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, 6 insertions, 6 deletions

diff --git a/drivers/net/sunhme.c b/drivers/net/sunhme.c
index b17dbb11bd67..20deb14e98ff 100644
--- a/drivers/net/sunhme.c
+++ b/drivers/net/sunhme.c
@@ -1523,13 +1523,13 @@ static int happy_meal_init(struct happy_meal *hp)
                 hme_write32(hp, bregs + BMAC_HTABLE3, 0xffff);
         } else if ((hp->dev->flags & IFF_PROMISC) == 0) {
                 u16 hash_table[4];
-                struct dev_mc_list *dmi;
+                struct netdev_hw_addr *ha;
                 char *addrs;
                 u32 crc;
 
                 memset(hash_table, 0, sizeof(hash_table));
-                netdev_for_each_mc_addr(dmi, hp->dev) {
-                        addrs = dmi->dmi_addr;
+                netdev_for_each_mc_addr(ha, hp->dev) {
+                        addrs = ha->addr;
 
                         if (!(*addrs & 1))
                                 continue;
@@ -2362,7 +2362,7 @@ static void happy_meal_set_multicast(struct net_device *dev)
 {
         struct happy_meal *hp = netdev_priv(dev);
         void __iomem *bregs = hp->bigmacregs;
-        struct dev_mc_list *dmi;
+        struct netdev_hw_addr *ha;
         char *addrs;
         u32 crc;
 
@@ -2380,8 +2380,8 @@ static void happy_meal_set_multicast(struct net_device *dev)
                 u16 hash_table[4];
 
                 memset(hash_table, 0, sizeof(hash_table));
-                netdev_for_each_mc_addr(dmi, dev) {
-                        addrs = dmi->dmi_addr;
+                netdev_for_each_mc_addr(ha, dev) {
+                        addrs = ha->addr;
 
                         if (!(*addrs & 1))
                                 continue;