Merge branch 'master' of /repos/git/net-next-2.6

Conflicts:
	Documentation/feature-removal-schedule.txt
	net/ipv6/netfilter/ip6t_REJECT.c
	net/netfilter/xt_limit.c

Signed-off-by: Patrick McHardy <kaber@trash.net>

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 @@
 #include <linux/mii.h>
 #include <linux/of_device.h>
 #include <linux/of_platform.h>
+#include <linux/slab.h>
 #include <asm/cacheflush.h>
 #include <asm/byteorder.h>
 
@@ -894,7 +895,6 @@ static int greth_rx_gbit(struct net_device *dev, int limit)
                                 else
                                         skb->ip_summed = CHECKSUM_NONE;
 
-                                skb->dev = dev;
                                 skb->protocol = eth_type_trans(skb, dev);
                                 dev->stats.rx_packets++;
                                 netif_receive_skb(skb);
@@ -989,7 +989,7 @@ static u32 greth_hash_get_index(__u8 *addr)
 
 static void greth_set_hash_filter(struct net_device *dev)
 {
-        struct dev_mc_list *curr;
+        struct netdev_hw_addr *ha;
         struct greth_private *greth = netdev_priv(dev);
         struct greth_regs *regs = (struct greth_regs *) greth->regs;
         u32 mc_filter[2];
@@ -997,8 +997,8 @@ static void greth_set_hash_filter(struct net_device *dev)
 
         mc_filter[0] = mc_filter[1] = 0;
 
-        netdev_for_each_mc_addr(curr, dev) {
-                bitnr = greth_hash_get_index(curr->dmi_addr);
+        netdev_for_each_mc_addr(ha, dev) {
+                bitnr = greth_hash_get_index(ha->addr);
                 mc_filter[bitnr >> 5] |= 1 << (bitnr & 31);
         }