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

diff --git a/drivers/net/eepro.c b/drivers/net/eepro.c
index 1b05bdf62c3c..eed65d821e47 100644
--- a/drivers/net/eepro.c
+++ b/drivers/net/eepro.c
@@ -137,7 +137,6 @@ static const char version[] =
 #include <linux/interrupt.h>
 #include <linux/ioport.h>
 #include <linux/in.h>
-#include <linux/slab.h>
 #include <linux/string.h>
 #include <linux/errno.h>
 #include <linux/netdevice.h>
@@ -646,7 +645,7 @@ static void __init printEEPROMInfo(struct net_device *dev)
         if (GetBit(Word,ee_PortTPE)) printk(KERN_DEBUG "TPE ");
         if (GetBit(Word,ee_PortBNC)) printk(KERN_DEBUG "BNC ");
         if (GetBit(Word,ee_PortAUI)) printk(KERN_DEBUG "AUI ");
-        printk(KERN_DEBUG "port(s) \n");
+        printk(KERN_DEBUG "port(s)\n");
 
         Word = lp->word[6];
         printk(KERN_DEBUG "Word6:\n");
@@ -766,7 +765,7 @@ static int __init eepro_probe1(struct net_device *dev, int autoprobe)
         /* Grab the region so we can find another board if autoIRQ fails. */
         if (!request_region(ioaddr, EEPRO_IO_EXTENT, DRV_NAME)) {
                 if (!autoprobe)
-                        printk(KERN_WARNING "EEPRO: io-port 0x%04x in use \n",
+                        printk(KERN_WARNING "EEPRO: io-port 0x%04x in use\n",
                                 ioaddr);
                 return -EBUSY;
         }
@@ -1287,7 +1286,7 @@ set_multicast_list(struct net_device *dev)
         struct eepro_local *lp = netdev_priv(dev);
         short ioaddr = dev->base_addr;
         unsigned short mode;
-        struct dev_mc_list *dmi;
+        struct netdev_hw_addr *ha;
         int mc_count = netdev_mc_count(dev);
 
         if (dev->flags&(IFF_ALLMULTI|IFF_PROMISC) || mc_count > 63)
@@ -1332,8 +1331,8 @@ set_multicast_list(struct net_device *dev)
                 outw(0, ioaddr + IO_PORT);
                 outw(6 * (mc_count + 1), ioaddr + IO_PORT);
 
-                netdev_for_each_mc_addr(dmi, dev) {
-                        eaddrs = (unsigned short *) dmi->dmi_addr;
+                netdev_for_each_mc_addr(ha, dev) {
+                        eaddrs = (unsigned short *) ha->addr;
                         outw(*eaddrs++, ioaddr + IO_PORT);
                         outw(*eaddrs++, ioaddr + IO_PORT);
                         outw(*eaddrs++, ioaddr + IO_PORT);