On Sun, 2012-08-26 at 23:39 +0200, Jaccon Bastiaansen wrote:
The RxCFG register of the CS89x0 could be configured incorrectly
(because of misplaced parentheses), resulting in the disabling
of packet reception.
Thanks.
quoted hunk ↗ jump to hunk
diff --git a/drivers/net/ethernet/cirrus/cs89x0.c b/drivers/net/ethernet/cirrus/cs89x0.c
[]
quoted hunk ↗ jump to hunk
@@ -1261,10 +1261,10 @@ static void set_multicast_list(struct net_device *dev)
* so we have to enable interrupts on them also
*/
writereg(dev, PP_RxCFG,
- (lp->curr_rx_cfg |
- (lp->rx_mode == RX_ALL_ACCEPT)
- ? (RX_CRC_ERROR_ENBL | RX_RUNT_ENBL | RX_EXTRA_DATA_ENBL)
- : 0));
+ lp->curr_rx_cfg |
+ (lp->rx_mode == RX_ALL_ACCEPT
+ ? (RX_CRC_ERROR_ENBL | RX_RUNT_ENBL | RX_EXTRA_DATA_ENBL)
+ : 0));
spin_unlock_irqrestore(&lp->lock, flags);
}
Perhaps it would be better to use something like:
int cfg = lp->curr_rx_cfg;
if (lp->rx_mode == RX_ALL_ACCEPT)
cfg |= RX_CRC_ERROR_ENBL | RX_RUNT_ENBL | RX_EXTRA_DATA_ENBL;
writereg(dev, PP_RxCFG, cfg);