diff options
Diffstat (limited to 'drivers/net/myri10ge/myri10ge.c')
-rw-r--r-- | drivers/net/myri10ge/myri10ge.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/net/myri10ge/myri10ge.c b/drivers/net/myri10ge/myri10ge.c index b37867097308..56c6f876042c 100644 --- a/drivers/net/myri10ge/myri10ge.c +++ b/drivers/net/myri10ge/myri10ge.c | |||
@@ -1334,7 +1334,6 @@ myri10ge_rx_done(struct myri10ge_slice_state *ss, struct myri10ge_rx_buf *rx, | |||
1334 | myri10ge_vlan_ip_csum(skb, csum); | 1334 | myri10ge_vlan_ip_csum(skb, csum); |
1335 | } | 1335 | } |
1336 | netif_receive_skb(skb); | 1336 | netif_receive_skb(skb); |
1337 | dev->last_rx = jiffies; | ||
1338 | return 1; | 1337 | return 1; |
1339 | } | 1338 | } |
1340 | 1339 | ||
@@ -2985,7 +2984,6 @@ static void myri10ge_set_multicast_list(struct net_device *dev) | |||
2985 | struct dev_mc_list *mc_list; | 2984 | struct dev_mc_list *mc_list; |
2986 | __be32 data[2] = { 0, 0 }; | 2985 | __be32 data[2] = { 0, 0 }; |
2987 | int err; | 2986 | int err; |
2988 | DECLARE_MAC_BUF(mac); | ||
2989 | 2987 | ||
2990 | /* can be called from atomic contexts, | 2988 | /* can be called from atomic contexts, |
2991 | * pass 1 to force atomicity in myri10ge_send_cmd() */ | 2989 | * pass 1 to force atomicity in myri10ge_send_cmd() */ |
@@ -3032,8 +3030,7 @@ static void myri10ge_set_multicast_list(struct net_device *dev) | |||
3032 | printk(KERN_ERR "myri10ge: %s: Failed " | 3030 | printk(KERN_ERR "myri10ge: %s: Failed " |
3033 | "MXGEFW_JOIN_MULTICAST_GROUP, error status:" | 3031 | "MXGEFW_JOIN_MULTICAST_GROUP, error status:" |
3034 | "%d\t", dev->name, err); | 3032 | "%d\t", dev->name, err); |
3035 | printk(KERN_ERR "MAC %s\n", | 3033 | printk(KERN_ERR "MAC %pM\n", mc_list->dmi_addr); |
3036 | print_mac(mac, mc_list->dmi_addr)); | ||
3037 | goto abort; | 3034 | goto abort; |
3038 | } | 3035 | } |
3039 | } | 3036 | } |