Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

165 files changed, 1052 insertions, 1059 deletions

diff --git a/drivers/net/appletalk/cops.c b/drivers/net/appletalk/cops.c
index 9abd4eb86dc..dd5e04813b7 100644
--- a/drivers/net/appletalk/cops.c
+++ b/drivers/net/appletalk/cops.c
@@ -70,7 +70,6 @@ static const char *version =
 #include <linux/bitops.h>
 #include <linux/jiffies.h>
 
-#include <asm/system.h>
 #include <asm/io.h>
 #include <asm/dma.h>
 
diff --git a/drivers/net/appletalk/ltpc.c b/drivers/net/appletalk/ltpc.c
index 6057b30417a..0910dce3996 100644
--- a/drivers/net/appletalk/ltpc.c
+++ b/drivers/net/appletalk/ltpc.c
@@ -229,7 +229,6 @@ static int dma;
 #include <linux/bitops.h>
 #include <linux/gfp.h>
 
-#include <asm/system.h>
 #include <asm/dma.h>
 #include <asm/io.h>
 
diff --git a/drivers/net/arcnet/com20020_cs.c b/drivers/net/arcnet/com20020_cs.c
index 980e65c1493..5bed4c4e250 100644
--- a/drivers/net/arcnet/com20020_cs.c
+++ b/drivers/net/arcnet/com20020_cs.c
@@ -47,7 +47,6 @@
 #include <pcmcia/ds.h>
 
 #include <asm/io.h>
-#include <asm/system.h>
 
 #define VERSION "arcnet: COM20020 PCMCIA support loaded.\n"
 
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index a20b5850e7c..62d2409bb29 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -54,7 +54,6 @@
 #include <linux/inet.h>
 #include <linux/bitops.h>
 #include <linux/io.h>
-#include <asm/system.h>
 #include <asm/dma.h>
 #include <linux/uaccess.h>
 #include <linux/errno.h>
@@ -2035,6 +2034,9 @@ int bond_release(struct net_device *bond_dev, struct net_device *slave_dev)
         write_unlock_bh(&bond->lock);
         unblock_netpoll_tx();
 
+        if (bond->slave_cnt == 0)
+                call_netdevice_notifiers(NETDEV_CHANGEADDR, bond->dev);
+
         bond_compute_features(bond);
         if (!(bond_dev->features & NETIF_F_VLAN_CHALLENGED) &&
             (old_features & NETIF_F_VLAN_CHALLENGED))
@@ -3008,7 +3010,11 @@ static void bond_ab_arp_commit(struct bonding *bond, int delta_in_ticks)
                                            trans_start + delta_in_ticks)) ||
                             bond->curr_active_slave != slave) {
                                 slave->link = BOND_LINK_UP;
-                                bond->current_arp_slave = NULL;
+                                if (bond->current_arp_slave) {
+                                        bond_set_slave_inactive_flags(
+                                                bond->current_arp_slave);
+                                        bond->current_arp_slave = NULL;
+                                }
 
                                 pr_info("%s: link status definitely up for interface %s.\n",
                                         bond->dev->name, slave->dev->name);
@@ -3702,17 +3708,52 @@ static void bond_set_multicast_list(struct net_device *bond_dev)
         read_unlock(&bond->lock);
 }
 
-static int bond_neigh_setup(struct net_device *dev, struct neigh_parms *parms)
+static int bond_neigh_init(struct neighbour *n)
 {
-        struct bonding *bond = netdev_priv(dev);
+        struct bonding *bond = netdev_priv(n->dev);
         struct slave *slave = bond->first_slave;
+        const struct net_device_ops *slave_ops;
+        struct neigh_parms parms;
+        int ret;
+
+        if (!slave)
+                return 0;
+
+        slave_ops = slave->dev->netdev_ops;
+
+        if (!slave_ops->ndo_neigh_setup)
+                return 0;
+
+        parms.neigh_setup = NULL;
+        parms.neigh_cleanup = NULL;
+        ret = slave_ops->ndo_neigh_setup(slave->dev, &parms);
+        if (ret)
+                return ret;
+
+        /*
+         * Assign slave's neigh_cleanup to neighbour in case cleanup is called
+         * after the last slave has been detached.  Assumes that all slaves
+         * utilize the same neigh_cleanup (true at this writing as only user
+         * is ipoib).
+         */
+        n->parms->neigh_cleanup = parms.neigh_cleanup;
+
+        if (!parms.neigh_setup)
+                return 0;
+
+        return parms.neigh_setup(n);
+}
+
+/*
+ * The bonding ndo_neigh_setup is called at init time beofre any
+ * slave exists. So we must declare proxy setup function which will
+ * be used at run time to resolve the actual slave neigh param setup.
+ */
+static int bond_neigh_setup(struct net_device *dev,
+                            struct neigh_parms *parms)
+{
+        parms->neigh_setup   = bond_neigh_init;
 
-        if (slave) {
-                const struct net_device_ops *slave_ops
-                        = slave->dev->netdev_ops;
-                if (slave_ops->ndo_neigh_setup)
-                        return slave_ops->ndo_neigh_setup(slave->dev, parms);
-        }
         return 0;
 }
 
diff --git a/drivers/net/caif/caif_spi.c b/drivers/net/caif/caif_spi.c
index 96391c36fa7..b71ce9bf0af 100644
--- a/drivers/net/caif/caif_spi.c
+++ b/drivers/net/caif/caif_spi.c
@@ -127,12 +127,6 @@ static inline void dev_debugfs_rem(struct cfspi *cfspi)
         debugfs_remove(cfspi->dbgfs_dir);
 }
 
-static int dbgfs_open(struct inode *inode, struct file *file)
-{
-        file->private_data = inode->i_private;
-        return 0;
-}
-
 static ssize_t dbgfs_state(struct file *file, char __user *user_buf,
                            size_t count, loff_t *ppos)
 {
@@ -243,13 +237,13 @@ static ssize_t dbgfs_frame(struct file *file, char __user *user_buf,
 }
 
 static const struct file_operations dbgfs_state_fops = {
-        .open = dbgfs_open,
+        .open = simple_open,
         .read = dbgfs_state,
         .owner = THIS_MODULE
 };
 
 static const struct file_operations dbgfs_frame_fops = {
-        .open = dbgfs_open,
+        .open = simple_open,
         .read = dbgfs_frame,
         .owner = THIS_MODULE
 };
diff --git a/drivers/net/can/slcan.c b/drivers/net/can/slcan.c
index 98a5a7d867f..034c16b60e9 100644
--- a/drivers/net/can/slcan.c
+++ b/drivers/net/can/slcan.c
@@ -40,7 +40,6 @@
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 
-#include <asm/system.h>
 #include <linux/uaccess.h>
 #include <linux/bitops.h>
 #include <linux/string.h>
diff --git a/drivers/net/cris/eth_v10.c b/drivers/net/cris/eth_v10.c
index 7cb2785e209..ec03b401620 100644
--- a/drivers/net/cris/eth_v10.c
+++ b/drivers/net/cris/eth_v10.c
@@ -35,7 +35,6 @@
 #include <asm/io.h>         /* CRIS_LED_* I/O functions */
 #include <asm/irq.h>
 #include <asm/dma.h>
-#include <asm/system.h>
 #include <asm/ethernet.h>
 #include <asm/cache.h>
 #include <arch/io_interface_mux.h>
diff --git a/drivers/net/ethernet/3com/3c574_cs.c b/drivers/net/ethernet/3com/3c574_cs.c
index e61b2f82ba3..66df9363808 100644
--- a/drivers/net/ethernet/3com/3c574_cs.c
+++ b/drivers/net/ethernet/3com/3c574_cs.c
@@ -95,7 +95,6 @@ earlier 3Com products.
 
 #include <asm/uaccess.h>
 #include <asm/io.h>
-#include <asm/system.h>
 
 /*====================================================================*/
 
diff --git a/drivers/net/ethernet/3com/3c589_cs.c b/drivers/net/ethernet/3com/3c589_cs.c
index b23253b9f74..a556c01e011 100644
--- a/drivers/net/ethernet/3com/3c589_cs.c
+++ b/drivers/net/ethernet/3com/3c589_cs.c
@@ -50,7 +50,6 @@
 
 #include <asm/uaccess.h>
 #include <asm/io.h>
-#include <asm/system.h>
 
 /* To minimize the size of the driver source I only define operating
    constants if they are used several times.  You'll need the manual
diff --git a/drivers/net/ethernet/8390/3c503.c b/drivers/net/ethernet/8390/3c503.c
index fbab1367505..49d76bd0dc8 100644
--- a/drivers/net/ethernet/8390/3c503.c
+++ b/drivers/net/ethernet/8390/3c503.c
@@ -54,7 +54,6 @@ static const char version[] =
 
 #include <asm/uaccess.h>
 #include <asm/io.h>
-#include <asm/system.h>
 #include <asm/byteorder.h>
 
 #include "8390.h"
diff --git a/drivers/net/ethernet/8390/ac3200.c b/drivers/net/ethernet/8390/ac3200.c
index 5337dd0a59b..ccf07942ff6 100644
--- a/drivers/net/ethernet/8390/ac3200.c
+++ b/drivers/net/ethernet/8390/ac3200.c
@@ -34,7 +34,6 @@ static const char version[] =
 #include <linux/init.h>
 #include <linux/interrupt.h>
 
-#include <asm/system.h>
 #include <asm/io.h>
 #include <asm/irq.h>
 
diff --git a/drivers/net/ethernet/8390/apne.c b/drivers/net/ethernet/8390/apne.c
index 3ad5d2f9a49..923959275a8 100644
--- a/drivers/net/ethernet/8390/apne.c
+++ b/drivers/net/ethernet/8390/apne.c
@@ -39,7 +39,6 @@
 #include <linux/interrupt.h>
 #include <linux/jiffies.h>
 
-#include <asm/system.h>
 #include <asm/io.h>
 #include <asm/setup.h>
 #include <asm/amigaints.h>
diff --git a/drivers/net/ethernet/8390/ax88796.c b/drivers/net/ethernet/8390/ax88796.c
index 211efbf82b5..203ff9dccad 100644
--- a/drivers/net/ethernet/8390/ax88796.c
+++ b/drivers/net/ethernet/8390/ax88796.c
@@ -31,7 +31,6 @@
 
 #include <net/ax88796.h>
 
-#include <asm/system.h>
 
 /* Rename the lib8390.c functions to show that they are in this driver */
 #define __ei_open ax_ei_open
diff --git a/drivers/net/ethernet/8390/axnet_cs.c b/drivers/net/ethernet/8390/axnet_cs.c
index c5bd8eb7a9f..e1b3941bd14 100644
--- a/drivers/net/ethernet/8390/axnet_cs.c
+++ b/drivers/net/ethernet/8390/axnet_cs.c
@@ -46,7 +46,6 @@
 #include <pcmcia/cisreg.h>
 
 #include <asm/io.h>
-#include <asm/system.h>
 #include <asm/byteorder.h>
 #include <asm/uaccess.h>
 
diff --git a/drivers/net/ethernet/8390/e2100.c b/drivers/net/ethernet/8390/e2100.c
index d16dc53c181..ed55ce85ebb 100644
--- a/drivers/net/ethernet/8390/e2100.c
+++ b/drivers/net/ethernet/8390/e2100.c
@@ -48,7 +48,6 @@ static const char version[] =
 #include <linux/delay.h>
 
 #include <asm/io.h>
-#include <asm/system.h>
 
 #include "8390.h"
 
diff --git a/drivers/net/ethernet/8390/es3210.c b/drivers/net/ethernet/8390/es3210.c
index 6428f9e7a55..ba1b5c95531 100644
--- a/drivers/net/ethernet/8390/es3210.c
+++ b/drivers/net/ethernet/8390/es3210.c
@@ -59,7 +59,6 @@ static const char version[] =
 #include <linux/etherdevice.h>
 
 #include <asm/io.h>
-#include <asm/system.h>
 
 #include "8390.h"
 
diff --git a/drivers/net/ethernet/8390/etherh.c b/drivers/net/ethernet/8390/etherh.c
index 89cba45c35c..8322c54972f 100644
--- a/drivers/net/ethernet/8390/etherh.c
+++ b/drivers/net/ethernet/8390/etherh.c
@@ -45,9 +45,9 @@
 #include <linux/bitops.h>
 #include <linux/jiffies.h>
 
-#include <asm/system.h>
 #include <asm/ecard.h>
 #include <asm/io.h>
+#include <asm/system_info.h>
 
 #define EI_SHIFT(x)     (ei_local->reg_offset[x])
 
diff --git a/drivers/net/ethernet/8390/hp-plus.c b/drivers/net/ethernet/8390/hp-plus.c
index d42938b6b59..52f70f999c0 100644
--- a/drivers/net/ethernet/8390/hp-plus.c
+++ b/drivers/net/ethernet/8390/hp-plus.c
@@ -33,7 +33,6 @@ static const char version[] =
 #include <linux/interrupt.h>
 #include <linux/delay.h>
 
-#include <asm/system.h>
 #include <asm/io.h>
 
 #include "8390.h"
diff --git a/drivers/net/ethernet/8390/hp.c b/drivers/net/ethernet/8390/hp.c
index 113f1e075a2..37fa89aa457 100644
--- a/drivers/net/ethernet/8390/hp.c
+++ b/drivers/net/ethernet/8390/hp.c
@@ -33,7 +33,6 @@ static const char version[] =
 #include <linux/interrupt.h>
 #include <linux/delay.h>
 
-#include <asm/system.h>
 #include <asm/io.h>
 
 #include "8390.h"
diff --git a/drivers/net/ethernet/8390/lib8390.c b/drivers/net/ethernet/8390/lib8390.c
index e77f624e819..b329f5c0d62 100644
--- a/drivers/net/ethernet/8390/lib8390.c
+++ b/drivers/net/ethernet/8390/lib8390.c
@@ -57,7 +57,6 @@
 #include <linux/types.h>
 #include <linux/string.h>
 #include <linux/bitops.h>
-#include <asm/system.h>
 #include <linux/uaccess.h>
 #include <linux/io.h>
 #include <asm/irq.h>
diff --git a/drivers/net/ethernet/8390/lne390.c b/drivers/net/ethernet/8390/lne390.c
index 69490ae018e..479409bf2e3 100644
--- a/drivers/net/ethernet/8390/lne390.c
+++ b/drivers/net/ethernet/8390/lne390.c
@@ -46,7 +46,6 @@ static const char *version =
 #include <linux/etherdevice.h>
 
 #include <asm/io.h>
-#include <asm/system.h>
 
 #include "8390.h"
 
diff --git a/drivers/net/ethernet/8390/mac8390.c b/drivers/net/ethernet/8390/mac8390.c
index af5d9822cad..88ccc8b14f0 100644
--- a/drivers/net/ethernet/8390/mac8390.c
+++ b/drivers/net/ethernet/8390/mac8390.c
@@ -37,7 +37,6 @@
 #include <linux/bitops.h>
 #include <linux/io.h>
 
-#include <asm/system.h>
 #include <asm/dma.h>
 #include <asm/hwtest.h>
 #include <asm/macints.h>
diff --git a/drivers/net/ethernet/8390/ne-h8300.c b/drivers/net/ethernet/8390/ne-h8300.c
index 9b9c77d5a65..7fc28f2d28a 100644
--- a/drivers/net/ethernet/8390/ne-h8300.c
+++ b/drivers/net/ethernet/8390/ne-h8300.c
@@ -29,7 +29,6 @@ static const char version1[] =
 #include <linux/etherdevice.h>
 #include <linux/jiffies.h>
 
-#include <asm/system.h>
 #include <asm/io.h>
 #include <asm/irq.h>
 
diff --git a/drivers/net/ethernet/8390/ne.c b/drivers/net/ethernet/8390/ne.c
index f92ea2a65a5..d04911d33b6 100644
--- a/drivers/net/ethernet/8390/ne.c
+++ b/drivers/net/ethernet/8390/ne.c
@@ -53,7 +53,6 @@ static const char version2[] =
 #include <linux/jiffies.h>
 #include <linux/platform_device.h>
 
-#include <asm/system.h>
 #include <asm/io.h>
 
 #include "8390.h"
diff --git a/drivers/net/ethernet/8390/ne2.c b/drivers/net/ethernet/8390/ne2.c
index 922b32036c6..ef85839f43d 100644
--- a/drivers/net/ethernet/8390/ne2.c
+++ b/drivers/net/ethernet/8390/ne2.c
@@ -76,7 +76,6 @@ static const char *version = "ne2.c:v0.91 Nov 16 1998 Wim Dumon <wimpie@kotnet.o
 #include <linux/bitops.h>
 #include <linux/jiffies.h>
 
-#include <asm/system.h>
 #include <asm/io.h>
 #include <asm/dma.h>
 
diff --git a/drivers/net/ethernet/8390/ne2k-pci.c b/drivers/net/ethernet/8390/ne2k-pci.c
index 3fab04a0034..5e8845febfb 100644
--- a/drivers/net/ethernet/8390/ne2k-pci.c
+++ b/drivers/net/ethernet/8390/ne2k-pci.c
@@ -54,7 +54,6 @@ static int options[MAX_UNITS];
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
 
-#include <asm/system.h>
 #include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/uaccess.h>
diff --git a/drivers/net/ethernet/8390/ne3210.c b/drivers/net/ethernet/8390/ne3210.c
index 2a3e8057fea..a2f8b2b8e27 100644
--- a/drivers/net/ethernet/8390/ne3210.c
+++ b/drivers/net/ethernet/8390/ne3210.c
@@ -39,7 +39,6 @@
 #include <linux/mm.h>
 
 #include <asm/io.h>
-#include <asm/system.h>
 
 #include "8390.h"
 
diff --git a/drivers/net/ethernet/8390/pcnet_cs.c b/drivers/net/ethernet/8390/pcnet_cs.c
index f2a4e5de18c..de1af0bfed4 100644
--- a/drivers/net/ethernet/8390/pcnet_cs.c
+++ b/drivers/net/ethernet/8390/pcnet_cs.c
@@ -49,7 +49,6 @@
 #include <pcmcia/cisreg.h>
 
 #include <asm/io.h>
-#include <asm/system.h>
 #include <asm/byteorder.h>
 #include <asm/uaccess.h>
 
diff --git a/drivers/net/ethernet/8390/smc-mca.c b/drivers/net/ethernet/8390/smc-mca.c
index 77efec44fea..7a68590f280 100644
--- a/drivers/net/ethernet/8390/smc-mca.c
+++ b/drivers/net/ethernet/8390/smc-mca.c
@@ -47,7 +47,6 @@
 #include <linux/etherdevice.h>
 
 #include <asm/io.h>
-#include <asm/system.h>
 
 #include "8390.h"
 
diff --git a/drivers/net/ethernet/8390/smc-ultra.c b/drivers/net/ethernet/8390/smc-ultra.c
index 1cc306a83ff..b0fbce39661 100644
--- a/drivers/net/ethernet/8390/smc-ultra.c
+++ b/drivers/net/ethernet/8390/smc-ultra.c
@@ -69,7 +69,6 @@ static const char version[] =
 
 #include <asm/io.h>
 #include <asm/irq.h>
-#include <asm/system.h>
 
 #include "8390.h"
 
diff --git a/drivers/net/ethernet/8390/smc-ultra32.c b/drivers/net/ethernet/8390/smc-ultra32.c
index bb87053eb3d..923e42aedcf 100644
--- a/drivers/net/ethernet/8390/smc-ultra32.c
+++ b/drivers/net/ethernet/8390/smc-ultra32.c
@@ -57,7 +57,6 @@ static const char *version = "smc-ultra32.c: 06/97 v1.00\n";
 #include <linux/etherdevice.h>
 
 #include <asm/io.h>
-#include <asm/system.h>
 
 #include "8390.h"
 
diff --git a/drivers/net/ethernet/8390/stnic.c b/drivers/net/ethernet/8390/stnic.c
index 3b903759980..8df4c415723 100644
--- a/drivers/net/ethernet/8390/stnic.c
+++ b/drivers/net/ethernet/8390/stnic.c
@@ -17,7 +17,6 @@
 #include <linux/init.h>
 #include <linux/delay.h>
 
-#include <asm/system.h>
 #include <asm/io.h>
 #include <mach-se/mach/se.h>
 #include <asm/machvec.h>
diff --git a/drivers/net/ethernet/8390/wd.c b/drivers/net/ethernet/8390/wd.c
index c175fadb597..03eb3eed49f 100644
--- a/drivers/net/ethernet/8390/wd.c
+++ b/drivers/net/ethernet/8390/wd.c
@@ -39,7 +39,6 @@ static const char version[] =
 #include <linux/etherdevice.h>
 
 #include <asm/io.h>
-#include <asm/system.h>
 
 #include "8390.h"
 
diff --git a/drivers/net/ethernet/8390/zorro8390.c b/drivers/net/ethernet/8390/zorro8390.c
index bcd27323b20..7818e6397e9 100644
--- a/drivers/net/ethernet/8390/zorro8390.c
+++ b/drivers/net/ethernet/8390/zorro8390.c
@@ -31,7 +31,6 @@
 #include <linux/zorro.h>
 #include <linux/jiffies.h>
 
-#include <asm/system.h>
 #include <asm/irq.h>
 #include <asm/amigaints.h>
 #include <asm/amigahw.h>
diff --git a/drivers/net/ethernet/alteon/acenic.c b/drivers/net/ethernet/alteon/acenic.c
index 6c3b1c0adaa..7219123fa0a 100644
--- a/drivers/net/ethernet/alteon/acenic.c
+++ b/drivers/net/ethernet/alteon/acenic.c
@@ -78,7 +78,6 @@
 #include <net/sock.h>
 #include <net/ip.h>
 
-#include <asm/system.h>
 #include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/byteorder.h>
diff --git a/drivers/net/ethernet/amd/7990.c b/drivers/net/ethernet/amd/7990.c
index 1b046f58d58..6e722dc37db 100644
--- a/drivers/net/ethernet/amd/7990.c
+++ b/drivers/net/ethernet/amd/7990.c
@@ -33,7 +33,6 @@
 #include <linux/socket.h>
 #include <linux/bitops.h>
 
-#include <asm/system.h>
 #include <asm/io.h>
 #include <asm/dma.h>
 #include <asm/pgtable.h>
diff --git a/drivers/net/ethernet/amd/am79c961a.c b/drivers/net/ethernet/amd/am79c961a.c
index cc7b9e46780..e10ffad525a 100644
--- a/drivers/net/ethernet/amd/am79c961a.c
+++ b/drivers/net/ethernet/amd/am79c961a.c
@@ -30,7 +30,6 @@
 #include <linux/io.h>
 
 #include <mach/hardware.h>
-#include <asm/system.h>
 
 #define TX_BUFFERS 15
 #define RX_BUFFERS 25
diff --git a/drivers/net/ethernet/amd/amd8111e.c b/drivers/net/ethernet/amd/amd8111e.c
index 9f62504d008..64d0d9c1afa 100644
--- a/drivers/net/ethernet/amd/amd8111e.c
+++ b/drivers/net/ethernet/amd/amd8111e.c
@@ -88,7 +88,6 @@ Revision History:
 #include <linux/crc32.h>
 #include <linux/dma-mapping.h>
 
-#include <asm/system.h>
 #include <asm/io.h>
 #include <asm/byteorder.h>
 #include <asm/uaccess.h>
diff --git a/drivers/net/ethernet/amd/declance.c b/drivers/net/ethernet/amd/declance.c
index 7dc508e5c72..75299f500ee 100644
--- a/drivers/net/ethernet/amd/declance.c
+++ b/drivers/net/ethernet/amd/declance.c
@@ -64,7 +64,6 @@
 #include <linux/types.h>
 
 #include <asm/addrspace.h>
-#include <asm/system.h>
 
 #include <asm/dec/interrupts.h>
 #include <asm/dec/ioasic.h>
diff --git a/drivers/net/ethernet/amd/hplance.c b/drivers/net/ethernet/amd/hplance.c
index 4e2d68a4de8..8baff4e5d96 100644
--- a/drivers/net/ethernet/amd/hplance.c
+++ b/drivers/net/ethernet/amd/hplance.c
@@ -22,7 +22,6 @@
 #include <linux/etherdevice.h>
 #include <linux/skbuff.h>
 
-#include <asm/system.h>
 #include <asm/io.h>
 #include <asm/pgtable.h>
 
diff --git a/drivers/net/ethernet/amd/mvme147.c b/drivers/net/ethernet/amd/mvme147.c
index 56bc47a9418..9af3c307862 100644
--- a/drivers/net/ethernet/amd/mvme147.c
+++ b/drivers/net/ethernet/amd/mvme147.c
@@ -22,7 +22,6 @@
 #include <linux/etherdevice.h>
 #include <linux/skbuff.h>
 
-#include <asm/system.h>
 #include <asm/io.h>
 #include <asm/pgtable.h>
 #include <asm/mvme147hw.h>
diff --git a/drivers/net/ethernet/amd/nmclan_cs.c b/drivers/net/ethernet/amd/nmclan_cs.c
index ebdb9e238a8..9f59bf63514 100644
--- a/drivers/net/ethernet/amd/nmclan_cs.c
+++ b/drivers/net/ethernet/amd/nmclan_cs.c
@@ -154,7 +154,6 @@ Include Files
 
 #include <asm/uaccess.h>
 #include <asm/io.h>
-#include <asm/system.h>
 
 /* ----------------------------------------------------------------------------
 Defines
diff --git a/drivers/net/ethernet/amd/sunlance.c b/drivers/net/ethernet/amd/sunlance.c
index e3fe3504e19..d7a3533d990 100644
--- a/drivers/net/ethernet/amd/sunlance.c
+++ b/drivers/net/ethernet/amd/sunlance.c
@@ -95,7 +95,6 @@ static char lancestr[] = "LANCE";
 #include <linux/of_device.h>
 #include <linux/gfp.h>
 
-#include <asm/system.h>
 #include <asm/io.h>
 #include <asm/dma.h>
 #include <asm/pgtable.h>
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
index 583da06e715..5a58cff78dc 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
@@ -1863,7 +1863,6 @@ int bnx2x_nic_load(struct bnx2x *bp, int load_mode)
                  * bnx2x_periodic_task().
                  */
                 smp_mb();
-                queue_delayed_work(bnx2x_wq, &bp->period_task, 0);
         } else
                 bp->port.pmf = 0;
 
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_fw_defs.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_fw_defs.h
index cd6dfa9eaa3..b9b26332343 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_fw_defs.h
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_fw_defs.h
@@ -25,31 +25,31 @@
         (IRO[149].base + ((funcId) * IRO[149].m1))
 #define CSTORM_IGU_MODE_OFFSET (IRO[157].base)
 #define CSTORM_ISCSI_CQ_SIZE_OFFSET(pfId) \
-        (IRO[315].base + ((pfId) * IRO[315].m1))
-#define CSTORM_ISCSI_CQ_SQN_SIZE_OFFSET(pfId) \
         (IRO[316].base + ((pfId) * IRO[316].m1))
+#define CSTORM_ISCSI_CQ_SQN_SIZE_OFFSET(pfId) \
+        (IRO[317].base + ((pfId) * IRO[317].m1))
 #define CSTORM_ISCSI_EQ_CONS_OFFSET(pfId, iscsiEqId) \
-        (IRO[308].base + ((pfId) * IRO[308].m1) + ((iscsiEqId) * IRO[308].m2))
+        (IRO[309].base + ((pfId) * IRO[309].m1) + ((iscsiEqId) * IRO[309].m2))
 #define CSTORM_ISCSI_EQ_NEXT_EQE_ADDR_OFFSET(pfId, iscsiEqId) \
-        (IRO[310].base + ((pfId) * IRO[310].m1) + ((iscsiEqId) * IRO[310].m2))
+        (IRO[311].base + ((pfId) * IRO[311].m1) + ((iscsiEqId) * IRO[311].m2))
 #define CSTORM_ISCSI_EQ_NEXT_PAGE_ADDR_OFFSET(pfId, iscsiEqId) \
-        (IRO[309].base + ((pfId) * IRO[309].m1) + ((iscsiEqId) * IRO[309].m2))
+        (IRO[310].base + ((pfId) * IRO[310].m1) + ((iscsiEqId) * IRO[310].m2))
 #define CSTORM_ISCSI_EQ_NEXT_PAGE_ADDR_VALID_OFFSET(pfId, iscsiEqId) \
-        (IRO[311].base + ((pfId) * IRO[311].m1) + ((iscsiEqId) * IRO[311].m2))
+        (IRO[312].base + ((pfId) * IRO[312].m1) + ((iscsiEqId) * IRO[312].m2))
 #define CSTORM_ISCSI_EQ_PROD_OFFSET(pfId, iscsiEqId) \
-        (IRO[307].base + ((pfId) * IRO[307].m1) + ((iscsiEqId) * IRO[307].m2))
+        (IRO[308].base + ((pfId) * IRO[308].m1) + ((iscsiEqId) * IRO[308].m2))
 #define CSTORM_ISCSI_EQ_SB_INDEX_OFFSET(pfId, iscsiEqId) \
-        (IRO[313].base + ((pfId) * IRO[313].m1) + ((iscsiEqId) * IRO[313].m2))
+        (IRO[314].base + ((pfId) * IRO[314].m1) + ((iscsiEqId) * IRO[314].m2))
 #define CSTORM_ISCSI_EQ_SB_NUM_OFFSET(pfId, iscsiEqId) \
-        (IRO[312].base + ((pfId) * IRO[312].m1) + ((iscsiEqId) * IRO[312].m2))
+        (IRO[313].base + ((pfId) * IRO[313].m1) + ((iscsiEqId) * IRO[313].m2))
 #define CSTORM_ISCSI_HQ_SIZE_OFFSET(pfId) \
-        (IRO[314].base + ((pfId) * IRO[314].m1))
+        (IRO[315].base + ((pfId) * IRO[315].m1))
 #define CSTORM_ISCSI_NUM_OF_TASKS_OFFSET(pfId) \
-        (IRO[306].base + ((pfId) * IRO[306].m1))
+        (IRO[307].base + ((pfId) * IRO[307].m1))
 #define CSTORM_ISCSI_PAGE_SIZE_LOG_OFFSET(pfId) \
-        (IRO[305].base + ((pfId) * IRO[305].m1))
+        (IRO[306].base + ((pfId) * IRO[306].m1))
 #define CSTORM_ISCSI_PAGE_SIZE_OFFSET(pfId) \
-        (IRO[304].base + ((pfId) * IRO[304].m1))
+        (IRO[305].base + ((pfId) * IRO[305].m1))
 #define CSTORM_RECORD_SLOW_PATH_OFFSET(funcId) \
         (IRO[151].base + ((funcId) * IRO[151].m1))
 #define CSTORM_SP_STATUS_BLOCK_DATA_OFFSET(pfId) \
@@ -96,37 +96,37 @@
 #define TSTORM_FUNC_EN_OFFSET(funcId) \
         (IRO[103].base + ((funcId) * IRO[103].m1))
 #define TSTORM_ISCSI_ERROR_BITMAP_OFFSET(pfId) \
-        (IRO[271].base + ((pfId) * IRO[271].m1))
-#define TSTORM_ISCSI_L2_ISCSI_OOO_CID_TABLE_OFFSET(pfId) \
         (IRO[272].base + ((pfId) * IRO[272].m1))
-#define TSTORM_ISCSI_L2_ISCSI_OOO_CLIENT_ID_TABLE_OFFSET(pfId) \
+#define TSTORM_ISCSI_L2_ISCSI_OOO_CID_TABLE_OFFSET(pfId) \
         (IRO[273].base + ((pfId) * IRO[273].m1))
-#define TSTORM_ISCSI_L2_ISCSI_OOO_PROD_OFFSET(pfId) \
+#define TSTORM_ISCSI_L2_ISCSI_OOO_CLIENT_ID_TABLE_OFFSET(pfId) \
         (IRO[274].base + ((pfId) * IRO[274].m1))
+#define TSTORM_ISCSI_L2_ISCSI_OOO_PROD_OFFSET(pfId) \
+        (IRO[275].base + ((pfId) * IRO[275].m1))
 #define TSTORM_ISCSI_NUM_OF_TASKS_OFFSET(pfId) \
-        (IRO[270].base + ((pfId) * IRO[270].m1))
+        (IRO[271].base + ((pfId) * IRO[271].m1))
 #define TSTORM_ISCSI_PAGE_SIZE_LOG_OFFSET(pfId) \
-        (IRO[269].base + ((pfId) * IRO[269].m1))
+        (IRO[270].base + ((pfId) * IRO[270].m1))
 #define TSTORM_ISCSI_PAGE_SIZE_OFFSET(pfId) \
-        (IRO[268].base + ((pfId) * IRO[268].m1))
+        (IRO[269].base + ((pfId) * IRO[269].m1))
 #define TSTORM_ISCSI_RQ_SIZE_OFFSET(pfId) \
-        (IRO[267].base + ((pfId) * IRO[267].m1))
+        (IRO[268].base + ((pfId) * IRO[268].m1))
 #define TSTORM_ISCSI_TCP_LOCAL_ADV_WND_OFFSET(pfId) \
-        (IRO[276].base + ((pfId) * IRO[276].m1))
+        (IRO[277].base + ((pfId) * IRO[277].m1))
 #define TSTORM_ISCSI_TCP_VARS_FLAGS_OFFSET(pfId) \
-        (IRO[263].base + ((pfId) * IRO[263].m1))
-#define TSTORM_ISCSI_TCP_VARS_LSB_LOCAL_MAC_ADDR_OFFSET(pfId) \
         (IRO[264].base + ((pfId) * IRO[264].m1))
-#define TSTORM_ISCSI_TCP_VARS_MID_LOCAL_MAC_ADDR_OFFSET(pfId) \
+#define TSTORM_ISCSI_TCP_VARS_LSB_LOCAL_MAC_ADDR_OFFSET(pfId) \
         (IRO[265].base + ((pfId) * IRO[265].m1))
-#define TSTORM_ISCSI_TCP_VARS_MSB_LOCAL_MAC_ADDR_OFFSET(pfId) \
+#define TSTORM_ISCSI_TCP_VARS_MID_LOCAL_MAC_ADDR_OFFSET(pfId) \
         (IRO[266].base + ((pfId) * IRO[266].m1))
+#define TSTORM_ISCSI_TCP_VARS_MSB_LOCAL_MAC_ADDR_OFFSET(pfId) \
+        (IRO[267].base + ((pfId) * IRO[267].m1))
 #define TSTORM_MAC_FILTER_CONFIG_OFFSET(pfId) \
         (IRO[202].base + ((pfId) * IRO[202].m1))
 #define TSTORM_RECORD_SLOW_PATH_OFFSET(funcId) \
         (IRO[105].base + ((funcId) * IRO[105].m1))
 #define TSTORM_TCP_MAX_CWND_OFFSET(pfId) \
-        (IRO[216].base + ((pfId) * IRO[216].m1))
+        (IRO[217].base + ((pfId) * IRO[217].m1))
 #define TSTORM_VF_TO_PF_OFFSET(funcId) \
         (IRO[104].base + ((funcId) * IRO[104].m1))
 #define USTORM_AGG_DATA_OFFSET (IRO[206].base)
@@ -140,29 +140,29 @@
 #define USTORM_ETH_PAUSE_ENABLED_OFFSET(portId) \
         (IRO[183].base + ((portId) * IRO[183].m1))
 #define USTORM_FCOE_EQ_PROD_OFFSET(pfId) \
-        (IRO[317].base + ((pfId) * IRO[317].m1))
+        (IRO[318].base + ((pfId) * IRO[318].m1))
 #define USTORM_FUNC_EN_OFFSET(funcId) \
         (IRO[178].base + ((funcId) * IRO[178].m1))
 #define USTORM_ISCSI_CQ_SIZE_OFFSET(pfId) \
-        (IRO[281].base + ((pfId) * IRO[281].m1))
-#define USTORM_ISCSI_CQ_SQN_SIZE_OFFSET(pfId) \
         (IRO[282].base + ((pfId) * IRO[282].m1))
+#define USTORM_ISCSI_CQ_SQN_SIZE_OFFSET(pfId) \
+        (IRO[283].base + ((pfId) * IRO[283].m1))
 #define USTORM_ISCSI_ERROR_BITMAP_OFFSET(pfId) \
-        (IRO[286].base + ((pfId) * IRO[286].m1))
+        (IRO[287].base + ((pfId) * IRO[287].m1))
 #define USTORM_ISCSI_GLOBAL_BUF_PHYS_ADDR_OFFSET(pfId) \
-        (IRO[283].base + ((pfId) * IRO[283].m1))
+        (IRO[284].base + ((pfId) * IRO[284].m1))
 #define USTORM_ISCSI_NUM_OF_TASKS_OFFSET(pfId) \
-        (IRO[279].base + ((pfId) * IRO[279].m1))
+        (IRO[280].base + ((pfId) * IRO[280].m1))
 #define USTORM_ISCSI_PAGE_SIZE_LOG_OFFSET(pfId) \
-        (IRO[278].base + ((pfId) * IRO[278].m1))
+        (IRO[279].base + ((pfId) * IRO[279].m1))
 #define USTORM_ISCSI_PAGE_SIZE_OFFSET(pfId) \
-        (IRO[277].base + ((pfId) * IRO[277].m1))
+        (IRO[278].base + ((pfId) * IRO[278].m1))
 #define USTORM_ISCSI_R2TQ_SIZE_OFFSET(pfId) \
-        (IRO[280].base + ((pfId) * IRO[280].m1))
+        (IRO[281].base + ((pfId) * IRO[281].m1))
 #define USTORM_ISCSI_RQ_BUFFER_SIZE_OFFSET(pfId) \
-        (IRO[284].base + ((pfId) * IRO[284].m1))
-#define USTORM_ISCSI_RQ_SIZE_OFFSET(pfId) \
         (IRO[285].base + ((pfId) * IRO[285].m1))
+#define USTORM_ISCSI_RQ_SIZE_OFFSET(pfId) \
+        (IRO[286].base + ((pfId) * IRO[286].m1))
 #define USTORM_MEM_WORKAROUND_ADDRESS_OFFSET(pfId) \
         (IRO[182].base + ((pfId) * IRO[182].m1))
 #define USTORM_RECORD_SLOW_PATH_OFFSET(funcId) \
@@ -188,39 +188,39 @@
 #define XSTORM_FUNC_EN_OFFSET(funcId) \
         (IRO[47].base + ((funcId) * IRO[47].m1))
 #define XSTORM_ISCSI_HQ_SIZE_OFFSET(pfId) \
-        (IRO[294].base + ((pfId) * IRO[294].m1))
+        (IRO[295].base + ((pfId) * IRO[295].m1))
 #define XSTORM_ISCSI_LOCAL_MAC_ADDR0_OFFSET(pfId) \
-        (IRO[297].base + ((pfId) * IRO[297].m1))
-#define XSTORM_ISCSI_LOCAL_MAC_ADDR1_OFFSET(pfId) \
         (IRO[298].base + ((pfId) * IRO[298].m1))
-#define XSTORM_ISCSI_LOCAL_MAC_ADDR2_OFFSET(pfId) \
+#define XSTORM_ISCSI_LOCAL_MAC_ADDR1_OFFSET(pfId) \
         (IRO[299].base + ((pfId) * IRO[299].m1))
-#define XSTORM_ISCSI_LOCAL_MAC_ADDR3_OFFSET(pfId) \
+#define XSTORM_ISCSI_LOCAL_MAC_ADDR2_OFFSET(pfId) \
         (IRO[300].base + ((pfId) * IRO[300].m1))
-#define XSTORM_ISCSI_LOCAL_MAC_ADDR4_OFFSET(pfId) \
+#define XSTORM_ISCSI_LOCAL_MAC_ADDR3_OFFSET(pfId) \
         (IRO[301].base + ((pfId) * IRO[301].m1))
-#define XSTORM_ISCSI_LOCAL_MAC_ADDR5_OFFSET(pfId) \
+#define XSTORM_ISCSI_LOCAL_MAC_ADDR4_OFFSET(pfId) \
         (IRO[302].base + ((pfId) * IRO[302].m1))
-#define XSTORM_ISCSI_LOCAL_VLAN_OFFSET(pfId) \
+#define XSTORM_ISCSI_LOCAL_MAC_ADDR5_OFFSET(pfId) \
         (IRO[303].base + ((pfId) * IRO[303].m1))
+#define XSTORM_ISCSI_LOCAL_VLAN_OFFSET(pfId) \
+        (IRO[304].base + ((pfId) * IRO[304].m1))
 #define XSTORM_ISCSI_NUM_OF_TASKS_OFFSET(pfId) \
-        (IRO[293].base + ((pfId) * IRO[293].m1))
+        (IRO[294].base + ((pfId) * IRO[294].m1))
 #define XSTORM_ISCSI_PAGE_SIZE_LOG_OFFSET(pfId) \
-        (IRO[292].base + ((pfId) * IRO[292].m1))
+        (IRO[293].base + ((pfId) * IRO[293].m1))
 #define XSTORM_ISCSI_PAGE_SIZE_OFFSET(pfId) \
-        (IRO[291].base + ((pfId) * IRO[291].m1))
+        (IRO[292].base + ((pfId) * IRO[292].m1))
 #define XSTORM_ISCSI_R2TQ_SIZE_OFFSET(pfId) \
-        (IRO[296].base + ((pfId) * IRO[296].m1))
+        (IRO[297].base + ((pfId) * IRO[297].m1))
 #define XSTORM_ISCSI_SQ_SIZE_OFFSET(pfId) \
-        (IRO[295].base + ((pfId) * IRO[295].m1))
+        (IRO[296].base + ((pfId) * IRO[296].m1))
 #define XSTORM_ISCSI_TCP_VARS_ADV_WND_SCL_OFFSET(pfId) \
-        (IRO[290].base + ((pfId) * IRO[290].m1))
+        (IRO[291].base + ((pfId) * IRO[291].m1))
 #define XSTORM_ISCSI_TCP_VARS_FLAGS_OFFSET(pfId) \
-        (IRO[289].base + ((pfId) * IRO[289].m1))
+        (IRO[290].base + ((pfId) * IRO[290].m1))
 #define XSTORM_ISCSI_TCP_VARS_TOS_OFFSET(pfId) \
-        (IRO[288].base + ((pfId) * IRO[288].m1))
+        (IRO[289].base + ((pfId) * IRO[289].m1))
 #define XSTORM_ISCSI_TCP_VARS_TTL_OFFSET(pfId) \
-        (IRO[287].base + ((pfId) * IRO[287].m1))
+        (IRO[288].base + ((pfId) * IRO[288].m1))
 #define XSTORM_RATE_SHAPING_PER_VN_VARS_OFFSET(pfId) \
         (IRO[44].base + ((pfId) * IRO[44].m1))
 #define XSTORM_RECORD_SLOW_PATH_OFFSET(funcId) \
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
index 71e5bd00e8b..ff882a48209 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
@@ -1340,7 +1340,14 @@ static void bnx2x_update_pfc_xmac(struct link_params *params,
                 pfc1_val |= XMAC_PFC_CTRL_HI_REG_PFC_REFRESH_EN |
                         XMAC_PFC_CTRL_HI_REG_PFC_STATS_EN |
                         XMAC_PFC_CTRL_HI_REG_RX_PFC_EN |
-                        XMAC_PFC_CTRL_HI_REG_TX_PFC_EN;
+                        XMAC_PFC_CTRL_HI_REG_TX_PFC_EN |
+                        XMAC_PFC_CTRL_HI_REG_FORCE_PFC_XON;
+                /* Write pause and PFC registers */
+                REG_WR(bp, xmac_base + XMAC_REG_PAUSE_CTRL, pause_val);
+                REG_WR(bp, xmac_base + XMAC_REG_PFC_CTRL, pfc0_val);
+                REG_WR(bp, xmac_base + XMAC_REG_PFC_CTRL_HI, pfc1_val);
+                pfc1_val &= ~XMAC_PFC_CTRL_HI_REG_FORCE_PFC_XON;
+
         }
 
         /* Write pause and PFC registers */
@@ -3574,6 +3581,33 @@ static void bnx2x_ext_phy_update_adv_fc(struct bnx2x_phy *phy,
         if (phy->type == PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM54618SE) {
                 bnx2x_cl22_read(bp, phy, 0x4, &ld_pause);
                 bnx2x_cl22_read(bp, phy, 0x5, &lp_pause);
+        } else if (CHIP_IS_E3(bp) &&
+                SINGLE_MEDIA_DIRECT(params)) {
+                u8 lane = bnx2x_get_warpcore_lane(phy, params);
+                u16 gp_status, gp_mask;
+                bnx2x_cl45_read(bp, phy,
+                                MDIO_AN_DEVAD, MDIO_WC_REG_GP2_STATUS_GP_2_4,
+                                &gp_status);
+                gp_mask = (MDIO_WC_REG_GP2_STATUS_GP_2_4_CL73_AN_CMPL |
+                           MDIO_WC_REG_GP2_STATUS_GP_2_4_CL37_LP_AN_CAP) <<
+                        lane;
+                if ((gp_status & gp_mask) == gp_mask) {
+                        bnx2x_cl45_read(bp, phy, MDIO_AN_DEVAD,
+                                        MDIO_AN_REG_ADV_PAUSE, &ld_pause);
+                        bnx2x_cl45_read(bp, phy, MDIO_AN_DEVAD,
+                                        MDIO_AN_REG_LP_AUTO_NEG, &lp_pause);
+                } else {
+                        bnx2x_cl45_read(bp, phy, MDIO_AN_DEVAD,
+                                        MDIO_AN_REG_CL37_FC_LD, &ld_pause);
+                        bnx2x_cl45_read(bp, phy, MDIO_AN_DEVAD,
+                                        MDIO_AN_REG_CL37_FC_LP, &lp_pause);
+                        ld_pause = ((ld_pause &
+                                     MDIO_COMBO_IEEE0_AUTO_NEG_ADV_PAUSE_BOTH)
+                                    << 3);
+                        lp_pause = ((lp_pause &
+                                     MDIO_COMBO_IEEE0_AUTO_NEG_ADV_PAUSE_BOTH)
+                                    << 3);
+                }
         } else {
                 bnx2x_cl45_read(bp, phy,
                                 MDIO_AN_DEVAD,
@@ -3625,7 +3659,23 @@ static void bnx2x_warpcore_enable_AN_KR(struct bnx2x_phy *phy,
         u16 val16 = 0, lane, bam37 = 0;
         struct bnx2x *bp = params->bp;
         DP(NETIF_MSG_LINK, "Enable Auto Negotiation for KR\n");
-
+        /* Set to default registers that may be overriden by 10G force */
+        bnx2x_cl45_write(bp, phy, MDIO_WC_DEVAD,
+                         MDIO_WC_REG_SERDESDIGITAL_CONTROL1000X2, 0x7);
+        bnx2x_cl45_write(bp, phy, MDIO_AN_DEVAD,
+                         MDIO_WC_REG_PAR_DET_10G_CTRL, 0);
+        bnx2x_cl45_write(bp, phy, MDIO_WC_DEVAD,
+                         MDIO_WC_REG_CL72_USERB0_CL72_MISC1_CONTROL, 0);
+        bnx2x_cl45_write(bp, phy, MDIO_WC_DEVAD,
+                        MDIO_WC_REG_XGXSBLK1_LANECTRL0, 0xff);
+        bnx2x_cl45_write(bp, phy, MDIO_WC_DEVAD,
+                        MDIO_WC_REG_XGXSBLK1_LANECTRL1, 0x5555);
+        bnx2x_cl45_write(bp, phy, MDIO_PMA_DEVAD,
+                         MDIO_WC_REG_IEEE0BLK_AUTONEGNP, 0x0);
+        bnx2x_cl45_write(bp, phy, MDIO_WC_DEVAD,
+                         MDIO_WC_REG_RX66_CONTROL, 0x7415);
+        bnx2x_cl45_write(bp, phy, MDIO_WC_DEVAD,
+                         MDIO_WC_REG_SERDESDIGITAL_MISC2, 0x6190);
         /* Disable Autoneg: re-enable it after adv is done. */
         bnx2x_cl45_write(bp, phy, MDIO_AN_DEVAD,
                          MDIO_WC_REG_IEEE0BLK_MIICNTL, 0);
@@ -3868,13 +3918,13 @@ static void bnx2x_warpcore_set_10G_XFI(struct bnx2x_phy *phy,
 
         } else {
                 misc1_val |= 0x9;
-                tap_val = ((0x12 << MDIO_WC_REG_TX_FIR_TAP_POST_TAP_OFFSET) |
-                           (0x2d << MDIO_WC_REG_TX_FIR_TAP_MAIN_TAP_OFFSET) |
-                           (0x00 << MDIO_WC_REG_TX_FIR_TAP_PRE_TAP_OFFSET));
+                tap_val = ((0x0f << MDIO_WC_REG_TX_FIR_TAP_POST_TAP_OFFSET) |
+                           (0x2b << MDIO_WC_REG_TX_FIR_TAP_MAIN_TAP_OFFSET) |
+                           (0x02 << MDIO_WC_REG_TX_FIR_TAP_PRE_TAP_OFFSET));
                 tx_driver_val =
-                      ((0x02 << MDIO_WC_REG_TX0_TX_DRIVER_POST2_COEFF_OFFSET) |
+                      ((0x03 << MDIO_WC_REG_TX0_TX_DRIVER_POST2_COEFF_OFFSET) |
                        (0x02 << MDIO_WC_REG_TX0_TX_DRIVER_IDRIVER_OFFSET) |
-                       (0x02 << MDIO_WC_REG_TX0_TX_DRIVER_IPRE_DRIVER_OFFSET));
+                       (0x06 << MDIO_WC_REG_TX0_TX_DRIVER_IPRE_DRIVER_OFFSET));
         }
         bnx2x_cl45_write(bp, phy, MDIO_WC_DEVAD,
                          MDIO_WC_REG_SERDESDIGITAL_MISC1, misc1_val);
@@ -4290,7 +4340,7 @@ static void bnx2x_warpcore_config_init(struct bnx2x_phy *phy,
                 switch (serdes_net_if) {
                 case PORT_HW_CFG_NET_SERDES_IF_KR:
                         /* Enable KR Auto Neg */
-                        if (params->loopback_mode == LOOPBACK_NONE)
+                        if (params->loopback_mode != LOOPBACK_EXT)
                                 bnx2x_warpcore_enable_AN_KR(phy, params, vars);
                         else {
                                 DP(NETIF_MSG_LINK, "Setting KR 10G-Force\n");
@@ -6076,12 +6126,14 @@ int bnx2x_set_led(struct link_params *params,
 
                 tmp = EMAC_RD(bp, EMAC_REG_EMAC_LED);
                 if (params->phy[EXT_PHY1].type ==
-                          PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM54618SE)
-                        EMAC_WR(bp, EMAC_REG_EMAC_LED, tmp & 0xfff1);
-                else {
-                        EMAC_WR(bp, EMAC_REG_EMAC_LED,
-                                (tmp | EMAC_LED_OVERRIDE));
-                }
+                        PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM54618SE)
+                        tmp &= ~(EMAC_LED_1000MB_OVERRIDE |
+                                EMAC_LED_100MB_OVERRIDE |
+                                EMAC_LED_10MB_OVERRIDE);
+                else
+                        tmp |= EMAC_LED_OVERRIDE;
+
+                EMAC_WR(bp, EMAC_REG_EMAC_LED, tmp);
                 break;
 
         case LED_MODE_OPER:
@@ -6131,10 +6183,15 @@ int bnx2x_set_led(struct link_params *params,
                                        hw_led_mode);
                 } else if ((params->phy[EXT_PHY1].type ==
                             PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM54618SE) &&
-                           (mode != LED_MODE_OPER)) {
+                           (mode == LED_MODE_ON)) {
                         REG_WR(bp, NIG_REG_LED_MODE_P0 + port*4, 0);
                         tmp = EMAC_RD(bp, EMAC_REG_EMAC_LED);
-                        EMAC_WR(bp, EMAC_REG_EMAC_LED, tmp | 0x3);
+                        EMAC_WR(bp, EMAC_REG_EMAC_LED, tmp |
+                                EMAC_LED_OVERRIDE | EMAC_LED_1000MB_OVERRIDE);
+                        /* Break here; otherwise, it'll disable the
+                         * intended override.
+                         */
+                        break;
                 } else
                         REG_WR(bp, NIG_REG_LED_MODE_P0 + port*4,
                                hw_led_mode);
@@ -6149,13 +6206,9 @@ int bnx2x_set_led(struct link_params *params,
                                LED_BLINK_RATE_VAL_E1X_E2);
                 REG_WR(bp, NIG_REG_LED_CONTROL_BLINK_RATE_ENA_P0 +
                        port*4, 1);
-                if ((params->phy[EXT_PHY1].type !=
-                     PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM54618SE) &&
-                    (mode != LED_MODE_OPER)) {
-                        tmp = EMAC_RD(bp, EMAC_REG_EMAC_LED);
-                        EMAC_WR(bp, EMAC_REG_EMAC_LED,
-                                (tmp & (~EMAC_LED_OVERRIDE)));
-                }
+                tmp = EMAC_RD(bp, EMAC_REG_EMAC_LED);
+                EMAC_WR(bp, EMAC_REG_EMAC_LED,
+                        (tmp & (~EMAC_LED_OVERRIDE)));
 
                 if (CHIP_IS_E1(bp) &&
                     ((speed == SPEED_2500) ||
@@ -6736,6 +6789,12 @@ int bnx2x_link_update(struct link_params *params, struct link_vars *vars)
                           SINGLE_MEDIA_DIRECT(params)) &&
                          (phy_vars[active_external_phy].fault_detected == 0));
 
+        /* Update the PFC configuration in case it was changed */
+        if (params->feature_config_flags & FEATURE_CONFIG_PFC_ENABLED)
+                vars->link_status |= LINK_STATUS_PFC_ENABLED;
+        else
+                vars->link_status &= ~LINK_STATUS_PFC_ENABLED;
+
         if (vars->link_up)
                 rc = bnx2x_update_link_up(params, vars, link_10g_plus);
         else
@@ -7909,7 +7968,9 @@ static int bnx2x_verify_sfp_module(struct bnx2x_phy *phy,
         netdev_err(bp->dev,  "Warning: Unqualified SFP+ module detected,"
                               " Port %d from %s part number %s\n",
                          params->port, vendor_name, vendor_pn);
-        phy->flags |= FLAGS_SFP_NOT_APPROVED;
+        if ((val & PORT_FEAT_CFG_OPT_MDL_ENFRCMNT_MASK) !=
+            PORT_FEAT_CFG_OPT_MDL_ENFRCMNT_WARNING_MSG)
+                phy->flags |= FLAGS_SFP_NOT_APPROVED;
         return -EINVAL;
 }
 
@@ -8948,6 +9009,12 @@ static int bnx2x_8727_config_init(struct bnx2x_phy *phy,
                 tmp2 &= 0xFFEF;
                 bnx2x_cl45_write(bp, phy,
                         MDIO_PMA_DEVAD, MDIO_PMA_REG_8727_OPT_CFG_REG, tmp2);
+                bnx2x_cl45_read(bp, phy,
+                                MDIO_PMA_DEVAD, MDIO_PMA_REG_PHY_IDENTIFIER,
+                                &tmp2);
+                bnx2x_cl45_write(bp, phy,
+                                 MDIO_PMA_DEVAD, MDIO_PMA_REG_PHY_IDENTIFIER,
+                                 (tmp2 & 0x7fff));
         }
 
         return 0;
@@ -9123,12 +9190,11 @@ static u8 bnx2x_8727_read_status(struct bnx2x_phy *phy,
                                  MDIO_PMA_DEVAD, MDIO_PMA_LASI_RXCTRL,
                                  ((1<<5) | (1<<2)));
         }
-        DP(NETIF_MSG_LINK, "Enabling 8727 TX laser if SFP is approved\n");
-        bnx2x_8727_specific_func(phy, params, ENABLE_TX);
-        /* If transmitter is disabled, ignore false link up indication */
-        bnx2x_cl45_read(bp, phy,
-                        MDIO_PMA_DEVAD, MDIO_PMA_REG_PHY_IDENTIFIER, &val1);
-        if (val1 & (1<<15)) {
+
+        if (!(phy->flags & FLAGS_SFP_NOT_APPROVED)) {
+                DP(NETIF_MSG_LINK, "Enabling 8727 TX laser\n");
+                bnx2x_sfp_set_transmitter(params, phy, 1);
+        } else {
                 DP(NETIF_MSG_LINK, "Tx is disabled\n");
                 return 0;
         }
@@ -9220,8 +9286,7 @@ static void bnx2x_save_848xx_spirom_version(struct bnx2x_phy *phy,
 
         if (phy->type == PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM84833) {
                 bnx2x_cl45_read(bp, phy, MDIO_CTL_DEVAD, 0x400f, &fw_ver1);
-                bnx2x_save_spirom_version(bp, port,
-                                ((fw_ver1 & 0xf000)>>5) | (fw_ver1 & 0x7f),
+                bnx2x_save_spirom_version(bp, port, fw_ver1 & 0xfff,
                                 phy->ver_addr);
         } else {
                 /* For 32-bit registers in 848xx, access via MDIO2ARM i/f. */
@@ -9642,6 +9707,15 @@ static int bnx2x_84833_hw_reset_phy(struct bnx2x_phy *phy,
                                 other_shmem_base_addr));
 
         u32 shmem_base_path[2];
+
+        /* Work around for 84833 LED failure inside RESET status */
+        bnx2x_cl45_write(bp, phy, MDIO_AN_DEVAD,
+                MDIO_AN_REG_8481_LEGACY_MII_CTRL,
+                MDIO_AN_REG_8481_MII_CTRL_FORCE_1G);
+        bnx2x_cl45_write(bp, phy, MDIO_AN_DEVAD,
+                MDIO_AN_REG_8481_1G_100T_EXT_CTRL,
+                MIDO_AN_REG_8481_EXT_CTRL_FORCE_LEDS_OFF);
+
         shmem_base_path[0] = params->shmem_base;
         shmem_base_path[1] = other_shmem_base_addr;
 
@@ -9951,7 +10025,7 @@ static void bnx2x_848x3_link_reset(struct bnx2x_phy *phy,
         u8 port;
         u16 val16;
 
-        if (!(CHIP_IS_E1(bp)))
+        if (!(CHIP_IS_E1x(bp)))
                 port = BP_PATH(bp);
         else
                 port = params->port;
@@ -9978,7 +10052,7 @@ static void bnx2x_848xx_set_link_led(struct bnx2x_phy *phy,
         u16 val;
         u8 port;
 
-        if (!(CHIP_IS_E1(bp)))
+        if (!(CHIP_IS_E1x(bp)))
                 port = BP_PATH(bp);
         else
                 port = params->port;
@@ -11893,6 +11967,9 @@ int bnx2x_phy_init(struct link_params *params, struct link_vars *vars)
 
         bnx2x_emac_init(params, vars);
 
+        if (params->feature_config_flags & FEATURE_CONFIG_PFC_ENABLED)
+                vars->link_status |= LINK_STATUS_PFC_ENABLED;
+
         if (params->num_phys == 0) {
                 DP(NETIF_MSG_LINK, "No phy found for initialization !!\n");
                 return -EINVAL;
@@ -11973,10 +12050,10 @@ int bnx2x_link_reset(struct link_params *params, struct link_vars *vars,
          * Hold it as vars low
          */
          /* clear link led */
+        bnx2x_set_mdio_clk(bp, params->chip_id, port);
         bnx2x_set_led(params, vars, LED_MODE_OFF, 0);
 
         if (reset_ext_phy) {
-                bnx2x_set_mdio_clk(bp, params->chip_id, port);
                 for (phy_index = EXT_PHY1; phy_index < params->num_phys;
                       phy_index++) {
                         if (params->phy[phy_index].link_reset) {
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_reg.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_reg.h
index 4532172c9fd..bbd387492a8 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_reg.h
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_reg.h
@@ -5359,6 +5359,7 @@
 #define XMAC_CTRL_REG_TX_EN                                      (0x1<<0)
 #define XMAC_PAUSE_CTRL_REG_RX_PAUSE_EN                          (0x1<<18)
 #define XMAC_PAUSE_CTRL_REG_TX_PAUSE_EN                          (0x1<<17)
+#define XMAC_PFC_CTRL_HI_REG_FORCE_PFC_XON                       (0x1<<1)
 #define XMAC_PFC_CTRL_HI_REG_PFC_REFRESH_EN                      (0x1<<0)
 #define XMAC_PFC_CTRL_HI_REG_PFC_STATS_EN                        (0x1<<3)
 #define XMAC_PFC_CTRL_HI_REG_RX_PFC_EN                           (0x1<<4)
@@ -6825,10 +6826,13 @@ Theotherbitsarereservedandshouldbezero*/
 
 #define MDIO_AN_REG_8481_10GBASE_T_AN_CTRL      0x0020
 #define MDIO_AN_REG_8481_LEGACY_MII_CTRL        0xffe0
+#define MDIO_AN_REG_8481_MII_CTRL_FORCE_1G      0x40
 #define MDIO_AN_REG_8481_LEGACY_MII_STATUS      0xffe1
 #define MDIO_AN_REG_8481_LEGACY_AN_ADV          0xffe4
 #define MDIO_AN_REG_8481_LEGACY_AN_EXPANSION    0xffe6
 #define MDIO_AN_REG_8481_1000T_CTRL             0xffe9
+#define MDIO_AN_REG_8481_1G_100T_EXT_CTRL       0xfff0
+#define MIDO_AN_REG_8481_EXT_CTRL_FORCE_LEDS_OFF        0x0008
 #define MDIO_AN_REG_8481_EXPANSION_REG_RD_RW    0xfff5
 #define MDIO_AN_REG_8481_EXPANSION_REG_ACCESS   0xfff7
 #define MDIO_AN_REG_8481_AUX_CTRL               0xfff8
@@ -6948,6 +6952,10 @@ Theotherbitsarereservedandshouldbezero*/
 #define MDIO_WC_REG_GP2_STATUS_GP_2_2                   0x81d2
 #define MDIO_WC_REG_GP2_STATUS_GP_2_3                   0x81d3
 #define MDIO_WC_REG_GP2_STATUS_GP_2_4                   0x81d4
+#define MDIO_WC_REG_GP2_STATUS_GP_2_4_CL73_AN_CMPL 0x1000
+#define MDIO_WC_REG_GP2_STATUS_GP_2_4_CL37_AN_CMPL 0x0100
+#define MDIO_WC_REG_GP2_STATUS_GP_2_4_CL37_LP_AN_CAP 0x0010
+#define MDIO_WC_REG_GP2_STATUS_GP_2_4_CL37_AN_CAP 0x1
 #define MDIO_WC_REG_UC_INFO_B0_DEAD_TRAP                0x81EE
 #define MDIO_WC_REG_UC_INFO_B1_VERSION                  0x81F0
 #define MDIO_WC_REG_UC_INFO_B1_FIRMWARE_MODE            0x81F2
diff --git a/drivers/net/ethernet/broadcom/tg3.c b/drivers/net/ethernet/broadcom/tg3.c
index 86097981e1e..0c3e7c70ffb 100644
--- a/drivers/net/ethernet/broadcom/tg3.c
+++ b/drivers/net/ethernet/broadcom/tg3.c
@@ -48,7 +48,6 @@
 #include <net/checksum.h>
 #include <net/ip.h>
 
-#include <asm/system.h>
 #include <linux/io.h>
 #include <asm/byteorder.h>
 #include <linux/uaccess.h>
@@ -2779,7 +2778,9 @@ static void tg3_power_down_phy(struct tg3 *tp, bool do_low_power)
         if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5700 ||
             GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5704 ||
             (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5780 &&
-             (tp->phy_flags & TG3_PHYFLG_MII_SERDES)))
+             (tp->phy_flags & TG3_PHYFLG_MII_SERDES)) ||
+            (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5717 &&
+             !tp->pci_fn))
                 return;
 
         if (GET_CHIP_REV(tp->pci_chip_rev_id) == CHIPREV_5784_AX ||
diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
index 05ff076af06..b126b98065a 100644
--- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
+++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
@@ -2000,13 +2000,6 @@ static const struct ethtool_ops cxgb_ethtool_ops = {
 /*
  * debugfs support
  */
-
-static int mem_open(struct inode *inode, struct file *file)
-{
-        file->private_data = inode->i_private;
-        return 0;
-}
-
 static ssize_t mem_read(struct file *file, char __user *buf, size_t count,
                         loff_t *ppos)
 {
@@ -2050,7 +2043,7 @@ static ssize_t mem_read(struct file *file, char __user *buf, size_t count,
 
 static const struct file_operations mem_debugfs_fops = {
         .owner   = THIS_MODULE,
-        .open    = mem_open,
+        .open    = simple_open,
         .read    = mem_read,
         .llseek  = default_llseek,
 };
diff --git a/drivers/net/ethernet/cirrus/cs89x0.c b/drivers/net/ethernet/cirrus/cs89x0.c
index 30fee428c48..b9406cbfc18 100644
--- a/drivers/net/ethernet/cirrus/cs89x0.c
+++ b/drivers/net/ethernet/cirrus/cs89x0.c
@@ -148,7 +148,6 @@
 #include <linux/delay.h>
 #include <linux/gfp.h>
 
-#include <asm/system.h>
 #include <asm/io.h>
 #include <asm/irq.h>
 #include <linux/atomic.h>
diff --git a/drivers/net/ethernet/cirrus/mac89x0.c b/drivers/net/ethernet/cirrus/mac89x0.c
index 932fdccc339..e285f384b09 100644
--- a/drivers/net/ethernet/cirrus/mac89x0.c
+++ b/drivers/net/ethernet/cirrus/mac89x0.c
@@ -99,7 +99,6 @@ static char *version =
 #include <linux/bitops.h>
 #include <linux/gfp.h>
 
-#include <asm/system.h>
 #include <asm/io.h>
 #include <asm/hwtest.h>
 #include <asm/macints.h>
diff --git a/drivers/net/ethernet/dlink/de600.c b/drivers/net/ethernet/dlink/de600.c
index 682750c052c..414f0eea104 100644
--- a/drivers/net/ethernet/dlink/de600.c
+++ b/drivers/net/ethernet/dlink/de600.c
@@ -46,7 +46,6 @@ static const char version[] = "de600.c: $Revision: 1.41-2.5 $,  Bjorn Ekwall (bj
 #include <linux/interrupt.h>
 #include <linux/ioport.h>
 #include <linux/in.h>
-#include <asm/system.h>
 #include <linux/errno.h>
 #include <linux/init.h>
 #include <linux/delay.h>
diff --git a/drivers/net/ethernet/dlink/de620.c b/drivers/net/ethernet/dlink/de620.c
index afc5aaac6b6..2e2bc60ee81 100644
--- a/drivers/net/ethernet/dlink/de620.c
+++ b/drivers/net/ethernet/dlink/de620.c
@@ -122,7 +122,6 @@ static const char version[] =
 #include <linux/skbuff.h>
 
 #include <asm/io.h>
-#include <asm/system.h>
 
 /* Constant definitions for the DE-620 registers, commands and bits */
 #include "de620.h"
diff --git a/drivers/net/ethernet/freescale/ucc_geth.c b/drivers/net/ethernet/freescale/ucc_geth.c
index 4e3cd2f8deb..17a46e76123 100644
--- a/drivers/net/ethernet/freescale/ucc_geth.c
+++ b/drivers/net/ethernet/freescale/ucc_geth.c
@@ -3945,6 +3945,8 @@ static int ucc_geth_probe(struct platform_device* ofdev)
                 }
 
         if (max_speed == SPEED_1000) {
+                unsigned int snums = qe_get_num_of_snums();
+
                 /* configure muram FIFOs for gigabit operation */
                 ug_info->uf_info.urfs = UCC_GETH_URFS_GIGA_INIT;
                 ug_info->uf_info.urfet = UCC_GETH_URFET_GIGA_INIT;
@@ -3954,11 +3956,11 @@ static int ucc_geth_probe(struct platform_device* ofdev)
                 ug_info->uf_info.utftt = UCC_GETH_UTFTT_GIGA_INIT;
                 ug_info->numThreadsTx = UCC_GETH_NUM_OF_THREADS_4;
 
-                /* If QE's snum number is 46 which means we need to support
+                /* If QE's snum number is 46/76 which means we need to support
                  * 4 UECs at 1000Base-T simultaneously, we need to allocate
                  * more Threads to Rx.
                  */
-                if (qe_get_num_of_snums() == 46)
+                if ((snums == 76) || (snums == 46))
                         ug_info->numThreadsRx = UCC_GETH_NUM_OF_THREADS_6;
                 else
                         ug_info->numThreadsRx = UCC_GETH_NUM_OF_THREADS_4;
diff --git a/drivers/net/ethernet/fujitsu/at1700.c b/drivers/net/ethernet/fujitsu/at1700.c
index 586b46fd4ee..3d94797c8f9 100644
--- a/drivers/net/ethernet/fujitsu/at1700.c
+++ b/drivers/net/ethernet/fujitsu/at1700.c
@@ -52,7 +52,6 @@
 #include <linux/crc32.h>
 #include <linux/bitops.h>
 
-#include <asm/system.h>
 #include <asm/io.h>
 #include <asm/dma.h>
 
diff --git a/drivers/net/ethernet/fujitsu/eth16i.c b/drivers/net/ethernet/fujitsu/eth16i.c
index c3f0178fb5c..a992d1f7e0d 100644
--- a/drivers/net/ethernet/fujitsu/eth16i.c
+++ b/drivers/net/ethernet/fujitsu/eth16i.c
@@ -163,7 +163,6 @@ static char *version =
 #include <linux/jiffies.h>
 #include <linux/io.h>
 
-#include <asm/system.h>
 #include <asm/dma.h>
 
 
diff --git a/drivers/net/ethernet/fujitsu/fmvj18x_cs.c b/drivers/net/ethernet/fujitsu/fmvj18x_cs.c
index 0230319ddb5..2418faf2251 100644
--- a/drivers/net/ethernet/fujitsu/fmvj18x_cs.c
+++ b/drivers/net/ethernet/fujitsu/fmvj18x_cs.c
@@ -57,7 +57,6 @@
 
 #include <asm/uaccess.h>
 #include <asm/io.h>
-#include <asm/system.h>
 
 /*====================================================================*/
 
diff --git a/drivers/net/ethernet/i825xx/3c507.c b/drivers/net/ethernet/i825xx/3c507.c
index ed6925f1147..e8984b05990 100644
--- a/drivers/net/ethernet/i825xx/3c507.c
+++ b/drivers/net/ethernet/i825xx/3c507.c
@@ -63,7 +63,6 @@ static const char version[] =
 
 #include <asm/dma.h>
 #include <asm/io.h>
-#include <asm/system.h>
 #include <asm/uaccess.h>
 
 /* use 0 for production, 1 for verification, 2..7 for debug */
diff --git a/drivers/net/ethernet/i825xx/3c527.c b/drivers/net/ethernet/i825xx/3c527.c
index ef43f3e951c..278e791afe0 100644
--- a/drivers/net/ethernet/i825xx/3c527.c
+++ b/drivers/net/ethernet/i825xx/3c527.c
@@ -106,7 +106,6 @@ DRV_NAME ".c:v" DRV_VERSION " " DRV_RELDATE " Richard Procter <rnp@paradise.net.
 #include <linux/semaphore.h>
 
 #include <asm/uaccess.h>
-#include <asm/system.h>
 #include <asm/io.h>
 #include <asm/dma.h>
 
diff --git a/drivers/net/ethernet/i825xx/eepro.c b/drivers/net/ethernet/i825xx/eepro.c
index 7a4ad4a0791..7f49fd54c52 100644
--- a/drivers/net/ethernet/i825xx/eepro.c
+++ b/drivers/net/ethernet/i825xx/eepro.c
@@ -148,7 +148,6 @@ static const char version[] =
 #include <linux/bitops.h>
 #include <linux/ethtool.h>
 
-#include <asm/system.h>
 #include <asm/io.h>
 #include <asm/dma.h>
 
diff --git a/drivers/net/ethernet/i825xx/eexpress.c b/drivers/net/ethernet/i825xx/eexpress.c
index 3fc649e54a3..cc2e66ad443 100644
--- a/drivers/net/ethernet/i825xx/eexpress.c
+++ b/drivers/net/ethernet/i825xx/eexpress.c
@@ -116,7 +116,6 @@
 #include <linux/bitops.h>
 #include <linux/jiffies.h>
 
-#include <asm/system.h>
 #include <asm/io.h>
 #include <asm/irq.h>
 
diff --git a/drivers/net/ethernet/i825xx/ether1.c b/drivers/net/ethernet/i825xx/ether1.c
index 406a12b4640..067db3f13e9 100644
--- a/drivers/net/ethernet/i825xx/ether1.c
+++ b/drivers/net/ethernet/i825xx/ether1.c
@@ -48,7 +48,6 @@
 #include <linux/skbuff.h>
 #include <linux/bitops.h>
 
-#include <asm/system.h>
 #include <asm/io.h>
 #include <asm/dma.h>
 #include <asm/ecard.h>
diff --git a/drivers/net/ethernet/i825xx/znet.c b/drivers/net/ethernet/i825xx/znet.c
index a43649735a0..bd1f1ef91e1 100644
--- a/drivers/net/ethernet/i825xx/znet.c
+++ b/drivers/net/ethernet/i825xx/znet.c
@@ -100,7 +100,6 @@
 #include <linux/if_arp.h>
 #include <linux/bitops.h>
 
-#include <asm/system.h>
 #include <asm/io.h>
 #include <asm/dma.h>
 
diff --git a/drivers/net/ethernet/ibm/ibmveth.c b/drivers/net/ethernet/ibm/ibmveth.c
index e877371680a..9010cea68bc 100644
--- a/drivers/net/ethernet/ibm/ibmveth.c
+++ b/drivers/net/ethernet/ibm/ibmveth.c
@@ -1616,11 +1616,8 @@ static struct vio_driver ibmveth_driver = {
         .probe          = ibmveth_probe,
         .remove         = ibmveth_remove,
         .get_desired_dma = ibmveth_get_desired_dma,
-        .driver         = {
-                .name   = ibmveth_driver_name,
-                .owner  = THIS_MODULE,
-                .pm = &ibmveth_pm_ops,
-        }
+        .name           = ibmveth_driver_name,
+        .pm             = &ibmveth_pm_ops,
 };
 
 static int __init ibmveth_module_init(void)
diff --git a/drivers/net/ethernet/intel/e1000e/e1000.h b/drivers/net/ethernet/intel/e1000e/e1000.h
index 86cdd479399..b83897f76ee 100644
--- a/drivers/net/ethernet/intel/e1000e/e1000.h
+++ b/drivers/net/ethernet/intel/e1000e/e1000.h
@@ -161,6 +161,12 @@ struct e1000_info;
 /* Time to wait before putting the device into D3 if there's no link (in ms). */
 #define LINK_TIMEOUT            100
 
+/*
+ * Count for polling __E1000_RESET condition every 10-20msec.
+ * Experimentation has shown the reset can take approximately 210msec.
+ */
+#define E1000_CHECK_RESET_COUNT         25
+
 #define DEFAULT_RDTR                    0
 #define DEFAULT_RADV                    8
 #define BURST_RDTR                      0x20
diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c
index f88dac614de..851f7937db2 100644
--- a/drivers/net/ethernet/intel/e1000e/netdev.c
+++ b/drivers/net/ethernet/intel/e1000e/netdev.c
@@ -1060,6 +1060,13 @@ static void e1000_print_hw_hang(struct work_struct *work)
                 ew32(TIDV, adapter->tx_int_delay | E1000_TIDV_FPD);
                 /* execute the writes immediately */
                 e1e_flush();
+                /*
+                 * Due to rare timing issues, write to TIDV again to ensure
+                 * the write is successful
+                 */
+                ew32(TIDV, adapter->tx_int_delay | E1000_TIDV_FPD);
+                /* execute the writes immediately */
+                e1e_flush();
                 adapter->tx_hang_recheck = true;
                 return;
         }
@@ -3615,6 +3622,16 @@ static void e1000e_flush_descriptors(struct e1000_adapter *adapter)
 
         /* execute the writes immediately */
         e1e_flush();
+
+        /*
+         * due to rare timing issues, write to TIDV/RDTR again to ensure the
+         * write is successful
+         */
+        ew32(TIDV, adapter->tx_int_delay | E1000_TIDV_FPD);
+        ew32(RDTR, adapter->rx_int_delay | E1000_RDTR_FPD);
+
+        /* execute the writes immediately */
+        e1e_flush();
 }
 
 static void e1000e_update_stats(struct e1000_adapter *adapter);
@@ -3967,6 +3984,10 @@ static int e1000_close(struct net_device *netdev)
 {
         struct e1000_adapter *adapter = netdev_priv(netdev);
         struct pci_dev *pdev = adapter->pdev;
+        int count = E1000_CHECK_RESET_COUNT;
+
+        while (test_bit(__E1000_RESETTING, &adapter->state) && count--)
+                usleep_range(10000, 20000);
 
         WARN_ON(test_bit(__E1000_RESETTING, &adapter->state));
 
@@ -5471,6 +5492,11 @@ static int __e1000_shutdown(struct pci_dev *pdev, bool *enable_wake,
         netif_device_detach(netdev);
 
         if (netif_running(netdev)) {
+                int count = E1000_CHECK_RESET_COUNT;
+
+                while (test_bit(__E1000_RESETTING, &adapter->state) && count--)
+                        usleep_range(10000, 20000);
+
                 WARN_ON(test_bit(__E1000_RESETTING, &adapter->state));
                 e1000e_down(adapter);
                 e1000_free_irq(adapter);
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_nl.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_nl.c
index dde65f95140..652e4b09546 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_nl.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_nl.c
@@ -44,62 +44,94 @@
 #define DCB_NO_HW_CHG   1  /* DCB configuration did not change */
 #define DCB_HW_CHG      2  /* DCB configuration changed, no reset */
 
-int ixgbe_copy_dcb_cfg(struct ixgbe_dcb_config *src_dcb_cfg,
-                       struct ixgbe_dcb_config *dst_dcb_cfg, int tc_max)
+int ixgbe_copy_dcb_cfg(struct ixgbe_dcb_config *scfg,
+                       struct ixgbe_dcb_config *dcfg, int tc_max)
 {
-        struct tc_configuration *src_tc_cfg = NULL;
-        struct tc_configuration *dst_tc_cfg = NULL;
-        int i;
+        struct tc_configuration *src = NULL;
+        struct tc_configuration *dst = NULL;
+        int i, j;
+        int tx = DCB_TX_CONFIG;
+        int rx = DCB_RX_CONFIG;
+        int changes = 0;
 
-        if (!src_dcb_cfg || !dst_dcb_cfg)
-                return -EINVAL;
+        if (!scfg || !dcfg)
+                return changes;
 
         for (i = DCB_PG_ATTR_TC_0; i < tc_max + DCB_PG_ATTR_TC_0; i++) {
-                src_tc_cfg = &src_dcb_cfg->tc_config[i - DCB_PG_ATTR_TC_0];
-                dst_tc_cfg = &dst_dcb_cfg->tc_config[i - DCB_PG_ATTR_TC_0];
+                src = &scfg->tc_config[i - DCB_PG_ATTR_TC_0];
+                dst = &dcfg->tc_config[i - DCB_PG_ATTR_TC_0];
 
-                dst_tc_cfg->path[DCB_TX_CONFIG].prio_type =
-                                src_tc_cfg->path[DCB_TX_CONFIG].prio_type;
+                if (dst->path[tx].prio_type != src->path[tx].prio_type) {
+                        dst->path[tx].prio_type = src->path[tx].prio_type;
+                        changes |= BIT_PG_TX;
+                }
 
-                dst_tc_cfg->path[DCB_TX_CONFIG].bwg_id =
-                                src_tc_cfg->path[DCB_TX_CONFIG].bwg_id;
+                if (dst->path[tx].bwg_id != src->path[tx].bwg_id) {
+                        dst->path[tx].bwg_id = src->path[tx].bwg_id;
+                        changes |= BIT_PG_TX;
+                }
 
-                dst_tc_cfg->path[DCB_TX_CONFIG].bwg_percent =
-                                src_tc_cfg->path[DCB_TX_CONFIG].bwg_percent;
+                if (dst->path[tx].bwg_percent != src->path[tx].bwg_percent) {
+                        dst->path[tx].bwg_percent = src->path[tx].bwg_percent;
+                        changes |= BIT_PG_TX;
+                }
 
-                dst_tc_cfg->path[DCB_TX_CONFIG].up_to_tc_bitmap =
-                                src_tc_cfg->path[DCB_TX_CONFIG].up_to_tc_bitmap;
+                if (dst->path[tx].up_to_tc_bitmap !=
+                                src->path[tx].up_to_tc_bitmap) {
+                        dst->path[tx].up_to_tc_bitmap =
+                                src->path[tx].up_to_tc_bitmap;
+                        changes |= (BIT_PG_TX | BIT_PFC | BIT_APP_UPCHG);
+                }
 
-                dst_tc_cfg->path[DCB_RX_CONFIG].prio_type =
-                                src_tc_cfg->path[DCB_RX_CONFIG].prio_type;
+                if (dst->path[rx].prio_type != src->path[rx].prio_type) {
+                        dst->path[rx].prio_type = src->path[rx].prio_type;
+                        changes |= BIT_PG_RX;
+                }
 
-                dst_tc_cfg->path[DCB_RX_CONFIG].bwg_id =
-                                src_tc_cfg->path[DCB_RX_CONFIG].bwg_id;
+                if (dst->path[rx].bwg_id != src->path[rx].bwg_id) {
+                        dst->path[rx].bwg_id = src->path[rx].bwg_id;
+                        changes |= BIT_PG_RX;
+                }
 
-                dst_tc_cfg->path[DCB_RX_CONFIG].bwg_percent =
-                                src_tc_cfg->path[DCB_RX_CONFIG].bwg_percent;
+                if (dst->path[rx].bwg_percent != src->path[rx].bwg_percent) {
+                        dst->path[rx].bwg_percent = src->path[rx].bwg_percent;
+                        changes |= BIT_PG_RX;
+                }
 
-                dst_tc_cfg->path[DCB_RX_CONFIG].up_to_tc_bitmap =
-                                src_tc_cfg->path[DCB_RX_CONFIG].up_to_tc_bitmap;
+                if (dst->path[rx].up_to_tc_bitmap !=
+                                src->path[rx].up_to_tc_bitmap) {
+                        dst->path[rx].up_to_tc_bitmap =
+                                src->path[rx].up_to_tc_bitmap;
+                        changes |= (BIT_PG_RX | BIT_PFC | BIT_APP_UPCHG);
+                }
         }
 
         for (i = DCB_PG_ATTR_BW_ID_0; i < DCB_PG_ATTR_BW_ID_MAX; i++) {
-                dst_dcb_cfg->bw_percentage[DCB_TX_CONFIG]
-                        [i-DCB_PG_ATTR_BW_ID_0] = src_dcb_cfg->bw_percentage
-                                [DCB_TX_CONFIG][i-DCB_PG_ATTR_BW_ID_0];
-                dst_dcb_cfg->bw_percentage[DCB_RX_CONFIG]
-                        [i-DCB_PG_ATTR_BW_ID_0] = src_dcb_cfg->bw_percentage
-                                [DCB_RX_CONFIG][i-DCB_PG_ATTR_BW_ID_0];
+                j = i - DCB_PG_ATTR_BW_ID_0;
+                if (dcfg->bw_percentage[tx][j] != scfg->bw_percentage[tx][j]) {
+                        dcfg->bw_percentage[tx][j] = scfg->bw_percentage[tx][j];
+                        changes |= BIT_PG_TX;
+                }
+                if (dcfg->bw_percentage[rx][j] != scfg->bw_percentage[rx][j]) {
+                        dcfg->bw_percentage[rx][j] = scfg->bw_percentage[rx][j];
+                        changes |= BIT_PG_RX;
+                }
         }
 
         for (i = DCB_PFC_UP_ATTR_0; i < DCB_PFC_UP_ATTR_MAX; i++) {
-                dst_dcb_cfg->tc_config[i - DCB_PFC_UP_ATTR_0].dcb_pfc =
-                        src_dcb_cfg->tc_config[i - DCB_PFC_UP_ATTR_0].dcb_pfc;
+                j = i - DCB_PFC_UP_ATTR_0;
+                if (dcfg->tc_config[j].dcb_pfc != scfg->tc_config[j].dcb_pfc) {
+                        dcfg->tc_config[j].dcb_pfc = scfg->tc_config[j].dcb_pfc;
+                        changes |= BIT_PFC;
+                }
         }
 
-        dst_dcb_cfg->pfc_mode_enable = src_dcb_cfg->pfc_mode_enable;
+        if (dcfg->pfc_mode_enable != scfg->pfc_mode_enable) {
+                dcfg->pfc_mode_enable = scfg->pfc_mode_enable;
+                changes |= BIT_PFC;
+        }
 
-        return 0;
+        return changes;
 }
 
 static u8 ixgbe_dcbnl_get_state(struct net_device *netdev)
@@ -179,20 +211,6 @@ static void ixgbe_dcbnl_set_pg_tc_cfg_tx(struct net_device *netdev, int tc,
         if (up_map != DCB_ATTR_VALUE_UNDEFINED)
                 adapter->temp_dcb_cfg.tc_config[tc].path[0].up_to_tc_bitmap =
                         up_map;
-
-        if ((adapter->temp_dcb_cfg.tc_config[tc].path[0].prio_type !=
-             adapter->dcb_cfg.tc_config[tc].path[0].prio_type) ||
-            (adapter->temp_dcb_cfg.tc_config[tc].path[0].bwg_id !=
-             adapter->dcb_cfg.tc_config[tc].path[0].bwg_id) ||
-            (adapter->temp_dcb_cfg.tc_config[tc].path[0].bwg_percent !=
-             adapter->dcb_cfg.tc_config[tc].path[0].bwg_percent) ||
-            (adapter->temp_dcb_cfg.tc_config[tc].path[0].up_to_tc_bitmap !=
-             adapter->dcb_cfg.tc_config[tc].path[0].up_to_tc_bitmap))
-                adapter->dcb_set_bitmap |= BIT_PG_TX;
-
-        if (adapter->temp_dcb_cfg.tc_config[tc].path[0].up_to_tc_bitmap !=
-             adapter->dcb_cfg.tc_config[tc].path[0].up_to_tc_bitmap)
-                adapter->dcb_set_bitmap |= BIT_PFC | BIT_APP_UPCHG;
 }
 
 static void ixgbe_dcbnl_set_pg_bwg_cfg_tx(struct net_device *netdev, int bwg_id,
@@ -201,10 +219,6 @@ static void ixgbe_dcbnl_set_pg_bwg_cfg_tx(struct net_device *netdev, int bwg_id,
         struct ixgbe_adapter *adapter = netdev_priv(netdev);
 
         adapter->temp_dcb_cfg.bw_percentage[0][bwg_id] = bw_pct;
-
-        if (adapter->temp_dcb_cfg.bw_percentage[0][bwg_id] !=
-            adapter->dcb_cfg.bw_percentage[0][bwg_id])
-                adapter->dcb_set_bitmap |= BIT_PG_TX;
 }
 
 static void ixgbe_dcbnl_set_pg_tc_cfg_rx(struct net_device *netdev, int tc,
@@ -223,20 +237,6 @@ static void ixgbe_dcbnl_set_pg_tc_cfg_rx(struct net_device *netdev, int tc,
         if (up_map != DCB_ATTR_VALUE_UNDEFINED)
                 adapter->temp_dcb_cfg.tc_config[tc].path[1].up_to_tc_bitmap =
                         up_map;
-
-        if ((adapter->temp_dcb_cfg.tc_config[tc].path[1].prio_type !=
-             adapter->dcb_cfg.tc_config[tc].path[1].prio_type) ||
-            (adapter->temp_dcb_cfg.tc_config[tc].path[1].bwg_id !=
-             adapter->dcb_cfg.tc_config[tc].path[1].bwg_id) ||
-            (adapter->temp_dcb_cfg.tc_config[tc].path[1].bwg_percent !=
-             adapter->dcb_cfg.tc_config[tc].path[1].bwg_percent) ||
-            (adapter->temp_dcb_cfg.tc_config[tc].path[1].up_to_tc_bitmap !=
-             adapter->dcb_cfg.tc_config[tc].path[1].up_to_tc_bitmap))
-                adapter->dcb_set_bitmap |= BIT_PG_RX;
-
-        if (adapter->temp_dcb_cfg.tc_config[tc].path[1].up_to_tc_bitmap !=
-             adapter->dcb_cfg.tc_config[tc].path[1].up_to_tc_bitmap)
-                adapter->dcb_set_bitmap |= BIT_PFC;
 }
 
 static void ixgbe_dcbnl_set_pg_bwg_cfg_rx(struct net_device *netdev, int bwg_id,
@@ -245,10 +245,6 @@ static void ixgbe_dcbnl_set_pg_bwg_cfg_rx(struct net_device *netdev, int bwg_id,
         struct ixgbe_adapter *adapter = netdev_priv(netdev);
 
         adapter->temp_dcb_cfg.bw_percentage[1][bwg_id] = bw_pct;
-
-        if (adapter->temp_dcb_cfg.bw_percentage[1][bwg_id] !=
-            adapter->dcb_cfg.bw_percentage[1][bwg_id])
-                adapter->dcb_set_bitmap |= BIT_PG_RX;
 }
 
 static void ixgbe_dcbnl_get_pg_tc_cfg_tx(struct net_device *netdev, int tc,
@@ -298,10 +294,8 @@ static void ixgbe_dcbnl_set_pfc_cfg(struct net_device *netdev, int priority,
 
         adapter->temp_dcb_cfg.tc_config[priority].dcb_pfc = setting;
         if (adapter->temp_dcb_cfg.tc_config[priority].dcb_pfc !=
-            adapter->dcb_cfg.tc_config[priority].dcb_pfc) {
-                adapter->dcb_set_bitmap |= BIT_PFC;
+            adapter->dcb_cfg.tc_config[priority].dcb_pfc)
                 adapter->temp_dcb_cfg.pfc_mode_enable = true;
-        }
 }
 
 static void ixgbe_dcbnl_get_pfc_cfg(struct net_device *netdev, int priority,
@@ -336,7 +330,8 @@ static void ixgbe_dcbnl_devreset(struct net_device *dev)
 static u8 ixgbe_dcbnl_set_all(struct net_device *netdev)
 {
         struct ixgbe_adapter *adapter = netdev_priv(netdev);
-        int ret, i;
+        int ret = DCB_NO_HW_CHG;
+        int i;
 #ifdef IXGBE_FCOE
         struct dcb_app app = {
                               .selector = DCB_APP_IDTYPE_ETHTYPE,
@@ -355,12 +350,13 @@ static u8 ixgbe_dcbnl_set_all(struct net_device *netdev)
 
         /* Fail command if not in CEE mode */
         if (!(adapter->dcbx_cap & DCB_CAP_DCBX_VER_CEE))
-                return 1;
+                return ret;
 
-        ret = ixgbe_copy_dcb_cfg(&adapter->temp_dcb_cfg, &adapter->dcb_cfg,
-                                 MAX_TRAFFIC_CLASS);
-        if (ret)
-                return DCB_NO_HW_CHG;
+        adapter->dcb_set_bitmap |= ixgbe_copy_dcb_cfg(&adapter->temp_dcb_cfg,
+                                                      &adapter->dcb_cfg,
+                                                      MAX_TRAFFIC_CLASS);
+        if (!adapter->dcb_set_bitmap)
+                return ret;
 
         if (adapter->dcb_cfg.pfc_mode_enable) {
                 switch (adapter->hw.mac.type) {
@@ -420,6 +416,8 @@ static u8 ixgbe_dcbnl_set_all(struct net_device *netdev)
 
                 for (i = 0; i < IEEE_8021QAZ_MAX_TCS; i++)
                         netdev_set_prio_tc_map(netdev, i, prio_tc[i]);
+
+                ret = DCB_HW_CHG_RST;
         }
 
         if (adapter->dcb_set_bitmap & BIT_PFC) {
@@ -430,7 +428,8 @@ static u8 ixgbe_dcbnl_set_all(struct net_device *netdev)
                                      DCB_TX_CONFIG, prio_tc);
                 ixgbe_dcb_unpack_pfc(&adapter->dcb_cfg, &pfc_en);
                 ixgbe_dcb_hw_pfc_config(&adapter->hw, pfc_en, prio_tc);
-                ret = DCB_HW_CHG;
+                if (ret != DCB_HW_CHG_RST)
+                        ret = DCB_HW_CHG;
         }
 
         if (adapter->dcb_cfg.pfc_mode_enable)
@@ -531,9 +530,6 @@ static void ixgbe_dcbnl_setpfcstate(struct net_device *netdev, u8 state)
         struct ixgbe_adapter *adapter = netdev_priv(netdev);
 
         adapter->temp_dcb_cfg.pfc_mode_enable = state;
-        if (adapter->temp_dcb_cfg.pfc_mode_enable !=
-                adapter->dcb_cfg.pfc_mode_enable)
-                adapter->dcb_set_bitmap |= BIT_PFC;
 }
 
 /**
diff --git a/drivers/net/ethernet/korina.c b/drivers/net/ethernet/korina.c
index f30db1c4660..bc58f1dc22f 100644
--- a/drivers/net/ethernet/korina.c
+++ b/drivers/net/ethernet/korina.c
@@ -55,7 +55,6 @@
 #include <linux/crc32.h>
 
 #include <asm/bootinfo.h>
-#include <asm/system.h>
 #include <asm/bitops.h>
 #include <asm/pgtable.h>
 #include <asm/io.h>
diff --git a/drivers/net/ethernet/marvell/mv643xx_eth.c b/drivers/net/ethernet/marvell/mv643xx_eth.c
index 153d33210e8..c8950da60e6 100644
--- a/drivers/net/ethernet/marvell/mv643xx_eth.c
+++ b/drivers/net/ethernet/marvell/mv643xx_eth.c
@@ -57,7 +57,6 @@
 #include <linux/types.h>
 #include <linux/inet_lro.h>
 #include <linux/slab.h>
-#include <asm/system.h>
 
 static char mv643xx_eth_driver_name[] = "mv643xx_eth";
 static char mv643xx_eth_driver_version[] = "1.4";
diff --git a/drivers/net/ethernet/marvell/pxa168_eth.c b/drivers/net/ethernet/marvell/pxa168_eth.c
index 44bad608eed..1db023b075a 100644
--- a/drivers/net/ethernet/marvell/pxa168_eth.c
+++ b/drivers/net/ethernet/marvell/pxa168_eth.c
@@ -43,7 +43,6 @@
 #include <linux/interrupt.h>
 #include <linux/types.h>
 #include <asm/pgtable.h>
-#include <asm/system.h>
 #include <asm/cacheflush.h>
 #include <linux/pxa168_eth.h>
 
diff --git a/drivers/net/ethernet/marvell/sky2.c b/drivers/net/ethernet/marvell/sky2.c
index 20a59322c79..7732474263d 100644
--- a/drivers/net/ethernet/marvell/sky2.c
+++ b/drivers/net/ethernet/marvell/sky2.c
@@ -1767,13 +1767,14 @@ static int sky2_open(struct net_device *dev)
 
         sky2_hw_up(sky2);
 
+        /* Enable interrupts from phy/mac for port */
+        imask = sky2_read32(hw, B0_IMSK);
+
         if (hw->chip_id == CHIP_ID_YUKON_OPT ||
             hw->chip_id == CHIP_ID_YUKON_PRM ||
             hw->chip_id == CHIP_ID_YUKON_OP_2)
                 imask |= Y2_IS_PHY_QLNK;        /* enable PHY Quick Link */
 
-        /* Enable interrupts from phy/mac for port */
-        imask = sky2_read32(hw, B0_IMSK);
         imask |= portirq_msk[port];
         sky2_write32(hw, B0_IMSK, imask);
         sky2_read32(hw, B0_IMSK);
@@ -2468,6 +2469,17 @@ static int sky2_change_mtu(struct net_device *dev, int new_mtu)
         return err;
 }
 
+static inline bool needs_copy(const struct rx_ring_info *re,
+                              unsigned length)
+{
+#ifndef CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS
+        /* Some architectures need the IP header to be aligned */
+        if (!IS_ALIGNED(re->data_addr + ETH_HLEN, sizeof(u32)))
+                return true;
+#endif
+        return length < copybreak;
+}
+
 /* For small just reuse existing skb for next receive */
 static struct sk_buff *receive_copy(struct sky2_port *sky2,
                                     const struct rx_ring_info *re,
@@ -2598,7 +2610,7 @@ static struct sk_buff *sky2_receive(struct net_device *dev,
                 goto error;
 
 okay:
-        if (length < copybreak)
+        if (needs_copy(re, length))
                 skb = receive_copy(sky2, re, length);
         else
                 skb = receive_new(sky2, re, length);
diff --git a/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h b/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h
index 3879c5eee62..47e1c0ff177 100644
--- a/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h
+++ b/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h
@@ -86,8 +86,9 @@
 
 #define MLX4_EN_WATCHDOG_TIMEOUT        (15 * HZ)
 
-#define MLX4_EN_ALLOC_ORDER     2
-#define MLX4_EN_ALLOC_SIZE      (PAGE_SIZE << MLX4_EN_ALLOC_ORDER)
+/* Use the maximum between 16384 and a single page */
+#define MLX4_EN_ALLOC_SIZE      PAGE_ALIGN(16384)
+#define MLX4_EN_ALLOC_ORDER     get_order(MLX4_EN_ALLOC_SIZE)
 
 #define MLX4_EN_MAX_LRO_DESCRIPTORS     32
 
diff --git a/drivers/net/ethernet/micrel/ks8842.c b/drivers/net/ethernet/micrel/ks8842.c
index 0686b93f185..f84dd2dc82b 100644
--- a/drivers/net/ethernet/micrel/ks8842.c
+++ b/drivers/net/ethernet/micrel/ks8842.c
@@ -458,7 +458,7 @@ static int ks8842_tx_frame_dma(struct sk_buff *skb, struct net_device *netdev)
         if (sg_dma_len(&ctl->sg) % 4)
                 sg_dma_len(&ctl->sg) += 4 - sg_dma_len(&ctl->sg) % 4;
 
-        ctl->adesc = ctl->chan->device->device_prep_slave_sg(ctl->chan,
+        ctl->adesc = dmaengine_prep_slave_sg(ctl->chan,
                 &ctl->sg, 1, DMA_MEM_TO_DEV,
                 DMA_PREP_INTERRUPT | DMA_COMPL_SKIP_SRC_UNMAP);
         if (!ctl->adesc)
@@ -570,7 +570,7 @@ static int __ks8842_start_new_rx_dma(struct net_device *netdev)
 
                 sg_dma_len(sg) = DMA_BUFFER_SIZE;
 
-                ctl->adesc = ctl->chan->device->device_prep_slave_sg(ctl->chan,
+                ctl->adesc = dmaengine_prep_slave_sg(ctl->chan,
                         sg, 1, DMA_DEV_TO_MEM,
                         DMA_PREP_INTERRUPT | DMA_COMPL_SKIP_SRC_UNMAP);
 
diff --git a/drivers/net/ethernet/natsemi/jazzsonic.c b/drivers/net/ethernet/natsemi/jazzsonic.c
index 5b89fd377ae..95dd39ffb23 100644
--- a/drivers/net/ethernet/natsemi/jazzsonic.c
+++ b/drivers/net/ethernet/natsemi/jazzsonic.c
@@ -38,7 +38,6 @@
 #include <linux/slab.h>
 
 #include <asm/bootinfo.h>
-#include <asm/system.h>
 #include <asm/pgtable.h>
 #include <asm/io.h>
 #include <asm/dma.h>
diff --git a/drivers/net/ethernet/natsemi/macsonic.c b/drivers/net/ethernet/natsemi/macsonic.c
index e640e23460d..b9680ba5a32 100644
--- a/drivers/net/ethernet/natsemi/macsonic.c
+++ b/drivers/net/ethernet/natsemi/macsonic.c
@@ -53,7 +53,6 @@
 #include <linux/slab.h>
 
 #include <asm/bootinfo.h>
-#include <asm/system.h>
 #include <asm/pgtable.h>
 #include <asm/io.h>
 #include <asm/hwtest.h>
diff --git a/drivers/net/ethernet/natsemi/ns83820.c b/drivers/net/ethernet/natsemi/ns83820.c
index c24b46cbfe2..d52728b3c43 100644
--- a/drivers/net/ethernet/natsemi/ns83820.c
+++ b/drivers/net/ethernet/natsemi/ns83820.c
@@ -121,7 +121,6 @@
 
 #include <asm/io.h>
 #include <asm/uaccess.h>
-#include <asm/system.h>
 
 #define DRV_NAME "ns83820"
 
diff --git a/drivers/net/ethernet/neterion/s2io.c b/drivers/net/ethernet/neterion/s2io.c
index eb2ab048cbc..bb367582c1e 100644
--- a/drivers/net/ethernet/neterion/s2io.c
+++ b/drivers/net/ethernet/neterion/s2io.c
@@ -81,7 +81,6 @@
 #include <linux/prefetch.h>
 #include <net/tcp.h>
 
-#include <asm/system.h>
 #include <asm/div64.h>
 #include <asm/irq.h>
 
diff --git a/drivers/net/ethernet/nvidia/forcedeth.c b/drivers/net/ethernet/nvidia/forcedeth.c
index 84952b308f8..d93a088debc 100644
--- a/drivers/net/ethernet/nvidia/forcedeth.c
+++ b/drivers/net/ethernet/nvidia/forcedeth.c
@@ -69,7 +69,6 @@
 #include <linux/io.h>
 
 #include <asm/irq.h>
-#include <asm/system.h>
 
 #define TX_WORK_PER_LOOP  64
 #define RX_WORK_PER_LOOP  64
diff --git a/drivers/net/ethernet/realtek/atp.c b/drivers/net/ethernet/realtek/atp.c
index 46c1932048c..e02f04d7f3a 100644
--- a/drivers/net/ethernet/realtek/atp.c
+++ b/drivers/net/ethernet/realtek/atp.c
@@ -140,7 +140,6 @@ static int xcvr[NUM_UNITS]; 			/* The data transfer mode. */
 #include <linux/delay.h>
 #include <linux/bitops.h>
 
-#include <asm/system.h>
 #include <asm/io.h>
 #include <asm/dma.h>
 
diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
index 074a5741baf..71393ea8ef5 100644
--- a/drivers/net/ethernet/realtek/r8169.c
+++ b/drivers/net/ethernet/realtek/r8169.c
@@ -29,7 +29,6 @@
 #include <linux/pci-aspm.h>
 #include <linux/prefetch.h>
 
-#include <asm/system.h>
 #include <asm/io.h>
 #include <asm/irq.h>
 
@@ -5812,7 +5811,10 @@ static void __rtl8169_resume(struct net_device *dev)
 
         rtl_pll_power_up(tp);
 
+        rtl_lock_work(tp);
+        napi_enable(&tp->napi);
         set_bit(RTL_FLAG_TASK_ENABLED, tp->wk.flags);
+        rtl_unlock_work(tp);
 
         rtl_schedule_task(tp, RTL_FLAG_TASK_RESET_PENDING);
 }
diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c
index 5999e961def..be3c2217916 100644
--- a/drivers/net/ethernet/renesas/sh_eth.c
+++ b/drivers/net/ethernet/renesas/sh_eth.c
@@ -912,7 +912,7 @@ static int sh_eth_dev_init(struct net_device *ndev)
         /* all sh_eth int mask */
         sh_eth_write(ndev, 0, EESIPR);
 
-#if defined(__LITTLE_ENDIAN__)
+#if defined(__LITTLE_ENDIAN)
         if (mdp->cd->hw_swap)
                 sh_eth_write(ndev, EDMR_EL, EDMR);
         else
diff --git a/drivers/net/ethernet/renesas/sh_eth.h b/drivers/net/ethernet/renesas/sh_eth.h
index 2d80feadc86..57b8e1fc5d1 100644
--- a/drivers/net/ethernet/renesas/sh_eth.h
+++ b/drivers/net/ethernet/renesas/sh_eth.h
@@ -694,7 +694,7 @@ enum TSU_FWSLC_BIT {
  */
 struct sh_eth_txdesc {
         u32 status;             /* TD0 */
-#if defined(CONFIG_CPU_LITTLE_ENDIAN)
+#if defined(__LITTLE_ENDIAN)
         u16 pad0;               /* TD1 */
         u16 buffer_length;      /* TD1 */
 #else
@@ -711,7 +711,7 @@ struct sh_eth_txdesc {
  */
 struct sh_eth_rxdesc {
         u32 status;             /* RD0 */
-#if defined(CONFIG_CPU_LITTLE_ENDIAN)
+#if defined(__LITTLE_ENDIAN)
         u16 frame_length;       /* RD1 */
         u16 buffer_length;      /* RD1 */
 #else
diff --git a/drivers/net/ethernet/seeq/ether3.c b/drivers/net/ethernet/seeq/ether3.c
index 7b819bd8c41..df808ac8cb6 100644
--- a/drivers/net/ethernet/seeq/ether3.c
+++ b/drivers/net/ethernet/seeq/ether3.c
@@ -64,7 +64,6 @@
 #include <linux/delay.h>
 #include <linux/bitops.h>
 
-#include <asm/system.h>
 #include <asm/ecard.h>
 #include <asm/io.h>
 
diff --git a/drivers/net/ethernet/seeq/seeq8005.c b/drivers/net/ethernet/seeq/seeq8005.c
index 79899077444..698edbbfc14 100644
--- a/drivers/net/ethernet/seeq/seeq8005.c
+++ b/drivers/net/ethernet/seeq/seeq8005.c
@@ -47,7 +47,6 @@ static const char version[] =
 #include <linux/bitops.h>
 #include <linux/jiffies.h>
 
-#include <asm/system.h>
 #include <asm/io.h>
 #include <asm/dma.h>
 
diff --git a/drivers/net/ethernet/sfc/mtd.c b/drivers/net/ethernet/sfc/mtd.c
index 26b3c23b0b6..758148379b0 100644
--- a/drivers/net/ethernet/sfc/mtd.c
+++ b/drivers/net/ethernet/sfc/mtd.c
@@ -193,7 +193,7 @@ static int efx_mtd_erase(struct mtd_info *mtd, struct erase_info *erase)
                 erase->state = MTD_ERASE_DONE;
         } else {
                 erase->state = MTD_ERASE_FAILED;
-                erase->fail_addr = 0xffffffff;
+                erase->fail_addr = MTD_FAIL_ADDR_UNKNOWN;
         }
         mtd_erase_callback(erase);
         return rc;
@@ -263,10 +263,10 @@ static int efx_mtd_probe_device(struct efx_nic *efx, struct efx_mtd *efx_mtd)
                 part->mtd.owner = THIS_MODULE;
                 part->mtd.priv = efx_mtd;
                 part->mtd.name = part->name;
-                part->mtd.erase = efx_mtd_erase;
-                part->mtd.read = efx_mtd->ops->read;
-                part->mtd.write = efx_mtd->ops->write;
-                part->mtd.sync = efx_mtd_sync;
+                part->mtd._erase = efx_mtd_erase;
+                part->mtd._read = efx_mtd->ops->read;
+                part->mtd._write = efx_mtd->ops->write;
+                part->mtd._sync = efx_mtd_sync;
 
                 if (mtd_device_register(&part->mtd, NULL, 0))
                         goto fail;
diff --git a/drivers/net/ethernet/smsc/smc91c92_cs.c b/drivers/net/ethernet/smsc/smc91c92_cs.c
index d12e48a7861..04393b5fef7 100644
--- a/drivers/net/ethernet/smsc/smc91c92_cs.c
+++ b/drivers/net/ethernet/smsc/smc91c92_cs.c
@@ -53,7 +53,6 @@
 #include <pcmcia/ss.h>
 
 #include <asm/io.h>
-#include <asm/system.h>
 #include <asm/uaccess.h>
 
 /*====================================================================*/
diff --git a/drivers/net/ethernet/smsc/smc91x.c b/drivers/net/ethernet/smsc/smc91x.c
index 1dc4fad593e..fee44935501 100644
--- a/drivers/net/ethernet/smsc/smc91x.c
+++ b/drivers/net/ethernet/smsc/smc91x.c
@@ -2280,7 +2280,7 @@ static int __devinit smc_drv_probe(struct platform_device *pdev)
         if (ret)
                 goto out_release_io;
 #if defined(CONFIG_SA1100_ASSABET)
-        NCR_0 |= NCR_ENET_OSC_EN;
+        neponset_ncr_set(NCR_ENET_OSC_EN);
 #endif
         platform_set_drvdata(pdev, ndev);
         ret = smc_enable_device(pdev);
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index 90d5c4c75d2..a64f0d422e7 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -1784,10 +1784,12 @@ static int stmmac_hw_init(struct stmmac_priv *priv)
         struct mac_device_info *mac;
 
         /* Identify the MAC HW device */
-        if (priv->plat->has_gmac)
+        if (priv->plat->has_gmac) {
+                priv->dev->priv_flags |= IFF_UNICAST_FLT;
                 mac = dwmac1000_setup(priv->ioaddr);
-        else
+        } else {
                 mac = dwmac100_setup(priv->ioaddr);
+        }
         if (!mac)
                 return -ENOMEM;
 
diff --git a/drivers/net/ethernet/sun/cassini.c b/drivers/net/ethernet/sun/cassini.c
index 3c229556073..ce4df61b4b5 100644
--- a/drivers/net/ethernet/sun/cassini.c
+++ b/drivers/net/ethernet/sun/cassini.c
@@ -99,7 +99,6 @@
 #include <net/checksum.h>
 
 #include <linux/atomic.h>
-#include <asm/system.h>
 #include <asm/io.h>
 #include <asm/byteorder.h>
 #include <asm/uaccess.h>
diff --git a/drivers/net/ethernet/sun/sunbmac.c b/drivers/net/ethernet/sun/sunbmac.c
index f359863b534..2a83fc57edb 100644
--- a/drivers/net/ethernet/sun/sunbmac.c
+++ b/drivers/net/ethernet/sun/sunbmac.c
@@ -35,7 +35,6 @@
 #include <asm/openprom.h>
 #include <asm/oplib.h>
 #include <asm/pgtable.h>
-#include <asm/system.h>
 
 #include "sunbmac.h"
 
diff --git a/drivers/net/ethernet/sun/sungem.c b/drivers/net/ethernet/sun/sungem.c
index 8707d59ed54..dfd4b1d13a5 100644
--- a/drivers/net/ethernet/sun/sungem.c
+++ b/drivers/net/ethernet/sun/sungem.c
@@ -41,7 +41,6 @@
 #include <linux/mm.h>
 #include <linux/gfp.h>
 
-#include <asm/system.h>
 #include <asm/io.h>
 #include <asm/byteorder.h>
 #include <asm/uaccess.h>
diff --git a/drivers/net/ethernet/sun/sunhme.c b/drivers/net/ethernet/sun/sunhme.c
index afb19a6d7c5..dfc00c4683e 100644
--- a/drivers/net/ethernet/sun/sunhme.c
+++ b/drivers/net/ethernet/sun/sunhme.c
@@ -36,7 +36,6 @@
 #include <linux/bitops.h>
 #include <linux/dma-mapping.h>
 
-#include <asm/system.h>
 #include <asm/io.h>
 #include <asm/dma.h>
 #include <asm/byteorder.h>
diff --git a/drivers/net/ethernet/sun/sunqe.c b/drivers/net/ethernet/sun/sunqe.c
index 139d6b410d6..7d4a040d84a 100644
--- a/drivers/net/ethernet/sun/sunqe.c
+++ b/drivers/net/ethernet/sun/sunqe.c
@@ -28,7 +28,6 @@
 #include <linux/of.h>
 #include <linux/of_device.h>
 
-#include <asm/system.h>
 #include <asm/io.h>
 #include <asm/dma.h>
 #include <asm/byteorder.h>
diff --git a/drivers/net/ethernet/sun/sunvnet.c b/drivers/net/ethernet/sun/sunvnet.c
index 92a037a8228..38e3ae9155b 100644
--- a/drivers/net/ethernet/sun/sunvnet.c
+++ b/drivers/net/ethernet/sun/sunvnet.c
@@ -1259,10 +1259,7 @@ static struct vio_driver vnet_port_driver = {
         .id_table       = vnet_port_match,
         .probe          = vnet_port_probe,
         .remove         = vnet_port_remove,
-        .driver         = {
-                .name   = "vnet_port",
-                .owner  = THIS_MODULE,
-        }
+        .name           = "vnet_port",
 };
 
 static int __init vnet_init(void)
diff --git a/drivers/net/ethernet/tundra/tsi108_eth.c b/drivers/net/ethernet/tundra/tsi108_eth.c
index 840e0e9031f..277c93e9ff4 100644
--- a/drivers/net/ethernet/tundra/tsi108_eth.c
+++ b/drivers/net/ethernet/tundra/tsi108_eth.c
@@ -50,7 +50,6 @@
 #include <linux/platform_device.h>
 #include <linux/gfp.h>
 
-#include <asm/system.h>
 #include <asm/io.h>
 #include <asm/tsi108.h>
 
diff --git a/drivers/net/ethernet/via/via-rhine.c b/drivers/net/ethernet/via/via-rhine.c
index 47b411fe3ec..0459c096629 100644
--- a/drivers/net/ethernet/via/via-rhine.c
+++ b/drivers/net/ethernet/via/via-rhine.c
@@ -503,30 +503,32 @@ static int rhine_vlan_rx_add_vid(struct net_device *dev, unsigned short vid);
 static int rhine_vlan_rx_kill_vid(struct net_device *dev, unsigned short vid);
 static void rhine_restart_tx(struct net_device *dev);
 
-static void rhine_wait_bit(struct rhine_private *rp, u8 reg, u8 mask, bool high)
+static void rhine_wait_bit(struct rhine_private *rp, u8 reg, u8 mask, bool low)
 {
         void __iomem *ioaddr = rp->base;
         int i;
 
         for (i = 0; i < 1024; i++) {
-                if (high ^ !!(ioread8(ioaddr + reg) & mask))
+                bool has_mask_bits = !!(ioread8(ioaddr + reg) & mask);
+
+                if (low ^ has_mask_bits)
                         break;
                 udelay(10);
         }
         if (i > 64) {
                 netif_dbg(rp, hw, rp->dev, "%s bit wait (%02x/%02x) cycle "
-                          "count: %04d\n", high ? "high" : "low", reg, mask, i);
+                          "count: %04d\n", low ? "low" : "high", reg, mask, i);
         }
 }
 
 static void rhine_wait_bit_high(struct rhine_private *rp, u8 reg, u8 mask)
 {
-        rhine_wait_bit(rp, reg, mask, true);
+        rhine_wait_bit(rp, reg, mask, false);
 }
 
 static void rhine_wait_bit_low(struct rhine_private *rp, u8 reg, u8 mask)
 {
-        rhine_wait_bit(rp, reg, mask, false);
+        rhine_wait_bit(rp, reg, mask, true);
 }
 
 static u32 rhine_get_events(struct rhine_private *rp)
diff --git a/drivers/net/ethernet/xircom/xirc2ps_cs.c b/drivers/net/ethernet/xircom/xirc2ps_cs.c
index 5c69c6f93fb..94a1f94f74b 100644
--- a/drivers/net/ethernet/xircom/xirc2ps_cs.c
+++ b/drivers/net/ethernet/xircom/xirc2ps_cs.c
@@ -89,7 +89,6 @@
 #include <pcmcia/ciscode.h>
 
 #include <asm/io.h>
-#include <asm/system.h>
 #include <asm/uaccess.h>
 
 #ifndef MANFID_COMPAQ
diff --git a/drivers/net/hamradio/6pack.c b/drivers/net/hamradio/6pack.c
index 2a5a34d2d67..64783a0d545 100644
--- a/drivers/net/hamradio/6pack.c
+++ b/drivers/net/hamradio/6pack.c
@@ -13,7 +13,6 @@
  */
 
 #include <linux/module.h>
-#include <asm/system.h>
 #include <asm/uaccess.h>
 #include <linux/bitops.h>
 #include <linux/string.h>
diff --git a/drivers/net/hamradio/baycom_par.c b/drivers/net/hamradio/baycom_par.c
index f1aea0c9833..acb636963e9 100644
--- a/drivers/net/hamradio/baycom_par.c
+++ b/drivers/net/hamradio/baycom_par.c
@@ -86,7 +86,6 @@
 #include <linux/bitops.h>
 #include <linux/jiffies.h>
 
-#include <asm/system.h>
 #include <asm/uaccess.h>
 
 /* --------------------------------------------------------------------- */
diff --git a/drivers/net/hamradio/bpqether.c b/drivers/net/hamradio/bpqether.c
index 18d8affecd1..76d54774ba8 100644
--- a/drivers/net/hamradio/bpqether.c
+++ b/drivers/net/hamradio/bpqether.c
@@ -69,7 +69,6 @@
 #include <linux/if_arp.h>
 #include <linux/skbuff.h>
 #include <net/sock.h>
-#include <asm/system.h>
 #include <asm/uaccess.h>
 #include <linux/mm.h>
 #include <linux/interrupt.h>
diff --git a/drivers/net/hamradio/mkiss.c b/drivers/net/hamradio/mkiss.c
index bc02968cee1..aed1a6105b2 100644
--- a/drivers/net/hamradio/mkiss.c
+++ b/drivers/net/hamradio/mkiss.c
@@ -17,7 +17,6 @@
  * Copyright (C) 2004, 05 Thomas Osterried DL9SAU <thomas@x-berg.in-berlin.de>
  */
 #include <linux/module.h>
-#include <asm/system.h>
 #include <linux/bitops.h>
 #include <asm/uaccess.h>
 #include <linux/crc16.h>
diff --git a/drivers/net/hamradio/scc.c b/drivers/net/hamradio/scc.c
index 33655814448..efc6c97163a 100644
--- a/drivers/net/hamradio/scc.c
+++ b/drivers/net/hamradio/scc.c
@@ -177,7 +177,6 @@
 #include <net/ax25.h>
 
 #include <asm/irq.h>
-#include <asm/system.h>
 #include <asm/io.h>
 #include <asm/uaccess.h>
 
diff --git a/drivers/net/hamradio/yam.c b/drivers/net/hamradio/yam.c
index 696327773fb..5a6412ecce7 100644
--- a/drivers/net/hamradio/yam.c
+++ b/drivers/net/hamradio/yam.c
@@ -52,7 +52,6 @@
 #include <linux/bitops.h>
 #include <linux/random.h>
 #include <asm/io.h>
-#include <asm/system.h>
 #include <linux/interrupt.h>
 #include <linux/ioport.h>
 #include <linux/firmware.h>
diff --git a/drivers/net/hippi/rrunner.c b/drivers/net/hippi/rrunner.c
index 248c4f17846..b6a2bdeff59 100644
--- a/drivers/net/hippi/rrunner.c
+++ b/drivers/net/hippi/rrunner.c
@@ -43,7 +43,6 @@
 #include <linux/slab.h>
 #include <net/sock.h>
 
-#include <asm/system.h>
 #include <asm/cache.h>
 #include <asm/byteorder.h>
 #include <asm/io.h>
diff --git a/drivers/net/irda/Kconfig b/drivers/net/irda/Kconfig
index e535137eb2d..468047866c8 100644
--- a/drivers/net/irda/Kconfig
+++ b/drivers/net/irda/Kconfig
@@ -356,7 +356,7 @@ config VLSI_FIR
 
 config SA1100_FIR
         tristate "SA1100 Internal IR"
-        depends on ARCH_SA1100 && IRDA
+        depends on ARCH_SA1100 && IRDA && DMA_SA11X0
 
 config VIA_FIR
         tristate "VIA VT8231/VT1211 SIR/MIR/FIR"
diff --git a/drivers/net/irda/donauboe.c b/drivers/net/irda/donauboe.c
index 617a446d126..4351296dde3 100644
--- a/drivers/net/irda/donauboe.c
+++ b/drivers/net/irda/donauboe.c
@@ -156,7 +156,6 @@
 #include <linux/pci.h>
 #include <linux/rtnetlink.h>
 
-#include <asm/system.h>
 #include <asm/io.h>
 
 #include <net/irda/wrapper.h>
diff --git a/drivers/net/irda/sa1100_ir.c b/drivers/net/irda/sa1100_ir.c
index da2705061a6..e25067552b2 100644
--- a/drivers/net/irda/sa1100_ir.c
+++ b/drivers/net/irda/sa1100_ir.c
@@ -15,7 +15,7 @@
  *  This driver takes one kernel command line parameter, sa1100ir=, with
  *  the following options:
  *      max_rate:baudrate       - set the maximum baud rate
- *      power_leve:level        - set the transmitter power level
+ *      power_level:level       - set the transmitter power level
  *      tx_lpm:0|1              - set transmit low power mode
  */
 #include <linux/module.h>
@@ -30,13 +30,13 @@
 #include <linux/delay.h>
 #include <linux/platform_device.h>
 #include <linux/dma-mapping.h>
+#include <linux/dmaengine.h>
+#include <linux/sa11x0-dma.h>
 
 #include <net/irda/irda.h>
 #include <net/irda/wrapper.h>
 #include <net/irda/irda_device.h>
 
-#include <asm/irq.h>
-#include <mach/dma.h>
 #include <mach/hardware.h>
 #include <asm/mach/irda.h>
 
@@ -44,8 +44,15 @@ static int power_level = 3;
 static int tx_lpm;
 static int max_rate = 4000000;
 
+struct sa1100_buf {
+        struct device           *dev;
+        struct sk_buff          *skb;
+        struct scatterlist      sg;
+        struct dma_chan         *chan;
+        dma_cookie_t            cookie;
+};
+
 struct sa1100_irda {
-        unsigned char           hscr0;
         unsigned char           utcr4;
         unsigned char           power;
         unsigned char           open;
@@ -53,12 +60,8 @@ struct sa1100_irda {
         int                     speed;
         int                     newspeed;
 
-        struct sk_buff          *txskb;
-        struct sk_buff          *rxskb;
-        dma_addr_t              txbuf_dma;
-        dma_addr_t              rxbuf_dma;
-        dma_regs_t              *txdma;
-        dma_regs_t              *rxdma;
+        struct sa1100_buf       dma_rx;
+        struct sa1100_buf       dma_tx;
 
         struct device           *dev;
         struct irda_platform_data *pdata;
@@ -67,23 +70,103 @@ struct sa1100_irda {
 
         iobuff_t                tx_buff;
         iobuff_t                rx_buff;
+
+        int (*tx_start)(struct sk_buff *, struct net_device *, struct sa1100_irda *);
+        irqreturn_t (*irq)(struct net_device *, struct sa1100_irda *);
 };
 
+static int sa1100_irda_set_speed(struct sa1100_irda *, int);
+
 #define IS_FIR(si)              ((si)->speed >= 4000000)
 
 #define HPSIR_MAX_RXLEN         2047
 
+static struct dma_slave_config sa1100_irda_sir_tx = {
+        .direction      = DMA_TO_DEVICE,
+        .dst_addr       = __PREG(Ser2UTDR),
+        .dst_addr_width = DMA_SLAVE_BUSWIDTH_1_BYTE,
+        .dst_maxburst   = 4,
+};
+
+static struct dma_slave_config sa1100_irda_fir_rx = {
+        .direction      = DMA_FROM_DEVICE,
+        .src_addr       = __PREG(Ser2HSDR),
+        .src_addr_width = DMA_SLAVE_BUSWIDTH_1_BYTE,
+        .src_maxburst   = 8,
+};
+
+static struct dma_slave_config sa1100_irda_fir_tx = {
+        .direction      = DMA_TO_DEVICE,
+        .dst_addr       = __PREG(Ser2HSDR),
+        .dst_addr_width = DMA_SLAVE_BUSWIDTH_1_BYTE,
+        .dst_maxburst   = 8,
+};
+
+static unsigned sa1100_irda_dma_xferred(struct sa1100_buf *buf)
+{
+        struct dma_chan *chan = buf->chan;
+        struct dma_tx_state state;
+        enum dma_status status;
+
+        status = chan->device->device_tx_status(chan, buf->cookie, &state);
+        if (status != DMA_PAUSED)
+                return 0;
+
+        return sg_dma_len(&buf->sg) - state.residue;
+}
+
+static int sa1100_irda_dma_request(struct device *dev, struct sa1100_buf *buf,
+        const char *name, struct dma_slave_config *cfg)
+{
+        dma_cap_mask_t m;
+        int ret;
+
+        dma_cap_zero(m);
+        dma_cap_set(DMA_SLAVE, m);
+
+        buf->chan = dma_request_channel(m, sa11x0_dma_filter_fn, (void *)name);
+        if (!buf->chan) {
+                dev_err(dev, "unable to request DMA channel for %s\n",
+                        name);
+                return -ENOENT;
+        }
+
+        ret = dmaengine_slave_config(buf->chan, cfg);
+        if (ret)
+                dev_warn(dev, "DMA slave_config for %s returned %d\n",
+                        name, ret);
+
+        buf->dev = buf->chan->device->dev;
+
+        return 0;
+}
+
+static void sa1100_irda_dma_start(struct sa1100_buf *buf,
+        enum dma_transfer_direction dir, dma_async_tx_callback cb, void *cb_p)
+{
+        struct dma_async_tx_descriptor *desc;
+        struct dma_chan *chan = buf->chan;
+
+        desc = dmaengine_prep_slave_sg(chan, &buf->sg, 1, dir,
+                        DMA_PREP_INTERRUPT | DMA_CTRL_ACK);
+        if (desc) {
+                desc->callback = cb;
+                desc->callback_param = cb_p;
+                buf->cookie = dmaengine_submit(desc);
+                dma_async_issue_pending(chan);
+        }
+}
+
 /*
  * Allocate and map the receive buffer, unless it is already allocated.
  */
 static int sa1100_irda_rx_alloc(struct sa1100_irda *si)
 {
-        if (si->rxskb)
+        if (si->dma_rx.skb)
                 return 0;
 
-        si->rxskb = alloc_skb(HPSIR_MAX_RXLEN + 1, GFP_ATOMIC);
-
-        if (!si->rxskb) {
+        si->dma_rx.skb = alloc_skb(HPSIR_MAX_RXLEN + 1, GFP_ATOMIC);
+        if (!si->dma_rx.skb) {
                 printk(KERN_ERR "sa1100_ir: out of memory for RX SKB\n");
                 return -ENOMEM;
         }
@@ -92,11 +175,14 @@ static int sa1100_irda_rx_alloc(struct sa1100_irda *si)
          * Align any IP headers that may be contained
          * within the frame.
          */
-        skb_reserve(si->rxskb, 1);
+        skb_reserve(si->dma_rx.skb, 1);
+
+        sg_set_buf(&si->dma_rx.sg, si->dma_rx.skb->data, HPSIR_MAX_RXLEN);
+        if (dma_map_sg(si->dma_rx.dev, &si->dma_rx.sg, 1, DMA_FROM_DEVICE) == 0) {
+                dev_kfree_skb_any(si->dma_rx.skb);
+                return -ENOMEM;
+        }
 
-        si->rxbuf_dma = dma_map_single(si->dev, si->rxskb->data,
-                                        HPSIR_MAX_RXLEN,
-                                        DMA_FROM_DEVICE);
         return 0;
 }
 
@@ -106,7 +192,7 @@ static int sa1100_irda_rx_alloc(struct sa1100_irda *si)
  */
 static void sa1100_irda_rx_dma_start(struct sa1100_irda *si)
 {
-        if (!si->rxskb) {
+        if (!si->dma_rx.skb) {
                 printk(KERN_ERR "sa1100_ir: rx buffer went missing\n");
                 return;
         }
@@ -114,254 +200,87 @@ static void sa1100_irda_rx_dma_start(struct sa1100_irda *si)
         /*
          * First empty receive FIFO
          */
-        Ser2HSCR0 = si->hscr0 | HSCR0_HSSP;
+        Ser2HSCR0 = HSCR0_HSSP;
 
         /*
          * Enable the DMA, receiver and receive interrupt.
          */
-        sa1100_clear_dma(si->rxdma);
-        sa1100_start_dma(si->rxdma, si->rxbuf_dma, HPSIR_MAX_RXLEN);
-        Ser2HSCR0 = si->hscr0 | HSCR0_HSSP | HSCR0_RXE;
+        dmaengine_terminate_all(si->dma_rx.chan);
+        sa1100_irda_dma_start(&si->dma_rx, DMA_DEV_TO_MEM, NULL, NULL);
+
+        Ser2HSCR0 = HSCR0_HSSP | HSCR0_RXE;
 }
 
-/*
- * Set the IrDA communications speed.
- */
-static int sa1100_irda_set_speed(struct sa1100_irda *si, int speed)
+static void sa1100_irda_check_speed(struct sa1100_irda *si)
 {
-        unsigned long flags;
-        int brd, ret = -EINVAL;
-
-        switch (speed) {
-        case 9600:      case 19200:     case 38400:
-        case 57600:     case 115200:
-                brd = 3686400 / (16 * speed) - 1;
-
-                /*
-                 * Stop the receive DMA.
-                 */
-                if (IS_FIR(si))
-                        sa1100_stop_dma(si->rxdma);
-
-                local_irq_save(flags);
-
-                Ser2UTCR3 = 0;
-                Ser2HSCR0 = HSCR0_UART;
-
-                Ser2UTCR1 = brd >> 8;
-                Ser2UTCR2 = brd;
-
-                /*
-                 * Clear status register
-                 */
-                Ser2UTSR0 = UTSR0_REB | UTSR0_RBB | UTSR0_RID;
-                Ser2UTCR3 = UTCR3_RIE | UTCR3_RXE | UTCR3_TXE;
-
-                if (si->pdata->set_speed)
-                        si->pdata->set_speed(si->dev, speed);
-
-                si->speed = speed;
-
-                local_irq_restore(flags);
-                ret = 0;
-                break;
-
-        case 4000000:
-                local_irq_save(flags);
-
-                si->hscr0 = 0;
-
-                Ser2HSSR0 = 0xff;
-                Ser2HSCR0 = si->hscr0 | HSCR0_HSSP;
-                Ser2UTCR3 = 0;
-
-                si->speed = speed;
-
-                if (si->pdata->set_speed)
-                        si->pdata->set_speed(si->dev, speed);
-
-                sa1100_irda_rx_alloc(si);
-                sa1100_irda_rx_dma_start(si);
-
-                local_irq_restore(flags);
-
-                break;
-
-        default:
-                break;
+        if (si->newspeed) {
+                sa1100_irda_set_speed(si, si->newspeed);
+                si->newspeed = 0;
         }
-
-        return ret;
 }
 
 /*
- * Control the power state of the IrDA transmitter.
- * State:
- *  0 - off
- *  1 - short range, lowest power
- *  2 - medium range, medium power
- *  3 - maximum range, high power
- *
- * Currently, only assabet is known to support this.
+ * HP-SIR format support.
  */
-static int
-__sa1100_irda_set_power(struct sa1100_irda *si, unsigned int state)
+static void sa1100_irda_sirtxdma_irq(void *id)
 {
-        int ret = 0;
-        if (si->pdata->set_power)
-                ret = si->pdata->set_power(si->dev, state);
-        return ret;
-}
-
-static inline int
-sa1100_set_power(struct sa1100_irda *si, unsigned int state)
-{
-        int ret;
-
-        ret = __sa1100_irda_set_power(si, state);
-        if (ret == 0)
-                si->power = state;
+        struct net_device *dev = id;
+        struct sa1100_irda *si = netdev_priv(dev);
 
-        return ret;
-}
+        dma_unmap_sg(si->dma_tx.dev, &si->dma_tx.sg, 1, DMA_TO_DEVICE);
+        dev_kfree_skb(si->dma_tx.skb);
+        si->dma_tx.skb = NULL;
 
-static int sa1100_irda_startup(struct sa1100_irda *si)
-{
-        int ret;
+        dev->stats.tx_packets++;
+        dev->stats.tx_bytes += sg_dma_len(&si->dma_tx.sg);
 
-        /*
-         * Ensure that the ports for this device are setup correctly.
-         */
-        if (si->pdata->startup) {
-                ret = si->pdata->startup(si->dev);
-                if (ret)
-                        return ret;
-        }
-
-        /*
-         * Configure PPC for IRDA - we want to drive TXD2 low.
-         * We also want to drive this pin low during sleep.
-         */
-        PPSR &= ~PPC_TXD2;
-        PSDR &= ~PPC_TXD2;
-        PPDR |= PPC_TXD2;
-
-        /*
-         * Enable HP-SIR modulation, and ensure that the port is disabled.
-         */
-        Ser2UTCR3 = 0;
-        Ser2HSCR0 = HSCR0_UART;
-        Ser2UTCR4 = si->utcr4;
-        Ser2UTCR0 = UTCR0_8BitData;
-        Ser2HSCR2 = HSCR2_TrDataH | HSCR2_RcDataL;
+        /* We need to ensure that the transmitter has finished. */
+        do
+                rmb();
+        while (Ser2UTSR1 & UTSR1_TBY);
 
         /*
-         * Clear status register
+         * Ok, we've finished transmitting.  Now enable the receiver.
+         * Sometimes we get a receive IRQ immediately after a transmit...
          */
         Ser2UTSR0 = UTSR0_REB | UTSR0_RBB | UTSR0_RID;
+        Ser2UTCR3 = UTCR3_RIE | UTCR3_RXE | UTCR3_TXE;
 
-        ret = sa1100_irda_set_speed(si, si->speed = 9600);
-        if (ret) {
-                Ser2UTCR3 = 0;
-                Ser2HSCR0 = 0;
-
-                if (si->pdata->shutdown)
-                        si->pdata->shutdown(si->dev);
-        }
-
-        return ret;
-}
-
-static void sa1100_irda_shutdown(struct sa1100_irda *si)
-{
-        /*
-         * Stop all DMA activity.
-         */
-        sa1100_stop_dma(si->rxdma);
-        sa1100_stop_dma(si->txdma);
-
-        /* Disable the port. */
-        Ser2UTCR3 = 0;
-        Ser2HSCR0 = 0;
+        sa1100_irda_check_speed(si);
 
-        if (si->pdata->shutdown)
-                si->pdata->shutdown(si->dev);
+        /* I'm hungry! */
+        netif_wake_queue(dev);
 }
 
-#ifdef CONFIG_PM
-/*
- * Suspend the IrDA interface.
- */
-static int sa1100_irda_suspend(struct platform_device *pdev, pm_message_t state)
+static int sa1100_irda_sir_tx_start(struct sk_buff *skb, struct net_device *dev,
+        struct sa1100_irda *si)
 {
-        struct net_device *dev = platform_get_drvdata(pdev);
-        struct sa1100_irda *si;
-
-        if (!dev)
-                return 0;
-
-        si = netdev_priv(dev);
-        if (si->open) {
-                /*
-                 * Stop the transmit queue
-                 */
-                netif_device_detach(dev);
-                disable_irq(dev->irq);
-                sa1100_irda_shutdown(si);
-                __sa1100_irda_set_power(si, 0);
+        si->tx_buff.data = si->tx_buff.head;
+        si->tx_buff.len  = async_wrap_skb(skb, si->tx_buff.data,
+                                          si->tx_buff.truesize);
+
+        si->dma_tx.skb = skb;
+        sg_set_buf(&si->dma_tx.sg, si->tx_buff.data, si->tx_buff.len);
+        if (dma_map_sg(si->dma_tx.dev, &si->dma_tx.sg, 1, DMA_TO_DEVICE) == 0) {
+                si->dma_tx.skb = NULL;
+                netif_wake_queue(dev);
+                dev->stats.tx_dropped++;
+                return NETDEV_TX_OK;
         }
 
-        return 0;
-}
-
-/*
- * Resume the IrDA interface.
- */
-static int sa1100_irda_resume(struct platform_device *pdev)
-{
-        struct net_device *dev = platform_get_drvdata(pdev);
-        struct sa1100_irda *si;
-
-        if (!dev)
-                return 0;
+        sa1100_irda_dma_start(&si->dma_tx, DMA_MEM_TO_DEV, sa1100_irda_sirtxdma_irq, dev);
 
-        si = netdev_priv(dev);
-        if (si->open) {
-                /*
-                 * If we missed a speed change, initialise at the new speed
-                 * directly.  It is debatable whether this is actually
-                 * required, but in the interests of continuing from where
-                 * we left off it is desirable.  The converse argument is
-                 * that we should re-negotiate at 9600 baud again.
-                 */
-                if (si->newspeed) {
-                        si->speed = si->newspeed;
-                        si->newspeed = 0;
-                }
-
-                sa1100_irda_startup(si);
-                __sa1100_irda_set_power(si, si->power);
-                enable_irq(dev->irq);
-
-                /*
-                 * This automatically wakes up the queue
-                 */
-                netif_device_attach(dev);
-        }
+        /*
+         * The mean turn-around time is enforced by XBOF padding,
+         * so we don't have to do anything special here.
+         */
+        Ser2UTCR3 = UTCR3_TXE;
 
-        return 0;
+        return NETDEV_TX_OK;
 }
-#else
-#define sa1100_irda_suspend     NULL
-#define sa1100_irda_resume      NULL
-#endif
 
-/*
- * HP-SIR format interrupt service routines.
- */
-static void sa1100_irda_hpsir_irq(struct net_device *dev)
+static irqreturn_t sa1100_irda_sir_irq(struct net_device *dev, struct sa1100_irda *si)
 {
-        struct sa1100_irda *si = netdev_priv(dev);
         int status;
 
         status = Ser2UTSR0;
@@ -414,51 +333,96 @@ static void sa1100_irda_hpsir_irq(struct net_device *dev)
 
         }
 
-        if (status & UTSR0_TFS && si->tx_buff.len) {
-                /*
-                 * Transmitter FIFO is not full
-                 */
-                do {
-                        Ser2UTDR = *si->tx_buff.data++;
-                        si->tx_buff.len -= 1;
-                } while (Ser2UTSR1 & UTSR1_TNF && si->tx_buff.len);
+        return IRQ_HANDLED;
+}
 
-                if (si->tx_buff.len == 0) {
-                        dev->stats.tx_packets++;
-                        dev->stats.tx_bytes += si->tx_buff.data -
-                                              si->tx_buff.head;
+/*
+ * FIR format support.
+ */
+static void sa1100_irda_firtxdma_irq(void *id)
+{
+        struct net_device *dev = id;
+        struct sa1100_irda *si = netdev_priv(dev);
+        struct sk_buff *skb;
 
-                        /*
-                         * We need to ensure that the transmitter has
-                         * finished.
-                         */
-                        do
-                                rmb();
-                        while (Ser2UTSR1 & UTSR1_TBY);
+        /*
+         * Wait for the transmission to complete.  Unfortunately,
+         * the hardware doesn't give us an interrupt to indicate
+         * "end of frame".
+         */
+        do
+                rmb();
+        while (!(Ser2HSSR0 & HSSR0_TUR) || Ser2HSSR1 & HSSR1_TBY);
 
-                        /*
-                         * Ok, we've finished transmitting.  Now enable
-                         * the receiver.  Sometimes we get a receive IRQ
-                         * immediately after a transmit...
-                         */
-                        Ser2UTSR0 = UTSR0_REB | UTSR0_RBB | UTSR0_RID;
-                        Ser2UTCR3 = UTCR3_RIE | UTCR3_RXE | UTCR3_TXE;
+        /*
+         * Clear the transmit underrun bit.
+         */
+        Ser2HSSR0 = HSSR0_TUR;
 
-                        if (si->newspeed) {
-                                sa1100_irda_set_speed(si, si->newspeed);
-                                si->newspeed = 0;
-                        }
+        /*
+         * Do we need to change speed?  Note that we're lazy
+         * here - we don't free the old dma_rx.skb.  We don't need
+         * to allocate a buffer either.
+         */
+        sa1100_irda_check_speed(si);
 
-                        /* I'm hungry! */
-                        netif_wake_queue(dev);
-                }
+        /*
+         * Start reception.  This disables the transmitter for
+         * us.  This will be using the existing RX buffer.
+         */
+        sa1100_irda_rx_dma_start(si);
+
+        /* Account and free the packet. */
+        skb = si->dma_tx.skb;
+        if (skb) {
+                dma_unmap_sg(si->dma_tx.dev, &si->dma_tx.sg, 1,
+                             DMA_TO_DEVICE);
+                dev->stats.tx_packets ++;
+                dev->stats.tx_bytes += skb->len;
+                dev_kfree_skb_irq(skb);
+                si->dma_tx.skb = NULL;
         }
+
+        /*
+         * Make sure that the TX queue is available for sending
+         * (for retries).  TX has priority over RX at all times.
+         */
+        netif_wake_queue(dev);
+}
+
+static int sa1100_irda_fir_tx_start(struct sk_buff *skb, struct net_device *dev,
+        struct sa1100_irda *si)
+{
+        int mtt = irda_get_mtt(skb);
+
+        si->dma_tx.skb = skb;
+        sg_set_buf(&si->dma_tx.sg, skb->data, skb->len);
+        if (dma_map_sg(si->dma_tx.dev, &si->dma_tx.sg, 1, DMA_TO_DEVICE) == 0) {
+                si->dma_tx.skb = NULL;
+                netif_wake_queue(dev);
+                dev->stats.tx_dropped++;
+                dev_kfree_skb(skb);
+                return NETDEV_TX_OK;
+        }
+
+        sa1100_irda_dma_start(&si->dma_tx, DMA_MEM_TO_DEV, sa1100_irda_firtxdma_irq, dev);
+
+        /*
+         * If we have a mean turn-around time, impose the specified
+         * specified delay.  We could shorten this by timing from
+         * the point we received the packet.
+         */
+        if (mtt)
+                udelay(mtt);
+
+        Ser2HSCR0 = HSCR0_HSSP | HSCR0_TXE;
+
+        return NETDEV_TX_OK;
 }
 
 static void sa1100_irda_fir_error(struct sa1100_irda *si, struct net_device *dev)
 {
-        struct sk_buff *skb = si->rxskb;
-        dma_addr_t dma_addr;
+        struct sk_buff *skb = si->dma_rx.skb;
         unsigned int len, stat, data;
 
         if (!skb) {
@@ -469,11 +433,10 @@ static void sa1100_irda_fir_error(struct sa1100_irda *si, struct net_device *dev
         /*
          * Get the current data position.
          */
-        dma_addr = sa1100_get_dma_pos(si->rxdma);
-        len = dma_addr - si->rxbuf_dma;
+        len = sa1100_irda_dma_xferred(&si->dma_rx);
         if (len > HPSIR_MAX_RXLEN)
                 len = HPSIR_MAX_RXLEN;
-        dma_unmap_single(si->dev, si->rxbuf_dma, len, DMA_FROM_DEVICE);
+        dma_unmap_sg(si->dma_rx.dev, &si->dma_rx.sg, 1, DMA_FROM_DEVICE);
 
         do {
                 /*
@@ -501,7 +464,7 @@ static void sa1100_irda_fir_error(struct sa1100_irda *si, struct net_device *dev
         } while (Ser2HSSR0 & HSSR0_EIF);
 
         if (stat & HSSR1_EOF) {
-                si->rxskb = NULL;
+                si->dma_rx.skb = NULL;
 
                 skb_put(skb, len);
                 skb->dev = dev;
@@ -518,28 +481,23 @@ static void sa1100_irda_fir_error(struct sa1100_irda *si, struct net_device *dev
                 netif_rx(skb);
         } else {
                 /*
-                 * Remap the buffer.
+                 * Remap the buffer - it was previously mapped, and we
+                 * hope that this succeeds.
                  */
-                si->rxbuf_dma = dma_map_single(si->dev, si->rxskb->data,
-                                                HPSIR_MAX_RXLEN,
-                                                DMA_FROM_DEVICE);
+                dma_map_sg(si->dma_rx.dev, &si->dma_rx.sg, 1, DMA_FROM_DEVICE);
         }
 }
 
 /*
- * FIR format interrupt service routine.  We only have to
- * handle RX events; transmit events go via the TX DMA handler.
- *
- * No matter what, we disable RX, process, and the restart RX.
+ * We only have to handle RX events here; transmit events go via the TX
+ * DMA handler. We disable RX, process, and the restart RX.
  */
-static void sa1100_irda_fir_irq(struct net_device *dev)
+static irqreturn_t sa1100_irda_fir_irq(struct net_device *dev, struct sa1100_irda *si)
 {
-        struct sa1100_irda *si = netdev_priv(dev);
-
         /*
          * Stop RX DMA
          */
-        sa1100_stop_dma(si->rxdma);
+        dmaengine_pause(si->dma_rx.chan);
 
         /*
          * Framing error - we throw away the packet completely.
@@ -555,7 +513,7 @@ static void sa1100_irda_fir_irq(struct net_device *dev)
                 /*
                  * Clear out the DMA...
                  */
-                Ser2HSCR0 = si->hscr0 | HSCR0_HSSP;
+                Ser2HSCR0 = HSCR0_HSSP;
 
                 /*
                  * Clear selected status bits now, so we
@@ -577,74 +535,124 @@ static void sa1100_irda_fir_irq(struct net_device *dev)
          * No matter what happens, we must restart reception.
          */
         sa1100_irda_rx_dma_start(si);
-}
 
-static irqreturn_t sa1100_irda_irq(int irq, void *dev_id)
-{
-        struct net_device *dev = dev_id;
-        if (IS_FIR(((struct sa1100_irda *)netdev_priv(dev))))
-                sa1100_irda_fir_irq(dev);
-        else
-                sa1100_irda_hpsir_irq(dev);
         return IRQ_HANDLED;
 }
 
 /*
- * TX DMA completion handler.
+ * Set the IrDA communications speed.
  */
-static void sa1100_irda_txdma_irq(void *id)
+static int sa1100_irda_set_speed(struct sa1100_irda *si, int speed)
 {
-        struct net_device *dev = id;
-        struct sa1100_irda *si = netdev_priv(dev);
-        struct sk_buff *skb = si->txskb;
+        unsigned long flags;
+        int brd, ret = -EINVAL;
 
-        si->txskb = NULL;
+        switch (speed) {
+        case 9600:      case 19200:     case 38400:
+        case 57600:     case 115200:
+                brd = 3686400 / (16 * speed) - 1;
 
-        /*
-         * Wait for the transmission to complete.  Unfortunately,
-         * the hardware doesn't give us an interrupt to indicate
-         * "end of frame".
-         */
-        do
-                rmb();
-        while (!(Ser2HSSR0 & HSSR0_TUR) || Ser2HSSR1 & HSSR1_TBY);
+                /* Stop the receive DMA, and configure transmit. */
+                if (IS_FIR(si)) {
+                        dmaengine_terminate_all(si->dma_rx.chan);
+                        dmaengine_slave_config(si->dma_tx.chan,
+                                                &sa1100_irda_sir_tx);
+                }
 
-        /*
-         * Clear the transmit underrun bit.
-         */
-        Ser2HSSR0 = HSSR0_TUR;
+                local_irq_save(flags);
 
-        /*
-         * Do we need to change speed?  Note that we're lazy
-         * here - we don't free the old rxskb.  We don't need
-         * to allocate a buffer either.
-         */
-        if (si->newspeed) {
-                sa1100_irda_set_speed(si, si->newspeed);
-                si->newspeed = 0;
-        }
+                Ser2UTCR3 = 0;
+                Ser2HSCR0 = HSCR0_UART;
 
-        /*
-         * Start reception.  This disables the transmitter for
-         * us.  This will be using the existing RX buffer.
-         */
-        sa1100_irda_rx_dma_start(si);
+                Ser2UTCR1 = brd >> 8;
+                Ser2UTCR2 = brd;
 
-        /*
-         * Account and free the packet.
-         */
-        if (skb) {
-                dma_unmap_single(si->dev, si->txbuf_dma, skb->len, DMA_TO_DEVICE);
-                dev->stats.tx_packets ++;
-                dev->stats.tx_bytes += skb->len;
-                dev_kfree_skb_irq(skb);
+                /*
+                 * Clear status register
+                 */
+                Ser2UTSR0 = UTSR0_REB | UTSR0_RBB | UTSR0_RID;
+                Ser2UTCR3 = UTCR3_RIE | UTCR3_RXE | UTCR3_TXE;
+
+                if (si->pdata->set_speed)
+                        si->pdata->set_speed(si->dev, speed);
+
+                si->speed = speed;
+                si->tx_start = sa1100_irda_sir_tx_start;
+                si->irq = sa1100_irda_sir_irq;
+
+                local_irq_restore(flags);
+                ret = 0;
+                break;
+
+        case 4000000:
+                if (!IS_FIR(si))
+                        dmaengine_slave_config(si->dma_tx.chan,
+                                                &sa1100_irda_fir_tx);
+
+                local_irq_save(flags);
+
+                Ser2HSSR0 = 0xff;
+                Ser2HSCR0 = HSCR0_HSSP;
+                Ser2UTCR3 = 0;
+
+                si->speed = speed;
+                si->tx_start = sa1100_irda_fir_tx_start;
+                si->irq = sa1100_irda_fir_irq;
+
+                if (si->pdata->set_speed)
+                        si->pdata->set_speed(si->dev, speed);
+
+                sa1100_irda_rx_alloc(si);
+                sa1100_irda_rx_dma_start(si);
+
+                local_irq_restore(flags);
+
+                break;
+
+        default:
+                break;
         }
 
-        /*
-         * Make sure that the TX queue is available for sending
-         * (for retries).  TX has priority over RX at all times.
-         */
-        netif_wake_queue(dev);
+        return ret;
+}
+
+/*
+ * Control the power state of the IrDA transmitter.
+ * State:
+ *  0 - off
+ *  1 - short range, lowest power
+ *  2 - medium range, medium power
+ *  3 - maximum range, high power
+ *
+ * Currently, only assabet is known to support this.
+ */
+static int
+__sa1100_irda_set_power(struct sa1100_irda *si, unsigned int state)
+{
+        int ret = 0;
+        if (si->pdata->set_power)
+                ret = si->pdata->set_power(si->dev, state);
+        return ret;
+}
+
+static inline int
+sa1100_set_power(struct sa1100_irda *si, unsigned int state)
+{
+        int ret;
+
+        ret = __sa1100_irda_set_power(si, state);
+        if (ret == 0)
+                si->power = state;
+
+        return ret;
+}
+
+static irqreturn_t sa1100_irda_irq(int irq, void *dev_id)
+{
+        struct net_device *dev = dev_id;
+        struct sa1100_irda *si = netdev_priv(dev);
+
+        return si->irq(dev, si);
 }
 
 static int sa1100_irda_hard_xmit(struct sk_buff *skb, struct net_device *dev)
@@ -660,62 +668,19 @@ static int sa1100_irda_hard_xmit(struct sk_buff *skb, struct net_device *dev)
         if (speed != si->speed && speed != -1)
                 si->newspeed = speed;
 
-        /*
-         * If this is an empty frame, we can bypass a lot.
-         */
+        /* If this is an empty frame, we can bypass a lot. */
         if (skb->len == 0) {
-                if (si->newspeed) {
-                        si->newspeed = 0;
-                        sa1100_irda_set_speed(si, speed);
-                }
+                sa1100_irda_check_speed(si);
                 dev_kfree_skb(skb);
                 return NETDEV_TX_OK;
         }
 
-        if (!IS_FIR(si)) {
-                netif_stop_queue(dev);
-
-                si->tx_buff.data = si->tx_buff.head;
-                si->tx_buff.len  = async_wrap_skb(skb, si->tx_buff.data,
-                                                  si->tx_buff.truesize);
-
-                /*
-                 * Set the transmit interrupt enable.  This will fire
-                 * off an interrupt immediately.  Note that we disable
-                 * the receiver so we won't get spurious characteres
-                 * received.
-                 */
-                Ser2UTCR3 = UTCR3_TIE | UTCR3_TXE;
-
-                dev_kfree_skb(skb);
-        } else {
-                int mtt = irda_get_mtt(skb);
-
-                /*
-                 * We must not be transmitting...
-                 */
-                BUG_ON(si->txskb);
-
-                netif_stop_queue(dev);
-
-                si->txskb = skb;
-                si->txbuf_dma = dma_map_single(si->dev, skb->data,
-                                         skb->len, DMA_TO_DEVICE);
-
-                sa1100_start_dma(si->txdma, si->txbuf_dma, skb->len);
-
-                /*
-                 * If we have a mean turn-around time, impose the specified
-                 * specified delay.  We could shorten this by timing from
-                 * the point we received the packet.
-                 */
-                if (mtt)
-                        udelay(mtt);
+        netif_stop_queue(dev);
 
-                Ser2HSCR0 = si->hscr0 | HSCR0_HSSP | HSCR0_TXE;
-        }
+        /* We must not already have a skb to transmit... */
+        BUG_ON(si->dma_tx.skb);
 
-        return NETDEV_TX_OK;
+        return si->tx_start(skb, dev, si);
 }
 
 static int
@@ -762,6 +727,69 @@ sa1100_irda_ioctl(struct net_device *dev, struct ifreq *ifreq, int cmd)
         return ret;
 }
 
+static int sa1100_irda_startup(struct sa1100_irda *si)
+{
+        int ret;
+
+        /*
+         * Ensure that the ports for this device are setup correctly.
+         */
+        if (si->pdata->startup) {
+                ret = si->pdata->startup(si->dev);
+                if (ret)
+                        return ret;
+        }
+
+        /*
+         * Configure PPC for IRDA - we want to drive TXD2 low.
+         * We also want to drive this pin low during sleep.
+         */
+        PPSR &= ~PPC_TXD2;
+        PSDR &= ~PPC_TXD2;
+        PPDR |= PPC_TXD2;
+
+        /*
+         * Enable HP-SIR modulation, and ensure that the port is disabled.
+         */
+        Ser2UTCR3 = 0;
+        Ser2HSCR0 = HSCR0_UART;
+        Ser2UTCR4 = si->utcr4;
+        Ser2UTCR0 = UTCR0_8BitData;
+        Ser2HSCR2 = HSCR2_TrDataH | HSCR2_RcDataL;
+
+        /*
+         * Clear status register
+         */
+        Ser2UTSR0 = UTSR0_REB | UTSR0_RBB | UTSR0_RID;
+
+        ret = sa1100_irda_set_speed(si, si->speed = 9600);
+        if (ret) {
+                Ser2UTCR3 = 0;
+                Ser2HSCR0 = 0;
+
+                if (si->pdata->shutdown)
+                        si->pdata->shutdown(si->dev);
+        }
+
+        return ret;
+}
+
+static void sa1100_irda_shutdown(struct sa1100_irda *si)
+{
+        /*
+         * Stop all DMA activity.
+         */
+        dmaengine_terminate_all(si->dma_rx.chan);
+        dmaengine_terminate_all(si->dma_tx.chan);
+
+        /* Disable the port. */
+        Ser2UTCR3 = 0;
+        Ser2HSCR0 = 0;
+
+        if (si->pdata->shutdown)
+                si->pdata->shutdown(si->dev);
+}
+
 static int sa1100_irda_start(struct net_device *dev)
 {
         struct sa1100_irda *si = netdev_priv(dev);
@@ -769,26 +797,17 @@ static int sa1100_irda_start(struct net_device *dev)
 
         si->speed = 9600;
 
-        err = request_irq(dev->irq, sa1100_irda_irq, 0, dev->name, dev);
-        if (err)
-                goto err_irq;
-
-        err = sa1100_request_dma(DMA_Ser2HSSPRd, "IrDA receive",
-                                 NULL, NULL, &si->rxdma);
+        err = sa1100_irda_dma_request(si->dev, &si->dma_rx, "Ser2ICPRc",
+                                &sa1100_irda_fir_rx);
         if (err)
                 goto err_rx_dma;
 
-        err = sa1100_request_dma(DMA_Ser2HSSPWr, "IrDA transmit",
-                                 sa1100_irda_txdma_irq, dev, &si->txdma);
+        err = sa1100_irda_dma_request(si->dev, &si->dma_tx, "Ser2ICPTr",
+                                &sa1100_irda_sir_tx);
         if (err)
                 goto err_tx_dma;
 
         /*
-         * The interrupt must remain disabled for now.
-         */
-        disable_irq(dev->irq);
-
-        /*
          * Setup the serial port for the specified speed.
          */
         err = sa1100_irda_startup(si);
@@ -803,44 +822,60 @@ static int sa1100_irda_start(struct net_device *dev)
         if (!si->irlap)
                 goto err_irlap;
 
+        err = request_irq(dev->irq, sa1100_irda_irq, 0, dev->name, dev);
+        if (err)
+                goto err_irq;
+
         /*
          * Now enable the interrupt and start the queue
          */
         si->open = 1;
         sa1100_set_power(si, power_level); /* low power mode */
-        enable_irq(dev->irq);
+
         netif_start_queue(dev);
         return 0;
 
+err_irq:
+        irlap_close(si->irlap);
 err_irlap:
         si->open = 0;
         sa1100_irda_shutdown(si);
 err_startup:
-        sa1100_free_dma(si->txdma);
+        dma_release_channel(si->dma_tx.chan);
 err_tx_dma:
-        sa1100_free_dma(si->rxdma);
+        dma_release_channel(si->dma_rx.chan);
 err_rx_dma:
-        free_irq(dev->irq, dev);
-err_irq:
         return err;
 }
 
 static int sa1100_irda_stop(struct net_device *dev)
 {
         struct sa1100_irda *si = netdev_priv(dev);
+        struct sk_buff *skb;
+
+        netif_stop_queue(dev);
 
-        disable_irq(dev->irq);
+        si->open = 0;
         sa1100_irda_shutdown(si);
 
         /*
-         * If we have been doing DMA receive, make sure we
+         * If we have been doing any DMA activity, make sure we
          * tidy that up cleanly.
          */
-        if (si->rxskb) {
-                dma_unmap_single(si->dev, si->rxbuf_dma, HPSIR_MAX_RXLEN,
-                                 DMA_FROM_DEVICE);
-                dev_kfree_skb(si->rxskb);
-                si->rxskb = NULL;
+        skb = si->dma_rx.skb;
+        if (skb) {
+                dma_unmap_sg(si->dma_rx.dev, &si->dma_rx.sg, 1,
+                             DMA_FROM_DEVICE);
+                dev_kfree_skb(skb);
+                si->dma_rx.skb = NULL;
+        }
+
+        skb = si->dma_tx.skb;
+        if (skb) {
+                dma_unmap_sg(si->dma_tx.dev, &si->dma_tx.sg, 1,
+                             DMA_TO_DEVICE);
+                dev_kfree_skb(skb);
+                si->dma_tx.skb = NULL;
         }
 
         /* Stop IrLAP */
@@ -849,14 +884,11 @@ static int sa1100_irda_stop(struct net_device *dev)
                 si->irlap = NULL;
         }
 
-        netif_stop_queue(dev);
-        si->open = 0;
-
         /*
          * Free resources
          */
-        sa1100_free_dma(si->txdma);
-        sa1100_free_dma(si->rxdma);
+        dma_release_channel(si->dma_tx.chan);
+        dma_release_channel(si->dma_rx.chan);
         free_irq(dev->irq, dev);
 
         sa1100_set_power(si, 0);
@@ -888,11 +920,15 @@ static int sa1100_irda_probe(struct platform_device *pdev)
         struct net_device *dev;
         struct sa1100_irda *si;
         unsigned int baudrate_mask;
-        int err;
+        int err, irq;
 
         if (!pdev->dev.platform_data)
                 return -EINVAL;
 
+        irq = platform_get_irq(pdev, 0);
+        if (irq <= 0)
+                return irq < 0 ? irq : -ENXIO;
+
         err = request_mem_region(__PREG(Ser2UTCR0), 0x24, "IrDA") ? 0 : -EBUSY;
         if (err)
                 goto err_mem_1;
@@ -907,22 +943,27 @@ static int sa1100_irda_probe(struct platform_device *pdev)
         if (!dev)
                 goto err_mem_4;
 
+        SET_NETDEV_DEV(dev, &pdev->dev);
+
         si = netdev_priv(dev);
         si->dev = &pdev->dev;
         si->pdata = pdev->dev.platform_data;
 
+        sg_init_table(&si->dma_rx.sg, 1);
+        sg_init_table(&si->dma_tx.sg, 1);
+
         /*
          * Initialise the HP-SIR buffers
          */
         err = sa1100_irda_init_iobuf(&si->rx_buff, 14384);
         if (err)
                 goto err_mem_5;
-        err = sa1100_irda_init_iobuf(&si->tx_buff, 4000);
+        err = sa1100_irda_init_iobuf(&si->tx_buff, IRDA_SIR_MAX_FRAME);
         if (err)
                 goto err_mem_5;
 
         dev->netdev_ops = &sa1100_irda_netdev_ops;
-        dev->irq        = IRQ_Ser2ICP;
+        dev->irq        = irq;
 
         irda_init_max_qos_capabilies(&si->qos);
 
@@ -996,6 +1037,74 @@ static int sa1100_irda_remove(struct platform_device *pdev)
         return 0;
 }
 
+#ifdef CONFIG_PM
+/*
+ * Suspend the IrDA interface.
+ */
+static int sa1100_irda_suspend(struct platform_device *pdev, pm_message_t state)
+{
+        struct net_device *dev = platform_get_drvdata(pdev);
+        struct sa1100_irda *si;
+
+        if (!dev)
+                return 0;
+
+        si = netdev_priv(dev);
+        if (si->open) {
+                /*
+                 * Stop the transmit queue
+                 */
+                netif_device_detach(dev);
+                disable_irq(dev->irq);
+                sa1100_irda_shutdown(si);
+                __sa1100_irda_set_power(si, 0);
+        }
+
+        return 0;
+}
+
+/*
+ * Resume the IrDA interface.
+ */
+static int sa1100_irda_resume(struct platform_device *pdev)
+{
+        struct net_device *dev = platform_get_drvdata(pdev);
+        struct sa1100_irda *si;
+
+        if (!dev)
+                return 0;
+
+        si = netdev_priv(dev);
+        if (si->open) {
+                /*
+                 * If we missed a speed change, initialise at the new speed
+                 * directly.  It is debatable whether this is actually
+                 * required, but in the interests of continuing from where
+                 * we left off it is desirable.  The converse argument is
+                 * that we should re-negotiate at 9600 baud again.
+                 */
+                if (si->newspeed) {
+                        si->speed = si->newspeed;
+                        si->newspeed = 0;
+                }
+
+                sa1100_irda_startup(si);
+                __sa1100_irda_set_power(si, si->power);
+                enable_irq(dev->irq);
+
+                /*
+                 * This automatically wakes up the queue
+                 */
+                netif_device_attach(dev);
+        }
+
+        return 0;
+}
+#else
+#define sa1100_irda_suspend     NULL
+#define sa1100_irda_resume      NULL
+#endif
+
 static struct platform_driver sa1100ir_driver = {
         .probe          = sa1100_irda_probe,
         .remove         = sa1100_irda_remove,
diff --git a/drivers/net/loopback.c b/drivers/net/loopback.c
index b71998d0b5b..32eb94ece6c 100644
--- a/drivers/net/loopback.c
+++ b/drivers/net/loopback.c
@@ -41,7 +41,6 @@
 #include <linux/in.h>
 #include <linux/init.h>
 
-#include <asm/system.h>
 #include <asm/uaccess.h>
 #include <asm/io.h>
 
diff --git a/drivers/net/phy/icplus.c b/drivers/net/phy/icplus.c
index 0856e1b7a84..f08c85acf76 100644
--- a/drivers/net/phy/icplus.c
+++ b/drivers/net/phy/icplus.c
@@ -162,7 +162,8 @@ static int ip101a_g_config_init(struct phy_device *phydev)
         /* Enable Auto Power Saving mode */
         c = phy_read(phydev, IP10XX_SPEC_CTRL_STATUS);
         c |= IP101A_G_APS_ON;
-        return c;
+
+        return phy_write(phydev, IP10XX_SPEC_CTRL_STATUS, c);
 }
 
 static int ip175c_read_status(struct phy_device *phydev)
diff --git a/drivers/net/plip/plip.c b/drivers/net/plip/plip.c
index 1a5a316cc96..bed62d9c53c 100644
--- a/drivers/net/plip/plip.c
+++ b/drivers/net/plip/plip.c
@@ -113,7 +113,6 @@ static const char version[] = "NET3 PLIP version 2.4-parport gniibe@mri.co.jp\n"
 
 #include <net/neighbour.h>
 
-#include <asm/system.h>
 #include <asm/irq.h>
 #include <asm/byteorder.h>
 
diff --git a/drivers/net/ppp/ppp_generic.c b/drivers/net/ppp/ppp_generic.c
index 159da2905fe..33f8c51968b 100644
--- a/drivers/net/ppp/ppp_generic.c
+++ b/drivers/net/ppp/ppp_generic.c
@@ -235,7 +235,7 @@ struct ppp_net {
 /* Prototypes. */
 static int ppp_unattached_ioctl(struct net *net, struct ppp_file *pf,
                         struct file *file, unsigned int cmd, unsigned long arg);
-static void ppp_xmit_process(struct ppp *ppp);
+static int ppp_xmit_process(struct ppp *ppp);
 static void ppp_send_frame(struct ppp *ppp, struct sk_buff *skb);
 static void ppp_push(struct ppp *ppp);
 static void ppp_channel_push(struct channel *pch);
@@ -968,9 +968,9 @@ ppp_start_xmit(struct sk_buff *skb, struct net_device *dev)
         proto = npindex_to_proto[npi];
         put_unaligned_be16(proto, pp);
 
-        netif_stop_queue(dev);
         skb_queue_tail(&ppp->file.xq, skb);
-        ppp_xmit_process(ppp);
+        if (!ppp_xmit_process(ppp))
+                netif_stop_queue(dev);
         return NETDEV_TX_OK;
 
  outf:
@@ -1048,10 +1048,11 @@ static void ppp_setup(struct net_device *dev)
  * Called to do any work queued up on the transmit side
  * that can now be done.
  */
-static void
+static int
 ppp_xmit_process(struct ppp *ppp)
 {
         struct sk_buff *skb;
+        int ret = 0;
 
         ppp_xmit_lock(ppp);
         if (!ppp->closing) {
@@ -1061,10 +1062,13 @@ ppp_xmit_process(struct ppp *ppp)
                         ppp_send_frame(ppp, skb);
                 /* If there's no work left to do, tell the core net
                    code that we can accept some more. */
-                if (!ppp->xmit_pending && !skb_peek(&ppp->file.xq))
+                if (!ppp->xmit_pending && !skb_peek(&ppp->file.xq)) {
                         netif_wake_queue(ppp->dev);
+                        ret = 1;
+                }
         }
         ppp_xmit_unlock(ppp);
+        return ret;
 }
 
 static inline struct sk_buff *
diff --git a/drivers/net/rionet.c b/drivers/net/rionet.c
index a57f05726b5..91d25888a1b 100644
--- a/drivers/net/rionet.c
+++ b/drivers/net/rionet.c
@@ -375,8 +375,8 @@ static void rionet_remove(struct rio_dev *rdev)
         struct net_device *ndev = rio_get_drvdata(rdev);
         struct rionet_peer *peer, *tmp;
 
-        free_pages((unsigned long)rionet_active, rdev->net->hport->sys_size ?
-                                        __fls(sizeof(void *)) + 4 : 0);
+        free_pages((unsigned long)rionet_active, get_order(sizeof(void *) *
+                        RIO_MAX_ROUTE_ENTRIES(rdev->net->hport->sys_size)));
         unregister_netdev(ndev);
         free_netdev(ndev);
 
@@ -432,15 +432,16 @@ static int rionet_setup_netdev(struct rio_mport *mport, struct net_device *ndev)
         int rc = 0;
         struct rionet_private *rnet;
         u16 device_id;
+        const size_t rionet_active_bytes = sizeof(void *) *
+                                RIO_MAX_ROUTE_ENTRIES(mport->sys_size);
 
         rionet_active = (struct rio_dev **)__get_free_pages(GFP_KERNEL,
-                        mport->sys_size ? __fls(sizeof(void *)) + 4 : 0);
+                        get_order(rionet_active_bytes));
         if (!rionet_active) {
                 rc = -ENOMEM;
                 goto out;
         }
-        memset((void *)rionet_active, 0, sizeof(void *) *
-                                RIO_MAX_ROUTE_ENTRIES(mport->sys_size));
+        memset((void *)rionet_active, 0, rionet_active_bytes);
 
         /* Set up private area */
         rnet = netdev_priv(ndev);
diff --git a/drivers/net/slip/slhc.c b/drivers/net/slip/slhc.c
index 0a0a6643cf3..1252d9c726a 100644
--- a/drivers/net/slip/slhc.c
+++ b/drivers/net/slip/slhc.c
@@ -75,7 +75,6 @@
 #include <linux/skbuff.h>
 #include <net/sock.h>
 #include <linux/timer.h>
-#include <asm/system.h>
 #include <asm/uaccess.h>
 #include <net/checksum.h>
 #include <asm/unaligned.h>
diff --git a/drivers/net/slip/slip.c b/drivers/net/slip/slip.c
index 69345dfae0f..d4c9db3da22 100644
--- a/drivers/net/slip/slip.c
+++ b/drivers/net/slip/slip.c
@@ -64,7 +64,6 @@
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 
-#include <asm/system.h>
 #include <asm/uaccess.h>
 #include <linux/bitops.h>
 #include <linux/sched.h>
diff --git a/drivers/net/tokenring/3c359.c b/drivers/net/tokenring/3c359.c
index d7c292aa76b..b15ac81d46f 100644
--- a/drivers/net/tokenring/3c359.c
+++ b/drivers/net/tokenring/3c359.c
@@ -68,7 +68,6 @@
 #include <net/checksum.h>
 
 #include <asm/io.h>
-#include <asm/system.h>
 
 #include "3c359.h"
 
diff --git a/drivers/net/tokenring/abyss.c b/drivers/net/tokenring/abyss.c
index 515f122777a..b715e6b444d 100644
--- a/drivers/net/tokenring/abyss.c
+++ b/drivers/net/tokenring/abyss.c
@@ -33,7 +33,6 @@
 #include <linux/netdevice.h>
 #include <linux/trdevice.h>
 
-#include <asm/system.h>
 #include <asm/io.h>
 #include <asm/irq.h>
 
diff --git a/drivers/net/tokenring/ibmtr_cs.c b/drivers/net/tokenring/ibmtr_cs.c
index 91b684630fc..356e28e4881 100644
--- a/drivers/net/tokenring/ibmtr_cs.c
+++ b/drivers/net/tokenring/ibmtr_cs.c
@@ -63,7 +63,6 @@
 
 #include <asm/uaccess.h>
 #include <asm/io.h>
-#include <asm/system.h>
 
 #define PCMCIA
 #include "ibmtr.c"
diff --git a/drivers/net/tokenring/lanstreamer.c b/drivers/net/tokenring/lanstreamer.c
index 8d71e0d2906..3e4b4f09111 100644
--- a/drivers/net/tokenring/lanstreamer.c
+++ b/drivers/net/tokenring/lanstreamer.c
@@ -127,7 +127,6 @@
 #include <net/checksum.h>
 
 #include <asm/io.h>
-#include <asm/system.h>
 
 #include "lanstreamer.h"
 
diff --git a/drivers/net/tokenring/madgemc.c b/drivers/net/tokenring/madgemc.c
index 1cdc034f6ae..28adcdf3b14 100644
--- a/drivers/net/tokenring/madgemc.c
+++ b/drivers/net/tokenring/madgemc.c
@@ -28,7 +28,6 @@ static const char version[] = "madgemc.c: v0.91 23/01/2000 by Adam Fritzler\n";
 #include <linux/netdevice.h>
 #include <linux/trdevice.h>
 
-#include <asm/system.h>
 #include <asm/io.h>
 #include <asm/irq.h>
 
diff --git a/drivers/net/tokenring/olympic.c b/drivers/net/tokenring/olympic.c
index fd8dce90c95..0e234741cc7 100644
--- a/drivers/net/tokenring/olympic.c
+++ b/drivers/net/tokenring/olympic.c
@@ -106,7 +106,6 @@
 #include <net/net_namespace.h>
 
 #include <asm/io.h>
-#include <asm/system.h>
 
 #include "olympic.h"
 
diff --git a/drivers/net/tokenring/proteon.c b/drivers/net/tokenring/proteon.c
index 8d362e64a40..62d90e40f9e 100644
--- a/drivers/net/tokenring/proteon.c
+++ b/drivers/net/tokenring/proteon.c
@@ -31,7 +31,6 @@ static const char version[] = "proteon.c: v1.00 02/01/2003 by Jochen Friedrich\n
 #include <linux/trdevice.h>
 #include <linux/platform_device.h>
 
-#include <asm/system.h>
 #include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/pci.h>
diff --git a/drivers/net/tokenring/skisa.c b/drivers/net/tokenring/skisa.c
index 46db5c5395b..ee11e93dc30 100644
--- a/drivers/net/tokenring/skisa.c
+++ b/drivers/net/tokenring/skisa.c
@@ -38,7 +38,6 @@ static const char version[] = "skisa.c: v1.03 09/12/2002 by Jochen Friedrich\n";
 #include <linux/trdevice.h>
 #include <linux/platform_device.h>
 
-#include <asm/system.h>
 #include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/pci.h>
diff --git a/drivers/net/tokenring/smctr.c b/drivers/net/tokenring/smctr.c
index 029846a9863..cb35fb79e01 100644
--- a/drivers/net/tokenring/smctr.c
+++ b/drivers/net/tokenring/smctr.c
@@ -49,7 +49,6 @@
 #include <linux/bitops.h>
 #include <linux/firmware.h>
 
-#include <asm/system.h>
 #include <asm/io.h>
 #include <asm/dma.h>
 #include <asm/irq.h>
diff --git a/drivers/net/tokenring/tms380tr.c b/drivers/net/tokenring/tms380tr.c
index 102f896bbc5..be4813e0366 100644
--- a/drivers/net/tokenring/tms380tr.c
+++ b/drivers/net/tokenring/tms380tr.c
@@ -98,7 +98,6 @@ static const char version[] = "tms380tr.c: v1.10 30/12/2002 by Christoph Goos, A
 #include <linux/firmware.h>
 #include <linux/bitops.h>
 
-#include <asm/system.h>
 #include <asm/io.h>
 #include <asm/dma.h>
 #include <asm/irq.h>
diff --git a/drivers/net/tokenring/tmspci.c b/drivers/net/tokenring/tmspci.c
index d3e788a9cd1..fb9918da579 100644
--- a/drivers/net/tokenring/tmspci.c
+++ b/drivers/net/tokenring/tmspci.c
@@ -34,7 +34,6 @@
 #include <linux/netdevice.h>
 #include <linux/trdevice.h>
 
-#include <asm/system.h>
 #include <asm/io.h>
 #include <asm/irq.h>
 
diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index 74d7f76d14a..bb8c72c79c6 100644
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -69,7 +69,6 @@
 #include <net/rtnetlink.h>
 #include <net/sock.h>
 
-#include <asm/system.h>
 #include <asm/uaccess.h>
 
 /* Uncomment to enable debugging */
diff --git a/drivers/net/usb/cdc_eem.c b/drivers/net/usb/cdc_eem.c
index 439690be519..685a4e22c76 100644
--- a/drivers/net/usb/cdc_eem.c
+++ b/drivers/net/usb/cdc_eem.c
@@ -93,6 +93,7 @@ static int eem_bind(struct usbnet *dev, struct usb_interface *intf)
         /* no jumbogram (16K) support for now */
 
         dev->net->hard_header_len += EEM_HEAD + ETH_FCS_LEN;
+        dev->hard_mtu = dev->net->mtu + dev->net->hard_header_len;
 
         return 0;
 }
diff --git a/drivers/net/usb/rtl8150.c b/drivers/net/usb/rtl8150.c
index 6dda2fe5b15..d363b31053d 100644
--- a/drivers/net/usb/rtl8150.c
+++ b/drivers/net/usb/rtl8150.c
@@ -85,32 +85,6 @@
 #define INT_CRERR_CNT           0x06
 #define INT_COL_CNT             0x07
 
-/* Transmit status register errors */
-#define TSR_ECOL                (1<<5)
-#define TSR_LCOL                (1<<4)
-#define TSR_LOSS_CRS            (1<<3)
-#define TSR_JBR                 (1<<2)
-#define TSR_ERRORS              (TSR_ECOL | TSR_LCOL | TSR_LOSS_CRS | TSR_JBR)
-/* Receive status register errors */
-#define RSR_CRC                 (1<<2)
-#define RSR_FAE                 (1<<1)
-#define RSR_ERRORS              (RSR_CRC | RSR_FAE)
-
-/* Media status register definitions */
-#define MSR_DUPLEX              (1<<4)
-#define MSR_SPEED               (1<<3)
-#define MSR_LINK                (1<<2)
-
-/* Interrupt pipe data */
-#define INT_TSR                 0x00
-#define INT_RSR                 0x01
-#define INT_MSR                 0x02
-#define INT_WAKSR               0x03
-#define INT_TXOK_CNT            0x04
-#define INT_RXLOST_CNT          0x05
-#define INT_CRERR_CNT           0x06
-#define INT_COL_CNT             0x07
-
 
 #define RTL8150_MTU             1540
 #define RTL8150_TX_TIMEOUT      (HZ)
diff --git a/drivers/net/wan/Kconfig b/drivers/net/wan/Kconfig
index 423eb26386c..d70ede7a7f9 100644
--- a/drivers/net/wan/Kconfig
+++ b/drivers/net/wan/Kconfig
@@ -290,8 +290,8 @@ config FARSYNC
           Frame Relay or X.25/LAPB.
 
           If you want the module to be automatically loaded when the interface
-          is referenced then you should add "alias hdlcX farsync" to
-          /etc/modprobe.conf for each interface, where X is 0, 1, 2, ..., or
+          is referenced then you should add "alias hdlcX farsync" to a file
+          in /etc/modprobe.d/ for each interface, where X is 0, 1, 2, ..., or
           simply use "alias hdlc* farsync" to indicate all of them.
 
           To compile this driver as a module, choose M here: the
diff --git a/drivers/net/wan/dlci.c b/drivers/net/wan/dlci.c
index 48ab38a34c5..147614ed86a 100644
--- a/drivers/net/wan/dlci.c
+++ b/drivers/net/wan/dlci.c
@@ -50,7 +50,6 @@
 
 #include <net/sock.h>
 
-#include <asm/system.h>
 #include <asm/io.h>
 #include <asm/dma.h>
 #include <asm/uaccess.h>
diff --git a/drivers/net/wan/dscc4.c b/drivers/net/wan/dscc4.c
index fe8d060d8ff..c676de7de02 100644
--- a/drivers/net/wan/dscc4.c
+++ b/drivers/net/wan/dscc4.c
@@ -93,7 +93,6 @@
 #include <linux/mm.h>
 #include <linux/slab.h>
 
-#include <asm/system.h>
 #include <asm/cache.h>
 #include <asm/byteorder.h>
 #include <asm/uaccess.h>
diff --git a/drivers/net/wan/hd64570.c b/drivers/net/wan/hd64570.c
index 33b67d88fce..cf4903355a3 100644
--- a/drivers/net/wan/hd64570.c
+++ b/drivers/net/wan/hd64570.c
@@ -40,7 +40,6 @@
 #include <linux/string.h>
 #include <linux/types.h>
 #include <asm/io.h>
-#include <asm/system.h>
 #include <asm/uaccess.h>
 #include "hd64570.h"
 
diff --git a/drivers/net/wan/hd64572.c b/drivers/net/wan/hd64572.c
index efc0db10118..e2779faa6c4 100644
--- a/drivers/net/wan/hd64572.c
+++ b/drivers/net/wan/hd64572.c
@@ -40,7 +40,6 @@
 #include <linux/string.h>
 #include <linux/types.h>
 #include <asm/io.h>
-#include <asm/system.h>
 #include <asm/uaccess.h>
 #include "hd64572.h"
 
diff --git a/drivers/net/wan/lapbether.c b/drivers/net/wan/lapbether.c
index 7beeb9b88a3..a73b49eb87e 100644
--- a/drivers/net/wan/lapbether.c
+++ b/drivers/net/wan/lapbether.c
@@ -35,7 +35,6 @@
 #include <linux/if_arp.h>
 #include <linux/skbuff.h>
 #include <net/sock.h>
-#include <asm/system.h>
 #include <asm/uaccess.h>
 #include <linux/mm.h>
 #include <linux/interrupt.h>
diff --git a/drivers/net/wan/sdla.c b/drivers/net/wan/sdla.c
index c8531612eea..de3bbf43fc5 100644
--- a/drivers/net/wan/sdla.c
+++ b/drivers/net/wan/sdla.c
@@ -54,7 +54,6 @@
 #include <linux/sdla.h>
 #include <linux/bitops.h>
 
-#include <asm/system.h>
 #include <asm/io.h>
 #include <asm/dma.h>
 #include <asm/uaccess.h>
diff --git a/drivers/net/wan/x25_asy.c b/drivers/net/wan/x25_asy.c
index e862369b4a6..d7a65e141d1 100644
--- a/drivers/net/wan/x25_asy.c
+++ b/drivers/net/wan/x25_asy.c
@@ -18,7 +18,6 @@
 
 #include <linux/module.h>
 
-#include <asm/system.h>
 #include <linux/uaccess.h>
 #include <linux/bitops.h>
 #include <linux/string.h>
diff --git a/drivers/net/wimax/i2400m/debugfs.c b/drivers/net/wimax/i2400m/debugfs.c
index 129ba36bd04..4b66ab1d0e5 100644
--- a/drivers/net/wimax/i2400m/debugfs.c
+++ b/drivers/net/wimax/i2400m/debugfs.c
@@ -53,17 +53,6 @@ struct dentry *debugfs_create_netdev_queue_stopped(
                                    &fops_netdev_queue_stopped);
 }
 
-
-/*
- * inode->i_private has the @data argument to debugfs_create_file()
- */
-static
-int i2400m_stats_open(struct inode *inode, struct file *filp)
-{
-        filp->private_data = inode->i_private;
-        return 0;
-}
-
 /*
  * We don't allow partial reads of this file, as then the reader would
  * get weirdly confused data as it is updated.
@@ -117,7 +106,7 @@ ssize_t i2400m_rx_stats_write(struct file *filp, const char __user *buffer,
 static
 const struct file_operations i2400m_rx_stats_fops = {
         .owner =        THIS_MODULE,
-        .open =         i2400m_stats_open,
+        .open =         simple_open,
         .read =         i2400m_rx_stats_read,
         .write =        i2400m_rx_stats_write,
         .llseek =       default_llseek,
@@ -170,7 +159,7 @@ ssize_t i2400m_tx_stats_write(struct file *filp, const char __user *buffer,
 static
 const struct file_operations i2400m_tx_stats_fops = {
         .owner =        THIS_MODULE,
-        .open =         i2400m_stats_open,
+        .open =         simple_open,
         .read =         i2400m_tx_stats_read,
         .write =        i2400m_tx_stats_write,
         .llseek =       default_llseek,
diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c
index ddc061dd150..520a4b2eb9c 100644
--- a/drivers/net/wireless/airo.c
+++ b/drivers/net/wireless/airo.c
@@ -37,7 +37,6 @@
 #include <linux/scatterlist.h>
 #include <linux/crypto.h>
 #include <asm/io.h>
-#include <asm/system.h>
 #include <asm/unaligned.h>
 
 #include <linux/netdevice.h>
diff --git a/drivers/net/wireless/airo_cs.c b/drivers/net/wireless/airo_cs.c
index c983c10e0f6..630577dd3a7 100644
--- a/drivers/net/wireless/airo_cs.c
+++ b/drivers/net/wireless/airo_cs.c
@@ -37,7 +37,6 @@
 #include <pcmcia/ds.h>
 
 #include <linux/io.h>
-#include <asm/system.h>
 
 #include "airo.h"
 
diff --git a/drivers/net/wireless/ath/ath5k/debug.c b/drivers/net/wireless/ath/ath5k/debug.c
index 8c5ce8b0c73..e5e8f45d86a 100644
--- a/drivers/net/wireless/ath/ath5k/debug.c
+++ b/drivers/net/wireless/ath/ath5k/debug.c
@@ -71,13 +71,6 @@ static unsigned int ath5k_debug;
 module_param_named(debug, ath5k_debug, uint, 0);
 
 
-static int ath5k_debugfs_open(struct inode *inode, struct file *file)
-{
-        file->private_data = inode->i_private;
-        return 0;
-}
-
-
 /* debugfs: registers */
 
 struct reg {
@@ -265,7 +258,7 @@ static ssize_t write_file_beacon(struct file *file,
 static const struct file_operations fops_beacon = {
         .read = read_file_beacon,
         .write = write_file_beacon,
-        .open = ath5k_debugfs_open,
+        .open = simple_open,
         .owner = THIS_MODULE,
         .llseek = default_llseek,
 };
@@ -285,7 +278,7 @@ static ssize_t write_file_reset(struct file *file,
 
 static const struct file_operations fops_reset = {
         .write = write_file_reset,
-        .open = ath5k_debugfs_open,
+        .open = simple_open,
         .owner = THIS_MODULE,
         .llseek = noop_llseek,
 };
@@ -365,7 +358,7 @@ static ssize_t write_file_debug(struct file *file,
 static const struct file_operations fops_debug = {
         .read = read_file_debug,
         .write = write_file_debug,
-        .open = ath5k_debugfs_open,
+        .open = simple_open,
         .owner = THIS_MODULE,
         .llseek = default_llseek,
 };
@@ -477,7 +470,7 @@ static ssize_t write_file_antenna(struct file *file,
 static const struct file_operations fops_antenna = {
         .read = read_file_antenna,
         .write = write_file_antenna,
-        .open = ath5k_debugfs_open,
+        .open = simple_open,
         .owner = THIS_MODULE,
         .llseek = default_llseek,
 };
@@ -532,7 +525,7 @@ static ssize_t read_file_misc(struct file *file, char __user *user_buf,
 
 static const struct file_operations fops_misc = {
         .read = read_file_misc,
-        .open = ath5k_debugfs_open,
+        .open = simple_open,
         .owner = THIS_MODULE,
 };
 
@@ -647,7 +640,7 @@ static ssize_t write_file_frameerrors(struct file *file,
 static const struct file_operations fops_frameerrors = {
         .read = read_file_frameerrors,
         .write = write_file_frameerrors,
-        .open = ath5k_debugfs_open,
+        .open = simple_open,
         .owner = THIS_MODULE,
         .llseek = default_llseek,
 };
@@ -810,7 +803,7 @@ static ssize_t write_file_ani(struct file *file,
 static const struct file_operations fops_ani = {
         .read = read_file_ani,
         .write = write_file_ani,
-        .open = ath5k_debugfs_open,
+        .open = simple_open,
         .owner = THIS_MODULE,
         .llseek = default_llseek,
 };
@@ -881,7 +874,7 @@ static ssize_t write_file_queue(struct file *file,
 static const struct file_operations fops_queue = {
         .read = read_file_queue,
         .write = write_file_queue,
-        .open = ath5k_debugfs_open,
+        .open = simple_open,
         .owner = THIS_MODULE,
         .llseek = default_llseek,
 };
diff --git a/drivers/net/wireless/ath/ath6kl/debug.c b/drivers/net/wireless/ath/ath6kl/debug.c
index 552adb3f80d..d01403a263f 100644
--- a/drivers/net/wireless/ath/ath6kl/debug.c
+++ b/drivers/net/wireless/ath/ath6kl/debug.c
@@ -217,12 +217,6 @@ void dump_cred_dist_stats(struct htc_target *target)
                    target->credit_info->cur_free_credits);
 }
 
-static int ath6kl_debugfs_open(struct inode *inode, struct file *file)
-{
-        file->private_data = inode->i_private;
-        return 0;
-}
-
 void ath6kl_debug_war(struct ath6kl *ar, enum ath6kl_war war)
 {
         switch (war) {
@@ -263,7 +257,7 @@ static ssize_t read_file_war_stats(struct file *file, char __user *user_buf,
 
 static const struct file_operations fops_war_stats = {
         .read = read_file_war_stats,
-        .open = ath6kl_debugfs_open,
+        .open = simple_open,
         .owner = THIS_MODULE,
         .llseek = default_llseek,
 };
@@ -488,7 +482,7 @@ static ssize_t ath6kl_fwlog_mask_write(struct file *file,
 }
 
 static const struct file_operations fops_fwlog_mask = {
-        .open = ath6kl_debugfs_open,
+        .open = simple_open,
         .read = ath6kl_fwlog_mask_read,
         .write = ath6kl_fwlog_mask_write,
         .owner = THIS_MODULE,
@@ -634,7 +628,7 @@ static ssize_t read_file_tgt_stats(struct file *file, char __user *user_buf,
 
 static const struct file_operations fops_tgt_stats = {
         .read = read_file_tgt_stats,
-        .open = ath6kl_debugfs_open,
+        .open = simple_open,
         .owner = THIS_MODULE,
         .llseek = default_llseek,
 };
@@ -699,7 +693,7 @@ static ssize_t read_file_credit_dist_stats(struct file *file,
 
 static const struct file_operations fops_credit_dist_stats = {
         .read = read_file_credit_dist_stats,
-        .open = ath6kl_debugfs_open,
+        .open = simple_open,
         .owner = THIS_MODULE,
         .llseek = default_llseek,
 };
@@ -802,7 +796,7 @@ static ssize_t ath6kl_endpoint_stats_write(struct file *file,
 }
 
 static const struct file_operations fops_endpoint_stats = {
-        .open = ath6kl_debugfs_open,
+        .open = simple_open,
         .read = ath6kl_endpoint_stats_read,
         .write = ath6kl_endpoint_stats_write,
         .owner = THIS_MODULE,
@@ -875,7 +869,7 @@ static ssize_t ath6kl_regread_write(struct file *file,
 static const struct file_operations fops_diag_reg_read = {
         .read = ath6kl_regread_read,
         .write = ath6kl_regread_write,
-        .open = ath6kl_debugfs_open,
+        .open = simple_open,
         .owner = THIS_MODULE,
         .llseek = default_llseek,
 };
@@ -999,7 +993,7 @@ static ssize_t ath6kl_lrssi_roam_read(struct file *file,
 static const struct file_operations fops_lrssi_roam_threshold = {
         .read = ath6kl_lrssi_roam_read,
         .write = ath6kl_lrssi_roam_write,
-        .open = ath6kl_debugfs_open,
+        .open = simple_open,
         .owner = THIS_MODULE,
         .llseek = default_llseek,
 };
@@ -1061,7 +1055,7 @@ static ssize_t ath6kl_regwrite_write(struct file *file,
 static const struct file_operations fops_diag_reg_write = {
         .read = ath6kl_regwrite_read,
         .write = ath6kl_regwrite_write,
-        .open = ath6kl_debugfs_open,
+        .open = simple_open,
         .owner = THIS_MODULE,
         .llseek = default_llseek,
 };
@@ -1166,7 +1160,7 @@ static ssize_t ath6kl_roam_table_read(struct file *file, char __user *user_buf,
 
 static const struct file_operations fops_roam_table = {
         .read = ath6kl_roam_table_read,
-        .open = ath6kl_debugfs_open,
+        .open = simple_open,
         .owner = THIS_MODULE,
         .llseek = default_llseek,
 };
@@ -1204,7 +1198,7 @@ static ssize_t ath6kl_force_roam_write(struct file *file,
 
 static const struct file_operations fops_force_roam = {
         .write = ath6kl_force_roam_write,
-        .open = ath6kl_debugfs_open,
+        .open = simple_open,
         .owner = THIS_MODULE,
         .llseek = default_llseek,
 };
@@ -1244,7 +1238,7 @@ static ssize_t ath6kl_roam_mode_write(struct file *file,
 
 static const struct file_operations fops_roam_mode = {
         .write = ath6kl_roam_mode_write,
-        .open = ath6kl_debugfs_open,
+        .open = simple_open,
         .owner = THIS_MODULE,
         .llseek = default_llseek,
 };
@@ -1286,7 +1280,7 @@ static ssize_t ath6kl_keepalive_write(struct file *file,
 }
 
 static const struct file_operations fops_keepalive = {
-        .open = ath6kl_debugfs_open,
+        .open = simple_open,
         .read = ath6kl_keepalive_read,
         .write = ath6kl_keepalive_write,
         .owner = THIS_MODULE,
@@ -1331,7 +1325,7 @@ static ssize_t ath6kl_disconnect_timeout_write(struct file *file,
 }
 
 static const struct file_operations fops_disconnect_timeout = {
-        .open = ath6kl_debugfs_open,
+        .open = simple_open,
         .read = ath6kl_disconnect_timeout_read,
         .write = ath6kl_disconnect_timeout_write,
         .owner = THIS_MODULE,
@@ -1512,7 +1506,7 @@ static ssize_t ath6kl_create_qos_write(struct file *file,
 
 static const struct file_operations fops_create_qos = {
         .write = ath6kl_create_qos_write,
-        .open = ath6kl_debugfs_open,
+        .open = simple_open,
         .owner = THIS_MODULE,
         .llseek = default_llseek,
 };
@@ -1560,7 +1554,7 @@ static ssize_t ath6kl_delete_qos_write(struct file *file,
 
 static const struct file_operations fops_delete_qos = {
         .write = ath6kl_delete_qos_write,
-        .open = ath6kl_debugfs_open,
+        .open = simple_open,
         .owner = THIS_MODULE,
         .llseek = default_llseek,
 };
@@ -1593,7 +1587,7 @@ static ssize_t ath6kl_bgscan_int_write(struct file *file,
 
 static const struct file_operations fops_bgscan_int = {
         .write = ath6kl_bgscan_int_write,
-        .open = ath6kl_debugfs_open,
+        .open = simple_open,
         .owner = THIS_MODULE,
         .llseek = default_llseek,
 };
@@ -1651,7 +1645,7 @@ static ssize_t ath6kl_listen_int_read(struct file *file,
 static const struct file_operations fops_listen_int = {
         .read = ath6kl_listen_int_read,
         .write = ath6kl_listen_int_write,
-        .open = ath6kl_debugfs_open,
+        .open = simple_open,
         .owner = THIS_MODULE,
         .llseek = default_llseek,
 };
@@ -1711,7 +1705,7 @@ static ssize_t ath6kl_power_params_write(struct file *file,
 
 static const struct file_operations fops_power_params = {
         .write = ath6kl_power_params_write,
-        .open = ath6kl_debugfs_open,
+        .open = simple_open,
         .owner = THIS_MODULE,
         .llseek = default_llseek,
 };
diff --git a/drivers/net/wireless/ath/ath9k/debug.c b/drivers/net/wireless/ath/ath9k/debug.c
index 35d1c8e91d1..ff47b32ecaf 100644
--- a/drivers/net/wireless/ath/ath9k/debug.c
+++ b/drivers/net/wireless/ath/ath9k/debug.c
@@ -26,11 +26,6 @@
 #define REG_READ_D(_ah, _reg) \
         ath9k_hw_common(_ah)->ops->read((_ah), (_reg))
 
-static int ath9k_debugfs_open(struct inode *inode, struct file *file)
-{
-        file->private_data = inode->i_private;
-        return 0;
-}
 
 static ssize_t ath9k_debugfs_read_buf(struct file *file, char __user *user_buf,
                                       size_t count, loff_t *ppos)
@@ -83,7 +78,7 @@ static ssize_t write_file_debug(struct file *file, const char __user *user_buf,
 static const struct file_operations fops_debug = {
         .read = read_file_debug,
         .write = write_file_debug,
-        .open = ath9k_debugfs_open,
+        .open = simple_open,
         .owner = THIS_MODULE,
         .llseek = default_llseek,
 };
@@ -129,7 +124,7 @@ static ssize_t write_file_tx_chainmask(struct file *file, const char __user *use
 static const struct file_operations fops_tx_chainmask = {
         .read = read_file_tx_chainmask,
         .write = write_file_tx_chainmask,
-        .open = ath9k_debugfs_open,
+        .open = simple_open,
         .owner = THIS_MODULE,
         .llseek = default_llseek,
 };
@@ -172,7 +167,7 @@ static ssize_t write_file_rx_chainmask(struct file *file, const char __user *use
 static const struct file_operations fops_rx_chainmask = {
         .read = read_file_rx_chainmask,
         .write = write_file_rx_chainmask,
-        .open = ath9k_debugfs_open,
+        .open = simple_open,
         .owner = THIS_MODULE,
         .llseek = default_llseek,
 };
@@ -223,7 +218,7 @@ static ssize_t write_file_disable_ani(struct file *file,
 static const struct file_operations fops_disable_ani = {
         .read = read_file_disable_ani,
         .write = write_file_disable_ani,
-        .open = ath9k_debugfs_open,
+        .open = simple_open,
         .owner = THIS_MODULE,
         .llseek = default_llseek,
 };
@@ -324,7 +319,7 @@ static ssize_t read_file_dma(struct file *file, char __user *user_buf,
 
 static const struct file_operations fops_dma = {
         .read = read_file_dma,
-        .open = ath9k_debugfs_open,
+        .open = simple_open,
         .owner = THIS_MODULE,
         .llseek = default_llseek,
 };
@@ -446,7 +441,7 @@ static ssize_t read_file_interrupt(struct file *file, char __user *user_buf,
 
 static const struct file_operations fops_interrupt = {
         .read = read_file_interrupt,
-        .open = ath9k_debugfs_open,
+        .open = simple_open,
         .owner = THIS_MODULE,
         .llseek = default_llseek,
 };
@@ -852,28 +847,28 @@ void ath_debug_stat_tx(struct ath_softc *sc, struct ath_buf *bf,
 
 static const struct file_operations fops_xmit = {
         .read = read_file_xmit,
-        .open = ath9k_debugfs_open,
+        .open = simple_open,
         .owner = THIS_MODULE,
         .llseek = default_llseek,
 };
 
 static const struct file_operations fops_stations = {
         .read = read_file_stations,
-        .open = ath9k_debugfs_open,
+        .open = simple_open,
         .owner = THIS_MODULE,
         .llseek = default_llseek,
 };
 
 static const struct file_operations fops_misc = {
         .read = read_file_misc,
-        .open = ath9k_debugfs_open,
+        .open = simple_open,
         .owner = THIS_MODULE,
         .llseek = default_llseek,
 };
 
 static const struct file_operations fops_reset = {
         .read = read_file_reset,
-        .open = ath9k_debugfs_open,
+        .open = simple_open,
         .owner = THIS_MODULE,
         .llseek = default_llseek,
 };
@@ -1016,7 +1011,7 @@ void ath_debug_stat_rx(struct ath_softc *sc, struct ath_rx_status *rs)
 
 static const struct file_operations fops_recv = {
         .read = read_file_recv,
-        .open = ath9k_debugfs_open,
+        .open = simple_open,
         .owner = THIS_MODULE,
         .llseek = default_llseek,
 };
@@ -1055,7 +1050,7 @@ static ssize_t write_file_regidx(struct file *file, const char __user *user_buf,
 static const struct file_operations fops_regidx = {
         .read = read_file_regidx,
         .write = write_file_regidx,
-        .open = ath9k_debugfs_open,
+        .open = simple_open,
         .owner = THIS_MODULE,
         .llseek = default_llseek,
 };
@@ -1102,7 +1097,7 @@ static ssize_t write_file_regval(struct file *file, const char __user *user_buf,
 static const struct file_operations fops_regval = {
         .read = read_file_regval,
         .write = write_file_regval,
-        .open = ath9k_debugfs_open,
+        .open = simple_open,
         .owner = THIS_MODULE,
         .llseek = default_llseek,
 };
@@ -1191,7 +1186,7 @@ static ssize_t read_file_dump_nfcal(struct file *file, char __user *user_buf,
 
 static const struct file_operations fops_dump_nfcal = {
         .read = read_file_dump_nfcal,
-        .open = ath9k_debugfs_open,
+        .open = simple_open,
         .owner = THIS_MODULE,
         .llseek = default_llseek,
 };
@@ -1219,7 +1214,7 @@ static ssize_t read_file_base_eeprom(struct file *file, char __user *user_buf,
 
 static const struct file_operations fops_base_eeprom = {
         .read = read_file_base_eeprom,
-        .open = ath9k_debugfs_open,
+        .open = simple_open,
         .owner = THIS_MODULE,
         .llseek = default_llseek,
 };
@@ -1247,7 +1242,7 @@ static ssize_t read_file_modal_eeprom(struct file *file, char __user *user_buf,
 
 static const struct file_operations fops_modal_eeprom = {
         .read = read_file_modal_eeprom,
-        .open = ath9k_debugfs_open,
+        .open = simple_open,
         .owner = THIS_MODULE,
         .llseek = default_llseek,
 };
diff --git a/drivers/net/wireless/ath/ath9k/dfs_debug.c b/drivers/net/wireless/ath/ath9k/dfs_debug.c
index 106d031d834..4364c103ed3 100644
--- a/drivers/net/wireless/ath/ath9k/dfs_debug.c
+++ b/drivers/net/wireless/ath/ath9k/dfs_debug.c
@@ -60,16 +60,9 @@ static ssize_t read_file_dfs(struct file *file, char __user *user_buf,
         return retval;
 }
 
-static int ath9k_dfs_debugfs_open(struct inode *inode, struct file *file)
-{
-        file->private_data = inode->i_private;
-
-        return 0;
-}
-
 static const struct file_operations fops_dfs_stats = {
         .read = read_file_dfs,
-        .open = ath9k_dfs_debugfs_open,
+        .open = simple_open,
         .owner = THIS_MODULE,
         .llseek = default_llseek,
 };
diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_debug.c b/drivers/net/wireless/ath/ath9k/htc_drv_debug.c
index d3ff33c71aa..3035deb7a0c 100644
--- a/drivers/net/wireless/ath/ath9k/htc_drv_debug.c
+++ b/drivers/net/wireless/ath/ath9k/htc_drv_debug.c
@@ -16,12 +16,6 @@
 
 #include "htc.h"
 
-static int ath9k_debugfs_open(struct inode *inode, struct file *file)
-{
-        file->private_data = inode->i_private;
-        return 0;
-}
-
 static ssize_t read_file_tgt_int_stats(struct file *file, char __user *user_buf,
                                        size_t count, loff_t *ppos)
 {
@@ -75,7 +69,7 @@ static ssize_t read_file_tgt_int_stats(struct file *file, char __user *user_buf,
 
 static const struct file_operations fops_tgt_int_stats = {
         .read = read_file_tgt_int_stats,
-        .open = ath9k_debugfs_open,
+        .open = simple_open,
         .owner = THIS_MODULE,
         .llseek = default_llseek,
 };
@@ -145,7 +139,7 @@ static ssize_t read_file_tgt_tx_stats(struct file *file, char __user *user_buf,
 
 static const struct file_operations fops_tgt_tx_stats = {
         .read = read_file_tgt_tx_stats,
-        .open = ath9k_debugfs_open,
+        .open = simple_open,
         .owner = THIS_MODULE,
         .llseek = default_llseek,
 };
@@ -191,7 +185,7 @@ static ssize_t read_file_tgt_rx_stats(struct file *file, char __user *user_buf,
 
 static const struct file_operations fops_tgt_rx_stats = {
         .read = read_file_tgt_rx_stats,
-        .open = ath9k_debugfs_open,
+        .open = simple_open,
         .owner = THIS_MODULE,
         .llseek = default_llseek,
 };
@@ -243,7 +237,7 @@ static ssize_t read_file_xmit(struct file *file, char __user *user_buf,
 
 static const struct file_operations fops_xmit = {
         .read = read_file_xmit,
-        .open = ath9k_debugfs_open,
+        .open = simple_open,
         .owner = THIS_MODULE,
         .llseek = default_llseek,
 };
@@ -364,7 +358,7 @@ static ssize_t read_file_recv(struct file *file, char __user *user_buf,
 
 static const struct file_operations fops_recv = {
         .read = read_file_recv,
-        .open = ath9k_debugfs_open,
+        .open = simple_open,
         .owner = THIS_MODULE,
         .llseek = default_llseek,
 };
@@ -399,7 +393,7 @@ static ssize_t read_file_slot(struct file *file, char __user *user_buf,
 
 static const struct file_operations fops_slot = {
         .read = read_file_slot,
-        .open = ath9k_debugfs_open,
+        .open = simple_open,
         .owner = THIS_MODULE,
         .llseek = default_llseek,
 };
@@ -446,7 +440,7 @@ static ssize_t read_file_queue(struct file *file, char __user *user_buf,
 
 static const struct file_operations fops_queue = {
         .read = read_file_queue,
-        .open = ath9k_debugfs_open,
+        .open = simple_open,
         .owner = THIS_MODULE,
         .llseek = default_llseek,
 };
@@ -487,7 +481,7 @@ static ssize_t write_file_debug(struct file *file, const char __user *user_buf,
 static const struct file_operations fops_debug = {
         .read = read_file_debug,
         .write = write_file_debug,
-        .open = ath9k_debugfs_open,
+        .open = simple_open,
         .owner = THIS_MODULE,
         .llseek = default_llseek,
 };
@@ -636,7 +630,7 @@ static ssize_t read_file_base_eeprom(struct file *file, char __user *user_buf,
 
 static const struct file_operations fops_base_eeprom = {
         .read = read_file_base_eeprom,
-        .open = ath9k_debugfs_open,
+        .open = simple_open,
         .owner = THIS_MODULE,
         .llseek = default_llseek,
 };
@@ -917,7 +911,7 @@ static ssize_t read_file_modal_eeprom(struct file *file, char __user *user_buf,
 
 static const struct file_operations fops_modal_eeprom = {
         .read = read_file_modal_eeprom,
-        .open = ath9k_debugfs_open,
+        .open = simple_open,
         .owner = THIS_MODULE,
         .llseek = default_llseek,
 };
diff --git a/drivers/net/wireless/ath/ath9k/rc.c b/drivers/net/wireless/ath/ath9k/rc.c
index 4f848493fec..08bb4553270 100644
--- a/drivers/net/wireless/ath/ath9k/rc.c
+++ b/drivers/net/wireless/ath/ath9k/rc.c
@@ -1480,12 +1480,6 @@ static void ath_rate_update(void *priv, struct ieee80211_supported_band *sband,
 
 #ifdef CONFIG_ATH9K_DEBUGFS
 
-static int ath9k_debugfs_open(struct inode *inode, struct file *file)
-{
-        file->private_data = inode->i_private;
-        return 0;
-}
-
 static ssize_t read_file_rcstat(struct file *file, char __user *user_buf,
                                 size_t count, loff_t *ppos)
 {
@@ -1553,7 +1547,7 @@ static ssize_t read_file_rcstat(struct file *file, char __user *user_buf,
 
 static const struct file_operations fops_rcstat = {
         .read = read_file_rcstat,
-        .open = ath9k_debugfs_open,
+        .open = simple_open,
         .owner = THIS_MODULE
 };
 
diff --git a/drivers/net/wireless/ath/carl9170/debug.c b/drivers/net/wireless/ath/carl9170/debug.c
index 3c164226687..93fe6003a49 100644
--- a/drivers/net/wireless/ath/carl9170/debug.c
+++ b/drivers/net/wireless/ath/carl9170/debug.c
@@ -48,11 +48,6 @@
 #define ADD(buf, off, max, fmt, args...)                                \
         off += snprintf(&buf[off], max - off, fmt, ##args);
 
-static int carl9170_debugfs_open(struct inode *inode, struct file *file)
-{
-        file->private_data = inode->i_private;
-        return 0;
-}
 
 struct carl9170_debugfs_fops {
         unsigned int read_bufsize;
@@ -178,7 +173,7 @@ static const struct carl9170_debugfs_fops carl_debugfs_##name ##_ops = {\
         .attr = _attr,                                                  \
         .req_dev_state = _dstate,                                       \
         .fops = {                                                       \
-                .open   = carl9170_debugfs_open,                        \
+                .open   = simple_open,                                  \
                 .read   = carl9170_debugfs_read,                        \
                 .write  = carl9170_debugfs_write,                       \
                 .owner  = THIS_MODULE                                   \
diff --git a/drivers/net/wireless/atmel.c b/drivers/net/wireless/atmel.c
index 3010cee7b95..6c87a823f5a 100644
--- a/drivers/net/wireless/atmel.c
+++ b/drivers/net/wireless/atmel.c
@@ -50,7 +50,6 @@
 #include <linux/timer.h>
 #include <asm/byteorder.h>
 #include <asm/io.h>
-#include <asm/system.h>
 #include <asm/uaccess.h>
 #include <linux/module.h>
 #include <linux/netdevice.h>
diff --git a/drivers/net/wireless/atmel_cs.c b/drivers/net/wireless/atmel_cs.c
index ec295c4f677..ded03d226a7 100644
--- a/drivers/net/wireless/atmel_cs.c
+++ b/drivers/net/wireless/atmel_cs.c
@@ -48,7 +48,6 @@
 #include <pcmcia/ciscode.h>
 
 #include <asm/io.h>
-#include <asm/system.h>
 #include <linux/wireless.h>
 
 #include "atmel.h"
diff --git a/drivers/net/wireless/b43/debugfs.c b/drivers/net/wireless/b43/debugfs.c
index e751fdee89b..e807bd93064 100644
--- a/drivers/net/wireless/b43/debugfs.c
+++ b/drivers/net/wireless/b43/debugfs.c
@@ -500,12 +500,6 @@ out:
 
 #undef fappend
 
-static int b43_debugfs_open(struct inode *inode, struct file *file)
-{
-        file->private_data = inode->i_private;
-        return 0;
-}
-
 static ssize_t b43_debugfs_read(struct file *file, char __user *userbuf,
                                 size_t count, loff_t *ppos)
 {
@@ -624,7 +618,7 @@ out_unlock:
                 .read   = _read,                                \
                 .write  = _write,                               \
                 .fops   = {                                     \
-                        .open   = b43_debugfs_open,             \
+                        .open   = simple_open,                  \
                         .read   = b43_debugfs_read,             \
                         .write  = b43_debugfs_write,            \
                         .llseek = generic_file_llseek,          \
diff --git a/drivers/net/wireless/b43legacy/debugfs.c b/drivers/net/wireless/b43legacy/debugfs.c
index 5e28ad0d6d1..1965edb765a 100644
--- a/drivers/net/wireless/b43legacy/debugfs.c
+++ b/drivers/net/wireless/b43legacy/debugfs.c
@@ -197,12 +197,6 @@ static int restart_write_file(struct b43legacy_wldev *dev, const char *buf, size
 
 #undef fappend
 
-static int b43legacy_debugfs_open(struct inode *inode, struct file *file)
-{
-        file->private_data = inode->i_private;
-        return 0;
-}
-
 static ssize_t b43legacy_debugfs_read(struct file *file, char __user *userbuf,
                                 size_t count, loff_t *ppos)
 {
@@ -331,7 +325,7 @@ out_unlock:
                 .read   = _read,                                \
                 .write  = _write,                               \
                 .fops   = {                                     \
-                        .open   = b43legacy_debugfs_open,               \
+                        .open   = simple_open,                          \
                         .read   = b43legacy_debugfs_read,               \
                         .write  = b43legacy_debugfs_write,              \
                         .llseek = generic_file_llseek,                  \
diff --git a/drivers/net/wireless/iwlegacy/3945-rs.c b/drivers/net/wireless/iwlegacy/3945-rs.c
index 70bee1a4d87..4b10157d868 100644
--- a/drivers/net/wireless/iwlegacy/3945-rs.c
+++ b/drivers/net/wireless/iwlegacy/3945-rs.c
@@ -821,12 +821,6 @@ out:
 }
 
 #ifdef CONFIG_MAC80211_DEBUGFS
-static int
-il3945_open_file_generic(struct inode *inode, struct file *file)
-{
-        file->private_data = inode->i_private;
-        return 0;
-}
 
 static ssize_t
 il3945_sta_dbgfs_stats_table_read(struct file *file, char __user *user_buf,
@@ -862,7 +856,7 @@ il3945_sta_dbgfs_stats_table_read(struct file *file, char __user *user_buf,
 
 static const struct file_operations rs_sta_dbgfs_stats_table_ops = {
         .read = il3945_sta_dbgfs_stats_table_read,
-        .open = il3945_open_file_generic,
+        .open = simple_open,
         .llseek = default_llseek,
 };
 
diff --git a/drivers/net/wireless/iwlegacy/4965-rs.c b/drivers/net/wireless/iwlegacy/4965-rs.c
index d7e2856e41d..11ab1247fae 100644
--- a/drivers/net/wireless/iwlegacy/4965-rs.c
+++ b/drivers/net/wireless/iwlegacy/4965-rs.c
@@ -2518,12 +2518,6 @@ il4965_rs_free_sta(void *il_r, struct ieee80211_sta *sta, void *il_sta)
 }
 
 #ifdef CONFIG_MAC80211_DEBUGFS
-static int
-il4965_open_file_generic(struct inode *inode, struct file *file)
-{
-        file->private_data = inode->i_private;
-        return 0;
-}
 
 static void
 il4965_rs_dbgfs_set_mcs(struct il_lq_sta *lq_sta, u32 * rate_n_flags, int idx)
@@ -2695,7 +2689,7 @@ il4965_rs_sta_dbgfs_scale_table_read(struct file *file, char __user *user_buf,
 static const struct file_operations rs_sta_dbgfs_scale_table_ops = {
         .write = il4965_rs_sta_dbgfs_scale_table_write,
         .read = il4965_rs_sta_dbgfs_scale_table_read,
-        .open = il4965_open_file_generic,
+        .open = simple_open,
         .llseek = default_llseek,
 };
 
@@ -2740,7 +2734,7 @@ il4965_rs_sta_dbgfs_stats_table_read(struct file *file, char __user *user_buf,
 
 static const struct file_operations rs_sta_dbgfs_stats_table_ops = {
         .read = il4965_rs_sta_dbgfs_stats_table_read,
-        .open = il4965_open_file_generic,
+        .open = simple_open,
         .llseek = default_llseek,
 };
 
@@ -2768,7 +2762,7 @@ il4965_rs_sta_dbgfs_rate_scale_data_read(struct file *file,
 
 static const struct file_operations rs_sta_dbgfs_rate_scale_data_ops = {
         .read = il4965_rs_sta_dbgfs_rate_scale_data_read,
-        .open = il4965_open_file_generic,
+        .open = simple_open,
         .llseek = default_llseek,
 };
 
diff --git a/drivers/net/wireless/iwlegacy/debug.c b/drivers/net/wireless/iwlegacy/debug.c
index 229849150aa..eff26501d60 100644
--- a/drivers/net/wireless/iwlegacy/debug.c
+++ b/drivers/net/wireless/iwlegacy/debug.c
@@ -160,18 +160,12 @@ static ssize_t il_dbgfs_##name##_write(struct file *file,              \
                                         const char __user *user_buf,    \
                                         size_t count, loff_t *ppos);
 
-static int
-il_dbgfs_open_file_generic(struct inode *inode, struct file *file)
-{
-        file->private_data = inode->i_private;
-        return 0;
-}
 
 #define DEBUGFS_READ_FILE_OPS(name)                             \
         DEBUGFS_READ_FUNC(name);                                \
 static const struct file_operations il_dbgfs_##name##_ops = {   \
         .read = il_dbgfs_##name##_read,                         \
-        .open = il_dbgfs_open_file_generic,                     \
+        .open = simple_open,                                    \
         .llseek = generic_file_llseek,                          \
 };
 
@@ -179,7 +173,7 @@ static const struct file_operations il_dbgfs_##name##_ops = {	\
         DEBUGFS_WRITE_FUNC(name);                               \
 static const struct file_operations il_dbgfs_##name##_ops = {   \
         .write = il_dbgfs_##name##_write,                       \
-        .open = il_dbgfs_open_file_generic,                     \
+        .open = simple_open,                                    \
         .llseek = generic_file_llseek,                          \
 };
 
@@ -189,7 +183,7 @@ static const struct file_operations il_dbgfs_##name##_ops = {	\
 static const struct file_operations il_dbgfs_##name##_ops = {   \
         .write = il_dbgfs_##name##_write,                       \
         .read = il_dbgfs_##name##_read,                         \
-        .open = il_dbgfs_open_file_generic,                     \
+        .open = simple_open,                                    \
         .llseek = generic_file_llseek,                          \
 };
 
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-rs.c b/drivers/net/wireless/iwlwifi/iwl-agn-rs.c
index 53f8c51cfcd..7e590b349dd 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-rs.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-rs.c
@@ -3083,11 +3083,6 @@ static void rs_free_sta(void *priv_r, struct ieee80211_sta *sta,
 }
 
 #ifdef CONFIG_MAC80211_DEBUGFS
-static int open_file_generic(struct inode *inode, struct file *file)
-{
-        file->private_data = inode->i_private;
-        return 0;
-}
 static void rs_dbgfs_set_mcs(struct iwl_lq_sta *lq_sta,
                              u32 *rate_n_flags, int index)
 {
@@ -3226,7 +3221,7 @@ static ssize_t rs_sta_dbgfs_scale_table_read(struct file *file,
 static const struct file_operations rs_sta_dbgfs_scale_table_ops = {
         .write = rs_sta_dbgfs_scale_table_write,
         .read = rs_sta_dbgfs_scale_table_read,
-        .open = open_file_generic,
+        .open = simple_open,
         .llseek = default_llseek,
 };
 static ssize_t rs_sta_dbgfs_stats_table_read(struct file *file,
@@ -3269,7 +3264,7 @@ static ssize_t rs_sta_dbgfs_stats_table_read(struct file *file,
 
 static const struct file_operations rs_sta_dbgfs_stats_table_ops = {
         .read = rs_sta_dbgfs_stats_table_read,
-        .open = open_file_generic,
+        .open = simple_open,
         .llseek = default_llseek,
 };
 
@@ -3295,7 +3290,7 @@ static ssize_t rs_sta_dbgfs_rate_scale_data_read(struct file *file,
 
 static const struct file_operations rs_sta_dbgfs_rate_scale_data_ops = {
         .read = rs_sta_dbgfs_rate_scale_data_read,
-        .open = open_file_generic,
+        .open = simple_open,
         .llseek = default_llseek,
 };
 
diff --git a/drivers/net/wireless/iwlwifi/iwl-debugfs.c b/drivers/net/wireless/iwlwifi/iwl-debugfs.c
index b7b1c04f2fb..2bbaebd99ad 100644
--- a/drivers/net/wireless/iwlwifi/iwl-debugfs.c
+++ b/drivers/net/wireless/iwlwifi/iwl-debugfs.c
@@ -84,17 +84,11 @@ static ssize_t iwl_dbgfs_##name##_write(struct file *file,              \
                                         size_t count, loff_t *ppos);
 
 
-static int iwl_dbgfs_open_file_generic(struct inode *inode, struct file *file)
-{
-        file->private_data = inode->i_private;
-        return 0;
-}
-
 #define DEBUGFS_READ_FILE_OPS(name)                                     \
         DEBUGFS_READ_FUNC(name);                                        \
 static const struct file_operations iwl_dbgfs_##name##_ops = {          \
         .read = iwl_dbgfs_##name##_read,                                \
-        .open = iwl_dbgfs_open_file_generic,                            \
+        .open = simple_open,                                            \
         .llseek = generic_file_llseek,                                  \
 };
 
@@ -102,7 +96,7 @@ static const struct file_operations iwl_dbgfs_##name##_ops = {          \
         DEBUGFS_WRITE_FUNC(name);                                       \
 static const struct file_operations iwl_dbgfs_##name##_ops = {          \
         .write = iwl_dbgfs_##name##_write,                              \
-        .open = iwl_dbgfs_open_file_generic,                            \
+        .open = simple_open,                                            \
         .llseek = generic_file_llseek,                                  \
 };
 
@@ -113,7 +107,7 @@ static const struct file_operations iwl_dbgfs_##name##_ops = {          \
 static const struct file_operations iwl_dbgfs_##name##_ops = {          \
         .write = iwl_dbgfs_##name##_write,                              \
         .read = iwl_dbgfs_##name##_read,                                \
-        .open = iwl_dbgfs_open_file_generic,                            \
+        .open = simple_open,                                            \
         .llseek = generic_file_llseek,                                  \
 };
 
diff --git a/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c b/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c
index b4f796c82e1..4d7b30d3e64 100644
--- a/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c
+++ b/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c
@@ -1898,17 +1898,11 @@ static ssize_t iwl_dbgfs_##name##_write(struct file *file,              \
                                         size_t count, loff_t *ppos);
 
 
-static int iwl_dbgfs_open_file_generic(struct inode *inode, struct file *file)
-{
-        file->private_data = inode->i_private;
-        return 0;
-}
-
 #define DEBUGFS_READ_FILE_OPS(name)                                     \
         DEBUGFS_READ_FUNC(name);                                        \
 static const struct file_operations iwl_dbgfs_##name##_ops = {          \
         .read = iwl_dbgfs_##name##_read,                                \
-        .open = iwl_dbgfs_open_file_generic,                            \
+        .open = simple_open,                                            \
         .llseek = generic_file_llseek,                                  \
 };
 
@@ -1916,7 +1910,7 @@ static const struct file_operations iwl_dbgfs_##name##_ops = {		\
         DEBUGFS_WRITE_FUNC(name);                                       \
 static const struct file_operations iwl_dbgfs_##name##_ops = {          \
         .write = iwl_dbgfs_##name##_write,                              \
-        .open = iwl_dbgfs_open_file_generic,                            \
+        .open = simple_open,                                            \
         .llseek = generic_file_llseek,                                  \
 };
 
@@ -1926,7 +1920,7 @@ static const struct file_operations iwl_dbgfs_##name##_ops = {          \
 static const struct file_operations iwl_dbgfs_##name##_ops = {          \
         .write = iwl_dbgfs_##name##_write,                              \
         .read = iwl_dbgfs_##name##_read,                                \
-        .open = iwl_dbgfs_open_file_generic,                            \
+        .open = simple_open,                                            \
         .llseek = generic_file_llseek,                                  \
 };
 
diff --git a/drivers/net/wireless/iwmc3200wifi/debugfs.c b/drivers/net/wireless/iwmc3200wifi/debugfs.c
index 87eef5773a0..b6199d124bb 100644
--- a/drivers/net/wireless/iwmc3200wifi/debugfs.c
+++ b/drivers/net/wireless/iwmc3200wifi/debugfs.c
@@ -99,12 +99,6 @@ DEFINE_SIMPLE_ATTRIBUTE(fops_iwm_dbg_modules,
                         iwm_debugfs_u32_read, iwm_debugfs_dbg_modules_write,
                         "%llu\n");
 
-static int iwm_generic_open(struct inode *inode, struct file *filp)
-{
-        filp->private_data = inode->i_private;
-        return 0;
-}
-
 
 static ssize_t iwm_debugfs_txq_read(struct file *filp, char __user *buffer,
                                    size_t count, loff_t *ppos)
@@ -401,28 +395,28 @@ out:
 
 static const struct file_operations iwm_debugfs_txq_fops = {
         .owner =        THIS_MODULE,
-        .open =         iwm_generic_open,
+        .open =         simple_open,
         .read =         iwm_debugfs_txq_read,
         .llseek =       default_llseek,
 };
 
 static const struct file_operations iwm_debugfs_tx_credit_fops = {
         .owner =        THIS_MODULE,
-        .open =         iwm_generic_open,
+        .open =         simple_open,
         .read =         iwm_debugfs_tx_credit_read,
         .llseek =       default_llseek,
 };
 
 static const struct file_operations iwm_debugfs_rx_ticket_fops = {
         .owner =        THIS_MODULE,
-        .open =         iwm_generic_open,
+        .open =         simple_open,
         .read =         iwm_debugfs_rx_ticket_read,
         .llseek =       default_llseek,
 };
 
 static const struct file_operations iwm_debugfs_fw_err_fops = {
         .owner =        THIS_MODULE,
-        .open =         iwm_generic_open,
+        .open =         simple_open,
         .read =         iwm_debugfs_fw_err_read,
         .llseek =       default_llseek,
 };
diff --git a/drivers/net/wireless/iwmc3200wifi/sdio.c b/drivers/net/wireless/iwmc3200wifi/sdio.c
index 764b40dd24a..0042f204b07 100644
--- a/drivers/net/wireless/iwmc3200wifi/sdio.c
+++ b/drivers/net/wireless/iwmc3200wifi/sdio.c
@@ -264,13 +264,6 @@ static int if_sdio_send_chunk(struct iwm_priv *iwm, u8 *buf, int count)
         return ret;
 }
 
-/* debugfs hooks */
-static int iwm_debugfs_sdio_open(struct inode *inode, struct file *filp)
-{
-        filp->private_data = inode->i_private;
-        return 0;
-}
-
 static ssize_t iwm_debugfs_sdio_read(struct file *filp, char __user *buffer,
                                      size_t count, loff_t *ppos)
 {
@@ -363,7 +356,7 @@ err:
 
 static const struct file_operations iwm_debugfs_sdio_fops = {
         .owner =        THIS_MODULE,
-        .open =         iwm_debugfs_sdio_open,
+        .open =         simple_open,
         .read =         iwm_debugfs_sdio_read,
         .llseek =       default_llseek,
 };
diff --git a/drivers/net/wireless/libertas/debugfs.c b/drivers/net/wireless/libertas/debugfs.c
index c192671610f..a06cc283e23 100644
--- a/drivers/net/wireless/libertas/debugfs.c
+++ b/drivers/net/wireless/libertas/debugfs.c
@@ -21,12 +21,6 @@ static char *szStates[] = {
 static void lbs_debug_init(struct lbs_private *priv);
 #endif
 
-static int open_file_generic(struct inode *inode, struct file *file)
-{
-        file->private_data = inode->i_private;
-        return 0;
-}
-
 static ssize_t write_file_dummy(struct file *file, const char __user *buf,
                                 size_t count, loff_t *ppos)
 {
@@ -696,7 +690,7 @@ out_unlock:
 
 #define FOPS(fread, fwrite) { \
         .owner = THIS_MODULE, \
-        .open = open_file_generic, \
+        .open = simple_open, \
         .read = (fread), \
         .write = (fwrite), \
         .llseek = generic_file_llseek, \
@@ -962,7 +956,7 @@ static ssize_t lbs_debugfs_write(struct file *f, const char __user *buf,
 
 static const struct file_operations lbs_debug_fops = {
         .owner = THIS_MODULE,
-        .open = open_file_generic,
+        .open = simple_open,
         .write = lbs_debugfs_write,
         .read = lbs_debugfs_read,
         .llseek = default_llseek,
diff --git a/drivers/net/wireless/mwifiex/debugfs.c b/drivers/net/wireless/mwifiex/debugfs.c
index d26a78b6b3c..1a845074c52 100644
--- a/drivers/net/wireless/mwifiex/debugfs.c
+++ b/drivers/net/wireless/mwifiex/debugfs.c
@@ -140,18 +140,6 @@ static struct mwifiex_debug_data items[] = {
 static int num_of_items = ARRAY_SIZE(items);
 
 /*
- * Generic proc file open handler.
- *
- * This function is called every time a file is accessed for read or write.
- */
-static int
-mwifiex_open_generic(struct inode *inode, struct file *file)
-{
-        file->private_data = inode->i_private;
-        return 0;
-}
-
-/*
  * Proc info file read handler.
  *
  * This function is called when the 'info' file is opened for reading.
@@ -676,19 +664,19 @@ done:
 static const struct file_operations mwifiex_dfs_##name##_fops = {       \
         .read = mwifiex_##name##_read,                                  \
         .write = mwifiex_##name##_write,                                \
-        .open = mwifiex_open_generic,                                   \
+        .open = simple_open,                                            \
 };
 
 #define MWIFIEX_DFS_FILE_READ_OPS(name)                                 \
 static const struct file_operations mwifiex_dfs_##name##_fops = {       \
         .read = mwifiex_##name##_read,                                  \
-        .open = mwifiex_open_generic,                                   \
+        .open = simple_open,                                            \
 };
 
 #define MWIFIEX_DFS_FILE_WRITE_OPS(name)                                \
 static const struct file_operations mwifiex_dfs_##name##_fops = {       \
         .write = mwifiex_##name##_write,                                \
-        .open = mwifiex_open_generic,                                   \
+        .open = simple_open,                                            \
 };
 
 
diff --git a/drivers/net/wireless/prism54/islpci_mgt.c b/drivers/net/wireless/prism54/islpci_mgt.c
index 851fa10241e..c5404cb59e0 100644
--- a/drivers/net/wireless/prism54/islpci_mgt.c
+++ b/drivers/net/wireless/prism54/islpci_mgt.c
@@ -24,7 +24,6 @@
 #include <linux/slab.h>
 
 #include <asm/io.h>
-#include <asm/system.h>
 #include <linux/if_arp.h>
 
 #include "prismcompat.h"
diff --git a/drivers/net/wireless/ray_cs.c b/drivers/net/wireless/ray_cs.c
index 04fec1fa6e0..86a738bf591 100644
--- a/drivers/net/wireless/ray_cs.c
+++ b/drivers/net/wireless/ray_cs.c
@@ -53,7 +53,6 @@
 #include <net/iw_handler.h>
 
 #include <asm/io.h>
-#include <asm/system.h>
 #include <asm/byteorder.h>
 #include <asm/uaccess.h>
 
diff --git a/drivers/net/wireless/wl1251/debugfs.c b/drivers/net/wireless/wl1251/debugfs.c
index 6c274007d20..448da1f8c22 100644
--- a/drivers/net/wireless/wl1251/debugfs.c
+++ b/drivers/net/wireless/wl1251/debugfs.c
@@ -47,7 +47,7 @@ static ssize_t name## _read(struct file *file, char __user *userbuf,	\
                                                                         \
 static const struct file_operations name## _ops = {                     \
         .read = name## _read,                                           \
-        .open = wl1251_open_file_generic,                               \
+        .open = simple_open,                                            \
         .llseek = generic_file_llseek,                                  \
 };
 
@@ -84,7 +84,7 @@ static ssize_t sub## _ ##name## _read(struct file *file,		\
                                                                         \
 static const struct file_operations sub## _ ##name## _ops = {           \
         .read = sub## _ ##name## _read,                                 \
-        .open = wl1251_open_file_generic,                               \
+        .open = simple_open,                                            \
         .llseek = generic_file_llseek,                                  \
 };
 
@@ -117,12 +117,6 @@ out:
         mutex_unlock(&wl->mutex);
 }
 
-static int wl1251_open_file_generic(struct inode *inode, struct file *file)
-{
-        file->private_data = inode->i_private;
-        return 0;
-}
-
 DEBUGFS_FWSTATS_FILE(tx, internal_desc_overflow, 20, "%u");
 
 DEBUGFS_FWSTATS_FILE(rx, out_of_mem, 20, "%u");
@@ -235,7 +229,7 @@ static ssize_t tx_queue_len_read(struct file *file, char __user *userbuf,
 
 static const struct file_operations tx_queue_len_ops = {
         .read = tx_queue_len_read,
-        .open = wl1251_open_file_generic,
+        .open = simple_open,
         .llseek = generic_file_llseek,
 };
 
@@ -257,7 +251,7 @@ static ssize_t tx_queue_status_read(struct file *file, char __user *userbuf,
 
 static const struct file_operations tx_queue_status_ops = {
         .read = tx_queue_status_read,
-        .open = wl1251_open_file_generic,
+        .open = simple_open,
         .llseek = generic_file_llseek,
 };
 
diff --git a/drivers/net/wireless/wl12xx/debugfs.c b/drivers/net/wireless/wl12xx/debugfs.c
index e1cf7276596..564d49575c9 100644
--- a/drivers/net/wireless/wl12xx/debugfs.c
+++ b/drivers/net/wireless/wl12xx/debugfs.c
@@ -63,7 +63,7 @@ static ssize_t name## _read(struct file *file, char __user *userbuf,	\
                                                                         \
 static const struct file_operations name## _ops = {                     \
         .read = name## _read,                                           \
-        .open = wl1271_open_file_generic,                               \
+        .open = simple_open,                                            \
         .llseek = generic_file_llseek,                                  \
 };
 
@@ -96,7 +96,7 @@ static ssize_t sub## _ ##name## _read(struct file *file,		\
                                                                         \
 static const struct file_operations sub## _ ##name## _ops = {           \
         .read = sub## _ ##name## _read,                                 \
-        .open = wl1271_open_file_generic,                               \
+        .open = simple_open,                                            \
         .llseek = generic_file_llseek,                                  \
 };
 
@@ -126,12 +126,6 @@ out:
         mutex_unlock(&wl->mutex);
 }
 
-static int wl1271_open_file_generic(struct inode *inode, struct file *file)
-{
-        file->private_data = inode->i_private;
-        return 0;
-}
-
 DEBUGFS_FWSTATS_FILE(tx, internal_desc_overflow, "%u");
 
 DEBUGFS_FWSTATS_FILE(rx, out_of_mem, "%u");
@@ -243,7 +237,7 @@ static ssize_t tx_queue_len_read(struct file *file, char __user *userbuf,
 
 static const struct file_operations tx_queue_len_ops = {
         .read = tx_queue_len_read,
-        .open = wl1271_open_file_generic,
+        .open = simple_open,
         .llseek = default_llseek,
 };
 
@@ -289,7 +283,7 @@ static ssize_t gpio_power_write(struct file *file,
 static const struct file_operations gpio_power_ops = {
         .read = gpio_power_read,
         .write = gpio_power_write,
-        .open = wl1271_open_file_generic,
+        .open = simple_open,
         .llseek = default_llseek,
 };
 
@@ -308,7 +302,7 @@ static ssize_t start_recovery_write(struct file *file,
 
 static const struct file_operations start_recovery_ops = {
         .write = start_recovery_write,
-        .open = wl1271_open_file_generic,
+        .open = simple_open,
         .llseek = default_llseek,
 };
 
@@ -372,7 +366,7 @@ out:
 static const struct file_operations dynamic_ps_timeout_ops = {
         .read = dynamic_ps_timeout_read,
         .write = dynamic_ps_timeout_write,
-        .open = wl1271_open_file_generic,
+        .open = simple_open,
         .llseek = default_llseek,
 };
 
@@ -441,7 +435,7 @@ out:
 static const struct file_operations forced_ps_ops = {
         .read = forced_ps_read,
         .write = forced_ps_write,
-        .open = wl1271_open_file_generic,
+        .open = simple_open,
         .llseek = default_llseek,
 };
 
@@ -483,7 +477,7 @@ static ssize_t split_scan_timeout_write(struct file *file,
 static const struct file_operations split_scan_timeout_ops = {
         .read = split_scan_timeout_read,
         .write = split_scan_timeout_write,
-        .open = wl1271_open_file_generic,
+        .open = simple_open,
         .llseek = default_llseek,
 };
 
@@ -566,7 +560,7 @@ static ssize_t driver_state_read(struct file *file, char __user *user_buf,
 
 static const struct file_operations driver_state_ops = {
         .read = driver_state_read,
-        .open = wl1271_open_file_generic,
+        .open = simple_open,
         .llseek = default_llseek,
 };
 
@@ -675,7 +669,7 @@ static ssize_t vifs_state_read(struct file *file, char __user *user_buf,
 
 static const struct file_operations vifs_state_ops = {
         .read = vifs_state_read,
-        .open = wl1271_open_file_generic,
+        .open = simple_open,
         .llseek = default_llseek,
 };
 
@@ -733,7 +727,7 @@ static ssize_t dtim_interval_write(struct file *file,
 static const struct file_operations dtim_interval_ops = {
         .read = dtim_interval_read,
         .write = dtim_interval_write,
-        .open = wl1271_open_file_generic,
+        .open = simple_open,
         .llseek = default_llseek,
 };
 
@@ -791,7 +785,7 @@ static ssize_t suspend_dtim_interval_write(struct file *file,
 static const struct file_operations suspend_dtim_interval_ops = {
         .read = suspend_dtim_interval_read,
         .write = suspend_dtim_interval_write,
-        .open = wl1271_open_file_generic,
+        .open = simple_open,
         .llseek = default_llseek,
 };
 
@@ -849,7 +843,7 @@ static ssize_t beacon_interval_write(struct file *file,
 static const struct file_operations beacon_interval_ops = {
         .read = beacon_interval_read,
         .write = beacon_interval_write,
-        .open = wl1271_open_file_generic,
+        .open = simple_open,
         .llseek = default_llseek,
 };
 
@@ -904,7 +898,7 @@ static ssize_t rx_streaming_interval_read(struct file *file,
 static const struct file_operations rx_streaming_interval_ops = {
         .read = rx_streaming_interval_read,
         .write = rx_streaming_interval_write,
-        .open = wl1271_open_file_generic,
+        .open = simple_open,
         .llseek = default_llseek,
 };
 
@@ -959,7 +953,7 @@ static ssize_t rx_streaming_always_read(struct file *file,
 static const struct file_operations rx_streaming_always_ops = {
         .read = rx_streaming_always_read,
         .write = rx_streaming_always_write,
-        .open = wl1271_open_file_generic,
+        .open = simple_open,
         .llseek = default_llseek,
 };
 
@@ -1003,7 +997,7 @@ out:
 
 static const struct file_operations beacon_filtering_ops = {
         .write = beacon_filtering_write,
-        .open = wl1271_open_file_generic,
+        .open = simple_open,
         .llseek = default_llseek,
 };
 
diff --git a/drivers/net/wireless/wl3501_cs.c b/drivers/net/wireless/wl3501_cs.c
index 98fbf54f600..00f6e69c1dc 100644
--- a/drivers/net/wireless/wl3501_cs.c
+++ b/drivers/net/wireless/wl3501_cs.c
@@ -53,7 +53,6 @@
 
 #include <asm/io.h>
 #include <asm/uaccess.h>
-#include <asm/system.h>
 
 #include "wl3501.h"