aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/greth.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/greth.c')
-rw-r--r--drivers/net/greth.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/greth.c b/drivers/net/greth.c
index 2b9c1cbc9ec1..fd491e409488 100644
--- a/drivers/net/greth.c
+++ b/drivers/net/greth.c
@@ -34,6 +34,7 @@
34#include <linux/mii.h> 34#include <linux/mii.h>
35#include <linux/of_device.h> 35#include <linux/of_device.h>
36#include <linux/of_platform.h> 36#include <linux/of_platform.h>
37#include <linux/slab.h>
37#include <asm/cacheflush.h> 38#include <asm/cacheflush.h>
38#include <asm/byteorder.h> 39#include <asm/byteorder.h>
39 40
@@ -894,7 +895,6 @@ static int greth_rx_gbit(struct net_device *dev, int limit)
894 else 895 else
895 skb->ip_summed = CHECKSUM_NONE; 896 skb->ip_summed = CHECKSUM_NONE;
896 897
897 skb->dev = dev;
898 skb->protocol = eth_type_trans(skb, dev); 898 skb->protocol = eth_type_trans(skb, dev);
899 dev->stats.rx_packets++; 899 dev->stats.rx_packets++;
900 netif_receive_skb(skb); 900 netif_receive_skb(skb);
@@ -989,7 +989,7 @@ static u32 greth_hash_get_index(__u8 *addr)
989 989
990static void greth_set_hash_filter(struct net_device *dev) 990static void greth_set_hash_filter(struct net_device *dev)
991{ 991{
992 struct dev_mc_list *curr; 992 struct netdev_hw_addr *ha;
993 struct greth_private *greth = netdev_priv(dev); 993 struct greth_private *greth = netdev_priv(dev);
994 struct greth_regs *regs = (struct greth_regs *) greth->regs; 994 struct greth_regs *regs = (struct greth_regs *) greth->regs;
995 u32 mc_filter[2]; 995 u32 mc_filter[2];
@@ -997,8 +997,8 @@ static void greth_set_hash_filter(struct net_device *dev)
997 997
998 mc_filter[0] = mc_filter[1] = 0; 998 mc_filter[0] = mc_filter[1] = 0;
999 999
1000 netdev_for_each_mc_addr(curr, dev) { 1000 netdev_for_each_mc_addr(ha, dev) {
1001 bitnr = greth_hash_get_index(curr->dmi_addr); 1001 bitnr = greth_hash_get_index(ha->addr);
1002 mc_filter[bitnr >> 5] |= 1 << (bitnr & 31); 1002 mc_filter[bitnr >> 5] |= 1 << (bitnr & 31);
1003 } 1003 }
1004 1004