109 files changed, 2280 insertions, 1431 deletions

diff --git a/Documentation/isdn/README.gigaset b/Documentation/isdn/README.gigaset
index 0fc9831d7ecb..794941fc9493 100644
--- a/Documentation/isdn/README.gigaset
+++ b/Documentation/isdn/README.gigaset
@@ -68,22 +68,38 @@ GigaSet 307x Device Driver
      for troubleshooting or to pass module parameters.
 
      The module ser_gigaset provides a serial line discipline N_GIGASET_M101
-     which drives the device through the regular serial line driver. It must
-     be attached to the serial line to which the M101 is connected with the
-     ldattach(8) command (requires util-linux-ng release 2.14 or later), for
-     example:
-         ldattach GIGASET_M101 /dev/ttyS1
+     which uses the regular serial port driver to access the device, and must
+     therefore be attached to the serial device to which the M101 is connected.
+     The ldattach(8) command (included in util-linux-ng release 2.14 or later)
+     can be used for that purpose, for example:
+        ldattach GIGASET_M101 /dev/ttyS1
      This will open the device file, attach the line discipline to it, and
      then sleep in the background, keeping the device open so that the line
      discipline remains active. To deactivate it, kill the daemon, for example
      with
-         killall ldattach
+        killall ldattach
      before disconnecting the device. To have this happen automatically at
      system startup/shutdown on an LSB compatible system, create and activate
      an appropriate LSB startup script /etc/init.d/gigaset. (The init name
      'gigaset' is officially assigned to this project by LANANA.)
      Alternatively, just add the 'ldattach' command line to /etc/rc.local.
 
+     The modules accept the following parameters:
+
+        Module          Parameter  Meaning
+
+        gigaset         debug      debug level (see section 3.2.)
+
+                        startmode  initial operation mode (see section 2.5.):
+        bas_gigaset )              1=ISDN4linux/CAPI (default), 0=Unimodem
+        ser_gigaset )
+        usb_gigaset )   cidmode    initial Call-ID mode setting (see section
+                                   2.5.): 1=on (default), 0=off
+
+     Depending on your distribution you may want to create a separate module
+     configuration file /etc/modprobe.d/gigaset for these, or add them to a
+     custom file like /etc/modprobe.conf.local.
+
 2.2. Device nodes for user space programs
      ------------------------------------
      The device can be accessed from user space (eg. by the user space tools
@@ -93,11 +109,48 @@ GigaSet 307x Device Driver
      - /dev/ttyGU0 for M105 (USB data boxes)
      - /dev/ttyGB0 for the base driver (direct USB connection)
 
-     You can also select a "default device" which is used by the frontends when
+     If you connect more than one device of a type, they will get consecutive
+     device nodes, eg. /dev/ttyGU1 for a second M105.
+
+     You can also set a "default device" for the user space tools to use when
      no device node is given as parameter, by creating a symlink /dev/ttyG to
      one of them, eg.:
 
-        ln -s /dev/ttyGB0 /dev/ttyG
+        ln -s /dev/ttyGB0 /dev/ttyG
+
+     The devices accept the following device specific ioctl calls
+     (defined in gigaset_dev.h):
+
+     ioctl(int fd, GIGASET_REDIR, int *cmd);
+     If cmd==1, the device is set to be controlled exclusively through the
+     character device node; access from the ISDN subsystem is blocked.
+     If cmd==0, the device is set to be used from the ISDN subsystem and does
+     not communicate through the character device node.
+
+     ioctl(int fd, GIGASET_CONFIG, int *cmd);
+     (ser_gigaset and usb_gigaset only)
+     If cmd==1, the device is set to adapter configuration mode where commands
+     are interpreted by the M10x DECT adapter itself instead of being
+     forwarded to the base station. In this mode, the device accepts the
+     commands described in Siemens document "AT-Kommando Alignment M10x Data"
+     for setting the operation mode, associating with a base station and
+     querying parameters like field strengh and signal quality.
+     Note that there is no ioctl command for leaving adapter configuration
+     mode and returning to regular operation. In order to leave adapter
+     configuration mode, write the command ATO to the device.
+
+     ioctl(int fd, GIGASET_BRKCHARS, unsigned char brkchars[6]);
+     (usb_gigaset only)
+     Set the break characters on an M105's internal serial adapter to the six
+     bytes stored in brkchars[]. Unused bytes should be set to zero.
+
+     ioctl(int fd, GIGASET_VERSION, unsigned version[4]);
+     Retrieve version information from the driver. version[0] must be set to
+     one of:
+     - GIGVER_DRIVER: retrieve driver version
+     - GIGVER_COMPAT: retrieve interface compatibility version
+     - GIGVER_FWBASE: retrieve the firmware version of the base
+     Upon return, version[] is filled with the requested version information.
 
 2.3. ISDN4linux
      ----------
@@ -113,15 +166,24 @@ GigaSet 307x Device Driver
          Connection State: 0, Response: -1
          gigaset_process_response: resp_code -1 in ConState 0 !
          Timeout occurred
-     you might need to use unimodem mode. (see section 2.5.)
+     you probably need to use unimodem mode. (see section 2.5.)
 
 2.4. CAPI
      ----
      If the driver is compiled with CAPI support (kernel configuration option
      GIGASET_CAPI, experimental) it can also be used with CAPI 2.0 kernel and
-     user space applications.  ISDN4Linux is supported in this configuration
+     user space applications. For user space access, the module capi.ko must
+     be loaded. The capiinit command (included in the capi4k-utils package)
+     does this for you.
+
+     The CAPI variant of the driver supports legacy ISDN4Linux applications
      via the capidrv compatibility driver. The kernel module capidrv.ko must
-     be loaded explicitly ("modprobe capidrv") if needed.
+     be loaded explicitly with the command
+        modprobe capidrv
+     if needed, and cannot be unloaded again without unloading the driver
+     first. (These are limitations of capidrv.)
+
+     The note about unimodem mode in the preceding section applies here, too.
 
 2.5. Unimodem mode
      -------------
@@ -134,9 +196,14 @@ GigaSet 307x Device Driver
      You can switch back using
          gigacontr --mode isdn
 
-     You can also load the driver using e.g.
-         modprobe usb_gigaset startmode=0
-     to prevent the driver from starting in "isdn4linux mode".
+     You can also put the driver directly into Unimodem mode when it's loaded,
+     by passing the module parameter startmode=0 to the hardware specific
+     module, e.g.
+        modprobe usb_gigaset startmode=0
+     or by adding a line like
+        options usb_gigaset startmode=0
+     to an appropriate module configuration file, like /etc/modprobe.d/gigaset
+     or /etc/modprobe.conf.local.
 
      In this mode the device works like a modem connected to a serial port
      (the /dev/ttyGU0, ... mentioned above) which understands the commands
@@ -164,9 +231,8 @@ GigaSet 307x Device Driver
 
         options ppp_async flag_time=0
 
-     to /etc/modprobe.conf. If your distribution has some local module
-     configuration file like /etc/modprobe.conf.local,
-     using that should be preferred.
+     to an appropriate module configuration file, like /etc/modprobe.d/gigaset
+     or /etc/modprobe.conf.local.
 
 2.6. Call-ID (CID) mode
      ------------------
@@ -189,12 +255,13 @@ GigaSet 307x Device Driver
        settings (CID mode).
      - If you have several DECT data devices (M10x) which you want to use
        in turn, select Unimodem mode by passing the parameter "cidmode=0" to
-       the driver ("modprobe usb_gigaset cidmode=0" or modprobe.conf).
+       the appropriate driver module (ser_gigaset or usb_gigaset).
 
      If you want both of these at once, you are out of luck.
 
-     You can also use /sys/class/tty/ttyGxy/cidmode for changing the CID mode
-     setting (ttyGxy is ttyGU0 or ttyGB0).
+     You can also use the tty class parameter "cidmode" of the device to
+     change its CID mode while the driver is loaded, eg.
+        echo 0 > /sys/class/tty/ttyGU0/cidmode
 
 2.7. Unregistered Wireless Devices (M101/M105)
      -----------------------------------------
@@ -208,7 +275,7 @@ GigaSet 307x Device Driver
      driver. In that situation, a restricted set of functions is available
      which includes, in particular, those necessary for registering the device
      to a base or for switching it between Fixed Part and Portable Part
-     modes.
+     modes. See the gigacontr(8) manpage for details.
 
 3.   Troubleshooting
      ---------------
@@ -222,9 +289,7 @@ GigaSet 307x Device Driver
 
            options isdn dialtimeout=15
 
-        to /etc/modprobe.conf. If your distribution has some local module
-        configuration file like /etc/modprobe.conf.local,
-        using that should be preferred.
+        to /etc/modprobe.d/gigaset, /etc/modprobe.conf.local or a similar file.
 
      Problem:
         Your isdn script aborts with a message about isdnlog.
@@ -264,7 +329,8 @@ GigaSet 307x Device Driver
      The initial value can be set using the debug parameter when loading the
      module "gigaset", e.g. by adding a line
         options gigaset debug=0
-     to /etc/modprobe.conf, ...
+     to your module configuration file, eg. /etc/modprobe.d/gigaset or
+     /etc/modprobe.conf.local.
 
      Generated debugging information can be found
      - as output of the command
diff --git a/MAINTAINERS b/MAINTAINERS
index 520a3b3fd82c..256139e0c231 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -5426,10 +5426,9 @@ S:	Supported
 F:      drivers/block/ub.c
 
 USB CDC ETHERNET DRIVER
-M:      Greg Kroah-Hartman <greg@kroah.com>
+M:      Oliver Neukum <oliver@neukum.name>
 L:      linux-usb@vger.kernel.org
 S:      Maintained
-W:      http://www.kroah.com/linux-usb/
 F:      drivers/net/usb/cdc_*.c
 F:      include/linux/usb/cdc.h
 
@@ -5960,9 +5959,9 @@ F:	sound/soc/codecs/wm8350.c
 F:      sound/soc/codecs/wm8400.c
 
 X.25 NETWORK LAYER
-M:      Henner Eisen <eis@baty.hanse.de>
+M:      Andrew Hendry <andrew.hendry@gmail.com>
 L:      linux-x25@vger.kernel.org
-S:      Maintained
+S:      Odd Fixes
 F:      Documentation/networking/x25*
 F:      include/net/x25*
 F:      net/x25/
diff --git a/drivers/atm/he.c b/drivers/atm/he.c
index e90665876c47..e8c6529dc366 100644
--- a/drivers/atm/he.c
+++ b/drivers/atm/he.c
@@ -2505,7 +2505,7 @@ he_close(struct atm_vcc *vcc)
                  * TBRQ, the host issues the close command to the adapter.
                  */
 
-                while (((tx_inuse = atomic_read(&sk_atm(vcc)->sk_wmem_alloc)) > 0) &&
+                while (((tx_inuse = atomic_read(&sk_atm(vcc)->sk_wmem_alloc)) > 1) &&
                        (retry < MAX_RETRY)) {
                         msleep(sleep);
                         if (sleep < 250)
@@ -2514,7 +2514,7 @@ he_close(struct atm_vcc *vcc)
                         ++retry;
                 }
 
-                if (tx_inuse)
+                if (tx_inuse > 1)
                         hprintk("close tx cid 0x%x tx_inuse = %d\n", cid, tx_inuse);
 
                 /* 2.3.1.1 generic close operations with flush */
diff --git a/drivers/atm/iphase.c b/drivers/atm/iphase.c
index f734b345ac71..25a4c86f839b 100644
--- a/drivers/atm/iphase.c
+++ b/drivers/atm/iphase.c
@@ -557,7 +557,7 @@ static int ia_cbr_setup (IADEV *dev, struct atm_vcc *vcc) {
           memcpy((caddr_t)&cbrVC,(caddr_t)TstSchedTbl,sizeof(cbrVC));
        } /* while */
        // Move this VCI number into this location of the CBR Sched table.
-       memcpy((caddr_t)TstSchedTbl, (caddr_t)&vcIndex,sizeof(TstSchedTbl));
+       memcpy((caddr_t)TstSchedTbl, (caddr_t)&vcIndex, sizeof(*TstSchedTbl));
        dev->CbrRemEntries--;
        toBeAssigned--;
    } /* while */ 
diff --git a/drivers/isdn/gigaset/common.c b/drivers/isdn/gigaset/common.c
index 82ed1cd14ff5..664b0c519c3e 100644
--- a/drivers/isdn/gigaset/common.c
+++ b/drivers/isdn/gigaset/common.c
@@ -29,7 +29,7 @@
 #endif
 
 /* Module parameters */
-int gigaset_debuglevel = DEBUG_DEFAULT;
+int gigaset_debuglevel;
 EXPORT_SYMBOL_GPL(gigaset_debuglevel);
 module_param_named(debug, gigaset_debuglevel, int, S_IRUGO|S_IWUSR);
 MODULE_PARM_DESC(debug, "debug level");
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 0bbd5ae49862..a5be9ac6405c 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -2696,6 +2696,7 @@ config NETXEN_NIC
 config NIU
         tristate "Sun Neptune 10Gbit Ethernet support"
         depends on PCI
+        select CRC32
         help
           This enables support for cards based upon Sun's
           Neptune chipset.
diff --git a/drivers/net/atl1c/atl1c.h b/drivers/net/atl1c/atl1c.h
index a348a22551d9..efe5435bc3d3 100644
--- a/drivers/net/atl1c/atl1c.h
+++ b/drivers/net/atl1c/atl1c.h
@@ -479,6 +479,9 @@ struct atl1c_buffer {
 #define ATL1C_PCIMAP_PAGE               0x0008
 #define ATL1C_PCIMAP_TYPE_MASK          0x000C
 
+#define ATL1C_PCIMAP_TODEVICE           0x0010
+#define ATL1C_PCIMAP_FROMDEVICE         0x0020
+#define ATL1C_PCIMAP_DIRECTION_MASK     0x0030
         dma_addr_t dma;
 };
 
@@ -487,9 +490,11 @@ struct atl1c_buffer {
         ((buff)->flags) |= (state);                     \
         } while (0)
 
-#define ATL1C_SET_PCIMAP_TYPE(buff, type) do {          \
-        ((buff)->flags) &= ~ATL1C_PCIMAP_TYPE_MASK;     \
-        ((buff)->flags) |= (type);                      \
+#define ATL1C_SET_PCIMAP_TYPE(buff, type, direction) do {       \
+        ((buff)->flags) &= ~ATL1C_PCIMAP_TYPE_MASK;             \
+        ((buff)->flags) |= (type);                              \
+        ((buff)->flags) &= ~ATL1C_PCIMAP_DIRECTION_MASK;        \
+        ((buff)->flags) |= (direction);                         \
         } while (0)
 
 /* transimit packet descriptor (tpd) ring */
@@ -550,6 +555,9 @@ struct atl1c_adapter {
 #define __AT_TESTING        0x0001
 #define __AT_RESETTING      0x0002
 #define __AT_DOWN           0x0003
+        u8 work_event;
+#define ATL1C_WORK_EVENT_RESET          0x01
+#define ATL1C_WORK_EVENT_LINK_CHANGE    0x02
         u32 msg_enable;
 
         bool have_msi;
@@ -561,8 +569,7 @@ struct atl1c_adapter {
         spinlock_t tx_lock;
         atomic_t irq_sem;
 
-        struct work_struct reset_task;
-        struct work_struct link_chg_task;
+        struct work_struct common_task;
         struct timer_list watchdog_timer;
         struct timer_list phy_config_timer;
 
diff --git a/drivers/net/atl1c/atl1c_main.c b/drivers/net/atl1c/atl1c_main.c
index 6eb9241cee0a..2f4be59b9c0b 100644
--- a/drivers/net/atl1c/atl1c_main.c
+++ b/drivers/net/atl1c/atl1c_main.c
@@ -198,27 +198,12 @@ static void atl1c_phy_config(unsigned long data)
 
 void atl1c_reinit_locked(struct atl1c_adapter *adapter)
 {
-
         WARN_ON(in_interrupt());
         atl1c_down(adapter);
         atl1c_up(adapter);
         clear_bit(__AT_RESETTING, &adapter->flags);
 }
 
-static void atl1c_reset_task(struct work_struct *work)
-{
-        struct atl1c_adapter *adapter;
-        struct net_device *netdev;
-
-        adapter = container_of(work, struct atl1c_adapter, reset_task);
-        netdev = adapter->netdev;
-
-        netif_device_detach(netdev);
-        atl1c_down(adapter);
-        atl1c_up(adapter);
-        netif_device_attach(netdev);
-}
-
 static void atl1c_check_link_status(struct atl1c_adapter *adapter)
 {
         struct atl1c_hw *hw = &adapter->hw;
@@ -275,18 +260,6 @@ static void atl1c_check_link_status(struct atl1c_adapter *adapter)
         }
 }
 
-/*
- * atl1c_link_chg_task - deal with link change event Out of interrupt context
- * @netdev: network interface device structure
- */
-static void atl1c_link_chg_task(struct work_struct *work)
-{
-        struct atl1c_adapter *adapter;
-
-        adapter = container_of(work, struct atl1c_adapter, link_chg_task);
-        atl1c_check_link_status(adapter);
-}
-
 static void atl1c_link_chg_event(struct atl1c_adapter *adapter)
 {
         struct net_device *netdev = adapter->netdev;
@@ -311,20 +284,40 @@ static void atl1c_link_chg_event(struct atl1c_adapter *adapter)
                         adapter->link_speed = SPEED_0;
                 }
         }
-        schedule_work(&adapter->link_chg_task);
+
+        adapter->work_event |= ATL1C_WORK_EVENT_LINK_CHANGE;
+        schedule_work(&adapter->common_task);
 }
 
-static void atl1c_del_timer(struct atl1c_adapter *adapter)
+static void atl1c_common_task(struct work_struct *work)
 {
-        del_timer_sync(&adapter->phy_config_timer);
+        struct atl1c_adapter *adapter;
+        struct net_device *netdev;
+
+        adapter = container_of(work, struct atl1c_adapter, common_task);
+        netdev = adapter->netdev;
+
+        if (adapter->work_event & ATL1C_WORK_EVENT_RESET) {
+                netif_device_detach(netdev);
+                atl1c_down(adapter);
+                atl1c_up(adapter);
+                netif_device_attach(netdev);
+                return;
+        }
+
+        if (adapter->work_event & ATL1C_WORK_EVENT_LINK_CHANGE)
+                atl1c_check_link_status(adapter);
+
+        return;
 }
 
-static void atl1c_cancel_work(struct atl1c_adapter *adapter)
+
+static void atl1c_del_timer(struct atl1c_adapter *adapter)
 {
-        cancel_work_sync(&adapter->reset_task);
-        cancel_work_sync(&adapter->link_chg_task);
+        del_timer_sync(&adapter->phy_config_timer);
 }
 
+
 /*
  * atl1c_tx_timeout - Respond to a Tx Hang
  * @netdev: network interface device structure
@@ -334,7 +327,8 @@ static void atl1c_tx_timeout(struct net_device *netdev)
         struct atl1c_adapter *adapter = netdev_priv(netdev);
 
         /* Do the reset outside of interrupt context */
-        schedule_work(&adapter->reset_task);
+        adapter->work_event |= ATL1C_WORK_EVENT_RESET;
+        schedule_work(&adapter->common_task);
 }
 
 /*
@@ -713,15 +707,21 @@ static int __devinit atl1c_sw_init(struct atl1c_adapter *adapter)
 static inline void atl1c_clean_buffer(struct pci_dev *pdev,
                                 struct atl1c_buffer *buffer_info, int in_irq)
 {
+        u16 pci_driection;
         if (buffer_info->flags & ATL1C_BUFFER_FREE)
                 return;
         if (buffer_info->dma) {
+                if (buffer_info->flags & ATL1C_PCIMAP_FROMDEVICE)
+                        pci_driection = PCI_DMA_FROMDEVICE;
+                else
+                        pci_driection = PCI_DMA_TODEVICE;
+
                 if (buffer_info->flags & ATL1C_PCIMAP_SINGLE)
                         pci_unmap_single(pdev, buffer_info->dma,
-                                        buffer_info->length, PCI_DMA_TODEVICE);
+                                        buffer_info->length, pci_driection);
                 else if (buffer_info->flags & ATL1C_PCIMAP_PAGE)
                         pci_unmap_page(pdev, buffer_info->dma,
-                                        buffer_info->length, PCI_DMA_TODEVICE);
+                                        buffer_info->length, pci_driection);
         }
         if (buffer_info->skb) {
                 if (in_irq)
@@ -1533,7 +1533,8 @@ static irqreturn_t atl1c_intr(int irq, void *data)
                         /* reset MAC */
                         hw->intr_mask &= ~ISR_ERROR;
                         AT_WRITE_REG(hw, REG_IMR, hw->intr_mask);
-                        schedule_work(&adapter->reset_task);
+                        adapter->work_event |= ATL1C_WORK_EVENT_RESET;
+                        schedule_work(&adapter->common_task);
                         break;
                 }
 
@@ -1606,7 +1607,8 @@ static int atl1c_alloc_rx_buffer(struct atl1c_adapter *adapter, const int ringid
                 buffer_info->dma = pci_map_single(pdev, vir_addr,
                                                 buffer_info->length,
                                                 PCI_DMA_FROMDEVICE);
-                ATL1C_SET_PCIMAP_TYPE(buffer_info, ATL1C_PCIMAP_SINGLE);
+                ATL1C_SET_PCIMAP_TYPE(buffer_info, ATL1C_PCIMAP_SINGLE,
+                        ATL1C_PCIMAP_FROMDEVICE);
                 rfd_desc->buffer_addr = cpu_to_le64(buffer_info->dma);
                 rfd_next_to_use = next_next;
                 if (++next_next == rfd_ring->count)
@@ -1967,7 +1969,8 @@ static void atl1c_tx_map(struct atl1c_adapter *adapter,
                 buffer_info->dma = pci_map_single(adapter->pdev,
                                         skb->data, hdr_len, PCI_DMA_TODEVICE);
                 ATL1C_SET_BUFFER_STATE(buffer_info, ATL1C_BUFFER_BUSY);
-                ATL1C_SET_PCIMAP_TYPE(buffer_info, ATL1C_PCIMAP_SINGLE);
+                ATL1C_SET_PCIMAP_TYPE(buffer_info, ATL1C_PCIMAP_SINGLE,
+                        ATL1C_PCIMAP_TODEVICE);
                 mapped_len += map_len;
                 use_tpd->buffer_addr = cpu_to_le64(buffer_info->dma);
                 use_tpd->buffer_len = cpu_to_le16(buffer_info->length);
@@ -1988,7 +1991,8 @@ static void atl1c_tx_map(struct atl1c_adapter *adapter,
                         pci_map_single(adapter->pdev, skb->data + mapped_len,
                                         buffer_info->length, PCI_DMA_TODEVICE);
                 ATL1C_SET_BUFFER_STATE(buffer_info, ATL1C_BUFFER_BUSY);
-                ATL1C_SET_PCIMAP_TYPE(buffer_info, ATL1C_PCIMAP_SINGLE);
+                ATL1C_SET_PCIMAP_TYPE(buffer_info, ATL1C_PCIMAP_SINGLE,
+                        ATL1C_PCIMAP_TODEVICE);
                 use_tpd->buffer_addr = cpu_to_le64(buffer_info->dma);
                 use_tpd->buffer_len  = cpu_to_le16(buffer_info->length);
         }
@@ -2009,7 +2013,8 @@ static void atl1c_tx_map(struct atl1c_adapter *adapter,
                                         buffer_info->length,
                                         PCI_DMA_TODEVICE);
                 ATL1C_SET_BUFFER_STATE(buffer_info, ATL1C_BUFFER_BUSY);
-                ATL1C_SET_PCIMAP_TYPE(buffer_info, ATL1C_PCIMAP_PAGE);
+                ATL1C_SET_PCIMAP_TYPE(buffer_info, ATL1C_PCIMAP_PAGE,
+                        ATL1C_PCIMAP_TODEVICE);
                 use_tpd->buffer_addr = cpu_to_le64(buffer_info->dma);
                 use_tpd->buffer_len  = cpu_to_le16(buffer_info->length);
         }
@@ -2198,8 +2203,7 @@ void atl1c_down(struct atl1c_adapter *adapter)
         struct net_device *netdev = adapter->netdev;
 
         atl1c_del_timer(adapter);
-        atl1c_cancel_work(adapter);
-
+        adapter->work_event = 0; /* clear all event */
         /* signal that we're down so the interrupt handler does not
          * reschedule our watchdog timer */
         set_bit(__AT_DOWN, &adapter->flags);
@@ -2599,8 +2603,8 @@ static int __devinit atl1c_probe(struct pci_dev *pdev,
                         adapter->hw.mac_addr[4], adapter->hw.mac_addr[5]);
 
         atl1c_hw_set_mac_addr(&adapter->hw);
-        INIT_WORK(&adapter->reset_task, atl1c_reset_task);
-        INIT_WORK(&adapter->link_chg_task, atl1c_link_chg_task);
+        INIT_WORK(&adapter->common_task, atl1c_common_task);
+        adapter->work_event = 0;
         err = register_netdev(netdev);
         if (err) {
                 dev_err(&pdev->dev, "register netdevice failed\n");
diff --git a/drivers/net/b44.c b/drivers/net/b44.c
index 2a9132343b66..4869adb69586 100644
--- a/drivers/net/b44.c
+++ b/drivers/net/b44.c
@@ -1505,8 +1505,7 @@ static int b44_magic_pattern(u8 *macaddr, u8 *ppattern, u8 *pmask, int offset)
                 for (k = 0; k< ethaddr_bytes; k++) {
                         ppattern[offset + magicsync +
                                 (j * ETH_ALEN) + k] = macaddr[k];
-                        len++;
-                        set_bit(len, (unsigned long *) pmask);
+                        set_bit(len++, (unsigned long *) pmask);
                 }
         }
         return len - 1;
diff --git a/drivers/net/benet/be_main.c b/drivers/net/benet/be_main.c
index 24c7d9900baa..3a1f7902c16d 100644
--- a/drivers/net/benet/be_main.c
+++ b/drivers/net/benet/be_main.c
@@ -759,7 +759,7 @@ static void be_rx_compl_process(struct be_adapter *adapter,
 
         /* vlanf could be wrongly set in some cards.
          * ignore if vtm is not set */
-        if ((adapter->cap == 0x400) && !vtm)
+        if ((adapter->cap & 0x400) && !vtm)
                 vlanf = 0;
 
         skb = netdev_alloc_skb_ip_align(adapter->netdev, BE_HDR_LEN);
@@ -816,7 +816,7 @@ static void be_rx_compl_process_gro(struct be_adapter *adapter,
 
         /* vlanf could be wrongly set in some cards.
          * ignore if vtm is not set */
-        if ((adapter->cap == 0x400) && !vtm)
+        if ((adapter->cap & 0x400) && !vtm)
                 vlanf = 0;
 
         skb = napi_get_frags(&eq_obj->napi);
diff --git a/drivers/net/bonding/bond_3ad.c b/drivers/net/bonding/bond_3ad.c
index d69e6838f21e..0fb7a4964e75 100644
--- a/drivers/net/bonding/bond_3ad.c
+++ b/drivers/net/bonding/bond_3ad.c
@@ -20,6 +20,8 @@
  *
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/skbuff.h>
 #include <linux/if_ether.h>
 #include <linux/netdevice.h>
@@ -352,7 +354,8 @@ static u16 __get_link_speed(struct port *port)
                 }
         }
 
-        pr_debug("Port %d Received link speed %d update from adapter\n", port->actor_port_number, speed);
+        pr_debug("Port %d Received link speed %d update from adapter\n",
+                 port->actor_port_number, speed);
         return speed;
 }
 
@@ -378,12 +381,14 @@ static u8 __get_duplex(struct port *port)
                 switch (slave->duplex) {
                 case DUPLEX_FULL:
                         retval=0x1;
-                        pr_debug("Port %d Received status full duplex update from adapter\n", port->actor_port_number);
+                        pr_debug("Port %d Received status full duplex update from adapter\n",
+                                 port->actor_port_number);
                         break;
                 case DUPLEX_HALF:
                 default:
                         retval=0x0;
-                        pr_debug("Port %d Received status NOT full duplex update from adapter\n", port->actor_port_number);
+                        pr_debug("Port %d Received status NOT full duplex update from adapter\n",
+                                 port->actor_port_number);
                         break;
                 }
         }
@@ -980,7 +985,9 @@ static void ad_mux_machine(struct port *port)
 
         // check if the state machine was changed
         if (port->sm_mux_state != last_state) {
-                pr_debug("Mux Machine: Port=%d, Last State=%d, Curr State=%d\n", port->actor_port_number, last_state, port->sm_mux_state);
+                pr_debug("Mux Machine: Port=%d, Last State=%d, Curr State=%d\n",
+                         port->actor_port_number, last_state,
+                         port->sm_mux_state);
                 switch (port->sm_mux_state) {
                 case AD_MUX_DETACHED:
                         __detach_bond_from_agg(port);
@@ -1079,7 +1086,9 @@ static void ad_rx_machine(struct lacpdu *lacpdu, struct port *port)
 
         // check if the State machine was changed or new lacpdu arrived
         if ((port->sm_rx_state != last_state) || (lacpdu)) {
-                pr_debug("Rx Machine: Port=%d, Last State=%d, Curr State=%d\n", port->actor_port_number, last_state, port->sm_rx_state);
+                pr_debug("Rx Machine: Port=%d, Last State=%d, Curr State=%d\n",
+                         port->actor_port_number, last_state,
+                         port->sm_rx_state);
                 switch (port->sm_rx_state) {
                 case AD_RX_INITIALIZE:
                         if (!(port->actor_oper_port_key & AD_DUPLEX_KEY_BITS)) {
@@ -1126,9 +1135,8 @@ static void ad_rx_machine(struct lacpdu *lacpdu, struct port *port)
                         // detect loopback situation
                         if (!MAC_ADDRESS_COMPARE(&(lacpdu->actor_system), &(port->actor_system))) {
                                 // INFO_RECEIVED_LOOPBACK_FRAMES
-                                pr_err(DRV_NAME ": %s: An illegal loopback occurred on "
-                                       "adapter (%s). Check the configuration to verify that all "
-                                       "Adapters are connected to 802.3ad compliant switch ports\n",
+                                pr_err("%s: An illegal loopback occurred on adapter (%s).\n"
+                                       "Check the configuration to verify that all adapters are connected to 802.3ad compliant switch ports\n",
                                        port->slave->dev->master->name, port->slave->dev->name);
                                 __release_rx_machine_lock(port);
                                 return;
@@ -1166,7 +1174,8 @@ static void ad_tx_machine(struct port *port)
                         __update_lacpdu_from_port(port);
 
                         if (ad_lacpdu_send(port) >= 0) {
-                                pr_debug("Sent LACPDU on port %d\n", port->actor_port_number);
+                                pr_debug("Sent LACPDU on port %d\n",
+                                         port->actor_port_number);
 
                                 /* mark ntt as false, so it will not be sent again until
                                    demanded */
@@ -1241,7 +1250,9 @@ static void ad_periodic_machine(struct port *port)
 
         // check if the state machine was changed
         if (port->sm_periodic_state != last_state) {
-                pr_debug("Periodic Machine: Port=%d, Last State=%d, Curr State=%d\n", port->actor_port_number, last_state, port->sm_periodic_state);
+                pr_debug("Periodic Machine: Port=%d, Last State=%d, Curr State=%d\n",
+                         port->actor_port_number, last_state,
+                         port->sm_periodic_state);
                 switch (port->sm_periodic_state) {
                 case AD_NO_PERIODIC:
                         port->sm_periodic_timer_counter = 0;       // zero timer
@@ -1298,7 +1309,9 @@ static void ad_port_selection_logic(struct port *port)
                                 port->next_port_in_aggregator=NULL;
                                 port->actor_port_aggregator_identifier=0;
 
-                                pr_debug("Port %d left LAG %d\n", port->actor_port_number, temp_aggregator->aggregator_identifier);
+                                pr_debug("Port %d left LAG %d\n",
+                                         port->actor_port_number,
+                                         temp_aggregator->aggregator_identifier);
                                 // if the aggregator is empty, clear its parameters, and set it ready to be attached
                                 if (!temp_aggregator->lag_ports) {
                                         ad_clear_agg(temp_aggregator);
@@ -1307,9 +1320,7 @@ static void ad_port_selection_logic(struct port *port)
                         }
                 }
                 if (!curr_port) { // meaning: the port was related to an aggregator but was not on the aggregator port list
-                        pr_warning(DRV_NAME ": %s: Warning: Port %d (on %s) "
-                                   "was related to aggregator %d but was not "
-                                   "on its port list\n",
+                        pr_warning("%s: Warning: Port %d (on %s) was related to aggregator %d but was not on its port list\n",
                                    port->slave->dev->master->name,
                                    port->actor_port_number,
                                    port->slave->dev->name,
@@ -1343,7 +1354,9 @@ static void ad_port_selection_logic(struct port *port)
                         port->next_port_in_aggregator=aggregator->lag_ports;
                         port->aggregator->num_of_ports++;
                         aggregator->lag_ports=port;
-                        pr_debug("Port %d joined LAG %d(existing LAG)\n", port->actor_port_number, port->aggregator->aggregator_identifier);
+                        pr_debug("Port %d joined LAG %d(existing LAG)\n",
+                                 port->actor_port_number,
+                                 port->aggregator->aggregator_identifier);
 
                         // mark this port as selected
                         port->sm_vars |= AD_PORT_SELECTED;
@@ -1380,10 +1393,11 @@ static void ad_port_selection_logic(struct port *port)
                         // mark this port as selected
                         port->sm_vars |= AD_PORT_SELECTED;
 
-                        pr_debug("Port %d joined LAG %d(new LAG)\n", port->actor_port_number, port->aggregator->aggregator_identifier);
+                        pr_debug("Port %d joined LAG %d(new LAG)\n",
+                                 port->actor_port_number,
+                                 port->aggregator->aggregator_identifier);
                 } else {
-                        pr_err(DRV_NAME ": %s: Port %d (on %s) did not find "
-                               "a suitable aggregator\n",
+                        pr_err("%s: Port %d (on %s) did not find a suitable aggregator\n",
                                port->slave->dev->master->name,
                                port->actor_port_number, port->slave->dev->name);
                 }
@@ -1460,8 +1474,7 @@ static struct aggregator *ad_agg_selection_test(struct aggregator *best,
                 break;
 
         default:
-                pr_warning(DRV_NAME
-                           ": %s: Impossible agg select mode %d\n",
+                pr_warning("%s: Impossible agg select mode %d\n",
                            curr->slave->dev->master->name,
                            __get_agg_selection_mode(curr->lag_ports));
                 break;
@@ -1546,40 +1559,38 @@ static void ad_agg_selection_logic(struct aggregator *agg)
         // if there is new best aggregator, activate it
         if (best) {
                 pr_debug("best Agg=%d; P=%d; a k=%d; p k=%d; Ind=%d; Act=%d\n",
-                       best->aggregator_identifier, best->num_of_ports,
-                       best->actor_oper_aggregator_key,
-                       best->partner_oper_aggregator_key,
-                       best->is_individual, best->is_active);
+                         best->aggregator_identifier, best->num_of_ports,
+                         best->actor_oper_aggregator_key,
+                         best->partner_oper_aggregator_key,
+                         best->is_individual, best->is_active);
                 pr_debug("best ports %p slave %p %s\n",
-                       best->lag_ports, best->slave,
-                       best->slave ? best->slave->dev->name : "NULL");
+                         best->lag_ports, best->slave,
+                         best->slave ? best->slave->dev->name : "NULL");
 
                 for (agg = __get_first_agg(best->lag_ports); agg;
                      agg = __get_next_agg(agg)) {
 
                         pr_debug("Agg=%d; P=%d; a k=%d; p k=%d; Ind=%d; Act=%d\n",
-                                agg->aggregator_identifier, agg->num_of_ports,
-                                agg->actor_oper_aggregator_key,
-                                agg->partner_oper_aggregator_key,
-                                agg->is_individual, agg->is_active);
+                                 agg->aggregator_identifier, agg->num_of_ports,
+                                 agg->actor_oper_aggregator_key,
+                                 agg->partner_oper_aggregator_key,
+                                 agg->is_individual, agg->is_active);
                 }
 
                 // check if any partner replys
                 if (best->is_individual) {
-                        pr_warning(DRV_NAME ": %s: Warning: No 802.3ad"
-                               " response from the link partner for any"
-                               " adapters in the bond\n",
-                               best->slave->dev->master->name);
+                        pr_warning("%s: Warning: No 802.3ad response from the link partner for any adapters in the bond\n",
+                                   best->slave->dev->master->name);
                 }
 
                 best->is_active = 1;
                 pr_debug("LAG %d chosen as the active LAG\n",
-                        best->aggregator_identifier);
+                         best->aggregator_identifier);
                 pr_debug("Agg=%d; P=%d; a k=%d; p k=%d; Ind=%d; Act=%d\n",
-                        best->aggregator_identifier, best->num_of_ports,
-                        best->actor_oper_aggregator_key,
-                        best->partner_oper_aggregator_key,
-                        best->is_individual, best->is_active);
+                         best->aggregator_identifier, best->num_of_ports,
+                         best->actor_oper_aggregator_key,
+                         best->partner_oper_aggregator_key,
+                         best->is_individual, best->is_active);
 
                 // disable the ports that were related to the former active_aggregator
                 if (active) {
@@ -1633,7 +1644,8 @@ static void ad_clear_agg(struct aggregator *aggregator)
                 aggregator->lag_ports = NULL;
                 aggregator->is_active = 0;
                 aggregator->num_of_ports = 0;
-                pr_debug("LAG %d was cleared\n", aggregator->aggregator_identifier);
+                pr_debug("LAG %d was cleared\n",
+                         aggregator->aggregator_identifier);
         }
 }
 
@@ -1728,7 +1740,9 @@ static void ad_initialize_port(struct port *port, int lacp_fast)
 static void ad_enable_collecting_distributing(struct port *port)
 {
         if (port->aggregator->is_active) {
-                pr_debug("Enabling port %d(LAG %d)\n", port->actor_port_number, port->aggregator->aggregator_identifier);
+                pr_debug("Enabling port %d(LAG %d)\n",
+                         port->actor_port_number,
+                         port->aggregator->aggregator_identifier);
                 __enable_port(port);
         }
 }
@@ -1741,7 +1755,9 @@ static void ad_enable_collecting_distributing(struct port *port)
 static void ad_disable_collecting_distributing(struct port *port)
 {
         if (port->aggregator && MAC_ADDRESS_COMPARE(&(port->aggregator->partner_system), &(null_mac_addr))) {
-                pr_debug("Disabling port %d(LAG %d)\n", port->actor_port_number, port->aggregator->aggregator_identifier);
+                pr_debug("Disabling port %d(LAG %d)\n",
+                         port->actor_port_number,
+                         port->aggregator->aggregator_identifier);
                 __disable_port(port);
         }
 }
@@ -1779,7 +1795,8 @@ static void ad_marker_info_send(struct port *port)
 
         // send the marker information
         if (ad_marker_send(port, &marker) >= 0) {
-                pr_debug("Sent Marker Information on port %d\n", port->actor_port_number);
+                pr_debug("Sent Marker Information on port %d\n",
+                         port->actor_port_number);
         }
 }
 #endif
@@ -1803,7 +1820,8 @@ static void ad_marker_info_received(struct bond_marker *marker_info,
         // send the marker response
 
         if (ad_marker_send(port, &marker) >= 0) {
-                pr_debug("Sent Marker Response on port %d\n", port->actor_port_number);
+                pr_debug("Sent Marker Response on port %d\n",
+                         port->actor_port_number);
         }
 }
 
@@ -1889,8 +1907,7 @@ int bond_3ad_bind_slave(struct slave *slave)
         struct aggregator *aggregator;
 
         if (bond == NULL) {
-                pr_err(DRV_NAME ": %s: The slave %s is not attached to "
-                       "its bond\n",
+                pr_err("%s: The slave %s is not attached to its bond\n",
                        slave->dev->master->name, slave->dev->name);
                 return -1;
         }
@@ -1966,13 +1983,13 @@ void bond_3ad_unbind_slave(struct slave *slave)
 
         // if slave is null, the whole port is not initialized
         if (!port->slave) {
-                pr_warning(DRV_NAME ": Warning: %s: Trying to "
-                           "unbind an uninitialized port on %s\n",
+                pr_warning("Warning: %s: Trying to unbind an uninitialized port on %s\n",
                            slave->dev->master->name, slave->dev->name);
                 return;
         }
 
-        pr_debug("Unbinding Link Aggregation Group %d\n", aggregator->aggregator_identifier);
+        pr_debug("Unbinding Link Aggregation Group %d\n",
+                 aggregator->aggregator_identifier);
 
         /* Tell the partner that this port is not suitable for aggregation */
         port->actor_oper_port_state &= ~AD_STATE_AGGREGATION;
@@ -1996,10 +2013,12 @@ void bond_3ad_unbind_slave(struct slave *slave)
                         // if new aggregator found, copy the aggregator's parameters
                         // and connect the related lag_ports to the new aggregator
                         if ((new_aggregator) && ((!new_aggregator->lag_ports) || ((new_aggregator->lag_ports == port) && !new_aggregator->lag_ports->next_port_in_aggregator))) {
-                                pr_debug("Some port(s) related to LAG %d - replaceing with LAG %d\n", aggregator->aggregator_identifier, new_aggregator->aggregator_identifier);
+                                pr_debug("Some port(s) related to LAG %d - replaceing with LAG %d\n",
+                                         aggregator->aggregator_identifier,
+                                         new_aggregator->aggregator_identifier);
 
                                 if ((new_aggregator->lag_ports == port) && new_aggregator->is_active) {
-                                        pr_info(DRV_NAME ": %s: Removing an active aggregator\n",
+                                        pr_info("%s: Removing an active aggregator\n",
                                                 aggregator->slave->dev->master->name);
                                         // select new active aggregator
                                          select_new_active_agg = 1;
@@ -2030,8 +2049,7 @@ void bond_3ad_unbind_slave(struct slave *slave)
                                         ad_agg_selection_logic(__get_first_agg(port));
                                 }
                         } else {
-                                pr_warning(DRV_NAME ": %s: Warning: unbinding aggregator, "
-                                           "and could not find a new aggregator for its ports\n",
+                                pr_warning("%s: Warning: unbinding aggregator, and could not find a new aggregator for its ports\n",
                                            slave->dev->master->name);
                         }
                 } else { // in case that the only port related to this aggregator is the one we want to remove
@@ -2039,7 +2057,7 @@ void bond_3ad_unbind_slave(struct slave *slave)
                         // clear the aggregator
                         ad_clear_agg(aggregator);
                         if (select_new_active_agg) {
-                                pr_info(DRV_NAME ": %s: Removing an active aggregator\n",
+                                pr_info("%s: Removing an active aggregator\n",
                                         slave->dev->master->name);
                                 // select new active aggregator
                                 ad_agg_selection_logic(__get_first_agg(port));
@@ -2066,7 +2084,7 @@ void bond_3ad_unbind_slave(struct slave *slave)
                                         // clear the aggregator
                                         ad_clear_agg(temp_aggregator);
                                         if (select_new_active_agg) {
-                                                pr_info(DRV_NAME ": %s: Removing an active aggregator\n",
+                                                pr_info("%s: Removing an active aggregator\n",
                                                         slave->dev->master->name);
                                                 // select new active aggregator
                                                 ad_agg_selection_logic(__get_first_agg(port));
@@ -2115,8 +2133,8 @@ void bond_3ad_state_machine_handler(struct work_struct *work)
                 // select the active aggregator for the bond
                 if ((port = __get_first_port(bond))) {
                         if (!port->slave) {
-                                pr_warning(DRV_NAME ": %s: Warning: bond's first port is "
-                                           "uninitialized\n", bond->dev->name);
+                                pr_warning("%s: Warning: bond's first port is uninitialized\n",
+                                           bond->dev->name);
                                 goto re_arm;
                         }
 
@@ -2129,8 +2147,8 @@ void bond_3ad_state_machine_handler(struct work_struct *work)
         // for each port run the state machines
         for (port = __get_first_port(bond); port; port = __get_next_port(port)) {
                 if (!port->slave) {
-                        pr_warning(DRV_NAME ": %s: Warning: Found an uninitialized "
-                                   "port\n", bond->dev->name);
+                        pr_warning("%s: Warning: Found an uninitialized port\n",
+                                   bond->dev->name);
                         goto re_arm;
                 }
 
@@ -2171,15 +2189,15 @@ static void bond_3ad_rx_indication(struct lacpdu *lacpdu, struct slave *slave, u
                 port = &(SLAVE_AD_INFO(slave).port);
 
                 if (!port->slave) {
-                        pr_warning(DRV_NAME ": %s: Warning: port of slave %s "
-                                   "is uninitialized\n",
+                        pr_warning("%s: Warning: port of slave %s is uninitialized\n",
                                    slave->dev->name, slave->dev->master->name);
                         return;
                 }
 
                 switch (lacpdu->subtype) {
                 case AD_TYPE_LACPDU:
-                        pr_debug("Received LACPDU on port %d\n", port->actor_port_number);
+                        pr_debug("Received LACPDU on port %d\n",
+                                 port->actor_port_number);
                         ad_rx_machine(lacpdu, port);
                         break;
 
@@ -2188,17 +2206,20 @@ static void bond_3ad_rx_indication(struct lacpdu *lacpdu, struct slave *slave, u
 
                         switch (((struct bond_marker *)lacpdu)->tlv_type) {
                         case AD_MARKER_INFORMATION_SUBTYPE:
-                                pr_debug("Received Marker Information on port %d\n", port->actor_port_number);
+                                pr_debug("Received Marker Information on port %d\n",
+                                         port->actor_port_number);
                                 ad_marker_info_received((struct bond_marker *)lacpdu, port);
                                 break;
 
                         case AD_MARKER_RESPONSE_SUBTYPE:
-                                pr_debug("Received Marker Response on port %d\n", port->actor_port_number);
+                                pr_debug("Received Marker Response on port %d\n",
+                                         port->actor_port_number);
                                 ad_marker_response_received((struct bond_marker *)lacpdu, port);
                                 break;
 
                         default:
-                                pr_debug("Received an unknown Marker subtype on slot %d\n", port->actor_port_number);
+                                pr_debug("Received an unknown Marker subtype on slot %d\n",
+                                         port->actor_port_number);
                         }
                 }
         }
@@ -2218,8 +2239,7 @@ void bond_3ad_adapter_speed_changed(struct slave *slave)
 
         // if slave is null, the whole port is not initialized
         if (!port->slave) {
-                pr_warning(DRV_NAME ": Warning: %s: speed "
-                           "changed for uninitialized port on %s\n",
+                pr_warning("Warning: %s: speed changed for uninitialized port on %s\n",
                            slave->dev->master->name, slave->dev->name);
                 return;
         }
@@ -2246,8 +2266,7 @@ void bond_3ad_adapter_duplex_changed(struct slave *slave)
 
         // if slave is null, the whole port is not initialized
         if (!port->slave) {
-                pr_warning(DRV_NAME ": %s: Warning: duplex changed "
-                           "for uninitialized port on %s\n",
+                pr_warning("%s: Warning: duplex changed for uninitialized port on %s\n",
                            slave->dev->master->name, slave->dev->name);
                 return;
         }
@@ -2275,8 +2294,7 @@ void bond_3ad_handle_link_change(struct slave *slave, char link)
 
         // if slave is null, the whole port is not initialized
         if (!port->slave) {
-                pr_warning(DRV_NAME ": Warning: %s: link status changed for "
-                           "uninitialized port on %s\n",
+                pr_warning("Warning: %s: link status changed for uninitialized port on %s\n",
                            slave->dev->master->name, slave->dev->name);
                 return;
         }
@@ -2381,8 +2399,8 @@ int bond_3ad_xmit_xor(struct sk_buff *skb, struct net_device *dev)
         }
 
         if (bond_3ad_get_active_agg_info(bond, &ad_info)) {
-                pr_debug(DRV_NAME ": %s: Error: "
-                         "bond_3ad_get_active_agg_info failed\n", dev->name);
+                pr_debug("%s: Error: bond_3ad_get_active_agg_info failed\n",
+                         dev->name);
                 goto out;
         }
 
@@ -2391,8 +2409,7 @@ int bond_3ad_xmit_xor(struct sk_buff *skb, struct net_device *dev)
 
         if (slaves_in_agg == 0) {
                 /*the aggregator is empty*/
-                pr_debug(DRV_NAME ": %s: Error: active aggregator is empty\n",
-                         dev->name);
+                pr_debug("%s: Error: active aggregator is empty\n", dev->name);
                 goto out;
         }
 
@@ -2410,8 +2427,8 @@ int bond_3ad_xmit_xor(struct sk_buff *skb, struct net_device *dev)
         }
 
         if (slave_agg_no >= 0) {
-                pr_err(DRV_NAME ": %s: Error: Couldn't find a slave to tx on "
-                       "for aggregator ID %d\n", dev->name, agg_id);
+                pr_err("%s: Error: Couldn't find a slave to tx on for aggregator ID %d\n",
+                       dev->name, agg_id);
                 goto out;
         }
 
diff --git a/drivers/net/bonding/bond_alb.c b/drivers/net/bonding/bond_alb.c
index 00ab51ef3129..40fdc41446cc 100644
--- a/drivers/net/bonding/bond_alb.c
+++ b/drivers/net/bonding/bond_alb.c
@@ -20,6 +20,8 @@
  *
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/skbuff.h>
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
@@ -201,8 +203,7 @@ static int tlb_initialize(struct bonding *bond)
 
         new_hashtbl = kzalloc(size, GFP_KERNEL);
         if (!new_hashtbl) {
-                pr_err(DRV_NAME
-                       ": %s: Error: Failed to allocate TLB hash table\n",
+                pr_err("%s: Error: Failed to allocate TLB hash table\n",
                        bond->dev->name);
                 return -1;
         }
@@ -514,8 +515,7 @@ static void rlb_update_client(struct rlb_client_info *client_info)
                                  client_info->slave->dev->dev_addr,
                                  client_info->mac_dst);
                 if (!skb) {
-                        pr_err(DRV_NAME
-                               ": %s: Error: failed to create an ARP packet\n",
+                        pr_err("%s: Error: failed to create an ARP packet\n",
                                client_info->slave->dev->master->name);
                         continue;
                 }
@@ -525,8 +525,7 @@ static void rlb_update_client(struct rlb_client_info *client_info)
                 if (client_info->tag) {
                         skb = vlan_put_tag(skb, client_info->vlan_id);
                         if (!skb) {
-                                pr_err(DRV_NAME
-                                       ": %s: Error: failed to insert VLAN tag\n",
+                                pr_err("%s: Error: failed to insert VLAN tag\n",
                                        client_info->slave->dev->master->name);
                                 continue;
                         }
@@ -609,9 +608,7 @@ static void rlb_req_update_subnet_clients(struct bonding *bond, __be32 src_ip)
                 client_info = &(bond_info->rx_hashtbl[hash_index]);
 
                 if (!client_info->slave) {
-                        pr_err(DRV_NAME
-                               ": %s: Error: found a client with no channel in "
-                               "the client's hash table\n",
+                        pr_err("%s: Error: found a client with no channel in the client's hash table\n",
                                bond->dev->name);
                         continue;
                 }
@@ -806,8 +803,7 @@ static int rlb_initialize(struct bonding *bond)
 
         new_hashtbl = kmalloc(size, GFP_KERNEL);
         if (!new_hashtbl) {
-                pr_err(DRV_NAME
-                       ": %s: Error: Failed to allocate RLB hash table\n",
+                pr_err("%s: Error: Failed to allocate RLB hash table\n",
                        bond->dev->name);
                 return -1;
         }
@@ -928,8 +924,7 @@ static void alb_send_learning_packets(struct slave *slave, u8 mac_addr[])
 
                         skb = vlan_put_tag(skb, vlan->vlan_id);
                         if (!skb) {
-                                pr_err(DRV_NAME
-                                       ": %s: Error: failed to insert VLAN tag\n",
+                                pr_err("%s: Error: failed to insert VLAN tag\n",
                                        bond->dev->name);
                                 continue;
                         }
@@ -958,11 +953,8 @@ static int alb_set_slave_mac_addr(struct slave *slave, u8 addr[], int hw)
         memcpy(s_addr.sa_data, addr, dev->addr_len);
         s_addr.sa_family = dev->type;
         if (dev_set_mac_address(dev, &s_addr)) {
-                pr_err(DRV_NAME
-                       ": %s: Error: dev_set_mac_address of dev %s failed! ALB "
-                       "mode requires that the base driver support setting "
-                       "the hw address also when the network device's "
-                       "interface is open\n",
+                pr_err("%s: Error: dev_set_mac_address of dev %s failed!\n"
+                       "ALB mode requires that the base driver support setting the hw address also when the network device's interface is open\n",
                        dev->master->name, dev->name);
                 return -EOPNOTSUPP;
         }
@@ -1169,18 +1161,12 @@ static int alb_handle_addr_collision_on_attach(struct bonding *bond, struct slav
                 alb_set_slave_mac_addr(slave, free_mac_slave->perm_hwaddr,
                                        bond->alb_info.rlb_enabled);
 
-                pr_warning(DRV_NAME
-                           ": %s: Warning: the hw address of slave %s is "
-                           "in use by the bond; giving it the hw address "
-                           "of %s\n",
+                pr_warning("%s: Warning: the hw address of slave %s is in use by the bond; giving it the hw address of %s\n",
                            bond->dev->name, slave->dev->name,
                            free_mac_slave->dev->name);
 
         } else if (has_bond_addr) {
-                pr_err(DRV_NAME
-                       ": %s: Error: the hw address of slave %s is in use by the "
-                       "bond; couldn't find a slave with a free hw address to "
-                       "give it (this should not have happened)\n",
+                pr_err("%s: Error: the hw address of slave %s is in use by the bond; couldn't find a slave with a free hw address to give it (this should not have happened)\n",
                        bond->dev->name, slave->dev->name);
                 return -EFAULT;
         }
diff --git a/drivers/net/bonding/bond_ipv6.c b/drivers/net/bonding/bond_ipv6.c
index b72e1dc8cf8f..6dd64cf3cb76 100644
--- a/drivers/net/bonding/bond_ipv6.c
+++ b/drivers/net/bonding/bond_ipv6.c
@@ -20,6 +20,8 @@
  *
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/types.h>
 #include <linux/if_vlan.h>
 #include <net/ipv6.h>
@@ -74,20 +76,20 @@ static void bond_na_send(struct net_device *slave_dev,
         addrconf_addr_solict_mult(daddr, &mcaddr);
 
         pr_debug("ipv6 na on slave %s: dest %pI6, src %pI6\n",
-               slave_dev->name, &mcaddr, daddr);
+                 slave_dev->name, &mcaddr, daddr);
 
         skb = ndisc_build_skb(slave_dev, &mcaddr, daddr, &icmp6h, daddr,
                               ND_OPT_TARGET_LL_ADDR);
 
         if (!skb) {
-                pr_err(DRV_NAME ": NA packet allocation failed\n");
+                pr_err("NA packet allocation failed\n");
                 return;
         }
 
         if (vlan_id) {
                 skb = vlan_put_tag(skb, vlan_id);
                 if (!skb) {
-                        pr_err(DRV_NAME ": failed to insert VLAN tag\n");
+                        pr_err("failed to insert VLAN tag\n");
                         return;
                 }
         }
@@ -109,8 +111,8 @@ void bond_send_unsolicited_na(struct bonding *bond)
         struct inet6_dev *idev;
         int is_router;
 
-        pr_debug("bond_send_unsol_na: bond %s slave %s\n", bond->dev->name,
-                                slave ? slave->dev->name : "NULL");
+        pr_debug("%s: bond %s slave %s\n", bond->dev->name,
+                 __func__, slave ? slave->dev->name : "NULL");
 
         if (!slave || !bond->send_unsol_na ||
             test_bit(__LINK_STATE_LINKWATCH_PENDING, &slave->dev->state))
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index af9b9c4eb496..3f0071cfe56b 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -31,6 +31,8 @@
  *
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/types.h>
@@ -260,7 +262,7 @@ static int bond_add_vlan(struct bonding *bond, unsigned short vlan_id)
         struct vlan_entry *vlan;
 
         pr_debug("bond: %s, vlan id %d\n",
-                (bond ? bond->dev->name : "None"), vlan_id);
+                 (bond ? bond->dev->name : "None"), vlan_id);
 
         vlan = kzalloc(sizeof(struct vlan_entry), GFP_KERNEL);
         if (!vlan)
@@ -303,8 +305,8 @@ static int bond_del_vlan(struct bonding *bond, unsigned short vlan_id)
                         if (bond_is_lb(bond))
                                 bond_alb_clear_vlan(bond, vlan_id);
 
-                        pr_debug("removed VLAN ID %d from bond %s\n", vlan_id,
-                                bond->dev->name);
+                        pr_debug("removed VLAN ID %d from bond %s\n",
+                                 vlan_id, bond->dev->name);
 
                         kfree(vlan);
 
@@ -323,8 +325,8 @@ static int bond_del_vlan(struct bonding *bond, unsigned short vlan_id)
                 }
         }
 
-        pr_debug("couldn't find VLAN ID %d in bond %s\n", vlan_id,
-                bond->dev->name);
+        pr_debug("couldn't find VLAN ID %d in bond %s\n",
+                 vlan_id, bond->dev->name);
 
 out:
         write_unlock_bh(&bond->lock);
@@ -348,7 +350,7 @@ static int bond_has_challenged_slaves(struct bonding *bond)
         bond_for_each_slave(bond, slave, i) {
                 if (slave->dev->features & NETIF_F_VLAN_CHALLENGED) {
                         pr_debug("found VLAN challenged slave - %s\n",
-                                slave->dev->name);
+                                 slave->dev->name);
                         return 1;
                 }
         }
@@ -499,8 +501,7 @@ static void bond_vlan_rx_add_vid(struct net_device *bond_dev, uint16_t vid)
 
         res = bond_add_vlan(bond, vid);
         if (res) {
-                pr_err(DRV_NAME
-                       ": %s: Error: Failed to add vlan id %d\n",
+                pr_err("%s: Error: Failed to add vlan id %d\n",
                        bond_dev->name, vid);
         }
 }
@@ -534,8 +535,7 @@ static void bond_vlan_rx_kill_vid(struct net_device *bond_dev, uint16_t vid)
 
         res = bond_del_vlan(bond, vid);
         if (res) {
-                pr_err(DRV_NAME
-                       ": %s: Error: Failed to remove vlan id %d\n",
+                pr_err("%s: Error: Failed to remove vlan id %d\n",
                        bond_dev->name, vid);
         }
 }
@@ -1053,8 +1053,7 @@ static void bond_do_fail_over_mac(struct bonding *bond,
 
                 rv = dev_set_mac_address(new_active->dev, &saddr);
                 if (rv) {
-                        pr_err(DRV_NAME
-                               ": %s: Error %d setting MAC of slave %s\n",
+                        pr_err("%s: Error %d setting MAC of slave %s\n",
                                bond->dev->name, -rv, new_active->dev->name);
                         goto out;
                 }
@@ -1067,16 +1066,14 @@ static void bond_do_fail_over_mac(struct bonding *bond,
 
                 rv = dev_set_mac_address(old_active->dev, &saddr);
                 if (rv)
-                        pr_err(DRV_NAME
-                               ": %s: Error %d setting MAC of slave %s\n",
+                        pr_err("%s: Error %d setting MAC of slave %s\n",
                                bond->dev->name, -rv, new_active->dev->name);
 out:
                 read_lock(&bond->lock);
                 write_lock_bh(&bond->curr_slave_lock);
                 break;
         default:
-                pr_err(DRV_NAME
-                       ": %s: bond_do_fail_over_mac impossible: bad policy %d\n",
+                pr_err("%s: bond_do_fail_over_mac impossible: bad policy %d\n",
                        bond->dev->name, bond->params.fail_over_mac);
                 break;
         }
@@ -1178,11 +1175,9 @@ void bond_change_active_slave(struct bonding *bond, struct slave *new_active)
 
                 if (new_active->link == BOND_LINK_BACK) {
                         if (USES_PRIMARY(bond->params.mode)) {
-                                pr_info(DRV_NAME
-                                       ": %s: making interface %s the new "
-                                       "active one %d ms earlier.\n",
-                                       bond->dev->name, new_active->dev->name,
-                                       (bond->params.updelay - new_active->delay) * bond->params.miimon);
+                                pr_info("%s: making interface %s the new active one %d ms earlier.\n",
+                                        bond->dev->name, new_active->dev->name,
+                                        (bond->params.updelay - new_active->delay) * bond->params.miimon);
                         }
 
                         new_active->delay = 0;
@@ -1195,10 +1190,8 @@ void bond_change_active_slave(struct bonding *bond, struct slave *new_active)
                                 bond_alb_handle_link_change(bond, new_active, BOND_LINK_UP);
                 } else {
                         if (USES_PRIMARY(bond->params.mode)) {
-                                pr_info(DRV_NAME
-                                       ": %s: making interface %s the new "
-                                       "active one.\n",
-                                       bond->dev->name, new_active->dev->name);
+                                pr_info("%s: making interface %s the new active one.\n",
+                                        bond->dev->name, new_active->dev->name);
                         }
                 }
         }
@@ -1268,13 +1261,11 @@ void bond_select_active_slave(struct bonding *bond)
                         return;
 
                 if (netif_carrier_ok(bond->dev)) {
-                        pr_info(DRV_NAME
-                               ": %s: first active interface up!\n",
-                               bond->dev->name);
+                        pr_info("%s: first active interface up!\n",
+                                bond->dev->name);
                 } else {
-                        pr_info(DRV_NAME ": %s: "
-                               "now running without any active interface !\n",
-                               bond->dev->name);
+                        pr_info("%s: now running without any active interface !\n",
+                                bond->dev->name);
                 }
         }
 }
@@ -1423,16 +1414,14 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev)
 
         if (!bond->params.use_carrier && slave_dev->ethtool_ops == NULL &&
                 slave_ops->ndo_do_ioctl == NULL) {
-                pr_warning(DRV_NAME
-                       ": %s: Warning: no link monitoring support for %s\n",
-                       bond_dev->name, slave_dev->name);
+                pr_warning("%s: Warning: no link monitoring support for %s\n",
+                           bond_dev->name, slave_dev->name);
         }
 
         /* bond must be initialized by bond_open() before enslaving */
         if (!(bond_dev->flags & IFF_UP)) {
-                pr_warning(DRV_NAME
-                        " %s: master_dev is not up in bond_enslave\n",
-                        bond_dev->name);
+                pr_warning("%s: master_dev is not up in bond_enslave\n",
+                           bond_dev->name);
         }
 
         /* already enslaved */
@@ -1446,19 +1435,13 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev)
         if (slave_dev->features & NETIF_F_VLAN_CHALLENGED) {
                 pr_debug("%s: NETIF_F_VLAN_CHALLENGED\n", slave_dev->name);
                 if (!list_empty(&bond->vlan_list)) {
-                        pr_err(DRV_NAME
-                               ": %s: Error: cannot enslave VLAN "
-                               "challenged slave %s on VLAN enabled "
-                               "bond %s\n", bond_dev->name, slave_dev->name,
-                               bond_dev->name);
+                        pr_err("%s: Error: cannot enslave VLAN challenged slave %s on VLAN enabled bond %s\n",
+                               bond_dev->name, slave_dev->name, bond_dev->name);
                         return -EPERM;
                 } else {
-                        pr_warning(DRV_NAME
-                               ": %s: Warning: enslaved VLAN challenged "
-                               "slave %s. Adding VLANs will be blocked as "
-                               "long as %s is part of bond %s\n",
-                               bond_dev->name, slave_dev->name, slave_dev->name,
-                               bond_dev->name);
+                        pr_warning("%s: Warning: enslaved VLAN challenged slave %s. Adding VLANs will be blocked as long as %s is part of bond %s\n",
+                                   bond_dev->name, slave_dev->name,
+                                   slave_dev->name, bond_dev->name);
                         bond_dev->features |= NETIF_F_VLAN_CHALLENGED;
                 }
         } else {
@@ -1478,8 +1461,7 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev)
          * enslaving it; the old ifenslave will not.
          */
         if ((slave_dev->flags & IFF_UP)) {
-                pr_err(DRV_NAME ": %s is up. "
-                       "This may be due to an out of date ifenslave.\n",
+                pr_err("%s is up. This may be due to an out of date ifenslave.\n",
                        slave_dev->name);
                 res = -EPERM;
                 goto err_undo_flags;
@@ -1495,7 +1477,8 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev)
         if (bond->slave_cnt == 0) {
                 if (bond_dev->type != slave_dev->type) {
                         pr_debug("%s: change device type from %d to %d\n",
-                                bond_dev->name, bond_dev->type, slave_dev->type);
+                                 bond_dev->name,
+                                 bond_dev->type, slave_dev->type);
 
                         netdev_bonding_change(bond_dev, NETDEV_BONDING_OLDTYPE);
 
@@ -1507,28 +1490,21 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev)
                         netdev_bonding_change(bond_dev, NETDEV_BONDING_NEWTYPE);
                 }
         } else if (bond_dev->type != slave_dev->type) {
-                pr_err(DRV_NAME ": %s ether type (%d) is different "
-                        "from other slaves (%d), can not enslave it.\n",
-                        slave_dev->name,
-                        slave_dev->type, bond_dev->type);
-                        res = -EINVAL;
-                        goto err_undo_flags;
+                pr_err("%s ether type (%d) is different from other slaves (%d), can not enslave it.\n",
+                       slave_dev->name,
+                       slave_dev->type, bond_dev->type);
+                res = -EINVAL;
+                goto err_undo_flags;
         }
 
         if (slave_ops->ndo_set_mac_address == NULL) {
                 if (bond->slave_cnt == 0) {
-                        pr_warning(DRV_NAME
-                               ": %s: Warning: The first slave device "
-                               "specified does not support setting the MAC "
-                               "address. Setting fail_over_mac to active.",
-                               bond_dev->name);
+                        pr_warning("%s: Warning: The first slave device specified does not support setting the MAC address. Setting fail_over_mac to active.",
+                                   bond_dev->name);
                         bond->params.fail_over_mac = BOND_FOM_ACTIVE;
                 } else if (bond->params.fail_over_mac != BOND_FOM_ACTIVE) {
-                        pr_err(DRV_NAME
-                                ": %s: Error: The slave device specified "
-                                "does not support setting the MAC address, "
-                                "but fail_over_mac is not set to active.\n"
-                                , bond_dev->name);
+                        pr_err("%s: Error: The slave device specified does not support setting the MAC address, but fail_over_mac is not set to active.\n",
+                               bond_dev->name);
                         res = -EOPNOTSUPP;
                         goto err_undo_flags;
                 }
@@ -1655,22 +1631,12 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev)
                          * supported); thus, we don't need to change
                          * the messages for netif_carrier.
                          */
-                        pr_warning(DRV_NAME
-                               ": %s: Warning: MII and ETHTOOL support not "
-                               "available for interface %s, and "
-                               "arp_interval/arp_ip_target module parameters "
-                               "not specified, thus bonding will not detect "
-                               "link failures! see bonding.txt for details.\n",
+                        pr_warning("%s: Warning: MII and ETHTOOL support not available for interface %s, and arp_interval/arp_ip_target module parameters not specified, thus bonding will not detect link failures! see bonding.txt for details.\n",
                                bond_dev->name, slave_dev->name);
                 } else if (link_reporting == -1) {
                         /* unable get link status using mii/ethtool */
-                        pr_warning(DRV_NAME
-                               ": %s: Warning: can't get link status from "
-                               "interface %s; the network driver associated "
-                               "with this interface does not support MII or "
-                               "ETHTOOL link status reporting, thus miimon "
-                               "has no effect on this interface.\n",
-                               bond_dev->name, slave_dev->name);
+                        pr_warning("%s: Warning: can't get link status from interface %s; the network driver associated with this interface does not support MII or ETHTOOL link status reporting, thus miimon has no effect on this interface.\n",
+                                   bond_dev->name, slave_dev->name);
                 }
         }
 
@@ -1678,34 +1644,27 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev)
         if (!bond->params.miimon ||
             (bond_check_dev_link(bond, slave_dev, 0) == BMSR_LSTATUS)) {
                 if (bond->params.updelay) {
-                        pr_debug("Initial state of slave_dev is "
-                                "BOND_LINK_BACK\n");
+                        pr_debug("Initial state of slave_dev is BOND_LINK_BACK\n");
                         new_slave->link  = BOND_LINK_BACK;
                         new_slave->delay = bond->params.updelay;
                 } else {
-                        pr_debug("Initial state of slave_dev is "
-                                "BOND_LINK_UP\n");
+                        pr_debug("Initial state of slave_dev is BOND_LINK_UP\n");
                         new_slave->link  = BOND_LINK_UP;
                 }
                 new_slave->jiffies = jiffies;
         } else {
-                pr_debug("Initial state of slave_dev is "
-                        "BOND_LINK_DOWN\n");
+                pr_debug("Initial state of slave_dev is BOND_LINK_DOWN\n");
                 new_slave->link  = BOND_LINK_DOWN;
         }
 
         if (bond_update_speed_duplex(new_slave) &&
             (new_slave->link != BOND_LINK_DOWN)) {
-                pr_warning(DRV_NAME
-                       ": %s: Warning: failed to get speed and duplex from %s, "
-                       "assumed to be 100Mb/sec and Full.\n",
-                       bond_dev->name, new_slave->dev->name);
+                pr_warning("%s: Warning: failed to get speed and duplex from %s, assumed to be 100Mb/sec and Full.\n",
+                           bond_dev->name, new_slave->dev->name);
 
                 if (bond->params.mode == BOND_MODE_8023AD) {
-                        pr_warning(DRV_NAME
-                               ": %s: Warning: Operation of 802.3ad mode requires ETHTOOL "
-                               "support in base driver for proper aggregator "
-                               "selection.\n", bond_dev->name);
+                        pr_warning("%s: Warning: Operation of 802.3ad mode requires ETHTOOL support in base driver for proper aggregator selection.\n",
+                                   bond_dev->name);
                 }
         }
 
@@ -1777,11 +1736,10 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev)
         if (res)
                 goto err_close;
 
-        pr_info(DRV_NAME
-               ": %s: enslaving %s as a%s interface with a%s link.\n",
-               bond_dev->name, slave_dev->name,
-               new_slave->state == BOND_STATE_ACTIVE ? "n active" : " backup",
-               new_slave->link != BOND_LINK_DOWN ? "n up" : " down");
+        pr_info("%s: enslaving %s as a%s interface with a%s link.\n",
+                bond_dev->name, slave_dev->name,
+                new_slave->state == BOND_STATE_ACTIVE ? "n active" : " backup",
+                new_slave->link != BOND_LINK_DOWN ? "n up" : " down");
 
         /* enslave is successful */
         return 0;
@@ -1833,8 +1791,7 @@ int bond_release(struct net_device *bond_dev, struct net_device *slave_dev)
         /* slave is not a slave or master is not master of this slave */
         if (!(slave_dev->flags & IFF_SLAVE) ||
             (slave_dev->master != bond_dev)) {
-                pr_err(DRV_NAME
-                       ": %s: Error: cannot release %s.\n",
+                pr_err("%s: Error: cannot release %s.\n",
                        bond_dev->name, slave_dev->name);
                 return -EINVAL;
         }
@@ -1844,9 +1801,8 @@ int bond_release(struct net_device *bond_dev, struct net_device *slave_dev)
         slave = bond_get_slave_by_dev(bond, slave_dev);
         if (!slave) {
                 /* not a slave of this bond */
-                pr_info(DRV_NAME
-                       ": %s: %s not enslaved\n",
-                       bond_dev->name, slave_dev->name);
+                pr_info("%s: %s not enslaved\n",
+                        bond_dev->name, slave_dev->name);
                 write_unlock_bh(&bond->lock);
                 return -EINVAL;
         }
@@ -1854,14 +1810,10 @@ int bond_release(struct net_device *bond_dev, struct net_device *slave_dev)
         if (!bond->params.fail_over_mac) {
                 if (!compare_ether_addr(bond_dev->dev_addr, slave->perm_hwaddr) &&
                     bond->slave_cnt > 1)
-                        pr_warning(DRV_NAME
-                               ": %s: Warning: the permanent HWaddr of %s - "
-                               "%pM - is still in use by %s. "
-                               "Set the HWaddr of %s to a different address "
-                               "to avoid conflicts.\n",
-                               bond_dev->name, slave_dev->name,
-                               slave->perm_hwaddr,
-                               bond_dev->name, slave_dev->name);
+                        pr_warning("%s: Warning: the permanent HWaddr of %s - %pM - is still in use by %s. Set the HWaddr of %s to a different address to avoid conflicts.\n",
+                                   bond_dev->name, slave_dev->name,
+                                   slave->perm_hwaddr,
+                                   bond_dev->name, slave_dev->name);
         }
 
         /* Inform AD package of unbinding of slave. */
@@ -1872,12 +1824,10 @@ int bond_release(struct net_device *bond_dev, struct net_device *slave_dev)
                 bond_3ad_unbind_slave(slave);
         }
 
-        pr_info(DRV_NAME
-               ": %s: releasing %s interface %s\n",
-               bond_dev->name,
-               (slave->state == BOND_STATE_ACTIVE)
-               ? "active" : "backup",
-               slave_dev->name);
+        pr_info("%s: releasing %s interface %s\n",
+                bond_dev->name,
+                (slave->state == BOND_STATE_ACTIVE) ? "active" : "backup",
+                slave_dev->name);
 
         oldcurrent = bond->curr_active_slave;
 
@@ -1934,21 +1884,15 @@ int bond_release(struct net_device *bond_dev, struct net_device *slave_dev)
                 if (list_empty(&bond->vlan_list)) {
                         bond_dev->features |= NETIF_F_VLAN_CHALLENGED;
                 } else {
-                        pr_warning(DRV_NAME
-                               ": %s: Warning: clearing HW address of %s while it "
-                               "still has VLANs.\n",
-                               bond_dev->name, bond_dev->name);
-                        pr_warning(DRV_NAME
-                               ": %s: When re-adding slaves, make sure the bond's "
-                               "HW address matches its VLANs'.\n",
-                               bond_dev->name);
+                        pr_warning("%s: Warning: clearing HW address of %s while it still has VLANs.\n",
+                                   bond_dev->name, bond_dev->name);
+                        pr_warning("%s: When re-adding slaves, make sure the bond's HW address matches its VLANs'.\n",
+                                   bond_dev->name);
                 }
         } else if ((bond_dev->features & NETIF_F_VLAN_CHALLENGED) &&
                    !bond_has_challenged_slaves(bond)) {
-                pr_info(DRV_NAME
-                       ": %s: last VLAN challenged slave %s "
-                       "left bond %s. VLAN blocking is removed\n",
-                       bond_dev->name, slave_dev->name, bond_dev->name);
+                pr_info("%s: last VLAN challenged slave %s left bond %s. VLAN blocking is removed\n",
+                        bond_dev->name, slave_dev->name, bond_dev->name);
                 bond_dev->features &= ~NETIF_F_VLAN_CHALLENGED;
         }
 
@@ -2011,8 +1955,8 @@ int  bond_release_and_destroy(struct net_device *bond_dev,
 
         ret = bond_release(bond_dev, slave_dev);
         if ((ret == 0) && (bond->slave_cnt == 0)) {
-                pr_info(DRV_NAME ": %s: destroying bond %s.\n",
-                       bond_dev->name, bond_dev->name);
+                pr_info("%s: destroying bond %s.\n",
+                        bond_dev->name, bond_dev->name);
                 unregister_netdevice(bond_dev);
         }
         return ret;
@@ -2116,19 +2060,13 @@ static int bond_release_all(struct net_device *bond_dev)
         if (list_empty(&bond->vlan_list))
                 bond_dev->features |= NETIF_F_VLAN_CHALLENGED;
         else {
-                pr_warning(DRV_NAME
-                       ": %s: Warning: clearing HW address of %s while it "
-                       "still has VLANs.\n",
-                       bond_dev->name, bond_dev->name);
-                pr_warning(DRV_NAME
-                       ": %s: When re-adding slaves, make sure the bond's "
-                       "HW address matches its VLANs'.\n",
-                       bond_dev->name);
+                pr_warning("%s: Warning: clearing HW address of %s while it still has VLANs.\n",
+                           bond_dev->name, bond_dev->name);
+                pr_warning("%s: When re-adding slaves, make sure the bond's HW address matches its VLANs'.\n",
+                           bond_dev->name);
         }
 
-        pr_info(DRV_NAME
-               ": %s: released all slaves\n",
-               bond_dev->name);
+        pr_info("%s: released all slaves\n", bond_dev->name);
 
 out:
         write_unlock_bh(&bond->lock);
@@ -2254,16 +2192,14 @@ static int bond_miimon_inspect(struct bonding *bond)
                         slave->link = BOND_LINK_FAIL;
                         slave->delay = bond->params.downdelay;
                         if (slave->delay) {
-                                pr_info(DRV_NAME
-                                       ": %s: link status down for %s"
-                                       "interface %s, disabling it in %d ms.\n",
-                                       bond->dev->name,
-                                       (bond->params.mode ==
-                                        BOND_MODE_ACTIVEBACKUP) ?
-                                       ((slave->state == BOND_STATE_ACTIVE) ?
-                                        "active " : "backup ") : "",
-                                       slave->dev->name,
-                                       bond->params.downdelay * bond->params.miimon);
+                                pr_info("%s: link status down for %sinterface %s, disabling it in %d ms.\n",
+                                        bond->dev->name,
+                                        (bond->params.mode ==
+                                         BOND_MODE_ACTIVEBACKUP) ?
+                                        ((slave->state == BOND_STATE_ACTIVE) ?
+                                         "active " : "backup ") : "",
+                                        slave->dev->name,
+                                        bond->params.downdelay * bond->params.miimon);
                         }
                         /*FALLTHRU*/
                 case BOND_LINK_FAIL:
@@ -2273,13 +2209,11 @@ static int bond_miimon_inspect(struct bonding *bond)
                                  */
                                 slave->link = BOND_LINK_UP;
                                 slave->jiffies = jiffies;
-                                pr_info(DRV_NAME
-                                       ": %s: link status up again after %d "
-                                       "ms for interface %s.\n",
-                                       bond->dev->name,
-                                       (bond->params.downdelay - slave->delay) *
-                                       bond->params.miimon,
-                                       slave->dev->name);
+                                pr_info("%s: link status up again after %d ms for interface %s.\n",
+                                        bond->dev->name,
+                                        (bond->params.downdelay - slave->delay) *
+                                        bond->params.miimon,
+                                        slave->dev->name);
                                 continue;
                         }
 
@@ -2300,25 +2234,21 @@ static int bond_miimon_inspect(struct bonding *bond)
                         slave->delay = bond->params.updelay;
 
                         if (slave->delay) {
-                                pr_info(DRV_NAME
-                                       ": %s: link status up for "
-                                       "interface %s, enabling it in %d ms.\n",
-                                       bond->dev->name, slave->dev->name,
-                                       ignore_updelay ? 0 :
-                                       bond->params.updelay *
-                                       bond->params.miimon);
+                                pr_info("%s: link status up for interface %s, enabling it in %d ms.\n",
+                                        bond->dev->name, slave->dev->name,
+                                        ignore_updelay ? 0 :
+                                        bond->params.updelay *
+                                        bond->params.miimon);
                         }
                         /*FALLTHRU*/
                 case BOND_LINK_BACK:
                         if (!link_state) {
                                 slave->link = BOND_LINK_DOWN;
-                                pr_info(DRV_NAME
-                                       ": %s: link status down again after %d "
-                                       "ms for interface %s.\n",
-                                       bond->dev->name,
-                                       (bond->params.updelay - slave->delay) *
-                                       bond->params.miimon,
-                                       slave->dev->name);
+                                pr_info("%s: link status down again after %d ms for interface %s.\n",
+                                        bond->dev->name,
+                                        (bond->params.updelay - slave->delay) *
+                                        bond->params.miimon,
+                                        slave->dev->name);
 
                                 continue;
                         }
@@ -2366,10 +2296,8 @@ static void bond_miimon_commit(struct bonding *bond)
                                 slave->state = BOND_STATE_BACKUP;
                         }
 
-                        pr_info(DRV_NAME
-                               ": %s: link status definitely "
-                               "up for interface %s.\n",
-                               bond->dev->name, slave->dev->name);
+                        pr_info("%s: link status definitely up for interface %s.\n",
+                                bond->dev->name, slave->dev->name);
 
                         /* notify ad that the link status has changed */
                         if (bond->params.mode == BOND_MODE_8023AD)
@@ -2395,10 +2323,8 @@ static void bond_miimon_commit(struct bonding *bond)
                             bond->params.mode == BOND_MODE_8023AD)
                                 bond_set_slave_inactive_flags(slave);
 
-                        pr_info(DRV_NAME
-                               ": %s: link status definitely down for "
-                               "interface %s, disabling it\n",
-                               bond->dev->name, slave->dev->name);
+                        pr_info("%s: link status definitely down for interface %s, disabling it\n",
+                                bond->dev->name, slave->dev->name);
 
                         if (bond->params.mode == BOND_MODE_8023AD)
                                 bond_3ad_handle_link_change(slave,
@@ -2414,8 +2340,7 @@ static void bond_miimon_commit(struct bonding *bond)
                         continue;
 
                 default:
-                        pr_err(DRV_NAME
-                               ": %s: invalid new link %d on slave %s\n",
+                        pr_err("%s: invalid new link %d on slave %s\n",
                                bond->dev->name, slave->new_link,
                                slave->dev->name);
                         slave->new_link = BOND_LINK_NOCHANGE;
@@ -2534,19 +2459,19 @@ static void bond_arp_send(struct net_device *slave_dev, int arp_op, __be32 dest_
         struct sk_buff *skb;
 
         pr_debug("arp %d on slave %s: dst %x src %x vid %d\n", arp_op,
-               slave_dev->name, dest_ip, src_ip, vlan_id);
+                 slave_dev->name, dest_ip, src_ip, vlan_id);
 
         skb = arp_create(arp_op, ETH_P_ARP, dest_ip, slave_dev, src_ip,
                          NULL, slave_dev->dev_addr, NULL);
 
         if (!skb) {
-                pr_err(DRV_NAME ": ARP packet allocation failed\n");
+                pr_err("ARP packet allocation failed\n");
                 return;
         }
         if (vlan_id) {
                 skb = vlan_put_tag(skb, vlan_id);
                 if (!skb) {
-                        pr_err(DRV_NAME ": failed to insert VLAN tag\n");
+                        pr_err("failed to insert VLAN tag\n");
                         return;
                 }
         }
@@ -2586,9 +2511,8 @@ static void bond_arp_send_all(struct bonding *bond, struct slave *slave)
                 rv = ip_route_output_key(dev_net(bond->dev), &rt, &fl);
                 if (rv) {
                         if (net_ratelimit()) {
-                                pr_warning(DRV_NAME
-                             ": %s: no route to arp_ip_target %pI4\n",
-                                       bond->dev->name, &fl.fl4_dst);
+                                pr_warning("%s: no route to arp_ip_target %pI4\n",
+                                           bond->dev->name, &fl.fl4_dst);
                         }
                         continue;
                 }
@@ -2623,10 +2547,9 @@ static void bond_arp_send_all(struct bonding *bond, struct slave *slave)
                 }
 
                 if (net_ratelimit()) {
-                        pr_warning(DRV_NAME
-               ": %s: no path to arp_ip_target %pI4 via rt.dev %s\n",
-                               bond->dev->name, &fl.fl4_dst,
-                               rt->u.dst.dev ? rt->u.dst.dev->name : "NULL");
+                        pr_warning("%s: no path to arp_ip_target %pI4 via rt.dev %s\n",
+                                   bond->dev->name, &fl.fl4_dst,
+                                   rt->u.dst.dev ? rt->u.dst.dev->name : "NULL");
                 }
                 ip_rt_put(rt);
         }
@@ -2644,8 +2567,8 @@ static void bond_send_gratuitous_arp(struct bonding *bond)
         struct vlan_entry *vlan;
         struct net_device *vlan_dev;
 
-        pr_debug("bond_send_grat_arp: bond %s slave %s\n", bond->dev->name,
-                                slave ? slave->dev->name : "NULL");
+        pr_debug("bond_send_grat_arp: bond %s slave %s\n",
+                 bond->dev->name, slave ? slave->dev->name : "NULL");
 
         if (!slave || !bond->send_grat_arp ||
             test_bit(__LINK_STATE_LINKWATCH_PENDING, &slave->dev->state))
@@ -2674,7 +2597,8 @@ static void bond_validate_arp(struct bonding *bond, struct slave *slave, __be32
 
         for (i = 0; (i < BOND_MAX_ARP_TARGETS) && targets[i]; i++) {
                 pr_debug("bva: sip %pI4 tip %pI4 t[%d] %pI4 bhti(tip) %d\n",
-                        &sip, &tip, i, &targets[i], bond_has_this_ip(bond, tip));
+                         &sip, &tip, i, &targets[i],
+                         bond_has_this_ip(bond, tip));
                 if (sip == targets[i]) {
                         if (bond_has_this_ip(bond, tip))
                                 slave->last_arp_rx = jiffies;
@@ -2698,8 +2622,8 @@ static int bond_arp_rcv(struct sk_buff *skb, struct net_device *dev, struct pack
         read_lock(&bond->lock);
 
         pr_debug("bond_arp_rcv: bond %s skb->dev %s orig_dev %s\n",
-                bond->dev->name, skb->dev ? skb->dev->name : "NULL",
-                orig_dev ? orig_dev->name : "NULL");
+                 bond->dev->name, skb->dev ? skb->dev->name : "NULL",
+                 orig_dev ? orig_dev->name : "NULL");
 
         slave = bond_get_slave_by_dev(bond, orig_dev);
         if (!slave || !slave_do_arp_validate(bond, slave))
@@ -2724,9 +2648,9 @@ static int bond_arp_rcv(struct sk_buff *skb, struct net_device *dev, struct pack
         memcpy(&tip, arp_ptr, 4);
 
         pr_debug("bond_arp_rcv: %s %s/%d av %d sv %d sip %pI4 tip %pI4\n",
-                bond->dev->name, slave->dev->name, slave->state,
-                bond->params.arp_validate, slave_do_arp_validate(bond, slave),
-                &sip, &tip);
+                 bond->dev->name, slave->dev->name, slave->state,
+                 bond->params.arp_validate, slave_do_arp_validate(bond, slave),
+                 &sip, &tip);
 
         /*
          * Backup slaves won't see the ARP reply, but do come through
@@ -2800,17 +2724,14 @@ void bond_loadbalance_arp_mon(struct work_struct *work)
                                  * is closed.
                                  */
                                 if (!oldcurrent) {
-                                        pr_info(DRV_NAME
-                                               ": %s: link status definitely "
-                                               "up for interface %s, ",
-                                               bond->dev->name,
-                                               slave->dev->name);
+                                        pr_info("%s: link status definitely up for interface %s, ",
+                                                bond->dev->name,
+                                                slave->dev->name);
                                         do_failover = 1;
                                 } else {
-                                        pr_info(DRV_NAME
-                                               ": %s: interface %s is now up\n",
-                                               bond->dev->name,
-                                               slave->dev->name);
+                                        pr_info("%s: interface %s is now up\n",
+                                                bond->dev->name,
+                                                slave->dev->name);
                                 }
                         }
                 } else {
@@ -2829,10 +2750,9 @@ void bond_loadbalance_arp_mon(struct work_struct *work)
                                 if (slave->link_failure_count < UINT_MAX)
                                         slave->link_failure_count++;
 
-                                pr_info(DRV_NAME
-                                       ": %s: interface %s is now down.\n",
-                                       bond->dev->name,
-                                       slave->dev->name);
+                                pr_info("%s: interface %s is now down.\n",
+                                        bond->dev->name,
+                                        slave->dev->name);
 
                                 if (slave == oldcurrent)
                                         do_failover = 1;
@@ -2965,9 +2885,7 @@ static void bond_ab_arp_commit(struct bonding *bond, int delta_in_ticks)
                                 slave->link = BOND_LINK_UP;
                                 bond->current_arp_slave = NULL;
 
-                                pr_info(DRV_NAME
-                                        ": %s: link status definitely "
-                                        "up for interface %s.\n",
+                                pr_info("%s: link status definitely up for interface %s.\n",
                                         bond->dev->name, slave->dev->name);
 
                                 if (!bond->curr_active_slave ||
@@ -2985,9 +2903,7 @@ static void bond_ab_arp_commit(struct bonding *bond, int delta_in_ticks)
                         slave->link = BOND_LINK_DOWN;
                         bond_set_slave_inactive_flags(slave);
 
-                        pr_info(DRV_NAME
-                                ": %s: link status definitely down for "
-                                "interface %s, disabling it\n",
+                        pr_info("%s: link status definitely down for interface %s, disabling it\n",
                                 bond->dev->name, slave->dev->name);
 
                         if (slave == bond->curr_active_slave) {
@@ -2998,8 +2914,7 @@ static void bond_ab_arp_commit(struct bonding *bond, int delta_in_ticks)
                         continue;
 
                 default:
-                        pr_err(DRV_NAME
-                               ": %s: impossible: new_link %d on slave %s\n",
+                        pr_err("%s: impossible: new_link %d on slave %s\n",
                                bond->dev->name, slave->new_link,
                                slave->dev->name);
                         continue;
@@ -3028,9 +2943,9 @@ static void bond_ab_arp_probe(struct bonding *bond)
         read_lock(&bond->curr_slave_lock);
 
         if (bond->current_arp_slave && bond->curr_active_slave)
-                pr_info(DRV_NAME "PROBE: c_arp %s && cas %s BAD\n",
-                       bond->current_arp_slave->dev->name,
-                       bond->curr_active_slave->dev->name);
+                pr_info("PROBE: c_arp %s && cas %s BAD\n",
+                        bond->current_arp_slave->dev->name,
+                        bond->curr_active_slave->dev->name);
 
         if (bond->curr_active_slave) {
                 bond_arp_send_all(bond, bond->curr_active_slave);
@@ -3078,9 +2993,8 @@ static void bond_ab_arp_probe(struct bonding *bond)
 
                         bond_set_slave_inactive_flags(slave);
 
-                        pr_info(DRV_NAME
-                               ": %s: backup interface %s is now down.\n",
-                               bond->dev->name, slave->dev->name);
+                        pr_info("%s: backup interface %s is now down.\n",
+                                bond->dev->name, slave->dev->name);
                 }
         }
 }
@@ -3360,9 +3274,8 @@ static void bond_create_proc_entry(struct bonding *bond)
                                                     S_IRUGO, bn->proc_dir,
                                                     &bond_info_fops, bond);
                 if (bond->proc_entry == NULL)
-                        pr_warning(DRV_NAME
-                               ": Warning: Cannot create /proc/net/%s/%s\n",
-                               DRV_NAME, bond_dev->name);
+                        pr_warning("Warning: Cannot create /proc/net/%s/%s\n",
+                                   DRV_NAME, bond_dev->name);
                 else
                         memcpy(bond->proc_file_name, bond_dev->name, IFNAMSIZ);
         }
@@ -3388,9 +3301,8 @@ static void bond_create_proc_dir(struct bond_net *bn)
         if (!bn->proc_dir) {
                 bn->proc_dir = proc_mkdir(DRV_NAME, bn->net->proc_net);
                 if (!bn->proc_dir)
-                        pr_warning(DRV_NAME
-                                ": Warning: cannot create /proc/net/%s\n",
-                                DRV_NAME);
+                        pr_warning("Warning: cannot create /proc/net/%s\n",
+                                   DRV_NAME);
         }
 }
 
@@ -3539,8 +3451,8 @@ static int bond_netdev_event(struct notifier_block *this,
         struct net_device *event_dev = (struct net_device *)ptr;
 
         pr_debug("event_dev: %s, event: %lx\n",
-                (event_dev ? event_dev->name : "None"),
-                event);
+                 event_dev ? event_dev->name : "None",
+                 event);
 
         if (!(event_dev->priv_flags & IFF_BONDING))
                 return NOTIFY_DONE;
@@ -3875,8 +3787,7 @@ static int bond_do_ioctl(struct net_device *bond_dev, struct ifreq *ifr, int cmd
         struct mii_ioctl_data *mii = NULL;
         int res = 0;
 
-        pr_debug("bond_ioctl: master=%s, cmd=%d\n",
-                bond_dev->name, cmd);
+        pr_debug("bond_ioctl: master=%s, cmd=%d\n", bond_dev->name, cmd);
 
         switch (cmd) {
         case SIOCGMIIPHY:
@@ -3945,12 +3856,12 @@ static int bond_do_ioctl(struct net_device *bond_dev, struct ifreq *ifr, int cmd
 
         slave_dev = dev_get_by_name(dev_net(bond_dev), ifr->ifr_slave);
 
-        pr_debug("slave_dev=%p: \n", slave_dev);
+        pr_debug("slave_dev=%p:\n", slave_dev);
 
         if (!slave_dev)
                 res = -ENODEV;
         else {
-                pr_debug("slave_dev->name=%s: \n", slave_dev->name);
+                pr_debug("slave_dev->name=%s:\n", slave_dev->name);
                 switch (cmd) {
                 case BOND_ENSLAVE_OLD:
                 case SIOCBONDENSLAVE:
@@ -4059,7 +3970,7 @@ static int bond_change_mtu(struct net_device *bond_dev, int new_mtu)
         int i;
 
         pr_debug("bond=%p, name=%s, new_mtu=%d\n", bond,
-                (bond_dev ? bond_dev->name : "None"), new_mtu);
+                 (bond_dev ? bond_dev->name : "None"), new_mtu);
 
         /* Can't hold bond->lock with bh disabled here since
          * some base drivers panic. On the other hand we can't
@@ -4077,8 +3988,10 @@ static int bond_change_mtu(struct net_device *bond_dev, int new_mtu)
          */
 
         bond_for_each_slave(bond, slave, i) {
-                pr_debug("s %p s->p %p c_m %p\n", slave,
-                        slave->prev, slave->dev->netdev_ops->ndo_change_mtu);
+                pr_debug("s %p s->p %p c_m %p\n",
+                         slave,
+                         slave->prev,
+                         slave->dev->netdev_ops->ndo_change_mtu);
 
                 res = dev_set_mtu(slave->dev, new_mtu);
 
@@ -4108,8 +4021,8 @@ unwind:
 
                 tmp_res = dev_set_mtu(slave->dev, bond_dev->mtu);
                 if (tmp_res) {
-                        pr_debug("unwind err %d dev %s\n", tmp_res,
-                                slave->dev->name);
+                        pr_debug("unwind err %d dev %s\n",
+                                 tmp_res, slave->dev->name);
                 }
         }
 
@@ -4135,7 +4048,8 @@ static int bond_set_mac_address(struct net_device *bond_dev, void *addr)
                 return bond_alb_set_mac_address(bond_dev, addr);
 
 
-        pr_debug("bond=%p, name=%s\n", bond, (bond_dev ? bond_dev->name : "None"));
+        pr_debug("bond=%p, name=%s\n",
+                 bond, bond_dev ? bond_dev->name : "None");
 
         /*
          * If fail_over_mac is set to active, do nothing and return
@@ -4200,8 +4114,8 @@ unwind:
 
                 tmp_res = dev_set_mac_address(slave->dev, &tmp_sa);
                 if (tmp_res) {
-                        pr_debug("unwind err %d dev %s\n", tmp_res,
-                                slave->dev->name);
+                        pr_debug("unwind err %d dev %s\n",
+                                 tmp_res, slave->dev->name);
                 }
         }
 
@@ -4357,9 +4271,7 @@ static int bond_xmit_broadcast(struct sk_buff *skb, struct net_device *bond_dev)
                         if (tx_dev) {
                                 struct sk_buff *skb2 = skb_clone(skb, GFP_ATOMIC);
                                 if (!skb2) {
-                                        pr_err(DRV_NAME
-                                               ": %s: Error: bond_xmit_broadcast(): "
-                                               "skb_clone() failed\n",
+                                        pr_err("%s: Error: bond_xmit_broadcast(): skb_clone() failed\n",
                                                bond_dev->name);
                                         continue;
                                 }
@@ -4425,8 +4337,8 @@ static netdev_tx_t bond_start_xmit(struct sk_buff *skb, struct net_device *dev)
                 return bond_alb_xmit(skb, dev);
         default:
                 /* Should never happen, mode already checked */
-                pr_err(DRV_NAME ": %s: Error: Unknown bonding mode %d\n",
-                     dev->name, bond->params.mode);
+                pr_err("%s: Error: Unknown bonding mode %d\n",
+                       dev->name, bond->params.mode);
                 WARN_ON_ONCE(1);
                 dev_kfree_skb(skb);
                 return NETDEV_TX_OK;
@@ -4462,10 +4374,8 @@ void bond_set_mode_ops(struct bonding *bond, int mode)
                 break;
         default:
                 /* Should never happen, mode already checked */
-                pr_err(DRV_NAME
-                       ": %s: Error: Unknown bonding mode %d\n",
-                       bond_dev->name,
-                       mode);
+                pr_err("%s: Error: Unknown bonding mode %d\n",
+                       bond_dev->name, mode);
                 break;
         }
 }
@@ -4650,8 +4560,7 @@ static int bond_check_params(struct bond_params *params)
         if (mode) {
                 bond_mode = bond_parse_parm(mode, bond_mode_tbl);
                 if (bond_mode == -1) {
-                        pr_err(DRV_NAME
-                               ": Error: Invalid bonding mode \"%s\"\n",
+                        pr_err("Error: Invalid bonding mode \"%s\"\n",
                                mode == NULL ? "NULL" : mode);
                         return -EINVAL;
                 }
@@ -4660,16 +4569,13 @@ static int bond_check_params(struct bond_params *params)
         if (xmit_hash_policy) {
                 if ((bond_mode != BOND_MODE_XOR) &&
                     (bond_mode != BOND_MODE_8023AD)) {
-                        pr_info(DRV_NAME
-                                ": xmit_hash_policy param is irrelevant in"
-                                " mode %s\n",
+                        pr_info("xmit_hash_policy param is irrelevant in mode %s\n",
                                bond_mode_name(bond_mode));
                 } else {
                         xmit_hashtype = bond_parse_parm(xmit_hash_policy,
                                                         xmit_hashtype_tbl);
                         if (xmit_hashtype == -1) {
-                                pr_err(DRV_NAME
-                                       ": Error: Invalid xmit_hash_policy \"%s\"\n",
+                                pr_err("Error: Invalid xmit_hash_policy \"%s\"\n",
                                        xmit_hash_policy == NULL ? "NULL" :
                                        xmit_hash_policy);
                                 return -EINVAL;
@@ -4679,14 +4585,12 @@ static int bond_check_params(struct bond_params *params)
 
         if (lacp_rate) {
                 if (bond_mode != BOND_MODE_8023AD) {
-                        pr_info(DRV_NAME
-                               ": lacp_rate param is irrelevant in mode %s\n",
-                               bond_mode_name(bond_mode));
+                        pr_info("lacp_rate param is irrelevant in mode %s\n",
+                                bond_mode_name(bond_mode));
                 } else {
                         lacp_fast = bond_parse_parm(lacp_rate, bond_lacp_tbl);
                         if (lacp_fast == -1) {
-                                pr_err(DRV_NAME
-                                       ": Error: Invalid lacp rate \"%s\"\n",
+                                pr_err("Error: Invalid lacp rate \"%s\"\n",
                                        lacp_rate == NULL ? "NULL" : lacp_rate);
                                 return -EINVAL;
                         }
@@ -4696,82 +4600,64 @@ static int bond_check_params(struct bond_params *params)
         if (ad_select) {
                 params->ad_select = bond_parse_parm(ad_select, ad_select_tbl);
                 if (params->ad_select == -1) {
-                        pr_err(DRV_NAME
-                               ": Error: Invalid ad_select \"%s\"\n",
+                        pr_err("Error: Invalid ad_select \"%s\"\n",
                                ad_select == NULL ? "NULL" : ad_select);
                         return -EINVAL;
                 }
 
                 if (bond_mode != BOND_MODE_8023AD) {
-                        pr_warning(DRV_NAME
-                               ": ad_select param only affects 802.3ad mode\n");
+                        pr_warning("ad_select param only affects 802.3ad mode\n");
                 }
         } else {
                 params->ad_select = BOND_AD_STABLE;
         }
 
         if (max_bonds < 0) {
-                pr_warning(DRV_NAME
-                       ": Warning: max_bonds (%d) not in range %d-%d, so it "
-                       "was reset to BOND_DEFAULT_MAX_BONDS (%d)\n",
-                       max_bonds, 0, INT_MAX, BOND_DEFAULT_MAX_BONDS);
+                pr_warning("Warning: max_bonds (%d) not in range %d-%d, so it was reset to BOND_DEFAULT_MAX_BONDS (%d)\n",
+                           max_bonds, 0, INT_MAX, BOND_DEFAULT_MAX_BONDS);
                 max_bonds = BOND_DEFAULT_MAX_BONDS;
         }
 
         if (miimon < 0) {
-                pr_warning(DRV_NAME
-                       ": Warning: miimon module parameter (%d), "
-                       "not in range 0-%d, so it was reset to %d\n",
-                       miimon, INT_MAX, BOND_LINK_MON_INTERV);
+                pr_warning("Warning: miimon module parameter (%d), not in range 0-%d, so it was reset to %d\n",
+                           miimon, INT_MAX, BOND_LINK_MON_INTERV);
                 miimon = BOND_LINK_MON_INTERV;
         }
 
         if (updelay < 0) {
-                pr_warning(DRV_NAME
-                       ": Warning: updelay module parameter (%d), "
-                       "not in range 0-%d, so it was reset to 0\n",
-                       updelay, INT_MAX);
+                pr_warning("Warning: updelay module parameter (%d), not in range 0-%d, so it was reset to 0\n",
+                           updelay, INT_MAX);
                 updelay = 0;
         }
 
         if (downdelay < 0) {
-                pr_warning(DRV_NAME
-                       ": Warning: downdelay module parameter (%d), "
-                       "not in range 0-%d, so it was reset to 0\n",
-                       downdelay, INT_MAX);
+                pr_warning("Warning: downdelay module parameter (%d), not in range 0-%d, so it was reset to 0\n",
+                           downdelay, INT_MAX);
                 downdelay = 0;
         }
 
         if ((use_carrier != 0) && (use_carrier != 1)) {
-                pr_warning(DRV_NAME
-                       ": Warning: use_carrier module parameter (%d), "
-                       "not of valid value (0/1), so it was set to 1\n",
-                       use_carrier);
+                pr_warning("Warning: use_carrier module parameter (%d), not of valid value (0/1), so it was set to 1\n",
+                           use_carrier);
                 use_carrier = 1;
         }
 
         if (num_grat_arp < 0 || num_grat_arp > 255) {
-                pr_warning(DRV_NAME
-                       ": Warning: num_grat_arp (%d) not in range 0-255 so it "
-                       "was reset to 1 \n", num_grat_arp);
+                pr_warning("Warning: num_grat_arp (%d) not in range 0-255 so it was reset to 1 \n",
+                           num_grat_arp);
                 num_grat_arp = 1;
         }
 
         if (num_unsol_na < 0 || num_unsol_na > 255) {
-                pr_warning(DRV_NAME
-                       ": Warning: num_unsol_na (%d) not in range 0-255 so it "
-                       "was reset to 1 \n", num_unsol_na);
+                pr_warning("Warning: num_unsol_na (%d) not in range 0-255 so it was reset to 1 \n",
+                           num_unsol_na);
                 num_unsol_na = 1;
         }
 
         /* reset values for 802.3ad */
         if (bond_mode == BOND_MODE_8023AD) {
                 if (!miimon) {
-                        pr_warning(DRV_NAME
-                               ": Warning: miimon must be specified, "
-                               "otherwise bonding will not detect link "
-                               "failure, speed and duplex which are "
-                               "essential for 802.3ad operation\n");
+                        pr_warning("Warning: miimon must be specified, otherwise bonding will not detect link failure, speed and duplex which are essential for 802.3ad operation\n");
                         pr_warning("Forcing miimon to 100msec\n");
                         miimon = 100;
                 }
@@ -4781,24 +4667,15 @@ static int bond_check_params(struct bond_params *params)
         if ((bond_mode == BOND_MODE_TLB) ||
             (bond_mode == BOND_MODE_ALB)) {
                 if (!miimon) {
-                        pr_warning(DRV_NAME
-                               ": Warning: miimon must be specified, "
-                               "otherwise bonding will not detect link "
-                               "failure and link speed which are essential "
-                               "for TLB/ALB load balancing\n");
+                        pr_warning("Warning: miimon must be specified, otherwise bonding will not detect link failure and link speed which are essential for TLB/ALB load balancing\n");
                         pr_warning("Forcing miimon to 100msec\n");
                         miimon = 100;
                 }
         }
 
         if (bond_mode == BOND_MODE_ALB) {
-                pr_notice(DRV_NAME
-                       ": In ALB mode you might experience client "
-                       "disconnections upon reconnection of a link if the "
-                       "bonding module updelay parameter (%d msec) is "
-                       "incompatible with the forwarding delay time of the "
-                       "switch\n",
-                       updelay);
+                pr_notice("In ALB mode you might experience client disconnections upon reconnection of a link if the bonding module updelay parameter (%d msec) is incompatible with the forwarding delay time of the switch\n",
+                          updelay);
         }
 
         if (!miimon) {
@@ -4806,49 +4683,37 @@ static int bond_check_params(struct bond_params *params)
                         /* just warn the user the up/down delay will have
                          * no effect since miimon is zero...
                          */
-                        pr_warning(DRV_NAME
-                               ": Warning: miimon module parameter not set "
-                               "and updelay (%d) or downdelay (%d) module "
-                               "parameter is set; updelay and downdelay have "
-                               "no effect unless miimon is set\n",
-                               updelay, downdelay);
+                        pr_warning("Warning: miimon module parameter not set and updelay (%d) or downdelay (%d) module parameter is set; updelay and downdelay have no effect unless miimon is set\n",
+                                   updelay, downdelay);
                 }
         } else {
                 /* don't allow arp monitoring */
                 if (arp_interval) {
-                        pr_warning(DRV_NAME
-                               ": Warning: miimon (%d) and arp_interval (%d) "
-                               "can't be used simultaneously, disabling ARP "
-                               "monitoring\n",
-                               miimon, arp_interval);
+                        pr_warning("Warning: miimon (%d) and arp_interval (%d) can't be used simultaneously, disabling ARP monitoring\n",
+                                   miimon, arp_interval);
                         arp_interval = 0;
                 }
 
                 if ((updelay % miimon) != 0) {
-                        pr_warning(DRV_NAME
-                               ": Warning: updelay (%d) is not a multiple "
-                               "of miimon (%d), updelay rounded to %d ms\n",
-                               updelay, miimon, (updelay / miimon) * miimon);
+                        pr_warning("Warning: updelay (%d) is not a multiple of miimon (%d), updelay rounded to %d ms\n",
+                                   updelay, miimon,
+                                   (updelay / miimon) * miimon);
                 }
 
                 updelay /= miimon;
 
                 if ((downdelay % miimon) != 0) {
-                        pr_warning(DRV_NAME
-                               ": Warning: downdelay (%d) is not a multiple "
-                               "of miimon (%d), downdelay rounded to %d ms\n",
-                               downdelay, miimon,
-                               (downdelay / miimon) * miimon);
+                        pr_warning("Warning: downdelay (%d) is not a multiple of miimon (%d), downdelay rounded to %d ms\n",
+                                   downdelay, miimon,
+                                   (downdelay / miimon) * miimon);
                 }
 
                 downdelay /= miimon;
         }
 
         if (arp_interval < 0) {
-                pr_warning(DRV_NAME
-                       ": Warning: arp_interval module parameter (%d) "
-                       ", not in range 0-%d, so it was reset to %d\n",
-                       arp_interval, INT_MAX, BOND_LINK_ARP_INTERV);
+                pr_warning("Warning: arp_interval module parameter (%d) , not in range 0-%d, so it was reset to %d\n",
+                           arp_interval, INT_MAX, BOND_LINK_ARP_INTERV);
                 arp_interval = BOND_LINK_ARP_INTERV;
         }
 
@@ -4858,10 +4723,8 @@ static int bond_check_params(struct bond_params *params)
                 /* not complete check, but should be good enough to
                    catch mistakes */
                 if (!isdigit(arp_ip_target[arp_ip_count][0])) {
-                        pr_warning(DRV_NAME
-                               ": Warning: bad arp_ip_target module parameter "
-                               "(%s), ARP monitoring will not be performed\n",
-                               arp_ip_target[arp_ip_count]);
+                        pr_warning("Warning: bad arp_ip_target module parameter (%s), ARP monitoring will not be performed\n",
+                                   arp_ip_target[arp_ip_count]);
                         arp_interval = 0;
                 } else {
                         __be32 ip = in_aton(arp_ip_target[arp_ip_count]);
@@ -4871,31 +4734,25 @@ static int bond_check_params(struct bond_params *params)
 
         if (arp_interval && !arp_ip_count) {
                 /* don't allow arping if no arp_ip_target given... */
-                pr_warning(DRV_NAME
-                       ": Warning: arp_interval module parameter (%d) "
-                       "specified without providing an arp_ip_target "
-                       "parameter, arp_interval was reset to 0\n",
-                       arp_interval);
+                pr_warning("Warning: arp_interval module parameter (%d) specified without providing an arp_ip_target parameter, arp_interval was reset to 0\n",
+                           arp_interval);
                 arp_interval = 0;
         }
 
         if (arp_validate) {
                 if (bond_mode != BOND_MODE_ACTIVEBACKUP) {
-                        pr_err(DRV_NAME
-                               ": arp_validate only supported in active-backup mode\n");
+                        pr_err("arp_validate only supported in active-backup mode\n");
                         return -EINVAL;
                 }
                 if (!arp_interval) {
-                        pr_err(DRV_NAME
-                               ": arp_validate requires arp_interval\n");
+                        pr_err("arp_validate requires arp_interval\n");
                         return -EINVAL;
                 }
 
                 arp_validate_value = bond_parse_parm(arp_validate,
                                                      arp_validate_tbl);
                 if (arp_validate_value == -1) {
-                        pr_err(DRV_NAME
-                               ": Error: invalid arp_validate \"%s\"\n",
+                        pr_err("Error: invalid arp_validate \"%s\"\n",
                                arp_validate == NULL ? "NULL" : arp_validate);
                         return -EINVAL;
                 }
@@ -4903,17 +4760,14 @@ static int bond_check_params(struct bond_params *params)
                 arp_validate_value = 0;
 
         if (miimon) {
-                pr_info(DRV_NAME
-                       ": MII link monitoring set to %d ms\n",
-                       miimon);
+                pr_info("MII link monitoring set to %d ms\n", miimon);
         } else if (arp_interval) {
                 int i;
 
-                pr_info(DRV_NAME ": ARP monitoring set to %d ms,"
-                       " validate %s, with %d target(s):",
-                       arp_interval,
-                       arp_validate_tbl[arp_validate_value].modename,
-                       arp_ip_count);
+                pr_info("ARP monitoring set to %d ms, validate %s, with %d target(s):",
+                        arp_interval,
+                        arp_validate_tbl[arp_validate_value].modename,
+                        arp_ip_count);
 
                 for (i = 0; i < arp_ip_count; i++)
                         pr_info(" %s", arp_ip_target[i]);
@@ -4924,21 +4778,15 @@ static int bond_check_params(struct bond_params *params)
                 /* miimon and arp_interval not set, we need one so things
                  * work as expected, see bonding.txt for details
                  */
-                pr_warning(DRV_NAME
-                       ": Warning: either miimon or arp_interval and "
-                       "arp_ip_target module parameters must be specified, "
-                       "otherwise bonding will not detect link failures! see "
-                       "bonding.txt for details.\n");
+                pr_warning("Warning: either miimon or arp_interval and arp_ip_target module parameters must be specified, otherwise bonding will not detect link failures! see bonding.txt for details.\n");
         }
 
         if (primary && !USES_PRIMARY(bond_mode)) {
                 /* currently, using a primary only makes sense
                  * in active backup, TLB or ALB modes
                  */
-                pr_warning(DRV_NAME
-                       ": Warning: %s primary device specified but has no "
-                       "effect in %s mode\n",
-                       primary, bond_mode_name(bond_mode));
+                pr_warning("Warning: %s primary device specified but has no effect in %s mode\n",
+                           primary, bond_mode_name(bond_mode));
                 primary = NULL;
         }
 
@@ -4946,8 +4794,7 @@ static int bond_check_params(struct bond_params *params)
                 primary_reselect_value = bond_parse_parm(primary_reselect,
                                                          pri_reselect_tbl);
                 if (primary_reselect_value == -1) {
-                        pr_err(DRV_NAME
-                               ": Error: Invalid primary_reselect \"%s\"\n",
+                        pr_err("Error: Invalid primary_reselect \"%s\"\n",
                                primary_reselect ==
                                         NULL ? "NULL" : primary_reselect);
                         return -EINVAL;
@@ -4960,16 +4807,13 @@ static int bond_check_params(struct bond_params *params)
                 fail_over_mac_value = bond_parse_parm(fail_over_mac,
                                                       fail_over_mac_tbl);
                 if (fail_over_mac_value == -1) {
-                        pr_err(DRV_NAME
-                               ": Error: invalid fail_over_mac \"%s\"\n",
+                        pr_err("Error: invalid fail_over_mac \"%s\"\n",
                                arp_validate == NULL ? "NULL" : arp_validate);
                         return -EINVAL;
                 }
 
                 if (bond_mode != BOND_MODE_ACTIVEBACKUP)
-                        pr_warning(DRV_NAME
-                               ": Warning: fail_over_mac only affects "
-                               "active-backup mode.\n");
+                        pr_warning("Warning: fail_over_mac only affects active-backup mode.\n");
         } else {
                 fail_over_mac_value = BOND_FOM_NONE;
         }
@@ -5076,8 +4920,7 @@ int bond_create(struct net *net, const char *name)
         bond_dev = alloc_netdev(sizeof(struct bonding), name ? name : "",
                                 bond_setup);
         if (!bond_dev) {
-                pr_err(DRV_NAME ": %s: eek! can't alloc netdev!\n",
-                       name);
+                pr_err("%s: eek! can't alloc netdev!\n", name);
                 res = -ENOMEM;
                 goto out;
         }
diff --git a/drivers/net/bonding/bond_sysfs.c b/drivers/net/bonding/bond_sysfs.c
index 4e00b4f83641..5acd557cea9b 100644
--- a/drivers/net/bonding/bond_sysfs.c
+++ b/drivers/net/bonding/bond_sysfs.c
@@ -19,6 +19,9 @@
  * file called LICENSE.
  *
  */
+
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/device.h>
@@ -109,11 +112,10 @@ static ssize_t bonding_store_bonds(struct class *cls,
                 goto err_no_cmd;
 
         if (command[0] == '+') {
-                pr_info(DRV_NAME
-                        ": %s is being created...\n", ifname);
+                pr_info("%s is being created...\n", ifname);
                 rv = bond_create(net, ifname);
                 if (rv) {
-                        pr_info(DRV_NAME ": Bond creation failed.\n");
+                        pr_info("Bond creation failed.\n");
                         res = rv;
                 }
         } else if (command[0] == '-') {
@@ -122,12 +124,10 @@ static ssize_t bonding_store_bonds(struct class *cls,
                 rtnl_lock();
                 bond_dev = bond_get_by_name(net, ifname);
                 if (bond_dev) {
-                        pr_info(DRV_NAME ": %s is being deleted...\n",
-                                ifname);
+                        pr_info("%s is being deleted...\n", ifname);
                         unregister_netdevice(bond_dev);
                 } else {
-                        pr_err(DRV_NAME ": unable to delete non-existent %s\n",
-                               ifname);
+                        pr_err("unable to delete non-existent %s\n", ifname);
                         res = -ENODEV;
                 }
                 rtnl_unlock();
@@ -140,8 +140,7 @@ static ssize_t bonding_store_bonds(struct class *cls,
         return res;
 
 err_no_cmd:
-        pr_err(DRV_NAME ": no command found in bonding_masters."
-               " Use +ifname or -ifname.\n");
+        pr_err("no command found in bonding_masters. Use +ifname or -ifname.\n");
         return -EPERM;
 }
 
@@ -225,8 +224,8 @@ static ssize_t bonding_store_slaves(struct device *d,
 
         /* Quick sanity check -- is the bond interface up? */
         if (!(bond->dev->flags & IFF_UP)) {
-                pr_warning(DRV_NAME ": %s: doing slave updates when "
-                           "interface is down.\n", bond->dev->name);
+                pr_warning("%s: doing slave updates when interface is down.\n",
+                           bond->dev->name);
         }
 
         /* Note:  We can't hold bond->lock here, as bond_create grabs it. */
@@ -247,17 +246,14 @@ static ssize_t bonding_store_slaves(struct device *d,
 
                 dev = __dev_get_by_name(dev_net(bond->dev), ifname);
                 if (!dev) {
-                        pr_info(DRV_NAME
-                               ": %s: Interface %s does not exist!\n",
-                               bond->dev->name, ifname);
+                        pr_info("%s: Interface %s does not exist!\n",
+                                bond->dev->name, ifname);
                         ret = -ENODEV;
                         goto out;
                 }
 
                 if (dev->flags & IFF_UP) {
-                        pr_err(DRV_NAME
-                               ": %s: Error: Unable to enslave %s "
-                               "because it is already up.\n",
+                        pr_err("%s: Error: Unable to enslave %s because it is already up.\n",
                                bond->dev->name, dev->name);
                         ret = -EPERM;
                         goto out;
@@ -266,8 +262,7 @@ static ssize_t bonding_store_slaves(struct device *d,
                 read_lock(&bond->lock);
                 bond_for_each_slave(bond, slave, i)
                         if (slave->dev == dev) {
-                                pr_err(DRV_NAME
-                                       ": %s: Interface %s is already enslaved!\n",
+                                pr_err("%s: Interface %s is already enslaved!\n",
                                        bond->dev->name, ifname);
                                 ret = -EPERM;
                                 read_unlock(&bond->lock);
@@ -275,8 +270,7 @@ static ssize_t bonding_store_slaves(struct device *d,
                         }
                 read_unlock(&bond->lock);
 
-                pr_info(DRV_NAME ": %s: Adding slave %s.\n",
-                        bond->dev->name, ifname);
+                pr_info("%s: Adding slave %s.\n", bond->dev->name, ifname);
 
                 /* If this is the first slave, then we need to set
                    the master's hardware address to be the same as the
@@ -313,7 +307,7 @@ static ssize_t bonding_store_slaves(struct device *d,
                                 break;
                         }
                 if (dev) {
-                        pr_info(DRV_NAME ": %s: Removing slave %s\n",
+                        pr_info("%s: Removing slave %s\n",
                                 bond->dev->name, dev->name);
                                 res = bond_release(bond->dev, dev);
                         if (res) {
@@ -323,16 +317,16 @@ static ssize_t bonding_store_slaves(struct device *d,
                         /* set the slave MTU to the default */
                         dev_set_mtu(dev, original_mtu);
                 } else {
-                        pr_err(DRV_NAME ": unable to remove non-existent"
-                               " slave %s for bond %s.\n",
-                                ifname, bond->dev->name);
+                        pr_err("unable to remove non-existent slave %s for bond %s.\n",
+                               ifname, bond->dev->name);
                         ret = -ENODEV;
                 }
                 goto out;
         }
 
 err_no_cmd:
-        pr_err(DRV_NAME ": no command found in slaves file for bond %s. Use +ifname or -ifname.\n", bond->dev->name);
+        pr_err("no command found in slaves file for bond %s. Use +ifname or -ifname.\n",
+               bond->dev->name);
         ret = -EPERM;
 
 out:
@@ -365,18 +359,16 @@ static ssize_t bonding_store_mode(struct device *d,
         struct bonding *bond = to_bond(d);
 
         if (bond->dev->flags & IFF_UP) {
-                pr_err(DRV_NAME ": unable to update mode of %s"
-                       " because interface is up.\n", bond->dev->name);
+                pr_err("unable to update mode of %s because interface is up.\n",
+                       bond->dev->name);
                 ret = -EPERM;
                 goto out;
         }
 
         new_value = bond_parse_parm(buf, bond_mode_tbl);
         if (new_value < 0)  {
-                pr_err(DRV_NAME
-                       ": %s: Ignoring invalid mode value %.*s.\n",
-                       bond->dev->name,
-                       (int)strlen(buf) - 1, buf);
+                pr_err("%s: Ignoring invalid mode value %.*s.\n",
+                       bond->dev->name, (int)strlen(buf) - 1, buf);
                 ret = -EINVAL;
                 goto out;
         } else {
@@ -388,8 +380,8 @@ static ssize_t bonding_store_mode(struct device *d,
 
                 bond->params.mode = new_value;
                 bond_set_mode_ops(bond, bond->params.mode);
-                pr_info(DRV_NAME ": %s: setting mode to %s (%d).\n",
-                       bond->dev->name, bond_mode_tbl[new_value].modename,
+                pr_info("%s: setting mode to %s (%d).\n",
+                        bond->dev->name, bond_mode_tbl[new_value].modename,
                        new_value);
         }
 out:
@@ -421,8 +413,7 @@ static ssize_t bonding_store_xmit_hash(struct device *d,
         struct bonding *bond = to_bond(d);
 
         if (bond->dev->flags & IFF_UP) {
-                pr_err(DRV_NAME
-                       "%s: Interface is up. Unable to update xmit policy.\n",
+                pr_err("%s: Interface is up. Unable to update xmit policy.\n",
                        bond->dev->name);
                 ret = -EPERM;
                 goto out;
@@ -430,8 +421,7 @@ static ssize_t bonding_store_xmit_hash(struct device *d,
 
         new_value = bond_parse_parm(buf, xmit_hashtype_tbl);
         if (new_value < 0)  {
-                pr_err(DRV_NAME
-                       ": %s: Ignoring invalid xmit hash policy value %.*s.\n",
+                pr_err("%s: Ignoring invalid xmit hash policy value %.*s.\n",
                        bond->dev->name,
                        (int)strlen(buf) - 1, buf);
                 ret = -EINVAL;
@@ -439,7 +429,7 @@ static ssize_t bonding_store_xmit_hash(struct device *d,
         } else {
                 bond->params.xmit_policy = new_value;
                 bond_set_mode_ops(bond, bond->params.mode);
-                pr_info(DRV_NAME ": %s: setting xmit hash policy to %s (%d).\n",
+                pr_info("%s: setting xmit hash policy to %s (%d).\n",
                         bond->dev->name,
                         xmit_hashtype_tbl[new_value].modename, new_value);
         }
@@ -472,20 +462,18 @@ static ssize_t bonding_store_arp_validate(struct device *d,
 
         new_value = bond_parse_parm(buf, arp_validate_tbl);
         if (new_value < 0) {
-                pr_err(DRV_NAME
-                       ": %s: Ignoring invalid arp_validate value %s\n",
+                pr_err("%s: Ignoring invalid arp_validate value %s\n",
                        bond->dev->name, buf);
                 return -EINVAL;
         }
         if (new_value && (bond->params.mode != BOND_MODE_ACTIVEBACKUP)) {
-                pr_err(DRV_NAME
-                       ": %s: arp_validate only supported in active-backup mode.\n",
+                pr_err("%s: arp_validate only supported in active-backup mode.\n",
                        bond->dev->name);
                 return -EINVAL;
         }
-        pr_info(DRV_NAME ": %s: setting arp_validate to %s (%d).\n",
-               bond->dev->name, arp_validate_tbl[new_value].modename,
-               new_value);
+        pr_info("%s: setting arp_validate to %s (%d).\n",
+                bond->dev->name, arp_validate_tbl[new_value].modename,
+                new_value);
 
         if (!bond->params.arp_validate && new_value)
                 bond_register_arp(bond);
@@ -523,24 +511,22 @@ static ssize_t bonding_store_fail_over_mac(struct device *d,
         struct bonding *bond = to_bond(d);
 
         if (bond->slave_cnt != 0) {
-                pr_err(DRV_NAME
-                       ": %s: Can't alter fail_over_mac with slaves in bond.\n",
+                pr_err("%s: Can't alter fail_over_mac with slaves in bond.\n",
                        bond->dev->name);
                 return -EPERM;
         }
 
         new_value = bond_parse_parm(buf, fail_over_mac_tbl);
         if (new_value < 0) {
-                pr_err(DRV_NAME
-                       ": %s: Ignoring invalid fail_over_mac value %s.\n",
+                pr_err("%s: Ignoring invalid fail_over_mac value %s.\n",
                        bond->dev->name, buf);
                 return -EINVAL;
         }
 
         bond->params.fail_over_mac = new_value;
-        pr_info(DRV_NAME ": %s: Setting fail_over_mac to %s (%d).\n",
-               bond->dev->name, fail_over_mac_tbl[new_value].modename,
-               new_value);
+        pr_info("%s: Setting fail_over_mac to %s (%d).\n",
+                bond->dev->name, fail_over_mac_tbl[new_value].modename,
+                new_value);
 
         return count;
 }
@@ -571,31 +557,26 @@ static ssize_t bonding_store_arp_interval(struct device *d,
         struct bonding *bond = to_bond(d);
 
         if (sscanf(buf, "%d", &new_value) != 1) {
-                pr_err(DRV_NAME
-                       ": %s: no arp_interval value specified.\n",
+                pr_err("%s: no arp_interval value specified.\n",
                        bond->dev->name);
                 ret = -EINVAL;
                 goto out;
         }
         if (new_value < 0) {
-                pr_err(DRV_NAME
-                       ": %s: Invalid arp_interval value %d not in range 1-%d; rejected.\n",
+                pr_err("%s: Invalid arp_interval value %d not in range 1-%d; rejected.\n",
                        bond->dev->name, new_value, INT_MAX);
                 ret = -EINVAL;
                 goto out;
         }
 
-        pr_info(DRV_NAME
-               ": %s: Setting ARP monitoring interval to %d.\n",
-               bond->dev->name, new_value);
+        pr_info("%s: Setting ARP monitoring interval to %d.\n",
+                bond->dev->name, new_value);
         bond->params.arp_interval = new_value;
         if (bond->params.arp_interval)
                 bond->dev->priv_flags |= IFF_MASTER_ARPMON;
         if (bond->params.miimon) {
-                pr_info(DRV_NAME
-                       ": %s: ARP monitoring cannot be used with MII monitoring. "
-                       "%s Disabling MII monitoring.\n",
-                       bond->dev->name, bond->dev->name);
+                pr_info("%s: ARP monitoring cannot be used with MII monitoring. %s Disabling MII monitoring.\n",
+                        bond->dev->name, bond->dev->name);
                 bond->params.miimon = 0;
                 if (delayed_work_pending(&bond->mii_work)) {
                         cancel_delayed_work(&bond->mii_work);
@@ -603,10 +584,8 @@ static ssize_t bonding_store_arp_interval(struct device *d,
                 }
         }
         if (!bond->params.arp_targets[0]) {
-                pr_info(DRV_NAME
-                       ": %s: ARP monitoring has been set up, "
-                       "but no ARP targets have been specified.\n",
-                       bond->dev->name);
+                pr_info("%s: ARP monitoring has been set up, but no ARP targets have been specified.\n",
+                        bond->dev->name);
         }
         if (bond->dev->flags & IFF_UP) {
                 /* If the interface is up, we may need to fire off
@@ -666,8 +645,7 @@ static ssize_t bonding_store_arp_targets(struct device *d,
         /* look for adds */
         if (buf[0] == '+') {
                 if ((newtarget == 0) || (newtarget == htonl(INADDR_BROADCAST))) {
-                        pr_err(DRV_NAME
-                               ": %s: invalid ARP target %pI4 specified for addition\n",
+                        pr_err("%s: invalid ARP target %pI4 specified for addition\n",
                                bond->dev->name, &newtarget);
                         ret = -EINVAL;
                         goto out;
@@ -675,23 +653,20 @@ static ssize_t bonding_store_arp_targets(struct device *d,
                 /* look for an empty slot to put the target in, and check for dupes */
                 for (i = 0; (i < BOND_MAX_ARP_TARGETS) && !done; i++) {
                         if (targets[i] == newtarget) { /* duplicate */
-                                pr_err(DRV_NAME
-                                       ": %s: ARP target %pI4 is already present\n",
+                                pr_err("%s: ARP target %pI4 is already present\n",
                                        bond->dev->name, &newtarget);
                                 ret = -EINVAL;
                                 goto out;
                         }
                         if (targets[i] == 0) {
-                                pr_info(DRV_NAME
-                                       ": %s: adding ARP target %pI4.\n",
-                                       bond->dev->name, &newtarget);
+                                pr_info("%s: adding ARP target %pI4.\n",
+                                        bond->dev->name, &newtarget);
                                 done = 1;
                                 targets[i] = newtarget;
                         }
                 }
                 if (!done) {
-                        pr_err(DRV_NAME
-                               ": %s: ARP target table is full!\n",
+                        pr_err("%s: ARP target table is full!\n",
                                bond->dev->name);
                         ret = -EINVAL;
                         goto out;
@@ -699,8 +674,7 @@ static ssize_t bonding_store_arp_targets(struct device *d,
 
         } else if (buf[0] == '-')       {
                 if ((newtarget == 0) || (newtarget == htonl(INADDR_BROADCAST))) {
-                        pr_err(DRV_NAME
-                               ": %s: invalid ARP target %pI4 specified for removal\n",
+                        pr_err("%s: invalid ARP target %pI4 specified for removal\n",
                                bond->dev->name, &newtarget);
                         ret = -EINVAL;
                         goto out;
@@ -709,9 +683,8 @@ static ssize_t bonding_store_arp_targets(struct device *d,
                 for (i = 0; (i < BOND_MAX_ARP_TARGETS) && !done; i++) {
                         if (targets[i] == newtarget) {
                                 int j;
-                                pr_info(DRV_NAME
-                                       ": %s: removing ARP target %pI4.\n",
-                                       bond->dev->name, &newtarget);
+                                pr_info("%s: removing ARP target %pI4.\n",
+                                        bond->dev->name, &newtarget);
                                 for (j = i; (j < (BOND_MAX_ARP_TARGETS-1)) && targets[j+1]; j++)
                                         targets[j] = targets[j+1];
 
@@ -720,16 +693,14 @@ static ssize_t bonding_store_arp_targets(struct device *d,
                         }
                 }
                 if (!done) {
-                        pr_info(DRV_NAME
-                               ": %s: unable to remove nonexistent ARP target %pI4.\n",
-                               bond->dev->name, &newtarget);
+                        pr_info("%s: unable to remove nonexistent ARP target %pI4.\n",
+                                bond->dev->name, &newtarget);
                         ret = -EINVAL;
                         goto out;
                 }
         } else {
-                pr_err(DRV_NAME ": no command found in arp_ip_targets file"
-                       " for bond %s. Use +<addr> or -<addr>.\n",
-                        bond->dev->name);
+                pr_err("no command found in arp_ip_targets file for bond %s. Use +<addr> or -<addr>.\n",
+                       bond->dev->name);
                 ret = -EPERM;
                 goto out;
         }
@@ -761,41 +732,34 @@ static ssize_t bonding_store_downdelay(struct device *d,
         struct bonding *bond = to_bond(d);
 
         if (!(bond->params.miimon)) {
-                pr_err(DRV_NAME
-                       ": %s: Unable to set down delay as MII monitoring is disabled\n",
+                pr_err("%s: Unable to set down delay as MII monitoring is disabled\n",
                        bond->dev->name);
                 ret = -EPERM;
                 goto out;
         }
 
         if (sscanf(buf, "%d", &new_value) != 1) {
-                pr_err(DRV_NAME
-                       ": %s: no down delay value specified.\n",
-                       bond->dev->name);
+                pr_err("%s: no down delay value specified.\n", bond->dev->name);
                 ret = -EINVAL;
                 goto out;
         }
         if (new_value < 0) {
-                pr_err(DRV_NAME
-                       ": %s: Invalid down delay value %d not in range %d-%d; rejected.\n",
+                pr_err("%s: Invalid down delay value %d not in range %d-%d; rejected.\n",
                        bond->dev->name, new_value, 1, INT_MAX);
                 ret = -EINVAL;
                 goto out;
         } else {
                 if ((new_value % bond->params.miimon) != 0) {
-                        pr_warning(DRV_NAME
-                                   ": %s: Warning: down delay (%d) is not a "
-                                   "multiple of miimon (%d), delay rounded "
-                                   "to %d ms\n",
+                        pr_warning("%s: Warning: down delay (%d) is not a multiple of miimon (%d), delay rounded to %d ms\n",
                                    bond->dev->name, new_value,
                                    bond->params.miimon,
                                    (new_value / bond->params.miimon) *
                                    bond->params.miimon);
                 }
                 bond->params.downdelay = new_value / bond->params.miimon;
-                pr_info(DRV_NAME ": %s: Setting down delay to %d.\n",
-                       bond->dev->name,
-                       bond->params.downdelay * bond->params.miimon);
+                pr_info("%s: Setting down delay to %d.\n",
+                        bond->dev->name,
+                        bond->params.downdelay * bond->params.miimon);
 
         }
 
@@ -823,41 +787,35 @@ static ssize_t bonding_store_updelay(struct device *d,
         struct bonding *bond = to_bond(d);
 
         if (!(bond->params.miimon)) {
-                pr_err(DRV_NAME
-                       ": %s: Unable to set up delay as MII monitoring is disabled\n",
+                pr_err("%s: Unable to set up delay as MII monitoring is disabled\n",
                        bond->dev->name);
                 ret = -EPERM;
                 goto out;
         }
 
         if (sscanf(buf, "%d", &new_value) != 1) {
-                pr_err(DRV_NAME
-                       ": %s: no up delay value specified.\n",
+                pr_err("%s: no up delay value specified.\n",
                        bond->dev->name);
                 ret = -EINVAL;
                 goto out;
         }
         if (new_value < 0) {
-                pr_err(DRV_NAME
-                       ": %s: Invalid down delay value %d not in range %d-%d; rejected.\n",
+                pr_err("%s: Invalid down delay value %d not in range %d-%d; rejected.\n",
                        bond->dev->name, new_value, 1, INT_MAX);
                 ret = -EINVAL;
                 goto out;
         } else {
                 if ((new_value % bond->params.miimon) != 0) {
-                        pr_warning(DRV_NAME
-                                   ": %s: Warning: up delay (%d) is not a "
-                                   "multiple of miimon (%d), updelay rounded "
-                                   "to %d ms\n",
+                        pr_warning("%s: Warning: up delay (%d) is not a multiple of miimon (%d), updelay rounded to %d ms\n",
                                    bond->dev->name, new_value,
                                    bond->params.miimon,
                                    (new_value / bond->params.miimon) *
                                    bond->params.miimon);
                 }
                 bond->params.updelay = new_value / bond->params.miimon;
-                pr_info(DRV_NAME ": %s: Setting up delay to %d.\n",
-                       bond->dev->name, bond->params.updelay * bond->params.miimon);
-
+                pr_info("%s: Setting up delay to %d.\n",
+                        bond->dev->name,
+                        bond->params.updelay * bond->params.miimon);
         }
 
 out:
@@ -889,16 +847,14 @@ static ssize_t bonding_store_lacp(struct device *d,
         struct bonding *bond = to_bond(d);
 
         if (bond->dev->flags & IFF_UP) {
-                pr_err(DRV_NAME
-                       ": %s: Unable to update LACP rate because interface is up.\n",
+                pr_err("%s: Unable to update LACP rate because interface is up.\n",
                        bond->dev->name);
                 ret = -EPERM;
                 goto out;
         }
 
         if (bond->params.mode != BOND_MODE_8023AD) {
-                pr_err(DRV_NAME
-                       ": %s: Unable to update LACP rate because bond is not in 802.3ad mode.\n",
+                pr_err("%s: Unable to update LACP rate because bond is not in 802.3ad mode.\n",
                        bond->dev->name);
                 ret = -EPERM;
                 goto out;
@@ -908,12 +864,11 @@ static ssize_t bonding_store_lacp(struct device *d,
 
         if ((new_value == 1) || (new_value == 0)) {
                 bond->params.lacp_fast = new_value;
-                pr_info(DRV_NAME ": %s: Setting LACP rate to %s (%d).\n",
+                pr_info("%s: Setting LACP rate to %s (%d).\n",
                         bond->dev->name, bond_lacp_tbl[new_value].modename,
                         new_value);
         } else {
-                pr_err(DRV_NAME
-                       ": %s: Ignoring invalid LACP rate value %.*s.\n",
+                pr_err("%s: Ignoring invalid LACP rate value %.*s.\n",
                        bond->dev->name, (int)strlen(buf) - 1, buf);
                 ret = -EINVAL;
         }
@@ -943,9 +898,8 @@ static ssize_t bonding_store_ad_select(struct device *d,
         struct bonding *bond = to_bond(d);
 
         if (bond->dev->flags & IFF_UP) {
-                pr_err(DRV_NAME
-                       ": %s: Unable to update ad_select because interface "
-                       "is up.\n", bond->dev->name);
+                pr_err("%s: Unable to update ad_select because interface is up.\n",
+                       bond->dev->name);
                 ret = -EPERM;
                 goto out;
         }
@@ -954,13 +908,11 @@ static ssize_t bonding_store_ad_select(struct device *d,
 
         if (new_value != -1) {
                 bond->params.ad_select = new_value;
-                pr_info(DRV_NAME
-                       ": %s: Setting ad_select to %s (%d).\n",
-                       bond->dev->name, ad_select_tbl[new_value].modename,
-                       new_value);
+                pr_info("%s: Setting ad_select to %s (%d).\n",
+                        bond->dev->name, ad_select_tbl[new_value].modename,
+                        new_value);
         } else {
-                pr_err(DRV_NAME
-                       ": %s: Ignoring invalid ad_select value %.*s.\n",
+                pr_err("%s: Ignoring invalid ad_select value %.*s.\n",
                        bond->dev->name, (int)strlen(buf) - 1, buf);
                 ret = -EINVAL;
         }
@@ -990,15 +942,13 @@ static ssize_t bonding_store_n_grat_arp(struct device *d,
         struct bonding *bond = to_bond(d);
 
         if (sscanf(buf, "%d", &new_value) != 1) {
-                pr_err(DRV_NAME
-                       ": %s: no num_grat_arp value specified.\n",
+                pr_err("%s: no num_grat_arp value specified.\n",
                        bond->dev->name);
                 ret = -EINVAL;
                 goto out;
         }
         if (new_value < 0 || new_value > 255) {
-                pr_err(DRV_NAME
-                       ": %s: Invalid num_grat_arp value %d not in range 0-255; rejected.\n",
+                pr_err("%s: Invalid num_grat_arp value %d not in range 0-255; rejected.\n",
                        bond->dev->name, new_value);
                 ret = -EINVAL;
                 goto out;
@@ -1031,16 +981,14 @@ static ssize_t bonding_store_n_unsol_na(struct device *d,
         struct bonding *bond = to_bond(d);
 
         if (sscanf(buf, "%d", &new_value) != 1) {
-                pr_err(DRV_NAME
-                       ": %s: no num_unsol_na value specified.\n",
+                pr_err("%s: no num_unsol_na value specified.\n",
                        bond->dev->name);
                 ret = -EINVAL;
                 goto out;
         }
 
         if (new_value < 0 || new_value > 255) {
-                pr_err(DRV_NAME
-                       ": %s: Invalid num_unsol_na value %d not in range 0-255; rejected.\n",
+                pr_err("%s: Invalid num_unsol_na value %d not in range 0-255; rejected.\n",
                        bond->dev->name, new_value);
                 ret = -EINVAL;
                 goto out;
@@ -1075,40 +1023,31 @@ static ssize_t bonding_store_miimon(struct device *d,
         struct bonding *bond = to_bond(d);
 
         if (sscanf(buf, "%d", &new_value) != 1) {
-                pr_err(DRV_NAME
-                       ": %s: no miimon value specified.\n",
+                pr_err("%s: no miimon value specified.\n",
                        bond->dev->name);
                 ret = -EINVAL;
                 goto out;
         }
         if (new_value < 0) {
-                pr_err(DRV_NAME
-                       ": %s: Invalid miimon value %d not in range %d-%d; rejected.\n",
+                pr_err("%s: Invalid miimon value %d not in range %d-%d; rejected.\n",
                        bond->dev->name, new_value, 1, INT_MAX);
                 ret = -EINVAL;
                 goto out;
         } else {
-                pr_info(DRV_NAME
-                       ": %s: Setting MII monitoring interval to %d.\n",
-                       bond->dev->name, new_value);
+                pr_info("%s: Setting MII monitoring interval to %d.\n",
+                        bond->dev->name, new_value);
                 bond->params.miimon = new_value;
                 if (bond->params.updelay)
-                        pr_info(DRV_NAME
-                              ": %s: Note: Updating updelay (to %d) "
-                              "since it is a multiple of the miimon value.\n",
-                              bond->dev->name,
-                              bond->params.updelay * bond->params.miimon);
+                        pr_info("%s: Note: Updating updelay (to %d) since it is a multiple of the miimon value.\n",
+                                bond->dev->name,
+                                bond->params.updelay * bond->params.miimon);
                 if (bond->params.downdelay)
-                        pr_info(DRV_NAME
-                              ": %s: Note: Updating downdelay (to %d) "
-                              "since it is a multiple of the miimon value.\n",
-                              bond->dev->name,
-                              bond->params.downdelay * bond->params.miimon);
+                        pr_info("%s: Note: Updating downdelay (to %d) since it is a multiple of the miimon value.\n",
+                                bond->dev->name,
+                                bond->params.downdelay * bond->params.miimon);
                 if (bond->params.arp_interval) {
-                        pr_info(DRV_NAME
-                               ": %s: MII monitoring cannot be used with "
-                               "ARP monitoring. Disabling ARP monitoring...\n",
-                               bond->dev->name);
+                        pr_info("%s: MII monitoring cannot be used with ARP monitoring. Disabling ARP monitoring...\n",
+                                bond->dev->name);
                         bond->params.arp_interval = 0;
                         bond->dev->priv_flags &= ~IFF_MASTER_ARPMON;
                         if (bond->params.arp_validate) {
@@ -1176,17 +1115,15 @@ static ssize_t bonding_store_primary(struct device *d,
         write_lock_bh(&bond->curr_slave_lock);
 
         if (!USES_PRIMARY(bond->params.mode)) {
-                pr_info(DRV_NAME
-                       ": %s: Unable to set primary slave; %s is in mode %d\n",
-                       bond->dev->name, bond->dev->name, bond->params.mode);
+                pr_info("%s: Unable to set primary slave; %s is in mode %d\n",
+                        bond->dev->name, bond->dev->name, bond->params.mode);
         } else {
                 bond_for_each_slave(bond, slave, i) {
                         if (strnicmp
                             (slave->dev->name, buf,
                              strlen(slave->dev->name)) == 0) {
-                                pr_info(DRV_NAME
-                                       ": %s: Setting %s as primary slave.\n",
-                                       bond->dev->name, slave->dev->name);
+                                pr_info("%s: Setting %s as primary slave.\n",
+                                        bond->dev->name, slave->dev->name);
                                 bond->primary_slave = slave;
                                 strcpy(bond->params.primary, slave->dev->name);
                                 bond_select_active_slave(bond);
@@ -1197,15 +1134,13 @@ static ssize_t bonding_store_primary(struct device *d,
                 /* if we got here, then we didn't match the name of any slave */
 
                 if (strlen(buf) == 0 || buf[0] == '\n') {
-                        pr_info(DRV_NAME
-                               ": %s: Setting primary slave to None.\n",
-                               bond->dev->name);
+                        pr_info("%s: Setting primary slave to None.\n",
+                                bond->dev->name);
                         bond->primary_slave = NULL;
                                 bond_select_active_slave(bond);
                 } else {
-                        pr_info(DRV_NAME
-                               ": %s: Unable to set %.*s as primary slave as it is not a slave.\n",
-                               bond->dev->name, (int)strlen(buf) - 1, buf);
+                        pr_info("%s: Unable to set %.*s as primary slave as it is not a slave.\n",
+                                bond->dev->name, (int)strlen(buf) - 1, buf);
                 }
         }
 out:
@@ -1244,8 +1179,7 @@ static ssize_t bonding_store_primary_reselect(struct device *d,
 
         new_value = bond_parse_parm(buf, pri_reselect_tbl);
         if (new_value < 0)  {
-                pr_err(DRV_NAME
-                       ": %s: Ignoring invalid primary_reselect value %.*s.\n",
+                pr_err("%s: Ignoring invalid primary_reselect value %.*s.\n",
                        bond->dev->name,
                        (int) strlen(buf) - 1, buf);
                 ret = -EINVAL;
@@ -1253,7 +1187,7 @@ static ssize_t bonding_store_primary_reselect(struct device *d,
         }
 
         bond->params.primary_reselect = new_value;
-        pr_info(DRV_NAME ": %s: setting primary_reselect to %s (%d).\n",
+        pr_info("%s: setting primary_reselect to %s (%d).\n",
                 bond->dev->name, pri_reselect_tbl[new_value].modename,
                 new_value);
 
@@ -1291,20 +1225,18 @@ static ssize_t bonding_store_carrier(struct device *d,
 
 
         if (sscanf(buf, "%d", &new_value) != 1) {
-                pr_err(DRV_NAME
-                       ": %s: no use_carrier value specified.\n",
+                pr_err("%s: no use_carrier value specified.\n",
                        bond->dev->name);
                 ret = -EINVAL;
                 goto out;
         }
         if ((new_value == 0) || (new_value == 1)) {
                 bond->params.use_carrier = new_value;
-                pr_info(DRV_NAME ": %s: Setting use_carrier to %d.\n",
-                       bond->dev->name, new_value);
+                pr_info("%s: Setting use_carrier to %d.\n",
+                        bond->dev->name, new_value);
         } else {
-                pr_info(DRV_NAME
-                       ": %s: Ignoring invalid use_carrier value %d.\n",
-                       bond->dev->name, new_value);
+                pr_info("%s: Ignoring invalid use_carrier value %d.\n",
+                        bond->dev->name, new_value);
         }
 out:
         return count;
@@ -1349,8 +1281,7 @@ static ssize_t bonding_store_active_slave(struct device *d,
         write_lock_bh(&bond->curr_slave_lock);
 
         if (!USES_PRIMARY(bond->params.mode))
-                pr_info(DRV_NAME ": %s: Unable to change active slave;"
-                        " %s is in mode %d\n",
+                pr_info("%s: Unable to change active slave; %s is in mode %d\n",
                         bond->dev->name, bond->dev->name, bond->params.mode);
         else {
                 bond_for_each_slave(bond, slave, i) {
@@ -1361,9 +1292,9 @@ static ssize_t bonding_store_active_slave(struct device *d,
                                 new_active = slave;
                                 if (new_active == old_active) {
                                         /* do nothing */
-                                        pr_info(DRV_NAME
-                                                ": %s: %s is already the current active slave.\n",
-                                                bond->dev->name, slave->dev->name);
+                                        pr_info("%s: %s is already the current active slave.\n",
+                                                bond->dev->name,
+                                                slave->dev->name);
                                         goto out;
                                 }
                                 else {
@@ -1371,16 +1302,15 @@ static ssize_t bonding_store_active_slave(struct device *d,
                                             (old_active) &&
                                             (new_active->link == BOND_LINK_UP) &&
                                             IS_UP(new_active->dev)) {
-                                                pr_info(DRV_NAME
-                                                        ": %s: Setting %s as active slave.\n",
-                                                        bond->dev->name, slave->dev->name);
+                                                pr_info("%s: Setting %s as active slave.\n",
+                                                        bond->dev->name,
+                                                        slave->dev->name);
                                                         bond_change_active_slave(bond, new_active);
                                         }
                                         else {
-                                                pr_info(DRV_NAME
-                                                        ": %s: Could not set %s as active slave; "
-                                                        "either %s is down or the link is down.\n",
-                                                        bond->dev->name, slave->dev->name,
+                                                pr_info("%s: Could not set %s as active slave; either %s is down or the link is down.\n",
+                                                        bond->dev->name,
+                                                        slave->dev->name,
                                                         slave->dev->name);
                                         }
                                         goto out;
@@ -1391,14 +1321,12 @@ static ssize_t bonding_store_active_slave(struct device *d,
                 /* if we got here, then we didn't match the name of any slave */
 
                 if (strlen(buf) == 0 || buf[0] == '\n') {
-                        pr_info(DRV_NAME
-                                ": %s: Setting active slave to None.\n",
+                        pr_info("%s: Setting active slave to None.\n",
                                 bond->dev->name);
                         bond->primary_slave = NULL;
                         bond_select_active_slave(bond);
                 } else {
-                        pr_info(DRV_NAME ": %s: Unable to set %.*s"
-                                " as active slave as it is not a slave.\n",
+                        pr_info("%s: Unable to set %.*s as active slave as it is not a slave.\n",
                                 bond->dev->name, (int)strlen(buf) - 1, buf);
                 }
         }
@@ -1600,8 +1528,7 @@ int bond_create_sysfs(void)
                 /* Is someone being kinky and naming a device bonding_master? */
                 if (__dev_get_by_name(&init_net,
                                       class_attr_bonding_masters.attr.name))
-                        pr_err("network device named %s already "
-                               "exists in sysfs",
+                        pr_err("network device named %s already exists in sysfs",
                                class_attr_bonding_masters.attr.name);
                 ret = 0;
         }
diff --git a/drivers/net/can/Kconfig b/drivers/net/can/Kconfig
index bb803fa1e6a7..05b751719bd5 100644
--- a/drivers/net/can/Kconfig
+++ b/drivers/net/can/Kconfig
@@ -50,10 +50,19 @@ config CAN_TI_HECC
 
 config CAN_MCP251X
         tristate "Microchip MCP251x SPI CAN controllers"
-        depends on CAN_DEV && SPI
+        depends on CAN_DEV && SPI && HAS_DMA
         ---help---
           Driver for the Microchip MCP251x SPI CAN controllers.
 
+config CAN_BFIN
+        depends on CAN_DEV && (BF534 || BF536 || BF537 || BF538 || BF539 || BF54x)
+        tristate "Analog Devices Blackfin on-chip CAN"
+        ---help---
+          Driver for the Analog Devices Blackfin on-chip CAN controllers
+
+          To compile this driver as a module, choose M here: the
+          module will be called bfin_can.
+
 source "drivers/net/can/mscan/Kconfig"
 
 source "drivers/net/can/sja1000/Kconfig"
diff --git a/drivers/net/can/Makefile b/drivers/net/can/Makefile
index 56899fef1c6a..7a702f28d01c 100644
--- a/drivers/net/can/Makefile
+++ b/drivers/net/can/Makefile
@@ -14,5 +14,6 @@ obj-$(CONFIG_CAN_MSCAN)		+= mscan/
 obj-$(CONFIG_CAN_AT91)          += at91_can.o
 obj-$(CONFIG_CAN_TI_HECC)       += ti_hecc.o
 obj-$(CONFIG_CAN_MCP251X)       += mcp251x.o
+obj-$(CONFIG_CAN_BFIN)          += bfin_can.o
 
 ccflags-$(CONFIG_CAN_DEBUG_DEVICES) := -DDEBUG
diff --git a/drivers/net/can/at91_can.c b/drivers/net/can/at91_can.c
index cbe3fce53e3b..d0ec17878ffc 100644
--- a/drivers/net/can/at91_can.c
+++ b/drivers/net/can/at91_can.c
@@ -474,7 +474,7 @@ static void at91_read_mb(struct net_device *dev, unsigned int mb,
         reg_msr = at91_read(priv, AT91_MSR(mb));
         if (reg_msr & AT91_MSR_MRTR)
                 cf->can_id |= CAN_RTR_FLAG;
-        cf->can_dlc = min_t(__u8, (reg_msr >> 16) & 0xf, 8);
+        cf->can_dlc = get_can_dlc((reg_msr >> 16) & 0xf);
 
         *(u32 *)(cf->data + 0) = at91_read(priv, AT91_MDL(mb));
         *(u32 *)(cf->data + 4) = at91_read(priv, AT91_MDH(mb));
diff --git a/drivers/net/can/bfin_can.c b/drivers/net/can/bfin_can.c
new file mode 100644
index 000000000000..0ec1524523cc
--- /dev/null
+++ b/drivers/net/can/bfin_can.c
@@ -0,0 +1,783 @@
+/*
+ * Blackfin On-Chip CAN Driver
+ *
+ * Copyright 2004-2009 Analog Devices Inc.
+ *
+ * Enter bugs at http://blackfin.uclinux.org/
+ *
+ * Licensed under the GPL-2 or later.
+ */
+
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/kernel.h>
+#include <linux/bitops.h>
+#include <linux/interrupt.h>
+#include <linux/errno.h>
+#include <linux/netdevice.h>
+#include <linux/skbuff.h>
+#include <linux/platform_device.h>
+
+#include <linux/can.h>
+#include <linux/can/dev.h>
+#include <linux/can/error.h>
+
+#include <asm/portmux.h>
+
+#define DRV_NAME "bfin_can"
+#define BFIN_CAN_TIMEOUT 100
+
+/*
+ * transmit and receive channels
+ */
+#define TRANSMIT_CHL            24
+#define RECEIVE_STD_CHL         0
+#define RECEIVE_EXT_CHL         4
+#define RECEIVE_RTR_CHL         8
+#define RECEIVE_EXT_RTR_CHL     12
+#define MAX_CHL_NUMBER          32
+
+/*
+ * bfin can registers layout
+ */
+struct bfin_can_mask_regs {
+        u16 aml;
+        u16 dummy1;
+        u16 amh;
+        u16 dummy2;
+};
+
+struct bfin_can_channel_regs {
+        u16 data[8];
+        u16 dlc;
+        u16 dummy1;
+        u16 tsv;
+        u16 dummy2;
+        u16 id0;
+        u16 dummy3;
+        u16 id1;
+        u16 dummy4;
+};
+
+struct bfin_can_regs {
+        /*
+         * global control and status registers
+         */
+        u16 mc1;           /* offset 0 */
+        u16 dummy1;
+        u16 md1;           /* offset 4 */
+        u16 rsv1[13];
+        u16 mbtif1;        /* offset 0x20 */
+        u16 dummy2;
+        u16 mbrif1;        /* offset 0x24 */
+        u16 dummy3;
+        u16 mbim1;         /* offset 0x28 */
+        u16 rsv2[11];
+        u16 mc2;           /* offset 0x40 */
+        u16 dummy4;
+        u16 md2;           /* offset 0x44 */
+        u16 dummy5;
+        u16 trs2;          /* offset 0x48 */
+        u16 rsv3[11];
+        u16 mbtif2;        /* offset 0x60 */
+        u16 dummy6;
+        u16 mbrif2;        /* offset 0x64 */
+        u16 dummy7;
+        u16 mbim2;         /* offset 0x68 */
+        u16 rsv4[11];
+        u16 clk;           /* offset 0x80 */
+        u16 dummy8;
+        u16 timing;        /* offset 0x84 */
+        u16 rsv5[3];
+        u16 status;        /* offset 0x8c */
+        u16 dummy9;
+        u16 cec;           /* offset 0x90 */
+        u16 dummy10;
+        u16 gis;           /* offset 0x94 */
+        u16 dummy11;
+        u16 gim;           /* offset 0x98 */
+        u16 rsv6[3];
+        u16 ctrl;          /* offset 0xa0 */
+        u16 dummy12;
+        u16 intr;          /* offset 0xa4 */
+        u16 rsv7[7];
+        u16 esr;           /* offset 0xb4 */
+        u16 rsv8[37];
+
+        /*
+         * channel(mailbox) mask and message registers
+         */
+        struct bfin_can_mask_regs msk[MAX_CHL_NUMBER];    /* offset 0x100 */
+        struct bfin_can_channel_regs chl[MAX_CHL_NUMBER]; /* offset 0x200 */
+};
+
+/*
+ * bfin can private data
+ */
+struct bfin_can_priv {
+        struct can_priv can;    /* must be the first member */
+        struct net_device *dev;
+        void __iomem *membase;
+        int rx_irq;
+        int tx_irq;
+        int err_irq;
+        unsigned short *pin_list;
+};
+
+/*
+ * bfin can timing parameters
+ */
+static struct can_bittiming_const bfin_can_bittiming_const = {
+        .name = DRV_NAME,
+        .tseg1_min = 1,
+        .tseg1_max = 16,
+        .tseg2_min = 1,
+        .tseg2_max = 8,
+        .sjw_max = 4,
+        /*
+         * Although the BRP field can be set to any value, it is recommended
+         * that the value be greater than or equal to 4, as restrictions
+         * apply to the bit timing configuration when BRP is less than 4.
+         */
+        .brp_min = 4,
+        .brp_max = 1024,
+        .brp_inc = 1,
+};
+
+static int bfin_can_set_bittiming(struct net_device *dev)
+{
+        struct bfin_can_priv *priv = netdev_priv(dev);
+        struct bfin_can_regs __iomem *reg = priv->membase;
+        struct can_bittiming *bt = &priv->can.bittiming;
+        u16 clk, timing;
+
+        clk = bt->brp - 1;
+        timing = ((bt->sjw - 1) << 8) | (bt->prop_seg + bt->phase_seg1 - 1) |
+                ((bt->phase_seg2 - 1) << 4);
+
+        /*
+         * If the SAM bit is set, the input signal is oversampled three times
+         * at the SCLK rate.
+         */
+        if (priv->can.ctrlmode & CAN_CTRLMODE_3_SAMPLES)
+                timing |= SAM;
+
+        bfin_write16(&reg->clk, clk);
+        bfin_write16(&reg->timing, timing);
+
+        dev_info(dev->dev.parent, "setting CLOCK=0x%04x TIMING=0x%04x\n",
+                        clk, timing);
+
+        return 0;
+}
+
+static void bfin_can_set_reset_mode(struct net_device *dev)
+{
+        struct bfin_can_priv *priv = netdev_priv(dev);
+        struct bfin_can_regs __iomem *reg = priv->membase;
+        int timeout = BFIN_CAN_TIMEOUT;
+        int i;
+
+        /* disable interrupts */
+        bfin_write16(&reg->mbim1, 0);
+        bfin_write16(&reg->mbim2, 0);
+        bfin_write16(&reg->gim, 0);
+
+        /* reset can and enter configuration mode */
+        bfin_write16(&reg->ctrl, SRS | CCR);
+        SSYNC();
+        bfin_write16(&reg->ctrl, CCR);
+        SSYNC();
+        while (!(bfin_read16(&reg->ctrl) & CCA)) {
+                udelay(10);
+                if (--timeout == 0) {
+                        dev_err(dev->dev.parent,
+                                        "fail to enter configuration mode\n");
+                        BUG();
+                }
+        }
+
+        /*
+         * All mailbox configurations are marked as inactive
+         * by writing to CAN Mailbox Configuration Registers 1 and 2
+         * For all bits: 0 - Mailbox disabled, 1 - Mailbox enabled
+         */
+        bfin_write16(&reg->mc1, 0);
+        bfin_write16(&reg->mc2, 0);
+
+        /* Set Mailbox Direction */
+        bfin_write16(&reg->md1, 0xFFFF);   /* mailbox 1-16 are RX */
+        bfin_write16(&reg->md2, 0);   /* mailbox 17-32 are TX */
+
+        /* RECEIVE_STD_CHL */
+        for (i = 0; i < 2; i++) {
+                bfin_write16(&reg->chl[RECEIVE_STD_CHL + i].id0, 0);
+                bfin_write16(&reg->chl[RECEIVE_STD_CHL + i].id1, AME);
+                bfin_write16(&reg->chl[RECEIVE_STD_CHL + i].dlc, 0);
+                bfin_write16(&reg->msk[RECEIVE_STD_CHL + i].amh, 0x1FFF);
+                bfin_write16(&reg->msk[RECEIVE_STD_CHL + i].aml, 0xFFFF);
+        }
+
+        /* RECEIVE_EXT_CHL */
+        for (i = 0; i < 2; i++) {
+                bfin_write16(&reg->chl[RECEIVE_EXT_CHL + i].id0, 0);
+                bfin_write16(&reg->chl[RECEIVE_EXT_CHL + i].id1, AME | IDE);
+                bfin_write16(&reg->chl[RECEIVE_EXT_CHL + i].dlc, 0);
+                bfin_write16(&reg->msk[RECEIVE_EXT_CHL + i].amh, 0x1FFF);
+                bfin_write16(&reg->msk[RECEIVE_EXT_CHL + i].aml, 0xFFFF);
+        }
+
+        bfin_write16(&reg->mc2, BIT(TRANSMIT_CHL - 16));
+        bfin_write16(&reg->mc1, BIT(RECEIVE_STD_CHL) + BIT(RECEIVE_EXT_CHL));
+        SSYNC();
+
+        priv->can.state = CAN_STATE_STOPPED;
+}
+
+static void bfin_can_set_normal_mode(struct net_device *dev)
+{
+        struct bfin_can_priv *priv = netdev_priv(dev);
+        struct bfin_can_regs __iomem *reg = priv->membase;
+        int timeout = BFIN_CAN_TIMEOUT;
+
+        /*
+         * leave configuration mode
+         */
+        bfin_write16(&reg->ctrl, bfin_read16(&reg->ctrl) & ~CCR);
+
+        while (bfin_read16(&reg->status) & CCA) {
+                udelay(10);
+                if (--timeout == 0) {
+                        dev_err(dev->dev.parent,
+                                        "fail to leave configuration mode\n");
+                        BUG();
+                }
+        }
+
+        /*
+         * clear _All_  tx and rx interrupts
+         */
+        bfin_write16(&reg->mbtif1, 0xFFFF);
+        bfin_write16(&reg->mbtif2, 0xFFFF);
+        bfin_write16(&reg->mbrif1, 0xFFFF);
+        bfin_write16(&reg->mbrif2, 0xFFFF);
+
+        /*
+         * clear global interrupt status register
+         */
+        bfin_write16(&reg->gis, 0x7FF); /* overwrites with '1' */
+
+        /*
+         * Initialize Interrupts
+         * - set bits in the mailbox interrupt mask register
+         * - global interrupt mask
+         */
+        bfin_write16(&reg->mbim1, BIT(RECEIVE_STD_CHL) + BIT(RECEIVE_EXT_CHL));
+        bfin_write16(&reg->mbim2, BIT(TRANSMIT_CHL - 16));
+
+        bfin_write16(&reg->gim, EPIM | BOIM | RMLIM);
+        SSYNC();
+}
+
+static void bfin_can_start(struct net_device *dev)
+{
+        struct bfin_can_priv *priv = netdev_priv(dev);
+
+        /* enter reset mode */
+        if (priv->can.state != CAN_STATE_STOPPED)
+                bfin_can_set_reset_mode(dev);
+
+        /* leave reset mode */
+        bfin_can_set_normal_mode(dev);
+}
+
+static int bfin_can_set_mode(struct net_device *dev, enum can_mode mode)
+{
+        switch (mode) {
+        case CAN_MODE_START:
+                bfin_can_start(dev);
+                if (netif_queue_stopped(dev))
+                        netif_wake_queue(dev);
+                break;
+
+        default:
+                return -EOPNOTSUPP;
+        }
+
+        return 0;
+}
+
+static int bfin_can_start_xmit(struct sk_buff *skb, struct net_device *dev)
+{
+        struct bfin_can_priv *priv = netdev_priv(dev);
+        struct bfin_can_regs __iomem *reg = priv->membase;
+        struct can_frame *cf = (struct can_frame *)skb->data;
+        u8 dlc = cf->can_dlc;
+        canid_t id = cf->can_id;
+        u8 *data = cf->data;
+        u16 val;
+        int i;
+
+        netif_stop_queue(dev);
+
+        /* fill id */
+        if (id & CAN_EFF_FLAG) {
+                bfin_write16(&reg->chl[TRANSMIT_CHL].id0, id);
+                if (id & CAN_RTR_FLAG)
+                        writew(((id & 0x1FFF0000) >> 16) | IDE | AME | RTR,
+                                        &reg->chl[TRANSMIT_CHL].id1);
+                else
+                        writew(((id & 0x1FFF0000) >> 16) | IDE | AME,
+                                        &reg->chl[TRANSMIT_CHL].id1);
+
+        } else {
+                if (id & CAN_RTR_FLAG)
+                        writew((id << 2) | AME | RTR,
+                                &reg->chl[TRANSMIT_CHL].id1);
+                else
+                        bfin_write16(&reg->chl[TRANSMIT_CHL].id1,
+                                        (id << 2) | AME);
+        }
+
+        /* fill payload */
+        for (i = 0; i < 8; i += 2) {
+                val = ((7 - i) < dlc ? (data[7 - i]) : 0) +
+                        ((6 - i) < dlc ? (data[6 - i] << 8) : 0);
+                bfin_write16(&reg->chl[TRANSMIT_CHL].data[i], val);
+        }
+
+        /* fill data length code */
+        bfin_write16(&reg->chl[TRANSMIT_CHL].dlc, dlc);
+
+        dev->trans_start = jiffies;
+
+        can_put_echo_skb(skb, dev, 0);
+
+        /* set transmit request */
+        bfin_write16(&reg->trs2, BIT(TRANSMIT_CHL - 16));
+
+        return 0;
+}
+
+static void bfin_can_rx(struct net_device *dev, u16 isrc)
+{
+        struct bfin_can_priv *priv = netdev_priv(dev);
+        struct net_device_stats *stats = &dev->stats;
+        struct bfin_can_regs __iomem *reg = priv->membase;
+        struct can_frame *cf;
+        struct sk_buff *skb;
+        int obj;
+        int i;
+        u16 val;
+
+        skb = alloc_can_skb(dev, &cf);
+        if (skb == NULL)
+                return;
+
+        /* get id */
+        if (isrc & BIT(RECEIVE_EXT_CHL)) {
+                /* extended frame format (EFF) */
+                cf->can_id = ((bfin_read16(&reg->chl[RECEIVE_EXT_CHL].id1)
+                             & 0x1FFF) << 16)
+                             + bfin_read16(&reg->chl[RECEIVE_EXT_CHL].id0);
+                cf->can_id |= CAN_EFF_FLAG;
+                obj = RECEIVE_EXT_CHL;
+        } else {
+                /* standard frame format (SFF) */
+                cf->can_id = (bfin_read16(&reg->chl[RECEIVE_STD_CHL].id1)
+                             & 0x1ffc) >> 2;
+                obj = RECEIVE_STD_CHL;
+        }
+        if (bfin_read16(&reg->chl[obj].id1) & RTR)
+                cf->can_id |= CAN_RTR_FLAG;
+
+        /* get data length code */
+        cf->can_dlc = get_can_dlc(bfin_read16(&reg->chl[obj].dlc) & 0xF);
+
+        /* get payload */
+        for (i = 0; i < 8; i += 2) {
+                val = bfin_read16(&reg->chl[obj].data[i]);
+                cf->data[7 - i] = (7 - i) < cf->can_dlc ? val : 0;
+                cf->data[6 - i] = (6 - i) < cf->can_dlc ? (val >> 8) : 0;
+        }
+
+        netif_rx(skb);
+
+        stats->rx_packets++;
+        stats->rx_bytes += cf->can_dlc;
+}
+
+static int bfin_can_err(struct net_device *dev, u16 isrc, u16 status)
+{
+        struct bfin_can_priv *priv = netdev_priv(dev);
+        struct bfin_can_regs __iomem *reg = priv->membase;
+        struct net_device_stats *stats = &dev->stats;
+        struct can_frame *cf;
+        struct sk_buff *skb;
+        enum can_state state = priv->can.state;
+
+        skb = alloc_can_err_skb(dev, &cf);
+        if (skb == NULL)
+                return -ENOMEM;
+
+        if (isrc & RMLIS) {
+                /* data overrun interrupt */
+                dev_dbg(dev->dev.parent, "data overrun interrupt\n");
+                cf->can_id |= CAN_ERR_CRTL;
+                cf->data[1] = CAN_ERR_CRTL_RX_OVERFLOW;
+                stats->rx_over_errors++;
+                stats->rx_errors++;
+        }
+
+        if (isrc & BOIS) {
+                dev_dbg(dev->dev.parent, "bus-off mode interrupt\n");
+                state = CAN_STATE_BUS_OFF;
+                cf->can_id |= CAN_ERR_BUSOFF;
+                can_bus_off(dev);
+        }
+
+        if (isrc & EPIS) {
+                /* error passive interrupt */
+                dev_dbg(dev->dev.parent, "error passive interrupt\n");
+                state = CAN_STATE_ERROR_PASSIVE;
+        }
+
+        if ((isrc & EWTIS) || (isrc & EWRIS)) {
+                dev_dbg(dev->dev.parent,
+                                "Error Warning Transmit/Receive Interrupt\n");
+                state = CAN_STATE_ERROR_WARNING;
+        }
+
+        if (state != priv->can.state && (state == CAN_STATE_ERROR_WARNING ||
+                                state == CAN_STATE_ERROR_PASSIVE)) {
+                u16 cec = bfin_read16(&reg->cec);
+                u8 rxerr = cec;
+                u8 txerr = cec >> 8;
+
+                cf->can_id |= CAN_ERR_CRTL;
+                if (state == CAN_STATE_ERROR_WARNING) {
+                        priv->can.can_stats.error_warning++;
+                        cf->data[1] = (txerr > rxerr) ?
+                                CAN_ERR_CRTL_TX_WARNING :
+                                CAN_ERR_CRTL_RX_WARNING;
+                } else {
+                        priv->can.can_stats.error_passive++;
+                        cf->data[1] = (txerr > rxerr) ?
+                                CAN_ERR_CRTL_TX_PASSIVE :
+                                CAN_ERR_CRTL_RX_PASSIVE;
+                }
+        }
+
+        if (status) {
+                priv->can.can_stats.bus_error++;
+
+                cf->can_id |= CAN_ERR_PROT | CAN_ERR_BUSERROR;
+
+                if (status & BEF)
+                        cf->data[2] |= CAN_ERR_PROT_BIT;
+                else if (status & FER)
+                        cf->data[2] |= CAN_ERR_PROT_FORM;
+                else if (status & SER)
+                        cf->data[2] |= CAN_ERR_PROT_STUFF;
+                else
+                        cf->data[2] |= CAN_ERR_PROT_UNSPEC;
+        }
+
+        priv->can.state = state;
+
+        netif_rx(skb);
+
+        stats->rx_packets++;
+        stats->rx_bytes += cf->can_dlc;
+
+        return 0;
+}
+
+irqreturn_t bfin_can_interrupt(int irq, void *dev_id)
+{
+        struct net_device *dev = dev_id;
+        struct bfin_can_priv *priv = netdev_priv(dev);
+        struct bfin_can_regs __iomem *reg = priv->membase;
+        struct net_device_stats *stats = &dev->stats;
+        u16 status, isrc;
+
+        if ((irq == priv->tx_irq) && bfin_read16(&reg->mbtif2)) {
+                /* transmission complete interrupt */
+                bfin_write16(&reg->mbtif2, 0xFFFF);
+                stats->tx_packets++;
+                stats->tx_bytes += bfin_read16(&reg->chl[TRANSMIT_CHL].dlc);
+                can_get_echo_skb(dev, 0);
+                netif_wake_queue(dev);
+        } else if ((irq == priv->rx_irq) && bfin_read16(&reg->mbrif1)) {
+                /* receive interrupt */
+                isrc = bfin_read16(&reg->mbrif1);
+                bfin_write16(&reg->mbrif1, 0xFFFF);
+                bfin_can_rx(dev, isrc);
+        } else if ((irq == priv->err_irq) && bfin_read16(&reg->gis)) {
+                /* error interrupt */
+                isrc = bfin_read16(&reg->gis);
+                status = bfin_read16(&reg->esr);
+                bfin_write16(&reg->gis, 0x7FF);
+                bfin_can_err(dev, isrc, status);
+        } else {
+                return IRQ_NONE;
+        }
+
+        return IRQ_HANDLED;
+}
+
+static int bfin_can_open(struct net_device *dev)
+{
+        struct bfin_can_priv *priv = netdev_priv(dev);
+        int err;
+
+        /* set chip into reset mode */
+        bfin_can_set_reset_mode(dev);
+
+        /* common open */
+        err = open_candev(dev);
+        if (err)
+                goto exit_open;
+
+        /* register interrupt handler */
+        err = request_irq(priv->rx_irq, &bfin_can_interrupt, 0,
+                        "bfin-can-rx", dev);
+        if (err)
+                goto exit_rx_irq;
+        err = request_irq(priv->tx_irq, &bfin_can_interrupt, 0,
+                        "bfin-can-tx", dev);
+        if (err)
+                goto exit_tx_irq;
+        err = request_irq(priv->err_irq, &bfin_can_interrupt, 0,
+                        "bfin-can-err", dev);
+        if (err)
+                goto exit_err_irq;
+
+        bfin_can_start(dev);
+
+        netif_start_queue(dev);
+
+        return 0;
+
+exit_err_irq:
+        free_irq(priv->tx_irq, dev);
+exit_tx_irq:
+        free_irq(priv->rx_irq, dev);
+exit_rx_irq:
+        close_candev(dev);
+exit_open:
+        return err;
+}
+
+static int bfin_can_close(struct net_device *dev)
+{
+        struct bfin_can_priv *priv = netdev_priv(dev);
+
+        netif_stop_queue(dev);
+        bfin_can_set_reset_mode(dev);
+
+        close_candev(dev);
+
+        free_irq(priv->rx_irq, dev);
+        free_irq(priv->tx_irq, dev);
+        free_irq(priv->err_irq, dev);
+
+        return 0;
+}
+
+struct net_device *alloc_bfin_candev(void)
+{
+        struct net_device *dev;
+        struct bfin_can_priv *priv;
+
+        dev = alloc_candev(sizeof(*priv));
+        if (!dev)
+                return NULL;
+
+        priv = netdev_priv(dev);
+
+        priv->dev = dev;
+        priv->can.bittiming_const = &bfin_can_bittiming_const;
+        priv->can.do_set_bittiming = bfin_can_set_bittiming;
+        priv->can.do_set_mode = bfin_can_set_mode;
+
+        return dev;
+}
+
+static const struct net_device_ops bfin_can_netdev_ops = {
+        .ndo_open               = bfin_can_open,
+        .ndo_stop               = bfin_can_close,
+        .ndo_start_xmit         = bfin_can_start_xmit,
+};
+
+static int __devinit bfin_can_probe(struct platform_device *pdev)
+{
+        int err;
+        struct net_device *dev;
+        struct bfin_can_priv *priv;
+        struct resource *res_mem, *rx_irq, *tx_irq, *err_irq;
+        unsigned short *pdata;
+
+        pdata = pdev->dev.platform_data;
+        if (!pdata) {
+                dev_err(&pdev->dev, "No platform data provided!\n");
+                err = -EINVAL;
+                goto exit;
+        }
+
+        res_mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        rx_irq = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
+        tx_irq = platform_get_resource(pdev, IORESOURCE_IRQ, 1);
+        err_irq = platform_get_resource(pdev, IORESOURCE_IRQ, 2);
+        if (!res_mem || !rx_irq || !tx_irq || !err_irq) {
+                err = -EINVAL;
+                goto exit;
+        }
+
+        if (!request_mem_region(res_mem->start, resource_size(res_mem),
+                                dev_name(&pdev->dev))) {
+                err = -EBUSY;
+                goto exit;
+        }
+
+        /* request peripheral pins */
+        err = peripheral_request_list(pdata, dev_name(&pdev->dev));
+        if (err)
+                goto exit_mem_release;
+
+        dev = alloc_bfin_candev();
+        if (!dev) {
+                err = -ENOMEM;
+                goto exit_peri_pin_free;
+        }
+
+        priv = netdev_priv(dev);
+        priv->membase = (void __iomem *)res_mem->start;
+        priv->rx_irq = rx_irq->start;
+        priv->tx_irq = tx_irq->start;
+        priv->err_irq = err_irq->start;
+        priv->pin_list = pdata;
+        priv->can.clock.freq = get_sclk();
+
+        dev_set_drvdata(&pdev->dev, dev);
+        SET_NETDEV_DEV(dev, &pdev->dev);
+
+        dev->flags |= IFF_ECHO; /* we support local echo */
+        dev->netdev_ops = &bfin_can_netdev_ops;
+
+        bfin_can_set_reset_mode(dev);
+
+        err = register_candev(dev);
+        if (err) {
+                dev_err(&pdev->dev, "registering failed (err=%d)\n", err);
+                goto exit_candev_free;
+        }
+
+        dev_info(&pdev->dev,
+                "%s device registered"
+                "(&reg_base=%p, rx_irq=%d, tx_irq=%d, err_irq=%d, sclk=%d)\n",
+                DRV_NAME, (void *)priv->membase, priv->rx_irq,
+                priv->tx_irq, priv->err_irq, priv->can.clock.freq);
+        return 0;
+
+exit_candev_free:
+        free_candev(dev);
+exit_peri_pin_free:
+        peripheral_free_list(pdata);
+exit_mem_release:
+        release_mem_region(res_mem->start, resource_size(res_mem));
+exit:
+        return err;
+}
+
+static int __devexit bfin_can_remove(struct platform_device *pdev)
+{
+        struct net_device *dev = dev_get_drvdata(&pdev->dev);
+        struct bfin_can_priv *priv = netdev_priv(dev);
+        struct resource *res;
+
+        bfin_can_set_reset_mode(dev);
+
+        unregister_candev(dev);
+
+        dev_set_drvdata(&pdev->dev, NULL);
+
+        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        release_mem_region(res->start, resource_size(res));
+
+        peripheral_free_list(priv->pin_list);
+
+        free_candev(dev);
+        return 0;
+}
+
+#ifdef CONFIG_PM
+static int bfin_can_suspend(struct platform_device *pdev, pm_message_t mesg)
+{
+        struct net_device *dev = dev_get_drvdata(&pdev->dev);
+        struct bfin_can_priv *priv = netdev_priv(dev);
+        struct bfin_can_regs __iomem *reg = priv->membase;
+        int timeout = BFIN_CAN_TIMEOUT;
+
+        if (netif_running(dev)) {
+                /* enter sleep mode */
+                bfin_write16(&reg->ctrl, bfin_read16(&reg->ctrl) | SMR);
+                SSYNC();
+                while (!(bfin_read16(&reg->intr) & SMACK)) {
+                        udelay(10);
+                        if (--timeout == 0) {
+                                dev_err(dev->dev.parent,
+                                                "fail to enter sleep mode\n");
+                                BUG();
+                        }
+                }
+        }
+
+        return 0;
+}
+
+static int bfin_can_resume(struct platform_device *pdev)
+{
+        struct net_device *dev = dev_get_drvdata(&pdev->dev);
+        struct bfin_can_priv *priv = netdev_priv(dev);
+        struct bfin_can_regs __iomem *reg = priv->membase;
+
+        if (netif_running(dev)) {
+                /* leave sleep mode */
+                bfin_write16(&reg->intr, 0);
+                SSYNC();
+        }
+
+        return 0;
+}
+#else
+#define bfin_can_suspend NULL
+#define bfin_can_resume NULL
+#endif  /* CONFIG_PM */
+
+static struct platform_driver bfin_can_driver = {
+        .probe = bfin_can_probe,
+        .remove = __devexit_p(bfin_can_remove),
+        .suspend = bfin_can_suspend,
+        .resume = bfin_can_resume,
+        .driver = {
+                .name = DRV_NAME,
+                .owner = THIS_MODULE,
+        },
+};
+
+static int __init bfin_can_init(void)
+{
+        return platform_driver_register(&bfin_can_driver);
+}
+module_init(bfin_can_init);
+
+static void __exit bfin_can_exit(void)
+{
+        platform_driver_unregister(&bfin_can_driver);
+}
+module_exit(bfin_can_exit);
+
+MODULE_AUTHOR("Barry Song <21cnbao@gmail.com>");
+MODULE_LICENSE("GPL");
+MODULE_DESCRIPTION("Blackfin on-chip CAN netdevice driver");
diff --git a/drivers/net/can/mcp251x.c b/drivers/net/can/mcp251x.c
index 78b1b69b2921..9c5a1537939c 100644
--- a/drivers/net/can/mcp251x.c
+++ b/drivers/net/can/mcp251x.c
@@ -403,9 +403,8 @@ static void mcp251x_hw_rx_frame(struct spi_device *spi, u8 *buf,
 
                 for (i = 1; i < RXBDAT_OFF; i++)
                         buf[i] = mcp251x_read_reg(spi, RXBCTRL(buf_idx) + i);
-                len = buf[RXBDLC_OFF] & RXBDLC_LEN_MASK;
-                if (len > 8)
-                        len = 8;
+
+                len = get_can_dlc(buf[RXBDLC_OFF] & RXBDLC_LEN_MASK);
                 for (; i < (RXBDAT_OFF + len); i++)
                         buf[i] = mcp251x_read_reg(spi, RXBCTRL(buf_idx) + i);
         } else {
@@ -455,13 +454,7 @@ static void mcp251x_hw_rx(struct spi_device *spi, int buf_idx)
                         (buf[RXBSIDL_OFF] >> RXBSIDL_SHIFT);
         }
         /* Data length */
-        frame->can_dlc = buf[RXBDLC_OFF] & RXBDLC_LEN_MASK;
-        if (frame->can_dlc > 8) {
-                dev_warn(&spi->dev, "invalid frame recevied\n");
-                priv->net->stats.rx_errors++;
-                dev_kfree_skb(skb);
-                return;
-        }
+        frame->can_dlc = get_can_dlc(buf[RXBDLC_OFF] & RXBDLC_LEN_MASK);
         memcpy(frame->data, buf + RXBDAT_OFF, frame->can_dlc);
 
         priv->net->stats.rx_packets++;
diff --git a/drivers/net/can/mscan/mscan.c b/drivers/net/can/mscan/mscan.c
index bb06dfb58f25..07346f880ca6 100644
--- a/drivers/net/can/mscan/mscan.c
+++ b/drivers/net/can/mscan/mscan.c
@@ -297,7 +297,8 @@ static void mscan_get_rx_frame(struct net_device *dev, struct can_frame *frame)
         frame->can_id |= can_id >> 1;
         if (can_id & 1)
                 frame->can_id |= CAN_RTR_FLAG;
-        frame->can_dlc = in_8(&regs->rx.dlr) & 0xf;
+
+        frame->can_dlc = get_can_dlc(in_8(&regs->rx.dlr) & 0xf);
 
         if (!(frame->can_id & CAN_RTR_FLAG)) {
                 void __iomem *data = &regs->rx.dsr1_0;
diff --git a/drivers/net/can/sja1000/sja1000.c b/drivers/net/can/sja1000/sja1000.c
index b4ba88a31075..542a4f7255b4 100644
--- a/drivers/net/can/sja1000/sja1000.c
+++ b/drivers/net/can/sja1000/sja1000.c
@@ -293,15 +293,14 @@ static void sja1000_rx(struct net_device *dev)
         uint8_t fi;
         uint8_t dreg;
         canid_t id;
-        uint8_t dlc;
         int i;
 
+        /* create zero'ed CAN frame buffer */
         skb = alloc_can_skb(dev, &cf);
         if (skb == NULL)
                 return;
 
         fi = priv->read_reg(priv, REG_FI);
-        dlc = fi & 0x0F;
 
         if (fi & FI_FF) {
                 /* extended frame format (EFF) */
@@ -318,16 +317,15 @@ static void sja1000_rx(struct net_device *dev)
                     | (priv->read_reg(priv, REG_ID2) >> 5);
         }
 
-        if (fi & FI_RTR)
+        if (fi & FI_RTR) {
                 id |= CAN_RTR_FLAG;
+        } else {
+                cf->can_dlc = get_can_dlc(fi & 0x0F);
+                for (i = 0; i < cf->can_dlc; i++)
+                        cf->data[i] = priv->read_reg(priv, dreg++);
+        }
 
         cf->can_id = id;
-        cf->can_dlc = dlc;
-        for (i = 0; i < dlc; i++)
-                cf->data[i] = priv->read_reg(priv, dreg++);
-
-        while (i < 8)
-                cf->data[i++] = 0;
 
         /* release receive buffer */
         priv->write_reg(priv, REG_CMR, CMD_RRB);
@@ -335,7 +333,7 @@ static void sja1000_rx(struct net_device *dev)
         netif_rx(skb);
 
         stats->rx_packets++;
-        stats->rx_bytes += dlc;
+        stats->rx_bytes += cf->can_dlc;
 }
 
 static int sja1000_err(struct net_device *dev, uint8_t isrc, uint8_t status)
diff --git a/drivers/net/can/ti_hecc.c b/drivers/net/can/ti_hecc.c
index 07e8016b17ec..5c993c2da528 100644
--- a/drivers/net/can/ti_hecc.c
+++ b/drivers/net/can/ti_hecc.c
@@ -552,7 +552,7 @@ static int ti_hecc_rx_pkt(struct ti_hecc_priv *priv, int mbxno)
         data = hecc_read_mbx(priv, mbxno, HECC_CANMCF);
         if (data & HECC_CANMCF_RTR)
                 cf->can_id |= CAN_RTR_FLAG;
-        cf->can_dlc = data & 0xF;
+        cf->can_dlc = get_can_dlc(data & 0xF);
         data = hecc_read_mbx(priv, mbxno, HECC_CANMDL);
         *(u32 *)(cf->data) = cpu_to_be32(data);
         if (cf->can_dlc > 4) {
diff --git a/drivers/net/can/usb/ems_usb.c b/drivers/net/can/usb/ems_usb.c
index 591eb0eb1c2b..efbb05c71bf4 100644
--- a/drivers/net/can/usb/ems_usb.c
+++ b/drivers/net/can/usb/ems_usb.c
@@ -316,7 +316,7 @@ static void ems_usb_rx_can_msg(struct ems_usb *dev, struct ems_cpc_msg *msg)
                 return;
 
         cf->can_id = le32_to_cpu(msg->msg.can_msg.id);
-        cf->can_dlc = min_t(u8, msg->msg.can_msg.length, 8);
+        cf->can_dlc = get_can_dlc(msg->msg.can_msg.length & 0xF);
 
         if (msg->type == CPC_MSG_TYPE_EXT_CAN_FRAME ||
             msg->type == CPC_MSG_TYPE_EXT_RTR_FRAME)
diff --git a/drivers/net/cnic.c b/drivers/net/cnic.c
index d4c6e7fcff53..4332b3a2fafb 100644
--- a/drivers/net/cnic.c
+++ b/drivers/net/cnic.c
@@ -1104,6 +1104,8 @@ static int cnic_alloc_bnx2x_resc(struct cnic_dev *dev)
         cp->bnx2x_status_blk = cp->status_blk;
         cp->bnx2x_def_status_blk = cp->ethdev->irq_arr[1].status_blk;
 
+        memset(cp->bnx2x_status_blk, 0, sizeof(struct host_status_block));
+
         cp->l2_rx_ring_size = 15;
 
         ret = cnic_alloc_l2_rings(dev, 4);
@@ -4183,6 +4185,12 @@ static void cnic_shutdown_rings(struct cnic_dev *dev)
                 cnic_submit_kwqe_16(dev, RAMROD_CMD_ID_ETH_HALT,
                         BNX2X_ISCSI_L2_CID, ETH_CONNECTION_TYPE, &l5_data);
                 msleep(10);
+
+                memset(&l5_data, 0, sizeof(l5_data));
+                cnic_submit_kwqe_16(dev, RAMROD_CMD_ID_ETH_CFC_DEL,
+                        BNX2X_ISCSI_L2_CID, ETH_CONNECTION_TYPE |
+                        (1 << SPE_HDR_COMMON_RAMROD_SHIFT), &l5_data);
+                msleep(10);
         }
 }
 
@@ -4289,6 +4297,9 @@ static void cnic_stop_bnx2x_hw(struct cnic_dev *dev)
                   offsetof(struct cstorm_status_block_c,
                            index_values[HC_INDEX_C_ISCSI_EQ_CONS]),
                   0);
+        CNIC_WR(dev, BAR_CSTRORM_INTMEM +
+                CSTORM_ISCSI_EQ_CONS_OFFSET(cp->func, 0), 0);
+        CNIC_WR16(dev, cp->kcq_io_addr, 0);
         cnic_free_resc(dev);
 }
 
diff --git a/drivers/net/cpmac.c b/drivers/net/cpmac.c
index 678222389407..8d0be26f94e3 100644
--- a/drivers/net/cpmac.c
+++ b/drivers/net/cpmac.c
@@ -1163,7 +1163,7 @@ static int __devinit cpmac_probe(struct platform_device *pdev)
         priv->dev = dev;
         priv->ring_size = 64;
         priv->msg_enable = netif_msg_init(debug_level, 0xff);
-        memcpy(dev->dev_addr, pdata->dev_addr, sizeof(dev->dev_addr));
+        memcpy(dev->dev_addr, pdata->dev_addr, sizeof(pdata->dev_addr));
 
         snprintf(priv->phy_name, MII_BUS_ID_SIZE, PHY_ID_FMT, mdio_bus_id, phy_id);
 
diff --git a/drivers/net/cxgb3/cxgb3_main.c b/drivers/net/cxgb3/cxgb3_main.c
index cef3f882e2b6..89bec9c3c141 100644
--- a/drivers/net/cxgb3/cxgb3_main.c
+++ b/drivers/net/cxgb3/cxgb3_main.c
@@ -2860,6 +2860,7 @@ static int t3_reenable_adapter(struct adapter *adapter)
         }
         pci_set_master(adapter->pdev);
         pci_restore_state(adapter->pdev);
+        pci_save_state(adapter->pdev);
 
         /* Free sge resources */
         t3_free_sge_resources(adapter);
diff --git a/drivers/net/e1000e/defines.h b/drivers/net/e1000e/defines.h
index 86d2809763c3..e02e38221ed4 100644
--- a/drivers/net/e1000e/defines.h
+++ b/drivers/net/e1000e/defines.h
@@ -74,7 +74,7 @@
 #define E1000_WUS_BC           E1000_WUFC_BC
 
 /* Extended Device Control */
-#define E1000_CTRL_EXT_SDP7_DATA 0x00000080 /* Value of SW Definable Pin 7 */
+#define E1000_CTRL_EXT_SDP3_DATA 0x00000080 /* Value of SW Definable Pin 3 */
 #define E1000_CTRL_EXT_EE_RST    0x00002000 /* Reinitialize from EEPROM */
 #define E1000_CTRL_EXT_SPD_BYPS  0x00008000 /* Speed Select Bypass */
 #define E1000_CTRL_EXT_RO_DIS    0x00020000 /* Relaxed Ordering disable */
diff --git a/drivers/net/e1000e/es2lan.c b/drivers/net/e1000e/es2lan.c
index d2a104794609..3028f23da891 100644
--- a/drivers/net/e1000e/es2lan.c
+++ b/drivers/net/e1000e/es2lan.c
@@ -46,6 +46,9 @@
 #define E1000_KMRNCTRLSTA_HD_CTRL_1000_DEFAULT   0x0000
 #define E1000_KMRNCTRLSTA_OPMODE_E_IDLE          0x2000
 
+#define E1000_KMRNCTRLSTA_OPMODE_MASK            0x000C
+#define E1000_KMRNCTRLSTA_OPMODE_INBAND_MDIO     0x0004
+
 #define E1000_TCTL_EXT_GCEX_MASK 0x000FFC00 /* Gigabit Carry Extend Padding */
 #define DEFAULT_TCTL_EXT_GCEX_80003ES2LAN        0x00010000
 
@@ -462,28 +465,36 @@ static s32 e1000_read_phy_reg_gg82563_80003es2lan(struct e1000_hw *hw,
                 return ret_val;
         }
 
-        /*
-         * The "ready" bit in the MDIC register may be incorrectly set
-         * before the device has completed the "Page Select" MDI
-         * transaction.  So we wait 200us after each MDI command...
-         */
-        udelay(200);
+        if (hw->dev_spec.e80003es2lan.mdic_wa_enable == true) {
+                /*
+                 * The "ready" bit in the MDIC register may be incorrectly set
+                 * before the device has completed the "Page Select" MDI
+                 * transaction.  So we wait 200us after each MDI command...
+                 */
+                udelay(200);
 
-        /* ...and verify the command was successful. */
-        ret_val = e1000e_read_phy_reg_mdic(hw, page_select, &temp);
+                /* ...and verify the command was successful. */
+                ret_val = e1000e_read_phy_reg_mdic(hw, page_select, &temp);
 
-        if (((u16)offset >> GG82563_PAGE_SHIFT) != temp) {
-                ret_val = -E1000_ERR_PHY;
-                e1000_release_phy_80003es2lan(hw);
-                return ret_val;
-        }
+                if (((u16)offset >> GG82563_PAGE_SHIFT) != temp) {
+                        ret_val = -E1000_ERR_PHY;
+                        e1000_release_phy_80003es2lan(hw);
+                        return ret_val;
+                }
 
-        udelay(200);
+                udelay(200);
 
-        ret_val = e1000e_read_phy_reg_mdic(hw, MAX_PHY_REG_ADDRESS & offset,
-                                           data);
+                ret_val = e1000e_read_phy_reg_mdic(hw,
+                                                  MAX_PHY_REG_ADDRESS & offset,
+                                                  data);
+
+                udelay(200);
+        } else {
+                ret_val = e1000e_read_phy_reg_mdic(hw,
+                                                  MAX_PHY_REG_ADDRESS & offset,
+                                                  data);
+        }
 
-        udelay(200);
         e1000_release_phy_80003es2lan(hw);
 
         return ret_val;
@@ -526,28 +537,35 @@ static s32 e1000_write_phy_reg_gg82563_80003es2lan(struct e1000_hw *hw,
                 return ret_val;
         }
 
+        if (hw->dev_spec.e80003es2lan.mdic_wa_enable == true) {
+                /*
+                 * The "ready" bit in the MDIC register may be incorrectly set
+                 * before the device has completed the "Page Select" MDI
+                 * transaction.  So we wait 200us after each MDI command...
+                 */
+                udelay(200);
 
-        /*
-         * The "ready" bit in the MDIC register may be incorrectly set
-         * before the device has completed the "Page Select" MDI
-         * transaction.  So we wait 200us after each MDI command...
-         */
-        udelay(200);
+                /* ...and verify the command was successful. */
+                ret_val = e1000e_read_phy_reg_mdic(hw, page_select, &temp);
 
-        /* ...and verify the command was successful. */
-        ret_val = e1000e_read_phy_reg_mdic(hw, page_select, &temp);
+                if (((u16)offset >> GG82563_PAGE_SHIFT) != temp) {
+                        e1000_release_phy_80003es2lan(hw);
+                        return -E1000_ERR_PHY;
+                }
 
-        if (((u16)offset >> GG82563_PAGE_SHIFT) != temp) {
-                e1000_release_phy_80003es2lan(hw);
-                return -E1000_ERR_PHY;
-        }
+                udelay(200);
 
-        udelay(200);
+                ret_val = e1000e_write_phy_reg_mdic(hw,
+                                                  MAX_PHY_REG_ADDRESS & offset,
+                                                  data);
 
-        ret_val = e1000e_write_phy_reg_mdic(hw, MAX_PHY_REG_ADDRESS & offset,
-                                            data);
+                udelay(200);
+        } else {
+                ret_val = e1000e_write_phy_reg_mdic(hw,
+                                                  MAX_PHY_REG_ADDRESS & offset,
+                                                  data);
+        }
 
-        udelay(200);
         e1000_release_phy_80003es2lan(hw);
 
         return ret_val;
@@ -866,6 +884,19 @@ static s32 e1000_init_hw_80003es2lan(struct e1000_hw *hw)
         reg_data &= ~0x00100000;
         E1000_WRITE_REG_ARRAY(hw, E1000_FFLT, 0x0001, reg_data);
 
+        /* default to true to enable the MDIC W/A */
+        hw->dev_spec.e80003es2lan.mdic_wa_enable = true;
+
+        ret_val = e1000_read_kmrn_reg_80003es2lan(hw,
+                                      E1000_KMRNCTRLSTA_OFFSET >>
+                                      E1000_KMRNCTRLSTA_OFFSET_SHIFT,
+                                      &i);
+        if (!ret_val) {
+                if ((i & E1000_KMRNCTRLSTA_OPMODE_MASK) ==
+                     E1000_KMRNCTRLSTA_OPMODE_INBAND_MDIO)
+                        hw->dev_spec.e80003es2lan.mdic_wa_enable = false;
+        }
+
         /*
          * Clear all of the statistics registers (clear on read).  It is
          * important that we do this after we have tried to establish link
diff --git a/drivers/net/e1000e/hw.h b/drivers/net/e1000e/hw.h
index a7d08dae79c4..2784cf44a6f3 100644
--- a/drivers/net/e1000e/hw.h
+++ b/drivers/net/e1000e/hw.h
@@ -302,6 +302,8 @@ enum e1e_registers {
 #define E1000_KMRNCTRLSTA_OFFSET_SHIFT  16
 #define E1000_KMRNCTRLSTA_REN           0x00200000
 #define E1000_KMRNCTRLSTA_DIAG_OFFSET   0x3    /* Kumeran Diagnostic */
+#define E1000_KMRNCTRLSTA_TIMEOUTS      0x4    /* Kumeran Timeouts */
+#define E1000_KMRNCTRLSTA_INBAND_PARAM  0x9    /* Kumeran InBand Parameters */
 #define E1000_KMRNCTRLSTA_DIAG_NELPBK   0x1000 /* Nearend Loopback mode */
 #define E1000_KMRNCTRLSTA_K1_CONFIG     0x7
 #define E1000_KMRNCTRLSTA_K1_ENABLE     0x140E
@@ -898,6 +900,10 @@ struct e1000_dev_spec_82571 {
         u32 smb_counter;
 };
 
+struct e1000_dev_spec_80003es2lan {
+        bool  mdic_wa_enable;
+};
+
 struct e1000_shadow_ram {
         u16  value;
         bool modified;
@@ -926,6 +932,7 @@ struct e1000_hw {
 
         union {
                 struct e1000_dev_spec_82571     e82571;
+                struct e1000_dev_spec_80003es2lan e80003es2lan;
                 struct e1000_dev_spec_ich8lan   ich8lan;
         } dev_spec;
 };
diff --git a/drivers/net/e1000e/ich8lan.c b/drivers/net/e1000e/ich8lan.c
index 7b33be98a2ca..9b09246af064 100644
--- a/drivers/net/e1000e/ich8lan.c
+++ b/drivers/net/e1000e/ich8lan.c
@@ -2755,14 +2755,16 @@ static s32 e1000_setup_copper_link_ich8lan(struct e1000_hw *hw)
          * and increase the max iterations when polling the phy;
          * this fixes erroneous timeouts at 10Mbps.
          */
-        ret_val = e1000e_write_kmrn_reg(hw, GG82563_REG(0x34, 4), 0xFFFF);
+        ret_val = e1000e_write_kmrn_reg(hw, E1000_KMRNCTRLSTA_TIMEOUTS, 0xFFFF);
         if (ret_val)
                 return ret_val;
-        ret_val = e1000e_read_kmrn_reg(hw, GG82563_REG(0x34, 9), &reg_data);
+        ret_val = e1000e_read_kmrn_reg(hw, E1000_KMRNCTRLSTA_INBAND_PARAM,
+                                       &reg_data);
         if (ret_val)
                 return ret_val;
         reg_data |= 0x3F;
-        ret_val = e1000e_write_kmrn_reg(hw, GG82563_REG(0x34, 9), reg_data);
+        ret_val = e1000e_write_kmrn_reg(hw, E1000_KMRNCTRLSTA_INBAND_PARAM,
+                                        reg_data);
         if (ret_val)
                 return ret_val;
 
diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c
index c3105c5087e0..762b697ce731 100644
--- a/drivers/net/e1000e/netdev.c
+++ b/drivers/net/e1000e/netdev.c
@@ -4541,7 +4541,7 @@ static int __e1000_shutdown(struct pci_dev *pdev, bool *enable_wake)
                     e1000_media_type_internal_serdes) {
                         /* keep the laser running in D3 */
                         ctrl_ext = er32(CTRL_EXT);
-                        ctrl_ext |= E1000_CTRL_EXT_SDP7_DATA;
+                        ctrl_ext |= E1000_CTRL_EXT_SDP3_DATA;
                         ew32(CTRL_EXT, ctrl_ext);
                 }
 
diff --git a/drivers/net/fec_mpc52xx.c b/drivers/net/fec_mpc52xx.c
index 6407672b28e9..848e8407ea8f 100644
--- a/drivers/net/fec_mpc52xx.c
+++ b/drivers/net/fec_mpc52xx.c
@@ -85,11 +85,15 @@ MODULE_PARM_DESC(debug, "debugging messages level");
 
 static void mpc52xx_fec_tx_timeout(struct net_device *dev)
 {
+        struct mpc52xx_fec_priv *priv = netdev_priv(dev);
+        unsigned long flags;
+
         dev_warn(&dev->dev, "transmit timed out\n");
 
+        spin_lock_irqsave(&priv->lock, flags);
         mpc52xx_fec_reset(dev);
-
         dev->stats.tx_errors++;
+        spin_unlock_irqrestore(&priv->lock, flags);
 
         netif_wake_queue(dev);
 }
@@ -135,28 +139,32 @@ static void mpc52xx_fec_free_rx_buffers(struct net_device *dev, struct bcom_task
         }
 }
 
+static void
+mpc52xx_fec_rx_submit(struct net_device *dev, struct sk_buff *rskb)
+{
+        struct mpc52xx_fec_priv *priv = netdev_priv(dev);
+        struct bcom_fec_bd *bd;
+
+        bd = (struct bcom_fec_bd *) bcom_prepare_next_buffer(priv->rx_dmatsk);
+        bd->status = FEC_RX_BUFFER_SIZE;
+        bd->skb_pa = dma_map_single(dev->dev.parent, rskb->data,
+                                    FEC_RX_BUFFER_SIZE, DMA_FROM_DEVICE);
+        bcom_submit_next_buffer(priv->rx_dmatsk, rskb);
+}
+
 static int mpc52xx_fec_alloc_rx_buffers(struct net_device *dev, struct bcom_task *rxtsk)
 {
-        while (!bcom_queue_full(rxtsk)) {
-                struct sk_buff *skb;
-                struct bcom_fec_bd *bd;
+        struct sk_buff *skb;
 
+        while (!bcom_queue_full(rxtsk)) {
                 skb = dev_alloc_skb(FEC_RX_BUFFER_SIZE);
-                if (skb == NULL)
+                if (!skb)
                         return -EAGAIN;
 
                 /* zero out the initial receive buffers to aid debugging */
                 memset(skb->data, 0, FEC_RX_BUFFER_SIZE);
-
-                bd = (struct bcom_fec_bd *)bcom_prepare_next_buffer(rxtsk);
-
-                bd->status = FEC_RX_BUFFER_SIZE;
-                bd->skb_pa = dma_map_single(dev->dev.parent, skb->data,
-                                FEC_RX_BUFFER_SIZE, DMA_FROM_DEVICE);
-
-                bcom_submit_next_buffer(rxtsk, skb);
+                mpc52xx_fec_rx_submit(dev, skb);
         }
-
         return 0;
 }
 
@@ -328,13 +336,12 @@ static int mpc52xx_fec_start_xmit(struct sk_buff *skb, struct net_device *dev)
                                     DMA_TO_DEVICE);
 
         bcom_submit_next_buffer(priv->tx_dmatsk, skb);
+        spin_unlock_irqrestore(&priv->lock, flags);
 
         if (bcom_queue_full(priv->tx_dmatsk)) {
                 netif_stop_queue(dev);
         }
 
-        spin_unlock_irqrestore(&priv->lock, flags);
-
         return NETDEV_TX_OK;
 }
 
@@ -359,9 +366,9 @@ static irqreturn_t mpc52xx_fec_tx_interrupt(int irq, void *dev_id)
 {
         struct net_device *dev = dev_id;
         struct mpc52xx_fec_priv *priv = netdev_priv(dev);
+        unsigned long flags;
 
-        spin_lock(&priv->lock);
-
+        spin_lock_irqsave(&priv->lock, flags);
         while (bcom_buffer_done(priv->tx_dmatsk)) {
                 struct sk_buff *skb;
                 struct bcom_fec_bd *bd;
@@ -372,11 +379,10 @@ static irqreturn_t mpc52xx_fec_tx_interrupt(int irq, void *dev_id)
 
                 dev_kfree_skb_irq(skb);
         }
+        spin_unlock_irqrestore(&priv->lock, flags);
 
         netif_wake_queue(dev);
 
-        spin_unlock(&priv->lock);
-
         return IRQ_HANDLED;
 }
 
@@ -384,67 +390,60 @@ static irqreturn_t mpc52xx_fec_rx_interrupt(int irq, void *dev_id)
 {
         struct net_device *dev = dev_id;
         struct mpc52xx_fec_priv *priv = netdev_priv(dev);
+        struct sk_buff *rskb; /* received sk_buff */
+        struct sk_buff *skb;  /* new sk_buff to enqueue in its place */
+        struct bcom_fec_bd *bd;
+        u32 status, physaddr;
+        int length;
+        unsigned long flags;
+
+        spin_lock_irqsave(&priv->lock, flags);
 
         while (bcom_buffer_done(priv->rx_dmatsk)) {
-                struct sk_buff *skb;
-                struct sk_buff *rskb;
-                struct bcom_fec_bd *bd;
-                u32 status;
 
                 rskb = bcom_retrieve_buffer(priv->rx_dmatsk, &status,
-                                (struct bcom_bd **)&bd);
-                dma_unmap_single(dev->dev.parent, bd->skb_pa, rskb->len,
-                                 DMA_FROM_DEVICE);
+                                            (struct bcom_bd **)&bd);
+                physaddr = bd->skb_pa;
 
                 /* Test for errors in received frame */
                 if (status & BCOM_FEC_RX_BD_ERRORS) {
                         /* Drop packet and reuse the buffer */
-                        bd = (struct bcom_fec_bd *)
-                                bcom_prepare_next_buffer(priv->rx_dmatsk);
-
-                        bd->status = FEC_RX_BUFFER_SIZE;
-                        bd->skb_pa = dma_map_single(dev->dev.parent,
-                                        rskb->data,
-                                        FEC_RX_BUFFER_SIZE, DMA_FROM_DEVICE);
-
-                        bcom_submit_next_buffer(priv->rx_dmatsk, rskb);
-
+                        mpc52xx_fec_rx_submit(dev, rskb);
                         dev->stats.rx_dropped++;
-
                         continue;
                 }
 
                 /* skbs are allocated on open, so now we allocate a new one,
                  * and remove the old (with the packet) */
                 skb = dev_alloc_skb(FEC_RX_BUFFER_SIZE);
-                if (skb) {
-                        /* Process the received skb */
-                        int length = status & BCOM_FEC_RX_BD_LEN_MASK;
-
-                        skb_put(rskb, length - 4);      /* length without CRC32 */
-
-                        rskb->dev = dev;
-                        rskb->protocol = eth_type_trans(rskb, dev);
-
-                        netif_rx(rskb);
-                } else {
+                if (!skb) {
                         /* Can't get a new one : reuse the same & drop pkt */
-                        dev_notice(&dev->dev, "Memory squeeze, dropping packet.\n");
+                        dev_notice(&dev->dev, "Low memory - dropped packet.\n");
+                        mpc52xx_fec_rx_submit(dev, rskb);
                         dev->stats.rx_dropped++;
-
-                        skb = rskb;
+                        continue;
                 }
 
-                bd = (struct bcom_fec_bd *)
-                        bcom_prepare_next_buffer(priv->rx_dmatsk);
+                /* Enqueue the new sk_buff back on the hardware */
+                mpc52xx_fec_rx_submit(dev, skb);
 
-                bd->status = FEC_RX_BUFFER_SIZE;
-                bd->skb_pa = dma_map_single(dev->dev.parent, skb->data,
-                                FEC_RX_BUFFER_SIZE, DMA_FROM_DEVICE);
+                /* Process the received skb - Drop the spin lock while
+                 * calling into the network stack */
+                spin_unlock_irqrestore(&priv->lock, flags);
 
-                bcom_submit_next_buffer(priv->rx_dmatsk, skb);
+                dma_unmap_single(dev->dev.parent, physaddr, rskb->len,
+                                 DMA_FROM_DEVICE);
+                length = status & BCOM_FEC_RX_BD_LEN_MASK;
+                skb_put(rskb, length - 4);      /* length without CRC32 */
+                rskb->dev = dev;
+                rskb->protocol = eth_type_trans(rskb, dev);
+                netif_rx(rskb);
+
+                spin_lock_irqsave(&priv->lock, flags);
         }
 
+        spin_unlock_irqrestore(&priv->lock, flags);
+
         return IRQ_HANDLED;
 }
 
@@ -454,6 +453,7 @@ static irqreturn_t mpc52xx_fec_interrupt(int irq, void *dev_id)
         struct mpc52xx_fec_priv *priv = netdev_priv(dev);
         struct mpc52xx_fec __iomem *fec = priv->fec;
         u32 ievent;
+        unsigned long flags;
 
         ievent = in_be32(&fec->ievent);
 
@@ -471,9 +471,10 @@ static irqreturn_t mpc52xx_fec_interrupt(int irq, void *dev_id)
                 if (net_ratelimit() && (ievent & FEC_IEVENT_XFIFO_ERROR))
                         dev_warn(&dev->dev, "FEC_IEVENT_XFIFO_ERROR\n");
 
+                spin_lock_irqsave(&priv->lock, flags);
                 mpc52xx_fec_reset(dev);
+                spin_unlock_irqrestore(&priv->lock, flags);
 
-                netif_wake_queue(dev);
                 return IRQ_HANDLED;
         }
 
@@ -768,6 +769,8 @@ static void mpc52xx_fec_reset(struct net_device *dev)
         bcom_enable(priv->tx_dmatsk);
 
         mpc52xx_fec_start(dev);
+
+        netif_wake_queue(dev);
 }
 
 
diff --git a/drivers/net/gianfar.c b/drivers/net/gianfar.c
index 16def131c390..6850dc0a7b91 100644
--- a/drivers/net/gianfar.c
+++ b/drivers/net/gianfar.c
@@ -2644,6 +2644,7 @@ static void gfar_netpoll(struct net_device *dev)
                         gfar_interrupt(priv->gfargrp[i].interruptTransmit,
                                                 &priv->gfargrp[i]);
                         enable_irq(priv->gfargrp[i].interruptTransmit);
+                }
         }
 }
 #endif
diff --git a/drivers/net/igb/igb_main.c b/drivers/net/igb/igb_main.c
index 16349ba68736..78963a0e128d 100644
--- a/drivers/net/igb/igb_main.c
+++ b/drivers/net/igb/igb_main.c
@@ -4608,8 +4608,14 @@ static void igb_rcv_msg_from_vf(struct igb_adapter *adapter, u32 vf)
 
         retval = igb_read_mbx(hw, msgbuf, E1000_VFMAILBOX_SIZE, vf);
 
-        if (retval)
+        if (retval) {
+                /* if receive failed revoke VF CTS stats and restart init */
                 dev_err(&pdev->dev, "Error receiving message from VF\n");
+                vf_data->flags &= ~IGB_VF_FLAG_CTS;
+                if (!time_after(jiffies, vf_data->last_nack + (2 * HZ)))
+                        return;
+                goto out;
+        }
 
         /* this is a message we already processed, do nothing */
         if (msgbuf[0] & (E1000_VT_MSGTYPE_ACK | E1000_VT_MSGTYPE_NACK))
@@ -4626,12 +4632,10 @@ static void igb_rcv_msg_from_vf(struct igb_adapter *adapter, u32 vf)
         }
 
         if (!(vf_data->flags & IGB_VF_FLAG_CTS)) {
-                msgbuf[0] = E1000_VT_MSGTYPE_NACK;
-                if (time_after(jiffies, vf_data->last_nack + (2 * HZ))) {
-                        igb_write_mbx(hw, msgbuf, 1, vf);
-                        vf_data->last_nack = jiffies;
-                }
-                return;
+                if (!time_after(jiffies, vf_data->last_nack + (2 * HZ)))
+                        return;
+                retval = -1;
+                goto out;
         }
 
         switch ((msgbuf[0] & 0xFFFF)) {
@@ -4656,14 +4660,14 @@ static void igb_rcv_msg_from_vf(struct igb_adapter *adapter, u32 vf)
                 break;
         }
 
+        msgbuf[0] |= E1000_VT_MSGTYPE_CTS;
+out:
         /* notify the VF of the results of what it sent us */
         if (retval)
                 msgbuf[0] |= E1000_VT_MSGTYPE_NACK;
         else
                 msgbuf[0] |= E1000_VT_MSGTYPE_ACK;
 
-        msgbuf[0] |= E1000_VT_MSGTYPE_CTS;
-
         igb_write_mbx(hw, msgbuf, 1, vf);
 }
 
diff --git a/drivers/net/igbvf/igbvf.h b/drivers/net/igbvf/igbvf.h
index 3d1ee7a8478e..a1774b29d222 100644
--- a/drivers/net/igbvf/igbvf.h
+++ b/drivers/net/igbvf/igbvf.h
@@ -276,6 +276,7 @@ struct igbvf_adapter {
         unsigned long led_status;
 
         unsigned int flags;
+        unsigned long last_reset;
 };
 
 struct igbvf_info {
diff --git a/drivers/net/igbvf/netdev.c b/drivers/net/igbvf/netdev.c
index a127620dc653..e9dd95f136aa 100644
--- a/drivers/net/igbvf/netdev.c
+++ b/drivers/net/igbvf/netdev.c
@@ -1469,6 +1469,8 @@ static void igbvf_reset(struct igbvf_adapter *adapter)
                 memcpy(netdev->perm_addr, adapter->hw.mac.addr,
                        netdev->addr_len);
         }
+
+        adapter->last_reset = jiffies;
 }
 
 int igbvf_up(struct igbvf_adapter *adapter)
@@ -1812,11 +1814,15 @@ static bool igbvf_has_link(struct igbvf_adapter *adapter)
         s32 ret_val = E1000_SUCCESS;
         bool link_active;
 
+        /* If interface is down, stay link down */
+        if (test_bit(__IGBVF_DOWN, &adapter->state))
+                return false;
+
         ret_val = hw->mac.ops.check_for_link(hw);
         link_active = !hw->mac.get_link_status;
 
         /* if check for link returns error we will need to reset */
-        if (ret_val)
+        if (ret_val && time_after(jiffies, adapter->last_reset + (10 * HZ)))
                 schedule_work(&adapter->reset_task);
 
         return link_active;
diff --git a/drivers/net/ixgbe/ixgbe_82599.c b/drivers/net/ixgbe/ixgbe_82599.c
index 72106898a5cb..538340527aa6 100644
--- a/drivers/net/ixgbe/ixgbe_82599.c
+++ b/drivers/net/ixgbe/ixgbe_82599.c
@@ -342,6 +342,7 @@ static enum ixgbe_media_type ixgbe_get_media_type_82599(struct ixgbe_hw *hw)
         case IXGBE_DEV_ID_82599_KX4:
         case IXGBE_DEV_ID_82599_KX4_MEZZ:
         case IXGBE_DEV_ID_82599_COMBO_BACKPLANE:
+        case IXGBE_DEV_ID_82599_KR:
         case IXGBE_DEV_ID_82599_XAUI_LOM:
                 /* Default device ID is mezzanine card KX/KX4 */
                 media_type = ixgbe_media_type_backplane;
diff --git a/drivers/net/ixgbe/ixgbe_ethtool.c b/drivers/net/ixgbe/ixgbe_ethtool.c
index 06a9d18bbdbc..0bd49d3b9f65 100644
--- a/drivers/net/ixgbe/ixgbe_ethtool.c
+++ b/drivers/net/ixgbe/ixgbe_ethtool.c
@@ -990,6 +990,7 @@ static void ixgbe_get_ethtool_stats(struct net_device *netdev,
         char *p = NULL;
 
         ixgbe_update_stats(adapter);
+        dev_get_stats(netdev);
         for (i = 0; i < IXGBE_GLOBAL_STATS_LEN; i++) {
                 switch (ixgbe_gstrings_stats[i].type) {
                 case NETDEV_STATS:
diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c
index 247ed2a24769..35ea8c93fd80 100644
--- a/drivers/net/ixgbe/ixgbe_main.c
+++ b/drivers/net/ixgbe/ixgbe_main.c
@@ -96,6 +96,8 @@ static struct pci_device_id ixgbe_pci_tbl[] = {
          board_82599 },
         {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599_XAUI_LOM),
          board_82599 },
+        {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599_KR),
+         board_82599 },
         {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599_SFP),
          board_82599 },
         {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599_SFP_EM),
@@ -435,8 +437,6 @@ static bool ixgbe_clean_tx_irq(struct ixgbe_q_vector *q_vector,
         tx_ring->total_packets += total_packets;
         tx_ring->stats.packets += total_packets;
         tx_ring->stats.bytes += total_bytes;
-        netdev->stats.tx_bytes += total_bytes;
-        netdev->stats.tx_packets += total_packets;
         return (count < tx_ring->work_limit);
 }
 
@@ -5327,6 +5327,7 @@ static netdev_tx_t ixgbe_xmit_frame(struct sk_buff *skb,
 {
         struct ixgbe_adapter *adapter = netdev_priv(netdev);
         struct ixgbe_ring *tx_ring;
+        struct netdev_queue *txq;
         unsigned int first;
         unsigned int tx_flags = 0;
         u8 hdr_len = 0;
@@ -5424,6 +5425,9 @@ static netdev_tx_t ixgbe_xmit_frame(struct sk_buff *skb,
                                 tx_ring->atr_count = 0;
                         }
                 }
+                txq = netdev_get_tx_queue(netdev, tx_ring->queue_index);
+                txq->tx_bytes += skb->len;
+                txq->tx_packets++;
                 ixgbe_tx_queue(adapter, tx_ring, tx_flags, count, skb->len,
                                hdr_len);
                 ixgbe_maybe_stop_tx(netdev, tx_ring, DESC_NEEDED);
@@ -5438,19 +5442,6 @@ static netdev_tx_t ixgbe_xmit_frame(struct sk_buff *skb,
 }
 
 /**
- * ixgbe_get_stats - Get System Network Statistics
- * @netdev: network interface device structure
- *
- * Returns the address of the device statistics structure.
- * The statistics are actually updated from the timer callback.
- **/
-static struct net_device_stats *ixgbe_get_stats(struct net_device *netdev)
-{
-        /* only return the current stats */
-        return &netdev->stats;
-}
-
-/**
  * ixgbe_set_mac - Change the Ethernet Address of the NIC
  * @netdev: network interface device structure
  * @p: pointer to an address structure
@@ -5580,7 +5571,6 @@ static const struct net_device_ops ixgbe_netdev_ops = {
         .ndo_stop               = ixgbe_close,
         .ndo_start_xmit         = ixgbe_xmit_frame,
         .ndo_select_queue       = ixgbe_select_queue,
-        .ndo_get_stats          = ixgbe_get_stats,
         .ndo_set_rx_mode        = ixgbe_set_rx_mode,
         .ndo_set_multicast_list = ixgbe_set_rx_mode,
         .ndo_validate_addr      = eth_validate_addr,
diff --git a/drivers/net/ixgbe/ixgbe_type.h b/drivers/net/ixgbe/ixgbe_type.h
index 21b6633da578..f3e8d52610b7 100644
--- a/drivers/net/ixgbe/ixgbe_type.h
+++ b/drivers/net/ixgbe/ixgbe_type.h
@@ -50,6 +50,7 @@
 #define IXGBE_DEV_ID_82598EB_XF_LR       0x10F4
 #define IXGBE_DEV_ID_82599_KX4           0x10F7
 #define IXGBE_DEV_ID_82599_KX4_MEZZ      0x1514
+#define IXGBE_DEV_ID_82599_KR            0x1517
 #define IXGBE_DEV_ID_82599_CX4           0x10F9
 #define IXGBE_DEV_ID_82599_SFP           0x10FB
 #define IXGBE_DEV_ID_82599_SFP_EM        0x1507
diff --git a/drivers/net/mlx4/sense.c b/drivers/net/mlx4/sense.c
index f36ae691cab3..015fbe785c13 100644
--- a/drivers/net/mlx4/sense.c
+++ b/drivers/net/mlx4/sense.c
@@ -53,7 +53,7 @@ static int mlx4_SENSE_PORT(struct mlx4_dev *dev, int port,
 
         if (out_param > 2) {
                 mlx4_err(dev, "Sense returned illegal value: 0x%llx\n", out_param);
-                return EINVAL;
+                return -EINVAL;
         }
 
         *type = out_param;
diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c
index 796a493f95ab..1405a170bb43 100644
--- a/drivers/net/mv643xx_eth.c
+++ b/drivers/net/mv643xx_eth.c
@@ -1827,6 +1827,9 @@ static int mv643xx_eth_set_mac_address(struct net_device *dev, void *addr)
 {
         struct sockaddr *sa = addr;
 
+        if (!is_valid_ether_addr(sa->sa_data))
+                return -EINVAL;
+
         memcpy(dev->dev_addr, sa->sa_data, ETH_ALEN);
 
         netif_addr_lock_bh(dev);
diff --git a/drivers/net/myri10ge/myri10ge.c b/drivers/net/myri10ge/myri10ge.c
index d38921906bb7..3fcb1c356e0d 100644
--- a/drivers/net/myri10ge/myri10ge.c
+++ b/drivers/net/myri10ge/myri10ge.c
@@ -75,7 +75,7 @@
 #include "myri10ge_mcp.h"
 #include "myri10ge_mcp_gen_header.h"
 
-#define MYRI10GE_VERSION_STR "1.5.1-1.451"
+#define MYRI10GE_VERSION_STR "1.5.1-1.453"
 
 MODULE_DESCRIPTION("Myricom 10G driver (10GbE)");
 MODULE_AUTHOR("Maintainer: help@myri.com");
@@ -347,7 +347,7 @@ static int myri10ge_max_slices = 1;
 module_param(myri10ge_max_slices, int, S_IRUGO);
 MODULE_PARM_DESC(myri10ge_max_slices, "Max tx/rx queues");
 
-static int myri10ge_rss_hash = MXGEFW_RSS_HASH_TYPE_SRC_PORT;
+static int myri10ge_rss_hash = MXGEFW_RSS_HASH_TYPE_SRC_DST_PORT;
 module_param(myri10ge_rss_hash, int, S_IRUGO);
 MODULE_PARM_DESC(myri10ge_rss_hash, "Type of RSS hashing to do");
 
diff --git a/drivers/net/netxen/netxen_nic_init.c b/drivers/net/netxen/netxen_nic_init.c
index 80a667460514..02f8d4b4db63 100644
--- a/drivers/net/netxen/netxen_nic_init.c
+++ b/drivers/net/netxen/netxen_nic_init.c
@@ -619,17 +619,20 @@ nx_set_product_offs(struct netxen_adapter *adapter)
         uint32_t i;
         __le32 entries;
 
+        int mn_present = (NX_IS_REVISION_P2(adapter->ahw.revision_id)) ?
+                        1 : netxen_p3_has_mn(adapter);
+
         ptab_descr = nx_get_table_desc(unirom, NX_UNI_DIR_SECT_PRODUCT_TBL);
         if (ptab_descr == NULL)
                 return -1;
 
         entries = cpu_to_le32(ptab_descr->num_entries);
 
+nomn:
         for (i = 0; i < entries; i++) {
 
                 __le32 flags, file_chiprev, offs;
                 u8 chiprev = adapter->ahw.revision_id;
-                int mn_present = netxen_p3_has_mn(adapter);
                 uint32_t flagbit;
 
                 offs = cpu_to_le32(ptab_descr->findex) +
@@ -647,6 +650,11 @@ nx_set_product_offs(struct netxen_adapter *adapter)
                 }
         }
 
+        if (mn_present && NX_IS_REVISION_P3(adapter->ahw.revision_id)) {
+                mn_present = 0;
+                goto nomn;
+        }
+
         return -1;
 }
 
@@ -1021,6 +1029,10 @@ netxen_p3_has_mn(struct netxen_adapter *adapter)
         u32 capability, flashed_ver;
         capability = 0;
 
+        /* NX2031 always had MN */
+        if (NX_IS_REVISION_P2(adapter->ahw.revision_id))
+                return 1;
+
         netxen_rom_fast_read(adapter,
                         NX_FW_VERSION_OFFSET, (int *)&flashed_ver);
         flashed_ver = NETXEN_DECODE_VERSION(flashed_ver);
diff --git a/drivers/net/netxen/netxen_nic_main.c b/drivers/net/netxen/netxen_nic_main.c
index e5d187fce51b..f4996846a234 100644
--- a/drivers/net/netxen/netxen_nic_main.c
+++ b/drivers/net/netxen/netxen_nic_main.c
@@ -946,8 +946,9 @@ netxen_nic_init_coalesce_defaults(struct netxen_adapter *adapter)
                 NETXEN_DEFAULT_INTR_COALESCE_TX_PACKETS;
 }
 
+/* with rtnl_lock */
 static int
-netxen_nic_up(struct netxen_adapter *adapter, struct net_device *netdev)
+__netxen_nic_up(struct netxen_adapter *adapter, struct net_device *netdev)
 {
         int err;
 
@@ -988,14 +989,32 @@ netxen_nic_up(struct netxen_adapter *adapter, struct net_device *netdev)
         return 0;
 }
 
+/* Usage: During resume and firmware recovery module.*/
+
+static inline int
+netxen_nic_up(struct netxen_adapter *adapter, struct net_device *netdev)
+{
+        int err = 0;
+
+        rtnl_lock();
+        if (netif_running(netdev))
+                err = __netxen_nic_up(adapter, netdev);
+        rtnl_unlock();
+
+        return err;
+}
+
+/* with rtnl_lock */
 static void
-netxen_nic_down(struct netxen_adapter *adapter, struct net_device *netdev)
+__netxen_nic_down(struct netxen_adapter *adapter, struct net_device *netdev)
 {
         if (adapter->is_up != NETXEN_ADAPTER_UP_MAGIC)
                 return;
 
-        clear_bit(__NX_DEV_UP, &adapter->state);
+        if (!test_and_clear_bit(__NX_DEV_UP, &adapter->state))
+                return;
 
+        smp_mb();
         spin_lock(&adapter->tx_clean_lock);
         netif_carrier_off(netdev);
         netif_tx_disable(netdev);
@@ -1014,6 +1033,17 @@ netxen_nic_down(struct netxen_adapter *adapter, struct net_device *netdev)
         spin_unlock(&adapter->tx_clean_lock);
 }
 
+/* Usage: During suspend and firmware recovery module */
+
+static inline void
+netxen_nic_down(struct netxen_adapter *adapter, struct net_device *netdev)
+{
+        rtnl_lock();
+        if (netif_running(netdev))
+                __netxen_nic_down(adapter, netdev);
+        rtnl_unlock();
+
+}
 
 static int
 netxen_nic_attach(struct netxen_adapter *adapter)
@@ -1122,14 +1152,14 @@ netxen_nic_reset_context(struct netxen_adapter *adapter)
                 netif_device_detach(netdev);
 
                 if (netif_running(netdev))
-                        netxen_nic_down(adapter, netdev);
+                        __netxen_nic_down(adapter, netdev);
 
                 netxen_nic_detach(adapter);
 
                 if (netif_running(netdev)) {
                         err = netxen_nic_attach(adapter);
                         if (!err)
-                                err = netxen_nic_up(adapter, netdev);
+                                err = __netxen_nic_up(adapter, netdev);
 
                         if (err)
                                 goto done;
@@ -1499,7 +1529,7 @@ static int netxen_nic_open(struct net_device *netdev)
         if (err)
                 return err;
 
-        err = netxen_nic_up(adapter, netdev);
+        err = __netxen_nic_up(adapter, netdev);
         if (err)
                 goto err_out;
 
@@ -1519,7 +1549,7 @@ static int netxen_nic_close(struct net_device *netdev)
 {
         struct netxen_adapter *adapter = netdev_priv(netdev);
 
-        netxen_nic_down(adapter, netdev);
+        __netxen_nic_down(adapter, netdev);
         return 0;
 }
 
@@ -2025,7 +2055,7 @@ static int netxen_nic_poll(struct napi_struct *napi, int budget)
 
         if ((work_done < budget) && tx_complete) {
                 napi_complete(&sds_ring->napi);
-                if (netif_running(adapter->netdev))
+                if (test_bit(__NX_DEV_UP, &adapter->state))
                         netxen_nic_enable_int(sds_ring);
         }
 
@@ -2210,8 +2240,7 @@ netxen_detach_work(struct work_struct *work)
 
         netif_device_detach(netdev);
 
-        if (netif_running(netdev))
-                netxen_nic_down(adapter, netdev);
+        netxen_nic_down(adapter, netdev);
 
         netxen_nic_detach(adapter);
 
diff --git a/drivers/net/pcmcia/3c574_cs.c b/drivers/net/pcmcia/3c574_cs.c
index 17a27225cc98..98938ea9e0bd 100644
--- a/drivers/net/pcmcia/3c574_cs.c
+++ b/drivers/net/pcmcia/3c574_cs.c
@@ -912,7 +912,11 @@ static void media_check(unsigned long arg)
         if ((inw(ioaddr + EL3_STATUS) & IntLatch) && (inb(ioaddr + Timer) == 0xff)) {
                 if (!lp->fast_poll)
                         printk(KERN_INFO "%s: interrupt(s) dropped!\n", dev->name);
+
+                local_irq_save(flags);
                 el3_interrupt(dev->irq, dev);
+                local_irq_restore(flags);
+
                 lp->fast_poll = HZ;
         }
         if (lp->fast_poll) {
diff --git a/drivers/net/pcmcia/3c589_cs.c b/drivers/net/pcmcia/3c589_cs.c
index 6f8d7e2e5922..322e11df0097 100644
--- a/drivers/net/pcmcia/3c589_cs.c
+++ b/drivers/net/pcmcia/3c589_cs.c
@@ -711,7 +711,11 @@ static void media_check(unsigned long arg)
         (inb(ioaddr + EL3_TIMER) == 0xff)) {
         if (!lp->fast_poll)
             printk(KERN_WARNING "%s: interrupt(s) dropped!\n", dev->name);
+
+        local_irq_save(flags);
         el3_interrupt(dev->irq, dev);
+        local_irq_restore(flags);
+
         lp->fast_poll = HZ;
     }
     if (lp->fast_poll) {
diff --git a/drivers/net/sfc/selftest.c b/drivers/net/sfc/selftest.c
index 14949bb303a0..af3933579790 100644
--- a/drivers/net/sfc/selftest.c
+++ b/drivers/net/sfc/selftest.c
@@ -47,7 +47,7 @@ static const unsigned char payload_source[ETH_ALEN] = {
         0x00, 0x0f, 0x53, 0x1b, 0x1b, 0x1b,
 };
 
-static const char *payload_msg =
+static const char payload_msg[] =
         "Hello world! This is an Efx loopback test in progress!";
 
 /**
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c
index 044e6817986f..1c01b96c9611 100644
--- a/drivers/net/sky2.c
+++ b/drivers/net/sky2.c
@@ -644,7 +644,6 @@ static void sky2_phy_power_up(struct sky2_hw *hw, unsigned port)
 {
         u32 reg1;
 
-        sky2_write8(hw, B2_TST_CTRL1, TST_CFG_WRITE_ON);
         reg1 = sky2_pci_read32(hw, PCI_DEV_REG1);
         reg1 &= ~phy_power[port];
 
@@ -652,7 +651,6 @@ static void sky2_phy_power_up(struct sky2_hw *hw, unsigned port)
                 reg1 |= coma_mode[port];
 
         sky2_pci_write32(hw, PCI_DEV_REG1, reg1);
-        sky2_write8(hw, B2_TST_CTRL1, TST_CFG_WRITE_OFF);
         sky2_pci_read32(hw, PCI_DEV_REG1);
 
         if (hw->chip_id == CHIP_ID_YUKON_FE)
@@ -709,11 +707,9 @@ static void sky2_phy_power_down(struct sky2_hw *hw, unsigned port)
                 gm_phy_write(hw, port, PHY_MARV_CTRL, PHY_CT_PDOWN);
         }
 
-        sky2_write8(hw, B2_TST_CTRL1, TST_CFG_WRITE_ON);
         reg1 = sky2_pci_read32(hw, PCI_DEV_REG1);
         reg1 |= phy_power[port];                /* set PHY to PowerDown/COMA Mode */
         sky2_pci_write32(hw, PCI_DEV_REG1, reg1);
-        sky2_write8(hw, B2_TST_CTRL1, TST_CFG_WRITE_OFF);
 }
 
 /* Force a renegotiation */
@@ -2643,7 +2639,6 @@ static void sky2_hw_intr(struct sky2_hw *hw)
         if (status & (Y2_IS_MST_ERR | Y2_IS_IRQ_STAT)) {
                 u16 pci_err;
 
-                sky2_write8(hw, B2_TST_CTRL1, TST_CFG_WRITE_ON);
                 pci_err = sky2_pci_read16(hw, PCI_STATUS);
                 if (net_ratelimit())
                         dev_err(&pdev->dev, "PCI hardware error (0x%x)\n",
@@ -2651,14 +2646,12 @@ static void sky2_hw_intr(struct sky2_hw *hw)
 
                 sky2_pci_write16(hw, PCI_STATUS,
                                       pci_err | PCI_STATUS_ERROR_BITS);
-                sky2_write8(hw, B2_TST_CTRL1, TST_CFG_WRITE_OFF);
         }
 
         if (status & Y2_IS_PCI_EXP) {
                 /* PCI-Express uncorrectable Error occurred */
                 u32 err;
 
-                sky2_write8(hw, B2_TST_CTRL1, TST_CFG_WRITE_ON);
                 err = sky2_read32(hw, Y2_CFG_AER + PCI_ERR_UNCOR_STATUS);
                 sky2_write32(hw, Y2_CFG_AER + PCI_ERR_UNCOR_STATUS,
                              0xfffffffful);
@@ -2666,7 +2659,6 @@ static void sky2_hw_intr(struct sky2_hw *hw)
                         dev_err(&pdev->dev, "PCI Express error (0x%x)\n", err);
 
                 sky2_read32(hw, Y2_CFG_AER + PCI_ERR_UNCOR_STATUS);
-                sky2_write8(hw, B2_TST_CTRL1, TST_CFG_WRITE_OFF);
         }
 
         if (status & Y2_HWE_L1_MASK)
@@ -2968,8 +2960,13 @@ static int __devinit sky2_init(struct sky2_hw *hw)
                 break;
 
         case CHIP_ID_YUKON_UL_2:
+                hw->flags = SKY2_HW_GIGABIT
+                        | SKY2_HW_ADV_POWER_CTL;
+                break;
+
         case CHIP_ID_YUKON_OPT:
                 hw->flags = SKY2_HW_GIGABIT
+                        | SKY2_HW_NEW_LE
                         | SKY2_HW_ADV_POWER_CTL;
                 break;
 
@@ -3040,7 +3037,6 @@ static void sky2_reset(struct sky2_hw *hw)
         }
 
         sky2_power_on(hw);
-        sky2_write8(hw, B2_TST_CTRL1, TST_CFG_WRITE_OFF);
 
         for (i = 0; i < hw->ports; i++) {
                 sky2_write8(hw, SK_REG(i, GMAC_LINK_CTRL), GMLC_RST_SET);
@@ -4521,7 +4517,7 @@ static const char *sky2_name(u8 chipid, char *buf, int sz)
                 "Optima",       /* 0xbc */
         };
 
-        if (chipid >= CHIP_ID_YUKON_XL && chipid < CHIP_ID_YUKON_OPT)
+        if (chipid >= CHIP_ID_YUKON_XL && chipid <= CHIP_ID_YUKON_OPT)
                 strncpy(buf, name[chipid - CHIP_ID_YUKON_XL], sz);
         else
                 snprintf(buf, sz, "(chip %#x)", chipid);
diff --git a/drivers/net/smc91x.c b/drivers/net/smc91x.c
index ae4983a5127d..ea4fae79d6ec 100644
--- a/drivers/net/smc91x.c
+++ b/drivers/net/smc91x.c
@@ -534,9 +534,9 @@ static inline void  smc_rcv(struct net_device *dev)
 #define smc_special_lock(lock, flags)           spin_lock_irqsave(lock, flags)
 #define smc_special_unlock(lock, flags)         spin_unlock_irqrestore(lock, flags)
 #else
-#define smc_special_trylock(lock, flags)        (1)
-#define smc_special_lock(lock, flags)           do { } while (0)
-#define smc_special_unlock(lock, flags) do { } while (0)
+#define smc_special_trylock(lock, flags)        (flags == flags)
+#define smc_special_lock(lock, flags)           do { flags = 0; } while (0)
+#define smc_special_unlock(lock, flags) do { flags = 0; } while (0)
 #endif
 
 /*
@@ -2387,7 +2387,7 @@ static int smc_drv_resume(struct device *dev)
 
         if (ndev) {
                 struct smc_local *lp = netdev_priv(ndev);
-                smc_enable_device(dev);
+                smc_enable_device(pdev);
                 if (netif_running(ndev)) {
                         smc_reset(ndev);
                         smc_enable(ndev);
diff --git a/drivers/net/usb/kaweth.c b/drivers/net/usb/kaweth.c
index 3b80e8d2d621..f1d64ef67efa 100644
--- a/drivers/net/usb/kaweth.c
+++ b/drivers/net/usb/kaweth.c
@@ -716,7 +716,7 @@ static int kaweth_open(struct net_device *net)
         return 0;
 
 err_out:
-        usb_autopm_enable(kaweth->intf);
+        usb_autopm_put_interface(kaweth->intf);
         return -EIO;
 }
 
@@ -753,7 +753,7 @@ static int kaweth_close(struct net_device *net)
 
         kaweth->status &= ~KAWETH_STATUS_CLOSING;
 
-        usb_autopm_enable(kaweth->intf);
+        usb_autopm_put_interface(kaweth->intf);
 
         return 0;
 }
diff --git a/drivers/net/usb/rtl8150.c b/drivers/net/usb/rtl8150.c
index b091e20ca167..f14d225404da 100644
--- a/drivers/net/usb/rtl8150.c
+++ b/drivers/net/usb/rtl8150.c
@@ -324,7 +324,7 @@ static int rtl8150_set_mac_address(struct net_device *netdev, void *p)
                 dbg("%02X:", netdev->dev_addr[i]);
         dbg("%02X\n", netdev->dev_addr[i]);
         /* Set the IDR registers. */
-        set_registers(dev, IDR, sizeof(netdev->dev_addr), netdev->dev_addr);
+        set_registers(dev, IDR, netdev->addr_len, netdev->dev_addr);
 #ifdef EEPROM_WRITE
         {
         u8 cr;
diff --git a/drivers/net/wireless/ath/ath5k/eeprom.c b/drivers/net/wireless/ath/ath5k/eeprom.c
index 81ea52c4faff..5d1c8677f180 100644
--- a/drivers/net/wireless/ath/ath5k/eeprom.c
+++ b/drivers/net/wireless/ath/ath5k/eeprom.c
@@ -97,6 +97,7 @@ ath5k_eeprom_init_header(struct ath5k_hw *ah)
         struct ath5k_eeprom_info *ee = &ah->ah_capabilities.cap_eeprom;
         int ret;
         u16 val;
+        u32 cksum, offset;
 
         /*
          * Read values from EEPROM and store them in the capability structure
@@ -111,7 +112,6 @@ ath5k_eeprom_init_header(struct ath5k_hw *ah)
         if (ah->ah_ee_version < AR5K_EEPROM_VERSION_3_0)
                 return 0;
 
-#ifdef notyet
         /*
          * Validate the checksum of the EEPROM date. There are some
          * devices with invalid EEPROMs.
@@ -124,7 +124,6 @@ ath5k_eeprom_init_header(struct ath5k_hw *ah)
                 ATH5K_ERR(ah->ah_sc, "Invalid EEPROM checksum 0x%04x\n", cksum);
                 return -EIO;
         }
-#endif
 
         AR5K_EEPROM_READ_HDR(AR5K_EEPROM_ANT_GAIN(ah->ah_ee_version),
             ee_ant_gain);
diff --git a/drivers/net/wireless/ath/ath5k/led.c b/drivers/net/wireless/ath/ath5k/led.c
index d495890355d9..60f547503d75 100644
--- a/drivers/net/wireless/ath/ath5k/led.c
+++ b/drivers/net/wireless/ath/ath5k/led.c
@@ -79,6 +79,8 @@ static const struct pci_device_id ath5k_led_devices[] = {
         { ATH_SDEVICE(PCI_VENDOR_ID_HP, 0x0137b), ATH_LED(3, 1) },
         /* IBM-specific AR5212 (all others) */
         { PCI_VDEVICE(ATHEROS, PCI_DEVICE_ID_ATHEROS_AR5212_IBM), ATH_LED(0, 0) },
+        /* Dell Vostro A860 (shahar@shahar-or.co.il) */
+        { ATH_SDEVICE(PCI_VENDOR_ID_QMI, 0x0112), ATH_LED(3, 0) },
         { }
 };
 
diff --git a/drivers/net/wireless/ath/ath9k/xmit.c b/drivers/net/wireless/ath/ath9k/xmit.c
index 564c6cb1c2b4..2a11cc57ceea 100644
--- a/drivers/net/wireless/ath/ath9k/xmit.c
+++ b/drivers/net/wireless/ath/ath9k/xmit.c
@@ -2078,7 +2078,7 @@ static void ath_tx_processq(struct ath_softc *sc, struct ath_txq *txq)
                                 &txq->axq_q, lastbf->list.prev);
 
                 txq->axq_depth--;
-                txok = (ds->ds_txstat.ts_status == 0);
+                txok = !(ds->ds_txstat.ts_status & ATH9K_TXERR_FILT);
                 txq->axq_tx_inprogress = false;
                 spin_unlock_bh(&txq->axq_lock);
 
diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c
index 71e5c996bd09..4c41cfe44f26 100644
--- a/drivers/net/wireless/b43/main.c
+++ b/drivers/net/wireless/b43/main.c
@@ -1784,7 +1784,10 @@ static void b43_do_interrupt_thread(struct b43_wldev *dev)
                                dma_reason[0], dma_reason[1],
                                dma_reason[2], dma_reason[3],
                                dma_reason[4], dma_reason[5]);
-                        b43_controller_restart(dev, "DMA error");
+                        b43err(dev->wl, "This device does not support DMA "
+                               "on your system. Please use PIO instead.\n");
+                        b43err(dev->wl, "CONFIG_B43_FORCE_PIO must be set in "
+                               "your kernel configuration.\n");
                         return;
                 }
                 if (merged_dma_reason & B43_DMAIRQ_NONFATALMASK) {
diff --git a/drivers/net/wireless/iwlwifi/iwl-tx.c b/drivers/net/wireless/iwlwifi/iwl-tx.c
index 58b132f9cf28..00da5e152d46 100644
--- a/drivers/net/wireless/iwlwifi/iwl-tx.c
+++ b/drivers/net/wireless/iwlwifi/iwl-tx.c
@@ -1353,7 +1353,7 @@ int iwl_tx_agg_stop(struct iwl_priv *priv , const u8 *ra, u16 tid)
         if (priv->stations[sta_id].tid[tid].agg.state ==
                                 IWL_EMPTYING_HW_QUEUE_ADDBA) {
                 IWL_DEBUG_HT(priv, "AGG stop before setup done\n");
-                ieee80211_stop_tx_ba_cb_irqsafe(priv->hw, ra, tid);
+                ieee80211_stop_tx_ba_cb_irqsafe(priv->vif, ra, tid);
                 priv->stations[sta_id].tid[tid].agg.state = IWL_AGG_OFF;
                 return 0;
         }
diff --git a/drivers/net/wireless/mwl8k.c b/drivers/net/wireless/mwl8k.c
index 0cb5ecc822a8..59d49159cf2a 100644
--- a/drivers/net/wireless/mwl8k.c
+++ b/drivers/net/wireless/mwl8k.c
@@ -84,7 +84,8 @@ struct rxd_ops {
         int rxd_size;
         void (*rxd_init)(void *rxd, dma_addr_t next_dma_addr);
         void (*rxd_refill)(void *rxd, dma_addr_t addr, int len);
-        int (*rxd_process)(void *rxd, struct ieee80211_rx_status *status);
+        int (*rxd_process)(void *rxd, struct ieee80211_rx_status *status,
+                           __le16 *qos);
 };
 
 struct mwl8k_device_info {
@@ -184,7 +185,7 @@ struct mwl8k_priv {
         /* PHY parameters */
         struct ieee80211_supported_band band;
         struct ieee80211_channel channels[14];
-        struct ieee80211_rate rates[13];
+        struct ieee80211_rate rates[14];
 
         bool radio_on;
         bool radio_short_preamble;
@@ -220,15 +221,6 @@ struct mwl8k_vif {
         u8      bssid[ETH_ALEN];
         u8      mac_addr[ETH_ALEN];
 
-        /*
-         * Subset of supported legacy rates.
-         * Intersection of AP and STA supported rates.
-         */
-        struct ieee80211_rate legacy_rates[13];
-
-        /* number of supported legacy rates */
-        u8      legacy_nrates;
-
          /* Index into station database.Returned by update_sta_db call */
         u8      peer_id;
 
@@ -266,6 +258,11 @@ static const struct ieee80211_rate mwl8k_rates[] = {
         { .bitrate = 360, .hw_value = 72, },
         { .bitrate = 480, .hw_value = 96, },
         { .bitrate = 540, .hw_value = 108, },
+        { .bitrate = 720, .hw_value = 144, },
+};
+
+static const u8 mwl8k_rateids[12] = {
+        2, 4, 11, 22, 12, 18, 24, 36, 48, 72, 96, 108,
 };
 
 /* Set or get info from Firmware */
@@ -574,7 +571,7 @@ static int mwl8k_load_firmware(struct ieee80211_hw *hw)
                                "helper image\n", pci_name(priv->pdev));
                         return rc;
                 }
-                msleep(1);
+                msleep(5);
 
                 rc = mwl8k_feed_fw_image(priv, fw->data, fw->size);
         } else {
@@ -591,9 +588,8 @@ static int mwl8k_load_firmware(struct ieee80211_hw *hw)
                 iowrite32(MWL8K_MODE_AP, priv->regs + MWL8K_HIU_GEN_PTR);
         else
                 iowrite32(MWL8K_MODE_STA, priv->regs + MWL8K_HIU_GEN_PTR);
-        msleep(1);
 
-        loops = 200000;
+        loops = 500000;
         do {
                 u32 ready_code;
 
@@ -633,9 +629,6 @@ struct ewc_ht_info {
 /* Peer Entry flags - used to define the type of the peer node */
 #define MWL8K_PEER_TYPE_ACCESSPOINT     2
 
-#define MWL8K_IEEE_LEGACY_DATA_RATES    13
-#define MWL8K_MCS_BITMAP_SIZE           16
-
 struct peer_capability_info {
         /* Peer type - AP vs. STA.  */
         __u8    peer_type;
@@ -652,10 +645,10 @@ struct peer_capability_info {
         struct ewc_ht_info      ewc_info;
 
         /* Legacy rate table. Intersection of our rates and peer rates.  */
-        __u8    legacy_rates[MWL8K_IEEE_LEGACY_DATA_RATES];
+        __u8    legacy_rates[12];
 
         /* HT rate table. Intersection of our rates and peer rates.  */
-        __u8    ht_rates[MWL8K_MCS_BITMAP_SIZE];
+        __u8    ht_rates[16];
         __u8    pad[16];
 
         /* If set, interoperability mode, no proprietary extensions.  */
@@ -706,55 +699,64 @@ static inline u16 mwl8k_qos_setbit_qlen(u16 qos, u8 len)
 struct mwl8k_dma_data {
         __le16 fwlen;
         struct ieee80211_hdr wh;
+        char data[0];
 } __attribute__((packed));
 
 /* Routines to add/remove DMA header from skb.  */
-static inline void mwl8k_remove_dma_header(struct sk_buff *skb)
+static inline void mwl8k_remove_dma_header(struct sk_buff *skb, __le16 qos)
 {
-        struct mwl8k_dma_data *tr = (struct mwl8k_dma_data *)skb->data;
-        void *dst, *src = &tr->wh;
-        int hdrlen = ieee80211_hdrlen(tr->wh.frame_control);
-        u16 space = sizeof(struct mwl8k_dma_data) - hdrlen;
+        struct mwl8k_dma_data *tr;
+        int hdrlen;
 
-        dst = (void *)tr + space;
-        if (dst != src) {
-                memmove(dst, src, hdrlen);
-                skb_pull(skb, space);
+        tr = (struct mwl8k_dma_data *)skb->data;
+        hdrlen = ieee80211_hdrlen(tr->wh.frame_control);
+
+        if (hdrlen != sizeof(tr->wh)) {
+                if (ieee80211_is_data_qos(tr->wh.frame_control)) {
+                        memmove(tr->data - hdrlen, &tr->wh, hdrlen - 2);
+                        *((__le16 *)(tr->data - 2)) = qos;
+                } else {
+                        memmove(tr->data - hdrlen, &tr->wh, hdrlen);
+                }
         }
+
+        if (hdrlen != sizeof(*tr))
+                skb_pull(skb, sizeof(*tr) - hdrlen);
 }
 
 static inline void mwl8k_add_dma_header(struct sk_buff *skb)
 {
         struct ieee80211_hdr *wh;
-        u32 hdrlen, pktlen;
+        int hdrlen;
         struct mwl8k_dma_data *tr;
 
+        /*
+         * Add a firmware DMA header; the firmware requires that we
+         * present a 2-byte payload length followed by a 4-address
+         * header (without QoS field), followed (optionally) by any
+         * WEP/ExtIV header (but only filled in for CCMP).
+         */
         wh = (struct ieee80211_hdr *)skb->data;
+
         hdrlen = ieee80211_hdrlen(wh->frame_control);
-        pktlen = skb->len;
+        if (hdrlen != sizeof(*tr))
+                skb_push(skb, sizeof(*tr) - hdrlen);
 
-        /*
-         * Copy up/down the 802.11 header; the firmware requires
-         * we present a 2-byte payload length followed by a
-         * 4-address header (w/o QoS), followed (optionally) by
-         * any WEP/ExtIV header (but only filled in for CCMP).
-         */
-        if (hdrlen != sizeof(struct mwl8k_dma_data))
-                skb_push(skb, sizeof(struct mwl8k_dma_data) - hdrlen);
+        if (ieee80211_is_data_qos(wh->frame_control))
+                hdrlen -= 2;
 
         tr = (struct mwl8k_dma_data *)skb->data;
         if (wh != &tr->wh)
                 memmove(&tr->wh, wh, hdrlen);
-
-        /* Clear addr4 */
-        memset(tr->wh.addr4, 0, ETH_ALEN);
+        if (hdrlen != sizeof(tr->wh))
+                memset(((void *)&tr->wh) + hdrlen, 0, sizeof(tr->wh) - hdrlen);
 
         /*
          * Firmware length is the length of the fully formed "802.11
          * payload".  That is, everything except for the 802.11 header.
          * This includes all crypto material including the MIC.
          */
-        tr->fwlen = cpu_to_le16(pktlen - hdrlen);
+        tr->fwlen = cpu_to_le16(skb->len - sizeof(*tr));
 }
 
 
@@ -779,6 +781,10 @@ struct mwl8k_rxd_8366 {
         __u8 rx_ctrl;
 } __attribute__((packed));
 
+#define MWL8K_8366_RATE_INFO_MCS_FORMAT         0x80
+#define MWL8K_8366_RATE_INFO_40MHZ              0x40
+#define MWL8K_8366_RATE_INFO_RATEID(x)          ((x) & 0x3f)
+
 #define MWL8K_8366_RX_CTRL_OWNED_BY_HOST        0x80
 
 static void mwl8k_rxd_8366_init(void *_rxd, dma_addr_t next_dma_addr)
@@ -800,7 +806,8 @@ static void mwl8k_rxd_8366_refill(void *_rxd, dma_addr_t addr, int len)
 }
 
 static int
-mwl8k_rxd_8366_process(void *_rxd, struct ieee80211_rx_status *status)
+mwl8k_rxd_8366_process(void *_rxd, struct ieee80211_rx_status *status,
+                       __le16 *qos)
 {
         struct mwl8k_rxd_8366 *rxd = _rxd;
 
@@ -813,9 +820,11 @@ mwl8k_rxd_8366_process(void *_rxd, struct ieee80211_rx_status *status)
         status->signal = -rxd->rssi;
         status->noise = -rxd->noise_floor;
 
-        if (rxd->rate & 0x80) {
+        if (rxd->rate & MWL8K_8366_RATE_INFO_MCS_FORMAT) {
                 status->flag |= RX_FLAG_HT;
-                status->rate_idx = rxd->rate & 0x7f;
+                if (rxd->rate & MWL8K_8366_RATE_INFO_40MHZ)
+                        status->flag |= RX_FLAG_40MHZ;
+                status->rate_idx = MWL8K_8366_RATE_INFO_RATEID(rxd->rate);
         } else {
                 int i;
 
@@ -830,6 +839,8 @@ mwl8k_rxd_8366_process(void *_rxd, struct ieee80211_rx_status *status)
         status->band = IEEE80211_BAND_2GHZ;
         status->freq = ieee80211_channel_to_frequency(rxd->channel);
 
+        *qos = rxd->qos_control;
+
         return le16_to_cpu(rxd->pkt_len);
 }
 
@@ -888,7 +899,8 @@ static void mwl8k_rxd_8687_refill(void *_rxd, dma_addr_t addr, int len)
 }
 
 static int
-mwl8k_rxd_8687_process(void *_rxd, struct ieee80211_rx_status *status)
+mwl8k_rxd_8687_process(void *_rxd, struct ieee80211_rx_status *status,
+                       __le16 *qos)
 {
         struct mwl8k_rxd_8687 *rxd = _rxd;
         u16 rate_info;
@@ -903,7 +915,6 @@ mwl8k_rxd_8687_process(void *_rxd, struct ieee80211_rx_status *status)
 
         status->signal = -rxd->rssi;
         status->noise = -rxd->noise_level;
-        status->qual = rxd->link_quality;
         status->antenna = MWL8K_8687_RATE_INFO_ANTSELECT(rate_info);
         status->rate_idx = MWL8K_8687_RATE_INFO_RATEID(rate_info);
 
@@ -919,6 +930,8 @@ mwl8k_rxd_8687_process(void *_rxd, struct ieee80211_rx_status *status)
         status->band = IEEE80211_BAND_2GHZ;
         status->freq = ieee80211_channel_to_frequency(rxd->channel);
 
+        *qos = rxd->qos_control;
+
         return le16_to_cpu(rxd->pkt_len);
 }
 
@@ -1090,6 +1103,7 @@ static int rxq_process(struct ieee80211_hw *hw, int index, int limit)
                 void *rxd;
                 int pkt_len;
                 struct ieee80211_rx_status status;
+                __le16 qos;
 
                 skb = rxq->buf[rxq->head].skb;
                 if (skb == NULL)
@@ -1097,7 +1111,7 @@ static int rxq_process(struct ieee80211_hw *hw, int index, int limit)
 
                 rxd = rxq->rxd + (rxq->head * priv->rxd_ops->rxd_size);
 
-                pkt_len = priv->rxd_ops->rxd_process(rxd, &status);
+                pkt_len = priv->rxd_ops->rxd_process(rxd, &status, &qos);
                 if (pkt_len < 0)
                         break;
 
@@ -1115,7 +1129,7 @@ static int rxq_process(struct ieee80211_hw *hw, int index, int limit)
                 rxq->rxd_count--;
 
                 skb_put(skb, pkt_len);
-                mwl8k_remove_dma_header(skb);
+                mwl8k_remove_dma_header(skb, qos);
 
                 /*
                  * Check for a pending join operation.  Save a
@@ -1221,99 +1235,106 @@ static inline void mwl8k_tx_start(struct mwl8k_priv *priv)
         ioread32(priv->regs + MWL8K_HIU_INT_CODE);
 }
 
-struct mwl8k_txq_info {
-        u32 fw_owned;
-        u32 drv_owned;
-        u32 unused;
-        u32 len;
-        u32 head;
-        u32 tail;
-};
-
-static int mwl8k_scan_tx_ring(struct mwl8k_priv *priv,
-                                struct mwl8k_txq_info *txinfo)
+static void mwl8k_dump_tx_rings(struct ieee80211_hw *hw)
 {
-        int count, desc, status;
-        struct mwl8k_tx_queue *txq;
-        struct mwl8k_tx_desc *tx_desc;
-        int ndescs = 0;
+        struct mwl8k_priv *priv = hw->priv;
+        int i;
 
-        memset(txinfo, 0, MWL8K_TX_QUEUES * sizeof(struct mwl8k_txq_info));
+        for (i = 0; i < MWL8K_TX_QUEUES; i++) {
+                struct mwl8k_tx_queue *txq = priv->txq + i;
+                int fw_owned = 0;
+                int drv_owned = 0;
+                int unused = 0;
+                int desc;
 
-        for (count = 0; count < MWL8K_TX_QUEUES; count++) {
-                txq = priv->txq + count;
-                txinfo[count].len = txq->stats.len;
-                txinfo[count].head = txq->head;
-                txinfo[count].tail = txq->tail;
                 for (desc = 0; desc < MWL8K_TX_DESCS; desc++) {
-                        tx_desc = txq->txd + desc;
-                        status = le32_to_cpu(tx_desc->status);
+                        struct mwl8k_tx_desc *tx_desc = txq->txd + desc;
+                        u32 status;
 
+                        status = le32_to_cpu(tx_desc->status);
                         if (status & MWL8K_TXD_STATUS_FW_OWNED)
-                                txinfo[count].fw_owned++;
+                                fw_owned++;
                         else
-                                txinfo[count].drv_owned++;
+                                drv_owned++;
 
                         if (tx_desc->pkt_len == 0)
-                                txinfo[count].unused++;
+                                unused++;
                 }
-        }
 
-        return ndescs;
+                printk(KERN_ERR "%s: txq[%d] len=%d head=%d tail=%d "
+                       "fw_owned=%d drv_owned=%d unused=%d\n",
+                       wiphy_name(hw->wiphy), i,
+                       txq->stats.len, txq->head, txq->tail,
+                       fw_owned, drv_owned, unused);
+        }
 }
 
 /*
  * Must be called with priv->fw_mutex held and tx queues stopped.
  */
+#define MWL8K_TX_WAIT_TIMEOUT_MS        1000
+
 static int mwl8k_tx_wait_empty(struct ieee80211_hw *hw)
 {
         struct mwl8k_priv *priv = hw->priv;
         DECLARE_COMPLETION_ONSTACK(tx_wait);
-        u32 count;
-        unsigned long timeout;
+        int retry;
+        int rc;
 
         might_sleep();
 
+        /*
+         * The TX queues are stopped at this point, so this test
+         * doesn't need to take ->tx_lock.
+         */
+        if (!priv->pending_tx_pkts)
+                return 0;
+
+        retry = 0;
+        rc = 0;
+
         spin_lock_bh(&priv->tx_lock);
-        count = priv->pending_tx_pkts;
-        if (count)
-                priv->tx_wait = &tx_wait;
-        spin_unlock_bh(&priv->tx_lock);
+        priv->tx_wait = &tx_wait;
+        while (!rc) {
+                int oldcount;
+                unsigned long timeout;
 
-        if (count) {
-                struct mwl8k_txq_info txinfo[MWL8K_TX_QUEUES];
-                int index;
-                int newcount;
+                oldcount = priv->pending_tx_pkts;
 
+                spin_unlock_bh(&priv->tx_lock);
                 timeout = wait_for_completion_timeout(&tx_wait,
-                                        msecs_to_jiffies(5000));
-                if (timeout)
-                        return 0;
-
+                            msecs_to_jiffies(MWL8K_TX_WAIT_TIMEOUT_MS));
                 spin_lock_bh(&priv->tx_lock);
-                priv->tx_wait = NULL;
-                newcount = priv->pending_tx_pkts;
-                mwl8k_scan_tx_ring(priv, txinfo);
-                spin_unlock_bh(&priv->tx_lock);
 
-                printk(KERN_ERR "%s(%u) TIMEDOUT:5000ms Pend:%u-->%u\n",
-                       __func__, __LINE__, count, newcount);
+                if (timeout) {
+                        WARN_ON(priv->pending_tx_pkts);
+                        if (retry) {
+                                printk(KERN_NOTICE "%s: tx rings drained\n",
+                                       wiphy_name(hw->wiphy));
+                        }
+                        break;
+                }
 
-                for (index = 0; index < MWL8K_TX_QUEUES; index++)
-                        printk(KERN_ERR "TXQ:%u L:%u H:%u T:%u FW:%u "
-                               "DRV:%u U:%u\n",
-                                        index,
-                                        txinfo[index].len,
-                                        txinfo[index].head,
-                                        txinfo[index].tail,
-                                        txinfo[index].fw_owned,
-                                        txinfo[index].drv_owned,
-                                        txinfo[index].unused);
+                if (priv->pending_tx_pkts < oldcount) {
+                        printk(KERN_NOTICE "%s: timeout waiting for tx "
+                               "rings to drain (%d -> %d pkts), retrying\n",
+                               wiphy_name(hw->wiphy), oldcount,
+                               priv->pending_tx_pkts);
+                        retry = 1;
+                        continue;
+                }
 
-                return -ETIMEDOUT;
+                priv->tx_wait = NULL;
+
+                printk(KERN_ERR "%s: tx rings stuck for %d ms\n",
+                       wiphy_name(hw->wiphy), MWL8K_TX_WAIT_TIMEOUT_MS);
+                mwl8k_dump_tx_rings(hw);
+
+                rc = -ETIMEDOUT;
         }
+        spin_unlock_bh(&priv->tx_lock);
 
-        return 0;
+        return rc;
 }
 
 #define MWL8K_TXD_SUCCESS(status)                               \
@@ -1361,7 +1382,7 @@ static void mwl8k_txq_reclaim(struct ieee80211_hw *hw, int index, int force)
                 BUG_ON(skb == NULL);
                 pci_unmap_single(priv->pdev, addr, size, PCI_DMA_TODEVICE);
 
-                mwl8k_remove_dma_header(skb);
+                mwl8k_remove_dma_header(skb, tx_desc->qos_control);
 
                 /* Mark descriptor as unused */
                 tx_desc->pkt_phys_addr = 0;
@@ -1563,8 +1584,8 @@ static void mwl8k_fw_unlock(struct ieee80211_hw *hw)
  * Command processing.
  */
 
-/* Timeout firmware commands after 2000ms */
-#define MWL8K_CMD_TIMEOUT_MS    2000
+/* Timeout firmware commands after 10s */
+#define MWL8K_CMD_TIMEOUT_MS    10000
 
 static int mwl8k_post_cmd(struct ieee80211_hw *hw, struct mwl8k_cmd_pkt *cmd)
 {
@@ -1615,12 +1636,21 @@ static int mwl8k_post_cmd(struct ieee80211_hw *hw, struct mwl8k_cmd_pkt *cmd)
                        MWL8K_CMD_TIMEOUT_MS);
                 rc = -ETIMEDOUT;
         } else {
+                int ms;
+
+                ms = MWL8K_CMD_TIMEOUT_MS - jiffies_to_msecs(timeout);
+
                 rc = cmd->result ? -EINVAL : 0;
                 if (rc)
                         printk(KERN_ERR "%s: Command %s error 0x%x\n",
                                wiphy_name(hw->wiphy),
                                mwl8k_cmd_name(cmd->code, buf, sizeof(buf)),
                                le16_to_cpu(cmd->result));
+                else if (ms > 2000)
+                        printk(KERN_NOTICE "%s: Command %s took %d ms\n",
+                               wiphy_name(hw->wiphy),
+                               mwl8k_cmd_name(cmd->code, buf, sizeof(buf)),
+                               ms);
         }
 
         return rc;
@@ -2439,8 +2469,6 @@ mwl8k_set_edca_params(struct ieee80211_hw *hw, __u8 qnum,
 /*
  * CMD_FINALIZE_JOIN.
  */
-
-/* FJ beacon buffer size is compiled into the firmware.  */
 #define MWL8K_FJ_BEACON_MAXLEN  128
 
 struct mwl8k_cmd_finalize_join {
@@ -2450,17 +2478,13 @@ struct mwl8k_cmd_finalize_join {
 } __attribute__((packed));
 
 static int mwl8k_finalize_join(struct ieee80211_hw *hw, void *frame,
-                                __u16 framelen, __u16 dtim)
+                               int framelen, int dtim)
 {
         struct mwl8k_cmd_finalize_join *cmd;
         struct ieee80211_mgmt *payload = frame;
-        u16 hdrlen;
-        u32 payload_len;
+        int payload_len;
         int rc;
 
-        if (frame == NULL)
-                return -EINVAL;
-
         cmd = kzalloc(sizeof(*cmd), GFP_KERNEL);
         if (cmd == NULL)
                 return -ENOMEM;
@@ -2469,24 +2493,17 @@ static int mwl8k_finalize_join(struct ieee80211_hw *hw, void *frame,
         cmd->header.length = cpu_to_le16(sizeof(*cmd));
         cmd->sleep_interval = cpu_to_le32(dtim ? dtim : 1);
 
-        hdrlen = ieee80211_hdrlen(payload->frame_control);
-
-        payload_len = framelen > hdrlen ? framelen - hdrlen : 0;
-
-        /* XXX TBD Might just have to abort and return an error */
-        if (payload_len > MWL8K_FJ_BEACON_MAXLEN)
-                printk(KERN_ERR "%s(): WARNING: Incomplete beacon "
-                       "sent to firmware. Sz=%u MAX=%u\n", __func__,
-                       payload_len, MWL8K_FJ_BEACON_MAXLEN);
-
-        if (payload_len > MWL8K_FJ_BEACON_MAXLEN)
+        payload_len = framelen - ieee80211_hdrlen(payload->frame_control);
+        if (payload_len < 0)
+                payload_len = 0;
+        else if (payload_len > MWL8K_FJ_BEACON_MAXLEN)
                 payload_len = MWL8K_FJ_BEACON_MAXLEN;
 
-        if (payload && payload_len)
-                memcpy(cmd->beacon_data, &payload->u.beacon, payload_len);
+        memcpy(cmd->beacon_data, &payload->u.beacon, payload_len);
 
         rc = mwl8k_post_cmd(hw, &cmd->header);
         kfree(cmd);
+
         return rc;
 }
 
@@ -2515,9 +2532,7 @@ static int mwl8k_cmd_update_sta_db(struct ieee80211_hw *hw,
         struct ieee80211_bss_conf *info = &mv_vif->bss_info;
         struct mwl8k_cmd_update_sta_db *cmd;
         struct peer_capability_info *peer_info;
-        struct ieee80211_rate *bitrates = mv_vif->legacy_rates;
         int rc;
-        __u8 count, *rates;
 
         cmd = kzalloc(sizeof(*cmd), GFP_KERNEL);
         if (cmd == NULL)
@@ -2536,13 +2551,11 @@ static int mwl8k_cmd_update_sta_db(struct ieee80211_hw *hw,
                 /* Build peer_info block */
                 peer_info->peer_type = MWL8K_PEER_TYPE_ACCESSPOINT;
                 peer_info->basic_caps = cpu_to_le16(info->assoc_capability);
+                memcpy(peer_info->legacy_rates, mwl8k_rateids,
+                       sizeof(mwl8k_rateids));
                 peer_info->interop = 1;
                 peer_info->amsdu_enabled = 0;
 
-                rates = peer_info->legacy_rates;
-                for (count = 0; count < mv_vif->legacy_nrates; count++)
-                        rates[count] = bitrates[count].hw_value;
-
                 rc = mwl8k_post_cmd(hw, &cmd->header);
                 if (rc == 0)
                         mv_vif->peer_id = peer_info->station_id;
@@ -2565,8 +2578,6 @@ static int mwl8k_cmd_update_sta_db(struct ieee80211_hw *hw,
 /*
  * CMD_SET_AID.
  */
-#define MWL8K_RATE_INDEX_MAX_ARRAY                      14
-
 #define MWL8K_FRAME_PROT_DISABLED                       0x00
 #define MWL8K_FRAME_PROT_11G                            0x07
 #define MWL8K_FRAME_PROT_11N_HT_40MHZ_ONLY              0x02
@@ -2579,7 +2590,7 @@ struct mwl8k_cmd_update_set_aid {
          /* AP's MAC address (BSSID) */
         __u8    bssid[ETH_ALEN];
         __le16  protection_mode;
-        __u8    supp_rates[MWL8K_RATE_INDEX_MAX_ARRAY];
+        __u8    supp_rates[14];
 } __attribute__((packed));
 
 static int mwl8k_cmd_set_aid(struct ieee80211_hw *hw,
@@ -2588,8 +2599,6 @@ static int mwl8k_cmd_set_aid(struct ieee80211_hw *hw,
         struct mwl8k_vif *mv_vif = MWL8K_VIF(vif);
         struct ieee80211_bss_conf *info = &mv_vif->bss_info;
         struct mwl8k_cmd_update_set_aid *cmd;
-        struct ieee80211_rate *bitrates = mv_vif->legacy_rates;
-        int count;
         u16 prot_mode;
         int rc;
 
@@ -2621,8 +2630,7 @@ static int mwl8k_cmd_set_aid(struct ieee80211_hw *hw,
         }
         cmd->protection_mode = cpu_to_le16(prot_mode);
 
-        for (count = 0; count < mv_vif->legacy_nrates; count++)
-                cmd->supp_rates[count] = bitrates[count].hw_value;
+        memcpy(cmd->supp_rates, mwl8k_rateids, sizeof(mwl8k_rateids));
 
         rc = mwl8k_post_cmd(hw, &cmd->header);
         kfree(cmd);
@@ -2635,20 +2643,17 @@ static int mwl8k_cmd_set_aid(struct ieee80211_hw *hw,
  */
 struct mwl8k_cmd_update_rateset {
         struct  mwl8k_cmd_pkt header;
-        __u8    legacy_rates[MWL8K_RATE_INDEX_MAX_ARRAY];
+        __u8    legacy_rates[14];
 
         /* Bitmap for supported MCS codes.  */
-        __u8    mcs_set[MWL8K_IEEE_LEGACY_DATA_RATES];
-        __u8    reserved[MWL8K_IEEE_LEGACY_DATA_RATES];
+        __u8    mcs_set[16];
+        __u8    reserved[16];
 } __attribute__((packed));
 
 static int mwl8k_update_rateset(struct ieee80211_hw *hw,
                 struct ieee80211_vif *vif)
 {
-        struct mwl8k_vif *mv_vif = MWL8K_VIF(vif);
         struct mwl8k_cmd_update_rateset *cmd;
-        struct ieee80211_rate *bitrates = mv_vif->legacy_rates;
-        int count;
         int rc;
 
         cmd = kzalloc(sizeof(*cmd), GFP_KERNEL);
@@ -2657,9 +2662,7 @@ static int mwl8k_update_rateset(struct ieee80211_hw *hw,
 
         cmd->header.code = cpu_to_le16(MWL8K_CMD_SET_RATE);
         cmd->header.length = cpu_to_le16(sizeof(*cmd));
-
-        for (count = 0; count < mv_vif->legacy_nrates; count++)
-                cmd->legacy_rates[count] = bitrates[count].hw_value;
+        memcpy(cmd->legacy_rates, mwl8k_rateids, sizeof(mwl8k_rateids));
 
         rc = mwl8k_post_cmd(hw, &cmd->header);
         kfree(cmd);
@@ -2932,11 +2935,6 @@ static int mwl8k_add_interface(struct ieee80211_hw *hw,
         /* Back pointer to parent config block */
         mwl8k_vif->priv = priv;
 
-        /* Setup initial PHY parameters */
-        memcpy(mwl8k_vif->legacy_rates,
-                priv->rates, sizeof(mwl8k_vif->legacy_rates));
-        mwl8k_vif->legacy_nrates = ARRAY_SIZE(priv->rates);
-
         /* Set Initial sequence number to zero */
         mwl8k_vif->seqno = 0;
 
@@ -3014,9 +3012,6 @@ static void mwl8k_bss_info_changed(struct ieee80211_hw *hw,
         struct mwl8k_vif *mwl8k_vif = MWL8K_VIF(vif);
         int rc;
 
-        if (changed & BSS_CHANGED_BSSID)
-                memcpy(mwl8k_vif->bssid, info->bssid, ETH_ALEN);
-
         if ((changed & BSS_CHANGED_ASSOC) == 0)
                 return;
 
@@ -3030,6 +3025,8 @@ static void mwl8k_bss_info_changed(struct ieee80211_hw *hw,
                 memcpy(&mwl8k_vif->bss_info, info,
                         sizeof(struct ieee80211_bss_conf));
 
+                memcpy(mwl8k_vif->bssid, info->bssid, ETH_ALEN);
+
                 /* Install rates */
                 rc = mwl8k_update_rateset(hw, vif);
                 if (rc)
@@ -3366,7 +3363,7 @@ static int __devinit mwl8k_probe(struct pci_dev *pdev,
         if (rc) {
                 printk(KERN_ERR "%s: Cannot obtain PCI resources\n",
                        MWL8K_NAME);
-                return rc;
+                goto err_disable_device;
         }
 
         pci_set_master(pdev);
@@ -3597,6 +3594,8 @@ err_iounmap:
 
 err_free_reg:
         pci_release_regions(pdev);
+
+err_disable_device:
         pci_disable_device(pdev);
 
         return rc;
diff --git a/drivers/net/wireless/orinoco/hermes_dld.c b/drivers/net/wireless/orinoco/hermes_dld.c
index 84200da900b6..fb157eb889ca 100644
--- a/drivers/net/wireless/orinoco/hermes_dld.c
+++ b/drivers/net/wireless/orinoco/hermes_dld.c
@@ -427,7 +427,7 @@ int hermesi_program_init(hermes_t *hw, u32 offset)
         if (err)
                 return err;
 
-        pr_debug(KERN_DEBUG PFX "Enabling volatile, EP 0x%08x\n", offset);
+        pr_debug(PFX "Enabling volatile, EP 0x%08x\n", offset);
         err = hermes_doicmd_wait(hw,
                                  HERMES_PROGRAM_ENABLE_VOLATILE,
                                  offset & 0xFFFFu,
diff --git a/drivers/net/wireless/rtl818x/rtl8187.h b/drivers/net/wireless/rtl818x/rtl8187.h
index abb4907cf296..6af0f3f71f3a 100644
--- a/drivers/net/wireless/rtl818x/rtl8187.h
+++ b/drivers/net/wireless/rtl818x/rtl8187.h
@@ -23,6 +23,7 @@
 #define RTL8187_EEPROM_TXPWR_CHAN_1     0x16    /* 3 channels */
 #define RTL8187_EEPROM_TXPWR_CHAN_6     0x1B    /* 2 channels */
 #define RTL8187_EEPROM_TXPWR_CHAN_4     0x3D    /* 2 channels */
+#define RTL8187_EEPROM_SELECT_GPIO      0x3B
 
 #define RTL8187_REQT_READ       0xC0
 #define RTL8187_REQT_WRITE      0x40
@@ -31,6 +32,9 @@
 
 #define RTL8187_MAX_RX          0x9C4
 
+#define RFKILL_MASK_8187_89_97  0x2
+#define RFKILL_MASK_8198        0x4
+
 struct rtl8187_rx_info {
         struct urb *urb;
         struct ieee80211_hw *dev;
@@ -104,6 +108,7 @@ struct rtl8187_priv {
         struct delayed_work work;
         struct ieee80211_hw *dev;
 #ifdef CONFIG_RTL8187_LEDS
+        struct rtl8187_led led_radio;
         struct rtl8187_led led_tx;
         struct rtl8187_led led_rx;
         struct delayed_work led_on;
@@ -122,6 +127,7 @@ struct rtl8187_priv {
         u8 noise;
         u8 slot_time;
         u8 aifsn[4];
+        u8 rfkill_mask;
         struct {
                 __le64 buf;
                 struct sk_buff_head queue;
diff --git a/drivers/net/wireless/rtl818x/rtl8187_dev.c b/drivers/net/wireless/rtl818x/rtl8187_dev.c
index 76973b8c7099..bc5726dd5fe4 100644
--- a/drivers/net/wireless/rtl818x/rtl8187_dev.c
+++ b/drivers/net/wireless/rtl818x/rtl8187_dev.c
@@ -1322,6 +1322,7 @@ static int __devinit rtl8187_probe(struct usb_interface *intf,
         struct ieee80211_channel *channel;
         const char *chip_name;
         u16 txpwr, reg;
+        u16 product_id = le16_to_cpu(udev->descriptor.idProduct);
         int err, i;
 
         dev = ieee80211_alloc_hw(sizeof(*priv), &rtl8187_ops);
@@ -1481,6 +1482,13 @@ static int __devinit rtl8187_probe(struct usb_interface *intf,
                 (*channel++).hw_value = txpwr & 0xFF;
                 (*channel++).hw_value = txpwr >> 8;
         }
+        /* Handle the differing rfkill GPIO bit in different models */
+        priv->rfkill_mask = RFKILL_MASK_8187_89_97;
+        if (product_id == 0x8197 || product_id == 0x8198) {
+                eeprom_93cx6_read(&eeprom, RTL8187_EEPROM_SELECT_GPIO, &reg);
+                if (reg & 0xFF00)
+                        priv->rfkill_mask = RFKILL_MASK_8198;
+        }
 
         /*
          * XXX: Once this driver supports anything that requires
@@ -1509,9 +1517,9 @@ static int __devinit rtl8187_probe(struct usb_interface *intf,
         mutex_init(&priv->conf_mutex);
         skb_queue_head_init(&priv->b_tx_status.queue);
 
-        printk(KERN_INFO "%s: hwaddr %pM, %s V%d + %s\n",
+        printk(KERN_INFO "%s: hwaddr %pM, %s V%d + %s, rfkill mask %d\n",
                wiphy_name(dev->wiphy), dev->wiphy->perm_addr,
-               chip_name, priv->asic_rev, priv->rf->name);
+               chip_name, priv->asic_rev, priv->rf->name, priv->rfkill_mask);
 
 #ifdef CONFIG_RTL8187_LEDS
         eeprom_93cx6_read(&eeprom, 0x3F, &reg);
diff --git a/drivers/net/wireless/rtl818x/rtl8187_leds.c b/drivers/net/wireless/rtl818x/rtl8187_leds.c
index cf8a4a40fdf6..ded44c045eb2 100644
--- a/drivers/net/wireless/rtl818x/rtl8187_leds.c
+++ b/drivers/net/wireless/rtl818x/rtl8187_leds.c
@@ -105,19 +105,36 @@ static void rtl8187_led_brightness_set(struct led_classdev *led_dev,
         struct rtl8187_led *led = container_of(led_dev, struct rtl8187_led,
                                                led_dev);
         struct ieee80211_hw *hw = led->dev;
-        struct rtl8187_priv *priv = hw->priv;
+        struct rtl8187_priv *priv;
+        static bool radio_on;
 
-        if (brightness == LED_OFF) {
-                ieee80211_queue_delayed_work(hw, &priv->led_off, 0);
-                /* The LED is off for 1/20 sec so that it just blinks. */
-                ieee80211_queue_delayed_work(hw, &priv->led_on, HZ / 20);
-        } else
-                ieee80211_queue_delayed_work(hw, &priv->led_on, 0);
+        if (!hw)
+                return;
+        priv = hw->priv;
+        if (led->is_radio) {
+                if (brightness == LED_FULL) {
+                        ieee80211_queue_delayed_work(hw, &priv->led_on, 0);
+                        radio_on = true;
+                } else if (radio_on) {
+                        radio_on = false;
+                        cancel_delayed_work_sync(&priv->led_on);
+                        ieee80211_queue_delayed_work(hw, &priv->led_off, 0);
+                }
+        } else if (radio_on) {
+                if (brightness == LED_OFF) {
+                        ieee80211_queue_delayed_work(hw, &priv->led_off, 0);
+                        /* The LED is off for 1/20 sec - it just blinks. */
+                        ieee80211_queue_delayed_work(hw, &priv->led_on,
+                                                     HZ / 20);
+                } else
+                        ieee80211_queue_delayed_work(hw, &priv->led_on, 0);
+        }
 }
 
 static int rtl8187_register_led(struct ieee80211_hw *dev,
                                 struct rtl8187_led *led, const char *name,
-                                const char *default_trigger, u8 ledpin)
+                                const char *default_trigger, u8 ledpin,
+                                bool is_radio)
 {
         int err;
         struct rtl8187_priv *priv = dev->priv;
@@ -128,6 +145,7 @@ static int rtl8187_register_led(struct ieee80211_hw *dev,
                 return -EINVAL;
         led->dev = dev;
         led->ledpin = ledpin;
+        led->is_radio = is_radio;
         strncpy(led->name, name, sizeof(led->name));
 
         led->led_dev.name = led->name;
@@ -145,7 +163,11 @@ static int rtl8187_register_led(struct ieee80211_hw *dev,
 
 static void rtl8187_unregister_led(struct rtl8187_led *led)
 {
+        struct ieee80211_hw *hw = led->dev;
+        struct rtl8187_priv *priv = hw->priv;
+
         led_classdev_unregister(&led->led_dev);
+        flush_delayed_work(&priv->led_off);
         led->dev = NULL;
 }
 
@@ -183,33 +205,37 @@ void rtl8187_leds_init(struct ieee80211_hw *dev, u16 custid)
         INIT_DELAYED_WORK(&priv->led_off, led_turn_off);
 
         snprintf(name, sizeof(name),
+                 "rtl8187-%s::radio", wiphy_name(dev->wiphy));
+        err = rtl8187_register_led(dev, &priv->led_radio, name,
+                         ieee80211_get_radio_led_name(dev), ledpin, true);
+        if (err)
+                return;
+
+        snprintf(name, sizeof(name),
                  "rtl8187-%s::tx", wiphy_name(dev->wiphy));
         err = rtl8187_register_led(dev, &priv->led_tx, name,
-                         ieee80211_get_tx_led_name(dev), ledpin);
+                         ieee80211_get_tx_led_name(dev), ledpin, false);
         if (err)
-                goto error;
+                goto err_tx;
+
         snprintf(name, sizeof(name),
                  "rtl8187-%s::rx", wiphy_name(dev->wiphy));
         err = rtl8187_register_led(dev, &priv->led_rx, name,
-                         ieee80211_get_rx_led_name(dev), ledpin);
-        if (!err) {
-                ieee80211_queue_delayed_work(dev, &priv->led_on, 0);
+                         ieee80211_get_rx_led_name(dev), ledpin, false);
+        if (!err)
                 return;
-        }
-        /* registration of RX LED failed - unregister TX */
+
+        /* registration of RX LED failed - unregister */
         rtl8187_unregister_led(&priv->led_tx);
-error:
-        /* If registration of either failed, cancel delayed work */
-        cancel_delayed_work_sync(&priv->led_off);
-        cancel_delayed_work_sync(&priv->led_on);
+err_tx:
+        rtl8187_unregister_led(&priv->led_radio);
 }
 
 void rtl8187_leds_exit(struct ieee80211_hw *dev)
 {
         struct rtl8187_priv *priv = dev->priv;
 
-        /* turn the LED off before exiting */
-        ieee80211_queue_delayed_work(dev, &priv->led_off, 0);
+        rtl8187_unregister_led(&priv->led_radio);
         rtl8187_unregister_led(&priv->led_rx);
         rtl8187_unregister_led(&priv->led_tx);
         cancel_delayed_work_sync(&priv->led_off);
diff --git a/drivers/net/wireless/rtl818x/rtl8187_leds.h b/drivers/net/wireless/rtl818x/rtl8187_leds.h
index a0332027aead..efe8041bdda4 100644
--- a/drivers/net/wireless/rtl818x/rtl8187_leds.h
+++ b/drivers/net/wireless/rtl818x/rtl8187_leds.h
@@ -47,6 +47,8 @@ struct rtl8187_led {
         u8 ledpin;
         /* The unique name string for this LED device. */
         char name[RTL8187_LED_MAX_NAME_LEN + 1];
+        /* If the LED is radio or tx/rx */
+        bool is_radio;
 };
 
 void rtl8187_leds_init(struct ieee80211_hw *dev, u16 code);
diff --git a/drivers/net/wireless/rtl818x/rtl8187_rfkill.c b/drivers/net/wireless/rtl818x/rtl8187_rfkill.c
index cad8037ab2af..03555e1e0cab 100644
--- a/drivers/net/wireless/rtl818x/rtl8187_rfkill.c
+++ b/drivers/net/wireless/rtl818x/rtl8187_rfkill.c
@@ -25,10 +25,10 @@ static bool rtl8187_is_radio_enabled(struct rtl8187_priv *priv)
         u8 gpio;
 
         gpio = rtl818x_ioread8(priv, &priv->map->GPIO0);
-        rtl818x_iowrite8(priv, &priv->map->GPIO0, gpio & ~0x02);
+        rtl818x_iowrite8(priv, &priv->map->GPIO0, gpio & ~priv->rfkill_mask);
         gpio = rtl818x_ioread8(priv, &priv->map->GPIO1);
 
-        return gpio & 0x02;
+        return gpio & priv->rfkill_mask;
 }
 
 void rtl8187_rfkill_init(struct ieee80211_hw *hw)
diff --git a/drivers/net/wireless/wl12xx/wl1251_main.c b/drivers/net/wireless/wl12xx/wl1251_main.c
index ff4be7bf5d36..2f50a256efa5 100644
--- a/drivers/net/wireless/wl12xx/wl1251_main.c
+++ b/drivers/net/wireless/wl12xx/wl1251_main.c
@@ -629,10 +629,6 @@ static int wl1251_op_config(struct ieee80211_hw *hw, u32 changed)
                         goto out_sleep;
         }
 
-        ret = wl1251_build_null_data(wl);
-        if (ret < 0)
-                goto out_sleep;
-
         if (conf->flags & IEEE80211_CONF_PS && !wl->psm_requested) {
                 wl1251_debug(DEBUG_PSM, "psm enabled");
 
@@ -1110,6 +1106,21 @@ static void wl1251_op_bss_info_changed(struct ieee80211_hw *hw,
         if (ret < 0)
                 goto out;
 
+        if (changed & BSS_CHANGED_BSSID) {
+                memcpy(wl->bssid, bss_conf->bssid, ETH_ALEN);
+
+                ret = wl1251_build_null_data(wl);
+                if (ret < 0)
+                        goto out;
+
+                if (wl->bss_type != BSS_TYPE_IBSS) {
+                        ret = wl1251_join(wl, wl->bss_type, wl->channel,
+                                          wl->beacon_int, wl->dtim_period);
+                        if (ret < 0)
+                                goto out_sleep;
+                }
+        }
+
         if (changed & BSS_CHANGED_ASSOC) {
                 if (bss_conf->assoc) {
                         wl->beacon_int = bss_conf->beacon_int;
@@ -1169,23 +1180,6 @@ static void wl1251_op_bss_info_changed(struct ieee80211_hw *hw,
                 }
         }
 
-        if (changed & BSS_CHANGED_BSSID) {
-                memcpy(wl->bssid, bss_conf->bssid, ETH_ALEN);
-
-                ret = wl1251_build_null_data(wl);
-                if (ret < 0)
-                        goto out;
-
-                if (wl->bss_type != BSS_TYPE_IBSS) {
-                        ret = wl1251_join(wl, wl->bss_type, wl->channel,
-                                          wl->beacon_int, wl->dtim_period);
-                        if (ret < 0)
-                                goto out_sleep;
-                        wl1251_warning("Set ctsprotect failed %d", ret);
-                        goto out_sleep;
-                }
-        }
-
         if (changed & BSS_CHANGED_BEACON) {
                 beacon = ieee80211_beacon_get(hw, vif);
                 ret = wl1251_cmd_template_set(wl, CMD_BEACON, beacon->data,
diff --git a/include/linux/can/dev.h b/include/linux/can/dev.h
index 1ed2a5cc03f5..3db7767d2a17 100644
--- a/include/linux/can/dev.h
+++ b/include/linux/can/dev.h
@@ -51,6 +51,15 @@ struct can_priv {
         struct sk_buff **echo_skb;
 };
 
+/*
+ * get_can_dlc(value) - helper macro to cast a given data length code (dlc)
+ * to __u8 and ensure the dlc value to be max. 8 bytes.
+ *
+ * To be used in the CAN netdriver receive path to ensure conformance with
+ * ISO 11898-1 Chapter 8.4.2.3 (DLC field)
+ */
+#define get_can_dlc(i)  (min_t(__u8, (i), 8))
+
 struct net_device *alloc_candev(int sizeof_priv, unsigned int echo_skb_max);
 void free_candev(struct net_device *dev);
 
diff --git a/include/linux/gigaset_dev.h b/include/linux/gigaset_dev.h
index 5dc4a316ca37..258ba82937e7 100644
--- a/include/linux/gigaset_dev.h
+++ b/include/linux/gigaset_dev.h
@@ -16,15 +16,23 @@
 
 #include <linux/ioctl.h>
 
+/* The magic IOCTL value for this interface. */
 #define GIGASET_IOCTL 0x47
 
-#define GIGVER_DRIVER 0
-#define GIGVER_COMPAT 1
-#define GIGVER_FWBASE 2
+/* enable/disable device control via character device (lock out ISDN subsys) */
+#define GIGASET_REDIR    _IOWR(GIGASET_IOCTL, 0, int)
 
-#define GIGASET_REDIR    _IOWR (GIGASET_IOCTL, 0, int)
-#define GIGASET_CONFIG   _IOWR (GIGASET_IOCTL, 1, int)
-#define GIGASET_BRKCHARS _IOW  (GIGASET_IOCTL, 2, unsigned char[6]) //FIXME [6] okay?
-#define GIGASET_VERSION  _IOWR (GIGASET_IOCTL, 3, unsigned[4])
+/* enable adapter configuration mode (M10x only) */
+#define GIGASET_CONFIG   _IOWR(GIGASET_IOCTL, 1, int)
+
+/* set break characters (M105 only) */
+#define GIGASET_BRKCHARS _IOW(GIGASET_IOCTL, 2, unsigned char[6])
+
+/* get version information selected by arg[0] */
+#define GIGASET_VERSION  _IOWR(GIGASET_IOCTL, 3, unsigned[4])
+/* values for GIGASET_VERSION arg[0] */
+#define GIGVER_DRIVER 0         /* get driver version */
+#define GIGVER_COMPAT 1         /* get interface compatibility version */
+#define GIGVER_FWBASE 2         /* get base station firmware version */
 
 #endif
diff --git a/include/linux/if_ether.h b/include/linux/if_ether.h
index 005e1525ab86..299b4121f914 100644
--- a/include/linux/if_ether.h
+++ b/include/linux/if_ether.h
@@ -137,8 +137,6 @@ extern struct ctl_table ether_table[];
 extern ssize_t sysfs_format_mac(char *buf, const unsigned char *addr, int len);
 
 #define MAC_FMT "%02x:%02x:%02x:%02x:%02x:%02x"
-#define MAC_BUF_SIZE    18
-#define DECLARE_MAC_BUF(var) char var[MAC_BUF_SIZE]
 
 #endif
 
diff --git a/include/linux/rtnetlink.h b/include/linux/rtnetlink.h
index 14fc906ed602..05330fc5b436 100644
--- a/include/linux/rtnetlink.h
+++ b/include/linux/rtnetlink.h
@@ -368,11 +368,9 @@ enum {
 #define RTAX_MAX (__RTAX_MAX - 1)
 
 #define RTAX_FEATURE_ECN        0x00000001
-#define RTAX_FEATURE_NO_SACK    0x00000002
-#define RTAX_FEATURE_NO_TSTAMP  0x00000004
+#define RTAX_FEATURE_SACK       0x00000002
+#define RTAX_FEATURE_TIMESTAMP  0x00000004
 #define RTAX_FEATURE_ALLFRAG    0x00000008
-#define RTAX_FEATURE_NO_WSCALE  0x00000010
-#define RTAX_FEATURE_NO_DSACK   0x00000020
 
 struct rta_session {
         __u8    proto;
diff --git a/include/net/compat.h b/include/net/compat.h
index 3c7d4e38fa1d..28d5428ec6a2 100644
--- a/include/net/compat.h
+++ b/include/net/compat.h
@@ -46,7 +46,7 @@ extern asmlinkage long compat_sys_sendmsg(int,struct compat_msghdr __user *,unsi
 extern asmlinkage long compat_sys_recvmsg(int,struct compat_msghdr __user *,unsigned);
 extern asmlinkage long compat_sys_recvmmsg(int, struct compat_mmsghdr __user *,
                                            unsigned, unsigned,
-                                           struct timespec __user *);
+                                           struct compat_timespec __user *);
 extern asmlinkage long compat_sys_getsockopt(int, int, int, char __user *, int __user *);
 extern int put_cmsg_compat(struct msghdr*, int, int, int, void *);
 
diff --git a/include/net/dst.h b/include/net/dst.h
index 387cb3cfde7e..39c4a5963e12 100644
--- a/include/net/dst.h
+++ b/include/net/dst.h
@@ -113,7 +113,7 @@ dst_metric(const struct dst_entry *dst, int metric)
 static inline u32
 dst_feature(const struct dst_entry *dst, u32 feature)
 {
-        return (dst ? dst_metric(dst, RTAX_FEATURES) & feature : 0);
+        return dst_metric(dst, RTAX_FEATURES) & feature;
 }
 
 static inline u32 dst_mtu(const struct dst_entry *dst)
diff --git a/include/net/inet6_hashtables.h b/include/net/inet6_hashtables.h
index 92838d3a1ab7..e46674d5daea 100644
--- a/include/net/inet6_hashtables.h
+++ b/include/net/inet6_hashtables.h
@@ -53,7 +53,7 @@ static inline int inet6_sk_ehashfn(const struct sock *sk)
         return inet6_ehashfn(net, laddr, lport, faddr, fport);
 }
 
-extern void __inet6_hash(struct sock *sk);
+extern int __inet6_hash(struct sock *sk, struct inet_timewait_sock *twp);
 
 /*
  * Sockets in TCP_CLOSE state are _always_ taken out of the hash, so
diff --git a/include/net/inet_hashtables.h b/include/net/inet_hashtables.h
index 41cbddd25b70..74358d1b3f43 100644
--- a/include/net/inet_hashtables.h
+++ b/include/net/inet_hashtables.h
@@ -251,7 +251,7 @@ extern void inet_put_port(struct sock *sk);
 
 void inet_hashinfo_init(struct inet_hashinfo *h);
 
-extern void __inet_hash_nolisten(struct sock *sk);
+extern int __inet_hash_nolisten(struct sock *sk, struct inet_timewait_sock *tw);
 extern void inet_hash(struct sock *sk);
 extern void inet_unhash(struct sock *sk);
 
@@ -391,10 +391,12 @@ static inline struct sock *__inet_lookup_skb(struct inet_hashinfo *hashinfo,
 }
 
 extern int __inet_hash_connect(struct inet_timewait_death_row *death_row,
-                struct sock *sk, u32 port_offset,
+                struct sock *sk,
+                u32 port_offset,
                 int (*check_established)(struct inet_timewait_death_row *,
                         struct sock *, __u16, struct inet_timewait_sock **),
-                               void (*hash)(struct sock *sk));
+                int (*hash)(struct sock *sk, struct inet_timewait_sock *twp));
+
 extern int inet_hash_connect(struct inet_timewait_death_row *death_row,
                              struct sock *sk);
 #endif /* _INET_HASHTABLES_H */
diff --git a/include/net/inet_timewait_sock.h b/include/net/inet_timewait_sock.h
index b801ade2295e..79f67eae8a7e 100644
--- a/include/net/inet_timewait_sock.h
+++ b/include/net/inet_timewait_sock.h
@@ -201,6 +201,9 @@ extern void inet_twsk_put(struct inet_timewait_sock *tw);
 
 extern int inet_twsk_unhash(struct inet_timewait_sock *tw);
 
+extern int inet_twsk_bind_unhash(struct inet_timewait_sock *tw,
+                                 struct inet_hashinfo *hashinfo);
+
 extern struct inet_timewait_sock *inet_twsk_alloc(const struct sock *sk,
                                                   const int state);
 
diff --git a/include/net/tcp.h b/include/net/tcp.h
index 5740b85bc5a0..34f5cc24d903 100644
--- a/include/net/tcp.h
+++ b/include/net/tcp.h
@@ -408,8 +408,7 @@ extern int			tcp_recvmsg(struct kiocb *iocb, struct sock *sk,
 extern void                     tcp_parse_options(struct sk_buff *skb,
                                                   struct tcp_options_received *opt_rx,
                                                   u8 **hvpp,
-                                                  int estab,
-                                                  struct dst_entry *dst);
+                                                  int estab);
 
 extern u8                       *tcp_parse_md5sig_option(struct tcphdr *th);
 
@@ -1261,29 +1260,6 @@ static inline struct sk_buff *tcp_write_queue_prev(struct sock *sk, struct sk_bu
 #define tcp_for_write_queue_from_safe(skb, tmp, sk)                     \
         skb_queue_walk_from_safe(&(sk)->sk_write_queue, skb, tmp)
 
-/* This function calculates a "timeout" which is equivalent to the timeout of a
- * TCP connection after "boundary" unsuccessful, exponentially backed-off
- * retransmissions with an initial RTO of TCP_RTO_MIN.
- */
-static inline bool retransmits_timed_out(const struct sock *sk,
-                                         unsigned int boundary)
-{
-        unsigned int timeout, linear_backoff_thresh;
-
-        if (!inet_csk(sk)->icsk_retransmits)
-                return false;
-
-        linear_backoff_thresh = ilog2(TCP_RTO_MAX/TCP_RTO_MIN);
-
-        if (boundary <= linear_backoff_thresh)
-                timeout = ((2 << boundary) - 1) * TCP_RTO_MIN;
-        else
-                timeout = ((2 << linear_backoff_thresh) - 1) * TCP_RTO_MIN +
-                          (boundary - linear_backoff_thresh) * TCP_RTO_MAX;
-
-        return (tcp_time_stamp - tcp_sk(sk)->retrans_stamp) >= timeout;
-}
-
 static inline struct sk_buff *tcp_send_head(struct sock *sk)
 {
         return sk->sk_send_head;
diff --git a/net/atm/br2684.c b/net/atm/br2684.c
index 26a646d4eb32..c9230c398697 100644
--- a/net/atm/br2684.c
+++ b/net/atm/br2684.c
@@ -554,6 +554,12 @@ static const struct net_device_ops br2684_netdev_ops = {
         .ndo_validate_addr      = eth_validate_addr,
 };
 
+static const struct net_device_ops br2684_netdev_ops_routed = {
+        .ndo_start_xmit         = br2684_start_xmit,
+        .ndo_set_mac_address    = br2684_mac_addr,
+        .ndo_change_mtu         = eth_change_mtu
+};
+
 static void br2684_setup(struct net_device *netdev)
 {
         struct br2684_dev *brdev = BRPRIV(netdev);
@@ -569,11 +575,10 @@ static void br2684_setup(struct net_device *netdev)
 static void br2684_setup_routed(struct net_device *netdev)
 {
         struct br2684_dev *brdev = BRPRIV(netdev);
-        brdev->net_dev = netdev;
 
+        brdev->net_dev = netdev;
         netdev->hard_header_len = 0;
-
-        netdev->netdev_ops = &br2684_netdev_ops;
+        netdev->netdev_ops = &br2684_netdev_ops_routed;
         netdev->addr_len = 0;
         netdev->mtu = 1500;
         netdev->type = ARPHRD_PPP;
diff --git a/net/atm/lec.c b/net/atm/lec.c
index b2d644560323..42749b7b917c 100644
--- a/net/atm/lec.c
+++ b/net/atm/lec.c
@@ -62,7 +62,6 @@ static int lec_open(struct net_device *dev);
 static netdev_tx_t lec_start_xmit(struct sk_buff *skb,
                                   struct net_device *dev);
 static int lec_close(struct net_device *dev);
-static void lec_init(struct net_device *dev);
 static struct lec_arp_table *lec_arp_find(struct lec_priv *priv,
                                           const unsigned char *mac_addr);
 static int lec_arp_remove(struct lec_priv *priv,
@@ -670,13 +669,6 @@ static const struct net_device_ops lec_netdev_ops = {
         .ndo_set_multicast_list = lec_set_multicast_list,
 };
 
-
-static void lec_init(struct net_device *dev)
-{
-        dev->netdev_ops = &lec_netdev_ops;
-        printk("%s: Initialized!\n", dev->name);
-}
-
 static const unsigned char lec_ctrl_magic[] = {
         0xff,
         0x00,
@@ -893,6 +885,7 @@ static int lecd_attach(struct atm_vcc *vcc, int arg)
                         dev_lec[i] = alloc_etherdev(size);
                 if (!dev_lec[i])
                         return -ENOMEM;
+                dev_lec[i]->netdev_ops = &lec_netdev_ops;
                 snprintf(dev_lec[i]->name, IFNAMSIZ, "lec%d", i);
                 if (register_netdev(dev_lec[i])) {
                         free_netdev(dev_lec[i]);
@@ -901,7 +894,6 @@ static int lecd_attach(struct atm_vcc *vcc, int arg)
 
                 priv = netdev_priv(dev_lec[i]);
                 priv->is_trdev = is_trdev;
-                lec_init(dev_lec[i]);
         } else {
                 priv = netdev_priv(dev_lec[i]);
                 if (priv->lecd)
diff --git a/net/compat.c b/net/compat.c
index e1a56ade803b..a1fb1b079a82 100644
--- a/net/compat.c
+++ b/net/compat.c
@@ -754,26 +754,21 @@ asmlinkage long compat_sys_recvfrom(int fd, void __user *buf, size_t len,
 
 asmlinkage long compat_sys_recvmmsg(int fd, struct compat_mmsghdr __user *mmsg,
                                     unsigned vlen, unsigned int flags,
-                                    struct timespec __user *timeout)
+                                    struct compat_timespec __user *timeout)
 {
         int datagrams;
         struct timespec ktspec;
-        struct compat_timespec __user *utspec;
 
         if (timeout == NULL)
                 return __sys_recvmmsg(fd, (struct mmsghdr __user *)mmsg, vlen,
                                       flags | MSG_CMSG_COMPAT, NULL);
 
-        utspec = (struct compat_timespec __user *)timeout;
-        if (get_user(ktspec.tv_sec, &utspec->tv_sec) ||
-            get_user(ktspec.tv_nsec, &utspec->tv_nsec))
+        if (get_compat_timespec(&ktspec, timeout))
                 return -EFAULT;
 
         datagrams = __sys_recvmmsg(fd, (struct mmsghdr __user *)mmsg, vlen,
                                    flags | MSG_CMSG_COMPAT, &ktspec);
-        if (datagrams > 0 &&
-            (put_user(ktspec.tv_sec, &utspec->tv_sec) ||
-             put_user(ktspec.tv_nsec, &utspec->tv_nsec)))
+        if (datagrams > 0 && put_compat_timespec(&ktspec, timeout))
                 datagrams = -EFAULT;
 
         return datagrams;
diff --git a/net/core/dev.c b/net/core/dev.c
index c36a17aafcf3..be9924f60ec3 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -4771,21 +4771,23 @@ static void net_set_todo(struct net_device *dev)
 
 static void rollback_registered_many(struct list_head *head)
 {
-        struct net_device *dev;
+        struct net_device *dev, *tmp;
 
         BUG_ON(dev_boot_phase);
         ASSERT_RTNL();
 
-        list_for_each_entry(dev, head, unreg_list) {
+        list_for_each_entry_safe(dev, tmp, head, unreg_list) {
                 /* Some devices call without registering
-                 * for initialization unwind.
+                 * for initialization unwind. Remove those
+                 * devices and proceed with the remaining.
                  */
                 if (dev->reg_state == NETREG_UNINITIALIZED) {
                         pr_debug("unregister_netdevice: device %s/%p never "
                                  "was registered\n", dev->name, dev);
 
                         WARN_ON(1);
-                        return;
+                        list_del(&dev->unreg_list);
+                        continue;
                 }
 
                 BUG_ON(dev->reg_state != NETREG_REGISTERED);
@@ -5033,6 +5035,11 @@ int register_netdevice(struct net_device *dev)
                 rollback_registered(dev);
                 dev->reg_state = NETREG_UNREGISTERED;
         }
+        /*
+         *      Prevent userspace races by waiting until the network
+         *      device is fully setup before sending notifications.
+         */
+        rtmsg_ifinfo(RTM_NEWLINK, dev, ~0U);
 
 out:
         return ret;
@@ -5595,6 +5602,12 @@ int dev_change_net_namespace(struct net_device *dev, struct net *net, const char
         /* Notify protocols, that a new device appeared. */
         call_netdevice_notifiers(NETDEV_REGISTER, dev);
 
+        /*
+         *      Prevent userspace races by waiting until the network
+         *      device is fully setup before sending notifications.
+         */
+        rtmsg_ifinfo(RTM_NEWLINK, dev, ~0U);
+
         synchronize_net();
         err = 0;
 out:
diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
index 33148a568199..794bcb897ff0 100644
--- a/net/core/rtnetlink.c
+++ b/net/core/rtnetlink.c
@@ -1364,15 +1364,15 @@ static int rtnetlink_event(struct notifier_block *this, unsigned long event, voi
         case NETDEV_UNREGISTER:
                 rtmsg_ifinfo(RTM_DELLINK, dev, ~0U);
                 break;
-        case NETDEV_REGISTER:
-                rtmsg_ifinfo(RTM_NEWLINK, dev, ~0U);
-                break;
         case NETDEV_UP:
         case NETDEV_DOWN:
                 rtmsg_ifinfo(RTM_NEWLINK, dev, IFF_UP|IFF_RUNNING);
                 break;
+        case NETDEV_POST_INIT:
+        case NETDEV_REGISTER:
         case NETDEV_CHANGE:
         case NETDEV_GOING_DOWN:
+        case NETDEV_UNREGISTER_BATCH:
                 break;
         default:
                 rtmsg_ifinfo(RTM_NEWLINK, dev, 0);
diff --git a/net/dccp/ipv4.c b/net/dccp/ipv4.c
index efbcfdc12796..dad7bc4878e0 100644
--- a/net/dccp/ipv4.c
+++ b/net/dccp/ipv4.c
@@ -408,7 +408,7 @@ struct sock *dccp_v4_request_recv_sock(struct sock *sk, struct sk_buff *skb,
 
         dccp_sync_mss(newsk, dst_mtu(dst));
 
-        __inet_hash_nolisten(newsk);
+        __inet_hash_nolisten(newsk, NULL);
         __inet_inherit_port(sk, newsk);
 
         return newsk;
diff --git a/net/dccp/ipv6.c b/net/dccp/ipv6.c
index 6574215a1f51..baf05cf43c28 100644
--- a/net/dccp/ipv6.c
+++ b/net/dccp/ipv6.c
@@ -46,7 +46,7 @@ static void dccp_v6_hash(struct sock *sk)
                         return;
                 }
                 local_bh_disable();
-                __inet6_hash(sk);
+                __inet6_hash(sk, NULL);
                 local_bh_enable();
         }
 }
@@ -644,7 +644,7 @@ static struct sock *dccp_v6_request_recv_sock(struct sock *sk,
         newinet->inet_daddr = newinet->inet_saddr = LOOPBACK4_IPV6;
         newinet->inet_rcv_saddr = LOOPBACK4_IPV6;
 
-        __inet6_hash(newsk);
+        __inet6_hash(newsk, NULL);
         __inet_inherit_port(sk, newsk);
 
         return newsk;
diff --git a/net/ipv4/inet_hashtables.c b/net/ipv4/inet_hashtables.c
index 21e5e32d8c60..2b79377b468d 100644
--- a/net/ipv4/inet_hashtables.c
+++ b/net/ipv4/inet_hashtables.c
@@ -351,12 +351,13 @@ static inline u32 inet_sk_port_offset(const struct sock *sk)
                                           inet->inet_dport);
 }
 
-void __inet_hash_nolisten(struct sock *sk)
+int __inet_hash_nolisten(struct sock *sk, struct inet_timewait_sock *tw)
 {
         struct inet_hashinfo *hashinfo = sk->sk_prot->h.hashinfo;
         struct hlist_nulls_head *list;
         spinlock_t *lock;
         struct inet_ehash_bucket *head;
+        int twrefcnt = 0;
 
         WARN_ON(!sk_unhashed(sk));
 
@@ -367,8 +368,13 @@ void __inet_hash_nolisten(struct sock *sk)
 
         spin_lock(lock);
         __sk_nulls_add_node_rcu(sk, list);
+        if (tw) {
+                WARN_ON(sk->sk_hash != tw->tw_hash);
+                twrefcnt = inet_twsk_unhash(tw);
+        }
         spin_unlock(lock);
         sock_prot_inuse_add(sock_net(sk), sk->sk_prot, 1);
+        return twrefcnt;
 }
 EXPORT_SYMBOL_GPL(__inet_hash_nolisten);
 
@@ -378,7 +384,7 @@ static void __inet_hash(struct sock *sk)
         struct inet_listen_hashbucket *ilb;
 
         if (sk->sk_state != TCP_LISTEN) {
-                __inet_hash_nolisten(sk);
+                __inet_hash_nolisten(sk, NULL);
                 return;
         }
 
@@ -427,7 +433,7 @@ int __inet_hash_connect(struct inet_timewait_death_row *death_row,
                 struct sock *sk, u32 port_offset,
                 int (*check_established)(struct inet_timewait_death_row *,
                         struct sock *, __u16, struct inet_timewait_sock **),
-                void (*hash)(struct sock *sk))
+                int (*hash)(struct sock *sk, struct inet_timewait_sock *twp))
 {
         struct inet_hashinfo *hinfo = death_row->hashinfo;
         const unsigned short snum = inet_sk(sk)->inet_num;
@@ -435,6 +441,7 @@ int __inet_hash_connect(struct inet_timewait_death_row *death_row,
         struct inet_bind_bucket *tb;
         int ret;
         struct net *net = sock_net(sk);
+        int twrefcnt = 1;
 
         if (!snum) {
                 int i, remaining, low, high, port;
@@ -493,13 +500,18 @@ ok:
                 inet_bind_hash(sk, tb, port);
                 if (sk_unhashed(sk)) {
                         inet_sk(sk)->inet_sport = htons(port);
-                        hash(sk);
+                        twrefcnt += hash(sk, tw);
                 }
+                if (tw)
+                        twrefcnt += inet_twsk_bind_unhash(tw, hinfo);
                 spin_unlock(&head->lock);
 
                 if (tw) {
                         inet_twsk_deschedule(tw, death_row);
-                        inet_twsk_put(tw);
+                        while (twrefcnt) {
+                                twrefcnt--;
+                                inet_twsk_put(tw);
+                        }
                 }
 
                 ret = 0;
@@ -510,7 +522,7 @@ ok:
         tb  = inet_csk(sk)->icsk_bind_hash;
         spin_lock_bh(&head->lock);
         if (sk_head(&tb->owners) == sk && !sk->sk_bind_node.next) {
-                hash(sk);
+                hash(sk, NULL);
                 spin_unlock_bh(&head->lock);
                 return 0;
         } else {
diff --git a/net/ipv4/inet_timewait_sock.c b/net/ipv4/inet_timewait_sock.c
index 0fdf45e4c90c..cc94cc2d8b2d 100644
--- a/net/ipv4/inet_timewait_sock.c
+++ b/net/ipv4/inet_timewait_sock.c
@@ -15,9 +15,13 @@
 #include <net/ip.h>
 
 
-/*
- * unhash a timewait socket from established hash
- * lock must be hold by caller
+/**
+ *      inet_twsk_unhash - unhash a timewait socket from established hash
+ *      @tw: timewait socket
+ *
+ *      unhash a timewait socket from established hash, if hashed.
+ *      ehash lock must be held by caller.
+ *      Returns 1 if caller should call inet_twsk_put() after lock release.
  */
 int inet_twsk_unhash(struct inet_timewait_sock *tw)
 {
@@ -26,6 +30,37 @@ int inet_twsk_unhash(struct inet_timewait_sock *tw)
 
         hlist_nulls_del_rcu(&tw->tw_node);
         sk_nulls_node_init(&tw->tw_node);
+        /*
+         * We cannot call inet_twsk_put() ourself under lock,
+         * caller must call it for us.
+         */
+        return 1;
+}
+
+/**
+ *      inet_twsk_bind_unhash - unhash a timewait socket from bind hash
+ *      @tw: timewait socket
+ *      @hashinfo: hashinfo pointer
+ *
+ *      unhash a timewait socket from bind hash, if hashed.
+ *      bind hash lock must be held by caller.
+ *      Returns 1 if caller should call inet_twsk_put() after lock release.
+ */
+int inet_twsk_bind_unhash(struct inet_timewait_sock *tw,
+                          struct inet_hashinfo *hashinfo)
+{
+        struct inet_bind_bucket *tb = tw->tw_tb;
+
+        if (!tb)
+                return 0;
+
+        __hlist_del(&tw->tw_bind_node);
+        tw->tw_tb = NULL;
+        inet_bind_bucket_destroy(hashinfo->bind_bucket_cachep, tb);
+        /*
+         * We cannot call inet_twsk_put() ourself under lock,
+         * caller must call it for us.
+         */
         return 1;
 }
 
@@ -34,7 +69,6 @@ static void __inet_twsk_kill(struct inet_timewait_sock *tw,
                              struct inet_hashinfo *hashinfo)
 {
         struct inet_bind_hashbucket *bhead;
-        struct inet_bind_bucket *tb;
         int refcnt;
         /* Unlink from established hashes. */
         spinlock_t *lock = inet_ehash_lockp(hashinfo, tw->tw_hash);
@@ -46,15 +80,11 @@ static void __inet_twsk_kill(struct inet_timewait_sock *tw,
         /* Disassociate with bind bucket. */
         bhead = &hashinfo->bhash[inet_bhashfn(twsk_net(tw), tw->tw_num,
                         hashinfo->bhash_size)];
+
         spin_lock(&bhead->lock);
-        tb = tw->tw_tb;
-        if (tb) {
-                __hlist_del(&tw->tw_bind_node);
-                tw->tw_tb = NULL;
-                inet_bind_bucket_destroy(hashinfo->bind_bucket_cachep, tb);
-                refcnt++;
-        }
+        refcnt += inet_twsk_bind_unhash(tw, hashinfo);
         spin_unlock(&bhead->lock);
+
 #ifdef SOCK_REFCNT_DEBUG
         if (atomic_read(&tw->tw_refcnt) != 1) {
                 printk(KERN_DEBUG "%s timewait_sock %p refcnt=%d\n",
@@ -126,7 +156,7 @@ void __inet_twsk_hashdance(struct inet_timewait_sock *tw, struct sock *sk,
 
         /*
          * Notes :
-         * - We initially set tw_refcnt to 0 in inet_twsk_alloc()
+         * - We initially set tw_refcnt to 0 in inet_twsk_alloc()
          * - We add one reference for the bhash link
          * - We add one reference for the ehash link
          * - We want this refcnt update done before allowing other
@@ -136,7 +166,6 @@ void __inet_twsk_hashdance(struct inet_timewait_sock *tw, struct sock *sk,
 
         spin_unlock(lock);
 }
-
 EXPORT_SYMBOL_GPL(__inet_twsk_hashdance);
 
 struct inet_timewait_sock *inet_twsk_alloc(const struct sock *sk, const int state)
@@ -177,7 +206,6 @@ struct inet_timewait_sock *inet_twsk_alloc(const struct sock *sk, const int stat
 
         return tw;
 }
-
 EXPORT_SYMBOL_GPL(inet_twsk_alloc);
 
 /* Returns non-zero if quota exceeded.  */
@@ -256,7 +284,6 @@ void inet_twdr_hangman(unsigned long data)
 out:
         spin_unlock(&twdr->death_lock);
 }
-
 EXPORT_SYMBOL_GPL(inet_twdr_hangman);
 
 void inet_twdr_twkill_work(struct work_struct *work)
@@ -287,7 +314,6 @@ void inet_twdr_twkill_work(struct work_struct *work)
                 spin_unlock_bh(&twdr->death_lock);
         }
 }
-
 EXPORT_SYMBOL_GPL(inet_twdr_twkill_work);
 
 /* These are always called from BH context.  See callers in
@@ -307,7 +333,6 @@ void inet_twsk_deschedule(struct inet_timewait_sock *tw,
         spin_unlock(&twdr->death_lock);
         __inet_twsk_kill(tw, twdr->hashinfo);
 }
-
 EXPORT_SYMBOL(inet_twsk_deschedule);
 
 void inet_twsk_schedule(struct inet_timewait_sock *tw,
@@ -388,7 +413,6 @@ void inet_twsk_schedule(struct inet_timewait_sock *tw,
                 mod_timer(&twdr->tw_timer, jiffies + twdr->period);
         spin_unlock(&twdr->death_lock);
 }
-
 EXPORT_SYMBOL_GPL(inet_twsk_schedule);
 
 void inet_twdr_twcal_tick(unsigned long data)
@@ -449,7 +473,6 @@ out:
 #endif
         spin_unlock(&twdr->death_lock);
 }
-
 EXPORT_SYMBOL_GPL(inet_twdr_twcal_tick);
 
 void inet_twsk_purge(struct inet_hashinfo *hashinfo,
diff --git a/net/ipv4/syncookies.c b/net/ipv4/syncookies.c
index 26399ad2a289..66fd80ef2473 100644
--- a/net/ipv4/syncookies.c
+++ b/net/ipv4/syncookies.c
@@ -277,6 +277,13 @@ struct sock *cookie_v4_check(struct sock *sk, struct sk_buff *skb,
 
         NET_INC_STATS_BH(sock_net(sk), LINUX_MIB_SYNCOOKIESRECV);
 
+        /* check for timestamp cookie support */
+        memset(&tcp_opt, 0, sizeof(tcp_opt));
+        tcp_parse_options(skb, &tcp_opt, &hash_location, 0);
+
+        if (tcp_opt.saw_tstamp)
+                cookie_check_timestamp(&tcp_opt);
+
         ret = NULL;
         req = inet_reqsk_alloc(&tcp_request_sock_ops); /* for safety */
         if (!req)
@@ -292,6 +299,12 @@ struct sock *cookie_v4_check(struct sock *sk, struct sk_buff *skb,
         ireq->loc_addr          = ip_hdr(skb)->daddr;
         ireq->rmt_addr          = ip_hdr(skb)->saddr;
         ireq->ecn_ok            = 0;
+        ireq->snd_wscale        = tcp_opt.snd_wscale;
+        ireq->rcv_wscale        = tcp_opt.rcv_wscale;
+        ireq->sack_ok           = tcp_opt.sack_ok;
+        ireq->wscale_ok         = tcp_opt.wscale_ok;
+        ireq->tstamp_ok         = tcp_opt.saw_tstamp;
+        req->ts_recent          = tcp_opt.saw_tstamp ? tcp_opt.rcv_tsval : 0;
 
         /* We throwed the options of the initial SYN away, so we hope
          * the ACK carries the same options again (see RFC1122 4.2.3.8)
@@ -340,20 +353,6 @@ struct sock *cookie_v4_check(struct sock *sk, struct sk_buff *skb,
                 }
         }
 
-        /* check for timestamp cookie support */
-        memset(&tcp_opt, 0, sizeof(tcp_opt));
-        tcp_parse_options(skb, &tcp_opt, &hash_location, 0, &rt->u.dst);
-
-        if (tcp_opt.saw_tstamp)
-                cookie_check_timestamp(&tcp_opt);
-
-        ireq->snd_wscale        = tcp_opt.snd_wscale;
-        ireq->rcv_wscale        = tcp_opt.rcv_wscale;
-        ireq->sack_ok           = tcp_opt.sack_ok;
-        ireq->wscale_ok         = tcp_opt.wscale_ok;
-        ireq->tstamp_ok         = tcp_opt.saw_tstamp;
-        req->ts_recent          = tcp_opt.saw_tstamp ? tcp_opt.rcv_tsval : 0;
-
         /* Try to redo what tcp_v4_send_synack did. */
         req->window_clamp = tp->window_clamp ? :dst_metric(&rt->u.dst, RTAX_WINDOW);
 
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
index c8666b70cde0..b0a26bb25e2e 100644
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@ -2540,11 +2540,6 @@ static int do_tcp_getsockopt(struct sock *sk, int level,
                         ctd.tcpct_cookie_desired = cvp->cookie_desired;
                         ctd.tcpct_s_data_desired = cvp->s_data_desired;
 
-                        /* Cookie(s) saved, return as nonce */
-                        if (sizeof(ctd.tcpct_value) < cvp->cookie_pair_size) {
-                                /* impossible? */
-                                return -EINVAL;
-                        }
                         memcpy(&ctd.tcpct_value[0], &cvp->cookie_pair[0],
                                cvp->cookie_pair_size);
                         ctd.tcpct_used = cvp->cookie_pair_size;
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
index 57ae96a04220..28e029632493 100644
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
@@ -2717,6 +2717,35 @@ static void tcp_try_undo_dsack(struct sock *sk)
         }
 }
 
+/* We can clear retrans_stamp when there are no retransmissions in the
+ * window. It would seem that it is trivially available for us in
+ * tp->retrans_out, however, that kind of assumptions doesn't consider
+ * what will happen if errors occur when sending retransmission for the
+ * second time. ...It could the that such segment has only
+ * TCPCB_EVER_RETRANS set at the present time. It seems that checking
+ * the head skb is enough except for some reneging corner cases that
+ * are not worth the effort.
+ *
+ * Main reason for all this complexity is the fact that connection dying
+ * time now depends on the validity of the retrans_stamp, in particular,
+ * that successive retransmissions of a segment must not advance
+ * retrans_stamp under any conditions.
+ */
+static int tcp_any_retrans_done(struct sock *sk)
+{
+        struct tcp_sock *tp = tcp_sk(sk);
+        struct sk_buff *skb;
+
+        if (tp->retrans_out)
+                return 1;
+
+        skb = tcp_write_queue_head(sk);
+        if (unlikely(skb && TCP_SKB_CB(skb)->sacked & TCPCB_EVER_RETRANS))
+                return 1;
+
+        return 0;
+}
+
 /* Undo during fast recovery after partial ACK. */
 
 static int tcp_try_undo_partial(struct sock *sk, int acked)
@@ -2729,7 +2758,7 @@ static int tcp_try_undo_partial(struct sock *sk, int acked)
                 /* Plain luck! Hole if filled with delayed
                  * packet, rather than with a retransmit.
                  */
-                if (tp->retrans_out == 0)
+                if (!tcp_any_retrans_done(sk))
                         tp->retrans_stamp = 0;
 
                 tcp_update_reordering(sk, tcp_fackets_out(tp) + acked, 1);
@@ -2788,7 +2817,7 @@ static void tcp_try_keep_open(struct sock *sk)
         struct tcp_sock *tp = tcp_sk(sk);
         int state = TCP_CA_Open;
 
-        if (tcp_left_out(tp) || tp->retrans_out || tp->undo_marker)
+        if (tcp_left_out(tp) || tcp_any_retrans_done(sk) || tp->undo_marker)
                 state = TCP_CA_Disorder;
 
         if (inet_csk(sk)->icsk_ca_state != state) {
@@ -2803,7 +2832,7 @@ static void tcp_try_to_open(struct sock *sk, int flag)
 
         tcp_verify_left_out(tp);
 
-        if (!tp->frto_counter && tp->retrans_out == 0)
+        if (!tp->frto_counter && !tcp_any_retrans_done(sk))
                 tp->retrans_stamp = 0;
 
         if (flag & FLAG_ECE)
@@ -3698,7 +3727,7 @@ old_ack:
  * the fast version below fails.
  */
 void tcp_parse_options(struct sk_buff *skb, struct tcp_options_received *opt_rx,
-                       u8 **hvpp, int estab,  struct dst_entry *dst)
+                       u8 **hvpp, int estab)
 {
         unsigned char *ptr;
         struct tcphdr *th = tcp_hdr(skb);
@@ -3737,8 +3766,7 @@ void tcp_parse_options(struct sk_buff *skb, struct tcp_options_received *opt_rx,
                                 break;
                         case TCPOPT_WINDOW:
                                 if (opsize == TCPOLEN_WINDOW && th->syn &&
-                                    !estab && sysctl_tcp_window_scaling &&
-                                    !dst_feature(dst, RTAX_FEATURE_NO_WSCALE)) {
+                                    !estab && sysctl_tcp_window_scaling) {
                                         __u8 snd_wscale = *(__u8 *)ptr;
                                         opt_rx->wscale_ok = 1;
                                         if (snd_wscale > 14) {
@@ -3754,8 +3782,7 @@ void tcp_parse_options(struct sk_buff *skb, struct tcp_options_received *opt_rx,
                         case TCPOPT_TIMESTAMP:
                                 if ((opsize == TCPOLEN_TIMESTAMP) &&
                                     ((estab && opt_rx->tstamp_ok) ||
-                                     (!estab && sysctl_tcp_timestamps &&
-                                      !dst_feature(dst, RTAX_FEATURE_NO_TSTAMP)))) {
+                                     (!estab && sysctl_tcp_timestamps))) {
                                         opt_rx->saw_tstamp = 1;
                                         opt_rx->rcv_tsval = get_unaligned_be32(ptr);
                                         opt_rx->rcv_tsecr = get_unaligned_be32(ptr + 4);
@@ -3763,8 +3790,7 @@ void tcp_parse_options(struct sk_buff *skb, struct tcp_options_received *opt_rx,
                                 break;
                         case TCPOPT_SACK_PERM:
                                 if (opsize == TCPOLEN_SACK_PERM && th->syn &&
-                                    !estab && sysctl_tcp_sack &&
-                                    !dst_feature(dst, RTAX_FEATURE_NO_SACK)) {
+                                    !estab && sysctl_tcp_sack) {
                                         opt_rx->sack_ok = 1;
                                         tcp_sack_reset(opt_rx);
                                 }
@@ -3849,7 +3875,7 @@ static int tcp_fast_parse_options(struct sk_buff *skb, struct tcphdr *th,
                 if (tcp_parse_aligned_timestamp(tp, th))
                         return 1;
         }
-        tcp_parse_options(skb, &tp->rx_opt, hvpp, 1, NULL);
+        tcp_parse_options(skb, &tp->rx_opt, hvpp, 1);
         return 1;
 }
 
@@ -4104,10 +4130,8 @@ static inline int tcp_sack_extend(struct tcp_sack_block *sp, u32 seq,
 static void tcp_dsack_set(struct sock *sk, u32 seq, u32 end_seq)
 {
         struct tcp_sock *tp = tcp_sk(sk);
-        struct dst_entry *dst = __sk_dst_get(sk);
 
-        if (tcp_is_sack(tp) && sysctl_tcp_dsack &&
-            !dst_feature(dst, RTAX_FEATURE_NO_DSACK)) {
+        if (tcp_is_sack(tp) && sysctl_tcp_dsack) {
                 int mib_idx;
 
                 if (before(seq, tp->rcv_nxt))
@@ -4136,15 +4160,13 @@ static void tcp_dsack_extend(struct sock *sk, u32 seq, u32 end_seq)
 static void tcp_send_dupack(struct sock *sk, struct sk_buff *skb)
 {
         struct tcp_sock *tp = tcp_sk(sk);
-        struct dst_entry *dst = __sk_dst_get(sk);
 
         if (TCP_SKB_CB(skb)->end_seq != TCP_SKB_CB(skb)->seq &&
             before(TCP_SKB_CB(skb)->seq, tp->rcv_nxt)) {
                 NET_INC_STATS_BH(sock_net(sk), LINUX_MIB_DELAYEDACKLOST);
                 tcp_enter_quickack_mode(sk);
 
-                if (tcp_is_sack(tp) && sysctl_tcp_dsack &&
-                    !dst_feature(dst, RTAX_FEATURE_NO_DSACK)) {
+                if (tcp_is_sack(tp) && sysctl_tcp_dsack) {
                         u32 end_seq = TCP_SKB_CB(skb)->end_seq;
 
                         if (after(TCP_SKB_CB(skb)->end_seq, tp->rcv_nxt))
@@ -5399,11 +5421,10 @@ static int tcp_rcv_synsent_state_process(struct sock *sk, struct sk_buff *skb,
         u8 *hash_location;
         struct inet_connection_sock *icsk = inet_csk(sk);
         struct tcp_sock *tp = tcp_sk(sk);
-        struct dst_entry *dst = __sk_dst_get(sk);
         struct tcp_cookie_values *cvp = tp->cookie_values;
         int saved_clamp = tp->rx_opt.mss_clamp;
 
-        tcp_parse_options(skb, &tp->rx_opt, &hash_location, 0, dst);
+        tcp_parse_options(skb, &tp->rx_opt, &hash_location, 0);
 
         if (th->ack) {
                 /* rfc793:
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
index 29002ab26e0d..65b8ebfd078a 100644
--- a/net/ipv4/tcp_ipv4.c
+++ b/net/ipv4/tcp_ipv4.c
@@ -1262,20 +1262,10 @@ int tcp_v4_conn_request(struct sock *sk, struct sk_buff *skb)
         tcp_rsk(req)->af_specific = &tcp_request_sock_ipv4_ops;
 #endif
 
-        ireq = inet_rsk(req);
-        ireq->loc_addr = daddr;
-        ireq->rmt_addr = saddr;
-        ireq->no_srccheck = inet_sk(sk)->transparent;
-        ireq->opt = tcp_v4_save_options(sk, skb);
-
-        dst = inet_csk_route_req(sk, req);
-        if(!dst)
-                goto drop_and_free;
-
         tcp_clear_options(&tmp_opt);
         tmp_opt.mss_clamp = TCP_MSS_DEFAULT;
         tmp_opt.user_mss  = tp->rx_opt.user_mss;
-        tcp_parse_options(skb, &tmp_opt, &hash_location, 0, dst);
+        tcp_parse_options(skb, &tmp_opt, &hash_location, 0);
 
         if (tmp_opt.cookie_plus > 0 &&
             tmp_opt.saw_tstamp &&
@@ -1319,8 +1309,14 @@ int tcp_v4_conn_request(struct sock *sk, struct sk_buff *skb)
         tmp_opt.tstamp_ok = tmp_opt.saw_tstamp;
         tcp_openreq_init(req, &tmp_opt, skb);
 
+        ireq = inet_rsk(req);
+        ireq->loc_addr = daddr;
+        ireq->rmt_addr = saddr;
+        ireq->no_srccheck = inet_sk(sk)->transparent;
+        ireq->opt = tcp_v4_save_options(sk, skb);
+
         if (security_inet_conn_request(sk, skb, req))
-                goto drop_and_release;
+                goto drop_and_free;
 
         if (!want_cookie)
                 TCP_ECN_create_request(req, tcp_hdr(skb));
@@ -1345,6 +1341,7 @@ int tcp_v4_conn_request(struct sock *sk, struct sk_buff *skb)
                  */
                 if (tmp_opt.saw_tstamp &&
                     tcp_death_row.sysctl_tw_recycle &&
+                    (dst = inet_csk_route_req(sk, req)) != NULL &&
                     (peer = rt_get_peer((struct rtable *)dst)) != NULL &&
                     peer->v4daddr == saddr) {
                         if ((u32)get_seconds() - peer->tcp_ts_stamp < TCP_PAWS_MSL &&
@@ -1464,7 +1461,7 @@ struct sock *tcp_v4_syn_recv_sock(struct sock *sk, struct sk_buff *skb,
         }
 #endif
 
-        __inet_hash_nolisten(newsk);
+        __inet_hash_nolisten(newsk, NULL);
         __inet_inherit_port(sk, newsk);
 
         return newsk;
diff --git a/net/ipv4/tcp_minisocks.c b/net/ipv4/tcp_minisocks.c
index 87accec8d097..f206ee5dda80 100644
--- a/net/ipv4/tcp_minisocks.c
+++ b/net/ipv4/tcp_minisocks.c
@@ -95,9 +95,9 @@ tcp_timewait_state_process(struct inet_timewait_sock *tw, struct sk_buff *skb,
         struct tcp_timewait_sock *tcptw = tcp_twsk((struct sock *)tw);
         int paws_reject = 0;
 
+        tmp_opt.saw_tstamp = 0;
         if (th->doff > (sizeof(*th) >> 2) && tcptw->tw_ts_recent_stamp) {
-                tmp_opt.tstamp_ok = 1;
-                tcp_parse_options(skb, &tmp_opt, &hash_location, 1, NULL);
+                tcp_parse_options(skb, &tmp_opt, &hash_location, 0);
 
                 if (tmp_opt.saw_tstamp) {
                         tmp_opt.ts_recent       = tcptw->tw_ts_recent;
@@ -526,9 +526,9 @@ struct sock *tcp_check_req(struct sock *sk, struct sk_buff *skb,
         __be32 flg = tcp_flag_word(th) & (TCP_FLAG_RST|TCP_FLAG_SYN|TCP_FLAG_ACK);
         int paws_reject = 0;
 
-        if ((th->doff > (sizeof(*th) >> 2)) && (req->ts_recent)) {
-                tmp_opt.tstamp_ok = 1;
-                tcp_parse_options(skb, &tmp_opt, &hash_location, 1, NULL);
+        tmp_opt.saw_tstamp = 0;
+        if (th->doff > (sizeof(struct tcphdr)>>2)) {
+                tcp_parse_options(skb, &tmp_opt, &hash_location, 0);
 
                 if (tmp_opt.saw_tstamp) {
                         tmp_opt.ts_recent = req->ts_recent;
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c
index 93316a96d820..383ce237640f 100644
--- a/net/ipv4/tcp_output.c
+++ b/net/ipv4/tcp_output.c
@@ -553,7 +553,6 @@ static unsigned tcp_syn_options(struct sock *sk, struct sk_buff *skb,
                                 struct tcp_md5sig_key **md5) {
         struct tcp_sock *tp = tcp_sk(sk);
         struct tcp_cookie_values *cvp = tp->cookie_values;
-        struct dst_entry *dst = __sk_dst_get(sk);
         unsigned remaining = MAX_TCP_OPTION_SPACE;
         u8 cookie_size = (!tp->rx_opt.cookie_out_never && cvp != NULL) ?
                          tcp_cookie_size_check(cvp->cookie_desired) :
@@ -581,22 +580,18 @@ static unsigned tcp_syn_options(struct sock *sk, struct sk_buff *skb,
         opts->mss = tcp_advertise_mss(sk);
         remaining -= TCPOLEN_MSS_ALIGNED;
 
-        if (likely(sysctl_tcp_timestamps &&
-                   !dst_feature(dst, RTAX_FEATURE_NO_TSTAMP) &&
-                   *md5 == NULL)) {
+        if (likely(sysctl_tcp_timestamps && *md5 == NULL)) {
                 opts->options |= OPTION_TS;
                 opts->tsval = TCP_SKB_CB(skb)->when;
                 opts->tsecr = tp->rx_opt.ts_recent;
                 remaining -= TCPOLEN_TSTAMP_ALIGNED;
         }
-        if (likely(sysctl_tcp_window_scaling &&
-                   !dst_feature(dst, RTAX_FEATURE_NO_WSCALE))) {
+        if (likely(sysctl_tcp_window_scaling)) {
                 opts->ws = tp->rx_opt.rcv_wscale;
                 opts->options |= OPTION_WSCALE;
                 remaining -= TCPOLEN_WSCALE_ALIGNED;
         }
-        if (likely(sysctl_tcp_sack &&
-                   !dst_feature(dst, RTAX_FEATURE_NO_SACK))) {
+        if (likely(sysctl_tcp_sack)) {
                 opts->options |= OPTION_SACK_ADVERTISE;
                 if (unlikely(!(OPTION_TS & opts->options)))
                         remaining -= TCPOLEN_SACKPERM_ALIGNED;
@@ -2527,9 +2522,7 @@ static void tcp_connect_init(struct sock *sk)
          * See tcp_input.c:tcp_rcv_state_process case TCP_SYN_SENT.
          */
         tp->tcp_header_len = sizeof(struct tcphdr) +
-                (sysctl_tcp_timestamps &&
-                (!dst_feature(dst, RTAX_FEATURE_NO_TSTAMP) ?
-                  TCPOLEN_TSTAMP_ALIGNED : 0));
+                (sysctl_tcp_timestamps ? TCPOLEN_TSTAMP_ALIGNED : 0);
 
 #ifdef CONFIG_TCP_MD5SIG
         if (tp->af_specific->md5_lookup(sk, sk) != NULL)
@@ -2555,8 +2548,7 @@ static void tcp_connect_init(struct sock *sk)
                                   tp->advmss - (tp->rx_opt.ts_recent_stamp ? tp->tcp_header_len - sizeof(struct tcphdr) : 0),
                                   &tp->rcv_wnd,
                                   &tp->window_clamp,
-                                  (sysctl_tcp_window_scaling &&
-                                   !dst_feature(dst, RTAX_FEATURE_NO_WSCALE)),
+                                  sysctl_tcp_window_scaling,
                                   &rcv_wscale);
 
         tp->rx_opt.rcv_wscale = rcv_wscale;
diff --git a/net/ipv4/tcp_timer.c b/net/ipv4/tcp_timer.c
index 8353a538cd4c..8816a20c2597 100644
--- a/net/ipv4/tcp_timer.c
+++ b/net/ipv4/tcp_timer.c
@@ -132,6 +132,35 @@ static void tcp_mtu_probing(struct inet_connection_sock *icsk, struct sock *sk)
         }
 }
 
+/* This function calculates a "timeout" which is equivalent to the timeout of a
+ * TCP connection after "boundary" unsucessful, exponentially backed-off
+ * retransmissions with an initial RTO of TCP_RTO_MIN.
+ */
+static bool retransmits_timed_out(struct sock *sk,
+                                  unsigned int boundary)
+{
+        unsigned int timeout, linear_backoff_thresh;
+        unsigned int start_ts;
+
+        if (!inet_csk(sk)->icsk_retransmits)
+                return false;
+
+        if (unlikely(!tcp_sk(sk)->retrans_stamp))
+                start_ts = TCP_SKB_CB(tcp_write_queue_head(sk))->when;
+        else
+                start_ts = tcp_sk(sk)->retrans_stamp;
+
+        linear_backoff_thresh = ilog2(TCP_RTO_MAX/TCP_RTO_MIN);
+
+        if (boundary <= linear_backoff_thresh)
+                timeout = ((2 << boundary) - 1) * TCP_RTO_MIN;
+        else
+                timeout = ((2 << linear_backoff_thresh) - 1) * TCP_RTO_MIN +
+                          (boundary - linear_backoff_thresh) * TCP_RTO_MAX;
+
+        return (tcp_time_stamp - start_ts) >= timeout;
+}
+
 /* A write timeout has occurred. Process the after effects. */
 static int tcp_write_timeout(struct sock *sk)
 {
diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
index 1f9534846ca9..f0126fdd7e04 100644
--- a/net/ipv4/udp.c
+++ b/net/ipv4/udp.c
@@ -216,9 +216,8 @@ int udp_lib_get_port(struct sock *sk, unsigned short snum,
                  * force rand to be an odd multiple of UDP_HTABLE_SIZE
                  */
                 rand = (rand | 1) * (udptable->mask + 1);
-                for (last = first + udptable->mask + 1;
-                     first != last;
-                     first++) {
+                last = first + udptable->mask + 1;
+                do {
                         hslot = udp_hashslot(udptable, net, first);
                         bitmap_zero(bitmap, PORTS_PER_CHAIN);
                         spin_lock_bh(&hslot->lock);
@@ -238,7 +237,7 @@ int udp_lib_get_port(struct sock *sk, unsigned short snum,
                                 snum += rand;
                         } while (snum != first);
                         spin_unlock_bh(&hslot->lock);
-                }
+                } while (++first != last);
                 goto fail;
         } else {
                 hslot = udp_hashslot(udptable, net, snum);
diff --git a/net/ipv6/inet6_hashtables.c b/net/ipv6/inet6_hashtables.c
index c813e294ec0c..633a6c266136 100644
--- a/net/ipv6/inet6_hashtables.c
+++ b/net/ipv6/inet6_hashtables.c
@@ -22,9 +22,10 @@
 #include <net/inet6_hashtables.h>
 #include <net/ip.h>
 
-void __inet6_hash(struct sock *sk)
+int __inet6_hash(struct sock *sk, struct inet_timewait_sock *tw)
 {
         struct inet_hashinfo *hashinfo = sk->sk_prot->h.hashinfo;
+        int twrefcnt = 0;
 
         WARN_ON(!sk_unhashed(sk));
 
@@ -45,10 +46,15 @@ void __inet6_hash(struct sock *sk)
                 lock = inet_ehash_lockp(hashinfo, hash);
                 spin_lock(lock);
                 __sk_nulls_add_node_rcu(sk, list);
+                if (tw) {
+                        WARN_ON(sk->sk_hash != tw->tw_hash);
+                        twrefcnt = inet_twsk_unhash(tw);
+                }
                 spin_unlock(lock);
         }
 
         sock_prot_inuse_add(sock_net(sk), sk->sk_prot, 1);
+        return twrefcnt;
 }
 EXPORT_SYMBOL(__inet6_hash);
 
diff --git a/net/ipv6/syncookies.c b/net/ipv6/syncookies.c
index 5b9af508b8f2..7208a06576c6 100644
--- a/net/ipv6/syncookies.c
+++ b/net/ipv6/syncookies.c
@@ -185,6 +185,13 @@ struct sock *cookie_v6_check(struct sock *sk, struct sk_buff *skb)
 
         NET_INC_STATS_BH(sock_net(sk), LINUX_MIB_SYNCOOKIESRECV);
 
+        /* check for timestamp cookie support */
+        memset(&tcp_opt, 0, sizeof(tcp_opt));
+        tcp_parse_options(skb, &tcp_opt, &hash_location, 0);
+
+        if (tcp_opt.saw_tstamp)
+                cookie_check_timestamp(&tcp_opt);
+
         ret = NULL;
         req = inet6_reqsk_alloc(&tcp6_request_sock_ops);
         if (!req)
@@ -218,6 +225,12 @@ struct sock *cookie_v6_check(struct sock *sk, struct sk_buff *skb)
         req->expires = 0UL;
         req->retrans = 0;
         ireq->ecn_ok            = 0;
+        ireq->snd_wscale        = tcp_opt.snd_wscale;
+        ireq->rcv_wscale        = tcp_opt.rcv_wscale;
+        ireq->sack_ok           = tcp_opt.sack_ok;
+        ireq->wscale_ok         = tcp_opt.wscale_ok;
+        ireq->tstamp_ok         = tcp_opt.saw_tstamp;
+        req->ts_recent          = tcp_opt.saw_tstamp ? tcp_opt.rcv_tsval : 0;
         treq->rcv_isn = ntohl(th->seq) - 1;
         treq->snt_isn = cookie;
 
@@ -253,21 +266,6 @@ struct sock *cookie_v6_check(struct sock *sk, struct sk_buff *skb)
                         goto out_free;
         }
 
-        /* check for timestamp cookie support */
-        memset(&tcp_opt, 0, sizeof(tcp_opt));
-        tcp_parse_options(skb, &tcp_opt, &hash_location, 0, dst);
-
-        if (tcp_opt.saw_tstamp)
-                cookie_check_timestamp(&tcp_opt);
-
-        req->ts_recent          = tcp_opt.saw_tstamp ? tcp_opt.rcv_tsval : 0;
-
-        ireq->snd_wscale        = tcp_opt.snd_wscale;
-        ireq->rcv_wscale        = tcp_opt.rcv_wscale;
-        ireq->sack_ok           = tcp_opt.sack_ok;
-        ireq->wscale_ok         = tcp_opt.wscale_ok;
-        ireq->tstamp_ok         = tcp_opt.saw_tstamp;
-
         req->window_clamp = tp->window_clamp ? :dst_metric(dst, RTAX_WINDOW);
         tcp_select_initial_window(tcp_full_space(sk), req->mss,
                                   &req->rcv_wnd, &req->window_clamp,
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
index aadd7cef73b3..febfd595a40d 100644
--- a/net/ipv6/tcp_ipv6.c
+++ b/net/ipv6/tcp_ipv6.c
@@ -96,7 +96,7 @@ static void tcp_v6_hash(struct sock *sk)
                         return;
                 }
                 local_bh_disable();
-                __inet6_hash(sk);
+                __inet6_hash(sk, NULL);
                 local_bh_enable();
         }
 }
@@ -1169,7 +1169,6 @@ static int tcp_v6_conn_request(struct sock *sk, struct sk_buff *skb)
         struct inet6_request_sock *treq;
         struct ipv6_pinfo *np = inet6_sk(sk);
         struct tcp_sock *tp = tcp_sk(sk);
-        struct dst_entry *dst = __sk_dst_get(sk);
         __u32 isn = TCP_SKB_CB(skb)->when;
 #ifdef CONFIG_SYN_COOKIES
         int want_cookie = 0;
@@ -1208,7 +1207,7 @@ static int tcp_v6_conn_request(struct sock *sk, struct sk_buff *skb)
         tcp_clear_options(&tmp_opt);
         tmp_opt.mss_clamp = IPV6_MIN_MTU - sizeof(struct tcphdr) - sizeof(struct ipv6hdr);
         tmp_opt.user_mss = tp->rx_opt.user_mss;
-        tcp_parse_options(skb, &tmp_opt, &hash_location, 0, dst);
+        tcp_parse_options(skb, &tmp_opt, &hash_location, 0);
 
         if (tmp_opt.cookie_plus > 0 &&
             tmp_opt.saw_tstamp &&
@@ -1496,7 +1495,7 @@ static struct sock * tcp_v6_syn_recv_sock(struct sock *sk, struct sk_buff *skb,
         }
 #endif
 
-        __inet6_hash(newsk);
+        __inet6_hash(newsk, NULL);
         __inet_inherit_port(sk, newsk);
 
         return newsk;
diff --git a/net/key/af_key.c b/net/key/af_key.c
index 84209fbbeb17..76fa6fef6473 100644
--- a/net/key/af_key.c
+++ b/net/key/af_key.c
@@ -1193,6 +1193,7 @@ static struct xfrm_state * pfkey_msg2xfrm_state(struct net *net,
                         x->aalg->alg_key_len = key->sadb_key_bits;
                         memcpy(x->aalg->alg_key, key+1, keysize);
                 }
+                x->aalg->alg_trunc_len = a->uinfo.auth.icv_truncbits;
                 x->props.aalgo = sa->sadb_sa_auth;
                 /* x->algo.flags = sa->sadb_sa_flags; */
         }
diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index 93ee1fd5c08d..6dc3579c0ac5 100644
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -354,7 +354,8 @@ static void sta_set_sinfo(struct sta_info *sta, struct station_info *sinfo)
         sinfo->rx_packets = sta->rx_packets;
         sinfo->tx_packets = sta->tx_packets;
 
-        if (sta->local->hw.flags & IEEE80211_HW_SIGNAL_DBM) {
+        if ((sta->local->hw.flags & IEEE80211_HW_SIGNAL_DBM) ||
+            (sta->local->hw.flags & IEEE80211_HW_SIGNAL_UNSPEC)) {
                 sinfo->filled |= STATION_INFO_SIGNAL;
                 sinfo->signal = (s8)sta->last_signal;
         }
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
index 419f186cfcf0..91dc8636d644 100644
--- a/net/mac80211/ieee80211_i.h
+++ b/net/mac80211/ieee80211_i.h
@@ -746,6 +746,7 @@ struct ieee80211_local {
         unsigned int wmm_acm; /* bit field of ACM bits (BIT(802.1D tag)) */
 
         bool pspolling;
+        bool scan_ps_enabled;
         /*
          * PS can only be enabled when we have exactly one managed
          * interface (and monitors) in PS, this then points there.
diff --git a/net/mac80211/mesh.c b/net/mac80211/mesh.c
index c0fe46493f71..6a4331429598 100644
--- a/net/mac80211/mesh.c
+++ b/net/mac80211/mesh.c
@@ -427,7 +427,7 @@ int ieee80211_new_mesh_header(struct ieee80211s_hdr *meshhdr,
                 char *addr5, char *addr6)
 {
         int aelen = 0;
-        memset(meshhdr, 0, sizeof(meshhdr));
+        memset(meshhdr, 0, sizeof(*meshhdr));
         meshhdr->ttl = sdata->u.mesh.mshcfg.dot11MeshTTL;
         put_unaligned(cpu_to_le32(sdata->u.mesh.mesh_seqnum), &meshhdr->seqnum);
         sdata->u.mesh.mesh_seqnum++;
diff --git a/net/mac80211/mesh.h b/net/mac80211/mesh.h
index 31e102541869..85562c59d7d6 100644
--- a/net/mac80211/mesh.h
+++ b/net/mac80211/mesh.h
@@ -188,8 +188,9 @@ struct mesh_rmc {
  */
 #define MESH_PREQ_MIN_INT       10
 #define MESH_DIAM_TRAVERSAL_TIME 50
-/* Paths will be refreshed if they are closer than PATH_REFRESH_TIME to their
- * expiration
+/* A path will be refreshed if it is used PATH_REFRESH_TIME milliseconds before
+ * timing out.  This way it will remain ACTIVE and no data frames will be
+ * unnecesarily held in the pending queue.
  */
 #define MESH_PATH_REFRESH_TIME                  1000
 #define MESH_MIN_DISCOVERY_TIMEOUT (2 * MESH_DIAM_TRAVERSAL_TIME)
diff --git a/net/mac80211/mesh_hwmp.c b/net/mac80211/mesh_hwmp.c
index 833b2f3670c5..d28acb6b1f81 100644
--- a/net/mac80211/mesh_hwmp.c
+++ b/net/mac80211/mesh_hwmp.c
@@ -937,7 +937,7 @@ int mesh_nexthop_lookup(struct sk_buff *skb,
 
         if (mpath->flags & MESH_PATH_ACTIVE) {
                 if (time_after(jiffies,
-                               mpath->exp_time +
+                               mpath->exp_time -
                                msecs_to_jiffies(sdata->u.mesh.mshcfg.path_refresh_time)) &&
                     !memcmp(sdata->dev->dev_addr, hdr->addr4, ETH_ALEN) &&
                     !(mpath->flags & MESH_PATH_RESOLVING) &&
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index 6dc7b5ad9a41..d8d50fb5e823 100644
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -1083,8 +1083,6 @@ static void ieee80211_set_disassoc(struct ieee80211_sub_if_data *sdata,
 
         ieee80211_set_wmm_default(sdata);
 
-        ieee80211_recalc_idle(local);
-
         /* channel(_type) changes are handled by ieee80211_hw_config */
         local->oper_channel_type = NL80211_CHAN_NO_HT;
 
@@ -1370,6 +1368,7 @@ ieee80211_rx_mgmt_deauth(struct ieee80211_sub_if_data *sdata,
 
         if (!wk) {
                 ieee80211_set_disassoc(sdata, true);
+                ieee80211_recalc_idle(sdata->local);
         } else {
                 list_del(&wk->list);
                 kfree(wk);
@@ -1403,6 +1402,7 @@ ieee80211_rx_mgmt_disassoc(struct ieee80211_sub_if_data *sdata,
                         sdata->dev->name, mgmt->sa, reason_code);
 
         ieee80211_set_disassoc(sdata, false);
+        ieee80211_recalc_idle(sdata->local);
         return RX_MGMT_CFG80211_DISASSOC;
 }
 
@@ -2117,6 +2117,7 @@ static void ieee80211_sta_work(struct work_struct *work)
                                 " after %dms, disconnecting.\n",
                                 bssid, (1000 * IEEE80211_PROBE_WAIT)/HZ);
                         ieee80211_set_disassoc(sdata, true);
+                        ieee80211_recalc_idle(local);
                         mutex_unlock(&ifmgd->mtx);
                         /*
                          * must be outside lock due to cfg80211,
@@ -2560,6 +2561,8 @@ int ieee80211_mgd_deauth(struct ieee80211_sub_if_data *sdata,
                         IEEE80211_STYPE_DEAUTH, req->reason_code,
                         cookie);
 
+        ieee80211_recalc_idle(sdata->local);
+
         return 0;
 }
 
@@ -2592,5 +2595,8 @@ int ieee80211_mgd_disassoc(struct ieee80211_sub_if_data *sdata,
         ieee80211_send_deauth_disassoc(sdata, req->bss->bssid,
                         IEEE80211_STYPE_DISASSOC, req->reason_code,
                         cookie);
+
+        ieee80211_recalc_idle(sdata->local);
+
         return 0;
 }
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
index f237df408378..9f2807aeaf52 100644
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@ -1712,7 +1712,6 @@ ieee80211_rx_h_mesh_fwding(struct ieee80211_rx_data *rx)
                         mpp_path_add(proxied_addr, mpp_addr, sdata);
                 } else {
                         spin_lock_bh(&mppath->state_lock);
-                        mppath->exp_time = jiffies;
                         if (compare_ether_addr(mppath->mpp, mpp_addr) != 0)
                                 memcpy(mppath->mpp, mpp_addr, ETH_ALEN);
                         spin_unlock_bh(&mppath->state_lock);
diff --git a/net/mac80211/scan.c b/net/mac80211/scan.c
index 4cf387c944bf..f1a4c7160300 100644
--- a/net/mac80211/scan.c
+++ b/net/mac80211/scan.c
@@ -227,7 +227,8 @@ static bool ieee80211_prep_hw_scan(struct ieee80211_local *local)
 static void ieee80211_scan_ps_enable(struct ieee80211_sub_if_data *sdata)
 {
         struct ieee80211_local *local = sdata->local;
-        bool ps = false;
+
+        local->scan_ps_enabled = false;
 
         /* FIXME: what to do when local->pspolling is true? */
 
@@ -235,12 +236,13 @@ static void ieee80211_scan_ps_enable(struct ieee80211_sub_if_data *sdata)
         cancel_work_sync(&local->dynamic_ps_enable_work);
 
         if (local->hw.conf.flags & IEEE80211_CONF_PS) {
-                ps = true;
+                local->scan_ps_enabled = true;
                 local->hw.conf.flags &= ~IEEE80211_CONF_PS;
                 ieee80211_hw_config(local, IEEE80211_CONF_CHANGE_PS);
         }
 
-        if (!ps || !(local->hw.flags & IEEE80211_HW_PS_NULLFUNC_STACK))
+        if (!(local->scan_ps_enabled) ||
+            !(local->hw.flags & IEEE80211_HW_PS_NULLFUNC_STACK))
                 /*
                  * If power save was enabled, no need to send a nullfunc
                  * frame because AP knows that we are sleeping. But if the
@@ -261,7 +263,7 @@ static void ieee80211_scan_ps_disable(struct ieee80211_sub_if_data *sdata)
 
         if (!local->ps_sdata)
                 ieee80211_send_nullfunc(local, sdata, 0);
-        else {
+        else if (local->scan_ps_enabled) {
                 /*
                  * In !IEEE80211_HW_PS_NULLFUNC_STACK case the hardware
                  * will send a nullfunc frame with the powersave bit set
@@ -277,6 +279,16 @@ static void ieee80211_scan_ps_disable(struct ieee80211_sub_if_data *sdata)
                  */
                 local->hw.conf.flags |= IEEE80211_CONF_PS;
                 ieee80211_hw_config(local, IEEE80211_CONF_CHANGE_PS);
+        } else if (local->hw.conf.dynamic_ps_timeout > 0) {
+                /*
+                 * If IEEE80211_CONF_PS was not set and the dynamic_ps_timer
+                 * had been running before leaving the operating channel,
+                 * restart the timer now and send a nullfunc frame to inform
+                 * the AP that we are awake.
+                 */
+                ieee80211_send_nullfunc(local, sdata, 0);
+                mod_timer(&local->dynamic_ps_timer, jiffies +
+                          msecs_to_jiffies(local->hw.conf.dynamic_ps_timeout));
         }
 }
 
diff --git a/net/mac80211/util.c b/net/mac80211/util.c
index d09f78bb2442..78a6e924c7e1 100644
--- a/net/mac80211/util.c
+++ b/net/mac80211/util.c
@@ -579,7 +579,7 @@ u32 ieee802_11_parse_elems_crc(u8 *start, size_t len,
                 if (elen > left)
                         break;
 
-                if (calc_crc && id < 64 && (filter & BIT(id)))
+                if (calc_crc && id < 64 && (filter & (1ULL << id)))
                         crc = crc32_be(crc, pos - 2, elen + 2);
 
                 switch (id) {
diff --git a/net/rfkill/core.c b/net/rfkill/core.c
index 448e5a0fcc2e..c218e07e5caf 100644
--- a/net/rfkill/core.c
+++ b/net/rfkill/core.c
@@ -579,6 +579,8 @@ static ssize_t rfkill_name_show(struct device *dev,
 
 static const char *rfkill_get_type_str(enum rfkill_type type)
 {
+        BUILD_BUG_ON(NUM_RFKILL_TYPES != RFKILL_TYPE_FM + 1);
+
         switch (type) {
         case RFKILL_TYPE_WLAN:
                 return "wlan";
@@ -597,8 +599,6 @@ static const char *rfkill_get_type_str(enum rfkill_type type)
         default:
                 BUG();
         }
-
-        BUILD_BUG_ON(NUM_RFKILL_TYPES != RFKILL_TYPE_FM + 1);
 }
 
 static ssize_t rfkill_type_show(struct device *dev,
diff --git a/net/wireless/reg.c b/net/wireless/reg.c
index c01470e7de15..baa898add287 100644
--- a/net/wireless/reg.c
+++ b/net/wireless/reg.c
@@ -141,62 +141,35 @@ static const struct ieee80211_regdomain us_regdom = {
         .reg_rules = {
                 /* IEEE 802.11b/g, channels 1..11 */
                 REG_RULE(2412-10, 2462+10, 40, 6, 27, 0),
-                /* IEEE 802.11a, channel 36 */
-                REG_RULE(5180-10, 5180+10, 40, 6, 23, 0),
-                /* IEEE 802.11a, channel 40 */
-                REG_RULE(5200-10, 5200+10, 40, 6, 23, 0),
-                /* IEEE 802.11a, channel 44 */
-                REG_RULE(5220-10, 5220+10, 40, 6, 23, 0),
+                /* IEEE 802.11a, channel 36..48 */
+                REG_RULE(5180-10, 5240+10, 40, 6, 17, 0),
                 /* IEEE 802.11a, channels 48..64 */
-                REG_RULE(5240-10, 5320+10, 40, 6, 23, 0),
+                REG_RULE(5260-10, 5320+10, 40, 6, 20, NL80211_RRF_DFS),
+                /* IEEE 802.11a, channels 100..124 */
+                REG_RULE(5500-10, 5590+10, 40, 6, 20, NL80211_RRF_DFS),
+                /* IEEE 802.11a, channels 132..144 */
+                REG_RULE(5660-10, 5700+10, 40, 6, 20, NL80211_RRF_DFS),
                 /* IEEE 802.11a, channels 149..165, outdoor */
                 REG_RULE(5745-10, 5825+10, 40, 6, 30, 0),
         }
 };
 
 static const struct ieee80211_regdomain jp_regdom = {
-        .n_reg_rules = 3,
+        .n_reg_rules = 6,
         .alpha2 =  "JP",
         .reg_rules = {
-                /* IEEE 802.11b/g, channels 1..14 */
-                REG_RULE(2412-10, 2484+10, 40, 6, 20, 0),
-                /* IEEE 802.11a, channels 34..48 */
-                REG_RULE(5170-10, 5240+10, 40, 6, 20,
-                        NL80211_RRF_PASSIVE_SCAN),
+                /* IEEE 802.11b/g, channels 1..11 */
+                REG_RULE(2412-10, 2462+10, 40, 6, 20, 0),
+                /* IEEE 802.11b/g, channels 12..13 */
+                REG_RULE(2467-10, 2472+10, 20, 6, 20, 0),
+                /* IEEE 802.11b/g, channel 14 */
+                REG_RULE(2484-10, 2484+10, 20, 6, 20, NL80211_RRF_NO_OFDM),
+                /* IEEE 802.11a, channels 36..48 */
+                REG_RULE(5180-10, 5240+10, 40, 6, 20, 0),
                 /* IEEE 802.11a, channels 52..64 */
-                REG_RULE(5260-10, 5320+10, 40, 6, 20,
-                        NL80211_RRF_NO_IBSS |
-                        NL80211_RRF_DFS),
-        }
-};
-
-static const struct ieee80211_regdomain eu_regdom = {
-        .n_reg_rules = 6,
-        /*
-         * This alpha2 is bogus, we leave it here just for stupid
-         * backward compatibility
-         */
-        .alpha2 =  "EU",
-        .reg_rules = {
-                /* IEEE 802.11b/g, channels 1..13 */
-                REG_RULE(2412-10, 2472+10, 40, 6, 20, 0),
-                /* IEEE 802.11a, channel 36 */
-                REG_RULE(5180-10, 5180+10, 40, 6, 23,
-                        NL80211_RRF_PASSIVE_SCAN),
-                /* IEEE 802.11a, channel 40 */
-                REG_RULE(5200-10, 5200+10, 40, 6, 23,
-                        NL80211_RRF_PASSIVE_SCAN),
-                /* IEEE 802.11a, channel 44 */
-                REG_RULE(5220-10, 5220+10, 40, 6, 23,
-                        NL80211_RRF_PASSIVE_SCAN),
-                /* IEEE 802.11a, channels 48..64 */
-                REG_RULE(5240-10, 5320+10, 40, 6, 20,
-                        NL80211_RRF_NO_IBSS |
-                        NL80211_RRF_DFS),
-                /* IEEE 802.11a, channels 100..140 */
-                REG_RULE(5500-10, 5700+10, 40, 6, 30,
-                        NL80211_RRF_NO_IBSS |
-                        NL80211_RRF_DFS),
+                REG_RULE(5260-10, 5320+10, 40, 6, 20, NL80211_RRF_DFS),
+                /* IEEE 802.11a, channels 100..144 */
+                REG_RULE(5500-10, 5700+10, 40, 6, 23, NL80211_RRF_DFS),
         }
 };
 
@@ -206,15 +179,17 @@ static const struct ieee80211_regdomain *static_regdom(char *alpha2)
                 return &us_regdom;
         if (alpha2[0] == 'J' && alpha2[1] == 'P')
                 return &jp_regdom;
+        /* Use world roaming rules for "EU", since it was a pseudo
+           domain anyway... */
         if (alpha2[0] == 'E' && alpha2[1] == 'U')
-                return &eu_regdom;
-        /* Default, as per the old rules */
-        return &us_regdom;
+                return &world_regdom;
+        /* Default, world roaming rules */
+        return &world_regdom;
 }
 
 static bool is_old_static_regdom(const struct ieee80211_regdomain *rd)
 {
-        if (rd == &us_regdom || rd == &jp_regdom || rd == &eu_regdom)
+        if (rd == &us_regdom || rd == &jp_regdom || rd == &world_regdom)
                 return true;
         return false;
 }
diff --git a/net/wireless/wext-compat.c b/net/wireless/wext-compat.c
index 584eb4826e02..54face3d4424 100644
--- a/net/wireless/wext-compat.c
+++ b/net/wireless/wext-compat.c
@@ -479,6 +479,7 @@ static int __cfg80211_set_encryption(struct cfg80211_registered_device *rdev,
                         }
                         err = rdev->ops->del_key(&rdev->wiphy, dev, idx, addr);
                 }
+                wdev->wext.connect.privacy = false;
                 /*
                  * Applications using wireless extensions expect to be
                  * able to delete keys that don't exist, so allow that.