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/macmace.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/macmace.c')
-rw-r--r-- | drivers/net/macmace.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/net/macmace.c b/drivers/net/macmace.c index 52e9a51c4c4f..c685a4656878 100644 --- a/drivers/net/macmace.c +++ b/drivers/net/macmace.c | |||
@@ -488,7 +488,6 @@ static int mace_xmit_start(struct sk_buff *skb, struct net_device *dev) | |||
488 | 488 | ||
489 | dev_kfree_skb(skb); | 489 | dev_kfree_skb(skb); |
490 | 490 | ||
491 | dev->trans_start = jiffies; | ||
492 | return NETDEV_TX_OK; | 491 | return NETDEV_TX_OK; |
493 | } | 492 | } |
494 | 493 | ||
@@ -509,7 +508,7 @@ static void mace_set_multicast(struct net_device *dev) | |||
509 | mb->maccc |= PROM; | 508 | mb->maccc |= PROM; |
510 | } else { | 509 | } else { |
511 | unsigned char multicast_filter[8]; | 510 | unsigned char multicast_filter[8]; |
512 | struct dev_mc_list *dmi; | 511 | struct netdev_hw_addr *ha; |
513 | 512 | ||
514 | if (dev->flags & IFF_ALLMULTI) { | 513 | if (dev->flags & IFF_ALLMULTI) { |
515 | for (i = 0; i < 8; i++) { | 514 | for (i = 0; i < 8; i++) { |
@@ -518,8 +517,8 @@ static void mace_set_multicast(struct net_device *dev) | |||
518 | } else { | 517 | } else { |
519 | for (i = 0; i < 8; i++) | 518 | for (i = 0; i < 8; i++) |
520 | multicast_filter[i] = 0; | 519 | multicast_filter[i] = 0; |
521 | netdev_for_each_mc_addr(dmi, dev) { | 520 | netdev_for_each_mc_addr(ha, dev) { |
522 | crc = ether_crc_le(6, dmi->dmi_addr); | 521 | crc = ether_crc_le(6, ha->addr); |
523 | /* bit number in multicast_filter */ | 522 | /* bit number in multicast_filter */ |
524 | i = crc >> 26; | 523 | i = crc >> 26; |
525 | multicast_filter[i >> 3] |= 1 << (i & 7); | 524 | multicast_filter[i >> 3] |= 1 << (i & 7); |