diff options
author | Grant Likely <grant.likely@secretlab.ca> | 2010-05-22 02:36:56 -0400 |
---|---|---|
committer | Grant Likely <grant.likely@secretlab.ca> | 2010-05-22 02:36:56 -0400 |
commit | cf9b59e9d3e008591d1f54830f570982bb307a0d (patch) | |
tree | 113478ce8fd8c832ba726ffdf59b82cb46356476 /drivers/net/8139cp.c | |
parent | 44504b2bebf8b5823c59484e73096a7d6574471d (diff) | |
parent | f4b87dee923342505e1ddba8d34ce9de33e75050 (diff) |
Merge remote branch 'origin' into secretlab/next-devicetree
Merging in current state of Linus' tree to deal with merge conflicts and
build failures in vio.c after merge.
Conflicts:
drivers/i2c/busses/i2c-cpm.c
drivers/i2c/busses/i2c-mpc.c
drivers/net/gianfar.c
Also fixed up one line in arch/powerpc/kernel/vio.c to use the
correct node pointer.
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Diffstat (limited to 'drivers/net/8139cp.c')
-rw-r--r-- | drivers/net/8139cp.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/net/8139cp.c b/drivers/net/8139cp.c index a09e6ce3eaa0..9c149750e2bf 100644 --- a/drivers/net/8139cp.c +++ b/drivers/net/8139cp.c | |||
@@ -882,7 +882,6 @@ static netdev_tx_t cp_start_xmit (struct sk_buff *skb, | |||
882 | spin_unlock_irqrestore(&cp->lock, intr_flags); | 882 | spin_unlock_irqrestore(&cp->lock, intr_flags); |
883 | 883 | ||
884 | cpw8(TxPoll, NormalTxPoll); | 884 | cpw8(TxPoll, NormalTxPoll); |
885 | dev->trans_start = jiffies; | ||
886 | 885 | ||
887 | return NETDEV_TX_OK; | 886 | return NETDEV_TX_OK; |
888 | } | 887 | } |
@@ -910,11 +909,11 @@ static void __cp_set_rx_mode (struct net_device *dev) | |||
910 | rx_mode = AcceptBroadcast | AcceptMulticast | AcceptMyPhys; | 909 | rx_mode = AcceptBroadcast | AcceptMulticast | AcceptMyPhys; |
911 | mc_filter[1] = mc_filter[0] = 0xffffffff; | 910 | mc_filter[1] = mc_filter[0] = 0xffffffff; |
912 | } else { | 911 | } else { |
913 | struct dev_mc_list *mclist; | 912 | struct netdev_hw_addr *ha; |
914 | rx_mode = AcceptBroadcast | AcceptMyPhys; | 913 | rx_mode = AcceptBroadcast | AcceptMyPhys; |
915 | mc_filter[1] = mc_filter[0] = 0; | 914 | mc_filter[1] = mc_filter[0] = 0; |
916 | netdev_for_each_mc_addr(mclist, dev) { | 915 | netdev_for_each_mc_addr(ha, dev) { |
917 | int bit_nr = ether_crc(ETH_ALEN, mclist->dmi_addr) >> 26; | 916 | int bit_nr = ether_crc(ETH_ALEN, ha->addr) >> 26; |
918 | 917 | ||
919 | mc_filter[bit_nr >> 5] |= 1 << (bit_nr & 31); | 918 | mc_filter[bit_nr >> 5] |= 1 << (bit_nr & 31); |
920 | rx_mode |= AcceptMulticast; | 919 | rx_mode |= AcceptMulticast; |
@@ -1225,8 +1224,6 @@ static void cp_tx_timeout(struct net_device *dev) | |||
1225 | netif_wake_queue(dev); | 1224 | netif_wake_queue(dev); |
1226 | 1225 | ||
1227 | spin_unlock_irqrestore(&cp->lock, flags); | 1226 | spin_unlock_irqrestore(&cp->lock, flags); |
1228 | |||
1229 | return; | ||
1230 | } | 1227 | } |
1231 | 1228 | ||
1232 | #ifdef BROKEN | 1229 | #ifdef BROKEN |