1012 files changed, 49784 insertions, 32650 deletions

diff --git a/Documentation/connector/cn_test.c b/Documentation/connector/cn_test.c
index 7764594778d..adcca0368d6 100644
--- a/Documentation/connector/cn_test.c
+++ b/Documentation/connector/cn_test.c
@@ -69,9 +69,13 @@ static int cn_test_want_notify(void)
                 return -ENOMEM;
         }
 
-        nlh = NLMSG_PUT(skb, 0, 0x123, NLMSG_DONE, size - sizeof(*nlh));
+        nlh = nlmsg_put(skb, 0, 0x123, NLMSG_DONE, size - sizeof(*nlh), 0);
+        if (!nlh) {
+                kfree_skb(skb);
+                return -EMSGSIZE;
+        }
 
-        msg = (struct cn_msg *)NLMSG_DATA(nlh);
+        msg = nlmsg_data(nlh);
 
         memset(msg, 0, size0);
 
@@ -117,11 +121,6 @@ static int cn_test_want_notify(void)
         pr_info("request was sent: group=0x%x\n", ctl->group);
 
         return 0;
-
-nlmsg_failure:
-        pr_err("failed to send %u.%u\n", msg->seq, msg->ack);
-        kfree_skb(skb);
-        return -EINVAL;
 }
 #endif
 
diff --git a/Documentation/devicetree/bindings/net/broadcom-bcm87xx.txt b/Documentation/devicetree/bindings/net/broadcom-bcm87xx.txt
new file mode 100644
index 00000000000..7c86d5e28a0
--- /dev/null
+++ b/Documentation/devicetree/bindings/net/broadcom-bcm87xx.txt
@@ -0,0 +1,29 @@
+The Broadcom BCM87XX devices are a family of 10G Ethernet PHYs.  They
+have these bindings in addition to the standard PHY bindings.
+
+Compatible: Should contain "broadcom,bcm8706" or "broadcom,bcm8727" and
+            "ethernet-phy-ieee802.3-c45"
+
+Optional Properties:
+
+- broadcom,c45-reg-init : one of more sets of 4 cells.  The first cell
+  is the MDIO Manageable Device (MMD) address, the second a register
+  address within the MMD, the third cell contains a mask to be ANDed
+  with the existing register value, and the fourth cell is ORed with
+  he result to yield the new register value.  If the third cell has a
+  value of zero, no read of the existing value is performed.
+
+Example:
+
+        ethernet-phy@5 {
+                reg = <5>;
+                compatible = "broadcom,bcm8706", "ethernet-phy-ieee802.3-c45";
+                interrupt-parent = <&gpio>;
+                interrupts = <12 8>; /* Pin 12, active low */
+                /*
+                 * Set PMD Digital Control Register for
+                 * GPIO[1] Tx/Rx
+                 * GPIO[0] R64 Sync Acquired
+                 */
+                broadcom,c45-reg-init = <1 0xc808 0xff8f 0x70>;
+        };
diff --git a/Documentation/devicetree/bindings/net/can/fsl-flexcan.txt b/Documentation/devicetree/bindings/net/can/fsl-flexcan.txt
index f31b686d455..8ff324eaa88 100644
--- a/Documentation/devicetree/bindings/net/can/fsl-flexcan.txt
+++ b/Documentation/devicetree/bindings/net/can/fsl-flexcan.txt
@@ -11,6 +11,9 @@ Required properties:
 
 - reg : Offset and length of the register set for this device
 - interrupts : Interrupt tuple for this device
+
+Optional properties:
+
 - clock-frequency : The oscillator frequency driving the flexcan device
 
 Example:
diff --git a/Documentation/devicetree/bindings/net/fsl-fec.txt b/Documentation/devicetree/bindings/net/fsl-fec.txt
index 7ab9e1a2d8b..f7a2fefc8ef 100644
--- a/Documentation/devicetree/bindings/net/fsl-fec.txt
+++ b/Documentation/devicetree/bindings/net/fsl-fec.txt
@@ -7,10 +7,14 @@ Required properties:
 - phy-mode : String, operation mode of the PHY interface.
   Supported values are: "mii", "gmii", "sgmii", "tbi", "rmii",
   "rgmii", "rgmii-id", "rgmii-rxid", "rgmii-txid", "rtbi", "smii".
-- phy-reset-gpios : Should specify the gpio for phy reset
 
 Optional properties:
 - local-mac-address : 6 bytes, mac address
+- phy-reset-gpios : Should specify the gpio for phy reset
+- phy-reset-duration : Reset duration in milliseconds.  Should present
+  only if property "phy-reset-gpios" is available.  Missing the property
+  will have the duration be 1 millisecond.  Numbers greater than 1000 are
+  invalid and 1 millisecond will be used instead.
 
 Example:
 
diff --git a/Documentation/devicetree/bindings/net/phy.txt b/Documentation/devicetree/bindings/net/phy.txt
index bb8c742eb8c..7cd18fbfcf7 100644
--- a/Documentation/devicetree/bindings/net/phy.txt
+++ b/Documentation/devicetree/bindings/net/phy.txt
@@ -14,10 +14,20 @@ Required properties:
  - linux,phandle :  phandle for this node; likely referenced by an
    ethernet controller node.
 
+Optional Properties:
+
+- compatible: Compatible list, may contain
+  "ethernet-phy-ieee802.3-c22" or "ethernet-phy-ieee802.3-c45" for
+  PHYs that implement IEEE802.3 clause 22 or IEEE802.3 clause 45
+  specifications. If neither of these are specified, the default is to
+  assume clause 22. The compatible list may also contain other
+  elements.
+
 Example:
 
 ethernet-phy@0 {
-        linux,phandle = <2452000>
+        compatible = "ethernet-phy-ieee802.3-c22";
+        linux,phandle = <2452000>;
         interrupt-parent = <40000>;
         interrupts = <35 1>;
         reg = <0>;
diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index 56000b33340..61d1a89baea 100644
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -249,15 +249,6 @@ Who:	Ravikiran Thirumalai <kiran@scalex86.org>
 
 ---------------------------
 
-What:   Code that is now under CONFIG_WIRELESS_EXT_SYSFS
-        (in net/core/net-sysfs.c)
-When:   3.5
-Why:    Over 1K .text/.data size reduction, data is available in other
-        ways (ioctls)
-Who:    Johannes Berg <johannes@sipsolutions.net>
-
----------------------------
-
 What:   sysfs ui for changing p4-clockmod parameters
 When:   September 2009
 Why:    See commits 129f8ae9b1b5be94517da76009ea956e89104ce8 and
@@ -414,21 +405,6 @@ Who:	Jean Delvare <khali@linux-fr.org>
 
 ----------------------------
 
-What:   xt_connlimit rev 0
-When:   2012
-Who:    Jan Engelhardt <jengelh@medozas.de>
-Files:  net/netfilter/xt_connlimit.c
-
-----------------------------
-
-What:   ipt_addrtype match include file
-When:   2012
-Why:    superseded by xt_addrtype
-Who:    Florian Westphal <fw@strlen.de>
-Files:  include/linux/netfilter_ipv4/ipt_addrtype.h
-
-----------------------------
-
 What:   i2c_driver.attach_adapter
         i2c_driver.detach_adapter
 When:   September 2011
@@ -449,6 +425,19 @@ Who:	Hans Verkuil <hans.verkuil@cisco.com>
 
 ----------------------------
 
+What:   CONFIG_CFG80211_WEXT
+When:   as soon as distributions ship new wireless tools, ie. wpa_supplicant 1.0
+        and NetworkManager/connman/etc. that are able to use nl80211
+Why:    Wireless extensions are deprecated, and userland tools are moving to
+        using nl80211. New drivers are no longer using wireless extensions,
+        and while there might still be old drivers, both new drivers and new
+        userland no longer needs them and they can't be used for an feature
+        developed in the past couple of years. As such, compatibility with
+        wireless extensions in new drivers will be removed.
+Who:    Johannes Berg <johannes@sipsolutions.net>
+
+----------------------------
+
 What:   g_file_storage driver
 When:   3.8
 Why:    This driver has been superseded by g_mass_storage.
@@ -589,6 +578,13 @@ Why:	Remount currently allows changing bound subsystems and
 
 ----------------------------
 
+What:  xt_recent rev 0
+When:  2013
+Who:   Pablo Neira Ayuso <pablo@netfilter.org>
+Files: net/netfilter/xt_recent.c
+
+----------------------------
+
 What:   KVM debugfs statistics
 When:   2013
 Why:    KVM tracepoints provide mostly equivalent information in a much more
diff --git a/Documentation/networking/batman-adv.txt b/Documentation/networking/batman-adv.txt
index 75a592365af..8f3ae4a6147 100644
--- a/Documentation/networking/batman-adv.txt
+++ b/Documentation/networking/batman-adv.txt
@@ -211,6 +211,11 @@ The debug output can be changed at runtime  using  the  file
 
 will enable debug messages for when routes change.
 
+Counters for different types of packets entering and leaving the
+batman-adv module are available through ethtool:
+
+# ethtool --statistics bat0
+
 
 BATCTL
 ------
diff --git a/Documentation/networking/caif/Linux-CAIF.txt b/Documentation/networking/caif/Linux-CAIF.txt
index e52fd62bef3..0aa4bd381be 100644
--- a/Documentation/networking/caif/Linux-CAIF.txt
+++ b/Documentation/networking/caif/Linux-CAIF.txt
@@ -19,60 +19,36 @@ and host. Currently, UART and Loopback are available for Linux.
 Architecture:
 ------------
 The implementation of CAIF is divided into:
-* CAIF Socket Layer, Kernel API, and  Net Device.
+* CAIF Socket Layer and GPRS IP Interface.
 * CAIF Core Protocol Implementation
 * CAIF Link Layer, implemented as NET devices.
 
 
   RTNL
    !
-   !     +------+   +------+   +------+
-   !    +------+!  +------+!  +------+!
-   !    ! Sock !!  !Kernel!!  ! Net  !!
-   !    ! API  !+  ! API  !+  ! Dev  !+   <- CAIF Client APIs
-   !    +------+   +------!   +------+
-   !       !          !          !
-   !       +----------!----------+
-   !               +------+               <- CAIF Protocol Implementation
-   +------->       ! CAIF !
-                   ! Core !
-                   +------+
-             +--------!--------+
-             !                 !
-          +------+          +-----+
-          !      !          ! TTY !       <- Link Layer (Net Devices)
-          +------+          +-----+
-
-
-Using the Kernel API
-----------------------
-The Kernel API is used for accessing CAIF channels from the
-kernel.
-The user of the API has to implement two callbacks for receive
-and control.
-The receive callback gives a CAIF packet as a SKB. The control
-callback will
-notify of channel initialization complete, and flow-on/flow-
-off.
-
-
-  struct caif_device caif_dev = {
-    .caif_config = {
-     .name = "MYDEV"
-     .type = CAIF_CHTY_AT
-    }
-   .receive_cb = my_receive,
-   .control_cb = my_control,
-  };
-  caif_add_device(&caif_dev);
-  caif_transmit(&caif_dev, skb);
-
-See the caif_kernel.h for details about the CAIF kernel API.
+   !          +------+   +------+
+   !         +------+!  +------+!
+   !         !  IP  !!  !Socket!!
+   +-------> !interf!+  ! API  !+       <- CAIF Client APIs
+   !         +------+   +------!
+   !            !           !
+   !            +-----------+
+   !                  !
+   !               +------+             <- CAIF Core Protocol
+   !               ! CAIF !
+   !               ! Core !
+   !               +------+
+   !       +----------!---------+
+   !       !          !         !
+   !    +------+   +-----+   +------+
+   +--> ! HSI  !   ! TTY !   ! USB  !   <- Link Layer (Net Devices)
+        +------+   +-----+   +------+
+
 
 
 I M P L E M E N T A T I O N
 ===========================
-===========================
+
 
 CAIF Core Protocol Layer
 =========================================
@@ -88,17 +64,13 @@ The Core CAIF implementation contains:
       - Simple implementation of CAIF.
       - Layered architecture (a la Streams), each layer in the CAIF
         specification is implemented in a separate c-file.
-      - Clients must implement PHY layer to access physical HW
-        with receive and transmit functions.
       - Clients must call configuration function to add PHY layer.
       - Clients must implement CAIF layer to consume/produce
         CAIF payload with receive and transmit functions.
       - Clients must call configuration function to add and connect the
         Client layer.
       - When receiving / transmitting CAIF Packets (cfpkt), ownership is passed
-        to the called function (except for framing layers' receive functions
-        or if a transmit function returns an error, in which case the caller
-        must free the packet).
+        to the called function (except for framing layers' receive function)
 
 Layered Architecture
 --------------------
@@ -109,11 +81,6 @@ Implementation. The support functions include:
         CAIF Packet has functions for creating, destroying and adding content
         and for adding/extracting header and trailers to protocol packets.
 
-      - CFLST CAIF list implementation.
-
-      - CFGLUE CAIF Glue. Contains OS Specifics, such as memory
-        allocation, endianness, etc.
-
 The CAIF Protocol implementation contains:
 
       - CFCNFG CAIF Configuration layer. Configures the CAIF Protocol
@@ -128,7 +95,7 @@ The CAIF Protocol implementation contains:
         control and remote shutdown requests.
 
       - CFVEI CAIF VEI layer. Handles CAIF AT Channels on VEI (Virtual
-        External Interface). This layer encodes/decodes VEI frames.
+        External Interface). This layer encodes/decodes VEI frames.
 
       - CFDGML CAIF Datagram layer. Handles CAIF Datagram layer (IP
         traffic), encodes/decodes Datagram frames.
@@ -170,7 +137,7 @@ The CAIF Protocol implementation contains:
             +---------+     +---------+
                  !              !
             +---------+     +---------+
-            |         |     | Serial  |
+            |         |     | Serial  |
             |         |     | CFSERL  |
             +---------+     +---------+
 
@@ -186,24 +153,20 @@ In this layered approach the following "rules" apply.
                  layer->dn->transmit(layer->dn, packet);
 
 
-Linux Driver Implementation
+CAIF Socket and IP interface
 ===========================
 
-Linux GPRS Net Device and CAIF socket are implemented on top of the
-CAIF Core protocol. The Net device and CAIF socket have an instance of
+The IP interface and CAIF socket API are implemented on top of the
+CAIF Core protocol. The IP Interface and CAIF socket have an instance of
 'struct cflayer', just like the CAIF Core protocol stack.
 Net device and Socket implement the 'receive()' function defined by
 'struct cflayer', just like the rest of the CAIF stack. In this way, transmit and
 receive of packets is handled as by the rest of the layers: the 'dn->transmit()'
 function is called in order to transmit data.
 
-The layer on top of the CAIF Core implementation is
-sometimes referred to as the "Client layer".
-
-
 Configuration of Link Layer
 ---------------------------
-The Link Layer is implemented as Linux net devices (struct net_device).
+The Link Layer is implemented as Linux network devices (struct net_device).
 Payload handling and registration is done using standard Linux mechanisms.
 
 The CAIF Protocol relies on a loss-less link layer without implementing
diff --git a/Documentation/networking/can.txt b/Documentation/networking/can.txt
index ac295399f0d..820f55344ed 100644
--- a/Documentation/networking/can.txt
+++ b/Documentation/networking/can.txt
@@ -22,7 +22,8 @@ This file contains
       4.1.2 RAW socket option CAN_RAW_ERR_FILTER
       4.1.3 RAW socket option CAN_RAW_LOOPBACK
       4.1.4 RAW socket option CAN_RAW_RECV_OWN_MSGS
-      4.1.5 RAW socket returned message flags
+      4.1.5 RAW socket option CAN_RAW_FD_FRAMES
+      4.1.6 RAW socket returned message flags
     4.2 Broadcast Manager protocol sockets (SOCK_DGRAM)
     4.3 connected transport protocols (SOCK_SEQPACKET)
     4.4 unconnected transport protocols (SOCK_DGRAM)
@@ -41,7 +42,8 @@ This file contains
       6.5.1 Netlink interface to set/get devices properties
       6.5.2 Setting the CAN bit-timing
       6.5.3 Starting and stopping the CAN network device
-    6.6 supported CAN hardware
+    6.6 CAN FD (flexible data rate) driver support
+    6.7 supported CAN hardware
 
   7 Socket CAN resources
 
@@ -232,16 +234,16 @@ solution for a couple of reasons:
   arbitration problems and error frames caused by the different
   ECUs. The occurrence of detected errors are important for diagnosis
   and have to be logged together with the exact timestamp. For this
-  reason the CAN interface driver can generate so called Error Frames
-  that can optionally be passed to the user application in the same
-  way as other CAN frames. Whenever an error on the physical layer
+  reason the CAN interface driver can generate so called Error Message
+  Frames that can optionally be passed to the user application in the
+  same way as other CAN frames. Whenever an error on the physical layer
   or the MAC layer is detected (e.g. by the CAN controller) the driver
-  creates an appropriate error frame. Error frames can be requested by
-  the user application using the common CAN filter mechanisms. Inside
-  this filter definition the (interested) type of errors may be
-  selected. The reception of error frames is disabled by default.
-  The format of the CAN error frame is briefly described in the Linux
-  header file "include/linux/can/error.h".
+  creates an appropriate error message frame. Error messages frames can
+  be requested by the user application using the common CAN filter
+  mechanisms. Inside this filter definition the (interested) type of
+  errors may be selected. The reception of error messages is disabled
+  by default. The format of the CAN error message frame is briefly
+  described in the Linux header file "include/linux/can/error.h".
 
 4. How to use Socket CAN
 ------------------------
@@ -273,7 +275,7 @@ solution for a couple of reasons:
 
     struct can_frame {
             canid_t can_id;  /* 32 bit CAN_ID + EFF/RTR/ERR flags */
-            __u8    can_dlc; /* data length code: 0 .. 8 */
+            __u8    can_dlc; /* frame payload length in byte (0 .. 8) */
             __u8    data[8] __attribute__((aligned(8)));
     };
 
@@ -375,6 +377,51 @@ solution for a couple of reasons:
     nbytes = sendto(s, &frame, sizeof(struct can_frame),
                     0, (struct sockaddr*)&addr, sizeof(addr));
 
+  Remark about CAN FD (flexible data rate) support:
+
+  Generally the handling of CAN FD is very similar to the formerly described
+  examples. The new CAN FD capable CAN controllers support two different
+  bitrates for the arbitration phase and the payload phase of the CAN FD frame
+  and up to 64 bytes of payload. This extended payload length breaks all the
+  kernel interfaces (ABI) which heavily rely on the CAN frame with fixed eight
+  bytes of payload (struct can_frame) like the CAN_RAW socket. Therefore e.g.
+  the CAN_RAW socket supports a new socket option CAN_RAW_FD_FRAMES that
+  switches the socket into a mode that allows the handling of CAN FD frames
+  and (legacy) CAN frames simultaneously (see section 4.1.5).
+
+  The struct canfd_frame is defined in include/linux/can.h:
+
+    struct canfd_frame {
+            canid_t can_id;  /* 32 bit CAN_ID + EFF/RTR/ERR flags */
+            __u8    len;     /* frame payload length in byte (0 .. 64) */
+            __u8    flags;   /* additional flags for CAN FD */
+            __u8    __res0;  /* reserved / padding */
+            __u8    __res1;  /* reserved / padding */
+            __u8    data[64] __attribute__((aligned(8)));
+    };
+
+  The struct canfd_frame and the existing struct can_frame have the can_id,
+  the payload length and the payload data at the same offset inside their
+  structures. This allows to handle the different structures very similar.
+  When the content of a struct can_frame is copied into a struct canfd_frame
+  all structure elements can be used as-is - only the data[] becomes extended.
+
+  When introducing the struct canfd_frame it turned out that the data length
+  code (DLC) of the struct can_frame was used as a length information as the
+  length and the DLC has a 1:1 mapping in the range of 0 .. 8. To preserve
+  the easy handling of the length information the canfd_frame.len element
+  contains a plain length value from 0 .. 64. So both canfd_frame.len and
+  can_frame.can_dlc are equal and contain a length information and no DLC.
+  For details about the distinction of CAN and CAN FD capable devices and
+  the mapping to the bus-relevant data length code (DLC), see chapter 6.6.
+
+  The length of the two CAN(FD) frame structures define the maximum transfer
+  unit (MTU) of the CAN(FD) network interface and skbuff data length. Two
+  definitions are specified for CAN specific MTUs in include/linux/can.h :
+
+  #define CAN_MTU   (sizeof(struct can_frame))   == 16  => 'legacy' CAN frame
+  #define CANFD_MTU (sizeof(struct canfd_frame)) == 72  => CAN FD frame
+
   4.1 RAW protocol sockets with can_filters (SOCK_RAW)
 
   Using CAN_RAW sockets is extensively comparable to the commonly
@@ -383,7 +430,7 @@ solution for a couple of reasons:
   defaults are set at RAW socket binding time:
 
   - The filters are set to exactly one filter receiving everything
-  - The socket only receives valid data frames (=> no error frames)
+  - The socket only receives valid data frames (=> no error message frames)
   - The loopback of sent CAN frames is enabled (see chapter 3.2)
   - The socket does not receive its own sent frames (in loopback mode)
 
@@ -434,7 +481,7 @@ solution for a couple of reasons:
   4.1.2 RAW socket option CAN_RAW_ERR_FILTER
 
   As described in chapter 3.4 the CAN interface driver can generate so
-  called Error Frames that can optionally be passed to the user
+  called Error Message Frames that can optionally be passed to the user
   application in the same way as other CAN frames. The possible
   errors are divided into different error classes that may be filtered
   using the appropriate error mask. To register for every possible
@@ -472,7 +519,69 @@ solution for a couple of reasons:
     setsockopt(s, SOL_CAN_RAW, CAN_RAW_RECV_OWN_MSGS,
                &recv_own_msgs, sizeof(recv_own_msgs));
 
-  4.1.5 RAW socket returned message flags
+  4.1.5 RAW socket option CAN_RAW_FD_FRAMES
+
+  CAN FD support in CAN_RAW sockets can be enabled with a new socket option
+  CAN_RAW_FD_FRAMES which is off by default. When the new socket option is
+  not supported by the CAN_RAW socket (e.g. on older kernels), switching the
+  CAN_RAW_FD_FRAMES option returns the error -ENOPROTOOPT.
+
+  Once CAN_RAW_FD_FRAMES is enabled the application can send both CAN frames
+  and CAN FD frames. OTOH the application has to handle CAN and CAN FD frames
+  when reading from the socket.
+
+    CAN_RAW_FD_FRAMES enabled:  CAN_MTU and CANFD_MTU are allowed
+    CAN_RAW_FD_FRAMES disabled: only CAN_MTU is allowed (default)
+
+  Example:
+    [ remember: CANFD_MTU == sizeof(struct canfd_frame) ]
+
+    struct canfd_frame cfd;
+
+    nbytes = read(s, &cfd, CANFD_MTU);
+
+    if (nbytes == CANFD_MTU) {
+            printf("got CAN FD frame with length %d\n", cfd.len);
+            /* cfd.flags contains valid data */
+    } else if (nbytes == CAN_MTU) {
+            printf("got legacy CAN frame with length %d\n", cfd.len);
+            /* cfd.flags is undefined */
+    } else {
+            fprintf(stderr, "read: invalid CAN(FD) frame\n");
+            return 1;
+    }
+
+    /* the content can be handled independently from the received MTU size */
+
+    printf("can_id: %X data length: %d data: ", cfd.can_id, cfd.len);
+    for (i = 0; i < cfd.len; i++)
+            printf("%02X ", cfd.data[i]);
+
+  When reading with size CANFD_MTU only returns CAN_MTU bytes that have
+  been received from the socket a legacy CAN frame has been read into the
+  provided CAN FD structure. Note that the canfd_frame.flags data field is
+  not specified in the struct can_frame and therefore it is only valid in
+  CANFD_MTU sized CAN FD frames.
+
+  As long as the payload length is <=8 the received CAN frames from CAN FD
+  capable CAN devices can be received and read by legacy sockets too. When
+  user-generated CAN FD frames have a payload length <=8 these can be send
+  by legacy CAN network interfaces too. Sending CAN FD frames with payload
+  length > 8 to a legacy CAN network interface returns an -EMSGSIZE error.
+
+  Implementation hint for new CAN applications:
+
+  To build a CAN FD aware application use struct canfd_frame as basic CAN
+  data structure for CAN_RAW based applications. When the application is
+  executed on an older Linux kernel and switching the CAN_RAW_FD_FRAMES
+  socket option returns an error: No problem. You'll get legacy CAN frames
+  or CAN FD frames and can process them the same way.
+
+  When sending to CAN devices make sure that the device is capable to handle
+  CAN FD frames by checking if the device maximum transfer unit is CANFD_MTU.
+  The CAN device MTU can be retrieved e.g. with a SIOCGIFMTU ioctl() syscall.
+
+  4.1.6 RAW socket returned message flags
 
   When using recvmsg() call, the msg->msg_flags may contain following flags:
 
@@ -527,7 +636,7 @@ solution for a couple of reasons:
 
     rcvlist_all - list for unfiltered entries (no filter operations)
     rcvlist_eff - list for single extended frame (EFF) entries
-    rcvlist_err - list for error frames masks
+    rcvlist_err - list for error message frames masks
     rcvlist_fil - list for mask/value filters
     rcvlist_inv - list for mask/value filters (inverse semantic)
     rcvlist_sff - list for single standard frame (SFF) entries
@@ -573,10 +682,13 @@ solution for a couple of reasons:
     dev->type  = ARPHRD_CAN; /* the netdevice hardware type */
     dev->flags = IFF_NOARP;  /* CAN has no arp */
 
-    dev->mtu   = sizeof(struct can_frame);
+    dev->mtu = CAN_MTU; /* sizeof(struct can_frame) -> legacy CAN interface */
 
-  The struct can_frame is the payload of each socket buffer in the
-  protocol family PF_CAN.
+    or alternative, when the controller supports CAN with flexible data rate:
+    dev->mtu = CANFD_MTU; /* sizeof(struct canfd_frame) -> CAN FD interface */
+
+  The struct can_frame or struct canfd_frame is the payload of each socket
+  buffer (skbuff) in the protocol family PF_CAN.
 
   6.2 local loopback of sent frames
 
@@ -784,15 +896,41 @@ solution for a couple of reasons:
     $ ip link set canX type can restart-ms 100
 
   Alternatively, the application may realize the "bus-off" condition
-  by monitoring CAN error frames and do a restart when appropriate with
-  the command:
+  by monitoring CAN error message frames and do a restart when
+  appropriate with the command:
 
     $ ip link set canX type can restart
 
-  Note that a restart will also create a CAN error frame (see also
-  chapter 3.4).
+  Note that a restart will also create a CAN error message frame (see
+  also chapter 3.4).
+
+  6.6 CAN FD (flexible data rate) driver support
+
+  CAN FD capable CAN controllers support two different bitrates for the
+  arbitration phase and the payload phase of the CAN FD frame. Therefore a
+  second bittiming has to be specified in order to enable the CAN FD bitrate.
+
+  Additionally CAN FD capable CAN controllers support up to 64 bytes of
+  payload. The representation of this length in can_frame.can_dlc and
+  canfd_frame.len for userspace applications and inside the Linux network
+  layer is a plain value from 0 .. 64 instead of the CAN 'data length code'.
+  The data length code was a 1:1 mapping to the payload length in the legacy
+  CAN frames anyway. The payload length to the bus-relevant DLC mapping is
+  only performed inside the CAN drivers, preferably with the helper
+  functions can_dlc2len() and can_len2dlc().
+
+  The CAN netdevice driver capabilities can be distinguished by the network
+  devices maximum transfer unit (MTU):
+
+  MTU = 16 (CAN_MTU)   => sizeof(struct can_frame)   => 'legacy' CAN device
+  MTU = 72 (CANFD_MTU) => sizeof(struct canfd_frame) => CAN FD capable device
+
+  The CAN device MTU can be retrieved e.g. with a SIOCGIFMTU ioctl() syscall.
+  N.B. CAN FD capable devices can also handle and send legacy CAN frames.
+
+  FIXME: Add details about the CAN FD controller configuration when available.
 
-  6.6 Supported CAN hardware
+  6.7 Supported CAN hardware
 
   Please check the "Kconfig" file in "drivers/net/can" to get an actual
   list of the support CAN hardware. On the Socket CAN project website
diff --git a/Documentation/networking/ip-sysctl.txt b/Documentation/networking/ip-sysctl.txt
index 6f896b94abd..47b6c79e9b0 100644
--- a/Documentation/networking/ip-sysctl.txt
+++ b/Documentation/networking/ip-sysctl.txt
@@ -857,9 +857,19 @@ accept_source_route - BOOLEAN
                 FALSE (host)
 
 accept_local - BOOLEAN
-        Accept packets with local source addresses. In combination with
-        suitable routing, this can be used to direct packets between two
-        local interfaces over the wire and have them accepted properly.
+        Accept packets with local source addresses. In combination
+        with suitable routing, this can be used to direct packets
+        between two local interfaces over the wire and have them
+        accepted properly.
+
+        rp_filter must be set to a non-zero value in order for
+        accept_local to have an effect.
+
+        default FALSE
+
+route_localnet - BOOLEAN
+        Do not consider loopback addresses as martian source or destination
+        while routing. This enables the use of 127/8 for local routing purposes.
         default FALSE
 
 rp_filter - INTEGER
diff --git a/Documentation/networking/s2io.txt b/Documentation/networking/s2io.txt
index 4be0c039edb..d2a9f43b554 100644
--- a/Documentation/networking/s2io.txt
+++ b/Documentation/networking/s2io.txt
@@ -136,16 +136,6 @@ For more information, please review the AMD8131 errata at
 http://vip.amd.com/us-en/assets/content_type/white_papers_and_tech_docs/
 26310_AMD-8131_HyperTransport_PCI-X_Tunnel_Revision_Guide_rev_3_18.pdf
 
-6.  Available Downloads
-Neterion "s2io" driver in Red Hat and Suse 2.6-based distributions is kept up 
-to date, also the latest "s2io" code (including support for 2.4 kernels) is 
-available via "Support" link on the Neterion site:  http://www.neterion.com.
-
-For Xframe User Guide (Programming manual), visit ftp site ns1.s2io.com,
-user: linuxdocs password: HALdocs
-
-7. Support 
+6. Support
 For further support please contact either your 10GbE Xframe NIC vendor (IBM, 
-HP, SGI etc.) or click on the "Support" link on the Neterion site:  
-http://www.neterion.com.
-
+HP, SGI etc.)
diff --git a/Documentation/networking/stmmac.txt b/Documentation/networking/stmmac.txt
index 5cb9a197246..c676b9cedbd 100644
--- a/Documentation/networking/stmmac.txt
+++ b/Documentation/networking/stmmac.txt
@@ -257,9 +257,11 @@ reset procedure etc).
  o Makefile
  o stmmac_main.c: main network device driver;
  o stmmac_mdio.c: mdio functions;
+ o stmmac_pci: PCI driver;
+ o stmmac_platform.c: platform driver
  o stmmac_ethtool.c: ethtool support;
  o stmmac_timer.[ch]: timer code used for mitigating the driver dma interrupts
-                      Only tested on ST40 platforms based.
+                      (only tested on ST40 platforms based);
  o stmmac.h: private driver structure;
  o common.h: common definitions and VFTs;
  o descs.h: descriptor structure definitions;
@@ -269,9 +271,11 @@ reset procedure etc).
  o dwmac100_core: MAC 100 core and dma code;
  o dwmac100_dma.c: dma funtions for the MAC chip;
  o dwmac1000.h: specific header file for the MAC;
- o dwmac_lib.c: generic DMA functions shared among chips
- o enh_desc.c: functions for handling enhanced descriptors
- o norm_desc.c: functions for handling normal descriptors
+ o dwmac_lib.c: generic DMA functions shared among chips;
+ o enh_desc.c: functions for handling enhanced descriptors;
+ o norm_desc.c: functions for handling normal descriptors;
+ o chain_mode.c/ring_mode.c:: functions to manage RING/CHAINED modes;
+ o mmc_core.c/mmc.h: Management MAC Counters;
 
 5) Debug Information
 
@@ -304,7 +308,27 @@ All these are only useful during the developing stage
 and should never enabled inside the code for general usage.
 In fact, these can generate an huge amount of debug messages.
 
-6) TODO:
+6) Energy Efficient Ethernet
+
+Energy Efficient Ethernet(EEE) enables IEEE 802.3 MAC sublayer along
+with a family of Physical layer to operate in the Low power Idle(LPI)
+mode. The EEE mode supports the IEEE 802.3 MAC operation at 100Mbps,
+1000Mbps & 10Gbps.
+
+The LPI mode allows power saving by switching off parts of the
+communication device functionality when there is no data to be
+transmitted & received. The system on both the side of the link can
+disable some functionalities & save power during the period of low-link
+utilization. The MAC controls whether the system should enter or exit
+the LPI mode & communicate this to PHY.
+
+As soon as the interface is opened, the driver verifies if the EEE can
+be supported. This is done by looking at both the DMA HW capability
+register and the PHY devices MCD registers.
+To enter in Tx LPI mode the driver needs to have a software timer
+that enable and disable the LPI mode when there is nothing to be
+transmitted.
+
+7) TODO:
  o XGMAC is not supported.
- o Add the EEE - Energy Efficient Ethernet
  o Add the PTP - precision time protocol
diff --git a/Documentation/networking/vxge.txt b/Documentation/networking/vxge.txt
index d2e2997e6fa..bb76c667a47 100644
--- a/Documentation/networking/vxge.txt
+++ b/Documentation/networking/vxge.txt
@@ -91,10 +91,3 @@ v)  addr_learn_en
        virtualization environment.
        Valid range: 0,1 (disabled, enabled respectively)
        Default: 0
-
-4) Troubleshooting:
--------------------
-
-To resolve an issue with the source code or X3100 series adapter, please collect
-the statistics, register dumps using ethool, relevant logs and email them to
-support@neterion.com.
diff --git a/MAINTAINERS b/MAINTAINERS
index 03df1d15ebf..ce7398e1e1e 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -329,7 +329,7 @@ F:	drivers/hwmon/adm1029.c
 
 ADM8211 WIRELESS DRIVER
 L:      linux-wireless@vger.kernel.org
-W:      http://linuxwireless.org/
+W:      http://wireless.kernel.org/
 S:      Orphan
 F:      drivers/net/wireless/adm8211.*
 
@@ -1423,7 +1423,7 @@ B43 WIRELESS DRIVER
 M:      Stefano Brivio <stefano.brivio@polimi.it>
 L:      linux-wireless@vger.kernel.org
 L:      b43-dev@lists.infradead.org
-W:      http://linuxwireless.org/en/users/Drivers/b43
+W:      http://wireless.kernel.org/en/users/Drivers/b43
 S:      Maintained
 F:      drivers/net/wireless/b43/
 
@@ -1432,7 +1432,7 @@ M:	Larry Finger <Larry.Finger@lwfinger.net>
 M:      Stefano Brivio <stefano.brivio@polimi.it>
 L:      linux-wireless@vger.kernel.org
 L:      b43-dev@lists.infradead.org
-W:      http://linuxwireless.org/en/users/Drivers/b43
+W:      http://wireless.kernel.org/en/users/Drivers/b43
 S:      Maintained
 F:      drivers/net/wireless/b43legacy/
 
@@ -1595,6 +1595,7 @@ M:	Arend van Spriel <arend@broadcom.com>
 M:      Franky (Zhenhui) Lin <frankyl@broadcom.com>
 M:      Kan Yan <kanyan@broadcom.com>
 L:      linux-wireless@vger.kernel.org
+L:      brcm80211-dev-list@broadcom.com
 S:      Supported
 F:      drivers/net/wireless/brcm80211/
 
@@ -4351,7 +4352,7 @@ F:	arch/m68k/hp300/
 MAC80211
 M:      Johannes Berg <johannes@sipsolutions.net>
 L:      linux-wireless@vger.kernel.org
-W:      http://linuxwireless.org/
+W:      http://wireless.kernel.org/
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211.git
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git
 S:      Maintained
@@ -4363,7 +4364,7 @@ MAC80211 PID RATE CONTROL
 M:      Stefano Brivio <stefano.brivio@polimi.it>
 M:      Mattias Nissler <mattias.nissler@gmx.de>
 L:      linux-wireless@vger.kernel.org
-W:      http://linuxwireless.org/en/developers/Documentation/mac80211/RateControl/PID
+W:      http://wireless.kernel.org/en/developers/Documentation/mac80211/RateControl/PID
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211.git
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git
 S:      Maintained
@@ -4637,8 +4638,6 @@ F:	net/sched/sch_netem.c
 NETERION 10GbE DRIVERS (s2io/vxge)
 M:      Jon Mason <jdmason@kudzu.us>
 L:      netdev@vger.kernel.org
-W:      http://trac.neterion.com/cgi-bin/trac.cgi/wiki/Linux?Anonymous
-W:      http://trac.neterion.com/cgi-bin/trac.cgi/wiki/X3100Linux?Anonymous
 S:      Supported
 F:      Documentation/networking/s2io.txt
 F:      Documentation/networking/vxge.txt
@@ -5048,7 +5047,7 @@ F:	fs/ocfs2/
 
 ORINOCO DRIVER
 L:      linux-wireless@vger.kernel.org
-W:      http://linuxwireless.org/en/users/Drivers/orinoco
+W:      http://wireless.kernel.org/en/users/Drivers/orinoco
 W:      http://www.nongnu.org/orinoco/
 S:      Orphan
 F:      drivers/net/wireless/orinoco/
@@ -5753,7 +5752,7 @@ F:	net/rose/
 RTL8180 WIRELESS DRIVER
 M:      "John W. Linville" <linville@tuxdriver.com>
 L:      linux-wireless@vger.kernel.org
-W:      http://linuxwireless.org/
+W:      http://wireless.kernel.org/
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.git
 S:      Maintained
 F:      drivers/net/wireless/rtl818x/rtl8180/
@@ -5763,7 +5762,7 @@ M:	Herton Ronaldo Krzesinski <herton@canonical.com>
 M:      Hin-Tak Leung <htl10@users.sourceforge.net>
 M:      Larry Finger <Larry.Finger@lwfinger.net>
 L:      linux-wireless@vger.kernel.org
-W:      http://linuxwireless.org/
+W:      http://wireless.kernel.org/
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.git
 S:      Maintained
 F:      drivers/net/wireless/rtl818x/rtl8187/
@@ -5772,7 +5771,7 @@ RTL8192CE WIRELESS DRIVER
 M:      Larry Finger <Larry.Finger@lwfinger.net>
 M:      Chaoming Li <chaoming_li@realsil.com.cn>
 L:      linux-wireless@vger.kernel.org
-W:      http://linuxwireless.org/
+W:      http://wireless.kernel.org/
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.git
 S:      Maintained
 F:      drivers/net/wireless/rtlwifi/
diff --git a/arch/sparc/net/bpf_jit_comp.c b/arch/sparc/net/bpf_jit_comp.c
index 1a69244e785..e9073e9501b 100644
--- a/arch/sparc/net/bpf_jit_comp.c
+++ b/arch/sparc/net/bpf_jit_comp.c
@@ -96,6 +96,7 @@ static void bpf_flush_icache(void *start_, void *end_)
 #define AND             F3(2, 0x01)
 #define ANDCC           F3(2, 0x11)
 #define OR              F3(2, 0x02)
+#define XOR             F3(2, 0x03)
 #define SUB             F3(2, 0x04)
 #define SUBCC           F3(2, 0x14)
 #define MUL             F3(2, 0x0a)     /* umul */
@@ -462,6 +463,9 @@ void bpf_jit_compile(struct sk_filter *fp)
                         case BPF_S_ALU_OR_K:    /* A |= K */
                                 emit_alu_K(OR, K);
                                 break;
+                        case BPF_S_ANC_ALU_XOR_X: /* A ^= X; */
+                                emit_alu_X(XOR);
+                                break;
                         case BPF_S_ALU_LSH_X:   /* A <<= X */
                                 emit_alu_X(SLL);
                                 break;
diff --git a/arch/x86/net/bpf_jit_comp.c b/arch/x86/net/bpf_jit_comp.c
index 0597f95b6da..33643a8bcbb 100644
--- a/arch/x86/net/bpf_jit_comp.c
+++ b/arch/x86/net/bpf_jit_comp.c
@@ -309,6 +309,10 @@ void bpf_jit_compile(struct sk_filter *fp)
                                 else
                                         EMIT1_off32(0x0d, K);   /* or imm32,%eax */
                                 break;
+                        case BPF_S_ANC_ALU_XOR_X: /* A ^= X; */
+                                seen |= SEEN_XREG;
+                                EMIT2(0x31, 0xd8);              /* xor %ebx,%eax */
+                                break;
                         case BPF_S_ALU_LSH_X: /* A <<= X; */
                                 seen |= SEEN_XREG;
                                 EMIT4(0x89, 0xd9, 0xd3, 0xe0);  /* mov %ebx,%ecx; shl %cl,%eax */
diff --git a/crypto/crypto_user.c b/crypto/crypto_user.c
index 5a37eadb4e5..ba2c611154a 100644
--- a/crypto/crypto_user.c
+++ b/crypto/crypto_user.c
@@ -496,9 +496,12 @@ static void crypto_netlink_rcv(struct sk_buff *skb)
 
 static int __init crypto_user_init(void)
 {
+        struct netlink_kernel_cfg cfg = {
+                .input  = crypto_netlink_rcv,
+        };
+
         crypto_nlsk = netlink_kernel_create(&init_net, NETLINK_CRYPTO,
-                                            0, crypto_netlink_rcv,
-                                            NULL, THIS_MODULE);
+                                            THIS_MODULE, &cfg);
         if (!crypto_nlsk)
                 return -ENOMEM;
 
diff --git a/drivers/bcma/scan.c b/drivers/bcma/scan.c
index 5ed0718fc66..a3420585d94 100644
--- a/drivers/bcma/scan.c
+++ b/drivers/bcma/scan.c
@@ -28,6 +28,12 @@ static const struct bcma_device_id_name bcma_arm_device_names[] = {
 
 static const struct bcma_device_id_name bcma_bcm_device_names[] = {
         { BCMA_CORE_OOB_ROUTER, "OOB Router" },
+        { BCMA_CORE_4706_CHIPCOMMON, "BCM4706 ChipCommon" },
+        { BCMA_CORE_4706_SOC_RAM, "BCM4706 SOC RAM" },
+        { BCMA_CORE_4706_MAC_GBIT, "BCM4706 GBit MAC" },
+        { BCMA_CORE_AMEMC, "AMEMC (DDR)" },
+        { BCMA_CORE_ALTA, "ALTA (I2S)" },
+        { BCMA_CORE_4706_MAC_GBIT_COMMON, "BCM4706 GBit MAC Common" },
         { BCMA_CORE_INVALID, "Invalid" },
         { BCMA_CORE_CHIPCOMMON, "ChipCommon" },
         { BCMA_CORE_ILINE20, "ILine 20" },
diff --git a/drivers/bluetooth/bluecard_cs.c b/drivers/bluetooth/bluecard_cs.c
index 1fcd9238035..585c88e0189 100644
--- a/drivers/bluetooth/bluecard_cs.c
+++ b/drivers/bluetooth/bluecard_cs.c
@@ -231,12 +231,12 @@ static void bluecard_write_wakeup(bluecard_info_t *info)
         }
 
         do {
-                register unsigned int iobase = info->p_dev->resource[0]->start;
-                register unsigned int offset;
-                register unsigned char command;
-                register unsigned long ready_bit;
+                unsigned int iobase = info->p_dev->resource[0]->start;
+                unsigned int offset;
+                unsigned char command;
+                unsigned long ready_bit;
                 register struct sk_buff *skb;
-                register int len;
+                int len;
 
                 clear_bit(XMIT_WAKEUP, &(info->tx_state));
 
diff --git a/drivers/bluetooth/bpa10x.c b/drivers/bluetooth/bpa10x.c
index 609861a53c2..29caaed2d71 100644
--- a/drivers/bluetooth/bpa10x.c
+++ b/drivers/bluetooth/bpa10x.c
@@ -470,7 +470,7 @@ static int bpa10x_probe(struct usb_interface *intf, const struct usb_device_id *
         hdev->flush    = bpa10x_flush;
         hdev->send     = bpa10x_send_frame;
 
-        set_bit(HCI_QUIRK_NO_RESET, &hdev->quirks);
+        set_bit(HCI_QUIRK_RESET_ON_CLOSE, &hdev->quirks);
 
         err = hci_register_dev(hdev);
         if (err < 0) {
diff --git a/drivers/bluetooth/bt3c_cs.c b/drivers/bluetooth/bt3c_cs.c
index 308c8599ab5..b2b0fbbb43b 100644
--- a/drivers/bluetooth/bt3c_cs.c
+++ b/drivers/bluetooth/bt3c_cs.c
@@ -186,9 +186,9 @@ static void bt3c_write_wakeup(bt3c_info_t *info)
                 return;
 
         do {
-                register unsigned int iobase = info->p_dev->resource[0]->start;
+                unsigned int iobase = info->p_dev->resource[0]->start;
                 register struct sk_buff *skb;
-                register int len;
+                int len;
 
                 if (!pcmcia_dev_present(info->p_dev))
                         break;
diff --git a/drivers/bluetooth/btmrvl_sdio.c b/drivers/bluetooth/btmrvl_sdio.c
index 0cd61d9f07c..cf7588edba0 100644
--- a/drivers/bluetooth/btmrvl_sdio.c
+++ b/drivers/bluetooth/btmrvl_sdio.c
@@ -110,6 +110,9 @@ static const struct sdio_device_id btmrvl_sdio_ids[] = {
         /* Marvell SD8787 Bluetooth device */
         { SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, 0x911A),
                         .driver_data = (unsigned long) &btmrvl_sdio_sd8787 },
+        /* Marvell SD8787 Bluetooth AMP device */
+        { SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, 0x911B),
+                        .driver_data = (unsigned long) &btmrvl_sdio_sd8787 },
         /* Marvell SD8797 Bluetooth device */
         { SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, 0x912A),
                         .driver_data = (unsigned long) &btmrvl_sdio_sd8797 },
diff --git a/drivers/bluetooth/btuart_cs.c b/drivers/bluetooth/btuart_cs.c
index c4fc2f3fc32..65b8d996840 100644
--- a/drivers/bluetooth/btuart_cs.c
+++ b/drivers/bluetooth/btuart_cs.c
@@ -140,9 +140,9 @@ static void btuart_write_wakeup(btuart_info_t *info)
         }
 
         do {
-                register unsigned int iobase = info->p_dev->resource[0]->start;
+                unsigned int iobase = info->p_dev->resource[0]->start;
                 register struct sk_buff *skb;
-                register int len;
+                int len;
 
                 clear_bit(XMIT_WAKEUP, &(info->tx_state));
 
diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
index 83ebb241bfc..e2722141103 100644
--- a/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c
@@ -21,15 +21,7 @@
  *
  */
 
-#include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/init.h>
-#include <linux/slab.h>
-#include <linux/types.h>
-#include <linux/sched.h>
-#include <linux/errno.h>
-#include <linux/skbuff.h>
-
 #include <linux/usb.h>
 
 #include <net/bluetooth/bluetooth.h>
@@ -1028,7 +1020,7 @@ static int btusb_probe(struct usb_interface *intf,
         data->isoc = usb_ifnum_to_if(data->udev, 1);
 
         if (!reset)
-                set_bit(HCI_QUIRK_NO_RESET, &hdev->quirks);
+                set_bit(HCI_QUIRK_RESET_ON_CLOSE, &hdev->quirks);
 
         if (force_scofix || id->driver_info & BTUSB_WRONG_SCO_MTU) {
                 if (!disable_scofix)
@@ -1040,7 +1032,7 @@ static int btusb_probe(struct usb_interface *intf,
 
         if (id->driver_info & BTUSB_DIGIANSWER) {
                 data->cmdreq_type = USB_TYPE_VENDOR;
-                set_bit(HCI_QUIRK_NO_RESET, &hdev->quirks);
+                set_bit(HCI_QUIRK_RESET_ON_CLOSE, &hdev->quirks);
         }
 
         if (id->driver_info & BTUSB_CSR) {
@@ -1048,7 +1040,7 @@ static int btusb_probe(struct usb_interface *intf,
 
                 /* Old firmware would otherwise execute USB reset */
                 if (le16_to_cpu(udev->descriptor.bcdDevice) < 0x117)
-                        set_bit(HCI_QUIRK_NO_RESET, &hdev->quirks);
+                        set_bit(HCI_QUIRK_RESET_ON_CLOSE, &hdev->quirks);
         }
 
         if (id->driver_info & BTUSB_SNIFFER) {
diff --git a/drivers/bluetooth/dtl1_cs.c b/drivers/bluetooth/dtl1_cs.c
index 6e8d9618968..b1b37ccd3cd 100644
--- a/drivers/bluetooth/dtl1_cs.c
+++ b/drivers/bluetooth/dtl1_cs.c
@@ -144,9 +144,9 @@ static void dtl1_write_wakeup(dtl1_info_t *info)
         }
 
         do {
-                register unsigned int iobase = info->p_dev->resource[0]->start;
+                unsigned int iobase = info->p_dev->resource[0]->start;
                 register struct sk_buff *skb;
-                register int len;
+                int len;
 
                 clear_bit(XMIT_WAKEUP, &(info->tx_state));
 
diff --git a/drivers/bluetooth/hci_bcsp.c b/drivers/bluetooth/hci_bcsp.c
index 661a8dc4d2f..57e502e0608 100644
--- a/drivers/bluetooth/hci_bcsp.c
+++ b/drivers/bluetooth/hci_bcsp.c
@@ -552,7 +552,7 @@ static u16 bscp_get_crc(struct bcsp_struct *bcsp)
 static int bcsp_recv(struct hci_uart *hu, void *data, int count)
 {
         struct bcsp_struct *bcsp = hu->priv;
-        register unsigned char *ptr;
+        unsigned char *ptr;
 
         BT_DBG("hu %p count %d rx_state %d rx_count %ld", 
                 hu, count, bcsp->rx_state, bcsp->rx_count);
diff --git a/drivers/bluetooth/hci_h4.c b/drivers/bluetooth/hci_h4.c
index 748329468d2..c60623f206d 100644
--- a/drivers/bluetooth/hci_h4.c
+++ b/drivers/bluetooth/hci_h4.c
@@ -126,7 +126,7 @@ static int h4_enqueue(struct hci_uart *hu, struct sk_buff *skb)
 
 static inline int h4_check_data_len(struct h4_struct *h4, int len)
 {
-        register int room = skb_tailroom(h4->rx_skb);
+        int room = skb_tailroom(h4->rx_skb);
 
         BT_DBG("len %d room %d", len, room);
 
diff --git a/drivers/bluetooth/hci_ldisc.c b/drivers/bluetooth/hci_ldisc.c
index e564579a611..2f9b796e106 100644
--- a/drivers/bluetooth/hci_ldisc.c
+++ b/drivers/bluetooth/hci_ldisc.c
@@ -394,7 +394,7 @@ static int hci_uart_register_dev(struct hci_uart *hu)
                 set_bit(HCI_QUIRK_RAW_DEVICE, &hdev->quirks);
 
         if (!test_bit(HCI_UART_RESET_ON_INIT, &hu->hdev_flags))
-                set_bit(HCI_QUIRK_NO_RESET, &hdev->quirks);
+                set_bit(HCI_QUIRK_RESET_ON_CLOSE, &hdev->quirks);
 
         if (test_bit(HCI_UART_CREATE_AMP, &hu->hdev_flags))
                 hdev->dev_type = HCI_AMP;
diff --git a/drivers/bluetooth/hci_ll.c b/drivers/bluetooth/hci_ll.c
index b874c0efde2..ff6d589c34a 100644
--- a/drivers/bluetooth/hci_ll.c
+++ b/drivers/bluetooth/hci_ll.c
@@ -348,7 +348,7 @@ static int ll_enqueue(struct hci_uart *hu, struct sk_buff *skb)
 
 static inline int ll_check_data_len(struct ll_struct *ll, int len)
 {
-        register int room = skb_tailroom(ll->rx_skb);
+        int room = skb_tailroom(ll->rx_skb);
 
         BT_DBG("len %d room %d", len, room);
 
@@ -374,11 +374,11 @@ static inline int ll_check_data_len(struct ll_struct *ll, int len)
 static int ll_recv(struct hci_uart *hu, void *data, int count)
 {
         struct ll_struct *ll = hu->priv;
-        register char *ptr;
+        char *ptr;
         struct hci_event_hdr *eh;
         struct hci_acl_hdr   *ah;
         struct hci_sco_hdr   *sh;
-        register int len, type, dlen;
+        int len, type, dlen;
 
         BT_DBG("hu %p count %d rx_state %ld rx_count %ld", hu, count, ll->rx_state, ll->rx_count);
 
diff --git a/drivers/connector/connector.c b/drivers/connector/connector.c
index dde6a0fad40..116cf8d0283 100644
--- a/drivers/connector/connector.c
+++ b/drivers/connector/connector.c
@@ -101,19 +101,19 @@ int cn_netlink_send(struct cn_msg *msg, u32 __group, gfp_t gfp_mask)
         if (!skb)
                 return -ENOMEM;
 
-        nlh = NLMSG_PUT(skb, 0, msg->seq, NLMSG_DONE, size - sizeof(*nlh));
+        nlh = nlmsg_put(skb, 0, msg->seq, NLMSG_DONE, size - sizeof(*nlh), 0);
+        if (!nlh) {
+                kfree_skb(skb);
+                return -EMSGSIZE;
+        }
 
-        data = NLMSG_DATA(nlh);
+        data = nlmsg_data(nlh);
 
         memcpy(data, msg, sizeof(*data) + msg->len);
 
         NETLINK_CB(skb).dst_group = group;
 
         return netlink_broadcast(dev->nls, skb, 0, group, gfp_mask);
-
-nlmsg_failure:
-        kfree_skb(skb);
-        return -EINVAL;
 }
 EXPORT_SYMBOL_GPL(cn_netlink_send);
 
@@ -251,15 +251,20 @@ static const struct file_operations cn_file_ops = {
         .release = single_release
 };
 
+static struct cn_dev cdev = {
+        .input   = cn_rx_skb,
+};
+
 static int __devinit cn_init(void)
 {
         struct cn_dev *dev = &cdev;
-
-        dev->input = cn_rx_skb;
+        struct netlink_kernel_cfg cfg = {
+                .groups = CN_NETLINK_USERS + 0xf,
+                .input  = dev->input,
+        };
 
         dev->nls = netlink_kernel_create(&init_net, NETLINK_CONNECTOR,
-                                         CN_NETLINK_USERS + 0xf,
-                                         dev->input, NULL, THIS_MODULE);
+                                         THIS_MODULE, &cfg);
         if (!dev->nls)
                 return -EIO;
 
diff --git a/drivers/ieee802154/Kconfig b/drivers/ieee802154/Kconfig
index 15c06407370..1fc4eefc20e 100644
--- a/drivers/ieee802154/Kconfig
+++ b/drivers/ieee802154/Kconfig
@@ -19,6 +19,7 @@ config IEEE802154_FAKEHARD
 
           This driver can also be built as a module. To do so say M here.
           The module will be called 'fakehard'.
+
 config IEEE802154_FAKELB
         depends on IEEE802154_DRIVERS && MAC802154
         tristate "IEEE 802.15.4 loopback driver"
@@ -28,3 +29,8 @@ config IEEE802154_FAKELB
 
           This driver can also be built as a module. To do so say M here.
           The module will be called 'fakelb'.
+
+config IEEE802154_AT86RF230
+        depends on IEEE802154_DRIVERS && MAC802154
+        tristate "AT86RF230/231 transceiver driver"
+        depends on SPI
diff --git a/drivers/ieee802154/Makefile b/drivers/ieee802154/Makefile
index ea784ea6f0f..4f4371d3aa7 100644
--- a/drivers/ieee802154/Makefile
+++ b/drivers/ieee802154/Makefile
@@ -1,2 +1,3 @@
 obj-$(CONFIG_IEEE802154_FAKEHARD) += fakehard.o
 obj-$(CONFIG_IEEE802154_FAKELB) += fakelb.o
+obj-$(CONFIG_IEEE802154_AT86RF230) += at86rf230.o
diff --git a/drivers/ieee802154/at86rf230.c b/drivers/ieee802154/at86rf230.c
new file mode 100644
index 00000000000..902e38bb382
--- /dev/null
+++ b/drivers/ieee802154/at86rf230.c
@@ -0,0 +1,964 @@
+/*
+ * AT86RF230/RF231 driver
+ *
+ * Copyright (C) 2009-2012 Siemens AG
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Written by:
+ * Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
+ * Alexander Smirnov <alex.bluesman.smirnov@gmail.com>
+ */
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/interrupt.h>
+#include <linux/gpio.h>
+#include <linux/delay.h>
+#include <linux/mutex.h>
+#include <linux/workqueue.h>
+#include <linux/spinlock.h>
+#include <linux/spi/spi.h>
+#include <linux/spi/at86rf230.h>
+#include <linux/skbuff.h>
+
+#include <net/mac802154.h>
+#include <net/wpan-phy.h>
+
+struct at86rf230_local {
+        struct spi_device *spi;
+        int rstn, slp_tr, dig2;
+
+        u8 part;
+        u8 vers;
+
+        u8 buf[2];
+        struct mutex bmux;
+
+        struct work_struct irqwork;
+        struct completion tx_complete;
+
+        struct ieee802154_dev *dev;
+
+        spinlock_t lock;
+        bool irq_disabled;
+        bool is_tx;
+};
+
+#define RG_TRX_STATUS   (0x01)
+#define SR_TRX_STATUS           0x01, 0x1f, 0
+#define SR_RESERVED_01_3        0x01, 0x20, 5
+#define SR_CCA_STATUS           0x01, 0x40, 6
+#define SR_CCA_DONE             0x01, 0x80, 7
+#define RG_TRX_STATE    (0x02)
+#define SR_TRX_CMD              0x02, 0x1f, 0
+#define SR_TRAC_STATUS          0x02, 0xe0, 5
+#define RG_TRX_CTRL_0   (0x03)
+#define SR_CLKM_CTRL            0x03, 0x07, 0
+#define SR_CLKM_SHA_SEL         0x03, 0x08, 3
+#define SR_PAD_IO_CLKM          0x03, 0x30, 4
+#define SR_PAD_IO               0x03, 0xc0, 6
+#define RG_TRX_CTRL_1   (0x04)
+#define SR_IRQ_POLARITY         0x04, 0x01, 0
+#define SR_IRQ_MASK_MODE        0x04, 0x02, 1
+#define SR_SPI_CMD_MODE         0x04, 0x0c, 2
+#define SR_RX_BL_CTRL           0x04, 0x10, 4
+#define SR_TX_AUTO_CRC_ON       0x04, 0x20, 5
+#define SR_IRQ_2_EXT_EN         0x04, 0x40, 6
+#define SR_PA_EXT_EN            0x04, 0x80, 7
+#define RG_PHY_TX_PWR   (0x05)
+#define SR_TX_PWR               0x05, 0x0f, 0
+#define SR_PA_LT                0x05, 0x30, 4
+#define SR_PA_BUF_LT            0x05, 0xc0, 6
+#define RG_PHY_RSSI     (0x06)
+#define SR_RSSI                 0x06, 0x1f, 0
+#define SR_RND_VALUE            0x06, 0x60, 5
+#define SR_RX_CRC_VALID         0x06, 0x80, 7
+#define RG_PHY_ED_LEVEL (0x07)
+#define SR_ED_LEVEL             0x07, 0xff, 0
+#define RG_PHY_CC_CCA   (0x08)
+#define SR_CHANNEL              0x08, 0x1f, 0
+#define SR_CCA_MODE             0x08, 0x60, 5
+#define SR_CCA_REQUEST          0x08, 0x80, 7
+#define RG_CCA_THRES    (0x09)
+#define SR_CCA_ED_THRES         0x09, 0x0f, 0
+#define SR_RESERVED_09_1        0x09, 0xf0, 4
+#define RG_RX_CTRL      (0x0a)
+#define SR_PDT_THRES            0x0a, 0x0f, 0
+#define SR_RESERVED_0a_1        0x0a, 0xf0, 4
+#define RG_SFD_VALUE    (0x0b)
+#define SR_SFD_VALUE            0x0b, 0xff, 0
+#define RG_TRX_CTRL_2   (0x0c)
+#define SR_OQPSK_DATA_RATE      0x0c, 0x03, 0
+#define SR_RESERVED_0c_2        0x0c, 0x7c, 2
+#define SR_RX_SAFE_MODE         0x0c, 0x80, 7
+#define RG_ANT_DIV      (0x0d)
+#define SR_ANT_CTRL             0x0d, 0x03, 0
+#define SR_ANT_EXT_SW_EN        0x0d, 0x04, 2
+#define SR_ANT_DIV_EN           0x0d, 0x08, 3
+#define SR_RESERVED_0d_2        0x0d, 0x70, 4
+#define SR_ANT_SEL              0x0d, 0x80, 7
+#define RG_IRQ_MASK     (0x0e)
+#define SR_IRQ_MASK             0x0e, 0xff, 0
+#define RG_IRQ_STATUS   (0x0f)
+#define SR_IRQ_0_PLL_LOCK       0x0f, 0x01, 0
+#define SR_IRQ_1_PLL_UNLOCK     0x0f, 0x02, 1
+#define SR_IRQ_2_RX_START       0x0f, 0x04, 2
+#define SR_IRQ_3_TRX_END        0x0f, 0x08, 3
+#define SR_IRQ_4_CCA_ED_DONE    0x0f, 0x10, 4
+#define SR_IRQ_5_AMI            0x0f, 0x20, 5
+#define SR_IRQ_6_TRX_UR         0x0f, 0x40, 6
+#define SR_IRQ_7_BAT_LOW        0x0f, 0x80, 7
+#define RG_VREG_CTRL    (0x10)
+#define SR_RESERVED_10_6        0x10, 0x03, 0
+#define SR_DVDD_OK              0x10, 0x04, 2
+#define SR_DVREG_EXT            0x10, 0x08, 3
+#define SR_RESERVED_10_3        0x10, 0x30, 4
+#define SR_AVDD_OK              0x10, 0x40, 6
+#define SR_AVREG_EXT            0x10, 0x80, 7
+#define RG_BATMON       (0x11)
+#define SR_BATMON_VTH           0x11, 0x0f, 0
+#define SR_BATMON_HR            0x11, 0x10, 4
+#define SR_BATMON_OK            0x11, 0x20, 5
+#define SR_RESERVED_11_1        0x11, 0xc0, 6
+#define RG_XOSC_CTRL    (0x12)
+#define SR_XTAL_TRIM            0x12, 0x0f, 0
+#define SR_XTAL_MODE            0x12, 0xf0, 4
+#define RG_RX_SYN       (0x15)
+#define SR_RX_PDT_LEVEL         0x15, 0x0f, 0
+#define SR_RESERVED_15_2        0x15, 0x70, 4
+#define SR_RX_PDT_DIS           0x15, 0x80, 7
+#define RG_XAH_CTRL_1   (0x17)
+#define SR_RESERVED_17_8        0x17, 0x01, 0
+#define SR_AACK_PROM_MODE       0x17, 0x02, 1
+#define SR_AACK_ACK_TIME        0x17, 0x04, 2
+#define SR_RESERVED_17_5        0x17, 0x08, 3
+#define SR_AACK_UPLD_RES_FT     0x17, 0x10, 4
+#define SR_AACK_FLTR_RES_FT     0x17, 0x20, 5
+#define SR_RESERVED_17_2        0x17, 0x40, 6
+#define SR_RESERVED_17_1        0x17, 0x80, 7
+#define RG_FTN_CTRL     (0x18)
+#define SR_RESERVED_18_2        0x18, 0x7f, 0
+#define SR_FTN_START            0x18, 0x80, 7
+#define RG_PLL_CF       (0x1a)
+#define SR_RESERVED_1a_2        0x1a, 0x7f, 0
+#define SR_PLL_CF_START         0x1a, 0x80, 7
+#define RG_PLL_DCU      (0x1b)
+#define SR_RESERVED_1b_3        0x1b, 0x3f, 0
+#define SR_RESERVED_1b_2        0x1b, 0x40, 6
+#define SR_PLL_DCU_START        0x1b, 0x80, 7
+#define RG_PART_NUM     (0x1c)
+#define SR_PART_NUM             0x1c, 0xff, 0
+#define RG_VERSION_NUM  (0x1d)
+#define SR_VERSION_NUM          0x1d, 0xff, 0
+#define RG_MAN_ID_0     (0x1e)
+#define SR_MAN_ID_0             0x1e, 0xff, 0
+#define RG_MAN_ID_1     (0x1f)
+#define SR_MAN_ID_1             0x1f, 0xff, 0
+#define RG_SHORT_ADDR_0 (0x20)
+#define SR_SHORT_ADDR_0         0x20, 0xff, 0
+#define RG_SHORT_ADDR_1 (0x21)
+#define SR_SHORT_ADDR_1         0x21, 0xff, 0
+#define RG_PAN_ID_0     (0x22)
+#define SR_PAN_ID_0             0x22, 0xff, 0
+#define RG_PAN_ID_1     (0x23)
+#define SR_PAN_ID_1             0x23, 0xff, 0
+#define RG_IEEE_ADDR_0  (0x24)
+#define SR_IEEE_ADDR_0          0x24, 0xff, 0
+#define RG_IEEE_ADDR_1  (0x25)
+#define SR_IEEE_ADDR_1          0x25, 0xff, 0
+#define RG_IEEE_ADDR_2  (0x26)
+#define SR_IEEE_ADDR_2          0x26, 0xff, 0
+#define RG_IEEE_ADDR_3  (0x27)
+#define SR_IEEE_ADDR_3          0x27, 0xff, 0
+#define RG_IEEE_ADDR_4  (0x28)
+#define SR_IEEE_ADDR_4          0x28, 0xff, 0
+#define RG_IEEE_ADDR_5  (0x29)
+#define SR_IEEE_ADDR_5          0x29, 0xff, 0
+#define RG_IEEE_ADDR_6  (0x2a)
+#define SR_IEEE_ADDR_6          0x2a, 0xff, 0
+#define RG_IEEE_ADDR_7  (0x2b)
+#define SR_IEEE_ADDR_7          0x2b, 0xff, 0
+#define RG_XAH_CTRL_0   (0x2c)
+#define SR_SLOTTED_OPERATION    0x2c, 0x01, 0
+#define SR_MAX_CSMA_RETRIES     0x2c, 0x0e, 1
+#define SR_MAX_FRAME_RETRIES    0x2c, 0xf0, 4
+#define RG_CSMA_SEED_0  (0x2d)
+#define SR_CSMA_SEED_0          0x2d, 0xff, 0
+#define RG_CSMA_SEED_1  (0x2e)
+#define SR_CSMA_SEED_1          0x2e, 0x07, 0
+#define SR_AACK_I_AM_COORD      0x2e, 0x08, 3
+#define SR_AACK_DIS_ACK         0x2e, 0x10, 4
+#define SR_AACK_SET_PD          0x2e, 0x20, 5
+#define SR_AACK_FVN_MODE        0x2e, 0xc0, 6
+#define RG_CSMA_BE      (0x2f)
+#define SR_MIN_BE               0x2f, 0x0f, 0
+#define SR_MAX_BE               0x2f, 0xf0, 4
+
+#define CMD_REG         0x80
+#define CMD_REG_MASK    0x3f
+#define CMD_WRITE       0x40
+#define CMD_FB          0x20
+
+#define IRQ_BAT_LOW     (1 << 7)
+#define IRQ_TRX_UR      (1 << 6)
+#define IRQ_AMI         (1 << 5)
+#define IRQ_CCA_ED      (1 << 4)
+#define IRQ_TRX_END     (1 << 3)
+#define IRQ_RX_START    (1 << 2)
+#define IRQ_PLL_UNL     (1 << 1)
+#define IRQ_PLL_LOCK    (1 << 0)
+
+#define STATE_P_ON              0x00    /* BUSY */
+#define STATE_BUSY_RX           0x01
+#define STATE_BUSY_TX           0x02
+#define STATE_FORCE_TRX_OFF     0x03
+#define STATE_FORCE_TX_ON       0x04    /* IDLE */
+/* 0x05 */                              /* INVALID_PARAMETER */
+#define STATE_RX_ON             0x06
+/* 0x07 */                              /* SUCCESS */
+#define STATE_TRX_OFF           0x08
+#define STATE_TX_ON             0x09
+/* 0x0a - 0x0e */                       /* 0x0a - UNSUPPORTED_ATTRIBUTE */
+#define STATE_SLEEP             0x0F
+#define STATE_BUSY_RX_AACK      0x11
+#define STATE_BUSY_TX_ARET      0x12
+#define STATE_BUSY_RX_AACK_ON   0x16
+#define STATE_BUSY_TX_ARET_ON   0x19
+#define STATE_RX_ON_NOCLK       0x1C
+#define STATE_RX_AACK_ON_NOCLK  0x1D
+#define STATE_BUSY_RX_AACK_NOCLK 0x1E
+#define STATE_TRANSITION_IN_PROGRESS 0x1F
+
+static int
+__at86rf230_write(struct at86rf230_local *lp, u8 addr, u8 data)
+{
+        u8 *buf = lp->buf;
+        int status;
+        struct spi_message msg;
+        struct spi_transfer xfer = {
+                .len    = 2,
+                .tx_buf = buf,
+        };
+
+        buf[0] = (addr & CMD_REG_MASK) | CMD_REG | CMD_WRITE;
+        buf[1] = data;
+        dev_vdbg(&lp->spi->dev, "buf[0] = %02x\n", buf[0]);
+        dev_vdbg(&lp->spi->dev, "buf[1] = %02x\n", buf[1]);
+        spi_message_init(&msg);
+        spi_message_add_tail(&xfer, &msg);
+
+        status = spi_sync(lp->spi, &msg);
+        dev_vdbg(&lp->spi->dev, "status = %d\n", status);
+        if (msg.status)
+                status = msg.status;
+
+        dev_vdbg(&lp->spi->dev, "status = %d\n", status);
+        dev_vdbg(&lp->spi->dev, "buf[0] = %02x\n", buf[0]);
+        dev_vdbg(&lp->spi->dev, "buf[1] = %02x\n", buf[1]);
+
+        return status;
+}
+
+static int
+__at86rf230_read_subreg(struct at86rf230_local *lp,
+                        u8 addr, u8 mask, int shift, u8 *data)
+{
+        u8 *buf = lp->buf;
+        int status;
+        struct spi_message msg;
+        struct spi_transfer xfer = {
+                .len    = 2,
+                .tx_buf = buf,
+                .rx_buf = buf,
+        };
+
+        buf[0] = (addr & CMD_REG_MASK) | CMD_REG;
+        buf[1] = 0xff;
+        dev_vdbg(&lp->spi->dev, "buf[0] = %02x\n", buf[0]);
+        spi_message_init(&msg);
+        spi_message_add_tail(&xfer, &msg);
+
+        status = spi_sync(lp->spi, &msg);
+        dev_vdbg(&lp->spi->dev, "status = %d\n", status);
+        if (msg.status)
+                status = msg.status;
+
+        dev_vdbg(&lp->spi->dev, "status = %d\n", status);
+        dev_vdbg(&lp->spi->dev, "buf[0] = %02x\n", buf[0]);
+        dev_vdbg(&lp->spi->dev, "buf[1] = %02x\n", buf[1]);
+
+        if (status == 0)
+                *data = buf[1];
+
+        return status;
+}
+
+static int
+at86rf230_read_subreg(struct at86rf230_local *lp,
+                      u8 addr, u8 mask, int shift, u8 *data)
+{
+        int status;
+
+        mutex_lock(&lp->bmux);
+        status = __at86rf230_read_subreg(lp, addr, mask, shift, data);
+        mutex_unlock(&lp->bmux);
+
+        return status;
+}
+
+static int
+at86rf230_write_subreg(struct at86rf230_local *lp,
+                       u8 addr, u8 mask, int shift, u8 data)
+{
+        int status;
+        u8 val;
+
+        mutex_lock(&lp->bmux);
+        status = __at86rf230_read_subreg(lp, addr, 0xff, 0, &val);
+        if (status)
+                goto out;
+
+        val &= ~mask;
+        val |= (data << shift) & mask;
+
+        status = __at86rf230_write(lp, addr, val);
+out:
+        mutex_unlock(&lp->bmux);
+
+        return status;
+}
+
+static int
+at86rf230_write_fbuf(struct at86rf230_local *lp, u8 *data, u8 len)
+{
+        u8 *buf = lp->buf;
+        int status;
+        struct spi_message msg;
+        struct spi_transfer xfer_head = {
+                .len            = 2,
+                .tx_buf         = buf,
+
+        };
+        struct spi_transfer xfer_buf = {
+                .len            = len,
+                .tx_buf         = data,
+        };
+
+        mutex_lock(&lp->bmux);
+        buf[0] = CMD_WRITE | CMD_FB;
+        buf[1] = len + 2; /* 2 bytes for CRC that isn't written */
+
+        dev_vdbg(&lp->spi->dev, "buf[0] = %02x\n", buf[0]);
+        dev_vdbg(&lp->spi->dev, "buf[1] = %02x\n", buf[1]);
+
+        spi_message_init(&msg);
+        spi_message_add_tail(&xfer_head, &msg);
+        spi_message_add_tail(&xfer_buf, &msg);
+
+        status = spi_sync(lp->spi, &msg);
+        dev_vdbg(&lp->spi->dev, "status = %d\n", status);
+        if (msg.status)
+                status = msg.status;
+
+        dev_vdbg(&lp->spi->dev, "status = %d\n", status);
+        dev_vdbg(&lp->spi->dev, "buf[0] = %02x\n", buf[0]);
+        dev_vdbg(&lp->spi->dev, "buf[1] = %02x\n", buf[1]);
+
+        mutex_unlock(&lp->bmux);
+        return status;
+}
+
+static int
+at86rf230_read_fbuf(struct at86rf230_local *lp, u8 *data, u8 *len, u8 *lqi)
+{
+        u8 *buf = lp->buf;
+        int status;
+        struct spi_message msg;
+        struct spi_transfer xfer_head = {
+                .len            = 2,
+                .tx_buf         = buf,
+                .rx_buf         = buf,
+        };
+        struct spi_transfer xfer_head1 = {
+                .len            = 2,
+                .tx_buf         = buf,
+                .rx_buf         = buf,
+        };
+        struct spi_transfer xfer_buf = {
+                .len            = 0,
+                .rx_buf         = data,
+        };
+
+        mutex_lock(&lp->bmux);
+
+        buf[0] = CMD_FB;
+        buf[1] = 0x00;
+
+        spi_message_init(&msg);
+        spi_message_add_tail(&xfer_head, &msg);
+
+        status = spi_sync(lp->spi, &msg);
+        dev_vdbg(&lp->spi->dev, "status = %d\n", status);
+
+        xfer_buf.len = *(buf + 1) + 1;
+        *len = buf[1];
+
+        buf[0] = CMD_FB;
+        buf[1] = 0x00;
+
+        spi_message_init(&msg);
+        spi_message_add_tail(&xfer_head1, &msg);
+        spi_message_add_tail(&xfer_buf, &msg);
+
+        status = spi_sync(lp->spi, &msg);
+
+        if (msg.status)
+                status = msg.status;
+
+        dev_vdbg(&lp->spi->dev, "status = %d\n", status);
+        dev_vdbg(&lp->spi->dev, "buf[0] = %02x\n", buf[0]);
+        dev_vdbg(&lp->spi->dev, "buf[1] = %02x\n", buf[1]);
+
+        if (status) {
+                if (lqi && (*len > lp->buf[1]))
+                        *lqi = data[lp->buf[1]];
+        }
+        mutex_unlock(&lp->bmux);
+
+        return status;
+}
+
+static int
+at86rf230_ed(struct ieee802154_dev *dev, u8 *level)
+{
+        might_sleep();
+        BUG_ON(!level);
+        *level = 0xbe;
+        return 0;
+}
+
+static int
+at86rf230_state(struct ieee802154_dev *dev, int state)
+{
+        struct at86rf230_local *lp = dev->priv;
+        int rc;
+        u8 val;
+        u8 desired_status;
+
+        might_sleep();
+
+        if (state == STATE_FORCE_TX_ON)
+                desired_status = STATE_TX_ON;
+        else if (state == STATE_FORCE_TRX_OFF)
+                desired_status = STATE_TRX_OFF;
+        else
+                desired_status = state;
+
+        do {
+                rc = at86rf230_read_subreg(lp, SR_TRX_STATUS, &val);
+                if (rc)
+                        goto err;
+        } while (val == STATE_TRANSITION_IN_PROGRESS);
+
+        if (val == desired_status)
+                return 0;
+
+        /* state is equal to phy states */
+        rc = at86rf230_write_subreg(lp, SR_TRX_CMD, state);
+        if (rc)
+                goto err;
+
+        do {
+                rc = at86rf230_read_subreg(lp, SR_TRX_STATUS, &val);
+                if (rc)
+                        goto err;
+        } while (val == STATE_TRANSITION_IN_PROGRESS);
+
+
+        if (val == desired_status)
+                return 0;
+
+        pr_err("unexpected state change: %d, asked for %d\n", val, state);
+        return -EBUSY;
+
+err:
+        pr_err("error: %d\n", rc);
+        return rc;
+}
+
+static int
+at86rf230_start(struct ieee802154_dev *dev)
+{
+        struct at86rf230_local *lp = dev->priv;
+        u8 rc;
+
+        rc = at86rf230_write_subreg(lp, SR_RX_SAFE_MODE, 1);
+        if (rc)
+                return rc;
+
+        return at86rf230_state(dev, STATE_RX_ON);
+}
+
+static void
+at86rf230_stop(struct ieee802154_dev *dev)
+{
+        at86rf230_state(dev, STATE_FORCE_TRX_OFF);
+}
+
+static int
+at86rf230_channel(struct ieee802154_dev *dev, int page, int channel)
+{
+        struct at86rf230_local *lp = dev->priv;
+        int rc;
+
+        might_sleep();
+
+        if (page != 0 || channel < 11 || channel > 26) {
+                WARN_ON(1);
+                return -EINVAL;
+        }
+
+        rc = at86rf230_write_subreg(lp, SR_CHANNEL, channel);
+        msleep(1); /* Wait for PLL */
+        dev->phy->current_channel = channel;
+
+        return 0;
+}
+
+static int
+at86rf230_xmit(struct ieee802154_dev *dev, struct sk_buff *skb)
+{
+        struct at86rf230_local *lp = dev->priv;
+        int rc;
+        unsigned long flags;
+
+        might_sleep();
+
+        rc = at86rf230_state(dev, STATE_FORCE_TX_ON);
+        if (rc)
+                goto err;
+
+        spin_lock_irqsave(&lp->lock, flags);
+        lp->is_tx = 1;
+        INIT_COMPLETION(lp->tx_complete);
+        spin_unlock_irqrestore(&lp->lock, flags);
+
+        rc = at86rf230_write_fbuf(lp, skb->data, skb->len);
+        if (rc)
+                goto err_rx;
+
+        rc = at86rf230_write_subreg(lp, SR_TRX_CMD, STATE_BUSY_TX);
+        if (rc)
+                goto err_rx;
+
+        rc = wait_for_completion_interruptible(&lp->tx_complete);
+        if (rc < 0)
+                goto err_rx;
+
+        rc = at86rf230_start(dev);
+
+        return rc;
+
+err_rx:
+        at86rf230_start(dev);
+err:
+        pr_err("error: %d\n", rc);
+
+        spin_lock_irqsave(&lp->lock, flags);
+        lp->is_tx = 0;
+        spin_unlock_irqrestore(&lp->lock, flags);
+
+        return rc;
+}
+
+static int at86rf230_rx(struct at86rf230_local *lp)
+{
+        u8 len = 128, lqi = 0;
+        struct sk_buff *skb;
+
+        skb = alloc_skb(len, GFP_KERNEL);
+
+        if (!skb)
+                return -ENOMEM;
+
+        if (at86rf230_write_subreg(lp, SR_RX_PDT_DIS, 1) ||
+            at86rf230_read_fbuf(lp, skb_put(skb, len), &len, &lqi) ||
+            at86rf230_write_subreg(lp, SR_RX_SAFE_MODE, 1) ||
+            at86rf230_write_subreg(lp, SR_RX_PDT_DIS, 0)) {
+                goto err;
+        }
+
+        if (len < 2)
+                goto err;
+
+        skb_trim(skb, len - 2); /* We do not put CRC into the frame */
+
+        ieee802154_rx_irqsafe(lp->dev, skb, lqi);
+
+        dev_dbg(&lp->spi->dev, "READ_FBUF: %d %x\n", len, lqi);
+
+        return 0;
+err:
+        pr_debug("received frame is too small\n");
+
+        kfree_skb(skb);
+        return -EINVAL;
+}
+
+static struct ieee802154_ops at86rf230_ops = {
+        .owner = THIS_MODULE,
+        .xmit = at86rf230_xmit,
+        .ed = at86rf230_ed,
+        .set_channel = at86rf230_channel,
+        .start = at86rf230_start,
+        .stop = at86rf230_stop,
+};
+
+static void at86rf230_irqwork(struct work_struct *work)
+{
+        struct at86rf230_local *lp =
+                container_of(work, struct at86rf230_local, irqwork);
+        u8 status = 0, val;
+        int rc;
+        unsigned long flags;
+
+        spin_lock_irqsave(&lp->lock, flags);
+        rc = at86rf230_read_subreg(lp, RG_IRQ_STATUS, 0xff, 0, &val);
+        status |= val;
+
+        status &= ~IRQ_PLL_LOCK; /* ignore */
+        status &= ~IRQ_RX_START; /* ignore */
+        status &= ~IRQ_AMI; /* ignore */
+        status &= ~IRQ_TRX_UR; /* FIXME: possibly handle ???*/
+
+        if (status & IRQ_TRX_END) {
+                status &= ~IRQ_TRX_END;
+                if (lp->is_tx) {
+                        lp->is_tx = 0;
+                        complete(&lp->tx_complete);
+                } else {
+                        at86rf230_rx(lp);
+                }
+        }
+
+        if (lp->irq_disabled) {
+                lp->irq_disabled = 0;
+                enable_irq(lp->spi->irq);
+        }
+        spin_unlock_irqrestore(&lp->lock, flags);
+}
+
+static irqreturn_t at86rf230_isr(int irq, void *data)
+{
+        struct at86rf230_local *lp = data;
+
+        spin_lock(&lp->lock);
+        if (!lp->irq_disabled) {
+                disable_irq_nosync(irq);
+                lp->irq_disabled = 1;
+        }
+        spin_unlock(&lp->lock);
+
+        schedule_work(&lp->irqwork);
+
+        return IRQ_HANDLED;
+}
+
+
+static int at86rf230_hw_init(struct at86rf230_local *lp)
+{
+        u8 status;
+        int rc;
+
+        rc = at86rf230_read_subreg(lp, SR_TRX_STATUS, &status);
+        if (rc)
+                return rc;
+
+        dev_info(&lp->spi->dev, "Status: %02x\n", status);
+        if (status == STATE_P_ON) {
+                rc = at86rf230_write_subreg(lp, SR_TRX_CMD, STATE_TRX_OFF);
+                if (rc)
+                        return rc;
+                msleep(1);
+                rc = at86rf230_read_subreg(lp, SR_TRX_STATUS, &status);
+                if (rc)
+                        return rc;
+                dev_info(&lp->spi->dev, "Status: %02x\n", status);
+        }
+
+        rc = at86rf230_write_subreg(lp, SR_IRQ_MASK, 0xff); /* IRQ_TRX_UR |
+                                                             * IRQ_CCA_ED |
+                                                             * IRQ_TRX_END |
+                                                             * IRQ_PLL_UNL |
+                                                             * IRQ_PLL_LOCK
+                                                             */
+        if (rc)
+                return rc;
+
+        /* CLKM changes are applied immediately */
+        rc = at86rf230_write_subreg(lp, SR_CLKM_SHA_SEL, 0x00);
+        if (rc)
+                return rc;
+
+        /* Turn CLKM Off */
+        rc = at86rf230_write_subreg(lp, SR_CLKM_CTRL, 0x00);
+        if (rc)
+                return rc;
+        /* Wait the next SLEEP cycle */
+        msleep(100);
+
+        rc = at86rf230_write_subreg(lp, SR_TRX_CMD, STATE_TX_ON);
+        if (rc)
+                return rc;
+        msleep(1);
+
+        rc = at86rf230_read_subreg(lp, SR_TRX_STATUS, &status);
+        if (rc)
+                return rc;
+        dev_info(&lp->spi->dev, "Status: %02x\n", status);
+
+        rc = at86rf230_read_subreg(lp, SR_DVDD_OK, &status);
+        if (rc)
+                return rc;
+        if (!status) {
+                dev_err(&lp->spi->dev, "DVDD error\n");
+                return -EINVAL;
+        }
+
+        rc = at86rf230_read_subreg(lp, SR_AVDD_OK, &status);
+        if (rc)
+                return rc;
+        if (!status) {
+                dev_err(&lp->spi->dev, "AVDD error\n");
+                return -EINVAL;
+        }
+
+        return 0;
+}
+
+static int at86rf230_suspend(struct spi_device *spi, pm_message_t message)
+{
+        return 0;
+}
+
+static int at86rf230_resume(struct spi_device *spi)
+{
+        return 0;
+}
+
+static int at86rf230_fill_data(struct spi_device *spi)
+{
+        struct at86rf230_local *lp = spi_get_drvdata(spi);
+        struct at86rf230_platform_data *pdata = spi->dev.platform_data;
+
+        if (!pdata) {
+                dev_err(&spi->dev, "no platform_data\n");
+                return -EINVAL;
+        }
+
+        lp->rstn = pdata->rstn;
+        lp->slp_tr = pdata->slp_tr;
+        lp->dig2 = pdata->dig2;
+
+        return 0;
+}
+
+static int __devinit at86rf230_probe(struct spi_device *spi)
+{
+        struct ieee802154_dev *dev;
+        struct at86rf230_local *lp;
+        u8 man_id_0, man_id_1;
+        int rc;
+        const char *chip;
+        int supported = 0;
+
+        if (!spi->irq) {
+                dev_err(&spi->dev, "no IRQ specified\n");
+                return -EINVAL;
+        }
+
+        dev = ieee802154_alloc_device(sizeof(*lp), &at86rf230_ops);
+        if (!dev)
+                return -ENOMEM;
+
+        lp = dev->priv;
+        lp->dev = dev;
+
+        lp->spi = spi;
+
+        dev->priv = lp;
+        dev->parent = &spi->dev;
+        dev->extra_tx_headroom = 0;
+        /* We do support only 2.4 Ghz */
+        dev->phy->channels_supported[0] = 0x7FFF800;
+        dev->flags = IEEE802154_HW_OMIT_CKSUM;
+
+        mutex_init(&lp->bmux);
+        INIT_WORK(&lp->irqwork, at86rf230_irqwork);
+        spin_lock_init(&lp->lock);
+        init_completion(&lp->tx_complete);
+
+        spi_set_drvdata(spi, lp);
+
+        rc = at86rf230_fill_data(spi);
+        if (rc)
+                goto err_fill;
+
+        rc = gpio_request(lp->rstn, "rstn");
+        if (rc)
+                goto err_rstn;
+
+        if (gpio_is_valid(lp->slp_tr)) {
+                rc = gpio_request(lp->slp_tr, "slp_tr");
+                if (rc)
+                        goto err_slp_tr;
+        }
+
+        rc = gpio_direction_output(lp->rstn, 1);
+        if (rc)
+                goto err_gpio_dir;
+
+        if (gpio_is_valid(lp->slp_tr)) {
+                rc = gpio_direction_output(lp->slp_tr, 0);
+                if (rc)
+                        goto err_gpio_dir;
+        }
+
+        /* Reset */
+        msleep(1);
+        gpio_set_value(lp->rstn, 0);
+        msleep(1);
+        gpio_set_value(lp->rstn, 1);
+        msleep(1);
+
+        rc = at86rf230_read_subreg(lp, SR_MAN_ID_0, &man_id_0);
+        if (rc)
+                goto err_gpio_dir;
+        rc = at86rf230_read_subreg(lp, SR_MAN_ID_1, &man_id_1);
+        if (rc)
+                goto err_gpio_dir;
+
+        if (man_id_1 != 0x00 || man_id_0 != 0x1f) {
+                dev_err(&spi->dev, "Non-Atmel dev found (MAN_ID %02x %02x)\n",
+                        man_id_1, man_id_0);
+                rc = -EINVAL;
+                goto err_gpio_dir;
+        }
+
+        rc = at86rf230_read_subreg(lp, SR_PART_NUM, &lp->part);
+        if (rc)
+                goto err_gpio_dir;
+
+        rc = at86rf230_read_subreg(lp, SR_VERSION_NUM, &lp->vers);
+        if (rc)
+                goto err_gpio_dir;
+
+        switch (lp->part) {
+        case 2:
+                chip = "at86rf230";
+                /* supported = 1;  FIXME: should be easy to support; */
+                break;
+        case 3:
+                chip = "at86rf231";
+                supported = 1;
+                break;
+        default:
+                chip = "UNKNOWN";
+                break;
+        }
+
+        dev_info(&spi->dev, "Detected %s chip version %d\n", chip, lp->vers);
+        if (!supported) {
+                rc = -ENOTSUPP;
+                goto err_gpio_dir;
+        }
+
+        rc = at86rf230_hw_init(lp);
+        if (rc)
+                goto err_gpio_dir;
+
+        rc = request_irq(spi->irq, at86rf230_isr, IRQF_SHARED,
+                         dev_name(&spi->dev), lp);
+        if (rc)
+                goto err_gpio_dir;
+
+        rc = ieee802154_register_device(lp->dev);
+        if (rc)
+                goto err_irq;
+
+        return rc;
+
+        ieee802154_unregister_device(lp->dev);
+err_irq:
+        free_irq(spi->irq, lp);
+        flush_work(&lp->irqwork);
+err_gpio_dir:
+        if (gpio_is_valid(lp->slp_tr))
+                gpio_free(lp->slp_tr);
+err_slp_tr:
+        gpio_free(lp->rstn);
+err_rstn:
+err_fill:
+        spi_set_drvdata(spi, NULL);
+        mutex_destroy(&lp->bmux);
+        ieee802154_free_device(lp->dev);
+        return rc;
+}
+
+static int __devexit at86rf230_remove(struct spi_device *spi)
+{
+        struct at86rf230_local *lp = spi_get_drvdata(spi);
+
+        ieee802154_unregister_device(lp->dev);
+
+        free_irq(spi->irq, lp);
+        flush_work(&lp->irqwork);
+
+        if (gpio_is_valid(lp->slp_tr))
+                gpio_free(lp->slp_tr);
+        gpio_free(lp->rstn);
+
+        spi_set_drvdata(spi, NULL);
+        mutex_destroy(&lp->bmux);
+        ieee802154_free_device(lp->dev);
+
+        dev_dbg(&spi->dev, "unregistered at86rf230\n");
+        return 0;
+}
+
+static struct spi_driver at86rf230_driver = {
+        .driver = {
+                .name   = "at86rf230",
+                .owner  = THIS_MODULE,
+        },
+        .probe      = at86rf230_probe,
+        .remove     = __devexit_p(at86rf230_remove),
+        .suspend    = at86rf230_suspend,
+        .resume     = at86rf230_resume,
+};
+
+static int __init at86rf230_init(void)
+{
+        return spi_register_driver(&at86rf230_driver);
+}
+module_init(at86rf230_init);
+
+static void __exit at86rf230_exit(void)
+{
+        spi_unregister_driver(&at86rf230_driver);
+}
+module_exit(at86rf230_exit);
+
+MODULE_DESCRIPTION("AT86RF230 Transceiver Driver");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/infiniband/core/netlink.c b/drivers/infiniband/core/netlink.c
index e497dfbee43..3ae2bfd3101 100644
--- a/drivers/infiniband/core/netlink.c
+++ b/drivers/infiniband/core/netlink.c
@@ -108,12 +108,14 @@ void *ibnl_put_msg(struct sk_buff *skb, struct nlmsghdr **nlh, int seq,
         unsigned char *prev_tail;
 
         prev_tail = skb_tail_pointer(skb);
-        *nlh = NLMSG_NEW(skb, 0, seq, RDMA_NL_GET_TYPE(client, op),
-                        len, NLM_F_MULTI);
+        *nlh = nlmsg_put(skb, 0, seq, RDMA_NL_GET_TYPE(client, op),
+                         len, NLM_F_MULTI);
+        if (!*nlh)
+                goto out_nlmsg_trim;
         (*nlh)->nlmsg_len = skb_tail_pointer(skb) - prev_tail;
-        return NLMSG_DATA(*nlh);
+        return nlmsg_data(*nlh);
 
-nlmsg_failure:
+out_nlmsg_trim:
         nlmsg_trim(skb, prev_tail);
         return NULL;
 }
@@ -171,8 +173,11 @@ static void ibnl_rcv(struct sk_buff *skb)
 
 int __init ibnl_init(void)
 {
-        nls = netlink_kernel_create(&init_net, NETLINK_RDMA, 0, ibnl_rcv,
-                                    NULL, THIS_MODULE);
+        struct netlink_kernel_cfg cfg = {
+                .input  = ibnl_rcv,
+        };
+
+        nls = netlink_kernel_create(&init_net, NETLINK_RDMA, THIS_MODULE, &cfg);
         if (!nls) {
                 pr_warn("Failed to create netlink socket\n");
                 return -ENOMEM;
diff --git a/drivers/infiniband/hw/cxgb3/iwch_cm.c b/drivers/infiniband/hw/cxgb3/iwch_cm.c
index 740dcc065cf..77b6b182778 100644
--- a/drivers/infiniband/hw/cxgb3/iwch_cm.c
+++ b/drivers/infiniband/hw/cxgb3/iwch_cm.c
@@ -1374,7 +1374,7 @@ static int pass_accept_req(struct t3cdev *tdev, struct sk_buff *skb, void *ctx)
                 goto reject;
         }
         dst = &rt->dst;
-        l2t = t3_l2t_get(tdev, dst, NULL);
+        l2t = t3_l2t_get(tdev, dst, NULL, &req->peer_ip);
         if (!l2t) {
                 printk(KERN_ERR MOD "%s - failed to allocate l2t entry!\n",
                        __func__);
@@ -1942,7 +1942,8 @@ int iwch_connect(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param)
                 goto fail3;
         }
         ep->dst = &rt->dst;
-        ep->l2t = t3_l2t_get(ep->com.tdev, ep->dst, NULL);
+        ep->l2t = t3_l2t_get(ep->com.tdev, ep->dst, NULL,
+                             &cm_id->remote_addr.sin_addr.s_addr);
         if (!ep->l2t) {
                 printk(KERN_ERR MOD "%s - cannot alloc l2e.\n", __func__);
                 err = -ENOMEM;
diff --git a/drivers/infiniband/hw/mlx4/main.c b/drivers/infiniband/hw/mlx4/main.c
index 3530c41fcd1..8a3a2037b00 100644
--- a/drivers/infiniband/hw/mlx4/main.c
+++ b/drivers/infiniband/hw/mlx4/main.c
@@ -718,26 +718,53 @@ int mlx4_ib_add_mc(struct mlx4_ib_dev *mdev, struct mlx4_ib_qp *mqp,
         return ret;
 }
 
+struct mlx4_ib_steering {
+        struct list_head list;
+        u64 reg_id;
+        union ib_gid gid;
+};
+
 static int mlx4_ib_mcg_attach(struct ib_qp *ibqp, union ib_gid *gid, u16 lid)
 {
         int err;
         struct mlx4_ib_dev *mdev = to_mdev(ibqp->device);
         struct mlx4_ib_qp *mqp = to_mqp(ibqp);
+        u64 reg_id;
+        struct mlx4_ib_steering *ib_steering = NULL;
+
+        if (mdev->dev->caps.steering_mode ==
+            MLX4_STEERING_MODE_DEVICE_MANAGED) {
+                ib_steering = kmalloc(sizeof(*ib_steering), GFP_KERNEL);
+                if (!ib_steering)
+                        return -ENOMEM;
+        }
 
-        err = mlx4_multicast_attach(mdev->dev, &mqp->mqp, gid->raw,
-                                    !!(mqp->flags & MLX4_IB_QP_BLOCK_MULTICAST_LOOPBACK),
-                                    MLX4_PROT_IB_IPV6);
+        err = mlx4_multicast_attach(mdev->dev, &mqp->mqp, gid->raw, mqp->port,
+                                    !!(mqp->flags &
+                                       MLX4_IB_QP_BLOCK_MULTICAST_LOOPBACK),
+                                    MLX4_PROT_IB_IPV6, &reg_id);
         if (err)
-                return err;
+                goto err_malloc;
 
         err = add_gid_entry(ibqp, gid);
         if (err)
                 goto err_add;
 
+        if (ib_steering) {
+                memcpy(ib_steering->gid.raw, gid->raw, 16);
+                ib_steering->reg_id = reg_id;
+                mutex_lock(&mqp->mutex);
+                list_add(&ib_steering->list, &mqp->steering_rules);
+                mutex_unlock(&mqp->mutex);
+        }
         return 0;
 
 err_add:
-        mlx4_multicast_detach(mdev->dev, &mqp->mqp, gid->raw, MLX4_PROT_IB_IPV6);
+        mlx4_multicast_detach(mdev->dev, &mqp->mqp, gid->raw,
+                              MLX4_PROT_IB_IPV6, reg_id);
+err_malloc:
+        kfree(ib_steering);
+
         return err;
 }
 
@@ -765,9 +792,30 @@ static int mlx4_ib_mcg_detach(struct ib_qp *ibqp, union ib_gid *gid, u16 lid)
         u8 mac[6];
         struct net_device *ndev;
         struct mlx4_ib_gid_entry *ge;
+        u64 reg_id = 0;
+
+        if (mdev->dev->caps.steering_mode ==
+            MLX4_STEERING_MODE_DEVICE_MANAGED) {
+                struct mlx4_ib_steering *ib_steering;
+
+                mutex_lock(&mqp->mutex);
+                list_for_each_entry(ib_steering, &mqp->steering_rules, list) {
+                        if (!memcmp(ib_steering->gid.raw, gid->raw, 16)) {
+                                list_del(&ib_steering->list);
+                                break;
+                        }
+                }
+                mutex_unlock(&mqp->mutex);
+                if (&ib_steering->list == &mqp->steering_rules) {
+                        pr_err("Couldn't find reg_id for mgid. Steering rule is left attached\n");
+                        return -EINVAL;
+                }
+                reg_id = ib_steering->reg_id;
+                kfree(ib_steering);
+        }
 
-        err = mlx4_multicast_detach(mdev->dev,
-                                    &mqp->mqp, gid->raw, MLX4_PROT_IB_IPV6);
+        err = mlx4_multicast_detach(mdev->dev, &mqp->mqp, gid->raw,
+                                    MLX4_PROT_IB_IPV6, reg_id);
         if (err)
                 return err;
 
diff --git a/drivers/infiniband/hw/mlx4/mlx4_ib.h b/drivers/infiniband/hw/mlx4/mlx4_ib.h
index ff36655d23d..42df4f7a6a5 100644
--- a/drivers/infiniband/hw/mlx4/mlx4_ib.h
+++ b/drivers/infiniband/hw/mlx4/mlx4_ib.h
@@ -163,6 +163,7 @@ struct mlx4_ib_qp {
         u8                      state;
         int                     mlx_type;
         struct list_head        gid_list;
+        struct list_head        steering_rules;
 };
 
 struct mlx4_ib_srq {
diff --git a/drivers/infiniband/hw/mlx4/qp.c b/drivers/infiniband/hw/mlx4/qp.c
index 8d4ed24aef9..6af19f6c2b1 100644
--- a/drivers/infiniband/hw/mlx4/qp.c
+++ b/drivers/infiniband/hw/mlx4/qp.c
@@ -495,6 +495,7 @@ static int create_qp_common(struct mlx4_ib_dev *dev, struct ib_pd *pd,
         spin_lock_init(&qp->sq.lock);
         spin_lock_init(&qp->rq.lock);
         INIT_LIST_HEAD(&qp->gid_list);
+        INIT_LIST_HEAD(&qp->steering_rules);
 
         qp->state        = IB_QPS_RESET;
         if (init_attr->sq_sig_type == IB_SIGNAL_ALL_WR)
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_main.c b/drivers/infiniband/ulp/ipoib/ipoib_main.c
index 3974c290b66..bbee4b2d7a1 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_main.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_main.c
@@ -715,7 +715,7 @@ static int ipoib_start_xmit(struct sk_buff *skb, struct net_device *dev)
 
         rcu_read_lock();
         if (likely(skb_dst(skb))) {
-                n = dst_get_neighbour_noref(skb_dst(skb));
+                n = dst_neigh_lookup_skb(skb_dst(skb), skb);
                 if (!n) {
                         ++dev->stats.tx_dropped;
                         dev_kfree_skb_any(skb);
@@ -797,6 +797,8 @@ static int ipoib_start_xmit(struct sk_buff *skb, struct net_device *dev)
                 }
         }
 unlock:
+        if (n)
+                neigh_release(n);
         rcu_read_unlock();
         return NETDEV_TX_OK;
 }
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_multicast.c b/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
index 20ebc6fd1bb..7cecb16d3d4 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
@@ -658,9 +658,15 @@ static int ipoib_mcast_leave(struct net_device *dev, struct ipoib_mcast *mcast)
 void ipoib_mcast_send(struct net_device *dev, void *mgid, struct sk_buff *skb)
 {
         struct ipoib_dev_priv *priv = netdev_priv(dev);
+        struct dst_entry *dst = skb_dst(skb);
         struct ipoib_mcast *mcast;
+        struct neighbour *n;
         unsigned long flags;
 
+        n = NULL;
+        if (dst)
+                n = dst_neigh_lookup_skb(dst, skb);
+
         spin_lock_irqsave(&priv->lock, flags);
 
         if (!test_bit(IPOIB_FLAG_OPER_UP, &priv->flags)         ||
@@ -715,29 +721,28 @@ void ipoib_mcast_send(struct net_device *dev, void *mgid, struct sk_buff *skb)
 
 out:
         if (mcast && mcast->ah) {
-                struct dst_entry *dst = skb_dst(skb);
-                struct neighbour *n = NULL;
-
-                rcu_read_lock();
-                if (dst)
-                        n = dst_get_neighbour_noref(dst);
-                if (n && !*to_ipoib_neigh(n)) {
-                        struct ipoib_neigh *neigh = ipoib_neigh_alloc(n,
-                                                                      skb->dev);
-
-                        if (neigh) {
-                                kref_get(&mcast->ah->ref);
-                                neigh->ah       = mcast->ah;
-                                list_add_tail(&neigh->list, &mcast->neigh_list);
+                if (n) {
+                        if (!*to_ipoib_neigh(n)) {
+                                struct ipoib_neigh *neigh;
+
+                                neigh = ipoib_neigh_alloc(n, skb->dev);
+                                if (neigh) {
+                                        kref_get(&mcast->ah->ref);
+                                        neigh->ah       = mcast->ah;
+                                        list_add_tail(&neigh->list,
+                                                      &mcast->neigh_list);
+                                }
                         }
+                        neigh_release(n);
                 }
-                rcu_read_unlock();
                 spin_unlock_irqrestore(&priv->lock, flags);
                 ipoib_send(dev, skb, mcast->ah, IB_MULTICAST_QPN);
                 return;
         }
 
 unlock:
+        if (n)
+                neigh_release(n);
         spin_unlock_irqrestore(&priv->lock, flags);
 }
 
diff --git a/drivers/net/appletalk/cops.c b/drivers/net/appletalk/cops.c
index dd5e04813b7..545c09ed907 100644
--- a/drivers/net/appletalk/cops.c
+++ b/drivers/net/appletalk/cops.c
@@ -936,7 +936,7 @@ static int cops_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
 {
         struct cops_local *lp = netdev_priv(dev);
         struct sockaddr_at *sa = (struct sockaddr_at *)&ifr->ifr_addr;
-        struct atalk_addr *aa = (struct atalk_addr *)&lp->node_addr;
+        struct atalk_addr *aa = &lp->node_addr;
 
         switch(cmd)
         {
diff --git a/drivers/net/bonding/bond_3ad.c b/drivers/net/bonding/bond_3ad.c
index 3463b469e65..a030e635f00 100644
--- a/drivers/net/bonding/bond_3ad.c
+++ b/drivers/net/bonding/bond_3ad.c
@@ -2454,24 +2454,27 @@ int bond_3ad_xmit_xor(struct sk_buff *skb, struct net_device *dev)
 out:
         if (res) {
                 /* no suitable interface, frame not sent */
-                dev_kfree_skb(skb);
+                kfree_skb(skb);
         }
 
         return NETDEV_TX_OK;
 }
 
-int bond_3ad_lacpdu_recv(struct sk_buff *skb, struct bonding *bond,
-                          struct slave *slave)
+int bond_3ad_lacpdu_recv(const struct sk_buff *skb, struct bonding *bond,
+                         struct slave *slave)
 {
         int ret = RX_HANDLER_ANOTHER;
+        struct lacpdu *lacpdu, _lacpdu;
+
         if (skb->protocol != PKT_TYPE_LACPDU)
                 return ret;
 
-        if (!pskb_may_pull(skb, sizeof(struct lacpdu)))
+        lacpdu = skb_header_pointer(skb, 0, sizeof(_lacpdu), &_lacpdu);
+        if (!lacpdu)
                 return ret;
 
         read_lock(&bond->lock);
-        ret = bond_3ad_rx_indication((struct lacpdu *) skb->data, slave, skb->len);
+        ret = bond_3ad_rx_indication(lacpdu, slave, skb->len);
         read_unlock(&bond->lock);
         return ret;
 }
diff --git a/drivers/net/bonding/bond_3ad.h b/drivers/net/bonding/bond_3ad.h
index 5ee7e3c45db..0cfaa4afdec 100644
--- a/drivers/net/bonding/bond_3ad.h
+++ b/drivers/net/bonding/bond_3ad.h
@@ -274,8 +274,8 @@ void bond_3ad_adapter_duplex_changed(struct slave *slave);
 void bond_3ad_handle_link_change(struct slave *slave, char link);
 int  bond_3ad_get_active_agg_info(struct bonding *bond, struct ad_info *ad_info);
 int bond_3ad_xmit_xor(struct sk_buff *skb, struct net_device *dev);
-int bond_3ad_lacpdu_recv(struct sk_buff *skb, struct bonding *bond,
-                          struct slave *slave);
+int bond_3ad_lacpdu_recv(const struct sk_buff *skb, struct bonding *bond,
+                         struct slave *slave);
 int bond_3ad_set_carrier(struct bonding *bond);
 void bond_3ad_update_lacp_rate(struct bonding *bond);
 #endif //__BOND_3AD_H__
diff --git a/drivers/net/bonding/bond_alb.c b/drivers/net/bonding/bond_alb.c
index 0f59c1564e5..e15cc11edbb 100644
--- a/drivers/net/bonding/bond_alb.c
+++ b/drivers/net/bonding/bond_alb.c
@@ -342,27 +342,17 @@ static void rlb_update_entry_from_arp(struct bonding *bond, struct arp_pkt *arp)
         _unlock_rx_hashtbl_bh(bond);
 }
 
-static int rlb_arp_recv(struct sk_buff *skb, struct bonding *bond,
-                         struct slave *slave)
+static int rlb_arp_recv(const struct sk_buff *skb, struct bonding *bond,
+                        struct slave *slave)
 {
-        struct arp_pkt *arp;
+        struct arp_pkt *arp, _arp;
 
         if (skb->protocol != cpu_to_be16(ETH_P_ARP))
                 goto out;
 
-        arp = (struct arp_pkt *) skb->data;
-        if (!arp) {
-                pr_debug("Packet has no ARP data\n");
+        arp = skb_header_pointer(skb, 0, sizeof(_arp), &_arp);
+        if (!arp)
                 goto out;
-        }
-
-        if (!pskb_may_pull(skb, arp_hdr_len(bond->dev)))
-                goto out;
-
-        if (skb->len < sizeof(struct arp_pkt)) {
-                pr_debug("Packet is too small to be an ARP\n");
-                goto out;
-        }
 
         if (arp->op_code == htons(ARPOP_REPLY)) {
                 /* update rx hash table for this ARP */
@@ -1356,12 +1346,12 @@ int bond_alb_xmit(struct sk_buff *skb, struct net_device *bond_dev)
                 }
         }
 
+        read_unlock(&bond->curr_slave_lock);
+
         if (res) {
                 /* no suitable interface, frame not sent */
-                dev_kfree_skb(skb);
+                kfree_skb(skb);
         }
-        read_unlock(&bond->curr_slave_lock);
-
         return NETDEV_TX_OK;
 }
 
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 2ee76993f05..4ddcc3e41da 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -1445,8 +1445,8 @@ static rx_handler_result_t bond_handle_frame(struct sk_buff **pskb)
         struct sk_buff *skb = *pskb;
         struct slave *slave;
         struct bonding *bond;
-        int (*recv_probe)(struct sk_buff *, struct bonding *,
-                                struct slave *);
+        int (*recv_probe)(const struct sk_buff *, struct bonding *,
+                          struct slave *);
         int ret = RX_HANDLER_ANOTHER;
 
         skb = skb_share_check(skb, GFP_ATOMIC);
@@ -1463,15 +1463,10 @@ static rx_handler_result_t bond_handle_frame(struct sk_buff **pskb)
 
         recv_probe = ACCESS_ONCE(bond->recv_probe);
         if (recv_probe) {
-                struct sk_buff *nskb = skb_clone(skb, GFP_ATOMIC);
-
-                if (likely(nskb)) {
-                        ret = recv_probe(nskb, bond, slave);
-                        dev_kfree_skb(nskb);
-                        if (ret == RX_HANDLER_CONSUMED) {
-                                consume_skb(skb);
-                                return ret;
-                        }
+                ret = recv_probe(skb, bond, slave);
+                if (ret == RX_HANDLER_CONSUMED) {
+                        consume_skb(skb);
+                        return ret;
                 }
         }
 
@@ -2738,25 +2733,31 @@ static void bond_validate_arp(struct bonding *bond, struct slave *slave, __be32
         }
 }
 
-static int bond_arp_rcv(struct sk_buff *skb, struct bonding *bond,
-                         struct slave *slave)
+static int bond_arp_rcv(const struct sk_buff *skb, struct bonding *bond,
+                        struct slave *slave)
 {
-        struct arphdr *arp;
+        struct arphdr *arp = (struct arphdr *)skb->data;
         unsigned char *arp_ptr;
         __be32 sip, tip;
+        int alen;
 
         if (skb->protocol != __cpu_to_be16(ETH_P_ARP))
                 return RX_HANDLER_ANOTHER;
 
         read_lock(&bond->lock);
+        alen = arp_hdr_len(bond->dev);
 
         pr_debug("bond_arp_rcv: bond %s skb->dev %s\n",
                  bond->dev->name, skb->dev->name);
 
-        if (!pskb_may_pull(skb, arp_hdr_len(bond->dev)))
-                goto out_unlock;
+        if (alen > skb_headlen(skb)) {
+                arp = kmalloc(alen, GFP_ATOMIC);
+                if (!arp)
+                        goto out_unlock;
+                if (skb_copy_bits(skb, 0, arp, alen) < 0)
+                        goto out_unlock;
+        }
 
-        arp = arp_hdr(skb);
         if (arp->ar_hln != bond->dev->addr_len ||
             skb->pkt_type == PACKET_OTHERHOST ||
             skb->pkt_type == PACKET_LOOPBACK ||
@@ -2791,6 +2792,8 @@ static int bond_arp_rcv(struct sk_buff *skb, struct bonding *bond,
 
 out_unlock:
         read_unlock(&bond->lock);
+        if (arp != (struct arphdr *)skb->data)
+                kfree(arp);
         return RX_HANDLER_ANOTHER;
 }
 
@@ -3993,7 +3996,7 @@ static int bond_xmit_roundrobin(struct sk_buff *skb, struct net_device *bond_dev
 out:
         if (res) {
                 /* no suitable interface, frame not sent */
-                dev_kfree_skb(skb);
+                kfree_skb(skb);
         }
 
         return NETDEV_TX_OK;
@@ -4015,11 +4018,11 @@ static int bond_xmit_activebackup(struct sk_buff *skb, struct net_device *bond_d
                 res = bond_dev_queue_xmit(bond, skb,
                         bond->curr_active_slave->dev);
 
+        read_unlock(&bond->curr_slave_lock);
+
         if (res)
                 /* no suitable interface, frame not sent */
-                dev_kfree_skb(skb);
-
-        read_unlock(&bond->curr_slave_lock);
+                kfree_skb(skb);
 
         return NETDEV_TX_OK;
 }
@@ -4058,7 +4061,7 @@ static int bond_xmit_xor(struct sk_buff *skb, struct net_device *bond_dev)
 
         if (res) {
                 /* no suitable interface, frame not sent */
-                dev_kfree_skb(skb);
+                kfree_skb(skb);
         }
 
         return NETDEV_TX_OK;
@@ -4096,7 +4099,7 @@ static int bond_xmit_broadcast(struct sk_buff *skb, struct net_device *bond_dev)
 
                                 res = bond_dev_queue_xmit(bond, skb2, tx_dev);
                                 if (res) {
-                                        dev_kfree_skb(skb2);
+                                        kfree_skb(skb2);
                                         continue;
                                 }
                         }
@@ -4110,7 +4113,7 @@ static int bond_xmit_broadcast(struct sk_buff *skb, struct net_device *bond_dev)
 out:
         if (res)
                 /* no suitable interface, frame not sent */
-                dev_kfree_skb(skb);
+                kfree_skb(skb);
 
         /* frame sent to all suitable interfaces */
         return NETDEV_TX_OK;
@@ -4216,7 +4219,7 @@ static netdev_tx_t __bond_start_xmit(struct sk_buff *skb, struct net_device *dev
                 pr_err("%s: Error: Unknown bonding mode %d\n",
                        dev->name, bond->params.mode);
                 WARN_ON_ONCE(1);
-                dev_kfree_skb(skb);
+                kfree_skb(skb);
                 return NETDEV_TX_OK;
         }
 }
@@ -4238,7 +4241,7 @@ static netdev_tx_t bond_start_xmit(struct sk_buff *skb, struct net_device *dev)
         if (bond->slave_cnt)
                 ret = __bond_start_xmit(skb, dev);
         else
-                dev_kfree_skb(skb);
+                kfree_skb(skb);
 
         read_unlock(&bond->lock);
 
diff --git a/drivers/net/bonding/bonding.h b/drivers/net/bonding/bonding.h
index 4581aa5ccab..f8af2fcd3d1 100644
--- a/drivers/net/bonding/bonding.h
+++ b/drivers/net/bonding/bonding.h
@@ -218,8 +218,8 @@ struct bonding {
         struct   slave *primary_slave;
         bool     force_primary;
         s32      slave_cnt; /* never change this value outside the attach/detach wrappers */
-        int     (*recv_probe)(struct sk_buff *, struct bonding *,
-                               struct slave *);
+        int     (*recv_probe)(const struct sk_buff *, struct bonding *,
+                              struct slave *);
         rwlock_t lock;
         rwlock_t curr_slave_lock;
         u8       send_peer_notif;
diff --git a/drivers/net/caif/caif_hsi.c b/drivers/net/caif/caif_hsi.c
index 4a27adb7ae6..0def8b3106f 100644
--- a/drivers/net/caif/caif_hsi.c
+++ b/drivers/net/caif/caif_hsi.c
@@ -11,7 +11,6 @@
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/device.h>
-#include <linux/platform_device.h>
 #include <linux/netdevice.h>
 #include <linux/string.h>
 #include <linux/list.h>
@@ -20,7 +19,7 @@
 #include <linux/sched.h>
 #include <linux/if_arp.h>
 #include <linux/timer.h>
-#include <linux/rtnetlink.h>
+#include <net/rtnetlink.h>
 #include <linux/pkt_sched.h>
 #include <net/caif/caif_layer.h>
 #include <net/caif/caif_hsi.h>
@@ -33,59 +32,46 @@ MODULE_DESCRIPTION("CAIF HSI driver");
 #define PAD_POW2(x, pow) ((((x)&((pow)-1)) == 0) ? 0 :\
                                 (((pow)-((x)&((pow)-1)))))
 
-static int inactivity_timeout = 1000;
-module_param(inactivity_timeout, int, S_IRUGO | S_IWUSR);
-MODULE_PARM_DESC(inactivity_timeout, "Inactivity timeout on HSI, ms.");
+static const struct cfhsi_config  hsi_default_config = {
 
-static int aggregation_timeout = 1;
-module_param(aggregation_timeout, int, S_IRUGO | S_IWUSR);
-MODULE_PARM_DESC(aggregation_timeout, "Aggregation timeout on HSI, ms.");
+        /* Inactivity timeout on HSI, ms */
+        .inactivity_timeout = HZ,
 
-/*
- * HSI padding options.
- * Warning: must be a base of 2 (& operation used) and can not be zero !
- */
-static int hsi_head_align = 4;
-module_param(hsi_head_align, int, S_IRUGO);
-MODULE_PARM_DESC(hsi_head_align, "HSI head alignment.");
+        /* Aggregation timeout (ms) of zero means no aggregation is done*/
+        .aggregation_timeout = 1,
 
-static int hsi_tail_align = 4;
-module_param(hsi_tail_align, int, S_IRUGO);
-MODULE_PARM_DESC(hsi_tail_align, "HSI tail alignment.");
-
-/*
- * HSI link layer flowcontrol thresholds.
- * Warning: A high threshold value migth increase throughput but it will at
- * the same time prevent channel prioritization and increase the risk of
- * flooding the modem. The high threshold should be above the low.
- */
-static int hsi_high_threshold = 100;
-module_param(hsi_high_threshold, int, S_IRUGO);
-MODULE_PARM_DESC(hsi_high_threshold, "HSI high threshold (FLOW OFF).");
+        /*
+         * HSI link layer flow-control thresholds.
+         * Threshold values for the HSI packet queue. Flow-control will be
+         * asserted when the number of packets exceeds q_high_mark. It will
+         * not be de-asserted before the number of packets drops below
+         * q_low_mark.
+         * Warning: A high threshold value might increase throughput but it
+         * will at the same time prevent channel prioritization and increase
+         * the risk of flooding the modem. The high threshold should be above
+         * the low.
+         */
+        .q_high_mark = 100,
+        .q_low_mark = 50,
 
-static int hsi_low_threshold = 50;
-module_param(hsi_low_threshold, int, S_IRUGO);
-MODULE_PARM_DESC(hsi_low_threshold, "HSI high threshold (FLOW ON).");
+        /*
+         * HSI padding options.
+         * Warning: must be a base of 2 (& operation used) and can not be zero !
+         */
+        .head_align = 4,
+        .tail_align = 4,
+};
 
 #define ON 1
 #define OFF 0
 
-/*
- * Threshold values for the HSI packet queue. Flowcontrol will be asserted
- * when the number of packets exceeds HIGH_WATER_MARK. It will not be
- * de-asserted before the number of packets drops below LOW_WATER_MARK.
- */
-#define LOW_WATER_MARK   hsi_low_threshold
-#define HIGH_WATER_MARK  hsi_high_threshold
-
 static LIST_HEAD(cfhsi_list);
-static spinlock_t cfhsi_list_lock;
 
 static void cfhsi_inactivity_tout(unsigned long arg)
 {
         struct cfhsi *cfhsi = (struct cfhsi *)arg;
 
-        dev_dbg(&cfhsi->ndev->dev, "%s.\n",
+        netdev_dbg(cfhsi->ndev, "%s.\n",
                 __func__);
 
         /* Schedule power down work queue. */
@@ -101,8 +87,8 @@ static void cfhsi_update_aggregation_stats(struct cfhsi *cfhsi,
         int hpad, tpad, len;
 
         info = (struct caif_payload_info *)&skb->cb;
-        hpad = 1 + PAD_POW2((info->hdr_len + 1), hsi_head_align);
-        tpad = PAD_POW2((skb->len + hpad), hsi_tail_align);
+        hpad = 1 + PAD_POW2((info->hdr_len + 1), cfhsi->cfg.head_align);
+        tpad = PAD_POW2((skb->len + hpad), cfhsi->cfg.tail_align);
         len = skb->len + hpad + tpad;
 
         if (direction > 0)
@@ -115,7 +101,7 @@ static bool cfhsi_can_send_aggregate(struct cfhsi *cfhsi)
 {
         int i;
 
-        if (cfhsi->aggregation_timeout < 0)
+        if (cfhsi->cfg.aggregation_timeout == 0)
                 return true;
 
         for (i = 0; i < CFHSI_PRIO_BEBK; ++i) {
@@ -171,7 +157,7 @@ static void cfhsi_abort_tx(struct cfhsi *cfhsi)
         cfhsi->tx_state = CFHSI_TX_STATE_IDLE;
         if (!test_bit(CFHSI_SHUTDOWN, &cfhsi->bits))
                 mod_timer(&cfhsi->inactivity_timer,
-                        jiffies + cfhsi->inactivity_timeout);
+                        jiffies + cfhsi->cfg.inactivity_timeout);
         spin_unlock_bh(&cfhsi->lock);
 }
 
@@ -181,14 +167,14 @@ static int cfhsi_flush_fifo(struct cfhsi *cfhsi)
         size_t fifo_occupancy;
         int ret;
 
-        dev_dbg(&cfhsi->ndev->dev, "%s.\n",
+        netdev_dbg(cfhsi->ndev, "%s.\n",
                 __func__);
 
         do {
-                ret = cfhsi->dev->cfhsi_fifo_occupancy(cfhsi->dev,
+                ret = cfhsi->ops->cfhsi_fifo_occupancy(cfhsi->ops,
                                 &fifo_occupancy);
                 if (ret) {
-                        dev_warn(&cfhsi->ndev->dev,
+                        netdev_warn(cfhsi->ndev,
                                 "%s: can't get FIFO occupancy: %d.\n",
                                 __func__, ret);
                         break;
@@ -198,11 +184,11 @@ static int cfhsi_flush_fifo(struct cfhsi *cfhsi)
 
                 fifo_occupancy = min(sizeof(buffer), fifo_occupancy);
                 set_bit(CFHSI_FLUSH_FIFO, &cfhsi->bits);
-                ret = cfhsi->dev->cfhsi_rx(buffer, fifo_occupancy,
-                                cfhsi->dev);
+                ret = cfhsi->ops->cfhsi_rx(buffer, fifo_occupancy,
+                                cfhsi->ops);
                 if (ret) {
                         clear_bit(CFHSI_FLUSH_FIFO, &cfhsi->bits);
-                        dev_warn(&cfhsi->ndev->dev,
+                        netdev_warn(cfhsi->ndev,
                                 "%s: can't read data: %d.\n",
                                 __func__, ret);
                         break;
@@ -213,13 +199,13 @@ static int cfhsi_flush_fifo(struct cfhsi *cfhsi)
                          !test_bit(CFHSI_FLUSH_FIFO, &cfhsi->bits), ret);
 
                 if (ret < 0) {
-                        dev_warn(&cfhsi->ndev->dev,
+                        netdev_warn(cfhsi->ndev,
                                 "%s: can't wait for flush complete: %d.\n",
                                 __func__, ret);
                         break;
                 } else if (!ret) {
                         ret = -ETIMEDOUT;
-                        dev_warn(&cfhsi->ndev->dev,
+                        netdev_warn(cfhsi->ndev,
                                 "%s: timeout waiting for flush complete.\n",
                                 __func__);
                         break;
@@ -246,14 +232,14 @@ static int cfhsi_tx_frm(struct cfhsi_desc *desc, struct cfhsi *cfhsi)
         /* Check if we can embed a CAIF frame. */
         if (skb->len < CFHSI_MAX_EMB_FRM_SZ) {
                 struct caif_payload_info *info;
-                int hpad = 0;
-                int tpad = 0;
+                int hpad;
+                int tpad;
 
                 /* Calculate needed head alignment and tail alignment. */
                 info = (struct caif_payload_info *)&skb->cb;
 
-                hpad = 1 + PAD_POW2((info->hdr_len + 1), hsi_head_align);
-                tpad = PAD_POW2((skb->len + hpad), hsi_tail_align);
+                hpad = 1 + PAD_POW2((info->hdr_len + 1), cfhsi->cfg.head_align);
+                tpad = PAD_POW2((skb->len + hpad), cfhsi->cfg.tail_align);
 
                 /* Check if frame still fits with added alignment. */
                 if ((skb->len + hpad + tpad) <= CFHSI_MAX_EMB_FRM_SZ) {
@@ -282,8 +268,8 @@ static int cfhsi_tx_frm(struct cfhsi_desc *desc, struct cfhsi *cfhsi)
         pfrm = desc->emb_frm + CFHSI_MAX_EMB_FRM_SZ;
         while (nfrms < CFHSI_MAX_PKTS) {
                 struct caif_payload_info *info;
-                int hpad = 0;
-                int tpad = 0;
+                int hpad;
+                int tpad;
 
                 if (!skb)
                         skb = cfhsi_dequeue(cfhsi);
@@ -294,8 +280,8 @@ static int cfhsi_tx_frm(struct cfhsi_desc *desc, struct cfhsi *cfhsi)
                 /* Calculate needed head alignment and tail alignment. */
                 info = (struct caif_payload_info *)&skb->cb;
 
-                hpad = 1 + PAD_POW2((info->hdr_len + 1), hsi_head_align);
-                tpad = PAD_POW2((skb->len + hpad), hsi_tail_align);
+                hpad = 1 + PAD_POW2((info->hdr_len + 1), cfhsi->cfg.head_align);
+                tpad = PAD_POW2((skb->len + hpad), cfhsi->cfg.tail_align);
 
                 /* Fill in CAIF frame length in descriptor. */
                 desc->cffrm_len[nfrms] = hpad + skb->len + tpad;
@@ -348,7 +334,7 @@ static void cfhsi_start_tx(struct cfhsi *cfhsi)
         struct cfhsi_desc *desc = (struct cfhsi_desc *)cfhsi->tx_buf;
         int len, res;
 
-        dev_dbg(&cfhsi->ndev->dev, "%s.\n", __func__);
+        netdev_dbg(cfhsi->ndev, "%s.\n", __func__);
 
         if (test_bit(CFHSI_SHUTDOWN, &cfhsi->bits))
                 return;
@@ -366,22 +352,22 @@ static void cfhsi_start_tx(struct cfhsi *cfhsi)
                         cfhsi->tx_state = CFHSI_TX_STATE_IDLE;
                         /* Start inactivity timer. */
                         mod_timer(&cfhsi->inactivity_timer,
-                                jiffies + cfhsi->inactivity_timeout);
+                                jiffies + cfhsi->cfg.inactivity_timeout);
                         spin_unlock_bh(&cfhsi->lock);
                         break;
                 }
 
                 /* Set up new transfer. */
-                res = cfhsi->dev->cfhsi_tx(cfhsi->tx_buf, len, cfhsi->dev);
+                res = cfhsi->ops->cfhsi_tx(cfhsi->tx_buf, len, cfhsi->ops);
                 if (WARN_ON(res < 0))
-                        dev_err(&cfhsi->ndev->dev, "%s: TX error %d.\n",
+                        netdev_err(cfhsi->ndev, "%s: TX error %d.\n",
                                 __func__, res);
         } while (res < 0);
 }
 
 static void cfhsi_tx_done(struct cfhsi *cfhsi)
 {
-        dev_dbg(&cfhsi->ndev->dev, "%s.\n", __func__);
+        netdev_dbg(cfhsi->ndev, "%s.\n", __func__);
 
         if (test_bit(CFHSI_SHUTDOWN, &cfhsi->bits))
                 return;
@@ -392,7 +378,7 @@ static void cfhsi_tx_done(struct cfhsi *cfhsi)
          */
         spin_lock_bh(&cfhsi->lock);
         if (cfhsi->flow_off_sent &&
-                        cfhsi_tx_queue_len(cfhsi) <= cfhsi->q_low_mark &&
+                        cfhsi_tx_queue_len(cfhsi) <= cfhsi->cfg.q_low_mark &&
                         cfhsi->cfdev.flowctrl) {
 
                 cfhsi->flow_off_sent = 0;
@@ -404,19 +390,19 @@ static void cfhsi_tx_done(struct cfhsi *cfhsi)
                 cfhsi_start_tx(cfhsi);
         } else {
                 mod_timer(&cfhsi->aggregation_timer,
-                        jiffies + cfhsi->aggregation_timeout);
+                        jiffies + cfhsi->cfg.aggregation_timeout);
                 spin_unlock_bh(&cfhsi->lock);
         }
 
         return;
 }
 
-static void cfhsi_tx_done_cb(struct cfhsi_drv *drv)
+static void cfhsi_tx_done_cb(struct cfhsi_cb_ops *cb_ops)
 {
         struct cfhsi *cfhsi;
 
-        cfhsi = container_of(drv, struct cfhsi, drv);
-        dev_dbg(&cfhsi->ndev->dev, "%s.\n",
+        cfhsi = container_of(cb_ops, struct cfhsi, cb_ops);
+        netdev_dbg(cfhsi->ndev, "%s.\n",
                 __func__);
 
         if (test_bit(CFHSI_SHUTDOWN, &cfhsi->bits))
@@ -433,7 +419,7 @@ static int cfhsi_rx_desc(struct cfhsi_desc *desc, struct cfhsi *cfhsi)
 
         if ((desc->header & ~CFHSI_PIGGY_DESC) ||
                         (desc->offset > CFHSI_MAX_EMB_FRM_SZ)) {
-                dev_err(&cfhsi->ndev->dev, "%s: Invalid descriptor.\n",
+                netdev_err(cfhsi->ndev, "%s: Invalid descriptor.\n",
                         __func__);
                 return -EPROTO;
         }
@@ -455,7 +441,7 @@ static int cfhsi_rx_desc(struct cfhsi_desc *desc, struct cfhsi *cfhsi)
 
                 /* Sanity check length of CAIF frame. */
                 if (unlikely(len > CFHSI_MAX_CAIF_FRAME_SZ)) {
-                        dev_err(&cfhsi->ndev->dev, "%s: Invalid length.\n",
+                        netdev_err(cfhsi->ndev, "%s: Invalid length.\n",
                                 __func__);
                         return -EPROTO;
                 }
@@ -463,7 +449,7 @@ static int cfhsi_rx_desc(struct cfhsi_desc *desc, struct cfhsi *cfhsi)
                 /* Allocate SKB (OK even in IRQ context). */
                 skb = alloc_skb(len + 1, GFP_ATOMIC);
                 if (!skb) {
-                        dev_err(&cfhsi->ndev->dev, "%s: Out of memory !\n",
+                        netdev_err(cfhsi->ndev, "%s: Out of memory !\n",
                                 __func__);
                         return -ENOMEM;
                 }
@@ -477,8 +463,8 @@ static int cfhsi_rx_desc(struct cfhsi_desc *desc, struct cfhsi *cfhsi)
                 skb->dev = cfhsi->ndev;
 
                 /*
-                 * We are called from a arch specific platform device.
-                 * Unfortunately we don't know what context we're
+                 * We are in a callback handler and
+                 * unfortunately we don't know what context we're
                  * running in.
                  */
                 if (in_interrupt())
@@ -504,7 +490,7 @@ static int cfhsi_rx_desc(struct cfhsi_desc *desc, struct cfhsi *cfhsi)
                 xfer_sz += CFHSI_DESC_SZ;
 
         if ((xfer_sz % 4) || (xfer_sz > (CFHSI_BUF_SZ_RX - CFHSI_DESC_SZ))) {
-                dev_err(&cfhsi->ndev->dev,
+                netdev_err(cfhsi->ndev,
                                 "%s: Invalid payload len: %d, ignored.\n",
                         __func__, xfer_sz);
                 return -EPROTO;
@@ -551,7 +537,7 @@ static int cfhsi_rx_pld(struct cfhsi_desc *desc, struct cfhsi *cfhsi)
         /* Sanity check header and offset. */
         if (WARN_ON((desc->header & ~CFHSI_PIGGY_DESC) ||
                         (desc->offset > CFHSI_MAX_EMB_FRM_SZ))) {
-                dev_err(&cfhsi->ndev->dev, "%s: Invalid descriptor.\n",
+                netdev_err(cfhsi->ndev, "%s: Invalid descriptor.\n",
                         __func__);
                 return -EPROTO;
         }
@@ -573,7 +559,7 @@ static int cfhsi_rx_pld(struct cfhsi_desc *desc, struct cfhsi *cfhsi)
                 struct sk_buff *skb;
                 u8 *dst = NULL;
                 u8 *pcffrm = NULL;
-                int len = 0;
+                int len;
 
                 /* CAIF frame starts after head padding. */
                 pcffrm = pfrm + *pfrm + 1;
@@ -585,7 +571,7 @@ static int cfhsi_rx_pld(struct cfhsi_desc *desc, struct cfhsi *cfhsi)
 
                 /* Sanity check length of CAIF frames. */
                 if (unlikely(len > CFHSI_MAX_CAIF_FRAME_SZ)) {
-                        dev_err(&cfhsi->ndev->dev, "%s: Invalid length.\n",
+                        netdev_err(cfhsi->ndev, "%s: Invalid length.\n",
                                 __func__);
                         return -EPROTO;
                 }
@@ -593,7 +579,7 @@ static int cfhsi_rx_pld(struct cfhsi_desc *desc, struct cfhsi *cfhsi)
                 /* Allocate SKB (OK even in IRQ context). */
                 skb = alloc_skb(len + 1, GFP_ATOMIC);
                 if (!skb) {
-                        dev_err(&cfhsi->ndev->dev, "%s: Out of memory !\n",
+                        netdev_err(cfhsi->ndev, "%s: Out of memory !\n",
                                 __func__);
                         cfhsi->rx_state.nfrms = nfrms;
                         return -ENOMEM;
@@ -608,7 +594,7 @@ static int cfhsi_rx_pld(struct cfhsi_desc *desc, struct cfhsi *cfhsi)
                 skb->dev = cfhsi->ndev;
 
                 /*
-                 * We're called from a platform device,
+                 * We're called in callback from HSI
                  * and don't know the context we're running in.
                  */
                 if (in_interrupt())
@@ -639,7 +625,7 @@ static void cfhsi_rx_done(struct cfhsi *cfhsi)
 
         desc = (struct cfhsi_desc *)cfhsi->rx_buf;
 
-        dev_dbg(&cfhsi->ndev->dev, "%s\n", __func__);
+        netdev_dbg(cfhsi->ndev, "%s\n", __func__);
 
         if (test_bit(CFHSI_SHUTDOWN, &cfhsi->bits))
                 return;
@@ -647,7 +633,7 @@ static void cfhsi_rx_done(struct cfhsi *cfhsi)
         /* Update inactivity timer if pending. */
         spin_lock_bh(&cfhsi->lock);
         mod_timer_pending(&cfhsi->inactivity_timer,
-                        jiffies + cfhsi->inactivity_timeout);
+                        jiffies + cfhsi->cfg.inactivity_timeout);
         spin_unlock_bh(&cfhsi->lock);
 
         if (cfhsi->rx_state.state == CFHSI_RX_STATE_DESC) {
@@ -680,12 +666,11 @@ static void cfhsi_rx_done(struct cfhsi *cfhsi)
                         if (desc_pld_len < 0)
                                 goto out_of_sync;
 
-                        if (desc_pld_len > 0)
+                        if (desc_pld_len > 0) {
                                 rx_len = desc_pld_len;
-
-                        if (desc_pld_len > 0 &&
-                                        (piggy_desc->header & CFHSI_PIGGY_DESC))
-                                rx_len += CFHSI_DESC_SZ;
+                                if (piggy_desc->header & CFHSI_PIGGY_DESC)
+                                        rx_len += CFHSI_DESC_SZ;
+                        }
 
                         /*
                          * Copy needed information from the piggy-backed
@@ -693,8 +678,6 @@ static void cfhsi_rx_done(struct cfhsi *cfhsi)
                          */
                         memcpy(rx_buf, (u8 *)piggy_desc,
                                         CFHSI_DESC_SHORT_SZ);
-                        if (desc_pld_len == -EPROTO)
-                                goto out_of_sync;
                 }
         }
 
@@ -710,13 +693,13 @@ static void cfhsi_rx_done(struct cfhsi *cfhsi)
         /* Initiate next read */
         if (test_bit(CFHSI_AWAKE, &cfhsi->bits)) {
                 /* Set up new transfer. */
-                dev_dbg(&cfhsi->ndev->dev, "%s: Start RX.\n",
+                netdev_dbg(cfhsi->ndev, "%s: Start RX.\n",
                                 __func__);
 
-                res = cfhsi->dev->cfhsi_rx(rx_ptr, rx_len,
-                                cfhsi->dev);
+                res = cfhsi->ops->cfhsi_rx(rx_ptr, rx_len,
+                                cfhsi->ops);
                 if (WARN_ON(res < 0)) {
-                        dev_err(&cfhsi->ndev->dev, "%s: RX error %d.\n",
+                        netdev_err(cfhsi->ndev, "%s: RX error %d.\n",
                                 __func__, res);
                         cfhsi->ndev->stats.rx_errors++;
                         cfhsi->ndev->stats.rx_dropped++;
@@ -753,7 +736,7 @@ static void cfhsi_rx_done(struct cfhsi *cfhsi)
         return;
 
 out_of_sync:
-        dev_err(&cfhsi->ndev->dev, "%s: Out of sync.\n", __func__);
+        netdev_err(cfhsi->ndev, "%s: Out of sync.\n", __func__);
         print_hex_dump_bytes("--> ", DUMP_PREFIX_NONE,
                         cfhsi->rx_buf, CFHSI_DESC_SZ);
         schedule_work(&cfhsi->out_of_sync_work);
@@ -763,18 +746,18 @@ static void cfhsi_rx_slowpath(unsigned long arg)
 {
         struct cfhsi *cfhsi = (struct cfhsi *)arg;
 
-        dev_dbg(&cfhsi->ndev->dev, "%s.\n",
+        netdev_dbg(cfhsi->ndev, "%s.\n",
                 __func__);
 
         cfhsi_rx_done(cfhsi);
 }
 
-static void cfhsi_rx_done_cb(struct cfhsi_drv *drv)
+static void cfhsi_rx_done_cb(struct cfhsi_cb_ops *cb_ops)
 {
         struct cfhsi *cfhsi;
 
-        cfhsi = container_of(drv, struct cfhsi, drv);
-        dev_dbg(&cfhsi->ndev->dev, "%s.\n",
+        cfhsi = container_of(cb_ops, struct cfhsi, cb_ops);
+        netdev_dbg(cfhsi->ndev, "%s.\n",
                 __func__);
 
         if (test_bit(CFHSI_SHUTDOWN, &cfhsi->bits))
@@ -807,9 +790,9 @@ static void cfhsi_wake_up(struct work_struct *work)
         }
 
         /* Activate wake line. */
-        cfhsi->dev->cfhsi_wake_up(cfhsi->dev);
+        cfhsi->ops->cfhsi_wake_up(cfhsi->ops);
 
-        dev_dbg(&cfhsi->ndev->dev, "%s: Start waiting.\n",
+        netdev_dbg(cfhsi->ndev, "%s: Start waiting.\n",
                 __func__);
 
         /* Wait for acknowledge. */
@@ -819,33 +802,33 @@ static void cfhsi_wake_up(struct work_struct *work)
                                                         &cfhsi->bits), ret);
         if (unlikely(ret < 0)) {
                 /* Interrupted by signal. */
-                dev_err(&cfhsi->ndev->dev, "%s: Signalled: %ld.\n",
+                netdev_err(cfhsi->ndev, "%s: Signalled: %ld.\n",
                         __func__, ret);
 
                 clear_bit(CFHSI_WAKE_UP, &cfhsi->bits);
-                cfhsi->dev->cfhsi_wake_down(cfhsi->dev);
+                cfhsi->ops->cfhsi_wake_down(cfhsi->ops);
                 return;
         } else if (!ret) {
                 bool ca_wake = false;
                 size_t fifo_occupancy = 0;
 
                 /* Wakeup timeout */
-                dev_dbg(&cfhsi->ndev->dev, "%s: Timeout.\n",
+                netdev_dbg(cfhsi->ndev, "%s: Timeout.\n",
                         __func__);
 
                 /* Check FIFO to check if modem has sent something. */
-                WARN_ON(cfhsi->dev->cfhsi_fifo_occupancy(cfhsi->dev,
+                WARN_ON(cfhsi->ops->cfhsi_fifo_occupancy(cfhsi->ops,
                                         &fifo_occupancy));
 
-                dev_dbg(&cfhsi->ndev->dev, "%s: Bytes in FIFO: %u.\n",
+                netdev_dbg(cfhsi->ndev, "%s: Bytes in FIFO: %u.\n",
                                 __func__, (unsigned) fifo_occupancy);
 
                 /* Check if we misssed the interrupt. */
-                WARN_ON(cfhsi->dev->cfhsi_get_peer_wake(cfhsi->dev,
+                WARN_ON(cfhsi->ops->cfhsi_get_peer_wake(cfhsi->ops,
                                                         &ca_wake));
 
                 if (ca_wake) {
-                        dev_err(&cfhsi->ndev->dev, "%s: CA Wake missed !.\n",
+                        netdev_err(cfhsi->ndev, "%s: CA Wake missed !.\n",
                                 __func__);
 
                         /* Clear the CFHSI_WAKE_UP_ACK bit to prevent race. */
@@ -856,11 +839,11 @@ static void cfhsi_wake_up(struct work_struct *work)
                 }
 
                 clear_bit(CFHSI_WAKE_UP, &cfhsi->bits);
-                cfhsi->dev->cfhsi_wake_down(cfhsi->dev);
+                cfhsi->ops->cfhsi_wake_down(cfhsi->ops);
                 return;
         }
 wake_ack:
-        dev_dbg(&cfhsi->ndev->dev, "%s: Woken.\n",
+        netdev_dbg(cfhsi->ndev, "%s: Woken.\n",
                 __func__);
 
         /* Clear power up bit. */
@@ -868,11 +851,11 @@ wake_ack:
         clear_bit(CFHSI_WAKE_UP, &cfhsi->bits);
 
         /* Resume read operation. */
-        dev_dbg(&cfhsi->ndev->dev, "%s: Start RX.\n", __func__);
-        res = cfhsi->dev->cfhsi_rx(cfhsi->rx_ptr, cfhsi->rx_len, cfhsi->dev);
+        netdev_dbg(cfhsi->ndev, "%s: Start RX.\n", __func__);
+        res = cfhsi->ops->cfhsi_rx(cfhsi->rx_ptr, cfhsi->rx_len, cfhsi->ops);
 
         if (WARN_ON(res < 0))
-                dev_err(&cfhsi->ndev->dev, "%s: RX err %d.\n", __func__, res);
+                netdev_err(cfhsi->ndev, "%s: RX err %d.\n", __func__, res);
 
         /* Clear power up acknowledment. */
         clear_bit(CFHSI_WAKE_UP_ACK, &cfhsi->bits);
@@ -881,16 +864,16 @@ wake_ack:
 
         /* Resume transmit if queues are not empty. */
         if (!cfhsi_tx_queue_len(cfhsi)) {
-                dev_dbg(&cfhsi->ndev->dev, "%s: Peer wake, start timer.\n",
+                netdev_dbg(cfhsi->ndev, "%s: Peer wake, start timer.\n",
                         __func__);
                 /* Start inactivity timer. */
                 mod_timer(&cfhsi->inactivity_timer,
-                                jiffies + cfhsi->inactivity_timeout);
+                                jiffies + cfhsi->cfg.inactivity_timeout);
                 spin_unlock_bh(&cfhsi->lock);
                 return;
         }
 
-        dev_dbg(&cfhsi->ndev->dev, "%s: Host wake.\n",
+        netdev_dbg(cfhsi->ndev, "%s: Host wake.\n",
                 __func__);
 
         spin_unlock_bh(&cfhsi->lock);
@@ -900,14 +883,14 @@ wake_ack:
 
         if (likely(len > 0)) {
                 /* Set up new transfer. */
-                res = cfhsi->dev->cfhsi_tx(cfhsi->tx_buf, len, cfhsi->dev);
+                res = cfhsi->ops->cfhsi_tx(cfhsi->tx_buf, len, cfhsi->ops);
                 if (WARN_ON(res < 0)) {
-                        dev_err(&cfhsi->ndev->dev, "%s: TX error %d.\n",
+                        netdev_err(cfhsi->ndev, "%s: TX error %d.\n",
                                 __func__, res);
                         cfhsi_abort_tx(cfhsi);
                 }
         } else {
-                dev_err(&cfhsi->ndev->dev,
+                netdev_err(cfhsi->ndev,
                                 "%s: Failed to create HSI frame: %d.\n",
                                 __func__, len);
         }
@@ -921,13 +904,13 @@ static void cfhsi_wake_down(struct work_struct *work)
         int retry = CFHSI_WAKE_TOUT;
 
         cfhsi = container_of(work, struct cfhsi, wake_down_work);
-        dev_dbg(&cfhsi->ndev->dev, "%s.\n", __func__);
+        netdev_dbg(cfhsi->ndev, "%s.\n", __func__);
 
         if (test_bit(CFHSI_SHUTDOWN, &cfhsi->bits))
                 return;
 
         /* Deactivate wake line. */
-        cfhsi->dev->cfhsi_wake_down(cfhsi->dev);
+        cfhsi->ops->cfhsi_wake_down(cfhsi->ops);
 
         /* Wait for acknowledge. */
         ret = CFHSI_WAKE_TOUT;
@@ -936,26 +919,26 @@ static void cfhsi_wake_down(struct work_struct *work)
                                                         &cfhsi->bits), ret);
         if (ret < 0) {
                 /* Interrupted by signal. */
-                dev_err(&cfhsi->ndev->dev, "%s: Signalled: %ld.\n",
+                netdev_err(cfhsi->ndev, "%s: Signalled: %ld.\n",
                         __func__, ret);
                 return;
         } else if (!ret) {
                 bool ca_wake = true;
 
                 /* Timeout */
-                dev_err(&cfhsi->ndev->dev, "%s: Timeout.\n", __func__);
+                netdev_err(cfhsi->ndev, "%s: Timeout.\n", __func__);
 
                 /* Check if we misssed the interrupt. */
-                WARN_ON(cfhsi->dev->cfhsi_get_peer_wake(cfhsi->dev,
+                WARN_ON(cfhsi->ops->cfhsi_get_peer_wake(cfhsi->ops,
                                                         &ca_wake));
                 if (!ca_wake)
-                        dev_err(&cfhsi->ndev->dev, "%s: CA Wake missed !.\n",
+                        netdev_err(cfhsi->ndev, "%s: CA Wake missed !.\n",
                                 __func__);
         }
 
         /* Check FIFO occupancy. */
         while (retry) {
-                WARN_ON(cfhsi->dev->cfhsi_fifo_occupancy(cfhsi->dev,
+                WARN_ON(cfhsi->ops->cfhsi_fifo_occupancy(cfhsi->ops,
                                                         &fifo_occupancy));
 
                 if (!fifo_occupancy)
@@ -967,14 +950,13 @@ static void cfhsi_wake_down(struct work_struct *work)
         }
 
         if (!retry)
-                dev_err(&cfhsi->ndev->dev, "%s: FIFO Timeout.\n", __func__);
+                netdev_err(cfhsi->ndev, "%s: FIFO Timeout.\n", __func__);
 
         /* Clear AWAKE condition. */
         clear_bit(CFHSI_AWAKE, &cfhsi->bits);
 
         /* Cancel pending RX requests. */
-        cfhsi->dev->cfhsi_rx_cancel(cfhsi->dev);
-
+        cfhsi->ops->cfhsi_rx_cancel(cfhsi->ops);
 }
 
 static void cfhsi_out_of_sync(struct work_struct *work)
@@ -988,12 +970,12 @@ static void cfhsi_out_of_sync(struct work_struct *work)
         rtnl_unlock();
 }
 
-static void cfhsi_wake_up_cb(struct cfhsi_drv *drv)
+static void cfhsi_wake_up_cb(struct cfhsi_cb_ops *cb_ops)
 {
         struct cfhsi *cfhsi = NULL;
 
-        cfhsi = container_of(drv, struct cfhsi, drv);
-        dev_dbg(&cfhsi->ndev->dev, "%s.\n",
+        cfhsi = container_of(cb_ops, struct cfhsi, cb_ops);
+        netdev_dbg(cfhsi->ndev, "%s.\n",
                 __func__);
 
         set_bit(CFHSI_WAKE_UP_ACK, &cfhsi->bits);
@@ -1007,12 +989,12 @@ static void cfhsi_wake_up_cb(struct cfhsi_drv *drv)
                 queue_work(cfhsi->wq, &cfhsi->wake_up_work);
 }
 
-static void cfhsi_wake_down_cb(struct cfhsi_drv *drv)
+static void cfhsi_wake_down_cb(struct cfhsi_cb_ops *cb_ops)
 {
         struct cfhsi *cfhsi = NULL;
 
-        cfhsi = container_of(drv, struct cfhsi, drv);
-        dev_dbg(&cfhsi->ndev->dev, "%s.\n",
+        cfhsi = container_of(cb_ops, struct cfhsi, cb_ops);
+        netdev_dbg(cfhsi->ndev, "%s.\n",
                 __func__);
 
         /* Initiating low power is only permitted by the host (us). */
@@ -1024,7 +1006,7 @@ static void cfhsi_aggregation_tout(unsigned long arg)
 {
         struct cfhsi *cfhsi = (struct cfhsi *)arg;
 
-        dev_dbg(&cfhsi->ndev->dev, "%s.\n",
+        netdev_dbg(cfhsi->ndev, "%s.\n",
                 __func__);
 
         cfhsi_start_tx(cfhsi);
@@ -1077,7 +1059,7 @@ static int cfhsi_xmit(struct sk_buff *skb, struct net_device *dev)
 
         /* Send flow off if number of packets is above high water mark. */
         if (!cfhsi->flow_off_sent &&
-                cfhsi_tx_queue_len(cfhsi) > cfhsi->q_high_mark &&
+                cfhsi_tx_queue_len(cfhsi) > cfhsi->cfg.q_high_mark &&
                 cfhsi->cfdev.flowctrl) {
                 cfhsi->flow_off_sent = 1;
                 cfhsi->cfdev.flowctrl(cfhsi->ndev, OFF);
@@ -1114,9 +1096,9 @@ static int cfhsi_xmit(struct sk_buff *skb, struct net_device *dev)
                 WARN_ON(!len);
 
                 /* Set up new transfer. */
-                res = cfhsi->dev->cfhsi_tx(cfhsi->tx_buf, len, cfhsi->dev);
+                res = cfhsi->ops->cfhsi_tx(cfhsi->tx_buf, len, cfhsi->ops);
                 if (WARN_ON(res < 0)) {
-                        dev_err(&cfhsi->ndev->dev, "%s: TX error %d.\n",
+                        netdev_err(cfhsi->ndev, "%s: TX error %d.\n",
                                 __func__, res);
                         cfhsi_abort_tx(cfhsi);
                 }
@@ -1129,19 +1111,19 @@ static int cfhsi_xmit(struct sk_buff *skb, struct net_device *dev)
         return 0;
 }
 
-static const struct net_device_ops cfhsi_ops;
+static const struct net_device_ops cfhsi_netdevops;
 
 static void cfhsi_setup(struct net_device *dev)
 {
         int i;
         struct cfhsi *cfhsi = netdev_priv(dev);
         dev->features = 0;
-        dev->netdev_ops = &cfhsi_ops;
         dev->type = ARPHRD_CAIF;
         dev->flags = IFF_POINTOPOINT | IFF_NOARP;
         dev->mtu = CFHSI_MAX_CAIF_FRAME_SZ;
         dev->tx_queue_len = 0;
         dev->destructor = free_netdev;
+        dev->netdev_ops = &cfhsi_netdevops;
         for (i = 0; i < CFHSI_PRIO_LAST; ++i)
                 skb_queue_head_init(&cfhsi->qhead[i]);
         cfhsi->cfdev.link_select = CAIF_LINK_HIGH_BANDW;
@@ -1149,43 +1131,7 @@ static void cfhsi_setup(struct net_device *dev)
         cfhsi->cfdev.use_stx = false;
         cfhsi->cfdev.use_fcs = false;
         cfhsi->ndev = dev;
-}
-
-int cfhsi_probe(struct platform_device *pdev)
-{
-        struct cfhsi *cfhsi = NULL;
-        struct net_device *ndev;
-
-        int res;
-
-        ndev = alloc_netdev(sizeof(struct cfhsi), "cfhsi%d", cfhsi_setup);
-        if (!ndev)
-                return -ENODEV;
-
-        cfhsi = netdev_priv(ndev);
-        cfhsi->ndev = ndev;
-        cfhsi->pdev = pdev;
-
-        /* Assign the HSI device. */
-        cfhsi->dev = pdev->dev.platform_data;
-
-        /* Assign the driver to this HSI device. */
-        cfhsi->dev->drv = &cfhsi->drv;
-
-        /* Register network device. */
-        res = register_netdev(ndev);
-        if (res) {
-                dev_err(&ndev->dev, "%s: Registration error: %d.\n",
-                        __func__, res);
-                free_netdev(ndev);
-                return -ENODEV;
-        }
-        /* Add CAIF HSI device to list. */
-        spin_lock(&cfhsi_list_lock);
-        list_add_tail(&cfhsi->list, &cfhsi_list);
-        spin_unlock(&cfhsi_list_lock);
-
-        return res;
+        cfhsi->cfg = hsi_default_config;
 }
 
 static int cfhsi_open(struct net_device *ndev)
@@ -1201,9 +1147,6 @@ static int cfhsi_open(struct net_device *ndev)
 
         /* Set flow info */
         cfhsi->flow_off_sent = 0;
-        cfhsi->q_low_mark = LOW_WATER_MARK;
-        cfhsi->q_high_mark = HIGH_WATER_MARK;
-
 
         /*
          * Allocate a TX buffer with the size of a HSI packet descriptors
@@ -1231,20 +1174,8 @@ static int cfhsi_open(struct net_device *ndev)
                 goto err_alloc_rx_flip;
         }
 
-        /* Pre-calculate inactivity timeout. */
-        if (inactivity_timeout != -1) {
-                cfhsi->inactivity_timeout =
-                                inactivity_timeout * HZ / 1000;
-                if (!cfhsi->inactivity_timeout)
-                        cfhsi->inactivity_timeout = 1;
-                else if (cfhsi->inactivity_timeout > NEXT_TIMER_MAX_DELTA)
-                        cfhsi->inactivity_timeout = NEXT_TIMER_MAX_DELTA;
-        } else {
-                cfhsi->inactivity_timeout = NEXT_TIMER_MAX_DELTA;
-        }
-
         /* Initialize aggregation timeout */
-        cfhsi->aggregation_timeout = aggregation_timeout;
+        cfhsi->cfg.aggregation_timeout = hsi_default_config.aggregation_timeout;
 
         /* Initialize recieve vaiables. */
         cfhsi->rx_ptr = cfhsi->rx_buf;
@@ -1254,10 +1185,10 @@ static int cfhsi_open(struct net_device *ndev)
         spin_lock_init(&cfhsi->lock);
 
         /* Set up the driver. */
-        cfhsi->drv.tx_done_cb = cfhsi_tx_done_cb;
-        cfhsi->drv.rx_done_cb = cfhsi_rx_done_cb;
-        cfhsi->drv.wake_up_cb = cfhsi_wake_up_cb;
-        cfhsi->drv.wake_down_cb = cfhsi_wake_down_cb;
+        cfhsi->cb_ops.tx_done_cb = cfhsi_tx_done_cb;
+        cfhsi->cb_ops.rx_done_cb = cfhsi_rx_done_cb;
+        cfhsi->cb_ops.wake_up_cb = cfhsi_wake_up_cb;
+        cfhsi->cb_ops.wake_down_cb = cfhsi_wake_down_cb;
 
         /* Initialize the work queues. */
         INIT_WORK(&cfhsi->wake_up_work, cfhsi_wake_up);
@@ -1271,9 +1202,9 @@ static int cfhsi_open(struct net_device *ndev)
         clear_bit(CFHSI_AWAKE, &cfhsi->bits);
 
         /* Create work thread. */
-        cfhsi->wq = create_singlethread_workqueue(cfhsi->pdev->name);
+        cfhsi->wq = create_singlethread_workqueue(cfhsi->ndev->name);
         if (!cfhsi->wq) {
-                dev_err(&cfhsi->ndev->dev, "%s: Failed to create work queue.\n",
+                netdev_err(cfhsi->ndev, "%s: Failed to create work queue.\n",
                         __func__);
                 res = -ENODEV;
                 goto err_create_wq;
@@ -1298,9 +1229,9 @@ static int cfhsi_open(struct net_device *ndev)
         cfhsi->aggregation_timer.function = cfhsi_aggregation_tout;
 
         /* Activate HSI interface. */
-        res = cfhsi->dev->cfhsi_up(cfhsi->dev);
+        res = cfhsi->ops->cfhsi_up(cfhsi->ops);
         if (res) {
-                dev_err(&cfhsi->ndev->dev,
+                netdev_err(cfhsi->ndev,
                         "%s: can't activate HSI interface: %d.\n",
                         __func__, res);
                 goto err_activate;
@@ -1309,14 +1240,14 @@ static int cfhsi_open(struct net_device *ndev)
         /* Flush FIFO */
         res = cfhsi_flush_fifo(cfhsi);
         if (res) {
-                dev_err(&cfhsi->ndev->dev, "%s: Can't flush FIFO: %d.\n",
+                netdev_err(cfhsi->ndev, "%s: Can't flush FIFO: %d.\n",
                         __func__, res);
                 goto err_net_reg;
         }
         return res;
 
  err_net_reg:
-        cfhsi->dev->cfhsi_down(cfhsi->dev);
+        cfhsi->ops->cfhsi_down(cfhsi->ops);
  err_activate:
         destroy_workqueue(cfhsi->wq);
  err_create_wq:
@@ -1346,7 +1277,7 @@ static int cfhsi_close(struct net_device *ndev)
         del_timer_sync(&cfhsi->aggregation_timer);
 
         /* Cancel pending RX request (if any) */
-        cfhsi->dev->cfhsi_rx_cancel(cfhsi->dev);
+        cfhsi->ops->cfhsi_rx_cancel(cfhsi->ops);
 
         /* Destroy workqueue */
         destroy_workqueue(cfhsi->wq);
@@ -1359,7 +1290,7 @@ static int cfhsi_close(struct net_device *ndev)
         cfhsi_abort_tx(cfhsi);
 
         /* Deactivate interface */
-        cfhsi->dev->cfhsi_down(cfhsi->dev);
+        cfhsi->ops->cfhsi_down(cfhsi->ops);
 
         /* Free buffers. */
         kfree(tx_buf);
@@ -1368,85 +1299,184 @@ static int cfhsi_close(struct net_device *ndev)
         return 0;
 }
 
-static const struct net_device_ops cfhsi_ops = {
+static void cfhsi_uninit(struct net_device *dev)
+{
+        struct cfhsi *cfhsi = netdev_priv(dev);
+        ASSERT_RTNL();
+        symbol_put(cfhsi_get_device);
+        list_del(&cfhsi->list);
+}
+
+static const struct net_device_ops cfhsi_netdevops = {
+        .ndo_uninit = cfhsi_uninit,
         .ndo_open = cfhsi_open,
         .ndo_stop = cfhsi_close,
         .ndo_start_xmit = cfhsi_xmit
 };
 
-int cfhsi_remove(struct platform_device *pdev)
+static void cfhsi_netlink_parms(struct nlattr *data[], struct cfhsi *cfhsi)
 {
-        struct list_head *list_node;
-        struct list_head *n;
-        struct cfhsi *cfhsi = NULL;
-        struct cfhsi_dev *dev;
+        int i;
 
-        dev = (struct cfhsi_dev *)pdev->dev.platform_data;
-        spin_lock(&cfhsi_list_lock);
-        list_for_each_safe(list_node, n, &cfhsi_list) {
-                cfhsi = list_entry(list_node, struct cfhsi, list);
-                /* Find the corresponding device. */
-                if (cfhsi->dev == dev) {
-                        /* Remove from list. */
-                        list_del(list_node);
-                        spin_unlock(&cfhsi_list_lock);
-                        return 0;
-                }
+        if (!data) {
+                pr_debug("no params data found\n");
+                return;
         }
-        spin_unlock(&cfhsi_list_lock);
-        return -ENODEV;
+
+        i = __IFLA_CAIF_HSI_INACTIVITY_TOUT;
+        /*
+         * Inactivity timeout in millisecs. Lowest possible value is 1,
+         * and highest possible is NEXT_TIMER_MAX_DELTA.
+         */
+        if (data[i]) {
+                u32 inactivity_timeout = nla_get_u32(data[i]);
+                /* Pre-calculate inactivity timeout. */
+                cfhsi->cfg.inactivity_timeout = inactivity_timeout * HZ / 1000;
+                if (cfhsi->cfg.inactivity_timeout == 0)
+                        cfhsi->cfg.inactivity_timeout = 1;
+                else if (cfhsi->cfg.inactivity_timeout > NEXT_TIMER_MAX_DELTA)
+                        cfhsi->cfg.inactivity_timeout = NEXT_TIMER_MAX_DELTA;
+        }
+
+        i = __IFLA_CAIF_HSI_AGGREGATION_TOUT;
+        if (data[i])
+                cfhsi->cfg.aggregation_timeout = nla_get_u32(data[i]);
+
+        i = __IFLA_CAIF_HSI_HEAD_ALIGN;
+        if (data[i])
+                cfhsi->cfg.head_align = nla_get_u32(data[i]);
+
+        i = __IFLA_CAIF_HSI_TAIL_ALIGN;
+        if (data[i])
+                cfhsi->cfg.tail_align = nla_get_u32(data[i]);
+
+        i = __IFLA_CAIF_HSI_QHIGH_WATERMARK;
+        if (data[i])
+                cfhsi->cfg.q_high_mark = nla_get_u32(data[i]);
+
+        i = __IFLA_CAIF_HSI_QLOW_WATERMARK;
+        if (data[i])
+                cfhsi->cfg.q_low_mark = nla_get_u32(data[i]);
+}
+
+static int caif_hsi_changelink(struct net_device *dev, struct nlattr *tb[],
+                                struct nlattr *data[])
+{
+        cfhsi_netlink_parms(data, netdev_priv(dev));
+        netdev_state_change(dev);
+        return 0;
 }
 
-struct platform_driver cfhsi_plat_drv = {
-        .probe = cfhsi_probe,
-        .remove = cfhsi_remove,
-        .driver = {
-                   .name = "cfhsi",
-                   .owner = THIS_MODULE,
-                   },
+static const struct nla_policy caif_hsi_policy[__IFLA_CAIF_HSI_MAX + 1] = {
+        [__IFLA_CAIF_HSI_INACTIVITY_TOUT] = { .type = NLA_U32, .len = 4 },
+        [__IFLA_CAIF_HSI_AGGREGATION_TOUT] = { .type = NLA_U32, .len = 4 },
+        [__IFLA_CAIF_HSI_HEAD_ALIGN] = { .type = NLA_U32, .len = 4 },
+        [__IFLA_CAIF_HSI_TAIL_ALIGN] = { .type = NLA_U32, .len = 4 },
+        [__IFLA_CAIF_HSI_QHIGH_WATERMARK] = { .type = NLA_U32, .len = 4 },
+        [__IFLA_CAIF_HSI_QLOW_WATERMARK] = { .type = NLA_U32, .len = 4 },
 };
 
-static void __exit cfhsi_exit_module(void)
+static size_t caif_hsi_get_size(const struct net_device *dev)
+{
+        int i;
+        size_t s = 0;
+        for (i = __IFLA_CAIF_HSI_UNSPEC + 1; i < __IFLA_CAIF_HSI_MAX; i++)
+                s += nla_total_size(caif_hsi_policy[i].len);
+        return s;
+}
+
+static int caif_hsi_fill_info(struct sk_buff *skb, const struct net_device *dev)
+{
+        struct cfhsi *cfhsi = netdev_priv(dev);
+
+        if (nla_put_u32(skb, __IFLA_CAIF_HSI_INACTIVITY_TOUT,
+                        cfhsi->cfg.inactivity_timeout) ||
+            nla_put_u32(skb, __IFLA_CAIF_HSI_AGGREGATION_TOUT,
+                        cfhsi->cfg.aggregation_timeout) ||
+            nla_put_u32(skb, __IFLA_CAIF_HSI_HEAD_ALIGN,
+                        cfhsi->cfg.head_align) ||
+            nla_put_u32(skb, __IFLA_CAIF_HSI_TAIL_ALIGN,
+                        cfhsi->cfg.tail_align) ||
+            nla_put_u32(skb, __IFLA_CAIF_HSI_QHIGH_WATERMARK,
+                        cfhsi->cfg.q_high_mark) ||
+            nla_put_u32(skb, __IFLA_CAIF_HSI_QLOW_WATERMARK,
+                        cfhsi->cfg.q_low_mark))
+                return -EMSGSIZE;
+
+        return 0;
+}
+
+static int caif_hsi_newlink(struct net *src_net, struct net_device *dev,
+                          struct nlattr *tb[], struct nlattr *data[])
 {
-        struct list_head *list_node;
-        struct list_head *n;
         struct cfhsi *cfhsi = NULL;
+        struct cfhsi_ops *(*get_ops)(void);
 
-        spin_lock(&cfhsi_list_lock);
-        list_for_each_safe(list_node, n, &cfhsi_list) {
-                cfhsi = list_entry(list_node, struct cfhsi, list);
+        ASSERT_RTNL();
 
-                /* Remove from list. */
-                list_del(list_node);
-                spin_unlock(&cfhsi_list_lock);
+        cfhsi = netdev_priv(dev);
+        cfhsi_netlink_parms(data, cfhsi);
+        dev_net_set(cfhsi->ndev, src_net);
+
+        get_ops = symbol_get(cfhsi_get_ops);
+        if (!get_ops) {
+                pr_err("%s: failed to get the cfhsi_ops\n", __func__);
+                return -ENODEV;
+        }
 
-                unregister_netdevice(cfhsi->ndev);
+        /* Assign the HSI device. */
+        cfhsi->ops = (*get_ops)();
+        if (!cfhsi->ops) {
+                pr_err("%s: failed to get the cfhsi_ops\n", __func__);
+                goto err;
+        }
 
-                spin_lock(&cfhsi_list_lock);
+        /* Assign the driver to this HSI device. */
+        cfhsi->ops->cb_ops = &cfhsi->cb_ops;
+        if (register_netdevice(dev)) {
+                pr_warn("%s: caif_hsi device registration failed\n", __func__);
+                goto err;
         }
-        spin_unlock(&cfhsi_list_lock);
+        /* Add CAIF HSI device to list. */
+        list_add_tail(&cfhsi->list, &cfhsi_list);
 
-        /* Unregister platform driver. */
-        platform_driver_unregister(&cfhsi_plat_drv);
+        return 0;
+err:
+        symbol_put(cfhsi_get_ops);
+        return -ENODEV;
 }
 
-static int __init cfhsi_init_module(void)
+static struct rtnl_link_ops caif_hsi_link_ops __read_mostly = {
+        .kind           = "cfhsi",
+        .priv_size      = sizeof(struct cfhsi),
+        .setup          = cfhsi_setup,
+        .maxtype        = __IFLA_CAIF_HSI_MAX,
+        .policy = caif_hsi_policy,
+        .newlink        = caif_hsi_newlink,
+        .changelink     = caif_hsi_changelink,
+        .get_size       = caif_hsi_get_size,
+        .fill_info      = caif_hsi_fill_info,
+};
+
+static void __exit cfhsi_exit_module(void)
 {
-        int result;
+        struct list_head *list_node;
+        struct list_head *n;
+        struct cfhsi *cfhsi;
 
-        /* Initialize spin lock. */
-        spin_lock_init(&cfhsi_list_lock);
+        rtnl_link_unregister(&caif_hsi_link_ops);
 
-        /* Register platform driver. */
-        result = platform_driver_register(&cfhsi_plat_drv);
-        if (result) {
-                printk(KERN_ERR "Could not register platform HSI driver: %d.\n",
-                        result);
-                goto err_dev_register;
+        rtnl_lock();
+        list_for_each_safe(list_node, n, &cfhsi_list) {
+                cfhsi = list_entry(list_node, struct cfhsi, list);
+                unregister_netdev(cfhsi->ndev);
         }
+        rtnl_unlock();
+}
 
- err_dev_register:
-        return result;
+static int __init cfhsi_init_module(void)
+{
+        return rtnl_link_register(&caif_hsi_link_ops);
 }
 
 module_init(cfhsi_init_module);
diff --git a/drivers/net/can/bfin_can.c b/drivers/net/can/bfin_can.c
index 3f88473423e..ea3143895e6 100644
--- a/drivers/net/can/bfin_can.c
+++ b/drivers/net/can/bfin_can.c
@@ -597,7 +597,7 @@ static int __devinit bfin_can_probe(struct platform_device *pdev)
         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,
+                DRV_NAME, priv->membase, priv->rx_irq,
                 priv->tx_irq, priv->err_irq, priv->can.clock.freq);
         return 0;
 
diff --git a/drivers/net/can/c_can/Kconfig b/drivers/net/can/c_can/Kconfig
index ffb9773d102..3b83bafcd94 100644
--- a/drivers/net/can/c_can/Kconfig
+++ b/drivers/net/can/c_can/Kconfig
@@ -1,15 +1,23 @@
 menuconfig CAN_C_CAN
-        tristate "Bosch C_CAN devices"
+        tristate "Bosch C_CAN/D_CAN devices"
         depends on CAN_DEV && HAS_IOMEM
 
 if CAN_C_CAN
 
 config CAN_C_CAN_PLATFORM
-        tristate "Generic Platform Bus based C_CAN driver"
+        tristate "Generic Platform Bus based C_CAN/D_CAN driver"
         ---help---
-          This driver adds support for the C_CAN chips connected to
-          the "platform bus" (Linux abstraction for directly to the
+          This driver adds support for the C_CAN/D_CAN chips connected
+          to the "platform bus" (Linux abstraction for directly to the
           processor attached devices) which can be found on various
-          boards from ST Microelectronics (http://www.st.com)
-          like the SPEAr1310 and SPEAr320 evaluation boards.
+          boards from ST Microelectronics (http://www.st.com) like the
+          SPEAr1310 and SPEAr320 evaluation boards & TI (www.ti.com)
+          boards like am335x, dm814x, dm813x and dm811x.
+
+config CAN_C_CAN_PCI
+        tristate "Generic PCI Bus based C_CAN/D_CAN driver"
+        depends on PCI
+        ---help---
+          This driver adds support for the C_CAN/D_CAN chips connected
+          to the PCI bus.
 endif
diff --git a/drivers/net/can/c_can/Makefile b/drivers/net/can/c_can/Makefile
index 9273f6d5c4b..ad1cc842170 100644
--- a/drivers/net/can/c_can/Makefile
+++ b/drivers/net/can/c_can/Makefile
@@ -4,5 +4,6 @@
 
 obj-$(CONFIG_CAN_C_CAN) += c_can.o
 obj-$(CONFIG_CAN_C_CAN_PLATFORM) += c_can_platform.o
+obj-$(CONFIG_CAN_C_CAN_PCI) += c_can_pci.o
 
 ccflags-$(CONFIG_CAN_DEBUG_DEVICES) := -DDEBUG
diff --git a/drivers/net/can/c_can/c_can.c b/drivers/net/can/c_can/c_can.c
index 86cd532c78f..eea660800a0 100644
--- a/drivers/net/can/c_can/c_can.c
+++ b/drivers/net/can/c_can/c_can.c
@@ -41,6 +41,10 @@
 
 #include "c_can.h"
 
+/* Number of interface registers */
+#define IF_ENUM_REG_LEN         11
+#define C_CAN_IFACE(reg, iface) (C_CAN_IF1_##reg + (iface) * IF_ENUM_REG_LEN)
+
 /* control register */
 #define CONTROL_TEST            BIT(7)
 #define CONTROL_CCE             BIT(6)
@@ -209,10 +213,10 @@ static inline int get_tx_echo_msg_obj(const struct c_can_priv *priv)
                         C_CAN_MSG_OBJ_TX_FIRST;
 }
 
-static u32 c_can_read_reg32(struct c_can_priv *priv, void *reg)
+static u32 c_can_read_reg32(struct c_can_priv *priv, enum reg index)
 {
-        u32 val = priv->read_reg(priv, reg);
-        val |= ((u32) priv->read_reg(priv, reg + 2)) << 16;
+        u32 val = priv->read_reg(priv, index);
+        val |= ((u32) priv->read_reg(priv, index + 1)) << 16;
         return val;
 }
 
@@ -220,14 +224,14 @@ static void c_can_enable_all_interrupts(struct c_can_priv *priv,
                                                 int enable)
 {
         unsigned int cntrl_save = priv->read_reg(priv,
-                                                &priv->regs->control);
+                                                C_CAN_CTRL_REG);
 
         if (enable)
                 cntrl_save |= (CONTROL_SIE | CONTROL_EIE | CONTROL_IE);
         else
                 cntrl_save &= ~(CONTROL_EIE | CONTROL_IE | CONTROL_SIE);
 
-        priv->write_reg(priv, &priv->regs->control, cntrl_save);
+        priv->write_reg(priv, C_CAN_CTRL_REG, cntrl_save);
 }
 
 static inline int c_can_msg_obj_is_busy(struct c_can_priv *priv, int iface)
@@ -235,7 +239,7 @@ static inline int c_can_msg_obj_is_busy(struct c_can_priv *priv, int iface)
         int count = MIN_TIMEOUT_VALUE;
 
         while (count && priv->read_reg(priv,
-                                &priv->regs->ifregs[iface].com_req) &
+                                C_CAN_IFACE(COMREQ_REG, iface)) &
                                 IF_COMR_BUSY) {
                 count--;
                 udelay(1);
@@ -258,9 +262,9 @@ static inline void c_can_object_get(struct net_device *dev,
          * register and message RAM must be complete in 6 CAN-CLK
          * period.
          */
-        priv->write_reg(priv, &priv->regs->ifregs[iface].com_mask,
+        priv->write_reg(priv, C_CAN_IFACE(COMMSK_REG, iface),
                         IFX_WRITE_LOW_16BIT(mask));
-        priv->write_reg(priv, &priv->regs->ifregs[iface].com_req,
+        priv->write_reg(priv, C_CAN_IFACE(COMREQ_REG, iface),
                         IFX_WRITE_LOW_16BIT(objno));
 
         if (c_can_msg_obj_is_busy(priv, iface))
@@ -278,9 +282,9 @@ static inline void c_can_object_put(struct net_device *dev,
          * register and message RAM must be complete in 6 CAN-CLK
          * period.
          */
-        priv->write_reg(priv, &priv->regs->ifregs[iface].com_mask,
+        priv->write_reg(priv, C_CAN_IFACE(COMMSK_REG, iface),
                         (IF_COMM_WR | IFX_WRITE_LOW_16BIT(mask)));
-        priv->write_reg(priv, &priv->regs->ifregs[iface].com_req,
+        priv->write_reg(priv, C_CAN_IFACE(COMREQ_REG, iface),
                         IFX_WRITE_LOW_16BIT(objno));
 
         if (c_can_msg_obj_is_busy(priv, iface))
@@ -306,18 +310,18 @@ static void c_can_write_msg_object(struct net_device *dev,
 
         flags |= IF_ARB_MSGVAL;
 
-        priv->write_reg(priv, &priv->regs->ifregs[iface].arb1,
+        priv->write_reg(priv, C_CAN_IFACE(ARB1_REG, iface),
                                 IFX_WRITE_LOW_16BIT(id));
-        priv->write_reg(priv, &priv->regs->ifregs[iface].arb2, flags |
+        priv->write_reg(priv, C_CAN_IFACE(ARB2_REG, iface), flags |
                                 IFX_WRITE_HIGH_16BIT(id));
 
         for (i = 0; i < frame->can_dlc; i += 2) {
-                priv->write_reg(priv, &priv->regs->ifregs[iface].data[i / 2],
+                priv->write_reg(priv, C_CAN_IFACE(DATA1_REG, iface) + i / 2,
                                 frame->data[i] | (frame->data[i + 1] << 8));
         }
 
         /* enable interrupt for this message object */
-        priv->write_reg(priv, &priv->regs->ifregs[iface].msg_cntrl,
+        priv->write_reg(priv, C_CAN_IFACE(MSGCTRL_REG, iface),
                         IF_MCONT_TXIE | IF_MCONT_TXRQST | IF_MCONT_EOB |
                         frame->can_dlc);
         c_can_object_put(dev, iface, objno, IF_COMM_ALL);
@@ -329,7 +333,7 @@ static inline void c_can_mark_rx_msg_obj(struct net_device *dev,
 {
         struct c_can_priv *priv = netdev_priv(dev);
 
-        priv->write_reg(priv, &priv->regs->ifregs[iface].msg_cntrl,
+        priv->write_reg(priv, C_CAN_IFACE(MSGCTRL_REG, iface),
                         ctrl_mask & ~(IF_MCONT_MSGLST | IF_MCONT_INTPND));
         c_can_object_put(dev, iface, obj, IF_COMM_CONTROL);
 
@@ -343,7 +347,7 @@ static inline void c_can_activate_all_lower_rx_msg_obj(struct net_device *dev,
         struct c_can_priv *priv = netdev_priv(dev);
 
         for (i = C_CAN_MSG_OBJ_RX_FIRST; i <= C_CAN_MSG_RX_LOW_LAST; i++) {
-                priv->write_reg(priv, &priv->regs->ifregs[iface].msg_cntrl,
+                priv->write_reg(priv, C_CAN_IFACE(MSGCTRL_REG, iface),
                                 ctrl_mask & ~(IF_MCONT_MSGLST |
                                         IF_MCONT_INTPND | IF_MCONT_NEWDAT));
                 c_can_object_put(dev, iface, i, IF_COMM_CONTROL);
@@ -356,7 +360,7 @@ static inline void c_can_activate_rx_msg_obj(struct net_device *dev,
 {
         struct c_can_priv *priv = netdev_priv(dev);
 
-        priv->write_reg(priv, &priv->regs->ifregs[iface].msg_cntrl,
+        priv->write_reg(priv, C_CAN_IFACE(MSGCTRL_REG, iface),
                         ctrl_mask & ~(IF_MCONT_MSGLST |
                                 IF_MCONT_INTPND | IF_MCONT_NEWDAT));
         c_can_object_put(dev, iface, obj, IF_COMM_CONTROL);
@@ -374,7 +378,7 @@ static void c_can_handle_lost_msg_obj(struct net_device *dev,
 
         c_can_object_get(dev, iface, objno, IF_COMM_ALL & ~IF_COMM_TXRQST);
 
-        priv->write_reg(priv, &priv->regs->ifregs[iface].msg_cntrl,
+        priv->write_reg(priv, C_CAN_IFACE(MSGCTRL_REG, iface),
                         IF_MCONT_CLR_MSGLST);
 
         c_can_object_put(dev, 0, objno, IF_COMM_CONTROL);
@@ -410,8 +414,8 @@ static int c_can_read_msg_object(struct net_device *dev, int iface, int ctrl)
 
         frame->can_dlc = get_can_dlc(ctrl & 0x0F);
 
-        flags = priv->read_reg(priv, &priv->regs->ifregs[iface].arb2);
-        val = priv->read_reg(priv, &priv->regs->ifregs[iface].arb1) |
+        flags = priv->read_reg(priv, C_CAN_IFACE(ARB2_REG, iface));
+        val = priv->read_reg(priv, C_CAN_IFACE(ARB1_REG, iface)) |
                 (flags << 16);
 
         if (flags & IF_ARB_MSGXTD)
@@ -424,7 +428,7 @@ static int c_can_read_msg_object(struct net_device *dev, int iface, int ctrl)
         else {
                 for (i = 0; i < frame->can_dlc; i += 2) {
                         data = priv->read_reg(priv,
-                                &priv->regs->ifregs[iface].data[i / 2]);
+                                C_CAN_IFACE(DATA1_REG, iface) + i / 2);
                         frame->data[i] = data;
                         frame->data[i + 1] = data >> 8;
                 }
@@ -444,40 +448,40 @@ static void c_can_setup_receive_object(struct net_device *dev, int iface,
 {
         struct c_can_priv *priv = netdev_priv(dev);
 
-        priv->write_reg(priv, &priv->regs->ifregs[iface].mask1,
+        priv->write_reg(priv, C_CAN_IFACE(MASK1_REG, iface),
                         IFX_WRITE_LOW_16BIT(mask));
-        priv->write_reg(priv, &priv->regs->ifregs[iface].mask2,
+        priv->write_reg(priv, C_CAN_IFACE(MASK2_REG, iface),
                         IFX_WRITE_HIGH_16BIT(mask));
 
-        priv->write_reg(priv, &priv->regs->ifregs[iface].arb1,
+        priv->write_reg(priv, C_CAN_IFACE(ARB1_REG, iface),
                         IFX_WRITE_LOW_16BIT(id));
-        priv->write_reg(priv, &priv->regs->ifregs[iface].arb2,
+        priv->write_reg(priv, C_CAN_IFACE(ARB2_REG, iface),
                         (IF_ARB_MSGVAL | IFX_WRITE_HIGH_16BIT(id)));
 
-        priv->write_reg(priv, &priv->regs->ifregs[iface].msg_cntrl, mcont);
+        priv->write_reg(priv, C_CAN_IFACE(MSGCTRL_REG, iface), mcont);
         c_can_object_put(dev, iface, objno, IF_COMM_ALL & ~IF_COMM_TXRQST);
 
         netdev_dbg(dev, "obj no:%d, msgval:0x%08x\n", objno,
-                        c_can_read_reg32(priv, &priv->regs->msgval1));
+                        c_can_read_reg32(priv, C_CAN_MSGVAL1_REG));
 }
 
 static void c_can_inval_msg_object(struct net_device *dev, int iface, int objno)
 {
         struct c_can_priv *priv = netdev_priv(dev);
 
-        priv->write_reg(priv, &priv->regs->ifregs[iface].arb1, 0);
-        priv->write_reg(priv, &priv->regs->ifregs[iface].arb2, 0);
-        priv->write_reg(priv, &priv->regs->ifregs[iface].msg_cntrl, 0);
+        priv->write_reg(priv, C_CAN_IFACE(ARB1_REG, iface), 0);
+        priv->write_reg(priv, C_CAN_IFACE(ARB2_REG, iface), 0);
+        priv->write_reg(priv, C_CAN_IFACE(MSGCTRL_REG, iface), 0);
 
         c_can_object_put(dev, iface, objno, IF_COMM_ARB | IF_COMM_CONTROL);
 
         netdev_dbg(dev, "obj no:%d, msgval:0x%08x\n", objno,
-                        c_can_read_reg32(priv, &priv->regs->msgval1));
+                        c_can_read_reg32(priv, C_CAN_MSGVAL1_REG));
 }
 
 static inline int c_can_is_next_tx_obj_busy(struct c_can_priv *priv, int objno)
 {
-        int val = c_can_read_reg32(priv, &priv->regs->txrqst1);
+        int val = c_can_read_reg32(priv, C_CAN_TXRQST1_REG);
 
         /*
          * as transmission request register's bit n-1 corresponds to
@@ -540,12 +544,12 @@ static int c_can_set_bittiming(struct net_device *dev)
         netdev_info(dev,
                 "setting BTR=%04x BRPE=%04x\n", reg_btr, reg_brpe);
 
-        ctrl_save = priv->read_reg(priv, &priv->regs->control);
-        priv->write_reg(priv, &priv->regs->control,
+        ctrl_save = priv->read_reg(priv, C_CAN_CTRL_REG);
+        priv->write_reg(priv, C_CAN_CTRL_REG,
                         ctrl_save | CONTROL_CCE | CONTROL_INIT);
-        priv->write_reg(priv, &priv->regs->btr, reg_btr);
-        priv->write_reg(priv, &priv->regs->brp_ext, reg_brpe);
-        priv->write_reg(priv, &priv->regs->control, ctrl_save);
+        priv->write_reg(priv, C_CAN_BTR_REG, reg_btr);
+        priv->write_reg(priv, C_CAN_BRPEXT_REG, reg_brpe);
+        priv->write_reg(priv, C_CAN_CTRL_REG, ctrl_save);
 
         return 0;
 }
@@ -587,36 +591,36 @@ static void c_can_chip_config(struct net_device *dev)
         struct c_can_priv *priv = netdev_priv(dev);
 
         /* enable automatic retransmission */
-        priv->write_reg(priv, &priv->regs->control,
+        priv->write_reg(priv, C_CAN_CTRL_REG,
                         CONTROL_ENABLE_AR);
 
         if ((priv->can.ctrlmode & CAN_CTRLMODE_LISTENONLY) &&
             (priv->can.ctrlmode & CAN_CTRLMODE_LOOPBACK)) {
                 /* loopback + silent mode : useful for hot self-test */
-                priv->write_reg(priv, &priv->regs->control, CONTROL_EIE |
+                priv->write_reg(priv, C_CAN_CTRL_REG, CONTROL_EIE |
                                 CONTROL_SIE | CONTROL_IE | CONTROL_TEST);
-                priv->write_reg(priv, &priv->regs->test,
+                priv->write_reg(priv, C_CAN_TEST_REG,
                                 TEST_LBACK | TEST_SILENT);
         } else if (priv->can.ctrlmode & CAN_CTRLMODE_LOOPBACK) {
                 /* loopback mode : useful for self-test function */
-                priv->write_reg(priv, &priv->regs->control, CONTROL_EIE |
+                priv->write_reg(priv, C_CAN_CTRL_REG, CONTROL_EIE |
                                 CONTROL_SIE | CONTROL_IE | CONTROL_TEST);
-                priv->write_reg(priv, &priv->regs->test, TEST_LBACK);
+                priv->write_reg(priv, C_CAN_TEST_REG, TEST_LBACK);
         } else if (priv->can.ctrlmode & CAN_CTRLMODE_LISTENONLY) {
                 /* silent mode : bus-monitoring mode */
-                priv->write_reg(priv, &priv->regs->control, CONTROL_EIE |
+                priv->write_reg(priv, C_CAN_CTRL_REG, CONTROL_EIE |
                                 CONTROL_SIE | CONTROL_IE | CONTROL_TEST);
-                priv->write_reg(priv, &priv->regs->test, TEST_SILENT);
+                priv->write_reg(priv, C_CAN_TEST_REG, TEST_SILENT);
         } else
                 /* normal mode*/
-                priv->write_reg(priv, &priv->regs->control,
+                priv->write_reg(priv, C_CAN_CTRL_REG,
                                 CONTROL_EIE | CONTROL_SIE | CONTROL_IE);
 
         /* configure message objects */
         c_can_configure_msg_objects(dev);
 
         /* set a `lec` value so that we can check for updates later */
-        priv->write_reg(priv, &priv->regs->status, LEC_UNUSED);
+        priv->write_reg(priv, C_CAN_STS_REG, LEC_UNUSED);
 
         /* set bittiming params */
         c_can_set_bittiming(dev);
@@ -669,7 +673,7 @@ static int c_can_get_berr_counter(const struct net_device *dev,
         unsigned int reg_err_counter;
         struct c_can_priv *priv = netdev_priv(dev);
 
-        reg_err_counter = priv->read_reg(priv, &priv->regs->err_cnt);
+        reg_err_counter = priv->read_reg(priv, C_CAN_ERR_CNT_REG);
         bec->rxerr = (reg_err_counter & ERR_CNT_REC_MASK) >>
                                 ERR_CNT_REC_SHIFT;
         bec->txerr = reg_err_counter & ERR_CNT_TEC_MASK;
@@ -697,12 +701,12 @@ static void c_can_do_tx(struct net_device *dev)
 
         for (/* nix */; (priv->tx_next - priv->tx_echo) > 0; priv->tx_echo++) {
                 msg_obj_no = get_tx_echo_msg_obj(priv);
-                val = c_can_read_reg32(priv, &priv->regs->txrqst1);
+                val = c_can_read_reg32(priv, C_CAN_TXRQST1_REG);
                 if (!(val & (1 << (msg_obj_no - 1)))) {
                         can_get_echo_skb(dev,
                                         msg_obj_no - C_CAN_MSG_OBJ_TX_FIRST);
                         stats->tx_bytes += priv->read_reg(priv,
-                                        &priv->regs->ifregs[0].msg_cntrl)
+                                        C_CAN_IFACE(MSGCTRL_REG, 0))
                                         & IF_MCONT_DLC_MASK;
                         stats->tx_packets++;
                         c_can_inval_msg_object(dev, 0, msg_obj_no);
@@ -744,11 +748,11 @@ static int c_can_do_rx_poll(struct net_device *dev, int quota)
         u32 num_rx_pkts = 0;
         unsigned int msg_obj, msg_ctrl_save;
         struct c_can_priv *priv = netdev_priv(dev);
-        u32 val = c_can_read_reg32(priv, &priv->regs->intpnd1);
+        u32 val = c_can_read_reg32(priv, C_CAN_INTPND1_REG);
 
         for (msg_obj = C_CAN_MSG_OBJ_RX_FIRST;
                         msg_obj <= C_CAN_MSG_OBJ_RX_LAST && quota > 0;
-                        val = c_can_read_reg32(priv, &priv->regs->intpnd1),
+                        val = c_can_read_reg32(priv, C_CAN_INTPND1_REG),
                         msg_obj++) {
                 /*
                  * as interrupt pending register's bit n-1 corresponds to
@@ -758,7 +762,7 @@ static int c_can_do_rx_poll(struct net_device *dev, int quota)
                         c_can_object_get(dev, 0, msg_obj, IF_COMM_ALL &
                                         ~IF_COMM_TXRQST);
                         msg_ctrl_save = priv->read_reg(priv,
-                                        &priv->regs->ifregs[0].msg_cntrl);
+                                        C_CAN_IFACE(MSGCTRL_REG, 0));
 
                         if (msg_ctrl_save & IF_MCONT_EOB)
                                 return num_rx_pkts;
@@ -819,7 +823,7 @@ static int c_can_handle_state_change(struct net_device *dev,
                 return 0;
 
         c_can_get_berr_counter(dev, &bec);
-        reg_err_counter = priv->read_reg(priv, &priv->regs->err_cnt);
+        reg_err_counter = priv->read_reg(priv, C_CAN_ERR_CNT_REG);
         rx_err_passive = (reg_err_counter & ERR_CNT_RP_MASK) >>
                                 ERR_CNT_RP_SHIFT;
 
@@ -935,7 +939,7 @@ static int c_can_handle_bus_err(struct net_device *dev,
         }
 
         /* set a `lec` value so that we can check for updates later */
-        priv->write_reg(priv, &priv->regs->status, LEC_UNUSED);
+        priv->write_reg(priv, C_CAN_STS_REG, LEC_UNUSED);
 
         netif_receive_skb(skb);
         stats->rx_packets++;
@@ -959,15 +963,15 @@ static int c_can_poll(struct napi_struct *napi, int quota)
         /* status events have the highest priority */
         if (irqstatus == STATUS_INTERRUPT) {
                 priv->current_status = priv->read_reg(priv,
-                                        &priv->regs->status);
+                                        C_CAN_STS_REG);
 
                 /* handle Tx/Rx events */
                 if (priv->current_status & STATUS_TXOK)
-                        priv->write_reg(priv, &priv->regs->status,
+                        priv->write_reg(priv, C_CAN_STS_REG,
                                         priv->current_status & ~STATUS_TXOK);
 
                 if (priv->current_status & STATUS_RXOK)
-                        priv->write_reg(priv, &priv->regs->status,
+                        priv->write_reg(priv, C_CAN_STS_REG,
                                         priv->current_status & ~STATUS_RXOK);
 
                 /* handle state changes */
@@ -1033,7 +1037,7 @@ static irqreturn_t c_can_isr(int irq, void *dev_id)
         struct net_device *dev = (struct net_device *)dev_id;
         struct c_can_priv *priv = netdev_priv(dev);
 
-        priv->irqstatus = priv->read_reg(priv, &priv->regs->interrupt);
+        priv->irqstatus = priv->read_reg(priv, C_CAN_INT_REG);
         if (!priv->irqstatus)
                 return IRQ_NONE;
 
diff --git a/drivers/net/can/c_can/c_can.h b/drivers/net/can/c_can/c_can.h
index 5f32d34af50..01a7049ab99 100644
--- a/drivers/net/can/c_can/c_can.h
+++ b/drivers/net/can/c_can/c_can.h
@@ -22,43 +22,129 @@
 #ifndef C_CAN_H
 #define C_CAN_H
 
-/* c_can IF registers */
-struct c_can_if_regs {
-        u16 com_req;
-        u16 com_mask;
-        u16 mask1;
-        u16 mask2;
-        u16 arb1;
-        u16 arb2;
-        u16 msg_cntrl;
-        u16 data[4];
-        u16 _reserved[13];
+enum reg {
+        C_CAN_CTRL_REG = 0,
+        C_CAN_STS_REG,
+        C_CAN_ERR_CNT_REG,
+        C_CAN_BTR_REG,
+        C_CAN_INT_REG,
+        C_CAN_TEST_REG,
+        C_CAN_BRPEXT_REG,
+        C_CAN_IF1_COMREQ_REG,
+        C_CAN_IF1_COMMSK_REG,
+        C_CAN_IF1_MASK1_REG,
+        C_CAN_IF1_MASK2_REG,
+        C_CAN_IF1_ARB1_REG,
+        C_CAN_IF1_ARB2_REG,
+        C_CAN_IF1_MSGCTRL_REG,
+        C_CAN_IF1_DATA1_REG,
+        C_CAN_IF1_DATA2_REG,
+        C_CAN_IF1_DATA3_REG,
+        C_CAN_IF1_DATA4_REG,
+        C_CAN_IF2_COMREQ_REG,
+        C_CAN_IF2_COMMSK_REG,
+        C_CAN_IF2_MASK1_REG,
+        C_CAN_IF2_MASK2_REG,
+        C_CAN_IF2_ARB1_REG,
+        C_CAN_IF2_ARB2_REG,
+        C_CAN_IF2_MSGCTRL_REG,
+        C_CAN_IF2_DATA1_REG,
+        C_CAN_IF2_DATA2_REG,
+        C_CAN_IF2_DATA3_REG,
+        C_CAN_IF2_DATA4_REG,
+        C_CAN_TXRQST1_REG,
+        C_CAN_TXRQST2_REG,
+        C_CAN_NEWDAT1_REG,
+        C_CAN_NEWDAT2_REG,
+        C_CAN_INTPND1_REG,
+        C_CAN_INTPND2_REG,
+        C_CAN_MSGVAL1_REG,
+        C_CAN_MSGVAL2_REG,
 };
 
-/* c_can hardware registers */
-struct c_can_regs {
-        u16 control;
-        u16 status;
-        u16 err_cnt;
-        u16 btr;
-        u16 interrupt;
-        u16 test;
-        u16 brp_ext;
-        u16 _reserved1;
-        struct c_can_if_regs ifregs[2]; /* [0] = IF1 and [1] = IF2 */
-        u16 _reserved2[8];
-        u16 txrqst1;
-        u16 txrqst2;
-        u16 _reserved3[6];
-        u16 newdat1;
-        u16 newdat2;
-        u16 _reserved4[6];
-        u16 intpnd1;
-        u16 intpnd2;
-        u16 _reserved5[6];
-        u16 msgval1;
-        u16 msgval2;
-        u16 _reserved6[6];
+static const u16 reg_map_c_can[] = {
+        [C_CAN_CTRL_REG]        = 0x00,
+        [C_CAN_STS_REG]         = 0x02,
+        [C_CAN_ERR_CNT_REG]     = 0x04,
+        [C_CAN_BTR_REG]         = 0x06,
+        [C_CAN_INT_REG]         = 0x08,
+        [C_CAN_TEST_REG]        = 0x0A,
+        [C_CAN_BRPEXT_REG]      = 0x0C,
+        [C_CAN_IF1_COMREQ_REG]  = 0x10,
+        [C_CAN_IF1_COMMSK_REG]  = 0x12,
+        [C_CAN_IF1_MASK1_REG]   = 0x14,
+        [C_CAN_IF1_MASK2_REG]   = 0x16,
+        [C_CAN_IF1_ARB1_REG]    = 0x18,
+        [C_CAN_IF1_ARB2_REG]    = 0x1A,
+        [C_CAN_IF1_MSGCTRL_REG] = 0x1C,
+        [C_CAN_IF1_DATA1_REG]   = 0x1E,
+        [C_CAN_IF1_DATA2_REG]   = 0x20,
+        [C_CAN_IF1_DATA3_REG]   = 0x22,
+        [C_CAN_IF1_DATA4_REG]   = 0x24,
+        [C_CAN_IF2_COMREQ_REG]  = 0x40,
+        [C_CAN_IF2_COMMSK_REG]  = 0x42,
+        [C_CAN_IF2_MASK1_REG]   = 0x44,
+        [C_CAN_IF2_MASK2_REG]   = 0x46,
+        [C_CAN_IF2_ARB1_REG]    = 0x48,
+        [C_CAN_IF2_ARB2_REG]    = 0x4A,
+        [C_CAN_IF2_MSGCTRL_REG] = 0x4C,
+        [C_CAN_IF2_DATA1_REG]   = 0x4E,
+        [C_CAN_IF2_DATA2_REG]   = 0x50,
+        [C_CAN_IF2_DATA3_REG]   = 0x52,
+        [C_CAN_IF2_DATA4_REG]   = 0x54,
+        [C_CAN_TXRQST1_REG]     = 0x80,
+        [C_CAN_TXRQST2_REG]     = 0x82,
+        [C_CAN_NEWDAT1_REG]     = 0x90,
+        [C_CAN_NEWDAT2_REG]     = 0x92,
+        [C_CAN_INTPND1_REG]     = 0xA0,
+        [C_CAN_INTPND2_REG]     = 0xA2,
+        [C_CAN_MSGVAL1_REG]     = 0xB0,
+        [C_CAN_MSGVAL2_REG]     = 0xB2,
+};
+
+static const u16 reg_map_d_can[] = {
+        [C_CAN_CTRL_REG]        = 0x00,
+        [C_CAN_STS_REG]         = 0x04,
+        [C_CAN_ERR_CNT_REG]     = 0x08,
+        [C_CAN_BTR_REG]         = 0x0C,
+        [C_CAN_BRPEXT_REG]      = 0x0E,
+        [C_CAN_INT_REG]         = 0x10,
+        [C_CAN_TEST_REG]        = 0x14,
+        [C_CAN_TXRQST1_REG]     = 0x88,
+        [C_CAN_TXRQST2_REG]     = 0x8A,
+        [C_CAN_NEWDAT1_REG]     = 0x9C,
+        [C_CAN_NEWDAT2_REG]     = 0x9E,
+        [C_CAN_INTPND1_REG]     = 0xB0,
+        [C_CAN_INTPND2_REG]     = 0xB2,
+        [C_CAN_MSGVAL1_REG]     = 0xC4,
+        [C_CAN_MSGVAL2_REG]     = 0xC6,
+        [C_CAN_IF1_COMREQ_REG]  = 0x100,
+        [C_CAN_IF1_COMMSK_REG]  = 0x102,
+        [C_CAN_IF1_MASK1_REG]   = 0x104,
+        [C_CAN_IF1_MASK2_REG]   = 0x106,
+        [C_CAN_IF1_ARB1_REG]    = 0x108,
+        [C_CAN_IF1_ARB2_REG]    = 0x10A,
+        [C_CAN_IF1_MSGCTRL_REG] = 0x10C,
+        [C_CAN_IF1_DATA1_REG]   = 0x110,
+        [C_CAN_IF1_DATA2_REG]   = 0x112,
+        [C_CAN_IF1_DATA3_REG]   = 0x114,
+        [C_CAN_IF1_DATA4_REG]   = 0x116,
+        [C_CAN_IF2_COMREQ_REG]  = 0x120,
+        [C_CAN_IF2_COMMSK_REG]  = 0x122,
+        [C_CAN_IF2_MASK1_REG]   = 0x124,
+        [C_CAN_IF2_MASK2_REG]   = 0x126,
+        [C_CAN_IF2_ARB1_REG]    = 0x128,
+        [C_CAN_IF2_ARB2_REG]    = 0x12A,
+        [C_CAN_IF2_MSGCTRL_REG] = 0x12C,
+        [C_CAN_IF2_DATA1_REG]   = 0x130,
+        [C_CAN_IF2_DATA2_REG]   = 0x132,
+        [C_CAN_IF2_DATA3_REG]   = 0x134,
+        [C_CAN_IF2_DATA4_REG]   = 0x136,
+};
+
+enum c_can_dev_id {
+        C_CAN_DEVTYPE,
+        D_CAN_DEVTYPE,
 };
 
 /* c_can private data structure */
@@ -69,9 +155,10 @@ struct c_can_priv {
         int tx_object;
         int current_status;
         int last_status;
-        u16 (*read_reg) (struct c_can_priv *priv, void *reg);
-        void (*write_reg) (struct c_can_priv *priv, void *reg, u16 val);
-        struct c_can_regs __iomem *regs;
+        u16 (*read_reg) (struct c_can_priv *priv, enum reg index);
+        void (*write_reg) (struct c_can_priv *priv, enum reg index, u16 val);
+        void __iomem *base;
+        const u16 *regs;
         unsigned long irq_flags; /* for request_irq() */
         unsigned int tx_next;
         unsigned int tx_echo;
diff --git a/drivers/net/can/c_can/c_can_pci.c b/drivers/net/can/c_can/c_can_pci.c
new file mode 100644
index 00000000000..1011146ea51
--- /dev/null
+++ b/drivers/net/can/c_can/c_can_pci.c
@@ -0,0 +1,221 @@
+/*
+ * PCI bus driver for Bosch C_CAN/D_CAN controller
+ *
+ * Copyright (C) 2012 Federico Vaga <federico.vaga@gmail.com>
+ *
+ * Borrowed from c_can_platform.c
+ *
+ * This file is licensed under the terms of the GNU General Public
+ * License version 2. This program is licensed "as is" without any
+ * warranty of any kind, whether express or implied.
+ */
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/netdevice.h>
+#include <linux/pci.h>
+
+#include <linux/can/dev.h>
+
+#include "c_can.h"
+
+enum c_can_pci_reg_align {
+        C_CAN_REG_ALIGN_16,
+        C_CAN_REG_ALIGN_32,
+};
+
+struct c_can_pci_data {
+        /* Specify if is C_CAN or D_CAN */
+        enum c_can_dev_id type;
+        /* Set the register alignment in the memory */
+        enum c_can_pci_reg_align reg_align;
+        /* Set the frequency */
+        unsigned int freq;
+};
+
+/*
+ * 16-bit c_can registers can be arranged differently in the memory
+ * architecture of different implementations. For example: 16-bit
+ * registers can be aligned to a 16-bit boundary or 32-bit boundary etc.
+ * Handle the same by providing a common read/write interface.
+ */
+static u16 c_can_pci_read_reg_aligned_to_16bit(struct c_can_priv *priv,
+                                                enum reg index)
+{
+        return readw(priv->base + priv->regs[index]);
+}
+
+static void c_can_pci_write_reg_aligned_to_16bit(struct c_can_priv *priv,
+                                                enum reg index, u16 val)
+{
+        writew(val, priv->base + priv->regs[index]);
+}
+
+static u16 c_can_pci_read_reg_aligned_to_32bit(struct c_can_priv *priv,
+                                                enum reg index)
+{
+        return readw(priv->base + 2 * priv->regs[index]);
+}
+
+static void c_can_pci_write_reg_aligned_to_32bit(struct c_can_priv *priv,
+                                                enum reg index, u16 val)
+{
+        writew(val, priv->base + 2 * priv->regs[index]);
+}
+
+static int __devinit c_can_pci_probe(struct pci_dev *pdev,
+                                     const struct pci_device_id *ent)
+{
+        struct c_can_pci_data *c_can_pci_data = (void *)ent->driver_data;
+        struct c_can_priv *priv;
+        struct net_device *dev;
+        void __iomem *addr;
+        int ret;
+
+        ret = pci_enable_device(pdev);
+        if (ret) {
+                dev_err(&pdev->dev, "pci_enable_device FAILED\n");
+                goto out;
+        }
+
+        ret = pci_request_regions(pdev, KBUILD_MODNAME);
+        if (ret) {
+                dev_err(&pdev->dev, "pci_request_regions FAILED\n");
+                goto out_disable_device;
+        }
+
+        pci_set_master(pdev);
+        pci_enable_msi(pdev);
+
+        addr = pci_iomap(pdev, 0, pci_resource_len(pdev, 0));
+        if (!addr) {
+                dev_err(&pdev->dev,
+                        "device has no PCI memory resources, "
+                        "failing adapter\n");
+                ret = -ENOMEM;
+                goto out_release_regions;
+        }
+
+        /* allocate the c_can device */
+        dev = alloc_c_can_dev();
+        if (!dev) {
+                ret = -ENOMEM;
+                goto out_iounmap;
+        }
+
+        priv = netdev_priv(dev);
+        pci_set_drvdata(pdev, dev);
+        SET_NETDEV_DEV(dev, &pdev->dev);
+
+        dev->irq = pdev->irq;
+        priv->base = addr;
+
+        if (!c_can_pci_data->freq) {
+                dev_err(&pdev->dev, "no clock frequency defined\n");
+                ret = -ENODEV;
+                goto out_free_c_can;
+        } else {
+                priv->can.clock.freq = c_can_pci_data->freq;
+        }
+
+        /* Configure CAN type */
+        switch (c_can_pci_data->type) {
+        case C_CAN_DEVTYPE:
+                priv->regs = reg_map_c_can;
+                break;
+        case D_CAN_DEVTYPE:
+                priv->regs = reg_map_d_can;
+                priv->can.ctrlmode_supported |= CAN_CTRLMODE_3_SAMPLES;
+                break;
+        default:
+                ret = -EINVAL;
+                goto out_free_c_can;
+        }
+
+        /* Configure access to registers */
+        switch (c_can_pci_data->reg_align) {
+        case C_CAN_REG_ALIGN_32:
+                priv->read_reg = c_can_pci_read_reg_aligned_to_32bit;
+                priv->write_reg = c_can_pci_write_reg_aligned_to_32bit;
+                break;
+        case C_CAN_REG_ALIGN_16:
+                priv->read_reg = c_can_pci_read_reg_aligned_to_16bit;
+                priv->write_reg = c_can_pci_write_reg_aligned_to_16bit;
+                break;
+        default:
+                ret = -EINVAL;
+                goto out_free_c_can;
+        }
+
+        ret = register_c_can_dev(dev);
+        if (ret) {
+                dev_err(&pdev->dev, "registering %s failed (err=%d)\n",
+                        KBUILD_MODNAME, ret);
+                goto out_free_c_can;
+        }
+
+        dev_dbg(&pdev->dev, "%s device registered (regs=%p, irq=%d)\n",
+                 KBUILD_MODNAME, priv->regs, dev->irq);
+
+        return 0;
+
+out_free_c_can:
+        pci_set_drvdata(pdev, NULL);
+        free_c_can_dev(dev);
+out_iounmap:
+        pci_iounmap(pdev, addr);
+out_release_regions:
+        pci_disable_msi(pdev);
+        pci_clear_master(pdev);
+        pci_release_regions(pdev);
+out_disable_device:
+        pci_disable_device(pdev);
+out:
+        return ret;
+}
+
+static void __devexit c_can_pci_remove(struct pci_dev *pdev)
+{
+        struct net_device *dev = pci_get_drvdata(pdev);
+        struct c_can_priv *priv = netdev_priv(dev);
+
+        unregister_c_can_dev(dev);
+
+        pci_set_drvdata(pdev, NULL);
+        free_c_can_dev(dev);
+
+        pci_iounmap(pdev, priv->base);
+        pci_disable_msi(pdev);
+        pci_clear_master(pdev);
+        pci_release_regions(pdev);
+        pci_disable_device(pdev);
+}
+
+static struct c_can_pci_data c_can_sta2x11= {
+        .type = C_CAN_DEVTYPE,
+        .reg_align = C_CAN_REG_ALIGN_32,
+        .freq = 52000000, /* 52 Mhz */
+};
+
+#define C_CAN_ID(_vend, _dev, _driverdata) {            \
+        PCI_DEVICE(_vend, _dev),                        \
+        .driver_data = (unsigned long)&_driverdata,     \
+}
+static DEFINE_PCI_DEVICE_TABLE(c_can_pci_tbl) = {
+        C_CAN_ID(PCI_VENDOR_ID_STMICRO, PCI_DEVICE_ID_STMICRO_CAN,
+                 c_can_sta2x11),
+        {},
+};
+static struct pci_driver c_can_pci_driver = {
+        .name = KBUILD_MODNAME,
+        .id_table = c_can_pci_tbl,
+        .probe = c_can_pci_probe,
+        .remove = __devexit_p(c_can_pci_remove),
+};
+
+module_pci_driver(c_can_pci_driver);
+
+MODULE_AUTHOR("Federico Vaga <federico.vaga@gmail.com>");
+MODULE_LICENSE("GPL v2");
+MODULE_DESCRIPTION("PCI CAN bus driver for Bosch C_CAN/D_CAN controller");
+MODULE_DEVICE_TABLE(pci, c_can_pci_tbl);
diff --git a/drivers/net/can/c_can/c_can_platform.c b/drivers/net/can/c_can/c_can_platform.c
index 5e1a5ff6476..f0921d16f0a 100644
--- a/drivers/net/can/c_can/c_can_platform.c
+++ b/drivers/net/can/c_can/c_can_platform.c
@@ -42,27 +42,27 @@
  * Handle the same by providing a common read/write interface.
  */
 static u16 c_can_plat_read_reg_aligned_to_16bit(struct c_can_priv *priv,
-                                                void *reg)
+                                                enum reg index)
 {
-        return readw(reg);
+        return readw(priv->base + priv->regs[index]);
 }
 
 static void c_can_plat_write_reg_aligned_to_16bit(struct c_can_priv *priv,
-                                                void *reg, u16 val)
+                                                enum reg index, u16 val)
 {
-        writew(val, reg);
+        writew(val, priv->base + priv->regs[index]);
 }
 
 static u16 c_can_plat_read_reg_aligned_to_32bit(struct c_can_priv *priv,
-                                                void *reg)
+                                                enum reg index)
 {
-        return readw(reg + (long)reg - (long)priv->regs);
+        return readw(priv->base + 2 * priv->regs[index]);
 }
 
 static void c_can_plat_write_reg_aligned_to_32bit(struct c_can_priv *priv,
-                                                void *reg, u16 val)
+                                                enum reg index, u16 val)
 {
-        writew(val, reg + (long)reg - (long)priv->regs);
+        writew(val, priv->base + 2 * priv->regs[index]);
 }
 
 static int __devinit c_can_plat_probe(struct platform_device *pdev)
@@ -71,6 +71,7 @@ static int __devinit c_can_plat_probe(struct platform_device *pdev)
         void __iomem *addr;
         struct net_device *dev;
         struct c_can_priv *priv;
+        const struct platform_device_id *id;
         struct resource *mem;
         int irq;
 #ifdef CONFIG_HAVE_CLK
@@ -115,26 +116,40 @@ static int __devinit c_can_plat_probe(struct platform_device *pdev)
         }
 
         priv = netdev_priv(dev);
+        id = platform_get_device_id(pdev);
+        switch (id->driver_data) {
+        case C_CAN_DEVTYPE:
+                priv->regs = reg_map_c_can;
+                switch (mem->flags & IORESOURCE_MEM_TYPE_MASK) {
+                case IORESOURCE_MEM_32BIT:
+                        priv->read_reg = c_can_plat_read_reg_aligned_to_32bit;
+                        priv->write_reg = c_can_plat_write_reg_aligned_to_32bit;
+                        break;
+                case IORESOURCE_MEM_16BIT:
+                default:
+                        priv->read_reg = c_can_plat_read_reg_aligned_to_16bit;
+                        priv->write_reg = c_can_plat_write_reg_aligned_to_16bit;
+                        break;
+                }
+                break;
+        case D_CAN_DEVTYPE:
+                priv->regs = reg_map_d_can;
+                priv->can.ctrlmode_supported |= CAN_CTRLMODE_3_SAMPLES;
+                priv->read_reg = c_can_plat_read_reg_aligned_to_16bit;
+                priv->write_reg = c_can_plat_write_reg_aligned_to_16bit;
+                break;
+        default:
+                ret = -EINVAL;
+                goto exit_free_device;
+        }
 
         dev->irq = irq;
-        priv->regs = addr;
+        priv->base = addr;
 #ifdef CONFIG_HAVE_CLK
         priv->can.clock.freq = clk_get_rate(clk);
         priv->priv = clk;
 #endif
 
-        switch (mem->flags & IORESOURCE_MEM_TYPE_MASK) {
-        case IORESOURCE_MEM_32BIT:
-                priv->read_reg = c_can_plat_read_reg_aligned_to_32bit;
-                priv->write_reg = c_can_plat_write_reg_aligned_to_32bit;
-                break;
-        case IORESOURCE_MEM_16BIT:
-        default:
-                priv->read_reg = c_can_plat_read_reg_aligned_to_16bit;
-                priv->write_reg = c_can_plat_write_reg_aligned_to_16bit;
-                break;
-        }
-
         platform_set_drvdata(pdev, dev);
         SET_NETDEV_DEV(dev, &pdev->dev);
 
@@ -146,7 +161,7 @@ static int __devinit c_can_plat_probe(struct platform_device *pdev)
         }
 
         dev_info(&pdev->dev, "%s device registered (regs=%p, irq=%d)\n",
-                 KBUILD_MODNAME, priv->regs, dev->irq);
+                 KBUILD_MODNAME, priv->base, dev->irq);
         return 0;
 
 exit_free_device:
@@ -176,7 +191,7 @@ static int __devexit c_can_plat_remove(struct platform_device *pdev)
         platform_set_drvdata(pdev, NULL);
 
         free_c_can_dev(dev);
-        iounmap(priv->regs);
+        iounmap(priv->base);
 
         mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
         release_mem_region(mem->start, resource_size(mem));
@@ -188,6 +203,20 @@ static int __devexit c_can_plat_remove(struct platform_device *pdev)
         return 0;
 }
 
+static const struct platform_device_id c_can_id_table[] = {
+        {
+                .name = KBUILD_MODNAME,
+                .driver_data = C_CAN_DEVTYPE,
+        }, {
+                .name = "c_can",
+                .driver_data = C_CAN_DEVTYPE,
+        }, {
+                .name = "d_can",
+                .driver_data = D_CAN_DEVTYPE,
+        }, {
+        }
+};
+
 static struct platform_driver c_can_plat_driver = {
         .driver = {
                 .name = KBUILD_MODNAME,
@@ -195,6 +224,7 @@ static struct platform_driver c_can_plat_driver = {
         },
         .probe = c_can_plat_probe,
         .remove = __devexit_p(c_can_plat_remove),
+        .id_table = c_can_id_table,
 };
 
 module_platform_driver(c_can_plat_driver);
diff --git a/drivers/net/can/cc770/cc770.c b/drivers/net/can/cc770/cc770.c
index d42a6a7396f..a138db11cbf 100644
--- a/drivers/net/can/cc770/cc770.c
+++ b/drivers/net/can/cc770/cc770.c
@@ -695,7 +695,7 @@ static void cc770_tx_interrupt(struct net_device *dev, unsigned int o)
         netif_wake_queue(dev);
 }
 
-irqreturn_t cc770_interrupt(int irq, void *dev_id)
+static irqreturn_t cc770_interrupt(int irq, void *dev_id)
 {
         struct net_device *dev = (struct net_device *)dev_id;
         struct cc770_priv *priv = netdev_priv(dev);
diff --git a/drivers/net/can/dev.c b/drivers/net/can/dev.c
index f03d7a481a8..963e2ccd10d 100644
--- a/drivers/net/can/dev.c
+++ b/drivers/net/can/dev.c
@@ -33,6 +33,39 @@ MODULE_DESCRIPTION(MOD_DESC);
 MODULE_LICENSE("GPL v2");
 MODULE_AUTHOR("Wolfgang Grandegger <wg@grandegger.com>");
 
+/* CAN DLC to real data length conversion helpers */
+
+static const u8 dlc2len[] = {0, 1, 2, 3, 4, 5, 6, 7,
+                             8, 12, 16, 20, 24, 32, 48, 64};
+
+/* get data length from can_dlc with sanitized can_dlc */
+u8 can_dlc2len(u8 can_dlc)
+{
+        return dlc2len[can_dlc & 0x0F];
+}
+EXPORT_SYMBOL_GPL(can_dlc2len);
+
+static const u8 len2dlc[] = {0, 1, 2, 3, 4, 5, 6, 7, 8,         /* 0 - 8 */
+                             9, 9, 9, 9,                        /* 9 - 12 */
+                             10, 10, 10, 10,                    /* 13 - 16 */
+                             11, 11, 11, 11,                    /* 17 - 20 */
+                             12, 12, 12, 12,                    /* 21 - 24 */
+                             13, 13, 13, 13, 13, 13, 13, 13,    /* 25 - 32 */
+                             14, 14, 14, 14, 14, 14, 14, 14,    /* 33 - 40 */
+                             14, 14, 14, 14, 14, 14, 14, 14,    /* 41 - 48 */
+                             15, 15, 15, 15, 15, 15, 15, 15,    /* 49 - 56 */
+                             15, 15, 15, 15, 15, 15, 15, 15};   /* 57 - 64 */
+
+/* map the sanitized data length to an appropriate data length code */
+u8 can_len2dlc(u8 len)
+{
+        if (unlikely(len > 64))
+                return 0xF;
+
+        return len2dlc[len];
+}
+EXPORT_SYMBOL_GPL(can_len2dlc);
+
 #ifdef CONFIG_CAN_CALC_BITTIMING
 #define CAN_CALC_MAX_ERROR 50 /* in one-tenth of a percent */
 
@@ -368,7 +401,7 @@ EXPORT_SYMBOL_GPL(can_free_echo_skb);
 /*
  * CAN device restart for bus-off recovery
  */
-void can_restart(unsigned long data)
+static void can_restart(unsigned long data)
 {
         struct net_device *dev = (struct net_device *)data;
         struct can_priv *priv = netdev_priv(dev);
@@ -454,7 +487,7 @@ EXPORT_SYMBOL_GPL(can_bus_off);
 static void can_setup(struct net_device *dev)
 {
         dev->type = ARPHRD_CAN;
-        dev->mtu = sizeof(struct can_frame);
+        dev->mtu = CAN_MTU;
         dev->hard_header_len = 0;
         dev->addr_len = 0;
         dev->tx_queue_len = 10;
diff --git a/drivers/net/can/flexcan.c b/drivers/net/can/flexcan.c
index 81d47410237..81324a11a50 100644
--- a/drivers/net/can/flexcan.c
+++ b/drivers/net/can/flexcan.c
@@ -34,6 +34,7 @@
 #include <linux/list.h>
 #include <linux/module.h>
 #include <linux/of.h>
+#include <linux/of_device.h>
 #include <linux/platform_device.h>
 #include <linux/pinctrl/consumer.h>
 
@@ -165,10 +166,21 @@ struct flexcan_regs {
         u32 imask1;             /* 0x28 */
         u32 iflag2;             /* 0x2c */
         u32 iflag1;             /* 0x30 */
-        u32 _reserved2[19];
+        u32 crl2;               /* 0x34 */
+        u32 esr2;               /* 0x38 */
+        u32 imeur;              /* 0x3c */
+        u32 lrfr;               /* 0x40 */
+        u32 crcr;               /* 0x44 */
+        u32 rxfgmask;           /* 0x48 */
+        u32 rxfir;              /* 0x4c */
+        u32 _reserved3[12];
         struct flexcan_mb cantxfg[64];
 };
 
+struct flexcan_devtype_data {
+        u32 hw_ver;     /* hardware controller version */
+};
+
 struct flexcan_priv {
         struct can_priv can;
         struct net_device *dev;
@@ -180,6 +192,15 @@ struct flexcan_priv {
 
         struct clk *clk;
         struct flexcan_platform_data *pdata;
+        struct flexcan_devtype_data *devtype_data;
+};
+
+static struct flexcan_devtype_data fsl_p1010_devtype_data = {
+        .hw_ver = 3,
+};
+
+static struct flexcan_devtype_data fsl_imx6q_devtype_data = {
+        .hw_ver = 10,
 };
 
 static struct can_bittiming_const flexcan_bittiming_const = {
@@ -750,6 +771,9 @@ static int flexcan_chip_start(struct net_device *dev)
         flexcan_write(0x0, &regs->rx14mask);
         flexcan_write(0x0, &regs->rx15mask);
 
+        if (priv->devtype_data->hw_ver >= 10)
+                flexcan_write(0x0, &regs->rxfgmask);
+
         flexcan_transceiver_switch(priv, 1);
 
         /* synchronize with the can bus */
@@ -922,8 +946,21 @@ static void __devexit unregister_flexcandev(struct net_device *dev)
         unregister_candev(dev);
 }
 
+static const struct of_device_id flexcan_of_match[] = {
+        { .compatible = "fsl,p1010-flexcan", .data = &fsl_p1010_devtype_data, },
+        { .compatible = "fsl,imx6q-flexcan", .data = &fsl_imx6q_devtype_data, },
+        { /* sentinel */ },
+};
+
+static const struct platform_device_id flexcan_id_table[] = {
+        { .name = "flexcan", .driver_data = (kernel_ulong_t)&fsl_p1010_devtype_data, },
+        { /* sentinel */ },
+};
+
 static int __devinit flexcan_probe(struct platform_device *pdev)
 {
+        const struct of_device_id *of_id;
+        struct flexcan_devtype_data *devtype_data;
         struct net_device *dev;
         struct flexcan_priv *priv;
         struct resource *mem;
@@ -938,14 +975,9 @@ static int __devinit flexcan_probe(struct platform_device *pdev)
         if (IS_ERR(pinctrl))
                 return PTR_ERR(pinctrl);
 
-        if (pdev->dev.of_node) {
-                const __be32 *clock_freq_p;
-
-                clock_freq_p = of_get_property(pdev->dev.of_node,
-                                                "clock-frequency", NULL);
-                if (clock_freq_p)
-                        clock_freq = be32_to_cpup(clock_freq_p);
-        }
+        if (pdev->dev.of_node)
+                of_property_read_u32(pdev->dev.of_node,
+                                                "clock-frequency", &clock_freq);
 
         if (!clock_freq) {
                 clk = clk_get(&pdev->dev, NULL);
@@ -982,6 +1014,17 @@ static int __devinit flexcan_probe(struct platform_device *pdev)
                 goto failed_alloc;
         }
 
+        of_id = of_match_device(flexcan_of_match, &pdev->dev);
+        if (of_id) {
+                devtype_data = of_id->data;
+        } else if (pdev->id_entry->driver_data) {
+                devtype_data = (struct flexcan_devtype_data *)
+                        pdev->id_entry->driver_data;
+        } else {
+                err = -ENODEV;
+                goto failed_devtype;
+        }
+
         dev->netdev_ops = &flexcan_netdev_ops;
         dev->irq = irq;
         dev->flags |= IFF_ECHO;
@@ -998,6 +1041,7 @@ static int __devinit flexcan_probe(struct platform_device *pdev)
         priv->dev = dev;
         priv->clk = clk;
         priv->pdata = pdev->dev.platform_data;
+        priv->devtype_data = devtype_data;
 
         netif_napi_add(dev, &priv->napi, flexcan_poll, FLEXCAN_NAPI_WEIGHT);
 
@@ -1016,6 +1060,7 @@ static int __devinit flexcan_probe(struct platform_device *pdev)
         return 0;
 
  failed_register:
+ failed_devtype:
         free_candev(dev);
  failed_alloc:
         iounmap(base);
@@ -1049,12 +1094,41 @@ static int __devexit flexcan_remove(struct platform_device *pdev)
         return 0;
 }
 
-static struct of_device_id flexcan_of_match[] = {
-        {
-                .compatible = "fsl,p1010-flexcan",
-        },
-        {},
-};
+#ifdef CONFIG_PM
+static int flexcan_suspend(struct platform_device *pdev, pm_message_t state)
+{
+        struct net_device *dev = platform_get_drvdata(pdev);
+        struct flexcan_priv *priv = netdev_priv(dev);
+
+        flexcan_chip_disable(priv);
+
+        if (netif_running(dev)) {
+                netif_stop_queue(dev);
+                netif_device_detach(dev);
+        }
+        priv->can.state = CAN_STATE_SLEEPING;
+
+        return 0;
+}
+
+static int flexcan_resume(struct platform_device *pdev)
+{
+        struct net_device *dev = platform_get_drvdata(pdev);
+        struct flexcan_priv *priv = netdev_priv(dev);
+
+        priv->can.state = CAN_STATE_ERROR_ACTIVE;
+        if (netif_running(dev)) {
+                netif_device_attach(dev);
+                netif_start_queue(dev);
+        }
+        flexcan_chip_enable(priv);
+
+        return 0;
+}
+#else
+#define flexcan_suspend NULL
+#define flexcan_resume NULL
+#endif
 
 static struct platform_driver flexcan_driver = {
         .driver = {
@@ -1064,6 +1138,9 @@ static struct platform_driver flexcan_driver = {
         },
         .probe = flexcan_probe,
         .remove = __devexit_p(flexcan_remove),
+        .suspend = flexcan_suspend,
+        .resume = flexcan_resume,
+        .id_table = flexcan_id_table,
 };
 
 module_platform_driver(flexcan_driver);
diff --git a/drivers/net/can/mcp251x.c b/drivers/net/can/mcp251x.c
index 346785c56a2..9120a36ec70 100644
--- a/drivers/net/can/mcp251x.c
+++ b/drivers/net/can/mcp251x.c
@@ -1020,8 +1020,7 @@ static int __devinit mcp251x_can_probe(struct spi_device *spi)
                                                       GFP_DMA);
 
                 if (priv->spi_tx_buf) {
-                        priv->spi_rx_buf = (u8 *)(priv->spi_tx_buf +
-                                                  (PAGE_SIZE / 2));
+                        priv->spi_rx_buf = (priv->spi_tx_buf + (PAGE_SIZE / 2));
                         priv->spi_rx_dma = (dma_addr_t)(priv->spi_tx_dma +
                                                         (PAGE_SIZE / 2));
                 } else {
diff --git a/drivers/net/can/vcan.c b/drivers/net/can/vcan.c
index ea2d9428593..4f93c0be005 100644
--- a/drivers/net/can/vcan.c
+++ b/drivers/net/can/vcan.c
@@ -70,13 +70,12 @@ MODULE_PARM_DESC(echo, "Echo sent frames (for testing). Default: 0 (Off)");
 
 static void vcan_rx(struct sk_buff *skb, struct net_device *dev)
 {
-        struct can_frame *cf = (struct can_frame *)skb->data;
+        struct canfd_frame *cfd = (struct canfd_frame *)skb->data;
         struct net_device_stats *stats = &dev->stats;
 
         stats->rx_packets++;
-        stats->rx_bytes += cf->can_dlc;
+        stats->rx_bytes += cfd->len;
 
-        skb->protocol  = htons(ETH_P_CAN);
         skb->pkt_type  = PACKET_BROADCAST;
         skb->dev       = dev;
         skb->ip_summed = CHECKSUM_UNNECESSARY;
@@ -86,7 +85,7 @@ static void vcan_rx(struct sk_buff *skb, struct net_device *dev)
 
 static netdev_tx_t vcan_tx(struct sk_buff *skb, struct net_device *dev)
 {
-        struct can_frame *cf = (struct can_frame *)skb->data;
+        struct canfd_frame *cfd = (struct canfd_frame *)skb->data;
         struct net_device_stats *stats = &dev->stats;
         int loop;
 
@@ -94,7 +93,7 @@ static netdev_tx_t vcan_tx(struct sk_buff *skb, struct net_device *dev)
                 return NETDEV_TX_OK;
 
         stats->tx_packets++;
-        stats->tx_bytes += cf->can_dlc;
+        stats->tx_bytes += cfd->len;
 
         /* set flag whether this packet has to be looped back */
         loop = skb->pkt_type == PACKET_LOOPBACK;
@@ -108,7 +107,7 @@ static netdev_tx_t vcan_tx(struct sk_buff *skb, struct net_device *dev)
                          * CAN core already did the echo for us
                          */
                         stats->rx_packets++;
-                        stats->rx_bytes += cf->can_dlc;
+                        stats->rx_bytes += cfd->len;
                 }
                 kfree_skb(skb);
                 return NETDEV_TX_OK;
@@ -133,14 +132,28 @@ static netdev_tx_t vcan_tx(struct sk_buff *skb, struct net_device *dev)
         return NETDEV_TX_OK;
 }
 
+static int vcan_change_mtu(struct net_device *dev, int new_mtu)
+{
+        /* Do not allow changing the MTU while running */
+        if (dev->flags & IFF_UP)
+                return -EBUSY;
+
+        if (new_mtu != CAN_MTU && new_mtu != CANFD_MTU)
+                return -EINVAL;
+
+        dev->mtu = new_mtu;
+        return 0;
+}
+
 static const struct net_device_ops vcan_netdev_ops = {
         .ndo_start_xmit = vcan_tx,
+        .ndo_change_mtu = vcan_change_mtu,
 };
 
 static void vcan_setup(struct net_device *dev)
 {
         dev->type               = ARPHRD_CAN;
-        dev->mtu                = sizeof(struct can_frame);
+        dev->mtu                = CAN_MTU;
         dev->hard_header_len    = 0;
         dev->addr_len           = 0;
         dev->tx_queue_len       = 0;
diff --git a/drivers/net/cris/eth_v10.c b/drivers/net/cris/eth_v10.c
index 9c755db6b16..f0c8bd54ce2 100644
--- a/drivers/net/cris/eth_v10.c
+++ b/drivers/net/cris/eth_v10.c
@@ -1008,7 +1008,7 @@ e100_send_mdio_bit(unsigned char bit)
 }
 
 static unsigned char
-e100_receive_mdio_bit()
+e100_receive_mdio_bit(void)
 {
         unsigned char bit;
         *R_NETWORK_MGM_CTRL = 0;
diff --git a/drivers/net/dummy.c b/drivers/net/dummy.c
index bab0158f1cc..9d6a0677466 100644
--- a/drivers/net/dummy.c
+++ b/drivers/net/dummy.c
@@ -40,18 +40,6 @@
 
 static int numdummies = 1;
 
-static int dummy_set_address(struct net_device *dev, void *p)
-{
-        struct sockaddr *sa = p;
-
-        if (!is_valid_ether_addr(sa->sa_data))
-                return -EADDRNOTAVAIL;
-
-        dev->addr_assign_type &= ~NET_ADDR_RANDOM;
-        memcpy(dev->dev_addr, sa->sa_data, ETH_ALEN);
-        return 0;
-}
-
 /* fake multicast ability */
 static void set_multicast_list(struct net_device *dev)
 {
@@ -118,7 +106,7 @@ static const struct net_device_ops dummy_netdev_ops = {
         .ndo_start_xmit         = dummy_xmit,
         .ndo_validate_addr      = eth_validate_addr,
         .ndo_set_rx_mode        = set_multicast_list,
-        .ndo_set_mac_address    = dummy_set_address,
+        .ndo_set_mac_address    = eth_mac_addr,
         .ndo_get_stats64        = dummy_get_stats64,
 };
 
@@ -134,6 +122,7 @@ static void dummy_setup(struct net_device *dev)
         dev->tx_queue_len = 0;
         dev->flags |= IFF_NOARP;
         dev->flags &= ~IFF_MULTICAST;
+        dev->priv_flags |= IFF_LIVE_ADDR_CHANGE;
         dev->features   |= NETIF_F_SG | NETIF_F_FRAGLIST | NETIF_F_TSO;
         dev->features   |= NETIF_F_HW_CSUM | NETIF_F_HIGHDMA | NETIF_F_LLTX;
         eth_hw_addr_random(dev);
diff --git a/drivers/net/ethernet/3com/3c501.c b/drivers/net/ethernet/3com/3c501.c
index bf73e1a0229..2038eaabaea 100644
--- a/drivers/net/ethernet/3com/3c501.c
+++ b/drivers/net/ethernet/3com/3c501.c
@@ -143,7 +143,7 @@ static int irq = 5;
 static int mem_start;
 
 /**
- * el1_probe:           -       probe for a 3c501
+ * el1_probe            -       probe for a 3c501
  * @dev: The device structure passed in to probe.
  *
  * This can be called from two places. The network layer will probe using
diff --git a/drivers/net/ethernet/8390/apne.c b/drivers/net/ethernet/8390/apne.c
index 923959275a8..912ed7a5f33 100644
--- a/drivers/net/ethernet/8390/apne.c
+++ b/drivers/net/ethernet/8390/apne.c
@@ -454,7 +454,7 @@ apne_block_input(struct net_device *dev, int count, struct sk_buff *skb, int rin
         buf[count-1] = inb(NE_BASE + NE_DATAPORT);
       }
     } else {
-      ptrc = (char*)buf;
+      ptrc = buf;
       for (cnt = 0; cnt < count; cnt++)
         *ptrc++ = inb(NE_BASE + NE_DATAPORT);
     }
diff --git a/drivers/net/ethernet/aeroflex/greth.c b/drivers/net/ethernet/aeroflex/greth.c
index 34850117808..9c77c736f17 100644
--- a/drivers/net/ethernet/aeroflex/greth.c
+++ b/drivers/net/ethernet/aeroflex/greth.c
@@ -1014,7 +1014,7 @@ static int greth_set_mac_add(struct net_device *dev, void *p)
         struct greth_regs *regs;
 
         greth = netdev_priv(dev);
-        regs = (struct greth_regs *) greth->regs;
+        regs = greth->regs;
 
         if (!is_valid_ether_addr(addr->sa_data))
                 return -EADDRNOTAVAIL;
@@ -1036,7 +1036,7 @@ static void greth_set_hash_filter(struct net_device *dev)
 {
         struct netdev_hw_addr *ha;
         struct greth_private *greth = netdev_priv(dev);
-        struct greth_regs *regs = (struct greth_regs *) greth->regs;
+        struct greth_regs *regs = greth->regs;
         u32 mc_filter[2];
         unsigned int bitnr;
 
@@ -1055,7 +1055,7 @@ static void greth_set_multicast_list(struct net_device *dev)
 {
         int cfg;
         struct greth_private *greth = netdev_priv(dev);
-        struct greth_regs *regs = (struct greth_regs *) greth->regs;
+        struct greth_regs *regs = greth->regs;
 
         cfg = GRETH_REGLOAD(regs->control);
         if (dev->flags & IFF_PROMISC)
@@ -1414,7 +1414,7 @@ static int __devinit greth_of_probe(struct platform_device *ofdev)
                 goto error1;
         }
 
-        regs = (struct greth_regs *) greth->regs;
+        regs = greth->regs;
         greth->irq = ofdev->archdata.irqs[0];
 
         dev_set_drvdata(greth->dev, dev);
diff --git a/drivers/net/ethernet/amd/declance.c b/drivers/net/ethernet/amd/declance.c
index 75299f500ee..7203b522f23 100644
--- a/drivers/net/ethernet/amd/declance.c
+++ b/drivers/net/ethernet/amd/declance.c
@@ -623,7 +623,7 @@ static int lance_rx(struct net_device *dev)
                         skb_put(skb, len);      /* make room */
 
                         cp_from_buf(lp->type, skb->data,
-                                    (char *)lp->rx_buf_ptr_cpu[entry], len);
+                                    lp->rx_buf_ptr_cpu[entry], len);
 
                         skb->protocol = eth_type_trans(skb, dev);
                         netif_rx(skb);
@@ -919,7 +919,7 @@ static int lance_start_xmit(struct sk_buff *skb, struct net_device *dev)
         *lib_ptr(ib, btx_ring[entry].length, lp->type) = (-len);
         *lib_ptr(ib, btx_ring[entry].misc, lp->type) = 0;
 
-        cp_to_buf(lp->type, (char *)lp->tx_buf_ptr_cpu[entry], skb->data, len);
+        cp_to_buf(lp->type, lp->tx_buf_ptr_cpu[entry], skb->data, len);
 
         /* Now, give the packet to the lance */
         *lib_ptr(ib, btx_ring[entry].tmd1, lp->type) =
diff --git a/drivers/net/ethernet/amd/lance.c b/drivers/net/ethernet/amd/lance.c
index a6e2e840884..5c728436b85 100644
--- a/drivers/net/ethernet/amd/lance.c
+++ b/drivers/net/ethernet/amd/lance.c
@@ -873,10 +873,9 @@ lance_init_ring(struct net_device *dev, gfp_t gfp)
 
                 skb = alloc_skb(PKT_BUF_SZ, GFP_DMA | gfp);
                 lp->rx_skbuff[i] = skb;
-                if (skb) {
-                        skb->dev = dev;
+                if (skb)
                         rx_buff = skb->data;
-                } else
+                else
                         rx_buff = kmalloc(PKT_BUF_SZ, GFP_DMA | gfp);
                 if (rx_buff == NULL)
                         lp->rx_ring[i].base = 0;
diff --git a/drivers/net/ethernet/apple/macmace.c b/drivers/net/ethernet/apple/macmace.c
index ab7ff8645ab..a92ddee7f66 100644
--- a/drivers/net/ethernet/apple/macmace.c
+++ b/drivers/net/ethernet/apple/macmace.c
@@ -228,7 +228,7 @@ static int __devinit mace_probe(struct platform_device *pdev)
          * bits are reversed.
          */
 
-        addr = (void *)MACE_PROM;
+        addr = MACE_PROM;
 
         for (j = 0; j < 6; ++j) {
                 u8 v = bitrev8(addr[j<<4]);
diff --git a/drivers/net/ethernet/atheros/atl1c/atl1c_hw.c b/drivers/net/ethernet/atheros/atl1c/atl1c_hw.c
index ff9c73859d4..801f0126512 100644
--- a/drivers/net/ethernet/atheros/atl1c/atl1c_hw.c
+++ b/drivers/net/ethernet/atheros/atl1c/atl1c_hw.c
@@ -602,7 +602,7 @@ int atl1c_phy_reset(struct atl1c_hw *hw)
 
 int atl1c_phy_init(struct atl1c_hw *hw)
 {
-        struct atl1c_adapter *adapter = (struct atl1c_adapter *)hw->adapter;
+        struct atl1c_adapter *adapter = hw->adapter;
         struct pci_dev *pdev = adapter->pdev;
         int ret_val;
         u16 mii_bmcr_data = BMCR_RESET;
@@ -696,7 +696,7 @@ int atl1c_get_speed_and_duplex(struct atl1c_hw *hw, u16 *speed, u16 *duplex)
 /* select one link mode to get lower power consumption */
 int atl1c_phy_to_ps_link(struct atl1c_hw *hw)
 {
-        struct atl1c_adapter *adapter = (struct atl1c_adapter *)hw->adapter;
+        struct atl1c_adapter *adapter = hw->adapter;
         struct pci_dev *pdev = adapter->pdev;
         int ret = 0;
         u16 autoneg_advertised = ADVERTISED_10baseT_Half;
@@ -768,7 +768,7 @@ int atl1c_restart_autoneg(struct atl1c_hw *hw)
 
 int atl1c_power_saving(struct atl1c_hw *hw, u32 wufc)
 {
-        struct atl1c_adapter *adapter = (struct atl1c_adapter *)hw->adapter;
+        struct atl1c_adapter *adapter = hw->adapter;
         struct pci_dev *pdev = adapter->pdev;
         u32 master_ctrl, mac_ctrl, phy_ctrl;
         u32 wol_ctrl, speed;
diff --git a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
index 1f78b63d5ef..36d3783ebfa 100644
--- a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
+++ b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
@@ -166,7 +166,7 @@ static void atl1c_reset_pcie(struct atl1c_hw *hw, u32 flag)
         msleep(5);
 }
 
-/*
+/**
  * atl1c_irq_enable - Enable default interrupt generation settings
  * @adapter: board private structure
  */
@@ -179,7 +179,7 @@ static inline void atl1c_irq_enable(struct atl1c_adapter *adapter)
         }
 }
 
-/*
+/**
  * atl1c_irq_disable - Mask off interrupt generation on the NIC
  * @adapter: board private structure
  */
@@ -192,7 +192,7 @@ static inline void atl1c_irq_disable(struct atl1c_adapter *adapter)
         synchronize_irq(adapter->pdev->irq);
 }
 
-/*
+/**
  * atl1c_irq_reset - reset interrupt confiure on the NIC
  * @adapter: board private structure
  */
@@ -220,7 +220,7 @@ static u32 atl1c_wait_until_idle(struct atl1c_hw *hw, u32 modu_ctrl)
         return data;
 }
 
-/*
+/**
  * atl1c_phy_config - Timer Call-back
  * @data: pointer to netdev cast into an unsigned long
  */
@@ -360,7 +360,7 @@ static void atl1c_del_timer(struct atl1c_adapter *adapter)
 }
 
 
-/*
+/**
  * atl1c_tx_timeout - Respond to a Tx Hang
  * @netdev: network interface device structure
  */
@@ -373,7 +373,7 @@ static void atl1c_tx_timeout(struct net_device *netdev)
         schedule_work(&adapter->common_task);
 }
 
-/*
+/**
  * atl1c_set_multi - Multicast and Promiscuous mode set
  * @netdev: network interface device structure
  *
@@ -452,7 +452,7 @@ static void atl1c_restore_vlan(struct atl1c_adapter *adapter)
         atl1c_vlan_mode(adapter->netdev, adapter->netdev->features);
 }
 
-/*
+/**
  * atl1c_set_mac - Change the Ethernet Address of the NIC
  * @netdev: network interface device structure
  * @p: pointer to an address structure
@@ -517,7 +517,7 @@ static int atl1c_set_features(struct net_device *netdev,
         return 0;
 }
 
-/*
+/**
  * atl1c_change_mtu - Change the Maximum Transfer Unit
  * @netdev: network interface device structure
  * @new_mtu: new value for maximum frame size
@@ -576,12 +576,6 @@ static void atl1c_mdio_write(struct net_device *netdev, int phy_id,
         atl1c_write_phy_reg(&adapter->hw, reg_num, val);
 }
 
-/*
- * atl1c_mii_ioctl -
- * @netdev:
- * @ifreq:
- * @cmd:
- */
 static int atl1c_mii_ioctl(struct net_device *netdev,
                            struct ifreq *ifr, int cmd)
 {
@@ -632,12 +626,6 @@ out:
         return retval;
 }
 
-/*
- * atl1c_ioctl -
- * @netdev:
- * @ifreq:
- * @cmd:
- */
 static int atl1c_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd)
 {
         switch (cmd) {
@@ -650,7 +638,7 @@ static int atl1c_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd)
         }
 }
 
-/*
+/**
  * atl1c_alloc_queues - Allocate memory for all rings
  * @adapter: board private structure to initialize
  *
@@ -754,7 +742,7 @@ static void __devinit atl1c_patch_assign(struct atl1c_hw *hw)
                 i++;
         }
 }
-/*
+/**
  * atl1c_sw_init - Initialize general software structures (struct atl1c_adapter)
  * @adapter: board private structure to initialize
  *
@@ -852,7 +840,7 @@ static inline void atl1c_clean_buffer(struct pci_dev *pdev,
         buffer_info->skb = NULL;
         ATL1C_SET_BUFFER_STATE(buffer_info, ATL1C_BUFFER_FREE);
 }
-/*
+/**
  * atl1c_clean_tx_ring - Free Tx-skb
  * @adapter: board private structure
  */
@@ -877,7 +865,7 @@ static void atl1c_clean_tx_ring(struct atl1c_adapter *adapter,
         tpd_ring->next_to_use = 0;
 }
 
-/*
+/**
  * atl1c_clean_rx_ring - Free rx-reservation skbs
  * @adapter: board private structure
  */
@@ -930,7 +918,7 @@ static void atl1c_init_ring_ptrs(struct atl1c_adapter *adapter)
         }
 }
 
-/*
+/**
  * atl1c_free_ring_resources - Free Tx / RX descriptor Resources
  * @adapter: board private structure
  *
@@ -953,7 +941,7 @@ static void atl1c_free_ring_resources(struct atl1c_adapter *adapter)
         }
 }
 
-/*
+/**
  * atl1c_setup_mem_resources - allocate Tx / RX descriptor resources
  * @adapter: board private structure
  *
@@ -988,12 +976,12 @@ static int atl1c_setup_ring_resources(struct atl1c_adapter *adapter)
         }
         for (i = 0; i < AT_MAX_TRANSMIT_QUEUE; i++) {
                 tpd_ring[i].buffer_info =
-                        (struct atl1c_buffer *) (tpd_ring->buffer_info + count);
+                        (tpd_ring->buffer_info + count);
                 count += tpd_ring[i].count;
         }
 
         rfd_ring->buffer_info =
-                (struct atl1c_buffer *) (tpd_ring->buffer_info + count);
+                (tpd_ring->buffer_info + count);
         count += rfd_ring->count;
         rx_desc_count += rfd_ring->count;
 
@@ -1226,7 +1214,7 @@ static void atl1c_start_mac(struct atl1c_adapter *adapter)
  */
 static int atl1c_reset_mac(struct atl1c_hw *hw)
 {
-        struct atl1c_adapter *adapter = (struct atl1c_adapter *)hw->adapter;
+        struct atl1c_adapter *adapter = hw->adapter;
         struct pci_dev *pdev = adapter->pdev;
         u32 ctrl_data = 0;
 
@@ -1362,7 +1350,7 @@ static void atl1c_set_aspm(struct atl1c_hw *hw, u16 link_speed)
         return;
 }
 
-/*
+/**
  * atl1c_configure - Configure Transmit&Receive Unit after Reset
  * @adapter: board private structure
  *
@@ -1476,7 +1464,7 @@ static void atl1c_update_hw_stats(struct atl1c_adapter *adapter)
         }
 }
 
-/*
+/**
  * atl1c_get_stats - Get System Network Statistics
  * @netdev: network interface device structure
  *
@@ -1530,8 +1518,7 @@ static inline void atl1c_clear_phy_int(struct atl1c_adapter *adapter)
 static bool atl1c_clean_tx_irq(struct atl1c_adapter *adapter,
                                 enum atl1c_trans_queue type)
 {
-        struct atl1c_tpd_ring *tpd_ring = (struct atl1c_tpd_ring *)
-                                &adapter->tpd_ring[type];
+        struct atl1c_tpd_ring *tpd_ring = &adapter->tpd_ring[type];
         struct atl1c_buffer *buffer_info;
         struct pci_dev *pdev = adapter->pdev;
         u16 next_to_clean = atomic_read(&tpd_ring->next_to_clean);
@@ -1558,11 +1545,10 @@ static bool atl1c_clean_tx_irq(struct atl1c_adapter *adapter,
         return true;
 }
 
-/*
+/**
  * atl1c_intr - Interrupt Handler
  * @irq: interrupt number
  * @data: pointer to a network interface device structure
- * @pt_regs: CPU registers structure
  */
 static irqreturn_t atl1c_intr(int irq, void *data)
 {
@@ -1813,9 +1799,8 @@ rrs_checked:
                 atl1c_alloc_rx_buffer(adapter);
 }
 
-/*
+/**
  * atl1c_clean - NAPI Rx polling callback
- * @adapter: board private structure
  */
 static int atl1c_clean(struct napi_struct *napi, int budget)
 {
@@ -2270,7 +2255,7 @@ static void atl1c_down(struct atl1c_adapter *adapter)
         atl1c_reset_dma_ring(adapter);
 }
 
-/*
+/**
  * atl1c_open - Called when a network interface is made active
  * @netdev: network interface device structure
  *
@@ -2309,7 +2294,7 @@ err_up:
         return err;
 }
 
-/*
+/**
  * atl1c_close - Disables a network interface
  * @netdev: network interface device structure
  *
@@ -2432,7 +2417,7 @@ static int atl1c_init_netdev(struct net_device *netdev, struct pci_dev *pdev)
         return 0;
 }
 
-/*
+/**
  * atl1c_probe - Device Initialization Routine
  * @pdev: PCI device information struct
  * @ent: entry in atl1c_pci_tbl
@@ -2579,7 +2564,7 @@ err_dma:
         return err;
 }
 
-/*
+/**
  * atl1c_remove - Device Removal Routine
  * @pdev: PCI device information struct
  *
@@ -2605,7 +2590,7 @@ static void __devexit atl1c_remove(struct pci_dev *pdev)
         free_netdev(netdev);
 }
 
-/*
+/**
  * atl1c_io_error_detected - called when PCI error is detected
  * @pdev: Pointer to PCI device
  * @state: The current pci connection state
@@ -2633,7 +2618,7 @@ static pci_ers_result_t atl1c_io_error_detected(struct pci_dev *pdev,
         return PCI_ERS_RESULT_NEED_RESET;
 }
 
-/*
+/**
  * atl1c_io_slot_reset - called after the pci bus has been reset.
  * @pdev: Pointer to PCI device
  *
@@ -2661,7 +2646,7 @@ static pci_ers_result_t atl1c_io_slot_reset(struct pci_dev *pdev)
         return PCI_ERS_RESULT_RECOVERED;
 }
 
-/*
+/**
  * atl1c_io_resume - called when traffic can start flowing again.
  * @pdev: Pointer to PCI device
  *
@@ -2704,7 +2689,7 @@ static struct pci_driver atl1c_driver = {
         .driver.pm = &atl1c_pm_ops,
 };
 
-/*
+/**
  * atl1c_init_module - Driver Registration Routine
  *
  * atl1c_init_module is the first routine called when the driver is
@@ -2715,7 +2700,7 @@ static int __init atl1c_init_module(void)
         return pci_register_driver(&atl1c_driver);
 }
 
-/*
+/**
  * atl1c_exit_module - Driver Exit Cleanup Routine
  *
  * atl1c_exit_module is called just before the driver is removed
diff --git a/drivers/net/ethernet/atheros/atl1e/atl1e_ethtool.c b/drivers/net/ethernet/atheros/atl1e/atl1e_ethtool.c
index 6e61f9f9ebb..82b23861bf5 100644
--- a/drivers/net/ethernet/atheros/atl1e/atl1e_ethtool.c
+++ b/drivers/net/ethernet/atheros/atl1e/atl1e_ethtool.c
@@ -268,7 +268,7 @@ static int atl1e_set_eeprom(struct net_device *netdev,
         if (eeprom_buff == NULL)
                 return -ENOMEM;
 
-        ptr = (u32 *)eeprom_buff;
+        ptr = eeprom_buff;
 
         if (eeprom->offset & 3) {
                 /* need read/modify/write of first changed EEPROM word */
diff --git a/drivers/net/ethernet/atheros/atl1e/atl1e_main.c b/drivers/net/ethernet/atheros/atl1e/atl1e_main.c
index 1220e511ced..a98acc8a956 100644
--- a/drivers/net/ethernet/atheros/atl1e/atl1e_main.c
+++ b/drivers/net/ethernet/atheros/atl1e/atl1e_main.c
@@ -89,7 +89,7 @@ static const u16 atl1e_pay_load_size[] = {
         128, 256, 512, 1024, 2048, 4096,
 };
 
-/*
+/**
  * atl1e_irq_enable - Enable default interrupt generation settings
  * @adapter: board private structure
  */
@@ -102,7 +102,7 @@ static inline void atl1e_irq_enable(struct atl1e_adapter *adapter)
         }
 }
 
-/*
+/**
  * atl1e_irq_disable - Mask off interrupt generation on the NIC
  * @adapter: board private structure
  */
@@ -114,7 +114,7 @@ static inline void atl1e_irq_disable(struct atl1e_adapter *adapter)
         synchronize_irq(adapter->pdev->irq);
 }
 
-/*
+/**
  * atl1e_irq_reset - reset interrupt confiure on the NIC
  * @adapter: board private structure
  */
@@ -126,7 +126,7 @@ static inline void atl1e_irq_reset(struct atl1e_adapter *adapter)
         AT_WRITE_FLUSH(&adapter->hw);
 }
 
-/*
+/**
  * atl1e_phy_config - Timer Call-back
  * @data: pointer to netdev cast into an unsigned long
  */
@@ -210,7 +210,7 @@ static int atl1e_check_link(struct atl1e_adapter *adapter)
         return 0;
 }
 
-/*
+/**
  * atl1e_link_chg_task - deal with link change event Out of interrupt context
  * @netdev: network interface device structure
  */
@@ -259,7 +259,7 @@ static void atl1e_cancel_work(struct atl1e_adapter *adapter)
         cancel_work_sync(&adapter->link_chg_task);
 }
 
-/*
+/**
  * atl1e_tx_timeout - Respond to a Tx Hang
  * @netdev: network interface device structure
  */
@@ -271,7 +271,7 @@ static void atl1e_tx_timeout(struct net_device *netdev)
         schedule_work(&adapter->reset_task);
 }
 
-/*
+/**
  * atl1e_set_multi - Multicast and Promiscuous mode set
  * @netdev: network interface device structure
  *
@@ -345,7 +345,7 @@ static void atl1e_restore_vlan(struct atl1e_adapter *adapter)
         atl1e_vlan_mode(adapter->netdev, adapter->netdev->features);
 }
 
-/*
+/**
  * atl1e_set_mac - Change the Ethernet Address of the NIC
  * @netdev: network interface device structure
  * @p: pointer to an address structure
@@ -397,7 +397,7 @@ static int atl1e_set_features(struct net_device *netdev,
         return 0;
 }
 
-/*
+/**
  * atl1e_change_mtu - Change the Maximum Transfer Unit
  * @netdev: network interface device structure
  * @new_mtu: new value for maximum frame size
@@ -449,12 +449,6 @@ static void atl1e_mdio_write(struct net_device *netdev, int phy_id,
         atl1e_write_phy_reg(&adapter->hw, reg_num & MDIO_REG_ADDR_MASK, val);
 }
 
-/*
- * atl1e_mii_ioctl -
- * @netdev:
- * @ifreq:
- * @cmd:
- */
 static int atl1e_mii_ioctl(struct net_device *netdev,
                            struct ifreq *ifr, int cmd)
 {
@@ -505,12 +499,6 @@ out:
 
 }
 
-/*
- * atl1e_ioctl -
- * @netdev:
- * @ifreq:
- * @cmd:
- */
 static int atl1e_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd)
 {
         switch (cmd) {
@@ -541,7 +529,7 @@ static void atl1e_setup_pcicmd(struct pci_dev *pdev)
         msleep(1);
 }
 
-/*
+/**
  * atl1e_alloc_queues - Allocate memory for all rings
  * @adapter: board private structure to initialize
  *
@@ -551,7 +539,7 @@ static int __devinit atl1e_alloc_queues(struct atl1e_adapter *adapter)
         return 0;
 }
 
-/*
+/**
  * atl1e_sw_init - Initialize general software structures (struct atl1e_adapter)
  * @adapter: board private structure to initialize
  *
@@ -635,14 +623,13 @@ static int __devinit atl1e_sw_init(struct atl1e_adapter *adapter)
         return 0;
 }
 
-/*
+/**
  * atl1e_clean_tx_ring - Free Tx-skb
  * @adapter: board private structure
  */
 static void atl1e_clean_tx_ring(struct atl1e_adapter *adapter)
 {
-        struct atl1e_tx_ring *tx_ring = (struct atl1e_tx_ring *)
-                                &adapter->tx_ring;
+        struct atl1e_tx_ring *tx_ring = &adapter->tx_ring;
         struct atl1e_tx_buffer *tx_buffer = NULL;
         struct pci_dev *pdev = adapter->pdev;
         u16 index, ring_count;
@@ -679,14 +666,14 @@ static void atl1e_clean_tx_ring(struct atl1e_adapter *adapter)
                                 ring_count);
 }
 
-/*
+/**
  * atl1e_clean_rx_ring - Free rx-reservation skbs
  * @adapter: board private structure
  */
 static void atl1e_clean_rx_ring(struct atl1e_adapter *adapter)
 {
         struct atl1e_rx_ring *rx_ring =
-                (struct atl1e_rx_ring *)&adapter->rx_ring;
+                &adapter->rx_ring;
         struct atl1e_rx_page_desc *rx_page_desc = rx_ring->rx_page_desc;
         u16 i, j;
 
@@ -762,7 +749,7 @@ static void atl1e_init_ring_ptrs(struct atl1e_adapter *adapter)
         }
 }
 
-/*
+/**
  * atl1e_free_ring_resources - Free Tx / RX descriptor Resources
  * @adapter: board private structure
  *
@@ -787,7 +774,7 @@ static void atl1e_free_ring_resources(struct atl1e_adapter *adapter)
         }
 }
 
-/*
+/**
  * atl1e_setup_mem_resources - allocate Tx / RX descriptor resources
  * @adapter: board private structure
  *
@@ -884,14 +871,12 @@ failed:
         return err;
 }
 
-static inline void atl1e_configure_des_ring(const struct atl1e_adapter *adapter)
+static inline void atl1e_configure_des_ring(struct atl1e_adapter *adapter)
 {
 
-        struct atl1e_hw *hw = (struct atl1e_hw *)&adapter->hw;
-        struct atl1e_rx_ring *rx_ring =
-                        (struct atl1e_rx_ring *)&adapter->rx_ring;
-        struct atl1e_tx_ring *tx_ring =
-                        (struct atl1e_tx_ring *)&adapter->tx_ring;
+        struct atl1e_hw *hw = &adapter->hw;
+        struct atl1e_rx_ring *rx_ring = &adapter->rx_ring;
+        struct atl1e_tx_ring *tx_ring = &adapter->tx_ring;
         struct atl1e_rx_page_desc *rx_page_desc = NULL;
         int i, j;
 
@@ -932,7 +917,7 @@ static inline void atl1e_configure_des_ring(const struct atl1e_adapter *adapter)
 
 static inline void atl1e_configure_tx(struct atl1e_adapter *adapter)
 {
-        struct atl1e_hw *hw = (struct atl1e_hw *)&adapter->hw;
+        struct atl1e_hw *hw = &adapter->hw;
         u32 dev_ctrl_data = 0;
         u32 max_pay_load = 0;
         u32 jumbo_thresh = 0;
@@ -975,7 +960,7 @@ static inline void atl1e_configure_tx(struct atl1e_adapter *adapter)
 
 static inline void atl1e_configure_rx(struct atl1e_adapter *adapter)
 {
-        struct atl1e_hw *hw = (struct atl1e_hw *)&adapter->hw;
+        struct atl1e_hw *hw = &adapter->hw;
         u32 rxf_len  = 0;
         u32 rxf_low  = 0;
         u32 rxf_high = 0;
@@ -1078,7 +1063,7 @@ static void atl1e_setup_mac_ctrl(struct atl1e_adapter *adapter)
         AT_WRITE_REG(hw, REG_MAC_CTRL, value);
 }
 
-/*
+/**
  * atl1e_configure - Configure Transmit&Receive Unit after Reset
  * @adapter: board private structure
  *
@@ -1148,7 +1133,7 @@ static int atl1e_configure(struct atl1e_adapter *adapter)
         return 0;
 }
 
-/*
+/**
  * atl1e_get_stats - Get System Network Statistics
  * @netdev: network interface device structure
  *
@@ -1224,8 +1209,7 @@ static inline void atl1e_clear_phy_int(struct atl1e_adapter *adapter)
 
 static bool atl1e_clean_tx_irq(struct atl1e_adapter *adapter)
 {
-        struct atl1e_tx_ring *tx_ring = (struct atl1e_tx_ring *)
-                                        &adapter->tx_ring;
+        struct atl1e_tx_ring *tx_ring = &adapter->tx_ring;
         struct atl1e_tx_buffer *tx_buffer = NULL;
         u16 hw_next_to_clean = AT_READ_REGW(&adapter->hw, REG_TPD_CONS_IDX);
         u16 next_to_clean = atomic_read(&tx_ring->next_to_clean);
@@ -1261,11 +1245,10 @@ static bool atl1e_clean_tx_irq(struct atl1e_adapter *adapter)
         return true;
 }
 
-/*
+/**
  * atl1e_intr - Interrupt Handler
  * @irq: interrupt number
  * @data: pointer to a network interface device structure
- * @pt_regs: CPU registers structure
  */
 static irqreturn_t atl1e_intr(int irq, void *data)
 {
@@ -1384,15 +1367,14 @@ static struct atl1e_rx_page *atl1e_get_rx_page(struct atl1e_adapter *adapter,
                 (struct atl1e_rx_page_desc *) adapter->rx_ring.rx_page_desc;
         u8 rx_using = rx_page_desc[que].rx_using;
 
-        return (struct atl1e_rx_page *)&(rx_page_desc[que].rx_page[rx_using]);
+        return &(rx_page_desc[que].rx_page[rx_using]);
 }
 
 static void atl1e_clean_rx_irq(struct atl1e_adapter *adapter, u8 que,
                    int *work_done, int work_to_do)
 {
         struct net_device *netdev  = adapter->netdev;
-        struct atl1e_rx_ring *rx_ring = (struct atl1e_rx_ring *)
-                                         &adapter->rx_ring;
+        struct atl1e_rx_ring *rx_ring = &adapter->rx_ring;
         struct atl1e_rx_page_desc *rx_page_desc =
                 (struct atl1e_rx_page_desc *) rx_ring->rx_page_desc;
         struct sk_buff *skb = NULL;
@@ -1494,9 +1476,8 @@ fatal_err:
                 schedule_work(&adapter->reset_task);
 }
 
-/*
+/**
  * atl1e_clean - NAPI Rx polling callback
- * @adapter: board private structure
  */
 static int atl1e_clean(struct napi_struct *napi, int budget)
 {
@@ -1576,7 +1557,7 @@ static struct atl1e_tpd_desc *atl1e_get_tpd(struct atl1e_adapter *adapter)
                 tx_ring->next_to_use = 0;
 
         memset(&tx_ring->desc[next_to_use], 0, sizeof(struct atl1e_tpd_desc));
-        return (struct atl1e_tpd_desc *)&tx_ring->desc[next_to_use];
+        return &tx_ring->desc[next_to_use];
 }
 
 static struct atl1e_tx_buffer *
@@ -1961,7 +1942,7 @@ void atl1e_down(struct atl1e_adapter *adapter)
         atl1e_clean_rx_ring(adapter);
 }
 
-/*
+/**
  * atl1e_open - Called when a network interface is made active
  * @netdev: network interface device structure
  *
@@ -2007,7 +1988,7 @@ err_req_irq:
         return err;
 }
 
-/*
+/**
  * atl1e_close - Disables a network interface
  * @netdev: network interface device structure
  *
@@ -2061,8 +2042,8 @@ static int atl1e_suspend(struct pci_dev *pdev, pm_message_t state)
 
         if (wufc) {
                 /* get link status */
-                atl1e_read_phy_reg(hw, MII_BMSR, (u16 *)&mii_bmsr_data);
-                atl1e_read_phy_reg(hw, MII_BMSR, (u16 *)&mii_bmsr_data);
+                atl1e_read_phy_reg(hw, MII_BMSR, &mii_bmsr_data);
+                atl1e_read_phy_reg(hw, MII_BMSR, &mii_bmsr_data);
 
                 mii_advertise_data = ADVERTISE_10HALF;
 
@@ -2086,7 +2067,7 @@ static int atl1e_suspend(struct pci_dev *pdev, pm_message_t state)
                                 for (i = 0; i < AT_SUSPEND_LINK_TIMEOUT; i++) {
                                         msleep(100);
                                         atl1e_read_phy_reg(hw, MII_BMSR,
-                                                        (u16 *)&mii_bmsr_data);
+                                                        &mii_bmsr_data);
                                         if (mii_bmsr_data & BMSR_LSTATUS)
                                                 break;
                                 }
@@ -2243,7 +2224,7 @@ static int atl1e_init_netdev(struct net_device *netdev, struct pci_dev *pdev)
         return 0;
 }
 
-/*
+/**
  * atl1e_probe - Device Initialization Routine
  * @pdev: PCI device information struct
  * @ent: entry in atl1e_pci_tbl
@@ -2397,7 +2378,7 @@ err_dma:
         return err;
 }
 
-/*
+/**
  * atl1e_remove - Device Removal Routine
  * @pdev: PCI device information struct
  *
@@ -2429,7 +2410,7 @@ static void __devexit atl1e_remove(struct pci_dev *pdev)
         pci_disable_device(pdev);
 }
 
-/*
+/**
  * atl1e_io_error_detected - called when PCI error is detected
  * @pdev: Pointer to PCI device
  * @state: The current pci connection state
@@ -2457,7 +2438,7 @@ atl1e_io_error_detected(struct pci_dev *pdev, pci_channel_state_t state)
         return PCI_ERS_RESULT_NEED_RESET;
 }
 
-/*
+/**
  * atl1e_io_slot_reset - called after the pci bus has been reset.
  * @pdev: Pointer to PCI device
  *
@@ -2484,7 +2465,7 @@ static pci_ers_result_t atl1e_io_slot_reset(struct pci_dev *pdev)
         return PCI_ERS_RESULT_RECOVERED;
 }
 
-/*
+/**
  * atl1e_io_resume - called when traffic can start flowing again.
  * @pdev: Pointer to PCI device
  *
@@ -2528,7 +2509,7 @@ static struct pci_driver atl1e_driver = {
         .err_handler = &atl1e_err_handler
 };
 
-/*
+/**
  * atl1e_init_module - Driver Registration Routine
  *
  * atl1e_init_module is the first routine called when the driver is
@@ -2539,7 +2520,7 @@ static int __init atl1e_init_module(void)
         return pci_register_driver(&atl1e_driver);
 }
 
-/*
+/**
  * atl1e_exit_module - Driver Exit Cleanup Routine
  *
  * atl1e_exit_module is called just before the driver is removed
diff --git a/drivers/net/ethernet/atheros/atl1e/atl1e_param.c b/drivers/net/ethernet/atheros/atl1e/atl1e_param.c
index 0ce60b6e7ef..b5086f1e637 100644
--- a/drivers/net/ethernet/atheros/atl1e/atl1e_param.c
+++ b/drivers/net/ethernet/atheros/atl1e/atl1e_param.c
@@ -168,7 +168,7 @@ static int __devinit atl1e_validate_option(int *value, struct atl1e_option *opt,
         return -1;
 }
 
-/*
+/**
  * atl1e_check_options - Range Checking for Command Line Parameters
  * @adapter: board private structure
  *
diff --git a/drivers/net/ethernet/atheros/atlx/atl1.c b/drivers/net/ethernet/atheros/atlx/atl1.c
index 5d10884e508..f2402f355ce 100644
--- a/drivers/net/ethernet/atheros/atlx/atl1.c
+++ b/drivers/net/ethernet/atheros/atlx/atl1.c
@@ -195,7 +195,7 @@ static int __devinit atl1_validate_option(int *value, struct atl1_option *opt,
         return -1;
 }
 
-/*
+/**
  * atl1_check_options - Range Checking for Command Line Parameters
  * @adapter: board private structure
  *
@@ -937,7 +937,7 @@ static void atl1_set_mac_addr(struct atl1_hw *hw)
         iowrite32(value, (hw->hw_addr + REG_MAC_STA_ADDR) + (1 << 2));
 }
 
-/*
+/**
  * atl1_sw_init - Initialize general software structures (struct atl1_adapter)
  * @adapter: board private structure to initialize
  *
@@ -1014,12 +1014,6 @@ static void mdio_write(struct net_device *netdev, int phy_id, int reg_num,
         atl1_write_phy_reg(&adapter->hw, reg_num, val);
 }
 
-/*
- * atl1_mii_ioctl -
- * @netdev:
- * @ifreq:
- * @cmd:
- */
 static int atl1_mii_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd)
 {
         struct atl1_adapter *adapter = netdev_priv(netdev);
@@ -1036,7 +1030,7 @@ static int atl1_mii_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd)
         return retval;
 }
 
-/*
+/**
  * atl1_setup_mem_resources - allocate Tx / RX descriptor resources
  * @adapter: board private structure
  *
@@ -1061,7 +1055,7 @@ static s32 atl1_setup_ring_resources(struct atl1_adapter *adapter)
                 goto err_nomem;
         }
         rfd_ring->buffer_info =
-                (struct atl1_buffer *)(tpd_ring->buffer_info + tpd_ring->count);
+                (tpd_ring->buffer_info + tpd_ring->count);
 
         /*
          * real ring DMA buffer
@@ -1147,7 +1141,7 @@ static void atl1_init_ring_ptrs(struct atl1_adapter *adapter)
         atomic_set(&rrd_ring->next_to_clean, 0);
 }
 
-/*
+/**
  * atl1_clean_rx_ring - Free RFD Buffers
  * @adapter: board private structure
  */
@@ -1187,7 +1181,7 @@ static void atl1_clean_rx_ring(struct atl1_adapter *adapter)
         atomic_set(&rrd_ring->next_to_clean, 0);
 }
 
-/*
+/**
  * atl1_clean_tx_ring - Free Tx Buffers
  * @adapter: board private structure
  */
@@ -1227,7 +1221,7 @@ static void atl1_clean_tx_ring(struct atl1_adapter *adapter)
         atomic_set(&tpd_ring->next_to_clean, 0);
 }
 
-/*
+/**
  * atl1_free_ring_resources - Free Tx / RX descriptor Resources
  * @adapter: board private structure
  *
@@ -1470,7 +1464,7 @@ static void set_flow_ctrl_new(struct atl1_hw *hw)
         iowrite32(value, hw->hw_addr + REG_RXQ_RRD_PAUSE_THRESH);
 }
 
-/*
+/**
  * atl1_configure - Configure Transmit&Receive Unit after Reset
  * @adapter: board private structure
  *
@@ -1844,7 +1838,7 @@ static void atl1_rx_checksum(struct atl1_adapter *adapter,
         }
 }
 
-/*
+/**
  * atl1_alloc_rx_buffers - Replace used receive buffers
  * @adapter: address of board private structure
  */
@@ -2489,11 +2483,10 @@ static inline int atl1_sched_rings_clean(struct atl1_adapter* adapter)
         return 1;
 }
 
-/*
+/**
  * atl1_intr - Interrupt Handler
  * @irq: interrupt number
  * @data: pointer to a network interface device structure
- * @pt_regs: CPU registers structure
  */
 static irqreturn_t atl1_intr(int irq, void *data)
 {
@@ -2574,7 +2567,7 @@ static irqreturn_t atl1_intr(int irq, void *data)
 }
 
 
-/*
+/**
  * atl1_phy_config - Timer Call-back
  * @data: pointer to netdev cast into an unsigned long
  */
@@ -2693,7 +2686,7 @@ static void atl1_reset_dev_task(struct work_struct *work)
         netif_device_attach(netdev);
 }
 
-/*
+/**
  * atl1_change_mtu - Change the Maximum Transfer Unit
  * @netdev: network interface device structure
  * @new_mtu: new value for maximum frame size
@@ -2727,7 +2720,7 @@ static int atl1_change_mtu(struct net_device *netdev, int new_mtu)
         return 0;
 }
 
-/*
+/**
  * atl1_open - Called when a network interface is made active
  * @netdev: network interface device structure
  *
@@ -2762,7 +2755,7 @@ err_up:
         return err;
 }
 
-/*
+/**
  * atl1_close - Disables a network interface
  * @netdev: network interface device structure
  *
@@ -2930,7 +2923,7 @@ static const struct net_device_ops atl1_netdev_ops = {
 #endif
 };
 
-/*
+/**
  * atl1_probe - Device Initialization Routine
  * @pdev: PCI device information struct
  * @ent: entry in atl1_pci_tbl
@@ -3111,7 +3104,7 @@ err_request_regions:
         return err;
 }
 
-/*
+/**
  * atl1_remove - Device Removal Routine
  * @pdev: PCI device information struct
  *
@@ -3158,7 +3151,7 @@ static struct pci_driver atl1_driver = {
         .driver.pm = ATL1_PM_OPS,
 };
 
-/*
+/**
  * atl1_exit_module - Driver Exit Cleanup Routine
  *
  * atl1_exit_module is called just before the driver is removed
@@ -3169,7 +3162,7 @@ static void __exit atl1_exit_module(void)
         pci_unregister_driver(&atl1_driver);
 }
 
-/*
+/**
  * atl1_init_module - Driver Registration Routine
  *
  * atl1_init_module is the first routine called when the driver is
diff --git a/drivers/net/ethernet/atheros/atlx/atl2.c b/drivers/net/ethernet/atheros/atlx/atl2.c
index 6762dc406b2..7c0b7e2bcb6 100644
--- a/drivers/net/ethernet/atheros/atlx/atl2.c
+++ b/drivers/net/ethernet/atheros/atlx/atl2.c
@@ -75,7 +75,7 @@ static void atl2_set_ethtool_ops(struct net_device *netdev);
 
 static void atl2_check_options(struct atl2_adapter *adapter);
 
-/*
+/**
  * atl2_sw_init - Initialize general software structures (struct atl2_adapter)
  * @adapter: board private structure to initialize
  *
@@ -123,7 +123,7 @@ static int __devinit atl2_sw_init(struct atl2_adapter *adapter)
         return 0;
 }
 
-/*
+/**
  * atl2_set_multi - Multicast and Promiscuous mode set
  * @netdev: network interface device structure
  *
@@ -177,7 +177,7 @@ static void init_ring_ptrs(struct atl2_adapter *adapter)
         adapter->txs_next_clear = 0;
 }
 
-/*
+/**
  * atl2_configure - Configure Transmit&Receive Unit after Reset
  * @adapter: board private structure
  *
@@ -283,7 +283,7 @@ static int atl2_configure(struct atl2_adapter *adapter)
         return value;
 }
 
-/*
+/**
  * atl2_setup_ring_resources - allocate Tx / RX descriptor resources
  * @adapter: board private structure
  *
@@ -340,7 +340,7 @@ static s32 atl2_setup_ring_resources(struct atl2_adapter *adapter)
         return 0;
 }
 
-/*
+/**
  * atl2_irq_enable - Enable default interrupt generation settings
  * @adapter: board private structure
  */
@@ -350,7 +350,7 @@ static inline void atl2_irq_enable(struct atl2_adapter *adapter)
         ATL2_WRITE_FLUSH(&adapter->hw);
 }
 
-/*
+/**
  * atl2_irq_disable - Mask off interrupt generation on the NIC
  * @adapter: board private structure
  */
@@ -599,11 +599,10 @@ static inline void atl2_clear_phy_int(struct atl2_adapter *adapter)
         spin_unlock(&adapter->stats_lock);
 }
 
-/*
+/**
  * atl2_intr - Interrupt Handler
  * @irq: interrupt number
  * @data: pointer to a network interface device structure
- * @pt_regs: CPU registers structure
  */
 static irqreturn_t atl2_intr(int irq, void *data)
 {
@@ -679,7 +678,7 @@ static int atl2_request_irq(struct atl2_adapter *adapter)
                 netdev);
 }
 
-/*
+/**
  * atl2_free_ring_resources - Free Tx / RX descriptor Resources
  * @adapter: board private structure
  *
@@ -692,7 +691,7 @@ static void atl2_free_ring_resources(struct atl2_adapter *adapter)
                 adapter->ring_dma);
 }
 
-/*
+/**
  * atl2_open - Called when a network interface is made active
  * @netdev: network interface device structure
  *
@@ -798,7 +797,7 @@ static void atl2_free_irq(struct atl2_adapter *adapter)
 #endif
 }
 
-/*
+/**
  * atl2_close - Disables a network interface
  * @netdev: network interface device structure
  *
@@ -918,7 +917,7 @@ static netdev_tx_t atl2_xmit_frame(struct sk_buff *skb,
         return NETDEV_TX_OK;
 }
 
-/*
+/**
  * atl2_change_mtu - Change the Maximum Transfer Unit
  * @netdev: network interface device structure
  * @new_mtu: new value for maximum frame size
@@ -943,7 +942,7 @@ static int atl2_change_mtu(struct net_device *netdev, int new_mtu)
         return 0;
 }
 
-/*
+/**
  * atl2_set_mac - Change the Ethernet Address of the NIC
  * @netdev: network interface device structure
  * @p: pointer to an address structure
@@ -969,12 +968,6 @@ static int atl2_set_mac(struct net_device *netdev, void *p)
         return 0;
 }
 
-/*
- * atl2_mii_ioctl -
- * @netdev:
- * @ifreq:
- * @cmd:
- */
 static int atl2_mii_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd)
 {
         struct atl2_adapter *adapter = netdev_priv(netdev);
@@ -1011,12 +1004,6 @@ static int atl2_mii_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd)
         return 0;
 }
 
-/*
- * atl2_ioctl -
- * @netdev:
- * @ifreq:
- * @cmd:
- */
 static int atl2_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd)
 {
         switch (cmd) {
@@ -1033,7 +1020,7 @@ static int atl2_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd)
         }
 }
 
-/*
+/**
  * atl2_tx_timeout - Respond to a Tx Hang
  * @netdev: network interface device structure
  */
@@ -1045,7 +1032,7 @@ static void atl2_tx_timeout(struct net_device *netdev)
         schedule_work(&adapter->reset_task);
 }
 
-/*
+/**
  * atl2_watchdog - Timer Call-back
  * @data: pointer to netdev cast into an unsigned long
  */
@@ -1070,7 +1057,7 @@ static void atl2_watchdog(unsigned long data)
         }
 }
 
-/*
+/**
  * atl2_phy_config - Timer Call-back
  * @data: pointer to netdev cast into an unsigned long
  */
@@ -1274,9 +1261,8 @@ static int atl2_check_link(struct atl2_adapter *adapter)
         return 0;
 }
 
-/*
+/**
  * atl2_link_chg_task - deal with link change event Out of interrupt context
- * @netdev: network interface device structure
  */
 static void atl2_link_chg_task(struct work_struct *work)
 {
@@ -1341,7 +1327,7 @@ static const struct net_device_ops atl2_netdev_ops = {
 #endif
 };
 
-/*
+/**
  * atl2_probe - Device Initialization Routine
  * @pdev: PCI device information struct
  * @ent: entry in atl2_pci_tbl
@@ -1501,7 +1487,7 @@ err_dma:
         return err;
 }
 
-/*
+/**
  * atl2_remove - Device Removal Routine
  * @pdev: PCI device information struct
  *
@@ -1728,7 +1714,7 @@ static struct pci_driver atl2_driver = {
         .shutdown = atl2_shutdown,
 };
 
-/*
+/**
  * atl2_init_module - Driver Registration Routine
  *
  * atl2_init_module is the first routine called when the driver is
@@ -1743,7 +1729,7 @@ static int __init atl2_init_module(void)
 }
 module_init(atl2_init_module);
 
-/*
+/**
  * atl2_exit_module - Driver Exit Cleanup Routine
  *
  * atl2_exit_module is called just before the driver is removed
@@ -2997,7 +2983,7 @@ static int __devinit atl2_validate_option(int *value, struct atl2_option *opt)
         return -1;
 }
 
-/*
+/**
  * atl2_check_options - Range Checking for Command Line Parameters
  * @adapter: board private structure
  *
diff --git a/drivers/net/ethernet/atheros/atlx/atlx.c b/drivers/net/ethernet/atheros/atlx/atlx.c
index b4f3aa49a7f..77ffbc4a507 100644
--- a/drivers/net/ethernet/atheros/atlx/atlx.c
+++ b/drivers/net/ethernet/atheros/atlx/atlx.c
@@ -64,7 +64,7 @@ static int atlx_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd)
         }
 }
 
-/*
+/**
  * atlx_set_mac - Change the Ethernet Address of the NIC
  * @netdev: network interface device structure
  * @p: pointer to an address structure
@@ -115,7 +115,7 @@ static void atlx_check_for_link(struct atlx_adapter *adapter)
         schedule_work(&adapter->link_chg_task);
 }
 
-/*
+/**
  * atlx_set_multi - Multicast and Promiscuous mode set
  * @netdev: network interface device structure
  *
@@ -162,7 +162,7 @@ static inline void atlx_imr_set(struct atlx_adapter *adapter,
         ioread32(adapter->hw.hw_addr + REG_IMR);
 }
 
-/*
+/**
  * atlx_irq_enable - Enable default interrupt generation settings
  * @adapter: board private structure
  */
@@ -172,7 +172,7 @@ static void atlx_irq_enable(struct atlx_adapter *adapter)
         adapter->int_enabled = true;
 }
 
-/*
+/**
  * atlx_irq_disable - Mask off interrupt generation on the NIC
  * @adapter: board private structure
  */
@@ -193,7 +193,7 @@ static void atlx_clear_phy_int(struct atlx_adapter *adapter)
         spin_unlock_irqrestore(&adapter->lock, flags);
 }
 
-/*
+/**
  * atlx_tx_timeout - Respond to a Tx Hang
  * @netdev: network interface device structure
  */
diff --git a/drivers/net/ethernet/broadcom/bnx2.c b/drivers/net/ethernet/broadcom/bnx2.c
index 1fa4927a45b..0ced154129a 100644
--- a/drivers/net/ethernet/broadcom/bnx2.c
+++ b/drivers/net/ethernet/broadcom/bnx2.c
@@ -14,6 +14,7 @@
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 
+#include <linux/stringify.h>
 #include <linux/kernel.h>
 #include <linux/timer.h>
 #include <linux/errno.h>
@@ -57,8 +58,8 @@
 #include "bnx2_fw.h"
 
 #define DRV_MODULE_NAME         "bnx2"
-#define DRV_MODULE_VERSION      "2.2.1"
-#define DRV_MODULE_RELDATE      "Dec 18, 2011"
+#define DRV_MODULE_VERSION      "2.2.3"
+#define DRV_MODULE_RELDATE      "June 27, 2012"
 #define FW_MIPS_FILE_06         "bnx2/bnx2-mips-06-6.2.3.fw"
 #define FW_RV2P_FILE_06         "bnx2/bnx2-rv2p-06-6.0.15.fw"
 #define FW_MIPS_FILE_09         "bnx2/bnx2-mips-09-6.2.1b.fw"
@@ -872,8 +873,7 @@ bnx2_alloc_mem(struct bnx2 *bp)
 
                         bnapi = &bp->bnx2_napi[i];
 
-                        sblk = (void *) (status_blk +
-                                         BNX2_SBLK_MSIX_ALIGN_SIZE * i);
+                        sblk = (status_blk + BNX2_SBLK_MSIX_ALIGN_SIZE * i);
                         bnapi->status_blk.msix = sblk;
                         bnapi->hw_tx_cons_ptr =
                                 &sblk->status_tx_quick_consumer_index;
@@ -1972,22 +1972,26 @@ bnx2_remote_phy_event(struct bnx2 *bp)
                 switch (speed) {
                         case BNX2_LINK_STATUS_10HALF:
                                 bp->duplex = DUPLEX_HALF;
+                                /* fall through */
                         case BNX2_LINK_STATUS_10FULL:
                                 bp->line_speed = SPEED_10;
                                 break;
                         case BNX2_LINK_STATUS_100HALF:
                                 bp->duplex = DUPLEX_HALF;
+                                /* fall through */
                         case BNX2_LINK_STATUS_100BASE_T4:
                         case BNX2_LINK_STATUS_100FULL:
                                 bp->line_speed = SPEED_100;
                                 break;
                         case BNX2_LINK_STATUS_1000HALF:
                                 bp->duplex = DUPLEX_HALF;
+                                /* fall through */
                         case BNX2_LINK_STATUS_1000FULL:
                                 bp->line_speed = SPEED_1000;
                                 break;
                         case BNX2_LINK_STATUS_2500HALF:
                                 bp->duplex = DUPLEX_HALF;
+                                /* fall through */
                         case BNX2_LINK_STATUS_2500FULL:
                                 bp->line_speed = SPEED_2500;
                                 break;
@@ -2473,6 +2477,7 @@ bnx2_dump_mcp_state(struct bnx2 *bp)
                    bnx2_shmem_rd(bp, BNX2_BC_STATE_RESET_TYPE));
         pr_cont(" condition[%08x]\n",
                 bnx2_shmem_rd(bp, BNX2_BC_STATE_CONDITION));
+        DP_SHMEM_LINE(bp, BNX2_BC_RESET_TYPE);
         DP_SHMEM_LINE(bp, 0x3cc);
         DP_SHMEM_LINE(bp, 0x3dc);
         DP_SHMEM_LINE(bp, 0x3ec);
@@ -6245,7 +6250,7 @@ bnx2_enable_msix(struct bnx2 *bp, int msix_vecs)
 static int
 bnx2_setup_int_mode(struct bnx2 *bp, int dis_msi)
 {
-        int cpus = num_online_cpus();
+        int cpus = netif_get_num_default_rss_queues();
         int msix_vecs;
 
         if (!bp->num_req_rx_rings)
@@ -6406,6 +6411,75 @@ bnx2_reset_task(struct work_struct *work)
         rtnl_unlock();
 }
 
+#define BNX2_FTQ_ENTRY(ftq) { __stringify(ftq##FTQ_CTL), BNX2_##ftq##FTQ_CTL }
+
+static void
+bnx2_dump_ftq(struct bnx2 *bp)
+{
+        int i;
+        u32 reg, bdidx, cid, valid;
+        struct net_device *dev = bp->dev;
+        static const struct ftq_reg {
+                char *name;
+                u32 off;
+        } ftq_arr[] = {
+                BNX2_FTQ_ENTRY(RV2P_P),
+                BNX2_FTQ_ENTRY(RV2P_T),
+                BNX2_FTQ_ENTRY(RV2P_M),
+                BNX2_FTQ_ENTRY(TBDR_),
+                BNX2_FTQ_ENTRY(TDMA_),
+                BNX2_FTQ_ENTRY(TXP_),
+                BNX2_FTQ_ENTRY(TXP_),
+                BNX2_FTQ_ENTRY(TPAT_),
+                BNX2_FTQ_ENTRY(RXP_C),
+                BNX2_FTQ_ENTRY(RXP_),
+                BNX2_FTQ_ENTRY(COM_COMXQ_),
+                BNX2_FTQ_ENTRY(COM_COMTQ_),
+                BNX2_FTQ_ENTRY(COM_COMQ_),
+                BNX2_FTQ_ENTRY(CP_CPQ_),
+        };
+
+        netdev_err(dev, "<--- start FTQ dump --->\n");
+        for (i = 0; i < ARRAY_SIZE(ftq_arr); i++)
+                netdev_err(dev, "%s %08x\n", ftq_arr[i].name,
+                           bnx2_reg_rd_ind(bp, ftq_arr[i].off));
+
+        netdev_err(dev, "CPU states:\n");
+        for (reg = BNX2_TXP_CPU_MODE; reg <= BNX2_CP_CPU_MODE; reg += 0x40000)
+                netdev_err(dev, "%06x mode %x state %x evt_mask %x pc %x pc %x instr %x\n",
+                           reg, bnx2_reg_rd_ind(bp, reg),
+                           bnx2_reg_rd_ind(bp, reg + 4),
+                           bnx2_reg_rd_ind(bp, reg + 8),
+                           bnx2_reg_rd_ind(bp, reg + 0x1c),
+                           bnx2_reg_rd_ind(bp, reg + 0x1c),
+                           bnx2_reg_rd_ind(bp, reg + 0x20));
+
+        netdev_err(dev, "<--- end FTQ dump --->\n");
+        netdev_err(dev, "<--- start TBDC dump --->\n");
+        netdev_err(dev, "TBDC free cnt: %ld\n",
+                   REG_RD(bp, BNX2_TBDC_STATUS) & BNX2_TBDC_STATUS_FREE_CNT);
+        netdev_err(dev, "LINE     CID  BIDX   CMD  VALIDS\n");
+        for (i = 0; i < 0x20; i++) {
+                int j = 0;
+
+                REG_WR(bp, BNX2_TBDC_BD_ADDR, i);
+                REG_WR(bp, BNX2_TBDC_CAM_OPCODE,
+                       BNX2_TBDC_CAM_OPCODE_OPCODE_CAM_READ);
+                REG_WR(bp, BNX2_TBDC_COMMAND, BNX2_TBDC_COMMAND_CMD_REG_ARB);
+                while ((REG_RD(bp, BNX2_TBDC_COMMAND) &
+                        BNX2_TBDC_COMMAND_CMD_REG_ARB) && j < 100)
+                        j++;
+
+                cid = REG_RD(bp, BNX2_TBDC_CID);
+                bdidx = REG_RD(bp, BNX2_TBDC_BIDX);
+                valid = REG_RD(bp, BNX2_TBDC_CAM_OPCODE);
+                netdev_err(dev, "%02x    %06x  %04lx   %02x    [%x]\n",
+                           i, cid, bdidx & BNX2_TBDC_BDIDX_BDIDX,
+                           bdidx >> 24, (valid >> 8) & 0x0ff);
+        }
+        netdev_err(dev, "<--- end TBDC dump --->\n");
+}
+
 static void
 bnx2_dump_state(struct bnx2 *bp)
 {
@@ -6435,6 +6509,7 @@ bnx2_tx_timeout(struct net_device *dev)
 {
         struct bnx2 *bp = netdev_priv(dev);
 
+        bnx2_dump_ftq(bp);
         bnx2_dump_state(bp);
         bnx2_dump_mcp_state(bp);
 
@@ -6628,6 +6703,7 @@ bnx2_close(struct net_device *dev)
 
         bnx2_disable_int_sync(bp);
         bnx2_napi_disable(bp);
+        netif_tx_disable(dev);
         del_timer_sync(&bp->timer);
         bnx2_shutdown_chip(bp);
         bnx2_free_irq(bp);
@@ -7832,7 +7908,7 @@ bnx2_get_5709_media(struct bnx2 *bp)
         else
                 strap = (val & BNX2_MISC_DUAL_MEDIA_CTRL_PHY_CTRL_STRAP) >> 8;
 
-        if (PCI_FUNC(bp->pdev->devfn) == 0) {
+        if (bp->func == 0) {
                 switch (strap) {
                 case 0x4:
                 case 0x5:
@@ -8131,9 +8207,12 @@ bnx2_init_board(struct pci_dev *pdev, struct net_device *dev)
 
         reg = bnx2_reg_rd_ind(bp, BNX2_SHM_HDR_SIGNATURE);
 
+        if (bnx2_reg_rd_ind(bp, BNX2_MCP_TOE_ID) & BNX2_MCP_TOE_ID_FUNCTION_ID)
+                bp->func = 1;
+
         if ((reg & BNX2_SHM_HDR_SIGNATURE_SIG_MASK) ==
             BNX2_SHM_HDR_SIGNATURE_SIG) {
-                u32 off = PCI_FUNC(pdev->devfn) << 2;
+                u32 off = bp->func << 2;
 
                 bp->shmem_base = bnx2_reg_rd_ind(bp, BNX2_SHM_HDR_ADDR_0 + off);
         } else
diff --git a/drivers/net/ethernet/broadcom/bnx2.h b/drivers/net/ethernet/broadcom/bnx2.h
index dc06bda73be..af6451dec29 100644
--- a/drivers/net/ethernet/broadcom/bnx2.h
+++ b/drivers/net/ethernet/broadcom/bnx2.h
@@ -4642,6 +4642,47 @@ struct l2_fhdr {
 #define BNX2_TBDR_FTQ_CTL_CUR_DEPTH                      (0x3ffL<<22)
 
 
+/*
+ *  tbdc definition
+ *  offset: 0x5400
+ */
+#define BNX2_TBDC_COMMAND                               0x5400
+#define BNX2_TBDC_COMMAND_CMD_ENABLED                    (1UL<<0)
+#define BNX2_TBDC_COMMAND_CMD_FLUSH                      (1UL<<1)
+#define BNX2_TBDC_COMMAND_CMD_SOFT_RST                   (1UL<<2)
+#define BNX2_TBDC_COMMAND_CMD_REG_ARB                    (1UL<<3)
+#define BNX2_TBDC_COMMAND_WRCHK_RANGE_ERROR              (1UL<<4)
+#define BNX2_TBDC_COMMAND_WRCHK_ALL_ONES_ERROR           (1UL<<5)
+#define BNX2_TBDC_COMMAND_WRCHK_ALL_ZEROS_ERROR          (1UL<<6)
+#define BNX2_TBDC_COMMAND_WRCHK_ANY_ONES_ERROR           (1UL<<7)
+#define BNX2_TBDC_COMMAND_WRCHK_ANY_ZEROS_ERROR          (1UL<<8)
+
+#define BNX2_TBDC_STATUS                                0x5404
+#define BNX2_TBDC_STATUS_FREE_CNT                        (0x3fUL<<0)
+
+#define BNX2_TBDC_BD_ADDR                               0x5424
+
+#define BNX2_TBDC_BIDX                                  0x542c
+#define BNX2_TBDC_BDIDX_BDIDX                            (0xffffUL<<0)
+#define BNX2_TBDC_BDIDX_CMD                              (0xffUL<<24)
+
+#define BNX2_TBDC_CID                                   0x5430
+
+#define BNX2_TBDC_CAM_OPCODE                            0x5434
+#define BNX2_TBDC_CAM_OPCODE_OPCODE                      (0x7UL<<0)
+#define BNX2_TBDC_CAM_OPCODE_OPCODE_SEARCH               (0UL<<0)
+#define BNX2_TBDC_CAM_OPCODE_OPCODE_CACHE_WRITE          (1UL<<0)
+#define BNX2_TBDC_CAM_OPCODE_OPCODE_INVALIDATE           (2UL<<0)
+#define BNX2_TBDC_CAM_OPCODE_OPCODE_CAM_WRITE            (4UL<<0)
+#define BNX2_TBDC_CAM_OPCODE_OPCODE_CAM_READ             (5UL<<0)
+#define BNX2_TBDC_CAM_OPCODE_OPCODE_RAM_WRITE            (6UL<<0)
+#define BNX2_TBDC_CAM_OPCODE_OPCODE_RAM_READ             (7UL<<0)
+#define BNX2_TBDC_CAM_OPCODE_SMASK_BDIDX                 (1UL<<4)
+#define BNX2_TBDC_CAM_OPCODE_SMASK_CID                   (1UL<<5)
+#define BNX2_TBDC_CAM_OPCODE_SMASK_CMD                   (1UL<<6)
+#define BNX2_TBDC_CAM_OPCODE_WMT_FAILED                  (1UL<<7)
+#define BNX2_TBDC_CAM_OPCODE_CAM_VALIDS                  (0xffUL<<8)
+
 
 /*
  *  tdma_reg definition
@@ -6930,6 +6971,8 @@ struct bnx2 {
         struct bnx2_irq         irq_tbl[BNX2_MAX_MSIX_VEC];
         int                     irq_nvecs;
 
+        u8                      func;
+
         u8                      num_tx_rings;
         u8                      num_rx_rings;
 
@@ -7314,6 +7357,8 @@ struct bnx2_rv2p_fw_file {
 #define BNX2_BC_STATE_RESET_TYPE_VALUE(msg) (BNX2_BC_STATE_RESET_TYPE_SIG | \
                                              (msg))
 
+#define BNX2_BC_RESET_TYPE                      0x000001c0
+
 #define BNX2_BC_STATE                           0x000001c4
 #define BNX2_BC_STATE_ERR_MASK                   0x0000ff00
 #define BNX2_BC_STATE_SIGN                       0x42530000
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
index 7de82418497..52f33b8c41e 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
@@ -23,8 +23,8 @@
  * (you will need to reboot afterwards) */
 /* #define BNX2X_STOP_ON_ERROR */
 
-#define DRV_MODULE_VERSION      "1.72.50-0"
-#define DRV_MODULE_RELDATE      "2012/04/23"
+#define DRV_MODULE_VERSION      "1.72.51-0"
+#define DRV_MODULE_RELDATE      "2012/06/18"
 #define BNX2X_BC_VER            0x040200
 
 #if defined(CONFIG_DCB)
@@ -51,6 +51,7 @@
 
 #include "bnx2x_reg.h"
 #include "bnx2x_fw_defs.h"
+#include "bnx2x_mfw_req.h"
 #include "bnx2x_hsi.h"
 #include "bnx2x_link.h"
 #include "bnx2x_sp.h"
@@ -248,13 +249,12 @@ enum {
         BNX2X_MAX_CNIC_ETH_CL_ID_IDX,
 };
 
-#define BNX2X_CNIC_START_ETH_CID        48
-enum {
+#define BNX2X_CNIC_START_ETH_CID(bp)    (BNX2X_NUM_NON_CNIC_QUEUES(bp) *\
+                                         (bp)->max_cos)
         /* iSCSI L2 */
-        BNX2X_ISCSI_ETH_CID = BNX2X_CNIC_START_ETH_CID,
+#define BNX2X_ISCSI_ETH_CID(bp)         (BNX2X_CNIC_START_ETH_CID(bp))
         /* FCoE L2 */
-        BNX2X_FCOE_ETH_CID,
-};
+#define BNX2X_FCOE_ETH_CID(bp)          (BNX2X_CNIC_START_ETH_CID(bp) + 1)
 
 /** Additional rings budgeting */
 #ifdef BCM_CNIC
@@ -276,29 +276,30 @@ enum {
 #define FIRST_TX_ONLY_COS_INDEX         1
 #define FIRST_TX_COS_INDEX              0
 
-/* defines for decodeing the fastpath index and the cos index out of the
- * transmission queue index
- */
-#define MAX_TXQS_PER_COS        FP_SB_MAX_E1x
-
-#define TXQ_TO_FP(txq_index)    ((txq_index) % MAX_TXQS_PER_COS)
-#define TXQ_TO_COS(txq_index)   ((txq_index) / MAX_TXQS_PER_COS)
-
 /* rules for calculating the cids of tx-only connections */
-#define CID_TO_FP(cid)          ((cid) % MAX_TXQS_PER_COS)
-#define CID_COS_TO_TX_ONLY_CID(cid, cos)        (cid + cos * MAX_TXQS_PER_COS)
+#define CID_TO_FP(cid, bp)              ((cid) % BNX2X_NUM_NON_CNIC_QUEUES(bp))
+#define CID_COS_TO_TX_ONLY_CID(cid, cos, bp) \
+                                (cid + cos * BNX2X_NUM_NON_CNIC_QUEUES(bp))
 
 /* fp index inside class of service range */
-#define FP_COS_TO_TXQ(fp, cos)    ((fp)->index + cos * MAX_TXQS_PER_COS)
-
-/*
- * 0..15 eth cos0
- * 16..31 eth cos1 if applicable
- * 32..47 eth cos2 If applicable
- * fcoe queue follows eth queues (16, 32, 48 depending on cos)
+#define FP_COS_TO_TXQ(fp, cos, bp) \
+                        ((fp)->index + cos * BNX2X_NUM_NON_CNIC_QUEUES(bp))
+
+/* Indexes for transmission queues array:
+ * txdata for RSS i CoS j is at location i + (j * num of RSS)
+ * txdata for FCoE (if exist) is at location max cos * num of RSS
+ * txdata for FWD (if exist) is one location after FCoE
+ * txdata for OOO (if exist) is one location after FWD
  */
-#define MAX_ETH_TXQ_IDX(bp)     (MAX_TXQS_PER_COS * (bp)->max_cos)
-#define FCOE_TXQ_IDX(bp)        (MAX_ETH_TXQ_IDX(bp))
+enum {
+        FCOE_TXQ_IDX_OFFSET,
+        FWD_TXQ_IDX_OFFSET,
+        OOO_TXQ_IDX_OFFSET,
+};
+#define MAX_ETH_TXQ_IDX(bp)     (BNX2X_NUM_NON_CNIC_QUEUES(bp) * (bp)->max_cos)
+#ifdef BCM_CNIC
+#define FCOE_TXQ_IDX(bp)        (MAX_ETH_TXQ_IDX(bp) + FCOE_TXQ_IDX_OFFSET)
+#endif
 
 /* fast path */
 /*
@@ -453,6 +454,7 @@ struct bnx2x_agg_info {
         u16                     vlan_tag;
         u16                     len_on_bd;
         u32                     rxhash;
+        bool                    l4_rxhash;
         u16                     gro_size;
         u16                     full_page;
 };
@@ -481,6 +483,8 @@ struct bnx2x_fp_txdata {
         __le16                  *tx_cons_sb;
 
         int                     txq_index;
+        struct bnx2x_fastpath   *parent_fp;
+        int                     tx_ring_size;
 };
 
 enum bnx2x_tpa_mode_t {
@@ -507,7 +511,7 @@ struct bnx2x_fastpath {
         enum bnx2x_tpa_mode_t   mode;
 
         u8                      max_cos; /* actual number of active tx coses */
-        struct bnx2x_fp_txdata  txdata[BNX2X_MULTI_TX_COS];
+        struct bnx2x_fp_txdata  *txdata_ptr[BNX2X_MULTI_TX_COS];
 
         struct sw_rx_bd         *rx_buf_ring;   /* BDs mappings ring */
         struct sw_rx_page       *rx_page_ring;  /* SGE pages mappings ring */
@@ -547,51 +551,45 @@ struct bnx2x_fastpath {
                                 rx_calls;
 
         /* TPA related */
-        struct bnx2x_agg_info   tpa_info[ETH_MAX_AGGREGATION_QUEUES_E1H_E2];
+        struct bnx2x_agg_info   *tpa_info;
         u8                      disable_tpa;
 #ifdef BNX2X_STOP_ON_ERROR
         u64                     tpa_queue_used;
 #endif
-
-        struct tstorm_per_queue_stats old_tclient;
-        struct ustorm_per_queue_stats old_uclient;
-        struct xstorm_per_queue_stats old_xclient;
-        struct bnx2x_eth_q_stats eth_q_stats;
-        struct bnx2x_eth_q_stats_old eth_q_stats_old;
-
         /* The size is calculated using the following:
              sizeof name field from netdev structure +
              4 ('-Xx-' string) +
              4 (for the digits and to make it DWORD aligned) */
 #define FP_NAME_SIZE            (sizeof(((struct net_device *)0)->name) + 8)
         char                    name[FP_NAME_SIZE];
-
-        /* MACs object */
-        struct bnx2x_vlan_mac_obj mac_obj;
-
-        /* Queue State object */
-        struct bnx2x_queue_sp_obj q_obj;
-
 };
 
-#define bnx2x_fp(bp, nr, var)           (bp->fp[nr].var)
+#define bnx2x_fp(bp, nr, var)   ((bp)->fp[(nr)].var)
+#define bnx2x_sp_obj(bp, fp)    ((bp)->sp_objs[(fp)->index])
+#define bnx2x_fp_stats(bp, fp)  (&((bp)->fp_stats[(fp)->index]))
+#define bnx2x_fp_qstats(bp, fp) (&((bp)->fp_stats[(fp)->index].eth_q_stats))
 
 /* Use 2500 as a mini-jumbo MTU for FCoE */
 #define BNX2X_FCOE_MINI_JUMBO_MTU       2500
 
-/* FCoE L2 `fastpath' entry is right after the eth entries */
-#define FCOE_IDX                        BNX2X_NUM_ETH_QUEUES(bp)
-#define bnx2x_fcoe_fp(bp)               (&bp->fp[FCOE_IDX])
-#define bnx2x_fcoe(bp, var)             (bnx2x_fcoe_fp(bp)->var)
-#define bnx2x_fcoe_tx(bp, var)          (bnx2x_fcoe_fp(bp)-> \
-                                                txdata[FIRST_TX_COS_INDEX].var)
+#define FCOE_IDX_OFFSET         0
+
+#define FCOE_IDX(bp)            (BNX2X_NUM_NON_CNIC_QUEUES(bp) + \
+                                 FCOE_IDX_OFFSET)
+#define bnx2x_fcoe_fp(bp)       (&bp->fp[FCOE_IDX(bp)])
+#define bnx2x_fcoe(bp, var)     (bnx2x_fcoe_fp(bp)->var)
+#define bnx2x_fcoe_inner_sp_obj(bp)     (&bp->sp_objs[FCOE_IDX(bp)])
+#define bnx2x_fcoe_sp_obj(bp, var)      (bnx2x_fcoe_inner_sp_obj(bp)->var)
+#define bnx2x_fcoe_tx(bp, var)  (bnx2x_fcoe_fp(bp)-> \
+                                                txdata_ptr[FIRST_TX_COS_INDEX] \
+                                                ->var)
 
 
 #define IS_ETH_FP(fp)                   (fp->index < \
                                          BNX2X_NUM_ETH_QUEUES(fp->bp))
 #ifdef BCM_CNIC
-#define IS_FCOE_FP(fp)                  (fp->index == FCOE_IDX)
-#define IS_FCOE_IDX(idx)                ((idx) == FCOE_IDX)
+#define IS_FCOE_FP(fp)                  (fp->index == FCOE_IDX(fp->bp))
+#define IS_FCOE_IDX(idx)                ((idx) == FCOE_IDX(bp))
 #else
 #define IS_FCOE_FP(fp)          false
 #define IS_FCOE_IDX(idx)        false
@@ -978,8 +976,8 @@ union cdu_context {
 };
 
 /* CDU host DB constants */
-#define CDU_ILT_PAGE_SZ_HW      3
-#define CDU_ILT_PAGE_SZ         (8192 << CDU_ILT_PAGE_SZ_HW) /* 64K */
+#define CDU_ILT_PAGE_SZ_HW      2
+#define CDU_ILT_PAGE_SZ         (8192 << CDU_ILT_PAGE_SZ_HW) /* 32K */
 #define ILT_PAGE_CIDS           (CDU_ILT_PAGE_SZ / sizeof(union cdu_context))
 
 #ifdef BCM_CNIC
@@ -1182,11 +1180,31 @@ struct bnx2x_prev_path_list {
         struct list_head list;
 };
 
+struct bnx2x_sp_objs {
+        /* MACs object */
+        struct bnx2x_vlan_mac_obj mac_obj;
+
+        /* Queue State object */
+        struct bnx2x_queue_sp_obj q_obj;
+};
+
+struct bnx2x_fp_stats {
+        struct tstorm_per_queue_stats old_tclient;
+        struct ustorm_per_queue_stats old_uclient;
+        struct xstorm_per_queue_stats old_xclient;
+        struct bnx2x_eth_q_stats eth_q_stats;
+        struct bnx2x_eth_q_stats_old eth_q_stats_old;
+};
+
 struct bnx2x {
         /* Fields used in the tx and intr/napi performance paths
          * are grouped together in the beginning of the structure
          */
         struct bnx2x_fastpath   *fp;
+        struct bnx2x_sp_objs    *sp_objs;
+        struct bnx2x_fp_stats   *fp_stats;
+        struct bnx2x_fp_txdata  *bnx2x_txq;
+        int                     bnx2x_txq_size;
         void __iomem            *regview;
         void __iomem            *doorbells;
         u16                     db_size;
@@ -1301,7 +1319,9 @@ struct bnx2x {
 #define NO_ISCSI_FLAG                   (1 << 14)
 #define NO_FCOE_FLAG                    (1 << 15)
 #define BC_SUPPORTS_PFC_STATS           (1 << 17)
+#define BC_SUPPORTS_FCOE_FEATURES       (1 << 19)
 #define USING_SINGLE_MSIX_FLAG          (1 << 20)
+#define BC_SUPPORTS_DCBX_MSG_NON_PMF    (1 << 21)
 
 #define NO_ISCSI(bp)            ((bp)->flags & NO_ISCSI_FLAG)
 #define NO_ISCSI_OOO(bp)        ((bp)->flags & NO_ISCSI_OOO_FLAG)
@@ -1377,6 +1397,7 @@ struct bnx2x {
 #define BNX2X_MAX_COS                   3
 #define BNX2X_MAX_TX_COS                2
         int                     num_queues;
+        int                     num_napi_queues;
         int                     disable_tpa;
 
         u32                     rx_mode;
@@ -1389,6 +1410,7 @@ struct bnx2x {
         u8                      igu_dsb_id;
         u8                      igu_base_sb;
         u8                      igu_sb_cnt;
+
         dma_addr_t              def_status_blk_mapping;
 
         struct bnx2x_slowpath   *slowpath;
@@ -1420,7 +1442,11 @@ struct bnx2x {
         dma_addr_t                      fw_stats_data_mapping;
         int                             fw_stats_data_sz;
 
-        struct hw_context       context;
+        /* For max 196 cids (64*3 + non-eth), 32KB ILT page size and 1KB
+         * context size we need 8 ILT entries.
+         */
+#define ILT_MAX_L2_LINES        8
+        struct hw_context       context[ILT_MAX_L2_LINES];
 
         struct bnx2x_ilt        *ilt;
 #define BP_ILT(bp)              ((bp)->ilt)
@@ -1433,13 +1459,14 @@ struct bnx2x {
 
 /*
  * Maximum CID count that might be required by the bnx2x:
- * Max Tss * Max_Tx_Multi_Cos + CNIC L2 Clients (FCoE and iSCSI related)
+ * Max RSS * Max_Tx_Multi_Cos + FCoE + iSCSI
  */
-#define BNX2X_L2_CID_COUNT(bp)  (MAX_TXQS_PER_COS * BNX2X_MULTI_TX_COS +\
-                                        NON_ETH_CONTEXT_USE + CNIC_PRESENT)
+#define BNX2X_L2_CID_COUNT(bp)  (BNX2X_NUM_ETH_QUEUES(bp) * BNX2X_MULTI_TX_COS \
+                                + NON_ETH_CONTEXT_USE + CNIC_PRESENT)
+#define BNX2X_L2_MAX_CID(bp)    (BNX2X_MAX_RSS_COUNT(bp) * BNX2X_MULTI_TX_COS \
+                                + NON_ETH_CONTEXT_USE + CNIC_PRESENT)
 #define L2_ILT_LINES(bp)        (DIV_ROUND_UP(BNX2X_L2_CID_COUNT(bp),\
                                         ILT_PAGE_CIDS))
-#define BNX2X_DB_SIZE(bp)       (BNX2X_L2_CID_COUNT(bp) * (1 << BNX2X_DB_SHIFT))
 
         int                     qm_cid_count;
 
@@ -1598,6 +1625,8 @@ struct bnx2x {
 extern int num_queues;
 #define BNX2X_NUM_QUEUES(bp)    (bp->num_queues)
 #define BNX2X_NUM_ETH_QUEUES(bp) (BNX2X_NUM_QUEUES(bp) - NON_ETH_CONTEXT_USE)
+#define BNX2X_NUM_NON_CNIC_QUEUES(bp)   (BNX2X_NUM_QUEUES(bp) - \
+                                         NON_ETH_CONTEXT_USE)
 #define BNX2X_NUM_RX_QUEUES(bp) BNX2X_NUM_QUEUES(bp)
 
 #define is_multi(bp)            (BNX2X_NUM_QUEUES(bp) > 1)
@@ -1656,6 +1685,9 @@ struct bnx2x_func_init_params {
                         continue;               \
                 else
 
+#define for_each_napi_rx_queue(bp, var) \
+        for ((var) = 0; (var) < bp->num_napi_queues; (var)++)
+
 /* Skip OOO FP */
 #define for_each_tx_queue(bp, var) \
         for ((var) = 0; (var) < BNX2X_NUM_QUEUES(bp); (var)++) \
@@ -1709,15 +1741,6 @@ int bnx2x_set_mac_one(struct bnx2x *bp, u8 *mac,
                       struct bnx2x_vlan_mac_obj *obj, bool set,
                       int mac_type, unsigned long *ramrod_flags);
 /**
- * Deletes all MACs configured for the specific MAC object.
- *
- * @param bp Function driver instance
- * @param mac_obj MAC object to cleanup
- *
- * @return zero if all MACs were cleaned
- */
-
-/**
  * bnx2x_del_all_macs - delete all MACs configured for the specific MAC object
  *
  * @bp:                 driver handle
@@ -1817,6 +1840,7 @@ static inline u32 reg_poll(struct bnx2x *bp, u32 reg, u32 expected, int ms,
 #define LOAD_NORMAL                     0
 #define LOAD_OPEN                       1
 #define LOAD_DIAG                       2
+#define LOAD_LOOPBACK_EXT               3
 #define UNLOAD_NORMAL                   0
 #define UNLOAD_CLOSE                    1
 #define UNLOAD_RECOVERY                 2
@@ -1899,13 +1923,17 @@ static inline u32 reg_poll(struct bnx2x *bp, u32 reg, u32 expected, int ms,
 #define PCICFG_LINK_SPEED               0xf0000
 #define PCICFG_LINK_SPEED_SHIFT         16
 
-
-#define BNX2X_NUM_TESTS                 7
+#define BNX2X_NUM_TESTS_SF              7
+#define BNX2X_NUM_TESTS_MF              3
+#define BNX2X_NUM_TESTS(bp)             (IS_MF(bp) ? BNX2X_NUM_TESTS_MF : \
+                                                     BNX2X_NUM_TESTS_SF)
 
 #define BNX2X_PHY_LOOPBACK              0
 #define BNX2X_MAC_LOOPBACK              1
+#define BNX2X_EXT_LOOPBACK              2
 #define BNX2X_PHY_LOOPBACK_FAILED       1
 #define BNX2X_MAC_LOOPBACK_FAILED       2
+#define BNX2X_EXT_LOOPBACK_FAILED       3
 #define BNX2X_LOOPBACK_FAILED           (BNX2X_MAC_LOOPBACK_FAILED | \
                                          BNX2X_PHY_LOOPBACK_FAILED)
 
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
index 8098eea9704..5aeb034fa05 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
@@ -40,12 +40,19 @@
  * Makes sure the contents of the bp->fp[to].napi is kept
  * intact. This is done by first copying the napi struct from
  * the target to the source, and then mem copying the entire
- * source onto the target
+ * source onto the target. Update txdata pointers and related
+ * content.
  */
 static inline void bnx2x_move_fp(struct bnx2x *bp, int from, int to)
 {
         struct bnx2x_fastpath *from_fp = &bp->fp[from];
         struct bnx2x_fastpath *to_fp = &bp->fp[to];
+        struct bnx2x_sp_objs *from_sp_objs = &bp->sp_objs[from];
+        struct bnx2x_sp_objs *to_sp_objs = &bp->sp_objs[to];
+        struct bnx2x_fp_stats *from_fp_stats = &bp->fp_stats[from];
+        struct bnx2x_fp_stats *to_fp_stats = &bp->fp_stats[to];
+        int old_max_eth_txqs, new_max_eth_txqs;
+        int old_txdata_index = 0, new_txdata_index = 0;
 
         /* Copy the NAPI object as it has been already initialized */
         from_fp->napi = to_fp->napi;
@@ -53,6 +60,30 @@ static inline void bnx2x_move_fp(struct bnx2x *bp, int from, int to)
         /* Move bnx2x_fastpath contents */
         memcpy(to_fp, from_fp, sizeof(*to_fp));
         to_fp->index = to;
+
+        /* move sp_objs contents as well, as their indices match fp ones */
+        memcpy(to_sp_objs, from_sp_objs, sizeof(*to_sp_objs));
+
+        /* move fp_stats contents as well, as their indices match fp ones */
+        memcpy(to_fp_stats, from_fp_stats, sizeof(*to_fp_stats));
+
+        /* Update txdata pointers in fp and move txdata content accordingly:
+         * Each fp consumes 'max_cos' txdata structures, so the index should be
+         * decremented by max_cos x delta.
+         */
+
+        old_max_eth_txqs = BNX2X_NUM_ETH_QUEUES(bp) * (bp)->max_cos;
+        new_max_eth_txqs = (BNX2X_NUM_ETH_QUEUES(bp) - from + to) *
+                                (bp)->max_cos;
+        if (from == FCOE_IDX(bp)) {
+                old_txdata_index = old_max_eth_txqs + FCOE_TXQ_IDX_OFFSET;
+                new_txdata_index = new_max_eth_txqs + FCOE_TXQ_IDX_OFFSET;
+        }
+
+        memcpy(&bp->bnx2x_txq[old_txdata_index],
+               &bp->bnx2x_txq[new_txdata_index],
+               sizeof(struct bnx2x_fp_txdata));
+        to_fp->txdata_ptr[0] = &bp->bnx2x_txq[new_txdata_index];
 }
 
 int load_count[2][3] = { {0} }; /* per-path: 0-common, 1-port0, 2-port1 */
@@ -264,12 +295,20 @@ static inline void bnx2x_update_sge_prod(struct bnx2x_fastpath *fp,
  * CQE (calculated by HW).
  */
 static u32 bnx2x_get_rxhash(const struct bnx2x *bp,
-                            const struct eth_fast_path_rx_cqe *cqe)
+                            const struct eth_fast_path_rx_cqe *cqe,
+                            bool *l4_rxhash)
 {
         /* Set Toeplitz hash from CQE */
         if ((bp->dev->features & NETIF_F_RXHASH) &&
-            (cqe->status_flags & ETH_FAST_PATH_RX_CQE_RSS_HASH_FLG))
+            (cqe->status_flags & ETH_FAST_PATH_RX_CQE_RSS_HASH_FLG)) {
+                enum eth_rss_hash_type htype;
+
+                htype = cqe->status_flags & ETH_FAST_PATH_RX_CQE_RSS_HASH_TYPE;
+                *l4_rxhash = (htype == TCP_IPV4_HASH_TYPE) ||
+                             (htype == TCP_IPV6_HASH_TYPE);
                 return le32_to_cpu(cqe->rss_hash_result);
+        }
+        *l4_rxhash = false;
         return 0;
 }
 
@@ -323,7 +362,7 @@ static void bnx2x_tpa_start(struct bnx2x_fastpath *fp, u16 queue,
         tpa_info->tpa_state = BNX2X_TPA_START;
         tpa_info->len_on_bd = le16_to_cpu(cqe->len_on_bd);
         tpa_info->placement_offset = cqe->placement_offset;
-        tpa_info->rxhash = bnx2x_get_rxhash(bp, cqe);
+        tpa_info->rxhash = bnx2x_get_rxhash(bp, cqe, &tpa_info->l4_rxhash);
         if (fp->mode == TPA_MODE_GRO) {
                 u16 gro_size = le16_to_cpu(cqe->pkt_len_or_gro_seg_len);
                 tpa_info->full_page =
@@ -479,7 +518,7 @@ static int bnx2x_fill_frag_skb(struct bnx2x *bp, struct bnx2x_fastpath *fp,
                    where we are and drop the whole packet */
                 err = bnx2x_alloc_rx_sge(bp, fp, sge_idx);
                 if (unlikely(err)) {
-                        fp->eth_q_stats.rx_skb_alloc_failed++;
+                        bnx2x_fp_qstats(bp, fp)->rx_skb_alloc_failed++;
                         return err;
                 }
 
@@ -558,6 +597,7 @@ static void bnx2x_tpa_stop(struct bnx2x *bp, struct bnx2x_fastpath *fp,
                 skb_reserve(skb, pad + NET_SKB_PAD);
                 skb_put(skb, len);
                 skb->rxhash = tpa_info->rxhash;
+                skb->l4_rxhash = tpa_info->l4_rxhash;
 
                 skb->protocol = eth_type_trans(skb, bp->dev);
                 skb->ip_summed = CHECKSUM_UNNECESSARY;
@@ -584,7 +624,7 @@ drop:
         /* drop the packet and keep the buffer in the bin */
         DP(NETIF_MSG_RX_STATUS,
            "Failed to allocate or map a new skb - dropping packet!\n");
-        fp->eth_q_stats.rx_skb_alloc_failed++;
+        bnx2x_fp_stats(bp, fp)->eth_q_stats.rx_skb_alloc_failed++;
 }
 
 static int bnx2x_alloc_rx_data(struct bnx2x *bp,
@@ -617,8 +657,10 @@ static int bnx2x_alloc_rx_data(struct bnx2x *bp,
         return 0;
 }
 
-static void bnx2x_csum_validate(struct sk_buff *skb, union eth_rx_cqe *cqe,
-                                struct bnx2x_fastpath *fp)
+static
+void bnx2x_csum_validate(struct sk_buff *skb, union eth_rx_cqe *cqe,
+                                 struct bnx2x_fastpath *fp,
+                                 struct bnx2x_eth_q_stats *qstats)
 {
         /* Do nothing if no IP/L4 csum validation was done */
 
@@ -632,7 +674,7 @@ static void bnx2x_csum_validate(struct sk_buff *skb, union eth_rx_cqe *cqe,
         if (cqe->fast_path_cqe.type_error_flags &
             (ETH_FAST_PATH_RX_CQE_IP_BAD_XSUM_FLG |
              ETH_FAST_PATH_RX_CQE_L4_BAD_XSUM_FLG))
-                fp->eth_q_stats.hw_csum_err++;
+                qstats->hw_csum_err++;
         else
                 skb->ip_summed = CHECKSUM_UNNECESSARY;
 }
@@ -679,6 +721,7 @@ int bnx2x_rx_int(struct bnx2x_fastpath *fp, int budget)
                 enum eth_rx_cqe_type cqe_fp_type;
                 u16 len, pad, queue;
                 u8 *data;
+                bool l4_rxhash;
 
 #ifdef BNX2X_STOP_ON_ERROR
                 if (unlikely(bp->panic))
@@ -776,7 +819,7 @@ int bnx2x_rx_int(struct bnx2x_fastpath *fp, int budget)
                         DP(NETIF_MSG_RX_ERR | NETIF_MSG_RX_STATUS,
                            "ERROR  flags %x  rx packet %u\n",
                            cqe_fp_flags, sw_comp_cons);
-                        fp->eth_q_stats.rx_err_discard_pkt++;
+                        bnx2x_fp_qstats(bp, fp)->rx_err_discard_pkt++;
                         goto reuse_rx;
                 }
 
@@ -789,7 +832,7 @@ int bnx2x_rx_int(struct bnx2x_fastpath *fp, int budget)
                         if (skb == NULL) {
                                 DP(NETIF_MSG_RX_ERR | NETIF_MSG_RX_STATUS,
                                    "ERROR  packet dropped because of alloc failure\n");
-                                fp->eth_q_stats.rx_skb_alloc_failed++;
+                                bnx2x_fp_qstats(bp, fp)->rx_skb_alloc_failed++;
                                 goto reuse_rx;
                         }
                         memcpy(skb->data, data + pad, len);
@@ -803,14 +846,15 @@ int bnx2x_rx_int(struct bnx2x_fastpath *fp, int budget)
                                 skb = build_skb(data, 0);
                                 if (unlikely(!skb)) {
                                         kfree(data);
-                                        fp->eth_q_stats.rx_skb_alloc_failed++;
+                                        bnx2x_fp_qstats(bp, fp)->
+                                                        rx_skb_alloc_failed++;
                                         goto next_rx;
                                 }
                                 skb_reserve(skb, pad);
                         } else {
                                 DP(NETIF_MSG_RX_ERR | NETIF_MSG_RX_STATUS,
                                    "ERROR  packet dropped because of alloc failure\n");
-                                fp->eth_q_stats.rx_skb_alloc_failed++;
+                                bnx2x_fp_qstats(bp, fp)->rx_skb_alloc_failed++;
 reuse_rx:
                                 bnx2x_reuse_rx_data(fp, bd_cons, bd_prod);
                                 goto next_rx;
@@ -821,13 +865,14 @@ reuse_rx:
                 skb->protocol = eth_type_trans(skb, bp->dev);
 
                 /* Set Toeplitz hash for a none-LRO skb */
-                skb->rxhash = bnx2x_get_rxhash(bp, cqe_fp);
+                skb->rxhash = bnx2x_get_rxhash(bp, cqe_fp, &l4_rxhash);
+                skb->l4_rxhash = l4_rxhash;
 
                 skb_checksum_none_assert(skb);
 
                 if (bp->dev->features & NETIF_F_RXCSUM)
-                        bnx2x_csum_validate(skb, cqe, fp);
-
+                        bnx2x_csum_validate(skb, cqe, fp,
+                                            bnx2x_fp_qstats(bp, fp));
 
                 skb_record_rx_queue(skb, fp->rx_queue);
 
@@ -888,7 +933,7 @@ static irqreturn_t bnx2x_msix_fp_int(int irq, void *fp_cookie)
         prefetch(fp->rx_cons_sb);
 
         for_each_cos_in_tx_queue(fp, cos)
-                prefetch(fp->txdata[cos].tx_cons_sb);
+                prefetch(fp->txdata_ptr[cos]->tx_cons_sb);
 
         prefetch(&fp->sb_running_index[SM_RX_ID]);
         napi_schedule(&bnx2x_fp(bp, fp->index, napi));
@@ -1205,7 +1250,7 @@ static void bnx2x_free_tx_skbs(struct bnx2x *bp)
         for_each_tx_queue(bp, i) {
                 struct bnx2x_fastpath *fp = &bp->fp[i];
                 for_each_cos_in_tx_queue(fp, cos) {
-                        struct bnx2x_fp_txdata *txdata = &fp->txdata[cos];
+                        struct bnx2x_fp_txdata *txdata = fp->txdata_ptr[cos];
                         unsigned pkts_compl = 0, bytes_compl = 0;
 
                         u16 sw_prod = txdata->tx_pkt_prod;
@@ -1217,7 +1262,8 @@ static void bnx2x_free_tx_skbs(struct bnx2x *bp)
                                 sw_cons++;
                         }
                         netdev_tx_reset_queue(
-                            netdev_get_tx_queue(bp->dev, txdata->txq_index));
+                                netdev_get_tx_queue(bp->dev,
+                                                    txdata->txq_index));
                 }
         }
 }
@@ -1325,7 +1371,7 @@ void bnx2x_free_irq(struct bnx2x *bp)
                 free_irq(bp->dev->irq, bp->dev);
 }
 
-int __devinit bnx2x_enable_msix(struct bnx2x *bp)
+int bnx2x_enable_msix(struct bnx2x *bp)
 {
         int msix_vec = 0, i, rc, req_cnt;
 
@@ -1579,6 +1625,8 @@ void bnx2x_set_num_queues(struct bnx2x *bp)
 #endif
         /* Add special queues */
         bp->num_queues += NON_ETH_CONTEXT_USE;
+
+        BNX2X_DEV_INFO("set number of queues to %d\n", bp->num_queues);
 }
 
 /**
@@ -1607,8 +1655,8 @@ static int bnx2x_set_real_num_queues(struct bnx2x *bp)
 {
         int rc, tx, rx;
 
-        tx = MAX_TXQS_PER_COS * bp->max_cos;
-        rx = BNX2X_NUM_ETH_QUEUES(bp);
+        tx = BNX2X_NUM_ETH_QUEUES(bp) * bp->max_cos;
+        rx = BNX2X_NUM_QUEUES(bp) - NON_ETH_CONTEXT_USE;
 
 /* account for fcoe queue */
 #ifdef BCM_CNIC
@@ -1666,14 +1714,13 @@ static void bnx2x_set_rx_buf_size(struct bnx2x *bp)
 static int bnx2x_init_rss_pf(struct bnx2x *bp)
 {
         int i;
-        u8 ind_table[T_ETH_INDIRECTION_TABLE_SIZE] = {0};
         u8 num_eth_queues = BNX2X_NUM_ETH_QUEUES(bp);
 
         /* Prepare the initial contents fo the indirection table if RSS is
          * enabled
          */
-        for (i = 0; i < sizeof(ind_table); i++)
-                ind_table[i] =
+        for (i = 0; i < sizeof(bp->rss_conf_obj.ind_table); i++)
+                bp->rss_conf_obj.ind_table[i] =
                         bp->fp->cl_id +
                         ethtool_rxfh_indir_default(i, num_eth_queues);
 
@@ -1685,12 +1732,11 @@ static int bnx2x_init_rss_pf(struct bnx2x *bp)
          * For 57712 and newer on the other hand it's a per-function
          * configuration.
          */
-        return bnx2x_config_rss_eth(bp, ind_table,
-                                    bp->port.pmf || !CHIP_IS_E1x(bp));
+        return bnx2x_config_rss_eth(bp, bp->port.pmf || !CHIP_IS_E1x(bp));
 }
 
 int bnx2x_config_rss_pf(struct bnx2x *bp, struct bnx2x_rss_config_obj *rss_obj,
-                        u8 *ind_table, bool config_hash)
+                        bool config_hash)
 {
         struct bnx2x_config_rss_params params = {NULL};
         int i;
@@ -1713,11 +1759,15 @@ int bnx2x_config_rss_pf(struct bnx2x *bp, struct bnx2x_rss_config_obj *rss_obj,
         __set_bit(BNX2X_RSS_IPV4_TCP, &params.rss_flags);
         __set_bit(BNX2X_RSS_IPV6, &params.rss_flags);
         __set_bit(BNX2X_RSS_IPV6_TCP, &params.rss_flags);
+        if (rss_obj->udp_rss_v4)
+                __set_bit(BNX2X_RSS_IPV4_UDP, &params.rss_flags);
+        if (rss_obj->udp_rss_v6)
+                __set_bit(BNX2X_RSS_IPV6_UDP, &params.rss_flags);
 
         /* Hash bits */
         params.rss_result_mask = MULTI_MASK;
 
-        memcpy(params.ind_table, ind_table, sizeof(params.ind_table));
+        memcpy(params.ind_table, rss_obj->ind_table, sizeof(params.ind_table));
 
         if (config_hash) {
                 /* RSS keys */
@@ -1754,7 +1804,7 @@ static void bnx2x_squeeze_objects(struct bnx2x *bp)
         int rc;
         unsigned long ramrod_flags = 0, vlan_mac_flags = 0;
         struct bnx2x_mcast_ramrod_params rparam = {NULL};
-        struct bnx2x_vlan_mac_obj *mac_obj = &bp->fp->mac_obj;
+        struct bnx2x_vlan_mac_obj *mac_obj = &bp->sp_objs->mac_obj;
 
         /***************** Cleanup MACs' object first *************************/
 
@@ -1765,7 +1815,7 @@ static void bnx2x_squeeze_objects(struct bnx2x *bp)
 
         /* Clean ETH primary MAC */
         __set_bit(BNX2X_ETH_MAC, &vlan_mac_flags);
-        rc = mac_obj->delete_all(bp, &bp->fp->mac_obj, &vlan_mac_flags,
+        rc = mac_obj->delete_all(bp, &bp->sp_objs->mac_obj, &vlan_mac_flags,
                                  &ramrod_flags);
         if (rc != 0)
                 BNX2X_ERR("Failed to clean ETH MACs: %d\n", rc);
@@ -1851,11 +1901,16 @@ bool bnx2x_test_firmware_version(struct bnx2x *bp, bool is_err)
 static void bnx2x_bz_fp(struct bnx2x *bp, int index)
 {
         struct bnx2x_fastpath *fp = &bp->fp[index];
+        struct bnx2x_fp_stats *fp_stats = &bp->fp_stats[index];
+
+        int cos;
         struct napi_struct orig_napi = fp->napi;
+        struct bnx2x_agg_info *orig_tpa_info = fp->tpa_info;
         /* bzero bnx2x_fastpath contents */
-        if (bp->stats_init)
+        if (bp->stats_init) {
+                memset(fp->tpa_info, 0, sizeof(*fp->tpa_info));
                 memset(fp, 0, sizeof(*fp));
-        else {
+        } else {
                 /* Keep Queue statistics */
                 struct bnx2x_eth_q_stats *tmp_eth_q_stats;
                 struct bnx2x_eth_q_stats_old *tmp_eth_q_stats_old;
@@ -1863,26 +1918,27 @@ static void bnx2x_bz_fp(struct bnx2x *bp, int index)
                 tmp_eth_q_stats = kzalloc(sizeof(struct bnx2x_eth_q_stats),
                                           GFP_KERNEL);
                 if (tmp_eth_q_stats)
-                        memcpy(tmp_eth_q_stats, &fp->eth_q_stats,
+                        memcpy(tmp_eth_q_stats, &fp_stats->eth_q_stats,
                                sizeof(struct bnx2x_eth_q_stats));
 
                 tmp_eth_q_stats_old =
                         kzalloc(sizeof(struct bnx2x_eth_q_stats_old),
                                 GFP_KERNEL);
                 if (tmp_eth_q_stats_old)
-                        memcpy(tmp_eth_q_stats_old, &fp->eth_q_stats_old,
+                        memcpy(tmp_eth_q_stats_old, &fp_stats->eth_q_stats_old,
                                sizeof(struct bnx2x_eth_q_stats_old));
 
+                memset(fp->tpa_info, 0, sizeof(*fp->tpa_info));
                 memset(fp, 0, sizeof(*fp));
 
                 if (tmp_eth_q_stats) {
-                        memcpy(&fp->eth_q_stats, tmp_eth_q_stats,
-                                   sizeof(struct bnx2x_eth_q_stats));
+                        memcpy(&fp_stats->eth_q_stats, tmp_eth_q_stats,
+                               sizeof(struct bnx2x_eth_q_stats));
                         kfree(tmp_eth_q_stats);
                 }
 
                 if (tmp_eth_q_stats_old) {
-                        memcpy(&fp->eth_q_stats_old, tmp_eth_q_stats_old,
+                        memcpy(&fp_stats->eth_q_stats_old, tmp_eth_q_stats_old,
                                sizeof(struct bnx2x_eth_q_stats_old));
                         kfree(tmp_eth_q_stats_old);
                 }
@@ -1891,7 +1947,7 @@ static void bnx2x_bz_fp(struct bnx2x *bp, int index)
 
         /* Restore the NAPI object as it has been already initialized */
         fp->napi = orig_napi;
-
+        fp->tpa_info = orig_tpa_info;
         fp->bp = bp;
         fp->index = index;
         if (IS_ETH_FP(fp))
@@ -1900,6 +1956,16 @@ static void bnx2x_bz_fp(struct bnx2x *bp, int index)
                 /* Special queues support only one CoS */
                 fp->max_cos = 1;
 
+        /* Init txdata pointers */
+#ifdef BCM_CNIC
+        if (IS_FCOE_FP(fp))
+                fp->txdata_ptr[0] = &bp->bnx2x_txq[FCOE_TXQ_IDX(bp)];
+#endif
+        if (IS_ETH_FP(fp))
+                for_each_cos_in_tx_queue(fp, cos)
+                        fp->txdata_ptr[cos] = &bp->bnx2x_txq[cos *
+                                BNX2X_NUM_ETH_QUEUES(bp) + index];
+
         /*
          * set the tpa flag for each queue. The tpa flag determines the queue
          * minimal size so it must be set prior to queue memory allocation
@@ -1949,11 +2015,13 @@ int bnx2x_nic_load(struct bnx2x *bp, int load_mode)
         /*
          * Zero fastpath structures preserving invariants like napi, which are
          * allocated only once, fp index, max_cos, bp pointer.
-         * Also set fp->disable_tpa.
+         * Also set fp->disable_tpa and txdata_ptr.
          */
         DP(NETIF_MSG_IFUP, "num queues: %d", bp->num_queues);
         for_each_queue(bp, i)
                 bnx2x_bz_fp(bp, i);
+        memset(bp->bnx2x_txq, 0, bp->bnx2x_txq_size *
+               sizeof(struct bnx2x_fp_txdata));
 
 
         /* Set the receive queues buffer size */
@@ -2176,6 +2244,7 @@ int bnx2x_nic_load(struct bnx2x *bp, int load_mode)
                 break;
 
         case LOAD_DIAG:
+        case LOAD_LOOPBACK_EXT:
                 bp->state = BNX2X_STATE_DIAG;
                 break;
 
@@ -2195,6 +2264,7 @@ int bnx2x_nic_load(struct bnx2x *bp, int load_mode)
         /* re-read iscsi info */
         bnx2x_get_iscsi_info(bp);
         bnx2x_setup_cnic_irq_info(bp);
+        bnx2x_setup_cnic_info(bp);
         if (bp->state == BNX2X_STATE_OPEN)
                 bnx2x_cnic_notify(bp, CNIC_CTL_START_CMD);
 #endif
@@ -2215,7 +2285,10 @@ int bnx2x_nic_load(struct bnx2x *bp, int load_mode)
                 return -EBUSY;
         }
 
-        bnx2x_dcbx_init(bp);
+        /* If PMF - send ADMIN DCBX msg to MFW to initiate DCBX FSM */
+        if (bp->port.pmf && (bp->state != BNX2X_STATE_DIAG))
+                bnx2x_dcbx_init(bp, false);
+
         return 0;
 
 #ifndef BNX2X_STOP_ON_ERROR
@@ -2298,6 +2371,7 @@ int bnx2x_nic_unload(struct bnx2x *bp, int unload_mode)
 
         /* Stop Tx */
         bnx2x_tx_disable(bp);
+        netdev_reset_tc(bp->dev);
 
 #ifdef BCM_CNIC
         bnx2x_cnic_notify(bp, CNIC_CTL_STOP_CMD);
@@ -2456,8 +2530,8 @@ int bnx2x_poll(struct napi_struct *napi, int budget)
 #endif
 
                 for_each_cos_in_tx_queue(fp, cos)
-                        if (bnx2x_tx_queue_has_work(&fp->txdata[cos]))
-                                bnx2x_tx_int(bp, &fp->txdata[cos]);
+                        if (bnx2x_tx_queue_has_work(fp->txdata_ptr[cos]))
+                                bnx2x_tx_int(bp, fp->txdata_ptr[cos]);
 
 
                 if (bnx2x_has_rx_work(fp)) {
@@ -2834,7 +2908,6 @@ netdev_tx_t bnx2x_start_xmit(struct sk_buff *skb, struct net_device *dev)
 {
         struct bnx2x *bp = netdev_priv(dev);
 
-        struct bnx2x_fastpath *fp;
         struct netdev_queue *txq;
         struct bnx2x_fp_txdata *txdata;
         struct sw_tx_bd *tx_buf;
@@ -2844,7 +2917,7 @@ netdev_tx_t bnx2x_start_xmit(struct sk_buff *skb, struct net_device *dev)
         struct eth_tx_parse_bd_e2 *pbd_e2 = NULL;
         u32 pbd_e2_parsing_data = 0;
         u16 pkt_prod, bd_prod;
-        int nbd, txq_index, fp_index, txdata_index;
+        int nbd, txq_index;
         dma_addr_t mapping;
         u32 xmit_type = bnx2x_xmit_type(bp, skb);
         int i;
@@ -2863,31 +2936,12 @@ netdev_tx_t bnx2x_start_xmit(struct sk_buff *skb, struct net_device *dev)
 
         BUG_ON(txq_index >= MAX_ETH_TXQ_IDX(bp) + FCOE_PRESENT);
 
-        /* decode the fastpath index and the cos index from the txq */
-        fp_index = TXQ_TO_FP(txq_index);
-        txdata_index = TXQ_TO_COS(txq_index);
-
-#ifdef BCM_CNIC
-        /*
-         * Override the above for the FCoE queue:
-         *   - FCoE fp entry is right after the ETH entries.
-         *   - FCoE L2 queue uses bp->txdata[0] only.
-         */
-        if (unlikely(!NO_FCOE(bp) && (txq_index ==
-                                      bnx2x_fcoe_tx(bp, txq_index)))) {
-                fp_index = FCOE_IDX;
-                txdata_index = 0;
-        }
-#endif
+        txdata = &bp->bnx2x_txq[txq_index];
 
         /* enable this debug print to view the transmission queue being used
         DP(NETIF_MSG_TX_QUEUED, "indices: txq %d, fp %d, txdata %d\n",
            txq_index, fp_index, txdata_index); */
 
-        /* locate the fastpath and the txdata */
-        fp = &bp->fp[fp_index];
-        txdata = &fp->txdata[txdata_index];
-
         /* enable this debug print to view the tranmission details
         DP(NETIF_MSG_TX_QUEUED,
            "transmitting packet cid %d fp index %d txdata_index %d tx_data ptr %p fp pointer %p\n",
@@ -2895,7 +2949,7 @@ netdev_tx_t bnx2x_start_xmit(struct sk_buff *skb, struct net_device *dev)
 
         if (unlikely(bnx2x_tx_avail(bp, txdata) <
                      (skb_shinfo(skb)->nr_frags + 3))) {
-                fp->eth_q_stats.driver_xoff++;
+                bnx2x_fp_qstats(bp, txdata->parent_fp)->driver_xoff++;
                 netif_tx_stop_queue(txq);
                 BNX2X_ERR("BUG! Tx ring full when queue awake!\n");
                 return NETDEV_TX_BUSY;
@@ -3177,7 +3231,7 @@ netdev_tx_t bnx2x_start_xmit(struct sk_buff *skb, struct net_device *dev)
                  * fp->bd_tx_cons */
                 smp_mb();
 
-                fp->eth_q_stats.driver_xoff++;
+                bnx2x_fp_qstats(bp, txdata->parent_fp)->driver_xoff++;
                 if (bnx2x_tx_avail(bp, txdata) >= MAX_SKB_FRAGS + 4)
                         netif_tx_wake_queue(txq);
         }
@@ -3243,7 +3297,7 @@ int bnx2x_setup_tc(struct net_device *dev, u8 num_tc)
         /* configure traffic class to transmission queue mapping */
         for (cos = 0; cos < bp->max_cos; cos++) {
                 count = BNX2X_NUM_ETH_QUEUES(bp);
-                offset = cos * MAX_TXQS_PER_COS;
+                offset = cos * BNX2X_NUM_NON_CNIC_QUEUES(bp);
                 netdev_set_tc_queue(dev, cos, count, offset);
                 DP(BNX2X_MSG_SP | NETIF_MSG_IFUP,
                    "mapping tc %d to offset %d count %d\n",
@@ -3342,7 +3396,7 @@ static void bnx2x_free_fp_mem_at(struct bnx2x *bp, int fp_index)
         if (!skip_tx_queue(bp, fp_index)) {
                 /* fastpath tx rings: tx_buf tx_desc */
                 for_each_cos_in_tx_queue(fp, cos) {
-                        struct bnx2x_fp_txdata *txdata = &fp->txdata[cos];
+                        struct bnx2x_fp_txdata *txdata = fp->txdata_ptr[cos];
 
                         DP(NETIF_MSG_IFDOWN,
                            "freeing tx memory of fp %d cos %d cid %d\n",
@@ -3414,7 +3468,7 @@ static int bnx2x_alloc_rx_bds(struct bnx2x_fastpath *fp,
                                cqe_ring_prod);
         fp->rx_pkt = fp->rx_calls = 0;
 
-        fp->eth_q_stats.rx_skb_alloc_failed += failure_cnt;
+        bnx2x_fp_stats(bp, fp)->eth_q_stats.rx_skb_alloc_failed += failure_cnt;
 
         return i - failure_cnt;
 }
@@ -3499,7 +3553,7 @@ static int bnx2x_alloc_fp_mem_at(struct bnx2x *bp, int index)
         if (!skip_tx_queue(bp, index)) {
                 /* fastpath tx rings: tx_buf tx_desc */
                 for_each_cos_in_tx_queue(fp, cos) {
-                        struct bnx2x_fp_txdata *txdata = &fp->txdata[cos];
+                        struct bnx2x_fp_txdata *txdata = fp->txdata_ptr[cos];
 
                         DP(NETIF_MSG_IFUP,
                            "allocating tx memory of fp %d cos %d\n",
@@ -3582,7 +3636,7 @@ int bnx2x_alloc_fp_mem(struct bnx2x *bp)
 #ifdef BCM_CNIC
         if (!NO_FCOE(bp))
                 /* FCoE */
-                if (bnx2x_alloc_fp_mem_at(bp, FCOE_IDX))
+                if (bnx2x_alloc_fp_mem_at(bp, FCOE_IDX(bp)))
                         /* we will fail load process instead of mark
                          * NO_FCOE_FLAG
                          */
@@ -3607,7 +3661,7 @@ int bnx2x_alloc_fp_mem(struct bnx2x *bp)
                  */
 
                 /* move FCoE fp even NO_FCOE_FLAG is on */
-                bnx2x_move_fp(bp, FCOE_IDX, FCOE_IDX - delta);
+                bnx2x_move_fp(bp, FCOE_IDX(bp), FCOE_IDX(bp) - delta);
 #endif
                 bp->num_queues -= delta;
                 BNX2X_ERR("Adjusted num of queues from %d to %d\n",
@@ -3619,7 +3673,11 @@ int bnx2x_alloc_fp_mem(struct bnx2x *bp)
 
 void bnx2x_free_mem_bp(struct bnx2x *bp)
 {
+        kfree(bp->fp->tpa_info);
         kfree(bp->fp);
+        kfree(bp->sp_objs);
+        kfree(bp->fp_stats);
+        kfree(bp->bnx2x_txq);
         kfree(bp->msix_table);
         kfree(bp->ilt);
 }
@@ -3630,6 +3688,8 @@ int __devinit bnx2x_alloc_mem_bp(struct bnx2x *bp)
         struct msix_entry *tbl;
         struct bnx2x_ilt *ilt;
         int msix_table_size = 0;
+        int fp_array_size;
+        int i;
 
         /*
          * The biggest MSI-X table we might need is as a maximum number of fast
@@ -3638,12 +3698,44 @@ int __devinit bnx2x_alloc_mem_bp(struct bnx2x *bp)
         msix_table_size = bp->igu_sb_cnt + 1;
 
         /* fp array: RSS plus CNIC related L2 queues */
-        fp = kcalloc(BNX2X_MAX_RSS_COUNT(bp) + NON_ETH_CONTEXT_USE,
-                     sizeof(*fp), GFP_KERNEL);
+        fp_array_size = BNX2X_MAX_RSS_COUNT(bp) + NON_ETH_CONTEXT_USE;
+        BNX2X_DEV_INFO("fp_array_size %d", fp_array_size);
+
+        fp = kcalloc(fp_array_size, sizeof(*fp), GFP_KERNEL);
         if (!fp)
                 goto alloc_err;
+        for (i = 0; i < fp_array_size; i++) {
+                fp[i].tpa_info =
+                        kcalloc(ETH_MAX_AGGREGATION_QUEUES_E1H_E2,
+                                sizeof(struct bnx2x_agg_info), GFP_KERNEL);
+                if (!(fp[i].tpa_info))
+                        goto alloc_err;
+        }
+
         bp->fp = fp;
 
+        /* allocate sp objs */
+        bp->sp_objs = kcalloc(fp_array_size, sizeof(struct bnx2x_sp_objs),
+                              GFP_KERNEL);
+        if (!bp->sp_objs)
+                goto alloc_err;
+
+        /* allocate fp_stats */
+        bp->fp_stats = kcalloc(fp_array_size, sizeof(struct bnx2x_fp_stats),
+                               GFP_KERNEL);
+        if (!bp->fp_stats)
+                goto alloc_err;
+
+        /* Allocate memory for the transmission queues array */
+        bp->bnx2x_txq_size = BNX2X_MAX_RSS_COUNT(bp) * BNX2X_MULTI_TX_COS;
+#ifdef BCM_CNIC
+        bp->bnx2x_txq_size++;
+#endif
+        bp->bnx2x_txq = kcalloc(bp->bnx2x_txq_size,
+                                sizeof(struct bnx2x_fp_txdata), GFP_KERNEL);
+        if (!bp->bnx2x_txq)
+                goto alloc_err;
+
         /* msix table */
         tbl = kcalloc(msix_table_size, sizeof(*tbl), GFP_KERNEL);
         if (!tbl)
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
index 7cd99b75347..dfa757e7429 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
@@ -29,6 +29,7 @@
 extern int load_count[2][3]; /* per-path: 0-common, 1-port0, 2-port1 */
 
 extern int num_queues;
+extern int int_mode;
 
 /************************ Macros ********************************/
 #define BNX2X_PCI_FREE(x, y, size) \
@@ -89,12 +90,12 @@ void bnx2x_send_unload_done(struct bnx2x *bp);
  * bnx2x_config_rss_pf - configure RSS parameters in a PF.
  *
  * @bp:                 driver handle
- * @rss_obj             RSS object to use
+ * @rss_obj:            RSS object to use
  * @ind_table:          indirection table to configure
  * @config_hash:        re-configure RSS hash keys configuration
  */
 int bnx2x_config_rss_pf(struct bnx2x *bp, struct bnx2x_rss_config_obj *rss_obj,
-                        u8 *ind_table, bool config_hash);
+                        bool config_hash);
 
 /**
  * bnx2x__init_func_obj - init function object
@@ -244,6 +245,14 @@ int bnx2x_cnic_notify(struct bnx2x *bp, int cmd);
  * @bp:         driver handle
  */
 void bnx2x_setup_cnic_irq_info(struct bnx2x *bp);
+
+/**
+ * bnx2x_setup_cnic_info - provides cnic with updated info
+ *
+ * @bp:         driver handle
+ */
+void bnx2x_setup_cnic_info(struct bnx2x *bp);
+
 #endif
 
 /**
@@ -409,7 +418,7 @@ void bnx2x_ilt_set_info(struct bnx2x *bp);
  *
  * @bp:         driver handle
  */
-void bnx2x_dcbx_init(struct bnx2x *bp);
+void bnx2x_dcbx_init(struct bnx2x *bp, bool update_shmem);
 
 /**
  * bnx2x_set_power_state - set power state to the requested value.
@@ -487,7 +496,7 @@ void bnx2x_netif_start(struct bnx2x *bp);
  * fills msix_table, requests vectors, updates num_queues
  * according to number of available vectors.
  */
-int __devinit bnx2x_enable_msix(struct bnx2x *bp);
+int bnx2x_enable_msix(struct bnx2x *bp);
 
 /**
  * bnx2x_enable_msi - request msi mode from OS, updated internals accordingly
@@ -728,7 +737,7 @@ static inline bool bnx2x_has_tx_work(struct bnx2x_fastpath *fp)
 {
         u8 cos;
         for_each_cos_in_tx_queue(fp, cos)
-                if (bnx2x_tx_queue_has_work(&fp->txdata[cos]))
+                if (bnx2x_tx_queue_has_work(fp->txdata_ptr[cos]))
                         return true;
         return false;
 }
@@ -780,8 +789,10 @@ static inline void bnx2x_add_all_napi(struct bnx2x *bp)
 {
         int i;
 
+        bp->num_napi_queues = bp->num_queues;
+
         /* Add NAPI objects */
-        for_each_rx_queue(bp, i)
+        for_each_napi_rx_queue(bp, i)
                 netif_napi_add(bp->dev, &bnx2x_fp(bp, i, napi),
                                bnx2x_poll, BNX2X_NAPI_WEIGHT);
 }
@@ -790,10 +801,12 @@ static inline void bnx2x_del_all_napi(struct bnx2x *bp)
 {
         int i;
 
-        for_each_rx_queue(bp, i)
+        for_each_napi_rx_queue(bp, i)
                 netif_napi_del(&bnx2x_fp(bp, i, napi));
 }
 
+void bnx2x_set_int_mode(struct bnx2x *bp);
+
 static inline void bnx2x_disable_msi(struct bnx2x *bp)
 {
         if (bp->flags & USING_MSIX_FLAG) {
@@ -809,7 +822,8 @@ static inline int bnx2x_calc_num_queues(struct bnx2x *bp)
 {
         return  num_queues ?
                  min_t(int, num_queues, BNX2X_MAX_QUEUES(bp)) :
-                 min_t(int, num_online_cpus(), BNX2X_MAX_QUEUES(bp));
+                 min_t(int, netif_get_num_default_rss_queues(),
+                       BNX2X_MAX_QUEUES(bp));
 }
 
 static inline void bnx2x_clear_sge_mask_next_elems(struct bnx2x_fastpath *fp)
@@ -865,11 +879,9 @@ static inline int func_by_vn(struct bnx2x *bp, int vn)
         return 2 * vn + BP_PORT(bp);
 }
 
-static inline int bnx2x_config_rss_eth(struct bnx2x *bp, u8 *ind_table,
-                                       bool config_hash)
+static inline int bnx2x_config_rss_eth(struct bnx2x *bp, bool config_hash)
 {
-        return bnx2x_config_rss_pf(bp, &bp->rss_conf_obj, ind_table,
-                                   config_hash);
+        return bnx2x_config_rss_pf(bp, &bp->rss_conf_obj, config_hash);
 }
 
 /**
@@ -975,8 +987,8 @@ static inline void bnx2x_init_vlan_mac_fp_objs(struct bnx2x_fastpath *fp,
         struct bnx2x *bp = fp->bp;
 
         /* Configure classification DBs */
-        bnx2x_init_mac_obj(bp, &fp->mac_obj, fp->cl_id, fp->cid,
-                           BP_FUNC(bp), bnx2x_sp(bp, mac_rdata),
+        bnx2x_init_mac_obj(bp, &bnx2x_sp_obj(bp, fp).mac_obj, fp->cl_id,
+                           fp->cid, BP_FUNC(bp), bnx2x_sp(bp, mac_rdata),
                            bnx2x_sp_mapping(bp, mac_rdata),
                            BNX2X_FILTER_MAC_PENDING,
                            &bp->sp_state, obj_type,
@@ -1068,12 +1080,14 @@ static inline u32 bnx2x_rx_ustorm_prods_offset(struct bnx2x_fastpath *fp)
 }
 
 static inline void bnx2x_init_txdata(struct bnx2x *bp,
-        struct bnx2x_fp_txdata *txdata, u32 cid, int txq_index,
-        __le16 *tx_cons_sb)
+                                     struct bnx2x_fp_txdata *txdata, u32 cid,
+                                     int txq_index, __le16 *tx_cons_sb,
+                                     struct bnx2x_fastpath *fp)
 {
         txdata->cid = cid;
         txdata->txq_index = txq_index;
         txdata->tx_cons_sb = tx_cons_sb;
+        txdata->parent_fp = fp;
 
         DP(NETIF_MSG_IFUP, "created tx data cid %d, txq %d\n",
            txdata->cid, txdata->txq_index);
@@ -1107,18 +1121,13 @@ static inline void bnx2x_init_fcoe_fp(struct bnx2x *bp)
         bnx2x_fcoe(bp, rx_queue) = BNX2X_NUM_ETH_QUEUES(bp);
         bnx2x_fcoe(bp, cl_id) = bnx2x_cnic_eth_cl_id(bp,
                                                      BNX2X_FCOE_ETH_CL_ID_IDX);
-        /** Current BNX2X_FCOE_ETH_CID deffinition implies not more than
-         *  16 ETH clients per function when CNIC is enabled!
-         *
-         *  Fix it ASAP!!!
-         */
-        bnx2x_fcoe(bp, cid) = BNX2X_FCOE_ETH_CID;
+        bnx2x_fcoe(bp, cid) = BNX2X_FCOE_ETH_CID(bp);
         bnx2x_fcoe(bp, fw_sb_id) = DEF_SB_ID;
         bnx2x_fcoe(bp, igu_sb_id) = bp->igu_dsb_id;
         bnx2x_fcoe(bp, rx_cons_sb) = BNX2X_FCOE_L2_RX_INDEX;
-
-        bnx2x_init_txdata(bp, &bnx2x_fcoe(bp, txdata[0]),
-                          fp->cid, FCOE_TXQ_IDX(bp), BNX2X_FCOE_L2_TX_INDEX);
+        bnx2x_init_txdata(bp, bnx2x_fcoe(bp, txdata_ptr[0]),
+                          fp->cid, FCOE_TXQ_IDX(bp), BNX2X_FCOE_L2_TX_INDEX,
+                          fp);
 
         DP(NETIF_MSG_IFUP, "created fcoe tx data (fp index %d)\n", fp->index);
 
@@ -1135,8 +1144,8 @@ static inline void bnx2x_init_fcoe_fp(struct bnx2x *bp)
         /* No multi-CoS for FCoE L2 client */
         BUG_ON(fp->max_cos != 1);
 
-        bnx2x_init_queue_obj(bp, &fp->q_obj, fp->cl_id, &fp->cid, 1,
-                             BP_FUNC(bp), bnx2x_sp(bp, q_rdata),
+        bnx2x_init_queue_obj(bp, &bnx2x_sp_obj(bp, fp).q_obj, fp->cl_id,
+                             &fp->cid, 1, BP_FUNC(bp), bnx2x_sp(bp, q_rdata),
                              bnx2x_sp_mapping(bp, q_rdata), q_type);
 
         DP(NETIF_MSG_IFUP,
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c
index 4f9244bd753..8a73374e52a 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c
@@ -972,23 +972,26 @@ void bnx2x_dcbx_init_params(struct bnx2x *bp)
         bp->dcbx_config_params.admin_default_priority = 0;
 }
 
-void bnx2x_dcbx_init(struct bnx2x *bp)
+void bnx2x_dcbx_init(struct bnx2x *bp, bool update_shmem)
 {
         u32 dcbx_lldp_params_offset = SHMEM_LLDP_DCBX_PARAMS_NONE;
 
+        /* only PMF can send ADMIN msg to MFW in old MFW versions */
+        if ((!bp->port.pmf) && (!(bp->flags & BC_SUPPORTS_DCBX_MSG_NON_PMF)))
+                return;
+
         if (bp->dcbx_enabled <= 0)
                 return;
 
         /* validate:
          * chip of good for dcbx version,
          * dcb is wanted
-         * the function is pmf
          * shmem2 contains DCBX support fields
          */
         DP(BNX2X_MSG_DCB, "dcb_state %d bp->port.pmf %d\n",
            bp->dcb_state, bp->port.pmf);
 
-        if (bp->dcb_state == BNX2X_DCB_STATE_ON && bp->port.pmf &&
+        if (bp->dcb_state == BNX2X_DCB_STATE_ON &&
             SHMEM2_HAS(bp, dcbx_lldp_params_offset)) {
                 dcbx_lldp_params_offset =
                         SHMEM2_RD(bp, dcbx_lldp_params_offset);
@@ -999,12 +1002,23 @@ void bnx2x_dcbx_init(struct bnx2x *bp)
                 bnx2x_update_drv_flags(bp, 1 << DRV_FLAGS_DCB_CONFIGURED, 0);
 
                 if (SHMEM_LLDP_DCBX_PARAMS_NONE != dcbx_lldp_params_offset) {
-                        bnx2x_dcbx_admin_mib_updated_params(bp,
-                                dcbx_lldp_params_offset);
+                        /* need HW lock to avoid scenario of two drivers
+                         * writing in parallel to shmem
+                         */
+                        bnx2x_acquire_hw_lock(bp,
+                                              HW_LOCK_RESOURCE_DCBX_ADMIN_MIB);
+                        if (update_shmem)
+                                bnx2x_dcbx_admin_mib_updated_params(bp,
+                                        dcbx_lldp_params_offset);
 
                         /* Let HW start negotiation */
                         bnx2x_fw_command(bp,
                                          DRV_MSG_CODE_DCBX_ADMIN_PMF_MSG, 0);
+                        /* release HW lock only after MFW acks that it finished
+                         * reading values from shmem
+                         */
+                        bnx2x_release_hw_lock(bp,
+                                              HW_LOCK_RESOURCE_DCBX_ADMIN_MIB);
                 }
         }
 }
@@ -2063,10 +2077,8 @@ static u8 bnx2x_dcbnl_set_all(struct net_device *netdev)
                            "Handling parity error recovery. Try again later\n");
                 return 1;
         }
-        if (netif_running(bp->dev)) {
-                bnx2x_nic_unload(bp, UNLOAD_NORMAL);
-                rc = bnx2x_nic_load(bp, LOAD_NORMAL);
-        }
+        if (netif_running(bp->dev))
+                bnx2x_dcbx_init(bp, true);
         DP(BNX2X_MSG_DCB, "set_dcbx_params done (%d)\n", rc);
         if (rc)
                 return 1;
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c
index ddc18ee5c5a..bff31290198 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c
@@ -177,6 +177,8 @@ static const struct {
                         4, STATS_FLAGS_FUNC, "recoverable_errors" },
         { STATS_OFFSET32(unrecoverable_error),
                         4, STATS_FLAGS_FUNC, "unrecoverable_errors" },
+        { STATS_OFFSET32(eee_tx_lpi),
+                        4, STATS_FLAGS_PORT, "Tx LPI entry count"}
 };
 
 #define BNX2X_NUM_STATS         ARRAY_SIZE(bnx2x_stats_arr)
@@ -185,7 +187,8 @@ static int bnx2x_get_port_type(struct bnx2x *bp)
         int port_type;
         u32 phy_idx = bnx2x_get_cur_phy_idx(bp);
         switch (bp->link_params.phy[phy_idx].media_type) {
-        case ETH_PHY_SFP_FIBER:
+        case ETH_PHY_SFPP_10G_FIBER:
+        case ETH_PHY_SFP_1G_FIBER:
         case ETH_PHY_XFP_FIBER:
         case ETH_PHY_KR:
         case ETH_PHY_CX4:
@@ -218,6 +221,11 @@ static int bnx2x_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
                 (bp->port.supported[cfg_idx ^ 1] &
                  (SUPPORTED_TP | SUPPORTED_FIBRE));
         cmd->advertising = bp->port.advertising[cfg_idx];
+        if (bp->link_params.phy[bnx2x_get_cur_phy_idx(bp)].media_type ==
+            ETH_PHY_SFP_1G_FIBER) {
+                cmd->supported &= ~(SUPPORTED_10000baseT_Full);
+                cmd->advertising &= ~(ADVERTISED_10000baseT_Full);
+        }
 
         if ((bp->state == BNX2X_STATE_OPEN) && (bp->link_vars.link_up)) {
                 if (!(bp->flags & MF_FUNC_DIS)) {
@@ -293,7 +301,7 @@ static int bnx2x_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
 {
         struct bnx2x *bp = netdev_priv(dev);
         u32 advertising, cfg_idx, old_multi_phy_config, new_multi_phy_config;
-        u32 speed;
+        u32 speed, phy_idx;
 
         if (IS_MF_SD(bp))
                 return 0;
@@ -548,9 +556,11 @@ static int bnx2x_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
                                    "10G half not supported\n");
                                 return -EINVAL;
                         }
-
+                        phy_idx = bnx2x_get_cur_phy_idx(bp);
                         if (!(bp->port.supported[cfg_idx]
-                              & SUPPORTED_10000baseT_Full)) {
+                              & SUPPORTED_10000baseT_Full) ||
+                            (bp->link_params.phy[phy_idx].media_type ==
+                             ETH_PHY_SFP_1G_FIBER)) {
                                 DP(BNX2X_MSG_ETHTOOL,
                                    "10G full not supported\n");
                                 return -EINVAL;
@@ -824,7 +834,7 @@ static void bnx2x_get_drvinfo(struct net_device *dev,
                  ((phy_fw_ver[0] != '\0') ? " phy " : ""), phy_fw_ver);
         strlcpy(info->bus_info, pci_name(bp->pdev), sizeof(info->bus_info));
         info->n_stats = BNX2X_NUM_STATS;
-        info->testinfo_len = BNX2X_NUM_TESTS;
+        info->testinfo_len = BNX2X_NUM_TESTS(bp);
         info->eedump_len = bp->common.flash_size;
         info->regdump_len = bnx2x_get_regs_len(dev);
 }
@@ -1150,6 +1160,65 @@ static int bnx2x_get_eeprom(struct net_device *dev,
         return rc;
 }
 
+static int bnx2x_get_module_eeprom(struct net_device *dev,
+                                   struct ethtool_eeprom *ee,
+                                   u8 *data)
+{
+        struct bnx2x *bp = netdev_priv(dev);
+        int rc = 0, phy_idx;
+        u8 *user_data = data;
+        int remaining_len = ee->len, xfer_size;
+        unsigned int page_off = ee->offset;
+
+        if (!netif_running(dev)) {
+                DP(BNX2X_MSG_ETHTOOL | BNX2X_MSG_NVM,
+                   "cannot access eeprom when the interface is down\n");
+                return -EAGAIN;
+        }
+
+        phy_idx = bnx2x_get_cur_phy_idx(bp);
+        bnx2x_acquire_phy_lock(bp);
+        while (!rc && remaining_len > 0) {
+                xfer_size = (remaining_len > SFP_EEPROM_PAGE_SIZE) ?
+                        SFP_EEPROM_PAGE_SIZE : remaining_len;
+                rc = bnx2x_read_sfp_module_eeprom(&bp->link_params.phy[phy_idx],
+                                                  &bp->link_params,
+                                                  page_off,
+                                                  xfer_size,
+                                                  user_data);
+                remaining_len -= xfer_size;
+                user_data += xfer_size;
+                page_off += xfer_size;
+        }
+
+        bnx2x_release_phy_lock(bp);
+        return rc;
+}
+
+static int bnx2x_get_module_info(struct net_device *dev,
+                                 struct ethtool_modinfo *modinfo)
+{
+        struct bnx2x *bp = netdev_priv(dev);
+        int phy_idx;
+        if (!netif_running(dev)) {
+                DP(BNX2X_MSG_ETHTOOL  | BNX2X_MSG_NVM,
+                   "cannot access eeprom when the interface is down\n");
+                return -EAGAIN;
+        }
+
+        phy_idx = bnx2x_get_cur_phy_idx(bp);
+        switch (bp->link_params.phy[phy_idx].media_type) {
+        case ETH_PHY_SFPP_10G_FIBER:
+        case ETH_PHY_SFP_1G_FIBER:
+        case ETH_PHY_DA_TWINAX:
+                modinfo->type = ETH_MODULE_SFF_8079;
+                modinfo->eeprom_len = ETH_MODULE_SFF_8079_LEN;
+                return 0;
+        default:
+                return -EOPNOTSUPP;
+        }
+}
+
 static int bnx2x_nvram_write_dword(struct bnx2x *bp, u32 offset, u32 val,
                                    u32 cmd_flags)
 {
@@ -1531,18 +1600,146 @@ static int bnx2x_set_pauseparam(struct net_device *dev,
         return 0;
 }
 
-static const struct {
-        char string[ETH_GSTRING_LEN];
-} bnx2x_tests_str_arr[BNX2X_NUM_TESTS] = {
-        { "register_test (offline)" },
-        { "memory_test (offline)" },
-        { "loopback_test (offline)" },
-        { "nvram_test (online)" },
-        { "interrupt_test (online)" },
-        { "link_test (online)" },
-        { "idle check (online)" }
+static char *bnx2x_tests_str_arr[BNX2X_NUM_TESTS_SF] = {
+        "register_test (offline)    ",
+        "memory_test (offline)      ",
+        "int_loopback_test (offline)",
+        "ext_loopback_test (offline)",
+        "nvram_test (online)        ",
+        "interrupt_test (online)    ",
+        "link_test (online)         "
 };
 
+static u32 bnx2x_eee_to_adv(u32 eee_adv)
+{
+        u32 modes = 0;
+
+        if (eee_adv & SHMEM_EEE_100M_ADV)
+                modes |= ADVERTISED_100baseT_Full;
+        if (eee_adv & SHMEM_EEE_1G_ADV)
+                modes |= ADVERTISED_1000baseT_Full;
+        if (eee_adv & SHMEM_EEE_10G_ADV)
+                modes |= ADVERTISED_10000baseT_Full;
+
+        return modes;
+}
+
+static u32 bnx2x_adv_to_eee(u32 modes, u32 shift)
+{
+        u32 eee_adv = 0;
+        if (modes & ADVERTISED_100baseT_Full)
+                eee_adv |= SHMEM_EEE_100M_ADV;
+        if (modes & ADVERTISED_1000baseT_Full)
+                eee_adv |= SHMEM_EEE_1G_ADV;
+        if (modes & ADVERTISED_10000baseT_Full)
+                eee_adv |= SHMEM_EEE_10G_ADV;
+
+        return eee_adv << shift;
+}
+
+static int bnx2x_get_eee(struct net_device *dev, struct ethtool_eee *edata)
+{
+        struct bnx2x *bp = netdev_priv(dev);
+        u32 eee_cfg;
+
+        if (!SHMEM2_HAS(bp, eee_status[BP_PORT(bp)])) {
+                DP(BNX2X_MSG_ETHTOOL, "BC Version does not support EEE\n");
+                return -EOPNOTSUPP;
+        }
+
+        eee_cfg = SHMEM2_RD(bp, eee_status[BP_PORT(bp)]);
+
+        edata->supported =
+                bnx2x_eee_to_adv((eee_cfg & SHMEM_EEE_SUPPORTED_MASK) >>
+                                 SHMEM_EEE_SUPPORTED_SHIFT);
+
+        edata->advertised =
+                bnx2x_eee_to_adv((eee_cfg & SHMEM_EEE_ADV_STATUS_MASK) >>
+                                 SHMEM_EEE_ADV_STATUS_SHIFT);
+        edata->lp_advertised =
+                bnx2x_eee_to_adv((eee_cfg & SHMEM_EEE_LP_ADV_STATUS_MASK) >>
+                                 SHMEM_EEE_LP_ADV_STATUS_SHIFT);
+
+        /* SHMEM value is in 16u units --> Convert to 1u units. */
+        edata->tx_lpi_timer = (eee_cfg & SHMEM_EEE_TIMER_MASK) << 4;
+
+        edata->eee_enabled    = (eee_cfg & SHMEM_EEE_REQUESTED_BIT)     ? 1 : 0;
+        edata->eee_active     = (eee_cfg & SHMEM_EEE_ACTIVE_BIT)        ? 1 : 0;
+        edata->tx_lpi_enabled = (eee_cfg & SHMEM_EEE_LPI_REQUESTED_BIT) ? 1 : 0;
+
+        return 0;
+}
+
+static int bnx2x_set_eee(struct net_device *dev, struct ethtool_eee *edata)
+{
+        struct bnx2x *bp = netdev_priv(dev);
+        u32 eee_cfg;
+        u32 advertised;
+
+        if (IS_MF(bp))
+                return 0;
+
+        if (!SHMEM2_HAS(bp, eee_status[BP_PORT(bp)])) {
+                DP(BNX2X_MSG_ETHTOOL, "BC Version does not support EEE\n");
+                return -EOPNOTSUPP;
+        }
+
+        eee_cfg = SHMEM2_RD(bp, eee_status[BP_PORT(bp)]);
+
+        if (!(eee_cfg & SHMEM_EEE_SUPPORTED_MASK)) {
+                DP(BNX2X_MSG_ETHTOOL, "Board does not support EEE!\n");
+                return -EOPNOTSUPP;
+        }
+
+        advertised = bnx2x_adv_to_eee(edata->advertised,
+                                      SHMEM_EEE_ADV_STATUS_SHIFT);
+        if ((advertised != (eee_cfg & SHMEM_EEE_ADV_STATUS_MASK))) {
+                DP(BNX2X_MSG_ETHTOOL,
+                   "Direct manipulation of EEE advertisment is not supported\n");
+                return -EINVAL;
+        }
+
+        if (edata->tx_lpi_timer > EEE_MODE_TIMER_MASK) {
+                DP(BNX2X_MSG_ETHTOOL,
+                   "Maximal Tx Lpi timer supported is %x(u)\n",
+                   EEE_MODE_TIMER_MASK);
+                return -EINVAL;
+        }
+        if (edata->tx_lpi_enabled &&
+            (edata->tx_lpi_timer < EEE_MODE_NVRAM_AGGRESSIVE_TIME)) {
+                DP(BNX2X_MSG_ETHTOOL,
+                   "Minimal Tx Lpi timer supported is %d(u)\n",
+                   EEE_MODE_NVRAM_AGGRESSIVE_TIME);
+                return -EINVAL;
+        }
+
+        /* All is well; Apply changes*/
+        if (edata->eee_enabled)
+                bp->link_params.eee_mode |= EEE_MODE_ADV_LPI;
+        else
+                bp->link_params.eee_mode &= ~EEE_MODE_ADV_LPI;
+
+        if (edata->tx_lpi_enabled)
+                bp->link_params.eee_mode |= EEE_MODE_ENABLE_LPI;
+        else
+                bp->link_params.eee_mode &= ~EEE_MODE_ENABLE_LPI;
+
+        bp->link_params.eee_mode &= ~EEE_MODE_TIMER_MASK;
+        bp->link_params.eee_mode |= (edata->tx_lpi_timer &
+                                    EEE_MODE_TIMER_MASK) |
+                                    EEE_MODE_OVERRIDE_NVRAM |
+                                    EEE_MODE_OUTPUT_TIME;
+
+        /* Restart link to propogate changes */
+        if (netif_running(dev)) {
+                bnx2x_stats_handle(bp, STATS_EVENT_STOP);
+                bnx2x_link_set(bp);
+        }
+
+        return 0;
+}
+
+
 enum {
         BNX2X_CHIP_E1_OFST = 0,
         BNX2X_CHIP_E1H_OFST,
@@ -1811,6 +2008,14 @@ static void bnx2x_wait_for_link(struct bnx2x *bp, u8 link_up, u8 is_serdes)
 
                 if (cnt <= 0 && bnx2x_link_test(bp, is_serdes))
                         DP(BNX2X_MSG_ETHTOOL, "Timeout waiting for link up\n");
+
+                cnt = 1400;
+                while (!bp->link_vars.link_up && cnt--)
+                        msleep(20);
+
+                if (cnt <= 0 && !bp->link_vars.link_up)
+                        DP(BNX2X_MSG_ETHTOOL,
+                           "Timeout waiting for link init\n");
         }
 }
 
@@ -1821,7 +2026,7 @@ static int bnx2x_run_loopback(struct bnx2x *bp, int loopback_mode)
         unsigned char *packet;
         struct bnx2x_fastpath *fp_rx = &bp->fp[0];
         struct bnx2x_fastpath *fp_tx = &bp->fp[0];
-        struct bnx2x_fp_txdata *txdata = &fp_tx->txdata[0];
+        struct bnx2x_fp_txdata *txdata = fp_tx->txdata_ptr[0];
         u16 tx_start_idx, tx_idx;
         u16 rx_start_idx, rx_idx;
         u16 pkt_prod, bd_prod;
@@ -1836,13 +2041,16 @@ static int bnx2x_run_loopback(struct bnx2x *bp, int loopback_mode)
         u16 len;
         int rc = -ENODEV;
         u8 *data;
-        struct netdev_queue *txq = netdev_get_tx_queue(bp->dev, txdata->txq_index);
+        struct netdev_queue *txq = netdev_get_tx_queue(bp->dev,
+                                                       txdata->txq_index);
 
         /* check the loopback mode */
         switch (loopback_mode) {
         case BNX2X_PHY_LOOPBACK:
-                if (bp->link_params.loopback_mode != LOOPBACK_XGXS)
+                if (bp->link_params.loopback_mode != LOOPBACK_XGXS) {
+                        DP(BNX2X_MSG_ETHTOOL, "PHY loopback not supported\n");
                         return -EINVAL;
+                }
                 break;
         case BNX2X_MAC_LOOPBACK:
                 if (CHIP_IS_E3(bp)) {
@@ -1859,6 +2067,13 @@ static int bnx2x_run_loopback(struct bnx2x *bp, int loopback_mode)
 
                 bnx2x_phy_init(&bp->link_params, &bp->link_vars);
                 break;
+        case BNX2X_EXT_LOOPBACK:
+                if (bp->link_params.loopback_mode != LOOPBACK_EXT) {
+                        DP(BNX2X_MSG_ETHTOOL,
+                           "Can't configure external loopback\n");
+                        return -EINVAL;
+                }
+                break;
         default:
                 DP(BNX2X_MSG_ETHTOOL, "Command parameters not supported\n");
                 return -EINVAL;
@@ -2030,6 +2245,38 @@ static int bnx2x_test_loopback(struct bnx2x *bp)
         return rc;
 }
 
+static int bnx2x_test_ext_loopback(struct bnx2x *bp)
+{
+        int rc;
+        u8 is_serdes =
+                (bp->link_vars.link_status & LINK_STATUS_SERDES_LINK) > 0;
+
+        if (BP_NOMCP(bp))
+                return -ENODEV;
+
+        if (!netif_running(bp->dev))
+                return BNX2X_EXT_LOOPBACK_FAILED;
+
+        bnx2x_nic_unload(bp, UNLOAD_NORMAL);
+        rc = bnx2x_nic_load(bp, LOAD_LOOPBACK_EXT);
+        if (rc) {
+                DP(BNX2X_MSG_ETHTOOL,
+                   "Can't perform self-test, nic_load (for external lb) failed\n");
+                return -ENODEV;
+        }
+        bnx2x_wait_for_link(bp, 1, is_serdes);
+
+        bnx2x_netif_stop(bp, 1);
+
+        rc = bnx2x_run_loopback(bp, BNX2X_EXT_LOOPBACK);
+        if (rc)
+                DP(BNX2X_MSG_ETHTOOL, "EXT loopback failed  (res %d)\n", rc);
+
+        bnx2x_netif_start(bp);
+
+        return rc;
+}
+
 #define CRC32_RESIDUAL                  0xdebb20e3
 
 static int bnx2x_test_nvram(struct bnx2x *bp)
@@ -2112,7 +2359,7 @@ static int bnx2x_test_intr(struct bnx2x *bp)
                 return -ENODEV;
         }
 
-        params.q_obj = &bp->fp->q_obj;
+        params.q_obj = &bp->sp_objs->q_obj;
         params.cmd = BNX2X_Q_CMD_EMPTY;
 
         __set_bit(RAMROD_COMP_WAIT, &params.ramrod_flags);
@@ -2125,24 +2372,31 @@ static void bnx2x_self_test(struct net_device *dev,
 {
         struct bnx2x *bp = netdev_priv(dev);
         u8 is_serdes;
+        int rc;
+
         if (bp->recovery_state != BNX2X_RECOVERY_DONE) {
                 netdev_err(bp->dev,
                            "Handling parity error recovery. Try again later\n");
                 etest->flags |= ETH_TEST_FL_FAILED;
                 return;
         }
+        DP(BNX2X_MSG_ETHTOOL,
+           "Self-test command parameters: offline = %d, external_lb = %d\n",
+           (etest->flags & ETH_TEST_FL_OFFLINE),
+           (etest->flags & ETH_TEST_FL_EXTERNAL_LB)>>2);
 
-        memset(buf, 0, sizeof(u64) * BNX2X_NUM_TESTS);
+        memset(buf, 0, sizeof(u64) * BNX2X_NUM_TESTS(bp));
 
-        if (!netif_running(dev))
+        if (!netif_running(dev)) {
+                DP(BNX2X_MSG_ETHTOOL,
+                   "Can't perform self-test when interface is down\n");
                 return;
+        }
 
-        /* offline tests are not supported in MF mode */
-        if (IS_MF(bp))
-                etest->flags &= ~ETH_TEST_FL_OFFLINE;
         is_serdes = (bp->link_vars.link_status & LINK_STATUS_SERDES_LINK) > 0;
 
-        if (etest->flags & ETH_TEST_FL_OFFLINE) {
+        /* offline tests are not supported in MF mode */
+        if ((etest->flags & ETH_TEST_FL_OFFLINE) && !IS_MF(bp)) {
                 int port = BP_PORT(bp);
                 u32 val;
                 u8 link_up;
@@ -2155,7 +2409,14 @@ static void bnx2x_self_test(struct net_device *dev,
                 link_up = bp->link_vars.link_up;
 
                 bnx2x_nic_unload(bp, UNLOAD_NORMAL);
-                bnx2x_nic_load(bp, LOAD_DIAG);
+                rc = bnx2x_nic_load(bp, LOAD_DIAG);
+                if (rc) {
+                        etest->flags |= ETH_TEST_FL_FAILED;
+                        DP(BNX2X_MSG_ETHTOOL,
+                           "Can't perform self-test, nic_load (for offline) failed\n");
+                        return;
+                }
+
                 /* wait until link state is restored */
                 bnx2x_wait_for_link(bp, 1, is_serdes);
 
@@ -2168,30 +2429,51 @@ static void bnx2x_self_test(struct net_device *dev,
                         etest->flags |= ETH_TEST_FL_FAILED;
                 }
 
-                buf[2] = bnx2x_test_loopback(bp);
+                buf[2] = bnx2x_test_loopback(bp); /* internal LB */
                 if (buf[2] != 0)
                         etest->flags |= ETH_TEST_FL_FAILED;
 
+                if (etest->flags & ETH_TEST_FL_EXTERNAL_LB) {
+                        buf[3] = bnx2x_test_ext_loopback(bp); /* external LB */
+                        if (buf[3] != 0)
+                                etest->flags |= ETH_TEST_FL_FAILED;
+                        etest->flags |= ETH_TEST_FL_EXTERNAL_LB_DONE;
+                }
+
                 bnx2x_nic_unload(bp, UNLOAD_NORMAL);
 
                 /* restore input for TX port IF */
                 REG_WR(bp, NIG_REG_EGRESS_UMP0_IN_EN + port*4, val);
-
-                bnx2x_nic_load(bp, LOAD_NORMAL);
+                rc = bnx2x_nic_load(bp, LOAD_NORMAL);
+                if (rc) {
+                        etest->flags |= ETH_TEST_FL_FAILED;
+                        DP(BNX2X_MSG_ETHTOOL,
+                           "Can't perform self-test, nic_load (for online) failed\n");
+                        return;
+                }
                 /* wait until link state is restored */
                 bnx2x_wait_for_link(bp, link_up, is_serdes);
         }
         if (bnx2x_test_nvram(bp) != 0) {
-                buf[3] = 1;
+                if (!IS_MF(bp))
+                        buf[4] = 1;
+                else
+                        buf[0] = 1;
                 etest->flags |= ETH_TEST_FL_FAILED;
         }
         if (bnx2x_test_intr(bp) != 0) {
-                buf[4] = 1;
+                if (!IS_MF(bp))
+                        buf[5] = 1;
+                else
+                        buf[1] = 1;
                 etest->flags |= ETH_TEST_FL_FAILED;
         }
 
         if (bnx2x_link_test(bp, is_serdes) != 0) {
-                buf[5] = 1;
+                if (!IS_MF(bp))
+                        buf[6] = 1;
+                else
+                        buf[2] = 1;
                 etest->flags |= ETH_TEST_FL_FAILED;
         }
 
@@ -2236,7 +2518,7 @@ static int bnx2x_get_sset_count(struct net_device *dev, int stringset)
                 return num_stats;
 
         case ETH_SS_TEST:
-                return BNX2X_NUM_TESTS;
+                return BNX2X_NUM_TESTS(bp);
 
         default:
                 return -EINVAL;
@@ -2246,7 +2528,7 @@ static int bnx2x_get_sset_count(struct net_device *dev, int stringset)
 static void bnx2x_get_strings(struct net_device *dev, u32 stringset, u8 *buf)
 {
         struct bnx2x *bp = netdev_priv(dev);
-        int i, j, k;
+        int i, j, k, offset, start;
         char queue_name[MAX_QUEUE_NAME_LEN+1];
 
         switch (stringset) {
@@ -2277,7 +2559,17 @@ static void bnx2x_get_strings(struct net_device *dev, u32 stringset, u8 *buf)
                 break;
 
         case ETH_SS_TEST:
-                memcpy(buf, bnx2x_tests_str_arr, sizeof(bnx2x_tests_str_arr));
+                /* First 4 tests cannot be done in MF mode */
+                if (!IS_MF(bp))
+                        start = 0;
+                else
+                        start = 4;
+                for (i = 0, j = start; j < (start + BNX2X_NUM_TESTS(bp));
+                     i++, j++) {
+                        offset = sprintf(buf+32*i, "%s",
+                                         bnx2x_tests_str_arr[j]);
+                        *(buf+offset) = '\0';
+                }
                 break;
         }
 }
@@ -2291,7 +2583,7 @@ static void bnx2x_get_ethtool_stats(struct net_device *dev,
 
         if (is_multi(bp)) {
                 for_each_eth_queue(bp, i) {
-                        hw_stats = (u32 *)&bp->fp[i].eth_q_stats;
+                        hw_stats = (u32 *)&bp->fp_stats[i].eth_q_stats;
                         for (j = 0; j < BNX2X_NUM_Q_STATS; j++) {
                                 if (bnx2x_q_stats_arr[j].size == 0) {
                                         /* skip this counter */
@@ -2375,6 +2667,41 @@ static int bnx2x_set_phys_id(struct net_device *dev,
         return 0;
 }
 
+static int bnx2x_get_rss_flags(struct bnx2x *bp, struct ethtool_rxnfc *info)
+{
+
+        switch (info->flow_type) {
+        case TCP_V4_FLOW:
+        case TCP_V6_FLOW:
+                info->data = RXH_IP_SRC | RXH_IP_DST |
+                             RXH_L4_B_0_1 | RXH_L4_B_2_3;
+                break;
+        case UDP_V4_FLOW:
+                if (bp->rss_conf_obj.udp_rss_v4)
+                        info->data = RXH_IP_SRC | RXH_IP_DST |
+                                     RXH_L4_B_0_1 | RXH_L4_B_2_3;
+                else
+                        info->data = RXH_IP_SRC | RXH_IP_DST;
+                break;
+        case UDP_V6_FLOW:
+                if (bp->rss_conf_obj.udp_rss_v6)
+                        info->data = RXH_IP_SRC | RXH_IP_DST |
+                                     RXH_L4_B_0_1 | RXH_L4_B_2_3;
+                else
+                        info->data = RXH_IP_SRC | RXH_IP_DST;
+                break;
+        case IPV4_FLOW:
+        case IPV6_FLOW:
+                info->data = RXH_IP_SRC | RXH_IP_DST;
+                break;
+        default:
+                info->data = 0;
+                break;
+        }
+
+        return 0;
+}
+
 static int bnx2x_get_rxnfc(struct net_device *dev, struct ethtool_rxnfc *info,
                            u32 *rules __always_unused)
 {
@@ -2384,7 +2711,102 @@ static int bnx2x_get_rxnfc(struct net_device *dev, struct ethtool_rxnfc *info,
         case ETHTOOL_GRXRINGS:
                 info->data = BNX2X_NUM_ETH_QUEUES(bp);
                 return 0;
+        case ETHTOOL_GRXFH:
+                return bnx2x_get_rss_flags(bp, info);
+        default:
+                DP(BNX2X_MSG_ETHTOOL, "Command parameters not supported\n");
+                return -EOPNOTSUPP;
+        }
+}
+
+static int bnx2x_set_rss_flags(struct bnx2x *bp, struct ethtool_rxnfc *info)
+{
+        int udp_rss_requested;
+
+        DP(BNX2X_MSG_ETHTOOL,
+           "Set rss flags command parameters: flow type = %d, data = %llu\n",
+           info->flow_type, info->data);
+
+        switch (info->flow_type) {
+        case TCP_V4_FLOW:
+        case TCP_V6_FLOW:
+                /* For TCP only 4-tupple hash is supported */
+                if (info->data ^ (RXH_IP_SRC | RXH_IP_DST |
+                                  RXH_L4_B_0_1 | RXH_L4_B_2_3)) {
+                        DP(BNX2X_MSG_ETHTOOL,
+                           "Command parameters not supported\n");
+                        return -EINVAL;
+                } else {
+                        return 0;
+                }
 
+        case UDP_V4_FLOW:
+        case UDP_V6_FLOW:
+                /* For UDP either 2-tupple hash or 4-tupple hash is supported */
+                if (info->data == (RXH_IP_SRC | RXH_IP_DST |
+                                 RXH_L4_B_0_1 | RXH_L4_B_2_3))
+                        udp_rss_requested = 1;
+                else if (info->data == (RXH_IP_SRC | RXH_IP_DST))
+                        udp_rss_requested = 0;
+                else
+                        return -EINVAL;
+                if ((info->flow_type == UDP_V4_FLOW) &&
+                    (bp->rss_conf_obj.udp_rss_v4 != udp_rss_requested)) {
+                        bp->rss_conf_obj.udp_rss_v4 = udp_rss_requested;
+                        DP(BNX2X_MSG_ETHTOOL,
+                           "rss re-configured, UDP 4-tupple %s\n",
+                           udp_rss_requested ? "enabled" : "disabled");
+                        return bnx2x_config_rss_pf(bp, &bp->rss_conf_obj, 0);
+                } else if ((info->flow_type == UDP_V6_FLOW) &&
+                           (bp->rss_conf_obj.udp_rss_v6 != udp_rss_requested)) {
+                        bp->rss_conf_obj.udp_rss_v6 = udp_rss_requested;
+                        return bnx2x_config_rss_pf(bp, &bp->rss_conf_obj, 0);
+                        DP(BNX2X_MSG_ETHTOOL,
+                           "rss re-configured, UDP 4-tupple %s\n",
+                           udp_rss_requested ? "enabled" : "disabled");
+                } else {
+                        return 0;
+                }
+        case IPV4_FLOW:
+        case IPV6_FLOW:
+                /* For IP only 2-tupple hash is supported */
+                if (info->data ^ (RXH_IP_SRC | RXH_IP_DST)) {
+                        DP(BNX2X_MSG_ETHTOOL,
+                           "Command parameters not supported\n");
+                        return -EINVAL;
+                } else {
+                        return 0;
+                }
+        case SCTP_V4_FLOW:
+        case AH_ESP_V4_FLOW:
+        case AH_V4_FLOW:
+        case ESP_V4_FLOW:
+        case SCTP_V6_FLOW:
+        case AH_ESP_V6_FLOW:
+        case AH_V6_FLOW:
+        case ESP_V6_FLOW:
+        case IP_USER_FLOW:
+        case ETHER_FLOW:
+                /* RSS is not supported for these protocols */
+                if (info->data) {
+                        DP(BNX2X_MSG_ETHTOOL,
+                           "Command parameters not supported\n");
+                        return -EINVAL;
+                } else {
+                        return 0;
+                }
+        default:
+                return -EINVAL;
+        }
+}
+
+static int bnx2x_set_rxnfc(struct net_device *dev, struct ethtool_rxnfc *info)
+{
+        struct bnx2x *bp = netdev_priv(dev);
+
+        switch (info->cmd) {
+        case ETHTOOL_SRXFH:
+                return bnx2x_set_rss_flags(bp, info);
         default:
                 DP(BNX2X_MSG_ETHTOOL, "Command parameters not supported\n");
                 return -EOPNOTSUPP;
@@ -2424,7 +2846,6 @@ static int bnx2x_set_rxfh_indir(struct net_device *dev, const u32 *indir)
 {
         struct bnx2x *bp = netdev_priv(dev);
         size_t i;
-        u8 ind_table[T_ETH_INDIRECTION_TABLE_SIZE] = {0};
 
         for (i = 0; i < T_ETH_INDIRECTION_TABLE_SIZE; i++) {
                 /*
@@ -2436,10 +2857,88 @@ static int bnx2x_set_rxfh_indir(struct net_device *dev, const u32 *indir)
                  * align the received table to the Client ID of the leading RSS
                  * queue
                  */
-                ind_table[i] = indir[i] + bp->fp->cl_id;
+                bp->rss_conf_obj.ind_table[i] = indir[i] + bp->fp->cl_id;
         }
 
-        return bnx2x_config_rss_eth(bp, ind_table, false);
+        return bnx2x_config_rss_eth(bp, false);
+}
+
+/**
+ * bnx2x_get_channels - gets the number of RSS queues.
+ *
+ * @dev:                net device
+ * @channels:           returns the number of max / current queues
+ */
+static void bnx2x_get_channels(struct net_device *dev,
+                               struct ethtool_channels *channels)
+{
+        struct bnx2x *bp = netdev_priv(dev);
+
+        channels->max_combined = BNX2X_MAX_RSS_COUNT(bp);
+        channels->combined_count = BNX2X_NUM_ETH_QUEUES(bp);
+}
+
+/**
+ * bnx2x_change_num_queues - change the number of RSS queues.
+ *
+ * @bp:                 bnx2x private structure
+ *
+ * Re-configure interrupt mode to get the new number of MSI-X
+ * vectors and re-add NAPI objects.
+ */
+static void bnx2x_change_num_queues(struct bnx2x *bp, int num_rss)
+{
+        bnx2x_del_all_napi(bp);
+        bnx2x_disable_msi(bp);
+        BNX2X_NUM_QUEUES(bp) = num_rss + NON_ETH_CONTEXT_USE;
+        bnx2x_set_int_mode(bp);
+        bnx2x_add_all_napi(bp);
+}
+
+/**
+ * bnx2x_set_channels - sets the number of RSS queues.
+ *
+ * @dev:                net device
+ * @channels:           includes the number of queues requested
+ */
+static int bnx2x_set_channels(struct net_device *dev,
+                              struct ethtool_channels *channels)
+{
+        struct bnx2x *bp = netdev_priv(dev);
+
+
+        DP(BNX2X_MSG_ETHTOOL,
+           "set-channels command parameters: rx = %d, tx = %d, other = %d, combined = %d\n",
+           channels->rx_count, channels->tx_count, channels->other_count,
+           channels->combined_count);
+
+        /* We don't support separate rx / tx channels.
+         * We don't allow setting 'other' channels.
+         */
+        if (channels->rx_count || channels->tx_count || channels->other_count
+            || (channels->combined_count == 0) ||
+            (channels->combined_count > BNX2X_MAX_RSS_COUNT(bp))) {
+                DP(BNX2X_MSG_ETHTOOL, "command parameters not supported\n");
+                return -EINVAL;
+        }
+
+        /* Check if there was a change in the active parameters */
+        if (channels->combined_count == BNX2X_NUM_ETH_QUEUES(bp)) {
+                DP(BNX2X_MSG_ETHTOOL, "No change in active parameters\n");
+                return 0;
+        }
+
+        /* Set the requested number of queues in bp context.
+         * Note that the actual number of queues created during load may be
+         * less than requested if memory is low.
+         */
+        if (unlikely(!netif_running(dev))) {
+                bnx2x_change_num_queues(bp, channels->combined_count);
+                return 0;
+        }
+        bnx2x_nic_unload(bp, UNLOAD_NORMAL);
+        bnx2x_change_num_queues(bp, channels->combined_count);
+        return bnx2x_nic_load(bp, LOAD_NORMAL);
 }
 
 static const struct ethtool_ops bnx2x_ethtool_ops = {
@@ -2469,9 +2968,16 @@ static const struct ethtool_ops bnx2x_ethtool_ops = {
         .set_phys_id            = bnx2x_set_phys_id,
         .get_ethtool_stats      = bnx2x_get_ethtool_stats,
         .get_rxnfc              = bnx2x_get_rxnfc,
+        .set_rxnfc              = bnx2x_set_rxnfc,
         .get_rxfh_indir_size    = bnx2x_get_rxfh_indir_size,
         .get_rxfh_indir         = bnx2x_get_rxfh_indir,
         .set_rxfh_indir         = bnx2x_set_rxfh_indir,
+        .get_channels           = bnx2x_get_channels,
+        .set_channels           = bnx2x_set_channels,
+        .get_module_info        = bnx2x_get_module_info,
+        .get_module_eeprom      = bnx2x_get_module_eeprom,
+        .get_eee                = bnx2x_get_eee,
+        .set_eee                = bnx2x_set_eee,
 };
 
 void bnx2x_set_ethtool_ops(struct net_device *netdev)
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_fw_defs.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_fw_defs.h
index 426f77aa721..bbc66ced9c2 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_fw_defs.h
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_fw_defs.h
@@ -321,9 +321,7 @@
 #define DISABLE_STATISTIC_COUNTER_ID_VALUE 0
 
 
-/**
- * This file defines HSI constants common to all microcode flows
- */
+/* This file defines HSI constants common to all microcode flows */
 
 #define PROTOCOL_STATE_BIT_OFFSET 6
 
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h
index a440a8ba85f..76b6e65790f 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h
@@ -10,6 +10,7 @@
 #define BNX2X_HSI_H
 
 #include "bnx2x_fw_defs.h"
+#include "bnx2x_mfw_req.h"
 
 #define FW_ENCODE_32BIT_PATTERN         0x1e1e1e1e
 
@@ -33,12 +34,6 @@ struct license_key {
         u32 reserved_b[4];
 };
 
-
-#define PORT_0                  0
-#define PORT_1                  1
-#define PORT_MAX                2
-#define NVM_PATH_MAX            2
-
 /****************************************************************************
  * Shared HW configuration                                                  *
  ****************************************************************************/
@@ -1067,8 +1062,18 @@ struct port_feat_cfg {		    /* port 0: 0x454  port 1: 0x4c8 */
            uses the same defines as link_config */
         u32 mfw_wol_link_cfg2;                              /* 0x480 */
 
-        u32 Reserved2[17];                                  /* 0x484 */
 
+        /*  EEE power saving mode */
+        u32 eee_power_mode;                                 /* 0x484 */
+        #define PORT_FEAT_CFG_EEE_POWER_MODE_MASK                     0x000000FF
+        #define PORT_FEAT_CFG_EEE_POWER_MODE_SHIFT                    0
+        #define PORT_FEAT_CFG_EEE_POWER_MODE_DISABLED                 0x00000000
+        #define PORT_FEAT_CFG_EEE_POWER_MODE_BALANCED                 0x00000001
+        #define PORT_FEAT_CFG_EEE_POWER_MODE_AGGRESSIVE               0x00000002
+        #define PORT_FEAT_CFG_EEE_POWER_MODE_LOW_LATENCY              0x00000003
+
+
+        u32 Reserved2[16];                                  /* 0x488 */
 };
 
 
@@ -1140,6 +1145,7 @@ struct drv_port_mb {
         u32 link_status;
         /* Driver should update this field on any link change event */
 
+        #define LINK_STATUS_NONE                                (0<<0)
         #define LINK_STATUS_LINK_FLAG_MASK                      0x00000001
         #define LINK_STATUS_LINK_UP                             0x00000001
         #define LINK_STATUS_SPEED_AND_DUPLEX_MASK               0x0000001E
@@ -1197,6 +1203,7 @@ struct drv_port_mb {
         #define LINK_STATUS_PFC_ENABLED                         0x20000000
 
         #define LINK_STATUS_PHYSICAL_LINK_FLAG                  0x40000000
+        #define LINK_STATUS_SFP_TX_FAULT                        0x80000000
 
         u32 port_stx;
 
@@ -1240,9 +1247,11 @@ struct drv_func_mb {
         #define REQ_BC_VER_4_VRFY_AFEX_SUPPORTED        0x00070002
         #define REQ_BC_VER_4_SFP_TX_DISABLE_SUPPORTED   0x00070014
         #define REQ_BC_VER_4_PFC_STATS_SUPPORTED        0x00070201
+        #define REQ_BC_VER_4_FCOE_FEATURES              0x00070209
 
         #define DRV_MSG_CODE_DCBX_ADMIN_PMF_MSG         0xb0000000
         #define DRV_MSG_CODE_DCBX_PMF_DRV_OK            0xb2000000
+        #define REQ_BC_VER_4_DCBX_ADMIN_MSG_NON_PMF     0x00070401
 
         #define DRV_MSG_CODE_VF_DISABLED_DONE           0xc0000000
 
@@ -1255,6 +1264,8 @@ struct drv_func_mb {
         #define DRV_MSG_CODE_DRV_INFO_ACK               0xd8000000
         #define DRV_MSG_CODE_DRV_INFO_NACK              0xd9000000
 
+        #define DRV_MSG_CODE_EEE_RESULTS_ACK            0xda000000
+
         #define DRV_MSG_CODE_SET_MF_BW                  0xe0000000
         #define REQ_BC_VER_4_SET_MF_BW                  0x00060202
         #define DRV_MSG_CODE_SET_MF_BW_ACK              0xe1000000
@@ -1320,6 +1331,8 @@ struct drv_func_mb {
         #define FW_MSG_CODE_DRV_INFO_ACK                0xd8100000
         #define FW_MSG_CODE_DRV_INFO_NACK               0xd9100000
 
+        #define FW_MSG_CODE_EEE_RESULS_ACK              0xda100000
+
         #define FW_MSG_CODE_SET_MF_BW_SENT              0xe0000000
         #define FW_MSG_CODE_SET_MF_BW_DONE              0xe1000000
 
@@ -1383,6 +1396,8 @@ struct drv_func_mb {
 
         #define DRV_STATUS_DRV_INFO_REQ                 0x04000000
 
+        #define DRV_STATUS_EEE_NEGOTIATION_RESULTS      0x08000000
+
         u32 virt_mac_upper;
         #define VIRT_MAC_SIGN_MASK                      0xffff0000
         #define VIRT_MAC_SIGNATURE                      0x564d0000
@@ -1613,6 +1628,11 @@ struct fw_flr_mb {
         struct fw_flr_ack ack;
 };
 
+struct eee_remote_vals {
+        u32         tx_tw;
+        u32         rx_tw;
+};
+
 /**** SUPPORT FOR SHMEM ARRRAYS ***
  * The SHMEM HSI is aligned on 32 bit boundaries which makes it difficult to
  * define arrays with storage types smaller then unsigned dwords.
@@ -2053,6 +2073,41 @@ struct shmem2_region {
 #define DRV_INFO_CONTROL_OP_CODE_MASK      0x0000ff00
 #define DRV_INFO_CONTROL_OP_CODE_SHIFT     8
         u32 ibft_host_addr; /* initialized by option ROM */
+        struct eee_remote_vals eee_remote_vals[PORT_MAX];
+        u32 reserved[E2_FUNC_MAX];
+
+
+        /* the status of EEE auto-negotiation
+         * bits 15:0 the configured tx-lpi entry timer value. Depends on bit 31.
+         * bits 19:16 the supported modes for EEE.
+         * bits 23:20 the speeds advertised for EEE.
+         * bits 27:24 the speeds the Link partner advertised for EEE.
+         * The supported/adv. modes in bits 27:19 originate from the
+         * SHMEM_EEE_XXX_ADV definitions (where XXX is replaced by speed).
+         * bit 28 when 1'b1 EEE was requested.
+         * bit 29 when 1'b1 tx lpi was requested.
+         * bit 30 when 1'b1 EEE was negotiated. Tx lpi will be asserted iff
+         * 30:29 are 2'b11.
+         * bit 31 when 1'b0 bits 15:0 contain a PORT_FEAT_CFG_EEE_ define as
+         * value. When 1'b1 those bits contains a value times 16 microseconds.
+         */
+        u32 eee_status[PORT_MAX];
+        #define SHMEM_EEE_TIMER_MASK               0x0000ffff
+        #define SHMEM_EEE_SUPPORTED_MASK           0x000f0000
+        #define SHMEM_EEE_SUPPORTED_SHIFT          16
+        #define SHMEM_EEE_ADV_STATUS_MASK          0x00f00000
+                #define SHMEM_EEE_100M_ADV         (1<<0)
+                #define SHMEM_EEE_1G_ADV           (1<<1)
+                #define SHMEM_EEE_10G_ADV          (1<<2)
+        #define SHMEM_EEE_ADV_STATUS_SHIFT         20
+        #define SHMEM_EEE_LP_ADV_STATUS_MASK       0x0f000000
+        #define SHMEM_EEE_LP_ADV_STATUS_SHIFT      24
+        #define SHMEM_EEE_REQUESTED_BIT            0x10000000
+        #define SHMEM_EEE_LPI_REQUESTED_BIT        0x20000000
+        #define SHMEM_EEE_ACTIVE_BIT               0x40000000
+        #define SHMEM_EEE_TIME_OUTPUT_BIT          0x80000000
+
+        u32 sizeof_port_stats;
 };
 
 
@@ -2599,6 +2654,9 @@ struct host_port_stats {
         u32            pfc_frames_tx_lo;
         u32            pfc_frames_rx_hi;
         u32            pfc_frames_rx_lo;
+
+        u32            eee_lpi_count_hi;
+        u32            eee_lpi_count_lo;
 };
 
 
@@ -2638,118 +2696,6 @@ struct host_func_stats {
 /* VIC definitions */
 #define VICSTATST_UIF_INDEX 2
 
-/* current drv_info version */
-#define DRV_INFO_CUR_VER 1
-
-/* drv_info op codes supported */
-enum drv_info_opcode {
-        ETH_STATS_OPCODE,
-        FCOE_STATS_OPCODE,
-        ISCSI_STATS_OPCODE
-};
-
-#define ETH_STAT_INFO_VERSION_LEN       12
-/*  Per PCI Function Ethernet Statistics required from the driver */
-struct eth_stats_info {
-        /* Function's Driver Version. padded to 12 */
-        u8 version[ETH_STAT_INFO_VERSION_LEN];
-        /* Locally Admin Addr. BigEndian EIU48. Actual size is 6 bytes */
-        u8 mac_local[8];
-        u8 mac_add1[8];         /* Additional Programmed MAC Addr 1. */
-        u8 mac_add2[8];         /* Additional Programmed MAC Addr 2. */
-        u32 mtu_size;           /* MTU Size. Note   : Negotiated MTU */
-        u32 feature_flags;      /* Feature_Flags. */
-#define FEATURE_ETH_CHKSUM_OFFLOAD_MASK         0x01
-#define FEATURE_ETH_LSO_MASK                    0x02
-#define FEATURE_ETH_BOOTMODE_MASK               0x1C
-#define FEATURE_ETH_BOOTMODE_SHIFT              2
-#define FEATURE_ETH_BOOTMODE_NONE               (0x0 << 2)
-#define FEATURE_ETH_BOOTMODE_PXE                (0x1 << 2)
-#define FEATURE_ETH_BOOTMODE_ISCSI              (0x2 << 2)
-#define FEATURE_ETH_BOOTMODE_FCOE               (0x3 << 2)
-#define FEATURE_ETH_TOE_MASK                    0x20
-        u32 lso_max_size;       /* LSO MaxOffloadSize. */
-        u32 lso_min_seg_cnt;    /* LSO MinSegmentCount. */
-        /* Num Offloaded Connections TCP_IPv4. */
-        u32 ipv4_ofld_cnt;
-        /* Num Offloaded Connections TCP_IPv6. */
-        u32 ipv6_ofld_cnt;
-        u32 promiscuous_mode;   /* Promiscuous Mode. non-zero true */
-        u32 txq_size;           /* TX Descriptors Queue Size */
-        u32 rxq_size;           /* RX Descriptors Queue Size */
-        /* TX Descriptor Queue Avg Depth. % Avg Queue Depth since last poll */
-        u32 txq_avg_depth;
-        /* RX Descriptors Queue Avg Depth. % Avg Queue Depth since last poll */
-        u32 rxq_avg_depth;
-        /* IOV_Offload. 0=none; 1=MultiQueue, 2=VEB 3= VEPA*/
-        u32 iov_offload;
-        /* Number of NetQueue/VMQ Config'd. */
-        u32 netq_cnt;
-        u32 vf_cnt;             /* Num VF assigned to this PF. */
-};
-
-/*  Per PCI Function FCOE Statistics required from the driver */
-struct fcoe_stats_info {
-        u8 version[12];         /* Function's Driver Version. */
-        u8 mac_local[8];        /* Locally Admin Addr. */
-        u8 mac_add1[8];         /* Additional Programmed MAC Addr 1. */
-        u8 mac_add2[8];         /* Additional Programmed MAC Addr 2. */
-        /* QoS Priority (per 802.1p). 0-7255 */
-        u32 qos_priority;
-        u32 txq_size;           /* FCoE TX Descriptors Queue Size. */
-        u32 rxq_size;           /* FCoE RX Descriptors Queue Size. */
-        /* FCoE TX Descriptor Queue Avg Depth. */
-        u32 txq_avg_depth;
-        /* FCoE RX Descriptors Queue Avg Depth. */
-        u32 rxq_avg_depth;
-        u32 rx_frames_lo;       /* FCoE RX Frames received. */
-        u32 rx_frames_hi;       /* FCoE RX Frames received. */
-        u32 rx_bytes_lo;        /* FCoE RX Bytes received. */
-        u32 rx_bytes_hi;        /* FCoE RX Bytes received. */
-        u32 tx_frames_lo;       /* FCoE TX Frames sent. */
-        u32 tx_frames_hi;       /* FCoE TX Frames sent. */
-        u32 tx_bytes_lo;        /* FCoE TX Bytes sent. */
-        u32 tx_bytes_hi;        /* FCoE TX Bytes sent. */
-};
-
-/* Per PCI  Function iSCSI Statistics required from the driver*/
-struct iscsi_stats_info {
-        u8 version[12];         /* Function's Driver Version. */
-        u8 mac_local[8];        /* Locally Admin iSCSI MAC Addr. */
-        u8 mac_add1[8];         /* Additional Programmed MAC Addr 1. */
-        /* QoS Priority (per 802.1p). 0-7255 */
-        u32 qos_priority;
-        u8 initiator_name[64];  /* iSCSI Boot Initiator Node name. */
-        u8 ww_port_name[64];    /* iSCSI World wide port name */
-        u8 boot_target_name[64];/* iSCSI Boot Target Name. */
-        u8 boot_target_ip[16];  /* iSCSI Boot Target IP. */
-        u32 boot_target_portal; /* iSCSI Boot Target Portal. */
-        u8 boot_init_ip[16];    /* iSCSI Boot Initiator IP Address. */
-        u32 max_frame_size;     /* Max Frame Size. bytes */
-        u32 txq_size;           /* PDU TX Descriptors Queue Size. */
-        u32 rxq_size;           /* PDU RX Descriptors Queue Size. */
-        u32 txq_avg_depth;      /* PDU TX Descriptor Queue Avg Depth. */
-        u32 rxq_avg_depth;      /* PDU RX Descriptors Queue Avg Depth. */
-        u32 rx_pdus_lo;         /* iSCSI PDUs received. */
-        u32 rx_pdus_hi;         /* iSCSI PDUs received. */
-        u32 rx_bytes_lo;        /* iSCSI RX Bytes received. */
-        u32 rx_bytes_hi;        /* iSCSI RX Bytes received. */
-        u32 tx_pdus_lo;         /* iSCSI PDUs sent. */
-        u32 tx_pdus_hi;         /* iSCSI PDUs sent. */
-        u32 tx_bytes_lo;        /* iSCSI PDU TX Bytes sent. */
-        u32 tx_bytes_hi;        /* iSCSI PDU TX Bytes sent. */
-        u32 pcp_prior_map_tbl;  /* C-PCP to S-PCP Priority MapTable.
-                                 * 9 nibbles, the position of each nibble
-                                 * represents the C-PCP value, the value
-                                 * of the nibble = S-PCP value.
-                                 */
-};
-
-union drv_info_to_mcp {
-        struct eth_stats_info   ether_stat;
-        struct fcoe_stats_info  fcoe_stat;
-        struct iscsi_stats_info iscsi_stat;
-};
 
 /* stats collected for afex.
  * NOTE: structure is exactly as expected to be received by the switch.
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
index 6e7d5c0843b..e04b282c039 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
@@ -285,7 +285,6 @@
 #define ETS_E3B0_PBF_MIN_W_VAL                          (10000)
 
 #define MAX_PACKET_SIZE                                 (9700)
-#define WC_UC_TIMEOUT                                   100
 #define MAX_KR_LINK_RETRY                               4
 
 /**********************************************************/
@@ -1306,6 +1305,94 @@ int bnx2x_ets_strict(const struct link_params *params, const u8 strict_cos)
 
         return 0;
 }
+
+/******************************************************************/
+/*                      EEE section                                */
+/******************************************************************/
+static u8 bnx2x_eee_has_cap(struct link_params *params)
+{
+        struct bnx2x *bp = params->bp;
+
+        if (REG_RD(bp, params->shmem2_base) <=
+                   offsetof(struct shmem2_region, eee_status[params->port]))
+                return 0;
+
+        return 1;
+}
+
+static int bnx2x_eee_nvram_to_time(u32 nvram_mode, u32 *idle_timer)
+{
+        switch (nvram_mode) {
+        case PORT_FEAT_CFG_EEE_POWER_MODE_BALANCED:
+                *idle_timer = EEE_MODE_NVRAM_BALANCED_TIME;
+                break;
+        case PORT_FEAT_CFG_EEE_POWER_MODE_AGGRESSIVE:
+                *idle_timer = EEE_MODE_NVRAM_AGGRESSIVE_TIME;
+                break;
+        case PORT_FEAT_CFG_EEE_POWER_MODE_LOW_LATENCY:
+                *idle_timer = EEE_MODE_NVRAM_LATENCY_TIME;
+                break;
+        default:
+                *idle_timer = 0;
+                break;
+        }
+
+        return 0;
+}
+
+static int bnx2x_eee_time_to_nvram(u32 idle_timer, u32 *nvram_mode)
+{
+        switch (idle_timer) {
+        case EEE_MODE_NVRAM_BALANCED_TIME:
+                *nvram_mode = PORT_FEAT_CFG_EEE_POWER_MODE_BALANCED;
+                break;
+        case EEE_MODE_NVRAM_AGGRESSIVE_TIME:
+                *nvram_mode = PORT_FEAT_CFG_EEE_POWER_MODE_AGGRESSIVE;
+                break;
+        case EEE_MODE_NVRAM_LATENCY_TIME:
+                *nvram_mode = PORT_FEAT_CFG_EEE_POWER_MODE_LOW_LATENCY;
+                break;
+        default:
+                *nvram_mode = PORT_FEAT_CFG_EEE_POWER_MODE_DISABLED;
+                break;
+        }
+
+        return 0;
+}
+
+static u32 bnx2x_eee_calc_timer(struct link_params *params)
+{
+        u32 eee_mode, eee_idle;
+        struct bnx2x *bp = params->bp;
+
+        if (params->eee_mode & EEE_MODE_OVERRIDE_NVRAM) {
+                if (params->eee_mode & EEE_MODE_OUTPUT_TIME) {
+                        /* time value in eee_mode --> used directly*/
+                        eee_idle = params->eee_mode & EEE_MODE_TIMER_MASK;
+                } else {
+                        /* hsi value in eee_mode --> time */
+                        if (bnx2x_eee_nvram_to_time(params->eee_mode &
+                                                    EEE_MODE_NVRAM_MASK,
+                                                    &eee_idle))
+                                return 0;
+                }
+        } else {
+                /* hsi values in nvram --> time*/
+                eee_mode = ((REG_RD(bp, params->shmem_base +
+                                    offsetof(struct shmem_region, dev_info.
+                                    port_feature_config[params->port].
+                                    eee_power_mode)) &
+                             PORT_FEAT_CFG_EEE_POWER_MODE_MASK) >>
+                            PORT_FEAT_CFG_EEE_POWER_MODE_SHIFT);
+
+                if (bnx2x_eee_nvram_to_time(eee_mode, &eee_idle))
+                        return 0;
+        }
+
+        return eee_idle;
+}
+
+
 /******************************************************************/
 /*                      PFC section                               */
 /******************************************************************/
@@ -1540,7 +1627,7 @@ static void bnx2x_umac_enable(struct link_params *params,
         /* Reset UMAC */
         REG_WR(bp, GRCBASE_MISC + MISC_REGISTERS_RESET_REG_2_CLEAR,
                (MISC_REGISTERS_RESET_REG_2_UMAC0 << params->port));
-        usleep_range(1000, 1000);
+        usleep_range(1000, 2000);
 
         REG_WR(bp, GRCBASE_MISC + MISC_REGISTERS_RESET_REG_2_SET,
                (MISC_REGISTERS_RESET_REG_2_UMAC0 << params->port));
@@ -1642,7 +1729,7 @@ static void bnx2x_xmac_init(struct link_params *params, u32 max_speed)
         /* Hard reset */
         REG_WR(bp, GRCBASE_MISC + MISC_REGISTERS_RESET_REG_2_CLEAR,
                MISC_REGISTERS_RESET_REG_2_XMAC);
-        usleep_range(1000, 1000);
+        usleep_range(1000, 2000);
 
         REG_WR(bp, GRCBASE_MISC + MISC_REGISTERS_RESET_REG_2_SET,
                MISC_REGISTERS_RESET_REG_2_XMAC);
@@ -1672,7 +1759,7 @@ static void bnx2x_xmac_init(struct link_params *params, u32 max_speed)
         /* Soft reset */
         REG_WR(bp, GRCBASE_MISC + MISC_REGISTERS_RESET_REG_2_CLEAR,
                MISC_REGISTERS_RESET_REG_2_XMAC_SOFT);
-        usleep_range(1000, 1000);
+        usleep_range(1000, 2000);
 
         REG_WR(bp, GRCBASE_MISC + MISC_REGISTERS_RESET_REG_2_SET,
                MISC_REGISTERS_RESET_REG_2_XMAC_SOFT);
@@ -1730,6 +1817,14 @@ static int bnx2x_xmac_enable(struct link_params *params,
         /* update PFC */
         bnx2x_update_pfc_xmac(params, vars, 0);
 
+        if (vars->eee_status & SHMEM_EEE_ADV_STATUS_MASK) {
+                DP(NETIF_MSG_LINK, "Setting XMAC for EEE\n");
+                REG_WR(bp, xmac_base + XMAC_REG_EEE_TIMERS_HI, 0x1380008);
+                REG_WR(bp, xmac_base + XMAC_REG_EEE_CTRL, 0x1);
+        } else {
+                REG_WR(bp, xmac_base + XMAC_REG_EEE_CTRL, 0x0);
+        }
+
         /* Enable TX and RX */
         val = XMAC_CTRL_REG_TX_EN | XMAC_CTRL_REG_RX_EN;
 
@@ -1785,11 +1880,6 @@ static int bnx2x_emac_enable(struct link_params *params,
         bnx2x_bits_en(bp, emac_base + EMAC_REG_EMAC_TX_MODE,
                       EMAC_TX_MODE_RESET);
 
-        if (CHIP_REV_IS_SLOW(bp)) {
-                /* config GMII mode */
-                val = REG_RD(bp, emac_base + EMAC_REG_EMAC_MODE);
-                EMAC_WR(bp, EMAC_REG_EMAC_MODE, (val | EMAC_MODE_PORT_GMII));
-        } else { /* ASIC */
                 /* pause enable/disable */
                 bnx2x_bits_dis(bp, emac_base + EMAC_REG_EMAC_RX_MODE,
                                EMAC_RX_MODE_FLOW_EN);
@@ -1812,7 +1902,6 @@ static int bnx2x_emac_enable(struct link_params *params,
                 } else
                         bnx2x_bits_en(bp, emac_base + EMAC_REG_EMAC_TX_MODE,
                                       EMAC_TX_MODE_FLOW_EN);
-        }
 
         /* KEEP_VLAN_TAG, promiscuous */
         val = REG_RD(bp, emac_base + EMAC_REG_EMAC_RX_MODE);
@@ -1851,23 +1940,23 @@ static int bnx2x_emac_enable(struct link_params *params,
                 val &= ~0x810;
         EMAC_WR(bp, EMAC_REG_EMAC_MODE, val);
 
-        /* enable emac */
+        /* Enable emac */
         REG_WR(bp, NIG_REG_NIG_EMAC0_EN + port*4, 1);
 
-        /* enable emac for jumbo packets */
+        /* Enable emac for jumbo packets */
         EMAC_WR(bp, EMAC_REG_EMAC_RX_MTU_SIZE,
                 (EMAC_RX_MTU_SIZE_JUMBO_ENA |
                  (ETH_MAX_JUMBO_PACKET_SIZE + ETH_OVREHEAD)));
 
-        /* strip CRC */
+        /* Strip CRC */
         REG_WR(bp, NIG_REG_NIG_INGRESS_EMAC0_NO_CRC + port*4, 0x1);
 
-        /* disable the NIG in/out to the bmac */
+        /* Disable the NIG in/out to the bmac */
         REG_WR(bp, NIG_REG_BMAC0_IN_EN + port*4, 0x0);
         REG_WR(bp, NIG_REG_BMAC0_PAUSE_OUT_EN + port*4, 0x0);
         REG_WR(bp, NIG_REG_BMAC0_OUT_EN + port*4, 0x0);
 
-        /* enable the NIG in/out to the emac */
+        /* Enable the NIG in/out to the emac */
         REG_WR(bp, NIG_REG_EMAC0_IN_EN + port*4, 0x1);
         val = 0;
         if ((params->feature_config_flags &
@@ -1902,7 +1991,7 @@ static void bnx2x_update_pfc_bmac1(struct link_params *params,
         wb_data[1] = 0;
         REG_WR_DMAE(bp, bmac_addr + BIGMAC_REGISTER_RX_CONTROL, wb_data, 2);
 
-        /* tx control */
+        /* TX control */
         val = 0xc0;
         if (!(params->feature_config_flags &
               FEATURE_CONFIG_PFC_ENABLED) &&
@@ -1962,7 +2051,7 @@ static void bnx2x_update_pfc_bmac2(struct link_params *params,
                 wb_data[0] &= ~(1<<2);
         } else {
                 DP(NETIF_MSG_LINK, "PFC is disabled\n");
-                /* disable PFC RX & TX & STATS and set 8 COS */
+                /* Disable PFC RX & TX & STATS and set 8 COS */
                 wb_data[0] = 0x8;
                 wb_data[1] = 0;
         }
@@ -2056,7 +2145,7 @@ static int bnx2x_pfc_brb_get_config_params(
                         PFC_E2_BRB_MAC_FULL_XOFF_THR_PAUSE;
                 config_val->pauseable_th.full_xon =
                         PFC_E2_BRB_MAC_FULL_XON_THR_PAUSE;
-                /* non pause able*/
+                /* Non pause able*/
                 config_val->non_pauseable_th.pause_xoff =
                         PFC_E2_BRB_MAC_PAUSE_XOFF_THR_NON_PAUSE;
                 config_val->non_pauseable_th.pause_xon =
@@ -2084,7 +2173,7 @@ static int bnx2x_pfc_brb_get_config_params(
                         PFC_E3A0_BRB_MAC_FULL_XOFF_THR_PAUSE;
                 config_val->pauseable_th.full_xon =
                         PFC_E3A0_BRB_MAC_FULL_XON_THR_PAUSE;
-                /* non pause able*/
+                /* Non pause able*/
                 config_val->non_pauseable_th.pause_xoff =
                         PFC_E3A0_BRB_MAC_PAUSE_XOFF_THR_NON_PAUSE;
                 config_val->non_pauseable_th.pause_xon =
@@ -2114,7 +2203,7 @@ static int bnx2x_pfc_brb_get_config_params(
                                 PFC_E3B0_4P_BRB_MAC_FULL_XOFF_THR_PAUSE;
                         config_val->pauseable_th.full_xon =
                                 PFC_E3B0_4P_BRB_MAC_FULL_XON_THR_PAUSE;
-                        /* non pause able*/
+                        /* Non pause able*/
                         config_val->non_pauseable_th.pause_xoff =
                         PFC_E3B0_4P_BRB_MAC_PAUSE_XOFF_THR_NON_PAUSE;
                         config_val->non_pauseable_th.pause_xon =
@@ -2132,7 +2221,7 @@ static int bnx2x_pfc_brb_get_config_params(
                                 PFC_E3B0_2P_BRB_MAC_FULL_XOFF_THR_PAUSE;
                         config_val->pauseable_th.full_xon =
                                 PFC_E3B0_2P_BRB_MAC_FULL_XON_THR_PAUSE;
-                        /* non pause able*/
+                        /* Non pause able*/
                         config_val->non_pauseable_th.pause_xoff =
                                 PFC_E3B0_2P_BRB_MAC_PAUSE_XOFF_THR_NON_PAUSE;
                         config_val->non_pauseable_th.pause_xon =
@@ -2189,7 +2278,7 @@ static void bnx2x_pfc_brb_get_e3b0_config_params(
 
                         if (pfc_params->cos0_pauseable !=
                                 pfc_params->cos1_pauseable) {
-                                /* nonpauseable= Lossy + pauseable = Lossless*/
+                                /* Nonpauseable= Lossy + pauseable = Lossless*/
                                 e3b0_val->lb_guarantied =
                                         PFC_E3B0_2P_MIX_PAUSE_LB_GUART;
                                 e3b0_val->mac_0_class_t_guarantied =
@@ -2388,9 +2477,9 @@ static int bnx2x_update_pfc_brb(struct link_params *params,
 *  This function is needed because NIG ARB_CREDIT_WEIGHT_X are
 *  not continues and ARB_CREDIT_WEIGHT_0 + offset is suitable.
 ******************************************************************************/
-int bnx2x_pfc_nig_rx_priority_mask(struct bnx2x *bp,
-                                              u8 cos_entry,
-                                              u32 priority_mask, u8 port)
+static int bnx2x_pfc_nig_rx_priority_mask(struct bnx2x *bp,
+                                           u8 cos_entry,
+                                           u32 priority_mask, u8 port)
 {
         u32 nig_reg_rx_priority_mask_add = 0;
 
@@ -2440,6 +2529,16 @@ static void bnx2x_update_mng(struct link_params *params, u32 link_status)
                         port_mb[params->port].link_status), link_status);
 }
 
+static void bnx2x_update_mng_eee(struct link_params *params, u32 eee_status)
+{
+        struct bnx2x *bp = params->bp;
+
+        if (bnx2x_eee_has_cap(params))
+                REG_WR(bp, params->shmem2_base +
+                       offsetof(struct shmem2_region,
+                                eee_status[params->port]), eee_status);
+}
+
 static void bnx2x_update_pfc_nig(struct link_params *params,
                 struct link_vars *vars,
                 struct bnx2x_nig_brb_pfc_port_params *nig_params)
@@ -2507,7 +2606,7 @@ static void bnx2x_update_pfc_nig(struct link_params *params,
         REG_WR(bp, port ? NIG_REG_LLFC_EGRESS_SRC_ENABLE_1 :
                NIG_REG_LLFC_EGRESS_SRC_ENABLE_0, 0x7);
 
-        /* output enable for RX_XCM # IF */
+        /* Output enable for RX_XCM # IF */
         REG_WR(bp, port ? NIG_REG_XCM1_OUT_EN :
                NIG_REG_XCM0_OUT_EN, xcm_out_en);
 
@@ -2556,10 +2655,10 @@ int bnx2x_update_pfc(struct link_params *params,
 
         bnx2x_update_mng(params, vars->link_status);
 
-        /* update NIG params */
+        /* Update NIG params */
         bnx2x_update_pfc_nig(params, vars, pfc_params);
 
-        /* update BRB params */
+        /* Update BRB params */
         bnx2x_status = bnx2x_update_pfc_brb(params, vars, pfc_params);
         if (bnx2x_status)
                 return bnx2x_status;
@@ -2614,7 +2713,7 @@ static int bnx2x_bmac1_enable(struct link_params *params,
         REG_WR_DMAE(bp, bmac_addr + BIGMAC_REGISTER_BMAC_XGXS_CONTROL,
                     wb_data, 2);
 
-        /* tx MAC SA */
+        /* TX MAC SA */
         wb_data[0] = ((params->mac_addr[2] << 24) |
                        (params->mac_addr[3] << 16) |
                        (params->mac_addr[4] << 8) |
@@ -2623,7 +2722,7 @@ static int bnx2x_bmac1_enable(struct link_params *params,
                         params->mac_addr[1]);
         REG_WR_DMAE(bp, bmac_addr + BIGMAC_REGISTER_TX_SOURCE_ADDR, wb_data, 2);
 
-        /* mac control */
+        /* MAC control */
         val = 0x3;
         if (is_lb) {
                 val |= 0x4;
@@ -2633,24 +2732,24 @@ static int bnx2x_bmac1_enable(struct link_params *params,
         wb_data[1] = 0;
         REG_WR_DMAE(bp, bmac_addr + BIGMAC_REGISTER_BMAC_CONTROL, wb_data, 2);
 
-        /* set rx mtu */
+        /* Set rx mtu */
         wb_data[0] = ETH_MAX_JUMBO_PACKET_SIZE + ETH_OVREHEAD;
         wb_data[1] = 0;
         REG_WR_DMAE(bp, bmac_addr + BIGMAC_REGISTER_RX_MAX_SIZE, wb_data, 2);
 
         bnx2x_update_pfc_bmac1(params, vars);
 
-        /* set tx mtu */
+        /* Set tx mtu */
         wb_data[0] = ETH_MAX_JUMBO_PACKET_SIZE + ETH_OVREHEAD;
         wb_data[1] = 0;
         REG_WR_DMAE(bp, bmac_addr + BIGMAC_REGISTER_TX_MAX_SIZE, wb_data, 2);
 
-        /* set cnt max size */
+        /* Set cnt max size */
         wb_data[0] = ETH_MAX_JUMBO_PACKET_SIZE + ETH_OVREHEAD;
         wb_data[1] = 0;
         REG_WR_DMAE(bp, bmac_addr + BIGMAC_REGISTER_CNT_MAX_SIZE, wb_data, 2);
 
-        /* configure safc */
+        /* Configure SAFC */
         wb_data[0] = 0x1000200;
         wb_data[1] = 0;
         REG_WR_DMAE(bp, bmac_addr + BIGMAC_REGISTER_RX_LLFC_MSG_FLDS,
@@ -2684,7 +2783,7 @@ static int bnx2x_bmac2_enable(struct link_params *params,
 
         udelay(30);
 
-        /* tx MAC SA */
+        /* TX MAC SA */
         wb_data[0] = ((params->mac_addr[2] << 24) |
                        (params->mac_addr[3] << 16) |
                        (params->mac_addr[4] << 8) |
@@ -2703,18 +2802,18 @@ static int bnx2x_bmac2_enable(struct link_params *params,
                     wb_data, 2);
         udelay(30);
 
-        /* set rx mtu */
+        /* Set RX MTU */
         wb_data[0] = ETH_MAX_JUMBO_PACKET_SIZE + ETH_OVREHEAD;
         wb_data[1] = 0;
         REG_WR_DMAE(bp, bmac_addr + BIGMAC2_REGISTER_RX_MAX_SIZE, wb_data, 2);
         udelay(30);
 
-        /* set tx mtu */
+        /* Set TX MTU */
         wb_data[0] = ETH_MAX_JUMBO_PACKET_SIZE + ETH_OVREHEAD;
         wb_data[1] = 0;
         REG_WR_DMAE(bp, bmac_addr + BIGMAC2_REGISTER_TX_MAX_SIZE, wb_data, 2);
         udelay(30);
-        /* set cnt max size */
+        /* Set cnt max size */
         wb_data[0] = ETH_MAX_JUMBO_PACKET_SIZE + ETH_OVREHEAD - 2;
         wb_data[1] = 0;
         REG_WR_DMAE(bp, bmac_addr + BIGMAC2_REGISTER_CNT_MAX_SIZE, wb_data, 2);
@@ -2732,15 +2831,15 @@ static int bnx2x_bmac_enable(struct link_params *params,
         u8 port = params->port;
         struct bnx2x *bp = params->bp;
         u32 val;
-        /* reset and unreset the BigMac */
+        /* Reset and unreset the BigMac */
         REG_WR(bp, GRCBASE_MISC + MISC_REGISTERS_RESET_REG_2_CLEAR,
                (MISC_REGISTERS_RESET_REG_2_RST_BMAC0 << port));
-        msleep(1);
+        usleep_range(1000, 2000);
 
         REG_WR(bp, GRCBASE_MISC + MISC_REGISTERS_RESET_REG_2_SET,
                (MISC_REGISTERS_RESET_REG_2_RST_BMAC0 << port));
 
-        /* enable access for bmac registers */
+        /* Enable access for bmac registers */
         REG_WR(bp, NIG_REG_BMAC0_REGS_OUT_EN + port*4, 0x1);
 
         /* Enable BMAC according to BMAC type*/
@@ -2798,7 +2897,7 @@ static void bnx2x_bmac_rx_disable(struct bnx2x *bp, u8 port)
                                         BIGMAC_REGISTER_BMAC_CONTROL,
                                         wb_data, 2);
                 }
-                msleep(1);
+                usleep_range(1000, 2000);
         }
 }
 
@@ -2810,17 +2909,16 @@ static int bnx2x_pbf_update(struct link_params *params, u32 flow_ctrl,
         u32 init_crd, crd;
         u32 count = 1000;
 
-        /* disable port */
+        /* Disable port */
         REG_WR(bp, PBF_REG_DISABLE_NEW_TASK_PROC_P0 + port*4, 0x1);
 
-        /* wait for init credit */
+        /* Wait for init credit */
         init_crd = REG_RD(bp, PBF_REG_P0_INIT_CRD + port*4);
         crd = REG_RD(bp, PBF_REG_P0_CREDIT + port*8);
         DP(NETIF_MSG_LINK, "init_crd 0x%x  crd 0x%x\n", init_crd, crd);
 
         while ((init_crd != crd) && count) {
-                msleep(5);
-
+                usleep_range(5000, 10000);
                 crd = REG_RD(bp, PBF_REG_P0_CREDIT + port*8);
                 count--;
         }
@@ -2837,18 +2935,18 @@ static int bnx2x_pbf_update(struct link_params *params, u32 flow_ctrl,
             line_speed == SPEED_1000 ||
             line_speed == SPEED_2500) {
                 REG_WR(bp, PBF_REG_P0_PAUSE_ENABLE + port*4, 1);
-                /* update threshold */
+                /* Update threshold */
                 REG_WR(bp, PBF_REG_P0_ARB_THRSH + port*4, 0);
-                /* update init credit */
+                /* Update init credit */
                 init_crd = 778;         /* (800-18-4) */
 
         } else {
                 u32 thresh = (ETH_MAX_JUMBO_PACKET_SIZE +
                               ETH_OVREHEAD)/16;
                 REG_WR(bp, PBF_REG_P0_PAUSE_ENABLE + port*4, 0);
-                /* update threshold */
+                /* Update threshold */
                 REG_WR(bp, PBF_REG_P0_ARB_THRSH + port*4, thresh);
-                /* update init credit */
+                /* Update init credit */
                 switch (line_speed) {
                 case SPEED_10000:
                         init_crd = thresh + 553 - 22;
@@ -2863,12 +2961,12 @@ static int bnx2x_pbf_update(struct link_params *params, u32 flow_ctrl,
         DP(NETIF_MSG_LINK, "PBF updated to speed %d credit %d\n",
                  line_speed, init_crd);
 
-        /* probe the credit changes */
+        /* Probe the credit changes */
         REG_WR(bp, PBF_REG_INIT_P0 + port*4, 0x1);
-        msleep(5);
+        usleep_range(5000, 10000);
         REG_WR(bp, PBF_REG_INIT_P0 + port*4, 0x0);
 
-        /* enable port */
+        /* Enable port */
         REG_WR(bp, PBF_REG_DISABLE_NEW_TASK_PROC_P0 + port*4, 0x0);
         return 0;
 }
@@ -2935,7 +3033,7 @@ static int bnx2x_cl22_write(struct bnx2x *bp,
         REG_WR(bp, phy->mdio_ctrl + EMAC_REG_EMAC_MDIO_MODE,
                mode & ~EMAC_MDIO_MODE_CLAUSE_45);
 
-        /* address */
+        /* Address */
         tmp = ((phy->addr << 21) | (reg << 16) | val |
                EMAC_MDIO_COMM_COMMAND_WRITE_22 |
                EMAC_MDIO_COMM_START_BUSY);
@@ -2971,7 +3069,7 @@ static int bnx2x_cl22_read(struct bnx2x *bp,
         REG_WR(bp, phy->mdio_ctrl + EMAC_REG_EMAC_MDIO_MODE,
                mode & ~EMAC_MDIO_MODE_CLAUSE_45);
 
-        /* address */
+        /* Address */
         val = ((phy->addr << 21) | (reg << 16) |
                EMAC_MDIO_COMM_COMMAND_READ_22 |
                EMAC_MDIO_COMM_START_BUSY);
@@ -3009,7 +3107,7 @@ static int bnx2x_cl45_read(struct bnx2x *bp, struct bnx2x_phy *phy,
         if (phy->flags & FLAGS_MDC_MDIO_WA_B0)
                 bnx2x_bits_en(bp, phy->mdio_ctrl + EMAC_REG_EMAC_MDIO_STATUS,
                               EMAC_MDIO_STATUS_10MB);
-        /* address */
+        /* Address */
         val = ((phy->addr << 21) | (devad << 16) | reg |
                EMAC_MDIO_COMM_COMMAND_ADDRESS |
                EMAC_MDIO_COMM_START_BUSY);
@@ -3030,7 +3128,7 @@ static int bnx2x_cl45_read(struct bnx2x *bp, struct bnx2x_phy *phy,
                 *ret_val = 0;
                 rc = -EFAULT;
         } else {
-                /* data */
+                /* Data */
                 val = ((phy->addr << 21) | (devad << 16) |
                        EMAC_MDIO_COMM_COMMAND_READ_45 |
                        EMAC_MDIO_COMM_START_BUSY);
@@ -3078,7 +3176,7 @@ static int bnx2x_cl45_write(struct bnx2x *bp, struct bnx2x_phy *phy,
                 bnx2x_bits_en(bp, phy->mdio_ctrl + EMAC_REG_EMAC_MDIO_STATUS,
                               EMAC_MDIO_STATUS_10MB);
 
-        /* address */
+        /* Address */
         tmp = ((phy->addr << 21) | (devad << 16) | reg |
                EMAC_MDIO_COMM_COMMAND_ADDRESS |
                EMAC_MDIO_COMM_START_BUSY);
@@ -3098,7 +3196,7 @@ static int bnx2x_cl45_write(struct bnx2x *bp, struct bnx2x_phy *phy,
                 netdev_err(bp->dev,  "MDC/MDIO access timeout\n");
                 rc = -EFAULT;
         } else {
-                /* data */
+                /* Data */
                 tmp = ((phy->addr << 21) | (devad << 16) | val |
                        EMAC_MDIO_COMM_COMMAND_WRITE_45 |
                        EMAC_MDIO_COMM_START_BUSY);
@@ -3188,23 +3286,23 @@ static int bnx2x_bsc_read(struct link_params *params,
 
         xfer_cnt = 16 - lc_addr;
 
-        /* enable the engine */
+        /* Enable the engine */
         val = REG_RD(bp, MCP_REG_MCPR_IMC_COMMAND);
         val |= MCPR_IMC_COMMAND_ENABLE;
         REG_WR(bp, MCP_REG_MCPR_IMC_COMMAND, val);
 
-        /* program slave device ID */
+        /* Program slave device ID */
         val = (sl_devid << 16) | sl_addr;
         REG_WR(bp, MCP_REG_MCPR_IMC_SLAVE_CONTROL, val);
 
-        /* start xfer with 0 byte to update the address pointer ???*/
+        /* Start xfer with 0 byte to update the address pointer ???*/
         val = (MCPR_IMC_COMMAND_ENABLE) |
               (MCPR_IMC_COMMAND_WRITE_OP <<
                 MCPR_IMC_COMMAND_OPERATION_BITSHIFT) |
                 (lc_addr << MCPR_IMC_COMMAND_TRANSFER_ADDRESS_BITSHIFT) | (0);
         REG_WR(bp, MCP_REG_MCPR_IMC_COMMAND, val);
 
-        /* poll for completion */
+        /* Poll for completion */
         i = 0;
         val = REG_RD(bp, MCP_REG_MCPR_IMC_COMMAND);
         while (((val >> MCPR_IMC_COMMAND_IMC_STATUS_BITSHIFT) & 0x3) != 1) {
@@ -3220,7 +3318,7 @@ static int bnx2x_bsc_read(struct link_params *params,
         if (rc == -EFAULT)
                 return rc;
 
-        /* start xfer with read op */
+        /* Start xfer with read op */
         val = (MCPR_IMC_COMMAND_ENABLE) |
                 (MCPR_IMC_COMMAND_READ_OP <<
                 MCPR_IMC_COMMAND_OPERATION_BITSHIFT) |
@@ -3228,7 +3326,7 @@ static int bnx2x_bsc_read(struct link_params *params,
                   (xfer_cnt);
         REG_WR(bp, MCP_REG_MCPR_IMC_COMMAND, val);
 
-        /* poll for completion */
+        /* Poll for completion */
         i = 0;
         val = REG_RD(bp, MCP_REG_MCPR_IMC_COMMAND);
         while (((val >> MCPR_IMC_COMMAND_IMC_STATUS_BITSHIFT) & 0x3) != 1) {
@@ -3331,7 +3429,7 @@ static u8 bnx2x_get_warpcore_lane(struct bnx2x_phy *phy,
                         port = port ^ 1;
 
                 lane = (port<<1) + path;
-        } else { /* two port mode - no port swap */
+        } else { /* Two port mode - no port swap */
 
                 /* Figure out path swap value */
                 path_swap_ovr =
@@ -3409,7 +3507,7 @@ static void bnx2x_serdes_deassert(struct bnx2x *bp, u8 port)
 
         val = SERDES_RESET_BITS << (port*16);
 
-        /* reset and unreset the SerDes/XGXS */
+        /* Reset and unreset the SerDes/XGXS */
         REG_WR(bp, GRCBASE_MISC + MISC_REGISTERS_RESET_REG_3_CLEAR, val);
         udelay(500);
         REG_WR(bp, GRCBASE_MISC + MISC_REGISTERS_RESET_REG_3_SET, val);
@@ -3430,7 +3528,7 @@ static void bnx2x_xgxs_deassert(struct link_params *params)
 
         val = XGXS_RESET_BITS << (port*16);
 
-        /* reset and unreset the SerDes/XGXS */
+        /* Reset and unreset the SerDes/XGXS */
         REG_WR(bp, GRCBASE_MISC + MISC_REGISTERS_RESET_REG_3_CLEAR, val);
         udelay(500);
         REG_WR(bp, GRCBASE_MISC + MISC_REGISTERS_RESET_REG_3_SET, val);
@@ -3522,7 +3620,7 @@ static void bnx2x_ext_phy_set_pause(struct link_params *params,
 {
         u16 val;
         struct bnx2x *bp = params->bp;
-        /* read modify write pause advertizing */
+        /* Read modify write pause advertizing */
         bnx2x_cl45_read(bp, phy, MDIO_AN_DEVAD, MDIO_AN_REG_ADV_PAUSE, &val);
 
         val &= ~MDIO_AN_REG_ADV_PAUSE_BOTH;
@@ -3657,44 +3755,35 @@ static u8 bnx2x_ext_phy_resolve_fc(struct bnx2x_phy *phy,
 static void bnx2x_warpcore_enable_AN_KR(struct bnx2x_phy *phy,
                                         struct link_params *params,
                                         struct link_vars *vars) {
-        u16 val16 = 0, lane, bam37 = 0;
-        struct bnx2x *bp = params->bp;
+        u16 val16 = 0, lane, i;
+        struct bnx2x *bp = params->bp;
+        static struct bnx2x_reg_set reg_set[] = {
+                {MDIO_WC_DEVAD, MDIO_WC_REG_SERDESDIGITAL_CONTROL1000X2, 0x7},
+                {MDIO_AN_DEVAD, MDIO_WC_REG_PAR_DET_10G_CTRL, 0},
+                {MDIO_WC_DEVAD, MDIO_WC_REG_CL72_USERB0_CL72_MISC1_CONTROL, 0},
+                {MDIO_WC_DEVAD, MDIO_WC_REG_XGXSBLK1_LANECTRL0, 0xff},
+                {MDIO_WC_DEVAD, MDIO_WC_REG_XGXSBLK1_LANECTRL1, 0x5555},
+                {MDIO_PMA_DEVAD, MDIO_WC_REG_IEEE0BLK_AUTONEGNP, 0x0},
+                {MDIO_WC_DEVAD, MDIO_WC_REG_RX66_CONTROL, 0x7415},
+                {MDIO_WC_DEVAD, MDIO_WC_REG_SERDESDIGITAL_MISC2, 0x6190},
+                /* Disable Autoneg: re-enable it after adv is done. */
+                {MDIO_AN_DEVAD, MDIO_WC_REG_IEEE0BLK_MIICNTL, 0}
+        };
         DP(NETIF_MSG_LINK, "Enable Auto Negotiation for KR\n");
         /* Set to default registers that may be overriden by 10G force */
-        bnx2x_cl45_write(bp, phy, MDIO_WC_DEVAD,
-                         MDIO_WC_REG_SERDESDIGITAL_CONTROL1000X2, 0x7);
-        bnx2x_cl45_write(bp, phy, MDIO_AN_DEVAD,
-                         MDIO_WC_REG_PAR_DET_10G_CTRL, 0);
-        bnx2x_cl45_write(bp, phy, MDIO_WC_DEVAD,
-                         MDIO_WC_REG_CL72_USERB0_CL72_MISC1_CONTROL, 0);
-        bnx2x_cl45_write(bp, phy, MDIO_WC_DEVAD,
-                        MDIO_WC_REG_XGXSBLK1_LANECTRL0, 0xff);
-        bnx2x_cl45_write(bp, phy, MDIO_WC_DEVAD,
-                        MDIO_WC_REG_XGXSBLK1_LANECTRL1, 0x5555);
-        bnx2x_cl45_write(bp, phy, MDIO_PMA_DEVAD,
-                         MDIO_WC_REG_IEEE0BLK_AUTONEGNP, 0x0);
-        bnx2x_cl45_write(bp, phy, MDIO_WC_DEVAD,
-                         MDIO_WC_REG_RX66_CONTROL, 0x7415);
-        bnx2x_cl45_write(bp, phy, MDIO_WC_DEVAD,
-                         MDIO_WC_REG_SERDESDIGITAL_MISC2, 0x6190);
-        /* Disable Autoneg: re-enable it after adv is done. */
-        bnx2x_cl45_write(bp, phy, MDIO_AN_DEVAD,
-                         MDIO_WC_REG_IEEE0BLK_MIICNTL, 0);
+        for (i = 0; i < sizeof(reg_set)/sizeof(struct bnx2x_reg_set); i++)
+                bnx2x_cl45_write(bp, phy, reg_set[i].devad, reg_set[i].reg,
+                                 reg_set[i].val);
 
         /* Check adding advertisement for 1G KX */
         if (((vars->line_speed == SPEED_AUTO_NEG) &&
              (phy->speed_cap_mask & PORT_HW_CFG_SPEED_CAPABILITY_D0_1G)) ||
             (vars->line_speed == SPEED_1000)) {
-                u16 sd_digital;
+                u32 addr = MDIO_WC_REG_SERDESDIGITAL_CONTROL1000X2;
                 val16 |= (1<<5);
 
                 /* Enable CL37 1G Parallel Detect */
-                bnx2x_cl45_read(bp, phy, MDIO_WC_DEVAD,
-                        MDIO_WC_REG_SERDESDIGITAL_CONTROL1000X2, &sd_digital);
-                bnx2x_cl45_write(bp, phy, MDIO_WC_DEVAD,
-                         MDIO_WC_REG_SERDESDIGITAL_CONTROL1000X2,
-                                 (sd_digital | 0x1));
-
+                bnx2x_cl45_read_or_write(bp, phy, MDIO_WC_DEVAD, addr, 0x1);
                 DP(NETIF_MSG_LINK, "Advertize 1G\n");
         }
         if (((vars->line_speed == SPEED_AUTO_NEG) &&
@@ -3704,7 +3793,7 @@ static void bnx2x_warpcore_enable_AN_KR(struct bnx2x_phy *phy,
                 val16 |= (1<<7);
                 /* Enable 10G Parallel Detect */
                 bnx2x_cl45_write(bp, phy, MDIO_AN_DEVAD,
-                                MDIO_WC_REG_PAR_DET_10G_CTRL, 1);
+                                 MDIO_WC_REG_PAR_DET_10G_CTRL, 1);
 
                 DP(NETIF_MSG_LINK, "Advertize 10G\n");
         }
@@ -3738,10 +3827,9 @@ static void bnx2x_warpcore_enable_AN_KR(struct bnx2x_phy *phy,
                    offsetof(struct shmem_region, dev_info.
                             port_hw_config[params->port].default_cfg)) &
             PORT_HW_CFG_ENABLE_BAM_ON_KR_ENABLED) {
-                bnx2x_cl45_read(bp, phy, MDIO_WC_DEVAD,
-                                MDIO_WC_REG_DIGITAL6_MP5_NEXTPAGECTRL, &bam37);
-                bnx2x_cl45_write(bp, phy, MDIO_WC_DEVAD,
-                        MDIO_WC_REG_DIGITAL6_MP5_NEXTPAGECTRL, bam37 | 1);
+                bnx2x_cl45_read_or_write(bp, phy, MDIO_WC_DEVAD,
+                                         MDIO_WC_REG_DIGITAL6_MP5_NEXTPAGECTRL,
+                                         1);
                 DP(NETIF_MSG_LINK, "Enable CL37 BAM on KR\n");
         }
 
@@ -3755,11 +3843,8 @@ static void bnx2x_warpcore_enable_AN_KR(struct bnx2x_phy *phy,
                 DP(NETIF_MSG_LINK, "Enable AN KR work-around\n");
                 vars->rx_tx_asic_rst = MAX_KR_LINK_RETRY;
         }
-        bnx2x_cl45_read(bp, phy, MDIO_WC_DEVAD,
-                        MDIO_WC_REG_DIGITAL5_MISC7, &val16);
-
-        bnx2x_cl45_write(bp, phy, MDIO_WC_DEVAD,
-                         MDIO_WC_REG_DIGITAL5_MISC7, val16 | 0x100);
+        bnx2x_cl45_read_or_write(bp, phy, MDIO_WC_DEVAD,
+                                 MDIO_WC_REG_DIGITAL5_MISC7, 0x100);
 
         /* Over 1G - AN local device user page 1 */
         bnx2x_cl45_write(bp, phy, MDIO_WC_DEVAD,
@@ -3776,50 +3861,35 @@ static void bnx2x_warpcore_set_10G_KR(struct bnx2x_phy *phy,
                                       struct link_vars *vars)
 {
         struct bnx2x *bp = params->bp;
-        u16 val;
-
-        /* Disable Autoneg */
-        bnx2x_cl45_write(bp, phy, MDIO_WC_DEVAD,
-                         MDIO_WC_REG_SERDESDIGITAL_CONTROL1000X2, 0x7);
-
-        bnx2x_cl45_write(bp, phy, MDIO_AN_DEVAD,
-                         MDIO_WC_REG_PAR_DET_10G_CTRL, 0);
-
-        bnx2x_cl45_write(bp, phy, MDIO_WC_DEVAD,
-                         MDIO_WC_REG_CL72_USERB0_CL72_MISC1_CONTROL, 0x3f00);
-
-        bnx2x_cl45_write(bp, phy, MDIO_AN_DEVAD,
-                         MDIO_WC_REG_AN_IEEE1BLK_AN_ADVERTISEMENT1, 0);
-
-        bnx2x_cl45_write(bp, phy, MDIO_AN_DEVAD,
-                         MDIO_WC_REG_IEEE0BLK_MIICNTL, 0x0);
-
-        bnx2x_cl45_write(bp, phy, MDIO_WC_DEVAD,
-                        MDIO_WC_REG_DIGITAL3_UP1, 0x1);
-
-        bnx2x_cl45_write(bp, phy, MDIO_WC_DEVAD,
-                         MDIO_WC_REG_DIGITAL5_MISC7, 0xa);
-
-        /* Disable CL36 PCS Tx */
-        bnx2x_cl45_write(bp, phy, MDIO_WC_DEVAD,
-                        MDIO_WC_REG_XGXSBLK1_LANECTRL0, 0x0);
-
-        /* Double Wide Single Data Rate @ pll rate */
-        bnx2x_cl45_write(bp, phy, MDIO_WC_DEVAD,
-                        MDIO_WC_REG_XGXSBLK1_LANECTRL1, 0xFFFF);
-
-        /* Leave cl72 training enable, needed for KR */
-        bnx2x_cl45_write(bp, phy, MDIO_PMA_DEVAD,
+        u16 i;
+        static struct bnx2x_reg_set reg_set[] = {
+                /* Disable Autoneg */
+                {MDIO_WC_DEVAD, MDIO_WC_REG_SERDESDIGITAL_CONTROL1000X2, 0x7},
+                {MDIO_AN_DEVAD, MDIO_WC_REG_PAR_DET_10G_CTRL, 0},
+                {MDIO_WC_DEVAD, MDIO_WC_REG_CL72_USERB0_CL72_MISC1_CONTROL,
+                        0x3f00},
+                {MDIO_AN_DEVAD, MDIO_WC_REG_AN_IEEE1BLK_AN_ADVERTISEMENT1, 0},
+                {MDIO_AN_DEVAD, MDIO_WC_REG_IEEE0BLK_MIICNTL, 0x0},
+                {MDIO_WC_DEVAD, MDIO_WC_REG_DIGITAL3_UP1, 0x1},
+                {MDIO_WC_DEVAD, MDIO_WC_REG_DIGITAL5_MISC7, 0xa},
+                /* Disable CL36 PCS Tx */
+                {MDIO_WC_DEVAD, MDIO_WC_REG_XGXSBLK1_LANECTRL0, 0x0},
+                /* Double Wide Single Data Rate @ pll rate */
+                {MDIO_WC_DEVAD, MDIO_WC_REG_XGXSBLK1_LANECTRL1, 0xFFFF},
+                /* Leave cl72 training enable, needed for KR */
+                {MDIO_PMA_DEVAD,
                 MDIO_WC_REG_PMD_IEEE9BLK_TENGBASE_KR_PMD_CONTROL_REGISTER_150,
-                0x2);
+                0x2}
+        };
+
+        for (i = 0; i < sizeof(reg_set)/sizeof(struct bnx2x_reg_set); i++)
+                bnx2x_cl45_write(bp, phy, reg_set[i].devad, reg_set[i].reg,
+                                 reg_set[i].val);
 
         /* Leave CL72 enabled */
-        bnx2x_cl45_read(bp, phy, MDIO_WC_DEVAD,
-                         MDIO_WC_REG_CL72_USERB0_CL72_MISC1_CONTROL,
-                         &val);
-        bnx2x_cl45_write(bp, phy, MDIO_WC_DEVAD,
-                         MDIO_WC_REG_CL72_USERB0_CL72_MISC1_CONTROL,
-                         val | 0x3800);
+        bnx2x_cl45_read_or_write(bp, phy, MDIO_WC_DEVAD,
+                                 MDIO_WC_REG_CL72_USERB0_CL72_MISC1_CONTROL,
+                                 0x3800);
 
         /* Set speed via PMA/PMD register */
         bnx2x_cl45_write(bp, phy, MDIO_PMA_DEVAD,
@@ -3840,7 +3910,7 @@ static void bnx2x_warpcore_set_10G_KR(struct bnx2x_phy *phy,
         bnx2x_cl45_read_or_write(bp, phy, MDIO_WC_DEVAD,
                                  MDIO_WC_REG_RX66_CONTROL, 0xF9);
 
-        /* set and clear loopback to cause a reset to 64/66 decoder */
+        /* Set and clear loopback to cause a reset to 64/66 decoder */
         bnx2x_cl45_write(bp, phy, MDIO_WC_DEVAD,
                          MDIO_WC_REG_IEEE0BLK_MIICNTL, 0x4000);
         bnx2x_cl45_write(bp, phy, MDIO_WC_DEVAD,
@@ -3855,16 +3925,12 @@ static void bnx2x_warpcore_set_10G_XFI(struct bnx2x_phy *phy,
         struct bnx2x *bp = params->bp;
         u16 misc1_val, tap_val, tx_driver_val, lane, val;
         /* Hold rxSeqStart */
-        bnx2x_cl45_read(bp, phy, MDIO_WC_DEVAD,
-                        MDIO_WC_REG_DSC2B0_DSC_MISC_CTRL0, &val);
-        bnx2x_cl45_write(bp, phy, MDIO_WC_DEVAD,
-                         MDIO_WC_REG_DSC2B0_DSC_MISC_CTRL0, (val | 0x8000));
+        bnx2x_cl45_read_or_write(bp, phy, MDIO_WC_DEVAD,
+                                 MDIO_WC_REG_DSC2B0_DSC_MISC_CTRL0, 0x8000);
 
         /* Hold tx_fifo_reset */
-        bnx2x_cl45_read(bp, phy, MDIO_WC_DEVAD,
-                        MDIO_WC_REG_SERDESDIGITAL_CONTROL1000X3, &val);
-        bnx2x_cl45_write(bp, phy, MDIO_WC_DEVAD,
-                         MDIO_WC_REG_SERDESDIGITAL_CONTROL1000X3, (val | 0x1));
+        bnx2x_cl45_read_or_write(bp, phy, MDIO_WC_DEVAD,
+                                 MDIO_WC_REG_SERDESDIGITAL_CONTROL1000X3, 0x1);
 
         /* Disable CL73 AN */
         bnx2x_cl45_write(bp, phy, MDIO_AN_DEVAD, MDIO_AN_REG_CTRL, 0);
@@ -3876,10 +3942,8 @@ static void bnx2x_warpcore_set_10G_XFI(struct bnx2x_phy *phy,
                          MDIO_WC_REG_FX100_CTRL1, (val & 0xFFFA));
 
         /* Disable 100FX Idle detect */
-        bnx2x_cl45_read(bp, phy, MDIO_WC_DEVAD,
-                        MDIO_WC_REG_FX100_CTRL3, &val);
-        bnx2x_cl45_write(bp, phy, MDIO_WC_DEVAD,
-                         MDIO_WC_REG_FX100_CTRL3, (val | 0x0080));
+        bnx2x_cl45_read_or_write(bp, phy, MDIO_WC_DEVAD,
+                                 MDIO_WC_REG_FX100_CTRL3, 0x0080);
 
         /* Set Block address to Remote PHY & Clear forced_speed[5] */
         bnx2x_cl45_read(bp, phy, MDIO_WC_DEVAD,
@@ -3940,16 +4004,20 @@ static void bnx2x_warpcore_set_10G_XFI(struct bnx2x_phy *phy,
                          tx_driver_val);
 
         /* Enable fiber mode, enable and invert sig_det */
-        bnx2x_cl45_read(bp, phy, MDIO_WC_DEVAD,
-                        MDIO_WC_REG_SERDESDIGITAL_CONTROL1000X1, &val);
-        bnx2x_cl45_write(bp, phy, MDIO_WC_DEVAD,
-                         MDIO_WC_REG_SERDESDIGITAL_CONTROL1000X1, val | 0xd);
+        bnx2x_cl45_read_or_write(bp, phy, MDIO_WC_DEVAD,
+                                 MDIO_WC_REG_SERDESDIGITAL_CONTROL1000X1, 0xd);
 
         /* Set Block address to Remote PHY & Set forced_speed[5], 40bit mode */
-        bnx2x_cl45_read(bp, phy, MDIO_WC_DEVAD,
-                        MDIO_WC_REG_DIGITAL4_MISC3, &val);
+        bnx2x_cl45_read_or_write(bp, phy, MDIO_WC_DEVAD,
+                                 MDIO_WC_REG_DIGITAL4_MISC3, 0x8080);
+
+        /* Enable LPI pass through */
+        DP(NETIF_MSG_LINK, "Configure WC for LPI pass through\n");
         bnx2x_cl45_write(bp, phy, MDIO_WC_DEVAD,
-                         MDIO_WC_REG_DIGITAL4_MISC3, val | 0x8080);
+                         MDIO_WC_REG_EEE_COMBO_CONTROL0,
+                         0x7c);
+        bnx2x_cl45_read_or_write(bp, phy, MDIO_WC_DEVAD,
+                                 MDIO_WC_REG_DIGITAL4_MISC5, 0xc000);
 
         /* 10G XFI Full Duplex */
         bnx2x_cl45_write(bp, phy, MDIO_WC_DEVAD,
@@ -4139,40 +4207,35 @@ static void bnx2x_warpcore_clear_regs(struct bnx2x_phy *phy,
                                       u16 lane)
 {
         struct bnx2x *bp = params->bp;
-        u16 val16;
-
+        u16 i;
+        static struct bnx2x_reg_set wc_regs[] = {
+                {MDIO_AN_DEVAD, MDIO_AN_REG_CTRL, 0},
+                {MDIO_WC_DEVAD, MDIO_WC_REG_FX100_CTRL1, 0x014a},
+                {MDIO_WC_DEVAD, MDIO_WC_REG_FX100_CTRL3, 0x0800},
+                {MDIO_WC_DEVAD, MDIO_WC_REG_DIGITAL4_MISC3, 0x8008},
+                {MDIO_WC_DEVAD, MDIO_WC_REG_SERDESDIGITAL_CONTROL1000X1,
+                        0x0195},
+                {MDIO_WC_DEVAD, MDIO_WC_REG_SERDESDIGITAL_CONTROL1000X2,
+                        0x0007},
+                {MDIO_WC_DEVAD, MDIO_WC_REG_SERDESDIGITAL_CONTROL1000X3,
+                        0x0002},
+                {MDIO_WC_DEVAD, MDIO_WC_REG_SERDESDIGITAL_MISC1, 0x6000},
+                {MDIO_WC_DEVAD, MDIO_WC_REG_TX_FIR_TAP, 0x0000},
+                {MDIO_WC_DEVAD, MDIO_WC_REG_IEEE0BLK_MIICNTL, 0x2040},
+                {MDIO_WC_DEVAD, MDIO_WC_REG_COMBO_IEEE0_MIICTRL, 0x0140}
+        };
         /* Set XFI clock comp as default. */
-        bnx2x_cl45_read(bp, phy, MDIO_WC_DEVAD,
-                        MDIO_WC_REG_RX66_CONTROL, &val16);
-        bnx2x_cl45_write(bp, phy, MDIO_WC_DEVAD,
-                         MDIO_WC_REG_RX66_CONTROL, val16 | (3<<13));
+        bnx2x_cl45_read_or_write(bp, phy, MDIO_WC_DEVAD,
+                                 MDIO_WC_REG_RX66_CONTROL, (3<<13));
+
+        for (i = 0; i < sizeof(wc_regs)/sizeof(struct bnx2x_reg_set); i++)
+                bnx2x_cl45_write(bp, phy, wc_regs[i].devad, wc_regs[i].reg,
+                                 wc_regs[i].val);
 
-        bnx2x_warpcore_reset_lane(bp, phy, 1);
-        bnx2x_cl45_write(bp, phy, MDIO_AN_DEVAD, MDIO_AN_REG_CTRL, 0);
-        bnx2x_cl45_write(bp, phy, MDIO_WC_DEVAD,
-                         MDIO_WC_REG_FX100_CTRL1, 0x014a);
-        bnx2x_cl45_write(bp, phy, MDIO_WC_DEVAD,
-                         MDIO_WC_REG_FX100_CTRL3, 0x0800);
-        bnx2x_cl45_write(bp, phy, MDIO_WC_DEVAD,
-                         MDIO_WC_REG_DIGITAL4_MISC3, 0x8008);
-        bnx2x_cl45_write(bp, phy, MDIO_WC_DEVAD,
-                         MDIO_WC_REG_SERDESDIGITAL_CONTROL1000X1, 0x0195);
-        bnx2x_cl45_write(bp, phy, MDIO_WC_DEVAD,
-                         MDIO_WC_REG_SERDESDIGITAL_CONTROL1000X2, 0x0007);
-        bnx2x_cl45_write(bp, phy, MDIO_WC_DEVAD,
-                         MDIO_WC_REG_SERDESDIGITAL_CONTROL1000X3, 0x0002);
-        bnx2x_cl45_write(bp, phy, MDIO_WC_DEVAD,
-                         MDIO_WC_REG_SERDESDIGITAL_MISC1, 0x6000);
         lane = bnx2x_get_warpcore_lane(phy, params);
         bnx2x_cl45_write(bp, phy, MDIO_WC_DEVAD,
-                         MDIO_WC_REG_TX_FIR_TAP, 0x0000);
-        bnx2x_cl45_write(bp, phy, MDIO_WC_DEVAD,
                          MDIO_WC_REG_TX0_TX_DRIVER + 0x10*lane, 0x0990);
-        bnx2x_cl45_write(bp, phy, MDIO_WC_DEVAD,
-                         MDIO_WC_REG_IEEE0BLK_MIICNTL, 0x2040);
-        bnx2x_cl45_write(bp, phy, MDIO_WC_DEVAD,
-                         MDIO_WC_REG_COMBO_IEEE0_MIICTRL, 0x0140);
-        bnx2x_warpcore_reset_lane(bp, phy, 0);
+
 }
 
 static int bnx2x_get_mod_abs_int_cfg(struct bnx2x *bp,
@@ -4260,7 +4323,7 @@ static void bnx2x_warpcore_config_runtime(struct bnx2x_phy *phy,
         if (!vars->turn_to_run_wc_rt)
                 return;
 
-        /* return if there is no link partner */
+        /* Return if there is no link partner */
         if (!(bnx2x_warpcore_get_sigdet(phy, params))) {
                 DP(NETIF_MSG_LINK, "bnx2x_warpcore_get_sigdet false\n");
                 return;
@@ -4294,7 +4357,7 @@ static void bnx2x_warpcore_config_runtime(struct bnx2x_phy *phy,
                                 bnx2x_warpcore_reset_lane(bp, phy, 1);
                                 bnx2x_warpcore_reset_lane(bp, phy, 0);
 
-                                /* restart Autoneg */
+                                /* Restart Autoneg */
                                 bnx2x_cl45_write(bp, phy, MDIO_AN_DEVAD,
                                         MDIO_WC_REG_IEEE0BLK_MIICNTL, 0x1200);
 
@@ -4311,6 +4374,23 @@ static void bnx2x_warpcore_config_runtime(struct bnx2x_phy *phy,
         } /*params->rx_tx_asic_rst*/
 
 }
+static void bnx2x_warpcore_config_sfi(struct bnx2x_phy *phy,
+                                      struct link_params *params)
+{
+        u16 lane = bnx2x_get_warpcore_lane(phy, params);
+        struct bnx2x *bp = params->bp;
+        bnx2x_warpcore_clear_regs(phy, params, lane);
+        if ((params->req_line_speed[LINK_CONFIG_IDX(INT_PHY)] ==
+             SPEED_10000) &&
+            (phy->media_type != ETH_PHY_SFP_1G_FIBER)) {
+                DP(NETIF_MSG_LINK, "Setting 10G SFI\n");
+                bnx2x_warpcore_set_10G_XFI(phy, params, 0);
+        } else {
+                DP(NETIF_MSG_LINK, "Setting 1G Fiber\n");
+                bnx2x_warpcore_set_sgmii_speed(phy, params, 1, 0);
+        }
+}
+
 static void bnx2x_warpcore_config_init(struct bnx2x_phy *phy,
                                        struct link_params *params,
                                        struct link_vars *vars)
@@ -4371,19 +4451,11 @@ static void bnx2x_warpcore_config_init(struct bnx2x_phy *phy,
                         break;
 
                 case PORT_HW_CFG_NET_SERDES_IF_SFI:
-
-                        bnx2x_warpcore_clear_regs(phy, params, lane);
-                        if (vars->line_speed == SPEED_10000) {
-                                DP(NETIF_MSG_LINK, "Setting 10G SFI\n");
-                                bnx2x_warpcore_set_10G_XFI(phy, params, 0);
-                        } else if (vars->line_speed == SPEED_1000) {
-                                DP(NETIF_MSG_LINK, "Setting 1G Fiber\n");
-                                bnx2x_warpcore_set_sgmii_speed(
-                                                phy, params, 1, 0);
-                        }
                         /* Issue Module detection */
                         if (bnx2x_is_sfp_module_plugged(phy, params))
                                 bnx2x_sfp_module_detection(phy, params);
+
+                        bnx2x_warpcore_config_sfi(phy, params);
                         break;
 
                 case PORT_HW_CFG_NET_SERDES_IF_DXGXS:
@@ -4500,12 +4572,9 @@ static void bnx2x_set_warpcore_loopback(struct bnx2x_phy *phy,
                 CL22_WR_OVER_CL45(bp, phy, MDIO_REG_BANK_AER_BLOCK,
                                   MDIO_AER_BLOCK_AER_REG, 0);
                 /* Enable 1G MDIO (1-copy) */
-                bnx2x_cl45_read(bp, phy, MDIO_WC_DEVAD,
-                                MDIO_WC_REG_XGXSBLK0_XGXSCONTROL,
-                                &val16);
-                bnx2x_cl45_write(bp, phy, MDIO_WC_DEVAD,
-                                MDIO_WC_REG_XGXSBLK0_XGXSCONTROL,
-                                val16 | 0x10);
+                bnx2x_cl45_read_or_write(bp, phy, MDIO_WC_DEVAD,
+                                         MDIO_WC_REG_XGXSBLK0_XGXSCONTROL,
+                                         0x10);
                 /* Set 1G loopback based on lane (1-copy) */
                 lane = bnx2x_get_warpcore_lane(phy, params);
                 bnx2x_cl45_read(bp, phy, MDIO_WC_DEVAD,
@@ -4518,22 +4587,19 @@ static void bnx2x_set_warpcore_loopback(struct bnx2x_phy *phy,
                 bnx2x_set_aer_mmd(params, phy);
         } else {
                 /* 10G & 20G */
-                bnx2x_cl45_read(bp, phy, MDIO_WC_DEVAD,
-                                MDIO_WC_REG_COMBO_IEEE0_MIICTRL, &val16);
-                bnx2x_cl45_write(bp, phy, MDIO_WC_DEVAD,
-                                MDIO_WC_REG_COMBO_IEEE0_MIICTRL, val16 |
-                                 0x4000);
+                bnx2x_cl45_read_or_write(bp, phy, MDIO_WC_DEVAD,
+                                         MDIO_WC_REG_COMBO_IEEE0_MIICTRL,
+                                         0x4000);
 
-                bnx2x_cl45_read(bp, phy, MDIO_WC_DEVAD,
-                                MDIO_WC_REG_IEEE0BLK_MIICNTL, &val16);
-                bnx2x_cl45_write(bp, phy, MDIO_WC_DEVAD,
-                                MDIO_WC_REG_IEEE0BLK_MIICNTL, val16 | 0x1);
+                bnx2x_cl45_read_or_write(bp, phy, MDIO_WC_DEVAD,
+                                         MDIO_WC_REG_IEEE0BLK_MIICNTL, 0x1);
         }
 }
 
 
-void bnx2x_sync_link(struct link_params *params,
-                           struct link_vars *vars)
+
+static void bnx2x_sync_link(struct link_params *params,
+                             struct link_vars *vars)
 {
         struct bnx2x *bp = params->bp;
         u8 link_10g_plus;
@@ -4606,7 +4672,7 @@ void bnx2x_sync_link(struct link_params *params,
                     USES_WARPCORE(bp) &&
                     (vars->line_speed == SPEED_1000))
                         vars->phy_flags |= PHY_SGMII_FLAG;
-                /* anything 10 and over uses the bmac */
+                /* Anything 10 and over uses the bmac */
                 link_10g_plus = (vars->line_speed >= SPEED_10000);
 
                 if (link_10g_plus) {
@@ -4620,7 +4686,7 @@ void bnx2x_sync_link(struct link_params *params,
                         else
                                 vars->mac_type = MAC_TYPE_EMAC;
                 }
-        } else { /* link down */
+        } else { /* Link down */
                 DP(NETIF_MSG_LINK, "phy link down\n");
 
                 vars->phy_link_up = 0;
@@ -4629,10 +4695,12 @@ void bnx2x_sync_link(struct link_params *params,
                 vars->duplex = DUPLEX_FULL;
                 vars->flow_ctrl = BNX2X_FLOW_CTRL_NONE;
 
-                /* indicate no mac active */
+                /* Indicate no mac active */
                 vars->mac_type = MAC_TYPE_NONE;
                 if (vars->link_status & LINK_STATUS_PHYSICAL_LINK_FLAG)
                         vars->phy_flags |= PHY_HALF_OPEN_CONN_FLAG;
+                if (vars->link_status & LINK_STATUS_SFP_TX_FAULT)
+                        vars->phy_flags |= PHY_SFP_TX_FAULT_FLAG;
         }
 }
 
@@ -4698,7 +4766,7 @@ static void bnx2x_set_master_ln(struct link_params *params,
                      PORT_HW_CFG_LANE_SWAP_CFG_MASTER_MASK) >>
                     PORT_HW_CFG_LANE_SWAP_CFG_MASTER_SHIFT);
 
-        /* set the master_ln for AN */
+        /* Set the master_ln for AN */
         CL22_RD_OVER_CL45(bp, phy,
                           MDIO_REG_BANK_XGXS_BLOCK2,
                           MDIO_XGXS_BLOCK2_TEST_MODE_LANE,
@@ -4721,7 +4789,7 @@ static int bnx2x_reset_unicore(struct link_params *params,
                           MDIO_REG_BANK_COMBO_IEEE0,
                           MDIO_COMBO_IEEE0_MII_CONTROL, &mii_control);
 
-        /* reset the unicore */
+        /* Reset the unicore */
         CL22_WR_OVER_CL45(bp, phy,
                           MDIO_REG_BANK_COMBO_IEEE0,
                           MDIO_COMBO_IEEE0_MII_CONTROL,
@@ -4730,11 +4798,11 @@ static int bnx2x_reset_unicore(struct link_params *params,
         if (set_serdes)
                 bnx2x_set_serdes_access(bp, params->port);
 
-        /* wait for the reset to self clear */
+        /* Wait for the reset to self clear */
         for (i = 0; i < MDIO_ACCESS_TIMEOUT; i++) {
                 udelay(5);
 
-                /* the reset erased the previous bank value */
+                /* The reset erased the previous bank value */
                 CL22_RD_OVER_CL45(bp, phy,
                                   MDIO_REG_BANK_COMBO_IEEE0,
                                   MDIO_COMBO_IEEE0_MII_CONTROL,
@@ -4952,7 +5020,7 @@ static void bnx2x_set_autoneg(struct bnx2x_phy *phy,
                           MDIO_CL73_IEEEB0_CL73_AN_CONTROL, reg_val);
 }
 
-/* program SerDes, forced speed */
+/* Program SerDes, forced speed */
 static void bnx2x_program_serdes(struct bnx2x_phy *phy,
                                  struct link_params *params,
                                  struct link_vars *vars)
@@ -4960,7 +5028,7 @@ static void bnx2x_program_serdes(struct bnx2x_phy *phy,
         struct bnx2x *bp = params->bp;
         u16 reg_val;
 
-        /* program duplex, disable autoneg and sgmii*/
+        /* Program duplex, disable autoneg and sgmii*/
         CL22_RD_OVER_CL45(bp, phy,
                           MDIO_REG_BANK_COMBO_IEEE0,
                           MDIO_COMBO_IEEE0_MII_CONTROL, &reg_val);
@@ -4979,7 +5047,7 @@ static void bnx2x_program_serdes(struct bnx2x_phy *phy,
         CL22_RD_OVER_CL45(bp, phy,
                           MDIO_REG_BANK_SERDES_DIGITAL,
                           MDIO_SERDES_DIGITAL_MISC1, &reg_val);
-        /* clearing the speed value before setting the right speed */
+        /* Clearing the speed value before setting the right speed */
         DP(NETIF_MSG_LINK, "MDIO_REG_BANK_SERDES_DIGITAL = 0x%x\n", reg_val);
 
         reg_val &= ~(MDIO_SERDES_DIGITAL_MISC1_FORCE_SPEED_MASK |
@@ -5008,7 +5076,7 @@ static void bnx2x_set_brcm_cl37_advertisement(struct bnx2x_phy *phy,
         struct bnx2x *bp = params->bp;
         u16 val = 0;
 
-        /* set extended capabilities */
+        /* Set extended capabilities */
         if (phy->speed_cap_mask & PORT_HW_CFG_SPEED_CAPABILITY_D0_2_5G)
                 val |= MDIO_OVER_1G_UP1_2_5G;
         if (phy->speed_cap_mask & PORT_HW_CFG_SPEED_CAPABILITY_D0_10G)
@@ -5028,7 +5096,7 @@ static void bnx2x_set_ieee_aneg_advertisement(struct bnx2x_phy *phy,
 {
         struct bnx2x *bp = params->bp;
         u16 val;
-        /* for AN, we are always publishing full duplex */
+        /* For AN, we are always publishing full duplex */
 
         CL22_WR_OVER_CL45(bp, phy,
                           MDIO_REG_BANK_COMBO_IEEE0,
@@ -5090,14 +5158,14 @@ static void bnx2x_initialize_sgmii_process(struct bnx2x_phy *phy,
         struct bnx2x *bp = params->bp;
         u16 control1;
 
-        /* in SGMII mode, the unicore is always slave */
+        /* In SGMII mode, the unicore is always slave */
 
         CL22_RD_OVER_CL45(bp, phy,
                           MDIO_REG_BANK_SERDES_DIGITAL,
                           MDIO_SERDES_DIGITAL_A_1000X_CONTROL1,
                           &control1);
         control1 |= MDIO_SERDES_DIGITAL_A_1000X_CONTROL1_INVERT_SIGNAL_DETECT;
-        /* set sgmii mode (and not fiber) */
+        /* Set sgmii mode (and not fiber) */
         control1 &= ~(MDIO_SERDES_DIGITAL_A_1000X_CONTROL1_FIBER_MODE |
                       MDIO_SERDES_DIGITAL_A_1000X_CONTROL1_AUTODET |
                       MDIO_SERDES_DIGITAL_A_1000X_CONTROL1_MSTR_MODE);
@@ -5106,9 +5174,9 @@ static void bnx2x_initialize_sgmii_process(struct bnx2x_phy *phy,
                           MDIO_SERDES_DIGITAL_A_1000X_CONTROL1,
                           control1);
 
-        /* if forced speed */
+        /* If forced speed */
         if (!(vars->line_speed == SPEED_AUTO_NEG)) {
-                /* set speed, disable autoneg */
+                /* Set speed, disable autoneg */
                 u16 mii_control;
 
                 CL22_RD_OVER_CL45(bp, phy,
@@ -5129,16 +5197,16 @@ static void bnx2x_initialize_sgmii_process(struct bnx2x_phy *phy,
                                 MDIO_COMBO_IEEO_MII_CONTROL_MAN_SGMII_SP_1000;
                         break;
                 case SPEED_10:
-                        /* there is nothing to set for 10M */
+                        /* There is nothing to set for 10M */
                         break;
                 default:
-                        /* invalid speed for SGMII */
+                        /* Invalid speed for SGMII */
                         DP(NETIF_MSG_LINK, "Invalid line_speed 0x%x\n",
                                   vars->line_speed);
                         break;
                 }
 
-                /* setting the full duplex */
+                /* Setting the full duplex */
                 if (phy->req_duplex == DUPLEX_FULL)
                         mii_control |=
                                 MDIO_COMBO_IEEO_MII_CONTROL_FULL_DUPLEX;
@@ -5148,7 +5216,7 @@ static void bnx2x_initialize_sgmii_process(struct bnx2x_phy *phy,
                                   mii_control);
 
         } else { /* AN mode */
-                /* enable and restart AN */
+                /* Enable and restart AN */
                 bnx2x_restart_autoneg(phy, params, 0);
         }
 }
@@ -5244,7 +5312,7 @@ static void bnx2x_flow_ctrl_resolve(struct bnx2x_phy *phy,
         struct bnx2x *bp = params->bp;
         vars->flow_ctrl = BNX2X_FLOW_CTRL_NONE;
 
-        /* resolve from gp_status in case of AN complete and not sgmii */
+        /* Resolve from gp_status in case of AN complete and not sgmii */
         if (phy->req_flow_ctrl != BNX2X_FLOW_CTRL_AUTO) {
                 /* Update the advertised flow-controled of LD/LP in AN */
                 if (phy->req_line_speed == SPEED_AUTO_NEG)
@@ -5468,7 +5536,7 @@ static int bnx2x_link_settings_status(struct bnx2x_phy *phy,
                                 bnx2x_xgxs_an_resolve(phy, params, vars,
                                                       gp_status);
                 }
-        } else { /* link_down */
+        } else { /* Link_down */
                 if ((phy->req_line_speed == SPEED_AUTO_NEG) &&
                     SINGLE_MEDIA_DIRECT(params)) {
                         /* Check signal is detected */
@@ -5617,12 +5685,12 @@ static void bnx2x_set_gmii_tx_driver(struct link_params *params)
         u16 tx_driver;
         u16 bank;
 
-        /* read precomp */
+        /* Read precomp */
         CL22_RD_OVER_CL45(bp, phy,
                           MDIO_REG_BANK_OVER_1G,
                           MDIO_OVER_1G_LP_UP2, &lp_up2);
 
-        /* bits [10:7] at lp_up2, positioned at [15:12] */
+        /* Bits [10:7] at lp_up2, positioned at [15:12] */
         lp_up2 = (((lp_up2 & MDIO_OVER_1G_LP_UP2_PREEMPHASIS_MASK) >>
                    MDIO_OVER_1G_LP_UP2_PREEMPHASIS_SHIFT) <<
                   MDIO_TX0_TX_DRIVER_PREEMPHASIS_SHIFT);
@@ -5636,7 +5704,7 @@ static void bnx2x_set_gmii_tx_driver(struct link_params *params)
                                   bank,
                                   MDIO_TX0_TX_DRIVER, &tx_driver);
 
-                /* replace tx_driver bits [15:12] */
+                /* Replace tx_driver bits [15:12] */
                 if (lp_up2 !=
                     (tx_driver & MDIO_TX0_TX_DRIVER_PREEMPHASIS_MASK)) {
                         tx_driver &= ~MDIO_TX0_TX_DRIVER_PREEMPHASIS_MASK;
@@ -5732,16 +5800,16 @@ static void bnx2x_xgxs_config_init(struct bnx2x_phy *phy,
                      FEATURE_CONFIG_OVERRIDE_PREEMPHASIS_ENABLED))
                         bnx2x_set_preemphasis(phy, params);
 
-                /* forced speed requested? */
+                /* Forced speed requested? */
                 if (vars->line_speed != SPEED_AUTO_NEG ||
                     (SINGLE_MEDIA_DIRECT(params) &&
                      params->loopback_mode == LOOPBACK_EXT)) {
                         DP(NETIF_MSG_LINK, "not SGMII, no AN\n");
 
-                        /* disable autoneg */
+                        /* Disable autoneg */
                         bnx2x_set_autoneg(phy, params, vars, 0);
 
-                        /* program speed and duplex */
+                        /* Program speed and duplex */
                         bnx2x_program_serdes(phy, params, vars);
 
                 } else { /* AN_mode */
@@ -5750,14 +5818,14 @@ static void bnx2x_xgxs_config_init(struct bnx2x_phy *phy,
                         /* AN enabled */
                         bnx2x_set_brcm_cl37_advertisement(phy, params);
 
-                        /* program duplex & pause advertisement (for aneg) */
+                        /* Program duplex & pause advertisement (for aneg) */
                         bnx2x_set_ieee_aneg_advertisement(phy, params,
                                                           vars->ieee_fc);
 
-                        /* enable autoneg */
+                        /* Enable autoneg */
                         bnx2x_set_autoneg(phy, params, vars, enable_cl73);
 
-                        /* enable and restart AN */
+                        /* Enable and restart AN */
                         bnx2x_restart_autoneg(phy, params, enable_cl73);
                 }
 
@@ -5793,12 +5861,12 @@ static int bnx2x_prepare_xgxs(struct bnx2x_phy *phy,
                 bnx2x_set_master_ln(params, phy);
 
         rc = bnx2x_reset_unicore(params, phy, 0);
-        /* reset the SerDes and wait for reset bit return low */
-        if (rc != 0)
+        /* Reset the SerDes and wait for reset bit return low */
+        if (rc)
                 return rc;
 
         bnx2x_set_aer_mmd(params, phy);
-        /* setting the masterLn_def again after the reset */
+        /* Setting the masterLn_def again after the reset */
         if (phy->type == PORT_HW_CFG_XGXS_EXT_PHY_TYPE_DIRECT) {
                 bnx2x_set_master_ln(params, phy);
                 bnx2x_set_swap_lanes(params, phy);
@@ -5823,7 +5891,7 @@ static u16 bnx2x_wait_reset_complete(struct bnx2x *bp,
                                 MDIO_PMA_REG_CTRL, &ctrl);
                 if (!(ctrl & (1<<15)))
                         break;
-                msleep(1);
+                usleep_range(1000, 2000);
         }
 
         if (cnt == 1000)
@@ -6054,7 +6122,7 @@ static void bnx2x_set_xgxs_loopback(struct bnx2x_phy *phy,
                 DP(NETIF_MSG_LINK, "XGXS 10G loopback enable\n");
 
                 if (!CHIP_IS_E3(bp)) {
-                        /* change the uni_phy_addr in the nig */
+                        /* Change the uni_phy_addr in the nig */
                         md_devad = REG_RD(bp, (NIG_REG_XGXS0_CTRL_MD_DEVAD +
                                                port*0x18));
 
@@ -6074,11 +6142,11 @@ static void bnx2x_set_xgxs_loopback(struct bnx2x_phy *phy,
                                   (MDIO_CL73_IEEEB0_CL73_AN_CONTROL & 0xf)),
                                  0x6041);
                 msleep(200);
-                /* set aer mmd back */
+                /* Set aer mmd back */
                 bnx2x_set_aer_mmd(params, phy);
 
                 if (!CHIP_IS_E3(bp)) {
-                        /* and md_devad */
+                        /* And md_devad */
                         REG_WR(bp, NIG_REG_XGXS0_CTRL_MD_DEVAD + port*0x18,
                                md_devad);
                 }
@@ -6275,7 +6343,7 @@ int bnx2x_test_link(struct link_params *params, struct link_vars *vars,
                           MDIO_REG_BANK_GP_STATUS,
                           MDIO_GP_STATUS_TOP_AN_STATUS1,
                           &gp_status);
-        /* link is up only if both local phy and external phy are up */
+        /* Link is up only if both local phy and external phy are up */
         if (!(gp_status & MDIO_GP_STATUS_TOP_AN_STATUS1_LINK_STATUS))
                 return -ESRCH;
         }
@@ -6296,7 +6364,9 @@ int bnx2x_test_link(struct link_params *params, struct link_vars *vars,
                 for (phy_index = EXT_PHY1; phy_index < params->num_phys;
                       phy_index++) {
                         serdes_phy_type = ((params->phy[phy_index].media_type ==
-                                            ETH_PHY_SFP_FIBER) ||
+                                            ETH_PHY_SFPP_10G_FIBER) ||
+                                           (params->phy[phy_index].media_type ==
+                                            ETH_PHY_SFP_1G_FIBER) ||
                                            (params->phy[phy_index].media_type ==
                                             ETH_PHY_XFP_FIBER) ||
                                            (params->phy[phy_index].media_type ==
@@ -6397,7 +6467,7 @@ static int bnx2x_link_initialize(struct link_params *params,
 static void bnx2x_int_link_reset(struct bnx2x_phy *phy,
                                  struct link_params *params)
 {
-        /* reset the SerDes/XGXS */
+        /* Reset the SerDes/XGXS */
         REG_WR(params->bp, GRCBASE_MISC + MISC_REGISTERS_RESET_REG_3_CLEAR,
                (0x1ff << (params->port*16)));
 }
@@ -6430,10 +6500,10 @@ static int bnx2x_update_link_down(struct link_params *params,
         DP(NETIF_MSG_LINK, "Port %x: Link is down\n", port);
         bnx2x_set_led(params, vars, LED_MODE_OFF, 0);
         vars->phy_flags &= ~PHY_PHYSICAL_LINK_FLAG;
-        /* indicate no mac active */
+        /* Indicate no mac active */
         vars->mac_type = MAC_TYPE_NONE;
 
-        /* update shared memory */
+        /* Update shared memory */
         vars->link_status &= ~(LINK_STATUS_SPEED_AND_DUPLEX_MASK |
                                LINK_STATUS_LINK_UP |
                                LINK_STATUS_PHYSICAL_LINK_FLAG |
@@ -6446,15 +6516,15 @@ static int bnx2x_update_link_down(struct link_params *params,
         vars->line_speed = 0;
         bnx2x_update_mng(params, vars->link_status);
 
-        /* activate nig drain */
+        /* Activate nig drain */
         REG_WR(bp, NIG_REG_EGRESS_DRAIN0_MODE + port*4, 1);
 
-        /* disable emac */
+        /* Disable emac */
         if (!CHIP_IS_E3(bp))
                 REG_WR(bp, NIG_REG_NIG_EMAC0_EN + port*4, 0);
 
-        msleep(10);
-        /* reset BigMac/Xmac */
+        usleep_range(10000, 20000);
+        /* Reset BigMac/Xmac */
         if (CHIP_IS_E1x(bp) ||
             CHIP_IS_E2(bp)) {
                 bnx2x_bmac_rx_disable(bp, params->port);
@@ -6463,6 +6533,16 @@ static int bnx2x_update_link_down(struct link_params *params,
                (MISC_REGISTERS_RESET_REG_2_RST_BMAC0 << port));
         }
         if (CHIP_IS_E3(bp)) {
+                /* Prevent LPI Generation by chip */
+                REG_WR(bp, MISC_REG_CPMU_LP_FW_ENABLE_P0 + (params->port << 2),
+                       0);
+                REG_WR(bp, MISC_REG_CPMU_LP_DR_ENABLE, 0);
+                REG_WR(bp, MISC_REG_CPMU_LP_MASK_ENT_P0 + (params->port << 2),
+                       0);
+                vars->eee_status &= ~(SHMEM_EEE_LP_ADV_STATUS_MASK |
+                                      SHMEM_EEE_ACTIVE_BIT);
+
+                bnx2x_update_mng_eee(params, vars->eee_status);
                 bnx2x_xmac_disable(params);
                 bnx2x_umac_disable(params);
         }
@@ -6502,6 +6582,16 @@ static int bnx2x_update_link_up(struct link_params *params,
                         bnx2x_umac_enable(params, vars, 0);
                 bnx2x_set_led(params, vars,
                               LED_MODE_OPER, vars->line_speed);
+
+                if ((vars->eee_status & SHMEM_EEE_ACTIVE_BIT) &&
+                    (vars->eee_status & SHMEM_EEE_LPI_REQUESTED_BIT)) {
+                        DP(NETIF_MSG_LINK, "Enabling LPI assertion\n");
+                        REG_WR(bp, MISC_REG_CPMU_LP_FW_ENABLE_P0 +
+                               (params->port << 2), 1);
+                        REG_WR(bp, MISC_REG_CPMU_LP_DR_ENABLE, 1);
+                        REG_WR(bp, MISC_REG_CPMU_LP_MASK_ENT_P0 +
+                               (params->port << 2), 0xfc20);
+                }
         }
         if ((CHIP_IS_E1x(bp) ||
              CHIP_IS_E2(bp))) {
@@ -6534,12 +6624,12 @@ static int bnx2x_update_link_up(struct link_params *params,
                 rc |= bnx2x_pbf_update(params, vars->flow_ctrl,
                                        vars->line_speed);
 
-        /* disable drain */
+        /* Disable drain */
         REG_WR(bp, NIG_REG_EGRESS_DRAIN0_MODE + port*4, 0);
 
-        /* update shared memory */
+        /* Update shared memory */
         bnx2x_update_mng(params, vars->link_status);
-
+        bnx2x_update_mng_eee(params, vars->eee_status);
         /* Check remote fault */
         for (phy_idx = INT_PHY; phy_idx < MAX_PHYS; phy_idx++) {
                 if (params->phy[phy_idx].flags & FLAGS_TX_ERROR_CHECK) {
@@ -6583,6 +6673,8 @@ int bnx2x_link_update(struct link_params *params, struct link_vars *vars)
                 phy_vars[phy_index].phy_link_up = 0;
                 phy_vars[phy_index].link_up = 0;
                 phy_vars[phy_index].fault_detected = 0;
+                /* different consideration, since vars holds inner state */
+                phy_vars[phy_index].eee_status = vars->eee_status;
         }
 
         if (USES_WARPCORE(bp))
@@ -6603,7 +6695,7 @@ int bnx2x_link_update(struct link_params *params, struct link_vars *vars)
           REG_RD(bp, NIG_REG_XGXS0_STATUS_LINK10G + port*0x68),
           REG_RD(bp, NIG_REG_XGXS0_STATUS_LINK_STATUS + port*0x68));
 
-        /* disable emac */
+        /* Disable emac */
         if (!CHIP_IS_E3(bp))
                 REG_WR(bp, NIG_REG_NIG_EMAC0_EN + port*4, 0);
 
@@ -6712,6 +6804,9 @@ int bnx2x_link_update(struct link_params *params, struct link_vars *vars)
                         vars->link_status |= LINK_STATUS_SERDES_LINK;
                 else
                         vars->link_status &= ~LINK_STATUS_SERDES_LINK;
+
+                vars->eee_status = phy_vars[active_external_phy].eee_status;
+
                 DP(NETIF_MSG_LINK, "Active external phy selected: %x\n",
                            active_external_phy);
         }
@@ -6745,11 +6840,11 @@ int bnx2x_link_update(struct link_params *params, struct link_vars *vars)
                 } else if (prev_line_speed != vars->line_speed) {
                         REG_WR(bp, NIG_REG_EGRESS_DRAIN0_MODE + params->port*4,
                                0);
-                        msleep(1);
+                         usleep_range(1000, 2000);
                 }
         }
 
-        /* anything 10 and over uses the bmac */
+        /* Anything 10 and over uses the bmac */
         link_10g_plus = (vars->line_speed >= SPEED_10000);
 
         bnx2x_link_int_ack(params, vars, link_10g_plus);
@@ -6815,7 +6910,7 @@ void bnx2x_ext_phy_hw_reset(struct bnx2x *bp, u8 port)
 {
         bnx2x_set_gpio(bp, MISC_REGISTERS_GPIO_1,
                        MISC_REGISTERS_GPIO_OUTPUT_LOW, port);
-        msleep(1);
+         usleep_range(1000, 2000);
         bnx2x_set_gpio(bp, MISC_REGISTERS_GPIO_1,
                        MISC_REGISTERS_GPIO_OUTPUT_HIGH, port);
 }
@@ -6912,7 +7007,7 @@ static int bnx2x_8073_8727_external_rom_boot(struct bnx2x *bp,
                          MDIO_PMA_REG_GEN_CTRL,
                          0x0001);
 
-        /* ucode reboot and rst */
+        /* Ucode reboot and rst */
         bnx2x_cl45_write(bp, phy,
                          MDIO_PMA_DEVAD,
                          MDIO_PMA_REG_GEN_CTRL,
@@ -6956,7 +7051,7 @@ static int bnx2x_8073_8727_external_rom_boot(struct bnx2x *bp,
                                 MDIO_PMA_DEVAD,
                                 MDIO_PMA_REG_M8051_MSGOUT_REG, &fw_msgout);
 
-                msleep(1);
+                 usleep_range(1000, 2000);
         } while (fw_ver1 == 0 || fw_ver1 == 0x4321 ||
                         ((fw_msgout & 0xff) != 0x03 && (phy->type ==
                         PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8073)));
@@ -7050,11 +7145,11 @@ static int bnx2x_8073_xaui_wa(struct bnx2x *bp, struct bnx2x_phy *phy)
                                           "XAUI workaround has completed\n");
                                         return 0;
                                  }
-                                 msleep(3);
+                                 usleep_range(3000, 6000);
                         }
                         break;
                 }
-                msleep(3);
+                usleep_range(3000, 6000);
         }
         DP(NETIF_MSG_LINK, "Warning: XAUI work-around timeout !!!\n");
         return -EINVAL;
@@ -7128,7 +7223,7 @@ static int bnx2x_8073_config_init(struct bnx2x_phy *phy,
         bnx2x_set_gpio(bp, MISC_REGISTERS_GPIO_1,
                        MISC_REGISTERS_GPIO_OUTPUT_HIGH, gpio_port);
 
-        /* enable LASI */
+        /* Enable LASI */
         bnx2x_cl45_write(bp, phy,
                          MDIO_PMA_DEVAD, MDIO_PMA_LASI_RXCTRL, (1<<2));
         bnx2x_cl45_write(bp, phy,
@@ -7276,7 +7371,7 @@ static u8 bnx2x_8073_read_status(struct bnx2x_phy *phy,
 
         DP(NETIF_MSG_LINK, "8703 LASI status 0x%x\n", val1);
 
-        /* clear the interrupt LASI status register */
+        /* Clear the interrupt LASI status register */
         bnx2x_cl45_read(bp, phy,
                         MDIO_PCS_DEVAD, MDIO_PCS_REG_STATUS, &val2);
         bnx2x_cl45_read(bp, phy,
@@ -7601,7 +7696,7 @@ static int bnx2x_8726_read_sfp_module_eeprom(struct bnx2x_phy *phy,
         struct bnx2x *bp = params->bp;
         u16 val = 0;
         u16 i;
-        if (byte_cnt > 16) {
+        if (byte_cnt > SFP_EEPROM_PAGE_SIZE) {
                 DP(NETIF_MSG_LINK,
                    "Reading from eeprom is limited to 0xf\n");
                 return -EINVAL;
@@ -7655,7 +7750,7 @@ static int bnx2x_8726_read_sfp_module_eeprom(struct bnx2x_phy *phy,
                 if ((val & MDIO_PMA_REG_SFP_TWO_WIRE_CTRL_STATUS_MASK) ==
                     MDIO_PMA_REG_SFP_TWO_WIRE_STATUS_IDLE)
                         return 0;
-                msleep(1);
+                 usleep_range(1000, 2000);
         }
         return -EINVAL;
 }
@@ -7692,7 +7787,8 @@ static int bnx2x_warpcore_read_sfp_module_eeprom(struct bnx2x_phy *phy,
         u32 data_array[4];
         u16 addr32;
         struct bnx2x *bp = params->bp;
-        if (byte_cnt > 16) {
+
+        if (byte_cnt > SFP_EEPROM_PAGE_SIZE) {
                 DP(NETIF_MSG_LINK,
                    "Reading from eeprom is limited to 16 bytes\n");
                 return -EINVAL;
@@ -7728,7 +7824,7 @@ static int bnx2x_8727_read_sfp_module_eeprom(struct bnx2x_phy *phy,
         struct bnx2x *bp = params->bp;
         u16 val, i;
 
-        if (byte_cnt > 16) {
+        if (byte_cnt > SFP_EEPROM_PAGE_SIZE) {
                 DP(NETIF_MSG_LINK,
                    "Reading from eeprom is limited to 0xf\n");
                 return -EINVAL;
@@ -7765,7 +7861,7 @@ static int bnx2x_8727_read_sfp_module_eeprom(struct bnx2x_phy *phy,
         /* Wait appropriate time for two-wire command to finish before
          * polling the status register
          */
-        msleep(1);
+         usleep_range(1000, 2000);
 
         /* Wait up to 500us for command complete status */
         for (i = 0; i < 100; i++) {
@@ -7801,7 +7897,7 @@ static int bnx2x_8727_read_sfp_module_eeprom(struct bnx2x_phy *phy,
                 if ((val & MDIO_PMA_REG_SFP_TWO_WIRE_CTRL_STATUS_MASK) ==
                     MDIO_PMA_REG_SFP_TWO_WIRE_STATUS_IDLE)
                         return 0;
-                msleep(1);
+                 usleep_range(1000, 2000);
         }
 
         return -EINVAL;
@@ -7811,7 +7907,7 @@ int bnx2x_read_sfp_module_eeprom(struct bnx2x_phy *phy,
                                  struct link_params *params, u16 addr,
                                  u8 byte_cnt, u8 *o_buf)
 {
-        int rc = -EINVAL;
+        int rc = -EOPNOTSUPP;
         switch (phy->type) {
         case PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8726:
                 rc = bnx2x_8726_read_sfp_module_eeprom(phy, params, addr,
@@ -7836,7 +7932,7 @@ static int bnx2x_get_edc_mode(struct bnx2x_phy *phy,
 {
         struct bnx2x *bp = params->bp;
         u32 sync_offset = 0, phy_idx, media_types;
-        u8 val, check_limiting_mode = 0;
+        u8 val[2], check_limiting_mode = 0;
         *edc_mode = EDC_MODE_LIMITING;
 
         phy->media_type = ETH_PHY_UNSPECIFIED;
@@ -7844,13 +7940,13 @@ static int bnx2x_get_edc_mode(struct bnx2x_phy *phy,
         if (bnx2x_read_sfp_module_eeprom(phy,
                                          params,
                                          SFP_EEPROM_CON_TYPE_ADDR,
-                                         1,
-                                         &val) != 0) {
+                                         2,
+                                         (u8 *)val) != 0) {
                 DP(NETIF_MSG_LINK, "Failed to read from SFP+ module EEPROM\n");
                 return -EINVAL;
         }
 
-        switch (val) {
+        switch (val[0]) {
         case SFP_EEPROM_CON_TYPE_VAL_COPPER:
         {
                 u8 copper_module_type;
@@ -7888,13 +7984,29 @@ static int bnx2x_get_edc_mode(struct bnx2x_phy *phy,
                 break;
         }
         case SFP_EEPROM_CON_TYPE_VAL_LC:
-                phy->media_type = ETH_PHY_SFP_FIBER;
-                DP(NETIF_MSG_LINK, "Optic module detected\n");
                 check_limiting_mode = 1;
+                if ((val[1] & (SFP_EEPROM_COMP_CODE_SR_MASK |
+                               SFP_EEPROM_COMP_CODE_LR_MASK |
+                               SFP_EEPROM_COMP_CODE_LRM_MASK)) == 0) {
+                        DP(NETIF_MSG_LINK, "1G Optic module detected\n");
+                        phy->media_type = ETH_PHY_SFP_1G_FIBER;
+                        phy->req_line_speed = SPEED_1000;
+                } else {
+                        int idx, cfg_idx = 0;
+                        DP(NETIF_MSG_LINK, "10G Optic module detected\n");
+                        for (idx = INT_PHY; idx < MAX_PHYS; idx++) {
+                                if (params->phy[idx].type == phy->type) {
+                                        cfg_idx = LINK_CONFIG_IDX(idx);
+                                        break;
+                                }
+                        }
+                        phy->media_type = ETH_PHY_SFPP_10G_FIBER;
+                        phy->req_line_speed = params->req_line_speed[cfg_idx];
+                }
                 break;
         default:
                 DP(NETIF_MSG_LINK, "Unable to determine module type 0x%x !!!\n",
-                         val);
+                         val[0]);
                 return -EINVAL;
         }
         sync_offset = params->shmem_base +
@@ -7980,7 +8092,7 @@ static int bnx2x_verify_sfp_module(struct bnx2x_phy *phy,
                 return 0;
         }
 
-        /* format the warning message */
+        /* Format the warning message */
         if (bnx2x_read_sfp_module_eeprom(phy,
                                          params,
                                          SFP_EEPROM_VENDOR_NAME_ADDR,
@@ -8026,7 +8138,7 @@ static int bnx2x_wait_for_sfp_module_initialized(struct bnx2x_phy *phy,
                            timeout * 5);
                         return 0;
                 }
-                msleep(5);
+                usleep_range(5000, 10000);
         }
         return -EINVAL;
 }
@@ -8338,7 +8450,7 @@ int bnx2x_sfp_module_detection(struct bnx2x_phy *phy,
                 DP(NETIF_MSG_LINK, "Failed to get valid module type\n");
                 return -EINVAL;
         } else if (bnx2x_verify_sfp_module(phy, params) != 0) {
-                /* check SFP+ module compatibility */
+                /* Check SFP+ module compatibility */
                 DP(NETIF_MSG_LINK, "Module verification failed!!\n");
                 rc = -EINVAL;
                 /* Turn on fault module-detected led */
@@ -8401,14 +8513,34 @@ void bnx2x_handle_module_detect_int(struct link_params *params)
 
         /* Call the handling function in case module is detected */
         if (gpio_val == 0) {
+                bnx2x_set_mdio_clk(bp, params->chip_id, params->port);
+                bnx2x_set_aer_mmd(params, phy);
+
                 bnx2x_power_sfp_module(params, phy, 1);
                 bnx2x_set_gpio_int(bp, gpio_num,
                                    MISC_REGISTERS_GPIO_INT_OUTPUT_CLR,
                                    gpio_port);
-                if (bnx2x_wait_for_sfp_module_initialized(phy, params) == 0)
+                if (bnx2x_wait_for_sfp_module_initialized(phy, params) == 0) {
                         bnx2x_sfp_module_detection(phy, params);
-                else
+                        if (CHIP_IS_E3(bp)) {
+                                u16 rx_tx_in_reset;
+                                /* In case WC is out of reset, reconfigure the
+                                 * link speed while taking into account 1G
+                                 * module limitation.
+                                 */
+                                bnx2x_cl45_read(bp, phy,
+                                                MDIO_WC_DEVAD,
+                                                MDIO_WC_REG_DIGITAL5_MISC6,
+                                                &rx_tx_in_reset);
+                                if (!rx_tx_in_reset) {
+                                        bnx2x_warpcore_reset_lane(bp, phy, 1);
+                                        bnx2x_warpcore_config_sfi(phy, params);
+                                        bnx2x_warpcore_reset_lane(bp, phy, 0);
+                                }
+                        }
+                } else {
                         DP(NETIF_MSG_LINK, "SFP+ module is not initialized\n");
+                }
         } else {
                 u32 val = REG_RD(bp, params->shmem_base +
                                  offsetof(struct shmem_region, dev_info.
@@ -8469,7 +8601,7 @@ static u8 bnx2x_8706_8726_read_status(struct bnx2x_phy *phy,
         bnx2x_sfp_mask_fault(bp, phy, MDIO_PMA_LASI_TXSTAT,
                              MDIO_PMA_LASI_TXCTRL);
 
-        /* clear LASI indication*/
+        /* Clear LASI indication*/
         bnx2x_cl45_read(bp, phy,
                         MDIO_PMA_DEVAD, MDIO_PMA_LASI_STAT, &val1);
         bnx2x_cl45_read(bp, phy,
@@ -8537,7 +8669,7 @@ static u8 bnx2x_8706_config_init(struct bnx2x_phy *phy,
                                 MDIO_PMA_DEVAD, MDIO_PMA_REG_ROM_VER1, &val);
                 if (val)
                         break;
-                msleep(10);
+                usleep_range(10000, 20000);
         }
         DP(NETIF_MSG_LINK, "XGXS 8706 is initialized after %d ms\n", cnt);
         if ((params->feature_config_flags &
@@ -8666,7 +8798,7 @@ static void bnx2x_8726_external_rom_boot(struct bnx2x_phy *phy,
                          MDIO_PMA_REG_GEN_CTRL,
                          MDIO_PMA_REG_GEN_CTRL_ROM_RESET_INTERNAL_MP);
 
-        /* wait for 150ms for microcode load */
+        /* Wait for 150ms for microcode load */
         msleep(150);
 
         /* Disable serial boot control, tristates pins SS_N, SCK, MOSI, MISO */
@@ -8860,6 +8992,63 @@ static void bnx2x_8727_hw_reset(struct bnx2x_phy *phy,
                        MISC_REGISTERS_GPIO_OUTPUT_LOW, port);
 }
 
+static void bnx2x_8727_config_speed(struct bnx2x_phy *phy,
+                                    struct link_params *params)
+{
+        struct bnx2x *bp = params->bp;
+        u16 tmp1, val;
+        /* Set option 1G speed */
+        if ((phy->req_line_speed == SPEED_1000) ||
+            (phy->media_type == ETH_PHY_SFP_1G_FIBER)) {
+                DP(NETIF_MSG_LINK, "Setting 1G force\n");
+                bnx2x_cl45_write(bp, phy,
+                                 MDIO_PMA_DEVAD, MDIO_PMA_REG_CTRL, 0x40);
+                bnx2x_cl45_write(bp, phy,
+                                 MDIO_PMA_DEVAD, MDIO_PMA_REG_10G_CTRL2, 0xD);
+                bnx2x_cl45_read(bp, phy,
+                                MDIO_PMA_DEVAD, MDIO_PMA_REG_10G_CTRL2, &tmp1);
+                DP(NETIF_MSG_LINK, "1.7 = 0x%x\n", tmp1);
+                /* Power down the XAUI until link is up in case of dual-media
+                 * and 1G
+                 */
+                if (DUAL_MEDIA(params)) {
+                        bnx2x_cl45_read(bp, phy,
+                                        MDIO_PMA_DEVAD,
+                                        MDIO_PMA_REG_8727_PCS_GP, &val);
+                        val |= (3<<10);
+                        bnx2x_cl45_write(bp, phy,
+                                         MDIO_PMA_DEVAD,
+                                         MDIO_PMA_REG_8727_PCS_GP, val);
+                }
+        } else if ((phy->req_line_speed == SPEED_AUTO_NEG) &&
+                   ((phy->speed_cap_mask &
+                     PORT_HW_CFG_SPEED_CAPABILITY_D0_1G)) &&
+                   ((phy->speed_cap_mask &
+                      PORT_HW_CFG_SPEED_CAPABILITY_D0_10G) !=
+                   PORT_HW_CFG_SPEED_CAPABILITY_D0_10G)) {
+
+                DP(NETIF_MSG_LINK, "Setting 1G clause37\n");
+                bnx2x_cl45_write(bp, phy,
+                                 MDIO_AN_DEVAD, MDIO_AN_REG_8727_MISC_CTRL, 0);
+                bnx2x_cl45_write(bp, phy,
+                                 MDIO_AN_DEVAD, MDIO_AN_REG_CL37_AN, 0x1300);
+        } else {
+                /* Since the 8727 has only single reset pin, need to set the 10G
+                 * registers although it is default
+                 */
+                bnx2x_cl45_write(bp, phy,
+                                 MDIO_AN_DEVAD, MDIO_AN_REG_8727_MISC_CTRL,
+                                 0x0020);
+                bnx2x_cl45_write(bp, phy,
+                                 MDIO_AN_DEVAD, MDIO_AN_REG_CL37_AN, 0x0100);
+                bnx2x_cl45_write(bp, phy,
+                                 MDIO_PMA_DEVAD, MDIO_PMA_REG_CTRL, 0x2040);
+                bnx2x_cl45_write(bp, phy,
+                                 MDIO_PMA_DEVAD, MDIO_PMA_REG_10G_CTRL2,
+                                 0x0008);
+        }
+}
+
 static int bnx2x_8727_config_init(struct bnx2x_phy *phy,
                                   struct link_params *params,
                                   struct link_vars *vars)
@@ -8877,7 +9066,7 @@ static int bnx2x_8727_config_init(struct bnx2x_phy *phy,
         lasi_ctrl_val = 0x0006;
 
         DP(NETIF_MSG_LINK, "Initializing BCM8727\n");
-        /* enable LASI */
+        /* Enable LASI */
         bnx2x_cl45_write(bp, phy,
                          MDIO_PMA_DEVAD, MDIO_PMA_LASI_RXCTRL,
                          rx_alarm_ctrl_val);
@@ -8929,56 +9118,7 @@ static int bnx2x_8727_config_init(struct bnx2x_phy *phy,
         bnx2x_cl45_read(bp, phy,
                         MDIO_PMA_DEVAD, MDIO_PMA_LASI_RXSTAT, &tmp1);
 
-        /* Set option 1G speed */
-        if (phy->req_line_speed == SPEED_1000) {
-                DP(NETIF_MSG_LINK, "Setting 1G force\n");
-                bnx2x_cl45_write(bp, phy,
-                                 MDIO_PMA_DEVAD, MDIO_PMA_REG_CTRL, 0x40);
-                bnx2x_cl45_write(bp, phy,
-                                 MDIO_PMA_DEVAD, MDIO_PMA_REG_10G_CTRL2, 0xD);
-                bnx2x_cl45_read(bp, phy,
-                                MDIO_PMA_DEVAD, MDIO_PMA_REG_10G_CTRL2, &tmp1);
-                DP(NETIF_MSG_LINK, "1.7 = 0x%x\n", tmp1);
-                /* Power down the XAUI until link is up in case of dual-media
-                 * and 1G
-                 */
-                if (DUAL_MEDIA(params)) {
-                        bnx2x_cl45_read(bp, phy,
-                                        MDIO_PMA_DEVAD,
-                                        MDIO_PMA_REG_8727_PCS_GP, &val);
-                        val |= (3<<10);
-                        bnx2x_cl45_write(bp, phy,
-                                         MDIO_PMA_DEVAD,
-                                         MDIO_PMA_REG_8727_PCS_GP, val);
-                }
-        } else if ((phy->req_line_speed == SPEED_AUTO_NEG) &&
-                   ((phy->speed_cap_mask &
-                     PORT_HW_CFG_SPEED_CAPABILITY_D0_1G)) &&
-                   ((phy->speed_cap_mask &
-                      PORT_HW_CFG_SPEED_CAPABILITY_D0_10G) !=
-                   PORT_HW_CFG_SPEED_CAPABILITY_D0_10G)) {
-
-                DP(NETIF_MSG_LINK, "Setting 1G clause37\n");
-                bnx2x_cl45_write(bp, phy,
-                                 MDIO_AN_DEVAD, MDIO_AN_REG_8727_MISC_CTRL, 0);
-                bnx2x_cl45_write(bp, phy,
-                                 MDIO_AN_DEVAD, MDIO_AN_REG_CL37_AN, 0x1300);
-        } else {
-                /* Since the 8727 has only single reset pin, need to set the 10G
-                 * registers although it is default
-                 */
-                bnx2x_cl45_write(bp, phy,
-                                 MDIO_AN_DEVAD, MDIO_AN_REG_8727_MISC_CTRL,
-                                 0x0020);
-                bnx2x_cl45_write(bp, phy,
-                                 MDIO_AN_DEVAD, MDIO_AN_REG_CL37_AN, 0x0100);
-                bnx2x_cl45_write(bp, phy,
-                                 MDIO_PMA_DEVAD, MDIO_PMA_REG_CTRL, 0x2040);
-                bnx2x_cl45_write(bp, phy,
-                                 MDIO_PMA_DEVAD, MDIO_PMA_REG_10G_CTRL2,
-                                 0x0008);
-        }
-
+        bnx2x_8727_config_speed(phy, params);
         /* Set 2-wire transfer rate of SFP+ module EEPROM
          * to 100Khz since some DACs(direct attached cables) do
          * not work at 400Khz.
@@ -9105,6 +9245,9 @@ static void bnx2x_8727_handle_mod_abs(struct bnx2x_phy *phy,
                         bnx2x_sfp_module_detection(phy, params);
                 else
                         DP(NETIF_MSG_LINK, "SFP+ module is not initialized\n");
+
+                /* Reconfigure link speed based on module type limitations */
+                bnx2x_8727_config_speed(phy, params);
         }
 
         DP(NETIF_MSG_LINK, "8727 RX_ALARM_STATUS 0x%x\n",
@@ -9585,9 +9728,9 @@ static int bnx2x_8481_config_init(struct bnx2x_phy *phy,
 static int bnx2x_84833_cmd_hdlr(struct bnx2x_phy *phy,
                                    struct link_params *params,
                    u16 fw_cmd,
-                   u16 cmd_args[])
+                   u16 cmd_args[], int argc)
 {
-        u32 idx;
+        int idx;
         u16 val;
         struct bnx2x *bp = params->bp;
         /* Write CMD_OPEN_OVERRIDE to STATUS reg */
@@ -9599,7 +9742,7 @@ static int bnx2x_84833_cmd_hdlr(struct bnx2x_phy *phy,
                                 MDIO_84833_CMD_HDLR_STATUS, &val);
                 if (val == PHY84833_STATUS_CMD_OPEN_FOR_CMDS)
                         break;
-                msleep(1);
+                 usleep_range(1000, 2000);
         }
         if (idx >= PHY84833_CMDHDLR_WAIT) {
                 DP(NETIF_MSG_LINK, "FW cmd: FW not ready.\n");
@@ -9607,7 +9750,7 @@ static int bnx2x_84833_cmd_hdlr(struct bnx2x_phy *phy,
         }
 
         /* Prepare argument(s) and issue command */
-        for (idx = 0; idx < PHY84833_CMDHDLR_MAX_ARGS; idx++) {
+        for (idx = 0; idx < argc; idx++) {
                 bnx2x_cl45_write(bp, phy, MDIO_CTL_DEVAD,
                                 MDIO_84833_CMD_HDLR_DATA1 + idx,
                                 cmd_args[idx]);
@@ -9620,7 +9763,7 @@ static int bnx2x_84833_cmd_hdlr(struct bnx2x_phy *phy,
                 if ((val == PHY84833_STATUS_CMD_COMPLETE_PASS) ||
                         (val == PHY84833_STATUS_CMD_COMPLETE_ERROR))
                         break;
-                msleep(1);
+                 usleep_range(1000, 2000);
         }
         if ((idx >= PHY84833_CMDHDLR_WAIT) ||
                 (val == PHY84833_STATUS_CMD_COMPLETE_ERROR)) {
@@ -9628,7 +9771,7 @@ static int bnx2x_84833_cmd_hdlr(struct bnx2x_phy *phy,
                 return -EINVAL;
         }
         /* Gather returning data */
-        for (idx = 0; idx < PHY84833_CMDHDLR_MAX_ARGS; idx++) {
+        for (idx = 0; idx < argc; idx++) {
                 bnx2x_cl45_read(bp, phy, MDIO_CTL_DEVAD,
                                 MDIO_84833_CMD_HDLR_DATA1 + idx,
                                 &cmd_args[idx]);
@@ -9662,7 +9805,7 @@ static int bnx2x_84833_pair_swap_cfg(struct bnx2x_phy *phy,
         data[1] = (u16)pair_swap;
 
         status = bnx2x_84833_cmd_hdlr(phy, params,
-                PHY84833_CMD_SET_PAIR_SWAP, data);
+                PHY84833_CMD_SET_PAIR_SWAP, data, PHY84833_CMDHDLR_MAX_ARGS);
         if (status == 0)
                 DP(NETIF_MSG_LINK, "Pairswap OK, val=0x%x\n", data[1]);
 
@@ -9740,6 +9883,95 @@ static int bnx2x_84833_hw_reset_phy(struct bnx2x_phy *phy,
         return 0;
 }
 
+static int bnx2x_8483x_eee_timers(struct link_params *params,
+                                   struct link_vars *vars)
+{
+        u32 eee_idle = 0, eee_mode;
+        struct bnx2x *bp = params->bp;
+
+        eee_idle = bnx2x_eee_calc_timer(params);
+
+        if (eee_idle) {
+                REG_WR(bp, MISC_REG_CPMU_LP_IDLE_THR_P0 + (params->port << 2),
+                       eee_idle);
+        } else if ((params->eee_mode & EEE_MODE_ENABLE_LPI) &&
+                   (params->eee_mode & EEE_MODE_OVERRIDE_NVRAM) &&
+                   (params->eee_mode & EEE_MODE_OUTPUT_TIME)) {
+                DP(NETIF_MSG_LINK, "Error: Tx LPI is enabled with timer 0\n");
+                return -EINVAL;
+        }
+
+        vars->eee_status &= ~(SHMEM_EEE_TIMER_MASK | SHMEM_EEE_TIME_OUTPUT_BIT);
+        if (params->eee_mode & EEE_MODE_OUTPUT_TIME) {
+                /* eee_idle in 1u --> eee_status in 16u */
+                eee_idle >>= 4;
+                vars->eee_status |= (eee_idle & SHMEM_EEE_TIMER_MASK) |
+                                    SHMEM_EEE_TIME_OUTPUT_BIT;
+        } else {
+                if (bnx2x_eee_time_to_nvram(eee_idle, &eee_mode))
+                        return -EINVAL;
+                vars->eee_status |= eee_mode;
+        }
+
+        return 0;
+}
+
+static int bnx2x_8483x_disable_eee(struct bnx2x_phy *phy,
+                                   struct link_params *params,
+                                   struct link_vars *vars)
+{
+        int rc;
+        struct bnx2x *bp = params->bp;
+        u16 cmd_args = 0;
+
+        DP(NETIF_MSG_LINK, "Don't Advertise 10GBase-T EEE\n");
+
+        /* Make Certain LPI is disabled */
+        REG_WR(bp, MISC_REG_CPMU_LP_FW_ENABLE_P0 + (params->port << 2), 0);
+        REG_WR(bp, MISC_REG_CPMU_LP_DR_ENABLE, 0);
+
+        /* Prevent Phy from working in EEE and advertising it */
+        rc = bnx2x_84833_cmd_hdlr(phy, params,
+                PHY84833_CMD_SET_EEE_MODE, &cmd_args, 1);
+        if (rc) {
+                DP(NETIF_MSG_LINK, "EEE disable failed.\n");
+                return rc;
+        }
+
+        bnx2x_cl45_write(bp, phy, MDIO_AN_DEVAD, MDIO_AN_REG_EEE_ADV, 0);
+        vars->eee_status &= ~SHMEM_EEE_ADV_STATUS_MASK;
+
+        return 0;
+}
+
+static int bnx2x_8483x_enable_eee(struct bnx2x_phy *phy,
+                                   struct link_params *params,
+                                   struct link_vars *vars)
+{
+        int rc;
+        struct bnx2x *bp = params->bp;
+        u16 cmd_args = 1;
+
+        DP(NETIF_MSG_LINK, "Advertise 10GBase-T EEE\n");
+
+        rc = bnx2x_84833_cmd_hdlr(phy, params,
+                PHY84833_CMD_SET_EEE_MODE, &cmd_args, 1);
+        if (rc) {
+                DP(NETIF_MSG_LINK, "EEE enable failed.\n");
+                return rc;
+        }
+
+        bnx2x_cl45_write(bp, phy, MDIO_AN_DEVAD, MDIO_AN_REG_EEE_ADV, 0x8);
+
+        /* Mask events preventing LPI generation */
+        REG_WR(bp, MISC_REG_CPMU_LP_MASK_EXT_P0 + (params->port << 2), 0xfc20);
+
+        vars->eee_status &= ~SHMEM_EEE_ADV_STATUS_MASK;
+        vars->eee_status |= (SHMEM_EEE_10G_ADV << SHMEM_EEE_ADV_STATUS_SHIFT);
+
+        return 0;
+}
+
 #define PHY84833_CONSTANT_LATENCY 1193
 static int bnx2x_848x3_config_init(struct bnx2x_phy *phy,
                                    struct link_params *params,
@@ -9752,7 +9984,7 @@ static int bnx2x_848x3_config_init(struct bnx2x_phy *phy,
         u16 cmd_args[PHY84833_CMDHDLR_MAX_ARGS];
         int rc = 0;
 
-        msleep(1);
+         usleep_range(1000, 2000);
 
         if (!(CHIP_IS_E1x(bp)))
                 port = BP_PATH(bp);
@@ -9839,8 +10071,9 @@ static int bnx2x_848x3_config_init(struct bnx2x_phy *phy,
                 cmd_args[2] = PHY84833_CONSTANT_LATENCY + 1;
                 cmd_args[3] = PHY84833_CONSTANT_LATENCY;
                 rc = bnx2x_84833_cmd_hdlr(phy, params,
-                        PHY84833_CMD_SET_EEE_MODE, cmd_args);
-                if (rc != 0)
+                        PHY84833_CMD_SET_EEE_MODE, cmd_args,
+                        PHY84833_CMDHDLR_MAX_ARGS);
+                if (rc)
                         DP(NETIF_MSG_LINK, "Cfg AutogrEEEn failed.\n");
         }
         if (initialize)
@@ -9864,6 +10097,48 @@ static int bnx2x_848x3_config_init(struct bnx2x_phy *phy,
                                  MDIO_CTL_REG_84823_USER_CTRL_REG, val);
         }
 
+        bnx2x_cl45_read(bp, phy, MDIO_CTL_DEVAD,
+                        MDIO_84833_TOP_CFG_FW_REV, &val);
+
+        /* Configure EEE support */
+        if ((val >= MDIO_84833_TOP_CFG_FW_EEE) && bnx2x_eee_has_cap(params)) {
+                phy->flags |= FLAGS_EEE_10GBT;
+                vars->eee_status |= SHMEM_EEE_10G_ADV <<
+                                    SHMEM_EEE_SUPPORTED_SHIFT;
+                /* Propogate params' bits --> vars (for migration exposure) */
+                if (params->eee_mode & EEE_MODE_ENABLE_LPI)
+                        vars->eee_status |= SHMEM_EEE_LPI_REQUESTED_BIT;
+                else
+                        vars->eee_status &= ~SHMEM_EEE_LPI_REQUESTED_BIT;
+
+                if (params->eee_mode & EEE_MODE_ADV_LPI)
+                        vars->eee_status |= SHMEM_EEE_REQUESTED_BIT;
+                else
+                        vars->eee_status &= ~SHMEM_EEE_REQUESTED_BIT;
+
+                rc = bnx2x_8483x_eee_timers(params, vars);
+                if (rc) {
+                        DP(NETIF_MSG_LINK, "Failed to configure EEE timers\n");
+                        bnx2x_8483x_disable_eee(phy, params, vars);
+                        return rc;
+                }
+
+                if ((params->req_duplex[actual_phy_selection] == DUPLEX_FULL) &&
+                    (params->eee_mode & EEE_MODE_ADV_LPI) &&
+                    (bnx2x_eee_calc_timer(params) ||
+                     !(params->eee_mode & EEE_MODE_ENABLE_LPI)))
+                        rc = bnx2x_8483x_enable_eee(phy, params, vars);
+                else
+                        rc = bnx2x_8483x_disable_eee(phy, params, vars);
+                if (rc) {
+                        DP(NETIF_MSG_LINK, "Failed to set EEE advertisment\n");
+                        return rc;
+                }
+        } else {
+                phy->flags &= ~FLAGS_EEE_10GBT;
+                vars->eee_status &= ~SHMEM_EEE_SUPPORTED_MASK;
+        }
+
         if (phy->type == PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM84833) {
                 /* Bring PHY out of super isolate mode as the final step. */
                 bnx2x_cl45_read(bp, phy,
@@ -9918,17 +10193,19 @@ static u8 bnx2x_848xx_read_status(struct bnx2x_phy *phy,
                 DP(NETIF_MSG_LINK, "Legacy speed status = 0x%x\n",
                    legacy_status);
                 link_up = ((legacy_status & (1<<11)) == (1<<11));
-                if (link_up) {
-                        legacy_speed = (legacy_status & (3<<9));
-                        if (legacy_speed == (0<<9))
-                                vars->line_speed = SPEED_10;
-                        else if (legacy_speed == (1<<9))
-                                vars->line_speed = SPEED_100;
-                        else if (legacy_speed == (2<<9))
-                                vars->line_speed = SPEED_1000;
-                        else /* Should not happen */
-                                vars->line_speed = 0;
+                legacy_speed = (legacy_status & (3<<9));
+                if (legacy_speed == (0<<9))
+                        vars->line_speed = SPEED_10;
+                else if (legacy_speed == (1<<9))
+                        vars->line_speed = SPEED_100;
+                else if (legacy_speed == (2<<9))
+                        vars->line_speed = SPEED_1000;
+                else { /* Should not happen: Treat as link down */
+                        vars->line_speed = 0;
+                        link_up = 0;
+                }
 
+                if (link_up) {
                         if (legacy_status & (1<<8))
                                 vars->duplex = DUPLEX_FULL;
                         else
@@ -9956,7 +10233,7 @@ static u8 bnx2x_848xx_read_status(struct bnx2x_phy *phy,
                 }
         }
         if (link_up) {
-                DP(NETIF_MSG_LINK, "BCM84823: link speed is %d\n",
+                DP(NETIF_MSG_LINK, "BCM848x3: link speed is %d\n",
                            vars->line_speed);
                 bnx2x_ext_phy_resolve_fc(phy, params, vars);
 
@@ -9995,6 +10272,31 @@ static u8 bnx2x_848xx_read_status(struct bnx2x_phy *phy,
                 if (val & (1<<11))
                         vars->link_status |=
                                 LINK_STATUS_LINK_PARTNER_10GXFD_CAPABLE;
+
+                /* Determine if EEE was negotiated */
+                if (phy->type == PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM84833) {
+                        u32 eee_shmem = 0;
+
+                        bnx2x_cl45_read(bp, phy, MDIO_AN_DEVAD,
+                                        MDIO_AN_REG_EEE_ADV, &val1);
+                        bnx2x_cl45_read(bp, phy, MDIO_AN_DEVAD,
+                                        MDIO_AN_REG_LP_EEE_ADV, &val2);
+                        if ((val1 & val2) & 0x8) {
+                                DP(NETIF_MSG_LINK, "EEE negotiated\n");
+                                vars->eee_status |= SHMEM_EEE_ACTIVE_BIT;
+                        }
+
+                        if (val2 & 0x12)
+                                eee_shmem |= SHMEM_EEE_100M_ADV;
+                        if (val2 & 0x4)
+                                eee_shmem |= SHMEM_EEE_1G_ADV;
+                        if (val2 & 0x68)
+                                eee_shmem |= SHMEM_EEE_10G_ADV;
+
+                        vars->eee_status &= ~SHMEM_EEE_LP_ADV_STATUS_MASK;
+                        vars->eee_status |= (eee_shmem <<
+                                             SHMEM_EEE_LP_ADV_STATUS_SHIFT);
+                }
         }
 
         return link_up;
@@ -10273,7 +10575,7 @@ static int bnx2x_54618se_config_init(struct bnx2x_phy *phy,
         u32 cfg_pin;
 
         DP(NETIF_MSG_LINK, "54618SE cfg init\n");
-        usleep_range(1000, 1000);
+        usleep_range(1000, 2000);
 
         /* This works with E3 only, no need to check the chip
          * before determining the port.
@@ -10342,7 +10644,7 @@ static int bnx2x_54618se_config_init(struct bnx2x_phy *phy,
                         MDIO_COMBO_IEEE0_AUTO_NEG_ADV_PAUSE_BOTH)
                 fc_val |= MDIO_AN_REG_ADV_PAUSE_PAUSE;
 
-        /* read all advertisement */
+        /* Read all advertisement */
         bnx2x_cl22_read(bp, phy,
                         0x09,
                         &an_1000_val);
@@ -10379,7 +10681,7 @@ static int bnx2x_54618se_config_init(struct bnx2x_phy *phy,
                         0x09,
                         &an_1000_val);
 
-        /* set 100 speed advertisement */
+        /* Set 100 speed advertisement */
         if (((phy->req_line_speed == SPEED_AUTO_NEG) &&
                         (phy->speed_cap_mask &
                         (PORT_HW_CFG_SPEED_CAPABILITY_D0_100M_FULL |
@@ -10393,7 +10695,7 @@ static int bnx2x_54618se_config_init(struct bnx2x_phy *phy,
                 DP(NETIF_MSG_LINK, "Advertising 100M\n");
         }
 
-        /* set 10 speed advertisement */
+        /* Set 10 speed advertisement */
         if (((phy->req_line_speed == SPEED_AUTO_NEG) &&
                         (phy->speed_cap_mask &
                         (PORT_HW_CFG_SPEED_CAPABILITY_D0_10M_FULL |
@@ -10532,7 +10834,7 @@ static u8 bnx2x_54618se_read_status(struct bnx2x_phy *phy,
 
         /* Get speed operation status */
         bnx2x_cl22_read(bp, phy,
-                        0x19,
+                        MDIO_REG_GPHY_AUX_STATUS,
                         &legacy_status);
         DP(NETIF_MSG_LINK, "54618SE read_status: 0x%x\n", legacy_status);
 
@@ -10759,7 +11061,7 @@ static u8 bnx2x_7101_read_status(struct bnx2x_phy *phy,
         DP(NETIF_MSG_LINK, "10G-base-T PMA status 0x%x->0x%x\n",
                    val2, val1);
         link_up = ((val1 & 4) == 4);
-        /* if link is up print the AN outcome of the SFX7101 PHY */
+        /* If link is up print the AN outcome of the SFX7101 PHY */
         if (link_up) {
                 bnx2x_cl45_read(bp, phy,
                                 MDIO_AN_DEVAD, MDIO_AN_REG_MASTER_STATUS,
@@ -10771,7 +11073,7 @@ static u8 bnx2x_7101_read_status(struct bnx2x_phy *phy,
                 bnx2x_ext_phy_10G_an_resolve(bp, phy, vars);
                 bnx2x_ext_phy_resolve_fc(phy, params, vars);
 
-                /* read LP advertised speeds */
+                /* Read LP advertised speeds */
                 if (val2 & (1<<11))
                         vars->link_status |=
                                 LINK_STATUS_LINK_PARTNER_10GXFD_CAPABLE;
@@ -11090,7 +11392,7 @@ static struct bnx2x_phy phy_8706 = {
                            SUPPORTED_FIBRE |
                            SUPPORTED_Pause |
                            SUPPORTED_Asym_Pause),
-        .media_type     = ETH_PHY_SFP_FIBER,
+        .media_type     = ETH_PHY_SFPP_10G_FIBER,
         .ver_addr       = 0,
         .req_flow_ctrl  = 0,
         .req_line_speed = 0,
@@ -11249,7 +11551,8 @@ static struct bnx2x_phy phy_84833 = {
         .def_md_devad   = 0,
         .flags          = (FLAGS_FAN_FAILURE_DET_REQ |
                            FLAGS_REARM_LATCH_SIGNAL |
-                           FLAGS_TX_ERROR_CHECK),
+                           FLAGS_TX_ERROR_CHECK |
+                           FLAGS_EEE_10GBT),
         .rx_preemphasis = {0xffff, 0xffff, 0xffff, 0xffff},
         .tx_preemphasis = {0xffff, 0xffff, 0xffff, 0xffff},
         .mdio_ctrl      = 0,
@@ -11428,7 +11731,7 @@ static int bnx2x_populate_int_phy(struct bnx2x *bp, u32 shmem_base, u8 port,
                                            SUPPORTED_FIBRE |
                                            SUPPORTED_Pause |
                                            SUPPORTED_Asym_Pause);
-                        phy->media_type = ETH_PHY_SFP_FIBER;
+                        phy->media_type = ETH_PHY_SFPP_10G_FIBER;
                         break;
                 case PORT_HW_CFG_NET_SERDES_IF_KR:
                         phy->media_type = ETH_PHY_KR;
@@ -11968,7 +12271,7 @@ int bnx2x_phy_init(struct link_params *params, struct link_vars *vars)
         vars->mac_type = MAC_TYPE_NONE;
         vars->phy_flags = 0;
 
-        /* disable attentions */
+        /* Disable attentions */
         bnx2x_bits_dis(bp, NIG_REG_MASK_INTERRUPT_PORT0 + params->port*4,
                        (NIG_MASK_XGXS0_LINK_STATUS |
                         NIG_MASK_XGXS0_LINK10G |
@@ -12017,6 +12320,8 @@ int bnx2x_phy_init(struct link_params *params, struct link_vars *vars)
                 break;
         }
         bnx2x_update_mng(params, vars->link_status);
+
+        bnx2x_update_mng_eee(params, vars->eee_status);
         return 0;
 }
 
@@ -12026,19 +12331,22 @@ int bnx2x_link_reset(struct link_params *params, struct link_vars *vars,
         struct bnx2x *bp = params->bp;
         u8 phy_index, port = params->port, clear_latch_ind = 0;
         DP(NETIF_MSG_LINK, "Resetting the link of port %d\n", port);
-        /* disable attentions */
+        /* Disable attentions */
         vars->link_status = 0;
         bnx2x_update_mng(params, vars->link_status);
+        vars->eee_status &= ~(SHMEM_EEE_LP_ADV_STATUS_MASK |
+                              SHMEM_EEE_ACTIVE_BIT);
+        bnx2x_update_mng_eee(params, vars->eee_status);
         bnx2x_bits_dis(bp, NIG_REG_MASK_INTERRUPT_PORT0 + port*4,
                        (NIG_MASK_XGXS0_LINK_STATUS |
                         NIG_MASK_XGXS0_LINK10G |
                         NIG_MASK_SERDES0_LINK_STATUS |
                         NIG_MASK_MI_INT));
 
-        /* activate nig drain */
+        /* Activate nig drain */
         REG_WR(bp, NIG_REG_EGRESS_DRAIN0_MODE + port*4, 1);
 
-        /* disable nig egress interface */
+        /* Disable nig egress interface */
         if (!CHIP_IS_E3(bp)) {
                 REG_WR(bp, NIG_REG_BMAC0_OUT_EN + port*4, 0);
                 REG_WR(bp, NIG_REG_EGRESS_EMAC0_OUT_EN + port*4, 0);
@@ -12051,15 +12359,15 @@ int bnx2x_link_reset(struct link_params *params, struct link_vars *vars,
                 bnx2x_xmac_disable(params);
                 bnx2x_umac_disable(params);
         }
-        /* disable emac */
+        /* Disable emac */
         if (!CHIP_IS_E3(bp))
                 REG_WR(bp, NIG_REG_NIG_EMAC0_EN + port*4, 0);
 
-        msleep(10);
+        usleep_range(10000, 20000);
         /* The PHY reset is controlled by GPIO 1
          * Hold it as vars low
          */
-         /* clear link led */
+         /* Clear link led */
         bnx2x_set_mdio_clk(bp, params->chip_id, port);
         bnx2x_set_led(params, vars, LED_MODE_OFF, 0);
 
@@ -12089,9 +12397,9 @@ int bnx2x_link_reset(struct link_params *params, struct link_vars *vars,
                 params->phy[INT_PHY].link_reset(
                         &params->phy[INT_PHY], params);
 
-        /* disable nig ingress interface */
+        /* Disable nig ingress interface */
         if (!CHIP_IS_E3(bp)) {
-                /* reset BigMac */
+                /* Reset BigMac */
                 REG_WR(bp, GRCBASE_MISC + MISC_REGISTERS_RESET_REG_2_CLEAR,
                        (MISC_REGISTERS_RESET_REG_2_RST_BMAC0 << port));
                 REG_WR(bp, NIG_REG_BMAC0_IN_EN + port*4, 0);
@@ -12148,7 +12456,7 @@ static int bnx2x_8073_common_init_phy(struct bnx2x *bp,
                         DP(NETIF_MSG_LINK, "populate_phy failed\n");
                         return -EINVAL;
                 }
-                /* disable attentions */
+                /* Disable attentions */
                 bnx2x_bits_dis(bp, NIG_REG_MASK_INTERRUPT_PORT0 +
                                port_of_path*4,
                                (NIG_MASK_XGXS0_LINK_STATUS |
@@ -12222,7 +12530,7 @@ static int bnx2x_8073_common_init_phy(struct bnx2x *bp,
                 bnx2x_cl45_write(bp, phy_blk[port],
                                 MDIO_PMA_DEVAD,
                                 MDIO_PMA_REG_TX_POWER_DOWN, (val & (~(1<<10))));
-                msleep(15);
+                usleep_range(15000, 30000);
 
                 /* Read modify write the SPI-ROM version select register */
                 bnx2x_cl45_read(bp, phy_blk[port],
@@ -12254,7 +12562,7 @@ static int bnx2x_8726_common_init_phy(struct bnx2x *bp,
         REG_WR(bp, MISC_REG_GPIO_EVENT_EN, val);
 
         bnx2x_ext_phy_hw_reset(bp, 0);
-        msleep(5);
+        usleep_range(5000, 10000);
         for (port = 0; port < PORT_MAX; port++) {
                 u32 shmem_base, shmem2_base;
 
@@ -12361,11 +12669,11 @@ static int bnx2x_8727_common_init_phy(struct bnx2x *bp,
         /* Initiate PHY reset*/
         bnx2x_set_gpio(bp, reset_gpio, MISC_REGISTERS_GPIO_OUTPUT_LOW,
                        port);
-        msleep(1);
+         usleep_range(1000, 2000);
         bnx2x_set_gpio(bp, reset_gpio, MISC_REGISTERS_GPIO_OUTPUT_HIGH,
                        port);
 
-        msleep(5);
+        usleep_range(5000, 10000);
 
         /* PART1 - Reset both phys */
         for (port = PORT_MAX - 1; port >= PORT_0; port--) {
@@ -12459,7 +12767,7 @@ static int bnx2x_84833_pre_init_phy(struct bnx2x *bp,
                                 MDIO_PMA_REG_CTRL, &val);
                 if (!(val & (1<<15)))
                         break;
-                msleep(1);
+                 usleep_range(1000, 2000);
         }
         if (cnt >= 1500) {
                 DP(NETIF_MSG_LINK, "84833 reset timeout\n");
@@ -12549,7 +12857,7 @@ static int bnx2x_ext_phy_common_init(struct bnx2x *bp, u32 shmem_base_path[],
                 break;
         }
 
-        if (rc != 0)
+        if (rc)
                 netdev_err(bp->dev,  "Warning: PHY was not initialized,"
                                       " Port %d\n",
                          0);
@@ -12630,30 +12938,41 @@ static void bnx2x_check_over_curr(struct link_params *params,
                 vars->phy_flags &= ~PHY_OVER_CURRENT_FLAG;
 }
 
-static void bnx2x_analyze_link_error(struct link_params *params,
-                                     struct link_vars *vars, u32 lss_status,
-                                     u8 notify)
+/* Returns 0 if no change occured since last check; 1 otherwise. */
+static u8 bnx2x_analyze_link_error(struct link_params *params,
+                                    struct link_vars *vars, u32 status,
+                                    u32 phy_flag, u32 link_flag, u8 notify)
 {
         struct bnx2x *bp = params->bp;
         /* Compare new value with previous value */
         u8 led_mode;
-        u32 half_open_conn = (vars->phy_flags & PHY_HALF_OPEN_CONN_FLAG) > 0;
+        u32 old_status = (vars->phy_flags & phy_flag) ? 1 : 0;
 
-        if ((lss_status ^ half_open_conn) == 0)
-                return;
+        if ((status ^ old_status) == 0)
+                return 0;
 
         /* If values differ */
-        DP(NETIF_MSG_LINK, "Link changed:%x %x->%x\n", vars->link_up,
-                       half_open_conn, lss_status);
+        switch (phy_flag) {
+        case PHY_HALF_OPEN_CONN_FLAG:
+                DP(NETIF_MSG_LINK, "Analyze Remote Fault\n");
+                break;
+        case PHY_SFP_TX_FAULT_FLAG:
+                DP(NETIF_MSG_LINK, "Analyze TX Fault\n");
+                break;
+        default:
+                DP(NETIF_MSG_LINK, "Analyze UNKOWN\n");
+        }
+        DP(NETIF_MSG_LINK, "Link changed:[%x %x]->%x\n", vars->link_up,
+           old_status, status);
 
         /* a. Update shmem->link_status accordingly
          * b. Update link_vars->link_up
          */
-        if (lss_status) {
-                DP(NETIF_MSG_LINK, "Remote Fault detected !!!\n");
+        if (status) {
                 vars->link_status &= ~LINK_STATUS_LINK_UP;
+                vars->link_status |= link_flag;
                 vars->link_up = 0;
-                vars->phy_flags |= PHY_HALF_OPEN_CONN_FLAG;
+                vars->phy_flags |= phy_flag;
 
                 /* activate nig drain */
                 REG_WR(bp, NIG_REG_EGRESS_DRAIN0_MODE + params->port*4, 1);
@@ -12662,10 +12981,10 @@ static void bnx2x_analyze_link_error(struct link_params *params,
                  */
                 led_mode = LED_MODE_OFF;
         } else {
-                DP(NETIF_MSG_LINK, "Remote Fault cleared\n");
                 vars->link_status |= LINK_STATUS_LINK_UP;
+                vars->link_status &= ~link_flag;
                 vars->link_up = 1;
-                vars->phy_flags &= ~PHY_HALF_OPEN_CONN_FLAG;
+                vars->phy_flags &= ~phy_flag;
                 led_mode = LED_MODE_OPER;
 
                 /* Clear nig drain */
@@ -12682,6 +13001,8 @@ static void bnx2x_analyze_link_error(struct link_params *params,
         vars->periodic_flags |= PERIODIC_FLAGS_LINK_EVENT;
         if (notify)
                 bnx2x_notify_link_changed(bp);
+
+        return 1;
 }
 
 /******************************************************************************
@@ -12723,7 +13044,9 @@ int bnx2x_check_half_open_conn(struct link_params *params,
                 if (REG_RD(bp, mac_base + XMAC_REG_RX_LSS_STATUS))
                         lss_status = 1;
 
-                bnx2x_analyze_link_error(params, vars, lss_status, notify);
+                bnx2x_analyze_link_error(params, vars, lss_status,
+                                         PHY_HALF_OPEN_CONN_FLAG,
+                                         LINK_STATUS_NONE, notify);
         } else if (REG_RD(bp, MISC_REG_RESET_REG_2) &
                    (MISC_REGISTERS_RESET_REG_2_RST_BMAC0 << params->port)) {
                 /* Check E1X / E2 BMAC */
@@ -12740,11 +13063,55 @@ int bnx2x_check_half_open_conn(struct link_params *params,
                 REG_RD_DMAE(bp, mac_base + lss_status_reg, wb_data, 2);
                 lss_status = (wb_data[0] > 0);
 
-                bnx2x_analyze_link_error(params, vars, lss_status, notify);
+                bnx2x_analyze_link_error(params, vars, lss_status,
+                                         PHY_HALF_OPEN_CONN_FLAG,
+                                         LINK_STATUS_NONE, notify);
         }
         return 0;
 }
+static void bnx2x_sfp_tx_fault_detection(struct bnx2x_phy *phy,
+                                         struct link_params *params,
+                                         struct link_vars *vars)
+{
+        struct bnx2x *bp = params->bp;
+        u32 cfg_pin, value = 0;
+        u8 led_change, port = params->port;
 
+        /* Get The SFP+ TX_Fault controlling pin ([eg]pio) */
+        cfg_pin = (REG_RD(bp, params->shmem_base + offsetof(struct shmem_region,
+                          dev_info.port_hw_config[port].e3_cmn_pin_cfg)) &
+                   PORT_HW_CFG_E3_TX_FAULT_MASK) >>
+                  PORT_HW_CFG_E3_TX_FAULT_SHIFT;
+
+        if (bnx2x_get_cfg_pin(bp, cfg_pin, &value)) {
+                DP(NETIF_MSG_LINK, "Failed to read pin 0x%02x\n", cfg_pin);
+                return;
+        }
+
+        led_change = bnx2x_analyze_link_error(params, vars, value,
+                                              PHY_SFP_TX_FAULT_FLAG,
+                                              LINK_STATUS_SFP_TX_FAULT, 1);
+
+        if (led_change) {
+                /* Change TX_Fault led, set link status for further syncs */
+                u8 led_mode;
+
+                if (vars->phy_flags & PHY_SFP_TX_FAULT_FLAG) {
+                        led_mode = MISC_REGISTERS_GPIO_HIGH;
+                        vars->link_status |= LINK_STATUS_SFP_TX_FAULT;
+                } else {
+                        led_mode = MISC_REGISTERS_GPIO_LOW;
+                        vars->link_status &= ~LINK_STATUS_SFP_TX_FAULT;
+                }
+
+                /* If module is unapproved, led should be on regardless */
+                if (!(phy->flags & FLAGS_SFP_NOT_APPROVED)) {
+                        DP(NETIF_MSG_LINK, "Change TX_Fault LED: ->%x\n",
+                           led_mode);
+                        bnx2x_set_e3_module_fault_led(params, led_mode);
+                }
+        }
+}
 void bnx2x_period_func(struct link_params *params, struct link_vars *vars)
 {
         u16 phy_idx;
@@ -12763,7 +13130,26 @@ void bnx2x_period_func(struct link_params *params, struct link_vars *vars)
                 struct bnx2x_phy *phy = &params->phy[INT_PHY];
                 bnx2x_set_aer_mmd(params, phy);
                 bnx2x_check_over_curr(params, vars);
-                bnx2x_warpcore_config_runtime(phy, params, vars);
+                if (vars->rx_tx_asic_rst)
+                        bnx2x_warpcore_config_runtime(phy, params, vars);
+
+                if ((REG_RD(bp, params->shmem_base +
+                            offsetof(struct shmem_region, dev_info.
+                                port_hw_config[params->port].default_cfg))
+                    & PORT_HW_CFG_NET_SERDES_IF_MASK) ==
+                    PORT_HW_CFG_NET_SERDES_IF_SFI) {
+                        if (bnx2x_is_sfp_module_plugged(phy, params)) {
+                                bnx2x_sfp_tx_fault_detection(phy, params, vars);
+                        } else if (vars->link_status &
+                                LINK_STATUS_SFP_TX_FAULT) {
+                                /* Clean trail, interrupt corrects the leds */
+                                vars->link_status &= ~LINK_STATUS_SFP_TX_FAULT;
+                                vars->phy_flags &= ~PHY_SFP_TX_FAULT_FLAG;
+                                /* Update link status in the shared memory */
+                                bnx2x_update_mng(params, vars->link_status);
+                        }
+                }
+
         }
 
 }
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.h
index ea4371f4335..51cac813005 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.h
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.h
@@ -41,6 +41,7 @@
 #define SPEED_AUTO_NEG          0
 #define SPEED_20000             20000
 
+#define SFP_EEPROM_PAGE_SIZE                    16
 #define SFP_EEPROM_VENDOR_NAME_ADDR             0x14
 #define SFP_EEPROM_VENDOR_NAME_SIZE             16
 #define SFP_EEPROM_VENDOR_OUI_ADDR              0x25
@@ -125,6 +126,11 @@ typedef void (*set_link_led_t)(struct bnx2x_phy *phy,
                                struct link_params *params, u8 mode);
 typedef void (*phy_specific_func_t)(struct bnx2x_phy *phy,
                                     struct link_params *params, u32 action);
+struct bnx2x_reg_set {
+        u8  devad;
+        u16 reg;
+        u16 val;
+};
 
 struct bnx2x_phy {
         u32 type;
@@ -149,6 +155,7 @@ struct bnx2x_phy {
 #define FLAGS_DUMMY_READ                (1<<9)
 #define FLAGS_MDC_MDIO_WA_B0            (1<<10)
 #define FLAGS_TX_ERROR_CHECK            (1<<12)
+#define FLAGS_EEE_10GBT                 (1<<13)
 
         /* preemphasis values for the rx side */
         u16 rx_preemphasis[4];
@@ -162,14 +169,15 @@ struct bnx2x_phy {
         u32 supported;
 
         u32 media_type;
-#define ETH_PHY_UNSPECIFIED 0x0
-#define ETH_PHY_SFP_FIBER   0x1
-#define ETH_PHY_XFP_FIBER   0x2
-#define ETH_PHY_DA_TWINAX   0x3
-#define ETH_PHY_BASE_T      0x4
-#define ETH_PHY_KR          0xf0
-#define ETH_PHY_CX4         0xf1
-#define ETH_PHY_NOT_PRESENT 0xff
+#define ETH_PHY_UNSPECIFIED     0x0
+#define ETH_PHY_SFPP_10G_FIBER  0x1
+#define ETH_PHY_XFP_FIBER               0x2
+#define ETH_PHY_DA_TWINAX               0x3
+#define ETH_PHY_BASE_T          0x4
+#define ETH_PHY_SFP_1G_FIBER    0x5
+#define ETH_PHY_KR              0xf0
+#define ETH_PHY_CX4             0xf1
+#define ETH_PHY_NOT_PRESENT     0xff
 
         /* The address in which version is located*/
         u32 ver_addr;
@@ -265,6 +273,30 @@ struct link_params {
         u8 num_phys;
 
         u8 rsrv;
+
+        /* Used to configure the EEE Tx LPI timer, has several modes of
+         * operation, according to bits 29:28 -
+         * 2'b00: Timer will be configured by nvram, output will be the value
+         *        from nvram.
+         * 2'b01: Timer will be configured by nvram, output will be in
+         *        microseconds.
+         * 2'b10: bits 1:0 contain an nvram value which will be used instead
+         *        of the one located in the nvram. Output will be that value.
+         * 2'b11: bits 19:0 contain the idle timer in microseconds; output
+         *        will be in microseconds.
+         * Bits 31:30 should be 2'b11 in order for EEE to be enabled.
+         */
+        u32 eee_mode;
+#define EEE_MODE_NVRAM_BALANCED_TIME            (0xa00)
+#define EEE_MODE_NVRAM_AGGRESSIVE_TIME          (0x100)
+#define EEE_MODE_NVRAM_LATENCY_TIME             (0x6000)
+#define EEE_MODE_NVRAM_MASK             (0x3)
+#define EEE_MODE_TIMER_MASK             (0xfffff)
+#define EEE_MODE_OUTPUT_TIME            (1<<28)
+#define EEE_MODE_OVERRIDE_NVRAM         (1<<29)
+#define EEE_MODE_ENABLE_LPI             (1<<30)
+#define EEE_MODE_ADV_LPI                        (1<<31)
+
         u16 hw_led_mode; /* part of the hw_config read from the shmem */
         u32 multi_phy_config;
 
@@ -282,6 +314,7 @@ struct link_vars {
 #define PHY_PHYSICAL_LINK_FLAG          (1<<2)
 #define PHY_HALF_OPEN_CONN_FLAG         (1<<3)
 #define PHY_OVER_CURRENT_FLAG           (1<<4)
+#define PHY_SFP_TX_FAULT_FLAG           (1<<5)
 
         u8 mac_type;
 #define MAC_TYPE_NONE           0
@@ -301,6 +334,7 @@ struct link_vars {
 
         /* The same definitions as the shmem parameter */
         u32 link_status;
+        u32 eee_status;
         u8 fault_detected;
         u8 rsrv1;
         u16 periodic_flags;
@@ -459,8 +493,7 @@ struct bnx2x_ets_params {
         struct bnx2x_ets_cos_params cos[DCBX_MAX_NUM_COS];
 };
 
-/**
- * Used to update the PFC attributes in EMAC, BMAC, NIG and BRB
+/* Used to update the PFC attributes in EMAC, BMAC, NIG and BRB
  * when link is already up
  */
 int bnx2x_update_pfc(struct link_params *params,
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
index f755a665dab..08eca3ff7db 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
@@ -74,6 +74,8 @@
 #define FW_FILE_NAME_E1H        "bnx2x/bnx2x-e1h-" FW_FILE_VERSION ".fw"
 #define FW_FILE_NAME_E2         "bnx2x/bnx2x-e2-" FW_FILE_VERSION ".fw"
 
+#define MAC_LEADING_ZERO_CNT (ALIGN(ETH_ALEN, sizeof(u32)) - ETH_ALEN)
+
 /* Time in jiffies before concluding the transmitter is hung */
 #define TX_TIMEOUT              (5*HZ)
 
@@ -104,7 +106,7 @@ MODULE_PARM_DESC(disable_tpa, " Disable the TPA (LRO) feature");
 
 #define INT_MODE_INTx                   1
 #define INT_MODE_MSI                    2
-static int int_mode;
+int int_mode;
 module_param(int_mode, int, 0);
 MODULE_PARM_DESC(int_mode, " Force interrupt mode other than MSI-X "
                                 "(1 INT#x; 2 MSI)");
@@ -758,7 +760,7 @@ void bnx2x_panic_dump(struct bnx2x *bp)
                 /* Tx */
                 for_each_cos_in_tx_queue(fp, cos)
                 {
-                        txdata = fp->txdata[cos];
+                        txdata = *fp->txdata_ptr[cos];
                         BNX2X_ERR("fp%d: tx_pkt_prod(0x%x)  tx_pkt_cons(0x%x)  tx_bd_prod(0x%x)  tx_bd_cons(0x%x)  *tx_cons_sb(0x%x)\n",
                                   i, txdata.tx_pkt_prod,
                                   txdata.tx_pkt_cons, txdata.tx_bd_prod,
@@ -876,7 +878,7 @@ void bnx2x_panic_dump(struct bnx2x *bp)
         for_each_tx_queue(bp, i) {
                 struct bnx2x_fastpath *fp = &bp->fp[i];
                 for_each_cos_in_tx_queue(fp, cos) {
-                        struct bnx2x_fp_txdata *txdata = &fp->txdata[cos];
+                        struct bnx2x_fp_txdata *txdata = fp->txdata_ptr[cos];
 
                         start = TX_BD(le16_to_cpu(*txdata->tx_cons_sb) - 10);
                         end = TX_BD(le16_to_cpu(*txdata->tx_cons_sb) + 245);
@@ -1583,7 +1585,7 @@ void bnx2x_sp_event(struct bnx2x_fastpath *fp, union eth_rx_cqe *rr_cqe)
         int cid = SW_CID(rr_cqe->ramrod_cqe.conn_and_cmd_data);
         int command = CQE_CMD(rr_cqe->ramrod_cqe.conn_and_cmd_data);
         enum bnx2x_queue_cmd drv_cmd = BNX2X_Q_CMD_MAX;
-        struct bnx2x_queue_sp_obj *q_obj = &fp->q_obj;
+        struct bnx2x_queue_sp_obj *q_obj = &bnx2x_sp_obj(bp, fp).q_obj;
 
         DP(BNX2X_MSG_SP,
            "fp %d  cid %d  got ramrod #%d  state is %x  type is %d\n",
@@ -1710,7 +1712,7 @@ irqreturn_t bnx2x_interrupt(int irq, void *dev_instance)
                         /* Handle Rx or Tx according to SB id */
                         prefetch(fp->rx_cons_sb);
                         for_each_cos_in_tx_queue(fp, cos)
-                                prefetch(fp->txdata[cos].tx_cons_sb);
+                                prefetch(fp->txdata_ptr[cos]->tx_cons_sb);
                         prefetch(&fp->sb_running_index[SM_RX_ID]);
                         napi_schedule(&bnx2x_fp(bp, fp->index, napi));
                         status &= ~mask;
@@ -2124,6 +2126,11 @@ u8 bnx2x_initial_phy_init(struct bnx2x *bp, int load_mode)
                         }
                 }
 
+                if (load_mode == LOAD_LOOPBACK_EXT) {
+                        struct link_params *lp = &bp->link_params;
+                        lp->loopback_mode = LOOPBACK_EXT;
+                }
+
                 rc = bnx2x_phy_init(&bp->link_params, &bp->link_vars);
 
                 bnx2x_release_phy_lock(bp);
@@ -2916,7 +2923,7 @@ static void bnx2x_pf_tx_q_prep(struct bnx2x *bp,
         struct bnx2x_fastpath *fp, struct bnx2x_txq_setup_params *txq_init,
         u8 cos)
 {
-        txq_init->dscr_map = fp->txdata[cos].tx_desc_mapping;
+        txq_init->dscr_map = fp->txdata_ptr[cos]->tx_desc_mapping;
         txq_init->sb_cq_index = HC_INDEX_ETH_FIRST_TX_CQ_CONS + cos;
         txq_init->traffic_type = LLFC_TRAFFIC_TYPE_NW;
         txq_init->fw_sb_id = fp->fw_sb_id;
@@ -3030,9 +3037,9 @@ static void bnx2x_drv_info_ether_stat(struct bnx2x *bp)
         memcpy(ether_stat->version, DRV_MODULE_VERSION,
                ETH_STAT_INFO_VERSION_LEN - 1);
 
-        bp->fp[0].mac_obj.get_n_elements(bp, &bp->fp[0].mac_obj,
-                                         DRV_INFO_ETH_STAT_NUM_MACS_REQUIRED,
-                                         ether_stat->mac_local);
+        bp->sp_objs[0].mac_obj.get_n_elements(bp, &bp->sp_objs[0].mac_obj,
+                                        DRV_INFO_ETH_STAT_NUM_MACS_REQUIRED,
+                                        ether_stat->mac_local);
 
         ether_stat->mtu_size = bp->dev->mtu;
 
@@ -3055,7 +3062,8 @@ static void bnx2x_drv_info_fcoe_stat(struct bnx2x *bp)
         struct fcoe_stats_info *fcoe_stat =
                 &bp->slowpath->drv_info_to_mcp.fcoe_stat;
 
-        memcpy(fcoe_stat->mac_local, bp->fip_mac, ETH_ALEN);
+        memcpy(fcoe_stat->mac_local + MAC_LEADING_ZERO_CNT,
+               bp->fip_mac, ETH_ALEN);
 
         fcoe_stat->qos_priority =
                 app->traffic_type_priority[LLFC_TRAFFIC_TYPE_FCOE];
@@ -3063,11 +3071,11 @@ static void bnx2x_drv_info_fcoe_stat(struct bnx2x *bp)
         /* insert FCoE stats from ramrod response */
         if (!NO_FCOE(bp)) {
                 struct tstorm_per_queue_stats *fcoe_q_tstorm_stats =
-                        &bp->fw_stats_data->queue_stats[FCOE_IDX].
+                        &bp->fw_stats_data->queue_stats[FCOE_IDX(bp)].
                         tstorm_queue_statistics;
 
                 struct xstorm_per_queue_stats *fcoe_q_xstorm_stats =
-                        &bp->fw_stats_data->queue_stats[FCOE_IDX].
+                        &bp->fw_stats_data->queue_stats[FCOE_IDX(bp)].
                         xstorm_queue_statistics;
 
                 struct fcoe_statistics_params *fw_fcoe_stat =
@@ -3146,7 +3154,8 @@ static void bnx2x_drv_info_iscsi_stat(struct bnx2x *bp)
         struct iscsi_stats_info *iscsi_stat =
                 &bp->slowpath->drv_info_to_mcp.iscsi_stat;
 
-        memcpy(iscsi_stat->mac_local, bp->cnic_eth_dev.iscsi_mac, ETH_ALEN);
+        memcpy(iscsi_stat->mac_local + MAC_LEADING_ZERO_CNT,
+               bp->cnic_eth_dev.iscsi_mac, ETH_ALEN);
 
         iscsi_stat->qos_priority =
                 app->traffic_type_priority[LLFC_TRAFFIC_TYPE_ISCSI];
@@ -3176,6 +3185,12 @@ static void bnx2x_set_mf_bw(struct bnx2x *bp)
         bnx2x_fw_command(bp, DRV_MSG_CODE_SET_MF_BW_ACK, 0);
 }
 
+static void bnx2x_handle_eee_event(struct bnx2x *bp)
+{
+        DP(BNX2X_MSG_MCP, "EEE - LLDP event\n");
+        bnx2x_fw_command(bp, DRV_MSG_CODE_EEE_RESULTS_ACK, 0);
+}
+
 static void bnx2x_handle_drv_info_req(struct bnx2x *bp)
 {
         enum drv_info_opcode op_code;
@@ -3742,6 +3757,8 @@ static void bnx2x_attn_int_deasserted3(struct bnx2x *bp, u32 attn)
                         if (val & DRV_STATUS_AFEX_EVENT_MASK)
                                 bnx2x_handle_afex_cmd(bp,
                                         val & DRV_STATUS_AFEX_EVENT_MASK);
+                        if (val & DRV_STATUS_EEE_NEGOTIATION_RESULTS)
+                                bnx2x_handle_eee_event(bp);
                         if (bp->link_vars.periodic_flags &
                             PERIODIC_FLAGS_LINK_EVENT) {
                                 /*  sync with link */
@@ -4615,11 +4632,11 @@ static void bnx2x_handle_classification_eqe(struct bnx2x *bp,
         case BNX2X_FILTER_MAC_PENDING:
                 DP(BNX2X_MSG_SP, "Got SETUP_MAC completions\n");
 #ifdef BCM_CNIC
-                if (cid == BNX2X_ISCSI_ETH_CID)
+                if (cid == BNX2X_ISCSI_ETH_CID(bp))
                         vlan_mac_obj = &bp->iscsi_l2_mac_obj;
                 else
 #endif
-                        vlan_mac_obj = &bp->fp[cid].mac_obj;
+                        vlan_mac_obj = &bp->sp_objs[cid].mac_obj;
 
                 break;
         case BNX2X_FILTER_MCAST_PENDING:
@@ -4717,7 +4734,7 @@ static void bnx2x_after_function_update(struct bnx2x *bp)
         for_each_eth_queue(bp, q) {
                 /* Set the appropriate Queue object */
                 fp = &bp->fp[q];
-                queue_params.q_obj = &fp->q_obj;
+                queue_params.q_obj = &bnx2x_sp_obj(bp, fp).q_obj;
 
                 /* send the ramrod */
                 rc = bnx2x_queue_state_change(bp, &queue_params);
@@ -4728,8 +4745,8 @@ static void bnx2x_after_function_update(struct bnx2x *bp)
 
 #ifdef BCM_CNIC
         if (!NO_FCOE(bp)) {
-                fp = &bp->fp[FCOE_IDX];
-                queue_params.q_obj = &fp->q_obj;
+                fp = &bp->fp[FCOE_IDX(bp)];
+                queue_params.q_obj = &bnx2x_sp_obj(bp, fp).q_obj;
 
                 /* clear pending completion bit */
                 __clear_bit(RAMROD_COMP_WAIT, &queue_params.ramrod_flags);
@@ -4761,11 +4778,11 @@ static struct bnx2x_queue_sp_obj *bnx2x_cid_to_q_obj(
 {
         DP(BNX2X_MSG_SP, "retrieving fp from cid %d\n", cid);
 #ifdef BCM_CNIC
-        if (cid == BNX2X_FCOE_ETH_CID)
-                return &bnx2x_fcoe(bp, q_obj);
+        if (cid == BNX2X_FCOE_ETH_CID(bp))
+                return &bnx2x_fcoe_sp_obj(bp, q_obj);
         else
 #endif
-                return &bnx2x_fp(bp, CID_TO_FP(cid), q_obj);
+                return &bp->sp_objs[CID_TO_FP(cid, bp)].q_obj;
 }
 
 static void bnx2x_eq_int(struct bnx2x *bp)
@@ -5647,15 +5664,15 @@ static void bnx2x_init_eth_fp(struct bnx2x *bp, int fp_idx)
 
         /* init tx data */
         for_each_cos_in_tx_queue(fp, cos) {
-                bnx2x_init_txdata(bp, &fp->txdata[cos],
-                                  CID_COS_TO_TX_ONLY_CID(fp->cid, cos),
-                                  FP_COS_TO_TXQ(fp, cos),
-                                  BNX2X_TX_SB_INDEX_BASE + cos);
-                cids[cos] = fp->txdata[cos].cid;
+                bnx2x_init_txdata(bp, fp->txdata_ptr[cos],
+                                  CID_COS_TO_TX_ONLY_CID(fp->cid, cos, bp),
+                                  FP_COS_TO_TXQ(fp, cos, bp),
+                                  BNX2X_TX_SB_INDEX_BASE + cos, fp);
+                cids[cos] = fp->txdata_ptr[cos]->cid;
         }
 
-        bnx2x_init_queue_obj(bp, &fp->q_obj, fp->cl_id, cids, fp->max_cos,
-                             BP_FUNC(bp), bnx2x_sp(bp, q_rdata),
+        bnx2x_init_queue_obj(bp, &bnx2x_sp_obj(bp, fp).q_obj, fp->cl_id, cids,
+                             fp->max_cos, BP_FUNC(bp), bnx2x_sp(bp, q_rdata),
                              bnx2x_sp_mapping(bp, q_rdata), q_type);
 
         /**
@@ -5706,7 +5723,7 @@ static void bnx2x_init_tx_rings(struct bnx2x *bp)
 
         for_each_tx_queue(bp, i)
                 for_each_cos_in_tx_queue(&bp->fp[i], cos)
-                        bnx2x_init_tx_ring_one(&bp->fp[i].txdata[cos]);
+                        bnx2x_init_tx_ring_one(bp->fp[i].txdata_ptr[cos]);
 }
 
 void bnx2x_nic_init(struct bnx2x *bp, u32 load_code)
@@ -7055,12 +7072,10 @@ static int bnx2x_init_hw_func(struct bnx2x *bp)
         cdu_ilt_start = ilt->clients[ILT_CLIENT_CDU].start;
 
         for (i = 0; i < L2_ILT_LINES(bp); i++) {
-                ilt->lines[cdu_ilt_start + i].page =
-                        bp->context.vcxt + (ILT_PAGE_CIDS * i);
+                ilt->lines[cdu_ilt_start + i].page = bp->context[i].vcxt;
                 ilt->lines[cdu_ilt_start + i].page_mapping =
-                        bp->context.cxt_mapping + (CDU_ILT_PAGE_SZ * i);
-                /* cdu ilt pages are allocated manually so there's no need to
-                set the size */
+                        bp->context[i].cxt_mapping;
+                ilt->lines[cdu_ilt_start + i].size = bp->context[i].size;
         }
         bnx2x_ilt_init_op(bp, INITOP_SET);
 
@@ -7327,6 +7342,8 @@ static int bnx2x_init_hw_func(struct bnx2x *bp)
 
 void bnx2x_free_mem(struct bnx2x *bp)
 {
+        int i;
+
         /* fastpath */
         bnx2x_free_fp_mem(bp);
         /* end of fastpath */
@@ -7340,9 +7357,9 @@ void bnx2x_free_mem(struct bnx2x *bp)
         BNX2X_PCI_FREE(bp->slowpath, bp->slowpath_mapping,
                        sizeof(struct bnx2x_slowpath));
 
-        BNX2X_PCI_FREE(bp->context.vcxt, bp->context.cxt_mapping,
-                       bp->context.size);
-
+        for (i = 0; i < L2_ILT_LINES(bp); i++)
+                BNX2X_PCI_FREE(bp->context[i].vcxt, bp->context[i].cxt_mapping,
+                               bp->context[i].size);
         bnx2x_ilt_mem_op(bp, ILT_MEMOP_FREE);
 
         BNX2X_FREE(bp->ilt->lines);
@@ -7428,6 +7445,8 @@ alloc_mem_err:
 
 int bnx2x_alloc_mem(struct bnx2x *bp)
 {
+        int i, allocated, context_size;
+
 #ifdef BCM_CNIC
         if (!CHIP_IS_E1x(bp))
                 /* size = the status block + ramrod buffers */
@@ -7457,11 +7476,29 @@ int bnx2x_alloc_mem(struct bnx2x *bp)
         if (bnx2x_alloc_fw_stats_mem(bp))
                 goto alloc_mem_err;
 
-        bp->context.size = sizeof(union cdu_context) * BNX2X_L2_CID_COUNT(bp);
-
-        BNX2X_PCI_ALLOC(bp->context.vcxt, &bp->context.cxt_mapping,
-                        bp->context.size);
+        /* Allocate memory for CDU context:
+         * This memory is allocated separately and not in the generic ILT
+         * functions because CDU differs in few aspects:
+         * 1. There are multiple entities allocating memory for context -
+         * 'regular' driver, CNIC and SRIOV driver. Each separately controls
+         * its own ILT lines.
+         * 2. Since CDU page-size is not a single 4KB page (which is the case
+         * for the other ILT clients), to be efficient we want to support
+         * allocation of sub-page-size in the last entry.
+         * 3. Context pointers are used by the driver to pass to FW / update
+         * the context (for the other ILT clients the pointers are used just to
+         * free the memory during unload).
+         */
+        context_size = sizeof(union cdu_context) * BNX2X_L2_CID_COUNT(bp);
 
+        for (i = 0, allocated = 0; allocated < context_size; i++) {
+                bp->context[i].size = min(CDU_ILT_PAGE_SZ,
+                                          (context_size - allocated));
+                BNX2X_PCI_ALLOC(bp->context[i].vcxt,
+                                &bp->context[i].cxt_mapping,
+                                bp->context[i].size);
+                allocated += bp->context[i].size;
+        }
         BNX2X_ALLOC(bp->ilt->lines, sizeof(struct ilt_line) * ILT_MAX_LINES);
 
         if (bnx2x_ilt_mem_op(bp, ILT_MEMOP_ALLOC))
@@ -7563,8 +7600,8 @@ int bnx2x_set_eth_mac(struct bnx2x *bp, bool set)
 
         __set_bit(RAMROD_COMP_WAIT, &ramrod_flags);
         /* Eth MAC is set on RSS leading client (fp[0]) */
-        return bnx2x_set_mac_one(bp, bp->dev->dev_addr, &bp->fp->mac_obj, set,
-                                 BNX2X_ETH_MAC, &ramrod_flags);
+        return bnx2x_set_mac_one(bp, bp->dev->dev_addr, &bp->sp_objs->mac_obj,
+                                 set, BNX2X_ETH_MAC, &ramrod_flags);
 }
 
 int bnx2x_setup_leading(struct bnx2x *bp)
@@ -7579,7 +7616,7 @@ int bnx2x_setup_leading(struct bnx2x *bp)
  *
  * In case of MSI-X it will also try to enable MSI-X.
  */
-static void __devinit bnx2x_set_int_mode(struct bnx2x *bp)
+void bnx2x_set_int_mode(struct bnx2x *bp)
 {
         switch (int_mode) {
         case INT_MODE_MSI:
@@ -7590,11 +7627,6 @@ static void __devinit bnx2x_set_int_mode(struct bnx2x *bp)
                 BNX2X_DEV_INFO("set number of queues to 1\n");
                 break;
         default:
-                /* Set number of queues for MSI-X mode */
-                bnx2x_set_num_queues(bp);
-
-                BNX2X_DEV_INFO("set number of queues to %d\n", bp->num_queues);
-
                 /* if we can't use MSI-X we only need one fp,
                  * so try to enable MSI-X with the requested number of fp's
                  * and fallback to MSI or legacy INTx with one fp
@@ -7735,6 +7767,8 @@ static void bnx2x_pf_q_prep_init(struct bnx2x *bp,
 {
 
         u8 cos;
+        int cxt_index, cxt_offset;
+
         /* FCoE Queue uses Default SB, thus has no HC capabilities */
         if (!IS_FCOE_FP(fp)) {
                 __set_bit(BNX2X_Q_FLG_HC, &init_params->rx.flags);
@@ -7771,9 +7805,13 @@ static void bnx2x_pf_q_prep_init(struct bnx2x *bp,
             fp->index, init_params->max_cos);
 
         /* set the context pointers queue object */
-        for (cos = FIRST_TX_COS_INDEX; cos < init_params->max_cos; cos++)
+        for (cos = FIRST_TX_COS_INDEX; cos < init_params->max_cos; cos++) {
+                cxt_index = fp->txdata_ptr[cos]->cid / ILT_PAGE_CIDS;
+                cxt_offset = fp->txdata_ptr[cos]->cid - (cxt_index *
+                                ILT_PAGE_CIDS);
                 init_params->cxts[cos] =
-                        &bp->context.vcxt[fp->txdata[cos].cid].eth;
+                        &bp->context[cxt_index].vcxt[cxt_offset].eth;
+        }
 }
 
 int bnx2x_setup_tx_only(struct bnx2x *bp, struct bnx2x_fastpath *fp,
@@ -7838,7 +7876,7 @@ int bnx2x_setup_queue(struct bnx2x *bp, struct bnx2x_fastpath *fp,
                 bnx2x_ack_sb(bp, fp->igu_sb_id, USTORM_ID, 0,
                              IGU_INT_ENABLE, 0);
 
-        q_params.q_obj = &fp->q_obj;
+        q_params.q_obj = &bnx2x_sp_obj(bp, fp).q_obj;
         /* We want to wait for completion in this context */
         __set_bit(RAMROD_COMP_WAIT, &q_params.ramrod_flags);
 
@@ -7911,7 +7949,7 @@ static int bnx2x_stop_queue(struct bnx2x *bp, int index)
 
         DP(NETIF_MSG_IFDOWN, "stopping queue %d cid %d\n", index, fp->cid);
 
-        q_params.q_obj = &fp->q_obj;
+        q_params.q_obj = &bnx2x_sp_obj(bp, fp).q_obj;
         /* We want to wait for completion in this context */
         __set_bit(RAMROD_COMP_WAIT, &q_params.ramrod_flags);
 
@@ -7922,7 +7960,7 @@ static int bnx2x_stop_queue(struct bnx2x *bp, int index)
              tx_index++){
 
                 /* ascertain this is a normal queue*/
-                txdata = &fp->txdata[tx_index];
+                txdata = fp->txdata_ptr[tx_index];
 
                 DP(NETIF_MSG_IFDOWN, "stopping tx-only queue %d\n",
                                                         txdata->txq_index);
@@ -8289,7 +8327,7 @@ void bnx2x_chip_cleanup(struct bnx2x *bp, int unload_mode)
                 struct bnx2x_fastpath *fp = &bp->fp[i];
 
                 for_each_cos_in_tx_queue(fp, cos)
-                        rc = bnx2x_clean_tx_queue(bp, &fp->txdata[cos]);
+                        rc = bnx2x_clean_tx_queue(bp, fp->txdata_ptr[cos]);
 #ifdef BNX2X_STOP_ON_ERROR
                 if (rc)
                         return;
@@ -8300,12 +8338,13 @@ void bnx2x_chip_cleanup(struct bnx2x *bp, int unload_mode)
         usleep_range(1000, 1000);
 
         /* Clean all ETH MACs */
-        rc = bnx2x_del_all_macs(bp, &bp->fp[0].mac_obj, BNX2X_ETH_MAC, false);
+        rc = bnx2x_del_all_macs(bp, &bp->sp_objs[0].mac_obj, BNX2X_ETH_MAC,
+                                false);
         if (rc < 0)
                 BNX2X_ERR("Failed to delete all ETH macs: %d\n", rc);
 
         /* Clean up UC list  */
-        rc = bnx2x_del_all_macs(bp, &bp->fp[0].mac_obj, BNX2X_UC_LIST_MAC,
+        rc = bnx2x_del_all_macs(bp, &bp->sp_objs[0].mac_obj, BNX2X_UC_LIST_MAC,
                                 true);
         if (rc < 0)
                 BNX2X_ERR("Failed to schedule DEL commands for UC MACs list: %d\n",
@@ -9697,6 +9736,11 @@ static void __devinit bnx2x_get_common_hwinfo(struct bnx2x *bp)
         bp->flags |= (val >= REQ_BC_VER_4_PFC_STATS_SUPPORTED) ?
                         BC_SUPPORTS_PFC_STATS : 0;
 
+        bp->flags |= (val >= REQ_BC_VER_4_FCOE_FEATURES) ?
+                        BC_SUPPORTS_FCOE_FEATURES : 0;
+
+        bp->flags |= (val >= REQ_BC_VER_4_DCBX_ADMIN_MSG_NON_PMF) ?
+                        BC_SUPPORTS_DCBX_MSG_NON_PMF : 0;
         boot_mode = SHMEM_RD(bp,
                         dev_info.port_feature_config[BP_PORT(bp)].mba_config) &
                         PORT_FEATURE_MBA_BOOT_AGENT_TYPE_MASK;
@@ -10082,7 +10126,7 @@ static void __devinit bnx2x_get_port_hwinfo(struct bnx2x *bp)
 {
         int port = BP_PORT(bp);
         u32 config;
-        u32 ext_phy_type, ext_phy_config;
+        u32 ext_phy_type, ext_phy_config, eee_mode;
 
         bp->link_params.bp = bp;
         bp->link_params.port = port;
@@ -10149,6 +10193,19 @@ static void __devinit bnx2x_get_port_hwinfo(struct bnx2x *bp)
                 bp->port.need_hw_lock = bnx2x_hw_lock_required(bp,
                                                         bp->common.shmem_base,
                                                         bp->common.shmem2_base);
+
+        /* Configure link feature according to nvram value */
+        eee_mode = (((SHMEM_RD(bp, dev_info.
+                      port_feature_config[port].eee_power_mode)) &
+                     PORT_FEAT_CFG_EEE_POWER_MODE_MASK) >>
+                    PORT_FEAT_CFG_EEE_POWER_MODE_SHIFT);
+        if (eee_mode != PORT_FEAT_CFG_EEE_POWER_MODE_DISABLED) {
+                bp->link_params.eee_mode = EEE_MODE_ADV_LPI |
+                                           EEE_MODE_ENABLE_LPI |
+                                           EEE_MODE_OUTPUT_TIME;
+        } else {
+                bp->link_params.eee_mode = 0;
+        }
 }
 
 void bnx2x_get_iscsi_info(struct bnx2x *bp)
@@ -10997,7 +11054,7 @@ static int bnx2x_set_uc_list(struct bnx2x *bp)
         int rc;
         struct net_device *dev = bp->dev;
         struct netdev_hw_addr *ha;
-        struct bnx2x_vlan_mac_obj *mac_obj = &bp->fp->mac_obj;
+        struct bnx2x_vlan_mac_obj *mac_obj = &bp->sp_objs->mac_obj;
         unsigned long ramrod_flags = 0;
 
         /* First schedule a cleanup up of old configuration */
@@ -11503,8 +11560,7 @@ static void bnx2x_prep_ops(const u8 *_source, u8 *_target, u32 n)
         }
 }
 
-/**
- * IRO array is stored in the following format:
+/* IRO array is stored in the following format:
  * {base(24bit), m1(16bit), m2(16bit), m3(16bit), size(16bit) }
  */
 static void bnx2x_prep_iro(const u8 *_source, u8 *_target, u32 n)
@@ -11672,7 +11728,7 @@ void bnx2x__init_func_obj(struct bnx2x *bp)
 /* must be called after sriov-enable */
 static int bnx2x_set_qm_cid_count(struct bnx2x *bp)
 {
-        int cid_count = BNX2X_L2_CID_COUNT(bp);
+        int cid_count = BNX2X_L2_MAX_CID(bp);
 
 #ifdef BCM_CNIC
         cid_count += CNIC_CID_MAX;
@@ -11717,7 +11773,7 @@ static int __devinit bnx2x_init_one(struct pci_dev *pdev,
         struct bnx2x *bp;
         int pcie_width, pcie_speed;
         int rc, max_non_def_sbs;
-        int rx_count, tx_count, rss_count;
+        int rx_count, tx_count, rss_count, doorbell_size;
         /*
          * An estimated maximum supported CoS number according to the chip
          * version.
@@ -11760,13 +11816,6 @@ static int __devinit bnx2x_init_one(struct pci_dev *pdev,
 
         max_non_def_sbs = bnx2x_get_num_non_def_sbs(pdev);
 
-        /* !!! FIXME !!!
-         * Do not allow the maximum SB count to grow above 16
-         * since Special CIDs starts from 16*BNX2X_MULTI_TX_COS=48.
-         * We will use the FP_SB_MAX_E1x macro for this matter.
-         */
-        max_non_def_sbs = min_t(int, FP_SB_MAX_E1x, max_non_def_sbs);
-
         WARN_ON(!max_non_def_sbs);
 
         /* Maximum number of RSS queues: one IGU SB goes to CNIC */
@@ -11777,9 +11826,9 @@ static int __devinit bnx2x_init_one(struct pci_dev *pdev,
 
         /*
          * Maximum number of netdev Tx queues:
-         *      Maximum TSS queues * Maximum supported number of CoS  + FCoE L2
+         * Maximum TSS queues * Maximum supported number of CoS  + FCoE L2
          */
-        tx_count = MAX_TXQS_PER_COS * max_cos_est + FCOE_PRESENT;
+        tx_count = rss_count * max_cos_est + FCOE_PRESENT;
 
         /* dev zeroed in init_etherdev */
         dev = alloc_etherdev_mqs(sizeof(*bp), tx_count, rx_count);
@@ -11788,9 +11837,6 @@ static int __devinit bnx2x_init_one(struct pci_dev *pdev,
 
         bp = netdev_priv(dev);
 
-        BNX2X_DEV_INFO("Allocated netdev with %d tx and %d rx queues\n",
-                          tx_count, rx_count);
-
         bp->igu_sb_cnt = max_non_def_sbs;
         bp->msg_enable = debug;
         pci_set_drvdata(pdev, dev);
@@ -11803,6 +11849,9 @@ static int __devinit bnx2x_init_one(struct pci_dev *pdev,
 
         BNX2X_DEV_INFO("max_non_def_sbs %d\n", max_non_def_sbs);
 
+        BNX2X_DEV_INFO("Allocated netdev with %d tx and %d rx queues\n",
+                          tx_count, rx_count);
+
         rc = bnx2x_init_bp(bp);
         if (rc)
                 goto init_one_exit;
@@ -11811,9 +11860,15 @@ static int __devinit bnx2x_init_one(struct pci_dev *pdev,
          * Map doorbels here as we need the real value of bp->max_cos which
          * is initialized in bnx2x_init_bp().
          */
+        doorbell_size = BNX2X_L2_MAX_CID(bp) * (1 << BNX2X_DB_SHIFT);
+        if (doorbell_size > pci_resource_len(pdev, 2)) {
+                dev_err(&bp->pdev->dev,
+                        "Cannot map doorbells, bar size too small, aborting\n");
+                rc = -ENOMEM;
+                goto init_one_exit;
+        }
         bp->doorbells = ioremap_nocache(pci_resource_start(pdev, 2),
-                                        min_t(u64, BNX2X_DB_SIZE(bp),
-                                              pci_resource_len(pdev, 2)));
+                                        doorbell_size);
         if (!bp->doorbells) {
                 dev_err(&bp->pdev->dev,
                         "Cannot map doorbell space, aborting\n");
@@ -11831,8 +11886,12 @@ static int __devinit bnx2x_init_one(struct pci_dev *pdev,
 
 #endif
 
+
+        /* Set bp->num_queues for MSI-X mode*/
+        bnx2x_set_num_queues(bp);
+
         /* Configure interrupt mode: try to enable MSI-X/MSI if
-         * needed, set bp->num_queues appropriately.
+         * needed.
          */
         bnx2x_set_int_mode(bp);
 
@@ -12176,6 +12235,7 @@ static int bnx2x_set_iscsi_eth_mac_addr(struct bnx2x *bp)
 static void bnx2x_cnic_sp_post(struct bnx2x *bp, int count)
 {
         struct eth_spe *spe;
+        int cxt_index, cxt_offset;
 
 #ifdef BNX2X_STOP_ON_ERROR
         if (unlikely(bp->panic))
@@ -12198,10 +12258,16 @@ static void bnx2x_cnic_sp_post(struct bnx2x *bp, int count)
                  *  ramrod
                  */
                 if (type == ETH_CONNECTION_TYPE) {
-                        if (cmd == RAMROD_CMD_ID_ETH_CLIENT_SETUP)
-                                bnx2x_set_ctx_validation(bp, &bp->context.
-                                        vcxt[BNX2X_ISCSI_ETH_CID].eth,
-                                        BNX2X_ISCSI_ETH_CID);
+                        if (cmd == RAMROD_CMD_ID_ETH_CLIENT_SETUP) {
+                                cxt_index = BNX2X_ISCSI_ETH_CID(bp) /
+                                        ILT_PAGE_CIDS;
+                                cxt_offset = BNX2X_ISCSI_ETH_CID(bp) -
+                                        (cxt_index * ILT_PAGE_CIDS);
+                                bnx2x_set_ctx_validation(bp,
+                                        &bp->context[cxt_index].
+                                                         vcxt[cxt_offset].eth,
+                                        BNX2X_ISCSI_ETH_CID(bp));
+                        }
                 }
 
                 /*
@@ -12488,21 +12554,45 @@ static int bnx2x_drv_ctl(struct net_device *dev, struct drv_ctl_info *ctl)
                 break;
         }
         case DRV_CTL_ULP_REGISTER_CMD: {
-                int ulp_type = ctl->data.ulp_type;
+                int ulp_type = ctl->data.register_data.ulp_type;
 
                 if (CHIP_IS_E3(bp)) {
                         int idx = BP_FW_MB_IDX(bp);
-                        u32 cap;
+                        u32 cap = SHMEM2_RD(bp, drv_capabilities_flag[idx]);
+                        int path = BP_PATH(bp);
+                        int port = BP_PORT(bp);
+                        int i;
+                        u32 scratch_offset;
+                        u32 *host_addr;
 
-                        cap = SHMEM2_RD(bp, drv_capabilities_flag[idx]);
+                        /* first write capability to shmem2 */
                         if (ulp_type == CNIC_ULP_ISCSI)
                                 cap |= DRV_FLAGS_CAPABILITIES_LOADED_ISCSI;
                         else if (ulp_type == CNIC_ULP_FCOE)
                                 cap |= DRV_FLAGS_CAPABILITIES_LOADED_FCOE;
                         SHMEM2_WR(bp, drv_capabilities_flag[idx], cap);
+
+                        if ((ulp_type != CNIC_ULP_FCOE) ||
+                            (!SHMEM2_HAS(bp, ncsi_oem_data_addr)) ||
+                            (!(bp->flags &  BC_SUPPORTS_FCOE_FEATURES)))
+                                break;
+
+                        /* if reached here - should write fcoe capabilities */
+                        scratch_offset = SHMEM2_RD(bp, ncsi_oem_data_addr);
+                        if (!scratch_offset)
+                                break;
+                        scratch_offset += offsetof(struct glob_ncsi_oem_data,
+                                                   fcoe_features[path][port]);
+                        host_addr = (u32 *) &(ctl->data.register_data.
+                                              fcoe_features);
+                        for (i = 0; i < sizeof(struct fcoe_capabilities);
+                             i += 4)
+                                REG_WR(bp, scratch_offset + i,
+                                       *(host_addr + i/4));
                 }
                 break;
         }
+
         case DRV_CTL_ULP_UNREGISTER_CMD: {
                 int ulp_type = ctl->data.ulp_type;
 
@@ -12554,6 +12644,21 @@ void bnx2x_setup_cnic_irq_info(struct bnx2x *bp)
         cp->num_irq = 2;
 }
 
+void bnx2x_setup_cnic_info(struct bnx2x *bp)
+{
+        struct cnic_eth_dev *cp = &bp->cnic_eth_dev;
+
+
+        cp->ctx_tbl_offset = FUNC_ILT_BASE(BP_FUNC(bp)) +
+                             bnx2x_cid_ilt_lines(bp);
+        cp->starting_cid = bnx2x_cid_ilt_lines(bp) * ILT_PAGE_CIDS;
+        cp->fcoe_init_cid = BNX2X_FCOE_ETH_CID(bp);
+        cp->iscsi_l2_cid = BNX2X_ISCSI_ETH_CID(bp);
+
+        if (NO_ISCSI_OOO(bp))
+                cp->drv_state |= CNIC_DRV_STATE_NO_ISCSI_OOO;
+}
+
 static int bnx2x_register_cnic(struct net_device *dev, struct cnic_ops *ops,
                                void *data)
 {
@@ -12632,10 +12737,10 @@ struct cnic_eth_dev *bnx2x_cnic_probe(struct net_device *dev)
         cp->drv_ctl = bnx2x_drv_ctl;
         cp->drv_register_cnic = bnx2x_register_cnic;
         cp->drv_unregister_cnic = bnx2x_unregister_cnic;
-        cp->fcoe_init_cid = BNX2X_FCOE_ETH_CID;
+        cp->fcoe_init_cid = BNX2X_FCOE_ETH_CID(bp);
         cp->iscsi_l2_client_id =
                 bnx2x_cnic_eth_cl_id(bp, BNX2X_ISCSI_ETH_CL_ID_IDX);
-        cp->iscsi_l2_cid = BNX2X_ISCSI_ETH_CID;
+        cp->iscsi_l2_cid = BNX2X_ISCSI_ETH_CID(bp);
 
         if (NO_ISCSI_OOO(bp))
                 cp->drv_state |= CNIC_DRV_STATE_NO_ISCSI_OOO;
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_mfw_req.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_mfw_req.h
new file mode 100644
index 00000000000..ddd5106ad2f
--- /dev/null
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_mfw_req.h
@@ -0,0 +1,168 @@
+/* bnx2x_mfw_req.h: Broadcom Everest network driver.
+ *
+ * Copyright (c) 2012 Broadcom Corporation
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation.
+ */
+
+#ifndef BNX2X_MFW_REQ_H
+#define BNX2X_MFW_REQ_H
+
+#define PORT_0                  0
+#define PORT_1                  1
+#define PORT_MAX                2
+#define NVM_PATH_MAX            2
+
+/* FCoE capabilities required from the driver */
+struct fcoe_capabilities {
+        u32 capability1;
+        /* Maximum number of I/Os per connection */
+        #define FCOE_IOS_PER_CONNECTION_MASK    0x0000ffff
+        #define FCOE_IOS_PER_CONNECTION_SHIFT   0
+        /* Maximum number of Logins per port */
+        #define FCOE_LOGINS_PER_PORT_MASK       0xffff0000
+        #define FCOE_LOGINS_PER_PORT_SHIFT   16
+
+        u32 capability2;
+        /* Maximum number of exchanges */
+        #define FCOE_NUMBER_OF_EXCHANGES_MASK   0x0000ffff
+        #define FCOE_NUMBER_OF_EXCHANGES_SHIFT  0
+        /* Maximum NPIV WWN per port */
+        #define FCOE_NPIV_WWN_PER_PORT_MASK     0xffff0000
+        #define FCOE_NPIV_WWN_PER_PORT_SHIFT    16
+
+        u32 capability3;
+        /* Maximum number of targets supported */
+        #define FCOE_TARGETS_SUPPORTED_MASK     0x0000ffff
+        #define FCOE_TARGETS_SUPPORTED_SHIFT    0
+        /* Maximum number of outstanding commands across all connections */
+        #define FCOE_OUTSTANDING_COMMANDS_MASK  0xffff0000
+        #define FCOE_OUTSTANDING_COMMANDS_SHIFT 16
+
+        u32 capability4;
+        #define FCOE_CAPABILITY4_STATEFUL                       0x00000001
+        #define FCOE_CAPABILITY4_STATELESS                      0x00000002
+        #define FCOE_CAPABILITY4_CAPABILITIES_REPORTED_VALID    0x00000004
+};
+
+struct glob_ncsi_oem_data {
+        u32 driver_version;
+        u32 unused[3];
+        struct fcoe_capabilities fcoe_features[NVM_PATH_MAX][PORT_MAX];
+};
+
+/* current drv_info version */
+#define DRV_INFO_CUR_VER 2
+
+/* drv_info op codes supported */
+enum drv_info_opcode {
+        ETH_STATS_OPCODE,
+        FCOE_STATS_OPCODE,
+        ISCSI_STATS_OPCODE
+};
+
+#define ETH_STAT_INFO_VERSION_LEN       12
+/*  Per PCI Function Ethernet Statistics required from the driver */
+struct eth_stats_info {
+        /* Function's Driver Version. padded to 12 */
+        u8 version[ETH_STAT_INFO_VERSION_LEN];
+        /* Locally Admin Addr. BigEndian EIU48. Actual size is 6 bytes */
+        u8 mac_local[8];
+        u8 mac_add1[8];         /* Additional Programmed MAC Addr 1. */
+        u8 mac_add2[8];         /* Additional Programmed MAC Addr 2. */
+        u32 mtu_size;           /* MTU Size. Note   : Negotiated MTU */
+        u32 feature_flags;      /* Feature_Flags. */
+#define FEATURE_ETH_CHKSUM_OFFLOAD_MASK         0x01
+#define FEATURE_ETH_LSO_MASK                    0x02
+#define FEATURE_ETH_BOOTMODE_MASK               0x1C
+#define FEATURE_ETH_BOOTMODE_SHIFT              2
+#define FEATURE_ETH_BOOTMODE_NONE               (0x0 << 2)
+#define FEATURE_ETH_BOOTMODE_PXE                (0x1 << 2)
+#define FEATURE_ETH_BOOTMODE_ISCSI              (0x2 << 2)
+#define FEATURE_ETH_BOOTMODE_FCOE               (0x3 << 2)
+#define FEATURE_ETH_TOE_MASK                    0x20
+        u32 lso_max_size;       /* LSO MaxOffloadSize. */
+        u32 lso_min_seg_cnt;    /* LSO MinSegmentCount. */
+        /* Num Offloaded Connections TCP_IPv4. */
+        u32 ipv4_ofld_cnt;
+        /* Num Offloaded Connections TCP_IPv6. */
+        u32 ipv6_ofld_cnt;
+        u32 promiscuous_mode;   /* Promiscuous Mode. non-zero true */
+        u32 txq_size;           /* TX Descriptors Queue Size */
+        u32 rxq_size;           /* RX Descriptors Queue Size */
+        /* TX Descriptor Queue Avg Depth. % Avg Queue Depth since last poll */
+        u32 txq_avg_depth;
+        /* RX Descriptors Queue Avg Depth. % Avg Queue Depth since last poll */
+        u32 rxq_avg_depth;
+        /* IOV_Offload. 0=none; 1=MultiQueue, 2=VEB 3= VEPA*/
+        u32 iov_offload;
+        /* Number of NetQueue/VMQ Config'd. */
+        u32 netq_cnt;
+        u32 vf_cnt;             /* Num VF assigned to this PF. */
+};
+
+/*  Per PCI Function FCOE Statistics required from the driver */
+struct fcoe_stats_info {
+        u8 version[12];         /* Function's Driver Version. */
+        u8 mac_local[8];        /* Locally Admin Addr. */
+        u8 mac_add1[8];         /* Additional Programmed MAC Addr 1. */
+        u8 mac_add2[8];         /* Additional Programmed MAC Addr 2. */
+        /* QoS Priority (per 802.1p). 0-7255 */
+        u32 qos_priority;
+        u32 txq_size;           /* FCoE TX Descriptors Queue Size. */
+        u32 rxq_size;           /* FCoE RX Descriptors Queue Size. */
+        /* FCoE TX Descriptor Queue Avg Depth. */
+        u32 txq_avg_depth;
+        /* FCoE RX Descriptors Queue Avg Depth. */
+        u32 rxq_avg_depth;
+        u32 rx_frames_lo;       /* FCoE RX Frames received. */
+        u32 rx_frames_hi;       /* FCoE RX Frames received. */
+        u32 rx_bytes_lo;        /* FCoE RX Bytes received. */
+        u32 rx_bytes_hi;        /* FCoE RX Bytes received. */
+        u32 tx_frames_lo;       /* FCoE TX Frames sent. */
+        u32 tx_frames_hi;       /* FCoE TX Frames sent. */
+        u32 tx_bytes_lo;        /* FCoE TX Bytes sent. */
+        u32 tx_bytes_hi;        /* FCoE TX Bytes sent. */
+};
+
+/* Per PCI  Function iSCSI Statistics required from the driver*/
+struct iscsi_stats_info {
+        u8 version[12];         /* Function's Driver Version. */
+        u8 mac_local[8];        /* Locally Admin iSCSI MAC Addr. */
+        u8 mac_add1[8];         /* Additional Programmed MAC Addr 1. */
+        /* QoS Priority (per 802.1p). 0-7255 */
+        u32 qos_priority;
+        u8 initiator_name[64];  /* iSCSI Boot Initiator Node name. */
+        u8 ww_port_name[64];    /* iSCSI World wide port name */
+        u8 boot_target_name[64];/* iSCSI Boot Target Name. */
+        u8 boot_target_ip[16];  /* iSCSI Boot Target IP. */
+        u32 boot_target_portal; /* iSCSI Boot Target Portal. */
+        u8 boot_init_ip[16];    /* iSCSI Boot Initiator IP Address. */
+        u32 max_frame_size;     /* Max Frame Size. bytes */
+        u32 txq_size;           /* PDU TX Descriptors Queue Size. */
+        u32 rxq_size;           /* PDU RX Descriptors Queue Size. */
+        u32 txq_avg_depth;      /* PDU TX Descriptor Queue Avg Depth. */
+        u32 rxq_avg_depth;      /* PDU RX Descriptors Queue Avg Depth. */
+        u32 rx_pdus_lo;         /* iSCSI PDUs received. */
+        u32 rx_pdus_hi;         /* iSCSI PDUs received. */
+        u32 rx_bytes_lo;        /* iSCSI RX Bytes received. */
+        u32 rx_bytes_hi;        /* iSCSI RX Bytes received. */
+        u32 tx_pdus_lo;         /* iSCSI PDUs sent. */
+        u32 tx_pdus_hi;         /* iSCSI PDUs sent. */
+        u32 tx_bytes_lo;        /* iSCSI PDU TX Bytes sent. */
+        u32 tx_bytes_hi;        /* iSCSI PDU TX Bytes sent. */
+        u32 pcp_prior_map_tbl;  /* C-PCP to S-PCP Priority MapTable.
+                                 * 9 nibbles, the position of each nibble
+                                 * represents the C-PCP value, the value
+                                 * of the nibble = S-PCP value.
+                                 */
+};
+
+union drv_info_to_mcp {
+        struct eth_stats_info   ether_stat;
+        struct fcoe_stats_info  fcoe_stat;
+        struct iscsi_stats_info iscsi_stat;
+};
+#endif /* BNX2X_MFW_REQ_H */
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_reg.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_reg.h
index bbd387492a8..ec62a5c8bd3 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_reg.h
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_reg.h
@@ -1488,6 +1488,121 @@
  * 2:1 - otp_misc_do[51:50]; 0 - otp_misc_do[1]. */
 #define MISC_REG_CHIP_TYPE                                       0xac60
 #define MISC_REG_CHIP_TYPE_57811_MASK                            (1<<1)
+#define MISC_REG_CPMU_LP_DR_ENABLE                               0xa858
+/* [RW 1] FW EEE LPI Enable. When 1 indicates that EEE LPI mode is enabled
+ * by FW. When 0 indicates that the EEE LPI mode is disabled by FW. Clk
+ * 25MHz. Reset on hard reset. */
+#define MISC_REG_CPMU_LP_FW_ENABLE_P0                            0xa84c
+/* [RW 32] EEE LPI Idle Threshold. The threshold value for the idle EEE LPI
+ * counter. Timer tick is 1 us. Clock 25MHz. Reset on hard reset. */
+#define MISC_REG_CPMU_LP_IDLE_THR_P0                             0xa8a0
+/* [RW 18] LPI entry events mask. [0] - Vmain SM Mask. When 1 indicates that
+ * the Vmain SM end state is disabled. When 0 indicates that the Vmain SM
+ * end state is enabled. [1] - FW Queues Empty Mask. When 1 indicates that
+ * the FW command that all Queues are empty is disabled. When 0 indicates
+ * that the FW command that all Queues are empty is enabled. [2] - FW Early
+ * Exit Mask / Reserved (Entry mask). When 1 indicates that the FW Early
+ * Exit command is disabled. When 0 indicates that the FW Early Exit command
+ * is enabled. This bit applicable only in the EXIT Events Mask registers.
+ * [3] - PBF Request Mask. When 1 indicates that the PBF Request indication
+ * is disabled. When 0 indicates that the PBF Request indication is enabled.
+ * [4] - Tx Request Mask. When =1 indicates that the Tx other Than PBF
+ * Request indication is disabled. When 0 indicates that the Tx Other Than
+ * PBF Request indication is enabled. [5] - Rx EEE LPI Status Mask. When 1
+ * indicates that the RX EEE LPI Status indication is disabled. When 0
+ * indicates that the RX EEE LPI Status indication is enabled. In the EXIT
+ * Events Masks registers; this bit masks the falling edge detect of the LPI
+ * Status (Rx LPI is on - off). [6] - Tx Pause Mask. When 1 indicates that
+ * the Tx Pause indication is disabled. When 0 indicates that the Tx Pause
+ * indication is enabled. [7] - BRB1 Empty Mask. When 1 indicates that the
+ * BRB1 EMPTY indication is disabled. When 0 indicates that the BRB1 EMPTY
+ * indication is enabled. [8] - QM Idle Mask. When 1 indicates that the QM
+ * IDLE indication is disabled. When 0 indicates that the QM IDLE indication
+ * is enabled. (One bit for both VOQ0 and VOQ1). [9] - QM LB Idle Mask. When
+ * 1 indicates that the QM IDLE indication for LOOPBACK is disabled. When 0
+ * indicates that the QM IDLE indication for LOOPBACK is enabled. [10] - L1
+ * Status Mask. When 1 indicates that the L1 Status indication from the PCIE
+ * CORE is disabled. When 0 indicates that the RX EEE LPI Status indication
+ * from the PCIE CORE is enabled. In the EXIT Events Masks registers; this
+ * bit masks the falling edge detect of the L1 status (L1 is on - off). [11]
+ * - P0 E0 EEE EEE LPI REQ Mask. When =1 indicates that the P0 E0 EEE EEE
+ * LPI REQ indication is disabled. When =0 indicates that the P0 E0 EEE LPI
+ * REQ indication is enabled. [12] - P1 E0 EEE LPI REQ Mask. When =1
+ * indicates that the P0 EEE LPI REQ indication is disabled. When =0
+ * indicates that the P0 EEE LPI REQ indication is enabled. [13] - P0 E1 EEE
+ * LPI REQ Mask. When =1 indicates that the P0 EEE LPI REQ indication is
+ * disabled. When =0 indicates that the P0 EEE LPI REQ indication is
+ * enabled. [14] - P1 E1 EEE LPI REQ Mask. When =1 indicates that the P0 EEE
+ * LPI REQ indication is disabled. When =0 indicates that the P0 EEE LPI REQ
+ * indication is enabled. [15] - L1 REQ Mask. When =1 indicates that the L1
+ * REQ indication is disabled. When =0 indicates that the L1 indication is
+ * enabled. [16] - Rx EEE LPI Status Edge Detect Mask. When =1 indicates
+ * that the RX EEE LPI Status Falling Edge Detect indication is disabled (Rx
+ * EEE LPI is on - off). When =0 indicates that the RX EEE LPI Status
+ * Falling Edge Detec indication is enabled (Rx EEE LPI is on - off). This
+ * bit is applicable only in the EXIT Events Masks registers. [17] - L1
+ * Status Edge Detect Mask. When =1 indicates that the L1 Status Falling
+ * Edge Detect indication from the PCIE CORE is disabled (L1 is on - off).
+ * When =0 indicates that the L1 Status Falling Edge Detect indication from
+ * the PCIE CORE is enabled (L1 is on - off). This bit is applicable only in
+ * the EXIT Events Masks registers. Clock 25MHz. Reset on hard reset. */
+#define MISC_REG_CPMU_LP_MASK_ENT_P0                             0xa880
+/* [RW 18] EEE LPI exit events mask. [0] - Vmain SM Mask. When 1 indicates
+ * that the Vmain SM end state is disabled. When 0 indicates that the Vmain
+ * SM end state is enabled. [1] - FW Queues Empty Mask. When 1 indicates
+ * that the FW command that all Queues are empty is disabled. When 0
+ * indicates that the FW command that all Queues are empty is enabled. [2] -
+ * FW Early Exit Mask / Reserved (Entry mask). When 1 indicates that the FW
+ * Early Exit command is disabled. When 0 indicates that the FW Early Exit
+ * command is enabled. This bit applicable only in the EXIT Events Mask
+ * registers. [3] - PBF Request Mask. When 1 indicates that the PBF Request
+ * indication is disabled. When 0 indicates that the PBF Request indication
+ * is enabled. [4] - Tx Request Mask. When =1 indicates that the Tx other
+ * Than PBF Request indication is disabled. When 0 indicates that the Tx
+ * Other Than PBF Request indication is enabled. [5] - Rx EEE LPI Status
+ * Mask. When 1 indicates that the RX EEE LPI Status indication is disabled.
+ * When 0 indicates that the RX LPI Status indication is enabled. In the
+ * EXIT Events Masks registers; this bit masks the falling edge detect of
+ * the EEE LPI Status (Rx EEE LPI is on - off). [6] - Tx Pause Mask. When 1
+ * indicates that the Tx Pause indication is disabled. When 0 indicates that
+ * the Tx Pause indication is enabled. [7] - BRB1 Empty Mask. When 1
+ * indicates that the BRB1 EMPTY indication is disabled. When 0 indicates
+ * that the BRB1 EMPTY indication is enabled. [8] - QM Idle Mask. When 1
+ * indicates that the QM IDLE indication is disabled. When 0 indicates that
+ * the QM IDLE indication is enabled. (One bit for both VOQ0 and VOQ1). [9]
+ * - QM LB Idle Mask. When 1 indicates that the QM IDLE indication for
+ * LOOPBACK is disabled. When 0 indicates that the QM IDLE indication for
+ * LOOPBACK is enabled. [10] - L1 Status Mask. When 1 indicates that the L1
+ * Status indication from the PCIE CORE is disabled. When 0 indicates that
+ * the RX EEE LPI Status indication from the PCIE CORE is enabled. In the
+ * EXIT Events Masks registers; this bit masks the falling edge detect of
+ * the L1 status (L1 is on - off). [11] - P0 E0 EEE EEE LPI REQ Mask. When
+ * =1 indicates that the P0 E0 EEE EEE LPI REQ indication is disabled. When
+ * =0 indicates that the P0 E0 EEE LPI REQ indication is enabled. [12] - P1
+ * E0 EEE LPI REQ Mask. When =1 indicates that the P0 EEE LPI REQ indication
+ * is disabled. When =0 indicates that the P0 EEE LPI REQ indication is
+ * enabled. [13] - P0 E1 EEE LPI REQ Mask. When =1 indicates that the P0 EEE
+ * LPI REQ indication is disabled. When =0 indicates that the P0 EEE LPI REQ
+ * indication is enabled. [14] - P1 E1 EEE LPI REQ Mask. When =1 indicates
+ * that the P0 EEE LPI REQ indication is disabled. When =0 indicates that
+ * the P0 EEE LPI REQ indication is enabled. [15] - L1 REQ Mask. When =1
+ * indicates that the L1 REQ indication is disabled. When =0 indicates that
+ * the L1 indication is enabled. [16] - Rx EEE LPI Status Edge Detect Mask.
+ * When =1 indicates that the RX EEE LPI Status Falling Edge Detect
+ * indication is disabled (Rx EEE LPI is on - off). When =0 indicates that
+ * the RX EEE LPI Status Falling Edge Detec indication is enabled (Rx EEE
+ * LPI is on - off). This bit is applicable only in the EXIT Events Masks
+ * registers. [17] - L1 Status Edge Detect Mask. When =1 indicates that the
+ * L1 Status Falling Edge Detect indication from the PCIE CORE is disabled
+ * (L1 is on - off). When =0 indicates that the L1 Status Falling Edge
+ * Detect indication from the PCIE CORE is enabled (L1 is on - off). This
+ * bit is applicable only in the EXIT Events Masks registers.Clock 25MHz.
+ * Reset on hard reset. */
+#define MISC_REG_CPMU_LP_MASK_EXT_P0                             0xa888
+/* [RW 16] EEE LPI Entry Events Counter. A statistic counter with the number
+ * of counts that the SM entered the EEE LPI state. Clock 25MHz. Read only
+ * register. Reset on hard reset. */
+#define MISC_REG_CPMU_LP_SM_ENT_CNT_P0                           0xa8b8
 /* [RW 32] The following driver registers(1...16) represent 16 drivers and
    32 clients. Each client can be controlled by one driver only. One in each
    bit represent that this driver control the appropriate client (Ex: bit 5
@@ -5372,6 +5487,8 @@
 /* [RW 32] Lower 48 bits of ctrl_sa register. Used as the SA in PAUSE/PFC
  * packets transmitted by the MAC */
 #define XMAC_REG_CTRL_SA_LO                                      0x28
+#define XMAC_REG_EEE_CTRL                                        0xd8
+#define XMAC_REG_EEE_TIMERS_HI                                   0xe4
 #define XMAC_REG_PAUSE_CTRL                                      0x68
 #define XMAC_REG_PFC_CTRL                                        0x70
 #define XMAC_REG_PFC_CTRL_HI                                     0x74
@@ -5796,6 +5913,7 @@
 #define MISC_REGISTERS_SPIO_OUTPUT_LOW                           0
 #define MISC_REGISTERS_SPIO_SET_POS                              8
 #define HW_LOCK_MAX_RESOURCE_VALUE                               31
+#define HW_LOCK_RESOURCE_DCBX_ADMIN_MIB                          13
 #define HW_LOCK_RESOURCE_DRV_FLAGS                               10
 #define HW_LOCK_RESOURCE_GPIO                                    1
 #define HW_LOCK_RESOURCE_MDIO                                    0
@@ -6813,6 +6931,8 @@ Theotherbitsarereservedandshouldbezero*/
 #define MDIO_AN_REG_LP_AUTO_NEG         0x0013
 #define MDIO_AN_REG_LP_AUTO_NEG2        0x0014
 #define MDIO_AN_REG_MASTER_STATUS       0x0021
+#define MDIO_AN_REG_EEE_ADV             0x003c
+#define MDIO_AN_REG_LP_EEE_ADV          0x003d
 /*bcm*/
 #define MDIO_AN_REG_LINK_STATUS         0x8304
 #define MDIO_AN_REG_CL37_CL73           0x8370
@@ -6866,6 +6986,8 @@ Theotherbitsarereservedandshouldbezero*/
 #define MDIO_PMA_REG_84823_LED3_STRETCH_EN                      0x0080
 
 /* BCM84833 only */
+#define MDIO_84833_TOP_CFG_FW_REV                       0x400f
+#define MDIO_84833_TOP_CFG_FW_EEE               0x10b1
 #define MDIO_84833_TOP_CFG_XGPHY_STRAP1                 0x401a
 #define MDIO_84833_SUPER_ISOLATE                0x8000
 /* These are mailbox register set used by 84833. */
@@ -6993,11 +7115,13 @@ Theotherbitsarereservedandshouldbezero*/
 #define MDIO_WC_REG_DIGITAL3_UP1                        0x8329
 #define MDIO_WC_REG_DIGITAL3_LP_UP1                      0x832c
 #define MDIO_WC_REG_DIGITAL4_MISC3                      0x833c
+#define MDIO_WC_REG_DIGITAL4_MISC5                      0x833e
 #define MDIO_WC_REG_DIGITAL5_MISC6                      0x8345
 #define MDIO_WC_REG_DIGITAL5_MISC7                      0x8349
 #define MDIO_WC_REG_DIGITAL5_ACTUAL_SPEED               0x834e
 #define MDIO_WC_REG_DIGITAL6_MP5_NEXTPAGECTRL           0x8350
 #define MDIO_WC_REG_CL49_USERB0_CTRL                    0x8368
+#define MDIO_WC_REG_EEE_COMBO_CONTROL0                  0x8390
 #define MDIO_WC_REG_TX66_CONTROL                        0x83b0
 #define MDIO_WC_REG_RX66_CONTROL                        0x83c0
 #define MDIO_WC_REG_RX66_SCW0                           0x83c2
@@ -7036,6 +7160,7 @@ Theotherbitsarereservedandshouldbezero*/
 #define MDIO_REG_GPHY_EEE_1G            (0x1 << 2)
 #define MDIO_REG_GPHY_EEE_100           (0x1 << 1)
 #define MDIO_REG_GPHY_EEE_RESOLVED              0x803e
+#define MDIO_REG_GPHY_AUX_STATUS                        0x19
 #define MDIO_REG_INTR_STATUS                            0x1a
 #define MDIO_REG_INTR_MASK                              0x1b
 #define MDIO_REG_INTR_MASK_LINK_STATUS                  (0x1 << 1)
@@ -7150,8 +7275,7 @@ Theotherbitsarereservedandshouldbezero*/
 #define CDU_REGION_NUMBER_UCM_AG 4
 
 
-/**
- * String-to-compress [31:8] = CID (all 24 bits)
+/* String-to-compress [31:8] = CID (all 24 bits)
  * String-to-compress [7:4] = Region
  * String-to-compress [3:0] = Type
  */
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
index 6c14b4a4e82..734fd87cd99 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
@@ -4107,6 +4107,10 @@ static int bnx2x_setup_rss(struct bnx2x *bp,
                 data->capabilities |=
                         ETH_RSS_UPDATE_RAMROD_DATA_IPV4_TCP_CAPABILITY;
 
+        if (test_bit(BNX2X_RSS_IPV4_UDP, &p->rss_flags))
+                data->capabilities |=
+                        ETH_RSS_UPDATE_RAMROD_DATA_IPV4_UDP_CAPABILITY;
+
         if (test_bit(BNX2X_RSS_IPV6, &p->rss_flags))
                 data->capabilities |=
                         ETH_RSS_UPDATE_RAMROD_DATA_IPV6_CAPABILITY;
@@ -4115,6 +4119,10 @@ static int bnx2x_setup_rss(struct bnx2x *bp,
                 data->capabilities |=
                         ETH_RSS_UPDATE_RAMROD_DATA_IPV6_TCP_CAPABILITY;
 
+        if (test_bit(BNX2X_RSS_IPV6_UDP, &p->rss_flags))
+                data->capabilities |=
+                        ETH_RSS_UPDATE_RAMROD_DATA_IPV6_UDP_CAPABILITY;
+
         /* Hashing mask */
         data->rss_result_mask = p->rss_result_mask;
 
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h
index efd80bdd0df..f83e033da6d 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h
@@ -167,9 +167,8 @@ typedef int (*exe_q_remove)(struct bnx2x *bp,
                             union bnx2x_qable_obj *o,
                             struct bnx2x_exeq_elem *elem);
 
-/**
- * @return positive is entry was optimized, 0 - if not, negative
- *         in case of an error.
+/* Return positive if entry was optimized, 0 - if not, negative
+ * in case of an error.
  */
 typedef int (*exe_q_optimize)(struct bnx2x *bp,
                               union bnx2x_qable_obj *o,
@@ -694,8 +693,10 @@ enum {
 
         BNX2X_RSS_IPV4,
         BNX2X_RSS_IPV4_TCP,
+        BNX2X_RSS_IPV4_UDP,
         BNX2X_RSS_IPV6,
         BNX2X_RSS_IPV6_TCP,
+        BNX2X_RSS_IPV6_UDP,
 };
 
 struct bnx2x_config_rss_params {
@@ -729,6 +730,10 @@ struct bnx2x_rss_config_obj {
         /* Last configured indirection table */
         u8                      ind_table[T_ETH_INDIRECTION_TABLE_SIZE];
 
+        /* flags for enabling 4-tupple hash on UDP */
+        u8                      udp_rss_v4;
+        u8                      udp_rss_v6;
+
         int (*config_rss)(struct bnx2x *bp,
                           struct bnx2x_config_rss_params *p);
 };
@@ -1280,12 +1285,11 @@ void bnx2x_init_rx_mode_obj(struct bnx2x *bp,
                             struct bnx2x_rx_mode_obj *o);
 
 /**
- * Send and RX_MODE ramrod according to the provided parameters.
+ * bnx2x_config_rx_mode - Send and RX_MODE ramrod according to the provided parameters.
  *
- * @param bp
- * @param p Command parameters
+ * @p: Command parameters
  *
- * @return 0 - if operation was successfull and there is no pending completions,
+ * Return: 0 - if operation was successfull and there is no pending completions,
  *         positive number - if there are pending completions,
  *         negative - if there were errors
  */
@@ -1302,7 +1306,11 @@ void bnx2x_init_mcast_obj(struct bnx2x *bp,
                           bnx2x_obj_type type);
 
 /**
- * Configure multicast MACs list. May configure a new list
+ * bnx2x_config_mcast - Configure multicast MACs list.
+ *
+ * @cmd: command to execute: BNX2X_MCAST_CMD_X
+ *
+ * May configure a new list
  * provided in p->mcast_list (BNX2X_MCAST_CMD_ADD), clean up
  * (BNX2X_MCAST_CMD_DEL) or restore (BNX2X_MCAST_CMD_RESTORE) a current
  * configuration, continue to execute the pending commands
@@ -1313,11 +1321,7 @@ void bnx2x_init_mcast_obj(struct bnx2x *bp,
  * the current command will be enqueued to the tail of the
  * pending commands list.
  *
- * @param bp
- * @param p
- * @param command to execute: BNX2X_MCAST_CMD_X
- *
- * @return 0 is operation was sucessfull and there are no pending completions,
+ * Return: 0 is operation was sucessfull and there are no pending completions,
  *         negative if there were errors, positive if there are pending
  *         completions.
  */
@@ -1342,21 +1346,17 @@ void bnx2x_init_rss_config_obj(struct bnx2x *bp,
                                bnx2x_obj_type type);
 
 /**
- * Updates RSS configuration according to provided parameters.
- *
- * @param bp
- * @param p
+ * bnx2x_config_rss - Updates RSS configuration according to provided parameters
  *
- * @return 0 in case of success
+ * Return: 0 in case of success
  */
 int bnx2x_config_rss(struct bnx2x *bp,
                      struct bnx2x_config_rss_params *p);
 
 /**
- * Return the current ind_table configuration.
+ * bnx2x_get_rss_ind_table - Return the current ind_table configuration.
  *
- * @param bp
- * @param ind_table buffer to fill with the current indirection
+ * @ind_table: buffer to fill with the current indirection
  *                  table content. Should be at least
  *                  T_ETH_INDIRECTION_TABLE_SIZE bytes long.
  */
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c
index 1e2785cd11d..667d89042d3 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c
@@ -785,6 +785,10 @@ static int bnx2x_hw_stats_update(struct bnx2x *bp)
 
         pstats->host_port_stats_counter++;
 
+        if (CHIP_IS_E3(bp))
+                estats->eee_tx_lpi += REG_RD(bp,
+                                             MISC_REG_CPMU_LP_SM_ENT_CNT_P0);
+
         if (!BP_NOMCP(bp)) {
                 u32 nig_timer_max =
                         SHMEM_RD(bp, port_mb[BP_PORT(bp)].stat_nig_timer);
@@ -855,17 +859,22 @@ static int bnx2x_storm_stats_update(struct bnx2x *bp)
                 struct tstorm_per_queue_stats *tclient =
                         &bp->fw_stats_data->queue_stats[i].
                         tstorm_queue_statistics;
-                struct tstorm_per_queue_stats *old_tclient = &fp->old_tclient;
+                struct tstorm_per_queue_stats *old_tclient =
+                        &bnx2x_fp_stats(bp, fp)->old_tclient;
                 struct ustorm_per_queue_stats *uclient =
                         &bp->fw_stats_data->queue_stats[i].
                         ustorm_queue_statistics;
-                struct ustorm_per_queue_stats *old_uclient = &fp->old_uclient;
+                struct ustorm_per_queue_stats *old_uclient =
+                        &bnx2x_fp_stats(bp, fp)->old_uclient;
                 struct xstorm_per_queue_stats *xclient =
                         &bp->fw_stats_data->queue_stats[i].
                         xstorm_queue_statistics;
-                struct xstorm_per_queue_stats *old_xclient = &fp->old_xclient;
-                struct bnx2x_eth_q_stats *qstats = &fp->eth_q_stats;
-                struct bnx2x_eth_q_stats_old *qstats_old = &fp->eth_q_stats_old;
+                struct xstorm_per_queue_stats *old_xclient =
+                        &bnx2x_fp_stats(bp, fp)->old_xclient;
+                struct bnx2x_eth_q_stats *qstats =
+                        &bnx2x_fp_stats(bp, fp)->eth_q_stats;
+                struct bnx2x_eth_q_stats_old *qstats_old =
+                        &bnx2x_fp_stats(bp, fp)->eth_q_stats_old;
 
                 u32 diff;
 
@@ -1048,8 +1057,11 @@ static void bnx2x_net_stats_update(struct bnx2x *bp)
         nstats->tx_bytes = bnx2x_hilo(&estats->total_bytes_transmitted_hi);
 
         tmp = estats->mac_discard;
-        for_each_rx_queue(bp, i)
-                tmp += le32_to_cpu(bp->fp[i].old_tclient.checksum_discard);
+        for_each_rx_queue(bp, i) {
+                struct tstorm_per_queue_stats *old_tclient =
+                        &bp->fp_stats[i].old_tclient;
+                tmp += le32_to_cpu(old_tclient->checksum_discard);
+        }
         nstats->rx_dropped = tmp + bp->net_stats_old.rx_dropped;
 
         nstats->tx_dropped = 0;
@@ -1099,9 +1111,9 @@ static void bnx2x_drv_stats_update(struct bnx2x *bp)
         int i;
 
         for_each_queue(bp, i) {
-                struct bnx2x_eth_q_stats *qstats = &bp->fp[i].eth_q_stats;
+                struct bnx2x_eth_q_stats *qstats = &bp->fp_stats[i].eth_q_stats;
                 struct bnx2x_eth_q_stats_old *qstats_old =
-                                                &bp->fp[i].eth_q_stats_old;
+                        &bp->fp_stats[i].eth_q_stats_old;
 
                 UPDATE_ESTAT_QSTAT(driver_xoff);
                 UPDATE_ESTAT_QSTAT(rx_err_discard_pkt);
@@ -1309,12 +1321,9 @@ static void bnx2x_port_stats_base_init(struct bnx2x *bp)
         bnx2x_stats_comp(bp);
 }
 
-/**
- * This function will prepare the statistics ramrod data the way
+/* This function will prepare the statistics ramrod data the way
  * we will only have to increment the statistics counter and
  * send the ramrod each time we have to.
- *
- * @param bp
  */
 static void bnx2x_prep_fw_stats_req(struct bnx2x *bp)
 {
@@ -1428,7 +1437,7 @@ static void bnx2x_prep_fw_stats_req(struct bnx2x *bp)
                                         query[first_queue_query_index + i];
 
                 cur_query_entry->kind = STATS_TYPE_QUEUE;
-                cur_query_entry->index = bnx2x_stats_id(&bp->fp[FCOE_IDX]);
+                cur_query_entry->index = bnx2x_stats_id(&bp->fp[FCOE_IDX(bp)]);
                 cur_query_entry->funcID = cpu_to_le16(BP_FUNC(bp));
                 cur_query_entry->address.hi =
                         cpu_to_le32(U64_HI(cur_data_offset));
@@ -1479,15 +1488,19 @@ void bnx2x_stats_init(struct bnx2x *bp)
 
         /* function stats */
         for_each_queue(bp, i) {
-                struct bnx2x_fastpath *fp = &bp->fp[i];
-
-                memset(&fp->old_tclient, 0, sizeof(fp->old_tclient));
-                memset(&fp->old_uclient, 0, sizeof(fp->old_uclient));
-                memset(&fp->old_xclient, 0, sizeof(fp->old_xclient));
+                struct bnx2x_fp_stats *fp_stats = &bp->fp_stats[i];
+
+                memset(&fp_stats->old_tclient, 0,
+                       sizeof(fp_stats->old_tclient));
+                memset(&fp_stats->old_uclient, 0,
+                       sizeof(fp_stats->old_uclient));
+                memset(&fp_stats->old_xclient, 0,
+                       sizeof(fp_stats->old_xclient));
                 if (bp->stats_init) {
-                        memset(&fp->eth_q_stats, 0, sizeof(fp->eth_q_stats));
-                        memset(&fp->eth_q_stats_old, 0,
-                               sizeof(fp->eth_q_stats_old));
+                        memset(&fp_stats->eth_q_stats, 0,
+                               sizeof(fp_stats->eth_q_stats));
+                        memset(&fp_stats->eth_q_stats_old, 0,
+                               sizeof(fp_stats->eth_q_stats_old));
                 }
         }
 
@@ -1529,8 +1542,10 @@ void bnx2x_save_statistics(struct bnx2x *bp)
         /* save queue statistics */
         for_each_eth_queue(bp, i) {
                 struct bnx2x_fastpath *fp = &bp->fp[i];
-                struct bnx2x_eth_q_stats *qstats = &fp->eth_q_stats;
-                struct bnx2x_eth_q_stats_old *qstats_old = &fp->eth_q_stats_old;
+                struct bnx2x_eth_q_stats *qstats =
+                        &bnx2x_fp_stats(bp, fp)->eth_q_stats;
+                struct bnx2x_eth_q_stats_old *qstats_old =
+                        &bnx2x_fp_stats(bp, fp)->eth_q_stats_old;
 
                 UPDATE_QSTAT_OLD(total_unicast_bytes_received_hi);
                 UPDATE_QSTAT_OLD(total_unicast_bytes_received_lo);
@@ -1569,7 +1584,7 @@ void bnx2x_afex_collect_stats(struct bnx2x *bp, void *void_afex_stats,
         struct afex_stats *afex_stats = (struct afex_stats *)void_afex_stats;
         struct bnx2x_eth_stats *estats = &bp->eth_stats;
         struct per_queue_stats *fcoe_q_stats =
-                &bp->fw_stats_data->queue_stats[FCOE_IDX];
+                &bp->fw_stats_data->queue_stats[FCOE_IDX(bp)];
 
         struct tstorm_per_queue_stats *fcoe_q_tstorm_stats =
                 &fcoe_q_stats->tstorm_queue_statistics;
@@ -1586,8 +1601,7 @@ void bnx2x_afex_collect_stats(struct bnx2x *bp, void *void_afex_stats,
         memset(afex_stats, 0, sizeof(struct afex_stats));
 
         for_each_eth_queue(bp, i) {
-                struct bnx2x_fastpath *fp = &bp->fp[i];
-                struct bnx2x_eth_q_stats *qstats = &fp->eth_q_stats;
+                struct bnx2x_eth_q_stats *qstats = &bp->fp_stats[i].eth_q_stats;
 
                 ADD_64(afex_stats->rx_unicast_bytes_hi,
                        qstats->total_unicast_bytes_received_hi,
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.h
index 93e689fdfed..24b8e505b60 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.h
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.h
@@ -203,6 +203,8 @@ struct bnx2x_eth_stats {
         /* Recovery */
         u32 recoverable_error;
         u32 unrecoverable_error;
+        /* src: Clear-on-Read register; Will not survive PMF Migration */
+        u32 eee_tx_lpi;
 };
 
 
diff --git a/drivers/net/ethernet/broadcom/cnic.c b/drivers/net/ethernet/broadcom/cnic.c
index 2c89d17cbb2..3b4fc61f24c 100644
--- a/drivers/net/ethernet/broadcom/cnic.c
+++ b/drivers/net/ethernet/broadcom/cnic.c
@@ -256,11 +256,16 @@ static void cnic_ulp_ctl(struct cnic_dev *dev, int ulp_type, bool reg)
         struct cnic_local *cp = dev->cnic_priv;
         struct cnic_eth_dev *ethdev = cp->ethdev;
         struct drv_ctl_info info;
+        struct fcoe_capabilities *fcoe_cap =
+                &info.data.register_data.fcoe_features;
 
-        if (reg)
+        if (reg) {
                 info.cmd = DRV_CTL_ULP_REGISTER_CMD;
-        else
+                if (ulp_type == CNIC_ULP_FCOE && dev->fcoe_cap)
+                        memcpy(fcoe_cap, dev->fcoe_cap, sizeof(*fcoe_cap));
+        } else {
                 info.cmd = DRV_CTL_ULP_UNREGISTER_CMD;
+        }
 
         info.data.ulp_type = ulp_type;
         ethdev->drv_ctl(dev->netdev, &info);
@@ -286,6 +291,9 @@ static int cnic_get_l5_cid(struct cnic_local *cp, u32 cid, u32 *l5_cid)
 {
         u32 i;
 
+        if (!cp->ctx_tbl)
+                return -EINVAL;
+
         for (i = 0; i < cp->max_cid_space; i++) {
                 if (cp->ctx_tbl[i].cid == cid) {
                         *l5_cid = i;
@@ -612,6 +620,8 @@ static int cnic_unregister_device(struct cnic_dev *dev, int ulp_type)
 
         if (ulp_type == CNIC_ULP_ISCSI)
                 cnic_send_nlmsg(cp, ISCSI_KEVENT_IF_DOWN, NULL);
+        else if (ulp_type == CNIC_ULP_FCOE)
+                dev->fcoe_cap = NULL;
 
         synchronize_rcu();
 
@@ -2589,7 +2599,7 @@ static void cnic_bnx2x_kwqe_err(struct cnic_dev *dev, struct kwqe *kwqe)
                 return;
         }
 
-        cqes[0] = (struct kcqe *) &kcqe;
+        cqes[0] = &kcqe;
         cnic_reply_bnx2x_kcqes(dev, ulp_type, cqes, 1);
 }
 
@@ -3217,6 +3227,9 @@ static int cnic_ctl(void *data, struct cnic_ctl_info *info)
                 u32 l5_cid;
                 struct cnic_local *cp = dev->cnic_priv;
 
+                if (!test_bit(CNIC_F_CNIC_UP, &dev->flags))
+                        break;
+
                 if (cnic_get_l5_cid(cp, cid, &l5_cid) == 0) {
                         struct cnic_context *ctx = &cp->ctx_tbl[l5_cid];
 
@@ -3947,6 +3960,15 @@ static void cnic_cm_process_kcqe(struct cnic_dev *dev, struct kcqe *kcqe)
                 cnic_cm_upcall(cp, csk, opcode);
                 break;
 
+        case L5CM_RAMROD_CMD_ID_CLOSE:
+                if (l4kcqe->status != 0) {
+                        netdev_warn(dev->netdev, "RAMROD CLOSE compl with "
+                                    "status 0x%x\n", l4kcqe->status);
+                        opcode = L4_KCQE_OPCODE_VALUE_CLOSE_COMP;
+                        /* Fall through */
+                } else {
+                        break;
+                }
         case L4_KCQE_OPCODE_VALUE_RESET_RECEIVED:
         case L4_KCQE_OPCODE_VALUE_CLOSE_COMP:
         case L4_KCQE_OPCODE_VALUE_RESET_COMP:
@@ -4250,8 +4272,6 @@ static int cnic_cm_shutdown(struct cnic_dev *dev)
         struct cnic_local *cp = dev->cnic_priv;
         int i;
 
-        cp->stop_cm(dev);
-
         if (!cp->csk_tbl)
                 return 0;
 
@@ -4669,9 +4689,9 @@ static int cnic_start_bnx2_hw(struct cnic_dev *dev)
 
         cp->kcq1.sw_prod_idx = 0;
         cp->kcq1.hw_prod_idx_ptr =
-                (u16 *) &sblk->status_completion_producer_index;
+                &sblk->status_completion_producer_index;
 
-        cp->kcq1.status_idx_ptr = (u16 *) &sblk->status_idx;
+        cp->kcq1.status_idx_ptr = &sblk->status_idx;
 
         /* Initialize the kernel complete queue context. */
         val = KRNLQ_TYPE_TYPE_KRNLQ | KRNLQ_SIZE_TYPE_SIZE |
@@ -4697,9 +4717,9 @@ static int cnic_start_bnx2_hw(struct cnic_dev *dev)
                 u32 sb = BNX2_L2CTX_L5_STATUSB_NUM(sb_id);
 
                 cp->kcq1.hw_prod_idx_ptr =
-                        (u16 *) &msblk->status_completion_producer_index;
-                cp->kcq1.status_idx_ptr = (u16 *) &msblk->status_idx;
-                cp->kwq_con_idx_ptr = (u16 *) &msblk->status_cmd_consumer_index;
+                        &msblk->status_completion_producer_index;
+                cp->kcq1.status_idx_ptr = &msblk->status_idx;
+                cp->kwq_con_idx_ptr = &msblk->status_cmd_consumer_index;
                 cp->int_num = sb_id << BNX2_PCICFG_INT_ACK_CMD_INT_NUM_SHIFT;
                 cnic_ctx_wr(dev, kwq_cid_addr, L5_KRNLQ_HOST_QIDX, sb);
                 cnic_ctx_wr(dev, kcq_cid_addr, L5_KRNLQ_HOST_QIDX, sb);
@@ -4981,8 +5001,14 @@ static int cnic_start_bnx2x_hw(struct cnic_dev *dev)
         cp->port_mode = CHIP_PORT_MODE_NONE;
 
         if (BNX2X_CHIP_IS_E2_PLUS(cp->chip_id)) {
-                u32 val = CNIC_RD(dev, MISC_REG_PORT4MODE_EN_OVWR);
+                u32 val;
 
+                pci_read_config_dword(dev->pcidev, PCICFG_ME_REGISTER, &val);
+                cp->func = (u8) ((val & ME_REG_ABS_PF_NUM) >>
+                                 ME_REG_ABS_PF_NUM_SHIFT);
+                func = CNIC_FUNC(cp);
+
+                val = CNIC_RD(dev, MISC_REG_PORT4MODE_EN_OVWR);
                 if (!(val & 1))
                         val = CNIC_RD(dev, MISC_REG_PORT4MODE_EN);
                 else
@@ -5287,6 +5313,7 @@ static void cnic_stop_hw(struct cnic_dev *dev)
                         i++;
                 }
                 cnic_shutdown_rings(dev);
+                cp->stop_cm(dev);
                 clear_bit(CNIC_F_CNIC_UP, &dev->flags);
                 RCU_INIT_POINTER(cp->ulp_ops[CNIC_ULP_L4], NULL);
                 synchronize_rcu();
@@ -5516,9 +5543,7 @@ static void cnic_rcv_netevent(struct cnic_local *cp, unsigned long event,
         rcu_read_unlock();
 }
 
-/**
- * netdev event handler
- */
+/* netdev event handler */
 static int cnic_netdev_event(struct notifier_block *this, unsigned long event,
                                                          void *ptr)
 {
diff --git a/drivers/net/ethernet/broadcom/cnic_if.h b/drivers/net/ethernet/broadcom/cnic_if.h
index 289274e546b..5cb88881bba 100644
--- a/drivers/net/ethernet/broadcom/cnic_if.h
+++ b/drivers/net/ethernet/broadcom/cnic_if.h
@@ -12,8 +12,10 @@
 #ifndef CNIC_IF_H
 #define CNIC_IF_H
 
-#define CNIC_MODULE_VERSION     "2.5.10"
-#define CNIC_MODULE_RELDATE     "March 21, 2012"
+#include "bnx2x/bnx2x_mfw_req.h"
+
+#define CNIC_MODULE_VERSION     "2.5.12"
+#define CNIC_MODULE_RELDATE     "June 29, 2012"
 
 #define CNIC_ULP_RDMA           0
 #define CNIC_ULP_ISCSI          1
@@ -131,6 +133,11 @@ struct drv_ctl_l2_ring {
         u32             cid;
 };
 
+struct drv_ctl_register_data {
+        int ulp_type;
+        struct fcoe_capabilities fcoe_features;
+};
+
 struct drv_ctl_info {
         int     cmd;
         union {
@@ -138,6 +145,7 @@ struct drv_ctl_info {
                 struct drv_ctl_io io;
                 struct drv_ctl_l2_ring ring;
                 int ulp_type;
+                struct drv_ctl_register_data register_data;
                 char bytes[MAX_DRV_CTL_DATA];
         } data;
 };
@@ -305,6 +313,7 @@ struct cnic_dev {
         int             max_rdma_conn;
 
         union drv_info_to_mcp   *stats_addr;
+        struct fcoe_capabilities        *fcoe_cap;
 
         void            *cnic_priv;
 };
diff --git a/drivers/net/ethernet/broadcom/tg3.c b/drivers/net/ethernet/broadcom/tg3.c
index e47ff8be1d7..6cbab036973 100644
--- a/drivers/net/ethernet/broadcom/tg3.c
+++ b/drivers/net/ethernet/broadcom/tg3.c
@@ -9908,7 +9908,7 @@ static bool tg3_enable_msix(struct tg3 *tp)
         int i, rc;
         struct msix_entry msix_ent[tp->irq_max];
 
-        tp->irq_cnt = num_online_cpus();
+        tp->irq_cnt = netif_get_num_default_rss_queues();
         if (tp->irq_cnt > 1) {
                 /* We want as many rx rings enabled as there are cpus.
                  * In multiqueue MSI-X mode, the first MSI-X vector
diff --git a/drivers/net/ethernet/brocade/bna/bfa_cee.c b/drivers/net/ethernet/brocade/bna/bfa_cee.c
index 689e5e19cc0..550d2521ba7 100644
--- a/drivers/net/ethernet/brocade/bna/bfa_cee.c
+++ b/drivers/net/ethernet/brocade/bna/bfa_cee.c
@@ -52,13 +52,7 @@ bfa_cee_format_lldp_cfg(struct bfa_cee_lldp_cfg *lldp_cfg)
 }
 
 /**
- * bfa_cee_attr_meminfo()
- *
- * @brief Returns the size of the DMA memory needed by CEE attributes
- *
- * @param[in] void
- *
- * @return Size of DMA region
+ * bfa_cee_attr_meminfo - Returns the size of the DMA memory needed by CEE attributes
  */
 static u32
 bfa_cee_attr_meminfo(void)
@@ -66,13 +60,7 @@ bfa_cee_attr_meminfo(void)
         return roundup(sizeof(struct bfa_cee_attr), BFA_DMA_ALIGN_SZ);
 }
 /**
- * bfa_cee_stats_meminfo()
- *
- * @brief Returns the size of the DMA memory needed by CEE stats
- *
- * @param[in] void
- *
- * @return Size of DMA region
+ * bfa_cee_stats_meminfo - Returns the size of the DMA memory needed by CEE stats
  */
 static u32
 bfa_cee_stats_meminfo(void)
@@ -81,14 +69,10 @@ bfa_cee_stats_meminfo(void)
 }
 
 /**
- * bfa_cee_get_attr_isr()
- *
- * @brief CEE ISR for get-attributes responses from f/w
- *
- * @param[in] cee - Pointer to the CEE module
- *            status - Return status from the f/w
+ * bfa_cee_get_attr_isr - CEE ISR for get-attributes responses from f/w
  *
- * @return void
+ * @cee: Pointer to the CEE module
+ * @status: Return status from the f/w
  */
 static void
 bfa_cee_get_attr_isr(struct bfa_cee *cee, enum bfa_status status)
@@ -105,14 +89,10 @@ bfa_cee_get_attr_isr(struct bfa_cee *cee, enum bfa_status status)
 }
 
 /**
- * bfa_cee_get_attr_isr()
- *
- * @brief CEE ISR for get-stats responses from f/w
+ * bfa_cee_get_attr_isr - CEE ISR for get-stats responses from f/w
  *
- * @param[in] cee - Pointer to the CEE module
- *            status - Return status from the f/w
- *
- * @return void
+ * @cee: Pointer to the CEE module
+ * @status: Return status from the f/w
  */
 static void
 bfa_cee_get_stats_isr(struct bfa_cee *cee, enum bfa_status status)
@@ -147,13 +127,7 @@ bfa_cee_reset_stats_isr(struct bfa_cee *cee, enum bfa_status status)
                 cee->cbfn.reset_stats_cbfn(cee->cbfn.reset_stats_cbarg, status);
 }
 /**
- * bfa_nw_cee_meminfo()
- *
- * @brief Returns the size of the DMA memory needed by CEE module
- *
- * @param[in] void
- *
- * @return Size of DMA region
+ * bfa_nw_cee_meminfo - Returns the size of the DMA memory needed by CEE module
  */
 u32
 bfa_nw_cee_meminfo(void)
@@ -162,15 +136,11 @@ bfa_nw_cee_meminfo(void)
 }
 
 /**
- * bfa_nw_cee_mem_claim()
- *
- * @brief Initialized CEE DMA Memory
- *
- * @param[in] cee CEE module pointer
- *            dma_kva Kernel Virtual Address of CEE DMA Memory
- *            dma_pa  Physical Address of CEE DMA Memory
+ * bfa_nw_cee_mem_claim - Initialized CEE DMA Memory
  *
- * @return void
+ * @cee: CEE module pointer
+ * @dma_kva: Kernel Virtual Address of CEE DMA Memory
+ * @dma_pa:  Physical Address of CEE DMA Memory
  */
 void
 bfa_nw_cee_mem_claim(struct bfa_cee *cee, u8 *dma_kva, u64 dma_pa)
@@ -185,13 +155,11 @@ bfa_nw_cee_mem_claim(struct bfa_cee *cee, u8 *dma_kva, u64 dma_pa)
 }
 
 /**
- * bfa_cee_get_attr()
- *
- * @brief       Send the request to the f/w to fetch CEE attributes.
+ * bfa_cee_get_attr - Send the request to the f/w to fetch CEE attributes.
  *
- * @param[in]   Pointer to the CEE module data structure.
+ * @cee: Pointer to the CEE module data structure.
  *
- * @return      Status
+ * Return: status
  */
 enum bfa_status
 bfa_nw_cee_get_attr(struct bfa_cee *cee, struct bfa_cee_attr *attr,
@@ -220,13 +188,7 @@ bfa_nw_cee_get_attr(struct bfa_cee *cee, struct bfa_cee_attr *attr,
 }
 
 /**
- * bfa_cee_isrs()
- *
- * @brief Handles Mail-box interrupts for CEE module.
- *
- * @param[in] Pointer to the CEE module data structure.
- *
- * @return void
+ * bfa_cee_isrs - Handles Mail-box interrupts for CEE module.
  */
 
 static void
@@ -253,14 +215,9 @@ bfa_cee_isr(void *cbarg, struct bfi_mbmsg *m)
 }
 
 /**
- * bfa_cee_notify()
- *
- * @brief CEE module heart-beat failure handler.
- * @brief CEE module IOC event handler.
- *
- * @param[in] IOC event type
+ * bfa_cee_notify - CEE module heart-beat failure handler.
  *
- * @return void
+ * @event: IOC event type
  */
 
 static void
@@ -307,17 +264,13 @@ bfa_cee_notify(void *arg, enum bfa_ioc_event event)
 }
 
 /**
- * bfa_nw_cee_attach()
- *
- * @brief CEE module-attach API
+ * bfa_nw_cee_attach - CEE module-attach API
  *
- * @param[in] cee - Pointer to the CEE module data structure
- *            ioc - Pointer to the ioc module data structure
- *            dev - Pointer to the device driver module data structure
- *                  The device driver specific mbox ISR functions have
- *                  this pointer as one of the parameters.
- *
- * @return void
+ * @cee: Pointer to the CEE module data structure
+ * @ioc: Pointer to the ioc module data structure
+ * @dev: Pointer to the device driver module data structure.
+ *       The device driver specific mbox ISR functions have
+ *       this pointer as one of the parameters.
  */
 void
 bfa_nw_cee_attach(struct bfa_cee *cee, struct bfa_ioc *ioc,
diff --git a/drivers/net/ethernet/brocade/bna/bfa_cs.h b/drivers/net/ethernet/brocade/bna/bfa_cs.h
index 3da1a946ccd..ad004a4c389 100644
--- a/drivers/net/ethernet/brocade/bna/bfa_cs.h
+++ b/drivers/net/ethernet/brocade/bna/bfa_cs.h
@@ -16,23 +16,18 @@
  * www.brocade.com
  */
 
-/**
- * @file bfa_cs.h BFA common services
- */
+/* BFA common services */
 
 #ifndef __BFA_CS_H__
 #define __BFA_CS_H__
 
 #include "cna.h"
 
-/**
- * @ BFA state machine interfaces
- */
+/* BFA state machine interfaces */
 
 typedef void (*bfa_sm_t)(void *sm, int event);
 
-/**
- * oc - object class eg. bfa_ioc
+/* oc - object class eg. bfa_ioc
  * st - state, eg. reset
  * otype - object type, eg. struct bfa_ioc
  * etype - object type, eg. enum ioc_event
@@ -45,9 +40,7 @@ typedef void (*bfa_sm_t)(void *sm, int event);
 #define bfa_sm_get_state(_sm)           ((_sm)->sm)
 #define bfa_sm_cmp_state(_sm, _state)   ((_sm)->sm == (bfa_sm_t)(_state))
 
-/**
- * For converting from state machine function to state encoding.
- */
+/* For converting from state machine function to state encoding. */
 struct bfa_sm_table {
         bfa_sm_t        sm;     /*!< state machine function     */
         int             state;  /*!< state machine encoding     */
@@ -55,13 +48,10 @@ struct bfa_sm_table {
 };
 #define BFA_SM(_sm)             ((bfa_sm_t)(_sm))
 
-/**
- * State machine with entry actions.
- */
+/* State machine with entry actions. */
 typedef void (*bfa_fsm_t)(void *fsm, int event);
 
-/**
- * oc - object class eg. bfa_ioc
+/* oc - object class eg. bfa_ioc
  * st - state, eg. reset
  * otype - object type, eg. struct bfa_ioc
  * etype - object type, eg. enum ioc_event
@@ -90,9 +80,7 @@ bfa_sm_to_state(const struct bfa_sm_table *smt, bfa_sm_t sm)
         return smt[i].state;
 }
 
-/**
- * @ Generic wait counter.
- */
+/* Generic wait counter. */
 
 typedef void (*bfa_wc_resume_t) (void *cbarg);
 
@@ -116,9 +104,7 @@ bfa_wc_down(struct bfa_wc *wc)
                 wc->wc_resume(wc->wc_cbarg);
 }
 
-/**
- * Initialize a waiting counter.
- */
+/* Initialize a waiting counter. */
 static inline void
 bfa_wc_init(struct bfa_wc *wc, bfa_wc_resume_t wc_resume, void *wc_cbarg)
 {
@@ -128,9 +114,7 @@ bfa_wc_init(struct bfa_wc *wc, bfa_wc_resume_t wc_resume, void *wc_cbarg)
         bfa_wc_up(wc);
 }
 
-/**
- * Wait for counter to reach zero
- */
+/* Wait for counter to reach zero */
 static inline void
 bfa_wc_wait(struct bfa_wc *wc)
 {
diff --git a/drivers/net/ethernet/brocade/bna/bfa_defs.h b/drivers/net/ethernet/brocade/bna/bfa_defs.h
index 48f87733739..e423f82da49 100644
--- a/drivers/net/ethernet/brocade/bna/bfa_defs.h
+++ b/drivers/net/ethernet/brocade/bna/bfa_defs.h
@@ -26,13 +26,9 @@
 #define BFA_STRING_32   32
 #define BFA_VERSION_LEN 64
 
-/**
- * ---------------------- adapter definitions ------------
- */
+/* ---------------------- adapter definitions ------------ */
 
-/**
- * BFA adapter level attributes.
- */
+/* BFA adapter level attributes. */
 enum {
         BFA_ADAPTER_SERIAL_NUM_LEN = STRSZ(BFA_MFG_SERIALNUM_SIZE),
                                         /*
@@ -74,18 +70,14 @@ struct bfa_adapter_attr {
         u8              trunk_capable;
 };
 
-/**
- * ---------------------- IOC definitions ------------
- */
+/* ---------------------- IOC definitions ------------ */
 
 enum {
         BFA_IOC_DRIVER_LEN      = 16,
         BFA_IOC_CHIP_REV_LEN    = 8,
 };
 
-/**
- * Driver and firmware versions.
- */
+/* Driver and firmware versions. */
 struct bfa_ioc_driver_attr {
         char            driver[BFA_IOC_DRIVER_LEN];     /*!< driver name */
         char            driver_ver[BFA_VERSION_LEN];    /*!< driver version */
@@ -95,9 +87,7 @@ struct bfa_ioc_driver_attr {
         char            ob_ver[BFA_VERSION_LEN];        /*!< openboot version */
 };
 
-/**
- * IOC PCI device attributes
- */
+/* IOC PCI device attributes */
 struct bfa_ioc_pci_attr {
         u16     vendor_id;      /*!< PCI vendor ID */
         u16     device_id;      /*!< PCI device ID */
@@ -108,9 +98,7 @@ struct bfa_ioc_pci_attr {
         char            chip_rev[BFA_IOC_CHIP_REV_LEN];  /*!< chip revision */
 };
 
-/**
- * IOC states
- */
+/* IOC states */
 enum bfa_ioc_state {
         BFA_IOC_UNINIT          = 1,    /*!< IOC is in uninit state */
         BFA_IOC_RESET           = 2,    /*!< IOC is in reset state */
@@ -127,9 +115,7 @@ enum bfa_ioc_state {
         BFA_IOC_HWFAIL          = 13,   /*!< PCI mapping doesn't exist */
 };
 
-/**
- * IOC firmware stats
- */
+/* IOC firmware stats */
 struct bfa_fw_ioc_stats {
         u32     enable_reqs;
         u32     disable_reqs;
@@ -139,9 +125,7 @@ struct bfa_fw_ioc_stats {
         u32     unknown_reqs;
 };
 
-/**
- * IOC driver stats
- */
+/* IOC driver stats */
 struct bfa_ioc_drv_stats {
         u32     ioc_isrs;
         u32     ioc_enables;
@@ -157,9 +141,7 @@ struct bfa_ioc_drv_stats {
         u32     rsvd;
 };
 
-/**
- * IOC statistics
- */
+/* IOC statistics */
 struct bfa_ioc_stats {
         struct bfa_ioc_drv_stats drv_stats; /*!< driver IOC stats */
         struct bfa_fw_ioc_stats fw_stats;  /*!< firmware IOC stats */
@@ -171,9 +153,7 @@ enum bfa_ioc_type {
         BFA_IOC_TYPE_LL         = 3,
 };
 
-/**
- * IOC attributes returned in queries
- */
+/* IOC attributes returned in queries */
 struct bfa_ioc_attr {
         enum bfa_ioc_type ioc_type;
         enum bfa_ioc_state              state;          /*!< IOC state      */
@@ -187,22 +167,16 @@ struct bfa_ioc_attr {
         u8                              rsvd[4];        /*!< 64bit align */
 };
 
-/**
- * Adapter capability mask definition
- */
+/* Adapter capability mask definition */
 enum {
         BFA_CM_HBA      =       0x01,
         BFA_CM_CNA      =       0x02,
         BFA_CM_NIC      =       0x04,
 };
 
-/**
- * ---------------------- mfg definitions ------------
- */
+/* ---------------------- mfg definitions ------------ */
 
-/**
- * Checksum size
- */
+/* Checksum size */
 #define BFA_MFG_CHKSUM_SIZE                     16
 
 #define BFA_MFG_PARTNUM_SIZE                    14
@@ -213,8 +187,7 @@ enum {
 
 #pragma pack(1)
 
-/**
- * @brief BFA adapter manufacturing block definition.
+/* BFA adapter manufacturing block definition.
  *
  * All numerical fields are in big-endian format.
  */
@@ -256,9 +229,7 @@ struct bfa_mfg_block {
 
 #pragma pack()
 
-/**
- * ---------------------- pci definitions ------------
- */
+/* ---------------------- pci definitions ------------ */
 
 /*
  * PCI device ID information
@@ -275,9 +246,7 @@ enum {
 #define bfa_asic_id_ctc(device)                 \
         (bfa_asic_id_ct(device) || bfa_asic_id_ct2(device))
 
-/**
- * PCI sub-system device and vendor ID information
- */
+/* PCI sub-system device and vendor ID information */
 enum {
         BFA_PCI_FCOE_SSDEVICE_ID        = 0x14,
         BFA_PCI_CT2_SSID_FCoE           = 0x22,
diff --git a/drivers/net/ethernet/brocade/bna/bfa_defs_cna.h b/drivers/net/ethernet/brocade/bna/bfa_defs_cna.h
index 8ab33ee2c2b..b39c5f23974 100644
--- a/drivers/net/ethernet/brocade/bna/bfa_defs_cna.h
+++ b/drivers/net/ethernet/brocade/bna/bfa_defs_cna.h
@@ -20,10 +20,7 @@
 
 #include "bfa_defs.h"
 
-/**
- * @brief
- * FC physical port statistics.
- */
+/* FC physical port statistics. */
 struct bfa_port_fc_stats {
         u64     secs_reset;     /*!< Seconds since stats is reset */
         u64     tx_frames;      /*!< Tx frames                  */
@@ -59,10 +56,7 @@ struct bfa_port_fc_stats {
         u64     bbsc_link_resets; /*!< Credit Recovery-Link Resets   */
 };
 
-/**
- * @brief
- * Eth Physical Port statistics.
- */
+/* Eth Physical Port statistics. */
 struct bfa_port_eth_stats {
         u64     secs_reset;     /*!< Seconds since stats is reset */
         u64     frame_64;       /*!< Frames 64 bytes            */
@@ -108,10 +102,7 @@ struct bfa_port_eth_stats {
         u64     tx_iscsi_zero_pause; /*!< Tx iSCSI zero pause   */
 };
 
-/**
- * @brief
- *              Port statistics.
- */
+/* Port statistics. */
 union bfa_port_stats_u {
         struct bfa_port_fc_stats fc;
         struct bfa_port_eth_stats eth;
diff --git a/drivers/net/ethernet/brocade/bna/bfa_defs_mfg_comm.h b/drivers/net/ethernet/brocade/bna/bfa_defs_mfg_comm.h
index 6681fe87c1e..7fb396fe679 100644
--- a/drivers/net/ethernet/brocade/bna/bfa_defs_mfg_comm.h
+++ b/drivers/net/ethernet/brocade/bna/bfa_defs_mfg_comm.h
@@ -20,33 +20,23 @@
 
 #include "bfa_defs.h"
 
-/**
- * Manufacturing block version
- */
+/* Manufacturing block version */
 #define BFA_MFG_VERSION                         3
 #define BFA_MFG_VERSION_UNINIT                  0xFF
 
-/**
- * Manufacturing block encrypted version
- */
+/* Manufacturing block encrypted version */
 #define BFA_MFG_ENC_VER                         2
 
-/**
- * Manufacturing block version 1 length
- */
+/* Manufacturing block version 1 length */
 #define BFA_MFG_VER1_LEN                        128
 
-/**
- * Manufacturing block header length
- */
+/* Manufacturing block header length */
 #define BFA_MFG_HDR_LEN                         4
 
 #define BFA_MFG_SERIALNUM_SIZE                  11
 #define STRSZ(_n)                               (((_n) + 4) & ~3)
 
-/**
- * Manufacturing card type
- */
+/* Manufacturing card type */
 enum {
         BFA_MFG_TYPE_CB_MAX  = 825,      /*!< Crossbow card type max    */
         BFA_MFG_TYPE_FC8P2   = 825,      /*!< 8G 2port FC card          */
@@ -70,9 +60,7 @@ enum {
 
 #pragma pack(1)
 
-/**
- * Check if Mezz card
- */
+/* Check if Mezz card */
 #define bfa_mfg_is_mezz(type) (( \
         (type) == BFA_MFG_TYPE_JAYHAWK || \
         (type) == BFA_MFG_TYPE_WANCHESE || \
@@ -127,9 +115,7 @@ do {								\
         }                                                       \
 } while (0)
 
-/**
- * VPD data length
- */
+/* VPD data length */
 #define BFA_MFG_VPD_LEN                 512
 #define BFA_MFG_VPD_LEN_INVALID         0
 
@@ -137,9 +123,7 @@ do {								\
 #define BFA_MFG_VPD_PCI_VER_MASK        0x07    /*!< version mask 3 bits */
 #define BFA_MFG_VPD_PCI_VDR_MASK        0xf8    /*!< vendor mask 5 bits */
 
-/**
- * VPD vendor tag
- */
+/* VPD vendor tag */
 enum {
         BFA_MFG_VPD_UNKNOWN     = 0,     /*!< vendor unknown            */
         BFA_MFG_VPD_IBM         = 1,     /*!< vendor IBM                */
@@ -151,8 +135,7 @@ enum {
         BFA_MFG_VPD_PCI_BRCD    = 0xf8,  /*!< PCI VPD Brocade           */
 };
 
-/**
- * @brief BFA adapter flash vpd data definition.
+/* BFA adapter flash vpd data definition.
  *
  * All numerical fields are in big-endian format.
  */
diff --git a/drivers/net/ethernet/brocade/bna/bfa_defs_status.h b/drivers/net/ethernet/brocade/bna/bfa_defs_status.h
index 7c5fe6c2e80..ea9af9ae754 100644
--- a/drivers/net/ethernet/brocade/bna/bfa_defs_status.h
+++ b/drivers/net/ethernet/brocade/bna/bfa_defs_status.h
@@ -18,8 +18,7 @@
 #ifndef __BFA_DEFS_STATUS_H__
 #define __BFA_DEFS_STATUS_H__
 
-/**
- * API status return values
+/* API status return values
  *
  * NOTE: The error msgs are auto generated from the comments. Only singe line
  * comments are supported
diff --git a/drivers/net/ethernet/brocade/bna/bfa_ioc.c b/drivers/net/ethernet/brocade/bna/bfa_ioc.c
index 0b640fafbda..959c58ef972 100644
--- a/drivers/net/ethernet/brocade/bna/bfa_ioc.c
+++ b/drivers/net/ethernet/brocade/bna/bfa_ioc.c
@@ -20,13 +20,9 @@
 #include "bfi_reg.h"
 #include "bfa_defs.h"
 
-/**
- * IOC local definitions
- */
+/* IOC local definitions */
 
-/**
- * Asic specific macros : see bfa_hw_cb.c and bfa_hw_ct.c for details.
- */
+/* Asic specific macros : see bfa_hw_cb.c and bfa_hw_ct.c for details. */
 
 #define bfa_ioc_firmware_lock(__ioc)                    \
                         ((__ioc)->ioc_hwif->ioc_firmware_lock(__ioc))
@@ -96,9 +92,7 @@ static void bfa_ioc_get_adapter_manufacturer(struct bfa_ioc *ioc,
 static void bfa_ioc_get_adapter_model(struct bfa_ioc *ioc, char *model);
 static u64 bfa_ioc_get_pwwn(struct bfa_ioc *ioc);
 
-/**
- * IOC state machine definitions/declarations
- */
+/* IOC state machine definitions/declarations */
 enum ioc_event {
         IOC_E_RESET             = 1,    /*!< IOC reset request          */
         IOC_E_ENABLE            = 2,    /*!< IOC enable request         */
@@ -148,9 +142,7 @@ static void bfa_iocpf_initfail(struct bfa_ioc *ioc);
 static void bfa_iocpf_getattrfail(struct bfa_ioc *ioc);
 static void bfa_iocpf_stop(struct bfa_ioc *ioc);
 
-/**
- * IOCPF state machine events
- */
+/* IOCPF state machine events */
 enum iocpf_event {
         IOCPF_E_ENABLE          = 1,    /*!< IOCPF enable request       */
         IOCPF_E_DISABLE         = 2,    /*!< IOCPF disable request      */
@@ -166,9 +158,7 @@ enum iocpf_event {
         IOCPF_E_SEM_ERROR       = 12,   /*!< h/w sem mapping error      */
 };
 
-/**
- * IOCPF states
- */
+/* IOCPF states */
 enum bfa_iocpf_state {
         BFA_IOCPF_RESET         = 1,    /*!< IOC is in reset state */
         BFA_IOCPF_SEMWAIT       = 2,    /*!< Waiting for IOC h/w semaphore */
@@ -215,21 +205,15 @@ static struct bfa_sm_table iocpf_sm_table[] = {
         {BFA_SM(bfa_iocpf_sm_disabled), BFA_IOCPF_DISABLED},
 };
 
-/**
- * IOC State Machine
- */
+/* IOC State Machine */
 
-/**
- * Beginning state. IOC uninit state.
- */
+/* Beginning state. IOC uninit state. */
 static void
 bfa_ioc_sm_uninit_entry(struct bfa_ioc *ioc)
 {
 }
 
-/**
- * IOC is in uninit state.
- */
+/* IOC is in uninit state. */
 static void
 bfa_ioc_sm_uninit(struct bfa_ioc *ioc, enum ioc_event event)
 {
@@ -243,18 +227,14 @@ bfa_ioc_sm_uninit(struct bfa_ioc *ioc, enum ioc_event event)
         }
 }
 
-/**
- * Reset entry actions -- initialize state machine
- */
+/* Reset entry actions -- initialize state machine */
 static void
 bfa_ioc_sm_reset_entry(struct bfa_ioc *ioc)
 {
         bfa_fsm_set_state(&ioc->iocpf, bfa_iocpf_sm_reset);
 }
 
-/**
- * IOC is in reset state.
- */
+/* IOC is in reset state. */
 static void
 bfa_ioc_sm_reset(struct bfa_ioc *ioc, enum ioc_event event)
 {
@@ -282,8 +262,7 @@ bfa_ioc_sm_enabling_entry(struct bfa_ioc *ioc)
         bfa_iocpf_enable(ioc);
 }
 
-/**
- * Host IOC function is being enabled, awaiting response from firmware.
+/* Host IOC function is being enabled, awaiting response from firmware.
  * Semaphore is acquired.
  */
 static void
@@ -325,9 +304,7 @@ bfa_ioc_sm_enabling(struct bfa_ioc *ioc, enum ioc_event event)
         }
 }
 
-/**
- * Semaphore should be acquired for version check.
- */
+/* Semaphore should be acquired for version check. */
 static void
 bfa_ioc_sm_getattr_entry(struct bfa_ioc *ioc)
 {
@@ -336,9 +313,7 @@ bfa_ioc_sm_getattr_entry(struct bfa_ioc *ioc)
         bfa_ioc_send_getattr(ioc);
 }
 
-/**
- * IOC configuration in progress. Timer is active.
- */
+/* IOC configuration in progress. Timer is active. */
 static void
 bfa_ioc_sm_getattr(struct bfa_ioc *ioc, enum ioc_event event)
 {
@@ -419,9 +394,7 @@ bfa_ioc_sm_disabling_entry(struct bfa_ioc *ioc)
         bfa_iocpf_disable(ioc);
 }
 
-/**
- * IOC is being disabled
- */
+/* IOC is being disabled */
 static void
 bfa_ioc_sm_disabling(struct bfa_ioc *ioc, enum ioc_event event)
 {
@@ -449,9 +422,7 @@ bfa_ioc_sm_disabling(struct bfa_ioc *ioc, enum ioc_event event)
         }
 }
 
-/**
- * IOC disable completion entry.
- */
+/* IOC disable completion entry. */
 static void
 bfa_ioc_sm_disabled_entry(struct bfa_ioc *ioc)
 {
@@ -485,9 +456,7 @@ bfa_ioc_sm_fail_retry_entry(struct bfa_ioc *ioc)
 {
 }
 
-/**
- * Hardware initialization retry.
- */
+/* Hardware initialization retry. */
 static void
 bfa_ioc_sm_fail_retry(struct bfa_ioc *ioc, enum ioc_event event)
 {
@@ -534,9 +503,7 @@ bfa_ioc_sm_fail_entry(struct bfa_ioc *ioc)
 {
 }
 
-/**
- * IOC failure.
- */
+/* IOC failure. */
 static void
 bfa_ioc_sm_fail(struct bfa_ioc *ioc, enum ioc_event event)
 {
@@ -568,9 +535,7 @@ bfa_ioc_sm_hwfail_entry(struct bfa_ioc *ioc)
 {
 }
 
-/**
- * IOC failure.
- */
+/* IOC failure. */
 static void
 bfa_ioc_sm_hwfail(struct bfa_ioc *ioc, enum ioc_event event)
 {
@@ -593,13 +558,9 @@ bfa_ioc_sm_hwfail(struct bfa_ioc *ioc, enum ioc_event event)
         }
 }
 
-/**
- * IOCPF State Machine
- */
+/* IOCPF State Machine */
 
-/**
- * Reset entry actions -- initialize state machine
- */
+/* Reset entry actions -- initialize state machine */
 static void
 bfa_iocpf_sm_reset_entry(struct bfa_iocpf *iocpf)
 {
@@ -607,9 +568,7 @@ bfa_iocpf_sm_reset_entry(struct bfa_iocpf *iocpf)
         iocpf->auto_recover = bfa_nw_auto_recover;
 }
 
-/**
- * Beginning state. IOC is in reset state.
- */
+/* Beginning state. IOC is in reset state. */
 static void
 bfa_iocpf_sm_reset(struct bfa_iocpf *iocpf, enum iocpf_event event)
 {
@@ -626,9 +585,7 @@ bfa_iocpf_sm_reset(struct bfa_iocpf *iocpf, enum iocpf_event event)
         }
 }
 
-/**
- * Semaphore should be acquired for version check.
- */
+/* Semaphore should be acquired for version check. */
 static void
 bfa_iocpf_sm_fwcheck_entry(struct bfa_iocpf *iocpf)
 {
@@ -636,9 +593,7 @@ bfa_iocpf_sm_fwcheck_entry(struct bfa_iocpf *iocpf)
         bfa_ioc_hw_sem_get(iocpf->ioc);
 }
 
-/**
- * Awaiting h/w semaphore to continue with version check.
- */
+/* Awaiting h/w semaphore to continue with version check. */
 static void
 bfa_iocpf_sm_fwcheck(struct bfa_iocpf *iocpf, enum iocpf_event event)
 {
@@ -683,9 +638,7 @@ bfa_iocpf_sm_fwcheck(struct bfa_iocpf *iocpf, enum iocpf_event event)
         }
 }
 
-/**
- * Notify enable completion callback
- */
+/* Notify enable completion callback */
 static void
 bfa_iocpf_sm_mismatch_entry(struct bfa_iocpf *iocpf)
 {
@@ -698,9 +651,7 @@ bfa_iocpf_sm_mismatch_entry(struct bfa_iocpf *iocpf)
                 msecs_to_jiffies(BFA_IOC_TOV));
 }
 
-/**
- * Awaiting firmware version match.
- */
+/* Awaiting firmware version match. */
 static void
 bfa_iocpf_sm_mismatch(struct bfa_iocpf *iocpf, enum iocpf_event event)
 {
@@ -727,18 +678,14 @@ bfa_iocpf_sm_mismatch(struct bfa_iocpf *iocpf, enum iocpf_event event)
         }
 }
 
-/**
- * Request for semaphore.
- */
+/* Request for semaphore. */
 static void
 bfa_iocpf_sm_semwait_entry(struct bfa_iocpf *iocpf)
 {
         bfa_ioc_hw_sem_get(iocpf->ioc);
 }
 
-/**
- * Awaiting semaphore for h/w initialzation.
- */
+/* Awaiting semaphore for h/w initialzation. */
 static void
 bfa_iocpf_sm_semwait(struct bfa_iocpf *iocpf, enum iocpf_event event)
 {
@@ -778,8 +725,7 @@ bfa_iocpf_sm_hwinit_entry(struct bfa_iocpf *iocpf)
         bfa_ioc_reset(iocpf->ioc, false);
 }
 
-/**
- * Hardware is being initialized. Interrupts are enabled.
+/* Hardware is being initialized. Interrupts are enabled.
  * Holding hardware semaphore lock.
  */
 static void
@@ -822,8 +768,7 @@ bfa_iocpf_sm_enabling_entry(struct bfa_iocpf *iocpf)
         bfa_ioc_send_enable(iocpf->ioc);
 }
 
-/**
- * Host IOC function is being enabled, awaiting response from firmware.
+/* Host IOC function is being enabled, awaiting response from firmware.
  * Semaphore is acquired.
  */
 static void
@@ -896,9 +841,7 @@ bfa_iocpf_sm_disabling_entry(struct bfa_iocpf *iocpf)
         bfa_ioc_send_disable(iocpf->ioc);
 }
 
-/**
- * IOC is being disabled
- */
+/* IOC is being disabled */
 static void
 bfa_iocpf_sm_disabling(struct bfa_iocpf *iocpf, enum iocpf_event event)
 {
@@ -935,9 +878,7 @@ bfa_iocpf_sm_disabling_sync_entry(struct bfa_iocpf *iocpf)
         bfa_ioc_hw_sem_get(iocpf->ioc);
 }
 
-/**
- * IOC hb ack request is being removed.
- */
+/* IOC hb ack request is being removed. */
 static void
 bfa_iocpf_sm_disabling_sync(struct bfa_iocpf *iocpf, enum iocpf_event event)
 {
@@ -963,9 +904,7 @@ bfa_iocpf_sm_disabling_sync(struct bfa_iocpf *iocpf, enum iocpf_event event)
         }
 }
 
-/**
- * IOC disable completion entry.
- */
+/* IOC disable completion entry. */
 static void
 bfa_iocpf_sm_disabled_entry(struct bfa_iocpf *iocpf)
 {
@@ -1000,9 +939,7 @@ bfa_iocpf_sm_initfail_sync_entry(struct bfa_iocpf *iocpf)
         bfa_ioc_hw_sem_get(iocpf->ioc);
 }
 
-/**
- * Hardware initialization failed.
- */
+/* Hardware initialization failed. */
 static void
 bfa_iocpf_sm_initfail_sync(struct bfa_iocpf *iocpf, enum iocpf_event event)
 {
@@ -1046,9 +983,7 @@ bfa_iocpf_sm_initfail_entry(struct bfa_iocpf *iocpf)
 {
 }
 
-/**
- * Hardware initialization failed.
- */
+/* Hardware initialization failed. */
 static void
 bfa_iocpf_sm_initfail(struct bfa_iocpf *iocpf, enum iocpf_event event)
 {
@@ -1084,9 +1019,7 @@ bfa_iocpf_sm_fail_sync_entry(struct bfa_iocpf *iocpf)
         bfa_ioc_hw_sem_get(iocpf->ioc);
 }
 
-/**
- * IOC is in failed state.
- */
+/* IOC is in failed state. */
 static void
 bfa_iocpf_sm_fail_sync(struct bfa_iocpf *iocpf, enum iocpf_event event)
 {
@@ -1134,10 +1067,7 @@ bfa_iocpf_sm_fail_entry(struct bfa_iocpf *iocpf)
 {
 }
 
-/**
- * @brief
- * IOC is in failed state.
- */
+/* IOC is in failed state. */
 static void
 bfa_iocpf_sm_fail(struct bfa_iocpf *iocpf, enum iocpf_event event)
 {
@@ -1151,13 +1081,9 @@ bfa_iocpf_sm_fail(struct bfa_iocpf *iocpf, enum iocpf_event event)
         }
 }
 
-/**
- * BFA IOC private functions
- */
+/* BFA IOC private functions */
 
-/**
- * Notify common modules registered for notification.
- */
+/* Notify common modules registered for notification. */
 static void
 bfa_ioc_event_notify(struct bfa_ioc *ioc, enum bfa_ioc_event event)
 {
@@ -1298,10 +1224,7 @@ bfa_ioc_hw_sem_get_cancel(struct bfa_ioc *ioc)
         del_timer(&ioc->sem_timer);
 }
 
-/**
- * @brief
- * Initialize LPU local memory (aka secondary memory / SRAM)
- */
+/* Initialize LPU local memory (aka secondary memory / SRAM) */
 static void
 bfa_ioc_lmem_init(struct bfa_ioc *ioc)
 {
@@ -1366,9 +1289,7 @@ bfa_ioc_lpu_stop(struct bfa_ioc *ioc)
         writel(pss_ctl, ioc->ioc_regs.pss_ctl_reg);
 }
 
-/**
- * Get driver and firmware versions.
- */
+/* Get driver and firmware versions. */
 void
 bfa_nw_ioc_fwver_get(struct bfa_ioc *ioc, struct bfi_ioc_image_hdr *fwhdr)
 {
@@ -1388,9 +1309,7 @@ bfa_nw_ioc_fwver_get(struct bfa_ioc *ioc, struct bfi_ioc_image_hdr *fwhdr)
         }
 }
 
-/**
- * Returns TRUE if same.
- */
+/* Returns TRUE if same. */
 bool
 bfa_nw_ioc_fwver_cmp(struct bfa_ioc *ioc, struct bfi_ioc_image_hdr *fwhdr)
 {
@@ -1408,8 +1327,7 @@ bfa_nw_ioc_fwver_cmp(struct bfa_ioc *ioc, struct bfi_ioc_image_hdr *fwhdr)
         return true;
 }
 
-/**
- * Return true if current running version is valid. Firmware signature and
+/* Return true if current running version is valid. Firmware signature and
  * execution context (driver/bios) must match.
  */
 static bool
@@ -1430,9 +1348,7 @@ bfa_ioc_fwver_valid(struct bfa_ioc *ioc, u32 boot_env)
         return bfa_nw_ioc_fwver_cmp(ioc, &fwhdr);
 }
 
-/**
- * Conditionally flush any pending message from firmware at start.
- */
+/* Conditionally flush any pending message from firmware at start. */
 static void
 bfa_ioc_msgflush(struct bfa_ioc *ioc)
 {
@@ -1443,9 +1359,6 @@ bfa_ioc_msgflush(struct bfa_ioc *ioc)
                 writel(1, ioc->ioc_regs.lpu_mbox_cmd);
 }
 
-/**
- * @img ioc_init_logic.jpg
- */
 static void
 bfa_ioc_hwinit(struct bfa_ioc *ioc, bool force)
 {
@@ -1603,10 +1516,7 @@ bfa_ioc_hb_stop(struct bfa_ioc *ioc)
         del_timer(&ioc->hb_timer);
 }
 
-/**
- * @brief
- *      Initiate a full firmware download.
- */
+/* Initiate a full firmware download. */
 static void
 bfa_ioc_download_fw(struct bfa_ioc *ioc, u32 boot_type,
                     u32 boot_env)
@@ -1672,9 +1582,7 @@ bfa_ioc_reset(struct bfa_ioc *ioc, bool force)
         bfa_ioc_hwinit(ioc, force);
 }
 
-/**
- * BFA ioc enable reply by firmware
- */
+/* BFA ioc enable reply by firmware */
 static void
 bfa_ioc_enable_reply(struct bfa_ioc *ioc, enum bfa_mode port_mode,
                         u8 cap_bm)
@@ -1686,10 +1594,7 @@ bfa_ioc_enable_reply(struct bfa_ioc *ioc, enum bfa_mode port_mode,
         bfa_fsm_send_event(iocpf, IOCPF_E_FWRSP_ENABLE);
 }
 
-/**
- * @brief
- * Update BFA configuration from firmware configuration.
- */
+/* Update BFA configuration from firmware configuration. */
 static void
 bfa_ioc_getattr_reply(struct bfa_ioc *ioc)
 {
@@ -1702,9 +1607,7 @@ bfa_ioc_getattr_reply(struct bfa_ioc *ioc)
         bfa_fsm_send_event(ioc, IOC_E_FWRSP_GETATTR);
 }
 
-/**
- * Attach time initialization of mbox logic.
- */
+/* Attach time initialization of mbox logic. */
 static void
 bfa_ioc_mbox_attach(struct bfa_ioc *ioc)
 {
@@ -1718,9 +1621,7 @@ bfa_ioc_mbox_attach(struct bfa_ioc *ioc)
         }
 }
 
-/**
- * Mbox poll timer -- restarts any pending mailbox requests.
- */
+/* Mbox poll timer -- restarts any pending mailbox requests. */
 static void
 bfa_ioc_mbox_poll(struct bfa_ioc *ioc)
 {
@@ -1760,9 +1661,7 @@ bfa_ioc_mbox_poll(struct bfa_ioc *ioc)
         }
 }
 
-/**
- * Cleanup any pending requests.
- */
+/* Cleanup any pending requests. */
 static void
 bfa_ioc_mbox_flush(struct bfa_ioc *ioc)
 {
@@ -1774,12 +1673,12 @@ bfa_ioc_mbox_flush(struct bfa_ioc *ioc)
 }
 
 /**
- * Read data from SMEM to host through PCI memmap
+ * bfa_nw_ioc_smem_read - Read data from SMEM to host through PCI memmap
  *
- * @param[in]  ioc     memory for IOC
- * @param[in]  tbuf    app memory to store data from smem
- * @param[in]  soff    smem offset
- * @param[in]  sz      size of smem in bytes
+ * @ioc:     memory for IOC
+ * @tbuf:    app memory to store data from smem
+ * @soff:    smem offset
+ * @sz:      size of smem in bytes
  */
 static int
 bfa_nw_ioc_smem_read(struct bfa_ioc *ioc, void *tbuf, u32 soff, u32 sz)
@@ -1826,9 +1725,7 @@ bfa_nw_ioc_smem_read(struct bfa_ioc *ioc, void *tbuf, u32 soff, u32 sz)
         return 0;
 }
 
-/**
- * Retrieve saved firmware trace from a prior IOC failure.
- */
+/* Retrieve saved firmware trace from a prior IOC failure. */
 int
 bfa_nw_ioc_debug_fwtrc(struct bfa_ioc *ioc, void *trcdata, int *trclen)
 {
@@ -1844,9 +1741,7 @@ bfa_nw_ioc_debug_fwtrc(struct bfa_ioc *ioc, void *trcdata, int *trclen)
         return status;
 }
 
-/**
- * Save firmware trace if configured.
- */
+/* Save firmware trace if configured. */
 static void
 bfa_nw_ioc_debug_save_ftrc(struct bfa_ioc *ioc)
 {
@@ -1861,9 +1756,7 @@ bfa_nw_ioc_debug_save_ftrc(struct bfa_ioc *ioc)
         }
 }
 
-/**
- * Retrieve saved firmware trace from a prior IOC failure.
- */
+/* Retrieve saved firmware trace from a prior IOC failure. */
 int
 bfa_nw_ioc_debug_fwsave(struct bfa_ioc *ioc, void *trcdata, int *trclen)
 {
@@ -1892,9 +1785,7 @@ bfa_ioc_fail_notify(struct bfa_ioc *ioc)
         bfa_nw_ioc_debug_save_ftrc(ioc);
 }
 
-/**
- * IOCPF to IOC interface
- */
+/* IOCPF to IOC interface */
 static void
 bfa_ioc_pf_enabled(struct bfa_ioc *ioc)
 {
@@ -1928,9 +1819,7 @@ bfa_ioc_pf_fwmismatch(struct bfa_ioc *ioc)
         ioc->cbfn->enable_cbfn(ioc->bfa, BFA_STATUS_IOC_FAILURE);
 }
 
-/**
- * IOC public
- */
+/* IOC public */
 static enum bfa_status
 bfa_ioc_pll_init(struct bfa_ioc *ioc)
 {
@@ -1954,8 +1843,7 @@ bfa_ioc_pll_init(struct bfa_ioc *ioc)
         return BFA_STATUS_OK;
 }
 
-/**
- * Interface used by diag module to do firmware boot with memory test
+/* Interface used by diag module to do firmware boot with memory test
  * as the entry vector.
  */
 static void
@@ -1983,9 +1871,7 @@ bfa_ioc_boot(struct bfa_ioc *ioc, enum bfi_fwboot_type boot_type,
         bfa_ioc_lpu_start(ioc);
 }
 
-/**
- * Enable/disable IOC failure auto recovery.
- */
+/* Enable/disable IOC failure auto recovery. */
 void
 bfa_nw_ioc_auto_recover(bool auto_recover)
 {
@@ -2056,10 +1942,10 @@ bfa_ioc_isr(struct bfa_ioc *ioc, struct bfi_mbmsg *m)
 }
 
 /**
- * IOC attach time initialization and setup.
+ * bfa_nw_ioc_attach - IOC attach time initialization and setup.
  *
- * @param[in]   ioc     memory for IOC
- * @param[in]   bfa     driver instance structure
+ * @ioc:        memory for IOC
+ * @bfa:        driver instance structure
  */
 void
 bfa_nw_ioc_attach(struct bfa_ioc *ioc, void *bfa, struct bfa_ioc_cbfn *cbfn)
@@ -2078,9 +1964,7 @@ bfa_nw_ioc_attach(struct bfa_ioc *ioc, void *bfa, struct bfa_ioc_cbfn *cbfn)
         bfa_fsm_send_event(ioc, IOC_E_RESET);
 }
 
-/**
- * Driver detach time IOC cleanup.
- */
+/* Driver detach time IOC cleanup. */
 void
 bfa_nw_ioc_detach(struct bfa_ioc *ioc)
 {
@@ -2091,9 +1975,9 @@ bfa_nw_ioc_detach(struct bfa_ioc *ioc)
 }
 
 /**
- * Setup IOC PCI properties.
+ * bfa_nw_ioc_pci_init - Setup IOC PCI properties.
  *
- * @param[in]   pcidev  PCI device information for this IOC
+ * @pcidev:     PCI device information for this IOC
  */
 void
 bfa_nw_ioc_pci_init(struct bfa_ioc *ioc, struct bfa_pcidev *pcidev,
@@ -2160,10 +2044,10 @@ bfa_nw_ioc_pci_init(struct bfa_ioc *ioc, struct bfa_pcidev *pcidev,
 }
 
 /**
- * Initialize IOC dma memory
+ * bfa_nw_ioc_mem_claim - Initialize IOC dma memory
  *
- * @param[in]   dm_kva  kernel virtual address of IOC dma memory
- * @param[in]   dm_pa   physical address of IOC dma memory
+ * @dm_kva:     kernel virtual address of IOC dma memory
+ * @dm_pa:      physical address of IOC dma memory
  */
 void
 bfa_nw_ioc_mem_claim(struct bfa_ioc *ioc,  u8 *dm_kva, u64 dm_pa)
@@ -2176,9 +2060,7 @@ bfa_nw_ioc_mem_claim(struct bfa_ioc *ioc,  u8 *dm_kva, u64 dm_pa)
         ioc->attr = (struct bfi_ioc_attr *) dm_kva;
 }
 
-/**
- * Return size of dma memory required.
- */
+/* Return size of dma memory required. */
 u32
 bfa_nw_ioc_meminfo(void)
 {
@@ -2201,9 +2083,7 @@ bfa_nw_ioc_disable(struct bfa_ioc *ioc)
         bfa_fsm_send_event(ioc, IOC_E_DISABLE);
 }
 
-/**
- * Initialize memory for saving firmware trace.
- */
+/* Initialize memory for saving firmware trace. */
 void
 bfa_nw_ioc_debug_memclaim(struct bfa_ioc *ioc, void *dbg_fwsave)
 {
@@ -2217,9 +2097,7 @@ bfa_ioc_smem_pgnum(struct bfa_ioc *ioc, u32 fmaddr)
         return PSS_SMEM_PGNUM(ioc->ioc_regs.smem_pg0, fmaddr);
 }
 
-/**
- * Register mailbox message handler function, to be called by common modules
- */
+/* Register mailbox message handler function, to be called by common modules */
 void
 bfa_nw_ioc_mbox_regisr(struct bfa_ioc *ioc, enum bfi_mclass mc,
                     bfa_ioc_mbox_mcfunc_t cbfn, void *cbarg)
@@ -2231,11 +2109,12 @@ bfa_nw_ioc_mbox_regisr(struct bfa_ioc *ioc, enum bfi_mclass mc,
 }
 
 /**
- * Queue a mailbox command request to firmware. Waits if mailbox is busy.
- * Responsibility of caller to serialize
+ * bfa_nw_ioc_mbox_queue - Queue a mailbox command request to firmware.
  *
- * @param[in]   ioc     IOC instance
- * @param[i]    cmd     Mailbox command
+ * @ioc:        IOC instance
+ * @cmd:        Mailbox command
+ *
+ * Waits if mailbox is busy. Responsibility of caller to serialize
  */
 bool
 bfa_nw_ioc_mbox_queue(struct bfa_ioc *ioc, struct bfa_mbox_cmd *cmd,
@@ -2272,9 +2151,7 @@ bfa_nw_ioc_mbox_queue(struct bfa_ioc *ioc, struct bfa_mbox_cmd *cmd,
         return false;
 }
 
-/**
- * Handle mailbox interrupts
- */
+/* Handle mailbox interrupts */
 void
 bfa_nw_ioc_mbox_isr(struct bfa_ioc *ioc)
 {
@@ -2314,9 +2191,7 @@ bfa_nw_ioc_error_isr(struct bfa_ioc *ioc)
         bfa_fsm_send_event(ioc, IOC_E_HWERROR);
 }
 
-/**
- * return true if IOC is disabled
- */
+/* return true if IOC is disabled */
 bool
 bfa_nw_ioc_is_disabled(struct bfa_ioc *ioc)
 {
@@ -2324,17 +2199,14 @@ bfa_nw_ioc_is_disabled(struct bfa_ioc *ioc)
                 bfa_fsm_cmp_state(ioc, bfa_ioc_sm_disabled);
 }
 
-/**
- * return true if IOC is operational
- */
+/* return true if IOC is operational */
 bool
 bfa_nw_ioc_is_operational(struct bfa_ioc *ioc)
 {
         return bfa_fsm_cmp_state(ioc, bfa_ioc_sm_op);
 }
 
-/**
- * Add to IOC heartbeat failure notification queue. To be used by common
+/* Add to IOC heartbeat failure notification queue. To be used by common
  * modules such as cee, port, diag.
  */
 void
@@ -2518,9 +2390,7 @@ bfa_nw_ioc_get_attr(struct bfa_ioc *ioc, struct bfa_ioc_attr *ioc_attr)
         bfa_ioc_get_pci_chip_rev(ioc, ioc_attr->pci_attr.chip_rev);
 }
 
-/**
- * WWN public
- */
+/* WWN public */
 static u64
 bfa_ioc_get_pwwn(struct bfa_ioc *ioc)
 {
@@ -2533,9 +2403,7 @@ bfa_nw_ioc_get_mac(struct bfa_ioc *ioc)
         return ioc->attr->mac;
 }
 
-/**
- * Firmware failure detected. Start recovery actions.
- */
+/* Firmware failure detected. Start recovery actions. */
 static void
 bfa_ioc_recover(struct bfa_ioc *ioc)
 {
@@ -2545,10 +2413,7 @@ bfa_ioc_recover(struct bfa_ioc *ioc)
         bfa_fsm_send_event(ioc, IOC_E_HBFAIL);
 }
 
-/**
- * @dg hal_iocpf_pvt BFA IOC PF private functions
- * @{
- */
+/* BFA IOC PF private functions */
 
 static void
 bfa_iocpf_enable(struct bfa_ioc *ioc)
@@ -2669,8 +2534,6 @@ bfa_flash_notify(void *cbarg, enum bfa_ioc_event event)
 
 /*
  * Send flash write request.
- *
- * @param[in] cbarg - callback argument
  */
 static void
 bfa_flash_write_send(struct bfa_flash *flash)
@@ -2699,10 +2562,10 @@ bfa_flash_write_send(struct bfa_flash *flash)
         flash->offset += len;
 }
 
-/*
- * Send flash read request.
+/**
+ * bfa_flash_read_send - Send flash read request.
  *
- * @param[in] cbarg - callback argument
+ * @cbarg: callback argument
  */
 static void
 bfa_flash_read_send(void *cbarg)
@@ -2724,11 +2587,11 @@ bfa_flash_read_send(void *cbarg)
         bfa_nw_ioc_mbox_queue(flash->ioc, &flash->mb, NULL, NULL);
 }
 
-/*
- * Process flash response messages upon receiving interrupts.
+/**
+ * bfa_flash_intr - Process flash response messages upon receiving interrupts.
  *
- * @param[in] flasharg - flash structure
- * @param[in] msg - message structure
+ * @flasharg: flash structure
+ * @msg: message structure
  */
 static void
 bfa_flash_intr(void *flasharg, struct bfi_mbmsg *msg)
@@ -2821,12 +2684,12 @@ bfa_nw_flash_meminfo(void)
         return roundup(BFA_FLASH_DMA_BUF_SZ, BFA_DMA_ALIGN_SZ);
 }
 
-/*
- * Flash attach API.
+/**
+ * bfa_nw_flash_attach - Flash attach API.
  *
- * @param[in] flash - flash structure
- * @param[in] ioc  - ioc structure
- * @param[in] dev  - device structure
+ * @flash: flash structure
+ * @ioc: ioc structure
+ * @dev: device structure
  */
 void
 bfa_nw_flash_attach(struct bfa_flash *flash, struct bfa_ioc *ioc, void *dev)
@@ -2842,12 +2705,12 @@ bfa_nw_flash_attach(struct bfa_flash *flash, struct bfa_ioc *ioc, void *dev)
         list_add_tail(&flash->ioc_notify.qe, &flash->ioc->notify_q);
 }
 
-/*
- * Claim memory for flash
+/**
+ * bfa_nw_flash_memclaim - Claim memory for flash
  *
- * @param[in] flash - flash structure
- * @param[in] dm_kva - pointer to virtual memory address
- * @param[in] dm_pa - physical memory address
+ * @flash: flash structure
+ * @dm_kva: pointer to virtual memory address
+ * @dm_pa: physical memory address
  */
 void
 bfa_nw_flash_memclaim(struct bfa_flash *flash, u8 *dm_kva, u64 dm_pa)
@@ -2859,13 +2722,13 @@ bfa_nw_flash_memclaim(struct bfa_flash *flash, u8 *dm_kva, u64 dm_pa)
         dm_pa += roundup(BFA_FLASH_DMA_BUF_SZ, BFA_DMA_ALIGN_SZ);
 }
 
-/*
- * Get flash attribute.
+/**
+ * bfa_nw_flash_get_attr - Get flash attribute.
  *
- * @param[in] flash - flash structure
- * @param[in] attr - flash attribute structure
- * @param[in] cbfn - callback function
- * @param[in] cbarg - callback argument
+ * @flash: flash structure
+ * @attr: flash attribute structure
+ * @cbfn: callback function
+ * @cbarg: callback argument
  *
  * Return status.
  */
@@ -2895,17 +2758,17 @@ bfa_nw_flash_get_attr(struct bfa_flash *flash, struct bfa_flash_attr *attr,
         return BFA_STATUS_OK;
 }
 
-/*
- * Update flash partition.
+/**
+ * bfa_nw_flash_update_part - Update flash partition.
  *
- * @param[in] flash - flash structure
- * @param[in] type - flash partition type
- * @param[in] instance - flash partition instance
- * @param[in] buf - update data buffer
- * @param[in] len - data buffer length
- * @param[in] offset - offset relative to the partition starting address
- * @param[in] cbfn - callback function
- * @param[in] cbarg - callback argument
+ * @flash: flash structure
+ * @type: flash partition type
+ * @instance: flash partition instance
+ * @buf: update data buffer
+ * @len: data buffer length
+ * @offset: offset relative to the partition starting address
+ * @cbfn: callback function
+ * @cbarg: callback argument
  *
  * Return status.
  */
@@ -2944,17 +2807,17 @@ bfa_nw_flash_update_part(struct bfa_flash *flash, u32 type, u8 instance,
         return BFA_STATUS_OK;
 }
 
-/*
- * Read flash partition.
+/**
+ * bfa_nw_flash_read_part - Read flash partition.
  *
- * @param[in] flash - flash structure
- * @param[in] type - flash partition type
- * @param[in] instance - flash partition instance
- * @param[in] buf - read data buffer
- * @param[in] len - data buffer length
- * @param[in] offset - offset relative to the partition starting address
- * @param[in] cbfn - callback function
- * @param[in] cbarg - callback argument
+ * @flash: flash structure
+ * @type: flash partition type
+ * @instance: flash partition instance
+ * @buf: read data buffer
+ * @len: data buffer length
+ * @offset: offset relative to the partition starting address
+ * @cbfn: callback function
+ * @cbarg: callback argument
  *
  * Return status.
  */
diff --git a/drivers/net/ethernet/brocade/bna/bfa_ioc.h b/drivers/net/ethernet/brocade/bna/bfa_ioc.h
index 3b4460fdc14..63a85e555df 100644
--- a/drivers/net/ethernet/brocade/bna/bfa_ioc.h
+++ b/drivers/net/ethernet/brocade/bna/bfa_ioc.h
@@ -30,9 +30,7 @@
 #define BNA_DBG_FWTRC_LEN      (BFI_IOC_TRC_ENTS * BFI_IOC_TRC_ENT_SZ + \
                                 BFI_IOC_TRC_HDR_SZ)
 
-/**
- * PCI device information required by IOC
- */
+/* PCI device information required by IOC */
 struct bfa_pcidev {
         int     pci_slot;
         u8      pci_func;
@@ -41,8 +39,7 @@ struct bfa_pcidev {
         void    __iomem *pci_bar_kva;
 };
 
-/**
- * Structure used to remember the DMA-able memory block's KVA and Physical
+/* Structure used to remember the DMA-able memory block's KVA and Physical
  * Address
  */
 struct bfa_dma {
@@ -52,15 +49,11 @@ struct bfa_dma {
 
 #define BFA_DMA_ALIGN_SZ        256
 
-/**
- * smem size for Crossbow and Catapult
- */
+/* smem size for Crossbow and Catapult */
 #define BFI_SMEM_CB_SIZE        0x200000U       /* ! 2MB for crossbow   */
 #define BFI_SMEM_CT_SIZE        0x280000U       /* ! 2.5MB for catapult */
 
-/**
- * @brief BFA dma address assignment macro. (big endian format)
- */
+/* BFA dma address assignment macro. (big endian format) */
 #define bfa_dma_be_addr_set(dma_addr, pa)       \
                 __bfa_dma_be_addr_set(&dma_addr, (u64)pa)
 static inline void
@@ -108,9 +101,7 @@ struct bfa_ioc_regs {
         u32     smem_pg0;
 };
 
-/**
- * IOC Mailbox structures
- */
+/* IOC Mailbox structures */
 typedef void (*bfa_mbox_cmd_cbfn_t)(void *cbarg);
 struct bfa_mbox_cmd {
         struct list_head        qe;
@@ -119,9 +110,7 @@ struct bfa_mbox_cmd {
         u32     msg[BFI_IOC_MSGSZ];
 };
 
-/**
- * IOC mailbox module
- */
+/* IOC mailbox module */
 typedef void (*bfa_ioc_mbox_mcfunc_t)(void *cbarg, struct bfi_mbmsg *m);
 struct bfa_ioc_mbox_mod {
         struct list_head        cmd_q;          /*!< pending mbox queue */
@@ -132,9 +121,7 @@ struct bfa_ioc_mbox_mod {
         } mbhdlr[BFI_MC_MAX];
 };
 
-/**
- * IOC callback function interfaces
- */
+/* IOC callback function interfaces */
 typedef void (*bfa_ioc_enable_cbfn_t)(void *bfa, enum bfa_status status);
 typedef void (*bfa_ioc_disable_cbfn_t)(void *bfa);
 typedef void (*bfa_ioc_hbfail_cbfn_t)(void *bfa);
@@ -146,9 +133,7 @@ struct bfa_ioc_cbfn {
         bfa_ioc_reset_cbfn_t    reset_cbfn;
 };
 
-/**
- * IOC event notification mechanism.
- */
+/* IOC event notification mechanism. */
 enum bfa_ioc_event {
         BFA_IOC_E_ENABLED       = 1,
         BFA_IOC_E_DISABLED      = 2,
@@ -163,9 +148,7 @@ struct bfa_ioc_notify {
         void                    *cbarg;
 };
 
-/**
- * Initialize a IOC event notification structure
- */
+/* Initialize a IOC event notification structure */
 #define bfa_ioc_notify_init(__notify, __cbfn, __cbarg) do {     \
         (__notify)->cbfn = (__cbfn);                            \
         (__notify)->cbarg = (__cbarg);                          \
@@ -261,9 +244,7 @@ struct bfa_ioc_hwif {
 #define BFA_IOC_FLASH_OFFSET_IN_CHUNK(off)      (off % BFI_FLASH_CHUNK_SZ_WORDS)
 #define BFA_IOC_FLASH_CHUNK_ADDR(chunkno)  (chunkno * BFI_FLASH_CHUNK_SZ_WORDS)
 
-/**
- * IOC mailbox interface
- */
+/* IOC mailbox interface */
 bool bfa_nw_ioc_mbox_queue(struct bfa_ioc *ioc,
                         struct bfa_mbox_cmd *cmd,
                         bfa_mbox_cmd_cbfn_t cbfn, void *cbarg);
@@ -271,9 +252,7 @@ void bfa_nw_ioc_mbox_isr(struct bfa_ioc *ioc);
 void bfa_nw_ioc_mbox_regisr(struct bfa_ioc *ioc, enum bfi_mclass mc,
                 bfa_ioc_mbox_mcfunc_t cbfn, void *cbarg);
 
-/**
- * IOC interfaces
- */
+/* IOC interfaces */
 
 #define bfa_ioc_pll_init_asic(__ioc) \
         ((__ioc)->ioc_hwif->ioc_pll_init((__ioc)->pcidev.pci_bar_kva, \
diff --git a/drivers/net/ethernet/brocade/bna/bfa_ioc_ct.c b/drivers/net/ethernet/brocade/bna/bfa_ioc_ct.c
index b6b036a143a..5df0b0c68c5 100644
--- a/drivers/net/ethernet/brocade/bna/bfa_ioc_ct.c
+++ b/drivers/net/ethernet/brocade/bna/bfa_ioc_ct.c
@@ -87,9 +87,7 @@ static const struct bfa_ioc_hwif nw_hwif_ct2 = {
         .ioc_sync_complete   = bfa_ioc_ct_sync_complete,
 };
 
-/**
- * Called from bfa_ioc_attach() to map asic specific calls.
- */
+/* Called from bfa_ioc_attach() to map asic specific calls. */
 void
 bfa_nw_ioc_set_ct_hwif(struct bfa_ioc *ioc)
 {
@@ -102,9 +100,7 @@ bfa_nw_ioc_set_ct2_hwif(struct bfa_ioc *ioc)
         ioc->ioc_hwif = &nw_hwif_ct2;
 }
 
-/**
- * Return true if firmware of current driver matches the running firmware.
- */
+/* Return true if firmware of current driver matches the running firmware. */
 static bool
 bfa_ioc_ct_firmware_lock(struct bfa_ioc *ioc)
 {
@@ -182,9 +178,7 @@ bfa_ioc_ct_firmware_unlock(struct bfa_ioc *ioc)
         bfa_nw_ioc_sem_release(ioc->ioc_regs.ioc_usage_sem_reg);
 }
 
-/**
- * Notify other functions on HB failure.
- */
+/* Notify other functions on HB failure. */
 static void
 bfa_ioc_ct_notify_fail(struct bfa_ioc *ioc)
 {
@@ -195,9 +189,7 @@ bfa_ioc_ct_notify_fail(struct bfa_ioc *ioc)
         readl(ioc->ioc_regs.alt_ll_halt);
 }
 
-/**
- * Host to LPU mailbox message addresses
- */
+/* Host to LPU mailbox message addresses */
 static const struct {
         u32     hfn_mbox;
         u32     lpu_mbox;
@@ -209,9 +201,7 @@ static const struct {
         { HOSTFN3_LPU_MBOX0_8, LPU_HOSTFN3_MBOX0_8, HOST_PAGE_NUM_FN3 }
 };
 
-/**
- * Host <-> LPU mailbox command/status registers - port 0
- */
+/* Host <-> LPU mailbox command/status registers - port 0 */
 static const struct {
         u32     hfn;
         u32     lpu;
@@ -222,9 +212,7 @@ static const struct {
         { HOSTFN3_LPU0_CMD_STAT, LPU0_HOSTFN3_CMD_STAT }
 };
 
-/**
- * Host <-> LPU mailbox command/status registers - port 1
- */
+/* Host <-> LPU mailbox command/status registers - port 1 */
 static const struct {
         u32     hfn;
         u32     lpu;
@@ -368,9 +356,7 @@ bfa_ioc_ct2_reg_init(struct bfa_ioc *ioc)
         ioc->ioc_regs.err_set = rb + ERR_SET_REG;
 }
 
-/**
- * Initialize IOC to port mapping.
- */
+/* Initialize IOC to port mapping. */
 
 #define FNC_PERS_FN_SHIFT(__fn) ((__fn) * 8)
 static void
@@ -398,9 +384,7 @@ bfa_ioc_ct2_map_port(struct bfa_ioc *ioc)
         ioc->port_id = ((r32 & __FC_LL_PORT_MAP__MK) >> __FC_LL_PORT_MAP__SH);
 }
 
-/**
- * Set interrupt mode for a function: INTX or MSIX
- */
+/* Set interrupt mode for a function: INTX or MSIX */
 static void
 bfa_ioc_ct_isr_mode_set(struct bfa_ioc *ioc, bool msix)
 {
@@ -443,9 +427,7 @@ bfa_ioc_ct2_lpu_read_stat(struct bfa_ioc *ioc)
         return false;
 }
 
-/**
- * MSI-X resource allocation for 1860 with no asic block
- */
+/* MSI-X resource allocation for 1860 with no asic block */
 #define HOSTFN_MSIX_DEFAULT             64
 #define HOSTFN_MSIX_VT_INDEX_MBOX_ERR   0x30138
 #define HOSTFN_MSIX_VT_OFST_NUMVT       0x3013c
@@ -473,9 +455,7 @@ bfa_nw_ioc_ct2_poweron(struct bfa_ioc *ioc)
                         rb + HOSTFN_MSIX_VT_INDEX_MBOX_ERR);
 }
 
-/**
- * Cleanup hw semaphore and usecnt registers
- */
+/* Cleanup hw semaphore and usecnt registers */
 static void
 bfa_ioc_ct_ownership_reset(struct bfa_ioc *ioc)
 {
@@ -492,9 +472,7 @@ bfa_ioc_ct_ownership_reset(struct bfa_ioc *ioc)
         bfa_nw_ioc_hw_sem_release(ioc);
 }
 
-/**
- * Synchronized IOC failure processing routines
- */
+/* Synchronized IOC failure processing routines */
 static bool
 bfa_ioc_ct_sync_start(struct bfa_ioc *ioc)
 {
@@ -518,9 +496,7 @@ bfa_ioc_ct_sync_start(struct bfa_ioc *ioc)
 
         return bfa_ioc_ct_sync_complete(ioc);
 }
-/**
- * Synchronized IOC failure processing routines
- */
+/* Synchronized IOC failure processing routines */
 static void
 bfa_ioc_ct_sync_join(struct bfa_ioc *ioc)
 {
diff --git a/drivers/net/ethernet/brocade/bna/bfa_msgq.c b/drivers/net/ethernet/brocade/bna/bfa_msgq.c
index dd36427f475..55067d0d25c 100644
--- a/drivers/net/ethernet/brocade/bna/bfa_msgq.c
+++ b/drivers/net/ethernet/brocade/bna/bfa_msgq.c
@@ -16,9 +16,7 @@
  * www.brocade.com
  */
 
-/**
- * @file bfa_msgq.c MSGQ module source file.
- */
+/* MSGQ module source file. */
 
 #include "bfi.h"
 #include "bfa_msgq.h"
diff --git a/drivers/net/ethernet/brocade/bna/bfi.h b/drivers/net/ethernet/brocade/bna/bfi.h
index 0d9df695397..1f24c23dc78 100644
--- a/drivers/net/ethernet/brocade/bna/bfi.h
+++ b/drivers/net/ethernet/brocade/bna/bfi.h
@@ -22,15 +22,11 @@
 
 #pragma pack(1)
 
-/**
- * BFI FW image type
- */
+/* BFI FW image type */
 #define BFI_FLASH_CHUNK_SZ                      256     /*!< Flash chunk size */
 #define BFI_FLASH_CHUNK_SZ_WORDS        (BFI_FLASH_CHUNK_SZ/sizeof(u32))
 
-/**
- * Msg header common to all msgs
- */
+/* Msg header common to all msgs */
 struct bfi_mhdr {
         u8              msg_class;      /*!< @ref enum bfi_mclass           */
         u8              msg_id;         /*!< msg opcode with in the class   */
@@ -65,17 +61,14 @@ struct bfi_mhdr {
 #define BFI_I2H_OPCODE_BASE     128
 #define BFA_I2HM(_x)                    ((_x) + BFI_I2H_OPCODE_BASE)
 
-/**
- ****************************************************************************
+/****************************************************************************
  *
  * Scatter Gather Element and Page definition
  *
  ****************************************************************************
  */
 
-/**
- * DMA addresses
- */
+/* DMA addresses */
 union bfi_addr_u {
         struct {
                 u32     addr_lo;
@@ -83,9 +76,7 @@ union bfi_addr_u {
         } a32;
 };
 
-/**
- * Generic DMA addr-len pair.
- */
+/* Generic DMA addr-len pair. */
 struct bfi_alen {
         union bfi_addr_u        al_addr;        /* DMA addr of buffer   */
         u32                     al_len;         /* length of buffer */
@@ -98,26 +89,20 @@ struct bfi_alen {
 #define BFI_LMSG_PL_WSZ \
                         ((BFI_LMSG_SZ - sizeof(struct bfi_mhdr)) / 4)
 
-/**
- * Mailbox message structure
- */
+/* Mailbox message structure */
 #define BFI_MBMSG_SZ            7
 struct bfi_mbmsg {
         struct bfi_mhdr mh;
         u32             pl[BFI_MBMSG_SZ];
 };
 
-/**
- * Supported PCI function class codes (personality)
- */
+/* Supported PCI function class codes (personality) */
 enum bfi_pcifn_class {
         BFI_PCIFN_CLASS_FC      = 0x0c04,
         BFI_PCIFN_CLASS_ETH     = 0x0200,
 };
 
-/**
- * Message Classes
- */
+/* Message Classes */
 enum bfi_mclass {
         BFI_MC_IOC              = 1,    /*!< IO Controller (IOC)            */
         BFI_MC_DIAG             = 2,    /*!< Diagnostic Msgs                */
@@ -159,15 +144,12 @@ enum bfi_mclass {
 
 #define BFI_FWBOOT_ENV_OS               0
 
-/**
- *----------------------------------------------------------------------
+/*----------------------------------------------------------------------
  *                              IOC
  *----------------------------------------------------------------------
  */
 
-/**
- * Different asic generations
- */
+/* Different asic generations */
 enum bfi_asic_gen {
         BFI_ASIC_GEN_CB         = 1,
         BFI_ASIC_GEN_CT         = 2,
@@ -196,9 +178,7 @@ enum bfi_ioc_i2h_msgs {
         BFI_IOC_I2H_HBEAT               = BFA_I2HM(4),
 };
 
-/**
- * BFI_IOC_H2I_GETATTR_REQ message
- */
+/* BFI_IOC_H2I_GETATTR_REQ message */
 struct bfi_ioc_getattr_req {
         struct bfi_mhdr mh;
         union bfi_addr_u        attr_addr;
@@ -231,30 +211,22 @@ struct bfi_ioc_attr {
         u32     card_type;      /*!< card type                  */
 };
 
-/**
- * BFI_IOC_I2H_GETATTR_REPLY message
- */
+/* BFI_IOC_I2H_GETATTR_REPLY message */
 struct bfi_ioc_getattr_reply {
         struct bfi_mhdr mh;     /*!< Common msg header          */
         u8                      status; /*!< cfg reply status           */
         u8                      rsvd[3];
 };
 
-/**
- * Firmware memory page offsets
- */
+/* Firmware memory page offsets */
 #define BFI_IOC_SMEM_PG0_CB     (0x40)
 #define BFI_IOC_SMEM_PG0_CT     (0x180)
 
-/**
- * Firmware statistic offset
- */
+/* Firmware statistic offset */
 #define BFI_IOC_FWSTATS_OFF     (0x6B40)
 #define BFI_IOC_FWSTATS_SZ      (4096)
 
-/**
- * Firmware trace offset
- */
+/* Firmware trace offset */
 #define BFI_IOC_TRC_OFF         (0x4b00)
 #define BFI_IOC_TRC_ENTS        256
 #define BFI_IOC_TRC_ENT_SZ      16
@@ -299,9 +271,7 @@ struct bfi_ioc_hbeat {
         u32        hb_count;    /*!< current heart beat count   */
 };
 
-/**
- * IOC hardware/firmware state
- */
+/* IOC hardware/firmware state */
 enum bfi_ioc_state {
         BFI_IOC_UNINIT          = 0,    /*!< not initialized                 */
         BFI_IOC_INITING         = 1,    /*!< h/w is being initialized        */
@@ -345,9 +315,7 @@ enum {
         ((__adap_type) & (BFI_ADAPTER_TTV | BFI_ADAPTER_PROTO | \
                         BFI_ADAPTER_UNSUPP))
 
-/**
- * BFI_IOC_H2I_ENABLE_REQ & BFI_IOC_H2I_DISABLE_REQ messages
- */
+/* BFI_IOC_H2I_ENABLE_REQ & BFI_IOC_H2I_DISABLE_REQ messages */
 struct bfi_ioc_ctrl_req {
         struct bfi_mhdr mh;
         u16                     clscode;
@@ -355,9 +323,7 @@ struct bfi_ioc_ctrl_req {
         u32             tv_sec;
 };
 
-/**
- * BFI_IOC_I2H_ENABLE_REPLY & BFI_IOC_I2H_DISABLE_REPLY messages
- */
+/* BFI_IOC_I2H_ENABLE_REPLY & BFI_IOC_I2H_DISABLE_REPLY messages */
 struct bfi_ioc_ctrl_reply {
         struct bfi_mhdr mh;                     /*!< Common msg header     */
         u8                      status;         /*!< enable/disable status */
@@ -367,9 +333,7 @@ struct bfi_ioc_ctrl_reply {
 };
 
 #define BFI_IOC_MSGSZ   8
-/**
- * H2I Messages
- */
+/* H2I Messages */
 union bfi_ioc_h2i_msg_u {
         struct bfi_mhdr mh;
         struct bfi_ioc_ctrl_req enable_req;
@@ -378,17 +342,14 @@ union bfi_ioc_h2i_msg_u {
         u32                     mboxmsg[BFI_IOC_MSGSZ];
 };
 
-/**
- * I2H Messages
- */
+/* I2H Messages */
 union bfi_ioc_i2h_msg_u {
         struct bfi_mhdr mh;
         struct bfi_ioc_ctrl_reply fw_event;
         u32                     mboxmsg[BFI_IOC_MSGSZ];
 };
 
-/**
- *----------------------------------------------------------------------
+/*----------------------------------------------------------------------
  *                              MSGQ
  *----------------------------------------------------------------------
  */
diff --git a/drivers/net/ethernet/brocade/bna/bfi_cna.h b/drivers/net/ethernet/brocade/bna/bfi_cna.h
index 4eecabea397..6704a439297 100644
--- a/drivers/net/ethernet/brocade/bna/bfi_cna.h
+++ b/drivers/net/ethernet/brocade/bna/bfi_cna.h
@@ -37,18 +37,14 @@ enum bfi_port_i2h {
         BFI_PORT_I2H_CLEAR_STATS_RSP    = BFA_I2HM(4),
 };
 
-/**
- * Generic REQ type
- */
+/* Generic REQ type */
 struct bfi_port_generic_req {
         struct bfi_mhdr mh;             /*!< msg header                     */
         u32     msgtag;         /*!< msgtag for reply               */
         u32     rsvd;
 };
 
-/**
- * Generic RSP type
- */
+/* Generic RSP type */
 struct bfi_port_generic_rsp {
         struct bfi_mhdr mh;             /*!< common msg header              */
         u8              status;         /*!< port enable status             */
@@ -56,44 +52,12 @@ struct bfi_port_generic_rsp {
         u32     msgtag;         /*!< msgtag for reply               */
 };
 
-/**
- * @todo
- * BFI_PORT_H2I_ENABLE_REQ
- */
-
-/**
- * @todo
- * BFI_PORT_I2H_ENABLE_RSP
- */
-
-/**
- * BFI_PORT_H2I_DISABLE_REQ
- */
-
-/**
- * BFI_PORT_I2H_DISABLE_RSP
- */
-
-/**
- * BFI_PORT_H2I_GET_STATS_REQ
- */
+/* BFI_PORT_H2I_GET_STATS_REQ */
 struct bfi_port_get_stats_req {
         struct bfi_mhdr mh;             /*!< common msg header              */
         union bfi_addr_u   dma_addr;
 };
 
-/**
- * BFI_PORT_I2H_GET_STATS_RSP
- */
-
-/**
- * BFI_PORT_H2I_CLEAR_STATS_REQ
- */
-
-/**
- * BFI_PORT_I2H_CLEAR_STATS_RSP
- */
-
 union bfi_port_h2i_msg_u {
         struct bfi_mhdr mh;
         struct bfi_port_generic_req enable_req;
diff --git a/drivers/net/ethernet/brocade/bna/bfi_enet.h b/drivers/net/ethernet/brocade/bna/bfi_enet.h
index a90f1cf46b4..eef6e1f8aec 100644
--- a/drivers/net/ethernet/brocade/bna/bfi_enet.h
+++ b/drivers/net/ethernet/brocade/bna/bfi_enet.h
@@ -16,12 +16,9 @@
  * www.brocade.com
  */
 
-/**
- * @file bfi_enet.h BNA Hardware and Firmware Interface
- */
+/* BNA Hardware and Firmware Interface */
 
-/**
- * Skipping statistics collection to avoid clutter.
+/* Skipping statistics collection to avoid clutter.
  * Command is no longer needed:
  *      MTU
  *      TxQ Stop
@@ -64,9 +61,7 @@ union bfi_addr_be_u {
         } a32;
 };
 
-/**
- *      T X   Q U E U E   D E F I N E S
- */
+/*      T X   Q U E U E   D E F I N E S      */
 /* TxQ Vector (a.k.a. Tx-Buffer Descriptor) */
 /* TxQ Entry Opcodes */
 #define BFI_ENET_TXQ_WI_SEND            (0x402) /* Single Frame Transmission */
@@ -106,10 +101,7 @@ struct bfi_enet_txq_wi_vector {			/* Tx Buffer Descriptor */
         union bfi_addr_be_u     addr;
 };
 
-/**
- *  TxQ Entry Structure
- *
- */
+/*  TxQ Entry Structure  */
 struct bfi_enet_txq_entry {
         union {
                 struct bfi_enet_txq_wi_base     base;
@@ -124,16 +116,12 @@ struct bfi_enet_txq_entry {
 #define BFI_ENET_TXQ_WI_L4_HDR_N_OFFSET(_hdr_size, _offset) \
                 (((_hdr_size) << 10) | ((_offset) & 0x3FF))
 
-/**
- *   R X   Q U E U E   D E F I N E S
- */
+/*   R X   Q U E U E   D E F I N E S   */
 struct bfi_enet_rxq_entry {
         union bfi_addr_be_u  rx_buffer;
 };
 
-/**
- *   R X   C O M P L E T I O N   Q U E U E   D E F I N E S
- */
+/*   R X   C O M P L E T I O N   Q U E U E   D E F I N E S   */
 /* CQ Entry Flags */
 #define BFI_ENET_CQ_EF_MAC_ERROR        (1 <<  0)
 #define BFI_ENET_CQ_EF_FCS_ERROR        (1 <<  1)
@@ -174,9 +162,7 @@ struct bfi_enet_cq_entry {
         u8      rxq_id;
 };
 
-/**
- *   E N E T   C O N T R O L   P A T H   C O M M A N D S
- */
+/*   E N E T   C O N T R O L   P A T H   C O M M A N D S   */
 struct bfi_enet_q {
         union bfi_addr_u        pg_tbl;
         union bfi_addr_u        first_entry;
@@ -222,9 +208,7 @@ struct bfi_enet_ib {
         u16             rsvd;
 };
 
-/**
- * ENET command messages
- */
+/* ENET command messages */
 enum bfi_enet_h2i_msgs {
         /* Rx Commands */
         BFI_ENET_H2I_RX_CFG_SET_REQ = 1,
@@ -350,9 +334,7 @@ enum bfi_enet_i2h_msgs {
         BFI_ENET_I2H_BW_UPDATE_AEN = BFA_I2HM(BFI_ENET_H2I_MAX + 4),
 };
 
-/**
- *  The following error codes can be returned by the enet commands
- */
+/* The following error codes can be returned by the enet commands */
 enum bfi_enet_err {
         BFI_ENET_CMD_OK         = 0,
         BFI_ENET_CMD_FAIL       = 1,
@@ -364,8 +346,7 @@ enum bfi_enet_err {
         BFI_ENET_CMD_PORT_DISABLED = 7, /* !< port in disabled state */
 };
 
-/**
- * Generic Request
+/* Generic Request
  *
  * bfi_enet_req is used by:
  *      BFI_ENET_H2I_RX_CFG_CLR_REQ
@@ -375,8 +356,7 @@ struct bfi_enet_req {
         struct bfi_msgq_mhdr mh;
 };
 
-/**
- * Enable/Disable Request
+/* Enable/Disable Request
  *
  * bfi_enet_enable_req is used by:
  *      BFI_ENET_H2I_RSS_ENABLE_REQ     (enet_id must be zero)
@@ -391,9 +371,7 @@ struct bfi_enet_enable_req {
         u8              rsvd[3];
 };
 
-/**
- * Generic Response
- */
+/* Generic Response */
 struct bfi_enet_rsp {
         struct bfi_msgq_mhdr mh;
         u8              error;          /*!< if error see cmd_offset */
@@ -401,20 +379,16 @@ struct bfi_enet_rsp {
         u16             cmd_offset;     /*!< offset to invalid parameter */
 };
 
-/**
- * GLOBAL CONFIGURATION
- */
+/* GLOBAL CONFIGURATION */
 
-/**
- * bfi_enet_attr_req is used by:
+/* bfi_enet_attr_req is used by:
  *      BFI_ENET_H2I_GET_ATTR_REQ
  */
 struct bfi_enet_attr_req {
         struct bfi_msgq_mhdr    mh;
 };
 
-/**
- * bfi_enet_attr_rsp is used by:
+/* bfi_enet_attr_rsp is used by:
  *      BFI_ENET_I2H_GET_ATTR_RSP
  */
 struct bfi_enet_attr_rsp {
@@ -427,8 +401,7 @@ struct bfi_enet_attr_rsp {
         u32             rit_size;
 };
 
-/**
- * Tx Configuration
+/* Tx Configuration
  *
  * bfi_enet_tx_cfg is used by:
  *      BFI_ENET_H2I_TX_CFG_SET_REQ
@@ -477,8 +450,7 @@ struct bfi_enet_tx_cfg_rsp {
         } q_handles[BFI_ENET_TXQ_PRIO_MAX];
 };
 
-/**
- * Rx Configuration
+/* Rx Configuration
  *
  * bfi_enet_rx_cfg is used by:
  *      BFI_ENET_H2I_RX_CFG_SET_REQ
@@ -553,8 +525,7 @@ struct bfi_enet_rx_cfg_rsp {
         } q_handles[BFI_ENET_RX_QSET_MAX];
 };
 
-/**
- * RIT
+/* RIT
  *
  * bfi_enet_rit_req is used by:
  *      BFI_ENET_H2I_RIT_CFG_REQ
@@ -566,8 +537,7 @@ struct bfi_enet_rit_req {
         u8      table[BFI_ENET_RSS_RIT_MAX];
 };
 
-/**
- * RSS
+/* RSS
  *
  * bfi_enet_rss_cfg_req is used by:
  *      BFI_ENET_H2I_RSS_CFG_REQ
@@ -591,8 +561,7 @@ struct bfi_enet_rss_cfg_req {
         struct bfi_enet_rss_cfg cfg;
 };
 
-/**
- * MAC Unicast
+/* MAC Unicast
  *
  * bfi_enet_rx_vlan_req is used by:
  *      BFI_ENET_H2I_MAC_UCAST_SET_REQ
@@ -606,17 +575,14 @@ struct bfi_enet_ucast_req {
         u8                      rsvd[2];
 };
 
-/**
- * MAC Unicast + VLAN
- */
+/* MAC Unicast + VLAN */
 struct bfi_enet_mac_n_vlan_req {
         struct bfi_msgq_mhdr    mh;
         u16                     vlan_id;
         mac_t                   mac_addr;
 };
 
-/**
- * MAC Multicast
+/* MAC Multicast
  *
  * bfi_enet_mac_mfilter_add_req is used by:
  *      BFI_ENET_H2I_MAC_MCAST_ADD_REQ
@@ -627,8 +593,7 @@ struct bfi_enet_mcast_add_req {
         u8                      rsvd[2];
 };
 
-/**
- * bfi_enet_mac_mfilter_add_rsp is used by:
+/* bfi_enet_mac_mfilter_add_rsp is used by:
  *      BFI_ENET_I2H_MAC_MCAST_ADD_RSP
  */
 struct bfi_enet_mcast_add_rsp {
@@ -640,8 +605,7 @@ struct bfi_enet_mcast_add_rsp {
         u8                      rsvd1[2];
 };
 
-/**
- * bfi_enet_mac_mfilter_del_req is used by:
+/* bfi_enet_mac_mfilter_del_req is used by:
  *      BFI_ENET_H2I_MAC_MCAST_DEL_REQ
  */
 struct bfi_enet_mcast_del_req {
@@ -650,8 +614,7 @@ struct bfi_enet_mcast_del_req {
         u8                      rsvd[2];
 };
 
-/**
- * VLAN
+/* VLAN
  *
  * bfi_enet_rx_vlan_req is used by:
  *      BFI_ENET_H2I_RX_VLAN_SET_REQ
@@ -663,8 +626,7 @@ struct bfi_enet_rx_vlan_req {
         u32                     bit_mask[BFI_ENET_VLAN_WORDS_MAX];
 };
 
-/**
- * PAUSE
+/* PAUSE
  *
  * bfi_enet_set_pause_req is used by:
  *      BFI_ENET_H2I_SET_PAUSE_REQ
@@ -676,8 +638,7 @@ struct bfi_enet_set_pause_req {
         u8                      rx_pause;       /* 1 = enable;  0 = disable */
 };
 
-/**
- * DIAGNOSTICS
+/* DIAGNOSTICS
  *
  * bfi_enet_diag_lb_req is used by:
  *      BFI_ENET_H2I_DIAG_LOOPBACK
@@ -689,16 +650,13 @@ struct bfi_enet_diag_lb_req {
         u8                      enable;         /* 1 = enable;  0 = disable */
 };
 
-/**
- * enum for Loopback opmodes
- */
+/* enum for Loopback opmodes */
 enum {
         BFI_ENET_DIAG_LB_OPMODE_EXT = 0,
         BFI_ENET_DIAG_LB_OPMODE_CBL = 1,
 };
 
-/**
- * STATISTICS
+/* STATISTICS
  *
  * bfi_enet_stats_req is used by:
  *    BFI_ENET_H2I_STATS_GET_REQ
@@ -713,9 +671,7 @@ struct bfi_enet_stats_req {
         union bfi_addr_u        host_buffer;
 };
 
-/**
- * defines for "stats_mask" above.
- */
+/* defines for "stats_mask" above. */
 #define BFI_ENET_STATS_MAC    (1 << 0)    /* !< MAC Statistics */
 #define BFI_ENET_STATS_BPC    (1 << 1)    /* !< Pause Stats from BPC */
 #define BFI_ENET_STATS_RAD    (1 << 2)    /* !< Rx Admission Statistics */
@@ -881,8 +837,7 @@ struct bfi_enet_stats_mac {
         u64 tx_fragments;
 };
 
-/**
- * Complete statistics, DMAed from fw to host followed by
+/* Complete statistics, DMAed from fw to host followed by
  * BFI_ENET_I2H_STATS_GET_RSP
  */
 struct bfi_enet_stats {
diff --git a/drivers/net/ethernet/brocade/bna/bfi_reg.h b/drivers/net/ethernet/brocade/bna/bfi_reg.h
index 0e094fe46df..c49fa312ddb 100644
--- a/drivers/net/ethernet/brocade/bna/bfi_reg.h
+++ b/drivers/net/ethernet/brocade/bna/bfi_reg.h
@@ -221,9 +221,7 @@ enum {
 #define __PMM_1T_RESET_P                0x00000001
 #define PMM_1T_RESET_REG_P1             0x00023c1c
 
-/**
- * Brocade 1860 Adapter specific defines
- */
+/* Brocade 1860 Adapter specific defines */
 #define CT2_PCI_CPQ_BASE                0x00030000
 #define CT2_PCI_APP_BASE                0x00030100
 #define CT2_PCI_ETH_BASE                0x00030400
diff --git a/drivers/net/ethernet/brocade/bna/bna.h b/drivers/net/ethernet/brocade/bna/bna.h
index 4d7a5de08e1..ede532b4e9d 100644
--- a/drivers/net/ethernet/brocade/bna/bna.h
+++ b/drivers/net/ethernet/brocade/bna/bna.h
@@ -25,11 +25,7 @@
 
 extern const u32 bna_napi_dim_vector[][BNA_BIAS_T_MAX];
 
-/**
- *
- *  Macros and constants
- *
- */
+/*  Macros and constants  */
 
 #define BNA_IOC_TIMER_FREQ              200
 
@@ -356,11 +352,7 @@ do {									\
         }                                                               \
 } while (0)
 
-/**
- *
- *  Inline functions
- *
- */
+/*  Inline functions  */
 
 static inline struct bna_mac *bna_mac_find(struct list_head *q, u8 *addr)
 {
@@ -377,15 +369,9 @@ static inline struct bna_mac *bna_mac_find(struct list_head *q, u8 *addr)
 
 #define bna_attr(_bna) (&(_bna)->ioceth.attr)
 
-/**
- *
- * Function prototypes
- *
- */
+/* Function prototypes */
 
-/**
- * BNA
- */
+/* BNA */
 
 /* FW response handlers */
 void bna_bfi_stats_clr_rsp(struct bna *bna, struct bfi_msgq_mhdr *msghdr);
@@ -413,24 +399,19 @@ struct bna_mcam_handle *bna_mcam_mod_handle_get(struct bna_mcam_mod *mod);
 void bna_mcam_mod_handle_put(struct bna_mcam_mod *mcam_mod,
                           struct bna_mcam_handle *handle);
 
-/**
- * MBOX
- */
+/* MBOX */
 
 /* API for BNAD */
 void bna_mbox_handler(struct bna *bna, u32 intr_status);
 
-/**
- * ETHPORT
- */
+/* ETHPORT */
 
 /* Callbacks for RX */
 void bna_ethport_cb_rx_started(struct bna_ethport *ethport);
 void bna_ethport_cb_rx_stopped(struct bna_ethport *ethport);
 
-/**
- * TX MODULE AND TX
- */
+/* TX MODULE AND TX */
+
 /* FW response handelrs */
 void bna_bfi_tx_enet_start_rsp(struct bna_tx *tx,
                                struct bfi_msgq_mhdr *msghdr);
@@ -462,9 +443,7 @@ void bna_tx_disable(struct bna_tx *tx, enum bna_cleanup_type type,
 void bna_tx_cleanup_complete(struct bna_tx *tx);
 void bna_tx_coalescing_timeo_set(struct bna_tx *tx, int coalescing_timeo);
 
-/**
- * RX MODULE, RX, RXF
- */
+/* RX MODULE, RX, RXF */
 
 /* FW response handlers */
 void bna_bfi_rx_enet_start_rsp(struct bna_rx *rx,
@@ -522,9 +501,7 @@ bna_rx_mode_set(struct bna_rx *rx, enum bna_rxmode rxmode,
 void bna_rx_vlan_add(struct bna_rx *rx, int vlan_id);
 void bna_rx_vlan_del(struct bna_rx *rx, int vlan_id);
 void bna_rx_vlanfilter_enable(struct bna_rx *rx);
-/**
- * ENET
- */
+/* ENET */
 
 /* API for RX */
 int bna_enet_mtu_get(struct bna_enet *enet);
@@ -544,18 +521,14 @@ void bna_enet_mtu_set(struct bna_enet *enet, int mtu,
                       void (*cbfn)(struct bnad *));
 void bna_enet_perm_mac_get(struct bna_enet *enet, mac_t *mac);
 
-/**
- * IOCETH
- */
+/* IOCETH */
 
 /* APIs for BNAD */
 void bna_ioceth_enable(struct bna_ioceth *ioceth);
 void bna_ioceth_disable(struct bna_ioceth *ioceth,
                         enum bna_cleanup_type type);
 
-/**
- * BNAD
- */
+/* BNAD */
 
 /* Callbacks for ENET */
 void bnad_cb_ethport_link_status(struct bnad *bnad,
diff --git a/drivers/net/ethernet/brocade/bna/bna_enet.c b/drivers/net/ethernet/brocade/bna/bna_enet.c
index 9ccc586e376..db14f69d63b 100644
--- a/drivers/net/ethernet/brocade/bna/bna_enet.c
+++ b/drivers/net/ethernet/brocade/bna/bna_enet.c
@@ -378,9 +378,8 @@ bna_msgq_rsp_handler(void *arg, struct bfi_msgq_mhdr *msghdr)
         }
 }
 
-/**
- * ETHPORT
- */
+/* ETHPORT */
+
 #define call_ethport_stop_cbfn(_ethport)                                \
 do {                                                                    \
         if ((_ethport)->stop_cbfn) {                                    \
@@ -804,9 +803,8 @@ bna_ethport_cb_rx_stopped(struct bna_ethport *ethport)
         }
 }
 
-/**
- * ENET
- */
+/* ENET */
+
 #define bna_enet_chld_start(enet)                                       \
 do {                                                                    \
         enum bna_tx_type tx_type =                                      \
@@ -1328,9 +1326,8 @@ bna_enet_perm_mac_get(struct bna_enet *enet, mac_t *mac)
         *mac = bfa_nw_ioc_get_mac(&enet->bna->ioceth.ioc);
 }
 
-/**
- * IOCETH
- */
+/* IOCETH */
+
 #define enable_mbox_intr(_ioceth)                                       \
 do {                                                                    \
         u32 intr_status;                                                \
diff --git a/drivers/net/ethernet/brocade/bna/bna_hw_defs.h b/drivers/net/ethernet/brocade/bna/bna_hw_defs.h
index 4c6aab2a953..b8c4e21fbf4 100644
--- a/drivers/net/ethernet/brocade/bna/bna_hw_defs.h
+++ b/drivers/net/ethernet/brocade/bna/bna_hw_defs.h
@@ -16,20 +16,15 @@
  * www.brocade.com
  */
 
-/**
- * File for interrupt macros and functions
- */
+/* File for interrupt macros and functions */
 
 #ifndef __BNA_HW_DEFS_H__
 #define __BNA_HW_DEFS_H__
 
 #include "bfi_reg.h"
 
-/**
- *
- * SW imposed limits
- *
- */
+/* SW imposed limits */
+
 #define BFI_ENET_DEF_TXQ                1
 #define BFI_ENET_DEF_RXP                1
 #define BFI_ENET_DEF_UCAM               1
@@ -141,11 +136,8 @@
 }
 
 #define bna_port_id_get(_bna) ((_bna)->ioceth.ioc.port_id)
-/**
- *
- *  Interrupt related bits, flags and macros
- *
- */
+
+/*  Interrupt related bits, flags and macros  */
 
 #define IB_STATUS_BITS          0x0000ffff
 
@@ -280,11 +272,7 @@ do {									\
         (writel(BNA_DOORBELL_Q_PRD_IDX((_rcb)->producer_index), \
                 (_rcb)->q_dbell));
 
-/**
- *
- * TxQ, RxQ, CQ related bits, offsets, macros
- *
- */
+/* TxQ, RxQ, CQ related bits, offsets, macros */
 
 /* TxQ Entry Opcodes */
 #define BNA_TXQ_WI_SEND                 (0x402) /* Single Frame Transmission */
@@ -334,11 +322,7 @@ do {									\
 
 #define BNA_CQ_EF_LOCAL         (1 << 20)
 
-/**
- *
- * Data structures
- *
- */
+/* Data structures */
 
 struct bna_reg_offset {
         u32 fn_int_status;
@@ -371,8 +355,7 @@ struct bna_txq_wi_vector {
         struct bna_dma_addr host_addr; /* Tx-Buf DMA addr */
 };
 
-/**
- *  TxQ Entry Structure
+/*  TxQ Entry Structure
  *
  *  BEWARE:  Load values into this structure with correct endianess.
  */
diff --git a/drivers/net/ethernet/brocade/bna/bna_tx_rx.c b/drivers/net/ethernet/brocade/bna/bna_tx_rx.c
index 276fcb589f4..71144b396e0 100644
--- a/drivers/net/ethernet/brocade/bna/bna_tx_rx.c
+++ b/drivers/net/ethernet/brocade/bna/bna_tx_rx.c
@@ -18,9 +18,7 @@
 #include "bna.h"
 #include "bfi.h"
 
-/**
- * IB
- */
+/* IB */
 static void
 bna_ib_coalescing_timeo_set(struct bna_ib *ib, u8 coalescing_timeo)
 {
@@ -29,9 +27,7 @@ bna_ib_coalescing_timeo_set(struct bna_ib *ib, u8 coalescing_timeo)
                                 (u32)ib->coalescing_timeo, 0);
 }
 
-/**
- * RXF
- */
+/* RXF */
 
 #define bna_rxf_vlan_cfg_soft_reset(rxf)                                \
 do {                                                                    \
@@ -1312,9 +1308,7 @@ bna_rxf_vlan_strip_cfg_apply(struct bna_rxf *rxf)
         return 0;
 }
 
-/**
- * RX
- */
+/* RX */
 
 #define BNA_GET_RXQS(qcfg)      (((qcfg)->rxp_type == BNA_RXP_SINGLE) ? \
         (qcfg)->num_paths : ((qcfg)->num_paths * 2))
@@ -2791,9 +2785,8 @@ const u32 bna_napi_dim_vector[BNA_LOAD_T_MAX][BNA_BIAS_T_MAX] = {
         {1, 2},
 };
 
-/**
- * TX
- */
+/* TX */
+
 #define call_tx_stop_cbfn(tx)                                           \
 do {                                                                    \
         if ((tx)->stop_cbfn) {                                          \
diff --git a/drivers/net/ethernet/brocade/bna/bna_types.h b/drivers/net/ethernet/brocade/bna/bna_types.h
index e8d3ab7ea6c..d3eb8bddfb2 100644
--- a/drivers/net/ethernet/brocade/bna/bna_types.h
+++ b/drivers/net/ethernet/brocade/bna/bna_types.h
@@ -23,11 +23,7 @@
 #include "bfa_cee.h"
 #include "bfa_msgq.h"
 
-/**
- *
- * Forward declarations
- *
- */
+/* Forward declarations */
 
 struct bna_mcam_handle;
 struct bna_txq;
@@ -40,11 +36,7 @@ struct bna_enet;
 struct bna;
 struct bnad;
 
-/**
- *
- * Enums, primitive data types
- *
- */
+/* Enums, primitive data types */
 
 enum bna_status {
         BNA_STATUS_T_DISABLED   = 0,
@@ -331,11 +323,7 @@ struct bna_attr {
         int                     max_rit_size;
 };
 
-/**
- *
- * IOCEth
- *
- */
+/* IOCEth */
 
 struct bna_ioceth {
         bfa_fsm_t               fsm;
@@ -351,11 +339,7 @@ struct bna_ioceth {
         struct bna *bna;
 };
 
-/**
- *
- * Enet
- *
- */
+/* Enet */
 
 /* Pause configuration */
 struct bna_pause_config {
@@ -390,11 +374,7 @@ struct bna_enet {
         struct bna *bna;
 };
 
-/**
- *
- * Ethport
- *
- */
+/* Ethport */
 
 struct bna_ethport {
         bfa_fsm_t               fsm;
@@ -419,11 +399,7 @@ struct bna_ethport {
         struct bna *bna;
 };
 
-/**
- *
- * Interrupt Block
- *
- */
+/* Interrupt Block */
 
 /* Doorbell structure */
 struct bna_ib_dbell {
@@ -447,11 +423,7 @@ struct bna_ib {
         int                     interpkt_timeo;
 };
 
-/**
- *
- * Tx object
- *
- */
+/* Tx object */
 
 /* Tx datapath control structure */
 #define BNA_Q_NAME_SIZE         16
@@ -585,11 +557,7 @@ struct bna_tx_mod {
         struct bna *bna;
 };
 
-/**
- *
- * Rx object
- *
- */
+/* Rx object */
 
 /* Rx datapath control structure */
 struct bna_rcb {
@@ -898,11 +866,7 @@ struct bna_rx_mod {
         u32             rid_mask;
 };
 
-/**
- *
- * CAM
- *
- */
+/* CAM */
 
 struct bna_ucam_mod {
         struct bna_mac *ucmac;          /* BFI_MAX_UCMAC entries */
@@ -927,11 +891,7 @@ struct bna_mcam_mod {
         struct bna *bna;
 };
 
-/**
- *
- * Statistics
- *
- */
+/* Statistics */
 
 struct bna_stats {
         struct bna_dma_addr     hw_stats_dma;
@@ -949,11 +909,7 @@ struct bna_stats_mod {
         struct bfi_enet_stats_req stats_clr;
 };
 
-/**
- *
- * BNA
- *
- */
+/* BNA */
 
 struct bna {
         struct bna_ident ident;
diff --git a/drivers/net/ethernet/brocade/bna/bnad.c b/drivers/net/ethernet/brocade/bna/bnad.c
index 67cd2ed0306..b441f33258e 100644
--- a/drivers/net/ethernet/brocade/bna/bnad.c
+++ b/drivers/net/ethernet/brocade/bna/bnad.c
@@ -1302,8 +1302,7 @@ bnad_txrx_irq_alloc(struct bnad *bnad, enum bnad_intr_source src,
         return 0;
 }
 
-/**
- * NOTE: Should be called for MSIX only
+/* NOTE: Should be called for MSIX only
  * Unregisters Tx MSIX vector(s) from the kernel
  */
 static void
@@ -1322,8 +1321,7 @@ bnad_tx_msix_unregister(struct bnad *bnad, struct bnad_tx_info *tx_info,
         }
 }
 
-/**
- * NOTE: Should be called for MSIX only
+/* NOTE: Should be called for MSIX only
  * Registers Tx MSIX vector(s) and ISR(s), cookie with the kernel
  */
 static int
@@ -1354,8 +1352,7 @@ err_return:
         return -1;
 }
 
-/**
- * NOTE: Should be called for MSIX only
+/* NOTE: Should be called for MSIX only
  * Unregisters Rx MSIX vector(s) from the kernel
  */
 static void
@@ -1375,8 +1372,7 @@ bnad_rx_msix_unregister(struct bnad *bnad, struct bnad_rx_info *rx_info,
         }
 }
 
-/**
- * NOTE: Should be called for MSIX only
+/* NOTE: Should be called for MSIX only
  * Registers Tx MSIX vector(s) and ISR(s), cookie with the kernel
  */
 static int
diff --git a/drivers/net/ethernet/brocade/bna/bnad.h b/drivers/net/ethernet/brocade/bna/bnad.h
index 72742be1127..d7833922475 100644
--- a/drivers/net/ethernet/brocade/bna/bnad.h
+++ b/drivers/net/ethernet/brocade/bna/bnad.h
@@ -389,9 +389,7 @@ extern void bnad_netdev_hwstats_fill(struct bnad *bnad,
 void    bnad_debugfs_init(struct bnad *bnad);
 void    bnad_debugfs_uninit(struct bnad *bnad);
 
-/**
- * MACROS
- */
+/* MACROS */
 /* To set & get the stats counters */
 #define BNAD_UPDATE_CTR(_bnad, _ctr)                            \
                                 (((_bnad)->stats.drv_stats._ctr)++)
diff --git a/drivers/net/ethernet/brocade/bna/cna_fwimg.c b/drivers/net/ethernet/brocade/bna/cna_fwimg.c
index cfc22a64157..6a68e8d9330 100644
--- a/drivers/net/ethernet/brocade/bna/cna_fwimg.c
+++ b/drivers/net/ethernet/brocade/bna/cna_fwimg.c
@@ -67,10 +67,10 @@ bfa_cb_image_get_chunk(enum bfi_asic_gen asic_gen, u32 off)
 {
         switch (asic_gen) {
         case BFI_ASIC_GEN_CT:
-                return (u32 *)(bfi_image_ct_cna + off);
+                return (bfi_image_ct_cna + off);
                 break;
         case BFI_ASIC_GEN_CT2:
-                return (u32 *)(bfi_image_ct2_cna + off);
+                return (bfi_image_ct2_cna + off);
                 break;
         default:
                 return NULL;
diff --git a/drivers/net/ethernet/cadence/macb.c b/drivers/net/ethernet/cadence/macb.c
index 1466bc4e3dd..033064b7b57 100644
--- a/drivers/net/ethernet/cadence/macb.c
+++ b/drivers/net/ethernet/cadence/macb.c
@@ -179,13 +179,16 @@ static void macb_handle_link_change(struct net_device *dev)
         spin_unlock_irqrestore(&bp->lock, flags);
 
         if (status_change) {
-                if (phydev->link)
+                if (phydev->link) {
+                        netif_carrier_on(dev);
                         netdev_info(dev, "link up (%d/%s)\n",
                                     phydev->speed,
                                     phydev->duplex == DUPLEX_FULL ?
                                     "Full" : "Half");
-                else
+                } else {
+                        netif_carrier_off(dev);
                         netdev_info(dev, "link down\n");
+                }
         }
 }
 
@@ -1033,6 +1036,9 @@ static int macb_open(struct net_device *dev)
 
         netdev_dbg(bp->dev, "open\n");
 
+        /* carrier starts down */
+        netif_carrier_off(dev);
+
         /* if the phy is not yet register, retry later*/
         if (!bp->phy_dev)
                 return -EAGAIN;
@@ -1406,6 +1412,8 @@ static int __init macb_probe(struct platform_device *pdev)
 
         platform_set_drvdata(pdev, dev);
 
+        netif_carrier_off(dev);
+
         netdev_info(dev, "Cadence %s at 0x%08lx irq %d (%pM)\n",
                     macb_is_gem(bp) ? "GEM" : "MACB", dev->base_addr,
                     dev->irq, dev->dev_addr);
@@ -1469,6 +1477,7 @@ static int macb_suspend(struct platform_device *pdev, pm_message_t state)
         struct net_device *netdev = platform_get_drvdata(pdev);
         struct macb *bp = netdev_priv(netdev);
 
+        netif_carrier_off(netdev);
         netif_device_detach(netdev);
 
         clk_disable(bp->hclk);
diff --git a/drivers/net/ethernet/calxeda/xgmac.c b/drivers/net/ethernet/calxeda/xgmac.c
index 11f667f6131..2b4b4f529ab 100644
--- a/drivers/net/ethernet/calxeda/xgmac.c
+++ b/drivers/net/ethernet/calxeda/xgmac.c
@@ -264,7 +264,7 @@
 #define XGMAC_OMR_FEF           0x00000080      /* Forward Error Frames */
 #define XGMAC_OMR_DT            0x00000040      /* Drop TCP/IP csum Errors */
 #define XGMAC_OMR_RSF           0x00000020      /* RX FIFO Store and Forward */
-#define XGMAC_OMR_RTC           0x00000010      /* RX Threshhold Ctrl */
+#define XGMAC_OMR_RTC_256       0x00000018      /* RX Threshhold Ctrl */
 #define XGMAC_OMR_RTC_MASK      0x00000018      /* RX Threshhold Ctrl MASK */
 
 /* XGMAC HW Features Register */
@@ -671,26 +671,23 @@ static void xgmac_rx_refill(struct xgmac_priv *priv)
 
                 p = priv->dma_rx + entry;
 
-                if (priv->rx_skbuff[entry] != NULL)
-                        continue;
-
-                skb = __skb_dequeue(&priv->rx_recycle);
-                if (skb == NULL)
-                        skb = netdev_alloc_skb(priv->dev, priv->dma_buf_sz);
-                if (unlikely(skb == NULL))
-                        break;
-
-                priv->rx_skbuff[entry] = skb;
-                paddr = dma_map_single(priv->device, skb->data,
-                                         priv->dma_buf_sz, DMA_FROM_DEVICE);
-                desc_set_buf_addr(p, paddr, priv->dma_buf_sz);
+                if (priv->rx_skbuff[entry] == NULL) {
+                        skb = __skb_dequeue(&priv->rx_recycle);
+                        if (skb == NULL)
+                                skb = netdev_alloc_skb(priv->dev, priv->dma_buf_sz);
+                        if (unlikely(skb == NULL))
+                                break;
+
+                        priv->rx_skbuff[entry] = skb;
+                        paddr = dma_map_single(priv->device, skb->data,
+                                               priv->dma_buf_sz, DMA_FROM_DEVICE);
+                        desc_set_buf_addr(p, paddr, priv->dma_buf_sz);
+                }
 
                 netdev_dbg(priv->dev, "rx ring: head %d, tail %d\n",
                         priv->rx_head, priv->rx_tail);
 
                 priv->rx_head = dma_ring_incr(priv->rx_head, DMA_RX_RING_SZ);
-                /* Ensure descriptor is in memory before handing to h/w */
-                wmb();
                 desc_set_rx_owner(p);
         }
 }
@@ -933,6 +930,7 @@ static void xgmac_tx_err(struct xgmac_priv *priv)
         desc_init_tx_desc(priv->dma_tx, DMA_TX_RING_SZ);
         priv->tx_tail = 0;
         priv->tx_head = 0;
+        writel(priv->dma_tx_phy, priv->base + XGMAC_DMA_TX_BASE_ADDR);
         writel(reg | DMA_CONTROL_ST, priv->base + XGMAC_DMA_CONTROL);
 
         writel(DMA_STATUS_TU | DMA_STATUS_TPS | DMA_STATUS_NIS | DMA_STATUS_AIS,
@@ -972,7 +970,7 @@ static int xgmac_hw_init(struct net_device *dev)
         writel(DMA_INTR_DEFAULT_MASK, ioaddr + XGMAC_DMA_INTR_ENA);
 
         /* XGMAC requires AXI bus init. This is a 'magic number' for now */
-        writel(0x000100E, ioaddr + XGMAC_DMA_AXI_BUS);
+        writel(0x0077000E, ioaddr + XGMAC_DMA_AXI_BUS);
 
         ctrl |= XGMAC_CONTROL_DDIC | XGMAC_CONTROL_JE | XGMAC_CONTROL_ACS |
                 XGMAC_CONTROL_CAR;
@@ -984,7 +982,8 @@ static int xgmac_hw_init(struct net_device *dev)
         writel(value, ioaddr + XGMAC_DMA_CONTROL);
 
         /* Set the HW DMA mode and the COE */
-        writel(XGMAC_OMR_TSF | XGMAC_OMR_RSF | XGMAC_OMR_RFD | XGMAC_OMR_RFA,
+        writel(XGMAC_OMR_TSF | XGMAC_OMR_RFD | XGMAC_OMR_RFA |
+                XGMAC_OMR_RTC_256,
                 ioaddr + XGMAC_OMR);
 
         /* Reset the MMC counters */
diff --git a/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c b/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c
index abb6ce7c1b7..9b0874957df 100644
--- a/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c
+++ b/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c
@@ -3050,7 +3050,7 @@ static struct pci_error_handlers t3_err_handler = {
 static void set_nqsets(struct adapter *adap)
 {
         int i, j = 0;
-        int num_cpus = num_online_cpus();
+        int num_cpus = netif_get_num_default_rss_queues();
         int hwports = adap->params.nports;
         int nqsets = adap->msix_nvectors - 1;
 
diff --git a/drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c b/drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c
index 65e4b280619..2dbbcbb450d 100644
--- a/drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c
+++ b/drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c
@@ -62,7 +62,9 @@ static const unsigned int MAX_ATIDS = 64 * 1024;
 static const unsigned int ATID_BASE = 0x10000;
 
 static void cxgb_neigh_update(struct neighbour *neigh);
-static void cxgb_redirect(struct dst_entry *old, struct dst_entry *new);
+static void cxgb_redirect(struct dst_entry *old, struct neighbour *old_neigh,
+                          struct dst_entry *new, struct neighbour *new_neigh,
+                          const void *daddr);
 
 static inline int offload_activated(struct t3cdev *tdev)
 {
@@ -575,7 +577,7 @@ static void t3_process_tid_release_list(struct work_struct *work)
                 if (!skb) {
                         spin_lock_bh(&td->tid_release_lock);
                         p->ctx = (void *)td->tid_release_list;
-                        td->tid_release_list = (struct t3c_tid_entry *)p;
+                        td->tid_release_list = p;
                         break;
                 }
                 mk_tid_release(skb, p - td->tid_maps.tid_tab);
@@ -968,8 +970,10 @@ static int nb_callback(struct notifier_block *self, unsigned long event,
         }
         case (NETEVENT_REDIRECT):{
                 struct netevent_redirect *nr = ctx;
-                cxgb_redirect(nr->old, nr->new);
-                cxgb_neigh_update(dst_get_neighbour_noref(nr->new));
+                cxgb_redirect(nr->old, nr->old_neigh,
+                              nr->new, nr->new_neigh,
+                              nr->daddr);
+                cxgb_neigh_update(nr->new_neigh);
                 break;
         }
         default:
@@ -1107,10 +1111,11 @@ static void set_l2t_ix(struct t3cdev *tdev, u32 tid, struct l2t_entry *e)
         tdev->send(tdev, skb);
 }
 
-static void cxgb_redirect(struct dst_entry *old, struct dst_entry *new)
+static void cxgb_redirect(struct dst_entry *old, struct neighbour *old_neigh,
+                          struct dst_entry *new, struct neighbour *new_neigh,
+                          const void *daddr)
 {
         struct net_device *olddev, *newdev;
-        struct neighbour *n;
         struct tid_info *ti;
         struct t3cdev *tdev;
         u32 tid;
@@ -1118,15 +1123,8 @@ static void cxgb_redirect(struct dst_entry *old, struct dst_entry *new)
         struct l2t_entry *e;
         struct t3c_tid_entry *te;
 
-        n = dst_get_neighbour_noref(old);
-        if (!n)
-                return;
-        olddev = n->dev;
-
-        n = dst_get_neighbour_noref(new);
-        if (!n)
-                return;
-        newdev = n->dev;
+        olddev = old_neigh->dev;
+        newdev = new_neigh->dev;
 
         if (!is_offloading(olddev))
                 return;
@@ -1144,7 +1142,7 @@ static void cxgb_redirect(struct dst_entry *old, struct dst_entry *new)
         }
 
         /* Add new L2T entry */
-        e = t3_l2t_get(tdev, new, newdev);
+        e = t3_l2t_get(tdev, new, newdev, daddr);
         if (!e) {
                 printk(KERN_ERR "%s: couldn't allocate new l2t entry!\n",
                        __func__);
diff --git a/drivers/net/ethernet/chelsio/cxgb3/l2t.c b/drivers/net/ethernet/chelsio/cxgb3/l2t.c
index 3fa3c8833ed..8d53438638b 100644
--- a/drivers/net/ethernet/chelsio/cxgb3/l2t.c
+++ b/drivers/net/ethernet/chelsio/cxgb3/l2t.c
@@ -299,7 +299,7 @@ static inline void reuse_entry(struct l2t_entry *e, struct neighbour *neigh)
 }
 
 struct l2t_entry *t3_l2t_get(struct t3cdev *cdev, struct dst_entry *dst,
-                             struct net_device *dev)
+                             struct net_device *dev, const void *daddr)
 {
         struct l2t_entry *e = NULL;
         struct neighbour *neigh;
@@ -311,7 +311,7 @@ struct l2t_entry *t3_l2t_get(struct t3cdev *cdev, struct dst_entry *dst,
         int smt_idx;
 
         rcu_read_lock();
-        neigh = dst_get_neighbour_noref(dst);
+        neigh = dst_neigh_lookup(dst, daddr);
         if (!neigh)
                 goto done_rcu;
 
@@ -360,6 +360,8 @@ struct l2t_entry *t3_l2t_get(struct t3cdev *cdev, struct dst_entry *dst,
 done_unlock:
         write_unlock_bh(&d->lock);
 done_rcu:
+        if (neigh)
+                neigh_release(neigh);
         rcu_read_unlock();
         return e;
 }
diff --git a/drivers/net/ethernet/chelsio/cxgb3/l2t.h b/drivers/net/ethernet/chelsio/cxgb3/l2t.h
index c4e86436975..8cffcdfd567 100644
--- a/drivers/net/ethernet/chelsio/cxgb3/l2t.h
+++ b/drivers/net/ethernet/chelsio/cxgb3/l2t.h
@@ -110,7 +110,7 @@ static inline void set_arp_failure_handler(struct sk_buff *skb,
 void t3_l2e_free(struct l2t_data *d, struct l2t_entry *e);
 void t3_l2t_update(struct t3cdev *dev, struct neighbour *neigh);
 struct l2t_entry *t3_l2t_get(struct t3cdev *cdev, struct dst_entry *dst,
-                             struct net_device *dev);
+                             struct net_device *dev, const void *daddr);
 int t3_l2t_send_slow(struct t3cdev *dev, struct sk_buff *skb,
                      struct l2t_entry *e);
 void t3_l2t_send_event(struct t3cdev *dev, struct l2t_entry *e);
diff --git a/drivers/net/ethernet/chelsio/cxgb3/sge.c b/drivers/net/ethernet/chelsio/cxgb3/sge.c
index cfb60e1f51d..dd901c5061b 100644
--- a/drivers/net/ethernet/chelsio/cxgb3/sge.c
+++ b/drivers/net/ethernet/chelsio/cxgb3/sge.c
@@ -2877,7 +2877,7 @@ static void sge_timer_tx(unsigned long data)
         mod_timer(&qs->tx_reclaim_timer, jiffies + next_period);
 }
 
-/*
+/**
  *      sge_timer_rx - perform periodic maintenance of an SGE qset
  *      @data: the SGE queue set to maintain
  *
diff --git a/drivers/net/ethernet/chelsio/cxgb3/t3_hw.c b/drivers/net/ethernet/chelsio/cxgb3/t3_hw.c
index 44ac2f40b64..bff8a3cdd3d 100644
--- a/drivers/net/ethernet/chelsio/cxgb3/t3_hw.c
+++ b/drivers/net/ethernet/chelsio/cxgb3/t3_hw.c
@@ -1076,7 +1076,7 @@ static int t3_flash_erase_sectors(struct adapter *adapter, int start, int end)
         return 0;
 }
 
-/*
+/**
  *      t3_load_fw - download firmware
  *      @adapter: the adapter
  *      @fw_data: the firmware image to write
diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
index e1f96fbb48c..5ed49af23d6 100644
--- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
+++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
@@ -3493,8 +3493,8 @@ static void __devinit cfg_queues(struct adapter *adap)
          */
         if (n10g)
                 q10g = (MAX_ETH_QSETS - (adap->params.nports - n10g)) / n10g;
-        if (q10g > num_online_cpus())
-                q10g = num_online_cpus();
+        if (q10g > netif_get_num_default_rss_queues())
+                q10g = netif_get_num_default_rss_queues();
 
         for_each_port(adap, i) {
                 struct port_info *pi = adap2pinfo(adap, i);
diff --git a/drivers/net/ethernet/chelsio/cxgb4/sge.c b/drivers/net/ethernet/chelsio/cxgb4/sge.c
index e111d974afd..8596acaa402 100644
--- a/drivers/net/ethernet/chelsio/cxgb4/sge.c
+++ b/drivers/net/ethernet/chelsio/cxgb4/sge.c
@@ -753,7 +753,7 @@ static void write_sgl(const struct sk_buff *skb, struct sge_txq *q,
                 end = (void *)q->desc + part1;
         }
         if ((uintptr_t)end & 8)           /* 0-pad to multiple of 16 */
-                *(u64 *)end = 0;
+                *end = 0;
 }
 
 /**
diff --git a/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c b/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c
index 32e1dd566a1..fa947dfa4c3 100644
--- a/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c
+++ b/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c
@@ -2010,7 +2010,7 @@ int t4_fwaddrspace_write(struct adapter *adap, unsigned int mbox,
         return t4_wr_mbox(adap, mbox, &c, sizeof(c), NULL);
 }
 
-/*
+/**
  *     t4_mem_win_read_len - read memory through PCIE memory window
  *     @adap: the adapter
  *     @addr: address of first byte requested aligned on 32b.
diff --git a/drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c b/drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c
index 25e3308fc9d..9dad56101e2 100644
--- a/drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c
+++ b/drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c
@@ -418,7 +418,7 @@ static int fwevtq_handler(struct sge_rspq *rspq, const __be64 *rsp,
                  * restart a TX Ethernet Queue which was stopped for lack of
                  * free TX Queue Descriptors ...
                  */
-                const struct cpl_sge_egr_update *p = (void *)cpl;
+                const struct cpl_sge_egr_update *p = cpl;
                 unsigned int qid = EGR_QID(be32_to_cpu(p->opcode_qid));
                 struct sge *s = &adapter->sge;
                 struct sge_txq *tq;
diff --git a/drivers/net/ethernet/chelsio/cxgb4vf/sge.c b/drivers/net/ethernet/chelsio/cxgb4vf/sge.c
index 0bd585bba39..f2d1ecdcaf9 100644
--- a/drivers/net/ethernet/chelsio/cxgb4vf/sge.c
+++ b/drivers/net/ethernet/chelsio/cxgb4vf/sge.c
@@ -934,7 +934,7 @@ static void write_sgl(const struct sk_buff *skb, struct sge_txq *tq,
                 end = (void *)tq->desc + part1;
         }
         if ((uintptr_t)end & 8)           /* 0-pad to multiple of 16 */
-                *(u64 *)end = 0;
+                *end = 0;
 }
 
 /**
@@ -1323,8 +1323,7 @@ int t4vf_eth_xmit(struct sk_buff *skb, struct net_device *dev)
                  */
                 if (unlikely((void *)sgl == (void *)tq->stat)) {
                         sgl = (void *)tq->desc;
-                        end = (void *)((void *)tq->desc +
-                                       ((void *)end - (void *)tq->stat));
+                        end = ((void *)tq->desc + ((void *)end - (void *)tq->stat));
                 }
 
                 write_sgl(skb, tq, sgl, end, 0, addr);
diff --git a/drivers/net/ethernet/cisco/enic/enic_main.c b/drivers/net/ethernet/cisco/enic/enic_main.c
index 8132c785cea..ad1468b3ab9 100644
--- a/drivers/net/ethernet/cisco/enic/enic_main.c
+++ b/drivers/net/ethernet/cisco/enic/enic_main.c
@@ -1300,8 +1300,6 @@ static void enic_rq_indicate_buf(struct vnic_rq *rq,
                         skb->ip_summed = CHECKSUM_COMPLETE;
                 }
 
-                skb->dev = netdev;
-
                 if (vlan_stripped)
                         __vlan_hwaccel_put_tag(skb, vlan_tci);
 
diff --git a/drivers/net/ethernet/dec/tulip/de4x5.c b/drivers/net/ethernet/dec/tulip/de4x5.c
index d3cd489d11a..f879e922484 100644
--- a/drivers/net/ethernet/dec/tulip/de4x5.c
+++ b/drivers/net/ethernet/dec/tulip/de4x5.c
@@ -3973,7 +3973,7 @@ DevicePresent(struct net_device *dev, u_long aprom_addr)
             tmp = srom_rd(aprom_addr, i);
             *p++ = cpu_to_le16(tmp);
         }
-        de4x5_dbg_srom((struct de4x5_srom *)&lp->srom);
+        de4x5_dbg_srom(&lp->srom);
     }
 }
 
diff --git a/drivers/net/ethernet/emulex/benet/be.h b/drivers/net/ethernet/emulex/benet/be.h
index c5c4c0e83bd..0490a04ca0b 100644
--- a/drivers/net/ethernet/emulex/benet/be.h
+++ b/drivers/net/ethernet/emulex/benet/be.h
@@ -34,7 +34,7 @@
 #include "be_hw.h"
 #include "be_roce.h"
 
-#define DRV_VER                 "4.2.220u"
+#define DRV_VER                 "4.2.248.0u"
 #define DRV_NAME                "be2net"
 #define BE_NAME                 "ServerEngines BladeEngine2 10Gbps NIC"
 #define BE3_NAME                "ServerEngines BladeEngine3 10Gbps NIC"
@@ -573,6 +573,11 @@ static inline u8 is_udp_pkt(struct sk_buff *skb)
         return val;
 }
 
+static inline bool is_ipv4_pkt(struct sk_buff *skb)
+{
+        return skb->protocol == htons(ETH_P_IP) && ip_hdr(skb)->version == 4;
+}
+
 static inline void be_vf_eth_addr_generate(struct be_adapter *adapter, u8 *mac)
 {
         u32 addr;
diff --git a/drivers/net/ethernet/emulex/benet/be_cmds.c b/drivers/net/ethernet/emulex/benet/be_cmds.c
index 921c2082af4..5eab791b716 100644
--- a/drivers/net/ethernet/emulex/benet/be_cmds.c
+++ b/drivers/net/ethernet/emulex/benet/be_cmds.c
@@ -1132,7 +1132,7 @@ err:
  * Uses MCCQ
  */
 int be_cmd_if_create(struct be_adapter *adapter, u32 cap_flags, u32 en_flags,
-                u8 *mac, u32 *if_handle, u32 *pmac_id, u32 domain)
+                     u32 *if_handle, u32 domain)
 {
         struct be_mcc_wrb *wrb;
         struct be_cmd_req_if_create *req;
@@ -1152,17 +1152,13 @@ int be_cmd_if_create(struct be_adapter *adapter, u32 cap_flags, u32 en_flags,
         req->hdr.domain = domain;
         req->capability_flags = cpu_to_le32(cap_flags);
         req->enable_flags = cpu_to_le32(en_flags);
-        if (mac)
-                memcpy(req->mac_addr, mac, ETH_ALEN);
-        else
-                req->pmac_invalid = true;
+
+        req->pmac_invalid = true;
 
         status = be_mcc_notify_wait(adapter);
         if (!status) {
                 struct be_cmd_resp_if_create *resp = embedded_payload(wrb);
                 *if_handle = le32_to_cpu(resp->interface_id);
-                if (mac)
-                        *pmac_id = le32_to_cpu(resp->pmac_id);
         }
 
 err:
@@ -2330,8 +2326,8 @@ err:
 }
 
 /* Uses synchronous MCCQ */
-int be_cmd_get_mac_from_list(struct be_adapter *adapter, u32 domain,
-                        bool *pmac_id_active, u32 *pmac_id, u8 *mac)
+int be_cmd_get_mac_from_list(struct be_adapter *adapter, u8 *mac,
+                             bool *pmac_id_active, u32 *pmac_id, u8 domain)
 {
         struct be_mcc_wrb *wrb;
         struct be_cmd_req_get_mac_list *req;
@@ -2376,8 +2372,9 @@ int be_cmd_get_mac_from_list(struct be_adapter *adapter, u32 domain,
                                                 get_mac_list_cmd.va;
                 mac_count = resp->true_mac_count + resp->pseudo_mac_count;
                 /* Mac list returned could contain one or more active mac_ids
-                 * or one or more pseudo permanant mac addresses. If an active
-                 * mac_id is present, return first active mac_id found
+                 * or one or more true or pseudo permanant mac addresses.
+                 * If an active mac_id is present, return first active mac_id
+                 * found.
                  */
                 for (i = 0; i < mac_count; i++) {
                         struct get_list_macaddr *mac_entry;
@@ -2396,7 +2393,7 @@ int be_cmd_get_mac_from_list(struct be_adapter *adapter, u32 domain,
                                 goto out;
                         }
                 }
-                /* If no active mac_id found, return first pseudo mac addr */
+                /* If no active mac_id found, return first mac addr */
                 *pmac_id_active = false;
                 memcpy(mac, resp->macaddr_list[0].mac_addr_id.macaddr,
                                                                 ETH_ALEN);
diff --git a/drivers/net/ethernet/emulex/benet/be_cmds.h b/drivers/net/ethernet/emulex/benet/be_cmds.h
index b3f3fc3d132..3c938f55c00 100644
--- a/drivers/net/ethernet/emulex/benet/be_cmds.h
+++ b/drivers/net/ethernet/emulex/benet/be_cmds.h
@@ -1664,8 +1664,7 @@ extern int be_cmd_pmac_add(struct be_adapter *adapter, u8 *mac_addr,
 extern int be_cmd_pmac_del(struct be_adapter *adapter, u32 if_id,
                         int pmac_id, u32 domain);
 extern int be_cmd_if_create(struct be_adapter *adapter, u32 cap_flags,
-                        u32 en_flags, u8 *mac, u32 *if_handle, u32 *pmac_id,
-                        u32 domain);
+                            u32 en_flags, u32 *if_handle, u32 domain);
 extern int be_cmd_if_destroy(struct be_adapter *adapter, int if_handle,
                         u32 domain);
 extern int be_cmd_eq_create(struct be_adapter *adapter,
@@ -1751,8 +1750,9 @@ extern int be_cmd_get_cntl_attributes(struct be_adapter *adapter);
 extern int be_cmd_req_native_mode(struct be_adapter *adapter);
 extern int be_cmd_get_reg_len(struct be_adapter *adapter, u32 *log_size);
 extern void be_cmd_get_regs(struct be_adapter *adapter, u32 buf_len, void *buf);
-extern int be_cmd_get_mac_from_list(struct be_adapter *adapter, u32 domain,
-                                bool *pmac_id_active, u32 *pmac_id, u8 *mac);
+extern int be_cmd_get_mac_from_list(struct be_adapter *adapter, u8 *mac,
+                                    bool *pmac_id_active, u32 *pmac_id,
+                                    u8 domain);
 extern int be_cmd_set_mac_list(struct be_adapter *adapter, u8 *mac_array,
                                                 u8 mac_count, u32 domain);
 extern int be_cmd_set_hsw_config(struct be_adapter *adapter, u16 pvid,
diff --git a/drivers/net/ethernet/emulex/benet/be_hw.h b/drivers/net/ethernet/emulex/benet/be_hw.h
index d9fb0c501fa..7c8a710eac2 100644
--- a/drivers/net/ethernet/emulex/benet/be_hw.h
+++ b/drivers/net/ethernet/emulex/benet/be_hw.h
@@ -58,8 +58,6 @@
 
 #define SLI_PORT_CONTROL_IP_MASK        0x08000000
 
-#define PCICFG_CUST_SCRATCHPAD_CSR      0x1EC
-
 /********* Memory BAR register ************/
 #define PCICFG_MEMBAR_CTRL_INT_CTRL_OFFSET      0xfc
 /* Host Interrupt Enable, if set interrupts are enabled although "PCI Interrupt
diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c
index 501dfa9c88e..2141bd78475 100644
--- a/drivers/net/ethernet/emulex/benet/be_main.c
+++ b/drivers/net/ethernet/emulex/benet/be_main.c
@@ -558,6 +558,7 @@ static inline void wrb_fill(struct be_eth_wrb *wrb, u64 addr, int len)
         wrb->frag_pa_hi = upper_32_bits(addr);
         wrb->frag_pa_lo = addr & 0xFFFFFFFF;
         wrb->frag_len = len & ETH_WRB_FRAG_LEN_MASK;
+        wrb->rsvd0 = 0;
 }
 
 static inline u16 be_get_tx_vlan_tag(struct be_adapter *adapter,
@@ -576,6 +577,11 @@ static inline u16 be_get_tx_vlan_tag(struct be_adapter *adapter,
         return vlan_tag;
 }
 
+static int be_vlan_tag_chk(struct be_adapter *adapter, struct sk_buff *skb)
+{
+        return vlan_tx_tag_present(skb) || adapter->pvid;
+}
+
 static void wrb_fill_hdr(struct be_adapter *adapter, struct be_eth_hdr_wrb *hdr,
                 struct sk_buff *skb, u32 wrb_cnt, u32 len)
 {
@@ -703,33 +709,56 @@ dma_err:
         return 0;
 }
 
+static struct sk_buff *be_insert_vlan_in_pkt(struct be_adapter *adapter,
+                                             struct sk_buff *skb)
+{
+        u16 vlan_tag = 0;
+
+        skb = skb_share_check(skb, GFP_ATOMIC);
+        if (unlikely(!skb))
+                return skb;
+
+        if (vlan_tx_tag_present(skb)) {
+                vlan_tag = be_get_tx_vlan_tag(adapter, skb);
+                __vlan_put_tag(skb, vlan_tag);
+                skb->vlan_tci = 0;
+        }
+
+        return skb;
+}
+
 static netdev_tx_t be_xmit(struct sk_buff *skb,
                         struct net_device *netdev)
 {
         struct be_adapter *adapter = netdev_priv(netdev);
         struct be_tx_obj *txo = &adapter->tx_obj[skb_get_queue_mapping(skb)];
         struct be_queue_info *txq = &txo->q;
+        struct iphdr *ip = NULL;
         u32 wrb_cnt = 0, copied = 0;
-        u32 start = txq->head;
+        u32 start = txq->head, eth_hdr_len;
         bool dummy_wrb, stopped = false;
 
-        /* For vlan tagged pkts, BE
-         * 1) calculates checksum even when CSO is not requested
-         * 2) calculates checksum wrongly for padded pkt less than
-         * 60 bytes long.
-         * As a workaround disable TX vlan offloading in such cases.
+        eth_hdr_len = ntohs(skb->protocol) == ETH_P_8021Q ?
+                VLAN_ETH_HLEN : ETH_HLEN;
+
+        /* HW has a bug which considers padding bytes as legal
+         * and modifies the IPv4 hdr's 'tot_len' field
          */
-        if (unlikely(vlan_tx_tag_present(skb) &&
-                     (skb->ip_summed != CHECKSUM_PARTIAL || skb->len <= 60))) {
-                skb = skb_share_check(skb, GFP_ATOMIC);
-                if (unlikely(!skb))
-                        goto tx_drop;
+        if (skb->len <= 60 && be_vlan_tag_chk(adapter, skb) &&
+                        is_ipv4_pkt(skb)) {
+                ip = (struct iphdr *)ip_hdr(skb);
+                pskb_trim(skb, eth_hdr_len + ntohs(ip->tot_len));
+        }
 
-                skb = __vlan_put_tag(skb, be_get_tx_vlan_tag(adapter, skb));
+        /* HW has a bug wherein it will calculate CSUM for VLAN
+         * pkts even though it is disabled.
+         * Manually insert VLAN in pkt.
+         */
+        if (skb->ip_summed != CHECKSUM_PARTIAL &&
+                        be_vlan_tag_chk(adapter, skb)) {
+                skb = be_insert_vlan_in_pkt(adapter, skb);
                 if (unlikely(!skb))
                         goto tx_drop;
-
-                skb->vlan_tci = 0;
         }
 
         wrb_cnt = wrb_cnt_for_skb(adapter, skb, &dummy_wrb);
@@ -786,19 +815,12 @@ static int be_change_mtu(struct net_device *netdev, int new_mtu)
  * A max of 64 (BE_NUM_VLANS_SUPPORTED) vlans can be configured in BE.
  * If the user configures more, place BE in vlan promiscuous mode.
  */
-static int be_vid_config(struct be_adapter *adapter, bool vf, u32 vf_num)
+static int be_vid_config(struct be_adapter *adapter)
 {
-        struct be_vf_cfg *vf_cfg = &adapter->vf_cfg[vf_num];
-        u16 vtag[BE_NUM_VLANS_SUPPORTED];
-        u16 ntags = 0, i;
+        u16 vids[BE_NUM_VLANS_SUPPORTED];
+        u16 num = 0, i;
         int status = 0;
 
-        if (vf) {
-                vtag[0] = cpu_to_le16(vf_cfg->vlan_tag);
-                status = be_cmd_vlan_config(adapter, vf_cfg->if_handle, vtag,
-                                            1, 1, 0);
-        }
-
         /* No need to further configure vids if in promiscuous mode */
         if (adapter->promiscuous)
                 return 0;
@@ -809,10 +831,10 @@ static int be_vid_config(struct be_adapter *adapter, bool vf, u32 vf_num)
         /* Construct VLAN Table to give to HW */
         for (i = 0; i < VLAN_N_VID; i++)
                 if (adapter->vlan_tag[i])
-                        vtag[ntags++] = cpu_to_le16(i);
+                        vids[num++] = cpu_to_le16(i);
 
         status = be_cmd_vlan_config(adapter, adapter->if_handle,
-                                    vtag, ntags, 1, 0);
+                                    vids, num, 1, 0);
 
         /* Set to VLAN promisc mode as setting VLAN filter failed */
         if (status) {
@@ -841,7 +863,7 @@ static int be_vlan_add_vid(struct net_device *netdev, u16 vid)
 
         adapter->vlan_tag[vid] = 1;
         if (adapter->vlans_added <= (adapter->max_vlans + 1))
-                status = be_vid_config(adapter, false, 0);
+                status = be_vid_config(adapter);
 
         if (!status)
                 adapter->vlans_added++;
@@ -863,7 +885,7 @@ static int be_vlan_rem_vid(struct net_device *netdev, u16 vid)
 
         adapter->vlan_tag[vid] = 0;
         if (adapter->vlans_added <= adapter->max_vlans)
-                status = be_vid_config(adapter, false, 0);
+                status = be_vid_config(adapter);
 
         if (!status)
                 adapter->vlans_added--;
@@ -890,7 +912,7 @@ static void be_set_rx_mode(struct net_device *netdev)
                 be_cmd_rx_filter(adapter, IFF_PROMISC, OFF);
 
                 if (adapter->vlans_added)
-                        be_vid_config(adapter, false, 0);
+                        be_vid_config(adapter);
         }
 
         /* Enable multicast promisc if num configured exceeds what we support */
@@ -1057,13 +1079,16 @@ static int be_find_vfs(struct be_adapter *adapter, int vf_state)
         u16 offset, stride;
 
         pos = pci_find_ext_capability(pdev, PCI_EXT_CAP_ID_SRIOV);
+        if (!pos)
+                return 0;
         pci_read_config_word(pdev, pos + PCI_SRIOV_VF_OFFSET, &offset);
         pci_read_config_word(pdev, pos + PCI_SRIOV_VF_STRIDE, &stride);
 
         dev = pci_get_device(pdev->vendor, PCI_ANY_ID, NULL);
         while (dev) {
                 vf_fn = (pdev->devfn + offset + stride * vfs) & 0xFFFF;
-                if (dev->is_virtfn && dev->devfn == vf_fn) {
+                if (dev->is_virtfn && dev->devfn == vf_fn &&
+                        dev->bus->number == pdev->bus->number) {
                         vfs++;
                         if (dev->dev_flags & PCI_DEV_FLAGS_ASSIGNED)
                                 assigned_vfs++;
@@ -1898,6 +1923,12 @@ static int be_rx_cqs_create(struct be_adapter *adapter)
          */
         adapter->num_rx_qs = (num_irqs(adapter) > 1) ?
                                 num_irqs(adapter) + 1 : 1;
+        if (adapter->num_rx_qs != MAX_RX_QS) {
+                rtnl_lock();
+                netif_set_real_num_rx_queues(adapter->netdev,
+                                             adapter->num_rx_qs);
+                rtnl_unlock();
+        }
 
         adapter->big_page_size = (1 << get_order(rx_frag_size)) * PAGE_SIZE;
         for_all_rx_queues(adapter, rxo, i) {
@@ -2141,12 +2172,14 @@ static void be_msix_disable(struct be_adapter *adapter)
 
 static uint be_num_rss_want(struct be_adapter *adapter)
 {
+        u32 num = 0;
         if ((adapter->function_caps & BE_FUNCTION_CAPS_RSS) &&
              !sriov_want(adapter) && be_physfn(adapter) &&
-             !be_is_mc(adapter))
-                return (adapter->be3_native) ? BE3_MAX_RSS_QS : BE2_MAX_RSS_QS;
-        else
-                return 0;
+             !be_is_mc(adapter)) {
+                num = (adapter->be3_native) ? BE3_MAX_RSS_QS : BE2_MAX_RSS_QS;
+                num = min_t(u32, num, (u32)netif_get_num_default_rss_queues());
+        }
+        return num;
 }
 
 static void be_msix_enable(struct be_adapter *adapter)
@@ -2544,7 +2577,6 @@ static int be_clear(struct be_adapter *adapter)
         be_cmd_fw_clean(adapter);
 
         be_msix_disable(adapter);
-        pci_write_config_dword(adapter->pdev, PCICFG_CUST_SCRATCHPAD_CSR, 0);
         return 0;
 }
 
@@ -2602,8 +2634,8 @@ static int be_vf_setup(struct be_adapter *adapter)
         cap_flags = en_flags = BE_IF_FLAGS_UNTAGGED | BE_IF_FLAGS_BROADCAST |
                                 BE_IF_FLAGS_MULTICAST;
         for_all_vfs(adapter, vf_cfg, vf) {
-                status = be_cmd_if_create(adapter, cap_flags, en_flags, NULL,
-                                          &vf_cfg->if_handle, NULL, vf + 1);
+                status = be_cmd_if_create(adapter, cap_flags, en_flags,
+                                          &vf_cfg->if_handle, vf + 1);
                 if (status)
                         goto err;
         }
@@ -2643,29 +2675,43 @@ static void be_setup_init(struct be_adapter *adapter)
         adapter->phy.forced_port_speed = -1;
 }
 
-static int be_add_mac_from_list(struct be_adapter *adapter, u8 *mac)
+static int be_get_mac_addr(struct be_adapter *adapter, u8 *mac, u32 if_handle,
+                           bool *active_mac, u32 *pmac_id)
 {
-        u32 pmac_id;
-        int status;
-        bool pmac_id_active;
+        int status = 0;
 
-        status = be_cmd_get_mac_from_list(adapter, 0, &pmac_id_active,
-                                                        &pmac_id, mac);
-        if (status != 0)
-                goto do_none;
+        if (!is_zero_ether_addr(adapter->netdev->perm_addr)) {
+                memcpy(mac, adapter->netdev->dev_addr, ETH_ALEN);
+                if (!lancer_chip(adapter) && !be_physfn(adapter))
+                        *active_mac = true;
+                else
+                        *active_mac = false;
 
-        if (pmac_id_active) {
-                status = be_cmd_mac_addr_query(adapter, mac,
-                                MAC_ADDRESS_TYPE_NETWORK,
-                                false, adapter->if_handle, pmac_id);
+                return status;
+        }
 
-                if (!status)
-                        adapter->pmac_id[0] = pmac_id;
+        if (lancer_chip(adapter)) {
+                status = be_cmd_get_mac_from_list(adapter, mac,
+                                                  active_mac, pmac_id, 0);
+                if (*active_mac) {
+                        status = be_cmd_mac_addr_query(adapter, mac,
+                                                       MAC_ADDRESS_TYPE_NETWORK,
+                                                       false, if_handle,
+                                                       *pmac_id);
+                }
+        } else if (be_physfn(adapter)) {
+                /* For BE3, for PF get permanent MAC */
+                status = be_cmd_mac_addr_query(adapter, mac,
+                                               MAC_ADDRESS_TYPE_NETWORK, true,
+                                               0, 0);
+                *active_mac = false;
         } else {
-                status = be_cmd_pmac_add(adapter, mac,
-                                adapter->if_handle, &adapter->pmac_id[0], 0);
+                /* For BE3, for VF get soft MAC assigned by PF*/
+                status = be_cmd_mac_addr_query(adapter, mac,
+                                               MAC_ADDRESS_TYPE_NETWORK, false,
+                                               if_handle, 0);
+                *active_mac = true;
         }
-do_none:
         return status;
 }
 
@@ -2686,12 +2732,12 @@ static int be_get_config(struct be_adapter *adapter)
 
 static int be_setup(struct be_adapter *adapter)
 {
-        struct net_device *netdev = adapter->netdev;
         struct device *dev = &adapter->pdev->dev;
         u32 cap_flags, en_flags;
         u32 tx_fc, rx_fc;
         int status;
         u8 mac[ETH_ALEN];
+        bool active_mac;
 
         be_setup_init(adapter);
 
@@ -2717,14 +2763,6 @@ static int be_setup(struct be_adapter *adapter)
         if (status)
                 goto err;
 
-        memset(mac, 0, ETH_ALEN);
-        status = be_cmd_mac_addr_query(adapter, mac, MAC_ADDRESS_TYPE_NETWORK,
-                        true /*permanent */, 0, 0);
-        if (status)
-                return status;
-        memcpy(adapter->netdev->dev_addr, mac, ETH_ALEN);
-        memcpy(adapter->netdev->perm_addr, mac, ETH_ALEN);
-
         en_flags = BE_IF_FLAGS_UNTAGGED | BE_IF_FLAGS_BROADCAST |
                         BE_IF_FLAGS_MULTICAST | BE_IF_FLAGS_PASS_L3L4_ERRORS;
         cap_flags = en_flags | BE_IF_FLAGS_MCAST_PROMISCUOUS |
@@ -2734,27 +2772,29 @@ static int be_setup(struct be_adapter *adapter)
                 cap_flags |= BE_IF_FLAGS_RSS;
                 en_flags |= BE_IF_FLAGS_RSS;
         }
+
         status = be_cmd_if_create(adapter, cap_flags, en_flags,
-                        netdev->dev_addr, &adapter->if_handle,
-                        &adapter->pmac_id[0], 0);
+                                  &adapter->if_handle, 0);
         if (status != 0)
                 goto err;
 
-         /* The VF's permanent mac queried from card is incorrect.
-          * For BEx: Query the mac configued by the PF using if_handle
-          * For Lancer: Get and use mac_list to obtain mac address.
-          */
-        if (!be_physfn(adapter)) {
-                if (lancer_chip(adapter))
-                        status = be_add_mac_from_list(adapter, mac);
-                else
-                        status = be_cmd_mac_addr_query(adapter, mac,
-                                        MAC_ADDRESS_TYPE_NETWORK, false,
-                                        adapter->if_handle, 0);
-                if (!status) {
-                        memcpy(adapter->netdev->dev_addr, mac, ETH_ALEN);
-                        memcpy(adapter->netdev->perm_addr, mac, ETH_ALEN);
-                }
+        memset(mac, 0, ETH_ALEN);
+        active_mac = false;
+        status = be_get_mac_addr(adapter, mac, adapter->if_handle,
+                                 &active_mac, &adapter->pmac_id[0]);
+        if (status != 0)
+                goto err;
+
+        if (!active_mac) {
+                status = be_cmd_pmac_add(adapter, mac, adapter->if_handle,
+                                         &adapter->pmac_id[0], 0);
+                if (status != 0)
+                        goto err;
+        }
+
+        if (is_zero_ether_addr(adapter->netdev->dev_addr)) {
+                memcpy(adapter->netdev->dev_addr, mac, ETH_ALEN);
+                memcpy(adapter->netdev->perm_addr, mac, ETH_ALEN);
         }
 
         status = be_tx_qs_create(adapter);
@@ -2763,7 +2803,8 @@ static int be_setup(struct be_adapter *adapter)
 
         be_cmd_get_fw_ver(adapter, adapter->fw_ver, NULL);
 
-        be_vid_config(adapter, false, 0);
+        if (adapter->vlans_added)
+                be_vid_config(adapter);
 
         be_set_rx_mode(adapter->netdev);
 
@@ -2773,8 +2814,6 @@ static int be_setup(struct be_adapter *adapter)
                 be_cmd_set_flow_control(adapter, adapter->tx_fc,
                                         adapter->rx_fc);
 
-        pcie_set_readrq(adapter->pdev, 4096);
-
         if (be_physfn(adapter) && num_vfs) {
                 if (adapter->dev_num_vfs)
                         be_vf_setup(adapter);
@@ -2788,8 +2827,6 @@ static int be_setup(struct be_adapter *adapter)
 
         schedule_delayed_work(&adapter->work, msecs_to_jiffies(1000));
         adapter->flags |= BE_FLAGS_WORKER_SCHEDULED;
-
-        pci_write_config_dword(adapter->pdev, PCICFG_CUST_SCRATCHPAD_CSR, 1);
         return 0;
 err:
         be_clear(adapter);
@@ -3727,10 +3764,7 @@ reschedule:
 
 static bool be_reset_required(struct be_adapter *adapter)
 {
-        u32 reg;
-
-        pci_read_config_dword(adapter->pdev, PCICFG_CUST_SCRATCHPAD_CSR, &reg);
-        return reg;
+        return be_find_vfs(adapter, ENABLED) > 0 ? false : true;
 }
 
 static int __devinit be_probe(struct pci_dev *pdev,
@@ -3749,7 +3783,7 @@ static int __devinit be_probe(struct pci_dev *pdev,
                 goto disable_dev;
         pci_set_master(pdev);
 
-        netdev = alloc_etherdev_mq(sizeof(struct be_adapter), MAX_TX_QS);
+        netdev = alloc_etherdev_mqs(sizeof(*adapter), MAX_TX_QS, MAX_RX_QS);
         if (netdev == NULL) {
                 status = -ENOMEM;
                 goto rel_reg;
diff --git a/drivers/net/ethernet/ethoc.c b/drivers/net/ethernet/ethoc.c
index a3816781054..20297881f8e 100644
--- a/drivers/net/ethernet/ethoc.c
+++ b/drivers/net/ethernet/ethoc.c
@@ -902,7 +902,7 @@ static const struct net_device_ops ethoc_netdev_ops = {
 };
 
 /**
- * ethoc_probe() - initialize OpenCores ethernet MAC
+ * ethoc_probe - initialize OpenCores ethernet MAC
  * pdev:        platform device
  */
 static int __devinit ethoc_probe(struct platform_device *pdev)
@@ -1140,7 +1140,7 @@ out:
 }
 
 /**
- * ethoc_remove() - shutdown OpenCores ethernet MAC
+ * ethoc_remove - shutdown OpenCores ethernet MAC
  * @pdev:       platform device
  */
 static int __devexit ethoc_remove(struct platform_device *pdev)
diff --git a/drivers/net/ethernet/freescale/fec.c b/drivers/net/ethernet/freescale/fec.c
index ff7f4c5115a..fffd20528b5 100644
--- a/drivers/net/ethernet/freescale/fec.c
+++ b/drivers/net/ethernet/freescale/fec.c
@@ -49,6 +49,7 @@
 #include <linux/of_gpio.h>
 #include <linux/of_net.h>
 #include <linux/pinctrl/consumer.h>
+#include <linux/regulator/consumer.h>
 
 #include <asm/cacheflush.h>
 
@@ -1388,8 +1389,8 @@ fec_set_mac_address(struct net_device *ndev, void *p)
 }
 
 #ifdef CONFIG_NET_POLL_CONTROLLER
-/*
- * fec_poll_controller: FEC Poll controller function
+/**
+ * fec_poll_controller - FEC Poll controller function
  * @dev: The FEC network adapter
  *
  * Polled functionality used by netconsole and others in non interrupt mode
@@ -1506,18 +1507,25 @@ static int __devinit fec_get_phy_mode_dt(struct platform_device *pdev)
 static void __devinit fec_reset_phy(struct platform_device *pdev)
 {
         int err, phy_reset;
+        int msec = 1;
         struct device_node *np = pdev->dev.of_node;
 
         if (!np)
                 return;
 
+        of_property_read_u32(np, "phy-reset-duration", &msec);
+        /* A sane reset duration should not be longer than 1s */
+        if (msec > 1000)
+                msec = 1;
+
         phy_reset = of_get_named_gpio(np, "phy-reset-gpios", 0);
-        err = gpio_request_one(phy_reset, GPIOF_OUT_INIT_LOW, "phy-reset");
+        err = devm_gpio_request_one(&pdev->dev, phy_reset,
+                                    GPIOF_OUT_INIT_LOW, "phy-reset");
         if (err) {
                 pr_debug("FEC: failed to get gpio phy-reset: %d\n", err);
                 return;
         }
-        msleep(1);
+        msleep(msec);
         gpio_set_value(phy_reset, 1);
 }
 #else /* CONFIG_OF */
@@ -1546,6 +1554,7 @@ fec_probe(struct platform_device *pdev)
         const struct of_device_id *of_id;
         static int dev_id;
         struct pinctrl *pinctrl;
+        struct regulator *reg_phy;
 
         of_id = of_match_device(fec_dt_ids, &pdev->dev);
         if (of_id)
@@ -1593,8 +1602,6 @@ fec_probe(struct platform_device *pdev)
                 fep->phy_interface = ret;
         }
 
-        fec_reset_phy(pdev);
-
         for (i = 0; i < FEC_IRQ_NUM; i++) {
                 irq = platform_get_irq(pdev, i);
                 if (irq < 0) {
@@ -1634,6 +1641,18 @@ fec_probe(struct platform_device *pdev)
         clk_prepare_enable(fep->clk_ahb);
         clk_prepare_enable(fep->clk_ipg);
 
+        reg_phy = devm_regulator_get(&pdev->dev, "phy");
+        if (!IS_ERR(reg_phy)) {
+                ret = regulator_enable(reg_phy);
+                if (ret) {
+                        dev_err(&pdev->dev,
+                                "Failed to enable phy regulator: %d\n", ret);
+                        goto failed_regulator;
+                }
+        }
+
+        fec_reset_phy(pdev);
+
         ret = fec_enet_init(ndev);
         if (ret)
                 goto failed_init;
@@ -1655,6 +1674,7 @@ failed_register:
         fec_enet_mii_remove(fep);
 failed_mii_init:
 failed_init:
+failed_regulator:
         clk_disable_unprepare(fep->clk_ahb);
         clk_disable_unprepare(fep->clk_ipg);
 failed_pin:
diff --git a/drivers/net/ethernet/freescale/fsl_pq_mdio.c b/drivers/net/ethernet/freescale/fsl_pq_mdio.c
index f7f0bf5d037..9527b28d70d 100644
--- a/drivers/net/ethernet/freescale/fsl_pq_mdio.c
+++ b/drivers/net/ethernet/freescale/fsl_pq_mdio.c
@@ -47,6 +47,9 @@
 #include "gianfar.h"
 #include "fsl_pq_mdio.h"
 
+/* Number of microseconds to wait for an MII register to respond */
+#define MII_TIMEOUT     1000
+
 struct fsl_pq_mdio_priv {
         void __iomem *map;
         struct fsl_pq_mdio __iomem *regs;
@@ -64,6 +67,8 @@ struct fsl_pq_mdio_priv {
 int fsl_pq_local_mdio_write(struct fsl_pq_mdio __iomem *regs, int mii_id,
                 int regnum, u16 value)
 {
+        u32 status;
+
         /* Set the PHY address and the register address we want to write */
         out_be32(&regs->miimadd, (mii_id << 8) | regnum);
 
@@ -71,10 +76,10 @@ int fsl_pq_local_mdio_write(struct fsl_pq_mdio __iomem *regs, int mii_id,
         out_be32(&regs->miimcon, value);
 
         /* Wait for the transaction to finish */
-        while (in_be32(&regs->miimind) & MIIMIND_BUSY)
-                cpu_relax();
+        status = spin_event_timeout(!(in_be32(&regs->miimind) & MIIMIND_BUSY),
+                                    MII_TIMEOUT, 0);
 
-        return 0;
+        return status ? 0 : -ETIMEDOUT;
 }
 
 /*
@@ -91,6 +96,7 @@ int fsl_pq_local_mdio_read(struct fsl_pq_mdio __iomem *regs,
                 int mii_id, int regnum)
 {
         u16 value;
+        u32 status;
 
         /* Set the PHY address and the register address we want to read */
         out_be32(&regs->miimadd, (mii_id << 8) | regnum);
@@ -99,9 +105,12 @@ int fsl_pq_local_mdio_read(struct fsl_pq_mdio __iomem *regs,
         out_be32(&regs->miimcom, 0);
         out_be32(&regs->miimcom, MII_READ_COMMAND);
 
-        /* Wait for the transaction to finish */
-        while (in_be32(&regs->miimind) & (MIIMIND_NOTVALID | MIIMIND_BUSY))
-                cpu_relax();
+        /* Wait for the transaction to finish, normally less than 100us */
+        status = spin_event_timeout(!(in_be32(&regs->miimind) &
+                                    (MIIMIND_NOTVALID | MIIMIND_BUSY)),
+                                    MII_TIMEOUT, 0);
+        if (!status)
+                return -ETIMEDOUT;
 
         /* Grab the value of the register from miimstat */
         value = in_be32(&regs->miimstat);
@@ -144,7 +153,7 @@ int fsl_pq_mdio_read(struct mii_bus *bus, int mii_id, int regnum)
 static int fsl_pq_mdio_reset(struct mii_bus *bus)
 {
         struct fsl_pq_mdio __iomem *regs = fsl_pq_mdio_get_regs(bus);
-        int timeout = PHY_INIT_TIMEOUT;
+        u32 status;
 
         mutex_lock(&bus->mdio_lock);
 
@@ -155,12 +164,12 @@ static int fsl_pq_mdio_reset(struct mii_bus *bus)
         out_be32(&regs->miimcfg, MIIMCFG_INIT_VALUE);
 
         /* Wait until the bus is free */
-        while ((in_be32(&regs->miimind) & MIIMIND_BUSY) && timeout--)
-                cpu_relax();
+        status = spin_event_timeout(!(in_be32(&regs->miimind) & MIIMIND_BUSY),
+                                    MII_TIMEOUT, 0);
 
         mutex_unlock(&bus->mdio_lock);
 
-        if (timeout < 0) {
+        if (!status) {
                 printk(KERN_ERR "%s: The MII Bus is stuck!\n",
                                 bus->name);
                 return -EBUSY;
diff --git a/drivers/net/ethernet/freescale/gianfar.c b/drivers/net/ethernet/freescale/gianfar.c
index ab1d80ff079..4605f724668 100644
--- a/drivers/net/ethernet/freescale/gianfar.c
+++ b/drivers/net/ethernet/freescale/gianfar.c
@@ -1,5 +1,4 @@
-/*
- * drivers/net/ethernet/freescale/gianfar.c
+/* drivers/net/ethernet/freescale/gianfar.c
  *
  * Gianfar Ethernet Driver
  * This driver is designed for the non-CPM ethernet controllers
@@ -114,7 +113,7 @@ static void gfar_timeout(struct net_device *dev);
 static int gfar_close(struct net_device *dev);
 struct sk_buff *gfar_new_skb(struct net_device *dev);
 static void gfar_new_rxbdp(struct gfar_priv_rx_q *rx_queue, struct rxbd8 *bdp,
-                struct sk_buff *skb);
+                           struct sk_buff *skb);
 static int gfar_set_mac_address(struct net_device *dev);
 static int gfar_change_mtu(struct net_device *dev, int new_mtu);
 static irqreturn_t gfar_error(int irq, void *dev_id);
@@ -266,8 +265,8 @@ static int gfar_alloc_skb_resources(struct net_device *ndev)
                 tx_queue->tx_bd_dma_base = addr;
                 tx_queue->dev = ndev;
                 /* enet DMA only understands physical addresses */
-                addr    += sizeof(struct txbd8) *tx_queue->tx_ring_size;
-                vaddr   += sizeof(struct txbd8) *tx_queue->tx_ring_size;
+                addr  += sizeof(struct txbd8) * tx_queue->tx_ring_size;
+                vaddr += sizeof(struct txbd8) * tx_queue->tx_ring_size;
         }
 
         /* Start the rx descriptor ring where the tx ring leaves off */
@@ -276,15 +275,16 @@ static int gfar_alloc_skb_resources(struct net_device *ndev)
                 rx_queue->rx_bd_base = vaddr;
                 rx_queue->rx_bd_dma_base = addr;
                 rx_queue->dev = ndev;
-                addr    += sizeof (struct rxbd8) * rx_queue->rx_ring_size;
-                vaddr   += sizeof (struct rxbd8) * rx_queue->rx_ring_size;
+                addr  += sizeof(struct rxbd8) * rx_queue->rx_ring_size;
+                vaddr += sizeof(struct rxbd8) * rx_queue->rx_ring_size;
         }
 
         /* Setup the skbuff rings */
         for (i = 0; i < priv->num_tx_queues; i++) {
                 tx_queue = priv->tx_queue[i];
                 tx_queue->tx_skbuff = kmalloc(sizeof(*tx_queue->tx_skbuff) *
-                                  tx_queue->tx_ring_size, GFP_KERNEL);
+                                              tx_queue->tx_ring_size,
+                                              GFP_KERNEL);
                 if (!tx_queue->tx_skbuff) {
                         netif_err(priv, ifup, ndev,
                                   "Could not allocate tx_skbuff\n");
@@ -298,7 +298,8 @@ static int gfar_alloc_skb_resources(struct net_device *ndev)
         for (i = 0; i < priv->num_rx_queues; i++) {
                 rx_queue = priv->rx_queue[i];
                 rx_queue->rx_skbuff = kmalloc(sizeof(*rx_queue->rx_skbuff) *
-                                  rx_queue->rx_ring_size, GFP_KERNEL);
+                                              rx_queue->rx_ring_size,
+                                              GFP_KERNEL);
 
                 if (!rx_queue->rx_skbuff) {
                         netif_err(priv, ifup, ndev,
@@ -327,15 +328,15 @@ static void gfar_init_tx_rx_base(struct gfar_private *priv)
         int i;
 
         baddr = &regs->tbase0;
-        for(i = 0; i < priv->num_tx_queues; i++) {
+        for (i = 0; i < priv->num_tx_queues; i++) {
                 gfar_write(baddr, priv->tx_queue[i]->tx_bd_dma_base);
-                baddr   += 2;
+                baddr += 2;
         }
 
         baddr = &regs->rbase0;
-        for(i = 0; i < priv->num_rx_queues; i++) {
+        for (i = 0; i < priv->num_rx_queues; i++) {
                 gfar_write(baddr, priv->rx_queue[i]->rx_bd_dma_base);
-                baddr   += 2;
+                baddr += 2;
         }
 }
 
@@ -405,7 +406,8 @@ static void gfar_init_mac(struct net_device *ndev)
         gfar_write(&regs->attreli, attrs);
 
         /* Start with defaults, and add stashing or locking
-         * depending on the approprate variables */
+         * depending on the approprate variables
+         */
         attrs = ATTR_INIT_SETTINGS;
 
         if (priv->bd_stash_en)
@@ -426,16 +428,16 @@ static struct net_device_stats *gfar_get_stats(struct net_device *dev)
         struct gfar_private *priv = netdev_priv(dev);
         unsigned long rx_packets = 0, rx_bytes = 0, rx_dropped = 0;
         unsigned long tx_packets = 0, tx_bytes = 0;
-        int i = 0;
+        int i;
 
         for (i = 0; i < priv->num_rx_queues; i++) {
                 rx_packets += priv->rx_queue[i]->stats.rx_packets;
-                rx_bytes += priv->rx_queue[i]->stats.rx_bytes;
+                rx_bytes   += priv->rx_queue[i]->stats.rx_bytes;
                 rx_dropped += priv->rx_queue[i]->stats.rx_dropped;
         }
 
         dev->stats.rx_packets = rx_packets;
-        dev->stats.rx_bytes = rx_bytes;
+        dev->stats.rx_bytes   = rx_bytes;
         dev->stats.rx_dropped = rx_dropped;
 
         for (i = 0; i < priv->num_tx_queues; i++) {
@@ -443,7 +445,7 @@ static struct net_device_stats *gfar_get_stats(struct net_device *dev)
                 tx_packets += priv->tx_queue[i]->stats.tx_packets;
         }
 
-        dev->stats.tx_bytes = tx_bytes;
+        dev->stats.tx_bytes   = tx_bytes;
         dev->stats.tx_packets = tx_packets;
 
         return &dev->stats;
@@ -468,7 +470,7 @@ static const struct net_device_ops gfar_netdev_ops = {
 
 void lock_rx_qs(struct gfar_private *priv)
 {
-        int i = 0x0;
+        int i;
 
         for (i = 0; i < priv->num_rx_queues; i++)
                 spin_lock(&priv->rx_queue[i]->rxlock);
@@ -476,7 +478,7 @@ void lock_rx_qs(struct gfar_private *priv)
 
 void lock_tx_qs(struct gfar_private *priv)
 {
-        int i = 0x0;
+        int i;
 
         for (i = 0; i < priv->num_tx_queues; i++)
                 spin_lock(&priv->tx_queue[i]->txlock);
@@ -484,7 +486,7 @@ void lock_tx_qs(struct gfar_private *priv)
 
 void unlock_rx_qs(struct gfar_private *priv)
 {
-        int i = 0x0;
+        int i;
 
         for (i = 0; i < priv->num_rx_queues; i++)
                 spin_unlock(&priv->rx_queue[i]->rxlock);
@@ -492,7 +494,7 @@ void unlock_rx_qs(struct gfar_private *priv)
 
 void unlock_tx_qs(struct gfar_private *priv)
 {
-        int i = 0x0;
+        int i;
 
         for (i = 0; i < priv->num_tx_queues; i++)
                 spin_unlock(&priv->tx_queue[i]->txlock);
@@ -508,13 +510,13 @@ static bool gfar_is_vlan_on(struct gfar_private *priv)
 static inline int gfar_uses_fcb(struct gfar_private *priv)
 {
         return gfar_is_vlan_on(priv) ||
-                (priv->ndev->features & NETIF_F_RXCSUM) ||
-                (priv->device_flags & FSL_GIANFAR_DEV_HAS_TIMER);
+               (priv->ndev->features & NETIF_F_RXCSUM) ||
+               (priv->device_flags & FSL_GIANFAR_DEV_HAS_TIMER);
 }
 
 static void free_tx_pointers(struct gfar_private *priv)
 {
-        int i = 0;
+        int i;
 
         for (i = 0; i < priv->num_tx_queues; i++)
                 kfree(priv->tx_queue[i]);
@@ -522,7 +524,7 @@ static void free_tx_pointers(struct gfar_private *priv)
 
 static void free_rx_pointers(struct gfar_private *priv)
 {
-        int i = 0;
+        int i;
 
         for (i = 0; i < priv->num_rx_queues; i++)
                 kfree(priv->rx_queue[i]);
@@ -530,7 +532,7 @@ static void free_rx_pointers(struct gfar_private *priv)
 
 static void unmap_group_regs(struct gfar_private *priv)
 {
-        int i = 0;
+        int i;
 
         for (i = 0; i < MAXGROUPS; i++)
                 if (priv->gfargrp[i].regs)
@@ -539,7 +541,7 @@ static void unmap_group_regs(struct gfar_private *priv)
 
 static void disable_napi(struct gfar_private *priv)
 {
-        int i = 0;
+        int i;
 
         for (i = 0; i < priv->num_grps; i++)
                 napi_disable(&priv->gfargrp[i].napi);
@@ -547,14 +549,14 @@ static void disable_napi(struct gfar_private *priv)
 
 static void enable_napi(struct gfar_private *priv)
 {
-        int i = 0;
+        int i;
 
         for (i = 0; i < priv->num_grps; i++)
                 napi_enable(&priv->gfargrp[i].napi);
 }
 
 static int gfar_parse_group(struct device_node *np,
-                struct gfar_private *priv, const char *model)
+                            struct gfar_private *priv, const char *model)
 {
         u32 *queue_mask;
 
@@ -580,15 +582,13 @@ static int gfar_parse_group(struct device_node *np,
         priv->gfargrp[priv->num_grps].grp_id = priv->num_grps;
         priv->gfargrp[priv->num_grps].priv = priv;
         spin_lock_init(&priv->gfargrp[priv->num_grps].grplock);
-        if(priv->mode == MQ_MG_MODE) {
-                queue_mask = (u32 *)of_get_property(np,
-                                        "fsl,rx-bit-map", NULL);
-                priv->gfargrp[priv->num_grps].rx_bit_map =
-                        queue_mask ?  *queue_mask :(DEFAULT_MAPPING >> priv->num_grps);
-                queue_mask = (u32 *)of_get_property(np,
-                                        "fsl,tx-bit-map", NULL);
-                priv->gfargrp[priv->num_grps].tx_bit_map =
-                        queue_mask ? *queue_mask : (DEFAULT_MAPPING >> priv->num_grps);
+        if (priv->mode == MQ_MG_MODE) {
+                queue_mask = (u32 *)of_get_property(np, "fsl,rx-bit-map", NULL);
+                priv->gfargrp[priv->num_grps].rx_bit_map = queue_mask ?
+                        *queue_mask : (DEFAULT_MAPPING >> priv->num_grps);
+                queue_mask = (u32 *)of_get_property(np, "fsl,tx-bit-map", NULL);
+                priv->gfargrp[priv->num_grps].tx_bit_map = queue_mask ?
+                        *queue_mask : (DEFAULT_MAPPING >> priv->num_grps);
         } else {
                 priv->gfargrp[priv->num_grps].rx_bit_map = 0xFF;
                 priv->gfargrp[priv->num_grps].tx_bit_map = 0xFF;
@@ -652,7 +652,7 @@ static int gfar_of_init(struct platform_device *ofdev, struct net_device **pdev)
         priv->num_rx_queues = num_rx_qs;
         priv->num_grps = 0x0;
 
-        /* Init Rx queue filer rule set linked list*/
+        /* Init Rx queue filer rule set linked list */
         INIT_LIST_HEAD(&priv->rx_list.list);
         priv->rx_list.count = 0;
         mutex_init(&priv->rx_queue_access);
@@ -673,7 +673,7 @@ static int gfar_of_init(struct platform_device *ofdev, struct net_device **pdev)
         } else {
                 priv->mode = SQ_SG_MODE;
                 err = gfar_parse_group(np, priv, model);
-                if(err)
+                if (err)
                         goto err_grp_init;
         }
 
@@ -730,27 +730,27 @@ static int gfar_of_init(struct platform_device *ofdev, struct net_device **pdev)
                 priv->device_flags |= FSL_GIANFAR_DEV_HAS_BUF_STASHING;
 
         mac_addr = of_get_mac_address(np);
+
         if (mac_addr)
                 memcpy(dev->dev_addr, mac_addr, ETH_ALEN);
 
         if (model && !strcasecmp(model, "TSEC"))
-                priv->device_flags =
-                        FSL_GIANFAR_DEV_HAS_GIGABIT |
-                        FSL_GIANFAR_DEV_HAS_COALESCE |
-                        FSL_GIANFAR_DEV_HAS_RMON |
-                        FSL_GIANFAR_DEV_HAS_MULTI_INTR;
+                priv->device_flags = FSL_GIANFAR_DEV_HAS_GIGABIT |
+                                     FSL_GIANFAR_DEV_HAS_COALESCE |
+                                     FSL_GIANFAR_DEV_HAS_RMON |
+                                     FSL_GIANFAR_DEV_HAS_MULTI_INTR;
+
         if (model && !strcasecmp(model, "eTSEC"))
-                priv->device_flags =
-                        FSL_GIANFAR_DEV_HAS_GIGABIT |
-                        FSL_GIANFAR_DEV_HAS_COALESCE |
-                        FSL_GIANFAR_DEV_HAS_RMON |
-                        FSL_GIANFAR_DEV_HAS_MULTI_INTR |
-                        FSL_GIANFAR_DEV_HAS_PADDING |
-                        FSL_GIANFAR_DEV_HAS_CSUM |
-                        FSL_GIANFAR_DEV_HAS_VLAN |
-                        FSL_GIANFAR_DEV_HAS_MAGIC_PACKET |
-                        FSL_GIANFAR_DEV_HAS_EXTENDED_HASH |
-                        FSL_GIANFAR_DEV_HAS_TIMER;
+                priv->device_flags = FSL_GIANFAR_DEV_HAS_GIGABIT |
+                                     FSL_GIANFAR_DEV_HAS_COALESCE |
+                                     FSL_GIANFAR_DEV_HAS_RMON |
+                                     FSL_GIANFAR_DEV_HAS_MULTI_INTR |
+                                     FSL_GIANFAR_DEV_HAS_PADDING |
+                                     FSL_GIANFAR_DEV_HAS_CSUM |
+                                     FSL_GIANFAR_DEV_HAS_VLAN |
+                                     FSL_GIANFAR_DEV_HAS_MAGIC_PACKET |
+                                     FSL_GIANFAR_DEV_HAS_EXTENDED_HASH |
+                                     FSL_GIANFAR_DEV_HAS_TIMER;
 
         ctype = of_get_property(np, "phy-connection-type", NULL);
 
@@ -781,7 +781,7 @@ err_grp_init:
 }
 
 static int gfar_hwtstamp_ioctl(struct net_device *netdev,
-                        struct ifreq *ifr, int cmd)
+                               struct ifreq *ifr, int cmd)
 {
         struct hwtstamp_config config;
         struct gfar_private *priv = netdev_priv(netdev);
@@ -851,6 +851,7 @@ static unsigned int reverse_bitmap(unsigned int bit_map, unsigned int max_qs)
 {
         unsigned int new_bit_map = 0x0;
         int mask = 0x1 << (max_qs - 1), i;
+
         for (i = 0; i < max_qs; i++) {
                 if (bit_map & mask)
                         new_bit_map = new_bit_map + (1 << i);
@@ -936,22 +937,22 @@ static void gfar_detect_errata(struct gfar_private *priv)
 
         /* MPC8313 Rev 2.0 and higher; All MPC837x */
         if ((pvr == 0x80850010 && mod == 0x80b0 && rev >= 0x0020) ||
-                        (pvr == 0x80861010 && (mod & 0xfff9) == 0x80c0))
+            (pvr == 0x80861010 && (mod & 0xfff9) == 0x80c0))
                 priv->errata |= GFAR_ERRATA_74;
 
         /* MPC8313 and MPC837x all rev */
         if ((pvr == 0x80850010 && mod == 0x80b0) ||
-                        (pvr == 0x80861010 && (mod & 0xfff9) == 0x80c0))
+            (pvr == 0x80861010 && (mod & 0xfff9) == 0x80c0))
                 priv->errata |= GFAR_ERRATA_76;
 
         /* MPC8313 and MPC837x all rev */
         if ((pvr == 0x80850010 && mod == 0x80b0) ||
-                        (pvr == 0x80861010 && (mod & 0xfff9) == 0x80c0))
+            (pvr == 0x80861010 && (mod & 0xfff9) == 0x80c0))
                 priv->errata |= GFAR_ERRATA_A002;
 
         /* MPC8313 Rev < 2.0, MPC8548 rev 2.0 */
         if ((pvr == 0x80850010 && mod == 0x80b0 && rev < 0x0020) ||
-                        (pvr == 0x80210020 && mod == 0x8030 && rev == 0x0020))
+            (pvr == 0x80210020 && mod == 0x8030 && rev == 0x0020))
                 priv->errata |= GFAR_ERRATA_12;
 
         if (priv->errata)
@@ -960,7 +961,8 @@ static void gfar_detect_errata(struct gfar_private *priv)
 }
 
 /* Set up the ethernet device structure, private data,
- * and anything else we need before we start */
+ * and anything else we need before we start
+ */
 static int gfar_probe(struct platform_device *ofdev)
 {
         u32 tempval;
@@ -991,8 +993,9 @@ static int gfar_probe(struct platform_device *ofdev)
 
         gfar_detect_errata(priv);
 
-        /* Stop the DMA engine now, in case it was running before */
-        /* (The firmware could have used it, and left it running). */
+        /* Stop the DMA engine now, in case it was running before
+         * (The firmware could have used it, and left it running).
+         */
         gfar_halt(dev);
 
         /* Reset MAC layer */
@@ -1026,13 +1029,14 @@ static int gfar_probe(struct platform_device *ofdev)
 
         /* Register for napi ...We are registering NAPI for each grp */
         for (i = 0; i < priv->num_grps; i++)
-                netif_napi_add(dev, &priv->gfargrp[i].napi, gfar_poll, GFAR_DEV_WEIGHT);
+                netif_napi_add(dev, &priv->gfargrp[i].napi, gfar_poll,
+                               GFAR_DEV_WEIGHT);
 
         if (priv->device_flags & FSL_GIANFAR_DEV_HAS_CSUM) {
                 dev->hw_features = NETIF_F_IP_CSUM | NETIF_F_SG |
-                        NETIF_F_RXCSUM;
+                                   NETIF_F_RXCSUM;
                 dev->features |= NETIF_F_IP_CSUM | NETIF_F_SG |
-                        NETIF_F_RXCSUM | NETIF_F_HIGHDMA;
+                                 NETIF_F_RXCSUM | NETIF_F_HIGHDMA;
         }
 
         if (priv->device_flags & FSL_GIANFAR_DEV_HAS_VLAN) {
@@ -1081,7 +1085,7 @@ static int gfar_probe(struct platform_device *ofdev)
                 priv->padding = 0;
 
         if (dev->features & NETIF_F_IP_CSUM ||
-                        priv->device_flags & FSL_GIANFAR_DEV_HAS_TIMER)
+            priv->device_flags & FSL_GIANFAR_DEV_HAS_TIMER)
                 dev->needed_headroom = GMAC_FCB_LEN;
 
         /* Program the isrg regs only if number of grps > 1 */
@@ -1098,28 +1102,32 @@ static int gfar_probe(struct platform_device *ofdev)
 
         /* Need to reverse the bit maps as  bit_map's MSB is q0
          * but, for_each_set_bit parses from right to left, which
-         * basically reverses the queue numbers */
+         * basically reverses the queue numbers
+         */
         for (i = 0; i< priv->num_grps; i++) {
-                priv->gfargrp[i].tx_bit_map = reverse_bitmap(
-                                priv->gfargrp[i].tx_bit_map, MAX_TX_QS);
-                priv->gfargrp[i].rx_bit_map = reverse_bitmap(
-                                priv->gfargrp[i].rx_bit_map, MAX_RX_QS);
+                priv->gfargrp[i].tx_bit_map =
+                        reverse_bitmap(priv->gfargrp[i].tx_bit_map, MAX_TX_QS);
+                priv->gfargrp[i].rx_bit_map =
+                        reverse_bitmap(priv->gfargrp[i].rx_bit_map, MAX_RX_QS);
         }
 
         /* Calculate RSTAT, TSTAT, RQUEUE and TQUEUE values,
-         * also assign queues to groups */
+         * also assign queues to groups
+         */
         for (grp_idx = 0; grp_idx < priv->num_grps; grp_idx++) {
                 priv->gfargrp[grp_idx].num_rx_queues = 0x0;
+
                 for_each_set_bit(i, &priv->gfargrp[grp_idx].rx_bit_map,
-                                priv->num_rx_queues) {
+                                 priv->num_rx_queues) {
                         priv->gfargrp[grp_idx].num_rx_queues++;
                         priv->rx_queue[i]->grp = &priv->gfargrp[grp_idx];
                         rstat = rstat | (RSTAT_CLEAR_RHALT >> i);
                         rqueue = rqueue | ((RQUEUE_EN0 | RQUEUE_EX0) >> i);
                 }
                 priv->gfargrp[grp_idx].num_tx_queues = 0x0;
+
                 for_each_set_bit(i, &priv->gfargrp[grp_idx].tx_bit_map,
-                                priv->num_tx_queues) {
+                                 priv->num_tx_queues) {
                         priv->gfargrp[grp_idx].num_tx_queues++;
                         priv->tx_queue[i]->grp = &priv->gfargrp[grp_idx];
                         tstat = tstat | (TSTAT_CLEAR_THALT >> i);
@@ -1149,7 +1157,7 @@ static int gfar_probe(struct platform_device *ofdev)
                 priv->rx_queue[i]->rxic = DEFAULT_RXIC;
         }
 
-        /* always enable rx filer*/
+        /* always enable rx filer */
         priv->rx_filer_enable = 1;
         /* Enable most messages by default */
         priv->msg_enable = (NETIF_MSG_IFUP << 1 ) - 1;
@@ -1165,7 +1173,8 @@ static int gfar_probe(struct platform_device *ofdev)
         }
 
         device_init_wakeup(&dev->dev,
-                priv->device_flags & FSL_GIANFAR_DEV_HAS_MAGIC_PACKET);
+                           priv->device_flags &
+                           FSL_GIANFAR_DEV_HAS_MAGIC_PACKET);
 
         /* fill out IRQ number and name fields */
         for (i = 0; i < priv->num_grps; i++) {
@@ -1189,13 +1198,14 @@ static int gfar_probe(struct platform_device *ofdev)
         /* Print out the device info */
         netdev_info(dev, "mac: %pM\n", dev->dev_addr);
 
-        /* Even more device info helps when determining which kernel */
-        /* provided which set of benchmarks. */
+        /* Even more device info helps when determining which kernel
+         * provided which set of benchmarks.
+         */
         netdev_info(dev, "Running with NAPI enabled\n");
         for (i = 0; i < priv->num_rx_queues; i++)
                 netdev_info(dev, "RX BD ring size for Q[%d]: %d\n",
                             i, priv->rx_queue[i]->rx_ring_size);
-        for(i = 0; i < priv->num_tx_queues; i++)
+        for (i = 0; i < priv->num_tx_queues; i++)
                 netdev_info(dev, "TX BD ring size for Q[%d]: %d\n",
                             i, priv->tx_queue[i]->tx_ring_size);
 
@@ -1242,7 +1252,8 @@ static int gfar_suspend(struct device *dev)
         u32 tempval;
 
         int magic_packet = priv->wol_en &&
-                (priv->device_flags & FSL_GIANFAR_DEV_HAS_MAGIC_PACKET);
+                           (priv->device_flags &
+                            FSL_GIANFAR_DEV_HAS_MAGIC_PACKET);
 
         netif_device_detach(ndev);
 
@@ -1294,7 +1305,8 @@ static int gfar_resume(struct device *dev)
         unsigned long flags;
         u32 tempval;
         int magic_packet = priv->wol_en &&
-                (priv->device_flags & FSL_GIANFAR_DEV_HAS_MAGIC_PACKET);
+                           (priv->device_flags &
+                            FSL_GIANFAR_DEV_HAS_MAGIC_PACKET);
 
         if (!netif_running(ndev)) {
                 netif_device_attach(ndev);
@@ -1393,13 +1405,13 @@ static phy_interface_t gfar_get_interface(struct net_device *dev)
         }
 
         if (ecntrl & ECNTRL_REDUCED_MODE) {
-                if (ecntrl & ECNTRL_REDUCED_MII_MODE)
+                if (ecntrl & ECNTRL_REDUCED_MII_MODE) {
                         return PHY_INTERFACE_MODE_RMII;
+                }
                 else {
                         phy_interface_t interface = priv->interface;
 
-                        /*
-                         * This isn't autodetected right now, so it must
+                        /* This isn't autodetected right now, so it must
                          * be set by the device tree or platform code.
                          */
                         if (interface == PHY_INTERFACE_MODE_RGMII_ID)
@@ -1453,8 +1465,7 @@ static int init_phy(struct net_device *dev)
         return 0;
 }
 
-/*
- * Initialize TBI PHY interface for communicating with the
+/* Initialize TBI PHY interface for communicating with the
  * SERDES lynx PHY on the chip.  We communicate with this PHY
  * through the MDIO bus on each controller, treating it as a
  * "normal" PHY at the address found in the TBIPA register.  We assume
@@ -1479,8 +1490,7 @@ static void gfar_configure_serdes(struct net_device *dev)
                 return;
         }
 
-        /*
-         * If the link is already up, we must already be ok, and don't need to
+        /* If the link is already up, we must already be ok, and don't need to
          * configure and reset the TBI<->SerDes link.  Maybe U-Boot configured
          * everything for us?  Resetting it takes the link down and requires
          * several seconds for it to come back.
@@ -1492,18 +1502,19 @@ static void gfar_configure_serdes(struct net_device *dev)
         phy_write(tbiphy, MII_TBICON, TBICON_CLK_SELECT);
 
         phy_write(tbiphy, MII_ADVERTISE,
-                        ADVERTISE_1000XFULL | ADVERTISE_1000XPAUSE |
-                        ADVERTISE_1000XPSE_ASYM);
+                  ADVERTISE_1000XFULL | ADVERTISE_1000XPAUSE |
+                  ADVERTISE_1000XPSE_ASYM);
 
-        phy_write(tbiphy, MII_BMCR, BMCR_ANENABLE |
-                        BMCR_ANRESTART | BMCR_FULLDPLX | BMCR_SPEED1000);
+        phy_write(tbiphy, MII_BMCR,
+                  BMCR_ANENABLE | BMCR_ANRESTART | BMCR_FULLDPLX |
+                  BMCR_SPEED1000);
 }
 
 static void init_registers(struct net_device *dev)
 {
         struct gfar_private *priv = netdev_priv(dev);
         struct gfar __iomem *regs = NULL;
-        int i = 0;
+        int i;
 
         for (i = 0; i < priv->num_grps; i++) {
                 regs = priv->gfargrp[i].regs;
@@ -1554,15 +1565,13 @@ static int __gfar_is_rx_idle(struct gfar_private *priv)
 {
         u32 res;
 
-        /*
-         * Normaly TSEC should not hang on GRS commands, so we should
+        /* Normaly TSEC should not hang on GRS commands, so we should
          * actually wait for IEVENT_GRSC flag.
          */
         if (likely(!gfar_has_errata(priv, GFAR_ERRATA_A002)))
                 return 0;
 
-        /*
-         * Read the eTSEC register at offset 0xD1C. If bits 7-14 are
+        /* Read the eTSEC register at offset 0xD1C. If bits 7-14 are
          * the same as bits 23-30, the eTSEC Rx is assumed to be idle
          * and the Rx can be safely reset.
          */
@@ -1580,7 +1589,7 @@ static void gfar_halt_nodisable(struct net_device *dev)
         struct gfar_private *priv = netdev_priv(dev);
         struct gfar __iomem *regs = NULL;
         u32 tempval;
-        int i = 0;
+        int i;
 
         for (i = 0; i < priv->num_grps; i++) {
                 regs = priv->gfargrp[i].regs;
@@ -1594,8 +1603,8 @@ static void gfar_halt_nodisable(struct net_device *dev)
         regs = priv->gfargrp[0].regs;
         /* Stop the DMA, and wait for it to stop */
         tempval = gfar_read(&regs->dmactrl);
-        if ((tempval & (DMACTRL_GRS | DMACTRL_GTS))
-            != (DMACTRL_GRS | DMACTRL_GTS)) {
+        if ((tempval & (DMACTRL_GRS | DMACTRL_GTS)) !=
+            (DMACTRL_GRS | DMACTRL_GTS)) {
                 int ret;
 
                 tempval |= (DMACTRL_GRS | DMACTRL_GTS);
@@ -1660,7 +1669,7 @@ void stop_gfar(struct net_device *dev)
         } else {
                 for (i = 0; i < priv->num_grps; i++)
                         free_irq(priv->gfargrp[i].interruptTransmit,
-                                        &priv->gfargrp[i]);
+                                 &priv->gfargrp[i]);
         }
 
         free_skb_resources(priv);
@@ -1679,13 +1688,13 @@ static void free_skb_tx_queue(struct gfar_priv_tx_q *tx_queue)
                         continue;
 
                 dma_unmap_single(&priv->ofdev->dev, txbdp->bufPtr,
-                                txbdp->length, DMA_TO_DEVICE);
+                                 txbdp->length, DMA_TO_DEVICE);
                 txbdp->lstatus = 0;
                 for (j = 0; j < skb_shinfo(tx_queue->tx_skbuff[i])->nr_frags;
-                                j++) {
+                     j++) {
                         txbdp++;
                         dma_unmap_page(&priv->ofdev->dev, txbdp->bufPtr,
-                                        txbdp->length, DMA_TO_DEVICE);
+                                       txbdp->length, DMA_TO_DEVICE);
                 }
                 txbdp++;
                 dev_kfree_skb_any(tx_queue->tx_skbuff[i]);
@@ -1705,8 +1714,8 @@ static void free_skb_rx_queue(struct gfar_priv_rx_q *rx_queue)
         for (i = 0; i < rx_queue->rx_ring_size; i++) {
                 if (rx_queue->rx_skbuff[i]) {
                         dma_unmap_single(&priv->ofdev->dev,
-                                        rxbdp->bufPtr, priv->rx_buffer_size,
-                                        DMA_FROM_DEVICE);
+                                         rxbdp->bufPtr, priv->rx_buffer_size,
+                                         DMA_FROM_DEVICE);
                         dev_kfree_skb_any(rx_queue->rx_skbuff[i]);
                         rx_queue->rx_skbuff[i] = NULL;
                 }
@@ -1718,7 +1727,8 @@ static void free_skb_rx_queue(struct gfar_priv_rx_q *rx_queue)
 }
 
 /* If there are any tx skbs or rx skbs still around, free them.
- * Then free tx_skbuff and rx_skbuff */
+ * Then free tx_skbuff and rx_skbuff
+ */
 static void free_skb_resources(struct gfar_private *priv)
 {
         struct gfar_priv_tx_q *tx_queue = NULL;
@@ -1728,24 +1738,25 @@ static void free_skb_resources(struct gfar_private *priv)
         /* Go through all the buffer descriptors and free their data buffers */
         for (i = 0; i < priv->num_tx_queues; i++) {
                 struct netdev_queue *txq;
+
                 tx_queue = priv->tx_queue[i];
                 txq = netdev_get_tx_queue(tx_queue->dev, tx_queue->qindex);
-                if(tx_queue->tx_skbuff)
+                if (tx_queue->tx_skbuff)
                         free_skb_tx_queue(tx_queue);
                 netdev_tx_reset_queue(txq);
         }
 
         for (i = 0; i < priv->num_rx_queues; i++) {
                 rx_queue = priv->rx_queue[i];
-                if(rx_queue->rx_skbuff)
+                if (rx_queue->rx_skbuff)
                         free_skb_rx_queue(rx_queue);
         }
 
         dma_free_coherent(&priv->ofdev->dev,
-                        sizeof(struct txbd8) * priv->total_tx_ring_size +
-                        sizeof(struct rxbd8) * priv->total_rx_ring_size,
-                        priv->tx_queue[0]->tx_bd_base,
-                        priv->tx_queue[0]->tx_bd_dma_base);
+                          sizeof(struct txbd8) * priv->total_tx_ring_size +
+                          sizeof(struct rxbd8) * priv->total_rx_ring_size,
+                          priv->tx_queue[0]->tx_bd_base,
+                          priv->tx_queue[0]->tx_bd_dma_base);
         skb_queue_purge(&priv->rx_recycle);
 }
 
@@ -1784,7 +1795,7 @@ void gfar_start(struct net_device *dev)
 }
 
 void gfar_configure_coalescing(struct gfar_private *priv,
-        unsigned long tx_mask, unsigned long rx_mask)
+                               unsigned long tx_mask, unsigned long rx_mask)
 {
         struct gfar __iomem *regs = priv->gfargrp[0].regs;
         u32 __iomem *baddr;
@@ -1794,11 +1805,11 @@ void gfar_configure_coalescing(struct gfar_private *priv,
          * multiple queues, there's only single reg to program
          */
         gfar_write(&regs->txic, 0);
-        if(likely(priv->tx_queue[0]->txcoalescing))
+        if (likely(priv->tx_queue[0]->txcoalescing))
                 gfar_write(&regs->txic, priv->tx_queue[0]->txic);
 
         gfar_write(&regs->rxic, 0);
-        if(unlikely(priv->rx_queue[0]->rxcoalescing))
+        if (unlikely(priv->rx_queue[0]->rxcoalescing))
                 gfar_write(&regs->rxic, priv->rx_queue[0]->rxic);
 
         if (priv->mode == MQ_MG_MODE) {
@@ -1825,12 +1836,14 @@ static int register_grp_irqs(struct gfar_priv_grp *grp)
         int err;
 
         /* If the device has multiple interrupts, register for
-         * them.  Otherwise, only register for the one */
+         * them.  Otherwise, only register for the one
+         */
         if (priv->device_flags & FSL_GIANFAR_DEV_HAS_MULTI_INTR) {
                 /* Install our interrupt handlers for Error,
-                 * Transmit, and Receive */
-                if ((err = request_irq(grp->interruptError, gfar_error, 0,
-                                grp->int_name_er,grp)) < 0) {
+                 * Transmit, and Receive
+                 */
+                if ((err = request_irq(grp->interruptError, gfar_error,
+                                       0, grp->int_name_er, grp)) < 0) {
                         netif_err(priv, intr, dev, "Can't get IRQ %d\n",
                                   grp->interruptError);
 
@@ -1838,21 +1851,21 @@ static int register_grp_irqs(struct gfar_priv_grp *grp)
                 }
 
                 if ((err = request_irq(grp->interruptTransmit, gfar_transmit,
-                                0, grp->int_name_tx, grp)) < 0) {
+                                       0, grp->int_name_tx, grp)) < 0) {
                         netif_err(priv, intr, dev, "Can't get IRQ %d\n",
                                   grp->interruptTransmit);
                         goto tx_irq_fail;
                 }
 
-                if ((err = request_irq(grp->interruptReceive, gfar_receive, 0,
-                                grp->int_name_rx, grp)) < 0) {
+                if ((err = request_irq(grp->interruptReceive, gfar_receive,
+                                       0, grp->int_name_rx, grp)) < 0) {
                         netif_err(priv, intr, dev, "Can't get IRQ %d\n",
                                   grp->interruptReceive);
                         goto rx_irq_fail;
                 }
         } else {
-                if ((err = request_irq(grp->interruptTransmit, gfar_interrupt, 0,
-                                grp->int_name_tx, grp)) < 0) {
+                if ((err = request_irq(grp->interruptTransmit, gfar_interrupt,
+                                       0, grp->int_name_tx, grp)) < 0) {
                         netif_err(priv, intr, dev, "Can't get IRQ %d\n",
                                   grp->interruptTransmit);
                         goto err_irq_fail;
@@ -1912,8 +1925,9 @@ irq_fail:
         return err;
 }
 
-/* Called when something needs to use the ethernet device */
-/* Returns 0 for success. */
+/* Called when something needs to use the ethernet device
+ * Returns 0 for success.
+ */
 static int gfar_enet_open(struct net_device *dev)
 {
         struct gfar_private *priv = netdev_priv(dev);
@@ -1958,18 +1972,17 @@ static inline struct txfcb *gfar_add_fcb(struct sk_buff *skb)
 }
 
 static inline void gfar_tx_checksum(struct sk_buff *skb, struct txfcb *fcb,
-                int fcb_length)
+                                    int fcb_length)
 {
-        u8 flags = 0;
-
         /* If we're here, it's a IP packet with a TCP or UDP
          * payload.  We set it to checksum, using a pseudo-header
          * we provide
          */
-        flags = TXFCB_DEFAULT;
+        u8 flags = TXFCB_DEFAULT;
 
-        /* Tell the controller what the protocol is */
-        /* And provide the already calculated phcs */
+        /* Tell the controller what the protocol is
+         * And provide the already calculated phcs
+         */
         if (ip_hdr(skb)->protocol == IPPROTO_UDP) {
                 flags |= TXFCB_UDP;
                 fcb->phcs = udp_hdr(skb)->check;
@@ -1979,7 +1992,8 @@ static inline void gfar_tx_checksum(struct sk_buff *skb, struct txfcb *fcb,
         /* l3os is the distance between the start of the
          * frame (skb->data) and the start of the IP hdr.
          * l4os is the distance between the start of the
-         * l3 hdr and the l4 hdr */
+         * l3 hdr and the l4 hdr
+         */
         fcb->l3os = (u16)(skb_network_offset(skb) - fcb_length);
         fcb->l4os = skb_network_header_len(skb);
 
@@ -1993,7 +2007,7 @@ void inline gfar_tx_vlan(struct sk_buff *skb, struct txfcb *fcb)
 }
 
 static inline struct txbd8 *skip_txbd(struct txbd8 *bdp, int stride,
-                               struct txbd8 *base, int ring_size)
+                                      struct txbd8 *base, int ring_size)
 {
         struct txbd8 *new_bd = bdp + stride;
 
@@ -2001,13 +2015,14 @@ static inline struct txbd8 *skip_txbd(struct txbd8 *bdp, int stride,
 }
 
 static inline struct txbd8 *next_txbd(struct txbd8 *bdp, struct txbd8 *base,
-                int ring_size)
+                                      int ring_size)
 {
         return skip_txbd(bdp, 1, base, ring_size);
 }
 
-/* This is called by the kernel when a frame is ready for transmission. */
-/* It is pointed to by the dev->hard_start_xmit function pointer */
+/* This is called by the kernel when a frame is ready for transmission.
+ * It is pointed to by the dev->hard_start_xmit function pointer
+ */
 static int gfar_start_xmit(struct sk_buff *skb, struct net_device *dev)
 {
         struct gfar_private *priv = netdev_priv(dev);
@@ -2022,13 +2037,12 @@ static int gfar_start_xmit(struct sk_buff *skb, struct net_device *dev)
         unsigned long flags;
         unsigned int nr_frags, nr_txbds, length, fcb_length = GMAC_FCB_LEN;
 
-        /*
-         * TOE=1 frames larger than 2500 bytes may see excess delays
+        /* TOE=1 frames larger than 2500 bytes may see excess delays
          * before start of transmission.
          */
         if (unlikely(gfar_has_errata(priv, GFAR_ERRATA_76) &&
-                        skb->ip_summed == CHECKSUM_PARTIAL &&
-                        skb->len > 2500)) {
+                     skb->ip_summed == CHECKSUM_PARTIAL &&
+                     skb->len > 2500)) {
                 int ret;
 
                 ret = skb_checksum_help(skb);
@@ -2044,16 +2058,16 @@ static int gfar_start_xmit(struct sk_buff *skb, struct net_device *dev)
 
         /* check if time stamp should be generated */
         if (unlikely(skb_shinfo(skb)->tx_flags & SKBTX_HW_TSTAMP &&
-                        priv->hwts_tx_en)) {
+                     priv->hwts_tx_en)) {
                 do_tstamp = 1;
                 fcb_length = GMAC_FCB_LEN + GMAC_TXPAL_LEN;
         }
 
         /* make space for additional header when fcb is needed */
         if (((skb->ip_summed == CHECKSUM_PARTIAL) ||
-                        vlan_tx_tag_present(skb) ||
-                        unlikely(do_tstamp)) &&
-                        (skb_headroom(skb) < fcb_length)) {
+             vlan_tx_tag_present(skb) ||
+             unlikely(do_tstamp)) &&
+            (skb_headroom(skb) < fcb_length)) {
                 struct sk_buff *skb_new;
 
                 skb_new = skb_realloc_headroom(skb, fcb_length);
@@ -2096,12 +2110,12 @@ static int gfar_start_xmit(struct sk_buff *skb, struct net_device *dev)
         /* Time stamp insertion requires one additional TxBD */
         if (unlikely(do_tstamp))
                 txbdp_tstamp = txbdp = next_txbd(txbdp, base,
-                                tx_queue->tx_ring_size);
+                                                 tx_queue->tx_ring_size);
 
         if (nr_frags == 0) {
                 if (unlikely(do_tstamp))
                         txbdp_tstamp->lstatus |= BD_LFLAG(TXBD_LAST |
-                                        TXBD_INTERRUPT);
+                                                          TXBD_INTERRUPT);
                 else
                         lstatus |= BD_LFLAG(TXBD_LAST | TXBD_INTERRUPT);
         } else {
@@ -2113,7 +2127,7 @@ static int gfar_start_xmit(struct sk_buff *skb, struct net_device *dev)
                         length = skb_shinfo(skb)->frags[i].size;
 
                         lstatus = txbdp->lstatus | length |
-                                BD_LFLAG(TXBD_READY);
+                                  BD_LFLAG(TXBD_READY);
 
                         /* Handle the last BD specially */
                         if (i == nr_frags - 1)
@@ -2143,8 +2157,8 @@ static int gfar_start_xmit(struct sk_buff *skb, struct net_device *dev)
         if (CHECKSUM_PARTIAL == skb->ip_summed) {
                 fcb = gfar_add_fcb(skb);
                 /* as specified by errata */
-                if (unlikely(gfar_has_errata(priv, GFAR_ERRATA_12)
-                             && ((unsigned long)fcb % 0x20) > 0x18)) {
+                if (unlikely(gfar_has_errata(priv, GFAR_ERRATA_12) &&
+                             ((unsigned long)fcb % 0x20) > 0x18)) {
                         __skb_pull(skb, GMAC_FCB_LEN);
                         skb_checksum_help(skb);
                 } else {
@@ -2172,10 +2186,9 @@ static int gfar_start_xmit(struct sk_buff *skb, struct net_device *dev)
         }
 
         txbdp_start->bufPtr = dma_map_single(&priv->ofdev->dev, skb->data,
-                        skb_headlen(skb), DMA_TO_DEVICE);
+                                             skb_headlen(skb), DMA_TO_DEVICE);
 
-        /*
-         * If time stamping is requested one additional TxBD must be set up. The
+        /* If time stamping is requested one additional TxBD must be set up. The
          * first TxBD points to the FCB and must have a data length of
          * GMAC_FCB_LEN. The second TxBD points to the actual frame data with
          * the full frame length.
@@ -2183,7 +2196,7 @@ static int gfar_start_xmit(struct sk_buff *skb, struct net_device *dev)
         if (unlikely(do_tstamp)) {
                 txbdp_tstamp->bufPtr = txbdp_start->bufPtr + fcb_length;
                 txbdp_tstamp->lstatus |= BD_LFLAG(TXBD_READY) |
-                                (skb_headlen(skb) - fcb_length);
+                                         (skb_headlen(skb) - fcb_length);
                 lstatus |= BD_LFLAG(TXBD_CRC | TXBD_READY) | GMAC_FCB_LEN;
         } else {
                 lstatus |= BD_LFLAG(TXBD_CRC | TXBD_READY) | skb_headlen(skb);
@@ -2191,8 +2204,7 @@ static int gfar_start_xmit(struct sk_buff *skb, struct net_device *dev)
 
         netdev_tx_sent_queue(txq, skb->len);
 
-        /*
-         * We can work in parallel with gfar_clean_tx_ring(), except
+        /* We can work in parallel with gfar_clean_tx_ring(), except
          * when modifying num_txbdfree. Note that we didn't grab the lock
          * when we were reading the num_txbdfree and checking for available
          * space, that's because outside of this function it can only grow,
@@ -2205,8 +2217,7 @@ static int gfar_start_xmit(struct sk_buff *skb, struct net_device *dev)
          */
         spin_lock_irqsave(&tx_queue->txlock, flags);
 
-        /*
-         * The powerpc-specific eieio() is used, as wmb() has too strong
+        /* The powerpc-specific eieio() is used, as wmb() has too strong
          * semantics (it requires synchronization between cacheable and
          * uncacheable mappings, which eieio doesn't provide and which we
          * don't need), thus requiring a more expensive sync instruction.  At
@@ -2222,9 +2233,10 @@ static int gfar_start_xmit(struct sk_buff *skb, struct net_device *dev)
         tx_queue->tx_skbuff[tx_queue->skb_curtx] = skb;
 
         /* Update the current skb pointer to the next entry we will use
-         * (wrapping if necessary) */
+         * (wrapping if necessary)
+         */
         tx_queue->skb_curtx = (tx_queue->skb_curtx + 1) &
-                TX_RING_MOD_MASK(tx_queue->tx_ring_size);
+                              TX_RING_MOD_MASK(tx_queue->tx_ring_size);
 
         tx_queue->cur_tx = next_txbd(txbdp, base, tx_queue->tx_ring_size);
 
@@ -2232,7 +2244,8 @@ static int gfar_start_xmit(struct sk_buff *skb, struct net_device *dev)
         tx_queue->num_txbdfree -= (nr_txbds);
 
         /* If the next BD still needs to be cleaned up, then the bds
-           are full.  We need to tell the kernel to stop sending us stuff. */
+         * are full.  We need to tell the kernel to stop sending us stuff.
+         */
         if (!tx_queue->num_txbdfree) {
                 netif_tx_stop_queue(txq);
 
@@ -2357,12 +2370,12 @@ static int gfar_change_mtu(struct net_device *dev, int new_mtu)
 
         frame_size += priv->padding;
 
-        tempsize =
-            (frame_size & ~(INCREMENTAL_BUFFER_SIZE - 1)) +
-            INCREMENTAL_BUFFER_SIZE;
+        tempsize = (frame_size & ~(INCREMENTAL_BUFFER_SIZE - 1)) +
+                   INCREMENTAL_BUFFER_SIZE;
 
         /* Only stop and start the controller if it isn't already
-         * stopped, and we changed something */
+         * stopped, and we changed something
+         */
         if ((oldsize != tempsize) && (dev->flags & IFF_UP))
                 stop_gfar(dev);
 
@@ -2375,11 +2388,12 @@ static int gfar_change_mtu(struct net_device *dev, int new_mtu)
 
         /* If the mtu is larger than the max size for standard
          * ethernet frames (ie, a jumbo frame), then set maccfg2
-         * to allow huge frames, and to check the length */
+         * to allow huge frames, and to check the length
+         */
         tempval = gfar_read(&regs->maccfg2);
 
         if (priv->rx_buffer_size > DEFAULT_RX_BUFFER_SIZE ||
-                        gfar_has_errata(priv, GFAR_ERRATA_74))
+            gfar_has_errata(priv, GFAR_ERRATA_74))
                 tempval |= (MACCFG2_HUGEFRAME | MACCFG2_LENGTHCHECK);
         else
                 tempval &= ~(MACCFG2_HUGEFRAME | MACCFG2_LENGTHCHECK);
@@ -2400,7 +2414,7 @@ static int gfar_change_mtu(struct net_device *dev, int new_mtu)
 static void gfar_reset_task(struct work_struct *work)
 {
         struct gfar_private *priv = container_of(work, struct gfar_private,
-                        reset_task);
+                                                 reset_task);
         struct net_device *dev = priv->ndev;
 
         if (dev->flags & IFF_UP) {
@@ -2427,7 +2441,7 @@ static void gfar_align_skb(struct sk_buff *skb)
          * as many bytes as needed to align the data properly
          */
         skb_reserve(skb, RXBUF_ALIGNMENT -
-                (((unsigned long) skb->data) & (RXBUF_ALIGNMENT - 1)));
+                    (((unsigned long) skb->data) & (RXBUF_ALIGNMENT - 1)));
 }
 
 /* Interrupt Handler for Transmit complete */
@@ -2461,8 +2475,7 @@ static int gfar_clean_tx_ring(struct gfar_priv_tx_q *tx_queue)
 
                 frags = skb_shinfo(skb)->nr_frags;
 
-                /*
-                 * When time stamping, one additional TxBD must be freed.
+                /* When time stamping, one additional TxBD must be freed.
                  * Also, we need to dma_unmap_single() the TxPAL.
                  */
                 if (unlikely(skb_shinfo(skb)->tx_flags & SKBTX_IN_PROGRESS))
@@ -2476,7 +2489,7 @@ static int gfar_clean_tx_ring(struct gfar_priv_tx_q *tx_queue)
 
                 /* Only clean completed frames */
                 if ((lstatus & BD_LFLAG(TXBD_READY)) &&
-                                (lstatus & BD_LENGTH_MASK))
+                    (lstatus & BD_LENGTH_MASK))
                         break;
 
                 if (unlikely(skb_shinfo(skb)->tx_flags & SKBTX_IN_PROGRESS)) {
@@ -2486,11 +2499,12 @@ static int gfar_clean_tx_ring(struct gfar_priv_tx_q *tx_queue)
                         buflen = bdp->length;
 
                 dma_unmap_single(&priv->ofdev->dev, bdp->bufPtr,
-                                buflen, DMA_TO_DEVICE);
+                                 buflen, DMA_TO_DEVICE);
 
                 if (unlikely(skb_shinfo(skb)->tx_flags & SKBTX_IN_PROGRESS)) {
                         struct skb_shared_hwtstamps shhwtstamps;
                         u64 *ns = (u64*) (((u32)skb->data + 0x10) & ~0x7);
+
                         memset(&shhwtstamps, 0, sizeof(shhwtstamps));
                         shhwtstamps.hwtstamp = ns_to_ktime(*ns);
                         skb_pull(skb, GMAC_FCB_LEN + GMAC_TXPAL_LEN);
@@ -2503,23 +2517,20 @@ static int gfar_clean_tx_ring(struct gfar_priv_tx_q *tx_queue)
                 bdp = next_txbd(bdp, base, tx_ring_size);
 
                 for (i = 0; i < frags; i++) {
-                        dma_unmap_page(&priv->ofdev->dev,
-                                        bdp->bufPtr,
-                                        bdp->length,
-                                        DMA_TO_DEVICE);
+                        dma_unmap_page(&priv->ofdev->dev, bdp->bufPtr,
+                                       bdp->length, DMA_TO_DEVICE);
                         bdp->lstatus &= BD_LFLAG(TXBD_WRAP);
                         bdp = next_txbd(bdp, base, tx_ring_size);
                 }
 
                 bytes_sent += skb->len;
 
-                /*
-                 * If there's room in the queue (limit it to rx_buffer_size)
+                /* If there's room in the queue (limit it to rx_buffer_size)
                  * we add this skb back into the pool, if it's the right size
                  */
                 if (skb_queue_len(&priv->rx_recycle) < rx_queue->rx_ring_size &&
-                                skb_recycle_check(skb, priv->rx_buffer_size +
-                                        RXBUF_ALIGNMENT)) {
+                    skb_recycle_check(skb, priv->rx_buffer_size +
+                                      RXBUF_ALIGNMENT)) {
                         gfar_align_skb(skb);
                         skb_queue_head(&priv->rx_recycle, skb);
                 } else
@@ -2528,7 +2539,7 @@ static int gfar_clean_tx_ring(struct gfar_priv_tx_q *tx_queue)
                 tx_queue->tx_skbuff[skb_dirtytx] = NULL;
 
                 skb_dirtytx = (skb_dirtytx + 1) &
-                        TX_RING_MOD_MASK(tx_ring_size);
+                              TX_RING_MOD_MASK(tx_ring_size);
 
                 howmany++;
                 spin_lock_irqsave(&tx_queue->txlock, flags);
@@ -2558,8 +2569,7 @@ static void gfar_schedule_cleanup(struct gfar_priv_grp *gfargrp)
                 gfar_write(&gfargrp->regs->imask, IMASK_RTX_DISABLED);
                 __napi_schedule(&gfargrp->napi);
         } else {
-                /*
-                 * Clear IEVENT, so interrupts aren't called again
+                /* Clear IEVENT, so interrupts aren't called again
                  * because of the packets that have already arrived.
                  */
                 gfar_write(&gfargrp->regs->ievent, IEVENT_RTX_MASK);
@@ -2576,7 +2586,7 @@ static irqreturn_t gfar_transmit(int irq, void *grp_id)
 }
 
 static void gfar_new_rxbdp(struct gfar_priv_rx_q *rx_queue, struct rxbd8 *bdp,
-                struct sk_buff *skb)
+                           struct sk_buff *skb)
 {
         struct net_device *dev = rx_queue->dev;
         struct gfar_private *priv = netdev_priv(dev);
@@ -2587,7 +2597,7 @@ static void gfar_new_rxbdp(struct gfar_priv_rx_q *rx_queue, struct rxbd8 *bdp,
         gfar_init_rxbdp(rx_queue, bdp, buf);
 }
 
-static struct sk_buff * gfar_alloc_skb(struct net_device *dev)
+static struct sk_buff *gfar_alloc_skb(struct net_device *dev)
 {
         struct gfar_private *priv = netdev_priv(dev);
         struct sk_buff *skb = NULL;
@@ -2601,7 +2611,7 @@ static struct sk_buff * gfar_alloc_skb(struct net_device *dev)
         return skb;
 }
 
-struct sk_buff * gfar_new_skb(struct net_device *dev)
+struct sk_buff *gfar_new_skb(struct net_device *dev)
 {
         struct gfar_private *priv = netdev_priv(dev);
         struct sk_buff *skb = NULL;
@@ -2619,8 +2629,7 @@ static inline void count_errors(unsigned short status, struct net_device *dev)
         struct net_device_stats *stats = &dev->stats;
         struct gfar_extra_stats *estats = &priv->extra_stats;
 
-        /* If the packet was truncated, none of the other errors
-         * matter */
+        /* If the packet was truncated, none of the other errors matter */
         if (status & RXBD_TRUNCATED) {
                 stats->rx_length_errors++;
 
@@ -2661,7 +2670,8 @@ static inline void gfar_rx_checksum(struct sk_buff *skb, struct rxfcb *fcb)
 {
         /* If valid headers were found, and valid sums
          * were verified, then we tell the kernel that no
-         * checksumming is necessary.  Otherwise, it is */
+         * checksumming is necessary.  Otherwise, it is [FIXME]
+         */
         if ((fcb->flags & RXFCB_CSUM_MASK) == (RXFCB_CIP | RXFCB_CTU))
                 skb->ip_summed = CHECKSUM_UNNECESSARY;
         else
@@ -2669,8 +2679,7 @@ static inline void gfar_rx_checksum(struct sk_buff *skb, struct rxfcb *fcb)
 }
 
 
-/* gfar_process_frame() -- handle one incoming packet if skb
- * isn't NULL.  */
+/* gfar_process_frame() -- handle one incoming packet if skb isn't NULL. */
 static int gfar_process_frame(struct net_device *dev, struct sk_buff *skb,
                               int amount_pull, struct napi_struct *napi)
 {
@@ -2682,8 +2691,9 @@ static int gfar_process_frame(struct net_device *dev, struct sk_buff *skb,
         /* fcb is at the beginning if exists */
         fcb = (struct rxfcb *)skb->data;
 
-        /* Remove the FCB from the skb */
-        /* Remove the padded bytes, if there are any */
+        /* Remove the FCB from the skb
+         * Remove the padded bytes, if there are any
+         */
         if (amount_pull) {
                 skb_record_rx_queue(skb, fcb->rq);
                 skb_pull(skb, amount_pull);
@@ -2693,6 +2703,7 @@ static int gfar_process_frame(struct net_device *dev, struct sk_buff *skb,
         if (priv->hwts_rx_en) {
                 struct skb_shared_hwtstamps *shhwtstamps = skb_hwtstamps(skb);
                 u64 *ns = (u64 *) skb->data;
+
                 memset(shhwtstamps, 0, sizeof(*shhwtstamps));
                 shhwtstamps->hwtstamp = ns_to_ktime(*ns);
         }
@@ -2706,8 +2717,7 @@ static int gfar_process_frame(struct net_device *dev, struct sk_buff *skb,
         /* Tell the skb what kind of packet this is */
         skb->protocol = eth_type_trans(skb, dev);
 
-        /*
-         * There's need to check for NETIF_F_HW_VLAN_RX here.
+        /* There's need to check for NETIF_F_HW_VLAN_RX here.
          * Even if vlan rx accel is disabled, on some chips
          * RXFCB_VLN is pseudo randomly set.
          */
@@ -2725,8 +2735,8 @@ static int gfar_process_frame(struct net_device *dev, struct sk_buff *skb,
 }
 
 /* gfar_clean_rx_ring() -- Processes each frame in the rx ring
- *   until the budget/quota has been reached. Returns the number
- *   of frames handled
+ * until the budget/quota has been reached. Returns the number
+ * of frames handled
  */
 int gfar_clean_rx_ring(struct gfar_priv_rx_q *rx_queue, int rx_work_limit)
 {
@@ -2746,6 +2756,7 @@ int gfar_clean_rx_ring(struct gfar_priv_rx_q *rx_queue, int rx_work_limit)
 
         while (!((bdp->status & RXBD_EMPTY) || (--rx_work_limit < 0))) {
                 struct sk_buff *newskb;
+
                 rmb();
 
                 /* Add another skb for the future */
@@ -2754,15 +2765,15 @@ int gfar_clean_rx_ring(struct gfar_priv_rx_q *rx_queue, int rx_work_limit)
                 skb = rx_queue->rx_skbuff[rx_queue->skb_currx];
 
                 dma_unmap_single(&priv->ofdev->dev, bdp->bufPtr,
-                                priv->rx_buffer_size, DMA_FROM_DEVICE);
+                                 priv->rx_buffer_size, DMA_FROM_DEVICE);
 
                 if (unlikely(!(bdp->status & RXBD_ERR) &&
-                                bdp->length > priv->rx_buffer_size))
+                             bdp->length > priv->rx_buffer_size))
                         bdp->status = RXBD_LARGE;
 
                 /* We drop the frame if we failed to allocate a new buffer */
                 if (unlikely(!newskb || !(bdp->status & RXBD_LAST) ||
-                                 bdp->status & RXBD_ERR)) {
+                             bdp->status & RXBD_ERR)) {
                         count_errors(bdp->status, dev);
 
                         if (unlikely(!newskb))
@@ -2781,7 +2792,7 @@ int gfar_clean_rx_ring(struct gfar_priv_rx_q *rx_queue, int rx_work_limit)
                                 rx_queue->stats.rx_bytes += pkt_len;
                                 skb_record_rx_queue(skb, rx_queue->qindex);
                                 gfar_process_frame(dev, skb, amount_pull,
-                                                &rx_queue->grp->napi);
+                                                   &rx_queue->grp->napi);
 
                         } else {
                                 netif_warn(priv, rx_err, dev, "Missing skb!\n");
@@ -2800,9 +2811,8 @@ int gfar_clean_rx_ring(struct gfar_priv_rx_q *rx_queue, int rx_work_limit)
                 bdp = next_bd(bdp, base, rx_queue->rx_ring_size);
 
                 /* update to point at the next skb */
-                rx_queue->skb_currx =
-                    (rx_queue->skb_currx + 1) &
-                    RX_RING_MOD_MASK(rx_queue->rx_ring_size);
+                rx_queue->skb_currx = (rx_queue->skb_currx + 1) &
+                                      RX_RING_MOD_MASK(rx_queue->rx_ring_size);
         }
 
         /* Update the current rxbd pointer to be the next one */
@@ -2813,8 +2823,8 @@ int gfar_clean_rx_ring(struct gfar_priv_rx_q *rx_queue, int rx_work_limit)
 
 static int gfar_poll(struct napi_struct *napi, int budget)
 {
-        struct gfar_priv_grp *gfargrp = container_of(napi,
-                        struct gfar_priv_grp, napi);
+        struct gfar_priv_grp *gfargrp =
+                container_of(napi, struct gfar_priv_grp, napi);
         struct gfar_private *priv = gfargrp->priv;
         struct gfar __iomem *regs = gfargrp->regs;
         struct gfar_priv_tx_q *tx_queue = NULL;
@@ -2828,11 +2838,11 @@ static int gfar_poll(struct napi_struct *napi, int budget)
         budget_per_queue = budget/num_queues;
 
         /* Clear IEVENT, so interrupts aren't called again
-         * because of the packets that have already arrived */
+         * because of the packets that have already arrived
+         */
         gfar_write(&regs->ievent, IEVENT_RTX_MASK);
 
         while (num_queues && left_over_budget) {
-
                 budget_per_queue = left_over_budget/num_queues;
                 left_over_budget = 0;
 
@@ -2843,12 +2853,13 @@ static int gfar_poll(struct napi_struct *napi, int budget)
                         tx_queue = priv->tx_queue[rx_queue->qindex];
 
                         tx_cleaned += gfar_clean_tx_ring(tx_queue);
-                        rx_cleaned_per_queue = gfar_clean_rx_ring(rx_queue,
-                                                        budget_per_queue);
+                        rx_cleaned_per_queue =
+                                gfar_clean_rx_ring(rx_queue, budget_per_queue);
                         rx_cleaned += rx_cleaned_per_queue;
-                        if(rx_cleaned_per_queue < budget_per_queue) {
+                        if (rx_cleaned_per_queue < budget_per_queue) {
                                 left_over_budget = left_over_budget +
-                                        (budget_per_queue - rx_cleaned_per_queue);
+                                        (budget_per_queue -
+                                         rx_cleaned_per_queue);
                                 set_bit(i, &serviced_queues);
                                 num_queues--;
                         }
@@ -2866,25 +2877,25 @@ static int gfar_poll(struct napi_struct *napi, int budget)
 
                 gfar_write(&regs->imask, IMASK_DEFAULT);
 
-                /* If we are coalescing interrupts, update the timer */
-                /* Otherwise, clear it */
-                gfar_configure_coalescing(priv,
-                                gfargrp->rx_bit_map, gfargrp->tx_bit_map);
+                /* If we are coalescing interrupts, update the timer
+                 * Otherwise, clear it
+                 */
+                gfar_configure_coalescing(priv, gfargrp->rx_bit_map,
+                                          gfargrp->tx_bit_map);
         }
 
         return rx_cleaned;
 }
 
 #ifdef CONFIG_NET_POLL_CONTROLLER
-/*
- * Polling 'interrupt' - used by things like netconsole to send skbs
+/* Polling 'interrupt' - used by things like netconsole to send skbs
  * without having to re-enable interrupts. It's not called while
  * the interrupt routine is executing.
  */
 static void gfar_netpoll(struct net_device *dev)
 {
         struct gfar_private *priv = netdev_priv(dev);
-        int i = 0;
+        int i;
 
         /* If the device has multiple interrupts, run tx/rx */
         if (priv->device_flags & FSL_GIANFAR_DEV_HAS_MULTI_INTR) {
@@ -2893,7 +2904,7 @@ static void gfar_netpoll(struct net_device *dev)
                         disable_irq(priv->gfargrp[i].interruptReceive);
                         disable_irq(priv->gfargrp[i].interruptError);
                         gfar_interrupt(priv->gfargrp[i].interruptTransmit,
-                                                &priv->gfargrp[i]);
+                                       &priv->gfargrp[i]);
                         enable_irq(priv->gfargrp[i].interruptError);
                         enable_irq(priv->gfargrp[i].interruptReceive);
                         enable_irq(priv->gfargrp[i].interruptTransmit);
@@ -2902,7 +2913,7 @@ static void gfar_netpoll(struct net_device *dev)
                 for (i = 0; i < priv->num_grps; i++) {
                         disable_irq(priv->gfargrp[i].interruptTransmit);
                         gfar_interrupt(priv->gfargrp[i].interruptTransmit,
-                                                &priv->gfargrp[i]);
+                                       &priv->gfargrp[i]);
                         enable_irq(priv->gfargrp[i].interruptTransmit);
                 }
         }
@@ -2954,7 +2965,8 @@ static void adjust_link(struct net_device *dev)
                 u32 ecntrl = gfar_read(&regs->ecntrl);
 
                 /* Now we make sure that we can be in full duplex mode.
-                 * If not, we operate in half-duplex mode. */
+                 * If not, we operate in half-duplex mode.
+                 */
                 if (phydev->duplex != priv->oldduplex) {
                         new_state = 1;
                         if (!(phydev->duplex))
@@ -2980,7 +2992,8 @@ static void adjust_link(struct net_device *dev)
                                     ((tempval & ~(MACCFG2_IF)) | MACCFG2_MII);
 
                                 /* Reduced mode distinguishes
-                                 * between 10 and 100 */
+                                 * between 10 and 100
+                                 */
                                 if (phydev->speed == SPEED_100)
                                         ecntrl |= ECNTRL_R100;
                                 else
@@ -3019,7 +3032,8 @@ static void adjust_link(struct net_device *dev)
 /* Update the hash table based on the current list of multicast
  * addresses we subscribe to.  Also, change the promiscuity of
  * the device based on the flags (this function is called
- * whenever dev->flags is changed */
+ * whenever dev->flags is changed
+ */
 static void gfar_set_multi(struct net_device *dev)
 {
         struct netdev_hw_addr *ha;
@@ -3081,7 +3095,8 @@ static void gfar_set_multi(struct net_device *dev)
 
                 /* If we have extended hash tables, we need to
                  * clear the exact match registers to prepare for
-                 * setting them */
+                 * setting them
+                 */
                 if (priv->extended_hash) {
                         em_num = GFAR_EM_NUM + 1;
                         gfar_clear_exact_match(dev);
@@ -3107,13 +3122,14 @@ static void gfar_set_multi(struct net_device *dev)
 
 
 /* Clears each of the exact match registers to zero, so they
- * don't interfere with normal reception */
+ * don't interfere with normal reception
+ */
 static void gfar_clear_exact_match(struct net_device *dev)
 {
         int idx;
         static const u8 zero_arr[ETH_ALEN] = {0, 0, 0, 0, 0, 0};
 
-        for(idx = 1;idx < GFAR_EM_NUM + 1;idx++)
+        for (idx = 1; idx < GFAR_EM_NUM + 1; idx++)
                 gfar_set_mac_for_addr(dev, idx, zero_arr);
 }
 
@@ -3129,7 +3145,8 @@ static void gfar_clear_exact_match(struct net_device *dev)
  * hash index which gaddr register to use, and the 5 other bits
  * indicate which bit (assuming an IBM numbering scheme, which
  * for PowerPC (tm) is usually the case) in the register holds
- * the entry. */
+ * the entry.
+ */
 static void gfar_set_hash_for_addr(struct net_device *dev, u8 *addr)
 {
         u32 tempval;
@@ -3161,8 +3178,9 @@ static void gfar_set_mac_for_addr(struct net_device *dev, int num,
 
         macptr += num*2;
 
-        /* Now copy it into the mac registers backwards, cuz */
-        /* little endian is silly */
+        /* Now copy it into the mac registers backwards, cuz
+         * little endian is silly
+         */
         for (idx = 0; idx < ETH_ALEN; idx++)
                 tmpbuf[ETH_ALEN - 1 - idx] = addr[idx];
 
@@ -3194,7 +3212,8 @@ static irqreturn_t gfar_error(int irq, void *grp_id)
 
         /* Hmm... */
         if (netif_msg_rx_err(priv) || netif_msg_tx_err(priv))
-                netdev_dbg(dev, "error interrupt (ievent=0x%08x imask=0x%08x)\n",
+                netdev_dbg(dev,
+                           "error interrupt (ievent=0x%08x imask=0x%08x)\n",
                            events, gfar_read(&regs->imask));
 
         /* Update the error counters */
diff --git a/drivers/net/ethernet/freescale/gianfar_ethtool.c b/drivers/net/ethernet/freescale/gianfar_ethtool.c
index 8a025570d97..8971921cc1c 100644
--- a/drivers/net/ethernet/freescale/gianfar_ethtool.c
+++ b/drivers/net/ethernet/freescale/gianfar_ethtool.c
@@ -46,18 +46,24 @@
 #include "gianfar.h"
 
 extern void gfar_start(struct net_device *dev);
-extern int gfar_clean_rx_ring(struct gfar_priv_rx_q *rx_queue, int rx_work_limit);
+extern int gfar_clean_rx_ring(struct gfar_priv_rx_q *rx_queue,
+                              int rx_work_limit);
 
 #define GFAR_MAX_COAL_USECS 0xffff
 #define GFAR_MAX_COAL_FRAMES 0xff
 static void gfar_fill_stats(struct net_device *dev, struct ethtool_stats *dummy,
-                     u64 * buf);
+                            u64 *buf);
 static void gfar_gstrings(struct net_device *dev, u32 stringset, u8 * buf);
-static int gfar_gcoalesce(struct net_device *dev, struct ethtool_coalesce *cvals);
-static int gfar_scoalesce(struct net_device *dev, struct ethtool_coalesce *cvals);
-static void gfar_gringparam(struct net_device *dev, struct ethtool_ringparam *rvals);
-static int gfar_sringparam(struct net_device *dev, struct ethtool_ringparam *rvals);
-static void gfar_gdrvinfo(struct net_device *dev, struct ethtool_drvinfo *drvinfo);
+static int gfar_gcoalesce(struct net_device *dev,
+                          struct ethtool_coalesce *cvals);
+static int gfar_scoalesce(struct net_device *dev,
+                          struct ethtool_coalesce *cvals);
+static void gfar_gringparam(struct net_device *dev,
+                            struct ethtool_ringparam *rvals);
+static int gfar_sringparam(struct net_device *dev,
+                           struct ethtool_ringparam *rvals);
+static void gfar_gdrvinfo(struct net_device *dev,
+                          struct ethtool_drvinfo *drvinfo);
 
 static const char stat_gstrings[][ETH_GSTRING_LEN] = {
         "rx-dropped-by-kernel",
@@ -130,14 +136,15 @@ static void gfar_gstrings(struct net_device *dev, u32 stringset, u8 * buf)
                 memcpy(buf, stat_gstrings, GFAR_STATS_LEN * ETH_GSTRING_LEN);
         else
                 memcpy(buf, stat_gstrings,
-                                GFAR_EXTRA_STATS_LEN * ETH_GSTRING_LEN);
+                       GFAR_EXTRA_STATS_LEN * ETH_GSTRING_LEN);
 }
 
 /* Fill in an array of 64-bit statistics from various sources.
  * This array will be appended to the end of the ethtool_stats
  * structure, and returned to user space
  */
-static void gfar_fill_stats(struct net_device *dev, struct ethtool_stats *dummy, u64 * buf)
+static void gfar_fill_stats(struct net_device *dev, struct ethtool_stats *dummy,
+                            u64 *buf)
 {
         int i;
         struct gfar_private *priv = netdev_priv(dev);
@@ -174,8 +181,8 @@ static int gfar_sset_count(struct net_device *dev, int sset)
 }
 
 /* Fills in the drvinfo structure with some basic info */
-static void gfar_gdrvinfo(struct net_device *dev, struct
-              ethtool_drvinfo *drvinfo)
+static void gfar_gdrvinfo(struct net_device *dev,
+                          struct ethtool_drvinfo *drvinfo)
 {
         strncpy(drvinfo->driver, DRV_NAME, GFAR_INFOSTR_LEN);
         strncpy(drvinfo->version, gfar_driver_version, GFAR_INFOSTR_LEN);
@@ -226,7 +233,8 @@ static int gfar_reglen(struct net_device *dev)
 }
 
 /* Return a dump of the GFAR register space */
-static void gfar_get_regs(struct net_device *dev, struct ethtool_regs *regs, void *regbuf)
+static void gfar_get_regs(struct net_device *dev, struct ethtool_regs *regs,
+                          void *regbuf)
 {
         int i;
         struct gfar_private *priv = netdev_priv(dev);
@@ -239,7 +247,8 @@ static void gfar_get_regs(struct net_device *dev, struct ethtool_regs *regs, voi
 
 /* Convert microseconds to ethernet clock ticks, which changes
  * depending on what speed the controller is running at */
-static unsigned int gfar_usecs2ticks(struct gfar_private *priv, unsigned int usecs)
+static unsigned int gfar_usecs2ticks(struct gfar_private *priv,
+                                     unsigned int usecs)
 {
         unsigned int count;
 
@@ -263,7 +272,8 @@ static unsigned int gfar_usecs2ticks(struct gfar_private *priv, unsigned int use
 }
 
 /* Convert ethernet clock ticks to microseconds */
-static unsigned int gfar_ticks2usecs(struct gfar_private *priv, unsigned int ticks)
+static unsigned int gfar_ticks2usecs(struct gfar_private *priv,
+                                     unsigned int ticks)
 {
         unsigned int count;
 
@@ -288,7 +298,8 @@ static unsigned int gfar_ticks2usecs(struct gfar_private *priv, unsigned int tic
 
 /* Get the coalescing parameters, and put them in the cvals
  * structure.  */
-static int gfar_gcoalesce(struct net_device *dev, struct ethtool_coalesce *cvals)
+static int gfar_gcoalesce(struct net_device *dev,
+                          struct ethtool_coalesce *cvals)
 {
         struct gfar_private *priv = netdev_priv(dev);
         struct gfar_priv_rx_q *rx_queue = NULL;
@@ -353,7 +364,8 @@ static int gfar_gcoalesce(struct net_device *dev, struct ethtool_coalesce *cvals
  * Both cvals->*_usecs and cvals->*_frames have to be > 0
  * in order for coalescing to be active
  */
-static int gfar_scoalesce(struct net_device *dev, struct ethtool_coalesce *cvals)
+static int gfar_scoalesce(struct net_device *dev,
+                          struct ethtool_coalesce *cvals)
 {
         struct gfar_private *priv = netdev_priv(dev);
         int i = 0;
@@ -364,7 +376,8 @@ static int gfar_scoalesce(struct net_device *dev, struct ethtool_coalesce *cvals
         /* Set up rx coalescing */
         /* As of now, we will enable/disable coalescing for all
          * queues together in case of eTSEC2, this will be modified
-         * along with the ethtool interface */
+         * along with the ethtool interface
+         */
         if ((cvals->rx_coalesce_usecs == 0) ||
             (cvals->rx_max_coalesced_frames == 0)) {
                 for (i = 0; i < priv->num_rx_queues; i++)
@@ -433,7 +446,8 @@ static int gfar_scoalesce(struct net_device *dev, struct ethtool_coalesce *cvals
 /* Fills in rvals with the current ring parameters.  Currently,
  * rx, rx_mini, and rx_jumbo rings are the same size, as mini and
  * jumbo are ignored by the driver */
-static void gfar_gringparam(struct net_device *dev, struct ethtool_ringparam *rvals)
+static void gfar_gringparam(struct net_device *dev,
+                            struct ethtool_ringparam *rvals)
 {
         struct gfar_private *priv = netdev_priv(dev);
         struct gfar_priv_tx_q *tx_queue = NULL;
@@ -459,8 +473,10 @@ static void gfar_gringparam(struct net_device *dev, struct ethtool_ringparam *rv
 /* Change the current ring parameters, stopping the controller if
  * necessary so that we don't mess things up while we're in
  * motion.  We wait for the ring to be clean before reallocating
- * the rings. */
-static int gfar_sringparam(struct net_device *dev, struct ethtool_ringparam *rvals)
+ * the rings.
+ */
+static int gfar_sringparam(struct net_device *dev,
+                           struct ethtool_ringparam *rvals)
 {
         struct gfar_private *priv = netdev_priv(dev);
         int err = 0, i = 0;
@@ -486,7 +502,8 @@ static int gfar_sringparam(struct net_device *dev, struct ethtool_ringparam *rva
                 unsigned long flags;
 
                 /* Halt TX and RX, and process the frames which
-                 * have already been received */
+                 * have already been received
+                 */
                 local_irq_save(flags);
                 lock_tx_qs(priv);
                 lock_rx_qs(priv);
@@ -499,7 +516,7 @@ static int gfar_sringparam(struct net_device *dev, struct ethtool_ringparam *rva
 
                 for (i = 0; i < priv->num_rx_queues; i++)
                         gfar_clean_rx_ring(priv->rx_queue[i],
-                                        priv->rx_queue[i]->rx_ring_size);
+                                           priv->rx_queue[i]->rx_ring_size);
 
                 /* Now we take down the rings to rebuild them */
                 stop_gfar(dev);
@@ -509,7 +526,8 @@ static int gfar_sringparam(struct net_device *dev, struct ethtool_ringparam *rva
         for (i = 0; i < priv->num_rx_queues; i++) {
                 priv->rx_queue[i]->rx_ring_size = rvals->rx_pending;
                 priv->tx_queue[i]->tx_ring_size = rvals->tx_pending;
-                priv->tx_queue[i]->num_txbdfree = priv->tx_queue[i]->tx_ring_size;
+                priv->tx_queue[i]->num_txbdfree =
+                        priv->tx_queue[i]->tx_ring_size;
         }
 
         /* Rebuild the rings with the new size */
@@ -535,7 +553,8 @@ int gfar_set_features(struct net_device *dev, netdev_features_t features)
 
         if (dev->flags & IFF_UP) {
                 /* Halt TX and RX, and process the frames which
-                 * have already been received */
+                 * have already been received
+                 */
                 local_irq_save(flags);
                 lock_tx_qs(priv);
                 lock_rx_qs(priv);
@@ -548,7 +567,7 @@ int gfar_set_features(struct net_device *dev, netdev_features_t features)
 
                 for (i = 0; i < priv->num_rx_queues; i++)
                         gfar_clean_rx_ring(priv->rx_queue[i],
-                                        priv->rx_queue[i]->rx_ring_size);
+                                           priv->rx_queue[i]->rx_ring_size);
 
                 /* Now we take down the rings to rebuild them */
                 stop_gfar(dev);
@@ -564,12 +583,14 @@ int gfar_set_features(struct net_device *dev, netdev_features_t features)
 static uint32_t gfar_get_msglevel(struct net_device *dev)
 {
         struct gfar_private *priv = netdev_priv(dev);
+
         return priv->msg_enable;
 }
 
 static void gfar_set_msglevel(struct net_device *dev, uint32_t data)
 {
         struct gfar_private *priv = netdev_priv(dev);
+
         priv->msg_enable = data;
 }
 
@@ -614,14 +635,14 @@ static void ethflow_to_filer_rules (struct gfar_private *priv, u64 ethflow)
 
         if (ethflow & RXH_L2DA) {
                 fcr = RQFCR_PID_DAH |RQFCR_CMP_NOMATCH |
-                        RQFCR_HASH | RQFCR_AND | RQFCR_HASHTBL_0;
+                      RQFCR_HASH | RQFCR_AND | RQFCR_HASHTBL_0;
                 priv->ftp_rqfpr[priv->cur_filer_idx] = fpr;
                 priv->ftp_rqfcr[priv->cur_filer_idx] = fcr;
                 gfar_write_filer(priv, priv->cur_filer_idx, fcr, fpr);
                 priv->cur_filer_idx = priv->cur_filer_idx - 1;
 
                 fcr = RQFCR_PID_DAL | RQFCR_AND | RQFCR_CMP_NOMATCH |
-                                RQFCR_HASH | RQFCR_AND | RQFCR_HASHTBL_0;
+                      RQFCR_HASH | RQFCR_AND | RQFCR_HASHTBL_0;
                 priv->ftp_rqfpr[priv->cur_filer_idx] = fpr;
                 priv->ftp_rqfcr[priv->cur_filer_idx] = fcr;
                 gfar_write_filer(priv, priv->cur_filer_idx, fcr, fpr);
@@ -630,7 +651,7 @@ static void ethflow_to_filer_rules (struct gfar_private *priv, u64 ethflow)
 
         if (ethflow & RXH_VLAN) {
                 fcr = RQFCR_PID_VID | RQFCR_CMP_NOMATCH | RQFCR_HASH |
-                                RQFCR_AND | RQFCR_HASHTBL_0;
+                      RQFCR_AND | RQFCR_HASHTBL_0;
                 gfar_write_filer(priv, priv->cur_filer_idx, fcr, fpr);
                 priv->ftp_rqfpr[priv->cur_filer_idx] = fpr;
                 priv->ftp_rqfcr[priv->cur_filer_idx] = fcr;
@@ -639,7 +660,7 @@ static void ethflow_to_filer_rules (struct gfar_private *priv, u64 ethflow)
 
         if (ethflow & RXH_IP_SRC) {
                 fcr = RQFCR_PID_SIA | RQFCR_CMP_NOMATCH | RQFCR_HASH |
-                        RQFCR_AND | RQFCR_HASHTBL_0;
+                      RQFCR_AND | RQFCR_HASHTBL_0;
                 priv->ftp_rqfpr[priv->cur_filer_idx] = fpr;
                 priv->ftp_rqfcr[priv->cur_filer_idx] = fcr;
                 gfar_write_filer(priv, priv->cur_filer_idx, fcr, fpr);
@@ -648,7 +669,7 @@ static void ethflow_to_filer_rules (struct gfar_private *priv, u64 ethflow)
 
         if (ethflow & (RXH_IP_DST)) {
                 fcr = RQFCR_PID_DIA | RQFCR_CMP_NOMATCH | RQFCR_HASH |
-                        RQFCR_AND | RQFCR_HASHTBL_0;
+                      RQFCR_AND | RQFCR_HASHTBL_0;
                 priv->ftp_rqfpr[priv->cur_filer_idx] = fpr;
                 priv->ftp_rqfcr[priv->cur_filer_idx] = fcr;
                 gfar_write_filer(priv, priv->cur_filer_idx, fcr, fpr);
@@ -657,7 +678,7 @@ static void ethflow_to_filer_rules (struct gfar_private *priv, u64 ethflow)
 
         if (ethflow & RXH_L3_PROTO) {
                 fcr = RQFCR_PID_L4P | RQFCR_CMP_NOMATCH | RQFCR_HASH |
-                        RQFCR_AND | RQFCR_HASHTBL_0;
+                      RQFCR_AND | RQFCR_HASHTBL_0;
                 priv->ftp_rqfpr[priv->cur_filer_idx] = fpr;
                 priv->ftp_rqfcr[priv->cur_filer_idx] = fcr;
                 gfar_write_filer(priv, priv->cur_filer_idx, fcr, fpr);
@@ -666,7 +687,7 @@ static void ethflow_to_filer_rules (struct gfar_private *priv, u64 ethflow)
 
         if (ethflow & RXH_L4_B_0_1) {
                 fcr = RQFCR_PID_SPT | RQFCR_CMP_NOMATCH | RQFCR_HASH |
-                        RQFCR_AND | RQFCR_HASHTBL_0;
+                      RQFCR_AND | RQFCR_HASHTBL_0;
                 priv->ftp_rqfpr[priv->cur_filer_idx] = fpr;
                 priv->ftp_rqfcr[priv->cur_filer_idx] = fcr;
                 gfar_write_filer(priv, priv->cur_filer_idx, fcr, fpr);
@@ -675,7 +696,7 @@ static void ethflow_to_filer_rules (struct gfar_private *priv, u64 ethflow)
 
         if (ethflow & RXH_L4_B_2_3) {
                 fcr = RQFCR_PID_DPT | RQFCR_CMP_NOMATCH | RQFCR_HASH |
-                        RQFCR_AND | RQFCR_HASHTBL_0;
+                      RQFCR_AND | RQFCR_HASHTBL_0;
                 priv->ftp_rqfpr[priv->cur_filer_idx] = fpr;
                 priv->ftp_rqfcr[priv->cur_filer_idx] = fcr;
                 gfar_write_filer(priv, priv->cur_filer_idx, fcr, fpr);
@@ -683,7 +704,8 @@ static void ethflow_to_filer_rules (struct gfar_private *priv, u64 ethflow)
         }
 }
 
-static int gfar_ethflow_to_filer_table(struct gfar_private *priv, u64 ethflow, u64 class)
+static int gfar_ethflow_to_filer_table(struct gfar_private *priv, u64 ethflow,
+                                       u64 class)
 {
         unsigned int last_rule_idx = priv->cur_filer_idx;
         unsigned int cmp_rqfpr;
@@ -694,9 +716,9 @@ static int gfar_ethflow_to_filer_table(struct gfar_private *priv, u64 ethflow, u
         int ret = 1;
 
         local_rqfpr = kmalloc(sizeof(unsigned int) * (MAX_FILER_IDX + 1),
-                GFP_KERNEL);
+                              GFP_KERNEL);
         local_rqfcr = kmalloc(sizeof(unsigned int) * (MAX_FILER_IDX + 1),
-                GFP_KERNEL);
+                              GFP_KERNEL);
         if (!local_rqfpr || !local_rqfcr) {
                 pr_err("Out of memory\n");
                 ret = 0;
@@ -726,9 +748,9 @@ static int gfar_ethflow_to_filer_table(struct gfar_private *priv, u64 ethflow, u
                 local_rqfpr[j] = priv->ftp_rqfpr[i];
                 local_rqfcr[j] = priv->ftp_rqfcr[i];
                 j--;
-                if ((priv->ftp_rqfcr[i] == (RQFCR_PID_PARSE |
-                        RQFCR_CLE |RQFCR_AND)) &&
-                        (priv->ftp_rqfpr[i] == cmp_rqfpr))
+                if ((priv->ftp_rqfcr[i] ==
+                     (RQFCR_PID_PARSE | RQFCR_CLE | RQFCR_AND)) &&
+                    (priv->ftp_rqfpr[i] == cmp_rqfpr))
                         break;
         }
 
@@ -743,12 +765,12 @@ static int gfar_ethflow_to_filer_table(struct gfar_private *priv, u64 ethflow, u
          */
         for (l = i+1; l < MAX_FILER_IDX; l++) {
                 if ((priv->ftp_rqfcr[l] & RQFCR_CLE) &&
-                        !(priv->ftp_rqfcr[l] & RQFCR_AND)) {
+                    !(priv->ftp_rqfcr[l] & RQFCR_AND)) {
                         priv->ftp_rqfcr[l] = RQFCR_CLE | RQFCR_CMP_EXACT |
-                                RQFCR_HASHTBL_0 | RQFCR_PID_MASK;
+                                             RQFCR_HASHTBL_0 | RQFCR_PID_MASK;
                         priv->ftp_rqfpr[l] = FPR_FILER_MASK;
                         gfar_write_filer(priv, l, priv->ftp_rqfcr[l],
-                                priv->ftp_rqfpr[l]);
+                                         priv->ftp_rqfpr[l]);
                         break;
                 }
 
@@ -773,7 +795,7 @@ static int gfar_ethflow_to_filer_table(struct gfar_private *priv, u64 ethflow, u
                 priv->ftp_rqfpr[priv->cur_filer_idx] = local_rqfpr[k];
                 priv->ftp_rqfcr[priv->cur_filer_idx] = local_rqfcr[k];
                 gfar_write_filer(priv, priv->cur_filer_idx,
-                                local_rqfcr[k], local_rqfpr[k]);
+                                 local_rqfcr[k], local_rqfpr[k]);
                 if (!priv->cur_filer_idx)
                         break;
                 priv->cur_filer_idx = priv->cur_filer_idx - 1;
@@ -785,7 +807,8 @@ err:
         return ret;
 }
 
-static int gfar_set_hash_opts(struct gfar_private *priv, struct ethtool_rxnfc *cmd)
+static int gfar_set_hash_opts(struct gfar_private *priv,
+                              struct ethtool_rxnfc *cmd)
 {
         /* write the filer rules here */
         if (!gfar_ethflow_to_filer_table(priv, cmd->data, cmd->flow_type))
@@ -810,10 +833,10 @@ static int gfar_check_filer_hardware(struct gfar_private *priv)
                 i &= RCTRL_PRSDEP_MASK | RCTRL_PRSFM;
                 if (i == (RCTRL_PRSDEP_MASK | RCTRL_PRSFM)) {
                         netdev_info(priv->ndev,
-                                        "Receive Queue Filtering enabled\n");
+                                    "Receive Queue Filtering enabled\n");
                 } else {
                         netdev_warn(priv->ndev,
-                                        "Receive Queue Filtering disabled\n");
+                                    "Receive Queue Filtering disabled\n");
                         return -EOPNOTSUPP;
                 }
         }
@@ -823,16 +846,17 @@ static int gfar_check_filer_hardware(struct gfar_private *priv)
                 i &= RCTRL_PRSDEP_MASK;
                 if (i == RCTRL_PRSDEP_MASK) {
                         netdev_info(priv->ndev,
-                                        "Receive Queue Filtering enabled\n");
+                                    "Receive Queue Filtering enabled\n");
                 } else {
                         netdev_warn(priv->ndev,
-                                        "Receive Queue Filtering disabled\n");
+                                    "Receive Queue Filtering disabled\n");
                         return -EOPNOTSUPP;
                 }
         }
 
         /* Sets the properties for arbitrary filer rule
-         * to the first 4 Layer 4 Bytes */
+         * to the first 4 Layer 4 Bytes
+         */
         regs->rbifx = 0xC0C1C2C3;
         return 0;
 }
@@ -870,14 +894,14 @@ static void gfar_set_mask(u32 mask, struct filer_table *tab)
 static void gfar_set_parse_bits(u32 value, u32 mask, struct filer_table *tab)
 {
         gfar_set_mask(mask, tab);
-        tab->fe[tab->index].ctrl = RQFCR_CMP_EXACT | RQFCR_PID_PARSE
-                        | RQFCR_AND;
+        tab->fe[tab->index].ctrl = RQFCR_CMP_EXACT | RQFCR_PID_PARSE |
+                                   RQFCR_AND;
         tab->fe[tab->index].prop = value;
         tab->index++;
 }
 
 static void gfar_set_general_attribute(u32 value, u32 mask, u32 flag,
-                struct filer_table *tab)
+                                       struct filer_table *tab)
 {
         gfar_set_mask(mask, tab);
         tab->fe[tab->index].ctrl = RQFCR_CMP_EXACT | RQFCR_AND | flag;
@@ -885,8 +909,7 @@ static void gfar_set_general_attribute(u32 value, u32 mask, u32 flag,
         tab->index++;
 }
 
-/*
- * For setting a tuple of value and mask of type flag
+/* For setting a tuple of value and mask of type flag
  * Example:
  * IP-Src = 10.0.0.0/255.0.0.0
  * value: 0x0A000000 mask: FF000000 flag: RQFPR_IPV4
@@ -901,7 +924,7 @@ static void gfar_set_general_attribute(u32 value, u32 mask, u32 flag,
  * Further the all masks are one-padded for better hardware efficiency.
  */
 static void gfar_set_attribute(u32 value, u32 mask, u32 flag,
-                struct filer_table *tab)
+                               struct filer_table *tab)
 {
         switch (flag) {
                 /* 3bit */
@@ -959,7 +982,8 @@ static void gfar_set_attribute(u32 value, u32 mask, u32 flag,
 
 /* Translates value and mask for UDP, TCP or SCTP */
 static void gfar_set_basic_ip(struct ethtool_tcpip4_spec *value,
-                struct ethtool_tcpip4_spec *mask, struct filer_table *tab)
+                              struct ethtool_tcpip4_spec *mask,
+                              struct filer_table *tab)
 {
         gfar_set_attribute(value->ip4src, mask->ip4src, RQFCR_PID_SIA, tab);
         gfar_set_attribute(value->ip4dst, mask->ip4dst, RQFCR_PID_DIA, tab);
@@ -970,97 +994,92 @@ static void gfar_set_basic_ip(struct ethtool_tcpip4_spec *value,
 
 /* Translates value and mask for RAW-IP4 */
 static void gfar_set_user_ip(struct ethtool_usrip4_spec *value,
-                struct ethtool_usrip4_spec *mask, struct filer_table *tab)
+                             struct ethtool_usrip4_spec *mask,
+                             struct filer_table *tab)
 {
         gfar_set_attribute(value->ip4src, mask->ip4src, RQFCR_PID_SIA, tab);
         gfar_set_attribute(value->ip4dst, mask->ip4dst, RQFCR_PID_DIA, tab);
         gfar_set_attribute(value->tos, mask->tos, RQFCR_PID_TOS, tab);
         gfar_set_attribute(value->proto, mask->proto, RQFCR_PID_L4P, tab);
         gfar_set_attribute(value->l4_4_bytes, mask->l4_4_bytes, RQFCR_PID_ARB,
-                        tab);
+                           tab);
 
 }
 
 /* Translates value and mask for ETHER spec */
 static void gfar_set_ether(struct ethhdr *value, struct ethhdr *mask,
-                struct filer_table *tab)
+                           struct filer_table *tab)
 {
         u32 upper_temp_mask = 0;
         u32 lower_temp_mask = 0;
+
         /* Source address */
         if (!is_broadcast_ether_addr(mask->h_source)) {
-
                 if (is_zero_ether_addr(mask->h_source)) {
                         upper_temp_mask = 0xFFFFFFFF;
                         lower_temp_mask = 0xFFFFFFFF;
                 } else {
-                        upper_temp_mask = mask->h_source[0] << 16
-                                        | mask->h_source[1] << 8
-                                        | mask->h_source[2];
-                        lower_temp_mask = mask->h_source[3] << 16
-                                        | mask->h_source[4] << 8
-                                        | mask->h_source[5];
+                        upper_temp_mask = mask->h_source[0] << 16 |
+                                          mask->h_source[1] << 8  |
+                                          mask->h_source[2];
+                        lower_temp_mask = mask->h_source[3] << 16 |
+                                          mask->h_source[4] << 8  |
+                                          mask->h_source[5];
                 }
                 /* Upper 24bit */
-                gfar_set_attribute(
-                                value->h_source[0] << 16 | value->h_source[1]
-                                                << 8 | value->h_source[2],
-                                upper_temp_mask, RQFCR_PID_SAH, tab);
+                gfar_set_attribute(value->h_source[0] << 16 |
+                                   value->h_source[1] << 8  |
+                                   value->h_source[2],
+                                   upper_temp_mask, RQFCR_PID_SAH, tab);
                 /* And the same for the lower part */
-                gfar_set_attribute(
-                                value->h_source[3] << 16 | value->h_source[4]
-                                                << 8 | value->h_source[5],
-                                lower_temp_mask, RQFCR_PID_SAL, tab);
+                gfar_set_attribute(value->h_source[3] << 16 |
+                                   value->h_source[4] << 8  |
+                                   value->h_source[5],
+                                   lower_temp_mask, RQFCR_PID_SAL, tab);
         }
         /* Destination address */
         if (!is_broadcast_ether_addr(mask->h_dest)) {
-
                 /* Special for destination is limited broadcast */
-                if ((is_broadcast_ether_addr(value->h_dest)
-                                && is_zero_ether_addr(mask->h_dest))) {
+                if ((is_broadcast_ether_addr(value->h_dest) &&
+                    is_zero_ether_addr(mask->h_dest))) {
                         gfar_set_parse_bits(RQFPR_EBC, RQFPR_EBC, tab);
                 } else {
-
                         if (is_zero_ether_addr(mask->h_dest)) {
                                 upper_temp_mask = 0xFFFFFFFF;
                                 lower_temp_mask = 0xFFFFFFFF;
                         } else {
-                                upper_temp_mask = mask->h_dest[0] << 16
-                                                | mask->h_dest[1] << 8
-                                                | mask->h_dest[2];
-                                lower_temp_mask = mask->h_dest[3] << 16
-                                                | mask->h_dest[4] << 8
-                                                | mask->h_dest[5];
+                                upper_temp_mask = mask->h_dest[0] << 16 |
+                                                  mask->h_dest[1] << 8  |
+                                                  mask->h_dest[2];
+                                lower_temp_mask = mask->h_dest[3] << 16 |
+                                                  mask->h_dest[4] << 8  |
+                                                  mask->h_dest[5];
                         }
 
                         /* Upper 24bit */
-                        gfar_set_attribute(
-                                        value->h_dest[0] << 16
-                                                        | value->h_dest[1] << 8
-                                                        | value->h_dest[2],
-                                        upper_temp_mask, RQFCR_PID_DAH, tab);
+                        gfar_set_attribute(value->h_dest[0] << 16 |
+                                           value->h_dest[1] << 8  |
+                                           value->h_dest[2],
+                                           upper_temp_mask, RQFCR_PID_DAH, tab);
                         /* And the same for the lower part */
-                        gfar_set_attribute(
-                                        value->h_dest[3] << 16
-                                                        | value->h_dest[4] << 8
-                                                        | value->h_dest[5],
-                                        lower_temp_mask, RQFCR_PID_DAL, tab);
+                        gfar_set_attribute(value->h_dest[3] << 16 |
+                                           value->h_dest[4] << 8  |
+                                           value->h_dest[5],
+                                           lower_temp_mask, RQFCR_PID_DAL, tab);
                 }
         }
 
         gfar_set_attribute(value->h_proto, mask->h_proto, RQFCR_PID_ETY, tab);
-
 }
 
 /* Convert a rule to binary filter format of gianfar */
 static int gfar_convert_to_filer(struct ethtool_rx_flow_spec *rule,
-                struct filer_table *tab)
+                                 struct filer_table *tab)
 {
         u32 vlan = 0, vlan_mask = 0;
         u32 id = 0, id_mask = 0;
         u32 cfi = 0, cfi_mask = 0;
         u32 prio = 0, prio_mask = 0;
-
         u32 old_index = tab->index;
 
         /* Check if vlan is wanted */
@@ -1076,13 +1095,16 @@ static int gfar_convert_to_filer(struct ethtool_rx_flow_spec *rule,
                 id_mask = rule->m_ext.vlan_tci & VLAN_VID_MASK;
                 cfi = rule->h_ext.vlan_tci & VLAN_CFI_MASK;
                 cfi_mask = rule->m_ext.vlan_tci & VLAN_CFI_MASK;
-                prio = (rule->h_ext.vlan_tci & VLAN_PRIO_MASK) >> VLAN_PRIO_SHIFT;
-                prio_mask = (rule->m_ext.vlan_tci & VLAN_PRIO_MASK) >> VLAN_PRIO_SHIFT;
+                prio = (rule->h_ext.vlan_tci & VLAN_PRIO_MASK) >>
+                       VLAN_PRIO_SHIFT;
+                prio_mask = (rule->m_ext.vlan_tci & VLAN_PRIO_MASK) >>
+                            VLAN_PRIO_SHIFT;
 
                 if (cfi == VLAN_TAG_PRESENT && cfi_mask == VLAN_TAG_PRESENT) {
                         vlan |= RQFPR_CFI;
                         vlan_mask |= RQFPR_CFI;
-                } else if (cfi != VLAN_TAG_PRESENT && cfi_mask == VLAN_TAG_PRESENT) {
+                } else if (cfi != VLAN_TAG_PRESENT &&
+                           cfi_mask == VLAN_TAG_PRESENT) {
                         vlan_mask |= RQFPR_CFI;
                 }
         }
@@ -1090,34 +1112,36 @@ static int gfar_convert_to_filer(struct ethtool_rx_flow_spec *rule,
         switch (rule->flow_type & ~FLOW_EXT) {
         case TCP_V4_FLOW:
                 gfar_set_parse_bits(RQFPR_IPV4 | RQFPR_TCP | vlan,
-                                RQFPR_IPV4 | RQFPR_TCP | vlan_mask, tab);
+                                    RQFPR_IPV4 | RQFPR_TCP | vlan_mask, tab);
                 gfar_set_basic_ip(&rule->h_u.tcp_ip4_spec,
-                                &rule->m_u.tcp_ip4_spec, tab);
+                                  &rule->m_u.tcp_ip4_spec, tab);
                 break;
         case UDP_V4_FLOW:
                 gfar_set_parse_bits(RQFPR_IPV4 | RQFPR_UDP | vlan,
-                                RQFPR_IPV4 | RQFPR_UDP | vlan_mask, tab);
+                                    RQFPR_IPV4 | RQFPR_UDP | vlan_mask, tab);
                 gfar_set_basic_ip(&rule->h_u.udp_ip4_spec,
-                                &rule->m_u.udp_ip4_spec, tab);
+                                  &rule->m_u.udp_ip4_spec, tab);
                 break;
         case SCTP_V4_FLOW:
                 gfar_set_parse_bits(RQFPR_IPV4 | vlan, RQFPR_IPV4 | vlan_mask,
-                                tab);
+                                    tab);
                 gfar_set_attribute(132, 0, RQFCR_PID_L4P, tab);
-                gfar_set_basic_ip((struct ethtool_tcpip4_spec *) &rule->h_u,
-                                (struct ethtool_tcpip4_spec *) &rule->m_u, tab);
+                gfar_set_basic_ip((struct ethtool_tcpip4_spec *)&rule->h_u,
+                                  (struct ethtool_tcpip4_spec *)&rule->m_u,
+                                  tab);
                 break;
         case IP_USER_FLOW:
                 gfar_set_parse_bits(RQFPR_IPV4 | vlan, RQFPR_IPV4 | vlan_mask,
-                                tab);
+                                    tab);
                 gfar_set_user_ip((struct ethtool_usrip4_spec *) &rule->h_u,
-                                (struct ethtool_usrip4_spec *) &rule->m_u, tab);
+                                 (struct ethtool_usrip4_spec *) &rule->m_u,
+                                 tab);
                 break;
         case ETHER_FLOW:
                 if (vlan)
                         gfar_set_parse_bits(vlan, vlan_mask, tab);
                 gfar_set_ether((struct ethhdr *) &rule->h_u,
-                                (struct ethhdr *) &rule->m_u, tab);
+                               (struct ethhdr *) &rule->m_u, tab);
                 break;
         default:
                 return -1;
@@ -1152,7 +1176,9 @@ static int gfar_convert_to_filer(struct ethtool_rx_flow_spec *rule,
                 tab->fe[tab->index - 1].ctrl |= RQFCR_CLE;
         }
 
-        /* In rare cases the cache can be full while there is free space in hw */
+        /* In rare cases the cache can be full while there is
+         * free space in hw
+         */
         if (tab->index > MAX_FILER_CACHE_IDX - 1)
                 return -EBUSY;
 
@@ -1161,7 +1187,7 @@ static int gfar_convert_to_filer(struct ethtool_rx_flow_spec *rule,
 
 /* Copy size filer entries */
 static void gfar_copy_filer_entries(struct gfar_filer_entry dst[0],
-                struct gfar_filer_entry src[0], s32 size)
+                                    struct gfar_filer_entry src[0], s32 size)
 {
         while (size > 0) {
                 size--;
@@ -1171,10 +1197,12 @@ static void gfar_copy_filer_entries(struct gfar_filer_entry dst[0],
 }
 
 /* Delete the contents of the filer-table between start and end
- * and collapse them */
+ * and collapse them
+ */
 static int gfar_trim_filer_entries(u32 begin, u32 end, struct filer_table *tab)
 {
         int length;
+
         if (end > MAX_FILER_CACHE_IDX || end < begin)
                 return -EINVAL;
 
@@ -1200,14 +1228,14 @@ static int gfar_trim_filer_entries(u32 begin, u32 end, struct filer_table *tab)
 
 /* Make space on the wanted location */
 static int gfar_expand_filer_entries(u32 begin, u32 length,
-                struct filer_table *tab)
+                                     struct filer_table *tab)
 {
-        if (length == 0 || length + tab->index > MAX_FILER_CACHE_IDX || begin
-                        > MAX_FILER_CACHE_IDX)
+        if (length == 0 || length + tab->index > MAX_FILER_CACHE_IDX ||
+            begin > MAX_FILER_CACHE_IDX)
                 return -EINVAL;
 
         gfar_copy_filer_entries(&(tab->fe[begin + length]), &(tab->fe[begin]),
-                        tab->index - length + 1);
+                                tab->index - length + 1);
 
         tab->index += length;
         return 0;
@@ -1215,9 +1243,10 @@ static int gfar_expand_filer_entries(u32 begin, u32 length,
 
 static int gfar_get_next_cluster_start(int start, struct filer_table *tab)
 {
-        for (; (start < tab->index) && (start < MAX_FILER_CACHE_IDX - 1); start++) {
-                if ((tab->fe[start].ctrl & (RQFCR_AND | RQFCR_CLE))
-                                == (RQFCR_AND | RQFCR_CLE))
+        for (; (start < tab->index) && (start < MAX_FILER_CACHE_IDX - 1);
+             start++) {
+                if ((tab->fe[start].ctrl & (RQFCR_AND | RQFCR_CLE)) ==
+                    (RQFCR_AND | RQFCR_CLE))
                         return start;
         }
         return -1;
@@ -1225,16 +1254,16 @@ static int gfar_get_next_cluster_start(int start, struct filer_table *tab)
 
 static int gfar_get_next_cluster_end(int start, struct filer_table *tab)
 {
-        for (; (start < tab->index) && (start < MAX_FILER_CACHE_IDX - 1); start++) {
-                if ((tab->fe[start].ctrl & (RQFCR_AND | RQFCR_CLE))
-                                == (RQFCR_CLE))
+        for (; (start < tab->index) && (start < MAX_FILER_CACHE_IDX - 1);
+             start++) {
+                if ((tab->fe[start].ctrl & (RQFCR_AND | RQFCR_CLE)) ==
+                    (RQFCR_CLE))
                         return start;
         }
         return -1;
 }
 
-/*
- * Uses hardwares clustering option to reduce
+/* Uses hardwares clustering option to reduce
  * the number of filer table entries
  */
 static void gfar_cluster_filer(struct filer_table *tab)
@@ -1244,8 +1273,7 @@ static void gfar_cluster_filer(struct filer_table *tab)
         while ((i = gfar_get_next_cluster_start(++i, tab)) != -1) {
                 j = i;
                 while ((j = gfar_get_next_cluster_start(++j, tab)) != -1) {
-                        /*
-                         * The cluster entries self and the previous one
+                        /* The cluster entries self and the previous one
                          * (a mask) must be identical!
                          */
                         if (tab->fe[i].ctrl != tab->fe[j].ctrl)
@@ -1260,21 +1288,21 @@ static void gfar_cluster_filer(struct filer_table *tab)
                         jend = gfar_get_next_cluster_end(j, tab);
                         if (jend == -1 || iend == -1)
                                 break;
-                        /*
-                         * First we make some free space, where our cluster
+
+                        /* First we make some free space, where our cluster
                          * element should be. Then we copy it there and finally
                          * delete in from its old location.
                          */
-
-                        if (gfar_expand_filer_entries(iend, (jend - j), tab)
-                                        == -EINVAL)
+                        if (gfar_expand_filer_entries(iend, (jend - j), tab) ==
+                            -EINVAL)
                                 break;
 
                         gfar_copy_filer_entries(&(tab->fe[iend + 1]),
-                                        &(tab->fe[jend + 1]), jend - j);
+                                                &(tab->fe[jend + 1]), jend - j);
 
                         if (gfar_trim_filer_entries(jend - 1,
-                                        jend + (jend - j), tab) == -EINVAL)
+                                                    jend + (jend - j),
+                                                    tab) == -EINVAL)
                                 return;
 
                         /* Mask out cluster bit */
@@ -1285,8 +1313,9 @@ static void gfar_cluster_filer(struct filer_table *tab)
 
 /* Swaps the masked bits of a1<>a2 and b1<>b2 */
 static void gfar_swap_bits(struct gfar_filer_entry *a1,
-                struct gfar_filer_entry *a2, struct gfar_filer_entry *b1,
-                struct gfar_filer_entry *b2, u32 mask)
+                           struct gfar_filer_entry *a2,
+                           struct gfar_filer_entry *b1,
+                           struct gfar_filer_entry *b2, u32 mask)
 {
         u32 temp[4];
         temp[0] = a1->ctrl & mask;
@@ -1305,13 +1334,12 @@ static void gfar_swap_bits(struct gfar_filer_entry *a1,
         b2->ctrl |= temp[2];
 }
 
-/*
- * Generate a list consisting of masks values with their start and
+/* Generate a list consisting of masks values with their start and
  * end of validity and block as indicator for parts belonging
  * together (glued by ANDs) in mask_table
  */
 static u32 gfar_generate_mask_table(struct gfar_mask_entry *mask_table,
-                struct filer_table *tab)
+                                    struct filer_table *tab)
 {
         u32 i, and_index = 0, block_index = 1;
 
@@ -1327,13 +1355,13 @@ static u32 gfar_generate_mask_table(struct gfar_mask_entry *mask_table,
                         and_index++;
                 }
                 /* cluster starts and ends will be separated because they should
-                 * hold their position */
+                 * hold their position
+                 */
                 if (tab->fe[i].ctrl & RQFCR_CLE)
                         block_index++;
                 /* A not set AND indicates the end of a depended block */
                 if (!(tab->fe[i].ctrl & RQFCR_AND))
                         block_index++;
-
         }
 
         mask_table[and_index - 1].end = i - 1;
@@ -1341,14 +1369,13 @@ static u32 gfar_generate_mask_table(struct gfar_mask_entry *mask_table,
         return and_index;
 }
 
-/*
- * Sorts the entries of mask_table by the values of the masks.
+/* Sorts the entries of mask_table by the values of the masks.
  * Important: The 0xFF80 flags of the first and last entry of a
  * block must hold their position (which queue, CLusterEnable, ReJEct,
  * AND)
  */
 static void gfar_sort_mask_table(struct gfar_mask_entry *mask_table,
-                struct filer_table *temp_table, u32 and_index)
+                                 struct filer_table *temp_table, u32 and_index)
 {
         /* Pointer to compare function (_asc or _desc) */
         int (*gfar_comp)(const void *, const void *);
@@ -1359,16 +1386,16 @@ static void gfar_sort_mask_table(struct gfar_mask_entry *mask_table,
         gfar_comp = &gfar_comp_desc;
 
         for (i = 0; i < and_index; i++) {
-
                 if (prev != mask_table[i].block) {
                         old_first = mask_table[start].start + 1;
                         old_last = mask_table[i - 1].end;
                         sort(mask_table + start, size,
-                                        sizeof(struct gfar_mask_entry),
-                                        gfar_comp, &gfar_swap);
+                             sizeof(struct gfar_mask_entry),
+                             gfar_comp, &gfar_swap);
 
                         /* Toggle order for every block. This makes the
-                         * thing more efficient! */
+                         * thing more efficient!
+                         */
                         if (gfar_comp == gfar_comp_desc)
                                 gfar_comp = &gfar_comp_asc;
                         else
@@ -1378,12 +1405,11 @@ static void gfar_sort_mask_table(struct gfar_mask_entry *mask_table,
                         new_last = mask_table[i - 1].end;
 
                         gfar_swap_bits(&temp_table->fe[new_first],
-                                        &temp_table->fe[old_first],
-                                        &temp_table->fe[new_last],
-                                        &temp_table->fe[old_last],
-                                        RQFCR_QUEUE | RQFCR_CLE |
-                                                RQFCR_RJE | RQFCR_AND
-                                        );
+                                       &temp_table->fe[old_first],
+                                       &temp_table->fe[new_last],
+                                       &temp_table->fe[old_last],
+                                       RQFCR_QUEUE | RQFCR_CLE |
+                                       RQFCR_RJE | RQFCR_AND);
 
                         start = i;
                         size = 0;
@@ -1391,11 +1417,9 @@ static void gfar_sort_mask_table(struct gfar_mask_entry *mask_table,
                 size++;
                 prev = mask_table[i].block;
         }
-
 }
 
-/*
- * Reduces the number of masks needed in the filer table to save entries
+/* Reduces the number of masks needed in the filer table to save entries
  * This is done by sorting the masks of a depended block. A depended block is
  * identified by gluing ANDs or CLE. The sorting order toggles after every
  * block. Of course entries in scope of a mask must change their location with
@@ -1410,13 +1434,14 @@ static int gfar_optimize_filer_masks(struct filer_table *tab)
         s32 ret = 0;
 
         /* We need a copy of the filer table because
-         * we want to change its order */
+         * we want to change its order
+         */
         temp_table = kmemdup(tab, sizeof(*temp_table), GFP_KERNEL);
         if (temp_table == NULL)
                 return -ENOMEM;
 
         mask_table = kcalloc(MAX_FILER_CACHE_IDX / 2 + 1,
-                        sizeof(struct gfar_mask_entry), GFP_KERNEL);
+                             sizeof(struct gfar_mask_entry), GFP_KERNEL);
 
         if (mask_table == NULL) {
                 ret = -ENOMEM;
@@ -1428,7 +1453,8 @@ static int gfar_optimize_filer_masks(struct filer_table *tab)
         gfar_sort_mask_table(mask_table, temp_table, and_index);
 
         /* Now we can copy the data from our duplicated filer table to
-         * the real one in the order the mask table says */
+         * the real one in the order the mask table says
+         */
         for (i = 0; i < and_index; i++) {
                 size = mask_table[i].end - mask_table[i].start + 1;
                 gfar_copy_filer_entries(&(tab->fe[j]),
@@ -1437,7 +1463,8 @@ static int gfar_optimize_filer_masks(struct filer_table *tab)
         }
 
         /* And finally we just have to check for duplicated masks and drop the
-         * second ones */
+         * second ones
+         */
         for (i = 0; i < tab->index && i < MAX_FILER_CACHE_IDX; i++) {
                 if (tab->fe[i].ctrl == 0x80) {
                         previous_mask = i++;
@@ -1448,7 +1475,8 @@ static int gfar_optimize_filer_masks(struct filer_table *tab)
                 if (tab->fe[i].ctrl == 0x80) {
                         if (tab->fe[i].prop == tab->fe[previous_mask].prop) {
                                 /* Two identical ones found!
-                                 * So drop the second one! */
+                                 * So drop the second one!
+                                 */
                                 gfar_trim_filer_entries(i, i, tab);
                         } else
                                 /* Not identical! */
@@ -1463,7 +1491,7 @@ end:	kfree(temp_table);
 
 /* Write the bit-pattern from software's buffer to hardware registers */
 static int gfar_write_filer_table(struct gfar_private *priv,
-                struct filer_table *tab)
+                                  struct filer_table *tab)
 {
         u32 i = 0;
         if (tab->index > MAX_FILER_IDX - 1)
@@ -1473,13 +1501,15 @@ static int gfar_write_filer_table(struct gfar_private *priv,
         lock_rx_qs(priv);
 
         /* Fill regular entries */
-        for (; i < MAX_FILER_IDX - 1 && (tab->fe[i].ctrl | tab->fe[i].ctrl); i++)
+        for (; i < MAX_FILER_IDX - 1 && (tab->fe[i].ctrl | tab->fe[i].ctrl);
+             i++)
                 gfar_write_filer(priv, i, tab->fe[i].ctrl, tab->fe[i].prop);
         /* Fill the rest with fall-troughs */
         for (; i < MAX_FILER_IDX - 1; i++)
                 gfar_write_filer(priv, i, 0x60, 0xFFFFFFFF);
         /* Last entry must be default accept
-         * because that's what people expect */
+         * because that's what people expect
+         */
         gfar_write_filer(priv, i, 0x20, 0x0);
 
         unlock_rx_qs(priv);
@@ -1488,21 +1518,21 @@ static int gfar_write_filer_table(struct gfar_private *priv,
 }
 
 static int gfar_check_capability(struct ethtool_rx_flow_spec *flow,
-                struct gfar_private *priv)
+                                 struct gfar_private *priv)
 {
 
         if (flow->flow_type & FLOW_EXT) {
                 if (~flow->m_ext.data[0] || ~flow->m_ext.data[1])
                         netdev_warn(priv->ndev,
-                                        "User-specific data not supported!\n");
+                                    "User-specific data not supported!\n");
                 if (~flow->m_ext.vlan_etype)
                         netdev_warn(priv->ndev,
-                                        "VLAN-etype not supported!\n");
+                                    "VLAN-etype not supported!\n");
         }
         if (flow->flow_type == IP_USER_FLOW)
                 if (flow->h_u.usr_ip4_spec.ip_ver != ETH_RX_NFC_IP4)
                         netdev_warn(priv->ndev,
-                                        "IP-Version differing from IPv4 not supported!\n");
+                                    "IP-Version differing from IPv4 not supported!\n");
 
         return 0;
 }
@@ -1520,15 +1550,18 @@ static int gfar_process_filer_changes(struct gfar_private *priv)
                 return -ENOMEM;
 
         /* Now convert the existing filer data from flow_spec into
-         * filer tables binary format */
+         * filer tables binary format
+         */
         list_for_each_entry(j, &priv->rx_list.list, list) {
                 ret = gfar_convert_to_filer(&j->fs, tab);
                 if (ret == -EBUSY) {
-                        netdev_err(priv->ndev, "Rule not added: No free space!\n");
+                        netdev_err(priv->ndev,
+                                   "Rule not added: No free space!\n");
                         goto end;
                 }
                 if (ret == -1) {
-                        netdev_err(priv->ndev, "Rule not added: Unsupported Flow-type!\n");
+                        netdev_err(priv->ndev,
+                                   "Rule not added: Unsupported Flow-type!\n");
                         goto end;
                 }
         }
@@ -1540,9 +1573,9 @@ static int gfar_process_filer_changes(struct gfar_private *priv)
         gfar_optimize_filer_masks(tab);
 
         pr_debug("\n\tSummary:\n"
-                "\tData on hardware: %d\n"
-                "\tCompression rate: %d%%\n",
-                tab->index, 100 - (100 * tab->index) / i);
+                 "\tData on hardware: %d\n"
+                 "\tCompression rate: %d%%\n",
+                 tab->index, 100 - (100 * tab->index) / i);
 
         /* Write everything to hardware */
         ret = gfar_write_filer_table(priv, tab);
@@ -1551,7 +1584,8 @@ static int gfar_process_filer_changes(struct gfar_private *priv)
                 goto end;
         }
 
-end:    kfree(tab);
+end:
+        kfree(tab);
         return ret;
 }
 
@@ -1569,7 +1603,7 @@ static void gfar_invert_masks(struct ethtool_rx_flow_spec *flow)
 }
 
 static int gfar_add_cls(struct gfar_private *priv,
-                struct ethtool_rx_flow_spec *flow)
+                        struct ethtool_rx_flow_spec *flow)
 {
         struct ethtool_flow_spec_container *temp, *comp;
         int ret = 0;
@@ -1591,7 +1625,6 @@ static int gfar_add_cls(struct gfar_private *priv,
                 list_add(&temp->list, &priv->rx_list.list);
                 goto process;
         } else {
-
                 list_for_each_entry(comp, &priv->rx_list.list, list) {
                         if (comp->fs.location > flow->location) {
                                 list_add_tail(&temp->list, &comp->list);
@@ -1599,8 +1632,8 @@ static int gfar_add_cls(struct gfar_private *priv,
                         }
                         if (comp->fs.location == flow->location) {
                                 netdev_err(priv->ndev,
-                                                "Rule not added: ID %d not free!\n",
-                                        flow->location);
+                                           "Rule not added: ID %d not free!\n",
+                                           flow->location);
                                 ret = -EBUSY;
                                 goto clean_mem;
                         }
@@ -1642,7 +1675,6 @@ static int gfar_del_cls(struct gfar_private *priv, u32 loc)
         }
 
         return ret;
-
 }
 
 static int gfar_get_cls(struct gfar_private *priv, struct ethtool_rxnfc *cmd)
@@ -1663,7 +1695,7 @@ static int gfar_get_cls(struct gfar_private *priv, struct ethtool_rxnfc *cmd)
 }
 
 static int gfar_get_cls_all(struct gfar_private *priv,
-                struct ethtool_rxnfc *cmd, u32 *rule_locs)
+                            struct ethtool_rxnfc *cmd, u32 *rule_locs)
 {
         struct ethtool_flow_spec_container *comp;
         u32 i = 0;
@@ -1714,7 +1746,7 @@ static int gfar_set_nfc(struct net_device *dev, struct ethtool_rxnfc *cmd)
 }
 
 static int gfar_get_nfc(struct net_device *dev, struct ethtool_rxnfc *cmd,
-                u32 *rule_locs)
+                        u32 *rule_locs)
 {
         struct gfar_private *priv = netdev_priv(dev);
         int ret = 0;
@@ -1748,23 +1780,19 @@ static int gfar_get_ts_info(struct net_device *dev,
         struct gfar_private *priv = netdev_priv(dev);
 
         if (!(priv->device_flags & FSL_GIANFAR_DEV_HAS_TIMER)) {
-                info->so_timestamping =
-                        SOF_TIMESTAMPING_RX_SOFTWARE |
-                        SOF_TIMESTAMPING_SOFTWARE;
+                info->so_timestamping = SOF_TIMESTAMPING_RX_SOFTWARE |
+                                        SOF_TIMESTAMPING_SOFTWARE;
                 info->phc_index = -1;
                 return 0;
         }
-        info->so_timestamping =
-                SOF_TIMESTAMPING_TX_HARDWARE |
-                SOF_TIMESTAMPING_RX_HARDWARE |
-                SOF_TIMESTAMPING_RAW_HARDWARE;
+        info->so_timestamping = SOF_TIMESTAMPING_TX_HARDWARE |
+                                SOF_TIMESTAMPING_RX_HARDWARE |
+                                SOF_TIMESTAMPING_RAW_HARDWARE;
         info->phc_index = gfar_phc_index;
-        info->tx_types =
-                (1 << HWTSTAMP_TX_OFF) |
-                (1 << HWTSTAMP_TX_ON);
-        info->rx_filters =
-                (1 << HWTSTAMP_FILTER_NONE) |
-                (1 << HWTSTAMP_FILTER_ALL);
+        info->tx_types = (1 << HWTSTAMP_TX_OFF) |
+                         (1 << HWTSTAMP_TX_ON);
+        info->rx_filters = (1 << HWTSTAMP_FILTER_NONE) |
+                           (1 << HWTSTAMP_FILTER_ALL);
         return 0;
 }
 
diff --git a/drivers/net/ethernet/freescale/ucc_geth.c b/drivers/net/ethernet/freescale/ucc_geth.c
index 9ac14f80485..21c6574c5f1 100644
--- a/drivers/net/ethernet/freescale/ucc_geth.c
+++ b/drivers/net/ethernet/freescale/ucc_geth.c
@@ -185,7 +185,7 @@ static void mem_disp(u8 *addr, int size)
         for (; (u32) i < (u32) addr + size4Aling; i += 4)
                 printk("%08x ", *((u32 *) (i)));
         for (; (u32) i < (u32) addr + size; i++)
-                printk("%02x", *((u8 *) (i)));
+                printk("%02x", *((i)));
         if (notAlign == 1)
                 printk("\r\n");
 }
diff --git a/drivers/net/ethernet/hp/hp100.c b/drivers/net/ethernet/hp/hp100.c
index d496673f090..3f4391bede8 100644
--- a/drivers/net/ethernet/hp/hp100.c
+++ b/drivers/net/ethernet/hp/hp100.c
@@ -1217,7 +1217,7 @@ static int hp100_init_rxpdl(struct net_device *dev,
 
         ringptr->pdl = pdlptr + 1;
         ringptr->pdl_paddr = virt_to_whatever(dev, pdlptr + 1);
-        ringptr->skb = (void *) NULL;
+        ringptr->skb = NULL;
 
         /*
          * Write address and length of first PDL Fragment (which is used for
@@ -1243,7 +1243,7 @@ static int hp100_init_txpdl(struct net_device *dev,
 
         ringptr->pdl = pdlptr;  /* +1; */
         ringptr->pdl_paddr = virt_to_whatever(dev, pdlptr);     /* +1 */
-        ringptr->skb = (void *) NULL;
+        ringptr->skb = NULL;
 
         return roundup(MAX_TX_FRAG * 2 + 2, 4);
 }
@@ -1628,7 +1628,7 @@ static void hp100_clean_txring(struct net_device *dev)
                 /* Conversion to new PCI API : NOP */
                 pci_unmap_single(lp->pci_dev, (dma_addr_t) lp->txrhead->pdl[1], lp->txrhead->pdl[2], PCI_DMA_TODEVICE);
                 dev_kfree_skb_any(lp->txrhead->skb);
-                lp->txrhead->skb = (void *) NULL;
+                lp->txrhead->skb = NULL;
                 lp->txrhead = lp->txrhead->next;
                 lp->txrcommit--;
         }
diff --git a/drivers/net/ethernet/i825xx/lp486e.c b/drivers/net/ethernet/i825xx/lp486e.c
index 6c2952c8ea1..3735bfa5360 100644
--- a/drivers/net/ethernet/i825xx/lp486e.c
+++ b/drivers/net/ethernet/i825xx/lp486e.c
@@ -629,10 +629,10 @@ init_i596(struct net_device *dev) {
 
         memcpy ((void *)lp->eth_addr, dev->dev_addr, 6);
         lp->set_add.command = CmdIASetup;
-        i596_add_cmd(dev, (struct i596_cmd *)&lp->set_add);
+        i596_add_cmd(dev, &lp->set_add);
 
         lp->tdr.command = CmdTDR;
-        i596_add_cmd(dev, (struct i596_cmd *)&lp->tdr);
+        i596_add_cmd(dev, &lp->tdr);
 
         if (lp->scb.command && i596_timeout(dev, "i82596 init", 200))
                 return 1;
@@ -737,7 +737,7 @@ i596_cleanup_cmd(struct net_device *dev) {
 
         lp = netdev_priv(dev);
         while (lp->cmd_head) {
-                cmd = (struct i596_cmd *)lp->cmd_head;
+                cmd = lp->cmd_head;
 
                 lp->cmd_head = pa_to_va(lp->cmd_head->pa_next);
                 lp->cmd_backlog--;
@@ -1281,7 +1281,7 @@ static void set_multicast_list(struct net_device *dev) {
                         lp->i596_config[8] |= 0x01;
                 }
 
-                i596_add_cmd(dev, (struct i596_cmd *) &lp->set_conf);
+                i596_add_cmd(dev, &lp->set_conf);
         }
 }
 
diff --git a/drivers/net/ethernet/i825xx/sun3_82586.c b/drivers/net/ethernet/i825xx/sun3_82586.c
index cae17f4bc93..353f57f675d 100644
--- a/drivers/net/ethernet/i825xx/sun3_82586.c
+++ b/drivers/net/ethernet/i825xx/sun3_82586.c
@@ -571,7 +571,7 @@ static int init586(struct net_device *dev)
         }
 #endif
 
-        ptr = alloc_rfa(dev,(void *)ptr); /* init receive-frame-area */
+        ptr = alloc_rfa(dev,ptr); /* init receive-frame-area */
 
         /*
          * alloc xmit-buffs / init xmit_cmds
@@ -584,7 +584,7 @@ static int init586(struct net_device *dev)
                 ptr = (char *) ptr + XMIT_BUFF_SIZE;
                 p->xmit_buffs[i] = (struct tbd_struct *)ptr; /* TBD */
                 ptr = (char *) ptr + sizeof(struct tbd_struct);
-                if((void *)ptr > (void *)dev->mem_end)
+                if(ptr > (void *)dev->mem_end)
                 {
                         printk("%s: not enough shared-mem for your configuration!\n",dev->name);
                         return 1;
diff --git a/drivers/net/ethernet/ibm/ehea/ehea_qmr.c b/drivers/net/ethernet/ibm/ehea/ehea_qmr.c
index 4fb47f14dbf..cb66f574dc9 100644
--- a/drivers/net/ethernet/ibm/ehea/ehea_qmr.c
+++ b/drivers/net/ethernet/ibm/ehea/ehea_qmr.c
@@ -376,9 +376,7 @@ int ehea_destroy_eq(struct ehea_eq *eq)
         return 0;
 }
 
-/**
- * allocates memory for a queue and registers pages in phyp
- */
+/* allocates memory for a queue and registers pages in phyp */
 static int ehea_qp_alloc_register(struct ehea_qp *qp, struct hw_queue *hw_queue,
                            int nr_pages, int wqe_size, int act_nr_sges,
                            struct ehea_adapter *adapter, int h_call_q_selector)
diff --git a/drivers/net/ethernet/intel/e1000/e1000_hw.c b/drivers/net/ethernet/intel/e1000/e1000_hw.c
index c526279e492..3d683952876 100644
--- a/drivers/net/ethernet/intel/e1000/e1000_hw.c
+++ b/drivers/net/ethernet/intel/e1000/e1000_hw.c
@@ -399,7 +399,7 @@ void e1000_set_media_type(struct e1000_hw *hw)
 }
 
 /**
- * e1000_reset_hw: reset the hardware completely
+ * e1000_reset_hw - reset the hardware completely
  * @hw: Struct containing variables accessed by shared code
  *
  * Reset the transmit and receive units; mask and clear all interrupts.
@@ -546,7 +546,7 @@ s32 e1000_reset_hw(struct e1000_hw *hw)
 }
 
 /**
- * e1000_init_hw: Performs basic configuration of the adapter.
+ * e1000_init_hw - Performs basic configuration of the adapter.
  * @hw: Struct containing variables accessed by shared code
  *
  * Assumes that the controller has previously been reset and is in a
@@ -2591,7 +2591,7 @@ s32 e1000_check_for_link(struct e1000_hw *hw)
  * @hw: Struct containing variables accessed by shared code
  * @speed: Speed of the connection
  * @duplex: Duplex setting of the connection
-
+ *
  * Detects the current speed and duplex settings of the hardware.
  */
 s32 e1000_get_speed_and_duplex(struct e1000_hw *hw, u16 *speed, u16 *duplex)
@@ -2959,7 +2959,7 @@ static s32 e1000_read_phy_reg_ex(struct e1000_hw *hw, u32 reg_addr,
  * @hw: Struct containing variables accessed by shared code
  * @reg_addr: address of the PHY register to write
  * @data: data to write to the PHY
-
+ *
  * Writes a value to a PHY register
  */
 s32 e1000_write_phy_reg(struct e1000_hw *hw, u32 reg_addr, u16 phy_data)
diff --git a/drivers/net/ethernet/intel/e1000/e1000_main.c b/drivers/net/ethernet/intel/e1000/e1000_main.c
index 7483ca0a628..3bfbb8df898 100644
--- a/drivers/net/ethernet/intel/e1000/e1000_main.c
+++ b/drivers/net/ethernet/intel/e1000/e1000_main.c
@@ -721,9 +721,7 @@ void e1000_reset(struct e1000_adapter *adapter)
         e1000_release_manageability(adapter);
 }
 
-/**
- *  Dump the eeprom for users having checksum issues
- **/
+/* Dump the eeprom for users having checksum issues */
 static void e1000_dump_eeprom(struct e1000_adapter *adapter)
 {
         struct net_device *netdev = adapter->netdev;
@@ -1078,18 +1076,18 @@ static int __devinit e1000_probe(struct pci_dev *pdev,
         netdev->priv_flags |= IFF_SUPP_NOFCS;
 
         netdev->features |= netdev->hw_features;
-        netdev->hw_features |= NETIF_F_RXCSUM;
-        netdev->hw_features |= NETIF_F_RXALL;
-        netdev->hw_features |= NETIF_F_RXFCS;
+        netdev->hw_features |= (NETIF_F_RXCSUM |
+                                NETIF_F_RXALL |
+                                NETIF_F_RXFCS);
 
         if (pci_using_dac) {
                 netdev->features |= NETIF_F_HIGHDMA;
                 netdev->vlan_features |= NETIF_F_HIGHDMA;
         }
 
-        netdev->vlan_features |= NETIF_F_TSO;
-        netdev->vlan_features |= NETIF_F_HW_CSUM;
-        netdev->vlan_features |= NETIF_F_SG;
+        netdev->vlan_features |= (NETIF_F_TSO |
+                                  NETIF_F_HW_CSUM |
+                                  NETIF_F_SG);
 
         netdev->priv_flags |= IFF_UNICAST_FLT;
 
@@ -3056,14 +3054,13 @@ static void e1000_tx_queue(struct e1000_adapter *adapter,
         mmiowb();
 }
 
-/**
- * 82547 workaround to avoid controller hang in half-duplex environment.
+/* 82547 workaround to avoid controller hang in half-duplex environment.
  * The workaround is to avoid queuing a large packet that would span
  * the internal Tx FIFO ring boundary by notifying the stack to resend
  * the packet at a later time.  This gives the Tx FIFO an opportunity to
  * flush all packets.  When that occurs, we reset the Tx FIFO pointers
  * to the beginning of the Tx FIFO.
- **/
+ */
 
 #define E1000_FIFO_HDR                  0x10
 #define E1000_82547_PAD_LEN             0x3E0
diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c
index 623e30b9964..ca477e87eb8 100644
--- a/drivers/net/ethernet/intel/e1000e/netdev.c
+++ b/drivers/net/ethernet/intel/e1000e/netdev.c
@@ -2159,7 +2159,7 @@ void e1000e_release_hw_control(struct e1000_adapter *adapter)
 }
 
 /**
- * @e1000_alloc_ring - allocate memory for a ring structure
+ * e1000_alloc_ring_dma - allocate memory for a ring structure
  **/
 static int e1000_alloc_ring_dma(struct e1000_adapter *adapter,
                                 struct e1000_ring *ring)
@@ -6191,7 +6191,8 @@ static int __devinit e1000_probe(struct pci_dev *pdev,
         }
 
         if (hw->phy.ops.check_reset_block && hw->phy.ops.check_reset_block(hw))
-                e_info("PHY reset is blocked due to SOL/IDER session.\n");
+                dev_info(&pdev->dev,
+                         "PHY reset is blocked due to SOL/IDER session.\n");
 
         /* Set initial default active device features */
         netdev->features = (NETIF_F_SG |
@@ -6241,7 +6242,7 @@ static int __devinit e1000_probe(struct pci_dev *pdev,
                 if (e1000_validate_nvm_checksum(&adapter->hw) >= 0)
                         break;
                 if (i == 2) {
-                        e_err("The NVM Checksum Is Not Valid\n");
+                        dev_err(&pdev->dev, "The NVM Checksum Is Not Valid\n");
                         err = -EIO;
                         goto err_eeprom;
                 }
@@ -6251,13 +6252,15 @@ static int __devinit e1000_probe(struct pci_dev *pdev,
 
         /* copy the MAC address */
         if (e1000e_read_mac_addr(&adapter->hw))
-                e_err("NVM Read Error while reading MAC address\n");
+                dev_err(&pdev->dev,
+                        "NVM Read Error while reading MAC address\n");
 
         memcpy(netdev->dev_addr, adapter->hw.mac.addr, netdev->addr_len);
         memcpy(netdev->perm_addr, adapter->hw.mac.addr, netdev->addr_len);
 
         if (!is_valid_ether_addr(netdev->perm_addr)) {
-                e_err("Invalid MAC Address: %pM\n", netdev->perm_addr);
+                dev_err(&pdev->dev, "Invalid MAC Address: %pM\n",
+                        netdev->perm_addr);
                 err = -EIO;
                 goto err_eeprom;
         }
diff --git a/drivers/net/ethernet/intel/e1000e/param.c b/drivers/net/ethernet/intel/e1000e/param.c
index 55cc1565bc2..dfbfa7fd98c 100644
--- a/drivers/net/ethernet/intel/e1000e/param.c
+++ b/drivers/net/ethernet/intel/e1000e/param.c
@@ -199,16 +199,19 @@ static int __devinit e1000_validate_option(unsigned int *value,
         case enable_option:
                 switch (*value) {
                 case OPTION_ENABLED:
-                        e_info("%s Enabled\n", opt->name);
+                        dev_info(&adapter->pdev->dev, "%s Enabled\n",
+                                 opt->name);
                         return 0;
                 case OPTION_DISABLED:
-                        e_info("%s Disabled\n", opt->name);
+                        dev_info(&adapter->pdev->dev, "%s Disabled\n",
+                                 opt->name);
                         return 0;
                 }
                 break;
         case range_option:
                 if (*value >= opt->arg.r.min && *value <= opt->arg.r.max) {
-                        e_info("%s set to %i\n", opt->name, *value);
+                        dev_info(&adapter->pdev->dev, "%s set to %i\n",
+                                 opt->name, *value);
                         return 0;
                 }
                 break;
@@ -220,7 +223,8 @@ static int __devinit e1000_validate_option(unsigned int *value,
                         ent = &opt->arg.l.p[i];
                         if (*value == ent->i) {
                                 if (ent->str[0] != '\0')
-                                        e_info("%s\n", ent->str);
+                                        dev_info(&adapter->pdev->dev, "%s\n",
+                                                 ent->str);
                                 return 0;
                         }
                 }
@@ -230,8 +234,8 @@ static int __devinit e1000_validate_option(unsigned int *value,
                 BUG();
         }
 
-        e_info("Invalid %s value specified (%i) %s\n", opt->name, *value,
-               opt->err);
+        dev_info(&adapter->pdev->dev, "Invalid %s value specified (%i) %s\n",
+                 opt->name, *value, opt->err);
         *value = opt->def;
         return -1;
 }
@@ -251,8 +255,10 @@ void __devinit e1000e_check_options(struct e1000_adapter *adapter)
         int bd = adapter->bd_number;
 
         if (bd >= E1000_MAX_NIC) {
-                e_notice("Warning: no configuration for board #%i\n", bd);
-                e_notice("Using defaults for all values\n");
+                dev_notice(&adapter->pdev->dev,
+                           "Warning: no configuration for board #%i\n", bd);
+                dev_notice(&adapter->pdev->dev,
+                           "Using defaults for all values\n");
         }
 
         { /* Transmit Interrupt Delay */
@@ -366,27 +372,32 @@ void __devinit e1000e_check_options(struct e1000_adapter *adapter)
                          * default values
                          */
                         if (adapter->itr > 4)
-                                e_info("%s set to default %d\n", opt.name,
-                                       adapter->itr);
+                                dev_info(&adapter->pdev->dev,
+                                         "%s set to default %d\n", opt.name,
+                                         adapter->itr);
                 }
 
                 adapter->itr_setting = adapter->itr;
                 switch (adapter->itr) {
                 case 0:
-                        e_info("%s turned off\n", opt.name);
+                        dev_info(&adapter->pdev->dev, "%s turned off\n",
+                                 opt.name);
                         break;
                 case 1:
-                        e_info("%s set to dynamic mode\n", opt.name);
+                        dev_info(&adapter->pdev->dev,
+                                 "%s set to dynamic mode\n", opt.name);
                         adapter->itr = 20000;
                         break;
                 case 3:
-                        e_info("%s set to dynamic conservative mode\n",
-                               opt.name);
+                        dev_info(&adapter->pdev->dev,
+                                 "%s set to dynamic conservative mode\n",
+                                 opt.name);
                         adapter->itr = 20000;
                         break;
                 case 4:
-                        e_info("%s set to simplified (2000-8000 ints) mode\n",
-                               opt.name);
+                        dev_info(&adapter->pdev->dev,
+                                 "%s set to simplified (2000-8000 ints) mode\n",
+                                 opt.name);
                         break;
                 default:
                         /*
diff --git a/drivers/net/ethernet/intel/igb/e1000_regs.h b/drivers/net/ethernet/intel/igb/e1000_regs.h
index 35d1e4f2c92..10efcd88dca 100644
--- a/drivers/net/ethernet/intel/igb/e1000_regs.h
+++ b/drivers/net/ethernet/intel/igb/e1000_regs.h
@@ -117,6 +117,7 @@
 
 /* TX Rate Limit Registers */
 #define E1000_RTTDQSEL  0x3604  /* Tx Desc Plane Queue Select - WO */
+#define E1000_RTTBCNRM  0x3690  /* Tx BCN Rate-scheduler MMW */
 #define E1000_RTTBCNRC  0x36B0  /* Tx BCN Rate-Scheduler Config - WO */
 
 /* Split and Replication RX Control - RW */
diff --git a/drivers/net/ethernet/intel/igb/igb.h b/drivers/net/ethernet/intel/igb/igb.h
index ae6d3f393a5..9e572dd29ab 100644
--- a/drivers/net/ethernet/intel/igb/igb.h
+++ b/drivers/net/ethernet/intel/igb/igb.h
@@ -65,19 +65,30 @@ struct igb_adapter;
 #define MAX_Q_VECTORS                      8
 
 /* Transmit and receive queues */
-#define IGB_MAX_RX_QUEUES               ((adapter->vfs_allocated_count ? 2 : \
-                                        (hw->mac.type > e1000_82575 ? 8 : 4)))
-#define IGB_MAX_RX_QUEUES_I210             4
+#define IGB_MAX_RX_QUEUES                  8
+#define IGB_MAX_RX_QUEUES_82575            4
 #define IGB_MAX_RX_QUEUES_I211             2
-#define IGB_MAX_TX_QUEUES                  16
-#define IGB_MAX_TX_QUEUES_I210             4
-#define IGB_MAX_TX_QUEUES_I211             2
+#define IGB_MAX_TX_QUEUES                  8
 #define IGB_MAX_VF_MC_ENTRIES              30
 #define IGB_MAX_VF_FUNCTIONS               8
 #define IGB_MAX_VFTA_ENTRIES               128
 #define IGB_82576_VF_DEV_ID                0x10CA
 #define IGB_I350_VF_DEV_ID                 0x1520
 
+/* NVM version defines */
+#define IGB_MAJOR_MASK                  0xF000
+#define IGB_MINOR_MASK                  0x0FF0
+#define IGB_BUILD_MASK                  0x000F
+#define IGB_COMB_VER_MASK               0x00FF
+#define IGB_MAJOR_SHIFT                 12
+#define IGB_MINOR_SHIFT                 4
+#define IGB_COMB_VER_SHFT               8
+#define IGB_NVM_VER_INVALID             0xFFFF
+#define IGB_ETRACK_SHIFT                16
+#define NVM_ETRACK_WORD                 0x0042
+#define NVM_COMB_VER_OFF                0x0083
+#define NVM_COMB_VER_PTR                0x003d
+
 struct vf_data_storage {
         unsigned char vf_mac_addresses[ETH_ALEN];
         u16 vf_mc_hashes[IGB_MAX_VF_MC_ENTRIES];
@@ -371,6 +382,7 @@ struct igb_adapter {
         spinlock_t tmreg_lock;
         struct cyclecounter cc;
         struct timecounter tc;
+        char fw_version[32];
 };
 
 #define IGB_FLAG_HAS_MSI           (1 << 0)
@@ -420,6 +432,7 @@ extern void igb_update_stats(struct igb_adapter *, struct rtnl_link_stats64 *);
 extern bool igb_has_link(struct igb_adapter *adapter);
 extern void igb_set_ethtool_ops(struct net_device *);
 extern void igb_power_up_link(struct igb_adapter *);
+extern void igb_set_fw_version(struct igb_adapter *);
 #ifdef CONFIG_IGB_PTP
 extern void igb_ptp_init(struct igb_adapter *adapter);
 extern void igb_ptp_remove(struct igb_adapter *adapter);
diff --git a/drivers/net/ethernet/intel/igb/igb_ethtool.c b/drivers/net/ethernet/intel/igb/igb_ethtool.c
index 812d4f963bd..a19c84cad0e 100644
--- a/drivers/net/ethernet/intel/igb/igb_ethtool.c
+++ b/drivers/net/ethernet/intel/igb/igb_ethtool.c
@@ -710,6 +710,7 @@ static int igb_set_eeprom(struct net_device *netdev,
         if ((ret_val == 0) && ((first_word <= NVM_CHECKSUM_REG)))
                 hw->nvm.ops.update(hw);
 
+        igb_set_fw_version(adapter);
         kfree(eeprom_buff);
         return ret_val;
 }
@@ -718,20 +719,16 @@ static void igb_get_drvinfo(struct net_device *netdev,
                             struct ethtool_drvinfo *drvinfo)
 {
         struct igb_adapter *adapter = netdev_priv(netdev);
-        u16 eeprom_data;
 
         strlcpy(drvinfo->driver,  igb_driver_name, sizeof(drvinfo->driver));
         strlcpy(drvinfo->version, igb_driver_version, sizeof(drvinfo->version));
 
-        /* EEPROM image version # is reported as firmware version # for
-         * 82575 controllers */
-        adapter->hw.nvm.ops.read(&adapter->hw, 5, 1, &eeprom_data);
-        snprintf(drvinfo->fw_version, sizeof(drvinfo->fw_version),
-                "%d.%d-%d",
-                (eeprom_data & 0xF000) >> 12,
-                (eeprom_data & 0x0FF0) >> 4,
-                eeprom_data & 0x000F);
-
+        /*
+         * EEPROM image version # is reported as firmware version # for
+         * 82575 controllers
+         */
+        strlcpy(drvinfo->fw_version, adapter->fw_version,
+                sizeof(drvinfo->fw_version));
         strlcpy(drvinfo->bus_info, pci_name(adapter->pdev),
                 sizeof(drvinfo->bus_info));
         drvinfo->n_stats = IGB_STATS_LEN;
@@ -2271,6 +2268,38 @@ static void igb_ethtool_complete(struct net_device *netdev)
         pm_runtime_put(&adapter->pdev->dev);
 }
 
+#ifdef CONFIG_IGB_PTP
+static int igb_ethtool_get_ts_info(struct net_device *dev,
+                                   struct ethtool_ts_info *info)
+{
+        struct igb_adapter *adapter = netdev_priv(dev);
+
+        info->so_timestamping =
+                SOF_TIMESTAMPING_TX_HARDWARE |
+                SOF_TIMESTAMPING_RX_HARDWARE |
+                SOF_TIMESTAMPING_RAW_HARDWARE;
+
+        if (adapter->ptp_clock)
+                info->phc_index = ptp_clock_index(adapter->ptp_clock);
+        else
+                info->phc_index = -1;
+
+        info->tx_types =
+                (1 << HWTSTAMP_TX_OFF) |
+                (1 << HWTSTAMP_TX_ON);
+
+        info->rx_filters =
+                (1 << HWTSTAMP_FILTER_NONE) |
+                (1 << HWTSTAMP_FILTER_ALL) |
+                (1 << HWTSTAMP_FILTER_SOME) |
+                (1 << HWTSTAMP_FILTER_PTP_V1_L4_SYNC) |
+                (1 << HWTSTAMP_FILTER_PTP_V1_L4_DELAY_REQ) |
+                (1 << HWTSTAMP_FILTER_PTP_V2_EVENT);
+
+        return 0;
+}
+
+#endif
 static const struct ethtool_ops igb_ethtool_ops = {
         .get_settings           = igb_get_settings,
         .set_settings           = igb_set_settings,
@@ -2299,6 +2328,9 @@ static const struct ethtool_ops igb_ethtool_ops = {
         .set_coalesce           = igb_set_coalesce,
         .begin                  = igb_ethtool_begin,
         .complete               = igb_ethtool_complete,
+#ifdef CONFIG_IGB_PTP
+        .get_ts_info            = igb_ethtool_get_ts_info,
+#endif
 };
 
 void igb_set_ethtool_ops(struct net_device *netdev)
diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c
index dd3bfe8cd36..60e307548f4 100644
--- a/drivers/net/ethernet/intel/igb/igb_main.c
+++ b/drivers/net/ethernet/intel/igb/igb_main.c
@@ -59,9 +59,9 @@
 #endif
 #include "igb.h"
 
-#define MAJ 3
-#define MIN 4
-#define BUILD 7
+#define MAJ 4
+#define MIN 0
+#define BUILD 1
 #define DRV_VERSION __stringify(MAJ) "." __stringify(MIN) "." \
 __stringify(BUILD) "-k"
 char igb_driver_name[] = "igb";
@@ -1048,11 +1048,6 @@ static int igb_set_interrupt_capability(struct igb_adapter *adapter)
         if (!(adapter->flags & IGB_FLAG_QUEUE_PAIRS))
                 numvecs += adapter->num_tx_queues;
 
-        /* i210 and i211 can only have 4 MSIX vectors for rx/tx queues. */
-        if ((adapter->hw.mac.type == e1000_i210)
-                || (adapter->hw.mac.type == e1000_i211))
-                numvecs = 4;
-
         /* store the number of vectors reserved for queues */
         adapter->num_q_vectors = numvecs;
 
@@ -1821,6 +1816,69 @@ static const struct net_device_ops igb_netdev_ops = {
 };
 
 /**
+ * igb_set_fw_version - Configure version string for ethtool
+ * @adapter: adapter struct
+ *
+ **/
+void igb_set_fw_version(struct igb_adapter *adapter)
+{
+        struct e1000_hw *hw = &adapter->hw;
+        u16 eeprom_verh, eeprom_verl, comb_verh, comb_verl, comb_offset;
+        u16 major, build, patch, fw_version;
+        u32 etrack_id;
+
+        hw->nvm.ops.read(hw, 5, 1, &fw_version);
+        if (adapter->hw.mac.type != e1000_i211) {
+                hw->nvm.ops.read(hw, NVM_ETRACK_WORD, 1, &eeprom_verh);
+                hw->nvm.ops.read(hw, (NVM_ETRACK_WORD + 1), 1, &eeprom_verl);
+                etrack_id = (eeprom_verh << IGB_ETRACK_SHIFT) | eeprom_verl;
+
+                /* combo image version needs to be found */
+                hw->nvm.ops.read(hw, NVM_COMB_VER_PTR, 1, &comb_offset);
+                if ((comb_offset != 0x0) &&
+                    (comb_offset != IGB_NVM_VER_INVALID)) {
+                        hw->nvm.ops.read(hw, (NVM_COMB_VER_OFF + comb_offset
+                                         + 1), 1, &comb_verh);
+                        hw->nvm.ops.read(hw, (NVM_COMB_VER_OFF + comb_offset),
+                                         1, &comb_verl);
+
+                        /* Only display Option Rom if it exists and is valid */
+                        if ((comb_verh && comb_verl) &&
+                            ((comb_verh != IGB_NVM_VER_INVALID) &&
+                             (comb_verl != IGB_NVM_VER_INVALID))) {
+                                major = comb_verl >> IGB_COMB_VER_SHFT;
+                                build = (comb_verl << IGB_COMB_VER_SHFT) |
+                                        (comb_verh >> IGB_COMB_VER_SHFT);
+                                patch = comb_verh & IGB_COMB_VER_MASK;
+                                snprintf(adapter->fw_version,
+                                         sizeof(adapter->fw_version),
+                                         "%d.%d%d, 0x%08x, %d.%d.%d",
+                                         (fw_version & IGB_MAJOR_MASK) >>
+                                         IGB_MAJOR_SHIFT,
+                                         (fw_version & IGB_MINOR_MASK) >>
+                                         IGB_MINOR_SHIFT,
+                                         (fw_version & IGB_BUILD_MASK),
+                                         etrack_id, major, build, patch);
+                                goto out;
+                        }
+                }
+                snprintf(adapter->fw_version, sizeof(adapter->fw_version),
+                         "%d.%d%d, 0x%08x",
+                         (fw_version & IGB_MAJOR_MASK) >> IGB_MAJOR_SHIFT,
+                         (fw_version & IGB_MINOR_MASK) >> IGB_MINOR_SHIFT,
+                         (fw_version & IGB_BUILD_MASK), etrack_id);
+        } else {
+                snprintf(adapter->fw_version, sizeof(adapter->fw_version),
+                         "%d.%d%d",
+                         (fw_version & IGB_MAJOR_MASK) >> IGB_MAJOR_SHIFT,
+                         (fw_version & IGB_MINOR_MASK) >> IGB_MINOR_SHIFT,
+                         (fw_version & IGB_BUILD_MASK));
+        }
+out:
+        return;
+}
+
+/**
  * igb_probe - Device Initialization Routine
  * @pdev: PCI device information struct
  * @ent: entry in igb_pci_tbl
@@ -2030,6 +2088,9 @@ static int __devinit igb_probe(struct pci_dev *pdev,
                 goto err_eeprom;
         }
 
+        /* get firmware version for ethtool -i */
+        igb_set_fw_version(adapter);
+
         setup_timer(&adapter->watchdog_timer, igb_watchdog,
                     (unsigned long) adapter);
         setup_timer(&adapter->phy_info_timer, igb_update_phy_info,
@@ -2338,6 +2399,7 @@ static int __devinit igb_sw_init(struct igb_adapter *adapter)
         struct e1000_hw *hw = &adapter->hw;
         struct net_device *netdev = adapter->netdev;
         struct pci_dev *pdev = adapter->pdev;
+        u32 max_rss_queues;
 
         pci_read_config_word(pdev, PCI_COMMAND, &hw->bus.pci_cmd_word);
 
@@ -2370,40 +2432,69 @@ static int __devinit igb_sw_init(struct igb_adapter *adapter)
                 } else
                         adapter->vfs_allocated_count = max_vfs;
                 break;
-        case e1000_i210:
-        case e1000_i211:
-                adapter->vfs_allocated_count = 0;
-                break;
         default:
                 break;
         }
 #endif /* CONFIG_PCI_IOV */
+
+        /* Determine the maximum number of RSS queues supported. */
         switch (hw->mac.type) {
+        case e1000_i211:
+                max_rss_queues = IGB_MAX_RX_QUEUES_I211;
+                break;
+        case e1000_82575:
         case e1000_i210:
-                adapter->rss_queues = min_t(u32, IGB_MAX_RX_QUEUES_I210,
-                        num_online_cpus());
+                max_rss_queues = IGB_MAX_RX_QUEUES_82575;
                 break;
+        case e1000_i350:
+                /* I350 cannot do RSS and SR-IOV at the same time */
+                if (!!adapter->vfs_allocated_count) {
+                        max_rss_queues = 1;
+                        break;
+                }
+                /* fall through */
+        case e1000_82576:
+                if (!!adapter->vfs_allocated_count) {
+                        max_rss_queues = 2;
+                        break;
+                }
+                /* fall through */
+        case e1000_82580:
+        default:
+                max_rss_queues = IGB_MAX_RX_QUEUES;
+                break;
+        }
+
+        adapter->rss_queues = min_t(u32, max_rss_queues, num_online_cpus());
+
+        /* Determine if we need to pair queues. */
+        switch (hw->mac.type) {
+        case e1000_82575:
         case e1000_i211:
-                adapter->rss_queues = min_t(u32, IGB_MAX_RX_QUEUES_I211,
-                        num_online_cpus());
+                /* Device supports enough interrupts without queue pairing. */
                 break;
+        case e1000_82576:
+                /*
+                 * If VFs are going to be allocated with RSS queues then we
+                 * should pair the queues in order to conserve interrupts due
+                 * to limited supply.
+                 */
+                if ((adapter->rss_queues > 1) &&
+                    (adapter->vfs_allocated_count > 6))
+                        adapter->flags |= IGB_FLAG_QUEUE_PAIRS;
+                /* fall through */
+        case e1000_82580:
+        case e1000_i350:
+        case e1000_i210:
         default:
-                adapter->rss_queues = min_t(u32, IGB_MAX_RX_QUEUES,
-                num_online_cpus());
+                /*
+                 * If rss_queues > half of max_rss_queues, pair the queues in
+                 * order to conserve interrupts due to limited supply.
+                 */
+                if (adapter->rss_queues > (max_rss_queues / 2))
+                        adapter->flags |= IGB_FLAG_QUEUE_PAIRS;
                 break;
         }
-        /* i350 cannot do RSS and SR-IOV at the same time */
-        if (hw->mac.type == e1000_i350 && adapter->vfs_allocated_count)
-                adapter->rss_queues = 1;
-
-        /*
-         * if rss_queues > 4 or vfs are going to be allocated with rss_queues
-         * then we should combine the queues into a queue pair in order to
-         * conserve interrupts due to limited supply
-         */
-        if ((adapter->rss_queues > 4) ||
-            ((adapter->rss_queues > 1) && (adapter->vfs_allocated_count > 6)))
-                adapter->flags |= IGB_FLAG_QUEUE_PAIRS;
 
         /* Setup and initialize a copy of the hw vlan table array */
         adapter->shadow_vfta = kzalloc(sizeof(u32) *
@@ -5686,6 +5777,7 @@ static void igb_tx_hwtstamp(struct igb_q_vector *q_vector,
 /**
  * igb_clean_tx_irq - Reclaim resources after transmit completes
  * @q_vector: pointer to q_vector containing needed info
+ *
  * returns true if ring is completely cleaned
  **/
 static bool igb_clean_tx_irq(struct igb_q_vector *q_vector)
@@ -6997,6 +7089,11 @@ static void igb_set_vf_rate_limit(struct e1000_hw *hw, int vf, int tx_rate,
         }
 
         wr32(E1000_RTTDQSEL, vf); /* vf X uses queue X */
+        /*
+         * Set global transmit compensation time to the MMW_SIZE in RTTBCNRM
+         * register. MMW_SIZE=0x014 if 9728-byte jumbo is supported.
+         */
+        wr32(E1000_RTTBCNRM, 0x14);
         wr32(E1000_RTTBCNRC, bcnrc_val);
 }
 
diff --git a/drivers/net/ethernet/intel/igb/igb_ptp.c b/drivers/net/ethernet/intel/igb/igb_ptp.c
index d5ee7fa5072..c846ea9131a 100644
--- a/drivers/net/ethernet/intel/igb/igb_ptp.c
+++ b/drivers/net/ethernet/intel/igb/igb_ptp.c
@@ -330,7 +330,17 @@ void igb_ptp_init(struct igb_adapter *adapter)
 
 void igb_ptp_remove(struct igb_adapter *adapter)
 {
-        cancel_delayed_work_sync(&adapter->overflow_work);
+        switch (adapter->hw.mac.type) {
+        case e1000_i211:
+        case e1000_i210:
+        case e1000_i350:
+        case e1000_82580:
+        case e1000_82576:
+                cancel_delayed_work_sync(&adapter->overflow_work);
+                break;
+        default:
+                return;
+        }
 
         if (adapter->ptp_clock) {
                 ptp_clock_unregister(adapter->ptp_clock);
diff --git a/drivers/net/ethernet/intel/igbvf/netdev.c b/drivers/net/ethernet/intel/igbvf/netdev.c
index 8ec74b07f94..0696abfe994 100644
--- a/drivers/net/ethernet/intel/igbvf/netdev.c
+++ b/drivers/net/ethernet/intel/igbvf/netdev.c
@@ -766,6 +766,7 @@ static void igbvf_set_itr(struct igbvf_adapter *adapter)
 /**
  * igbvf_clean_tx_irq - Reclaim resources after transmit completes
  * @adapter: board private structure
+ *
  * returns true if ring is completely cleaned
  **/
 static bool igbvf_clean_tx_irq(struct igbvf_ring *tx_ring)
diff --git a/drivers/net/ethernet/intel/igbvf/vf.c b/drivers/net/ethernet/intel/igbvf/vf.c
index 30a6cc42603..eea0e10ce12 100644
--- a/drivers/net/ethernet/intel/igbvf/vf.c
+++ b/drivers/net/ethernet/intel/igbvf/vf.c
@@ -283,7 +283,8 @@ static s32 e1000_set_vfta_vf(struct e1000_hw *hw, u16 vid, bool set)
         return err;
 }
 
-/** e1000_rlpml_set_vf - Set the maximum receive packet length
+/**
+ *  e1000_rlpml_set_vf - Set the maximum receive packet length
  *  @hw: pointer to the HW structure
  *  @max_size: value to assign to max frame size
  **/
@@ -302,7 +303,7 @@ void e1000_rlpml_set_vf(struct e1000_hw *hw, u16 max_size)
  *  e1000_rar_set_vf - set device MAC address
  *  @hw: pointer to the HW structure
  *  @addr: pointer to the receive address
- *  @index receive address array register
+ *  @index: receive address array register
  **/
 static void e1000_rar_set_vf(struct e1000_hw *hw, u8 * addr, u32 index)
 {
diff --git a/drivers/net/ethernet/intel/ixgb/ixgb_main.c b/drivers/net/ethernet/intel/ixgb/ixgb_main.c
index 5fce363d810..aab649f8c5f 100644
--- a/drivers/net/ethernet/intel/ixgb/ixgb_main.c
+++ b/drivers/net/ethernet/intel/ixgb/ixgb_main.c
@@ -2276,9 +2276,9 @@ static void ixgb_netpoll(struct net_device *dev)
 #endif
 
 /**
- * ixgb_io_error_detected() - called when PCI error is detected
- * @pdev    pointer to pci device with error
- * @state   pci channel state after error
+ * ixgb_io_error_detected - called when PCI error is detected
+ * @pdev:    pointer to pci device with error
+ * @state:   pci channel state after error
  *
  * This callback is called by the PCI subsystem whenever
  * a PCI bus error is detected.
diff --git a/drivers/net/ethernet/intel/ixgbe/Makefile b/drivers/net/ethernet/intel/ixgbe/Makefile
index 0bdf06bc5c4..5fd5d04c26c 100644
--- a/drivers/net/ethernet/intel/ixgbe/Makefile
+++ b/drivers/net/ethernet/intel/ixgbe/Makefile
@@ -34,11 +34,11 @@ obj-$(CONFIG_IXGBE) += ixgbe.o
 
 ixgbe-objs := ixgbe_main.o ixgbe_common.o ixgbe_ethtool.o \
               ixgbe_82599.o ixgbe_82598.o ixgbe_phy.o ixgbe_sriov.o \
-              ixgbe_mbx.o ixgbe_x540.o ixgbe_sysfs.o ixgbe_lib.o
+              ixgbe_mbx.o ixgbe_x540.o ixgbe_lib.o
 
 ixgbe-$(CONFIG_IXGBE_DCB) +=  ixgbe_dcb.o ixgbe_dcb_82598.o \
                               ixgbe_dcb_82599.o ixgbe_dcb_nl.o
 
 ixgbe-$(CONFIG_IXGBE_PTP) += ixgbe_ptp.o
-
+ixgbe-$(CONFIG_IXGBE_HWMON) += ixgbe_sysfs.o
 ixgbe-$(CONFIG_FCOE:m=y) += ixgbe_fcoe.o
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe.h b/drivers/net/ethernet/intel/ixgbe/ixgbe.h
index 7af291e236b..d1acf2451d5 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe.h
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe.h
@@ -561,6 +561,7 @@ struct ixgbe_adapter {
         spinlock_t tmreg_lock;
         struct cyclecounter cc;
         struct timecounter tc;
+        int rx_hwtstamp_filter;
         u32 base_incval;
         u32 cycle_speed;
 #endif /* CONFIG_IXGBE_PTP */
@@ -718,6 +719,7 @@ extern void ixgbe_ptp_overflow_check(struct ixgbe_adapter *adapter);
 extern void ixgbe_ptp_tx_hwtstamp(struct ixgbe_q_vector *q_vector,
                                   struct sk_buff *skb);
 extern void ixgbe_ptp_rx_hwtstamp(struct ixgbe_q_vector *q_vector,
+                                  union ixgbe_adv_rx_desc *rx_desc,
                                   struct sk_buff *skb);
 extern int ixgbe_ptp_hwtstamp_ioctl(struct ixgbe_adapter *adapter,
                                     struct ifreq *ifr, int cmd);
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c
index dee64d2703f..e7dddfd97cb 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c
@@ -241,7 +241,9 @@ static s32 ixgbe_get_link_capabilities_82599(struct ixgbe_hw *hw,
 
         /* Determine 1G link capabilities off of SFP+ type */
         if (hw->phy.sfp_type == ixgbe_sfp_type_1g_cu_core0 ||
-            hw->phy.sfp_type == ixgbe_sfp_type_1g_cu_core1) {
+            hw->phy.sfp_type == ixgbe_sfp_type_1g_cu_core1 ||
+            hw->phy.sfp_type == ixgbe_sfp_type_1g_sx_core0 ||
+            hw->phy.sfp_type == ixgbe_sfp_type_1g_sx_core1) {
                 *speed = IXGBE_LINK_SPEED_1GB_FULL;
                 *negotiation = true;
                 goto out;
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_common.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_common.c
index 77ac41feb0f..bb7fde45c05 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_common.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_common.c
@@ -3132,7 +3132,7 @@ s32 ixgbe_check_mac_link_generic(struct ixgbe_hw *hw, ixgbe_link_speed *speed,
 }
 
 /**
- *  ixgbe_get_wwn_prefix_generic Get alternative WWNN/WWPN prefix from
+ *  ixgbe_get_wwn_prefix_generic - Get alternative WWNN/WWPN prefix from
  *  the EEPROM
  *  @hw: pointer to hardware structure
  *  @wwnn_prefix: the alternative WWNN prefix
@@ -3325,6 +3325,7 @@ void ixgbe_set_rxpba_generic(struct ixgbe_hw *hw,
  *  ixgbe_calculate_checksum - Calculate checksum for buffer
  *  @buffer: pointer to EEPROM
  *  @length: size of EEPROM to calculate a checksum for
+ *
  *  Calculates the checksum for some buffer on a specified length.  The
  *  checksum calculated is returned.
  **/
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c
index 3178f1ec371..bbc7da5cdb4 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c
@@ -154,100 +154,60 @@ static int ixgbe_get_settings(struct net_device *netdev,
 {
         struct ixgbe_adapter *adapter = netdev_priv(netdev);
         struct ixgbe_hw *hw = &adapter->hw;
+        ixgbe_link_speed supported_link;
         u32 link_speed = 0;
+        bool autoneg;
         bool link_up;
 
-        ecmd->supported = SUPPORTED_10000baseT_Full;
-        ecmd->autoneg = AUTONEG_ENABLE;
-        ecmd->transceiver = XCVR_EXTERNAL;
-        if ((hw->phy.media_type == ixgbe_media_type_copper) ||
-            (hw->phy.multispeed_fiber)) {
-                ecmd->supported |= (SUPPORTED_1000baseT_Full |
-                                    SUPPORTED_Autoneg);
-
-                switch (hw->mac.type) {
-                case ixgbe_mac_X540:
-                        ecmd->supported |= SUPPORTED_100baseT_Full;
-                        break;
-                default:
-                        break;
-                }
-
-                ecmd->advertising = ADVERTISED_Autoneg;
-                if (hw->phy.autoneg_advertised) {
-                        if (hw->phy.autoneg_advertised &
-                            IXGBE_LINK_SPEED_100_FULL)
-                                ecmd->advertising |= ADVERTISED_100baseT_Full;
-                        if (hw->phy.autoneg_advertised &
-                            IXGBE_LINK_SPEED_10GB_FULL)
-                                ecmd->advertising |= ADVERTISED_10000baseT_Full;
-                        if (hw->phy.autoneg_advertised &
-                            IXGBE_LINK_SPEED_1GB_FULL)
-                                ecmd->advertising |= ADVERTISED_1000baseT_Full;
-                } else {
-                        /*
-                         * Default advertised modes in case
-                         * phy.autoneg_advertised isn't set.
-                         */
-                        ecmd->advertising |= (ADVERTISED_10000baseT_Full |
-                                              ADVERTISED_1000baseT_Full);
-                        if (hw->mac.type == ixgbe_mac_X540)
-                                ecmd->advertising |= ADVERTISED_100baseT_Full;
-                }
-
-                if (hw->phy.media_type == ixgbe_media_type_copper) {
-                        ecmd->supported |= SUPPORTED_TP;
-                        ecmd->advertising |= ADVERTISED_TP;
-                        ecmd->port = PORT_TP;
-                } else {
-                        ecmd->supported |= SUPPORTED_FIBRE;
-                        ecmd->advertising |= ADVERTISED_FIBRE;
-                        ecmd->port = PORT_FIBRE;
-                }
-        } else if (hw->phy.media_type == ixgbe_media_type_backplane) {
-                /* Set as FIBRE until SERDES defined in kernel */
-                if (hw->device_id == IXGBE_DEV_ID_82598_BX) {
-                        ecmd->supported = (SUPPORTED_1000baseT_Full |
-                                           SUPPORTED_FIBRE);
-                        ecmd->advertising = (ADVERTISED_1000baseT_Full |
-                                             ADVERTISED_FIBRE);
-                        ecmd->port = PORT_FIBRE;
-                        ecmd->autoneg = AUTONEG_DISABLE;
-                } else if ((hw->device_id == IXGBE_DEV_ID_82599_COMBO_BACKPLANE) ||
-                           (hw->device_id == IXGBE_DEV_ID_82599_KX4_MEZZ)) {
-                        ecmd->supported |= (SUPPORTED_1000baseT_Full |
-                                            SUPPORTED_Autoneg |
-                                            SUPPORTED_FIBRE);
-                        ecmd->advertising = (ADVERTISED_10000baseT_Full |
-                                             ADVERTISED_1000baseT_Full |
-                                             ADVERTISED_Autoneg |
-                                             ADVERTISED_FIBRE);
-                        ecmd->port = PORT_FIBRE;
-                } else {
-                        ecmd->supported |= (SUPPORTED_1000baseT_Full |
-                                            SUPPORTED_FIBRE);
-                        ecmd->advertising = (ADVERTISED_10000baseT_Full |
-                                             ADVERTISED_1000baseT_Full |
-                                             ADVERTISED_FIBRE);
-                        ecmd->port = PORT_FIBRE;
-                }
+        hw->mac.ops.get_link_capabilities(hw, &supported_link, &autoneg);
+
+        /* set the supported link speeds */
+        if (supported_link & IXGBE_LINK_SPEED_10GB_FULL)
+                ecmd->supported |= SUPPORTED_10000baseT_Full;
+        if (supported_link & IXGBE_LINK_SPEED_1GB_FULL)
+                ecmd->supported |= SUPPORTED_1000baseT_Full;
+        if (supported_link & IXGBE_LINK_SPEED_100_FULL)
+                ecmd->supported |= SUPPORTED_100baseT_Full;
+
+        /* set the advertised speeds */
+        if (hw->phy.autoneg_advertised) {
+                if (hw->phy.autoneg_advertised & IXGBE_LINK_SPEED_100_FULL)
+                        ecmd->advertising |= ADVERTISED_100baseT_Full;
+                if (hw->phy.autoneg_advertised & IXGBE_LINK_SPEED_10GB_FULL)
+                        ecmd->advertising |= ADVERTISED_10000baseT_Full;
+                if (hw->phy.autoneg_advertised & IXGBE_LINK_SPEED_1GB_FULL)
+                        ecmd->advertising |= ADVERTISED_1000baseT_Full;
         } else {
-                ecmd->supported |= SUPPORTED_FIBRE;
-                ecmd->advertising = (ADVERTISED_10000baseT_Full |
-                                     ADVERTISED_FIBRE);
-                ecmd->port = PORT_FIBRE;
-                ecmd->autoneg = AUTONEG_DISABLE;
+                /* default modes in case phy.autoneg_advertised isn't set */
+                if (supported_link & IXGBE_LINK_SPEED_10GB_FULL)
+                        ecmd->advertising |= ADVERTISED_10000baseT_Full;
+                if (supported_link & IXGBE_LINK_SPEED_1GB_FULL)
+                        ecmd->advertising |= ADVERTISED_1000baseT_Full;
+                if (supported_link & IXGBE_LINK_SPEED_100_FULL)
+                        ecmd->advertising |= ADVERTISED_100baseT_Full;
         }
 
-        /* Get PHY type */
+        if (autoneg) {
+                ecmd->supported |= SUPPORTED_Autoneg;
+                ecmd->advertising |= ADVERTISED_Autoneg;
+                ecmd->autoneg = AUTONEG_ENABLE;
+        } else
+                ecmd->autoneg = AUTONEG_DISABLE;
+
+        ecmd->transceiver = XCVR_EXTERNAL;
+
+        /* Determine the remaining settings based on the PHY type. */
         switch (adapter->hw.phy.type) {
         case ixgbe_phy_tn:
         case ixgbe_phy_aq:
         case ixgbe_phy_cu_unknown:
-                /* Copper 10G-BASET */
+                ecmd->supported |= SUPPORTED_TP;
+                ecmd->advertising |= ADVERTISED_TP;
                 ecmd->port = PORT_TP;
                 break;
         case ixgbe_phy_qt:
+                ecmd->supported |= SUPPORTED_FIBRE;
+                ecmd->advertising |= ADVERTISED_FIBRE;
                 ecmd->port = PORT_FIBRE;
                 break;
         case ixgbe_phy_nl:
@@ -257,42 +217,59 @@ static int ixgbe_get_settings(struct net_device *netdev,
         case ixgbe_phy_sfp_avago:
         case ixgbe_phy_sfp_intel:
         case ixgbe_phy_sfp_unknown:
-                switch (adapter->hw.phy.sfp_type) {
                 /* SFP+ devices, further checking needed */
+                switch (adapter->hw.phy.sfp_type) {
                 case ixgbe_sfp_type_da_cu:
                 case ixgbe_sfp_type_da_cu_core0:
                 case ixgbe_sfp_type_da_cu_core1:
+                        ecmd->supported |= SUPPORTED_FIBRE;
+                        ecmd->advertising |= ADVERTISED_FIBRE;
                         ecmd->port = PORT_DA;
                         break;
                 case ixgbe_sfp_type_sr:
                 case ixgbe_sfp_type_lr:
                 case ixgbe_sfp_type_srlr_core0:
                 case ixgbe_sfp_type_srlr_core1:
+                        ecmd->supported |= SUPPORTED_FIBRE;
+                        ecmd->advertising |= ADVERTISED_FIBRE;
                         ecmd->port = PORT_FIBRE;
                         break;
                 case ixgbe_sfp_type_not_present:
+                        ecmd->supported |= SUPPORTED_FIBRE;
+                        ecmd->advertising |= ADVERTISED_FIBRE;
                         ecmd->port = PORT_NONE;
                         break;
                 case ixgbe_sfp_type_1g_cu_core0:
                 case ixgbe_sfp_type_1g_cu_core1:
+                        ecmd->supported |= SUPPORTED_TP;
+                        ecmd->advertising |= ADVERTISED_TP;
                         ecmd->port = PORT_TP;
-                        ecmd->supported = SUPPORTED_TP;
-                        ecmd->advertising = (ADVERTISED_1000baseT_Full |
-                                             ADVERTISED_TP);
+                        break;
+                case ixgbe_sfp_type_1g_sx_core0:
+                case ixgbe_sfp_type_1g_sx_core1:
+                        ecmd->supported |= SUPPORTED_FIBRE;
+                        ecmd->advertising |= ADVERTISED_FIBRE;
+                        ecmd->port = PORT_FIBRE;
                         break;
                 case ixgbe_sfp_type_unknown:
                 default:
+                        ecmd->supported |= SUPPORTED_FIBRE;
+                        ecmd->advertising |= ADVERTISED_FIBRE;
                         ecmd->port = PORT_OTHER;
                         break;
                 }
                 break;
         case ixgbe_phy_xaui:
+                ecmd->supported |= SUPPORTED_FIBRE;
+                ecmd->advertising |= ADVERTISED_FIBRE;
                 ecmd->port = PORT_NONE;
                 break;
         case ixgbe_phy_unknown:
         case ixgbe_phy_generic:
         case ixgbe_phy_sfp_unsupported:
         default:
+                ecmd->supported |= SUPPORTED_FIBRE;
+                ecmd->advertising |= ADVERTISED_FIBRE;
                 ecmd->port = PORT_OTHER;
                 break;
         }
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c
index bc07933d67d..0ee4dbf4a75 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c
@@ -38,7 +38,7 @@
 
 /**
  * ixgbe_fcoe_clear_ddp - clear the given ddp context
- * @ddp - ptr to the ixgbe_fcoe_ddp
+ * @ddp: ptr to the ixgbe_fcoe_ddp
  *
  * Returns : none
  *
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c
index c377706e81a..f36c3c38dbc 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c
@@ -252,7 +252,7 @@ static void ixgbe_cache_ring_register(struct ixgbe_adapter *adapter)
 }
 
 /**
- * ixgbe_set_sriov_queues: Allocate queues for IOV use
+ * ixgbe_set_sriov_queues - Allocate queues for IOV use
  * @adapter: board private structure to initialize
  *
  * IOV doesn't actually use anything, so just NAK the
@@ -265,7 +265,7 @@ static inline bool ixgbe_set_sriov_queues(struct ixgbe_adapter *adapter)
 }
 
 /**
- * ixgbe_set_rss_queues: Allocate queues for RSS
+ * ixgbe_set_rss_queues - Allocate queues for RSS
  * @adapter: board private structure to initialize
  *
  * This is our "base" multiqueue mode.  RSS (Receive Side Scaling) will try
@@ -288,7 +288,7 @@ static inline bool ixgbe_set_rss_queues(struct ixgbe_adapter *adapter)
 }
 
 /**
- * ixgbe_set_fdir_queues: Allocate queues for Flow Director
+ * ixgbe_set_fdir_queues - Allocate queues for Flow Director
  * @adapter: board private structure to initialize
  *
  * Flow Director is an advanced Rx filter, attempting to get Rx flows back
@@ -323,7 +323,7 @@ static inline bool ixgbe_set_fdir_queues(struct ixgbe_adapter *adapter)
 
 #ifdef IXGBE_FCOE
 /**
- * ixgbe_set_fcoe_queues: Allocate queues for Fiber Channel over Ethernet (FCoE)
+ * ixgbe_set_fcoe_queues - Allocate queues for Fiber Channel over Ethernet (FCoE)
  * @adapter: board private structure to initialize
  *
  * FCoE RX FCRETA can use up to 8 rx queues for up to 8 different exchanges.
@@ -410,7 +410,7 @@ static inline bool ixgbe_set_dcb_queues(struct ixgbe_adapter *adapter)
 #endif
 
 /**
- * ixgbe_set_num_queues: Allocate queues for device, feature dependent
+ * ixgbe_set_num_queues - Allocate queues for device, feature dependent
  * @adapter: board private structure to initialize
  *
  * This is the top level queue allocation routine.  The order here is very
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
index e242104ab47..59a3f141feb 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
@@ -516,7 +516,7 @@ static void ixgbe_get_hw_control(struct ixgbe_adapter *adapter)
                         ctrl_ext | IXGBE_CTRL_EXT_DRV_LOAD);
 }
 
-/*
+/**
  * ixgbe_set_ivar - set the IVAR registers, mapping interrupt causes to vectors
  * @adapter: pointer to adapter struct
  * @direction: 0 for Rx, 1 for Tx, -1 for other causes
@@ -790,12 +790,10 @@ static bool ixgbe_clean_tx_irq(struct ixgbe_q_vector *q_vector,
                 total_packets += tx_buffer->gso_segs;
 
 #ifdef CONFIG_IXGBE_PTP
-                if (unlikely(tx_buffer->tx_flags &
-                             IXGBE_TX_FLAGS_TSTAMP))
-                        ixgbe_ptp_tx_hwtstamp(q_vector,
-                                              tx_buffer->skb);
-
+                if (unlikely(tx_buffer->tx_flags & IXGBE_TX_FLAGS_TSTAMP))
+                        ixgbe_ptp_tx_hwtstamp(q_vector, tx_buffer->skb);
 #endif
+
                 /* free the skb */
                 dev_kfree_skb_any(tx_buffer->skb);
 
@@ -1399,8 +1397,7 @@ static void ixgbe_process_skb_fields(struct ixgbe_ring *rx_ring,
         ixgbe_rx_checksum(rx_ring, rx_desc, skb);
 
 #ifdef CONFIG_IXGBE_PTP
-        if (ixgbe_test_staterr(rx_desc, IXGBE_RXDADV_STAT_TS))
-                ixgbe_ptp_rx_hwtstamp(rx_ring->q_vector, skb);
+        ixgbe_ptp_rx_hwtstamp(rx_ring->q_vector, rx_desc, skb);
 #endif
 
         if ((dev->features & NETIF_F_HW_VLAN_RX) &&
@@ -3594,7 +3591,7 @@ static void ixgbe_napi_disable_all(struct ixgbe_adapter *adapter)
 }
 
 #ifdef CONFIG_IXGBE_DCB
-/*
+/**
  * ixgbe_configure_dcb - Configure DCB hardware
  * @adapter: ixgbe adapter struct
  *
@@ -3661,11 +3658,11 @@ static void ixgbe_configure_dcb(struct ixgbe_adapter *adapter)
 /* Additional bittime to account for IXGBE framing */
 #define IXGBE_ETH_FRAMING 20
 
-/*
+/**
  * ixgbe_hpbthresh - calculate high water mark for flow control
  *
  * @adapter: board private structure to calculate for
- * @pb - packet buffer to calculate
+ * @pb: packet buffer to calculate
  */
 static int ixgbe_hpbthresh(struct ixgbe_adapter *adapter, int pb)
 {
@@ -3725,11 +3722,11 @@ static int ixgbe_hpbthresh(struct ixgbe_adapter *adapter, int pb)
         return marker;
 }
 
-/*
+/**
  * ixgbe_lpbthresh - calculate low water mark for for flow control
  *
  * @adapter: board private structure to calculate for
- * @pb - packet buffer to calculate
+ * @pb: packet buffer to calculate
  */
 static int ixgbe_lpbthresh(struct ixgbe_adapter *adapter)
 {
@@ -5246,7 +5243,7 @@ void ixgbe_update_stats(struct ixgbe_adapter *adapter)
 
 /**
  * ixgbe_fdir_reinit_subtask - worker thread to reinit FDIR filter table
- * @adapter - pointer to the device adapter structure
+ * @adapter: pointer to the device adapter structure
  **/
 static void ixgbe_fdir_reinit_subtask(struct ixgbe_adapter *adapter)
 {
@@ -5282,7 +5279,7 @@ static void ixgbe_fdir_reinit_subtask(struct ixgbe_adapter *adapter)
 
 /**
  * ixgbe_check_hang_subtask - check for hung queues and dropped interrupts
- * @adapter - pointer to the device adapter structure
+ * @adapter: pointer to the device adapter structure
  *
  * This function serves two purposes.  First it strobes the interrupt lines
  * in order to make certain interrupts are occurring.  Secondly it sets the
@@ -5330,8 +5327,8 @@ static void ixgbe_check_hang_subtask(struct ixgbe_adapter *adapter)
 
 /**
  * ixgbe_watchdog_update_link - update the link status
- * @adapter - pointer to the device adapter structure
- * @link_speed - pointer to a u32 to store the link_speed
+ * @adapter: pointer to the device adapter structure
+ * @link_speed: pointer to a u32 to store the link_speed
  **/
 static void ixgbe_watchdog_update_link(struct ixgbe_adapter *adapter)
 {
@@ -5374,7 +5371,7 @@ static void ixgbe_watchdog_update_link(struct ixgbe_adapter *adapter)
 /**
  * ixgbe_watchdog_link_is_up - update netif_carrier status and
  *                             print link up message
- * @adapter - pointer to the device adapter structure
+ * @adapter: pointer to the device adapter structure
  **/
 static void ixgbe_watchdog_link_is_up(struct ixgbe_adapter *adapter)
 {
@@ -5434,7 +5431,7 @@ static void ixgbe_watchdog_link_is_up(struct ixgbe_adapter *adapter)
 /**
  * ixgbe_watchdog_link_is_down - update netif_carrier status and
  *                               print link down message
- * @adapter - pointer to the adapter structure
+ * @adapter: pointer to the adapter structure
  **/
 static void ixgbe_watchdog_link_is_down(struct ixgbe_adapter *adapter)
 {
@@ -5462,7 +5459,7 @@ static void ixgbe_watchdog_link_is_down(struct ixgbe_adapter *adapter)
 
 /**
  * ixgbe_watchdog_flush_tx - flush queues on link down
- * @adapter - pointer to the device adapter structure
+ * @adapter: pointer to the device adapter structure
  **/
 static void ixgbe_watchdog_flush_tx(struct ixgbe_adapter *adapter)
 {
@@ -5511,7 +5508,7 @@ static void ixgbe_spoof_check(struct ixgbe_adapter *adapter)
 
 /**
  * ixgbe_watchdog_subtask - check and bring link up
- * @adapter - pointer to the device adapter structure
+ * @adapter: pointer to the device adapter structure
  **/
 static void ixgbe_watchdog_subtask(struct ixgbe_adapter *adapter)
 {
@@ -5535,7 +5532,7 @@ static void ixgbe_watchdog_subtask(struct ixgbe_adapter *adapter)
 
 /**
  * ixgbe_sfp_detection_subtask - poll for SFP+ cable
- * @adapter - the ixgbe adapter structure
+ * @adapter: the ixgbe adapter structure
  **/
 static void ixgbe_sfp_detection_subtask(struct ixgbe_adapter *adapter)
 {
@@ -5602,7 +5599,7 @@ sfp_out:
 
 /**
  * ixgbe_sfp_link_config_subtask - set up link SFP after module install
- * @adapter - the ixgbe adapter structure
+ * @adapter: the ixgbe adapter structure
  **/
 static void ixgbe_sfp_link_config_subtask(struct ixgbe_adapter *adapter)
 {
@@ -6389,17 +6386,12 @@ static netdev_tx_t ixgbe_xmit_frame(struct sk_buff *skb,
         struct ixgbe_adapter *adapter = netdev_priv(netdev);
         struct ixgbe_ring *tx_ring;
 
-        if (skb->len <= 0) {
-                dev_kfree_skb_any(skb);
-                return NETDEV_TX_OK;
-        }
-
         /*
          * The minimum packet size for olinfo paylen is 17 so pad the skb
          * in order to meet this minimum size requirement.
          */
-        if (skb->len < 17) {
-                if (skb_padto(skb, 17))
+        if (unlikely(skb->len < 17)) {
+                if (skb_pad(skb, 17 - skb->len))
                         return NETDEV_TX_OK;
                 skb->len = 17;
         }
@@ -6594,8 +6586,9 @@ static struct rtnl_link_stats64 *ixgbe_get_stats64(struct net_device *netdev,
 }
 
 #ifdef CONFIG_IXGBE_DCB
-/* ixgbe_validate_rtr - verify 802.1Qp to Rx packet buffer mapping is valid.
- * #adapter: pointer to ixgbe_adapter
+/**
+ * ixgbe_validate_rtr - verify 802.1Qp to Rx packet buffer mapping is valid.
+ * @adapter: pointer to ixgbe_adapter
  * @tc: number of traffic classes currently enabled
  *
  * Configure a valid 802.1Qp to Rx packet buffer mapping ie confirm
@@ -6630,8 +6623,8 @@ static void ixgbe_validate_rtr(struct ixgbe_adapter *adapter, u8 tc)
         return;
 }
 
-/* ixgbe_setup_tc - routine to configure net_device for multiple traffic
- * classes.
+/**
+ * ixgbe_setup_tc - configure net_device for multiple traffic classes
  *
  * @netdev: net device to configure
  * @tc: number of traffic classes to enable
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c
index 24117709d6a..71659edf81a 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c
@@ -907,6 +907,8 @@ s32 ixgbe_identify_sfp_module_generic(struct ixgbe_hw *hw)
                   * 8   SFP_act_lmt_DA_CORE1 - 82599-specific
                   * 9   SFP_1g_cu_CORE0 - 82599-specific
                   * 10  SFP_1g_cu_CORE1 - 82599-specific
+                  * 11  SFP_1g_sx_CORE0 - 82599-specific
+                  * 12  SFP_1g_sx_CORE1 - 82599-specific
                   */
                 if (hw->mac.type == ixgbe_mac_82598EB) {
                         if (cable_tech & IXGBE_SFF_DA_PASSIVE_CABLE)
@@ -957,6 +959,13 @@ s32 ixgbe_identify_sfp_module_generic(struct ixgbe_hw *hw)
                                 else
                                         hw->phy.sfp_type =
                                                 ixgbe_sfp_type_1g_cu_core1;
+                        } else if (comp_codes_1g & IXGBE_SFF_1GBASESX_CAPABLE) {
+                                if (hw->bus.lan_id == 0)
+                                        hw->phy.sfp_type =
+                                                ixgbe_sfp_type_1g_sx_core0;
+                                else
+                                        hw->phy.sfp_type =
+                                                ixgbe_sfp_type_1g_sx_core1;
                         } else {
                                 hw->phy.sfp_type = ixgbe_sfp_type_unknown;
                         }
@@ -1049,7 +1058,9 @@ s32 ixgbe_identify_sfp_module_generic(struct ixgbe_hw *hw)
                 /* Verify supported 1G SFP modules */
                 if (comp_codes_10g == 0 &&
                     !(hw->phy.sfp_type == ixgbe_sfp_type_1g_cu_core1 ||
-                      hw->phy.sfp_type == ixgbe_sfp_type_1g_cu_core0)) {
+                      hw->phy.sfp_type == ixgbe_sfp_type_1g_cu_core0 ||
+                      hw->phy.sfp_type == ixgbe_sfp_type_1g_sx_core0 ||
+                      hw->phy.sfp_type == ixgbe_sfp_type_1g_sx_core1)) {
                         hw->phy.type = ixgbe_phy_sfp_unsupported;
                         status = IXGBE_ERR_SFP_NOT_SUPPORTED;
                         goto out;
@@ -1064,7 +1075,9 @@ s32 ixgbe_identify_sfp_module_generic(struct ixgbe_hw *hw)
                 hw->mac.ops.get_device_caps(hw, &enforce_sfp);
                 if (!(enforce_sfp & IXGBE_DEVICE_CAPS_ALLOW_ANY_SFP) &&
                     !((hw->phy.sfp_type == ixgbe_sfp_type_1g_cu_core0) ||
-                      (hw->phy.sfp_type == ixgbe_sfp_type_1g_cu_core1))) {
+                      (hw->phy.sfp_type == ixgbe_sfp_type_1g_cu_core1) ||
+                      (hw->phy.sfp_type == ixgbe_sfp_type_1g_sx_core0) ||
+                      (hw->phy.sfp_type == ixgbe_sfp_type_1g_sx_core1))) {
                         /* Make sure we're a supported PHY type */
                         if (hw->phy.type == ixgbe_phy_sfp_intel) {
                                 status = 0;
@@ -1128,10 +1141,12 @@ s32 ixgbe_get_sfp_init_sequence_offsets(struct ixgbe_hw *hw,
          * SR modules
          */
         if (sfp_type == ixgbe_sfp_type_da_act_lmt_core0 ||
-            sfp_type == ixgbe_sfp_type_1g_cu_core0)
+            sfp_type == ixgbe_sfp_type_1g_cu_core0 ||
+            sfp_type == ixgbe_sfp_type_1g_sx_core0)
                 sfp_type = ixgbe_sfp_type_srlr_core0;
         else if (sfp_type == ixgbe_sfp_type_da_act_lmt_core1 ||
-                 sfp_type == ixgbe_sfp_type_1g_cu_core1)
+                 sfp_type == ixgbe_sfp_type_1g_cu_core1 ||
+                 sfp_type == ixgbe_sfp_type_1g_sx_core1)
                 sfp_type = ixgbe_sfp_type_srlr_core1;
 
         /* Read offset to PHY init contents */
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c
index dcebd128bec..3456d561714 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c
@@ -26,6 +26,7 @@
 *******************************************************************************/
 #include "ixgbe.h"
 #include <linux/export.h>
+#include <linux/ptp_classify.h>
 
 /*
  * The 82599 and the X540 do not have true 64bit nanosecond scale
@@ -100,9 +101,13 @@
 #define NSECS_PER_SEC 1000000000ULL
 #endif
 
+static struct sock_filter ptp_filter[] = {
+        PTP_FILTER
+};
+
 /**
  * ixgbe_ptp_read - read raw cycle counter (to be used by time counter)
- * @cc - the cyclecounter structure
+ * @cc: the cyclecounter structure
  *
  * this function reads the cyclecounter registers and is called by the
  * cyclecounter structure used to construct a ns counter from the
@@ -123,8 +128,8 @@ static cycle_t ixgbe_ptp_read(const struct cyclecounter *cc)
 
 /**
  * ixgbe_ptp_adjfreq
- * @ptp - the ptp clock structure
- * @ppb - parts per billion adjustment from base
+ * @ptp: the ptp clock structure
+ * @ppb: parts per billion adjustment from base
  *
  * adjust the frequency of the ptp cycle counter by the
  * indicated ppb from the base frequency.
@@ -170,8 +175,8 @@ static int ixgbe_ptp_adjfreq(struct ptp_clock_info *ptp, s32 ppb)
 
 /**
  * ixgbe_ptp_adjtime
- * @ptp - the ptp clock structure
- * @delta - offset to adjust the cycle counter by
+ * @ptp: the ptp clock structure
+ * @delta: offset to adjust the cycle counter by
  *
  * adjust the timer by resetting the timecounter structure.
  */
@@ -198,8 +203,8 @@ static int ixgbe_ptp_adjtime(struct ptp_clock_info *ptp, s64 delta)
 
 /**
  * ixgbe_ptp_gettime
- * @ptp - the ptp clock structure
- * @ts - timespec structure to hold the current time value
+ * @ptp: the ptp clock structure
+ * @ts: timespec structure to hold the current time value
  *
  * read the timecounter and return the correct value on ns,
  * after converting it into a struct timespec.
@@ -224,8 +229,8 @@ static int ixgbe_ptp_gettime(struct ptp_clock_info *ptp, struct timespec *ts)
 
 /**
  * ixgbe_ptp_settime
- * @ptp - the ptp clock structure
- * @ts - the timespec containing the new time for the cycle counter
+ * @ptp: the ptp clock structure
+ * @ts: the timespec containing the new time for the cycle counter
  *
  * reset the timecounter to use a new base value instead of the kernel
  * wall timer value.
@@ -251,9 +256,9 @@ static int ixgbe_ptp_settime(struct ptp_clock_info *ptp,
 
 /**
  * ixgbe_ptp_enable
- * @ptp - the ptp clock structure
- * @rq - the requested feature to change
- * @on - whether to enable or disable the feature
+ * @ptp: the ptp clock structure
+ * @rq: the requested feature to change
+ * @on: whether to enable or disable the feature
  *
  * enable (or disable) ancillary features of the phc subsystem.
  * our driver only supports the PPS feature on the X540
@@ -289,8 +294,8 @@ static int ixgbe_ptp_enable(struct ptp_clock_info *ptp,
 
 /**
  * ixgbe_ptp_check_pps_event
- * @adapter - the private adapter structure
- * @eicr - the interrupt cause register value
+ * @adapter: the private adapter structure
+ * @eicr: the interrupt cause register value
  *
  * This function is called by the interrupt routine when checking for
  * interrupts. It will check and handle a pps event.
@@ -307,20 +312,21 @@ void ixgbe_ptp_check_pps_event(struct ixgbe_adapter *adapter, u32 eicr)
             !(adapter->flags2 & IXGBE_FLAG2_PTP_PPS_ENABLED))
                 return;
 
-        switch (hw->mac.type) {
-        case ixgbe_mac_X540:
-                if (eicr & IXGBE_EICR_TIMESYNC)
+        if (unlikely(eicr & IXGBE_EICR_TIMESYNC)) {
+                switch (hw->mac.type) {
+                case ixgbe_mac_X540:
                         ptp_clock_event(adapter->ptp_clock, &event);
-                break;
-        default:
-                break;
+                        break;
+                default:
+                        break;
+                }
         }
 }
 
 /**
  * ixgbe_ptp_enable_sdp
- * @hw - the hardware private structure
- * @shift - the clock shift for calculating nanoseconds
+ * @hw: the hardware private structure
+ * @shift: the clock shift for calculating nanoseconds
  *
  * this function enables the clock out feature on the sdp0 for the
  * X540 device. It will create a 1second periodic output that can be
@@ -393,7 +399,7 @@ static void ixgbe_ptp_enable_sdp(struct ixgbe_hw *hw, int shift)
 
 /**
  * ixgbe_ptp_disable_sdp
- * @hw - the private hardware structure
+ * @hw: the private hardware structure
  *
  * this function disables the auxiliary SDP clock out feature
  */
@@ -425,6 +431,68 @@ void ixgbe_ptp_overflow_check(struct ixgbe_adapter *adapter)
 }
 
 /**
+ * ixgbe_ptp_match - determine if this skb matches a ptp packet
+ * @skb: pointer to the skb
+ * @hwtstamp: pointer to the hwtstamp_config to check
+ *
+ * Determine whether the skb should have been timestamped, assuming the
+ * hwtstamp was set via the hwtstamp ioctl. Returns non-zero when the packet
+ * should have a timestamp waiting in the registers, and 0 otherwise.
+ *
+ * V1 packets have to check the version type to determine whether they are
+ * correct. However, we can't directly access the data because it might be
+ * fragmented in the SKB, in paged memory. In order to work around this, we
+ * use skb_copy_bits which will properly copy the data whether it is in the
+ * paged memory fragments or not. We have to copy the IP header as well as the
+ * message type.
+ */
+static int ixgbe_ptp_match(struct sk_buff *skb, int rx_filter)
+{
+        struct iphdr iph;
+        u8 msgtype;
+        unsigned int type, offset;
+
+        if (rx_filter == HWTSTAMP_FILTER_NONE)
+                return 0;
+
+        type = sk_run_filter(skb, ptp_filter);
+
+        if (likely(rx_filter == HWTSTAMP_FILTER_PTP_V2_EVENT))
+                return type & PTP_CLASS_V2;
+
+        /* For the remaining cases actually check message type */
+        switch (type) {
+        case PTP_CLASS_V1_IPV4:
+                skb_copy_bits(skb, OFF_IHL, &iph, sizeof(iph));
+                offset = ETH_HLEN + (iph.ihl << 2) + UDP_HLEN + OFF_PTP_CONTROL;
+                break;
+        case PTP_CLASS_V1_IPV6:
+                offset = OFF_PTP6 + OFF_PTP_CONTROL;
+                break;
+        default:
+                /* other cases invalid or handled above */
+                return 0;
+        }
+
+        /* Make sure our buffer is long enough */
+        if (skb->len < offset)
+                return 0;
+
+        skb_copy_bits(skb, offset, &msgtype, sizeof(msgtype));
+
+        switch (rx_filter) {
+        case HWTSTAMP_FILTER_PTP_V1_L4_SYNC:
+                return (msgtype == IXGBE_RXMTRL_V1_SYNC_MSG);
+                break;
+        case HWTSTAMP_FILTER_PTP_V1_L4_DELAY_REQ:
+                return (msgtype == IXGBE_RXMTRL_V1_DELAY_REQ_MSG);
+                break;
+        default:
+                return 0;
+        }
+}
+
+/**
  * ixgbe_ptp_tx_hwtstamp - utility function which checks for TX time stamp
  * @q_vector: structure containing interrupt and ring information
  * @skb: particular skb to send timestamp with
@@ -473,6 +541,7 @@ void ixgbe_ptp_tx_hwtstamp(struct ixgbe_q_vector *q_vector,
 /**
  * ixgbe_ptp_rx_hwtstamp - utility function which checks for RX time stamp
  * @q_vector: structure containing interrupt and ring information
+ * @rx_desc: the rx descriptor
  * @skb: particular skb to send timestamp with
  *
  * if the timestamp is valid, we convert it into the timecounter ns
@@ -480,6 +549,7 @@ void ixgbe_ptp_tx_hwtstamp(struct ixgbe_q_vector *q_vector,
  * is passed up the network stack
  */
 void ixgbe_ptp_rx_hwtstamp(struct ixgbe_q_vector *q_vector,
+                           union ixgbe_adv_rx_desc *rx_desc,
                            struct sk_buff *skb)
 {
         struct ixgbe_adapter *adapter;
@@ -497,21 +567,33 @@ void ixgbe_ptp_rx_hwtstamp(struct ixgbe_q_vector *q_vector,
         hw = &adapter->hw;
 
         tsyncrxctl = IXGBE_READ_REG(hw, IXGBE_TSYNCRXCTL);
+
+        /* Check if we have a valid timestamp and make sure the skb should
+         * have been timestamped */
+        if (likely(!(tsyncrxctl & IXGBE_TSYNCRXCTL_VALID) ||
+                   !ixgbe_ptp_match(skb, adapter->rx_hwtstamp_filter)))
+                return;
+
+        /*
+         * Always read the registers, in order to clear a possible fault
+         * because of stagnant RX timestamp values for a packet that never
+         * reached the queue.
+         */
         regval |= (u64)IXGBE_READ_REG(hw, IXGBE_RXSTMPL);
         regval |= (u64)IXGBE_READ_REG(hw, IXGBE_RXSTMPH) << 32;
 
         /*
-         * If this bit is set, then the RX registers contain the time stamp. No
-         * other packet will be time stamped until we read these registers, so
-         * read the registers to make them available again. Because only one
-         * packet can be time stamped at a time, we know that the register
-         * values must belong to this one here and therefore we don't need to
-         * compare any of the additional attributes stored for it.
+         * If the timestamp bit is set in the packet's descriptor, we know the
+         * timestamp belongs to this packet. No other packet can be
+         * timestamped until the registers for timestamping have been read.
+         * Therefor only one packet with this bit can be in the queue at a
+         * time, and the rx timestamp values that were in the registers belong
+         * to this packet.
          *
          * If nothing went wrong, then it should have a skb_shared_tx that we
          * can turn into a skb_shared_hwtstamps.
          */
-        if (!(tsyncrxctl & IXGBE_TSYNCRXCTL_VALID))
+        if (unlikely(!ixgbe_test_staterr(rx_desc, IXGBE_RXDADV_STAT_TS)))
                 return;
 
         spin_lock_irqsave(&adapter->tmreg_lock, flags);
@@ -539,6 +621,11 @@ void ixgbe_ptp_rx_hwtstamp(struct ixgbe_q_vector *q_vector,
  * type has to be specified. Matching the kind of event packet is
  * not supported, with the exception of "all V2 events regardless of
  * level 2 or 4".
+ *
+ * Since hardware always timestamps Path delay packets when timestamping V2
+ * packets, regardless of the type specified in the register, only use V2
+ * Event mode. This more accurately tells the user what the hardware is going
+ * to do anyways.
  */
 int ixgbe_ptp_hwtstamp_ioctl(struct ixgbe_adapter *adapter,
                              struct ifreq *ifr, int cmd)
@@ -582,41 +669,30 @@ int ixgbe_ptp_hwtstamp_ioctl(struct ixgbe_adapter *adapter,
                 tsync_rx_mtrl = IXGBE_RXMTRL_V1_DELAY_REQ_MSG;
                 is_l4 = true;
                 break;
+        case HWTSTAMP_FILTER_PTP_V2_EVENT:
+        case HWTSTAMP_FILTER_PTP_V2_L2_EVENT:
+        case HWTSTAMP_FILTER_PTP_V2_L4_EVENT:
         case HWTSTAMP_FILTER_PTP_V2_SYNC:
         case HWTSTAMP_FILTER_PTP_V2_L2_SYNC:
         case HWTSTAMP_FILTER_PTP_V2_L4_SYNC:
-                tsync_rx_ctl |= IXGBE_TSYNCRXCTL_TYPE_L2_L4_V2;
-                tsync_rx_mtrl = IXGBE_RXMTRL_V2_SYNC_MSG;
-                is_l2 = true;
-                is_l4 = true;
-                config.rx_filter = HWTSTAMP_FILTER_SOME;
-                break;
         case HWTSTAMP_FILTER_PTP_V2_DELAY_REQ:
         case HWTSTAMP_FILTER_PTP_V2_L2_DELAY_REQ:
         case HWTSTAMP_FILTER_PTP_V2_L4_DELAY_REQ:
-                tsync_rx_ctl |= IXGBE_TSYNCRXCTL_TYPE_L2_L4_V2;
-                tsync_rx_mtrl = IXGBE_RXMTRL_V2_DELAY_REQ_MSG;
-                is_l2 = true;
-                is_l4 = true;
-                config.rx_filter = HWTSTAMP_FILTER_SOME;
-                break;
-        case HWTSTAMP_FILTER_PTP_V2_L4_EVENT:
-        case HWTSTAMP_FILTER_PTP_V2_L2_EVENT:
-        case HWTSTAMP_FILTER_PTP_V2_EVENT:
                 tsync_rx_ctl |= IXGBE_TSYNCRXCTL_TYPE_EVENT_V2;
-                config.rx_filter = HWTSTAMP_FILTER_PTP_V2_EVENT;
                 is_l2 = true;
                 is_l4 = true;
+                config.rx_filter = HWTSTAMP_FILTER_PTP_V2_EVENT;
                 break;
         case HWTSTAMP_FILTER_PTP_V1_L4_EVENT:
         case HWTSTAMP_FILTER_ALL:
         default:
                 /*
-                 * register RXMTRL must be set, therefore it is not
-                 * possible to time stamp both V1 Sync and Delay_Req messages
-                 * and hardware does not support timestamping all packets
-                 * => return error
+                 * register RXMTRL must be set in order to do V1 packets,
+                 * therefore it is not possible to time stamp both V1 Sync and
+                 * Delay_Req messages and hardware does not support
+                 * timestamping all packets => return error
                  */
+                config.rx_filter = HWTSTAMP_FILTER_NONE;
                 return -ERANGE;
         }
 
@@ -626,6 +702,9 @@ int ixgbe_ptp_hwtstamp_ioctl(struct ixgbe_adapter *adapter,
                 return 0;
         }
 
+        /* Store filter value for later use */
+        adapter->rx_hwtstamp_filter = config.rx_filter;
+
         /* define ethertype filter for timestamped packets */
         if (is_l2)
                 IXGBE_WRITE_REG(hw, IXGBE_ETQF(3),
@@ -690,7 +769,7 @@ int ixgbe_ptp_hwtstamp_ioctl(struct ixgbe_adapter *adapter,
 
 /**
  * ixgbe_ptp_start_cyclecounter - create the cycle counter from hw
- * @adapter - pointer to the adapter structure
+ * @adapter: pointer to the adapter structure
  *
  * this function initializes the timecounter and cyclecounter
  * structures for use in generated a ns counter from the arbitrary
@@ -826,7 +905,7 @@ void ixgbe_ptp_start_cyclecounter(struct ixgbe_adapter *adapter)
 
 /**
  * ixgbe_ptp_init
- * @adapter - the ixgbe private adapter structure
+ * @adapter: the ixgbe private adapter structure
  *
  * This function performs the required steps for enabling ptp
  * support. If ptp support has already been loaded it simply calls the
@@ -870,6 +949,10 @@ void ixgbe_ptp_init(struct ixgbe_adapter *adapter)
                 return;
         }
 
+        /* initialize the ptp filter */
+        if (ptp_filter_init(ptp_filter, ARRAY_SIZE(ptp_filter)))
+                e_dev_warn("ptp_filter_init failed\n");
+
         spin_lock_init(&adapter->tmreg_lock);
 
         ixgbe_ptp_start_cyclecounter(adapter);
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_sysfs.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_sysfs.c
index 1d80b1cefa6..16ddf14e8ba 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_sysfs.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_sysfs.c
@@ -37,7 +37,6 @@
 #include <linux/netdevice.h>
 #include <linux/hwmon.h>
 
-#ifdef CONFIG_IXGBE_HWMON
 /* hwmon callback functions */
 static ssize_t ixgbe_hwmon_show_location(struct device *dev,
                                          struct device_attribute *attr,
@@ -96,11 +95,11 @@ static ssize_t ixgbe_hwmon_show_maxopthresh(struct device *dev,
         return sprintf(buf, "%u\n", value);
 }
 
-/*
+/**
  * ixgbe_add_hwmon_attr - Create hwmon attr table for a hwmon sysfs file.
- * @ adapter: pointer to the adapter structure
- * @ offset: offset in the eeprom sensor data table
- * @ type: type of sensor data to display
+ * @adapter: pointer to the adapter structure
+ * @offset: offset in the eeprom sensor data table
+ * @type: type of sensor data to display
  *
  * For each file we want in hwmon's sysfs interface we need a device_attribute
  * This is included in our hwmon_attr struct that contains the references to
@@ -241,5 +240,4 @@ err:
 exit:
         return rc;
 }
-#endif /* CONFIG_IXGBE_HWMON */
 
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h b/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h
index 204848d2448..7416d22ec22 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h
@@ -2419,7 +2419,7 @@ typedef u32 ixgbe_physical_layer;
  */
 
 /* BitTimes (BT) conversion */
-#define IXGBE_BT2KB(BT) ((BT + 1023) / (8 * 1024))
+#define IXGBE_BT2KB(BT) ((BT + (8 * 1024 - 1)) / (8 * 1024))
 #define IXGBE_B2BT(BT) (BT * 8)
 
 /* Calculate Delay to respond to PFC */
@@ -2450,24 +2450,31 @@ typedef u32 ixgbe_physical_layer;
 #define IXGBE_PCI_DELAY 10000
 
 /* Calculate X540 delay value in bit times */
-#define IXGBE_FILL_RATE (36 / 25)
-
-#define IXGBE_DV_X540(LINK, TC) (IXGBE_FILL_RATE * \
-                                 (IXGBE_B2BT(LINK) + IXGBE_PFC_D + \
-                                 (2 * IXGBE_CABLE_DC) + \
-                                 (2 * IXGBE_ID_X540) + \
-                                 IXGBE_HD + IXGBE_B2BT(TC)))
+#define IXGBE_DV_X540(_max_frame_link, _max_frame_tc) \
+                        ((36 * \
+                          (IXGBE_B2BT(_max_frame_link) + \
+                           IXGBE_PFC_D + \
+                           (2 * IXGBE_CABLE_DC) + \
+                           (2 * IXGBE_ID_X540) + \
+                           IXGBE_HD) / 25 + 1) + \
+                         2 * IXGBE_B2BT(_max_frame_tc))
 
 /* Calculate 82599, 82598 delay value in bit times */
-#define IXGBE_DV(LINK, TC) (IXGBE_FILL_RATE * \
-                            (IXGBE_B2BT(LINK) + IXGBE_PFC_D + \
-                            (2 * IXGBE_CABLE_DC) + (2 * IXGBE_ID) + \
-                            IXGBE_HD + IXGBE_B2BT(TC)))
+#define IXGBE_DV(_max_frame_link, _max_frame_tc) \
+                        ((36 * \
+                          (IXGBE_B2BT(_max_frame_link) + \
+                           IXGBE_PFC_D + \
+                           (2 * IXGBE_CABLE_DC) + \
+                           (2 * IXGBE_ID) + \
+                           IXGBE_HD) / 25 + 1) + \
+                         2 * IXGBE_B2BT(_max_frame_tc))
 
 /* Calculate low threshold delay values */
-#define IXGBE_LOW_DV_X540(TC) (2 * IXGBE_B2BT(TC) + \
-                               (IXGBE_FILL_RATE * IXGBE_PCI_DELAY))
-#define IXGBE_LOW_DV(TC)      (2 * IXGBE_LOW_DV_X540(TC))
+#define IXGBE_LOW_DV_X540(_max_frame_tc) \
+                        (2 * IXGBE_B2BT(_max_frame_tc) + \
+                        (36 * IXGBE_PCI_DELAY / 25) + 1)
+#define IXGBE_LOW_DV(_max_frame_tc) \
+                        (2 * IXGBE_LOW_DV_X540(_max_frame_tc))
 
 /* Software ATR hash keys */
 #define IXGBE_ATR_BUCKET_HASH_KEY    0x3DAD14E2
@@ -2597,6 +2604,8 @@ enum ixgbe_sfp_type {
         ixgbe_sfp_type_da_act_lmt_core1 = 8,
         ixgbe_sfp_type_1g_cu_core0 = 9,
         ixgbe_sfp_type_1g_cu_core1 = 10,
+        ixgbe_sfp_type_1g_sx_core0 = 11,
+        ixgbe_sfp_type_1g_sx_core1 = 12,
         ixgbe_sfp_type_not_present = 0xFFFE,
         ixgbe_sfp_type_unknown = 0xFFFF
 };
diff --git a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
index f69ec4288b1..0368160286f 100644
--- a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
+++ b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
@@ -115,7 +115,7 @@ static inline void ixgbevf_release_rx_desc(struct ixgbe_hw *hw,
         IXGBE_WRITE_REG(hw, IXGBE_VFRDT(rx_ring->reg_idx), val);
 }
 
-/*
+/**
  * ixgbevf_set_ivar - set IVAR registers - maps interrupt causes to vectors
  * @adapter: pointer to adapter struct
  * @direction: 0 for Rx, 1 for Tx, -1 for other causes
@@ -1942,8 +1942,8 @@ static void ixgbevf_acquire_msix_vectors(struct ixgbevf_adapter *adapter,
         }
 }
 
-/*
- * ixgbevf_set_num_queues: Allocate queues for device, feature dependent
+/**
+ * ixgbevf_set_num_queues - Allocate queues for device, feature dependent
  * @adapter: board private structure to initialize
  *
  * This is the top level queue allocation routine.  The order here is very
diff --git a/drivers/net/ethernet/lantiq_etop.c b/drivers/net/ethernet/lantiq_etop.c
index 5dc9cbd5151..9fa39ebf545 100644
--- a/drivers/net/ethernet/lantiq_etop.c
+++ b/drivers/net/ethernet/lantiq_etop.c
@@ -149,7 +149,6 @@ ltq_etop_hw_receive(struct ltq_etop_chan *ch)
         spin_unlock_irqrestore(&priv->lock, flags);
 
         skb_put(skb, len);
-        skb->dev = ch->netdev;
         skb->protocol = eth_type_trans(skb, ch->netdev);
         netif_receive_skb(skb);
 }
diff --git a/drivers/net/ethernet/marvell/mv643xx_eth.c b/drivers/net/ethernet/marvell/mv643xx_eth.c
index f0f06b2bc28..770ee557924 100644
--- a/drivers/net/ethernet/marvell/mv643xx_eth.c
+++ b/drivers/net/ethernet/marvell/mv643xx_eth.c
@@ -1896,7 +1896,7 @@ static int rxq_init(struct mv643xx_eth_private *mp, int index)
                 goto out_free;
         }
 
-        rx_desc = (struct rx_desc *)rxq->rx_desc_area;
+        rx_desc = rxq->rx_desc_area;
         for (i = 0; i < rxq->rx_ring_size; i++) {
                 int nexti;
 
@@ -2001,7 +2001,7 @@ static int txq_init(struct mv643xx_eth_private *mp, int index)
 
         txq->tx_desc_area_size = size;
 
-        tx_desc = (struct tx_desc *)txq->tx_desc_area;
+        tx_desc = txq->tx_desc_area;
         for (i = 0; i < txq->tx_ring_size; i++) {
                 struct tx_desc *txd = tx_desc + i;
                 int nexti;
diff --git a/drivers/net/ethernet/marvell/pxa168_eth.c b/drivers/net/ethernet/marvell/pxa168_eth.c
index 1db023b075a..59489722e89 100644
--- a/drivers/net/ethernet/marvell/pxa168_eth.c
+++ b/drivers/net/ethernet/marvell/pxa168_eth.c
@@ -1032,7 +1032,7 @@ static int rxq_init(struct net_device *dev)
         }
         memset((void *)pep->p_rx_desc_area, 0, size);
         /* initialize the next_desc_ptr links in the Rx descriptors ring */
-        p_rx_desc = (struct rx_desc *)pep->p_rx_desc_area;
+        p_rx_desc = pep->p_rx_desc_area;
         for (i = 0; i < rx_desc_num; i++) {
                 p_rx_desc[i].next_desc_ptr = pep->rx_desc_dma +
                     ((i + 1) % rx_desc_num) * sizeof(struct rx_desc);
@@ -1095,7 +1095,7 @@ static int txq_init(struct net_device *dev)
         }
         memset((void *)pep->p_tx_desc_area, 0, pep->tx_desc_area_size);
         /* Initialize the next_desc_ptr links in the Tx descriptors ring */
-        p_tx_desc = (struct tx_desc *)pep->p_tx_desc_area;
+        p_tx_desc = pep->p_tx_desc_area;
         for (i = 0; i < tx_desc_num; i++) {
                 p_tx_desc[i].next_desc_ptr = pep->tx_desc_dma +
                     ((i + 1) % tx_desc_num) * sizeof(struct tx_desc);
diff --git a/drivers/net/ethernet/marvell/sky2.c b/drivers/net/ethernet/marvell/sky2.c
index 28a54451a3e..2b0748dba8b 100644
--- a/drivers/net/ethernet/marvell/sky2.c
+++ b/drivers/net/ethernet/marvell/sky2.c
@@ -141,6 +141,7 @@ static DEFINE_PCI_DEVICE_TABLE(sky2_id_table) = {
         { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x4370) }, /* 88E8075 */
         { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x4380) }, /* 88E8057 */
         { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x4381) }, /* 88E8059 */
+        { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x4382) }, /* 88E8079 */
         { 0 }
 };
 
@@ -3079,8 +3080,10 @@ static irqreturn_t sky2_intr(int irq, void *dev_id)
 
         /* Reading this mask interrupts as side effect */
         status = sky2_read32(hw, B0_Y2_SP_ISRC2);
-        if (status == 0 || status == ~0)
+        if (status == 0 || status == ~0) {
+                sky2_write32(hw, B0_Y2_SP_ICR, 2);
                 return IRQ_NONE;
+        }
 
         prefetch(&hw->st_le[hw->st_idx]);
 
@@ -3349,6 +3352,17 @@ static void sky2_reset(struct sky2_hw *hw)
                         sky2_pci_write16(hw, pdev->pcie_cap + PCI_EXP_LNKCTL,
                                          reg);
 
+                if (hw->chip_id == CHIP_ID_YUKON_PRM &&
+                        hw->chip_rev == CHIP_REV_YU_PRM_A0) {
+                        /* change PHY Interrupt polarity to low active */
+                        reg = sky2_read16(hw, GPHY_CTRL);
+                        sky2_write16(hw, GPHY_CTRL, reg | GPC_INTPOL);
+
+                        /* adapt HW for low active PHY Interrupt */
+                        reg = sky2_read16(hw, Y2_CFG_SPC + PCI_LDO_CTRL);
+                        sky2_write16(hw, Y2_CFG_SPC + PCI_LDO_CTRL, reg | PHY_M_UNDOC1);
+                }
+
                 sky2_write8(hw, B2_TST_CTRL1, TST_CFG_WRITE_OFF);
 
                 /* re-enable PEX PM in PEX PHY debug reg. 8 (clear bit 12) */
@@ -4871,7 +4885,7 @@ static const char *sky2_name(u8 chipid, char *buf, int sz)
                 "UL 2",         /* 0xba */
                 "Unknown",      /* 0xbb */
                 "Optima",       /* 0xbc */
-                "Optima Prime", /* 0xbd */
+                "OptimaEEE",    /* 0xbd */
                 "Optima 2",     /* 0xbe */
         };
 
diff --git a/drivers/net/ethernet/marvell/sky2.h b/drivers/net/ethernet/marvell/sky2.h
index 3c896ce80b7..615ac63ea86 100644
--- a/drivers/net/ethernet/marvell/sky2.h
+++ b/drivers/net/ethernet/marvell/sky2.h
@@ -23,6 +23,7 @@ enum {
         PSM_CONFIG_REG3  = 0x164,
         PSM_CONFIG_REG4  = 0x168,
 
+        PCI_LDO_CTRL    = 0xbc,
 };
 
 /* Yukon-2 */
@@ -586,6 +587,10 @@ enum yukon_supr_rev {
         CHIP_REV_YU_SU_B1    = 3,
 };
 
+enum yukon_prm_rev {
+        CHIP_REV_YU_PRM_Z1   = 1,
+        CHIP_REV_YU_PRM_A0   = 2,
+};
 
 /*      B2_Y2_CLK_GATE   8 bit  Clock Gating (Yukon-2 only) */
 enum {
diff --git a/drivers/net/ethernet/mellanox/mlx4/cmd.c b/drivers/net/ethernet/mellanox/mlx4/cmd.c
index 842c8ce9494..7e94987d030 100644
--- a/drivers/net/ethernet/mellanox/mlx4/cmd.c
+++ b/drivers/net/ethernet/mellanox/mlx4/cmd.c
@@ -1080,6 +1080,25 @@ static struct mlx4_cmd_info cmd_info[] = {
                 .verify = NULL,
                 .wrapper = NULL
         },
+        /* flow steering commands */
+        {
+                .opcode = MLX4_QP_FLOW_STEERING_ATTACH,
+                .has_inbox = true,
+                .has_outbox = false,
+                .out_is_imm = true,
+                .encode_slave_id = false,
+                .verify = NULL,
+                .wrapper = mlx4_QP_FLOW_STEERING_ATTACH_wrapper
+        },
+        {
+                .opcode = MLX4_QP_FLOW_STEERING_DETACH,
+                .has_inbox = false,
+                .has_outbox = false,
+                .out_is_imm = false,
+                .encode_slave_id = false,
+                .verify = NULL,
+                .wrapper = mlx4_QP_FLOW_STEERING_DETACH_wrapper
+        },
 };
 
 static int mlx4_master_process_vhcr(struct mlx4_dev *dev, int slave,
diff --git a/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c b/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c
index 72901ce2b08..dd6a77b2114 100644
--- a/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c
@@ -38,6 +38,10 @@
 #include "mlx4_en.h"
 #include "en_port.h"
 
+#define EN_ETHTOOL_QP_ATTACH (1ull << 63)
+#define EN_ETHTOOL_MAC_MASK 0xffffffffffffULL
+#define EN_ETHTOOL_SHORT_MASK cpu_to_be16(0xffff)
+#define EN_ETHTOOL_WORD_MASK  cpu_to_be32(0xffffffff)
 
 static void
 mlx4_en_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *drvinfo)
@@ -599,16 +603,369 @@ static int mlx4_en_set_rxfh_indir(struct net_device *dev,
         return err;
 }
 
+#define all_zeros_or_all_ones(field)            \
+        ((field) == 0 || (field) == (__force typeof(field))-1)
+
+static int mlx4_en_validate_flow(struct net_device *dev,
+                                 struct ethtool_rxnfc *cmd)
+{
+        struct ethtool_usrip4_spec *l3_mask;
+        struct ethtool_tcpip4_spec *l4_mask;
+        struct ethhdr *eth_mask;
+        u64 full_mac = ~0ull;
+        u64 zero_mac = 0;
+
+        if (cmd->fs.location >= MAX_NUM_OF_FS_RULES)
+                return -EINVAL;
+
+        switch (cmd->fs.flow_type & ~FLOW_EXT) {
+        case TCP_V4_FLOW:
+        case UDP_V4_FLOW:
+                if (cmd->fs.m_u.tcp_ip4_spec.tos)
+                        return -EINVAL;
+                l4_mask = &cmd->fs.m_u.tcp_ip4_spec;
+                /* don't allow mask which isn't all 0 or 1 */
+                if (!all_zeros_or_all_ones(l4_mask->ip4src) ||
+                    !all_zeros_or_all_ones(l4_mask->ip4dst) ||
+                    !all_zeros_or_all_ones(l4_mask->psrc) ||
+                    !all_zeros_or_all_ones(l4_mask->pdst))
+                        return -EINVAL;
+                break;
+        case IP_USER_FLOW:
+                l3_mask = &cmd->fs.m_u.usr_ip4_spec;
+                if (l3_mask->l4_4_bytes || l3_mask->tos || l3_mask->proto ||
+                    cmd->fs.h_u.usr_ip4_spec.ip_ver != ETH_RX_NFC_IP4 ||
+                    (!l3_mask->ip4src && !l3_mask->ip4dst) ||
+                    !all_zeros_or_all_ones(l3_mask->ip4src) ||
+                    !all_zeros_or_all_ones(l3_mask->ip4dst))
+                        return -EINVAL;
+                break;
+        case ETHER_FLOW:
+                eth_mask = &cmd->fs.m_u.ether_spec;
+                /* source mac mask must not be set */
+                if (memcmp(eth_mask->h_source, &zero_mac, ETH_ALEN))
+                        return -EINVAL;
+
+                /* dest mac mask must be ff:ff:ff:ff:ff:ff */
+                if (memcmp(eth_mask->h_dest, &full_mac, ETH_ALEN))
+                        return -EINVAL;
+
+                if (!all_zeros_or_all_ones(eth_mask->h_proto))
+                        return -EINVAL;
+                break;
+        default:
+                return -EINVAL;
+        }
+
+        if ((cmd->fs.flow_type & FLOW_EXT)) {
+                if (cmd->fs.m_ext.vlan_etype ||
+                    !(cmd->fs.m_ext.vlan_tci == 0 ||
+                      cmd->fs.m_ext.vlan_tci == cpu_to_be16(0xfff)))
+                        return -EINVAL;
+        }
+
+        return 0;
+}
+
+static int add_ip_rule(struct mlx4_en_priv *priv,
+                        struct ethtool_rxnfc *cmd,
+                        struct list_head *list_h)
+{
+        struct mlx4_spec_list *spec_l3;
+        struct ethtool_usrip4_spec *l3_mask = &cmd->fs.m_u.usr_ip4_spec;
+
+        spec_l3 = kzalloc(sizeof *spec_l3, GFP_KERNEL);
+        if (!spec_l3) {
+                en_err(priv, "Fail to alloc ethtool rule.\n");
+                return -ENOMEM;
+        }
+
+        spec_l3->id = MLX4_NET_TRANS_RULE_ID_IPV4;
+        spec_l3->ipv4.src_ip = cmd->fs.h_u.usr_ip4_spec.ip4src;
+        if (l3_mask->ip4src)
+                spec_l3->ipv4.src_ip_msk = EN_ETHTOOL_WORD_MASK;
+        spec_l3->ipv4.dst_ip = cmd->fs.h_u.usr_ip4_spec.ip4dst;
+        if (l3_mask->ip4dst)
+                spec_l3->ipv4.dst_ip_msk = EN_ETHTOOL_WORD_MASK;
+        list_add_tail(&spec_l3->list, list_h);
+
+        return 0;
+}
+
+static int add_tcp_udp_rule(struct mlx4_en_priv *priv,
+                             struct ethtool_rxnfc *cmd,
+                             struct list_head *list_h, int proto)
+{
+        struct mlx4_spec_list *spec_l3;
+        struct mlx4_spec_list *spec_l4;
+        struct ethtool_tcpip4_spec *l4_mask = &cmd->fs.m_u.tcp_ip4_spec;
+
+        spec_l3 = kzalloc(sizeof *spec_l3, GFP_KERNEL);
+        spec_l4 = kzalloc(sizeof *spec_l4, GFP_KERNEL);
+        if (!spec_l4 || !spec_l3) {
+                en_err(priv, "Fail to alloc ethtool rule.\n");
+                kfree(spec_l3);
+                kfree(spec_l4);
+                return -ENOMEM;
+        }
+
+        spec_l3->id = MLX4_NET_TRANS_RULE_ID_IPV4;
+
+        if (proto == TCP_V4_FLOW) {
+                spec_l4->id = MLX4_NET_TRANS_RULE_ID_TCP;
+                spec_l3->ipv4.src_ip = cmd->fs.h_u.tcp_ip4_spec.ip4src;
+                spec_l3->ipv4.dst_ip = cmd->fs.h_u.tcp_ip4_spec.ip4dst;
+                spec_l4->tcp_udp.src_port = cmd->fs.h_u.tcp_ip4_spec.psrc;
+                spec_l4->tcp_udp.dst_port = cmd->fs.h_u.tcp_ip4_spec.pdst;
+        } else {
+                spec_l4->id = MLX4_NET_TRANS_RULE_ID_UDP;
+                spec_l3->ipv4.src_ip = cmd->fs.h_u.udp_ip4_spec.ip4src;
+                spec_l3->ipv4.dst_ip = cmd->fs.h_u.udp_ip4_spec.ip4dst;
+                spec_l4->tcp_udp.src_port = cmd->fs.h_u.udp_ip4_spec.psrc;
+                spec_l4->tcp_udp.dst_port = cmd->fs.h_u.udp_ip4_spec.pdst;
+        }
+
+        if (l4_mask->ip4src)
+                spec_l3->ipv4.src_ip_msk = EN_ETHTOOL_WORD_MASK;
+        if (l4_mask->ip4dst)
+                spec_l3->ipv4.dst_ip_msk = EN_ETHTOOL_WORD_MASK;
+
+        if (l4_mask->psrc)
+                spec_l4->tcp_udp.src_port_msk = EN_ETHTOOL_SHORT_MASK;
+        if (l4_mask->pdst)
+                spec_l4->tcp_udp.dst_port_msk = EN_ETHTOOL_SHORT_MASK;
+
+        list_add_tail(&spec_l3->list, list_h);
+        list_add_tail(&spec_l4->list, list_h);
+
+        return 0;
+}
+
+static int mlx4_en_ethtool_to_net_trans_rule(struct net_device *dev,
+                                             struct ethtool_rxnfc *cmd,
+                                             struct list_head *rule_list_h)
+{
+        int err;
+        u64 mac;
+        __be64 be_mac;
+        struct ethhdr *eth_spec;
+        struct mlx4_en_priv *priv = netdev_priv(dev);
+        struct mlx4_spec_list *spec_l2;
+        __be64 mac_msk = cpu_to_be64(EN_ETHTOOL_MAC_MASK << 16);
+
+        err = mlx4_en_validate_flow(dev, cmd);
+        if (err)
+                return err;
+
+        spec_l2 = kzalloc(sizeof *spec_l2, GFP_KERNEL);
+        if (!spec_l2)
+                return -ENOMEM;
+
+        mac = priv->mac & EN_ETHTOOL_MAC_MASK;
+        be_mac = cpu_to_be64(mac << 16);
+
+        spec_l2->id = MLX4_NET_TRANS_RULE_ID_ETH;
+        memcpy(spec_l2->eth.dst_mac_msk, &mac_msk, ETH_ALEN);
+        if ((cmd->fs.flow_type & ~FLOW_EXT) != ETHER_FLOW)
+                memcpy(spec_l2->eth.dst_mac, &be_mac, ETH_ALEN);
+
+        if ((cmd->fs.flow_type & FLOW_EXT) && cmd->fs.m_ext.vlan_tci) {
+                spec_l2->eth.vlan_id = cmd->fs.h_ext.vlan_tci;
+                spec_l2->eth.vlan_id_msk = cpu_to_be16(0xfff);
+        }
+
+        list_add_tail(&spec_l2->list, rule_list_h);
+
+        switch (cmd->fs.flow_type & ~FLOW_EXT) {
+        case ETHER_FLOW:
+                eth_spec = &cmd->fs.h_u.ether_spec;
+                memcpy(&spec_l2->eth.dst_mac, eth_spec->h_dest, ETH_ALEN);
+                spec_l2->eth.ether_type = eth_spec->h_proto;
+                if (eth_spec->h_proto)
+                        spec_l2->eth.ether_type_enable = 1;
+                break;
+        case IP_USER_FLOW:
+                err = add_ip_rule(priv, cmd, rule_list_h);
+                break;
+        case TCP_V4_FLOW:
+                err = add_tcp_udp_rule(priv, cmd, rule_list_h, TCP_V4_FLOW);
+                break;
+        case UDP_V4_FLOW:
+                err = add_tcp_udp_rule(priv, cmd, rule_list_h, UDP_V4_FLOW);
+                break;
+        }
+
+        return err;
+}
+
+static int mlx4_en_flow_replace(struct net_device *dev,
+                                struct ethtool_rxnfc *cmd)
+{
+        int err;
+        struct mlx4_en_priv *priv = netdev_priv(dev);
+        struct ethtool_flow_id *loc_rule;
+        struct mlx4_spec_list *spec, *tmp_spec;
+        u32 qpn;
+        u64 reg_id;
+
+        struct mlx4_net_trans_rule rule = {
+                .queue_mode = MLX4_NET_TRANS_Q_FIFO,
+                .exclusive = 0,
+                .allow_loopback = 1,
+                .promisc_mode = MLX4_FS_PROMISC_NONE,
+        };
+
+        rule.port = priv->port;
+        rule.priority = MLX4_DOMAIN_ETHTOOL | cmd->fs.location;
+        INIT_LIST_HEAD(&rule.list);
+
+        /* Allow direct QP attaches if the EN_ETHTOOL_QP_ATTACH flag is set */
+        if (cmd->fs.ring_cookie == RX_CLS_FLOW_DISC)
+                qpn = priv->drop_qp.qpn;
+        else if (cmd->fs.ring_cookie & EN_ETHTOOL_QP_ATTACH) {
+                qpn = cmd->fs.ring_cookie & (EN_ETHTOOL_QP_ATTACH - 1);
+        } else {
+                if (cmd->fs.ring_cookie >= priv->rx_ring_num) {
+                        en_warn(priv, "rxnfc: RX ring (%llu) doesn't exist.\n",
+                                cmd->fs.ring_cookie);
+                        return -EINVAL;
+                }
+                qpn = priv->rss_map.qps[cmd->fs.ring_cookie].qpn;
+                if (!qpn) {
+                        en_warn(priv, "rxnfc: RX ring (%llu) is inactive.\n",
+                                cmd->fs.ring_cookie);
+                        return -EINVAL;
+                }
+        }
+        rule.qpn = qpn;
+        err = mlx4_en_ethtool_to_net_trans_rule(dev, cmd, &rule.list);
+        if (err)
+                goto out_free_list;
+
+        loc_rule = &priv->ethtool_rules[cmd->fs.location];
+        if (loc_rule->id) {
+                err = mlx4_flow_detach(priv->mdev->dev, loc_rule->id);
+                if (err) {
+                        en_err(priv, "Fail to detach network rule at location %d. registration id = %llx\n",
+                               cmd->fs.location, loc_rule->id);
+                        goto out_free_list;
+                }
+                loc_rule->id = 0;
+                memset(&loc_rule->flow_spec, 0,
+                       sizeof(struct ethtool_rx_flow_spec));
+        }
+        err = mlx4_flow_attach(priv->mdev->dev, &rule, &reg_id);
+        if (err) {
+                en_err(priv, "Fail to attach network rule at location %d.\n",
+                       cmd->fs.location);
+                goto out_free_list;
+        }
+        loc_rule->id = reg_id;
+        memcpy(&loc_rule->flow_spec, &cmd->fs,
+               sizeof(struct ethtool_rx_flow_spec));
+
+out_free_list:
+        list_for_each_entry_safe(spec, tmp_spec, &rule.list, list) {
+                list_del(&spec->list);
+                kfree(spec);
+        }
+        return err;
+}
+
+static int mlx4_en_flow_detach(struct net_device *dev,
+                               struct ethtool_rxnfc *cmd)
+{
+        int err = 0;
+        struct ethtool_flow_id *rule;
+        struct mlx4_en_priv *priv = netdev_priv(dev);
+
+        if (cmd->fs.location >= MAX_NUM_OF_FS_RULES)
+                return -EINVAL;
+
+        rule = &priv->ethtool_rules[cmd->fs.location];
+        if (!rule->id) {
+                err =  -ENOENT;
+                goto out;
+        }
+
+        err = mlx4_flow_detach(priv->mdev->dev, rule->id);
+        if (err) {
+                en_err(priv, "Fail to detach network rule at location %d. registration id = 0x%llx\n",
+                       cmd->fs.location, rule->id);
+                goto out;
+        }
+        rule->id = 0;
+        memset(&rule->flow_spec, 0, sizeof(struct ethtool_rx_flow_spec));
+out:
+        return err;
+
+}
+
+static int mlx4_en_get_flow(struct net_device *dev, struct ethtool_rxnfc *cmd,
+                            int loc)
+{
+        int err = 0;
+        struct ethtool_flow_id *rule;
+        struct mlx4_en_priv *priv = netdev_priv(dev);
+
+        if (loc < 0 || loc >= MAX_NUM_OF_FS_RULES)
+                return -EINVAL;
+
+        rule = &priv->ethtool_rules[loc];
+        if (rule->id)
+                memcpy(&cmd->fs, &rule->flow_spec,
+                       sizeof(struct ethtool_rx_flow_spec));
+        else
+                err = -ENOENT;
+
+        return err;
+}
+
+static int mlx4_en_get_num_flows(struct mlx4_en_priv *priv)
+{
+
+        int i, res = 0;
+        for (i = 0; i < MAX_NUM_OF_FS_RULES; i++) {
+                if (priv->ethtool_rules[i].id)
+                        res++;
+        }
+        return res;
+
+}
+
 static int mlx4_en_get_rxnfc(struct net_device *dev, struct ethtool_rxnfc *cmd,
                              u32 *rule_locs)
 {
         struct mlx4_en_priv *priv = netdev_priv(dev);
+        struct mlx4_en_dev *mdev = priv->mdev;
         int err = 0;
+        int i = 0, priority = 0;
+
+        if ((cmd->cmd == ETHTOOL_GRXCLSRLCNT ||
+             cmd->cmd == ETHTOOL_GRXCLSRULE ||
+             cmd->cmd == ETHTOOL_GRXCLSRLALL) &&
+            mdev->dev->caps.steering_mode != MLX4_STEERING_MODE_DEVICE_MANAGED)
+                return -EINVAL;
 
         switch (cmd->cmd) {
         case ETHTOOL_GRXRINGS:
                 cmd->data = priv->rx_ring_num;
                 break;
+        case ETHTOOL_GRXCLSRLCNT:
+                cmd->rule_cnt = mlx4_en_get_num_flows(priv);
+                break;
+        case ETHTOOL_GRXCLSRULE:
+                err = mlx4_en_get_flow(dev, cmd, cmd->fs.location);
+                break;
+        case ETHTOOL_GRXCLSRLALL:
+                while ((!err || err == -ENOENT) && priority < cmd->rule_cnt) {
+                        err = mlx4_en_get_flow(dev, cmd, i);
+                        if (!err)
+                                rule_locs[priority++] = i;
+                        i++;
+                }
+                err = 0;
+                break;
         default:
                 err = -EOPNOTSUPP;
                 break;
@@ -617,6 +974,30 @@ static int mlx4_en_get_rxnfc(struct net_device *dev, struct ethtool_rxnfc *cmd,
         return err;
 }
 
+static int mlx4_en_set_rxnfc(struct net_device *dev, struct ethtool_rxnfc *cmd)
+{
+        int err = 0;
+        struct mlx4_en_priv *priv = netdev_priv(dev);
+        struct mlx4_en_dev *mdev = priv->mdev;
+
+        if (mdev->dev->caps.steering_mode != MLX4_STEERING_MODE_DEVICE_MANAGED)
+                return -EINVAL;
+
+        switch (cmd->cmd) {
+        case ETHTOOL_SRXCLSRLINS:
+                err = mlx4_en_flow_replace(dev, cmd);
+                break;
+        case ETHTOOL_SRXCLSRLDEL:
+                err = mlx4_en_flow_detach(dev, cmd);
+                break;
+        default:
+                en_warn(priv, "Unsupported ethtool command. (%d)\n", cmd->cmd);
+                return -EINVAL;
+        }
+
+        return err;
+}
+
 const struct ethtool_ops mlx4_en_ethtool_ops = {
         .get_drvinfo = mlx4_en_get_drvinfo,
         .get_settings = mlx4_en_get_settings,
@@ -637,6 +1018,7 @@ const struct ethtool_ops mlx4_en_ethtool_ops = {
         .get_ringparam = mlx4_en_get_ringparam,
         .set_ringparam = mlx4_en_set_ringparam,
         .get_rxnfc = mlx4_en_get_rxnfc,
+        .set_rxnfc = mlx4_en_set_rxnfc,
         .get_rxfh_indir_size = mlx4_en_get_rxfh_indir_size,
         .get_rxfh_indir = mlx4_en_get_rxfh_indir,
         .set_rxfh_indir = mlx4_en_set_rxfh_indir,
diff --git a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
index 073b85b45fc..94375a8c6d4 100644
--- a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
@@ -170,33 +170,81 @@ static void mlx4_en_do_set_mac(struct work_struct *work)
 static void mlx4_en_clear_list(struct net_device *dev)
 {
         struct mlx4_en_priv *priv = netdev_priv(dev);
+        struct mlx4_en_mc_list *tmp, *mc_to_del;
 
-        kfree(priv->mc_addrs);
-        priv->mc_addrs = NULL;
-        priv->mc_addrs_cnt = 0;
+        list_for_each_entry_safe(mc_to_del, tmp, &priv->mc_list, list) {
+                list_del(&mc_to_del->list);
+                kfree(mc_to_del);
+        }
 }
 
 static void mlx4_en_cache_mclist(struct net_device *dev)
 {
         struct mlx4_en_priv *priv = netdev_priv(dev);
         struct netdev_hw_addr *ha;
-        char *mc_addrs;
-        int mc_addrs_cnt = netdev_mc_count(dev);
-        int i;
+        struct mlx4_en_mc_list *tmp;
 
-        mc_addrs = kmalloc(mc_addrs_cnt * ETH_ALEN, GFP_ATOMIC);
-        if (!mc_addrs) {
-                en_err(priv, "failed to allocate multicast list\n");
-                return;
-        }
-        i = 0;
-        netdev_for_each_mc_addr(ha, dev)
-                memcpy(mc_addrs + i++ * ETH_ALEN, ha->addr, ETH_ALEN);
         mlx4_en_clear_list(dev);
-        priv->mc_addrs = mc_addrs;
-        priv->mc_addrs_cnt = mc_addrs_cnt;
+        netdev_for_each_mc_addr(ha, dev) {
+                tmp = kzalloc(sizeof(struct mlx4_en_mc_list), GFP_ATOMIC);
+                if (!tmp) {
+                        en_err(priv, "failed to allocate multicast list\n");
+                        mlx4_en_clear_list(dev);
+                        return;
+                }
+                memcpy(tmp->addr, ha->addr, ETH_ALEN);
+                list_add_tail(&tmp->list, &priv->mc_list);
+        }
 }
 
+static void update_mclist_flags(struct mlx4_en_priv *priv,
+                                struct list_head *dst,
+                                struct list_head *src)
+{
+        struct mlx4_en_mc_list *dst_tmp, *src_tmp, *new_mc;
+        bool found;
+
+        /* Find all the entries that should be removed from dst,
+         * These are the entries that are not found in src
+         */
+        list_for_each_entry(dst_tmp, dst, list) {
+                found = false;
+                list_for_each_entry(src_tmp, src, list) {
+                        if (!memcmp(dst_tmp->addr, src_tmp->addr, ETH_ALEN)) {
+                                found = true;
+                                break;
+                        }
+                }
+                if (!found)
+                        dst_tmp->action = MCLIST_REM;
+        }
+
+        /* Add entries that exist in src but not in dst
+         * mark them as need to add
+         */
+        list_for_each_entry(src_tmp, src, list) {
+                found = false;
+                list_for_each_entry(dst_tmp, dst, list) {
+                        if (!memcmp(dst_tmp->addr, src_tmp->addr, ETH_ALEN)) {
+                                dst_tmp->action = MCLIST_NONE;
+                                found = true;
+                                break;
+                        }
+                }
+                if (!found) {
+                        new_mc = kmalloc(sizeof(struct mlx4_en_mc_list),
+                                         GFP_KERNEL);
+                        if (!new_mc) {
+                                en_err(priv, "Failed to allocate current multicast list\n");
+                                return;
+                        }
+                        memcpy(new_mc, src_tmp,
+                               sizeof(struct mlx4_en_mc_list));
+                        new_mc->action = MCLIST_ADD;
+                        list_add_tail(&new_mc->list, dst);
+                }
+        }
+}
 
 static void mlx4_en_set_multicast(struct net_device *dev)
 {
@@ -214,9 +262,10 @@ static void mlx4_en_do_set_multicast(struct work_struct *work)
                                                  mcast_task);
         struct mlx4_en_dev *mdev = priv->mdev;
         struct net_device *dev = priv->dev;
+        struct mlx4_en_mc_list *mclist, *tmp;
         u64 mcast_addr = 0;
         u8 mc_list[16] = {0};
-        int err;
+        int err = 0;
 
         mutex_lock(&mdev->state_lock);
         if (!mdev->device_up) {
@@ -251,16 +300,46 @@ static void mlx4_en_do_set_multicast(struct work_struct *work)
                         priv->flags |= MLX4_EN_FLAG_PROMISC;
 
                         /* Enable promiscouos mode */
-                        if (!(mdev->dev->caps.flags &
-                                                MLX4_DEV_CAP_FLAG_VEP_UC_STEER))
-                                err = mlx4_SET_PORT_qpn_calc(mdev->dev, priv->port,
-                                                             priv->base_qpn, 1);
-                        else
-                                err = mlx4_unicast_promisc_add(mdev->dev, priv->base_qpn,
+                        switch (mdev->dev->caps.steering_mode) {
+                        case MLX4_STEERING_MODE_DEVICE_MANAGED:
+                                err = mlx4_flow_steer_promisc_add(mdev->dev,
+                                                                  priv->port,
+                                                                  priv->base_qpn,
+                                                                  MLX4_FS_PROMISC_UPLINK);
+                                if (err)
+                                        en_err(priv, "Failed enabling promiscuous mode\n");
+                                priv->flags |= MLX4_EN_FLAG_MC_PROMISC;
+                                break;
+
+                        case MLX4_STEERING_MODE_B0:
+                                err = mlx4_unicast_promisc_add(mdev->dev,
+                                                               priv->base_qpn,
                                                                priv->port);
-                        if (err)
-                                en_err(priv, "Failed enabling "
-                                             "promiscuous mode\n");
+                                if (err)
+                                        en_err(priv, "Failed enabling unicast promiscuous mode\n");
+
+                                /* Add the default qp number as multicast
+                                 * promisc
+                                 */
+                                if (!(priv->flags & MLX4_EN_FLAG_MC_PROMISC)) {
+                                        err = mlx4_multicast_promisc_add(mdev->dev,
+                                                                         priv->base_qpn,
+                                                                         priv->port);
+                                        if (err)
+                                                en_err(priv, "Failed enabling multicast promiscuous mode\n");
+                                        priv->flags |= MLX4_EN_FLAG_MC_PROMISC;
+                                }
+                                break;
+
+                        case MLX4_STEERING_MODE_A0:
+                                err = mlx4_SET_PORT_qpn_calc(mdev->dev,
+                                                             priv->port,
+                                                             priv->base_qpn,
+                                                             1);
+                                if (err)
+                                        en_err(priv, "Failed enabling promiscuous mode\n");
+                                break;
+                        }
 
                         /* Disable port multicast filter (unconditionally) */
                         err = mlx4_SET_MCAST_FLTR(mdev->dev, priv->port, 0,
@@ -269,15 +348,6 @@ static void mlx4_en_do_set_multicast(struct work_struct *work)
                                 en_err(priv, "Failed disabling "
                                              "multicast filter\n");
 
-                        /* Add the default qp number as multicast promisc */
-                        if (!(priv->flags & MLX4_EN_FLAG_MC_PROMISC)) {
-                                err = mlx4_multicast_promisc_add(mdev->dev, priv->base_qpn,
-                                                                 priv->port);
-                                if (err)
-                                        en_err(priv, "Failed entering multicast promisc mode\n");
-                                priv->flags |= MLX4_EN_FLAG_MC_PROMISC;
-                        }
-
                         /* Disable port VLAN filter */
                         err = mlx4_SET_VLAN_FLTR(mdev->dev, priv);
                         if (err)
@@ -296,22 +366,40 @@ static void mlx4_en_do_set_multicast(struct work_struct *work)
                 priv->flags &= ~MLX4_EN_FLAG_PROMISC;
 
                 /* Disable promiscouos mode */
-                if (!(mdev->dev->caps.flags & MLX4_DEV_CAP_FLAG_VEP_UC_STEER))
-                        err = mlx4_SET_PORT_qpn_calc(mdev->dev, priv->port,
-                                                     priv->base_qpn, 0);
-                else
-                        err = mlx4_unicast_promisc_remove(mdev->dev, priv->base_qpn,
+                switch (mdev->dev->caps.steering_mode) {
+                case MLX4_STEERING_MODE_DEVICE_MANAGED:
+                        err = mlx4_flow_steer_promisc_remove(mdev->dev,
+                                                             priv->port,
+                                                             MLX4_FS_PROMISC_UPLINK);
+                        if (err)
+                                en_err(priv, "Failed disabling promiscuous mode\n");
+                        priv->flags &= ~MLX4_EN_FLAG_MC_PROMISC;
+                        break;
+
+                case MLX4_STEERING_MODE_B0:
+                        err = mlx4_unicast_promisc_remove(mdev->dev,
+                                                          priv->base_qpn,
                                                           priv->port);
-                if (err)
-                        en_err(priv, "Failed disabling promiscuous mode\n");
+                        if (err)
+                                en_err(priv, "Failed disabling unicast promiscuous mode\n");
+                        /* Disable Multicast promisc */
+                        if (priv->flags & MLX4_EN_FLAG_MC_PROMISC) {
+                                err = mlx4_multicast_promisc_remove(mdev->dev,
+                                                                    priv->base_qpn,
+                                                                    priv->port);
+                                if (err)
+                                        en_err(priv, "Failed disabling multicast promiscuous mode\n");
+                                priv->flags &= ~MLX4_EN_FLAG_MC_PROMISC;
+                        }
+                        break;
 
-                /* Disable Multicast promisc */
-                if (priv->flags & MLX4_EN_FLAG_MC_PROMISC) {
-                        err = mlx4_multicast_promisc_remove(mdev->dev, priv->base_qpn,
-                                                            priv->port);
+                case MLX4_STEERING_MODE_A0:
+                        err = mlx4_SET_PORT_qpn_calc(mdev->dev,
+                                                     priv->port,
+                                                     priv->base_qpn, 0);
                         if (err)
-                                en_err(priv, "Failed disabling multicast promiscuous mode\n");
-                        priv->flags &= ~MLX4_EN_FLAG_MC_PROMISC;
+                                en_err(priv, "Failed disabling promiscuous mode\n");
+                        break;
                 }
 
                 /* Enable port VLAN filter */
@@ -329,18 +417,46 @@ static void mlx4_en_do_set_multicast(struct work_struct *work)
 
                 /* Add the default qp number as multicast promisc */
                 if (!(priv->flags & MLX4_EN_FLAG_MC_PROMISC)) {
-                        err = mlx4_multicast_promisc_add(mdev->dev, priv->base_qpn,
-                                                         priv->port);
+                        switch (mdev->dev->caps.steering_mode) {
+                        case MLX4_STEERING_MODE_DEVICE_MANAGED:
+                                err = mlx4_flow_steer_promisc_add(mdev->dev,
+                                                                  priv->port,
+                                                                  priv->base_qpn,
+                                                                  MLX4_FS_PROMISC_ALL_MULTI);
+                                break;
+
+                        case MLX4_STEERING_MODE_B0:
+                                err = mlx4_multicast_promisc_add(mdev->dev,
+                                                                 priv->base_qpn,
+                                                                 priv->port);
+                                break;
+
+                        case MLX4_STEERING_MODE_A0:
+                                break;
+                        }
                         if (err)
                                 en_err(priv, "Failed entering multicast promisc mode\n");
                         priv->flags |= MLX4_EN_FLAG_MC_PROMISC;
                 }
         } else {
-                int i;
                 /* Disable Multicast promisc */
                 if (priv->flags & MLX4_EN_FLAG_MC_PROMISC) {
-                        err = mlx4_multicast_promisc_remove(mdev->dev, priv->base_qpn,
-                                                            priv->port);
+                        switch (mdev->dev->caps.steering_mode) {
+                        case MLX4_STEERING_MODE_DEVICE_MANAGED:
+                                err = mlx4_flow_steer_promisc_remove(mdev->dev,
+                                                                     priv->port,
+                                                                     MLX4_FS_PROMISC_ALL_MULTI);
+                                break;
+
+                        case MLX4_STEERING_MODE_B0:
+                                err = mlx4_multicast_promisc_remove(mdev->dev,
+                                                                    priv->base_qpn,
+                                                                    priv->port);
+                                break;
+
+                        case MLX4_STEERING_MODE_A0:
+                                break;
+                        }
                         if (err)
                                 en_err(priv, "Failed disabling multicast promiscuous mode\n");
                         priv->flags &= ~MLX4_EN_FLAG_MC_PROMISC;
@@ -351,13 +467,6 @@ static void mlx4_en_do_set_multicast(struct work_struct *work)
                 if (err)
                         en_err(priv, "Failed disabling multicast filter\n");
 
-                /* Detach our qp from all the multicast addresses */
-                for (i = 0; i < priv->mc_addrs_cnt; i++) {
-                        memcpy(&mc_list[10], priv->mc_addrs + i * ETH_ALEN, ETH_ALEN);
-                        mc_list[5] = priv->port;
-                        mlx4_multicast_detach(mdev->dev, &priv->rss_map.indir_qp,
-                                              mc_list, MLX4_PROT_ETH);
-                }
                 /* Flush mcast filter and init it with broadcast address */
                 mlx4_SET_MCAST_FLTR(mdev->dev, priv->port, ETH_BCAST,
                                     1, MLX4_MCAST_CONFIG);
@@ -367,13 +476,8 @@ static void mlx4_en_do_set_multicast(struct work_struct *work)
                 netif_tx_lock_bh(dev);
                 mlx4_en_cache_mclist(dev);
                 netif_tx_unlock_bh(dev);
-                for (i = 0; i < priv->mc_addrs_cnt; i++) {
-                        mcast_addr =
-                              mlx4_en_mac_to_u64(priv->mc_addrs + i * ETH_ALEN);
-                        memcpy(&mc_list[10], priv->mc_addrs + i * ETH_ALEN, ETH_ALEN);
-                        mc_list[5] = priv->port;
-                        mlx4_multicast_attach(mdev->dev, &priv->rss_map.indir_qp,
-                                              mc_list, 0, MLX4_PROT_ETH);
+                list_for_each_entry(mclist, &priv->mc_list, list) {
+                        mcast_addr = mlx4_en_mac_to_u64(mclist->addr);
                         mlx4_SET_MCAST_FLTR(mdev->dev, priv->port,
                                             mcast_addr, 0, MLX4_MCAST_CONFIG);
                 }
@@ -381,6 +485,42 @@ static void mlx4_en_do_set_multicast(struct work_struct *work)
                                           0, MLX4_MCAST_ENABLE);
                 if (err)
                         en_err(priv, "Failed enabling multicast filter\n");
+
+                update_mclist_flags(priv, &priv->curr_list, &priv->mc_list);
+                list_for_each_entry_safe(mclist, tmp, &priv->curr_list, list) {
+                        if (mclist->action == MCLIST_REM) {
+                                /* detach this address and delete from list */
+                                memcpy(&mc_list[10], mclist->addr, ETH_ALEN);
+                                mc_list[5] = priv->port;
+                                err = mlx4_multicast_detach(mdev->dev,
+                                                            &priv->rss_map.indir_qp,
+                                                            mc_list,
+                                                            MLX4_PROT_ETH,
+                                                            mclist->reg_id);
+                                if (err)
+                                        en_err(priv, "Fail to detach multicast address\n");
+
+                                /* remove from list */
+                                list_del(&mclist->list);
+                                kfree(mclist);
+                        }
+
+                        if (mclist->action == MCLIST_ADD) {
+                                /* attach the address */
+                                memcpy(&mc_list[10], mclist->addr, ETH_ALEN);
+                                /* needed for B0 steering support */
+                                mc_list[5] = priv->port;
+                                err = mlx4_multicast_attach(mdev->dev,
+                                                            &priv->rss_map.indir_qp,
+                                                            mc_list,
+                                                            priv->port, 0,
+                                                            MLX4_PROT_ETH,
+                                                            &mclist->reg_id);
+                                if (err)
+                                        en_err(priv, "Fail to attach multicast address\n");
+
+                        }
+                }
         }
 out:
         mutex_unlock(&mdev->state_lock);
@@ -605,6 +745,9 @@ int mlx4_en_start_port(struct net_device *dev)
                 return 0;
         }
 
+        INIT_LIST_HEAD(&priv->mc_list);
+        INIT_LIST_HEAD(&priv->curr_list);
+
         /* Calculate Rx buf size */
         dev->mtu = min(dev->mtu, priv->max_mtu);
         mlx4_en_calc_rx_buf(dev);
@@ -653,6 +796,10 @@ int mlx4_en_start_port(struct net_device *dev)
                 goto mac_err;
         }
 
+        err = mlx4_en_create_drop_qp(priv);
+        if (err)
+                goto rss_err;
+
         /* Configure tx cq's and rings */
         for (i = 0; i < priv->tx_ring_num; i++) {
                 /* Configure cq */
@@ -720,13 +867,23 @@ int mlx4_en_start_port(struct net_device *dev)
 
         /* Attach rx QP to bradcast address */
         memset(&mc_list[10], 0xff, ETH_ALEN);
-        mc_list[5] = priv->port;
+        mc_list[5] = priv->port; /* needed for B0 steering support */
         if (mlx4_multicast_attach(mdev->dev, &priv->rss_map.indir_qp, mc_list,
-                                  0, MLX4_PROT_ETH))
+                                  priv->port, 0, MLX4_PROT_ETH,
+                                  &priv->broadcast_id))
                 mlx4_warn(mdev, "Failed Attaching Broadcast\n");
 
         /* Must redo promiscuous mode setup. */
         priv->flags &= ~(MLX4_EN_FLAG_PROMISC | MLX4_EN_FLAG_MC_PROMISC);
+        if (mdev->dev->caps.steering_mode ==
+            MLX4_STEERING_MODE_DEVICE_MANAGED) {
+                mlx4_flow_steer_promisc_remove(mdev->dev,
+                                               priv->port,
+                                               MLX4_FS_PROMISC_UPLINK);
+                mlx4_flow_steer_promisc_remove(mdev->dev,
+                                               priv->port,
+                                               MLX4_FS_PROMISC_ALL_MULTI);
+        }
 
         /* Schedule multicast task to populate multicast list */
         queue_work(mdev->workqueue, &priv->mcast_task);
@@ -742,7 +899,8 @@ tx_err:
                 mlx4_en_deactivate_tx_ring(priv, &priv->tx_ring[tx_index]);
                 mlx4_en_deactivate_cq(priv, &priv->tx_cq[tx_index]);
         }
-
+        mlx4_en_destroy_drop_qp(priv);
+rss_err:
         mlx4_en_release_rss_steer(priv);
 mac_err:
         mlx4_put_eth_qp(mdev->dev, priv->port, priv->mac, priv->base_qpn);
@@ -760,6 +918,7 @@ void mlx4_en_stop_port(struct net_device *dev)
 {
         struct mlx4_en_priv *priv = netdev_priv(dev);
         struct mlx4_en_dev *mdev = priv->mdev;
+        struct mlx4_en_mc_list *mclist, *tmp;
         int i;
         u8 mc_list[16] = {0};
 
@@ -778,19 +937,26 @@ void mlx4_en_stop_port(struct net_device *dev)
 
         /* Detach All multicasts */
         memset(&mc_list[10], 0xff, ETH_ALEN);
-        mc_list[5] = priv->port;
+        mc_list[5] = priv->port; /* needed for B0 steering support */
         mlx4_multicast_detach(mdev->dev, &priv->rss_map.indir_qp, mc_list,
-                              MLX4_PROT_ETH);
-        for (i = 0; i < priv->mc_addrs_cnt; i++) {
-                memcpy(&mc_list[10], priv->mc_addrs + i * ETH_ALEN, ETH_ALEN);
+                              MLX4_PROT_ETH, priv->broadcast_id);
+        list_for_each_entry(mclist, &priv->curr_list, list) {
+                memcpy(&mc_list[10], mclist->addr, ETH_ALEN);
                 mc_list[5] = priv->port;
                 mlx4_multicast_detach(mdev->dev, &priv->rss_map.indir_qp,
-                                      mc_list, MLX4_PROT_ETH);
+                                      mc_list, MLX4_PROT_ETH, mclist->reg_id);
         }
         mlx4_en_clear_list(dev);
+        list_for_each_entry_safe(mclist, tmp, &priv->curr_list, list) {
+                list_del(&mclist->list);
+                kfree(mclist);
+        }
+
         /* Flush multicast filter */
         mlx4_SET_MCAST_FLTR(mdev->dev, priv->port, 0, 1, MLX4_MCAST_CONFIG);
 
+        mlx4_en_destroy_drop_qp(priv);
+
         /* Free TX Rings */
         for (i = 0; i < priv->tx_ring_num; i++) {
                 mlx4_en_deactivate_tx_ring(priv, &priv->tx_ring[i]);
diff --git a/drivers/net/ethernet/mellanox/mlx4/en_rx.c b/drivers/net/ethernet/mellanox/mlx4/en_rx.c
index d49a7ac3187..a04cbf767eb 100644
--- a/drivers/net/ethernet/mellanox/mlx4/en_rx.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_rx.c
@@ -844,6 +844,36 @@ out:
         return err;
 }
 
+int mlx4_en_create_drop_qp(struct mlx4_en_priv *priv)
+{
+        int err;
+        u32 qpn;
+
+        err = mlx4_qp_reserve_range(priv->mdev->dev, 1, 1, &qpn);
+        if (err) {
+                en_err(priv, "Failed reserving drop qpn\n");
+                return err;
+        }
+        err = mlx4_qp_alloc(priv->mdev->dev, qpn, &priv->drop_qp);
+        if (err) {
+                en_err(priv, "Failed allocating drop qp\n");
+                mlx4_qp_release_range(priv->mdev->dev, qpn, 1);
+                return err;
+        }
+
+        return 0;
+}
+
+void mlx4_en_destroy_drop_qp(struct mlx4_en_priv *priv)
+{
+        u32 qpn;
+
+        qpn = priv->drop_qp.qpn;
+        mlx4_qp_remove(priv->mdev->dev, &priv->drop_qp);
+        mlx4_qp_free(priv->mdev->dev, &priv->drop_qp);
+        mlx4_qp_release_range(priv->mdev->dev, qpn, 1);
+}
+
 /* Allocate rx qp's and configure them according to rss map */
 int mlx4_en_config_rss_steer(struct mlx4_en_priv *priv)
 {
diff --git a/drivers/net/ethernet/mellanox/mlx4/fw.c b/drivers/net/ethernet/mellanox/mlx4/fw.c
index 9c83bb8151e..1d70657058a 100644
--- a/drivers/net/ethernet/mellanox/mlx4/fw.c
+++ b/drivers/net/ethernet/mellanox/mlx4/fw.c
@@ -123,7 +123,8 @@ static void dump_dev_cap_flags2(struct mlx4_dev *dev, u64 flags)
         static const char * const fname[] = {
                 [0] = "RSS support",
                 [1] = "RSS Toeplitz Hash Function support",
-                [2] = "RSS XOR Hash Function support"
+                [2] = "RSS XOR Hash Function support",
+                [3] = "Device manage flow steering support"
         };
         int i;
 
@@ -391,6 +392,8 @@ int mlx4_QUERY_DEV_CAP(struct mlx4_dev *dev, struct mlx4_dev_cap *dev_cap)
 #define QUERY_DEV_CAP_RSVD_XRC_OFFSET           0x66
 #define QUERY_DEV_CAP_MAX_XRC_OFFSET            0x67
 #define QUERY_DEV_CAP_MAX_COUNTERS_OFFSET       0x68
+#define QUERY_DEV_CAP_FLOW_STEERING_RANGE_EN_OFFSET     0x76
+#define QUERY_DEV_CAP_FLOW_STEERING_MAX_QP_OFFSET       0x77
 #define QUERY_DEV_CAP_RDMARC_ENTRY_SZ_OFFSET    0x80
 #define QUERY_DEV_CAP_QPC_ENTRY_SZ_OFFSET       0x82
 #define QUERY_DEV_CAP_AUX_ENTRY_SZ_OFFSET       0x84
@@ -474,6 +477,12 @@ int mlx4_QUERY_DEV_CAP(struct mlx4_dev *dev, struct mlx4_dev_cap *dev_cap)
         dev_cap->num_ports = field & 0xf;
         MLX4_GET(field, outbox, QUERY_DEV_CAP_MAX_MSG_SZ_OFFSET);
         dev_cap->max_msg_sz = 1 << (field & 0x1f);
+        MLX4_GET(field, outbox, QUERY_DEV_CAP_FLOW_STEERING_RANGE_EN_OFFSET);
+        if (field & 0x80)
+                dev_cap->flags2 |= MLX4_DEV_CAP_FLAG2_FS_EN;
+        dev_cap->fs_log_max_ucast_qp_range_size = field & 0x1f;
+        MLX4_GET(field, outbox, QUERY_DEV_CAP_FLOW_STEERING_MAX_QP_OFFSET);
+        dev_cap->fs_max_num_qp_per_entry = field;
         MLX4_GET(stat_rate, outbox, QUERY_DEV_CAP_RATE_SUPPORT_OFFSET);
         dev_cap->stat_rate_support = stat_rate;
         MLX4_GET(ext_flags, outbox, QUERY_DEV_CAP_EXT_FLAGS_OFFSET);
@@ -1061,6 +1070,15 @@ int mlx4_INIT_HCA(struct mlx4_dev *dev, struct mlx4_init_hca_param *param)
 #define  INIT_HCA_LOG_MC_HASH_SZ_OFFSET  (INIT_HCA_MCAST_OFFSET + 0x16)
 #define  INIT_HCA_UC_STEERING_OFFSET     (INIT_HCA_MCAST_OFFSET + 0x18)
 #define  INIT_HCA_LOG_MC_TABLE_SZ_OFFSET (INIT_HCA_MCAST_OFFSET + 0x1b)
+#define  INIT_HCA_DEVICE_MANAGED_FLOW_STEERING_EN       0x6
+#define  INIT_HCA_FS_PARAM_OFFSET         0x1d0
+#define  INIT_HCA_FS_BASE_OFFSET          (INIT_HCA_FS_PARAM_OFFSET + 0x00)
+#define  INIT_HCA_FS_LOG_ENTRY_SZ_OFFSET  (INIT_HCA_FS_PARAM_OFFSET + 0x12)
+#define  INIT_HCA_FS_LOG_TABLE_SZ_OFFSET  (INIT_HCA_FS_PARAM_OFFSET + 0x1b)
+#define  INIT_HCA_FS_ETH_BITS_OFFSET      (INIT_HCA_FS_PARAM_OFFSET + 0x21)
+#define  INIT_HCA_FS_ETH_NUM_ADDRS_OFFSET (INIT_HCA_FS_PARAM_OFFSET + 0x22)
+#define  INIT_HCA_FS_IB_BITS_OFFSET       (INIT_HCA_FS_PARAM_OFFSET + 0x25)
+#define  INIT_HCA_FS_IB_NUM_ADDRS_OFFSET  (INIT_HCA_FS_PARAM_OFFSET + 0x26)
 #define INIT_HCA_TPT_OFFSET              0x0f0
 #define  INIT_HCA_DMPT_BASE_OFFSET       (INIT_HCA_TPT_OFFSET + 0x00)
 #define  INIT_HCA_LOG_MPT_SZ_OFFSET      (INIT_HCA_TPT_OFFSET + 0x0b)
@@ -1119,14 +1137,44 @@ int mlx4_INIT_HCA(struct mlx4_dev *dev, struct mlx4_init_hca_param *param)
         MLX4_PUT(inbox, param->rdmarc_base,   INIT_HCA_RDMARC_BASE_OFFSET);
         MLX4_PUT(inbox, param->log_rd_per_qp, INIT_HCA_LOG_RD_OFFSET);
 
-        /* multicast attributes */
-
-        MLX4_PUT(inbox, param->mc_base,         INIT_HCA_MC_BASE_OFFSET);
-        MLX4_PUT(inbox, param->log_mc_entry_sz, INIT_HCA_LOG_MC_ENTRY_SZ_OFFSET);
-        MLX4_PUT(inbox, param->log_mc_hash_sz,  INIT_HCA_LOG_MC_HASH_SZ_OFFSET);
-        if (dev->caps.flags & MLX4_DEV_CAP_FLAG_VEP_MC_STEER)
-                MLX4_PUT(inbox, (u8) (1 << 3),  INIT_HCA_UC_STEERING_OFFSET);
-        MLX4_PUT(inbox, param->log_mc_table_sz, INIT_HCA_LOG_MC_TABLE_SZ_OFFSET);
+        /* steering attributes */
+        if (dev->caps.steering_mode ==
+            MLX4_STEERING_MODE_DEVICE_MANAGED) {
+                *(inbox + INIT_HCA_FLAGS_OFFSET / 4) |=
+                        cpu_to_be32(1 <<
+                                    INIT_HCA_DEVICE_MANAGED_FLOW_STEERING_EN);
+
+                MLX4_PUT(inbox, param->mc_base, INIT_HCA_FS_BASE_OFFSET);
+                MLX4_PUT(inbox, param->log_mc_entry_sz,
+                         INIT_HCA_FS_LOG_ENTRY_SZ_OFFSET);
+                MLX4_PUT(inbox, param->log_mc_table_sz,
+                         INIT_HCA_FS_LOG_TABLE_SZ_OFFSET);
+                /* Enable Ethernet flow steering
+                 * with udp unicast and tcp unicast
+                 */
+                MLX4_PUT(inbox, param->fs_hash_enable_bits,
+                         INIT_HCA_FS_ETH_BITS_OFFSET);
+                MLX4_PUT(inbox, (u16) MLX4_FS_NUM_OF_L2_ADDR,
+                         INIT_HCA_FS_ETH_NUM_ADDRS_OFFSET);
+                /* Enable IPoIB flow steering
+                 * with udp unicast and tcp unicast
+                 */
+                MLX4_PUT(inbox, param->fs_hash_enable_bits,
+                         INIT_HCA_FS_IB_BITS_OFFSET);
+                MLX4_PUT(inbox, (u16) MLX4_FS_NUM_OF_L2_ADDR,
+                         INIT_HCA_FS_IB_NUM_ADDRS_OFFSET);
+        } else {
+                MLX4_PUT(inbox, param->mc_base, INIT_HCA_MC_BASE_OFFSET);
+                MLX4_PUT(inbox, param->log_mc_entry_sz,
+                         INIT_HCA_LOG_MC_ENTRY_SZ_OFFSET);
+                MLX4_PUT(inbox, param->log_mc_hash_sz,
+                         INIT_HCA_LOG_MC_HASH_SZ_OFFSET);
+                MLX4_PUT(inbox, param->log_mc_table_sz,
+                         INIT_HCA_LOG_MC_TABLE_SZ_OFFSET);
+                if (dev->caps.steering_mode == MLX4_STEERING_MODE_B0)
+                        MLX4_PUT(inbox, (u8) (1 << 3),
+                                 INIT_HCA_UC_STEERING_OFFSET);
+        }
 
         /* TPT attributes */
 
@@ -1188,15 +1236,24 @@ int mlx4_QUERY_HCA(struct mlx4_dev *dev,
         MLX4_GET(param->rdmarc_base,   outbox, INIT_HCA_RDMARC_BASE_OFFSET);
         MLX4_GET(param->log_rd_per_qp, outbox, INIT_HCA_LOG_RD_OFFSET);
 
-        /* multicast attributes */
+        /* steering attributes */
+        if (dev->caps.steering_mode ==
+            MLX4_STEERING_MODE_DEVICE_MANAGED) {
 
-        MLX4_GET(param->mc_base,         outbox, INIT_HCA_MC_BASE_OFFSET);
-        MLX4_GET(param->log_mc_entry_sz, outbox,
-                 INIT_HCA_LOG_MC_ENTRY_SZ_OFFSET);
-        MLX4_GET(param->log_mc_hash_sz,  outbox,
-                 INIT_HCA_LOG_MC_HASH_SZ_OFFSET);
-        MLX4_GET(param->log_mc_table_sz, outbox,
-                 INIT_HCA_LOG_MC_TABLE_SZ_OFFSET);
+                MLX4_GET(param->mc_base, outbox, INIT_HCA_FS_BASE_OFFSET);
+                MLX4_GET(param->log_mc_entry_sz, outbox,
+                         INIT_HCA_FS_LOG_ENTRY_SZ_OFFSET);
+                MLX4_GET(param->log_mc_table_sz, outbox,
+                         INIT_HCA_FS_LOG_TABLE_SZ_OFFSET);
+        } else {
+                MLX4_GET(param->mc_base, outbox, INIT_HCA_MC_BASE_OFFSET);
+                MLX4_GET(param->log_mc_entry_sz, outbox,
+                         INIT_HCA_LOG_MC_ENTRY_SZ_OFFSET);
+                MLX4_GET(param->log_mc_hash_sz,  outbox,
+                         INIT_HCA_LOG_MC_HASH_SZ_OFFSET);
+                MLX4_GET(param->log_mc_table_sz, outbox,
+                         INIT_HCA_LOG_MC_TABLE_SZ_OFFSET);
+        }
 
         /* TPT attributes */
 
diff --git a/drivers/net/ethernet/mellanox/mlx4/fw.h b/drivers/net/ethernet/mellanox/mlx4/fw.h
index 64c0399e4b7..83fcbbf1b16 100644
--- a/drivers/net/ethernet/mellanox/mlx4/fw.h
+++ b/drivers/net/ethernet/mellanox/mlx4/fw.h
@@ -78,6 +78,8 @@ struct mlx4_dev_cap {
         u16 wavelength[MLX4_MAX_PORTS + 1];
         u64 trans_code[MLX4_MAX_PORTS + 1];
         u16 stat_rate_support;
+        int fs_log_max_ucast_qp_range_size;
+        int fs_max_num_qp_per_entry;
         u64 flags;
         u64 flags2;
         int reserved_uars;
@@ -165,6 +167,7 @@ struct mlx4_init_hca_param {
         u8  log_mpt_sz;
         u8  log_uar_sz;
         u8  uar_page_sz; /* log pg sz in 4k chunks */
+        u8  fs_hash_enable_bits;
 };
 
 struct mlx4_init_ib_param {
diff --git a/drivers/net/ethernet/mellanox/mlx4/main.c b/drivers/net/ethernet/mellanox/mlx4/main.c
index a0313de122d..42645166bae 100644
--- a/drivers/net/ethernet/mellanox/mlx4/main.c
+++ b/drivers/net/ethernet/mellanox/mlx4/main.c
@@ -41,6 +41,7 @@
 #include <linux/slab.h>
 #include <linux/io-mapping.h>
 #include <linux/delay.h>
+#include <linux/netdevice.h>
 
 #include <linux/mlx4/device.h>
 #include <linux/mlx4/doorbell.h>
@@ -90,7 +91,9 @@ module_param_named(log_num_mgm_entry_size,
 MODULE_PARM_DESC(log_num_mgm_entry_size, "log mgm size, that defines the num"
                                          " of qp per mcg, for example:"
                                          " 10 gives 248.range: 9<="
-                                         " log_num_mgm_entry_size <= 12");
+                                         " log_num_mgm_entry_size <= 12."
+                                         " Not in use with device managed"
+                                         " flow steering");
 
 #define MLX4_VF                                        (1 << 0)
 
@@ -243,7 +246,6 @@ static int mlx4_dev_cap(struct mlx4_dev *dev, struct mlx4_dev_cap *dev_cap)
         dev->caps.reserved_srqs      = dev_cap->reserved_srqs;
         dev->caps.max_sq_desc_sz     = dev_cap->max_sq_desc_sz;
         dev->caps.max_rq_desc_sz     = dev_cap->max_rq_desc_sz;
-        dev->caps.num_qp_per_mgm     = mlx4_get_qp_per_mgm(dev);
         /*
          * Subtract 1 from the limit because we need to allocate a
          * spare CQE so the HCA HW can tell the difference between an
@@ -274,6 +276,28 @@ static int mlx4_dev_cap(struct mlx4_dev *dev, struct mlx4_dev_cap *dev_cap)
         dev->caps.max_gso_sz         = dev_cap->max_gso_sz;
         dev->caps.max_rss_tbl_sz     = dev_cap->max_rss_tbl_sz;
 
+        if (dev_cap->flags2 & MLX4_DEV_CAP_FLAG2_FS_EN) {
+                dev->caps.steering_mode = MLX4_STEERING_MODE_DEVICE_MANAGED;
+                dev->caps.num_qp_per_mgm = dev_cap->fs_max_num_qp_per_entry;
+                dev->caps.fs_log_max_ucast_qp_range_size =
+                        dev_cap->fs_log_max_ucast_qp_range_size;
+        } else {
+                if (dev->caps.flags & MLX4_DEV_CAP_FLAG_VEP_UC_STEER &&
+                    dev->caps.flags & MLX4_DEV_CAP_FLAG_VEP_MC_STEER) {
+                        dev->caps.steering_mode = MLX4_STEERING_MODE_B0;
+                } else {
+                        dev->caps.steering_mode = MLX4_STEERING_MODE_A0;
+
+                        if (dev->caps.flags & MLX4_DEV_CAP_FLAG_VEP_UC_STEER ||
+                            dev->caps.flags & MLX4_DEV_CAP_FLAG_VEP_MC_STEER)
+                                mlx4_warn(dev, "Must have UC_STEER and MC_STEER flags "
+                                                "set to use B0 steering. Falling back to A0 steering mode.\n");
+                }
+                dev->caps.num_qp_per_mgm = mlx4_get_qp_per_mgm(dev);
+        }
+        mlx4_dbg(dev, "Steering mode is: %s\n",
+                 mlx4_steering_mode_str(dev->caps.steering_mode));
+
         /* Sense port always allowed on supported devices for ConnectX1 and 2 */
         if (dev->pdev->device != 0x1003)
                 dev->caps.flags |= MLX4_DEV_CAP_FLAG_SENSE_SUPPORT;
@@ -967,9 +991,11 @@ static int mlx4_init_icm(struct mlx4_dev *dev, struct mlx4_dev_cap *dev_cap,
         }
 
         /*
-         * It's not strictly required, but for simplicity just map the
-         * whole multicast group table now.  The table isn't very big
-         * and it's a lot easier than trying to track ref counts.
+         * For flow steering device managed mode it is required to use
+         * mlx4_init_icm_table. For B0 steering mode it's not strictly
+         * required, but for simplicity just map the whole multicast
+         * group table now.  The table isn't very big and it's a lot
+         * easier than trying to track ref counts.
          */
         err = mlx4_init_icm_table(dev, &priv->mcg_table.table,
                                   init_hca->mc_base,
@@ -1205,7 +1231,26 @@ static int mlx4_init_hca(struct mlx4_dev *dev)
                         goto err_stop_fw;
                 }
 
+                priv->fs_hash_mode = MLX4_FS_L2_HASH;
+
+                switch (priv->fs_hash_mode) {
+                case MLX4_FS_L2_HASH:
+                        init_hca.fs_hash_enable_bits = 0;
+                        break;
+
+                case MLX4_FS_L2_L3_L4_HASH:
+                        /* Enable flow steering with
+                         * udp unicast and tcp unicast
+                         */
+                        init_hca.fs_hash_enable_bits =
+                                MLX4_FS_UDP_UC_EN | MLX4_FS_TCP_UC_EN;
+                        break;
+                }
+
                 profile = default_profile;
+                if (dev->caps.steering_mode ==
+                    MLX4_STEERING_MODE_DEVICE_MANAGED)
+                        profile.num_mcg = MLX4_FS_NUM_MCG;
 
                 icm_size = mlx4_make_profile(dev, &profile, &dev_cap,
                                              &init_hca);
@@ -1539,8 +1584,8 @@ static void mlx4_enable_msi_x(struct mlx4_dev *dev)
         struct mlx4_priv *priv = mlx4_priv(dev);
         struct msix_entry *entries;
         int nreq = min_t(int, dev->caps.num_ports *
-                         min_t(int, num_online_cpus() + 1, MAX_MSIX_P_PORT)
-                                + MSIX_LEGACY_SZ, MAX_MSIX);
+                         min_t(int, netif_get_num_default_rss_queues() + 1,
+                               MAX_MSIX_P_PORT) + MSIX_LEGACY_SZ, MAX_MSIX);
         int err;
         int i;
 
diff --git a/drivers/net/ethernet/mellanox/mlx4/mcg.c b/drivers/net/ethernet/mellanox/mlx4/mcg.c
index f4a8f98e402..bc62f536ffa 100644
--- a/drivers/net/ethernet/mellanox/mlx4/mcg.c
+++ b/drivers/net/ethernet/mellanox/mlx4/mcg.c
@@ -41,6 +41,7 @@
 
 #define MGM_QPN_MASK       0x00FFFFFF
 #define MGM_BLCK_LB_BIT    30
+#define MLX4_MAC_MASK      0xffffffffffffULL
 
 static const u8 zero_gid[16];   /* automatically initialized to 0 */
 
@@ -54,7 +55,12 @@ struct mlx4_mgm {
 
 int mlx4_get_mgm_entry_size(struct mlx4_dev *dev)
 {
-        return min((1 << mlx4_log_num_mgm_entry_size), MLX4_MAX_MGM_ENTRY_SIZE);
+        if (dev->caps.steering_mode ==
+            MLX4_STEERING_MODE_DEVICE_MANAGED)
+                return 1 << MLX4_FS_MGM_LOG_ENTRY_SIZE;
+        else
+                return min((1 << mlx4_log_num_mgm_entry_size),
+                           MLX4_MAX_MGM_ENTRY_SIZE);
 }
 
 int mlx4_get_qp_per_mgm(struct mlx4_dev *dev)
@@ -62,6 +68,35 @@ int mlx4_get_qp_per_mgm(struct mlx4_dev *dev)
         return 4 * (mlx4_get_mgm_entry_size(dev) / 16 - 2);
 }
 
+static int mlx4_QP_FLOW_STEERING_ATTACH(struct mlx4_dev *dev,
+                                        struct mlx4_cmd_mailbox *mailbox,
+                                        u32 size,
+                                        u64 *reg_id)
+{
+        u64 imm;
+        int err = 0;
+
+        err = mlx4_cmd_imm(dev, mailbox->dma, &imm, size, 0,
+                           MLX4_QP_FLOW_STEERING_ATTACH, MLX4_CMD_TIME_CLASS_A,
+                           MLX4_CMD_NATIVE);
+        if (err)
+                return err;
+        *reg_id = imm;
+
+        return err;
+}
+
+static int mlx4_QP_FLOW_STEERING_DETACH(struct mlx4_dev *dev, u64 regid)
+{
+        int err = 0;
+
+        err = mlx4_cmd(dev, regid, 0, 0,
+                       MLX4_QP_FLOW_STEERING_DETACH, MLX4_CMD_TIME_CLASS_A,
+                       MLX4_CMD_NATIVE);
+
+        return err;
+}
+
 static int mlx4_READ_ENTRY(struct mlx4_dev *dev, int index,
                            struct mlx4_cmd_mailbox *mailbox)
 {
@@ -614,6 +649,311 @@ static int find_entry(struct mlx4_dev *dev, u8 port,
         return err;
 }
 
+struct mlx4_net_trans_rule_hw_ctrl {
+        __be32 ctrl;
+        __be32 vf_vep_port;
+        __be32 qpn;
+        __be32 reserved;
+};
+
+static void trans_rule_ctrl_to_hw(struct mlx4_net_trans_rule *ctrl,
+                                  struct mlx4_net_trans_rule_hw_ctrl *hw)
+{
+        static const u8 __promisc_mode[] = {
+                [MLX4_FS_PROMISC_NONE]   = 0x0,
+                [MLX4_FS_PROMISC_UPLINK] = 0x1,
+                [MLX4_FS_PROMISC_FUNCTION_PORT] = 0x2,
+                [MLX4_FS_PROMISC_ALL_MULTI] = 0x3,
+        };
+
+        u32 dw = 0;
+
+        dw = ctrl->queue_mode == MLX4_NET_TRANS_Q_LIFO ? 1 : 0;
+        dw |= ctrl->exclusive ? (1 << 2) : 0;
+        dw |= ctrl->allow_loopback ? (1 << 3) : 0;
+        dw |= __promisc_mode[ctrl->promisc_mode] << 8;
+        dw |= ctrl->priority << 16;
+
+        hw->ctrl = cpu_to_be32(dw);
+        hw->vf_vep_port = cpu_to_be32(ctrl->port);
+        hw->qpn = cpu_to_be32(ctrl->qpn);
+}
+
+struct mlx4_net_trans_rule_hw_ib {
+        u8      size;
+        u8      rsvd1;
+        __be16  id;
+        u32     rsvd2;
+        __be32  qpn;
+        __be32  qpn_mask;
+        u8      dst_gid[16];
+        u8      dst_gid_msk[16];
+} __packed;
+
+struct mlx4_net_trans_rule_hw_eth {
+        u8      size;
+        u8      rsvd;
+        __be16  id;
+        u8      rsvd1[6];
+        u8      dst_mac[6];
+        u16     rsvd2;
+        u8      dst_mac_msk[6];
+        u16     rsvd3;
+        u8      src_mac[6];
+        u16     rsvd4;
+        u8      src_mac_msk[6];
+        u8      rsvd5;
+        u8      ether_type_enable;
+        __be16  ether_type;
+        __be16  vlan_id_msk;
+        __be16  vlan_id;
+} __packed;
+
+struct mlx4_net_trans_rule_hw_tcp_udp {
+        u8      size;
+        u8      rsvd;
+        __be16  id;
+        __be16  rsvd1[3];
+        __be16  dst_port;
+        __be16  rsvd2;
+        __be16  dst_port_msk;
+        __be16  rsvd3;
+        __be16  src_port;
+        __be16  rsvd4;
+        __be16  src_port_msk;
+} __packed;
+
+struct mlx4_net_trans_rule_hw_ipv4 {
+        u8      size;
+        u8      rsvd;
+        __be16  id;
+        __be32  rsvd1;
+        __be32  dst_ip;
+        __be32  dst_ip_msk;
+        __be32  src_ip;
+        __be32  src_ip_msk;
+} __packed;
+
+struct _rule_hw {
+        union {
+                struct {
+                        u8 size;
+                        u8 rsvd;
+                        __be16 id;
+                };
+                struct mlx4_net_trans_rule_hw_eth eth;
+                struct mlx4_net_trans_rule_hw_ib ib;
+                struct mlx4_net_trans_rule_hw_ipv4 ipv4;
+                struct mlx4_net_trans_rule_hw_tcp_udp tcp_udp;
+        };
+};
+
+static int parse_trans_rule(struct mlx4_dev *dev, struct mlx4_spec_list *spec,
+                            struct _rule_hw *rule_hw)
+{
+        static const u16 __sw_id_hw[] = {
+                [MLX4_NET_TRANS_RULE_ID_ETH]     = 0xE001,
+                [MLX4_NET_TRANS_RULE_ID_IB]      = 0xE005,
+                [MLX4_NET_TRANS_RULE_ID_IPV6]    = 0xE003,
+                [MLX4_NET_TRANS_RULE_ID_IPV4]    = 0xE002,
+                [MLX4_NET_TRANS_RULE_ID_TCP]     = 0xE004,
+                [MLX4_NET_TRANS_RULE_ID_UDP]     = 0xE006
+        };
+
+        static const size_t __rule_hw_sz[] = {
+                [MLX4_NET_TRANS_RULE_ID_ETH] =
+                        sizeof(struct mlx4_net_trans_rule_hw_eth),
+                [MLX4_NET_TRANS_RULE_ID_IB] =
+                        sizeof(struct mlx4_net_trans_rule_hw_ib),
+                [MLX4_NET_TRANS_RULE_ID_IPV6] = 0,
+                [MLX4_NET_TRANS_RULE_ID_IPV4] =
+                        sizeof(struct mlx4_net_trans_rule_hw_ipv4),
+                [MLX4_NET_TRANS_RULE_ID_TCP] =
+                        sizeof(struct mlx4_net_trans_rule_hw_tcp_udp),
+                [MLX4_NET_TRANS_RULE_ID_UDP] =
+                        sizeof(struct mlx4_net_trans_rule_hw_tcp_udp)
+        };
+        if (spec->id > MLX4_NET_TRANS_RULE_NUM) {
+                mlx4_err(dev, "Invalid network rule id. id = %d\n", spec->id);
+                return -EINVAL;
+        }
+        memset(rule_hw, 0, __rule_hw_sz[spec->id]);
+        rule_hw->id = cpu_to_be16(__sw_id_hw[spec->id]);
+        rule_hw->size = __rule_hw_sz[spec->id] >> 2;
+
+        switch (spec->id) {
+        case MLX4_NET_TRANS_RULE_ID_ETH:
+                memcpy(rule_hw->eth.dst_mac, spec->eth.dst_mac, ETH_ALEN);
+                memcpy(rule_hw->eth.dst_mac_msk, spec->eth.dst_mac_msk,
+                       ETH_ALEN);
+                memcpy(rule_hw->eth.src_mac, spec->eth.src_mac, ETH_ALEN);
+                memcpy(rule_hw->eth.src_mac_msk, spec->eth.src_mac_msk,
+                       ETH_ALEN);
+                if (spec->eth.ether_type_enable) {
+                        rule_hw->eth.ether_type_enable = 1;
+                        rule_hw->eth.ether_type = spec->eth.ether_type;
+                }
+                rule_hw->eth.vlan_id = spec->eth.vlan_id;
+                rule_hw->eth.vlan_id_msk = spec->eth.vlan_id_msk;
+                break;
+
+        case MLX4_NET_TRANS_RULE_ID_IB:
+                rule_hw->ib.qpn = spec->ib.r_qpn;
+                rule_hw->ib.qpn_mask = spec->ib.qpn_msk;
+                memcpy(&rule_hw->ib.dst_gid, &spec->ib.dst_gid, 16);
+                memcpy(&rule_hw->ib.dst_gid_msk, &spec->ib.dst_gid_msk, 16);
+                break;
+
+        case MLX4_NET_TRANS_RULE_ID_IPV6:
+                return -EOPNOTSUPP;
+
+        case MLX4_NET_TRANS_RULE_ID_IPV4:
+                rule_hw->ipv4.src_ip = spec->ipv4.src_ip;
+                rule_hw->ipv4.src_ip_msk = spec->ipv4.src_ip_msk;
+                rule_hw->ipv4.dst_ip = spec->ipv4.dst_ip;
+                rule_hw->ipv4.dst_ip_msk = spec->ipv4.dst_ip_msk;
+                break;
+
+        case MLX4_NET_TRANS_RULE_ID_TCP:
+        case MLX4_NET_TRANS_RULE_ID_UDP:
+                rule_hw->tcp_udp.dst_port = spec->tcp_udp.dst_port;
+                rule_hw->tcp_udp.dst_port_msk = spec->tcp_udp.dst_port_msk;
+                rule_hw->tcp_udp.src_port = spec->tcp_udp.src_port;
+                rule_hw->tcp_udp.src_port_msk = spec->tcp_udp.src_port_msk;
+                break;
+
+        default:
+                return -EINVAL;
+        }
+
+        return __rule_hw_sz[spec->id];
+}
+
+static void mlx4_err_rule(struct mlx4_dev *dev, char *str,
+                          struct mlx4_net_trans_rule *rule)
+{
+#define BUF_SIZE 256
+        struct mlx4_spec_list *cur;
+        char buf[BUF_SIZE];
+        int len = 0;
+
+        mlx4_err(dev, "%s", str);
+        len += snprintf(buf + len, BUF_SIZE - len,
+                        "port = %d prio = 0x%x qp = 0x%x ",
+                        rule->port, rule->priority, rule->qpn);
+
+        list_for_each_entry(cur, &rule->list, list) {
+                switch (cur->id) {
+                case MLX4_NET_TRANS_RULE_ID_ETH:
+                        len += snprintf(buf + len, BUF_SIZE - len,
+                                        "dmac = %pM ", &cur->eth.dst_mac);
+                        if (cur->eth.ether_type)
+                                len += snprintf(buf + len, BUF_SIZE - len,
+                                                "ethertype = 0x%x ",
+                                                be16_to_cpu(cur->eth.ether_type));
+                        if (cur->eth.vlan_id)
+                                len += snprintf(buf + len, BUF_SIZE - len,
+                                                "vlan-id = %d ",
+                                                be16_to_cpu(cur->eth.vlan_id));
+                        break;
+
+                case MLX4_NET_TRANS_RULE_ID_IPV4:
+                        if (cur->ipv4.src_ip)
+                                len += snprintf(buf + len, BUF_SIZE - len,
+                                                "src-ip = %pI4 ",
+                                                &cur->ipv4.src_ip);
+                        if (cur->ipv4.dst_ip)
+                                len += snprintf(buf + len, BUF_SIZE - len,
+                                                "dst-ip = %pI4 ",
+                                                &cur->ipv4.dst_ip);
+                        break;
+
+                case MLX4_NET_TRANS_RULE_ID_TCP:
+                case MLX4_NET_TRANS_RULE_ID_UDP:
+                        if (cur->tcp_udp.src_port)
+                                len += snprintf(buf + len, BUF_SIZE - len,
+                                                "src-port = %d ",
+                                                be16_to_cpu(cur->tcp_udp.src_port));
+                        if (cur->tcp_udp.dst_port)
+                                len += snprintf(buf + len, BUF_SIZE - len,
+                                                "dst-port = %d ",
+                                                be16_to_cpu(cur->tcp_udp.dst_port));
+                        break;
+
+                case MLX4_NET_TRANS_RULE_ID_IB:
+                        len += snprintf(buf + len, BUF_SIZE - len,
+                                        "dst-gid = %pI6\n", cur->ib.dst_gid);
+                        len += snprintf(buf + len, BUF_SIZE - len,
+                                        "dst-gid-mask = %pI6\n",
+                                        cur->ib.dst_gid_msk);
+                        break;
+
+                case MLX4_NET_TRANS_RULE_ID_IPV6:
+                        break;
+
+                default:
+                        break;
+                }
+        }
+        len += snprintf(buf + len, BUF_SIZE - len, "\n");
+        mlx4_err(dev, "%s", buf);
+
+        if (len >= BUF_SIZE)
+                mlx4_err(dev, "Network rule error message was truncated, print buffer is too small.\n");
+}
+
+int mlx4_flow_attach(struct mlx4_dev *dev,
+                     struct mlx4_net_trans_rule *rule, u64 *reg_id)
+{
+        struct mlx4_cmd_mailbox *mailbox;
+        struct mlx4_spec_list *cur;
+        u32 size = 0;
+        int ret;
+
+        mailbox = mlx4_alloc_cmd_mailbox(dev);
+        if (IS_ERR(mailbox))
+                return PTR_ERR(mailbox);
+
+        memset(mailbox->buf, 0, sizeof(struct mlx4_net_trans_rule_hw_ctrl));
+        trans_rule_ctrl_to_hw(rule, mailbox->buf);
+
+        size += sizeof(struct mlx4_net_trans_rule_hw_ctrl);
+
+        list_for_each_entry(cur, &rule->list, list) {
+                ret = parse_trans_rule(dev, cur, mailbox->buf + size);
+                if (ret < 0) {
+                        mlx4_free_cmd_mailbox(dev, mailbox);
+                        return -EINVAL;
+                }
+                size += ret;
+        }
+
+        ret = mlx4_QP_FLOW_STEERING_ATTACH(dev, mailbox, size >> 2, reg_id);
+        if (ret == -ENOMEM)
+                mlx4_err_rule(dev,
+                              "mcg table is full. Fail to register network rule.\n",
+                              rule);
+        else if (ret)
+                mlx4_err_rule(dev, "Fail to register network rule.\n", rule);
+
+        mlx4_free_cmd_mailbox(dev, mailbox);
+
+        return ret;
+}
+EXPORT_SYMBOL_GPL(mlx4_flow_attach);
+
+int mlx4_flow_detach(struct mlx4_dev *dev, u64 reg_id)
+{
+        int err;
+
+        err = mlx4_QP_FLOW_STEERING_DETACH(dev, reg_id);
+        if (err)
+                mlx4_err(dev, "Fail to detach network rule. registration id = 0x%llx\n",
+                         reg_id);
+        return err;
+}
+EXPORT_SYMBOL_GPL(mlx4_flow_detach);
+
 int mlx4_qp_attach_common(struct mlx4_dev *dev, struct mlx4_qp *qp, u8 gid[16],
                           int block_mcast_loopback, enum mlx4_protocol prot,
                           enum mlx4_steer_type steer)
@@ -866,49 +1206,159 @@ static int mlx4_QP_ATTACH(struct mlx4_dev *dev, struct mlx4_qp *qp,
 }
 
 int mlx4_multicast_attach(struct mlx4_dev *dev, struct mlx4_qp *qp, u8 gid[16],
-                          int block_mcast_loopback, enum mlx4_protocol prot)
+                          u8 port, int block_mcast_loopback,
+                          enum mlx4_protocol prot, u64 *reg_id)
 {
-        if (prot == MLX4_PROT_ETH &&
-                        !(dev->caps.flags & MLX4_DEV_CAP_FLAG_VEP_MC_STEER))
-                return 0;
 
-        if (prot == MLX4_PROT_ETH)
-                gid[7] |= (MLX4_MC_STEER << 1);
+        switch (dev->caps.steering_mode) {
+        case MLX4_STEERING_MODE_A0:
+                if (prot == MLX4_PROT_ETH)
+                        return 0;
+
+        case MLX4_STEERING_MODE_B0:
+                if (prot == MLX4_PROT_ETH)
+                        gid[7] |= (MLX4_MC_STEER << 1);
+
+                if (mlx4_is_mfunc(dev))
+                        return mlx4_QP_ATTACH(dev, qp, gid, 1,
+                                              block_mcast_loopback, prot);
+                return mlx4_qp_attach_common(dev, qp, gid,
+                                             block_mcast_loopback, prot,
+                                             MLX4_MC_STEER);
+
+        case MLX4_STEERING_MODE_DEVICE_MANAGED: {
+                struct mlx4_spec_list spec = { {NULL} };
+                __be64 mac_mask = cpu_to_be64(MLX4_MAC_MASK << 16);
+
+                struct mlx4_net_trans_rule rule = {
+                        .queue_mode = MLX4_NET_TRANS_Q_FIFO,
+                        .exclusive = 0,
+                        .promisc_mode = MLX4_FS_PROMISC_NONE,
+                        .priority = MLX4_DOMAIN_NIC,
+                };
+
+                rule.allow_loopback = ~block_mcast_loopback;
+                rule.port = port;
+                rule.qpn = qp->qpn;
+                INIT_LIST_HEAD(&rule.list);
+
+                switch (prot) {
+                case MLX4_PROT_ETH:
+                        spec.id = MLX4_NET_TRANS_RULE_ID_ETH;
+                        memcpy(spec.eth.dst_mac, &gid[10], ETH_ALEN);
+                        memcpy(spec.eth.dst_mac_msk, &mac_mask, ETH_ALEN);
+                        break;
 
-        if (mlx4_is_mfunc(dev))
-                return mlx4_QP_ATTACH(dev, qp, gid, 1,
-                                        block_mcast_loopback, prot);
+                case MLX4_PROT_IB_IPV6:
+                        spec.id = MLX4_NET_TRANS_RULE_ID_IB;
+                        memcpy(spec.ib.dst_gid, gid, 16);
+                        memset(&spec.ib.dst_gid_msk, 0xff, 16);
+                        break;
+                default:
+                        return -EINVAL;
+                }
+                list_add_tail(&spec.list, &rule.list);
 
-        return mlx4_qp_attach_common(dev, qp, gid, block_mcast_loopback,
-                                        prot, MLX4_MC_STEER);
+                return mlx4_flow_attach(dev, &rule, reg_id);
+        }
+
+        default:
+                return -EINVAL;
+        }
 }
 EXPORT_SYMBOL_GPL(mlx4_multicast_attach);
 
 int mlx4_multicast_detach(struct mlx4_dev *dev, struct mlx4_qp *qp, u8 gid[16],
-                          enum mlx4_protocol prot)
+                          enum mlx4_protocol prot, u64 reg_id)
 {
-        if (prot == MLX4_PROT_ETH &&
-                        !(dev->caps.flags & MLX4_DEV_CAP_FLAG_VEP_MC_STEER))
-                return 0;
+        switch (dev->caps.steering_mode) {
+        case MLX4_STEERING_MODE_A0:
+                if (prot == MLX4_PROT_ETH)
+                        return 0;
 
-        if (prot == MLX4_PROT_ETH)
-                gid[7] |= (MLX4_MC_STEER << 1);
+        case MLX4_STEERING_MODE_B0:
+                if (prot == MLX4_PROT_ETH)
+                        gid[7] |= (MLX4_MC_STEER << 1);
 
-        if (mlx4_is_mfunc(dev))
-                return mlx4_QP_ATTACH(dev, qp, gid, 0, 0, prot);
+                if (mlx4_is_mfunc(dev))
+                        return mlx4_QP_ATTACH(dev, qp, gid, 0, 0, prot);
+
+                return mlx4_qp_detach_common(dev, qp, gid, prot,
+                                             MLX4_MC_STEER);
+
+        case MLX4_STEERING_MODE_DEVICE_MANAGED:
+                return mlx4_flow_detach(dev, reg_id);
 
-        return mlx4_qp_detach_common(dev, qp, gid, prot, MLX4_MC_STEER);
+        default:
+                return -EINVAL;
+        }
 }
 EXPORT_SYMBOL_GPL(mlx4_multicast_detach);
 
+int mlx4_flow_steer_promisc_add(struct mlx4_dev *dev, u8 port,
+                                u32 qpn, enum mlx4_net_trans_promisc_mode mode)
+{
+        struct mlx4_net_trans_rule rule;
+        u64 *regid_p;
+
+        switch (mode) {
+        case MLX4_FS_PROMISC_UPLINK:
+        case MLX4_FS_PROMISC_FUNCTION_PORT:
+                regid_p = &dev->regid_promisc_array[port];
+                break;
+        case MLX4_FS_PROMISC_ALL_MULTI:
+                regid_p = &dev->regid_allmulti_array[port];
+                break;
+        default:
+                return -1;
+        }
+
+        if (*regid_p != 0)
+                return -1;
+
+        rule.promisc_mode = mode;
+        rule.port = port;
+        rule.qpn = qpn;
+        INIT_LIST_HEAD(&rule.list);
+        mlx4_err(dev, "going promisc on %x\n", port);
+
+        return  mlx4_flow_attach(dev, &rule, regid_p);
+}
+EXPORT_SYMBOL_GPL(mlx4_flow_steer_promisc_add);
+
+int mlx4_flow_steer_promisc_remove(struct mlx4_dev *dev, u8 port,
+                                   enum mlx4_net_trans_promisc_mode mode)
+{
+        int ret;
+        u64 *regid_p;
+
+        switch (mode) {
+        case MLX4_FS_PROMISC_UPLINK:
+        case MLX4_FS_PROMISC_FUNCTION_PORT:
+                regid_p = &dev->regid_promisc_array[port];
+                break;
+        case MLX4_FS_PROMISC_ALL_MULTI:
+                regid_p = &dev->regid_allmulti_array[port];
+                break;
+        default:
+                return -1;
+        }
+
+        if (*regid_p == 0)
+                return -1;
+
+        ret =  mlx4_flow_detach(dev, *regid_p);
+        if (ret == 0)
+                *regid_p = 0;
+
+        return ret;
+}
+EXPORT_SYMBOL_GPL(mlx4_flow_steer_promisc_remove);
+
 int mlx4_unicast_attach(struct mlx4_dev *dev,
                         struct mlx4_qp *qp, u8 gid[16],
                         int block_mcast_loopback, enum mlx4_protocol prot)
 {
-        if (prot == MLX4_PROT_ETH &&
-                        !(dev->caps.flags & MLX4_DEV_CAP_FLAG_VEP_UC_STEER))
-                return 0;
-
         if (prot == MLX4_PROT_ETH)
                 gid[7] |= (MLX4_UC_STEER << 1);
 
@@ -924,10 +1374,6 @@ EXPORT_SYMBOL_GPL(mlx4_unicast_attach);
 int mlx4_unicast_detach(struct mlx4_dev *dev, struct mlx4_qp *qp,
                                u8 gid[16], enum mlx4_protocol prot)
 {
-        if (prot == MLX4_PROT_ETH &&
-                        !(dev->caps.flags & MLX4_DEV_CAP_FLAG_VEP_UC_STEER))
-                return 0;
-
         if (prot == MLX4_PROT_ETH)
                 gid[7] |= (MLX4_UC_STEER << 1);
 
@@ -968,9 +1414,6 @@ static int mlx4_PROMISC(struct mlx4_dev *dev, u32 qpn,
 
 int mlx4_multicast_promisc_add(struct mlx4_dev *dev, u32 qpn, u8 port)
 {
-        if (!(dev->caps.flags & MLX4_DEV_CAP_FLAG_VEP_MC_STEER))
-                return 0;
-
         if (mlx4_is_mfunc(dev))
                 return mlx4_PROMISC(dev, qpn, MLX4_MC_STEER, 1, port);
 
@@ -980,9 +1423,6 @@ EXPORT_SYMBOL_GPL(mlx4_multicast_promisc_add);
 
 int mlx4_multicast_promisc_remove(struct mlx4_dev *dev, u32 qpn, u8 port)
 {
-        if (!(dev->caps.flags & MLX4_DEV_CAP_FLAG_VEP_MC_STEER))
-                return 0;
-
         if (mlx4_is_mfunc(dev))
                 return mlx4_PROMISC(dev, qpn, MLX4_MC_STEER, 0, port);
 
@@ -992,9 +1432,6 @@ EXPORT_SYMBOL_GPL(mlx4_multicast_promisc_remove);
 
 int mlx4_unicast_promisc_add(struct mlx4_dev *dev, u32 qpn, u8 port)
 {
-        if (!(dev->caps.flags & MLX4_DEV_CAP_FLAG_VEP_UC_STEER))
-                return 0;
-
         if (mlx4_is_mfunc(dev))
                 return mlx4_PROMISC(dev, qpn, MLX4_UC_STEER, 1, port);
 
@@ -1004,9 +1441,6 @@ EXPORT_SYMBOL_GPL(mlx4_unicast_promisc_add);
 
 int mlx4_unicast_promisc_remove(struct mlx4_dev *dev, u32 qpn, u8 port)
 {
-        if (!(dev->caps.flags & MLX4_DEV_CAP_FLAG_VEP_UC_STEER))
-                return 0;
-
         if (mlx4_is_mfunc(dev))
                 return mlx4_PROMISC(dev, qpn, MLX4_UC_STEER, 0, port);
 
@@ -1019,6 +1453,10 @@ int mlx4_init_mcg_table(struct mlx4_dev *dev)
         struct mlx4_priv *priv = mlx4_priv(dev);
         int err;
 
+        /* No need for mcg_table when fw managed the mcg table*/
+        if (dev->caps.steering_mode ==
+            MLX4_STEERING_MODE_DEVICE_MANAGED)
+                return 0;
         err = mlx4_bitmap_init(&priv->mcg_table.bitmap, dev->caps.num_amgms,
                                dev->caps.num_amgms - 1, 0, 0);
         if (err)
@@ -1031,5 +1469,7 @@ int mlx4_init_mcg_table(struct mlx4_dev *dev)
 
 void mlx4_cleanup_mcg_table(struct mlx4_dev *dev)
 {
-        mlx4_bitmap_cleanup(&mlx4_priv(dev)->mcg_table.bitmap);
+        if (dev->caps.steering_mode !=
+            MLX4_STEERING_MODE_DEVICE_MANAGED)
+                mlx4_bitmap_cleanup(&mlx4_priv(dev)->mcg_table.bitmap);
 }
diff --git a/drivers/net/ethernet/mellanox/mlx4/mlx4.h b/drivers/net/ethernet/mellanox/mlx4/mlx4.h
index e5d20220762..d2c436b10fb 100644
--- a/drivers/net/ethernet/mellanox/mlx4/mlx4.h
+++ b/drivers/net/ethernet/mellanox/mlx4/mlx4.h
@@ -39,6 +39,7 @@
 
 #include <linux/mutex.h>
 #include <linux/radix-tree.h>
+#include <linux/rbtree.h>
 #include <linux/timer.h>
 #include <linux/semaphore.h>
 #include <linux/workqueue.h>
@@ -53,6 +54,17 @@
 #define DRV_VERSION     "1.1"
 #define DRV_RELDATE     "Dec, 2011"
 
+#define MLX4_FS_UDP_UC_EN               (1 << 1)
+#define MLX4_FS_TCP_UC_EN               (1 << 2)
+#define MLX4_FS_NUM_OF_L2_ADDR          8
+#define MLX4_FS_MGM_LOG_ENTRY_SIZE      7
+#define MLX4_FS_NUM_MCG                 (1 << 17)
+
+enum {
+        MLX4_FS_L2_HASH = 0,
+        MLX4_FS_L2_L3_L4_HASH,
+};
+
 #define MLX4_NUM_UP             8
 #define MLX4_NUM_TC             8
 #define MLX4_RATELIMIT_UNITS 3 /* 100 Mbps */
@@ -137,6 +149,7 @@ enum mlx4_resource {
         RES_VLAN,
         RES_EQ,
         RES_COUNTER,
+        RES_FS_RULE,
         MLX4_NUM_OF_RESOURCE_TYPE
 };
 
@@ -509,7 +522,7 @@ struct slave_list {
 struct mlx4_resource_tracker {
         spinlock_t lock;
         /* tree for each resources */
-        struct radix_tree_root res_tree[MLX4_NUM_OF_RESOURCE_TYPE];
+        struct rb_root res_tree[MLX4_NUM_OF_RESOURCE_TYPE];
         /* num_of_slave's lists, one per slave */
         struct slave_list *slave_list;
 };
@@ -703,6 +716,7 @@ struct mlx4_set_port_rqp_calc_context {
 
 struct mlx4_mac_entry {
         u64 mac;
+        u64 reg_id;
 };
 
 struct mlx4_port_info {
@@ -776,6 +790,7 @@ struct mlx4_priv {
         struct mutex            bf_mutex;
         struct io_mapping       *bf_mapping;
         int                     reserved_mtts;
+        int                     fs_hash_mode;
 };
 
 static inline struct mlx4_priv *mlx4_priv(struct mlx4_dev *dev)
@@ -1032,7 +1047,7 @@ int mlx4_SET_PORT(struct mlx4_dev *dev, u8 port);
 /* resource tracker functions*/
 int mlx4_get_slave_from_resource_id(struct mlx4_dev *dev,
                                     enum mlx4_resource resource_type,
-                                    int resource_id, int *slave);
+                                    u64 resource_id, int *slave);
 void mlx4_delete_all_resources_for_slave(struct mlx4_dev *dev, int slave_id);
 int mlx4_init_resource_tracker(struct mlx4_dev *dev);
 
@@ -1117,6 +1132,16 @@ int mlx4_QUERY_IF_STAT_wrapper(struct mlx4_dev *dev, int slave,
                                struct mlx4_cmd_mailbox *inbox,
                                struct mlx4_cmd_mailbox *outbox,
                                struct mlx4_cmd_info *cmd);
+int mlx4_QP_FLOW_STEERING_ATTACH_wrapper(struct mlx4_dev *dev, int slave,
+                                         struct mlx4_vhcr *vhcr,
+                                         struct mlx4_cmd_mailbox *inbox,
+                                         struct mlx4_cmd_mailbox *outbox,
+                                         struct mlx4_cmd_info *cmd);
+int mlx4_QP_FLOW_STEERING_DETACH_wrapper(struct mlx4_dev *dev, int slave,
+                                         struct mlx4_vhcr *vhcr,
+                                         struct mlx4_cmd_mailbox *inbox,
+                                         struct mlx4_cmd_mailbox *outbox,
+                                         struct mlx4_cmd_info *cmd);
 
 int mlx4_get_mgm_entry_size(struct mlx4_dev *dev);
 int mlx4_get_qp_per_mgm(struct mlx4_dev *dev);
diff --git a/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h b/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h
index 225c20d4790..a12632150b3 100644
--- a/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h
+++ b/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h
@@ -75,6 +75,7 @@
 #define STAMP_SHIFT             31
 #define STAMP_VAL               0x7fffffff
 #define STATS_DELAY             (HZ / 4)
+#define MAX_NUM_OF_FS_RULES     256
 
 /* Typical TSO descriptor with 16 gather entries is 352 bytes... */
 #define MAX_DESC_SIZE           512
@@ -404,6 +405,19 @@ struct mlx4_en_perf_stats {
 #define NUM_PERF_COUNTERS               6
 };
 
+enum mlx4_en_mclist_act {
+        MCLIST_NONE,
+        MCLIST_REM,
+        MCLIST_ADD,
+};
+
+struct mlx4_en_mc_list {
+        struct list_head        list;
+        enum mlx4_en_mclist_act action;
+        u8                      addr[ETH_ALEN];
+        u64                     reg_id;
+};
+
 struct mlx4_en_frag_info {
         u16 frag_size;
         u16 frag_prefix_size;
@@ -422,6 +436,11 @@ struct mlx4_en_frag_info {
 
 #endif
 
+struct ethtool_flow_id {
+        struct ethtool_rx_flow_spec flow_spec;
+        u64 id;
+};
+
 struct mlx4_en_priv {
         struct mlx4_en_dev *mdev;
         struct mlx4_en_port_profile *prof;
@@ -431,6 +450,7 @@ struct mlx4_en_priv {
         struct net_device_stats ret_stats;
         struct mlx4_en_port_state port_state;
         spinlock_t stats_lock;
+        struct ethtool_flow_id ethtool_rules[MAX_NUM_OF_FS_RULES];
 
         unsigned long last_moder_packets[MAX_RX_RINGS];
         unsigned long last_moder_tx_packets;
@@ -480,6 +500,7 @@ struct mlx4_en_priv {
         struct mlx4_en_rx_ring rx_ring[MAX_RX_RINGS];
         struct mlx4_en_cq *tx_cq;
         struct mlx4_en_cq rx_cq[MAX_RX_RINGS];
+        struct mlx4_qp drop_qp;
         struct work_struct mcast_task;
         struct work_struct mac_task;
         struct work_struct watchdog_task;
@@ -489,8 +510,9 @@ struct mlx4_en_priv {
         struct mlx4_en_pkt_stats pkstats;
         struct mlx4_en_port_stats port_stats;
         u64 stats_bitmap;
-        char *mc_addrs;
-        int mc_addrs_cnt;
+        struct list_head mc_list;
+        struct list_head curr_list;
+        u64 broadcast_id;
         struct mlx4_en_stat_out_mbox hw_stats;
         int vids[128];
         bool wol;
@@ -565,6 +587,8 @@ void mlx4_en_unmap_buffer(struct mlx4_buf *buf);
 void mlx4_en_calc_rx_buf(struct net_device *dev);
 int mlx4_en_config_rss_steer(struct mlx4_en_priv *priv);
 void mlx4_en_release_rss_steer(struct mlx4_en_priv *priv);
+int mlx4_en_create_drop_qp(struct mlx4_en_priv *priv);
+void mlx4_en_destroy_drop_qp(struct mlx4_en_priv *priv);
 int mlx4_en_free_tx_buf(struct net_device *dev, struct mlx4_en_tx_ring *ring);
 void mlx4_en_rx_irq(struct mlx4_cq *mcq);
 
diff --git a/drivers/net/ethernet/mellanox/mlx4/port.c b/drivers/net/ethernet/mellanox/mlx4/port.c
index a8fb52992c6..a51d1b9bf1d 100644
--- a/drivers/net/ethernet/mellanox/mlx4/port.c
+++ b/drivers/net/ethernet/mellanox/mlx4/port.c
@@ -75,21 +75,54 @@ void mlx4_init_vlan_table(struct mlx4_dev *dev, struct mlx4_vlan_table *table)
         table->total = 0;
 }
 
-static int mlx4_uc_steer_add(struct mlx4_dev *dev, u8 port, u64 mac, int *qpn)
+static int mlx4_uc_steer_add(struct mlx4_dev *dev, u8 port,
+                             u64 mac, int *qpn, u64 *reg_id)
 {
-        struct mlx4_qp qp;
-        u8 gid[16] = {0};
         __be64 be_mac;
         int err;
 
-        qp.qpn = *qpn;
-
-        mac &= 0xffffffffffffULL;
+        mac &= MLX4_MAC_MASK;
         be_mac = cpu_to_be64(mac << 16);
-        memcpy(&gid[10], &be_mac, ETH_ALEN);
-        gid[5] = port;
 
-        err = mlx4_unicast_attach(dev, &qp, gid, 0, MLX4_PROT_ETH);
+        switch (dev->caps.steering_mode) {
+        case MLX4_STEERING_MODE_B0: {
+                struct mlx4_qp qp;
+                u8 gid[16] = {0};
+
+                qp.qpn = *qpn;
+                memcpy(&gid[10], &be_mac, ETH_ALEN);
+                gid[5] = port;
+
+                err = mlx4_unicast_attach(dev, &qp, gid, 0, MLX4_PROT_ETH);
+                break;
+        }
+        case MLX4_STEERING_MODE_DEVICE_MANAGED: {
+                struct mlx4_spec_list spec_eth = { {NULL} };
+                __be64 mac_mask = cpu_to_be64(MLX4_MAC_MASK << 16);
+
+                struct mlx4_net_trans_rule rule = {
+                        .queue_mode = MLX4_NET_TRANS_Q_FIFO,
+                        .exclusive = 0,
+                        .allow_loopback = 1,
+                        .promisc_mode = MLX4_FS_PROMISC_NONE,
+                        .priority = MLX4_DOMAIN_NIC,
+                };
+
+                rule.port = port;
+                rule.qpn = *qpn;
+                INIT_LIST_HEAD(&rule.list);
+
+                spec_eth.id = MLX4_NET_TRANS_RULE_ID_ETH;
+                memcpy(spec_eth.eth.dst_mac, &be_mac, ETH_ALEN);
+                memcpy(spec_eth.eth.dst_mac_msk, &mac_mask, ETH_ALEN);
+                list_add_tail(&spec_eth.list, &rule.list);
+
+                err = mlx4_flow_attach(dev, &rule, reg_id);
+                break;
+        }
+        default:
+                return -EINVAL;
+        }
         if (err)
                 mlx4_warn(dev, "Failed Attaching Unicast\n");
 
@@ -97,19 +130,30 @@ static int mlx4_uc_steer_add(struct mlx4_dev *dev, u8 port, u64 mac, int *qpn)
 }
 
 static void mlx4_uc_steer_release(struct mlx4_dev *dev, u8 port,
-                                  u64 mac, int qpn)
+                                  u64 mac, int qpn, u64 reg_id)
 {
-        struct mlx4_qp qp;
-        u8 gid[16] = {0};
-        __be64 be_mac;
+        switch (dev->caps.steering_mode) {
+        case MLX4_STEERING_MODE_B0: {
+                struct mlx4_qp qp;
+                u8 gid[16] = {0};
+                __be64 be_mac;
 
-        qp.qpn = qpn;
-        mac &= 0xffffffffffffULL;
-        be_mac = cpu_to_be64(mac << 16);
-        memcpy(&gid[10], &be_mac, ETH_ALEN);
-        gid[5] = port;
+                qp.qpn = qpn;
+                mac &= MLX4_MAC_MASK;
+                be_mac = cpu_to_be64(mac << 16);
+                memcpy(&gid[10], &be_mac, ETH_ALEN);
+                gid[5] = port;
 
-        mlx4_unicast_detach(dev, &qp, gid, MLX4_PROT_ETH);
+                mlx4_unicast_detach(dev, &qp, gid, MLX4_PROT_ETH);
+                break;
+        }
+        case MLX4_STEERING_MODE_DEVICE_MANAGED: {
+                mlx4_flow_detach(dev, reg_id);
+                break;
+        }
+        default:
+                mlx4_err(dev, "Invalid steering mode.\n");
+        }
 }
 
 static int validate_index(struct mlx4_dev *dev,
@@ -144,6 +188,7 @@ int mlx4_get_eth_qp(struct mlx4_dev *dev, u8 port, u64 mac, int *qpn)
         struct mlx4_mac_entry *entry;
         int index = 0;
         int err = 0;
+        u64 reg_id;
 
         mlx4_dbg(dev, "Registering MAC: 0x%llx for adding\n",
                         (unsigned long long) mac);
@@ -155,7 +200,7 @@ int mlx4_get_eth_qp(struct mlx4_dev *dev, u8 port, u64 mac, int *qpn)
                 return err;
         }
 
-        if (!(dev->caps.flags & MLX4_DEV_CAP_FLAG_VEP_UC_STEER)) {
+        if (dev->caps.steering_mode == MLX4_STEERING_MODE_A0) {
                 *qpn = info->base_qpn + index;
                 return 0;
         }
@@ -167,7 +212,7 @@ int mlx4_get_eth_qp(struct mlx4_dev *dev, u8 port, u64 mac, int *qpn)
                 goto qp_err;
         }
 
-        err = mlx4_uc_steer_add(dev, port, mac, qpn);
+        err = mlx4_uc_steer_add(dev, port, mac, qpn, &reg_id);
         if (err)
                 goto steer_err;
 
@@ -177,6 +222,7 @@ int mlx4_get_eth_qp(struct mlx4_dev *dev, u8 port, u64 mac, int *qpn)
                 goto alloc_err;
         }
         entry->mac = mac;
+        entry->reg_id = reg_id;
         err = radix_tree_insert(&info->mac_tree, *qpn, entry);
         if (err)
                 goto insert_err;
@@ -186,7 +232,7 @@ insert_err:
         kfree(entry);
 
 alloc_err:
-        mlx4_uc_steer_release(dev, port, mac, *qpn);
+        mlx4_uc_steer_release(dev, port, mac, *qpn, reg_id);
 
 steer_err:
         mlx4_qp_release_range(dev, *qpn, 1);
@@ -206,13 +252,14 @@ void mlx4_put_eth_qp(struct mlx4_dev *dev, u8 port, u64 mac, int qpn)
                  (unsigned long long) mac);
         mlx4_unregister_mac(dev, port, mac);
 
-        if (dev->caps.flags & MLX4_DEV_CAP_FLAG_VEP_UC_STEER) {
+        if (dev->caps.steering_mode != MLX4_STEERING_MODE_A0) {
                 entry = radix_tree_lookup(&info->mac_tree, qpn);
                 if (entry) {
                         mlx4_dbg(dev, "Releasing qp: port %d, mac 0x%llx,"
                                  " qpn %d\n", port,
                                  (unsigned long long) mac, qpn);
-                        mlx4_uc_steer_release(dev, port, entry->mac, qpn);
+                        mlx4_uc_steer_release(dev, port, entry->mac,
+                                              qpn, entry->reg_id);
                         mlx4_qp_release_range(dev, qpn, 1);
                         radix_tree_delete(&info->mac_tree, qpn);
                         kfree(entry);
@@ -359,15 +406,18 @@ int mlx4_replace_mac(struct mlx4_dev *dev, u8 port, int qpn, u64 new_mac)
         int index = qpn - info->base_qpn;
         int err = 0;
 
-        if (dev->caps.flags & MLX4_DEV_CAP_FLAG_VEP_UC_STEER) {
+        if (dev->caps.steering_mode != MLX4_STEERING_MODE_A0) {
                 entry = radix_tree_lookup(&info->mac_tree, qpn);
                 if (!entry)
                         return -EINVAL;
-                mlx4_uc_steer_release(dev, port, entry->mac, qpn);
+                mlx4_uc_steer_release(dev, port, entry->mac,
+                                      qpn, entry->reg_id);
                 mlx4_unregister_mac(dev, port, entry->mac);
                 entry->mac = new_mac;
+                entry->reg_id = 0;
                 mlx4_register_mac(dev, port, new_mac);
-                err = mlx4_uc_steer_add(dev, port, entry->mac, &qpn);
+                err = mlx4_uc_steer_add(dev, port, entry->mac,
+                                        &qpn, &entry->reg_id);
                 return err;
         }
 
@@ -803,8 +853,7 @@ int mlx4_SET_PORT_qpn_calc(struct mlx4_dev *dev, u8 port, u32 base_qpn,
         u32 m_promisc = (dev->caps.flags & MLX4_DEV_CAP_FLAG_VEP_MC_STEER) ?
                 MCAST_DIRECT : MCAST_DEFAULT;
 
-        if (dev->caps.flags & MLX4_DEV_CAP_FLAG_VEP_MC_STEER  &&
-            dev->caps.flags & MLX4_DEV_CAP_FLAG_VEP_UC_STEER)
+        if (dev->caps.steering_mode != MLX4_STEERING_MODE_A0)
                 return 0;
 
         mailbox = mlx4_alloc_cmd_mailbox(dev);
diff --git a/drivers/net/ethernet/mellanox/mlx4/profile.c b/drivers/net/ethernet/mellanox/mlx4/profile.c
index b83bc928d52..9ee4725363d 100644
--- a/drivers/net/ethernet/mellanox/mlx4/profile.c
+++ b/drivers/net/ethernet/mellanox/mlx4/profile.c
@@ -237,13 +237,19 @@ u64 mlx4_make_profile(struct mlx4_dev *dev,
                         init_hca->mtt_base       = profile[i].start;
                         break;
                 case MLX4_RES_MCG:
-                        dev->caps.num_mgms        = profile[i].num >> 1;
-                        dev->caps.num_amgms       = profile[i].num >> 1;
                         init_hca->mc_base         = profile[i].start;
                         init_hca->log_mc_entry_sz =
                                         ilog2(mlx4_get_mgm_entry_size(dev));
                         init_hca->log_mc_table_sz = profile[i].log_num;
-                        init_hca->log_mc_hash_sz  = profile[i].log_num - 1;
+                        if (dev->caps.steering_mode ==
+                            MLX4_STEERING_MODE_DEVICE_MANAGED) {
+                                dev->caps.num_mgms = profile[i].num;
+                        } else {
+                                init_hca->log_mc_hash_sz =
+                                                profile[i].log_num - 1;
+                                dev->caps.num_mgms = profile[i].num >> 1;
+                                dev->caps.num_amgms = profile[i].num >> 1;
+                        }
                         break;
                 default:
                         break;
diff --git a/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c b/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c
index b45d0e7f6ab..c3fa9198619 100644
--- a/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c
+++ b/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c
@@ -57,7 +57,8 @@ struct mac_res {
 
 struct res_common {
         struct list_head        list;
-        u32                     res_id;
+        struct rb_node          node;
+        u64                     res_id;
         int                     owner;
         int                     state;
         int                     from_state;
@@ -189,6 +190,58 @@ struct res_xrcdn {
         int                     port;
 };
 
+enum res_fs_rule_states {
+        RES_FS_RULE_BUSY = RES_ANY_BUSY,
+        RES_FS_RULE_ALLOCATED,
+};
+
+struct res_fs_rule {
+        struct res_common       com;
+};
+
+static void *res_tracker_lookup(struct rb_root *root, u64 res_id)
+{
+        struct rb_node *node = root->rb_node;
+
+        while (node) {
+                struct res_common *res = container_of(node, struct res_common,
+                                                      node);
+
+                if (res_id < res->res_id)
+                        node = node->rb_left;
+                else if (res_id > res->res_id)
+                        node = node->rb_right;
+                else
+                        return res;
+        }
+        return NULL;
+}
+
+static int res_tracker_insert(struct rb_root *root, struct res_common *res)
+{
+        struct rb_node **new = &(root->rb_node), *parent = NULL;
+
+        /* Figure out where to put new node */
+        while (*new) {
+                struct res_common *this = container_of(*new, struct res_common,
+                                                       node);
+
+                parent = *new;
+                if (res->res_id < this->res_id)
+                        new = &((*new)->rb_left);
+                else if (res->res_id > this->res_id)
+                        new = &((*new)->rb_right);
+                else
+                        return -EEXIST;
+        }
+
+        /* Add new node and rebalance tree. */
+        rb_link_node(&res->node, parent, new);
+        rb_insert_color(&res->node, root);
+
+        return 0;
+}
+
 /* For Debug uses */
 static const char *ResourceType(enum mlx4_resource rt)
 {
@@ -201,6 +254,7 @@ static const char *ResourceType(enum mlx4_resource rt)
         case RES_MAC: return  "RES_MAC";
         case RES_EQ: return "RES_EQ";
         case RES_COUNTER: return "RES_COUNTER";
+        case RES_FS_RULE: return "RES_FS_RULE";
         case RES_XRCD: return "RES_XRCD";
         default: return "Unknown resource type !!!";
         };
@@ -228,8 +282,7 @@ int mlx4_init_resource_tracker(struct mlx4_dev *dev)
         mlx4_dbg(dev, "Started init_resource_tracker: %ld slaves\n",
                  dev->num_slaves);
         for (i = 0 ; i < MLX4_NUM_OF_RESOURCE_TYPE; i++)
-                INIT_RADIX_TREE(&priv->mfunc.master.res_tracker.res_tree[i],
-                                GFP_ATOMIC|__GFP_NOWARN);
+                priv->mfunc.master.res_tracker.res_tree[i] = RB_ROOT;
 
         spin_lock_init(&priv->mfunc.master.res_tracker.lock);
         return 0 ;
@@ -277,11 +330,11 @@ static void *find_res(struct mlx4_dev *dev, int res_id,
 {
         struct mlx4_priv *priv = mlx4_priv(dev);
 
-        return radix_tree_lookup(&priv->mfunc.master.res_tracker.res_tree[type],
-                                 res_id);
+        return res_tracker_lookup(&priv->mfunc.master.res_tracker.res_tree[type],
+                                  res_id);
 }
 
-static int get_res(struct mlx4_dev *dev, int slave, int res_id,
+static int get_res(struct mlx4_dev *dev, int slave, u64 res_id,
                    enum mlx4_resource type,
                    void *res)
 {
@@ -307,7 +360,7 @@ static int get_res(struct mlx4_dev *dev, int slave, int res_id,
 
         r->from_state = r->state;
         r->state = RES_ANY_BUSY;
-        mlx4_dbg(dev, "res %s id 0x%x to busy\n",
+        mlx4_dbg(dev, "res %s id 0x%llx to busy\n",
                  ResourceType(type), r->res_id);
 
         if (res)
@@ -320,7 +373,7 @@ exit:
 
 int mlx4_get_slave_from_resource_id(struct mlx4_dev *dev,
                                     enum mlx4_resource type,
-                                    int res_id, int *slave)
+                                    u64 res_id, int *slave)
 {
 
         struct res_common *r;
@@ -341,7 +394,7 @@ int mlx4_get_slave_from_resource_id(struct mlx4_dev *dev,
         return err;
 }
 
-static void put_res(struct mlx4_dev *dev, int slave, int res_id,
+static void put_res(struct mlx4_dev *dev, int slave, u64 res_id,
                     enum mlx4_resource type)
 {
         struct res_common *r;
@@ -473,7 +526,21 @@ static struct res_common *alloc_xrcdn_tr(int id)
         return &ret->com;
 }
 
-static struct res_common *alloc_tr(int id, enum mlx4_resource type, int slave,
+static struct res_common *alloc_fs_rule_tr(u64 id)
+{
+        struct res_fs_rule *ret;
+
+        ret = kzalloc(sizeof *ret, GFP_KERNEL);
+        if (!ret)
+                return NULL;
+
+        ret->com.res_id = id;
+        ret->com.state = RES_FS_RULE_ALLOCATED;
+
+        return &ret->com;
+}
+
+static struct res_common *alloc_tr(u64 id, enum mlx4_resource type, int slave,
                                    int extra)
 {
         struct res_common *ret;
@@ -506,6 +573,9 @@ static struct res_common *alloc_tr(int id, enum mlx4_resource type, int slave,
         case RES_XRCD:
                 ret = alloc_xrcdn_tr(id);
                 break;
+        case RES_FS_RULE:
+                ret = alloc_fs_rule_tr(id);
+                break;
         default:
                 return NULL;
         }
@@ -515,7 +585,7 @@ static struct res_common *alloc_tr(int id, enum mlx4_resource type, int slave,
         return ret;
 }
 
-static int add_res_range(struct mlx4_dev *dev, int slave, int base, int count,
+static int add_res_range(struct mlx4_dev *dev, int slave, u64 base, int count,
                          enum mlx4_resource type, int extra)
 {
         int i;
@@ -523,7 +593,7 @@ static int add_res_range(struct mlx4_dev *dev, int slave, int base, int count,
         struct mlx4_priv *priv = mlx4_priv(dev);
         struct res_common **res_arr;
         struct mlx4_resource_tracker *tracker = &priv->mfunc.master.res_tracker;
-        struct radix_tree_root *root = &tracker->res_tree[type];
+        struct rb_root *root = &tracker->res_tree[type];
 
         res_arr = kzalloc(count * sizeof *res_arr, GFP_KERNEL);
         if (!res_arr)
@@ -546,7 +616,7 @@ static int add_res_range(struct mlx4_dev *dev, int slave, int base, int count,
                         err = -EEXIST;
                         goto undo;
                 }
-                err = radix_tree_insert(root, base + i, res_arr[i]);
+                err = res_tracker_insert(root, res_arr[i]);
                 if (err)
                         goto undo;
                 list_add_tail(&res_arr[i]->list,
@@ -559,7 +629,7 @@ static int add_res_range(struct mlx4_dev *dev, int slave, int base, int count,
 
 undo:
         for (--i; i >= base; --i)
-                radix_tree_delete(&tracker->res_tree[type], i);
+                rb_erase(&res_arr[i]->node, root);
 
         spin_unlock_irq(mlx4_tlock(dev));
 
@@ -638,6 +708,16 @@ static int remove_xrcdn_ok(struct res_xrcdn *res)
         return 0;
 }
 
+static int remove_fs_rule_ok(struct res_fs_rule *res)
+{
+        if (res->com.state == RES_FS_RULE_BUSY)
+                return -EBUSY;
+        else if (res->com.state != RES_FS_RULE_ALLOCATED)
+                return -EPERM;
+
+        return 0;
+}
+
 static int remove_cq_ok(struct res_cq *res)
 {
         if (res->com.state == RES_CQ_BUSY)
@@ -679,15 +759,17 @@ static int remove_ok(struct res_common *res, enum mlx4_resource type, int extra)
                 return remove_counter_ok((struct res_counter *)res);
         case RES_XRCD:
                 return remove_xrcdn_ok((struct res_xrcdn *)res);
+        case RES_FS_RULE:
+                return remove_fs_rule_ok((struct res_fs_rule *)res);
         default:
                 return -EINVAL;
         }
 }
 
-static int rem_res_range(struct mlx4_dev *dev, int slave, int base, int count,
+static int rem_res_range(struct mlx4_dev *dev, int slave, u64 base, int count,
                          enum mlx4_resource type, int extra)
 {
-        int i;
+        u64 i;
         int err;
         struct mlx4_priv *priv = mlx4_priv(dev);
         struct mlx4_resource_tracker *tracker = &priv->mfunc.master.res_tracker;
@@ -695,7 +777,7 @@ static int rem_res_range(struct mlx4_dev *dev, int slave, int base, int count,
 
         spin_lock_irq(mlx4_tlock(dev));
         for (i = base; i < base + count; ++i) {
-                r = radix_tree_lookup(&tracker->res_tree[type], i);
+                r = res_tracker_lookup(&tracker->res_tree[type], i);
                 if (!r) {
                         err = -ENOENT;
                         goto out;
@@ -710,8 +792,8 @@ static int rem_res_range(struct mlx4_dev *dev, int slave, int base, int count,
         }
 
         for (i = base; i < base + count; ++i) {
-                r = radix_tree_lookup(&tracker->res_tree[type], i);
-                radix_tree_delete(&tracker->res_tree[type], i);
+                r = res_tracker_lookup(&tracker->res_tree[type], i);
+                rb_erase(&r->node, &tracker->res_tree[type]);
                 list_del(&r->list);
                 kfree(r);
         }
@@ -733,7 +815,7 @@ static int qp_res_start_move_to(struct mlx4_dev *dev, int slave, int qpn,
         int err = 0;
 
         spin_lock_irq(mlx4_tlock(dev));
-        r = radix_tree_lookup(&tracker->res_tree[RES_QP], qpn);
+        r = res_tracker_lookup(&tracker->res_tree[RES_QP], qpn);
         if (!r)
                 err = -ENOENT;
         else if (r->com.owner != slave)
@@ -741,7 +823,7 @@ static int qp_res_start_move_to(struct mlx4_dev *dev, int slave, int qpn,
         else {
                 switch (state) {
                 case RES_QP_BUSY:
-                        mlx4_dbg(dev, "%s: failed RES_QP, 0x%x\n",
+                        mlx4_dbg(dev, "%s: failed RES_QP, 0x%llx\n",
                                  __func__, r->com.res_id);
                         err = -EBUSY;
                         break;
@@ -750,7 +832,7 @@ static int qp_res_start_move_to(struct mlx4_dev *dev, int slave, int qpn,
                         if (r->com.state == RES_QP_MAPPED && !alloc)
                                 break;
 
-                        mlx4_dbg(dev, "failed RES_QP, 0x%x\n", r->com.res_id);
+                        mlx4_dbg(dev, "failed RES_QP, 0x%llx\n", r->com.res_id);
                         err = -EINVAL;
                         break;
 
@@ -759,7 +841,7 @@ static int qp_res_start_move_to(struct mlx4_dev *dev, int slave, int qpn,
                             r->com.state == RES_QP_HW)
                                 break;
                         else {
-                                mlx4_dbg(dev, "failed RES_QP, 0x%x\n",
+                                mlx4_dbg(dev, "failed RES_QP, 0x%llx\n",
                                           r->com.res_id);
                                 err = -EINVAL;
                         }
@@ -779,7 +861,7 @@ static int qp_res_start_move_to(struct mlx4_dev *dev, int slave, int qpn,
                         r->com.to_state = state;
                         r->com.state = RES_QP_BUSY;
                         if (qp)
-                                *qp = (struct res_qp *)r;
+                                *qp = r;
                 }
         }
 
@@ -797,7 +879,7 @@ static int mr_res_start_move_to(struct mlx4_dev *dev, int slave, int index,
         int err = 0;
 
         spin_lock_irq(mlx4_tlock(dev));
-        r = radix_tree_lookup(&tracker->res_tree[RES_MPT], index);
+        r = res_tracker_lookup(&tracker->res_tree[RES_MPT], index);
         if (!r)
                 err = -ENOENT;
         else if (r->com.owner != slave)
@@ -832,7 +914,7 @@ static int mr_res_start_move_to(struct mlx4_dev *dev, int slave, int index,
                         r->com.to_state = state;
                         r->com.state = RES_MPT_BUSY;
                         if (mpt)
-                                *mpt = (struct res_mpt *)r;
+                                *mpt = r;
                 }
         }
 
@@ -850,7 +932,7 @@ static int eq_res_start_move_to(struct mlx4_dev *dev, int slave, int index,
         int err = 0;
 
         spin_lock_irq(mlx4_tlock(dev));
-        r = radix_tree_lookup(&tracker->res_tree[RES_EQ], index);
+        r = res_tracker_lookup(&tracker->res_tree[RES_EQ], index);
         if (!r)
                 err = -ENOENT;
         else if (r->com.owner != slave)
@@ -898,7 +980,7 @@ static int cq_res_start_move_to(struct mlx4_dev *dev, int slave, int cqn,
         int err;
 
         spin_lock_irq(mlx4_tlock(dev));
-        r = radix_tree_lookup(&tracker->res_tree[RES_CQ], cqn);
+        r = res_tracker_lookup(&tracker->res_tree[RES_CQ], cqn);
         if (!r)
                 err = -ENOENT;
         else if (r->com.owner != slave)
@@ -952,7 +1034,7 @@ static int srq_res_start_move_to(struct mlx4_dev *dev, int slave, int index,
         int err = 0;
 
         spin_lock_irq(mlx4_tlock(dev));
-        r = radix_tree_lookup(&tracker->res_tree[RES_SRQ], index);
+        r = res_tracker_lookup(&tracker->res_tree[RES_SRQ], index);
         if (!r)
                 err = -ENOENT;
         else if (r->com.owner != slave)
@@ -1001,7 +1083,7 @@ static void res_abort_move(struct mlx4_dev *dev, int slave,
         struct res_common *r;
 
         spin_lock_irq(mlx4_tlock(dev));
-        r = radix_tree_lookup(&tracker->res_tree[type], id);
+        r = res_tracker_lookup(&tracker->res_tree[type], id);
         if (r && (r->owner == slave))
                 r->state = r->from_state;
         spin_unlock_irq(mlx4_tlock(dev));
@@ -1015,7 +1097,7 @@ static void res_end_move(struct mlx4_dev *dev, int slave,
         struct res_common *r;
 
         spin_lock_irq(mlx4_tlock(dev));
-        r = radix_tree_lookup(&tracker->res_tree[type], id);
+        r = res_tracker_lookup(&tracker->res_tree[type], id);
         if (r && (r->owner == slave))
                 r->state = r->to_state;
         spin_unlock_irq(mlx4_tlock(dev));
@@ -2695,6 +2777,60 @@ ex_put:
         return err;
 }
 
+int mlx4_QP_FLOW_STEERING_ATTACH_wrapper(struct mlx4_dev *dev, int slave,
+                                         struct mlx4_vhcr *vhcr,
+                                         struct mlx4_cmd_mailbox *inbox,
+                                         struct mlx4_cmd_mailbox *outbox,
+                                         struct mlx4_cmd_info *cmd)
+{
+        int err;
+
+        if (dev->caps.steering_mode !=
+            MLX4_STEERING_MODE_DEVICE_MANAGED)
+                return -EOPNOTSUPP;
+
+        err = mlx4_cmd_imm(dev, inbox->dma, &vhcr->out_param,
+                           vhcr->in_modifier, 0,
+                           MLX4_QP_FLOW_STEERING_ATTACH, MLX4_CMD_TIME_CLASS_A,
+                           MLX4_CMD_NATIVE);
+        if (err)
+                return err;
+
+        err = add_res_range(dev, slave, vhcr->out_param, 1, RES_FS_RULE, 0);
+        if (err) {
+                mlx4_err(dev, "Fail to add flow steering resources.\n ");
+                /* detach rule*/
+                mlx4_cmd(dev, vhcr->out_param, 0, 0,
+                         MLX4_QP_FLOW_STEERING_ATTACH, MLX4_CMD_TIME_CLASS_A,
+                         MLX4_CMD_NATIVE);
+        }
+        return err;
+}
+
+int mlx4_QP_FLOW_STEERING_DETACH_wrapper(struct mlx4_dev *dev, int slave,
+                                         struct mlx4_vhcr *vhcr,
+                                         struct mlx4_cmd_mailbox *inbox,
+                                         struct mlx4_cmd_mailbox *outbox,
+                                         struct mlx4_cmd_info *cmd)
+{
+        int err;
+
+        if (dev->caps.steering_mode !=
+            MLX4_STEERING_MODE_DEVICE_MANAGED)
+                return -EOPNOTSUPP;
+
+        err = rem_res_range(dev, slave, vhcr->in_param, 1, RES_FS_RULE, 0);
+        if (err) {
+                mlx4_err(dev, "Fail to remove flow steering resources.\n ");
+                return err;
+        }
+
+        err = mlx4_cmd(dev, vhcr->in_param, 0, 0,
+                       MLX4_QP_FLOW_STEERING_DETACH, MLX4_CMD_TIME_CLASS_A,
+                       MLX4_CMD_NATIVE);
+        return err;
+}
+
 enum {
         BUSY_MAX_RETRIES = 10
 };
@@ -2751,7 +2887,7 @@ static int _move_all_busy(struct mlx4_dev *dev, int slave,
                                 if (r->state == RES_ANY_BUSY) {
                                         if (print)
                                                 mlx4_dbg(dev,
-                                                         "%s id 0x%x is busy\n",
+                                                         "%s id 0x%llx is busy\n",
                                                           ResourceType(type),
                                                           r->res_id);
                                         ++busy;
@@ -2817,8 +2953,8 @@ static void rem_slave_qps(struct mlx4_dev *dev, int slave)
                                 switch (state) {
                                 case RES_QP_RESERVED:
                                         spin_lock_irq(mlx4_tlock(dev));
-                                        radix_tree_delete(&tracker->res_tree[RES_QP],
-                                                          qp->com.res_id);
+                                        rb_erase(&qp->com.node,
+                                                 &tracker->res_tree[RES_QP]);
                                         list_del(&qp->com.list);
                                         spin_unlock_irq(mlx4_tlock(dev));
                                         kfree(qp);
@@ -2888,8 +3024,8 @@ static void rem_slave_srqs(struct mlx4_dev *dev, int slave)
                                 case RES_SRQ_ALLOCATED:
                                         __mlx4_srq_free_icm(dev, srqn);
                                         spin_lock_irq(mlx4_tlock(dev));
-                                        radix_tree_delete(&tracker->res_tree[RES_SRQ],
-                                                          srqn);
+                                        rb_erase(&srq->com.node,
+                                                 &tracker->res_tree[RES_SRQ]);
                                         list_del(&srq->com.list);
                                         spin_unlock_irq(mlx4_tlock(dev));
                                         kfree(srq);
@@ -2954,8 +3090,8 @@ static void rem_slave_cqs(struct mlx4_dev *dev, int slave)
                                 case RES_CQ_ALLOCATED:
                                         __mlx4_cq_free_icm(dev, cqn);
                                         spin_lock_irq(mlx4_tlock(dev));
-                                        radix_tree_delete(&tracker->res_tree[RES_CQ],
-                                                          cqn);
+                                        rb_erase(&cq->com.node,
+                                                 &tracker->res_tree[RES_CQ]);
                                         list_del(&cq->com.list);
                                         spin_unlock_irq(mlx4_tlock(dev));
                                         kfree(cq);
@@ -3017,8 +3153,8 @@ static void rem_slave_mrs(struct mlx4_dev *dev, int slave)
                                 case RES_MPT_RESERVED:
                                         __mlx4_mr_release(dev, mpt->key);
                                         spin_lock_irq(mlx4_tlock(dev));
-                                        radix_tree_delete(&tracker->res_tree[RES_MPT],
-                                                          mptn);
+                                        rb_erase(&mpt->com.node,
+                                                 &tracker->res_tree[RES_MPT]);
                                         list_del(&mpt->com.list);
                                         spin_unlock_irq(mlx4_tlock(dev));
                                         kfree(mpt);
@@ -3086,8 +3222,8 @@ static void rem_slave_mtts(struct mlx4_dev *dev, int slave)
                                         __mlx4_free_mtt_range(dev, base,
                                                               mtt->order);
                                         spin_lock_irq(mlx4_tlock(dev));
-                                        radix_tree_delete(&tracker->res_tree[RES_MTT],
-                                                          base);
+                                        rb_erase(&mtt->com.node,
+                                                 &tracker->res_tree[RES_MTT]);
                                         list_del(&mtt->com.list);
                                         spin_unlock_irq(mlx4_tlock(dev));
                                         kfree(mtt);
@@ -3104,6 +3240,58 @@ static void rem_slave_mtts(struct mlx4_dev *dev, int slave)
         spin_unlock_irq(mlx4_tlock(dev));
 }
 
+static void rem_slave_fs_rule(struct mlx4_dev *dev, int slave)
+{
+        struct mlx4_priv *priv = mlx4_priv(dev);
+        struct mlx4_resource_tracker *tracker =
+                &priv->mfunc.master.res_tracker;
+        struct list_head *fs_rule_list =
+                &tracker->slave_list[slave].res_list[RES_FS_RULE];
+        struct res_fs_rule *fs_rule;
+        struct res_fs_rule *tmp;
+        int state;
+        u64 base;
+        int err;
+
+        err = move_all_busy(dev, slave, RES_FS_RULE);
+        if (err)
+                mlx4_warn(dev, "rem_slave_fs_rule: Could not move all mtts to busy for slave %d\n",
+                          slave);
+
+        spin_lock_irq(mlx4_tlock(dev));
+        list_for_each_entry_safe(fs_rule, tmp, fs_rule_list, com.list) {
+                spin_unlock_irq(mlx4_tlock(dev));
+                if (fs_rule->com.owner == slave) {
+                        base = fs_rule->com.res_id;
+                        state = fs_rule->com.from_state;
+                        while (state != 0) {
+                                switch (state) {
+                                case RES_FS_RULE_ALLOCATED:
+                                        /* detach rule */
+                                        err = mlx4_cmd(dev, base, 0, 0,
+                                                       MLX4_QP_FLOW_STEERING_DETACH,
+                                                       MLX4_CMD_TIME_CLASS_A,
+                                                       MLX4_CMD_NATIVE);
+
+                                        spin_lock_irq(mlx4_tlock(dev));
+                                        rb_erase(&fs_rule->com.node,
+                                                 &tracker->res_tree[RES_FS_RULE]);
+                                        list_del(&fs_rule->com.list);
+                                        spin_unlock_irq(mlx4_tlock(dev));
+                                        kfree(fs_rule);
+                                        state = 0;
+                                        break;
+
+                                default:
+                                        state = 0;
+                                }
+                        }
+                }
+                spin_lock_irq(mlx4_tlock(dev));
+        }
+        spin_unlock_irq(mlx4_tlock(dev));
+}
+
 static void rem_slave_eqs(struct mlx4_dev *dev, int slave)
 {
         struct mlx4_priv *priv = mlx4_priv(dev);
@@ -3133,8 +3321,8 @@ static void rem_slave_eqs(struct mlx4_dev *dev, int slave)
                                 switch (state) {
                                 case RES_EQ_RESERVED:
                                         spin_lock_irq(mlx4_tlock(dev));
-                                        radix_tree_delete(&tracker->res_tree[RES_EQ],
-                                                          eqn);
+                                        rb_erase(&eq->com.node,
+                                                 &tracker->res_tree[RES_EQ]);
                                         list_del(&eq->com.list);
                                         spin_unlock_irq(mlx4_tlock(dev));
                                         kfree(eq);
@@ -3191,7 +3379,8 @@ static void rem_slave_counters(struct mlx4_dev *dev, int slave)
         list_for_each_entry_safe(counter, tmp, counter_list, com.list) {
                 if (counter->com.owner == slave) {
                         index = counter->com.res_id;
-                        radix_tree_delete(&tracker->res_tree[RES_COUNTER], index);
+                        rb_erase(&counter->com.node,
+                                 &tracker->res_tree[RES_COUNTER]);
                         list_del(&counter->com.list);
                         kfree(counter);
                         __mlx4_counter_free(dev, index);
@@ -3220,7 +3409,7 @@ static void rem_slave_xrcdns(struct mlx4_dev *dev, int slave)
         list_for_each_entry_safe(xrcd, tmp, xrcdn_list, com.list) {
                 if (xrcd->com.owner == slave) {
                         xrcdn = xrcd->com.res_id;
-                        radix_tree_delete(&tracker->res_tree[RES_XRCD], xrcdn);
+                        rb_erase(&xrcd->com.node, &tracker->res_tree[RES_XRCD]);
                         list_del(&xrcd->com.list);
                         kfree(xrcd);
                         __mlx4_xrcd_free(dev, xrcdn);
@@ -3244,5 +3433,6 @@ void mlx4_delete_all_resources_for_slave(struct mlx4_dev *dev, int slave)
         rem_slave_mtts(dev, slave);
         rem_slave_counters(dev, slave);
         rem_slave_xrcdns(dev, slave);
+        rem_slave_fs_rule(dev, slave);
         mutex_unlock(&priv->mfunc.master.res_tracker.slave_list[slave].mutex);
 }
diff --git a/drivers/net/ethernet/micrel/ks8851_mll.c b/drivers/net/ethernet/micrel/ks8851_mll.c
index 5ffde23ac8f..59ef568d5dd 100644
--- a/drivers/net/ethernet/micrel/ks8851_mll.c
+++ b/drivers/net/ethernet/micrel/ks8851_mll.c
@@ -16,8 +16,7 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-/**
- * Supports:
+/* Supports:
  * KS8851 16bit MLL chip from Micrel Inc.
  */
 
@@ -35,7 +34,7 @@
 #include <linux/platform_device.h>
 #include <linux/delay.h>
 #include <linux/slab.h>
-#include <asm/io.h>
+#include <linux/ks8851_mll.h>
 
 #define DRV_NAME        "ks8851_mll"
 
@@ -465,8 +464,7 @@ static int msg_enable;
 #define BE1             0x2000      /* Byte Enable 1 */
 #define BE0             0x1000      /* Byte Enable 0 */
 
-/**
- * register read/write calls.
+/* register read/write calls.
  *
  * All these calls issue transactions to access the chip's registers. They
  * all require that the necessary lock is held to prevent accesses when the
@@ -1103,7 +1101,7 @@ static void ks_set_grpaddr(struct ks_net *ks)
         }
 }  /* ks_set_grpaddr */
 
-/*
+/**
 * ks_clear_mcast - clear multicast information
 *
 * @ks : The chip information
@@ -1515,6 +1513,7 @@ static int __devinit ks8851_probe(struct platform_device *pdev)
         struct net_device *netdev;
         struct ks_net *ks;
         u16 id, data;
+        struct ks8851_mll_platform_data *pdata;
 
         io_d = platform_get_resource(pdev, IORESOURCE_MEM, 0);
         io_c = platform_get_resource(pdev, IORESOURCE_MEM, 1);
@@ -1596,17 +1595,27 @@ static int __devinit ks8851_probe(struct platform_device *pdev)
         ks_disable_qmu(ks);
         ks_setup(ks);
         ks_setup_int(ks);
-        memcpy(netdev->dev_addr, ks->mac_addr, 6);
 
         data = ks_rdreg16(ks, KS_OBCR);
         ks_wrreg16(ks, KS_OBCR, data | OBCR_ODS_16MA);
 
-        /**
-         * If you want to use the default MAC addr,
-         * comment out the 2 functions below.
-         */
+        /* overwriting the default MAC address */
+        pdata = pdev->dev.platform_data;
+        if (!pdata) {
+                netdev_err(netdev, "No platform data\n");
+                err = -ENODEV;
+                goto err_pdata;
+        }
+        memcpy(ks->mac_addr, pdata->mac_addr, 6);
+        if (!is_valid_ether_addr(ks->mac_addr)) {
+                /* Use random MAC address if none passed */
+                random_ether_addr(ks->mac_addr);
+                netdev_info(netdev, "Using random mac address\n");
+        }
+        netdev_info(netdev, "Mac address is: %pM\n", ks->mac_addr);
+
+        memcpy(netdev->dev_addr, ks->mac_addr, 6);
 
-        random_ether_addr(netdev->dev_addr);
         ks_set_mac(ks, netdev->dev_addr);
 
         id = ks_rdreg16(ks, KS_CIDER);
@@ -1615,6 +1624,8 @@ static int __devinit ks8851_probe(struct platform_device *pdev)
                     (id >> 8) & 0xff, (id >> 4) & 0xf, (id >> 1) & 0x7);
         return 0;
 
+err_pdata:
+        unregister_netdev(netdev);
 err_register:
 err_get_irq:
         iounmap(ks->hw_addr_cmd);
diff --git a/drivers/net/ethernet/micrel/ksz884x.c b/drivers/net/ethernet/micrel/ksz884x.c
index eaf9ff0262a..37b44b91950 100644
--- a/drivers/net/ethernet/micrel/ksz884x.c
+++ b/drivers/net/ethernet/micrel/ksz884x.c
@@ -3913,7 +3913,7 @@ static void hw_start_rx(struct ksz_hw *hw)
                 hw->rx_stop = 2;
 }
 
-/*
+/**
  * hw_stop_rx - stop receiving
  * @hw:         The hardware instance.
  *
@@ -4480,14 +4480,12 @@ static void ksz_init_rx_buffers(struct dev_info *adapter)
                 dma_buf->len = adapter->mtu;
                 if (!dma_buf->skb)
                         dma_buf->skb = alloc_skb(dma_buf->len, GFP_ATOMIC);
-                if (dma_buf->skb && !dma_buf->dma) {
-                        dma_buf->skb->dev = adapter->dev;
+                if (dma_buf->skb && !dma_buf->dma)
                         dma_buf->dma = pci_map_single(
                                 adapter->pdev,
                                 skb_tail_pointer(dma_buf->skb),
                                 dma_buf->len,
                                 PCI_DMA_FROMDEVICE);
-                }
 
                 /* Set descriptor. */
                 set_rx_buf(desc, dma_buf->dma);
diff --git a/drivers/net/ethernet/myricom/myri10ge/myri10ge.c b/drivers/net/ethernet/myricom/myri10ge/myri10ge.c
index 90153fc983c..fa85cf1353f 100644
--- a/drivers/net/ethernet/myricom/myri10ge/myri10ge.c
+++ b/drivers/net/ethernet/myricom/myri10ge/myri10ge.c
@@ -3775,7 +3775,7 @@ static void myri10ge_probe_slices(struct myri10ge_priv *mgp)
 
         mgp->num_slices = 1;
         msix_cap = pci_find_capability(pdev, PCI_CAP_ID_MSIX);
-        ncpus = num_online_cpus();
+        ncpus = netif_get_num_default_rss_queues();
 
         if (myri10ge_max_slices == 1 || msix_cap == 0 ||
             (myri10ge_max_slices == -1 && ncpus < 2))
diff --git a/drivers/net/ethernet/neterion/s2io.c b/drivers/net/ethernet/neterion/s2io.c
index bb367582c1e..d958c229937 100644
--- a/drivers/net/ethernet/neterion/s2io.c
+++ b/drivers/net/ethernet/neterion/s2io.c
@@ -3377,7 +3377,7 @@ static int wait_for_cmd_complete(void __iomem *addr, u64 busy_bit,
         } while (cnt < 20);
         return ret;
 }
-/*
+/**
  * check_pci_device_id - Checks if the device id is supported
  * @id : device id
  * Description: Function to check if the pci device id is supported by driver.
@@ -5238,7 +5238,7 @@ static u64 do_s2io_read_unicast_mc(struct s2io_nic *sp, int offset)
 }
 
 /**
- * s2io_set_mac_addr driver entry point
+ * s2io_set_mac_addr - driver entry point
  */
 
 static int s2io_set_mac_addr(struct net_device *dev, void *p)
@@ -6088,7 +6088,7 @@ static int s2io_bist_test(struct s2io_nic *sp, uint64_t *data)
 }
 
 /**
- * s2io-link_test - verifies the link state of the nic
+ * s2io_link_test - verifies the link state of the nic
  * @sp ; private member of the device structure, which is a pointer to the
  * s2io_nic structure.
  * @data: variable that returns the result of each of the test conducted by
@@ -6116,9 +6116,9 @@ static int s2io_link_test(struct s2io_nic *sp, uint64_t *data)
 
 /**
  * s2io_rldram_test - offline test for access to the RldRam chip on the NIC
- * @sp - private member of the device structure, which is a pointer to the
+ * @sp: private member of the device structure, which is a pointer to the
  * s2io_nic structure.
- * @data - variable that returns the result of each of the test
+ * @data: variable that returns the result of each of the test
  * conducted by the driver.
  * Description:
  *  This is one of the offline test that tests the read and write
@@ -6946,9 +6946,9 @@ static  int rxd_owner_bit_reset(struct s2io_nic *sp)
                                 if (sp->rxd_mode == RXD_MODE_3B)
                                         ba = &ring->ba[j][k];
                                 if (set_rxd_buffer_pointer(sp, rxdp, ba, &skb,
-                                                           (u64 *)&temp0_64,
-                                                           (u64 *)&temp1_64,
-                                                           (u64 *)&temp2_64,
+                                                           &temp0_64,
+                                                           &temp1_64,
+                                                           &temp2_64,
                                                            size) == -ENOMEM) {
                                         return 0;
                                 }
@@ -7149,7 +7149,7 @@ static int s2io_card_up(struct s2io_nic *sp)
         int i, ret = 0;
         struct config_param *config;
         struct mac_info *mac_control;
-        struct net_device *dev = (struct net_device *)sp->dev;
+        struct net_device *dev = sp->dev;
         u16 interruptible;
 
         /* Initialize the H/W I/O registers */
@@ -7325,7 +7325,7 @@ static void s2io_tx_watchdog(struct net_device *dev)
 static int rx_osm_handler(struct ring_info *ring_data, struct RxD_t * rxdp)
 {
         struct s2io_nic *sp = ring_data->nic;
-        struct net_device *dev = (struct net_device *)ring_data->dev;
+        struct net_device *dev = ring_data->dev;
         struct sk_buff *skb = (struct sk_buff *)
                 ((unsigned long)rxdp->Host_Control);
         int ring_no = ring_data->ring_no;
@@ -7508,7 +7508,7 @@ aggregate:
 
 static void s2io_link(struct s2io_nic *sp, int link)
 {
-        struct net_device *dev = (struct net_device *)sp->dev;
+        struct net_device *dev = sp->dev;
         struct swStat *swstats = &sp->mac_control.stats_info->sw_stat;
 
         if (link != sp->last_link_state) {
@@ -8280,7 +8280,7 @@ static int check_L2_lro_capable(u8 *buffer, struct iphdr **ip,
                 return -1;
         }
 
-        *ip = (struct iphdr *)((u8 *)buffer + ip_off);
+        *ip = (struct iphdr *)(buffer + ip_off);
         ip_len = (u8)((*ip)->ihl);
         ip_len <<= 2;
         *tcp = (struct tcphdr *)((unsigned long)*ip + ip_len);
diff --git a/drivers/net/ethernet/neterion/vxge/vxge-config.c b/drivers/net/ethernet/neterion/vxge/vxge-config.c
index 98e2c10ae08..32d06824fe3 100644
--- a/drivers/net/ethernet/neterion/vxge/vxge-config.c
+++ b/drivers/net/ethernet/neterion/vxge/vxge-config.c
@@ -2346,7 +2346,7 @@ void __vxge_hw_blockpool_blocks_add(struct __vxge_hw_blockpool *blockpool)
 
         for (i = 0; i < nreq; i++)
                 vxge_os_dma_malloc_async(
-                        ((struct __vxge_hw_device *)blockpool->hldev)->pdev,
+                        (blockpool->hldev)->pdev,
                         blockpool->hldev, VXGE_HW_BLOCK_SIZE);
 }
 
@@ -2428,13 +2428,13 @@ __vxge_hw_blockpool_blocks_remove(struct __vxge_hw_blockpool *blockpool)
                         break;
 
                 pci_unmap_single(
-                        ((struct __vxge_hw_device *)blockpool->hldev)->pdev,
+                        (blockpool->hldev)->pdev,
                         ((struct __vxge_hw_blockpool_entry *)p)->dma_addr,
                         ((struct __vxge_hw_blockpool_entry *)p)->length,
                         PCI_DMA_BIDIRECTIONAL);
 
                 vxge_os_dma_free(
-                        ((struct __vxge_hw_device *)blockpool->hldev)->pdev,
+                        (blockpool->hldev)->pdev,
                         ((struct __vxge_hw_blockpool_entry *)p)->memblock,
                         &((struct __vxge_hw_blockpool_entry *)p)->acc_handle);
 
@@ -4059,7 +4059,7 @@ __vxge_hw_vpath_sw_reset(struct __vxge_hw_device *hldev, u32 vp_id)
         enum vxge_hw_status status = VXGE_HW_OK;
         struct __vxge_hw_virtualpath *vpath;
 
-        vpath = (struct __vxge_hw_virtualpath *)&hldev->virtual_paths[vp_id];
+        vpath = &hldev->virtual_paths[vp_id];
 
         if (vpath->ringh) {
                 status = __vxge_hw_ring_reset(vpath->ringh);
diff --git a/drivers/net/ethernet/neterion/vxge/vxge-config.h b/drivers/net/ethernet/neterion/vxge/vxge-config.h
index 5046a64f0fe..9e0c1eed5dc 100644
--- a/drivers/net/ethernet/neterion/vxge/vxge-config.h
+++ b/drivers/net/ethernet/neterion/vxge/vxge-config.h
@@ -1922,7 +1922,7 @@ realloc:
                 /* misaligned, free current one and try allocating
                  * size + VXGE_CACHE_LINE_SIZE memory
                  */
-                kfree((void *) vaddr);
+                kfree(vaddr);
                 size += VXGE_CACHE_LINE_SIZE;
                 realloc_flag = 1;
                 goto realloc;
diff --git a/drivers/net/ethernet/neterion/vxge/vxge-main.c b/drivers/net/ethernet/neterion/vxge/vxge-main.c
index 51387c31914..4e20c5f0271 100644
--- a/drivers/net/ethernet/neterion/vxge/vxge-main.c
+++ b/drivers/net/ethernet/neterion/vxge/vxge-main.c
@@ -1134,7 +1134,7 @@ static void vxge_set_multicast(struct net_device *dev)
                 "%s:%d", __func__, __LINE__);
 
         vdev = netdev_priv(dev);
-        hldev = (struct __vxge_hw_device  *)vdev->devh;
+        hldev = vdev->devh;
 
         if (unlikely(!is_vxge_card_up(vdev)))
                 return;
@@ -3687,7 +3687,8 @@ static int __devinit vxge_config_vpaths(
                         return 0;
 
                 if (!driver_config->g_no_cpus)
-                        driver_config->g_no_cpus = num_online_cpus();
+                        driver_config->g_no_cpus =
+                                netif_get_num_default_rss_queues();
 
                 driver_config->vpath_per_dev = driver_config->g_no_cpus >> 1;
                 if (!driver_config->vpath_per_dev)
@@ -3989,16 +3990,16 @@ static void __devinit vxge_print_parm(struct vxgedev *vdev, u64 vpath_mask)
                         continue;
                 vxge_debug_ll_config(VXGE_TRACE,
                         "%s: MTU size - %d", vdev->ndev->name,
-                        ((struct __vxge_hw_device  *)(vdev->devh))->
+                        ((vdev->devh))->
                                 config.vp_config[i].mtu);
                 vxge_debug_init(VXGE_TRACE,
                         "%s: VLAN tag stripping %s", vdev->ndev->name,
-                        ((struct __vxge_hw_device  *)(vdev->devh))->
+                        ((vdev->devh))->
                                 config.vp_config[i].rpa_strip_vlan_tag
                         ? "Enabled" : "Disabled");
                 vxge_debug_ll_config(VXGE_TRACE,
                         "%s: Max frags : %d", vdev->ndev->name,
-                        ((struct __vxge_hw_device  *)(vdev->devh))->
+                        ((vdev->devh))->
                                 config.vp_config[i].fifo.max_frags);
                 break;
         }
@@ -4260,9 +4261,7 @@ static int vxge_probe_fw_update(struct vxgedev *vdev)
         if (VXGE_FW_VER(VXGE_CERT_FW_VER_MAJOR, VXGE_CERT_FW_VER_MINOR, 0) >
             VXGE_FW_VER(maj, min, 0)) {
                 vxge_debug_init(VXGE_ERR, "%s: Firmware %d.%d.%d is too old to"
-                                " be used with this driver.\n"
-                                "Please get the latest version from "
-                                "ftp://ftp.s2io.com/pub/X3100-Drivers/FIRMWARE",
+                                " be used with this driver.",
                                 VXGE_DRIVER_NAME, maj, min, bld);
                 return -EINVAL;
         }
diff --git a/drivers/net/ethernet/neterion/vxge/vxge-main.h b/drivers/net/ethernet/neterion/vxge/vxge-main.h
index 35f3e7552ec..36ca40f8f24 100644
--- a/drivers/net/ethernet/neterion/vxge/vxge-main.h
+++ b/drivers/net/ethernet/neterion/vxge/vxge-main.h
@@ -430,8 +430,7 @@ void vxge_initialize_ethtool_ops(struct net_device *ndev);
 enum vxge_hw_status vxge_reset_all_vpaths(struct vxgedev *vdev);
 int vxge_fw_upgrade(struct vxgedev *vdev, char *fw_name, int override);
 
-/**
- * #define VXGE_DEBUG_INIT: debug for initialization functions
+/* #define VXGE_DEBUG_INIT: debug for initialization functions
  * #define VXGE_DEBUG_TX         : debug transmit related functions
  * #define VXGE_DEBUG_RX  : debug recevice related functions
  * #define VXGE_DEBUG_MEM : debug memory module
diff --git a/drivers/net/ethernet/neterion/vxge/vxge-traffic.c b/drivers/net/ethernet/neterion/vxge/vxge-traffic.c
index 5954fa264da..99749bd07d7 100644
--- a/drivers/net/ethernet/neterion/vxge/vxge-traffic.c
+++ b/drivers/net/ethernet/neterion/vxge/vxge-traffic.c
@@ -533,8 +533,7 @@ __vxge_hw_device_handle_error(struct __vxge_hw_device *hldev, u32 vp_id,
 
         /* notify driver */
         if (hldev->uld_callbacks->crit_err)
-                hldev->uld_callbacks->crit_err(
-                        (struct __vxge_hw_device *)hldev,
+                hldev->uld_callbacks->crit_err(hldev,
                         type, vp_id);
 out:
 
@@ -1322,7 +1321,7 @@ enum vxge_hw_status vxge_hw_ring_rxd_next_completed(
         /* check whether it is not the end */
         if (!own || *t_code == VXGE_HW_RING_T_CODE_FRM_DROP) {
 
-                vxge_assert(((struct vxge_hw_ring_rxd_1 *)rxdp)->host_control !=
+                vxge_assert((rxdp)->host_control !=
                                 0);
 
                 ++ring->cmpl_cnt;
diff --git a/drivers/net/ethernet/nvidia/forcedeth.c b/drivers/net/ethernet/nvidia/forcedeth.c
index 928913c4f3f..8b7c5129c7e 100644
--- a/drivers/net/ethernet/nvidia/forcedeth.c
+++ b/drivers/net/ethernet/nvidia/forcedeth.c
@@ -3218,7 +3218,7 @@ static void nv_force_linkspeed(struct net_device *dev, int speed, int duplex)
 }
 
 /**
- * nv_update_linkspeed: Setup the MAC according to the link partner
+ * nv_update_linkspeed - Setup the MAC according to the link partner
  * @dev: Network device to be configured
  *
  * The function queries the PHY and checks if there is a link partner.
@@ -3552,8 +3552,7 @@ static irqreturn_t nv_nic_irq(int foo, void *data)
         return IRQ_HANDLED;
 }
 
-/**
- * All _optimized functions are used to help increase performance
+/* All _optimized functions are used to help increase performance
  * (reduce CPU and increase throughput). They use descripter version 3,
  * compiler directives, and reduce memory accesses.
  */
diff --git a/drivers/net/ethernet/nxp/lpc_eth.c b/drivers/net/ethernet/nxp/lpc_eth.c
index 083d6715335..e7d2496a473 100644
--- a/drivers/net/ethernet/nxp/lpc_eth.c
+++ b/drivers/net/ethernet/nxp/lpc_eth.c
@@ -52,7 +52,6 @@
 
 #define MODNAME "lpc-eth"
 #define DRV_VERSION "1.00"
-#define PHYDEF_ADDR 0x00
 
 #define ENET_MAXF_SIZE 1536
 #define ENET_RX_DESC 48
@@ -416,9 +415,6 @@ static bool use_iram_for_net(struct device *dev)
 #define TXDESC_CONTROL_LAST             (1 << 30)
 #define TXDESC_CONTROL_INT              (1 << 31)
 
-static int lpc_eth_hard_start_xmit(struct sk_buff *skb,
-                                   struct net_device *ndev);
-
 /*
  * Structure of a TX/RX descriptors and RX status
  */
@@ -440,7 +436,7 @@ struct netdata_local {
         spinlock_t              lock;
         void __iomem            *net_base;
         u32                     msg_enable;
-        struct sk_buff          *skb[ENET_TX_DESC];
+        unsigned int            skblen[ENET_TX_DESC];
         unsigned int            last_tx_idx;
         unsigned int            num_used_tx_buffs;
         struct mii_bus          *mii_bus;
@@ -903,12 +899,11 @@ err_out:
 static void __lpc_handle_xmit(struct net_device *ndev)
 {
         struct netdata_local *pldat = netdev_priv(ndev);
-        struct sk_buff *skb;
         u32 txcidx, *ptxstat, txstat;
 
         txcidx = readl(LPC_ENET_TXCONSUMEINDEX(pldat->net_base));
         while (pldat->last_tx_idx != txcidx) {
-                skb = pldat->skb[pldat->last_tx_idx];
+                unsigned int skblen = pldat->skblen[pldat->last_tx_idx];
 
                 /* A buffer is available, get buffer status */
                 ptxstat = &pldat->tx_stat_v[pldat->last_tx_idx];
@@ -945,9 +940,8 @@ static void __lpc_handle_xmit(struct net_device *ndev)
                 } else {
                         /* Update stats */
                         ndev->stats.tx_packets++;
-                        ndev->stats.tx_bytes += skb->len;
+                        ndev->stats.tx_bytes += skblen;
                 }
-                dev_kfree_skb_irq(skb);
 
                 txcidx = readl(LPC_ENET_TXCONSUMEINDEX(pldat->net_base));
         }
@@ -1132,7 +1126,7 @@ static int lpc_eth_hard_start_xmit(struct sk_buff *skb, struct net_device *ndev)
         memcpy(pldat->tx_buff_v + txidx * ENET_MAXF_SIZE, skb->data, len);
 
         /* Save the buffer and increment the buffer counter */
-        pldat->skb[txidx] = skb;
+        pldat->skblen[txidx] = len;
         pldat->num_used_tx_buffs++;
 
         /* Start transmit */
@@ -1147,6 +1141,7 @@ static int lpc_eth_hard_start_xmit(struct sk_buff *skb, struct net_device *ndev)
 
         spin_unlock_irq(&pldat->lock);
 
+        dev_kfree_skb(skb);
         return NETDEV_TX_OK;
 }
 
@@ -1442,7 +1437,7 @@ static int lpc_eth_drv_probe(struct platform_device *pdev)
                         res->start);
         netdev_dbg(ndev, "IO address size      :%d\n",
                         res->end - res->start + 1);
-        netdev_err(ndev, "IO address (mapped)  :0x%p\n",
+        netdev_dbg(ndev, "IO address (mapped)  :0x%p\n",
                         pldat->net_base);
         netdev_dbg(ndev, "IRQ number           :%d\n", ndev->irq);
         netdev_dbg(ndev, "DMA buffer size      :%d\n", pldat->dma_buff_size);
diff --git a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_api.c b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_api.c
index e48f084ad22..5ae03e815ee 100644
--- a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_api.c
+++ b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_api.c
@@ -60,7 +60,7 @@ static void pch_gbe_plat_get_bus_info(struct pch_gbe_hw *hw)
 /**
  * pch_gbe_plat_init_hw - Initialize hardware
  * @hw: Pointer to the HW structure
- * Returns
+ * Returns:
  *      0:              Successfully
  *      Negative value: Failed-EBUSY
  */
@@ -108,7 +108,7 @@ static void pch_gbe_plat_init_function_pointers(struct pch_gbe_hw *hw)
 /**
  * pch_gbe_hal_setup_init_funcs - Initializes function pointers
  * @hw: Pointer to the HW structure
- * Returns
+ * Returns:
  *      0:      Successfully
  *      ENOSYS: Function is not registered
  */
@@ -137,7 +137,7 @@ inline void pch_gbe_hal_get_bus_info(struct pch_gbe_hw *hw)
 /**
  * pch_gbe_hal_init_hw - Initialize hardware
  * @hw: Pointer to the HW structure
- * Returns
+ * Returns:
  *      0:      Successfully
  *      ENOSYS: Function is not registered
  */
@@ -155,7 +155,7 @@ inline s32 pch_gbe_hal_init_hw(struct pch_gbe_hw *hw)
  * @hw:     Pointer to the HW structure
  * @offset: The register to read
  * @data:   The buffer to store the 16-bit read.
- * Returns
+ * Returns:
  *      0:      Successfully
  *      Negative value: Failed
  */
@@ -172,7 +172,7 @@ inline s32 pch_gbe_hal_read_phy_reg(struct pch_gbe_hw *hw, u32 offset,
  * @hw:     Pointer to the HW structure
  * @offset: The register to read
  * @data:   The value to write.
- * Returns
+ * Returns:
  *      0:      Successfully
  *      Negative value: Failed
  */
@@ -211,7 +211,7 @@ inline void pch_gbe_hal_phy_sw_reset(struct pch_gbe_hw *hw)
 /**
  * pch_gbe_hal_read_mac_addr - Reads MAC address
  * @hw: Pointer to the HW structure
- * Returns
+ * Returns:
  *      0:      Successfully
  *      ENOSYS: Function is not registered
  */
diff --git a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_ethtool.c b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_ethtool.c
index ac4e72d529e..9dbf38c10a6 100644
--- a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_ethtool.c
+++ b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_ethtool.c
@@ -77,7 +77,7 @@ static const struct pch_gbe_stats pch_gbe_gstrings_stats[] = {
  * pch_gbe_get_settings - Get device-specific settings
  * @netdev: Network interface device structure
  * @ecmd:   Ethtool command
- * Returns
+ * Returns:
  *      0:                      Successful.
  *      Negative value:         Failed.
  */
@@ -100,7 +100,7 @@ static int pch_gbe_get_settings(struct net_device *netdev,
  * pch_gbe_set_settings - Set device-specific settings
  * @netdev: Network interface device structure
  * @ecmd:   Ethtool command
- * Returns
+ * Returns:
  *      0:                      Successful.
  *      Negative value:         Failed.
  */
@@ -220,7 +220,7 @@ static void pch_gbe_get_wol(struct net_device *netdev,
  * pch_gbe_set_wol - Turn Wake-on-Lan on or off
  * @netdev: Network interface device structure
  * @wol:    Pointer of wake-on-Lan information straucture
- * Returns
+ * Returns:
  *      0:                      Successful.
  *      Negative value:         Failed.
  */
@@ -248,7 +248,7 @@ static int pch_gbe_set_wol(struct net_device *netdev,
 /**
  * pch_gbe_nway_reset - Restart autonegotiation
  * @netdev: Network interface device structure
- * Returns
+ * Returns:
  *      0:                      Successful.
  *      Negative value:         Failed.
  */
@@ -398,7 +398,7 @@ static void pch_gbe_get_pauseparam(struct net_device *netdev,
  * pch_gbe_set_pauseparam - Set pause paramters
  * @netdev:  Network interface device structure
  * @pause:   Pause parameters structure
- * Returns
+ * Returns:
  *      0:                      Successful.
  *      Negative value:         Failed.
  */
diff --git a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c
index 3787c64ee71..b1006563f73 100644
--- a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c
+++ b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c
@@ -301,7 +301,7 @@ inline void pch_gbe_mac_load_mac_addr(struct pch_gbe_hw *hw)
 /**
  * pch_gbe_mac_read_mac_addr - Read MAC address
  * @hw:             Pointer to the HW structure
- * Returns
+ * Returns:
  *      0:                      Successful.
  */
 s32 pch_gbe_mac_read_mac_addr(struct pch_gbe_hw *hw)
@@ -483,7 +483,7 @@ static void pch_gbe_mac_mc_addr_list_update(struct pch_gbe_hw *hw,
 /**
  * pch_gbe_mac_force_mac_fc - Force the MAC's flow control settings
  * @hw:             Pointer to the HW structure
- * Returns
+ * Returns:
  *      0:                      Successful.
  *      Negative value:         Failed.
  */
@@ -639,7 +639,7 @@ static void pch_gbe_mac_set_pause_packet(struct pch_gbe_hw *hw)
 /**
  * pch_gbe_alloc_queues - Allocate memory for all rings
  * @adapter:  Board private structure to initialize
- * Returns
+ * Returns:
  *      0:      Successfully
  *      Negative value: Failed
  */
@@ -670,7 +670,7 @@ static void pch_gbe_init_stats(struct pch_gbe_adapter *adapter)
 /**
  * pch_gbe_init_phy - Initialize PHY
  * @adapter:  Board private structure to initialize
- * Returns
+ * Returns:
  *      0:      Successfully
  *      Negative value: Failed
  */
@@ -720,7 +720,7 @@ static int pch_gbe_init_phy(struct pch_gbe_adapter *adapter)
  * @netdev: Network interface device structure
  * @addr:   Phy ID
  * @reg:    Access location
- * Returns
+ * Returns:
  *      0:      Successfully
  *      Negative value: Failed
  */
@@ -1364,7 +1364,7 @@ static void pch_gbe_start_receive(struct pch_gbe_hw *hw)
  * pch_gbe_intr - Interrupt Handler
  * @irq:   Interrupt number
  * @data:  Pointer to a network interface device structure
- * Returns
+ * Returns:
  *      - IRQ_HANDLED:  Our interrupt
  *      - IRQ_NONE:     Not our interrupt
  */
@@ -1566,7 +1566,7 @@ static void pch_gbe_alloc_tx_buffers(struct pch_gbe_adapter *adapter,
  * pch_gbe_clean_tx - Reclaim resources after transmit completes
  * @adapter:   Board private structure
  * @tx_ring:   Tx descriptor ring
- * Returns
+ * Returns:
  *      true:  Cleaned the descriptor
  *      false: Not cleaned the descriptor
  */
@@ -1660,7 +1660,7 @@ pch_gbe_clean_tx(struct pch_gbe_adapter *adapter,
  * @rx_ring:     Rx descriptor ring
  * @work_done:   Completed count
  * @work_to_do:  Request count
- * Returns
+ * Returns:
  *      true:  Cleaned the descriptor
  *      false: Not cleaned the descriptor
  */
@@ -1775,7 +1775,7 @@ pch_gbe_clean_rx(struct pch_gbe_adapter *adapter,
  * pch_gbe_setup_tx_resources - Allocate Tx resources (Descriptors)
  * @adapter:  Board private structure
  * @tx_ring:  Tx descriptor ring (for a specific queue) to setup
- * Returns
+ * Returns:
  *      0:              Successfully
  *      Negative value: Failed
  */
@@ -1822,7 +1822,7 @@ int pch_gbe_setup_tx_resources(struct pch_gbe_adapter *adapter,
  * pch_gbe_setup_rx_resources - Allocate Rx resources (Descriptors)
  * @adapter:  Board private structure
  * @rx_ring:  Rx descriptor ring (for a specific queue) to setup
- * Returns
+ * Returns:
  *      0:              Successfully
  *      Negative value: Failed
  */
@@ -1899,7 +1899,7 @@ void pch_gbe_free_rx_resources(struct pch_gbe_adapter *adapter,
 /**
  * pch_gbe_request_irq - Allocate an interrupt line
  * @adapter:  Board private structure
- * Returns
+ * Returns:
  *      0:              Successfully
  *      Negative value: Failed
  */
@@ -1932,7 +1932,7 @@ static int pch_gbe_request_irq(struct pch_gbe_adapter *adapter)
 /**
  * pch_gbe_up - Up GbE network device
  * @adapter:  Board private structure
- * Returns
+ * Returns:
  *      0:              Successfully
  *      Negative value: Failed
  */
@@ -2018,7 +2018,7 @@ void pch_gbe_down(struct pch_gbe_adapter *adapter)
 /**
  * pch_gbe_sw_init - Initialize general software structures (struct pch_gbe_adapter)
  * @adapter:  Board private structure to initialize
- * Returns
+ * Returns:
  *      0:              Successfully
  *      Negative value: Failed
  */
@@ -2057,7 +2057,7 @@ static int pch_gbe_sw_init(struct pch_gbe_adapter *adapter)
 /**
  * pch_gbe_open - Called when a network interface is made active
  * @netdev:     Network interface device structure
- * Returns
+ * Returns:
  *      0:              Successfully
  *      Negative value: Failed
  */
@@ -2097,7 +2097,7 @@ err_setup_tx:
 /**
  * pch_gbe_stop - Disables a network interface
  * @netdev:  Network interface device structure
- * Returns
+ * Returns:
  *      0: Successfully
  */
 static int pch_gbe_stop(struct net_device *netdev)
@@ -2117,7 +2117,7 @@ static int pch_gbe_stop(struct net_device *netdev)
  * pch_gbe_xmit_frame - Packet transmitting start
  * @skb:     Socket buffer structure
  * @netdev:  Network interface device structure
- * Returns
+ * Returns:
  *      - NETDEV_TX_OK:   Normal end
  *      - NETDEV_TX_BUSY: Error end
  */
@@ -2225,7 +2225,7 @@ static void pch_gbe_set_multi(struct net_device *netdev)
  * pch_gbe_set_mac - Change the Ethernet Address of the NIC
  * @netdev: Network interface device structure
  * @addr:   Pointer to an address structure
- * Returns
+ * Returns:
  *      0:              Successfully
  *      -EADDRNOTAVAIL: Failed
  */
@@ -2256,7 +2256,7 @@ static int pch_gbe_set_mac(struct net_device *netdev, void *addr)
  * pch_gbe_change_mtu - Change the Maximum Transfer Unit
  * @netdev:   Network interface device structure
  * @new_mtu:  New value for maximum frame size
- * Returns
+ * Returns:
  *      0:              Successfully
  *      -EINVAL:        Failed
  */
@@ -2309,7 +2309,7 @@ static int pch_gbe_change_mtu(struct net_device *netdev, int new_mtu)
  * pch_gbe_set_features - Reset device after features changed
  * @netdev:   Network interface device structure
  * @features:  New features
- * Returns
+ * Returns:
  *      0:              HW state updated successfully
  */
 static int pch_gbe_set_features(struct net_device *netdev,
@@ -2334,7 +2334,7 @@ static int pch_gbe_set_features(struct net_device *netdev,
  * @netdev:   Network interface device structure
  * @ifr:      Pointer to ifr structure
  * @cmd:      Control command
- * Returns
+ * Returns:
  *      0:      Successfully
  *      Negative value: Failed
  */
@@ -2369,7 +2369,7 @@ static void pch_gbe_tx_timeout(struct net_device *netdev)
  * pch_gbe_napi_poll - NAPI receive and transfer polling callback
  * @napi:    Pointer of polling device struct
  * @budget:  The maximum number of a packet
- * Returns
+ * Returns:
  *      false:  Exit the polling mode
  *      true:   Continue the polling mode
  */
diff --git a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_param.c b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_param.c
index 29e23bec809..8653c3b81f8 100644
--- a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_param.c
+++ b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_param.c
@@ -139,7 +139,7 @@ MODULE_PARM_DESC(XsumTX, "Disable or enable Transmit Checksum offload");
 /**
  * pch_gbe_option - Force the MAC's flow control settings
  * @hw:             Pointer to the HW structure
- * Returns
+ * Returns:
  *      0:                      Successful.
  *      Negative value:         Failed.
  */
@@ -220,7 +220,7 @@ static const struct pch_gbe_opt_list fc_list[] = {
  * @value:    value
  * @opt:      option
  * @adapter:  Board private structure
- * Returns
+ * Returns:
  *      0:                      Successful.
  *      Negative value:         Failed.
  */
diff --git a/drivers/net/ethernet/qlogic/netxen/netxen_nic.h b/drivers/net/ethernet/qlogic/netxen/netxen_nic.h
index 37ccbe54e62..eb3dfdbb642 100644
--- a/drivers/net/ethernet/qlogic/netxen/netxen_nic.h
+++ b/drivers/net/ethernet/qlogic/netxen/netxen_nic.h
@@ -53,8 +53,8 @@
 
 #define _NETXEN_NIC_LINUX_MAJOR 4
 #define _NETXEN_NIC_LINUX_MINOR 0
-#define _NETXEN_NIC_LINUX_SUBVERSION 79
-#define NETXEN_NIC_LINUX_VERSIONID  "4.0.79"
+#define _NETXEN_NIC_LINUX_SUBVERSION 80
+#define NETXEN_NIC_LINUX_VERSIONID  "4.0.80"
 
 #define NETXEN_VERSION_CODE(a, b, c)    (((a) << 24) + ((b) << 16) + (c))
 #define _major(v)       (((v) >> 24) & 0xff)
diff --git a/drivers/net/ethernet/qlogic/netxen/netxen_nic_ethtool.c b/drivers/net/ethernet/qlogic/netxen/netxen_nic_ethtool.c
index 39730403782..10468e7932d 100644
--- a/drivers/net/ethernet/qlogic/netxen/netxen_nic_ethtool.c
+++ b/drivers/net/ethernet/qlogic/netxen/netxen_nic_ethtool.c
@@ -489,7 +489,7 @@ netxen_nic_get_pauseparam(struct net_device *dev,
         int port = adapter->physical_port;
 
         if (adapter->ahw.port_type == NETXEN_NIC_GBE) {
-                if ((port < 0) || (port > NETXEN_NIU_MAX_GBE_PORTS))
+                if ((port < 0) || (port >= NETXEN_NIU_MAX_GBE_PORTS))
                         return;
                 /* get flow control settings */
                 val = NXRD32(adapter, NETXEN_NIU_GB_MAC_CONFIG_0(port));
@@ -511,7 +511,7 @@ netxen_nic_get_pauseparam(struct net_device *dev,
                                 break;
                 }
         } else if (adapter->ahw.port_type == NETXEN_NIC_XGBE) {
-                if ((port < 0) || (port > NETXEN_NIU_MAX_XG_PORTS))
+                if ((port < 0) || (port >= NETXEN_NIU_MAX_XG_PORTS))
                         return;
                 pause->rx_pause = 1;
                 val = NXRD32(adapter, NETXEN_NIU_XG_PAUSE_CTL);
@@ -534,7 +534,7 @@ netxen_nic_set_pauseparam(struct net_device *dev,
         int port = adapter->physical_port;
         /* read mode */
         if (adapter->ahw.port_type == NETXEN_NIC_GBE) {
-                if ((port < 0) || (port > NETXEN_NIU_MAX_GBE_PORTS))
+                if ((port < 0) || (port >= NETXEN_NIU_MAX_GBE_PORTS))
                         return -EIO;
                 /* set flow control */
                 val = NXRD32(adapter, NETXEN_NIU_GB_MAC_CONFIG_0(port));
@@ -577,7 +577,7 @@ netxen_nic_set_pauseparam(struct net_device *dev,
                 }
                 NXWR32(adapter, NETXEN_NIU_GB_PAUSE_CTL, val);
         } else if (adapter->ahw.port_type == NETXEN_NIC_XGBE) {
-                if ((port < 0) || (port > NETXEN_NIU_MAX_XG_PORTS))
+                if ((port < 0) || (port >= NETXEN_NIU_MAX_XG_PORTS))
                         return -EIO;
                 val = NXRD32(adapter, NETXEN_NIU_XG_PAUSE_CTL);
                 if (port == 0) {
@@ -826,7 +826,12 @@ netxen_get_dump_flag(struct net_device *netdev, struct ethtool_dump *dump)
                 dump->len = mdump->md_dump_size;
         else
                 dump->len = 0;
-        dump->flag = mdump->md_capture_mask;
+
+        if (!mdump->md_enabled)
+                dump->flag = ETH_FW_DUMP_DISABLE;
+        else
+                dump->flag = mdump->md_capture_mask;
+
         dump->version = adapter->fw_version;
         return 0;
 }
@@ -840,8 +845,10 @@ netxen_set_dump(struct net_device *netdev, struct ethtool_dump *val)
 
         switch (val->flag) {
         case NX_FORCE_FW_DUMP_KEY:
-                if (!mdump->md_enabled)
-                        mdump->md_enabled = 1;
+                if (!mdump->md_enabled) {
+                        netdev_info(netdev, "FW dump not enabled\n");
+                        return 0;
+                }
                 if (adapter->fw_mdump_rdy) {
                         netdev_info(netdev, "Previous dump not cleared, not forcing dump\n");
                         return 0;
diff --git a/drivers/net/ethernet/qlogic/netxen/netxen_nic_hw.c b/drivers/net/ethernet/qlogic/netxen/netxen_nic_hw.c
index de96a948bb7..946160fa584 100644
--- a/drivers/net/ethernet/qlogic/netxen/netxen_nic_hw.c
+++ b/drivers/net/ethernet/qlogic/netxen/netxen_nic_hw.c
@@ -365,7 +365,7 @@ static int netxen_niu_disable_xg_port(struct netxen_adapter *adapter)
         if (NX_IS_REVISION_P3(adapter->ahw.revision_id))
                 return 0;
 
-        if (port > NETXEN_NIU_MAX_XG_PORTS)
+        if (port >= NETXEN_NIU_MAX_XG_PORTS)
                 return -EINVAL;
 
         mac_cfg = 0;
@@ -392,7 +392,7 @@ static int netxen_p2_nic_set_promisc(struct netxen_adapter *adapter, u32 mode)
         u32 port = adapter->physical_port;
         u16 board_type = adapter->ahw.board_type;
 
-        if (port > NETXEN_NIU_MAX_XG_PORTS)
+        if (port >= NETXEN_NIU_MAX_XG_PORTS)
                 return -EINVAL;
 
         mac_cfg = NXRD32(adapter, NETXEN_NIU_XGE_CONFIG_0 + (0x10000 * port));
diff --git a/drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c b/drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c
index 8694124ef77..b2c1b676477 100644
--- a/drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c
+++ b/drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c
@@ -1532,8 +1532,6 @@ static struct sk_buff *netxen_process_rxbuf(struct netxen_adapter *adapter,
         } else
                 skb->ip_summed = CHECKSUM_NONE;
 
-        skb->dev = adapter->netdev;
-
         buffer->skb = NULL;
 no_skb:
         buffer->state = NETXEN_BUFFER_FREE;
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic.h b/drivers/net/ethernet/qlogic/qlcnic/qlcnic.h
index 8680a5dae4a..eaa1db9fec3 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic.h
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic.h
@@ -36,8 +36,8 @@
 
 #define _QLCNIC_LINUX_MAJOR 5
 #define _QLCNIC_LINUX_MINOR 0
-#define _QLCNIC_LINUX_SUBVERSION 28
-#define QLCNIC_LINUX_VERSIONID  "5.0.28"
+#define _QLCNIC_LINUX_SUBVERSION 29
+#define QLCNIC_LINUX_VERSIONID  "5.0.29"
 #define QLCNIC_DRV_IDC_VER  0x01
 #define QLCNIC_DRIVER_VERSION  ((_QLCNIC_LINUX_MAJOR << 16) |\
                  (_QLCNIC_LINUX_MINOR << 8) | (_QLCNIC_LINUX_SUBVERSION))
@@ -258,6 +258,8 @@ struct rcv_desc {
         (((sts_data) >> 52) & 0x1)
 #define qlcnic_get_lro_sts_seq_number(sts_data)         \
         ((sts_data) & 0x0FFFFFFFF)
+#define qlcnic_get_lro_sts_mss(sts_data1)               \
+        ((sts_data1 >> 32) & 0x0FFFF)
 
 
 struct status_desc {
@@ -610,7 +612,11 @@ struct qlcnic_recv_context {
 #define QLCNIC_CDRP_CMD_GET_MAC_STATS           0x00000037
 
 #define QLCNIC_RCODE_SUCCESS            0
+#define QLCNIC_RCODE_INVALID_ARGS       6
 #define QLCNIC_RCODE_NOT_SUPPORTED      9
+#define QLCNIC_RCODE_NOT_PERMITTED      10
+#define QLCNIC_RCODE_NOT_IMPL           15
+#define QLCNIC_RCODE_INVALID            16
 #define QLCNIC_RCODE_TIMEOUT            17
 #define QLCNIC_DESTROY_CTX_RESET        0
 
@@ -623,6 +629,7 @@ struct qlcnic_recv_context {
 #define QLCNIC_CAP0_JUMBO_CONTIGUOUS    (1 << 7)
 #define QLCNIC_CAP0_LRO_CONTIGUOUS      (1 << 8)
 #define QLCNIC_CAP0_VALIDOFF            (1 << 11)
+#define QLCNIC_CAP0_LRO_MSS             (1 << 21)
 
 /*
  * Context state
@@ -829,6 +836,9 @@ struct qlcnic_mac_list_s {
 #define QLCNIC_FW_CAPABILITY_FVLANTX            BIT_9
 #define QLCNIC_FW_CAPABILITY_HW_LRO             BIT_10
 #define QLCNIC_FW_CAPABILITY_MULTI_LOOPBACK     BIT_27
+#define QLCNIC_FW_CAPABILITY_MORE_CAPS          BIT_31
+
+#define QLCNIC_FW_CAPABILITY_2_LRO_MAX_TCP_SEG  BIT_2
 
 /* module types */
 #define LINKEVENT_MODULE_NOT_PRESENT                    1
@@ -918,6 +928,7 @@ struct qlcnic_ipaddr {
 #define QLCNIC_NEED_FLR                 0x1000
 #define QLCNIC_FW_RESET_OWNER           0x2000
 #define QLCNIC_FW_HANG                  0x4000
+#define QLCNIC_FW_LRO_MSS_CAP           0x8000
 #define QLCNIC_IS_MSI_FAMILY(adapter) \
         ((adapter)->flags & (QLCNIC_MSI_ENABLED | QLCNIC_MSIX_ENABLED))
 
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c
index 8db85244e8a..b8ead696141 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c
@@ -53,12 +53,39 @@ qlcnic_issue_cmd(struct qlcnic_adapter *adapter, struct qlcnic_cmd_args *cmd)
         rsp = qlcnic_poll_rsp(adapter);
 
         if (rsp == QLCNIC_CDRP_RSP_TIMEOUT) {
-                dev_err(&pdev->dev, "card response timeout.\n");
+                dev_err(&pdev->dev, "CDRP response timeout.\n");
                 cmd->rsp.cmd = QLCNIC_RCODE_TIMEOUT;
         } else if (rsp == QLCNIC_CDRP_RSP_FAIL) {
                 cmd->rsp.cmd = QLCRD32(adapter, QLCNIC_ARG1_CRB_OFFSET);
-                dev_err(&pdev->dev, "failed card response code:0x%x\n",
+                switch (cmd->rsp.cmd) {
+                case QLCNIC_RCODE_INVALID_ARGS:
+                        dev_err(&pdev->dev, "CDRP invalid args: 0x%x.\n",
                                 cmd->rsp.cmd);
+                        break;
+                case QLCNIC_RCODE_NOT_SUPPORTED:
+                case QLCNIC_RCODE_NOT_IMPL:
+                        dev_err(&pdev->dev,
+                                "CDRP command not supported: 0x%x.\n",
+                                cmd->rsp.cmd);
+                        break;
+                case QLCNIC_RCODE_NOT_PERMITTED:
+                        dev_err(&pdev->dev,
+                                "CDRP requested action not permitted: 0x%x.\n",
+                                cmd->rsp.cmd);
+                        break;
+                case QLCNIC_RCODE_INVALID:
+                        dev_err(&pdev->dev,
+                                "CDRP invalid or unknown cmd received: 0x%x.\n",
+                                cmd->rsp.cmd);
+                        break;
+                case QLCNIC_RCODE_TIMEOUT:
+                        dev_err(&pdev->dev, "CDRP command timeout: 0x%x.\n",
+                                cmd->rsp.cmd);
+                        break;
+                default:
+                        dev_err(&pdev->dev, "CDRP command failed: 0x%x.\n",
+                                cmd->rsp.cmd);
+                }
         } else if (rsp == QLCNIC_CDRP_RSP_OK) {
                 cmd->rsp.cmd = QLCNIC_RCODE_SUCCESS;
                 if (cmd->rsp.arg2)
@@ -237,6 +264,9 @@ qlcnic_fw_cmd_create_rx_ctx(struct qlcnic_adapter *adapter)
                                                 | QLCNIC_CAP0_VALIDOFF);
         cap |= (QLCNIC_CAP0_JUMBO_CONTIGUOUS | QLCNIC_CAP0_LRO_CONTIGUOUS);
 
+        if (adapter->flags & QLCNIC_FW_LRO_MSS_CAP)
+                cap |= QLCNIC_CAP0_LRO_MSS;
+
         prq->valid_field_offset = offsetof(struct qlcnic_hostrq_rx_ctx,
                                                          msix_handler);
         prq->txrx_sds_binding = nsds_rings - 1;
@@ -954,9 +984,6 @@ int qlcnic_get_mac_stats(struct qlcnic_adapter *adapter,
                 mac_stats->mac_rx_jabber = le64_to_cpu(stats->mac_rx_jabber);
                 mac_stats->mac_rx_dropped = le64_to_cpu(stats->mac_rx_dropped);
                 mac_stats->mac_rx_crc_error = le64_to_cpu(stats->mac_rx_crc_error);
-        } else {
-                dev_info(&adapter->pdev->dev,
-                        "%s: Get mac stats failed =%d.\n", __func__, err);
         }
 
         dma_free_coherent(&adapter->pdev->dev, stats_size, stats_addr,
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_hdr.h b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_hdr.h
index 6ced3195aad..28a6b28192e 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_hdr.h
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_hdr.h
@@ -588,6 +588,7 @@ enum {
 #define CRB_DRIVER_VERSION              (QLCNIC_REG(0x2a0))
 
 #define CRB_FW_CAPABILITIES_1           (QLCNIC_CAM_RAM(0x128))
+#define CRB_FW_CAPABILITIES_2           (QLCNIC_CAM_RAM(0x12c))
 #define CRB_MAC_BLOCK_START             (QLCNIC_CAM_RAM(0x1c0))
 
 /*
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c
index 799fd40ed03..0bcda9c51e9 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c
@@ -1488,8 +1488,6 @@ static struct sk_buff *qlcnic_process_rxbuf(struct qlcnic_adapter *adapter,
                 skb_checksum_none_assert(skb);
         }
 
-        skb->dev = adapter->netdev;
-
         buffer->skb = NULL;
 
         return skb;
@@ -1653,6 +1651,9 @@ qlcnic_process_lro(struct qlcnic_adapter *adapter,
 
         length = skb->len;
 
+        if (adapter->flags & QLCNIC_FW_LRO_MSS_CAP)
+                skb_shinfo(skb)->gso_size = qlcnic_get_lro_sts_mss(sts_data1);
+
         if (vid != 0xffff)
                 __vlan_hwaccel_put_tag(skb, vid);
         netif_receive_skb(skb);
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
index ad98f4d7919..212c1219327 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
@@ -1136,6 +1136,8 @@ static int
 __qlcnic_up(struct qlcnic_adapter *adapter, struct net_device *netdev)
 {
         int ring;
+        u32 capab2;
+
         struct qlcnic_host_rds_ring *rds_ring;
 
         if (adapter->is_up != QLCNIC_ADAPTER_UP_MAGIC)
@@ -1146,6 +1148,12 @@ __qlcnic_up(struct qlcnic_adapter *adapter, struct net_device *netdev)
         if (qlcnic_set_eswitch_port_config(adapter))
                 return -EIO;
 
+        if (adapter->capabilities & QLCNIC_FW_CAPABILITY_MORE_CAPS) {
+                capab2 = QLCRD32(adapter, CRB_FW_CAPABILITIES_2);
+                if (capab2 & QLCNIC_FW_CAPABILITY_2_LRO_MAX_TCP_SEG)
+                        adapter->flags |= QLCNIC_FW_LRO_MSS_CAP;
+        }
+
         if (qlcnic_fw_create_ctx(adapter))
                 return -EIO;
 
@@ -1215,6 +1223,7 @@ __qlcnic_down(struct qlcnic_adapter *adapter, struct net_device *netdev)
         qlcnic_napi_disable(adapter);
 
         qlcnic_fw_destroy_ctx(adapter);
+        adapter->flags &= ~QLCNIC_FW_LRO_MSS_CAP;
 
         qlcnic_reset_rx_buffers_list(adapter);
         qlcnic_release_tx_buffers(adapter);
@@ -2024,6 +2033,7 @@ qlcnic_tx_pkt(struct qlcnic_adapter *adapter,
                 vh = (struct vlan_ethhdr *)skb->data;
                 flags = FLAGS_VLAN_TAGGED;
                 vlan_tci = vh->h_vlan_TCI;
+                protocol = ntohs(vh->h_vlan_encapsulated_proto);
         } else if (vlan_tx_tag_present(skb)) {
                 flags = FLAGS_VLAN_OOB;
                 vlan_tci = vlan_tx_tag_get(skb);
diff --git a/drivers/net/ethernet/qlogic/qlge/qlge.h b/drivers/net/ethernet/qlogic/qlge/qlge.h
index 5a639df33f1..a131d7b5d2f 100644
--- a/drivers/net/ethernet/qlogic/qlge/qlge.h
+++ b/drivers/net/ethernet/qlogic/qlge/qlge.h
@@ -18,13 +18,15 @@
  */
 #define DRV_NAME        "qlge"
 #define DRV_STRING      "QLogic 10 Gigabit PCI-E Ethernet Driver "
-#define DRV_VERSION     "v1.00.00.30.00.00-01"
+#define DRV_VERSION     "v1.00.00.31"
 
 #define WQ_ADDR_ALIGN   0x3     /* 4 byte alignment */
 
 #define QLGE_VENDOR_ID    0x1077
 #define QLGE_DEVICE_ID_8012     0x8012
 #define QLGE_DEVICE_ID_8000     0x8000
+#define QLGE_MEZZ_SSYS_ID_068   0x0068
+#define QLGE_MEZZ_SSYS_ID_180   0x0180
 #define MAX_CPUS 8
 #define MAX_TX_RINGS MAX_CPUS
 #define MAX_RX_RINGS ((MAX_CPUS * 2) + 1)
@@ -1397,7 +1399,6 @@ struct tx_ring {
         struct tx_ring_desc *q; /* descriptor list for the queue */
         spinlock_t lock;
         atomic_t tx_count;      /* counts down for every outstanding IO */
-        atomic_t queue_stopped; /* Turns queue off when full. */
         struct delayed_work tx_work;
         struct ql_adapter *qdev;
         u64 tx_packets;
@@ -1535,6 +1536,14 @@ struct nic_stats {
         u64 rx_1024_to_1518_pkts;
         u64 rx_1519_to_max_pkts;
         u64 rx_len_err_pkts;
+        /* Receive Mac Err stats */
+        u64 rx_code_err;
+        u64 rx_oversize_err;
+        u64 rx_undersize_err;
+        u64 rx_preamble_err;
+        u64 rx_frame_len_err;
+        u64 rx_crc_err;
+        u64 rx_err_count;
         /*
          * These stats come from offset 500h to 5C8h
          * in the XGMAC register.
diff --git a/drivers/net/ethernet/qlogic/qlge/qlge_ethtool.c b/drivers/net/ethernet/qlogic/qlge/qlge_ethtool.c
index 8e2c2a74f3a..3d4462bd9de 100644
--- a/drivers/net/ethernet/qlogic/qlge/qlge_ethtool.c
+++ b/drivers/net/ethernet/qlogic/qlge/qlge_ethtool.c
@@ -35,10 +35,152 @@
 
 #include "qlge.h"
 
+struct ql_stats {
+        char stat_string[ETH_GSTRING_LEN];
+        int sizeof_stat;
+        int stat_offset;
+};
+
+#define QL_SIZEOF(m) FIELD_SIZEOF(struct ql_adapter, m)
+#define QL_OFF(m) offsetof(struct ql_adapter, m)
+
+static const struct ql_stats ql_gstrings_stats[] = {
+        {"tx_pkts", QL_SIZEOF(nic_stats.tx_pkts), QL_OFF(nic_stats.tx_pkts)},
+        {"tx_bytes", QL_SIZEOF(nic_stats.tx_bytes), QL_OFF(nic_stats.tx_bytes)},
+        {"tx_mcast_pkts", QL_SIZEOF(nic_stats.tx_mcast_pkts),
+                                        QL_OFF(nic_stats.tx_mcast_pkts)},
+        {"tx_bcast_pkts", QL_SIZEOF(nic_stats.tx_bcast_pkts),
+                                        QL_OFF(nic_stats.tx_bcast_pkts)},
+        {"tx_ucast_pkts", QL_SIZEOF(nic_stats.tx_ucast_pkts),
+                                        QL_OFF(nic_stats.tx_ucast_pkts)},
+        {"tx_ctl_pkts", QL_SIZEOF(nic_stats.tx_ctl_pkts),
+                                        QL_OFF(nic_stats.tx_ctl_pkts)},
+        {"tx_pause_pkts", QL_SIZEOF(nic_stats.tx_pause_pkts),
+                                        QL_OFF(nic_stats.tx_pause_pkts)},
+        {"tx_64_pkts", QL_SIZEOF(nic_stats.tx_64_pkt),
+                                        QL_OFF(nic_stats.tx_64_pkt)},
+        {"tx_65_to_127_pkts", QL_SIZEOF(nic_stats.tx_65_to_127_pkt),
+                                        QL_OFF(nic_stats.tx_65_to_127_pkt)},
+        {"tx_128_to_255_pkts", QL_SIZEOF(nic_stats.tx_128_to_255_pkt),
+                                        QL_OFF(nic_stats.tx_128_to_255_pkt)},
+        {"tx_256_511_pkts", QL_SIZEOF(nic_stats.tx_256_511_pkt),
+                                        QL_OFF(nic_stats.tx_256_511_pkt)},
+        {"tx_512_to_1023_pkts", QL_SIZEOF(nic_stats.tx_512_to_1023_pkt),
+                                        QL_OFF(nic_stats.tx_512_to_1023_pkt)},
+        {"tx_1024_to_1518_pkts", QL_SIZEOF(nic_stats.tx_1024_to_1518_pkt),
+                                        QL_OFF(nic_stats.tx_1024_to_1518_pkt)},
+        {"tx_1519_to_max_pkts", QL_SIZEOF(nic_stats.tx_1519_to_max_pkt),
+                                        QL_OFF(nic_stats.tx_1519_to_max_pkt)},
+        {"tx_undersize_pkts", QL_SIZEOF(nic_stats.tx_undersize_pkt),
+                                        QL_OFF(nic_stats.tx_undersize_pkt)},
+        {"tx_oversize_pkts", QL_SIZEOF(nic_stats.tx_oversize_pkt),
+                                        QL_OFF(nic_stats.tx_oversize_pkt)},
+        {"rx_bytes", QL_SIZEOF(nic_stats.rx_bytes), QL_OFF(nic_stats.rx_bytes)},
+        {"rx_bytes_ok", QL_SIZEOF(nic_stats.rx_bytes_ok),
+                                        QL_OFF(nic_stats.rx_bytes_ok)},
+        {"rx_pkts", QL_SIZEOF(nic_stats.rx_pkts), QL_OFF(nic_stats.rx_pkts)},
+        {"rx_pkts_ok", QL_SIZEOF(nic_stats.rx_pkts_ok),
+                                        QL_OFF(nic_stats.rx_pkts_ok)},
+        {"rx_bcast_pkts", QL_SIZEOF(nic_stats.rx_bcast_pkts),
+                                        QL_OFF(nic_stats.rx_bcast_pkts)},
+        {"rx_mcast_pkts", QL_SIZEOF(nic_stats.rx_mcast_pkts),
+                                        QL_OFF(nic_stats.rx_mcast_pkts)},
+        {"rx_ucast_pkts", QL_SIZEOF(nic_stats.rx_ucast_pkts),
+                                        QL_OFF(nic_stats.rx_ucast_pkts)},
+        {"rx_undersize_pkts", QL_SIZEOF(nic_stats.rx_undersize_pkts),
+                                        QL_OFF(nic_stats.rx_undersize_pkts)},
+        {"rx_oversize_pkts", QL_SIZEOF(nic_stats.rx_oversize_pkts),
+                                        QL_OFF(nic_stats.rx_oversize_pkts)},
+        {"rx_jabber_pkts", QL_SIZEOF(nic_stats.rx_jabber_pkts),
+                                        QL_OFF(nic_stats.rx_jabber_pkts)},
+        {"rx_undersize_fcerr_pkts",
+                QL_SIZEOF(nic_stats.rx_undersize_fcerr_pkts),
+                                QL_OFF(nic_stats.rx_undersize_fcerr_pkts)},
+        {"rx_drop_events", QL_SIZEOF(nic_stats.rx_drop_events),
+                                        QL_OFF(nic_stats.rx_drop_events)},
+        {"rx_fcerr_pkts", QL_SIZEOF(nic_stats.rx_fcerr_pkts),
+                                        QL_OFF(nic_stats.rx_fcerr_pkts)},
+        {"rx_align_err", QL_SIZEOF(nic_stats.rx_align_err),
+                                        QL_OFF(nic_stats.rx_align_err)},
+        {"rx_symbol_err", QL_SIZEOF(nic_stats.rx_symbol_err),
+                                        QL_OFF(nic_stats.rx_symbol_err)},
+        {"rx_mac_err", QL_SIZEOF(nic_stats.rx_mac_err),
+                                        QL_OFF(nic_stats.rx_mac_err)},
+        {"rx_ctl_pkts", QL_SIZEOF(nic_stats.rx_ctl_pkts),
+                                        QL_OFF(nic_stats.rx_ctl_pkts)},
+        {"rx_pause_pkts", QL_SIZEOF(nic_stats.rx_pause_pkts),
+                                        QL_OFF(nic_stats.rx_pause_pkts)},
+        {"rx_64_pkts", QL_SIZEOF(nic_stats.rx_64_pkts),
+                                        QL_OFF(nic_stats.rx_64_pkts)},
+        {"rx_65_to_127_pkts", QL_SIZEOF(nic_stats.rx_65_to_127_pkts),
+                                        QL_OFF(nic_stats.rx_65_to_127_pkts)},
+        {"rx_128_255_pkts", QL_SIZEOF(nic_stats.rx_128_255_pkts),
+                                        QL_OFF(nic_stats.rx_128_255_pkts)},
+        {"rx_256_511_pkts", QL_SIZEOF(nic_stats.rx_256_511_pkts),
+                                        QL_OFF(nic_stats.rx_256_511_pkts)},
+        {"rx_512_to_1023_pkts", QL_SIZEOF(nic_stats.rx_512_to_1023_pkts),
+                                        QL_OFF(nic_stats.rx_512_to_1023_pkts)},
+        {"rx_1024_to_1518_pkts", QL_SIZEOF(nic_stats.rx_1024_to_1518_pkts),
+                                        QL_OFF(nic_stats.rx_1024_to_1518_pkts)},
+        {"rx_1519_to_max_pkts", QL_SIZEOF(nic_stats.rx_1519_to_max_pkts),
+                                        QL_OFF(nic_stats.rx_1519_to_max_pkts)},
+        {"rx_len_err_pkts", QL_SIZEOF(nic_stats.rx_len_err_pkts),
+                                        QL_OFF(nic_stats.rx_len_err_pkts)},
+        {"rx_code_err", QL_SIZEOF(nic_stats.rx_code_err),
+                                        QL_OFF(nic_stats.rx_code_err)},
+        {"rx_oversize_err", QL_SIZEOF(nic_stats.rx_oversize_err),
+                                        QL_OFF(nic_stats.rx_oversize_err)},
+        {"rx_undersize_err", QL_SIZEOF(nic_stats.rx_undersize_err),
+                                        QL_OFF(nic_stats.rx_undersize_err)},
+        {"rx_preamble_err", QL_SIZEOF(nic_stats.rx_preamble_err),
+                                        QL_OFF(nic_stats.rx_preamble_err)},
+        {"rx_frame_len_err", QL_SIZEOF(nic_stats.rx_frame_len_err),
+                                        QL_OFF(nic_stats.rx_frame_len_err)},
+        {"rx_crc_err", QL_SIZEOF(nic_stats.rx_crc_err),
+                                        QL_OFF(nic_stats.rx_crc_err)},
+        {"rx_err_count", QL_SIZEOF(nic_stats.rx_err_count),
+                                        QL_OFF(nic_stats.rx_err_count)},
+        {"tx_cbfc_pause_frames0", QL_SIZEOF(nic_stats.tx_cbfc_pause_frames0),
+                                QL_OFF(nic_stats.tx_cbfc_pause_frames0)},
+        {"tx_cbfc_pause_frames1", QL_SIZEOF(nic_stats.tx_cbfc_pause_frames1),
+                                QL_OFF(nic_stats.tx_cbfc_pause_frames1)},
+        {"tx_cbfc_pause_frames2", QL_SIZEOF(nic_stats.tx_cbfc_pause_frames2),
+                                QL_OFF(nic_stats.tx_cbfc_pause_frames2)},
+        {"tx_cbfc_pause_frames3", QL_SIZEOF(nic_stats.tx_cbfc_pause_frames3),
+                                QL_OFF(nic_stats.tx_cbfc_pause_frames3)},
+        {"tx_cbfc_pause_frames4", QL_SIZEOF(nic_stats.tx_cbfc_pause_frames4),
+                                QL_OFF(nic_stats.tx_cbfc_pause_frames4)},
+        {"tx_cbfc_pause_frames5", QL_SIZEOF(nic_stats.tx_cbfc_pause_frames5),
+                                QL_OFF(nic_stats.tx_cbfc_pause_frames5)},
+        {"tx_cbfc_pause_frames6", QL_SIZEOF(nic_stats.tx_cbfc_pause_frames6),
+                                QL_OFF(nic_stats.tx_cbfc_pause_frames6)},
+        {"tx_cbfc_pause_frames7", QL_SIZEOF(nic_stats.tx_cbfc_pause_frames7),
+                                QL_OFF(nic_stats.tx_cbfc_pause_frames7)},
+        {"rx_cbfc_pause_frames0", QL_SIZEOF(nic_stats.rx_cbfc_pause_frames0),
+                                QL_OFF(nic_stats.rx_cbfc_pause_frames0)},
+        {"rx_cbfc_pause_frames1", QL_SIZEOF(nic_stats.rx_cbfc_pause_frames1),
+                                QL_OFF(nic_stats.rx_cbfc_pause_frames1)},
+        {"rx_cbfc_pause_frames2", QL_SIZEOF(nic_stats.rx_cbfc_pause_frames2),
+                                QL_OFF(nic_stats.rx_cbfc_pause_frames2)},
+        {"rx_cbfc_pause_frames3", QL_SIZEOF(nic_stats.rx_cbfc_pause_frames3),
+                                QL_OFF(nic_stats.rx_cbfc_pause_frames3)},
+        {"rx_cbfc_pause_frames4", QL_SIZEOF(nic_stats.rx_cbfc_pause_frames4),
+                                QL_OFF(nic_stats.rx_cbfc_pause_frames4)},
+        {"rx_cbfc_pause_frames5", QL_SIZEOF(nic_stats.rx_cbfc_pause_frames5),
+                                QL_OFF(nic_stats.rx_cbfc_pause_frames5)},
+        {"rx_cbfc_pause_frames6", QL_SIZEOF(nic_stats.rx_cbfc_pause_frames6),
+                                QL_OFF(nic_stats.rx_cbfc_pause_frames6)},
+        {"rx_cbfc_pause_frames7", QL_SIZEOF(nic_stats.rx_cbfc_pause_frames7),
+                                QL_OFF(nic_stats.rx_cbfc_pause_frames7)},
+        {"rx_nic_fifo_drop", QL_SIZEOF(nic_stats.rx_nic_fifo_drop),
+                                        QL_OFF(nic_stats.rx_nic_fifo_drop)},
+};
+
 static const char ql_gstrings_test[][ETH_GSTRING_LEN] = {
         "Loopback test  (offline)"
 };
 #define QLGE_TEST_LEN (sizeof(ql_gstrings_test) / ETH_GSTRING_LEN)
+#define QLGE_STATS_LEN ARRAY_SIZE(ql_gstrings_stats)
 
 static int ql_update_ring_coalescing(struct ql_adapter *qdev)
 {
@@ -183,73 +325,19 @@ quit:
         QL_DUMP_STAT(qdev);
 }
 
-static char ql_stats_str_arr[][ETH_GSTRING_LEN] = {
-        {"tx_pkts"},
-        {"tx_bytes"},
-        {"tx_mcast_pkts"},
-        {"tx_bcast_pkts"},
-        {"tx_ucast_pkts"},
-        {"tx_ctl_pkts"},
-        {"tx_pause_pkts"},
-        {"tx_64_pkts"},
-        {"tx_65_to_127_pkts"},
-        {"tx_128_to_255_pkts"},
-        {"tx_256_511_pkts"},
-        {"tx_512_to_1023_pkts"},
-        {"tx_1024_to_1518_pkts"},
-        {"tx_1519_to_max_pkts"},
-        {"tx_undersize_pkts"},
-        {"tx_oversize_pkts"},
-        {"rx_bytes"},
-        {"rx_bytes_ok"},
-        {"rx_pkts"},
-        {"rx_pkts_ok"},
-        {"rx_bcast_pkts"},
-        {"rx_mcast_pkts"},
-        {"rx_ucast_pkts"},
-        {"rx_undersize_pkts"},
-        {"rx_oversize_pkts"},
-        {"rx_jabber_pkts"},
-        {"rx_undersize_fcerr_pkts"},
-        {"rx_drop_events"},
-        {"rx_fcerr_pkts"},
-        {"rx_align_err"},
-        {"rx_symbol_err"},
-        {"rx_mac_err"},
-        {"rx_ctl_pkts"},
-        {"rx_pause_pkts"},
-        {"rx_64_pkts"},
-        {"rx_65_to_127_pkts"},
-        {"rx_128_255_pkts"},
-        {"rx_256_511_pkts"},
-        {"rx_512_to_1023_pkts"},
-        {"rx_1024_to_1518_pkts"},
-        {"rx_1519_to_max_pkts"},
-        {"rx_len_err_pkts"},
-        {"tx_cbfc_pause_frames0"},
-        {"tx_cbfc_pause_frames1"},
-        {"tx_cbfc_pause_frames2"},
-        {"tx_cbfc_pause_frames3"},
-        {"tx_cbfc_pause_frames4"},
-        {"tx_cbfc_pause_frames5"},
-        {"tx_cbfc_pause_frames6"},
-        {"tx_cbfc_pause_frames7"},
-        {"rx_cbfc_pause_frames0"},
-        {"rx_cbfc_pause_frames1"},
-        {"rx_cbfc_pause_frames2"},
-        {"rx_cbfc_pause_frames3"},
-        {"rx_cbfc_pause_frames4"},
-        {"rx_cbfc_pause_frames5"},
-        {"rx_cbfc_pause_frames6"},
-        {"rx_cbfc_pause_frames7"},
-        {"rx_nic_fifo_drop"},
-};
-
 static void ql_get_strings(struct net_device *dev, u32 stringset, u8 *buf)
 {
+        int index;
         switch (stringset) {
+        case ETH_SS_TEST:
+                memcpy(buf, *ql_gstrings_test, QLGE_TEST_LEN * ETH_GSTRING_LEN);
+                break;
         case ETH_SS_STATS:
-                memcpy(buf, ql_stats_str_arr, sizeof(ql_stats_str_arr));
+                for (index = 0; index < QLGE_STATS_LEN; index++) {
+                        memcpy(buf + index * ETH_GSTRING_LEN,
+                                ql_gstrings_stats[index].stat_string,
+                                ETH_GSTRING_LEN);
+                }
                 break;
         }
 }
@@ -260,7 +348,7 @@ static int ql_get_sset_count(struct net_device *dev, int sset)
         case ETH_SS_TEST:
                 return QLGE_TEST_LEN;
         case ETH_SS_STATS:
-                return ARRAY_SIZE(ql_stats_str_arr);
+                return QLGE_STATS_LEN;
         default:
                 return -EOPNOTSUPP;
         }
@@ -271,69 +359,17 @@ ql_get_ethtool_stats(struct net_device *ndev,
                      struct ethtool_stats *stats, u64 *data)
 {
         struct ql_adapter *qdev = netdev_priv(ndev);
-        struct nic_stats *s = &qdev->nic_stats;
+        int index, length;
 
+        length = QLGE_STATS_LEN;
         ql_update_stats(qdev);
 
-        *data++ = s->tx_pkts;
-        *data++ = s->tx_bytes;
-        *data++ = s->tx_mcast_pkts;
-        *data++ = s->tx_bcast_pkts;
-        *data++ = s->tx_ucast_pkts;
-        *data++ = s->tx_ctl_pkts;
-        *data++ = s->tx_pause_pkts;
-        *data++ = s->tx_64_pkt;
-        *data++ = s->tx_65_to_127_pkt;
-        *data++ = s->tx_128_to_255_pkt;
-        *data++ = s->tx_256_511_pkt;
-        *data++ = s->tx_512_to_1023_pkt;
-        *data++ = s->tx_1024_to_1518_pkt;
-        *data++ = s->tx_1519_to_max_pkt;
-        *data++ = s->tx_undersize_pkt;
-        *data++ = s->tx_oversize_pkt;
-        *data++ = s->rx_bytes;
-        *data++ = s->rx_bytes_ok;
-        *data++ = s->rx_pkts;
-        *data++ = s->rx_pkts_ok;
-        *data++ = s->rx_bcast_pkts;
-        *data++ = s->rx_mcast_pkts;
-        *data++ = s->rx_ucast_pkts;
-        *data++ = s->rx_undersize_pkts;
-        *data++ = s->rx_oversize_pkts;
-        *data++ = s->rx_jabber_pkts;
-        *data++ = s->rx_undersize_fcerr_pkts;
-        *data++ = s->rx_drop_events;
-        *data++ = s->rx_fcerr_pkts;
-        *data++ = s->rx_align_err;
-        *data++ = s->rx_symbol_err;
-        *data++ = s->rx_mac_err;
-        *data++ = s->rx_ctl_pkts;
-        *data++ = s->rx_pause_pkts;
-        *data++ = s->rx_64_pkts;
-        *data++ = s->rx_65_to_127_pkts;
-        *data++ = s->rx_128_255_pkts;
-        *data++ = s->rx_256_511_pkts;
-        *data++ = s->rx_512_to_1023_pkts;
-        *data++ = s->rx_1024_to_1518_pkts;
-        *data++ = s->rx_1519_to_max_pkts;
-        *data++ = s->rx_len_err_pkts;
-        *data++ = s->tx_cbfc_pause_frames0;
-        *data++ = s->tx_cbfc_pause_frames1;
-        *data++ = s->tx_cbfc_pause_frames2;
-        *data++ = s->tx_cbfc_pause_frames3;
-        *data++ = s->tx_cbfc_pause_frames4;
-        *data++ = s->tx_cbfc_pause_frames5;
-        *data++ = s->tx_cbfc_pause_frames6;
-        *data++ = s->tx_cbfc_pause_frames7;
-        *data++ = s->rx_cbfc_pause_frames0;
-        *data++ = s->rx_cbfc_pause_frames1;
-        *data++ = s->rx_cbfc_pause_frames2;
-        *data++ = s->rx_cbfc_pause_frames3;
-        *data++ = s->rx_cbfc_pause_frames4;
-        *data++ = s->rx_cbfc_pause_frames5;
-        *data++ = s->rx_cbfc_pause_frames6;
-        *data++ = s->rx_cbfc_pause_frames7;
-        *data++ = s->rx_nic_fifo_drop;
+        for (index = 0; index < length; index++) {
+                char *p = (char *)qdev +
+                        ql_gstrings_stats[index].stat_offset;
+                *data++ = (ql_gstrings_stats[index].sizeof_stat ==
+                        sizeof(u64)) ? *(u64 *)p : (*(u32 *)p);
+        }
 }
 
 static int ql_get_settings(struct net_device *ndev,
@@ -388,30 +424,33 @@ static void ql_get_drvinfo(struct net_device *ndev,
 static void ql_get_wol(struct net_device *ndev, struct ethtool_wolinfo *wol)
 {
         struct ql_adapter *qdev = netdev_priv(ndev);
-        /* What we support. */
-        wol->supported = WAKE_MAGIC;
-        /* What we've currently got set. */
-        wol->wolopts = qdev->wol;
+        unsigned short ssys_dev = qdev->pdev->subsystem_device;
+
+        /* WOL is only supported for mezz card. */
+        if (ssys_dev == QLGE_MEZZ_SSYS_ID_068 ||
+                        ssys_dev == QLGE_MEZZ_SSYS_ID_180) {
+                wol->supported = WAKE_MAGIC;
+                wol->wolopts = qdev->wol;
+        }
 }
 
 static int ql_set_wol(struct net_device *ndev, struct ethtool_wolinfo *wol)
 {
         struct ql_adapter *qdev = netdev_priv(ndev);
-        int status;
+        unsigned short ssys_dev = qdev->pdev->subsystem_device;
 
+        /* WOL is only supported for mezz card. */
+        if (ssys_dev != QLGE_MEZZ_SSYS_ID_068 ||
+                        ssys_dev != QLGE_MEZZ_SSYS_ID_180) {
+                netif_info(qdev, drv, qdev->ndev,
+                                "WOL is only supported for mezz card\n");
+                return -EOPNOTSUPP;
+        }
         if (wol->wolopts & ~WAKE_MAGIC)
                 return -EINVAL;
         qdev->wol = wol->wolopts;
 
         netif_info(qdev, drv, qdev->ndev, "Set wol option 0x%x\n", qdev->wol);
-        if (!qdev->wol) {
-                u32 wol = 0;
-                status = ql_mb_wol_mode(qdev, wol);
-                netif_err(qdev, drv, qdev->ndev, "WOL %s (wol code 0x%x)\n",
-                          status == 0 ? "cleared successfully" : "clear failed",
-                          wol);
-        }
-
         return 0;
 }
 
@@ -528,6 +567,8 @@ static void ql_self_test(struct net_device *ndev,
 {
         struct ql_adapter *qdev = netdev_priv(ndev);
 
+        memset(data, 0, sizeof(u64) * QLGE_TEST_LEN);
+
         if (netif_running(ndev)) {
                 set_bit(QL_SELFTEST, &qdev->flags);
                 if (eth_test->flags == ETH_TEST_FL_OFFLINE) {
diff --git a/drivers/net/ethernet/qlogic/qlge/qlge_main.c b/drivers/net/ethernet/qlogic/qlge/qlge_main.c
index 09d8d33171d..31cae42498a 100644
--- a/drivers/net/ethernet/qlogic/qlge/qlge_main.c
+++ b/drivers/net/ethernet/qlogic/qlge/qlge_main.c
@@ -1433,6 +1433,36 @@ map_error:
         return NETDEV_TX_BUSY;
 }
 
+/* Categorizing receive firmware frame errors */
+static void ql_categorize_rx_err(struct ql_adapter *qdev, u8 rx_err)
+{
+        struct nic_stats *stats = &qdev->nic_stats;
+
+        stats->rx_err_count++;
+
+        switch (rx_err & IB_MAC_IOCB_RSP_ERR_MASK) {
+        case IB_MAC_IOCB_RSP_ERR_CODE_ERR:
+                stats->rx_code_err++;
+                break;
+        case IB_MAC_IOCB_RSP_ERR_OVERSIZE:
+                stats->rx_oversize_err++;
+                break;
+        case IB_MAC_IOCB_RSP_ERR_UNDERSIZE:
+                stats->rx_undersize_err++;
+                break;
+        case IB_MAC_IOCB_RSP_ERR_PREAMBLE:
+                stats->rx_preamble_err++;
+                break;
+        case IB_MAC_IOCB_RSP_ERR_FRAME_LEN:
+                stats->rx_frame_len_err++;
+                break;
+        case IB_MAC_IOCB_RSP_ERR_CRC:
+                stats->rx_crc_err++;
+        default:
+                break;
+        }
+}
+
 /* Process an inbound completion from an rx ring. */
 static void ql_process_mac_rx_gro_page(struct ql_adapter *qdev,
                                         struct rx_ring *rx_ring,
@@ -1499,15 +1529,6 @@ static void ql_process_mac_rx_page(struct ql_adapter *qdev,
         addr = lbq_desc->p.pg_chunk.va;
         prefetch(addr);
 
-
-        /* Frame error, so drop the packet. */
-        if (ib_mac_rsp->flags2 & IB_MAC_IOCB_RSP_ERR_MASK) {
-                netif_info(qdev, drv, qdev->ndev,
-                          "Receive error, flags2 = 0x%x\n", ib_mac_rsp->flags2);
-                rx_ring->rx_errors++;
-                goto err_out;
-        }
-
         /* The max framesize filter on this chip is set higher than
          * MTU since FCoE uses 2k frames.
          */
@@ -1593,15 +1614,6 @@ static void ql_process_mac_rx_skb(struct ql_adapter *qdev,
         memcpy(skb_put(new_skb, length), skb->data, length);
         skb = new_skb;
 
-        /* Frame error, so drop the packet. */
-        if (ib_mac_rsp->flags2 & IB_MAC_IOCB_RSP_ERR_MASK) {
-                netif_info(qdev, drv, qdev->ndev,
-                          "Receive error, flags2 = 0x%x\n", ib_mac_rsp->flags2);
-                dev_kfree_skb_any(skb);
-                rx_ring->rx_errors++;
-                return;
-        }
-
         /* loopback self test for ethtool */
         if (test_bit(QL_SELFTEST, &qdev->flags)) {
                 ql_check_lb_frame(qdev, skb);
@@ -1619,7 +1631,6 @@ static void ql_process_mac_rx_skb(struct ql_adapter *qdev,
         }
 
         prefetch(skb->data);
-        skb->dev = ndev;
         if (ib_mac_rsp->flags1 & IB_MAC_IOCB_RSP_M_MASK) {
                 netif_printk(qdev, rx_status, KERN_DEBUG, qdev->ndev,
                              "%s Multicast.\n",
@@ -1908,15 +1919,6 @@ static void ql_process_mac_split_rx_intr(struct ql_adapter *qdev,
                 return;
         }
 
-        /* Frame error, so drop the packet. */
-        if (ib_mac_rsp->flags2 & IB_MAC_IOCB_RSP_ERR_MASK) {
-                netif_info(qdev, drv, qdev->ndev,
-                          "Receive error, flags2 = 0x%x\n", ib_mac_rsp->flags2);
-                dev_kfree_skb_any(skb);
-                rx_ring->rx_errors++;
-                return;
-        }
-
         /* The max framesize filter on this chip is set higher than
          * MTU since FCoE uses 2k frames.
          */
@@ -1934,7 +1936,6 @@ static void ql_process_mac_split_rx_intr(struct ql_adapter *qdev,
         }
 
         prefetch(skb->data);
-        skb->dev = ndev;
         if (ib_mac_rsp->flags1 & IB_MAC_IOCB_RSP_M_MASK) {
                 netif_printk(qdev, rx_status, KERN_DEBUG, qdev->ndev, "%s Multicast.\n",
                              (ib_mac_rsp->flags1 & IB_MAC_IOCB_RSP_M_MASK) ==
@@ -1999,6 +2000,12 @@ static unsigned long ql_process_mac_rx_intr(struct ql_adapter *qdev,
 
         QL_DUMP_IB_MAC_RSP(ib_mac_rsp);
 
+        /* Frame error, so drop the packet. */
+        if (ib_mac_rsp->flags2 & IB_MAC_IOCB_RSP_ERR_MASK) {
+                ql_categorize_rx_err(qdev, ib_mac_rsp->flags2);
+                return (unsigned long)length;
+        }
+
         if (ib_mac_rsp->flags4 & IB_MAC_IOCB_RSP_HV) {
                 /* The data and headers are split into
                  * separate buffers.
@@ -2173,8 +2180,7 @@ static int ql_clean_outbound_rx_ring(struct rx_ring *rx_ring)
         ql_write_cq_idx(rx_ring);
         tx_ring = &qdev->tx_ring[net_rsp->txq_idx];
         if (__netif_subqueue_stopped(qdev->ndev, tx_ring->wq_id)) {
-                if (atomic_read(&tx_ring->queue_stopped) &&
-                    (atomic_read(&tx_ring->tx_count) > (tx_ring->wq_len / 4)))
+                if ((atomic_read(&tx_ring->tx_count) > (tx_ring->wq_len / 4)))
                         /*
                          * The queue got stopped because the tx_ring was full.
                          * Wake it up, because it's now at least 25% empty.
@@ -2558,10 +2564,9 @@ static netdev_tx_t qlge_send(struct sk_buff *skb, struct net_device *ndev)
 
         if (unlikely(atomic_read(&tx_ring->tx_count) < 2)) {
                 netif_info(qdev, tx_queued, qdev->ndev,
-                           "%s: shutting down tx queue %d du to lack of resources.\n",
+                           "%s: BUG! shutting down tx queue %d due to lack of resources.\n",
                            __func__, tx_ring_idx);
                 netif_stop_subqueue(ndev, tx_ring->wq_id);
-                atomic_inc(&tx_ring->queue_stopped);
                 tx_ring->tx_errors++;
                 return NETDEV_TX_BUSY;
         }
@@ -2612,6 +2617,16 @@ static netdev_tx_t qlge_send(struct sk_buff *skb, struct net_device *ndev)
                      tx_ring->prod_idx, skb->len);
 
         atomic_dec(&tx_ring->tx_count);
+
+        if (unlikely(atomic_read(&tx_ring->tx_count) < 2)) {
+                netif_stop_subqueue(ndev, tx_ring->wq_id);
+                if ((atomic_read(&tx_ring->tx_count) > (tx_ring->wq_len / 4)))
+                        /*
+                         * The queue got stopped because the tx_ring was full.
+                         * Wake it up, because it's now at least 25% empty.
+                         */
+                        netif_wake_subqueue(qdev->ndev, tx_ring->wq_id);
+        }
         return NETDEV_TX_OK;
 }
 
@@ -2680,7 +2695,6 @@ static void ql_init_tx_ring(struct ql_adapter *qdev, struct tx_ring *tx_ring)
                 tx_ring_desc++;
         }
         atomic_set(&tx_ring->tx_count, tx_ring->wq_len);
-        atomic_set(&tx_ring->queue_stopped, 0);
 }
 
 static void ql_free_tx_resources(struct ql_adapter *qdev,
@@ -2703,10 +2717,9 @@ static int ql_alloc_tx_resources(struct ql_adapter *qdev,
                                  &tx_ring->wq_base_dma);
 
         if ((tx_ring->wq_base == NULL) ||
-            tx_ring->wq_base_dma & WQ_ADDR_ALIGN) {
-                netif_err(qdev, ifup, qdev->ndev, "tx_ring alloc failed.\n");
-                return -ENOMEM;
-        }
+            tx_ring->wq_base_dma & WQ_ADDR_ALIGN)
+                goto pci_alloc_err;
+
         tx_ring->q =
             kmalloc(tx_ring->wq_len * sizeof(struct tx_ring_desc), GFP_KERNEL);
         if (tx_ring->q == NULL)
@@ -2716,6 +2729,9 @@ static int ql_alloc_tx_resources(struct ql_adapter *qdev,
 err:
         pci_free_consistent(qdev->pdev, tx_ring->wq_size,
                             tx_ring->wq_base, tx_ring->wq_base_dma);
+        tx_ring->wq_base = NULL;
+pci_alloc_err:
+        netif_err(qdev, ifup, qdev->ndev, "tx_ring alloc failed.\n");
         return -ENOMEM;
 }
 
@@ -4649,7 +4665,7 @@ static int __devinit qlge_probe(struct pci_dev *pdev,
         int err = 0;
 
         ndev = alloc_etherdev_mq(sizeof(struct ql_adapter),
-                        min(MAX_CPUS, (int)num_online_cpus()));
+                        min(MAX_CPUS, netif_get_num_default_rss_queues()));
         if (!ndev)
                 return -ENOMEM;
 
diff --git a/drivers/net/ethernet/rdc/r6040.c b/drivers/net/ethernet/rdc/r6040.c
index d1827e887f4..557a26545d7 100644
--- a/drivers/net/ethernet/rdc/r6040.c
+++ b/drivers/net/ethernet/rdc/r6040.c
@@ -1256,7 +1256,6 @@ static void __devexit r6040_remove_one(struct pci_dev *pdev)
         kfree(lp->mii_bus->irq);
         mdiobus_free(lp->mii_bus);
         netif_napi_del(&lp->napi);
-        pci_set_drvdata(pdev, NULL);
         pci_iounmap(pdev, lp->base);
         pci_release_regions(pdev);
         free_netdev(dev);
@@ -1278,17 +1277,4 @@ static struct pci_driver r6040_driver = {
         .remove         = __devexit_p(r6040_remove_one),
 };
 
-
-static int __init r6040_init(void)
-{
-        return pci_register_driver(&r6040_driver);
-}
-
-
-static void __exit r6040_cleanup(void)
-{
-        pci_unregister_driver(&r6040_driver);
-}
-
-module_init(r6040_init);
-module_exit(r6040_cleanup);
+module_pci_driver(r6040_driver);
diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
index d7a04e09110..7ff3423edb9 100644
--- a/drivers/net/ethernet/realtek/r8169.c
+++ b/drivers/net/ethernet/realtek/r8169.c
@@ -46,6 +46,8 @@
 #define FIRMWARE_8105E_1        "rtl_nic/rtl8105e-1.fw"
 #define FIRMWARE_8402_1         "rtl_nic/rtl8402-1.fw"
 #define FIRMWARE_8411_1         "rtl_nic/rtl8411-1.fw"
+#define FIRMWARE_8106E_1        "rtl_nic/rtl8106e-1.fw"
+#define FIRMWARE_8168G_1        "rtl_nic/rtl8168g-1.fw"
 
 #ifdef RTL8169_DEBUG
 #define assert(expr) \
@@ -141,6 +143,9 @@ enum mac_version {
         RTL_GIGA_MAC_VER_36,
         RTL_GIGA_MAC_VER_37,
         RTL_GIGA_MAC_VER_38,
+        RTL_GIGA_MAC_VER_39,
+        RTL_GIGA_MAC_VER_40,
+        RTL_GIGA_MAC_VER_41,
         RTL_GIGA_MAC_NONE   = 0xff,
 };
 
@@ -259,6 +264,14 @@ static const struct {
         [RTL_GIGA_MAC_VER_38] =
                 _R("RTL8411",           RTL_TD_1, FIRMWARE_8411_1,
                                                         JUMBO_9K, false),
+        [RTL_GIGA_MAC_VER_39] =
+                _R("RTL8106e",          RTL_TD_1, FIRMWARE_8106E_1,
+                                                        JUMBO_1K, true),
+        [RTL_GIGA_MAC_VER_40] =
+                _R("RTL8168g/8111g",    RTL_TD_1, FIRMWARE_8168G_1,
+                                                        JUMBO_9K, false),
+        [RTL_GIGA_MAC_VER_41] =
+                _R("RTL8168g/8111g",    RTL_TD_1, NULL, JUMBO_9K, false),
 };
 #undef _R
 
@@ -389,8 +402,12 @@ enum rtl8168_8101_registers {
         TWSI                    = 0xd2,
         MCU                     = 0xd3,
 #define NOW_IS_OOB                      (1 << 7)
+#define TX_EMPTY                        (1 << 5)
+#define RX_EMPTY                        (1 << 4)
+#define RXTX_EMPTY                      (TX_EMPTY | RX_EMPTY)
 #define EN_NDP                          (1 << 3)
 #define EN_OOB_RESET                    (1 << 2)
+#define LINK_LIST_RDY                   (1 << 1)
         EFUSEAR                 = 0xdc,
 #define EFUSEAR_FLAG                    0x80000000
 #define EFUSEAR_WRITE_CMD               0x80000000
@@ -416,6 +433,7 @@ enum rtl8168_registers {
 #define ERIAR_MASK_SHIFT                12
 #define ERIAR_MASK_0001                 (0x1 << ERIAR_MASK_SHIFT)
 #define ERIAR_MASK_0011                 (0x3 << ERIAR_MASK_SHIFT)
+#define ERIAR_MASK_0101                 (0x5 << ERIAR_MASK_SHIFT)
 #define ERIAR_MASK_1111                 (0xf << ERIAR_MASK_SHIFT)
         EPHY_RXER_NUM           = 0x7c,
         OCPDR                   = 0xb0, /* OCP GPHY access */
@@ -428,10 +446,14 @@ enum rtl8168_registers {
 #define OCPAR_FLAG                      0x80000000
 #define OCPAR_GPHY_WRITE_CMD            0x8000f060
 #define OCPAR_GPHY_READ_CMD             0x0000f060
+        GPHY_OCP                = 0xb8,
         RDSAR1                  = 0xd0, /* 8168c only. Undocumented on 8168dp */
         MISC                    = 0xf0, /* 8168e only. */
 #define TXPLA_RST                       (1 << 29)
+#define DISABLE_LAN_EN                  (1 << 23) /* Enable GPIO pin */
 #define PWM_EN                          (1 << 22)
+#define RXDV_GATED_EN                   (1 << 19)
+#define EARLY_TALLY_EN                  (1 << 16)
 };
 
 enum rtl_register_content {
@@ -721,8 +743,8 @@ struct rtl8169_private {
         u16 event_slow;
 
         struct mdio_ops {
-                void (*write)(void __iomem *, int, int);
-                int (*read)(void __iomem *, int);
+                void (*write)(struct rtl8169_private *, int, int);
+                int (*read)(struct rtl8169_private *, int);
         } mdio_ops;
 
         struct pll_power_ops {
@@ -736,8 +758,8 @@ struct rtl8169_private {
         } jumbo_ops;
 
         struct csi_ops {
-                void (*write)(void __iomem *, int, int);
-                u32 (*read)(void __iomem *, int);
+                void (*write)(struct rtl8169_private *, int, int);
+                u32 (*read)(struct rtl8169_private *, int);
         } csi_ops;
 
         int (*set_speed)(struct net_device *, u8 aneg, u16 sp, u8 dpx, u32 adv);
@@ -774,6 +796,8 @@ struct rtl8169_private {
                 } phy_action;
         } *rtl_fw;
 #define RTL_FIRMWARE_UNKNOWN    ERR_PTR(-EAGAIN)
+
+        u32 ocp_base;
 };
 
 MODULE_AUTHOR("Realtek and the Linux r8169 crew <netdev@vger.kernel.org>");
@@ -794,6 +818,8 @@ MODULE_FIRMWARE(FIRMWARE_8168F_1);
 MODULE_FIRMWARE(FIRMWARE_8168F_2);
 MODULE_FIRMWARE(FIRMWARE_8402_1);
 MODULE_FIRMWARE(FIRMWARE_8411_1);
+MODULE_FIRMWARE(FIRMWARE_8106E_1);
+MODULE_FIRMWARE(FIRMWARE_8168G_1);
 
 static void rtl_lock_work(struct rtl8169_private *tp)
 {
@@ -818,47 +844,113 @@ static void rtl_tx_performance_tweak(struct pci_dev *pdev, u16 force)
         }
 }
 
+struct rtl_cond {
+        bool (*check)(struct rtl8169_private *);
+        const char *msg;
+};
+
+static void rtl_udelay(unsigned int d)
+{
+        udelay(d);
+}
+
+static bool rtl_loop_wait(struct rtl8169_private *tp, const struct rtl_cond *c,
+                          void (*delay)(unsigned int), unsigned int d, int n,
+                          bool high)
+{
+        int i;
+
+        for (i = 0; i < n; i++) {
+                delay(d);
+                if (c->check(tp) == high)
+                        return true;
+        }
+        netif_err(tp, drv, tp->dev, c->msg);
+        return false;
+}
+
+static bool rtl_udelay_loop_wait_high(struct rtl8169_private *tp,
+                                      const struct rtl_cond *c,
+                                      unsigned int d, int n)
+{
+        return rtl_loop_wait(tp, c, rtl_udelay, d, n, true);
+}
+
+static bool rtl_udelay_loop_wait_low(struct rtl8169_private *tp,
+                                     const struct rtl_cond *c,
+                                     unsigned int d, int n)
+{
+        return rtl_loop_wait(tp, c, rtl_udelay, d, n, false);
+}
+
+static bool rtl_msleep_loop_wait_high(struct rtl8169_private *tp,
+                                      const struct rtl_cond *c,
+                                      unsigned int d, int n)
+{
+        return rtl_loop_wait(tp, c, msleep, d, n, true);
+}
+
+static bool rtl_msleep_loop_wait_low(struct rtl8169_private *tp,
+                                     const struct rtl_cond *c,
+                                     unsigned int d, int n)
+{
+        return rtl_loop_wait(tp, c, msleep, d, n, false);
+}
+
+#define DECLARE_RTL_COND(name)                          \
+static bool name ## _check(struct rtl8169_private *);   \
+                                                        \
+static const struct rtl_cond name = {                   \
+        .check  = name ## _check,                       \
+        .msg    = #name                                 \
+};                                                      \
+                                                        \
+static bool name ## _check(struct rtl8169_private *tp)
+
+DECLARE_RTL_COND(rtl_ocpar_cond)
+{
+        void __iomem *ioaddr = tp->mmio_addr;
+
+        return RTL_R32(OCPAR) & OCPAR_FLAG;
+}
+
 static u32 ocp_read(struct rtl8169_private *tp, u8 mask, u16 reg)
 {
         void __iomem *ioaddr = tp->mmio_addr;
-        int i;
 
         RTL_W32(OCPAR, ((u32)mask & 0x0f) << 12 | (reg & 0x0fff));
-        for (i = 0; i < 20; i++) {
-                udelay(100);
-                if (RTL_R32(OCPAR) & OCPAR_FLAG)
-                        break;
-        }
-        return RTL_R32(OCPDR);
+
+        return rtl_udelay_loop_wait_high(tp, &rtl_ocpar_cond, 100, 20) ?
+                RTL_R32(OCPDR) : ~0;
 }
 
 static void ocp_write(struct rtl8169_private *tp, u8 mask, u16 reg, u32 data)
 {
         void __iomem *ioaddr = tp->mmio_addr;
-        int i;
 
         RTL_W32(OCPDR, data);
         RTL_W32(OCPAR, OCPAR_FLAG | ((u32)mask & 0x0f) << 12 | (reg & 0x0fff));
-        for (i = 0; i < 20; i++) {
-                udelay(100);
-                if ((RTL_R32(OCPAR) & OCPAR_FLAG) == 0)
-                        break;
-        }
+
+        rtl_udelay_loop_wait_low(tp, &rtl_ocpar_cond, 100, 20);
+}
+
+DECLARE_RTL_COND(rtl_eriar_cond)
+{
+        void __iomem *ioaddr = tp->mmio_addr;
+
+        return RTL_R32(ERIAR) & ERIAR_FLAG;
 }
 
 static void rtl8168_oob_notify(struct rtl8169_private *tp, u8 cmd)
 {
         void __iomem *ioaddr = tp->mmio_addr;
-        int i;
 
         RTL_W8(ERIDR, cmd);
         RTL_W32(ERIAR, 0x800010e8);
         msleep(2);
-        for (i = 0; i < 5; i++) {
-                udelay(100);
-                if (!(RTL_R32(ERIAR) & ERIAR_FLAG))
-                        break;
-        }
+
+        if (!rtl_udelay_loop_wait_low(tp, &rtl_eriar_cond, 100, 5))
+                return;
 
         ocp_write(tp, 0x1, 0x30, 0x00000001);
 }
@@ -872,36 +964,27 @@ static u16 rtl8168_get_ocp_reg(struct rtl8169_private *tp)
         return (tp->mac_version == RTL_GIGA_MAC_VER_31) ? 0xb8 : 0x10;
 }
 
-static void rtl8168_driver_start(struct rtl8169_private *tp)
+DECLARE_RTL_COND(rtl_ocp_read_cond)
 {
         u16 reg;
-        int i;
-
-        rtl8168_oob_notify(tp, OOB_CMD_DRIVER_START);
 
         reg = rtl8168_get_ocp_reg(tp);
 
-        for (i = 0; i < 10; i++) {
-                msleep(10);
-                if (ocp_read(tp, 0x0f, reg) & 0x00000800)
-                        break;
-        }
+        return ocp_read(tp, 0x0f, reg) & 0x00000800;
 }
 
-static void rtl8168_driver_stop(struct rtl8169_private *tp)
+static void rtl8168_driver_start(struct rtl8169_private *tp)
 {
-        u16 reg;
-        int i;
+        rtl8168_oob_notify(tp, OOB_CMD_DRIVER_START);
 
-        rtl8168_oob_notify(tp, OOB_CMD_DRIVER_STOP);
+        rtl_msleep_loop_wait_high(tp, &rtl_ocp_read_cond, 10, 10);
+}
 
-        reg = rtl8168_get_ocp_reg(tp);
+static void rtl8168_driver_stop(struct rtl8169_private *tp)
+{
+        rtl8168_oob_notify(tp, OOB_CMD_DRIVER_STOP);
 
-        for (i = 0; i < 10; i++) {
-                msleep(10);
-                if ((ocp_read(tp, 0x0f, reg) & 0x00000800) == 0)
-                        break;
-        }
+        rtl_msleep_loop_wait_low(tp, &rtl_ocp_read_cond, 10, 10);
 }
 
 static int r8168dp_check_dash(struct rtl8169_private *tp)
@@ -911,21 +994,124 @@ static int r8168dp_check_dash(struct rtl8169_private *tp)
         return (ocp_read(tp, 0x0f, reg) & 0x00008000) ? 1 : 0;
 }
 
-static void r8169_mdio_write(void __iomem *ioaddr, int reg_addr, int value)
+static bool rtl_ocp_reg_failure(struct rtl8169_private *tp, u32 reg)
 {
-        int i;
+        if (reg & 0xffff0001) {
+                netif_err(tp, drv, tp->dev, "Invalid ocp reg %x!\n", reg);
+                return true;
+        }
+        return false;
+}
 
-        RTL_W32(PHYAR, 0x80000000 | (reg_addr & 0x1f) << 16 | (value & 0xffff));
+DECLARE_RTL_COND(rtl_ocp_gphy_cond)
+{
+        void __iomem *ioaddr = tp->mmio_addr;
 
-        for (i = 20; i > 0; i--) {
-                /*
-                 * Check if the RTL8169 has completed writing to the specified
-                 * MII register.
-                 */
-                if (!(RTL_R32(PHYAR) & 0x80000000))
-                        break;
-                udelay(25);
+        return RTL_R32(GPHY_OCP) & OCPAR_FLAG;
+}
+
+static void r8168_phy_ocp_write(struct rtl8169_private *tp, u32 reg, u32 data)
+{
+        void __iomem *ioaddr = tp->mmio_addr;
+
+        if (rtl_ocp_reg_failure(tp, reg))
+                return;
+
+        RTL_W32(GPHY_OCP, OCPAR_FLAG | (reg << 15) | data);
+
+        rtl_udelay_loop_wait_low(tp, &rtl_ocp_gphy_cond, 25, 10);
+}
+
+static u16 r8168_phy_ocp_read(struct rtl8169_private *tp, u32 reg)
+{
+        void __iomem *ioaddr = tp->mmio_addr;
+
+        if (rtl_ocp_reg_failure(tp, reg))
+                return 0;
+
+        RTL_W32(GPHY_OCP, reg << 15);
+
+        return rtl_udelay_loop_wait_high(tp, &rtl_ocp_gphy_cond, 25, 10) ?
+                (RTL_R32(GPHY_OCP) & 0xffff) : ~0;
+}
+
+static void rtl_w1w0_phy_ocp(struct rtl8169_private *tp, int reg, int p, int m)
+{
+        int val;
+
+        val = r8168_phy_ocp_read(tp, reg);
+        r8168_phy_ocp_write(tp, reg, (val | p) & ~m);
+}
+
+DECLARE_RTL_COND(rtl_ocpdr_cond)
+{
+        void __iomem *ioaddr = tp->mmio_addr;
+
+        return RTL_R32(OCPDR) & OCPAR_FLAG;
+}
+
+static void r8168_mac_ocp_write(struct rtl8169_private *tp, u32 reg, u32 data)
+{
+        void __iomem *ioaddr = tp->mmio_addr;
+
+        if (rtl_ocp_reg_failure(tp, reg))
+                return;
+
+        RTL_W32(OCPDR, OCPAR_FLAG | (reg << 15) | data);
+
+        rtl_udelay_loop_wait_low(tp, &rtl_ocpdr_cond, 25, 10);
+}
+
+static u16 r8168_mac_ocp_read(struct rtl8169_private *tp, u32 reg)
+{
+        void __iomem *ioaddr = tp->mmio_addr;
+
+        if (rtl_ocp_reg_failure(tp, reg))
+                return 0;
+
+        RTL_W32(OCPDR, reg << 15);
+
+        return rtl_udelay_loop_wait_high(tp, &rtl_ocpdr_cond, 25, 10) ?
+                RTL_R32(OCPDR) : ~0;
+}
+
+#define OCP_STD_PHY_BASE        0xa400
+
+static void r8168g_mdio_write(struct rtl8169_private *tp, int reg, int value)
+{
+        if (reg == 0x1f) {
+                tp->ocp_base = value ? value << 4 : OCP_STD_PHY_BASE;
+                return;
         }
+
+        if (tp->ocp_base != OCP_STD_PHY_BASE)
+                reg -= 0x10;
+
+        r8168_phy_ocp_write(tp, tp->ocp_base + reg * 2, value);
+}
+
+static int r8168g_mdio_read(struct rtl8169_private *tp, int reg)
+{
+        if (tp->ocp_base != OCP_STD_PHY_BASE)
+                reg -= 0x10;
+
+        return r8168_phy_ocp_read(tp, tp->ocp_base + reg * 2);
+}
+
+DECLARE_RTL_COND(rtl_phyar_cond)
+{
+        void __iomem *ioaddr = tp->mmio_addr;
+
+        return RTL_R32(PHYAR) & 0x80000000;
+}
+
+static void r8169_mdio_write(struct rtl8169_private *tp, int reg, int value)
+{
+        void __iomem *ioaddr = tp->mmio_addr;
+
+        RTL_W32(PHYAR, 0x80000000 | (reg & 0x1f) << 16 | (value & 0xffff));
+
+        rtl_udelay_loop_wait_low(tp, &rtl_phyar_cond, 25, 20);
         /*
          * According to hardware specs a 20us delay is required after write
          * complete indication, but before sending next command.
@@ -933,23 +1119,16 @@ static void r8169_mdio_write(void __iomem *ioaddr, int reg_addr, int value)
         udelay(20);
 }
 
-static int r8169_mdio_read(void __iomem *ioaddr, int reg_addr)
+static int r8169_mdio_read(struct rtl8169_private *tp, int reg)
 {
-        int i, value = -1;
+        void __iomem *ioaddr = tp->mmio_addr;
+        int value;
 
-        RTL_W32(PHYAR, 0x0 | (reg_addr & 0x1f) << 16);
+        RTL_W32(PHYAR, 0x0 | (reg & 0x1f) << 16);
+
+        value = rtl_udelay_loop_wait_high(tp, &rtl_phyar_cond, 25, 20) ?
+                RTL_R32(PHYAR) & 0xffff : ~0;
 
-        for (i = 20; i > 0; i--) {
-                /*
-                 * Check if the RTL8169 has completed retrieving data from
-                 * the specified MII register.
-                 */
-                if (RTL_R32(PHYAR) & 0x80000000) {
-                        value = RTL_R32(PHYAR) & 0xffff;
-                        break;
-                }
-                udelay(25);
-        }
         /*
          * According to hardware specs a 20us delay is required after read
          * complete indication, but before sending next command.
@@ -959,45 +1138,35 @@ static int r8169_mdio_read(void __iomem *ioaddr, int reg_addr)
         return value;
 }
 
-static void r8168dp_1_mdio_access(void __iomem *ioaddr, int reg_addr, u32 data)
+static void r8168dp_1_mdio_access(struct rtl8169_private *tp, int reg, u32 data)
 {
-        int i;
+        void __iomem *ioaddr = tp->mmio_addr;
 
-        RTL_W32(OCPDR, data |
-                ((reg_addr & OCPDR_REG_MASK) << OCPDR_GPHY_REG_SHIFT));
+        RTL_W32(OCPDR, data | ((reg & OCPDR_REG_MASK) << OCPDR_GPHY_REG_SHIFT));
         RTL_W32(OCPAR, OCPAR_GPHY_WRITE_CMD);
         RTL_W32(EPHY_RXER_NUM, 0);
 
-        for (i = 0; i < 100; i++) {
-                mdelay(1);
-                if (!(RTL_R32(OCPAR) & OCPAR_FLAG))
-                        break;
-        }
+        rtl_udelay_loop_wait_low(tp, &rtl_ocpar_cond, 1000, 100);
 }
 
-static void r8168dp_1_mdio_write(void __iomem *ioaddr, int reg_addr, int value)
+static void r8168dp_1_mdio_write(struct rtl8169_private *tp, int reg, int value)
 {
-        r8168dp_1_mdio_access(ioaddr, reg_addr, OCPDR_WRITE_CMD |
-                (value & OCPDR_DATA_MASK));
+        r8168dp_1_mdio_access(tp, reg,
+                              OCPDR_WRITE_CMD | (value & OCPDR_DATA_MASK));
 }
 
-static int r8168dp_1_mdio_read(void __iomem *ioaddr, int reg_addr)
+static int r8168dp_1_mdio_read(struct rtl8169_private *tp, int reg)
 {
-        int i;
+        void __iomem *ioaddr = tp->mmio_addr;
 
-        r8168dp_1_mdio_access(ioaddr, reg_addr, OCPDR_READ_CMD);
+        r8168dp_1_mdio_access(tp, reg, OCPDR_READ_CMD);
 
         mdelay(1);
         RTL_W32(OCPAR, OCPAR_GPHY_READ_CMD);
         RTL_W32(EPHY_RXER_NUM, 0);
 
-        for (i = 0; i < 100; i++) {
-                mdelay(1);
-                if (RTL_R32(OCPAR) & OCPAR_FLAG)
-                        break;
-        }
-
-        return RTL_R32(OCPDR) & OCPDR_DATA_MASK;
+        return rtl_udelay_loop_wait_high(tp, &rtl_ocpar_cond, 1000, 100) ?
+                RTL_R32(OCPDR) & OCPDR_DATA_MASK : ~0;
 }
 
 #define R8168DP_1_MDIO_ACCESS_BIT       0x00020000
@@ -1012,22 +1181,25 @@ static void r8168dp_2_mdio_stop(void __iomem *ioaddr)
         RTL_W32(0xd0, RTL_R32(0xd0) | R8168DP_1_MDIO_ACCESS_BIT);
 }
 
-static void r8168dp_2_mdio_write(void __iomem *ioaddr, int reg_addr, int value)
+static void r8168dp_2_mdio_write(struct rtl8169_private *tp, int reg, int value)
 {
+        void __iomem *ioaddr = tp->mmio_addr;
+
         r8168dp_2_mdio_start(ioaddr);
 
-        r8169_mdio_write(ioaddr, reg_addr, value);
+        r8169_mdio_write(tp, reg, value);
 
         r8168dp_2_mdio_stop(ioaddr);
 }
 
-static int r8168dp_2_mdio_read(void __iomem *ioaddr, int reg_addr)
+static int r8168dp_2_mdio_read(struct rtl8169_private *tp, int reg)
 {
+        void __iomem *ioaddr = tp->mmio_addr;
         int value;
 
         r8168dp_2_mdio_start(ioaddr);
 
-        value = r8169_mdio_read(ioaddr, reg_addr);
+        value = r8169_mdio_read(tp, reg);
 
         r8168dp_2_mdio_stop(ioaddr);
 
@@ -1036,12 +1208,12 @@ static int r8168dp_2_mdio_read(void __iomem *ioaddr, int reg_addr)
 
 static void rtl_writephy(struct rtl8169_private *tp, int location, u32 val)
 {
-        tp->mdio_ops.write(tp->mmio_addr, location, val);
+        tp->mdio_ops.write(tp, location, val);
 }
 
 static int rtl_readphy(struct rtl8169_private *tp, int location)
 {
-        return tp->mdio_ops.read(tp->mmio_addr, location);
+        return tp->mdio_ops.read(tp, location);
 }
 
 static void rtl_patchphy(struct rtl8169_private *tp, int reg_addr, int value)
@@ -1072,79 +1244,64 @@ static int rtl_mdio_read(struct net_device *dev, int phy_id, int location)
         return rtl_readphy(tp, location);
 }
 
-static void rtl_ephy_write(void __iomem *ioaddr, int reg_addr, int value)
+DECLARE_RTL_COND(rtl_ephyar_cond)
 {
-        unsigned int i;
+        void __iomem *ioaddr = tp->mmio_addr;
+
+        return RTL_R32(EPHYAR) & EPHYAR_FLAG;
+}
+
+static void rtl_ephy_write(struct rtl8169_private *tp, int reg_addr, int value)
+{
+        void __iomem *ioaddr = tp->mmio_addr;
 
         RTL_W32(EPHYAR, EPHYAR_WRITE_CMD | (value & EPHYAR_DATA_MASK) |
                 (reg_addr & EPHYAR_REG_MASK) << EPHYAR_REG_SHIFT);
 
-        for (i = 0; i < 100; i++) {
-                if (!(RTL_R32(EPHYAR) & EPHYAR_FLAG))
-                        break;
-                udelay(10);
-        }
+        rtl_udelay_loop_wait_low(tp, &rtl_ephyar_cond, 10, 100);
+
+        udelay(10);
 }
 
-static u16 rtl_ephy_read(void __iomem *ioaddr, int reg_addr)
+static u16 rtl_ephy_read(struct rtl8169_private *tp, int reg_addr)
 {
-        u16 value = 0xffff;
-        unsigned int i;
+        void __iomem *ioaddr = tp->mmio_addr;
 
         RTL_W32(EPHYAR, (reg_addr & EPHYAR_REG_MASK) << EPHYAR_REG_SHIFT);
 
-        for (i = 0; i < 100; i++) {
-                if (RTL_R32(EPHYAR) & EPHYAR_FLAG) {
-                        value = RTL_R32(EPHYAR) & EPHYAR_DATA_MASK;
-                        break;
-                }
-                udelay(10);
-        }
-
-        return value;
+        return rtl_udelay_loop_wait_high(tp, &rtl_ephyar_cond, 10, 100) ?
+                RTL_R32(EPHYAR) & EPHYAR_DATA_MASK : ~0;
 }
 
-static
-void rtl_eri_write(void __iomem *ioaddr, int addr, u32 mask, u32 val, int type)
+static void rtl_eri_write(struct rtl8169_private *tp, int addr, u32 mask,
+                          u32 val, int type)
 {
-        unsigned int i;
+        void __iomem *ioaddr = tp->mmio_addr;
 
         BUG_ON((addr & 3) || (mask == 0));
         RTL_W32(ERIDR, val);
         RTL_W32(ERIAR, ERIAR_WRITE_CMD | type | mask | addr);
 
-        for (i = 0; i < 100; i++) {
-                if (!(RTL_R32(ERIAR) & ERIAR_FLAG))
-                        break;
-                udelay(100);
-        }
+        rtl_udelay_loop_wait_low(tp, &rtl_eriar_cond, 100, 100);
 }
 
-static u32 rtl_eri_read(void __iomem *ioaddr, int addr, int type)
+static u32 rtl_eri_read(struct rtl8169_private *tp, int addr, int type)
 {
-        u32 value = ~0x00;
-        unsigned int i;
+        void __iomem *ioaddr = tp->mmio_addr;
 
         RTL_W32(ERIAR, ERIAR_READ_CMD | type | ERIAR_MASK_1111 | addr);
 
-        for (i = 0; i < 100; i++) {
-                if (RTL_R32(ERIAR) & ERIAR_FLAG) {
-                        value = RTL_R32(ERIDR);
-                        break;
-                }
-                udelay(100);
-        }
-
-        return value;
+        return rtl_udelay_loop_wait_high(tp, &rtl_eriar_cond, 100, 100) ?
+                RTL_R32(ERIDR) : ~0;
 }
 
-static void
-rtl_w1w0_eri(void __iomem *ioaddr, int addr, u32 mask, u32 p, u32 m, int type)
+static void rtl_w1w0_eri(struct rtl8169_private *tp, int addr, u32 mask, u32 p,
+                         u32 m, int type)
 {
         u32 val;
 
-        val = rtl_eri_read(ioaddr, addr, type);
-        rtl_eri_write(ioaddr, addr, mask, (val & ~m) | p, type);
+        val = rtl_eri_read(tp, addr, type);
+        rtl_eri_write(tp, addr, mask, (val & ~m) | p, type);
 }
 
 struct exgmac_reg {
@@ -1153,31 +1310,30 @@ struct exgmac_reg {
         u32 val;
 };
 
-static void rtl_write_exgmac_batch(void __iomem *ioaddr,
+static void rtl_write_exgmac_batch(struct rtl8169_private *tp,
                                    const struct exgmac_reg *r, int len)
 {
         while (len-- > 0) {
-                rtl_eri_write(ioaddr, r->addr, r->mask, r->val, ERIAR_EXGMAC);
+                rtl_eri_write(tp, r->addr, r->mask, r->val, ERIAR_EXGMAC);
                 r++;
         }
 }
 
-static u8 rtl8168d_efuse_read(void __iomem *ioaddr, int reg_addr)
+DECLARE_RTL_COND(rtl_efusear_cond)
 {
-        u8 value = 0xff;
-        unsigned int i;
+        void __iomem *ioaddr = tp->mmio_addr;
 
-        RTL_W32(EFUSEAR, (reg_addr & EFUSEAR_REG_MASK) << EFUSEAR_REG_SHIFT);
+        return RTL_R32(EFUSEAR) & EFUSEAR_FLAG;
+}
 
-        for (i = 0; i < 300; i++) {
-                if (RTL_R32(EFUSEAR) & EFUSEAR_FLAG) {
-                        value = RTL_R32(EFUSEAR) & EFUSEAR_DATA_MASK;
-                        break;
-                }
-                udelay(100);
-        }
+static u8 rtl8168d_efuse_read(struct rtl8169_private *tp, int reg_addr)
+{
+        void __iomem *ioaddr = tp->mmio_addr;
 
-        return value;
+        RTL_W32(EFUSEAR, (reg_addr & EFUSEAR_REG_MASK) << EFUSEAR_REG_SHIFT);
+
+        return rtl_udelay_loop_wait_high(tp, &rtl_efusear_cond, 100, 300) ?
+                RTL_R32(EFUSEAR) & EFUSEAR_DATA_MASK : ~0;
 }
 
 static u16 rtl_get_events(struct rtl8169_private *tp)
@@ -1276,48 +1432,48 @@ static void rtl_link_chg_patch(struct rtl8169_private *tp)
         if (tp->mac_version == RTL_GIGA_MAC_VER_34 ||
             tp->mac_version == RTL_GIGA_MAC_VER_38) {
                 if (RTL_R8(PHYstatus) & _1000bpsF) {
-                        rtl_eri_write(ioaddr, 0x1bc, ERIAR_MASK_1111,
-                                      0x00000011, ERIAR_EXGMAC);
-                        rtl_eri_write(ioaddr, 0x1dc, ERIAR_MASK_1111,
-                                      0x00000005, ERIAR_EXGMAC);
+                        rtl_eri_write(tp, 0x1bc, ERIAR_MASK_1111, 0x00000011,
+                                      ERIAR_EXGMAC);
+                        rtl_eri_write(tp, 0x1dc, ERIAR_MASK_1111, 0x00000005,
+                                      ERIAR_EXGMAC);
                 } else if (RTL_R8(PHYstatus) & _100bps) {
-                        rtl_eri_write(ioaddr, 0x1bc, ERIAR_MASK_1111,
-                                      0x0000001f, ERIAR_EXGMAC);
-                        rtl_eri_write(ioaddr, 0x1dc, ERIAR_MASK_1111,
-                                      0x00000005, ERIAR_EXGMAC);
+                        rtl_eri_write(tp, 0x1bc, ERIAR_MASK_1111, 0x0000001f,
+                                      ERIAR_EXGMAC);
+                        rtl_eri_write(tp, 0x1dc, ERIAR_MASK_1111, 0x00000005,
+                                      ERIAR_EXGMAC);
                 } else {
-                        rtl_eri_write(ioaddr, 0x1bc, ERIAR_MASK_1111,
-                                      0x0000001f, ERIAR_EXGMAC);
-                        rtl_eri_write(ioaddr, 0x1dc, ERIAR_MASK_1111,
-                                      0x0000003f, ERIAR_EXGMAC);
+                        rtl_eri_write(tp, 0x1bc, ERIAR_MASK_1111, 0x0000001f,
+                                      ERIAR_EXGMAC);
+                        rtl_eri_write(tp, 0x1dc, ERIAR_MASK_1111, 0x0000003f,
+                                      ERIAR_EXGMAC);
                 }
                 /* Reset packet filter */
-                rtl_w1w0_eri(ioaddr, 0xdc, ERIAR_MASK_0001, 0x00, 0x01,
+                rtl_w1w0_eri(tp, 0xdc, ERIAR_MASK_0001, 0x00, 0x01,
                              ERIAR_EXGMAC);
-                rtl_w1w0_eri(ioaddr, 0xdc, ERIAR_MASK_0001, 0x01, 0x00,
+                rtl_w1w0_eri(tp, 0xdc, ERIAR_MASK_0001, 0x01, 0x00,
                              ERIAR_EXGMAC);
         } else if (tp->mac_version == RTL_GIGA_MAC_VER_35 ||
                    tp->mac_version == RTL_GIGA_MAC_VER_36) {
                 if (RTL_R8(PHYstatus) & _1000bpsF) {
-                        rtl_eri_write(ioaddr, 0x1bc, ERIAR_MASK_1111,
-                                      0x00000011, ERIAR_EXGMAC);
-                        rtl_eri_write(ioaddr, 0x1dc, ERIAR_MASK_1111,
-                                      0x00000005, ERIAR_EXGMAC);
+                        rtl_eri_write(tp, 0x1bc, ERIAR_MASK_1111, 0x00000011,
+                                      ERIAR_EXGMAC);
+                        rtl_eri_write(tp, 0x1dc, ERIAR_MASK_1111, 0x00000005,
+                                      ERIAR_EXGMAC);
                 } else {
-                        rtl_eri_write(ioaddr, 0x1bc, ERIAR_MASK_1111,
-                                      0x0000001f, ERIAR_EXGMAC);
-                        rtl_eri_write(ioaddr, 0x1dc, ERIAR_MASK_1111,
-                                      0x0000003f, ERIAR_EXGMAC);
+                        rtl_eri_write(tp, 0x1bc, ERIAR_MASK_1111, 0x0000001f,
+                                      ERIAR_EXGMAC);
+                        rtl_eri_write(tp, 0x1dc, ERIAR_MASK_1111, 0x0000003f,
+                                      ERIAR_EXGMAC);
                 }
         } else if (tp->mac_version == RTL_GIGA_MAC_VER_37) {
                 if (RTL_R8(PHYstatus) & _10bps) {
-                        rtl_eri_write(ioaddr, 0x1d0, ERIAR_MASK_0011,
-                                      0x4d02, ERIAR_EXGMAC);
-                        rtl_eri_write(ioaddr, 0x1dc, ERIAR_MASK_0011,
-                                      0x0060, ERIAR_EXGMAC);
+                        rtl_eri_write(tp, 0x1d0, ERIAR_MASK_0011, 0x4d02,
+                                      ERIAR_EXGMAC);
+                        rtl_eri_write(tp, 0x1dc, ERIAR_MASK_0011, 0x0060,
+                                      ERIAR_EXGMAC);
                 } else {
-                        rtl_eri_write(ioaddr, 0x1d0, ERIAR_MASK_0011,
-                                      0x0000, ERIAR_EXGMAC);
+                        rtl_eri_write(tp, 0x1d0, ERIAR_MASK_0011, 0x0000,
+                                      ERIAR_EXGMAC);
                 }
         }
 }
@@ -1784,6 +1940,13 @@ static int rtl8169_get_sset_count(struct net_device *dev, int sset)
         }
 }
 
+DECLARE_RTL_COND(rtl_counters_cond)
+{
+        void __iomem *ioaddr = tp->mmio_addr;
+
+        return RTL_R32(CounterAddrLow) & CounterDump;
+}
+
 static void rtl8169_update_counters(struct net_device *dev)
 {
         struct rtl8169_private *tp = netdev_priv(dev);
@@ -1792,7 +1955,6 @@ static void rtl8169_update_counters(struct net_device *dev)
         struct rtl8169_counters *counters;
         dma_addr_t paddr;
         u32 cmd;
-        int wait = 1000;
 
         /*
          * Some chips are unable to dump tally counters when the receiver
@@ -1810,13 +1972,8 @@ static void rtl8169_update_counters(struct net_device *dev)
         RTL_W32(CounterAddrLow, cmd);
         RTL_W32(CounterAddrLow, cmd | CounterDump);
 
-        while (wait--) {
-                if ((RTL_R32(CounterAddrLow) & CounterDump) == 0) {
-                        memcpy(&tp->counters, counters, sizeof(*counters));
-                        break;
-                }
-                udelay(10);
-        }
+        if (rtl_udelay_loop_wait_low(tp, &rtl_counters_cond, 10, 1000))
+                memcpy(&tp->counters, counters, sizeof(*counters));
 
         RTL_W32(CounterAddrLow, 0);
         RTL_W32(CounterAddrHigh, 0);
@@ -1894,6 +2051,10 @@ static void rtl8169_get_mac_version(struct rtl8169_private *tp,
                 u32 val;
                 int mac_version;
         } mac_info[] = {
+                /* 8168G family. */
+                { 0x7cf00000, 0x4c100000,       RTL_GIGA_MAC_VER_41 },
+                { 0x7cf00000, 0x4c000000,       RTL_GIGA_MAC_VER_40 },
+
                 /* 8168F family. */
                 { 0x7c800000, 0x48800000,       RTL_GIGA_MAC_VER_38 },
                 { 0x7cf00000, 0x48100000,       RTL_GIGA_MAC_VER_36 },
@@ -1933,6 +2094,8 @@ static void rtl8169_get_mac_version(struct rtl8169_private *tp,
                 { 0x7c800000, 0x30000000,       RTL_GIGA_MAC_VER_11 },
 
                 /* 8101 family. */
+                { 0x7cf00000, 0x44900000,       RTL_GIGA_MAC_VER_39 },
+                { 0x7c800000, 0x44800000,       RTL_GIGA_MAC_VER_39 },
                 { 0x7c800000, 0x44000000,       RTL_GIGA_MAC_VER_37 },
                 { 0x7cf00000, 0x40b00000,       RTL_GIGA_MAC_VER_30 },
                 { 0x7cf00000, 0x40a00000,       RTL_GIGA_MAC_VER_30 },
@@ -2186,7 +2349,7 @@ static void rtl_phy_write_fw(struct rtl8169_private *tp, struct rtl_fw *rtl_fw)
                         index -= regno;
                         break;
                 case PHY_READ_EFUSE:
-                        predata = rtl8168d_efuse_read(tp->mmio_addr, regno);
+                        predata = rtl8168d_efuse_read(tp, regno);
                         index++;
                         break;
                 case PHY_CLEAR_READCOUNT:
@@ -2626,7 +2789,6 @@ static void rtl8168d_1_hw_phy_config(struct rtl8169_private *tp)
                 { 0x1f, 0x0000 },
                 { 0x0d, 0xf880 }
         };
-        void __iomem *ioaddr = tp->mmio_addr;
 
         rtl_writephy_batch(tp, phy_reg_init_0, ARRAY_SIZE(phy_reg_init_0));
 
@@ -2638,7 +2800,7 @@ static void rtl8168d_1_hw_phy_config(struct rtl8169_private *tp)
         rtl_w1w0_phy(tp, 0x0b, 0x0010, 0x00ef);
         rtl_w1w0_phy(tp, 0x0c, 0xa200, 0x5d00);
 
-        if (rtl8168d_efuse_read(ioaddr, 0x01) == 0xb1) {
+        if (rtl8168d_efuse_read(tp, 0x01) == 0xb1) {
                 static const struct phy_reg phy_reg_init[] = {
                         { 0x1f, 0x0002 },
                         { 0x05, 0x669a },
@@ -2738,11 +2900,10 @@ static void rtl8168d_2_hw_phy_config(struct rtl8169_private *tp)
                 { 0x1f, 0x0000 },
                 { 0x0d, 0xf880 }
         };
-        void __iomem *ioaddr = tp->mmio_addr;
 
         rtl_writephy_batch(tp, phy_reg_init_0, ARRAY_SIZE(phy_reg_init_0));
 
-        if (rtl8168d_efuse_read(ioaddr, 0x01) == 0xb1) {
+        if (rtl8168d_efuse_read(tp, 0x01) == 0xb1) {
                 static const struct phy_reg phy_reg_init[] = {
                         { 0x1f, 0x0002 },
                         { 0x05, 0x669a },
@@ -3010,8 +3171,7 @@ static void rtl8168e_2_hw_phy_config(struct rtl8169_private *tp)
         rtl_writephy(tp, 0x1f, 0x0000);
 
         /* EEE setting */
-        rtl_w1w0_eri(tp->mmio_addr, 0x1b0, ERIAR_MASK_1111, 0x0000, 0x0003,
-                     ERIAR_EXGMAC);
+        rtl_w1w0_eri(tp, 0x1b0, ERIAR_MASK_1111, 0x0000, 0x0003, ERIAR_EXGMAC);
         rtl_writephy(tp, 0x1f, 0x0005);
         rtl_writephy(tp, 0x05, 0x8b85);
         rtl_w1w0_phy(tp, 0x06, 0x0000, 0x2000);
@@ -3115,7 +3275,6 @@ static void rtl8168f_2_hw_phy_config(struct rtl8169_private *tp)
 
 static void rtl8411_hw_phy_config(struct rtl8169_private *tp)
 {
-        void __iomem *ioaddr = tp->mmio_addr;
         static const struct phy_reg phy_reg_init[] = {
                 /* Channel estimation fine tune */
                 { 0x1f, 0x0003 },
@@ -3189,7 +3348,7 @@ static void rtl8411_hw_phy_config(struct rtl8169_private *tp)
         rtl_writephy(tp, 0x1f, 0x0000);
 
         /* eee setting */
-        rtl_w1w0_eri(ioaddr, 0x1b0, ERIAR_MASK_0001, 0x00, 0x03, ERIAR_EXGMAC);
+        rtl_w1w0_eri(tp, 0x1b0, ERIAR_MASK_0001, 0x00, 0x03, ERIAR_EXGMAC);
         rtl_writephy(tp, 0x1f, 0x0005);
         rtl_writephy(tp, 0x05, 0x8b85);
         rtl_w1w0_phy(tp, 0x06, 0x0000, 0x2000);
@@ -3211,6 +3370,55 @@ static void rtl8411_hw_phy_config(struct rtl8169_private *tp)
         rtl_writephy(tp, 0x1f, 0x0000);
 }
 
+static void rtl8168g_1_hw_phy_config(struct rtl8169_private *tp)
+{
+        static const u16 mac_ocp_patch[] = {
+                0xe008, 0xe01b, 0xe01d, 0xe01f,
+                0xe021, 0xe023, 0xe025, 0xe027,
+                0x49d2, 0xf10d, 0x766c, 0x49e2,
+                0xf00a, 0x1ec0, 0x8ee1, 0xc60a,
+
+                0x77c0, 0x4870, 0x9fc0, 0x1ea0,
+                0xc707, 0x8ee1, 0x9d6c, 0xc603,
+                0xbe00, 0xb416, 0x0076, 0xe86c,
+                0xc602, 0xbe00, 0x0000, 0xc602,
+
+                0xbe00, 0x0000, 0xc602, 0xbe00,
+                0x0000, 0xc602, 0xbe00, 0x0000,
+                0xc602, 0xbe00, 0x0000, 0xc602,
+                0xbe00, 0x0000, 0xc602, 0xbe00,
+
+                0x0000, 0x0000, 0x0000, 0x0000
+        };
+        u32 i;
+
+        /* Patch code for GPHY reset */
+        for (i = 0; i < ARRAY_SIZE(mac_ocp_patch); i++)
+                r8168_mac_ocp_write(tp, 0xf800 + 2*i, mac_ocp_patch[i]);
+        r8168_mac_ocp_write(tp, 0xfc26, 0x8000);
+        r8168_mac_ocp_write(tp, 0xfc28, 0x0075);
+
+        rtl_apply_firmware(tp);
+
+        if (r8168_phy_ocp_read(tp, 0xa460) & 0x0100)
+                rtl_w1w0_phy_ocp(tp, 0xbcc4, 0x0000, 0x8000);
+        else
+                rtl_w1w0_phy_ocp(tp, 0xbcc4, 0x8000, 0x0000);
+
+        if (r8168_phy_ocp_read(tp, 0xa466) & 0x0100)
+                rtl_w1w0_phy_ocp(tp, 0xc41a, 0x0002, 0x0000);
+        else
+                rtl_w1w0_phy_ocp(tp, 0xbcc4, 0x0000, 0x0002);
+
+        rtl_w1w0_phy_ocp(tp, 0xa442, 0x000c, 0x0000);
+        rtl_w1w0_phy_ocp(tp, 0xa4b2, 0x0004, 0x0000);
+
+        r8168_phy_ocp_write(tp, 0xa436, 0x8012);
+        rtl_w1w0_phy_ocp(tp, 0xa438, 0x8000, 0x0000);
+
+        rtl_w1w0_phy_ocp(tp, 0xc422, 0x4000, 0x2000);
+}
+
 static void rtl8102e_hw_phy_config(struct rtl8169_private *tp)
 {
         static const struct phy_reg phy_reg_init[] = {
@@ -3256,8 +3464,6 @@ static void rtl8105e_hw_phy_config(struct rtl8169_private *tp)
 
 static void rtl8402_hw_phy_config(struct rtl8169_private *tp)
 {
-        void __iomem *ioaddr = tp->mmio_addr;
-
         /* Disable ALDPS before setting firmware */
         rtl_writephy(tp, 0x1f, 0x0000);
         rtl_writephy(tp, 0x18, 0x0310);
@@ -3266,13 +3472,35 @@ static void rtl8402_hw_phy_config(struct rtl8169_private *tp)
         rtl_apply_firmware(tp);
 
         /* EEE setting */
-        rtl_eri_write(ioaddr, 0x1b0, ERIAR_MASK_0011, 0x0000, ERIAR_EXGMAC);
+        rtl_eri_write(tp, 0x1b0, ERIAR_MASK_0011, 0x0000, ERIAR_EXGMAC);
         rtl_writephy(tp, 0x1f, 0x0004);
         rtl_writephy(tp, 0x10, 0x401f);
         rtl_writephy(tp, 0x19, 0x7030);
         rtl_writephy(tp, 0x1f, 0x0000);
 }
 
+static void rtl8106e_hw_phy_config(struct rtl8169_private *tp)
+{
+        static const struct phy_reg phy_reg_init[] = {
+                { 0x1f, 0x0004 },
+                { 0x10, 0xc07f },
+                { 0x19, 0x7030 },
+                { 0x1f, 0x0000 }
+        };
+
+        /* Disable ALDPS before ram code */
+        rtl_writephy(tp, 0x1f, 0x0000);
+        rtl_writephy(tp, 0x18, 0x0310);
+        msleep(100);
+
+        rtl_apply_firmware(tp);
+
+        rtl_eri_write(tp, 0x1b0, ERIAR_MASK_0011, 0x0000, ERIAR_EXGMAC);
+        rtl_writephy_batch(tp, phy_reg_init, ARRAY_SIZE(phy_reg_init));
+
+        rtl_eri_write(tp, 0x1d0, ERIAR_MASK_0011, 0x0000, ERIAR_EXGMAC);
+}
+
 static void rtl_hw_phy_config(struct net_device *dev)
 {
         struct rtl8169_private *tp = netdev_priv(dev);
@@ -3369,6 +3597,15 @@ static void rtl_hw_phy_config(struct net_device *dev)
                 rtl8411_hw_phy_config(tp);
                 break;
 
+        case RTL_GIGA_MAC_VER_39:
+                rtl8106e_hw_phy_config(tp);
+                break;
+
+        case RTL_GIGA_MAC_VER_40:
+                rtl8168g_1_hw_phy_config(tp);
+                break;
+
+        case RTL_GIGA_MAC_VER_41:
         default:
                 break;
         }
@@ -3426,18 +3663,16 @@ static void rtl8169_release_board(struct pci_dev *pdev, struct net_device *dev,
         free_netdev(dev);
 }
 
+DECLARE_RTL_COND(rtl_phy_reset_cond)
+{
+        return tp->phy_reset_pending(tp);
+}
+
 static void rtl8169_phy_reset(struct net_device *dev,
                               struct rtl8169_private *tp)
 {
-        unsigned int i;
-
         tp->phy_reset_enable(tp);
-        for (i = 0; i < 100; i++) {
-                if (!tp->phy_reset_pending(tp))
-                        return;
-                msleep(1);
-        }
-        netif_err(tp, link, dev, "PHY reset failed\n");
+        rtl_msleep_loop_wait_low(tp, &rtl_phy_reset_cond, 1, 100);
 }
 
 static bool rtl_tbi_enabled(struct rtl8169_private *tp)
@@ -3512,7 +3747,7 @@ static void rtl_rar_set(struct rtl8169_private *tp, u8 *addr)
                                                                 low  >> 16 },
                 };
 
-                rtl_write_exgmac_batch(ioaddr, e, ARRAY_SIZE(e));
+                rtl_write_exgmac_batch(tp, e, ARRAY_SIZE(e));
         }
 
         RTL_W8(Cfg9346, Cfg9346_Lock);
@@ -3589,6 +3824,11 @@ static void __devinit rtl_init_mdio_ops(struct rtl8169_private *tp)
                 ops->write      = r8168dp_2_mdio_write;
                 ops->read       = r8168dp_2_mdio_read;
                 break;
+        case RTL_GIGA_MAC_VER_40:
+        case RTL_GIGA_MAC_VER_41:
+                ops->write      = r8168g_mdio_write;
+                ops->read       = r8168g_mdio_read;
+                break;
         default:
                 ops->write      = r8169_mdio_write;
                 ops->read       = r8169_mdio_read;
@@ -3608,6 +3848,9 @@ static void rtl_wol_suspend_quirk(struct rtl8169_private *tp)
         case RTL_GIGA_MAC_VER_34:
         case RTL_GIGA_MAC_VER_37:
         case RTL_GIGA_MAC_VER_38:
+        case RTL_GIGA_MAC_VER_39:
+        case RTL_GIGA_MAC_VER_40:
+        case RTL_GIGA_MAC_VER_41:
                 RTL_W32(RxConfig, RTL_R32(RxConfig) |
                         AcceptBroadcast | AcceptMulticast | AcceptMyPhys);
                 break;
@@ -3761,7 +4004,7 @@ static void r8168_pll_power_down(struct rtl8169_private *tp)
 
         if (tp->mac_version == RTL_GIGA_MAC_VER_32 ||
             tp->mac_version == RTL_GIGA_MAC_VER_33)
-                rtl_ephy_write(ioaddr, 0x19, 0xff64);
+                rtl_ephy_write(tp, 0x19, 0xff64);
 
         if (rtl_wol_pll_power_down(tp))
                 return;
@@ -3830,6 +4073,7 @@ static void __devinit rtl_init_pll_power_ops(struct rtl8169_private *tp)
         case RTL_GIGA_MAC_VER_29:
         case RTL_GIGA_MAC_VER_30:
         case RTL_GIGA_MAC_VER_37:
+        case RTL_GIGA_MAC_VER_39:
                 ops->down       = r810x_pll_power_down;
                 ops->up         = r810x_pll_power_up;
                 break;
@@ -3855,6 +4099,8 @@ static void __devinit rtl_init_pll_power_ops(struct rtl8169_private *tp)
         case RTL_GIGA_MAC_VER_35:
         case RTL_GIGA_MAC_VER_36:
         case RTL_GIGA_MAC_VER_38:
+        case RTL_GIGA_MAC_VER_40:
+        case RTL_GIGA_MAC_VER_41:
                 ops->down       = r8168_pll_power_down;
                 ops->up         = r8168_pll_power_up;
                 break;
@@ -4051,6 +4297,8 @@ static void __devinit rtl_init_jumbo_ops(struct rtl8169_private *tp)
          * No action needed for jumbo frames with 8169.
          * No jumbo for 810x at all.
          */
+        case RTL_GIGA_MAC_VER_40:
+        case RTL_GIGA_MAC_VER_41:
         default:
                 ops->disable    = NULL;
                 ops->enable     = NULL;
@@ -4058,20 +4306,20 @@ static void __devinit rtl_init_jumbo_ops(struct rtl8169_private *tp)
         }
 }
 
+DECLARE_RTL_COND(rtl_chipcmd_cond)
+{
+        void __iomem *ioaddr = tp->mmio_addr;
+
+        return RTL_R8(ChipCmd) & CmdReset;
+}
+
 static void rtl_hw_reset(struct rtl8169_private *tp)
 {
         void __iomem *ioaddr = tp->mmio_addr;
-        int i;
 
-        /* Soft reset the chip. */
         RTL_W8(ChipCmd, CmdReset);
 
-        /* Check that the chip has finished the reset. */
-        for (i = 0; i < 100; i++) {
-                if ((RTL_R8(ChipCmd) & CmdReset) == 0)
-                        break;
-                udelay(100);
-        }
+        rtl_udelay_loop_wait_low(tp, &rtl_chipcmd_cond, 100, 100);
 }
 
 static void rtl_request_uncached_firmware(struct rtl8169_private *tp)
@@ -4125,6 +4373,20 @@ static void rtl_rx_close(struct rtl8169_private *tp)
         RTL_W32(RxConfig, RTL_R32(RxConfig) & ~RX_CONFIG_ACCEPT_MASK);
 }
 
+DECLARE_RTL_COND(rtl_npq_cond)
+{
+        void __iomem *ioaddr = tp->mmio_addr;
+
+        return RTL_R8(TxPoll) & NPQ;
+}
+
+DECLARE_RTL_COND(rtl_txcfg_empty_cond)
+{
+        void __iomem *ioaddr = tp->mmio_addr;
+
+        return RTL_R32(TxConfig) & TXCFG_EMPTY;
+}
+
 static void rtl8169_hw_reset(struct rtl8169_private *tp)
 {
         void __iomem *ioaddr = tp->mmio_addr;
@@ -4137,16 +4399,16 @@ static void rtl8169_hw_reset(struct rtl8169_private *tp)
         if (tp->mac_version == RTL_GIGA_MAC_VER_27 ||
             tp->mac_version == RTL_GIGA_MAC_VER_28 ||
             tp->mac_version == RTL_GIGA_MAC_VER_31) {
-                while (RTL_R8(TxPoll) & NPQ)
-                        udelay(20);
+                rtl_udelay_loop_wait_low(tp, &rtl_npq_cond, 20, 42*42);
         } else if (tp->mac_version == RTL_GIGA_MAC_VER_34 ||
                    tp->mac_version == RTL_GIGA_MAC_VER_35 ||
                    tp->mac_version == RTL_GIGA_MAC_VER_36 ||
                    tp->mac_version == RTL_GIGA_MAC_VER_37 ||
+                   tp->mac_version == RTL_GIGA_MAC_VER_40 ||
+                   tp->mac_version == RTL_GIGA_MAC_VER_41 ||
                    tp->mac_version == RTL_GIGA_MAC_VER_38) {
                 RTL_W8(ChipCmd, RTL_R8(ChipCmd) | StopReq);
-                while (!(RTL_R32(TxConfig) & TXCFG_EMPTY))
-                        udelay(100);
+                rtl_udelay_loop_wait_high(tp, &rtl_txcfg_empty_cond, 100, 666);
         } else {
                 RTL_W8(ChipCmd, RTL_R8(ChipCmd) | StopReq);
                 udelay(100);
@@ -4352,15 +4614,12 @@ static void rtl_hw_start_8169(struct net_device *dev)
 static void rtl_csi_write(struct rtl8169_private *tp, int addr, int value)
 {
         if (tp->csi_ops.write)
-                tp->csi_ops.write(tp->mmio_addr, addr, value);
+                tp->csi_ops.write(tp, addr, value);
 }
 
 static u32 rtl_csi_read(struct rtl8169_private *tp, int addr)
 {
-        if (tp->csi_ops.read)
-                return tp->csi_ops.read(tp->mmio_addr, addr);
-        else
-                return ~0;
+        return tp->csi_ops.read ? tp->csi_ops.read(tp, addr) : ~0;
 }
 
 static void rtl_csi_access_enable(struct rtl8169_private *tp, u32 bits)
@@ -4381,73 +4640,56 @@ static void rtl_csi_access_enable_2(struct rtl8169_private *tp)
         rtl_csi_access_enable(tp, 0x27000000);
 }
 
-static void r8169_csi_write(void __iomem *ioaddr, int addr, int value)
+DECLARE_RTL_COND(rtl_csiar_cond)
 {
-        unsigned int i;
+        void __iomem *ioaddr = tp->mmio_addr;
+
+        return RTL_R32(CSIAR) & CSIAR_FLAG;
+}
+
+static void r8169_csi_write(struct rtl8169_private *tp, int addr, int value)
+{
+        void __iomem *ioaddr = tp->mmio_addr;
 
         RTL_W32(CSIDR, value);
         RTL_W32(CSIAR, CSIAR_WRITE_CMD | (addr & CSIAR_ADDR_MASK) |
                 CSIAR_BYTE_ENABLE << CSIAR_BYTE_ENABLE_SHIFT);
 
-        for (i = 0; i < 100; i++) {
-                if (!(RTL_R32(CSIAR) & CSIAR_FLAG))
-                        break;
-                udelay(10);
-        }
+        rtl_udelay_loop_wait_low(tp, &rtl_csiar_cond, 10, 100);
 }
 
-static u32 r8169_csi_read(void __iomem *ioaddr, int addr)
+static u32 r8169_csi_read(struct rtl8169_private *tp, int addr)
 {
-        u32 value = ~0x00;
-        unsigned int i;
+        void __iomem *ioaddr = tp->mmio_addr;
 
         RTL_W32(CSIAR, (addr & CSIAR_ADDR_MASK) |
                 CSIAR_BYTE_ENABLE << CSIAR_BYTE_ENABLE_SHIFT);
 
-        for (i = 0; i < 100; i++) {
-                if (RTL_R32(CSIAR) & CSIAR_FLAG) {
-                        value = RTL_R32(CSIDR);
-                        break;
-                }
-                udelay(10);
-        }
-
-        return value;
+        return rtl_udelay_loop_wait_high(tp, &rtl_csiar_cond, 10, 100) ?
+                RTL_R32(CSIDR) : ~0;
 }
 
-static void r8402_csi_write(void __iomem *ioaddr, int addr, int value)
+static void r8402_csi_write(struct rtl8169_private *tp, int addr, int value)
 {
-        unsigned int i;
+        void __iomem *ioaddr = tp->mmio_addr;
 
         RTL_W32(CSIDR, value);
         RTL_W32(CSIAR, CSIAR_WRITE_CMD | (addr & CSIAR_ADDR_MASK) |
                 CSIAR_BYTE_ENABLE << CSIAR_BYTE_ENABLE_SHIFT |
                 CSIAR_FUNC_NIC);
 
-        for (i = 0; i < 100; i++) {
-                if (!(RTL_R32(CSIAR) & CSIAR_FLAG))
-                        break;
-                udelay(10);
-        }
+        rtl_udelay_loop_wait_low(tp, &rtl_csiar_cond, 10, 100);
 }
 
-static u32 r8402_csi_read(void __iomem *ioaddr, int addr)
+static u32 r8402_csi_read(struct rtl8169_private *tp, int addr)
 {
-        u32 value = ~0x00;
-        unsigned int i;
+        void __iomem *ioaddr = tp->mmio_addr;
 
         RTL_W32(CSIAR, (addr & CSIAR_ADDR_MASK) | CSIAR_FUNC_NIC |
                 CSIAR_BYTE_ENABLE << CSIAR_BYTE_ENABLE_SHIFT);
 
-        for (i = 0; i < 100; i++) {
-                if (RTL_R32(CSIAR) & CSIAR_FLAG) {
-                        value = RTL_R32(CSIDR);
-                        break;
-                }
-                udelay(10);
-        }
-
-        return value;
+        return rtl_udelay_loop_wait_high(tp, &rtl_csiar_cond, 10, 100) ?
+                RTL_R32(CSIDR) : ~0;
 }
 
 static void __devinit rtl_init_csi_ops(struct rtl8169_private *tp)
@@ -4492,13 +4734,14 @@ struct ephy_info {
         u16 bits;
 };
 
-static void rtl_ephy_init(void __iomem *ioaddr, const struct ephy_info *e, int len)
+static void rtl_ephy_init(struct rtl8169_private *tp, const struct ephy_info *e,
+                          int len)
 {
         u16 w;
 
         while (len-- > 0) {
-                w = (rtl_ephy_read(ioaddr, e->offset) & ~e->mask) | e->bits;
-                rtl_ephy_write(ioaddr, e->offset, w);
+                w = (rtl_ephy_read(tp, e->offset) & ~e->mask) | e->bits;
+                rtl_ephy_write(tp, e->offset, w);
                 e++;
         }
 }
@@ -4582,7 +4825,6 @@ static void __rtl_hw_start_8168cp(struct rtl8169_private *tp)
 
 static void rtl_hw_start_8168cp_1(struct rtl8169_private *tp)
 {
-        void __iomem *ioaddr = tp->mmio_addr;
         static const struct ephy_info e_info_8168cp[] = {
                 { 0x01, 0,      0x0001 },
                 { 0x02, 0x0800, 0x1000 },
@@ -4593,7 +4835,7 @@ static void rtl_hw_start_8168cp_1(struct rtl8169_private *tp)
 
         rtl_csi_access_enable_2(tp);
 
-        rtl_ephy_init(ioaddr, e_info_8168cp, ARRAY_SIZE(e_info_8168cp));
+        rtl_ephy_init(tp, e_info_8168cp, ARRAY_SIZE(e_info_8168cp));
 
         __rtl_hw_start_8168cp(tp);
 }
@@ -4644,14 +4886,13 @@ static void rtl_hw_start_8168c_1(struct rtl8169_private *tp)
 
         RTL_W8(DBG_REG, 0x06 | FIX_NAK_1 | FIX_NAK_2);
 
-        rtl_ephy_init(ioaddr, e_info_8168c_1, ARRAY_SIZE(e_info_8168c_1));
+        rtl_ephy_init(tp, e_info_8168c_1, ARRAY_SIZE(e_info_8168c_1));
 
         __rtl_hw_start_8168cp(tp);
 }
 
 static void rtl_hw_start_8168c_2(struct rtl8169_private *tp)
 {
-        void __iomem *ioaddr = tp->mmio_addr;
         static const struct ephy_info e_info_8168c_2[] = {
                 { 0x01, 0,      0x0001 },
                 { 0x03, 0x0400, 0x0220 }
@@ -4659,7 +4900,7 @@ static void rtl_hw_start_8168c_2(struct rtl8169_private *tp)
 
         rtl_csi_access_enable_2(tp);
 
-        rtl_ephy_init(ioaddr, e_info_8168c_2, ARRAY_SIZE(e_info_8168c_2));
+        rtl_ephy_init(tp, e_info_8168c_2, ARRAY_SIZE(e_info_8168c_2));
 
         __rtl_hw_start_8168cp(tp);
 }
@@ -4727,8 +4968,8 @@ static void rtl_hw_start_8168d_4(struct rtl8169_private *tp)
                 const struct ephy_info *e = e_info_8168d_4 + i;
                 u16 w;
 
-                w = rtl_ephy_read(ioaddr, e->offset);
-                rtl_ephy_write(ioaddr, 0x03, (w & e->mask) | e->bits);
+                w = rtl_ephy_read(tp, e->offset);
+                rtl_ephy_write(tp, 0x03, (w & e->mask) | e->bits);
         }
 
         rtl_enable_clock_request(pdev);
@@ -4756,7 +4997,7 @@ static void rtl_hw_start_8168e_1(struct rtl8169_private *tp)
 
         rtl_csi_access_enable_2(tp);
 
-        rtl_ephy_init(ioaddr, e_info_8168e_1, ARRAY_SIZE(e_info_8168e_1));
+        rtl_ephy_init(tp, e_info_8168e_1, ARRAY_SIZE(e_info_8168e_1));
 
         rtl_tx_performance_tweak(pdev, 0x5 << MAX_READ_REQUEST_SHIFT);
 
@@ -4782,19 +5023,18 @@ static void rtl_hw_start_8168e_2(struct rtl8169_private *tp)
 
         rtl_csi_access_enable_1(tp);
 
-        rtl_ephy_init(ioaddr, e_info_8168e_2, ARRAY_SIZE(e_info_8168e_2));
+        rtl_ephy_init(tp, e_info_8168e_2, ARRAY_SIZE(e_info_8168e_2));
 
         rtl_tx_performance_tweak(pdev, 0x5 << MAX_READ_REQUEST_SHIFT);
 
-        rtl_eri_write(ioaddr, 0xc0, ERIAR_MASK_0011, 0x0000, ERIAR_EXGMAC);
-        rtl_eri_write(ioaddr, 0xb8, ERIAR_MASK_0011, 0x0000, ERIAR_EXGMAC);
-        rtl_eri_write(ioaddr, 0xc8, ERIAR_MASK_1111, 0x00100002, ERIAR_EXGMAC);
-        rtl_eri_write(ioaddr, 0xe8, ERIAR_MASK_1111, 0x00100006, ERIAR_EXGMAC);
-        rtl_eri_write(ioaddr, 0xcc, ERIAR_MASK_1111, 0x00000050, ERIAR_EXGMAC);
-        rtl_eri_write(ioaddr, 0xd0, ERIAR_MASK_1111, 0x07ff0060, ERIAR_EXGMAC);
-        rtl_w1w0_eri(ioaddr, 0x1b0, ERIAR_MASK_0001, 0x10, 0x00, ERIAR_EXGMAC);
-        rtl_w1w0_eri(ioaddr, 0x0d4, ERIAR_MASK_0011, 0x0c00, 0xff00,
-                     ERIAR_EXGMAC);
+        rtl_eri_write(tp, 0xc0, ERIAR_MASK_0011, 0x0000, ERIAR_EXGMAC);
+        rtl_eri_write(tp, 0xb8, ERIAR_MASK_0011, 0x0000, ERIAR_EXGMAC);
+        rtl_eri_write(tp, 0xc8, ERIAR_MASK_1111, 0x00100002, ERIAR_EXGMAC);
+        rtl_eri_write(tp, 0xe8, ERIAR_MASK_1111, 0x00100006, ERIAR_EXGMAC);
+        rtl_eri_write(tp, 0xcc, ERIAR_MASK_1111, 0x00000050, ERIAR_EXGMAC);
+        rtl_eri_write(tp, 0xd0, ERIAR_MASK_1111, 0x07ff0060, ERIAR_EXGMAC);
+        rtl_w1w0_eri(tp, 0x1b0, ERIAR_MASK_0001, 0x10, 0x00, ERIAR_EXGMAC);
+        rtl_w1w0_eri(tp, 0x0d4, ERIAR_MASK_0011, 0x0c00, 0xff00, ERIAR_EXGMAC);
 
         RTL_W8(MaxTxPacketSize, EarlySize);
 
@@ -4820,16 +5060,16 @@ static void rtl_hw_start_8168f(struct rtl8169_private *tp)
 
         rtl_tx_performance_tweak(pdev, 0x5 << MAX_READ_REQUEST_SHIFT);
 
-        rtl_eri_write(ioaddr, 0xc0, ERIAR_MASK_0011, 0x0000, ERIAR_EXGMAC);
-        rtl_eri_write(ioaddr, 0xb8, ERIAR_MASK_0011, 0x0000, ERIAR_EXGMAC);
-        rtl_eri_write(ioaddr, 0xc8, ERIAR_MASK_1111, 0x00100002, ERIAR_EXGMAC);
-        rtl_eri_write(ioaddr, 0xe8, ERIAR_MASK_1111, 0x00100006, ERIAR_EXGMAC);
-        rtl_w1w0_eri(ioaddr, 0xdc, ERIAR_MASK_0001, 0x00, 0x01, ERIAR_EXGMAC);
-        rtl_w1w0_eri(ioaddr, 0xdc, ERIAR_MASK_0001, 0x01, 0x00, ERIAR_EXGMAC);
-        rtl_w1w0_eri(ioaddr, 0x1b0, ERIAR_MASK_0001, 0x10, 0x00, ERIAR_EXGMAC);
-        rtl_w1w0_eri(ioaddr, 0x1d0, ERIAR_MASK_0001, 0x10, 0x00, ERIAR_EXGMAC);
-        rtl_eri_write(ioaddr, 0xcc, ERIAR_MASK_1111, 0x00000050, ERIAR_EXGMAC);
-        rtl_eri_write(ioaddr, 0xd0, ERIAR_MASK_1111, 0x00000060, ERIAR_EXGMAC);
+        rtl_eri_write(tp, 0xc0, ERIAR_MASK_0011, 0x0000, ERIAR_EXGMAC);
+        rtl_eri_write(tp, 0xb8, ERIAR_MASK_0011, 0x0000, ERIAR_EXGMAC);
+        rtl_eri_write(tp, 0xc8, ERIAR_MASK_1111, 0x00100002, ERIAR_EXGMAC);
+        rtl_eri_write(tp, 0xe8, ERIAR_MASK_1111, 0x00100006, ERIAR_EXGMAC);
+        rtl_w1w0_eri(tp, 0xdc, ERIAR_MASK_0001, 0x00, 0x01, ERIAR_EXGMAC);
+        rtl_w1w0_eri(tp, 0xdc, ERIAR_MASK_0001, 0x01, 0x00, ERIAR_EXGMAC);
+        rtl_w1w0_eri(tp, 0x1b0, ERIAR_MASK_0001, 0x10, 0x00, ERIAR_EXGMAC);
+        rtl_w1w0_eri(tp, 0x1d0, ERIAR_MASK_0001, 0x10, 0x00, ERIAR_EXGMAC);
+        rtl_eri_write(tp, 0xcc, ERIAR_MASK_1111, 0x00000050, ERIAR_EXGMAC);
+        rtl_eri_write(tp, 0xd0, ERIAR_MASK_1111, 0x00000060, ERIAR_EXGMAC);
 
         RTL_W8(MaxTxPacketSize, EarlySize);
 
@@ -4854,10 +5094,9 @@ static void rtl_hw_start_8168f_1(struct rtl8169_private *tp)
 
         rtl_hw_start_8168f(tp);
 
-        rtl_ephy_init(ioaddr, e_info_8168f_1, ARRAY_SIZE(e_info_8168f_1));
+        rtl_ephy_init(tp, e_info_8168f_1, ARRAY_SIZE(e_info_8168f_1));
 
-        rtl_w1w0_eri(ioaddr, 0x0d4, ERIAR_MASK_0011, 0x0c00, 0xff00,
-                     ERIAR_EXGMAC);
+        rtl_w1w0_eri(tp, 0x0d4, ERIAR_MASK_0011, 0x0c00, 0xff00, ERIAR_EXGMAC);
 
         /* Adjust EEE LED frequency */
         RTL_W8(EEE_LED, RTL_R8(EEE_LED) & ~0x07);
@@ -4865,7 +5104,6 @@ static void rtl_hw_start_8168f_1(struct rtl8169_private *tp)
 
 static void rtl_hw_start_8411(struct rtl8169_private *tp)
 {
-        void __iomem *ioaddr = tp->mmio_addr;
         static const struct ephy_info e_info_8168f_1[] = {
                 { 0x06, 0x00c0, 0x0020 },
                 { 0x0f, 0xffff, 0x5200 },
@@ -4875,10 +5113,39 @@ static void rtl_hw_start_8411(struct rtl8169_private *tp)
 
         rtl_hw_start_8168f(tp);
 
-        rtl_ephy_init(ioaddr, e_info_8168f_1, ARRAY_SIZE(e_info_8168f_1));
+        rtl_ephy_init(tp, e_info_8168f_1, ARRAY_SIZE(e_info_8168f_1));
 
-        rtl_w1w0_eri(ioaddr, 0x0d4, ERIAR_MASK_0011, 0x0c00, 0x0000,
-                     ERIAR_EXGMAC);
+        rtl_w1w0_eri(tp, 0x0d4, ERIAR_MASK_0011, 0x0c00, 0x0000, ERIAR_EXGMAC);
+}
+
+static void rtl_hw_start_8168g_1(struct rtl8169_private *tp)
+{
+        void __iomem *ioaddr = tp->mmio_addr;
+        struct pci_dev *pdev = tp->pci_dev;
+
+        rtl_eri_write(tp, 0xc8, ERIAR_MASK_0101, 0x080002, ERIAR_EXGMAC);
+        rtl_eri_write(tp, 0xcc, ERIAR_MASK_0001, 0x38, ERIAR_EXGMAC);
+        rtl_eri_write(tp, 0xd0, ERIAR_MASK_0001, 0x48, ERIAR_EXGMAC);
+        rtl_eri_write(tp, 0xe8, ERIAR_MASK_1111, 0x00100006, ERIAR_EXGMAC);
+
+        rtl_csi_access_enable_1(tp);
+
+        rtl_tx_performance_tweak(pdev, 0x5 << MAX_READ_REQUEST_SHIFT);
+
+        rtl_w1w0_eri(tp, 0xdc, ERIAR_MASK_0001, 0x00, 0x01, ERIAR_EXGMAC);
+        rtl_w1w0_eri(tp, 0xdc, ERIAR_MASK_0001, 0x01, 0x00, ERIAR_EXGMAC);
+
+        RTL_W8(ChipCmd, CmdTxEnb | CmdRxEnb);
+        RTL_W32(MISC, RTL_R32(MISC) & ~RXDV_GATED_EN);
+        RTL_W8(MaxTxPacketSize, EarlySize);
+
+        rtl_eri_write(tp, 0xc0, ERIAR_MASK_0011, 0x0000, ERIAR_EXGMAC);
+        rtl_eri_write(tp, 0xb8, ERIAR_MASK_0011, 0x0000, ERIAR_EXGMAC);
+
+        /* Adjust EEE LED frequency */
+        RTL_W8(EEE_LED, RTL_R8(EEE_LED) & ~0x07);
+
+        rtl_w1w0_eri(tp, 0x2fc, ERIAR_MASK_0001, 0x01, 0x02, ERIAR_EXGMAC);
 }
 
 static void rtl_hw_start_8168(struct net_device *dev)
@@ -4982,6 +5249,11 @@ static void rtl_hw_start_8168(struct net_device *dev)
                 rtl_hw_start_8411(tp);
                 break;
 
+        case RTL_GIGA_MAC_VER_40:
+        case RTL_GIGA_MAC_VER_41:
+                rtl_hw_start_8168g_1(tp);
+                break;
+
         default:
                 printk(KERN_ERR PFX "%s: unknown chipset (mac_version = %d).\n",
                         dev->name, tp->mac_version);
@@ -5036,7 +5308,7 @@ static void rtl_hw_start_8102e_1(struct rtl8169_private *tp)
         if ((cfg1 & LEDS0) && (cfg1 & LEDS1))
                 RTL_W8(Config1, cfg1 & ~LEDS0);
 
-        rtl_ephy_init(ioaddr, e_info_8102e_1, ARRAY_SIZE(e_info_8102e_1));
+        rtl_ephy_init(tp, e_info_8102e_1, ARRAY_SIZE(e_info_8102e_1));
 }
 
 static void rtl_hw_start_8102e_2(struct rtl8169_private *tp)
@@ -5056,7 +5328,7 @@ static void rtl_hw_start_8102e_3(struct rtl8169_private *tp)
 {
         rtl_hw_start_8102e_2(tp);
 
-        rtl_ephy_write(tp->mmio_addr, 0x03, 0xc2f9);
+        rtl_ephy_write(tp, 0x03, 0xc2f9);
 }
 
 static void rtl_hw_start_8105e_1(struct rtl8169_private *tp)
@@ -5082,15 +5354,13 @@ static void rtl_hw_start_8105e_1(struct rtl8169_private *tp)
         RTL_W8(MCU, RTL_R8(MCU) | EN_NDP | EN_OOB_RESET);
         RTL_W8(DLLPR, RTL_R8(DLLPR) | PFM_EN);
 
-        rtl_ephy_init(ioaddr, e_info_8105e_1, ARRAY_SIZE(e_info_8105e_1));
+        rtl_ephy_init(tp, e_info_8105e_1, ARRAY_SIZE(e_info_8105e_1));
 }
 
 static void rtl_hw_start_8105e_2(struct rtl8169_private *tp)
 {
-        void __iomem *ioaddr = tp->mmio_addr;
-
         rtl_hw_start_8105e_1(tp);
-        rtl_ephy_write(ioaddr, 0x1e, rtl_ephy_read(ioaddr, 0x1e) | 0x8000);
+        rtl_ephy_write(tp, 0x1e, rtl_ephy_read(tp, 0x1e) | 0x8000);
 }
 
 static void rtl_hw_start_8402(struct rtl8169_private *tp)
@@ -5109,18 +5379,29 @@ static void rtl_hw_start_8402(struct rtl8169_private *tp)
         RTL_W32(TxConfig, RTL_R32(TxConfig) | TXCFG_AUTO_FIFO);
         RTL_W8(MCU, RTL_R8(MCU) & ~NOW_IS_OOB);
 
-        rtl_ephy_init(ioaddr, e_info_8402, ARRAY_SIZE(e_info_8402));
+        rtl_ephy_init(tp, e_info_8402, ARRAY_SIZE(e_info_8402));
 
         rtl_tx_performance_tweak(tp->pci_dev, 0x5 << MAX_READ_REQUEST_SHIFT);
 
-        rtl_eri_write(ioaddr, 0xc8, ERIAR_MASK_1111, 0x00000002, ERIAR_EXGMAC);
-        rtl_eri_write(ioaddr, 0xe8, ERIAR_MASK_1111, 0x00000006, ERIAR_EXGMAC);
-        rtl_w1w0_eri(ioaddr, 0xdc, ERIAR_MASK_0001, 0x00, 0x01, ERIAR_EXGMAC);
-        rtl_w1w0_eri(ioaddr, 0xdc, ERIAR_MASK_0001, 0x01, 0x00, ERIAR_EXGMAC);
-        rtl_eri_write(ioaddr, 0xc0, ERIAR_MASK_0011, 0x0000, ERIAR_EXGMAC);
-        rtl_eri_write(ioaddr, 0xb8, ERIAR_MASK_0011, 0x0000, ERIAR_EXGMAC);
-        rtl_w1w0_eri(ioaddr, 0x0d4, ERIAR_MASK_0011, 0x0e00, 0xff00,
-                     ERIAR_EXGMAC);
+        rtl_eri_write(tp, 0xc8, ERIAR_MASK_1111, 0x00000002, ERIAR_EXGMAC);
+        rtl_eri_write(tp, 0xe8, ERIAR_MASK_1111, 0x00000006, ERIAR_EXGMAC);
+        rtl_w1w0_eri(tp, 0xdc, ERIAR_MASK_0001, 0x00, 0x01, ERIAR_EXGMAC);
+        rtl_w1w0_eri(tp, 0xdc, ERIAR_MASK_0001, 0x01, 0x00, ERIAR_EXGMAC);
+        rtl_eri_write(tp, 0xc0, ERIAR_MASK_0011, 0x0000, ERIAR_EXGMAC);
+        rtl_eri_write(tp, 0xb8, ERIAR_MASK_0011, 0x0000, ERIAR_EXGMAC);
+        rtl_w1w0_eri(tp, 0x0d4, ERIAR_MASK_0011, 0x0e00, 0xff00, ERIAR_EXGMAC);
+}
+
+static void rtl_hw_start_8106(struct rtl8169_private *tp)
+{
+        void __iomem *ioaddr = tp->mmio_addr;
+
+        /* Force LAN exit from ASPM if Rx/Tx are not idle */
+        RTL_W32(FuncEvent, RTL_R32(FuncEvent) | 0x002800);
+
+        RTL_W32(MISC, (RTL_R32(MISC) | DISABLE_LAN_EN) & ~EARLY_TALLY_EN);
+        RTL_W8(MCU, RTL_R8(MCU) | EN_NDP | EN_OOB_RESET);
+        RTL_W8(DLLPR, RTL_R8(DLLPR) & ~PFM_EN);
 }
 
 static void rtl_hw_start_8101(struct net_device *dev)
@@ -5167,6 +5448,10 @@ static void rtl_hw_start_8101(struct net_device *dev)
         case RTL_GIGA_MAC_VER_37:
                 rtl_hw_start_8402(tp);
                 break;
+
+        case RTL_GIGA_MAC_VER_39:
+                rtl_hw_start_8106(tp);
+                break;
         }
 
         RTL_W8(Cfg9346, Cfg9346_Lock);
@@ -6435,6 +6720,67 @@ static unsigned rtl_try_msi(struct rtl8169_private *tp,
         return msi;
 }
 
+DECLARE_RTL_COND(rtl_link_list_ready_cond)
+{
+        void __iomem *ioaddr = tp->mmio_addr;
+
+        return RTL_R8(MCU) & LINK_LIST_RDY;
+}
+
+DECLARE_RTL_COND(rtl_rxtx_empty_cond)
+{
+        void __iomem *ioaddr = tp->mmio_addr;
+
+        return (RTL_R8(MCU) & RXTX_EMPTY) == RXTX_EMPTY;
+}
+
+static void __devinit rtl_hw_init_8168g(struct rtl8169_private *tp)
+{
+        void __iomem *ioaddr = tp->mmio_addr;
+        u32 data;
+
+        tp->ocp_base = OCP_STD_PHY_BASE;
+
+        RTL_W32(MISC, RTL_R32(MISC) | RXDV_GATED_EN);
+
+        if (!rtl_udelay_loop_wait_high(tp, &rtl_txcfg_empty_cond, 100, 42))
+                return;
+
+        if (!rtl_udelay_loop_wait_high(tp, &rtl_rxtx_empty_cond, 100, 42))
+                return;
+
+        RTL_W8(ChipCmd, RTL_R8(ChipCmd) & ~(CmdTxEnb | CmdRxEnb));
+        msleep(1);
+        RTL_W8(MCU, RTL_R8(MCU) & ~NOW_IS_OOB);
+
+        data = r8168_mac_ocp_read(ioaddr, 0xe8de);
+        data &= ~(1 << 14);
+        r8168_mac_ocp_write(tp, 0xe8de, data);
+
+        if (!rtl_udelay_loop_wait_high(tp, &rtl_link_list_ready_cond, 100, 42))
+                return;
+
+        data = r8168_mac_ocp_read(ioaddr, 0xe8de);
+        data |= (1 << 15);
+        r8168_mac_ocp_write(tp, 0xe8de, data);
+
+        if (!rtl_udelay_loop_wait_high(tp, &rtl_link_list_ready_cond, 100, 42))
+                return;
+}
+
+static void __devinit rtl_hw_initialize(struct rtl8169_private *tp)
+{
+        switch (tp->mac_version) {
+        case RTL_GIGA_MAC_VER_40:
+        case RTL_GIGA_MAC_VER_41:
+                rtl_hw_init_8168g(tp);
+                break;
+
+        default:
+                break;
+        }
+}
+
 static int __devinit
 rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
 {
@@ -6544,6 +6890,8 @@ rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
 
         rtl_irq_disable(tp);
 
+        rtl_hw_initialize(tp);
+
         rtl_hw_reset(tp);
 
         rtl_ack_events(tp, 0xffff);
diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c
index 79bf09b4197..af0b867a6cf 100644
--- a/drivers/net/ethernet/renesas/sh_eth.c
+++ b/drivers/net/ethernet/renesas/sh_eth.c
@@ -49,6 +49,34 @@
                 NETIF_MSG_RX_ERR| \
                 NETIF_MSG_TX_ERR)
 
+#if defined(CONFIG_CPU_SUBTYPE_SH7734) || \
+        defined(CONFIG_CPU_SUBTYPE_SH7763) || \
+        defined(CONFIG_ARCH_R8A7740)
+static void sh_eth_select_mii(struct net_device *ndev)
+{
+        u32 value = 0x0;
+        struct sh_eth_private *mdp = netdev_priv(ndev);
+
+        switch (mdp->phy_interface) {
+        case PHY_INTERFACE_MODE_GMII:
+                value = 0x2;
+                break;
+        case PHY_INTERFACE_MODE_MII:
+                value = 0x1;
+                break;
+        case PHY_INTERFACE_MODE_RMII:
+                value = 0x0;
+                break;
+        default:
+                pr_warn("PHY interface mode was not setup. Set to MII.\n");
+                value = 0x1;
+                break;
+        }
+
+        sh_eth_write(ndev, value, RMII_MII);
+}
+#endif
+
 /* There is CPU dependent code */
 #if defined(CONFIG_CPU_SUBTYPE_SH7724)
 #define SH_ETH_RESET_DEFAULT    1
@@ -102,6 +130,8 @@ static struct sh_eth_cpu_data sh_eth_my_cpu_data = {
 #elif defined(CONFIG_CPU_SUBTYPE_SH7757)
 #define SH_ETH_HAS_BOTH_MODULES 1
 #define SH_ETH_HAS_TSU  1
+static int sh_eth_check_reset(struct net_device *ndev);
+
 static void sh_eth_set_duplex(struct net_device *ndev)
 {
         struct sh_eth_private *mdp = netdev_priv(ndev);
@@ -176,23 +206,19 @@ static void sh_eth_chip_reset_giga(struct net_device *ndev)
 }
 
 static int sh_eth_is_gether(struct sh_eth_private *mdp);
-static void sh_eth_reset(struct net_device *ndev)
+static int sh_eth_reset(struct net_device *ndev)
 {
         struct sh_eth_private *mdp = netdev_priv(ndev);
-        int cnt = 100;
+        int ret = 0;
 
         if (sh_eth_is_gether(mdp)) {
                 sh_eth_write(ndev, 0x03, EDSR);
                 sh_eth_write(ndev, sh_eth_read(ndev, EDMR) | EDMR_SRST_GETHER,
                                 EDMR);
-                while (cnt > 0) {
-                        if (!(sh_eth_read(ndev, EDMR) & 0x3))
-                                break;
-                        mdelay(1);
-                        cnt--;
-                }
-                if (cnt < 0)
-                        printk(KERN_ERR "Device reset fail\n");
+
+                ret = sh_eth_check_reset(ndev);
+                if (ret)
+                        goto out;
 
                 /* Table Init */
                 sh_eth_write(ndev, 0x0, TDLAR);
@@ -210,6 +236,9 @@ static void sh_eth_reset(struct net_device *ndev)
                 sh_eth_write(ndev, sh_eth_read(ndev, EDMR) & ~EDMR_SRST_ETHER,
                                 EDMR);
         }
+
+out:
+        return ret;
 }
 
 static void sh_eth_set_duplex_giga(struct net_device *ndev)
@@ -282,7 +311,9 @@ static struct sh_eth_cpu_data *sh_eth_get_cpu_data(struct sh_eth_private *mdp)
 
 #elif defined(CONFIG_CPU_SUBTYPE_SH7734) || defined(CONFIG_CPU_SUBTYPE_SH7763)
 #define SH_ETH_HAS_TSU  1
+static int sh_eth_check_reset(struct net_device *ndev);
 static void sh_eth_reset_hw_crc(struct net_device *ndev);
+
 static void sh_eth_chip_reset(struct net_device *ndev)
 {
         struct sh_eth_private *mdp = netdev_priv(ndev);
@@ -292,35 +323,6 @@ static void sh_eth_chip_reset(struct net_device *ndev)
         mdelay(1);
 }
 
-static void sh_eth_reset(struct net_device *ndev)
-{
-        int cnt = 100;
-
-        sh_eth_write(ndev, EDSR_ENALL, EDSR);
-        sh_eth_write(ndev, sh_eth_read(ndev, EDMR) | EDMR_SRST_GETHER, EDMR);
-        while (cnt > 0) {
-                if (!(sh_eth_read(ndev, EDMR) & 0x3))
-                        break;
-                mdelay(1);
-                cnt--;
-        }
-        if (cnt == 0)
-                printk(KERN_ERR "Device reset fail\n");
-
-        /* Table Init */
-        sh_eth_write(ndev, 0x0, TDLAR);
-        sh_eth_write(ndev, 0x0, TDFAR);
-        sh_eth_write(ndev, 0x0, TDFXR);
-        sh_eth_write(ndev, 0x0, TDFFR);
-        sh_eth_write(ndev, 0x0, RDLAR);
-        sh_eth_write(ndev, 0x0, RDFAR);
-        sh_eth_write(ndev, 0x0, RDFXR);
-        sh_eth_write(ndev, 0x0, RDFFR);
-
-        /* Reset HW CRC register */
-        sh_eth_reset_hw_crc(ndev);
-}
-
 static void sh_eth_set_duplex(struct net_device *ndev)
 {
         struct sh_eth_private *mdp = netdev_priv(ndev);
@@ -377,9 +379,41 @@ static struct sh_eth_cpu_data sh_eth_my_cpu_data = {
         .tsu            = 1,
 #if defined(CONFIG_CPU_SUBTYPE_SH7734)
         .hw_crc     = 1,
+        .select_mii = 1,
 #endif
 };
 
+static int sh_eth_reset(struct net_device *ndev)
+{
+        int ret = 0;
+
+        sh_eth_write(ndev, EDSR_ENALL, EDSR);
+        sh_eth_write(ndev, sh_eth_read(ndev, EDMR) | EDMR_SRST_GETHER, EDMR);
+
+        ret = sh_eth_check_reset(ndev);
+        if (ret)
+                goto out;
+
+        /* Table Init */
+        sh_eth_write(ndev, 0x0, TDLAR);
+        sh_eth_write(ndev, 0x0, TDFAR);
+        sh_eth_write(ndev, 0x0, TDFXR);
+        sh_eth_write(ndev, 0x0, TDFFR);
+        sh_eth_write(ndev, 0x0, RDLAR);
+        sh_eth_write(ndev, 0x0, RDFAR);
+        sh_eth_write(ndev, 0x0, RDFXR);
+        sh_eth_write(ndev, 0x0, RDFFR);
+
+        /* Reset HW CRC register */
+        sh_eth_reset_hw_crc(ndev);
+
+        /* Select MII mode */
+        if (sh_eth_my_cpu_data.select_mii)
+                sh_eth_select_mii(ndev);
+out:
+        return ret;
+}
+
 static void sh_eth_reset_hw_crc(struct net_device *ndev)
 {
         if (sh_eth_my_cpu_data.hw_crc)
@@ -388,44 +422,29 @@ static void sh_eth_reset_hw_crc(struct net_device *ndev)
 
 #elif defined(CONFIG_ARCH_R8A7740)
 #define SH_ETH_HAS_TSU  1
+static int sh_eth_check_reset(struct net_device *ndev);
+
 static void sh_eth_chip_reset(struct net_device *ndev)
 {
         struct sh_eth_private *mdp = netdev_priv(ndev);
-        unsigned long mii;
 
         /* reset device */
         sh_eth_tsu_write(mdp, ARSTR_ARSTR, ARSTR);
         mdelay(1);
 
-        switch (mdp->phy_interface) {
-        case PHY_INTERFACE_MODE_GMII:
-                mii = 2;
-                break;
-        case PHY_INTERFACE_MODE_MII:
-                mii = 1;
-                break;
-        case PHY_INTERFACE_MODE_RMII:
-        default:
-                mii = 0;
-                break;
-        }
-        sh_eth_write(ndev, mii, RMII_MII);
+        sh_eth_select_mii(ndev);
 }
 
-static void sh_eth_reset(struct net_device *ndev)
+static int sh_eth_reset(struct net_device *ndev)
 {
-        int cnt = 100;
+        int ret = 0;
 
         sh_eth_write(ndev, EDSR_ENALL, EDSR);
         sh_eth_write(ndev, sh_eth_read(ndev, EDMR) | EDMR_SRST_GETHER, EDMR);
-        while (cnt > 0) {
-                if (!(sh_eth_read(ndev, EDMR) & 0x3))
-                        break;
-                mdelay(1);
-                cnt--;
-        }
-        if (cnt == 0)
-                printk(KERN_ERR "Device reset fail\n");
+
+        ret = sh_eth_check_reset(ndev);
+        if (ret)
+                goto out;
 
         /* Table Init */
         sh_eth_write(ndev, 0x0, TDLAR);
@@ -436,6 +455,9 @@ static void sh_eth_reset(struct net_device *ndev)
         sh_eth_write(ndev, 0x0, RDFAR);
         sh_eth_write(ndev, 0x0, RDFXR);
         sh_eth_write(ndev, 0x0, RDFFR);
+
+out:
+        return ret;
 }
 
 static void sh_eth_set_duplex(struct net_device *ndev)
@@ -492,6 +514,7 @@ static struct sh_eth_cpu_data sh_eth_my_cpu_data = {
         .no_trimd       = 1,
         .no_ade         = 1,
         .tsu            = 1,
+        .select_mii     = 1,
 };
 
 #elif defined(CONFIG_CPU_SUBTYPE_SH7619)
@@ -543,11 +566,31 @@ static void sh_eth_set_default_cpu_data(struct sh_eth_cpu_data *cd)
 
 #if defined(SH_ETH_RESET_DEFAULT)
 /* Chip Reset */
-static void sh_eth_reset(struct net_device *ndev)
+static int  sh_eth_reset(struct net_device *ndev)
 {
         sh_eth_write(ndev, sh_eth_read(ndev, EDMR) | EDMR_SRST_ETHER, EDMR);
         mdelay(3);
         sh_eth_write(ndev, sh_eth_read(ndev, EDMR) & ~EDMR_SRST_ETHER, EDMR);
+
+        return 0;
+}
+#else
+static int sh_eth_check_reset(struct net_device *ndev)
+{
+        int ret = 0;
+        int cnt = 100;
+
+        while (cnt > 0) {
+                if (!(sh_eth_read(ndev, EDMR) & 0x3))
+                        break;
+                mdelay(1);
+                cnt--;
+        }
+        if (cnt < 0) {
+                printk(KERN_ERR "Device reset fail\n");
+                ret = -ETIMEDOUT;
+        }
+        return ret;
 }
 #endif
 
@@ -739,21 +782,23 @@ static void sh_eth_ring_free(struct net_device *ndev)
 
         /* Free Rx skb ringbuffer */
         if (mdp->rx_skbuff) {
-                for (i = 0; i < RX_RING_SIZE; i++) {
+                for (i = 0; i < mdp->num_rx_ring; i++) {
                         if (mdp->rx_skbuff[i])
                                 dev_kfree_skb(mdp->rx_skbuff[i]);
                 }
         }
         kfree(mdp->rx_skbuff);
+        mdp->rx_skbuff = NULL;
 
         /* Free Tx skb ringbuffer */
         if (mdp->tx_skbuff) {
-                for (i = 0; i < TX_RING_SIZE; i++) {
+                for (i = 0; i < mdp->num_tx_ring; i++) {
                         if (mdp->tx_skbuff[i])
                                 dev_kfree_skb(mdp->tx_skbuff[i]);
                 }
         }
         kfree(mdp->tx_skbuff);
+        mdp->tx_skbuff = NULL;
 }
 
 /* format skb and descriptor buffer */
@@ -764,8 +809,8 @@ static void sh_eth_ring_format(struct net_device *ndev)
         struct sk_buff *skb;
         struct sh_eth_rxdesc *rxdesc = NULL;
         struct sh_eth_txdesc *txdesc = NULL;
-        int rx_ringsize = sizeof(*rxdesc) * RX_RING_SIZE;
-        int tx_ringsize = sizeof(*txdesc) * TX_RING_SIZE;
+        int rx_ringsize = sizeof(*rxdesc) * mdp->num_rx_ring;
+        int tx_ringsize = sizeof(*txdesc) * mdp->num_tx_ring;
 
         mdp->cur_rx = mdp->cur_tx = 0;
         mdp->dirty_rx = mdp->dirty_tx = 0;
@@ -773,7 +818,7 @@ static void sh_eth_ring_format(struct net_device *ndev)
         memset(mdp->rx_ring, 0, rx_ringsize);
 
         /* build Rx ring buffer */
-        for (i = 0; i < RX_RING_SIZE; i++) {
+        for (i = 0; i < mdp->num_rx_ring; i++) {
                 /* skb */
                 mdp->rx_skbuff[i] = NULL;
                 skb = netdev_alloc_skb(ndev, mdp->rx_buf_sz);
@@ -799,7 +844,7 @@ static void sh_eth_ring_format(struct net_device *ndev)
                 }
         }
 
-        mdp->dirty_rx = (u32) (i - RX_RING_SIZE);
+        mdp->dirty_rx = (u32) (i - mdp->num_rx_ring);
 
         /* Mark the last entry as wrapping the ring. */
         rxdesc->status |= cpu_to_edmac(mdp, RD_RDEL);
@@ -807,7 +852,7 @@ static void sh_eth_ring_format(struct net_device *ndev)
         memset(mdp->tx_ring, 0, tx_ringsize);
 
         /* build Tx ring buffer */
-        for (i = 0; i < TX_RING_SIZE; i++) {
+        for (i = 0; i < mdp->num_tx_ring; i++) {
                 mdp->tx_skbuff[i] = NULL;
                 txdesc = &mdp->tx_ring[i];
                 txdesc->status = cpu_to_edmac(mdp, TD_TFP);
@@ -841,7 +886,7 @@ static int sh_eth_ring_init(struct net_device *ndev)
                 mdp->rx_buf_sz += NET_IP_ALIGN;
 
         /* Allocate RX and TX skb rings */
-        mdp->rx_skbuff = kmalloc(sizeof(*mdp->rx_skbuff) * RX_RING_SIZE,
+        mdp->rx_skbuff = kmalloc(sizeof(*mdp->rx_skbuff) * mdp->num_rx_ring,
                                 GFP_KERNEL);
         if (!mdp->rx_skbuff) {
                 dev_err(&ndev->dev, "Cannot allocate Rx skb\n");
@@ -849,7 +894,7 @@ static int sh_eth_ring_init(struct net_device *ndev)
                 return ret;
         }
 
-        mdp->tx_skbuff = kmalloc(sizeof(*mdp->tx_skbuff) * TX_RING_SIZE,
+        mdp->tx_skbuff = kmalloc(sizeof(*mdp->tx_skbuff) * mdp->num_tx_ring,
                                 GFP_KERNEL);
         if (!mdp->tx_skbuff) {
                 dev_err(&ndev->dev, "Cannot allocate Tx skb\n");
@@ -858,7 +903,7 @@ static int sh_eth_ring_init(struct net_device *ndev)
         }
 
         /* Allocate all Rx descriptors. */
-        rx_ringsize = sizeof(struct sh_eth_rxdesc) * RX_RING_SIZE;
+        rx_ringsize = sizeof(struct sh_eth_rxdesc) * mdp->num_rx_ring;
         mdp->rx_ring = dma_alloc_coherent(NULL, rx_ringsize, &mdp->rx_desc_dma,
                         GFP_KERNEL);
 
@@ -872,7 +917,7 @@ static int sh_eth_ring_init(struct net_device *ndev)
         mdp->dirty_rx = 0;
 
         /* Allocate all Tx descriptors. */
-        tx_ringsize = sizeof(struct sh_eth_txdesc) * TX_RING_SIZE;
+        tx_ringsize = sizeof(struct sh_eth_txdesc) * mdp->num_tx_ring;
         mdp->tx_ring = dma_alloc_coherent(NULL, tx_ringsize, &mdp->tx_desc_dma,
                         GFP_KERNEL);
         if (!mdp->tx_ring) {
@@ -890,19 +935,41 @@ desc_ring_free:
 skb_ring_free:
         /* Free Rx and Tx skb ring buffer */
         sh_eth_ring_free(ndev);
+        mdp->tx_ring = NULL;
+        mdp->rx_ring = NULL;
 
         return ret;
 }
 
-static int sh_eth_dev_init(struct net_device *ndev)
+static void sh_eth_free_dma_buffer(struct sh_eth_private *mdp)
+{
+        int ringsize;
+
+        if (mdp->rx_ring) {
+                ringsize = sizeof(struct sh_eth_rxdesc) * mdp->num_rx_ring;
+                dma_free_coherent(NULL, ringsize, mdp->rx_ring,
+                                  mdp->rx_desc_dma);
+                mdp->rx_ring = NULL;
+        }
+
+        if (mdp->tx_ring) {
+                ringsize = sizeof(struct sh_eth_txdesc) * mdp->num_tx_ring;
+                dma_free_coherent(NULL, ringsize, mdp->tx_ring,
+                                  mdp->tx_desc_dma);
+                mdp->tx_ring = NULL;
+        }
+}
+
+static int sh_eth_dev_init(struct net_device *ndev, bool start)
 {
         int ret = 0;
         struct sh_eth_private *mdp = netdev_priv(ndev);
-        u_int32_t rx_int_var, tx_int_var;
         u32 val;
 
         /* Soft Reset */
-        sh_eth_reset(ndev);
+        ret = sh_eth_reset(ndev);
+        if (ret)
+                goto out;
 
         /* Descriptor format */
         sh_eth_ring_format(ndev);
@@ -926,9 +993,7 @@ static int sh_eth_dev_init(struct net_device *ndev)
         /* Frame recv control */
         sh_eth_write(ndev, mdp->cd->rmcr_value, RMCR);
 
-        rx_int_var = mdp->rx_int_var = DESC_I_RINT8 | DESC_I_RINT5;
-        tx_int_var = mdp->tx_int_var = DESC_I_TINT2;
-        sh_eth_write(ndev, rx_int_var | tx_int_var, TRSCER);
+        sh_eth_write(ndev, DESC_I_RINT8 | DESC_I_RINT5 | DESC_I_TINT2, TRSCER);
 
         if (mdp->cd->bculr)
                 sh_eth_write(ndev, 0x800, BCULR);       /* Burst sycle set */
@@ -943,7 +1008,8 @@ static int sh_eth_dev_init(struct net_device *ndev)
                      RFLR);
 
         sh_eth_write(ndev, sh_eth_read(ndev, EESR), EESR);
-        sh_eth_write(ndev, mdp->cd->eesipr_value, EESIPR);
+        if (start)
+                sh_eth_write(ndev, mdp->cd->eesipr_value, EESIPR);
 
         /* PAUSE Prohibition */
         val = (sh_eth_read(ndev, ECMR) & ECMR_DM) |
@@ -958,7 +1024,8 @@ static int sh_eth_dev_init(struct net_device *ndev)
         sh_eth_write(ndev, mdp->cd->ecsr_value, ECSR);
 
         /* E-MAC Interrupt Enable register */
-        sh_eth_write(ndev, mdp->cd->ecsipr_value, ECSIPR);
+        if (start)
+                sh_eth_write(ndev, mdp->cd->ecsipr_value, ECSIPR);
 
         /* Set MAC address */
         update_mac_address(ndev);
@@ -971,11 +1038,14 @@ static int sh_eth_dev_init(struct net_device *ndev)
         if (mdp->cd->tpauser)
                 sh_eth_write(ndev, TPAUSER_UNLIMITED, TPAUSER);
 
-        /* Setting the Rx mode will start the Rx process. */
-        sh_eth_write(ndev, EDRRR_R, EDRRR);
+        if (start) {
+                /* Setting the Rx mode will start the Rx process. */
+                sh_eth_write(ndev, EDRRR_R, EDRRR);
 
-        netif_start_queue(ndev);
+                netif_start_queue(ndev);
+        }
 
+out:
         return ret;
 }
 
@@ -988,7 +1058,7 @@ static int sh_eth_txfree(struct net_device *ndev)
         int entry = 0;
 
         for (; mdp->cur_tx - mdp->dirty_tx > 0; mdp->dirty_tx++) {
-                entry = mdp->dirty_tx % TX_RING_SIZE;
+                entry = mdp->dirty_tx % mdp->num_tx_ring;
                 txdesc = &mdp->tx_ring[entry];
                 if (txdesc->status & cpu_to_edmac(mdp, TD_TACT))
                         break;
@@ -1001,7 +1071,7 @@ static int sh_eth_txfree(struct net_device *ndev)
                         freeNum++;
                 }
                 txdesc->status = cpu_to_edmac(mdp, TD_TFP);
-                if (entry >= TX_RING_SIZE - 1)
+                if (entry >= mdp->num_tx_ring - 1)
                         txdesc->status |= cpu_to_edmac(mdp, TD_TDLE);
 
                 ndev->stats.tx_packets++;
@@ -1016,8 +1086,8 @@ static int sh_eth_rx(struct net_device *ndev, u32 intr_status)
         struct sh_eth_private *mdp = netdev_priv(ndev);
         struct sh_eth_rxdesc *rxdesc;
 
-        int entry = mdp->cur_rx % RX_RING_SIZE;
-        int boguscnt = (mdp->dirty_rx + RX_RING_SIZE) - mdp->cur_rx;
+        int entry = mdp->cur_rx % mdp->num_rx_ring;
+        int boguscnt = (mdp->dirty_rx + mdp->num_rx_ring) - mdp->cur_rx;
         struct sk_buff *skb;
         u16 pkt_len = 0;
         u32 desc_status;
@@ -1068,13 +1138,13 @@ static int sh_eth_rx(struct net_device *ndev, u32 intr_status)
                         ndev->stats.rx_bytes += pkt_len;
                 }
                 rxdesc->status |= cpu_to_edmac(mdp, RD_RACT);
-                entry = (++mdp->cur_rx) % RX_RING_SIZE;
+                entry = (++mdp->cur_rx) % mdp->num_rx_ring;
                 rxdesc = &mdp->rx_ring[entry];
         }
 
         /* Refill the Rx ring buffers. */
         for (; mdp->cur_rx - mdp->dirty_rx > 0; mdp->dirty_rx++) {
-                entry = mdp->dirty_rx % RX_RING_SIZE;
+                entry = mdp->dirty_rx % mdp->num_rx_ring;
                 rxdesc = &mdp->rx_ring[entry];
                 /* The size of the buffer is 16 byte boundary. */
                 rxdesc->buffer_length = ALIGN(mdp->rx_buf_sz, 16);
@@ -1091,7 +1161,7 @@ static int sh_eth_rx(struct net_device *ndev, u32 intr_status)
                         skb_checksum_none_assert(skb);
                         rxdesc->addr = virt_to_phys(PTR_ALIGN(skb->data, 4));
                 }
-                if (entry >= RX_RING_SIZE - 1)
+                if (entry >= mdp->num_rx_ring - 1)
                         rxdesc->status |=
                                 cpu_to_edmac(mdp, RD_RACT | RD_RFP | RD_RDEL);
                 else
@@ -1293,14 +1363,6 @@ other_irq:
         return ret;
 }
 
-static void sh_eth_timer(unsigned long data)
-{
-        struct net_device *ndev = (struct net_device *)data;
-        struct sh_eth_private *mdp = netdev_priv(ndev);
-
-        mod_timer(&mdp->timer, jiffies + (10 * HZ));
-}
-
 /* PHY state control function */
 static void sh_eth_adjust_link(struct net_device *ndev)
 {
@@ -1499,6 +1561,71 @@ static void sh_eth_get_strings(struct net_device *ndev, u32 stringset, u8 *data)
         }
 }
 
+static void sh_eth_get_ringparam(struct net_device *ndev,
+                                 struct ethtool_ringparam *ring)
+{
+        struct sh_eth_private *mdp = netdev_priv(ndev);
+
+        ring->rx_max_pending = RX_RING_MAX;
+        ring->tx_max_pending = TX_RING_MAX;
+        ring->rx_pending = mdp->num_rx_ring;
+        ring->tx_pending = mdp->num_tx_ring;
+}
+
+static int sh_eth_set_ringparam(struct net_device *ndev,
+                                struct ethtool_ringparam *ring)
+{
+        struct sh_eth_private *mdp = netdev_priv(ndev);
+        int ret;
+
+        if (ring->tx_pending > TX_RING_MAX ||
+            ring->rx_pending > RX_RING_MAX ||
+            ring->tx_pending < TX_RING_MIN ||
+            ring->rx_pending < RX_RING_MIN)
+                return -EINVAL;
+        if (ring->rx_mini_pending || ring->rx_jumbo_pending)
+                return -EINVAL;
+
+        if (netif_running(ndev)) {
+                netif_tx_disable(ndev);
+                /* Disable interrupts by clearing the interrupt mask. */
+                sh_eth_write(ndev, 0x0000, EESIPR);
+                /* Stop the chip's Tx and Rx processes. */
+                sh_eth_write(ndev, 0, EDTRR);
+                sh_eth_write(ndev, 0, EDRRR);
+                synchronize_irq(ndev->irq);
+        }
+
+        /* Free all the skbuffs in the Rx queue. */
+        sh_eth_ring_free(ndev);
+        /* Free DMA buffer */
+        sh_eth_free_dma_buffer(mdp);
+
+        /* Set new parameters */
+        mdp->num_rx_ring = ring->rx_pending;
+        mdp->num_tx_ring = ring->tx_pending;
+
+        ret = sh_eth_ring_init(ndev);
+        if (ret < 0) {
+                dev_err(&ndev->dev, "%s: sh_eth_ring_init failed.\n", __func__);
+                return ret;
+        }
+        ret = sh_eth_dev_init(ndev, false);
+        if (ret < 0) {
+                dev_err(&ndev->dev, "%s: sh_eth_dev_init failed.\n", __func__);
+                return ret;
+        }
+
+        if (netif_running(ndev)) {
+                sh_eth_write(ndev, mdp->cd->eesipr_value, EESIPR);
+                /* Setting the Rx mode will start the Rx process. */
+                sh_eth_write(ndev, EDRRR_R, EDRRR);
+                netif_wake_queue(ndev);
+        }
+
+        return 0;
+}
+
 static const struct ethtool_ops sh_eth_ethtool_ops = {
         .get_settings   = sh_eth_get_settings,
         .set_settings   = sh_eth_set_settings,
@@ -1509,6 +1636,8 @@ static const struct ethtool_ops sh_eth_ethtool_ops = {
         .get_strings    = sh_eth_get_strings,
         .get_ethtool_stats  = sh_eth_get_ethtool_stats,
         .get_sset_count     = sh_eth_get_sset_count,
+        .get_ringparam  = sh_eth_get_ringparam,
+        .set_ringparam  = sh_eth_set_ringparam,
 };
 
 /* network device open function */
@@ -1539,7 +1668,7 @@ static int sh_eth_open(struct net_device *ndev)
                 goto out_free_irq;
 
         /* device init */
-        ret = sh_eth_dev_init(ndev);
+        ret = sh_eth_dev_init(ndev, true);
         if (ret)
                 goto out_free_irq;
 
@@ -1548,11 +1677,6 @@ static int sh_eth_open(struct net_device *ndev)
         if (ret)
                 goto out_free_irq;
 
-        /* Set the timer to check for link beat. */
-        init_timer(&mdp->timer);
-        mdp->timer.expires = (jiffies + (24 * HZ)) / 10;/* 2.4 sec. */
-        setup_timer(&mdp->timer, sh_eth_timer, (unsigned long)ndev);
-
         return ret;
 
 out_free_irq:
@@ -1577,11 +1701,8 @@ static void sh_eth_tx_timeout(struct net_device *ndev)
         /* tx_errors count up */
         ndev->stats.tx_errors++;
 
-        /* timer off */
-        del_timer_sync(&mdp->timer);
-
         /* Free all the skbuffs in the Rx queue. */
-        for (i = 0; i < RX_RING_SIZE; i++) {
+        for (i = 0; i < mdp->num_rx_ring; i++) {
                 rxdesc = &mdp->rx_ring[i];
                 rxdesc->status = 0;
                 rxdesc->addr = 0xBADF00D0;
@@ -1589,18 +1710,14 @@ static void sh_eth_tx_timeout(struct net_device *ndev)
                         dev_kfree_skb(mdp->rx_skbuff[i]);
                 mdp->rx_skbuff[i] = NULL;
         }
-        for (i = 0; i < TX_RING_SIZE; i++) {
+        for (i = 0; i < mdp->num_tx_ring; i++) {
                 if (mdp->tx_skbuff[i])
                         dev_kfree_skb(mdp->tx_skbuff[i]);
                 mdp->tx_skbuff[i] = NULL;
         }
 
         /* device init */
-        sh_eth_dev_init(ndev);
-
-        /* timer on */
-        mdp->timer.expires = (jiffies + (24 * HZ)) / 10;/* 2.4 sec. */
-        add_timer(&mdp->timer);
+        sh_eth_dev_init(ndev, true);
 }
 
 /* Packet transmit function */
@@ -1612,7 +1729,7 @@ static int sh_eth_start_xmit(struct sk_buff *skb, struct net_device *ndev)
         unsigned long flags;
 
         spin_lock_irqsave(&mdp->lock, flags);
-        if ((mdp->cur_tx - mdp->dirty_tx) >= (TX_RING_SIZE - 4)) {
+        if ((mdp->cur_tx - mdp->dirty_tx) >= (mdp->num_tx_ring - 4)) {
                 if (!sh_eth_txfree(ndev)) {
                         if (netif_msg_tx_queued(mdp))
                                 dev_warn(&ndev->dev, "TxFD exhausted.\n");
@@ -1623,7 +1740,7 @@ static int sh_eth_start_xmit(struct sk_buff *skb, struct net_device *ndev)
         }
         spin_unlock_irqrestore(&mdp->lock, flags);
 
-        entry = mdp->cur_tx % TX_RING_SIZE;
+        entry = mdp->cur_tx % mdp->num_tx_ring;
         mdp->tx_skbuff[entry] = skb;
         txdesc = &mdp->tx_ring[entry];
         /* soft swap. */
@@ -1637,7 +1754,7 @@ static int sh_eth_start_xmit(struct sk_buff *skb, struct net_device *ndev)
         else
                 txdesc->buffer_length = skb->len;
 
-        if (entry >= TX_RING_SIZE - 1)
+        if (entry >= mdp->num_tx_ring - 1)
                 txdesc->status |= cpu_to_edmac(mdp, TD_TACT | TD_TDLE);
         else
                 txdesc->status |= cpu_to_edmac(mdp, TD_TACT);
@@ -1654,7 +1771,6 @@ static int sh_eth_start_xmit(struct sk_buff *skb, struct net_device *ndev)
 static int sh_eth_close(struct net_device *ndev)
 {
         struct sh_eth_private *mdp = netdev_priv(ndev);
-        int ringsize;
 
         netif_stop_queue(ndev);
 
@@ -1673,18 +1789,11 @@ static int sh_eth_close(struct net_device *ndev)
 
         free_irq(ndev->irq, ndev);
 
-        del_timer_sync(&mdp->timer);
-
         /* Free all the skbuffs in the Rx queue. */
         sh_eth_ring_free(ndev);
 
         /* free DMA buffer */
-        ringsize = sizeof(struct sh_eth_rxdesc) * RX_RING_SIZE;
-        dma_free_coherent(NULL, ringsize, mdp->rx_ring, mdp->rx_desc_dma);
-
-        /* free DMA buffer */
-        ringsize = sizeof(struct sh_eth_txdesc) * TX_RING_SIZE;
-        dma_free_coherent(NULL, ringsize, mdp->tx_ring, mdp->tx_desc_dma);
+        sh_eth_free_dma_buffer(mdp);
 
         pm_runtime_put_sync(&mdp->pdev->dev);
 
@@ -2275,6 +2384,8 @@ static int sh_eth_drv_probe(struct platform_device *pdev)
         ether_setup(ndev);
 
         mdp = netdev_priv(ndev);
+        mdp->num_tx_ring = TX_RING_SIZE;
+        mdp->num_rx_ring = RX_RING_SIZE;
         mdp->addr = ioremap(res->start, resource_size(res));
         if (mdp->addr == NULL) {
                 ret = -ENOMEM;
@@ -2312,8 +2423,6 @@ static int sh_eth_drv_probe(struct platform_device *pdev)
 
         /* debug message level */
         mdp->msg_enable = SH_ETH_DEF_MSG_ENABLE;
-        mdp->post_rx = POST_RX >> (devno << 1);
-        mdp->post_fw = POST_FW >> (devno << 1);
 
         /* read and set MAC address */
         read_mac_address(ndev, pd->mac_addr);
diff --git a/drivers/net/ethernet/renesas/sh_eth.h b/drivers/net/ethernet/renesas/sh_eth.h
index 57b8e1fc5d1..bae84fd2e73 100644
--- a/drivers/net/ethernet/renesas/sh_eth.h
+++ b/drivers/net/ethernet/renesas/sh_eth.h
@@ -27,6 +27,10 @@
 #define TX_TIMEOUT      (5*HZ)
 #define TX_RING_SIZE    64      /* Tx ring size */
 #define RX_RING_SIZE    64      /* Rx ring size */
+#define TX_RING_MIN     64
+#define RX_RING_MIN     64
+#define TX_RING_MAX     1024
+#define RX_RING_MAX     1024
 #define ETHERSMALL              60
 #define PKT_BUF_SZ              1538
 #define SH_ETH_TSU_TIMEOUT_MS   500
@@ -585,71 +589,6 @@ enum RPADIR_BIT {
 /* FDR */
 #define DEFAULT_FDR_INIT        0x00000707
 
-enum phy_offsets {
-        PHY_CTRL = 0, PHY_STAT = 1, PHY_IDT1 = 2, PHY_IDT2 = 3,
-        PHY_ANA = 4, PHY_ANL = 5, PHY_ANE = 6,
-        PHY_16 = 16,
-};
-
-/* PHY_CTRL */
-enum PHY_CTRL_BIT {
-        PHY_C_RESET = 0x8000, PHY_C_LOOPBK = 0x4000, PHY_C_SPEEDSL = 0x2000,
-        PHY_C_ANEGEN = 0x1000, PHY_C_PWRDN = 0x0800, PHY_C_ISO = 0x0400,
-        PHY_C_RANEG = 0x0200, PHY_C_DUPLEX = 0x0100, PHY_C_COLT = 0x0080,
-};
-#define DM9161_PHY_C_ANEGEN 0   /* auto nego special */
-
-/* PHY_STAT */
-enum PHY_STAT_BIT {
-        PHY_S_100T4 = 0x8000, PHY_S_100X_F = 0x4000, PHY_S_100X_H = 0x2000,
-        PHY_S_10T_F = 0x1000, PHY_S_10T_H = 0x0800, PHY_S_ANEGC = 0x0020,
-        PHY_S_RFAULT = 0x0010, PHY_S_ANEGA = 0x0008, PHY_S_LINK = 0x0004,
-        PHY_S_JAB = 0x0002, PHY_S_EXTD = 0x0001,
-};
-
-/* PHY_ANA */
-enum PHY_ANA_BIT {
-        PHY_A_NP = 0x8000, PHY_A_ACK = 0x4000, PHY_A_RF = 0x2000,
-        PHY_A_FCS = 0x0400, PHY_A_T4 = 0x0200, PHY_A_FDX = 0x0100,
-        PHY_A_HDX = 0x0080, PHY_A_10FDX = 0x0040, PHY_A_10HDX = 0x0020,
-        PHY_A_SEL = 0x001e,
-};
-/* PHY_ANL */
-enum PHY_ANL_BIT {
-        PHY_L_NP = 0x8000, PHY_L_ACK = 0x4000, PHY_L_RF = 0x2000,
-        PHY_L_FCS = 0x0400, PHY_L_T4 = 0x0200, PHY_L_FDX = 0x0100,
-        PHY_L_HDX = 0x0080, PHY_L_10FDX = 0x0040, PHY_L_10HDX = 0x0020,
-        PHY_L_SEL = 0x001f,
-};
-
-/* PHY_ANE */
-enum PHY_ANE_BIT {
-        PHY_E_PDF = 0x0010, PHY_E_LPNPA = 0x0008, PHY_E_NPA = 0x0004,
-        PHY_E_PRX = 0x0002, PHY_E_LPANEGA = 0x0001,
-};
-
-/* DM9161 */
-enum PHY_16_BIT {
-        PHY_16_BP4B45 = 0x8000, PHY_16_BPSCR = 0x4000, PHY_16_BPALIGN = 0x2000,
-        PHY_16_BP_ADPOK = 0x1000, PHY_16_Repeatmode = 0x0800,
-        PHY_16_TXselect = 0x0400,
-        PHY_16_Rsvd = 0x0200, PHY_16_RMIIEnable = 0x0100,
-        PHY_16_Force100LNK = 0x0080,
-        PHY_16_APDLED_CTL = 0x0040, PHY_16_COLLED_CTL = 0x0020,
-        PHY_16_RPDCTR_EN = 0x0010,
-        PHY_16_ResetStMch = 0x0008, PHY_16_PreamSupr = 0x0004,
-        PHY_16_Sleepmode = 0x0002,
-        PHY_16_RemoteLoopOut = 0x0001,
-};
-
-#define POST_RX         0x08
-#define POST_FW         0x04
-#define POST0_RX        (POST_RX)
-#define POST0_FW        (POST_FW)
-#define POST1_RX        (POST_RX >> 2)
-#define POST1_FW        (POST_FW >> 2)
-#define POST_ALL        (POST0_RX | POST0_FW | POST1_RX | POST1_FW)
-
 /* ARSTR */
 enum ARSTR_BIT { ARSTR_ARSTR = 0x00000001, };
 
@@ -757,6 +696,7 @@ struct sh_eth_cpu_data {
         unsigned no_trimd:1;            /* E-DMAC DO NOT have TRIMD */
         unsigned no_ade:1;      /* E-DMAC DO NOT have ADE bit in EESR */
         unsigned hw_crc:1;      /* E-DMAC have CSMR */
+        unsigned select_mii:1;  /* EtherC have RMII_MII (MII select register) */
 };
 
 struct sh_eth_private {
@@ -765,13 +705,14 @@ struct sh_eth_private {
         const u16 *reg_offset;
         void __iomem *addr;
         void __iomem *tsu_addr;
+        u32 num_rx_ring;
+        u32 num_tx_ring;
         dma_addr_t rx_desc_dma;
         dma_addr_t tx_desc_dma;
         struct sh_eth_rxdesc *rx_ring;
         struct sh_eth_txdesc *tx_ring;
         struct sk_buff **rx_skbuff;
         struct sk_buff **tx_skbuff;
-        struct timer_list timer;
         spinlock_t lock;
         u32 cur_rx, dirty_rx;   /* Producer/consumer ring indices */
         u32 cur_tx, dirty_tx;
@@ -786,10 +727,6 @@ struct sh_eth_private {
         int msg_enable;
         int speed;
         int duplex;
-        u32 rx_int_var, tx_int_var;     /* interrupt control variables */
-        char post_rx;           /* POST receive */
-        char post_fw;           /* POST forward */
-        struct net_device_stats tsu_stats;      /* TSU forward status */
         int port;               /* for TSU */
         int vlan_num_ids;       /* for VLAN tag filter */
 
diff --git a/drivers/net/ethernet/sfc/mcdi_pcol.h b/drivers/net/ethernet/sfc/mcdi_pcol.h
index 0310b9f08c9..db4beed9766 100644
--- a/drivers/net/ethernet/sfc/mcdi_pcol.h
+++ b/drivers/net/ethernet/sfc/mcdi_pcol.h
@@ -48,8 +48,7 @@
 
 /* Unused commands: 0x23, 0x27, 0x30, 0x31 */
 
-/**
- * MCDI version 1
+/* MCDI version 1
  *
  * Each MCDI request starts with an MCDI_HEADER, which is a 32byte
  * structure, filled in by the client.
diff --git a/drivers/net/ethernet/sfc/net_driver.h b/drivers/net/ethernet/sfc/net_driver.h
index 0e575359af1..a1965c07d1e 100644
--- a/drivers/net/ethernet/sfc/net_driver.h
+++ b/drivers/net/ethernet/sfc/net_driver.h
@@ -527,7 +527,7 @@ struct efx_phy_operations {
 };
 
 /**
- * @enum efx_phy_mode - PHY operating mode flags
+ * enum efx_phy_mode - PHY operating mode flags
  * @PHY_MODE_NORMAL: on and should pass traffic
  * @PHY_MODE_TX_DISABLED: on with TX disabled
  * @PHY_MODE_LOW_POWER: set to low power through MDIO
diff --git a/drivers/net/ethernet/sfc/rx.c b/drivers/net/ethernet/sfc/rx.c
index 243e91f3dff..fca61fea38e 100644
--- a/drivers/net/ethernet/sfc/rx.c
+++ b/drivers/net/ethernet/sfc/rx.c
@@ -336,6 +336,7 @@ static void efx_recycle_rx_buffer(struct efx_channel *channel,
 /**
  * efx_fast_push_rx_descriptors - push new RX descriptors quickly
  * @rx_queue:           RX descriptor queue
+ *
  * This will aim to fill the RX descriptor queue up to
  * @rx_queue->@max_fill. If there is insufficient atomic
  * memory to do so, a slow fill will be scheduled.
diff --git a/drivers/net/ethernet/sgi/ioc3-eth.c b/drivers/net/ethernet/sgi/ioc3-eth.c
index ac149d99f78..b5ba3084c7f 100644
--- a/drivers/net/ethernet/sgi/ioc3-eth.c
+++ b/drivers/net/ethernet/sgi/ioc3-eth.c
@@ -583,7 +583,7 @@ static inline void ioc3_rx(struct net_device *dev)
         unsigned long *rxr;
         u32 w0, err;
 
-        rxr = (unsigned long *) ip->rxr;                /* Ring base */
+        rxr = ip->rxr;          /* Ring base */
         rx_entry = ip->rx_ci;                           /* RX consume index */
         n_entry = ip->rx_pi;
 
@@ -903,7 +903,7 @@ static void ioc3_alloc_rings(struct net_device *dev)
         if (ip->rxr == NULL) {
                 /* Allocate and initialize rx ring.  4kb = 512 entries  */
                 ip->rxr = (unsigned long *) get_zeroed_page(GFP_ATOMIC);
-                rxr = (unsigned long *) ip->rxr;
+                rxr = ip->rxr;
                 if (!rxr)
                         printk("ioc3_alloc_rings(): get_zeroed_page() failed!\n");
 
diff --git a/drivers/net/ethernet/smsc/smc911x.c b/drivers/net/ethernet/smsc/smc911x.c
index 8814b2f5d46..8d15f7a74b4 100644
--- a/drivers/net/ethernet/smsc/smc911x.c
+++ b/drivers/net/ethernet/smsc/smc911x.c
@@ -773,7 +773,7 @@ static int smc911x_phy_fixed(struct net_device *dev)
         return 1;
 }
 
-/*
+/**
  * smc911x_phy_reset - reset the phy
  * @dev: net device
  * @phy: phy address
@@ -819,7 +819,7 @@ static int smc911x_phy_reset(struct net_device *dev, int phy)
         return reg & PMT_CTRL_PHY_RST_;
 }
 
-/*
+/**
  * smc911x_phy_powerdown - powerdown phy
  * @dev: net device
  * @phy: phy address
@@ -837,7 +837,7 @@ static void smc911x_phy_powerdown(struct net_device *dev, int phy)
         SMC_SET_PHY_BMCR(lp, phy, bmcr);
 }
 
-/*
+/**
  * smc911x_phy_check_media - check the media status and adjust BMCR
  * @dev: net device
  * @init: set true for initialisation
diff --git a/drivers/net/ethernet/smsc/smc91x.c b/drivers/net/ethernet/smsc/smc91x.c
index fee44935501..318adc935a5 100644
--- a/drivers/net/ethernet/smsc/smc91x.c
+++ b/drivers/net/ethernet/smsc/smc91x.c
@@ -942,7 +942,7 @@ static int smc_phy_fixed(struct net_device *dev)
         return 1;
 }
 
-/*
+/**
  * smc_phy_reset - reset the phy
  * @dev: net device
  * @phy: phy address
@@ -976,7 +976,7 @@ static int smc_phy_reset(struct net_device *dev, int phy)
         return bmcr & BMCR_RESET;
 }
 
-/*
+/**
  * smc_phy_powerdown - powerdown phy
  * @dev: net device
  *
@@ -1000,7 +1000,7 @@ static void smc_phy_powerdown(struct net_device *dev)
         smc_phy_write(dev, phy, MII_BMCR, bmcr | BMCR_PDOWN);
 }
 
-/*
+/**
  * smc_phy_check_media - check the media status and adjust TCR
  * @dev: net device
  * @init: set true for initialisation
diff --git a/drivers/net/ethernet/smsc/smsc911x.c b/drivers/net/ethernet/smsc/smsc911x.c
index 1466e5d2af4..54ca99dbb40 100644
--- a/drivers/net/ethernet/smsc/smsc911x.c
+++ b/drivers/net/ethernet/smsc/smsc911x.c
@@ -1442,6 +1442,14 @@ smsc911x_set_hw_mac_address(struct smsc911x_data *pdata, u8 dev_addr[6])
         smsc911x_mac_write(pdata, ADDRL, mac_low32);
 }
 
+static void smsc911x_disable_irq_chip(struct net_device *dev)
+{
+        struct smsc911x_data *pdata = netdev_priv(dev);
+
+        smsc911x_reg_write(pdata, INT_EN, 0);
+        smsc911x_reg_write(pdata, INT_STS, 0xFFFFFFFF);
+}
+
 static int smsc911x_open(struct net_device *dev)
 {
         struct smsc911x_data *pdata = netdev_priv(dev);
@@ -1494,8 +1502,7 @@ static int smsc911x_open(struct net_device *dev)
         spin_unlock_irq(&pdata->mac_lock);
 
         /* Initialise irqs, but leave all sources disabled */
-        smsc911x_reg_write(pdata, INT_EN, 0);
-        smsc911x_reg_write(pdata, INT_STS, 0xFFFFFFFF);
+        smsc911x_disable_irq_chip(dev);
 
         /* Set interrupt deassertion to 100uS */
         intcfg = ((10 << 24) | INT_CFG_IRQ_EN_);
@@ -2215,9 +2222,6 @@ static int __devinit smsc911x_init(struct net_device *dev)
         if (smsc911x_soft_reset(pdata))
                 return -ENODEV;
 
-        /* Disable all interrupt sources until we bring the device up */
-        smsc911x_reg_write(pdata, INT_EN, 0);
-
         ether_setup(dev);
         dev->flags |= IFF_MULTICAST;
         netif_napi_add(dev, &pdata->napi, smsc911x_poll, SMSC_NAPI_WEIGHT);
@@ -2434,8 +2438,7 @@ static int __devinit smsc911x_drv_probe(struct platform_device *pdev)
         smsc911x_reg_write(pdata, INT_CFG, intcfg);
 
         /* Ensure interrupts are globally disabled before connecting ISR */
-        smsc911x_reg_write(pdata, INT_EN, 0);
-        smsc911x_reg_write(pdata, INT_STS, 0xFFFFFFFF);
+        smsc911x_disable_irq_chip(dev);
 
         retval = request_irq(dev->irq, smsc911x_irqhandler,
                              irq_flags | IRQF_SHARED, dev->name, dev);
diff --git a/drivers/net/ethernet/smsc/smsc9420.c b/drivers/net/ethernet/smsc/smsc9420.c
index fd33b21f6c9..1fcd914ec39 100644
--- a/drivers/net/ethernet/smsc/smsc9420.c
+++ b/drivers/net/ethernet/smsc/smsc9420.c
@@ -1640,8 +1640,7 @@ smsc9420_probe(struct pci_dev *pdev, const struct pci_device_id *id)
                 goto out_free_io_4;
 
         /* descriptors are aligned due to the nature of pci_alloc_consistent */
-        pd->tx_ring = (struct smsc9420_dma_desc *)
-            (pd->rx_ring + RX_RING_SIZE);
+        pd->tx_ring = (pd->rx_ring + RX_RING_SIZE);
         pd->tx_dma_addr = pd->rx_dma_addr +
             sizeof(struct smsc9420_dma_desc) * RX_RING_SIZE;
 
diff --git a/drivers/net/ethernet/stmicro/stmmac/common.h b/drivers/net/ethernet/stmicro/stmmac/common.h
index bcd54d6e94f..e2d083228f3 100644
--- a/drivers/net/ethernet/stmicro/stmmac/common.h
+++ b/drivers/net/ethernet/stmicro/stmmac/common.h
@@ -95,6 +95,16 @@ struct stmmac_extra_stats {
         unsigned long poll_n;
         unsigned long sched_timer_n;
         unsigned long normal_irq_n;
+        unsigned long mmc_tx_irq_n;
+        unsigned long mmc_rx_irq_n;
+        unsigned long mmc_rx_csum_offload_irq_n;
+        /* EEE */
+        unsigned long irq_receive_pmt_irq_n;
+        unsigned long irq_tx_path_in_lpi_mode_n;
+        unsigned long irq_tx_path_exit_lpi_mode_n;
+        unsigned long irq_rx_path_in_lpi_mode_n;
+        unsigned long irq_rx_path_exit_lpi_mode_n;
+        unsigned long phy_eee_wakeup_error_n;
 };
 
 /* CSR Frequency Access Defines*/
@@ -162,6 +172,17 @@ enum tx_dma_irq_status {
         handle_tx_rx = 3,
 };
 
+enum core_specific_irq_mask {
+        core_mmc_tx_irq = 1,
+        core_mmc_rx_irq = 2,
+        core_mmc_rx_csum_offload_irq = 4,
+        core_irq_receive_pmt_irq = 8,
+        core_irq_tx_path_in_lpi_mode = 16,
+        core_irq_tx_path_exit_lpi_mode = 32,
+        core_irq_rx_path_in_lpi_mode = 64,
+        core_irq_rx_path_exit_lpi_mode = 128,
+};
+
 /* DMA HW capabilities */
 struct dma_features {
         unsigned int mbps_10_100;
@@ -208,6 +229,10 @@ struct dma_features {
 #define MAC_ENABLE_TX           0x00000008      /* Transmitter Enable */
 #define MAC_RNABLE_RX           0x00000004      /* Receiver Enable */
 
+/* Default LPI timers */
+#define STMMAC_DEFAULT_LIT_LS_TIMER     0x3E8
+#define STMMAC_DEFAULT_TWT_LS_TIMER     0x0
+
 struct stmmac_desc_ops {
         /* DMA RX descriptor ring initialization */
         void (*init_rx_desc) (struct dma_desc *p, unsigned int ring_size,
@@ -278,7 +303,7 @@ struct stmmac_ops {
         /* Dump MAC registers */
         void (*dump_regs) (void __iomem *ioaddr);
         /* Handle extra events on specific interrupts hw dependent */
-        void (*host_irq_status) (void __iomem *ioaddr);
+        int (*host_irq_status) (void __iomem *ioaddr);
         /* Multicast filter setting */
         void (*set_filter) (struct net_device *dev, int id);
         /* Flow control setting */
@@ -291,6 +316,10 @@ struct stmmac_ops {
                                unsigned int reg_n);
         void (*get_umac_addr) (void __iomem *ioaddr, unsigned char *addr,
                                unsigned int reg_n);
+        void (*set_eee_mode) (void __iomem *ioaddr);
+        void (*reset_eee_mode) (void __iomem *ioaddr);
+        void (*set_eee_timer) (void __iomem *ioaddr, int ls, int tw);
+        void (*set_eee_pls) (void __iomem *ioaddr, int link);
 };
 
 struct mac_link {
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac1000.h b/drivers/net/ethernet/stmicro/stmmac/dwmac1000.h
index 23478bf4ed7..f90fcb5f957 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac1000.h
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac1000.h
@@ -36,6 +36,7 @@
 
 #define GMAC_INT_STATUS         0x00000038      /* interrupt status register */
 enum dwmac1000_irq_status {
+        lpiis_irq = 0x400,
         time_stamp_irq = 0x0200,
         mmc_rx_csum_offload_irq = 0x0080,
         mmc_tx_irq = 0x0040,
@@ -60,6 +61,25 @@ enum power_event {
         power_down = 0x00000001,
 };
 
+/* Energy Efficient Ethernet (EEE)
+ *
+ * LPI status, timer and control register offset
+ */
+#define LPI_CTRL_STATUS 0x0030
+#define LPI_TIMER_CTRL  0x0034
+
+/* LPI control and status defines */
+#define LPI_CTRL_STATUS_LPITXA  0x00080000      /* Enable LPI TX Automate */
+#define LPI_CTRL_STATUS_PLSEN   0x00040000      /* Enable PHY Link Status */
+#define LPI_CTRL_STATUS_PLS     0x00020000      /* PHY Link Status */
+#define LPI_CTRL_STATUS_LPIEN   0x00010000      /* LPI Enable */
+#define LPI_CTRL_STATUS_RLPIST  0x00000200      /* Receive LPI state */
+#define LPI_CTRL_STATUS_TLPIST  0x00000100      /* Transmit LPI state */
+#define LPI_CTRL_STATUS_RLPIEX  0x00000008      /* Receive LPI Exit */
+#define LPI_CTRL_STATUS_RLPIEN  0x00000004      /* Receive LPI Entry */
+#define LPI_CTRL_STATUS_TLPIEX  0x00000002      /* Transmit LPI Exit */
+#define LPI_CTRL_STATUS_TLPIEN  0x00000001      /* Transmit LPI Entry */
+
 /* GMAC HW ADDR regs */
 #define GMAC_ADDR_HIGH(reg)     (((reg > 15) ? 0x00000800 : 0x00000040) + \
                                 (reg * 8))
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c b/drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c
index b5e4d02f15c..bfe02260549 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c
@@ -194,26 +194,107 @@ static void dwmac1000_pmt(void __iomem *ioaddr, unsigned long mode)
 }
 
 
-static void dwmac1000_irq_status(void __iomem *ioaddr)
+static int dwmac1000_irq_status(void __iomem *ioaddr)
 {
         u32 intr_status = readl(ioaddr + GMAC_INT_STATUS);
+        int status = 0;
 
         /* Not used events (e.g. MMC interrupts) are not handled. */
-        if ((intr_status & mmc_tx_irq))
-                CHIP_DBG(KERN_DEBUG "GMAC: MMC tx interrupt: 0x%08x\n",
+        if ((intr_status & mmc_tx_irq)) {
+                CHIP_DBG(KERN_INFO "GMAC: MMC tx interrupt: 0x%08x\n",
                     readl(ioaddr + GMAC_MMC_TX_INTR));
-        if (unlikely(intr_status & mmc_rx_irq))
-                CHIP_DBG(KERN_DEBUG "GMAC: MMC rx interrupt: 0x%08x\n",
+                status |= core_mmc_tx_irq;
+        }
+        if (unlikely(intr_status & mmc_rx_irq)) {
+                CHIP_DBG(KERN_INFO "GMAC: MMC rx interrupt: 0x%08x\n",
                     readl(ioaddr + GMAC_MMC_RX_INTR));
-        if (unlikely(intr_status & mmc_rx_csum_offload_irq))
-                CHIP_DBG(KERN_DEBUG "GMAC: MMC rx csum offload: 0x%08x\n",
+                status |= core_mmc_rx_irq;
+        }
+        if (unlikely(intr_status & mmc_rx_csum_offload_irq)) {
+                CHIP_DBG(KERN_INFO "GMAC: MMC rx csum offload: 0x%08x\n",
                     readl(ioaddr + GMAC_MMC_RX_CSUM_OFFLOAD));
+                status |= core_mmc_rx_csum_offload_irq;
+        }
         if (unlikely(intr_status & pmt_irq)) {
-                CHIP_DBG(KERN_DEBUG "GMAC: received Magic frame\n");
+                CHIP_DBG(KERN_INFO "GMAC: received Magic frame\n");
                 /* clear the PMT bits 5 and 6 by reading the PMT
                  * status register. */
                 readl(ioaddr + GMAC_PMT);
+                status |= core_irq_receive_pmt_irq;
         }
+        /* MAC trx/rx EEE LPI entry/exit interrupts */
+        if (intr_status & lpiis_irq) {
+                /* Clean LPI interrupt by reading the Reg 12 */
+                u32 lpi_status = readl(ioaddr + LPI_CTRL_STATUS);
+
+                if (lpi_status & LPI_CTRL_STATUS_TLPIEN) {
+                        CHIP_DBG(KERN_INFO "GMAC TX entered in LPI\n");
+                        status |= core_irq_tx_path_in_lpi_mode;
+                }
+                if (lpi_status & LPI_CTRL_STATUS_TLPIEX) {
+                        CHIP_DBG(KERN_INFO "GMAC TX exit from LPI\n");
+                        status |= core_irq_tx_path_exit_lpi_mode;
+                }
+                if (lpi_status & LPI_CTRL_STATUS_RLPIEN) {
+                        CHIP_DBG(KERN_INFO "GMAC RX entered in LPI\n");
+                        status |= core_irq_rx_path_in_lpi_mode;
+                }
+                if (lpi_status & LPI_CTRL_STATUS_RLPIEX) {
+                        CHIP_DBG(KERN_INFO "GMAC RX exit from LPI\n");
+                        status |= core_irq_rx_path_exit_lpi_mode;
+                }
+        }
+
+        return status;
+}
+
+static void  dwmac1000_set_eee_mode(void __iomem *ioaddr)
+{
+        u32 value;
+
+        /* Enable the link status receive on RGMII, SGMII ore SMII
+         * receive path and instruct the transmit to enter in LPI
+         * state. */
+        value = readl(ioaddr + LPI_CTRL_STATUS);
+        value |= LPI_CTRL_STATUS_LPIEN | LPI_CTRL_STATUS_LPITXA;
+        writel(value, ioaddr + LPI_CTRL_STATUS);
+}
+
+static void  dwmac1000_reset_eee_mode(void __iomem *ioaddr)
+{
+        u32 value;
+
+        value = readl(ioaddr + LPI_CTRL_STATUS);
+        value &= ~(LPI_CTRL_STATUS_LPIEN | LPI_CTRL_STATUS_LPITXA);
+        writel(value, ioaddr + LPI_CTRL_STATUS);
+}
+
+static void  dwmac1000_set_eee_pls(void __iomem *ioaddr, int link)
+{
+        u32 value;
+
+        value = readl(ioaddr + LPI_CTRL_STATUS);
+
+        if (link)
+                value |= LPI_CTRL_STATUS_PLS;
+        else
+                value &= ~LPI_CTRL_STATUS_PLS;
+
+        writel(value, ioaddr + LPI_CTRL_STATUS);
+}
+
+static void  dwmac1000_set_eee_timer(void __iomem *ioaddr, int ls, int tw)
+{
+        int value = ((tw & 0xffff)) | ((ls & 0x7ff) << 16);
+
+        /* Program the timers in the LPI timer control register:
+         * LS: minimum time (ms) for which the link
+         *  status from PHY should be ok before transmitting
+         *  the LPI pattern.
+         * TW: minimum time (us) for which the core waits
+         *  after it has stopped transmitting the LPI pattern.
+         */
+        writel(value, ioaddr + LPI_TIMER_CTRL);
 }
 
 static const struct stmmac_ops dwmac1000_ops = {
@@ -226,6 +307,10 @@ static const struct stmmac_ops dwmac1000_ops = {
         .pmt = dwmac1000_pmt,
         .set_umac_addr = dwmac1000_set_umac_addr,
         .get_umac_addr = dwmac1000_get_umac_addr,
+        .set_eee_mode =  dwmac1000_set_eee_mode,
+        .reset_eee_mode =  dwmac1000_reset_eee_mode,
+        .set_eee_timer =  dwmac1000_set_eee_timer,
+        .set_eee_pls =  dwmac1000_set_eee_pls,
 };
 
 struct mac_device_info *dwmac1000_setup(void __iomem *ioaddr)
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac100_core.c b/drivers/net/ethernet/stmicro/stmmac/dwmac100_core.c
index 19e0f4eed2b..f83210e7c22 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac100_core.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac100_core.c
@@ -72,9 +72,9 @@ static int dwmac100_rx_ipc_enable(void __iomem *ioaddr)
         return 0;
 }
 
-static void dwmac100_irq_status(void __iomem *ioaddr)
+static int dwmac100_irq_status(void __iomem *ioaddr)
 {
-        return;
+        return 0;
 }
 
 static void dwmac100_set_umac_addr(void __iomem *ioaddr, unsigned char *addr,
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac_dma.h b/drivers/net/ethernet/stmicro/stmmac/dwmac_dma.h
index 6e0360f9cfd..e678ce39d01 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac_dma.h
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac_dma.h
@@ -70,6 +70,7 @@
 #define DMA_INTR_DEFAULT_MASK   (DMA_INTR_NORMAL | DMA_INTR_ABNORMAL)
 
 /* DMA Status register defines */
+#define DMA_STATUS_GLPII        0x40000000      /* GMAC LPI interrupt */
 #define DMA_STATUS_GPI          0x10000000      /* PMT interrupt */
 #define DMA_STATUS_GMI          0x08000000      /* MMC interrupt */
 #define DMA_STATUS_GLI          0x04000000      /* GMAC Line interface int */
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac.h b/drivers/net/ethernet/stmicro/stmmac/stmmac.h
index dc20c56efc9..ab4c376cb27 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac.h
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac.h
@@ -87,6 +87,12 @@ struct stmmac_priv {
 #endif
         int clk_csr;
         int synopsys_id;
+        struct timer_list eee_ctrl_timer;
+        bool tx_path_in_lpi_mode;
+        int lpi_irq;
+        int eee_enabled;
+        int eee_active;
+        int tx_lpi_timer;
 };
 
 extern int phyaddr;
@@ -104,6 +110,8 @@ int stmmac_dvr_remove(struct net_device *ndev);
 struct stmmac_priv *stmmac_dvr_probe(struct device *device,
                                      struct plat_stmmacenet_data *plat_dat,
                                      void __iomem *addr);
+void stmmac_disable_eee_mode(struct stmmac_priv *priv);
+bool stmmac_eee_init(struct stmmac_priv *priv);
 
 #ifdef CONFIG_HAVE_CLK
 static inline int stmmac_clk_enable(struct stmmac_priv *priv)
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c
index ce431846fc6..76fd61aa005 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c
@@ -93,6 +93,16 @@ static const struct stmmac_stats stmmac_gstrings_stats[] = {
         STMMAC_STAT(poll_n),
         STMMAC_STAT(sched_timer_n),
         STMMAC_STAT(normal_irq_n),
+        STMMAC_STAT(normal_irq_n),
+        STMMAC_STAT(mmc_tx_irq_n),
+        STMMAC_STAT(mmc_rx_irq_n),
+        STMMAC_STAT(mmc_rx_csum_offload_irq_n),
+        STMMAC_STAT(irq_receive_pmt_irq_n),
+        STMMAC_STAT(irq_tx_path_in_lpi_mode_n),
+        STMMAC_STAT(irq_tx_path_exit_lpi_mode_n),
+        STMMAC_STAT(irq_rx_path_in_lpi_mode_n),
+        STMMAC_STAT(irq_rx_path_exit_lpi_mode_n),
+        STMMAC_STAT(phy_eee_wakeup_error_n),
 };
 #define STMMAC_STATS_LEN ARRAY_SIZE(stmmac_gstrings_stats)
 
@@ -366,6 +376,11 @@ static void stmmac_get_ethtool_stats(struct net_device *dev,
                                              (*(u32 *)p);
                         }
                 }
+                if (priv->eee_enabled) {
+                        int val = phy_get_eee_err(priv->phydev);
+                        if (val)
+                                priv->xstats.phy_eee_wakeup_error_n = val;
+                }
         }
         for (i = 0; i < STMMAC_STATS_LEN; i++) {
                 char *p = (char *)priv + stmmac_gstrings_stats[i].stat_offset;
@@ -464,6 +479,46 @@ static int stmmac_set_wol(struct net_device *dev, struct ethtool_wolinfo *wol)
         return 0;
 }
 
+static int stmmac_ethtool_op_get_eee(struct net_device *dev,
+                                     struct ethtool_eee *edata)
+{
+        struct stmmac_priv *priv = netdev_priv(dev);
+
+        if (!priv->dma_cap.eee)
+                return -EOPNOTSUPP;
+
+        edata->eee_enabled = priv->eee_enabled;
+        edata->eee_active = priv->eee_active;
+        edata->tx_lpi_timer = priv->tx_lpi_timer;
+
+        return phy_ethtool_get_eee(priv->phydev, edata);
+}
+
+static int stmmac_ethtool_op_set_eee(struct net_device *dev,
+                                     struct ethtool_eee *edata)
+{
+        struct stmmac_priv *priv = netdev_priv(dev);
+
+        priv->eee_enabled = edata->eee_enabled;
+
+        if (!priv->eee_enabled)
+                stmmac_disable_eee_mode(priv);
+        else {
+                /* We are asking for enabling the EEE but it is safe
+                 * to verify all by invoking the eee_init function.
+                 * In case of failure it will return an error.
+                 */
+                priv->eee_enabled = stmmac_eee_init(priv);
+                if (!priv->eee_enabled)
+                        return -EOPNOTSUPP;
+
+                /* Do not change tx_lpi_timer in case of failure */
+                priv->tx_lpi_timer = edata->tx_lpi_timer;
+        }
+
+        return phy_ethtool_set_eee(priv->phydev, edata);
+}
+
 static const struct ethtool_ops stmmac_ethtool_ops = {
         .begin = stmmac_check_if_running,
         .get_drvinfo = stmmac_ethtool_getdrvinfo,
@@ -480,6 +535,8 @@ static const struct ethtool_ops stmmac_ethtool_ops = {
         .get_strings = stmmac_get_strings,
         .get_wol = stmmac_get_wol,
         .set_wol = stmmac_set_wol,
+        .get_eee = stmmac_ethtool_op_get_eee,
+        .set_eee = stmmac_ethtool_op_set_eee,
         .get_sset_count = stmmac_get_sset_count,
         .get_ts_info = ethtool_op_get_ts_info,
 };
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index ea3003edde1..f6b04c1a367 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -133,6 +133,12 @@ static const u32 default_msg_level = (NETIF_MSG_DRV | NETIF_MSG_PROBE |
                                       NETIF_MSG_LINK | NETIF_MSG_IFUP |
                                       NETIF_MSG_IFDOWN | NETIF_MSG_TIMER);
 
+#define STMMAC_DEFAULT_LPI_TIMER        1000
+static int eee_timer = STMMAC_DEFAULT_LPI_TIMER;
+module_param(eee_timer, int, S_IRUGO | S_IWUSR);
+MODULE_PARM_DESC(eee_timer, "LPI tx expiration time in msec");
+#define STMMAC_LPI_TIMER(x) (jiffies + msecs_to_jiffies(x))
+
 static irqreturn_t stmmac_interrupt(int irq, void *dev_id);
 
 #ifdef CONFIG_STMMAC_DEBUG_FS
@@ -161,6 +167,8 @@ static void stmmac_verify_args(void)
                 flow_ctrl = FLOW_OFF;
         if (unlikely((pause < 0) || (pause > 0xffff)))
                 pause = PAUSE_TIME;
+        if (eee_timer < 0)
+                eee_timer = STMMAC_DEFAULT_LPI_TIMER;
 }
 
 static void stmmac_clk_csr_set(struct stmmac_priv *priv)
@@ -229,6 +237,85 @@ static inline void stmmac_hw_fix_mac_speed(struct stmmac_priv *priv)
                                           phydev->speed);
 }
 
+static void stmmac_enable_eee_mode(struct stmmac_priv *priv)
+{
+        /* Check and enter in LPI mode */
+        if ((priv->dirty_tx == priv->cur_tx) &&
+            (priv->tx_path_in_lpi_mode == false))
+                priv->hw->mac->set_eee_mode(priv->ioaddr);
+}
+
+void stmmac_disable_eee_mode(struct stmmac_priv *priv)
+{
+        /* Exit and disable EEE in case of we are are in LPI state. */
+        priv->hw->mac->reset_eee_mode(priv->ioaddr);
+        del_timer_sync(&priv->eee_ctrl_timer);
+        priv->tx_path_in_lpi_mode = false;
+}
+
+/**
+ * stmmac_eee_ctrl_timer
+ * @arg : data hook
+ * Description:
+ *  If there is no data transfer and if we are not in LPI state,
+ *  then MAC Transmitter can be moved to LPI state.
+ */
+static void stmmac_eee_ctrl_timer(unsigned long arg)
+{
+        struct stmmac_priv *priv = (struct stmmac_priv *)arg;
+
+        stmmac_enable_eee_mode(priv);
+        mod_timer(&priv->eee_ctrl_timer, STMMAC_LPI_TIMER(eee_timer));
+}
+
+/**
+ * stmmac_eee_init
+ * @priv: private device pointer
+ * Description:
+ *  If the EEE support has been enabled while configuring the driver,
+ *  if the GMAC actually supports the EEE (from the HW cap reg) and the
+ *  phy can also manage EEE, so enable the LPI state and start the timer
+ *  to verify if the tx path can enter in LPI state.
+ */
+bool stmmac_eee_init(struct stmmac_priv *priv)
+{
+        bool ret = false;
+
+        /* MAC core supports the EEE feature. */
+        if (priv->dma_cap.eee) {
+                /* Check if the PHY supports EEE */
+                if (phy_init_eee(priv->phydev, 1))
+                        goto out;
+
+                priv->eee_active = 1;
+                init_timer(&priv->eee_ctrl_timer);
+                priv->eee_ctrl_timer.function = stmmac_eee_ctrl_timer;
+                priv->eee_ctrl_timer.data = (unsigned long)priv;
+                priv->eee_ctrl_timer.expires = STMMAC_LPI_TIMER(eee_timer);
+                add_timer(&priv->eee_ctrl_timer);
+
+                priv->hw->mac->set_eee_timer(priv->ioaddr,
+                                             STMMAC_DEFAULT_LIT_LS_TIMER,
+                                             priv->tx_lpi_timer);
+
+                pr_info("stmmac: Energy-Efficient Ethernet initialized\n");
+
+                ret = true;
+        }
+out:
+        return ret;
+}
+
+static void stmmac_eee_adjust(struct stmmac_priv *priv)
+{
+        /* When the EEE has been already initialised we have to
+         * modify the PLS bit in the LPI ctrl & status reg according
+         * to the PHY link status. For this reason.
+         */
+        if (priv->eee_enabled)
+                priv->hw->mac->set_eee_pls(priv->ioaddr, priv->phydev->link);
+}
+
 /**
  * stmmac_adjust_link
  * @dev: net device structure
@@ -249,6 +336,7 @@ static void stmmac_adjust_link(struct net_device *dev)
             phydev->addr, phydev->link);
 
         spin_lock_irqsave(&priv->lock, flags);
+
         if (phydev->link) {
                 u32 ctrl = readl(priv->ioaddr + MAC_CTRL_REG);
 
@@ -315,6 +403,8 @@ static void stmmac_adjust_link(struct net_device *dev)
         if (new_state && netif_msg_link(priv))
                 phy_print_status(phydev);
 
+        stmmac_eee_adjust(priv);
+
         spin_unlock_irqrestore(&priv->lock, flags);
 
         DBG(probe, DEBUG, "stmmac_adjust_link: exiting\n");
@@ -332,7 +422,7 @@ static int stmmac_init_phy(struct net_device *dev)
 {
         struct stmmac_priv *priv = netdev_priv(dev);
         struct phy_device *phydev;
-        char phy_id[MII_BUS_ID_SIZE + 3];
+        char phy_id_fmt[MII_BUS_ID_SIZE + 3];
         char bus_id[MII_BUS_ID_SIZE];
         int interface = priv->plat->interface;
         priv->oldlink = 0;
@@ -346,11 +436,12 @@ static int stmmac_init_phy(struct net_device *dev)
                 snprintf(bus_id, MII_BUS_ID_SIZE, "stmmac-%x",
                                 priv->plat->bus_id);
 
-        snprintf(phy_id, MII_BUS_ID_SIZE + 3, PHY_ID_FMT, bus_id,
+        snprintf(phy_id_fmt, MII_BUS_ID_SIZE + 3, PHY_ID_FMT, bus_id,
                  priv->plat->phy_addr);
-        pr_debug("stmmac_init_phy:  trying to attach to %s\n", phy_id);
+        pr_debug("stmmac_init_phy:  trying to attach to %s\n", phy_id_fmt);
 
-        phydev = phy_connect(dev, phy_id, &stmmac_adjust_link, 0, interface);
+        phydev = phy_connect(dev, phy_id_fmt, &stmmac_adjust_link, 0,
+                             interface);
 
         if (IS_ERR(phydev)) {
                 pr_err("%s: Could not attach to PHY\n", dev->name);
@@ -677,7 +768,7 @@ static void stmmac_tx(struct stmmac_priv *priv)
 
                 priv->hw->desc->release_tx_desc(p);
 
-                entry = (++priv->dirty_tx) % txsize;
+                priv->dirty_tx++;
         }
         if (unlikely(netif_queue_stopped(priv->dev) &&
                      stmmac_tx_avail(priv) > STMMAC_TX_THRESH(priv))) {
@@ -689,6 +780,11 @@ static void stmmac_tx(struct stmmac_priv *priv)
                 }
                 netif_tx_unlock(priv->dev);
         }
+
+        if ((priv->eee_enabled) && (!priv->tx_path_in_lpi_mode)) {
+                stmmac_enable_eee_mode(priv);
+                mod_timer(&priv->eee_ctrl_timer, STMMAC_LPI_TIMER(eee_timer));
+        }
         spin_unlock(&priv->tx_lock);
 }
 
@@ -1027,6 +1123,17 @@ static int stmmac_open(struct net_device *dev)
                 }
         }
 
+        /* Request the IRQ lines */
+        if (priv->lpi_irq != -ENXIO) {
+                ret = request_irq(priv->lpi_irq, stmmac_interrupt, IRQF_SHARED,
+                                  dev->name, dev);
+                if (unlikely(ret < 0)) {
+                        pr_err("%s: ERROR: allocating the LPI IRQ %d (%d)\n",
+                               __func__, priv->lpi_irq, ret);
+                        goto open_error_lpiirq;
+                }
+        }
+
         /* Enable the MAC Rx/Tx */
         stmmac_set_mac(priv->ioaddr, true);
 
@@ -1062,12 +1169,19 @@ static int stmmac_open(struct net_device *dev)
         if (priv->phydev)
                 phy_start(priv->phydev);
 
+        priv->tx_lpi_timer = STMMAC_DEFAULT_TWT_LS_TIMER;
+        priv->eee_enabled = stmmac_eee_init(priv);
+
         napi_enable(&priv->napi);
         skb_queue_head_init(&priv->rx_recycle);
         netif_start_queue(dev);
 
         return 0;
 
+open_error_lpiirq:
+        if (priv->wol_irq != dev->irq)
+                free_irq(priv->wol_irq, dev);
+
 open_error_wolirq:
         free_irq(dev->irq, dev);
 
@@ -1093,6 +1207,9 @@ static int stmmac_release(struct net_device *dev)
 {
         struct stmmac_priv *priv = netdev_priv(dev);
 
+        if (priv->eee_enabled)
+                del_timer_sync(&priv->eee_ctrl_timer);
+
         /* Stop and disconnect the PHY */
         if (priv->phydev) {
                 phy_stop(priv->phydev);
@@ -1115,6 +1232,8 @@ static int stmmac_release(struct net_device *dev)
         free_irq(dev->irq, dev);
         if (priv->wol_irq != dev->irq)
                 free_irq(priv->wol_irq, dev);
+        if (priv->lpi_irq != -ENXIO)
+                free_irq(priv->lpi_irq, dev);
 
         /* Stop TX/RX DMA and clear the descriptors */
         priv->hw->dma->stop_tx(priv->ioaddr);
@@ -1164,6 +1283,9 @@ static netdev_tx_t stmmac_xmit(struct sk_buff *skb, struct net_device *dev)
 
         spin_lock(&priv->tx_lock);
 
+        if (priv->tx_path_in_lpi_mode)
+                stmmac_disable_eee_mode(priv);
+
         entry = priv->cur_tx % txsize;
 
 #ifdef STMMAC_XMIT_DEBUG
@@ -1311,7 +1433,6 @@ static int stmmac_rx(struct stmmac_priv *priv, int limit)
                 display_ring(priv->dma_rx, rxsize);
         }
 #endif
-        count = 0;
         while (!priv->hw->desc->get_rx_owner(p)) {
                 int status;
 
@@ -1544,10 +1665,37 @@ static irqreturn_t stmmac_interrupt(int irq, void *dev_id)
                 return IRQ_NONE;
         }
 
-        if (priv->plat->has_gmac)
-                /* To handle GMAC own interrupts */
-                priv->hw->mac->host_irq_status((void __iomem *) dev->base_addr);
+        /* To handle GMAC own interrupts */
+        if (priv->plat->has_gmac) {
+                int status = priv->hw->mac->host_irq_status((void __iomem *)
+                                                            dev->base_addr);
+                if (unlikely(status)) {
+                        if (status & core_mmc_tx_irq)
+                                priv->xstats.mmc_tx_irq_n++;
+                        if (status & core_mmc_rx_irq)
+                                priv->xstats.mmc_rx_irq_n++;
+                        if (status & core_mmc_rx_csum_offload_irq)
+                                priv->xstats.mmc_rx_csum_offload_irq_n++;
+                        if (status & core_irq_receive_pmt_irq)
+                                priv->xstats.irq_receive_pmt_irq_n++;
+
+                        /* For LPI we need to save the tx status */
+                        if (status & core_irq_tx_path_in_lpi_mode) {
+                                priv->xstats.irq_tx_path_in_lpi_mode_n++;
+                                priv->tx_path_in_lpi_mode = true;
+                        }
+                        if (status & core_irq_tx_path_exit_lpi_mode) {
+                                priv->xstats.irq_tx_path_exit_lpi_mode_n++;
+                                priv->tx_path_in_lpi_mode = false;
+                        }
+                        if (status & core_irq_rx_path_in_lpi_mode)
+                                priv->xstats.irq_rx_path_in_lpi_mode_n++;
+                        if (status & core_irq_rx_path_exit_lpi_mode)
+                                priv->xstats.irq_rx_path_exit_lpi_mode_n++;
+                }
+        }
 
+        /* To handle DMA interrupts */
         stmmac_dma_interrupt(priv);
 
         return IRQ_HANDLED;
@@ -2133,42 +2281,38 @@ static int __init stmmac_cmdline_opt(char *str)
                 return -EINVAL;
         while ((opt = strsep(&str, ",")) != NULL) {
                 if (!strncmp(opt, "debug:", 6)) {
-                        if (strict_strtoul(opt + 6, 0, (unsigned long *)&debug))
+                        if (kstrtoint(opt + 6, 0, &debug))
                                 goto err;
                 } else if (!strncmp(opt, "phyaddr:", 8)) {
-                        if (strict_strtoul(opt + 8, 0,
-                                           (unsigned long *)&phyaddr))
+                        if (kstrtoint(opt + 8, 0, &phyaddr))
                                 goto err;
                 } else if (!strncmp(opt, "dma_txsize:", 11)) {
-                        if (strict_strtoul(opt + 11, 0,
-                                           (unsigned long *)&dma_txsize))
+                        if (kstrtoint(opt + 11, 0, &dma_txsize))
                                 goto err;
                 } else if (!strncmp(opt, "dma_rxsize:", 11)) {
-                        if (strict_strtoul(opt + 11, 0,
-                                           (unsigned long *)&dma_rxsize))
+                        if (kstrtoint(opt + 11, 0, &dma_rxsize))
                                 goto err;
                 } else if (!strncmp(opt, "buf_sz:", 7)) {
-                        if (strict_strtoul(opt + 7, 0,
-                                           (unsigned long *)&buf_sz))
+                        if (kstrtoint(opt + 7, 0, &buf_sz))
                                 goto err;
                 } else if (!strncmp(opt, "tc:", 3)) {
-                        if (strict_strtoul(opt + 3, 0, (unsigned long *)&tc))
+                        if (kstrtoint(opt + 3, 0, &tc))
                                 goto err;
                 } else if (!strncmp(opt, "watchdog:", 9)) {
-                        if (strict_strtoul(opt + 9, 0,
-                                           (unsigned long *)&watchdog))
+                        if (kstrtoint(opt + 9, 0, &watchdog))
                                 goto err;
                 } else if (!strncmp(opt, "flow_ctrl:", 10)) {
-                        if (strict_strtoul(opt + 10, 0,
-                                           (unsigned long *)&flow_ctrl))
+                        if (kstrtoint(opt + 10, 0, &flow_ctrl))
                                 goto err;
                 } else if (!strncmp(opt, "pause:", 6)) {
-                        if (strict_strtoul(opt + 6, 0, (unsigned long *)&pause))
+                        if (kstrtoint(opt + 6, 0, &pause))
+                                goto err;
+                } else if (!strncmp(opt, "eee_timer:", 6)) {
+                        if (kstrtoint(opt + 10, 0, &eee_timer))
                                 goto err;
 #ifdef CONFIG_STMMAC_TIMER
                 } else if (!strncmp(opt, "tmrate:", 7)) {
-                        if (strict_strtoul(opt + 7, 0,
-                                           (unsigned long *)&tmrate))
+                        if (kstrtoint(opt + 7, 0, &tmrate))
                                 goto err;
 #endif
                 }
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c
index cf826e6b6aa..13afb8edfad 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c
@@ -125,7 +125,7 @@ err_out_req_reg_failed:
 }
 
 /**
- * stmmac_dvr_remove
+ * stmmac_pci_remove
  *
  * @pdev: platform device pointer
  * Description: this function calls the main to free the net resources
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
index 680d2b8dfe2..7d36163d0d2 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
@@ -156,6 +156,8 @@ static int stmmac_pltfr_probe(struct platform_device *pdev)
         if (priv->wol_irq == -ENXIO)
                 priv->wol_irq = priv->dev->irq;
 
+        priv->lpi_irq = platform_get_irq_byname(pdev, "eth_lpi");
+
         platform_set_drvdata(pdev, priv->dev);
 
         pr_debug("STMMAC platform driver registration completed");
@@ -190,7 +192,7 @@ static int stmmac_pltfr_remove(struct platform_device *pdev)
 
         platform_set_drvdata(pdev, NULL);
 
-        iounmap((void *)priv->ioaddr);
+        iounmap((void __force __iomem *)priv->ioaddr);
         res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
         release_mem_region(res->start, resource_size(res));
 
diff --git a/drivers/net/ethernet/sun/sunbmac.c b/drivers/net/ethernet/sun/sunbmac.c
index 2a83fc57edb..967fe8cb476 100644
--- a/drivers/net/ethernet/sun/sunbmac.c
+++ b/drivers/net/ethernet/sun/sunbmac.c
@@ -233,7 +233,6 @@ static void bigmac_init_rings(struct bigmac *bp, int from_irq)
                         continue;
 
                 bp->rx_skbs[i] = skb;
-                skb->dev = dev;
 
                 /* Because we reserve afterwards. */
                 skb_put(skb, ETH_FRAME_LEN);
@@ -838,7 +837,6 @@ static void bigmac_rx(struct bigmac *bp)
                                          RX_BUF_ALLOC_SIZE - 34,
                                          DMA_FROM_DEVICE);
                         bp->rx_skbs[elem] = new_skb;
-                        new_skb->dev = bp->dev;
                         skb_put(new_skb, ETH_FRAME_LEN);
                         skb_reserve(new_skb, 34);
                         this->rx_addr =
diff --git a/drivers/net/ethernet/sun/sungem.c b/drivers/net/ethernet/sun/sungem.c
index 3cf4ab75583..9ae12d0c963 100644
--- a/drivers/net/ethernet/sun/sungem.c
+++ b/drivers/net/ethernet/sun/sungem.c
@@ -752,7 +752,6 @@ static __inline__ struct sk_buff *gem_alloc_skb(struct net_device *dev, int size
         if (likely(skb)) {
                 unsigned long offset = ALIGNED_RX_SKB_ADDR(skb->data);
                 skb_reserve(skb, offset);
-                skb->dev = dev;
         }
         return skb;
 }
diff --git a/drivers/net/ethernet/sun/sunhme.c b/drivers/net/ethernet/sun/sunhme.c
index dfc00c4683e..73f341b8bef 100644
--- a/drivers/net/ethernet/sun/sunhme.c
+++ b/drivers/net/ethernet/sun/sunhme.c
@@ -1249,7 +1249,6 @@ static void happy_meal_clean_rings(struct happy_meal *hp)
 static void happy_meal_init_rings(struct happy_meal *hp)
 {
         struct hmeal_init_block *hb = hp->happy_block;
-        struct net_device *dev = hp->dev;
         int i;
 
         HMD(("happy_meal_init_rings: counters to zero, "));
@@ -1270,7 +1269,6 @@ static void happy_meal_init_rings(struct happy_meal *hp)
                         continue;
                 }
                 hp->rx_skbs[i] = skb;
-                skb->dev = dev;
 
                 /* Because we reserve afterwards. */
                 skb_put(skb, (ETH_FRAME_LEN + RX_OFFSET + 4));
@@ -2031,7 +2029,6 @@ static void happy_meal_rx(struct happy_meal *hp, struct net_device *dev)
                         }
                         dma_unmap_single(hp->dma_dev, dma_addr, RX_BUF_ALLOC_SIZE, DMA_FROM_DEVICE);
                         hp->rx_skbs[elem] = new_skb;
-                        new_skb->dev = dev;
                         skb_put(new_skb, (ETH_FRAME_LEN + RX_OFFSET + 4));
                         hme_write_rxd(hp, this,
                                       (RXFLAG_OWN|((RX_BUF_ALLOC_SIZE-RX_OFFSET)<<16)),
diff --git a/drivers/net/ethernet/sun/sunqe.c b/drivers/net/ethernet/sun/sunqe.c
index 7d4a040d84a..aeded7ff1c8 100644
--- a/drivers/net/ethernet/sun/sunqe.c
+++ b/drivers/net/ethernet/sun/sunqe.c
@@ -441,7 +441,7 @@ static void qe_rx(struct sunqe *qep)
                         } else {
                                 skb_reserve(skb, 2);
                                 skb_put(skb, len);
-                                skb_copy_to_linear_data(skb, (unsigned char *) this_qbuf,
+                                skb_copy_to_linear_data(skb, this_qbuf,
                                                  len);
                                 skb->protocol = eth_type_trans(skb, qep->dev);
                                 netif_rx(skb);
diff --git a/drivers/net/ethernet/tehuti/tehuti.c b/drivers/net/ethernet/tehuti/tehuti.c
index 447a6932cab..6ce9edd95c0 100644
--- a/drivers/net/ethernet/tehuti/tehuti.c
+++ b/drivers/net/ethernet/tehuti/tehuti.c
@@ -137,14 +137,15 @@ static void print_eth_id(struct net_device *ndev)
 #define bdx_disable_interrupts(priv)    \
         do { WRITE_REG(priv, regIMR, 0); } while (0)
 
-/* bdx_fifo_init
- * create TX/RX descriptor fifo for host-NIC communication.
+/**
+ * bdx_fifo_init - create TX/RX descriptor fifo for host-NIC communication.
+ * @priv: NIC private structure
+ * @f: fifo to initialize
+ * @fsz_type: fifo size type: 0-4KB, 1-8KB, 2-16KB, 3-32KB
+ * @reg_XXX: offsets of registers relative to base address
+ *
  * 1K extra space is allocated at the end of the fifo to simplify
  * processing of descriptors that wraps around fifo's end
- * @priv - NIC private structure
- * @f - fifo to initialize
- * @fsz_type - fifo size type: 0-4KB, 1-8KB, 2-16KB, 3-32KB
- * @reg_XXX - offsets of registers relative to base address
  *
  * Returns 0 on success, negative value on failure
  *
@@ -177,9 +178,10 @@ bdx_fifo_init(struct bdx_priv *priv, struct fifo *f, int fsz_type,
         RET(0);
 }
 
-/* bdx_fifo_free - free all resources used by fifo
- * @priv - NIC private structure
- * @f - fifo to release
+/**
+ * bdx_fifo_free - free all resources used by fifo
+ * @priv: NIC private structure
+ * @f: fifo to release
  */
 static void bdx_fifo_free(struct bdx_priv *priv, struct fifo *f)
 {
@@ -192,9 +194,9 @@ static void bdx_fifo_free(struct bdx_priv *priv, struct fifo *f)
         RET();
 }
 
-/*
+/**
  * bdx_link_changed - notifies OS about hw link state.
- * @bdx_priv - hw adapter structure
+ * @priv: hw adapter structure
  */
 static void bdx_link_changed(struct bdx_priv *priv)
 {
@@ -233,10 +235,10 @@ static void bdx_isr_extra(struct bdx_priv *priv, u32 isr)
 
 }
 
-/* bdx_isr - Interrupt Service Routine for Bordeaux NIC
- * @irq - interrupt number
- * @ndev - network device
- * @regs - CPU registers
+/**
+ * bdx_isr_napi - Interrupt Service Routine for Bordeaux NIC
+ * @irq: interrupt number
+ * @dev: network device
  *
  * Return IRQ_NONE if it was not our interrupt, IRQ_HANDLED - otherwise
  *
@@ -307,8 +309,10 @@ static int bdx_poll(struct napi_struct *napi, int budget)
         return work_done;
 }
 
-/* bdx_fw_load - loads firmware to NIC
- * @priv - NIC private structure
+/**
+ * bdx_fw_load - loads firmware to NIC
+ * @priv: NIC private structure
+ *
  * Firmware is loaded via TXD fifo, so it must be initialized first.
  * Firware must be loaded once per NIC not per PCI device provided by NIC (NIC
  * can have few of them). So all drivers use semaphore register to choose one
@@ -380,8 +384,9 @@ static void bdx_restore_mac(struct net_device *ndev, struct bdx_priv *priv)
         RET();
 }
 
-/* bdx_hw_start - inits registers and starts HW's Rx and Tx engines
- * @priv - NIC private structure
+/**
+ * bdx_hw_start - inits registers and starts HW's Rx and Tx engines
+ * @priv: NIC private structure
  */
 static int bdx_hw_start(struct bdx_priv *priv)
 {
@@ -691,12 +696,13 @@ static int bdx_ioctl(struct net_device *ndev, struct ifreq *ifr, int cmd)
                 RET(-EOPNOTSUPP);
 }
 
-/*
+/**
  * __bdx_vlan_rx_vid - private helper for adding/killing VLAN vid
- *                     by passing VLAN filter table to hardware
- * @ndev network device
- * @vid  VLAN vid
- * @op   add or kill operation
+ * @ndev: network device
+ * @vid:  VLAN vid
+ * @op:   add or kill operation
+ *
+ * Passes VLAN filter table to hardware
  */
 static void __bdx_vlan_rx_vid(struct net_device *ndev, uint16_t vid, int enable)
 {
@@ -722,10 +728,10 @@ static void __bdx_vlan_rx_vid(struct net_device *ndev, uint16_t vid, int enable)
         RET();
 }
 
-/*
+/**
  * bdx_vlan_rx_add_vid - kernel hook for adding VLAN vid to hw filtering table
- * @ndev network device
- * @vid  VLAN vid to add
+ * @ndev: network device
+ * @vid:  VLAN vid to add
  */
 static int bdx_vlan_rx_add_vid(struct net_device *ndev, uint16_t vid)
 {
@@ -733,10 +739,10 @@ static int bdx_vlan_rx_add_vid(struct net_device *ndev, uint16_t vid)
         return 0;
 }
 
-/*
+/**
  * bdx_vlan_rx_kill_vid - kernel hook for killing VLAN vid in hw filtering table
- * @ndev network device
- * @vid  VLAN vid to kill
+ * @ndev: network device
+ * @vid:  VLAN vid to kill
  */
 static int bdx_vlan_rx_kill_vid(struct net_device *ndev, unsigned short vid)
 {
@@ -974,8 +980,9 @@ static inline void bdx_rxdb_free_elem(struct rxdb *db, int n)
  *     Rx Init                                                           *
  *************************************************************************/
 
-/* bdx_rx_init - initialize RX all related HW and SW resources
- * @priv - NIC private structure
+/**
+ * bdx_rx_init - initialize RX all related HW and SW resources
+ * @priv: NIC private structure
  *
  * Returns 0 on success, negative value on failure
  *
@@ -1016,9 +1023,10 @@ err_mem:
         return -ENOMEM;
 }
 
-/* bdx_rx_free_skbs - frees and unmaps all skbs allocated for the fifo
- * @priv - NIC private structure
- * @f - RXF fifo
+/**
+ * bdx_rx_free_skbs - frees and unmaps all skbs allocated for the fifo
+ * @priv: NIC private structure
+ * @f: RXF fifo
  */
 static void bdx_rx_free_skbs(struct bdx_priv *priv, struct rxf_fifo *f)
 {
@@ -1045,8 +1053,10 @@ static void bdx_rx_free_skbs(struct bdx_priv *priv, struct rxf_fifo *f)
         }
 }
 
-/* bdx_rx_free - release all Rx resources
- * @priv - NIC private structure
+/**
+ * bdx_rx_free - release all Rx resources
+ * @priv: NIC private structure
+ *
  * It assumes that Rx is desabled in HW
  */
 static void bdx_rx_free(struct bdx_priv *priv)
@@ -1067,9 +1077,11 @@ static void bdx_rx_free(struct bdx_priv *priv)
  *     Rx Engine                                                         *
  *************************************************************************/
 
-/* bdx_rx_alloc_skbs - fill rxf fifo with new skbs
- * @priv - nic's private structure
- * @f - RXF fifo that needs skbs
+/**
+ * bdx_rx_alloc_skbs - fill rxf fifo with new skbs
+ * @priv: nic's private structure
+ * @f: RXF fifo that needs skbs
+ *
  * It allocates skbs, build rxf descs and push it (rxf descr) into rxf fifo.
  * skb's virtual and physical addresses are stored in skb db.
  * To calculate free space, func uses cached values of RPTR and WPTR
@@ -1179,13 +1191,15 @@ static void bdx_recycle_skb(struct bdx_priv *priv, struct rxd_desc *rxdd)
         RET();
 }
 
-/* bdx_rx_receive - receives full packets from RXD fifo and pass them to OS
+/**
+ * bdx_rx_receive - receives full packets from RXD fifo and pass them to OS
  * NOTE: a special treatment is given to non-continuous descriptors
  * that start near the end, wraps around and continue at the beginning. a second
  * part is copied right after the first, and then descriptor is interpreted as
  * normal. fifo has an extra space to allow such operations
- * @priv - nic's private structure
- * @f - RXF fifo that needs skbs
+ * @priv: nic's private structure
+ * @f: RXF fifo that needs skbs
+ * @budget: maximum number of packets to receive
  */
 
 /* TBD: replace memcpy func call by explicite inline asm */
@@ -1375,9 +1389,10 @@ static inline int bdx_tx_db_size(struct txdb *db)
         return db->size - taken;
 }
 
-/* __bdx_tx_ptr_next - helper function, increment read/write pointer + wrap
- * @d   - tx data base
- * @ptr - read or write pointer
+/**
+ * __bdx_tx_db_ptr_next - helper function, increment read/write pointer + wrap
+ * @db: tx data base
+ * @pptr: read or write pointer
  */
 static inline void __bdx_tx_db_ptr_next(struct txdb *db, struct tx_map **pptr)
 {
@@ -1394,8 +1409,9 @@ static inline void __bdx_tx_db_ptr_next(struct txdb *db, struct tx_map **pptr)
                 *pptr = db->start;
 }
 
-/* bdx_tx_db_inc_rptr - increment read pointer
- * @d   - tx data base
+/**
+ * bdx_tx_db_inc_rptr - increment read pointer
+ * @db: tx data base
  */
 static inline void bdx_tx_db_inc_rptr(struct txdb *db)
 {
@@ -1403,8 +1419,9 @@ static inline void bdx_tx_db_inc_rptr(struct txdb *db)
         __bdx_tx_db_ptr_next(db, &db->rptr);
 }
 
-/* bdx_tx_db_inc_rptr - increment write pointer
- * @d   - tx data base
+/**
+ * bdx_tx_db_inc_wptr - increment write pointer
+ * @db: tx data base
  */
 static inline void bdx_tx_db_inc_wptr(struct txdb *db)
 {
@@ -1413,9 +1430,11 @@ static inline void bdx_tx_db_inc_wptr(struct txdb *db)
                                                    a result of write */
 }
 
-/* bdx_tx_db_init - creates and initializes tx db
- * @d       - tx data base
- * @sz_type - size of tx fifo
+/**
+ * bdx_tx_db_init - creates and initializes tx db
+ * @d: tx data base
+ * @sz_type: size of tx fifo
+ *
  * Returns 0 on success, error code otherwise
  */
 static int bdx_tx_db_init(struct txdb *d, int sz_type)
@@ -1441,8 +1460,9 @@ static int bdx_tx_db_init(struct txdb *d, int sz_type)
         return 0;
 }
 
-/* bdx_tx_db_close - closes tx db and frees all memory
- * @d - tx data base
+/**
+ * bdx_tx_db_close - closes tx db and frees all memory
+ * @d: tx data base
  */
 static void bdx_tx_db_close(struct txdb *d)
 {
@@ -1463,9 +1483,11 @@ static struct {
         u16 qwords;             /* qword = 64 bit */
 } txd_sizes[MAX_SKB_FRAGS + 1];
 
-/* txdb_map_skb - creates and stores dma mappings for skb's data blocks
- * @priv - NIC private structure
- * @skb  - socket buffer to map
+/**
+ * bdx_tx_map_skb - creates and stores dma mappings for skb's data blocks
+ * @priv: NIC private structure
+ * @skb: socket buffer to map
+ * @txdd: TX descriptor to use
  *
  * It makes dma mappings for skb's data blocks and writes them to PBL of
  * new tx descriptor. It also stores them in the tx db, so they could be
@@ -1562,9 +1584,10 @@ err_mem:
         return -ENOMEM;
 }
 
-/*
+/**
  * bdx_tx_space - calculates available space in TX fifo
- * @priv - NIC private structure
+ * @priv: NIC private structure
+ *
  * Returns available space in TX fifo in bytes
  */
 static inline int bdx_tx_space(struct bdx_priv *priv)
@@ -1579,9 +1602,10 @@ static inline int bdx_tx_space(struct bdx_priv *priv)
         return fsize;
 }
 
-/* bdx_tx_transmit - send packet to NIC
- * @skb - packet to send
- * ndev - network device assigned to NIC
+/**
+ * bdx_tx_transmit - send packet to NIC
+ * @skb: packet to send
+ * @ndev: network device assigned to NIC
  * Return codes:
  * o NETDEV_TX_OK everything ok.
  * o NETDEV_TX_BUSY Cannot transmit packet, try later
@@ -1699,8 +1723,10 @@ static netdev_tx_t bdx_tx_transmit(struct sk_buff *skb,
         return NETDEV_TX_OK;
 }
 
-/* bdx_tx_cleanup - clean TXF fifo, run in the context of IRQ.
- * @priv - bdx adapter
+/**
+ * bdx_tx_cleanup - clean TXF fifo, run in the context of IRQ.
+ * @priv: bdx adapter
+ *
  * It scans TXF fifo for descriptors, frees DMA mappings and reports to OS
  * that those packets were sent
  */
@@ -1761,7 +1787,8 @@ static void bdx_tx_cleanup(struct bdx_priv *priv)
         spin_unlock(&priv->tx_lock);
 }
 
-/* bdx_tx_free_skbs - frees all skbs from TXD fifo.
+/**
+ * bdx_tx_free_skbs - frees all skbs from TXD fifo.
  * It gets called when OS stops this dev, eg upon "ifconfig down" or rmmod
  */
 static void bdx_tx_free_skbs(struct bdx_priv *priv)
@@ -1790,10 +1817,11 @@ static void bdx_tx_free(struct bdx_priv *priv)
         bdx_tx_db_close(&priv->txdb);
 }
 
-/* bdx_tx_push_desc - push descriptor to TxD fifo
- * @priv - NIC private structure
- * @data - desc's data
- * @size - desc's size
+/**
+ * bdx_tx_push_desc - push descriptor to TxD fifo
+ * @priv: NIC private structure
+ * @data: desc's data
+ * @size: desc's size
  *
  * Pushes desc to TxD fifo and overlaps it if needed.
  * NOTE: this func does not check for available space. this is responsibility
@@ -1819,10 +1847,11 @@ static void bdx_tx_push_desc(struct bdx_priv *priv, void *data, int size)
         WRITE_REG(priv, f->m.reg_WPTR, f->m.wptr & TXF_WPTR_WR_PTR);
 }
 
-/* bdx_tx_push_desc_safe - push descriptor to TxD fifo in a safe way
- * @priv - NIC private structure
- * @data - desc's data
- * @size - desc's size
+/**
+ * bdx_tx_push_desc_safe - push descriptor to TxD fifo in a safe way
+ * @priv: NIC private structure
+ * @data: desc's data
+ * @size: desc's size
  *
  * NOTE: this func does check for available space and, if necessary, waits for
  *   NIC to read existing data before writing new one.
diff --git a/drivers/net/ethernet/ti/davinci_emac.c b/drivers/net/ethernet/ti/davinci_emac.c
index 4da93a5d7ec..ab0bbb78699 100644
--- a/drivers/net/ethernet/ti/davinci_emac.c
+++ b/drivers/net/ethernet/ti/davinci_emac.c
@@ -375,7 +375,7 @@ static char *emac_rxhost_errcodes[16] = {
 #define emac_ctrl_write(reg, val) iowrite32(val, (priv->ctrl_base + (reg)))
 
 /**
- * emac_dump_regs: Dump important EMAC registers to debug terminal
+ * emac_dump_regs - Dump important EMAC registers to debug terminal
  * @priv: The DaVinci EMAC private adapter structure
  *
  * Executes ethtool set cmd & sets phy mode
@@ -466,7 +466,7 @@ static void emac_dump_regs(struct emac_priv *priv)
 }
 
 /**
- * emac_get_drvinfo: Get EMAC driver information
+ * emac_get_drvinfo - Get EMAC driver information
  * @ndev: The DaVinci EMAC network adapter
  * @info: ethtool info structure containing name and version
  *
@@ -481,7 +481,7 @@ static void emac_get_drvinfo(struct net_device *ndev,
 }
 
 /**
- * emac_get_settings: Get EMAC settings
+ * emac_get_settings - Get EMAC settings
  * @ndev: The DaVinci EMAC network adapter
  * @ecmd: ethtool command
  *
@@ -500,7 +500,7 @@ static int emac_get_settings(struct net_device *ndev,
 }
 
 /**
- * emac_set_settings: Set EMAC settings
+ * emac_set_settings - Set EMAC settings
  * @ndev: The DaVinci EMAC network adapter
  * @ecmd: ethtool command
  *
@@ -518,7 +518,7 @@ static int emac_set_settings(struct net_device *ndev, struct ethtool_cmd *ecmd)
 }
 
 /**
- * emac_get_coalesce : Get interrupt coalesce settings for this device
+ * emac_get_coalesce - Get interrupt coalesce settings for this device
  * @ndev : The DaVinci EMAC network adapter
  * @coal : ethtool coalesce settings structure
  *
@@ -536,7 +536,7 @@ static int emac_get_coalesce(struct net_device *ndev,
 }
 
 /**
- * emac_set_coalesce : Set interrupt coalesce settings for this device
+ * emac_set_coalesce - Set interrupt coalesce settings for this device
  * @ndev : The DaVinci EMAC network adapter
  * @coal : ethtool coalesce settings structure
  *
@@ -614,11 +614,9 @@ static int emac_set_coalesce(struct net_device *ndev,
 }
 
 
-/**
- * ethtool_ops: DaVinci EMAC Ethtool structure
+/* ethtool_ops: DaVinci EMAC Ethtool structure
  *
  * Ethtool support for EMAC adapter
- *
  */
 static const struct ethtool_ops ethtool_ops = {
         .get_drvinfo = emac_get_drvinfo,
@@ -631,7 +629,7 @@ static const struct ethtool_ops ethtool_ops = {
 };
 
 /**
- * emac_update_phystatus: Update Phy status
+ * emac_update_phystatus - Update Phy status
  * @priv: The DaVinci EMAC private adapter structure
  *
  * Updates phy status and takes action for network queue if required
@@ -697,7 +695,7 @@ static void emac_update_phystatus(struct emac_priv *priv)
 }
 
 /**
- * hash_get: Calculate hash value from mac address
+ * hash_get - Calculate hash value from mac address
  * @addr: mac address to delete from hash table
  *
  * Calculates hash value from mac address
@@ -723,9 +721,9 @@ static u32 hash_get(u8 *addr)
 }
 
 /**
- * hash_add: Hash function to add mac addr from hash table
+ * hash_add - Hash function to add mac addr from hash table
  * @priv: The DaVinci EMAC private adapter structure
- * mac_addr: mac address to delete from hash table
+ * @mac_addr: mac address to delete from hash table
  *
  * Adds mac address to the internal hash table
  *
@@ -765,9 +763,9 @@ static int hash_add(struct emac_priv *priv, u8 *mac_addr)
 }
 
 /**
- * hash_del: Hash function to delete mac addr from hash table
+ * hash_del - Hash function to delete mac addr from hash table
  * @priv: The DaVinci EMAC private adapter structure
- * mac_addr: mac address to delete from hash table
+ * @mac_addr: mac address to delete from hash table
  *
  * Removes mac address from the internal hash table
  *
@@ -807,7 +805,7 @@ static int hash_del(struct emac_priv *priv, u8 *mac_addr)
 #define EMAC_ALL_MULTI_CLR      3
 
 /**
- * emac_add_mcast: Set multicast address in the EMAC adapter (Internal)
+ * emac_add_mcast - Set multicast address in the EMAC adapter (Internal)
  * @priv: The DaVinci EMAC private adapter structure
  * @action: multicast operation to perform
  * mac_addr: mac address to set
@@ -855,7 +853,7 @@ static void emac_add_mcast(struct emac_priv *priv, u32 action, u8 *mac_addr)
 }
 
 /**
- * emac_dev_mcast_set: Set multicast address in the EMAC adapter
+ * emac_dev_mcast_set - Set multicast address in the EMAC adapter
  * @ndev: The DaVinci EMAC network adapter
  *
  * Set multicast addresses in EMAC adapter
@@ -901,7 +899,7 @@ static void emac_dev_mcast_set(struct net_device *ndev)
  *************************************************************************/
 
 /**
- * emac_int_disable: Disable EMAC module interrupt (from adapter)
+ * emac_int_disable - Disable EMAC module interrupt (from adapter)
  * @priv: The DaVinci EMAC private adapter structure
  *
  * Disable EMAC interrupt on the adapter
@@ -931,7 +929,7 @@ static void emac_int_disable(struct emac_priv *priv)
 }
 
 /**
- * emac_int_enable: Enable EMAC module interrupt (from adapter)
+ * emac_int_enable - Enable EMAC module interrupt (from adapter)
  * @priv: The DaVinci EMAC private adapter structure
  *
  * Enable EMAC interrupt on the adapter
@@ -967,7 +965,7 @@ static void emac_int_enable(struct emac_priv *priv)
 }
 
 /**
- * emac_irq: EMAC interrupt handler
+ * emac_irq - EMAC interrupt handler
  * @irq: interrupt number
  * @dev_id: EMAC network adapter data structure ptr
  *
@@ -1060,7 +1058,7 @@ static void emac_tx_handler(void *token, int len, int status)
 }
 
 /**
- * emac_dev_xmit: EMAC Transmit function
+ * emac_dev_xmit - EMAC Transmit function
  * @skb: SKB pointer
  * @ndev: The DaVinci EMAC network adapter
  *
@@ -1111,7 +1109,7 @@ fail_tx:
 }
 
 /**
- * emac_dev_tx_timeout: EMAC Transmit timeout function
+ * emac_dev_tx_timeout - EMAC Transmit timeout function
  * @ndev: The DaVinci EMAC network adapter
  *
  * Called when system detects that a skb timeout period has expired
@@ -1138,7 +1136,7 @@ static void emac_dev_tx_timeout(struct net_device *ndev)
 }
 
 /**
- * emac_set_type0addr: Set EMAC Type0 mac address
+ * emac_set_type0addr - Set EMAC Type0 mac address
  * @priv: The DaVinci EMAC private adapter structure
  * @ch: RX channel number
  * @mac_addr: MAC address to set in device
@@ -1165,7 +1163,7 @@ static void emac_set_type0addr(struct emac_priv *priv, u32 ch, char *mac_addr)
 }
 
 /**
- * emac_set_type1addr: Set EMAC Type1 mac address
+ * emac_set_type1addr - Set EMAC Type1 mac address
  * @priv: The DaVinci EMAC private adapter structure
  * @ch: RX channel number
  * @mac_addr: MAC address to set in device
@@ -1187,7 +1185,7 @@ static void emac_set_type1addr(struct emac_priv *priv, u32 ch, char *mac_addr)
 }
 
 /**
- * emac_set_type2addr: Set EMAC Type2 mac address
+ * emac_set_type2addr - Set EMAC Type2 mac address
  * @priv: The DaVinci EMAC private adapter structure
  * @ch: RX channel number
  * @mac_addr: MAC address to set in device
@@ -1213,7 +1211,7 @@ static void emac_set_type2addr(struct emac_priv *priv, u32 ch,
 }
 
 /**
- * emac_setmac: Set mac address in the adapter (internal function)
+ * emac_setmac - Set mac address in the adapter (internal function)
  * @priv: The DaVinci EMAC private adapter structure
  * @ch: RX channel number
  * @mac_addr: MAC address to set in device
@@ -1242,7 +1240,7 @@ static void emac_setmac(struct emac_priv *priv, u32 ch, char *mac_addr)
 }
 
 /**
- * emac_dev_setmac_addr: Set mac address in the adapter
+ * emac_dev_setmac_addr - Set mac address in the adapter
  * @ndev: The DaVinci EMAC network adapter
  * @addr: MAC address to set in device
  *
@@ -1277,7 +1275,7 @@ static int emac_dev_setmac_addr(struct net_device *ndev, void *addr)
 }
 
 /**
- * emac_hw_enable: Enable EMAC hardware for packet transmission/reception
+ * emac_hw_enable - Enable EMAC hardware for packet transmission/reception
  * @priv: The DaVinci EMAC private adapter structure
  *
  * Enables EMAC hardware for packet processing - enables PHY, enables RX
@@ -1347,7 +1345,7 @@ static int emac_hw_enable(struct emac_priv *priv)
 }
 
 /**
- * emac_poll: EMAC NAPI Poll function
+ * emac_poll - EMAC NAPI Poll function
  * @ndev: The DaVinci EMAC network adapter
  * @budget: Number of receive packets to process (as told by NAPI layer)
  *
@@ -1430,7 +1428,7 @@ static int emac_poll(struct napi_struct *napi, int budget)
 
 #ifdef CONFIG_NET_POLL_CONTROLLER
 /**
- * emac_poll_controller: EMAC Poll controller function
+ * emac_poll_controller - EMAC Poll controller function
  * @ndev: The DaVinci EMAC network adapter
  *
  * Polled functionality used by netconsole and others in non interrupt mode
@@ -1489,7 +1487,7 @@ static void emac_adjust_link(struct net_device *ndev)
  *************************************************************************/
 
 /**
- * emac_devioctl: EMAC adapter ioctl
+ * emac_devioctl - EMAC adapter ioctl
  * @ndev: The DaVinci EMAC network adapter
  * @ifrq: request parameter
  * @cmd: command parameter
@@ -1516,7 +1514,7 @@ static int match_first_device(struct device *dev, void *data)
 }
 
 /**
- * emac_dev_open: EMAC device open
+ * emac_dev_open - EMAC device open
  * @ndev: The DaVinci EMAC network adapter
  *
  * Called when system wants to start the interface. We init TX/RX channels
@@ -1649,7 +1647,7 @@ rollback:
 }
 
 /**
- * emac_dev_stop: EMAC device stop
+ * emac_dev_stop - EMAC device stop
  * @ndev: The DaVinci EMAC network adapter
  *
  * Called when system wants to stop or down the interface. We stop the network
@@ -1691,7 +1689,7 @@ static int emac_dev_stop(struct net_device *ndev)
 }
 
 /**
- * emac_dev_getnetstats: EMAC get statistics function
+ * emac_dev_getnetstats - EMAC get statistics function
  * @ndev: The DaVinci EMAC network adapter
  *
  * Called when system wants to get statistics from the device.
@@ -1763,7 +1761,7 @@ static const struct net_device_ops emac_netdev_ops = {
 };
 
 /**
- * davinci_emac_probe: EMAC device probe
+ * davinci_emac_probe - EMAC device probe
  * @pdev: The DaVinci EMAC device that we are removing
  *
  * Called when probing for emac devicesr. We get details of instances and
@@ -1949,7 +1947,7 @@ free_clk:
 }
 
 /**
- * davinci_emac_remove: EMAC device remove
+ * davinci_emac_remove - EMAC device remove
  * @pdev: The DaVinci EMAC device that we are removing
  *
  * Called when removing the device driver. We disable clock usage and release
@@ -2015,9 +2013,7 @@ static const struct dev_pm_ops davinci_emac_pm_ops = {
         .resume         = davinci_emac_resume,
 };
 
-/**
- * davinci_emac_driver: EMAC platform driver structure
- */
+/* davinci_emac_driver: EMAC platform driver structure */
 static struct platform_driver davinci_emac_driver = {
         .driver = {
                 .name    = "davinci_emac",
@@ -2029,7 +2025,7 @@ static struct platform_driver davinci_emac_driver = {
 };
 
 /**
- * davinci_emac_init: EMAC driver module init
+ * davinci_emac_init - EMAC driver module init
  *
  * Called when initializing the driver. We register the driver with
  * the platform.
@@ -2041,7 +2037,7 @@ static int __init davinci_emac_init(void)
 late_initcall(davinci_emac_init);
 
 /**
- * davinci_emac_exit: EMAC driver module exit
+ * davinci_emac_exit - EMAC driver module exit
  *
  * Called when exiting the driver completely. We unregister the driver with
  * the platform and exit
diff --git a/drivers/net/ethernet/toshiba/spider_net.c b/drivers/net/ethernet/toshiba/spider_net.c
index 6199f6b387b..c1ebfe9efcb 100644
--- a/drivers/net/ethernet/toshiba/spider_net.c
+++ b/drivers/net/ethernet/toshiba/spider_net.c
@@ -114,7 +114,8 @@ spider_net_write_reg(struct spider_net_card *card, u32 reg, u32 value)
         out_be32(card->regs + reg, value);
 }
 
-/** spider_net_write_phy - write to phy register
+/**
+ * spider_net_write_phy - write to phy register
  * @netdev: adapter to be written to
  * @mii_id: id of MII
  * @reg: PHY register
@@ -137,7 +138,8 @@ spider_net_write_phy(struct net_device *netdev, int mii_id,
         spider_net_write_reg(card, SPIDER_NET_GPCWOPCMD, writevalue);
 }
 
-/** spider_net_read_phy - read from phy register
+/**
+ * spider_net_read_phy - read from phy register
  * @netdev: network device to be read from
  * @mii_id: id of MII
  * @reg: PHY register
diff --git a/drivers/net/ethernet/via/via-velocity.c b/drivers/net/ethernet/via/via-velocity.c
index ea3e0a21ba7..a46c1985968 100644
--- a/drivers/net/ethernet/via/via-velocity.c
+++ b/drivers/net/ethernet/via/via-velocity.c
@@ -486,7 +486,7 @@ static void __devinit velocity_get_options(struct velocity_opt *opts, int index,
         velocity_set_bool_opt(&opts->flags, IP_byte_align[index], IP_ALIG_DEF, VELOCITY_FLAGS_IP_ALIGN, "IP_byte_align", devname);
         velocity_set_bool_opt(&opts->flags, ValPktLen[index], VAL_PKT_LEN_DEF, VELOCITY_FLAGS_VAL_PKT_LEN, "ValPktLen", devname);
         velocity_set_int_opt((int *) &opts->spd_dpx, speed_duplex[index], MED_LNK_MIN, MED_LNK_MAX, MED_LNK_DEF, "Media link mode", devname);
-        velocity_set_int_opt((int *) &opts->wol_opts, wol_opts[index], WOL_OPT_MIN, WOL_OPT_MAX, WOL_OPT_DEF, "Wake On Lan options", devname);
+        velocity_set_int_opt(&opts->wol_opts, wol_opts[index], WOL_OPT_MIN, WOL_OPT_MAX, WOL_OPT_DEF, "Wake On Lan options", devname);
         opts->numrx = (opts->numrx & ~3);
 }
 
diff --git a/drivers/net/ethernet/xilinx/ll_temac_main.c b/drivers/net/ethernet/xilinx/ll_temac_main.c
index 1eaf7128afe..f8e35188011 100644
--- a/drivers/net/ethernet/xilinx/ll_temac_main.c
+++ b/drivers/net/ethernet/xilinx/ll_temac_main.c
@@ -197,7 +197,7 @@ static int temac_dcr_setup(struct temac_local *lp, struct platform_device *op,
 #endif
 
 /**
- *  * temac_dma_bd_release - Release buffer descriptor rings
+ * temac_dma_bd_release - Release buffer descriptor rings
  */
 static void temac_dma_bd_release(struct net_device *ndev)
 {
@@ -768,7 +768,6 @@ static void ll_temac_recv(struct net_device *ndev)
                                  DMA_FROM_DEVICE);
 
                 skb_put(skb, length);
-                skb->dev = ndev;
                 skb->protocol = eth_type_trans(skb, ndev);
                 skb_checksum_none_assert(skb);
 
diff --git a/drivers/net/fddi/defxx.c b/drivers/net/fddi/defxx.c
index 4ad80f77109..6695a1dadf4 100644
--- a/drivers/net/fddi/defxx.c
+++ b/drivers/net/fddi/defxx.c
@@ -2962,7 +2962,7 @@ static int dfx_rcv_init(DFX_board_t *bp, int get_buffers)
                         bp->descr_block_virt->rcv_data[i+j].long_0 = (u32) (PI_RCV_DESCR_M_SOP |
                                 ((PI_RCV_DATA_K_SIZE_MAX / PI_ALIGN_K_RCV_DATA_BUFF) << PI_RCV_DESCR_V_SEG_LEN));
                         bp->descr_block_virt->rcv_data[i+j].long_1 = (u32) (bp->rcv_block_phys + (i * PI_RCV_DATA_K_SIZE_MAX));
-                        bp->p_rcv_buff_va[i+j] = (char *) (bp->rcv_block_virt + (i * PI_RCV_DATA_K_SIZE_MAX));
+                        bp->p_rcv_buff_va[i+j] = (bp->rcv_block_virt + (i * PI_RCV_DATA_K_SIZE_MAX));
                         }
 #endif
         }
@@ -3030,7 +3030,7 @@ static void dfx_rcv_queue_process(
 #ifdef DYNAMIC_BUFFERS
                 p_buff = (char *) (((struct sk_buff *)bp->p_rcv_buff_va[entry])->data);
 #else
-                p_buff = (char *) bp->p_rcv_buff_va[entry];
+                p_buff = bp->p_rcv_buff_va[entry];
 #endif
                 memcpy(&descr, p_buff + RCV_BUFF_K_DESCR, sizeof(u32));
 
diff --git a/drivers/net/fddi/skfp/pmf.c b/drivers/net/fddi/skfp/pmf.c
index 9ac4665d741..24d8566cfd8 100644
--- a/drivers/net/fddi/skfp/pmf.c
+++ b/drivers/net/fddi/skfp/pmf.c
@@ -1242,7 +1242,7 @@ static int smt_set_para(struct s_smc *smc, struct smt_para *pa, int index,
                         if (len < 8)
                                 goto len_error ;
                         if (set)
-                                memcpy((char *) to,(char *) from+2,6) ;
+                                memcpy(to,from+2,6) ;
                         to += 8 ;
                         from += 8 ;
                         len -= 8 ;
@@ -1251,7 +1251,7 @@ static int smt_set_para(struct s_smc *smc, struct smt_para *pa, int index,
                         if (len < 4)
                                 goto len_error ;
                         if (set)
-                                memcpy((char *) to,(char *) from,4) ;
+                                memcpy(to,from,4) ;
                         to += 4 ;
                         from += 4 ;
                         len -= 4 ;
@@ -1260,7 +1260,7 @@ static int smt_set_para(struct s_smc *smc, struct smt_para *pa, int index,
                         if (len < 8)
                                 goto len_error ;
                         if (set)
-                                memcpy((char *) to,(char *) from,8) ;
+                                memcpy(to,from,8) ;
                         to += 8 ;
                         from += 8 ;
                         len -= 8 ;
@@ -1269,7 +1269,7 @@ static int smt_set_para(struct s_smc *smc, struct smt_para *pa, int index,
                         if (len < 32)
                                 goto len_error ;
                         if (set)
-                                memcpy((char *) to,(char *) from,32) ;
+                                memcpy(to,from,32) ;
                         to += 32 ;
                         from += 32 ;
                         len -= 32 ;
diff --git a/drivers/net/hamradio/mkiss.c b/drivers/net/hamradio/mkiss.c
index aed1a6105b2..2c0894a92ab 100644
--- a/drivers/net/hamradio/mkiss.c
+++ b/drivers/net/hamradio/mkiss.c
@@ -485,7 +485,7 @@ static void ax_encaps(struct net_device *dev, unsigned char *icp, int len)
 
                         return;
                 default:
-                        count = kiss_esc(p, (unsigned char *)ax->xbuff, len);
+                        count = kiss_esc(p, ax->xbuff, len);
                 }
         } else {
                 unsigned short crc;
@@ -497,7 +497,7 @@ static void ax_encaps(struct net_device *dev, unsigned char *icp, int len)
                 case CRC_MODE_SMACK:
                         *p |= 0x80;
                         crc = swab16(crc16(0, p, len));
-                        count = kiss_esc_crc(p, (unsigned char *)ax->xbuff, crc, len+2);
+                        count = kiss_esc_crc(p, ax->xbuff, crc, len+2);
                         break;
                 case CRC_MODE_FLEX_TEST:
                         ax->crcmode = CRC_MODE_NONE;
@@ -506,11 +506,11 @@ static void ax_encaps(struct net_device *dev, unsigned char *icp, int len)
                 case CRC_MODE_FLEX:
                         *p |= 0x20;
                         crc = calc_crc_flex(p, len);
-                        count = kiss_esc_crc(p, (unsigned char *)ax->xbuff, crc, len+2);
+                        count = kiss_esc_crc(p, ax->xbuff, crc, len+2);
                         break;
 
                 default:
-                        count = kiss_esc(p, (unsigned char *)ax->xbuff, len);
+                        count = kiss_esc(p, ax->xbuff, len);
                 }
         }
         spin_unlock_bh(&ax->buflock);
diff --git a/drivers/net/hyperv/netvsc.c b/drivers/net/hyperv/netvsc.c
index 0c569831db5..6cee2917eb0 100644
--- a/drivers/net/hyperv/netvsc.c
+++ b/drivers/net/hyperv/netvsc.c
@@ -614,7 +614,7 @@ retry_send_cmplt:
 static void netvsc_receive_completion(void *context)
 {
         struct hv_netvsc_packet *packet = context;
-        struct hv_device *device = (struct hv_device *)packet->device;
+        struct hv_device *device = packet->device;
         struct netvsc_device *net_device;
         u64 transaction_id = 0;
         bool fsend_receive_comp = false;
diff --git a/drivers/net/irda/ali-ircc.c b/drivers/net/irda/ali-ircc.c
index dcc80d652b7..84872043b5c 100644
--- a/drivers/net/irda/ali-ircc.c
+++ b/drivers/net/irda/ali-ircc.c
@@ -1017,7 +1017,7 @@ static void ali_ircc_fir_change_speed(struct ali_ircc_cb *priv, __u32 baud)
 {
                 
         int iobase; 
-        struct ali_ircc_cb *self = (struct ali_ircc_cb *) priv;
+        struct ali_ircc_cb *self = priv;
         struct net_device *dev;
 
         IRDA_DEBUG(1, "%s(), ---------------- Start ----------------\n", __func__ );
@@ -1052,7 +1052,7 @@ static void ali_ircc_fir_change_speed(struct ali_ircc_cb *priv, __u32 baud)
  */
 static void ali_ircc_sir_change_speed(struct ali_ircc_cb *priv, __u32 speed)
 {
-        struct ali_ircc_cb *self = (struct ali_ircc_cb *) priv;
+        struct ali_ircc_cb *self = priv;
         unsigned long flags;
         int iobase; 
         int fcr;    /* FIFO control reg */
@@ -1121,7 +1121,7 @@ static void ali_ircc_sir_change_speed(struct ali_ircc_cb *priv, __u32 speed)
 static void ali_ircc_change_dongle_speed(struct ali_ircc_cb *priv, int speed)
 {
         
-        struct ali_ircc_cb *self = (struct ali_ircc_cb *) priv;
+        struct ali_ircc_cb *self = priv;
         int iobase,dongle_id;
         int tmp = 0;
                         
diff --git a/drivers/net/irda/au1k_ir.c b/drivers/net/irda/au1k_ir.c
index fc503aa5288..e09417df8f3 100644
--- a/drivers/net/irda/au1k_ir.c
+++ b/drivers/net/irda/au1k_ir.c
@@ -794,7 +794,7 @@ static int __devinit au1k_irda_net_init(struct net_device *dev)
 
         /* allocate the data buffers */
         aup->db[0].vaddr =
-                (void *)dma_alloc(MAX_BUF_SIZE * 2 * NUM_IR_DESC, &temp);
+                dma_alloc(MAX_BUF_SIZE * 2 * NUM_IR_DESC, &temp);
         if (!aup->db[0].vaddr)
                 goto out3;
 
diff --git a/drivers/net/macvtap.c b/drivers/net/macvtap.c
index 2ee56de7b0c..0737bd4d166 100644
--- a/drivers/net/macvtap.c
+++ b/drivers/net/macvtap.c
@@ -847,13 +847,12 @@ static ssize_t macvtap_do_read(struct macvtap_queue *q, struct kiocb *iocb,
                                const struct iovec *iv, unsigned long len,
                                int noblock)
 {
-        DECLARE_WAITQUEUE(wait, current);
+        DEFINE_WAIT(wait);
         struct sk_buff *skb;
         ssize_t ret = 0;
 
-        add_wait_queue(sk_sleep(&q->sk), &wait);
         while (len) {
-                current->state = TASK_INTERRUPTIBLE;
+                prepare_to_wait(sk_sleep(&q->sk), &wait, TASK_INTERRUPTIBLE);
 
                 /* Read frames from the queue */
                 skb = skb_dequeue(&q->sk.sk_receive_queue);
@@ -875,8 +874,7 @@ static ssize_t macvtap_do_read(struct macvtap_queue *q, struct kiocb *iocb,
                 break;
         }
 
-        current->state = TASK_RUNNING;
-        remove_wait_queue(sk_sleep(&q->sk), &wait);
+        finish_wait(sk_sleep(&q->sk), &wait);
         return ret;
 }
 
diff --git a/drivers/net/phy/Kconfig b/drivers/net/phy/Kconfig
index 944cdfb80fe..3090dc65a6f 100644
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
@@ -67,6 +67,11 @@ config BCM63XX_PHY
         ---help---
           Currently supports the 6348 and 6358 PHYs.
 
+config BCM87XX_PHY
+        tristate "Driver for Broadcom BCM8706 and BCM8727 PHYs"
+        help
+          Currently supports the BCM8706 and BCM8727 10G Ethernet PHYs.
+
 config ICPLUS_PHY
         tristate "Drivers for ICPlus PHYs"
         ---help---
diff --git a/drivers/net/phy/Makefile b/drivers/net/phy/Makefile
index f51af688ef8..6d2dc6c94f2 100644
--- a/drivers/net/phy/Makefile
+++ b/drivers/net/phy/Makefile
@@ -12,6 +12,7 @@ obj-$(CONFIG_SMSC_PHY)		+= smsc.o
 obj-$(CONFIG_VITESSE_PHY)       += vitesse.o
 obj-$(CONFIG_BROADCOM_PHY)      += broadcom.o
 obj-$(CONFIG_BCM63XX_PHY)       += bcm63xx.o
+obj-$(CONFIG_BCM87XX_PHY)       += bcm87xx.o
 obj-$(CONFIG_ICPLUS_PHY)        += icplus.o
 obj-$(CONFIG_REALTEK_PHY)       += realtek.o
 obj-$(CONFIG_LSI_ET1011C_PHY)   += et1011c.o
diff --git a/drivers/net/phy/amd.c b/drivers/net/phy/amd.c
index cfabd5fe537..a3fb5ceb648 100644
--- a/drivers/net/phy/amd.c
+++ b/drivers/net/phy/amd.c
@@ -77,13 +77,7 @@ static struct phy_driver am79c_driver = {
 
 static int __init am79c_init(void)
 {
-        int ret;
-
-        ret = phy_driver_register(&am79c_driver);
-        if (ret)
-                return ret;
-
-        return 0;
+        return phy_driver_register(&am79c_driver);
 }
 
 static void __exit am79c_exit(void)
diff --git a/drivers/net/phy/bcm63xx.c b/drivers/net/phy/bcm63xx.c
index cd802eb25fd..84c7a39b1c6 100644
--- a/drivers/net/phy/bcm63xx.c
+++ b/drivers/net/phy/bcm63xx.c
@@ -71,7 +71,8 @@ static int bcm63xx_config_intr(struct phy_device *phydev)
         return err;
 }
 
-static struct phy_driver bcm63xx_1_driver = {
+static struct phy_driver bcm63xx_driver[] = {
+{
         .phy_id         = 0x00406000,
         .phy_id_mask    = 0xfffffc00,
         .name           = "Broadcom BCM63XX (1)",
@@ -84,10 +85,8 @@ static struct phy_driver bcm63xx_1_driver = {
         .ack_interrupt  = bcm63xx_ack_interrupt,
         .config_intr    = bcm63xx_config_intr,
         .driver         = { .owner = THIS_MODULE },
-};
-
-/* same phy as above, with just a different OUI */
-static struct phy_driver bcm63xx_2_driver = {
+}, {
+        /* same phy as above, with just a different OUI */
         .phy_id         = 0x002bdc00,
         .phy_id_mask    = 0xfffffc00,
         .name           = "Broadcom BCM63XX (2)",
@@ -99,30 +98,18 @@ static struct phy_driver bcm63xx_2_driver = {
         .ack_interrupt  = bcm63xx_ack_interrupt,
         .config_intr    = bcm63xx_config_intr,
         .driver         = { .owner = THIS_MODULE },
-};
+} };
 
 static int __init bcm63xx_phy_init(void)
 {
-        int ret;
-
-        ret = phy_driver_register(&bcm63xx_1_driver);
-        if (ret)
-                goto out_63xx_1;
-        ret = phy_driver_register(&bcm63xx_2_driver);
-        if (ret)
-                goto out_63xx_2;
-        return ret;
-
-out_63xx_2:
-        phy_driver_unregister(&bcm63xx_1_driver);
-out_63xx_1:
-        return ret;
+        return phy_drivers_register(bcm63xx_driver,
+                ARRAY_SIZE(bcm63xx_driver));
 }
 
 static void __exit bcm63xx_phy_exit(void)
 {
-        phy_driver_unregister(&bcm63xx_1_driver);
-        phy_driver_unregister(&bcm63xx_2_driver);
+        phy_drivers_unregister(bcm63xx_driver,
+                ARRAY_SIZE(bcm63xx_driver));
 }
 
 module_init(bcm63xx_phy_init);
diff --git a/drivers/net/phy/bcm87xx.c b/drivers/net/phy/bcm87xx.c
new file mode 100644
index 00000000000..2346b38b983
--- /dev/null
+++ b/drivers/net/phy/bcm87xx.c
@@ -0,0 +1,231 @@
+/*
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ *
+ * Copyright (C) 2011 - 2012 Cavium, Inc.
+ */
+
+#include <linux/module.h>
+#include <linux/phy.h>
+#include <linux/of.h>
+
+#define PHY_ID_BCM8706  0x0143bdc1
+#define PHY_ID_BCM8727  0x0143bff0
+
+#define BCM87XX_PMD_RX_SIGNAL_DETECT    (MII_ADDR_C45 | 0x1000a)
+#define BCM87XX_10GBASER_PCS_STATUS     (MII_ADDR_C45 | 0x30020)
+#define BCM87XX_XGXS_LANE_STATUS        (MII_ADDR_C45 | 0x40018)
+
+#define BCM87XX_LASI_CONTROL (MII_ADDR_C45 | 0x39002)
+#define BCM87XX_LASI_STATUS (MII_ADDR_C45 | 0x39005)
+
+#if IS_ENABLED(CONFIG_OF_MDIO)
+/* Set and/or override some configuration registers based on the
+ * broadcom,c45-reg-init property stored in the of_node for the phydev.
+ *
+ * broadcom,c45-reg-init = <devid reg mask value>,...;
+ *
+ * There may be one or more sets of <devid reg mask value>:
+ *
+ * devid: which sub-device to use.
+ * reg: the register.
+ * mask: if non-zero, ANDed with existing register value.
+ * value: ORed with the masked value and written to the regiser.
+ *
+ */
+static int bcm87xx_of_reg_init(struct phy_device *phydev)
+{
+        const __be32 *paddr;
+        const __be32 *paddr_end;
+        int len, ret;
+
+        if (!phydev->dev.of_node)
+                return 0;
+
+        paddr = of_get_property(phydev->dev.of_node,
+                                "broadcom,c45-reg-init", &len);
+        if (!paddr)
+                return 0;
+
+        paddr_end = paddr + (len /= sizeof(*paddr));
+
+        ret = 0;
+
+        while (paddr + 3 < paddr_end) {
+                u16 devid       = be32_to_cpup(paddr++);
+                u16 reg         = be32_to_cpup(paddr++);
+                u16 mask        = be32_to_cpup(paddr++);
+                u16 val_bits    = be32_to_cpup(paddr++);
+                int val;
+                u32 regnum = MII_ADDR_C45 | (devid << 16) | reg;
+                val = 0;
+                if (mask) {
+                        val = phy_read(phydev, regnum);
+                        if (val < 0) {
+                                ret = val;
+                                goto err;
+                        }
+                        val &= mask;
+                }
+                val |= val_bits;
+
+                ret = phy_write(phydev, regnum, val);
+                if (ret < 0)
+                        goto err;
+        }
+err:
+        return ret;
+}
+#else
+static int bcm87xx_of_reg_init(struct phy_device *phydev)
+{
+        return 0;
+}
+#endif /* CONFIG_OF_MDIO */
+
+static int bcm87xx_config_init(struct phy_device *phydev)
+{
+        phydev->supported = SUPPORTED_10000baseR_FEC;
+        phydev->advertising = ADVERTISED_10000baseR_FEC;
+        phydev->state = PHY_NOLINK;
+        phydev->autoneg = AUTONEG_DISABLE;
+
+        bcm87xx_of_reg_init(phydev);
+
+        return 0;
+}
+
+static int bcm87xx_config_aneg(struct phy_device *phydev)
+{
+        return -EINVAL;
+}
+
+static int bcm87xx_read_status(struct phy_device *phydev)
+{
+        int rx_signal_detect;
+        int pcs_status;
+        int xgxs_lane_status;
+
+        rx_signal_detect = phy_read(phydev, BCM87XX_PMD_RX_SIGNAL_DETECT);
+        if (rx_signal_detect < 0)
+                return rx_signal_detect;
+
+        if ((rx_signal_detect & 1) == 0)
+                goto no_link;
+
+        pcs_status = phy_read(phydev, BCM87XX_10GBASER_PCS_STATUS);
+        if (pcs_status < 0)
+                return pcs_status;
+
+        if ((pcs_status & 1) == 0)
+                goto no_link;
+
+        xgxs_lane_status = phy_read(phydev, BCM87XX_XGXS_LANE_STATUS);
+        if (xgxs_lane_status < 0)
+                return xgxs_lane_status;
+
+        if ((xgxs_lane_status & 0x1000) == 0)
+                goto no_link;
+
+        phydev->speed = 10000;
+        phydev->link = 1;
+        phydev->duplex = 1;
+        return 0;
+
+no_link:
+        phydev->link = 0;
+        return 0;
+}
+
+static int bcm87xx_config_intr(struct phy_device *phydev)
+{
+        int reg, err;
+
+        reg = phy_read(phydev, BCM87XX_LASI_CONTROL);
+
+        if (reg < 0)
+                return reg;
+
+        if (phydev->interrupts == PHY_INTERRUPT_ENABLED)
+                reg |= 1;
+        else
+                reg &= ~1;
+
+        err = phy_write(phydev, BCM87XX_LASI_CONTROL, reg);
+        return err;
+}
+
+static int bcm87xx_did_interrupt(struct phy_device *phydev)
+{
+        int reg;
+
+        reg = phy_read(phydev, BCM87XX_LASI_STATUS);
+
+        if (reg < 0) {
+                dev_err(&phydev->dev,
+                        "Error: Read of BCM87XX_LASI_STATUS failed: %d\n", reg);
+                return 0;
+        }
+        return (reg & 1) != 0;
+}
+
+static int bcm87xx_ack_interrupt(struct phy_device *phydev)
+{
+        /* Reading the LASI status clears it. */
+        bcm87xx_did_interrupt(phydev);
+        return 0;
+}
+
+static int bcm8706_match_phy_device(struct phy_device *phydev)
+{
+        return phydev->c45_ids.device_ids[4] == PHY_ID_BCM8706;
+}
+
+static int bcm8727_match_phy_device(struct phy_device *phydev)
+{
+        return phydev->c45_ids.device_ids[4] == PHY_ID_BCM8727;
+}
+
+static struct phy_driver bcm87xx_driver[] = {
+{
+        .phy_id         = PHY_ID_BCM8706,
+        .phy_id_mask    = 0xffffffff,
+        .name           = "Broadcom BCM8706",
+        .flags          = PHY_HAS_INTERRUPT,
+        .config_init    = bcm87xx_config_init,
+        .config_aneg    = bcm87xx_config_aneg,
+        .read_status    = bcm87xx_read_status,
+        .ack_interrupt  = bcm87xx_ack_interrupt,
+        .config_intr    = bcm87xx_config_intr,
+        .did_interrupt  = bcm87xx_did_interrupt,
+        .match_phy_device = bcm8706_match_phy_device,
+        .driver         = { .owner = THIS_MODULE },
+}, {
+        .phy_id         = PHY_ID_BCM8727,
+        .phy_id_mask    = 0xffffffff,
+        .name           = "Broadcom BCM8727",
+        .flags          = PHY_HAS_INTERRUPT,
+        .config_init    = bcm87xx_config_init,
+        .config_aneg    = bcm87xx_config_aneg,
+        .read_status    = bcm87xx_read_status,
+        .ack_interrupt  = bcm87xx_ack_interrupt,
+        .config_intr    = bcm87xx_config_intr,
+        .did_interrupt  = bcm87xx_did_interrupt,
+        .match_phy_device = bcm8727_match_phy_device,
+        .driver         = { .owner = THIS_MODULE },
+} };
+
+static int __init bcm87xx_init(void)
+{
+        return phy_drivers_register(bcm87xx_driver,
+                ARRAY_SIZE(bcm87xx_driver));
+}
+module_init(bcm87xx_init);
+
+static void __exit bcm87xx_exit(void)
+{
+        phy_drivers_unregister(bcm87xx_driver,
+                ARRAY_SIZE(bcm87xx_driver));
+}
+module_exit(bcm87xx_exit);
diff --git a/drivers/net/phy/broadcom.c b/drivers/net/phy/broadcom.c
index 60338ff6309..f8c90ea7510 100644
--- a/drivers/net/phy/broadcom.c
+++ b/drivers/net/phy/broadcom.c
@@ -682,7 +682,8 @@ static int brcm_fet_config_intr(struct phy_device *phydev)
         return err;
 }
 
-static struct phy_driver bcm5411_driver = {
+static struct phy_driver broadcom_drivers[] = {
+{
         .phy_id         = PHY_ID_BCM5411,
         .phy_id_mask    = 0xfffffff0,
         .name           = "Broadcom BCM5411",
@@ -695,9 +696,7 @@ static struct phy_driver bcm5411_driver = {
         .ack_interrupt  = bcm54xx_ack_interrupt,
         .config_intr    = bcm54xx_config_intr,
         .driver         = { .owner = THIS_MODULE },
-};
-
-static struct phy_driver bcm5421_driver = {
+}, {
         .phy_id         = PHY_ID_BCM5421,
         .phy_id_mask    = 0xfffffff0,
         .name           = "Broadcom BCM5421",
@@ -710,9 +709,7 @@ static struct phy_driver bcm5421_driver = {
         .ack_interrupt  = bcm54xx_ack_interrupt,
         .config_intr    = bcm54xx_config_intr,
         .driver         = { .owner = THIS_MODULE },
-};
-
-static struct phy_driver bcm5461_driver = {
+}, {
         .phy_id         = PHY_ID_BCM5461,
         .phy_id_mask    = 0xfffffff0,
         .name           = "Broadcom BCM5461",
@@ -725,9 +722,7 @@ static struct phy_driver bcm5461_driver = {
         .ack_interrupt  = bcm54xx_ack_interrupt,
         .config_intr    = bcm54xx_config_intr,
         .driver         = { .owner = THIS_MODULE },
-};
-
-static struct phy_driver bcm5464_driver = {
+}, {
         .phy_id         = PHY_ID_BCM5464,
         .phy_id_mask    = 0xfffffff0,
         .name           = "Broadcom BCM5464",
@@ -740,9 +735,7 @@ static struct phy_driver bcm5464_driver = {
         .ack_interrupt  = bcm54xx_ack_interrupt,
         .config_intr    = bcm54xx_config_intr,
         .driver         = { .owner = THIS_MODULE },
-};
-
-static struct phy_driver bcm5481_driver = {
+}, {
         .phy_id         = PHY_ID_BCM5481,
         .phy_id_mask    = 0xfffffff0,
         .name           = "Broadcom BCM5481",
@@ -755,9 +748,7 @@ static struct phy_driver bcm5481_driver = {
         .ack_interrupt  = bcm54xx_ack_interrupt,
         .config_intr    = bcm54xx_config_intr,
         .driver         = { .owner = THIS_MODULE },
-};
-
-static struct phy_driver bcm5482_driver = {
+}, {
         .phy_id         = PHY_ID_BCM5482,
         .phy_id_mask    = 0xfffffff0,
         .name           = "Broadcom BCM5482",
@@ -770,9 +761,7 @@ static struct phy_driver bcm5482_driver = {
         .ack_interrupt  = bcm54xx_ack_interrupt,
         .config_intr    = bcm54xx_config_intr,
         .driver         = { .owner = THIS_MODULE },
-};
-
-static struct phy_driver bcm50610_driver = {
+}, {
         .phy_id         = PHY_ID_BCM50610,
         .phy_id_mask    = 0xfffffff0,
         .name           = "Broadcom BCM50610",
@@ -785,9 +774,7 @@ static struct phy_driver bcm50610_driver = {
         .ack_interrupt  = bcm54xx_ack_interrupt,
         .config_intr    = bcm54xx_config_intr,
         .driver         = { .owner = THIS_MODULE },
-};
-
-static struct phy_driver bcm50610m_driver = {
+}, {
         .phy_id         = PHY_ID_BCM50610M,
         .phy_id_mask    = 0xfffffff0,
         .name           = "Broadcom BCM50610M",
@@ -800,9 +787,7 @@ static struct phy_driver bcm50610m_driver = {
         .ack_interrupt  = bcm54xx_ack_interrupt,
         .config_intr    = bcm54xx_config_intr,
         .driver         = { .owner = THIS_MODULE },
-};
-
-static struct phy_driver bcm57780_driver = {
+}, {
         .phy_id         = PHY_ID_BCM57780,
         .phy_id_mask    = 0xfffffff0,
         .name           = "Broadcom BCM57780",
@@ -815,9 +800,7 @@ static struct phy_driver bcm57780_driver = {
         .ack_interrupt  = bcm54xx_ack_interrupt,
         .config_intr    = bcm54xx_config_intr,
         .driver         = { .owner = THIS_MODULE },
-};
-
-static struct phy_driver bcmac131_driver = {
+}, {
         .phy_id         = PHY_ID_BCMAC131,
         .phy_id_mask    = 0xfffffff0,
         .name           = "Broadcom BCMAC131",
@@ -830,9 +813,7 @@ static struct phy_driver bcmac131_driver = {
         .ack_interrupt  = brcm_fet_ack_interrupt,
         .config_intr    = brcm_fet_config_intr,
         .driver         = { .owner = THIS_MODULE },
-};
-
-static struct phy_driver bcm5241_driver = {
+}, {
         .phy_id         = PHY_ID_BCM5241,
         .phy_id_mask    = 0xfffffff0,
         .name           = "Broadcom BCM5241",
@@ -845,84 +826,18 @@ static struct phy_driver bcm5241_driver = {
         .ack_interrupt  = brcm_fet_ack_interrupt,
         .config_intr    = brcm_fet_config_intr,
         .driver         = { .owner = THIS_MODULE },
-};
+} };
 
 static int __init broadcom_init(void)
 {
-        int ret;
-
-        ret = phy_driver_register(&bcm5411_driver);
-        if (ret)
-                goto out_5411;
-        ret = phy_driver_register(&bcm5421_driver);
-        if (ret)
-                goto out_5421;
-        ret = phy_driver_register(&bcm5461_driver);
-        if (ret)
-                goto out_5461;
-        ret = phy_driver_register(&bcm5464_driver);
-        if (ret)
-                goto out_5464;
-        ret = phy_driver_register(&bcm5481_driver);
-        if (ret)
-                goto out_5481;
-        ret = phy_driver_register(&bcm5482_driver);
-        if (ret)
-                goto out_5482;
-        ret = phy_driver_register(&bcm50610_driver);
-        if (ret)
-                goto out_50610;
-        ret = phy_driver_register(&bcm50610m_driver);
-        if (ret)
-                goto out_50610m;
-        ret = phy_driver_register(&bcm57780_driver);
-        if (ret)
-                goto out_57780;
-        ret = phy_driver_register(&bcmac131_driver);
-        if (ret)
-                goto out_ac131;
-        ret = phy_driver_register(&bcm5241_driver);
-        if (ret)
-                goto out_5241;
-        return ret;
-
-out_5241:
-        phy_driver_unregister(&bcmac131_driver);
-out_ac131:
-        phy_driver_unregister(&bcm57780_driver);
-out_57780:
-        phy_driver_unregister(&bcm50610m_driver);
-out_50610m:
-        phy_driver_unregister(&bcm50610_driver);
-out_50610:
-        phy_driver_unregister(&bcm5482_driver);
-out_5482:
-        phy_driver_unregister(&bcm5481_driver);
-out_5481:
-        phy_driver_unregister(&bcm5464_driver);
-out_5464:
-        phy_driver_unregister(&bcm5461_driver);
-out_5461:
-        phy_driver_unregister(&bcm5421_driver);
-out_5421:
-        phy_driver_unregister(&bcm5411_driver);
-out_5411:
-        return ret;
+        return phy_drivers_register(broadcom_drivers,
+                ARRAY_SIZE(broadcom_drivers));
 }
 
 static void __exit broadcom_exit(void)
 {
-        phy_driver_unregister(&bcm5241_driver);
-        phy_driver_unregister(&bcmac131_driver);
-        phy_driver_unregister(&bcm57780_driver);
-        phy_driver_unregister(&bcm50610m_driver);
-        phy_driver_unregister(&bcm50610_driver);
-        phy_driver_unregister(&bcm5482_driver);
-        phy_driver_unregister(&bcm5481_driver);
-        phy_driver_unregister(&bcm5464_driver);
-        phy_driver_unregister(&bcm5461_driver);
-        phy_driver_unregister(&bcm5421_driver);
-        phy_driver_unregister(&bcm5411_driver);
+        phy_drivers_unregister(broadcom_drivers,
+                ARRAY_SIZE(broadcom_drivers));
 }
 
 module_init(broadcom_init);
diff --git a/drivers/net/phy/cicada.c b/drivers/net/phy/cicada.c
index d28173161c2..db472ffb6e8 100644
--- a/drivers/net/phy/cicada.c
+++ b/drivers/net/phy/cicada.c
@@ -102,7 +102,8 @@ static int cis820x_config_intr(struct phy_device *phydev)
 }
 
 /* Cicada 8201, a.k.a Vitesse VSC8201 */
-static struct phy_driver cis8201_driver = {
+static struct phy_driver cis820x_driver[] = {
+{
         .phy_id         = 0x000fc410,
         .name           = "Cicada Cis8201",
         .phy_id_mask    = 0x000ffff0,
@@ -113,11 +114,8 @@ static struct phy_driver cis8201_driver = {
         .read_status    = &genphy_read_status,
         .ack_interrupt  = &cis820x_ack_interrupt,
         .config_intr    = &cis820x_config_intr,
-        .driver         = { .owner = THIS_MODULE,},
-};
-
-/* Cicada 8204 */
-static struct phy_driver cis8204_driver = {
+        .driver         = { .owner = THIS_MODULE,},
+}, {
         .phy_id         = 0x000fc440,
         .name           = "Cicada Cis8204",
         .phy_id_mask    = 0x000fffc0,
@@ -128,32 +126,19 @@ static struct phy_driver cis8204_driver = {
         .read_status    = &genphy_read_status,
         .ack_interrupt  = &cis820x_ack_interrupt,
         .config_intr    = &cis820x_config_intr,
-        .driver         = { .owner = THIS_MODULE,},
-};
+        .driver         = { .owner = THIS_MODULE,},
+} };
 
 static int __init cicada_init(void)
 {
-        int ret;
-
-        ret = phy_driver_register(&cis8204_driver);
-        if (ret)
-                goto err1;
-
-        ret = phy_driver_register(&cis8201_driver);
-        if (ret)
-                goto err2;
-        return 0;
-
-err2:
-        phy_driver_unregister(&cis8204_driver);
-err1:
-        return ret;
+        return phy_drivers_register(cis820x_driver,
+                ARRAY_SIZE(cis820x_driver));
 }
 
 static void __exit cicada_exit(void)
 {
-        phy_driver_unregister(&cis8204_driver);
-        phy_driver_unregister(&cis8201_driver);
+        phy_drivers_unregister(cis820x_driver,
+                ARRAY_SIZE(cis820x_driver));
 }
 
 module_init(cicada_init);
diff --git a/drivers/net/phy/davicom.c b/drivers/net/phy/davicom.c
index 5f59cc06477..81c7bc010dd 100644
--- a/drivers/net/phy/davicom.c
+++ b/drivers/net/phy/davicom.c
@@ -144,7 +144,8 @@ static int dm9161_ack_interrupt(struct phy_device *phydev)
         return (err < 0) ? err : 0;
 }
 
-static struct phy_driver dm9161e_driver = {
+static struct phy_driver dm91xx_driver[] = {
+{
         .phy_id         = 0x0181b880,
         .name           = "Davicom DM9161E",
         .phy_id_mask    = 0x0ffffff0,
@@ -153,9 +154,7 @@ static struct phy_driver dm9161e_driver = {
         .config_aneg    = dm9161_config_aneg,
         .read_status    = genphy_read_status,
         .driver         = { .owner = THIS_MODULE,},
-};
-
-static struct phy_driver dm9161a_driver = {
+}, {
         .phy_id         = 0x0181b8a0,
         .name           = "Davicom DM9161A",
         .phy_id_mask    = 0x0ffffff0,
@@ -164,9 +163,7 @@ static struct phy_driver dm9161a_driver = {
         .config_aneg    = dm9161_config_aneg,
         .read_status    = genphy_read_status,
         .driver         = { .owner = THIS_MODULE,},
-};
-
-static struct phy_driver dm9131_driver = {
+}, {
         .phy_id         = 0x00181b80,
         .name           = "Davicom DM9131",
         .phy_id_mask    = 0x0ffffff0,
@@ -177,38 +174,18 @@ static struct phy_driver dm9131_driver = {
         .ack_interrupt  = dm9161_ack_interrupt,
         .config_intr    = dm9161_config_intr,
         .driver         = { .owner = THIS_MODULE,},
-};
+} };
 
 static int __init davicom_init(void)
 {
-        int ret;
-
-        ret = phy_driver_register(&dm9161e_driver);
-        if (ret)
-                goto err1;
-
-        ret = phy_driver_register(&dm9161a_driver);
-        if (ret)
-                goto err2;
-
-        ret = phy_driver_register(&dm9131_driver);
-        if (ret)
-                goto err3;
-        return 0;
-
- err3:
-        phy_driver_unregister(&dm9161a_driver);
- err2:
-        phy_driver_unregister(&dm9161e_driver);
- err1:
-        return ret;
+        return phy_drivers_register(dm91xx_driver,
+                ARRAY_SIZE(dm91xx_driver));
 }
 
 static void __exit davicom_exit(void)
 {
-        phy_driver_unregister(&dm9161e_driver);
-        phy_driver_unregister(&dm9161a_driver);
-        phy_driver_unregister(&dm9131_driver);
+        phy_drivers_unregister(dm91xx_driver,
+                ARRAY_SIZE(dm91xx_driver));
 }
 
 module_init(davicom_init);
diff --git a/drivers/net/phy/dp83640.c b/drivers/net/phy/dp83640.c
index 940b29022d0..b0da0226661 100644
--- a/drivers/net/phy/dp83640.c
+++ b/drivers/net/phy/dp83640.c
@@ -17,6 +17,9 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
+
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/ethtool.h>
 #include <linux/kernel.h>
 #include <linux/list.h>
@@ -453,16 +456,16 @@ static void enable_status_frames(struct phy_device *phydev, bool on)
         ext_write(0, phydev, PAGE6, PSF_CFG1, ver);
 
         if (!phydev->attached_dev) {
-                pr_warning("dp83640: expected to find an attached netdevice\n");
+                pr_warn("expected to find an attached netdevice\n");
                 return;
         }
 
         if (on) {
                 if (dev_mc_add(phydev->attached_dev, status_frame_dst))
-                        pr_warning("dp83640: failed to add mc address\n");
+                        pr_warn("failed to add mc address\n");
         } else {
                 if (dev_mc_del(phydev->attached_dev, status_frame_dst))
-                        pr_warning("dp83640: failed to delete mc address\n");
+                        pr_warn("failed to delete mc address\n");
         }
 }
 
@@ -582,9 +585,9 @@ static void recalibrate(struct dp83640_clock *clock)
          * read out and correct offsets
          */
         val = ext_read(master, PAGE4, PTP_STS);
-        pr_info("master PTP_STS  0x%04hx", val);
+        pr_info("master PTP_STS  0x%04hx\n", val);
         val = ext_read(master, PAGE4, PTP_ESTS);
-        pr_info("master PTP_ESTS 0x%04hx", val);
+        pr_info("master PTP_ESTS 0x%04hx\n", val);
         event_ts.ns_lo  = ext_read(master, PAGE4, PTP_EDATA);
         event_ts.ns_hi  = ext_read(master, PAGE4, PTP_EDATA);
         event_ts.sec_lo = ext_read(master, PAGE4, PTP_EDATA);
@@ -594,9 +597,9 @@ static void recalibrate(struct dp83640_clock *clock)
         list_for_each(this, &clock->phylist) {
                 tmp = list_entry(this, struct dp83640_private, list);
                 val = ext_read(tmp->phydev, PAGE4, PTP_STS);
-                pr_info("slave  PTP_STS  0x%04hx", val);
+                pr_info("slave  PTP_STS  0x%04hx\n", val);
                 val = ext_read(tmp->phydev, PAGE4, PTP_ESTS);
-                pr_info("slave  PTP_ESTS 0x%04hx", val);
+                pr_info("slave  PTP_ESTS 0x%04hx\n", val);
                 event_ts.ns_lo  = ext_read(tmp->phydev, PAGE4, PTP_EDATA);
                 event_ts.ns_hi  = ext_read(tmp->phydev, PAGE4, PTP_EDATA);
                 event_ts.sec_lo = ext_read(tmp->phydev, PAGE4, PTP_EDATA);
@@ -686,7 +689,7 @@ static void decode_rxts(struct dp83640_private *dp83640,
         prune_rx_ts(dp83640);
 
         if (list_empty(&dp83640->rxpool)) {
-                pr_debug("dp83640: rx timestamp pool is empty\n");
+                pr_debug("rx timestamp pool is empty\n");
                 goto out;
         }
         rxts = list_first_entry(&dp83640->rxpool, struct rxts, list);
@@ -709,7 +712,7 @@ static void decode_txts(struct dp83640_private *dp83640,
         skb = skb_dequeue(&dp83640->tx_queue);
 
         if (!skb) {
-                pr_debug("dp83640: have timestamp but tx_queue empty\n");
+                pr_debug("have timestamp but tx_queue empty\n");
                 return;
         }
         ns = phy2txts(phy_txts);
@@ -847,7 +850,7 @@ static void dp83640_free_clocks(void)
         list_for_each_safe(this, next, &phyter_clocks) {
                 clock = list_entry(this, struct dp83640_clock, list);
                 if (!list_empty(&clock->phylist)) {
-                        pr_warning("phy list non-empty while unloading");
+                        pr_warn("phy list non-empty while unloading\n");
                         BUG();
                 }
                 list_del(&clock->list);
diff --git a/drivers/net/phy/fixed.c b/drivers/net/phy/fixed.c
index 633680d0828..ba55adfc7aa 100644
--- a/drivers/net/phy/fixed.c
+++ b/drivers/net/phy/fixed.c
@@ -70,7 +70,7 @@ static int fixed_phy_update_regs(struct fixed_phy *fp)
                         lpa |= LPA_10FULL;
                         break;
                 default:
-                        printk(KERN_WARNING "fixed phy: unknown speed\n");
+                        pr_warn("fixed phy: unknown speed\n");
                         return -EINVAL;
                 }
         } else {
@@ -90,7 +90,7 @@ static int fixed_phy_update_regs(struct fixed_phy *fp)
                         lpa |= LPA_10HALF;
                         break;
                 default:
-                        printk(KERN_WARNING "fixed phy: unknown speed\n");
+                        pr_warn("fixed phy: unknown speed\n");
                         return -EINVAL;
                 }
         }
diff --git a/drivers/net/phy/icplus.c b/drivers/net/phy/icplus.c
index 47f8e893926..d5199cb4cae 100644
--- a/drivers/net/phy/icplus.c
+++ b/drivers/net/phy/icplus.c
@@ -202,7 +202,8 @@ static int ip101a_g_ack_interrupt(struct phy_device *phydev)
         return 0;
 }
 
-static struct phy_driver ip175c_driver = {
+static struct phy_driver icplus_driver[] = {
+{
         .phy_id         = 0x02430d80,
         .name           = "ICPlus IP175C",
         .phy_id_mask    = 0x0ffffff0,
@@ -213,9 +214,7 @@ static struct phy_driver ip175c_driver = {
         .suspend        = genphy_suspend,
         .resume         = genphy_resume,
         .driver         = { .owner = THIS_MODULE,},
-};
-
-static struct phy_driver ip1001_driver = {
+}, {
         .phy_id         = 0x02430d90,
         .name           = "ICPlus IP1001",
         .phy_id_mask    = 0x0ffffff0,
@@ -227,9 +226,7 @@ static struct phy_driver ip1001_driver = {
         .suspend        = genphy_suspend,
         .resume         = genphy_resume,
         .driver         = { .owner = THIS_MODULE,},
-};
-
-static struct phy_driver ip101a_g_driver = {
+}, {
         .phy_id         = 0x02430c54,
         .name           = "ICPlus IP101A/G",
         .phy_id_mask    = 0x0ffffff0,
@@ -243,28 +240,18 @@ static struct phy_driver ip101a_g_driver = {
         .suspend        = genphy_suspend,
         .resume         = genphy_resume,
         .driver         = { .owner = THIS_MODULE,},
-};
+} };
 
 static int __init icplus_init(void)
 {
-        int ret = 0;
-
-        ret = phy_driver_register(&ip1001_driver);
-        if (ret < 0)
-                return -ENODEV;
-
-        ret = phy_driver_register(&ip101a_g_driver);
-        if (ret < 0)
-                return -ENODEV;
-
-        return phy_driver_register(&ip175c_driver);
+        return phy_drivers_register(icplus_driver,
+                ARRAY_SIZE(icplus_driver));
 }
 
 static void __exit icplus_exit(void)
 {
-        phy_driver_unregister(&ip1001_driver);
-        phy_driver_unregister(&ip101a_g_driver);
-        phy_driver_unregister(&ip175c_driver);
+        phy_drivers_unregister(icplus_driver,
+                ARRAY_SIZE(icplus_driver));
 }
 
 module_init(icplus_init);
diff --git a/drivers/net/phy/lxt.c b/drivers/net/phy/lxt.c
index 6f6e8b616a6..6d1e3fcc43e 100644
--- a/drivers/net/phy/lxt.c
+++ b/drivers/net/phy/lxt.c
@@ -149,7 +149,8 @@ static int lxt973_config_aneg(struct phy_device *phydev)
         return phydev->priv ? 0 : genphy_config_aneg(phydev);
 }
 
-static struct phy_driver lxt970_driver = {
+static struct phy_driver lxt97x_driver[] = {
+{
         .phy_id         = 0x78100000,
         .name           = "LXT970",
         .phy_id_mask    = 0xfffffff0,
@@ -160,10 +161,8 @@ static struct phy_driver lxt970_driver = {
         .read_status    = genphy_read_status,
         .ack_interrupt  = lxt970_ack_interrupt,
         .config_intr    = lxt970_config_intr,
-        .driver         = { .owner = THIS_MODULE,},
-};
-
-static struct phy_driver lxt971_driver = {
+        .driver         = { .owner = THIS_MODULE,},
+}, {
         .phy_id         = 0x001378e0,
         .name           = "LXT971",
         .phy_id_mask    = 0xfffffff0,
@@ -173,10 +172,8 @@ static struct phy_driver lxt971_driver = {
         .read_status    = genphy_read_status,
         .ack_interrupt  = lxt971_ack_interrupt,
         .config_intr    = lxt971_config_intr,
-        .driver         = { .owner = THIS_MODULE,},
-};
-
-static struct phy_driver lxt973_driver = {
+        .driver         = { .owner = THIS_MODULE,},
+}, {
         .phy_id         = 0x00137a10,
         .name           = "LXT973",
         .phy_id_mask    = 0xfffffff0,
@@ -185,39 +182,19 @@ static struct phy_driver lxt973_driver = {
         .probe          = lxt973_probe,
         .config_aneg    = lxt973_config_aneg,
         .read_status    = genphy_read_status,
-        .driver         = { .owner = THIS_MODULE,},
-};
+        .driver         = { .owner = THIS_MODULE,},
+} };
 
 static int __init lxt_init(void)
 {
-        int ret;
-
-        ret = phy_driver_register(&lxt970_driver);
-        if (ret)
-                goto err1;
-
-        ret = phy_driver_register(&lxt971_driver);
-        if (ret)
-                goto err2;
-
-        ret = phy_driver_register(&lxt973_driver);
-        if (ret)
-                goto err3;
-        return 0;
-
- err3:
-        phy_driver_unregister(&lxt971_driver);
- err2:
-        phy_driver_unregister(&lxt970_driver);
- err1:
-        return ret;
+        return phy_drivers_register(lxt97x_driver,
+                ARRAY_SIZE(lxt97x_driver));
 }
 
 static void __exit lxt_exit(void)
 {
-        phy_driver_unregister(&lxt970_driver);
-        phy_driver_unregister(&lxt971_driver);
-        phy_driver_unregister(&lxt973_driver);
+        phy_drivers_unregister(lxt97x_driver,
+                ARRAY_SIZE(lxt97x_driver));
 }
 
 module_init(lxt_init);
diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c
index 418928d644b..5d2a3f21588 100644
--- a/drivers/net/phy/marvell.c
+++ b/drivers/net/phy/marvell.c
@@ -826,28 +826,14 @@ static struct phy_driver marvell_drivers[] = {
 
 static int __init marvell_init(void)
 {
-        int ret;
-        int i;
-
-        for (i = 0; i < ARRAY_SIZE(marvell_drivers); i++) {
-                ret = phy_driver_register(&marvell_drivers[i]);
-
-                if (ret) {
-                        while (i-- > 0)
-                                phy_driver_unregister(&marvell_drivers[i]);
-                        return ret;
-                }
-        }
-
-        return 0;
+        return phy_drivers_register(marvell_drivers,
+                 ARRAY_SIZE(marvell_drivers));
 }
 
 static void __exit marvell_exit(void)
 {
-        int i;
-
-        for (i = 0; i < ARRAY_SIZE(marvell_drivers); i++)
-                phy_driver_unregister(&marvell_drivers[i]);
+        phy_drivers_unregister(marvell_drivers,
+                 ARRAY_SIZE(marvell_drivers));
 }
 
 module_init(marvell_init);
diff --git a/drivers/net/phy/mdio_bus.c b/drivers/net/phy/mdio_bus.c
index 5061608f408..170eb411ab5 100644
--- a/drivers/net/phy/mdio_bus.c
+++ b/drivers/net/phy/mdio_bus.c
@@ -13,6 +13,9 @@
  * option) any later version.
  *
  */
+
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/kernel.h>
 #include <linux/string.h>
 #include <linux/errno.h>
@@ -22,6 +25,7 @@
 #include <linux/init.h>
 #include <linux/delay.h>
 #include <linux/device.h>
+#include <linux/of_device.h>
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
 #include <linux/skbuff.h>
@@ -148,7 +152,7 @@ int mdiobus_register(struct mii_bus *bus)
 
         err = device_register(&bus->dev);
         if (err) {
-                printk(KERN_ERR "mii_bus %s failed to register\n", bus->id);
+                pr_err("mii_bus %s failed to register\n", bus->id);
                 return -EINVAL;
         }
 
@@ -229,7 +233,7 @@ struct phy_device *mdiobus_scan(struct mii_bus *bus, int addr)
         struct phy_device *phydev;
         int err;
 
-        phydev = get_phy_device(bus, addr);
+        phydev = get_phy_device(bus, addr, false);
         if (IS_ERR(phydev) || phydev == NULL)
                 return phydev;
 
@@ -305,6 +309,12 @@ static int mdio_bus_match(struct device *dev, struct device_driver *drv)
         struct phy_device *phydev = to_phy_device(dev);
         struct phy_driver *phydrv = to_phy_driver(drv);
 
+        if (of_driver_match_device(dev, drv))
+                return 1;
+
+        if (phydrv->match_phy_device)
+                return phydrv->match_phy_device(phydev);
+
         return ((phydrv->phy_id & phydrv->phy_id_mask) ==
                 (phydev->phy_id & phydrv->phy_id_mask));
 }
diff --git a/drivers/net/phy/micrel.c b/drivers/net/phy/micrel.c
index 9d6c80c8a0c..cf287e0eb40 100644
--- a/drivers/net/phy/micrel.c
+++ b/drivers/net/phy/micrel.c
@@ -114,7 +114,8 @@ static int ks8051_config_init(struct phy_device *phydev)
         return 0;
 }
 
-static struct phy_driver ks8737_driver = {
+static struct phy_driver ksphy_driver[] = {
+{
         .phy_id         = PHY_ID_KS8737,
         .phy_id_mask    = 0x00fffff0,
         .name           = "Micrel KS8737",
@@ -126,9 +127,7 @@ static struct phy_driver ks8737_driver = {
         .ack_interrupt  = kszphy_ack_interrupt,
         .config_intr    = ks8737_config_intr,
         .driver         = { .owner = THIS_MODULE,},
-};
-
-static struct phy_driver ks8041_driver = {
+}, {
         .phy_id         = PHY_ID_KS8041,
         .phy_id_mask    = 0x00fffff0,
         .name           = "Micrel KS8041",
@@ -141,9 +140,7 @@ static struct phy_driver ks8041_driver = {
         .ack_interrupt  = kszphy_ack_interrupt,
         .config_intr    = kszphy_config_intr,
         .driver         = { .owner = THIS_MODULE,},
-};
-
-static struct phy_driver ks8051_driver = {
+}, {
         .phy_id         = PHY_ID_KS8051,
         .phy_id_mask    = 0x00fffff0,
         .name           = "Micrel KS8051",
@@ -156,9 +153,7 @@ static struct phy_driver ks8051_driver = {
         .ack_interrupt  = kszphy_ack_interrupt,
         .config_intr    = kszphy_config_intr,
         .driver         = { .owner = THIS_MODULE,},
-};
-
-static struct phy_driver ks8001_driver = {
+}, {
         .phy_id         = PHY_ID_KS8001,
         .name           = "Micrel KS8001 or KS8721",
         .phy_id_mask    = 0x00ffffff,
@@ -170,9 +165,7 @@ static struct phy_driver ks8001_driver = {
         .ack_interrupt  = kszphy_ack_interrupt,
         .config_intr    = kszphy_config_intr,
         .driver         = { .owner = THIS_MODULE,},
-};
-
-static struct phy_driver ksz9021_driver = {
+}, {
         .phy_id         = PHY_ID_KSZ9021,
         .phy_id_mask    = 0x000ffffe,
         .name           = "Micrel KSZ9021 Gigabit PHY",
@@ -185,51 +178,18 @@ static struct phy_driver ksz9021_driver = {
         .ack_interrupt  = kszphy_ack_interrupt,
         .config_intr    = ksz9021_config_intr,
         .driver         = { .owner = THIS_MODULE, },
-};
+} };
 
 static int __init ksphy_init(void)
 {
-        int ret;
-
-        ret = phy_driver_register(&ks8001_driver);
-        if (ret)
-                goto err1;
-
-        ret = phy_driver_register(&ksz9021_driver);
-        if (ret)
-                goto err2;
-
-        ret = phy_driver_register(&ks8737_driver);
-        if (ret)
-                goto err3;
-        ret = phy_driver_register(&ks8041_driver);
-        if (ret)
-                goto err4;
-        ret = phy_driver_register(&ks8051_driver);
-        if (ret)
-                goto err5;
-
-        return 0;
-
-err5:
-        phy_driver_unregister(&ks8041_driver);
-err4:
-        phy_driver_unregister(&ks8737_driver);
-err3:
-        phy_driver_unregister(&ksz9021_driver);
-err2:
-        phy_driver_unregister(&ks8001_driver);
-err1:
-        return ret;
+        return phy_drivers_register(ksphy_driver,
+                ARRAY_SIZE(ksphy_driver));
 }
 
 static void __exit ksphy_exit(void)
 {
-        phy_driver_unregister(&ks8001_driver);
-        phy_driver_unregister(&ks8737_driver);
-        phy_driver_unregister(&ksz9021_driver);
-        phy_driver_unregister(&ks8041_driver);
-        phy_driver_unregister(&ks8051_driver);
+        phy_drivers_unregister(ksphy_driver,
+                ARRAY_SIZE(ksphy_driver));
 }
 
 module_init(ksphy_init);
diff --git a/drivers/net/phy/national.c b/drivers/net/phy/national.c
index 04bb8fcc0cb..9a5f234d95b 100644
--- a/drivers/net/phy/national.c
+++ b/drivers/net/phy/national.c
@@ -15,6 +15,8 @@
  *
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/mii.h>
@@ -22,6 +24,8 @@
 #include <linux/phy.h>
 #include <linux/netdevice.h>
 
+#define DEBUG
+
 /* DP83865 phy identifier values */
 #define DP83865_PHY_ID  0x20005c7a
 
@@ -112,8 +116,8 @@ static void ns_10_base_t_hdx_loopack(struct phy_device *phydev, int disable)
                 ns_exp_write(phydev, 0x1c0,
                              ns_exp_read(phydev, 0x1c0) & 0xfffe);
 
-        printk(KERN_DEBUG "DP83865 PHY: 10BASE-T HDX loopback %s\n",
-               (ns_exp_read(phydev, 0x1c0) & 0x0001) ? "off" : "on");
+        pr_debug("10BASE-T HDX loopback %s\n",
+                 (ns_exp_read(phydev, 0x1c0) & 0x0001) ? "off" : "on");
 }
 
 static int ns_config_init(struct phy_device *phydev)
diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index 3cbda0851f8..7ca2ff97c36 100644
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
@@ -15,6 +15,9 @@
  * option) any later version.
  *
  */
+
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/kernel.h>
 #include <linux/string.h>
 #include <linux/errno.h>
@@ -32,6 +35,7 @@
 #include <linux/phy.h>
 #include <linux/timer.h>
 #include <linux/workqueue.h>
+#include <linux/mdio.h>
 
 #include <linux/atomic.h>
 #include <asm/io.h>
@@ -44,18 +48,16 @@
  */
 void phy_print_status(struct phy_device *phydev)
 {
-        pr_info("PHY: %s - Link is %s", dev_name(&phydev->dev),
-                        phydev->link ? "Up" : "Down");
         if (phydev->link)
-                printk(KERN_CONT " - %d/%s", phydev->speed,
-                                DUPLEX_FULL == phydev->duplex ?
-                                "Full" : "Half");
-
-        printk(KERN_CONT "\n");
+                pr_info("%s - Link is Up - %d/%s\n",
+                        dev_name(&phydev->dev),
+                        phydev->speed,
+                        DUPLEX_FULL == phydev->duplex ? "Full" : "Half");
+        else
+                pr_info("%s - Link is Down\n", dev_name(&phydev->dev));
 }
 EXPORT_SYMBOL(phy_print_status);
 
-
 /**
  * phy_clear_interrupt - Ack the phy device's interrupt
  * @phydev: the phy_device struct
@@ -482,9 +484,8 @@ static void phy_force_reduction(struct phy_device *phydev)
         phydev->speed = settings[idx].speed;
         phydev->duplex = settings[idx].duplex;
 
-        pr_info("Trying %d/%s\n", phydev->speed,
-                        DUPLEX_FULL == phydev->duplex ?
-                        "FULL" : "HALF");
+        pr_info("Trying %d/%s\n",
+                phydev->speed, DUPLEX_FULL == phydev->duplex ? "FULL" : "HALF");
 }
 
 
@@ -598,9 +599,8 @@ int phy_start_interrupts(struct phy_device *phydev)
                                 IRQF_SHARED,
                                 "phy_interrupt",
                                 phydev) < 0) {
-                printk(KERN_WARNING "%s: Can't get IRQ %d (PHY)\n",
-                                phydev->bus->name,
-                                phydev->irq);
+                pr_warn("%s: Can't get IRQ %d (PHY)\n",
+                        phydev->bus->name, phydev->irq);
                 phydev->irq = PHY_POLL;
                 return 0;
         }
@@ -838,10 +838,10 @@ void phy_state_machine(struct work_struct *work)
 
                                 phydev->autoneg = AUTONEG_DISABLE;
 
-                                pr_info("Trying %d/%s\n", phydev->speed,
-                                                DUPLEX_FULL ==
-                                                phydev->duplex ?
-                                                "FULL" : "HALF");
+                                pr_info("Trying %d/%s\n",
+                                        phydev->speed,
+                                        DUPLEX_FULL == phydev->duplex ?
+                                        "FULL" : "HALF");
                         }
                         break;
                 case PHY_NOLINK:
@@ -968,3 +968,283 @@ void phy_state_machine(struct work_struct *work)
 
         schedule_delayed_work(&phydev->state_queue, PHY_STATE_TIME * HZ);
 }
+
+static inline void mmd_phy_indirect(struct mii_bus *bus, int prtad, int devad,
+                                    int addr)
+{
+        /* Write the desired MMD Devad */
+        bus->write(bus, addr, MII_MMD_CTRL, devad);
+
+        /* Write the desired MMD register address */
+        bus->write(bus, addr, MII_MMD_DATA, prtad);
+
+        /* Select the Function : DATA with no post increment */
+        bus->write(bus, addr, MII_MMD_CTRL, (devad | MII_MMD_CTRL_NOINCR));
+}
+
+/**
+ * phy_read_mmd_indirect - reads data from the MMD registers
+ * @bus: the target MII bus
+ * @prtad: MMD Address
+ * @devad: MMD DEVAD
+ * @addr: PHY address on the MII bus
+ *
+ * Description: it reads data from the MMD registers (clause 22 to access to
+ * clause 45) of the specified phy address.
+ * To read these register we have:
+ * 1) Write reg 13 // DEVAD
+ * 2) Write reg 14 // MMD Address
+ * 3) Write reg 13 // MMD Data Command for MMD DEVAD
+ * 3) Read  reg 14 // Read MMD data
+ */
+static int phy_read_mmd_indirect(struct mii_bus *bus, int prtad, int devad,
+                                 int addr)
+{
+        u32 ret;
+
+        mmd_phy_indirect(bus, prtad, devad, addr);
+
+        /* Read the content of the MMD's selected register */
+        ret = bus->read(bus, addr, MII_MMD_DATA);
+
+        return ret;
+}
+
+/**
+ * phy_write_mmd_indirect - writes data to the MMD registers
+ * @bus: the target MII bus
+ * @prtad: MMD Address
+ * @devad: MMD DEVAD
+ * @addr: PHY address on the MII bus
+ * @data: data to write in the MMD register
+ *
+ * Description: Write data from the MMD registers of the specified
+ * phy address.
+ * To write these register we have:
+ * 1) Write reg 13 // DEVAD
+ * 2) Write reg 14 // MMD Address
+ * 3) Write reg 13 // MMD Data Command for MMD DEVAD
+ * 3) Write reg 14 // Write MMD data
+ */
+static void phy_write_mmd_indirect(struct mii_bus *bus, int prtad, int devad,
+                                   int addr, u32 data)
+{
+        mmd_phy_indirect(bus, prtad, devad, addr);
+
+        /* Write the data into MMD's selected register */
+        bus->write(bus, addr, MII_MMD_DATA, data);
+}
+
+static u32 phy_eee_to_adv(u16 eee_adv)
+{
+        u32 adv = 0;
+
+        if (eee_adv & MDIO_EEE_100TX)
+                adv |= ADVERTISED_100baseT_Full;
+        if (eee_adv & MDIO_EEE_1000T)
+                adv |= ADVERTISED_1000baseT_Full;
+        if (eee_adv & MDIO_EEE_10GT)
+                adv |= ADVERTISED_10000baseT_Full;
+        if (eee_adv & MDIO_EEE_1000KX)
+                adv |= ADVERTISED_1000baseKX_Full;
+        if (eee_adv & MDIO_EEE_10GKX4)
+                adv |= ADVERTISED_10000baseKX4_Full;
+        if (eee_adv & MDIO_EEE_10GKR)
+                adv |= ADVERTISED_10000baseKR_Full;
+
+        return adv;
+}
+
+static u32 phy_eee_to_supported(u16 eee_caported)
+{
+        u32 supported = 0;
+
+        if (eee_caported & MDIO_EEE_100TX)
+                supported |= SUPPORTED_100baseT_Full;
+        if (eee_caported & MDIO_EEE_1000T)
+                supported |= SUPPORTED_1000baseT_Full;
+        if (eee_caported & MDIO_EEE_10GT)
+                supported |= SUPPORTED_10000baseT_Full;
+        if (eee_caported & MDIO_EEE_1000KX)
+                supported |= SUPPORTED_1000baseKX_Full;
+        if (eee_caported & MDIO_EEE_10GKX4)
+                supported |= SUPPORTED_10000baseKX4_Full;
+        if (eee_caported & MDIO_EEE_10GKR)
+                supported |= SUPPORTED_10000baseKR_Full;
+
+        return supported;
+}
+
+static u16 phy_adv_to_eee(u32 adv)
+{
+        u16 reg = 0;
+
+        if (adv & ADVERTISED_100baseT_Full)
+                reg |= MDIO_EEE_100TX;
+        if (adv & ADVERTISED_1000baseT_Full)
+                reg |= MDIO_EEE_1000T;
+        if (adv & ADVERTISED_10000baseT_Full)
+                reg |= MDIO_EEE_10GT;
+        if (adv & ADVERTISED_1000baseKX_Full)
+                reg |= MDIO_EEE_1000KX;
+        if (adv & ADVERTISED_10000baseKX4_Full)
+                reg |= MDIO_EEE_10GKX4;
+        if (adv & ADVERTISED_10000baseKR_Full)
+                reg |= MDIO_EEE_10GKR;
+
+        return reg;
+}
+
+/**
+ * phy_init_eee - init and check the EEE feature
+ * @phydev: target phy_device struct
+ * @clk_stop_enable: PHY may stop the clock during LPI
+ *
+ * Description: it checks if the Energy-Efficient Ethernet (EEE)
+ * is supported by looking at the MMD registers 3.20 and 7.60/61
+ * and it programs the MMD register 3.0 setting the "Clock stop enable"
+ * bit if required.
+ */
+int phy_init_eee(struct phy_device *phydev, bool clk_stop_enable)
+{
+        int ret = -EPROTONOSUPPORT;
+
+        /* According to 802.3az,the EEE is supported only in full duplex-mode.
+         * Also EEE feature is active when core is operating with MII, GMII
+         * or RGMII.
+         */
+        if ((phydev->duplex == DUPLEX_FULL) &&
+            ((phydev->interface == PHY_INTERFACE_MODE_MII) ||
+            (phydev->interface == PHY_INTERFACE_MODE_GMII) ||
+            (phydev->interface == PHY_INTERFACE_MODE_RGMII))) {
+                int eee_lp, eee_cap, eee_adv;
+                u32 lp, cap, adv;
+                int idx, status;
+
+                /* Read phy status to properly get the right settings */
+                status = phy_read_status(phydev);
+                if (status)
+                        return status;
+
+                /* First check if the EEE ability is supported */
+                eee_cap = phy_read_mmd_indirect(phydev->bus, MDIO_PCS_EEE_ABLE,
+                                                MDIO_MMD_PCS, phydev->addr);
+                if (eee_cap < 0)
+                        return eee_cap;
+
+                cap = phy_eee_to_supported(eee_cap);
+                if (!cap)
+                        goto eee_exit;
+
+                /* Check which link settings negotiated and verify it in
+                 * the EEE advertising registers.
+                 */
+                eee_lp = phy_read_mmd_indirect(phydev->bus, MDIO_AN_EEE_LPABLE,
+                                               MDIO_MMD_AN, phydev->addr);
+                if (eee_lp < 0)
+                        return eee_lp;
+
+                eee_adv = phy_read_mmd_indirect(phydev->bus, MDIO_AN_EEE_ADV,
+                                                MDIO_MMD_AN, phydev->addr);
+                if (eee_adv < 0)
+                        return eee_adv;
+
+                adv = phy_eee_to_adv(eee_adv);
+                lp = phy_eee_to_adv(eee_lp);
+                idx = phy_find_setting(phydev->speed, phydev->duplex);
+                if ((lp & adv & settings[idx].setting))
+                        goto eee_exit;
+
+                if (clk_stop_enable) {
+                        /* Configure the PHY to stop receiving xMII
+                         * clock while it is signaling LPI.
+                         */
+                        int val = phy_read_mmd_indirect(phydev->bus, MDIO_CTRL1,
+                                                        MDIO_MMD_PCS,
+                                                        phydev->addr);
+                        if (val < 0)
+                                return val;
+
+                        val |= MDIO_PCS_CTRL1_CLKSTOP_EN;
+                        phy_write_mmd_indirect(phydev->bus, MDIO_CTRL1,
+                                               MDIO_MMD_PCS, phydev->addr, val);
+                }
+
+                ret = 0; /* EEE supported */
+        }
+
+eee_exit:
+        return ret;
+}
+EXPORT_SYMBOL(phy_init_eee);
+
+/**
+ * phy_get_eee_err - report the EEE wake error count
+ * @phydev: target phy_device struct
+ *
+ * Description: it is to report the number of time where the PHY
+ * failed to complete its normal wake sequence.
+ */
+int phy_get_eee_err(struct phy_device *phydev)
+{
+        return phy_read_mmd_indirect(phydev->bus, MDIO_PCS_EEE_WK_ERR,
+                                     MDIO_MMD_PCS, phydev->addr);
+
+}
+EXPORT_SYMBOL(phy_get_eee_err);
+
+/**
+ * phy_ethtool_get_eee - get EEE supported and status
+ * @phydev: target phy_device struct
+ * @data: ethtool_eee data
+ *
+ * Description: it reportes the Supported/Advertisement/LP Advertisement
+ * capabilities.
+ */
+int phy_ethtool_get_eee(struct phy_device *phydev, struct ethtool_eee *data)
+{
+        int val;
+
+        /* Get Supported EEE */
+        val = phy_read_mmd_indirect(phydev->bus, MDIO_PCS_EEE_ABLE,
+                                    MDIO_MMD_PCS, phydev->addr);
+        if (val < 0)
+                return val;
+        data->supported = phy_eee_to_supported(val);
+
+        /* Get advertisement EEE */
+        val = phy_read_mmd_indirect(phydev->bus, MDIO_AN_EEE_ADV,
+                                    MDIO_MMD_AN, phydev->addr);
+        if (val < 0)
+                return val;
+        data->advertised = phy_eee_to_adv(val);
+
+        /* Get LP advertisement EEE */
+        val = phy_read_mmd_indirect(phydev->bus, MDIO_AN_EEE_LPABLE,
+                                    MDIO_MMD_AN, phydev->addr);
+        if (val < 0)
+                return val;
+        data->lp_advertised = phy_eee_to_adv(val);
+
+        return 0;
+}
+EXPORT_SYMBOL(phy_ethtool_get_eee);
+
+/**
+ * phy_ethtool_set_eee - set EEE supported and status
+ * @phydev: target phy_device struct
+ * @data: ethtool_eee data
+ *
+ * Description: it is to program the Advertisement EEE register.
+ */
+int phy_ethtool_set_eee(struct phy_device *phydev, struct ethtool_eee *data)
+{
+        int val;
+
+        val = phy_adv_to_eee(data->advertised);
+        phy_write_mmd_indirect(phydev->bus, MDIO_AN_EEE_ADV, MDIO_MMD_AN,
+                               phydev->addr, val);
+
+        return 0;
+}
+EXPORT_SYMBOL(phy_ethtool_set_eee);
diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c
index de86a558222..8af46e88a18 100644
--- a/drivers/net/phy/phy_device.c
+++ b/drivers/net/phy/phy_device.c
@@ -14,6 +14,9 @@
  * option) any later version.
  *
  */
+
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/kernel.h>
 #include <linux/string.h>
 #include <linux/errno.h>
@@ -149,8 +152,8 @@ int phy_scan_fixups(struct phy_device *phydev)
 }
 EXPORT_SYMBOL(phy_scan_fixups);
 
-static struct phy_device* phy_device_create(struct mii_bus *bus,
-                                            int addr, int phy_id)
+struct phy_device *phy_device_create(struct mii_bus *bus, int addr, int phy_id,
+                        bool is_c45, struct phy_c45_device_ids *c45_ids)
 {
         struct phy_device *dev;
 
@@ -171,8 +174,11 @@ static struct phy_device* phy_device_create(struct mii_bus *bus,
 
         dev->autoneg = AUTONEG_ENABLE;
 
+        dev->is_c45 = is_c45;
         dev->addr = addr;
         dev->phy_id = phy_id;
+        if (c45_ids)
+                dev->c45_ids = *c45_ids;
         dev->bus = bus;
         dev->dev.parent = bus->parent;
         dev->dev.bus = &mdio_bus_type;
@@ -197,20 +203,99 @@ static struct phy_device* phy_device_create(struct mii_bus *bus,
 
         return dev;
 }
+EXPORT_SYMBOL(phy_device_create);
+
+/**
+ * get_phy_c45_ids - reads the specified addr for its 802.3-c45 IDs.
+ * @bus: the target MII bus
+ * @addr: PHY address on the MII bus
+ * @phy_id: where to store the ID retrieved.
+ * @c45_ids: where to store the c45 ID information.
+ *
+ *   If the PHY devices-in-package appears to be valid, it and the
+ *   corresponding identifiers are stored in @c45_ids, zero is stored
+ *   in @phy_id.  Otherwise 0xffffffff is stored in @phy_id.  Returns
+ *   zero on success.
+ *
+ */
+static int get_phy_c45_ids(struct mii_bus *bus, int addr, u32 *phy_id,
+                           struct phy_c45_device_ids *c45_ids) {
+        int phy_reg;
+        int i, reg_addr;
+        const int num_ids = ARRAY_SIZE(c45_ids->device_ids);
+
+        /* Find first non-zero Devices In package.  Device
+         * zero is reserved, so don't probe it.
+         */
+        for (i = 1;
+             i < num_ids && c45_ids->devices_in_package == 0;
+             i++) {
+                reg_addr = MII_ADDR_C45 | i << 16 | 6;
+                phy_reg = mdiobus_read(bus, addr, reg_addr);
+                if (phy_reg < 0)
+                        return -EIO;
+                c45_ids->devices_in_package = (phy_reg & 0xffff) << 16;
+
+                reg_addr = MII_ADDR_C45 | i << 16 | 5;
+                phy_reg = mdiobus_read(bus, addr, reg_addr);
+                if (phy_reg < 0)
+                        return -EIO;
+                c45_ids->devices_in_package |= (phy_reg & 0xffff);
+
+                /* If mostly Fs, there is no device there,
+                 * let's get out of here.
+                 */
+                if ((c45_ids->devices_in_package & 0x1fffffff) == 0x1fffffff) {
+                        *phy_id = 0xffffffff;
+                        return 0;
+                }
+        }
+
+        /* Now probe Device Identifiers for each device present. */
+        for (i = 1; i < num_ids; i++) {
+                if (!(c45_ids->devices_in_package & (1 << i)))
+                        continue;
+
+                reg_addr = MII_ADDR_C45 | i << 16 | MII_PHYSID1;
+                phy_reg = mdiobus_read(bus, addr, reg_addr);
+                if (phy_reg < 0)
+                        return -EIO;
+                c45_ids->device_ids[i] = (phy_reg & 0xffff) << 16;
+
+                reg_addr = MII_ADDR_C45 | i << 16 | MII_PHYSID2;
+                phy_reg = mdiobus_read(bus, addr, reg_addr);
+                if (phy_reg < 0)
+                        return -EIO;
+                c45_ids->device_ids[i] |= (phy_reg & 0xffff);
+        }
+        *phy_id = 0;
+        return 0;
+}
 
 /**
  * get_phy_id - reads the specified addr for its ID.
  * @bus: the target MII bus
  * @addr: PHY address on the MII bus
  * @phy_id: where to store the ID retrieved.
+ * @is_c45: If true the PHY uses the 802.3 clause 45 protocol
+ * @c45_ids: where to store the c45 ID information.
+ *
+ * Description: In the case of a 802.3-c22 PHY, reads the ID registers
+ *   of the PHY at @addr on the @bus, stores it in @phy_id and returns
+ *   zero on success.
+ *
+ *   In the case of a 802.3-c45 PHY, get_phy_c45_ids() is invoked, and
+ *   its return value is in turn returned.
  *
- * Description: Reads the ID registers of the PHY at @addr on the
- *   @bus, stores it in @phy_id and returns zero on success.
  */
-static int get_phy_id(struct mii_bus *bus, int addr, u32 *phy_id)
+static int get_phy_id(struct mii_bus *bus, int addr, u32 *phy_id,
+                      bool is_c45, struct phy_c45_device_ids *c45_ids)
 {
         int phy_reg;
 
+        if (is_c45)
+                return get_phy_c45_ids(bus, addr, phy_id, c45_ids);
+
         /* Grab the bits from PHYIR1, and put them
          * in the upper half */
         phy_reg = mdiobus_read(bus, addr, MII_PHYSID1);
@@ -235,17 +320,19 @@ static int get_phy_id(struct mii_bus *bus, int addr, u32 *phy_id)
  * get_phy_device - reads the specified PHY device and returns its @phy_device struct
  * @bus: the target MII bus
  * @addr: PHY address on the MII bus
+ * @is_c45: If true the PHY uses the 802.3 clause 45 protocol
  *
  * Description: Reads the ID registers of the PHY at @addr on the
  *   @bus, then allocates and returns the phy_device to represent it.
  */
-struct phy_device * get_phy_device(struct mii_bus *bus, int addr)
+struct phy_device *get_phy_device(struct mii_bus *bus, int addr, bool is_c45)
 {
+        struct phy_c45_device_ids c45_ids = {0};
         struct phy_device *dev = NULL;
-        u32 phy_id;
+        u32 phy_id = 0;
         int r;
 
-        r = get_phy_id(bus, addr, &phy_id);
+        r = get_phy_id(bus, addr, &phy_id, is_c45, &c45_ids);
         if (r)
                 return ERR_PTR(r);
 
@@ -253,7 +340,7 @@ struct phy_device * get_phy_device(struct mii_bus *bus, int addr)
         if ((phy_id & 0x1fffffff) == 0x1fffffff)
                 return NULL;
 
-        dev = phy_device_create(bus, addr, phy_id);
+        dev = phy_device_create(bus, addr, phy_id, is_c45, &c45_ids);
 
         return dev;
 }
@@ -446,6 +533,11 @@ static int phy_attach_direct(struct net_device *dev, struct phy_device *phydev,
         /* Assume that if there is no driver, that it doesn't
          * exist, and we should use the genphy driver. */
         if (NULL == d->driver) {
+                if (phydev->is_c45) {
+                        pr_err("No driver for phy %x\n", phydev->phy_id);
+                        return -ENODEV;
+                }
+
                 d->driver = &genphy_driver.driver;
 
                 err = d->driver->probe(d);
@@ -975,8 +1067,8 @@ int phy_driver_register(struct phy_driver *new_driver)
         retval = driver_register(&new_driver->driver);
 
         if (retval) {
-                printk(KERN_ERR "%s: Error %d in registering driver\n",
-                                new_driver->name, retval);
+                pr_err("%s: Error %d in registering driver\n",
+                       new_driver->name, retval);
 
                 return retval;
         }
@@ -987,12 +1079,37 @@ int phy_driver_register(struct phy_driver *new_driver)
 }
 EXPORT_SYMBOL(phy_driver_register);
 
+int phy_drivers_register(struct phy_driver *new_driver, int n)
+{
+        int i, ret = 0;
+
+        for (i = 0; i < n; i++) {
+                ret = phy_driver_register(new_driver + i);
+                if (ret) {
+                        while (i-- > 0)
+                                phy_driver_unregister(new_driver + i);
+                        break;
+                }
+        }
+        return ret;
+}
+EXPORT_SYMBOL(phy_drivers_register);
+
 void phy_driver_unregister(struct phy_driver *drv)
 {
         driver_unregister(&drv->driver);
 }
 EXPORT_SYMBOL(phy_driver_unregister);
 
+void phy_drivers_unregister(struct phy_driver *drv, int n)
+{
+        int i;
+        for (i = 0; i < n; i++) {
+                phy_driver_unregister(drv + i);
+        }
+}
+EXPORT_SYMBOL(phy_drivers_unregister);
+
 static struct phy_driver genphy_driver = {
         .phy_id         = 0xffffffff,
         .phy_id_mask    = 0xffffffff,
diff --git a/drivers/net/phy/realtek.c b/drivers/net/phy/realtek.c
index f414ffb5b72..72f93470ea3 100644
--- a/drivers/net/phy/realtek.c
+++ b/drivers/net/phy/realtek.c
@@ -65,11 +65,7 @@ static struct phy_driver rtl821x_driver = {
 
 static int __init realtek_init(void)
 {
-        int ret;
-
-        ret = phy_driver_register(&rtl821x_driver);
-
-        return ret;
+        return phy_driver_register(&rtl821x_driver);
 }
 
 static void __exit realtek_exit(void)
diff --git a/drivers/net/phy/smsc.c b/drivers/net/phy/smsc.c
index fc3e7e96c88..c6b06d311fe 100644
--- a/drivers/net/phy/smsc.c
+++ b/drivers/net/phy/smsc.c
@@ -61,7 +61,8 @@ static int lan911x_config_init(struct phy_device *phydev)
         return smsc_phy_ack_interrupt(phydev);
 }
 
-static struct phy_driver lan83c185_driver = {
+static struct phy_driver smsc_phy_driver[] = {
+{
         .phy_id         = 0x0007c0a0, /* OUI=0x00800f, Model#=0x0a */
         .phy_id_mask    = 0xfffffff0,
         .name           = "SMSC LAN83C185",
@@ -83,9 +84,7 @@ static struct phy_driver lan83c185_driver = {
         .resume         = genphy_resume,
 
         .driver         = { .owner = THIS_MODULE, }
-};
-
-static struct phy_driver lan8187_driver = {
+}, {
         .phy_id         = 0x0007c0b0, /* OUI=0x00800f, Model#=0x0b */
         .phy_id_mask    = 0xfffffff0,
         .name           = "SMSC LAN8187",
@@ -107,9 +106,7 @@ static struct phy_driver lan8187_driver = {
         .resume         = genphy_resume,
 
         .driver         = { .owner = THIS_MODULE, }
-};
-
-static struct phy_driver lan8700_driver = {
+}, {
         .phy_id         = 0x0007c0c0, /* OUI=0x00800f, Model#=0x0c */
         .phy_id_mask    = 0xfffffff0,
         .name           = "SMSC LAN8700",
@@ -131,9 +128,7 @@ static struct phy_driver lan8700_driver = {
         .resume         = genphy_resume,
 
         .driver         = { .owner = THIS_MODULE, }
-};
-
-static struct phy_driver lan911x_int_driver = {
+}, {
         .phy_id         = 0x0007c0d0, /* OUI=0x00800f, Model#=0x0d */
         .phy_id_mask    = 0xfffffff0,
         .name           = "SMSC LAN911x Internal PHY",
@@ -155,9 +150,7 @@ static struct phy_driver lan911x_int_driver = {
         .resume         = genphy_resume,
 
         .driver         = { .owner = THIS_MODULE, }
-};
-
-static struct phy_driver lan8710_driver = {
+}, {
         .phy_id         = 0x0007c0f0, /* OUI=0x00800f, Model#=0x0f */
         .phy_id_mask    = 0xfffffff0,
         .name           = "SMSC LAN8710/LAN8720",
@@ -179,53 +172,18 @@ static struct phy_driver lan8710_driver = {
         .resume         = genphy_resume,
 
         .driver         = { .owner = THIS_MODULE, }
-};
+} };
 
 static int __init smsc_init(void)
 {
-        int ret;
-
-        ret = phy_driver_register (&lan83c185_driver);
-        if (ret)
-                goto err1;
-
-        ret = phy_driver_register (&lan8187_driver);
-        if (ret)
-                goto err2;
-
-        ret = phy_driver_register (&lan8700_driver);
-        if (ret)
-                goto err3;
-
-        ret = phy_driver_register (&lan911x_int_driver);
-        if (ret)
-                goto err4;
-
-        ret = phy_driver_register (&lan8710_driver);
-        if (ret)
-                goto err5;
-
-        return 0;
-
-err5:
-        phy_driver_unregister (&lan911x_int_driver);
-err4:
-        phy_driver_unregister (&lan8700_driver);
-err3:
-        phy_driver_unregister (&lan8187_driver);
-err2:
-        phy_driver_unregister (&lan83c185_driver);
-err1:
-        return ret;
+        return phy_drivers_register(smsc_phy_driver,
+                ARRAY_SIZE(smsc_phy_driver));
 }
 
 static void __exit smsc_exit(void)
 {
-        phy_driver_unregister (&lan8710_driver);
-        phy_driver_unregister (&lan911x_int_driver);
-        phy_driver_unregister (&lan8700_driver);
-        phy_driver_unregister (&lan8187_driver);
-        phy_driver_unregister (&lan83c185_driver);
+        return phy_drivers_unregister(smsc_phy_driver,
+                ARRAY_SIZE(smsc_phy_driver));
 }
 
 MODULE_DESCRIPTION("SMSC PHY driver");
diff --git a/drivers/net/phy/spi_ks8995.c b/drivers/net/phy/spi_ks8995.c
index 4eb98bc52a0..1c3abce78b6 100644
--- a/drivers/net/phy/spi_ks8995.c
+++ b/drivers/net/phy/spi_ks8995.c
@@ -11,6 +11,8 @@
  * by the Free Software Foundation.
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/types.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
@@ -356,7 +358,7 @@ static struct spi_driver ks8995_driver = {
 
 static int __init ks8995_init(void)
 {
-        printk(KERN_INFO DRV_DESC " version " DRV_VERSION"\n");
+        pr_info(DRV_DESC " version " DRV_VERSION "\n");
 
         return spi_register_driver(&ks8995_driver);
 }
diff --git a/drivers/net/phy/ste10Xp.c b/drivers/net/phy/ste10Xp.c
index 187a2fa814f..5e1eb138916 100644
--- a/drivers/net/phy/ste10Xp.c
+++ b/drivers/net/phy/ste10Xp.c
@@ -81,7 +81,8 @@ static int ste10Xp_ack_interrupt(struct phy_device *phydev)
         return 0;
 }
 
-static struct phy_driver ste101p_pdriver = {
+static struct phy_driver ste10xp_pdriver[] = {
+{
         .phy_id = STE101P_PHY_ID,
         .phy_id_mask = 0xfffffff0,
         .name = "STe101p",
@@ -95,9 +96,7 @@ static struct phy_driver ste101p_pdriver = {
         .suspend = genphy_suspend,
         .resume = genphy_resume,
         .driver = {.owner = THIS_MODULE,}
-};
-
-static struct phy_driver ste100p_pdriver = {
+}, {
         .phy_id = STE100P_PHY_ID,
         .phy_id_mask = 0xffffffff,
         .name = "STe100p",
@@ -111,22 +110,18 @@ static struct phy_driver ste100p_pdriver = {
         .suspend = genphy_suspend,
         .resume = genphy_resume,
         .driver = {.owner = THIS_MODULE,}
-};
+} };
 
 static int __init ste10Xp_init(void)
 {
-        int retval;
-
-        retval = phy_driver_register(&ste100p_pdriver);
-        if (retval < 0)
-                return retval;
-        return phy_driver_register(&ste101p_pdriver);
+        return phy_drivers_register(ste10xp_pdriver,
+                ARRAY_SIZE(ste10xp_pdriver));
 }
 
 static void __exit ste10Xp_exit(void)
 {
-        phy_driver_unregister(&ste100p_pdriver);
-        phy_driver_unregister(&ste101p_pdriver);
+        phy_drivers_unregister(ste10xp_pdriver,
+                ARRAY_SIZE(ste10xp_pdriver));
 }
 
 module_init(ste10Xp_init);
diff --git a/drivers/net/phy/vitesse.c b/drivers/net/phy/vitesse.c
index 0ec8e09cc2a..2585c383e62 100644
--- a/drivers/net/phy/vitesse.c
+++ b/drivers/net/phy/vitesse.c
@@ -138,21 +138,6 @@ static int vsc82xx_config_intr(struct phy_device *phydev)
         return err;
 }
 
-/* Vitesse 824x */
-static struct phy_driver vsc8244_driver = {
-        .phy_id         = PHY_ID_VSC8244,
-        .name           = "Vitesse VSC8244",
-        .phy_id_mask    = 0x000fffc0,
-        .features       = PHY_GBIT_FEATURES,
-        .flags          = PHY_HAS_INTERRUPT,
-        .config_init    = &vsc824x_config_init,
-        .config_aneg    = &genphy_config_aneg,
-        .read_status    = &genphy_read_status,
-        .ack_interrupt  = &vsc824x_ack_interrupt,
-        .config_intr    = &vsc82xx_config_intr,
-        .driver         = { .owner = THIS_MODULE,},
-};
-
 static int vsc8221_config_init(struct phy_device *phydev)
 {
         int err;
@@ -165,8 +150,22 @@ static int vsc8221_config_init(struct phy_device *phydev)
            Options are 802.3Z SerDes or SGMII */
 }
 
-/* Vitesse 8221 */
-static struct phy_driver vsc8221_driver = {
+/* Vitesse 824x */
+static struct phy_driver vsc82xx_driver[] = {
+{
+        .phy_id         = PHY_ID_VSC8244,
+        .name           = "Vitesse VSC8244",
+        .phy_id_mask    = 0x000fffc0,
+        .features       = PHY_GBIT_FEATURES,
+        .flags          = PHY_HAS_INTERRUPT,
+        .config_init    = &vsc824x_config_init,
+        .config_aneg    = &genphy_config_aneg,
+        .read_status    = &genphy_read_status,
+        .ack_interrupt  = &vsc824x_ack_interrupt,
+        .config_intr    = &vsc82xx_config_intr,
+        .driver         = { .owner = THIS_MODULE,},
+}, {
+        /* Vitesse 8221 */
         .phy_id         = PHY_ID_VSC8221,
         .phy_id_mask    = 0x000ffff0,
         .name           = "Vitesse VSC8221",
@@ -177,26 +176,19 @@ static struct phy_driver vsc8221_driver = {
         .read_status    = &genphy_read_status,
         .ack_interrupt  = &vsc824x_ack_interrupt,
         .config_intr    = &vsc82xx_config_intr,
-        .driver         = { .owner = THIS_MODULE,},
-};
+        .driver         = { .owner = THIS_MODULE,},
+} };
 
 static int __init vsc82xx_init(void)
 {
-        int err;
-
-        err = phy_driver_register(&vsc8244_driver);
-        if (err < 0)
-                return err;
-        err = phy_driver_register(&vsc8221_driver);
-        if (err < 0)
-                phy_driver_unregister(&vsc8244_driver);
-        return err;
+        return phy_drivers_register(vsc82xx_driver,
+                ARRAY_SIZE(vsc82xx_driver));
 }
 
 static void __exit vsc82xx_exit(void)
 {
-        phy_driver_unregister(&vsc8244_driver);
-        phy_driver_unregister(&vsc8221_driver);
+        return phy_drivers_unregister(vsc82xx_driver,
+                ARRAY_SIZE(vsc82xx_driver));
 }
 
 module_init(vsc82xx_init);
diff --git a/drivers/net/slip/slip.c b/drivers/net/slip/slip.c
index d4c9db3da22..a34d6bf5e43 100644
--- a/drivers/net/slip/slip.c
+++ b/drivers/net/slip/slip.c
@@ -390,10 +390,10 @@ static void sl_encaps(struct slip *sl, unsigned char *icp, int len)
 #endif
 #ifdef CONFIG_SLIP_MODE_SLIP6
         if (sl->mode & SL_MODE_SLIP6)
-                count = slip_esc6(p, (unsigned char *) sl->xbuff, len);
+                count = slip_esc6(p, sl->xbuff, len);
         else
 #endif
-                count = slip_esc(p, (unsigned char *) sl->xbuff, len);
+                count = slip_esc(p, sl->xbuff, len);
 
         /* Order of next two lines is *very* important.
          * When we are sending a little amount of data,
diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c
index c61ae35a53c..9b94f53a9d4 100644
--- a/drivers/net/team/team.c
+++ b/drivers/net/team/team.c
@@ -1,5 +1,5 @@
 /*
- * net/drivers/team/team.c - Network team device driver
+ * drivers/net/team/team.c - Network team device driver
  * Copyright (c) 2011 Jiri Pirko <jpirko@redhat.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -82,14 +82,16 @@ static void team_refresh_port_linkup(struct team_port *port)
                                                    port->state.linkup;
 }
 
+
 /*******************
  * Options handling
  *******************/
 
 struct team_option_inst { /* One for each option instance */
         struct list_head list;
+        struct list_head tmp_list;
         struct team_option *option;
-        struct team_port *port; /* != NULL if per-port */
+        struct team_option_inst_info info;
         bool changed;
         bool removed;
 };
@@ -106,22 +108,6 @@ static struct team_option *__team_find_option(struct team *team,
         return NULL;
 }
 
-static int __team_option_inst_add(struct team *team, struct team_option *option,
-                                  struct team_port *port)
-{
-        struct team_option_inst *opt_inst;
-
-        opt_inst = kmalloc(sizeof(*opt_inst), GFP_KERNEL);
-        if (!opt_inst)
-                return -ENOMEM;
-        opt_inst->option = option;
-        opt_inst->port = port;
-        opt_inst->changed = true;
-        opt_inst->removed = false;
-        list_add_tail(&opt_inst->list, &team->option_inst_list);
-        return 0;
-}
-
 static void __team_option_inst_del(struct team_option_inst *opt_inst)
 {
         list_del(&opt_inst->list);
@@ -139,14 +125,49 @@ static void __team_option_inst_del_option(struct team *team,
         }
 }
 
+static int __team_option_inst_add(struct team *team, struct team_option *option,
+                                  struct team_port *port)
+{
+        struct team_option_inst *opt_inst;
+        unsigned int array_size;
+        unsigned int i;
+        int err;
+
+        array_size = option->array_size;
+        if (!array_size)
+                array_size = 1; /* No array but still need one instance */
+
+        for (i = 0; i < array_size; i++) {
+                opt_inst = kmalloc(sizeof(*opt_inst), GFP_KERNEL);
+                if (!opt_inst)
+                        return -ENOMEM;
+                opt_inst->option = option;
+                opt_inst->info.port = port;
+                opt_inst->info.array_index = i;
+                opt_inst->changed = true;
+                opt_inst->removed = false;
+                list_add_tail(&opt_inst->list, &team->option_inst_list);
+                if (option->init) {
+                        err = option->init(team, &opt_inst->info);
+                        if (err)
+                                return err;
+                }
+
+        }
+        return 0;
+}
+
 static int __team_option_inst_add_option(struct team *team,
                                          struct team_option *option)
 {
         struct team_port *port;
         int err;
 
-        if (!option->per_port)
-                return __team_option_inst_add(team, option, 0);
+        if (!option->per_port) {
+                err = __team_option_inst_add(team, option, NULL);
+                if (err)
+                        goto inst_del_option;
+        }
 
         list_for_each_entry(port, &team->port_list, list) {
                 err = __team_option_inst_add(team, option, port);
@@ -180,7 +201,7 @@ static void __team_option_inst_del_port(struct team *team,
 
         list_for_each_entry_safe(opt_inst, tmp, &team->option_inst_list, list) {
                 if (opt_inst->option->per_port &&
-                    opt_inst->port == port)
+                    opt_inst->info.port == port)
                         __team_option_inst_del(opt_inst);
         }
 }
@@ -211,7 +232,7 @@ static void __team_option_inst_mark_removed_port(struct team *team,
         struct team_option_inst *opt_inst;
 
         list_for_each_entry(opt_inst, &team->option_inst_list, list) {
-                if (opt_inst->port == port) {
+                if (opt_inst->info.port == port) {
                         opt_inst->changed = true;
                         opt_inst->removed = true;
                 }
@@ -324,28 +345,12 @@ void team_options_unregister(struct team *team,
 }
 EXPORT_SYMBOL(team_options_unregister);
 
-static int team_option_port_add(struct team *team, struct team_port *port)
-{
-        int err;
-
-        err = __team_option_inst_add_port(team, port);
-        if (err)
-                return err;
-        __team_options_change_check(team);
-        return 0;
-}
-
-static void team_option_port_del(struct team *team, struct team_port *port)
-{
-        __team_option_inst_mark_removed_port(team, port);
-        __team_options_change_check(team);
-        __team_option_inst_del_port(team, port);
-}
-
 static int team_option_get(struct team *team,
                            struct team_option_inst *opt_inst,
                            struct team_gsetter_ctx *ctx)
 {
+        if (!opt_inst->option->getter)
+                return -EOPNOTSUPP;
         return opt_inst->option->getter(team, ctx);
 }
 
@@ -353,16 +358,26 @@ static int team_option_set(struct team *team,
                            struct team_option_inst *opt_inst,
                            struct team_gsetter_ctx *ctx)
 {
-        int err;
+        if (!opt_inst->option->setter)
+                return -EOPNOTSUPP;
+        return opt_inst->option->setter(team, ctx);
+}
 
-        err = opt_inst->option->setter(team, ctx);
-        if (err)
-                return err;
+void team_option_inst_set_change(struct team_option_inst_info *opt_inst_info)
+{
+        struct team_option_inst *opt_inst;
 
+        opt_inst = container_of(opt_inst_info, struct team_option_inst, info);
         opt_inst->changed = true;
+}
+EXPORT_SYMBOL(team_option_inst_set_change);
+
+void team_options_change_check(struct team *team)
+{
         __team_options_change_check(team);
-        return err;
 }
+EXPORT_SYMBOL(team_options_change_check);
+
 
 /****************
  * Mode handling
@@ -371,13 +386,18 @@ static int team_option_set(struct team *team,
 static LIST_HEAD(mode_list);
 static DEFINE_SPINLOCK(mode_list_lock);
 
-static struct team_mode *__find_mode(const char *kind)
+struct team_mode_item {
+        struct list_head list;
+        const struct team_mode *mode;
+};
+
+static struct team_mode_item *__find_mode(const char *kind)
 {
-        struct team_mode *mode;
+        struct team_mode_item *mitem;
 
-        list_for_each_entry(mode, &mode_list, list) {
-                if (strcmp(mode->kind, kind) == 0)
-                        return mode;
+        list_for_each_entry(mitem, &mode_list, list) {
+                if (strcmp(mitem->mode->kind, kind) == 0)
+                        return mitem;
         }
         return NULL;
 }
@@ -392,49 +412,65 @@ static bool is_good_mode_name(const char *name)
         return true;
 }
 
-int team_mode_register(struct team_mode *mode)
+int team_mode_register(const struct team_mode *mode)
 {
         int err = 0;
+        struct team_mode_item *mitem;
 
         if (!is_good_mode_name(mode->kind) ||
             mode->priv_size > TEAM_MODE_PRIV_SIZE)
                 return -EINVAL;
+
+        mitem = kmalloc(sizeof(*mitem), GFP_KERNEL);
+        if (!mitem)
+                return -ENOMEM;
+
         spin_lock(&mode_list_lock);
         if (__find_mode(mode->kind)) {
                 err = -EEXIST;
+                kfree(mitem);
                 goto unlock;
         }
-        list_add_tail(&mode->list, &mode_list);
+        mitem->mode = mode;
+        list_add_tail(&mitem->list, &mode_list);
 unlock:
         spin_unlock(&mode_list_lock);
         return err;
 }
 EXPORT_SYMBOL(team_mode_register);
 
-int team_mode_unregister(struct team_mode *mode)
+void team_mode_unregister(const struct team_mode *mode)
 {
+        struct team_mode_item *mitem;
+
         spin_lock(&mode_list_lock);
-        list_del_init(&mode->list);
+        mitem = __find_mode(mode->kind);
+        if (mitem) {
+                list_del_init(&mitem->list);
+                kfree(mitem);
+        }
         spin_unlock(&mode_list_lock);
-        return 0;
 }
 EXPORT_SYMBOL(team_mode_unregister);
 
-static struct team_mode *team_mode_get(const char *kind)
+static const struct team_mode *team_mode_get(const char *kind)
 {
-        struct team_mode *mode;
+        struct team_mode_item *mitem;
+        const struct team_mode *mode = NULL;
 
         spin_lock(&mode_list_lock);
-        mode = __find_mode(kind);
-        if (!mode) {
+        mitem = __find_mode(kind);
+        if (!mitem) {
                 spin_unlock(&mode_list_lock);
                 request_module("team-mode-%s", kind);
                 spin_lock(&mode_list_lock);
-                mode = __find_mode(kind);
+                mitem = __find_mode(kind);
         }
-        if (mode)
+        if (mitem) {
+                mode = mitem->mode;
                 if (!try_module_get(mode->owner))
                         mode = NULL;
+        }
 
         spin_unlock(&mode_list_lock);
         return mode;
@@ -458,26 +494,45 @@ rx_handler_result_t team_dummy_receive(struct team *team,
         return RX_HANDLER_ANOTHER;
 }
 
-static void team_adjust_ops(struct team *team)
+static const struct team_mode __team_no_mode = {
+        .kind           = "*NOMODE*",
+};
+
+static bool team_is_mode_set(struct team *team)
+{
+        return team->mode != &__team_no_mode;
+}
+
+static void team_set_no_mode(struct team *team)
+{
+        team->mode = &__team_no_mode;
+}
+
+static void __team_adjust_ops(struct team *team, int en_port_count)
 {
         /*
          * To avoid checks in rx/tx skb paths, ensure here that non-null and
          * correct ops are always set.
          */
 
-        if (list_empty(&team->port_list) ||
-            !team->mode || !team->mode->ops->transmit)
+        if (!en_port_count || !team_is_mode_set(team) ||
+            !team->mode->ops->transmit)
                 team->ops.transmit = team_dummy_transmit;
         else
                 team->ops.transmit = team->mode->ops->transmit;
 
-        if (list_empty(&team->port_list) ||
-            !team->mode || !team->mode->ops->receive)
+        if (!en_port_count || !team_is_mode_set(team) ||
+            !team->mode->ops->receive)
                 team->ops.receive = team_dummy_receive;
         else
                 team->ops.receive = team->mode->ops->receive;
 }
 
+static void team_adjust_ops(struct team *team)
+{
+        __team_adjust_ops(team, team->en_port_count);
+}
+
 /*
  * We can benefit from the fact that it's ensured no port is present
  * at the time of mode change. Therefore no packets are in fly so there's no
@@ -487,7 +542,7 @@ static int __team_change_mode(struct team *team,
                               const struct team_mode *new_mode)
 {
         /* Check if mode was previously set and do cleanup if so */
-        if (team->mode) {
+        if (team_is_mode_set(team)) {
                 void (*exit_op)(struct team *team) = team->ops.exit;
 
                 /* Clear ops area so no callback is called any longer */
@@ -497,7 +552,7 @@ static int __team_change_mode(struct team *team,
                 if (exit_op)
                         exit_op(team);
                 team_mode_put(team->mode);
-                team->mode = NULL;
+                team_set_no_mode(team);
                 /* zero private data area */
                 memset(&team->mode_priv, 0,
                        sizeof(struct team) - offsetof(struct team, mode_priv));
@@ -523,7 +578,7 @@ static int __team_change_mode(struct team *team,
 
 static int team_change_mode(struct team *team, const char *kind)
 {
-        struct team_mode *new_mode;
+        const struct team_mode *new_mode;
         struct net_device *dev = team->dev;
         int err;
 
@@ -532,7 +587,7 @@ static int team_change_mode(struct team *team, const char *kind)
                 return -EBUSY;
         }
 
-        if (team->mode && strcmp(team->mode->kind, kind) == 0) {
+        if (team_is_mode_set(team) && strcmp(team->mode->kind, kind) == 0) {
                 netdev_err(dev, "Unable to change to the same mode the team is in\n");
                 return -EINVAL;
         }
@@ -559,8 +614,6 @@ static int team_change_mode(struct team *team, const char *kind)
  * Rx path frame handler
  ************************/
 
-static bool team_port_enabled(struct team_port *port);
-
 /* note: already called with rcu_read_lock */
 static rx_handler_result_t team_handle_frame(struct sk_buff **pskb)
 {
@@ -618,10 +671,11 @@ static bool team_port_find(const struct team *team,
         return false;
 }
 
-static bool team_port_enabled(struct team_port *port)
+bool team_port_enabled(struct team_port *port)
 {
         return port->index != -1;
 }
+EXPORT_SYMBOL(team_port_enabled);
 
 /*
  * Enable/disable port by adding to enabled port hashlist and setting
@@ -637,6 +691,9 @@ static void team_port_enable(struct team *team,
         port->index = team->en_port_count++;
         hlist_add_head_rcu(&port->hlist,
                            team_port_index_hash(team, port->index));
+        team_adjust_ops(team);
+        if (team->ops.port_enabled)
+                team->ops.port_enabled(team, port);
 }
 
 static void __reconstruct_port_hlist(struct team *team, int rm_index)
@@ -656,14 +713,20 @@ static void __reconstruct_port_hlist(struct team *team, int rm_index)
 static void team_port_disable(struct team *team,
                               struct team_port *port)
 {
-        int rm_index = port->index;
-
         if (!team_port_enabled(port))
                 return;
+        if (team->ops.port_disabled)
+                team->ops.port_disabled(team, port);
         hlist_del_rcu(&port->hlist);
-        __reconstruct_port_hlist(team, rm_index);
-        team->en_port_count--;
+        __reconstruct_port_hlist(team, port->index);
         port->index = -1;
+        __team_adjust_ops(team, team->en_port_count - 1);
+        /*
+         * Wait until readers see adjusted ops. This ensures that
+         * readers never see team->en_port_count == 0
+         */
+        synchronize_rcu();
+        team->en_port_count--;
 }
 
 #define TEAM_VLAN_FEATURES (NETIF_F_ALL_CSUM | NETIF_F_SG | \
@@ -758,7 +821,8 @@ static int team_port_add(struct team *team, struct net_device *port_dev)
                 return -EBUSY;
         }
 
-        port = kzalloc(sizeof(struct team_port), GFP_KERNEL);
+        port = kzalloc(sizeof(struct team_port) + team->mode->port_priv_size,
+                       GFP_KERNEL);
         if (!port)
                 return -ENOMEM;
 
@@ -809,7 +873,7 @@ static int team_port_add(struct team *team, struct net_device *port_dev)
                 goto err_handler_register;
         }
 
-        err = team_option_port_add(team, port);
+        err = __team_option_inst_add_port(team, port);
         if (err) {
                 netdev_err(dev, "Device %s failed to add per-port options\n",
                            portname);
@@ -819,9 +883,9 @@ static int team_port_add(struct team *team, struct net_device *port_dev)
         port->index = -1;
         team_port_enable(team, port);
         list_add_tail_rcu(&port->list, &team->port_list);
-        team_adjust_ops(team);
         __team_compute_features(team);
         __team_port_change_check(port, !!netif_carrier_ok(port_dev));
+        __team_options_change_check(team);
 
         netdev_info(dev, "Port device %s added\n", portname);
 
@@ -865,12 +929,13 @@ static int team_port_del(struct team *team, struct net_device *port_dev)
                 return -ENOENT;
         }
 
+        __team_option_inst_mark_removed_port(team, port);
+        __team_options_change_check(team);
+        __team_option_inst_del_port(team, port);
         port->removed = true;
         __team_port_change_check(port, false);
         team_port_disable(team, port);
         list_del_rcu(&port->list);
-        team_adjust_ops(team);
-        team_option_port_del(team, port);
         netdev_rx_handler_unregister(port_dev);
         netdev_set_master(port_dev, NULL);
         vlan_vids_del_by_dev(port_dev, dev);
@@ -891,11 +956,9 @@ static int team_port_del(struct team *team, struct net_device *port_dev)
  * Net device ops
  *****************/
 
-static const char team_no_mode_kind[] = "*NOMODE*";
-
 static int team_mode_option_get(struct team *team, struct team_gsetter_ctx *ctx)
 {
-        ctx->data.str_val = team->mode ? team->mode->kind : team_no_mode_kind;
+        ctx->data.str_val = team->mode->kind;
         return 0;
 }
 
@@ -907,39 +970,47 @@ static int team_mode_option_set(struct team *team, struct team_gsetter_ctx *ctx)
 static int team_port_en_option_get(struct team *team,
                                    struct team_gsetter_ctx *ctx)
 {
-        ctx->data.bool_val = team_port_enabled(ctx->port);
+        struct team_port *port = ctx->info->port;
+
+        ctx->data.bool_val = team_port_enabled(port);
         return 0;
 }
 
 static int team_port_en_option_set(struct team *team,
                                    struct team_gsetter_ctx *ctx)
 {
+        struct team_port *port = ctx->info->port;
+
         if (ctx->data.bool_val)
-                team_port_enable(team, ctx->port);
+                team_port_enable(team, port);
         else
-                team_port_disable(team, ctx->port);
+                team_port_disable(team, port);
         return 0;
 }
 
 static int team_user_linkup_option_get(struct team *team,
                                        struct team_gsetter_ctx *ctx)
 {
-        ctx->data.bool_val = ctx->port->user.linkup;
+        struct team_port *port = ctx->info->port;
+
+        ctx->data.bool_val = port->user.linkup;
         return 0;
 }
 
 static int team_user_linkup_option_set(struct team *team,
                                        struct team_gsetter_ctx *ctx)
 {
-        ctx->port->user.linkup = ctx->data.bool_val;
-        team_refresh_port_linkup(ctx->port);
+        struct team_port *port = ctx->info->port;
+
+        port->user.linkup = ctx->data.bool_val;
+        team_refresh_port_linkup(port);
         return 0;
 }
 
 static int team_user_linkup_en_option_get(struct team *team,
                                           struct team_gsetter_ctx *ctx)
 {
-        struct team_port *port = ctx->port;
+        struct team_port *port = ctx->info->port;
 
         ctx->data.bool_val = port->user.linkup_enabled;
         return 0;
@@ -948,10 +1019,10 @@ static int team_user_linkup_en_option_get(struct team *team,
 static int team_user_linkup_en_option_set(struct team *team,
                                           struct team_gsetter_ctx *ctx)
 {
-        struct team_port *port = ctx->port;
+        struct team_port *port = ctx->info->port;
 
         port->user.linkup_enabled = ctx->data.bool_val;
-        team_refresh_port_linkup(ctx->port);
+        team_refresh_port_linkup(port);
         return 0;
 }
 
@@ -993,6 +1064,7 @@ static int team_init(struct net_device *dev)
 
         team->dev = dev;
         mutex_init(&team->lock);
+        team_set_no_mode(team);
 
         team->pcpu_stats = alloc_percpu(struct team_pcpu_stats);
         if (!team->pcpu_stats)
@@ -1116,10 +1188,11 @@ static int team_set_mac_address(struct net_device *dev, void *p)
 {
         struct team *team = netdev_priv(dev);
         struct team_port *port;
-        struct sockaddr *addr = p;
+        int err;
 
-        dev->addr_assign_type &= ~NET_ADDR_RANDOM;
-        memcpy(dev->dev_addr, addr->sa_data, ETH_ALEN);
+        err = eth_mac_addr(dev, p);
+        if (err)
+                return err;
         rcu_read_lock();
         list_for_each_entry_rcu(port, &team->port_list, list)
                 if (team->ops.port_change_mac)
@@ -1321,7 +1394,7 @@ static void team_setup(struct net_device *dev)
          * bring us to promisc mode in case a unicast addr is added.
          * Let this up to underlay drivers.
          */
-        dev->priv_flags |= IFF_UNICAST_FLT;
+        dev->priv_flags |= IFF_UNICAST_FLT | IFF_LIVE_ADDR_CHANGE;
 
         dev->features |= NETIF_F_LLTX;
         dev->features |= NETIF_F_GRO;
@@ -1404,7 +1477,7 @@ static int team_nl_cmd_noop(struct sk_buff *skb, struct genl_info *info)
         void *hdr;
         int err;
 
-        msg = nlmsg_new(NLMSG_GOODSIZE, GFP_KERNEL);
+        msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);
         if (!msg)
                 return -ENOMEM;
 
@@ -1466,7 +1539,7 @@ static int team_nl_send_generic(struct genl_info *info, struct team *team,
         struct sk_buff *skb;
         int err;
 
-        skb = nlmsg_new(NLMSG_GOODSIZE, GFP_KERNEL);
+        skb = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);
         if (!skb)
                 return -ENOMEM;
 
@@ -1482,16 +1555,128 @@ err_fill:
         return err;
 }
 
-static int team_nl_fill_options_get(struct sk_buff *skb,
-                                    u32 pid, u32 seq, int flags,
-                                    struct team *team, bool fillall)
+typedef int team_nl_send_func_t(struct sk_buff *skb,
+                                struct team *team, u32 pid);
+
+static int team_nl_send_unicast(struct sk_buff *skb, struct team *team, u32 pid)
+{
+        return genlmsg_unicast(dev_net(team->dev), skb, pid);
+}
+
+static int team_nl_fill_one_option_get(struct sk_buff *skb, struct team *team,
+                                       struct team_option_inst *opt_inst)
+{
+        struct nlattr *option_item;
+        struct team_option *option = opt_inst->option;
+        struct team_option_inst_info *opt_inst_info = &opt_inst->info;
+        struct team_gsetter_ctx ctx;
+        int err;
+
+        ctx.info = opt_inst_info;
+        err = team_option_get(team, opt_inst, &ctx);
+        if (err)
+                return err;
+
+        option_item = nla_nest_start(skb, TEAM_ATTR_ITEM_OPTION);
+        if (!option_item)
+                return -EMSGSIZE;
+
+        if (nla_put_string(skb, TEAM_ATTR_OPTION_NAME, option->name))
+                goto nest_cancel;
+        if (opt_inst_info->port &&
+            nla_put_u32(skb, TEAM_ATTR_OPTION_PORT_IFINDEX,
+                        opt_inst_info->port->dev->ifindex))
+                goto nest_cancel;
+        if (opt_inst->option->array_size &&
+            nla_put_u32(skb, TEAM_ATTR_OPTION_ARRAY_INDEX,
+                        opt_inst_info->array_index))
+                goto nest_cancel;
+
+        switch (option->type) {
+        case TEAM_OPTION_TYPE_U32:
+                if (nla_put_u8(skb, TEAM_ATTR_OPTION_TYPE, NLA_U32))
+                        goto nest_cancel;
+                if (nla_put_u32(skb, TEAM_ATTR_OPTION_DATA, ctx.data.u32_val))
+                        goto nest_cancel;
+                break;
+        case TEAM_OPTION_TYPE_STRING:
+                if (nla_put_u8(skb, TEAM_ATTR_OPTION_TYPE, NLA_STRING))
+                        goto nest_cancel;
+                if (nla_put_string(skb, TEAM_ATTR_OPTION_DATA,
+                                   ctx.data.str_val))
+                        goto nest_cancel;
+                break;
+        case TEAM_OPTION_TYPE_BINARY:
+                if (nla_put_u8(skb, TEAM_ATTR_OPTION_TYPE, NLA_BINARY))
+                        goto nest_cancel;
+                if (nla_put(skb, TEAM_ATTR_OPTION_DATA, ctx.data.bin_val.len,
+                            ctx.data.bin_val.ptr))
+                        goto nest_cancel;
+                break;
+        case TEAM_OPTION_TYPE_BOOL:
+                if (nla_put_u8(skb, TEAM_ATTR_OPTION_TYPE, NLA_FLAG))
+                        goto nest_cancel;
+                if (ctx.data.bool_val &&
+                    nla_put_flag(skb, TEAM_ATTR_OPTION_DATA))
+                        goto nest_cancel;
+                break;
+        default:
+                BUG();
+        }
+        if (opt_inst->removed && nla_put_flag(skb, TEAM_ATTR_OPTION_REMOVED))
+                goto nest_cancel;
+        if (opt_inst->changed) {
+                if (nla_put_flag(skb, TEAM_ATTR_OPTION_CHANGED))
+                        goto nest_cancel;
+                opt_inst->changed = false;
+        }
+        nla_nest_end(skb, option_item);
+        return 0;
+
+nest_cancel:
+        nla_nest_cancel(skb, option_item);
+        return -EMSGSIZE;
+}
+
+static int __send_and_alloc_skb(struct sk_buff **pskb,
+                                struct team *team, u32 pid,
+                                team_nl_send_func_t *send_func)
+{
+        int err;
+
+        if (*pskb) {
+                err = send_func(*pskb, team, pid);
+                if (err)
+                        return err;
+        }
+        *pskb = genlmsg_new(GENLMSG_DEFAULT_SIZE, GFP_KERNEL);
+        if (!*pskb)
+                return -ENOMEM;
+        return 0;
+}
+
+static int team_nl_send_options_get(struct team *team, u32 pid, u32 seq,
+                                    int flags, team_nl_send_func_t *send_func,
+                                    struct list_head *sel_opt_inst_list)
 {
         struct nlattr *option_list;
+        struct nlmsghdr *nlh;
         void *hdr;
         struct team_option_inst *opt_inst;
         int err;
+        struct sk_buff *skb = NULL;
+        bool incomplete;
+        int i;
 
-        hdr = genlmsg_put(skb, pid, seq, &team_nl_family, flags,
+        opt_inst = list_first_entry(sel_opt_inst_list,
+                                    struct team_option_inst, tmp_list);
+
+start_again:
+        err = __send_and_alloc_skb(&skb, team, pid, send_func);
+        if (err)
+                return err;
+
+        hdr = genlmsg_put(skb, pid, seq, &team_nl_family, flags | NLM_F_MULTI,
                           TEAM_CMD_OPTIONS_GET);
         if (IS_ERR(hdr))
                 return PTR_ERR(hdr);
@@ -1500,122 +1685,80 @@ static int team_nl_fill_options_get(struct sk_buff *skb,
                 goto nla_put_failure;
         option_list = nla_nest_start(skb, TEAM_ATTR_LIST_OPTION);
         if (!option_list)
-                return -EMSGSIZE;
-
-        list_for_each_entry(opt_inst, &team->option_inst_list, list) {
-                struct nlattr *option_item;
-                struct team_option *option = opt_inst->option;
-                struct team_gsetter_ctx ctx;
+                goto nla_put_failure;
 
-                /* Include only changed options if fill all mode is not on */
-                if (!fillall && !opt_inst->changed)
-                        continue;
-                option_item = nla_nest_start(skb, TEAM_ATTR_ITEM_OPTION);
-                if (!option_item)
-                        goto nla_put_failure;
-                if (nla_put_string(skb, TEAM_ATTR_OPTION_NAME, option->name))
-                        goto nla_put_failure;
-                if (opt_inst->changed) {
-                        if (nla_put_flag(skb, TEAM_ATTR_OPTION_CHANGED))
-                                goto nla_put_failure;
-                        opt_inst->changed = false;
-                }
-                if (opt_inst->removed &&
-                    nla_put_flag(skb, TEAM_ATTR_OPTION_REMOVED))
-                        goto nla_put_failure;
-                if (opt_inst->port &&
-                    nla_put_u32(skb, TEAM_ATTR_OPTION_PORT_IFINDEX,
-                                opt_inst->port->dev->ifindex))
-                        goto nla_put_failure;
-                ctx.port = opt_inst->port;
-                switch (option->type) {
-                case TEAM_OPTION_TYPE_U32:
-                        if (nla_put_u8(skb, TEAM_ATTR_OPTION_TYPE, NLA_U32))
-                                goto nla_put_failure;
-                        err = team_option_get(team, opt_inst, &ctx);
-                        if (err)
-                                goto errout;
-                        if (nla_put_u32(skb, TEAM_ATTR_OPTION_DATA,
-                                        ctx.data.u32_val))
-                                goto nla_put_failure;
-                        break;
-                case TEAM_OPTION_TYPE_STRING:
-                        if (nla_put_u8(skb, TEAM_ATTR_OPTION_TYPE, NLA_STRING))
-                                goto nla_put_failure;
-                        err = team_option_get(team, opt_inst, &ctx);
-                        if (err)
-                                goto errout;
-                        if (nla_put_string(skb, TEAM_ATTR_OPTION_DATA,
-                                           ctx.data.str_val))
-                                goto nla_put_failure;
-                        break;
-                case TEAM_OPTION_TYPE_BINARY:
-                        if (nla_put_u8(skb, TEAM_ATTR_OPTION_TYPE, NLA_BINARY))
-                                goto nla_put_failure;
-                        err = team_option_get(team, opt_inst, &ctx);
-                        if (err)
-                                goto errout;
-                        if (nla_put(skb, TEAM_ATTR_OPTION_DATA,
-                                    ctx.data.bin_val.len, ctx.data.bin_val.ptr))
-                                goto nla_put_failure;
-                        break;
-                case TEAM_OPTION_TYPE_BOOL:
-                        if (nla_put_u8(skb, TEAM_ATTR_OPTION_TYPE, NLA_FLAG))
-                                goto nla_put_failure;
-                        err = team_option_get(team, opt_inst, &ctx);
-                        if (err)
-                                goto errout;
-                        if (ctx.data.bool_val &&
-                            nla_put_flag(skb, TEAM_ATTR_OPTION_DATA))
-                                goto nla_put_failure;
-                        break;
-                default:
-                        BUG();
+        i = 0;
+        incomplete = false;
+        list_for_each_entry_from(opt_inst, sel_opt_inst_list, tmp_list) {
+                err = team_nl_fill_one_option_get(skb, team, opt_inst);
+                if (err) {
+                        if (err == -EMSGSIZE) {
+                                if (!i)
+                                        goto errout;
+                                incomplete = true;
+                                break;
+                        }
+                        goto errout;
                 }
-                nla_nest_end(skb, option_item);
+                i++;
         }
 
         nla_nest_end(skb, option_list);
-        return genlmsg_end(skb, hdr);
+        genlmsg_end(skb, hdr);
+        if (incomplete)
+                goto start_again;
+
+send_done:
+        nlh = nlmsg_put(skb, pid, seq, NLMSG_DONE, 0, flags | NLM_F_MULTI);
+        if (!nlh) {
+                err = __send_and_alloc_skb(&skb, team, pid, send_func);
+                if (err)
+                        goto errout;
+                goto send_done;
+        }
+
+        return send_func(skb, team, pid);
 
 nla_put_failure:
         err = -EMSGSIZE;
 errout:
         genlmsg_cancel(skb, hdr);
+        nlmsg_free(skb);
         return err;
 }
 
-static int team_nl_fill_options_get_all(struct sk_buff *skb,
-                                        struct genl_info *info, int flags,
-                                        struct team *team)
-{
-        return team_nl_fill_options_get(skb, info->snd_pid,
-                                        info->snd_seq, NLM_F_ACK,
-                                        team, true);
-}
-
 static int team_nl_cmd_options_get(struct sk_buff *skb, struct genl_info *info)
 {
         struct team *team;
+        struct team_option_inst *opt_inst;
         int err;
+        LIST_HEAD(sel_opt_inst_list);
 
         team = team_nl_team_get(info);
         if (!team)
                 return -EINVAL;
 
-        err = team_nl_send_generic(info, team, team_nl_fill_options_get_all);
+        list_for_each_entry(opt_inst, &team->option_inst_list, list)
+                list_add_tail(&opt_inst->tmp_list, &sel_opt_inst_list);
+        err = team_nl_send_options_get(team, info->snd_pid, info->snd_seq,
+                                       NLM_F_ACK, team_nl_send_unicast,
+                                       &sel_opt_inst_list);
 
         team_nl_team_put(team);
 
         return err;
 }
 
+static int team_nl_send_event_options_get(struct team *team,
+                                          struct list_head *sel_opt_inst_list);
+
 static int team_nl_cmd_options_set(struct sk_buff *skb, struct genl_info *info)
 {
         struct team *team;
         int err = 0;
         int i;
         struct nlattr *nl_option;
+        LIST_HEAD(opt_inst_list);
 
         team = team_nl_team_get(info);
         if (!team)
@@ -1629,10 +1772,12 @@ static int team_nl_cmd_options_set(struct sk_buff *skb, struct genl_info *info)
 
         nla_for_each_nested(nl_option, info->attrs[TEAM_ATTR_LIST_OPTION], i) {
                 struct nlattr *opt_attrs[TEAM_ATTR_OPTION_MAX + 1];
-                struct nlattr *attr_port_ifindex;
+                struct nlattr *attr;
                 struct nlattr *attr_data;
                 enum team_option_type opt_type;
                 int opt_port_ifindex = 0; /* != 0 for per-port options */
+                u32 opt_array_index = 0;
+                bool opt_is_array = false;
                 struct team_option_inst *opt_inst;
                 char *opt_name;
                 bool opt_found = false;
@@ -1674,23 +1819,33 @@ static int team_nl_cmd_options_set(struct sk_buff *skb, struct genl_info *info)
                 }
 
                 opt_name = nla_data(opt_attrs[TEAM_ATTR_OPTION_NAME]);
-                attr_port_ifindex = opt_attrs[TEAM_ATTR_OPTION_PORT_IFINDEX];
-                if (attr_port_ifindex)
-                        opt_port_ifindex = nla_get_u32(attr_port_ifindex);
+                attr = opt_attrs[TEAM_ATTR_OPTION_PORT_IFINDEX];
+                if (attr)
+                        opt_port_ifindex = nla_get_u32(attr);
+
+                attr = opt_attrs[TEAM_ATTR_OPTION_ARRAY_INDEX];
+                if (attr) {
+                        opt_is_array = true;
+                        opt_array_index = nla_get_u32(attr);
+                }
 
                 list_for_each_entry(opt_inst, &team->option_inst_list, list) {
                         struct team_option *option = opt_inst->option;
                         struct team_gsetter_ctx ctx;
+                        struct team_option_inst_info *opt_inst_info;
                         int tmp_ifindex;
 
-                        tmp_ifindex = opt_inst->port ?
-                                      opt_inst->port->dev->ifindex : 0;
+                        opt_inst_info = &opt_inst->info;
+                        tmp_ifindex = opt_inst_info->port ?
+                                      opt_inst_info->port->dev->ifindex : 0;
                         if (option->type != opt_type ||
                             strcmp(option->name, opt_name) ||
-                            tmp_ifindex != opt_port_ifindex)
+                            tmp_ifindex != opt_port_ifindex ||
+                            (option->array_size && !opt_is_array) ||
+                            opt_inst_info->array_index != opt_array_index)
                                 continue;
                         opt_found = true;
-                        ctx.port = opt_inst->port;
+                        ctx.info = opt_inst_info;
                         switch (opt_type) {
                         case TEAM_OPTION_TYPE_U32:
                                 ctx.data.u32_val = nla_get_u32(attr_data);
@@ -1715,6 +1870,8 @@ static int team_nl_cmd_options_set(struct sk_buff *skb, struct genl_info *info)
                         err = team_option_set(team, opt_inst, &ctx);
                         if (err)
                                 goto team_put;
+                        opt_inst->changed = true;
+                        list_add(&opt_inst->tmp_list, &opt_inst_list);
                 }
                 if (!opt_found) {
                         err = -ENOENT;
@@ -1722,6 +1879,8 @@ static int team_nl_cmd_options_set(struct sk_buff *skb, struct genl_info *info)
                 }
         }
 
+        err = team_nl_send_event_options_get(team, &opt_inst_list);
+
 team_put:
         team_nl_team_put(team);
 
@@ -1746,7 +1905,7 @@ static int team_nl_fill_port_list_get(struct sk_buff *skb,
                 goto nla_put_failure;
         port_list = nla_nest_start(skb, TEAM_ATTR_LIST_PORT);
         if (!port_list)
-                return -EMSGSIZE;
+                goto nla_put_failure;
 
         list_for_each_entry(port, &team->port_list, list) {
                 struct nlattr *port_item;
@@ -1838,27 +1997,18 @@ static struct genl_multicast_group team_change_event_mcgrp = {
         .name = TEAM_GENL_CHANGE_EVENT_MC_GRP_NAME,
 };
 
-static int team_nl_send_event_options_get(struct team *team)
+static int team_nl_send_multicast(struct sk_buff *skb,
+                                  struct team *team, u32 pid)
 {
-        struct sk_buff *skb;
-        int err;
-        struct net *net = dev_net(team->dev);
-
-        skb = nlmsg_new(NLMSG_GOODSIZE, GFP_KERNEL);
-        if (!skb)
-                return -ENOMEM;
-
-        err = team_nl_fill_options_get(skb, 0, 0, 0, team, false);
-        if (err < 0)
-                goto err_fill;
-
-        err = genlmsg_multicast_netns(net, skb, 0, team_change_event_mcgrp.id,
-                                      GFP_KERNEL);
-        return err;
+        return genlmsg_multicast_netns(dev_net(team->dev), skb, 0,
+                                       team_change_event_mcgrp.id, GFP_KERNEL);
+}
 
-err_fill:
-        nlmsg_free(skb);
-        return err;
+static int team_nl_send_event_options_get(struct team *team,
+                                          struct list_head *sel_opt_inst_list)
+{
+        return team_nl_send_options_get(team, 0, 0, 0, team_nl_send_multicast,
+                                        sel_opt_inst_list);
 }
 
 static int team_nl_send_event_port_list_get(struct team *team)
@@ -1867,7 +2017,7 @@ static int team_nl_send_event_port_list_get(struct team *team)
         int err;
         struct net *net = dev_net(team->dev);
 
-        skb = nlmsg_new(NLMSG_GOODSIZE, GFP_KERNEL);
+        skb = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);
         if (!skb)
                 return -ENOMEM;
 
@@ -1918,10 +2068,17 @@ static void team_nl_fini(void)
 static void __team_options_change_check(struct team *team)
 {
         int err;
+        struct team_option_inst *opt_inst;
+        LIST_HEAD(sel_opt_inst_list);
 
-        err = team_nl_send_event_options_get(team);
+        list_for_each_entry(opt_inst, &team->option_inst_list, list) {
+                if (opt_inst->changed)
+                        list_add_tail(&opt_inst->tmp_list, &sel_opt_inst_list);
+        }
+        err = team_nl_send_event_options_get(team, &sel_opt_inst_list);
         if (err)
-                netdev_warn(team->dev, "Failed to send options change via netlink\n");
+                netdev_warn(team->dev, "Failed to send options change via netlink (err %d)\n",
+                            err);
 }
 
 /* rtnl lock is held */
@@ -1965,6 +2122,7 @@ static void team_port_change_check(struct team_port *port, bool linkup)
         mutex_unlock(&team->lock);
 }
 
+
 /************************************
  * Net device notifier event handler
  ************************************/
diff --git a/drivers/net/team/team_mode_activebackup.c b/drivers/net/team/team_mode_activebackup.c
index fd6bd03aaa8..253b8a5f342 100644
--- a/drivers/net/team/team_mode_activebackup.c
+++ b/drivers/net/team/team_mode_activebackup.c
@@ -1,5 +1,5 @@
 /*
- * net/drivers/team/team_mode_activebackup.c - Active-backup mode for team
+ * drivers/net/team/team_mode_activebackup.c - Active-backup mode for team
  * Copyright (c) 2011 Jiri Pirko <jpirko@redhat.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -40,7 +40,7 @@ static bool ab_transmit(struct team *team, struct sk_buff *skb)
 {
         struct team_port *active_port;
 
-        active_port = rcu_dereference(ab_priv(team)->active_port);
+        active_port = rcu_dereference_bh(ab_priv(team)->active_port);
         if (unlikely(!active_port))
                 goto drop;
         skb->dev = active_port->dev;
@@ -61,8 +61,12 @@ static void ab_port_leave(struct team *team, struct team_port *port)
 
 static int ab_active_port_get(struct team *team, struct team_gsetter_ctx *ctx)
 {
-        if (ab_priv(team)->active_port)
-                ctx->data.u32_val = ab_priv(team)->active_port->dev->ifindex;
+        struct team_port *active_port;
+
+        active_port = rcu_dereference_protected(ab_priv(team)->active_port,
+                                                lockdep_is_held(&team->lock));
+        if (active_port)
+                ctx->data.u32_val = active_port->dev->ifindex;
         else
                 ctx->data.u32_val = 0;
         return 0;
@@ -108,7 +112,7 @@ static const struct team_mode_ops ab_mode_ops = {
         .port_leave             = ab_port_leave,
 };
 
-static struct team_mode ab_mode = {
+static const struct team_mode ab_mode = {
         .kind           = "activebackup",
         .owner          = THIS_MODULE,
         .priv_size      = sizeof(struct ab_priv),
diff --git a/drivers/net/team/team_mode_loadbalance.c b/drivers/net/team/team_mode_loadbalance.c
index 86e8183c8e3..51a4b199c75 100644
--- a/drivers/net/team/team_mode_loadbalance.c
+++ b/drivers/net/team/team_mode_loadbalance.c
@@ -17,34 +17,210 @@
 #include <linux/filter.h>
 #include <linux/if_team.h>
 
+struct lb_priv;
+
+typedef struct team_port *lb_select_tx_port_func_t(struct team *,
+                                                   struct lb_priv *,
+                                                   struct sk_buff *,
+                                                   unsigned char);
+
+#define LB_TX_HASHTABLE_SIZE 256 /* hash is a char */
+
+struct lb_stats {
+        u64 tx_bytes;
+};
+
+struct lb_pcpu_stats {
+        struct lb_stats hash_stats[LB_TX_HASHTABLE_SIZE];
+        struct u64_stats_sync syncp;
+};
+
+struct lb_stats_info {
+        struct lb_stats stats;
+        struct lb_stats last_stats;
+        struct team_option_inst_info *opt_inst_info;
+};
+
+struct lb_port_mapping {
+        struct team_port __rcu *port;
+        struct team_option_inst_info *opt_inst_info;
+};
+
+struct lb_priv_ex {
+        struct team *team;
+        struct lb_port_mapping tx_hash_to_port_mapping[LB_TX_HASHTABLE_SIZE];
+        struct sock_fprog *orig_fprog;
+        struct {
+                unsigned int refresh_interval; /* in tenths of second */
+                struct delayed_work refresh_dw;
+                struct lb_stats_info info[LB_TX_HASHTABLE_SIZE];
+        } stats;
+};
+
 struct lb_priv {
         struct sk_filter __rcu *fp;
-        struct sock_fprog *orig_fprog;
+        lb_select_tx_port_func_t __rcu *select_tx_port_func;
+        struct lb_pcpu_stats __percpu *pcpu_stats;
+        struct lb_priv_ex *ex; /* priv extension */
 };
 
-static struct lb_priv *lb_priv(struct team *team)
+static struct lb_priv *get_lb_priv(struct team *team)
 {
         return (struct lb_priv *) &team->mode_priv;
 }
 
-static bool lb_transmit(struct team *team, struct sk_buff *skb)
+struct lb_port_priv {
+        struct lb_stats __percpu *pcpu_stats;
+        struct lb_stats_info stats_info;
+};
+
+static struct lb_port_priv *get_lb_port_priv(struct team_port *port)
+{
+        return (struct lb_port_priv *) &port->mode_priv;
+}
+
+#define LB_HTPM_PORT_BY_HASH(lp_priv, hash) \
+        (lb_priv)->ex->tx_hash_to_port_mapping[hash].port
+
+#define LB_HTPM_OPT_INST_INFO_BY_HASH(lp_priv, hash) \
+        (lb_priv)->ex->tx_hash_to_port_mapping[hash].opt_inst_info
+
+static void lb_tx_hash_to_port_mapping_null_port(struct team *team,
+                                                 struct team_port *port)
+{
+        struct lb_priv *lb_priv = get_lb_priv(team);
+        bool changed = false;
+        int i;
+
+        for (i = 0; i < LB_TX_HASHTABLE_SIZE; i++) {
+                struct lb_port_mapping *pm;
+
+                pm = &lb_priv->ex->tx_hash_to_port_mapping[i];
+                if (rcu_access_pointer(pm->port) == port) {
+                        RCU_INIT_POINTER(pm->port, NULL);
+                        team_option_inst_set_change(pm->opt_inst_info);
+                        changed = true;
+                }
+        }
+        if (changed)
+                team_options_change_check(team);
+}
+
+/* Basic tx selection based solely by hash */
+static struct team_port *lb_hash_select_tx_port(struct team *team,
+                                                struct lb_priv *lb_priv,
+                                                struct sk_buff *skb,
+                                                unsigned char hash)
 {
-        struct sk_filter *fp;
-        struct team_port *port;
-        unsigned int hash;
         int port_index;
 
-        fp = rcu_dereference(lb_priv(team)->fp);
-        if (unlikely(!fp))
-                goto drop;
-        hash = SK_RUN_FILTER(fp, skb);
         port_index = hash % team->en_port_count;
-        port = team_get_port_by_index_rcu(team, port_index);
+        return team_get_port_by_index_rcu(team, port_index);
+}
+
+/* Hash to port mapping select tx port */
+static struct team_port *lb_htpm_select_tx_port(struct team *team,
+                                                struct lb_priv *lb_priv,
+                                                struct sk_buff *skb,
+                                                unsigned char hash)
+{
+        return rcu_dereference_bh(LB_HTPM_PORT_BY_HASH(lb_priv, hash));
+}
+
+struct lb_select_tx_port {
+        char *name;
+        lb_select_tx_port_func_t *func;
+};
+
+static const struct lb_select_tx_port lb_select_tx_port_list[] = {
+        {
+                .name = "hash",
+                .func = lb_hash_select_tx_port,
+        },
+        {
+                .name = "hash_to_port_mapping",
+                .func = lb_htpm_select_tx_port,
+        },
+};
+#define LB_SELECT_TX_PORT_LIST_COUNT ARRAY_SIZE(lb_select_tx_port_list)
+
+static char *lb_select_tx_port_get_name(lb_select_tx_port_func_t *func)
+{
+        int i;
+
+        for (i = 0; i < LB_SELECT_TX_PORT_LIST_COUNT; i++) {
+                const struct lb_select_tx_port *item;
+
+                item = &lb_select_tx_port_list[i];
+                if (item->func == func)
+                        return item->name;
+        }
+        return NULL;
+}
+
+static lb_select_tx_port_func_t *lb_select_tx_port_get_func(const char *name)
+{
+        int i;
+
+        for (i = 0; i < LB_SELECT_TX_PORT_LIST_COUNT; i++) {
+                const struct lb_select_tx_port *item;
+
+                item = &lb_select_tx_port_list[i];
+                if (!strcmp(item->name, name))
+                        return item->func;
+        }
+        return NULL;
+}
+
+static unsigned int lb_get_skb_hash(struct lb_priv *lb_priv,
+                                    struct sk_buff *skb)
+{
+        struct sk_filter *fp;
+        uint32_t lhash;
+        unsigned char *c;
+
+        fp = rcu_dereference_bh(lb_priv->fp);
+        if (unlikely(!fp))
+                return 0;
+        lhash = SK_RUN_FILTER(fp, skb);
+        c = (char *) &lhash;
+        return c[0] ^ c[1] ^ c[2] ^ c[3];
+}
+
+static void lb_update_tx_stats(unsigned int tx_bytes, struct lb_priv *lb_priv,
+                               struct lb_port_priv *lb_port_priv,
+                               unsigned char hash)
+{
+        struct lb_pcpu_stats *pcpu_stats;
+        struct lb_stats *port_stats;
+        struct lb_stats *hash_stats;
+
+        pcpu_stats = this_cpu_ptr(lb_priv->pcpu_stats);
+        port_stats = this_cpu_ptr(lb_port_priv->pcpu_stats);
+        hash_stats = &pcpu_stats->hash_stats[hash];
+        u64_stats_update_begin(&pcpu_stats->syncp);
+        port_stats->tx_bytes += tx_bytes;
+        hash_stats->tx_bytes += tx_bytes;
+        u64_stats_update_end(&pcpu_stats->syncp);
+}
+
+static bool lb_transmit(struct team *team, struct sk_buff *skb)
+{
+        struct lb_priv *lb_priv = get_lb_priv(team);
+        lb_select_tx_port_func_t *select_tx_port_func;
+        struct team_port *port;
+        unsigned char hash;
+        unsigned int tx_bytes = skb->len;
+
+        hash = lb_get_skb_hash(lb_priv, skb);
+        select_tx_port_func = rcu_dereference_bh(lb_priv->select_tx_port_func);
+        port = select_tx_port_func(team, lb_priv, skb, hash);
         if (unlikely(!port))
                 goto drop;
         skb->dev = port->dev;
         if (dev_queue_xmit(skb))
                 return false;
+        lb_update_tx_stats(tx_bytes, lb_priv, get_lb_port_priv(port), hash);
         return true;
 
 drop:
@@ -54,14 +230,16 @@ drop:
 
 static int lb_bpf_func_get(struct team *team, struct team_gsetter_ctx *ctx)
 {
-        if (!lb_priv(team)->orig_fprog) {
+        struct lb_priv *lb_priv = get_lb_priv(team);
+
+        if (!lb_priv->ex->orig_fprog) {
                 ctx->data.bin_val.len = 0;
                 ctx->data.bin_val.ptr = NULL;
                 return 0;
         }
-        ctx->data.bin_val.len = lb_priv(team)->orig_fprog->len *
+        ctx->data.bin_val.len = lb_priv->ex->orig_fprog->len *
                                 sizeof(struct sock_filter);
-        ctx->data.bin_val.ptr = lb_priv(team)->orig_fprog->filter;
+        ctx->data.bin_val.ptr = lb_priv->ex->orig_fprog->filter;
         return 0;
 }
 
@@ -94,7 +272,9 @@ static void __fprog_destroy(struct sock_fprog *fprog)
 
 static int lb_bpf_func_set(struct team *team, struct team_gsetter_ctx *ctx)
 {
+        struct lb_priv *lb_priv = get_lb_priv(team);
         struct sk_filter *fp = NULL;
+        struct sk_filter *orig_fp;
         struct sock_fprog *fprog = NULL;
         int err;
 
@@ -110,14 +290,238 @@ static int lb_bpf_func_set(struct team *team, struct team_gsetter_ctx *ctx)
                 }
         }
 
-        if (lb_priv(team)->orig_fprog) {
+        if (lb_priv->ex->orig_fprog) {
                 /* Clear old filter data */
-                __fprog_destroy(lb_priv(team)->orig_fprog);
-                sk_unattached_filter_destroy(lb_priv(team)->fp);
+                __fprog_destroy(lb_priv->ex->orig_fprog);
+                orig_fp = rcu_dereference_protected(lb_priv->fp,
+                                                lockdep_is_held(&team->lock));
+                sk_unattached_filter_destroy(orig_fp);
         }
 
-        rcu_assign_pointer(lb_priv(team)->fp, fp);
-        lb_priv(team)->orig_fprog = fprog;
+        rcu_assign_pointer(lb_priv->fp, fp);
+        lb_priv->ex->orig_fprog = fprog;
+        return 0;
+}
+
+static int lb_tx_method_get(struct team *team, struct team_gsetter_ctx *ctx)
+{
+        struct lb_priv *lb_priv = get_lb_priv(team);
+        lb_select_tx_port_func_t *func;
+        char *name;
+
+        func = rcu_dereference_protected(lb_priv->select_tx_port_func,
+                                         lockdep_is_held(&team->lock));
+        name = lb_select_tx_port_get_name(func);
+        BUG_ON(!name);
+        ctx->data.str_val = name;
+        return 0;
+}
+
+static int lb_tx_method_set(struct team *team, struct team_gsetter_ctx *ctx)
+{
+        struct lb_priv *lb_priv = get_lb_priv(team);
+        lb_select_tx_port_func_t *func;
+
+        func = lb_select_tx_port_get_func(ctx->data.str_val);
+        if (!func)
+                return -EINVAL;
+        rcu_assign_pointer(lb_priv->select_tx_port_func, func);
+        return 0;
+}
+
+static int lb_tx_hash_to_port_mapping_init(struct team *team,
+                                           struct team_option_inst_info *info)
+{
+        struct lb_priv *lb_priv = get_lb_priv(team);
+        unsigned char hash = info->array_index;
+
+        LB_HTPM_OPT_INST_INFO_BY_HASH(lb_priv, hash) = info;
+        return 0;
+}
+
+static int lb_tx_hash_to_port_mapping_get(struct team *team,
+                                          struct team_gsetter_ctx *ctx)
+{
+        struct lb_priv *lb_priv = get_lb_priv(team);
+        struct team_port *port;
+        unsigned char hash = ctx->info->array_index;
+
+        port = LB_HTPM_PORT_BY_HASH(lb_priv, hash);
+        ctx->data.u32_val = port ? port->dev->ifindex : 0;
+        return 0;
+}
+
+static int lb_tx_hash_to_port_mapping_set(struct team *team,
+                                          struct team_gsetter_ctx *ctx)
+{
+        struct lb_priv *lb_priv = get_lb_priv(team);
+        struct team_port *port;
+        unsigned char hash = ctx->info->array_index;
+
+        list_for_each_entry(port, &team->port_list, list) {
+                if (ctx->data.u32_val == port->dev->ifindex &&
+                    team_port_enabled(port)) {
+                        rcu_assign_pointer(LB_HTPM_PORT_BY_HASH(lb_priv, hash),
+                                           port);
+                        return 0;
+                }
+        }
+        return -ENODEV;
+}
+
+static int lb_hash_stats_init(struct team *team,
+                              struct team_option_inst_info *info)
+{
+        struct lb_priv *lb_priv = get_lb_priv(team);
+        unsigned char hash = info->array_index;
+
+        lb_priv->ex->stats.info[hash].opt_inst_info = info;
+        return 0;
+}
+
+static int lb_hash_stats_get(struct team *team, struct team_gsetter_ctx *ctx)
+{
+        struct lb_priv *lb_priv = get_lb_priv(team);
+        unsigned char hash = ctx->info->array_index;
+
+        ctx->data.bin_val.ptr = &lb_priv->ex->stats.info[hash].stats;
+        ctx->data.bin_val.len = sizeof(struct lb_stats);
+        return 0;
+}
+
+static int lb_port_stats_init(struct team *team,
+                              struct team_option_inst_info *info)
+{
+        struct team_port *port = info->port;
+        struct lb_port_priv *lb_port_priv = get_lb_port_priv(port);
+
+        lb_port_priv->stats_info.opt_inst_info = info;
+        return 0;
+}
+
+static int lb_port_stats_get(struct team *team, struct team_gsetter_ctx *ctx)
+{
+        struct team_port *port = ctx->info->port;
+        struct lb_port_priv *lb_port_priv = get_lb_port_priv(port);
+
+        ctx->data.bin_val.ptr = &lb_port_priv->stats_info.stats;
+        ctx->data.bin_val.len = sizeof(struct lb_stats);
+        return 0;
+}
+
+static void __lb_stats_info_refresh_prepare(struct lb_stats_info *s_info)
+{
+        memcpy(&s_info->last_stats, &s_info->stats, sizeof(struct lb_stats));
+        memset(&s_info->stats, 0, sizeof(struct lb_stats));
+}
+
+static bool __lb_stats_info_refresh_check(struct lb_stats_info *s_info,
+                                          struct team *team)
+{
+        if (memcmp(&s_info->last_stats, &s_info->stats,
+            sizeof(struct lb_stats))) {
+                team_option_inst_set_change(s_info->opt_inst_info);
+                return true;
+        }
+        return false;
+}
+
+static void __lb_one_cpu_stats_add(struct lb_stats *acc_stats,
+                                   struct lb_stats *cpu_stats,
+                                   struct u64_stats_sync *syncp)
+{
+        unsigned int start;
+        struct lb_stats tmp;
+
+        do {
+                start = u64_stats_fetch_begin_bh(syncp);
+                tmp.tx_bytes = cpu_stats->tx_bytes;
+        } while (u64_stats_fetch_retry_bh(syncp, start));
+        acc_stats->tx_bytes += tmp.tx_bytes;
+}
+
+static void lb_stats_refresh(struct work_struct *work)
+{
+        struct team *team;
+        struct lb_priv *lb_priv;
+        struct lb_priv_ex *lb_priv_ex;
+        struct lb_pcpu_stats *pcpu_stats;
+        struct lb_stats *stats;
+        struct lb_stats_info *s_info;
+        struct team_port *port;
+        bool changed = false;
+        int i;
+        int j;
+
+        lb_priv_ex = container_of(work, struct lb_priv_ex,
+                                  stats.refresh_dw.work);
+
+        team = lb_priv_ex->team;
+        lb_priv = get_lb_priv(team);
+
+        if (!mutex_trylock(&team->lock)) {
+                schedule_delayed_work(&lb_priv_ex->stats.refresh_dw, 0);
+                return;
+        }
+
+        for (j = 0; j < LB_TX_HASHTABLE_SIZE; j++) {
+                s_info = &lb_priv->ex->stats.info[j];
+                __lb_stats_info_refresh_prepare(s_info);
+                for_each_possible_cpu(i) {
+                        pcpu_stats = per_cpu_ptr(lb_priv->pcpu_stats, i);
+                        stats = &pcpu_stats->hash_stats[j];
+                        __lb_one_cpu_stats_add(&s_info->stats, stats,
+                                               &pcpu_stats->syncp);
+                }
+                changed |= __lb_stats_info_refresh_check(s_info, team);
+        }
+
+        list_for_each_entry(port, &team->port_list, list) {
+                struct lb_port_priv *lb_port_priv = get_lb_port_priv(port);
+
+                s_info = &lb_port_priv->stats_info;
+                __lb_stats_info_refresh_prepare(s_info);
+                for_each_possible_cpu(i) {
+                        pcpu_stats = per_cpu_ptr(lb_priv->pcpu_stats, i);
+                        stats = per_cpu_ptr(lb_port_priv->pcpu_stats, i);
+                        __lb_one_cpu_stats_add(&s_info->stats, stats,
+                                               &pcpu_stats->syncp);
+                }
+                changed |= __lb_stats_info_refresh_check(s_info, team);
+        }
+
+        if (changed)
+                team_options_change_check(team);
+
+        schedule_delayed_work(&lb_priv_ex->stats.refresh_dw,
+                              (lb_priv_ex->stats.refresh_interval * HZ) / 10);
+
+        mutex_unlock(&team->lock);
+}
+
+static int lb_stats_refresh_interval_get(struct team *team,
+                                         struct team_gsetter_ctx *ctx)
+{
+        struct lb_priv *lb_priv = get_lb_priv(team);
+
+        ctx->data.u32_val = lb_priv->ex->stats.refresh_interval;
+        return 0;
+}
+
+static int lb_stats_refresh_interval_set(struct team *team,
+                                         struct team_gsetter_ctx *ctx)
+{
+        struct lb_priv *lb_priv = get_lb_priv(team);
+        unsigned int interval;
+
+        interval = ctx->data.u32_val;
+        if (lb_priv->ex->stats.refresh_interval == interval)
+                return 0;
+        lb_priv->ex->stats.refresh_interval = interval;
+        if (interval)
+                schedule_delayed_work(&lb_priv->ex->stats.refresh_dw, 0);
+        else
+                cancel_delayed_work(&lb_priv->ex->stats.refresh_dw);
         return 0;
 }
 
@@ -128,30 +532,125 @@ static const struct team_option lb_options[] = {
                 .getter = lb_bpf_func_get,
                 .setter = lb_bpf_func_set,
         },
+        {
+                .name = "lb_tx_method",
+                .type = TEAM_OPTION_TYPE_STRING,
+                .getter = lb_tx_method_get,
+                .setter = lb_tx_method_set,
+        },
+        {
+                .name = "lb_tx_hash_to_port_mapping",
+                .array_size = LB_TX_HASHTABLE_SIZE,
+                .type = TEAM_OPTION_TYPE_U32,
+                .init = lb_tx_hash_to_port_mapping_init,
+                .getter = lb_tx_hash_to_port_mapping_get,
+                .setter = lb_tx_hash_to_port_mapping_set,
+        },
+        {
+                .name = "lb_hash_stats",
+                .array_size = LB_TX_HASHTABLE_SIZE,
+                .type = TEAM_OPTION_TYPE_BINARY,
+                .init = lb_hash_stats_init,
+                .getter = lb_hash_stats_get,
+        },
+        {
+                .name = "lb_port_stats",
+                .per_port = true,
+                .type = TEAM_OPTION_TYPE_BINARY,
+                .init = lb_port_stats_init,
+                .getter = lb_port_stats_get,
+        },
+        {
+                .name = "lb_stats_refresh_interval",
+                .type = TEAM_OPTION_TYPE_U32,
+                .getter = lb_stats_refresh_interval_get,
+                .setter = lb_stats_refresh_interval_set,
+        },
 };
 
 static int lb_init(struct team *team)
 {
-        return team_options_register(team, lb_options,
-                                     ARRAY_SIZE(lb_options));
+        struct lb_priv *lb_priv = get_lb_priv(team);
+        lb_select_tx_port_func_t *func;
+        int err;
+
+        /* set default tx port selector */
+        func = lb_select_tx_port_get_func("hash");
+        BUG_ON(!func);
+        rcu_assign_pointer(lb_priv->select_tx_port_func, func);
+
+        lb_priv->ex = kzalloc(sizeof(*lb_priv->ex), GFP_KERNEL);
+        if (!lb_priv->ex)
+                return -ENOMEM;
+        lb_priv->ex->team = team;
+
+        lb_priv->pcpu_stats = alloc_percpu(struct lb_pcpu_stats);
+        if (!lb_priv->pcpu_stats) {
+                err = -ENOMEM;
+                goto err_alloc_pcpu_stats;
+        }
+
+        INIT_DELAYED_WORK(&lb_priv->ex->stats.refresh_dw, lb_stats_refresh);
+
+        err = team_options_register(team, lb_options, ARRAY_SIZE(lb_options));
+        if (err)
+                goto err_options_register;
+        return 0;
+
+err_options_register:
+        free_percpu(lb_priv->pcpu_stats);
+err_alloc_pcpu_stats:
+        kfree(lb_priv->ex);
+        return err;
 }
 
 static void lb_exit(struct team *team)
 {
+        struct lb_priv *lb_priv = get_lb_priv(team);
+
         team_options_unregister(team, lb_options,
                                 ARRAY_SIZE(lb_options));
+        cancel_delayed_work_sync(&lb_priv->ex->stats.refresh_dw);
+        free_percpu(lb_priv->pcpu_stats);
+        kfree(lb_priv->ex);
+}
+
+static int lb_port_enter(struct team *team, struct team_port *port)
+{
+        struct lb_port_priv *lb_port_priv = get_lb_port_priv(port);
+
+        lb_port_priv->pcpu_stats = alloc_percpu(struct lb_stats);
+        if (!lb_port_priv->pcpu_stats)
+                return -ENOMEM;
+        return 0;
+}
+
+static void lb_port_leave(struct team *team, struct team_port *port)
+{
+        struct lb_port_priv *lb_port_priv = get_lb_port_priv(port);
+
+        free_percpu(lb_port_priv->pcpu_stats);
+}
+
+static void lb_port_disabled(struct team *team, struct team_port *port)
+{
+        lb_tx_hash_to_port_mapping_null_port(team, port);
 }
 
 static const struct team_mode_ops lb_mode_ops = {
         .init                   = lb_init,
         .exit                   = lb_exit,
+        .port_enter             = lb_port_enter,
+        .port_leave             = lb_port_leave,
+        .port_disabled          = lb_port_disabled,
         .transmit               = lb_transmit,
 };
 
-static struct team_mode lb_mode = {
+static const struct team_mode lb_mode = {
         .kind           = "loadbalance",
         .owner          = THIS_MODULE,
         .priv_size      = sizeof(struct lb_priv),
+        .port_priv_size = sizeof(struct lb_port_priv),
         .ops            = &lb_mode_ops,
 };
 
diff --git a/drivers/net/team/team_mode_roundrobin.c b/drivers/net/team/team_mode_roundrobin.c
index 6abfbdc96be..52dd0ec9cd1 100644
--- a/drivers/net/team/team_mode_roundrobin.c
+++ b/drivers/net/team/team_mode_roundrobin.c
@@ -1,5 +1,5 @@
 /*
- * net/drivers/team/team_mode_roundrobin.c - Round-robin mode for team
+ * drivers/net/team/team_mode_roundrobin.c - Round-robin mode for team
  * Copyright (c) 2011 Jiri Pirko <jpirko@redhat.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -81,7 +81,7 @@ static const struct team_mode_ops rr_mode_ops = {
         .port_change_mac        = rr_port_change_mac,
 };
 
-static struct team_mode rr_mode = {
+static const struct team_mode rr_mode = {
         .kind           = "roundrobin",
         .owner          = THIS_MODULE,
         .priv_size      = sizeof(struct rr_priv),
diff --git a/drivers/net/usb/asix.c b/drivers/net/usb/asix.c
index 3ae80eccd0e..6564c32d3af 100644
--- a/drivers/net/usb/asix.c
+++ b/drivers/net/usb/asix.c
@@ -358,14 +358,30 @@ static struct sk_buff *asix_tx_fixup(struct usbnet *dev, struct sk_buff *skb,
 
         padlen = ((skb->len + 4) & (dev->maxpacket - 1)) ? 0 : 4;
 
-        if ((!skb_cloned(skb)) &&
-            ((headroom + tailroom) >= (4 + padlen))) {
-                if ((headroom < 4) || (tailroom < padlen)) {
+        /* We need to push 4 bytes in front of frame (packet_len)
+         * and maybe add 4 bytes after the end (if padlen is 4)
+         *
+         * Avoid skb_copy_expand() expensive call, using following rules :
+         * - We are allowed to push 4 bytes in headroom if skb_header_cloned()
+         *   is false (and if we have 4 bytes of headroom)
+         * - We are allowed to put 4 bytes at tail if skb_cloned()
+         *   is false (and if we have 4 bytes of tailroom)
+         *
+         * TCP packets for example are cloned, but skb_header_release()
+         * was called in tcp stack, allowing us to use headroom for our needs.
+         */
+        if (!skb_header_cloned(skb) &&
+            !(padlen && skb_cloned(skb)) &&
+            headroom + tailroom >= 4 + padlen) {
+                /* following should not happen, but better be safe */
+                if (headroom < 4 ||
+                    tailroom < padlen) {
                         skb->data = memmove(skb->head + 4, skb->data, skb->len);
                         skb_set_tail_pointer(skb, skb->len);
                 }
         } else {
                 struct sk_buff *skb2;
+
                 skb2 = skb_copy_expand(skb, 4, padlen, flags);
                 dev_kfree_skb_any(skb);
                 skb = skb2;
@@ -373,8 +389,8 @@ static struct sk_buff *asix_tx_fixup(struct usbnet *dev, struct sk_buff *skb,
                         return NULL;
         }
 
+        packet_len = ((skb->len ^ 0x0000ffff) << 16) + skb->len;
         skb_push(skb, 4);
-        packet_len = (((skb->len - 4) ^ 0x0000ffff) << 16) + (skb->len - 4);
         cpu_to_le32s(&packet_len);
         skb_copy_to_linear_data(skb, &packet_len, sizeof(packet_len));
 
@@ -880,6 +896,8 @@ static int ax88172_bind(struct usbnet *dev, struct usb_interface *intf)
 
         dev->net->netdev_ops = &ax88172_netdev_ops;
         dev->net->ethtool_ops = &ax88172_ethtool_ops;
+        dev->net->needed_headroom = 4; /* cf asix_tx_fixup() */
+        dev->net->needed_tailroom = 4; /* cf asix_tx_fixup() */
 
         asix_mdio_write(dev->net, dev->mii.phy_id, MII_BMCR, BMCR_RESET);
         asix_mdio_write(dev->net, dev->mii.phy_id, MII_ADVERTISE,
@@ -1075,6 +1093,8 @@ static int ax88772_bind(struct usbnet *dev, struct usb_interface *intf)
 
         dev->net->netdev_ops = &ax88772_netdev_ops;
         dev->net->ethtool_ops = &ax88772_ethtool_ops;
+        dev->net->needed_headroom = 4; /* cf asix_tx_fixup() */
+        dev->net->needed_tailroom = 4; /* cf asix_tx_fixup() */
 
         embd_phy = ((dev->mii.phy_id & 0x1f) == 0x10 ? 1 : 0);
 
diff --git a/drivers/net/usb/cdc-phonet.c b/drivers/net/usb/cdc-phonet.c
index d848d4dd575..187c144c5e5 100644
--- a/drivers/net/usb/cdc-phonet.c
+++ b/drivers/net/usb/cdc-phonet.c
@@ -394,7 +394,7 @@ int usbpn_probe(struct usb_interface *intf, const struct usb_device_id *id)
         SET_NETDEV_DEV(dev, &intf->dev);
 
         pnd->dev = dev;
-        pnd->usb = usb_get_dev(usbdev);
+        pnd->usb = usbdev;
         pnd->intf = intf;
         pnd->data_intf = data_intf;
         spin_lock_init(&pnd->tx_lock);
@@ -440,7 +440,6 @@ out:
 static void usbpn_disconnect(struct usb_interface *intf)
 {
         struct usbpn_dev *pnd = usb_get_intfdata(intf);
-        struct usb_device *usb = pnd->usb;
 
         if (pnd->disconnected)
                 return;
@@ -449,7 +448,6 @@ static void usbpn_disconnect(struct usb_interface *intf)
         usb_driver_release_interface(&usbpn_driver,
                         (pnd->intf == intf) ? pnd->data_intf : pnd->intf);
         unregister_netdev(pnd->dev);
-        usb_put_dev(usb);
 }
 
 static struct usb_driver usbpn_driver = {
diff --git a/drivers/net/usb/pegasus.c b/drivers/net/usb/pegasus.c
index 7023220456c..a0b5807b30d 100644
--- a/drivers/net/usb/pegasus.c
+++ b/drivers/net/usb/pegasus.c
@@ -1329,8 +1329,6 @@ static int pegasus_probe(struct usb_interface *intf,
         }
         pegasus_count++;
 
-        usb_get_dev(dev);
-
         net = alloc_etherdev(sizeof(struct pegasus));
         if (!net)
                 goto out;
@@ -1407,7 +1405,6 @@ out2:
 out1:
         free_netdev(net);
 out:
-        usb_put_dev(dev);
         pegasus_dec_workqueue();
         return res;
 }
@@ -1425,7 +1422,6 @@ static void pegasus_disconnect(struct usb_interface *intf)
         pegasus->flags |= PEGASUS_UNPLUG;
         cancel_delayed_work(&pegasus->carrier_check);
         unregister_netdev(pegasus->net);
-        usb_put_dev(interface_to_usbdev(intf));
         unlink_all_urbs(pegasus);
         free_all_urbs(pegasus);
         free_skb_pool(pegasus);
diff --git a/drivers/net/usb/qmi_wwan.c b/drivers/net/usb/qmi_wwan.c
index a051cedd64b..85c983d5252 100644
--- a/drivers/net/usb/qmi_wwan.c
+++ b/drivers/net/usb/qmi_wwan.c
@@ -1,6 +1,10 @@
 /*
  * Copyright (c) 2012  Bjørn Mork <bjorn@mork.no>
  *
+ * The probing code is heavily inspired by cdc_ether, which is:
+ * Copyright (C) 2003-2005 by David Brownell
+ * Copyright (C) 2006 by Ole Andre Vadla Ravnas (ActiveSync)
+ *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * version 2 as published by the Free Software Foundation.
@@ -15,11 +19,7 @@
 #include <linux/usb/usbnet.h>
 #include <linux/usb/cdc-wdm.h>
 
-/* The name of the CDC Device Management driver */
-#define DM_DRIVER "cdc_wdm"
-
-/*
- * This driver supports wwan (3G/LTE/?) devices using a vendor
+/* This driver supports wwan (3G/LTE/?) devices using a vendor
  * specific management protocol called Qualcomm MSM Interface (QMI) -
  * in addition to the more common AT commands over serial interface
  * management
@@ -31,59 +31,117 @@
  * management protocol is used in place of the standard CDC
  * notifications NOTIFY_NETWORK_CONNECTION and NOTIFY_SPEED_CHANGE
  *
+ * Alternatively, control and data functions can be combined in a
+ * single USB interface.
+ *
  * Handling a protocol like QMI is out of the scope for any driver.
- * It can be exported as a character device using the cdc-wdm driver,
- * which will enable userspace applications ("modem managers") to
- * handle it.  This may be required to use the network interface
- * provided by the driver.
+ * It is exported as a character device using the cdc-wdm driver as
+ * a subdriver, enabling userspace applications ("modem managers") to
+ * handle it.
  *
  * These devices may alternatively/additionally be configured using AT
- * commands on any of the serial interfaces driven by the option driver
- *
- * This driver binds only to the data ("slave") interface to enable
- * the cdc-wdm driver to bind to the control interface.  It still
- * parses the CDC functional descriptors on the control interface to
- *  a) verify that this is indeed a handled interface (CDC Union
- *     header lists it as slave)
- *  b) get MAC address and other ethernet config from the CDC Ethernet
- *     header
- *  c) enable user bind requests against the control interface, which
- *     is the common way to bind to CDC Ethernet Control Model type
- *     interfaces
- *  d) provide a hint to the user about which interface is the
- *     corresponding management interface
+ * commands on a serial interface
  */
 
+/* driver specific data */
+struct qmi_wwan_state {
+        struct usb_driver *subdriver;
+        atomic_t pmcount;
+        unsigned long unused;
+        struct usb_interface *control;
+        struct usb_interface *data;
+};
+
+/* using a counter to merge subdriver requests with our own into a combined state */
+static int qmi_wwan_manage_power(struct usbnet *dev, int on)
+{
+        struct qmi_wwan_state *info = (void *)&dev->data;
+        int rv = 0;
+
+        dev_dbg(&dev->intf->dev, "%s() pmcount=%d, on=%d\n", __func__, atomic_read(&info->pmcount), on);
+
+        if ((on && atomic_add_return(1, &info->pmcount) == 1) || (!on && atomic_dec_and_test(&info->pmcount))) {
+                /* need autopm_get/put here to ensure the usbcore sees the new value */
+                rv = usb_autopm_get_interface(dev->intf);
+                if (rv < 0)
+                        goto err;
+                dev->intf->needs_remote_wakeup = on;
+                usb_autopm_put_interface(dev->intf);
+        }
+err:
+        return rv;
+}
+
+static int qmi_wwan_cdc_wdm_manage_power(struct usb_interface *intf, int on)
+{
+        struct usbnet *dev = usb_get_intfdata(intf);
+
+        /* can be called while disconnecting */
+        if (!dev)
+                return 0;
+        return qmi_wwan_manage_power(dev, on);
+}
+
+/* collect all three endpoints and register subdriver */
+static int qmi_wwan_register_subdriver(struct usbnet *dev)
+{
+        int rv;
+        struct usb_driver *subdriver = NULL;
+        struct qmi_wwan_state *info = (void *)&dev->data;
+
+        /* collect bulk endpoints */
+        rv = usbnet_get_endpoints(dev, info->data);
+        if (rv < 0)
+                goto err;
+
+        /* update status endpoint if separate control interface */
+        if (info->control != info->data)
+                dev->status = &info->control->cur_altsetting->endpoint[0];
+
+        /* require interrupt endpoint for subdriver */
+        if (!dev->status) {
+                rv = -EINVAL;
+                goto err;
+        }
+
+        /* for subdriver power management */
+        atomic_set(&info->pmcount, 0);
+
+        /* register subdriver */
+        subdriver = usb_cdc_wdm_register(info->control, &dev->status->desc, 512, &qmi_wwan_cdc_wdm_manage_power);
+        if (IS_ERR(subdriver)) {
+                dev_err(&info->control->dev, "subdriver registration failed\n");
+                rv = PTR_ERR(subdriver);
+                goto err;
+        }
+
+        /* prevent usbnet from using status endpoint */
+        dev->status = NULL;
+
+        /* save subdriver struct for suspend/resume wrappers */
+        info->subdriver = subdriver;
+
+err:
+        return rv;
+}
+
 static int qmi_wwan_bind(struct usbnet *dev, struct usb_interface *intf)
 {
         int status = -1;
-        struct usb_interface *control = NULL;
         u8 *buf = intf->cur_altsetting->extra;
         int len = intf->cur_altsetting->extralen;
         struct usb_interface_descriptor *desc = &intf->cur_altsetting->desc;
         struct usb_cdc_union_desc *cdc_union = NULL;
         struct usb_cdc_ether_desc *cdc_ether = NULL;
-        u32 required = 1 << USB_CDC_HEADER_TYPE | 1 << USB_CDC_UNION_TYPE;
         u32 found = 0;
-        atomic_t *pmcount = (void *)&dev->data[1];
-
-        atomic_set(pmcount, 0);
+        struct usb_driver *driver = driver_of(intf);
+        struct qmi_wwan_state *info = (void *)&dev->data;
 
-        /*
-         * assume a data interface has no additional descriptors and
-         * that the control and data interface are numbered
-         * consecutively - this holds for the Huawei device at least
-         */
-        if (len == 0 && desc->bInterfaceNumber > 0) {
-                control = usb_ifnum_to_if(dev->udev, desc->bInterfaceNumber - 1);
-                if (!control)
-                        goto err;
+        BUILD_BUG_ON((sizeof(((struct usbnet *)0)->data) < sizeof(struct qmi_wwan_state)));
 
-                buf = control->cur_altsetting->extra;
-                len = control->cur_altsetting->extralen;
-                dev_dbg(&intf->dev, "guessing \"control\" => %s, \"data\" => this\n",
-                        dev_name(&control->dev));
-        }
+        /* require a single interrupt status endpoint for subdriver */
+        if (intf->cur_altsetting->desc.bNumEndpoints != 1)
+                goto err;
 
         while (len > 3) {
                 struct usb_descriptor_header *h = (void *)buf;
@@ -142,15 +200,23 @@ next_desc:
         }
 
         /* did we find all the required ones? */
-        if ((found & required) != required) {
+        if (!(found & (1 << USB_CDC_HEADER_TYPE)) ||
+            !(found & (1 << USB_CDC_UNION_TYPE))) {
                 dev_err(&intf->dev, "CDC functional descriptors missing\n");
                 goto err;
         }
 
-        /* give the user a helpful hint if trying to bind to the wrong interface */
-        if (cdc_union && desc->bInterfaceNumber == cdc_union->bMasterInterface0) {
-                dev_err(&intf->dev, "leaving \"control\" interface for " DM_DRIVER " - try binding to %s instead!\n",
-                        dev_name(&usb_ifnum_to_if(dev->udev, cdc_union->bSlaveInterface0)->dev));
+        /* verify CDC Union */
+        if (desc->bInterfaceNumber != cdc_union->bMasterInterface0) {
+                dev_err(&intf->dev, "bogus CDC Union: master=%u\n", cdc_union->bMasterInterface0);
+                goto err;
+        }
+
+        /* need to save these for unbind */
+        info->control = intf;
+        info->data = usb_ifnum_to_if(dev->udev, cdc_union->bSlaveInterface0);
+        if (!info->data) {
+                dev_err(&intf->dev, "bogus CDC Union: slave=%u\n", cdc_union->bSlaveInterface0);
                 goto err;
         }
 
@@ -160,63 +226,29 @@ next_desc:
                 usbnet_get_ethernet_addr(dev, cdc_ether->iMACAddress);
         }
 
-        /* success! point the user to the management interface */
-        if (control)
-                dev_info(&intf->dev, "Use \"" DM_DRIVER "\" for QMI interface %s\n",
-                        dev_name(&control->dev));
-
-        /* XXX: add a sysfs symlink somewhere to help management applications find it? */
+        /* claim data interface and set it up */
+        status = usb_driver_claim_interface(driver, info->data, dev);
+        if (status < 0)
+                goto err;
 
-        /* collect bulk endpoints now that we know intf == "data" interface */
-        status = usbnet_get_endpoints(dev, intf);
+        status = qmi_wwan_register_subdriver(dev);
+        if (status < 0) {
+                usb_set_intfdata(info->data, NULL);
+                usb_driver_release_interface(driver, info->data);
+        }
 
 err:
         return status;
 }
 
-/* using a counter to merge subdriver requests with our own into a combined state */
-static int qmi_wwan_manage_power(struct usbnet *dev, int on)
-{
-        atomic_t *pmcount = (void *)&dev->data[1];
-        int rv = 0;
-
-        dev_dbg(&dev->intf->dev, "%s() pmcount=%d, on=%d\n", __func__, atomic_read(pmcount), on);
-
-        if ((on && atomic_add_return(1, pmcount) == 1) || (!on && atomic_dec_and_test(pmcount))) {
-                /* need autopm_get/put here to ensure the usbcore sees the new value */
-                rv = usb_autopm_get_interface(dev->intf);
-                if (rv < 0)
-                        goto err;
-                dev->intf->needs_remote_wakeup = on;
-                usb_autopm_put_interface(dev->intf);
-        }
-err:
-        return rv;
-}
-
-static int qmi_wwan_cdc_wdm_manage_power(struct usb_interface *intf, int on)
-{
-        struct usbnet *dev = usb_get_intfdata(intf);
-
-        /* can be called while disconnecting */
-        if (!dev)
-                return 0;
-        return qmi_wwan_manage_power(dev, on);
-}
-
 /* Some devices combine the "control" and "data" functions into a
  * single interface with all three endpoints: interrupt + bulk in and
  * out
- *
- * Setting up cdc-wdm as a subdriver owning the interrupt endpoint
- * will let it provide userspace access to the encapsulated QMI
- * protocol without interfering with the usbnet operations.
-  */
+ */
 static int qmi_wwan_bind_shared(struct usbnet *dev, struct usb_interface *intf)
 {
         int rv;
-        struct usb_driver *subdriver = NULL;
-        atomic_t *pmcount = (void *)&dev->data[1];
+        struct qmi_wwan_state *info = (void *)&dev->data;
 
         /* ZTE makes devices where the interface descriptors and endpoint
          * configurations of two or more interfaces are identical, even
@@ -232,43 +264,39 @@ static int qmi_wwan_bind_shared(struct usbnet *dev, struct usb_interface *intf)
                 goto err;
         }
 
-        atomic_set(pmcount, 0);
-
-        /* collect all three endpoints */
-        rv = usbnet_get_endpoints(dev, intf);
-        if (rv < 0)
-                goto err;
-
-        /* require interrupt endpoint for subdriver */
-        if (!dev->status) {
-                rv = -EINVAL;
-                goto err;
-        }
-
-        subdriver = usb_cdc_wdm_register(intf, &dev->status->desc, 512, &qmi_wwan_cdc_wdm_manage_power);
-        if (IS_ERR(subdriver)) {
-                rv = PTR_ERR(subdriver);
-                goto err;
-        }
-
-        /* can't let usbnet use the interrupt endpoint */
-        dev->status = NULL;
-
-        /* save subdriver struct for suspend/resume wrappers */
-        dev->data[0] = (unsigned long)subdriver;
+        /*  control and data is shared */
+        info->control = intf;
+        info->data = intf;
+        rv = qmi_wwan_register_subdriver(dev);
 
 err:
         return rv;
 }
 
-static void qmi_wwan_unbind_shared(struct usbnet *dev, struct usb_interface *intf)
+static void qmi_wwan_unbind(struct usbnet *dev, struct usb_interface *intf)
 {
-        struct usb_driver *subdriver = (void *)dev->data[0];
-
-        if (subdriver && subdriver->disconnect)
-                subdriver->disconnect(intf);
+        struct qmi_wwan_state *info = (void *)&dev->data;
+        struct usb_driver *driver = driver_of(intf);
+        struct usb_interface *other;
+
+        if (info->subdriver && info->subdriver->disconnect)
+                info->subdriver->disconnect(info->control);
+
+        /* allow user to unbind using either control or data */
+        if (intf == info->control)
+                other = info->data;
+        else
+                other = info->control;
+
+        /* only if not shared */
+        if (other && intf != other) {
+                usb_set_intfdata(other, NULL);
+                usb_driver_release_interface(driver, other);
+        }
 
-        dev->data[0] = (unsigned long)NULL;
+        info->subdriver = NULL;
+        info->data = NULL;
+        info->control = NULL;
 }
 
 /* suspend/resume wrappers calling both usbnet and the cdc-wdm
@@ -280,15 +308,15 @@ static void qmi_wwan_unbind_shared(struct usbnet *dev, struct usb_interface *int
 static int qmi_wwan_suspend(struct usb_interface *intf, pm_message_t message)
 {
         struct usbnet *dev = usb_get_intfdata(intf);
-        struct usb_driver *subdriver = (void *)dev->data[0];
+        struct qmi_wwan_state *info = (void *)&dev->data;
         int ret;
 
         ret = usbnet_suspend(intf, message);
         if (ret < 0)
                 goto err;
 
-        if (subdriver && subdriver->suspend)
-                ret = subdriver->suspend(intf, message);
+        if (info->subdriver && info->subdriver->suspend)
+                ret = info->subdriver->suspend(intf, message);
         if (ret < 0)
                 usbnet_resume(intf);
 err:
@@ -298,33 +326,33 @@ err:
 static int qmi_wwan_resume(struct usb_interface *intf)
 {
         struct usbnet *dev = usb_get_intfdata(intf);
-        struct usb_driver *subdriver = (void *)dev->data[0];
+        struct qmi_wwan_state *info = (void *)&dev->data;
         int ret = 0;
 
-        if (subdriver && subdriver->resume)
-                ret = subdriver->resume(intf);
+        if (info->subdriver && info->subdriver->resume)
+                ret = info->subdriver->resume(intf);
         if (ret < 0)
                 goto err;
         ret = usbnet_resume(intf);
-        if (ret < 0 && subdriver && subdriver->resume && subdriver->suspend)
-                subdriver->suspend(intf, PMSG_SUSPEND);
+        if (ret < 0 && info->subdriver && info->subdriver->resume && info->subdriver->suspend)
+                info->subdriver->suspend(intf, PMSG_SUSPEND);
 err:
         return ret;
 }
 
-
 static const struct driver_info qmi_wwan_info = {
-        .description    = "QMI speaking wwan device",
+        .description    = "WWAN/QMI device",
         .flags          = FLAG_WWAN,
         .bind           = qmi_wwan_bind,
+        .unbind         = qmi_wwan_unbind,
         .manage_power   = qmi_wwan_manage_power,
 };
 
 static const struct driver_info qmi_wwan_shared = {
-        .description    = "QMI speaking wwan device with combined interface",
+        .description    = "WWAN/QMI device",
         .flags          = FLAG_WWAN,
         .bind           = qmi_wwan_bind_shared,
-        .unbind         = qmi_wwan_unbind_shared,
+        .unbind         = qmi_wwan_unbind,
         .manage_power   = qmi_wwan_manage_power,
 };
 
@@ -332,7 +360,7 @@ static const struct driver_info	qmi_wwan_force_int0 = {
         .description    = "Qualcomm WWAN/QMI device",
         .flags          = FLAG_WWAN,
         .bind           = qmi_wwan_bind_shared,
-        .unbind         = qmi_wwan_unbind_shared,
+        .unbind         = qmi_wwan_unbind,
         .manage_power   = qmi_wwan_manage_power,
         .data           = BIT(0), /* interface whitelist bitmap */
 };
@@ -341,7 +369,7 @@ static const struct driver_info	qmi_wwan_force_int1 = {
         .description    = "Qualcomm WWAN/QMI device",
         .flags          = FLAG_WWAN,
         .bind           = qmi_wwan_bind_shared,
-        .unbind         = qmi_wwan_unbind_shared,
+        .unbind         = qmi_wwan_unbind,
         .manage_power   = qmi_wwan_manage_power,
         .data           = BIT(1), /* interface whitelist bitmap */
 };
@@ -350,7 +378,7 @@ static const struct driver_info qmi_wwan_force_int2 = {
         .description    = "Qualcomm WWAN/QMI device",
         .flags          = FLAG_WWAN,
         .bind           = qmi_wwan_bind_shared,
-        .unbind         = qmi_wwan_unbind_shared,
+        .unbind         = qmi_wwan_unbind,
         .manage_power   = qmi_wwan_manage_power,
         .data           = BIT(2), /* interface whitelist bitmap */
 };
@@ -359,7 +387,7 @@ static const struct driver_info	qmi_wwan_force_int3 = {
         .description    = "Qualcomm WWAN/QMI device",
         .flags          = FLAG_WWAN,
         .bind           = qmi_wwan_bind_shared,
-        .unbind         = qmi_wwan_unbind_shared,
+        .unbind         = qmi_wwan_unbind,
         .manage_power   = qmi_wwan_manage_power,
         .data           = BIT(3), /* interface whitelist bitmap */
 };
@@ -368,7 +396,7 @@ static const struct driver_info	qmi_wwan_force_int4 = {
         .description    = "Qualcomm WWAN/QMI device",
         .flags          = FLAG_WWAN,
         .bind           = qmi_wwan_bind_shared,
-        .unbind         = qmi_wwan_unbind_shared,
+        .unbind         = qmi_wwan_unbind,
         .manage_power   = qmi_wwan_manage_power,
         .data           = BIT(4), /* interface whitelist bitmap */
 };
@@ -390,7 +418,7 @@ static const struct driver_info	qmi_wwan_sierra = {
         .description    = "Sierra Wireless wwan/QMI device",
         .flags          = FLAG_WWAN,
         .bind           = qmi_wwan_bind_shared,
-        .unbind         = qmi_wwan_unbind_shared,
+        .unbind         = qmi_wwan_unbind,
         .manage_power   = qmi_wwan_manage_power,
         .data           = BIT(8) | BIT(19), /* interface whitelist bitmap */
 };
@@ -413,7 +441,7 @@ static const struct usb_device_id products[] = {
                 .idVendor           = HUAWEI_VENDOR_ID,
                 .bInterfaceClass    = USB_CLASS_VENDOR_SPEC,
                 .bInterfaceSubClass = 1,
-                .bInterfaceProtocol = 8, /* NOTE: This is the *slave* interface of the CDC Union! */
+                .bInterfaceProtocol = 9, /* CDC Ethernet *control* interface */
                 .driver_info        = (unsigned long)&qmi_wwan_info,
         },
         {       /* Vodafone/Huawei K5005 (12d1:14c8) and similar modems */
@@ -421,7 +449,7 @@ static const struct usb_device_id products[] = {
                 .idVendor           = HUAWEI_VENDOR_ID,
                 .bInterfaceClass    = USB_CLASS_VENDOR_SPEC,
                 .bInterfaceSubClass = 1,
-                .bInterfaceProtocol = 56, /* NOTE: This is the *slave* interface of the CDC Union! */
+                .bInterfaceProtocol = 57, /* CDC Ethernet *control* interface */
                 .driver_info        = (unsigned long)&qmi_wwan_info,
         },
         {       /* Huawei E392, E398 and possibly others in "Windows mode"
@@ -584,17 +612,7 @@ static struct usb_driver qmi_wwan_driver = {
         .disable_hub_initiated_lpm = 1,
 };
 
-static int __init qmi_wwan_init(void)
-{
-        return usb_register(&qmi_wwan_driver);
-}
-module_init(qmi_wwan_init);
-
-static void __exit qmi_wwan_exit(void)
-{
-        usb_deregister(&qmi_wwan_driver);
-}
-module_exit(qmi_wwan_exit);
+module_usb_driver(qmi_wwan_driver);
 
 MODULE_AUTHOR("Bjørn Mork <bjorn@mork.no>");
 MODULE_DESCRIPTION("Qualcomm MSM Interface (QMI) WWAN driver");
diff --git a/drivers/net/usb/smsc95xx.c b/drivers/net/usb/smsc95xx.c
index b1112e75385..05ecf14d659 100644
--- a/drivers/net/usb/smsc95xx.c
+++ b/drivers/net/usb/smsc95xx.c
@@ -578,6 +578,35 @@ static int smsc95xx_ethtool_set_eeprom(struct net_device *netdev,
         return smsc95xx_write_eeprom(dev, ee->offset, ee->len, data);
 }
 
+static int smsc95xx_ethtool_getregslen(struct net_device *netdev)
+{
+        /* all smsc95xx registers */
+        return COE_CR - ID_REV + 1;
+}
+
+static void
+smsc95xx_ethtool_getregs(struct net_device *netdev, struct ethtool_regs *regs,
+                         void *buf)
+{
+        struct usbnet *dev = netdev_priv(netdev);
+        unsigned int i, j, retval;
+        u32 *data = buf;
+
+        retval = smsc95xx_read_reg(dev, ID_REV, &regs->version);
+        if (retval < 0) {
+                netdev_warn(netdev, "REGS: cannot read ID_REV\n");
+                return;
+        }
+
+        for (i = ID_REV, j = 0; i <= COE_CR; i += (sizeof(u32)), j++) {
+                retval = smsc95xx_read_reg(dev, i, &data[j]);
+                if (retval < 0) {
+                        netdev_warn(netdev, "REGS: cannot read reg[%x]\n", i);
+                        return;
+                }
+        }
+}
+
 static const struct ethtool_ops smsc95xx_ethtool_ops = {
         .get_link       = usbnet_get_link,
         .nway_reset     = usbnet_nway_reset,
@@ -589,6 +618,8 @@ static const struct ethtool_ops smsc95xx_ethtool_ops = {
         .get_eeprom_len = smsc95xx_ethtool_get_eeprom_len,
         .get_eeprom     = smsc95xx_ethtool_get_eeprom,
         .set_eeprom     = smsc95xx_ethtool_set_eeprom,
+        .get_regs_len   = smsc95xx_ethtool_getregslen,
+        .get_regs       = smsc95xx_ethtool_getregs,
 };
 
 static int smsc95xx_ioctl(struct net_device *netdev, struct ifreq *rq, int cmd)
diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c
index aba769d7745..e92c057f794 100644
--- a/drivers/net/usb/usbnet.c
+++ b/drivers/net/usb/usbnet.c
@@ -180,7 +180,40 @@ int usbnet_get_ethernet_addr(struct usbnet *dev, int iMACAddress)
 }
 EXPORT_SYMBOL_GPL(usbnet_get_ethernet_addr);
 
-static void intr_complete (struct urb *urb);
+static void intr_complete (struct urb *urb)
+{
+        struct usbnet   *dev = urb->context;
+        int             status = urb->status;
+
+        switch (status) {
+        /* success */
+        case 0:
+                dev->driver_info->status(dev, urb);
+                break;
+
+        /* software-driven interface shutdown */
+        case -ENOENT:           /* urb killed */
+        case -ESHUTDOWN:        /* hardware gone */
+                netif_dbg(dev, ifdown, dev->net,
+                          "intr shutdown, code %d\n", status);
+                return;
+
+        /* NOTE:  not throttling like RX/TX, since this endpoint
+         * already polls infrequently
+         */
+        default:
+                netdev_dbg(dev->net, "intr status %d\n", status);
+                break;
+        }
+
+        if (!netif_running (dev->net))
+                return;
+
+        status = usb_submit_urb (urb, GFP_ATOMIC);
+        if (status != 0)
+                netif_err(dev, timer, dev->net,
+                          "intr resubmit --> %d\n", status);
+}
 
 static int init_status (struct usbnet *dev, struct usb_interface *intf)
 {
@@ -519,42 +552,6 @@ block:
         netif_dbg(dev, rx_err, dev->net, "no read resubmitted\n");
 }
 
-static void intr_complete (struct urb *urb)
-{
-        struct usbnet   *dev = urb->context;
-        int             status = urb->status;
-
-        switch (status) {
-        /* success */
-        case 0:
-                dev->driver_info->status(dev, urb);
-                break;
-
-        /* software-driven interface shutdown */
-        case -ENOENT:           /* urb killed */
-        case -ESHUTDOWN:        /* hardware gone */
-                netif_dbg(dev, ifdown, dev->net,
-                          "intr shutdown, code %d\n", status);
-                return;
-
-        /* NOTE:  not throttling like RX/TX, since this endpoint
-         * already polls infrequently
-         */
-        default:
-                netdev_dbg(dev->net, "intr status %d\n", status);
-                break;
-        }
-
-        if (!netif_running (dev->net))
-                return;
-
-        memset(urb->transfer_buffer, 0, urb->transfer_buffer_length);
-        status = usb_submit_urb (urb, GFP_ATOMIC);
-        if (status != 0)
-                netif_err(dev, timer, dev->net,
-                          "intr resubmit --> %d\n", status);
-}
-
 /*-------------------------------------------------------------------------*/
 void usbnet_pause_rx(struct usbnet *dev)
 {
@@ -1312,7 +1309,6 @@ void usbnet_disconnect (struct usb_interface *intf)
         usb_free_urb(dev->interrupt);
 
         free_netdev(net);
-        usb_put_dev (xdev);
 }
 EXPORT_SYMBOL_GPL(usbnet_disconnect);
 
@@ -1368,8 +1364,6 @@ usbnet_probe (struct usb_interface *udev, const struct usb_device_id *prod)
         xdev = interface_to_usbdev (udev);
         interface = udev->cur_altsetting;
 
-        usb_get_dev (xdev);
-
         status = -ENOMEM;
 
         // set up our own records
@@ -1498,7 +1492,6 @@ out3:
 out1:
         free_netdev(net);
 out:
-        usb_put_dev(xdev);
         return status;
 }
 EXPORT_SYMBOL_GPL(usbnet_probe);
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index f18149ae258..1db445b2ecc 100644
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -1062,7 +1062,7 @@ static int virtnet_probe(struct virtio_device *vdev)
                 return -ENOMEM;
 
         /* Set up network device as normal. */
-        dev->priv_flags |= IFF_UNICAST_FLT;
+        dev->priv_flags |= IFF_UNICAST_FLT | IFF_LIVE_ADDR_CHANGE;
         dev->netdev_ops = &virtnet_netdev;
         dev->features = NETIF_F_HIGHDMA;
 
diff --git a/drivers/net/vmxnet3/vmxnet3_drv.c b/drivers/net/vmxnet3/vmxnet3_drv.c
index 3f04ba0a545..93e0cfb739b 100644
--- a/drivers/net/vmxnet3/vmxnet3_drv.c
+++ b/drivers/net/vmxnet3/vmxnet3_drv.c
@@ -1037,7 +1037,7 @@ vmxnet3_tq_xmit(struct sk_buff *skb, struct vmxnet3_tx_queue *tq,
 #endif
         dev_dbg(&adapter->netdev->dev,
                 "txd[%u]: SOP 0x%Lx 0x%x 0x%x\n",
-                (u32)((union Vmxnet3_GenericDesc *)ctx.sop_txd -
+                (u32)(ctx.sop_txd -
                 tq->tx_ring.base), le64_to_cpu(gdesc->txd.addr),
                 le32_to_cpu(gdesc->dword[2]), le32_to_cpu(gdesc->dword[3]));
 
diff --git a/drivers/net/wan/x25_asy.c b/drivers/net/wan/x25_asy.c
index d7a65e141d1..44db8b75a53 100644
--- a/drivers/net/wan/x25_asy.c
+++ b/drivers/net/wan/x25_asy.c
@@ -231,7 +231,7 @@ static void x25_asy_encaps(struct x25_asy *sl, unsigned char *icp, int len)
         }
 
         p = icp;
-        count = x25_asy_esc(p, (unsigned char *) sl->xbuff, len);
+        count = x25_asy_esc(p, sl->xbuff, len);
 
         /* Order of next two lines is *very* important.
          * When we are sending a little amount of data,
diff --git a/drivers/net/wimax/i2400m/fw.c b/drivers/net/wimax/i2400m/fw.c
index 7cbd7d231e1..d09e44970e6 100644
--- a/drivers/net/wimax/i2400m/fw.c
+++ b/drivers/net/wimax/i2400m/fw.c
@@ -1268,7 +1268,7 @@ int i2400m_fw_check(struct i2400m *i2400m, const void *bcf, size_t bcf_size)
                 size_t leftover, offset, header_len, size;
 
                 leftover = top - itr;
-                offset = itr - (const void *) bcf;
+                offset = itr - bcf;
                 if (leftover <= sizeof(*bcf_hdr)) {
                         dev_err(dev, "firmware %s: %zu B left at @%zx, "
                                 "not enough for BCF header\n",
diff --git a/drivers/net/wireless/adm8211.c b/drivers/net/wireless/adm8211.c
index 0ac09a2bd14..97afcec2475 100644
--- a/drivers/net/wireless/adm8211.c
+++ b/drivers/net/wireless/adm8211.c
@@ -1738,8 +1738,7 @@ static int adm8211_alloc_rings(struct ieee80211_hw *dev)
                 return -ENOMEM;
         }
 
-        priv->tx_ring = (struct adm8211_desc *)(priv->rx_ring +
-                                                priv->rx_ring_size);
+        priv->tx_ring = priv->rx_ring + priv->rx_ring_size;
         priv->tx_ring_dma = priv->rx_ring_dma +
                             sizeof(struct adm8211_desc) * priv->rx_ring_size;
 
diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c
index a747c632597..f9f15bb3f03 100644
--- a/drivers/net/wireless/airo.c
+++ b/drivers/net/wireless/airo.c
@@ -1997,7 +1997,7 @@ static int mpi_send_packet (struct net_device *dev)
  *                         ------------------------------------------------
  */
 
-        memcpy((char *)ai->txfids[0].virtual_host_addr,
+        memcpy(ai->txfids[0].virtual_host_addr,
                 (char *)&wifictlhdr8023, sizeof(wifictlhdr8023));
 
         payloadLen = (__le16 *)(ai->txfids[0].virtual_host_addr +
@@ -4212,7 +4212,7 @@ static int PC4500_writerid(struct airo_info *ai, u16 rid,
                         airo_print_err(ai->dev->name, "%s: len=%d", __func__, len);
                         rc = -1;
                 } else {
-                        memcpy((char *)ai->config_desc.virtual_host_addr,
+                        memcpy(ai->config_desc.virtual_host_addr,
                                 pBuf, len);
 
                         rc = issuecommand(ai, &cmd, &rsp);
diff --git a/drivers/net/wireless/ath/ath6kl/cfg80211.c b/drivers/net/wireless/ath/ath6kl/cfg80211.c
index b869a358ce4..fd7dbd4609d 100644
--- a/drivers/net/wireless/ath/ath6kl/cfg80211.c
+++ b/drivers/net/wireless/ath/ath6kl/cfg80211.c
@@ -53,6 +53,11 @@
 
 #define DEFAULT_BG_SCAN_PERIOD 60
 
+struct ath6kl_cfg80211_match_probe_ssid {
+        struct cfg80211_ssid ssid;
+        u8 flag;
+};
+
 static struct ieee80211_rate ath6kl_rates[] = {
         RATETAB_ENT(10, 0x1, 0),
         RATETAB_ENT(20, 0x2, 0),
@@ -576,6 +581,9 @@ static int ath6kl_cfg80211_connect(struct wiphy *wiphy, struct net_device *dev,
 
         vif->nw_type = vif->next_mode;
 
+        /* enable enhanced bmiss detection if applicable */
+        ath6kl_cfg80211_sta_bmiss_enhance(vif, true);
+
         if (vif->wdev.iftype == NL80211_IFTYPE_P2P_CLIENT)
                 nw_subtype = SUBTYPE_P2PCLIENT;
 
@@ -852,20 +860,6 @@ void ath6kl_cfg80211_disconnect_event(struct ath6kl_vif *vif, u8 reason,
                 }
         }
 
-        /*
-         * Send a disconnect command to target when a disconnect event is
-         * received with reason code other than 3 (DISCONNECT_CMD - disconnect
-         * request from host) to make the firmware stop trying to connect even
-         * after giving disconnect event. There will be one more disconnect
-         * event for this disconnect command with reason code DISCONNECT_CMD
-         * which will be notified to cfg80211.
-         */
-
-        if (reason != DISCONNECT_CMD) {
-                ath6kl_wmi_disconnect_cmd(ar->wmi, vif->fw_vif_idx);
-                return;
-        }
-
         clear_bit(CONNECT_PEND, &vif->flags);
 
         if (vif->sme_state == SME_CONNECTING) {
@@ -875,32 +869,96 @@ void ath6kl_cfg80211_disconnect_event(struct ath6kl_vif *vif, u8 reason,
                                         WLAN_STATUS_UNSPECIFIED_FAILURE,
                                         GFP_KERNEL);
         } else if (vif->sme_state == SME_CONNECTED) {
-                cfg80211_disconnected(vif->ndev, reason,
+                cfg80211_disconnected(vif->ndev, proto_reason,
                                       NULL, 0, GFP_KERNEL);
         }
 
         vif->sme_state = SME_DISCONNECTED;
+
+        /*
+         * Send a disconnect command to target when a disconnect event is
+         * received with reason code other than 3 (DISCONNECT_CMD - disconnect
+         * request from host) to make the firmware stop trying to connect even
+         * after giving disconnect event. There will be one more disconnect
+         * event for this disconnect command with reason code DISCONNECT_CMD
+         * which won't be notified to cfg80211.
+         */
+        if (reason != DISCONNECT_CMD)
+                ath6kl_wmi_disconnect_cmd(ar->wmi, vif->fw_vif_idx);
 }
 
 static int ath6kl_set_probed_ssids(struct ath6kl *ar,
                                    struct ath6kl_vif *vif,
-                                   struct cfg80211_ssid *ssids, int n_ssids)
+                                   struct cfg80211_ssid *ssids, int n_ssids,
+                                   struct cfg80211_match_set *match_set,
+                                   int n_match_ssid)
 {
-        u8 i;
+        u8 i, j, index_to_add, ssid_found = false;
+        struct ath6kl_cfg80211_match_probe_ssid ssid_list[MAX_PROBED_SSIDS];
 
-        if (n_ssids > MAX_PROBED_SSID_INDEX)
+        memset(ssid_list, 0, sizeof(ssid_list));
+
+        if (n_ssids > MAX_PROBED_SSIDS ||
+            n_match_ssid > MAX_PROBED_SSIDS)
                 return -EINVAL;
 
         for (i = 0; i < n_ssids; i++) {
+                memcpy(ssid_list[i].ssid.ssid,
+                       ssids[i].ssid,
+                       ssids[i].ssid_len);
+                ssid_list[i].ssid.ssid_len = ssids[i].ssid_len;
+
+                if (ssids[i].ssid_len)
+                        ssid_list[i].flag = SPECIFIC_SSID_FLAG;
+                else
+                        ssid_list[i].flag = ANY_SSID_FLAG;
+
+                if (n_match_ssid == 0)
+                        ssid_list[i].flag |= MATCH_SSID_FLAG;
+        }
+
+        index_to_add = i;
+
+        for (i = 0; i < n_match_ssid; i++) {
+                ssid_found = false;
+
+                for (j = 0; j < n_ssids; j++) {
+                        if ((match_set[i].ssid.ssid_len ==
+                             ssid_list[j].ssid.ssid_len) &&
+                            (!memcmp(ssid_list[j].ssid.ssid,
+                                     match_set[i].ssid.ssid,
+                                     match_set[i].ssid.ssid_len))) {
+                                ssid_list[j].flag |= MATCH_SSID_FLAG;
+                                ssid_found = true;
+                                break;
+                        }
+                }
+
+                if (ssid_found)
+                        continue;
+
+                if (index_to_add >= MAX_PROBED_SSIDS)
+                        continue;
+
+                ssid_list[index_to_add].ssid.ssid_len =
+                        match_set[i].ssid.ssid_len;
+                memcpy(ssid_list[index_to_add].ssid.ssid,
+                       match_set[i].ssid.ssid,
+                       match_set[i].ssid.ssid_len);
+                ssid_list[index_to_add].flag |= MATCH_SSID_FLAG;
+                index_to_add++;
+        }
+
+        for (i = 0; i < index_to_add; i++) {
                 ath6kl_wmi_probedssid_cmd(ar->wmi, vif->fw_vif_idx, i,
-                                          ssids[i].ssid_len ?
-                                          SPECIFIC_SSID_FLAG : ANY_SSID_FLAG,
-                                          ssids[i].ssid_len,
-                                          ssids[i].ssid);
+                                          ssid_list[i].flag,
+                                          ssid_list[i].ssid.ssid_len,
+                                          ssid_list[i].ssid.ssid);
+
         }
 
         /* Make sure no old entries are left behind */
-        for (i = n_ssids; i < MAX_PROBED_SSID_INDEX; i++) {
+        for (i = index_to_add; i < MAX_PROBED_SSIDS; i++) {
                 ath6kl_wmi_probedssid_cmd(ar->wmi, vif->fw_vif_idx, i,
                                           DISABLE_SSID_FLAG, 0, NULL);
         }
@@ -934,7 +992,7 @@ static int ath6kl_cfg80211_scan(struct wiphy *wiphy, struct net_device *ndev,
         }
 
         ret = ath6kl_set_probed_ssids(ar, vif, request->ssids,
-                                      request->n_ssids);
+                                      request->n_ssids, NULL, 0);
         if (ret < 0)
                 return ret;
 
@@ -943,7 +1001,7 @@ static int ath6kl_cfg80211_scan(struct wiphy *wiphy, struct net_device *ndev,
                                        WMI_FRAME_PROBE_REQ,
                                        request->ie, request->ie_len);
         if (ret) {
-                ath6kl_err("failed to set Probe Request appie for scan");
+                ath6kl_err("failed to set Probe Request appie for scan\n");
                 return ret;
         }
 
@@ -1512,6 +1570,9 @@ static int ath6kl_cfg80211_change_iface(struct wiphy *wiphy,
                 }
         }
 
+        /* need to clean up enhanced bmiss detection fw state */
+        ath6kl_cfg80211_sta_bmiss_enhance(vif, false);
+
 set_iface_type:
         switch (type) {
         case NL80211_IFTYPE_STATION:
@@ -2074,7 +2135,9 @@ static int ath6kl_wow_suspend(struct ath6kl *ar, struct cfg80211_wowlan *wow)
         if (wow && (wow->n_patterns > WOW_MAX_FILTERS_PER_LIST))
                 return -EINVAL;
 
-        if (!test_bit(NETDEV_MCAST_ALL_ON, &vif->flags)) {
+        if (!test_bit(NETDEV_MCAST_ALL_ON, &vif->flags) &&
+            test_bit(ATH6KL_FW_CAPABILITY_WOW_MULTICAST_FILTER,
+                     ar->fw_capabilities)) {
                 ret = ath6kl_wmi_mcast_filter_cmd(vif->ar->wmi,
                                                 vif->fw_vif_idx, false);
                 if (ret)
@@ -2209,7 +2272,9 @@ static int ath6kl_wow_resume(struct ath6kl *ar)
 
         ar->state = ATH6KL_STATE_ON;
 
-        if (!test_bit(NETDEV_MCAST_ALL_OFF, &vif->flags)) {
+        if (!test_bit(NETDEV_MCAST_ALL_OFF, &vif->flags) &&
+            test_bit(ATH6KL_FW_CAPABILITY_WOW_MULTICAST_FILTER,
+                     ar->fw_capabilities)) {
                 ret = ath6kl_wmi_mcast_filter_cmd(vif->ar->wmi,
                                         vif->fw_vif_idx, true);
                 if (ret)
@@ -2475,7 +2540,7 @@ void ath6kl_check_wow_status(struct ath6kl *ar)
 static int ath6kl_set_htcap(struct ath6kl_vif *vif, enum ieee80211_band band,
                             bool ht_enable)
 {
-        struct ath6kl_htcap *htcap = &vif->htcap;
+        struct ath6kl_htcap *htcap = &vif->htcap[band];
 
         if (htcap->ht_enable == ht_enable)
                 return 0;
@@ -2585,33 +2650,28 @@ static int ath6kl_set_ies(struct ath6kl_vif *vif,
         return 0;
 }
 
-static int ath6kl_set_channel(struct wiphy *wiphy, struct net_device *dev,
-                              struct ieee80211_channel *chan,
-                              enum nl80211_channel_type channel_type)
+void ath6kl_cfg80211_sta_bmiss_enhance(struct ath6kl_vif *vif, bool enable)
 {
-        struct ath6kl_vif *vif;
+        int err;
 
-        /*
-         * 'dev' could be NULL if a channel change is required for the hardware
-         * device itself, instead of a particular VIF.
-         *
-         * FIXME: To be handled properly when monitor mode is supported.
-         */
-        if (!dev)
-                return -EBUSY;
+        if (WARN_ON(!test_bit(WMI_READY, &vif->ar->flag)))
+                return;
 
-        vif = netdev_priv(dev);
+        if (vif->nw_type != INFRA_NETWORK)
+                return;
 
-        if (!ath6kl_cfg80211_ready(vif))
-                return -EIO;
+        if (!test_bit(ATH6KL_FW_CAPABILITY_BMISS_ENHANCE,
+                      vif->ar->fw_capabilities))
+                return;
 
-        ath6kl_dbg(ATH6KL_DBG_WLAN_CFG, "%s: center_freq=%u hw_value=%u\n",
-                   __func__, chan->center_freq, chan->hw_value);
-        vif->next_chan = chan->center_freq;
-        vif->next_ch_type = channel_type;
-        vif->next_ch_band = chan->band;
+        ath6kl_dbg(ATH6KL_DBG_WLAN_CFG, "%s fw bmiss enhance\n",
+                   enable ? "enable" : "disable");
 
-        return 0;
+        err = ath6kl_wmi_sta_bmiss_enhance_cmd(vif->ar->wmi,
+                                               vif->fw_vif_idx, enable);
+        if (err)
+                ath6kl_err("failed to %s enhanced bmiss detection: %d\n",
+                           enable ? "enable" : "disable", err);
 }
 
 static int ath6kl_get_rsn_capab(struct cfg80211_beacon_data *beacon,
@@ -2694,9 +2754,15 @@ static int ath6kl_start_ap(struct wiphy *wiphy, struct net_device *dev,
 
         /* TODO:
          * info->interval
-         * info->dtim_period
          */
 
+        ret = ath6kl_wmi_ap_set_dtim_cmd(ar->wmi, vif->fw_vif_idx,
+                                         info->dtim_period);
+
+        /* ignore error, just print a warning and continue normally */
+        if (ret)
+                ath6kl_warn("Failed to set dtim_period in beacon: %d\n", ret);
+
         if (info->beacon.head == NULL)
                 return -EINVAL;
         mgmt = (struct ieee80211_mgmt *) info->beacon.head;
@@ -2791,7 +2857,7 @@ static int ath6kl_start_ap(struct wiphy *wiphy, struct net_device *dev,
         p.ssid_len = vif->ssid_len;
         memcpy(p.ssid, vif->ssid, vif->ssid_len);
         p.dot11_auth_mode = vif->dot11_auth_mode;
-        p.ch = cpu_to_le16(vif->next_chan);
+        p.ch = cpu_to_le16(info->channel->center_freq);
 
         /* Enable uAPSD support by default */
         res = ath6kl_wmi_ap_set_apsd(ar->wmi, vif->fw_vif_idx, true);
@@ -2815,8 +2881,8 @@ static int ath6kl_start_ap(struct wiphy *wiphy, struct net_device *dev,
                         return res;
         }
 
-        if (ath6kl_set_htcap(vif, vif->next_ch_band,
-                             vif->next_ch_type != NL80211_CHAN_NO_HT))
+        if (ath6kl_set_htcap(vif, info->channel->band,
+                             info->channel_type != NL80211_CHAN_NO_HT))
                 return -EIO;
 
         /*
@@ -3160,10 +3226,24 @@ static int ath6kl_cfg80211_sscan_start(struct wiphy *wiphy,
         ath6kl_cfg80211_scan_complete_event(vif, true);
 
         ret = ath6kl_set_probed_ssids(ar, vif, request->ssids,
-                                      request->n_ssids);
+                                      request->n_ssids,
+                                      request->match_sets,
+                                      request->n_match_sets);
         if (ret < 0)
                 return ret;
 
+        if (!request->n_match_sets) {
+                ret = ath6kl_wmi_bssfilter_cmd(ar->wmi, vif->fw_vif_idx,
+                                               ALL_BSS_FILTER, 0);
+                if (ret < 0)
+                        return ret;
+        } else {
+                 ret = ath6kl_wmi_bssfilter_cmd(ar->wmi, vif->fw_vif_idx,
+                                                MATCHED_SSID_FILTER, 0);
+                if (ret < 0)
+                        return ret;
+        }
+
         /* fw uses seconds, also make sure that it's >0 */
         interval = max_t(u16, 1, request->interval / 1000);
 
@@ -3185,7 +3265,7 @@ static int ath6kl_cfg80211_sscan_start(struct wiphy *wiphy,
                                        WMI_FRAME_PROBE_REQ,
                                        request->ie, request->ie_len);
         if (ret) {
-                ath6kl_warn("Failed to set probe request IE for scheduled scan: %d",
+                ath6kl_warn("Failed to set probe request IE for scheduled scan: %d\n",
                             ret);
                 return ret;
         }
@@ -3217,6 +3297,18 @@ static int ath6kl_cfg80211_sscan_stop(struct wiphy *wiphy,
         return 0;
 }
 
+static int ath6kl_cfg80211_set_bitrate(struct wiphy *wiphy,
+                                       struct net_device *dev,
+                                       const u8 *addr,
+                                       const struct cfg80211_bitrate_mask *mask)
+{
+        struct ath6kl *ar = ath6kl_priv(dev);
+        struct ath6kl_vif *vif = netdev_priv(dev);
+
+        return ath6kl_wmi_set_bitrate_mask(ar->wmi, vif->fw_vif_idx,
+                                           mask);
+}
+
 static const struct ieee80211_txrx_stypes
 ath6kl_mgmt_stypes[NUM_NL80211_IFTYPES] = {
         [NL80211_IFTYPE_STATION] = {
@@ -3271,7 +3363,6 @@ static struct cfg80211_ops ath6kl_cfg80211_ops = {
         .suspend = __ath6kl_cfg80211_suspend,
         .resume = __ath6kl_cfg80211_resume,
 #endif
-        .set_channel = ath6kl_set_channel,
         .start_ap = ath6kl_start_ap,
         .change_beacon = ath6kl_change_beacon,
         .stop_ap = ath6kl_stop_ap,
@@ -3283,6 +3374,7 @@ static struct cfg80211_ops ath6kl_cfg80211_ops = {
         .mgmt_frame_register = ath6kl_mgmt_frame_register,
         .sched_scan_start = ath6kl_cfg80211_sscan_start,
         .sched_scan_stop = ath6kl_cfg80211_sscan_stop,
+        .set_bitrate_mask = ath6kl_cfg80211_set_bitrate,
 };
 
 void ath6kl_cfg80211_stop(struct ath6kl_vif *vif)
@@ -3410,7 +3502,8 @@ struct net_device *ath6kl_interface_add(struct ath6kl *ar, char *name,
         vif->listen_intvl_t = ATH6KL_DEFAULT_LISTEN_INTVAL;
         vif->bmiss_time_t = ATH6KL_DEFAULT_BMISS_TIME;
         vif->bg_scan_period = 0;
-        vif->htcap.ht_enable = true;
+        vif->htcap[IEEE80211_BAND_2GHZ].ht_enable = true;
+        vif->htcap[IEEE80211_BAND_5GHZ].ht_enable = true;
 
         memcpy(ndev->dev_addr, ar->mac_addr, ETH_ALEN);
         if (fw_vif_idx != 0)
@@ -3470,7 +3563,13 @@ int ath6kl_cfg80211_init(struct ath6kl *ar)
         }
 
         /* max num of ssids that can be probed during scanning */
-        wiphy->max_scan_ssids = MAX_PROBED_SSID_INDEX;
+        wiphy->max_scan_ssids = MAX_PROBED_SSIDS;
+
+        /* max num of ssids that can be matched after scan */
+        if (test_bit(ATH6KL_FW_CAPABILITY_SCHED_SCAN_MATCH_LIST,
+                     ar->fw_capabilities))
+                wiphy->max_match_sets = MAX_PROBED_SSIDS;
+
         wiphy->max_scan_ie_len = 1000; /* FIX: what is correct limit? */
         switch (ar->hw.cap) {
         case WMI_11AN_CAP:
@@ -3507,6 +3606,17 @@ int ath6kl_cfg80211_init(struct ath6kl *ar)
                 ath6kl_band_5ghz.ht_cap.cap = 0;
                 ath6kl_band_5ghz.ht_cap.ht_supported = false;
         }
+
+        if (ar->hw.flags & ATH6KL_HW_FLAG_64BIT_RATES) {
+                ath6kl_band_2ghz.ht_cap.mcs.rx_mask[0] = 0xff;
+                ath6kl_band_5ghz.ht_cap.mcs.rx_mask[0] = 0xff;
+                ath6kl_band_2ghz.ht_cap.mcs.rx_mask[1] = 0xff;
+                ath6kl_band_5ghz.ht_cap.mcs.rx_mask[1] = 0xff;
+        } else {
+                ath6kl_band_2ghz.ht_cap.mcs.rx_mask[0] = 0xff;
+                ath6kl_band_5ghz.ht_cap.mcs.rx_mask[0] = 0xff;
+        }
+
         if (band_2gig)
                 wiphy->bands[IEEE80211_BAND_2GHZ] = &ath6kl_band_2ghz;
         if (band_5gig)
@@ -3527,7 +3637,7 @@ int ath6kl_cfg80211_init(struct ath6kl *ar)
         wiphy->wowlan.pattern_min_len = 1;
         wiphy->wowlan.pattern_max_len = WOW_PATTERN_SIZE;
 
-        wiphy->max_sched_scan_ssids = MAX_PROBED_SSID_INDEX;
+        wiphy->max_sched_scan_ssids = MAX_PROBED_SSIDS;
 
         ar->wiphy->flags |= WIPHY_FLAG_SUPPORTS_FW_ROAM |
                             WIPHY_FLAG_HAVE_AP_SME |
diff --git a/drivers/net/wireless/ath/ath6kl/cfg80211.h b/drivers/net/wireless/ath/ath6kl/cfg80211.h
index 5ea8cbb79f4..b992046a1b0 100644
--- a/drivers/net/wireless/ath/ath6kl/cfg80211.h
+++ b/drivers/net/wireless/ath/ath6kl/cfg80211.h
@@ -62,5 +62,7 @@ void ath6kl_cfg80211_cleanup(struct ath6kl *ar);
 
 struct ath6kl *ath6kl_cfg80211_create(void);
 void ath6kl_cfg80211_destroy(struct ath6kl *ar);
+/* TODO: remove this once ath6kl_vif_cleanup() is moved to cfg80211.c */
+void ath6kl_cfg80211_sta_bmiss_enhance(struct ath6kl_vif *vif, bool enable);
 
 #endif /* ATH6KL_CFG80211_H */
diff --git a/drivers/net/wireless/ath/ath6kl/core.h b/drivers/net/wireless/ath/ath6kl/core.h
index 4d9c6f14269..d38a31de344 100644
--- a/drivers/net/wireless/ath/ath6kl/core.h
+++ b/drivers/net/wireless/ath/ath6kl/core.h
@@ -100,6 +100,21 @@ enum ath6kl_fw_capability {
         /* Firmware has support to override rsn cap of rsn ie */
         ATH6KL_FW_CAPABILITY_RSN_CAP_OVERRIDE,
 
+        /*
+         * Multicast support in WOW and host awake mode.
+         * Allow all multicast in host awake mode.
+         * Apply multicast filter in WOW mode.
+         */
+        ATH6KL_FW_CAPABILITY_WOW_MULTICAST_FILTER,
+
+        /* Firmware supports enhanced bmiss detection */
+        ATH6KL_FW_CAPABILITY_BMISS_ENHANCE,
+
+        /*
+         * FW supports matching of ssid in schedule scan
+         */
+        ATH6KL_FW_CAPABILITY_SCHED_SCAN_MATCH_LIST,
+
         /* this needs to be last */
         ATH6KL_FW_CAPABILITY_MAX,
 };
@@ -112,6 +127,10 @@ struct ath6kl_fw_ie {
         u8 data[0];
 };
 
+enum ath6kl_hw_flags {
+        ATH6KL_HW_FLAG_64BIT_RATES      = BIT(0),
+};
+
 #define ATH6KL_FW_API2_FILE "fw-2.bin"
 #define ATH6KL_FW_API3_FILE "fw-3.bin"
 
@@ -196,7 +215,7 @@ struct ath6kl_fw_ie {
 
 #define AGGR_NUM_OF_FREE_NETBUFS    16
 
-#define AGGR_RX_TIMEOUT     400 /* in ms */
+#define AGGR_RX_TIMEOUT     100 /* in ms */
 
 #define WMI_TIMEOUT (2 * HZ)
 
@@ -245,7 +264,6 @@ struct skb_hold_q {
 
 struct rxtid {
         bool aggr;
-        bool progress;
         bool timer_mon;
         u16 win_sz;
         u16 seq_next;
@@ -254,9 +272,15 @@ struct rxtid {
         struct sk_buff_head q;
 
         /*
-         * FIXME: No clue what this should protect. Apparently it should
-         * protect some of the fields above but they are also accessed
-         * without taking the lock.
+         * lock mainly protects seq_next and hold_q. Movement of seq_next
+         * needs to be protected between aggr_timeout() and
+         * aggr_process_recv_frm(). hold_q will be holding the pending
+         * reorder frames and it's access should also be protected.
+         * Some of the other fields like hold_q_sz, win_sz and aggr are
+         * initialized/reset when receiving addba/delba req, also while
+         * deleting aggr state all the pending buffers are flushed before
+         * resetting these fields, so there should not be any race in accessing
+         * these fields.
          */
         spinlock_t lock;
 };
@@ -541,7 +565,7 @@ struct ath6kl_vif {
         struct ath6kl_wep_key wep_key_list[WMI_MAX_KEY_INDEX + 1];
         struct ath6kl_key keys[WMI_MAX_KEY_INDEX + 1];
         struct aggr_info *aggr_cntxt;
-        struct ath6kl_htcap htcap;
+        struct ath6kl_htcap htcap[IEEE80211_NUM_BANDS];
 
         struct timer_list disconnect_timer;
         struct timer_list sched_scan_timer;
@@ -553,9 +577,6 @@ struct ath6kl_vif {
         u32 last_cancel_roc_id;
         u32 send_action_id;
         bool probe_req_report;
-        u16 next_chan;
-        enum nl80211_channel_type next_ch_type;
-        enum ieee80211_band next_ch_band;
         u16 assoc_bss_beacon_int;
         u16 listen_intvl_t;
         u16 bmiss_time_t;
@@ -687,6 +708,8 @@ struct ath6kl {
                 u32 testscript_addr;
                 enum wmi_phy_cap cap;
 
+                u32 flags;
+
                 struct ath6kl_hw_fw {
                         const char *dir;
                         const char *otp;
diff --git a/drivers/net/wireless/ath/ath6kl/htc_mbox.c b/drivers/net/wireless/ath/ath6kl/htc_mbox.c
index 2798624d3a9..cd0e1ba410d 100644
--- a/drivers/net/wireless/ath/ath6kl/htc_mbox.c
+++ b/drivers/net/wireless/ath/ath6kl/htc_mbox.c
@@ -1309,7 +1309,7 @@ static int ath6kl_htc_rx_packet(struct htc_target *target,
         }
 
         ath6kl_dbg(ATH6KL_DBG_HTC,
-                   "htc rx 0x%p hdr x%x len %d mbox 0x%x\n",
+                   "htc rx 0x%p hdr 0x%x len %d mbox 0x%x\n",
                    packet, packet->info.rx.exp_hdr,
                    padded_len, dev->ar->mbox_info.htc_addr);
 
diff --git a/drivers/net/wireless/ath/ath6kl/init.c b/drivers/net/wireless/ath/ath6kl/init.c
index 7eb0515f458..f90b5db741c 100644
--- a/drivers/net/wireless/ath/ath6kl/init.c
+++ b/drivers/net/wireless/ath/ath6kl/init.c
@@ -42,6 +42,7 @@ static const struct ath6kl_hw hw_list[] = {
                 .reserved_ram_size              = 6912,
                 .refclk_hz                      = 26000000,
                 .uarttx_pin                     = 8,
+                .flags                          = 0,
 
                 /* hw2.0 needs override address hardcoded */
                 .app_start_override_addr        = 0x944C00,
@@ -67,6 +68,7 @@ static const struct ath6kl_hw hw_list[] = {
                 .refclk_hz                      = 26000000,
                 .uarttx_pin                     = 8,
                 .testscript_addr                = 0x57ef74,
+                .flags                          = 0,
 
                 .fw = {
                         .dir            = AR6003_HW_2_1_1_FW_DIR,
@@ -91,6 +93,7 @@ static const struct ath6kl_hw hw_list[] = {
                 .board_addr                     = 0x433900,
                 .refclk_hz                      = 26000000,
                 .uarttx_pin                     = 11,
+                .flags                          = ATH6KL_HW_FLAG_64BIT_RATES,
 
                 .fw = {
                         .dir            = AR6004_HW_1_0_FW_DIR,
@@ -110,6 +113,7 @@ static const struct ath6kl_hw hw_list[] = {
                 .board_addr                     = 0x43d400,
                 .refclk_hz                      = 40000000,
                 .uarttx_pin                     = 11,
+                .flags                          = ATH6KL_HW_FLAG_64BIT_RATES,
 
                 .fw = {
                         .dir            = AR6004_HW_1_1_FW_DIR,
@@ -129,6 +133,7 @@ static const struct ath6kl_hw hw_list[] = {
                 .board_addr                     = 0x435c00,
                 .refclk_hz                      = 40000000,
                 .uarttx_pin                     = 11,
+                .flags                          = ATH6KL_HW_FLAG_64BIT_RATES,
 
                 .fw = {
                         .dir            = AR6004_HW_1_2_FW_DIR,
@@ -938,6 +943,14 @@ static int ath6kl_fetch_fw_apin(struct ath6kl *ar, const char *name)
                 }
 
                 switch (ie_id) {
+                case ATH6KL_FW_IE_FW_VERSION:
+                        strlcpy(ar->wiphy->fw_version, data,
+                                sizeof(ar->wiphy->fw_version));
+
+                        ath6kl_dbg(ATH6KL_DBG_BOOT,
+                                   "found fw version %s\n",
+                                    ar->wiphy->fw_version);
+                        break;
                 case ATH6KL_FW_IE_OTP_IMAGE:
                         ath6kl_dbg(ATH6KL_DBG_BOOT, "found otp image ie (%zd B)\n",
                                    ie_len);
@@ -991,9 +1004,6 @@ static int ath6kl_fetch_fw_apin(struct ath6kl *ar, const char *name)
                                    ar->hw.reserved_ram_size);
                         break;
                 case ATH6KL_FW_IE_CAPABILITIES:
-                        if (ie_len < DIV_ROUND_UP(ATH6KL_FW_CAPABILITY_MAX, 8))
-                                break;
-
                         ath6kl_dbg(ATH6KL_DBG_BOOT,
                                    "found firmware capabilities ie (%zd B)\n",
                                    ie_len);
@@ -1002,6 +1012,9 @@ static int ath6kl_fetch_fw_apin(struct ath6kl *ar, const char *name)
                                 index = i / 8;
                                 bit = i % 8;
 
+                                if (index == ie_len)
+                                        break;
+
                                 if (data[index] & (1 << bit))
                                         __set_bit(i, ar->fw_capabilities);
                         }
@@ -1392,6 +1405,12 @@ static int ath6kl_init_upload(struct ath6kl *ar)
             ar->version.target_ver == AR6003_HW_2_1_1_VERSION) {
                 ath6kl_err("temporary war to avoid sdio crc error\n");
 
+                param = 0x28;
+                address = GPIO_BASE_ADDRESS + GPIO_PIN9_ADDRESS;
+                status = ath6kl_bmi_reg_write(ar, address, param);
+                if (status)
+                        return status;
+
                 param = 0x20;
 
                 address = GPIO_BASE_ADDRESS + GPIO_PIN10_ADDRESS;
@@ -1659,6 +1678,9 @@ void ath6kl_cleanup_vif(struct ath6kl_vif *vif, bool wmi_ready)
                 cfg80211_scan_done(vif->scan_req, true);
                 vif->scan_req = NULL;
         }
+
+        /* need to clean up enhanced bmiss detection fw state */
+        ath6kl_cfg80211_sta_bmiss_enhance(vif, false);
 }
 
 void ath6kl_stop_txrx(struct ath6kl *ar)
diff --git a/drivers/net/wireless/ath/ath6kl/main.c b/drivers/net/wireless/ath/ath6kl/main.c
index e5524470529..c189e28e86a 100644
--- a/drivers/net/wireless/ath/ath6kl/main.c
+++ b/drivers/net/wireless/ath/ath6kl/main.c
@@ -554,20 +554,24 @@ void ath6kl_ready_event(void *devt, u8 *datap, u32 sw_ver, u32 abi_ver,
         struct ath6kl *ar = devt;
 
         memcpy(ar->mac_addr, datap, ETH_ALEN);
-        ath6kl_dbg(ATH6KL_DBG_TRC, "%s: mac addr = %pM\n",
-                   __func__, ar->mac_addr);
+
+        ath6kl_dbg(ATH6KL_DBG_BOOT,
+                   "ready event mac addr %pM sw_ver 0x%x abi_ver 0x%x cap 0x%x\n",
+                   ar->mac_addr, sw_ver, abi_ver, cap);
 
         ar->version.wlan_ver = sw_ver;
         ar->version.abi_ver = abi_ver;
         ar->hw.cap = cap;
 
-        snprintf(ar->wiphy->fw_version,
-                 sizeof(ar->wiphy->fw_version),
-                 "%u.%u.%u.%u",
-                 (ar->version.wlan_ver & 0xf0000000) >> 28,
-                 (ar->version.wlan_ver & 0x0f000000) >> 24,
-                 (ar->version.wlan_ver & 0x00ff0000) >> 16,
-                 (ar->version.wlan_ver & 0x0000ffff));
+        if (strlen(ar->wiphy->fw_version) == 0) {
+                snprintf(ar->wiphy->fw_version,
+                         sizeof(ar->wiphy->fw_version),
+                         "%u.%u.%u.%u",
+                         (ar->version.wlan_ver & 0xf0000000) >> 28,
+                         (ar->version.wlan_ver & 0x0f000000) >> 24,
+                         (ar->version.wlan_ver & 0x00ff0000) >> 16,
+                         (ar->version.wlan_ver & 0x0000ffff));
+        }
 
         /* indicate to the waiting thread that the ready event was received */
         set_bit(WMI_READY, &ar->flag);
@@ -598,7 +602,6 @@ static int ath6kl_commit_ch_switch(struct ath6kl_vif *vif, u16 channel)
 
         struct ath6kl *ar = vif->ar;
 
-        vif->next_chan = channel;
         vif->profile.ch = cpu_to_le16(channel);
 
         switch (vif->nw_type) {
@@ -1167,7 +1170,10 @@ static void ath6kl_set_multicast_list(struct net_device *ndev)
         else
                 clear_bit(NETDEV_MCAST_ALL_ON, &vif->flags);
 
-        mc_all_on = mc_all_on || (vif->ar->state == ATH6KL_STATE_ON);
+        if (test_bit(ATH6KL_FW_CAPABILITY_WOW_MULTICAST_FILTER,
+                     vif->ar->fw_capabilities)) {
+                mc_all_on = mc_all_on || (vif->ar->state == ATH6KL_STATE_ON);
+        }
 
         if (!(ndev->flags & IFF_MULTICAST)) {
                 mc_all_on = false;
diff --git a/drivers/net/wireless/ath/ath6kl/target.h b/drivers/net/wireless/ath/ath6kl/target.h
index 78e0ef4567a..a98c12ba70c 100644
--- a/drivers/net/wireless/ath/ath6kl/target.h
+++ b/drivers/net/wireless/ath/ath6kl/target.h
@@ -45,6 +45,7 @@
 #define LPO_CAL_ENABLE_S                20
 #define LPO_CAL_ENABLE                  0x00100000
 
+#define GPIO_PIN9_ADDRESS               0x0000004c
 #define GPIO_PIN10_ADDRESS              0x00000050
 #define GPIO_PIN11_ADDRESS              0x00000054
 #define GPIO_PIN12_ADDRESS              0x00000058
diff --git a/drivers/net/wireless/ath/ath6kl/txrx.c b/drivers/net/wireless/ath/ath6kl/txrx.c
index 67206aedea6..7dfa0fd86d7 100644
--- a/drivers/net/wireless/ath/ath6kl/txrx.c
+++ b/drivers/net/wireless/ath/ath6kl/txrx.c
@@ -1036,6 +1036,7 @@ static void aggr_deque_frms(struct aggr_info_conn *agg_conn, u8 tid,
         rxtid = &agg_conn->rx_tid[tid];
         stats = &agg_conn->stat[tid];
 
+        spin_lock_bh(&rxtid->lock);
         idx = AGGR_WIN_IDX(rxtid->seq_next, rxtid->hold_q_sz);
 
         /*
@@ -1054,8 +1055,6 @@ static void aggr_deque_frms(struct aggr_info_conn *agg_conn, u8 tid,
         seq_end = seq_no ? seq_no : rxtid->seq_next;
         idx_end = AGGR_WIN_IDX(seq_end, rxtid->hold_q_sz);
 
-        spin_lock_bh(&rxtid->lock);
-
         do {
                 node = &rxtid->hold_q[idx];
                 if ((order == 1) && (!node->skb))
@@ -1127,11 +1126,13 @@ static bool aggr_process_recv_frm(struct aggr_info_conn *agg_conn, u8 tid,
                     ((end > extended_end) && (cur > extended_end) &&
                      (cur < end))) {
                         aggr_deque_frms(agg_conn, tid, 0, 0);
+                        spin_lock_bh(&rxtid->lock);
                         if (cur >= rxtid->hold_q_sz - 1)
                                 rxtid->seq_next = cur - (rxtid->hold_q_sz - 1);
                         else
                                 rxtid->seq_next = ATH6KL_MAX_SEQ_NO -
                                                   (rxtid->hold_q_sz - 2 - cur);
+                        spin_unlock_bh(&rxtid->lock);
                 } else {
                         /*
                          * Dequeue only those frames that are outside the
@@ -1185,25 +1186,25 @@ static bool aggr_process_recv_frm(struct aggr_info_conn *agg_conn, u8 tid,
         aggr_deque_frms(agg_conn, tid, 0, 1);
 
         if (agg_conn->timer_scheduled)
-                rxtid->progress = true;
-        else
-                for (idx = 0 ; idx < rxtid->hold_q_sz; idx++) {
-                        if (rxtid->hold_q[idx].skb) {
-                                /*
-                                 * There is a frame in the queue and no
-                                 * timer so start a timer to ensure that
-                                 * the frame doesn't remain stuck
-                                 * forever.
-                                 */
-                                agg_conn->timer_scheduled = true;
-                                mod_timer(&agg_conn->timer,
-                                          (jiffies +
-                                           HZ * (AGGR_RX_TIMEOUT) / 1000));
-                                rxtid->progress = false;
-                                rxtid->timer_mon = true;
-                                break;
-                        }
+                return is_queued;
+
+        spin_lock_bh(&rxtid->lock);
+        for (idx = 0 ; idx < rxtid->hold_q_sz; idx++) {
+                if (rxtid->hold_q[idx].skb) {
+                        /*
+                         * There is a frame in the queue and no
+                         * timer so start a timer to ensure that
+                         * the frame doesn't remain stuck
+                         * forever.
+                         */
+                        agg_conn->timer_scheduled = true;
+                        mod_timer(&agg_conn->timer,
+                                  (jiffies + (HZ * AGGR_RX_TIMEOUT) / 1000));
+                        rxtid->timer_mon = true;
+                        break;
                 }
+        }
+        spin_unlock_bh(&rxtid->lock);
 
         return is_queued;
 }
@@ -1608,7 +1609,7 @@ static void aggr_timeout(unsigned long arg)
                 rxtid = &aggr_conn->rx_tid[i];
                 stats = &aggr_conn->stat[i];
 
-                if (!rxtid->aggr || !rxtid->timer_mon || rxtid->progress)
+                if (!rxtid->aggr || !rxtid->timer_mon)
                         continue;
 
                 stats->num_timeouts++;
@@ -1626,14 +1627,15 @@ static void aggr_timeout(unsigned long arg)
                 rxtid = &aggr_conn->rx_tid[i];
 
                 if (rxtid->aggr && rxtid->hold_q) {
+                        spin_lock_bh(&rxtid->lock);
                         for (j = 0; j < rxtid->hold_q_sz; j++) {
                                 if (rxtid->hold_q[j].skb) {
                                         aggr_conn->timer_scheduled = true;
                                         rxtid->timer_mon = true;
-                                        rxtid->progress = false;
                                         break;
                                 }
                         }
+                        spin_unlock_bh(&rxtid->lock);
 
                         if (j >= rxtid->hold_q_sz)
                                 rxtid->timer_mon = false;
@@ -1660,7 +1662,6 @@ static void aggr_delete_tid_state(struct aggr_info_conn *aggr_conn, u8 tid)
                 aggr_deque_frms(aggr_conn, tid, 0, 0);
 
         rxtid->aggr = false;
-        rxtid->progress = false;
         rxtid->timer_mon = false;
         rxtid->win_sz = 0;
         rxtid->seq_next = 0;
@@ -1739,7 +1740,6 @@ void aggr_conn_init(struct ath6kl_vif *vif, struct aggr_info *aggr_info,
         for (i = 0; i < NUM_OF_TIDS; i++) {
                 rxtid = &aggr_conn->rx_tid[i];
                 rxtid->aggr = false;
-                rxtid->progress = false;
                 rxtid->timer_mon = false;
                 skb_queue_head_init(&rxtid->q);
                 spin_lock_init(&rxtid->lock);
diff --git a/drivers/net/wireless/ath/ath6kl/wmi.c b/drivers/net/wireless/ath/ath6kl/wmi.c
index ee8ec2394c2..a6caa673e8a 100644
--- a/drivers/net/wireless/ath/ath6kl/wmi.c
+++ b/drivers/net/wireless/ath/ath6kl/wmi.c
@@ -743,7 +743,6 @@ int ath6kl_wmi_force_roam_cmd(struct wmi *wmi, const u8 *bssid)
                 return -ENOMEM;
 
         cmd = (struct roam_ctrl_cmd *) skb->data;
-        memset(cmd, 0, sizeof(*cmd));
 
         memcpy(cmd->info.bssid, bssid, ETH_ALEN);
         cmd->roam_ctrl = WMI_FORCE_ROAM;
@@ -753,6 +752,22 @@ int ath6kl_wmi_force_roam_cmd(struct wmi *wmi, const u8 *bssid)
                                    NO_SYNC_WMIFLAG);
 }
 
+int ath6kl_wmi_ap_set_dtim_cmd(struct wmi *wmi, u8 if_idx, u32 dtim_period)
+{
+        struct sk_buff *skb;
+        struct set_dtim_cmd *cmd;
+
+        skb = ath6kl_wmi_get_new_buf(sizeof(*cmd));
+        if (!skb)
+                return -ENOMEM;
+
+        cmd = (struct set_dtim_cmd *) skb->data;
+
+        cmd->dtim_period = cpu_to_le32(dtim_period);
+        return ath6kl_wmi_cmd_send(wmi, if_idx, skb,
+                                   WMI_AP_SET_DTIM_CMDID, NO_SYNC_WMIFLAG);
+}
+
 int ath6kl_wmi_set_roam_mode_cmd(struct wmi *wmi, enum wmi_roam_mode mode)
 {
         struct sk_buff *skb;
@@ -763,7 +778,6 @@ int ath6kl_wmi_set_roam_mode_cmd(struct wmi *wmi, enum wmi_roam_mode mode)
                 return -ENOMEM;
 
         cmd = (struct roam_ctrl_cmd *) skb->data;
-        memset(cmd, 0, sizeof(*cmd));
 
         cmd->info.roam_mode = mode;
         cmd->roam_ctrl = WMI_SET_ROAM_MODE;
@@ -1995,7 +2009,7 @@ int ath6kl_wmi_probedssid_cmd(struct wmi *wmi, u8 if_idx, u8 index, u8 flag,
         struct wmi_probed_ssid_cmd *cmd;
         int ret;
 
-        if (index > MAX_PROBED_SSID_INDEX)
+        if (index >= MAX_PROBED_SSIDS)
                 return -EINVAL;
 
         if (ssid_len > sizeof(cmd->ssid))
@@ -2599,6 +2613,115 @@ static void ath6kl_wmi_relinquish_implicit_pstream_credits(struct wmi *wmi)
         spin_unlock_bh(&wmi->lock);
 }
 
+static int ath6kl_set_bitrate_mask64(struct wmi *wmi, u8 if_idx,
+                                     const struct cfg80211_bitrate_mask *mask)
+{
+        struct sk_buff *skb;
+        int ret, mode, band;
+        u64 mcsrate, ratemask[IEEE80211_NUM_BANDS];
+        struct wmi_set_tx_select_rates64_cmd *cmd;
+
+        memset(&ratemask, 0, sizeof(ratemask));
+        for (band = 0; band < IEEE80211_NUM_BANDS; band++) {
+                /* copy legacy rate mask */
+                ratemask[band] = mask->control[band].legacy;
+                if (band == IEEE80211_BAND_5GHZ)
+                        ratemask[band] =
+                                mask->control[band].legacy << 4;
+
+                /* copy mcs rate mask */
+                mcsrate = mask->control[band].mcs[1];
+                mcsrate <<= 8;
+                mcsrate |= mask->control[band].mcs[0];
+                ratemask[band] |= mcsrate << 12;
+                ratemask[band] |= mcsrate << 28;
+        }
+
+        ath6kl_dbg(ATH6KL_DBG_WMI,
+                   "Ratemask 64 bit: 2.4:%llx 5:%llx\n",
+                   ratemask[0], ratemask[1]);
+
+        skb = ath6kl_wmi_get_new_buf(sizeof(*cmd) * WMI_RATES_MODE_MAX);
+        if (!skb)
+                return -ENOMEM;
+
+        cmd = (struct wmi_set_tx_select_rates64_cmd *) skb->data;
+        for (mode = 0; mode < WMI_RATES_MODE_MAX; mode++) {
+                /* A mode operate in 5GHZ band */
+                if (mode == WMI_RATES_MODE_11A ||
+                    mode == WMI_RATES_MODE_11A_HT20 ||
+                    mode == WMI_RATES_MODE_11A_HT40)
+                        band = IEEE80211_BAND_5GHZ;
+                else
+                        band = IEEE80211_BAND_2GHZ;
+                cmd->ratemask[mode] = cpu_to_le64(ratemask[band]);
+        }
+
+        ret = ath6kl_wmi_cmd_send(wmi, if_idx, skb,
+                                  WMI_SET_TX_SELECT_RATES_CMDID,
+                                  NO_SYNC_WMIFLAG);
+        return ret;
+}
+
+static int ath6kl_set_bitrate_mask32(struct wmi *wmi, u8 if_idx,
+                                     const struct cfg80211_bitrate_mask *mask)
+{
+        struct sk_buff *skb;
+        int ret, mode, band;
+        u32 mcsrate, ratemask[IEEE80211_NUM_BANDS];
+        struct wmi_set_tx_select_rates32_cmd *cmd;
+
+        memset(&ratemask, 0, sizeof(ratemask));
+        for (band = 0; band < IEEE80211_NUM_BANDS; band++) {
+                /* copy legacy rate mask */
+                ratemask[band] = mask->control[band].legacy;
+                if (band == IEEE80211_BAND_5GHZ)
+                        ratemask[band] =
+                                mask->control[band].legacy << 4;
+
+                /* copy mcs rate mask */
+                mcsrate = mask->control[band].mcs[0];
+                ratemask[band] |= mcsrate << 12;
+                ratemask[band] |= mcsrate << 20;
+        }
+
+        ath6kl_dbg(ATH6KL_DBG_WMI,
+                   "Ratemask 32 bit: 2.4:%x 5:%x\n",
+                   ratemask[0], ratemask[1]);
+
+        skb = ath6kl_wmi_get_new_buf(sizeof(*cmd) * WMI_RATES_MODE_MAX);
+        if (!skb)
+                return -ENOMEM;
+
+        cmd = (struct wmi_set_tx_select_rates32_cmd *) skb->data;
+        for (mode = 0; mode < WMI_RATES_MODE_MAX; mode++) {
+                /* A mode operate in 5GHZ band */
+                if (mode == WMI_RATES_MODE_11A ||
+                    mode == WMI_RATES_MODE_11A_HT20 ||
+                    mode == WMI_RATES_MODE_11A_HT40)
+                        band = IEEE80211_BAND_5GHZ;
+                else
+                        band = IEEE80211_BAND_2GHZ;
+                cmd->ratemask[mode] = cpu_to_le32(ratemask[band]);
+        }
+
+        ret = ath6kl_wmi_cmd_send(wmi, if_idx, skb,
+                                  WMI_SET_TX_SELECT_RATES_CMDID,
+                                  NO_SYNC_WMIFLAG);
+        return ret;
+}
+
+int ath6kl_wmi_set_bitrate_mask(struct wmi *wmi, u8 if_idx,
+                                const struct cfg80211_bitrate_mask *mask)
+{
+        struct ath6kl *ar = wmi->parent_dev;
+
+        if (ar->hw.flags & ATH6KL_HW_FLAG_64BIT_RATES)
+                return ath6kl_set_bitrate_mask64(wmi, if_idx, mask);
+        else
+                return ath6kl_set_bitrate_mask32(wmi, if_idx, mask);
+}
+
 int ath6kl_wmi_set_host_sleep_mode_cmd(struct wmi *wmi, u8 if_idx,
                                        enum ath6kl_host_mode host_mode)
 {
@@ -2997,6 +3120,25 @@ int ath6kl_wmi_add_del_mcast_filter_cmd(struct wmi *wmi, u8 if_idx,
         return ret;
 }
 
+int ath6kl_wmi_sta_bmiss_enhance_cmd(struct wmi *wmi, u8 if_idx, bool enhance)
+{
+        struct sk_buff *skb;
+        struct wmi_sta_bmiss_enhance_cmd *cmd;
+        int ret;
+
+        skb = ath6kl_wmi_get_new_buf(sizeof(*cmd));
+        if (!skb)
+                return -ENOMEM;
+
+        cmd = (struct wmi_sta_bmiss_enhance_cmd *) skb->data;
+        cmd->enable = enhance ? 1 : 0;
+
+        ret = ath6kl_wmi_cmd_send(wmi, if_idx, skb,
+                                  WMI_STA_BMISS_ENHANCE_CMDID,
+                                  NO_SYNC_WMIFLAG);
+        return ret;
+}
+
 s32 ath6kl_wmi_get_rate(s8 rate_index)
 {
         if (rate_index == RATE_AUTO)
diff --git a/drivers/net/wireless/ath/ath6kl/wmi.h b/drivers/net/wireless/ath/ath6kl/wmi.h
index 9076bec3a2b..43339aca585 100644
--- a/drivers/net/wireless/ath/ath6kl/wmi.h
+++ b/drivers/net/wireless/ath/ath6kl/wmi.h
@@ -624,6 +624,10 @@ enum wmi_cmd_id {
         WMI_SEND_MGMT_CMDID,
         WMI_BEGIN_SCAN_CMDID,
 
+        WMI_SET_BLACK_LIST,
+        WMI_SET_MCASTRATE,
+
+        WMI_STA_BMISS_ENHANCE_CMDID,
 };
 
 enum wmi_mgmt_frame_type {
@@ -960,6 +964,9 @@ enum wmi_bss_filter {
         /* beacons matching probed ssid */
         PROBED_SSID_FILTER,
 
+        /* beacons matching matched ssid */
+        MATCHED_SSID_FILTER,
+
         /* marker only */
         LAST_BSS_FILTER,
 };
@@ -978,7 +985,7 @@ struct wmi_bss_filter_cmd {
 } __packed;
 
 /* WMI_SET_PROBED_SSID_CMDID */
-#define MAX_PROBED_SSID_INDEX   9
+#define MAX_PROBED_SSIDS   16
 
 enum wmi_ssid_flag {
         /* disables entry */
@@ -989,10 +996,13 @@ enum wmi_ssid_flag {
 
         /* probes for any ssid */
         ANY_SSID_FLAG = 0x02,
+
+        /* match for ssid */
+        MATCH_SSID_FLAG = 0x08,
 };
 
 struct wmi_probed_ssid_cmd {
-        /* 0 to MAX_PROBED_SSID_INDEX */
+        /* 0 to MAX_PROBED_SSIDS - 1 */
         u8 entry_index;
 
         /* see, enum wmi_ssid_flg */
@@ -1017,6 +1027,11 @@ struct wmi_bmiss_time_cmd {
         __le16 num_beacons;
 };
 
+/* WMI_STA_ENHANCE_BMISS_CMDID */
+struct wmi_sta_bmiss_enhance_cmd {
+        u8 enable;
+} __packed;
+
 /* WMI_SET_POWER_MODE_CMDID */
 enum wmi_power_mode {
         REC_POWER = 0x01,
@@ -1048,6 +1063,36 @@ struct wmi_power_params_cmd {
         __le16 ps_fail_event_policy;
 } __packed;
 
+/*
+ * Ratemask for below modes should be passed
+ * to WMI_SET_TX_SELECT_RATES_CMDID.
+ * AR6003 has 32 bit mask for each modes.
+ * First 12 bits for legacy rates, 13 to 20
+ * bits for HT 20 rates and 21 to 28 bits for
+ * HT 40 rates
+ */
+enum wmi_mode_phy {
+        WMI_RATES_MODE_11A = 0,
+        WMI_RATES_MODE_11G,
+        WMI_RATES_MODE_11B,
+        WMI_RATES_MODE_11GONLY,
+        WMI_RATES_MODE_11A_HT20,
+        WMI_RATES_MODE_11G_HT20,
+        WMI_RATES_MODE_11A_HT40,
+        WMI_RATES_MODE_11G_HT40,
+        WMI_RATES_MODE_MAX
+};
+
+/* WMI_SET_TX_SELECT_RATES_CMDID */
+struct wmi_set_tx_select_rates32_cmd {
+        __le32 ratemask[WMI_RATES_MODE_MAX];
+} __packed;
+
+/* WMI_SET_TX_SELECT_RATES_CMDID */
+struct wmi_set_tx_select_rates64_cmd {
+        __le64 ratemask[WMI_RATES_MODE_MAX];
+} __packed;
+
 /* WMI_SET_DISC_TIMEOUT_CMDID */
 struct wmi_disc_timeout_cmd {
         /* seconds */
@@ -1572,6 +1617,10 @@ struct roam_ctrl_cmd {
         u8 roam_ctrl;
 } __packed;
 
+struct set_dtim_cmd {
+        __le32 dtim_period;
+} __packed;
+
 /* BSS INFO HDR version 2.0 */
 struct wmi_bss_info_hdr2 {
         __le16 ch; /* frequency in MHz */
@@ -2532,6 +2581,8 @@ int ath6kl_wmi_set_ip_cmd(struct wmi *wmi, u8 if_idx,
                           __be32 ips0, __be32 ips1);
 int ath6kl_wmi_set_host_sleep_mode_cmd(struct wmi *wmi, u8 if_idx,
                                        enum ath6kl_host_mode host_mode);
+int ath6kl_wmi_set_bitrate_mask(struct wmi *wmi, u8 if_idx,
+                                const struct cfg80211_bitrate_mask *mask);
 int ath6kl_wmi_set_wow_mode_cmd(struct wmi *wmi, u8 if_idx,
                                 enum ath6kl_wow_mode wow_mode,
                                 u32 filter, u16 host_req_delay);
@@ -2542,11 +2593,14 @@ int ath6kl_wmi_add_wow_pattern_cmd(struct wmi *wmi, u8 if_idx,
 int ath6kl_wmi_del_wow_pattern_cmd(struct wmi *wmi, u8 if_idx,
                                    u16 list_id, u16 filter_id);
 int ath6kl_wmi_set_roam_lrssi_cmd(struct wmi *wmi, u8 lrssi);
+int ath6kl_wmi_ap_set_dtim_cmd(struct wmi *wmi, u8 if_idx, u32 dtim_period);
 int ath6kl_wmi_force_roam_cmd(struct wmi *wmi, const u8 *bssid);
 int ath6kl_wmi_set_roam_mode_cmd(struct wmi *wmi, enum wmi_roam_mode mode);
 int ath6kl_wmi_mcast_filter_cmd(struct wmi *wmi, u8 if_idx, bool mc_all_on);
 int ath6kl_wmi_add_del_mcast_filter_cmd(struct wmi *wmi, u8 if_idx,
                                         u8 *filter, bool add_filter);
+int ath6kl_wmi_sta_bmiss_enhance_cmd(struct wmi *wmi, u8 if_idx, bool enable);
+
 /* AP mode uAPSD */
 int ath6kl_wmi_ap_set_apsd(struct wmi *wmi, u8 if_idx, u8 enable);
 
diff --git a/drivers/net/wireless/ath/ath9k/Makefile b/drivers/net/wireless/ath/ath9k/Makefile
index 3f0b8472378..9c41232b0cd 100644
--- a/drivers/net/wireless/ath/ath9k/Makefile
+++ b/drivers/net/wireless/ath/ath9k/Makefile
@@ -3,7 +3,9 @@ ath9k-y +=	beacon.o \
                 init.o \
                 main.o \
                 recv.o \
-                xmit.o
+                xmit.o \
+                link.o \
+                antenna.o
 
 ath9k-$(CONFIG_ATH9K_BTCOEX_SUPPORT) += mci.o
 ath9k-$(CONFIG_ATH9K_RATE_CONTROL) += rc.o
diff --git a/drivers/net/wireless/ath/ath9k/ahb.c b/drivers/net/wireless/ath/ath9k/ahb.c
index 5e47ca6d16a..4a4e8a2b9d2 100644
--- a/drivers/net/wireless/ath/ath9k/ahb.c
+++ b/drivers/net/wireless/ath/ath9k/ahb.c
@@ -126,7 +126,7 @@ static int ath_ahb_probe(struct platform_device *pdev)
         sc->irq = irq;
 
         /* Will be cleared in ath9k_start() */
-        sc->sc_flags |= SC_OP_INVALID;
+        set_bit(SC_OP_INVALID, &sc->sc_flags);
 
         ret = request_irq(irq, ath_isr, IRQF_SHARED, "ath9k", sc);
         if (ret) {
diff --git a/drivers/net/wireless/ath/ath9k/ani.c b/drivers/net/wireless/ath/ath9k/ani.c
index b4c77f9d747..ff007f500fe 100644
--- a/drivers/net/wireless/ath/ath9k/ani.c
+++ b/drivers/net/wireless/ath/ath9k/ani.c
@@ -104,11 +104,6 @@ static const struct ani_cck_level_entry cck_level_table[] = {
 #define ATH9K_ANI_CCK_DEF_LEVEL \
         2 /* default level - matches the INI settings */
 
-static bool use_new_ani(struct ath_hw *ah)
-{
-        return AR_SREV_9300_20_OR_LATER(ah) || modparam_force_new_ani;
-}
-
 static void ath9k_hw_update_mibstats(struct ath_hw *ah,
                                      struct ath9k_mib_stats *stats)
 {
@@ -122,8 +117,6 @@ static void ath9k_hw_update_mibstats(struct ath_hw *ah,
 static void ath9k_ani_restart(struct ath_hw *ah)
 {
         struct ar5416AniState *aniState;
-        struct ath_common *common = ath9k_hw_common(ah);
-        u32 ofdm_base = 0, cck_base = 0;
 
         if (!DO_ANI(ah))
                 return;
@@ -131,18 +124,10 @@ static void ath9k_ani_restart(struct ath_hw *ah)
         aniState = &ah->curchan->ani;
         aniState->listenTime = 0;
 
-        if (!use_new_ani(ah)) {
-                ofdm_base = AR_PHY_COUNTMAX - ah->config.ofdm_trig_high;
-                cck_base = AR_PHY_COUNTMAX - ah->config.cck_trig_high;
-        }
-
-        ath_dbg(common, ANI, "Writing ofdmbase=%u   cckbase=%u\n",
-                ofdm_base, cck_base);
-
         ENABLE_REGWRITE_BUFFER(ah);
 
-        REG_WRITE(ah, AR_PHY_ERR_1, ofdm_base);
-        REG_WRITE(ah, AR_PHY_ERR_2, cck_base);
+        REG_WRITE(ah, AR_PHY_ERR_1, 0);
+        REG_WRITE(ah, AR_PHY_ERR_2, 0);
         REG_WRITE(ah, AR_PHY_ERR_MASK_1, AR_PHY_ERR_OFDM_TIMING);
         REG_WRITE(ah, AR_PHY_ERR_MASK_2, AR_PHY_ERR_CCK_TIMING);
 
@@ -154,129 +139,23 @@ static void ath9k_ani_restart(struct ath_hw *ah)
         aniState->cckPhyErrCount = 0;
 }
 
-static void ath9k_hw_ani_ofdm_err_trigger_old(struct ath_hw *ah)
-{
-        struct ieee80211_conf *conf = &ath9k_hw_common(ah)->hw->conf;
-        struct ar5416AniState *aniState;
-        int32_t rssi;
-
-        aniState = &ah->curchan->ani;
-
-        if (aniState->noiseImmunityLevel < HAL_NOISE_IMMUNE_MAX) {
-                if (ath9k_hw_ani_control(ah, ATH9K_ANI_NOISE_IMMUNITY_LEVEL,
-                                         aniState->noiseImmunityLevel + 1)) {
-                        return;
-                }
-        }
-
-        if (aniState->spurImmunityLevel < HAL_SPUR_IMMUNE_MAX) {
-                if (ath9k_hw_ani_control(ah, ATH9K_ANI_SPUR_IMMUNITY_LEVEL,
-                                         aniState->spurImmunityLevel + 1)) {
-                        return;
-                }
-        }
-
-        if (ah->opmode == NL80211_IFTYPE_AP) {
-                if (aniState->firstepLevel < HAL_FIRST_STEP_MAX) {
-                        ath9k_hw_ani_control(ah, ATH9K_ANI_FIRSTEP_LEVEL,
-                                             aniState->firstepLevel + 1);
-                }
-                return;
-        }
-        rssi = BEACON_RSSI(ah);
-        if (rssi > aniState->rssiThrHigh) {
-                if (!aniState->ofdmWeakSigDetectOff) {
-                        if (ath9k_hw_ani_control(ah,
-                                         ATH9K_ANI_OFDM_WEAK_SIGNAL_DETECTION,
-                                         false)) {
-                                ath9k_hw_ani_control(ah,
-                                        ATH9K_ANI_SPUR_IMMUNITY_LEVEL, 0);
-                                return;
-                        }
-                }
-                if (aniState->firstepLevel < HAL_FIRST_STEP_MAX) {
-                        ath9k_hw_ani_control(ah, ATH9K_ANI_FIRSTEP_LEVEL,
-                                             aniState->firstepLevel + 1);
-                        return;
-                }
-        } else if (rssi > aniState->rssiThrLow) {
-                if (aniState->ofdmWeakSigDetectOff)
-                        ath9k_hw_ani_control(ah,
-                                     ATH9K_ANI_OFDM_WEAK_SIGNAL_DETECTION,
-                                     true);
-                if (aniState->firstepLevel < HAL_FIRST_STEP_MAX)
-                        ath9k_hw_ani_control(ah, ATH9K_ANI_FIRSTEP_LEVEL,
-                                             aniState->firstepLevel + 1);
-                return;
-        } else {
-                if ((conf->channel->band == IEEE80211_BAND_2GHZ) &&
-                    !conf_is_ht(conf)) {
-                        if (!aniState->ofdmWeakSigDetectOff)
-                                ath9k_hw_ani_control(ah,
-                                     ATH9K_ANI_OFDM_WEAK_SIGNAL_DETECTION,
-                                     false);
-                        if (aniState->firstepLevel > 0)
-                                ath9k_hw_ani_control(ah,
-                                             ATH9K_ANI_FIRSTEP_LEVEL, 0);
-                        return;
-                }
-        }
-}
-
-static void ath9k_hw_ani_cck_err_trigger_old(struct ath_hw *ah)
-{
-        struct ieee80211_conf *conf = &ath9k_hw_common(ah)->hw->conf;
-        struct ar5416AniState *aniState;
-        int32_t rssi;
-
-        aniState = &ah->curchan->ani;
-        if (aniState->noiseImmunityLevel < HAL_NOISE_IMMUNE_MAX) {
-                if (ath9k_hw_ani_control(ah, ATH9K_ANI_NOISE_IMMUNITY_LEVEL,
-                                         aniState->noiseImmunityLevel + 1)) {
-                        return;
-                }
-        }
-        if (ah->opmode == NL80211_IFTYPE_AP) {
-                if (aniState->firstepLevel < HAL_FIRST_STEP_MAX) {
-                        ath9k_hw_ani_control(ah, ATH9K_ANI_FIRSTEP_LEVEL,
-                                             aniState->firstepLevel + 1);
-                }
-                return;
-        }
-        rssi = BEACON_RSSI(ah);
-        if (rssi > aniState->rssiThrLow) {
-                if (aniState->firstepLevel < HAL_FIRST_STEP_MAX)
-                        ath9k_hw_ani_control(ah, ATH9K_ANI_FIRSTEP_LEVEL,
-                                             aniState->firstepLevel + 1);
-        } else {
-                if ((conf->channel->band == IEEE80211_BAND_2GHZ) &&
-                    !conf_is_ht(conf)) {
-                        if (aniState->firstepLevel > 0)
-                                ath9k_hw_ani_control(ah,
-                                             ATH9K_ANI_FIRSTEP_LEVEL, 0);
-                }
-        }
-}
-
 /* Adjust the OFDM Noise Immunity Level */
-static void ath9k_hw_set_ofdm_nil(struct ath_hw *ah, u8 immunityLevel)
+static void ath9k_hw_set_ofdm_nil(struct ath_hw *ah, u8 immunityLevel,
+                                  bool scan)
 {
         struct ar5416AniState *aniState = &ah->curchan->ani;
         struct ath_common *common = ath9k_hw_common(ah);
         const struct ani_ofdm_level_entry *entry_ofdm;
         const struct ani_cck_level_entry *entry_cck;
-
-        aniState->noiseFloor = BEACON_RSSI(ah);
+        bool weak_sig;
 
         ath_dbg(common, ANI, "**** ofdmlevel %d=>%d, rssi=%d[lo=%d hi=%d]\n",
                 aniState->ofdmNoiseImmunityLevel,
-                immunityLevel, aniState->noiseFloor,
+                immunityLevel, BEACON_RSSI(ah),
                 aniState->rssiThrLow, aniState->rssiThrHigh);
 
-        if (aniState->update_ani)
-                aniState->ofdmNoiseImmunityLevel =
-                        (immunityLevel > ATH9K_ANI_OFDM_DEF_LEVEL) ?
-                        immunityLevel : ATH9K_ANI_OFDM_DEF_LEVEL;
+        if (!scan)
+                aniState->ofdmNoiseImmunityLevel = immunityLevel;
 
         entry_ofdm = &ofdm_level_table[aniState->ofdmNoiseImmunityLevel];
         entry_cck = &cck_level_table[aniState->cckNoiseImmunityLevel];
@@ -292,12 +171,22 @@ static void ath9k_hw_set_ofdm_nil(struct ath_hw *ah, u8 immunityLevel)
                                      ATH9K_ANI_FIRSTEP_LEVEL,
                                      entry_ofdm->fir_step_level);
 
-        if ((aniState->noiseFloor >= aniState->rssiThrHigh) &&
-            (!aniState->ofdmWeakSigDetectOff !=
-             entry_ofdm->ofdm_weak_signal_on)) {
+        weak_sig = entry_ofdm->ofdm_weak_signal_on;
+        if (ah->opmode == NL80211_IFTYPE_STATION &&
+            BEACON_RSSI(ah) <= aniState->rssiThrHigh)
+                weak_sig = true;
+
+        if (aniState->ofdmWeakSigDetect != weak_sig)
                         ath9k_hw_ani_control(ah,
                                 ATH9K_ANI_OFDM_WEAK_SIGNAL_DETECTION,
                                 entry_ofdm->ofdm_weak_signal_on);
+
+        if (aniState->ofdmNoiseImmunityLevel >= ATH9K_ANI_OFDM_DEF_LEVEL) {
+                ah->config.ofdm_trig_high = ATH9K_ANI_OFDM_TRIG_HIGH;
+                ah->config.ofdm_trig_low = ATH9K_ANI_OFDM_TRIG_LOW_ABOVE_INI;
+        } else {
+                ah->config.ofdm_trig_high = ATH9K_ANI_OFDM_TRIG_HIGH_BELOW_INI;
+                ah->config.ofdm_trig_low = ATH9K_ANI_OFDM_TRIG_LOW;
         }
 }
 
@@ -308,43 +197,35 @@ static void ath9k_hw_ani_ofdm_err_trigger(struct ath_hw *ah)
         if (!DO_ANI(ah))
                 return;
 
-        if (!use_new_ani(ah)) {
-                ath9k_hw_ani_ofdm_err_trigger_old(ah);
-                return;
-        }
-
         aniState = &ah->curchan->ani;
 
         if (aniState->ofdmNoiseImmunityLevel < ATH9K_ANI_OFDM_MAX_LEVEL)
-                ath9k_hw_set_ofdm_nil(ah, aniState->ofdmNoiseImmunityLevel + 1);
+                ath9k_hw_set_ofdm_nil(ah, aniState->ofdmNoiseImmunityLevel + 1, false);
 }
 
 /*
  * Set the ANI settings to match an CCK level.
  */
-static void ath9k_hw_set_cck_nil(struct ath_hw *ah, u_int8_t immunityLevel)
+static void ath9k_hw_set_cck_nil(struct ath_hw *ah, u_int8_t immunityLevel,
+                                 bool scan)
 {
         struct ar5416AniState *aniState = &ah->curchan->ani;
         struct ath_common *common = ath9k_hw_common(ah);
         const struct ani_ofdm_level_entry *entry_ofdm;
         const struct ani_cck_level_entry *entry_cck;
 
-        aniState->noiseFloor = BEACON_RSSI(ah);
         ath_dbg(common, ANI, "**** ccklevel %d=>%d, rssi=%d[lo=%d hi=%d]\n",
                 aniState->cckNoiseImmunityLevel, immunityLevel,
-                aniState->noiseFloor, aniState->rssiThrLow,
+                BEACON_RSSI(ah), aniState->rssiThrLow,
                 aniState->rssiThrHigh);
 
-        if ((ah->opmode == NL80211_IFTYPE_STATION ||
-             ah->opmode == NL80211_IFTYPE_ADHOC) &&
-            aniState->noiseFloor <= aniState->rssiThrLow &&
+        if (ah->opmode == NL80211_IFTYPE_STATION &&
+            BEACON_RSSI(ah) <= aniState->rssiThrLow &&
             immunityLevel > ATH9K_ANI_CCK_MAX_LEVEL_LOW_RSSI)
                 immunityLevel = ATH9K_ANI_CCK_MAX_LEVEL_LOW_RSSI;
 
-        if (aniState->update_ani)
-                aniState->cckNoiseImmunityLevel =
-                        (immunityLevel > ATH9K_ANI_CCK_DEF_LEVEL) ?
-                        immunityLevel : ATH9K_ANI_CCK_DEF_LEVEL;
+        if (!scan)
+                aniState->cckNoiseImmunityLevel = immunityLevel;
 
         entry_ofdm = &ofdm_level_table[aniState->ofdmNoiseImmunityLevel];
         entry_cck = &cck_level_table[aniState->cckNoiseImmunityLevel];
@@ -359,7 +240,7 @@ static void ath9k_hw_set_cck_nil(struct ath_hw *ah, u_int8_t immunityLevel)
         if (!AR_SREV_9300_20_OR_LATER(ah) || AR_SREV_9485(ah))
                 return;
 
-        if (aniState->mrcCCKOff == entry_cck->mrc_cck_on)
+        if (aniState->mrcCCK != entry_cck->mrc_cck_on)
                 ath9k_hw_ani_control(ah,
                                      ATH9K_ANI_MRC_CCK,
                                      entry_cck->mrc_cck_on);
@@ -372,68 +253,11 @@ static void ath9k_hw_ani_cck_err_trigger(struct ath_hw *ah)
         if (!DO_ANI(ah))
                 return;
 
-        if (!use_new_ani(ah)) {
-                ath9k_hw_ani_cck_err_trigger_old(ah);
-                return;
-        }
-
         aniState = &ah->curchan->ani;
 
         if (aniState->cckNoiseImmunityLevel < ATH9K_ANI_CCK_MAX_LEVEL)
-                ath9k_hw_set_cck_nil(ah, aniState->cckNoiseImmunityLevel + 1);
-}
-
-static void ath9k_hw_ani_lower_immunity_old(struct ath_hw *ah)
-{
-        struct ar5416AniState *aniState;
-        int32_t rssi;
-
-        aniState = &ah->curchan->ani;
-
-        if (ah->opmode == NL80211_IFTYPE_AP) {
-                if (aniState->firstepLevel > 0) {
-                        if (ath9k_hw_ani_control(ah, ATH9K_ANI_FIRSTEP_LEVEL,
-                                                 aniState->firstepLevel - 1))
-                                return;
-                }
-        } else {
-                rssi = BEACON_RSSI(ah);
-                if (rssi > aniState->rssiThrHigh) {
-                        /* XXX: Handle me */
-                } else if (rssi > aniState->rssiThrLow) {
-                        if (aniState->ofdmWeakSigDetectOff) {
-                                if (ath9k_hw_ani_control(ah,
-                                         ATH9K_ANI_OFDM_WEAK_SIGNAL_DETECTION,
-                                         true))
-                                        return;
-                        }
-                        if (aniState->firstepLevel > 0) {
-                                if (ath9k_hw_ani_control(ah,
-                                         ATH9K_ANI_FIRSTEP_LEVEL,
-                                         aniState->firstepLevel - 1))
-                                        return;
-                        }
-                } else {
-                        if (aniState->firstepLevel > 0) {
-                                if (ath9k_hw_ani_control(ah,
-                                         ATH9K_ANI_FIRSTEP_LEVEL,
-                                         aniState->firstepLevel - 1))
-                                        return;
-                        }
-                }
-        }
-
-        if (aniState->spurImmunityLevel > 0) {
-                if (ath9k_hw_ani_control(ah, ATH9K_ANI_SPUR_IMMUNITY_LEVEL,
-                                         aniState->spurImmunityLevel - 1))
-                        return;
-        }
-
-        if (aniState->noiseImmunityLevel > 0) {
-                ath9k_hw_ani_control(ah, ATH9K_ANI_NOISE_IMMUNITY_LEVEL,
-                                     aniState->noiseImmunityLevel - 1);
-                return;
-        }
+                ath9k_hw_set_cck_nil(ah, aniState->cckNoiseImmunityLevel + 1,
+                                     false);
 }
 
 /*
@@ -446,87 +270,18 @@ static void ath9k_hw_ani_lower_immunity(struct ath_hw *ah)
 
         aniState = &ah->curchan->ani;
 
-        if (!use_new_ani(ah)) {
-                ath9k_hw_ani_lower_immunity_old(ah);
-                return;
-        }
-
         /* lower OFDM noise immunity */
         if (aniState->ofdmNoiseImmunityLevel > 0 &&
             (aniState->ofdmsTurn || aniState->cckNoiseImmunityLevel == 0)) {
-                ath9k_hw_set_ofdm_nil(ah, aniState->ofdmNoiseImmunityLevel - 1);
+                ath9k_hw_set_ofdm_nil(ah, aniState->ofdmNoiseImmunityLevel - 1,
+                                      false);
                 return;
         }
 
         /* lower CCK noise immunity */
         if (aniState->cckNoiseImmunityLevel > 0)
-                ath9k_hw_set_cck_nil(ah, aniState->cckNoiseImmunityLevel - 1);
-}
-
-static void ath9k_ani_reset_old(struct ath_hw *ah, bool is_scanning)
-{
-        struct ar5416AniState *aniState;
-        struct ath9k_channel *chan = ah->curchan;
-        struct ath_common *common = ath9k_hw_common(ah);
-
-        if (!DO_ANI(ah))
-                return;
-
-        aniState = &ah->curchan->ani;
-
-        if (ah->opmode != NL80211_IFTYPE_STATION
-            && ah->opmode != NL80211_IFTYPE_ADHOC) {
-                ath_dbg(common, ANI, "Reset ANI state opmode %u\n", ah->opmode);
-                ah->stats.ast_ani_reset++;
-
-                if (ah->opmode == NL80211_IFTYPE_AP) {
-                        /*
-                         * ath9k_hw_ani_control() will only process items set on
-                         * ah->ani_function
-                         */
-                        if (IS_CHAN_2GHZ(chan))
-                                ah->ani_function = (ATH9K_ANI_SPUR_IMMUNITY_LEVEL |
-                                                    ATH9K_ANI_FIRSTEP_LEVEL);
-                        else
-                                ah->ani_function = 0;
-                }
-
-                ath9k_hw_ani_control(ah, ATH9K_ANI_NOISE_IMMUNITY_LEVEL, 0);
-                ath9k_hw_ani_control(ah, ATH9K_ANI_SPUR_IMMUNITY_LEVEL, 0);
-                ath9k_hw_ani_control(ah, ATH9K_ANI_FIRSTEP_LEVEL, 0);
-                ath9k_hw_ani_control(ah, ATH9K_ANI_OFDM_WEAK_SIGNAL_DETECTION,
-                                     !ATH9K_ANI_USE_OFDM_WEAK_SIG);
-                ath9k_hw_ani_control(ah, ATH9K_ANI_CCK_WEAK_SIGNAL_THR,
-                                     ATH9K_ANI_CCK_WEAK_SIG_THR);
-
-                ath9k_ani_restart(ah);
-                return;
-        }
-
-        if (aniState->noiseImmunityLevel != 0)
-                ath9k_hw_ani_control(ah, ATH9K_ANI_NOISE_IMMUNITY_LEVEL,
-                                     aniState->noiseImmunityLevel);
-        if (aniState->spurImmunityLevel != 0)
-                ath9k_hw_ani_control(ah, ATH9K_ANI_SPUR_IMMUNITY_LEVEL,
-                                     aniState->spurImmunityLevel);
-        if (aniState->ofdmWeakSigDetectOff)
-                ath9k_hw_ani_control(ah, ATH9K_ANI_OFDM_WEAK_SIGNAL_DETECTION,
-                                     !aniState->ofdmWeakSigDetectOff);
-        if (aniState->cckWeakSigThreshold)
-                ath9k_hw_ani_control(ah, ATH9K_ANI_CCK_WEAK_SIGNAL_THR,
-                                     aniState->cckWeakSigThreshold);
-        if (aniState->firstepLevel != 0)
-                ath9k_hw_ani_control(ah, ATH9K_ANI_FIRSTEP_LEVEL,
-                                     aniState->firstepLevel);
-
-        ath9k_ani_restart(ah);
-
-        ENABLE_REGWRITE_BUFFER(ah);
-
-        REG_WRITE(ah, AR_PHY_ERR_MASK_1, AR_PHY_ERR_OFDM_TIMING);
-        REG_WRITE(ah, AR_PHY_ERR_MASK_2, AR_PHY_ERR_CCK_TIMING);
-
-        REGWRITE_BUFFER_FLUSH(ah);
+                ath9k_hw_set_cck_nil(ah, aniState->cckNoiseImmunityLevel - 1,
+                                     false);
 }
 
 /*
@@ -539,13 +294,11 @@ void ath9k_ani_reset(struct ath_hw *ah, bool is_scanning)
         struct ar5416AniState *aniState = &ah->curchan->ani;
         struct ath9k_channel *chan = ah->curchan;
         struct ath_common *common = ath9k_hw_common(ah);
+        int ofdm_nil, cck_nil;
 
         if (!DO_ANI(ah))
                 return;
 
-        if (!use_new_ani(ah))
-                return ath9k_ani_reset_old(ah, is_scanning);
-
         BUG_ON(aniState == NULL);
         ah->stats.ast_ani_reset++;
 
@@ -563,6 +316,11 @@ void ath9k_ani_reset(struct ath_hw *ah, bool is_scanning)
         /* always allow mode (on/off) to be controlled */
         ah->ani_function |= ATH9K_ANI_MODE;
 
+        ofdm_nil = max_t(int, ATH9K_ANI_OFDM_DEF_LEVEL,
+                         aniState->ofdmNoiseImmunityLevel);
+        cck_nil = max_t(int, ATH9K_ANI_CCK_DEF_LEVEL,
+                         aniState->cckNoiseImmunityLevel);
+
         if (is_scanning ||
             (ah->opmode != NL80211_IFTYPE_STATION &&
              ah->opmode != NL80211_IFTYPE_ADHOC)) {
@@ -585,9 +343,8 @@ void ath9k_ani_reset(struct ath_hw *ah, bool is_scanning)
                                 aniState->ofdmNoiseImmunityLevel,
                                 aniState->cckNoiseImmunityLevel);
 
-                        aniState->update_ani = false;
-                        ath9k_hw_set_ofdm_nil(ah, ATH9K_ANI_OFDM_DEF_LEVEL);
-                        ath9k_hw_set_cck_nil(ah, ATH9K_ANI_CCK_DEF_LEVEL);
+                        ofdm_nil = ATH9K_ANI_OFDM_DEF_LEVEL;
+                        cck_nil = ATH9K_ANI_CCK_DEF_LEVEL;
                 }
         } else {
                 /*
@@ -601,13 +358,9 @@ void ath9k_ani_reset(struct ath_hw *ah, bool is_scanning)
                         is_scanning,
                         aniState->ofdmNoiseImmunityLevel,
                         aniState->cckNoiseImmunityLevel);
-
-                        aniState->update_ani = true;
-                        ath9k_hw_set_ofdm_nil(ah,
-                                              aniState->ofdmNoiseImmunityLevel);
-                        ath9k_hw_set_cck_nil(ah,
-                                             aniState->cckNoiseImmunityLevel);
         }
+        ath9k_hw_set_ofdm_nil(ah, ofdm_nil, is_scanning);
+        ath9k_hw_set_cck_nil(ah, cck_nil, is_scanning);
 
         /*
          * enable phy counters if hw supports or if not, enable phy
@@ -627,9 +380,6 @@ static bool ath9k_hw_ani_read_counters(struct ath_hw *ah)
 {
         struct ath_common *common = ath9k_hw_common(ah);
         struct ar5416AniState *aniState = &ah->curchan->ani;
-        u32 ofdm_base = 0;
-        u32 cck_base = 0;
-        u32 ofdmPhyErrCnt, cckPhyErrCnt;
         u32 phyCnt1, phyCnt2;
         int32_t listenTime;
 
@@ -642,11 +392,6 @@ static bool ath9k_hw_ani_read_counters(struct ath_hw *ah)
                 return false;
         }
 
-        if (!use_new_ani(ah)) {
-                ofdm_base = AR_PHY_COUNTMAX - ah->config.ofdm_trig_high;
-                cck_base = AR_PHY_COUNTMAX - ah->config.cck_trig_high;
-        }
-
         aniState->listenTime += listenTime;
 
         ath9k_hw_update_mibstats(ah, &ah->ah_mibStats);
@@ -654,35 +399,12 @@ static bool ath9k_hw_ani_read_counters(struct ath_hw *ah)
         phyCnt1 = REG_READ(ah, AR_PHY_ERR_1);
         phyCnt2 = REG_READ(ah, AR_PHY_ERR_2);
 
-        if (!use_new_ani(ah) && (phyCnt1 < ofdm_base || phyCnt2 < cck_base)) {
-                if (phyCnt1 < ofdm_base) {
-                        ath_dbg(common, ANI,
-                                "phyCnt1 0x%x, resetting counter value to 0x%x\n",
-                                phyCnt1, ofdm_base);
-                        REG_WRITE(ah, AR_PHY_ERR_1, ofdm_base);
-                        REG_WRITE(ah, AR_PHY_ERR_MASK_1,
-                                  AR_PHY_ERR_OFDM_TIMING);
-                }
-                if (phyCnt2 < cck_base) {
-                        ath_dbg(common, ANI,
-                                "phyCnt2 0x%x, resetting counter value to 0x%x\n",
-                                phyCnt2, cck_base);
-                        REG_WRITE(ah, AR_PHY_ERR_2, cck_base);
-                        REG_WRITE(ah, AR_PHY_ERR_MASK_2,
-                                  AR_PHY_ERR_CCK_TIMING);
-                }
-                return false;
-        }
+        ah->stats.ast_ani_ofdmerrs += phyCnt1 - aniState->ofdmPhyErrCount;
+        aniState->ofdmPhyErrCount = phyCnt1;
 
-        ofdmPhyErrCnt = phyCnt1 - ofdm_base;
-        ah->stats.ast_ani_ofdmerrs +=
-                ofdmPhyErrCnt - aniState->ofdmPhyErrCount;
-        aniState->ofdmPhyErrCount = ofdmPhyErrCnt;
+        ah->stats.ast_ani_cckerrs += phyCnt2 - aniState->cckPhyErrCount;
+        aniState->cckPhyErrCount = phyCnt2;
 
-        cckPhyErrCnt = phyCnt2 - cck_base;
-        ah->stats.ast_ani_cckerrs +=
-                cckPhyErrCnt - aniState->cckPhyErrCount;
-        aniState->cckPhyErrCount = cckPhyErrCnt;
         return true;
 }
 
@@ -716,21 +438,10 @@ void ath9k_hw_ani_monitor(struct ath_hw *ah, struct ath9k_channel *chan)
 
         if (aniState->listenTime > ah->aniperiod) {
                 if (cckPhyErrRate < ah->config.cck_trig_low &&
-                    ((ofdmPhyErrRate < ah->config.ofdm_trig_low &&
-                      aniState->ofdmNoiseImmunityLevel <
-                      ATH9K_ANI_OFDM_DEF_LEVEL) ||
-                     (ofdmPhyErrRate < ATH9K_ANI_OFDM_TRIG_LOW_ABOVE_INI &&
-                      aniState->ofdmNoiseImmunityLevel >=
-                      ATH9K_ANI_OFDM_DEF_LEVEL))) {
+                    ofdmPhyErrRate < ah->config.ofdm_trig_low) {
                         ath9k_hw_ani_lower_immunity(ah);
                         aniState->ofdmsTurn = !aniState->ofdmsTurn;
-                } else if ((ofdmPhyErrRate > ah->config.ofdm_trig_high &&
-                            aniState->ofdmNoiseImmunityLevel >=
-                            ATH9K_ANI_OFDM_DEF_LEVEL) ||
-                           (ofdmPhyErrRate >
-                            ATH9K_ANI_OFDM_TRIG_HIGH_BELOW_INI &&
-                            aniState->ofdmNoiseImmunityLevel <
-                            ATH9K_ANI_OFDM_DEF_LEVEL)) {
+                } else if (ofdmPhyErrRate > ah->config.ofdm_trig_high) {
                         ath9k_hw_ani_ofdm_err_trigger(ah);
                         aniState->ofdmsTurn = false;
                 } else if (cckPhyErrRate > ah->config.cck_trig_high) {
@@ -778,49 +489,6 @@ void ath9k_hw_disable_mib_counters(struct ath_hw *ah)
 }
 EXPORT_SYMBOL(ath9k_hw_disable_mib_counters);
 
-/*
- * Process a MIB interrupt.  We may potentially be invoked because
- * any of the MIB counters overflow/trigger so don't assume we're
- * here because a PHY error counter triggered.
- */
-void ath9k_hw_proc_mib_event(struct ath_hw *ah)
-{
-        u32 phyCnt1, phyCnt2;
-
-        /* Reset these counters regardless */
-        REG_WRITE(ah, AR_FILT_OFDM, 0);
-        REG_WRITE(ah, AR_FILT_CCK, 0);
-        if (!(REG_READ(ah, AR_SLP_MIB_CTRL) & AR_SLP_MIB_PENDING))
-                REG_WRITE(ah, AR_SLP_MIB_CTRL, AR_SLP_MIB_CLEAR);
-
-        /* Clear the mib counters and save them in the stats */
-        ath9k_hw_update_mibstats(ah, &ah->ah_mibStats);
-
-        if (!DO_ANI(ah)) {
-                /*
-                 * We must always clear the interrupt cause by
-                 * resetting the phy error regs.
-                 */
-                REG_WRITE(ah, AR_PHY_ERR_1, 0);
-                REG_WRITE(ah, AR_PHY_ERR_2, 0);
-                return;
-        }
-
-        /* NB: these are not reset-on-read */
-        phyCnt1 = REG_READ(ah, AR_PHY_ERR_1);
-        phyCnt2 = REG_READ(ah, AR_PHY_ERR_2);
-        if (((phyCnt1 & AR_MIBCNT_INTRMASK) == AR_MIBCNT_INTRMASK) ||
-            ((phyCnt2 & AR_MIBCNT_INTRMASK) == AR_MIBCNT_INTRMASK)) {
-
-                if (!use_new_ani(ah))
-                        ath9k_hw_ani_read_counters(ah);
-
-                /* NB: always restart to insure the h/w counters are reset */
-                ath9k_ani_restart(ah);
-        }
-}
-EXPORT_SYMBOL(ath9k_hw_proc_mib_event);
-
 void ath9k_hw_ani_setup(struct ath_hw *ah)
 {
         int i;
@@ -845,66 +513,37 @@ void ath9k_hw_ani_init(struct ath_hw *ah)
 
         ath_dbg(common, ANI, "Initialize ANI\n");
 
-        if (use_new_ani(ah)) {
-                ah->config.ofdm_trig_high = ATH9K_ANI_OFDM_TRIG_HIGH_NEW;
-                ah->config.ofdm_trig_low = ATH9K_ANI_OFDM_TRIG_LOW_NEW;
+        ah->config.ofdm_trig_high = ATH9K_ANI_OFDM_TRIG_HIGH;
+        ah->config.ofdm_trig_low = ATH9K_ANI_OFDM_TRIG_LOW;
 
-                ah->config.cck_trig_high = ATH9K_ANI_CCK_TRIG_HIGH_NEW;
-                ah->config.cck_trig_low = ATH9K_ANI_CCK_TRIG_LOW_NEW;
-        } else {
-                ah->config.ofdm_trig_high = ATH9K_ANI_OFDM_TRIG_HIGH_OLD;
-                ah->config.ofdm_trig_low = ATH9K_ANI_OFDM_TRIG_LOW_OLD;
-
-                ah->config.cck_trig_high = ATH9K_ANI_CCK_TRIG_HIGH_OLD;
-                ah->config.cck_trig_low = ATH9K_ANI_CCK_TRIG_LOW_OLD;
-        }
+        ah->config.cck_trig_high = ATH9K_ANI_CCK_TRIG_HIGH;
+        ah->config.cck_trig_low = ATH9K_ANI_CCK_TRIG_LOW;
 
         for (i = 0; i < ARRAY_SIZE(ah->channels); i++) {
                 struct ath9k_channel *chan = &ah->channels[i];
                 struct ar5416AniState *ani = &chan->ani;
 
-                if (use_new_ani(ah)) {
-                        ani->spurImmunityLevel =
-                                ATH9K_ANI_SPUR_IMMUNE_LVL_NEW;
+                ani->spurImmunityLevel = ATH9K_ANI_SPUR_IMMUNE_LVL;
 
-                        ani->firstepLevel = ATH9K_ANI_FIRSTEP_LVL_NEW;
+                ani->firstepLevel = ATH9K_ANI_FIRSTEP_LVL;
 
-                        if (AR_SREV_9300_20_OR_LATER(ah))
-                                ani->mrcCCKOff =
-                                        !ATH9K_ANI_ENABLE_MRC_CCK;
-                        else
-                                ani->mrcCCKOff = true;
-
-                        ani->ofdmsTurn = true;
-                } else {
-                        ani->spurImmunityLevel =
-                                ATH9K_ANI_SPUR_IMMUNE_LVL_OLD;
-                        ani->firstepLevel = ATH9K_ANI_FIRSTEP_LVL_OLD;
-
-                        ani->cckWeakSigThreshold =
-                                ATH9K_ANI_CCK_WEAK_SIG_THR;
-                }
+                ani->mrcCCK = AR_SREV_9300_20_OR_LATER(ah) ? true : false;
+
+                ani->ofdmsTurn = true;
 
                 ani->rssiThrHigh = ATH9K_ANI_RSSI_THR_HIGH;
                 ani->rssiThrLow = ATH9K_ANI_RSSI_THR_LOW;
-                ani->ofdmWeakSigDetectOff =
-                        !ATH9K_ANI_USE_OFDM_WEAK_SIG;
+                ani->ofdmWeakSigDetect = ATH9K_ANI_USE_OFDM_WEAK_SIG;
                 ani->cckNoiseImmunityLevel = ATH9K_ANI_CCK_DEF_LEVEL;
                 ani->ofdmNoiseImmunityLevel = ATH9K_ANI_OFDM_DEF_LEVEL;
-                ani->update_ani = false;
         }
 
         /*
          * since we expect some ongoing maintenance on the tables, let's sanity
          * check here default level should not modify INI setting.
          */
-        if (use_new_ani(ah)) {
-                ah->aniperiod = ATH9K_ANI_PERIOD_NEW;
-                ah->config.ani_poll_interval = ATH9K_ANI_POLLINTERVAL_NEW;
-        } else {
-                ah->aniperiod = ATH9K_ANI_PERIOD_OLD;
-                ah->config.ani_poll_interval = ATH9K_ANI_POLLINTERVAL_OLD;
-        }
+        ah->aniperiod = ATH9K_ANI_PERIOD;
+        ah->config.ani_poll_interval = ATH9K_ANI_POLLINTERVAL;
 
         if (ah->config.enable_ani)
                 ah->proc_phyerr |= HAL_PROCESS_ANI;
diff --git a/drivers/net/wireless/ath/ath9k/ani.h b/drivers/net/wireless/ath/ath9k/ani.h
index 72e2b874e17..1485bf5e351 100644
--- a/drivers/net/wireless/ath/ath9k/ani.h
+++ b/drivers/net/wireless/ath/ath9k/ani.h
@@ -24,42 +24,34 @@
 #define BEACON_RSSI(ahp) (ahp->stats.avgbrssi)
 
 /* units are errors per second */
-#define ATH9K_ANI_OFDM_TRIG_HIGH_OLD      500
-#define ATH9K_ANI_OFDM_TRIG_HIGH_NEW      3500
+#define ATH9K_ANI_OFDM_TRIG_HIGH          3500
 #define ATH9K_ANI_OFDM_TRIG_HIGH_BELOW_INI 1000
 
 /* units are errors per second */
-#define ATH9K_ANI_OFDM_TRIG_LOW_OLD       200
-#define ATH9K_ANI_OFDM_TRIG_LOW_NEW       400
+#define ATH9K_ANI_OFDM_TRIG_LOW           400
 #define ATH9K_ANI_OFDM_TRIG_LOW_ABOVE_INI 900
 
 /* units are errors per second */
-#define ATH9K_ANI_CCK_TRIG_HIGH_OLD       200
-#define ATH9K_ANI_CCK_TRIG_HIGH_NEW       600
+#define ATH9K_ANI_CCK_TRIG_HIGH           600
 
 /* units are errors per second */
-#define ATH9K_ANI_CCK_TRIG_LOW_OLD        100
-#define ATH9K_ANI_CCK_TRIG_LOW_NEW        300
+#define ATH9K_ANI_CCK_TRIG_LOW            300
 
 #define ATH9K_ANI_NOISE_IMMUNE_LVL        4
 #define ATH9K_ANI_USE_OFDM_WEAK_SIG       true
 #define ATH9K_ANI_CCK_WEAK_SIG_THR        false
 
-#define ATH9K_ANI_SPUR_IMMUNE_LVL_OLD     7
-#define ATH9K_ANI_SPUR_IMMUNE_LVL_NEW     3
+#define ATH9K_ANI_SPUR_IMMUNE_LVL         3
 
-#define ATH9K_ANI_FIRSTEP_LVL_OLD         0
-#define ATH9K_ANI_FIRSTEP_LVL_NEW         2
+#define ATH9K_ANI_FIRSTEP_LVL             2
 
 #define ATH9K_ANI_RSSI_THR_HIGH           40
 #define ATH9K_ANI_RSSI_THR_LOW            7
 
-#define ATH9K_ANI_PERIOD_OLD              100
-#define ATH9K_ANI_PERIOD_NEW              300
+#define ATH9K_ANI_PERIOD                  300
 
 /* in ms */
-#define ATH9K_ANI_POLLINTERVAL_OLD        100
-#define ATH9K_ANI_POLLINTERVAL_NEW        1000
+#define ATH9K_ANI_POLLINTERVAL            1000
 
 #define HAL_NOISE_IMMUNE_MAX              4
 #define HAL_SPUR_IMMUNE_MAX               7
@@ -70,8 +62,6 @@
 #define ATH9K_SIG_SPUR_IMM_SETTING_MIN    0
 #define ATH9K_SIG_SPUR_IMM_SETTING_MAX    22
 
-#define ATH9K_ANI_ENABLE_MRC_CCK          true
-
 /* values here are relative to the INI */
 
 enum ath9k_ani_cmd {
@@ -119,16 +109,14 @@ struct ar5416AniState {
         u8 ofdmNoiseImmunityLevel;
         u8 cckNoiseImmunityLevel;
         bool ofdmsTurn;
-        u8 mrcCCKOff;
+        u8 mrcCCK;
         u8 spurImmunityLevel;
         u8 firstepLevel;
-        u8 ofdmWeakSigDetectOff;
+        u8 ofdmWeakSigDetect;
         u8 cckWeakSigThreshold;
-        bool update_ani;
         u32 listenTime;
         int32_t rssiThrLow;
         int32_t rssiThrHigh;
-        u32 noiseFloor;
         u32 ofdmPhyErrCount;
         u32 cckPhyErrCount;
         int16_t pktRssi[2];
diff --git a/drivers/net/wireless/ath/ath9k/antenna.c b/drivers/net/wireless/ath/ath9k/antenna.c
new file mode 100644
index 00000000000..bbcfeb3b2a6
--- /dev/null
+++ b/drivers/net/wireless/ath/ath9k/antenna.c
@@ -0,0 +1,776 @@
+/*
+ * Copyright (c) 2012 Qualcomm Atheros, Inc.
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include "ath9k.h"
+
+static inline bool ath_is_alt_ant_ratio_better(int alt_ratio, int maxdelta,
+                                               int mindelta, int main_rssi_avg,
+                                               int alt_rssi_avg, int pkt_count)
+{
+        return (((alt_ratio >= ATH_ANT_DIV_COMB_ALT_ANT_RATIO2) &&
+                 (alt_rssi_avg > main_rssi_avg + maxdelta)) ||
+                (alt_rssi_avg > main_rssi_avg + mindelta)) && (pkt_count > 50);
+}
+
+static inline bool ath_ant_div_comb_alt_check(u8 div_group, int alt_ratio,
+                                              int curr_main_set, int curr_alt_set,
+                                              int alt_rssi_avg, int main_rssi_avg)
+{
+        bool result = false;
+        switch (div_group) {
+        case 0:
+                if (alt_ratio > ATH_ANT_DIV_COMB_ALT_ANT_RATIO)
+                        result = true;
+                break;
+        case 1:
+        case 2:
+                if ((((curr_main_set == ATH_ANT_DIV_COMB_LNA2) &&
+                      (curr_alt_set == ATH_ANT_DIV_COMB_LNA1) &&
+                      (alt_rssi_avg >= (main_rssi_avg - 5))) ||
+                     ((curr_main_set == ATH_ANT_DIV_COMB_LNA1) &&
+                      (curr_alt_set == ATH_ANT_DIV_COMB_LNA2) &&
+                      (alt_rssi_avg >= (main_rssi_avg - 2)))) &&
+                    (alt_rssi_avg >= 4))
+                        result = true;
+                else
+                        result = false;
+                break;
+        }
+
+        return result;
+}
+
+static void ath_lnaconf_alt_good_scan(struct ath_ant_comb *antcomb,
+                                      struct ath_hw_antcomb_conf ant_conf,
+                                      int main_rssi_avg)
+{
+        antcomb->quick_scan_cnt = 0;
+
+        if (ant_conf.main_lna_conf == ATH_ANT_DIV_COMB_LNA2)
+                antcomb->rssi_lna2 = main_rssi_avg;
+        else if (ant_conf.main_lna_conf == ATH_ANT_DIV_COMB_LNA1)
+                antcomb->rssi_lna1 = main_rssi_avg;
+
+        switch ((ant_conf.main_lna_conf << 4) | ant_conf.alt_lna_conf) {
+        case 0x10: /* LNA2 A-B */
+                antcomb->main_conf = ATH_ANT_DIV_COMB_LNA1_MINUS_LNA2;
+                antcomb->first_quick_scan_conf =
+                        ATH_ANT_DIV_COMB_LNA1_PLUS_LNA2;
+                antcomb->second_quick_scan_conf = ATH_ANT_DIV_COMB_LNA1;
+                break;
+        case 0x20: /* LNA1 A-B */
+                antcomb->main_conf = ATH_ANT_DIV_COMB_LNA1_MINUS_LNA2;
+                antcomb->first_quick_scan_conf =
+                        ATH_ANT_DIV_COMB_LNA1_PLUS_LNA2;
+                antcomb->second_quick_scan_conf = ATH_ANT_DIV_COMB_LNA2;
+                break;
+        case 0x21: /* LNA1 LNA2 */
+                antcomb->main_conf = ATH_ANT_DIV_COMB_LNA2;
+                antcomb->first_quick_scan_conf =
+                        ATH_ANT_DIV_COMB_LNA1_MINUS_LNA2;
+                antcomb->second_quick_scan_conf =
+                        ATH_ANT_DIV_COMB_LNA1_PLUS_LNA2;
+                break;
+        case 0x12: /* LNA2 LNA1 */
+                antcomb->main_conf = ATH_ANT_DIV_COMB_LNA1;
+                antcomb->first_quick_scan_conf =
+                        ATH_ANT_DIV_COMB_LNA1_MINUS_LNA2;
+                antcomb->second_quick_scan_conf =
+                        ATH_ANT_DIV_COMB_LNA1_PLUS_LNA2;
+                break;
+        case 0x13: /* LNA2 A+B */
+                antcomb->main_conf = ATH_ANT_DIV_COMB_LNA1_PLUS_LNA2;
+                antcomb->first_quick_scan_conf =
+                        ATH_ANT_DIV_COMB_LNA1_MINUS_LNA2;
+                antcomb->second_quick_scan_conf = ATH_ANT_DIV_COMB_LNA1;
+                break;
+        case 0x23: /* LNA1 A+B */
+                antcomb->main_conf = ATH_ANT_DIV_COMB_LNA1_PLUS_LNA2;
+                antcomb->first_quick_scan_conf =
+                        ATH_ANT_DIV_COMB_LNA1_MINUS_LNA2;
+                antcomb->second_quick_scan_conf = ATH_ANT_DIV_COMB_LNA2;
+                break;
+        default:
+                break;
+        }
+}
+
+static void ath_select_ant_div_from_quick_scan(struct ath_ant_comb *antcomb,
+                                       struct ath_hw_antcomb_conf *div_ant_conf,
+                                       int main_rssi_avg, int alt_rssi_avg,
+                                       int alt_ratio)
+{
+        /* alt_good */
+        switch (antcomb->quick_scan_cnt) {
+        case 0:
+                /* set alt to main, and alt to first conf */
+                div_ant_conf->main_lna_conf = antcomb->main_conf;
+                div_ant_conf->alt_lna_conf = antcomb->first_quick_scan_conf;
+                break;
+        case 1:
+                /* set alt to main, and alt to first conf */
+                div_ant_conf->main_lna_conf = antcomb->main_conf;
+                div_ant_conf->alt_lna_conf = antcomb->second_quick_scan_conf;
+                antcomb->rssi_first = main_rssi_avg;
+                antcomb->rssi_second = alt_rssi_avg;
+
+                if (antcomb->main_conf == ATH_ANT_DIV_COMB_LNA1) {
+                        /* main is LNA1 */
+                        if (ath_is_alt_ant_ratio_better(alt_ratio,
+                                                ATH_ANT_DIV_COMB_LNA1_DELTA_HI,
+                                                ATH_ANT_DIV_COMB_LNA1_DELTA_LOW,
+                                                main_rssi_avg, alt_rssi_avg,
+                                                antcomb->total_pkt_count))
+                                antcomb->first_ratio = true;
+                        else
+                                antcomb->first_ratio = false;
+                } else if (antcomb->main_conf == ATH_ANT_DIV_COMB_LNA2) {
+                        if (ath_is_alt_ant_ratio_better(alt_ratio,
+                                                ATH_ANT_DIV_COMB_LNA1_DELTA_MID,
+                                                ATH_ANT_DIV_COMB_LNA1_DELTA_LOW,
+                                                main_rssi_avg, alt_rssi_avg,
+                                                antcomb->total_pkt_count))
+                                antcomb->first_ratio = true;
+                        else
+                                antcomb->first_ratio = false;
+                } else {
+                        if ((((alt_ratio >= ATH_ANT_DIV_COMB_ALT_ANT_RATIO2) &&
+                              (alt_rssi_avg > main_rssi_avg +
+                               ATH_ANT_DIV_COMB_LNA1_DELTA_HI)) ||
+                             (alt_rssi_avg > main_rssi_avg)) &&
+                            (antcomb->total_pkt_count > 50))
+                                antcomb->first_ratio = true;
+                        else
+                                antcomb->first_ratio = false;
+                }
+                break;
+        case 2:
+                antcomb->alt_good = false;
+                antcomb->scan_not_start = false;
+                antcomb->scan = false;
+                antcomb->rssi_first = main_rssi_avg;
+                antcomb->rssi_third = alt_rssi_avg;
+
+                if (antcomb->second_quick_scan_conf == ATH_ANT_DIV_COMB_LNA1)
+                        antcomb->rssi_lna1 = alt_rssi_avg;
+                else if (antcomb->second_quick_scan_conf ==
+                         ATH_ANT_DIV_COMB_LNA2)
+                        antcomb->rssi_lna2 = alt_rssi_avg;
+                else if (antcomb->second_quick_scan_conf ==
+                         ATH_ANT_DIV_COMB_LNA1_PLUS_LNA2) {
+                        if (antcomb->main_conf == ATH_ANT_DIV_COMB_LNA2)
+                                antcomb->rssi_lna2 = main_rssi_avg;
+                        else if (antcomb->main_conf == ATH_ANT_DIV_COMB_LNA1)
+                                antcomb->rssi_lna1 = main_rssi_avg;
+                }
+
+                if (antcomb->rssi_lna2 > antcomb->rssi_lna1 +
+                    ATH_ANT_DIV_COMB_LNA1_LNA2_SWITCH_DELTA)
+                        div_ant_conf->main_lna_conf = ATH_ANT_DIV_COMB_LNA2;
+                else
+                        div_ant_conf->main_lna_conf = ATH_ANT_DIV_COMB_LNA1;
+
+                if (antcomb->main_conf == ATH_ANT_DIV_COMB_LNA1) {
+                        if (ath_is_alt_ant_ratio_better(alt_ratio,
+                                                ATH_ANT_DIV_COMB_LNA1_DELTA_HI,
+                                                ATH_ANT_DIV_COMB_LNA1_DELTA_LOW,
+                                                main_rssi_avg, alt_rssi_avg,
+                                                antcomb->total_pkt_count))
+                                antcomb->second_ratio = true;
+                        else
+                                antcomb->second_ratio = false;
+                } else if (antcomb->main_conf == ATH_ANT_DIV_COMB_LNA2) {
+                        if (ath_is_alt_ant_ratio_better(alt_ratio,
+                                                ATH_ANT_DIV_COMB_LNA1_DELTA_MID,
+                                                ATH_ANT_DIV_COMB_LNA1_DELTA_LOW,
+                                                main_rssi_avg, alt_rssi_avg,
+                                                antcomb->total_pkt_count))
+                                antcomb->second_ratio = true;
+                        else
+                                antcomb->second_ratio = false;
+                } else {
+                        if ((((alt_ratio >= ATH_ANT_DIV_COMB_ALT_ANT_RATIO2) &&
+                              (alt_rssi_avg > main_rssi_avg +
+                               ATH_ANT_DIV_COMB_LNA1_DELTA_HI)) ||
+                             (alt_rssi_avg > main_rssi_avg)) &&
+                            (antcomb->total_pkt_count > 50))
+                                antcomb->second_ratio = true;
+                        else
+                                antcomb->second_ratio = false;
+                }
+
+                /* set alt to the conf with maximun ratio */
+                if (antcomb->first_ratio && antcomb->second_ratio) {
+                        if (antcomb->rssi_second > antcomb->rssi_third) {
+                                /* first alt*/
+                                if ((antcomb->first_quick_scan_conf ==
+                                    ATH_ANT_DIV_COMB_LNA1) ||
+                                    (antcomb->first_quick_scan_conf ==
+                                    ATH_ANT_DIV_COMB_LNA2))
+                                        /* Set alt LNA1 or LNA2*/
+                                        if (div_ant_conf->main_lna_conf ==
+                                            ATH_ANT_DIV_COMB_LNA2)
+                                                div_ant_conf->alt_lna_conf =
+                                                        ATH_ANT_DIV_COMB_LNA1;
+                                        else
+                                                div_ant_conf->alt_lna_conf =
+                                                        ATH_ANT_DIV_COMB_LNA2;
+                                else
+                                        /* Set alt to A+B or A-B */
+                                        div_ant_conf->alt_lna_conf =
+                                                antcomb->first_quick_scan_conf;
+                        } else if ((antcomb->second_quick_scan_conf ==
+                                   ATH_ANT_DIV_COMB_LNA1) ||
+                                   (antcomb->second_quick_scan_conf ==
+                                   ATH_ANT_DIV_COMB_LNA2)) {
+                                /* Set alt LNA1 or LNA2 */
+                                if (div_ant_conf->main_lna_conf ==
+                                    ATH_ANT_DIV_COMB_LNA2)
+                                        div_ant_conf->alt_lna_conf =
+                                                ATH_ANT_DIV_COMB_LNA1;
+                                else
+                                        div_ant_conf->alt_lna_conf =
+                                                ATH_ANT_DIV_COMB_LNA2;
+                        } else {
+                                /* Set alt to A+B or A-B */
+                                div_ant_conf->alt_lna_conf =
+                                        antcomb->second_quick_scan_conf;
+                        }
+                } else if (antcomb->first_ratio) {
+                        /* first alt */
+                        if ((antcomb->first_quick_scan_conf ==
+                            ATH_ANT_DIV_COMB_LNA1) ||
+                            (antcomb->first_quick_scan_conf ==
+                            ATH_ANT_DIV_COMB_LNA2))
+                                        /* Set alt LNA1 or LNA2 */
+                                if (div_ant_conf->main_lna_conf ==
+                                    ATH_ANT_DIV_COMB_LNA2)
+                                        div_ant_conf->alt_lna_conf =
+                                                        ATH_ANT_DIV_COMB_LNA1;
+                                else
+                                        div_ant_conf->alt_lna_conf =
+                                                        ATH_ANT_DIV_COMB_LNA2;
+                        else
+                                /* Set alt to A+B or A-B */
+                                div_ant_conf->alt_lna_conf =
+                                                antcomb->first_quick_scan_conf;
+                } else if (antcomb->second_ratio) {
+                                /* second alt */
+                        if ((antcomb->second_quick_scan_conf ==
+                            ATH_ANT_DIV_COMB_LNA1) ||
+                            (antcomb->second_quick_scan_conf ==
+                            ATH_ANT_DIV_COMB_LNA2))
+                                /* Set alt LNA1 or LNA2 */
+                                if (div_ant_conf->main_lna_conf ==
+                                    ATH_ANT_DIV_COMB_LNA2)
+                                        div_ant_conf->alt_lna_conf =
+                                                ATH_ANT_DIV_COMB_LNA1;
+                                else
+                                        div_ant_conf->alt_lna_conf =
+                                                ATH_ANT_DIV_COMB_LNA2;
+                        else
+                                /* Set alt to A+B or A-B */
+                                div_ant_conf->alt_lna_conf =
+                                                antcomb->second_quick_scan_conf;
+                } else {
+                        /* main is largest */
+                        if ((antcomb->main_conf == ATH_ANT_DIV_COMB_LNA1) ||
+                            (antcomb->main_conf == ATH_ANT_DIV_COMB_LNA2))
+                                /* Set alt LNA1 or LNA2 */
+                                if (div_ant_conf->main_lna_conf ==
+                                    ATH_ANT_DIV_COMB_LNA2)
+                                        div_ant_conf->alt_lna_conf =
+                                                        ATH_ANT_DIV_COMB_LNA1;
+                                else
+                                        div_ant_conf->alt_lna_conf =
+                                                        ATH_ANT_DIV_COMB_LNA2;
+                        else
+                                /* Set alt to A+B or A-B */
+                                div_ant_conf->alt_lna_conf = antcomb->main_conf;
+                }
+                break;
+        default:
+                break;
+        }
+}
+
+static void ath_ant_div_conf_fast_divbias(struct ath_hw_antcomb_conf *ant_conf,
+                                          struct ath_ant_comb *antcomb,
+                                          int alt_ratio)
+{
+        if (ant_conf->div_group == 0) {
+                /* Adjust the fast_div_bias based on main and alt lna conf */
+                switch ((ant_conf->main_lna_conf << 4) |
+                                ant_conf->alt_lna_conf) {
+                case 0x01: /* A-B LNA2 */
+                        ant_conf->fast_div_bias = 0x3b;
+                        break;
+                case 0x02: /* A-B LNA1 */
+                        ant_conf->fast_div_bias = 0x3d;
+                        break;
+                case 0x03: /* A-B A+B */
+                        ant_conf->fast_div_bias = 0x1;
+                        break;
+                case 0x10: /* LNA2 A-B */
+                        ant_conf->fast_div_bias = 0x7;
+                        break;
+                case 0x12: /* LNA2 LNA1 */
+                        ant_conf->fast_div_bias = 0x2;
+                        break;
+                case 0x13: /* LNA2 A+B */
+                        ant_conf->fast_div_bias = 0x7;
+                        break;
+                case 0x20: /* LNA1 A-B */
+                        ant_conf->fast_div_bias = 0x6;
+                        break;
+                case 0x21: /* LNA1 LNA2 */
+                        ant_conf->fast_div_bias = 0x0;
+                        break;
+                case 0x23: /* LNA1 A+B */
+                        ant_conf->fast_div_bias = 0x6;
+                        break;
+                case 0x30: /* A+B A-B */
+                        ant_conf->fast_div_bias = 0x1;
+                        break;
+                case 0x31: /* A+B LNA2 */
+                        ant_conf->fast_div_bias = 0x3b;
+                        break;
+                case 0x32: /* A+B LNA1 */
+                        ant_conf->fast_div_bias = 0x3d;
+                        break;
+                default:
+                        break;
+                }
+        } else if (ant_conf->div_group == 1) {
+                /* Adjust the fast_div_bias based on main and alt_lna_conf */
+                switch ((ant_conf->main_lna_conf << 4) |
+                        ant_conf->alt_lna_conf) {
+                case 0x01: /* A-B LNA2 */
+                        ant_conf->fast_div_bias = 0x1;
+                        ant_conf->main_gaintb = 0;
+                        ant_conf->alt_gaintb = 0;
+                        break;
+                case 0x02: /* A-B LNA1 */
+                        ant_conf->fast_div_bias = 0x1;
+                        ant_conf->main_gaintb = 0;
+                        ant_conf->alt_gaintb = 0;
+                        break;
+                case 0x03: /* A-B A+B */
+                        ant_conf->fast_div_bias = 0x1;
+                        ant_conf->main_gaintb = 0;
+                        ant_conf->alt_gaintb = 0;
+                        break;
+                case 0x10: /* LNA2 A-B */
+                        if (!(antcomb->scan) &&
+                            (alt_ratio > ATH_ANT_DIV_COMB_ALT_ANT_RATIO))
+                                ant_conf->fast_div_bias = 0x3f;
+                        else
+                                ant_conf->fast_div_bias = 0x1;
+                        ant_conf->main_gaintb = 0;
+                        ant_conf->alt_gaintb = 0;
+                        break;
+                case 0x12: /* LNA2 LNA1 */
+                        ant_conf->fast_div_bias = 0x1;
+                        ant_conf->main_gaintb = 0;
+                        ant_conf->alt_gaintb = 0;
+                        break;
+                case 0x13: /* LNA2 A+B */
+                        if (!(antcomb->scan) &&
+                            (alt_ratio > ATH_ANT_DIV_COMB_ALT_ANT_RATIO))
+                                ant_conf->fast_div_bias = 0x3f;
+                        else
+                                ant_conf->fast_div_bias = 0x1;
+                        ant_conf->main_gaintb = 0;
+                        ant_conf->alt_gaintb = 0;
+                        break;
+                case 0x20: /* LNA1 A-B */
+                        if (!(antcomb->scan) &&
+                            (alt_ratio > ATH_ANT_DIV_COMB_ALT_ANT_RATIO))
+                                ant_conf->fast_div_bias = 0x3f;
+                        else
+                                ant_conf->fast_div_bias = 0x1;
+                        ant_conf->main_gaintb = 0;
+                        ant_conf->alt_gaintb = 0;
+                        break;
+                case 0x21: /* LNA1 LNA2 */
+                        ant_conf->fast_div_bias = 0x1;
+                        ant_conf->main_gaintb = 0;
+                        ant_conf->alt_gaintb = 0;
+                        break;
+                case 0x23: /* LNA1 A+B */
+                        if (!(antcomb->scan) &&
+                            (alt_ratio > ATH_ANT_DIV_COMB_ALT_ANT_RATIO))
+                                ant_conf->fast_div_bias = 0x3f;
+                        else
+                                ant_conf->fast_div_bias = 0x1;
+                        ant_conf->main_gaintb = 0;
+                        ant_conf->alt_gaintb = 0;
+                        break;
+                case 0x30: /* A+B A-B */
+                        ant_conf->fast_div_bias = 0x1;
+                        ant_conf->main_gaintb = 0;
+                        ant_conf->alt_gaintb = 0;
+                        break;
+                case 0x31: /* A+B LNA2 */
+                        ant_conf->fast_div_bias = 0x1;
+                        ant_conf->main_gaintb = 0;
+                        ant_conf->alt_gaintb = 0;
+                        break;
+                case 0x32: /* A+B LNA1 */
+                        ant_conf->fast_div_bias = 0x1;
+                        ant_conf->main_gaintb = 0;
+                        ant_conf->alt_gaintb = 0;
+                        break;
+                default:
+                        break;
+                }
+        } else if (ant_conf->div_group == 2) {
+                /* Adjust the fast_div_bias based on main and alt_lna_conf */
+                switch ((ant_conf->main_lna_conf << 4) |
+                                ant_conf->alt_lna_conf) {
+                case 0x01: /* A-B LNA2 */
+                        ant_conf->fast_div_bias = 0x1;
+                        ant_conf->main_gaintb = 0;
+                        ant_conf->alt_gaintb = 0;
+                        break;
+                case 0x02: /* A-B LNA1 */
+                        ant_conf->fast_div_bias = 0x1;
+                        ant_conf->main_gaintb = 0;
+                        ant_conf->alt_gaintb = 0;
+                        break;
+                case 0x03: /* A-B A+B */
+                        ant_conf->fast_div_bias = 0x1;
+                        ant_conf->main_gaintb = 0;
+                        ant_conf->alt_gaintb = 0;
+                        break;
+                case 0x10: /* LNA2 A-B */
+                        if (!(antcomb->scan) &&
+                                (alt_ratio > ATH_ANT_DIV_COMB_ALT_ANT_RATIO))
+                                ant_conf->fast_div_bias = 0x1;
+                        else
+                                ant_conf->fast_div_bias = 0x2;
+                        ant_conf->main_gaintb = 0;
+                        ant_conf->alt_gaintb = 0;
+                        break;
+                case 0x12: /* LNA2 LNA1 */
+                        ant_conf->fast_div_bias = 0x1;
+                        ant_conf->main_gaintb = 0;
+                        ant_conf->alt_gaintb = 0;
+                        break;
+                case 0x13: /* LNA2 A+B */
+                        if (!(antcomb->scan) &&
+                                (alt_ratio > ATH_ANT_DIV_COMB_ALT_ANT_RATIO))
+                                ant_conf->fast_div_bias = 0x1;
+                        else
+                                ant_conf->fast_div_bias = 0x2;
+                        ant_conf->main_gaintb = 0;
+                        ant_conf->alt_gaintb = 0;
+                        break;
+                case 0x20: /* LNA1 A-B */
+                        if (!(antcomb->scan) &&
+                                (alt_ratio > ATH_ANT_DIV_COMB_ALT_ANT_RATIO))
+                                ant_conf->fast_div_bias = 0x1;
+                        else
+                                ant_conf->fast_div_bias = 0x2;
+                        ant_conf->main_gaintb = 0;
+                        ant_conf->alt_gaintb = 0;
+                        break;
+                case 0x21: /* LNA1 LNA2 */
+                        ant_conf->fast_div_bias = 0x1;
+                        ant_conf->main_gaintb = 0;
+                        ant_conf->alt_gaintb = 0;
+                        break;
+                case 0x23: /* LNA1 A+B */
+                        if (!(antcomb->scan) &&
+                                (alt_ratio > ATH_ANT_DIV_COMB_ALT_ANT_RATIO))
+                                ant_conf->fast_div_bias = 0x1;
+                        else
+                                ant_conf->fast_div_bias = 0x2;
+                        ant_conf->main_gaintb = 0;
+                        ant_conf->alt_gaintb = 0;
+                        break;
+                case 0x30: /* A+B A-B */
+                        ant_conf->fast_div_bias = 0x1;
+                        ant_conf->main_gaintb = 0;
+                        ant_conf->alt_gaintb = 0;
+                        break;
+                case 0x31: /* A+B LNA2 */
+                        ant_conf->fast_div_bias = 0x1;
+                        ant_conf->main_gaintb = 0;
+                        ant_conf->alt_gaintb = 0;
+                        break;
+                case 0x32: /* A+B LNA1 */
+                        ant_conf->fast_div_bias = 0x1;
+                        ant_conf->main_gaintb = 0;
+                        ant_conf->alt_gaintb = 0;
+                        break;
+                default:
+                        break;
+                }
+        }
+}
+
+void ath_ant_comb_scan(struct ath_softc *sc, struct ath_rx_status *rs)
+{
+        struct ath_hw_antcomb_conf div_ant_conf;
+        struct ath_ant_comb *antcomb = &sc->ant_comb;
+        int alt_ratio = 0, alt_rssi_avg = 0, main_rssi_avg = 0, curr_alt_set;
+        int curr_main_set;
+        int main_rssi = rs->rs_rssi_ctl0;
+        int alt_rssi = rs->rs_rssi_ctl1;
+        int rx_ant_conf,  main_ant_conf;
+        bool short_scan = false;
+
+        rx_ant_conf = (rs->rs_rssi_ctl2 >> ATH_ANT_RX_CURRENT_SHIFT) &
+                       ATH_ANT_RX_MASK;
+        main_ant_conf = (rs->rs_rssi_ctl2 >> ATH_ANT_RX_MAIN_SHIFT) &
+                         ATH_ANT_RX_MASK;
+
+        /* Record packet only when both main_rssi and  alt_rssi is positive */
+        if (main_rssi > 0 && alt_rssi > 0) {
+                antcomb->total_pkt_count++;
+                antcomb->main_total_rssi += main_rssi;
+                antcomb->alt_total_rssi  += alt_rssi;
+                if (main_ant_conf == rx_ant_conf)
+                        antcomb->main_recv_cnt++;
+                else
+                        antcomb->alt_recv_cnt++;
+        }
+
+        /* Short scan check */
+        if (antcomb->scan && antcomb->alt_good) {
+                if (time_after(jiffies, antcomb->scan_start_time +
+                    msecs_to_jiffies(ATH_ANT_DIV_COMB_SHORT_SCAN_INTR)))
+                        short_scan = true;
+                else
+                        if (antcomb->total_pkt_count ==
+                            ATH_ANT_DIV_COMB_SHORT_SCAN_PKTCOUNT) {
+                                alt_ratio = ((antcomb->alt_recv_cnt * 100) /
+                                            antcomb->total_pkt_count);
+                                if (alt_ratio < ATH_ANT_DIV_COMB_ALT_ANT_RATIO)
+                                        short_scan = true;
+                        }
+        }
+
+        if (((antcomb->total_pkt_count < ATH_ANT_DIV_COMB_MAX_PKTCOUNT) ||
+            rs->rs_moreaggr) && !short_scan)
+                return;
+
+        if (antcomb->total_pkt_count) {
+                alt_ratio = ((antcomb->alt_recv_cnt * 100) /
+                             antcomb->total_pkt_count);
+                main_rssi_avg = (antcomb->main_total_rssi /
+                                 antcomb->total_pkt_count);
+                alt_rssi_avg = (antcomb->alt_total_rssi /
+                                 antcomb->total_pkt_count);
+        }
+
+
+        ath9k_hw_antdiv_comb_conf_get(sc->sc_ah, &div_ant_conf);
+        curr_alt_set = div_ant_conf.alt_lna_conf;
+        curr_main_set = div_ant_conf.main_lna_conf;
+
+        antcomb->count++;
+
+        if (antcomb->count == ATH_ANT_DIV_COMB_MAX_COUNT) {
+                if (alt_ratio > ATH_ANT_DIV_COMB_ALT_ANT_RATIO) {
+                        ath_lnaconf_alt_good_scan(antcomb, div_ant_conf,
+                                                  main_rssi_avg);
+                        antcomb->alt_good = true;
+                } else {
+                        antcomb->alt_good = false;
+                }
+
+                antcomb->count = 0;
+                antcomb->scan = true;
+                antcomb->scan_not_start = true;
+        }
+
+        if (!antcomb->scan) {
+                if (ath_ant_div_comb_alt_check(div_ant_conf.div_group,
+                                        alt_ratio, curr_main_set, curr_alt_set,
+                                        alt_rssi_avg, main_rssi_avg)) {
+                        if (curr_alt_set == ATH_ANT_DIV_COMB_LNA2) {
+                                /* Switch main and alt LNA */
+                                div_ant_conf.main_lna_conf =
+                                                ATH_ANT_DIV_COMB_LNA2;
+                                div_ant_conf.alt_lna_conf  =
+                                                ATH_ANT_DIV_COMB_LNA1;
+                        } else if (curr_alt_set == ATH_ANT_DIV_COMB_LNA1) {
+                                div_ant_conf.main_lna_conf =
+                                                ATH_ANT_DIV_COMB_LNA1;
+                                div_ant_conf.alt_lna_conf  =
+                                                ATH_ANT_DIV_COMB_LNA2;
+                        }
+
+                        goto div_comb_done;
+                } else if ((curr_alt_set != ATH_ANT_DIV_COMB_LNA1) &&
+                           (curr_alt_set != ATH_ANT_DIV_COMB_LNA2)) {
+                        /* Set alt to another LNA */
+                        if (curr_main_set == ATH_ANT_DIV_COMB_LNA2)
+                                div_ant_conf.alt_lna_conf =
+                                                ATH_ANT_DIV_COMB_LNA1;
+                        else if (curr_main_set == ATH_ANT_DIV_COMB_LNA1)
+                                div_ant_conf.alt_lna_conf =
+                                                ATH_ANT_DIV_COMB_LNA2;
+
+                        goto div_comb_done;
+                }
+
+                if ((alt_rssi_avg < (main_rssi_avg +
+                                     div_ant_conf.lna1_lna2_delta)))
+                        goto div_comb_done;
+        }
+
+        if (!antcomb->scan_not_start) {
+                switch (curr_alt_set) {
+                case ATH_ANT_DIV_COMB_LNA2:
+                        antcomb->rssi_lna2 = alt_rssi_avg;
+                        antcomb->rssi_lna1 = main_rssi_avg;
+                        antcomb->scan = true;
+                        /* set to A+B */
+                        div_ant_conf.main_lna_conf =
+                                ATH_ANT_DIV_COMB_LNA1;
+                        div_ant_conf.alt_lna_conf  =
+                                ATH_ANT_DIV_COMB_LNA1_PLUS_LNA2;
+                        break;
+                case ATH_ANT_DIV_COMB_LNA1:
+                        antcomb->rssi_lna1 = alt_rssi_avg;
+                        antcomb->rssi_lna2 = main_rssi_avg;
+                        antcomb->scan = true;
+                        /* set to A+B */
+                        div_ant_conf.main_lna_conf = ATH_ANT_DIV_COMB_LNA2;
+                        div_ant_conf.alt_lna_conf  =
+                                ATH_ANT_DIV_COMB_LNA1_PLUS_LNA2;
+                        break;
+                case ATH_ANT_DIV_COMB_LNA1_PLUS_LNA2:
+                        antcomb->rssi_add = alt_rssi_avg;
+                        antcomb->scan = true;
+                        /* set to A-B */
+                        div_ant_conf.alt_lna_conf =
+                                ATH_ANT_DIV_COMB_LNA1_MINUS_LNA2;
+                        break;
+                case ATH_ANT_DIV_COMB_LNA1_MINUS_LNA2:
+                        antcomb->rssi_sub = alt_rssi_avg;
+                        antcomb->scan = false;
+                        if (antcomb->rssi_lna2 >
+                            (antcomb->rssi_lna1 +
+                            ATH_ANT_DIV_COMB_LNA1_LNA2_SWITCH_DELTA)) {
+                                /* use LNA2 as main LNA */
+                                if ((antcomb->rssi_add > antcomb->rssi_lna1) &&
+                                    (antcomb->rssi_add > antcomb->rssi_sub)) {
+                                        /* set to A+B */
+                                        div_ant_conf.main_lna_conf =
+                                                ATH_ANT_DIV_COMB_LNA2;
+                                        div_ant_conf.alt_lna_conf  =
+                                                ATH_ANT_DIV_COMB_LNA1_PLUS_LNA2;
+                                } else if (antcomb->rssi_sub >
+                                           antcomb->rssi_lna1) {
+                                        /* set to A-B */
+                                        div_ant_conf.main_lna_conf =
+                                                ATH_ANT_DIV_COMB_LNA2;
+                                        div_ant_conf.alt_lna_conf =
+                                                ATH_ANT_DIV_COMB_LNA1_MINUS_LNA2;
+                                } else {
+                                        /* set to LNA1 */
+                                        div_ant_conf.main_lna_conf =
+                                                ATH_ANT_DIV_COMB_LNA2;
+                                        div_ant_conf.alt_lna_conf =
+                                                ATH_ANT_DIV_COMB_LNA1;
+                                }
+                        } else {
+                                /* use LNA1 as main LNA */
+                                if ((antcomb->rssi_add > antcomb->rssi_lna2) &&
+                                    (antcomb->rssi_add > antcomb->rssi_sub)) {
+                                        /* set to A+B */
+                                        div_ant_conf.main_lna_conf =
+                                                ATH_ANT_DIV_COMB_LNA1;
+                                        div_ant_conf.alt_lna_conf  =
+                                                ATH_ANT_DIV_COMB_LNA1_PLUS_LNA2;
+                                } else if (antcomb->rssi_sub >
+                                           antcomb->rssi_lna1) {
+                                        /* set to A-B */
+                                        div_ant_conf.main_lna_conf =
+                                                ATH_ANT_DIV_COMB_LNA1;
+                                        div_ant_conf.alt_lna_conf =
+                                                ATH_ANT_DIV_COMB_LNA1_MINUS_LNA2;
+                                } else {
+                                        /* set to LNA2 */
+                                        div_ant_conf.main_lna_conf =
+                                                ATH_ANT_DIV_COMB_LNA1;
+                                        div_ant_conf.alt_lna_conf =
+                                                ATH_ANT_DIV_COMB_LNA2;
+                                }
+                        }
+                        break;
+                default:
+                        break;
+                }
+        } else {
+                if (!antcomb->alt_good) {
+                        antcomb->scan_not_start = false;
+                        /* Set alt to another LNA */
+                        if (curr_main_set == ATH_ANT_DIV_COMB_LNA2) {
+                                div_ant_conf.main_lna_conf =
+                                                ATH_ANT_DIV_COMB_LNA2;
+                                div_ant_conf.alt_lna_conf =
+                                                ATH_ANT_DIV_COMB_LNA1;
+                        } else if (curr_main_set == ATH_ANT_DIV_COMB_LNA1) {
+                                div_ant_conf.main_lna_conf =
+                                                ATH_ANT_DIV_COMB_LNA1;
+                                div_ant_conf.alt_lna_conf =
+                                                ATH_ANT_DIV_COMB_LNA2;
+                        }
+                        goto div_comb_done;
+                }
+        }
+
+        ath_select_ant_div_from_quick_scan(antcomb, &div_ant_conf,
+                                           main_rssi_avg, alt_rssi_avg,
+                                           alt_ratio);
+
+        antcomb->quick_scan_cnt++;
+
+div_comb_done:
+        ath_ant_div_conf_fast_divbias(&div_ant_conf, antcomb, alt_ratio);
+        ath9k_hw_antdiv_comb_conf_set(sc->sc_ah, &div_ant_conf);
+
+        antcomb->scan_start_time = jiffies;
+        antcomb->total_pkt_count = 0;
+        antcomb->main_total_rssi = 0;
+        antcomb->alt_total_rssi = 0;
+        antcomb->main_recv_cnt = 0;
+        antcomb->alt_recv_cnt = 0;
+}
+
+void ath_ant_comb_update(struct ath_softc *sc)
+{
+        struct ath_hw *ah = sc->sc_ah;
+        struct ath_hw_antcomb_conf div_ant_conf;
+        u8 lna_conf;
+
+        ath9k_hw_antdiv_comb_conf_get(ah, &div_ant_conf);
+
+        if (sc->ant_rx == 1)
+                lna_conf = ATH_ANT_DIV_COMB_LNA1;
+        else
+                lna_conf = ATH_ANT_DIV_COMB_LNA2;
+
+        div_ant_conf.main_lna_conf = lna_conf;
+        div_ant_conf.alt_lna_conf = lna_conf;
+
+        ath9k_hw_antdiv_comb_conf_set(ah, &div_ant_conf);
+}
diff --git a/drivers/net/wireless/ath/ath9k/ar5008_phy.c b/drivers/net/wireless/ath/ath9k/ar5008_phy.c
index c7492c6a251..874186bfda4 100644
--- a/drivers/net/wireless/ath/ath9k/ar5008_phy.c
+++ b/drivers/net/wireless/ath/ath9k/ar5008_phy.c
@@ -995,141 +995,6 @@ static u32 ar5008_hw_compute_pll_control(struct ath_hw *ah,
         return pll;
 }
 
-static bool ar5008_hw_ani_control_old(struct ath_hw *ah,
-                                      enum ath9k_ani_cmd cmd,
-                                      int param)
-{
-        struct ar5416AniState *aniState = &ah->curchan->ani;
-        struct ath_common *common = ath9k_hw_common(ah);
-
-        switch (cmd & ah->ani_function) {
-        case ATH9K_ANI_NOISE_IMMUNITY_LEVEL:{
-                u32 level = param;
-
-                if (level >= ARRAY_SIZE(ah->totalSizeDesired)) {
-                        ath_dbg(common, ANI, "level out of range (%u > %zu)\n",
-                                level, ARRAY_SIZE(ah->totalSizeDesired));
-                        return false;
-                }
-
-                REG_RMW_FIELD(ah, AR_PHY_DESIRED_SZ,
-                              AR_PHY_DESIRED_SZ_TOT_DES,
-                              ah->totalSizeDesired[level]);
-                REG_RMW_FIELD(ah, AR_PHY_AGC_CTL1,
-                              AR_PHY_AGC_CTL1_COARSE_LOW,
-                              ah->coarse_low[level]);
-                REG_RMW_FIELD(ah, AR_PHY_AGC_CTL1,
-                              AR_PHY_AGC_CTL1_COARSE_HIGH,
-                              ah->coarse_high[level]);
-                REG_RMW_FIELD(ah, AR_PHY_FIND_SIG,
-                              AR_PHY_FIND_SIG_FIRPWR,
-                              ah->firpwr[level]);
-
-                if (level > aniState->noiseImmunityLevel)
-                        ah->stats.ast_ani_niup++;
-                else if (level < aniState->noiseImmunityLevel)
-                        ah->stats.ast_ani_nidown++;
-                aniState->noiseImmunityLevel = level;
-                break;
-        }
-        case ATH9K_ANI_OFDM_WEAK_SIGNAL_DETECTION:{
-                u32 on = param ? 1 : 0;
-
-                if (on)
-                        REG_SET_BIT(ah, AR_PHY_SFCORR_LOW,
-                                    AR_PHY_SFCORR_LOW_USE_SELF_CORR_LOW);
-                else
-                        REG_CLR_BIT(ah, AR_PHY_SFCORR_LOW,
-                                    AR_PHY_SFCORR_LOW_USE_SELF_CORR_LOW);
-
-                if (!on != aniState->ofdmWeakSigDetectOff) {
-                        if (on)
-                                ah->stats.ast_ani_ofdmon++;
-                        else
-                                ah->stats.ast_ani_ofdmoff++;
-                        aniState->ofdmWeakSigDetectOff = !on;
-                }
-                break;
-        }
-        case ATH9K_ANI_CCK_WEAK_SIGNAL_THR:{
-                static const int weakSigThrCck[] = { 8, 6 };
-                u32 high = param ? 1 : 0;
-
-                REG_RMW_FIELD(ah, AR_PHY_CCK_DETECT,
-                              AR_PHY_CCK_DETECT_WEAK_SIG_THR_CCK,
-                              weakSigThrCck[high]);
-                if (high != aniState->cckWeakSigThreshold) {
-                        if (high)
-                                ah->stats.ast_ani_cckhigh++;
-                        else
-                                ah->stats.ast_ani_ccklow++;
-                        aniState->cckWeakSigThreshold = high;
-                }
-                break;
-        }
-        case ATH9K_ANI_FIRSTEP_LEVEL:{
-                static const int firstep[] = { 0, 4, 8 };
-                u32 level = param;
-
-                if (level >= ARRAY_SIZE(firstep)) {
-                        ath_dbg(common, ANI, "level out of range (%u > %zu)\n",
-                                level, ARRAY_SIZE(firstep));
-                        return false;
-                }
-                REG_RMW_FIELD(ah, AR_PHY_FIND_SIG,
-                              AR_PHY_FIND_SIG_FIRSTEP,
-                              firstep[level]);
-                if (level > aniState->firstepLevel)
-                        ah->stats.ast_ani_stepup++;
-                else if (level < aniState->firstepLevel)
-                        ah->stats.ast_ani_stepdown++;
-                aniState->firstepLevel = level;
-                break;
-        }
-        case ATH9K_ANI_SPUR_IMMUNITY_LEVEL:{
-                static const int cycpwrThr1[] = { 2, 4, 6, 8, 10, 12, 14, 16 };
-                u32 level = param;
-
-                if (level >= ARRAY_SIZE(cycpwrThr1)) {
-                        ath_dbg(common, ANI, "level out of range (%u > %zu)\n",
-                                level, ARRAY_SIZE(cycpwrThr1));
-                        return false;
-                }
-                REG_RMW_FIELD(ah, AR_PHY_TIMING5,
-                              AR_PHY_TIMING5_CYCPWR_THR1,
-                              cycpwrThr1[level]);
-                if (level > aniState->spurImmunityLevel)
-                        ah->stats.ast_ani_spurup++;
-                else if (level < aniState->spurImmunityLevel)
-                        ah->stats.ast_ani_spurdown++;
-                aniState->spurImmunityLevel = level;
-                break;
-        }
-        case ATH9K_ANI_PRESENT:
-                break;
-        default:
-                ath_dbg(common, ANI, "invalid cmd %u\n", cmd);
-                return false;
-        }
-
-        ath_dbg(common, ANI, "ANI parameters:\n");
-        ath_dbg(common, ANI,
-                "noiseImmunityLevel=%d, spurImmunityLevel=%d, ofdmWeakSigDetectOff=%d\n",
-                aniState->noiseImmunityLevel,
-                aniState->spurImmunityLevel,
-                !aniState->ofdmWeakSigDetectOff);
-        ath_dbg(common, ANI,
-                "cckWeakSigThreshold=%d, firstepLevel=%d, listenTime=%d\n",
-                aniState->cckWeakSigThreshold,
-                aniState->firstepLevel,
-                aniState->listenTime);
-        ath_dbg(common, ANI, "ofdmPhyErrCount=%d, cckPhyErrCount=%d\n\n",
-                aniState->ofdmPhyErrCount,
-                aniState->cckPhyErrCount);
-
-        return true;
-}
-
 static bool ar5008_hw_ani_control_new(struct ath_hw *ah,
                                       enum ath9k_ani_cmd cmd,
                                       int param)
@@ -1206,18 +1071,18 @@ static bool ar5008_hw_ani_control_new(struct ath_hw *ah,
                         REG_CLR_BIT(ah, AR_PHY_SFCORR_LOW,
                                     AR_PHY_SFCORR_LOW_USE_SELF_CORR_LOW);
 
-                if (!on != aniState->ofdmWeakSigDetectOff) {
+                if (on != aniState->ofdmWeakSigDetect) {
                         ath_dbg(common, ANI,
                                 "** ch %d: ofdm weak signal: %s=>%s\n",
                                 chan->channel,
-                                !aniState->ofdmWeakSigDetectOff ?
+                                aniState->ofdmWeakSigDetect ?
                                 "on" : "off",
                                 on ? "on" : "off");
                         if (on)
                                 ah->stats.ast_ani_ofdmon++;
                         else
                                 ah->stats.ast_ani_ofdmoff++;
-                        aniState->ofdmWeakSigDetectOff = !on;
+                        aniState->ofdmWeakSigDetect = on;
                 }
                 break;
         }
@@ -1236,7 +1101,7 @@ static bool ar5008_hw_ani_control_new(struct ath_hw *ah,
                  * from INI file & cap value
                  */
                 value = firstep_table[level] -
-                        firstep_table[ATH9K_ANI_FIRSTEP_LVL_NEW] +
+                        firstep_table[ATH9K_ANI_FIRSTEP_LVL] +
                         aniState->iniDef.firstep;
                 if (value < ATH9K_SIG_FIRSTEP_SETTING_MIN)
                         value = ATH9K_SIG_FIRSTEP_SETTING_MIN;
@@ -1251,7 +1116,7 @@ static bool ar5008_hw_ani_control_new(struct ath_hw *ah,
                  * from INI file & cap value
                  */
                 value2 = firstep_table[level] -
-                         firstep_table[ATH9K_ANI_FIRSTEP_LVL_NEW] +
+                         firstep_table[ATH9K_ANI_FIRSTEP_LVL] +
                          aniState->iniDef.firstepLow;
                 if (value2 < ATH9K_SIG_FIRSTEP_SETTING_MIN)
                         value2 = ATH9K_SIG_FIRSTEP_SETTING_MIN;
@@ -1267,7 +1132,7 @@ static bool ar5008_hw_ani_control_new(struct ath_hw *ah,
                                 chan->channel,
                                 aniState->firstepLevel,
                                 level,
-                                ATH9K_ANI_FIRSTEP_LVL_NEW,
+                                ATH9K_ANI_FIRSTEP_LVL,
                                 value,
                                 aniState->iniDef.firstep);
                         ath_dbg(common, ANI,
@@ -1275,7 +1140,7 @@ static bool ar5008_hw_ani_control_new(struct ath_hw *ah,
                                 chan->channel,
                                 aniState->firstepLevel,
                                 level,
-                                ATH9K_ANI_FIRSTEP_LVL_NEW,
+                                ATH9K_ANI_FIRSTEP_LVL,
                                 value2,
                                 aniState->iniDef.firstepLow);
                         if (level > aniState->firstepLevel)
@@ -1300,7 +1165,7 @@ static bool ar5008_hw_ani_control_new(struct ath_hw *ah,
                  * from INI file & cap value
                  */
                 value = cycpwrThr1_table[level] -
-                        cycpwrThr1_table[ATH9K_ANI_SPUR_IMMUNE_LVL_NEW] +
+                        cycpwrThr1_table[ATH9K_ANI_SPUR_IMMUNE_LVL] +
                         aniState->iniDef.cycpwrThr1;
                 if (value < ATH9K_SIG_SPUR_IMM_SETTING_MIN)
                         value = ATH9K_SIG_SPUR_IMM_SETTING_MIN;
@@ -1316,7 +1181,7 @@ static bool ar5008_hw_ani_control_new(struct ath_hw *ah,
                  * from INI file & cap value
                  */
                 value2 = cycpwrThr1_table[level] -
-                         cycpwrThr1_table[ATH9K_ANI_SPUR_IMMUNE_LVL_NEW] +
+                         cycpwrThr1_table[ATH9K_ANI_SPUR_IMMUNE_LVL] +
                          aniState->iniDef.cycpwrThr1Ext;
                 if (value2 < ATH9K_SIG_SPUR_IMM_SETTING_MIN)
                         value2 = ATH9K_SIG_SPUR_IMM_SETTING_MIN;
@@ -1331,7 +1196,7 @@ static bool ar5008_hw_ani_control_new(struct ath_hw *ah,
                                 chan->channel,
                                 aniState->spurImmunityLevel,
                                 level,
-                                ATH9K_ANI_SPUR_IMMUNE_LVL_NEW,
+                                ATH9K_ANI_SPUR_IMMUNE_LVL,
                                 value,
                                 aniState->iniDef.cycpwrThr1);
                         ath_dbg(common, ANI,
@@ -1339,7 +1204,7 @@ static bool ar5008_hw_ani_control_new(struct ath_hw *ah,
                                 chan->channel,
                                 aniState->spurImmunityLevel,
                                 level,
-                                ATH9K_ANI_SPUR_IMMUNE_LVL_NEW,
+                                ATH9K_ANI_SPUR_IMMUNE_LVL,
                                 value2,
                                 aniState->iniDef.cycpwrThr1Ext);
                         if (level > aniState->spurImmunityLevel)
@@ -1367,9 +1232,9 @@ static bool ar5008_hw_ani_control_new(struct ath_hw *ah,
         ath_dbg(common, ANI,
                 "ANI parameters: SI=%d, ofdmWS=%s FS=%d MRCcck=%s listenTime=%d ofdmErrs=%d cckErrs=%d\n",
                 aniState->spurImmunityLevel,
-                !aniState->ofdmWeakSigDetectOff ? "on" : "off",
+                aniState->ofdmWeakSigDetect ? "on" : "off",
                 aniState->firstepLevel,
-                !aniState->mrcCCKOff ? "on" : "off",
+                aniState->mrcCCK ? "on" : "off",
                 aniState->listenTime,
                 aniState->ofdmPhyErrCount,
                 aniState->cckPhyErrCount);
@@ -1454,10 +1319,10 @@ static void ar5008_hw_ani_cache_ini_regs(struct ath_hw *ah)
                                                AR_PHY_EXT_TIMING5_CYCPWR_THR1);
 
         /* these levels just got reset to defaults by the INI */
-        aniState->spurImmunityLevel = ATH9K_ANI_SPUR_IMMUNE_LVL_NEW;
-        aniState->firstepLevel = ATH9K_ANI_FIRSTEP_LVL_NEW;
-        aniState->ofdmWeakSigDetectOff = !ATH9K_ANI_USE_OFDM_WEAK_SIG;
-        aniState->mrcCCKOff = true; /* not available on pre AR9003 */
+        aniState->spurImmunityLevel = ATH9K_ANI_SPUR_IMMUNE_LVL;
+        aniState->firstepLevel = ATH9K_ANI_FIRSTEP_LVL;
+        aniState->ofdmWeakSigDetect = ATH9K_ANI_USE_OFDM_WEAK_SIG;
+        aniState->mrcCCK = false; /* not available on pre AR9003 */
 }
 
 static void ar5008_hw_set_nf_limits(struct ath_hw *ah)
@@ -1545,11 +1410,8 @@ void ar5008_hw_attach_phy_ops(struct ath_hw *ah)
         priv_ops->do_getnf = ar5008_hw_do_getnf;
         priv_ops->set_radar_params = ar5008_hw_set_radar_params;
 
-        if (modparam_force_new_ani) {
-                priv_ops->ani_control = ar5008_hw_ani_control_new;
-                priv_ops->ani_cache_ini_regs = ar5008_hw_ani_cache_ini_regs;
-        } else
-                priv_ops->ani_control = ar5008_hw_ani_control_old;
+        priv_ops->ani_control = ar5008_hw_ani_control_new;
+        priv_ops->ani_cache_ini_regs = ar5008_hw_ani_cache_ini_regs;
 
         if (AR_SREV_9100(ah) || AR_SREV_9160_10_OR_LATER(ah))
                 priv_ops->compute_pll_control = ar9160_hw_compute_pll_control;
diff --git a/drivers/net/wireless/ath/ath9k/ar9002_hw.c b/drivers/net/wireless/ath/ath9k/ar9002_hw.c
index d9a69fc470c..edf21ea4fe9 100644
--- a/drivers/net/wireless/ath/ath9k/ar9002_hw.c
+++ b/drivers/net/wireless/ath/ath9k/ar9002_hw.c
@@ -21,10 +21,6 @@
 #include "ar9002_initvals.h"
 #include "ar9002_phy.h"
 
-int modparam_force_new_ani;
-module_param_named(force_new_ani, modparam_force_new_ani, int, 0444);
-MODULE_PARM_DESC(force_new_ani, "Force new ANI for AR5008, AR9001, AR9002");
-
 /* General hardware code for the A5008/AR9001/AR9002 hadware families */
 
 static void ar9002_hw_init_mode_regs(struct ath_hw *ah)
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_2p2_initvals.h b/drivers/net/wireless/ath/ath9k/ar9003_2p2_initvals.h
index 952cb2b4656..89bf94d4d8a 100644
--- a/drivers/net/wireless/ath/ath9k/ar9003_2p2_initvals.h
+++ b/drivers/net/wireless/ath/ath9k/ar9003_2p2_initvals.h
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2010-2011 Atheros Communications Inc.
+ * Copyright (c) 2011-2012 Qualcomm Atheros Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_calib.c b/drivers/net/wireless/ath/ath9k/ar9003_calib.c
index 9fdd70fcaf5..d7deb8c9f29 100644
--- a/drivers/net/wireless/ath/ath9k/ar9003_calib.c
+++ b/drivers/net/wireless/ath/ath9k/ar9003_calib.c
@@ -653,7 +653,6 @@ static void ar9003_hw_detect_outlier(int *mp_coeff, int nmeasurement,
 }
 
 static void ar9003_hw_tx_iqcal_load_avg_2_passes(struct ath_hw *ah,
-                                                 u8 num_chains,
                                                  struct coeff *coeff,
                                                  bool is_reusable)
 {
@@ -677,7 +676,9 @@ static void ar9003_hw_tx_iqcal_load_avg_2_passes(struct ath_hw *ah,
         }
 
         /* Load the average of 2 passes */
-        for (i = 0; i < num_chains; i++) {
+        for (i = 0; i < AR9300_MAX_CHAINS; i++) {
+                if (!(ah->txchainmask & (1 << i)))
+                        continue;
                 nmeasurement = REG_READ_FIELD(ah,
                                 AR_PHY_TX_IQCAL_STATUS_B0,
                                 AR_PHY_CALIBRATED_GAINS_0);
@@ -767,16 +768,13 @@ static void ar9003_hw_tx_iq_cal_post_proc(struct ath_hw *ah, bool is_reusable)
         };
         struct coeff coeff;
         s32 iq_res[6];
-        u8 num_chains = 0;
         int i, im, j;
         int nmeasurement;
 
         for (i = 0; i < AR9300_MAX_CHAINS; i++) {
-                if (ah->txchainmask & (1 << i))
-                        num_chains++;
-        }
+                if (!(ah->txchainmask & (1 << i)))
+                        continue;
 
-        for (i = 0; i < num_chains; i++) {
                 nmeasurement = REG_READ_FIELD(ah,
                                 AR_PHY_TX_IQCAL_STATUS_B0,
                                 AR_PHY_CALIBRATED_GAINS_0);
@@ -839,8 +837,7 @@ static void ar9003_hw_tx_iq_cal_post_proc(struct ath_hw *ah, bool is_reusable)
                                 coeff.phs_coeff[i][im] -= 128;
                 }
         }
-        ar9003_hw_tx_iqcal_load_avg_2_passes(ah, num_chains,
-                                             &coeff, is_reusable);
+        ar9003_hw_tx_iqcal_load_avg_2_passes(ah, &coeff, is_reusable);
 
         return;
 
@@ -901,7 +898,6 @@ static bool ar9003_hw_init_cal(struct ath_hw *ah,
         bool is_reusable = true, status = true;
         bool run_rtt_cal = false, run_agc_cal;
         bool rtt = !!(ah->caps.hw_caps & ATH9K_HW_CAP_RTT);
-        bool mci = !!(ah->caps.hw_caps & ATH9K_HW_CAP_MCI);
         u32 agc_ctrl = 0, agc_supp_cals = AR_PHY_AGC_CONTROL_OFFSET_CAL |
                                           AR_PHY_AGC_CONTROL_FLTR_CAL   |
                                           AR_PHY_AGC_CONTROL_PKDET_CAL;
@@ -970,7 +966,7 @@ static bool ar9003_hw_init_cal(struct ath_hw *ah,
         } else if (caldata && !caldata->done_txiqcal_once)
                 run_agc_cal = true;
 
-        if (mci && IS_CHAN_2GHZ(chan) && run_agc_cal)
+        if (ath9k_hw_mci_is_enabled(ah) && IS_CHAN_2GHZ(chan) && run_agc_cal)
                 ar9003_mci_init_cal_req(ah, &is_reusable);
 
         if (!(IS_CHAN_HALF_RATE(chan) || IS_CHAN_QUARTER_RATE(chan))) {
@@ -993,7 +989,7 @@ skip_tx_iqcal:
                                        0, AH_WAIT_TIMEOUT);
         }
 
-        if (mci && IS_CHAN_2GHZ(chan) && run_agc_cal)
+        if (ath9k_hw_mci_is_enabled(ah) && IS_CHAN_2GHZ(chan) && run_agc_cal)
                 ar9003_mci_init_cal_done(ah);
 
         if (rtt && !run_rtt_cal) {
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
index dfb0441f406..b1e59236d24 100644
--- a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
+++ b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
@@ -3178,7 +3178,7 @@ static int ar9300_compress_decision(struct ath_hw *ah,
                                 mdata_size, length);
                         return -1;
                 }
-                memcpy(mptr, (u8 *) (word + COMP_HDR_LEN), length);
+                memcpy(mptr, word + COMP_HDR_LEN, length);
                 ath_dbg(common, EEPROM,
                         "restored eeprom %d: uncompressed, length %d\n",
                         it, length);
@@ -3199,7 +3199,7 @@ static int ar9300_compress_decision(struct ath_hw *ah,
                         "restore eeprom %d: block, reference %d, length %d\n",
                         it, reference, length);
                 ar9300_uncompress_block(ah, mptr, mdata_size,
-                                        (u8 *) (word + COMP_HDR_LEN), length);
+                                        (word + COMP_HDR_LEN), length);
                 break;
         default:
                 ath_dbg(common, EEPROM, "unknown compression code %d\n", code);
@@ -3412,11 +3412,11 @@ static u32 ath9k_hw_ar9003_dump_eeprom(struct ath_hw *ah, bool dump_base_hdr,
         if (!dump_base_hdr) {
                 len += snprintf(buf + len, size - len,
                                 "%20s :\n", "2GHz modal Header");
-                len += ar9003_dump_modal_eeprom(buf, len, size,
+                len = ar9003_dump_modal_eeprom(buf, len, size,
                                                 &eep->modalHeader2G);
                 len += snprintf(buf + len, size - len,
                                 "%20s :\n", "5GHz modal Header");
-                len += ar9003_dump_modal_eeprom(buf, len, size,
+                len = ar9003_dump_modal_eeprom(buf, len, size,
                                                 &eep->modalHeader5G);
                 goto out;
         }
@@ -3613,6 +3613,7 @@ static void ar9003_hw_ant_ctrl_apply(struct ath_hw *ah, bool is2ghz)
                 value = ar9003_switch_com_spdt_get(ah, is2ghz);
                 REG_RMW_FIELD(ah, AR_PHY_GLB_CONTROL,
                                 AR_SWITCH_TABLE_COM_SPDT_ALL, value);
+                REG_SET_BIT(ah, AR_PHY_GLB_CONTROL, AR_BTCOEX_CTRL_SPDT_ENABLE);
         }
 
         value = ar9003_hw_ant_ctrl_common_2_get(ah, is2ghz);
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_mac.c b/drivers/net/wireless/ath/ath9k/ar9003_mac.c
index d9e0824af09..78816b8b217 100644
--- a/drivers/net/wireless/ath/ath9k/ar9003_mac.c
+++ b/drivers/net/wireless/ath/ath9k/ar9003_mac.c
@@ -181,11 +181,14 @@ static bool ar9003_hw_get_isr(struct ath_hw *ah, enum ath9k_int *masked)
         u32 mask2 = 0;
         struct ath9k_hw_capabilities *pCap = &ah->caps;
         struct ath_common *common = ath9k_hw_common(ah);
-        u32 sync_cause = 0, async_cause;
+        u32 sync_cause = 0, async_cause, async_mask = AR_INTR_MAC_IRQ;
+
+        if (ath9k_hw_mci_is_enabled(ah))
+                async_mask |= AR_INTR_ASYNC_MASK_MCI;
 
         async_cause = REG_READ(ah, AR_INTR_ASYNC_CAUSE);
 
-        if (async_cause & (AR_INTR_MAC_IRQ | AR_INTR_ASYNC_MASK_MCI)) {
+        if (async_cause & async_mask) {
                 if ((REG_READ(ah, AR_RTC_STATUS) & AR_RTC_STATUS_M)
                                 == AR_RTC_STATUS_ON)
                         isr = REG_READ(ah, AR_ISR);
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_mci.c b/drivers/net/wireless/ath/ath9k/ar9003_mci.c
index ffbb180f91e..61558375bfb 100644
--- a/drivers/net/wireless/ath/ath9k/ar9003_mci.c
+++ b/drivers/net/wireless/ath/ath9k/ar9003_mci.c
@@ -35,31 +35,30 @@ static int ar9003_mci_wait_for_interrupt(struct ath_hw *ah, u32 address,
         struct ath_common *common = ath9k_hw_common(ah);
 
         while (time_out) {
-                if (REG_READ(ah, address) & bit_position) {
-                        REG_WRITE(ah, address, bit_position);
-
-                        if (address == AR_MCI_INTERRUPT_RX_MSG_RAW) {
-                                if (bit_position &
-                                    AR_MCI_INTERRUPT_RX_MSG_REQ_WAKE)
-                                        ar9003_mci_reset_req_wakeup(ah);
-
-                                if (bit_position &
-                                    (AR_MCI_INTERRUPT_RX_MSG_SYS_SLEEPING |
-                                     AR_MCI_INTERRUPT_RX_MSG_SYS_WAKING))
-                                        REG_WRITE(ah, AR_MCI_INTERRUPT_RAW,
-                                        AR_MCI_INTERRUPT_REMOTE_SLEEP_UPDATE);
-
-                                REG_WRITE(ah, AR_MCI_INTERRUPT_RAW,
-                                          AR_MCI_INTERRUPT_RX_MSG);
-                        }
-                        break;
-                }
+                if (!(REG_READ(ah, address) & bit_position)) {
+                        udelay(10);
+                        time_out -= 10;
 
-                udelay(10);
-                time_out -= 10;
+                        if (time_out < 0)
+                                break;
+                        else
+                                continue;
+                }
+                REG_WRITE(ah, address, bit_position);
 
-                if (time_out < 0)
+                if (address != AR_MCI_INTERRUPT_RX_MSG_RAW)
                         break;
+
+                if (bit_position & AR_MCI_INTERRUPT_RX_MSG_REQ_WAKE)
+                        ar9003_mci_reset_req_wakeup(ah);
+
+                if (bit_position & (AR_MCI_INTERRUPT_RX_MSG_SYS_SLEEPING |
+                                    AR_MCI_INTERRUPT_RX_MSG_SYS_WAKING))
+                        REG_WRITE(ah, AR_MCI_INTERRUPT_RAW,
+                                  AR_MCI_INTERRUPT_REMOTE_SLEEP_UPDATE);
+
+                REG_WRITE(ah, AR_MCI_INTERRUPT_RAW, AR_MCI_INTERRUPT_RX_MSG);
+                break;
         }
 
         if (time_out <= 0) {
@@ -127,14 +126,13 @@ static void ar9003_mci_send_coex_version_query(struct ath_hw *ah,
         struct ath9k_hw_mci *mci = &ah->btcoex_hw.mci;
         u32 payload[4] = {0, 0, 0, 0};
 
-        if (!mci->bt_version_known &&
-            (mci->bt_state != MCI_BT_SLEEP)) {
-                MCI_GPM_SET_TYPE_OPCODE(payload,
-                                        MCI_GPM_COEX_AGENT,
-                                        MCI_GPM_COEX_VERSION_QUERY);
-                ar9003_mci_send_message(ah, MCI_GPM, 0, payload, 16,
-                                        wait_done, true);
-        }
+        if (mci->bt_version_known ||
+            (mci->bt_state == MCI_BT_SLEEP))
+                return;
+
+        MCI_GPM_SET_TYPE_OPCODE(payload, MCI_GPM_COEX_AGENT,
+                                MCI_GPM_COEX_VERSION_QUERY);
+        ar9003_mci_send_message(ah, MCI_GPM, 0, payload, 16, wait_done, true);
 }
 
 static void ar9003_mci_send_coex_version_response(struct ath_hw *ah,
@@ -158,15 +156,14 @@ static void ar9003_mci_send_coex_wlan_channels(struct ath_hw *ah,
         struct ath9k_hw_mci *mci = &ah->btcoex_hw.mci;
         u32 *payload = &mci->wlan_channels[0];
 
-        if ((mci->wlan_channels_update == true) &&
-            (mci->bt_state != MCI_BT_SLEEP)) {
-                MCI_GPM_SET_TYPE_OPCODE(payload,
-                                        MCI_GPM_COEX_AGENT,
-                                        MCI_GPM_COEX_WLAN_CHANNELS);
-                ar9003_mci_send_message(ah, MCI_GPM, 0, payload, 16,
-                                        wait_done, true);
-                MCI_GPM_SET_TYPE_OPCODE(payload, 0xff, 0xff);
-        }
+        if (!mci->wlan_channels_update ||
+            (mci->bt_state == MCI_BT_SLEEP))
+                return;
+
+        MCI_GPM_SET_TYPE_OPCODE(payload, MCI_GPM_COEX_AGENT,
+                                MCI_GPM_COEX_WLAN_CHANNELS);
+        ar9003_mci_send_message(ah, MCI_GPM, 0, payload, 16, wait_done, true);
+        MCI_GPM_SET_TYPE_OPCODE(payload, 0xff, 0xff);
 }
 
 static void ar9003_mci_send_coex_bt_status_query(struct ath_hw *ah,
@@ -174,29 +171,30 @@ static void ar9003_mci_send_coex_bt_status_query(struct ath_hw *ah,
 {
         struct ath9k_hw_mci *mci = &ah->btcoex_hw.mci;
         u32 payload[4] = {0, 0, 0, 0};
-        bool query_btinfo = !!(query_type & (MCI_GPM_COEX_QUERY_BT_ALL_INFO |
-                                             MCI_GPM_COEX_QUERY_BT_TOPOLOGY));
+        bool query_btinfo;
 
-        if (mci->bt_state != MCI_BT_SLEEP) {
-
-                MCI_GPM_SET_TYPE_OPCODE(payload, MCI_GPM_COEX_AGENT,
-                                        MCI_GPM_COEX_STATUS_QUERY);
+        if (mci->bt_state == MCI_BT_SLEEP)
+                return;
 
-                *(((u8 *)payload) + MCI_GPM_COEX_B_BT_BITMAP) = query_type;
+        query_btinfo = !!(query_type & (MCI_GPM_COEX_QUERY_BT_ALL_INFO |
+                                        MCI_GPM_COEX_QUERY_BT_TOPOLOGY));
+        MCI_GPM_SET_TYPE_OPCODE(payload, MCI_GPM_COEX_AGENT,
+                                MCI_GPM_COEX_STATUS_QUERY);
 
-                /*
-                 * If bt_status_query message is  not sent successfully,
-                 * then need_flush_btinfo should be set again.
-                 */
-                if (!ar9003_mci_send_message(ah, MCI_GPM, 0, payload, 16,
-                                             wait_done, true)) {
-                        if (query_btinfo)
-                                mci->need_flush_btinfo = true;
-                }
+        *(((u8 *)payload) + MCI_GPM_COEX_B_BT_BITMAP) = query_type;
 
+        /*
+         * If bt_status_query message is  not sent successfully,
+         * then need_flush_btinfo should be set again.
+         */
+        if (!ar9003_mci_send_message(ah, MCI_GPM, 0, payload, 16,
+                                wait_done, true)) {
                 if (query_btinfo)
-                        mci->query_bt = false;
+                        mci->need_flush_btinfo = true;
         }
+
+        if (query_btinfo)
+                mci->query_bt = false;
 }
 
 static void ar9003_mci_send_coex_halt_bt_gpm(struct ath_hw *ah, bool halt,
@@ -241,73 +239,73 @@ static void ar9003_mci_prep_interface(struct ath_hw *ah)
         ar9003_mci_remote_reset(ah, true);
         ar9003_mci_send_req_wake(ah, true);
 
-        if (ar9003_mci_wait_for_interrupt(ah, AR_MCI_INTERRUPT_RX_MSG_RAW,
-                                  AR_MCI_INTERRUPT_RX_MSG_SYS_WAKING, 500)) {
+        if (!ar9003_mci_wait_for_interrupt(ah, AR_MCI_INTERRUPT_RX_MSG_RAW,
+                                  AR_MCI_INTERRUPT_RX_MSG_SYS_WAKING, 500))
+                goto clear_redunt;
 
-                mci->bt_state = MCI_BT_AWAKE;
+        mci->bt_state = MCI_BT_AWAKE;
 
-                /*
-                 * we don't need to send more remote_reset at this moment.
-                 * If BT receive first remote_reset, then BT HW will
-                 * be cleaned up and will be able to receive req_wake
-                 * and BT HW will respond sys_waking.
-                 * In this case, WLAN will receive BT's HW sys_waking.
-                 * Otherwise, if BT SW missed initial remote_reset,
-                 * that remote_reset will still clean up BT MCI RX,
-                 * and the req_wake will wake BT up,
-                 * and BT SW will respond this req_wake with a remote_reset and
-                 * sys_waking. In this case, WLAN will receive BT's SW
-                 * sys_waking. In either case, BT's RX is cleaned up. So we
-                 * don't need to reply BT's remote_reset now, if any.
-                 * Similarly, if in any case, WLAN can receive BT's sys_waking,
-                 * that means WLAN's RX is also fine.
-                 */
-                ar9003_mci_send_sys_waking(ah, true);
-                udelay(10);
+        /*
+         * we don't need to send more remote_reset at this moment.
+         * If BT receive first remote_reset, then BT HW will
+         * be cleaned up and will be able to receive req_wake
+         * and BT HW will respond sys_waking.
+         * In this case, WLAN will receive BT's HW sys_waking.
+         * Otherwise, if BT SW missed initial remote_reset,
+         * that remote_reset will still clean up BT MCI RX,
+         * and the req_wake will wake BT up,
+         * and BT SW will respond this req_wake with a remote_reset and
+         * sys_waking. In this case, WLAN will receive BT's SW
+         * sys_waking. In either case, BT's RX is cleaned up. So we
+         * don't need to reply BT's remote_reset now, if any.
+         * Similarly, if in any case, WLAN can receive BT's sys_waking,
+         * that means WLAN's RX is also fine.
+         */
+        ar9003_mci_send_sys_waking(ah, true);
+        udelay(10);
 
-                /*
-                 * Set BT priority interrupt value to be 0xff to
-                 * avoid having too many BT PRIORITY interrupts.
-                 */
-                REG_WRITE(ah, AR_MCI_BT_PRI0, 0xFFFFFFFF);
-                REG_WRITE(ah, AR_MCI_BT_PRI1, 0xFFFFFFFF);
-                REG_WRITE(ah, AR_MCI_BT_PRI2, 0xFFFFFFFF);
-                REG_WRITE(ah, AR_MCI_BT_PRI3, 0xFFFFFFFF);
-                REG_WRITE(ah, AR_MCI_BT_PRI, 0X000000FF);
+        /*
+         * Set BT priority interrupt value to be 0xff to
+         * avoid having too many BT PRIORITY interrupts.
+         */
+        REG_WRITE(ah, AR_MCI_BT_PRI0, 0xFFFFFFFF);
+        REG_WRITE(ah, AR_MCI_BT_PRI1, 0xFFFFFFFF);
+        REG_WRITE(ah, AR_MCI_BT_PRI2, 0xFFFFFFFF);
+        REG_WRITE(ah, AR_MCI_BT_PRI3, 0xFFFFFFFF);
+        REG_WRITE(ah, AR_MCI_BT_PRI, 0X000000FF);
 
-                /*
-                 * A contention reset will be received after send out
-                 * sys_waking. Also BT priority interrupt bits will be set.
-                 * Clear those bits before the next step.
-                 */
+        /*
+         * A contention reset will be received after send out
+         * sys_waking. Also BT priority interrupt bits will be set.
+         * Clear those bits before the next step.
+         */
 
-                REG_WRITE(ah, AR_MCI_INTERRUPT_RX_MSG_RAW,
-                          AR_MCI_INTERRUPT_RX_MSG_CONT_RST);
-                REG_WRITE(ah, AR_MCI_INTERRUPT_RAW,
-                          AR_MCI_INTERRUPT_BT_PRI);
+        REG_WRITE(ah, AR_MCI_INTERRUPT_RX_MSG_RAW,
+                  AR_MCI_INTERRUPT_RX_MSG_CONT_RST);
+        REG_WRITE(ah, AR_MCI_INTERRUPT_RAW, AR_MCI_INTERRUPT_BT_PRI);
 
-                if (mci->is_2g) {
-                        ar9003_mci_send_lna_transfer(ah, true);
-                        udelay(5);
-                }
+        if (mci->is_2g) {
+                ar9003_mci_send_lna_transfer(ah, true);
+                udelay(5);
+        }
 
-                if ((mci->is_2g && !mci->update_2g5g)) {
-                        if (ar9003_mci_wait_for_interrupt(ah,
-                                          AR_MCI_INTERRUPT_RX_MSG_RAW,
-                                          AR_MCI_INTERRUPT_RX_MSG_LNA_INFO,
-                                          mci_timeout))
-                                ath_dbg(common, MCI,
-                                        "MCI WLAN has control over the LNA & BT obeys it\n");
-                        else
-                                ath_dbg(common, MCI,
-                                        "MCI BT didn't respond to LNA_TRANS\n");
-                }
+        if ((mci->is_2g && !mci->update_2g5g)) {
+                if (ar9003_mci_wait_for_interrupt(ah,
+                                        AR_MCI_INTERRUPT_RX_MSG_RAW,
+                                        AR_MCI_INTERRUPT_RX_MSG_LNA_INFO,
+                                        mci_timeout))
+                        ath_dbg(common, MCI,
+                                "MCI WLAN has control over the LNA & BT obeys it\n");
+                else
+                        ath_dbg(common, MCI,
+                                "MCI BT didn't respond to LNA_TRANS\n");
         }
 
+clear_redunt:
         /* Clear the extra redundant SYS_WAKING from BT */
         if ((mci->bt_state == MCI_BT_AWAKE) &&
-                (REG_READ_FIELD(ah, AR_MCI_INTERRUPT_RX_MSG_RAW,
-                                AR_MCI_INTERRUPT_RX_MSG_SYS_WAKING)) &&
+            (REG_READ_FIELD(ah, AR_MCI_INTERRUPT_RX_MSG_RAW,
+                            AR_MCI_INTERRUPT_RX_MSG_SYS_WAKING)) &&
             (REG_READ_FIELD(ah, AR_MCI_INTERRUPT_RX_MSG_RAW,
                             AR_MCI_INTERRUPT_RX_MSG_SYS_SLEEPING) == 0)) {
                 REG_WRITE(ah, AR_MCI_INTERRUPT_RX_MSG_RAW,
@@ -323,14 +321,13 @@ void ar9003_mci_set_full_sleep(struct ath_hw *ah)
 {
         struct ath9k_hw_mci *mci = &ah->btcoex_hw.mci;
 
-        if (ar9003_mci_state(ah, MCI_STATE_ENABLE, NULL) &&
+        if (ar9003_mci_state(ah, MCI_STATE_ENABLE) &&
             (mci->bt_state != MCI_BT_SLEEP) &&
             !mci->halted_bt_gpm) {
                 ar9003_mci_send_coex_halt_bt_gpm(ah, true, true);
         }
 
         mci->ready = false;
-        REG_WRITE(ah, AR_RTC_KEEP_AWAKE, 0x2);
 }
 
 static void ar9003_mci_disable_interrupt(struct ath_hw *ah)
@@ -487,7 +484,7 @@ static void ar9003_mci_sync_bt_state(struct ath_hw *ah)
         struct ath9k_hw_mci *mci = &ah->btcoex_hw.mci;
         u32 cur_bt_state;
 
-        cur_bt_state = ar9003_mci_state(ah, MCI_STATE_REMOTE_SLEEP, NULL);
+        cur_bt_state = ar9003_mci_state(ah, MCI_STATE_REMOTE_SLEEP);
 
         if (mci->bt_state != cur_bt_state)
                 mci->bt_state = cur_bt_state;
@@ -596,8 +593,7 @@ static u32 ar9003_mci_wait_for_gpm(struct ath_hw *ah, u8 gpm_type,
                 if (!time_out)
                         break;
 
-                offset = ar9003_mci_state(ah, MCI_STATE_NEXT_GPM_OFFSET,
-                                          &more_data);
+                offset = ar9003_mci_get_next_gpm_offset(ah, false, &more_data);
 
                 if (offset == MCI_GPM_INVALID)
                         continue;
@@ -615,9 +611,9 @@ static u32 ar9003_mci_wait_for_gpm(struct ath_hw *ah, u8 gpm_type,
                                 }
                                 break;
                         }
-                } else if ((recv_type == gpm_type) && (recv_opcode == gpm_opcode)) {
+                } else if ((recv_type == gpm_type) &&
+                           (recv_opcode == gpm_opcode))
                         break;
-                }
 
                 /*
                  * check if it's cal_grant
@@ -661,8 +657,7 @@ static u32 ar9003_mci_wait_for_gpm(struct ath_hw *ah, u8 gpm_type,
                 time_out = 0;
 
         while (more_data == MCI_GPM_MORE) {
-                offset = ar9003_mci_state(ah, MCI_STATE_NEXT_GPM_OFFSET,
-                                          &more_data);
+                offset = ar9003_mci_get_next_gpm_offset(ah, false, &more_data);
                 if (offset == MCI_GPM_INVALID)
                         break;
 
@@ -731,38 +726,38 @@ int ar9003_mci_end_reset(struct ath_hw *ah, struct ath9k_channel *chan,
         if (!IS_CHAN_2GHZ(chan) || (mci_hw->bt_state != MCI_BT_SLEEP))
                 goto exit;
 
-        if (ar9003_mci_check_int(ah, AR_MCI_INTERRUPT_RX_MSG_REMOTE_RESET) ||
-            ar9003_mci_check_int(ah, AR_MCI_INTERRUPT_RX_MSG_REQ_WAKE)) {
+        if (!ar9003_mci_check_int(ah, AR_MCI_INTERRUPT_RX_MSG_REMOTE_RESET) &&
+            !ar9003_mci_check_int(ah, AR_MCI_INTERRUPT_RX_MSG_REQ_WAKE))
+                goto exit;
 
-                /*
-                 * BT is sleeping. Check if BT wakes up during
-                 * WLAN calibration. If BT wakes up during
-                 * WLAN calibration, need to go through all
-                 * message exchanges again and recal.
-                 */
-                REG_WRITE(ah, AR_MCI_INTERRUPT_RX_MSG_RAW,
-                          AR_MCI_INTERRUPT_RX_MSG_REMOTE_RESET |
-                          AR_MCI_INTERRUPT_RX_MSG_REQ_WAKE);
+        /*
+         * BT is sleeping. Check if BT wakes up during
+         * WLAN calibration. If BT wakes up during
+         * WLAN calibration, need to go through all
+         * message exchanges again and recal.
+         */
+        REG_WRITE(ah, AR_MCI_INTERRUPT_RX_MSG_RAW,
+                  (AR_MCI_INTERRUPT_RX_MSG_REMOTE_RESET |
+                   AR_MCI_INTERRUPT_RX_MSG_REQ_WAKE));
 
-                ar9003_mci_remote_reset(ah, true);
-                ar9003_mci_send_sys_waking(ah, true);
-                udelay(1);
+        ar9003_mci_remote_reset(ah, true);
+        ar9003_mci_send_sys_waking(ah, true);
+        udelay(1);
 
-                if (IS_CHAN_2GHZ(chan))
-                        ar9003_mci_send_lna_transfer(ah, true);
+        if (IS_CHAN_2GHZ(chan))
+                ar9003_mci_send_lna_transfer(ah, true);
 
-                mci_hw->bt_state = MCI_BT_AWAKE;
+        mci_hw->bt_state = MCI_BT_AWAKE;
 
-                if (caldata) {
-                        caldata->done_txiqcal_once = false;
-                        caldata->done_txclcal_once = false;
-                        caldata->rtt_done = false;
-                }
+        if (caldata) {
+                caldata->done_txiqcal_once = false;
+                caldata->done_txclcal_once = false;
+                caldata->rtt_done = false;
+        }
 
-                if (!ath9k_hw_init_cal(ah, chan))
-                        return -EIO;
+        if (!ath9k_hw_init_cal(ah, chan))
+                return -EIO;
 
-        }
 exit:
         ar9003_mci_enable_interrupt(ah);
         return 0;
@@ -772,10 +767,6 @@ static void ar9003_mci_mute_bt(struct ath_hw *ah)
 {
         /* disable all MCI messages */
         REG_WRITE(ah, AR_MCI_MSG_ATTRIBUTES_TABLE, 0xffff0000);
-        REG_WRITE(ah, AR_BTCOEX_WL_WEIGHTS0, 0xffffffff);
-        REG_WRITE(ah, AR_BTCOEX_WL_WEIGHTS1, 0xffffffff);
-        REG_WRITE(ah, AR_BTCOEX_WL_WEIGHTS2, 0xffffffff);
-        REG_WRITE(ah, AR_BTCOEX_WL_WEIGHTS3, 0xffffffff);
         REG_SET_BIT(ah, AR_MCI_TX_CTRL, AR_MCI_TX_CTRL_DISABLE_LNA_UPDATE);
 
         /* wait pending HW messages to flush out */
@@ -798,29 +789,27 @@ static void ar9003_mci_osla_setup(struct ath_hw *ah, bool enable)
         struct ath9k_hw_mci *mci = &ah->btcoex_hw.mci;
         u32 thresh;
 
-        if (enable) {
-                REG_RMW_FIELD(ah, AR_MCI_SCHD_TABLE_2,
-                              AR_MCI_SCHD_TABLE_2_HW_BASED, 1);
-                REG_RMW_FIELD(ah, AR_MCI_SCHD_TABLE_2,
-                              AR_MCI_SCHD_TABLE_2_MEM_BASED, 1);
-
-                if (!(mci->config & ATH_MCI_CONFIG_DISABLE_AGGR_THRESH)) {
-                        thresh = MS(mci->config, ATH_MCI_CONFIG_AGGR_THRESH);
-                        REG_RMW_FIELD(ah, AR_BTCOEX_CTRL,
-                                      AR_BTCOEX_CTRL_AGGR_THRESH, thresh);
-                        REG_RMW_FIELD(ah, AR_BTCOEX_CTRL,
-                                      AR_BTCOEX_CTRL_TIME_TO_NEXT_BT_THRESH_EN, 1);
-                } else {
-                        REG_RMW_FIELD(ah, AR_BTCOEX_CTRL,
-                                      AR_BTCOEX_CTRL_TIME_TO_NEXT_BT_THRESH_EN, 0);
-                }
-
-                REG_RMW_FIELD(ah, AR_BTCOEX_CTRL,
-                              AR_BTCOEX_CTRL_ONE_STEP_LOOK_AHEAD_EN, 1);
-        } else {
+        if (!enable) {
                 REG_CLR_BIT(ah, AR_BTCOEX_CTRL,
                             AR_BTCOEX_CTRL_ONE_STEP_LOOK_AHEAD_EN);
+                return;
         }
+        REG_RMW_FIELD(ah, AR_MCI_SCHD_TABLE_2, AR_MCI_SCHD_TABLE_2_HW_BASED, 1);
+        REG_RMW_FIELD(ah, AR_MCI_SCHD_TABLE_2,
+                      AR_MCI_SCHD_TABLE_2_MEM_BASED, 1);
+
+        if (!(mci->config & ATH_MCI_CONFIG_DISABLE_AGGR_THRESH)) {
+                thresh = MS(mci->config, ATH_MCI_CONFIG_AGGR_THRESH);
+                REG_RMW_FIELD(ah, AR_BTCOEX_CTRL,
+                              AR_BTCOEX_CTRL_AGGR_THRESH, thresh);
+                REG_RMW_FIELD(ah, AR_BTCOEX_CTRL,
+                              AR_BTCOEX_CTRL_TIME_TO_NEXT_BT_THRESH_EN, 1);
+        } else
+                REG_RMW_FIELD(ah, AR_BTCOEX_CTRL,
+                              AR_BTCOEX_CTRL_TIME_TO_NEXT_BT_THRESH_EN, 0);
+
+        REG_RMW_FIELD(ah, AR_BTCOEX_CTRL,
+                      AR_BTCOEX_CTRL_ONE_STEP_LOOK_AHEAD_EN, 1);
 }
 
 void ar9003_mci_reset(struct ath_hw *ah, bool en_int, bool is_2g,
@@ -898,13 +887,16 @@ void ar9003_mci_reset(struct ath_hw *ah, bool en_int, bool is_2g,
                 udelay(100);
         }
 
+        /* Check pending GPM msg before MCI Reset Rx */
+        ar9003_mci_check_gpm_offset(ah);
+
         regval |= SM(1, AR_MCI_COMMAND2_RESET_RX);
         REG_WRITE(ah, AR_MCI_COMMAND2, regval);
         udelay(1);
         regval &= ~SM(1, AR_MCI_COMMAND2_RESET_RX);
         REG_WRITE(ah, AR_MCI_COMMAND2, regval);
 
-        ar9003_mci_state(ah, MCI_STATE_INIT_GPM_OFFSET, NULL);
+        ar9003_mci_get_next_gpm_offset(ah, true, NULL);
 
         REG_WRITE(ah, AR_MCI_MSG_ATTRIBUTES_TABLE,
                   (SM(0xe801, AR_MCI_MSG_ATTRIBUTES_TABLE_INVALID_HDR) |
@@ -943,26 +935,27 @@ static void ar9003_mci_send_2g5g_status(struct ath_hw *ah, bool wait_done)
         struct ath9k_hw_mci *mci = &ah->btcoex_hw.mci;
         u32 new_flags, to_set, to_clear;
 
-        if (mci->update_2g5g && (mci->bt_state != MCI_BT_SLEEP)) {
-                if (mci->is_2g) {
-                        new_flags = MCI_2G_FLAGS;
-                        to_clear = MCI_2G_FLAGS_CLEAR_MASK;
-                        to_set = MCI_2G_FLAGS_SET_MASK;
-                } else {
-                        new_flags = MCI_5G_FLAGS;
-                        to_clear = MCI_5G_FLAGS_CLEAR_MASK;
-                        to_set = MCI_5G_FLAGS_SET_MASK;
-                }
+        if (!mci->update_2g5g || (mci->bt_state == MCI_BT_SLEEP))
+                return;
+
+        if (mci->is_2g) {
+                new_flags = MCI_2G_FLAGS;
+                to_clear = MCI_2G_FLAGS_CLEAR_MASK;
+                to_set = MCI_2G_FLAGS_SET_MASK;
+        } else {
+                new_flags = MCI_5G_FLAGS;
+                to_clear = MCI_5G_FLAGS_CLEAR_MASK;
+                to_set = MCI_5G_FLAGS_SET_MASK;
+        }
 
-                if (to_clear)
-                        ar9003_mci_send_coex_bt_flags(ah, wait_done,
+        if (to_clear)
+                ar9003_mci_send_coex_bt_flags(ah, wait_done,
                                               MCI_GPM_COEX_BT_FLAGS_CLEAR,
                                               to_clear);
-                if (to_set)
-                        ar9003_mci_send_coex_bt_flags(ah, wait_done,
+        if (to_set)
+                ar9003_mci_send_coex_bt_flags(ah, wait_done,
                                               MCI_GPM_COEX_BT_FLAGS_SET,
                                               to_set);
-        }
 }
 
 static void ar9003_mci_queue_unsent_gpm(struct ath_hw *ah, u8 header,
@@ -1014,38 +1007,42 @@ static void ar9003_mci_queue_unsent_gpm(struct ath_hw *ah, u8 header,
         }
 }
 
-void ar9003_mci_2g5g_switch(struct ath_hw *ah, bool wait_done)
+void ar9003_mci_2g5g_switch(struct ath_hw *ah, bool force)
 {
         struct ath9k_hw_mci *mci = &ah->btcoex_hw.mci;
 
-        if (mci->update_2g5g) {
-                if (mci->is_2g) {
+        if (!mci->update_2g5g && !force)
+                return;
+
+        if (mci->is_2g) {
+                if (!force) {
                         ar9003_mci_send_2g5g_status(ah, true);
+
                         ar9003_mci_send_lna_transfer(ah, true);
                         udelay(5);
+                }
 
-                        REG_CLR_BIT(ah, AR_MCI_TX_CTRL,
-                                    AR_MCI_TX_CTRL_DISABLE_LNA_UPDATE);
-                        REG_CLR_BIT(ah, AR_PHY_GLB_CONTROL,
-                                    AR_BTCOEX_CTRL_BT_OWN_SPDT_CTRL);
+                REG_CLR_BIT(ah, AR_MCI_TX_CTRL,
+                            AR_MCI_TX_CTRL_DISABLE_LNA_UPDATE);
+                REG_CLR_BIT(ah, AR_PHY_GLB_CONTROL,
+                            AR_BTCOEX_CTRL_BT_OWN_SPDT_CTRL);
 
-                        if (!(mci->config & ATH_MCI_CONFIG_DISABLE_OSLA)) {
-                                REG_SET_BIT(ah, AR_BTCOEX_CTRL,
-                                            AR_BTCOEX_CTRL_ONE_STEP_LOOK_AHEAD_EN);
-                        }
-                } else {
+                if (!(mci->config & ATH_MCI_CONFIG_DISABLE_OSLA))
+                        ar9003_mci_osla_setup(ah, true);
+        } else {
+                if (!force) {
                         ar9003_mci_send_lna_take(ah, true);
                         udelay(5);
+                }
 
-                        REG_SET_BIT(ah, AR_MCI_TX_CTRL,
-                                    AR_MCI_TX_CTRL_DISABLE_LNA_UPDATE);
-                        REG_SET_BIT(ah, AR_PHY_GLB_CONTROL,
-                                    AR_BTCOEX_CTRL_BT_OWN_SPDT_CTRL);
-                        REG_CLR_BIT(ah, AR_BTCOEX_CTRL,
-                                    AR_BTCOEX_CTRL_ONE_STEP_LOOK_AHEAD_EN);
+                REG_SET_BIT(ah, AR_MCI_TX_CTRL,
+                            AR_MCI_TX_CTRL_DISABLE_LNA_UPDATE);
+                REG_SET_BIT(ah, AR_PHY_GLB_CONTROL,
+                            AR_BTCOEX_CTRL_BT_OWN_SPDT_CTRL);
 
+                ar9003_mci_osla_setup(ah, false);
+                if (!force)
                         ar9003_mci_send_2g5g_status(ah, true);
-                }
         }
 }
 
@@ -1132,7 +1129,7 @@ void ar9003_mci_init_cal_req(struct ath_hw *ah, bool *is_reusable)
         if (ar9003_mci_wait_for_gpm(ah, MCI_GPM_BT_CAL_GRANT, 0, 50000)) {
                 ath_dbg(common, MCI, "MCI BT_CAL_GRANT received\n");
         } else {
-                is_reusable = false;
+                *is_reusable = false;
                 ath_dbg(common, MCI, "MCI BT_CAL_GRANT not received\n");
         }
 }
@@ -1173,11 +1170,10 @@ void ar9003_mci_cleanup(struct ath_hw *ah)
 }
 EXPORT_SYMBOL(ar9003_mci_cleanup);
 
-u32 ar9003_mci_state(struct ath_hw *ah, u32 state_type, u32 *p_data)
+u32 ar9003_mci_state(struct ath_hw *ah, u32 state_type)
 {
-        struct ath_common *common = ath9k_hw_common(ah);
         struct ath9k_hw_mci *mci = &ah->btcoex_hw.mci;
-        u32 value = 0, more_gpm = 0, gpm_ptr;
+        u32 value = 0;
         u8 query_type;
 
         switch (state_type) {
@@ -1190,81 +1186,6 @@ u32 ar9003_mci_state(struct ath_hw *ah, u32 state_type, u32 *p_data)
                 }
                 value &= AR_BTCOEX_CTRL_MCI_MODE_EN;
                 break;
-        case MCI_STATE_INIT_GPM_OFFSET:
-                value = MS(REG_READ(ah, AR_MCI_GPM_1), AR_MCI_GPM_WRITE_PTR);
-                mci->gpm_idx = value;
-                break;
-        case MCI_STATE_NEXT_GPM_OFFSET:
-        case MCI_STATE_LAST_GPM_OFFSET:
-                /*
-                * This could be useful to avoid new GPM message interrupt which
-                * may lead to spurious interrupt after power sleep, or multiple
-                * entry of ath_mci_intr().
-                * Adding empty GPM check by returning HAL_MCI_GPM_INVALID can
-                * alleviate this effect, but clearing GPM RX interrupt bit is
-                * safe, because whether this is called from hw or driver code
-                * there must be an interrupt bit set/triggered initially
-                */
-                REG_WRITE(ah, AR_MCI_INTERRUPT_RX_MSG_RAW,
-                          AR_MCI_INTERRUPT_RX_MSG_GPM);
-
-                gpm_ptr = MS(REG_READ(ah, AR_MCI_GPM_1), AR_MCI_GPM_WRITE_PTR);
-                value = gpm_ptr;
-
-                if (value == 0)
-                        value = mci->gpm_len - 1;
-                else if (value >= mci->gpm_len) {
-                        if (value != 0xFFFF)
-                                value = 0;
-                } else {
-                        value--;
-                }
-
-                if (value == 0xFFFF) {
-                        value = MCI_GPM_INVALID;
-                        more_gpm = MCI_GPM_NOMORE;
-                } else if (state_type == MCI_STATE_NEXT_GPM_OFFSET) {
-                        if (gpm_ptr == mci->gpm_idx) {
-                                value = MCI_GPM_INVALID;
-                                more_gpm = MCI_GPM_NOMORE;
-                        } else {
-                                for (;;) {
-                                        u32 temp_index;
-
-                                        /* skip reserved GPM if any */
-
-                                        if (value != mci->gpm_idx)
-                                                more_gpm = MCI_GPM_MORE;
-                                        else
-                                                more_gpm = MCI_GPM_NOMORE;
-
-                                        temp_index = mci->gpm_idx;
-                                        mci->gpm_idx++;
-
-                                        if (mci->gpm_idx >=
-                                            mci->gpm_len)
-                                                mci->gpm_idx = 0;
-
-                                        if (ar9003_mci_is_gpm_valid(ah,
-                                                                    temp_index)) {
-                                                value = temp_index;
-                                                break;
-                                        }
-
-                                        if (more_gpm == MCI_GPM_NOMORE) {
-                                                value = MCI_GPM_INVALID;
-                                                break;
-                                        }
-                                }
-                        }
-                        if (p_data)
-                                *p_data = more_gpm;
-                        }
-
-                        if (value != MCI_GPM_INVALID)
-                                value <<= 4;
-
-                        break;
         case MCI_STATE_LAST_SCHD_MSG_OFFSET:
                 value = MS(REG_READ(ah, AR_MCI_RX_STATUS),
                                     AR_MCI_RX_LAST_SCHD_MSG_INDEX);
@@ -1276,21 +1197,6 @@ u32 ar9003_mci_state(struct ath_hw *ah, u32 state_type, u32 *p_data)
                            AR_MCI_RX_REMOTE_SLEEP) ?
                         MCI_BT_SLEEP : MCI_BT_AWAKE;
                 break;
-        case MCI_STATE_CONT_RSSI_POWER:
-                value = MS(mci->cont_status, AR_MCI_CONT_RSSI_POWER);
-                break;
-        case MCI_STATE_CONT_PRIORITY:
-                value = MS(mci->cont_status, AR_MCI_CONT_RRIORITY);
-                break;
-        case MCI_STATE_CONT_TXRX:
-                value = MS(mci->cont_status, AR_MCI_CONT_TXRX);
-                break;
-        case MCI_STATE_BT:
-                value = mci->bt_state;
-                break;
-        case MCI_STATE_SET_BT_SLEEP:
-                mci->bt_state = MCI_BT_SLEEP;
-                break;
         case MCI_STATE_SET_BT_AWAKE:
                 mci->bt_state = MCI_BT_AWAKE;
                 ar9003_mci_send_coex_version_query(ah, true);
@@ -1299,7 +1205,7 @@ u32 ar9003_mci_state(struct ath_hw *ah, u32 state_type, u32 *p_data)
                 if (mci->unhalt_bt_gpm)
                         ar9003_mci_send_coex_halt_bt_gpm(ah, false, true);
 
-                ar9003_mci_2g5g_switch(ah, true);
+                ar9003_mci_2g5g_switch(ah, false);
                 break;
         case MCI_STATE_SET_BT_CAL_START:
                 mci->bt_state = MCI_BT_CAL_START;
@@ -1323,34 +1229,6 @@ u32 ar9003_mci_state(struct ath_hw *ah, u32 state_type, u32 *p_data)
         case MCI_STATE_SEND_WLAN_COEX_VERSION:
                 ar9003_mci_send_coex_version_response(ah, true);
                 break;
-        case MCI_STATE_SET_BT_COEX_VERSION:
-                if (!p_data)
-                        ath_dbg(common, MCI,
-                                "MCI Set BT Coex version with NULL data!!\n");
-                else {
-                        mci->bt_ver_major = (*p_data >> 8) & 0xff;
-                        mci->bt_ver_minor = (*p_data) & 0xff;
-                        mci->bt_version_known = true;
-                        ath_dbg(common, MCI, "MCI BT version set: %d.%d\n",
-                                mci->bt_ver_major, mci->bt_ver_minor);
-                }
-                break;
-        case MCI_STATE_SEND_WLAN_CHANNELS:
-                if (p_data) {
-                        if (((mci->wlan_channels[1] & 0xffff0000) ==
-                             (*(p_data + 1) & 0xffff0000)) &&
-                            (mci->wlan_channels[2] == *(p_data + 2)) &&
-                            (mci->wlan_channels[3] == *(p_data + 3)))
-                                break;
-
-                        mci->wlan_channels[0] = *p_data++;
-                        mci->wlan_channels[1] = *p_data++;
-                        mci->wlan_channels[2] = *p_data++;
-                        mci->wlan_channels[3] = *p_data++;
-                }
-                mci->wlan_channels_update = true;
-                ar9003_mci_send_coex_wlan_channels(ah, true);
-                break;
         case MCI_STATE_SEND_VERSION_QUERY:
                 ar9003_mci_send_coex_version_query(ah, true);
                 break;
@@ -1358,38 +1236,16 @@ u32 ar9003_mci_state(struct ath_hw *ah, u32 state_type, u32 *p_data)
                 query_type = MCI_GPM_COEX_QUERY_BT_TOPOLOGY;
                 ar9003_mci_send_coex_bt_status_query(ah, true, query_type);
                 break;
-        case MCI_STATE_NEED_FLUSH_BT_INFO:
-                        /*
-                         * btcoex_hw.mci.unhalt_bt_gpm means whether it's
-                         * needed to send UNHALT message. It's set whenever
-                         * there's a request to send HALT message.
-                         * mci_halted_bt_gpm means whether HALT message is sent
-                         * out successfully.
-                         *
-                         * Checking (mci_unhalt_bt_gpm == false) instead of
-                         * checking (ah->mci_halted_bt_gpm == false) will make
-                         * sure currently is in UNHALT-ed mode and BT can
-                         * respond to status query.
-                         */
-                        value = (!mci->unhalt_bt_gpm &&
-                                 mci->need_flush_btinfo) ? 1 : 0;
-                        if (p_data)
-                                mci->need_flush_btinfo =
-                                        (*p_data != 0) ? true : false;
-                        break;
         case MCI_STATE_RECOVER_RX:
                 ar9003_mci_prep_interface(ah);
                 mci->query_bt = true;
                 mci->need_flush_btinfo = true;
                 ar9003_mci_send_coex_wlan_channels(ah, true);
-                ar9003_mci_2g5g_switch(ah, true);
+                ar9003_mci_2g5g_switch(ah, false);
                 break;
         case MCI_STATE_NEED_FTP_STOMP:
                 value = !(mci->config & ATH_MCI_CONFIG_DISABLE_FTP_STOMP);
                 break;
-        case MCI_STATE_NEED_TUNING:
-                value = !(mci->config & ATH_MCI_CONFIG_DISABLE_TUNING);
-                break;
         default:
                 break;
         }
@@ -1397,3 +1253,173 @@ u32 ar9003_mci_state(struct ath_hw *ah, u32 state_type, u32 *p_data)
         return value;
 }
 EXPORT_SYMBOL(ar9003_mci_state);
+
+void ar9003_mci_bt_gain_ctrl(struct ath_hw *ah)
+{
+        struct ath_common *common = ath9k_hw_common(ah);
+        struct ath9k_hw_mci *mci = &ah->btcoex_hw.mci;
+
+        ath_dbg(common, MCI, "Give LNA and SPDT control to BT\n");
+
+        ar9003_mci_send_lna_take(ah, true);
+        udelay(50);
+
+        REG_SET_BIT(ah, AR_PHY_GLB_CONTROL, AR_BTCOEX_CTRL_BT_OWN_SPDT_CTRL);
+        mci->is_2g = false;
+        mci->update_2g5g = true;
+        ar9003_mci_send_2g5g_status(ah, true);
+
+        /* Force another 2g5g update at next scanning */
+        mci->update_2g5g = true;
+}
+
+void ar9003_mci_set_power_awake(struct ath_hw *ah)
+{
+        u32 btcoex_ctrl2, diag_sw;
+        int i;
+        u8 lna_ctrl, bt_sleep;
+
+        for (i = 0; i < AH_WAIT_TIMEOUT; i++) {
+                btcoex_ctrl2 = REG_READ(ah, AR_BTCOEX_CTRL2);
+                if (btcoex_ctrl2 != 0xdeadbeef)
+                        break;
+                udelay(AH_TIME_QUANTUM);
+        }
+        REG_WRITE(ah, AR_BTCOEX_CTRL2, (btcoex_ctrl2 | BIT(23)));
+
+        for (i = 0; i < AH_WAIT_TIMEOUT; i++) {
+                diag_sw = REG_READ(ah, AR_DIAG_SW);
+                if (diag_sw != 0xdeadbeef)
+                        break;
+                udelay(AH_TIME_QUANTUM);
+        }
+        REG_WRITE(ah, AR_DIAG_SW, (diag_sw | BIT(27) | BIT(19) | BIT(18)));
+        lna_ctrl = REG_READ(ah, AR_OBS_BUS_CTRL) & 0x3;
+        bt_sleep = REG_READ(ah, AR_MCI_RX_STATUS) & AR_MCI_RX_REMOTE_SLEEP;
+
+        REG_WRITE(ah, AR_BTCOEX_CTRL2, btcoex_ctrl2);
+        REG_WRITE(ah, AR_DIAG_SW, diag_sw);
+
+        if (bt_sleep && (lna_ctrl == 2)) {
+                REG_SET_BIT(ah, AR_BTCOEX_RC, 0x1);
+                REG_CLR_BIT(ah, AR_BTCOEX_RC, 0x1);
+                udelay(50);
+        }
+}
+
+void ar9003_mci_check_gpm_offset(struct ath_hw *ah)
+{
+        struct ath_common *common = ath9k_hw_common(ah);
+        struct ath9k_hw_mci *mci = &ah->btcoex_hw.mci;
+        u32 offset;
+
+        /*
+         * This should only be called before "MAC Warm Reset" or "MCI Reset Rx".
+         */
+        offset = MS(REG_READ(ah, AR_MCI_GPM_1), AR_MCI_GPM_WRITE_PTR);
+        if (mci->gpm_idx == offset)
+                return;
+        ath_dbg(common, MCI, "GPM cached write pointer mismatch %d %d\n",
+                mci->gpm_idx, offset);
+        mci->query_bt = true;
+        mci->need_flush_btinfo = true;
+        mci->gpm_idx = 0;
+}
+
+u32 ar9003_mci_get_next_gpm_offset(struct ath_hw *ah, bool first, u32 *more)
+{
+        struct ath9k_hw_mci *mci = &ah->btcoex_hw.mci;
+        u32 offset, more_gpm = 0, gpm_ptr;
+
+        if (first) {
+                gpm_ptr = MS(REG_READ(ah, AR_MCI_GPM_1), AR_MCI_GPM_WRITE_PTR);
+                mci->gpm_idx = gpm_ptr;
+                return gpm_ptr;
+        }
+
+        /*
+         * This could be useful to avoid new GPM message interrupt which
+         * may lead to spurious interrupt after power sleep, or multiple
+         * entry of ath_mci_intr().
+         * Adding empty GPM check by returning HAL_MCI_GPM_INVALID can
+         * alleviate this effect, but clearing GPM RX interrupt bit is
+         * safe, because whether this is called from hw or driver code
+         * there must be an interrupt bit set/triggered initially
+         */
+        REG_WRITE(ah, AR_MCI_INTERRUPT_RX_MSG_RAW,
+                        AR_MCI_INTERRUPT_RX_MSG_GPM);
+
+        gpm_ptr = MS(REG_READ(ah, AR_MCI_GPM_1), AR_MCI_GPM_WRITE_PTR);
+        offset = gpm_ptr;
+
+        if (!offset)
+                offset = mci->gpm_len - 1;
+        else if (offset >= mci->gpm_len) {
+                if (offset != 0xFFFF)
+                        offset = 0;
+        } else {
+                offset--;
+        }
+
+        if ((offset == 0xFFFF) || (gpm_ptr == mci->gpm_idx)) {
+                offset = MCI_GPM_INVALID;
+                more_gpm = MCI_GPM_NOMORE;
+                goto out;
+        }
+        for (;;) {
+                u32 temp_index;
+
+                /* skip reserved GPM if any */
+
+                if (offset != mci->gpm_idx)
+                        more_gpm = MCI_GPM_MORE;
+                else
+                        more_gpm = MCI_GPM_NOMORE;
+
+                temp_index = mci->gpm_idx;
+                mci->gpm_idx++;
+
+                if (mci->gpm_idx >= mci->gpm_len)
+                        mci->gpm_idx = 0;
+
+                if (ar9003_mci_is_gpm_valid(ah, temp_index)) {
+                        offset = temp_index;
+                        break;
+                }
+
+                if (more_gpm == MCI_GPM_NOMORE) {
+                        offset = MCI_GPM_INVALID;
+                        break;
+                }
+        }
+
+        if (offset != MCI_GPM_INVALID)
+                offset <<= 4;
+out:
+        if (more)
+                *more = more_gpm;
+
+        return offset;
+}
+EXPORT_SYMBOL(ar9003_mci_get_next_gpm_offset);
+
+void ar9003_mci_set_bt_version(struct ath_hw *ah, u8 major, u8 minor)
+{
+        struct ath9k_hw_mci *mci = &ah->btcoex_hw.mci;
+
+        mci->bt_ver_major = major;
+        mci->bt_ver_minor = minor;
+        mci->bt_version_known = true;
+        ath_dbg(ath9k_hw_common(ah), MCI, "MCI BT version set: %d.%d\n",
+                mci->bt_ver_major, mci->bt_ver_minor);
+}
+EXPORT_SYMBOL(ar9003_mci_set_bt_version);
+
+void ar9003_mci_send_wlan_channels(struct ath_hw *ah)
+{
+        struct ath9k_hw_mci *mci = &ah->btcoex_hw.mci;
+
+        mci->wlan_channels_update = true;
+        ar9003_mci_send_coex_wlan_channels(ah, true);
+}
+EXPORT_SYMBOL(ar9003_mci_send_wlan_channels);
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_mci.h b/drivers/net/wireless/ath/ath9k/ar9003_mci.h
index 4842f6c06b8..d33b8e12885 100644
--- a/drivers/net/wireless/ath/ath9k/ar9003_mci.h
+++ b/drivers/net/wireless/ath/ath9k/ar9003_mci.h
@@ -189,30 +189,18 @@ enum mci_bt_state {
 /* Type of state query */
 enum mci_state_type {
         MCI_STATE_ENABLE,
-        MCI_STATE_INIT_GPM_OFFSET,
-        MCI_STATE_NEXT_GPM_OFFSET,
-        MCI_STATE_LAST_GPM_OFFSET,
-        MCI_STATE_BT,
-        MCI_STATE_SET_BT_SLEEP,
         MCI_STATE_SET_BT_AWAKE,
         MCI_STATE_SET_BT_CAL_START,
         MCI_STATE_SET_BT_CAL,
         MCI_STATE_LAST_SCHD_MSG_OFFSET,
         MCI_STATE_REMOTE_SLEEP,
-        MCI_STATE_CONT_RSSI_POWER,
-        MCI_STATE_CONT_PRIORITY,
-        MCI_STATE_CONT_TXRX,
         MCI_STATE_RESET_REQ_WAKE,
         MCI_STATE_SEND_WLAN_COEX_VERSION,
-        MCI_STATE_SET_BT_COEX_VERSION,
-        MCI_STATE_SEND_WLAN_CHANNELS,
         MCI_STATE_SEND_VERSION_QUERY,
         MCI_STATE_SEND_STATUS_QUERY,
-        MCI_STATE_NEED_FLUSH_BT_INFO,
         MCI_STATE_SET_CONCUR_TX_PRI,
         MCI_STATE_RECOVER_RX,
         MCI_STATE_NEED_FTP_STOMP,
-        MCI_STATE_NEED_TUNING,
         MCI_STATE_DEBUG,
         MCI_STATE_MAX
 };
@@ -260,28 +248,26 @@ enum mci_gpm_coex_opcode {
 bool ar9003_mci_send_message(struct ath_hw *ah, u8 header, u32 flag,
                              u32 *payload, u8 len, bool wait_done,
                              bool check_bt);
-u32 ar9003_mci_state(struct ath_hw *ah, u32 state_type, u32 *p_data);
+u32 ar9003_mci_state(struct ath_hw *ah, u32 state_type);
 void ar9003_mci_setup(struct ath_hw *ah, u32 gpm_addr, void *gpm_buf,
                       u16 len, u32 sched_addr);
 void ar9003_mci_cleanup(struct ath_hw *ah);
 void ar9003_mci_get_interrupt(struct ath_hw *ah, u32 *raw_intr,
                               u32 *rx_msg_intr);
-
+u32 ar9003_mci_get_next_gpm_offset(struct ath_hw *ah, bool first, u32 *more);
+void ar9003_mci_set_bt_version(struct ath_hw *ah, u8 major, u8 minor);
+void ar9003_mci_send_wlan_channels(struct ath_hw *ah);
 /*
  * These functions are used by ath9k_hw.
  */
 
 #ifdef CONFIG_ATH9K_BTCOEX_SUPPORT
 
-static inline bool ar9003_mci_is_ready(struct ath_hw *ah)
-{
-        return ah->btcoex_hw.mci.ready;
-}
 void ar9003_mci_stop_bt(struct ath_hw *ah, bool save_fullsleep);
 void ar9003_mci_init_cal_req(struct ath_hw *ah, bool *is_reusable);
 void ar9003_mci_init_cal_done(struct ath_hw *ah);
 void ar9003_mci_set_full_sleep(struct ath_hw *ah);
-void ar9003_mci_2g5g_switch(struct ath_hw *ah, bool wait_done);
+void ar9003_mci_2g5g_switch(struct ath_hw *ah, bool force);
 void ar9003_mci_check_bt(struct ath_hw *ah);
 bool ar9003_mci_start_reset(struct ath_hw *ah, struct ath9k_channel *chan);
 int ar9003_mci_end_reset(struct ath_hw *ah, struct ath9k_channel *chan,
@@ -289,13 +275,12 @@ int ar9003_mci_end_reset(struct ath_hw *ah, struct ath9k_channel *chan,
 void ar9003_mci_reset(struct ath_hw *ah, bool en_int, bool is_2g,
                       bool is_full_sleep);
 void ar9003_mci_get_isr(struct ath_hw *ah, enum ath9k_int *masked);
+void ar9003_mci_bt_gain_ctrl(struct ath_hw *ah);
+void ar9003_mci_set_power_awake(struct ath_hw *ah);
+void ar9003_mci_check_gpm_offset(struct ath_hw *ah);
 
 #else
 
-static inline bool ar9003_mci_is_ready(struct ath_hw *ah)
-{
-        return false;
-}
 static inline void ar9003_mci_stop_bt(struct ath_hw *ah, bool save_fullsleep)
 {
 }
@@ -330,6 +315,15 @@ static inline void ar9003_mci_reset(struct ath_hw *ah, bool en_int, bool is_2g,
 static inline void ar9003_mci_get_isr(struct ath_hw *ah, enum ath9k_int *masked)
 {
 }
+static inline void ar9003_mci_bt_gain_ctrl(struct ath_hw *ah)
+{
+}
+static inline void ar9003_mci_set_power_awake(struct ath_hw *ah)
+{
+}
+static inline void ar9003_mci_check_gpm_offset(struct ath_hw *ah)
+{
+}
 #endif /* CONFIG_ATH9K_BTCOEX_SUPPORT */
 
 #endif
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_phy.c b/drivers/net/wireless/ath/ath9k/ar9003_phy.c
index 11abb972be1..6b91ebb158f 100644
--- a/drivers/net/wireless/ath/ath9k/ar9003_phy.c
+++ b/drivers/net/wireless/ath/ath9k/ar9003_phy.c
@@ -173,7 +173,7 @@ static void ar9003_hw_spur_mitigate_mrc_cck(struct ath_hw *ah,
         int cur_bb_spur, negative = 0, cck_spur_freq;
         int i;
         int range, max_spur_cnts, synth_freq;
-        u8 *spur_fbin_ptr = NULL;
+        u8 *spur_fbin_ptr = ar9003_get_spur_chan_ptr(ah, IS_CHAN_2GHZ(chan));
 
         /*
          * Need to verify range +/- 10 MHz in control channel, otherwise spur
@@ -181,8 +181,6 @@ static void ar9003_hw_spur_mitigate_mrc_cck(struct ath_hw *ah,
          */
 
         if (AR_SREV_9485(ah) || AR_SREV_9340(ah) || AR_SREV_9330(ah)) {
-                spur_fbin_ptr = ar9003_get_spur_chan_ptr(ah,
-                                                         IS_CHAN_2GHZ(chan));
                 if (spur_fbin_ptr[0] == 0) /* No spur */
                         return;
                 max_spur_cnts = 5;
@@ -676,6 +674,10 @@ static int ar9003_hw_process_ini(struct ath_hw *ah,
         if (chan->channel == 2484)
                 ar9003_hw_prog_ini(ah, &ah->ini_japan2484, 1);
 
+        if (AR_SREV_9462(ah))
+                REG_WRITE(ah, AR_GLB_SWREG_DISCONT_MODE,
+                          AR_GLB_SWREG_DISCONT_EN_BT_WLAN);
+
         ah->modes_index = modesIndex;
         ar9003_hw_override_ini(ah);
         ar9003_hw_set_channel_regs(ah, chan);
@@ -821,18 +823,18 @@ static bool ar9003_hw_ani_control(struct ath_hw *ah,
                         REG_CLR_BIT(ah, AR_PHY_SFCORR_LOW,
                                     AR_PHY_SFCORR_LOW_USE_SELF_CORR_LOW);
 
-                if (!on != aniState->ofdmWeakSigDetectOff) {
+                if (on != aniState->ofdmWeakSigDetect) {
                         ath_dbg(common, ANI,
                                 "** ch %d: ofdm weak signal: %s=>%s\n",
                                 chan->channel,
-                                !aniState->ofdmWeakSigDetectOff ?
+                                aniState->ofdmWeakSigDetect ?
                                 "on" : "off",
                                 on ? "on" : "off");
                         if (on)
                                 ah->stats.ast_ani_ofdmon++;
                         else
                                 ah->stats.ast_ani_ofdmoff++;
-                        aniState->ofdmWeakSigDetectOff = !on;
+                        aniState->ofdmWeakSigDetect = on;
                 }
                 break;
         }
@@ -851,7 +853,7 @@ static bool ar9003_hw_ani_control(struct ath_hw *ah,
                  * from INI file & cap value
                  */
                 value = firstep_table[level] -
-                        firstep_table[ATH9K_ANI_FIRSTEP_LVL_NEW] +
+                        firstep_table[ATH9K_ANI_FIRSTEP_LVL] +
                         aniState->iniDef.firstep;
                 if (value < ATH9K_SIG_FIRSTEP_SETTING_MIN)
                         value = ATH9K_SIG_FIRSTEP_SETTING_MIN;
@@ -866,7 +868,7 @@ static bool ar9003_hw_ani_control(struct ath_hw *ah,
                  * from INI file & cap value
                  */
                 value2 = firstep_table[level] -
-                         firstep_table[ATH9K_ANI_FIRSTEP_LVL_NEW] +
+                         firstep_table[ATH9K_ANI_FIRSTEP_LVL] +
                          aniState->iniDef.firstepLow;
                 if (value2 < ATH9K_SIG_FIRSTEP_SETTING_MIN)
                         value2 = ATH9K_SIG_FIRSTEP_SETTING_MIN;
@@ -882,7 +884,7 @@ static bool ar9003_hw_ani_control(struct ath_hw *ah,
                                 chan->channel,
                                 aniState->firstepLevel,
                                 level,
-                                ATH9K_ANI_FIRSTEP_LVL_NEW,
+                                ATH9K_ANI_FIRSTEP_LVL,
                                 value,
                                 aniState->iniDef.firstep);
                         ath_dbg(common, ANI,
@@ -890,7 +892,7 @@ static bool ar9003_hw_ani_control(struct ath_hw *ah,
                                 chan->channel,
                                 aniState->firstepLevel,
                                 level,
-                                ATH9K_ANI_FIRSTEP_LVL_NEW,
+                                ATH9K_ANI_FIRSTEP_LVL,
                                 value2,
                                 aniState->iniDef.firstepLow);
                         if (level > aniState->firstepLevel)
@@ -915,7 +917,7 @@ static bool ar9003_hw_ani_control(struct ath_hw *ah,
                  * from INI file & cap value
                  */
                 value = cycpwrThr1_table[level] -
-                        cycpwrThr1_table[ATH9K_ANI_SPUR_IMMUNE_LVL_NEW] +
+                        cycpwrThr1_table[ATH9K_ANI_SPUR_IMMUNE_LVL] +
                         aniState->iniDef.cycpwrThr1;
                 if (value < ATH9K_SIG_SPUR_IMM_SETTING_MIN)
                         value = ATH9K_SIG_SPUR_IMM_SETTING_MIN;
@@ -931,7 +933,7 @@ static bool ar9003_hw_ani_control(struct ath_hw *ah,
                  * from INI file & cap value
                  */
                 value2 = cycpwrThr1_table[level] -
-                         cycpwrThr1_table[ATH9K_ANI_SPUR_IMMUNE_LVL_NEW] +
+                         cycpwrThr1_table[ATH9K_ANI_SPUR_IMMUNE_LVL] +
                          aniState->iniDef.cycpwrThr1Ext;
                 if (value2 < ATH9K_SIG_SPUR_IMM_SETTING_MIN)
                         value2 = ATH9K_SIG_SPUR_IMM_SETTING_MIN;
@@ -946,7 +948,7 @@ static bool ar9003_hw_ani_control(struct ath_hw *ah,
                                 chan->channel,
                                 aniState->spurImmunityLevel,
                                 level,
-                                ATH9K_ANI_SPUR_IMMUNE_LVL_NEW,
+                                ATH9K_ANI_SPUR_IMMUNE_LVL,
                                 value,
                                 aniState->iniDef.cycpwrThr1);
                         ath_dbg(common, ANI,
@@ -954,7 +956,7 @@ static bool ar9003_hw_ani_control(struct ath_hw *ah,
                                 chan->channel,
                                 aniState->spurImmunityLevel,
                                 level,
-                                ATH9K_ANI_SPUR_IMMUNE_LVL_NEW,
+                                ATH9K_ANI_SPUR_IMMUNE_LVL,
                                 value2,
                                 aniState->iniDef.cycpwrThr1Ext);
                         if (level > aniState->spurImmunityLevel)
@@ -975,16 +977,16 @@ static bool ar9003_hw_ani_control(struct ath_hw *ah,
                               AR_PHY_MRC_CCK_ENABLE, is_on);
                 REG_RMW_FIELD(ah, AR_PHY_MRC_CCK_CTRL,
                               AR_PHY_MRC_CCK_MUX_REG, is_on);
-                if (!is_on != aniState->mrcCCKOff) {
+                if (is_on != aniState->mrcCCK) {
                         ath_dbg(common, ANI, "** ch %d: MRC CCK: %s=>%s\n",
                                 chan->channel,
-                                !aniState->mrcCCKOff ? "on" : "off",
+                                aniState->mrcCCK ? "on" : "off",
                                 is_on ? "on" : "off");
                 if (is_on)
                         ah->stats.ast_ani_ccklow++;
                 else
                         ah->stats.ast_ani_cckhigh++;
-                aniState->mrcCCKOff = !is_on;
+                aniState->mrcCCK = is_on;
                 }
         break;
         }
@@ -998,9 +1000,9 @@ static bool ar9003_hw_ani_control(struct ath_hw *ah,
         ath_dbg(common, ANI,
                 "ANI parameters: SI=%d, ofdmWS=%s FS=%d MRCcck=%s listenTime=%d ofdmErrs=%d cckErrs=%d\n",
                 aniState->spurImmunityLevel,
-                !aniState->ofdmWeakSigDetectOff ? "on" : "off",
+                aniState->ofdmWeakSigDetect ? "on" : "off",
                 aniState->firstepLevel,
-                !aniState->mrcCCKOff ? "on" : "off",
+                aniState->mrcCCK ? "on" : "off",
                 aniState->listenTime,
                 aniState->ofdmPhyErrCount,
                 aniState->cckPhyErrCount);
@@ -1107,10 +1109,10 @@ static void ar9003_hw_ani_cache_ini_regs(struct ath_hw *ah)
                                                AR_PHY_EXT_CYCPWR_THR1);
 
         /* these levels just got reset to defaults by the INI */
-        aniState->spurImmunityLevel = ATH9K_ANI_SPUR_IMMUNE_LVL_NEW;
-        aniState->firstepLevel = ATH9K_ANI_FIRSTEP_LVL_NEW;
-        aniState->ofdmWeakSigDetectOff = !ATH9K_ANI_USE_OFDM_WEAK_SIG;
-        aniState->mrcCCKOff = !ATH9K_ANI_ENABLE_MRC_CCK;
+        aniState->spurImmunityLevel = ATH9K_ANI_SPUR_IMMUNE_LVL;
+        aniState->firstepLevel = ATH9K_ANI_FIRSTEP_LVL;
+        aniState->ofdmWeakSigDetect = ATH9K_ANI_USE_OFDM_WEAK_SIG;
+        aniState->mrcCCK = true;
 }
 
 static void ar9003_hw_set_radar_params(struct ath_hw *ah,
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_phy.h b/drivers/net/wireless/ath/ath9k/ar9003_phy.h
index 7268a48a92a..ed662c3bae5 100644
--- a/drivers/net/wireless/ath/ath9k/ar9003_phy.h
+++ b/drivers/net/wireless/ath/ath9k/ar9003_phy.h
@@ -820,18 +820,26 @@
 #define AR_PHY_CHAN_INFO_MEMORY_CAPTURE_MASK         0x0001
 #define AR_PHY_RX_DELAY_DELAY   0x00003FFF
 #define AR_PHY_CCK_TX_CTRL_JAPAN    0x00000010
-#define AR_PHY_SPECTRAL_SCAN_ENABLE         0x00000001
-#define AR_PHY_SPECTRAL_SCAN_ENABLE_S       0
-#define AR_PHY_SPECTRAL_SCAN_ACTIVE         0x00000002
-#define AR_PHY_SPECTRAL_SCAN_ACTIVE_S       1
-#define AR_PHY_SPECTRAL_SCAN_FFT_PERIOD     0x000000F0
-#define AR_PHY_SPECTRAL_SCAN_FFT_PERIOD_S   4
-#define AR_PHY_SPECTRAL_SCAN_PERIOD         0x0000FF00
-#define AR_PHY_SPECTRAL_SCAN_PERIOD_S       8
-#define AR_PHY_SPECTRAL_SCAN_COUNT          0x00FF0000
-#define AR_PHY_SPECTRAL_SCAN_COUNT_S        16
-#define AR_PHY_SPECTRAL_SCAN_SHORT_REPEAT   0x01000000
-#define AR_PHY_SPECTRAL_SCAN_SHORT_REPEAT_S 24
+
+#define AR_PHY_SPECTRAL_SCAN_ENABLE           0x00000001
+#define AR_PHY_SPECTRAL_SCAN_ENABLE_S         0
+#define AR_PHY_SPECTRAL_SCAN_ACTIVE           0x00000002
+#define AR_PHY_SPECTRAL_SCAN_ACTIVE_S         1
+#define AR_PHY_SPECTRAL_SCAN_FFT_PERIOD       0x000000F0
+#define AR_PHY_SPECTRAL_SCAN_FFT_PERIOD_S     4
+#define AR_PHY_SPECTRAL_SCAN_PERIOD           0x0000FF00
+#define AR_PHY_SPECTRAL_SCAN_PERIOD_S         8
+#define AR_PHY_SPECTRAL_SCAN_COUNT            0x0FFF0000
+#define AR_PHY_SPECTRAL_SCAN_COUNT_S          16
+#define AR_PHY_SPECTRAL_SCAN_SHORT_REPEAT     0x10000000
+#define AR_PHY_SPECTRAL_SCAN_SHORT_REPEAT_S   28
+#define AR_PHY_SPECTRAL_SCAN_PRIORITY         0x20000000
+#define AR_PHY_SPECTRAL_SCAN_PRIORITY_S       29
+#define AR_PHY_SPECTRAL_SCAN_USE_ERR5         0x40000000
+#define AR_PHY_SPECTRAL_SCAN_USE_ERR5_S       30
+#define AR_PHY_SPECTRAL_SCAN_COMPRESSED_RPT   0x80000000
+#define AR_PHY_SPECTRAL_SCAN_COMPRESSED_RPT_S 31
+
 #define AR_PHY_CHANNEL_STATUS_RX_CLEAR      0x00000004
 #define AR_PHY_RTT_CTRL_ENA_RADIO_RETENTION     0x00000001
 #define AR_PHY_RTT_CTRL_ENA_RADIO_RETENTION_S   0
diff --git a/drivers/net/wireless/ath/ath9k/ar9330_1p1_initvals.h b/drivers/net/wireless/ath/ath9k/ar9330_1p1_initvals.h
index 1bd3a3d2210..6e1756bc383 100644
--- a/drivers/net/wireless/ath/ath9k/ar9330_1p1_initvals.h
+++ b/drivers/net/wireless/ath/ath9k/ar9330_1p1_initvals.h
@@ -337,12 +337,7 @@ static const u32 ar9331_modes_low_ob_db_tx_gain_1p1[][5] = {
         {0x00016284, 0x14d3f000, 0x14d3f000, 0x14d3f000, 0x14d3f000},
 };
 
-static const u32 ar9331_1p1_baseband_core_txfir_coeff_japan_2484[][2] = {
-        /* Addr      allmodes  */
-        {0x0000a398, 0x00000000},
-        {0x0000a39c, 0x6f7f0301},
-        {0x0000a3a0, 0xca9228ee},
-};
+#define ar9331_1p1_baseband_core_txfir_coeff_japan_2484 ar9462_2p0_baseband_core_txfir_coeff_japan_2484
 
 static const u32 ar9331_1p1_xtal_25M[][2] = {
         /* Addr      allmodes  */
@@ -783,17 +778,7 @@ static const u32 ar9331_modes_high_power_tx_gain_1p1[][5] = {
         {0x00016284, 0x14d3f000, 0x14d3f000, 0x14d3f000, 0x14d3f000},
 };
 
-static const u32 ar9331_1p1_mac_postamble[][5] = {
-        /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
-        {0x00001030, 0x00000230, 0x00000460, 0x000002c0, 0x00000160},
-        {0x00001070, 0x00000168, 0x000002d0, 0x00000318, 0x0000018c},
-        {0x000010b0, 0x00000e60, 0x00001cc0, 0x00007c70, 0x00003e38},
-        {0x00008014, 0x03e803e8, 0x07d007d0, 0x10801600, 0x08400b00},
-        {0x0000801c, 0x128d8027, 0x128d804f, 0x12e00057, 0x12e0002b},
-        {0x00008120, 0x08f04800, 0x08f04800, 0x08f04810, 0x08f04810},
-        {0x000081d0, 0x00003210, 0x00003210, 0x0000320a, 0x0000320a},
-        {0x00008318, 0x00003e80, 0x00007d00, 0x00006880, 0x00003440},
-};
+#define ar9331_1p1_mac_postamble ar9300_2p2_mac_postamble
 
 static const u32 ar9331_1p1_soc_preamble[][2] = {
         /* Addr      allmodes  */
@@ -1112,38 +1097,4 @@ static const u32 ar9331_common_tx_gain_offset1_1[][1] = {
         {0x00000000},
 };
 
-static const u32 ar9331_1p1_chansel_xtal_25M[] = {
-        0x0101479e,
-        0x0101d027,
-        0x010258af,
-        0x0102e138,
-        0x010369c0,
-        0x0103f249,
-        0x01047ad1,
-        0x0105035a,
-        0x01058be2,
-        0x0106146b,
-        0x01069cf3,
-        0x0107257c,
-        0x0107ae04,
-        0x0108f5b2,
-};
-
-static const u32 ar9331_1p1_chansel_xtal_40M[] = {
-        0x00a0ccbe,
-        0x00a12213,
-        0x00a17769,
-        0x00a1ccbe,
-        0x00a22213,
-        0x00a27769,
-        0x00a2ccbe,
-        0x00a32213,
-        0x00a37769,
-        0x00a3ccbe,
-        0x00a42213,
-        0x00a47769,
-        0x00a4ccbe,
-        0x00a5998b,
-};
-
 #endif /* INITVALS_9330_1P1_H */
diff --git a/drivers/net/wireless/ath/ath9k/ar9330_1p2_initvals.h b/drivers/net/wireless/ath/ath9k/ar9330_1p2_initvals.h
index 0e6ca0834b3..57ed8a11217 100644
--- a/drivers/net/wireless/ath/ath9k/ar9330_1p2_initvals.h
+++ b/drivers/net/wireless/ath/ath9k/ar9330_1p2_initvals.h
@@ -1,5 +1,6 @@
 /*
- * Copyright (c) 2011 Atheros Communications Inc.
+ * Copyright (c) 2010-2011 Atheros Communications Inc.
+ * Copyright (c) 2011-2012 Qualcomm Atheros Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -17,8 +18,8 @@
 #ifndef INITVALS_9330_1P2_H
 #define INITVALS_9330_1P2_H
 
-static const u32 ar9331_modes_lowest_ob_db_tx_gain_1p2[][5] = {
-        /*  Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20  */
+static const u32 ar9331_modes_high_ob_db_tx_gain_1p2[][5] = {
+        /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
         {0x0000a410, 0x000050d7, 0x000050d7, 0x000050d7, 0x000050d7},
         {0x0000a500, 0x00022200, 0x00022200, 0x00000000, 0x00000000},
         {0x0000a504, 0x05062002, 0x05062002, 0x04000002, 0x04000002},
@@ -102,8 +103,14 @@ static const u32 ar9331_modes_lowest_ob_db_tx_gain_1p2[][5] = {
         {0x0000a63c, 0x04011004, 0x04011004, 0x04011004, 0x04011004},
 };
 
+#define ar9331_modes_high_power_tx_gain_1p2 ar9331_modes_high_ob_db_tx_gain_1p2
+
+#define ar9331_modes_low_ob_db_tx_gain_1p2 ar9331_modes_high_power_tx_gain_1p2
+
+#define ar9331_modes_lowest_ob_db_tx_gain_1p2 ar9331_modes_low_ob_db_tx_gain_1p2
+
 static const u32 ar9331_1p2_baseband_postamble[][5] = {
-        /*  Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20  */
+        /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
         {0x00009810, 0xd00a8005, 0xd00a8005, 0xd00a8005, 0xd00a8005},
         {0x00009820, 0x206a002e, 0x206a002e, 0x206a002e, 0x206a002e},
         {0x00009824, 0x5ac640d0, 0x5ac640d0, 0x5ac640d0, 0x5ac640d0},
@@ -147,191 +154,6 @@ static const u32 ar9331_1p2_baseband_postamble[][5] = {
         {0x0000ae18, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
 };
 
-static const u32 ar9331_modes_high_ob_db_tx_gain_1p2[][5] = {
-        /*  Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20  */
-        {0x0000a410, 0x000050d7, 0x000050d7, 0x000050d7, 0x000050d7},
-        {0x0000a500, 0x00022200, 0x00022200, 0x00000000, 0x00000000},
-        {0x0000a504, 0x05062002, 0x05062002, 0x04000002, 0x04000002},
-        {0x0000a508, 0x0c002e00, 0x0c002e00, 0x08000004, 0x08000004},
-        {0x0000a50c, 0x11062202, 0x11062202, 0x0d000200, 0x0d000200},
-        {0x0000a510, 0x17022e00, 0x17022e00, 0x11000202, 0x11000202},
-        {0x0000a514, 0x1d000ec2, 0x1d000ec2, 0x15000400, 0x15000400},
-        {0x0000a518, 0x25020ec0, 0x25020ec0, 0x19000402, 0x19000402},
-        {0x0000a51c, 0x2b020ec3, 0x2b020ec3, 0x1d000404, 0x1d000404},
-        {0x0000a520, 0x2f001f04, 0x2f001f04, 0x23000a00, 0x23000a00},
-        {0x0000a524, 0x35001fc4, 0x35001fc4, 0x27000a02, 0x27000a02},
-        {0x0000a528, 0x3c022f04, 0x3c022f04, 0x2b000a04, 0x2b000a04},
-        {0x0000a52c, 0x41023e85, 0x41023e85, 0x3f001620, 0x3f001620},
-        {0x0000a530, 0x48023ec6, 0x48023ec6, 0x41001621, 0x41001621},
-        {0x0000a534, 0x4d023f01, 0x4d023f01, 0x44001640, 0x44001640},
-        {0x0000a538, 0x53023f4b, 0x53023f4b, 0x46001641, 0x46001641},
-        {0x0000a53c, 0x5a027f09, 0x5a027f09, 0x48001642, 0x48001642},
-        {0x0000a540, 0x5f027fc9, 0x5f027fc9, 0x4b001644, 0x4b001644},
-        {0x0000a544, 0x6502feca, 0x6502feca, 0x4e001a81, 0x4e001a81},
-        {0x0000a548, 0x6b02ff4a, 0x6b02ff4a, 0x51001a83, 0x51001a83},
-        {0x0000a54c, 0x7203feca, 0x7203feca, 0x54001c84, 0x54001c84},
-        {0x0000a550, 0x7703ff0b, 0x7703ff0b, 0x57001ce3, 0x57001ce3},
-        {0x0000a554, 0x7d06ffcb, 0x7d06ffcb, 0x5b001ce5, 0x5b001ce5},
-        {0x0000a558, 0x8407ff0b, 0x8407ff0b, 0x5f001ce9, 0x5f001ce9},
-        {0x0000a55c, 0x8907ffcb, 0x8907ffcb, 0x66001eec, 0x66001eec},
-        {0x0000a560, 0x900fff0b, 0x900fff0b, 0x66001eec, 0x66001eec},
-        {0x0000a564, 0x960fffcb, 0x960fffcb, 0x66001eec, 0x66001eec},
-        {0x0000a568, 0x9c1fff0b, 0x9c1fff0b, 0x66001eec, 0x66001eec},
-        {0x0000a56c, 0x9c1fff0b, 0x9c1fff0b, 0x66001eec, 0x66001eec},
-        {0x0000a570, 0x9c1fff0b, 0x9c1fff0b, 0x66001eec, 0x66001eec},
-        {0x0000a574, 0x9c1fff0b, 0x9c1fff0b, 0x66001eec, 0x66001eec},
-        {0x0000a578, 0x9c1fff0b, 0x9c1fff0b, 0x66001eec, 0x66001eec},
-        {0x0000a57c, 0x9c1fff0b, 0x9c1fff0b, 0x66001eec, 0x66001eec},
-        {0x0000a580, 0x00022200, 0x00022200, 0x00000000, 0x00000000},
-        {0x0000a584, 0x05062002, 0x05062002, 0x04000002, 0x04000002},
-        {0x0000a588, 0x0c002e00, 0x0c002e00, 0x08000004, 0x08000004},
-        {0x0000a58c, 0x11062202, 0x11062202, 0x0b000200, 0x0b000200},
-        {0x0000a590, 0x17022e00, 0x17022e00, 0x0f000202, 0x0f000202},
-        {0x0000a594, 0x1d000ec2, 0x1d000ec2, 0x11000400, 0x11000400},
-        {0x0000a598, 0x25020ec0, 0x25020ec0, 0x15000402, 0x15000402},
-        {0x0000a59c, 0x2b020ec3, 0x2b020ec3, 0x19000404, 0x19000404},
-        {0x0000a5a0, 0x2f001f04, 0x2f001f04, 0x1b000603, 0x1b000603},
-        {0x0000a5a4, 0x35001fc4, 0x35001fc4, 0x1f000a02, 0x1f000a02},
-        {0x0000a5a8, 0x3c022f04, 0x3c022f04, 0x23000a04, 0x23000a04},
-        {0x0000a5ac, 0x41023e85, 0x41023e85, 0x26000a20, 0x26000a20},
-        {0x0000a5b0, 0x48023ec6, 0x48023ec6, 0x2a000e20, 0x2a000e20},
-        {0x0000a5b4, 0x4d023f01, 0x4d023f01, 0x2e000e22, 0x2e000e22},
-        {0x0000a5b8, 0x53023f4b, 0x53023f4b, 0x31000e24, 0x31000e24},
-        {0x0000a5bc, 0x5a027f09, 0x5a027f09, 0x34001640, 0x34001640},
-        {0x0000a5c0, 0x5f027fc9, 0x5f027fc9, 0x38001660, 0x38001660},
-        {0x0000a5c4, 0x6502feca, 0x6502feca, 0x3b001861, 0x3b001861},
-        {0x0000a5c8, 0x6b02ff4a, 0x6b02ff4a, 0x3e001a81, 0x3e001a81},
-        {0x0000a5cc, 0x7203feca, 0x7203feca, 0x42001a83, 0x42001a83},
-        {0x0000a5d0, 0x7703ff0b, 0x7703ff0b, 0x44001c84, 0x44001c84},
-        {0x0000a5d4, 0x7d06ffcb, 0x7d06ffcb, 0x48001ce3, 0x48001ce3},
-        {0x0000a5d8, 0x8407ff0b, 0x8407ff0b, 0x4c001ce5, 0x4c001ce5},
-        {0x0000a5dc, 0x8907ffcb, 0x8907ffcb, 0x50001ce9, 0x50001ce9},
-        {0x0000a5e0, 0x900fff0b, 0x900fff0b, 0x54001ceb, 0x54001ceb},
-        {0x0000a5e4, 0x960fffcb, 0x960fffcb, 0x56001eec, 0x56001eec},
-        {0x0000a5e8, 0x9c1fff0b, 0x9c1fff0b, 0x56001eec, 0x56001eec},
-        {0x0000a5ec, 0x9c1fff0b, 0x9c1fff0b, 0x56001eec, 0x56001eec},
-        {0x0000a5f0, 0x9c1fff0b, 0x9c1fff0b, 0x56001eec, 0x56001eec},
-        {0x0000a5f4, 0x9c1fff0b, 0x9c1fff0b, 0x56001eec, 0x56001eec},
-        {0x0000a5f8, 0x9c1fff0b, 0x9c1fff0b, 0x56001eec, 0x56001eec},
-        {0x0000a5fc, 0x9c1fff0b, 0x9c1fff0b, 0x56001eec, 0x56001eec},
-        {0x0000a600, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000a604, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000a608, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000a60c, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000a610, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000a614, 0x01404000, 0x01404000, 0x01404000, 0x01404000},
-        {0x0000a618, 0x02008501, 0x02008501, 0x02008501, 0x02008501},
-        {0x0000a61c, 0x02008802, 0x02008802, 0x02008802, 0x02008802},
-        {0x0000a620, 0x0300c802, 0x0300c802, 0x0300c802, 0x0300c802},
-        {0x0000a624, 0x0300cc03, 0x0300cc03, 0x0300cc03, 0x0300cc03},
-        {0x0000a628, 0x04011004, 0x04011004, 0x04011004, 0x04011004},
-        {0x0000a62c, 0x04011004, 0x04011004, 0x04011004, 0x04011004},
-        {0x0000a630, 0x04011004, 0x04011004, 0x04011004, 0x04011004},
-        {0x0000a634, 0x04011004, 0x04011004, 0x04011004, 0x04011004},
-        {0x0000a638, 0x04011004, 0x04011004, 0x04011004, 0x04011004},
-        {0x0000a63c, 0x04011004, 0x04011004, 0x04011004, 0x04011004},
-};
-
-static const u32 ar9331_modes_low_ob_db_tx_gain_1p2[][5] = {
-        /*  Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20  */
-        {0x0000a410, 0x000050d7, 0x000050d7, 0x000050d7, 0x000050d7},
-        {0x0000a500, 0x00022200, 0x00022200, 0x00000000, 0x00000000},
-        {0x0000a504, 0x05062002, 0x05062002, 0x04000002, 0x04000002},
-        {0x0000a508, 0x0c002e00, 0x0c002e00, 0x08000004, 0x08000004},
-        {0x0000a50c, 0x11062202, 0x11062202, 0x0d000200, 0x0d000200},
-        {0x0000a510, 0x17022e00, 0x17022e00, 0x11000202, 0x11000202},
-        {0x0000a514, 0x1d000ec2, 0x1d000ec2, 0x15000400, 0x15000400},
-        {0x0000a518, 0x25020ec0, 0x25020ec0, 0x19000402, 0x19000402},
-        {0x0000a51c, 0x2b020ec3, 0x2b020ec3, 0x1d000404, 0x1d000404},
-        {0x0000a520, 0x2f001f04, 0x2f001f04, 0x23000a00, 0x23000a00},
-        {0x0000a524, 0x35001fc4, 0x35001fc4, 0x27000a02, 0x27000a02},
-        {0x0000a528, 0x3c022f04, 0x3c022f04, 0x2b000a04, 0x2b000a04},
-        {0x0000a52c, 0x41023e85, 0x41023e85, 0x3f001620, 0x3f001620},
-        {0x0000a530, 0x48023ec6, 0x48023ec6, 0x41001621, 0x41001621},
-        {0x0000a534, 0x4d023f01, 0x4d023f01, 0x44001640, 0x44001640},
-        {0x0000a538, 0x53023f4b, 0x53023f4b, 0x46001641, 0x46001641},
-        {0x0000a53c, 0x5a027f09, 0x5a027f09, 0x48001642, 0x48001642},
-        {0x0000a540, 0x5f027fc9, 0x5f027fc9, 0x4b001644, 0x4b001644},
-        {0x0000a544, 0x6502feca, 0x6502feca, 0x4e001a81, 0x4e001a81},
-        {0x0000a548, 0x6b02ff4a, 0x6b02ff4a, 0x51001a83, 0x51001a83},
-        {0x0000a54c, 0x7203feca, 0x7203feca, 0x54001c84, 0x54001c84},
-        {0x0000a550, 0x7703ff0b, 0x7703ff0b, 0x57001ce3, 0x57001ce3},
-        {0x0000a554, 0x7d06ffcb, 0x7d06ffcb, 0x5b001ce5, 0x5b001ce5},
-        {0x0000a558, 0x8407ff0b, 0x8407ff0b, 0x5f001ce9, 0x5f001ce9},
-        {0x0000a55c, 0x8907ffcb, 0x8907ffcb, 0x66001eec, 0x66001eec},
-        {0x0000a560, 0x900fff0b, 0x900fff0b, 0x66001eec, 0x66001eec},
-        {0x0000a564, 0x960fffcb, 0x960fffcb, 0x66001eec, 0x66001eec},
-        {0x0000a568, 0x9c1fff0b, 0x9c1fff0b, 0x66001eec, 0x66001eec},
-        {0x0000a56c, 0x9c1fff0b, 0x9c1fff0b, 0x66001eec, 0x66001eec},
-        {0x0000a570, 0x9c1fff0b, 0x9c1fff0b, 0x66001eec, 0x66001eec},
-        {0x0000a574, 0x9c1fff0b, 0x9c1fff0b, 0x66001eec, 0x66001eec},
-        {0x0000a578, 0x9c1fff0b, 0x9c1fff0b, 0x66001eec, 0x66001eec},
-        {0x0000a57c, 0x9c1fff0b, 0x9c1fff0b, 0x66001eec, 0x66001eec},
-        {0x0000a580, 0x00022200, 0x00022200, 0x00000000, 0x00000000},
-        {0x0000a584, 0x05062002, 0x05062002, 0x04000002, 0x04000002},
-        {0x0000a588, 0x0c002e00, 0x0c002e00, 0x08000004, 0x08000004},
-        {0x0000a58c, 0x11062202, 0x11062202, 0x0b000200, 0x0b000200},
-        {0x0000a590, 0x17022e00, 0x17022e00, 0x0f000202, 0x0f000202},
-        {0x0000a594, 0x1d000ec2, 0x1d000ec2, 0x11000400, 0x11000400},
-        {0x0000a598, 0x25020ec0, 0x25020ec0, 0x15000402, 0x15000402},
-        {0x0000a59c, 0x2b020ec3, 0x2b020ec3, 0x19000404, 0x19000404},
-        {0x0000a5a0, 0x2f001f04, 0x2f001f04, 0x1b000603, 0x1b000603},
-        {0x0000a5a4, 0x35001fc4, 0x35001fc4, 0x1f000a02, 0x1f000a02},
-        {0x0000a5a8, 0x3c022f04, 0x3c022f04, 0x23000a04, 0x23000a04},
-        {0x0000a5ac, 0x41023e85, 0x41023e85, 0x26000a20, 0x26000a20},
-        {0x0000a5b0, 0x48023ec6, 0x48023ec6, 0x2a000e20, 0x2a000e20},
-        {0x0000a5b4, 0x4d023f01, 0x4d023f01, 0x2e000e22, 0x2e000e22},
-        {0x0000a5b8, 0x53023f4b, 0x53023f4b, 0x31000e24, 0x31000e24},
-        {0x0000a5bc, 0x5a027f09, 0x5a027f09, 0x34001640, 0x34001640},
-        {0x0000a5c0, 0x5f027fc9, 0x5f027fc9, 0x38001660, 0x38001660},
-        {0x0000a5c4, 0x6502feca, 0x6502feca, 0x3b001861, 0x3b001861},
-        {0x0000a5c8, 0x6b02ff4a, 0x6b02ff4a, 0x3e001a81, 0x3e001a81},
-        {0x0000a5cc, 0x7203feca, 0x7203feca, 0x42001a83, 0x42001a83},
-        {0x0000a5d0, 0x7703ff0b, 0x7703ff0b, 0x44001c84, 0x44001c84},
-        {0x0000a5d4, 0x7d06ffcb, 0x7d06ffcb, 0x48001ce3, 0x48001ce3},
-        {0x0000a5d8, 0x8407ff0b, 0x8407ff0b, 0x4c001ce5, 0x4c001ce5},
-        {0x0000a5dc, 0x8907ffcb, 0x8907ffcb, 0x50001ce9, 0x50001ce9},
-        {0x0000a5e0, 0x900fff0b, 0x900fff0b, 0x54001ceb, 0x54001ceb},
-        {0x0000a5e4, 0x960fffcb, 0x960fffcb, 0x56001eec, 0x56001eec},
-        {0x0000a5e8, 0x9c1fff0b, 0x9c1fff0b, 0x56001eec, 0x56001eec},
-        {0x0000a5ec, 0x9c1fff0b, 0x9c1fff0b, 0x56001eec, 0x56001eec},
-        {0x0000a5f0, 0x9c1fff0b, 0x9c1fff0b, 0x56001eec, 0x56001eec},
-        {0x0000a5f4, 0x9c1fff0b, 0x9c1fff0b, 0x56001eec, 0x56001eec},
-        {0x0000a5f8, 0x9c1fff0b, 0x9c1fff0b, 0x56001eec, 0x56001eec},
-        {0x0000a5fc, 0x9c1fff0b, 0x9c1fff0b, 0x56001eec, 0x56001eec},
-        {0x0000a600, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000a604, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000a608, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000a60c, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000a610, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000a614, 0x01404000, 0x01404000, 0x01404000, 0x01404000},
-        {0x0000a618, 0x02008501, 0x02008501, 0x02008501, 0x02008501},
-        {0x0000a61c, 0x02008802, 0x02008802, 0x02008802, 0x02008802},
-        {0x0000a620, 0x0300c802, 0x0300c802, 0x0300c802, 0x0300c802},
-        {0x0000a624, 0x0300cc03, 0x0300cc03, 0x0300cc03, 0x0300cc03},
-        {0x0000a628, 0x04011004, 0x04011004, 0x04011004, 0x04011004},
-        {0x0000a62c, 0x04011004, 0x04011004, 0x04011004, 0x04011004},
-        {0x0000a630, 0x04011004, 0x04011004, 0x04011004, 0x04011004},
-        {0x0000a634, 0x04011004, 0x04011004, 0x04011004, 0x04011004},
-        {0x0000a638, 0x04011004, 0x04011004, 0x04011004, 0x04011004},
-        {0x0000a63c, 0x04011004, 0x04011004, 0x04011004, 0x04011004},
-};
-
-static const u32 ar9331_1p2_baseband_core_txfir_coeff_japan_2484[][2] = {
-        /* Addr      allmodes  */
-        {0x0000a398, 0x00000000},
-        {0x0000a39c, 0x6f7f0301},
-        {0x0000a3a0, 0xca9228ee},
-};
-
-static const u32 ar9331_1p2_xtal_25M[][2] = {
-        /* Addr      allmodes  */
-        {0x00007038, 0x000002f8},
-        {0x00008244, 0x0010f3d7},
-        {0x0000824c, 0x0001e7ae},
-        {0x0001609c, 0x0f508f29},
-};
-
 static const u32 ar9331_1p2_radio_core[][2] = {
         /* Addr      allmodes  */
         {0x00016000, 0x36db6db6},
@@ -397,684 +219,24 @@ static const u32 ar9331_1p2_radio_core[][2] = {
         {0x000163d4, 0x00000000},
 };
 
-static const u32 ar9331_1p2_soc_postamble[][5] = {
-        /*  Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20  */
-        {0x00007010, 0x00000022, 0x00000022, 0x00000022, 0x00000022},
-};
+#define ar9331_1p2_baseband_core_txfir_coeff_japan_2484 ar9331_1p1_baseband_core_txfir_coeff_japan_2484
 
-static const u32 ar9331_common_wo_xlna_rx_gain_1p2[][2] = {
-        /* Addr      allmodes  */
-        {0x0000a000, 0x00060005},
-        {0x0000a004, 0x00810080},
-        {0x0000a008, 0x00830082},
-        {0x0000a00c, 0x00850084},
-        {0x0000a010, 0x01820181},
-        {0x0000a014, 0x01840183},
-        {0x0000a018, 0x01880185},
-        {0x0000a01c, 0x018a0189},
-        {0x0000a020, 0x02850284},
-        {0x0000a024, 0x02890288},
-        {0x0000a028, 0x028b028a},
-        {0x0000a02c, 0x03850384},
-        {0x0000a030, 0x03890388},
-        {0x0000a034, 0x038b038a},
-        {0x0000a038, 0x038d038c},
-        {0x0000a03c, 0x03910390},
-        {0x0000a040, 0x03930392},
-        {0x0000a044, 0x03950394},
-        {0x0000a048, 0x00000396},
-        {0x0000a04c, 0x00000000},
-        {0x0000a050, 0x00000000},
-        {0x0000a054, 0x00000000},
-        {0x0000a058, 0x00000000},
-        {0x0000a05c, 0x00000000},
-        {0x0000a060, 0x00000000},
-        {0x0000a064, 0x00000000},
-        {0x0000a068, 0x00000000},
-        {0x0000a06c, 0x00000000},
-        {0x0000a070, 0x00000000},
-        {0x0000a074, 0x00000000},
-        {0x0000a078, 0x00000000},
-        {0x0000a07c, 0x00000000},
-        {0x0000a080, 0x28282828},
-        {0x0000a084, 0x28282828},
-        {0x0000a088, 0x28282828},
-        {0x0000a08c, 0x28282828},
-        {0x0000a090, 0x28282828},
-        {0x0000a094, 0x24242428},
-        {0x0000a098, 0x171e1e1e},
-        {0x0000a09c, 0x02020b0b},
-        {0x0000a0a0, 0x02020202},
-        {0x0000a0a4, 0x00000000},
-        {0x0000a0a8, 0x00000000},
-        {0x0000a0ac, 0x00000000},
-        {0x0000a0b0, 0x00000000},
-        {0x0000a0b4, 0x00000000},
-        {0x0000a0b8, 0x00000000},
-        {0x0000a0bc, 0x00000000},
-        {0x0000a0c0, 0x22072208},
-        {0x0000a0c4, 0x22052206},
-        {0x0000a0c8, 0x22032204},
-        {0x0000a0cc, 0x22012202},
-        {0x0000a0d0, 0x221f2200},
-        {0x0000a0d4, 0x221d221e},
-        {0x0000a0d8, 0x33023303},
-        {0x0000a0dc, 0x33003301},
-        {0x0000a0e0, 0x331e331f},
-        {0x0000a0e4, 0x4402331d},
-        {0x0000a0e8, 0x44004401},
-        {0x0000a0ec, 0x441e441f},
-        {0x0000a0f0, 0x55025503},
-        {0x0000a0f4, 0x55005501},
-        {0x0000a0f8, 0x551e551f},
-        {0x0000a0fc, 0x6602551d},
-        {0x0000a100, 0x66006601},
-        {0x0000a104, 0x661e661f},
-        {0x0000a108, 0x7703661d},
-        {0x0000a10c, 0x77017702},
-        {0x0000a110, 0x00007700},
-        {0x0000a114, 0x00000000},
-        {0x0000a118, 0x00000000},
-        {0x0000a11c, 0x00000000},
-        {0x0000a120, 0x00000000},
-        {0x0000a124, 0x00000000},
-        {0x0000a128, 0x00000000},
-        {0x0000a12c, 0x00000000},
-        {0x0000a130, 0x00000000},
-        {0x0000a134, 0x00000000},
-        {0x0000a138, 0x00000000},
-        {0x0000a13c, 0x00000000},
-        {0x0000a140, 0x001f0000},
-        {0x0000a144, 0x111f1100},
-        {0x0000a148, 0x111d111e},
-        {0x0000a14c, 0x111b111c},
-        {0x0000a150, 0x22032204},
-        {0x0000a154, 0x22012202},
-        {0x0000a158, 0x221f2200},
-        {0x0000a15c, 0x221d221e},
-        {0x0000a160, 0x33013302},
-        {0x0000a164, 0x331f3300},
-        {0x0000a168, 0x4402331e},
-        {0x0000a16c, 0x44004401},
-        {0x0000a170, 0x441e441f},
-        {0x0000a174, 0x55015502},
-        {0x0000a178, 0x551f5500},
-        {0x0000a17c, 0x6602551e},
-        {0x0000a180, 0x66006601},
-        {0x0000a184, 0x661e661f},
-        {0x0000a188, 0x7703661d},
-        {0x0000a18c, 0x77017702},
-        {0x0000a190, 0x00007700},
-        {0x0000a194, 0x00000000},
-        {0x0000a198, 0x00000000},
-        {0x0000a19c, 0x00000000},
-        {0x0000a1a0, 0x00000000},
-        {0x0000a1a4, 0x00000000},
-        {0x0000a1a8, 0x00000000},
-        {0x0000a1ac, 0x00000000},
-        {0x0000a1b0, 0x00000000},
-        {0x0000a1b4, 0x00000000},
-        {0x0000a1b8, 0x00000000},
-        {0x0000a1bc, 0x00000000},
-        {0x0000a1c0, 0x00000000},
-        {0x0000a1c4, 0x00000000},
-        {0x0000a1c8, 0x00000000},
-        {0x0000a1cc, 0x00000000},
-        {0x0000a1d0, 0x00000000},
-        {0x0000a1d4, 0x00000000},
-        {0x0000a1d8, 0x00000000},
-        {0x0000a1dc, 0x00000000},
-        {0x0000a1e0, 0x00000000},
-        {0x0000a1e4, 0x00000000},
-        {0x0000a1e8, 0x00000000},
-        {0x0000a1ec, 0x00000000},
-        {0x0000a1f0, 0x00000396},
-        {0x0000a1f4, 0x00000396},
-        {0x0000a1f8, 0x00000396},
-        {0x0000a1fc, 0x00000296},
-};
+#define ar9331_1p2_xtal_25M ar9331_1p1_xtal_25M
 
-static const u32 ar9331_1p2_baseband_core[][2] = {
-        /* Addr      allmodes  */
-        {0x00009800, 0xafe68e30},
-        {0x00009804, 0xfd14e000},
-        {0x00009808, 0x9c0a8f6b},
-        {0x0000980c, 0x04800000},
-        {0x00009814, 0x9280c00a},
-        {0x00009818, 0x00000000},
-        {0x0000981c, 0x00020028},
-        {0x00009834, 0x5f3ca3de},
-        {0x00009838, 0x0108ecff},
-        {0x0000983c, 0x14750600},
-        {0x00009880, 0x201fff00},
-        {0x00009884, 0x00001042},
-        {0x000098a4, 0x00200400},
-        {0x000098b0, 0x32840bbe},
-        {0x000098d0, 0x004b6a8e},
-        {0x000098d4, 0x00000820},
-        {0x000098dc, 0x00000000},
-        {0x000098f0, 0x00000000},
-        {0x000098f4, 0x00000000},
-        {0x00009c04, 0x00000000},
-        {0x00009c08, 0x03200000},
-        {0x00009c0c, 0x00000000},
-        {0x00009c10, 0x00000000},
-        {0x00009c14, 0x00046384},
-        {0x00009c18, 0x05b6b440},
-        {0x00009c1c, 0x00b6b440},
-        {0x00009d00, 0xc080a333},
-        {0x00009d04, 0x40206c10},
-        {0x00009d08, 0x009c4060},
-        {0x00009d0c, 0x1883800a},
-        {0x00009d10, 0x01834061},
-        {0x00009d14, 0x00c00400},
-        {0x00009d18, 0x00000000},
-        {0x00009e08, 0x0038233c},
-        {0x00009e24, 0x9927b515},
-        {0x00009e28, 0x12ef0200},
-        {0x00009e30, 0x06336f77},
-        {0x00009e34, 0x6af6532f},
-        {0x00009e38, 0x0cc80c00},
-        {0x00009e40, 0x0d261820},
-        {0x00009e4c, 0x00001004},
-        {0x00009e50, 0x00ff03f1},
-        {0x00009fc0, 0x803e4788},
-        {0x00009fc4, 0x0001efb5},
-        {0x00009fcc, 0x40000014},
-        {0x0000a20c, 0x00000000},
-        {0x0000a220, 0x00000000},
-        {0x0000a224, 0x00000000},
-        {0x0000a228, 0x10002310},
-        {0x0000a23c, 0x00000000},
-        {0x0000a244, 0x0c000000},
-        {0x0000a2a0, 0x00000001},
-        {0x0000a2c0, 0x00000001},
-        {0x0000a2c8, 0x00000000},
-        {0x0000a2cc, 0x18c43433},
-        {0x0000a2d4, 0x00000000},
-        {0x0000a2dc, 0x00000000},
-        {0x0000a2e0, 0x00000000},
-        {0x0000a2e4, 0x00000000},
-        {0x0000a2e8, 0x00000000},
-        {0x0000a2ec, 0x00000000},
-        {0x0000a2f0, 0x00000000},
-        {0x0000a2f4, 0x00000000},
-        {0x0000a2f8, 0x00000000},
-        {0x0000a344, 0x00000000},
-        {0x0000a34c, 0x00000000},
-        {0x0000a350, 0x0000a000},
-        {0x0000a364, 0x00000000},
-        {0x0000a370, 0x00000000},
-        {0x0000a390, 0x00000001},
-        {0x0000a394, 0x00000444},
-        {0x0000a398, 0x001f0e0f},
-        {0x0000a39c, 0x0075393f},
-        {0x0000a3a0, 0xb79f6427},
-        {0x0000a3a4, 0x00000000},
-        {0x0000a3a8, 0xaaaaaaaa},
-        {0x0000a3ac, 0x3c466478},
-        {0x0000a3c0, 0x20202020},
-        {0x0000a3c4, 0x22222220},
-        {0x0000a3c8, 0x20200020},
-        {0x0000a3cc, 0x20202020},
-        {0x0000a3d0, 0x20202020},
-        {0x0000a3d4, 0x20202020},
-        {0x0000a3d8, 0x20202020},
-        {0x0000a3dc, 0x20202020},
-        {0x0000a3e0, 0x20202020},
-        {0x0000a3e4, 0x20202020},
-        {0x0000a3e8, 0x20202020},
-        {0x0000a3ec, 0x20202020},
-        {0x0000a3f0, 0x00000000},
-        {0x0000a3f4, 0x00000006},
-        {0x0000a3f8, 0x0cdbd380},
-        {0x0000a3fc, 0x000f0f01},
-        {0x0000a400, 0x8fa91f01},
-        {0x0000a404, 0x00000000},
-        {0x0000a408, 0x0e79e5c6},
-        {0x0000a40c, 0x00820820},
-        {0x0000a414, 0x1ce739ce},
-        {0x0000a418, 0x2d001dce},
-        {0x0000a41c, 0x1ce739ce},
-        {0x0000a420, 0x000001ce},
-        {0x0000a424, 0x1ce739ce},
-        {0x0000a428, 0x000001ce},
-        {0x0000a42c, 0x1ce739ce},
-        {0x0000a430, 0x1ce739ce},
-        {0x0000a434, 0x00000000},
-        {0x0000a438, 0x00001801},
-        {0x0000a43c, 0x00000000},
-        {0x0000a440, 0x00000000},
-        {0x0000a444, 0x00000000},
-        {0x0000a448, 0x04000000},
-        {0x0000a44c, 0x00000001},
-        {0x0000a450, 0x00010000},
-        {0x0000a458, 0x00000000},
-        {0x0000a640, 0x00000000},
-        {0x0000a644, 0x3fad9d74},
-        {0x0000a648, 0x0048060a},
-        {0x0000a64c, 0x00003c37},
-        {0x0000a670, 0x03020100},
-        {0x0000a674, 0x09080504},
-        {0x0000a678, 0x0d0c0b0a},
-        {0x0000a67c, 0x13121110},
-        {0x0000a680, 0x31301514},
-        {0x0000a684, 0x35343332},
-        {0x0000a688, 0x00000036},
-        {0x0000a690, 0x00000838},
-        {0x0000a7c0, 0x00000000},
-        {0x0000a7c4, 0xfffffffc},
-        {0x0000a7c8, 0x00000000},
-        {0x0000a7cc, 0x00000000},
-        {0x0000a7d0, 0x00000000},
-        {0x0000a7d4, 0x00000004},
-        {0x0000a7dc, 0x00000001},
-};
+#define ar9331_1p2_xtal_40M ar9331_1p1_xtal_40M
 
-static const u32 ar9331_modes_high_power_tx_gain_1p2[][5] = {
-        /*  Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20  */
-        {0x0000a410, 0x000050d7, 0x000050d7, 0x000050d7, 0x000050d7},
-        {0x0000a500, 0x00022200, 0x00022200, 0x00000000, 0x00000000},
-        {0x0000a504, 0x05062002, 0x05062002, 0x04000002, 0x04000002},
-        {0x0000a508, 0x0c002e00, 0x0c002e00, 0x08000004, 0x08000004},
-        {0x0000a50c, 0x11062202, 0x11062202, 0x0d000200, 0x0d000200},
-        {0x0000a510, 0x17022e00, 0x17022e00, 0x11000202, 0x11000202},
-        {0x0000a514, 0x1d000ec2, 0x1d000ec2, 0x15000400, 0x15000400},
-        {0x0000a518, 0x25020ec0, 0x25020ec0, 0x19000402, 0x19000402},
-        {0x0000a51c, 0x2b020ec3, 0x2b020ec3, 0x1d000404, 0x1d000404},
-        {0x0000a520, 0x2f001f04, 0x2f001f04, 0x23000a00, 0x23000a00},
-        {0x0000a524, 0x35001fc4, 0x35001fc4, 0x27000a02, 0x27000a02},
-        {0x0000a528, 0x3c022f04, 0x3c022f04, 0x2b000a04, 0x2b000a04},
-        {0x0000a52c, 0x41023e85, 0x41023e85, 0x3f001620, 0x3f001620},
-        {0x0000a530, 0x48023ec6, 0x48023ec6, 0x41001621, 0x41001621},
-        {0x0000a534, 0x4d023f01, 0x4d023f01, 0x44001640, 0x44001640},
-        {0x0000a538, 0x53023f4b, 0x53023f4b, 0x46001641, 0x46001641},
-        {0x0000a53c, 0x5a027f09, 0x5a027f09, 0x48001642, 0x48001642},
-        {0x0000a540, 0x5f027fc9, 0x5f027fc9, 0x4b001644, 0x4b001644},
-        {0x0000a544, 0x6502feca, 0x6502feca, 0x4e001a81, 0x4e001a81},
-        {0x0000a548, 0x6b02ff4a, 0x6b02ff4a, 0x51001a83, 0x51001a83},
-        {0x0000a54c, 0x7203feca, 0x7203feca, 0x54001c84, 0x54001c84},
-        {0x0000a550, 0x7703ff0b, 0x7703ff0b, 0x57001ce3, 0x57001ce3},
-        {0x0000a554, 0x7d06ffcb, 0x7d06ffcb, 0x5b001ce5, 0x5b001ce5},
-        {0x0000a558, 0x8407ff0b, 0x8407ff0b, 0x5f001ce9, 0x5f001ce9},
-        {0x0000a55c, 0x8907ffcb, 0x8907ffcb, 0x66001eec, 0x66001eec},
-        {0x0000a560, 0x900fff0b, 0x900fff0b, 0x66001eec, 0x66001eec},
-        {0x0000a564, 0x960fffcb, 0x960fffcb, 0x66001eec, 0x66001eec},
-        {0x0000a568, 0x9c1fff0b, 0x9c1fff0b, 0x66001eec, 0x66001eec},
-        {0x0000a56c, 0x9c1fff0b, 0x9c1fff0b, 0x66001eec, 0x66001eec},
-        {0x0000a570, 0x9c1fff0b, 0x9c1fff0b, 0x66001eec, 0x66001eec},
-        {0x0000a574, 0x9c1fff0b, 0x9c1fff0b, 0x66001eec, 0x66001eec},
-        {0x0000a578, 0x9c1fff0b, 0x9c1fff0b, 0x66001eec, 0x66001eec},
-        {0x0000a57c, 0x9c1fff0b, 0x9c1fff0b, 0x66001eec, 0x66001eec},
-        {0x0000a580, 0x00022200, 0x00022200, 0x00000000, 0x00000000},
-        {0x0000a584, 0x05062002, 0x05062002, 0x04000002, 0x04000002},
-        {0x0000a588, 0x0c002e00, 0x0c002e00, 0x08000004, 0x08000004},
-        {0x0000a58c, 0x11062202, 0x11062202, 0x0b000200, 0x0b000200},
-        {0x0000a590, 0x17022e00, 0x17022e00, 0x0f000202, 0x0f000202},
-        {0x0000a594, 0x1d000ec2, 0x1d000ec2, 0x11000400, 0x11000400},
-        {0x0000a598, 0x25020ec0, 0x25020ec0, 0x15000402, 0x15000402},
-        {0x0000a59c, 0x2b020ec3, 0x2b020ec3, 0x19000404, 0x19000404},
-        {0x0000a5a0, 0x2f001f04, 0x2f001f04, 0x1b000603, 0x1b000603},
-        {0x0000a5a4, 0x35001fc4, 0x35001fc4, 0x1f000a02, 0x1f000a02},
-        {0x0000a5a8, 0x3c022f04, 0x3c022f04, 0x23000a04, 0x23000a04},
-        {0x0000a5ac, 0x41023e85, 0x41023e85, 0x26000a20, 0x26000a20},
-        {0x0000a5b0, 0x48023ec6, 0x48023ec6, 0x2a000e20, 0x2a000e20},
-        {0x0000a5b4, 0x4d023f01, 0x4d023f01, 0x2e000e22, 0x2e000e22},
-        {0x0000a5b8, 0x53023f4b, 0x53023f4b, 0x31000e24, 0x31000e24},
-        {0x0000a5bc, 0x5a027f09, 0x5a027f09, 0x34001640, 0x34001640},
-        {0x0000a5c0, 0x5f027fc9, 0x5f027fc9, 0x38001660, 0x38001660},
-        {0x0000a5c4, 0x6502feca, 0x6502feca, 0x3b001861, 0x3b001861},
-        {0x0000a5c8, 0x6b02ff4a, 0x6b02ff4a, 0x3e001a81, 0x3e001a81},
-        {0x0000a5cc, 0x7203feca, 0x7203feca, 0x42001a83, 0x42001a83},
-        {0x0000a5d0, 0x7703ff0b, 0x7703ff0b, 0x44001c84, 0x44001c84},
-        {0x0000a5d4, 0x7d06ffcb, 0x7d06ffcb, 0x48001ce3, 0x48001ce3},
-        {0x0000a5d8, 0x8407ff0b, 0x8407ff0b, 0x4c001ce5, 0x4c001ce5},
-        {0x0000a5dc, 0x8907ffcb, 0x8907ffcb, 0x50001ce9, 0x50001ce9},
-        {0x0000a5e0, 0x900fff0b, 0x900fff0b, 0x54001ceb, 0x54001ceb},
-        {0x0000a5e4, 0x960fffcb, 0x960fffcb, 0x56001eec, 0x56001eec},
-        {0x0000a5e8, 0x9c1fff0b, 0x9c1fff0b, 0x56001eec, 0x56001eec},
-        {0x0000a5ec, 0x9c1fff0b, 0x9c1fff0b, 0x56001eec, 0x56001eec},
-        {0x0000a5f0, 0x9c1fff0b, 0x9c1fff0b, 0x56001eec, 0x56001eec},
-        {0x0000a5f4, 0x9c1fff0b, 0x9c1fff0b, 0x56001eec, 0x56001eec},
-        {0x0000a5f8, 0x9c1fff0b, 0x9c1fff0b, 0x56001eec, 0x56001eec},
-        {0x0000a5fc, 0x9c1fff0b, 0x9c1fff0b, 0x56001eec, 0x56001eec},
-        {0x0000a600, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000a604, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000a608, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000a60c, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000a610, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000a614, 0x01404000, 0x01404000, 0x01404000, 0x01404000},
-        {0x0000a618, 0x02008501, 0x02008501, 0x02008501, 0x02008501},
-        {0x0000a61c, 0x02008802, 0x02008802, 0x02008802, 0x02008802},
-        {0x0000a620, 0x0300c802, 0x0300c802, 0x0300c802, 0x0300c802},
-        {0x0000a624, 0x0300cc03, 0x0300cc03, 0x0300cc03, 0x0300cc03},
-        {0x0000a628, 0x04011004, 0x04011004, 0x04011004, 0x04011004},
-        {0x0000a62c, 0x04011004, 0x04011004, 0x04011004, 0x04011004},
-        {0x0000a630, 0x04011004, 0x04011004, 0x04011004, 0x04011004},
-        {0x0000a634, 0x04011004, 0x04011004, 0x04011004, 0x04011004},
-        {0x0000a638, 0x04011004, 0x04011004, 0x04011004, 0x04011004},
-        {0x0000a63c, 0x04011004, 0x04011004, 0x04011004, 0x04011004},
-};
+#define ar9331_1p2_baseband_core ar9331_1p1_baseband_core
 
-static const u32 ar9331_1p2_mac_postamble[][5] = {
-        /*  Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20  */
-        {0x00001030, 0x00000230, 0x00000460, 0x000002c0, 0x00000160},
-        {0x00001070, 0x00000168, 0x000002d0, 0x00000318, 0x0000018c},
-        {0x000010b0, 0x00000e60, 0x00001cc0, 0x00007c70, 0x00003e38},
-        {0x00008014, 0x03e803e8, 0x07d007d0, 0x10801600, 0x08400b00},
-        {0x0000801c, 0x128d8027, 0x128d804f, 0x12e00057, 0x12e0002b},
-        {0x00008120, 0x08f04800, 0x08f04800, 0x08f04810, 0x08f04810},
-        {0x000081d0, 0x00003210, 0x00003210, 0x0000320a, 0x0000320a},
-        {0x00008318, 0x00003e80, 0x00007d00, 0x00006880, 0x00003440},
-};
+#define ar9331_1p2_soc_postamble ar9331_1p1_soc_postamble
 
-static const u32 ar9331_1p2_soc_preamble[][2] = {
-        /* Addr      allmodes  */
-        {0x00007020, 0x00000000},
-        {0x00007034, 0x00000002},
-        {0x00007038, 0x000002f8},
-};
+#define ar9331_1p2_mac_postamble ar9331_1p1_mac_postamble
 
-static const u32 ar9331_1p2_xtal_40M[][2] = {
-        /* Addr      allmodes  */
-        {0x00007038, 0x000004c2},
-        {0x00008244, 0x0010f400},
-        {0x0000824c, 0x0001e800},
-        {0x0001609c, 0x0b283f31},
-};
+#define ar9331_1p2_soc_preamble ar9331_1p1_soc_preamble
 
-static const u32 ar9331_1p2_mac_core[][2] = {
-        /* Addr      allmodes  */
-        {0x00000008, 0x00000000},
-        {0x00000030, 0x00020085},
-        {0x00000034, 0x00000005},
-        {0x00000040, 0x00000000},
-        {0x00000044, 0x00000000},
-        {0x00000048, 0x00000008},
-        {0x0000004c, 0x00000010},
-        {0x00000050, 0x00000000},
-        {0x00001040, 0x002ffc0f},
-        {0x00001044, 0x002ffc0f},
-        {0x00001048, 0x002ffc0f},
-        {0x0000104c, 0x002ffc0f},
-        {0x00001050, 0x002ffc0f},
-        {0x00001054, 0x002ffc0f},
-        {0x00001058, 0x002ffc0f},
-        {0x0000105c, 0x002ffc0f},
-        {0x00001060, 0x002ffc0f},
-        {0x00001064, 0x002ffc0f},
-        {0x000010f0, 0x00000100},
-        {0x00001270, 0x00000000},
-        {0x000012b0, 0x00000000},
-        {0x000012f0, 0x00000000},
-        {0x0000143c, 0x00000000},
-        {0x0000147c, 0x00000000},
-        {0x00008000, 0x00000000},
-        {0x00008004, 0x00000000},
-        {0x00008008, 0x00000000},
-        {0x0000800c, 0x00000000},
-        {0x00008018, 0x00000000},
-        {0x00008020, 0x00000000},
-        {0x00008038, 0x00000000},
-        {0x0000803c, 0x00000000},
-        {0x00008040, 0x00000000},
-        {0x00008044, 0x00000000},
-        {0x00008048, 0x00000000},
-        {0x0000804c, 0xffffffff},
-        {0x00008054, 0x00000000},
-        {0x00008058, 0x00000000},
-        {0x0000805c, 0x000fc78f},
-        {0x00008060, 0x0000000f},
-        {0x00008064, 0x00000000},
-        {0x00008070, 0x00000310},
-        {0x00008074, 0x00000020},
-        {0x00008078, 0x00000000},
-        {0x0000809c, 0x0000000f},
-        {0x000080a0, 0x00000000},
-        {0x000080a4, 0x02ff0000},
-        {0x000080a8, 0x0e070605},
-        {0x000080ac, 0x0000000d},
-        {0x000080b0, 0x00000000},
-        {0x000080b4, 0x00000000},
-        {0x000080b8, 0x00000000},
-        {0x000080bc, 0x00000000},
-        {0x000080c0, 0x2a800000},
-        {0x000080c4, 0x06900168},
-        {0x000080c8, 0x13881c20},
-        {0x000080cc, 0x01f40000},
-        {0x000080d0, 0x00252500},
-        {0x000080d4, 0x00a00000},
-        {0x000080d8, 0x00400000},
-        {0x000080dc, 0x00000000},
-        {0x000080e0, 0xffffffff},
-        {0x000080e4, 0x0000ffff},
-        {0x000080e8, 0x3f3f3f3f},
-        {0x000080ec, 0x00000000},
-        {0x000080f0, 0x00000000},
-        {0x000080f4, 0x00000000},
-        {0x000080fc, 0x00020000},
-        {0x00008100, 0x00000000},
-        {0x00008108, 0x00000052},
-        {0x0000810c, 0x00000000},
-        {0x00008110, 0x00000000},
-        {0x00008114, 0x000007ff},
-        {0x00008118, 0x000000aa},
-        {0x0000811c, 0x00003210},
-        {0x00008124, 0x00000000},
-        {0x00008128, 0x00000000},
-        {0x0000812c, 0x00000000},
-        {0x00008130, 0x00000000},
-        {0x00008134, 0x00000000},
-        {0x00008138, 0x00000000},
-        {0x0000813c, 0x0000ffff},
-        {0x00008144, 0xffffffff},
-        {0x00008168, 0x00000000},
-        {0x0000816c, 0x00000000},
-        {0x00008170, 0x18486200},
-        {0x00008174, 0x33332210},
-        {0x00008178, 0x00000000},
-        {0x0000817c, 0x00020000},
-        {0x000081c0, 0x00000000},
-        {0x000081c4, 0x33332210},
-        {0x000081c8, 0x00000000},
-        {0x000081cc, 0x00000000},
-        {0x000081d4, 0x00000000},
-        {0x000081ec, 0x00000000},
-        {0x000081f0, 0x00000000},
-        {0x000081f4, 0x00000000},
-        {0x000081f8, 0x00000000},
-        {0x000081fc, 0x00000000},
-        {0x00008240, 0x00100000},
-        {0x00008248, 0x00000800},
-        {0x00008250, 0x00000000},
-        {0x00008254, 0x00000000},
-        {0x00008258, 0x00000000},
-        {0x0000825c, 0x40000000},
-        {0x00008260, 0x00080922},
-        {0x00008264, 0x9d400010},
-        {0x00008268, 0xffffffff},
-        {0x0000826c, 0x0000ffff},
-        {0x00008270, 0x00000000},
-        {0x00008274, 0x40000000},
-        {0x00008278, 0x003e4180},
-        {0x0000827c, 0x00000004},
-        {0x00008284, 0x0000002c},
-        {0x00008288, 0x0000002c},
-        {0x0000828c, 0x000000ff},
-        {0x00008294, 0x00000000},
-        {0x00008298, 0x00000000},
-        {0x0000829c, 0x00000000},
-        {0x00008300, 0x00000140},
-        {0x00008314, 0x00000000},
-        {0x0000831c, 0x0000010d},
-        {0x00008328, 0x00000000},
-        {0x0000832c, 0x00000007},
-        {0x00008330, 0x00000302},
-        {0x00008334, 0x00000700},
-        {0x00008338, 0x00ff0000},
-        {0x0000833c, 0x02400000},
-        {0x00008340, 0x000107ff},
-        {0x00008344, 0xaa48105b},
-        {0x00008348, 0x008f0000},
-        {0x0000835c, 0x00000000},
-        {0x00008360, 0xffffffff},
-        {0x00008364, 0xffffffff},
-        {0x00008368, 0x00000000},
-        {0x00008370, 0x00000000},
-        {0x00008374, 0x000000ff},
-        {0x00008378, 0x00000000},
-        {0x0000837c, 0x00000000},
-        {0x00008380, 0xffffffff},
-        {0x00008384, 0xffffffff},
-        {0x00008390, 0xffffffff},
-        {0x00008394, 0xffffffff},
-        {0x00008398, 0x00000000},
-        {0x0000839c, 0x00000000},
-        {0x000083a0, 0x00000000},
-        {0x000083a4, 0x0000fa14},
-        {0x000083a8, 0x000f0c00},
-        {0x000083ac, 0x33332210},
-        {0x000083b0, 0x33332210},
-        {0x000083b4, 0x33332210},
-        {0x000083b8, 0x33332210},
-        {0x000083bc, 0x00000000},
-        {0x000083c0, 0x00000000},
-        {0x000083c4, 0x00000000},
-        {0x000083c8, 0x00000000},
-        {0x000083cc, 0x00000200},
-        {0x000083d0, 0x000301ff},
-};
+#define ar9331_1p2_mac_core ar9331_1p1_mac_core
 
-static const u32 ar9331_common_rx_gain_1p2[][2] = {
-        /* Addr      allmodes  */
-        {0x0000a000, 0x00010000},
-        {0x0000a004, 0x00030002},
-        {0x0000a008, 0x00050004},
-        {0x0000a00c, 0x00810080},
-        {0x0000a010, 0x01800082},
-        {0x0000a014, 0x01820181},
-        {0x0000a018, 0x01840183},
-        {0x0000a01c, 0x01880185},
-        {0x0000a020, 0x018a0189},
-        {0x0000a024, 0x02850284},
-        {0x0000a028, 0x02890288},
-        {0x0000a02c, 0x03850384},
-        {0x0000a030, 0x03890388},
-        {0x0000a034, 0x038b038a},
-        {0x0000a038, 0x038d038c},
-        {0x0000a03c, 0x03910390},
-        {0x0000a040, 0x03930392},
-        {0x0000a044, 0x03950394},
-        {0x0000a048, 0x00000396},
-        {0x0000a04c, 0x00000000},
-        {0x0000a050, 0x00000000},
-        {0x0000a054, 0x00000000},
-        {0x0000a058, 0x00000000},
-        {0x0000a05c, 0x00000000},
-        {0x0000a060, 0x00000000},
-        {0x0000a064, 0x00000000},
-        {0x0000a068, 0x00000000},
-        {0x0000a06c, 0x00000000},
-        {0x0000a070, 0x00000000},
-        {0x0000a074, 0x00000000},
-        {0x0000a078, 0x00000000},
-        {0x0000a07c, 0x00000000},
-        {0x0000a080, 0x28282828},
-        {0x0000a084, 0x28282828},
-        {0x0000a088, 0x28282828},
-        {0x0000a08c, 0x28282828},
-        {0x0000a090, 0x28282828},
-        {0x0000a094, 0x21212128},
-        {0x0000a098, 0x171c1c1c},
-        {0x0000a09c, 0x02020212},
-        {0x0000a0a0, 0x00000202},
-        {0x0000a0a4, 0x00000000},
-        {0x0000a0a8, 0x00000000},
-        {0x0000a0ac, 0x00000000},
-        {0x0000a0b0, 0x00000000},
-        {0x0000a0b4, 0x00000000},
-        {0x0000a0b8, 0x00000000},
-        {0x0000a0bc, 0x00000000},
-        {0x0000a0c0, 0x001f0000},
-        {0x0000a0c4, 0x111f1100},
-        {0x0000a0c8, 0x111d111e},
-        {0x0000a0cc, 0x111b111c},
-        {0x0000a0d0, 0x22032204},
-        {0x0000a0d4, 0x22012202},
-        {0x0000a0d8, 0x221f2200},
-        {0x0000a0dc, 0x221d221e},
-        {0x0000a0e0, 0x33013302},
-        {0x0000a0e4, 0x331f3300},
-        {0x0000a0e8, 0x4402331e},
-        {0x0000a0ec, 0x44004401},
-        {0x0000a0f0, 0x441e441f},
-        {0x0000a0f4, 0x55015502},
-        {0x0000a0f8, 0x551f5500},
-        {0x0000a0fc, 0x6602551e},
-        {0x0000a100, 0x66006601},
-        {0x0000a104, 0x661e661f},
-        {0x0000a108, 0x7703661d},
-        {0x0000a10c, 0x77017702},
-        {0x0000a110, 0x00007700},
-        {0x0000a114, 0x00000000},
-        {0x0000a118, 0x00000000},
-        {0x0000a11c, 0x00000000},
-        {0x0000a120, 0x00000000},
-        {0x0000a124, 0x00000000},
-        {0x0000a128, 0x00000000},
-        {0x0000a12c, 0x00000000},
-        {0x0000a130, 0x00000000},
-        {0x0000a134, 0x00000000},
-        {0x0000a138, 0x00000000},
-        {0x0000a13c, 0x00000000},
-        {0x0000a140, 0x001f0000},
-        {0x0000a144, 0x111f1100},
-        {0x0000a148, 0x111d111e},
-        {0x0000a14c, 0x111b111c},
-        {0x0000a150, 0x22032204},
-        {0x0000a154, 0x22012202},
-        {0x0000a158, 0x221f2200},
-        {0x0000a15c, 0x221d221e},
-        {0x0000a160, 0x33013302},
-        {0x0000a164, 0x331f3300},
-        {0x0000a168, 0x4402331e},
-        {0x0000a16c, 0x44004401},
-        {0x0000a170, 0x441e441f},
-        {0x0000a174, 0x55015502},
-        {0x0000a178, 0x551f5500},
-        {0x0000a17c, 0x6602551e},
-        {0x0000a180, 0x66006601},
-        {0x0000a184, 0x661e661f},
-        {0x0000a188, 0x7703661d},
-        {0x0000a18c, 0x77017702},
-        {0x0000a190, 0x00007700},
-        {0x0000a194, 0x00000000},
-        {0x0000a198, 0x00000000},
-        {0x0000a19c, 0x00000000},
-        {0x0000a1a0, 0x00000000},
-        {0x0000a1a4, 0x00000000},
-        {0x0000a1a8, 0x00000000},
-        {0x0000a1ac, 0x00000000},
-        {0x0000a1b0, 0x00000000},
-        {0x0000a1b4, 0x00000000},
-        {0x0000a1b8, 0x00000000},
-        {0x0000a1bc, 0x00000000},
-        {0x0000a1c0, 0x00000000},
-        {0x0000a1c4, 0x00000000},
-        {0x0000a1c8, 0x00000000},
-        {0x0000a1cc, 0x00000000},
-        {0x0000a1d0, 0x00000000},
-        {0x0000a1d4, 0x00000000},
-        {0x0000a1d8, 0x00000000},
-        {0x0000a1dc, 0x00000000},
-        {0x0000a1e0, 0x00000000},
-        {0x0000a1e4, 0x00000000},
-        {0x0000a1e8, 0x00000000},
-        {0x0000a1ec, 0x00000000},
-        {0x0000a1f0, 0x00000396},
-        {0x0000a1f4, 0x00000396},
-        {0x0000a1f8, 0x00000396},
-        {0x0000a1fc, 0x00000296},
-};
+#define ar9331_common_wo_xlna_rx_gain_1p2 ar9331_common_wo_xlna_rx_gain_1p1
+
+#define ar9331_common_rx_gain_1p2 ar9485_common_rx_gain_1_1
 
 #endif /* INITVALS_9330_1P2_H */
diff --git a/drivers/net/wireless/ath/ath9k/ar9340_initvals.h b/drivers/net/wireless/ath/ath9k/ar9340_initvals.h
index 815a8af1bee..1d8235e19f0 100644
--- a/drivers/net/wireless/ath/ath9k/ar9340_initvals.h
+++ b/drivers/net/wireless/ath/ath9k/ar9340_initvals.h
@@ -1,5 +1,6 @@
 /*
- * Copyright (c) 2011 Atheros Communications Inc.
+ * Copyright (c) 2010-2011 Atheros Communications Inc.
+ * Copyright (c) 2011-2012 Qualcomm Atheros Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -18,16 +19,16 @@
 #define INITVALS_9340_H
 
 static const u32 ar9340_1p0_radio_postamble[][5] = {
-        /*  Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20  */
+        /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
         {0x000160ac, 0xa4646800, 0xa4646800, 0xa4646800, 0xa4646800},
-        {0x0001610c, 0x08000000, 0x08000000, 0x00000000, 0x00000000},
+        {0x0001610c, 0x08000000, 0x00000000, 0x00000000, 0x00000000},
         {0x00016140, 0x10804000, 0x10804000, 0x50804000, 0x50804000},
-        {0x0001650c, 0x08000000, 0x08000000, 0x00000000, 0x00000000},
+        {0x0001650c, 0x08000000, 0x00000000, 0x00000000, 0x00000000},
         {0x00016540, 0x10804000, 0x10804000, 0x50804000, 0x50804000},
 };
 
 static const u32 ar9340Modes_lowest_ob_db_tx_gain_table_1p0[][5] = {
-        /*   Addr     5G_HT20     5G_HT40     2G_HT40     2G_HT20  */
+        /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
         {0x0000a410, 0x000050d9, 0x000050d9, 0x000050d9, 0x000050d9},
         {0x0000a500, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
         {0x0000a504, 0x06000003, 0x06000003, 0x04000002, 0x04000002},
@@ -99,21 +100,10 @@ static const u32 ar9340Modes_lowest_ob_db_tx_gain_table_1p0[][5] = {
         {0x00016448, 0x24925266, 0x24925266, 0x24925266, 0x24925266},
 };
 
-static const u32 ar9340Modes_fast_clock_1p0[][3] = {
-        /*  Addr      5G_HT20     5G_HT40  */
-        {0x00001030, 0x00000268, 0x000004d0},
-        {0x00001070, 0x0000018c, 0x00000318},
-        {0x000010b0, 0x00000fd0, 0x00001fa0},
-        {0x00008014, 0x044c044c, 0x08980898},
-        {0x0000801c, 0x148ec02b, 0x148ec057},
-        {0x00008318, 0x000044c0, 0x00008980},
-        {0x00009e00, 0x03721821, 0x03721821},
-        {0x0000a230, 0x0000000b, 0x00000016},
-        {0x0000a254, 0x00000898, 0x00001130},
-};
+#define ar9340Modes_fast_clock_1p0 ar9300Modes_fast_clock_2p2
 
 static const u32 ar9340_1p0_radio_core[][2] = {
-        /*  Addr     allmodes  */
+        /* Addr      allmodes  */
         {0x00016000, 0x36db6db6},
         {0x00016004, 0x6db6db40},
         {0x00016008, 0x73f00000},
@@ -146,15 +136,13 @@ static const u32 ar9340_1p0_radio_core[][2] = {
         {0x00016100, 0x04cb0001},
         {0x00016104, 0xfff80000},
         {0x00016108, 0x00080010},
-        {0x0001610c, 0x00000000},
         {0x00016140, 0x50804008},
         {0x00016144, 0x01884080},
         {0x00016148, 0x000080c0},
         {0x00016280, 0x01000015},
-        {0x00016284, 0x05530000},
+        {0x00016284, 0x15530000},
         {0x00016288, 0x00318000},
         {0x0001628c, 0x50000000},
-        {0x00016290, 0x4080294f},
         {0x00016380, 0x00000000},
         {0x00016384, 0x00000000},
         {0x00016388, 0x00800700},
@@ -219,52 +207,43 @@ static const u32 ar9340_1p0_radio_core[][2] = {
 };
 
 static const u32 ar9340_1p0_radio_core_40M[][2] = {
+        /* Addr      allmodes  */
         {0x0001609c, 0x02566f3a},
         {0x000160ac, 0xa4647c00},
         {0x000160b0, 0x01885f5a},
 };
 
-static const u32 ar9340_1p0_mac_postamble[][5] = {
-        /* Addr       5G_HT20     5G_HT40     2G_HT40    2G_HT20  */
-        {0x00001030, 0x00000230, 0x00000460, 0x000002c0, 0x00000160},
-        {0x00001070, 0x00000168, 0x000002d0, 0x00000318, 0x0000018c},
-        {0x000010b0, 0x00000e60, 0x00001cc0, 0x00007c70, 0x00003e38},
-        {0x00008014, 0x03e803e8, 0x07d007d0, 0x10801600, 0x08400b00},
-        {0x0000801c, 0x128d8027, 0x128d804f, 0x12e00057, 0x12e0002b},
-        {0x00008120, 0x08f04800, 0x08f04800, 0x08f04810, 0x08f04810},
-        {0x000081d0, 0x00003210, 0x00003210, 0x0000320a, 0x0000320a},
-        {0x00008318, 0x00003e80, 0x00007d00, 0x00006880, 0x00003440},
-};
+#define ar9340_1p0_mac_postamble ar9300_2p2_mac_postamble
 
-static const u32 ar9340_1p0_soc_postamble[][5] = {
-        /*   Addr     5G_HT20     5G_HT40     2G_HT40     2G_HT20  */
-        {0x00007010, 0x00000023, 0x00000023, 0x00000023, 0x00000023},
-};
+#define ar9340_1p0_soc_postamble ar9300_2p2_soc_postamble
 
 static const u32 ar9340_1p0_baseband_postamble[][5] = {
-        /*  Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20  */
+        /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
         {0x00009810, 0xd00a8005, 0xd00a8005, 0xd00a8011, 0xd00a8011},
         {0x00009820, 0x206a022e, 0x206a022e, 0x206a022e, 0x206a022e},
         {0x00009824, 0x5ac640d0, 0x5ac640d0, 0x5ac640d0, 0x5ac640d0},
         {0x00009828, 0x06903081, 0x06903081, 0x06903881, 0x06903881},
         {0x0000982c, 0x05eea6d4, 0x05eea6d4, 0x05eea6d4, 0x05eea6d4},
         {0x00009830, 0x0000059c, 0x0000059c, 0x0000119c, 0x0000119c},
-        {0x00009c00, 0x00000044, 0x000000c4, 0x000000c4, 0x00000044},
-        {0x00009e00, 0x0372161e, 0x0372161e, 0x037216a0, 0x037216a0},
-        {0x00009e04, 0x00182020, 0x00182020, 0x00182020, 0x00182020},
+        {0x00009c00, 0x000000c4, 0x000000c4, 0x000000c4, 0x000000c4},
+        {0x00009e00, 0x0372111a, 0x0372111a, 0x037216a0, 0x037216a0},
+        {0x00009e04, 0x001c2020, 0x001c2020, 0x001c2020, 0x001c2020},
         {0x00009e0c, 0x6c4000e2, 0x6d4000e2, 0x6d4000e2, 0x6c4000e2},
         {0x00009e10, 0x7ec88d2e, 0x7ec88d2e, 0x7ec88d2e, 0x7ec88d2e},
-        {0x00009e14, 0x31395d5e, 0x3139605e, 0x3139605e, 0x31395d5e},
+        {0x00009e14, 0x37b95d5e, 0x37b9605e, 0x3379605e, 0x33795d5e},
         {0x00009e18, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
         {0x00009e1c, 0x0001cf9c, 0x0001cf9c, 0x00021f9c, 0x00021f9c},
         {0x00009e20, 0x000003b5, 0x000003b5, 0x000003ce, 0x000003ce},
         {0x00009e2c, 0x0000001c, 0x0000001c, 0x00000021, 0x00000021},
+        {0x00009e3c, 0xcf946220, 0xcf946220, 0xcf946222, 0xcf946222},
         {0x00009e44, 0x02321e27, 0x02321e27, 0x02291e27, 0x02291e27},
         {0x00009e48, 0x5030201a, 0x5030201a, 0x50302012, 0x50302012},
         {0x00009fc8, 0x0003f000, 0x0003f000, 0x0001a000, 0x0001a000},
-        {0x0000a204, 0x00003fc0, 0x00003fc4, 0x00003fc4, 0x00003fc0},
+        {0x0000a204, 0x00003ec0, 0x00003ec4, 0x00003ec4, 0x00003ec0},
         {0x0000a208, 0x00000104, 0x00000104, 0x00000004, 0x00000004},
+        {0x0000a22c, 0x07e26a2f, 0x07e26a2f, 0x01026a2f, 0x01026a2f},
         {0x0000a230, 0x0000000a, 0x00000014, 0x00000016, 0x0000000b},
+        {0x0000a234, 0x00000fff, 0x10000fff, 0x10000fff, 0x00000fff},
         {0x0000a238, 0xffb81018, 0xffb81018, 0xffb81018, 0xffb81018},
         {0x0000a250, 0x00000000, 0x00000000, 0x00000210, 0x00000108},
         {0x0000a254, 0x000007d0, 0x00000fa0, 0x00001130, 0x00000898},
@@ -277,11 +256,11 @@ static const u32 ar9340_1p0_baseband_postamble[][5] = {
         {0x0000a288, 0x00000220, 0x00000220, 0x00000110, 0x00000110},
         {0x0000a28c, 0x00011111, 0x00011111, 0x00022222, 0x00022222},
         {0x0000a2c4, 0x00158d18, 0x00158d18, 0x00158d18, 0x00158d18},
-        {0x0000a2d0, 0x00071981, 0x00071981, 0x00071981, 0x00071982},
-        {0x0000a2d8, 0xf999a83a, 0xf999a83a, 0xf999a83a, 0xf999a83a},
+        {0x0000a2d0, 0x00041983, 0x00041983, 0x00041982, 0x00041982},
+        {0x0000a2d8, 0x7999a83a, 0x7999a83a, 0x7999a83a, 0x7999a83a},
         {0x0000a358, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
         {0x0000a830, 0x0000019c, 0x0000019c, 0x0000019c, 0x0000019c},
-        {0x0000ae04, 0x00180000, 0x00180000, 0x00180000, 0x00180000},
+        {0x0000ae04, 0x001c0000, 0x001c0000, 0x001c0000, 0x001c0000},
         {0x0000ae18, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
         {0x0000ae1c, 0x0000019c, 0x0000019c, 0x0000019c, 0x0000019c},
         {0x0000ae20, 0x000001b5, 0x000001b5, 0x000001ce, 0x000001ce},
@@ -289,21 +268,21 @@ static const u32 ar9340_1p0_baseband_postamble[][5] = {
 };
 
 static const u32 ar9340_1p0_baseband_core[][2] = {
-        /*  Addr     allmodes  */
+        /* Addr      allmodes  */
         {0x00009800, 0xafe68e30},
         {0x00009804, 0xfd14e000},
         {0x00009808, 0x9c0a9f6b},
         {0x0000980c, 0x04900000},
-        {0x00009814, 0xb280c00a},
+        {0x00009814, 0x3280c00a},
         {0x00009818, 0x00000000},
         {0x0000981c, 0x00020028},
-        {0x00009834, 0x5f3ca3de},
+        {0x00009834, 0x6400a190},
         {0x00009838, 0x0108ecff},
-        {0x0000983c, 0x14750600},
+        {0x0000983c, 0x14000600},
         {0x00009880, 0x201fff00},
         {0x00009884, 0x00001042},
         {0x000098a4, 0x00200400},
-        {0x000098b0, 0x52440bbe},
+        {0x000098b0, 0x32840bbe},
         {0x000098d0, 0x004b6a8e},
         {0x000098d4, 0x00000820},
         {0x000098dc, 0x00000000},
@@ -329,7 +308,6 @@ static const u32 ar9340_1p0_baseband_core[][2] = {
         {0x00009e30, 0x06336f77},
         {0x00009e34, 0x6af6532f},
         {0x00009e38, 0x0cc80c00},
-        {0x00009e3c, 0xcf946222},
         {0x00009e40, 0x0d261820},
         {0x00009e4c, 0x00001004},
         {0x00009e50, 0x00ff03f1},
@@ -342,8 +320,6 @@ static const u32 ar9340_1p0_baseband_core[][2] = {
         {0x0000a220, 0x00000000},
         {0x0000a224, 0x00000000},
         {0x0000a228, 0x10002310},
-        {0x0000a22c, 0x01036a1e},
-        {0x0000a234, 0x10000fff},
         {0x0000a23c, 0x00000000},
         {0x0000a244, 0x0c000000},
         {0x0000a2a0, 0x00000001},
@@ -351,10 +327,6 @@ static const u32 ar9340_1p0_baseband_core[][2] = {
         {0x0000a2c8, 0x00000000},
         {0x0000a2cc, 0x18c43433},
         {0x0000a2d4, 0x00000000},
-        {0x0000a2dc, 0x00000000},
-        {0x0000a2e0, 0x00000000},
-        {0x0000a2e4, 0x00000000},
-        {0x0000a2e8, 0x00000000},
         {0x0000a2ec, 0x00000000},
         {0x0000a2f0, 0x00000000},
         {0x0000a2f4, 0x00000000},
@@ -385,7 +357,7 @@ static const u32 ar9340_1p0_baseband_core[][2] = {
         {0x0000a3e8, 0x20202020},
         {0x0000a3ec, 0x20202020},
         {0x0000a3f0, 0x00000000},
-        {0x0000a3f4, 0x00000246},
+        {0x0000a3f4, 0x00000000},
         {0x0000a3f8, 0x0cdbd380},
         {0x0000a3fc, 0x000f0f01},
         {0x0000a400, 0x8fa91f01},
@@ -402,33 +374,17 @@ static const u32 ar9340_1p0_baseband_core[][2] = {
         {0x0000a430, 0x1ce739ce},
         {0x0000a434, 0x00000000},
         {0x0000a438, 0x00001801},
-        {0x0000a43c, 0x00000000},
+        {0x0000a43c, 0x00100000},
         {0x0000a440, 0x00000000},
         {0x0000a444, 0x00000000},
-        {0x0000a448, 0x04000080},
+        {0x0000a448, 0x05000080},
         {0x0000a44c, 0x00000001},
         {0x0000a450, 0x00010000},
         {0x0000a458, 0x00000000},
-        {0x0000a600, 0x00000000},
-        {0x0000a604, 0x00000000},
-        {0x0000a608, 0x00000000},
-        {0x0000a60c, 0x00000000},
-        {0x0000a610, 0x00000000},
-        {0x0000a614, 0x00000000},
-        {0x0000a618, 0x00000000},
-        {0x0000a61c, 0x00000000},
-        {0x0000a620, 0x00000000},
-        {0x0000a624, 0x00000000},
-        {0x0000a628, 0x00000000},
-        {0x0000a62c, 0x00000000},
-        {0x0000a630, 0x00000000},
-        {0x0000a634, 0x00000000},
-        {0x0000a638, 0x00000000},
-        {0x0000a63c, 0x00000000},
         {0x0000a640, 0x00000000},
         {0x0000a644, 0x3fad9d74},
         {0x0000a648, 0x0048060a},
-        {0x0000a64c, 0x00000637},
+        {0x0000a64c, 0x00003c37},
         {0x0000a670, 0x03020100},
         {0x0000a674, 0x09080504},
         {0x0000a678, 0x0d0c0b0a},
@@ -451,10 +407,6 @@ static const u32 ar9340_1p0_baseband_core[][2] = {
         {0x0000a8f4, 0x00000000},
         {0x0000b2d0, 0x00000080},
         {0x0000b2d4, 0x00000000},
-        {0x0000b2dc, 0x00000000},
-        {0x0000b2e0, 0x00000000},
-        {0x0000b2e4, 0x00000000},
-        {0x0000b2e8, 0x00000000},
         {0x0000b2ec, 0x00000000},
         {0x0000b2f0, 0x00000000},
         {0x0000b2f4, 0x00000000},
@@ -465,80 +417,108 @@ static const u32 ar9340_1p0_baseband_core[][2] = {
 };
 
 static const u32 ar9340Modes_high_power_tx_gain_table_1p0[][5] = {
-        /*  Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20  */
+        /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
+        {0x0000a2dc, 0x0380c7fc, 0x0380c7fc, 0x03aaa352, 0x03aaa352},
+        {0x0000a2e0, 0x0000f800, 0x0000f800, 0x03ccc584, 0x03ccc584},
+        {0x0000a2e4, 0x03ff0000, 0x03ff0000, 0x03f0f800, 0x03f0f800},
+        {0x0000a2e8, 0x00000000, 0x00000000, 0x03ff0000, 0x03ff0000},
+        {0x0000a600, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+        {0x0000a604, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+        {0x0000a608, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+        {0x0000a60c, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+        {0x0000a610, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+        {0x0000a614, 0x01404000, 0x01404000, 0x01404000, 0x01404000},
+        {0x0000a618, 0x01404501, 0x01404501, 0x01404501, 0x01404501},
+        {0x0000a61c, 0x02008802, 0x02008802, 0x02008501, 0x02008501},
+        {0x0000a620, 0x0300cc03, 0x0300cc03, 0x0280ca03, 0x0280ca03},
+        {0x0000a624, 0x0300cc03, 0x0300cc03, 0x03010c04, 0x03010c04},
+        {0x0000a628, 0x0300cc03, 0x0300cc03, 0x04014c04, 0x04014c04},
+        {0x0000a62c, 0x03810c03, 0x03810c03, 0x04015005, 0x04015005},
+        {0x0000a630, 0x03810e04, 0x03810e04, 0x04015005, 0x04015005},
+        {0x0000a634, 0x03810e04, 0x03810e04, 0x04015005, 0x04015005},
+        {0x0000a638, 0x03810e04, 0x03810e04, 0x04015005, 0x04015005},
+        {0x0000a63c, 0x03810e04, 0x03810e04, 0x04015005, 0x04015005},
+        {0x0000b2dc, 0x0380c7fc, 0x0380c7fc, 0x03aaa352, 0x03aaa352},
+        {0x0000b2e0, 0x0000f800, 0x0000f800, 0x03ccc584, 0x03ccc584},
+        {0x0000b2e4, 0x03ff0000, 0x03ff0000, 0x03f0f800, 0x03f0f800},
+        {0x0000b2e8, 0x00000000, 0x00000000, 0x03ff0000, 0x03ff0000},
         {0x0000a410, 0x000050d8, 0x000050d8, 0x000050d9, 0x000050d9},
         {0x0000a500, 0x00002220, 0x00002220, 0x00000000, 0x00000000},
-        {0x0000a504, 0x04002222, 0x04002222, 0x04000002, 0x04000002},
-        {0x0000a508, 0x09002421, 0x09002421, 0x08000004, 0x08000004},
-        {0x0000a50c, 0x0d002621, 0x0d002621, 0x0b000200, 0x0b000200},
-        {0x0000a510, 0x13004620, 0x13004620, 0x0f000202, 0x0f000202},
-        {0x0000a514, 0x19004a20, 0x19004a20, 0x11000400, 0x11000400},
-        {0x0000a518, 0x1d004e20, 0x1d004e20, 0x15000402, 0x15000402},
-        {0x0000a51c, 0x21005420, 0x21005420, 0x19000404, 0x19000404},
-        {0x0000a520, 0x26005e20, 0x26005e20, 0x1b000603, 0x1b000603},
-        {0x0000a524, 0x2b005e40, 0x2b005e40, 0x1f000a02, 0x1f000a02},
-        {0x0000a528, 0x2f005e42, 0x2f005e42, 0x23000a04, 0x23000a04},
-        {0x0000a52c, 0x33005e44, 0x33005e44, 0x26000a20, 0x26000a20},
-        {0x0000a530, 0x38005e65, 0x38005e65, 0x2a000e20, 0x2a000e20},
-        {0x0000a534, 0x3c005e69, 0x3c005e69, 0x2e000e22, 0x2e000e22},
-        {0x0000a538, 0x40005e6b, 0x40005e6b, 0x31000e24, 0x31000e24},
-        {0x0000a53c, 0x44005e6d, 0x44005e6d, 0x34001640, 0x34001640},
-        {0x0000a540, 0x49005e72, 0x49005e72, 0x38001660, 0x38001660},
-        {0x0000a544, 0x4e005eb2, 0x4e005eb2, 0x3b001861, 0x3b001861},
-        {0x0000a548, 0x53005f12, 0x53005f12, 0x3e001a81, 0x3e001a81},
-        {0x0000a54c, 0x59025eb5, 0x59025eb5, 0x42001a83, 0x42001a83},
-        {0x0000a550, 0x5e025f12, 0x5e025f12, 0x44001c84, 0x44001c84},
-        {0x0000a554, 0x61027f12, 0x61027f12, 0x48001ce3, 0x48001ce3},
-        {0x0000a558, 0x6702bf12, 0x6702bf12, 0x4c001ce5, 0x4c001ce5},
-        {0x0000a55c, 0x6b02bf14, 0x6b02bf14, 0x50001ce9, 0x50001ce9},
-        {0x0000a560, 0x6f02bf16, 0x6f02bf16, 0x54001ceb, 0x54001ceb},
-        {0x0000a564, 0x6f02bf16, 0x6f02bf16, 0x56001eec, 0x56001eec},
-        {0x0000a568, 0x6f02bf16, 0x6f02bf16, 0x56001eec, 0x56001eec},
-        {0x0000a56c, 0x6f02bf16, 0x6f02bf16, 0x56001eec, 0x56001eec},
-        {0x0000a570, 0x6f02bf16, 0x6f02bf16, 0x56001eec, 0x56001eec},
-        {0x0000a574, 0x6f02bf16, 0x6f02bf16, 0x56001eec, 0x56001eec},
-        {0x0000a578, 0x6f02bf16, 0x6f02bf16, 0x56001eec, 0x56001eec},
-        {0x0000a57c, 0x6f02bf16, 0x6f02bf16, 0x56001eec, 0x56001eec},
+        {0x0000a504, 0x04002222, 0x04002222, 0x02000001, 0x02000001},
+        {0x0000a508, 0x09002421, 0x09002421, 0x05000003, 0x05000003},
+        {0x0000a50c, 0x0d002621, 0x0d002621, 0x0a000005, 0x0a000005},
+        {0x0000a510, 0x13004620, 0x13004620, 0x0e000201, 0x0e000201},
+        {0x0000a514, 0x19004a20, 0x19004a20, 0x11000203, 0x11000203},
+        {0x0000a518, 0x1d004e20, 0x1d004e20, 0x14000401, 0x14000401},
+        {0x0000a51c, 0x21005420, 0x21005420, 0x18000403, 0x18000403},
+        {0x0000a520, 0x26005e20, 0x26005e20, 0x1b000602, 0x1b000602},
+        {0x0000a524, 0x2b005e40, 0x2b005e40, 0x1f000802, 0x1f000802},
+        {0x0000a528, 0x2f005e42, 0x2f005e42, 0x21000620, 0x21000620},
+        {0x0000a52c, 0x33005e44, 0x33005e44, 0x25000820, 0x25000820},
+        {0x0000a530, 0x38005e65, 0x38005e65, 0x29000822, 0x29000822},
+        {0x0000a534, 0x3c005e69, 0x3c005e69, 0x2d000824, 0x2d000824},
+        {0x0000a538, 0x40005e6b, 0x40005e6b, 0x30000828, 0x30000828},
+        {0x0000a53c, 0x44005e6d, 0x44005e6d, 0x3400082a, 0x3400082a},
+        {0x0000a540, 0x49005e72, 0x49005e72, 0x38000849, 0x38000849},
+        {0x0000a544, 0x4e005eb2, 0x4e005eb2, 0x3b000a2c, 0x3b000a2c},
+        {0x0000a548, 0x53005f12, 0x53005f12, 0x3e000e2b, 0x3e000e2b},
+        {0x0000a54c, 0x59025eb5, 0x59025eb5, 0x42000e2d, 0x42000e2d},
+        {0x0000a550, 0x5e025f12, 0x5e025f12, 0x4500124a, 0x4500124a},
+        {0x0000a554, 0x61027f12, 0x61027f12, 0x4900124c, 0x4900124c},
+        {0x0000a558, 0x6702bf12, 0x6702bf12, 0x4c00126c, 0x4c00126c},
+        {0x0000a55c, 0x6b02bf14, 0x6b02bf14, 0x4f00128c, 0x4f00128c},
+        {0x0000a560, 0x6f02bf16, 0x6f02bf16, 0x52001290, 0x52001290},
+        {0x0000a564, 0x6f02bf16, 0x6f02bf16, 0x56001292, 0x56001292},
+        {0x0000a568, 0x6f02bf16, 0x6f02bf16, 0x56001292, 0x56001292},
+        {0x0000a56c, 0x6f02bf16, 0x6f02bf16, 0x56001292, 0x56001292},
+        {0x0000a570, 0x6f02bf16, 0x6f02bf16, 0x56001292, 0x56001292},
+        {0x0000a574, 0x6f02bf16, 0x6f02bf16, 0x56001292, 0x56001292},
+        {0x0000a578, 0x6f02bf16, 0x6f02bf16, 0x56001292, 0x56001292},
+        {0x0000a57c, 0x6f02bf16, 0x6f02bf16, 0x56001292, 0x56001292},
         {0x0000a580, 0x00802220, 0x00802220, 0x00800000, 0x00800000},
-        {0x0000a584, 0x04802222, 0x04802222, 0x04800002, 0x04800002},
-        {0x0000a588, 0x09802421, 0x09802421, 0x08800004, 0x08800004},
-        {0x0000a58c, 0x0d802621, 0x0d802621, 0x0b800200, 0x0b800200},
-        {0x0000a590, 0x13804620, 0x13804620, 0x0f800202, 0x0f800202},
-        {0x0000a594, 0x19804a20, 0x19804a20, 0x11800400, 0x11800400},
-        {0x0000a598, 0x1d804e20, 0x1d804e20, 0x15800402, 0x15800402},
-        {0x0000a59c, 0x21805420, 0x21805420, 0x19800404, 0x19800404},
-        {0x0000a5a0, 0x26805e20, 0x26805e20, 0x1b800603, 0x1b800603},
-        {0x0000a5a4, 0x2b805e40, 0x2b805e40, 0x1f800a02, 0x1f800a02},
-        {0x0000a5a8, 0x2f805e42, 0x2f805e42, 0x23800a04, 0x23800a04},
-        {0x0000a5ac, 0x33805e44, 0x33805e44, 0x26800a20, 0x26800a20},
-        {0x0000a5b0, 0x38805e65, 0x38805e65, 0x2a800e20, 0x2a800e20},
-        {0x0000a5b4, 0x3c805e69, 0x3c805e69, 0x2e800e22, 0x2e800e22},
-        {0x0000a5b8, 0x40805e6b, 0x40805e6b, 0x31800e24, 0x31800e24},
-        {0x0000a5bc, 0x44805e6d, 0x44805e6d, 0x34801640, 0x34801640},
-        {0x0000a5c0, 0x49805e72, 0x49805e72, 0x38801660, 0x38801660},
-        {0x0000a5c4, 0x4e805eb2, 0x4e805eb2, 0x3b801861, 0x3b801861},
-        {0x0000a5c8, 0x53805f12, 0x53805f12, 0x3e801a81, 0x3e801a81},
-        {0x0000a5cc, 0x59825eb2, 0x59825eb2, 0x42801a83, 0x42801a83},
-        {0x0000a5d0, 0x5e825f12, 0x5e825f12, 0x44801c84, 0x44801c84},
-        {0x0000a5d4, 0x61827f12, 0x61827f12, 0x48801ce3, 0x48801ce3},
-        {0x0000a5d8, 0x6782bf12, 0x6782bf12, 0x4c801ce5, 0x4c801ce5},
-        {0x0000a5dc, 0x6b82bf14, 0x6b82bf14, 0x50801ce9, 0x50801ce9},
-        {0x0000a5e0, 0x6f82bf16, 0x6f82bf16, 0x54801ceb, 0x54801ceb},
-        {0x0000a5e4, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
-        {0x0000a5e8, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
-        {0x0000a5ec, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
-        {0x0000a5f0, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
-        {0x0000a5f4, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
-        {0x0000a5f8, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
-        {0x0000a5fc, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
-        {0x00016044, 0x056db2db, 0x056db2db, 0x056db2db, 0x056db2db},
+        {0x0000a584, 0x04802222, 0x04802222, 0x02800001, 0x02800001},
+        {0x0000a588, 0x09802421, 0x09802421, 0x05800003, 0x05800003},
+        {0x0000a58c, 0x0d802621, 0x0d802621, 0x0a800005, 0x0a800005},
+        {0x0000a590, 0x13804620, 0x13804620, 0x0e800201, 0x0e800201},
+        {0x0000a594, 0x19804a20, 0x19804a20, 0x11800203, 0x11800203},
+        {0x0000a598, 0x1d804e20, 0x1d804e20, 0x14800401, 0x14800401},
+        {0x0000a59c, 0x21805420, 0x21805420, 0x18800403, 0x18800403},
+        {0x0000a5a0, 0x26805e20, 0x26805e20, 0x1b800602, 0x1b800602},
+        {0x0000a5a4, 0x2b805e40, 0x2b805e40, 0x1f800802, 0x1f800802},
+        {0x0000a5a8, 0x2f805e42, 0x2f805e42, 0x21800620, 0x21800620},
+        {0x0000a5ac, 0x33805e44, 0x33805e44, 0x25800820, 0x25800820},
+        {0x0000a5b0, 0x38805e65, 0x38805e65, 0x29800822, 0x29800822},
+        {0x0000a5b4, 0x3c805e69, 0x3c805e69, 0x2d800824, 0x2d800824},
+        {0x0000a5b8, 0x40805e6b, 0x40805e6b, 0x30800828, 0x30800828},
+        {0x0000a5bc, 0x44805e6d, 0x44805e6d, 0x3480082a, 0x3480082a},
+        {0x0000a5c0, 0x49805e72, 0x49805e72, 0x38800849, 0x38800849},
+        {0x0000a5c4, 0x4e805eb2, 0x4e805eb2, 0x3b800a2c, 0x3b800a2c},
+        {0x0000a5c8, 0x53805f12, 0x53805f12, 0x3e800e2b, 0x3e800e2b},
+        {0x0000a5cc, 0x59825eb2, 0x59825eb2, 0x42800e2d, 0x42800e2d},
+        {0x0000a5d0, 0x5e825f12, 0x5e825f12, 0x4580124a, 0x4580124a},
+        {0x0000a5d4, 0x61827f12, 0x61827f12, 0x4980124c, 0x4980124c},
+        {0x0000a5d8, 0x6782bf12, 0x6782bf12, 0x4c80126c, 0x4c80126c},
+        {0x0000a5dc, 0x6b82bf14, 0x6b82bf14, 0x4f80128c, 0x4f80128c},
+        {0x0000a5e0, 0x6f82bf16, 0x6f82bf16, 0x52801290, 0x52801290},
+        {0x0000a5e4, 0x6f82bf16, 0x6f82bf16, 0x56801292, 0x56801292},
+        {0x0000a5e8, 0x6f82bf16, 0x6f82bf16, 0x56801292, 0x56801292},
+        {0x0000a5ec, 0x6f82bf16, 0x6f82bf16, 0x56801292, 0x56801292},
+        {0x0000a5f0, 0x6f82bf16, 0x6f82bf16, 0x56801292, 0x56801292},
+        {0x0000a5f4, 0x6f82bf16, 0x6f82bf16, 0x56801292, 0x56801292},
+        {0x0000a5f8, 0x6f82bf16, 0x6f82bf16, 0x56801292, 0x56801292},
+        {0x0000a5fc, 0x6f82bf16, 0x6f82bf16, 0x56801292, 0x56801292},
+        {0x00016044, 0x056db2db, 0x056db2db, 0x022492db, 0x022492db},
         {0x00016048, 0x24925266, 0x24925266, 0x24925266, 0x24925266},
-        {0x00016444, 0x056db2db, 0x056db2db, 0x056db2db, 0x056db2db},
+        {0x00016444, 0x056db2db, 0x056db2db, 0x022492db, 0x022492db},
         {0x00016448, 0x24925266, 0x24925266, 0x24925266, 0x24925266},
 };
 
 static const u32 ar9340Modes_high_ob_db_tx_gain_table_1p0[][5] = {
-        /*  Addr       5G_HT20    5G_HT40     2G_HT40     2G_HT20  */
+        /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
+        {0x0000a2dc, 0x01feee00, 0x01feee00, 0x03aaa352, 0x03aaa352},
+        {0x0000a2e0, 0x0000f000, 0x0000f000, 0x03ccc584, 0x03ccc584},
+        {0x0000a2e4, 0x01ff0000, 0x01ff0000, 0x03f0f800, 0x03f0f800},
+        {0x0000a2e8, 0x00000000, 0x00000000, 0x03ff0000, 0x03ff0000},
         {0x0000a410, 0x000050d8, 0x000050d8, 0x000050d9, 0x000050d9},
         {0x0000a500, 0x00002220, 0x00002220, 0x00000000, 0x00000000},
         {0x0000a504, 0x04002222, 0x04002222, 0x04000002, 0x04000002},
@@ -559,7 +539,7 @@ static const u32 ar9340Modes_high_ob_db_tx_gain_table_1p0[][5] = {
         {0x0000a540, 0x49005e72, 0x49005e72, 0x38001660, 0x38001660},
         {0x0000a544, 0x4e005eb2, 0x4e005eb2, 0x3b001861, 0x3b001861},
         {0x0000a548, 0x53005f12, 0x53005f12, 0x3e001a81, 0x3e001a81},
-        {0x0000a54c, 0x59025eb5, 0x59025eb5, 0x42001a83, 0x42001a83},
+        {0x0000a54c, 0x59025eb2, 0x59025eb2, 0x42001a83, 0x42001a83},
         {0x0000a550, 0x5e025f12, 0x5e025f12, 0x44001c84, 0x44001c84},
         {0x0000a554, 0x61027f12, 0x61027f12, 0x48001ce3, 0x48001ce3},
         {0x0000a558, 0x6702bf12, 0x6702bf12, 0x4c001ce5, 0x4c001ce5},
@@ -604,13 +584,43 @@ static const u32 ar9340Modes_high_ob_db_tx_gain_table_1p0[][5] = {
         {0x0000a5f4, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
         {0x0000a5f8, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
         {0x0000a5fc, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
+        {0x0000a600, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+        {0x0000a604, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+        {0x0000a608, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+        {0x0000a60c, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+        {0x0000a610, 0x00804000, 0x00804000, 0x00000000, 0x00000000},
+        {0x0000a614, 0x00804201, 0x00804201, 0x01404000, 0x01404000},
+        {0x0000a618, 0x0280c802, 0x0280c802, 0x01404501, 0x01404501},
+        {0x0000a61c, 0x0280ca03, 0x0280ca03, 0x02008501, 0x02008501},
+        {0x0000a620, 0x04c15104, 0x04c15104, 0x0280ca03, 0x0280ca03},
+        {0x0000a624, 0x04c15305, 0x04c15305, 0x03010c04, 0x03010c04},
+        {0x0000a628, 0x04c15305, 0x04c15305, 0x04014c04, 0x04014c04},
+        {0x0000a62c, 0x04c15305, 0x04c15305, 0x04015005, 0x04015005},
+        {0x0000a630, 0x04c15305, 0x04c15305, 0x04015005, 0x04015005},
+        {0x0000a634, 0x04c15305, 0x04c15305, 0x04015005, 0x04015005},
+        {0x0000a638, 0x04c15305, 0x04c15305, 0x04015005, 0x04015005},
+        {0x0000a63c, 0x04c15305, 0x04c15305, 0x04015005, 0x04015005},
+        {0x0000b2dc, 0x01feee00, 0x01feee00, 0x03aaa352, 0x03aaa352},
+        {0x0000b2e0, 0x0000f000, 0x0000f000, 0x03ccc584, 0x03ccc584},
+        {0x0000b2e4, 0x01ff0000, 0x01ff0000, 0x03f0f800, 0x03f0f800},
+        {0x0000b2e8, 0x00000000, 0x00000000, 0x03ff0000, 0x03ff0000},
         {0x00016044, 0x03b6d2e4, 0x03b6d2e4, 0x03b6d2e4, 0x03b6d2e4},
-        {0x00016048, 0x8e481266, 0x8e481266, 0x8e481266, 0x8e481266},
+        {0x00016048, 0x8e481666, 0x8e481666, 0x8e481266, 0x8e481266},
+        {0x00016280, 0x01000015, 0x01000015, 0x01001015, 0x01001015},
         {0x00016444, 0x03b6d2e4, 0x03b6d2e4, 0x03b6d2e4, 0x03b6d2e4},
-        {0x00016448, 0x8e481266, 0x8e481266, 0x8e481266, 0x8e481266},
+        {0x00016448, 0x8e481666, 0x8e481666, 0x8e481266, 0x8e481266},
 };
+
 static const u32 ar9340Modes_ub124_tx_gain_table_1p0[][5] = {
-        /*  Addr      5G_HT20      5G_HT40     2G_HT40    2G_HT20  */
+        /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
+        {0x00009810, 0xd00a8005, 0xd00a8005, 0xd00a8005, 0xd00a8005},
+        {0x00009820, 0x206a022e, 0x206a022e, 0x206a00ae, 0x206a00ae},
+        {0x00009830, 0x0000059c, 0x0000059c, 0x0000059c, 0x0000059c},
+        {0x00009e10, 0x7ec88d2e, 0x7ec88d2e, 0x7ec82d2e, 0x7ec82d2e},
+        {0x0000a2dc, 0xfef5d402, 0xfef5d402, 0xfdab5b52, 0xfdab5b52},
+        {0x0000a2e0, 0xfe896600, 0xfe896600, 0xfd339c84, 0xfd339c84},
+        {0x0000a2e4, 0xff01f800, 0xff01f800, 0xfec3e000, 0xfec3e000},
+        {0x0000a2e8, 0xfffe0000, 0xfffe0000, 0xfffc0000, 0xfffc0000},
         {0x0000a410, 0x000050d8, 0x000050d8, 0x000050d9, 0x000050d9},
         {0x0000a500, 0x00002220, 0x00002220, 0x00000000, 0x00000000},
         {0x0000a504, 0x04002222, 0x04002222, 0x04000002, 0x04000002},
@@ -676,15 +686,34 @@ static const u32 ar9340Modes_ub124_tx_gain_table_1p0[][5] = {
         {0x0000a5f4, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
         {0x0000a5f8, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
         {0x0000a5fc, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
-        {0x00016044, 0x036db2db, 0x036db2db, 0x036db2db, 0x036db2db},
-        {0x00016048, 0x69b65266, 0x69b65266, 0x69b65266, 0x69b65266},
-        {0x00016444, 0x036db2db, 0x036db2db, 0x036db2db, 0x036db2db},
-        {0x00016448, 0x69b65266, 0x69b65266, 0x69b65266, 0x69b65266},
+        {0x00016044, 0x03b6d2e4, 0x03b6d2e4, 0x03b6d2e4, 0x03b6d2e4},
+        {0x00016048, 0x8e480086, 0x8e480086, 0x8e480086, 0x8e480086},
+        {0x00016444, 0x03b6d2e4, 0x03b6d2e4, 0x03b6d2e4, 0x03b6d2e4},
+        {0x00016448, 0x8e480086, 0x8e480086, 0x8e480086, 0x8e480086},
+        {0x0000a600, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+        {0x0000a604, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+        {0x0000a608, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+        {0x0000a60c, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+        {0x0000a610, 0x00804000, 0x00804000, 0x00000000, 0x00000000},
+        {0x0000a614, 0x00804201, 0x00804201, 0x01404000, 0x01404000},
+        {0x0000a618, 0x0280c802, 0x0280c802, 0x01404501, 0x01404501},
+        {0x0000a61c, 0x0280ca03, 0x0280ca03, 0x02008501, 0x02008501},
+        {0x0000a620, 0x04c15104, 0x04c15104, 0x0280ca03, 0x0280ca03},
+        {0x0000a624, 0x04c15305, 0x04c15305, 0x03010c04, 0x03010c04},
+        {0x0000a628, 0x04c15305, 0x04c15305, 0x04014c04, 0x04014c04},
+        {0x0000a62c, 0x04c15305, 0x04c15305, 0x04015005, 0x04015005},
+        {0x0000a630, 0x04c15305, 0x04c15305, 0x04015005, 0x04015005},
+        {0x0000a634, 0x04c15305, 0x04c15305, 0x04015005, 0x04015005},
+        {0x0000a638, 0x04c15305, 0x04c15305, 0x04015005, 0x04015005},
+        {0x0000a63c, 0x04c15305, 0x04c15305, 0x04015005, 0x04015005},
+        {0x0000b2dc, 0xfef5d402, 0xfef5d402, 0xfdab5b52, 0xfdab5b52},
+        {0x0000b2e0, 0xfe896600, 0xfe896600, 0xfd339c84, 0xfd339c84},
+        {0x0000b2e4, 0xff01f800, 0xff01f800, 0xfec3e000, 0xfec3e000},
+        {0x0000b2e8, 0xfffe0000, 0xfffe0000, 0xfffc0000, 0xfffc0000},
 };
 
-
 static const u32 ar9340Common_rx_gain_table_1p0[][2] = {
-        /*   Addr     allmodes */
+        /* Addr      allmodes  */
         {0x0000a000, 0x00010000},
         {0x0000a004, 0x00030002},
         {0x0000a008, 0x00050004},
@@ -845,14 +874,14 @@ static const u32 ar9340Common_rx_gain_table_1p0[][2] = {
         {0x0000b074, 0x00000000},
         {0x0000b078, 0x00000000},
         {0x0000b07c, 0x00000000},
-        {0x0000b080, 0x32323232},
-        {0x0000b084, 0x2f2f3232},
-        {0x0000b088, 0x23282a2d},
-        {0x0000b08c, 0x1c1e2123},
-        {0x0000b090, 0x14171919},
-        {0x0000b094, 0x0e0e1214},
-        {0x0000b098, 0x03050707},
-        {0x0000b09c, 0x00030303},
+        {0x0000b080, 0x23232323},
+        {0x0000b084, 0x21232323},
+        {0x0000b088, 0x19191c1e},
+        {0x0000b08c, 0x12141417},
+        {0x0000b090, 0x07070e0e},
+        {0x0000b094, 0x03030305},
+        {0x0000b098, 0x00000003},
+        {0x0000b09c, 0x00000000},
         {0x0000b0a0, 0x00000000},
         {0x0000b0a4, 0x00000000},
         {0x0000b0a8, 0x00000000},
@@ -944,7 +973,11 @@ static const u32 ar9340Common_rx_gain_table_1p0[][2] = {
 };
 
 static const u32 ar9340Modes_low_ob_db_tx_gain_table_1p0[][5] = {
-        /*  Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20  */
+        /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
+        {0x0000a2dc, 0x0380c7fc, 0x0380c7fc, 0x03aaa352, 0x03aaa352},
+        {0x0000a2e0, 0x0000f800, 0x0000f800, 0x03ccc584, 0x03ccc584},
+        {0x0000a2e4, 0x03ff0000, 0x03ff0000, 0x03f0f800, 0x03f0f800},
+        {0x0000a2e8, 0x00000000, 0x00000000, 0x03ff0000, 0x03ff0000},
         {0x0000a410, 0x000050d9, 0x000050d9, 0x000050d9, 0x000050d9},
         {0x0000a500, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
         {0x0000a504, 0x06000003, 0x06000003, 0x04000002, 0x04000002},
@@ -952,8 +985,8 @@ static const u32 ar9340Modes_low_ob_db_tx_gain_table_1p0[][5] = {
         {0x0000a50c, 0x10000023, 0x10000023, 0x0b000200, 0x0b000200},
         {0x0000a510, 0x16000220, 0x16000220, 0x0f000202, 0x0f000202},
         {0x0000a514, 0x1c000223, 0x1c000223, 0x12000400, 0x12000400},
-        {0x0000a518, 0x21020220, 0x21020220, 0x16000402, 0x16000402},
-        {0x0000a51c, 0x27020223, 0x27020223, 0x19000404, 0x19000404},
+        {0x0000a518, 0x21002220, 0x21002220, 0x16000402, 0x16000402},
+        {0x0000a51c, 0x27002223, 0x27002223, 0x19000404, 0x19000404},
         {0x0000a520, 0x2b022220, 0x2b022220, 0x1c000603, 0x1c000603},
         {0x0000a524, 0x2f022222, 0x2f022222, 0x21000a02, 0x21000a02},
         {0x0000a528, 0x34022225, 0x34022225, 0x25000a04, 0x25000a04},
@@ -965,19 +998,19 @@ static const u32 ar9340Modes_low_ob_db_tx_gain_table_1p0[][5] = {
         {0x0000a540, 0x4e02246c, 0x4e02246c, 0x3c001660, 0x3c001660},
         {0x0000a544, 0x5302266c, 0x5302266c, 0x3f001861, 0x3f001861},
         {0x0000a548, 0x5702286c, 0x5702286c, 0x43001a81, 0x43001a81},
-        {0x0000a54c, 0x5c04286b, 0x5c04286b, 0x47001a83, 0x47001a83},
-        {0x0000a550, 0x61042a6c, 0x61042a6c, 0x4a001c84, 0x4a001c84},
-        {0x0000a554, 0x66062a6c, 0x66062a6c, 0x4e001ce3, 0x4e001ce3},
-        {0x0000a558, 0x6b062e6c, 0x6b062e6c, 0x52001ce5, 0x52001ce5},
-        {0x0000a55c, 0x7006308c, 0x7006308c, 0x56001ce9, 0x56001ce9},
-        {0x0000a560, 0x730a308a, 0x730a308a, 0x5a001ceb, 0x5a001ceb},
-        {0x0000a564, 0x770a308c, 0x770a308c, 0x5d001eec, 0x5d001eec},
-        {0x0000a568, 0x770a308c, 0x770a308c, 0x5d001eec, 0x5d001eec},
-        {0x0000a56c, 0x770a308c, 0x770a308c, 0x5d001eec, 0x5d001eec},
-        {0x0000a570, 0x770a308c, 0x770a308c, 0x5d001eec, 0x5d001eec},
-        {0x0000a574, 0x770a308c, 0x770a308c, 0x5d001eec, 0x5d001eec},
-        {0x0000a578, 0x770a308c, 0x770a308c, 0x5d001eec, 0x5d001eec},
-        {0x0000a57c, 0x770a308c, 0x770a308c, 0x5d001eec, 0x5d001eec},
+        {0x0000a54c, 0x5c02486b, 0x5c02486b, 0x47001a83, 0x47001a83},
+        {0x0000a550, 0x61024a6c, 0x61024a6c, 0x4a001c84, 0x4a001c84},
+        {0x0000a554, 0x66026a6c, 0x66026a6c, 0x4e001ce3, 0x4e001ce3},
+        {0x0000a558, 0x6b026e6c, 0x6b026e6c, 0x52001ce5, 0x52001ce5},
+        {0x0000a55c, 0x7002708c, 0x7002708c, 0x56001ce9, 0x56001ce9},
+        {0x0000a560, 0x7302b08a, 0x7302b08a, 0x5a001ceb, 0x5a001ceb},
+        {0x0000a564, 0x7702b08c, 0x7702b08c, 0x5d001eec, 0x5d001eec},
+        {0x0000a568, 0x7702b08c, 0x7702b08c, 0x5d001eec, 0x5d001eec},
+        {0x0000a56c, 0x7702b08c, 0x7702b08c, 0x5d001eec, 0x5d001eec},
+        {0x0000a570, 0x7702b08c, 0x7702b08c, 0x5d001eec, 0x5d001eec},
+        {0x0000a574, 0x7702b08c, 0x7702b08c, 0x5d001eec, 0x5d001eec},
+        {0x0000a578, 0x7702b08c, 0x7702b08c, 0x5d001eec, 0x5d001eec},
+        {0x0000a57c, 0x7702b08c, 0x7702b08c, 0x5d001eec, 0x5d001eec},
         {0x0000a580, 0x00800000, 0x00800000, 0x00800000, 0x00800000},
         {0x0000a584, 0x06800003, 0x06800003, 0x04800002, 0x04800002},
         {0x0000a588, 0x0a800020, 0x0a800020, 0x08800004, 0x08800004},
@@ -1010,14 +1043,40 @@ static const u32 ar9340Modes_low_ob_db_tx_gain_table_1p0[][5] = {
         {0x0000a5f4, 0x778a308c, 0x778a308c, 0x5d801eec, 0x5d801eec},
         {0x0000a5f8, 0x778a308c, 0x778a308c, 0x5d801eec, 0x5d801eec},
         {0x0000a5fc, 0x778a308c, 0x778a308c, 0x5d801eec, 0x5d801eec},
+        {0x0000a600, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+        {0x0000a604, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+        {0x0000a608, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+        {0x0000a60c, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+        {0x0000a610, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+        {0x0000a614, 0x01404000, 0x01404000, 0x01404000, 0x01404000},
+        {0x0000a618, 0x01404501, 0x01404501, 0x01404501, 0x01404501},
+        {0x0000a61c, 0x02008802, 0x02008802, 0x02008501, 0x02008501},
+        {0x0000a620, 0x0300cc03, 0x0300cc03, 0x0280ca03, 0x0280ca03},
+        {0x0000a624, 0x0300cc03, 0x0300cc03, 0x03010c04, 0x03010c04},
+        {0x0000a628, 0x0300cc03, 0x0300cc03, 0x04014c04, 0x04014c04},
+        {0x0000a62c, 0x03810c03, 0x03810c03, 0x04015005, 0x04015005},
+        {0x0000a630, 0x03810e04, 0x03810e04, 0x04015005, 0x04015005},
+        {0x0000a634, 0x03810e04, 0x03810e04, 0x04015005, 0x04015005},
+        {0x0000a638, 0x03810e04, 0x03810e04, 0x04015005, 0x04015005},
+        {0x0000a63c, 0x03810e04, 0x03810e04, 0x04015005, 0x04015005},
+        {0x0000b2dc, 0x0380c7fc, 0x0380c7fc, 0x03aaa352, 0x03aaa352},
+        {0x0000b2e0, 0x0000f800, 0x0000f800, 0x03ccc584, 0x03ccc584},
+        {0x0000b2e4, 0x03ff0000, 0x03ff0000, 0x03f0f800, 0x03f0f800},
+        {0x0000b2e8, 0x00000000, 0x00000000, 0x03ff0000, 0x03ff0000},
         {0x00016044, 0x056db2db, 0x056db2db, 0x056db2db, 0x056db2db},
-        {0x00016048, 0x24925266, 0x24925266, 0x24925266, 0x24925266},
+        {0x00016048, 0x24925666, 0x24925666, 0x24925266, 0x24925266},
+        {0x00016280, 0x01000015, 0x01000015, 0x01001015, 0x01001015},
+        {0x00016288, 0xf0318000, 0xf0318000, 0xf0318000, 0xf0318000},
         {0x00016444, 0x056db2db, 0x056db2db, 0x056db2db, 0x056db2db},
-        {0x00016448, 0x24925266, 0x24925266, 0x24925266, 0x24925266},
+        {0x00016448, 0x24925666, 0x24925666, 0x24925266, 0x24925266},
 };
 
 static const u32 ar9340Modes_mixed_ob_db_tx_gain_table_1p0[][5] = {
-        /*  Addr       5G_HT20     5G_HT40     2G_HT40    2G_HT20  */
+        /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
+        {0x0000a2dc, 0x0380c7fc, 0x0380c7fc, 0x03aaa352, 0x03aaa352},
+        {0x0000a2e0, 0x0000f800, 0x0000f800, 0x03ccc584, 0x03ccc584},
+        {0x0000a2e4, 0x03ff0000, 0x03ff0000, 0x03f0f800, 0x03f0f800},
+        {0x0000a2e8, 0x00000000, 0x00000000, 0x03ff0000, 0x03ff0000},
         {0x0000a410, 0x000050d9, 0x000050d9, 0x000050d9, 0x000050d9},
         {0x0000a500, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
         {0x0000a504, 0x06000003, 0x06000003, 0x04000002, 0x04000002},
@@ -1025,8 +1084,8 @@ static const u32 ar9340Modes_mixed_ob_db_tx_gain_table_1p0[][5] = {
         {0x0000a50c, 0x10000023, 0x10000023, 0x0b000200, 0x0b000200},
         {0x0000a510, 0x16000220, 0x16000220, 0x0f000202, 0x0f000202},
         {0x0000a514, 0x1c000223, 0x1c000223, 0x11000400, 0x11000400},
-        {0x0000a518, 0x21020220, 0x21020220, 0x15000402, 0x15000402},
-        {0x0000a51c, 0x27020223, 0x27020223, 0x19000404, 0x19000404},
+        {0x0000a518, 0x21002220, 0x21002220, 0x15000402, 0x15000402},
+        {0x0000a51c, 0x27002223, 0x27002223, 0x19000404, 0x19000404},
         {0x0000a520, 0x2b022220, 0x2b022220, 0x1b000603, 0x1b000603},
         {0x0000a524, 0x2f022222, 0x2f022222, 0x1f000a02, 0x1f000a02},
         {0x0000a528, 0x34022225, 0x34022225, 0x23000a04, 0x23000a04},
@@ -1038,19 +1097,19 @@ static const u32 ar9340Modes_mixed_ob_db_tx_gain_table_1p0[][5] = {
         {0x0000a540, 0x4e02246c, 0x4e02246c, 0x38001660, 0x38001660},
         {0x0000a544, 0x5302266c, 0x5302266c, 0x3b001861, 0x3b001861},
         {0x0000a548, 0x5702286c, 0x5702286c, 0x3e001a81, 0x3e001a81},
-        {0x0000a54c, 0x5c04286b, 0x5c04286b, 0x42001a83, 0x42001a83},
-        {0x0000a550, 0x61042a6c, 0x61042a6c, 0x44001c84, 0x44001c84},
-        {0x0000a554, 0x66062a6c, 0x66062a6c, 0x48001ce3, 0x48001ce3},
-        {0x0000a558, 0x6b062e6c, 0x6b062e6c, 0x4c001ce5, 0x4c001ce5},
-        {0x0000a55c, 0x7006308c, 0x7006308c, 0x50001ce9, 0x50001ce9},
-        {0x0000a560, 0x730a308a, 0x730a308a, 0x54001ceb, 0x54001ceb},
-        {0x0000a564, 0x770a308c, 0x770a308c, 0x56001eec, 0x56001eec},
-        {0x0000a568, 0x770a308c, 0x770a308c, 0x56001eec, 0x56001eec},
-        {0x0000a56c, 0x770a308c, 0x770a308c, 0x56001eec, 0x56001eec},
-        {0x0000a570, 0x770a308c, 0x770a308c, 0x56001eec, 0x56001eec},
-        {0x0000a574, 0x770a308c, 0x770a308c, 0x56001eec, 0x56001eec},
-        {0x0000a578, 0x770a308c, 0x770a308c, 0x56001eec, 0x56001eec},
-        {0x0000a57c, 0x770a308c, 0x770a308c, 0x56001eec, 0x56001eec},
+        {0x0000a54c, 0x5c02486b, 0x5c02486b, 0x42001a83, 0x42001a83},
+        {0x0000a550, 0x61024a6c, 0x61024a6c, 0x44001c84, 0x44001c84},
+        {0x0000a554, 0x66026a6c, 0x66026a6c, 0x48001ce3, 0x48001ce3},
+        {0x0000a558, 0x6b026e6c, 0x6b026e6c, 0x4c001ce5, 0x4c001ce5},
+        {0x0000a55c, 0x7002708c, 0x7002708c, 0x50001ce9, 0x50001ce9},
+        {0x0000a560, 0x7302b08a, 0x7302b08a, 0x54001ceb, 0x54001ceb},
+        {0x0000a564, 0x7702b08c, 0x7702b08c, 0x56001eec, 0x56001eec},
+        {0x0000a568, 0x7702b08c, 0x7702b08c, 0x56001eec, 0x56001eec},
+        {0x0000a56c, 0x7702b08c, 0x7702b08c, 0x56001eec, 0x56001eec},
+        {0x0000a570, 0x7702b08c, 0x7702b08c, 0x56001eec, 0x56001eec},
+        {0x0000a574, 0x7702b08c, 0x7702b08c, 0x56001eec, 0x56001eec},
+        {0x0000a578, 0x7702b08c, 0x7702b08c, 0x56001eec, 0x56001eec},
+        {0x0000a57c, 0x7702b08c, 0x7702b08c, 0x56001eec, 0x56001eec},
         {0x0000a580, 0x00800000, 0x00800000, 0x00800000, 0x00800000},
         {0x0000a584, 0x06800003, 0x06800003, 0x04800002, 0x04800002},
         {0x0000a588, 0x0a800020, 0x0a800020, 0x08800004, 0x08800004},
@@ -1083,14 +1142,36 @@ static const u32 ar9340Modes_mixed_ob_db_tx_gain_table_1p0[][5] = {
         {0x0000a5f4, 0x778a308c, 0x778a308c, 0x56801eec, 0x56801eec},
         {0x0000a5f8, 0x778a308c, 0x778a308c, 0x56801eec, 0x56801eec},
         {0x0000a5fc, 0x778a308c, 0x778a308c, 0x56801eec, 0x56801eec},
+        {0x0000a600, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+        {0x0000a604, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+        {0x0000a608, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+        {0x0000a60c, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+        {0x0000a610, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+        {0x0000a614, 0x01404000, 0x01404000, 0x01404000, 0x01404000},
+        {0x0000a618, 0x01404501, 0x01404501, 0x01404501, 0x01404501},
+        {0x0000a61c, 0x02008802, 0x02008802, 0x02008501, 0x02008501},
+        {0x0000a620, 0x0300cc03, 0x0300cc03, 0x0280ca03, 0x0280ca03},
+        {0x0000a624, 0x0300cc03, 0x0300cc03, 0x03010c04, 0x03010c04},
+        {0x0000a628, 0x0300cc03, 0x0300cc03, 0x04014c04, 0x04014c04},
+        {0x0000a62c, 0x03810c03, 0x03810c03, 0x04015005, 0x04015005},
+        {0x0000a630, 0x03810e04, 0x03810e04, 0x04015005, 0x04015005},
+        {0x0000a634, 0x03810e04, 0x03810e04, 0x04015005, 0x04015005},
+        {0x0000a638, 0x03810e04, 0x03810e04, 0x04015005, 0x04015005},
+        {0x0000a63c, 0x03810e04, 0x03810e04, 0x04015005, 0x04015005},
+        {0x0000b2dc, 0x0380c7fc, 0x0380c7fc, 0x03aaa352, 0x03aaa352},
+        {0x0000b2e0, 0x0000f800, 0x0000f800, 0x03ccc584, 0x03ccc584},
+        {0x0000b2e4, 0x03ff0000, 0x03ff0000, 0x03f0f800, 0x03f0f800},
+        {0x0000b2e8, 0x00000000, 0x00000000, 0x03ff0000, 0x03ff0000},
         {0x00016044, 0x056db2db, 0x056db2db, 0x03b6d2e4, 0x03b6d2e4},
-        {0x00016048, 0x24927266, 0x24927266, 0x8e483266, 0x8e483266},
+        {0x00016048, 0x24925666, 0x24925666, 0x8e481266, 0x8e481266},
+        {0x00016280, 0x01000015, 0x01000015, 0x01001015, 0x01001015},
+        {0x00016288, 0x30318000, 0x30318000, 0x00318000, 0x00318000},
         {0x00016444, 0x056db2db, 0x056db2db, 0x03b6d2e4, 0x03b6d2e4},
-        {0x00016448, 0x24927266, 0x24927266, 0x8e482266, 0x8e482266},
+        {0x00016448, 0x24925666, 0x24925666, 0x8e481266, 0x8e481266},
 };
 
 static const u32 ar9340_1p0_mac_core[][2] = {
-        /*    Addr        allmodes        */
+        /* Addr      allmodes  */
         {0x00000008, 0x00000000},
         {0x00000030, 0x00020085},
         {0x00000034, 0x00000005},
@@ -1119,6 +1200,7 @@ static const u32 ar9340_1p0_mac_core[][2] = {
         {0x00008004, 0x00000000},
         {0x00008008, 0x00000000},
         {0x0000800c, 0x00000000},
+        {0x00008010, 0x00080800},
         {0x00008018, 0x00000000},
         {0x00008020, 0x00000000},
         {0x00008038, 0x00000000},
@@ -1146,7 +1228,7 @@ static const u32 ar9340_1p0_mac_core[][2] = {
         {0x000080bc, 0x00000000},
         {0x000080c0, 0x2a800000},
         {0x000080c4, 0x06900168},
-        {0x000080c8, 0x13881c20},
+        {0x000080c8, 0x13881c22},
         {0x000080cc, 0x01f40000},
         {0x000080d0, 0x00252500},
         {0x000080d4, 0x00a00000},
@@ -1250,276 +1332,17 @@ static const u32 ar9340_1p0_mac_core[][2] = {
         {0x000083c4, 0x00000000},
         {0x000083c8, 0x00000000},
         {0x000083cc, 0x00000200},
-        {0x000083d0, 0x000301ff},
+        {0x000083d0, 0x000101ff},
 };
 
-static const u32 ar9340Common_wo_xlna_rx_gain_table_1p0[][2] = {
-        /*    Addr        allmodes        */
-        {0x0000a000, 0x00010000},
-        {0x0000a004, 0x00030002},
-        {0x0000a008, 0x00050004},
-        {0x0000a00c, 0x00810080},
-        {0x0000a010, 0x00830082},
-        {0x0000a014, 0x01810180},
-        {0x0000a018, 0x01830182},
-        {0x0000a01c, 0x01850184},
-        {0x0000a020, 0x01890188},
-        {0x0000a024, 0x018b018a},
-        {0x0000a028, 0x018d018c},
-        {0x0000a02c, 0x03820190},
-        {0x0000a030, 0x03840383},
-        {0x0000a034, 0x03880385},
-        {0x0000a038, 0x038a0389},
-        {0x0000a03c, 0x038c038b},
-        {0x0000a040, 0x0390038d},
-        {0x0000a044, 0x03920391},
-        {0x0000a048, 0x03940393},
-        {0x0000a04c, 0x03960395},
-        {0x0000a050, 0x00000000},
-        {0x0000a054, 0x00000000},
-        {0x0000a058, 0x00000000},
-        {0x0000a05c, 0x00000000},
-        {0x0000a060, 0x00000000},
-        {0x0000a064, 0x00000000},
-        {0x0000a068, 0x00000000},
-        {0x0000a06c, 0x00000000},
-        {0x0000a070, 0x00000000},
-        {0x0000a074, 0x00000000},
-        {0x0000a078, 0x00000000},
-        {0x0000a07c, 0x00000000},
-        {0x0000a080, 0x29292929},
-        {0x0000a084, 0x29292929},
-        {0x0000a088, 0x29292929},
-        {0x0000a08c, 0x29292929},
-        {0x0000a090, 0x22292929},
-        {0x0000a094, 0x1d1d2222},
-        {0x0000a098, 0x0c111117},
-        {0x0000a09c, 0x00030303},
-        {0x0000a0a0, 0x00000000},
-        {0x0000a0a4, 0x00000000},
-        {0x0000a0a8, 0x00000000},
-        {0x0000a0ac, 0x00000000},
-        {0x0000a0b0, 0x00000000},
-        {0x0000a0b4, 0x00000000},
-        {0x0000a0b8, 0x00000000},
-        {0x0000a0bc, 0x00000000},
-        {0x0000a0c0, 0x001f0000},
-        {0x0000a0c4, 0x01000101},
-        {0x0000a0c8, 0x011e011f},
-        {0x0000a0cc, 0x011c011d},
-        {0x0000a0d0, 0x02030204},
-        {0x0000a0d4, 0x02010202},
-        {0x0000a0d8, 0x021f0200},
-        {0x0000a0dc, 0x0302021e},
-        {0x0000a0e0, 0x03000301},
-        {0x0000a0e4, 0x031e031f},
-        {0x0000a0e8, 0x0402031d},
-        {0x0000a0ec, 0x04000401},
-        {0x0000a0f0, 0x041e041f},
-        {0x0000a0f4, 0x0502041d},
-        {0x0000a0f8, 0x05000501},
-        {0x0000a0fc, 0x051e051f},
-        {0x0000a100, 0x06010602},
-        {0x0000a104, 0x061f0600},
-        {0x0000a108, 0x061d061e},
-        {0x0000a10c, 0x07020703},
-        {0x0000a110, 0x07000701},
-        {0x0000a114, 0x00000000},
-        {0x0000a118, 0x00000000},
-        {0x0000a11c, 0x00000000},
-        {0x0000a120, 0x00000000},
-        {0x0000a124, 0x00000000},
-        {0x0000a128, 0x00000000},
-        {0x0000a12c, 0x00000000},
-        {0x0000a130, 0x00000000},
-        {0x0000a134, 0x00000000},
-        {0x0000a138, 0x00000000},
-        {0x0000a13c, 0x00000000},
-        {0x0000a140, 0x001f0000},
-        {0x0000a144, 0x01000101},
-        {0x0000a148, 0x011e011f},
-        {0x0000a14c, 0x011c011d},
-        {0x0000a150, 0x02030204},
-        {0x0000a154, 0x02010202},
-        {0x0000a158, 0x021f0200},
-        {0x0000a15c, 0x0302021e},
-        {0x0000a160, 0x03000301},
-        {0x0000a164, 0x031e031f},
-        {0x0000a168, 0x0402031d},
-        {0x0000a16c, 0x04000401},
-        {0x0000a170, 0x041e041f},
-        {0x0000a174, 0x0502041d},
-        {0x0000a178, 0x05000501},
-        {0x0000a17c, 0x051e051f},
-        {0x0000a180, 0x06010602},
-        {0x0000a184, 0x061f0600},
-        {0x0000a188, 0x061d061e},
-        {0x0000a18c, 0x07020703},
-        {0x0000a190, 0x07000701},
-        {0x0000a194, 0x00000000},
-        {0x0000a198, 0x00000000},
-        {0x0000a19c, 0x00000000},
-        {0x0000a1a0, 0x00000000},
-        {0x0000a1a4, 0x00000000},
-        {0x0000a1a8, 0x00000000},
-        {0x0000a1ac, 0x00000000},
-        {0x0000a1b0, 0x00000000},
-        {0x0000a1b4, 0x00000000},
-        {0x0000a1b8, 0x00000000},
-        {0x0000a1bc, 0x00000000},
-        {0x0000a1c0, 0x00000000},
-        {0x0000a1c4, 0x00000000},
-        {0x0000a1c8, 0x00000000},
-        {0x0000a1cc, 0x00000000},
-        {0x0000a1d0, 0x00000000},
-        {0x0000a1d4, 0x00000000},
-        {0x0000a1d8, 0x00000000},
-        {0x0000a1dc, 0x00000000},
-        {0x0000a1e0, 0x00000000},
-        {0x0000a1e4, 0x00000000},
-        {0x0000a1e8, 0x00000000},
-        {0x0000a1ec, 0x00000000},
-        {0x0000a1f0, 0x00000396},
-        {0x0000a1f4, 0x00000396},
-        {0x0000a1f8, 0x00000396},
-        {0x0000a1fc, 0x00000196},
-        {0x0000b000, 0x00010000},
-        {0x0000b004, 0x00030002},
-        {0x0000b008, 0x00050004},
-        {0x0000b00c, 0x00810080},
-        {0x0000b010, 0x00830082},
-        {0x0000b014, 0x01810180},
-        {0x0000b018, 0x01830182},
-        {0x0000b01c, 0x01850184},
-        {0x0000b020, 0x02810280},
-        {0x0000b024, 0x02830282},
-        {0x0000b028, 0x02850284},
-        {0x0000b02c, 0x02890288},
-        {0x0000b030, 0x028b028a},
-        {0x0000b034, 0x0388028c},
-        {0x0000b038, 0x038a0389},
-        {0x0000b03c, 0x038c038b},
-        {0x0000b040, 0x0390038d},
-        {0x0000b044, 0x03920391},
-        {0x0000b048, 0x03940393},
-        {0x0000b04c, 0x03960395},
-        {0x0000b050, 0x00000000},
-        {0x0000b054, 0x00000000},
-        {0x0000b058, 0x00000000},
-        {0x0000b05c, 0x00000000},
-        {0x0000b060, 0x00000000},
-        {0x0000b064, 0x00000000},
-        {0x0000b068, 0x00000000},
-        {0x0000b06c, 0x00000000},
-        {0x0000b070, 0x00000000},
-        {0x0000b074, 0x00000000},
-        {0x0000b078, 0x00000000},
-        {0x0000b07c, 0x00000000},
-        {0x0000b080, 0x32323232},
-        {0x0000b084, 0x2f2f3232},
-        {0x0000b088, 0x23282a2d},
-        {0x0000b08c, 0x1c1e2123},
-        {0x0000b090, 0x14171919},
-        {0x0000b094, 0x0e0e1214},
-        {0x0000b098, 0x03050707},
-        {0x0000b09c, 0x00030303},
-        {0x0000b0a0, 0x00000000},
-        {0x0000b0a4, 0x00000000},
-        {0x0000b0a8, 0x00000000},
-        {0x0000b0ac, 0x00000000},
-        {0x0000b0b0, 0x00000000},
-        {0x0000b0b4, 0x00000000},
-        {0x0000b0b8, 0x00000000},
-        {0x0000b0bc, 0x00000000},
-        {0x0000b0c0, 0x003f0020},
-        {0x0000b0c4, 0x00400041},
-        {0x0000b0c8, 0x0140005f},
-        {0x0000b0cc, 0x0160015f},
-        {0x0000b0d0, 0x017e017f},
-        {0x0000b0d4, 0x02410242},
-        {0x0000b0d8, 0x025f0240},
-        {0x0000b0dc, 0x027f0260},
-        {0x0000b0e0, 0x0341027e},
-        {0x0000b0e4, 0x035f0340},
-        {0x0000b0e8, 0x037f0360},
-        {0x0000b0ec, 0x04400441},
-        {0x0000b0f0, 0x0460045f},
-        {0x0000b0f4, 0x0541047f},
-        {0x0000b0f8, 0x055f0540},
-        {0x0000b0fc, 0x057f0560},
-        {0x0000b100, 0x06400641},
-        {0x0000b104, 0x0660065f},
-        {0x0000b108, 0x067e067f},
-        {0x0000b10c, 0x07410742},
-        {0x0000b110, 0x075f0740},
-        {0x0000b114, 0x077f0760},
-        {0x0000b118, 0x07800781},
-        {0x0000b11c, 0x07a0079f},
-        {0x0000b120, 0x07c107bf},
-        {0x0000b124, 0x000007c0},
-        {0x0000b128, 0x00000000},
-        {0x0000b12c, 0x00000000},
-        {0x0000b130, 0x00000000},
-        {0x0000b134, 0x00000000},
-        {0x0000b138, 0x00000000},
-        {0x0000b13c, 0x00000000},
-        {0x0000b140, 0x003f0020},
-        {0x0000b144, 0x00400041},
-        {0x0000b148, 0x0140005f},
-        {0x0000b14c, 0x0160015f},
-        {0x0000b150, 0x017e017f},
-        {0x0000b154, 0x02410242},
-        {0x0000b158, 0x025f0240},
-        {0x0000b15c, 0x027f0260},
-        {0x0000b160, 0x0341027e},
-        {0x0000b164, 0x035f0340},
-        {0x0000b168, 0x037f0360},
-        {0x0000b16c, 0x04400441},
-        {0x0000b170, 0x0460045f},
-        {0x0000b174, 0x0541047f},
-        {0x0000b178, 0x055f0540},
-        {0x0000b17c, 0x057f0560},
-        {0x0000b180, 0x06400641},
-        {0x0000b184, 0x0660065f},
-        {0x0000b188, 0x067e067f},
-        {0x0000b18c, 0x07410742},
-        {0x0000b190, 0x075f0740},
-        {0x0000b194, 0x077f0760},
-        {0x0000b198, 0x07800781},
-        {0x0000b19c, 0x07a0079f},
-        {0x0000b1a0, 0x07c107bf},
-        {0x0000b1a4, 0x000007c0},
-        {0x0000b1a8, 0x00000000},
-        {0x0000b1ac, 0x00000000},
-        {0x0000b1b0, 0x00000000},
-        {0x0000b1b4, 0x00000000},
-        {0x0000b1b8, 0x00000000},
-        {0x0000b1bc, 0x00000000},
-        {0x0000b1c0, 0x00000000},
-        {0x0000b1c4, 0x00000000},
-        {0x0000b1c8, 0x00000000},
-        {0x0000b1cc, 0x00000000},
-        {0x0000b1d0, 0x00000000},
-        {0x0000b1d4, 0x00000000},
-        {0x0000b1d8, 0x00000000},
-        {0x0000b1dc, 0x00000000},
-        {0x0000b1e0, 0x00000000},
-        {0x0000b1e4, 0x00000000},
-        {0x0000b1e8, 0x00000000},
-        {0x0000b1ec, 0x00000000},
-        {0x0000b1f0, 0x00000396},
-        {0x0000b1f4, 0x00000396},
-        {0x0000b1f8, 0x00000396},
-        {0x0000b1fc, 0x00000196},
-};
+#define ar9340Common_wo_xlna_rx_gain_table_1p0 ar9300Common_wo_xlna_rx_gain_table_2p2
 
 static const u32 ar9340_1p0_soc_preamble[][2] = {
-        /*    Addr        allmodes        */
-        {0x000040a4, 0x00a0c1c9},
+        /* Addr      allmodes  */
         {0x00007008, 0x00000000},
         {0x00007020, 0x00000000},
         {0x00007034, 0x00000002},
         {0x00007038, 0x000004c2},
 };
 
-#endif
+#endif /* INITVALS_9340_H */
diff --git a/drivers/net/wireless/ath/ath9k/ar9462_2p0_initvals.h b/drivers/net/wireless/ath/ath9k/ar9462_2p0_initvals.h
index 1d6658e139b..4ef7dcccaa2 100644
--- a/drivers/net/wireless/ath/ath9k/ar9462_2p0_initvals.h
+++ b/drivers/net/wireless/ath/ath9k/ar9462_2p0_initvals.h
@@ -1,5 +1,6 @@
 /*
- * Copyright (c) 2010 Atheros Communications Inc.
+ * Copyright (c) 2010-2011 Atheros Communications Inc.
+ * Copyright (c) 2011-2012 Qualcomm Atheros Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -52,7 +53,7 @@ static const u32 ar9462_2p0_baseband_postamble[][5] = {
         {0x00009e04, 0x001c2020, 0x001c2020, 0x001c2020, 0x001c2020},
         {0x00009e0c, 0x6c4000e2, 0x6d4000e2, 0x6d4000e2, 0x6c4000d8},
         {0x00009e10, 0x92c88d2e, 0x7ec88d2e, 0x7ec84d2e, 0x7ec86d2e},
-        {0x00009e14, 0x37b95d5e, 0x37b9605e, 0x3376605e, 0x33795d5e},
+        {0x00009e14, 0x37b95d5e, 0x37b9605e, 0x3376605e, 0x32395d5e},
         {0x00009e18, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
         {0x00009e1c, 0x0001cf9c, 0x0001cf9c, 0x00021f9c, 0x00021f9c},
         {0x00009e20, 0x000003b5, 0x000003b5, 0x000003ce, 0x000003ce},
@@ -61,7 +62,7 @@ static const u32 ar9462_2p0_baseband_postamble[][5] = {
         {0x00009e44, 0x62321e27, 0x62321e27, 0xfe291e27, 0xfe291e27},
         {0x00009e48, 0x5030201a, 0x5030201a, 0x50302012, 0x50302012},
         {0x00009fc8, 0x0003f000, 0x0003f000, 0x0001a000, 0x0001a000},
-        {0x0000a204, 0x013187c0, 0x013187c4, 0x013187c4, 0x013187c0},
+        {0x0000a204, 0x01318fc0, 0x01318fc4, 0x01318fc4, 0x01318fc0},
         {0x0000a208, 0x00000104, 0x00000104, 0x00000004, 0x00000004},
         {0x0000a22c, 0x01026a2f, 0x01026a27, 0x01026a2f, 0x01026a2f},
         {0x0000a230, 0x0000400a, 0x00004014, 0x00004016, 0x0000400b},
@@ -958,7 +959,7 @@ static const u32 ar9462_2p0_radio_core[][2] = {
         {0x0001604c, 0x2699e04f},
         {0x00016050, 0x6db6db6c},
         {0x00016058, 0x6c200000},
-        {0x00016080, 0x00040000},
+        {0x00016080, 0x000c0000},
         {0x00016084, 0x9a68048c},
         {0x00016088, 0x54214514},
         {0x0001608c, 0x1203040b},
@@ -981,7 +982,7 @@ static const u32 ar9462_2p0_radio_core[][2] = {
         {0x00016144, 0x02084080},
         {0x00016148, 0x000080c0},
         {0x00016280, 0x050a0001},
-        {0x00016284, 0x3d841400},
+        {0x00016284, 0x3d841418},
         {0x00016288, 0x00000000},
         {0x0001628c, 0xe3000000},
         {0x00016290, 0xa1005080},
@@ -1007,6 +1008,7 @@ static const u32 ar9462_2p0_radio_core[][2] = {
 
 static const u32 ar9462_2p0_soc_preamble[][2] = {
         /* Addr      allmodes  */
+        {0x000040a4, 0x00a0c1c9},
         {0x00007020, 0x00000000},
         {0x00007034, 0x00000002},
         {0x00007038, 0x000004c2},
diff --git a/drivers/net/wireless/ath/ath9k/ar9485_initvals.h b/drivers/net/wireless/ath/ath9k/ar9485_initvals.h
index d16d029f81a..fb4497fc7a3 100644
--- a/drivers/net/wireless/ath/ath9k/ar9485_initvals.h
+++ b/drivers/net/wireless/ath/ath9k/ar9485_initvals.h
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2010-2011 Atheros Communications Inc.
+ * Copyright (c) 2011-2012 Qualcomm Atheros Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -17,360 +18,151 @@
 #ifndef INITVALS_9485_H
 #define INITVALS_9485_H
 
-static const u32 ar9485_1_1_mac_core[][2] = {
-        /*  Addr       allmodes */
-        {0x00000008, 0x00000000},
-        {0x00000030, 0x00020085},
-        {0x00000034, 0x00000005},
-        {0x00000040, 0x00000000},
-        {0x00000044, 0x00000000},
-        {0x00000048, 0x00000008},
-        {0x0000004c, 0x00000010},
-        {0x00000050, 0x00000000},
-        {0x00001040, 0x002ffc0f},
-        {0x00001044, 0x002ffc0f},
-        {0x00001048, 0x002ffc0f},
-        {0x0000104c, 0x002ffc0f},
-        {0x00001050, 0x002ffc0f},
-        {0x00001054, 0x002ffc0f},
-        {0x00001058, 0x002ffc0f},
-        {0x0000105c, 0x002ffc0f},
-        {0x00001060, 0x002ffc0f},
-        {0x00001064, 0x002ffc0f},
-        {0x000010f0, 0x00000100},
-        {0x00001270, 0x00000000},
-        {0x000012b0, 0x00000000},
-        {0x000012f0, 0x00000000},
-        {0x0000143c, 0x00000000},
-        {0x0000147c, 0x00000000},
-        {0x00008000, 0x00000000},
-        {0x00008004, 0x00000000},
-        {0x00008008, 0x00000000},
-        {0x0000800c, 0x00000000},
-        {0x00008018, 0x00000000},
-        {0x00008020, 0x00000000},
-        {0x00008038, 0x00000000},
-        {0x0000803c, 0x00000000},
-        {0x00008040, 0x00000000},
-        {0x00008044, 0x00000000},
-        {0x00008048, 0x00000000},
-        {0x0000804c, 0xffffffff},
-        {0x00008054, 0x00000000},
-        {0x00008058, 0x00000000},
-        {0x0000805c, 0x000fc78f},
-        {0x00008060, 0x0000000f},
-        {0x00008064, 0x00000000},
-        {0x00008070, 0x00000310},
-        {0x00008074, 0x00000020},
-        {0x00008078, 0x00000000},
-        {0x0000809c, 0x0000000f},
-        {0x000080a0, 0x00000000},
-        {0x000080a4, 0x02ff0000},
-        {0x000080a8, 0x0e070605},
-        {0x000080ac, 0x0000000d},
-        {0x000080b0, 0x00000000},
-        {0x000080b4, 0x00000000},
-        {0x000080b8, 0x00000000},
-        {0x000080bc, 0x00000000},
-        {0x000080c0, 0x2a800000},
-        {0x000080c4, 0x06900168},
-        {0x000080c8, 0x13881c22},
-        {0x000080cc, 0x01f40000},
-        {0x000080d0, 0x00252500},
-        {0x000080d4, 0x00a00000},
-        {0x000080d8, 0x00400000},
-        {0x000080dc, 0x00000000},
-        {0x000080e0, 0xffffffff},
-        {0x000080e4, 0x0000ffff},
-        {0x000080e8, 0x3f3f3f3f},
-        {0x000080ec, 0x00000000},
-        {0x000080f0, 0x00000000},
-        {0x000080f4, 0x00000000},
-        {0x000080fc, 0x00020000},
-        {0x00008100, 0x00000000},
-        {0x00008108, 0x00000052},
-        {0x0000810c, 0x00000000},
-        {0x00008110, 0x00000000},
-        {0x00008114, 0x000007ff},
-        {0x00008118, 0x000000aa},
-        {0x0000811c, 0x00003210},
-        {0x00008124, 0x00000000},
-        {0x00008128, 0x00000000},
-        {0x0000812c, 0x00000000},
-        {0x00008130, 0x00000000},
-        {0x00008134, 0x00000000},
-        {0x00008138, 0x00000000},
-        {0x0000813c, 0x0000ffff},
-        {0x00008144, 0xffffffff},
-        {0x00008168, 0x00000000},
-        {0x0000816c, 0x00000000},
-        {0x00008170, 0x18486200},
-        {0x00008174, 0x33332210},
-        {0x00008178, 0x00000000},
-        {0x0000817c, 0x00020000},
-        {0x000081c0, 0x00000000},
-        {0x000081c4, 0x33332210},
-        {0x000081d4, 0x00000000},
-        {0x000081ec, 0x00000000},
-        {0x000081f0, 0x00000000},
-        {0x000081f4, 0x00000000},
-        {0x000081f8, 0x00000000},
-        {0x000081fc, 0x00000000},
-        {0x00008240, 0x00100000},
-        {0x00008244, 0x0010f400},
-        {0x00008248, 0x00000800},
-        {0x0000824c, 0x0001e800},
-        {0x00008250, 0x00000000},
-        {0x00008254, 0x00000000},
-        {0x00008258, 0x00000000},
-        {0x0000825c, 0x40000000},
-        {0x00008260, 0x00080922},
-        {0x00008264, 0x9ca00010},
-        {0x00008268, 0xffffffff},
-        {0x0000826c, 0x0000ffff},
-        {0x00008270, 0x00000000},
-        {0x00008274, 0x40000000},
-        {0x00008278, 0x003e4180},
-        {0x0000827c, 0x00000004},
-        {0x00008284, 0x0000002c},
-        {0x00008288, 0x0000002c},
-        {0x0000828c, 0x000000ff},
-        {0x00008294, 0x00000000},
-        {0x00008298, 0x00000000},
-        {0x0000829c, 0x00000000},
-        {0x00008300, 0x00000140},
-        {0x00008314, 0x00000000},
-        {0x0000831c, 0x0000010d},
-        {0x00008328, 0x00000000},
-        {0x0000832c, 0x00000007},
-        {0x00008330, 0x00000302},
-        {0x00008334, 0x00000700},
-        {0x00008338, 0x00ff0000},
-        {0x0000833c, 0x02400000},
-        {0x00008340, 0x000107ff},
-        {0x00008344, 0xa248105b},
-        {0x00008348, 0x008f0000},
-        {0x0000835c, 0x00000000},
-        {0x00008360, 0xffffffff},
-        {0x00008364, 0xffffffff},
-        {0x00008368, 0x00000000},
-        {0x00008370, 0x00000000},
-        {0x00008374, 0x000000ff},
-        {0x00008378, 0x00000000},
-        {0x0000837c, 0x00000000},
-        {0x00008380, 0xffffffff},
-        {0x00008384, 0xffffffff},
-        {0x00008390, 0xffffffff},
-        {0x00008394, 0xffffffff},
-        {0x00008398, 0x00000000},
-        {0x0000839c, 0x00000000},
-        {0x000083a0, 0x00000000},
-        {0x000083a4, 0x0000fa14},
-        {0x000083a8, 0x000f0c00},
-        {0x000083ac, 0x33332210},
-        {0x000083b0, 0x33332210},
-        {0x000083b4, 0x33332210},
-        {0x000083b8, 0x33332210},
-        {0x000083bc, 0x00000000},
-        {0x000083c0, 0x00000000},
-        {0x000083c4, 0x00000000},
-        {0x000083c8, 0x00000000},
-        {0x000083cc, 0x00000200},
-        {0x000083d0, 0x000301ff},
-};
+/* AR9485 1.0 */
 
-static const u32 ar9485_1_1_baseband_core[][2] = {
-        /* Addr       allmodes */
-        {0x00009800, 0xafe68e30},
-        {0x00009804, 0xfd14e000},
-        {0x00009808, 0x9c0a8f6b},
-        {0x0000980c, 0x04800000},
-        {0x00009814, 0x9280c00a},
-        {0x00009818, 0x00000000},
-        {0x0000981c, 0x00020028},
-        {0x00009834, 0x5f3ca3de},
-        {0x00009838, 0x0108ecff},
-        {0x0000983c, 0x14750600},
-        {0x00009880, 0x201fff00},
-        {0x00009884, 0x00001042},
-        {0x000098a4, 0x00200400},
-        {0x000098b0, 0x52440bbe},
-        {0x000098d0, 0x004b6a8e},
-        {0x000098d4, 0x00000820},
-        {0x000098dc, 0x00000000},
-        {0x000098f0, 0x00000000},
-        {0x000098f4, 0x00000000},
-        {0x00009c04, 0x00000000},
-        {0x00009c08, 0x03200000},
-        {0x00009c0c, 0x00000000},
-        {0x00009c10, 0x00000000},
-        {0x00009c14, 0x00046384},
-        {0x00009c18, 0x05b6b440},
-        {0x00009c1c, 0x00b6b440},
-        {0x00009d00, 0xc080a333},
-        {0x00009d04, 0x40206c10},
-        {0x00009d08, 0x009c4060},
-        {0x00009d0c, 0x1883800a},
-        {0x00009d10, 0x01834061},
-        {0x00009d14, 0x00c00400},
-        {0x00009d18, 0x00000000},
-        {0x00009d1c, 0x00000000},
-        {0x00009e08, 0x0038233c},
-        {0x00009e24, 0x9927b515},
-        {0x00009e28, 0x12ef0200},
-        {0x00009e30, 0x06336f77},
-        {0x00009e34, 0x6af6532f},
-        {0x00009e38, 0x0cc80c00},
-        {0x00009e40, 0x0d261820},
-        {0x00009e4c, 0x00001004},
-        {0x00009e50, 0x00ff03f1},
-        {0x00009fc0, 0x80be4788},
-        {0x00009fc4, 0x0001efb5},
-        {0x00009fcc, 0x40000014},
-        {0x0000a20c, 0x00000000},
-        {0x0000a210, 0x00000000},
-        {0x0000a220, 0x00000000},
-        {0x0000a224, 0x00000000},
-        {0x0000a228, 0x10002310},
-        {0x0000a23c, 0x00000000},
-        {0x0000a244, 0x0c000000},
-        {0x0000a2a0, 0x00000001},
-        {0x0000a2c0, 0x00000001},
-        {0x0000a2c8, 0x00000000},
-        {0x0000a2cc, 0x18c43433},
-        {0x0000a2d4, 0x00000000},
-        {0x0000a2dc, 0x00000000},
-        {0x0000a2e0, 0x00000000},
-        {0x0000a2e4, 0x00000000},
-        {0x0000a2e8, 0x00000000},
-        {0x0000a2ec, 0x00000000},
-        {0x0000a2f0, 0x00000000},
-        {0x0000a2f4, 0x00000000},
-        {0x0000a2f8, 0x00000000},
-        {0x0000a344, 0x00000000},
-        {0x0000a34c, 0x00000000},
-        {0x0000a350, 0x0000a000},
-        {0x0000a364, 0x00000000},
-        {0x0000a370, 0x00000000},
-        {0x0000a390, 0x00000001},
-        {0x0000a394, 0x00000444},
-        {0x0000a398, 0x001f0e0f},
-        {0x0000a39c, 0x0075393f},
-        {0x0000a3a0, 0xb79f6427},
-        {0x0000a3a4, 0x000000ff},
-        {0x0000a3a8, 0x3b3b3b3b},
-        {0x0000a3ac, 0x2f2f2f2f},
-        {0x0000a3c0, 0x20202020},
-        {0x0000a3c4, 0x22222220},
-        {0x0000a3c8, 0x20200020},
-        {0x0000a3cc, 0x20202020},
-        {0x0000a3d0, 0x20202020},
-        {0x0000a3d4, 0x20202020},
-        {0x0000a3d8, 0x20202020},
-        {0x0000a3dc, 0x20202020},
-        {0x0000a3e0, 0x20202020},
-        {0x0000a3e4, 0x20202020},
-        {0x0000a3e8, 0x20202020},
-        {0x0000a3ec, 0x20202020},
-        {0x0000a3f0, 0x00000000},
-        {0x0000a3f4, 0x00000006},
-        {0x0000a3f8, 0x0cdbd380},
-        {0x0000a3fc, 0x000f0f01},
-        {0x0000a400, 0x8fa91f01},
-        {0x0000a404, 0x00000000},
-        {0x0000a408, 0x0e79e5c6},
-        {0x0000a40c, 0x00820820},
-        {0x0000a414, 0x1ce739cf},
-        {0x0000a418, 0x2d0019ce},
-        {0x0000a41c, 0x1ce739ce},
-        {0x0000a420, 0x000001ce},
-        {0x0000a424, 0x1ce739ce},
-        {0x0000a428, 0x000001ce},
-        {0x0000a42c, 0x1ce739ce},
-        {0x0000a430, 0x1ce739ce},
-        {0x0000a434, 0x00000000},
-        {0x0000a438, 0x00001801},
-        {0x0000a43c, 0x00000000},
-        {0x0000a440, 0x00000000},
-        {0x0000a444, 0x00000000},
-        {0x0000a448, 0x04000000},
-        {0x0000a44c, 0x00000001},
-        {0x0000a450, 0x00010000},
-        {0x0000a5c4, 0xbfad9d74},
-        {0x0000a5c8, 0x0048060a},
-        {0x0000a5cc, 0x00000637},
-        {0x0000a760, 0x03020100},
-        {0x0000a764, 0x09080504},
-        {0x0000a768, 0x0d0c0b0a},
-        {0x0000a76c, 0x13121110},
-        {0x0000a770, 0x31301514},
-        {0x0000a774, 0x35343332},
-        {0x0000a778, 0x00000036},
-        {0x0000a780, 0x00000838},
-        {0x0000a7c0, 0x00000000},
-        {0x0000a7c4, 0xfffffffc},
-        {0x0000a7c8, 0x00000000},
-        {0x0000a7cc, 0x00000000},
-        {0x0000a7d0, 0x00000000},
-        {0x0000a7d4, 0x00000004},
-        {0x0000a7dc, 0x00000000},
-};
+#define ar9485_1_1_mac_postamble ar9300_2p2_mac_postamble
 
-static const u32 ar9485Common_1_1[][2] = {
-        /*  Addr      allmodes */
-        {0x00007010, 0x00000022},
-        {0x00007020, 0x00000000},
-        {0x00007034, 0x00000002},
-        {0x00007038, 0x000004c2},
+static const u32 ar9485_1_1_pcie_phy_pll_on_clkreq_disable_L1[][2] = {
+        /* Addr      allmodes  */
+        {0x00018c00, 0x18012e5e},
+        {0x00018c04, 0x000801d8},
+        {0x00018c08, 0x0000080c},
 };
 
-static const u32 ar9485_1_1_baseband_postamble[][5] = {
-        /* Addr       5G_HT20        5G_HT40       2G_HT40       2G_HT20 */
-        {0x00009810, 0xd00a8005, 0xd00a8005, 0xd00a8005, 0xd00a8005},
-        {0x00009820, 0x206a002e, 0x206a002e, 0x206a002e, 0x206a002e},
-        {0x00009824, 0x5ac640d0, 0x5ac640d0, 0x5ac640d0, 0x5ac640d0},
-        {0x00009828, 0x06903081, 0x06903081, 0x06903881, 0x06903881},
-        {0x0000982c, 0x05eea6d4, 0x05eea6d4, 0x05eea6d4, 0x05eea6d4},
-        {0x00009830, 0x0000059c, 0x0000059c, 0x0000059c, 0x0000059c},
-        {0x00009c00, 0x00000044, 0x00000044, 0x00000044, 0x00000044},
-        {0x00009e00, 0x0372161e, 0x0372161e, 0x037216a0, 0x037216a0},
-        {0x00009e04, 0x00182020, 0x00182020, 0x00182020, 0x00182020},
-        {0x00009e0c, 0x6c4000e2, 0x6d4000e2, 0x6d4000e2, 0x6c4000e2},
-        {0x00009e10, 0x7ec88d2e, 0x7ec88d2e, 0x7ec80d2e, 0x7ec80d2e},
-        {0x00009e14, 0x31395d5e, 0x3139605e, 0x3139605e, 0x31395d5e},
-        {0x00009e18, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x00009e1c, 0x0001cf9c, 0x0001cf9c, 0x00021f9c, 0x00021f9c},
-        {0x00009e20, 0x000003b5, 0x000003b5, 0x000003ce, 0x000003ce},
-        {0x00009e2c, 0x0000001c, 0x0000001c, 0x00000021, 0x00000021},
-        {0x00009e3c, 0xcf946220, 0xcf946220, 0xcf946222, 0xcf946222},
-        {0x00009e44, 0x02321e27, 0x02321e27, 0x02282324, 0x02282324},
-        {0x00009e48, 0x5030201a, 0x5030201a, 0x50302010, 0x50302010},
-        {0x00009fc8, 0x0003f000, 0x0003f000, 0x0001a000, 0x0001a000},
-        {0x0000a204, 0x01303fc0, 0x01303fc4, 0x01303fc4, 0x01303fc0},
-        {0x0000a208, 0x00000104, 0x00000104, 0x00000004, 0x00000004},
-        {0x0000a230, 0x0000400a, 0x00004014, 0x00004016, 0x0000400b},
-        {0x0000a234, 0x10000fff, 0x10000fff, 0x10000fff, 0x10000fff},
-        {0x0000a238, 0xffb81018, 0xffb81018, 0xffb81018, 0xffb81018},
-        {0x0000a250, 0x00000000, 0x00000000, 0x00000210, 0x00000108},
-        {0x0000a254, 0x000007d0, 0x00000fa0, 0x00001130, 0x00000898},
-        {0x0000a258, 0x02020002, 0x02020002, 0x02020002, 0x02020002},
-        {0x0000a25c, 0x01000e0e, 0x01000e0e, 0x01000e0e, 0x01000e0e},
-        {0x0000a260, 0x3a021501, 0x3a021501, 0x3a021501, 0x3a021501},
-        {0x0000a264, 0x00000e0e, 0x00000e0e, 0x00000e0e, 0x00000e0e},
-        {0x0000a280, 0x00000007, 0x00000007, 0x0000000b, 0x0000000b},
-        {0x0000a284, 0x00000000, 0x00000000, 0x000002a0, 0x000002a0},
-        {0x0000a288, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000a28c, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000a2c4, 0x00158d18, 0x00158d18, 0x00158d18, 0x00158d18},
-        {0x0000a2d0, 0x00071981, 0x00071981, 0x00071982, 0x00071982},
-        {0x0000a2d8, 0xf999a83a, 0xf999a83a, 0xf999a83a, 0xf999a83a},
-        {0x0000a358, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000be04, 0x00802020, 0x00802020, 0x00802020, 0x00802020},
-        {0x0000be18, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+static const u32 ar9485Common_wo_xlna_rx_gain_1_1[][2] = {
+        /* Addr      allmodes  */
+        {0x0000a000, 0x00060005},
+        {0x0000a004, 0x00810080},
+        {0x0000a008, 0x00830082},
+        {0x0000a00c, 0x00850084},
+        {0x0000a010, 0x01820181},
+        {0x0000a014, 0x01840183},
+        {0x0000a018, 0x01880185},
+        {0x0000a01c, 0x018a0189},
+        {0x0000a020, 0x02850284},
+        {0x0000a024, 0x02890288},
+        {0x0000a028, 0x028b028a},
+        {0x0000a02c, 0x03850384},
+        {0x0000a030, 0x03890388},
+        {0x0000a034, 0x038b038a},
+        {0x0000a038, 0x038d038c},
+        {0x0000a03c, 0x03910390},
+        {0x0000a040, 0x03930392},
+        {0x0000a044, 0x03950394},
+        {0x0000a048, 0x00000396},
+        {0x0000a04c, 0x00000000},
+        {0x0000a050, 0x00000000},
+        {0x0000a054, 0x00000000},
+        {0x0000a058, 0x00000000},
+        {0x0000a05c, 0x00000000},
+        {0x0000a060, 0x00000000},
+        {0x0000a064, 0x00000000},
+        {0x0000a068, 0x00000000},
+        {0x0000a06c, 0x00000000},
+        {0x0000a070, 0x00000000},
+        {0x0000a074, 0x00000000},
+        {0x0000a078, 0x00000000},
+        {0x0000a07c, 0x00000000},
+        {0x0000a080, 0x28282828},
+        {0x0000a084, 0x28282828},
+        {0x0000a088, 0x28282828},
+        {0x0000a08c, 0x28282828},
+        {0x0000a090, 0x28282828},
+        {0x0000a094, 0x24242428},
+        {0x0000a098, 0x171e1e1e},
+        {0x0000a09c, 0x02020b0b},
+        {0x0000a0a0, 0x02020202},
+        {0x0000a0a4, 0x00000000},
+        {0x0000a0a8, 0x00000000},
+        {0x0000a0ac, 0x00000000},
+        {0x0000a0b0, 0x00000000},
+        {0x0000a0b4, 0x00000000},
+        {0x0000a0b8, 0x00000000},
+        {0x0000a0bc, 0x00000000},
+        {0x0000a0c0, 0x22072208},
+        {0x0000a0c4, 0x22052206},
+        {0x0000a0c8, 0x22032204},
+        {0x0000a0cc, 0x22012202},
+        {0x0000a0d0, 0x221f2200},
+        {0x0000a0d4, 0x221d221e},
+        {0x0000a0d8, 0x33023303},
+        {0x0000a0dc, 0x33003301},
+        {0x0000a0e0, 0x331e331f},
+        {0x0000a0e4, 0x4402331d},
+        {0x0000a0e8, 0x44004401},
+        {0x0000a0ec, 0x441e441f},
+        {0x0000a0f0, 0x55025503},
+        {0x0000a0f4, 0x55005501},
+        {0x0000a0f8, 0x551e551f},
+        {0x0000a0fc, 0x6602551d},
+        {0x0000a100, 0x66006601},
+        {0x0000a104, 0x661e661f},
+        {0x0000a108, 0x7703661d},
+        {0x0000a10c, 0x77017702},
+        {0x0000a110, 0x00007700},
+        {0x0000a114, 0x00000000},
+        {0x0000a118, 0x00000000},
+        {0x0000a11c, 0x00000000},
+        {0x0000a120, 0x00000000},
+        {0x0000a124, 0x00000000},
+        {0x0000a128, 0x00000000},
+        {0x0000a12c, 0x00000000},
+        {0x0000a130, 0x00000000},
+        {0x0000a134, 0x00000000},
+        {0x0000a138, 0x00000000},
+        {0x0000a13c, 0x00000000},
+        {0x0000a140, 0x001f0000},
+        {0x0000a144, 0x111f1100},
+        {0x0000a148, 0x111d111e},
+        {0x0000a14c, 0x111b111c},
+        {0x0000a150, 0x22032204},
+        {0x0000a154, 0x22012202},
+        {0x0000a158, 0x221f2200},
+        {0x0000a15c, 0x221d221e},
+        {0x0000a160, 0x33013302},
+        {0x0000a164, 0x331f3300},
+        {0x0000a168, 0x4402331e},
+        {0x0000a16c, 0x44004401},
+        {0x0000a170, 0x441e441f},
+        {0x0000a174, 0x55015502},
+        {0x0000a178, 0x551f5500},
+        {0x0000a17c, 0x6602551e},
+        {0x0000a180, 0x66006601},
+        {0x0000a184, 0x661e661f},
+        {0x0000a188, 0x7703661d},
+        {0x0000a18c, 0x77017702},
+        {0x0000a190, 0x00007700},
+        {0x0000a194, 0x00000000},
+        {0x0000a198, 0x00000000},
+        {0x0000a19c, 0x00000000},
+        {0x0000a1a0, 0x00000000},
+        {0x0000a1a4, 0x00000000},
+        {0x0000a1a8, 0x00000000},
+        {0x0000a1ac, 0x00000000},
+        {0x0000a1b0, 0x00000000},
+        {0x0000a1b4, 0x00000000},
+        {0x0000a1b8, 0x00000000},
+        {0x0000a1bc, 0x00000000},
+        {0x0000a1c0, 0x00000000},
+        {0x0000a1c4, 0x00000000},
+        {0x0000a1c8, 0x00000000},
+        {0x0000a1cc, 0x00000000},
+        {0x0000a1d0, 0x00000000},
+        {0x0000a1d4, 0x00000000},
+        {0x0000a1d8, 0x00000000},
+        {0x0000a1dc, 0x00000000},
+        {0x0000a1e0, 0x00000000},
+        {0x0000a1e4, 0x00000000},
+        {0x0000a1e8, 0x00000000},
+        {0x0000a1ec, 0x00000000},
+        {0x0000a1f0, 0x00000396},
+        {0x0000a1f4, 0x00000396},
+        {0x0000a1f8, 0x00000396},
+        {0x0000a1fc, 0x00000296},
 };
 
-static const u32 ar9485Modes_high_ob_db_tx_gain_1_1[][5] = {
-        /* Addr        5G_HT20       5G_HT40       2G_HT40       2G_HT20 */
+static const u32 ar9485Modes_high_power_tx_gain_1_1[][5] = {
+        /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
         {0x000098bc, 0x00000002, 0x00000002, 0x00000002, 0x00000002},
         {0x0000a410, 0x000050d9, 0x000050d9, 0x000050d8, 0x000050d8},
         {0x0000a458, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
@@ -442,102 +234,34 @@ static const u32 ar9485Modes_high_ob_db_tx_gain_1_1[][5] = {
         {0x00016048, 0x6c924260, 0x6c924260, 0x6c924260, 0x6c924260},
 };
 
-static const u32 ar9485_modes_lowest_ob_db_tx_gain_1_1[][5] = {
-        /* Addr        5G_HT20       5G_HT40       2G_HT40       2G_HT20  */
-        {0x000098bc, 0x00000002, 0x00000002, 0x00000002, 0x00000002},
-        {0x0000a410, 0x000050d9, 0x000050d9, 0x000050d8, 0x000050d8},
-        {0x0000a458, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000a500, 0x00022200, 0x00022200, 0x00000000, 0x00000000},
-        {0x0000a504, 0x05062002, 0x05062002, 0x04000002, 0x04000002},
-        {0x0000a508, 0x0c002e00, 0x0c002e00, 0x08000004, 0x08000004},
-        {0x0000a50c, 0x11062202, 0x11062202, 0x0d000200, 0x0d000200},
-        {0x0000a510, 0x17022e00, 0x17022e00, 0x11000202, 0x11000202},
-        {0x0000a514, 0x1d000ec2, 0x1d000ec2, 0x15000400, 0x15000400},
-        {0x0000a518, 0x25020ec0, 0x25020ec0, 0x19000402, 0x19000402},
-        {0x0000a51c, 0x2b020ec3, 0x2b020ec3, 0x1d000404, 0x1d000404},
-        {0x0000a520, 0x2f001f04, 0x2f001f04, 0x21000603, 0x21000603},
-        {0x0000a524, 0x35001fc4, 0x35001fc4, 0x25000605, 0x25000605},
-        {0x0000a528, 0x3c022f04, 0x3c022f04, 0x2a000a03, 0x2a000a03},
-        {0x0000a52c, 0x41023e85, 0x41023e85, 0x2c000a04, 0x2c000a04},
-        {0x0000a530, 0x48023ec6, 0x48023ec6, 0x34000e20, 0x34000e20},
-        {0x0000a534, 0x4d023f01, 0x4d023f01, 0x35000e21, 0x35000e21},
-        {0x0000a538, 0x53023f4b, 0x53023f4b, 0x43000e62, 0x43000e62},
-        {0x0000a53c, 0x5a027f09, 0x5a027f09, 0x45000e63, 0x45000e63},
-        {0x0000a540, 0x5f027fc9, 0x5f027fc9, 0x49000e65, 0x49000e65},
-        {0x0000a544, 0x6502feca, 0x6502feca, 0x4b000e66, 0x4b000e66},
-        {0x0000a548, 0x6b02ff4a, 0x6b02ff4a, 0x4d001645, 0x4d001645},
-        {0x0000a54c, 0x7203feca, 0x7203feca, 0x51001865, 0x51001865},
-        {0x0000a550, 0x7703ff0b, 0x7703ff0b, 0x55001a86, 0x55001a86},
-        {0x0000a554, 0x7d06ffcb, 0x7d06ffcb, 0x57001ce9, 0x57001ce9},
-        {0x0000a558, 0x8407ff0b, 0x8407ff0b, 0x5a001ceb, 0x5a001ceb},
-        {0x0000a55c, 0x8907ffcb, 0x8907ffcb, 0x5e001eeb, 0x5e001eeb},
-        {0x0000a560, 0x900fff0b, 0x900fff0b, 0x5e001eeb, 0x5e001eeb},
-        {0x0000a564, 0x960fffcb, 0x960fffcb, 0x5e001eeb, 0x5e001eeb},
-        {0x0000a568, 0x9c1fff0b, 0x9c1fff0b, 0x5e001eeb, 0x5e001eeb},
-        {0x0000a56c, 0x9c1fff0b, 0x9c1fff0b, 0x5e001eeb, 0x5e001eeb},
-        {0x0000a570, 0x9c1fff0b, 0x9c1fff0b, 0x5e001eeb, 0x5e001eeb},
-        {0x0000a574, 0x9c1fff0b, 0x9c1fff0b, 0x5e001eeb, 0x5e001eeb},
-        {0x0000a578, 0x9c1fff0b, 0x9c1fff0b, 0x5e001eeb, 0x5e001eeb},
-        {0x0000a57c, 0x9c1fff0b, 0x9c1fff0b, 0x5e001eeb, 0x5e001eeb},
-        {0x0000b500, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b504, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b508, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b50c, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b510, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b514, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b518, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b51c, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b520, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b524, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b528, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b52c, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b530, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b534, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b538, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b53c, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b540, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b544, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b548, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b54c, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b550, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b554, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b558, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b55c, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b560, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b564, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b568, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b56c, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b570, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b574, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b578, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b57c, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x00016044, 0x05d6b2db, 0x05d6b2db, 0x05d6b2db, 0x05d6b2db},
-        {0x00016048, 0x6c924260, 0x6c924260, 0x6c924260, 0x6c924260},
-};
+#define ar9485Modes_high_ob_db_tx_gain_1_1 ar9485Modes_high_power_tx_gain_1_1
 
-static const u32 ar9485_1_1_radio_postamble[][2] = {
-        /* Addr        allmodes */
-        {0x0001609c, 0x0b283f31},
-        {0x000160ac, 0x24611800},
-        {0x000160b0, 0x03284f3e},
-        {0x0001610c, 0x00170000},
-        {0x00016140, 0x50804008},
-};
+#define ar9485Modes_low_ob_db_tx_gain_1_1 ar9485Modes_high_ob_db_tx_gain_1_1
 
-static const u32 ar9485_1_1_mac_postamble[][5] = {
-        /* Addr        5G_HT20       5G_HT40       2G_HT40       2G_HT20 */
-        {0x00001030, 0x00000230, 0x00000460, 0x000002c0, 0x00000160},
-        {0x00001070, 0x00000168, 0x000002d0, 0x00000318, 0x0000018c},
-        {0x000010b0, 0x00000e60, 0x00001cc0, 0x00007c70, 0x00003e38},
-        {0x00008014, 0x03e803e8, 0x07d007d0, 0x10801600, 0x08400b00},
-        {0x0000801c, 0x128d8027, 0x128d804f, 0x12e00057, 0x12e0002b},
-        {0x00008120, 0x08f04800, 0x08f04800, 0x08f04810, 0x08f04810},
-        {0x000081d0, 0x00003210, 0x00003210, 0x0000320a, 0x0000320a},
-        {0x00008318, 0x00003e80, 0x00007d00, 0x00006880, 0x00003440},
+#define ar9485_modes_lowest_ob_db_tx_gain_1_1 ar9485Modes_low_ob_db_tx_gain_1_1
+
+static const u32 ar9485_1_1[][2] = {
+        /* Addr      allmodes  */
+        {0x0000a580, 0x00000000},
+        {0x0000a584, 0x00000000},
+        {0x0000a588, 0x00000000},
+        {0x0000a58c, 0x00000000},
+        {0x0000a590, 0x00000000},
+        {0x0000a594, 0x00000000},
+        {0x0000a598, 0x00000000},
+        {0x0000a59c, 0x00000000},
+        {0x0000a5a0, 0x00000000},
+        {0x0000a5a4, 0x00000000},
+        {0x0000a5a8, 0x00000000},
+        {0x0000a5ac, 0x00000000},
+        {0x0000a5b0, 0x00000000},
+        {0x0000a5b4, 0x00000000},
+        {0x0000a5b8, 0x00000000},
+        {0x0000a5bc, 0x00000000},
 };
 
 static const u32 ar9485_1_1_radio_core[][2] = {
-        /* Addr        allmodes */
+        /* Addr      allmodes  */
         {0x00016000, 0x36db6db6},
         {0x00016004, 0x6db6db40},
         {0x00016008, 0x73800000},
@@ -601,294 +325,145 @@ static const u32 ar9485_1_1_radio_core[][2] = {
         {0x00016c44, 0x12000000},
 };
 
-static const u32 ar9485_1_1_pcie_phy_pll_on_clkreq_enable_L1[][2] = {
-        /* Addr        allmodes */
-        {0x00018c00, 0x18052e5e},
-        {0x00018c04, 0x000801d8},
-        {0x00018c08, 0x0000080c},
-};
-
-static const u32 ar9485Modes_high_power_tx_gain_1_1[][5] = {
-        /* Addr        5G_HT20       5G_HT40       2G_HT40       2G_HT20 */
-        {0x000098bc, 0x00000002, 0x00000002, 0x00000002, 0x00000002},
-        {0x0000a410, 0x000050d9, 0x000050d9, 0x000050d8, 0x000050d8},
-        {0x0000a458, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000a500, 0x00022200, 0x00022200, 0x00000000, 0x00000000},
-        {0x0000a504, 0x05062002, 0x05062002, 0x04000002, 0x04000002},
-        {0x0000a508, 0x0c002e00, 0x0c002e00, 0x08000004, 0x08000004},
-        {0x0000a50c, 0x11062202, 0x11062202, 0x0d000200, 0x0d000200},
-        {0x0000a510, 0x17022e00, 0x17022e00, 0x11000202, 0x11000202},
-        {0x0000a514, 0x1d000ec2, 0x1d000ec2, 0x15000400, 0x15000400},
-        {0x0000a518, 0x25020ec0, 0x25020ec0, 0x19000402, 0x19000402},
-        {0x0000a51c, 0x2b020ec3, 0x2b020ec3, 0x1d000404, 0x1d000404},
-        {0x0000a520, 0x2f001f04, 0x2f001f04, 0x21000603, 0x21000603},
-        {0x0000a524, 0x35001fc4, 0x35001fc4, 0x25000605, 0x25000605},
-        {0x0000a528, 0x3c022f04, 0x3c022f04, 0x2a000a03, 0x2a000a03},
-        {0x0000a52c, 0x41023e85, 0x41023e85, 0x2c000a04, 0x2c000a04},
-        {0x0000a530, 0x48023ec6, 0x48023ec6, 0x34000e20, 0x34000e20},
-        {0x0000a534, 0x4d023f01, 0x4d023f01, 0x35000e21, 0x35000e21},
-        {0x0000a538, 0x53023f4b, 0x53023f4b, 0x43000e62, 0x43000e62},
-        {0x0000a53c, 0x5a027f09, 0x5a027f09, 0x45000e63, 0x45000e63},
-        {0x0000a540, 0x5f027fc9, 0x5f027fc9, 0x49000e65, 0x49000e65},
-        {0x0000a544, 0x6502feca, 0x6502feca, 0x4b000e66, 0x4b000e66},
-        {0x0000a548, 0x6b02ff4a, 0x6b02ff4a, 0x4d001645, 0x4d001645},
-        {0x0000a54c, 0x7203feca, 0x7203feca, 0x51001865, 0x51001865},
-        {0x0000a550, 0x7703ff0b, 0x7703ff0b, 0x55001a86, 0x55001a86},
-        {0x0000a554, 0x7d06ffcb, 0x7d06ffcb, 0x57001ce9, 0x57001ce9},
-        {0x0000a558, 0x8407ff0b, 0x8407ff0b, 0x5a001ceb, 0x5a001ceb},
-        {0x0000a55c, 0x8907ffcb, 0x8907ffcb, 0x5e001eeb, 0x5e001eeb},
-        {0x0000a560, 0x900fff0b, 0x900fff0b, 0x5e001eeb, 0x5e001eeb},
-        {0x0000a564, 0x960fffcb, 0x960fffcb, 0x5e001eeb, 0x5e001eeb},
-        {0x0000a568, 0x9c1fff0b, 0x9c1fff0b, 0x5e001eeb, 0x5e001eeb},
-        {0x0000a56c, 0x9c1fff0b, 0x9c1fff0b, 0x5e001eeb, 0x5e001eeb},
-        {0x0000a570, 0x9c1fff0b, 0x9c1fff0b, 0x5e001eeb, 0x5e001eeb},
-        {0x0000a574, 0x9c1fff0b, 0x9c1fff0b, 0x5e001eeb, 0x5e001eeb},
-        {0x0000a578, 0x9c1fff0b, 0x9c1fff0b, 0x5e001eeb, 0x5e001eeb},
-        {0x0000a57c, 0x9c1fff0b, 0x9c1fff0b, 0x5e001eeb, 0x5e001eeb},
-        {0x0000b500, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b504, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b508, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b50c, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b510, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b514, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b518, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b51c, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b520, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b524, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b528, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b52c, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b530, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b534, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b538, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b53c, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b540, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b544, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b548, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b54c, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b550, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b554, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b558, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b55c, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b560, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b564, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b568, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b56c, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b570, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b574, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b578, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b57c, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x00016044, 0x05d6b2db, 0x05d6b2db, 0x05d6b2db, 0x05d6b2db},
-        {0x00016048, 0x6c924260, 0x6c924260, 0x6c924260, 0x6c924260},
-};
-
-static const u32 ar9485_1_1[][2] = {
-        /* Addr        allmodes */
-        {0x0000a580, 0x00000000},
-        {0x0000a584, 0x00000000},
-        {0x0000a588, 0x00000000},
-        {0x0000a58c, 0x00000000},
-        {0x0000a590, 0x00000000},
-        {0x0000a594, 0x00000000},
-        {0x0000a598, 0x00000000},
-        {0x0000a59c, 0x00000000},
-        {0x0000a5a0, 0x00000000},
-        {0x0000a5a4, 0x00000000},
-        {0x0000a5a8, 0x00000000},
-        {0x0000a5ac, 0x00000000},
-        {0x0000a5b0, 0x00000000},
-        {0x0000a5b4, 0x00000000},
-        {0x0000a5b8, 0x00000000},
-        {0x0000a5bc, 0x00000000},
-};
-
-static const u32 ar9485_modes_green_ob_db_tx_gain_1_1[][5] = {
-        /* Addr        5G_HT20       5G_HT40       2G_HT40       2G_HT20 */
-        {0x000098bc, 0x00000003, 0x00000003, 0x00000003, 0x00000003},
-        {0x0000a410, 0x000050d9, 0x000050d9, 0x000050d8, 0x000050d8},
-        {0x0000a458, 0x80000000, 0x80000000, 0x80000000, 0x80000000},
-        {0x0000a500, 0x00022200, 0x00022200, 0x00000006, 0x00000006},
-        {0x0000a504, 0x05062002, 0x05062002, 0x03000201, 0x03000201},
-        {0x0000a508, 0x0c002e00, 0x0c002e00, 0x06000203, 0x06000203},
-        {0x0000a50c, 0x11062202, 0x11062202, 0x0a000401, 0x0a000401},
-        {0x0000a510, 0x17022e00, 0x17022e00, 0x0e000403, 0x0e000403},
-        {0x0000a514, 0x1d000ec2, 0x1d000ec2, 0x12000405, 0x12000405},
-        {0x0000a518, 0x25020ec0, 0x25020ec0, 0x15000604, 0x15000604},
-        {0x0000a51c, 0x2b020ec3, 0x2b020ec3, 0x18000605, 0x18000605},
-        {0x0000a520, 0x2f001f04, 0x2f001f04, 0x1c000a04, 0x1c000a04},
-        {0x0000a524, 0x35001fc4, 0x35001fc4, 0x21000a06, 0x21000a06},
-        {0x0000a528, 0x3c022f04, 0x3c022f04, 0x29000a24, 0x29000a24},
-        {0x0000a52c, 0x41023e85, 0x41023e85, 0x2f000e21, 0x2f000e21},
-        {0x0000a530, 0x48023ec6, 0x48023ec6, 0x31000e20, 0x31000e20},
-        {0x0000a534, 0x4d023f01, 0x4d023f01, 0x33000e20, 0x33000e20},
-        {0x0000a538, 0x53023f4b, 0x53023f4b, 0x43000e62, 0x43000e62},
-        {0x0000a53c, 0x5a027f09, 0x5a027f09, 0x45000e63, 0x45000e63},
-        {0x0000a540, 0x5f027fc9, 0x5f027fc9, 0x49000e65, 0x49000e65},
-        {0x0000a544, 0x6502feca, 0x6502feca, 0x4b000e66, 0x4b000e66},
-        {0x0000a548, 0x6b02ff4a, 0x6b02ff4a, 0x4d001645, 0x4d001645},
-        {0x0000a54c, 0x7203feca, 0x7203feca, 0x51001865, 0x51001865},
-        {0x0000a550, 0x7703ff0b, 0x7703ff0b, 0x55001a86, 0x55001a86},
-        {0x0000a554, 0x7d06ffcb, 0x7d06ffcb, 0x57001ce9, 0x57001ce9},
-        {0x0000a558, 0x8407ff0b, 0x8407ff0b, 0x5a001ceb, 0x5a001ceb},
-        {0x0000a55c, 0x8907ffcb, 0x8907ffcb, 0x5e001eeb, 0x5e001eeb},
-        {0x0000a560, 0x900fff0b, 0x900fff0b, 0x5e001eeb, 0x5e001eeb},
-        {0x0000a564, 0x960fffcb, 0x960fffcb, 0x5e001eeb, 0x5e001eeb},
-        {0x0000a568, 0x9c1fff0b, 0x9c1fff0b, 0x5e001eeb, 0x5e001eeb},
-        {0x0000a56c, 0x9c1fff0b, 0x9c1fff0b, 0x5e001eeb, 0x5e001eeb},
-        {0x0000a570, 0x9c1fff0b, 0x9c1fff0b, 0x5e001eeb, 0x5e001eeb},
-        {0x0000a574, 0x9c1fff0b, 0x9c1fff0b, 0x5e001eeb, 0x5e001eeb},
-        {0x0000a578, 0x9c1fff0b, 0x9c1fff0b, 0x5e001eeb, 0x5e001eeb},
-        {0x0000a57c, 0x9c1fff0b, 0x9c1fff0b, 0x5e001eeb, 0x5e001eeb},
-        {0x0000b500, 0x0000001a, 0x0000001a, 0x0000001a, 0x0000001a},
-        {0x0000b504, 0x0000001a, 0x0000001a, 0x0000001a, 0x0000001a},
-        {0x0000b508, 0x0000001a, 0x0000001a, 0x0000001a, 0x0000001a},
-        {0x0000b50c, 0x0000001a, 0x0000001a, 0x0000001a, 0x0000001a},
-        {0x0000b510, 0x0000001a, 0x0000001a, 0x0000001a, 0x0000001a},
-        {0x0000b514, 0x0000001a, 0x0000001a, 0x0000001a, 0x0000001a},
-        {0x0000b518, 0x0000001a, 0x0000001a, 0x0000001a, 0x0000001a},
-        {0x0000b51c, 0x0000001a, 0x0000001a, 0x0000001a, 0x0000001a},
-        {0x0000b520, 0x0000001a, 0x0000001a, 0x0000001a, 0x0000001a},
-        {0x0000b524, 0x0000001a, 0x0000001a, 0x0000001a, 0x0000001a},
-        {0x0000b528, 0x0000001a, 0x0000001a, 0x0000001a, 0x0000001a},
-        {0x0000b52c, 0x0000002a, 0x0000002a, 0x0000002a, 0x0000002a},
-        {0x0000b530, 0x0000003a, 0x0000003a, 0x0000003a, 0x0000003a},
-        {0x0000b534, 0x0000004a, 0x0000004a, 0x0000004a, 0x0000004a},
-        {0x0000b538, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
-        {0x0000b53c, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
-        {0x0000b540, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
-        {0x0000b544, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
-        {0x0000b548, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
-        {0x0000b54c, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
-        {0x0000b550, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
-        {0x0000b554, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
-        {0x0000b558, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
-        {0x0000b55c, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
-        {0x0000b560, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
-        {0x0000b564, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
-        {0x0000b568, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
-        {0x0000b56c, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
-        {0x0000b570, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
-        {0x0000b574, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
-        {0x0000b578, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
-        {0x0000b57c, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
-        {0x00016044, 0x05d6b2db, 0x05d6b2db, 0x05d6b2db, 0x05d6b2db},
-        {0x00016048, 0x6c924260, 0x6c924260, 0x6c924260, 0x6c924260},
-};
-
-static const u32 ar9485_1_1_pcie_phy_clkreq_disable_L1[][2] = {
-        /* Addr        allmodes */
-        {0x00018c00, 0x18013e5e},
-        {0x00018c04, 0x000801d8},
-        {0x00018c08, 0x0000080c},
-};
-
-static const u32 ar9485_1_1_soc_preamble[][2] = {
-        /* Addr        allmodes */
-        {0x00004014, 0xba280400},
-        {0x00004090, 0x00aa10aa},
-        {0x000040a4, 0x00a0c9c9},
-        {0x00007010, 0x00000022},
-        {0x00007020, 0x00000000},
-        {0x00007034, 0x00000002},
-        {0x00007038, 0x000004c2},
-        {0x00007048, 0x00000002},
-};
-
-static const u32 ar9485_1_1_baseband_core_txfir_coeff_japan_2484[][2] = {
-        /* Addr        allmodes */
-        {0x0000a398, 0x00000000},
-        {0x0000a39c, 0x6f7f0301},
-        {0x0000a3a0, 0xca9228ee},
-};
-
-static const u32 ar9485Modes_low_ob_db_tx_gain_1_1[][5] = {
-        /* Addr        5G_HT20       5G_HT40       2G_HT40       2G_HT20  */
-        {0x000098bc, 0x00000002, 0x00000002, 0x00000002, 0x00000002},
-        {0x0000a410, 0x000050d9, 0x000050d9, 0x000050d8, 0x000050d8},
-        {0x0000a458, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000a500, 0x00022200, 0x00022200, 0x00000000, 0x00000000},
-        {0x0000a504, 0x05062002, 0x05062002, 0x04000002, 0x04000002},
-        {0x0000a508, 0x0c002e00, 0x0c002e00, 0x08000004, 0x08000004},
-        {0x0000a50c, 0x11062202, 0x11062202, 0x0d000200, 0x0d000200},
-        {0x0000a510, 0x17022e00, 0x17022e00, 0x11000202, 0x11000202},
-        {0x0000a514, 0x1d000ec2, 0x1d000ec2, 0x15000400, 0x15000400},
-        {0x0000a518, 0x25020ec0, 0x25020ec0, 0x19000402, 0x19000402},
-        {0x0000a51c, 0x2b020ec3, 0x2b020ec3, 0x1d000404, 0x1d000404},
-        {0x0000a520, 0x2f001f04, 0x2f001f04, 0x21000603, 0x21000603},
-        {0x0000a524, 0x35001fc4, 0x35001fc4, 0x25000605, 0x25000605},
-        {0x0000a528, 0x3c022f04, 0x3c022f04, 0x2a000a03, 0x2a000a03},
-        {0x0000a52c, 0x41023e85, 0x41023e85, 0x2c000a04, 0x2c000a04},
-        {0x0000a530, 0x48023ec6, 0x48023ec6, 0x34000e20, 0x34000e20},
-        {0x0000a534, 0x4d023f01, 0x4d023f01, 0x35000e21, 0x35000e21},
-        {0x0000a538, 0x53023f4b, 0x53023f4b, 0x43000e62, 0x43000e62},
-        {0x0000a53c, 0x5a027f09, 0x5a027f09, 0x45000e63, 0x45000e63},
-        {0x0000a540, 0x5f027fc9, 0x5f027fc9, 0x49000e65, 0x49000e65},
-        {0x0000a544, 0x6502feca, 0x6502feca, 0x4b000e66, 0x4b000e66},
-        {0x0000a548, 0x6b02ff4a, 0x6b02ff4a, 0x4d001645, 0x4d001645},
-        {0x0000a54c, 0x7203feca, 0x7203feca, 0x51001865, 0x51001865},
-        {0x0000a550, 0x7703ff0b, 0x7703ff0b, 0x55001a86, 0x55001a86},
-        {0x0000a554, 0x7d06ffcb, 0x7d06ffcb, 0x57001ce9, 0x57001ce9},
-        {0x0000a558, 0x8407ff0b, 0x8407ff0b, 0x5a001ceb, 0x5a001ceb},
-        {0x0000a55c, 0x8907ffcb, 0x8907ffcb, 0x5e001eeb, 0x5e001eeb},
-        {0x0000a560, 0x900fff0b, 0x900fff0b, 0x5e001eeb, 0x5e001eeb},
-        {0x0000a564, 0x960fffcb, 0x960fffcb, 0x5e001eeb, 0x5e001eeb},
-        {0x0000a568, 0x9c1fff0b, 0x9c1fff0b, 0x5e001eeb, 0x5e001eeb},
-        {0x0000a56c, 0x9c1fff0b, 0x9c1fff0b, 0x5e001eeb, 0x5e001eeb},
-        {0x0000a570, 0x9c1fff0b, 0x9c1fff0b, 0x5e001eeb, 0x5e001eeb},
-        {0x0000a574, 0x9c1fff0b, 0x9c1fff0b, 0x5e001eeb, 0x5e001eeb},
-        {0x0000a578, 0x9c1fff0b, 0x9c1fff0b, 0x5e001eeb, 0x5e001eeb},
-        {0x0000a57c, 0x9c1fff0b, 0x9c1fff0b, 0x5e001eeb, 0x5e001eeb},
-        {0x0000b500, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b504, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b508, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b50c, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b510, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b514, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b518, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b51c, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b520, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b524, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b528, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b52c, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b530, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b534, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b538, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b53c, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b540, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b544, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b548, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b54c, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b550, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b554, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b558, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b55c, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b560, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b564, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b568, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b56c, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b570, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b574, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b578, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b57c, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x00016044, 0x05d6b2db, 0x05d6b2db, 0x05d6b2db, 0x05d6b2db},
-        {0x00016048, 0x6c924260, 0x6c924260, 0x6c924260, 0x6c924260},
-};
-
-static const u32 ar9485_fast_clock_1_1_baseband_postamble[][3] = {
-        /* Addr        5G_HT2        5G_HT40  */
-        {0x00009e00, 0x03721821, 0x03721821},
-        {0x0000a230, 0x0000400b, 0x00004016},
-        {0x0000a254, 0x00000898, 0x00001130},
-};
-
-static const u32 ar9485_1_1_pcie_phy_pll_on_clkreq_disable_L1[][2] = {
-        /* Addr        allmodes  */
-        {0x00018c00, 0x18012e5e},
-        {0x00018c04, 0x000801d8},
-        {0x00018c08, 0x0000080c},
+static const u32 ar9485_1_1_baseband_core[][2] = {
+        /* Addr      allmodes  */
+        {0x00009800, 0xafe68e30},
+        {0x00009804, 0xfd14e000},
+        {0x00009808, 0x9c0a8f6b},
+        {0x0000980c, 0x04800000},
+        {0x00009814, 0x9280c00a},
+        {0x00009818, 0x00000000},
+        {0x0000981c, 0x00020028},
+        {0x00009834, 0x5f3ca3de},
+        {0x00009838, 0x0108ecff},
+        {0x0000983c, 0x14750600},
+        {0x00009880, 0x201fff00},
+        {0x00009884, 0x00001042},
+        {0x000098a4, 0x00200400},
+        {0x000098b0, 0x52440bbe},
+        {0x000098d0, 0x004b6a8e},
+        {0x000098d4, 0x00000820},
+        {0x000098dc, 0x00000000},
+        {0x000098f0, 0x00000000},
+        {0x000098f4, 0x00000000},
+        {0x00009c04, 0x00000000},
+        {0x00009c08, 0x03200000},
+        {0x00009c0c, 0x00000000},
+        {0x00009c10, 0x00000000},
+        {0x00009c14, 0x00046384},
+        {0x00009c18, 0x05b6b440},
+        {0x00009c1c, 0x00b6b440},
+        {0x00009d00, 0xc080a333},
+        {0x00009d04, 0x40206c10},
+        {0x00009d08, 0x009c4060},
+        {0x00009d0c, 0x1883800a},
+        {0x00009d10, 0x01834061},
+        {0x00009d14, 0x00c00400},
+        {0x00009d18, 0x00000000},
+        {0x00009d1c, 0x00000000},
+        {0x00009e08, 0x0038233c},
+        {0x00009e24, 0x9927b515},
+        {0x00009e28, 0x12ef0200},
+        {0x00009e30, 0x06336f77},
+        {0x00009e34, 0x6af6532f},
+        {0x00009e38, 0x0cc80c00},
+        {0x00009e40, 0x0d261820},
+        {0x00009e4c, 0x00001004},
+        {0x00009e50, 0x00ff03f1},
+        {0x00009fc0, 0x80be4788},
+        {0x00009fc4, 0x0001efb5},
+        {0x00009fcc, 0x40000014},
+        {0x0000a20c, 0x00000000},
+        {0x0000a210, 0x00000000},
+        {0x0000a220, 0x00000000},
+        {0x0000a224, 0x00000000},
+        {0x0000a228, 0x10002310},
+        {0x0000a23c, 0x00000000},
+        {0x0000a244, 0x0c000000},
+        {0x0000a2a0, 0x00000001},
+        {0x0000a2c0, 0x00000001},
+        {0x0000a2c8, 0x00000000},
+        {0x0000a2cc, 0x18c43433},
+        {0x0000a2d4, 0x00000000},
+        {0x0000a2dc, 0x00000000},
+        {0x0000a2e0, 0x00000000},
+        {0x0000a2e4, 0x00000000},
+        {0x0000a2e8, 0x00000000},
+        {0x0000a2ec, 0x00000000},
+        {0x0000a2f0, 0x00000000},
+        {0x0000a2f4, 0x00000000},
+        {0x0000a2f8, 0x00000000},
+        {0x0000a344, 0x00000000},
+        {0x0000a34c, 0x00000000},
+        {0x0000a350, 0x0000a000},
+        {0x0000a364, 0x00000000},
+        {0x0000a370, 0x00000000},
+        {0x0000a390, 0x00000001},
+        {0x0000a394, 0x00000444},
+        {0x0000a398, 0x001f0e0f},
+        {0x0000a39c, 0x0075393f},
+        {0x0000a3a0, 0xb79f6427},
+        {0x0000a3a4, 0x000000ff},
+        {0x0000a3a8, 0x3b3b3b3b},
+        {0x0000a3ac, 0x2f2f2f2f},
+        {0x0000a3c0, 0x20202020},
+        {0x0000a3c4, 0x22222220},
+        {0x0000a3c8, 0x20200020},
+        {0x0000a3cc, 0x20202020},
+        {0x0000a3d0, 0x20202020},
+        {0x0000a3d4, 0x20202020},
+        {0x0000a3d8, 0x20202020},
+        {0x0000a3dc, 0x20202020},
+        {0x0000a3e0, 0x20202020},
+        {0x0000a3e4, 0x20202020},
+        {0x0000a3e8, 0x20202020},
+        {0x0000a3ec, 0x20202020},
+        {0x0000a3f0, 0x00000000},
+        {0x0000a3f4, 0x00000006},
+        {0x0000a3f8, 0x0cdbd380},
+        {0x0000a3fc, 0x000f0f01},
+        {0x0000a400, 0x8fa91f01},
+        {0x0000a404, 0x00000000},
+        {0x0000a408, 0x0e79e5c6},
+        {0x0000a40c, 0x00820820},
+        {0x0000a414, 0x1ce739cf},
+        {0x0000a418, 0x2d0019ce},
+        {0x0000a41c, 0x1ce739ce},
+        {0x0000a420, 0x000001ce},
+        {0x0000a424, 0x1ce739ce},
+        {0x0000a428, 0x000001ce},
+        {0x0000a42c, 0x1ce739ce},
+        {0x0000a430, 0x1ce739ce},
+        {0x0000a434, 0x00000000},
+        {0x0000a438, 0x00001801},
+        {0x0000a43c, 0x00000000},
+        {0x0000a440, 0x00000000},
+        {0x0000a444, 0x00000000},
+        {0x0000a448, 0x04000000},
+        {0x0000a44c, 0x00000001},
+        {0x0000a450, 0x00010000},
+        {0x0000a5c4, 0xbfad9d74},
+        {0x0000a5c8, 0x0048060a},
+        {0x0000a5cc, 0x00000637},
+        {0x0000a760, 0x03020100},
+        {0x0000a764, 0x09080504},
+        {0x0000a768, 0x0d0c0b0a},
+        {0x0000a76c, 0x13121110},
+        {0x0000a770, 0x31301514},
+        {0x0000a774, 0x35343332},
+        {0x0000a778, 0x00000036},
+        {0x0000a780, 0x00000838},
+        {0x0000a7c0, 0x00000000},
+        {0x0000a7c4, 0xfffffffc},
+        {0x0000a7c8, 0x00000000},
+        {0x0000a7cc, 0x00000000},
+        {0x0000a7d0, 0x00000000},
+        {0x0000a7d4, 0x00000004},
+        {0x0000a7dc, 0x00000000},
 };
 
 static const u32 ar9485_common_rx_gain_1_1[][2] = {
-        /* Addr        allmodes */
+        /* Addr      allmodes  */
         {0x0000a000, 0x00010000},
         {0x0000a004, 0x00030002},
         {0x0000a008, 0x00050004},
@@ -1019,143 +594,260 @@ static const u32 ar9485_common_rx_gain_1_1[][2] = {
         {0x0000a1fc, 0x00000296},
 };
 
+static const u32 ar9485_1_1_pcie_phy_pll_on_clkreq_enable_L1[][2] = {
+        /* Addr      allmodes  */
+        {0x00018c00, 0x18052e5e},
+        {0x00018c04, 0x000801d8},
+        {0x00018c08, 0x0000080c},
+};
+
 static const u32 ar9485_1_1_pcie_phy_clkreq_enable_L1[][2] = {
-        /* Addr        allmodes */
+        /* Addr      allmodes  */
         {0x00018c00, 0x18053e5e},
         {0x00018c04, 0x000801d8},
         {0x00018c08, 0x0000080c},
 };
 
-static const u32 ar9485Common_wo_xlna_rx_gain_1_1[][2] = {
-        /* Addr        allmodes */
-        {0x0000a000, 0x00060005},
-        {0x0000a004, 0x00810080},
-        {0x0000a008, 0x00830082},
-        {0x0000a00c, 0x00850084},
-        {0x0000a010, 0x01820181},
-        {0x0000a014, 0x01840183},
-        {0x0000a018, 0x01880185},
-        {0x0000a01c, 0x018a0189},
-        {0x0000a020, 0x02850284},
-        {0x0000a024, 0x02890288},
-        {0x0000a028, 0x028b028a},
-        {0x0000a02c, 0x03850384},
-        {0x0000a030, 0x03890388},
-        {0x0000a034, 0x038b038a},
-        {0x0000a038, 0x038d038c},
-        {0x0000a03c, 0x03910390},
-        {0x0000a040, 0x03930392},
-        {0x0000a044, 0x03950394},
-        {0x0000a048, 0x00000396},
-        {0x0000a04c, 0x00000000},
-        {0x0000a050, 0x00000000},
-        {0x0000a054, 0x00000000},
-        {0x0000a058, 0x00000000},
-        {0x0000a05c, 0x00000000},
-        {0x0000a060, 0x00000000},
-        {0x0000a064, 0x00000000},
-        {0x0000a068, 0x00000000},
-        {0x0000a06c, 0x00000000},
-        {0x0000a070, 0x00000000},
-        {0x0000a074, 0x00000000},
-        {0x0000a078, 0x00000000},
-        {0x0000a07c, 0x00000000},
-        {0x0000a080, 0x28282828},
-        {0x0000a084, 0x28282828},
-        {0x0000a088, 0x28282828},
-        {0x0000a08c, 0x28282828},
-        {0x0000a090, 0x28282828},
-        {0x0000a094, 0x24242428},
-        {0x0000a098, 0x171e1e1e},
-        {0x0000a09c, 0x02020b0b},
-        {0x0000a0a0, 0x02020202},
-        {0x0000a0a4, 0x00000000},
-        {0x0000a0a8, 0x00000000},
-        {0x0000a0ac, 0x00000000},
-        {0x0000a0b0, 0x00000000},
-        {0x0000a0b4, 0x00000000},
-        {0x0000a0b8, 0x00000000},
-        {0x0000a0bc, 0x00000000},
-        {0x0000a0c0, 0x22072208},
-        {0x0000a0c4, 0x22052206},
-        {0x0000a0c8, 0x22032204},
-        {0x0000a0cc, 0x22012202},
-        {0x0000a0d0, 0x221f2200},
-        {0x0000a0d4, 0x221d221e},
-        {0x0000a0d8, 0x33023303},
-        {0x0000a0dc, 0x33003301},
-        {0x0000a0e0, 0x331e331f},
-        {0x0000a0e4, 0x4402331d},
-        {0x0000a0e8, 0x44004401},
-        {0x0000a0ec, 0x441e441f},
-        {0x0000a0f0, 0x55025503},
-        {0x0000a0f4, 0x55005501},
-        {0x0000a0f8, 0x551e551f},
-        {0x0000a0fc, 0x6602551d},
-        {0x0000a100, 0x66006601},
-        {0x0000a104, 0x661e661f},
-        {0x0000a108, 0x7703661d},
-        {0x0000a10c, 0x77017702},
-        {0x0000a110, 0x00007700},
-        {0x0000a114, 0x00000000},
-        {0x0000a118, 0x00000000},
-        {0x0000a11c, 0x00000000},
-        {0x0000a120, 0x00000000},
-        {0x0000a124, 0x00000000},
-        {0x0000a128, 0x00000000},
-        {0x0000a12c, 0x00000000},
-        {0x0000a130, 0x00000000},
-        {0x0000a134, 0x00000000},
-        {0x0000a138, 0x00000000},
-        {0x0000a13c, 0x00000000},
-        {0x0000a140, 0x001f0000},
-        {0x0000a144, 0x111f1100},
-        {0x0000a148, 0x111d111e},
-        {0x0000a14c, 0x111b111c},
-        {0x0000a150, 0x22032204},
-        {0x0000a154, 0x22012202},
-        {0x0000a158, 0x221f2200},
-        {0x0000a15c, 0x221d221e},
-        {0x0000a160, 0x33013302},
-        {0x0000a164, 0x331f3300},
-        {0x0000a168, 0x4402331e},
-        {0x0000a16c, 0x44004401},
-        {0x0000a170, 0x441e441f},
-        {0x0000a174, 0x55015502},
-        {0x0000a178, 0x551f5500},
-        {0x0000a17c, 0x6602551e},
-        {0x0000a180, 0x66006601},
-        {0x0000a184, 0x661e661f},
-        {0x0000a188, 0x7703661d},
-        {0x0000a18c, 0x77017702},
-        {0x0000a190, 0x00007700},
-        {0x0000a194, 0x00000000},
-        {0x0000a198, 0x00000000},
-        {0x0000a19c, 0x00000000},
-        {0x0000a1a0, 0x00000000},
-        {0x0000a1a4, 0x00000000},
-        {0x0000a1a8, 0x00000000},
-        {0x0000a1ac, 0x00000000},
-        {0x0000a1b0, 0x00000000},
-        {0x0000a1b4, 0x00000000},
-        {0x0000a1b8, 0x00000000},
-        {0x0000a1bc, 0x00000000},
-        {0x0000a1c0, 0x00000000},
-        {0x0000a1c4, 0x00000000},
-        {0x0000a1c8, 0x00000000},
-        {0x0000a1cc, 0x00000000},
-        {0x0000a1d0, 0x00000000},
-        {0x0000a1d4, 0x00000000},
-        {0x0000a1d8, 0x00000000},
-        {0x0000a1dc, 0x00000000},
-        {0x0000a1e0, 0x00000000},
-        {0x0000a1e4, 0x00000000},
-        {0x0000a1e8, 0x00000000},
-        {0x0000a1ec, 0x00000000},
-        {0x0000a1f0, 0x00000396},
-        {0x0000a1f4, 0x00000396},
-        {0x0000a1f8, 0x00000396},
-        {0x0000a1fc, 0x00000296},
+static const u32 ar9485_1_1_soc_preamble[][2] = {
+        /* Addr      allmodes  */
+        {0x00004014, 0xba280400},
+        {0x00004090, 0x00aa10aa},
+        {0x000040a4, 0x00a0c9c9},
+        {0x00007010, 0x00000022},
+        {0x00007020, 0x00000000},
+        {0x00007034, 0x00000002},
+        {0x00007038, 0x000004c2},
+        {0x00007048, 0x00000002},
+};
+
+static const u32 ar9485_fast_clock_1_1_baseband_postamble[][3] = {
+        /* Addr      5G_HT20     5G_HT40   */
+        {0x00009e00, 0x03721821, 0x03721821},
+        {0x0000a230, 0x0000400b, 0x00004016},
+        {0x0000a254, 0x00000898, 0x00001130},
+};
+
+static const u32 ar9485_1_1_baseband_postamble[][5] = {
+        /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
+        {0x00009810, 0xd00a8005, 0xd00a8005, 0xd00a8005, 0xd00a8005},
+        {0x00009820, 0x206a002e, 0x206a002e, 0x206a002e, 0x206a002e},
+        {0x00009824, 0x5ac640d0, 0x5ac640d0, 0x5ac640d0, 0x5ac640d0},
+        {0x00009828, 0x06903081, 0x06903081, 0x06903881, 0x06903881},
+        {0x0000982c, 0x05eea6d4, 0x05eea6d4, 0x05eea6d4, 0x05eea6d4},
+        {0x00009830, 0x0000059c, 0x0000059c, 0x0000059c, 0x0000059c},
+        {0x00009c00, 0x00000044, 0x00000044, 0x00000044, 0x00000044},
+        {0x00009e00, 0x0372161e, 0x0372161e, 0x037216a0, 0x037216a0},
+        {0x00009e04, 0x00182020, 0x00182020, 0x00182020, 0x00182020},
+        {0x00009e0c, 0x6c4000e2, 0x6d4000e2, 0x6d4000e2, 0x6c4000e2},
+        {0x00009e10, 0x7ec88d2e, 0x7ec88d2e, 0x7ec80d2e, 0x7ec80d2e},
+        {0x00009e14, 0x31395d5e, 0x3139605e, 0x3139605e, 0x31395d5e},
+        {0x00009e18, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+        {0x00009e1c, 0x0001cf9c, 0x0001cf9c, 0x00021f9c, 0x00021f9c},
+        {0x00009e20, 0x000003b5, 0x000003b5, 0x000003ce, 0x000003ce},
+        {0x00009e2c, 0x0000001c, 0x0000001c, 0x00000021, 0x00000021},
+        {0x00009e3c, 0xcf946220, 0xcf946220, 0xcf946222, 0xcf946222},
+        {0x00009e44, 0x02321e27, 0x02321e27, 0x02282324, 0x02282324},
+        {0x00009e48, 0x5030201a, 0x5030201a, 0x50302010, 0x50302010},
+        {0x00009fc8, 0x0003f000, 0x0003f000, 0x0001a000, 0x0001a000},
+        {0x0000a204, 0x01303fc0, 0x01303fc4, 0x01303fc4, 0x01303fc0},
+        {0x0000a208, 0x00000104, 0x00000104, 0x00000004, 0x00000004},
+        {0x0000a230, 0x0000400a, 0x00004014, 0x00004016, 0x0000400b},
+        {0x0000a234, 0x10000fff, 0x10000fff, 0x10000fff, 0x10000fff},
+        {0x0000a238, 0xffb81018, 0xffb81018, 0xffb81018, 0xffb81018},
+        {0x0000a250, 0x00000000, 0x00000000, 0x00000210, 0x00000108},
+        {0x0000a254, 0x000007d0, 0x00000fa0, 0x00001130, 0x00000898},
+        {0x0000a258, 0x02020002, 0x02020002, 0x02020002, 0x02020002},
+        {0x0000a25c, 0x01000e0e, 0x01000e0e, 0x01000e0e, 0x01000e0e},
+        {0x0000a260, 0x3a021501, 0x3a021501, 0x3a021501, 0x3a021501},
+        {0x0000a264, 0x00000e0e, 0x00000e0e, 0x00000e0e, 0x00000e0e},
+        {0x0000a280, 0x00000007, 0x00000007, 0x0000000b, 0x0000000b},
+        {0x0000a284, 0x00000000, 0x00000000, 0x000002a0, 0x000002a0},
+        {0x0000a288, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+        {0x0000a28c, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+        {0x0000a2c4, 0x00158d18, 0x00158d18, 0x00158d18, 0x00158d18},
+        {0x0000a2d0, 0x00071981, 0x00071981, 0x00071982, 0x00071982},
+        {0x0000a2d8, 0xf999a83a, 0xf999a83a, 0xf999a83a, 0xf999a83a},
+        {0x0000a358, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+        {0x0000be04, 0x00802020, 0x00802020, 0x00802020, 0x00802020},
+        {0x0000be18, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+};
+
+static const u32 ar9485_1_1_pcie_phy_clkreq_disable_L1[][2] = {
+        /* Addr      allmodes  */
+        {0x00018c00, 0x18013e5e},
+        {0x00018c04, 0x000801d8},
+        {0x00018c08, 0x0000080c},
+};
+
+static const u32 ar9485_1_1_radio_postamble[][2] = {
+        /* Addr      allmodes  */
+        {0x0001609c, 0x0b283f31},
+        {0x000160ac, 0x24611800},
+        {0x000160b0, 0x03284f3e},
+        {0x0001610c, 0x00170000},
+        {0x00016140, 0x50804008},
+};
+
+static const u32 ar9485_1_1_mac_core[][2] = {
+        /* Addr      allmodes  */
+        {0x00000008, 0x00000000},
+        {0x00000030, 0x00020085},
+        {0x00000034, 0x00000005},
+        {0x00000040, 0x00000000},
+        {0x00000044, 0x00000000},
+        {0x00000048, 0x00000008},
+        {0x0000004c, 0x00000010},
+        {0x00000050, 0x00000000},
+        {0x00001040, 0x002ffc0f},
+        {0x00001044, 0x002ffc0f},
+        {0x00001048, 0x002ffc0f},
+        {0x0000104c, 0x002ffc0f},
+        {0x00001050, 0x002ffc0f},
+        {0x00001054, 0x002ffc0f},
+        {0x00001058, 0x002ffc0f},
+        {0x0000105c, 0x002ffc0f},
+        {0x00001060, 0x002ffc0f},
+        {0x00001064, 0x002ffc0f},
+        {0x000010f0, 0x00000100},
+        {0x00001270, 0x00000000},
+        {0x000012b0, 0x00000000},
+        {0x000012f0, 0x00000000},
+        {0x0000143c, 0x00000000},
+        {0x0000147c, 0x00000000},
+        {0x00008000, 0x00000000},
+        {0x00008004, 0x00000000},
+        {0x00008008, 0x00000000},
+        {0x0000800c, 0x00000000},
+        {0x00008018, 0x00000000},
+        {0x00008020, 0x00000000},
+        {0x00008038, 0x00000000},
+        {0x0000803c, 0x00000000},
+        {0x00008040, 0x00000000},
+        {0x00008044, 0x00000000},
+        {0x00008048, 0x00000000},
+        {0x0000804c, 0xffffffff},
+        {0x00008054, 0x00000000},
+        {0x00008058, 0x00000000},
+        {0x0000805c, 0x000fc78f},
+        {0x00008060, 0x0000000f},
+        {0x00008064, 0x00000000},
+        {0x00008070, 0x00000310},
+        {0x00008074, 0x00000020},
+        {0x00008078, 0x00000000},
+        {0x0000809c, 0x0000000f},
+        {0x000080a0, 0x00000000},
+        {0x000080a4, 0x02ff0000},
+        {0x000080a8, 0x0e070605},
+        {0x000080ac, 0x0000000d},
+        {0x000080b0, 0x00000000},
+        {0x000080b4, 0x00000000},
+        {0x000080b8, 0x00000000},
+        {0x000080bc, 0x00000000},
+        {0x000080c0, 0x2a800000},
+        {0x000080c4, 0x06900168},
+        {0x000080c8, 0x13881c22},
+        {0x000080cc, 0x01f40000},
+        {0x000080d0, 0x00252500},
+        {0x000080d4, 0x00a00000},
+        {0x000080d8, 0x00400000},
+        {0x000080dc, 0x00000000},
+        {0x000080e0, 0xffffffff},
+        {0x000080e4, 0x0000ffff},
+        {0x000080e8, 0x3f3f3f3f},
+        {0x000080ec, 0x00000000},
+        {0x000080f0, 0x00000000},
+        {0x000080f4, 0x00000000},
+        {0x000080fc, 0x00020000},
+        {0x00008100, 0x00000000},
+        {0x00008108, 0x00000052},
+        {0x0000810c, 0x00000000},
+        {0x00008110, 0x00000000},
+        {0x00008114, 0x000007ff},
+        {0x00008118, 0x000000aa},
+        {0x0000811c, 0x00003210},
+        {0x00008124, 0x00000000},
+        {0x00008128, 0x00000000},
+        {0x0000812c, 0x00000000},
+        {0x00008130, 0x00000000},
+        {0x00008134, 0x00000000},
+        {0x00008138, 0x00000000},
+        {0x0000813c, 0x0000ffff},
+        {0x00008144, 0xffffffff},
+        {0x00008168, 0x00000000},
+        {0x0000816c, 0x00000000},
+        {0x00008170, 0x18486200},
+        {0x00008174, 0x33332210},
+        {0x00008178, 0x00000000},
+        {0x0000817c, 0x00020000},
+        {0x000081c0, 0x00000000},
+        {0x000081c4, 0x33332210},
+        {0x000081d4, 0x00000000},
+        {0x000081ec, 0x00000000},
+        {0x000081f0, 0x00000000},
+        {0x000081f4, 0x00000000},
+        {0x000081f8, 0x00000000},
+        {0x000081fc, 0x00000000},
+        {0x00008240, 0x00100000},
+        {0x00008244, 0x0010f400},
+        {0x00008248, 0x00000800},
+        {0x0000824c, 0x0001e800},
+        {0x00008250, 0x00000000},
+        {0x00008254, 0x00000000},
+        {0x00008258, 0x00000000},
+        {0x0000825c, 0x40000000},
+        {0x00008260, 0x00080922},
+        {0x00008264, 0x9ca00010},
+        {0x00008268, 0xffffffff},
+        {0x0000826c, 0x0000ffff},
+        {0x00008270, 0x00000000},
+        {0x00008274, 0x40000000},
+        {0x00008278, 0x003e4180},
+        {0x0000827c, 0x00000004},
+        {0x00008284, 0x0000002c},
+        {0x00008288, 0x0000002c},
+        {0x0000828c, 0x000000ff},
+        {0x00008294, 0x00000000},
+        {0x00008298, 0x00000000},
+        {0x0000829c, 0x00000000},
+        {0x00008300, 0x00000140},
+        {0x00008314, 0x00000000},
+        {0x0000831c, 0x0000010d},
+        {0x00008328, 0x00000000},
+        {0x0000832c, 0x00000007},
+        {0x00008330, 0x00000302},
+        {0x00008334, 0x00000700},
+        {0x00008338, 0x00ff0000},
+        {0x0000833c, 0x02400000},
+        {0x00008340, 0x000107ff},
+        {0x00008344, 0xa248105b},
+        {0x00008348, 0x008f0000},
+        {0x0000835c, 0x00000000},
+        {0x00008360, 0xffffffff},
+        {0x00008364, 0xffffffff},
+        {0x00008368, 0x00000000},
+        {0x00008370, 0x00000000},
+        {0x00008374, 0x000000ff},
+        {0x00008378, 0x00000000},
+        {0x0000837c, 0x00000000},
+        {0x00008380, 0xffffffff},
+        {0x00008384, 0xffffffff},
+        {0x00008390, 0xffffffff},
+        {0x00008394, 0xffffffff},
+        {0x00008398, 0x00000000},
+        {0x0000839c, 0x00000000},
+        {0x000083a0, 0x00000000},
+        {0x000083a4, 0x0000fa14},
+        {0x000083a8, 0x000f0c00},
+        {0x000083ac, 0x33332210},
+        {0x000083b0, 0x33332210},
+        {0x000083b4, 0x33332210},
+        {0x000083b8, 0x33332210},
+        {0x000083bc, 0x00000000},
+        {0x000083c0, 0x00000000},
+        {0x000083c4, 0x00000000},
+        {0x000083c8, 0x00000000},
+        {0x000083cc, 0x00000200},
+        {0x000083d0, 0x000301ff},
 };
 
-#endif
+#endif /* INITVALS_9485_H */
diff --git a/drivers/net/wireless/ath/ath9k/ar9580_1p0_initvals.h b/drivers/net/wireless/ath/ath9k/ar9580_1p0_initvals.h
index 06b3f0df9fa..6e1915aee71 100644
--- a/drivers/net/wireless/ath/ath9k/ar9580_1p0_initvals.h
+++ b/drivers/net/wireless/ath/ath9k/ar9580_1p0_initvals.h
@@ -1,5 +1,6 @@
 /*
- * Copyright (c) 2010 Atheros Communications Inc.
+ * Copyright (c) 2010-2011 Atheros Communications Inc.
+ * Copyright (c) 2011-2012 Qualcomm Atheros Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -19,18 +20,7 @@
 
 /* AR9580 1.0 */
 
-static const u32 ar9580_1p0_modes_fast_clock[][3] = {
-        /* Addr      5G_HT20     5G_HT40   */
-        {0x00001030, 0x00000268, 0x000004d0},
-        {0x00001070, 0x0000018c, 0x00000318},
-        {0x000010b0, 0x00000fd0, 0x00001fa0},
-        {0x00008014, 0x044c044c, 0x08980898},
-        {0x0000801c, 0x148ec02b, 0x148ec057},
-        {0x00008318, 0x000044c0, 0x00008980},
-        {0x00009e00, 0x0372131c, 0x0372131c},
-        {0x0000a230, 0x0000000b, 0x00000016},
-        {0x0000a254, 0x00000898, 0x00001130},
-};
+#define ar9580_1p0_modes_fast_clock ar9300Modes_fast_clock_2p2
 
 static const u32 ar9580_1p0_radio_postamble[][5] = {
         /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
@@ -208,17 +198,7 @@ static const u32 ar9580_1p0_baseband_core[][2] = {
         {0x0000c420, 0x00000000},
 };
 
-static const u32 ar9580_1p0_mac_postamble[][5] = {
-        /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
-        {0x00001030, 0x00000230, 0x00000460, 0x000002c0, 0x00000160},
-        {0x00001070, 0x00000168, 0x000002d0, 0x00000318, 0x0000018c},
-        {0x000010b0, 0x00000e60, 0x00001cc0, 0x00007c70, 0x00003e38},
-        {0x00008014, 0x03e803e8, 0x07d007d0, 0x10801600, 0x08400b00},
-        {0x0000801c, 0x128d8027, 0x128d804f, 0x12e00057, 0x12e0002b},
-        {0x00008120, 0x08f04800, 0x08f04800, 0x08f04810, 0x08f04810},
-        {0x000081d0, 0x00003210, 0x00003210, 0x0000320a, 0x0000320a},
-        {0x00008318, 0x00003e80, 0x00007d00, 0x00006880, 0x00003440},
-};
+#define ar9580_1p0_mac_postamble ar9300_2p2_mac_postamble
 
 static const u32 ar9580_1p0_low_ob_db_tx_gain_table[][5] = {
         /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
@@ -326,111 +306,7 @@ static const u32 ar9580_1p0_low_ob_db_tx_gain_table[][5] = {
         {0x00016868, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c},
 };
 
-static const u32 ar9580_1p0_high_power_tx_gain_table[][5] = {
-        /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
-        {0x0000a2dc, 0x0380c7fc, 0x0380c7fc, 0x03aaa352, 0x03aaa352},
-        {0x0000a2e0, 0x0000f800, 0x0000f800, 0x03ccc584, 0x03ccc584},
-        {0x0000a2e4, 0x03ff0000, 0x03ff0000, 0x03f0f800, 0x03f0f800},
-        {0x0000a2e8, 0x00000000, 0x00000000, 0x03ff0000, 0x03ff0000},
-        {0x0000a410, 0x000050d9, 0x000050d9, 0x000050d9, 0x000050d9},
-        {0x0000a500, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000a504, 0x06000003, 0x06000003, 0x04000002, 0x04000002},
-        {0x0000a508, 0x0a000020, 0x0a000020, 0x08000004, 0x08000004},
-        {0x0000a50c, 0x10000023, 0x10000023, 0x0b000200, 0x0b000200},
-        {0x0000a510, 0x16000220, 0x16000220, 0x0f000202, 0x0f000202},
-        {0x0000a514, 0x1c000223, 0x1c000223, 0x12000400, 0x12000400},
-        {0x0000a518, 0x21002220, 0x21002220, 0x16000402, 0x16000402},
-        {0x0000a51c, 0x27002223, 0x27002223, 0x19000404, 0x19000404},
-        {0x0000a520, 0x2b022220, 0x2b022220, 0x1c000603, 0x1c000603},
-        {0x0000a524, 0x2f022222, 0x2f022222, 0x21000a02, 0x21000a02},
-        {0x0000a528, 0x34022225, 0x34022225, 0x25000a04, 0x25000a04},
-        {0x0000a52c, 0x3a02222a, 0x3a02222a, 0x28000a20, 0x28000a20},
-        {0x0000a530, 0x3e02222c, 0x3e02222c, 0x2c000e20, 0x2c000e20},
-        {0x0000a534, 0x4202242a, 0x4202242a, 0x30000e22, 0x30000e22},
-        {0x0000a538, 0x4702244a, 0x4702244a, 0x34000e24, 0x34000e24},
-        {0x0000a53c, 0x4b02244c, 0x4b02244c, 0x38001640, 0x38001640},
-        {0x0000a540, 0x4e02246c, 0x4e02246c, 0x3c001660, 0x3c001660},
-        {0x0000a544, 0x5302266c, 0x5302266c, 0x3f001861, 0x3f001861},
-        {0x0000a548, 0x5702286c, 0x5702286c, 0x43001a81, 0x43001a81},
-        {0x0000a54c, 0x5c02486b, 0x5c02486b, 0x47001a83, 0x47001a83},
-        {0x0000a550, 0x61024a6c, 0x61024a6c, 0x4a001c84, 0x4a001c84},
-        {0x0000a554, 0x66026a6c, 0x66026a6c, 0x4e001ce3, 0x4e001ce3},
-        {0x0000a558, 0x6b026e6c, 0x6b026e6c, 0x52001ce5, 0x52001ce5},
-        {0x0000a55c, 0x7002708c, 0x7002708c, 0x56001ce9, 0x56001ce9},
-        {0x0000a560, 0x7302b08a, 0x7302b08a, 0x5a001ceb, 0x5a001ceb},
-        {0x0000a564, 0x7702b08c, 0x7702b08c, 0x5d001eec, 0x5d001eec},
-        {0x0000a568, 0x7702b08c, 0x7702b08c, 0x5d001eec, 0x5d001eec},
-        {0x0000a56c, 0x7702b08c, 0x7702b08c, 0x5d001eec, 0x5d001eec},
-        {0x0000a570, 0x7702b08c, 0x7702b08c, 0x5d001eec, 0x5d001eec},
-        {0x0000a574, 0x7702b08c, 0x7702b08c, 0x5d001eec, 0x5d001eec},
-        {0x0000a578, 0x7702b08c, 0x7702b08c, 0x5d001eec, 0x5d001eec},
-        {0x0000a57c, 0x7702b08c, 0x7702b08c, 0x5d001eec, 0x5d001eec},
-        {0x0000a580, 0x00800000, 0x00800000, 0x00800000, 0x00800000},
-        {0x0000a584, 0x06800003, 0x06800003, 0x04800002, 0x04800002},
-        {0x0000a588, 0x0a800020, 0x0a800020, 0x08800004, 0x08800004},
-        {0x0000a58c, 0x10800023, 0x10800023, 0x0b800200, 0x0b800200},
-        {0x0000a590, 0x16800220, 0x16800220, 0x0f800202, 0x0f800202},
-        {0x0000a594, 0x1c800223, 0x1c800223, 0x12800400, 0x12800400},
-        {0x0000a598, 0x21802220, 0x21802220, 0x16800402, 0x16800402},
-        {0x0000a59c, 0x27802223, 0x27802223, 0x19800404, 0x19800404},
-        {0x0000a5a0, 0x2b822220, 0x2b822220, 0x1c800603, 0x1c800603},
-        {0x0000a5a4, 0x2f822222, 0x2f822222, 0x21800a02, 0x21800a02},
-        {0x0000a5a8, 0x34822225, 0x34822225, 0x25800a04, 0x25800a04},
-        {0x0000a5ac, 0x3a82222a, 0x3a82222a, 0x28800a20, 0x28800a20},
-        {0x0000a5b0, 0x3e82222c, 0x3e82222c, 0x2c800e20, 0x2c800e20},
-        {0x0000a5b4, 0x4282242a, 0x4282242a, 0x30800e22, 0x30800e22},
-        {0x0000a5b8, 0x4782244a, 0x4782244a, 0x34800e24, 0x34800e24},
-        {0x0000a5bc, 0x4b82244c, 0x4b82244c, 0x38801640, 0x38801640},
-        {0x0000a5c0, 0x4e82246c, 0x4e82246c, 0x3c801660, 0x3c801660},
-        {0x0000a5c4, 0x5382266c, 0x5382266c, 0x3f801861, 0x3f801861},
-        {0x0000a5c8, 0x5782286c, 0x5782286c, 0x43801a81, 0x43801a81},
-        {0x0000a5cc, 0x5c82486b, 0x5c82486b, 0x47801a83, 0x47801a83},
-        {0x0000a5d0, 0x61824a6c, 0x61824a6c, 0x4a801c84, 0x4a801c84},
-        {0x0000a5d4, 0x66826a6c, 0x66826a6c, 0x4e801ce3, 0x4e801ce3},
-        {0x0000a5d8, 0x6b826e6c, 0x6b826e6c, 0x52801ce5, 0x52801ce5},
-        {0x0000a5dc, 0x7082708c, 0x7082708c, 0x56801ce9, 0x56801ce9},
-        {0x0000a5e0, 0x7382b08a, 0x7382b08a, 0x5a801ceb, 0x5a801ceb},
-        {0x0000a5e4, 0x7782b08c, 0x7782b08c, 0x5d801eec, 0x5d801eec},
-        {0x0000a5e8, 0x7782b08c, 0x7782b08c, 0x5d801eec, 0x5d801eec},
-        {0x0000a5ec, 0x7782b08c, 0x7782b08c, 0x5d801eec, 0x5d801eec},
-        {0x0000a5f0, 0x7782b08c, 0x7782b08c, 0x5d801eec, 0x5d801eec},
-        {0x0000a5f4, 0x7782b08c, 0x7782b08c, 0x5d801eec, 0x5d801eec},
-        {0x0000a5f8, 0x7782b08c, 0x7782b08c, 0x5d801eec, 0x5d801eec},
-        {0x0000a5fc, 0x7782b08c, 0x7782b08c, 0x5d801eec, 0x5d801eec},
-        {0x0000a600, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000a604, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000a608, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000a60c, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000a610, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000a614, 0x01404000, 0x01404000, 0x01404000, 0x01404000},
-        {0x0000a618, 0x01404501, 0x01404501, 0x01404501, 0x01404501},
-        {0x0000a61c, 0x02008802, 0x02008802, 0x02008501, 0x02008501},
-        {0x0000a620, 0x0300cc03, 0x0300cc03, 0x0280ca03, 0x0280ca03},
-        {0x0000a624, 0x0300cc03, 0x0300cc03, 0x03010c04, 0x03010c04},
-        {0x0000a628, 0x0300cc03, 0x0300cc03, 0x04014c04, 0x04014c04},
-        {0x0000a62c, 0x03810c03, 0x03810c03, 0x04015005, 0x04015005},
-        {0x0000a630, 0x03810e04, 0x03810e04, 0x04015005, 0x04015005},
-        {0x0000a634, 0x03810e04, 0x03810e04, 0x04015005, 0x04015005},
-        {0x0000a638, 0x03810e04, 0x03810e04, 0x04015005, 0x04015005},
-        {0x0000a63c, 0x03810e04, 0x03810e04, 0x04015005, 0x04015005},
-        {0x0000b2dc, 0x0380c7fc, 0x0380c7fc, 0x03aaa352, 0x03aaa352},
-        {0x0000b2e0, 0x0000f800, 0x0000f800, 0x03ccc584, 0x03ccc584},
-        {0x0000b2e4, 0x03ff0000, 0x03ff0000, 0x03f0f800, 0x03f0f800},
-        {0x0000b2e8, 0x00000000, 0x00000000, 0x03ff0000, 0x03ff0000},
-        {0x0000c2dc, 0x0380c7fc, 0x0380c7fc, 0x03aaa352, 0x03aaa352},
-        {0x0000c2e0, 0x0000f800, 0x0000f800, 0x03ccc584, 0x03ccc584},
-        {0x0000c2e4, 0x03ff0000, 0x03ff0000, 0x03f0f800, 0x03f0f800},
-        {0x0000c2e8, 0x00000000, 0x00000000, 0x03ff0000, 0x03ff0000},
-        {0x00016044, 0x012492d4, 0x012492d4, 0x012492d4, 0x012492d4},
-        {0x00016048, 0x66480001, 0x66480001, 0x66480001, 0x66480001},
-        {0x00016068, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c},
-        {0x00016444, 0x012492d4, 0x012492d4, 0x012492d4, 0x012492d4},
-        {0x00016448, 0x66480001, 0x66480001, 0x66480001, 0x66480001},
-        {0x00016468, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c},
-        {0x00016844, 0x012492d4, 0x012492d4, 0x012492d4, 0x012492d4},
-        {0x00016848, 0x66480001, 0x66480001, 0x66480001, 0x66480001},
-        {0x00016868, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c},
-};
+#define ar9580_1p0_high_power_tx_gain_table ar9580_1p0_low_ob_db_tx_gain_table
 
 static const u32 ar9580_1p0_lowest_ob_db_tx_gain_table[][5] = {
         /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
@@ -538,12 +414,7 @@ static const u32 ar9580_1p0_lowest_ob_db_tx_gain_table[][5] = {
         {0x00016868, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c},
 };
 
-static const u32 ar9580_1p0_baseband_core_txfir_coeff_japan_2484[][2] = {
-        /* Addr      allmodes  */
-        {0x0000a398, 0x00000000},
-        {0x0000a39c, 0x6f7f0301},
-        {0x0000a3a0, 0xca9228ee},
-};
+#define ar9580_1p0_baseband_core_txfir_coeff_japan_2484 ar9462_2p0_baseband_core_txfir_coeff_japan_2484
 
 static const u32 ar9580_1p0_mac_core[][2] = {
         /* Addr      allmodes  */
@@ -808,376 +679,11 @@ static const u32 ar9580_1p0_mixed_ob_db_tx_gain_table[][5] = {
         {0x00016868, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c},
 };
 
-static const u32 ar9580_1p0_wo_xlna_rx_gain_table[][2] = {
-        /* Addr      allmodes  */
-        {0x0000a000, 0x00010000},
-        {0x0000a004, 0x00030002},
-        {0x0000a008, 0x00050004},
-        {0x0000a00c, 0x00810080},
-        {0x0000a010, 0x00830082},
-        {0x0000a014, 0x01810180},
-        {0x0000a018, 0x01830182},
-        {0x0000a01c, 0x01850184},
-        {0x0000a020, 0x01890188},
-        {0x0000a024, 0x018b018a},
-        {0x0000a028, 0x018d018c},
-        {0x0000a02c, 0x03820190},
-        {0x0000a030, 0x03840383},
-        {0x0000a034, 0x03880385},
-        {0x0000a038, 0x038a0389},
-        {0x0000a03c, 0x038c038b},
-        {0x0000a040, 0x0390038d},
-        {0x0000a044, 0x03920391},
-        {0x0000a048, 0x03940393},
-        {0x0000a04c, 0x03960395},
-        {0x0000a050, 0x00000000},
-        {0x0000a054, 0x00000000},
-        {0x0000a058, 0x00000000},
-        {0x0000a05c, 0x00000000},
-        {0x0000a060, 0x00000000},
-        {0x0000a064, 0x00000000},
-        {0x0000a068, 0x00000000},
-        {0x0000a06c, 0x00000000},
-        {0x0000a070, 0x00000000},
-        {0x0000a074, 0x00000000},
-        {0x0000a078, 0x00000000},
-        {0x0000a07c, 0x00000000},
-        {0x0000a080, 0x29292929},
-        {0x0000a084, 0x29292929},
-        {0x0000a088, 0x29292929},
-        {0x0000a08c, 0x29292929},
-        {0x0000a090, 0x22292929},
-        {0x0000a094, 0x1d1d2222},
-        {0x0000a098, 0x0c111117},
-        {0x0000a09c, 0x00030303},
-        {0x0000a0a0, 0x00000000},
-        {0x0000a0a4, 0x00000000},
-        {0x0000a0a8, 0x00000000},
-        {0x0000a0ac, 0x00000000},
-        {0x0000a0b0, 0x00000000},
-        {0x0000a0b4, 0x00000000},
-        {0x0000a0b8, 0x00000000},
-        {0x0000a0bc, 0x00000000},
-        {0x0000a0c0, 0x001f0000},
-        {0x0000a0c4, 0x01000101},
-        {0x0000a0c8, 0x011e011f},
-        {0x0000a0cc, 0x011c011d},
-        {0x0000a0d0, 0x02030204},
-        {0x0000a0d4, 0x02010202},
-        {0x0000a0d8, 0x021f0200},
-        {0x0000a0dc, 0x0302021e},
-        {0x0000a0e0, 0x03000301},
-        {0x0000a0e4, 0x031e031f},
-        {0x0000a0e8, 0x0402031d},
-        {0x0000a0ec, 0x04000401},
-        {0x0000a0f0, 0x041e041f},
-        {0x0000a0f4, 0x0502041d},
-        {0x0000a0f8, 0x05000501},
-        {0x0000a0fc, 0x051e051f},
-        {0x0000a100, 0x06010602},
-        {0x0000a104, 0x061f0600},
-        {0x0000a108, 0x061d061e},
-        {0x0000a10c, 0x07020703},
-        {0x0000a110, 0x07000701},
-        {0x0000a114, 0x00000000},
-        {0x0000a118, 0x00000000},
-        {0x0000a11c, 0x00000000},
-        {0x0000a120, 0x00000000},
-        {0x0000a124, 0x00000000},
-        {0x0000a128, 0x00000000},
-        {0x0000a12c, 0x00000000},
-        {0x0000a130, 0x00000000},
-        {0x0000a134, 0x00000000},
-        {0x0000a138, 0x00000000},
-        {0x0000a13c, 0x00000000},
-        {0x0000a140, 0x001f0000},
-        {0x0000a144, 0x01000101},
-        {0x0000a148, 0x011e011f},
-        {0x0000a14c, 0x011c011d},
-        {0x0000a150, 0x02030204},
-        {0x0000a154, 0x02010202},
-        {0x0000a158, 0x021f0200},
-        {0x0000a15c, 0x0302021e},
-        {0x0000a160, 0x03000301},
-        {0x0000a164, 0x031e031f},
-        {0x0000a168, 0x0402031d},
-        {0x0000a16c, 0x04000401},
-        {0x0000a170, 0x041e041f},
-        {0x0000a174, 0x0502041d},
-        {0x0000a178, 0x05000501},
-        {0x0000a17c, 0x051e051f},
-        {0x0000a180, 0x06010602},
-        {0x0000a184, 0x061f0600},
-        {0x0000a188, 0x061d061e},
-        {0x0000a18c, 0x07020703},
-        {0x0000a190, 0x07000701},
-        {0x0000a194, 0x00000000},
-        {0x0000a198, 0x00000000},
-        {0x0000a19c, 0x00000000},
-        {0x0000a1a0, 0x00000000},
-        {0x0000a1a4, 0x00000000},
-        {0x0000a1a8, 0x00000000},
-        {0x0000a1ac, 0x00000000},
-        {0x0000a1b0, 0x00000000},
-        {0x0000a1b4, 0x00000000},
-        {0x0000a1b8, 0x00000000},
-        {0x0000a1bc, 0x00000000},
-        {0x0000a1c0, 0x00000000},
-        {0x0000a1c4, 0x00000000},
-        {0x0000a1c8, 0x00000000},
-        {0x0000a1cc, 0x00000000},
-        {0x0000a1d0, 0x00000000},
-        {0x0000a1d4, 0x00000000},
-        {0x0000a1d8, 0x00000000},
-        {0x0000a1dc, 0x00000000},
-        {0x0000a1e0, 0x00000000},
-        {0x0000a1e4, 0x00000000},
-        {0x0000a1e8, 0x00000000},
-        {0x0000a1ec, 0x00000000},
-        {0x0000a1f0, 0x00000396},
-        {0x0000a1f4, 0x00000396},
-        {0x0000a1f8, 0x00000396},
-        {0x0000a1fc, 0x00000196},
-        {0x0000b000, 0x00010000},
-        {0x0000b004, 0x00030002},
-        {0x0000b008, 0x00050004},
-        {0x0000b00c, 0x00810080},
-        {0x0000b010, 0x00830082},
-        {0x0000b014, 0x01810180},
-        {0x0000b018, 0x01830182},
-        {0x0000b01c, 0x01850184},
-        {0x0000b020, 0x02810280},
-        {0x0000b024, 0x02830282},
-        {0x0000b028, 0x02850284},
-        {0x0000b02c, 0x02890288},
-        {0x0000b030, 0x028b028a},
-        {0x0000b034, 0x0388028c},
-        {0x0000b038, 0x038a0389},
-        {0x0000b03c, 0x038c038b},
-        {0x0000b040, 0x0390038d},
-        {0x0000b044, 0x03920391},
-        {0x0000b048, 0x03940393},
-        {0x0000b04c, 0x03960395},
-        {0x0000b050, 0x00000000},
-        {0x0000b054, 0x00000000},
-        {0x0000b058, 0x00000000},
-        {0x0000b05c, 0x00000000},
-        {0x0000b060, 0x00000000},
-        {0x0000b064, 0x00000000},
-        {0x0000b068, 0x00000000},
-        {0x0000b06c, 0x00000000},
-        {0x0000b070, 0x00000000},
-        {0x0000b074, 0x00000000},
-        {0x0000b078, 0x00000000},
-        {0x0000b07c, 0x00000000},
-        {0x0000b080, 0x32323232},
-        {0x0000b084, 0x2f2f3232},
-        {0x0000b088, 0x23282a2d},
-        {0x0000b08c, 0x1c1e2123},
-        {0x0000b090, 0x14171919},
-        {0x0000b094, 0x0e0e1214},
-        {0x0000b098, 0x03050707},
-        {0x0000b09c, 0x00030303},
-        {0x0000b0a0, 0x00000000},
-        {0x0000b0a4, 0x00000000},
-        {0x0000b0a8, 0x00000000},
-        {0x0000b0ac, 0x00000000},
-        {0x0000b0b0, 0x00000000},
-        {0x0000b0b4, 0x00000000},
-        {0x0000b0b8, 0x00000000},
-        {0x0000b0bc, 0x00000000},
-        {0x0000b0c0, 0x003f0020},
-        {0x0000b0c4, 0x00400041},
-        {0x0000b0c8, 0x0140005f},
-        {0x0000b0cc, 0x0160015f},
-        {0x0000b0d0, 0x017e017f},
-        {0x0000b0d4, 0x02410242},
-        {0x0000b0d8, 0x025f0240},
-        {0x0000b0dc, 0x027f0260},
-        {0x0000b0e0, 0x0341027e},
-        {0x0000b0e4, 0x035f0340},
-        {0x0000b0e8, 0x037f0360},
-        {0x0000b0ec, 0x04400441},
-        {0x0000b0f0, 0x0460045f},
-        {0x0000b0f4, 0x0541047f},
-        {0x0000b0f8, 0x055f0540},
-        {0x0000b0fc, 0x057f0560},
-        {0x0000b100, 0x06400641},
-        {0x0000b104, 0x0660065f},
-        {0x0000b108, 0x067e067f},
-        {0x0000b10c, 0x07410742},
-        {0x0000b110, 0x075f0740},
-        {0x0000b114, 0x077f0760},
-        {0x0000b118, 0x07800781},
-        {0x0000b11c, 0x07a0079f},
-        {0x0000b120, 0x07c107bf},
-        {0x0000b124, 0x000007c0},
-        {0x0000b128, 0x00000000},
-        {0x0000b12c, 0x00000000},
-        {0x0000b130, 0x00000000},
-        {0x0000b134, 0x00000000},
-        {0x0000b138, 0x00000000},
-        {0x0000b13c, 0x00000000},
-        {0x0000b140, 0x003f0020},
-        {0x0000b144, 0x00400041},
-        {0x0000b148, 0x0140005f},
-        {0x0000b14c, 0x0160015f},
-        {0x0000b150, 0x017e017f},
-        {0x0000b154, 0x02410242},
-        {0x0000b158, 0x025f0240},
-        {0x0000b15c, 0x027f0260},
-        {0x0000b160, 0x0341027e},
-        {0x0000b164, 0x035f0340},
-        {0x0000b168, 0x037f0360},
-        {0x0000b16c, 0x04400441},
-        {0x0000b170, 0x0460045f},
-        {0x0000b174, 0x0541047f},
-        {0x0000b178, 0x055f0540},
-        {0x0000b17c, 0x057f0560},
-        {0x0000b180, 0x06400641},
-        {0x0000b184, 0x0660065f},
-        {0x0000b188, 0x067e067f},
-        {0x0000b18c, 0x07410742},
-        {0x0000b190, 0x075f0740},
-        {0x0000b194, 0x077f0760},
-        {0x0000b198, 0x07800781},
-        {0x0000b19c, 0x07a0079f},
-        {0x0000b1a0, 0x07c107bf},
-        {0x0000b1a4, 0x000007c0},
-        {0x0000b1a8, 0x00000000},
-        {0x0000b1ac, 0x00000000},
-        {0x0000b1b0, 0x00000000},
-        {0x0000b1b4, 0x00000000},
-        {0x0000b1b8, 0x00000000},
-        {0x0000b1bc, 0x00000000},
-        {0x0000b1c0, 0x00000000},
-        {0x0000b1c4, 0x00000000},
-        {0x0000b1c8, 0x00000000},
-        {0x0000b1cc, 0x00000000},
-        {0x0000b1d0, 0x00000000},
-        {0x0000b1d4, 0x00000000},
-        {0x0000b1d8, 0x00000000},
-        {0x0000b1dc, 0x00000000},
-        {0x0000b1e0, 0x00000000},
-        {0x0000b1e4, 0x00000000},
-        {0x0000b1e8, 0x00000000},
-        {0x0000b1ec, 0x00000000},
-        {0x0000b1f0, 0x00000396},
-        {0x0000b1f4, 0x00000396},
-        {0x0000b1f8, 0x00000396},
-        {0x0000b1fc, 0x00000196},
-};
+#define ar9580_1p0_wo_xlna_rx_gain_table ar9300Common_wo_xlna_rx_gain_table_2p2
 
-static const u32 ar9580_1p0_soc_postamble[][5] = {
-        /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
-        {0x00007010, 0x00000023, 0x00000023, 0x00000023, 0x00000023},
-};
+#define ar9580_1p0_soc_postamble ar9300_2p2_soc_postamble
 
-static const u32 ar9580_1p0_high_ob_db_tx_gain_table[][5] = {
-        /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
-        {0x0000a2dc, 0x01feee00, 0x01feee00, 0x03aaa352, 0x03aaa352},
-        {0x0000a2e0, 0x0000f000, 0x0000f000, 0x03ccc584, 0x03ccc584},
-        {0x0000a2e4, 0x01ff0000, 0x01ff0000, 0x03f0f800, 0x03f0f800},
-        {0x0000a2e8, 0x00000000, 0x00000000, 0x03ff0000, 0x03ff0000},
-        {0x0000a410, 0x000050d8, 0x000050d8, 0x000050d9, 0x000050d9},
-        {0x0000a500, 0x00002220, 0x00002220, 0x00000000, 0x00000000},
-        {0x0000a504, 0x04002222, 0x04002222, 0x04000002, 0x04000002},
-        {0x0000a508, 0x09002421, 0x09002421, 0x08000004, 0x08000004},
-        {0x0000a50c, 0x0d002621, 0x0d002621, 0x0b000200, 0x0b000200},
-        {0x0000a510, 0x13004620, 0x13004620, 0x0f000202, 0x0f000202},
-        {0x0000a514, 0x19004a20, 0x19004a20, 0x11000400, 0x11000400},
-        {0x0000a518, 0x1d004e20, 0x1d004e20, 0x15000402, 0x15000402},
-        {0x0000a51c, 0x21005420, 0x21005420, 0x19000404, 0x19000404},
-        {0x0000a520, 0x26005e20, 0x26005e20, 0x1b000603, 0x1b000603},
-        {0x0000a524, 0x2b005e40, 0x2b005e40, 0x1f000a02, 0x1f000a02},
-        {0x0000a528, 0x2f005e42, 0x2f005e42, 0x23000a04, 0x23000a04},
-        {0x0000a52c, 0x33005e44, 0x33005e44, 0x26000a20, 0x26000a20},
-        {0x0000a530, 0x38005e65, 0x38005e65, 0x2a000e20, 0x2a000e20},
-        {0x0000a534, 0x3c005e69, 0x3c005e69, 0x2e000e22, 0x2e000e22},
-        {0x0000a538, 0x40005e6b, 0x40005e6b, 0x31000e24, 0x31000e24},
-        {0x0000a53c, 0x44005e6d, 0x44005e6d, 0x34001640, 0x34001640},
-        {0x0000a540, 0x49005e72, 0x49005e72, 0x38001660, 0x38001660},
-        {0x0000a544, 0x4e005eb2, 0x4e005eb2, 0x3b001861, 0x3b001861},
-        {0x0000a548, 0x53005f12, 0x53005f12, 0x3e001a81, 0x3e001a81},
-        {0x0000a54c, 0x59025eb2, 0x59025eb2, 0x42001a83, 0x42001a83},
-        {0x0000a550, 0x5e025f12, 0x5e025f12, 0x44001c84, 0x44001c84},
-        {0x0000a554, 0x61027f12, 0x61027f12, 0x48001ce3, 0x48001ce3},
-        {0x0000a558, 0x6702bf12, 0x6702bf12, 0x4c001ce5, 0x4c001ce5},
-        {0x0000a55c, 0x6b02bf14, 0x6b02bf14, 0x50001ce9, 0x50001ce9},
-        {0x0000a560, 0x6f02bf16, 0x6f02bf16, 0x54001ceb, 0x54001ceb},
-        {0x0000a564, 0x6f02bf16, 0x6f02bf16, 0x56001eec, 0x56001eec},
-        {0x0000a568, 0x6f02bf16, 0x6f02bf16, 0x56001eec, 0x56001eec},
-        {0x0000a56c, 0x6f02bf16, 0x6f02bf16, 0x56001eec, 0x56001eec},
-        {0x0000a570, 0x6f02bf16, 0x6f02bf16, 0x56001eec, 0x56001eec},
-        {0x0000a574, 0x6f02bf16, 0x6f02bf16, 0x56001eec, 0x56001eec},
-        {0x0000a578, 0x6f02bf16, 0x6f02bf16, 0x56001eec, 0x56001eec},
-        {0x0000a57c, 0x6f02bf16, 0x6f02bf16, 0x56001eec, 0x56001eec},
-        {0x0000a580, 0x00802220, 0x00802220, 0x00800000, 0x00800000},
-        {0x0000a584, 0x04802222, 0x04802222, 0x04800002, 0x04800002},
-        {0x0000a588, 0x09802421, 0x09802421, 0x08800004, 0x08800004},
-        {0x0000a58c, 0x0d802621, 0x0d802621, 0x0b800200, 0x0b800200},
-        {0x0000a590, 0x13804620, 0x13804620, 0x0f800202, 0x0f800202},
-        {0x0000a594, 0x19804a20, 0x19804a20, 0x11800400, 0x11800400},
-        {0x0000a598, 0x1d804e20, 0x1d804e20, 0x15800402, 0x15800402},
-        {0x0000a59c, 0x21805420, 0x21805420, 0x19800404, 0x19800404},
-        {0x0000a5a0, 0x26805e20, 0x26805e20, 0x1b800603, 0x1b800603},
-        {0x0000a5a4, 0x2b805e40, 0x2b805e40, 0x1f800a02, 0x1f800a02},
-        {0x0000a5a8, 0x2f805e42, 0x2f805e42, 0x23800a04, 0x23800a04},
-        {0x0000a5ac, 0x33805e44, 0x33805e44, 0x26800a20, 0x26800a20},
-        {0x0000a5b0, 0x38805e65, 0x38805e65, 0x2a800e20, 0x2a800e20},
-        {0x0000a5b4, 0x3c805e69, 0x3c805e69, 0x2e800e22, 0x2e800e22},
-        {0x0000a5b8, 0x40805e6b, 0x40805e6b, 0x31800e24, 0x31800e24},
-        {0x0000a5bc, 0x44805e6d, 0x44805e6d, 0x34801640, 0x34801640},
-        {0x0000a5c0, 0x49805e72, 0x49805e72, 0x38801660, 0x38801660},
-        {0x0000a5c4, 0x4e805eb2, 0x4e805eb2, 0x3b801861, 0x3b801861},
-        {0x0000a5c8, 0x53805f12, 0x53805f12, 0x3e801a81, 0x3e801a81},
-        {0x0000a5cc, 0x59825eb2, 0x59825eb2, 0x42801a83, 0x42801a83},
-        {0x0000a5d0, 0x5e825f12, 0x5e825f12, 0x44801c84, 0x44801c84},
-        {0x0000a5d4, 0x61827f12, 0x61827f12, 0x48801ce3, 0x48801ce3},
-        {0x0000a5d8, 0x6782bf12, 0x6782bf12, 0x4c801ce5, 0x4c801ce5},
-        {0x0000a5dc, 0x6b82bf14, 0x6b82bf14, 0x50801ce9, 0x50801ce9},
-        {0x0000a5e0, 0x6f82bf16, 0x6f82bf16, 0x54801ceb, 0x54801ceb},
-        {0x0000a5e4, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
-        {0x0000a5e8, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
-        {0x0000a5ec, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
-        {0x0000a5f0, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
-        {0x0000a5f4, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
-        {0x0000a5f8, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
-        {0x0000a5fc, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
-        {0x0000a600, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000a604, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000a608, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000a60c, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000a610, 0x00804000, 0x00804000, 0x00000000, 0x00000000},
-        {0x0000a614, 0x00804201, 0x00804201, 0x01404000, 0x01404000},
-        {0x0000a618, 0x0280c802, 0x0280c802, 0x01404501, 0x01404501},
-        {0x0000a61c, 0x0280ca03, 0x0280ca03, 0x02008501, 0x02008501},
-        {0x0000a620, 0x04c15104, 0x04c15104, 0x0280ca03, 0x0280ca03},
-        {0x0000a624, 0x04c15305, 0x04c15305, 0x03010c04, 0x03010c04},
-        {0x0000a628, 0x04c15305, 0x04c15305, 0x04014c04, 0x04014c04},
-        {0x0000a62c, 0x04c15305, 0x04c15305, 0x04015005, 0x04015005},
-        {0x0000a630, 0x04c15305, 0x04c15305, 0x04015005, 0x04015005},
-        {0x0000a634, 0x04c15305, 0x04c15305, 0x04015005, 0x04015005},
-        {0x0000a638, 0x04c15305, 0x04c15305, 0x04015005, 0x04015005},
-        {0x0000a63c, 0x04c15305, 0x04c15305, 0x04015005, 0x04015005},
-        {0x0000b2dc, 0x01feee00, 0x01feee00, 0x03aaa352, 0x03aaa352},
-        {0x0000b2e0, 0x0000f000, 0x0000f000, 0x03ccc584, 0x03ccc584},
-        {0x0000b2e4, 0x01ff0000, 0x01ff0000, 0x03f0f800, 0x03f0f800},
-        {0x0000b2e8, 0x00000000, 0x00000000, 0x03ff0000, 0x03ff0000},
-        {0x0000c2dc, 0x01feee00, 0x01feee00, 0x03aaa352, 0x03aaa352},
-        {0x0000c2e0, 0x0000f000, 0x0000f000, 0x03ccc584, 0x03ccc584},
-        {0x0000c2e4, 0x01ff0000, 0x01ff0000, 0x03f0f800, 0x03f0f800},
-        {0x0000c2e8, 0x00000000, 0x00000000, 0x03ff0000, 0x03ff0000},
-        {0x00016044, 0x056db2e4, 0x056db2e4, 0x056db2e4, 0x056db2e4},
-        {0x00016048, 0x8e480001, 0x8e480001, 0x8e480001, 0x8e480001},
-        {0x00016068, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c},
-        {0x00016444, 0x056db2e4, 0x056db2e4, 0x056db2e4, 0x056db2e4},
-        {0x00016448, 0x8e480001, 0x8e480001, 0x8e480001, 0x8e480001},
-        {0x00016468, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c},
-        {0x00016844, 0x056db2e4, 0x056db2e4, 0x056db2e4, 0x056db2e4},
-        {0x00016848, 0x8e480001, 0x8e480001, 0x8e480001, 0x8e480001},
-        {0x00016868, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c},
-};
+#define ar9580_1p0_high_ob_db_tx_gain_table ar9300Modes_high_ob_db_tx_gain_table_2p2
 
 static const u32 ar9580_1p0_soc_preamble[][2] = {
         /* Addr      allmodes  */
@@ -1189,265 +695,7 @@ static const u32 ar9580_1p0_soc_preamble[][2] = {
         {0x00007048, 0x00000008},
 };
 
-static const u32 ar9580_1p0_rx_gain_table[][2] = {
-        /* Addr      allmodes  */
-        {0x0000a000, 0x00010000},
-        {0x0000a004, 0x00030002},
-        {0x0000a008, 0x00050004},
-        {0x0000a00c, 0x00810080},
-        {0x0000a010, 0x00830082},
-        {0x0000a014, 0x01810180},
-        {0x0000a018, 0x01830182},
-        {0x0000a01c, 0x01850184},
-        {0x0000a020, 0x01890188},
-        {0x0000a024, 0x018b018a},
-        {0x0000a028, 0x018d018c},
-        {0x0000a02c, 0x01910190},
-        {0x0000a030, 0x01930192},
-        {0x0000a034, 0x01950194},
-        {0x0000a038, 0x038a0196},
-        {0x0000a03c, 0x038c038b},
-        {0x0000a040, 0x0390038d},
-        {0x0000a044, 0x03920391},
-        {0x0000a048, 0x03940393},
-        {0x0000a04c, 0x03960395},
-        {0x0000a050, 0x00000000},
-        {0x0000a054, 0x00000000},
-        {0x0000a058, 0x00000000},
-        {0x0000a05c, 0x00000000},
-        {0x0000a060, 0x00000000},
-        {0x0000a064, 0x00000000},
-        {0x0000a068, 0x00000000},
-        {0x0000a06c, 0x00000000},
-        {0x0000a070, 0x00000000},
-        {0x0000a074, 0x00000000},
-        {0x0000a078, 0x00000000},
-        {0x0000a07c, 0x00000000},
-        {0x0000a080, 0x22222229},
-        {0x0000a084, 0x1d1d1d1d},
-        {0x0000a088, 0x1d1d1d1d},
-        {0x0000a08c, 0x1d1d1d1d},
-        {0x0000a090, 0x171d1d1d},
-        {0x0000a094, 0x11111717},
-        {0x0000a098, 0x00030311},
-        {0x0000a09c, 0x00000000},
-        {0x0000a0a0, 0x00000000},
-        {0x0000a0a4, 0x00000000},
-        {0x0000a0a8, 0x00000000},
-        {0x0000a0ac, 0x00000000},
-        {0x0000a0b0, 0x00000000},
-        {0x0000a0b4, 0x00000000},
-        {0x0000a0b8, 0x00000000},
-        {0x0000a0bc, 0x00000000},
-        {0x0000a0c0, 0x001f0000},
-        {0x0000a0c4, 0x01000101},
-        {0x0000a0c8, 0x011e011f},
-        {0x0000a0cc, 0x011c011d},
-        {0x0000a0d0, 0x02030204},
-        {0x0000a0d4, 0x02010202},
-        {0x0000a0d8, 0x021f0200},
-        {0x0000a0dc, 0x0302021e},
-        {0x0000a0e0, 0x03000301},
-        {0x0000a0e4, 0x031e031f},
-        {0x0000a0e8, 0x0402031d},
-        {0x0000a0ec, 0x04000401},
-        {0x0000a0f0, 0x041e041f},
-        {0x0000a0f4, 0x0502041d},
-        {0x0000a0f8, 0x05000501},
-        {0x0000a0fc, 0x051e051f},
-        {0x0000a100, 0x06010602},
-        {0x0000a104, 0x061f0600},
-        {0x0000a108, 0x061d061e},
-        {0x0000a10c, 0x07020703},
-        {0x0000a110, 0x07000701},
-        {0x0000a114, 0x00000000},
-        {0x0000a118, 0x00000000},
-        {0x0000a11c, 0x00000000},
-        {0x0000a120, 0x00000000},
-        {0x0000a124, 0x00000000},
-        {0x0000a128, 0x00000000},
-        {0x0000a12c, 0x00000000},
-        {0x0000a130, 0x00000000},
-        {0x0000a134, 0x00000000},
-        {0x0000a138, 0x00000000},
-        {0x0000a13c, 0x00000000},
-        {0x0000a140, 0x001f0000},
-        {0x0000a144, 0x01000101},
-        {0x0000a148, 0x011e011f},
-        {0x0000a14c, 0x011c011d},
-        {0x0000a150, 0x02030204},
-        {0x0000a154, 0x02010202},
-        {0x0000a158, 0x021f0200},
-        {0x0000a15c, 0x0302021e},
-        {0x0000a160, 0x03000301},
-        {0x0000a164, 0x031e031f},
-        {0x0000a168, 0x0402031d},
-        {0x0000a16c, 0x04000401},
-        {0x0000a170, 0x041e041f},
-        {0x0000a174, 0x0502041d},
-        {0x0000a178, 0x05000501},
-        {0x0000a17c, 0x051e051f},
-        {0x0000a180, 0x06010602},
-        {0x0000a184, 0x061f0600},
-        {0x0000a188, 0x061d061e},
-        {0x0000a18c, 0x07020703},
-        {0x0000a190, 0x07000701},
-        {0x0000a194, 0x00000000},
-        {0x0000a198, 0x00000000},
-        {0x0000a19c, 0x00000000},
-        {0x0000a1a0, 0x00000000},
-        {0x0000a1a4, 0x00000000},
-        {0x0000a1a8, 0x00000000},
-        {0x0000a1ac, 0x00000000},
-        {0x0000a1b0, 0x00000000},
-        {0x0000a1b4, 0x00000000},
-        {0x0000a1b8, 0x00000000},
-        {0x0000a1bc, 0x00000000},
-        {0x0000a1c0, 0x00000000},
-        {0x0000a1c4, 0x00000000},
-        {0x0000a1c8, 0x00000000},
-        {0x0000a1cc, 0x00000000},
-        {0x0000a1d0, 0x00000000},
-        {0x0000a1d4, 0x00000000},
-        {0x0000a1d8, 0x00000000},
-        {0x0000a1dc, 0x00000000},
-        {0x0000a1e0, 0x00000000},
-        {0x0000a1e4, 0x00000000},
-        {0x0000a1e8, 0x00000000},
-        {0x0000a1ec, 0x00000000},
-        {0x0000a1f0, 0x00000396},
-        {0x0000a1f4, 0x00000396},
-        {0x0000a1f8, 0x00000396},
-        {0x0000a1fc, 0x00000196},
-        {0x0000b000, 0x00010000},
-        {0x0000b004, 0x00030002},
-        {0x0000b008, 0x00050004},
-        {0x0000b00c, 0x00810080},
-        {0x0000b010, 0x00830082},
-        {0x0000b014, 0x01810180},
-        {0x0000b018, 0x01830182},
-        {0x0000b01c, 0x01850184},
-        {0x0000b020, 0x02810280},
-        {0x0000b024, 0x02830282},
-        {0x0000b028, 0x02850284},
-        {0x0000b02c, 0x02890288},
-        {0x0000b030, 0x028b028a},
-        {0x0000b034, 0x0388028c},
-        {0x0000b038, 0x038a0389},
-        {0x0000b03c, 0x038c038b},
-        {0x0000b040, 0x0390038d},
-        {0x0000b044, 0x03920391},
-        {0x0000b048, 0x03940393},
-        {0x0000b04c, 0x03960395},
-        {0x0000b050, 0x00000000},
-        {0x0000b054, 0x00000000},
-        {0x0000b058, 0x00000000},
-        {0x0000b05c, 0x00000000},
-        {0x0000b060, 0x00000000},
-        {0x0000b064, 0x00000000},
-        {0x0000b068, 0x00000000},
-        {0x0000b06c, 0x00000000},
-        {0x0000b070, 0x00000000},
-        {0x0000b074, 0x00000000},
-        {0x0000b078, 0x00000000},
-        {0x0000b07c, 0x00000000},
-        {0x0000b080, 0x2a2d2f32},
-        {0x0000b084, 0x21232328},
-        {0x0000b088, 0x19191c1e},
-        {0x0000b08c, 0x12141417},
-        {0x0000b090, 0x07070e0e},
-        {0x0000b094, 0x03030305},
-        {0x0000b098, 0x00000003},
-        {0x0000b09c, 0x00000000},
-        {0x0000b0a0, 0x00000000},
-        {0x0000b0a4, 0x00000000},
-        {0x0000b0a8, 0x00000000},
-        {0x0000b0ac, 0x00000000},
-        {0x0000b0b0, 0x00000000},
-        {0x0000b0b4, 0x00000000},
-        {0x0000b0b8, 0x00000000},
-        {0x0000b0bc, 0x00000000},
-        {0x0000b0c0, 0x003f0020},
-        {0x0000b0c4, 0x00400041},
-        {0x0000b0c8, 0x0140005f},
-        {0x0000b0cc, 0x0160015f},
-        {0x0000b0d0, 0x017e017f},
-        {0x0000b0d4, 0x02410242},
-        {0x0000b0d8, 0x025f0240},
-        {0x0000b0dc, 0x027f0260},
-        {0x0000b0e0, 0x0341027e},
-        {0x0000b0e4, 0x035f0340},
-        {0x0000b0e8, 0x037f0360},
-        {0x0000b0ec, 0x04400441},
-        {0x0000b0f0, 0x0460045f},
-        {0x0000b0f4, 0x0541047f},
-        {0x0000b0f8, 0x055f0540},
-        {0x0000b0fc, 0x057f0560},
-        {0x0000b100, 0x06400641},
-        {0x0000b104, 0x0660065f},
-        {0x0000b108, 0x067e067f},
-        {0x0000b10c, 0x07410742},
-        {0x0000b110, 0x075f0740},
-        {0x0000b114, 0x077f0760},
-        {0x0000b118, 0x07800781},
-        {0x0000b11c, 0x07a0079f},
-        {0x0000b120, 0x07c107bf},
-        {0x0000b124, 0x000007c0},
-        {0x0000b128, 0x00000000},
-        {0x0000b12c, 0x00000000},
-        {0x0000b130, 0x00000000},
-        {0x0000b134, 0x00000000},
-        {0x0000b138, 0x00000000},
-        {0x0000b13c, 0x00000000},
-        {0x0000b140, 0x003f0020},
-        {0x0000b144, 0x00400041},
-        {0x0000b148, 0x0140005f},
-        {0x0000b14c, 0x0160015f},
-        {0x0000b150, 0x017e017f},
-        {0x0000b154, 0x02410242},
-        {0x0000b158, 0x025f0240},
-        {0x0000b15c, 0x027f0260},
-        {0x0000b160, 0x0341027e},
-        {0x0000b164, 0x035f0340},
-        {0x0000b168, 0x037f0360},
-        {0x0000b16c, 0x04400441},
-        {0x0000b170, 0x0460045f},
-        {0x0000b174, 0x0541047f},
-        {0x0000b178, 0x055f0540},
-        {0x0000b17c, 0x057f0560},
-        {0x0000b180, 0x06400641},
-        {0x0000b184, 0x0660065f},
-        {0x0000b188, 0x067e067f},
-        {0x0000b18c, 0x07410742},
-        {0x0000b190, 0x075f0740},
-        {0x0000b194, 0x077f0760},
-        {0x0000b198, 0x07800781},
-        {0x0000b19c, 0x07a0079f},
-        {0x0000b1a0, 0x07c107bf},
-        {0x0000b1a4, 0x000007c0},
-        {0x0000b1a8, 0x00000000},
-        {0x0000b1ac, 0x00000000},
-        {0x0000b1b0, 0x00000000},
-        {0x0000b1b4, 0x00000000},
-        {0x0000b1b8, 0x00000000},
-        {0x0000b1bc, 0x00000000},
-        {0x0000b1c0, 0x00000000},
-        {0x0000b1c4, 0x00000000},
-        {0x0000b1c8, 0x00000000},
-        {0x0000b1cc, 0x00000000},
-        {0x0000b1d0, 0x00000000},
-        {0x0000b1d4, 0x00000000},
-        {0x0000b1d8, 0x00000000},
-        {0x0000b1dc, 0x00000000},
-        {0x0000b1e0, 0x00000000},
-        {0x0000b1e4, 0x00000000},
-        {0x0000b1e8, 0x00000000},
-        {0x0000b1ec, 0x00000000},
-        {0x0000b1f0, 0x00000396},
-        {0x0000b1f4, 0x00000396},
-        {0x0000b1f8, 0x00000396},
-        {0x0000b1fc, 0x00000196},
-};
+#define ar9580_1p0_rx_gain_table ar9462_common_rx_gain_table_2p0
 
 static const u32 ar9580_1p0_radio_core[][2] = {
         /* Addr      allmodes  */
diff --git a/drivers/net/wireless/ath/ath9k/ath9k.h b/drivers/net/wireless/ath/ath9k/ath9k.h
index 4866550ddd9..fe39eb4c42a 100644
--- a/drivers/net/wireless/ath/ath9k/ath9k.h
+++ b/drivers/net/wireless/ath/ath9k/ath9k.h
@@ -308,6 +308,7 @@ struct ath_rx {
         u8 defant;
         u8 rxotherant;
         u32 *rxlink;
+        u32 num_pkts;
         unsigned int rxfilter;
         spinlock_t rxbuflock;
         struct list_head rxbuf;
@@ -326,6 +327,9 @@ int ath_rx_init(struct ath_softc *sc, int nbufs);
 void ath_rx_cleanup(struct ath_softc *sc);
 int ath_rx_tasklet(struct ath_softc *sc, int flush, bool hp);
 struct ath_txq *ath_txq_setup(struct ath_softc *sc, int qtype, int subtype);
+void ath_txq_lock(struct ath_softc *sc, struct ath_txq *txq);
+void ath_txq_unlock(struct ath_softc *sc, struct ath_txq *txq);
+void ath_txq_unlock_complete(struct ath_softc *sc, struct ath_txq *txq);
 void ath_tx_cleanupq(struct ath_softc *sc, struct ath_txq *txq);
 bool ath_drain_all_txq(struct ath_softc *sc, bool retry_tx);
 void ath_draintxq(struct ath_softc *sc,
@@ -415,9 +419,9 @@ int ath_beaconq_config(struct ath_softc *sc);
 void ath_set_beacon(struct ath_softc *sc);
 void ath9k_set_beaconing_status(struct ath_softc *sc, bool status);
 
-/*******/
-/* ANI */
-/*******/
+/*******************/
+/* Link Monitoring */
+/*******************/
 
 #define ATH_STA_SHORT_CALINTERVAL 1000    /* 1 second */
 #define ATH_AP_SHORT_CALINTERVAL  100     /* 100 ms */
@@ -428,7 +432,9 @@ void ath9k_set_beaconing_status(struct ath_softc *sc, bool status);
 #define ATH_RESTART_CALINTERVAL   1200000 /* 20 minutes */
 
 #define ATH_PAPRD_TIMEOUT       100 /* msecs */
+#define ATH_PLL_WORK_INTERVAL   100
 
+void ath_tx_complete_poll_work(struct work_struct *work);
 void ath_reset_work(struct work_struct *work);
 void ath_hw_check(struct work_struct *work);
 void ath_hw_pll_work(struct work_struct *work);
@@ -437,22 +443,31 @@ void ath_start_rx_poll(struct ath_softc *sc, u8 nbeacon);
 void ath_paprd_calibrate(struct work_struct *work);
 void ath_ani_calibrate(unsigned long data);
 void ath_start_ani(struct ath_common *common);
+int ath_update_survey_stats(struct ath_softc *sc);
+void ath_update_survey_nf(struct ath_softc *sc, int channel);
 
 /**********/
 /* BTCOEX */
 /**********/
 
+enum bt_op_flags {
+        BT_OP_PRIORITY_DETECTED,
+        BT_OP_SCAN,
+};
+
 struct ath_btcoex {
         bool hw_timer_enabled;
         spinlock_t btcoex_lock;
         struct timer_list period_timer; /* Timer for BT period */
         u32 bt_priority_cnt;
         unsigned long bt_priority_time;
+        unsigned long op_flags;
         int bt_stomp_type; /* Types of BT stomping */
         u32 btcoex_no_stomp; /* in usec */
         u32 btcoex_period; /* in usec */
         u32 btscan_no_stomp; /* in usec */
         u32 duty_cycle;
+        u32 bt_wait_time;
         struct ath_gen_timer *no_stomp_timer; /* Timer for no BT stomping */
         struct ath_mci_profile mci;
 };
@@ -514,8 +529,10 @@ static inline void ath_deinit_leds(struct ath_softc *sc)
 }
 #endif
 
-
+/*******************************/
 /* Antenna diversity/combining */
+/*******************************/
+
 #define ATH_ANT_RX_CURRENT_SHIFT 4
 #define ATH_ANT_RX_MAIN_SHIFT 2
 #define ATH_ANT_RX_MASK 0x3
@@ -568,6 +585,9 @@ struct ath_ant_comb {
         unsigned long scan_start_time;
 };
 
+void ath_ant_comb_scan(struct ath_softc *sc, struct ath_rx_status *rs);
+void ath_ant_comb_update(struct ath_softc *sc);
+
 /********************/
 /* Main driver core */
 /********************/
@@ -585,15 +605,15 @@ struct ath_ant_comb {
 #define ATH_TXPOWER_MAX         100     /* .5 dBm units */
 #define ATH_RATE_DUMMY_MARKER   0
 
-#define SC_OP_INVALID                BIT(0)
-#define SC_OP_BEACONS                BIT(1)
-#define SC_OP_OFFCHANNEL             BIT(2)
-#define SC_OP_RXFLUSH                BIT(3)
-#define SC_OP_TSF_RESET              BIT(4)
-#define SC_OP_BT_PRIORITY_DETECTED   BIT(5)
-#define SC_OP_BT_SCAN                BIT(6)
-#define SC_OP_ANI_RUN                BIT(7)
-#define SC_OP_PRIM_STA_VIF           BIT(8)
+enum sc_op_flags {
+        SC_OP_INVALID,
+        SC_OP_BEACONS,
+        SC_OP_RXFLUSH,
+        SC_OP_TSF_RESET,
+        SC_OP_ANI_RUN,
+        SC_OP_PRIM_STA_VIF,
+        SC_OP_HW_RESET,
+};
 
 /* Powersave flags */
 #define PS_WAIT_FOR_BEACON        BIT(0)
@@ -639,9 +659,9 @@ struct ath_softc {
         struct completion paprd_complete;
 
         unsigned int hw_busy_count;
+        unsigned long sc_flags;
 
         u32 intrstatus;
-        u32 sc_flags; /* SC_OP_* */
         u16 ps_flags; /* PS_* */
         u16 curtxpow;
         bool ps_enabled;
@@ -679,6 +699,7 @@ struct ath_softc {
 #ifdef CONFIG_ATH9K_BTCOEX_SUPPORT
         struct ath_btcoex btcoex;
         struct ath_mci_coex mci_coex;
+        struct work_struct mci_work;
 #endif
 
         struct ath_descdma txsdma;
@@ -701,6 +722,7 @@ extern int ath9k_modparam_nohwcrypt;
 extern int led_blink;
 extern bool is_ath9k_unloaded;
 
+u8 ath9k_parse_mpdudensity(u8 mpdudensity);
 irqreturn_t ath_isr(int irq, void *dev);
 int ath9k_init_device(u16 devid, struct ath_softc *sc,
                     const struct ath_bus_ops *bus_ops);
@@ -737,5 +759,4 @@ void ath9k_calculate_iter_data(struct ieee80211_hw *hw,
                                struct ieee80211_vif *vif,
                                struct ath9k_vif_iter_data *iter_data);
 
-
 #endif /* ATH9K_H */
diff --git a/drivers/net/wireless/ath/ath9k/beacon.c b/drivers/net/wireless/ath/ath9k/beacon.c
index 11bc55e3d69..40775da8941 100644
--- a/drivers/net/wireless/ath/ath9k/beacon.c
+++ b/drivers/net/wireless/ath/ath9k/beacon.c
@@ -48,7 +48,10 @@ int ath_beaconq_config(struct ath_softc *sc)
                 txq = sc->tx.txq_map[WME_AC_BE];
                 ath9k_hw_get_txq_props(ah, txq->axq_qnum, &qi_be);
                 qi.tqi_aifs = qi_be.tqi_aifs;
-                qi.tqi_cwmin = 4*qi_be.tqi_cwmin;
+                if (ah->slottime == ATH9K_SLOT_TIME_20)
+                        qi.tqi_cwmin = 2*qi_be.tqi_cwmin;
+                else
+                        qi.tqi_cwmin = 4*qi_be.tqi_cwmin;
                 qi.tqi_cwmax = qi_be.tqi_cwmax;
         }
 
@@ -387,7 +390,7 @@ void ath_beacon_tasklet(unsigned long data)
                 } else if (sc->beacon.bmisscnt >= BSTUCK_THRESH) {
                         ath_dbg(common, BSTUCK, "beacon is officially stuck\n");
                         sc->beacon.bmisscnt = 0;
-                        sc->sc_flags |= SC_OP_TSF_RESET;
+                        set_bit(SC_OP_TSF_RESET, &sc->sc_flags);
                         ieee80211_queue_work(sc->hw, &sc->hw_reset_work);
                 }
 
@@ -477,16 +480,16 @@ static void ath9k_beacon_init(struct ath_softc *sc,
                               u32 next_beacon,
                               u32 beacon_period)
 {
-        if (sc->sc_flags & SC_OP_TSF_RESET) {
+        if (test_bit(SC_OP_TSF_RESET, &sc->sc_flags)) {
                 ath9k_ps_wakeup(sc);
                 ath9k_hw_reset_tsf(sc->sc_ah);
         }
 
         ath9k_hw_beaconinit(sc->sc_ah, next_beacon, beacon_period);
 
-        if (sc->sc_flags & SC_OP_TSF_RESET) {
+        if (test_bit(SC_OP_TSF_RESET, &sc->sc_flags)) {
                 ath9k_ps_restore(sc);
-                sc->sc_flags &= ~SC_OP_TSF_RESET;
+                clear_bit(SC_OP_TSF_RESET, &sc->sc_flags);
         }
 }
 
@@ -516,7 +519,7 @@ static void ath_beacon_config_ap(struct ath_softc *sc,
         /* Set the computed AP beacon timers */
 
         ath9k_hw_disable_interrupts(ah);
-        sc->sc_flags |= SC_OP_TSF_RESET;
+        set_bit(SC_OP_TSF_RESET, &sc->sc_flags);
         ath9k_beacon_init(sc, nexttbtt, intval);
         sc->beacon.bmisscnt = 0;
         ath9k_hw_set_interrupts(ah);
@@ -659,7 +662,7 @@ static void ath_beacon_config_adhoc(struct ath_softc *sc,
         u32 tsf, intval, nexttbtt;
 
         ath9k_reset_beacon_status(sc);
-        if (!(sc->sc_flags & SC_OP_BEACONS))
+        if (!test_bit(SC_OP_BEACONS, &sc->sc_flags))
                 ath9k_hw_settsf64(ah, sc->beacon.bc_tstamp);
 
         intval = TU_TO_USEC(conf->beacon_interval);
@@ -724,7 +727,7 @@ static bool ath9k_allow_beacon_config(struct ath_softc *sc,
          */
         if ((sc->sc_ah->opmode == NL80211_IFTYPE_STATION) &&
             (vif->type == NL80211_IFTYPE_STATION) &&
-            (sc->sc_flags & SC_OP_BEACONS) &&
+            test_bit(SC_OP_BEACONS, &sc->sc_flags) &&
             !avp->primary_sta_vif) {
                 ath_dbg(common, CONFIG,
                         "Beacon already configured for a station interface\n");
@@ -810,7 +813,7 @@ void ath_set_beacon(struct ath_softc *sc)
                 return;
         }
 
-        sc->sc_flags |= SC_OP_BEACONS;
+        set_bit(SC_OP_BEACONS, &sc->sc_flags);
 }
 
 void ath9k_set_beaconing_status(struct ath_softc *sc, bool status)
@@ -818,7 +821,7 @@ void ath9k_set_beaconing_status(struct ath_softc *sc, bool status)
         struct ath_hw *ah = sc->sc_ah;
 
         if (!ath_has_valid_bslot(sc)) {
-                sc->sc_flags &= ~SC_OP_BEACONS;
+                clear_bit(SC_OP_BEACONS, &sc->sc_flags);
                 return;
         }
 
diff --git a/drivers/net/wireless/ath/ath9k/btcoex.c b/drivers/net/wireless/ath/ath9k/btcoex.c
index 1ca6da80d4a..acd437384fe 100644
--- a/drivers/net/wireless/ath/ath9k/btcoex.c
+++ b/drivers/net/wireless/ath/ath9k/btcoex.c
@@ -336,10 +336,16 @@ static void ar9003_btcoex_bt_stomp(struct ath_hw *ah,
                          enum ath_stomp_type stomp_type)
 {
         struct ath_btcoex_hw *btcoex = &ah->btcoex_hw;
-        const u32 *weight = AR_SREV_9462(ah) ? ar9003_wlan_weights[stomp_type] :
-                                               ar9462_wlan_weights[stomp_type];
+        const u32 *weight = ar9003_wlan_weights[stomp_type];
         int i;
 
+        if (AR_SREV_9462(ah)) {
+                if ((stomp_type == ATH_BTCOEX_STOMP_LOW) &&
+                    btcoex->mci.stomp_ftp)
+                        stomp_type = ATH_BTCOEX_STOMP_LOW_FTP;
+                weight = ar9462_wlan_weights[stomp_type];
+        }
+
         for (i = 0; i < AR9300_NUM_WLAN_WEIGHTS; i++) {
                 btcoex->bt_weight[i] = AR9300_BT_WGHT;
                 btcoex->wlan_weight[i] = weight[i];
diff --git a/drivers/net/wireless/ath/ath9k/btcoex.h b/drivers/net/wireless/ath/ath9k/btcoex.h
index 3a1e1cfabd5..20092f98658 100644
--- a/drivers/net/wireless/ath/ath9k/btcoex.h
+++ b/drivers/net/wireless/ath/ath9k/btcoex.h
@@ -36,6 +36,9 @@
 #define ATH_BT_CNT_THRESHOLD           3
 #define ATH_BT_CNT_SCAN_THRESHOLD      15
 
+#define ATH_BTCOEX_RX_WAIT_TIME       100
+#define ATH_BTCOEX_STOMP_FTP_THRESH   5
+
 #define AR9300_NUM_BT_WEIGHTS   4
 #define AR9300_NUM_WLAN_WEIGHTS 4
 /* Defines the BT AR_BT_COEX_WGHT used */
@@ -80,6 +83,7 @@ struct ath9k_hw_mci {
         u8 bt_ver_major;
         u8 bt_ver_minor;
         u8 bt_state;
+        u8 stomp_ftp;
 };
 
 struct ath_btcoex_hw {
diff --git a/drivers/net/wireless/ath/ath9k/debug.c b/drivers/net/wireless/ath/ath9k/debug.c
index fde700c4e49..5c3192ffc19 100644
--- a/drivers/net/wireless/ath/ath9k/debug.c
+++ b/drivers/net/wireless/ath/ath9k/debug.c
@@ -205,10 +205,10 @@ static ssize_t write_file_disable_ani(struct file *file,
         common->disable_ani = !!disable_ani;
 
         if (disable_ani) {
-                sc->sc_flags &= ~SC_OP_ANI_RUN;
+                clear_bit(SC_OP_ANI_RUN, &sc->sc_flags);
                 del_timer_sync(&common->ani.timer);
         } else {
-                sc->sc_flags |= SC_OP_ANI_RUN;
+                set_bit(SC_OP_ANI_RUN, &sc->sc_flags);
                 ath_start_ani(common);
         }
 
@@ -348,8 +348,6 @@ void ath_debug_stat_interrupt(struct ath_softc *sc, enum ath9k_int status)
                 sc->debug.stats.istats.txok++;
         if (status & ATH9K_INT_TXURN)
                 sc->debug.stats.istats.txurn++;
-        if (status & ATH9K_INT_MIB)
-                sc->debug.stats.istats.mib++;
         if (status & ATH9K_INT_RXPHY)
                 sc->debug.stats.istats.rxphyerr++;
         if (status & ATH9K_INT_RXKCM)
@@ -374,6 +372,8 @@ void ath_debug_stat_interrupt(struct ath_softc *sc, enum ath9k_int status)
                 sc->debug.stats.istats.dtim++;
         if (status & ATH9K_INT_TSFOOR)
                 sc->debug.stats.istats.tsfoor++;
+        if (status & ATH9K_INT_MCI)
+                sc->debug.stats.istats.mci++;
 }
 
 static ssize_t read_file_interrupt(struct file *file, char __user *user_buf,
@@ -418,6 +418,7 @@ static ssize_t read_file_interrupt(struct file *file, char __user *user_buf,
         PR_IS("DTIMSYNC", dtimsync);
         PR_IS("DTIM", dtim);
         PR_IS("TSFOOR", tsfoor);
+        PR_IS("MCI", mci);
         PR_IS("TOTAL", total);
 
         len += snprintf(buf + len, mxlen - len,
@@ -1318,7 +1319,7 @@ static int open_file_bb_mac_samps(struct inode *inode, struct file *file)
         u8 chainmask = (ah->rxchainmask << 3) | ah->rxchainmask;
         u8 nread;
 
-        if (sc->sc_flags & SC_OP_INVALID)
+        if (test_bit(SC_OP_INVALID, &sc->sc_flags))
                 return -EAGAIN;
 
         buf = vmalloc(size);
diff --git a/drivers/net/wireless/ath/ath9k/debug.h b/drivers/net/wireless/ath/ath9k/debug.h
index c34da09d910..d0f851cea43 100644
--- a/drivers/net/wireless/ath/ath9k/debug.h
+++ b/drivers/net/wireless/ath/ath9k/debug.h
@@ -86,6 +86,7 @@ struct ath_interrupt_stats {
         u32 dtim;
         u32 bb_watchdog;
         u32 tsfoor;
+        u32 mci;
 
         /* Sync-cause stats */
         u32 sync_cause_all;
diff --git a/drivers/net/wireless/ath/ath9k/eeprom_4k.c b/drivers/net/wireless/ath/ath9k/eeprom_4k.c
index 4322ac80c20..7d075105a85 100644
--- a/drivers/net/wireless/ath/ath9k/eeprom_4k.c
+++ b/drivers/net/wireless/ath/ath9k/eeprom_4k.c
@@ -135,7 +135,7 @@ static u32 ath9k_hw_4k_dump_eeprom(struct ath_hw *ah, bool dump_base_hdr,
         if (!dump_base_hdr) {
                 len += snprintf(buf + len, size - len,
                                 "%20s :\n", "2GHz modal Header");
-                len += ath9k_dump_4k_modal_eeprom(buf, len, size,
+                len = ath9k_dump_4k_modal_eeprom(buf, len, size,
                                                   &eep->modalHeader);
                 goto out;
         }
@@ -188,8 +188,7 @@ static int ath9k_hw_4k_check_eeprom(struct ath_hw *ah)
 {
 #define EEPROM_4K_SIZE (sizeof(struct ar5416_eeprom_4k) / sizeof(u16))
         struct ath_common *common = ath9k_hw_common(ah);
-        struct ar5416_eeprom_4k *eep =
-                (struct ar5416_eeprom_4k *) &ah->eeprom.map4k;
+        struct ar5416_eeprom_4k *eep = &ah->eeprom.map4k;
         u16 *eepdata, temp, magic, magic2;
         u32 sum = 0, el;
         bool need_swap = false;
diff --git a/drivers/net/wireless/ath/ath9k/eeprom_9287.c b/drivers/net/wireless/ath/ath9k/eeprom_9287.c
index aa614767adf..cd742fb944c 100644
--- a/drivers/net/wireless/ath/ath9k/eeprom_9287.c
+++ b/drivers/net/wireless/ath/ath9k/eeprom_9287.c
@@ -132,7 +132,7 @@ static u32 ath9k_hw_ar9287_dump_eeprom(struct ath_hw *ah, bool dump_base_hdr,
         if (!dump_base_hdr) {
                 len += snprintf(buf + len, size - len,
                                 "%20s :\n", "2GHz modal Header");
-                len += ar9287_dump_modal_eeprom(buf, len, size,
+                len = ar9287_dump_modal_eeprom(buf, len, size,
                                                 &eep->modalHeader);
                 goto out;
         }
diff --git a/drivers/net/wireless/ath/ath9k/eeprom_def.c b/drivers/net/wireless/ath/ath9k/eeprom_def.c
index b5fba8b18b8..a8ac30a0072 100644
--- a/drivers/net/wireless/ath/ath9k/eeprom_def.c
+++ b/drivers/net/wireless/ath/ath9k/eeprom_def.c
@@ -211,11 +211,11 @@ static u32 ath9k_hw_def_dump_eeprom(struct ath_hw *ah, bool dump_base_hdr,
         if (!dump_base_hdr) {
                 len += snprintf(buf + len, size - len,
                                 "%20s :\n", "2GHz modal Header");
-                len += ath9k_def_dump_modal_eeprom(buf, len, size,
+                len = ath9k_def_dump_modal_eeprom(buf, len, size,
                                                    &eep->modalHeader[0]);
                 len += snprintf(buf + len, size - len,
                                 "%20s :\n", "5GHz modal Header");
-                len += ath9k_def_dump_modal_eeprom(buf, len, size,
+                len = ath9k_def_dump_modal_eeprom(buf, len, size,
                                                    &eep->modalHeader[1]);
                 goto out;
         }
@@ -264,8 +264,7 @@ static u32 ath9k_hw_def_dump_eeprom(struct ath_hw *ah, bool dump_base_hdr,
 
 static int ath9k_hw_def_check_eeprom(struct ath_hw *ah)
 {
-        struct ar5416_eeprom_def *eep =
-                (struct ar5416_eeprom_def *) &ah->eeprom.def;
+        struct ar5416_eeprom_def *eep = &ah->eeprom.def;
         struct ath_common *common = ath9k_hw_common(ah);
         u16 *eepdata, temp, magic, magic2;
         u32 sum = 0, el;
diff --git a/drivers/net/wireless/ath/ath9k/gpio.c b/drivers/net/wireless/ath/ath9k/gpio.c
index 281a9af0f1b..9ae6a4d9769 100644
--- a/drivers/net/wireless/ath/ath9k/gpio.c
+++ b/drivers/net/wireless/ath/ath9k/gpio.c
@@ -132,17 +132,18 @@ static void ath_detect_bt_priority(struct ath_softc *sc)
 
         if (time_after(jiffies, btcoex->bt_priority_time +
                         msecs_to_jiffies(ATH_BT_PRIORITY_TIME_THRESHOLD))) {
-                sc->sc_flags &= ~(SC_OP_BT_PRIORITY_DETECTED | SC_OP_BT_SCAN);
+                clear_bit(BT_OP_PRIORITY_DETECTED, &btcoex->op_flags);
+                clear_bit(BT_OP_SCAN, &btcoex->op_flags);
                 /* Detect if colocated bt started scanning */
                 if (btcoex->bt_priority_cnt >= ATH_BT_CNT_SCAN_THRESHOLD) {
                         ath_dbg(ath9k_hw_common(sc->sc_ah), BTCOEX,
                                 "BT scan detected\n");
-                        sc->sc_flags |= (SC_OP_BT_SCAN |
-                                         SC_OP_BT_PRIORITY_DETECTED);
+                        set_bit(BT_OP_PRIORITY_DETECTED, &btcoex->op_flags);
+                        set_bit(BT_OP_SCAN, &btcoex->op_flags);
                 } else if (btcoex->bt_priority_cnt >= ATH_BT_CNT_THRESHOLD) {
                         ath_dbg(ath9k_hw_common(sc->sc_ah), BTCOEX,
                                 "BT priority traffic detected\n");
-                        sc->sc_flags |= SC_OP_BT_PRIORITY_DETECTED;
+                        set_bit(BT_OP_PRIORITY_DETECTED, &btcoex->op_flags);
                 }
 
                 btcoex->bt_priority_cnt = 0;
@@ -190,13 +191,26 @@ static void ath_btcoex_period_timer(unsigned long data)
         struct ath_softc *sc = (struct ath_softc *) data;
         struct ath_hw *ah = sc->sc_ah;
         struct ath_btcoex *btcoex = &sc->btcoex;
+        struct ath_mci_profile *mci = &btcoex->mci;
         u32 timer_period;
         bool is_btscan;
 
         ath9k_ps_wakeup(sc);
         if (!(ah->caps.hw_caps & ATH9K_HW_CAP_MCI))
                 ath_detect_bt_priority(sc);
-        is_btscan = sc->sc_flags & SC_OP_BT_SCAN;
+        is_btscan = test_bit(BT_OP_SCAN, &btcoex->op_flags);
+
+        btcoex->bt_wait_time += btcoex->btcoex_period;
+        if (btcoex->bt_wait_time > ATH_BTCOEX_RX_WAIT_TIME) {
+                if (ar9003_mci_state(ah, MCI_STATE_NEED_FTP_STOMP) &&
+                    (mci->num_pan || mci->num_other_acl))
+                        ah->btcoex_hw.mci.stomp_ftp =
+                                (sc->rx.num_pkts < ATH_BTCOEX_STOMP_FTP_THRESH);
+                else
+                        ah->btcoex_hw.mci.stomp_ftp = false;
+                btcoex->bt_wait_time = 0;
+                sc->rx.num_pkts = 0;
+        }
 
         spin_lock_bh(&btcoex->btcoex_lock);
 
@@ -218,9 +232,8 @@ static void ath_btcoex_period_timer(unsigned long data)
         }
 
         ath9k_ps_restore(sc);
-        timer_period = btcoex->btcoex_period / 1000;
-        mod_timer(&btcoex->period_timer, jiffies +
-                                  msecs_to_jiffies(timer_period));
+        timer_period = btcoex->btcoex_period;
+        mod_timer(&btcoex->period_timer, jiffies + msecs_to_jiffies(timer_period));
 }
 
 /*
@@ -233,14 +246,14 @@ static void ath_btcoex_no_stomp_timer(void *arg)
         struct ath_hw *ah = sc->sc_ah;
         struct ath_btcoex *btcoex = &sc->btcoex;
         struct ath_common *common = ath9k_hw_common(ah);
-        bool is_btscan = sc->sc_flags & SC_OP_BT_SCAN;
 
         ath_dbg(common, BTCOEX, "no stomp timer running\n");
 
         ath9k_ps_wakeup(sc);
         spin_lock_bh(&btcoex->btcoex_lock);
 
-        if (btcoex->bt_stomp_type == ATH_BTCOEX_STOMP_LOW || is_btscan)
+        if (btcoex->bt_stomp_type == ATH_BTCOEX_STOMP_LOW ||
+            test_bit(BT_OP_SCAN, &btcoex->op_flags))
                 ath9k_hw_btcoex_bt_stomp(ah, ATH_BTCOEX_STOMP_NONE);
          else if (btcoex->bt_stomp_type == ATH_BTCOEX_STOMP_ALL)
                 ath9k_hw_btcoex_bt_stomp(ah, ATH_BTCOEX_STOMP_LOW);
@@ -254,10 +267,10 @@ static int ath_init_btcoex_timer(struct ath_softc *sc)
 {
         struct ath_btcoex *btcoex = &sc->btcoex;
 
-        btcoex->btcoex_period = ATH_BTCOEX_DEF_BT_PERIOD * 1000;
-        btcoex->btcoex_no_stomp = (100 - ATH_BTCOEX_DEF_DUTY_CYCLE) *
+        btcoex->btcoex_period = ATH_BTCOEX_DEF_BT_PERIOD;
+        btcoex->btcoex_no_stomp = (100 - ATH_BTCOEX_DEF_DUTY_CYCLE) * 1000 *
                 btcoex->btcoex_period / 100;
-        btcoex->btscan_no_stomp = (100 - ATH_BTCOEX_BTSCAN_DUTY_CYCLE) *
+        btcoex->btscan_no_stomp = (100 - ATH_BTCOEX_BTSCAN_DUTY_CYCLE) * 1000 *
                                    btcoex->btcoex_period / 100;
 
         setup_timer(&btcoex->period_timer, ath_btcoex_period_timer,
@@ -292,7 +305,7 @@ void ath9k_btcoex_timer_resume(struct ath_softc *sc)
 
         btcoex->bt_priority_cnt = 0;
         btcoex->bt_priority_time = jiffies;
-        sc->sc_flags &= ~(SC_OP_BT_PRIORITY_DETECTED | SC_OP_BT_SCAN);
+        btcoex->op_flags &= ~(BT_OP_PRIORITY_DETECTED | BT_OP_SCAN);
 
         mod_timer(&btcoex->period_timer, jiffies);
 }
@@ -316,12 +329,13 @@ void ath9k_btcoex_timer_pause(struct ath_softc *sc)
 
 u16 ath9k_btcoex_aggr_limit(struct ath_softc *sc, u32 max_4ms_framelen)
 {
+        struct ath_btcoex *btcoex = &sc->btcoex;
         struct ath_mci_profile *mci = &sc->btcoex.mci;
         u16 aggr_limit = 0;
 
         if ((sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_MCI) && mci->aggr_limit)
                 aggr_limit = (max_4ms_framelen * mci->aggr_limit) >> 4;
-        else if (sc->sc_flags & SC_OP_BT_PRIORITY_DETECTED)
+        else if (test_bit(BT_OP_PRIORITY_DETECTED, &btcoex->op_flags))
                 aggr_limit = min((max_4ms_framelen * 3) / 8,
                                  (u32)ATH_AMPDU_LIMIT_MAX);
 
@@ -402,7 +416,7 @@ int ath9k_init_btcoex(struct ath_softc *sc)
                 txq = sc->tx.txq_map[WME_AC_BE];
                 ath9k_hw_init_btcoex_hw(sc->sc_ah, txq->axq_qnum);
                 sc->btcoex.bt_stomp_type = ATH_BTCOEX_STOMP_LOW;
-                if (AR_SREV_9462(ah)) {
+                if (ath9k_hw_mci_is_enabled(ah)) {
                         sc->btcoex.duty_cycle = ATH_BTCOEX_DEF_DUTY_CYCLE;
                         INIT_LIST_HEAD(&sc->btcoex.mci.info);
 
diff --git a/drivers/net/wireless/ath/ath9k/htc.h b/drivers/net/wireless/ath/ath9k/htc.h
index 135795257d9..936e920fb88 100644
--- a/drivers/net/wireless/ath/ath9k/htc.h
+++ b/drivers/net/wireless/ath/ath9k/htc.h
@@ -453,7 +453,6 @@ struct ath9k_htc_priv {
         u8 num_sta_assoc_vif;
         u8 num_ap_vif;
 
-        u16 op_flags;
         u16 curtxpow;
         u16 txpowlimit;
         u16 nvifs;
@@ -461,6 +460,7 @@ struct ath9k_htc_priv {
         bool rearm_ani;
         bool reconfig_beacon;
         unsigned int rxfilter;
+        unsigned long op_flags;
 
         struct ath9k_hw_cal_data caldata;
         struct ieee80211_supported_band sbands[IEEE80211_NUM_BANDS];
@@ -572,8 +572,6 @@ bool ath9k_htc_setpower(struct ath9k_htc_priv *priv,
 
 void ath9k_start_rfkill_poll(struct ath9k_htc_priv *priv);
 void ath9k_htc_rfkill_poll_state(struct ieee80211_hw *hw);
-void ath9k_htc_radio_enable(struct ieee80211_hw *hw);
-void ath9k_htc_radio_disable(struct ieee80211_hw *hw);
 
 #ifdef CONFIG_MAC80211_LEDS
 void ath9k_init_leds(struct ath9k_htc_priv *priv);
diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_beacon.c b/drivers/net/wireless/ath/ath9k/htc_drv_beacon.c
index 2eadffb7971..77d541feb91 100644
--- a/drivers/net/wireless/ath/ath9k/htc_drv_beacon.c
+++ b/drivers/net/wireless/ath/ath9k/htc_drv_beacon.c
@@ -207,9 +207,9 @@ static void ath9k_htc_beacon_config_ap(struct ath9k_htc_priv *priv,
         else
                 priv->ah->config.sw_beacon_response_time = MIN_SWBA_RESPONSE;
 
-        if (priv->op_flags & OP_TSF_RESET) {
+        if (test_bit(OP_TSF_RESET, &priv->op_flags)) {
                 ath9k_hw_reset_tsf(priv->ah);
-                priv->op_flags &= ~OP_TSF_RESET;
+                clear_bit(OP_TSF_RESET, &priv->op_flags);
         } else {
                 /*
                  * Pull nexttbtt forward to reflect the current TSF.
@@ -221,7 +221,7 @@ static void ath9k_htc_beacon_config_ap(struct ath9k_htc_priv *priv,
                 } while (nexttbtt < tsftu);
         }
 
-        if (priv->op_flags & OP_ENABLE_BEACON)
+        if (test_bit(OP_ENABLE_BEACON, &priv->op_flags))
                 imask |= ATH9K_INT_SWBA;
 
         ath_dbg(common, CONFIG,
@@ -269,7 +269,7 @@ static void ath9k_htc_beacon_config_adhoc(struct ath9k_htc_priv *priv,
         else
                 priv->ah->config.sw_beacon_response_time = MIN_SWBA_RESPONSE;
 
-        if (priv->op_flags & OP_ENABLE_BEACON)
+        if (test_bit(OP_ENABLE_BEACON, &priv->op_flags))
                 imask |= ATH9K_INT_SWBA;
 
         ath_dbg(common, CONFIG,
@@ -365,7 +365,7 @@ static void ath9k_htc_send_beacon(struct ath9k_htc_priv *priv,
         vif = priv->cur_beacon_conf.bslot[slot];
         avp = (struct ath9k_htc_vif *)vif->drv_priv;
 
-        if (unlikely(priv->op_flags & OP_SCANNING)) {
+        if (unlikely(test_bit(OP_SCANNING, &priv->op_flags))) {
                 spin_unlock_bh(&priv->beacon_lock);
                 return;
         }
diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_gpio.c b/drivers/net/wireless/ath/ath9k/htc_drv_gpio.c
index 1c10e2e5c23..07df279c8d4 100644
--- a/drivers/net/wireless/ath/ath9k/htc_drv_gpio.c
+++ b/drivers/net/wireless/ath/ath9k/htc_drv_gpio.c
@@ -37,17 +37,18 @@ static void ath_detect_bt_priority(struct ath9k_htc_priv *priv)
 
         if (time_after(jiffies, btcoex->bt_priority_time +
                         msecs_to_jiffies(ATH_BT_PRIORITY_TIME_THRESHOLD))) {
-                priv->op_flags &= ~(OP_BT_PRIORITY_DETECTED | OP_BT_SCAN);
+                clear_bit(OP_BT_PRIORITY_DETECTED, &priv->op_flags);
+                clear_bit(OP_BT_SCAN, &priv->op_flags);
                 /* Detect if colocated bt started scanning */
                 if (btcoex->bt_priority_cnt >= ATH_BT_CNT_SCAN_THRESHOLD) {
                         ath_dbg(ath9k_hw_common(ah), BTCOEX,
                                 "BT scan detected\n");
-                        priv->op_flags |= (OP_BT_SCAN |
-                                         OP_BT_PRIORITY_DETECTED);
+                        set_bit(OP_BT_PRIORITY_DETECTED, &priv->op_flags);
+                        set_bit(OP_BT_SCAN, &priv->op_flags);
                 } else if (btcoex->bt_priority_cnt >= ATH_BT_CNT_THRESHOLD) {
                         ath_dbg(ath9k_hw_common(ah), BTCOEX,
                                 "BT priority traffic detected\n");
-                        priv->op_flags |= OP_BT_PRIORITY_DETECTED;
+                        set_bit(OP_BT_PRIORITY_DETECTED, &priv->op_flags);
                 }
 
                 btcoex->bt_priority_cnt = 0;
@@ -67,26 +68,23 @@ static void ath_btcoex_period_work(struct work_struct *work)
         struct ath_btcoex *btcoex = &priv->btcoex;
         struct ath_common *common = ath9k_hw_common(priv->ah);
         u32 timer_period;
-        bool is_btscan;
         int ret;
 
         ath_detect_bt_priority(priv);
 
-        is_btscan = !!(priv->op_flags & OP_BT_SCAN);
-
         ret = ath9k_htc_update_cap_target(priv,
-                                  !!(priv->op_flags & OP_BT_PRIORITY_DETECTED));
+                          test_bit(OP_BT_PRIORITY_DETECTED, &priv->op_flags));
         if (ret) {
                 ath_err(common, "Unable to set BTCOEX parameters\n");
                 return;
         }
 
-        ath9k_hw_btcoex_bt_stomp(priv->ah, is_btscan ? ATH_BTCOEX_STOMP_ALL :
-                        btcoex->bt_stomp_type);
+        ath9k_hw_btcoex_bt_stomp(priv->ah, test_bit(OP_BT_SCAN, &priv->op_flags) ?
+                                 ATH_BTCOEX_STOMP_ALL : btcoex->bt_stomp_type);
 
         ath9k_hw_btcoex_enable(priv->ah);
-        timer_period = is_btscan ? btcoex->btscan_no_stomp :
-                btcoex->btcoex_no_stomp;
+        timer_period = test_bit(OP_BT_SCAN, &priv->op_flags) ?
+                btcoex->btscan_no_stomp : btcoex->btcoex_no_stomp;
         ieee80211_queue_delayed_work(priv->hw, &priv->duty_cycle_work,
                                      msecs_to_jiffies(timer_period));
         ieee80211_queue_delayed_work(priv->hw, &priv->coex_period_work,
@@ -104,14 +102,15 @@ static void ath_btcoex_duty_cycle_work(struct work_struct *work)
         struct ath_hw *ah = priv->ah;
         struct ath_btcoex *btcoex = &priv->btcoex;
         struct ath_common *common = ath9k_hw_common(ah);
-        bool is_btscan = priv->op_flags & OP_BT_SCAN;
 
         ath_dbg(common, BTCOEX, "time slice work for bt and wlan\n");
 
-        if (btcoex->bt_stomp_type == ATH_BTCOEX_STOMP_LOW || is_btscan)
+        if (btcoex->bt_stomp_type == ATH_BTCOEX_STOMP_LOW ||
+            test_bit(OP_BT_SCAN, &priv->op_flags))
                 ath9k_hw_btcoex_bt_stomp(ah, ATH_BTCOEX_STOMP_NONE);
         else if (btcoex->bt_stomp_type == ATH_BTCOEX_STOMP_ALL)
                 ath9k_hw_btcoex_bt_stomp(ah, ATH_BTCOEX_STOMP_LOW);
+
         ath9k_hw_btcoex_enable(priv->ah);
 }
 
@@ -141,7 +140,8 @@ static void ath_htc_resume_btcoex_work(struct ath9k_htc_priv *priv)
 
         btcoex->bt_priority_cnt = 0;
         btcoex->bt_priority_time = jiffies;
-        priv->op_flags &= ~(OP_BT_PRIORITY_DETECTED | OP_BT_SCAN);
+        clear_bit(OP_BT_PRIORITY_DETECTED, &priv->op_flags);
+        clear_bit(OP_BT_SCAN, &priv->op_flags);
         ieee80211_queue_delayed_work(priv->hw, &priv->coex_period_work, 0);
 }
 
@@ -310,95 +310,3 @@ void ath9k_start_rfkill_poll(struct ath9k_htc_priv *priv)
         if (priv->ah->caps.hw_caps & ATH9K_HW_CAP_RFSILENT)
                 wiphy_rfkill_start_polling(priv->hw->wiphy);
 }
-
-void ath9k_htc_radio_enable(struct ieee80211_hw *hw)
-{
-        struct ath9k_htc_priv *priv = hw->priv;
-        struct ath_hw *ah = priv->ah;
-        struct ath_common *common = ath9k_hw_common(ah);
-        int ret;
-        u8 cmd_rsp;
-
-        if (!ah->curchan)
-                ah->curchan = ath9k_cmn_get_curchannel(hw, ah);
-
-        /* Reset the HW */
-        ret = ath9k_hw_reset(ah, ah->curchan, ah->caldata, false);
-        if (ret) {
-                ath_err(common,
-                        "Unable to reset hardware; reset status %d (freq %u MHz)\n",
-                        ret, ah->curchan->channel);
-        }
-
-        ath9k_cmn_update_txpow(ah, priv->curtxpow, priv->txpowlimit,
-                               &priv->curtxpow);
-
-        /* Start RX */
-        WMI_CMD(WMI_START_RECV_CMDID);
-        ath9k_host_rx_init(priv);
-
-        /* Start TX */
-        htc_start(priv->htc);
-        spin_lock_bh(&priv->tx.tx_lock);
-        priv->tx.flags &= ~ATH9K_HTC_OP_TX_QUEUES_STOP;
-        spin_unlock_bh(&priv->tx.tx_lock);
-        ieee80211_wake_queues(hw);
-
-        WMI_CMD(WMI_ENABLE_INTR_CMDID);
-
-        /* Enable LED */
-        ath9k_hw_cfg_output(ah, ah->led_pin,
-                            AR_GPIO_OUTPUT_MUX_AS_OUTPUT);
-        ath9k_hw_set_gpio(ah, ah->led_pin, 0);
-}
-
-void ath9k_htc_radio_disable(struct ieee80211_hw *hw)
-{
-        struct ath9k_htc_priv *priv = hw->priv;
-        struct ath_hw *ah = priv->ah;
-        struct ath_common *common = ath9k_hw_common(ah);
-        int ret;
-        u8 cmd_rsp;
-
-        ath9k_htc_ps_wakeup(priv);
-
-        /* Disable LED */
-        ath9k_hw_set_gpio(ah, ah->led_pin, 1);
-        ath9k_hw_cfg_gpio_input(ah, ah->led_pin);
-
-        WMI_CMD(WMI_DISABLE_INTR_CMDID);
-
-        /* Stop TX */
-        ieee80211_stop_queues(hw);
-        ath9k_htc_tx_drain(priv);
-        WMI_CMD(WMI_DRAIN_TXQ_ALL_CMDID);
-
-        /* Stop RX */
-        WMI_CMD(WMI_STOP_RECV_CMDID);
-
-        /* Clear the WMI event queue */
-        ath9k_wmi_event_drain(priv);
-
-        /*
-         * The MIB counters have to be disabled here,
-         * since the target doesn't do it.
-         */
-        ath9k_hw_disable_mib_counters(ah);
-
-        if (!ah->curchan)
-                ah->curchan = ath9k_cmn_get_curchannel(hw, ah);
-
-        /* Reset the HW */
-        ret = ath9k_hw_reset(ah, ah->curchan, ah->caldata, false);
-        if (ret) {
-                ath_err(common,
-                        "Unable to reset hardware; reset status %d (freq %u MHz)\n",
-                        ret, ah->curchan->channel);
-        }
-
-        /* Disable the PHY */
-        ath9k_hw_phy_disable(ah);
-
-        ath9k_htc_ps_restore(priv);
-        ath9k_htc_setpower(priv, ATH9K_PM_FULL_SLEEP);
-}
diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_init.c b/drivers/net/wireless/ath/ath9k/htc_drv_init.c
index 25213d521bc..a035a380d66 100644
--- a/drivers/net/wireless/ath/ath9k/htc_drv_init.c
+++ b/drivers/net/wireless/ath/ath9k/htc_drv_init.c
@@ -611,7 +611,7 @@ static int ath9k_init_priv(struct ath9k_htc_priv *priv,
         struct ath_common *common;
         int i, ret = 0, csz = 0;
 
-        priv->op_flags |= OP_INVALID;
+        set_bit(OP_INVALID, &priv->op_flags);
 
         ah = kzalloc(sizeof(struct ath_hw), GFP_KERNEL);
         if (!ah)
@@ -718,7 +718,7 @@ static void ath9k_set_hw_capab(struct ath9k_htc_priv *priv,
 
         hw->queues = 4;
         hw->channel_change_time = 5000;
-        hw->max_listen_interval = 10;
+        hw->max_listen_interval = 1;
 
         hw->vif_data_size = sizeof(struct ath9k_htc_vif);
         hw->sta_data_size = sizeof(struct ath9k_htc_sta);
diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_main.c b/drivers/net/wireless/ath/ath9k/htc_drv_main.c
index abbd6effd60..374c32ed905 100644
--- a/drivers/net/wireless/ath/ath9k/htc_drv_main.c
+++ b/drivers/net/wireless/ath/ath9k/htc_drv_main.c
@@ -75,14 +75,19 @@ unlock:
 
 void ath9k_htc_ps_restore(struct ath9k_htc_priv *priv)
 {
+        bool reset;
+
         mutex_lock(&priv->htc_pm_lock);
         if (--priv->ps_usecount != 0)
                 goto unlock;
 
-        if (priv->ps_idle)
+        if (priv->ps_idle) {
+                ath9k_hw_setrxabort(priv->ah, true);
+                ath9k_hw_stopdmarecv(priv->ah, &reset);
                 ath9k_hw_setpower(priv->ah, ATH9K_PM_FULL_SLEEP);
-        else if (priv->ps_enabled)
+        } else if (priv->ps_enabled) {
                 ath9k_hw_setpower(priv->ah, ATH9K_PM_NETWORK_SLEEP);
+        }
 
 unlock:
         mutex_unlock(&priv->htc_pm_lock);
@@ -250,7 +255,7 @@ static int ath9k_htc_set_channel(struct ath9k_htc_priv *priv,
         u8 cmd_rsp;
         int ret;
 
-        if (priv->op_flags & OP_INVALID)
+        if (test_bit(OP_INVALID, &priv->op_flags))
                 return -EIO;
 
         fastcc = !!(hw->conf.flags & IEEE80211_CONF_OFFCHANNEL);
@@ -304,7 +309,7 @@ static int ath9k_htc_set_channel(struct ath9k_htc_priv *priv,
 
         htc_start(priv->htc);
 
-        if (!(priv->op_flags & OP_SCANNING) &&
+        if (!test_bit(OP_SCANNING, &priv->op_flags) &&
             !(hw->conf.flags & IEEE80211_CONF_OFFCHANNEL))
                 ath9k_htc_vif_reconfig(priv);
 
@@ -750,7 +755,7 @@ void ath9k_htc_start_ani(struct ath9k_htc_priv *priv)
         common->ani.shortcal_timer = timestamp;
         common->ani.checkani_timer = timestamp;
 
-        priv->op_flags |= OP_ANI_RUNNING;
+        set_bit(OP_ANI_RUNNING, &priv->op_flags);
 
         ieee80211_queue_delayed_work(common->hw, &priv->ani_work,
                                      msecs_to_jiffies(ATH_ANI_POLLINTERVAL));
@@ -759,7 +764,7 @@ void ath9k_htc_start_ani(struct ath9k_htc_priv *priv)
 void ath9k_htc_stop_ani(struct ath9k_htc_priv *priv)
 {
         cancel_delayed_work_sync(&priv->ani_work);
-        priv->op_flags &= ~OP_ANI_RUNNING;
+        clear_bit(OP_ANI_RUNNING, &priv->op_flags);
 }
 
 void ath9k_htc_ani_work(struct work_struct *work)
@@ -944,7 +949,7 @@ static int ath9k_htc_start(struct ieee80211_hw *hw)
                 ath_dbg(common, CONFIG,
                         "Failed to update capability in target\n");
 
-        priv->op_flags &= ~OP_INVALID;
+        clear_bit(OP_INVALID, &priv->op_flags);
         htc_start(priv->htc);
 
         spin_lock_bh(&priv->tx.tx_lock);
@@ -973,7 +978,7 @@ static void ath9k_htc_stop(struct ieee80211_hw *hw)
 
         mutex_lock(&priv->mutex);
 
-        if (priv->op_flags & OP_INVALID) {
+        if (test_bit(OP_INVALID, &priv->op_flags)) {
                 ath_dbg(common, ANY, "Device not present\n");
                 mutex_unlock(&priv->mutex);
                 return;
@@ -1015,7 +1020,7 @@ static void ath9k_htc_stop(struct ieee80211_hw *hw)
         ath9k_htc_ps_restore(priv);
         ath9k_htc_setpower(priv, ATH9K_PM_FULL_SLEEP);
 
-        priv->op_flags |= OP_INVALID;
+        set_bit(OP_INVALID, &priv->op_flags);
 
         ath_dbg(common, CONFIG, "Driver halt\n");
         mutex_unlock(&priv->mutex);
@@ -1105,7 +1110,7 @@ static int ath9k_htc_add_interface(struct ieee80211_hw *hw,
         ath9k_htc_set_opmode(priv);
 
         if ((priv->ah->opmode == NL80211_IFTYPE_AP) &&
-            !(priv->op_flags & OP_ANI_RUNNING)) {
+            !test_bit(OP_ANI_RUNNING, &priv->op_flags)) {
                 ath9k_hw_set_tsfadjust(priv->ah, 1);
                 ath9k_htc_start_ani(priv);
         }
@@ -1178,24 +1183,20 @@ static int ath9k_htc_config(struct ieee80211_hw *hw, u32 changed)
         struct ath9k_htc_priv *priv = hw->priv;
         struct ath_common *common = ath9k_hw_common(priv->ah);
         struct ieee80211_conf *conf = &hw->conf;
+        bool chip_reset = false;
+        int ret = 0;
 
         mutex_lock(&priv->mutex);
+        ath9k_htc_ps_wakeup(priv);
 
         if (changed & IEEE80211_CONF_CHANGE_IDLE) {
-                bool enable_radio = false;
-                bool idle = !!(conf->flags & IEEE80211_CONF_IDLE);
-
                 mutex_lock(&priv->htc_pm_lock);
-                if (!idle && priv->ps_idle)
-                        enable_radio = true;
-                priv->ps_idle = idle;
-                mutex_unlock(&priv->htc_pm_lock);
 
-                if (enable_radio) {
-                        ath_dbg(common, CONFIG, "not-idle: enabling radio\n");
-                        ath9k_htc_setpower(priv, ATH9K_PM_AWAKE);
-                        ath9k_htc_radio_enable(hw);
-                }
+                priv->ps_idle = !!(conf->flags & IEEE80211_CONF_IDLE);
+                if (priv->ps_idle)
+                        chip_reset = true;
+
+                mutex_unlock(&priv->htc_pm_lock);
         }
 
         /*
@@ -1210,7 +1211,7 @@ static int ath9k_htc_config(struct ieee80211_hw *hw, u32 changed)
                         ath9k_htc_remove_monitor_interface(priv);
         }
 
-        if (changed & IEEE80211_CONF_CHANGE_CHANNEL) {
+        if ((changed & IEEE80211_CONF_CHANGE_CHANNEL) || chip_reset) {
                 struct ieee80211_channel *curchan = hw->conf.channel;
                 int pos = curchan->hw_value;
 
@@ -1223,8 +1224,8 @@ static int ath9k_htc_config(struct ieee80211_hw *hw, u32 changed)
 
                 if (ath9k_htc_set_channel(priv, hw, &priv->ah->channels[pos]) < 0) {
                         ath_err(common, "Unable to set channel\n");
-                        mutex_unlock(&priv->mutex);
-                        return -EINVAL;
+                        ret = -EINVAL;
+                        goto out;
                 }
 
         }
@@ -1246,21 +1247,10 @@ static int ath9k_htc_config(struct ieee80211_hw *hw, u32 changed)
                                        priv->txpowlimit, &priv->curtxpow);
         }
 
-        if (changed & IEEE80211_CONF_CHANGE_IDLE) {
-                mutex_lock(&priv->htc_pm_lock);
-                if (!priv->ps_idle) {
-                        mutex_unlock(&priv->htc_pm_lock);
-                        goto out;
-                }
-                mutex_unlock(&priv->htc_pm_lock);
-
-                ath_dbg(common, CONFIG, "idle: disabling radio\n");
-                ath9k_htc_radio_disable(hw);
-        }
-
 out:
+        ath9k_htc_ps_restore(priv);
         mutex_unlock(&priv->mutex);
-        return 0;
+        return ret;
 }
 
 #define SUPPORTED_FILTERS                       \
@@ -1285,7 +1275,7 @@ static void ath9k_htc_configure_filter(struct ieee80211_hw *hw,
         changed_flags &= SUPPORTED_FILTERS;
         *total_flags &= SUPPORTED_FILTERS;
 
-        if (priv->op_flags & OP_INVALID) {
+        if (test_bit(OP_INVALID, &priv->op_flags)) {
                 ath_dbg(ath9k_hw_common(priv->ah), ANY,
                         "Unable to configure filter on invalid state\n");
                 mutex_unlock(&priv->mutex);
@@ -1516,7 +1506,7 @@ static void ath9k_htc_bss_info_changed(struct ieee80211_hw *hw,
                 ath_dbg(common, CONFIG, "Beacon enabled for BSS: %pM\n",
                         bss_conf->bssid);
                 ath9k_htc_set_tsfadjust(priv, vif);
-                priv->op_flags |= OP_ENABLE_BEACON;
+                set_bit(OP_ENABLE_BEACON, &priv->op_flags);
                 ath9k_htc_beacon_config(priv, vif);
         }
 
@@ -1529,7 +1519,7 @@ static void ath9k_htc_bss_info_changed(struct ieee80211_hw *hw,
                         ath_dbg(common, CONFIG,
                                 "Beacon disabled for BSS: %pM\n",
                                 bss_conf->bssid);
-                        priv->op_flags &= ~OP_ENABLE_BEACON;
+                        clear_bit(OP_ENABLE_BEACON, &priv->op_flags);
                         ath9k_htc_beacon_config(priv, vif);
                 }
         }
@@ -1542,7 +1532,7 @@ static void ath9k_htc_bss_info_changed(struct ieee80211_hw *hw,
                     (priv->nvifs == 1) &&
                     (priv->num_ap_vif == 1) &&
                     (vif->type == NL80211_IFTYPE_AP)) {
-                        priv->op_flags |= OP_TSF_RESET;
+                        set_bit(OP_TSF_RESET, &priv->op_flags);
                 }
                 ath_dbg(common, CONFIG,
                         "Beacon interval changed for BSS: %pM\n",
@@ -1654,7 +1644,7 @@ static void ath9k_htc_sw_scan_start(struct ieee80211_hw *hw)
 
         mutex_lock(&priv->mutex);
         spin_lock_bh(&priv->beacon_lock);
-        priv->op_flags |= OP_SCANNING;
+        set_bit(OP_SCANNING, &priv->op_flags);
         spin_unlock_bh(&priv->beacon_lock);
         cancel_work_sync(&priv->ps_work);
         ath9k_htc_stop_ani(priv);
@@ -1667,7 +1657,7 @@ static void ath9k_htc_sw_scan_complete(struct ieee80211_hw *hw)
 
         mutex_lock(&priv->mutex);
         spin_lock_bh(&priv->beacon_lock);
-        priv->op_flags &= ~OP_SCANNING;
+        clear_bit(OP_SCANNING, &priv->op_flags);
         spin_unlock_bh(&priv->beacon_lock);
         ath9k_htc_ps_wakeup(priv);
         ath9k_htc_vif_reconfig(priv);
diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_txrx.c b/drivers/net/wireless/ath/ath9k/htc_drv_txrx.c
index 3e40a646151..47e61d0da33 100644
--- a/drivers/net/wireless/ath/ath9k/htc_drv_txrx.c
+++ b/drivers/net/wireless/ath/ath9k/htc_drv_txrx.c
@@ -916,7 +916,7 @@ void ath9k_host_rx_init(struct ath9k_htc_priv *priv)
 {
         ath9k_hw_rxena(priv->ah);
         ath9k_htc_opmode_init(priv);
-        ath9k_hw_startpcureceive(priv->ah, (priv->op_flags & OP_SCANNING));
+        ath9k_hw_startpcureceive(priv->ah, test_bit(OP_SCANNING, &priv->op_flags));
         priv->rx.last_rssi = ATH_RSSI_DUMMY_MARKER;
 }
 
diff --git a/drivers/net/wireless/ath/ath9k/hw.c b/drivers/net/wireless/ath/ath9k/hw.c
index 995ca8e1302..ebfb2a3c645 100644
--- a/drivers/net/wireless/ath/ath9k/hw.c
+++ b/drivers/net/wireless/ath/ath9k/hw.c
@@ -390,14 +390,6 @@ static void ath9k_hw_disablepcie(struct ath_hw *ah)
         REG_WRITE(ah, AR_PCIE_SERDES2, 0x00000000);
 }
 
-static void ath9k_hw_aspm_init(struct ath_hw *ah)
-{
-        struct ath_common *common = ath9k_hw_common(ah);
-
-        if (common->bus_ops->aspm_init)
-                common->bus_ops->aspm_init(common);
-}
-
 /* This should work for all families including legacy */
 static bool ath9k_hw_chip_test(struct ath_hw *ah)
 {
@@ -693,9 +685,6 @@ static int __ath9k_hw_init(struct ath_hw *ah)
         if (r)
                 return r;
 
-        if (ah->is_pciexpress)
-                ath9k_hw_aspm_init(ah);
-
         r = ath9k_hw_init_macaddr(ah);
         if (r) {
                 ath_err(common, "Failed to initialize MAC address\n");
@@ -1371,6 +1360,9 @@ static bool ath9k_hw_set_reset(struct ath_hw *ah, int type)
                 }
         }
 
+        if (ath9k_hw_mci_is_enabled(ah))
+                ar9003_mci_check_gpm_offset(ah);
+
         REG_WRITE(ah, AR_RTC_RC, rst_flags);
 
         REGWRITE_BUFFER_FLUSH(ah);
@@ -1455,9 +1447,6 @@ static bool ath9k_hw_set_reset_reg(struct ath_hw *ah, u32 type)
                 break;
         }
 
-        if (ah->caps.hw_caps & ATH9K_HW_CAP_MCI)
-                REG_WRITE(ah, AR_RTC_KEEP_AWAKE, 0x2);
-
         return ret;
 }
 
@@ -1733,8 +1722,8 @@ static int ath9k_hw_do_fastcc(struct ath_hw *ah, struct ath9k_channel *chan)
         ath9k_hw_loadnf(ah, ah->curchan);
         ath9k_hw_start_nfcal(ah, true);
 
-        if ((ah->caps.hw_caps & ATH9K_HW_CAP_MCI) && ar9003_mci_is_ready(ah))
-                ar9003_mci_2g5g_switch(ah, true);
+        if (ath9k_hw_mci_is_enabled(ah))
+                ar9003_mci_2g5g_switch(ah, false);
 
         if (AR_SREV_9271(ah))
                 ar9002_hw_load_ani_reg(ah, chan);
@@ -1754,10 +1743,9 @@ int ath9k_hw_reset(struct ath_hw *ah, struct ath9k_channel *chan,
         u64 tsf = 0;
         int i, r;
         bool start_mci_reset = false;
-        bool mci = !!(ah->caps.hw_caps & ATH9K_HW_CAP_MCI);
         bool save_fullsleep = ah->chip_fullsleep;
 
-        if (mci) {
+        if (ath9k_hw_mci_is_enabled(ah)) {
                 start_mci_reset = ar9003_mci_start_reset(ah, chan);
                 if (start_mci_reset)
                         return 0;
@@ -1786,7 +1774,7 @@ int ath9k_hw_reset(struct ath_hw *ah, struct ath9k_channel *chan,
                         return r;
         }
 
-        if (mci)
+        if (ath9k_hw_mci_is_enabled(ah))
                 ar9003_mci_stop_bt(ah, save_fullsleep);
 
         saveDefAntenna = REG_READ(ah, AR_DEF_ANTENNA);
@@ -1844,7 +1832,7 @@ int ath9k_hw_reset(struct ath_hw *ah, struct ath9k_channel *chan,
         if (r)
                 return r;
 
-        if (mci)
+        if (ath9k_hw_mci_is_enabled(ah))
                 ar9003_mci_reset(ah, false, IS_CHAN_2GHZ(chan), save_fullsleep);
 
         /*
@@ -1939,7 +1927,8 @@ int ath9k_hw_reset(struct ath_hw *ah, struct ath9k_channel *chan,
 
         ath9k_hw_set_dma(ah);
 
-        REG_WRITE(ah, AR_OBS, 8);
+        if (!ath9k_hw_mci_is_enabled(ah))
+                REG_WRITE(ah, AR_OBS, 8);
 
         if (ah->config.rx_intr_mitigation) {
                 REG_RMW_FIELD(ah, AR_RIMT, AR_RIMT_LAST, 500);
@@ -1963,7 +1952,7 @@ int ath9k_hw_reset(struct ath_hw *ah, struct ath9k_channel *chan,
         ath9k_hw_loadnf(ah, chan);
         ath9k_hw_start_nfcal(ah, true);
 
-        if (mci && ar9003_mci_end_reset(ah, chan, caldata))
+        if (ath9k_hw_mci_is_enabled(ah) && ar9003_mci_end_reset(ah, chan, caldata))
                 return -EIO;
 
         ENABLE_REGWRITE_BUFFER(ah);
@@ -2008,7 +1997,7 @@ int ath9k_hw_reset(struct ath_hw *ah, struct ath9k_channel *chan,
         if (ath9k_hw_btcoex_is_enabled(ah))
                 ath9k_hw_btcoex_enable(ah);
 
-        if (mci)
+        if (ath9k_hw_mci_is_enabled(ah))
                 ar9003_mci_check_bt(ah);
 
         if (AR_SREV_9300_20_OR_LATER(ah)) {
@@ -2031,39 +2020,35 @@ EXPORT_SYMBOL(ath9k_hw_reset);
  * Notify Power Mgt is disabled in self-generated frames.
  * If requested, force chip to sleep.
  */
-static void ath9k_set_power_sleep(struct ath_hw *ah, int setChip)
+static void ath9k_set_power_sleep(struct ath_hw *ah)
 {
         REG_SET_BIT(ah, AR_STA_ID1, AR_STA_ID1_PWR_SAV);
-        if (setChip) {
-                if (AR_SREV_9462(ah)) {
-                        REG_WRITE(ah, AR_TIMER_MODE,
-                                  REG_READ(ah, AR_TIMER_MODE) & 0xFFFFFF00);
-                        REG_WRITE(ah, AR_NDP2_TIMER_MODE, REG_READ(ah,
-                                  AR_NDP2_TIMER_MODE) & 0xFFFFFF00);
-                        REG_WRITE(ah, AR_SLP32_INC,
-                                  REG_READ(ah, AR_SLP32_INC) & 0xFFF00000);
-                        /* xxx Required for WLAN only case ? */
-                        REG_WRITE(ah, AR_MCI_INTERRUPT_RX_MSG_EN, 0);
-                        udelay(100);
-                }
 
-                /*
-                 * Clear the RTC force wake bit to allow the
-                 * mac to go to sleep.
-                 */
-                REG_CLR_BIT(ah, AR_RTC_FORCE_WAKE, AR_RTC_FORCE_WAKE_EN);
+        if (AR_SREV_9462(ah)) {
+                REG_CLR_BIT(ah, AR_TIMER_MODE, 0xff);
+                REG_CLR_BIT(ah, AR_NDP2_TIMER_MODE, 0xff);
+                REG_CLR_BIT(ah, AR_SLP32_INC, 0xfffff);
+                /* xxx Required for WLAN only case ? */
+                REG_WRITE(ah, AR_MCI_INTERRUPT_RX_MSG_EN, 0);
+                udelay(100);
+        }
 
-                if (AR_SREV_9462(ah))
-                        udelay(100);
+        /*
+         * Clear the RTC force wake bit to allow the
+         * mac to go to sleep.
+         */
+        REG_CLR_BIT(ah, AR_RTC_FORCE_WAKE, AR_RTC_FORCE_WAKE_EN);
 
-                if (!AR_SREV_9100(ah) && !AR_SREV_9300_20_OR_LATER(ah))
-                        REG_WRITE(ah, AR_RC, AR_RC_AHB | AR_RC_HOSTIF);
+        if (ath9k_hw_mci_is_enabled(ah))
+                udelay(100);
 
-                /* Shutdown chip. Active low */
-                if (!AR_SREV_5416(ah) && !AR_SREV_9271(ah)) {
-                        REG_CLR_BIT(ah, AR_RTC_RESET, AR_RTC_RESET_EN);
-                        udelay(2);
-                }
+        if (!AR_SREV_9100(ah) && !AR_SREV_9300_20_OR_LATER(ah))
+                REG_WRITE(ah, AR_RC, AR_RC_AHB | AR_RC_HOSTIF);
+
+        /* Shutdown chip. Active low */
+        if (!AR_SREV_5416(ah) && !AR_SREV_9271(ah)) {
+                REG_CLR_BIT(ah, AR_RTC_RESET, AR_RTC_RESET_EN);
+                udelay(2);
         }
 
         /* Clear Bit 14 of AR_WA after putting chip into Full Sleep mode. */
@@ -2076,44 +2061,38 @@ static void ath9k_set_power_sleep(struct ath_hw *ah, int setChip)
  * frames. If request, set power mode of chip to
  * auto/normal.  Duration in units of 128us (1/8 TU).
  */
-static void ath9k_set_power_network_sleep(struct ath_hw *ah, int setChip)
+static void ath9k_set_power_network_sleep(struct ath_hw *ah)
 {
-        u32 val;
+        struct ath9k_hw_capabilities *pCap = &ah->caps;
 
         REG_SET_BIT(ah, AR_STA_ID1, AR_STA_ID1_PWR_SAV);
-        if (setChip) {
-                struct ath9k_hw_capabilities *pCap = &ah->caps;
 
-                if (!(pCap->hw_caps & ATH9K_HW_CAP_AUTOSLEEP)) {
-                        /* Set WakeOnInterrupt bit; clear ForceWake bit */
-                        REG_WRITE(ah, AR_RTC_FORCE_WAKE,
-                                  AR_RTC_FORCE_WAKE_ON_INT);
-                } else {
+        if (!(pCap->hw_caps & ATH9K_HW_CAP_AUTOSLEEP)) {
+                /* Set WakeOnInterrupt bit; clear ForceWake bit */
+                REG_WRITE(ah, AR_RTC_FORCE_WAKE,
+                          AR_RTC_FORCE_WAKE_ON_INT);
+        } else {
 
-                        /* When chip goes into network sleep, it could be waken
-                         * up by MCI_INT interrupt caused by BT's HW messages
-                         * (LNA_xxx, CONT_xxx) which chould be in a very fast
-                         * rate (~100us). This will cause chip to leave and
-                         * re-enter network sleep mode frequently, which in
-                         * consequence will have WLAN MCI HW to generate lots of
-                         * SYS_WAKING and SYS_SLEEPING messages which will make
-                         * BT CPU to busy to process.
-                         */
-                        if (AR_SREV_9462(ah)) {
-                                val = REG_READ(ah, AR_MCI_INTERRUPT_RX_MSG_EN) &
-                                        ~AR_MCI_INTERRUPT_RX_HW_MSG_MASK;
-                                REG_WRITE(ah, AR_MCI_INTERRUPT_RX_MSG_EN, val);
-                        }
-                        /*
-                         * Clear the RTC force wake bit to allow the
-                         * mac to go to sleep.
-                         */
-                        REG_CLR_BIT(ah, AR_RTC_FORCE_WAKE,
-                                    AR_RTC_FORCE_WAKE_EN);
-
-                        if (AR_SREV_9462(ah))
-                                udelay(30);
-                }
+                /* When chip goes into network sleep, it could be waken
+                 * up by MCI_INT interrupt caused by BT's HW messages
+                 * (LNA_xxx, CONT_xxx) which chould be in a very fast
+                 * rate (~100us). This will cause chip to leave and
+                 * re-enter network sleep mode frequently, which in
+                 * consequence will have WLAN MCI HW to generate lots of
+                 * SYS_WAKING and SYS_SLEEPING messages which will make
+                 * BT CPU to busy to process.
+                 */
+                if (ath9k_hw_mci_is_enabled(ah))
+                        REG_CLR_BIT(ah, AR_MCI_INTERRUPT_RX_MSG_EN,
+                                    AR_MCI_INTERRUPT_RX_HW_MSG_MASK);
+                /*
+                 * Clear the RTC force wake bit to allow the
+                 * mac to go to sleep.
+                 */
+                REG_CLR_BIT(ah, AR_RTC_FORCE_WAKE, AR_RTC_FORCE_WAKE_EN);
+
+                if (ath9k_hw_mci_is_enabled(ah))
+                        udelay(30);
         }
 
         /* Clear Bit 14 of AR_WA after putting chip into Net Sleep mode. */
@@ -2121,7 +2100,7 @@ static void ath9k_set_power_network_sleep(struct ath_hw *ah, int setChip)
                 REG_WRITE(ah, AR_WA, ah->WARegVal & ~AR_WA_D3_L1_DISABLE);
 }
 
-static bool ath9k_hw_set_power_awake(struct ath_hw *ah, int setChip)
+static bool ath9k_hw_set_power_awake(struct ath_hw *ah)
 {
         u32 val;
         int i;
@@ -2132,37 +2111,38 @@ static bool ath9k_hw_set_power_awake(struct ath_hw *ah, int setChip)
                 udelay(10);
         }
 
-        if (setChip) {
-                if ((REG_READ(ah, AR_RTC_STATUS) &
-                     AR_RTC_STATUS_M) == AR_RTC_STATUS_SHUTDOWN) {
-                        if (!ath9k_hw_set_reset_reg(ah, ATH9K_RESET_POWER_ON)) {
-                                return false;
-                        }
-                        if (!AR_SREV_9300_20_OR_LATER(ah))
-                                ath9k_hw_init_pll(ah, NULL);
+        if ((REG_READ(ah, AR_RTC_STATUS) &
+             AR_RTC_STATUS_M) == AR_RTC_STATUS_SHUTDOWN) {
+                if (!ath9k_hw_set_reset_reg(ah, ATH9K_RESET_POWER_ON)) {
+                        return false;
                 }
-                if (AR_SREV_9100(ah))
-                        REG_SET_BIT(ah, AR_RTC_RESET,
-                                    AR_RTC_RESET_EN);
+                if (!AR_SREV_9300_20_OR_LATER(ah))
+                        ath9k_hw_init_pll(ah, NULL);
+        }
+        if (AR_SREV_9100(ah))
+                REG_SET_BIT(ah, AR_RTC_RESET,
+                            AR_RTC_RESET_EN);
 
+        REG_SET_BIT(ah, AR_RTC_FORCE_WAKE,
+                    AR_RTC_FORCE_WAKE_EN);
+        udelay(50);
+
+        if (ath9k_hw_mci_is_enabled(ah))
+                ar9003_mci_set_power_awake(ah);
+
+        for (i = POWER_UP_TIME / 50; i > 0; i--) {
+                val = REG_READ(ah, AR_RTC_STATUS) & AR_RTC_STATUS_M;
+                if (val == AR_RTC_STATUS_ON)
+                        break;
+                udelay(50);
                 REG_SET_BIT(ah, AR_RTC_FORCE_WAKE,
                             AR_RTC_FORCE_WAKE_EN);
-                udelay(50);
-
-                for (i = POWER_UP_TIME / 50; i > 0; i--) {
-                        val = REG_READ(ah, AR_RTC_STATUS) & AR_RTC_STATUS_M;
-                        if (val == AR_RTC_STATUS_ON)
-                                break;
-                        udelay(50);
-                        REG_SET_BIT(ah, AR_RTC_FORCE_WAKE,
-                                    AR_RTC_FORCE_WAKE_EN);
-                }
-                if (i == 0) {
-                        ath_err(ath9k_hw_common(ah),
-                                "Failed to wakeup in %uus\n",
-                                POWER_UP_TIME / 20);
-                        return false;
-                }
+        }
+        if (i == 0) {
+                ath_err(ath9k_hw_common(ah),
+                        "Failed to wakeup in %uus\n",
+                        POWER_UP_TIME / 20);
+                return false;
         }
 
         REG_CLR_BIT(ah, AR_STA_ID1, AR_STA_ID1_PWR_SAV);
@@ -2173,7 +2153,7 @@ static bool ath9k_hw_set_power_awake(struct ath_hw *ah, int setChip)
 bool ath9k_hw_setpower(struct ath_hw *ah, enum ath9k_power_mode mode)
 {
         struct ath_common *common = ath9k_hw_common(ah);
-        int status = true, setChip = true;
+        int status = true;
         static const char *modes[] = {
                 "AWAKE",
                 "FULL-SLEEP",
@@ -2189,25 +2169,17 @@ bool ath9k_hw_setpower(struct ath_hw *ah, enum ath9k_power_mode mode)
 
         switch (mode) {
         case ATH9K_PM_AWAKE:
-                status = ath9k_hw_set_power_awake(ah, setChip);
-
-                if (ah->caps.hw_caps & ATH9K_HW_CAP_MCI)
-                        REG_WRITE(ah, AR_RTC_KEEP_AWAKE, 0x2);
-
+                status = ath9k_hw_set_power_awake(ah);
                 break;
         case ATH9K_PM_FULL_SLEEP:
-                if (ah->caps.hw_caps & ATH9K_HW_CAP_MCI)
+                if (ath9k_hw_mci_is_enabled(ah))
                         ar9003_mci_set_full_sleep(ah);
 
-                ath9k_set_power_sleep(ah, setChip);
+                ath9k_set_power_sleep(ah);
                 ah->chip_fullsleep = true;
                 break;
         case ATH9K_PM_NETWORK_SLEEP:
-
-                if (ah->caps.hw_caps & ATH9K_HW_CAP_MCI)
-                        REG_WRITE(ah, AR_RTC_KEEP_AWAKE, 0x2);
-
-                ath9k_set_power_network_sleep(ah, setChip);
+                ath9k_set_power_network_sleep(ah);
                 break;
         default:
                 ath_err(common, "Unknown power mode %u\n", mode);
@@ -2777,6 +2749,9 @@ EXPORT_SYMBOL(ath9k_hw_setrxfilter);
 
 bool ath9k_hw_phy_disable(struct ath_hw *ah)
 {
+        if (ath9k_hw_mci_is_enabled(ah))
+                ar9003_mci_bt_gain_ctrl(ah);
+
         if (!ath9k_hw_set_reset_reg(ah, ATH9K_RESET_WARM))
                 return false;
 
diff --git a/drivers/net/wireless/ath/ath9k/hw.h b/drivers/net/wireless/ath/ath9k/hw.h
index b620c557c2a..94096607cbd 100644
--- a/drivers/net/wireless/ath/ath9k/hw.h
+++ b/drivers/net/wireless/ath/ath9k/hw.h
@@ -824,7 +824,6 @@ struct ath_hw {
         struct ar5416IniArray ini_japan2484;
         struct ar5416IniArray iniModes_9271_ANI_reg;
         struct ar5416IniArray ini_radio_post_sys2ant;
-        struct ar5416IniArray ini_BTCOEX_MAX_TXPWR;
 
         struct ar5416IniArray iniMac[ATH_INI_NUM_SPLIT];
         struct ar5416IniArray iniBB[ATH_INI_NUM_SPLIT];
@@ -1020,16 +1019,8 @@ void ar9002_hw_attach_ops(struct ath_hw *ah);
 void ar9003_hw_attach_ops(struct ath_hw *ah);
 
 void ar9002_hw_load_ani_reg(struct ath_hw *ah, struct ath9k_channel *chan);
-/*
- * ANI work can be shared between all families but a next
- * generation implementation of ANI will be used only for AR9003 only
- * for now as the other families still need to be tested with the same
- * next generation ANI. Feel free to start testing it though for the
- * older families (AR5008, AR9001, AR9002) by using modparam_force_new_ani.
- */
-extern int modparam_force_new_ani;
+
 void ath9k_ani_reset(struct ath_hw *ah, bool is_scanning);
-void ath9k_hw_proc_mib_event(struct ath_hw *ah);
 void ath9k_hw_ani_monitor(struct ath_hw *ah, struct ath9k_channel *chan);
 
 #ifdef CONFIG_ATH9K_BTCOEX_SUPPORT
@@ -1037,6 +1028,12 @@ static inline bool ath9k_hw_btcoex_is_enabled(struct ath_hw *ah)
 {
         return ah->btcoex_hw.enabled;
 }
+static inline bool ath9k_hw_mci_is_enabled(struct ath_hw *ah)
+{
+        return ah->common.btcoex_enabled &&
+               (ah->caps.hw_caps & ATH9K_HW_CAP_MCI);
+
+}
 void ath9k_hw_btcoex_enable(struct ath_hw *ah);
 static inline enum ath_btcoex_scheme
 ath9k_hw_get_btcoex_scheme(struct ath_hw *ah)
@@ -1048,6 +1045,10 @@ static inline bool ath9k_hw_btcoex_is_enabled(struct ath_hw *ah)
 {
         return false;
 }
+static inline bool ath9k_hw_mci_is_enabled(struct ath_hw *ah)
+{
+        return false;
+}
 static inline void ath9k_hw_btcoex_enable(struct ath_hw *ah)
 {
 }
diff --git a/drivers/net/wireless/ath/ath9k/init.c b/drivers/net/wireless/ath/ath9k/init.c
index dee9e092449..9dfce1a69c7 100644
--- a/drivers/net/wireless/ath/ath9k/init.c
+++ b/drivers/net/wireless/ath/ath9k/init.c
@@ -489,6 +489,7 @@ static void ath9k_init_misc(struct ath_softc *sc)
 
         setup_timer(&common->ani.timer, ath_ani_calibrate, (unsigned long)sc);
 
+        sc->last_rssi = ATH_RSSI_DUMMY_MARKER;
         sc->config.txpowlimit = ATH_TXPOWER_MAX;
         memcpy(common->bssidmask, ath_bcast_mac, ETH_ALEN);
         sc->beacon.slottime = ATH9K_SLOT_TIME_9;
@@ -560,6 +561,12 @@ static int ath9k_init_softc(u16 devid, struct ath_softc *sc,
         tasklet_init(&sc->bcon_tasklet, ath_beacon_tasklet,
                      (unsigned long)sc);
 
+        INIT_WORK(&sc->hw_reset_work, ath_reset_work);
+        INIT_WORK(&sc->hw_check_work, ath_hw_check);
+        INIT_WORK(&sc->paprd_work, ath_paprd_calibrate);
+        INIT_DELAYED_WORK(&sc->hw_pll_work, ath_hw_pll_work);
+        setup_timer(&sc->rx_poll_timer, ath_rx_poll, (unsigned long)sc);
+
         /*
          * Cache line size is used to size and align various
          * structures used to communicate with the hardware.
@@ -590,6 +597,9 @@ static int ath9k_init_softc(u16 devid, struct ath_softc *sc,
         ath9k_cmn_init_crypto(sc->sc_ah);
         ath9k_init_misc(sc);
 
+        if (common->bus_ops->aspm_init)
+                common->bus_ops->aspm_init(common);
+
         return 0;
 
 err_btcoex:
@@ -782,11 +792,6 @@ int ath9k_init_device(u16 devid, struct ath_softc *sc,
                 ARRAY_SIZE(ath9k_tpt_blink));
 #endif
 
-        INIT_WORK(&sc->hw_reset_work, ath_reset_work);
-        INIT_WORK(&sc->hw_check_work, ath_hw_check);
-        INIT_WORK(&sc->paprd_work, ath_paprd_calibrate);
-        INIT_DELAYED_WORK(&sc->hw_pll_work, ath_hw_pll_work);
-
         /* Register with mac80211 */
         error = ieee80211_register_hw(hw);
         if (error)
@@ -805,9 +810,6 @@ int ath9k_init_device(u16 devid, struct ath_softc *sc,
                         goto error_world;
         }
 
-        setup_timer(&sc->rx_poll_timer, ath_rx_poll, (unsigned long)sc);
-        sc->last_rssi = ATH_RSSI_DUMMY_MARKER;
-
         ath_init_leds(sc);
         ath_start_rfkill_poll(sc);
 
diff --git a/drivers/net/wireless/ath/ath9k/link.c b/drivers/net/wireless/ath/ath9k/link.c
new file mode 100644
index 00000000000..91650fe5046
--- /dev/null
+++ b/drivers/net/wireless/ath/ath9k/link.c
@@ -0,0 +1,510 @@
+/*
+ * Copyright (c) 2012 Qualcomm Atheros, Inc.
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include "ath9k.h"
+
+/*
+ * TX polling - checks if the TX engine is stuck somewhere
+ * and issues a chip reset if so.
+ */
+void ath_tx_complete_poll_work(struct work_struct *work)
+{
+        struct ath_softc *sc = container_of(work, struct ath_softc,
+                                            tx_complete_work.work);
+        struct ath_txq *txq;
+        int i;
+        bool needreset = false;
+#ifdef CONFIG_ATH9K_DEBUGFS
+        sc->tx_complete_poll_work_seen++;
+#endif
+
+        for (i = 0; i < ATH9K_NUM_TX_QUEUES; i++)
+                if (ATH_TXQ_SETUP(sc, i)) {
+                        txq = &sc->tx.txq[i];
+                        ath_txq_lock(sc, txq);
+                        if (txq->axq_depth) {
+                                if (txq->axq_tx_inprogress) {
+                                        needreset = true;
+                                        ath_txq_unlock(sc, txq);
+                                        break;
+                                } else {
+                                        txq->axq_tx_inprogress = true;
+                                }
+                        }
+                        ath_txq_unlock_complete(sc, txq);
+                }
+
+        if (needreset) {
+                ath_dbg(ath9k_hw_common(sc->sc_ah), RESET,
+                        "tx hung, resetting the chip\n");
+                RESET_STAT_INC(sc, RESET_TYPE_TX_HANG);
+                ieee80211_queue_work(sc->hw, &sc->hw_reset_work);
+                return;
+        }
+
+        ieee80211_queue_delayed_work(sc->hw, &sc->tx_complete_work,
+                                     msecs_to_jiffies(ATH_TX_COMPLETE_POLL_INT));
+}
+
+/*
+ * Checks if the BB/MAC is hung.
+ */
+void ath_hw_check(struct work_struct *work)
+{
+        struct ath_softc *sc = container_of(work, struct ath_softc, hw_check_work);
+        struct ath_common *common = ath9k_hw_common(sc->sc_ah);
+        unsigned long flags;
+        int busy;
+        u8 is_alive, nbeacon = 1;
+
+        ath9k_ps_wakeup(sc);
+        is_alive = ath9k_hw_check_alive(sc->sc_ah);
+
+        if (is_alive && !AR_SREV_9300(sc->sc_ah))
+                goto out;
+        else if (!is_alive && AR_SREV_9300(sc->sc_ah)) {
+                ath_dbg(common, RESET,
+                        "DCU stuck is detected. Schedule chip reset\n");
+                RESET_STAT_INC(sc, RESET_TYPE_MAC_HANG);
+                goto sched_reset;
+        }
+
+        spin_lock_irqsave(&common->cc_lock, flags);
+        busy = ath_update_survey_stats(sc);
+        spin_unlock_irqrestore(&common->cc_lock, flags);
+
+        ath_dbg(common, RESET, "Possible baseband hang, busy=%d (try %d)\n",
+                busy, sc->hw_busy_count + 1);
+        if (busy >= 99) {
+                if (++sc->hw_busy_count >= 3) {
+                        RESET_STAT_INC(sc, RESET_TYPE_BB_HANG);
+                        goto sched_reset;
+                }
+        } else if (busy >= 0) {
+                sc->hw_busy_count = 0;
+                nbeacon = 3;
+        }
+
+        ath_start_rx_poll(sc, nbeacon);
+        goto out;
+
+sched_reset:
+        ieee80211_queue_work(sc->hw, &sc->hw_reset_work);
+out:
+        ath9k_ps_restore(sc);
+}
+
+/*
+ * PLL-WAR for AR9485/AR9340
+ */
+static bool ath_hw_pll_rx_hang_check(struct ath_softc *sc, u32 pll_sqsum)
+{
+        static int count;
+        struct ath_common *common = ath9k_hw_common(sc->sc_ah);
+
+        if (pll_sqsum >= 0x40000) {
+                count++;
+                if (count == 3) {
+                        ath_dbg(common, RESET, "PLL WAR, resetting the chip\n");
+                        RESET_STAT_INC(sc, RESET_TYPE_PLL_HANG);
+                        ieee80211_queue_work(sc->hw, &sc->hw_reset_work);
+                        count = 0;
+                        return true;
+                }
+        } else {
+                count = 0;
+        }
+
+        return false;
+}
+
+void ath_hw_pll_work(struct work_struct *work)
+{
+        u32 pll_sqsum;
+        struct ath_softc *sc = container_of(work, struct ath_softc,
+                                            hw_pll_work.work);
+        /*
+         * ensure that the PLL WAR is executed only
+         * after the STA is associated (or) if the
+         * beaconing had started in interfaces that
+         * uses beacons.
+         */
+        if (!test_bit(SC_OP_BEACONS, &sc->sc_flags))
+                return;
+
+        ath9k_ps_wakeup(sc);
+        pll_sqsum = ar9003_get_pll_sqsum_dvc(sc->sc_ah);
+        ath9k_ps_restore(sc);
+        if (ath_hw_pll_rx_hang_check(sc, pll_sqsum))
+                return;
+
+        ieee80211_queue_delayed_work(sc->hw, &sc->hw_pll_work,
+                                     msecs_to_jiffies(ATH_PLL_WORK_INTERVAL));
+}
+
+/*
+ * RX Polling - monitors baseband hangs.
+ */
+void ath_start_rx_poll(struct ath_softc *sc, u8 nbeacon)
+{
+        if (!AR_SREV_9300(sc->sc_ah))
+                return;
+
+        if (!test_bit(SC_OP_PRIM_STA_VIF, &sc->sc_flags))
+                return;
+
+        mod_timer(&sc->rx_poll_timer, jiffies + msecs_to_jiffies
+                  (nbeacon * sc->cur_beacon_conf.beacon_interval));
+}
+
+void ath_rx_poll(unsigned long data)
+{
+        struct ath_softc *sc = (struct ath_softc *)data;
+
+        ieee80211_queue_work(sc->hw, &sc->hw_check_work);
+}
+
+/*
+ * PA Pre-distortion.
+ */
+static void ath_paprd_activate(struct ath_softc *sc)
+{
+        struct ath_hw *ah = sc->sc_ah;
+        struct ath9k_hw_cal_data *caldata = ah->caldata;
+        int chain;
+
+        if (!caldata || !caldata->paprd_done)
+                return;
+
+        ath9k_ps_wakeup(sc);
+        ar9003_paprd_enable(ah, false);
+        for (chain = 0; chain < AR9300_MAX_CHAINS; chain++) {
+                if (!(ah->txchainmask & BIT(chain)))
+                        continue;
+
+                ar9003_paprd_populate_single_table(ah, caldata, chain);
+        }
+
+        ar9003_paprd_enable(ah, true);
+        ath9k_ps_restore(sc);
+}
+
+static bool ath_paprd_send_frame(struct ath_softc *sc, struct sk_buff *skb, int chain)
+{
+        struct ieee80211_hw *hw = sc->hw;
+        struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(skb);
+        struct ath_hw *ah = sc->sc_ah;
+        struct ath_common *common = ath9k_hw_common(ah);
+        struct ath_tx_control txctl;
+        int time_left;
+
+        memset(&txctl, 0, sizeof(txctl));
+        txctl.txq = sc->tx.txq_map[WME_AC_BE];
+
+        memset(tx_info, 0, sizeof(*tx_info));
+        tx_info->band = hw->conf.channel->band;
+        tx_info->flags |= IEEE80211_TX_CTL_NO_ACK;
+        tx_info->control.rates[0].idx = 0;
+        tx_info->control.rates[0].count = 1;
+        tx_info->control.rates[0].flags = IEEE80211_TX_RC_MCS;
+        tx_info->control.rates[1].idx = -1;
+
+        init_completion(&sc->paprd_complete);
+        txctl.paprd = BIT(chain);
+
+        if (ath_tx_start(hw, skb, &txctl) != 0) {
+                ath_dbg(common, CALIBRATE, "PAPRD TX failed\n");
+                dev_kfree_skb_any(skb);
+                return false;
+        }
+
+        time_left = wait_for_completion_timeout(&sc->paprd_complete,
+                        msecs_to_jiffies(ATH_PAPRD_TIMEOUT));
+
+        if (!time_left)
+                ath_dbg(common, CALIBRATE,
+                        "Timeout waiting for paprd training on TX chain %d\n",
+                        chain);
+
+        return !!time_left;
+}
+
+void ath_paprd_calibrate(struct work_struct *work)
+{
+        struct ath_softc *sc = container_of(work, struct ath_softc, paprd_work);
+        struct ieee80211_hw *hw = sc->hw;
+        struct ath_hw *ah = sc->sc_ah;
+        struct ieee80211_hdr *hdr;
+        struct sk_buff *skb = NULL;
+        struct ath9k_hw_cal_data *caldata = ah->caldata;
+        struct ath_common *common = ath9k_hw_common(ah);
+        int ftype;
+        int chain_ok = 0;
+        int chain;
+        int len = 1800;
+
+        if (!caldata)
+                return;
+
+        ath9k_ps_wakeup(sc);
+
+        if (ar9003_paprd_init_table(ah) < 0)
+                goto fail_paprd;
+
+        skb = alloc_skb(len, GFP_KERNEL);
+        if (!skb)
+                goto fail_paprd;
+
+        skb_put(skb, len);
+        memset(skb->data, 0, len);
+        hdr = (struct ieee80211_hdr *)skb->data;
+        ftype = IEEE80211_FTYPE_DATA | IEEE80211_STYPE_NULLFUNC;
+        hdr->frame_control = cpu_to_le16(ftype);
+        hdr->duration_id = cpu_to_le16(10);
+        memcpy(hdr->addr1, hw->wiphy->perm_addr, ETH_ALEN);
+        memcpy(hdr->addr2, hw->wiphy->perm_addr, ETH_ALEN);
+        memcpy(hdr->addr3, hw->wiphy->perm_addr, ETH_ALEN);
+
+        for (chain = 0; chain < AR9300_MAX_CHAINS; chain++) {
+                if (!(ah->txchainmask & BIT(chain)))
+                        continue;
+
+                chain_ok = 0;
+
+                ath_dbg(common, CALIBRATE,
+                        "Sending PAPRD frame for thermal measurement on chain %d\n",
+                        chain);
+                if (!ath_paprd_send_frame(sc, skb, chain))
+                        goto fail_paprd;
+
+                ar9003_paprd_setup_gain_table(ah, chain);
+
+                ath_dbg(common, CALIBRATE,
+                        "Sending PAPRD training frame on chain %d\n", chain);
+                if (!ath_paprd_send_frame(sc, skb, chain))
+                        goto fail_paprd;
+
+                if (!ar9003_paprd_is_done(ah)) {
+                        ath_dbg(common, CALIBRATE,
+                                "PAPRD not yet done on chain %d\n", chain);
+                        break;
+                }
+
+                if (ar9003_paprd_create_curve(ah, caldata, chain)) {
+                        ath_dbg(common, CALIBRATE,
+                                "PAPRD create curve failed on chain %d\n",
+                                chain);
+                        break;
+                }
+
+                chain_ok = 1;
+        }
+        kfree_skb(skb);
+
+        if (chain_ok) {
+                caldata->paprd_done = true;
+                ath_paprd_activate(sc);
+        }
+
+fail_paprd:
+        ath9k_ps_restore(sc);
+}
+
+/*
+ *  ANI performs periodic noise floor calibration
+ *  that is used to adjust and optimize the chip performance.  This
+ *  takes environmental changes (location, temperature) into account.
+ *  When the task is complete, it reschedules itself depending on the
+ *  appropriate interval that was calculated.
+ */
+void ath_ani_calibrate(unsigned long data)
+{
+        struct ath_softc *sc = (struct ath_softc *)data;
+        struct ath_hw *ah = sc->sc_ah;
+        struct ath_common *common = ath9k_hw_common(ah);
+        bool longcal = false;
+        bool shortcal = false;
+        bool aniflag = false;
+        unsigned int timestamp = jiffies_to_msecs(jiffies);
+        u32 cal_interval, short_cal_interval, long_cal_interval;
+        unsigned long flags;
+
+        if (ah->caldata && ah->caldata->nfcal_interference)
+                long_cal_interval = ATH_LONG_CALINTERVAL_INT;
+        else
+                long_cal_interval = ATH_LONG_CALINTERVAL;
+
+        short_cal_interval = (ah->opmode == NL80211_IFTYPE_AP) ?
+                ATH_AP_SHORT_CALINTERVAL : ATH_STA_SHORT_CALINTERVAL;
+
+        /* Only calibrate if awake */
+        if (sc->sc_ah->power_mode != ATH9K_PM_AWAKE)
+                goto set_timer;
+
+        ath9k_ps_wakeup(sc);
+
+        /* Long calibration runs independently of short calibration. */
+        if ((timestamp - common->ani.longcal_timer) >= long_cal_interval) {
+                longcal = true;
+                common->ani.longcal_timer = timestamp;
+        }
+
+        /* Short calibration applies only while caldone is false */
+        if (!common->ani.caldone) {
+                if ((timestamp - common->ani.shortcal_timer) >= short_cal_interval) {
+                        shortcal = true;
+                        common->ani.shortcal_timer = timestamp;
+                        common->ani.resetcal_timer = timestamp;
+                }
+        } else {
+                if ((timestamp - common->ani.resetcal_timer) >=
+                    ATH_RESTART_CALINTERVAL) {
+                        common->ani.caldone = ath9k_hw_reset_calvalid(ah);
+                        if (common->ani.caldone)
+                                common->ani.resetcal_timer = timestamp;
+                }
+        }
+
+        /* Verify whether we must check ANI */
+        if (sc->sc_ah->config.enable_ani
+            && (timestamp - common->ani.checkani_timer) >=
+            ah->config.ani_poll_interval) {
+                aniflag = true;
+                common->ani.checkani_timer = timestamp;
+        }
+
+        /* Call ANI routine if necessary */
+        if (aniflag) {
+                spin_lock_irqsave(&common->cc_lock, flags);
+                ath9k_hw_ani_monitor(ah, ah->curchan);
+                ath_update_survey_stats(sc);
+                spin_unlock_irqrestore(&common->cc_lock, flags);
+        }
+
+        /* Perform calibration if necessary */
+        if (longcal || shortcal) {
+                common->ani.caldone =
+                        ath9k_hw_calibrate(ah, ah->curchan,
+                                           ah->rxchainmask, longcal);
+        }
+
+        ath_dbg(common, ANI,
+                "Calibration @%lu finished: %s %s %s, caldone: %s\n",
+                jiffies,
+                longcal ? "long" : "", shortcal ? "short" : "",
+                aniflag ? "ani" : "", common->ani.caldone ? "true" : "false");
+
+        ath9k_debug_samp_bb_mac(sc);
+        ath9k_ps_restore(sc);
+
+set_timer:
+        /*
+        * Set timer interval based on previous results.
+        * The interval must be the shortest necessary to satisfy ANI,
+        * short calibration and long calibration.
+        */
+        cal_interval = ATH_LONG_CALINTERVAL;
+        if (sc->sc_ah->config.enable_ani)
+                cal_interval = min(cal_interval,
+                                   (u32)ah->config.ani_poll_interval);
+        if (!common->ani.caldone)
+                cal_interval = min(cal_interval, (u32)short_cal_interval);
+
+        mod_timer(&common->ani.timer, jiffies + msecs_to_jiffies(cal_interval));
+        if ((sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_PAPRD) && ah->caldata) {
+                if (!ah->caldata->paprd_done)
+                        ieee80211_queue_work(sc->hw, &sc->paprd_work);
+                else if (!ah->paprd_table_write_done)
+                        ath_paprd_activate(sc);
+        }
+}
+
+void ath_start_ani(struct ath_common *common)
+{
+        struct ath_hw *ah = common->ah;
+        unsigned long timestamp = jiffies_to_msecs(jiffies);
+        struct ath_softc *sc = (struct ath_softc *) common->priv;
+
+        if (!test_bit(SC_OP_ANI_RUN, &sc->sc_flags))
+                return;
+
+        if (sc->hw->conf.flags & IEEE80211_CONF_OFFCHANNEL)
+                return;
+
+        common->ani.longcal_timer = timestamp;
+        common->ani.shortcal_timer = timestamp;
+        common->ani.checkani_timer = timestamp;
+
+        mod_timer(&common->ani.timer,
+                  jiffies + msecs_to_jiffies((u32)ah->config.ani_poll_interval));
+}
+
+void ath_update_survey_nf(struct ath_softc *sc, int channel)
+{
+        struct ath_hw *ah = sc->sc_ah;
+        struct ath9k_channel *chan = &ah->channels[channel];
+        struct survey_info *survey = &sc->survey[channel];
+
+        if (chan->noisefloor) {
+                survey->filled |= SURVEY_INFO_NOISE_DBM;
+                survey->noise = ath9k_hw_getchan_noise(ah, chan);
+        }
+}
+
+/*
+ * Updates the survey statistics and returns the busy time since last
+ * update in %, if the measurement duration was long enough for the
+ * result to be useful, -1 otherwise.
+ */
+int ath_update_survey_stats(struct ath_softc *sc)
+{
+        struct ath_hw *ah = sc->sc_ah;
+        struct ath_common *common = ath9k_hw_common(ah);
+        int pos = ah->curchan - &ah->channels[0];
+        struct survey_info *survey = &sc->survey[pos];
+        struct ath_cycle_counters *cc = &common->cc_survey;
+        unsigned int div = common->clockrate * 1000;
+        int ret = 0;
+
+        if (!ah->curchan)
+                return -1;
+
+        if (ah->power_mode == ATH9K_PM_AWAKE)
+                ath_hw_cycle_counters_update(common);
+
+        if (cc->cycles > 0) {
+                survey->filled |= SURVEY_INFO_CHANNEL_TIME |
+                        SURVEY_INFO_CHANNEL_TIME_BUSY |
+                        SURVEY_INFO_CHANNEL_TIME_RX |
+                        SURVEY_INFO_CHANNEL_TIME_TX;
+                survey->channel_time += cc->cycles / div;
+                survey->channel_time_busy += cc->rx_busy / div;
+                survey->channel_time_rx += cc->rx_frame / div;
+                survey->channel_time_tx += cc->tx_frame / div;
+        }
+
+        if (cc->cycles < div)
+                return -1;
+
+        if (cc->cycles > 0)
+                ret = cc->rx_busy * 100 / cc->cycles;
+
+        memset(cc, 0, sizeof(*cc));
+
+        ath_update_survey_nf(sc, pos);
+
+        return ret;
+}
diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c
index dac1a2709e3..e4e73f061a2 100644
--- a/drivers/net/wireless/ath/ath9k/main.c
+++ b/drivers/net/wireless/ath/ath9k/main.c
@@ -19,7 +19,7 @@
 #include "ath9k.h"
 #include "btcoex.h"
 
-static u8 parse_mpdudensity(u8 mpdudensity)
+u8 ath9k_parse_mpdudensity(u8 mpdudensity)
 {
         /*
          * 802.11n D2.0 defined values for "Minimum MPDU Start Spacing":
@@ -101,6 +101,7 @@ void ath9k_ps_wakeup(struct ath_softc *sc)
                 spin_lock(&common->cc_lock);
                 ath_hw_cycle_counters_update(common);
                 memset(&common->cc_survey, 0, sizeof(common->cc_survey));
+                memset(&common->cc_ani, 0, sizeof(common->cc_ani));
                 spin_unlock(&common->cc_lock);
         }
 
@@ -143,90 +144,17 @@ void ath9k_ps_restore(struct ath_softc *sc)
         spin_unlock_irqrestore(&sc->sc_pm_lock, flags);
 }
 
-void ath_start_ani(struct ath_common *common)
-{
-        struct ath_hw *ah = common->ah;
-        unsigned long timestamp = jiffies_to_msecs(jiffies);
-        struct ath_softc *sc = (struct ath_softc *) common->priv;
-
-        if (!(sc->sc_flags & SC_OP_ANI_RUN))
-                return;
-
-        if (sc->sc_flags & SC_OP_OFFCHANNEL)
-                return;
-
-        common->ani.longcal_timer = timestamp;
-        common->ani.shortcal_timer = timestamp;
-        common->ani.checkani_timer = timestamp;
-
-        mod_timer(&common->ani.timer,
-                  jiffies +
-                        msecs_to_jiffies((u32)ah->config.ani_poll_interval));
-}
-
-static void ath_update_survey_nf(struct ath_softc *sc, int channel)
-{
-        struct ath_hw *ah = sc->sc_ah;
-        struct ath9k_channel *chan = &ah->channels[channel];
-        struct survey_info *survey = &sc->survey[channel];
-
-        if (chan->noisefloor) {
-                survey->filled |= SURVEY_INFO_NOISE_DBM;
-                survey->noise = ath9k_hw_getchan_noise(ah, chan);
-        }
-}
-
-/*
- * Updates the survey statistics and returns the busy time since last
- * update in %, if the measurement duration was long enough for the
- * result to be useful, -1 otherwise.
- */
-static int ath_update_survey_stats(struct ath_softc *sc)
-{
-        struct ath_hw *ah = sc->sc_ah;
-        struct ath_common *common = ath9k_hw_common(ah);
-        int pos = ah->curchan - &ah->channels[0];
-        struct survey_info *survey = &sc->survey[pos];
-        struct ath_cycle_counters *cc = &common->cc_survey;
-        unsigned int div = common->clockrate * 1000;
-        int ret = 0;
-
-        if (!ah->curchan)
-                return -1;
-
-        if (ah->power_mode == ATH9K_PM_AWAKE)
-                ath_hw_cycle_counters_update(common);
-
-        if (cc->cycles > 0) {
-                survey->filled |= SURVEY_INFO_CHANNEL_TIME |
-                        SURVEY_INFO_CHANNEL_TIME_BUSY |
-                        SURVEY_INFO_CHANNEL_TIME_RX |
-                        SURVEY_INFO_CHANNEL_TIME_TX;
-                survey->channel_time += cc->cycles / div;
-                survey->channel_time_busy += cc->rx_busy / div;
-                survey->channel_time_rx += cc->rx_frame / div;
-                survey->channel_time_tx += cc->tx_frame / div;
-        }
-
-        if (cc->cycles < div)
-                return -1;
-
-        if (cc->cycles > 0)
-                ret = cc->rx_busy * 100 / cc->cycles;
-
-        memset(cc, 0, sizeof(*cc));
-
-        ath_update_survey_nf(sc, pos);
-
-        return ret;
-}
-
 static void __ath_cancel_work(struct ath_softc *sc)
 {
         cancel_work_sync(&sc->paprd_work);
         cancel_work_sync(&sc->hw_check_work);
         cancel_delayed_work_sync(&sc->tx_complete_work);
         cancel_delayed_work_sync(&sc->hw_pll_work);
+
+#ifdef CONFIG_ATH9K_BTCOEX_SUPPORT
+        if (ath9k_hw_mci_is_enabled(sc->sc_ah))
+                cancel_work_sync(&sc->mci_work);
+#endif
 }
 
 static void ath_cancel_work(struct ath_softc *sc)
@@ -235,6 +163,22 @@ static void ath_cancel_work(struct ath_softc *sc)
         cancel_work_sync(&sc->hw_reset_work);
 }
 
+static void ath_restart_work(struct ath_softc *sc)
+{
+        struct ath_common *common = ath9k_hw_common(sc->sc_ah);
+
+        ieee80211_queue_delayed_work(sc->hw, &sc->tx_complete_work, 0);
+
+        if (AR_SREV_9485(sc->sc_ah) || AR_SREV_9340(sc->sc_ah))
+                ieee80211_queue_delayed_work(sc->hw, &sc->hw_pll_work,
+                                     msecs_to_jiffies(ATH_PLL_WORK_INTERVAL));
+
+        ath_start_rx_poll(sc, 3);
+
+        if (!common->disable_ani)
+                ath_start_ani(common);
+}
+
 static bool ath_prepare_reset(struct ath_softc *sc, bool retry_tx, bool flush)
 {
         struct ath_hw *ah = sc->sc_ah;
@@ -271,6 +215,7 @@ static bool ath_complete_reset(struct ath_softc *sc, bool start)
 {
         struct ath_hw *ah = sc->sc_ah;
         struct ath_common *common = ath9k_hw_common(ah);
+        unsigned long flags;
 
         if (ath_startrecv(sc) != 0) {
                 ath_err(common, "Unable to restart recv logic\n");
@@ -279,36 +224,30 @@ static bool ath_complete_reset(struct ath_softc *sc, bool start)
 
         ath9k_cmn_update_txpow(ah, sc->curtxpow,
                                sc->config.txpowlimit, &sc->curtxpow);
+
+        clear_bit(SC_OP_HW_RESET, &sc->sc_flags);
         ath9k_hw_set_interrupts(ah);
         ath9k_hw_enable_interrupts(ah);
 
-        if (!(sc->sc_flags & (SC_OP_OFFCHANNEL)) && start) {
-                if (sc->sc_flags & SC_OP_BEACONS)
-                        ath_set_beacon(sc);
-
-                ieee80211_queue_delayed_work(sc->hw, &sc->tx_complete_work, 0);
-                ieee80211_queue_delayed_work(sc->hw, &sc->hw_pll_work, HZ/2);
-                ath_start_rx_poll(sc, 3);
-                if (!common->disable_ani)
-                        ath_start_ani(common);
-        }
-
-        if ((ah->caps.hw_caps & ATH9K_HW_CAP_ANT_DIV_COMB) && sc->ant_rx != 3) {
-                struct ath_hw_antcomb_conf div_ant_conf;
-                u8 lna_conf;
+        if (!(sc->hw->conf.flags & IEEE80211_CONF_OFFCHANNEL) && start) {
+                if (!test_bit(SC_OP_BEACONS, &sc->sc_flags))
+                        goto work;
 
-                ath9k_hw_antdiv_comb_conf_get(ah, &div_ant_conf);
+                ath_set_beacon(sc);
 
-                if (sc->ant_rx == 1)
-                        lna_conf = ATH_ANT_DIV_COMB_LNA1;
-                else
-                        lna_conf = ATH_ANT_DIV_COMB_LNA2;
-                div_ant_conf.main_lna_conf = lna_conf;
-                div_ant_conf.alt_lna_conf = lna_conf;
-
-                ath9k_hw_antdiv_comb_conf_set(ah, &div_ant_conf);
+                if (ah->opmode == NL80211_IFTYPE_STATION &&
+                    test_bit(SC_OP_PRIM_STA_VIF, &sc->sc_flags)) {
+                        spin_lock_irqsave(&sc->sc_pm_lock, flags);
+                        sc->ps_flags |= PS_BEACON_SYNC | PS_WAIT_FOR_BEACON;
+                        spin_unlock_irqrestore(&sc->sc_pm_lock, flags);
+                }
+        work:
+                ath_restart_work(sc);
         }
 
+        if ((ah->caps.hw_caps & ATH9K_HW_CAP_ANT_DIV_COMB) && sc->ant_rx != 3)
+                ath_ant_comb_update(sc);
+
         ieee80211_wake_queues(sc->hw);
 
         return true;
@@ -328,7 +267,7 @@ static int ath_reset_internal(struct ath_softc *sc, struct ath9k_channel *hchan,
 
         spin_lock_bh(&sc->sc_pcu_lock);
 
-        if (!(sc->sc_flags & SC_OP_OFFCHANNEL)) {
+        if (!(sc->hw->conf.flags & IEEE80211_CONF_OFFCHANNEL)) {
                 fastcc = false;
                 caldata = &sc->caldata;
         }
@@ -371,7 +310,7 @@ static int ath_set_channel(struct ath_softc *sc, struct ieee80211_hw *hw,
 {
         int r;
 
-        if (sc->sc_flags & SC_OP_INVALID)
+        if (test_bit(SC_OP_INVALID, &sc->sc_flags))
                 return -EIO;
 
         r = ath_reset_internal(sc, hchan, false);
@@ -379,262 +318,11 @@ static int ath_set_channel(struct ath_softc *sc, struct ieee80211_hw *hw,
         return r;
 }
 
-static void ath_paprd_activate(struct ath_softc *sc)
-{
-        struct ath_hw *ah = sc->sc_ah;
-        struct ath9k_hw_cal_data *caldata = ah->caldata;
-        int chain;
-
-        if (!caldata || !caldata->paprd_done)
-                return;
-
-        ath9k_ps_wakeup(sc);
-        ar9003_paprd_enable(ah, false);
-        for (chain = 0; chain < AR9300_MAX_CHAINS; chain++) {
-                if (!(ah->txchainmask & BIT(chain)))
-                        continue;
-
-                ar9003_paprd_populate_single_table(ah, caldata, chain);
-        }
-
-        ar9003_paprd_enable(ah, true);
-        ath9k_ps_restore(sc);
-}
-
-static bool ath_paprd_send_frame(struct ath_softc *sc, struct sk_buff *skb, int chain)
-{
-        struct ieee80211_hw *hw = sc->hw;
-        struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(skb);
-        struct ath_hw *ah = sc->sc_ah;
-        struct ath_common *common = ath9k_hw_common(ah);
-        struct ath_tx_control txctl;
-        int time_left;
-
-        memset(&txctl, 0, sizeof(txctl));
-        txctl.txq = sc->tx.txq_map[WME_AC_BE];
-
-        memset(tx_info, 0, sizeof(*tx_info));
-        tx_info->band = hw->conf.channel->band;
-        tx_info->flags |= IEEE80211_TX_CTL_NO_ACK;
-        tx_info->control.rates[0].idx = 0;
-        tx_info->control.rates[0].count = 1;
-        tx_info->control.rates[0].flags = IEEE80211_TX_RC_MCS;
-        tx_info->control.rates[1].idx = -1;
-
-        init_completion(&sc->paprd_complete);
-        txctl.paprd = BIT(chain);
-
-        if (ath_tx_start(hw, skb, &txctl) != 0) {
-                ath_dbg(common, CALIBRATE, "PAPRD TX failed\n");
-                dev_kfree_skb_any(skb);
-                return false;
-        }
-
-        time_left = wait_for_completion_timeout(&sc->paprd_complete,
-                        msecs_to_jiffies(ATH_PAPRD_TIMEOUT));
-
-        if (!time_left)
-                ath_dbg(common, CALIBRATE,
-                        "Timeout waiting for paprd training on TX chain %d\n",
-                        chain);
-
-        return !!time_left;
-}
-
-void ath_paprd_calibrate(struct work_struct *work)
-{
-        struct ath_softc *sc = container_of(work, struct ath_softc, paprd_work);
-        struct ieee80211_hw *hw = sc->hw;
-        struct ath_hw *ah = sc->sc_ah;
-        struct ieee80211_hdr *hdr;
-        struct sk_buff *skb = NULL;
-        struct ath9k_hw_cal_data *caldata = ah->caldata;
-        struct ath_common *common = ath9k_hw_common(ah);
-        int ftype;
-        int chain_ok = 0;
-        int chain;
-        int len = 1800;
-
-        if (!caldata)
-                return;
-
-        ath9k_ps_wakeup(sc);
-
-        if (ar9003_paprd_init_table(ah) < 0)
-                goto fail_paprd;
-
-        skb = alloc_skb(len, GFP_KERNEL);
-        if (!skb)
-                goto fail_paprd;
-
-        skb_put(skb, len);
-        memset(skb->data, 0, len);
-        hdr = (struct ieee80211_hdr *)skb->data;
-        ftype = IEEE80211_FTYPE_DATA | IEEE80211_STYPE_NULLFUNC;
-        hdr->frame_control = cpu_to_le16(ftype);
-        hdr->duration_id = cpu_to_le16(10);
-        memcpy(hdr->addr1, hw->wiphy->perm_addr, ETH_ALEN);
-        memcpy(hdr->addr2, hw->wiphy->perm_addr, ETH_ALEN);
-        memcpy(hdr->addr3, hw->wiphy->perm_addr, ETH_ALEN);
-
-        for (chain = 0; chain < AR9300_MAX_CHAINS; chain++) {
-                if (!(ah->txchainmask & BIT(chain)))
-                        continue;
-
-                chain_ok = 0;
-
-                ath_dbg(common, CALIBRATE,
-                        "Sending PAPRD frame for thermal measurement on chain %d\n",
-                        chain);
-                if (!ath_paprd_send_frame(sc, skb, chain))
-                        goto fail_paprd;
-
-                ar9003_paprd_setup_gain_table(ah, chain);
-
-                ath_dbg(common, CALIBRATE,
-                        "Sending PAPRD training frame on chain %d\n", chain);
-                if (!ath_paprd_send_frame(sc, skb, chain))
-                        goto fail_paprd;
-
-                if (!ar9003_paprd_is_done(ah)) {
-                        ath_dbg(common, CALIBRATE,
-                                "PAPRD not yet done on chain %d\n", chain);
-                        break;
-                }
-
-                if (ar9003_paprd_create_curve(ah, caldata, chain)) {
-                        ath_dbg(common, CALIBRATE,
-                                "PAPRD create curve failed on chain %d\n",
-                                                                   chain);
-                        break;
-                }
-
-                chain_ok = 1;
-        }
-        kfree_skb(skb);
-
-        if (chain_ok) {
-                caldata->paprd_done = true;
-                ath_paprd_activate(sc);
-        }
-
-fail_paprd:
-        ath9k_ps_restore(sc);
-}
-
-/*
- *  This routine performs the periodic noise floor calibration function
- *  that is used to adjust and optimize the chip performance.  This
- *  takes environmental changes (location, temperature) into account.
- *  When the task is complete, it reschedules itself depending on the
- *  appropriate interval that was calculated.
- */
-void ath_ani_calibrate(unsigned long data)
-{
-        struct ath_softc *sc = (struct ath_softc *)data;
-        struct ath_hw *ah = sc->sc_ah;
-        struct ath_common *common = ath9k_hw_common(ah);
-        bool longcal = false;
-        bool shortcal = false;
-        bool aniflag = false;
-        unsigned int timestamp = jiffies_to_msecs(jiffies);
-        u32 cal_interval, short_cal_interval, long_cal_interval;
-        unsigned long flags;
-
-        if (ah->caldata && ah->caldata->nfcal_interference)
-                long_cal_interval = ATH_LONG_CALINTERVAL_INT;
-        else
-                long_cal_interval = ATH_LONG_CALINTERVAL;
-
-        short_cal_interval = (ah->opmode == NL80211_IFTYPE_AP) ?
-                ATH_AP_SHORT_CALINTERVAL : ATH_STA_SHORT_CALINTERVAL;
-
-        /* Only calibrate if awake */
-        if (sc->sc_ah->power_mode != ATH9K_PM_AWAKE)
-                goto set_timer;
-
-        ath9k_ps_wakeup(sc);
-
-        /* Long calibration runs independently of short calibration. */
-        if ((timestamp - common->ani.longcal_timer) >= long_cal_interval) {
-                longcal = true;
-                common->ani.longcal_timer = timestamp;
-        }
-
-        /* Short calibration applies only while caldone is false */
-        if (!common->ani.caldone) {
-                if ((timestamp - common->ani.shortcal_timer) >= short_cal_interval) {
-                        shortcal = true;
-                        common->ani.shortcal_timer = timestamp;
-                        common->ani.resetcal_timer = timestamp;
-                }
-        } else {
-                if ((timestamp - common->ani.resetcal_timer) >=
-                    ATH_RESTART_CALINTERVAL) {
-                        common->ani.caldone = ath9k_hw_reset_calvalid(ah);
-                        if (common->ani.caldone)
-                                common->ani.resetcal_timer = timestamp;
-                }
-        }
-
-        /* Verify whether we must check ANI */
-        if (sc->sc_ah->config.enable_ani
-            && (timestamp - common->ani.checkani_timer) >=
-            ah->config.ani_poll_interval) {
-                aniflag = true;
-                common->ani.checkani_timer = timestamp;
-        }
-
-        /* Call ANI routine if necessary */
-        if (aniflag) {
-                spin_lock_irqsave(&common->cc_lock, flags);
-                ath9k_hw_ani_monitor(ah, ah->curchan);
-                ath_update_survey_stats(sc);
-                spin_unlock_irqrestore(&common->cc_lock, flags);
-        }
-
-        /* Perform calibration if necessary */
-        if (longcal || shortcal) {
-                common->ani.caldone =
-                        ath9k_hw_calibrate(ah, ah->curchan,
-                                                ah->rxchainmask, longcal);
-        }
-
-        ath_dbg(common, ANI,
-                "Calibration @%lu finished: %s %s %s, caldone: %s\n",
-                jiffies,
-                longcal ? "long" : "", shortcal ? "short" : "",
-                aniflag ? "ani" : "", common->ani.caldone ? "true" : "false");
-
-        ath9k_ps_restore(sc);
-
-set_timer:
-        /*
-        * Set timer interval based on previous results.
-        * The interval must be the shortest necessary to satisfy ANI,
-        * short calibration and long calibration.
-        */
-        ath9k_debug_samp_bb_mac(sc);
-        cal_interval = ATH_LONG_CALINTERVAL;
-        if (sc->sc_ah->config.enable_ani)
-                cal_interval = min(cal_interval,
-                                   (u32)ah->config.ani_poll_interval);
-        if (!common->ani.caldone)
-                cal_interval = min(cal_interval, (u32)short_cal_interval);
-
-        mod_timer(&common->ani.timer, jiffies + msecs_to_jiffies(cal_interval));
-        if ((sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_PAPRD) && ah->caldata) {
-                if (!ah->caldata->paprd_done)
-                        ieee80211_queue_work(sc->hw, &sc->paprd_work);
-                else if (!ah->paprd_table_write_done)
-                        ath_paprd_activate(sc);
-        }
-}
-
 static void ath_node_attach(struct ath_softc *sc, struct ieee80211_sta *sta,
                             struct ieee80211_vif *vif)
 {
         struct ath_node *an;
+        u8 density;
         an = (struct ath_node *)sta->drv_priv;
 
 #ifdef CONFIG_ATH9K_DEBUGFS
@@ -649,7 +337,8 @@ static void ath_node_attach(struct ath_softc *sc, struct ieee80211_sta *sta,
                 ath_tx_node_init(sc, an);
                 an->maxampdu = 1 << (IEEE80211_HT_MAX_AMPDU_FACTOR +
                                      sta->ht_cap.ampdu_factor);
-                an->mpdudensity = parse_mpdudensity(sta->ht_cap.ampdu_density);
+                density = ath9k_parse_mpdudensity(sta->ht_cap.ampdu_density);
+                an->mpdudensity = density;
         }
 }
 
@@ -668,13 +357,12 @@ static void ath_node_detach(struct ath_softc *sc, struct ieee80211_sta *sta)
                 ath_tx_node_cleanup(sc, an);
 }
 
-
 void ath9k_tasklet(unsigned long data)
 {
         struct ath_softc *sc = (struct ath_softc *)data;
         struct ath_hw *ah = sc->sc_ah;
         struct ath_common *common = ath9k_hw_common(ah);
-
+        unsigned long flags;
         u32 status = sc->intrstatus;
         u32 rxmask;
 
@@ -693,10 +381,12 @@ void ath9k_tasklet(unsigned long data)
 
                 RESET_STAT_INC(sc, type);
 #endif
+                set_bit(SC_OP_HW_RESET, &sc->sc_flags);
                 ieee80211_queue_work(sc->hw, &sc->hw_reset_work);
                 goto out;
         }
 
+        spin_lock_irqsave(&sc->sc_pm_lock, flags);
         if ((status & ATH9K_INT_TSFOOR) && sc->ps_enabled) {
                 /*
                  * TSF sync does not look correct; remain awake to sync with
@@ -705,6 +395,7 @@ void ath9k_tasklet(unsigned long data)
                 ath_dbg(common, PS, "TSFOOR - Sync with next Beacon\n");
                 sc->ps_flags |= PS_WAIT_FOR_BEACON | PS_BEACON_SYNC;
         }
+        spin_unlock_irqrestore(&sc->sc_pm_lock, flags);
 
         if (ah->caps.hw_caps & ATH9K_HW_CAP_EDMA)
                 rxmask = (ATH9K_INT_RXHP | ATH9K_INT_RXLP | ATH9K_INT_RXEOL |
@@ -766,15 +457,17 @@ irqreturn_t ath_isr(int irq, void *dev)
          * touch anything. Note this can happen early
          * on if the IRQ is shared.
          */
-        if (sc->sc_flags & SC_OP_INVALID)
+        if (test_bit(SC_OP_INVALID, &sc->sc_flags))
                 return IRQ_NONE;
 
-
         /* shared irq, not for us */
 
         if (!ath9k_hw_intrpend(ah))
                 return IRQ_NONE;
 
+        if(test_bit(SC_OP_HW_RESET, &sc->sc_flags))
+                return IRQ_HANDLED;
+
         /*
          * Figure out the reason(s) for the interrupt.  Note
          * that the hal returns a pseudo-ISR that may include
@@ -827,24 +520,6 @@ irqreturn_t ath_isr(int irq, void *dev)
                 ath9k_hw_set_interrupts(ah);
         }
 
-        if (status & ATH9K_INT_MIB) {
-                /*
-                 * Disable interrupts until we service the MIB
-                 * interrupt; otherwise it will continue to
-                 * fire.
-                 */
-                ath9k_hw_disable_interrupts(ah);
-                /*
-                 * Let the hal handle the event. We assume
-                 * it will clear whatever condition caused
-                 * the interrupt.
-                 */
-                spin_lock(&common->cc_lock);
-                ath9k_hw_proc_mib_event(ah);
-                spin_unlock(&common->cc_lock);
-                ath9k_hw_enable_interrupts(ah);
-        }
-
         if (!(ah->caps.hw_caps & ATH9K_HW_CAP_AUTOSLEEP))
                 if (status & ATH9K_INT_TIM_TIMER) {
                         if (ATH_DBG_WARN_ON_ONCE(sc->ps_idle))
@@ -852,8 +527,10 @@ irqreturn_t ath_isr(int irq, void *dev)
                         /* Clear RxAbort bit so that we can
                          * receive frames */
                         ath9k_setpower(sc, ATH9K_PM_AWAKE);
+                        spin_lock(&sc->sc_pm_lock);
                         ath9k_hw_setrxabort(sc->sc_ah, 0);
                         sc->ps_flags |= PS_WAIT_FOR_BEACON;
+                        spin_unlock(&sc->sc_pm_lock);
                 }
 
 chip_reset:
@@ -902,96 +579,6 @@ void ath_reset_work(struct work_struct *work)
         ath_reset(sc, true);
 }
 
-void ath_hw_check(struct work_struct *work)
-{
-        struct ath_softc *sc = container_of(work, struct ath_softc, hw_check_work);
-        struct ath_common *common = ath9k_hw_common(sc->sc_ah);
-        unsigned long flags;
-        int busy;
-        u8 is_alive, nbeacon = 1;
-
-        ath9k_ps_wakeup(sc);
-        is_alive = ath9k_hw_check_alive(sc->sc_ah);
-
-        if (is_alive && !AR_SREV_9300(sc->sc_ah))
-                goto out;
-        else if (!is_alive && AR_SREV_9300(sc->sc_ah)) {
-                ath_dbg(common, RESET,
-                        "DCU stuck is detected. Schedule chip reset\n");
-                RESET_STAT_INC(sc, RESET_TYPE_MAC_HANG);
-                goto sched_reset;
-        }
-
-        spin_lock_irqsave(&common->cc_lock, flags);
-        busy = ath_update_survey_stats(sc);
-        spin_unlock_irqrestore(&common->cc_lock, flags);
-
-        ath_dbg(common, RESET, "Possible baseband hang, busy=%d (try %d)\n",
-                busy, sc->hw_busy_count + 1);
-        if (busy >= 99) {
-                if (++sc->hw_busy_count >= 3) {
-                        RESET_STAT_INC(sc, RESET_TYPE_BB_HANG);
-                        goto sched_reset;
-                }
-        } else if (busy >= 0) {
-                sc->hw_busy_count = 0;
-                nbeacon = 3;
-        }
-
-        ath_start_rx_poll(sc, nbeacon);
-        goto out;
-
-sched_reset:
-        ieee80211_queue_work(sc->hw, &sc->hw_reset_work);
-out:
-        ath9k_ps_restore(sc);
-}
-
-static void ath_hw_pll_rx_hang_check(struct ath_softc *sc, u32 pll_sqsum)
-{
-        static int count;
-        struct ath_common *common = ath9k_hw_common(sc->sc_ah);
-
-        if (pll_sqsum >= 0x40000) {
-                count++;
-                if (count == 3) {
-                        /* Rx is hung for more than 500ms. Reset it */
-                        ath_dbg(common, RESET, "Possible RX hang, resetting\n");
-                        RESET_STAT_INC(sc, RESET_TYPE_PLL_HANG);
-                        ieee80211_queue_work(sc->hw, &sc->hw_reset_work);
-                        count = 0;
-                }
-        } else
-                count = 0;
-}
-
-void ath_hw_pll_work(struct work_struct *work)
-{
-        struct ath_softc *sc = container_of(work, struct ath_softc,
-                                            hw_pll_work.work);
-        u32 pll_sqsum;
-
-        /*
-         * ensure that the PLL WAR is executed only
-         * after the STA is associated (or) if the
-         * beaconing had started in interfaces that
-         * uses beacons.
-         */
-        if (!(sc->sc_flags & SC_OP_BEACONS))
-                return;
-
-        if (AR_SREV_9485(sc->sc_ah)) {
-
-                ath9k_ps_wakeup(sc);
-                pll_sqsum = ar9003_get_pll_sqsum_dvc(sc->sc_ah);
-                ath9k_ps_restore(sc);
-
-                ath_hw_pll_rx_hang_check(sc, pll_sqsum);
-
-                ieee80211_queue_delayed_work(sc->hw, &sc->hw_pll_work, HZ/5);
-        }
-}
-
 /**********************/
 /* mac80211 callbacks */
 /**********************/
@@ -1054,10 +641,9 @@ static int ath9k_start(struct ieee80211_hw *hw)
         if (ah->caps.hw_caps & ATH9K_HW_CAP_HT)
                 ah->imask |= ATH9K_INT_CST;
 
-        if (ah->caps.hw_caps & ATH9K_HW_CAP_MCI)
-                ah->imask |= ATH9K_INT_MCI;
+        ath_mci_enable(sc);
 
-        sc->sc_flags &= ~SC_OP_INVALID;
+        clear_bit(SC_OP_INVALID, &sc->sc_flags);
         sc->sc_ah->is_monitoring = false;
 
         if (!ath_complete_reset(sc, false)) {
@@ -1099,6 +685,7 @@ static void ath9k_tx(struct ieee80211_hw *hw, struct sk_buff *skb)
         struct ath_common *common = ath9k_hw_common(sc->sc_ah);
         struct ath_tx_control txctl;
         struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;
+        unsigned long flags;
 
         if (sc->ps_enabled) {
                 /*
@@ -1121,6 +708,7 @@ static void ath9k_tx(struct ieee80211_hw *hw, struct sk_buff *skb)
                  * completed and if needed, also for RX of buffered frames.
                  */
                 ath9k_ps_wakeup(sc);
+                spin_lock_irqsave(&sc->sc_pm_lock, flags);
                 if (!(sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_AUTOSLEEP))
                         ath9k_hw_setrxabort(sc->sc_ah, 0);
                 if (ieee80211_is_pspoll(hdr->frame_control)) {
@@ -1136,6 +724,7 @@ static void ath9k_tx(struct ieee80211_hw *hw, struct sk_buff *skb)
                  * the ps_flags bit is cleared. We are just dropping
                  * the ps_usecount here.
                  */
+                spin_unlock_irqrestore(&sc->sc_pm_lock, flags);
                 ath9k_ps_restore(sc);
         }
 
@@ -1176,7 +765,7 @@ static void ath9k_stop(struct ieee80211_hw *hw)
         ath_cancel_work(sc);
         del_timer_sync(&sc->rx_poll_timer);
 
-        if (sc->sc_flags & SC_OP_INVALID) {
+        if (test_bit(SC_OP_INVALID, &sc->sc_flags)) {
                 ath_dbg(common, ANY, "Device not present\n");
                 mutex_unlock(&sc->mutex);
                 return;
@@ -1233,7 +822,7 @@ static void ath9k_stop(struct ieee80211_hw *hw)
 
         ath9k_ps_restore(sc);
 
-        sc->sc_flags |= SC_OP_INVALID;
+        set_bit(SC_OP_INVALID, &sc->sc_flags);
         sc->ps_idle = prev_idle;
 
         mutex_unlock(&sc->mutex);
@@ -1337,11 +926,11 @@ static void ath9k_calculate_summary_state(struct ieee80211_hw *hw,
         /* Set op-mode & TSF */
         if (iter_data.naps > 0) {
                 ath9k_hw_set_tsfadjust(ah, 1);
-                sc->sc_flags |= SC_OP_TSF_RESET;
+                set_bit(SC_OP_TSF_RESET, &sc->sc_flags);
                 ah->opmode = NL80211_IFTYPE_AP;
         } else {
                 ath9k_hw_set_tsfadjust(ah, 0);
-                sc->sc_flags &= ~SC_OP_TSF_RESET;
+                clear_bit(SC_OP_TSF_RESET, &sc->sc_flags);
 
                 if (iter_data.nmeshes)
                         ah->opmode = NL80211_IFTYPE_MESH_POINT;
@@ -1356,14 +945,10 @@ static void ath9k_calculate_summary_state(struct ieee80211_hw *hw,
         /*
          * Enable MIB interrupts when there are hardware phy counters.
          */
-        if ((iter_data.nstations + iter_data.nadhocs + iter_data.nmeshes) > 0) {
-                if (ah->config.enable_ani)
-                        ah->imask |= ATH9K_INT_MIB;
+        if ((iter_data.nstations + iter_data.nadhocs + iter_data.nmeshes) > 0)
                 ah->imask |= ATH9K_INT_TSFOOR;
-        } else {
-                ah->imask &= ~ATH9K_INT_MIB;
+        else
                 ah->imask &= ~ATH9K_INT_TSFOOR;
-        }
 
         ath9k_hw_set_interrupts(ah);
 
@@ -1372,12 +957,12 @@ static void ath9k_calculate_summary_state(struct ieee80211_hw *hw,
                 sc->sc_ah->stats.avgbrssi = ATH_RSSI_DUMMY_MARKER;
 
                 if (!common->disable_ani) {
-                        sc->sc_flags |= SC_OP_ANI_RUN;
+                        set_bit(SC_OP_ANI_RUN, &sc->sc_flags);
                         ath_start_ani(common);
                 }
 
         } else {
-                sc->sc_flags &= ~SC_OP_ANI_RUN;
+                clear_bit(SC_OP_ANI_RUN, &sc->sc_flags);
                 del_timer_sync(&common->ani.timer);
         }
 }
@@ -1398,25 +983,6 @@ static void ath9k_do_vif_add_setup(struct ieee80211_hw *hw,
         }
 }
 
-void ath_start_rx_poll(struct ath_softc *sc, u8 nbeacon)
-{
-        if (!AR_SREV_9300(sc->sc_ah))
-                return;
-
-        if (!(sc->sc_flags & SC_OP_PRIM_STA_VIF))
-                return;
-
-        mod_timer(&sc->rx_poll_timer, jiffies + msecs_to_jiffies
-                        (nbeacon * sc->cur_beacon_conf.beacon_interval));
-}
-
-void ath_rx_poll(unsigned long data)
-{
-        struct ath_softc *sc = (struct ath_softc *)data;
-
-        ieee80211_queue_work(sc->hw, &sc->hw_check_work);
-}
-
 static int ath9k_add_interface(struct ieee80211_hw *hw,
                                struct ieee80211_vif *vif)
 {
@@ -1618,11 +1184,6 @@ static int ath9k_config(struct ieee80211_hw *hw, u32 changed)
                 if (ah->curchan)
                         old_pos = ah->curchan - &ah->channels[0];
 
-                if (hw->conf.flags & IEEE80211_CONF_OFFCHANNEL)
-                        sc->sc_flags |= SC_OP_OFFCHANNEL;
-                else
-                        sc->sc_flags &= ~SC_OP_OFFCHANNEL;
-
                 ath_dbg(common, CONFIG, "Set channel: %d MHz type: %d\n",
                         curchan->center_freq, conf->channel_type);
 
@@ -1664,6 +1225,7 @@ static int ath9k_config(struct ieee80211_hw *hw, u32 changed)
                 if (ath_set_channel(sc, hw, &sc->sc_ah->channels[pos]) < 0) {
                         ath_err(common, "Unable to set channel\n");
                         mutex_unlock(&sc->mutex);
+                        ath9k_ps_restore(sc);
                         return -EINVAL;
                 }
 
@@ -1902,16 +1464,16 @@ static void ath9k_bss_iter(void *data, u8 *mac, struct ieee80211_vif *vif)
         struct ath_common *common = ath9k_hw_common(sc->sc_ah);
         struct ieee80211_bss_conf *bss_conf = &vif->bss_conf;
         struct ath_vif *avp = (void *)vif->drv_priv;
-
+        unsigned long flags;
         /*
          * Skip iteration if primary station vif's bss info
          * was not changed
          */
-        if (sc->sc_flags & SC_OP_PRIM_STA_VIF)
+        if (test_bit(SC_OP_PRIM_STA_VIF, &sc->sc_flags))
                 return;
 
         if (bss_conf->assoc) {
-                sc->sc_flags |= SC_OP_PRIM_STA_VIF;
+                set_bit(SC_OP_PRIM_STA_VIF, &sc->sc_flags);
                 avp->primary_sta_vif = true;
                 memcpy(common->curbssid, bss_conf->bssid, ETH_ALEN);
                 common->curaid = bss_conf->aid;
@@ -1924,7 +1486,10 @@ static void ath9k_bss_iter(void *data, u8 *mac, struct ieee80211_vif *vif)
                  * on the receipt of the first Beacon frame (i.e.,
                  * after time sync with the AP).
                  */
+                spin_lock_irqsave(&sc->sc_pm_lock, flags);
                 sc->ps_flags |= PS_BEACON_SYNC | PS_WAIT_FOR_BEACON;
+                spin_unlock_irqrestore(&sc->sc_pm_lock, flags);
+
                 /* Reset rssi stats */
                 sc->last_rssi = ATH_RSSI_DUMMY_MARKER;
                 sc->sc_ah->stats.avgbrssi = ATH_RSSI_DUMMY_MARKER;
@@ -1932,7 +1497,7 @@ static void ath9k_bss_iter(void *data, u8 *mac, struct ieee80211_vif *vif)
                 ath_start_rx_poll(sc, 3);
 
                 if (!common->disable_ani) {
-                        sc->sc_flags |= SC_OP_ANI_RUN;
+                        set_bit(SC_OP_ANI_RUN, &sc->sc_flags);
                         ath_start_ani(common);
                 }
 
@@ -1952,7 +1517,8 @@ static void ath9k_config_bss(struct ath_softc *sc, struct ieee80211_vif *vif)
         if (avp->primary_sta_vif && !bss_conf->assoc) {
                 ath_dbg(common, CONFIG, "Bss Info DISASSOC %d, bssid %pM\n",
                         common->curaid, common->curbssid);
-                sc->sc_flags &= ~(SC_OP_PRIM_STA_VIF | SC_OP_BEACONS);
+                clear_bit(SC_OP_PRIM_STA_VIF, &sc->sc_flags);
+                clear_bit(SC_OP_BEACONS, &sc->sc_flags);
                 avp->primary_sta_vif = false;
                 memset(common->curbssid, 0, ETH_ALEN);
                 common->curaid = 0;
@@ -1965,10 +1531,9 @@ static void ath9k_config_bss(struct ath_softc *sc, struct ieee80211_vif *vif)
          * None of station vifs are associated.
          * Clear bssid & aid
          */
-        if (!(sc->sc_flags & SC_OP_PRIM_STA_VIF)) {
+        if (!test_bit(SC_OP_PRIM_STA_VIF, &sc->sc_flags)) {
                 ath9k_hw_write_associd(sc->sc_ah);
-                /* Stop ANI */
-                sc->sc_flags &= ~SC_OP_ANI_RUN;
+                clear_bit(SC_OP_ANI_RUN, &sc->sc_flags);
                 del_timer_sync(&common->ani.timer);
                 del_timer_sync(&sc->rx_poll_timer);
                 memset(&sc->caldata, 0, sizeof(sc->caldata));
@@ -2006,12 +1571,12 @@ static void ath9k_bss_info_changed(struct ieee80211_hw *hw,
                         sc->sc_ah->stats.avgbrssi = ATH_RSSI_DUMMY_MARKER;
 
                         if (!common->disable_ani) {
-                                sc->sc_flags |= SC_OP_ANI_RUN;
+                                set_bit(SC_OP_ANI_RUN, &sc->sc_flags);
                                 ath_start_ani(common);
                         }
 
                 } else {
-                        sc->sc_flags &= ~SC_OP_ANI_RUN;
+                        clear_bit(SC_OP_ANI_RUN, &sc->sc_flags);
                         del_timer_sync(&common->ani.timer);
                         del_timer_sync(&sc->rx_poll_timer);
                 }
@@ -2023,7 +1588,7 @@ static void ath9k_bss_info_changed(struct ieee80211_hw *hw,
          */
         if ((changed & BSS_CHANGED_BEACON_INT) &&
             (vif->type == NL80211_IFTYPE_AP))
-                sc->sc_flags |= SC_OP_TSF_RESET;
+                set_bit(SC_OP_TSF_RESET, &sc->sc_flags);
 
         /* Configure beaconing (AP, IBSS, MESH) */
         if (ath9k_uses_beacons(vif->type) &&
@@ -2215,7 +1780,7 @@ static void ath9k_flush(struct ieee80211_hw *hw, bool drop)
                 return;
         }
 
-        if (sc->sc_flags & SC_OP_INVALID) {
+        if (test_bit(SC_OP_INVALID, &sc->sc_flags)) {
                 ath_dbg(common, ANY, "Device not present\n");
                 mutex_unlock(&sc->mutex);
                 return;
@@ -2380,6 +1945,134 @@ static int ath9k_get_antenna(struct ieee80211_hw *hw, u32 *tx_ant, u32 *rx_ant)
         return 0;
 }
 
+#ifdef CONFIG_ATH9K_DEBUGFS
+
+/* Ethtool support for get-stats */
+
+#define AMKSTR(nm) #nm "_BE", #nm "_BK", #nm "_VI", #nm "_VO"
+static const char ath9k_gstrings_stats[][ETH_GSTRING_LEN] = {
+        "tx_pkts_nic",
+        "tx_bytes_nic",
+        "rx_pkts_nic",
+        "rx_bytes_nic",
+        AMKSTR(d_tx_pkts),
+        AMKSTR(d_tx_bytes),
+        AMKSTR(d_tx_mpdus_queued),
+        AMKSTR(d_tx_mpdus_completed),
+        AMKSTR(d_tx_mpdu_xretries),
+        AMKSTR(d_tx_aggregates),
+        AMKSTR(d_tx_ampdus_queued_hw),
+        AMKSTR(d_tx_ampdus_queued_sw),
+        AMKSTR(d_tx_ampdus_completed),
+        AMKSTR(d_tx_ampdu_retries),
+        AMKSTR(d_tx_ampdu_xretries),
+        AMKSTR(d_tx_fifo_underrun),
+        AMKSTR(d_tx_op_exceeded),
+        AMKSTR(d_tx_timer_expiry),
+        AMKSTR(d_tx_desc_cfg_err),
+        AMKSTR(d_tx_data_underrun),
+        AMKSTR(d_tx_delim_underrun),
+
+        "d_rx_decrypt_crc_err",
+        "d_rx_phy_err",
+        "d_rx_mic_err",
+        "d_rx_pre_delim_crc_err",
+        "d_rx_post_delim_crc_err",
+        "d_rx_decrypt_busy_err",
+
+        "d_rx_phyerr_radar",
+        "d_rx_phyerr_ofdm_timing",
+        "d_rx_phyerr_cck_timing",
+
+};
+#define ATH9K_SSTATS_LEN ARRAY_SIZE(ath9k_gstrings_stats)
+
+static void ath9k_get_et_strings(struct ieee80211_hw *hw,
+                                 struct ieee80211_vif *vif,
+                                 u32 sset, u8 *data)
+{
+        if (sset == ETH_SS_STATS)
+                memcpy(data, *ath9k_gstrings_stats,
+                       sizeof(ath9k_gstrings_stats));
+}
+
+static int ath9k_get_et_sset_count(struct ieee80211_hw *hw,
+                                   struct ieee80211_vif *vif, int sset)
+{
+        if (sset == ETH_SS_STATS)
+                return ATH9K_SSTATS_LEN;
+        return 0;
+}
+
+#define PR_QNUM(_n) (sc->tx.txq_map[_n]->axq_qnum)
+#define AWDATA(elem)                                                    \
+        do {                                                            \
+                data[i++] = sc->debug.stats.txstats[PR_QNUM(WME_AC_BE)].elem; \
+                data[i++] = sc->debug.stats.txstats[PR_QNUM(WME_AC_BK)].elem; \
+                data[i++] = sc->debug.stats.txstats[PR_QNUM(WME_AC_VI)].elem; \
+                data[i++] = sc->debug.stats.txstats[PR_QNUM(WME_AC_VO)].elem; \
+        } while (0)
+
+#define AWDATA_RX(elem)                                         \
+        do {                                                    \
+                data[i++] = sc->debug.stats.rxstats.elem;       \
+        } while (0)
+
+static void ath9k_get_et_stats(struct ieee80211_hw *hw,
+                               struct ieee80211_vif *vif,
+                               struct ethtool_stats *stats, u64 *data)
+{
+        struct ath_softc *sc = hw->priv;
+        int i = 0;
+
+        data[i++] = (sc->debug.stats.txstats[PR_QNUM(WME_AC_BE)].tx_pkts_all +
+                     sc->debug.stats.txstats[PR_QNUM(WME_AC_BK)].tx_pkts_all +
+                     sc->debug.stats.txstats[PR_QNUM(WME_AC_VI)].tx_pkts_all +
+                     sc->debug.stats.txstats[PR_QNUM(WME_AC_VO)].tx_pkts_all);
+        data[i++] = (sc->debug.stats.txstats[PR_QNUM(WME_AC_BE)].tx_bytes_all +
+                     sc->debug.stats.txstats[PR_QNUM(WME_AC_BK)].tx_bytes_all +
+                     sc->debug.stats.txstats[PR_QNUM(WME_AC_VI)].tx_bytes_all +
+                     sc->debug.stats.txstats[PR_QNUM(WME_AC_VO)].tx_bytes_all);
+        AWDATA_RX(rx_pkts_all);
+        AWDATA_RX(rx_bytes_all);
+
+        AWDATA(tx_pkts_all);
+        AWDATA(tx_bytes_all);
+        AWDATA(queued);
+        AWDATA(completed);
+        AWDATA(xretries);
+        AWDATA(a_aggr);
+        AWDATA(a_queued_hw);
+        AWDATA(a_queued_sw);
+        AWDATA(a_completed);
+        AWDATA(a_retries);
+        AWDATA(a_xretries);
+        AWDATA(fifo_underrun);
+        AWDATA(xtxop);
+        AWDATA(timer_exp);
+        AWDATA(desc_cfg_err);
+        AWDATA(data_underrun);
+        AWDATA(delim_underrun);
+
+        AWDATA_RX(decrypt_crc_err);
+        AWDATA_RX(phy_err);
+        AWDATA_RX(mic_err);
+        AWDATA_RX(pre_delim_crc_err);
+        AWDATA_RX(post_delim_crc_err);
+        AWDATA_RX(decrypt_busy_err);
+
+        AWDATA_RX(phy_err_stats[ATH9K_PHYERR_RADAR]);
+        AWDATA_RX(phy_err_stats[ATH9K_PHYERR_OFDM_TIMING]);
+        AWDATA_RX(phy_err_stats[ATH9K_PHYERR_CCK_TIMING]);
+
+        WARN_ON(i != ATH9K_SSTATS_LEN);
+}
+
+/* End of ethtool get-stats functions */
+
+#endif
+
+
 struct ieee80211_ops ath9k_ops = {
         .tx                 = ath9k_tx,
         .start              = ath9k_start,
@@ -2408,4 +2101,10 @@ struct ieee80211_ops ath9k_ops = {
         .get_stats          = ath9k_get_stats,
         .set_antenna        = ath9k_set_antenna,
         .get_antenna        = ath9k_get_antenna,
+
+#ifdef CONFIG_ATH9K_DEBUGFS
+        .get_et_sset_count  = ath9k_get_et_sset_count,
+        .get_et_stats  = ath9k_get_et_stats,
+        .get_et_strings  = ath9k_get_et_strings,
+#endif
 };
diff --git a/drivers/net/wireless/ath/ath9k/mci.c b/drivers/net/wireless/ath/ath9k/mci.c
index 29fe52d6997..64cc782587d 100644
--- a/drivers/net/wireless/ath/ath9k/mci.c
+++ b/drivers/net/wireless/ath/ath9k/mci.c
@@ -20,7 +20,7 @@
 #include "ath9k.h"
 #include "mci.h"
 
-static const u8 ath_mci_duty_cycle[] = { 0, 50, 60, 70, 80, 85, 90, 95, 98 };
+static const u8 ath_mci_duty_cycle[] = { 55, 50, 60, 70, 80, 85, 90, 95, 98 };
 
 static struct ath_mci_profile_info*
 ath_mci_find_profile(struct ath_mci_profile *mci,
@@ -28,11 +28,14 @@ ath_mci_find_profile(struct ath_mci_profile *mci,
 {
         struct ath_mci_profile_info *entry;
 
+        if (list_empty(&mci->info))
+                return NULL;
+
         list_for_each_entry(entry, &mci->info, list) {
                 if (entry->conn_handle == info->conn_handle)
-                        break;
+                        return entry;
         }
-        return entry;
+        return NULL;
 }
 
 static bool ath_mci_add_profile(struct ath_common *common,
@@ -49,31 +52,21 @@ static bool ath_mci_add_profile(struct ath_common *common,
             (info->type != MCI_GPM_COEX_PROFILE_VOICE))
                 return false;
 
-        entry = ath_mci_find_profile(mci, info);
-
-        if (entry) {
-                memcpy(entry, info, 10);
-        } else {
-                entry = kzalloc(sizeof(*entry), GFP_KERNEL);
-                if (!entry)
-                        return false;
+        entry = kzalloc(sizeof(*entry), GFP_ATOMIC);
+        if (!entry)
+                return false;
 
-                memcpy(entry, info, 10);
-                INC_PROF(mci, info);
-                list_add_tail(&info->list, &mci->info);
-        }
+        memcpy(entry, info, 10);
+        INC_PROF(mci, info);
+        list_add_tail(&entry->list, &mci->info);
 
         return true;
 }
 
 static void ath_mci_del_profile(struct ath_common *common,
                                 struct ath_mci_profile *mci,
-                                struct ath_mci_profile_info *info)
+                                struct ath_mci_profile_info *entry)
 {
-        struct ath_mci_profile_info *entry;
-
-        entry = ath_mci_find_profile(mci, info);
-
         if (!entry)
                 return;
 
@@ -86,12 +79,16 @@ void ath_mci_flush_profile(struct ath_mci_profile *mci)
 {
         struct ath_mci_profile_info *info, *tinfo;
 
+        mci->aggr_limit = 0;
+
+        if (list_empty(&mci->info))
+                return;
+
         list_for_each_entry_safe(info, tinfo, &mci->info, list) {
                 list_del(&info->list);
                 DEC_PROF(mci, info);
                 kfree(info);
         }
-        mci->aggr_limit = 0;
 }
 
 static void ath_mci_adjust_aggr_limit(struct ath_btcoex *btcoex)
@@ -116,42 +113,60 @@ static void ath_mci_update_scheme(struct ath_softc *sc)
         struct ath_common *common = ath9k_hw_common(sc->sc_ah);
         struct ath_btcoex *btcoex = &sc->btcoex;
         struct ath_mci_profile *mci = &btcoex->mci;
+        struct ath9k_hw_mci *mci_hw = &sc->sc_ah->btcoex_hw.mci;
         struct ath_mci_profile_info *info;
         u32 num_profile = NUM_PROF(mci);
 
+        if (mci_hw->config & ATH_MCI_CONFIG_DISABLE_TUNING)
+                goto skip_tuning;
+
+        btcoex->duty_cycle = ath_mci_duty_cycle[num_profile];
+
         if (num_profile == 1) {
                 info = list_first_entry(&mci->info,
                                         struct ath_mci_profile_info,
                                         list);
-                if (mci->num_sco && info->T == 12) {
-                        mci->aggr_limit = 8;
+                if (mci->num_sco) {
+                        if (info->T == 12)
+                                mci->aggr_limit = 8;
+                        else if (info->T == 6) {
+                                mci->aggr_limit = 6;
+                                btcoex->duty_cycle = 30;
+                        }
                         ath_dbg(common, MCI,
-                                "Single SCO, aggregation limit 2 ms\n");
-                } else if ((info->type == MCI_GPM_COEX_PROFILE_BNEP) &&
-                           !info->master) {
-                        btcoex->btcoex_period = 60;
+                                "Single SCO, aggregation limit %d 1/4 ms\n",
+                                mci->aggr_limit);
+                } else if (mci->num_pan || mci->num_other_acl) {
+                        /*
+                         * For single PAN/FTP profile, allocate 35% for BT
+                         * to improve WLAN throughput.
+                         */
+                        btcoex->duty_cycle = 35;
+                        btcoex->btcoex_period = 53;
                         ath_dbg(common, MCI,
-                                "Single slave PAN/FTP, bt period 60 ms\n");
-                } else if ((info->type == MCI_GPM_COEX_PROFILE_HID) &&
-                         (info->T > 0 && info->T < 50) &&
-                         (info->A > 1 || info->W > 1)) {
+                                "Single PAN/FTP bt period %d ms dutycycle %d\n",
+                                btcoex->duty_cycle, btcoex->btcoex_period);
+                } else if (mci->num_hid) {
                         btcoex->duty_cycle = 30;
-                        mci->aggr_limit = 8;
+                        mci->aggr_limit = 6;
                         ath_dbg(common, MCI,
                                 "Multiple attempt/timeout single HID "
-                                "aggregation limit 2 ms dutycycle 30%%\n");
+                                "aggregation limit 1.5 ms dutycycle 30%%\n");
                 }
-        } else if ((num_profile == 2) && (mci->num_hid == 2)) {
-                btcoex->duty_cycle = 30;
-                mci->aggr_limit = 8;
-                ath_dbg(common, MCI,
-                        "Two HIDs aggregation limit 2 ms dutycycle 30%%\n");
-        } else if (num_profile > 3) {
+        } else if (num_profile == 2) {
+                if (mci->num_hid == 2)
+                        btcoex->duty_cycle = 30;
                 mci->aggr_limit = 6;
                 ath_dbg(common, MCI,
-                        "Three or more profiles aggregation limit 1.5 ms\n");
+                        "Two BT profiles aggr limit 1.5 ms dutycycle %d%%\n",
+                        btcoex->duty_cycle);
+        } else if (num_profile >= 3) {
+                mci->aggr_limit = 4;
+                ath_dbg(common, MCI,
+                        "Three or more profiles aggregation limit 1 ms\n");
         }
 
+skip_tuning:
         if (IS_CHAN_2GHZ(sc->sc_ah->curchan)) {
                 if (IS_CHAN_HT(sc->sc_ah->curchan))
                         ath_mci_adjust_aggr_limit(btcoex);
@@ -165,12 +180,11 @@ static void ath_mci_update_scheme(struct ath_softc *sc)
         if (IS_CHAN_5GHZ(sc->sc_ah->curchan))
                 return;
 
-        btcoex->duty_cycle += (mci->num_bdr ? ATH_MCI_MAX_DUTY_CYCLE : 0);
+        btcoex->duty_cycle += (mci->num_bdr ? ATH_MCI_BDR_DUTY_CYCLE : 0);
         if (btcoex->duty_cycle > ATH_MCI_MAX_DUTY_CYCLE)
                 btcoex->duty_cycle = ATH_MCI_MAX_DUTY_CYCLE;
 
-        btcoex->btcoex_period *= 1000;
-        btcoex->btcoex_no_stomp =  btcoex->btcoex_period *
+        btcoex->btcoex_no_stomp =  btcoex->btcoex_period * 1000 *
                 (100 - btcoex->duty_cycle) / 100;
 
         ath9k_hw_btcoex_enable(sc->sc_ah);
@@ -181,20 +195,16 @@ static void ath_mci_cal_msg(struct ath_softc *sc, u8 opcode, u8 *rx_payload)
 {
         struct ath_hw *ah = sc->sc_ah;
         struct ath_common *common = ath9k_hw_common(ah);
+        struct ath9k_hw_mci *mci_hw = &ah->btcoex_hw.mci;
         u32 payload[4] = {0, 0, 0, 0};
 
         switch (opcode) {
         case MCI_GPM_BT_CAL_REQ:
-                if (ar9003_mci_state(ah, MCI_STATE_BT, NULL) == MCI_BT_AWAKE) {
-                        ar9003_mci_state(ah, MCI_STATE_SET_BT_CAL_START, NULL);
+                if (mci_hw->bt_state == MCI_BT_AWAKE) {
+                        ar9003_mci_state(ah, MCI_STATE_SET_BT_CAL_START);
                         ieee80211_queue_work(sc->hw, &sc->hw_reset_work);
-                } else {
-                        ath_dbg(common, MCI, "MCI State mismatch: %d\n",
-                                ar9003_mci_state(ah, MCI_STATE_BT, NULL));
                 }
-                break;
-        case MCI_GPM_BT_CAL_DONE:
-                ar9003_mci_state(ah, MCI_STATE_BT, NULL);
+                ath_dbg(common, MCI, "MCI State : %d\n", mci_hw->bt_state);
                 break;
         case MCI_GPM_BT_CAL_GRANT:
                 MCI_GPM_SET_CAL_TYPE(payload, MCI_GPM_WLAN_CAL_DONE);
@@ -207,32 +217,55 @@ static void ath_mci_cal_msg(struct ath_softc *sc, u8 opcode, u8 *rx_payload)
         }
 }
 
+static void ath9k_mci_work(struct work_struct *work)
+{
+        struct ath_softc *sc = container_of(work, struct ath_softc, mci_work);
+
+        ath_mci_update_scheme(sc);
+}
+
 static void ath_mci_process_profile(struct ath_softc *sc,
                                     struct ath_mci_profile_info *info)
 {
         struct ath_common *common = ath9k_hw_common(sc->sc_ah);
         struct ath_btcoex *btcoex = &sc->btcoex;
         struct ath_mci_profile *mci = &btcoex->mci;
+        struct ath_mci_profile_info *entry = NULL;
+
+        entry = ath_mci_find_profile(mci, info);
+        if (entry) {
+                /*
+                 * Two MCI interrupts are generated while connecting to
+                 * headset and A2DP profile, but only one MCI interrupt
+                 * is generated with last added profile type while disconnecting
+                 * both profiles.
+                 * So while adding second profile type decrement
+                 * the first one.
+                 */
+                if (entry->type != info->type) {
+                        DEC_PROF(mci, entry);
+                        INC_PROF(mci, info);
+                }
+                memcpy(entry, info, 10);
+        }
 
         if (info->start) {
-                if (!ath_mci_add_profile(common, mci, info))
+                if (!entry && !ath_mci_add_profile(common, mci, info))
                         return;
         } else
-                ath_mci_del_profile(common, mci, info);
+                ath_mci_del_profile(common, mci, entry);
 
         btcoex->btcoex_period = ATH_MCI_DEF_BT_PERIOD;
         mci->aggr_limit = mci->num_sco ? 6 : 0;
 
-        if (NUM_PROF(mci)) {
+        btcoex->duty_cycle = ath_mci_duty_cycle[NUM_PROF(mci)];
+        if (NUM_PROF(mci))
                 btcoex->bt_stomp_type = ATH_BTCOEX_STOMP_LOW;
-                btcoex->duty_cycle = ath_mci_duty_cycle[NUM_PROF(mci)];
-        } else {
+        else
                 btcoex->bt_stomp_type = mci->num_mgmt ? ATH_BTCOEX_STOMP_ALL :
                                                         ATH_BTCOEX_STOMP_LOW;
-                btcoex->duty_cycle = ATH_BTCOEX_DEF_DUTY_CYCLE;
-        }
 
-        ath_mci_update_scheme(sc);
+        ieee80211_queue_work(sc->hw, &sc->mci_work);
 }
 
 static void ath_mci_process_status(struct ath_softc *sc,
@@ -247,8 +280,6 @@ static void ath_mci_process_status(struct ath_softc *sc,
         if (status->is_link)
                 return;
 
-        memset(&info, 0, sizeof(struct ath_mci_profile_info));
-
         info.conn_handle = status->conn_handle;
         if (ath_mci_find_profile(mci, &info))
                 return;
@@ -268,7 +299,7 @@ static void ath_mci_process_status(struct ath_softc *sc,
         } while (++i < ATH_MCI_MAX_PROFILE);
 
         if (old_num_mgmt != mci->num_mgmt)
-                ath_mci_update_scheme(sc);
+                ieee80211_queue_work(sc->hw, &sc->mci_work);
 }
 
 static void ath_mci_msg(struct ath_softc *sc, u8 opcode, u8 *rx_payload)
@@ -277,25 +308,20 @@ static void ath_mci_msg(struct ath_softc *sc, u8 opcode, u8 *rx_payload)
         struct ath_mci_profile_info profile_info;
         struct ath_mci_profile_status profile_status;
         struct ath_common *common = ath9k_hw_common(sc->sc_ah);
-        u32 version;
-        u8 major;
-        u8 minor;
+        u8 major, minor;
         u32 seq_num;
 
         switch (opcode) {
         case MCI_GPM_COEX_VERSION_QUERY:
-                version = ar9003_mci_state(ah, MCI_STATE_SEND_WLAN_COEX_VERSION,
-                                           NULL);
+                ar9003_mci_state(ah, MCI_STATE_SEND_WLAN_COEX_VERSION);
                 break;
         case MCI_GPM_COEX_VERSION_RESPONSE:
                 major = *(rx_payload + MCI_GPM_COEX_B_MAJOR_VERSION);
                 minor = *(rx_payload + MCI_GPM_COEX_B_MINOR_VERSION);
-                version = (major << 8) + minor;
-                version = ar9003_mci_state(ah, MCI_STATE_SET_BT_COEX_VERSION,
-                                           &version);
+                ar9003_mci_set_bt_version(ah, major, minor);
                 break;
         case MCI_GPM_COEX_STATUS_QUERY:
-                ar9003_mci_state(ah, MCI_STATE_SEND_WLAN_CHANNELS, NULL);
+                ar9003_mci_send_wlan_channels(ah);
                 break;
         case MCI_GPM_COEX_BT_PROFILE_INFO:
                 memcpy(&profile_info,
@@ -322,7 +348,7 @@ static void ath_mci_msg(struct ath_softc *sc, u8 opcode, u8 *rx_payload)
 
                 seq_num = *((u32 *)(rx_payload + 12));
                 ath_dbg(common, MCI,
-                        "BT_Status_Update: is_link=%d, linkId=%d, state=%d, SEQ=%d\n",
+                        "BT_Status_Update: is_link=%d, linkId=%d, state=%d, SEQ=%u\n",
                         profile_status.is_link, profile_status.conn_handle,
                         profile_status.is_critical, seq_num);
 
@@ -362,6 +388,7 @@ int ath_mci_setup(struct ath_softc *sc)
                          mci->gpm_buf.bf_addr, (mci->gpm_buf.bf_len >> 4),
                          mci->sched_buf.bf_paddr);
 
+        INIT_WORK(&sc->mci_work, ath9k_mci_work);
         ath_dbg(common, MCI, "MCI Initialized\n");
 
         return 0;
@@ -389,6 +416,7 @@ void ath_mci_intr(struct ath_softc *sc)
         struct ath_mci_coex *mci = &sc->mci_coex;
         struct ath_hw *ah = sc->sc_ah;
         struct ath_common *common = ath9k_hw_common(ah);
+        struct ath9k_hw_mci *mci_hw = &ah->btcoex_hw.mci;
         u32 mci_int, mci_int_rxmsg;
         u32 offset, subtype, opcode;
         u32 *pgpm;
@@ -397,8 +425,8 @@ void ath_mci_intr(struct ath_softc *sc)
 
         ar9003_mci_get_interrupt(sc->sc_ah, &mci_int, &mci_int_rxmsg);
 
-        if (ar9003_mci_state(ah, MCI_STATE_ENABLE, NULL) == 0) {
-                ar9003_mci_state(ah, MCI_STATE_INIT_GPM_OFFSET, NULL);
+        if (ar9003_mci_state(ah, MCI_STATE_ENABLE) == 0) {
+                ar9003_mci_get_next_gpm_offset(ah, true, NULL);
                 return;
         }
 
@@ -417,46 +445,41 @@ void ath_mci_intr(struct ath_softc *sc)
                                         NULL, 0, true, false);
 
                 mci_int_rxmsg &= ~AR_MCI_INTERRUPT_RX_MSG_REQ_WAKE;
-                ar9003_mci_state(ah, MCI_STATE_RESET_REQ_WAKE, NULL);
+                ar9003_mci_state(ah, MCI_STATE_RESET_REQ_WAKE);
 
                 /*
                  * always do this for recovery and 2G/5G toggling and LNA_TRANS
                  */
-                ar9003_mci_state(ah, MCI_STATE_SET_BT_AWAKE, NULL);
+                ar9003_mci_state(ah, MCI_STATE_SET_BT_AWAKE);
         }
 
         if (mci_int_rxmsg & AR_MCI_INTERRUPT_RX_MSG_SYS_WAKING) {
                 mci_int_rxmsg &= ~AR_MCI_INTERRUPT_RX_MSG_SYS_WAKING;
 
-                if (ar9003_mci_state(ah, MCI_STATE_BT, NULL) == MCI_BT_SLEEP) {
-                        if (ar9003_mci_state(ah, MCI_STATE_REMOTE_SLEEP, NULL) !=
-                            MCI_BT_SLEEP)
-                                ar9003_mci_state(ah, MCI_STATE_SET_BT_AWAKE,
-                                                 NULL);
-                }
+                if ((mci_hw->bt_state == MCI_BT_SLEEP) &&
+                    (ar9003_mci_state(ah, MCI_STATE_REMOTE_SLEEP) !=
+                     MCI_BT_SLEEP))
+                        ar9003_mci_state(ah, MCI_STATE_SET_BT_AWAKE);
         }
 
         if (mci_int_rxmsg & AR_MCI_INTERRUPT_RX_MSG_SYS_SLEEPING) {
                 mci_int_rxmsg &= ~AR_MCI_INTERRUPT_RX_MSG_SYS_SLEEPING;
 
-                if (ar9003_mci_state(ah, MCI_STATE_BT, NULL) == MCI_BT_AWAKE) {
-                        if (ar9003_mci_state(ah, MCI_STATE_REMOTE_SLEEP, NULL) !=
-                            MCI_BT_AWAKE)
-                                ar9003_mci_state(ah, MCI_STATE_SET_BT_SLEEP,
-                                                 NULL);
-                }
+                if ((mci_hw->bt_state == MCI_BT_AWAKE) &&
+                    (ar9003_mci_state(ah, MCI_STATE_REMOTE_SLEEP) !=
+                     MCI_BT_AWAKE))
+                        mci_hw->bt_state = MCI_BT_SLEEP;
         }
 
         if ((mci_int & AR_MCI_INTERRUPT_RX_INVALID_HDR) ||
             (mci_int & AR_MCI_INTERRUPT_CONT_INFO_TIMEOUT)) {
-                ar9003_mci_state(ah, MCI_STATE_RECOVER_RX, NULL);
+                ar9003_mci_state(ah, MCI_STATE_RECOVER_RX);
                 skip_gpm = true;
         }
 
         if (mci_int_rxmsg & AR_MCI_INTERRUPT_RX_MSG_SCHD_INFO) {
                 mci_int_rxmsg &= ~AR_MCI_INTERRUPT_RX_MSG_SCHD_INFO;
-                offset = ar9003_mci_state(ah, MCI_STATE_LAST_SCHD_MSG_OFFSET,
-                                          NULL);
+                offset = ar9003_mci_state(ah, MCI_STATE_LAST_SCHD_MSG_OFFSET);
         }
 
         if (mci_int_rxmsg & AR_MCI_INTERRUPT_RX_MSG_GPM) {
@@ -465,8 +488,8 @@ void ath_mci_intr(struct ath_softc *sc)
                 while (more_data == MCI_GPM_MORE) {
 
                         pgpm = mci->gpm_buf.bf_addr;
-                        offset = ar9003_mci_state(ah, MCI_STATE_NEXT_GPM_OFFSET,
-                                                  &more_data);
+                        offset = ar9003_mci_get_next_gpm_offset(ah, false,
+                                                                &more_data);
 
                         if (offset == MCI_GPM_INVALID)
                                 break;
@@ -507,23 +530,17 @@ void ath_mci_intr(struct ath_softc *sc)
                         mci_int_rxmsg &= ~AR_MCI_INTERRUPT_RX_MSG_LNA_INFO;
 
                 if (mci_int_rxmsg & AR_MCI_INTERRUPT_RX_MSG_CONT_INFO) {
-                        int value_dbm = ar9003_mci_state(ah,
-                                                 MCI_STATE_CONT_RSSI_POWER, NULL);
+                        int value_dbm = MS(mci_hw->cont_status,
+                                           AR_MCI_CONT_RSSI_POWER);
 
                         mci_int_rxmsg &= ~AR_MCI_INTERRUPT_RX_MSG_CONT_INFO;
 
-                        if (ar9003_mci_state(ah, MCI_STATE_CONT_TXRX, NULL))
-                                ath_dbg(common, MCI,
-                                        "MCI CONT_INFO: (tx) pri = %d, pwr = %d dBm\n",
-                                        ar9003_mci_state(ah,
-                                                 MCI_STATE_CONT_PRIORITY, NULL),
-                                        value_dbm);
-                        else
-                                ath_dbg(common, MCI,
-                                        "MCI CONT_INFO: (rx) pri = %d,pwr = %d dBm\n",
-                                        ar9003_mci_state(ah,
-                                                 MCI_STATE_CONT_PRIORITY, NULL),
-                                        value_dbm);
+                        ath_dbg(common, MCI,
+                                "MCI CONT_INFO: (%s) pri = %d pwr = %d dBm\n",
+                                MS(mci_hw->cont_status, AR_MCI_CONT_TXRX) ?
+                                "tx" : "rx",
+                                MS(mci_hw->cont_status, AR_MCI_CONT_PRIORITY),
+                                value_dbm);
                 }
 
                 if (mci_int_rxmsg & AR_MCI_INTERRUPT_RX_MSG_CONT_NACK)
@@ -538,3 +555,14 @@ void ath_mci_intr(struct ath_softc *sc)
                 mci_int &= ~(AR_MCI_INTERRUPT_RX_INVALID_HDR |
                              AR_MCI_INTERRUPT_CONT_INFO_TIMEOUT);
 }
+
+void ath_mci_enable(struct ath_softc *sc)
+{
+        struct ath_common *common = ath9k_hw_common(sc->sc_ah);
+
+        if (!common->btcoex_enabled)
+                return;
+
+        if (sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_MCI)
+                sc->sc_ah->imask |= ATH9K_INT_MCI;
+}
diff --git a/drivers/net/wireless/ath/ath9k/mci.h b/drivers/net/wireless/ath/ath9k/mci.h
index c841444f53c..fc14eea034e 100644
--- a/drivers/net/wireless/ath/ath9k/mci.h
+++ b/drivers/net/wireless/ath/ath9k/mci.h
@@ -130,4 +130,13 @@ void ath_mci_flush_profile(struct ath_mci_profile *mci);
 int ath_mci_setup(struct ath_softc *sc);
 void ath_mci_cleanup(struct ath_softc *sc);
 void ath_mci_intr(struct ath_softc *sc);
-#endif
+
+#ifdef CONFIG_ATH9K_BTCOEX_SUPPORT
+void ath_mci_enable(struct ath_softc *sc);
+#else
+static inline void ath_mci_enable(struct ath_softc *sc)
+{
+}
+#endif /* CONFIG_ATH9K_BTCOEX_SUPPORT */
+
+#endif /* MCI_H*/
diff --git a/drivers/net/wireless/ath/ath9k/pci.c b/drivers/net/wireless/ath/ath9k/pci.c
index a856b51255f..aa0e83ac51f 100644
--- a/drivers/net/wireless/ath/ath9k/pci.c
+++ b/drivers/net/wireless/ath/ath9k/pci.c
@@ -115,6 +115,9 @@ static void ath_pci_aspm_init(struct ath_common *common)
         int pos;
         u8 aspm;
 
+        if (!ah->is_pciexpress)
+                return;
+
         pos = pci_pcie_cap(pdev);
         if (!pos)
                 return;
@@ -138,6 +141,7 @@ static void ath_pci_aspm_init(struct ath_common *common)
                 aspm &= ~(PCIE_LINK_STATE_L0S | PCIE_LINK_STATE_L1);
                 pci_write_config_byte(parent, pos + PCI_EXP_LNKCTL, aspm);
 
+                ath_info(common, "Disabling ASPM since BTCOEX is enabled\n");
                 return;
         }
 
@@ -147,6 +151,7 @@ static void ath_pci_aspm_init(struct ath_common *common)
                 ah->aspm_enabled = true;
                 /* Initialize PCIe PM and SERDES registers. */
                 ath9k_hw_configpcipowersave(ah, false);
+                ath_info(common, "ASPM enabled: 0x%x\n", aspm);
         }
 }
 
@@ -246,7 +251,7 @@ static int ath_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)
         sc->mem = mem;
 
         /* Will be cleared in ath9k_start() */
-        sc->sc_flags |= SC_OP_INVALID;
+        set_bit(SC_OP_INVALID, &sc->sc_flags);
 
         ret = request_irq(pdev->irq, ath_isr, IRQF_SHARED, "ath9k", sc);
         if (ret) {
diff --git a/drivers/net/wireless/ath/ath9k/rc.c b/drivers/net/wireless/ath/ath9k/rc.c
index 92a6c0a87f8..e034add9cd5 100644
--- a/drivers/net/wireless/ath/ath9k/rc.c
+++ b/drivers/net/wireless/ath/ath9k/rc.c
@@ -770,7 +770,7 @@ static void ath_get_rate(void *priv, struct ieee80211_sta *sta, void *priv_sta,
         struct ieee80211_tx_rate *rates = tx_info->control.rates;
         struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;
         __le16 fc = hdr->frame_control;
-        u8 try_per_rate, i = 0, rix, high_rix;
+        u8 try_per_rate, i = 0, rix;
         int is_probe = 0;
 
         if (rate_control_send_low(sta, priv_sta, txrc))
@@ -791,7 +791,6 @@ static void ath_get_rate(void *priv, struct ieee80211_sta *sta, void *priv_sta,
         rate_table = ath_rc_priv->rate_table;
         rix = ath_rc_get_highest_rix(sc, ath_rc_priv, rate_table,
                                      &is_probe, false);
-        high_rix = rix;
 
         /*
          * If we're in HT mode and both us and our peer supports LDPC.
@@ -839,16 +838,16 @@ static void ath_get_rate(void *priv, struct ieee80211_sta *sta, void *priv_sta,
         try_per_rate = 8;
 
         /*
-         * Use a legacy rate as last retry to ensure that the frame
-         * is tried in both MCS and legacy rates.
+         * If the last rate in the rate series is MCS and has
+         * more than 80% of per thresh, then use a legacy rate
+         * as last retry to ensure that the frame is tried in both
+         * MCS and legacy rate.
          */
-        if ((rates[2].flags & IEEE80211_TX_RC_MCS) &&
-            (!(tx_info->flags & IEEE80211_TX_CTL_AMPDU) ||
-            (ath_rc_priv->per[high_rix] > 45)))
+        ath_rc_get_lower_rix(rate_table, ath_rc_priv, rix, &rix);
+        if (WLAN_RC_PHY_HT(rate_table->info[rix].phy) &&
+            (ath_rc_priv->per[rix] > 45))
                 rix = ath_rc_get_highest_rix(sc, ath_rc_priv, rate_table,
                                 &is_probe, true);
-        else
-                ath_rc_get_lower_rix(rate_table, ath_rc_priv, rix, &rix);
 
         /* All other rates in the series have RTS enabled */
         ath_rc_rate_set_series(rate_table, &rates[i], txrc,
diff --git a/drivers/net/wireless/ath/ath9k/recv.c b/drivers/net/wireless/ath/ath9k/recv.c
index 0735aeb3b26..6a7dd26f2a1 100644
--- a/drivers/net/wireless/ath/ath9k/recv.c
+++ b/drivers/net/wireless/ath/ath9k/recv.c
@@ -20,43 +20,6 @@
 
 #define SKB_CB_ATHBUF(__skb)    (*((struct ath_buf **)__skb->cb))
 
-static inline bool ath_is_alt_ant_ratio_better(int alt_ratio, int maxdelta,
-                                               int mindelta, int main_rssi_avg,
-                                               int alt_rssi_avg, int pkt_count)
-{
-        return (((alt_ratio >= ATH_ANT_DIV_COMB_ALT_ANT_RATIO2) &&
-                (alt_rssi_avg > main_rssi_avg + maxdelta)) ||
-                (alt_rssi_avg > main_rssi_avg + mindelta)) && (pkt_count > 50);
-}
-
-static inline bool ath_ant_div_comb_alt_check(u8 div_group, int alt_ratio,
-                                        int curr_main_set, int curr_alt_set,
-                                        int alt_rssi_avg, int main_rssi_avg)
-{
-        bool result = false;
-        switch (div_group) {
-        case 0:
-                if (alt_ratio > ATH_ANT_DIV_COMB_ALT_ANT_RATIO)
-                        result = true;
-                break;
-        case 1:
-        case 2:
-                if ((((curr_main_set == ATH_ANT_DIV_COMB_LNA2) &&
-                        (curr_alt_set == ATH_ANT_DIV_COMB_LNA1) &&
-                                (alt_rssi_avg >= (main_rssi_avg - 5))) ||
-                        ((curr_main_set == ATH_ANT_DIV_COMB_LNA1) &&
-                        (curr_alt_set == ATH_ANT_DIV_COMB_LNA2) &&
-                                (alt_rssi_avg >= (main_rssi_avg - 2)))) &&
-                                                        (alt_rssi_avg >= 4))
-                        result = true;
-                else
-                        result = false;
-                break;
-        }
-
-        return result;
-}
-
 static inline bool ath9k_check_auto_sleep(struct ath_softc *sc)
 {
         return sc->ps_enabled &&
@@ -303,7 +266,7 @@ static void ath_edma_start_recv(struct ath_softc *sc)
 
         ath_opmode_init(sc);
 
-        ath9k_hw_startpcureceive(sc->sc_ah, (sc->sc_flags & SC_OP_OFFCHANNEL));
+        ath9k_hw_startpcureceive(sc->sc_ah, !!(sc->hw->conf.flags & IEEE80211_CONF_OFFCHANNEL));
 
         spin_unlock_bh(&sc->rx.rxbuflock);
 }
@@ -322,8 +285,8 @@ int ath_rx_init(struct ath_softc *sc, int nbufs)
         int error = 0;
 
         spin_lock_init(&sc->sc_pcu_lock);
-        sc->sc_flags &= ~SC_OP_RXFLUSH;
         spin_lock_init(&sc->rx.rxbuflock);
+        clear_bit(SC_OP_RXFLUSH, &sc->sc_flags);
 
         common->rx_bufsize = IEEE80211_MAX_MPDU_LEN / 2 +
                              sc->sc_ah->caps.rx_status_len;
@@ -500,7 +463,7 @@ int ath_startrecv(struct ath_softc *sc)
 
 start_recv:
         ath_opmode_init(sc);
-        ath9k_hw_startpcureceive(ah, (sc->sc_flags & SC_OP_OFFCHANNEL));
+        ath9k_hw_startpcureceive(ah, !!(sc->hw->conf.flags & IEEE80211_CONF_OFFCHANNEL));
 
         spin_unlock_bh(&sc->rx.rxbuflock);
 
@@ -535,11 +498,11 @@ bool ath_stoprecv(struct ath_softc *sc)
 
 void ath_flushrecv(struct ath_softc *sc)
 {
-        sc->sc_flags |= SC_OP_RXFLUSH;
+        set_bit(SC_OP_RXFLUSH, &sc->sc_flags);
         if (sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_EDMA)
                 ath_rx_tasklet(sc, 1, true);
         ath_rx_tasklet(sc, 1, false);
-        sc->sc_flags &= ~SC_OP_RXFLUSH;
+        clear_bit(SC_OP_RXFLUSH, &sc->sc_flags);
 }
 
 static bool ath_beacon_dtim_pending_cab(struct sk_buff *skb)
@@ -624,13 +587,13 @@ static void ath_rx_ps(struct ath_softc *sc, struct sk_buff *skb, bool mybeacon)
 
         /* Process Beacon and CAB receive in PS state */
         if (((sc->ps_flags & PS_WAIT_FOR_BEACON) || ath9k_check_auto_sleep(sc))
-            && mybeacon)
+            && mybeacon) {
                 ath_rx_ps_beacon(sc, skb);
-        else if ((sc->ps_flags & PS_WAIT_FOR_CAB) &&
-                 (ieee80211_is_data(hdr->frame_control) ||
-                  ieee80211_is_action(hdr->frame_control)) &&
-                 is_multicast_ether_addr(hdr->addr1) &&
-                 !ieee80211_has_moredata(hdr->frame_control)) {
+        } else if ((sc->ps_flags & PS_WAIT_FOR_CAB) &&
+                   (ieee80211_is_data(hdr->frame_control) ||
+                    ieee80211_is_action(hdr->frame_control)) &&
+                   is_multicast_ether_addr(hdr->addr1) &&
+                   !ieee80211_has_moredata(hdr->frame_control)) {
                 /*
                  * No more broadcast/multicast frames to be received at this
                  * point.
@@ -1068,709 +1031,6 @@ static void ath9k_rx_skb_postprocess(struct ath_common *common,
                 rxs->flag &= ~RX_FLAG_DECRYPTED;
 }
 
-static void ath_lnaconf_alt_good_scan(struct ath_ant_comb *antcomb,
-                                      struct ath_hw_antcomb_conf ant_conf,
-                                      int main_rssi_avg)
-{
-        antcomb->quick_scan_cnt = 0;
-
-        if (ant_conf.main_lna_conf == ATH_ANT_DIV_COMB_LNA2)
-                antcomb->rssi_lna2 = main_rssi_avg;
-        else if (ant_conf.main_lna_conf == ATH_ANT_DIV_COMB_LNA1)
-                antcomb->rssi_lna1 = main_rssi_avg;
-
-        switch ((ant_conf.main_lna_conf << 4) | ant_conf.alt_lna_conf) {
-        case 0x10: /* LNA2 A-B */
-                antcomb->main_conf = ATH_ANT_DIV_COMB_LNA1_MINUS_LNA2;
-                antcomb->first_quick_scan_conf =
-                        ATH_ANT_DIV_COMB_LNA1_PLUS_LNA2;
-                antcomb->second_quick_scan_conf = ATH_ANT_DIV_COMB_LNA1;
-                break;
-        case 0x20: /* LNA1 A-B */
-                antcomb->main_conf = ATH_ANT_DIV_COMB_LNA1_MINUS_LNA2;
-                antcomb->first_quick_scan_conf =
-                        ATH_ANT_DIV_COMB_LNA1_PLUS_LNA2;
-                antcomb->second_quick_scan_conf = ATH_ANT_DIV_COMB_LNA2;
-                break;
-        case 0x21: /* LNA1 LNA2 */
-                antcomb->main_conf = ATH_ANT_DIV_COMB_LNA2;
-                antcomb->first_quick_scan_conf =
-                        ATH_ANT_DIV_COMB_LNA1_MINUS_LNA2;
-                antcomb->second_quick_scan_conf =
-                        ATH_ANT_DIV_COMB_LNA1_PLUS_LNA2;
-                break;
-        case 0x12: /* LNA2 LNA1 */
-                antcomb->main_conf = ATH_ANT_DIV_COMB_LNA1;
-                antcomb->first_quick_scan_conf =
-                        ATH_ANT_DIV_COMB_LNA1_MINUS_LNA2;
-                antcomb->second_quick_scan_conf =
-                        ATH_ANT_DIV_COMB_LNA1_PLUS_LNA2;
-                break;
-        case 0x13: /* LNA2 A+B */
-                antcomb->main_conf = ATH_ANT_DIV_COMB_LNA1_PLUS_LNA2;
-                antcomb->first_quick_scan_conf =
-                        ATH_ANT_DIV_COMB_LNA1_MINUS_LNA2;
-                antcomb->second_quick_scan_conf = ATH_ANT_DIV_COMB_LNA1;
-                break;
-        case 0x23: /* LNA1 A+B */
-                antcomb->main_conf = ATH_ANT_DIV_COMB_LNA1_PLUS_LNA2;
-                antcomb->first_quick_scan_conf =
-                        ATH_ANT_DIV_COMB_LNA1_MINUS_LNA2;
-                antcomb->second_quick_scan_conf = ATH_ANT_DIV_COMB_LNA2;
-                break;
-        default:
-                break;
-        }
-}
-
-static void ath_select_ant_div_from_quick_scan(struct ath_ant_comb *antcomb,
-                                struct ath_hw_antcomb_conf *div_ant_conf,
-                                int main_rssi_avg, int alt_rssi_avg,
-                                int alt_ratio)
-{
-        /* alt_good */
-        switch (antcomb->quick_scan_cnt) {
-        case 0:
-                /* set alt to main, and alt to first conf */
-                div_ant_conf->main_lna_conf = antcomb->main_conf;
-                div_ant_conf->alt_lna_conf = antcomb->first_quick_scan_conf;
-                break;
-        case 1:
-                /* set alt to main, and alt to first conf */
-                div_ant_conf->main_lna_conf = antcomb->main_conf;
-                div_ant_conf->alt_lna_conf = antcomb->second_quick_scan_conf;
-                antcomb->rssi_first = main_rssi_avg;
-                antcomb->rssi_second = alt_rssi_avg;
-
-                if (antcomb->main_conf == ATH_ANT_DIV_COMB_LNA1) {
-                        /* main is LNA1 */
-                        if (ath_is_alt_ant_ratio_better(alt_ratio,
-                                                ATH_ANT_DIV_COMB_LNA1_DELTA_HI,
-                                                ATH_ANT_DIV_COMB_LNA1_DELTA_LOW,
-                                                main_rssi_avg, alt_rssi_avg,
-                                                antcomb->total_pkt_count))
-                                antcomb->first_ratio = true;
-                        else
-                                antcomb->first_ratio = false;
-                } else if (antcomb->main_conf == ATH_ANT_DIV_COMB_LNA2) {
-                        if (ath_is_alt_ant_ratio_better(alt_ratio,
-                                                ATH_ANT_DIV_COMB_LNA1_DELTA_MID,
-                                                ATH_ANT_DIV_COMB_LNA1_DELTA_LOW,
-                                                main_rssi_avg, alt_rssi_avg,
-                                                antcomb->total_pkt_count))
-                                antcomb->first_ratio = true;
-                        else
-                                antcomb->first_ratio = false;
-                } else {
-                        if ((((alt_ratio >= ATH_ANT_DIV_COMB_ALT_ANT_RATIO2) &&
-                            (alt_rssi_avg > main_rssi_avg +
-                            ATH_ANT_DIV_COMB_LNA1_DELTA_HI)) ||
-                            (alt_rssi_avg > main_rssi_avg)) &&
-                            (antcomb->total_pkt_count > 50))
-                                antcomb->first_ratio = true;
-                        else
-                                antcomb->first_ratio = false;
-                }
-                break;
-        case 2:
-                antcomb->alt_good = false;
-                antcomb->scan_not_start = false;
-                antcomb->scan = false;
-                antcomb->rssi_first = main_rssi_avg;
-                antcomb->rssi_third = alt_rssi_avg;
-
-                if (antcomb->second_quick_scan_conf == ATH_ANT_DIV_COMB_LNA1)
-                        antcomb->rssi_lna1 = alt_rssi_avg;
-                else if (antcomb->second_quick_scan_conf ==
-                         ATH_ANT_DIV_COMB_LNA2)
-                        antcomb->rssi_lna2 = alt_rssi_avg;
-                else if (antcomb->second_quick_scan_conf ==
-                         ATH_ANT_DIV_COMB_LNA1_PLUS_LNA2) {
-                        if (antcomb->main_conf == ATH_ANT_DIV_COMB_LNA2)
-                                antcomb->rssi_lna2 = main_rssi_avg;
-                        else if (antcomb->main_conf == ATH_ANT_DIV_COMB_LNA1)
-                                antcomb->rssi_lna1 = main_rssi_avg;
-                }
-
-                if (antcomb->rssi_lna2 > antcomb->rssi_lna1 +
-                    ATH_ANT_DIV_COMB_LNA1_LNA2_SWITCH_DELTA)
-                        div_ant_conf->main_lna_conf = ATH_ANT_DIV_COMB_LNA2;
-                else
-                        div_ant_conf->main_lna_conf = ATH_ANT_DIV_COMB_LNA1;
-
-                if (antcomb->main_conf == ATH_ANT_DIV_COMB_LNA1) {
-                        if (ath_is_alt_ant_ratio_better(alt_ratio,
-                                                ATH_ANT_DIV_COMB_LNA1_DELTA_HI,
-                                                ATH_ANT_DIV_COMB_LNA1_DELTA_LOW,
-                                                main_rssi_avg, alt_rssi_avg,
-                                                antcomb->total_pkt_count))
-                                antcomb->second_ratio = true;
-                        else
-                                antcomb->second_ratio = false;
-                } else if (antcomb->main_conf == ATH_ANT_DIV_COMB_LNA2) {
-                        if (ath_is_alt_ant_ratio_better(alt_ratio,
-                                                ATH_ANT_DIV_COMB_LNA1_DELTA_MID,
-                                                ATH_ANT_DIV_COMB_LNA1_DELTA_LOW,
-                                                main_rssi_avg, alt_rssi_avg,
-                                                antcomb->total_pkt_count))
-                                antcomb->second_ratio = true;
-                        else
-                                antcomb->second_ratio = false;
-                } else {
-                        if ((((alt_ratio >= ATH_ANT_DIV_COMB_ALT_ANT_RATIO2) &&
-                            (alt_rssi_avg > main_rssi_avg +
-                            ATH_ANT_DIV_COMB_LNA1_DELTA_HI)) ||
-                            (alt_rssi_avg > main_rssi_avg)) &&
-                            (antcomb->total_pkt_count > 50))
-                                antcomb->second_ratio = true;
-                        else
-                                antcomb->second_ratio = false;
-                }
-
-                /* set alt to the conf with maximun ratio */
-                if (antcomb->first_ratio && antcomb->second_ratio) {
-                        if (antcomb->rssi_second > antcomb->rssi_third) {
-                                /* first alt*/
-                                if ((antcomb->first_quick_scan_conf ==
-                                    ATH_ANT_DIV_COMB_LNA1) ||
-                                    (antcomb->first_quick_scan_conf ==
-                                    ATH_ANT_DIV_COMB_LNA2))
-                                        /* Set alt LNA1 or LNA2*/
-                                        if (div_ant_conf->main_lna_conf ==
-                                            ATH_ANT_DIV_COMB_LNA2)
-                                                div_ant_conf->alt_lna_conf =
-                                                        ATH_ANT_DIV_COMB_LNA1;
-                                        else
-                                                div_ant_conf->alt_lna_conf =
-                                                        ATH_ANT_DIV_COMB_LNA2;
-                                else
-                                        /* Set alt to A+B or A-B */
-                                        div_ant_conf->alt_lna_conf =
-                                                antcomb->first_quick_scan_conf;
-                        } else if ((antcomb->second_quick_scan_conf ==
-                                   ATH_ANT_DIV_COMB_LNA1) ||
-                                   (antcomb->second_quick_scan_conf ==
-                                   ATH_ANT_DIV_COMB_LNA2)) {
-                                /* Set alt LNA1 or LNA2 */
-                                if (div_ant_conf->main_lna_conf ==
-                                    ATH_ANT_DIV_COMB_LNA2)
-                                        div_ant_conf->alt_lna_conf =
-                                                ATH_ANT_DIV_COMB_LNA1;
-                                else
-                                        div_ant_conf->alt_lna_conf =
-                                                ATH_ANT_DIV_COMB_LNA2;
-                        } else {
-                                /* Set alt to A+B or A-B */
-                                div_ant_conf->alt_lna_conf =
-                                        antcomb->second_quick_scan_conf;
-                        }
-                } else if (antcomb->first_ratio) {
-                        /* first alt */
-                        if ((antcomb->first_quick_scan_conf ==
-                            ATH_ANT_DIV_COMB_LNA1) ||
-                            (antcomb->first_quick_scan_conf ==
-                            ATH_ANT_DIV_COMB_LNA2))
-                                        /* Set alt LNA1 or LNA2 */
-                                if (div_ant_conf->main_lna_conf ==
-                                    ATH_ANT_DIV_COMB_LNA2)
-                                        div_ant_conf->alt_lna_conf =
-                                                        ATH_ANT_DIV_COMB_LNA1;
-                                else
-                                        div_ant_conf->alt_lna_conf =
-                                                        ATH_ANT_DIV_COMB_LNA2;
-                        else
-                                /* Set alt to A+B or A-B */
-                                div_ant_conf->alt_lna_conf =
-                                                antcomb->first_quick_scan_conf;
-                } else if (antcomb->second_ratio) {
-                                /* second alt */
-                        if ((antcomb->second_quick_scan_conf ==
-                            ATH_ANT_DIV_COMB_LNA1) ||
-                            (antcomb->second_quick_scan_conf ==
-                            ATH_ANT_DIV_COMB_LNA2))
-                                /* Set alt LNA1 or LNA2 */
-                                if (div_ant_conf->main_lna_conf ==
-                                    ATH_ANT_DIV_COMB_LNA2)
-                                        div_ant_conf->alt_lna_conf =
-                                                ATH_ANT_DIV_COMB_LNA1;
-                                else
-                                        div_ant_conf->alt_lna_conf =
-                                                ATH_ANT_DIV_COMB_LNA2;
-                        else
-                                /* Set alt to A+B or A-B */
-                                div_ant_conf->alt_lna_conf =
-                                                antcomb->second_quick_scan_conf;
-                } else {
-                        /* main is largest */
-                        if ((antcomb->main_conf == ATH_ANT_DIV_COMB_LNA1) ||
-                            (antcomb->main_conf == ATH_ANT_DIV_COMB_LNA2))
-                                /* Set alt LNA1 or LNA2 */
-                                if (div_ant_conf->main_lna_conf ==
-                                    ATH_ANT_DIV_COMB_LNA2)
-                                        div_ant_conf->alt_lna_conf =
-                                                        ATH_ANT_DIV_COMB_LNA1;
-                                else
-                                        div_ant_conf->alt_lna_conf =
-                                                        ATH_ANT_DIV_COMB_LNA2;
-                        else
-                                /* Set alt to A+B or A-B */
-                                div_ant_conf->alt_lna_conf = antcomb->main_conf;
-                }
-                break;
-        default:
-                break;
-        }
-}
-
-static void ath_ant_div_conf_fast_divbias(struct ath_hw_antcomb_conf *ant_conf,
-                struct ath_ant_comb *antcomb, int alt_ratio)
-{
-        if (ant_conf->div_group == 0) {
-                /* Adjust the fast_div_bias based on main and alt lna conf */
-                switch ((ant_conf->main_lna_conf << 4) |
-                                ant_conf->alt_lna_conf) {
-                case 0x01: /* A-B LNA2 */
-                        ant_conf->fast_div_bias = 0x3b;
-                        break;
-                case 0x02: /* A-B LNA1 */
-                        ant_conf->fast_div_bias = 0x3d;
-                        break;
-                case 0x03: /* A-B A+B */
-                        ant_conf->fast_div_bias = 0x1;
-                        break;
-                case 0x10: /* LNA2 A-B */
-                        ant_conf->fast_div_bias = 0x7;
-                        break;
-                case 0x12: /* LNA2 LNA1 */
-                        ant_conf->fast_div_bias = 0x2;
-                        break;
-                case 0x13: /* LNA2 A+B */
-                        ant_conf->fast_div_bias = 0x7;
-                        break;
-                case 0x20: /* LNA1 A-B */
-                        ant_conf->fast_div_bias = 0x6;
-                        break;
-                case 0x21: /* LNA1 LNA2 */
-                        ant_conf->fast_div_bias = 0x0;
-                        break;
-                case 0x23: /* LNA1 A+B */
-                        ant_conf->fast_div_bias = 0x6;
-                        break;
-                case 0x30: /* A+B A-B */
-                        ant_conf->fast_div_bias = 0x1;
-                        break;
-                case 0x31: /* A+B LNA2 */
-                        ant_conf->fast_div_bias = 0x3b;
-                        break;
-                case 0x32: /* A+B LNA1 */
-                        ant_conf->fast_div_bias = 0x3d;
-                        break;
-                default:
-                        break;
-                }
-        } else if (ant_conf->div_group == 1) {
-                /* Adjust the fast_div_bias based on main and alt_lna_conf */
-                switch ((ant_conf->main_lna_conf << 4) |
-                        ant_conf->alt_lna_conf) {
-                case 0x01: /* A-B LNA2 */
-                        ant_conf->fast_div_bias = 0x1;
-                        ant_conf->main_gaintb = 0;
-                        ant_conf->alt_gaintb = 0;
-                        break;
-                case 0x02: /* A-B LNA1 */
-                        ant_conf->fast_div_bias = 0x1;
-                        ant_conf->main_gaintb = 0;
-                        ant_conf->alt_gaintb = 0;
-                        break;
-                case 0x03: /* A-B A+B */
-                        ant_conf->fast_div_bias = 0x1;
-                        ant_conf->main_gaintb = 0;
-                        ant_conf->alt_gaintb = 0;
-                        break;
-                case 0x10: /* LNA2 A-B */
-                        if (!(antcomb->scan) &&
-                            (alt_ratio > ATH_ANT_DIV_COMB_ALT_ANT_RATIO))
-                                ant_conf->fast_div_bias = 0x3f;
-                        else
-                                ant_conf->fast_div_bias = 0x1;
-                        ant_conf->main_gaintb = 0;
-                        ant_conf->alt_gaintb = 0;
-                        break;
-                case 0x12: /* LNA2 LNA1 */
-                        ant_conf->fast_div_bias = 0x1;
-                        ant_conf->main_gaintb = 0;
-                        ant_conf->alt_gaintb = 0;
-                        break;
-                case 0x13: /* LNA2 A+B */
-                        if (!(antcomb->scan) &&
-                            (alt_ratio > ATH_ANT_DIV_COMB_ALT_ANT_RATIO))
-                                ant_conf->fast_div_bias = 0x3f;
-                        else
-                                ant_conf->fast_div_bias = 0x1;
-                        ant_conf->main_gaintb = 0;
-                        ant_conf->alt_gaintb = 0;
-                        break;
-                case 0x20: /* LNA1 A-B */
-                        if (!(antcomb->scan) &&
-                            (alt_ratio > ATH_ANT_DIV_COMB_ALT_ANT_RATIO))
-                                ant_conf->fast_div_bias = 0x3f;
-                        else
-                                ant_conf->fast_div_bias = 0x1;
-                        ant_conf->main_gaintb = 0;
-                        ant_conf->alt_gaintb = 0;
-                        break;
-                case 0x21: /* LNA1 LNA2 */
-                        ant_conf->fast_div_bias = 0x1;
-                        ant_conf->main_gaintb = 0;
-                        ant_conf->alt_gaintb = 0;
-                        break;
-                case 0x23: /* LNA1 A+B */
-                        if (!(antcomb->scan) &&
-                            (alt_ratio > ATH_ANT_DIV_COMB_ALT_ANT_RATIO))
-                                ant_conf->fast_div_bias = 0x3f;
-                        else
-                                ant_conf->fast_div_bias = 0x1;
-                        ant_conf->main_gaintb = 0;
-                        ant_conf->alt_gaintb = 0;
-                        break;
-                case 0x30: /* A+B A-B */
-                        ant_conf->fast_div_bias = 0x1;
-                        ant_conf->main_gaintb = 0;
-                        ant_conf->alt_gaintb = 0;
-                        break;
-                case 0x31: /* A+B LNA2 */
-                        ant_conf->fast_div_bias = 0x1;
-                        ant_conf->main_gaintb = 0;
-                        ant_conf->alt_gaintb = 0;
-                        break;
-                case 0x32: /* A+B LNA1 */
-                        ant_conf->fast_div_bias = 0x1;
-                        ant_conf->main_gaintb = 0;
-                        ant_conf->alt_gaintb = 0;
-                        break;
-                default:
-                        break;
-                }
-        } else if (ant_conf->div_group == 2) {
-                /* Adjust the fast_div_bias based on main and alt_lna_conf */
-                switch ((ant_conf->main_lna_conf << 4) |
-                                ant_conf->alt_lna_conf) {
-                case 0x01: /* A-B LNA2 */
-                        ant_conf->fast_div_bias = 0x1;
-                        ant_conf->main_gaintb = 0;
-                        ant_conf->alt_gaintb = 0;
-                        break;
-                case 0x02: /* A-B LNA1 */
-                        ant_conf->fast_div_bias = 0x1;
-                        ant_conf->main_gaintb = 0;
-                        ant_conf->alt_gaintb = 0;
-                        break;
-                case 0x03: /* A-B A+B */
-                        ant_conf->fast_div_bias = 0x1;
-                        ant_conf->main_gaintb = 0;
-                        ant_conf->alt_gaintb = 0;
-                        break;
-                case 0x10: /* LNA2 A-B */
-                        if (!(antcomb->scan) &&
-                                (alt_ratio > ATH_ANT_DIV_COMB_ALT_ANT_RATIO))
-                                ant_conf->fast_div_bias = 0x1;
-                        else
-                                ant_conf->fast_div_bias = 0x2;
-                        ant_conf->main_gaintb = 0;
-                        ant_conf->alt_gaintb = 0;
-                        break;
-                case 0x12: /* LNA2 LNA1 */
-                        ant_conf->fast_div_bias = 0x1;
-                        ant_conf->main_gaintb = 0;
-                        ant_conf->alt_gaintb = 0;
-                        break;
-                case 0x13: /* LNA2 A+B */
-                        if (!(antcomb->scan) &&
-                                (alt_ratio > ATH_ANT_DIV_COMB_ALT_ANT_RATIO))
-                                ant_conf->fast_div_bias = 0x1;
-                        else
-                                ant_conf->fast_div_bias = 0x2;
-                        ant_conf->main_gaintb = 0;
-                        ant_conf->alt_gaintb = 0;
-                        break;
-                case 0x20: /* LNA1 A-B */
-                        if (!(antcomb->scan) &&
-                                (alt_ratio > ATH_ANT_DIV_COMB_ALT_ANT_RATIO))
-                                ant_conf->fast_div_bias = 0x1;
-                        else
-                                ant_conf->fast_div_bias = 0x2;
-                        ant_conf->main_gaintb = 0;
-                        ant_conf->alt_gaintb = 0;
-                        break;
-                case 0x21: /* LNA1 LNA2 */
-                        ant_conf->fast_div_bias = 0x1;
-                        ant_conf->main_gaintb = 0;
-                        ant_conf->alt_gaintb = 0;
-                        break;
-                case 0x23: /* LNA1 A+B */
-                        if (!(antcomb->scan) &&
-                                (alt_ratio > ATH_ANT_DIV_COMB_ALT_ANT_RATIO))
-                                ant_conf->fast_div_bias = 0x1;
-                        else
-                                ant_conf->fast_div_bias = 0x2;
-                        ant_conf->main_gaintb = 0;
-                        ant_conf->alt_gaintb = 0;
-                        break;
-                case 0x30: /* A+B A-B */
-                        ant_conf->fast_div_bias = 0x1;
-                        ant_conf->main_gaintb = 0;
-                        ant_conf->alt_gaintb = 0;
-                        break;
-                case 0x31: /* A+B LNA2 */
-                        ant_conf->fast_div_bias = 0x1;
-                        ant_conf->main_gaintb = 0;
-                        ant_conf->alt_gaintb = 0;
-                        break;
-                case 0x32: /* A+B LNA1 */
-                        ant_conf->fast_div_bias = 0x1;
-                        ant_conf->main_gaintb = 0;
-                        ant_conf->alt_gaintb = 0;
-                        break;
-                default:
-                        break;
-                }
-        }
-}
-
-/* Antenna diversity and combining */
-static void ath_ant_comb_scan(struct ath_softc *sc, struct ath_rx_status *rs)
-{
-        struct ath_hw_antcomb_conf div_ant_conf;
-        struct ath_ant_comb *antcomb = &sc->ant_comb;
-        int alt_ratio = 0, alt_rssi_avg = 0, main_rssi_avg = 0, curr_alt_set;
-        int curr_main_set;
-        int main_rssi = rs->rs_rssi_ctl0;
-        int alt_rssi = rs->rs_rssi_ctl1;
-        int rx_ant_conf,  main_ant_conf;
-        bool short_scan = false;
-
-        rx_ant_conf = (rs->rs_rssi_ctl2 >> ATH_ANT_RX_CURRENT_SHIFT) &
-                       ATH_ANT_RX_MASK;
-        main_ant_conf = (rs->rs_rssi_ctl2 >> ATH_ANT_RX_MAIN_SHIFT) &
-                         ATH_ANT_RX_MASK;
-
-        /* Record packet only when both main_rssi and  alt_rssi is positive */
-        if (main_rssi > 0 && alt_rssi > 0) {
-                antcomb->total_pkt_count++;
-                antcomb->main_total_rssi += main_rssi;
-                antcomb->alt_total_rssi  += alt_rssi;
-                if (main_ant_conf == rx_ant_conf)
-                        antcomb->main_recv_cnt++;
-                else
-                        antcomb->alt_recv_cnt++;
-        }
-
-        /* Short scan check */
-        if (antcomb->scan && antcomb->alt_good) {
-                if (time_after(jiffies, antcomb->scan_start_time +
-                    msecs_to_jiffies(ATH_ANT_DIV_COMB_SHORT_SCAN_INTR)))
-                        short_scan = true;
-                else
-                        if (antcomb->total_pkt_count ==
-                            ATH_ANT_DIV_COMB_SHORT_SCAN_PKTCOUNT) {
-                                alt_ratio = ((antcomb->alt_recv_cnt * 100) /
-                                            antcomb->total_pkt_count);
-                                if (alt_ratio < ATH_ANT_DIV_COMB_ALT_ANT_RATIO)
-                                        short_scan = true;
-                        }
-        }
-
-        if (((antcomb->total_pkt_count < ATH_ANT_DIV_COMB_MAX_PKTCOUNT) ||
-            rs->rs_moreaggr) && !short_scan)
-                return;
-
-        if (antcomb->total_pkt_count) {
-                alt_ratio = ((antcomb->alt_recv_cnt * 100) /
-                             antcomb->total_pkt_count);
-                main_rssi_avg = (antcomb->main_total_rssi /
-                                 antcomb->total_pkt_count);
-                alt_rssi_avg = (antcomb->alt_total_rssi /
-                                 antcomb->total_pkt_count);
-        }
-
-
-        ath9k_hw_antdiv_comb_conf_get(sc->sc_ah, &div_ant_conf);
-        curr_alt_set = div_ant_conf.alt_lna_conf;
-        curr_main_set = div_ant_conf.main_lna_conf;
-
-        antcomb->count++;
-
-        if (antcomb->count == ATH_ANT_DIV_COMB_MAX_COUNT) {
-                if (alt_ratio > ATH_ANT_DIV_COMB_ALT_ANT_RATIO) {
-                        ath_lnaconf_alt_good_scan(antcomb, div_ant_conf,
-                                                  main_rssi_avg);
-                        antcomb->alt_good = true;
-                } else {
-                        antcomb->alt_good = false;
-                }
-
-                antcomb->count = 0;
-                antcomb->scan = true;
-                antcomb->scan_not_start = true;
-        }
-
-        if (!antcomb->scan) {
-                if (ath_ant_div_comb_alt_check(div_ant_conf.div_group,
-                                        alt_ratio, curr_main_set, curr_alt_set,
-                                        alt_rssi_avg, main_rssi_avg)) {
-                        if (curr_alt_set == ATH_ANT_DIV_COMB_LNA2) {
-                                /* Switch main and alt LNA */
-                                div_ant_conf.main_lna_conf =
-                                                ATH_ANT_DIV_COMB_LNA2;
-                                div_ant_conf.alt_lna_conf  =
-                                                ATH_ANT_DIV_COMB_LNA1;
-                        } else if (curr_alt_set == ATH_ANT_DIV_COMB_LNA1) {
-                                div_ant_conf.main_lna_conf =
-                                                ATH_ANT_DIV_COMB_LNA1;
-                                div_ant_conf.alt_lna_conf  =
-                                                ATH_ANT_DIV_COMB_LNA2;
-                        }
-
-                        goto div_comb_done;
-                } else if ((curr_alt_set != ATH_ANT_DIV_COMB_LNA1) &&
-                           (curr_alt_set != ATH_ANT_DIV_COMB_LNA2)) {
-                        /* Set alt to another LNA */
-                        if (curr_main_set == ATH_ANT_DIV_COMB_LNA2)
-                                div_ant_conf.alt_lna_conf =
-                                                ATH_ANT_DIV_COMB_LNA1;
-                        else if (curr_main_set == ATH_ANT_DIV_COMB_LNA1)
-                                div_ant_conf.alt_lna_conf =
-                                                ATH_ANT_DIV_COMB_LNA2;
-
-                        goto div_comb_done;
-                }
-
-                if ((alt_rssi_avg < (main_rssi_avg +
-                                                div_ant_conf.lna1_lna2_delta)))
-                        goto div_comb_done;
-        }
-
-        if (!antcomb->scan_not_start) {
-                switch (curr_alt_set) {
-                case ATH_ANT_DIV_COMB_LNA2:
-                        antcomb->rssi_lna2 = alt_rssi_avg;
-                        antcomb->rssi_lna1 = main_rssi_avg;
-                        antcomb->scan = true;
-                        /* set to A+B */
-                        div_ant_conf.main_lna_conf =
-                                ATH_ANT_DIV_COMB_LNA1;
-                        div_ant_conf.alt_lna_conf  =
-                                ATH_ANT_DIV_COMB_LNA1_PLUS_LNA2;
-                        break;
-                case ATH_ANT_DIV_COMB_LNA1:
-                        antcomb->rssi_lna1 = alt_rssi_avg;
-                        antcomb->rssi_lna2 = main_rssi_avg;
-                        antcomb->scan = true;
-                        /* set to A+B */
-                        div_ant_conf.main_lna_conf = ATH_ANT_DIV_COMB_LNA2;
-                        div_ant_conf.alt_lna_conf  =
-                                ATH_ANT_DIV_COMB_LNA1_PLUS_LNA2;
-                        break;
-                case ATH_ANT_DIV_COMB_LNA1_PLUS_LNA2:
-                        antcomb->rssi_add = alt_rssi_avg;
-                        antcomb->scan = true;
-                        /* set to A-B */
-                        div_ant_conf.alt_lna_conf =
-                                ATH_ANT_DIV_COMB_LNA1_MINUS_LNA2;
-                        break;
-                case ATH_ANT_DIV_COMB_LNA1_MINUS_LNA2:
-                        antcomb->rssi_sub = alt_rssi_avg;
-                        antcomb->scan = false;
-                        if (antcomb->rssi_lna2 >
-                            (antcomb->rssi_lna1 +
-                            ATH_ANT_DIV_COMB_LNA1_LNA2_SWITCH_DELTA)) {
-                                /* use LNA2 as main LNA */
-                                if ((antcomb->rssi_add > antcomb->rssi_lna1) &&
-                                    (antcomb->rssi_add > antcomb->rssi_sub)) {
-                                        /* set to A+B */
-                                        div_ant_conf.main_lna_conf =
-                                                ATH_ANT_DIV_COMB_LNA2;
-                                        div_ant_conf.alt_lna_conf  =
-                                                ATH_ANT_DIV_COMB_LNA1_PLUS_LNA2;
-                                } else if (antcomb->rssi_sub >
-                                           antcomb->rssi_lna1) {
-                                        /* set to A-B */
-                                        div_ant_conf.main_lna_conf =
-                                                ATH_ANT_DIV_COMB_LNA2;
-                                        div_ant_conf.alt_lna_conf =
-                                                ATH_ANT_DIV_COMB_LNA1_MINUS_LNA2;
-                                } else {
-                                        /* set to LNA1 */
-                                        div_ant_conf.main_lna_conf =
-                                                ATH_ANT_DIV_COMB_LNA2;
-                                        div_ant_conf.alt_lna_conf =
-                                                ATH_ANT_DIV_COMB_LNA1;
-                                }
-                        } else {
-                                /* use LNA1 as main LNA */
-                                if ((antcomb->rssi_add > antcomb->rssi_lna2) &&
-                                    (antcomb->rssi_add > antcomb->rssi_sub)) {
-                                        /* set to A+B */
-                                        div_ant_conf.main_lna_conf =
-                                                ATH_ANT_DIV_COMB_LNA1;
-                                        div_ant_conf.alt_lna_conf  =
-                                                ATH_ANT_DIV_COMB_LNA1_PLUS_LNA2;
-                                } else if (antcomb->rssi_sub >
-                                           antcomb->rssi_lna1) {
-                                        /* set to A-B */
-                                        div_ant_conf.main_lna_conf =
-                                                ATH_ANT_DIV_COMB_LNA1;
-                                        div_ant_conf.alt_lna_conf =
-                                                ATH_ANT_DIV_COMB_LNA1_MINUS_LNA2;
-                                } else {
-                                        /* set to LNA2 */
-                                        div_ant_conf.main_lna_conf =
-                                                ATH_ANT_DIV_COMB_LNA1;
-                                        div_ant_conf.alt_lna_conf =
-                                                ATH_ANT_DIV_COMB_LNA2;
-                                }
-                        }
-                        break;
-                default:
-                        break;
-                }
-        } else {
-                if (!antcomb->alt_good) {
-                        antcomb->scan_not_start = false;
-                        /* Set alt to another LNA */
-                        if (curr_main_set == ATH_ANT_DIV_COMB_LNA2) {
-                                div_ant_conf.main_lna_conf =
-                                                ATH_ANT_DIV_COMB_LNA2;
-                                div_ant_conf.alt_lna_conf =
-                                                ATH_ANT_DIV_COMB_LNA1;
-                        } else if (curr_main_set == ATH_ANT_DIV_COMB_LNA1) {
-                                div_ant_conf.main_lna_conf =
-                                                ATH_ANT_DIV_COMB_LNA1;
-                                div_ant_conf.alt_lna_conf =
-                                                ATH_ANT_DIV_COMB_LNA2;
-                        }
-                        goto div_comb_done;
-                }
-        }
-
-        ath_select_ant_div_from_quick_scan(antcomb, &div_ant_conf,
-                                           main_rssi_avg, alt_rssi_avg,
-                                           alt_ratio);
-
-        antcomb->quick_scan_cnt++;
-
-div_comb_done:
-        ath_ant_div_conf_fast_divbias(&div_ant_conf, antcomb, alt_ratio);
-        ath9k_hw_antdiv_comb_conf_set(sc->sc_ah, &div_ant_conf);
-
-        antcomb->scan_start_time = jiffies;
-        antcomb->total_pkt_count = 0;
-        antcomb->main_total_rssi = 0;
-        antcomb->alt_total_rssi = 0;
-        antcomb->main_recv_cnt = 0;
-        antcomb->alt_recv_cnt = 0;
-}
-
 int ath_rx_tasklet(struct ath_softc *sc, int flush, bool hp)
 {
         struct ath_buf *bf;
@@ -1804,7 +1064,7 @@ int ath_rx_tasklet(struct ath_softc *sc, int flush, bool hp)
 
         do {
                 /* If handling rx interrupt and flush is in progress => exit */
-                if ((sc->sc_flags & SC_OP_RXFLUSH) && (flush == 0))
+                if (test_bit(SC_OP_RXFLUSH, &sc->sc_flags) && (flush == 0))
                         break;
 
                 memset(&rs, 0, sizeof(rs));
@@ -1842,13 +1102,14 @@ int ath_rx_tasklet(struct ath_softc *sc, int flush, bool hp)
                 else
                         rs.is_mybeacon = false;
 
+                sc->rx.num_pkts++;
                 ath_debug_stat_rx(sc, &rs);
 
                 /*
                  * If we're asked to flush receive queue, directly
                  * chain it back at the queue without processing it.
                  */
-                if (sc->sc_flags & SC_OP_RXFLUSH) {
+                if (test_bit(SC_OP_RXFLUSH, &sc->sc_flags)) {
                         RX_STAT_INC(rx_drop_rxflush);
                         goto requeue_drop_frag;
                 }
@@ -1969,7 +1230,6 @@ int ath_rx_tasklet(struct ath_softc *sc, int flush, bool hp)
                         skb_trim(skb, skb->len - 8);
 
                 spin_lock_irqsave(&sc->sc_pm_lock, flags);
-
                 if ((sc->ps_flags & (PS_WAIT_FOR_BEACON |
                                      PS_WAIT_FOR_CAB |
                                      PS_WAIT_FOR_PSPOLL_DATA)) ||
diff --git a/drivers/net/wireless/ath/ath9k/reg.h b/drivers/net/wireless/ath/ath9k/reg.h
index 458f81b4a7c..5046b282a93 100644
--- a/drivers/net/wireless/ath/ath9k/reg.h
+++ b/drivers/net/wireless/ath/ath9k/reg.h
@@ -2098,8 +2098,8 @@ enum {
 #define AR_MCI_CONT_STATUS                      0x1848
 #define AR_MCI_CONT_RSSI_POWER                  0x000000FF
 #define AR_MCI_CONT_RSSI_POWER_S                0
-#define AR_MCI_CONT_RRIORITY                    0x0000FF00
-#define AR_MCI_CONT_RRIORITY_S                  8
+#define AR_MCI_CONT_PRIORITY                    0x0000FF00
+#define AR_MCI_CONT_PRIORITY_S                  8
 #define AR_MCI_CONT_TXRX                        0x00010000
 #define AR_MCI_CONT_TXRX_S                      16
 
@@ -2162,10 +2162,6 @@ enum {
 #define AR_BTCOEX_CTRL_SPDT_POLARITY                    0x80000000
 #define AR_BTCOEX_CTRL_SPDT_POLARITY_S                  31
 
-#define AR_BTCOEX_WL_WEIGHTS0                           0x18b0
-#define AR_BTCOEX_WL_WEIGHTS1                           0x18b4
-#define AR_BTCOEX_WL_WEIGHTS2                           0x18b8
-#define AR_BTCOEX_WL_WEIGHTS3                           0x18bc
 #define AR_BTCOEX_MAX_TXPWR(_x)                         (0x18c0 + ((_x) << 2))
 #define AR_BTCOEX_WL_LNA                                0x1940
 #define AR_BTCOEX_RFGAIN_CTRL                           0x1944
@@ -2211,5 +2207,7 @@ enum {
 #define AR_BTCOEX_CTRL3_CONT_INFO_TIMEOUT       0x00000fff
 #define AR_BTCOEX_CTRL3_CONT_INFO_TIMEOUT_S     0
 
+#define AR_GLB_SWREG_DISCONT_MODE         0x2002c
+#define AR_GLB_SWREG_DISCONT_EN_BT_WLAN   0x3
 
 #endif
diff --git a/drivers/net/wireless/ath/ath9k/xmit.c b/drivers/net/wireless/ath/ath9k/xmit.c
index 4d571394c7a..cafb4a09729 100644
--- a/drivers/net/wireless/ath/ath9k/xmit.c
+++ b/drivers/net/wireless/ath/ath9k/xmit.c
@@ -105,19 +105,19 @@ static int ath_max_4ms_framelen[4][32] = {
 /* Aggregation logic */
 /*********************/
 
-static void ath_txq_lock(struct ath_softc *sc, struct ath_txq *txq)
+void ath_txq_lock(struct ath_softc *sc, struct ath_txq *txq)
         __acquires(&txq->axq_lock)
 {
         spin_lock_bh(&txq->axq_lock);
 }
 
-static void ath_txq_unlock(struct ath_softc *sc, struct ath_txq *txq)
+void ath_txq_unlock(struct ath_softc *sc, struct ath_txq *txq)
         __releases(&txq->axq_lock)
 {
         spin_unlock_bh(&txq->axq_lock);
 }
 
-static void ath_txq_unlock_complete(struct ath_softc *sc, struct ath_txq *txq)
+void ath_txq_unlock_complete(struct ath_softc *sc, struct ath_txq *txq)
         __releases(&txq->axq_lock)
 {
         struct sk_buff_head q;
@@ -1165,6 +1165,7 @@ int ath_tx_aggr_start(struct ath_softc *sc, struct ieee80211_sta *sta,
 {
         struct ath_atx_tid *txtid;
         struct ath_node *an;
+        u8 density;
 
         an = (struct ath_node *)sta->drv_priv;
         txtid = ATH_AN_2_TID(an, tid);
@@ -1172,6 +1173,17 @@ int ath_tx_aggr_start(struct ath_softc *sc, struct ieee80211_sta *sta,
         if (txtid->state & (AGGR_CLEANUP | AGGR_ADDBA_COMPLETE))
                 return -EAGAIN;
 
+        /* update ampdu factor/density, they may have changed. This may happen
+         * in HT IBSS when a beacon with HT-info is received after the station
+         * has already been added.
+         */
+        if (sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_HT) {
+                an->maxampdu = 1 << (IEEE80211_HT_MAX_AMPDU_FACTOR +
+                                     sta->ht_cap.ampdu_factor);
+                density = ath9k_parse_mpdudensity(sta->ht_cap.ampdu_density);
+                an->mpdudensity = density;
+        }
+
         txtid->state |= AGGR_ADDBA_PROGRESS;
         txtid->paused = true;
         *ssn = txtid->seq_start = txtid->seq_next;
@@ -1526,7 +1538,7 @@ bool ath_drain_all_txq(struct ath_softc *sc, bool retry_tx)
         int i;
         u32 npend = 0;
 
-        if (sc->sc_flags & SC_OP_INVALID)
+        if (test_bit(SC_OP_INVALID, &sc->sc_flags))
                 return true;
 
         ath9k_hw_abort_tx_dma(ah);
@@ -1999,6 +2011,7 @@ static void ath_tx_complete(struct ath_softc *sc, struct sk_buff *skb,
         struct ath_common *common = ath9k_hw_common(sc->sc_ah);
         struct ieee80211_hdr * hdr = (struct ieee80211_hdr *)skb->data;
         int q, padpos, padsize;
+        unsigned long flags;
 
         ath_dbg(common, XMIT, "TX complete: skb: %p\n", skb);
 
@@ -2017,6 +2030,7 @@ static void ath_tx_complete(struct ath_softc *sc, struct sk_buff *skb,
                 skb_pull(skb, padsize);
         }
 
+        spin_lock_irqsave(&sc->sc_pm_lock, flags);
         if ((sc->ps_flags & PS_WAIT_FOR_TX_ACK) && !txq->axq_depth) {
                 sc->ps_flags &= ~PS_WAIT_FOR_TX_ACK;
                 ath_dbg(common, PS,
@@ -2026,6 +2040,7 @@ static void ath_tx_complete(struct ath_softc *sc, struct sk_buff *skb,
                                         PS_WAIT_FOR_PSPOLL_DATA |
                                         PS_WAIT_FOR_TX_ACK));
         }
+        spin_unlock_irqrestore(&sc->sc_pm_lock, flags);
 
         q = skb_get_queue_mapping(skb);
         if (txq == sc->tx.txq_map[q]) {
@@ -2236,46 +2251,6 @@ static void ath_tx_processq(struct ath_softc *sc, struct ath_txq *txq)
         ath_txq_unlock_complete(sc, txq);
 }
 
-static void ath_tx_complete_poll_work(struct work_struct *work)
-{
-        struct ath_softc *sc = container_of(work, struct ath_softc,
-                        tx_complete_work.work);
-        struct ath_txq *txq;
-        int i;
-        bool needreset = false;
-#ifdef CONFIG_ATH9K_DEBUGFS
-        sc->tx_complete_poll_work_seen++;
-#endif
-
-        for (i = 0; i < ATH9K_NUM_TX_QUEUES; i++)
-                if (ATH_TXQ_SETUP(sc, i)) {
-                        txq = &sc->tx.txq[i];
-                        ath_txq_lock(sc, txq);
-                        if (txq->axq_depth) {
-                                if (txq->axq_tx_inprogress) {
-                                        needreset = true;
-                                        ath_txq_unlock(sc, txq);
-                                        break;
-                                } else {
-                                        txq->axq_tx_inprogress = true;
-                                }
-                        }
-                        ath_txq_unlock_complete(sc, txq);
-                }
-
-        if (needreset) {
-                ath_dbg(ath9k_hw_common(sc->sc_ah), RESET,
-                        "tx hung, resetting the chip\n");
-                RESET_STAT_INC(sc, RESET_TYPE_TX_HANG);
-                ieee80211_queue_work(sc->hw, &sc->hw_reset_work);
-        }
-
-        ieee80211_queue_delayed_work(sc->hw, &sc->tx_complete_work,
-                        msecs_to_jiffies(ATH_TX_COMPLETE_POLL_INT));
-}
-
-
-
 void ath_tx_tasklet(struct ath_softc *sc)
 {
         struct ath_hw *ah = sc->sc_ah;
diff --git a/drivers/net/wireless/ath/carl9170/cmd.c b/drivers/net/wireless/ath/carl9170/cmd.c
index 195dc653811..39a63874b27 100644
--- a/drivers/net/wireless/ath/carl9170/cmd.c
+++ b/drivers/net/wireless/ath/carl9170/cmd.c
@@ -138,7 +138,7 @@ int carl9170_reboot(struct ar9170 *ar)
         if (!cmd)
                 return -ENOMEM;
 
-        err = __carl9170_exec_cmd(ar, (struct carl9170_cmd *)cmd, true);
+        err = __carl9170_exec_cmd(ar, cmd, true);
         return err;
 }
 
diff --git a/drivers/net/wireless/ath/carl9170/rx.c b/drivers/net/wireless/ath/carl9170/rx.c
index 84b22eec7ab..7a8e90eaad8 100644
--- a/drivers/net/wireless/ath/carl9170/rx.c
+++ b/drivers/net/wireless/ath/carl9170/rx.c
@@ -161,7 +161,7 @@ static void carl9170_cmd_callback(struct ar9170 *ar, u32 len, void *buffer)
 
 void carl9170_handle_command_response(struct ar9170 *ar, void *buf, u32 len)
 {
-        struct carl9170_rsp *cmd = (void *) buf;
+        struct carl9170_rsp *cmd = buf;
         struct ieee80211_vif *vif;
 
         if (carl9170_check_sequence(ar, cmd->hdr.seq))
@@ -520,7 +520,7 @@ static u8 *carl9170_find_ie(u8 *data, unsigned int len, u8 ie)
  */
 static void carl9170_ps_beacon(struct ar9170 *ar, void *data, unsigned int len)
 {
-        struct ieee80211_hdr *hdr = (void *) data;
+        struct ieee80211_hdr *hdr = data;
         struct ieee80211_tim_ie *tim_ie;
         u8 *tim;
         u8 tim_len;
diff --git a/drivers/net/wireless/atmel.c b/drivers/net/wireless/atmel.c
index d07c0301da6..4a4e98f7180 100644
--- a/drivers/net/wireless/atmel.c
+++ b/drivers/net/wireless/atmel.c
@@ -2952,10 +2952,10 @@ static void send_association_request(struct atmel_private *priv, int is_reassoc)
         /* current AP address - only in reassoc frame */
         if (is_reassoc) {
                 memcpy(body.ap, priv->CurrentBSSID, 6);
-                ssid_el_p = (u8 *)&body.ssid_el_id;
+                ssid_el_p = &body.ssid_el_id;
                 bodysize = 18 + priv->SSID_size;
         } else {
-                ssid_el_p = (u8 *)&body.ap[0];
+                ssid_el_p = &body.ap[0];
                 bodysize = 12 + priv->SSID_size;
         }
 
diff --git a/drivers/net/wireless/b43legacy/dma.c b/drivers/net/wireless/b43legacy/dma.c
index c8baf020c20..2d3c6644f82 100644
--- a/drivers/net/wireless/b43legacy/dma.c
+++ b/drivers/net/wireless/b43legacy/dma.c
@@ -52,7 +52,7 @@ struct b43legacy_dmadesc32 *op32_idx2desc(struct b43legacy_dmaring *ring,
         desc = ring->descbase;
         desc = &(desc[slot]);
 
-        return (struct b43legacy_dmadesc32 *)desc;
+        return desc;
 }
 
 static void op32_fill_descriptor(struct b43legacy_dmaring *ring,
diff --git a/drivers/net/wireless/b43legacy/main.c b/drivers/net/wireless/b43legacy/main.c
index eae691e2f7d..8156135a059 100644
--- a/drivers/net/wireless/b43legacy/main.c
+++ b/drivers/net/wireless/b43legacy/main.c
@@ -1508,7 +1508,7 @@ static void b43legacy_release_firmware(struct b43legacy_wldev *dev)
 
 static void b43legacy_print_fw_helptext(struct b43legacy_wl *wl)
 {
-        b43legacyerr(wl, "You must go to http://linuxwireless.org/en/users/"
+        b43legacyerr(wl, "You must go to http://wireless.kernel.org/en/users/"
                      "Drivers/b43#devicefirmware "
                      "and download the correct firmware (version 3).\n");
 }
diff --git a/drivers/net/wireless/b43legacy/xmit.c b/drivers/net/wireless/b43legacy/xmit.c
index a8012f2749e..b8ffea6f5c6 100644
--- a/drivers/net/wireless/b43legacy/xmit.c
+++ b/drivers/net/wireless/b43legacy/xmit.c
@@ -269,8 +269,7 @@ static int generate_txhdr_fw3(struct b43legacy_wldev *dev,
         b43legacy_generate_plcp_hdr((struct b43legacy_plcp_hdr4 *)
                                     (&txhdr->plcp), plcp_fragment_len,
                                     rate);
-        b43legacy_generate_plcp_hdr((struct b43legacy_plcp_hdr4 *)
-                                    (&txhdr->plcp_fb), plcp_fragment_len,
+        b43legacy_generate_plcp_hdr(&txhdr->plcp_fb, plcp_fragment_len,
                                     rate_fb->hw_value);
 
         /* PHY TX Control word */
@@ -340,8 +339,7 @@ static int generate_txhdr_fw3(struct b43legacy_wldev *dev,
                 b43legacy_generate_plcp_hdr((struct b43legacy_plcp_hdr4 *)
                                             (&txhdr->rts_plcp),
                                             len, rts_rate);
-                b43legacy_generate_plcp_hdr((struct b43legacy_plcp_hdr4 *)
-                                            (&txhdr->rts_plcp_fb),
+                b43legacy_generate_plcp_hdr(&txhdr->rts_plcp_fb,
                                             len, rts_rate_fb);
                 hdr = (struct ieee80211_hdr *)(&txhdr->rts_frame);
                 txhdr->rts_dur_fb = hdr->duration_id;
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/Makefile b/drivers/net/wireless/brcm80211/brcmfmac/Makefile
index abb48032753..9d5170b6df5 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/Makefile
+++ b/drivers/net/wireless/brcm80211/brcmfmac/Makefile
@@ -34,3 +34,5 @@ brcmfmac-$(CONFIG_BRCMFMAC_SDIO) += \
                 sdio_chip.o
 brcmfmac-$(CONFIG_BRCMFMAC_USB) += \
                 usb.o
+brcmfmac-$(CONFIG_BRCMDBG) += \
+                dhd_dbg.o
\ No newline at end of file
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c b/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c
index 82f51dbd0d6..49765d34b4e 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c
@@ -44,6 +44,7 @@
 
 #define SDIO_DEVICE_ID_BROADCOM_4329    0x4329
 #define SDIO_DEVICE_ID_BROADCOM_4330    0x4330
+#define SDIO_DEVICE_ID_BROADCOM_4334    0x4334
 
 #define SDIO_FUNC1_BLOCKSIZE            64
 #define SDIO_FUNC2_BLOCKSIZE            512
@@ -52,6 +53,7 @@
 static const struct sdio_device_id brcmf_sdmmc_ids[] = {
         {SDIO_DEVICE(SDIO_VENDOR_ID_BROADCOM, SDIO_DEVICE_ID_BROADCOM_4329)},
         {SDIO_DEVICE(SDIO_VENDOR_ID_BROADCOM, SDIO_DEVICE_ID_BROADCOM_4330)},
+        {SDIO_DEVICE(SDIO_VENDOR_ID_BROADCOM, SDIO_DEVICE_ID_BROADCOM_4334)},
         { /* end: all zeroes */ },
 };
 MODULE_DEVICE_TABLE(sdio, brcmf_sdmmc_ids);
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd.h b/drivers/net/wireless/brcm80211/brcmfmac/dhd.h
index 9f637014486..a11fe54f595 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/dhd.h
+++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd.h
@@ -613,6 +613,9 @@ struct brcmf_pub {
         struct work_struct multicast_work;
         u8 macvalue[ETH_ALEN];
         atomic_t pend_8021x_cnt;
+#ifdef DEBUG
+        struct dentry *dbgfs_dir;
+#endif
 };
 
 struct brcmf_if_event {
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h b/drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h
index 366916494be..537f499cc5d 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h
+++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h
@@ -36,6 +36,13 @@ struct dngl_stats {
         unsigned long multicast;        /* multicast packets received */
 };
 
+struct brcmf_bus_dcmd {
+        char *name;
+        char *param;
+        int param_len;
+        struct list_head list;
+};
+
 /* interface structure between common and bus layer */
 struct brcmf_bus {
         u8 type;                /* bus type */
@@ -50,6 +57,7 @@ struct brcmf_bus {
         unsigned long tx_realloc;       /* Tx packets realloced for headroom */
         struct dngl_stats dstats;       /* Stats for dongle-based data */
         u8 align;               /* bus alignment requirement */
+        struct list_head dcmd_list;
 
         /* interface functions pointers */
         /* Stop bus module: clear pending frames, disable data flow */
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c b/drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c
index 236cb9fa460..2621dd3d7dc 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c
@@ -800,13 +800,13 @@ int brcmf_c_preinit_dcmds(struct brcmf_pub *drvr)
         char iovbuf[BRCMF_EVENTING_MASK_LEN + 12];      /*  Room for
                                  "event_msgs" + '\0' + bitvec  */
         char buf[128], *ptr;
-        u32 dongle_align = drvr->bus_if->align;
-        u32 glom = 0;
         u32 roaming = 1;
         uint bcn_timeout = 3;
         int scan_assoc_time = 40;
         int scan_unassoc_time = 40;
         int i;
+        struct brcmf_bus_dcmd *cmdlst;
+        struct list_head *cur, *q;
 
         mutex_lock(&drvr->proto_block);
 
@@ -827,17 +827,6 @@ int brcmf_c_preinit_dcmds(struct brcmf_pub *drvr)
         /* Print fw version info */
         brcmf_dbg(ERROR, "Firmware version = %s\n", buf);
 
-        /* Match Host and Dongle rx alignment */
-        brcmf_c_mkiovar("bus:txglomalign", (char *)&dongle_align, 4, iovbuf,
-                    sizeof(iovbuf));
-        brcmf_proto_cdc_set_dcmd(drvr, 0, BRCMF_C_SET_VAR, iovbuf,
-                                  sizeof(iovbuf));
-
-        /* disable glom option per default */
-        brcmf_c_mkiovar("bus:txglom", (char *)&glom, 4, iovbuf, sizeof(iovbuf));
-        brcmf_proto_cdc_set_dcmd(drvr, 0, BRCMF_C_SET_VAR, iovbuf,
-                                  sizeof(iovbuf));
-
         /* Setup timeout if Beacons are lost and roam is off to report
                  link down */
         brcmf_c_mkiovar("bcn_timeout", (char *)&bcn_timeout, 4, iovbuf,
@@ -874,6 +863,20 @@ int brcmf_c_preinit_dcmds(struct brcmf_pub *drvr)
                                                  0, true);
         }
 
+        /* set bus specific command if there is any */
+        list_for_each_safe(cur, q, &drvr->bus_if->dcmd_list) {
+                cmdlst = list_entry(cur, struct brcmf_bus_dcmd, list);
+                if (cmdlst->name && cmdlst->param && cmdlst->param_len) {
+                        brcmf_c_mkiovar(cmdlst->name, cmdlst->param,
+                                        cmdlst->param_len, iovbuf,
+                                        sizeof(iovbuf));
+                        brcmf_proto_cdc_set_dcmd(drvr, 0, BRCMF_C_SET_VAR,
+                                                 iovbuf, sizeof(iovbuf));
+                }
+                list_del(cur);
+                kfree(cmdlst);
+        }
+
         mutex_unlock(&drvr->proto_block);
 
         return 0;
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_dbg.c b/drivers/net/wireless/brcm80211/brcmfmac/dhd_dbg.c
new file mode 100644
index 00000000000..7f89540b56d
--- /dev/null
+++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_dbg.c
@@ -0,0 +1,126 @@
+/*
+ * Copyright (c) 2012 Broadcom Corporation
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
+ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+#include <linux/debugfs.h>
+#include <linux/if_ether.h>
+#include <linux/if.h>
+#include <linux/ieee80211.h>
+#include <linux/module.h>
+
+#include <defs.h>
+#include <brcmu_wifi.h>
+#include <brcmu_utils.h>
+#include "dhd.h"
+#include "dhd_bus.h"
+#include "dhd_dbg.h"
+
+static struct dentry *root_folder;
+
+void brcmf_debugfs_init(void)
+{
+        root_folder = debugfs_create_dir(KBUILD_MODNAME, NULL);
+        if (IS_ERR(root_folder))
+                root_folder = NULL;
+}
+
+void brcmf_debugfs_exit(void)
+{
+        if (!root_folder)
+                return;
+
+        debugfs_remove_recursive(root_folder);
+        root_folder = NULL;
+}
+
+int brcmf_debugfs_attach(struct brcmf_pub *drvr)
+{
+        if (!root_folder)
+                return -ENODEV;
+
+        drvr->dbgfs_dir = debugfs_create_dir(dev_name(drvr->dev), root_folder);
+        return PTR_RET(drvr->dbgfs_dir);
+}
+
+void brcmf_debugfs_detach(struct brcmf_pub *drvr)
+{
+        if (!IS_ERR_OR_NULL(drvr->dbgfs_dir))
+                debugfs_remove_recursive(drvr->dbgfs_dir);
+}
+
+struct dentry *brcmf_debugfs_get_devdir(struct brcmf_pub *drvr)
+{
+        return drvr->dbgfs_dir;
+}
+
+static
+ssize_t brcmf_debugfs_sdio_counter_read(struct file *f, char __user *data,
+                                        size_t count, loff_t *ppos)
+{
+        struct brcmf_sdio_count *sdcnt = f->private_data;
+        char buf[750];
+        int res;
+
+        /* only allow read from start */
+        if (*ppos > 0)
+                return 0;
+
+        res = scnprintf(buf, sizeof(buf),
+                        "intrcount:    %u\nlastintrs:    %u\n"
+                        "pollcnt:      %u\nregfails:     %u\n"
+                        "tx_sderrs:    %u\nfcqueued:     %u\n"
+                        "rxrtx:        %u\nrx_toolong:   %u\n"
+                        "rxc_errors:   %u\nrx_hdrfail:   %u\n"
+                        "rx_badhdr:    %u\nrx_badseq:    %u\n"
+                        "fc_rcvd:      %u\nfc_xoff:      %u\n"
+                        "fc_xon:       %u\nrxglomfail:   %u\n"
+                        "rxglomframes: %u\nrxglompkts:   %u\n"
+                        "f2rxhdrs:     %u\nf2rxdata:     %u\n"
+                        "f2txdata:     %u\nf1regdata:    %u\n"
+                        "tickcnt:      %u\ntx_ctlerrs:   %lu\n"
+                        "tx_ctlpkts:   %lu\nrx_ctlerrs:   %lu\n"
+                        "rx_ctlpkts:   %lu\nrx_readahead: %lu\n",
+                        sdcnt->intrcount, sdcnt->lastintrs,
+                        sdcnt->pollcnt, sdcnt->regfails,
+                        sdcnt->tx_sderrs, sdcnt->fcqueued,
+                        sdcnt->rxrtx, sdcnt->rx_toolong,
+                        sdcnt->rxc_errors, sdcnt->rx_hdrfail,
+                        sdcnt->rx_badhdr, sdcnt->rx_badseq,
+                        sdcnt->fc_rcvd, sdcnt->fc_xoff,
+                        sdcnt->fc_xon, sdcnt->rxglomfail,
+                        sdcnt->rxglomframes, sdcnt->rxglompkts,
+                        sdcnt->f2rxhdrs, sdcnt->f2rxdata,
+                        sdcnt->f2txdata, sdcnt->f1regdata,
+                        sdcnt->tickcnt, sdcnt->tx_ctlerrs,
+                        sdcnt->tx_ctlpkts, sdcnt->rx_ctlerrs,
+                        sdcnt->rx_ctlpkts, sdcnt->rx_readahead_cnt);
+
+        return simple_read_from_buffer(data, count, ppos, buf, res);
+}
+
+static const struct file_operations brcmf_debugfs_sdio_counter_ops = {
+        .owner = THIS_MODULE,
+        .open = simple_open,
+        .read = brcmf_debugfs_sdio_counter_read
+};
+
+void brcmf_debugfs_create_sdio_count(struct brcmf_pub *drvr,
+                                     struct brcmf_sdio_count *sdcnt)
+{
+        struct dentry *dentry = drvr->dbgfs_dir;
+
+        if (!IS_ERR_OR_NULL(dentry))
+                debugfs_create_file("counters", S_IRUGO, dentry,
+                                    sdcnt, &brcmf_debugfs_sdio_counter_ops);
+}
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_dbg.h b/drivers/net/wireless/brcm80211/brcmfmac/dhd_dbg.h
index a2c4576cf9f..b784920532d 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_dbg.h
+++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_dbg.h
@@ -76,4 +76,63 @@ do {									\
 
 extern int brcmf_msg_level;
 
+/*
+ * hold counter variables used in brcmfmac sdio driver.
+ */
+struct brcmf_sdio_count {
+        uint intrcount;         /* Count of device interrupt callbacks */
+        uint lastintrs;         /* Count as of last watchdog timer */
+        uint pollcnt;           /* Count of active polls */
+        uint regfails;          /* Count of R_REG failures */
+        uint tx_sderrs;         /* Count of tx attempts with sd errors */
+        uint fcqueued;          /* Tx packets that got queued */
+        uint rxrtx;             /* Count of rtx requests (NAK to dongle) */
+        uint rx_toolong;        /* Receive frames too long to receive */
+        uint rxc_errors;        /* SDIO errors when reading control frames */
+        uint rx_hdrfail;        /* SDIO errors on header reads */
+        uint rx_badhdr;         /* Bad received headers (roosync?) */
+        uint rx_badseq;         /* Mismatched rx sequence number */
+        uint fc_rcvd;           /* Number of flow-control events received */
+        uint fc_xoff;           /* Number which turned on flow-control */
+        uint fc_xon;            /* Number which turned off flow-control */
+        uint rxglomfail;        /* Failed deglom attempts */
+        uint rxglomframes;      /* Number of glom frames (superframes) */
+        uint rxglompkts;        /* Number of packets from glom frames */
+        uint f2rxhdrs;          /* Number of header reads */
+        uint f2rxdata;          /* Number of frame data reads */
+        uint f2txdata;          /* Number of f2 frame writes */
+        uint f1regdata;         /* Number of f1 register accesses */
+        uint tickcnt;           /* Number of watchdog been schedule */
+        ulong tx_ctlerrs;       /* Err of sending ctrl frames */
+        ulong tx_ctlpkts;       /* Ctrl frames sent to dongle */
+        ulong rx_ctlerrs;       /* Err of processing rx ctrl frames */
+        ulong rx_ctlpkts;       /* Ctrl frames processed from dongle */
+        ulong rx_readahead_cnt; /* packets where header read-ahead was used */
+};
+
+struct brcmf_pub;
+#ifdef DEBUG
+void brcmf_debugfs_init(void);
+void brcmf_debugfs_exit(void);
+int brcmf_debugfs_attach(struct brcmf_pub *drvr);
+void brcmf_debugfs_detach(struct brcmf_pub *drvr);
+struct dentry *brcmf_debugfs_get_devdir(struct brcmf_pub *drvr);
+void brcmf_debugfs_create_sdio_count(struct brcmf_pub *drvr,
+                                     struct brcmf_sdio_count *sdcnt);
+#else
+static inline void brcmf_debugfs_init(void)
+{
+}
+static inline void brcmf_debugfs_exit(void)
+{
+}
+static inline int brcmf_debugfs_attach(struct brcmf_pub *drvr)
+{
+        return 0;
+}
+static inline void brcmf_debugfs_detach(struct brcmf_pub *drvr)
+{
+}
+#endif
+
 #endif                          /* _BRCMF_DBG_H_ */
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c b/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c
index 8933f9b31a9..57bf1d7ee80 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c
@@ -1007,6 +1007,9 @@ int brcmf_attach(uint bus_hdrlen, struct device *dev)
         drvr->bus_if->drvr = drvr;
         drvr->dev = dev;
 
+        /* create device debugfs folder */
+        brcmf_debugfs_attach(drvr);
+
         /* Attach and link in the protocol */
         ret = brcmf_proto_attach(drvr);
         if (ret != 0) {
@@ -1017,6 +1020,8 @@ int brcmf_attach(uint bus_hdrlen, struct device *dev)
         INIT_WORK(&drvr->setmacaddr_work, _brcmf_set_mac_address);
         INIT_WORK(&drvr->multicast_work, _brcmf_set_multicast_list);
 
+        INIT_LIST_HEAD(&drvr->bus_if->dcmd_list);
+
         return ret;
 
 fail:
@@ -1123,6 +1128,7 @@ void brcmf_detach(struct device *dev)
                 brcmf_proto_detach(drvr);
         }
 
+        brcmf_debugfs_detach(drvr);
         bus_if->drvr = NULL;
         kfree(drvr);
 }
@@ -1192,6 +1198,8 @@ exit:
 
 static void brcmf_driver_init(struct work_struct *work)
 {
+        brcmf_debugfs_init();
+
 #ifdef CONFIG_BRCMFMAC_SDIO
         brcmf_sdio_init();
 #endif
@@ -1219,6 +1227,7 @@ static void __exit brcmfmac_module_exit(void)
 #ifdef CONFIG_BRCMFMAC_USB
         brcmf_usb_exit();
 #endif
+        brcmf_debugfs_exit();
 }
 
 module_init(brcmfmac_module_init);
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c b/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
index 1dbf2be478c..472f2ef5c65 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
@@ -31,6 +31,8 @@
 #include <linux/firmware.h>
 #include <linux/module.h>
 #include <linux/bcma/bcma.h>
+#include <linux/debugfs.h>
+#include <linux/vmalloc.h>
 #include <asm/unaligned.h>
 #include <defs.h>
 #include <brcmu_wifi.h>
@@ -48,6 +50,9 @@
 
 #define CBUF_LEN        (128)
 
+/* Device console log buffer state */
+#define CONSOLE_BUFFER_MAX      2024
+
 struct rte_log_le {
         __le32 buf;             /* Can't be pointer on (64-bit) hosts */
         __le32 buf_size;
@@ -281,7 +286,7 @@ struct rte_console {
  * Shared structure between dongle and the host.
  * The structure contains pointers to trap or assert information.
  */
-#define SDPCM_SHARED_VERSION       0x0002
+#define SDPCM_SHARED_VERSION       0x0003
 #define SDPCM_SHARED_VERSION_MASK  0x00FF
 #define SDPCM_SHARED_ASSERT_BUILT  0x0100
 #define SDPCM_SHARED_ASSERT        0x0200
@@ -428,6 +433,29 @@ struct brcmf_console {
         u8 *buf;                /* Log buffer (host copy) */
         uint last;              /* Last buffer read index */
 };
+
+struct brcmf_trap_info {
+        __le32          type;
+        __le32          epc;
+        __le32          cpsr;
+        __le32          spsr;
+        __le32          r0;     /* a1 */
+        __le32          r1;     /* a2 */
+        __le32          r2;     /* a3 */
+        __le32          r3;     /* a4 */
+        __le32          r4;     /* v1 */
+        __le32          r5;     /* v2 */
+        __le32          r6;     /* v3 */
+        __le32          r7;     /* v4 */
+        __le32          r8;     /* v5 */
+        __le32          r9;     /* sb/v6 */
+        __le32          r10;    /* sl/v7 */
+        __le32          r11;    /* fp/v8 */
+        __le32          r12;    /* ip */
+        __le32          r13;    /* sp */
+        __le32          r14;    /* lr */
+        __le32          pc;     /* r15 */
+};
 #endif                          /* DEBUG */
 
 struct sdpcm_shared {
@@ -439,6 +467,7 @@ struct sdpcm_shared {
         u32 console_addr;       /* Address of struct rte_console */
         u32 msgtrace_addr;
         u8 tag[32];
+        u32 brpt_addr;
 };
 
 struct sdpcm_shared_le {
@@ -450,6 +479,7 @@ struct sdpcm_shared_le {
         __le32 console_addr;    /* Address of struct rte_console */
         __le32 msgtrace_addr;
         u8 tag[32];
+        __le32 brpt_addr;
 };
 
 
@@ -502,12 +532,9 @@ struct brcmf_sdio {
         bool intr;              /* Use interrupts */
         bool poll;              /* Use polling */
         bool ipend;             /* Device interrupt is pending */
-        uint intrcount;         /* Count of device interrupt callbacks */
-        uint lastintrs;         /* Count as of last watchdog timer */
         uint spurious;          /* Count of spurious interrupts */
         uint pollrate;          /* Ticks between device polls */
         uint polltick;          /* Tick counter */
-        uint pollcnt;           /* Count of active polls */
 
 #ifdef DEBUG
         uint console_interval;
@@ -515,8 +542,6 @@ struct brcmf_sdio {
         uint console_addr;      /* Console address from shared struct */
 #endif                          /* DEBUG */
 
-        uint regfails;          /* Count of R_REG failures */
-
         uint clkstate;          /* State of sd and backplane clock(s) */
         bool activity;          /* Activity flag for clock down */
         s32 idletime;           /* Control for activity timeout */
@@ -531,33 +556,6 @@ struct brcmf_sdio {
 /* Field to decide if rx of control frames happen in rxbuf or lb-pool */
         bool usebufpool;
 
-        /* Some additional counters */
-        uint tx_sderrs;         /* Count of tx attempts with sd errors */
-        uint fcqueued;          /* Tx packets that got queued */
-        uint rxrtx;             /* Count of rtx requests (NAK to dongle) */
-        uint rx_toolong;        /* Receive frames too long to receive */
-        uint rxc_errors;        /* SDIO errors when reading control frames */
-        uint rx_hdrfail;        /* SDIO errors on header reads */
-        uint rx_badhdr;         /* Bad received headers (roosync?) */
-        uint rx_badseq;         /* Mismatched rx sequence number */
-        uint fc_rcvd;           /* Number of flow-control events received */
-        uint fc_xoff;           /* Number which turned on flow-control */
-        uint fc_xon;            /* Number which turned off flow-control */
-        uint rxglomfail;        /* Failed deglom attempts */
-        uint rxglomframes;      /* Number of glom frames (superframes) */
-        uint rxglompkts;        /* Number of packets from glom frames */
-        uint f2rxhdrs;          /* Number of header reads */
-        uint f2rxdata;          /* Number of frame data reads */
-        uint f2txdata;          /* Number of f2 frame writes */
-        uint f1regdata;         /* Number of f1 register accesses */
-        uint tickcnt;           /* Number of watchdog been schedule */
-        unsigned long tx_ctlerrs;       /* Err of sending ctrl frames */
-        unsigned long tx_ctlpkts;       /* Ctrl frames sent to dongle */
-        unsigned long rx_ctlerrs;       /* Err of processing rx ctrl frames */
-        unsigned long rx_ctlpkts;       /* Ctrl frames processed from dongle */
-        unsigned long rx_readahead_cnt; /* Number of packets where header
-                                         * read-ahead was used. */
-
         u8 *ctrl_frame_buf;
         u32 ctrl_frame_len;
         bool ctrl_frame_stat;
@@ -583,6 +581,7 @@ struct brcmf_sdio {
         u32 fw_ptr;
 
         bool txoff;             /* Transmit flow-controlled */
+        struct brcmf_sdio_count sdcnt;
 };
 
 /* clkstate */
@@ -945,7 +944,7 @@ static u32 brcmf_sdbrcm_hostmail(struct brcmf_sdio *bus)
         if (ret == 0)
                 w_sdreg32(bus, SMB_INT_ACK,
                           offsetof(struct sdpcmd_regs, tosbmailbox));
-        bus->f1regdata += 2;
+        bus->sdcnt.f1regdata += 2;
 
         /* Dongle recomposed rx frames, accept them again */
         if (hmb_data & HMB_DATA_NAKHANDLED) {
@@ -984,12 +983,12 @@ static u32 brcmf_sdbrcm_hostmail(struct brcmf_sdio *bus)
                                                         HMB_DATA_FCDATA_SHIFT;
 
                 if (fcbits & ~bus->flowcontrol)
-                        bus->fc_xoff++;
+                        bus->sdcnt.fc_xoff++;
 
                 if (bus->flowcontrol & ~fcbits)
-                        bus->fc_xon++;
+                        bus->sdcnt.fc_xon++;
 
-                bus->fc_rcvd++;
+                bus->sdcnt.fc_rcvd++;
                 bus->flowcontrol = fcbits;
         }
 
@@ -1021,7 +1020,7 @@ static void brcmf_sdbrcm_rxfail(struct brcmf_sdio *bus, bool abort, bool rtx)
 
         brcmf_sdio_regwb(bus->sdiodev, SBSDIO_FUNC1_FRAMECTRL,
                          SFC_RF_TERM, &err);
-        bus->f1regdata++;
+        bus->sdcnt.f1regdata++;
 
         /* Wait until the packet has been flushed (device/FIFO stable) */
         for (lastrbc = retries = 0xffff; retries > 0; retries--) {
@@ -1029,7 +1028,7 @@ static void brcmf_sdbrcm_rxfail(struct brcmf_sdio *bus, bool abort, bool rtx)
                                       SBSDIO_FUNC1_RFRAMEBCHI, &err);
                 lo = brcmf_sdio_regrb(bus->sdiodev,
                                       SBSDIO_FUNC1_RFRAMEBCLO, &err);
-                bus->f1regdata += 2;
+                bus->sdcnt.f1regdata += 2;
 
                 if ((hi == 0) && (lo == 0))
                         break;
@@ -1047,11 +1046,11 @@ static void brcmf_sdbrcm_rxfail(struct brcmf_sdio *bus, bool abort, bool rtx)
                 brcmf_dbg(INFO, "flush took %d iterations\n", 0xffff - retries);
 
         if (rtx) {
-                bus->rxrtx++;
+                bus->sdcnt.rxrtx++;
                 err = w_sdreg32(bus, SMB_NAK,
                                 offsetof(struct sdpcmd_regs, tosbmailbox));
 
-                bus->f1regdata++;
+                bus->sdcnt.f1regdata++;
                 if (err == 0)
                         bus->rxskip = true;
         }
@@ -1243,7 +1242,7 @@ static u8 brcmf_sdbrcm_rxglom(struct brcmf_sdio *bus, u8 rxseq)
                                   dlen);
                         errcode = -1;
                 }
-                bus->f2rxdata++;
+                bus->sdcnt.f2rxdata++;
 
                 /* On failure, kill the superframe, allow a couple retries */
                 if (errcode < 0) {
@@ -1256,7 +1255,7 @@ static u8 brcmf_sdbrcm_rxglom(struct brcmf_sdio *bus, u8 rxseq)
                         } else {
                                 bus->glomerr = 0;
                                 brcmf_sdbrcm_rxfail(bus, true, false);
-                                bus->rxglomfail++;
+                                bus->sdcnt.rxglomfail++;
                                 brcmf_sdbrcm_free_glom(bus);
                         }
                         return 0;
@@ -1312,7 +1311,7 @@ static u8 brcmf_sdbrcm_rxglom(struct brcmf_sdio *bus, u8 rxseq)
                 if (rxseq != seq) {
                         brcmf_dbg(INFO, "(superframe) rx_seq %d, expected %d\n",
                                   seq, rxseq);
-                        bus->rx_badseq++;
+                        bus->sdcnt.rx_badseq++;
                         rxseq = seq;
                 }
 
@@ -1376,7 +1375,7 @@ static u8 brcmf_sdbrcm_rxglom(struct brcmf_sdio *bus, u8 rxseq)
                         } else {
                                 bus->glomerr = 0;
                                 brcmf_sdbrcm_rxfail(bus, true, false);
-                                bus->rxglomfail++;
+                                bus->sdcnt.rxglomfail++;
                                 brcmf_sdbrcm_free_glom(bus);
                         }
                         bus->nextlen = 0;
@@ -1402,7 +1401,7 @@ static u8 brcmf_sdbrcm_rxglom(struct brcmf_sdio *bus, u8 rxseq)
                         if (rxseq != seq) {
                                 brcmf_dbg(GLOM, "rx_seq %d, expected %d\n",
                                           seq, rxseq);
-                                bus->rx_badseq++;
+                                bus->sdcnt.rx_badseq++;
                                 rxseq = seq;
                         }
                         rxseq++;
@@ -1441,8 +1440,8 @@ static u8 brcmf_sdbrcm_rxglom(struct brcmf_sdio *bus, u8 rxseq)
                         down(&bus->sdsem);
                 }
 
-                bus->rxglomframes++;
-                bus->rxglompkts += bus->glom.qlen;
+                bus->sdcnt.rxglomframes++;
+                bus->sdcnt.rxglompkts += bus->glom.qlen;
         }
         return num;
 }
@@ -1526,7 +1525,7 @@ brcmf_sdbrcm_read_control(struct brcmf_sdio *bus, u8 *hdr, uint len, uint doff)
                 brcmf_dbg(ERROR, "%d-byte ctl frame (%d-byte ctl data) exceeds %d-byte limit\n",
                           len, len - doff, bus->sdiodev->bus_if->maxctl);
                 bus->sdiodev->bus_if->dstats.rx_errors++;
-                bus->rx_toolong++;
+                bus->sdcnt.rx_toolong++;
                 brcmf_sdbrcm_rxfail(bus, false, false);
                 goto done;
         }
@@ -1536,13 +1535,13 @@ brcmf_sdbrcm_read_control(struct brcmf_sdio *bus, u8 *hdr, uint len, uint doff)
                                 bus->sdiodev->sbwad,
                                 SDIO_FUNC_2,
                                 F2SYNC, (bus->rxctl + BRCMF_FIRSTREAD), rdlen);
-        bus->f2rxdata++;
+        bus->sdcnt.f2rxdata++;
 
         /* Control frame failures need retransmission */
         if (sdret < 0) {
                 brcmf_dbg(ERROR, "read %d control bytes failed: %d\n",
                           rdlen, sdret);
-                bus->rxc_errors++;
+                bus->sdcnt.rxc_errors++;
                 brcmf_sdbrcm_rxfail(bus, true, true);
                 goto done;
         }
@@ -1589,7 +1588,7 @@ brcmf_alloc_pkt_and_read(struct brcmf_sdio *bus, u16 rdlen,
         /* Read the entire frame */
         sdret = brcmf_sdcard_recv_pkt(bus->sdiodev, bus->sdiodev->sbwad,
                                       SDIO_FUNC_2, F2SYNC, *pkt);
-        bus->f2rxdata++;
+        bus->sdcnt.f2rxdata++;
 
         if (sdret < 0) {
                 brcmf_dbg(ERROR, "(nextlen): read %d bytes failed: %d\n",
@@ -1630,7 +1629,7 @@ brcmf_check_rxbuf(struct brcmf_sdio *bus, struct sk_buff *pkt, u8 *rxbuf,
         if ((u16)~(*len ^ check)) {
                 brcmf_dbg(ERROR, "(nextlen): HW hdr error: nextlen/len/check 0x%04x/0x%04x/0x%04x\n",
                           nextlen, *len, check);
-                bus->rx_badhdr++;
+                bus->sdcnt.rx_badhdr++;
                 brcmf_sdbrcm_rxfail(bus, false, false);
                 goto fail;
         }
@@ -1746,7 +1745,7 @@ brcmf_sdbrcm_readframes(struct brcmf_sdio *bus, uint maxframes, bool *finished)
                                 bus->nextlen = 0;
                         }
 
-                        bus->rx_readahead_cnt++;
+                        bus->sdcnt.rx_readahead_cnt++;
 
                         /* Handle Flow Control */
                         fcbits = SDPCM_FCMASK_VALUE(
@@ -1754,12 +1753,12 @@ brcmf_sdbrcm_readframes(struct brcmf_sdio *bus, uint maxframes, bool *finished)
 
                         if (bus->flowcontrol != fcbits) {
                                 if (~bus->flowcontrol & fcbits)
-                                        bus->fc_xoff++;
+                                        bus->sdcnt.fc_xoff++;
 
                                 if (bus->flowcontrol & ~fcbits)
-                                        bus->fc_xon++;
+                                        bus->sdcnt.fc_xon++;
 
-                                bus->fc_rcvd++;
+                                bus->sdcnt.fc_rcvd++;
                                 bus->flowcontrol = fcbits;
                         }
 
@@ -1767,7 +1766,7 @@ brcmf_sdbrcm_readframes(struct brcmf_sdio *bus, uint maxframes, bool *finished)
                         if (rxseq != seq) {
                                 brcmf_dbg(INFO, "(nextlen): rx_seq %d, expected %d\n",
                                           seq, rxseq);
-                                bus->rx_badseq++;
+                                bus->sdcnt.rx_badseq++;
                                 rxseq = seq;
                         }
 
@@ -1814,11 +1813,11 @@ brcmf_sdbrcm_readframes(struct brcmf_sdio *bus, uint maxframes, bool *finished)
                 sdret = brcmf_sdcard_recv_buf(bus->sdiodev, bus->sdiodev->sbwad,
                                               SDIO_FUNC_2, F2SYNC, bus->rxhdr,
                                               BRCMF_FIRSTREAD);
-                bus->f2rxhdrs++;
+                bus->sdcnt.f2rxhdrs++;
 
                 if (sdret < 0) {
                         brcmf_dbg(ERROR, "RXHEADER FAILED: %d\n", sdret);
-                        bus->rx_hdrfail++;
+                        bus->sdcnt.rx_hdrfail++;
                         brcmf_sdbrcm_rxfail(bus, true, true);
                         continue;
                 }
@@ -1840,7 +1839,7 @@ brcmf_sdbrcm_readframes(struct brcmf_sdio *bus, uint maxframes, bool *finished)
                 if ((u16) ~(len ^ check)) {
                         brcmf_dbg(ERROR, "HW hdr err: len/check 0x%04x/0x%04x\n",
                                   len, check);
-                        bus->rx_badhdr++;
+                        bus->sdcnt.rx_badhdr++;
                         brcmf_sdbrcm_rxfail(bus, false, false);
                         continue;
                 }
@@ -1861,7 +1860,7 @@ brcmf_sdbrcm_readframes(struct brcmf_sdio *bus, uint maxframes, bool *finished)
                 if ((doff < SDPCM_HDRLEN) || (doff > len)) {
                         brcmf_dbg(ERROR, "Bad data offset %d: HW len %d, min %d seq %d\n",
                                   doff, len, SDPCM_HDRLEN, seq);
-                        bus->rx_badhdr++;
+                        bus->sdcnt.rx_badhdr++;
                         brcmf_sdbrcm_rxfail(bus, false, false);
                         continue;
                 }
@@ -1880,19 +1879,19 @@ brcmf_sdbrcm_readframes(struct brcmf_sdio *bus, uint maxframes, bool *finished)
 
                 if (bus->flowcontrol != fcbits) {
                         if (~bus->flowcontrol & fcbits)
-                                bus->fc_xoff++;
+                                bus->sdcnt.fc_xoff++;
 
                         if (bus->flowcontrol & ~fcbits)
-                                bus->fc_xon++;
+                                bus->sdcnt.fc_xon++;
 
-                        bus->fc_rcvd++;
+                        bus->sdcnt.fc_rcvd++;
                         bus->flowcontrol = fcbits;
                 }
 
                 /* Check and update sequence number */
                 if (rxseq != seq) {
                         brcmf_dbg(INFO, "rx_seq %d, expected %d\n", seq, rxseq);
-                        bus->rx_badseq++;
+                        bus->sdcnt.rx_badseq++;
                         rxseq = seq;
                 }
 
@@ -1937,7 +1936,7 @@ brcmf_sdbrcm_readframes(struct brcmf_sdio *bus, uint maxframes, bool *finished)
                         brcmf_dbg(ERROR, "too long: len %d rdlen %d\n",
                                   len, rdlen);
                         bus->sdiodev->bus_if->dstats.rx_errors++;
-                        bus->rx_toolong++;
+                        bus->sdcnt.rx_toolong++;
                         brcmf_sdbrcm_rxfail(bus, false, false);
                         continue;
                 }
@@ -1960,7 +1959,7 @@ brcmf_sdbrcm_readframes(struct brcmf_sdio *bus, uint maxframes, bool *finished)
                 /* Read the remaining frame data */
                 sdret = brcmf_sdcard_recv_pkt(bus->sdiodev, bus->sdiodev->sbwad,
                                               SDIO_FUNC_2, F2SYNC, pkt);
-                bus->f2rxdata++;
+                bus->sdcnt.f2rxdata++;
 
                 if (sdret < 0) {
                         brcmf_dbg(ERROR, "read %d %s bytes failed: %d\n", rdlen,
@@ -2147,18 +2146,18 @@ static int brcmf_sdbrcm_txpkt(struct brcmf_sdio *bus, struct sk_buff *pkt,
 
         ret = brcmf_sdcard_send_pkt(bus->sdiodev, bus->sdiodev->sbwad,
                                     SDIO_FUNC_2, F2SYNC, pkt);
-        bus->f2txdata++;
+        bus->sdcnt.f2txdata++;
 
         if (ret < 0) {
                 /* On failure, abort the command and terminate the frame */
                 brcmf_dbg(INFO, "sdio error %d, abort command and terminate frame\n",
                           ret);
-                bus->tx_sderrs++;
+                bus->sdcnt.tx_sderrs++;
 
                 brcmf_sdcard_abort(bus->sdiodev, SDIO_FUNC_2);
                 brcmf_sdio_regwb(bus->sdiodev, SBSDIO_FUNC1_FRAMECTRL,
                                  SFC_WF_TERM, NULL);
-                bus->f1regdata++;
+                bus->sdcnt.f1regdata++;
 
                 for (i = 0; i < 3; i++) {
                         u8 hi, lo;
@@ -2166,7 +2165,7 @@ static int brcmf_sdbrcm_txpkt(struct brcmf_sdio *bus, struct sk_buff *pkt,
                                               SBSDIO_FUNC1_WFRAMEBCHI, NULL);
                         lo = brcmf_sdio_regrb(bus->sdiodev,
                                               SBSDIO_FUNC1_WFRAMEBCLO, NULL);
-                        bus->f1regdata += 2;
+                        bus->sdcnt.f1regdata += 2;
                         if ((hi == 0) && (lo == 0))
                                 break;
                 }
@@ -2224,7 +2223,7 @@ static uint brcmf_sdbrcm_sendfromq(struct brcmf_sdio *bus, uint maxframes)
                         ret = r_sdreg32(bus, &intstatus,
                                         offsetof(struct sdpcmd_regs,
                                                  intstatus));
-                        bus->f2txdata++;
+                        bus->sdcnt.f2txdata++;
                         if (ret != 0)
                                 break;
                         if (intstatus & bus->hostintmask)
@@ -2417,7 +2416,7 @@ static bool brcmf_sdbrcm_dpc(struct brcmf_sdio *bus)
                 bus->ipend = false;
                 err = r_sdreg32(bus, &newstatus,
                                 offsetof(struct sdpcmd_regs, intstatus));
-                bus->f1regdata++;
+                bus->sdcnt.f1regdata++;
                 if (err != 0)
                         newstatus = 0;
                 newstatus &= bus->hostintmask;
@@ -2426,7 +2425,7 @@ static bool brcmf_sdbrcm_dpc(struct brcmf_sdio *bus)
                         err = w_sdreg32(bus, newstatus,
                                         offsetof(struct sdpcmd_regs,
                                                  intstatus));
-                        bus->f1regdata++;
+                        bus->sdcnt.f1regdata++;
                 }
         }
 
@@ -2445,7 +2444,7 @@ static bool brcmf_sdbrcm_dpc(struct brcmf_sdio *bus)
 
                 err = r_sdreg32(bus, &newstatus,
                                 offsetof(struct sdpcmd_regs, intstatus));
-                bus->f1regdata += 2;
+                bus->sdcnt.f1regdata += 2;
                 bus->fcstate =
                     !!(newstatus & (I_HMB_FC_STATE | I_HMB_FC_CHANGE));
                 intstatus |= (newstatus & bus->hostintmask);
@@ -2502,7 +2501,7 @@ clkwait:
                 int ret, i;
 
                 ret = brcmf_sdcard_send_buf(bus->sdiodev, bus->sdiodev->sbwad,
-                        SDIO_FUNC_2, F2SYNC, (u8 *) bus->ctrl_frame_buf,
+                        SDIO_FUNC_2, F2SYNC, bus->ctrl_frame_buf,
                         (u32) bus->ctrl_frame_len);
 
                 if (ret < 0) {
@@ -2510,13 +2509,13 @@ clkwait:
                                 terminate the frame */
                         brcmf_dbg(INFO, "sdio error %d, abort command and terminate frame\n",
                                   ret);
-                        bus->tx_sderrs++;
+                        bus->sdcnt.tx_sderrs++;
 
                         brcmf_sdcard_abort(bus->sdiodev, SDIO_FUNC_2);
 
                         brcmf_sdio_regwb(bus->sdiodev, SBSDIO_FUNC1_FRAMECTRL,
                                          SFC_WF_TERM, &err);
-                        bus->f1regdata++;
+                        bus->sdcnt.f1regdata++;
 
                         for (i = 0; i < 3; i++) {
                                 u8 hi, lo;
@@ -2526,7 +2525,7 @@ clkwait:
                                 lo = brcmf_sdio_regrb(bus->sdiodev,
                                                       SBSDIO_FUNC1_WFRAMEBCLO,
                                                       &err);
-                                bus->f1regdata += 2;
+                                bus->sdcnt.f1regdata += 2;
                                 if ((hi == 0) && (lo == 0))
                                         break;
                         }
@@ -2657,7 +2656,7 @@ static int brcmf_sdbrcm_bus_txdata(struct device *dev, struct sk_buff *pkt)
         /* Check for existing queue, current flow-control,
                          pending event, or pending clock */
         brcmf_dbg(TRACE, "deferring pktq len %d\n", pktq_len(&bus->txq));
-        bus->fcqueued++;
+        bus->sdcnt.fcqueued++;
 
         /* Priority based enq */
         spin_lock_bh(&bus->txqlock);
@@ -2845,13 +2844,13 @@ static int brcmf_tx_frame(struct brcmf_sdio *bus, u8 *frame, u16 len)
                 /* On failure, abort the command and terminate the frame */
                 brcmf_dbg(INFO, "sdio error %d, abort command and terminate frame\n",
                           ret);
-                bus->tx_sderrs++;
+                bus->sdcnt.tx_sderrs++;
 
                 brcmf_sdcard_abort(bus->sdiodev, SDIO_FUNC_2);
 
                 brcmf_sdio_regwb(bus->sdiodev, SBSDIO_FUNC1_FRAMECTRL,
                                  SFC_WF_TERM, NULL);
-                bus->f1regdata++;
+                bus->sdcnt.f1regdata++;
 
                 for (i = 0; i < 3; i++) {
                         u8 hi, lo;
@@ -2859,7 +2858,7 @@ static int brcmf_tx_frame(struct brcmf_sdio *bus, u8 *frame, u16 len)
                                               SBSDIO_FUNC1_WFRAMEBCHI, NULL);
                         lo = brcmf_sdio_regrb(bus->sdiodev,
                                               SBSDIO_FUNC1_WFRAMEBCLO, NULL);
-                        bus->f1regdata += 2;
+                        bus->sdcnt.f1regdata += 2;
                         if (hi == 0 && lo == 0)
                                 break;
                 }
@@ -2976,13 +2975,324 @@ brcmf_sdbrcm_bus_txctl(struct device *dev, unsigned char *msg, uint msglen)
         up(&bus->sdsem);
 
         if (ret)
-                bus->tx_ctlerrs++;
+                bus->sdcnt.tx_ctlerrs++;
         else
-                bus->tx_ctlpkts++;
+                bus->sdcnt.tx_ctlpkts++;
 
         return ret ? -EIO : 0;
 }
 
+#ifdef DEBUG
+static inline bool brcmf_sdio_valid_shared_address(u32 addr)
+{
+        return !(addr == 0 || ((~addr >> 16) & 0xffff) == (addr & 0xffff));
+}
+
+static int brcmf_sdio_readshared(struct brcmf_sdio *bus,
+                                 struct sdpcm_shared *sh)
+{
+        u32 addr;
+        int rv;
+        u32 shaddr = 0;
+        struct sdpcm_shared_le sh_le;
+        __le32 addr_le;
+
+        shaddr = bus->ramsize - 4;
+
+        /*
+         * Read last word in socram to determine
+         * address of sdpcm_shared structure
+         */
+        rv = brcmf_sdbrcm_membytes(bus, false, shaddr,
+                                   (u8 *)&addr_le, 4);
+        if (rv < 0)
+                return rv;
+
+        addr = le32_to_cpu(addr_le);
+
+        brcmf_dbg(INFO, "sdpcm_shared address 0x%08X\n", addr);
+
+        /*
+         * Check if addr is valid.
+         * NVRAM length at the end of memory should have been overwritten.
+         */
+        if (!brcmf_sdio_valid_shared_address(addr)) {
+                        brcmf_dbg(ERROR, "invalid sdpcm_shared address 0x%08X\n",
+                                  addr);
+                        return -EINVAL;
+        }
+
+        /* Read hndrte_shared structure */
+        rv = brcmf_sdbrcm_membytes(bus, false, addr, (u8 *)&sh_le,
+                                   sizeof(struct sdpcm_shared_le));
+        if (rv < 0)
+                return rv;
+
+        /* Endianness */
+        sh->flags = le32_to_cpu(sh_le.flags);
+        sh->trap_addr = le32_to_cpu(sh_le.trap_addr);
+        sh->assert_exp_addr = le32_to_cpu(sh_le.assert_exp_addr);
+        sh->assert_file_addr = le32_to_cpu(sh_le.assert_file_addr);
+        sh->assert_line = le32_to_cpu(sh_le.assert_line);
+        sh->console_addr = le32_to_cpu(sh_le.console_addr);
+        sh->msgtrace_addr = le32_to_cpu(sh_le.msgtrace_addr);
+
+        if ((sh->flags & SDPCM_SHARED_VERSION_MASK) != SDPCM_SHARED_VERSION) {
+                brcmf_dbg(ERROR,
+                          "sdpcm_shared version mismatch: dhd %d dongle %d\n",
+                          SDPCM_SHARED_VERSION,
+                          sh->flags & SDPCM_SHARED_VERSION_MASK);
+                return -EPROTO;
+        }
+
+        return 0;
+}
+
+static int brcmf_sdio_dump_console(struct brcmf_sdio *bus,
+                                   struct sdpcm_shared *sh, char __user *data,
+                                   size_t count)
+{
+        u32 addr, console_ptr, console_size, console_index;
+        char *conbuf = NULL;
+        __le32 sh_val;
+        int rv;
+        loff_t pos = 0;
+        int nbytes = 0;
+
+        /* obtain console information from device memory */
+        addr = sh->console_addr + offsetof(struct rte_console, log_le);
+        rv = brcmf_sdbrcm_membytes(bus, false, addr,
+                        (u8 *)&sh_val, sizeof(u32));
+        if (rv < 0)
+                return rv;
+        console_ptr = le32_to_cpu(sh_val);
+
+        addr = sh->console_addr + offsetof(struct rte_console, log_le.buf_size);
+        rv = brcmf_sdbrcm_membytes(bus, false, addr,
+                        (u8 *)&sh_val, sizeof(u32));
+        if (rv < 0)
+                return rv;
+        console_size = le32_to_cpu(sh_val);
+
+        addr = sh->console_addr + offsetof(struct rte_console, log_le.idx);
+        rv = brcmf_sdbrcm_membytes(bus, false, addr,
+                        (u8 *)&sh_val, sizeof(u32));
+        if (rv < 0)
+                return rv;
+        console_index = le32_to_cpu(sh_val);
+
+        /* allocate buffer for console data */
+        if (console_size <= CONSOLE_BUFFER_MAX)
+                conbuf = vzalloc(console_size+1);
+
+        if (!conbuf)
+                return -ENOMEM;
+
+        /* obtain the console data from device */
+        conbuf[console_size] = '\0';
+        rv = brcmf_sdbrcm_membytes(bus, false, console_ptr, (u8 *)conbuf,
+                                   console_size);
+        if (rv < 0)
+                goto done;
+
+        rv = simple_read_from_buffer(data, count, &pos,
+                                     conbuf + console_index,
+                                     console_size - console_index);
+        if (rv < 0)
+                goto done;
+
+        nbytes = rv;
+        if (console_index > 0) {
+                pos = 0;
+                rv = simple_read_from_buffer(data+nbytes, count, &pos,
+                                             conbuf, console_index - 1);
+                if (rv < 0)
+                        goto done;
+                rv += nbytes;
+        }
+done:
+        vfree(conbuf);
+        return rv;
+}
+
+static int brcmf_sdio_trap_info(struct brcmf_sdio *bus, struct sdpcm_shared *sh,
+                                char __user *data, size_t count)
+{
+        int error, res;
+        char buf[350];
+        struct brcmf_trap_info tr;
+        int nbytes;
+        loff_t pos = 0;
+
+        if ((sh->flags & SDPCM_SHARED_TRAP) == 0)
+                return 0;
+
+        error = brcmf_sdbrcm_membytes(bus, false, sh->trap_addr, (u8 *)&tr,
+                                      sizeof(struct brcmf_trap_info));
+        if (error < 0)
+                return error;
+
+        nbytes = brcmf_sdio_dump_console(bus, sh, data, count);
+        if (nbytes < 0)
+                return nbytes;
+
+        res = scnprintf(buf, sizeof(buf),
+                        "dongle trap info: type 0x%x @ epc 0x%08x\n"
+                        "  cpsr 0x%08x spsr 0x%08x sp 0x%08x\n"
+                        "  lr   0x%08x pc   0x%08x offset 0x%x\n"
+                        "  r0   0x%08x r1   0x%08x r2 0x%08x r3 0x%08x\n"
+                        "  r4   0x%08x r5   0x%08x r6 0x%08x r7 0x%08x\n",
+                        le32_to_cpu(tr.type), le32_to_cpu(tr.epc),
+                        le32_to_cpu(tr.cpsr), le32_to_cpu(tr.spsr),
+                        le32_to_cpu(tr.r13), le32_to_cpu(tr.r14),
+                        le32_to_cpu(tr.pc), sh->trap_addr,
+                        le32_to_cpu(tr.r0), le32_to_cpu(tr.r1),
+                        le32_to_cpu(tr.r2), le32_to_cpu(tr.r3),
+                        le32_to_cpu(tr.r4), le32_to_cpu(tr.r5),
+                        le32_to_cpu(tr.r6), le32_to_cpu(tr.r7));
+
+        error = simple_read_from_buffer(data+nbytes, count, &pos, buf, res);
+        if (error < 0)
+                return error;
+
+        nbytes += error;
+        return nbytes;
+}
+
+static int brcmf_sdio_assert_info(struct brcmf_sdio *bus,
+                                  struct sdpcm_shared *sh, char __user *data,
+                                  size_t count)
+{
+        int error = 0;
+        char buf[200];
+        char file[80] = "?";
+        char expr[80] = "<???>";
+        int res;
+        loff_t pos = 0;
+
+        if ((sh->flags & SDPCM_SHARED_ASSERT_BUILT) == 0) {
+                brcmf_dbg(INFO, "firmware not built with -assert\n");
+                return 0;
+        } else if ((sh->flags & SDPCM_SHARED_ASSERT) == 0) {
+                brcmf_dbg(INFO, "no assert in dongle\n");
+                return 0;
+        }
+
+        if (sh->assert_file_addr != 0) {
+                error = brcmf_sdbrcm_membytes(bus, false, sh->assert_file_addr,
+                                              (u8 *)file, 80);
+                if (error < 0)
+                        return error;
+        }
+        if (sh->assert_exp_addr != 0) {
+                error = brcmf_sdbrcm_membytes(bus, false, sh->assert_exp_addr,
+                                              (u8 *)expr, 80);
+                if (error < 0)
+                        return error;
+        }
+
+        res = scnprintf(buf, sizeof(buf),
+                        "dongle assert: %s:%d: assert(%s)\n",
+                        file, sh->assert_line, expr);
+        return simple_read_from_buffer(data, count, &pos, buf, res);
+}
+
+static int brcmf_sdbrcm_checkdied(struct brcmf_sdio *bus)
+{
+        int error;
+        struct sdpcm_shared sh;
+
+        down(&bus->sdsem);
+        error = brcmf_sdio_readshared(bus, &sh);
+        up(&bus->sdsem);
+
+        if (error < 0)
+                return error;
+
+        if ((sh.flags & SDPCM_SHARED_ASSERT_BUILT) == 0)
+                brcmf_dbg(INFO, "firmware not built with -assert\n");
+        else if (sh.flags & SDPCM_SHARED_ASSERT)
+                brcmf_dbg(ERROR, "assertion in dongle\n");
+
+        if (sh.flags & SDPCM_SHARED_TRAP)
+                brcmf_dbg(ERROR, "firmware trap in dongle\n");
+
+        return 0;
+}
+
+static int brcmf_sdbrcm_died_dump(struct brcmf_sdio *bus, char __user *data,
+                                  size_t count, loff_t *ppos)
+{
+        int error = 0;
+        struct sdpcm_shared sh;
+        int nbytes = 0;
+        loff_t pos = *ppos;
+
+        if (pos != 0)
+                return 0;
+
+        down(&bus->sdsem);
+        error = brcmf_sdio_readshared(bus, &sh);
+        if (error < 0)
+                goto done;
+
+        error = brcmf_sdio_assert_info(bus, &sh, data, count);
+        if (error < 0)
+                goto done;
+
+        nbytes = error;
+        error = brcmf_sdio_trap_info(bus, &sh, data, count);
+        if (error < 0)
+                goto done;
+
+        error += nbytes;
+        *ppos += error;
+done:
+        up(&bus->sdsem);
+        return error;
+}
+
+static ssize_t brcmf_sdio_forensic_read(struct file *f, char __user *data,
+                                        size_t count, loff_t *ppos)
+{
+        struct brcmf_sdio *bus = f->private_data;
+        int res;
+
+        res = brcmf_sdbrcm_died_dump(bus, data, count, ppos);
+        if (res > 0)
+                *ppos += res;
+        return (ssize_t)res;
+}
+
+static const struct file_operations brcmf_sdio_forensic_ops = {
+        .owner = THIS_MODULE,
+        .open = simple_open,
+        .read = brcmf_sdio_forensic_read
+};
+
+static void brcmf_sdio_debugfs_create(struct brcmf_sdio *bus)
+{
+        struct brcmf_pub *drvr = bus->sdiodev->bus_if->drvr;
+        struct dentry *dentry = brcmf_debugfs_get_devdir(drvr);
+
+        if (IS_ERR_OR_NULL(dentry))
+                return;
+
+        debugfs_create_file("forensics", S_IRUGO, dentry, bus,
+                            &brcmf_sdio_forensic_ops);
+        brcmf_debugfs_create_sdio_count(drvr, &bus->sdcnt);
+}
+#else
+static int brcmf_sdbrcm_checkdied(struct brcmf_sdio *bus)
+{
+        return 0;
+}
+
+static void brcmf_sdio_debugfs_create(struct brcmf_sdio *bus)
+{
+}
+#endif /* DEBUG */
+
 static int
 brcmf_sdbrcm_bus_rxctl(struct device *dev, unsigned char *msg, uint msglen)
 {
@@ -3009,60 +3319,27 @@ brcmf_sdbrcm_bus_rxctl(struct device *dev, unsigned char *msg, uint msglen)
                           rxlen, msglen);
         } else if (timeleft == 0) {
                 brcmf_dbg(ERROR, "resumed on timeout\n");
+                brcmf_sdbrcm_checkdied(bus);
         } else if (pending) {
                 brcmf_dbg(CTL, "cancelled\n");
                 return -ERESTARTSYS;
         } else {
                 brcmf_dbg(CTL, "resumed for unknown reason?\n");
+                brcmf_sdbrcm_checkdied(bus);
         }
 
         if (rxlen)
-                bus->rx_ctlpkts++;
+                bus->sdcnt.rx_ctlpkts++;
         else
-                bus->rx_ctlerrs++;
+                bus->sdcnt.rx_ctlerrs++;
 
         return rxlen ? (int)rxlen : -ETIMEDOUT;
 }
 
-static int brcmf_sdbrcm_downloadvars(struct brcmf_sdio *bus, void *arg, int len)
-{
-        int bcmerror = 0;
-
-        brcmf_dbg(TRACE, "Enter\n");
-
-        /* Basic sanity checks */
-        if (bus->sdiodev->bus_if->drvr_up) {
-                bcmerror = -EISCONN;
-                goto err;
-        }
-        if (!len) {
-                bcmerror = -EOVERFLOW;
-                goto err;
-        }
-
-        /* Free the old ones and replace with passed variables */
-        kfree(bus->vars);
-
-        bus->vars = kmalloc(len, GFP_ATOMIC);
-        bus->varsz = bus->vars ? len : 0;
-        if (bus->vars == NULL) {
-                bcmerror = -ENOMEM;
-                goto err;
-        }
-
-        /* Copy the passed variables, which should include the
-                 terminating double-null */
-        memcpy(bus->vars, arg, bus->varsz);
-err:
-        return bcmerror;
-}
-
 static int brcmf_sdbrcm_write_vars(struct brcmf_sdio *bus)
 {
         int bcmerror = 0;
-        u32 varsize;
         u32 varaddr;
-        u8 *vbuffer;
         u32 varsizew;
         __le32 varsizew_le;
 #ifdef DEBUG
@@ -3071,56 +3348,44 @@ static int brcmf_sdbrcm_write_vars(struct brcmf_sdio *bus)
 
         /* Even if there are no vars are to be written, we still
                  need to set the ramsize. */
-        varsize = bus->varsz ? roundup(bus->varsz, 4) : 0;
-        varaddr = (bus->ramsize - 4) - varsize;
+        varaddr = (bus->ramsize - 4) - bus->varsz;
 
         if (bus->vars) {
-                vbuffer = kzalloc(varsize, GFP_ATOMIC);
-                if (!vbuffer)
-                        return -ENOMEM;
-
-                memcpy(vbuffer, bus->vars, bus->varsz);
-
                 /* Write the vars list */
-                bcmerror =
-                    brcmf_sdbrcm_membytes(bus, true, varaddr, vbuffer, varsize);
+                bcmerror = brcmf_sdbrcm_membytes(bus, true, varaddr,
+                                                 bus->vars, bus->varsz);
 #ifdef DEBUG
                 /* Verify NVRAM bytes */
-                brcmf_dbg(INFO, "Compare NVRAM dl & ul; varsize=%d\n", varsize);
-                nvram_ularray = kmalloc(varsize, GFP_ATOMIC);
-                if (!nvram_ularray) {
-                        kfree(vbuffer);
+                brcmf_dbg(INFO, "Compare NVRAM dl & ul; varsize=%d\n",
+                          bus->varsz);
+                nvram_ularray = kmalloc(bus->varsz, GFP_ATOMIC);
+                if (!nvram_ularray)
                         return -ENOMEM;
-                }
 
                 /* Upload image to verify downloaded contents. */
-                memset(nvram_ularray, 0xaa, varsize);
+                memset(nvram_ularray, 0xaa, bus->varsz);
 
                 /* Read the vars list to temp buffer for comparison */
-                bcmerror =
-                    brcmf_sdbrcm_membytes(bus, false, varaddr, nvram_ularray,
-                                     varsize);
+                bcmerror = brcmf_sdbrcm_membytes(bus, false, varaddr,
+                                                 nvram_ularray, bus->varsz);
                 if (bcmerror) {
                         brcmf_dbg(ERROR, "error %d on reading %d nvram bytes at 0x%08x\n",
-                                  bcmerror, varsize, varaddr);
+                                  bcmerror, bus->varsz, varaddr);
                 }
                 /* Compare the org NVRAM with the one read from RAM */
-                if (memcmp(vbuffer, nvram_ularray, varsize))
+                if (memcmp(bus->vars, nvram_ularray, bus->varsz))
                         brcmf_dbg(ERROR, "Downloaded NVRAM image is corrupted\n");
                 else
                         brcmf_dbg(ERROR, "Download/Upload/Compare of NVRAM ok\n");
 
                 kfree(nvram_ularray);
 #endif                          /* DEBUG */
-
-                kfree(vbuffer);
         }
 
         /* adjust to the user specified RAM */
         brcmf_dbg(INFO, "Physical memory size: %d\n", bus->ramsize);
         brcmf_dbg(INFO, "Vars are at %d, orig varsize is %d\n",
-                  varaddr, varsize);
-        varsize = ((bus->ramsize - 4) - varaddr);
+                  varaddr, bus->varsz);
 
         /*
          * Determine the length token:
@@ -3131,13 +3396,13 @@ static int brcmf_sdbrcm_write_vars(struct brcmf_sdio *bus)
                 varsizew = 0;
                 varsizew_le = cpu_to_le32(0);
         } else {
-                varsizew = varsize / 4;
+                varsizew = bus->varsz / 4;
                 varsizew = (~varsizew << 16) | (varsizew & 0x0000FFFF);
                 varsizew_le = cpu_to_le32(varsizew);
         }
 
         brcmf_dbg(INFO, "New varsize is %d, length token=0x%08x\n",
-                  varsize, varsizew);
+                  bus->varsz, varsizew);
 
         /* Write the length token to the last word */
         bcmerror = brcmf_sdbrcm_membytes(bus, true, (bus->ramsize - 4),
@@ -3261,13 +3526,21 @@ err:
  * by two NULs.
 */
 
-static uint brcmf_process_nvram_vars(char *varbuf, uint len)
+static int brcmf_process_nvram_vars(struct brcmf_sdio *bus)
 {
+        char *varbuf;
         char *dp;
         bool findNewline;
         int column;
-        uint buf_len, n;
+        int ret = 0;
+        uint buf_len, n, len;
 
+        len = bus->firmware->size;
+        varbuf = vmalloc(len);
+        if (!varbuf)
+                return -ENOMEM;
+
+        memcpy(varbuf, bus->firmware->data, len);
         dp = varbuf;
 
         findNewline = false;
@@ -3296,56 +3569,44 @@ static uint brcmf_process_nvram_vars(char *varbuf, uint len)
                 column++;
         }
         buf_len = dp - varbuf;
-
         while (dp < varbuf + n)
                 *dp++ = 0;
 
-        return buf_len;
+        kfree(bus->vars);
+        /* roundup needed for download to device */
+        bus->varsz = roundup(buf_len + 1, 4);
+        bus->vars = kmalloc(bus->varsz, GFP_KERNEL);
+        if (bus->vars == NULL) {
+                bus->varsz = 0;
+                ret = -ENOMEM;
+                goto err;
+        }
+
+        /* copy the processed variables and add null termination */
+        memcpy(bus->vars, varbuf, buf_len);
+        bus->vars[buf_len] = 0;
+err:
+        vfree(varbuf);
+        return ret;
 }
 
 static int brcmf_sdbrcm_download_nvram(struct brcmf_sdio *bus)
 {
-        uint len;
-        char *memblock = NULL;
-        char *bufp;
         int ret;
 
+        if (bus->sdiodev->bus_if->drvr_up)
+                return -EISCONN;
+
         ret = request_firmware(&bus->firmware, BRCMF_SDIO_NV_NAME,
                                &bus->sdiodev->func[2]->dev);
         if (ret) {
                 brcmf_dbg(ERROR, "Fail to request nvram %d\n", ret);
                 return ret;
         }
-        bus->fw_ptr = 0;
-
-        memblock = kmalloc(MEMBLOCK, GFP_ATOMIC);
-        if (memblock == NULL) {
-                ret = -ENOMEM;
-                goto err;
-        }
-
-        len = brcmf_sdbrcm_get_image(memblock, MEMBLOCK, bus);
-
-        if (len > 0 && len < MEMBLOCK) {
-                bufp = (char *)memblock;
-                bufp[len] = 0;
-                len = brcmf_process_nvram_vars(bufp, len);
-                bufp += len;
-                *bufp++ = 0;
-                if (len)
-                        ret = brcmf_sdbrcm_downloadvars(bus, memblock, len + 1);
-                if (ret)
-                        brcmf_dbg(ERROR, "error downloading vars: %d\n", ret);
-        } else {
-                brcmf_dbg(ERROR, "error reading nvram file: %d\n", len);
-                ret = -EIO;
-        }
 
-err:
-        kfree(memblock);
+        ret = brcmf_process_nvram_vars(bus);
 
         release_firmware(bus->firmware);
-        bus->fw_ptr = 0;
 
         return ret;
 }
@@ -3419,7 +3680,7 @@ static int brcmf_sdbrcm_bus_init(struct device *dev)
                 return 0;
 
         /* Start the watchdog timer */
-        bus->tickcnt = 0;
+        bus->sdcnt.tickcnt = 0;
         brcmf_sdbrcm_wd_timer(bus, BRCMF_WD_POLL_MS);
 
         down(&bus->sdsem);
@@ -3512,7 +3773,7 @@ void brcmf_sdbrcm_isr(void *arg)
                 return;
         }
         /* Count the interrupt call */
-        bus->intrcount++;
+        bus->sdcnt.intrcount++;
         bus->ipend = true;
 
         /* Shouldn't get this interrupt if we're sleeping? */
@@ -3554,7 +3815,8 @@ static bool brcmf_sdbrcm_bus_watchdog(struct brcmf_sdio *bus)
                 bus->polltick = 0;
 
                 /* Check device if no interrupts */
-                if (!bus->intr || (bus->intrcount == bus->lastintrs)) {
+                if (!bus->intr ||
+                    (bus->sdcnt.intrcount == bus->sdcnt.lastintrs)) {
 
                         if (!bus->dpc_sched) {
                                 u8 devpend;
@@ -3569,7 +3831,7 @@ static bool brcmf_sdbrcm_bus_watchdog(struct brcmf_sdio *bus)
                         /* If there is something, make like the ISR and
                                  schedule the DPC */
                         if (intstatus) {
-                                bus->pollcnt++;
+                                bus->sdcnt.pollcnt++;
                                 bus->ipend = true;
 
                                 bus->dpc_sched = true;
@@ -3581,7 +3843,7 @@ static bool brcmf_sdbrcm_bus_watchdog(struct brcmf_sdio *bus)
                 }
 
                 /* Update interrupt tracking */
-                bus->lastintrs = bus->intrcount;
+                bus->sdcnt.lastintrs = bus->sdcnt.intrcount;
         }
 #ifdef DEBUG
         /* Poll for console output periodically */
@@ -3623,6 +3885,8 @@ static bool brcmf_sdbrcm_chipmatch(u16 chipid)
                 return true;
         if (chipid == BCM4330_CHIP_ID)
                 return true;
+        if (chipid == BCM4334_CHIP_ID)
+                return true;
         return false;
 }
 
@@ -3793,7 +4057,7 @@ brcmf_sdbrcm_watchdog_thread(void *data)
                 if (!wait_for_completion_interruptible(&bus->watchdog_wait)) {
                         brcmf_sdbrcm_bus_watchdog(bus);
                         /* Count the tick for reference */
-                        bus->tickcnt++;
+                        bus->sdcnt.tickcnt++;
                 } else
                         break;
         }
@@ -3856,6 +4120,10 @@ void *brcmf_sdbrcm_probe(u32 regsva, struct brcmf_sdio_dev *sdiodev)
 {
         int ret;
         struct brcmf_sdio *bus;
+        struct brcmf_bus_dcmd *dlst;
+        u32 dngl_txglom;
+        u32 dngl_txglomalign;
+        u8 idx;
 
         brcmf_dbg(TRACE, "Enter\n");
 
@@ -3938,8 +4206,29 @@ void *brcmf_sdbrcm_probe(u32 regsva, struct brcmf_sdio_dev *sdiodev)
                 goto fail;
         }
 
+        brcmf_sdio_debugfs_create(bus);
         brcmf_dbg(INFO, "completed!!\n");
 
+        /* sdio bus core specific dcmd */
+        idx = brcmf_sdio_chip_getinfidx(bus->ci, BCMA_CORE_SDIO_DEV);
+        dlst = kzalloc(sizeof(struct brcmf_bus_dcmd), GFP_KERNEL);
+        if (dlst) {
+                if (bus->ci->c_inf[idx].rev < 12) {
+                        /* for sdio core rev < 12, disable txgloming */
+                        dngl_txglom = 0;
+                        dlst->name = "bus:txglom";
+                        dlst->param = (char *)&dngl_txglom;
+                        dlst->param_len = sizeof(u32);
+                } else {
+                        /* otherwise, set txglomalign */
+                        dngl_txglomalign = bus->sdiodev->bus_if->align;
+                        dlst->name = "bus:txglomalign";
+                        dlst->param = (char *)&dngl_txglomalign;
+                        dlst->param_len = sizeof(u32);
+                }
+                list_add(&dlst->list, &bus->sdiodev->bus_if->dcmd_list);
+        }
+
         /* if firmware path present try to download and bring up bus */
         ret = brcmf_bus_start(bus->sdiodev->dev);
         if (ret != 0) {
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c b/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c
index f8e1f1c84d0..58155e23d22 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c
@@ -403,6 +403,23 @@ static int brcmf_sdio_chip_recognition(struct brcmf_sdio_dev *sdiodev,
                 ci->c_inf[3].cib = 0x03004211;
                 ci->ramsize = 0x48000;
                 break;
+        case BCM4334_CHIP_ID:
+                ci->c_inf[0].wrapbase = 0x18100000;
+                ci->c_inf[0].cib = 0x29004211;
+                ci->c_inf[1].id = BCMA_CORE_SDIO_DEV;
+                ci->c_inf[1].base = 0x18002000;
+                ci->c_inf[1].wrapbase = 0x18102000;
+                ci->c_inf[1].cib = 0x0d004211;
+                ci->c_inf[2].id = BCMA_CORE_INTERNAL_MEM;
+                ci->c_inf[2].base = 0x18004000;
+                ci->c_inf[2].wrapbase = 0x18104000;
+                ci->c_inf[2].cib = 0x13080401;
+                ci->c_inf[3].id = BCMA_CORE_ARM_CM3;
+                ci->c_inf[3].base = 0x18003000;
+                ci->c_inf[3].wrapbase = 0x18103000;
+                ci->c_inf[3].cib = 0x07004211;
+                ci->ramsize = 0x80000;
+                break;
         default:
                 brcmf_dbg(ERROR, "chipid 0x%x is not supported\n", ci->chip);
                 return -ENODEV;
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/aiutils.c b/drivers/net/wireless/brcm80211/brcmsmac/aiutils.c
index 6d8b7213643..3c6f9b1e8d0 100644
--- a/drivers/net/wireless/brcm80211/brcmsmac/aiutils.c
+++ b/drivers/net/wireless/brcm80211/brcmsmac/aiutils.c
@@ -631,9 +631,8 @@ uint ai_cc_reg(struct si_pub *sih, uint regoff, u32 mask, u32 val)
         cc = sii->icbus->drv_cc.core;
 
         /* mask and set */
-        if (mask || val) {
+        if (mask || val)
                 bcma_maskset32(cc, regoff, ~mask, val);
-        }
 
         /* readback */
         w = bcma_read32(cc, regoff);
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/aiutils.h b/drivers/net/wireless/brcm80211/brcmsmac/aiutils.h
index d9f04a683bd..d6fa9829af9 100644
--- a/drivers/net/wireless/brcm80211/brcmsmac/aiutils.h
+++ b/drivers/net/wireless/brcm80211/brcmsmac/aiutils.h
@@ -193,7 +193,7 @@ extern void ai_detach(struct si_pub *sih);
 extern uint ai_cc_reg(struct si_pub *sih, uint regoff, u32 mask, u32 val);
 extern void ai_clkctl_init(struct si_pub *sih);
 extern u16 ai_clkctl_fast_pwrup_delay(struct si_pub *sih);
-extern bool ai_clkctl_cc(struct si_pub *sih, uint mode);
+extern bool ai_clkctl_cc(struct si_pub *sih, enum bcma_clkmode mode);
 extern bool ai_deviceremoved(struct si_pub *sih);
 
 extern void ai_pci_down(struct si_pub *sih);
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/ampdu.c b/drivers/net/wireless/brcm80211/brcmsmac/ampdu.c
index 95b5902bc4b..01b190a25d9 100644
--- a/drivers/net/wireless/brcm80211/brcmsmac/ampdu.c
+++ b/drivers/net/wireless/brcm80211/brcmsmac/ampdu.c
@@ -735,10 +735,8 @@ brcms_c_sendampdu(struct ampdu_info *ampdu, struct brcms_txq_info *qi,
                  * a candidate for aggregation
                  */
                 p = pktq_ppeek(&qi->q, prec);
-                /* tx_info must be checked with current p */
-                tx_info = IEEE80211_SKB_CB(p);
-
                 if (p) {
+                        tx_info = IEEE80211_SKB_CB(p);
                         if ((tx_info->flags & IEEE80211_TX_CTL_AMPDU) &&
                             ((u8) (p->priority) == tid)) {
                                 plen = p->len + AMPDU_MAX_MPDU_OVERHEAD;
@@ -759,6 +757,7 @@ brcms_c_sendampdu(struct ampdu_info *ampdu, struct brcms_txq_info *qi,
                                         p = NULL;
                                         continue;
                                 }
+                                /* next packet fit for aggregation so dequeue */
                                 p = brcmu_pktq_pdeq(&qi->q, prec);
                         } else {
                                 p = NULL;
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/channel.c b/drivers/net/wireless/brcm80211/brcmsmac/channel.c
index eb77ac3cfb6..2d365d3486d 100644
--- a/drivers/net/wireless/brcm80211/brcmsmac/channel.c
+++ b/drivers/net/wireless/brcm80211/brcmsmac/channel.c
@@ -15,7 +15,9 @@
  */
 
 #include <linux/types.h>
+#include <net/cfg80211.h>
 #include <net/mac80211.h>
+#include <net/regulatory.h>
 
 #include <defs.h>
 #include "pub.h"
@@ -23,73 +25,17 @@
 #include "main.h"
 #include "stf.h"
 #include "channel.h"
+#include "mac80211_if.h"
 
 /* QDB() macro takes a dB value and converts to a quarter dB value */
 #define QDB(n) ((n) * BRCMS_TXPWR_DB_FACTOR)
 
-#define  LOCALE_CHAN_01_11       (1<<0)
-#define  LOCALE_CHAN_12_13       (1<<1)
-#define  LOCALE_CHAN_14          (1<<2)
-#define  LOCALE_SET_5G_LOW_JP1   (1<<3) /* 34-48, step 2 */
-#define  LOCALE_SET_5G_LOW_JP2   (1<<4) /* 34-46, step 4 */
-#define  LOCALE_SET_5G_LOW1      (1<<5) /* 36-48, step 4 */
-#define  LOCALE_SET_5G_LOW2      (1<<6) /* 52 */
-#define  LOCALE_SET_5G_LOW3      (1<<7) /* 56-64, step 4 */
-#define  LOCALE_SET_5G_MID1      (1<<8) /* 100-116, step 4 */
-#define  LOCALE_SET_5G_MID2      (1<<9) /* 120-124, step 4 */
-#define  LOCALE_SET_5G_MID3      (1<<10)        /* 128 */
-#define  LOCALE_SET_5G_HIGH1     (1<<11)        /* 132-140, step 4 */
-#define  LOCALE_SET_5G_HIGH2     (1<<12)        /* 149-161, step 4 */
-#define  LOCALE_SET_5G_HIGH3     (1<<13)        /* 165 */
-#define  LOCALE_CHAN_52_140_ALL  (1<<14)
-#define  LOCALE_SET_5G_HIGH4     (1<<15)        /* 184-216 */
-
-#define  LOCALE_CHAN_36_64      (LOCALE_SET_5G_LOW1 | \
-                                 LOCALE_SET_5G_LOW2 | \
-                                 LOCALE_SET_5G_LOW3)
-#define  LOCALE_CHAN_52_64      (LOCALE_SET_5G_LOW2 | LOCALE_SET_5G_LOW3)
-#define  LOCALE_CHAN_100_124    (LOCALE_SET_5G_MID1 | LOCALE_SET_5G_MID2)
-#define  LOCALE_CHAN_100_140    (LOCALE_SET_5G_MID1 | LOCALE_SET_5G_MID2 | \
-                                  LOCALE_SET_5G_MID3 | LOCALE_SET_5G_HIGH1)
-#define  LOCALE_CHAN_149_165    (LOCALE_SET_5G_HIGH2 | LOCALE_SET_5G_HIGH3)
-#define  LOCALE_CHAN_184_216    LOCALE_SET_5G_HIGH4
-
-#define  LOCALE_CHAN_01_14      (LOCALE_CHAN_01_11 | \
-                                 LOCALE_CHAN_12_13 | \
-                                 LOCALE_CHAN_14)
-
-#define  LOCALE_RADAR_SET_NONE            0
-#define  LOCALE_RADAR_SET_1               1
-
-#define  LOCALE_RESTRICTED_NONE           0
-#define  LOCALE_RESTRICTED_SET_2G_SHORT   1
-#define  LOCALE_RESTRICTED_CHAN_165       2
-#define  LOCALE_CHAN_ALL_5G               3
-#define  LOCALE_RESTRICTED_JAPAN_LEGACY   4
-#define  LOCALE_RESTRICTED_11D_2G         5
-#define  LOCALE_RESTRICTED_11D_5G         6
-#define  LOCALE_RESTRICTED_LOW_HI         7
-#define  LOCALE_RESTRICTED_12_13_14       8
-
-#define LOCALE_2G_IDX_i                 0
-#define LOCALE_5G_IDX_11                0
 #define LOCALE_MIMO_IDX_bn              0
 #define LOCALE_MIMO_IDX_11n             0
 
-/* max of BAND_5G_PWR_LVLS and 6 for 2.4 GHz */
-#define BRCMS_MAXPWR_TBL_SIZE           6
 /* max of BAND_5G_PWR_LVLS and 14 for 2.4 GHz */
 #define BRCMS_MAXPWR_MIMO_TBL_SIZE      14
 
-/* power level in group of 2.4GHz band channels:
- * maxpwr[0] - CCK  channels [1]
- * maxpwr[1] - CCK  channels [2-10]
- * maxpwr[2] - CCK  channels [11-14]
- * maxpwr[3] - OFDM channels [1]
- * maxpwr[4] - OFDM channels [2-10]
- * maxpwr[5] - OFDM channels [11-14]
- */
-
 /* maxpwr mapping to 5GHz band channels:
  * maxpwr[0] - channels [34-48]
  * maxpwr[1] - channels [52-60]
@@ -101,16 +47,8 @@
 
 #define LC(id)  LOCALE_MIMO_IDX_ ## id
 
-#define LC_2G(id)       LOCALE_2G_IDX_ ## id
-
-#define LC_5G(id)       LOCALE_5G_IDX_ ## id
-
-#define LOCALES(band2, band5, mimo2, mimo5) \
-                {LC_2G(band2), LC_5G(band5), LC(mimo2), LC(mimo5)}
-
-/* macro to get 2.4 GHz channel group index for tx power */
-#define CHANNEL_POWER_IDX_2G_CCK(c) (((c) < 2) ? 0 : (((c) < 11) ? 1 : 2))
-#define CHANNEL_POWER_IDX_2G_OFDM(c) (((c) < 2) ? 3 : (((c) < 11) ? 4 : 5))
+#define LOCALES(mimo2, mimo5) \
+                {LC(mimo2), LC(mimo5)}
 
 /* macro to get 5 GHz channel group index for tx power */
 #define CHANNEL_POWER_IDX_5G(c) (((c) < 52) ? 0 : \
@@ -118,18 +56,37 @@
                                  (((c) < 100) ? 2 : \
                                  (((c) < 149) ? 3 : 4))))
 
-#define ISDFS_EU(fl)            (((fl) & BRCMS_DFS_EU) == BRCMS_DFS_EU)
-
-struct brcms_cm_band {
-        /* struct locale_info flags */
-        u8 locale_flags;
-        /* List of valid channels in the country */
-        struct brcms_chanvec valid_channels;
-        /* List of restricted use channels */
-        const struct brcms_chanvec *restricted_channels;
-        /* List of radar sensitive channels */
-        const struct brcms_chanvec *radar_channels;
-        u8 PAD[8];
+#define BRCM_2GHZ_2412_2462     REG_RULE(2412-10, 2462+10, 40, 0, 19, 0)
+#define BRCM_2GHZ_2467_2472     REG_RULE(2467-10, 2472+10, 20, 0, 19, \
+                                         NL80211_RRF_PASSIVE_SCAN | \
+                                         NL80211_RRF_NO_IBSS)
+
+#define BRCM_5GHZ_5180_5240     REG_RULE(5180-10, 5240+10, 40, 0, 21, \
+                                         NL80211_RRF_PASSIVE_SCAN | \
+                                         NL80211_RRF_NO_IBSS)
+#define BRCM_5GHZ_5260_5320     REG_RULE(5260-10, 5320+10, 40, 0, 21, \
+                                         NL80211_RRF_PASSIVE_SCAN | \
+                                         NL80211_RRF_DFS | \
+                                         NL80211_RRF_NO_IBSS)
+#define BRCM_5GHZ_5500_5700     REG_RULE(5500-10, 5700+10, 40, 0, 21, \
+                                         NL80211_RRF_PASSIVE_SCAN | \
+                                         NL80211_RRF_DFS | \
+                                         NL80211_RRF_NO_IBSS)
+#define BRCM_5GHZ_5745_5825     REG_RULE(5745-10, 5825+10, 40, 0, 21, \
+                                         NL80211_RRF_PASSIVE_SCAN | \
+                                         NL80211_RRF_NO_IBSS)
+
+static const struct ieee80211_regdomain brcms_regdom_x2 = {
+        .n_reg_rules = 7,
+        .alpha2 = "X2",
+        .reg_rules = {
+                BRCM_2GHZ_2412_2462,
+                BRCM_2GHZ_2467_2472,
+                BRCM_5GHZ_5180_5240,
+                BRCM_5GHZ_5260_5320,
+                BRCM_5GHZ_5500_5700,
+                BRCM_5GHZ_5745_5825,
+        }
 };
 
  /* locale per-channel tx power limits for MIMO frames
@@ -141,337 +98,23 @@ struct locale_mimo_info {
         s8 maxpwr20[BRCMS_MAXPWR_MIMO_TBL_SIZE];
         /* tx 40 MHz power limits, qdBm units */
         s8 maxpwr40[BRCMS_MAXPWR_MIMO_TBL_SIZE];
-        u8 flags;
 };
 
 /* Country names and abbreviations with locale defined from ISO 3166 */
 struct country_info {
-        const u8 locale_2G;     /* 2.4G band locale */
-        const u8 locale_5G;     /* 5G band locale */
         const u8 locale_mimo_2G;        /* 2.4G mimo info */
         const u8 locale_mimo_5G;        /* 5G mimo info */
 };
 
+struct brcms_regd {
+        struct country_info country;
+        const struct ieee80211_regdomain *regdomain;
+};
+
 struct brcms_cm_info {
         struct brcms_pub *pub;
         struct brcms_c_info *wlc;
-        char srom_ccode[BRCM_CNTRY_BUF_SZ];     /* Country Code in SROM */
-        uint srom_regrev;       /* Regulatory Rev for the SROM ccode */
-        const struct country_info *country;     /* current country def */
-        char ccode[BRCM_CNTRY_BUF_SZ];  /* current internal Country Code */
-        uint regrev;            /* current Regulatory Revision */
-        char country_abbrev[BRCM_CNTRY_BUF_SZ]; /* current advertised ccode */
-        /* per-band state (one per phy/radio) */
-        struct brcms_cm_band bandstate[MAXBANDS];
-        /* quiet channels currently for radar sensitivity or 11h support */
-        /* channels on which we cannot transmit */
-        struct brcms_chanvec quiet_channels;
-};
-
-/* locale channel and power info. */
-struct locale_info {
-        u32 valid_channels;
-        /* List of radar sensitive channels */
-        u8 radar_channels;
-        /* List of channels used only if APs are detected */
-        u8 restricted_channels;
-        /* Max tx pwr in qdBm for each sub-band */
-        s8 maxpwr[BRCMS_MAXPWR_TBL_SIZE];
-        /* Country IE advertised max tx pwr in dBm per sub-band */
-        s8 pub_maxpwr[BAND_5G_PWR_LVLS];
-        u8 flags;
-};
-
-/* Regulatory Matrix Spreadsheet (CLM) MIMO v3.7.9 */
-
-/*
- * Some common channel sets
- */
-
-/* No channels */
-static const struct brcms_chanvec chanvec_none = {
-        {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00}
-};
-
-/* All 2.4 GHz HW channels */
-static const struct brcms_chanvec chanvec_all_2G = {
-        {0xfe, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00}
-};
-
-/* All 5 GHz HW channels */
-static const struct brcms_chanvec chanvec_all_5G = {
-        {0x00, 0x00, 0x00, 0x00, 0x54, 0x55, 0x11, 0x11,
-         0x01, 0x00, 0x00, 0x00, 0x10, 0x11, 0x11, 0x11,
-         0x11, 0x11, 0x20, 0x22, 0x22, 0x00, 0x00, 0x11,
-         0x11, 0x11, 0x11, 0x01}
-};
-
-/*
- * Radar channel sets
- */
-
-/* Channels 52 - 64, 100 - 140 */
-static const struct brcms_chanvec radar_set1 = {
-        {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x11,  /* 52 - 60 */
-         0x01, 0x00, 0x00, 0x00, 0x10, 0x11, 0x11, 0x11,  /* 64, 100 - 124 */
-         0x11, 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  /* 128 - 140 */
-         0x00, 0x00, 0x00, 0x00}
-};
-
-/*
- * Restricted channel sets
- */
-
-/* Channels 34, 38, 42, 46 */
-static const struct brcms_chanvec restricted_set_japan_legacy = {
-        {0x00, 0x00, 0x00, 0x00, 0x44, 0x44, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00}
-};
-
-/* Channels 12, 13 */
-static const struct brcms_chanvec restricted_set_2g_short = {
-        {0x00, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00}
-};
-
-/* Channel 165 */
-static const struct brcms_chanvec restricted_chan_165 = {
-        {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00}
-};
-
-/* Channels 36 - 48 & 149 - 165 */
-static const struct brcms_chanvec restricted_low_hi = {
-        {0x00, 0x00, 0x00, 0x00, 0x10, 0x11, 0x01, 0x00,
-         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-         0x00, 0x00, 0x20, 0x22, 0x22, 0x00, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00}
-};
-
-/* Channels 12 - 14 */
-static const struct brcms_chanvec restricted_set_12_13_14 = {
-        {0x00, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00}
-};
-
-/* global memory to provide working buffer for expanded locale */
-
-static const struct brcms_chanvec *g_table_radar_set[] = {
-        &chanvec_none,
-        &radar_set1
-};
-
-static const struct brcms_chanvec *g_table_restricted_chan[] = {
-        &chanvec_none,          /* restricted_set_none */
-        &restricted_set_2g_short,
-        &restricted_chan_165,
-        &chanvec_all_5G,
-        &restricted_set_japan_legacy,
-        &chanvec_all_2G,        /* restricted_set_11d_2G */
-        &chanvec_all_5G,        /* restricted_set_11d_5G */
-        &restricted_low_hi,
-        &restricted_set_12_13_14
-};
-
-static const struct brcms_chanvec locale_2g_01_11 = {
-        {0xfe, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00}
-};
-
-static const struct brcms_chanvec locale_2g_12_13 = {
-        {0x00, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00}
-};
-
-static const struct brcms_chanvec locale_2g_14 = {
-        {0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00}
-};
-
-static const struct brcms_chanvec locale_5g_LOW_JP1 = {
-        {0x00, 0x00, 0x00, 0x00, 0x54, 0x55, 0x01, 0x00,
-         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00}
-};
-
-static const struct brcms_chanvec locale_5g_LOW_JP2 = {
-        {0x00, 0x00, 0x00, 0x00, 0x44, 0x44, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00}
-};
-
-static const struct brcms_chanvec locale_5g_LOW1 = {
-        {0x00, 0x00, 0x00, 0x00, 0x10, 0x11, 0x01, 0x00,
-         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00}
-};
-
-static const struct brcms_chanvec locale_5g_LOW2 = {
-        {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00,
-         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00}
-};
-
-static const struct brcms_chanvec locale_5g_LOW3 = {
-        {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11,
-         0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00}
-};
-
-static const struct brcms_chanvec locale_5g_MID1 = {
-        {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00, 0x10, 0x11, 0x11, 0x00,
-         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00}
-};
-
-static const struct brcms_chanvec locale_5g_MID2 = {
-        {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11,
-         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00}
-};
-
-static const struct brcms_chanvec locale_5g_MID3 = {
-        {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-         0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00}
-};
-
-static const struct brcms_chanvec locale_5g_HIGH1 = {
-        {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-         0x10, 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00}
-};
-
-static const struct brcms_chanvec locale_5g_HIGH2 = {
-        {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-         0x00, 0x00, 0x20, 0x22, 0x02, 0x00, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00}
-};
-
-static const struct brcms_chanvec locale_5g_HIGH3 = {
-        {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00}
-};
-
-static const struct brcms_chanvec locale_5g_52_140_ALL = {
-        {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x11,
-         0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11,
-         0x11, 0x11, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00}
-};
-
-static const struct brcms_chanvec locale_5g_HIGH4 = {
-        {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11,
-         0x11, 0x11, 0x11, 0x11}
-};
-
-static const struct brcms_chanvec *g_table_locale_base[] = {
-        &locale_2g_01_11,
-        &locale_2g_12_13,
-        &locale_2g_14,
-        &locale_5g_LOW_JP1,
-        &locale_5g_LOW_JP2,
-        &locale_5g_LOW1,
-        &locale_5g_LOW2,
-        &locale_5g_LOW3,
-        &locale_5g_MID1,
-        &locale_5g_MID2,
-        &locale_5g_MID3,
-        &locale_5g_HIGH1,
-        &locale_5g_HIGH2,
-        &locale_5g_HIGH3,
-        &locale_5g_52_140_ALL,
-        &locale_5g_HIGH4
-};
-
-static void brcms_c_locale_add_channels(struct brcms_chanvec *target,
-                                    const struct brcms_chanvec *channels)
-{
-        u8 i;
-        for (i = 0; i < sizeof(struct brcms_chanvec); i++)
-                target->vec[i] |= channels->vec[i];
-}
-
-static void brcms_c_locale_get_channels(const struct locale_info *locale,
-                                    struct brcms_chanvec *channels)
-{
-        u8 i;
-
-        memset(channels, 0, sizeof(struct brcms_chanvec));
-
-        for (i = 0; i < ARRAY_SIZE(g_table_locale_base); i++) {
-                if (locale->valid_channels & (1 << i))
-                        brcms_c_locale_add_channels(channels,
-                                                g_table_locale_base[i]);
-        }
-}
-
-/*
- * Locale Definitions - 2.4 GHz
- */
-static const struct locale_info locale_i = {    /* locale i. channel 1 - 13 */
-        LOCALE_CHAN_01_11 | LOCALE_CHAN_12_13,
-        LOCALE_RADAR_SET_NONE,
-        LOCALE_RESTRICTED_SET_2G_SHORT,
-        {QDB(19), QDB(19), QDB(19),
-         QDB(19), QDB(19), QDB(19)},
-        {20, 20, 20, 0},
-        BRCMS_EIRP
-};
-
-/*
- * Locale Definitions - 5 GHz
- */
-static const struct locale_info locale_11 = {
-        /* locale 11. channel 36 - 48, 52 - 64, 100 - 140, 149 - 165 */
-        LOCALE_CHAN_36_64 | LOCALE_CHAN_100_140 | LOCALE_CHAN_149_165,
-        LOCALE_RADAR_SET_1,
-        LOCALE_RESTRICTED_NONE,
-        {QDB(21), QDB(21), QDB(21), QDB(21), QDB(21)},
-        {23, 23, 23, 30, 30},
-        BRCMS_EIRP | BRCMS_DFS_EU
-};
-
-static const struct locale_info *g_locale_2g_table[] = {
-        &locale_i
-};
-
-static const struct locale_info *g_locale_5g_table[] = {
-        &locale_11
+        const struct brcms_regd *world_regd;
 };
 
 /*
@@ -484,7 +127,6 @@ static const struct locale_mimo_info locale_bn = {
         {0, 0, QDB(13), QDB(13), QDB(13),
          QDB(13), QDB(13), QDB(13), QDB(13), QDB(13),
          QDB(13), 0, 0},
-        0
 };
 
 static const struct locale_mimo_info *g_mimo_2g_table[] = {
@@ -497,114 +139,20 @@ static const struct locale_mimo_info *g_mimo_2g_table[] = {
 static const struct locale_mimo_info locale_11n = {
         { /* 12.5 dBm */ 50, 50, 50, QDB(15), QDB(15)},
         {QDB(14), QDB(15), QDB(15), QDB(15), QDB(15)},
-        0
 };
 
 static const struct locale_mimo_info *g_mimo_5g_table[] = {
         &locale_11n
 };
 
-static const struct {
-        char abbrev[BRCM_CNTRY_BUF_SZ]; /* country abbreviation */
-        struct country_info country;
-} cntry_locales[] = {
+static const struct brcms_regd cntry_locales[] = {
+        /* Worldwide RoW 2, must always be at index 0 */
         {
-        "X2", LOCALES(i, 11, bn, 11n)}, /* Worldwide RoW 2 */
-};
-
-#ifdef SUPPORT_40MHZ
-/* 20MHz channel info for 40MHz pairing support */
-struct chan20_info {
-        u8 sb;
-        u8 adj_sbs;
+                .country = LOCALES(bn, 11n),
+                .regdomain = &brcms_regdom_x2,
+        },
 };
 
-/* indicates adjacent channels that are allowed for a 40 Mhz channel and
- * those that permitted by the HT
- */
-struct chan20_info chan20_info[] = {
-        /* 11b/11g */
-/* 0 */ {1, (CH_UPPER_SB | CH_EWA_VALID)},
-/* 1 */ {2, (CH_UPPER_SB | CH_EWA_VALID)},
-/* 2 */ {3, (CH_UPPER_SB | CH_EWA_VALID)},
-/* 3 */ {4, (CH_UPPER_SB | CH_EWA_VALID)},
-/* 4 */ {5, (CH_UPPER_SB | CH_LOWER_SB | CH_EWA_VALID)},
-/* 5 */ {6, (CH_UPPER_SB | CH_LOWER_SB | CH_EWA_VALID)},
-/* 6 */ {7, (CH_UPPER_SB | CH_LOWER_SB | CH_EWA_VALID)},
-/* 7 */ {8, (CH_UPPER_SB | CH_LOWER_SB | CH_EWA_VALID)},
-/* 8 */ {9, (CH_UPPER_SB | CH_LOWER_SB | CH_EWA_VALID)},
-/* 9 */ {10, (CH_LOWER_SB | CH_EWA_VALID)},
-/* 10 */ {11, (CH_LOWER_SB | CH_EWA_VALID)},
-/* 11 */ {12, (CH_LOWER_SB)},
-/* 12 */ {13, (CH_LOWER_SB)},
-/* 13 */ {14, (CH_LOWER_SB)},
-
-/* 11a japan high */
-/* 14 */ {34, (CH_UPPER_SB)},
-/* 15 */ {38, (CH_LOWER_SB)},
-/* 16 */ {42, (CH_LOWER_SB)},
-/* 17 */ {46, (CH_LOWER_SB)},
-
-/* 11a usa low */
-/* 18 */ {36, (CH_UPPER_SB | CH_EWA_VALID)},
-/* 19 */ {40, (CH_LOWER_SB | CH_EWA_VALID)},
-/* 20 */ {44, (CH_UPPER_SB | CH_EWA_VALID)},
-/* 21 */ {48, (CH_LOWER_SB | CH_EWA_VALID)},
-/* 22 */ {52, (CH_UPPER_SB | CH_EWA_VALID)},
-/* 23 */ {56, (CH_LOWER_SB | CH_EWA_VALID)},
-/* 24 */ {60, (CH_UPPER_SB | CH_EWA_VALID)},
-/* 25 */ {64, (CH_LOWER_SB | CH_EWA_VALID)},
-
-/* 11a Europe */
-/* 26 */ {100, (CH_UPPER_SB | CH_EWA_VALID)},
-/* 27 */ {104, (CH_LOWER_SB | CH_EWA_VALID)},
-/* 28 */ {108, (CH_UPPER_SB | CH_EWA_VALID)},
-/* 29 */ {112, (CH_LOWER_SB | CH_EWA_VALID)},
-/* 30 */ {116, (CH_UPPER_SB | CH_EWA_VALID)},
-/* 31 */ {120, (CH_LOWER_SB | CH_EWA_VALID)},
-/* 32 */ {124, (CH_UPPER_SB | CH_EWA_VALID)},
-/* 33 */ {128, (CH_LOWER_SB | CH_EWA_VALID)},
-/* 34 */ {132, (CH_UPPER_SB | CH_EWA_VALID)},
-/* 35 */ {136, (CH_LOWER_SB | CH_EWA_VALID)},
-/* 36 */ {140, (CH_LOWER_SB)},
-
-/* 11a usa high, ref5 only */
-/* The 0x80 bit in pdiv means these are REF5, other entries are REF20 */
-/* 37 */ {149, (CH_UPPER_SB | CH_EWA_VALID)},
-/* 38 */ {153, (CH_LOWER_SB | CH_EWA_VALID)},
-/* 39 */ {157, (CH_UPPER_SB | CH_EWA_VALID)},
-/* 40 */ {161, (CH_LOWER_SB | CH_EWA_VALID)},
-/* 41 */ {165, (CH_LOWER_SB)},
-
-/* 11a japan */
-/* 42 */ {184, (CH_UPPER_SB)},
-/* 43 */ {188, (CH_LOWER_SB)},
-/* 44 */ {192, (CH_UPPER_SB)},
-/* 45 */ {196, (CH_LOWER_SB)},
-/* 46 */ {200, (CH_UPPER_SB)},
-/* 47 */ {204, (CH_LOWER_SB)},
-/* 48 */ {208, (CH_UPPER_SB)},
-/* 49 */ {212, (CH_LOWER_SB)},
-/* 50 */ {216, (CH_LOWER_SB)}
-};
-#endif                          /* SUPPORT_40MHZ */
-
-static const struct locale_info *brcms_c_get_locale_2g(u8 locale_idx)
-{
-        if (locale_idx >= ARRAY_SIZE(g_locale_2g_table))
-                return NULL; /* error condition */
-
-        return g_locale_2g_table[locale_idx];
-}
-
-static const struct locale_info *brcms_c_get_locale_5g(u8 locale_idx)
-{
-        if (locale_idx >= ARRAY_SIZE(g_locale_5g_table))
-                return NULL; /* error condition */
-
-        return g_locale_5g_table[locale_idx];
-}
-
 static const struct locale_mimo_info *brcms_c_get_mimo_2g(u8 locale_idx)
 {
         if (locale_idx >= ARRAY_SIZE(g_mimo_2g_table))
@@ -621,13 +169,6 @@ static const struct locale_mimo_info *brcms_c_get_mimo_5g(u8 locale_idx)
         return g_mimo_5g_table[locale_idx];
 }
 
-static int
-brcms_c_country_aggregate_map(struct brcms_cm_info *wlc_cm, const char *ccode,
-                          char *mapped_ccode, uint *mapped_regrev)
-{
-        return false;
-}
-
 /*
  * Indicates whether the country provided is valid to pass
  * to cfg80211 or not.
@@ -662,155 +203,24 @@ static bool brcms_c_country_valid(const char *ccode)
         return true;
 }
 
-/* Lookup a country info structure from a null terminated country
- * abbreviation and regrev directly with no translation.
- */
-static const struct country_info *
-brcms_c_country_lookup_direct(const char *ccode, uint regrev)
+static const struct brcms_regd *brcms_world_regd(const char *regdom, int len)
 {
-        uint size, i;
-
-        /* Should just return 0 for single locale driver. */
-        /* Keep it this way in case we add more locales. (for now anyway) */
-
-        /*
-         * all other country def arrays are for regrev == 0, so if
-         * regrev is non-zero, fail
-         */
-        if (regrev > 0)
-                return NULL;
-
-        /* find matched table entry from country code */
-        size = ARRAY_SIZE(cntry_locales);
-        for (i = 0; i < size; i++) {
-                if (strcmp(ccode, cntry_locales[i].abbrev) == 0)
-                        return &cntry_locales[i].country;
-        }
-        return NULL;
-}
-
-static const struct country_info *
-brcms_c_countrycode_map(struct brcms_cm_info *wlc_cm, const char *ccode,
-                        char *mapped_ccode, uint *mapped_regrev)
-{
-        struct brcms_c_info *wlc = wlc_cm->wlc;
-        const struct country_info *country;
-        uint srom_regrev = wlc_cm->srom_regrev;
-        const char *srom_ccode = wlc_cm->srom_ccode;
-        int mapped;
-
-        /* check for currently supported ccode size */
-        if (strlen(ccode) > (BRCM_CNTRY_BUF_SZ - 1)) {
-                wiphy_err(wlc->wiphy, "wl%d: %s: ccode \"%s\" too long for "
-                          "match\n", wlc->pub->unit, __func__, ccode);
-                return NULL;
-        }
-
-        /* default mapping is the given ccode and regrev 0 */
-        strncpy(mapped_ccode, ccode, BRCM_CNTRY_BUF_SZ);
-        *mapped_regrev = 0;
-
-        /* If the desired country code matches the srom country code,
-         * then the mapped country is the srom regulatory rev.
-         * Otherwise look for an aggregate mapping.
-         */
-        if (!strcmp(srom_ccode, ccode)) {
-                *mapped_regrev = srom_regrev;
-                mapped = 0;
-                wiphy_err(wlc->wiphy, "srom_code == ccode %s\n", __func__);
-        } else {
-                mapped =
-                    brcms_c_country_aggregate_map(wlc_cm, ccode, mapped_ccode,
-                                              mapped_regrev);
-        }
-
-        /* find the matching built-in country definition */
-        country = brcms_c_country_lookup_direct(mapped_ccode, *mapped_regrev);
-
-        /* if there is not an exact rev match, default to rev zero */
-        if (country == NULL && *mapped_regrev != 0) {
-                *mapped_regrev = 0;
-                country =
-                    brcms_c_country_lookup_direct(mapped_ccode, *mapped_regrev);
-        }
-
-        return country;
-}
-
-/* Lookup a country info structure from a null terminated country code
- * The lookup is case sensitive.
- */
-static const struct country_info *
-brcms_c_country_lookup(struct brcms_c_info *wlc, const char *ccode)
-{
-        const struct country_info *country;
-        char mapped_ccode[BRCM_CNTRY_BUF_SZ];
-        uint mapped_regrev;
-
-        /*
-         * map the country code to a built-in country code, regrev, and
-         * country_info struct
-         */
-        country = brcms_c_countrycode_map(wlc->cmi, ccode, mapped_ccode,
-                                          &mapped_regrev);
-
-        return country;
-}
-
-/*
- * reset the quiet channels vector to the union
- * of the restricted and radar channel sets
- */
-static void brcms_c_quiet_channels_reset(struct brcms_cm_info *wlc_cm)
-{
-        struct brcms_c_info *wlc = wlc_cm->wlc;
-        uint i, j;
-        struct brcms_band *band;
-        const struct brcms_chanvec *chanvec;
-
-        memset(&wlc_cm->quiet_channels, 0, sizeof(struct brcms_chanvec));
-
-        band = wlc->band;
-        for (i = 0; i < wlc->pub->_nbands;
-             i++, band = wlc->bandstate[OTHERBANDUNIT(wlc)]) {
-
-                /* initialize quiet channels for restricted channels */
-                chanvec = wlc_cm->bandstate[band->bandunit].restricted_channels;
-                for (j = 0; j < sizeof(struct brcms_chanvec); j++)
-                        wlc_cm->quiet_channels.vec[j] |= chanvec->vec[j];
+        const struct brcms_regd *regd = NULL;
+        int i;
 
+        for (i = 0; i < ARRAY_SIZE(cntry_locales); i++) {
+                if (!strncmp(regdom, cntry_locales[i].regdomain->alpha2, len)) {
+                        regd = &cntry_locales[i];
+                        break;
+                }
         }
-}
-
-/* Is the channel valid for the current locale and current band? */
-static bool brcms_c_valid_channel20(struct brcms_cm_info *wlc_cm, uint val)
-{
-        struct brcms_c_info *wlc = wlc_cm->wlc;
 
-        return ((val < MAXCHANNEL) &&
-                isset(wlc_cm->bandstate[wlc->band->bandunit].valid_channels.vec,
-                      val));
+        return regd;
 }
 
-/* Is the channel valid for the current locale and specified band? */
-static bool brcms_c_valid_channel20_in_band(struct brcms_cm_info *wlc_cm,
-                                            uint bandunit, uint val)
-{
-        return ((val < MAXCHANNEL)
-                && isset(wlc_cm->bandstate[bandunit].valid_channels.vec, val));
-}
-
-/* Is the channel valid for the current locale? (but don't consider channels not
- *   available due to bandlocking)
- */
-static bool brcms_c_valid_channel20_db(struct brcms_cm_info *wlc_cm, uint val)
+static const struct brcms_regd *brcms_default_world_regd(void)
 {
-        struct brcms_c_info *wlc = wlc_cm->wlc;
-
-        return brcms_c_valid_channel20(wlc->cmi, val) ||
-                (!wlc->bandlocked
-                 && brcms_c_valid_channel20_in_band(wlc->cmi,
-                                                    OTHERBANDUNIT(wlc), val));
+        return &cntry_locales[0];
 }
 
 /* JP, J1 - J10 are Japan ccodes */
@@ -820,12 +230,6 @@ static bool brcms_c_japan_ccode(const char *ccode)
                 (ccode[1] == 'P' || (ccode[1] >= '1' && ccode[1] <= '9')));
 }
 
-/* Returns true if currently set country is Japan or variant */
-static bool brcms_c_japan(struct brcms_c_info *wlc)
-{
-        return brcms_c_japan_ccode(wlc->cmi->country_abbrev);
-}
-
 static void
 brcms_c_channel_min_txpower_limits_with_local_constraint(
                 struct brcms_cm_info *wlc_cm, struct txpwr_limits *txpwr,
@@ -901,140 +305,16 @@ brcms_c_channel_min_txpower_limits_with_local_constraint(
 
 }
 
-/* Update the radio state (enable/disable) and tx power targets
- * based on a new set of channel/regulatory information
- */
-static void brcms_c_channels_commit(struct brcms_cm_info *wlc_cm)
-{
-        struct brcms_c_info *wlc = wlc_cm->wlc;
-        uint chan;
-        struct txpwr_limits txpwr;
-
-        /* search for the existence of any valid channel */
-        for (chan = 0; chan < MAXCHANNEL; chan++) {
-                if (brcms_c_valid_channel20_db(wlc->cmi, chan))
-                        break;
-        }
-        if (chan == MAXCHANNEL)
-                chan = INVCHANNEL;
-
-        /*
-         * based on the channel search above, set or
-         * clear WL_RADIO_COUNTRY_DISABLE.
-         */
-        if (chan == INVCHANNEL) {
-                /*
-                 * country/locale with no valid channels, set
-                 * the radio disable bit
-                 */
-                mboolset(wlc->pub->radio_disabled, WL_RADIO_COUNTRY_DISABLE);
-                wiphy_err(wlc->wiphy, "wl%d: %s: no valid channel for \"%s\" "
-                          "nbands %d bandlocked %d\n", wlc->pub->unit,
-                          __func__, wlc_cm->country_abbrev, wlc->pub->_nbands,
-                          wlc->bandlocked);
-        } else if (mboolisset(wlc->pub->radio_disabled,
-                              WL_RADIO_COUNTRY_DISABLE)) {
-                /*
-                 * country/locale with valid channel, clear
-                 * the radio disable bit
-                 */
-                mboolclr(wlc->pub->radio_disabled, WL_RADIO_COUNTRY_DISABLE);
-        }
-
-        /*
-         * Now that the country abbreviation is set, if the radio supports 2G,
-         * then set channel 14 restrictions based on the new locale.
-         */
-        if (wlc->pub->_nbands > 1 || wlc->band->bandtype == BRCM_BAND_2G)
-                wlc_phy_chanspec_ch14_widefilter_set(wlc->band->pi,
-                                                     brcms_c_japan(wlc) ? true :
-                                                     false);
-
-        if (wlc->pub->up && chan != INVCHANNEL) {
-                brcms_c_channel_reg_limits(wlc_cm, wlc->chanspec, &txpwr);
-                brcms_c_channel_min_txpower_limits_with_local_constraint(wlc_cm,
-                        &txpwr, BRCMS_TXPWR_MAX);
-                wlc_phy_txpower_limit_set(wlc->band->pi, &txpwr, wlc->chanspec);
-        }
-}
-
-static int
-brcms_c_channels_init(struct brcms_cm_info *wlc_cm,
-                      const struct country_info *country)
-{
-        struct brcms_c_info *wlc = wlc_cm->wlc;
-        uint i, j;
-        struct brcms_band *band;
-        const struct locale_info *li;
-        struct brcms_chanvec sup_chan;
-        const struct locale_mimo_info *li_mimo;
-
-        band = wlc->band;
-        for (i = 0; i < wlc->pub->_nbands;
-             i++, band = wlc->bandstate[OTHERBANDUNIT(wlc)]) {
-
-                li = (band->bandtype == BRCM_BAND_5G) ?
-                    brcms_c_get_locale_5g(country->locale_5G) :
-                    brcms_c_get_locale_2g(country->locale_2G);
-                wlc_cm->bandstate[band->bandunit].locale_flags = li->flags;
-                li_mimo = (band->bandtype == BRCM_BAND_5G) ?
-                    brcms_c_get_mimo_5g(country->locale_mimo_5G) :
-                    brcms_c_get_mimo_2g(country->locale_mimo_2G);
-
-                /* merge the mimo non-mimo locale flags */
-                wlc_cm->bandstate[band->bandunit].locale_flags |=
-                    li_mimo->flags;
-
-                wlc_cm->bandstate[band->bandunit].restricted_channels =
-                    g_table_restricted_chan[li->restricted_channels];
-                wlc_cm->bandstate[band->bandunit].radar_channels =
-                    g_table_radar_set[li->radar_channels];
-
-                /*
-                 * set the channel availability, masking out the channels
-                 * that may not be supported on this phy.
-                 */
-                wlc_phy_chanspec_band_validch(band->pi, band->bandtype,
-                                              &sup_chan);
-                brcms_c_locale_get_channels(li,
-                                        &wlc_cm->bandstate[band->bandunit].
-                                        valid_channels);
-                for (j = 0; j < sizeof(struct brcms_chanvec); j++)
-                        wlc_cm->bandstate[band->bandunit].valid_channels.
-                            vec[j] &= sup_chan.vec[j];
-        }
-
-        brcms_c_quiet_channels_reset(wlc_cm);
-        brcms_c_channels_commit(wlc_cm);
-
-        return 0;
-}
-
 /*
  * set the driver's current country and regulatory information
  * using a country code as the source. Look up built in country
  * information found with the country code.
  */
 static void
-brcms_c_set_country_common(struct brcms_cm_info *wlc_cm,
-                       const char *country_abbrev,
-                       const char *ccode, uint regrev,
-                       const struct country_info *country)
+brcms_c_set_country(struct brcms_cm_info *wlc_cm,
+                    const struct brcms_regd *regd)
 {
-        const struct locale_info *locale;
         struct brcms_c_info *wlc = wlc_cm->wlc;
-        char prev_country_abbrev[BRCM_CNTRY_BUF_SZ];
-
-        /* save current country state */
-        wlc_cm->country = country;
-
-        memset(&prev_country_abbrev, 0, BRCM_CNTRY_BUF_SZ);
-        strncpy(prev_country_abbrev, wlc_cm->country_abbrev,
-                BRCM_CNTRY_BUF_SZ - 1);
-
-        strncpy(wlc_cm->country_abbrev, country_abbrev, BRCM_CNTRY_BUF_SZ - 1);
-        strncpy(wlc_cm->ccode, ccode, BRCM_CNTRY_BUF_SZ - 1);
-        wlc_cm->regrev = regrev;
 
         if ((wlc->pub->_n_enab & SUPPORT_11N) !=
             wlc->protection->nmode_user)
@@ -1042,75 +322,19 @@ brcms_c_set_country_common(struct brcms_cm_info *wlc_cm,
 
         brcms_c_stf_ss_update(wlc, wlc->bandstate[BAND_2G_INDEX]);
         brcms_c_stf_ss_update(wlc, wlc->bandstate[BAND_5G_INDEX]);
-        /* set or restore gmode as required by regulatory */
-        locale = brcms_c_get_locale_2g(country->locale_2G);
-        if (locale && (locale->flags & BRCMS_NO_OFDM))
-                brcms_c_set_gmode(wlc, GMODE_LEGACY_B, false);
-        else
-                brcms_c_set_gmode(wlc, wlc->protection->gmode_user, false);
 
-        brcms_c_channels_init(wlc_cm, country);
+        brcms_c_set_gmode(wlc, wlc->protection->gmode_user, false);
 
         return;
 }
 
-static int
-brcms_c_set_countrycode_rev(struct brcms_cm_info *wlc_cm,
-                        const char *country_abbrev,
-                        const char *ccode, int regrev)
-{
-        const struct country_info *country;
-        char mapped_ccode[BRCM_CNTRY_BUF_SZ];
-        uint mapped_regrev;
-
-        /* if regrev is -1, lookup the mapped country code,
-         * otherwise use the ccode and regrev directly
-         */
-        if (regrev == -1) {
-                /*
-                 * map the country code to a built-in country
-                 * code, regrev, and country_info
-                 */
-                country =
-                    brcms_c_countrycode_map(wlc_cm, ccode, mapped_ccode,
-                                        &mapped_regrev);
-        } else {
-                /* find the matching built-in country definition */
-                country = brcms_c_country_lookup_direct(ccode, regrev);
-                strncpy(mapped_ccode, ccode, BRCM_CNTRY_BUF_SZ);
-                mapped_regrev = regrev;
-        }
-
-        if (country == NULL)
-                return -EINVAL;
-
-        /* set the driver state for the country */
-        brcms_c_set_country_common(wlc_cm, country_abbrev, mapped_ccode,
-                               mapped_regrev, country);
-
-        return 0;
-}
-
-/*
- * set the driver's current country and regulatory information using
- * a country code as the source. Lookup built in country information
- * found with the country code.
- */
-static int
-brcms_c_set_countrycode(struct brcms_cm_info *wlc_cm, const char *ccode)
-{
-        char country_abbrev[BRCM_CNTRY_BUF_SZ];
-        strncpy(country_abbrev, ccode, BRCM_CNTRY_BUF_SZ);
-        return brcms_c_set_countrycode_rev(wlc_cm, country_abbrev, ccode, -1);
-}
-
 struct brcms_cm_info *brcms_c_channel_mgr_attach(struct brcms_c_info *wlc)
 {
         struct brcms_cm_info *wlc_cm;
-        char country_abbrev[BRCM_CNTRY_BUF_SZ];
-        const struct country_info *country;
         struct brcms_pub *pub = wlc->pub;
         struct ssb_sprom *sprom = &wlc->hw->d11core->bus->sprom;
+        const char *ccode = sprom->alpha2;
+        int ccode_len = sizeof(sprom->alpha2);
 
         BCMMSG(wlc->wiphy, "wl%d\n", wlc->pub->unit);
 
@@ -1122,24 +346,27 @@ struct brcms_cm_info *brcms_c_channel_mgr_attach(struct brcms_c_info *wlc)
         wlc->cmi = wlc_cm;
 
         /* store the country code for passing up as a regulatory hint */
-        if (sprom->alpha2 && brcms_c_country_valid(sprom->alpha2))
-                strncpy(wlc->pub->srom_ccode, sprom->alpha2, sizeof(sprom->alpha2));
+        wlc_cm->world_regd = brcms_world_regd(ccode, ccode_len);
+        if (brcms_c_country_valid(ccode))
+                strncpy(wlc->pub->srom_ccode, ccode, ccode_len);
 
         /*
-         * internal country information which must match
-         * regulatory constraints in firmware
+         * If no custom world domain is found in the SROM, use the
+         * default "X2" domain.
          */
-        memset(country_abbrev, 0, BRCM_CNTRY_BUF_SZ);
-        strncpy(country_abbrev, "X2", sizeof(country_abbrev) - 1);
-        country = brcms_c_country_lookup(wlc, country_abbrev);
+        if (!wlc_cm->world_regd) {
+                wlc_cm->world_regd = brcms_default_world_regd();
+                ccode = wlc_cm->world_regd->regdomain->alpha2;
+                ccode_len = BRCM_CNTRY_BUF_SZ - 1;
+        }
 
         /* save default country for exiting 11d regulatory mode */
-        strncpy(wlc->country_default, country_abbrev, BRCM_CNTRY_BUF_SZ - 1);
+        strncpy(wlc->country_default, ccode, ccode_len);
 
         /* initialize autocountry_default to driver default */
-        strncpy(wlc->autocountry_default, "X2", BRCM_CNTRY_BUF_SZ - 1);
+        strncpy(wlc->autocountry_default, ccode, ccode_len);
 
-        brcms_c_set_countrycode(wlc_cm, country_abbrev);
+        brcms_c_set_country(wlc_cm, wlc_cm->world_regd);
 
         return wlc_cm;
 }
@@ -1149,31 +376,15 @@ void brcms_c_channel_mgr_detach(struct brcms_cm_info *wlc_cm)
         kfree(wlc_cm);
 }
 
-u8
-brcms_c_channel_locale_flags_in_band(struct brcms_cm_info *wlc_cm,
-                                     uint bandunit)
-{
-        return wlc_cm->bandstate[bandunit].locale_flags;
-}
-
-static bool
-brcms_c_quiet_chanspec(struct brcms_cm_info *wlc_cm, u16 chspec)
-{
-        return (wlc_cm->wlc->pub->_n_enab & SUPPORT_11N) &&
-                CHSPEC_IS40(chspec) ?
-                (isset(wlc_cm->quiet_channels.vec,
-                       lower_20_sb(CHSPEC_CHANNEL(chspec))) ||
-                 isset(wlc_cm->quiet_channels.vec,
-                       upper_20_sb(CHSPEC_CHANNEL(chspec)))) :
-                isset(wlc_cm->quiet_channels.vec, CHSPEC_CHANNEL(chspec));
-}
-
 void
 brcms_c_channel_set_chanspec(struct brcms_cm_info *wlc_cm, u16 chanspec,
                          u8 local_constraint_qdbm)
 {
         struct brcms_c_info *wlc = wlc_cm->wlc;
+        struct ieee80211_channel *ch = wlc->pub->ieee_hw->conf.channel;
+        const struct ieee80211_reg_rule *reg_rule;
         struct txpwr_limits txpwr;
+        int ret;
 
         brcms_c_channel_reg_limits(wlc_cm, chanspec, &txpwr);
 
@@ -1181,8 +392,15 @@ brcms_c_channel_set_chanspec(struct brcms_cm_info *wlc_cm, u16 chanspec,
                 wlc_cm, &txpwr, local_constraint_qdbm
         );
 
+        /* set or restore gmode as required by regulatory */
+        ret = freq_reg_info(wlc->wiphy, ch->center_freq, 0, &reg_rule);
+        if (!ret && (reg_rule->flags & NL80211_RRF_NO_OFDM))
+                brcms_c_set_gmode(wlc, GMODE_LEGACY_B, false);
+        else
+                brcms_c_set_gmode(wlc, wlc->protection->gmode_user, false);
+
         brcms_b_set_chanspec(wlc->hw, chanspec,
-                              (brcms_c_quiet_chanspec(wlc_cm, chanspec) != 0),
+                              !!(ch->flags & IEEE80211_CHAN_PASSIVE_SCAN),
                               &txpwr);
 }
 
@@ -1191,15 +409,14 @@ brcms_c_channel_reg_limits(struct brcms_cm_info *wlc_cm, u16 chanspec,
                        struct txpwr_limits *txpwr)
 {
         struct brcms_c_info *wlc = wlc_cm->wlc;
+        struct ieee80211_channel *ch = wlc->pub->ieee_hw->conf.channel;
         uint i;
         uint chan;
         int maxpwr;
         int delta;
         const struct country_info *country;
         struct brcms_band *band;
-        const struct locale_info *li;
         int conducted_max = BRCMS_TXPWR_MAX;
-        int conducted_ofdm_max = BRCMS_TXPWR_MAX;
         const struct locale_mimo_info *li_mimo;
         int maxpwr20, maxpwr40;
         int maxpwr_idx;
@@ -1207,67 +424,35 @@ brcms_c_channel_reg_limits(struct brcms_cm_info *wlc_cm, u16 chanspec,
 
         memset(txpwr, 0, sizeof(struct txpwr_limits));
 
-        if (!brcms_c_valid_chanspec_db(wlc_cm, chanspec)) {
-                country = brcms_c_country_lookup(wlc, wlc->autocountry_default);
-                if (country == NULL)
-                        return;
-        } else {
-                country = wlc_cm->country;
-        }
+        if (WARN_ON(!ch))
+                return;
+
+        country = &wlc_cm->world_regd->country;
 
         chan = CHSPEC_CHANNEL(chanspec);
         band = wlc->bandstate[chspec_bandunit(chanspec)];
-        li = (band->bandtype == BRCM_BAND_5G) ?
-            brcms_c_get_locale_5g(country->locale_5G) :
-            brcms_c_get_locale_2g(country->locale_2G);
-
         li_mimo = (band->bandtype == BRCM_BAND_5G) ?
             brcms_c_get_mimo_5g(country->locale_mimo_5G) :
             brcms_c_get_mimo_2g(country->locale_mimo_2G);
 
-        if (li->flags & BRCMS_EIRP) {
-                delta = band->antgain;
-        } else {
-                delta = 0;
-                if (band->antgain > QDB(6))
-                        delta = band->antgain - QDB(6); /* Excess over 6 dB */
-        }
+        delta = band->antgain;
 
-        if (li == &locale_i) {
+        if (band->bandtype == BRCM_BAND_2G)
                 conducted_max = QDB(22);
-                conducted_ofdm_max = QDB(22);
-        }
+
+        maxpwr = QDB(ch->max_power) - delta;
+        maxpwr = max(maxpwr, 0);
+        maxpwr = min(maxpwr, conducted_max);
 
         /* CCK txpwr limits for 2.4G band */
         if (band->bandtype == BRCM_BAND_2G) {
-                maxpwr = li->maxpwr[CHANNEL_POWER_IDX_2G_CCK(chan)];
-
-                maxpwr = maxpwr - delta;
-                maxpwr = max(maxpwr, 0);
-                maxpwr = min(maxpwr, conducted_max);
-
                 for (i = 0; i < BRCMS_NUM_RATES_CCK; i++)
                         txpwr->cck[i] = (u8) maxpwr;
         }
 
-        /* OFDM txpwr limits for 2.4G or 5G bands */
-        if (band->bandtype == BRCM_BAND_2G)
-                maxpwr = li->maxpwr[CHANNEL_POWER_IDX_2G_OFDM(chan)];
-        else
-                maxpwr = li->maxpwr[CHANNEL_POWER_IDX_5G(chan)];
-
-        maxpwr = maxpwr - delta;
-        maxpwr = max(maxpwr, 0);
-        maxpwr = min(maxpwr, conducted_ofdm_max);
-
-        /* Keep OFDM lmit below CCK limit */
-        if (band->bandtype == BRCM_BAND_2G)
-                maxpwr = min_t(int, maxpwr, txpwr->cck[0]);
-
-        for (i = 0; i < BRCMS_NUM_RATES_OFDM; i++)
+        for (i = 0; i < BRCMS_NUM_RATES_OFDM; i++) {
                 txpwr->ofdm[i] = (u8) maxpwr;
 
-        for (i = 0; i < BRCMS_NUM_RATES_OFDM; i++) {
                 /*
                  * OFDM 40 MHz SISO has the same power as the corresponding
                  * MCS0-7 rate unless overriden by the locale specific code.
@@ -1282,14 +467,9 @@ brcms_c_channel_reg_limits(struct brcms_cm_info *wlc_cm, u16 chanspec,
                 txpwr->ofdm_40_cdd[i] = 0;
         }
 
-        /* MIMO/HT specific limits */
-        if (li_mimo->flags & BRCMS_EIRP) {
-                delta = band->antgain;
-        } else {
-                delta = 0;
-                if (band->antgain > QDB(6))
-                        delta = band->antgain - QDB(6); /* Excess over 6 dB */
-        }
+        delta = 0;
+        if (band->antgain > QDB(6))
+                delta = band->antgain - QDB(6); /* Excess over 6 dB */
 
         if (band->bandtype == BRCM_BAND_2G)
                 maxpwr_idx = (chan - 1);
@@ -1431,8 +611,7 @@ static bool brcms_c_chspec_malformed(u16 chanspec)
  * and they are also a legal HT combination
  */
 static bool
-brcms_c_valid_chanspec_ext(struct brcms_cm_info *wlc_cm, u16 chspec,
-                           bool dualband)
+brcms_c_valid_chanspec_ext(struct brcms_cm_info *wlc_cm, u16 chspec)
 {
         struct brcms_c_info *wlc = wlc_cm->wlc;
         u8 channel = CHSPEC_CHANNEL(chspec);
@@ -1448,59 +627,166 @@ brcms_c_valid_chanspec_ext(struct brcms_cm_info *wlc_cm, u16 chspec,
             chspec_bandunit(chspec))
                 return false;
 
-        /* Check a 20Mhz channel */
-        if (CHSPEC_IS20(chspec)) {
-                if (dualband)
-                        return brcms_c_valid_channel20_db(wlc_cm->wlc->cmi,
-                                                          channel);
-                else
-                        return brcms_c_valid_channel20(wlc_cm->wlc->cmi,
-                                                       channel);
+        return true;
+}
+
+bool brcms_c_valid_chanspec_db(struct brcms_cm_info *wlc_cm, u16 chspec)
+{
+        return brcms_c_valid_chanspec_ext(wlc_cm, chspec);
+}
+
+static bool brcms_is_radar_freq(u16 center_freq)
+{
+        return center_freq >= 5260 && center_freq <= 5700;
+}
+
+static void brcms_reg_apply_radar_flags(struct wiphy *wiphy)
+{
+        struct ieee80211_supported_band *sband;
+        struct ieee80211_channel *ch;
+        int i;
+
+        sband = wiphy->bands[IEEE80211_BAND_5GHZ];
+        if (!sband)
+                return;
+
+        for (i = 0; i < sband->n_channels; i++) {
+                ch = &sband->channels[i];
+
+                if (!brcms_is_radar_freq(ch->center_freq))
+                        continue;
+
+                /*
+                 * All channels in this range should be passive and have
+                 * DFS enabled.
+                 */
+                if (!(ch->flags & IEEE80211_CHAN_DISABLED))
+                        ch->flags |= IEEE80211_CHAN_RADAR |
+                                     IEEE80211_CHAN_NO_IBSS |
+                                     IEEE80211_CHAN_PASSIVE_SCAN;
         }
-#ifdef SUPPORT_40MHZ
-        /*
-         * We know we are now checking a 40MHZ channel, so we should
-         * only be here for NPHYS
-         */
-        if (BRCMS_ISNPHY(wlc->band) || BRCMS_ISSSLPNPHY(wlc->band)) {
-                u8 upper_sideband = 0, idx;
-                u8 num_ch20_entries =
-                    sizeof(chan20_info) / sizeof(struct chan20_info);
-
-                if (!VALID_40CHANSPEC_IN_BAND(wlc, chspec_bandunit(chspec)))
-                        return false;
-
-                if (dualband) {
-                        if (!brcms_c_valid_channel20_db(wlc->cmi,
-                                                        lower_20_sb(channel)) ||
-                            !brcms_c_valid_channel20_db(wlc->cmi,
-                                                        upper_20_sb(channel)))
-                                return false;
-                } else {
-                        if (!brcms_c_valid_channel20(wlc->cmi,
-                                                     lower_20_sb(channel)) ||
-                            !brcms_c_valid_channel20(wlc->cmi,
-                                                     upper_20_sb(channel)))
-                                return false;
+}
+
+static void
+brcms_reg_apply_beaconing_flags(struct wiphy *wiphy,
+                                enum nl80211_reg_initiator initiator)
+{
+        struct ieee80211_supported_band *sband;
+        struct ieee80211_channel *ch;
+        const struct ieee80211_reg_rule *rule;
+        int band, i, ret;
+
+        for (band = 0; band < IEEE80211_NUM_BANDS; band++) {
+                sband = wiphy->bands[band];
+                if (!sband)
+                        continue;
+
+                for (i = 0; i < sband->n_channels; i++) {
+                        ch = &sband->channels[i];
+
+                        if (ch->flags &
+                            (IEEE80211_CHAN_DISABLED | IEEE80211_CHAN_RADAR))
+                                continue;
+
+                        if (initiator == NL80211_REGDOM_SET_BY_COUNTRY_IE) {
+                                ret = freq_reg_info(wiphy, ch->center_freq,
+                                                    0, &rule);
+                                if (ret)
+                                        continue;
+
+                                if (!(rule->flags & NL80211_RRF_NO_IBSS))
+                                        ch->flags &= ~IEEE80211_CHAN_NO_IBSS;
+                                if (!(rule->flags & NL80211_RRF_PASSIVE_SCAN))
+                                        ch->flags &=
+                                                ~IEEE80211_CHAN_PASSIVE_SCAN;
+                        } else if (ch->beacon_found) {
+                                ch->flags &= ~(IEEE80211_CHAN_NO_IBSS |
+                                               IEEE80211_CHAN_PASSIVE_SCAN);
+                        }
                 }
+        }
+}
 
-                /* find the lower sideband info in the sideband array */
-                for (idx = 0; idx < num_ch20_entries; idx++) {
-                        if (chan20_info[idx].sb == lower_20_sb(channel))
-                                upper_sideband = chan20_info[idx].adj_sbs;
+static int brcms_reg_notifier(struct wiphy *wiphy,
+                              struct regulatory_request *request)
+{
+        struct ieee80211_hw *hw = wiphy_to_ieee80211_hw(wiphy);
+        struct brcms_info *wl = hw->priv;
+        struct brcms_c_info *wlc = wl->wlc;
+        struct ieee80211_supported_band *sband;
+        struct ieee80211_channel *ch;
+        int band, i;
+        bool ch_found = false;
+
+        brcms_reg_apply_radar_flags(wiphy);
+
+        if (request->initiator == NL80211_REGDOM_SET_BY_COUNTRY_IE)
+                brcms_reg_apply_beaconing_flags(wiphy, request->initiator);
+
+        /* Disable radio if all channels disallowed by regulatory */
+        for (band = 0; !ch_found && band < IEEE80211_NUM_BANDS; band++) {
+                sband = wiphy->bands[band];
+                if (!sband)
+                        continue;
+
+                for (i = 0; !ch_found && i < sband->n_channels; i++) {
+                        ch = &sband->channels[i];
+
+                        if (!(ch->flags & IEEE80211_CHAN_DISABLED))
+                                ch_found = true;
                 }
-                /* check that the lower sideband allows an upper sideband */
-                if ((upper_sideband & (CH_UPPER_SB | CH_EWA_VALID)) ==
-                    (CH_UPPER_SB | CH_EWA_VALID))
-                        return true;
-                return false;
         }
-#endif                          /* 40 MHZ */
 
-        return false;
+        if (ch_found) {
+                mboolclr(wlc->pub->radio_disabled, WL_RADIO_COUNTRY_DISABLE);
+        } else {
+                mboolset(wlc->pub->radio_disabled, WL_RADIO_COUNTRY_DISABLE);
+                wiphy_err(wlc->wiphy, "wl%d: %s: no valid channel for \"%s\"\n",
+                          wlc->pub->unit, __func__, request->alpha2);
+        }
+
+        if (wlc->pub->_nbands > 1 || wlc->band->bandtype == BRCM_BAND_2G)
+                wlc_phy_chanspec_ch14_widefilter_set(wlc->band->pi,
+                                        brcms_c_japan_ccode(request->alpha2));
+
+        return 0;
 }
 
-bool brcms_c_valid_chanspec_db(struct brcms_cm_info *wlc_cm, u16 chspec)
+void brcms_c_regd_init(struct brcms_c_info *wlc)
 {
-        return brcms_c_valid_chanspec_ext(wlc_cm, chspec, true);
+        struct wiphy *wiphy = wlc->wiphy;
+        const struct brcms_regd *regd = wlc->cmi->world_regd;
+        struct ieee80211_supported_band *sband;
+        struct ieee80211_channel *ch;
+        struct brcms_chanvec sup_chan;
+        struct brcms_band *band;
+        int band_idx, i;
+
+        /* Disable any channels not supported by the phy */
+        for (band_idx = 0; band_idx < IEEE80211_NUM_BANDS; band_idx++) {
+                if (band_idx == IEEE80211_BAND_2GHZ)
+                        band = wlc->bandstate[BAND_2G_INDEX];
+                else
+                        band = wlc->bandstate[BAND_5G_INDEX];
+
+                /* skip if band not initialized */
+                if (band->pi == NULL)
+                        continue;
+
+                wlc_phy_chanspec_band_validch(band->pi, band->bandtype,
+                                              &sup_chan);
+
+                sband = wiphy->bands[band_idx];
+                for (i = 0; i < sband->n_channels; i++) {
+                        ch = &sband->channels[i];
+                        if (!isset(sup_chan.vec, ch->hw_value))
+                                ch->flags |= IEEE80211_CHAN_DISABLED;
+                }
+        }
+
+        wlc->wiphy->reg_notifier = brcms_reg_notifier;
+        wlc->wiphy->flags |= WIPHY_FLAG_CUSTOM_REGULATORY |
+                             WIPHY_FLAG_STRICT_REGULATORY;
+        wiphy_apply_custom_regulatory(wlc->wiphy, regd->regdomain);
+        brcms_reg_apply_beaconing_flags(wiphy, NL80211_REGDOM_SET_BY_DRIVER);
 }
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/channel.h b/drivers/net/wireless/brcm80211/brcmsmac/channel.h
index 808cb4fbfbe..006483a0abe 100644
--- a/drivers/net/wireless/brcm80211/brcmsmac/channel.h
+++ b/drivers/net/wireless/brcm80211/brcmsmac/channel.h
@@ -37,9 +37,6 @@ brcms_c_channel_mgr_attach(struct brcms_c_info *wlc);
 
 extern void brcms_c_channel_mgr_detach(struct brcms_cm_info *wlc_cm);
 
-extern u8 brcms_c_channel_locale_flags_in_band(struct brcms_cm_info *wlc_cm,
-                                           uint bandunit);
-
 extern bool brcms_c_valid_chanspec_db(struct brcms_cm_info *wlc_cm,
                                       u16 chspec);
 
@@ -49,5 +46,6 @@ extern void brcms_c_channel_reg_limits(struct brcms_cm_info *wlc_cm,
 extern void brcms_c_channel_set_chanspec(struct brcms_cm_info *wlc_cm,
                                      u16 chanspec,
                                      u8 local_constraint_qdbm);
+extern void brcms_c_regd_init(struct brcms_c_info *wlc);
 
 #endif                          /* _WLC_CHANNEL_H */
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/dma.c b/drivers/net/wireless/brcm80211/brcmsmac/dma.c
index 11054ae9d4f..7516639412e 100644
--- a/drivers/net/wireless/brcm80211/brcmsmac/dma.c
+++ b/drivers/net/wireless/brcm80211/brcmsmac/dma.c
@@ -1433,7 +1433,7 @@ void dma_walk_packets(struct dma_pub *dmah, void (*callback_fnc)
         struct ieee80211_tx_info *tx_info;
 
         while (i != end) {
-                skb = (struct sk_buff *)di->txp[i];
+                skb = di->txp[i];
                 if (skb != NULL) {
                         tx_info = (struct ieee80211_tx_info *)skb->cb;
                         (callback_fnc)(tx_info, arg_a);
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c b/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
index 50f92a0b7c4..2d5a4041269 100644
--- a/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
+++ b/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
@@ -721,14 +721,6 @@ static const struct ieee80211_ops brcms_ops = {
         .flush = brcms_ops_flush,
 };
 
-/*
- * is called in brcms_bcma_probe() context, therefore no locking required.
- */
-static int brcms_set_hint(struct brcms_info *wl, char *abbrev)
-{
-        return regulatory_hint(wl->pub->ieee_hw->wiphy, abbrev);
-}
-
 void brcms_dpc(unsigned long data)
 {
         struct brcms_info *wl;
@@ -1058,6 +1050,8 @@ static struct brcms_info *brcms_attach(struct bcma_device *pdev)
                 goto fail;
         }
 
+        brcms_c_regd_init(wl->wlc);
+
         memcpy(perm, &wl->pub->cur_etheraddr, ETH_ALEN);
         if (WARN_ON(!is_valid_ether_addr(perm)))
                 goto fail;
@@ -1068,9 +1062,9 @@ static struct brcms_info *brcms_attach(struct bcma_device *pdev)
                 wiphy_err(wl->wiphy, "%s: ieee80211_register_hw failed, status"
                           "%d\n", __func__, err);
 
-        if (wl->pub->srom_ccode[0] && brcms_set_hint(wl, wl->pub->srom_ccode))
-                wiphy_err(wl->wiphy, "%s: regulatory_hint failed, status %d\n",
-                          __func__, err);
+        if (wl->pub->srom_ccode[0] &&
+            regulatory_hint(wl->wiphy, wl->pub->srom_ccode))
+                wiphy_err(wl->wiphy, "%s: regulatory hint failed\n", __func__);
 
         n_adapters_found++;
         return wl;
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/main.c b/drivers/net/wireless/brcm80211/brcmsmac/main.c
index 19db4052c44..bb00b6528d8 100644
--- a/drivers/net/wireless/brcm80211/brcmsmac/main.c
+++ b/drivers/net/wireless/brcm80211/brcmsmac/main.c
@@ -18,6 +18,7 @@
 
 #include <linux/pci_ids.h>
 #include <linux/if_ether.h>
+#include <net/cfg80211.h>
 #include <net/mac80211.h>
 #include <brcm_hw_ids.h>
 #include <aiutils.h>
@@ -3139,20 +3140,6 @@ void brcms_c_reset(struct brcms_c_info *wlc)
         brcms_b_reset(wlc->hw);
 }
 
-/* Return the channel the driver should initialize during brcms_c_init.
- * the channel may have to be changed from the currently configured channel
- * if other configurations are in conflict (bandlocked, 11n mode disabled,
- * invalid channel for current country, etc.)
- */
-static u16 brcms_c_init_chanspec(struct brcms_c_info *wlc)
-{
-        u16 chanspec =
-            1 | WL_CHANSPEC_BW_20 | WL_CHANSPEC_CTL_SB_NONE |
-            WL_CHANSPEC_BAND_2G;
-
-        return chanspec;
-}
-
 void brcms_c_init_scb(struct scb *scb)
 {
         int i;
@@ -5129,6 +5116,8 @@ static void brcms_c_wme_retries_write(struct brcms_c_info *wlc)
 /* make interface operational */
 int brcms_c_up(struct brcms_c_info *wlc)
 {
+        struct ieee80211_channel *ch;
+
         BCMMSG(wlc->wiphy, "wl%d\n", wlc->pub->unit);
 
         /* HW is turned off so don't try to access it */
@@ -5195,8 +5184,9 @@ int brcms_c_up(struct brcms_c_info *wlc)
         wlc->pub->up = true;
 
         if (wlc->bandinit_pending) {
+                ch = wlc->pub->ieee_hw->conf.channel;
                 brcms_c_suspend_mac_and_wait(wlc);
-                brcms_c_set_chanspec(wlc, wlc->default_bss->chanspec);
+                brcms_c_set_chanspec(wlc, ch20mhz_chspec(ch->hw_value));
                 wlc->bandinit_pending = false;
                 brcms_c_enable_mac(wlc);
         }
@@ -5397,11 +5387,6 @@ int brcms_c_set_gmode(struct brcms_c_info *wlc, u8 gmode, bool config)
         else
                 return -EINVAL;
 
-        /* Legacy or bust when no OFDM is supported by regulatory */
-        if ((brcms_c_channel_locale_flags_in_band(wlc->cmi, band->bandunit) &
-             BRCMS_NO_OFDM) && (gmode != GMODE_LEGACY_B))
-                return -EINVAL;
-
         /* update configuration value */
         if (config)
                 brcms_c_protection_upd(wlc, BRCMS_PROT_G_USER, gmode);
@@ -8201,19 +8186,12 @@ bool brcms_c_dpc(struct brcms_c_info *wlc, bool bounded)
 void brcms_c_init(struct brcms_c_info *wlc, bool mute_tx)
 {
         struct bcma_device *core = wlc->hw->d11core;
+        struct ieee80211_channel *ch = wlc->pub->ieee_hw->conf.channel;
         u16 chanspec;
 
         BCMMSG(wlc->wiphy, "wl%d\n", wlc->pub->unit);
 
-        /*
-         * This will happen if a big-hammer was executed. In
-         * that case, we want to go back to the channel that
-         * we were on and not new channel
-         */
-        if (wlc->pub->associated)
-                chanspec = wlc->home_chanspec;
-        else
-                chanspec = brcms_c_init_chanspec(wlc);
+        chanspec = ch20mhz_chspec(ch->hw_value);
 
         brcms_b_init(wlc->hw, chanspec);
 
@@ -8318,7 +8296,7 @@ brcms_c_attach(struct brcms_info *wl, struct bcma_device *core, uint unit,
         struct brcms_pub *pub;
 
         /* allocate struct brcms_c_info state and its substructures */
-        wlc = (struct brcms_c_info *) brcms_c_attach_malloc(unit, &err, 0);
+        wlc = brcms_c_attach_malloc(unit, &err, 0);
         if (wlc == NULL)
                 goto fail;
         wlc->wiphy = wl->wiphy;
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_n.c b/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_n.c
index 13b261517cc..36671814641 100644
--- a/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_n.c
+++ b/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_n.c
@@ -14358,7 +14358,7 @@ void wlc_phy_nphy_tkip_rifs_war(struct brcms_phy *pi, u8 rifs)
 
         wlc_phy_write_txmacreg_nphy(pi, holdoff, delay);
 
-        if (pi && pi->sh && (pi->sh->_rifs_phy != rifs))
+        if (pi->sh && (pi->sh->_rifs_phy != rifs))
                 pi->sh->_rifs_phy = rifs;
 }
 
diff --git a/drivers/net/wireless/brcm80211/brcmutil/utils.c b/drivers/net/wireless/brcm80211/brcmutil/utils.c
index b45ab34cdfd..3e6405e06ac 100644
--- a/drivers/net/wireless/brcm80211/brcmutil/utils.c
+++ b/drivers/net/wireless/brcm80211/brcmutil/utils.c
@@ -43,6 +43,8 @@ EXPORT_SYMBOL(brcmu_pkt_buf_get_skb);
 /* Free the driver packet. Free the tag if present */
 void brcmu_pkt_buf_free_skb(struct sk_buff *skb)
 {
+        if (!skb)
+                return;
         WARN_ON(skb->next);
         if (skb->destructor)
                 /* cannot kfree_skb() on hard IRQ (net/core/skbuff.c) if
diff --git a/drivers/net/wireless/brcm80211/include/brcm_hw_ids.h b/drivers/net/wireless/brcm80211/include/brcm_hw_ids.h
index 333193f20e1..bcc79b4e326 100644
--- a/drivers/net/wireless/brcm80211/include/brcm_hw_ids.h
+++ b/drivers/net/wireless/brcm80211/include/brcm_hw_ids.h
@@ -37,5 +37,6 @@
 #define BCM4329_CHIP_ID         0x4329
 #define BCM4330_CHIP_ID         0x4330
 #define BCM4331_CHIP_ID         0x4331
+#define BCM4334_CHIP_ID         0x4334
 
 #endif                          /* _BRCM_HW_IDS_H_ */
diff --git a/drivers/net/wireless/hostap/hostap_proc.c b/drivers/net/wireless/hostap/hostap_proc.c
index 75ef8f04aab..dc447c1b5ab 100644
--- a/drivers/net/wireless/hostap/hostap_proc.c
+++ b/drivers/net/wireless/hostap/hostap_proc.c
@@ -58,8 +58,7 @@ static int prism2_stats_proc_read(char *page, char **start, off_t off,
 {
         char *p = page;
         local_info_t *local = (local_info_t *) data;
-        struct comm_tallies_sums *sums = (struct comm_tallies_sums *)
-                &local->comm_tallies;
+        struct comm_tallies_sums *sums = &local->comm_tallies;
 
         if (off != 0) {
                 *eof = 1;
diff --git a/drivers/net/wireless/ipw2x00/ipw2200.c b/drivers/net/wireless/ipw2x00/ipw2200.c
index 0036737fe8e..0df45914739 100644
--- a/drivers/net/wireless/ipw2x00/ipw2200.c
+++ b/drivers/net/wireless/ipw2x00/ipw2200.c
@@ -2701,6 +2701,20 @@ static void eeprom_parse_mac(struct ipw_priv *priv, u8 * mac)
         memcpy(mac, &priv->eeprom[EEPROM_MAC_ADDRESS], 6);
 }
 
+static void ipw_read_eeprom(struct ipw_priv *priv)
+{
+        int i;
+        __le16 *eeprom = (__le16 *) priv->eeprom;
+
+        IPW_DEBUG_TRACE(">>\n");
+
+        /* read entire contents of eeprom into private buffer */
+        for (i = 0; i < 128; i++)
+                eeprom[i] = cpu_to_le16(eeprom_read_u16(priv, (u8) i));
+
+        IPW_DEBUG_TRACE("<<\n");
+}
+
 /*
  * Either the device driver (i.e. the host) or the firmware can
  * load eeprom data into the designated region in SRAM.  If neither
@@ -2712,14 +2726,9 @@ static void eeprom_parse_mac(struct ipw_priv *priv, u8 * mac)
 static void ipw_eeprom_init_sram(struct ipw_priv *priv)
 {
         int i;
-        __le16 *eeprom = (__le16 *) priv->eeprom;
 
         IPW_DEBUG_TRACE(">>\n");
 
-        /* read entire contents of eeprom into private buffer */
-        for (i = 0; i < 128; i++)
-                eeprom[i] = cpu_to_le16(eeprom_read_u16(priv, (u8) i));
-
         /*
            If the data looks correct, then copy it to our private
            copy.  Otherwise let the firmware know to perform the operation
@@ -3643,8 +3652,10 @@ static int ipw_load(struct ipw_priv *priv)
         /* ack fw init done interrupt */
         ipw_write32(priv, IPW_INTA_RW, IPW_INTA_BIT_FW_INITIALIZATION_DONE);
 
-        /* read eeprom data and initialize the eeprom region of sram */
+        /* read eeprom data */
         priv->eeprom_delay = 1;
+        ipw_read_eeprom(priv);
+        /* initialize the eeprom region of sram */
         ipw_eeprom_init_sram(priv);
 
         /* enable interrupts */
@@ -7069,9 +7080,7 @@ static int ipw_qos_activate(struct ipw_priv *priv,
         }
 
         IPW_DEBUG_QOS("QoS sending IPW_CMD_QOS_PARAMETERS\n");
-        err = ipw_send_qos_params_command(priv,
-                                          (struct libipw_qos_parameters *)
-                                          &(qos_parameters[0]));
+        err = ipw_send_qos_params_command(priv, &qos_parameters[0]);
         if (err)
                 IPW_DEBUG_QOS("QoS IPW_CMD_QOS_PARAMETERS failed\n");
 
diff --git a/drivers/net/wireless/iwlegacy/4965-mac.c b/drivers/net/wireless/iwlegacy/4965-mac.c
index ff5d689e13f..34f61a0581a 100644
--- a/drivers/net/wireless/iwlegacy/4965-mac.c
+++ b/drivers/net/wireless/iwlegacy/4965-mac.c
@@ -5724,7 +5724,8 @@ il4965_mac_setup_register(struct il_priv *il, u32 max_probe_length)
             BIT(NL80211_IFTYPE_STATION) | BIT(NL80211_IFTYPE_ADHOC);
 
         hw->wiphy->flags |=
-            WIPHY_FLAG_CUSTOM_REGULATORY | WIPHY_FLAG_DISABLE_BEACON_HINTS;
+            WIPHY_FLAG_CUSTOM_REGULATORY | WIPHY_FLAG_DISABLE_BEACON_HINTS |
+            WIPHY_FLAG_IBSS_RSN;
 
         /*
          * For now, disable PS by default because it affects
@@ -5873,6 +5874,16 @@ il4965_mac_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
                 return -EOPNOTSUPP;
         }
 
+        /*
+         * To support IBSS RSN, don't program group keys in IBSS, the
+         * hardware will then not attempt to decrypt the frames.
+         */
+        if (vif->type == NL80211_IFTYPE_ADHOC &&
+            !(key->flags & IEEE80211_KEY_FLAG_PAIRWISE)) {
+                D_MAC80211("leave - ad-hoc group key\n");
+                return -EOPNOTSUPP;
+        }
+
         sta_id = il_sta_id_or_broadcast(il, sta);
         if (sta_id == IL_INVALID_STATION)
                 return -EINVAL;
diff --git a/drivers/net/wireless/iwlegacy/common.c b/drivers/net/wireless/iwlegacy/common.c
index 5d4807c2b56..0f8a7703eea 100644
--- a/drivers/net/wireless/iwlegacy/common.c
+++ b/drivers/net/wireless/iwlegacy/common.c
@@ -4717,10 +4717,11 @@ il_check_stuck_queue(struct il_priv *il, int cnt)
         struct il_tx_queue *txq = &il->txq[cnt];
         struct il_queue *q = &txq->q;
         unsigned long timeout;
+        unsigned long now = jiffies;
         int ret;
 
         if (q->read_ptr == q->write_ptr) {
-                txq->time_stamp = jiffies;
+                txq->time_stamp = now;
                 return 0;
         }
 
@@ -4728,9 +4729,9 @@ il_check_stuck_queue(struct il_priv *il, int cnt)
             txq->time_stamp +
             msecs_to_jiffies(il->cfg->wd_timeout);
 
-        if (time_after(jiffies, timeout)) {
+        if (time_after(now, timeout)) {
                 IL_ERR("Queue %d stuck for %u ms.\n", q->id,
-                       il->cfg->wd_timeout);
+                       jiffies_to_msecs(now - txq->time_stamp));
                 ret = il_force_reset(il, false);
                 return (ret == -EAGAIN) ? 0 : 1;
         }
diff --git a/drivers/net/wireless/iwlwifi/Kconfig b/drivers/net/wireless/iwlwifi/Kconfig
index 2463c062643..727fbb5db9d 100644
--- a/drivers/net/wireless/iwlwifi/Kconfig
+++ b/drivers/net/wireless/iwlwifi/Kconfig
@@ -6,6 +6,7 @@ config IWLWIFI
         select LEDS_CLASS
         select LEDS_TRIGGERS
         select MAC80211_LEDS
+        select IWLDVM
         ---help---
           Select to build the driver supporting the:
 
@@ -41,6 +42,10 @@ config IWLWIFI
           say M here and read <file:Documentation/kbuild/modules.txt>.  The
           module will be called iwlwifi.
 
+config IWLDVM
+        tristate "Intel Wireless WiFi"
+        depends on IWLWIFI
+
 menu "Debugging Options"
         depends on IWLWIFI
 
diff --git a/drivers/net/wireless/iwlwifi/Makefile b/drivers/net/wireless/iwlwifi/Makefile
index d615eacbf05..170ec330d2a 100644
--- a/drivers/net/wireless/iwlwifi/Makefile
+++ b/drivers/net/wireless/iwlwifi/Makefile
@@ -1,27 +1,19 @@
-# WIFI
+# common
 obj-$(CONFIG_IWLWIFI)   += iwlwifi.o
-iwlwifi-objs            := iwl-agn.o iwl-agn-rs.o iwl-mac80211.o
-iwlwifi-objs            += iwl-ucode.o iwl-agn-tx.o iwl-debug.o
-iwlwifi-objs            += iwl-agn-lib.o iwl-agn-calib.o iwl-io.o
-iwlwifi-objs            += iwl-agn-tt.o iwl-agn-sta.o iwl-agn-rx.o
-
-iwlwifi-objs            += iwl-eeprom.o iwl-power.o
-iwlwifi-objs            += iwl-scan.o iwl-led.o
-iwlwifi-objs            += iwl-agn-rxon.o iwl-agn-devices.o
-iwlwifi-objs            += iwl-5000.o
-iwlwifi-objs            += iwl-6000.o
-iwlwifi-objs            += iwl-1000.o
-iwlwifi-objs            += iwl-2000.o
-iwlwifi-objs            += iwl-pci.o
+iwlwifi-objs            += iwl-io.o
 iwlwifi-objs            += iwl-drv.o
+iwlwifi-objs            += iwl-debug.o
 iwlwifi-objs            += iwl-notif-wait.o
-iwlwifi-objs            += iwl-trans-pcie.o iwl-trans-pcie-rx.o iwl-trans-pcie-tx.o
-
+iwlwifi-objs            += iwl-eeprom-read.o iwl-eeprom-parse.o
+iwlwifi-objs            += pcie/drv.o pcie/rx.o pcie/tx.o pcie/trans.o
+iwlwifi-objs            += pcie/1000.o pcie/2000.o pcie/5000.o pcie/6000.o
 
-iwlwifi-$(CONFIG_IWLWIFI_DEBUGFS) += iwl-debugfs.o
 iwlwifi-$(CONFIG_IWLWIFI_DEVICE_TRACING) += iwl-devtrace.o
-iwlwifi-$(CONFIG_IWLWIFI_DEVICE_TESTMODE) += iwl-testmode.o
+iwlwifi-$(CONFIG_IWLWIFI_DEVICE_TESTMODE) += iwl-test.o
 
-CFLAGS_iwl-devtrace.o := -I$(src)
+ccflags-y += -D__CHECK_ENDIAN__ -I$(src)
 
-ccflags-y += -D__CHECK_ENDIAN__
+
+obj-$(CONFIG_IWLDVM)    += dvm/
+
+CFLAGS_iwl-devtrace.o := -I$(src)
diff --git a/drivers/net/wireless/iwlwifi/dvm/Makefile b/drivers/net/wireless/iwlwifi/dvm/Makefile
new file mode 100644
index 00000000000..5ff76b20414
--- /dev/null
+++ b/drivers/net/wireless/iwlwifi/dvm/Makefile
@@ -0,0 +1,13 @@
+# DVM
+obj-$(CONFIG_IWLDVM)    += iwldvm.o
+iwldvm-objs             += main.o rs.o mac80211.o ucode.o tx.o
+iwldvm-objs             += lib.o calib.o tt.o sta.o rx.o
+
+iwldvm-objs             += power.o
+iwldvm-objs             += scan.o led.o
+iwldvm-objs             += rxon.o devices.o
+
+iwldvm-$(CONFIG_IWLWIFI_DEBUGFS) += debugfs.o
+iwldvm-$(CONFIG_IWLWIFI_DEVICE_TESTMODE) += testmode.o
+
+ccflags-y += -D__CHECK_ENDIAN__ -I$(src)/../
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.h b/drivers/net/wireless/iwlwifi/dvm/agn.h
index 79c0fe06f4d..9bb16bdf6d2 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn.h
+++ b/drivers/net/wireless/iwlwifi/dvm/agn.h
@@ -63,9 +63,10 @@
 #ifndef __iwl_agn_h__
 #define __iwl_agn_h__
 
-#include "iwl-dev.h"
 #include "iwl-config.h"
 
+#include "dev.h"
+
 /* The first 11 queues (0-10) are used otherwise */
 #define IWLAGN_FIRST_AMPDU_QUEUE        11
 
@@ -91,7 +92,6 @@ extern struct iwl_lib_ops iwl6030_lib;
 #define STATUS_CT_KILL          1
 #define STATUS_ALIVE            2
 #define STATUS_READY            3
-#define STATUS_GEO_CONFIGURED   4
 #define STATUS_EXIT_PENDING     5
 #define STATUS_STATISTICS       6
 #define STATUS_SCANNING         7
@@ -101,6 +101,7 @@ extern struct iwl_lib_ops iwl6030_lib;
 #define STATUS_CHANNEL_SWITCH_PENDING 11
 #define STATUS_SCAN_COMPLETE    12
 #define STATUS_POWER_PMI        13
+#define STATUS_SCAN_ROC_EXPIRED 14
 
 struct iwl_ucode_capabilities;
 
@@ -255,6 +256,10 @@ int __must_check iwl_scan_initiate(struct iwl_priv *priv,
                                    enum iwl_scan_type scan_type,
                                    enum ieee80211_band band);
 
+void iwl_scan_roc_expired(struct iwl_priv *priv);
+void iwl_scan_offchannel_skb(struct iwl_priv *priv);
+void iwl_scan_offchannel_skb_status(struct iwl_priv *priv);
+
 /* For faster active scanning, scan will move to the next channel if fewer than
  * PLCP_QUIET_THRESH packets are heard on this channel within
  * ACTIVE_QUIET_TIME after sending probe request.  This shortens the dwell
@@ -264,7 +269,7 @@ int __must_check iwl_scan_initiate(struct iwl_priv *priv,
 #define IWL_ACTIVE_QUIET_TIME       cpu_to_le16(10)  /* msec */
 #define IWL_PLCP_QUIET_THRESH       cpu_to_le16(1)  /* packets */
 
-#define IWL_SCAN_CHECK_WATCHDOG         (HZ * 7)
+#define IWL_SCAN_CHECK_WATCHDOG         (HZ * 15)
 
 
 /* bt coex */
@@ -390,8 +395,10 @@ static inline __le32 iwl_hw_set_rate_n_flags(u8 rate, u32 flags)
 }
 
 extern int iwl_alive_start(struct iwl_priv *priv);
-/* svtool */
+
+/* testmode support */
 #ifdef CONFIG_IWLWIFI_DEVICE_TESTMODE
+
 extern int iwlagn_mac_testmode_cmd(struct ieee80211_hw *hw, void *data,
                                    int len);
 extern int iwlagn_mac_testmode_dump(struct ieee80211_hw *hw,
@@ -399,13 +406,16 @@ extern int iwlagn_mac_testmode_dump(struct ieee80211_hw *hw,
                                     struct netlink_callback *cb,
                                     void *data, int len);
 extern void iwl_testmode_init(struct iwl_priv *priv);
-extern void iwl_testmode_cleanup(struct iwl_priv *priv);
+extern void iwl_testmode_free(struct iwl_priv *priv);
+
 #else
+
 static inline
 int iwlagn_mac_testmode_cmd(struct ieee80211_hw *hw, void *data, int len)
 {
         return -ENOSYS;
 }
+
 static inline
 int iwlagn_mac_testmode_dump(struct ieee80211_hw *hw, struct sk_buff *skb,
                       struct netlink_callback *cb,
@@ -413,12 +423,12 @@ int iwlagn_mac_testmode_dump(struct ieee80211_hw *hw, struct sk_buff *skb,
 {
         return -ENOSYS;
 }
-static inline
-void iwl_testmode_init(struct iwl_priv *priv)
+
+static inline void iwl_testmode_init(struct iwl_priv *priv)
 {
 }
-static inline
-void iwl_testmode_cleanup(struct iwl_priv *priv)
+
+static inline void iwl_testmode_free(struct iwl_priv *priv)
 {
 }
 #endif
@@ -437,10 +447,8 @@ static inline void iwl_print_rx_config_cmd(struct iwl_priv *priv,
 
 static inline int iwl_is_ready(struct iwl_priv *priv)
 {
-        /* The adapter is 'ready' if READY and GEO_CONFIGURED bits are
-         * set but EXIT_PENDING is not */
+        /* The adapter is 'ready' if READY EXIT_PENDING is not set */
         return test_bit(STATUS_READY, &priv->status) &&
-               test_bit(STATUS_GEO_CONFIGURED, &priv->status) &&
                !test_bit(STATUS_EXIT_PENDING, &priv->status);
 }
 
@@ -518,85 +526,4 @@ static inline const char *iwl_dvm_get_cmd_string(u8 cmd)
                 return s;
         return "UNKNOWN";
 }
-
-/* API method exported for mvm hybrid state */
-void iwl_setup_deferred_work(struct iwl_priv *priv);
-int iwl_send_wimax_coex(struct iwl_priv *priv);
-int iwl_send_bt_env(struct iwl_priv *priv, u8 action, u8 type);
-void iwl_option_config(struct iwl_priv *priv);
-void iwl_set_hw_params(struct iwl_priv *priv);
-void iwl_init_context(struct iwl_priv *priv, u32 ucode_flags);
-int iwl_init_drv(struct iwl_priv *priv);
-void iwl_uninit_drv(struct iwl_priv *priv);
-void iwl_send_bt_config(struct iwl_priv *priv);
-void iwl_rf_kill_ct_config(struct iwl_priv *priv);
-int iwl_setup_interface(struct iwl_priv *priv, struct iwl_rxon_context *ctx);
-void iwl_teardown_interface(struct iwl_priv *priv,
-                            struct ieee80211_vif *vif,
-                            bool mode_change);
-int iwl_full_rxon_required(struct iwl_priv *priv, struct iwl_rxon_context *ctx);
-void iwlagn_update_qos(struct iwl_priv *priv, struct iwl_rxon_context *ctx);
-void iwlagn_check_needed_chains(struct iwl_priv *priv,
-                                struct iwl_rxon_context *ctx,
-                                struct ieee80211_bss_conf *bss_conf);
-void iwlagn_chain_noise_reset(struct iwl_priv *priv);
-int iwlagn_update_beacon(struct iwl_priv *priv,
-                         struct ieee80211_vif *vif);
-void iwl_tt_handler(struct iwl_priv *priv);
-void iwl_op_mode_dvm_stop(struct iwl_op_mode *op_mode);
-void iwl_stop_sw_queue(struct iwl_op_mode *op_mode, int queue);
-void iwl_set_hw_rfkill_state(struct iwl_op_mode *op_mode, bool state);
-void iwl_free_skb(struct iwl_op_mode *op_mode, struct sk_buff *skb);
-void iwl_nic_error(struct iwl_op_mode *op_mode);
-void iwl_cmd_queue_full(struct iwl_op_mode *op_mode);
-void iwl_nic_config(struct iwl_op_mode *op_mode);
-int iwlagn_mac_set_tim(struct ieee80211_hw *hw,
-                       struct ieee80211_sta *sta, bool set);
-void iwlagn_mac_rssi_callback(struct ieee80211_hw *hw,
-                              enum ieee80211_rssi_event rssi_event);
-int iwlagn_mac_cancel_remain_on_channel(struct ieee80211_hw *hw);
-int iwlagn_mac_tx_last_beacon(struct ieee80211_hw *hw);
-void iwlagn_mac_flush(struct ieee80211_hw *hw, bool drop);
-void iwl_wake_sw_queue(struct iwl_op_mode *op_mode, int queue);
-void iwlagn_mac_channel_switch(struct ieee80211_hw *hw,
-                               struct ieee80211_channel_switch *ch_switch);
-int iwlagn_mac_sta_state(struct ieee80211_hw *hw,
-                         struct ieee80211_vif *vif,
-                         struct ieee80211_sta *sta,
-                         enum ieee80211_sta_state old_state,
-                         enum ieee80211_sta_state new_state);
-int iwlagn_mac_ampdu_action(struct ieee80211_hw *hw,
-                            struct ieee80211_vif *vif,
-                            enum ieee80211_ampdu_mlme_action action,
-                            struct ieee80211_sta *sta, u16 tid, u16 *ssn,
-                            u8 buf_size);
-int iwlagn_mac_hw_scan(struct ieee80211_hw *hw,
-                       struct ieee80211_vif *vif,
-                       struct cfg80211_scan_request *req);
-void iwlagn_mac_sta_notify(struct ieee80211_hw *hw,
-                           struct ieee80211_vif *vif,
-                           enum sta_notify_cmd cmd,
-                           struct ieee80211_sta *sta);
-void iwlagn_configure_filter(struct ieee80211_hw *hw,
-                             unsigned int changed_flags,
-                             unsigned int *total_flags,
-                             u64 multicast);
-int iwlagn_mac_conf_tx(struct ieee80211_hw *hw,
-                       struct ieee80211_vif *vif, u16 queue,
-                       const struct ieee80211_tx_queue_params *params);
-void iwlagn_mac_set_rekey_data(struct ieee80211_hw *hw,
-                               struct ieee80211_vif *vif,
-                               struct cfg80211_gtk_rekey_data *data);
-void iwlagn_mac_update_tkip_key(struct ieee80211_hw *hw,
-                                struct ieee80211_vif *vif,
-                                struct ieee80211_key_conf *keyconf,
-                                struct ieee80211_sta *sta,
-                                u32 iv32, u16 *phase1key);
-int iwlagn_mac_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
-                       struct ieee80211_vif *vif,
-                       struct ieee80211_sta *sta,
-                       struct ieee80211_key_conf *key);
-void iwlagn_mac_stop(struct ieee80211_hw *hw);
-void iwlagn_mac_tx(struct ieee80211_hw *hw, struct sk_buff *skb);
-int iwlagn_mac_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan);
 #endif /* __iwl_agn_h__ */
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-calib.c b/drivers/net/wireless/iwlwifi/dvm/calib.c
index 95f27f1a423..f2dd671d7dc 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-calib.c
+++ b/drivers/net/wireless/iwlwifi/dvm/calib.c
@@ -63,10 +63,11 @@
 #include <linux/slab.h>
 #include <net/mac80211.h>
 
-#include "iwl-dev.h"
-#include "iwl-agn-calib.h"
 #include "iwl-trans.h"
-#include "iwl-agn.h"
+
+#include "dev.h"
+#include "calib.h"
+#include "agn.h"
 
 /*****************************************************************************
  * INIT calibrations framework
@@ -832,14 +833,14 @@ static void iwl_find_disconn_antenna(struct iwl_priv *priv, u32* average_sig,
          * To be safe, simply mask out any chains that we know
          * are not on the device.
          */
-        active_chains &= priv->hw_params.valid_rx_ant;
+        active_chains &= priv->eeprom_data->valid_rx_ant;
 
         num_tx_chains = 0;
         for (i = 0; i < NUM_RX_CHAINS; i++) {
                 /* loops on all the bits of
                  * priv->hw_setting.valid_tx_ant */
                 u8 ant_msk = (1 << i);
-                if (!(priv->hw_params.valid_tx_ant & ant_msk))
+                if (!(priv->eeprom_data->valid_tx_ant & ant_msk))
                         continue;
 
                 num_tx_chains++;
@@ -853,7 +854,7 @@ static void iwl_find_disconn_antenna(struct iwl_priv *priv, u32* average_sig,
                          * connect the first valid tx chain
                          */
                         first_chain =
-                                find_first_chain(priv->hw_params.valid_tx_ant);
+                                find_first_chain(priv->eeprom_data->valid_tx_ant);
                         data->disconn_array[first_chain] = 0;
                         active_chains |= BIT(first_chain);
                         IWL_DEBUG_CALIB(priv,
@@ -863,13 +864,13 @@ static void iwl_find_disconn_antenna(struct iwl_priv *priv, u32* average_sig,
                 }
         }
 
-        if (active_chains != priv->hw_params.valid_rx_ant &&
+        if (active_chains != priv->eeprom_data->valid_rx_ant &&
             active_chains != priv->chain_noise_data.active_chains)
                 IWL_DEBUG_CALIB(priv,
                                 "Detected that not all antennas are connected! "
                                 "Connected: %#x, valid: %#x.\n",
                                 active_chains,
-                                priv->hw_params.valid_rx_ant);
+                                priv->eeprom_data->valid_rx_ant);
 
         /* Save for use within RXON, TX, SCAN commands, etc. */
         data->active_chains = active_chains;
@@ -1054,7 +1055,7 @@ void iwl_chain_noise_calibration(struct iwl_priv *priv)
             priv->cfg->bt_params->advanced_bt_coexist) {
                 /* Disable disconnected antenna algorithm for advanced
                    bt coex, assuming valid antennas are connected */
-                data->active_chains = priv->hw_params.valid_rx_ant;
+                data->active_chains = priv->eeprom_data->valid_rx_ant;
                 for (i = 0; i < NUM_RX_CHAINS; i++)
                         if (!(data->active_chains & (1<<i)))
                                 data->disconn_array[i] = 1;
@@ -1083,8 +1084,9 @@ void iwl_chain_noise_calibration(struct iwl_priv *priv)
         IWL_DEBUG_CALIB(priv, "min_average_noise = %d, antenna %d\n",
                         min_average_noise, min_average_noise_antenna_i);
 
-        iwlagn_gain_computation(priv, average_noise,
-                                find_first_chain(priv->hw_params.valid_rx_ant));
+        iwlagn_gain_computation(
+                priv, average_noise,
+                find_first_chain(priv->eeprom_data->valid_rx_ant));
 
         /* Some power changes may have been made during the calibration.
          * Update and commit the RXON
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-calib.h b/drivers/net/wireless/iwlwifi/dvm/calib.h
index dbe13787f27..2349f393cc4 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-calib.h
+++ b/drivers/net/wireless/iwlwifi/dvm/calib.h
@@ -62,8 +62,8 @@
 #ifndef __iwl_calib_h__
 #define __iwl_calib_h__
 
-#include "iwl-dev.h"
-#include "iwl-commands.h"
+#include "dev.h"
+#include "commands.h"
 
 void iwl_chain_noise_calibration(struct iwl_priv *priv);
 void iwl_sensitivity_calibration(struct iwl_priv *priv);
diff --git a/drivers/net/wireless/iwlwifi/iwl-commands.h b/drivers/net/wireless/iwlwifi/dvm/commands.h
index 9af6a239b38..64811cd9163 100644
--- a/drivers/net/wireless/iwlwifi/iwl-commands.h
+++ b/drivers/net/wireless/iwlwifi/dvm/commands.h
@@ -61,9 +61,9 @@
  *
  *****************************************************************************/
 /*
- * Please use this file (iwl-commands.h) only for uCode API definitions.
+ * Please use this file (commands.h) only for uCode API definitions.
  * Please use iwl-xxxx-hw.h for hardware-related definitions.
- * Please use iwl-dev.h for driver implementation definitions.
+ * Please use dev.h for driver implementation definitions.
  */
 
 #ifndef __iwl_commands_h__
@@ -197,9 +197,6 @@ enum {
  *
  *****************************************************************************/
 
-/* iwl_cmd_header flags value */
-#define IWL_CMD_FAILED_MSK 0x40
-
 /**
  * iwlagn rate_n_flags bit fields
  *
diff --git a/drivers/net/wireless/iwlwifi/iwl-debugfs.c b/drivers/net/wireless/iwlwifi/dvm/debugfs.c
index 7f97dec8534..b0eff1c340c 100644
--- a/drivers/net/wireless/iwlwifi/iwl-debugfs.c
+++ b/drivers/net/wireless/iwlwifi/dvm/debugfs.c
@@ -30,16 +30,12 @@
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/debugfs.h>
-
 #include <linux/ieee80211.h>
 #include <net/mac80211.h>
-
-
-#include "iwl-dev.h"
 #include "iwl-debug.h"
 #include "iwl-io.h"
-#include "iwl-agn.h"
-#include "iwl-modparams.h"
+#include "dev.h"
+#include "agn.h"
 
 /* create and remove of files */
 #define DEBUGFS_ADD_FILE(name, parent, mode) do {                       \
@@ -307,13 +303,13 @@ static ssize_t iwl_dbgfs_nvm_read(struct file *file,
         const u8 *ptr;
         char *buf;
         u16 eeprom_ver;
-        size_t eeprom_len = priv->cfg->base_params->eeprom_size;
+        size_t eeprom_len = priv->eeprom_blob_size;
         buf_size = 4 * eeprom_len + 256;
 
         if (eeprom_len % 16)
                 return -ENODATA;
 
-        ptr = priv->eeprom;
+        ptr = priv->eeprom_blob;
         if (!ptr)
                 return -ENOMEM;
 
@@ -322,11 +318,9 @@ static ssize_t iwl_dbgfs_nvm_read(struct file *file,
         if (!buf)
                 return -ENOMEM;
 
-        eeprom_ver = iwl_eeprom_query16(priv, EEPROM_VERSION);
-        pos += scnprintf(buf + pos, buf_size - pos, "NVM Type: %s, "
-                        "version: 0x%x\n",
-                        (priv->nvm_device_type == NVM_DEVICE_TYPE_OTP)
-                         ? "OTP" : "EEPROM", eeprom_ver);
+        eeprom_ver = priv->eeprom_data->eeprom_version;
+        pos += scnprintf(buf + pos, buf_size - pos,
+                         "NVM version: 0x%x\n", eeprom_ver);
         for (ofs = 0 ; ofs < eeprom_len ; ofs += 16) {
                 pos += scnprintf(buf + pos, buf_size - pos, "0x%.4x ", ofs);
                 hex_dump_to_buffer(ptr + ofs, 16 , 16, 2, buf + pos,
@@ -351,9 +345,6 @@ static ssize_t iwl_dbgfs_channels_read(struct file *file, char __user *user_buf,
         char *buf;
         ssize_t ret;
 
-        if (!test_bit(STATUS_GEO_CONFIGURED, &priv->status))
-                return -EAGAIN;
-
         buf = kzalloc(bufsz, GFP_KERNEL);
         if (!buf)
                 return -ENOMEM;
@@ -426,8 +417,6 @@ static ssize_t iwl_dbgfs_status_read(struct file *file,
                 test_bit(STATUS_ALIVE, &priv->status));
         pos += scnprintf(buf + pos, bufsz - pos, "STATUS_READY:\t\t %d\n",
                 test_bit(STATUS_READY, &priv->status));
-        pos += scnprintf(buf + pos, bufsz - pos, "STATUS_GEO_CONFIGURED:\t %d\n",
-                test_bit(STATUS_GEO_CONFIGURED, &priv->status));
         pos += scnprintf(buf + pos, bufsz - pos, "STATUS_EXIT_PENDING:\t %d\n",
                 test_bit(STATUS_EXIT_PENDING, &priv->status));
         pos += scnprintf(buf + pos, bufsz - pos, "STATUS_STATISTICS:\t %d\n",
@@ -1341,17 +1330,17 @@ static ssize_t iwl_dbgfs_ucode_tx_stats_read(struct file *file,
         if (tx->tx_power.ant_a || tx->tx_power.ant_b || tx->tx_power.ant_c) {
                 pos += scnprintf(buf + pos, bufsz - pos,
                         "tx power: (1/2 dB step)\n");
-                if ((priv->hw_params.valid_tx_ant & ANT_A) &&
+                if ((priv->eeprom_data->valid_tx_ant & ANT_A) &&
                     tx->tx_power.ant_a)
                         pos += scnprintf(buf + pos, bufsz - pos,
                                         fmt_hex, "antenna A:",
                                         tx->tx_power.ant_a);
-                if ((priv->hw_params.valid_tx_ant & ANT_B) &&
+                if ((priv->eeprom_data->valid_tx_ant & ANT_B) &&
                     tx->tx_power.ant_b)
                         pos += scnprintf(buf + pos, bufsz - pos,
                                         fmt_hex, "antenna B:",
                                         tx->tx_power.ant_b);
-                if ((priv->hw_params.valid_tx_ant & ANT_C) &&
+                if ((priv->eeprom_data->valid_tx_ant & ANT_C) &&
                     tx->tx_power.ant_c)
                         pos += scnprintf(buf + pos, bufsz - pos,
                                         fmt_hex, "antenna C:",
diff --git a/drivers/net/wireless/iwlwifi/iwl-dev.h b/drivers/net/wireless/iwlwifi/dvm/dev.h
index 70062379d0e..54cf085ddc8 100644
--- a/drivers/net/wireless/iwlwifi/iwl-dev.h
+++ b/drivers/net/wireless/iwlwifi/dvm/dev.h
@@ -24,8 +24,8 @@
  *
  *****************************************************************************/
 /*
- * Please use this file (iwl-dev.h) for driver implementation definitions.
- * Please use iwl-commands.h for uCode API definitions.
+ * Please use this file (dev.h) for driver implementation definitions.
+ * Please use commands.h for uCode API definitions.
  */
 
 #ifndef __iwl_dev_h__
@@ -39,17 +39,20 @@
 #include <linux/mutex.h>
 
 #include "iwl-fw.h"
-#include "iwl-eeprom.h"
+#include "iwl-eeprom-parse.h"
 #include "iwl-csr.h"
 #include "iwl-debug.h"
 #include "iwl-agn-hw.h"
-#include "iwl-led.h"
-#include "iwl-power.h"
-#include "iwl-agn-rs.h"
-#include "iwl-agn-tt.h"
-#include "iwl-trans.h"
 #include "iwl-op-mode.h"
 #include "iwl-notif-wait.h"
+#include "iwl-trans.h"
+
+#include "led.h"
+#include "power.h"
+#include "rs.h"
+#include "tt.h"
+
+#include "iwl-test.h"
 
 /* CT-KILL constants */
 #define CT_KILL_THRESHOLD_LEGACY   110 /* in Celsius */
@@ -88,33 +91,6 @@
 #define IWL_NUM_SCAN_RATES         (2)
 
 /*
- * One for each channel, holds all channel setup data
- * Some of the fields (e.g. eeprom and flags/max_power_avg) are redundant
- *     with one another!
- */
-struct iwl_channel_info {
-        struct iwl_eeprom_channel eeprom;       /* EEPROM regulatory limit */
-        struct iwl_eeprom_channel ht40_eeprom;  /* EEPROM regulatory limit for
-                                                 * HT40 channel */
-
-        u8 channel;       /* channel number */
-        u8 flags;         /* flags copied from EEPROM */
-        s8 max_power_avg; /* (dBm) regul. eeprom, normal Tx, any rate */
-        s8 curr_txpow;    /* (dBm) regulatory/spectrum/user (not h/w) limit */
-        s8 min_power;     /* always 0 */
-        s8 scan_power;    /* (dBm) regul. eeprom, direct scans, any rate */
-
-        u8 group_index;   /* 0-4, maps channel to group1/2/3/4/5 */
-        u8 band_index;    /* 0-4, maps channel to band1/2/3/4/5 */
-        enum ieee80211_band band;
-
-        /* HT40 channel info */
-        s8 ht40_max_power_avg;  /* (dBm) regul. eeprom, normal Tx, any rate */
-        u8 ht40_flags;          /* flags copied from EEPROM */
-        u8 ht40_extension_channel; /* HT_IE_EXT_CHANNEL_* */
-};
-
-/*
  * Minimum number of queues. MAX_NUM is defined in hw specific files.
  * Set the minimum to accommodate
  *  - 4 standard TX queues
@@ -153,29 +129,6 @@ union iwl_ht_rate_supp {
         };
 };
 
-#define CFG_HT_RX_AMPDU_FACTOR_8K   (0x0)
-#define CFG_HT_RX_AMPDU_FACTOR_16K  (0x1)
-#define CFG_HT_RX_AMPDU_FACTOR_32K  (0x2)
-#define CFG_HT_RX_AMPDU_FACTOR_64K  (0x3)
-#define CFG_HT_RX_AMPDU_FACTOR_DEF  CFG_HT_RX_AMPDU_FACTOR_64K
-#define CFG_HT_RX_AMPDU_FACTOR_MAX  CFG_HT_RX_AMPDU_FACTOR_64K
-#define CFG_HT_RX_AMPDU_FACTOR_MIN  CFG_HT_RX_AMPDU_FACTOR_8K
-
-/*
- * Maximal MPDU density for TX aggregation
- * 4 - 2us density
- * 5 - 4us density
- * 6 - 8us density
- * 7 - 16us density
- */
-#define CFG_HT_MPDU_DENSITY_2USEC   (0x4)
-#define CFG_HT_MPDU_DENSITY_4USEC   (0x5)
-#define CFG_HT_MPDU_DENSITY_8USEC   (0x6)
-#define CFG_HT_MPDU_DENSITY_16USEC  (0x7)
-#define CFG_HT_MPDU_DENSITY_DEF CFG_HT_MPDU_DENSITY_4USEC
-#define CFG_HT_MPDU_DENSITY_MAX CFG_HT_MPDU_DENSITY_16USEC
-#define CFG_HT_MPDU_DENSITY_MIN     (0x1)
-
 struct iwl_ht_config {
         bool single_chain_sufficient;
         enum ieee80211_smps_mode smps; /* current smps mode */
@@ -445,23 +398,6 @@ enum {
         MEASUREMENT_ACTIVE = (1 << 1),
 };
 
-enum iwl_nvm_type {
-        NVM_DEVICE_TYPE_EEPROM = 0,
-        NVM_DEVICE_TYPE_OTP,
-};
-
-/*
- * Two types of OTP memory access modes
- *   IWL_OTP_ACCESS_ABSOLUTE - absolute address mode,
- *                              based on physical memory addressing
- *   IWL_OTP_ACCESS_RELATIVE - relative address mode,
- *                             based on logical memory addressing
- */
-enum iwl_access_mode {
-        IWL_OTP_ACCESS_ABSOLUTE,
-        IWL_OTP_ACCESS_RELATIVE,
-};
-
 /* reply_tx_statistics (for _agn devices) */
 struct reply_tx_error_statistics {
         u32 pp_delay;
@@ -632,10 +568,6 @@ enum iwl_scan_type {
  *
  * @tx_chains_num: Number of TX chains
  * @rx_chains_num: Number of RX chains
- * @valid_tx_ant: usable antennas for TX
- * @valid_rx_ant: usable antennas for RX
- * @ht40_channel: is 40MHz width possible: BIT(IEEE80211_BAND_XXX)
- * @sku: sku read from EEPROM
  * @ct_kill_threshold: temperature threshold - in hw dependent unit
  * @ct_kill_exit_threshold: when to reeable the device - in hw dependent unit
  *      relevant for 1000, 6000 and up
@@ -645,11 +577,7 @@ enum iwl_scan_type {
 struct iwl_hw_params {
         u8  tx_chains_num;
         u8  rx_chains_num;
-        u8  valid_tx_ant;
-        u8  valid_rx_ant;
-        u8  ht40_channel;
         bool use_rts_for_aggregation;
-        u16 sku;
         u32 ct_kill_threshold;
         u32 ct_kill_exit_threshold;
 
@@ -664,31 +592,10 @@ struct iwl_lib_ops {
         /* device specific configuration */
         void (*nic_config)(struct iwl_priv *priv);
 
-        /* eeprom operations (as defined in iwl-eeprom.h) */
-        struct iwl_eeprom_ops eeprom_ops;
-
         /* temperature */
         void (*temperature)(struct iwl_priv *priv);
 };
 
-#ifdef CONFIG_IWLWIFI_DEVICE_TESTMODE
-struct iwl_testmode_trace {
-        u32 buff_size;
-        u32 total_size;
-        u32 num_chunks;
-        u8 *cpu_addr;
-        u8 *trace_addr;
-        dma_addr_t dma_addr;
-        bool trace_enabled;
-};
-struct iwl_testmode_mem {
-        u32 buff_size;
-        u32 num_chunks;
-        u8 *buff_addr;
-        bool read_in_progress;
-};
-#endif
-
 struct iwl_wipan_noa_data {
         struct rcu_head rcu_head;
         u32 length;
@@ -735,8 +642,6 @@ struct iwl_priv {
 
         /* ieee device used by generic ieee processing code */
         struct ieee80211_hw *hw;
-        struct ieee80211_channel *ieee_channels;
-        struct ieee80211_rate *ieee_rates;
 
         struct list_head calib_results;
 
@@ -747,16 +652,12 @@ struct iwl_priv {
         enum ieee80211_band band;
         u8 valid_contexts;
 
-        void (*pre_rx_handler)(struct iwl_priv *priv,
-                               struct iwl_rx_cmd_buffer *rxb);
         int (*rx_handlers[REPLY_MAX])(struct iwl_priv *priv,
                                        struct iwl_rx_cmd_buffer *rxb,
                                        struct iwl_device_cmd *cmd);
 
         struct iwl_notif_wait_data notif_wait;
 
-        struct ieee80211_supported_band bands[IEEE80211_NUM_BANDS];
-
         /* spectrum measurement report caching */
         struct iwl_spectrum_notification measure_report;
         u8 measurement_status;
@@ -787,11 +688,6 @@ struct iwl_priv {
         bool ucode_loaded;
         bool init_ucode_run;            /* Don't run init uCode again */
 
-        /* we allocate array of iwl_channel_info for NIC's valid channels.
-         *    Access via channel # using indirect index array */
-        struct iwl_channel_info *channel_info;  /* channel info array */
-        u8 channel_count;       /* # of channels */
-
         u8 plcp_delta_threshold;
 
         /* thermal calibration */
@@ -846,6 +742,7 @@ struct iwl_priv {
         struct iwl_station_entry stations[IWLAGN_STATION_COUNT];
         unsigned long ucode_key_table;
         struct iwl_tid_data tid_data[IWLAGN_STATION_COUNT][IWL_MAX_TID_COUNT];
+        atomic_t num_aux_in_flight;
 
         u8 mac80211_registered;
 
@@ -950,10 +847,8 @@ struct iwl_priv {
 
         struct delayed_work scan_check;
 
-        /* TX Power */
+        /* TX Power settings */
         s8 tx_power_user_lmt;
-        s8 tx_power_device_lmt;
-        s8 tx_power_lmt_in_half_dbm; /* max tx power in half-dBm format */
         s8 tx_power_next;
 
 #ifdef CONFIG_IWLWIFI_DEBUGFS
@@ -964,9 +859,10 @@ struct iwl_priv {
         void *wowlan_sram;
 #endif /* CONFIG_IWLWIFI_DEBUGFS */
 
-        /* eeprom -- this is in the card's little endian byte order */
-        u8 *eeprom;
-        enum iwl_nvm_type nvm_device_type;
+        struct iwl_eeprom_data *eeprom_data;
+        /* eeprom blob for debugfs/testmode */
+        u8 *eeprom_blob;
+        size_t eeprom_blob_size;
 
         struct work_struct txpower_work;
         u32 calib_disabled;
@@ -979,9 +875,9 @@ struct iwl_priv {
         struct led_classdev led;
         unsigned long blink_on, blink_off;
         bool led_registered;
+
 #ifdef CONFIG_IWLWIFI_DEVICE_TESTMODE
-        struct iwl_testmode_trace testmode_trace;
-        struct iwl_testmode_mem testmode_mem;
+        struct iwl_test tst;
         u32 tm_fixed_rate;
 #endif
 
@@ -1001,8 +897,6 @@ struct iwl_priv {
         enum iwl_ucode_type cur_ucode;
 }; /*iwl_priv */
 
-extern struct kmem_cache *iwl_tx_cmd_pool;
-
 static inline struct iwl_rxon_context *
 iwl_rxon_ctx_from_vif(struct ieee80211_vif *vif)
 {
@@ -1036,36 +930,4 @@ static inline int iwl_is_any_associated(struct iwl_priv *priv)
         return false;
 }
 
-static inline int is_channel_valid(const struct iwl_channel_info *ch_info)
-{
-        if (ch_info == NULL)
-                return 0;
-        return (ch_info->flags & EEPROM_CHANNEL_VALID) ? 1 : 0;
-}
-
-static inline int is_channel_radar(const struct iwl_channel_info *ch_info)
-{
-        return (ch_info->flags & EEPROM_CHANNEL_RADAR) ? 1 : 0;
-}
-
-static inline u8 is_channel_a_band(const struct iwl_channel_info *ch_info)
-{
-        return ch_info->band == IEEE80211_BAND_5GHZ;
-}
-
-static inline u8 is_channel_bg_band(const struct iwl_channel_info *ch_info)
-{
-        return ch_info->band == IEEE80211_BAND_2GHZ;
-}
-
-static inline int is_channel_passive(const struct iwl_channel_info *ch)
-{
-        return (!(ch->flags & EEPROM_CHANNEL_ACTIVE)) ? 1 : 0;
-}
-
-static inline int is_channel_ibss(const struct iwl_channel_info *ch)
-{
-        return ((ch->flags & EEPROM_CHANNEL_IBSS)) ? 1 : 0;
-}
-
 #endif                          /* __iwl_dev_h__ */
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-devices.c b/drivers/net/wireless/iwlwifi/dvm/devices.c
index 48533b3a0f9..349c205d5f6 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-devices.c
+++ b/drivers/net/wireless/iwlwifi/dvm/devices.c
@@ -27,11 +27,14 @@
 /*
  * DVM device-specific data & functions
  */
-#include "iwl-agn.h"
-#include "iwl-dev.h"
-#include "iwl-commands.h"
 #include "iwl-io.h"
 #include "iwl-prph.h"
+#include "iwl-eeprom-parse.h"
+
+#include "agn.h"
+#include "dev.h"
+#include "commands.h"
+
 
 /*
  * 1000 series
@@ -58,11 +61,6 @@ static void iwl1000_set_ct_threshold(struct iwl_priv *priv)
 /* NIC configuration for 1000 series */
 static void iwl1000_nic_config(struct iwl_priv *priv)
 {
-        /* set CSR_HW_CONFIG_REG for uCode use */
-        iwl_set_bit(priv->trans, CSR_HW_IF_CONFIG_REG,
-                    CSR_HW_IF_CONFIG_REG_BIT_RADIO_SI |
-                    CSR_HW_IF_CONFIG_REG_BIT_MAC_SI);
-
         /* Setting digital SVR for 1000 card to 1.32V */
         /* locking is acquired in iwl_set_bits_mask_prph() function */
         iwl_set_bits_mask_prph(priv->trans, APMG_DIGITAL_SVR_REG,
@@ -170,16 +168,6 @@ static const struct iwl_sensitivity_ranges iwl1000_sensitivity = {
 
 static void iwl1000_hw_set_hw_params(struct iwl_priv *priv)
 {
-        priv->hw_params.ht40_channel =  BIT(IEEE80211_BAND_2GHZ);
-
-        priv->hw_params.tx_chains_num =
-                num_of_ant(priv->hw_params.valid_tx_ant);
-        if (priv->cfg->rx_with_siso_diversity)
-                priv->hw_params.rx_chains_num = 1;
-        else
-                priv->hw_params.rx_chains_num =
-                        num_of_ant(priv->hw_params.valid_rx_ant);
-
         iwl1000_set_ct_threshold(priv);
 
         /* Set initial sensitivity parameters */
@@ -189,17 +177,6 @@ static void iwl1000_hw_set_hw_params(struct iwl_priv *priv)
 struct iwl_lib_ops iwl1000_lib = {
         .set_hw_params = iwl1000_hw_set_hw_params,
         .nic_config = iwl1000_nic_config,
-        .eeprom_ops = {
-                .regulatory_bands = {
-                        EEPROM_REG_BAND_1_CHANNELS,
-                        EEPROM_REG_BAND_2_CHANNELS,
-                        EEPROM_REG_BAND_3_CHANNELS,
-                        EEPROM_REG_BAND_4_CHANNELS,
-                        EEPROM_REG_BAND_5_CHANNELS,
-                        EEPROM_REG_BAND_24_HT40_CHANNELS,
-                        EEPROM_REGULATORY_BAND_NO_HT40,
-                },
-        },
         .temperature = iwlagn_temperature,
 };
 
@@ -219,8 +196,6 @@ static void iwl2000_set_ct_threshold(struct iwl_priv *priv)
 /* NIC configuration for 2000 series */
 static void iwl2000_nic_config(struct iwl_priv *priv)
 {
-        iwl_rf_config(priv);
-
         iwl_set_bit(priv->trans, CSR_GP_DRIVER_REG,
                     CSR_GP_DRIVER_REG_BIT_RADIO_IQ_INVER);
 }
@@ -251,16 +226,6 @@ static const struct iwl_sensitivity_ranges iwl2000_sensitivity = {
 
 static void iwl2000_hw_set_hw_params(struct iwl_priv *priv)
 {
-        priv->hw_params.ht40_channel =  BIT(IEEE80211_BAND_2GHZ);
-
-        priv->hw_params.tx_chains_num =
-                num_of_ant(priv->hw_params.valid_tx_ant);
-        if (priv->cfg->rx_with_siso_diversity)
-                priv->hw_params.rx_chains_num = 1;
-        else
-                priv->hw_params.rx_chains_num =
-                        num_of_ant(priv->hw_params.valid_rx_ant);
-
         iwl2000_set_ct_threshold(priv);
 
         /* Set initial sensitivity parameters */
@@ -270,36 +235,12 @@ static void iwl2000_hw_set_hw_params(struct iwl_priv *priv)
 struct iwl_lib_ops iwl2000_lib = {
         .set_hw_params = iwl2000_hw_set_hw_params,
         .nic_config = iwl2000_nic_config,
-        .eeprom_ops = {
-                .regulatory_bands = {
-                        EEPROM_REG_BAND_1_CHANNELS,
-                        EEPROM_REG_BAND_2_CHANNELS,
-                        EEPROM_REG_BAND_3_CHANNELS,
-                        EEPROM_REG_BAND_4_CHANNELS,
-                        EEPROM_REG_BAND_5_CHANNELS,
-                        EEPROM_6000_REG_BAND_24_HT40_CHANNELS,
-                        EEPROM_REGULATORY_BAND_NO_HT40,
-                },
-                .enhanced_txpower = true,
-        },
         .temperature = iwlagn_temperature,
 };
 
 struct iwl_lib_ops iwl2030_lib = {
         .set_hw_params = iwl2000_hw_set_hw_params,
         .nic_config = iwl2000_nic_config,
-        .eeprom_ops = {
-                .regulatory_bands = {
-                        EEPROM_REG_BAND_1_CHANNELS,
-                        EEPROM_REG_BAND_2_CHANNELS,
-                        EEPROM_REG_BAND_3_CHANNELS,
-                        EEPROM_REG_BAND_4_CHANNELS,
-                        EEPROM_REG_BAND_5_CHANNELS,
-                        EEPROM_6000_REG_BAND_24_HT40_CHANNELS,
-                        EEPROM_REGULATORY_BAND_NO_HT40,
-                },
-                .enhanced_txpower = true,
-        },
         .temperature = iwlagn_temperature,
 };
 
@@ -309,19 +250,6 @@ struct iwl_lib_ops iwl2030_lib = {
  */
 
 /* NIC configuration for 5000 series */
-static void iwl5000_nic_config(struct iwl_priv *priv)
-{
-        iwl_rf_config(priv);
-
-        /* W/A : NIC is stuck in a reset state after Early PCIe power off
-         * (PCIe power is lost before PERST# is asserted),
-         * causing ME FW to lose ownership and not being able to obtain it back.
-         */
-        iwl_set_bits_mask_prph(priv->trans, APMG_PS_CTRL_REG,
-                                APMG_PS_CTRL_EARLY_PWR_OFF_RESET_DIS,
-                                ~APMG_PS_CTRL_EARLY_PWR_OFF_RESET_DIS);
-}
-
 static const struct iwl_sensitivity_ranges iwl5000_sensitivity = {
         .min_nrg_cck = 100,
         .auto_corr_min_ofdm = 90,
@@ -376,11 +304,9 @@ static struct iwl_sensitivity_ranges iwl5150_sensitivity = {
 static s32 iwl_temp_calib_to_offset(struct iwl_priv *priv)
 {
         u16 temperature, voltage;
-        __le16 *temp_calib = (__le16 *)iwl_eeprom_query_addr(priv,
-                                EEPROM_KELVIN_TEMPERATURE);
 
-        temperature = le16_to_cpu(temp_calib[0]);
-        voltage = le16_to_cpu(temp_calib[1]);
+        temperature = le16_to_cpu(priv->eeprom_data->kelvin_temperature);
+        voltage = le16_to_cpu(priv->eeprom_data->kelvin_voltage);
 
         /* offset = temp - volt / coeff */
         return (s32)(temperature -
@@ -404,14 +330,6 @@ static void iwl5000_set_ct_threshold(struct iwl_priv *priv)
 
 static void iwl5000_hw_set_hw_params(struct iwl_priv *priv)
 {
-        priv->hw_params.ht40_channel =  BIT(IEEE80211_BAND_2GHZ) |
-                                        BIT(IEEE80211_BAND_5GHZ);
-
-        priv->hw_params.tx_chains_num =
-                num_of_ant(priv->hw_params.valid_tx_ant);
-        priv->hw_params.rx_chains_num =
-                num_of_ant(priv->hw_params.valid_rx_ant);
-
         iwl5000_set_ct_threshold(priv);
 
         /* Set initial sensitivity parameters */
@@ -420,14 +338,6 @@ static void iwl5000_hw_set_hw_params(struct iwl_priv *priv)
 
 static void iwl5150_hw_set_hw_params(struct iwl_priv *priv)
 {
-        priv->hw_params.ht40_channel =  BIT(IEEE80211_BAND_2GHZ) |
-                                        BIT(IEEE80211_BAND_5GHZ);
-
-        priv->hw_params.tx_chains_num =
-                num_of_ant(priv->hw_params.valid_tx_ant);
-        priv->hw_params.rx_chains_num =
-                num_of_ant(priv->hw_params.valid_rx_ant);
-
         iwl5150_set_ct_threshold(priv);
 
         /* Set initial sensitivity parameters */
@@ -455,7 +365,6 @@ static int iwl5000_hw_channel_switch(struct iwl_priv *priv,
          */
         struct iwl_rxon_context *ctx = &priv->contexts[IWL_RXON_CTX_BSS];
         struct iwl5000_channel_switch_cmd cmd;
-        const struct iwl_channel_info *ch_info;
         u32 switch_time_in_usec, ucode_switch_time;
         u16 ch;
         u32 tsf_low;
@@ -505,14 +414,7 @@ static int iwl5000_hw_channel_switch(struct iwl_priv *priv,
         }
         IWL_DEBUG_11H(priv, "uCode time for the switch is 0x%x\n",
                       cmd.switch_time);
-        ch_info = iwl_get_channel_info(priv, priv->band, ch);
-        if (ch_info)
-                cmd.expect_beacon = is_channel_radar(ch_info);
-        else {
-                IWL_ERR(priv, "invalid channel switch from %u to %u\n",
-                        ctx->active.channel, ch);
-                return -EFAULT;
-        }
+        cmd.expect_beacon = ch_switch->channel->flags & IEEE80211_CHAN_RADAR;
 
         return iwl_dvm_send_cmd(priv, &hcmd);
 }
@@ -520,36 +422,12 @@ static int iwl5000_hw_channel_switch(struct iwl_priv *priv,
 struct iwl_lib_ops iwl5000_lib = {
         .set_hw_params = iwl5000_hw_set_hw_params,
         .set_channel_switch = iwl5000_hw_channel_switch,
-        .nic_config = iwl5000_nic_config,
-        .eeprom_ops = {
-                .regulatory_bands = {
-                        EEPROM_REG_BAND_1_CHANNELS,
-                        EEPROM_REG_BAND_2_CHANNELS,
-                        EEPROM_REG_BAND_3_CHANNELS,
-                        EEPROM_REG_BAND_4_CHANNELS,
-                        EEPROM_REG_BAND_5_CHANNELS,
-                        EEPROM_REG_BAND_24_HT40_CHANNELS,
-                        EEPROM_REG_BAND_52_HT40_CHANNELS
-                },
-        },
         .temperature = iwlagn_temperature,
 };
 
 struct iwl_lib_ops iwl5150_lib = {
         .set_hw_params = iwl5150_hw_set_hw_params,
         .set_channel_switch = iwl5000_hw_channel_switch,
-        .nic_config = iwl5000_nic_config,
-        .eeprom_ops = {
-                .regulatory_bands = {
-                        EEPROM_REG_BAND_1_CHANNELS,
-                        EEPROM_REG_BAND_2_CHANNELS,
-                        EEPROM_REG_BAND_3_CHANNELS,
-                        EEPROM_REG_BAND_4_CHANNELS,
-                        EEPROM_REG_BAND_5_CHANNELS,
-                        EEPROM_REG_BAND_24_HT40_CHANNELS,
-                        EEPROM_REG_BAND_52_HT40_CHANNELS
-                },
-        },
         .temperature = iwl5150_temperature,
 };
 
@@ -570,8 +448,6 @@ static void iwl6000_set_ct_threshold(struct iwl_priv *priv)
 /* NIC configuration for 6000 series */
 static void iwl6000_nic_config(struct iwl_priv *priv)
 {
-        iwl_rf_config(priv);
-
         switch (priv->cfg->device_family) {
         case IWL_DEVICE_FAMILY_6005:
         case IWL_DEVICE_FAMILY_6030:
@@ -584,13 +460,13 @@ static void iwl6000_nic_config(struct iwl_priv *priv)
                 break;
         case IWL_DEVICE_FAMILY_6050:
                 /* Indicate calibration version to uCode. */
-                if (iwl_eeprom_calib_version(priv) >= 6)
+                if (priv->eeprom_data->calib_version >= 6)
                         iwl_set_bit(priv->trans, CSR_GP_DRIVER_REG,
                                         CSR_GP_DRIVER_REG_BIT_CALIB_VERSION6);
                 break;
         case IWL_DEVICE_FAMILY_6150:
                 /* Indicate calibration version to uCode. */
-                if (iwl_eeprom_calib_version(priv) >= 6)
+                if (priv->eeprom_data->calib_version >= 6)
                         iwl_set_bit(priv->trans, CSR_GP_DRIVER_REG,
                                         CSR_GP_DRIVER_REG_BIT_CALIB_VERSION6);
                 iwl_set_bit(priv->trans, CSR_GP_DRIVER_REG,
@@ -627,17 +503,6 @@ static const struct iwl_sensitivity_ranges iwl6000_sensitivity = {
 
 static void iwl6000_hw_set_hw_params(struct iwl_priv *priv)
 {
-        priv->hw_params.ht40_channel =  BIT(IEEE80211_BAND_2GHZ) |
-                                        BIT(IEEE80211_BAND_5GHZ);
-
-        priv->hw_params.tx_chains_num =
-                num_of_ant(priv->hw_params.valid_tx_ant);
-        if (priv->cfg->rx_with_siso_diversity)
-                priv->hw_params.rx_chains_num = 1;
-        else
-                priv->hw_params.rx_chains_num =
-                        num_of_ant(priv->hw_params.valid_rx_ant);
-
         iwl6000_set_ct_threshold(priv);
 
         /* Set initial sensitivity parameters */
@@ -654,7 +519,6 @@ static int iwl6000_hw_channel_switch(struct iwl_priv *priv,
          */
         struct iwl_rxon_context *ctx = &priv->contexts[IWL_RXON_CTX_BSS];
         struct iwl6000_channel_switch_cmd cmd;
-        const struct iwl_channel_info *ch_info;
         u32 switch_time_in_usec, ucode_switch_time;
         u16 ch;
         u32 tsf_low;
@@ -704,14 +568,7 @@ static int iwl6000_hw_channel_switch(struct iwl_priv *priv,
         }
         IWL_DEBUG_11H(priv, "uCode time for the switch is 0x%x\n",
                       cmd.switch_time);
-        ch_info = iwl_get_channel_info(priv, priv->band, ch);
-        if (ch_info)
-                cmd.expect_beacon = is_channel_radar(ch_info);
-        else {
-                IWL_ERR(priv, "invalid channel switch from %u to %u\n",
-                        ctx->active.channel, ch);
-                return -EFAULT;
-        }
+        cmd.expect_beacon = ch_switch->channel->flags & IEEE80211_CHAN_RADAR;
 
         return iwl_dvm_send_cmd(priv, &hcmd);
 }
@@ -720,18 +577,6 @@ struct iwl_lib_ops iwl6000_lib = {
         .set_hw_params = iwl6000_hw_set_hw_params,
         .set_channel_switch = iwl6000_hw_channel_switch,
         .nic_config = iwl6000_nic_config,
-        .eeprom_ops = {
-                .regulatory_bands = {
-                        EEPROM_REG_BAND_1_CHANNELS,
-                        EEPROM_REG_BAND_2_CHANNELS,
-                        EEPROM_REG_BAND_3_CHANNELS,
-                        EEPROM_REG_BAND_4_CHANNELS,
-                        EEPROM_REG_BAND_5_CHANNELS,
-                        EEPROM_6000_REG_BAND_24_HT40_CHANNELS,
-                        EEPROM_REG_BAND_52_HT40_CHANNELS
-                },
-                .enhanced_txpower = true,
-        },
         .temperature = iwlagn_temperature,
 };
 
@@ -739,17 +584,5 @@ struct iwl_lib_ops iwl6030_lib = {
         .set_hw_params = iwl6000_hw_set_hw_params,
         .set_channel_switch = iwl6000_hw_channel_switch,
         .nic_config = iwl6000_nic_config,
-        .eeprom_ops = {
-                .regulatory_bands = {
-                        EEPROM_REG_BAND_1_CHANNELS,
-                        EEPROM_REG_BAND_2_CHANNELS,
-                        EEPROM_REG_BAND_3_CHANNELS,
-                        EEPROM_REG_BAND_4_CHANNELS,
-                        EEPROM_REG_BAND_5_CHANNELS,
-                        EEPROM_6000_REG_BAND_24_HT40_CHANNELS,
-                        EEPROM_REG_BAND_52_HT40_CHANNELS
-                },
-                .enhanced_txpower = true,
-        },
         .temperature = iwlagn_temperature,
 };
diff --git a/drivers/net/wireless/iwlwifi/iwl-led.c b/drivers/net/wireless/iwlwifi/dvm/led.c
index 47000419f91..bf479f70909 100644
--- a/drivers/net/wireless/iwlwifi/iwl-led.c
+++ b/drivers/net/wireless/iwlwifi/dvm/led.c
@@ -34,12 +34,11 @@
 #include <net/mac80211.h>
 #include <linux/etherdevice.h>
 #include <asm/unaligned.h>
-
-#include "iwl-dev.h"
-#include "iwl-agn.h"
 #include "iwl-io.h"
 #include "iwl-trans.h"
 #include "iwl-modparams.h"
+#include "dev.h"
+#include "agn.h"
 
 /* Throughput           OFF time(ms)    ON time (ms)
  *      >300                    25              25
diff --git a/drivers/net/wireless/iwlwifi/iwl-led.h b/drivers/net/wireless/iwlwifi/dvm/led.h
index b02a853103d..b02a853103d 100644
--- a/drivers/net/wireless/iwlwifi/iwl-led.h
+++ b/drivers/net/wireless/iwlwifi/dvm/led.h
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-lib.c b/drivers/net/wireless/iwlwifi/dvm/lib.c
index e55ec6c8a92..207ae91a83a 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-lib.c
+++ b/drivers/net/wireless/iwlwifi/dvm/lib.c
@@ -33,13 +33,14 @@
 #include <linux/sched.h>
 #include <net/mac80211.h>
 
-#include "iwl-dev.h"
 #include "iwl-io.h"
 #include "iwl-agn-hw.h"
-#include "iwl-agn.h"
 #include "iwl-trans.h"
 #include "iwl-modparams.h"
 
+#include "dev.h"
+#include "agn.h"
+
 int iwlagn_hw_valid_rtc_data_addr(u32 addr)
 {
         return (addr >= IWLAGN_RTC_DATA_LOWER_BOUND) &&
@@ -58,8 +59,7 @@ int iwlagn_send_tx_power(struct iwl_priv *priv)
         /* half dBm need to multiply */
         tx_power_cmd.global_lmt = (s8)(2 * priv->tx_power_user_lmt);
 
-        if (priv->tx_power_lmt_in_half_dbm &&
-            priv->tx_power_lmt_in_half_dbm < tx_power_cmd.global_lmt) {
+        if (tx_power_cmd.global_lmt > priv->eeprom_data->max_tx_pwr_half_dbm) {
                 /*
                  * For the newer devices which using enhanced/extend tx power
                  * table in EEPROM, the format is in half dBm. driver need to
@@ -71,7 +71,8 @@ int iwlagn_send_tx_power(struct iwl_priv *priv)
                  * "tx_power_user_lmt" is higher than EEPROM value (in
                  * half-dBm format), lower the tx power based on EEPROM
                  */
-                tx_power_cmd.global_lmt = priv->tx_power_lmt_in_half_dbm;
+                tx_power_cmd.global_lmt =
+                        priv->eeprom_data->max_tx_pwr_half_dbm;
         }
         tx_power_cmd.flags = IWLAGN_TX_POWER_NO_CLOSED;
         tx_power_cmd.srv_chan_lmt = IWLAGN_TX_POWER_AUTO;
@@ -159,7 +160,7 @@ int iwlagn_txfifo_flush(struct iwl_priv *priv, u16 flush_control)
                                 IWL_PAN_SCD_BK_MSK | IWL_PAN_SCD_MGMT_MSK |
                                 IWL_PAN_SCD_MULTICAST_MSK;
 
-        if (priv->hw_params.sku & EEPROM_SKU_CAP_11N_ENABLE)
+        if (priv->eeprom_data->sku & EEPROM_SKU_CAP_11N_ENABLE)
                 flush_cmd.fifo_control |= IWL_AGG_TX_QUEUE_MSK;
 
         IWL_DEBUG_INFO(priv, "fifo queue control: 0X%x\n",
@@ -617,6 +618,11 @@ static bool iwlagn_fill_txpower_mode(struct iwl_priv *priv,
         struct iwl_rxon_context *ctx = &priv->contexts[IWL_RXON_CTX_BSS];
         int ave_rssi;
 
+        if (!ctx->vif || (ctx->vif->type != NL80211_IFTYPE_STATION)) {
+                IWL_DEBUG_INFO(priv, "BSS ctx not active or not in sta mode\n");
+                return false;
+        }
+
         ave_rssi = ieee80211_ave_rssi(ctx->vif);
         if (!ave_rssi) {
                 /* no rssi data, no changes to reduce tx power */
@@ -818,7 +824,7 @@ void iwlagn_set_rxon_chain(struct iwl_priv *priv, struct iwl_rxon_context *ctx)
         if (priv->chain_noise_data.active_chains)
                 active_chains = priv->chain_noise_data.active_chains;
         else
-                active_chains = priv->hw_params.valid_rx_ant;
+                active_chains = priv->eeprom_data->valid_rx_ant;
 
         if (priv->cfg->bt_params &&
             priv->cfg->bt_params->advanced_bt_coexist &&
@@ -1259,7 +1265,7 @@ int iwl_dvm_send_cmd(struct iwl_priv *priv, struct iwl_host_cmd *cmd)
          * the mutex, this ensures we don't try to send two
          * (or more) synchronous commands at a time.
          */
-        if (cmd->flags & CMD_SYNC)
+        if (!(cmd->flags & CMD_ASYNC))
                 lockdep_assert_held(&priv->mutex);
 
         if (priv->ucode_owner == IWL_OWNERSHIP_TM &&
diff --git a/drivers/net/wireless/iwlwifi/iwl-mac80211.c b/drivers/net/wireless/iwlwifi/dvm/mac80211.c
index 013680332f0..a5f7bce9632 100644
--- a/drivers/net/wireless/iwlwifi/iwl-mac80211.c
+++ b/drivers/net/wireless/iwlwifi/dvm/mac80211.c
@@ -38,19 +38,20 @@
 #include <linux/etherdevice.h>
 #include <linux/if_arp.h>
 
+#include <net/ieee80211_radiotap.h>
 #include <net/mac80211.h>
 
 #include <asm/div64.h>
 
-#include "iwl-eeprom.h"
-#include "iwl-dev.h"
 #include "iwl-io.h"
-#include "iwl-agn-calib.h"
-#include "iwl-agn.h"
 #include "iwl-trans.h"
 #include "iwl-op-mode.h"
 #include "iwl-modparams.h"
 
+#include "dev.h"
+#include "calib.h"
+#include "agn.h"
+
 /*****************************************************************************
  *
  * mac80211 entry point functions
@@ -154,6 +155,7 @@ int iwlagn_mac_setup_register(struct iwl_priv *priv,
                     IEEE80211_HW_SCAN_WHILE_IDLE;
 
         hw->offchannel_tx_hw_queue = IWL_AUX_QUEUE;
+        hw->radiotap_mcs_details |= IEEE80211_RADIOTAP_MCS_HAVE_FMT;
 
         /*
          * Including the following line will crash some AP's.  This
@@ -162,7 +164,7 @@ int iwlagn_mac_setup_register(struct iwl_priv *priv,
         hw->max_tx_aggregation_subframes = LINK_QUAL_AGG_FRAME_LIMIT_DEF;
          */
 
-        if (priv->hw_params.sku & EEPROM_SKU_CAP_11N_ENABLE)
+        if (priv->eeprom_data->sku & EEPROM_SKU_CAP_11N_ENABLE)
                 hw->flags |= IEEE80211_HW_SUPPORTS_DYNAMIC_SMPS |
                              IEEE80211_HW_SUPPORTS_STATIC_SMPS;
 
@@ -237,12 +239,12 @@ int iwlagn_mac_setup_register(struct iwl_priv *priv,
 
         hw->max_listen_interval = IWL_CONN_MAX_LISTEN_INTERVAL;
 
-        if (priv->bands[IEEE80211_BAND_2GHZ].n_channels)
+        if (priv->eeprom_data->bands[IEEE80211_BAND_2GHZ].n_channels)
                 priv->hw->wiphy->bands[IEEE80211_BAND_2GHZ] =
-                        &priv->bands[IEEE80211_BAND_2GHZ];
-        if (priv->bands[IEEE80211_BAND_5GHZ].n_channels)
+                        &priv->eeprom_data->bands[IEEE80211_BAND_2GHZ];
+        if (priv->eeprom_data->bands[IEEE80211_BAND_5GHZ].n_channels)
                 priv->hw->wiphy->bands[IEEE80211_BAND_5GHZ] =
-                        &priv->bands[IEEE80211_BAND_5GHZ];
+                        &priv->eeprom_data->bands[IEEE80211_BAND_5GHZ];
 
         hw->wiphy->hw_version = priv->trans->hw_id;
 
@@ -341,7 +343,7 @@ static int iwlagn_mac_start(struct ieee80211_hw *hw)
         return 0;
 }
 
-void iwlagn_mac_stop(struct ieee80211_hw *hw)
+static void iwlagn_mac_stop(struct ieee80211_hw *hw)
 {
         struct iwl_priv *priv = IWL_MAC80211_GET_DVM(hw);
 
@@ -369,9 +371,9 @@ void iwlagn_mac_stop(struct ieee80211_hw *hw)
         IWL_DEBUG_MAC80211(priv, "leave\n");
 }
 
-void iwlagn_mac_set_rekey_data(struct ieee80211_hw *hw,
-                               struct ieee80211_vif *vif,
-                               struct cfg80211_gtk_rekey_data *data)
+static void iwlagn_mac_set_rekey_data(struct ieee80211_hw *hw,
+                                      struct ieee80211_vif *vif,
+                                      struct cfg80211_gtk_rekey_data *data)
 {
         struct iwl_priv *priv = IWL_MAC80211_GET_DVM(hw);
 
@@ -397,7 +399,8 @@ void iwlagn_mac_set_rekey_data(struct ieee80211_hw *hw,
 
 #ifdef CONFIG_PM_SLEEP
 
-int iwlagn_mac_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)
+static int iwlagn_mac_suspend(struct ieee80211_hw *hw,
+                              struct cfg80211_wowlan *wowlan)
 {
         struct iwl_priv *priv = IWL_MAC80211_GET_DVM(hw);
         struct iwl_rxon_context *ctx = &priv->contexts[IWL_RXON_CTX_BSS];
@@ -420,8 +423,6 @@ int iwlagn_mac_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)
         if (ret)
                 goto error;
 
-        device_set_wakeup_enable(priv->trans->dev, true);
-
         iwl_trans_wowlan_suspend(priv->trans);
 
         goto out;
@@ -475,7 +476,7 @@ static int iwlagn_mac_resume(struct ieee80211_hw *hw)
                         }
 
                         if (priv->wowlan_sram)
-                                _iwl_read_targ_mem_words(
+                                _iwl_read_targ_mem_dwords(
                                       priv->trans, 0x800000,
                                       priv->wowlan_sram,
                                       img->sec[IWL_UCODE_SECTION_DATA].len / 4);
@@ -488,8 +489,6 @@ static int iwlagn_mac_resume(struct ieee80211_hw *hw)
 
         priv->wowlan = false;
 
-        device_set_wakeup_enable(priv->trans->dev, false);
-
         iwlagn_prepare_restart(priv);
 
         memset((void *)&ctx->active, 0, sizeof(ctx->active));
@@ -504,9 +503,15 @@ static int iwlagn_mac_resume(struct ieee80211_hw *hw)
         return 1;
 }
 
+static void iwlagn_mac_set_wakeup(struct ieee80211_hw *hw, bool enabled)
+{
+        struct iwl_priv *priv = IWL_MAC80211_GET_DVM(hw);
+
+        device_set_wakeup_enable(priv->trans->dev, enabled);
+}
 #endif
 
-void iwlagn_mac_tx(struct ieee80211_hw *hw, struct sk_buff *skb)
+static void iwlagn_mac_tx(struct ieee80211_hw *hw, struct sk_buff *skb)
 {
         struct iwl_priv *priv = IWL_MAC80211_GET_DVM(hw);
 
@@ -517,21 +522,21 @@ void iwlagn_mac_tx(struct ieee80211_hw *hw, struct sk_buff *skb)
                 dev_kfree_skb_any(skb);
 }
 
-void iwlagn_mac_update_tkip_key(struct ieee80211_hw *hw,
-                                struct ieee80211_vif *vif,
-                                struct ieee80211_key_conf *keyconf,
-                                struct ieee80211_sta *sta,
-                                u32 iv32, u16 *phase1key)
+static void iwlagn_mac_update_tkip_key(struct ieee80211_hw *hw,
+                                       struct ieee80211_vif *vif,
+                                       struct ieee80211_key_conf *keyconf,
+                                       struct ieee80211_sta *sta,
+                                       u32 iv32, u16 *phase1key)
 {
         struct iwl_priv *priv = IWL_MAC80211_GET_DVM(hw);
 
         iwl_update_tkip_key(priv, vif, keyconf, sta, iv32, phase1key);
 }
 
-int iwlagn_mac_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
-                       struct ieee80211_vif *vif,
-                       struct ieee80211_sta *sta,
-                       struct ieee80211_key_conf *key)
+static int iwlagn_mac_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
+                              struct ieee80211_vif *vif,
+                              struct ieee80211_sta *sta,
+                              struct ieee80211_key_conf *key)
 {
         struct iwl_priv *priv = IWL_MAC80211_GET_DVM(hw);
         struct iwl_vif_priv *vif_priv = (void *)vif->drv_priv;
@@ -631,11 +636,11 @@ int iwlagn_mac_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
         return ret;
 }
 
-int iwlagn_mac_ampdu_action(struct ieee80211_hw *hw,
-                            struct ieee80211_vif *vif,
-                            enum ieee80211_ampdu_mlme_action action,
-                            struct ieee80211_sta *sta, u16 tid, u16 *ssn,
-                            u8 buf_size)
+static int iwlagn_mac_ampdu_action(struct ieee80211_hw *hw,
+                                   struct ieee80211_vif *vif,
+                                   enum ieee80211_ampdu_mlme_action action,
+                                   struct ieee80211_sta *sta, u16 tid, u16 *ssn,
+                                   u8 buf_size)
 {
         struct iwl_priv *priv = IWL_MAC80211_GET_DVM(hw);
         int ret = -EINVAL;
@@ -644,7 +649,7 @@ int iwlagn_mac_ampdu_action(struct ieee80211_hw *hw,
         IWL_DEBUG_HT(priv, "A-MPDU action on addr %pM tid %d\n",
                      sta->addr, tid);
 
-        if (!(priv->hw_params.sku & EEPROM_SKU_CAP_11N_ENABLE))
+        if (!(priv->eeprom_data->sku & EEPROM_SKU_CAP_11N_ENABLE))
                 return -EACCES;
 
         IWL_DEBUG_MAC80211(priv, "enter\n");
@@ -662,7 +667,7 @@ int iwlagn_mac_ampdu_action(struct ieee80211_hw *hw,
                 ret = iwl_sta_rx_agg_stop(priv, sta, tid);
                 break;
         case IEEE80211_AMPDU_TX_START:
-                if (!priv->trans->ops->tx_agg_setup)
+                if (!priv->trans->ops->txq_enable)
                         break;
                 if (iwlwifi_mod_params.disable_11n & IWL_DISABLE_HT_TXAGG)
                         break;
@@ -757,11 +762,11 @@ static int iwlagn_mac_sta_remove(struct ieee80211_hw *hw,
         return ret;
 }
 
-int iwlagn_mac_sta_state(struct ieee80211_hw *hw,
-                         struct ieee80211_vif *vif,
-                         struct ieee80211_sta *sta,
-                         enum ieee80211_sta_state old_state,
-                         enum ieee80211_sta_state new_state)
+static int iwlagn_mac_sta_state(struct ieee80211_hw *hw,
+                                struct ieee80211_vif *vif,
+                                struct ieee80211_sta *sta,
+                                enum ieee80211_sta_state old_state,
+                                enum ieee80211_sta_state new_state)
 {
         struct iwl_priv *priv = IWL_MAC80211_GET_DVM(hw);
         struct iwl_vif_priv *vif_priv = (void *)vif->drv_priv;
@@ -852,11 +857,10 @@ int iwlagn_mac_sta_state(struct ieee80211_hw *hw,
         return ret;
 }
 
-void iwlagn_mac_channel_switch(struct ieee80211_hw *hw,
-                               struct ieee80211_channel_switch *ch_switch)
+static void iwlagn_mac_channel_switch(struct ieee80211_hw *hw,
+                                      struct ieee80211_channel_switch *ch_switch)
 {
         struct iwl_priv *priv = IWL_MAC80211_GET_DVM(hw);
-        const struct iwl_channel_info *ch_info;
         struct ieee80211_conf *conf = &hw->conf;
         struct ieee80211_channel *channel = ch_switch->channel;
         struct iwl_ht_config *ht_conf = &priv->current_ht_config;
@@ -893,12 +897,6 @@ void iwlagn_mac_channel_switch(struct ieee80211_hw *hw,
         if (le16_to_cpu(ctx->active.channel) == ch)
                 goto out;
 
-        ch_info = iwl_get_channel_info(priv, channel->band, ch);
-        if (!is_channel_valid(ch_info)) {
-                IWL_DEBUG_MAC80211(priv, "invalid channel\n");
-                goto out;
-        }
-
         priv->current_ht_config.smps = conf->smps_mode;
 
         /* Configure HT40 channels */
@@ -947,10 +945,10 @@ void iwl_chswitch_done(struct iwl_priv *priv, bool is_success)
                 ieee80211_chswitch_done(ctx->vif, is_success);
 }
 
-void iwlagn_configure_filter(struct ieee80211_hw *hw,
-                             unsigned int changed_flags,
-                             unsigned int *total_flags,
-                             u64 multicast)
+static void iwlagn_configure_filter(struct ieee80211_hw *hw,
+                                    unsigned int changed_flags,
+                                    unsigned int *total_flags,
+                                    u64 multicast)
 {
         struct iwl_priv *priv = IWL_MAC80211_GET_DVM(hw);
         __le32 filter_or = 0, filter_nand = 0;
@@ -997,7 +995,7 @@ void iwlagn_configure_filter(struct ieee80211_hw *hw,
                         FIF_BCN_PRBRESP_PROMISC | FIF_CONTROL;
 }
 
-void iwlagn_mac_flush(struct ieee80211_hw *hw, bool drop)
+static void iwlagn_mac_flush(struct ieee80211_hw *hw, bool drop)
 {
         struct iwl_priv *priv = IWL_MAC80211_GET_DVM(hw);
 
@@ -1050,8 +1048,18 @@ static int iwlagn_mac_remain_on_channel(struct ieee80211_hw *hw,
         mutex_lock(&priv->mutex);
 
         if (test_bit(STATUS_SCAN_HW, &priv->status)) {
-                err = -EBUSY;
-                goto out;
+                /* mac80211 should not scan while ROC or ROC while scanning */
+                if (WARN_ON_ONCE(priv->scan_type != IWL_SCAN_RADIO_RESET)) {
+                        err = -EBUSY;
+                        goto out;
+                }
+
+                iwl_scan_cancel_timeout(priv, 100);
+
+                if (test_bit(STATUS_SCAN_HW, &priv->status)) {
+                        err = -EBUSY;
+                        goto out;
+                }
         }
 
         priv->hw_roc_channel = channel;
@@ -1124,7 +1132,7 @@ static int iwlagn_mac_remain_on_channel(struct ieee80211_hw *hw,
         return err;
 }
 
-int iwlagn_mac_cancel_remain_on_channel(struct ieee80211_hw *hw)
+static int iwlagn_mac_cancel_remain_on_channel(struct ieee80211_hw *hw)
 {
         struct iwl_priv *priv = IWL_MAC80211_GET_DVM(hw);
 
@@ -1141,8 +1149,8 @@ int iwlagn_mac_cancel_remain_on_channel(struct ieee80211_hw *hw)
         return 0;
 }
 
-void iwlagn_mac_rssi_callback(struct ieee80211_hw *hw,
-                              enum ieee80211_rssi_event rssi_event)
+static void iwlagn_mac_rssi_callback(struct ieee80211_hw *hw,
+                                     enum ieee80211_rssi_event rssi_event)
 {
         struct iwl_priv *priv = IWL_MAC80211_GET_DVM(hw);
 
@@ -1166,8 +1174,8 @@ void iwlagn_mac_rssi_callback(struct ieee80211_hw *hw,
         IWL_DEBUG_MAC80211(priv, "leave\n");
 }
 
-int iwlagn_mac_set_tim(struct ieee80211_hw *hw,
-                       struct ieee80211_sta *sta, bool set)
+static int iwlagn_mac_set_tim(struct ieee80211_hw *hw,
+                              struct ieee80211_sta *sta, bool set)
 {
         struct iwl_priv *priv = IWL_MAC80211_GET_DVM(hw);
 
@@ -1176,9 +1184,9 @@ int iwlagn_mac_set_tim(struct ieee80211_hw *hw,
         return 0;
 }
 
-int iwlagn_mac_conf_tx(struct ieee80211_hw *hw,
-                       struct ieee80211_vif *vif, u16 queue,
-                       const struct ieee80211_tx_queue_params *params)
+static int iwlagn_mac_conf_tx(struct ieee80211_hw *hw,
+                              struct ieee80211_vif *vif, u16 queue,
+                              const struct ieee80211_tx_queue_params *params)
 {
         struct iwl_priv *priv = IWL_MAC80211_GET_DVM(hw);
         struct iwl_vif_priv *vif_priv = (void *)vif->drv_priv;
@@ -1220,7 +1228,7 @@ int iwlagn_mac_conf_tx(struct ieee80211_hw *hw,
         return 0;
 }
 
-int iwlagn_mac_tx_last_beacon(struct ieee80211_hw *hw)
+static int iwlagn_mac_tx_last_beacon(struct ieee80211_hw *hw)
 {
         struct iwl_priv *priv = IWL_MAC80211_GET_DVM(hw);
 
@@ -1236,7 +1244,8 @@ static int iwl_set_mode(struct iwl_priv *priv, struct iwl_rxon_context *ctx)
         return iwlagn_commit_rxon(priv, ctx);
 }
 
-int iwl_setup_interface(struct iwl_priv *priv, struct iwl_rxon_context *ctx)
+static int iwl_setup_interface(struct iwl_priv *priv,
+                               struct iwl_rxon_context *ctx)
 {
         struct ieee80211_vif *vif = ctx->vif;
         int err, ac;
@@ -1356,9 +1365,9 @@ static int iwlagn_mac_add_interface(struct ieee80211_hw *hw,
         return err;
 }
 
-void iwl_teardown_interface(struct iwl_priv *priv,
-                            struct ieee80211_vif *vif,
-                            bool mode_change)
+static void iwl_teardown_interface(struct iwl_priv *priv,
+                                   struct ieee80211_vif *vif,
+                                   bool mode_change)
 {
         struct iwl_rxon_context *ctx = iwl_rxon_ctx_from_vif(vif);
 
@@ -1414,13 +1423,11 @@ static void iwlagn_mac_remove_interface(struct ieee80211_hw *hw,
 }
 
 static int iwlagn_mac_change_interface(struct ieee80211_hw *hw,
-                                struct ieee80211_vif *vif,
-                                enum nl80211_iftype newtype, bool newp2p)
+                                       struct ieee80211_vif *vif,
+                                       enum nl80211_iftype newtype, bool newp2p)
 {
         struct iwl_priv *priv = IWL_MAC80211_GET_DVM(hw);
-        struct iwl_rxon_context *ctx = iwl_rxon_ctx_from_vif(vif);
-        struct iwl_rxon_context *bss_ctx = &priv->contexts[IWL_RXON_CTX_BSS];
-        struct iwl_rxon_context *tmp;
+        struct iwl_rxon_context *ctx, *tmp;
         enum nl80211_iftype newviftype = newtype;
         u32 interface_modes;
         int err;
@@ -1431,6 +1438,18 @@ static int iwlagn_mac_change_interface(struct ieee80211_hw *hw,
 
         mutex_lock(&priv->mutex);
 
+        ctx = iwl_rxon_ctx_from_vif(vif);
+
+        /*
+         * To simplify this code, only support changes on the
+         * BSS context. The PAN context is usually reassigned
+         * by creating/removing P2P interfaces anyway.
+         */
+        if (ctx->ctxid != IWL_RXON_CTX_BSS) {
+                err = -EBUSY;
+                goto out;
+        }
+
         if (!ctx->vif || !iwl_is_ready_rf(priv)) {
                 /*
                  * Huh? But wait ... this can maybe happen when
@@ -1440,32 +1459,19 @@ static int iwlagn_mac_change_interface(struct ieee80211_hw *hw,
                 goto out;
         }
 
+        /* Check if the switch is supported in the same context */
         interface_modes = ctx->interface_modes | ctx->exclusive_interface_modes;
-
         if (!(interface_modes & BIT(newtype))) {
                 err = -EBUSY;
                 goto out;
         }
 
-        /*
-         * Refuse a change that should be done by moving from the PAN
-         * context to the BSS context instead, if the BSS context is
-         * available and can support the new interface type.
-         */
-        if (ctx->ctxid == IWL_RXON_CTX_PAN && !bss_ctx->vif &&
-            (bss_ctx->interface_modes & BIT(newtype) ||
-             bss_ctx->exclusive_interface_modes & BIT(newtype))) {
-                BUILD_BUG_ON(NUM_IWL_RXON_CTX != 2);
-                err = -EBUSY;
-                goto out;
-        }
-
         if (ctx->exclusive_interface_modes & BIT(newtype)) {
                 for_each_context(priv, tmp) {
                         if (ctx == tmp)
                                 continue;
 
-                        if (!tmp->vif)
+                        if (!tmp->is_active)
                                 continue;
 
                         /*
@@ -1499,9 +1505,9 @@ static int iwlagn_mac_change_interface(struct ieee80211_hw *hw,
         return err;
 }
 
-int iwlagn_mac_hw_scan(struct ieee80211_hw *hw,
-                       struct ieee80211_vif *vif,
-                       struct cfg80211_scan_request *req)
+static int iwlagn_mac_hw_scan(struct ieee80211_hw *hw,
+                              struct ieee80211_vif *vif,
+                              struct cfg80211_scan_request *req)
 {
         struct iwl_priv *priv = IWL_MAC80211_GET_DVM(hw);
         int ret;
@@ -1556,10 +1562,10 @@ static void iwl_sta_modify_ps_wake(struct iwl_priv *priv, int sta_id)
         iwl_send_add_sta(priv, &cmd, CMD_ASYNC);
 }
 
-void iwlagn_mac_sta_notify(struct ieee80211_hw *hw,
-                           struct ieee80211_vif *vif,
-                           enum sta_notify_cmd cmd,
-                           struct ieee80211_sta *sta)
+static void iwlagn_mac_sta_notify(struct ieee80211_hw *hw,
+                                  struct ieee80211_vif *vif,
+                                  enum sta_notify_cmd cmd,
+                                  struct ieee80211_sta *sta)
 {
         struct iwl_priv *priv = IWL_MAC80211_GET_DVM(hw);
         struct iwl_station_priv *sta_priv = (void *)sta->drv_priv;
@@ -1596,6 +1602,7 @@ struct ieee80211_ops iwlagn_hw_ops = {
 #ifdef CONFIG_PM_SLEEP
         .suspend = iwlagn_mac_suspend,
         .resume = iwlagn_mac_resume,
+        .set_wakeup = iwlagn_mac_set_wakeup,
 #endif
         .add_interface = iwlagn_mac_add_interface,
         .remove_interface = iwlagn_mac_remove_interface,
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/dvm/main.c
index ec36e2b020b..abfd7916bde 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn.c
+++ b/drivers/net/wireless/iwlwifi/dvm/main.c
@@ -44,15 +44,19 @@
 
 #include <asm/div64.h>
 
-#include "iwl-eeprom.h"
-#include "iwl-dev.h"
+#include "iwl-eeprom-read.h"
+#include "iwl-eeprom-parse.h"
 #include "iwl-io.h"
-#include "iwl-agn-calib.h"
-#include "iwl-agn.h"
 #include "iwl-trans.h"
 #include "iwl-op-mode.h"
 #include "iwl-drv.h"
 #include "iwl-modparams.h"
+#include "iwl-prph.h"
+
+#include "dev.h"
+#include "calib.h"
+#include "agn.h"
+
 
 /******************************************************************************
  *
@@ -78,7 +82,8 @@ MODULE_DESCRIPTION(DRV_DESCRIPTION);
 MODULE_VERSION(DRV_VERSION);
 MODULE_AUTHOR(DRV_COPYRIGHT " " DRV_AUTHOR);
 MODULE_LICENSE("GPL");
-MODULE_ALIAS("iwlagn");
+
+static const struct iwl_op_mode_ops iwl_dvm_ops;
 
 void iwl_update_chain_flags(struct iwl_priv *priv)
 {
@@ -180,7 +185,7 @@ int iwlagn_send_beacon_cmd(struct iwl_priv *priv)
                 rate = info->control.rates[0].idx;
 
         priv->mgmt_tx_ant = iwl_toggle_tx_ant(priv, priv->mgmt_tx_ant,
-                                              priv->hw_params.valid_tx_ant);
+                                              priv->eeprom_data->valid_tx_ant);
         rate_flags = iwl_ant_idx_to_flags(priv->mgmt_tx_ant);
 
         /* In mac80211, rates for 5 GHz start at 0 */
@@ -403,7 +408,7 @@ static void iwl_continuous_event_trace(struct iwl_priv *priv)
 
         base = priv->device_pointers.log_event_table;
         if (iwlagn_hw_valid_rtc_data_addr(base)) {
-                iwl_read_targ_mem_words(priv->trans, base, &read, sizeof(read));
+                iwl_read_targ_mem_bytes(priv->trans, base, &read, sizeof(read));
                 capacity = read.capacity;
                 mode = read.mode;
                 num_wraps = read.wrap_counter;
@@ -578,7 +583,7 @@ static const u8 iwlagn_pan_ac_to_queue[] = {
         7, 6, 5, 4,
 };
 
-void iwl_init_context(struct iwl_priv *priv, u32 ucode_flags)
+static void iwl_init_context(struct iwl_priv *priv, u32 ucode_flags)
 {
         int i;
 
@@ -645,7 +650,7 @@ void iwl_init_context(struct iwl_priv *priv, u32 ucode_flags)
         BUILD_BUG_ON(NUM_IWL_RXON_CTX != 2);
 }
 
-void iwl_rf_kill_ct_config(struct iwl_priv *priv)
+static void iwl_rf_kill_ct_config(struct iwl_priv *priv)
 {
         struct iwl_ct_kill_config cmd;
         struct iwl_ct_kill_throttling_config adv_cmd;
@@ -726,7 +731,7 @@ static int iwlagn_send_tx_ant_config(struct iwl_priv *priv, u8 valid_tx_ant)
         }
 }
 
-void iwl_send_bt_config(struct iwl_priv *priv)
+static void iwl_send_bt_config(struct iwl_priv *priv)
 {
         struct iwl_bt_cmd bt_cmd = {
                 .lead_time = BT_LEAD_TIME_DEF,
@@ -814,7 +819,7 @@ int iwl_alive_start(struct iwl_priv *priv)
         ieee80211_wake_queues(priv->hw);
 
         /* Configure Tx antenna selection based on H/W config */
-        iwlagn_send_tx_ant_config(priv, priv->hw_params.valid_tx_ant);
+        iwlagn_send_tx_ant_config(priv, priv->eeprom_data->valid_tx_ant);
 
         if (iwl_is_associated_ctx(ctx) && !priv->wowlan) {
                 struct iwl_rxon_cmd *active_rxon =
@@ -932,11 +937,12 @@ void iwl_down(struct iwl_priv *priv)
         priv->ucode_loaded = false;
         iwl_trans_stop_device(priv->trans);
 
+        /* Set num_aux_in_flight must be done after the transport is stopped */
+        atomic_set(&priv->num_aux_in_flight, 0);
+
         /* Clear out all status bits but a few that are stable across reset */
         priv->status &= test_bit(STATUS_RF_KILL_HW, &priv->status) <<
                                 STATUS_RF_KILL_HW |
-                        test_bit(STATUS_GEO_CONFIGURED, &priv->status) <<
-                                STATUS_GEO_CONFIGURED |
                         test_bit(STATUS_FW_ERROR, &priv->status) <<
                                 STATUS_FW_ERROR |
                         test_bit(STATUS_EXIT_PENDING, &priv->status) <<
@@ -1078,7 +1084,7 @@ static void iwlagn_disable_roc_work(struct work_struct *work)
  *
  *****************************************************************************/
 
-void iwl_setup_deferred_work(struct iwl_priv *priv)
+static void iwl_setup_deferred_work(struct iwl_priv *priv)
 {
         priv->workqueue = create_singlethread_workqueue(DRV_NAME);
 
@@ -1123,224 +1129,14 @@ void iwl_cancel_deferred_work(struct iwl_priv *priv)
         del_timer_sync(&priv->ucode_trace);
 }
 
-static void iwl_init_hw_rates(struct ieee80211_rate *rates)
+static int iwl_init_drv(struct iwl_priv *priv)
 {
-        int i;
-
-        for (i = 0; i < IWL_RATE_COUNT_LEGACY; i++) {
-                rates[i].bitrate = iwl_rates[i].ieee * 5;
-                rates[i].hw_value = i; /* Rate scaling will work on indexes */
-                rates[i].hw_value_short = i;
-                rates[i].flags = 0;
-                if ((i >= IWL_FIRST_CCK_RATE) && (i <= IWL_LAST_CCK_RATE)) {
-                        /*
-                         * If CCK != 1M then set short preamble rate flag.
-                         */
-                        rates[i].flags |=
-                                (iwl_rates[i].plcp == IWL_RATE_1M_PLCP) ?
-                                        0 : IEEE80211_RATE_SHORT_PREAMBLE;
-                }
-        }
-}
-
-#define MAX_BIT_RATE_40_MHZ 150 /* Mbps */
-#define MAX_BIT_RATE_20_MHZ 72 /* Mbps */
-static void iwl_init_ht_hw_capab(const struct iwl_priv *priv,
-                              struct ieee80211_sta_ht_cap *ht_info,
-                              enum ieee80211_band band)
-{
-        u16 max_bit_rate = 0;
-        u8 rx_chains_num = priv->hw_params.rx_chains_num;
-        u8 tx_chains_num = priv->hw_params.tx_chains_num;
-
-        ht_info->cap = 0;
-        memset(&ht_info->mcs, 0, sizeof(ht_info->mcs));
-
-        ht_info->ht_supported = true;
-
-        if (priv->cfg->ht_params &&
-            priv->cfg->ht_params->ht_greenfield_support)
-                ht_info->cap |= IEEE80211_HT_CAP_GRN_FLD;
-        ht_info->cap |= IEEE80211_HT_CAP_SGI_20;
-        max_bit_rate = MAX_BIT_RATE_20_MHZ;
-        if (priv->hw_params.ht40_channel & BIT(band)) {
-                ht_info->cap |= IEEE80211_HT_CAP_SUP_WIDTH_20_40;
-                ht_info->cap |= IEEE80211_HT_CAP_SGI_40;
-                ht_info->mcs.rx_mask[4] = 0x01;
-                max_bit_rate = MAX_BIT_RATE_40_MHZ;
-        }
-
-        if (iwlwifi_mod_params.amsdu_size_8K)
-                ht_info->cap |= IEEE80211_HT_CAP_MAX_AMSDU;
-
-        ht_info->ampdu_factor = CFG_HT_RX_AMPDU_FACTOR_DEF;
-        ht_info->ampdu_density = CFG_HT_MPDU_DENSITY_DEF;
-
-        ht_info->mcs.rx_mask[0] = 0xFF;
-        if (rx_chains_num >= 2)
-                ht_info->mcs.rx_mask[1] = 0xFF;
-        if (rx_chains_num >= 3)
-                ht_info->mcs.rx_mask[2] = 0xFF;
-
-        /* Highest supported Rx data rate */
-        max_bit_rate *= rx_chains_num;
-        WARN_ON(max_bit_rate & ~IEEE80211_HT_MCS_RX_HIGHEST_MASK);
-        ht_info->mcs.rx_highest = cpu_to_le16(max_bit_rate);
-
-        /* Tx MCS capabilities */
-        ht_info->mcs.tx_params = IEEE80211_HT_MCS_TX_DEFINED;
-        if (tx_chains_num != rx_chains_num) {
-                ht_info->mcs.tx_params |= IEEE80211_HT_MCS_TX_RX_DIFF;
-                ht_info->mcs.tx_params |= ((tx_chains_num - 1) <<
-                                IEEE80211_HT_MCS_TX_MAX_STREAMS_SHIFT);
-        }
-}
-
-/**
- * iwl_init_geos - Initialize mac80211's geo/channel info based from eeprom
- */
-static int iwl_init_geos(struct iwl_priv *priv)
-{
-        struct iwl_channel_info *ch;
-        struct ieee80211_supported_band *sband;
-        struct ieee80211_channel *channels;
-        struct ieee80211_channel *geo_ch;
-        struct ieee80211_rate *rates;
-        int i = 0;
-        s8 max_tx_power = IWLAGN_TX_POWER_TARGET_POWER_MIN;
-
-        if (priv->bands[IEEE80211_BAND_2GHZ].n_bitrates ||
-            priv->bands[IEEE80211_BAND_5GHZ].n_bitrates) {
-                IWL_DEBUG_INFO(priv, "Geography modes already initialized.\n");
-                set_bit(STATUS_GEO_CONFIGURED, &priv->status);
-                return 0;
-        }
-
-        channels = kcalloc(priv->channel_count,
-                           sizeof(struct ieee80211_channel), GFP_KERNEL);
-        if (!channels)
-                return -ENOMEM;
-
-        rates = kcalloc(IWL_RATE_COUNT_LEGACY, sizeof(struct ieee80211_rate),
-                        GFP_KERNEL);
-        if (!rates) {
-                kfree(channels);
-                return -ENOMEM;
-        }
-
-        /* 5.2GHz channels start after the 2.4GHz channels */
-        sband = &priv->bands[IEEE80211_BAND_5GHZ];
-        sband->channels = &channels[ARRAY_SIZE(iwl_eeprom_band_1)];
-        /* just OFDM */
-        sband->bitrates = &rates[IWL_FIRST_OFDM_RATE];
-        sband->n_bitrates = IWL_RATE_COUNT_LEGACY - IWL_FIRST_OFDM_RATE;
-
-        if (priv->hw_params.sku & EEPROM_SKU_CAP_11N_ENABLE)
-                iwl_init_ht_hw_capab(priv, &sband->ht_cap,
-                                         IEEE80211_BAND_5GHZ);
-
-        sband = &priv->bands[IEEE80211_BAND_2GHZ];
-        sband->channels = channels;
-        /* OFDM & CCK */
-        sband->bitrates = rates;
-        sband->n_bitrates = IWL_RATE_COUNT_LEGACY;
-
-        if (priv->hw_params.sku & EEPROM_SKU_CAP_11N_ENABLE)
-                iwl_init_ht_hw_capab(priv, &sband->ht_cap,
-                                         IEEE80211_BAND_2GHZ);
-
-        priv->ieee_channels = channels;
-        priv->ieee_rates = rates;
-
-        for (i = 0;  i < priv->channel_count; i++) {
-                ch = &priv->channel_info[i];
-
-                /* FIXME: might be removed if scan is OK */
-                if (!is_channel_valid(ch))
-                        continue;
-
-                sband =  &priv->bands[ch->band];
-
-                geo_ch = &sband->channels[sband->n_channels++];
-
-                geo_ch->center_freq =
-                        ieee80211_channel_to_frequency(ch->channel, ch->band);
-                geo_ch->max_power = ch->max_power_avg;
-                geo_ch->max_antenna_gain = 0xff;
-                geo_ch->hw_value = ch->channel;
-
-                if (is_channel_valid(ch)) {
-                        if (!(ch->flags & EEPROM_CHANNEL_IBSS))
-                                geo_ch->flags |= IEEE80211_CHAN_NO_IBSS;
-
-                        if (!(ch->flags & EEPROM_CHANNEL_ACTIVE))
-                                geo_ch->flags |= IEEE80211_CHAN_PASSIVE_SCAN;
-
-                        if (ch->flags & EEPROM_CHANNEL_RADAR)
-                                geo_ch->flags |= IEEE80211_CHAN_RADAR;
-
-                        geo_ch->flags |= ch->ht40_extension_channel;
-
-                        if (ch->max_power_avg > max_tx_power)
-                                max_tx_power = ch->max_power_avg;
-                } else {
-                        geo_ch->flags |= IEEE80211_CHAN_DISABLED;
-                }
-
-                IWL_DEBUG_INFO(priv, "Channel %d Freq=%d[%sGHz] %s flag=0x%X\n",
-                                ch->channel, geo_ch->center_freq,
-                                is_channel_a_band(ch) ?  "5.2" : "2.4",
-                                geo_ch->flags & IEEE80211_CHAN_DISABLED ?
-                                "restricted" : "valid",
-                                 geo_ch->flags);
-        }
-
-        priv->tx_power_device_lmt = max_tx_power;
-        priv->tx_power_user_lmt = max_tx_power;
-        priv->tx_power_next = max_tx_power;
-
-        if ((priv->bands[IEEE80211_BAND_5GHZ].n_channels == 0) &&
-             priv->hw_params.sku & EEPROM_SKU_CAP_BAND_52GHZ) {
-                IWL_INFO(priv, "Incorrectly detected BG card as ABG. "
-                        "Please send your %s to maintainer.\n",
-                        priv->trans->hw_id_str);
-                priv->hw_params.sku &= ~EEPROM_SKU_CAP_BAND_52GHZ;
-        }
-
-        if (iwlwifi_mod_params.disable_5ghz)
-                priv->bands[IEEE80211_BAND_5GHZ].n_channels = 0;
-
-        IWL_INFO(priv, "Tunable channels: %d 802.11bg, %d 802.11a channels\n",
-                   priv->bands[IEEE80211_BAND_2GHZ].n_channels,
-                   priv->bands[IEEE80211_BAND_5GHZ].n_channels);
-
-        set_bit(STATUS_GEO_CONFIGURED, &priv->status);
-
-        return 0;
-}
-
-/*
- * iwl_free_geos - undo allocations in iwl_init_geos
- */
-static void iwl_free_geos(struct iwl_priv *priv)
-{
-        kfree(priv->ieee_channels);
-        kfree(priv->ieee_rates);
-        clear_bit(STATUS_GEO_CONFIGURED, &priv->status);
-}
-
-int iwl_init_drv(struct iwl_priv *priv)
-{
-        int ret;
-
         spin_lock_init(&priv->sta_lock);
 
         mutex_init(&priv->mutex);
 
         INIT_LIST_HEAD(&priv->calib_results);
 
-        priv->ieee_channels = NULL;
-        priv->ieee_rates = NULL;
         priv->band = IEEE80211_BAND_2GHZ;
 
         priv->plcp_delta_threshold =
@@ -1371,31 +1167,11 @@ int iwl_init_drv(struct iwl_priv *priv)
                 priv->dynamic_frag_thresh = BT_FRAG_THRESHOLD_DEF;
         }
 
-        ret = iwl_init_channel_map(priv);
-        if (ret) {
-                IWL_ERR(priv, "initializing regulatory failed: %d\n", ret);
-                goto err;
-        }
-
-        ret = iwl_init_geos(priv);
-        if (ret) {
-                IWL_ERR(priv, "initializing geos failed: %d\n", ret);
-                goto err_free_channel_map;
-        }
-        iwl_init_hw_rates(priv->ieee_rates);
-
         return 0;
-
-err_free_channel_map:
-        iwl_free_channel_map(priv);
-err:
-        return ret;
 }
 
-void iwl_uninit_drv(struct iwl_priv *priv)
+static void iwl_uninit_drv(struct iwl_priv *priv)
 {
-        iwl_free_geos(priv);
-        iwl_free_channel_map(priv);
         kfree(priv->scan_cmd);
         kfree(priv->beacon_cmd);
         kfree(rcu_dereference_raw(priv->noa_data));
@@ -1405,15 +1181,12 @@ void iwl_uninit_drv(struct iwl_priv *priv)
 #endif
 }
 
-void iwl_set_hw_params(struct iwl_priv *priv)
+static void iwl_set_hw_params(struct iwl_priv *priv)
 {
         if (priv->cfg->ht_params)
                 priv->hw_params.use_rts_for_aggregation =
                         priv->cfg->ht_params->use_rts_for_aggregation;
 
-        if (iwlwifi_mod_params.disable_11n & IWL_DISABLE_HT_ALL)
-                priv->hw_params.sku &= ~EEPROM_SKU_CAP_11N_ENABLE;
-
         /* Device-specific setup */
         priv->lib->set_hw_params(priv);
 }
@@ -1421,7 +1194,7 @@ void iwl_set_hw_params(struct iwl_priv *priv)
 
 
 /* show what optional capabilities we have */
-void iwl_option_config(struct iwl_priv *priv)
+static void iwl_option_config(struct iwl_priv *priv)
 {
 #ifdef CONFIG_IWLWIFI_DEBUG
         IWL_INFO(priv, "CONFIG_IWLWIFI_DEBUG enabled\n");
@@ -1454,6 +1227,42 @@ void iwl_option_config(struct iwl_priv *priv)
 #endif
 }
 
+static int iwl_eeprom_init_hw_params(struct iwl_priv *priv)
+{
+        u16 radio_cfg;
+
+        priv->eeprom_data->sku = priv->eeprom_data->sku;
+
+        if (priv->eeprom_data->sku & EEPROM_SKU_CAP_11N_ENABLE &&
+            !priv->cfg->ht_params) {
+                IWL_ERR(priv, "Invalid 11n configuration\n");
+                return -EINVAL;
+        }
+
+        if (!priv->eeprom_data->sku) {
+                IWL_ERR(priv, "Invalid device sku\n");
+                return -EINVAL;
+        }
+
+        IWL_INFO(priv, "Device SKU: 0x%X\n", priv->eeprom_data->sku);
+
+        radio_cfg = priv->eeprom_data->radio_cfg;
+
+        priv->hw_params.tx_chains_num =
+                num_of_ant(priv->eeprom_data->valid_tx_ant);
+        if (priv->cfg->rx_with_siso_diversity)
+                priv->hw_params.rx_chains_num = 1;
+        else
+                priv->hw_params.rx_chains_num =
+                        num_of_ant(priv->eeprom_data->valid_rx_ant);
+
+        IWL_INFO(priv, "Valid Tx ant: 0x%X, Valid Rx ant: 0x%X\n",
+                 priv->eeprom_data->valid_tx_ant,
+                 priv->eeprom_data->valid_rx_ant);
+
+        return 0;
+}
+
 static struct iwl_op_mode *iwl_op_mode_dvm_start(struct iwl_trans *trans,
                                                  const struct iwl_cfg *cfg,
                                                  const struct iwl_fw *fw)
@@ -1539,9 +1348,12 @@ static struct iwl_op_mode *iwl_op_mode_dvm_start(struct iwl_trans *trans,
                 trans_cfg.queue_watchdog_timeout =
                         priv->cfg->base_params->wd_timeout;
         else
-                trans_cfg.queue_watchdog_timeout = IWL_WATCHHDOG_DISABLED;
+                trans_cfg.queue_watchdog_timeout = IWL_WATCHDOG_DISABLED;
         trans_cfg.command_names = iwl_dvm_cmd_strings;
 
+        WARN_ON(sizeof(priv->transport_queue_stop) * BITS_PER_BYTE <
+                priv->cfg->base_params->num_of_queues);
+
         ucode_flags = fw->ucode_capa.flags;
 
 #ifndef CONFIG_IWLWIFI_P2P
@@ -1599,25 +1411,33 @@ static struct iwl_op_mode *iwl_op_mode_dvm_start(struct iwl_trans *trans,
                 goto out_free_hw;
 
         /* Read the EEPROM */
-        if (iwl_eeprom_init(priv, priv->trans->hw_rev)) {
+        if (iwl_read_eeprom(priv->trans, &priv->eeprom_blob,
+                            &priv->eeprom_blob_size)) {
                 IWL_ERR(priv, "Unable to init EEPROM\n");
                 goto out_free_hw;
         }
+
         /* Reset chip to save power until we load uCode during "up". */
         iwl_trans_stop_hw(priv->trans, false);
 
-        if (iwl_eeprom_check_version(priv))
+        priv->eeprom_data = iwl_parse_eeprom_data(priv->trans->dev, priv->cfg,
+                                                  priv->eeprom_blob,
+                                                  priv->eeprom_blob_size);
+        if (!priv->eeprom_data)
+                goto out_free_eeprom_blob;
+
+        if (iwl_eeprom_check_version(priv->eeprom_data, priv->trans))
                 goto out_free_eeprom;
 
         if (iwl_eeprom_init_hw_params(priv))
                 goto out_free_eeprom;
 
         /* extract MAC Address */
-        iwl_eeprom_get_mac(priv, priv->addresses[0].addr);
+        memcpy(priv->addresses[0].addr, priv->eeprom_data->hw_addr, ETH_ALEN);
         IWL_DEBUG_INFO(priv, "MAC address: %pM\n", priv->addresses[0].addr);
         priv->hw->wiphy->addresses = priv->addresses;
         priv->hw->wiphy->n_addresses = 1;
-        num_mac = iwl_eeprom_query16(priv, EEPROM_NUM_MAC_ADDRESS);
+        num_mac = priv->eeprom_data->n_hw_addrs;
         if (num_mac > 1) {
                 memcpy(priv->addresses[1].addr, priv->addresses[0].addr,
                        ETH_ALEN);
@@ -1630,7 +1450,7 @@ static struct iwl_op_mode *iwl_op_mode_dvm_start(struct iwl_trans *trans,
          ************************/
         iwl_set_hw_params(priv);
 
-        if (!(priv->hw_params.sku & EEPROM_SKU_CAP_IPAN_ENABLE)) {
+        if (!(priv->eeprom_data->sku & EEPROM_SKU_CAP_IPAN_ENABLE)) {
                 IWL_DEBUG_INFO(priv, "Your EEPROM disabled PAN");
                 ucode_flags &= ~IWL_UCODE_TLV_FLAGS_PAN;
                 /*
@@ -1711,8 +1531,10 @@ out_destroy_workqueue:
         destroy_workqueue(priv->workqueue);
         priv->workqueue = NULL;
         iwl_uninit_drv(priv);
+out_free_eeprom_blob:
+        kfree(priv->eeprom_blob);
 out_free_eeprom:
-        iwl_eeprom_free(priv);
+        iwl_free_eeprom_data(priv->eeprom_data);
 out_free_hw:
         ieee80211_free_hw(priv->hw);
 out:
@@ -1720,7 +1542,7 @@ out:
         return op_mode;
 }
 
-void iwl_op_mode_dvm_stop(struct iwl_op_mode *op_mode)
+static void iwl_op_mode_dvm_stop(struct iwl_op_mode *op_mode)
 {
         struct iwl_priv *priv = IWL_OP_MODE_GET_DVM(op_mode);
 
@@ -1728,7 +1550,7 @@ void iwl_op_mode_dvm_stop(struct iwl_op_mode *op_mode)
 
         iwl_dbgfs_unregister(priv);
 
-        iwl_testmode_cleanup(priv);
+        iwl_testmode_free(priv);
         iwlagn_mac_unregister(priv);
 
         iwl_tt_exit(priv);
@@ -1737,7 +1559,8 @@ void iwl_op_mode_dvm_stop(struct iwl_op_mode *op_mode)
         priv->ucode_loaded = false;
         iwl_trans_stop_device(priv->trans);
 
-        iwl_eeprom_free(priv);
+        kfree(priv->eeprom_blob);
+        iwl_free_eeprom_data(priv->eeprom_data);
 
         /*netif_stop_queue(dev); */
         flush_workqueue(priv->workqueue);
@@ -1850,7 +1673,7 @@ static void iwl_dump_nic_error_log(struct iwl_priv *priv)
         }
 
         /*TODO: Update dbgfs with ISR error stats obtained below */
-        iwl_read_targ_mem_words(trans, base, &table, sizeof(table));
+        iwl_read_targ_mem_bytes(trans, base, &table, sizeof(table));
 
         if (ERROR_START_OFFSET <= table.valid * ERROR_ELEM_SIZE) {
                 IWL_ERR(trans, "Start IWL Error Log Dump:\n");
@@ -2185,7 +2008,7 @@ static void iwlagn_fw_error(struct iwl_priv *priv, bool ondemand)
         }
 }
 
-void iwl_nic_error(struct iwl_op_mode *op_mode)
+static void iwl_nic_error(struct iwl_op_mode *op_mode)
 {
         struct iwl_priv *priv = IWL_OP_MODE_GET_DVM(op_mode);
 
@@ -2198,7 +2021,7 @@ void iwl_nic_error(struct iwl_op_mode *op_mode)
         iwlagn_fw_error(priv, false);
 }
 
-void iwl_cmd_queue_full(struct iwl_op_mode *op_mode)
+static void iwl_cmd_queue_full(struct iwl_op_mode *op_mode)
 {
         struct iwl_priv *priv = IWL_OP_MODE_GET_DVM(op_mode);
 
@@ -2208,11 +2031,60 @@ void iwl_cmd_queue_full(struct iwl_op_mode *op_mode)
         }
 }
 
-void iwl_nic_config(struct iwl_op_mode *op_mode)
+#define EEPROM_RF_CONFIG_TYPE_MAX      0x3
+
+static void iwl_nic_config(struct iwl_op_mode *op_mode)
 {
         struct iwl_priv *priv = IWL_OP_MODE_GET_DVM(op_mode);
+        u16 radio_cfg = priv->eeprom_data->radio_cfg;
+
+        /* SKU Control */
+        iwl_set_bits_mask(priv->trans, CSR_HW_IF_CONFIG_REG,
+                          CSR_HW_IF_CONFIG_REG_MSK_MAC_DASH |
+                          CSR_HW_IF_CONFIG_REG_MSK_MAC_STEP,
+                          (CSR_HW_REV_STEP(priv->trans->hw_rev) <<
+                                CSR_HW_IF_CONFIG_REG_POS_MAC_STEP) |
+                          (CSR_HW_REV_DASH(priv->trans->hw_rev) <<
+                                CSR_HW_IF_CONFIG_REG_POS_MAC_DASH));
+
+        /* write radio config values to register */
+        if (EEPROM_RF_CFG_TYPE_MSK(radio_cfg) <= EEPROM_RF_CONFIG_TYPE_MAX) {
+                u32 reg_val =
+                        EEPROM_RF_CFG_TYPE_MSK(radio_cfg) <<
+                                CSR_HW_IF_CONFIG_REG_POS_PHY_TYPE |
+                        EEPROM_RF_CFG_STEP_MSK(radio_cfg) <<
+                                CSR_HW_IF_CONFIG_REG_POS_PHY_STEP |
+                        EEPROM_RF_CFG_DASH_MSK(radio_cfg) <<
+                                CSR_HW_IF_CONFIG_REG_POS_PHY_DASH;
+
+                iwl_set_bits_mask(priv->trans, CSR_HW_IF_CONFIG_REG,
+                                  CSR_HW_IF_CONFIG_REG_MSK_PHY_TYPE |
+                                  CSR_HW_IF_CONFIG_REG_MSK_PHY_STEP |
+                                  CSR_HW_IF_CONFIG_REG_MSK_PHY_DASH, reg_val);
+
+                IWL_INFO(priv, "Radio type=0x%x-0x%x-0x%x\n",
+                         EEPROM_RF_CFG_TYPE_MSK(radio_cfg),
+                         EEPROM_RF_CFG_STEP_MSK(radio_cfg),
+                         EEPROM_RF_CFG_DASH_MSK(radio_cfg));
+        } else {
+                WARN_ON(1);
+        }
+
+        /* set CSR_HW_CONFIG_REG for uCode use */
+        iwl_set_bit(priv->trans, CSR_HW_IF_CONFIG_REG,
+                    CSR_HW_IF_CONFIG_REG_BIT_RADIO_SI |
+                    CSR_HW_IF_CONFIG_REG_BIT_MAC_SI);
+
+        /* W/A : NIC is stuck in a reset state after Early PCIe power off
+         * (PCIe power is lost before PERST# is asserted),
+         * causing ME FW to lose ownership and not being able to obtain it back.
+         */
+        iwl_set_bits_mask_prph(priv->trans, APMG_PS_CTRL_REG,
+                               APMG_PS_CTRL_EARLY_PWR_OFF_RESET_DIS,
+                               ~APMG_PS_CTRL_EARLY_PWR_OFF_RESET_DIS);
 
-        priv->lib->nic_config(priv);
+        if (priv->lib->nic_config)
+                priv->lib->nic_config(priv);
 }
 
 static void iwl_wimax_active(struct iwl_op_mode *op_mode)
@@ -2223,7 +2095,7 @@ static void iwl_wimax_active(struct iwl_op_mode *op_mode)
         IWL_ERR(priv, "RF is used by WiMAX\n");
 }
 
-void iwl_stop_sw_queue(struct iwl_op_mode *op_mode, int queue)
+static void iwl_stop_sw_queue(struct iwl_op_mode *op_mode, int queue)
 {
         struct iwl_priv *priv = IWL_OP_MODE_GET_DVM(op_mode);
         int mq = priv->queue_to_mac80211[queue];
@@ -2242,7 +2114,7 @@ void iwl_stop_sw_queue(struct iwl_op_mode *op_mode, int queue)
         ieee80211_stop_queue(priv->hw, mq);
 }
 
-void iwl_wake_sw_queue(struct iwl_op_mode *op_mode, int queue)
+static void iwl_wake_sw_queue(struct iwl_op_mode *op_mode, int queue)
 {
         struct iwl_priv *priv = IWL_OP_MODE_GET_DVM(op_mode);
         int mq = priv->queue_to_mac80211[queue];
@@ -2282,16 +2154,17 @@ void iwlagn_lift_passive_no_rx(struct iwl_priv *priv)
         priv->passive_no_rx = false;
 }
 
-void iwl_free_skb(struct iwl_op_mode *op_mode, struct sk_buff *skb)
+static void iwl_free_skb(struct iwl_op_mode *op_mode, struct sk_buff *skb)
 {
+        struct iwl_priv *priv = IWL_OP_MODE_GET_DVM(op_mode);
         struct ieee80211_tx_info *info;
 
         info = IEEE80211_SKB_CB(skb);
-        kmem_cache_free(iwl_tx_cmd_pool, (info->driver_data[1]));
+        iwl_trans_free_tx_cmd(priv->trans, info->driver_data[1]);
         dev_kfree_skb_any(skb);
 }
 
-void iwl_set_hw_rfkill_state(struct iwl_op_mode *op_mode, bool state)
+static void iwl_set_hw_rfkill_state(struct iwl_op_mode *op_mode, bool state)
 {
         struct iwl_priv *priv = IWL_OP_MODE_GET_DVM(op_mode);
 
@@ -2303,7 +2176,7 @@ void iwl_set_hw_rfkill_state(struct iwl_op_mode *op_mode, bool state)
         wiphy_rfkill_set_hw_state(priv->hw->wiphy, state);
 }
 
-const struct iwl_op_mode_ops iwl_dvm_ops = {
+static const struct iwl_op_mode_ops iwl_dvm_ops = {
         .start = iwl_op_mode_dvm_start,
         .stop = iwl_op_mode_dvm_stop,
         .rx = iwl_rx_dispatch,
@@ -2322,9 +2195,6 @@ const struct iwl_op_mode_ops iwl_dvm_ops = {
  * driver and module entry point
  *
  *****************************************************************************/
-
-struct kmem_cache *iwl_tx_cmd_pool;
-
 static int __init iwl_init(void)
 {
 
@@ -2332,36 +2202,25 @@ static int __init iwl_init(void)
         pr_info(DRV_DESCRIPTION ", " DRV_VERSION "\n");
         pr_info(DRV_COPYRIGHT "\n");
 
-        iwl_tx_cmd_pool = kmem_cache_create("iwl_dev_cmd",
-                                            sizeof(struct iwl_device_cmd),
-                                            sizeof(void *), 0, NULL);
-        if (!iwl_tx_cmd_pool)
-                return -ENOMEM;
-
         ret = iwlagn_rate_control_register();
         if (ret) {
                 pr_err("Unable to register rate control algorithm: %d\n", ret);
-                goto error_rc_register;
+                return ret;
         }
 
-        ret = iwl_pci_register_driver();
-        if (ret)
-                goto error_pci_register;
-        return ret;
+        ret = iwl_opmode_register("iwldvm", &iwl_dvm_ops);
+        if (ret) {
+                pr_err("Unable to register op_mode: %d\n", ret);
+                iwlagn_rate_control_unregister();
+        }
 
-error_pci_register:
-        iwlagn_rate_control_unregister();
-error_rc_register:
-        kmem_cache_destroy(iwl_tx_cmd_pool);
         return ret;
 }
+module_init(iwl_init);
 
 static void __exit iwl_exit(void)
 {
-        iwl_pci_unregister_driver();
+        iwl_opmode_deregister("iwldvm");
         iwlagn_rate_control_unregister();
-        kmem_cache_destroy(iwl_tx_cmd_pool);
 }
-
 module_exit(iwl_exit);
-module_init(iwl_init);
diff --git a/drivers/net/wireless/iwlwifi/iwl-power.c b/drivers/net/wireless/iwlwifi/dvm/power.c
index 544ddf17f5b..518cf371580 100644
--- a/drivers/net/wireless/iwlwifi/iwl-power.c
+++ b/drivers/net/wireless/iwlwifi/dvm/power.c
@@ -31,18 +31,15 @@
 #include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/init.h>
-
 #include <net/mac80211.h>
-
-#include "iwl-eeprom.h"
-#include "iwl-dev.h"
-#include "iwl-agn.h"
 #include "iwl-io.h"
-#include "iwl-commands.h"
 #include "iwl-debug.h"
-#include "iwl-power.h"
 #include "iwl-trans.h"
 #include "iwl-modparams.h"
+#include "dev.h"
+#include "agn.h"
+#include "commands.h"
+#include "power.h"
 
 /*
  * Setting power level allows the card to go to sleep when not busy.
diff --git a/drivers/net/wireless/iwlwifi/iwl-power.h b/drivers/net/wireless/iwlwifi/dvm/power.h
index 21afc92efac..a2cee7f0484 100644
--- a/drivers/net/wireless/iwlwifi/iwl-power.h
+++ b/drivers/net/wireless/iwlwifi/dvm/power.h
@@ -28,7 +28,7 @@
 #ifndef __iwl_power_setting_h__
 #define __iwl_power_setting_h__
 
-#include "iwl-commands.h"
+#include "commands.h"
 
 struct iwl_power_mgr {
         struct iwl_powertable_cmd sleep_cmd;
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-rs.c b/drivers/net/wireless/iwlwifi/dvm/rs.c
index 8cebd7c363f..6fddd2785e6 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-rs.c
+++ b/drivers/net/wireless/iwlwifi/dvm/rs.c
@@ -35,10 +35,8 @@
 
 #include <linux/workqueue.h>
 
-#include "iwl-dev.h"
-#include "iwl-agn.h"
-#include "iwl-op-mode.h"
-#include "iwl-modparams.h"
+#include "dev.h"
+#include "agn.h"
 
 #define RS_NAME "iwl-agn-rs"
 
@@ -819,7 +817,7 @@ static u32 rs_get_lower_rate(struct iwl_lq_sta *lq_sta,
 
                 if (num_of_ant(tbl->ant_type) > 1)
                         tbl->ant_type =
-                            first_antenna(priv->hw_params.valid_tx_ant);
+                            first_antenna(priv->eeprom_data->valid_tx_ant);
 
                 tbl->is_ht40 = 0;
                 tbl->is_SGI = 0;
@@ -1447,7 +1445,7 @@ static int rs_move_legacy_other(struct iwl_priv *priv,
         u32 sz = (sizeof(struct iwl_scale_tbl_info) -
                   (sizeof(struct iwl_rate_scale_data) * IWL_RATE_COUNT));
         u8 start_action;
-        u8 valid_tx_ant = priv->hw_params.valid_tx_ant;
+        u8 valid_tx_ant = priv->eeprom_data->valid_tx_ant;
         u8 tx_chains_num = priv->hw_params.tx_chains_num;
         int ret = 0;
         u8 update_search_tbl_counter = 0;
@@ -1465,7 +1463,7 @@ static int rs_move_legacy_other(struct iwl_priv *priv,
         case IWL_BT_COEX_TRAFFIC_LOAD_CONTINUOUS:
                 /* avoid antenna B and MIMO */
                 valid_tx_ant =
-                        first_antenna(priv->hw_params.valid_tx_ant);
+                        first_antenna(priv->eeprom_data->valid_tx_ant);
                 if (tbl->action >= IWL_LEGACY_SWITCH_ANTENNA2 &&
                     tbl->action != IWL_LEGACY_SWITCH_SISO)
                         tbl->action = IWL_LEGACY_SWITCH_SISO;
@@ -1489,7 +1487,7 @@ static int rs_move_legacy_other(struct iwl_priv *priv,
                 else if (tbl->action >= IWL_LEGACY_SWITCH_ANTENNA2)
                         tbl->action = IWL_LEGACY_SWITCH_SISO;
                 valid_tx_ant =
-                        first_antenna(priv->hw_params.valid_tx_ant);
+                        first_antenna(priv->eeprom_data->valid_tx_ant);
         }
 
         start_action = tbl->action;
@@ -1623,7 +1621,7 @@ static int rs_move_siso_to_other(struct iwl_priv *priv,
         u32 sz = (sizeof(struct iwl_scale_tbl_info) -
                   (sizeof(struct iwl_rate_scale_data) * IWL_RATE_COUNT));
         u8 start_action;
-        u8 valid_tx_ant = priv->hw_params.valid_tx_ant;
+        u8 valid_tx_ant = priv->eeprom_data->valid_tx_ant;
         u8 tx_chains_num = priv->hw_params.tx_chains_num;
         u8 update_search_tbl_counter = 0;
         int ret;
@@ -1641,7 +1639,7 @@ static int rs_move_siso_to_other(struct iwl_priv *priv,
         case IWL_BT_COEX_TRAFFIC_LOAD_CONTINUOUS:
                 /* avoid antenna B and MIMO */
                 valid_tx_ant =
-                        first_antenna(priv->hw_params.valid_tx_ant);
+                        first_antenna(priv->eeprom_data->valid_tx_ant);
                 if (tbl->action != IWL_SISO_SWITCH_ANTENNA1)
                         tbl->action = IWL_SISO_SWITCH_ANTENNA1;
                 break;
@@ -1659,7 +1657,7 @@ static int rs_move_siso_to_other(struct iwl_priv *priv,
         /* configure as 1x1 if bt full concurrency */
         if (priv->bt_full_concurrent) {
                 valid_tx_ant =
-                        first_antenna(priv->hw_params.valid_tx_ant);
+                        first_antenna(priv->eeprom_data->valid_tx_ant);
                 if (tbl->action >= IWL_LEGACY_SWITCH_ANTENNA2)
                         tbl->action = IWL_SISO_SWITCH_ANTENNA1;
         }
@@ -1795,7 +1793,7 @@ static int rs_move_mimo2_to_other(struct iwl_priv *priv,
         u32 sz = (sizeof(struct iwl_scale_tbl_info) -
                   (sizeof(struct iwl_rate_scale_data) * IWL_RATE_COUNT));
         u8 start_action;
-        u8 valid_tx_ant = priv->hw_params.valid_tx_ant;
+        u8 valid_tx_ant = priv->eeprom_data->valid_tx_ant;
         u8 tx_chains_num = priv->hw_params.tx_chains_num;
         u8 update_search_tbl_counter = 0;
         int ret;
@@ -1965,7 +1963,7 @@ static int rs_move_mimo3_to_other(struct iwl_priv *priv,
         u32 sz = (sizeof(struct iwl_scale_tbl_info) -
                   (sizeof(struct iwl_rate_scale_data) * IWL_RATE_COUNT));
         u8 start_action;
-        u8 valid_tx_ant = priv->hw_params.valid_tx_ant;
+        u8 valid_tx_ant = priv->eeprom_data->valid_tx_ant;
         u8 tx_chains_num = priv->hw_params.tx_chains_num;
         int ret;
         u8 update_search_tbl_counter = 0;
@@ -2699,7 +2697,7 @@ static void rs_initialize_lq(struct iwl_priv *priv,
 
         i = lq_sta->last_txrate_idx;
 
-        valid_tx_ant = priv->hw_params.valid_tx_ant;
+        valid_tx_ant = priv->eeprom_data->valid_tx_ant;
 
         if (!lq_sta->search_better_tbl)
                 active_tbl = lq_sta->active_tbl;
@@ -2893,15 +2891,15 @@ void iwl_rs_rate_init(struct iwl_priv *priv, struct ieee80211_sta *sta, u8 sta_i
 
         /* These values will be overridden later */
         lq_sta->lq.general_params.single_stream_ant_msk =
-                first_antenna(priv->hw_params.valid_tx_ant);
+                first_antenna(priv->eeprom_data->valid_tx_ant);
         lq_sta->lq.general_params.dual_stream_ant_msk =
-                priv->hw_params.valid_tx_ant &
-                ~first_antenna(priv->hw_params.valid_tx_ant);
+                priv->eeprom_data->valid_tx_ant &
+                ~first_antenna(priv->eeprom_data->valid_tx_ant);
         if (!lq_sta->lq.general_params.dual_stream_ant_msk) {
                 lq_sta->lq.general_params.dual_stream_ant_msk = ANT_AB;
-        } else if (num_of_ant(priv->hw_params.valid_tx_ant) == 2) {
+        } else if (num_of_ant(priv->eeprom_data->valid_tx_ant) == 2) {
                 lq_sta->lq.general_params.dual_stream_ant_msk =
-                        priv->hw_params.valid_tx_ant;
+                        priv->eeprom_data->valid_tx_ant;
         }
 
         /* as default allow aggregation for all tids */
@@ -2947,7 +2945,7 @@ static void rs_fill_link_cmd(struct iwl_priv *priv,
         if (priv && priv->bt_full_concurrent) {
                 /* 1x1 only */
                 tbl_type.ant_type =
-                        first_antenna(priv->hw_params.valid_tx_ant);
+                        first_antenna(priv->eeprom_data->valid_tx_ant);
         }
 
         /* How many times should we repeat the initial rate? */
@@ -2979,7 +2977,7 @@ static void rs_fill_link_cmd(struct iwl_priv *priv,
                 if (priv->bt_full_concurrent)
                         valid_tx_ant = ANT_A;
                 else
-                        valid_tx_ant = priv->hw_params.valid_tx_ant;
+                        valid_tx_ant = priv->eeprom_data->valid_tx_ant;
         }
 
         /* Fill rest of rate table */
@@ -3013,7 +3011,7 @@ static void rs_fill_link_cmd(struct iwl_priv *priv,
                 if (priv && priv->bt_full_concurrent) {
                         /* 1x1 only */
                         tbl_type.ant_type =
-                            first_antenna(priv->hw_params.valid_tx_ant);
+                            first_antenna(priv->eeprom_data->valid_tx_ant);
                 }
 
                 /* Indicate to uCode which entries might be MIMO.
@@ -3100,7 +3098,7 @@ static void rs_dbgfs_set_mcs(struct iwl_lq_sta *lq_sta,
         u8 ant_sel_tx;
 
         priv = lq_sta->drv;
-        valid_tx_ant = priv->hw_params.valid_tx_ant;
+        valid_tx_ant = priv->eeprom_data->valid_tx_ant;
         if (lq_sta->dbg_fixed_rate) {
                 ant_sel_tx =
                   ((lq_sta->dbg_fixed_rate & RATE_MCS_ANT_ABC_MSK)
@@ -3171,9 +3169,9 @@ static ssize_t rs_sta_dbgfs_scale_table_read(struct file *file,
         desc += sprintf(buff+desc, "fixed rate 0x%X\n",
                         lq_sta->dbg_fixed_rate);
         desc += sprintf(buff+desc, "valid_tx_ant %s%s%s\n",
-            (priv->hw_params.valid_tx_ant & ANT_A) ? "ANT_A," : "",
-            (priv->hw_params.valid_tx_ant & ANT_B) ? "ANT_B," : "",
-            (priv->hw_params.valid_tx_ant & ANT_C) ? "ANT_C" : "");
+            (priv->eeprom_data->valid_tx_ant & ANT_A) ? "ANT_A," : "",
+            (priv->eeprom_data->valid_tx_ant & ANT_B) ? "ANT_B," : "",
+            (priv->eeprom_data->valid_tx_ant & ANT_C) ? "ANT_C" : "");
         desc += sprintf(buff+desc, "lq type %s\n",
            (is_legacy(tbl->lq_type)) ? "legacy" : "HT");
         if (is_Ht(tbl->lq_type)) {
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-rs.h b/drivers/net/wireless/iwlwifi/dvm/rs.h
index 82d02e1ae89..ad3aea8f626 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-rs.h
+++ b/drivers/net/wireless/iwlwifi/dvm/rs.h
@@ -29,9 +29,10 @@
 
 #include <net/mac80211.h>
 
-#include "iwl-commands.h"
 #include "iwl-config.h"
 
+#include "commands.h"
+
 struct iwl_rate_info {
         u8 plcp;        /* uCode API:  IWL_RATE_6M_PLCP, etc. */
         u8 plcp_siso;   /* uCode API:  IWL_RATE_SISO_6M_PLCP, etc. */
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-rx.c b/drivers/net/wireless/iwlwifi/dvm/rx.c
index 403de96f974..c1f7a18e08d 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-rx.c
+++ b/drivers/net/wireless/iwlwifi/dvm/rx.c
@@ -32,12 +32,10 @@
 #include <linux/sched.h>
 #include <net/mac80211.h>
 #include <asm/unaligned.h>
-#include "iwl-eeprom.h"
-#include "iwl-dev.h"
 #include "iwl-io.h"
-#include "iwl-agn-calib.h"
-#include "iwl-agn.h"
-#include "iwl-modparams.h"
+#include "dev.h"
+#include "calib.h"
+#include "agn.h"
 
 #define IWL_CMD_ENTRY(x) [x] = #x
 
@@ -1012,6 +1010,8 @@ static int iwlagn_rx_reply_rx(struct iwl_priv *priv,
                 rx_status.flag |= RX_FLAG_40MHZ;
         if (rate_n_flags & RATE_MCS_SGI_MSK)
                 rx_status.flag |= RX_FLAG_SHORT_GI;
+        if (rate_n_flags & RATE_MCS_GF_MSK)
+                rx_status.flag |= RX_FLAG_HT_GF;
 
         iwlagn_pass_packet_to_mac80211(priv, header, len, ampdu_status,
                                     rxb, &rx_status);
@@ -1124,8 +1124,6 @@ int iwl_rx_dispatch(struct iwl_op_mode *op_mode, struct iwl_rx_cmd_buffer *rxb,
 {
         struct iwl_rx_packet *pkt = rxb_addr(rxb);
         struct iwl_priv *priv = IWL_OP_MODE_GET_DVM(op_mode);
-        void (*pre_rx_handler)(struct iwl_priv *,
-                               struct iwl_rx_cmd_buffer *);
         int err = 0;
 
         /*
@@ -1135,19 +1133,19 @@ int iwl_rx_dispatch(struct iwl_op_mode *op_mode, struct iwl_rx_cmd_buffer *rxb,
          */
         iwl_notification_wait_notify(&priv->notif_wait, pkt);
 
-        /* RX data may be forwarded to userspace (using pre_rx_handler) in one
-         * of two cases: the first, that the user owns the uCode through
-         * testmode - in such case the pre_rx_handler is set and no further
-         * processing takes place. The other case is when the user want to
-         * monitor the rx w/o affecting the regular flow - the pre_rx_handler
-         * will be set but the ownership flag != IWL_OWNERSHIP_TM and the flow
+#ifdef CONFIG_IWLWIFI_DEVICE_TESTMODE
+        /*
+         * RX data may be forwarded to userspace in one
+         * of two cases: the user owns the fw through testmode or when
+         * the user requested to monitor the rx w/o affecting the regular flow.
+         * In these cases the iwl_test object will handle forwarding the rx
+         * data to user space.
+         * Note that if the ownership flag != IWL_OWNERSHIP_TM the flow
          * continues.
-         * We need to use ACCESS_ONCE to prevent a case where the handler
-         * changes between the check and the call.
          */
-        pre_rx_handler = ACCESS_ONCE(priv->pre_rx_handler);
-        if (pre_rx_handler)
-                pre_rx_handler(priv, rxb);
+        iwl_test_rx(&priv->tst, rxb);
+#endif
+
         if (priv->ucode_owner != IWL_OWNERSHIP_TM) {
                 /* Based on type of command response or notification,
                  *   handle those that need handling via function in
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c b/drivers/net/wireless/iwlwifi/dvm/rxon.c
index 0a3aa7c8300..6ee940f497f 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
+++ b/drivers/net/wireless/iwlwifi/dvm/rxon.c
@@ -25,11 +25,11 @@
  *****************************************************************************/
 
 #include <linux/etherdevice.h>
-#include "iwl-dev.h"
-#include "iwl-agn.h"
-#include "iwl-agn-calib.h"
 #include "iwl-trans.h"
 #include "iwl-modparams.h"
+#include "dev.h"
+#include "agn.h"
+#include "calib.h"
 
 /*
  * initialize rxon structure with default values from eeprom
@@ -37,8 +37,6 @@
 void iwl_connection_init_rx_config(struct iwl_priv *priv,
                                    struct iwl_rxon_context *ctx)
 {
-        const struct iwl_channel_info *ch_info;
-
         memset(&ctx->staging, 0, sizeof(ctx->staging));
 
         if (!ctx->vif) {
@@ -80,14 +78,8 @@ void iwl_connection_init_rx_config(struct iwl_priv *priv,
                 ctx->staging.flags |= RXON_FLG_SHORT_PREAMBLE_MSK;
 #endif
 
-        ch_info = iwl_get_channel_info(priv, priv->band,
-                                       le16_to_cpu(ctx->active.channel));
-
-        if (!ch_info)
-                ch_info = &priv->channel_info[0];
-
-        ctx->staging.channel = cpu_to_le16(ch_info->channel);
-        priv->band = ch_info->band;
+        ctx->staging.channel = cpu_to_le16(priv->hw->conf.channel->hw_value);
+        priv->band = priv->hw->conf.channel->band;
 
         iwl_set_flags_for_band(priv, ctx, priv->band, ctx->vif);
 
@@ -175,7 +167,8 @@ static int iwlagn_disconn_pan(struct iwl_priv *priv,
         return ret;
 }
 
-void iwlagn_update_qos(struct iwl_priv *priv, struct iwl_rxon_context *ctx)
+static void iwlagn_update_qos(struct iwl_priv *priv,
+                              struct iwl_rxon_context *ctx)
 {
         int ret;
 
@@ -202,8 +195,8 @@ void iwlagn_update_qos(struct iwl_priv *priv, struct iwl_rxon_context *ctx)
                 IWL_DEBUG_QUIET_RFKILL(priv, "Failed to update QoS\n");
 }
 
-int iwlagn_update_beacon(struct iwl_priv *priv,
-                         struct ieee80211_vif *vif)
+static int iwlagn_update_beacon(struct iwl_priv *priv,
+                                struct ieee80211_vif *vif)
 {
         lockdep_assert_held(&priv->mutex);
 
@@ -215,7 +208,7 @@ int iwlagn_update_beacon(struct iwl_priv *priv,
 }
 
 static int iwlagn_send_rxon_assoc(struct iwl_priv *priv,
-                           struct iwl_rxon_context *ctx)
+                                  struct iwl_rxon_context *ctx)
 {
         int ret = 0;
         struct iwl_rxon_assoc_cmd rxon_assoc;
@@ -427,10 +420,10 @@ static int iwl_set_tx_power(struct iwl_priv *priv, s8 tx_power, bool force)
                 return -EINVAL;
         }
 
-        if (tx_power > priv->tx_power_device_lmt) {
+        if (tx_power > DIV_ROUND_UP(priv->eeprom_data->max_tx_pwr_half_dbm, 2)) {
                 IWL_WARN(priv,
                         "Requested user TXPOWER %d above upper limit %d.\n",
-                         tx_power, priv->tx_power_device_lmt);
+                         tx_power, priv->eeprom_data->max_tx_pwr_half_dbm);
                 return -EINVAL;
         }
 
@@ -863,8 +856,8 @@ static int iwl_check_rxon_cmd(struct iwl_priv *priv,
  * or is clearing the RXON_FILTER_ASSOC_MSK, then return 1 to indicate that
  * a new tune (full RXON command, rather than RXON_ASSOC cmd) is required.
  */
-int iwl_full_rxon_required(struct iwl_priv *priv,
-                           struct iwl_rxon_context *ctx)
+static int iwl_full_rxon_required(struct iwl_priv *priv,
+                                  struct iwl_rxon_context *ctx)
 {
         const struct iwl_rxon_cmd *staging = &ctx->staging;
         const struct iwl_rxon_cmd *active = &ctx->active;
@@ -1189,7 +1182,6 @@ int iwlagn_mac_config(struct ieee80211_hw *hw, u32 changed)
         struct iwl_rxon_context *ctx;
         struct ieee80211_conf *conf = &hw->conf;
         struct ieee80211_channel *channel = conf->channel;
-        const struct iwl_channel_info *ch_info;
         int ret = 0;
 
         IWL_DEBUG_MAC80211(priv, "enter: changed %#x\n", changed);
@@ -1223,14 +1215,6 @@ int iwlagn_mac_config(struct ieee80211_hw *hw, u32 changed)
         }
 
         if (changed & IEEE80211_CONF_CHANGE_CHANNEL) {
-                ch_info = iwl_get_channel_info(priv, channel->band,
-                                               channel->hw_value);
-                if (!is_channel_valid(ch_info)) {
-                        IWL_DEBUG_MAC80211(priv, "leave - invalid channel\n");
-                        ret = -EINVAL;
-                        goto out;
-                }
-
                 for_each_context(priv, ctx) {
                         /* Configure HT40 channels */
                         if (ctx->ht.enabled != conf_is_ht(conf))
@@ -1294,9 +1278,9 @@ int iwlagn_mac_config(struct ieee80211_hw *hw, u32 changed)
         return ret;
 }
 
-void iwlagn_check_needed_chains(struct iwl_priv *priv,
-                                struct iwl_rxon_context *ctx,
-                                struct ieee80211_bss_conf *bss_conf)
+static void iwlagn_check_needed_chains(struct iwl_priv *priv,
+                                       struct iwl_rxon_context *ctx,
+                                       struct ieee80211_bss_conf *bss_conf)
 {
         struct ieee80211_vif *vif = ctx->vif;
         struct iwl_rxon_context *tmp;
@@ -1388,7 +1372,7 @@ void iwlagn_check_needed_chains(struct iwl_priv *priv,
         ht_conf->single_chain_sufficient = !need_multiple;
 }
 
-void iwlagn_chain_noise_reset(struct iwl_priv *priv)
+static void iwlagn_chain_noise_reset(struct iwl_priv *priv)
 {
         struct iwl_chain_noise_data *data = &priv->chain_noise_data;
         int ret;
diff --git a/drivers/net/wireless/iwlwifi/iwl-scan.c b/drivers/net/wireless/iwlwifi/dvm/scan.c
index 031d8e21f82..6633074258c 100644
--- a/drivers/net/wireless/iwlwifi/iwl-scan.c
+++ b/drivers/net/wireless/iwlwifi/dvm/scan.c
@@ -30,11 +30,8 @@
 #include <linux/etherdevice.h>
 #include <net/mac80211.h>
 
-#include "iwl-eeprom.h"
-#include "iwl-dev.h"
-#include "iwl-io.h"
-#include "iwl-agn.h"
-#include "iwl-trans.h"
+#include "dev.h"
+#include "agn.h"
 
 /* For active scan, listen ACTIVE_DWELL_TIME (msec) on each channel after
  * sending probe req.  This should be set long enough to hear probe responses
@@ -54,6 +51,9 @@
 #define IWL_CHANNEL_TUNE_TIME       5
 #define MAX_SCAN_CHANNEL            50
 
+/* For reset radio, need minimal dwell time only */
+#define IWL_RADIO_RESET_DWELL_TIME      5
+
 static int iwl_send_scan_abort(struct iwl_priv *priv)
 {
         int ret;
@@ -67,7 +67,6 @@ static int iwl_send_scan_abort(struct iwl_priv *priv)
          * to receive scan abort command or it does not perform
          * hardware scan currently */
         if (!test_bit(STATUS_READY, &priv->status) ||
-            !test_bit(STATUS_GEO_CONFIGURED, &priv->status) ||
             !test_bit(STATUS_SCAN_HW, &priv->status) ||
             test_bit(STATUS_FW_ERROR, &priv->status))
                 return -EIO;
@@ -101,11 +100,8 @@ static void iwl_complete_scan(struct iwl_priv *priv, bool aborted)
                 ieee80211_scan_completed(priv->hw, aborted);
         }
 
-        if (priv->scan_type == IWL_SCAN_ROC) {
-                ieee80211_remain_on_channel_expired(priv->hw);
-                priv->hw_roc_channel = NULL;
-                schedule_delayed_work(&priv->hw_roc_disable_work, 10 * HZ);
-        }
+        if (priv->scan_type == IWL_SCAN_ROC)
+                iwl_scan_roc_expired(priv);
 
         priv->scan_type = IWL_SCAN_NORMAL;
         priv->scan_vif = NULL;
@@ -134,11 +130,8 @@ static void iwl_process_scan_complete(struct iwl_priv *priv)
                 goto out_settings;
         }
 
-        if (priv->scan_type == IWL_SCAN_ROC) {
-                ieee80211_remain_on_channel_expired(priv->hw);
-                priv->hw_roc_channel = NULL;
-                schedule_delayed_work(&priv->hw_roc_disable_work, 10 * HZ);
-        }
+        if (priv->scan_type == IWL_SCAN_ROC)
+                iwl_scan_roc_expired(priv);
 
         if (priv->scan_type != IWL_SCAN_NORMAL && !aborted) {
                 int err;
@@ -453,27 +446,17 @@ static u16 iwl_get_passive_dwell_time(struct iwl_priv *priv,
 
 /* Return valid, unused, channel for a passive scan to reset the RF */
 static u8 iwl_get_single_channel_number(struct iwl_priv *priv,
-                                 enum ieee80211_band band)
+                                        enum ieee80211_band band)
 {
-        const struct iwl_channel_info *ch_info;
-        int i;
-        u8 channel = 0;
-        u8 min, max;
+        struct ieee80211_supported_band *sband = priv->hw->wiphy->bands[band];
         struct iwl_rxon_context *ctx;
+        int i;
 
-        if (band == IEEE80211_BAND_5GHZ) {
-                min = 14;
-                max = priv->channel_count;
-        } else {
-                min = 0;
-                max = 14;
-        }
-
-        for (i = min; i < max; i++) {
+        for (i = 0; i < sband->n_channels; i++) {
                 bool busy = false;
 
                 for_each_context(priv, ctx) {
-                        busy = priv->channel_info[i].channel ==
+                        busy = sband->channels[i].hw_value ==
                                 le16_to_cpu(ctx->staging.channel);
                         if (busy)
                                 break;
@@ -482,54 +465,46 @@ static u8 iwl_get_single_channel_number(struct iwl_priv *priv,
                 if (busy)
                         continue;
 
-                channel = priv->channel_info[i].channel;
-                ch_info = iwl_get_channel_info(priv, band, channel);
-                if (is_channel_valid(ch_info))
-                        break;
+                if (!(sband->channels[i].flags & IEEE80211_CHAN_DISABLED))
+                        return sband->channels[i].hw_value;
         }
 
-        return channel;
+        return 0;
 }
 
-static int iwl_get_single_channel_for_scan(struct iwl_priv *priv,
-                                           struct ieee80211_vif *vif,
-                                           enum ieee80211_band band,
-                                           struct iwl_scan_channel *scan_ch)
+static int iwl_get_channel_for_reset_scan(struct iwl_priv *priv,
+                                          struct ieee80211_vif *vif,
+                                          enum ieee80211_band band,
+                                          struct iwl_scan_channel *scan_ch)
 {
         const struct ieee80211_supported_band *sband;
-        u16 passive_dwell = 0;
-        u16 active_dwell = 0;
-        int added = 0;
-        u16 channel = 0;
+        u16 channel;
 
         sband = iwl_get_hw_mode(priv, band);
         if (!sband) {
                 IWL_ERR(priv, "invalid band\n");
-                return added;
+                return 0;
         }
 
-        active_dwell = iwl_get_active_dwell_time(priv, band, 0);
-        passive_dwell = iwl_get_passive_dwell_time(priv, band);
-
-        if (passive_dwell <= active_dwell)
-                passive_dwell = active_dwell + 1;
-
         channel = iwl_get_single_channel_number(priv, band);
         if (channel) {
                 scan_ch->channel = cpu_to_le16(channel);
                 scan_ch->type = SCAN_CHANNEL_TYPE_PASSIVE;
-                scan_ch->active_dwell = cpu_to_le16(active_dwell);
-                scan_ch->passive_dwell = cpu_to_le16(passive_dwell);
+                scan_ch->active_dwell =
+                        cpu_to_le16(IWL_RADIO_RESET_DWELL_TIME);
+                scan_ch->passive_dwell =
+                        cpu_to_le16(IWL_RADIO_RESET_DWELL_TIME);
                 /* Set txpower levels to defaults */
                 scan_ch->dsp_atten = 110;
                 if (band == IEEE80211_BAND_5GHZ)
                         scan_ch->tx_gain = ((1 << 5) | (3 << 3)) | 3;
                 else
                         scan_ch->tx_gain = ((1 << 5) | (5 << 3));
-                added++;
-        } else
-                IWL_ERR(priv, "no valid channel found\n");
-        return added;
+                return 1;
+        }
+
+        IWL_ERR(priv, "no valid channel found\n");
+        return 0;
 }
 
 static int iwl_get_channels_for_scan(struct iwl_priv *priv,
@@ -540,7 +515,6 @@ static int iwl_get_channels_for_scan(struct iwl_priv *priv,
 {
         struct ieee80211_channel *chan;
         const struct ieee80211_supported_band *sband;
-        const struct iwl_channel_info *ch_info;
         u16 passive_dwell = 0;
         u16 active_dwell = 0;
         int added, i;
@@ -565,16 +539,7 @@ static int iwl_get_channels_for_scan(struct iwl_priv *priv,
                 channel = chan->hw_value;
                 scan_ch->channel = cpu_to_le16(channel);
 
-                ch_info = iwl_get_channel_info(priv, band, channel);
-                if (!is_channel_valid(ch_info)) {
-                        IWL_DEBUG_SCAN(priv,
-                                       "Channel %d is INVALID for this band.\n",
-                                       channel);
-                        continue;
-                }
-
-                if (!is_active || is_channel_passive(ch_info) ||
-                    (chan->flags & IEEE80211_CHAN_PASSIVE_SCAN))
+                if (!is_active || (chan->flags & IEEE80211_CHAN_PASSIVE_SCAN))
                         scan_ch->type = SCAN_CHANNEL_TYPE_PASSIVE;
                 else
                         scan_ch->type = SCAN_CHANNEL_TYPE_ACTIVE;
@@ -678,12 +643,12 @@ static int iwlagn_request_scan(struct iwl_priv *priv, struct ieee80211_vif *vif)
         u16 rx_chain = 0;
         enum ieee80211_band band;
         u8 n_probes = 0;
-        u8 rx_ant = priv->hw_params.valid_rx_ant;
+        u8 rx_ant = priv->eeprom_data->valid_rx_ant;
         u8 rate;
         bool is_active = false;
         int  chan_mod;
         u8 active_chains;
-        u8 scan_tx_antennas = priv->hw_params.valid_tx_ant;
+        u8 scan_tx_antennas = priv->eeprom_data->valid_tx_ant;
         int ret;
         int scan_cmd_size = sizeof(struct iwl_scan_cmd) +
                             MAX_SCAN_CHANNEL * sizeof(struct iwl_scan_channel) +
@@ -755,6 +720,12 @@ static int iwlagn_request_scan(struct iwl_priv *priv, struct ieee80211_vif *vif)
         switch (priv->scan_type) {
         case IWL_SCAN_RADIO_RESET:
                 IWL_DEBUG_SCAN(priv, "Start internal passive scan.\n");
+                /*
+                 * Override quiet time as firmware checks that active
+                 * dwell is >= quiet; since we use passive scan it'll
+                 * not actually be used.
+                 */
+                scan->quiet_time = cpu_to_le16(IWL_RADIO_RESET_DWELL_TIME);
                 break;
         case IWL_SCAN_NORMAL:
                 if (priv->scan_request->n_ssids) {
@@ -893,7 +864,7 @@ static int iwlagn_request_scan(struct iwl_priv *priv, struct ieee80211_vif *vif)
 
         /* MIMO is not used here, but value is required */
         rx_chain |=
-                priv->hw_params.valid_rx_ant << RXON_RX_CHAIN_VALID_POS;
+                priv->eeprom_data->valid_rx_ant << RXON_RX_CHAIN_VALID_POS;
         rx_chain |= rx_ant << RXON_RX_CHAIN_FORCE_MIMO_SEL_POS;
         rx_chain |= rx_ant << RXON_RX_CHAIN_FORCE_SEL_POS;
         rx_chain |= 0x1 << RXON_RX_CHAIN_DRIVER_FORCE_POS;
@@ -928,7 +899,7 @@ static int iwlagn_request_scan(struct iwl_priv *priv, struct ieee80211_vif *vif)
         switch (priv->scan_type) {
         case IWL_SCAN_RADIO_RESET:
                 scan->channel_count =
-                        iwl_get_single_channel_for_scan(priv, vif, band,
+                        iwl_get_channel_for_reset_scan(priv, vif, band,
                                 (void *)&scan->data[cmd_len]);
                 break;
         case IWL_SCAN_NORMAL:
@@ -994,8 +965,10 @@ static int iwlagn_request_scan(struct iwl_priv *priv, struct ieee80211_vif *vif)
         set_bit(STATUS_SCAN_HW, &priv->status);
 
         ret = iwlagn_set_pan_params(priv);
-        if (ret)
+        if (ret) {
+                clear_bit(STATUS_SCAN_HW, &priv->status);
                 return ret;
+        }
 
         ret = iwl_dvm_send_cmd(priv, &cmd);
         if (ret) {
@@ -1008,7 +981,7 @@ static int iwlagn_request_scan(struct iwl_priv *priv, struct ieee80211_vif *vif)
 
 void iwl_init_scan_params(struct iwl_priv *priv)
 {
-        u8 ant_idx = fls(priv->hw_params.valid_tx_ant) - 1;
+        u8 ant_idx = fls(priv->eeprom_data->valid_tx_ant) - 1;
         if (!priv->scan_tx_ant[IEEE80211_BAND_5GHZ])
                 priv->scan_tx_ant[IEEE80211_BAND_5GHZ] = ant_idx;
         if (!priv->scan_tx_ant[IEEE80211_BAND_2GHZ])
@@ -1158,3 +1131,40 @@ void iwl_cancel_scan_deferred_work(struct iwl_priv *priv)
                 mutex_unlock(&priv->mutex);
         }
 }
+
+void iwl_scan_roc_expired(struct iwl_priv *priv)
+{
+        /*
+         * The status bit should be set here, to prevent a race
+         * where the atomic_read returns 1, but before the execution continues
+         * iwl_scan_offchannel_skb_status() checks if the status bit is set
+         */
+        set_bit(STATUS_SCAN_ROC_EXPIRED, &priv->status);
+
+        if (atomic_read(&priv->num_aux_in_flight) == 0) {
+                ieee80211_remain_on_channel_expired(priv->hw);
+                priv->hw_roc_channel = NULL;
+                schedule_delayed_work(&priv->hw_roc_disable_work,
+                                      10 * HZ);
+
+                clear_bit(STATUS_SCAN_ROC_EXPIRED, &priv->status);
+        } else {
+                IWL_DEBUG_SCAN(priv, "ROC done with %d frames in aux\n",
+                               atomic_read(&priv->num_aux_in_flight));
+        }
+}
+
+void iwl_scan_offchannel_skb(struct iwl_priv *priv)
+{
+        WARN_ON(!priv->hw_roc_start_notified);
+        atomic_inc(&priv->num_aux_in_flight);
+}
+
+void iwl_scan_offchannel_skb_status(struct iwl_priv *priv)
+{
+        if (atomic_dec_return(&priv->num_aux_in_flight) == 0 &&
+            test_bit(STATUS_SCAN_ROC_EXPIRED, &priv->status)) {
+                IWL_DEBUG_SCAN(priv, "0 aux frames. Calling ROC expired\n");
+                iwl_scan_roc_expired(priv);
+        }
+}
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-sta.c b/drivers/net/wireless/iwlwifi/dvm/sta.c
index eb6a8eaf42f..b29b798f755 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-sta.c
+++ b/drivers/net/wireless/iwlwifi/dvm/sta.c
@@ -28,10 +28,9 @@
  *****************************************************************************/
 #include <linux/etherdevice.h>
 #include <net/mac80211.h>
-
-#include "iwl-dev.h"
-#include "iwl-agn.h"
 #include "iwl-trans.h"
+#include "dev.h"
+#include "agn.h"
 
 const u8 iwl_bcast_addr[ETH_ALEN] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF };
 
@@ -171,26 +170,6 @@ int iwl_send_add_sta(struct iwl_priv *priv,
         return cmd.handler_status;
 }
 
-static bool iwl_is_channel_extension(struct iwl_priv *priv,
-                                     enum ieee80211_band band,
-                                     u16 channel, u8 extension_chan_offset)
-{
-        const struct iwl_channel_info *ch_info;
-
-        ch_info = iwl_get_channel_info(priv, band, channel);
-        if (!is_channel_valid(ch_info))
-                return false;
-
-        if (extension_chan_offset == IEEE80211_HT_PARAM_CHA_SEC_ABOVE)
-                return !(ch_info->ht40_extension_channel &
-                                        IEEE80211_CHAN_NO_HT40PLUS);
-        else if (extension_chan_offset == IEEE80211_HT_PARAM_CHA_SEC_BELOW)
-                return !(ch_info->ht40_extension_channel &
-                                        IEEE80211_CHAN_NO_HT40MINUS);
-
-        return false;
-}
-
 bool iwl_is_ht40_tx_allowed(struct iwl_priv *priv,
                             struct iwl_rxon_context *ctx,
                             struct ieee80211_sta_ht_cap *ht_cap)
@@ -198,21 +177,25 @@ bool iwl_is_ht40_tx_allowed(struct iwl_priv *priv,
         if (!ctx->ht.enabled || !ctx->ht.is_40mhz)
                 return false;
 
+#ifdef CONFIG_IWLWIFI_DEBUGFS
+        if (priv->disable_ht40)
+                return false;
+#endif
+
         /*
-         * We do not check for IEEE80211_HT_CAP_SUP_WIDTH_20_40
-         * the bit will not set if it is pure 40MHz case
+         * Remainder of this function checks ht_cap, but if it's
+         * NULL then we can do HT40 (special case for RXON)
          */
-        if (ht_cap && !ht_cap->ht_supported)
+        if (!ht_cap)
+                return true;
+
+        if (!ht_cap->ht_supported)
                 return false;
 
-#ifdef CONFIG_IWLWIFI_DEBUGFS
-        if (priv->disable_ht40)
+        if (!(ht_cap->cap & IEEE80211_HT_CAP_SUP_WIDTH_20_40))
                 return false;
-#endif
 
-        return iwl_is_channel_extension(priv, priv->band,
-                        le16_to_cpu(ctx->staging.channel),
-                        ctx->ht.extension_chan_offset);
+        return true;
 }
 
 static void iwl_sta_calc_ht_flags(struct iwl_priv *priv,
@@ -236,6 +219,7 @@ static void iwl_sta_calc_ht_flags(struct iwl_priv *priv,
         mimo_ps_mode = (sta_ht_inf->cap & IEEE80211_HT_CAP_SM_PS) >> 2;
 
         IWL_DEBUG_INFO(priv, "STA %pM SM PS mode: %s\n",
+                        sta->addr,
                         (mimo_ps_mode == WLAN_HT_CAP_SM_PS_STATIC) ?
                         "static" :
                         (mimo_ps_mode == WLAN_HT_CAP_SM_PS_DYNAMIC) ?
@@ -649,23 +633,23 @@ static void iwl_sta_fill_lq(struct iwl_priv *priv, struct iwl_rxon_context *ctx,
         if (r >= IWL_FIRST_CCK_RATE && r <= IWL_LAST_CCK_RATE)
                 rate_flags |= RATE_MCS_CCK_MSK;
 
-        rate_flags |= first_antenna(priv->hw_params.valid_tx_ant) <<
+        rate_flags |= first_antenna(priv->eeprom_data->valid_tx_ant) <<
                                 RATE_MCS_ANT_POS;
         rate_n_flags = iwl_hw_set_rate_n_flags(iwl_rates[r].plcp, rate_flags);
         for (i = 0; i < LINK_QUAL_MAX_RETRY_NUM; i++)
                 link_cmd->rs_table[i].rate_n_flags = rate_n_flags;
 
         link_cmd->general_params.single_stream_ant_msk =
-                        first_antenna(priv->hw_params.valid_tx_ant);
+                        first_antenna(priv->eeprom_data->valid_tx_ant);
 
         link_cmd->general_params.dual_stream_ant_msk =
-                priv->hw_params.valid_tx_ant &
-                ~first_antenna(priv->hw_params.valid_tx_ant);
+                priv->eeprom_data->valid_tx_ant &
+                ~first_antenna(priv->eeprom_data->valid_tx_ant);
         if (!link_cmd->general_params.dual_stream_ant_msk) {
                 link_cmd->general_params.dual_stream_ant_msk = ANT_AB;
-        } else if (num_of_ant(priv->hw_params.valid_tx_ant) == 2) {
+        } else if (num_of_ant(priv->eeprom_data->valid_tx_ant) == 2) {
                 link_cmd->general_params.dual_stream_ant_msk =
-                        priv->hw_params.valid_tx_ant;
+                        priv->eeprom_data->valid_tx_ant;
         }
 
         link_cmd->agg_params.agg_dis_start_th =
diff --git a/drivers/net/wireless/iwlwifi/dvm/testmode.c b/drivers/net/wireless/iwlwifi/dvm/testmode.c
new file mode 100644
index 00000000000..57b918ce3b5
--- /dev/null
+++ b/drivers/net/wireless/iwlwifi/dvm/testmode.c
@@ -0,0 +1,471 @@
+/******************************************************************************
+ *
+ * This file is provided under a dual BSD/GPLv2 license.  When using or
+ * redistributing this file, you may do so under either license.
+ *
+ * GPL LICENSE SUMMARY
+ *
+ * Copyright(c) 2010 - 2012 Intel Corporation. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110,
+ * USA
+ *
+ * The full GNU General Public License is included in this distribution
+ * in the file called LICENSE.GPL.
+ *
+ * Contact Information:
+ *  Intel Linux Wireless <ilw@linux.intel.com>
+ * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
+ *
+ * BSD LICENSE
+ *
+ * Copyright(c) 2010 - 2012 Intel Corporation. All rights reserved.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *  * Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *  * Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *  * Neither the name Intel Corporation nor the names of its
+ *    contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *****************************************************************************/
+
+#include <linux/init.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/dma-mapping.h>
+#include <net/net_namespace.h>
+#include <linux/netdevice.h>
+#include <net/cfg80211.h>
+#include <net/mac80211.h>
+#include <net/netlink.h>
+
+#include "iwl-debug.h"
+#include "iwl-trans.h"
+#include "dev.h"
+#include "agn.h"
+#include "iwl-test.h"
+#include "iwl-testmode.h"
+
+static int iwl_testmode_send_cmd(struct iwl_op_mode *op_mode,
+                                 struct iwl_host_cmd *cmd)
+{
+        struct iwl_priv *priv = IWL_OP_MODE_GET_DVM(op_mode);
+        return iwl_dvm_send_cmd(priv, cmd);
+}
+
+static bool iwl_testmode_valid_hw_addr(u32 addr)
+{
+        if (iwlagn_hw_valid_rtc_data_addr(addr))
+                return true;
+
+        if (IWLAGN_RTC_INST_LOWER_BOUND <= addr &&
+            addr < IWLAGN_RTC_INST_UPPER_BOUND)
+                return true;
+
+        return false;
+}
+
+static u32 iwl_testmode_get_fw_ver(struct iwl_op_mode *op_mode)
+{
+        struct iwl_priv *priv = IWL_OP_MODE_GET_DVM(op_mode);
+        return priv->fw->ucode_ver;
+}
+
+static struct sk_buff*
+iwl_testmode_alloc_reply(struct iwl_op_mode *op_mode, int len)
+{
+        struct iwl_priv *priv = IWL_OP_MODE_GET_DVM(op_mode);
+        return cfg80211_testmode_alloc_reply_skb(priv->hw->wiphy, len);
+}
+
+static int iwl_testmode_reply(struct iwl_op_mode *op_mode, struct sk_buff *skb)
+{
+        return cfg80211_testmode_reply(skb);
+}
+
+static struct sk_buff *iwl_testmode_alloc_event(struct iwl_op_mode *op_mode,
+                                                int len)
+{
+        struct iwl_priv *priv = IWL_OP_MODE_GET_DVM(op_mode);
+        return cfg80211_testmode_alloc_event_skb(priv->hw->wiphy, len,
+                                                 GFP_ATOMIC);
+}
+
+static void iwl_testmode_event(struct iwl_op_mode *op_mode, struct sk_buff *skb)
+{
+        return cfg80211_testmode_event(skb, GFP_ATOMIC);
+}
+
+static struct iwl_test_ops tst_ops = {
+        .send_cmd = iwl_testmode_send_cmd,
+        .valid_hw_addr = iwl_testmode_valid_hw_addr,
+        .get_fw_ver = iwl_testmode_get_fw_ver,
+        .alloc_reply = iwl_testmode_alloc_reply,
+        .reply = iwl_testmode_reply,
+        .alloc_event = iwl_testmode_alloc_event,
+        .event = iwl_testmode_event,
+};
+
+void iwl_testmode_init(struct iwl_priv *priv)
+{
+        iwl_test_init(&priv->tst, priv->trans, &tst_ops);
+}
+
+void iwl_testmode_free(struct iwl_priv *priv)
+{
+        iwl_test_free(&priv->tst);
+}
+
+static int iwl_testmode_cfg_init_calib(struct iwl_priv *priv)
+{
+        struct iwl_notification_wait calib_wait;
+        static const u8 calib_complete[] = {
+                CALIBRATION_COMPLETE_NOTIFICATION
+        };
+        int ret;
+
+        iwl_init_notification_wait(&priv->notif_wait, &calib_wait,
+                                   calib_complete, ARRAY_SIZE(calib_complete),
+                                   NULL, NULL);
+        ret = iwl_init_alive_start(priv);
+        if (ret) {
+                IWL_ERR(priv, "Fail init calibration: %d\n", ret);
+                goto cfg_init_calib_error;
+        }
+
+        ret = iwl_wait_notification(&priv->notif_wait, &calib_wait, 2 * HZ);
+        if (ret)
+                IWL_ERR(priv, "Error detecting"
+                        " CALIBRATION_COMPLETE_NOTIFICATION: %d\n", ret);
+        return ret;
+
+cfg_init_calib_error:
+        iwl_remove_notification(&priv->notif_wait, &calib_wait);
+        return ret;
+}
+
+/*
+ * This function handles the user application commands for driver.
+ *
+ * It retrieves command ID carried with IWL_TM_ATTR_COMMAND and calls to the
+ * handlers respectively.
+ *
+ * If it's an unknown commdn ID, -ENOSYS is replied; otherwise, the returned
+ * value of the actual command execution is replied to the user application.
+ *
+ * If there's any message responding to the user space, IWL_TM_ATTR_SYNC_RSP
+ * is used for carry the message while IWL_TM_ATTR_COMMAND must set to
+ * IWL_TM_CMD_DEV2APP_SYNC_RSP.
+ *
+ * @hw: ieee80211_hw object that represents the device
+ * @tb: gnl message fields from the user space
+ */
+static int iwl_testmode_driver(struct ieee80211_hw *hw, struct nlattr **tb)
+{
+        struct iwl_priv *priv = IWL_MAC80211_GET_DVM(hw);
+        struct iwl_trans *trans = priv->trans;
+        struct sk_buff *skb;
+        unsigned char *rsp_data_ptr = NULL;
+        int status = 0, rsp_data_len = 0;
+        u32 inst_size = 0, data_size = 0;
+        const struct fw_img *img;
+
+        switch (nla_get_u32(tb[IWL_TM_ATTR_COMMAND])) {
+        case IWL_TM_CMD_APP2DEV_GET_DEVICENAME:
+                rsp_data_ptr = (unsigned char *)priv->cfg->name;
+                rsp_data_len = strlen(priv->cfg->name);
+                skb = cfg80211_testmode_alloc_reply_skb(hw->wiphy,
+                                                        rsp_data_len + 20);
+                if (!skb) {
+                        IWL_ERR(priv, "Memory allocation fail\n");
+                        return -ENOMEM;
+                }
+                if (nla_put_u32(skb, IWL_TM_ATTR_COMMAND,
+                                IWL_TM_CMD_DEV2APP_SYNC_RSP) ||
+                    nla_put(skb, IWL_TM_ATTR_SYNC_RSP,
+                            rsp_data_len, rsp_data_ptr))
+                        goto nla_put_failure;
+                status = cfg80211_testmode_reply(skb);
+                if (status < 0)
+                        IWL_ERR(priv, "Error sending msg : %d\n", status);
+                break;
+
+        case IWL_TM_CMD_APP2DEV_LOAD_INIT_FW:
+                status = iwl_load_ucode_wait_alive(priv, IWL_UCODE_INIT);
+                if (status)
+                        IWL_ERR(priv, "Error loading init ucode: %d\n", status);
+                break;
+
+        case IWL_TM_CMD_APP2DEV_CFG_INIT_CALIB:
+                iwl_testmode_cfg_init_calib(priv);
+                priv->ucode_loaded = false;
+                iwl_trans_stop_device(trans);
+                break;
+
+        case IWL_TM_CMD_APP2DEV_LOAD_RUNTIME_FW:
+                status = iwl_load_ucode_wait_alive(priv, IWL_UCODE_REGULAR);
+                if (status) {
+                        IWL_ERR(priv,
+                                "Error loading runtime ucode: %d\n", status);
+                        break;
+                }
+                status = iwl_alive_start(priv);
+                if (status)
+                        IWL_ERR(priv,
+                                "Error starting the device: %d\n", status);
+                break;
+
+        case IWL_TM_CMD_APP2DEV_LOAD_WOWLAN_FW:
+                iwl_scan_cancel_timeout(priv, 200);
+                priv->ucode_loaded = false;
+                iwl_trans_stop_device(trans);
+                status = iwl_load_ucode_wait_alive(priv, IWL_UCODE_WOWLAN);
+                if (status) {
+                        IWL_ERR(priv,
+                                "Error loading WOWLAN ucode: %d\n", status);
+                        break;
+                }
+                status = iwl_alive_start(priv);
+                if (status)
+                        IWL_ERR(priv,
+                                "Error starting the device: %d\n", status);
+                break;
+
+        case IWL_TM_CMD_APP2DEV_GET_EEPROM:
+                if (priv->eeprom_blob) {
+                        skb = cfg80211_testmode_alloc_reply_skb(hw->wiphy,
+                                priv->eeprom_blob_size + 20);
+                        if (!skb) {
+                                IWL_ERR(priv, "Memory allocation fail\n");
+                                return -ENOMEM;
+                        }
+                        if (nla_put_u32(skb, IWL_TM_ATTR_COMMAND,
+                                        IWL_TM_CMD_DEV2APP_EEPROM_RSP) ||
+                            nla_put(skb, IWL_TM_ATTR_EEPROM,
+                                    priv->eeprom_blob_size,
+                                    priv->eeprom_blob))
+                                goto nla_put_failure;
+                        status = cfg80211_testmode_reply(skb);
+                        if (status < 0)
+                                IWL_ERR(priv, "Error sending msg : %d\n",
+                                        status);
+                } else
+                        return -ENODATA;
+                break;
+
+        case IWL_TM_CMD_APP2DEV_FIXRATE_REQ:
+                if (!tb[IWL_TM_ATTR_FIXRATE]) {
+                        IWL_ERR(priv, "Missing fixrate setting\n");
+                        return -ENOMSG;
+                }
+                priv->tm_fixed_rate = nla_get_u32(tb[IWL_TM_ATTR_FIXRATE]);
+                break;
+
+        case IWL_TM_CMD_APP2DEV_GET_FW_INFO:
+                skb = cfg80211_testmode_alloc_reply_skb(hw->wiphy, 20 + 8);
+                if (!skb) {
+                        IWL_ERR(priv, "Memory allocation fail\n");
+                        return -ENOMEM;
+                }
+                if (!priv->ucode_loaded) {
+                        IWL_ERR(priv, "No uCode has not been loaded\n");
+                        return -EINVAL;
+                } else {
+                        img = &priv->fw->img[priv->cur_ucode];
+                        inst_size = img->sec[IWL_UCODE_SECTION_INST].len;
+                        data_size = img->sec[IWL_UCODE_SECTION_DATA].len;
+                }
+                if (nla_put_u32(skb, IWL_TM_ATTR_FW_TYPE, priv->cur_ucode) ||
+                    nla_put_u32(skb, IWL_TM_ATTR_FW_INST_SIZE, inst_size) ||
+                    nla_put_u32(skb, IWL_TM_ATTR_FW_DATA_SIZE, data_size))
+                        goto nla_put_failure;
+                status = cfg80211_testmode_reply(skb);
+                if (status < 0)
+                        IWL_ERR(priv, "Error sending msg : %d\n", status);
+                break;
+
+        default:
+                IWL_ERR(priv, "Unknown testmode driver command ID\n");
+                return -ENOSYS;
+        }
+        return status;
+
+nla_put_failure:
+        kfree_skb(skb);
+        return -EMSGSIZE;
+}
+
+/*
+ * This function handles the user application switch ucode ownership.
+ *
+ * It retrieves the mandatory fields IWL_TM_ATTR_UCODE_OWNER and
+ * decide who the current owner of the uCode
+ *
+ * If the current owner is OWNERSHIP_TM, then the only host command
+ * can deliver to uCode is from testmode, all the other host commands
+ * will dropped.
+ *
+ * default driver is the owner of uCode in normal operational mode
+ *
+ * @hw: ieee80211_hw object that represents the device
+ * @tb: gnl message fields from the user space
+ */
+static int iwl_testmode_ownership(struct ieee80211_hw *hw, struct nlattr **tb)
+{
+        struct iwl_priv *priv = IWL_MAC80211_GET_DVM(hw);
+        u8 owner;
+
+        if (!tb[IWL_TM_ATTR_UCODE_OWNER]) {
+                IWL_ERR(priv, "Missing ucode owner\n");
+                return -ENOMSG;
+        }
+
+        owner = nla_get_u8(tb[IWL_TM_ATTR_UCODE_OWNER]);
+        if (owner == IWL_OWNERSHIP_DRIVER) {
+                priv->ucode_owner = owner;
+                iwl_test_enable_notifications(&priv->tst, false);
+        } else if (owner == IWL_OWNERSHIP_TM) {
+                priv->ucode_owner = owner;
+                iwl_test_enable_notifications(&priv->tst, true);
+        } else {
+                IWL_ERR(priv, "Invalid owner\n");
+                return -EINVAL;
+        }
+        return 0;
+}
+
+/* The testmode gnl message handler that takes the gnl message from the
+ * user space and parses it per the policy iwl_testmode_gnl_msg_policy, then
+ * invoke the corresponding handlers.
+ *
+ * This function is invoked when there is user space application sending
+ * gnl message through the testmode tunnel NL80211_CMD_TESTMODE regulated
+ * by nl80211.
+ *
+ * It retrieves the mandatory field, IWL_TM_ATTR_COMMAND, before
+ * dispatching it to the corresponding handler.
+ *
+ * If IWL_TM_ATTR_COMMAND is missing, -ENOMSG is replied to user application;
+ * -ENOSYS is replied to the user application if the command is unknown;
+ * Otherwise, the command is dispatched to the respective handler.
+ *
+ * @hw: ieee80211_hw object that represents the device
+ * @data: pointer to user space message
+ * @len: length in byte of @data
+ */
+int iwlagn_mac_testmode_cmd(struct ieee80211_hw *hw, void *data, int len)
+{
+        struct nlattr *tb[IWL_TM_ATTR_MAX];
+        struct iwl_priv *priv = IWL_MAC80211_GET_DVM(hw);
+        int result;
+
+        result = iwl_test_parse(&priv->tst, tb, data, len);
+        if (result)
+                return result;
+
+        /* in case multiple accesses to the device happens */
+        mutex_lock(&priv->mutex);
+        switch (nla_get_u32(tb[IWL_TM_ATTR_COMMAND])) {
+        case IWL_TM_CMD_APP2DEV_UCODE:
+        case IWL_TM_CMD_APP2DEV_DIRECT_REG_READ32:
+        case IWL_TM_CMD_APP2DEV_DIRECT_REG_WRITE32:
+        case IWL_TM_CMD_APP2DEV_DIRECT_REG_WRITE8:
+        case IWL_TM_CMD_APP2DEV_BEGIN_TRACE:
+        case IWL_TM_CMD_APP2DEV_END_TRACE:
+        case IWL_TM_CMD_APP2DEV_INDIRECT_BUFFER_READ:
+        case IWL_TM_CMD_APP2DEV_NOTIFICATIONS:
+        case IWL_TM_CMD_APP2DEV_GET_FW_VERSION:
+        case IWL_TM_CMD_APP2DEV_GET_DEVICE_ID:
+        case IWL_TM_CMD_APP2DEV_INDIRECT_BUFFER_WRITE:
+                result = iwl_test_handle_cmd(&priv->tst, tb);
+                break;
+
+        case IWL_TM_CMD_APP2DEV_GET_DEVICENAME:
+        case IWL_TM_CMD_APP2DEV_LOAD_INIT_FW:
+        case IWL_TM_CMD_APP2DEV_CFG_INIT_CALIB:
+        case IWL_TM_CMD_APP2DEV_LOAD_RUNTIME_FW:
+        case IWL_TM_CMD_APP2DEV_GET_EEPROM:
+        case IWL_TM_CMD_APP2DEV_FIXRATE_REQ:
+        case IWL_TM_CMD_APP2DEV_LOAD_WOWLAN_FW:
+        case IWL_TM_CMD_APP2DEV_GET_FW_INFO:
+                IWL_DEBUG_INFO(priv, "testmode cmd to driver\n");
+                result = iwl_testmode_driver(hw, tb);
+                break;
+
+        case IWL_TM_CMD_APP2DEV_OWNERSHIP:
+                IWL_DEBUG_INFO(priv, "testmode change uCode ownership\n");
+                result = iwl_testmode_ownership(hw, tb);
+                break;
+
+        default:
+                IWL_ERR(priv, "Unknown testmode command\n");
+                result = -ENOSYS;
+                break;
+        }
+        mutex_unlock(&priv->mutex);
+
+        if (result)
+                IWL_ERR(priv, "Test cmd failed result=%d\n", result);
+        return result;
+}
+
+int iwlagn_mac_testmode_dump(struct ieee80211_hw *hw, struct sk_buff *skb,
+                      struct netlink_callback *cb,
+                      void *data, int len)
+{
+        struct iwl_priv *priv = IWL_MAC80211_GET_DVM(hw);
+        int result;
+        u32 cmd;
+
+        if (cb->args[3]) {
+                /* offset by 1 since commands start at 0 */
+                cmd = cb->args[3] - 1;
+        } else {
+                struct nlattr *tb[IWL_TM_ATTR_MAX];
+
+                result = iwl_test_parse(&priv->tst, tb, data, len);
+                if (result)
+                        return result;
+
+                cmd = nla_get_u32(tb[IWL_TM_ATTR_COMMAND]);
+                cb->args[3] = cmd + 1;
+        }
+
+        /* in case multiple accesses to the device happens */
+        mutex_lock(&priv->mutex);
+        result = iwl_test_dump(&priv->tst, cmd, skb, cb);
+        mutex_unlock(&priv->mutex);
+        return result;
+}
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-tt.c b/drivers/net/wireless/iwlwifi/dvm/tt.c
index a5cfe0aceed..eb864433e59 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-tt.c
+++ b/drivers/net/wireless/iwlwifi/dvm/tt.c
@@ -31,17 +31,14 @@
 #include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/init.h>
-
 #include <net/mac80211.h>
-
-#include "iwl-agn.h"
-#include "iwl-eeprom.h"
-#include "iwl-dev.h"
 #include "iwl-io.h"
-#include "iwl-commands.h"
-#include "iwl-debug.h"
-#include "iwl-agn-tt.h"
 #include "iwl-modparams.h"
+#include "iwl-debug.h"
+#include "agn.h"
+#include "dev.h"
+#include "commands.h"
+#include "tt.h"
 
 /* default Thermal Throttling transaction table
  * Current state   |         Throttling Down               |  Throttling Up
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-tt.h b/drivers/net/wireless/iwlwifi/dvm/tt.h
index 86bbf47501c..44c7c8f30a2 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-tt.h
+++ b/drivers/net/wireless/iwlwifi/dvm/tt.h
@@ -28,7 +28,7 @@
 #ifndef __iwl_tt_setting_h__
 #define __iwl_tt_setting_h__
 
-#include "iwl-commands.h"
+#include "commands.h"
 
 #define IWL_ABSOLUTE_ZERO               0
 #define IWL_ABSOLUTE_MAX                0xFFFFFFFF
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-tx.c b/drivers/net/wireless/iwlwifi/dvm/tx.c
index 3366e2e2f00..5971a23aa47 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-tx.c
+++ b/drivers/net/wireless/iwlwifi/dvm/tx.c
@@ -32,12 +32,11 @@
 #include <linux/init.h>
 #include <linux/sched.h>
 #include <linux/ieee80211.h>
-
-#include "iwl-dev.h"
 #include "iwl-io.h"
-#include "iwl-agn-hw.h"
-#include "iwl-agn.h"
 #include "iwl-trans.h"
+#include "iwl-agn-hw.h"
+#include "dev.h"
+#include "agn.h"
 
 static const u8 tid_to_ac[] = {
         IEEE80211_AC_BE,
@@ -187,7 +186,8 @@ static void iwlagn_tx_cmd_build_rate(struct iwl_priv *priv,
         rate_idx = info->control.rates[0].idx;
         if (info->control.rates[0].flags & IEEE80211_TX_RC_MCS ||
                         (rate_idx < 0) || (rate_idx > IWL_RATE_COUNT_LEGACY))
-                rate_idx = rate_lowest_index(&priv->bands[info->band],
+                rate_idx = rate_lowest_index(
+                                &priv->eeprom_data->bands[info->band],
                                 info->control.sta);
         /* For 5 GHZ band, remap mac80211 rate indices into driver indices */
         if (info->band == IEEE80211_BAND_5GHZ)
@@ -207,10 +207,11 @@ static void iwlagn_tx_cmd_build_rate(struct iwl_priv *priv,
              priv->bt_full_concurrent) {
                 /* operated as 1x1 in full concurrency mode */
                 priv->mgmt_tx_ant = iwl_toggle_tx_ant(priv, priv->mgmt_tx_ant,
-                                first_antenna(priv->hw_params.valid_tx_ant));
+                                first_antenna(priv->eeprom_data->valid_tx_ant));
         } else
-                priv->mgmt_tx_ant = iwl_toggle_tx_ant(priv, priv->mgmt_tx_ant,
-                                                priv->hw_params.valid_tx_ant);
+                priv->mgmt_tx_ant = iwl_toggle_tx_ant(
+                                        priv, priv->mgmt_tx_ant,
+                                        priv->eeprom_data->valid_tx_ant);
         rate_flags |= iwl_ant_idx_to_flags(priv->mgmt_tx_ant);
 
         /* Set the rate in the TX cmd */
@@ -296,7 +297,7 @@ int iwlagn_tx_skb(struct iwl_priv *priv, struct sk_buff *skb)
         struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
         struct iwl_station_priv *sta_priv = NULL;
         struct iwl_rxon_context *ctx = &priv->contexts[IWL_RXON_CTX_BSS];
-        struct iwl_device_cmd *dev_cmd = NULL;
+        struct iwl_device_cmd *dev_cmd;
         struct iwl_tx_cmd *tx_cmd;
         __le16 fc;
         u8 hdr_len;
@@ -378,7 +379,7 @@ int iwlagn_tx_skb(struct iwl_priv *priv, struct sk_buff *skb)
         if (info->flags & IEEE80211_TX_CTL_AMPDU)
                 is_agg = true;
 
-        dev_cmd = kmem_cache_alloc(iwl_tx_cmd_pool, GFP_ATOMIC);
+        dev_cmd = iwl_trans_alloc_tx_cmd(priv->trans);
 
         if (unlikely(!dev_cmd))
                 goto drop_unlock_priv;
@@ -402,6 +403,7 @@ int iwlagn_tx_skb(struct iwl_priv *priv, struct sk_buff *skb)
 
         info->driver_data[0] = ctx;
         info->driver_data[1] = dev_cmd;
+        /* From now on, we cannot access info->control */
 
         spin_lock(&priv->sta_lock);
 
@@ -486,11 +488,14 @@ int iwlagn_tx_skb(struct iwl_priv *priv, struct sk_buff *skb)
         if (sta_priv && sta_priv->client && !is_agg)
                 atomic_inc(&sta_priv->pending_frames);
 
+        if (info->flags & IEEE80211_TX_CTL_TX_OFFCHAN)
+                iwl_scan_offchannel_skb(priv);
+
         return 0;
 
 drop_unlock_sta:
         if (dev_cmd)
-                kmem_cache_free(iwl_tx_cmd_pool, dev_cmd);
+                iwl_trans_free_tx_cmd(priv->trans, dev_cmd);
         spin_unlock(&priv->sta_lock);
 drop_unlock_priv:
         return -1;
@@ -597,7 +602,7 @@ turn_off:
                  * time, or we hadn't time to drain the AC queues.
                  */
                 if (agg_state == IWL_AGG_ON)
-                        iwl_trans_tx_agg_disable(priv->trans, txq_id);
+                        iwl_trans_txq_disable(priv->trans, txq_id);
                 else
                         IWL_DEBUG_TX_QUEUES(priv, "Don't disable tx agg: %d\n",
                                             agg_state);
@@ -686,9 +691,8 @@ int iwlagn_tx_agg_oper(struct iwl_priv *priv, struct ieee80211_vif *vif,
 
         fifo = ctx->ac_to_fifo[tid_to_ac[tid]];
 
-        iwl_trans_tx_agg_setup(priv->trans, q, fifo,
-                               sta_priv->sta_id, tid,
-                               buf_size, ssn);
+        iwl_trans_txq_enable(priv->trans, q, fifo, sta_priv->sta_id, tid,
+                             buf_size, ssn);
 
         /*
          * If the limit is 0, then it wasn't initialised yet,
@@ -753,8 +757,8 @@ static void iwlagn_check_ratid_empty(struct iwl_priv *priv, int sta_id, u8 tid)
                         IWL_DEBUG_TX_QUEUES(priv,
                                 "Can continue DELBA flow ssn = next_recl ="
                                 " %d", tid_data->next_reclaimed);
-                        iwl_trans_tx_agg_disable(priv->trans,
-                                                 tid_data->agg.txq_id);
+                        iwl_trans_txq_disable(priv->trans,
+                                              tid_data->agg.txq_id);
                         iwlagn_dealloc_agg_txq(priv, tid_data->agg.txq_id);
                         tid_data->agg.state = IWL_AGG_OFF;
                         ieee80211_stop_tx_ba_cb_irqsafe(vif, addr, tid);
@@ -1136,6 +1140,7 @@ int iwlagn_rx_reply_tx(struct iwl_priv *priv, struct iwl_rx_cmd_buffer *rxb,
         struct sk_buff *skb;
         struct iwl_rxon_context *ctx;
         bool is_agg = (txq_id >= IWLAGN_FIRST_AMPDU_QUEUE);
+        bool is_offchannel_skb;
 
         tid = (tx_resp->ra_tid & IWLAGN_TX_RES_TID_MSK) >>
                 IWLAGN_TX_RES_TID_POS;
@@ -1149,6 +1154,8 @@ int iwlagn_rx_reply_tx(struct iwl_priv *priv, struct iwl_rx_cmd_buffer *rxb,
 
         __skb_queue_head_init(&skbs);
 
+        is_offchannel_skb = false;
+
         if (tx_resp->frame_count == 1) {
                 u16 next_reclaimed = le16_to_cpu(tx_resp->seq_ctl);
                 next_reclaimed = SEQ_TO_SN(next_reclaimed + 0x10);
@@ -1176,7 +1183,8 @@ int iwlagn_rx_reply_tx(struct iwl_priv *priv, struct iwl_rx_cmd_buffer *rxb,
                 }
 
                 /*we can free until ssn % q.n_bd not inclusive */
-                WARN_ON(iwl_reclaim(priv, sta_id, tid, txq_id, ssn, &skbs));
+                WARN_ON_ONCE(iwl_reclaim(priv, sta_id, tid,
+                                         txq_id, ssn, &skbs));
                 iwlagn_check_ratid_empty(priv, sta_id, tid);
                 freed = 0;
 
@@ -1189,8 +1197,8 @@ int iwlagn_rx_reply_tx(struct iwl_priv *priv, struct iwl_rx_cmd_buffer *rxb,
 
                         info = IEEE80211_SKB_CB(skb);
                         ctx = info->driver_data[0];
-                        kmem_cache_free(iwl_tx_cmd_pool,
-                                        (info->driver_data[1]));
+                        iwl_trans_free_tx_cmd(priv->trans,
+                                              info->driver_data[1]);
 
                         memset(&info->status, 0, sizeof(info->status));
 
@@ -1225,10 +1233,19 @@ int iwlagn_rx_reply_tx(struct iwl_priv *priv, struct iwl_rx_cmd_buffer *rxb,
                         if (!is_agg)
                                 iwlagn_non_agg_tx_status(priv, ctx, hdr->addr1);
 
+                        is_offchannel_skb =
+                                (info->flags & IEEE80211_TX_CTL_TX_OFFCHAN);
                         freed++;
                 }
 
                 WARN_ON(!is_agg && freed != 1);
+
+                /*
+                 * An offchannel frame can be send only on the AUX queue, where
+                 * there is no aggregation (and reordering) so it only is single
+                 * skb is expected to be processed.
+                 */
+                WARN_ON(is_offchannel_skb && freed != 1);
         }
 
         iwl_check_abort_status(priv, tx_resp->frame_count, status);
@@ -1239,6 +1256,9 @@ int iwlagn_rx_reply_tx(struct iwl_priv *priv, struct iwl_rx_cmd_buffer *rxb,
                 ieee80211_tx_status(priv->hw, skb);
         }
 
+        if (is_offchannel_skb)
+                iwl_scan_offchannel_skb_status(priv);
+
         return 0;
 }
 
@@ -1341,7 +1361,7 @@ int iwlagn_rx_reply_compressed_ba(struct iwl_priv *priv,
                         WARN_ON_ONCE(1);
 
                 info = IEEE80211_SKB_CB(skb);
-                kmem_cache_free(iwl_tx_cmd_pool, (info->driver_data[1]));
+                iwl_trans_free_tx_cmd(priv->trans, info->driver_data[1]);
 
                 if (freed == 1) {
                         /* this is the first skb we deliver in this batch */
diff --git a/drivers/net/wireless/iwlwifi/iwl-ucode.c b/drivers/net/wireless/iwlwifi/dvm/ucode.c
index bc40dc68b0f..b3a314ba48c 100644
--- a/drivers/net/wireless/iwlwifi/iwl-ucode.c
+++ b/drivers/net/wireless/iwlwifi/dvm/ucode.c
@@ -30,15 +30,16 @@
 #include <linux/kernel.h>
 #include <linux/init.h>
 
-#include "iwl-dev.h"
 #include "iwl-io.h"
 #include "iwl-agn-hw.h"
-#include "iwl-agn.h"
-#include "iwl-agn-calib.h"
 #include "iwl-trans.h"
 #include "iwl-fh.h"
 #include "iwl-op-mode.h"
 
+#include "dev.h"
+#include "agn.h"
+#include "calib.h"
+
 /******************************************************************************
  *
  * uCode download functions
@@ -60,8 +61,7 @@ iwl_get_ucode_image(struct iwl_priv *priv, enum iwl_ucode_type ucode_type)
 static int iwl_set_Xtal_calib(struct iwl_priv *priv)
 {
         struct iwl_calib_xtal_freq_cmd cmd;
-        __le16 *xtal_calib =
-                (__le16 *)iwl_eeprom_query_addr(priv, EEPROM_XTAL);
+        __le16 *xtal_calib = priv->eeprom_data->xtal_calib;
 
         iwl_set_calib_hdr(&cmd.hdr, IWL_PHY_CALIBRATE_CRYSTAL_FRQ_CMD);
         cmd.cap_pin1 = le16_to_cpu(xtal_calib[0]);
@@ -72,12 +72,10 @@ static int iwl_set_Xtal_calib(struct iwl_priv *priv)
 static int iwl_set_temperature_offset_calib(struct iwl_priv *priv)
 {
         struct iwl_calib_temperature_offset_cmd cmd;
-        __le16 *offset_calib =
-                (__le16 *)iwl_eeprom_query_addr(priv, EEPROM_RAW_TEMPERATURE);
 
         memset(&cmd, 0, sizeof(cmd));
         iwl_set_calib_hdr(&cmd.hdr, IWL_PHY_CALIBRATE_TEMP_OFFSET_CMD);
-        memcpy(&cmd.radio_sensor_offset, offset_calib, sizeof(*offset_calib));
+        cmd.radio_sensor_offset = priv->eeprom_data->raw_temperature;
         if (!(cmd.radio_sensor_offset))
                 cmd.radio_sensor_offset = DEFAULT_RADIO_SENSOR_OFFSET;
 
@@ -89,27 +87,17 @@ static int iwl_set_temperature_offset_calib(struct iwl_priv *priv)
 static int iwl_set_temperature_offset_calib_v2(struct iwl_priv *priv)
 {
         struct iwl_calib_temperature_offset_v2_cmd cmd;
-        __le16 *offset_calib_high = (__le16 *)iwl_eeprom_query_addr(priv,
-                                     EEPROM_KELVIN_TEMPERATURE);
-        __le16 *offset_calib_low =
-                (__le16 *)iwl_eeprom_query_addr(priv, EEPROM_RAW_TEMPERATURE);
-        struct iwl_eeprom_calib_hdr *hdr;
 
         memset(&cmd, 0, sizeof(cmd));
         iwl_set_calib_hdr(&cmd.hdr, IWL_PHY_CALIBRATE_TEMP_OFFSET_CMD);
-        hdr = (struct iwl_eeprom_calib_hdr *)iwl_eeprom_query_addr(priv,
-                                                        EEPROM_CALIB_ALL);
-        memcpy(&cmd.radio_sensor_offset_high, offset_calib_high,
-                sizeof(*offset_calib_high));
-        memcpy(&cmd.radio_sensor_offset_low, offset_calib_low,
-                sizeof(*offset_calib_low));
-        if (!(cmd.radio_sensor_offset_low)) {
+        cmd.radio_sensor_offset_high = priv->eeprom_data->kelvin_temperature;
+        cmd.radio_sensor_offset_low = priv->eeprom_data->raw_temperature;
+        if (!cmd.radio_sensor_offset_low) {
                 IWL_DEBUG_CALIB(priv, "no info in EEPROM, use default\n");
                 cmd.radio_sensor_offset_low = DEFAULT_RADIO_SENSOR_OFFSET;
                 cmd.radio_sensor_offset_high = DEFAULT_RADIO_SENSOR_OFFSET;
         }
-        memcpy(&cmd.burntVoltageRef, &hdr->voltage,
-                sizeof(hdr->voltage));
+        cmd.burntVoltageRef = priv->eeprom_data->calib_voltage;
 
         IWL_DEBUG_CALIB(priv, "Radio sensor offset high: %d\n",
                         le16_to_cpu(cmd.radio_sensor_offset_high));
@@ -177,7 +165,7 @@ int iwl_init_alive_start(struct iwl_priv *priv)
         return 0;
 }
 
-int iwl_send_wimax_coex(struct iwl_priv *priv)
+static int iwl_send_wimax_coex(struct iwl_priv *priv)
 {
         struct iwl_wimax_coex_cmd coex_cmd;
 
diff --git a/drivers/net/wireless/iwlwifi/iwl-config.h b/drivers/net/wireless/iwlwifi/iwl-config.h
index 67b28aa7f9b..10e47938b63 100644
--- a/drivers/net/wireless/iwlwifi/iwl-config.h
+++ b/drivers/net/wireless/iwlwifi/iwl-config.h
@@ -113,7 +113,7 @@ enum iwl_led_mode {
 #define IWL_MAX_PLCP_ERR_THRESHOLD_DISABLE      0
 
 /* TX queue watchdog timeouts in mSecs */
-#define IWL_WATCHHDOG_DISABLED  0
+#define IWL_WATCHDOG_DISABLED   0
 #define IWL_DEF_WD_TIMEOUT      2000
 #define IWL_LONG_WD_TIMEOUT     10000
 #define IWL_MAX_WD_TIMEOUT      120000
@@ -143,7 +143,7 @@ enum iwl_led_mode {
  * @chain_noise_scale: default chain noise scale used for gain computation
  * @wd_timeout: TX queues watchdog timeout
  * @max_event_log_size: size of event log buffer size for ucode event logging
- * @shadow_reg_enable: HW shadhow register bit
+ * @shadow_reg_enable: HW shadow register support
  * @hd_v2: v2 of enhanced sensitivity value, used for 2000 series and up
  * @no_idle_support: do not support idle mode
  */
@@ -182,13 +182,34 @@ struct iwl_bt_params {
         bool bt_sco_disable;
         bool bt_session_2;
 };
+
 /*
  * @use_rts_for_aggregation: use rts/cts protection for HT traffic
+ * @ht40_bands: bitmap of bands (using %IEEE80211_BAND_*) that support HT40
  */
 struct iwl_ht_params {
+        enum ieee80211_smps_mode smps_mode;
         const bool ht_greenfield_support; /* if used set to true */
         bool use_rts_for_aggregation;
-        enum ieee80211_smps_mode smps_mode;
+        u8 ht40_bands;
+};
+
+/*
+ * information on how to parse the EEPROM
+ */
+#define EEPROM_REG_BAND_1_CHANNELS              0x08
+#define EEPROM_REG_BAND_2_CHANNELS              0x26
+#define EEPROM_REG_BAND_3_CHANNELS              0x42
+#define EEPROM_REG_BAND_4_CHANNELS              0x5C
+#define EEPROM_REG_BAND_5_CHANNELS              0x74
+#define EEPROM_REG_BAND_24_HT40_CHANNELS        0x82
+#define EEPROM_REG_BAND_52_HT40_CHANNELS        0x92
+#define EEPROM_6000_REG_BAND_24_HT40_CHANNELS   0x80
+#define EEPROM_REGULATORY_BAND_NO_HT40          0
+
+struct iwl_eeprom_params {
+        const u8 regulatory_bands[7];
+        bool enhanced_txpower;
 };
 
 /**
@@ -243,6 +264,7 @@ struct iwl_cfg {
         /* params likely to change within a device family */
         const struct iwl_ht_params *ht_params;
         const struct iwl_bt_params *bt_params;
+        const struct iwl_eeprom_params *eeprom_params;
         const bool need_temp_offset_calib; /* if used set to true */
         const bool no_xtal_calib;
         enum iwl_led_mode led_mode;
diff --git a/drivers/net/wireless/iwlwifi/iwl-csr.h b/drivers/net/wireless/iwlwifi/iwl-csr.h
index 59750543fce..34a5287dfc2 100644
--- a/drivers/net/wireless/iwlwifi/iwl-csr.h
+++ b/drivers/net/wireless/iwlwifi/iwl-csr.h
@@ -97,13 +97,10 @@
 /*
  * Hardware revision info
  * Bit fields:
- * 31-8:  Reserved
- *  7-4:  Type of device:  see CSR_HW_REV_TYPE_xxx definitions
+ * 31-16:  Reserved
+ *  15-4:  Type of device:  see CSR_HW_REV_TYPE_xxx definitions
  *  3-2:  Revision step:  0 = A, 1 = B, 2 = C, 3 = D
  *  1-0:  "Dash" (-) value, as in A-1, etc.
- *
- * NOTE:  Revision step affects calculation of CCK txpower for 4965.
- * NOTE:  See also CSR_HW_REV_WA_REG (work-around for bug in 4965).
  */
 #define CSR_HW_REV              (CSR_BASE+0x028)
 
@@ -155,9 +152,21 @@
 #define CSR_DBG_LINK_PWR_MGMT_REG       (CSR_BASE+0x250)
 
 /* Bits for CSR_HW_IF_CONFIG_REG */
-#define CSR_HW_IF_CONFIG_REG_MSK_BOARD_VER      (0x00000C00)
-#define CSR_HW_IF_CONFIG_REG_BIT_MAC_SI         (0x00000100)
+#define CSR_HW_IF_CONFIG_REG_MSK_MAC_DASH       (0x00000003)
+#define CSR_HW_IF_CONFIG_REG_MSK_MAC_STEP       (0x0000000C)
+#define CSR_HW_IF_CONFIG_REG_MSK_BOARD_VER      (0x000000C0)
+#define CSR_HW_IF_CONFIG_REG_BIT_MAC_SI         (0x00000100)
 #define CSR_HW_IF_CONFIG_REG_BIT_RADIO_SI       (0x00000200)
+#define CSR_HW_IF_CONFIG_REG_MSK_PHY_TYPE       (0x00000C00)
+#define CSR_HW_IF_CONFIG_REG_MSK_PHY_DASH       (0x00003000)
+#define CSR_HW_IF_CONFIG_REG_MSK_PHY_STEP       (0x0000C000)
+
+#define CSR_HW_IF_CONFIG_REG_POS_MAC_DASH       (0)
+#define CSR_HW_IF_CONFIG_REG_POS_MAC_STEP       (2)
+#define CSR_HW_IF_CONFIG_REG_POS_BOARD_VER      (6)
+#define CSR_HW_IF_CONFIG_REG_POS_PHY_TYPE       (10)
+#define CSR_HW_IF_CONFIG_REG_POS_PHY_DASH       (12)
+#define CSR_HW_IF_CONFIG_REG_POS_PHY_STEP       (14)
 
 #define CSR_HW_IF_CONFIG_REG_BIT_HAP_WAKE_L1A   (0x00080000)
 #define CSR_HW_IF_CONFIG_REG_BIT_EEPROM_OWN_SEM (0x00200000)
@@ -270,7 +279,10 @@
 
 
 /* HW REV */
-#define CSR_HW_REV_TYPE_MSK            (0x00001F0)
+#define CSR_HW_REV_DASH(_val)          (((_val) & 0x0000003) >> 0)
+#define CSR_HW_REV_STEP(_val)          (((_val) & 0x000000C) >> 2)
+
+#define CSR_HW_REV_TYPE_MSK            (0x000FFF0)
 #define CSR_HW_REV_TYPE_5300           (0x0000020)
 #define CSR_HW_REV_TYPE_5350           (0x0000030)
 #define CSR_HW_REV_TYPE_5100           (0x0000050)
diff --git a/drivers/net/wireless/iwlwifi/iwl-debug.c b/drivers/net/wireless/iwlwifi/iwl-debug.c
index 2d1b42847b9..0f8fcd1d4fe 100644
--- a/drivers/net/wireless/iwlwifi/iwl-debug.c
+++ b/drivers/net/wireless/iwlwifi/iwl-debug.c
@@ -62,6 +62,7 @@
  *****************************************************************************/
 
 #include <linux/interrupt.h>
+#include <linux/export.h>
 #include "iwl-debug.h"
 #include "iwl-devtrace.h"
 
@@ -81,8 +82,11 @@ void __iwl_ ##fn(struct device *dev, const char *fmt, ...)	\
 }
 
 __iwl_fn(warn)
+EXPORT_SYMBOL_GPL(__iwl_warn);
 __iwl_fn(info)
+EXPORT_SYMBOL_GPL(__iwl_info);
 __iwl_fn(crit)
+EXPORT_SYMBOL_GPL(__iwl_crit);
 
 void __iwl_err(struct device *dev, bool rfkill_prefix, bool trace_only,
                 const char *fmt, ...)
@@ -103,6 +107,7 @@ void __iwl_err(struct device *dev, bool rfkill_prefix, bool trace_only,
         trace_iwlwifi_err(&vaf);
         va_end(args);
 }
+EXPORT_SYMBOL_GPL(__iwl_err);
 
 #if defined(CONFIG_IWLWIFI_DEBUG) || defined(CONFIG_IWLWIFI_DEVICE_TRACING)
 void __iwl_dbg(struct device *dev,
@@ -125,4 +130,5 @@ void __iwl_dbg(struct device *dev,
         trace_iwlwifi_dbg(level, in_interrupt(), function, &vaf);
         va_end(args);
 }
+EXPORT_SYMBOL_GPL(__iwl_dbg);
 #endif
diff --git a/drivers/net/wireless/iwlwifi/iwl-debug.h b/drivers/net/wireless/iwlwifi/iwl-debug.h
index 8376b842bdb..42b20b0e83b 100644
--- a/drivers/net/wireless/iwlwifi/iwl-debug.h
+++ b/drivers/net/wireless/iwlwifi/iwl-debug.h
@@ -38,13 +38,14 @@ static inline bool iwl_have_debug_level(u32 level)
 }
 
 void __iwl_err(struct device *dev, bool rfkill_prefix, bool only_trace,
-                const char *fmt, ...);
-void __iwl_warn(struct device *dev, const char *fmt, ...);
-void __iwl_info(struct device *dev, const char *fmt, ...);
-void __iwl_crit(struct device *dev, const char *fmt, ...);
+                const char *fmt, ...) __printf(4, 5);
+void __iwl_warn(struct device *dev, const char *fmt, ...) __printf(2, 3);
+void __iwl_info(struct device *dev, const char *fmt, ...) __printf(2, 3);
+void __iwl_crit(struct device *dev, const char *fmt, ...) __printf(2, 3);
 
 /* No matter what is m (priv, bus, trans), this will work */
 #define IWL_ERR(m, f, a...) __iwl_err((m)->dev, false, false, f, ## a)
+#define IWL_ERR_DEV(d, f, a...) __iwl_err((d), false, false, f, ## a)
 #define IWL_WARN(m, f, a...) __iwl_warn((m)->dev, f, ## a)
 #define IWL_INFO(m, f, a...) __iwl_info((m)->dev, f, ## a)
 #define IWL_CRIT(m, f, a...) __iwl_crit((m)->dev, f, ## a)
@@ -52,9 +53,9 @@ void __iwl_crit(struct device *dev, const char *fmt, ...);
 #if defined(CONFIG_IWLWIFI_DEBUG) || defined(CONFIG_IWLWIFI_DEVICE_TRACING)
 void __iwl_dbg(struct device *dev,
                u32 level, bool limit, const char *function,
-               const char *fmt, ...);
+               const char *fmt, ...) __printf(5, 6);
 #else
-static inline void
+__printf(5, 6) static inline void
 __iwl_dbg(struct device *dev,
           u32 level, bool limit, const char *function,
           const char *fmt, ...)
@@ -69,6 +70,8 @@ do {									\
 
 #define IWL_DEBUG(m, level, fmt, args...)                               \
         __iwl_dbg((m)->dev, level, false, __func__, fmt, ##args)
+#define IWL_DEBUG_DEV(dev, level, fmt, args...)                         \
+        __iwl_dbg((dev), level, false, __func__, fmt, ##args)
 #define IWL_DEBUG_LIMIT(m, level, fmt, args...)                         \
         __iwl_dbg((m)->dev, level, true, __func__, fmt, ##args)
 
@@ -153,7 +156,7 @@ do {                                            			\
 #define IWL_DEBUG_LED(p, f, a...)       IWL_DEBUG(p, IWL_DL_LED, f, ## a)
 #define IWL_DEBUG_WEP(p, f, a...)       IWL_DEBUG(p, IWL_DL_WEP, f, ## a)
 #define IWL_DEBUG_HC(p, f, a...)        IWL_DEBUG(p, IWL_DL_HCMD, f, ## a)
-#define IWL_DEBUG_EEPROM(p, f, a...)    IWL_DEBUG(p, IWL_DL_EEPROM, f, ## a)
+#define IWL_DEBUG_EEPROM(d, f, a...)    IWL_DEBUG_DEV(d, IWL_DL_EEPROM, f, ## a)
 #define IWL_DEBUG_CALIB(p, f, a...)     IWL_DEBUG(p, IWL_DL_CALIB, f, ## a)
 #define IWL_DEBUG_FW(p, f, a...)        IWL_DEBUG(p, IWL_DL_FW, f, ## a)
 #define IWL_DEBUG_RF_KILL(p, f, a...)   IWL_DEBUG(p, IWL_DL_RF_KILL, f, ## a)
diff --git a/drivers/net/wireless/iwlwifi/iwl-devtrace.c b/drivers/net/wireless/iwlwifi/iwl-devtrace.c
index 91f45e71e0a..70191ddbd8f 100644
--- a/drivers/net/wireless/iwlwifi/iwl-devtrace.c
+++ b/drivers/net/wireless/iwlwifi/iwl-devtrace.c
@@ -42,4 +42,9 @@ EXPORT_TRACEPOINT_SYMBOL(iwlwifi_dev_ucode_event);
 EXPORT_TRACEPOINT_SYMBOL(iwlwifi_dev_ucode_error);
 EXPORT_TRACEPOINT_SYMBOL(iwlwifi_dev_ucode_cont_event);
 EXPORT_TRACEPOINT_SYMBOL(iwlwifi_dev_ucode_wrap_event);
+EXPORT_TRACEPOINT_SYMBOL(iwlwifi_info);
+EXPORT_TRACEPOINT_SYMBOL(iwlwifi_warn);
+EXPORT_TRACEPOINT_SYMBOL(iwlwifi_crit);
+EXPORT_TRACEPOINT_SYMBOL(iwlwifi_err);
+EXPORT_TRACEPOINT_SYMBOL(iwlwifi_dbg);
 #endif
diff --git a/drivers/net/wireless/iwlwifi/iwl-devtrace.h b/drivers/net/wireless/iwlwifi/iwl-devtrace.h
index 06203d6a1d8..65364793021 100644
--- a/drivers/net/wireless/iwlwifi/iwl-devtrace.h
+++ b/drivers/net/wireless/iwlwifi/iwl-devtrace.h
@@ -28,6 +28,7 @@
 #define __IWLWIFI_DEVICE_TRACE
 
 #include <linux/tracepoint.h>
+#include <linux/device.h>
 
 
 #if !defined(CONFIG_IWLWIFI_DEVICE_TRACING) || defined(__CHECKER__)
diff --git a/drivers/net/wireless/iwlwifi/iwl-drv.c b/drivers/net/wireless/iwlwifi/iwl-drv.c
index fac67a526a3..a175997e782 100644
--- a/drivers/net/wireless/iwlwifi/iwl-drv.c
+++ b/drivers/net/wireless/iwlwifi/iwl-drv.c
@@ -77,8 +77,33 @@
 /* private includes */
 #include "iwl-fw-file.h"
 
+/******************************************************************************
+ *
+ * module boiler plate
+ *
+ ******************************************************************************/
+
+/*
+ * module name, copyright, version, etc.
+ */
+#define DRV_DESCRIPTION "Intel(R) Wireless WiFi driver for Linux"
+
+#ifdef CONFIG_IWLWIFI_DEBUG
+#define VD "d"
+#else
+#define VD
+#endif
+
+#define DRV_VERSION     IWLWIFI_VERSION VD
+
+MODULE_DESCRIPTION(DRV_DESCRIPTION);
+MODULE_VERSION(DRV_VERSION);
+MODULE_AUTHOR(DRV_COPYRIGHT " " DRV_AUTHOR);
+MODULE_LICENSE("GPL");
+
 /**
  * struct iwl_drv - drv common data
+ * @list: list of drv structures using this opmode
  * @fw: the iwl_fw structure
  * @op_mode: the running op_mode
  * @trans: transport layer
@@ -89,6 +114,7 @@
  * @request_firmware_complete: the firmware has been obtained from user space
  */
 struct iwl_drv {
+        struct list_head list;
         struct iwl_fw fw;
 
         struct iwl_op_mode *op_mode;
@@ -102,7 +128,19 @@ struct iwl_drv {
         struct completion request_firmware_complete;
 };
 
-
+#define DVM_OP_MODE     0
+#define MVM_OP_MODE     1
+
+/* Protects the table contents, i.e. the ops pointer & drv list */
+static struct mutex iwlwifi_opmode_table_mtx;
+static struct iwlwifi_opmode_table {
+        const char *name;                       /* name: iwldvm, iwlmvm, etc */
+        const struct iwl_op_mode_ops *ops;      /* pointer to op_mode ops */
+        struct list_head drv;           /* list of devices using this op_mode */
+} iwlwifi_opmode_table[] = {            /* ops set when driver is initialized */
+        { .name = "iwldvm", .ops = NULL },
+        { .name = "iwlmvm", .ops = NULL },
+};
 
 /*
  * struct fw_sec: Just for the image parsing proccess.
@@ -721,7 +759,6 @@ static int validate_sec_sizes(struct iwl_drv *drv,
         return 0;
 }
 
-
 /**
  * iwl_ucode_callback - callback when firmware was loaded
  *
@@ -733,6 +770,7 @@ static void iwl_ucode_callback(const struct firmware *ucode_raw, void *context)
         struct iwl_drv *drv = context;
         struct iwl_fw *fw = &drv->fw;
         struct iwl_ucode_header *ucode;
+        struct iwlwifi_opmode_table *op;
         int err;
         struct iwl_firmware_pieces pieces;
         const unsigned int api_max = drv->cfg->ucode_api_max;
@@ -740,6 +778,7 @@ static void iwl_ucode_callback(const struct firmware *ucode_raw, void *context)
         const unsigned int api_min = drv->cfg->ucode_api_min;
         u32 api_ver;
         int i;
+        bool load_module = false;
 
         fw->ucode_capa.max_probe_length = 200;
         fw->ucode_capa.standard_phy_calibration_size =
@@ -862,10 +901,24 @@ static void iwl_ucode_callback(const struct firmware *ucode_raw, void *context)
         /* We have our copies now, allow OS release its copies */
         release_firmware(ucode_raw);
 
-        drv->op_mode = iwl_dvm_ops.start(drv->trans, drv->cfg, &drv->fw);
+        mutex_lock(&iwlwifi_opmode_table_mtx);
+        op = &iwlwifi_opmode_table[DVM_OP_MODE];
 
-        if (!drv->op_mode)
-                goto out_unbind;
+        /* add this device to the list of devices using this op_mode */
+        list_add_tail(&drv->list, &op->drv);
+
+        if (op->ops) {
+                const struct iwl_op_mode_ops *ops = op->ops;
+                drv->op_mode = ops->start(drv->trans, drv->cfg, &drv->fw);
+
+                if (!drv->op_mode) {
+                        mutex_unlock(&iwlwifi_opmode_table_mtx);
+                        goto out_unbind;
+                }
+        } else {
+                load_module = true;
+        }
+        mutex_unlock(&iwlwifi_opmode_table_mtx);
 
         /*
          * Complete the firmware request last so that
@@ -873,6 +926,14 @@ static void iwl_ucode_callback(const struct firmware *ucode_raw, void *context)
          * are doing the start() above.
          */
         complete(&drv->request_firmware_complete);
+
+        /*
+         * Load the module last so we don't block anything
+         * else from proceeding if the module fails to load
+         * or hangs loading.
+         */
+        if (load_module)
+                request_module("%s", op->name);
         return;
 
  try_again:
@@ -906,6 +967,7 @@ struct iwl_drv *iwl_drv_start(struct iwl_trans *trans,
         drv->cfg = cfg;
 
         init_completion(&drv->request_firmware_complete);
+        INIT_LIST_HEAD(&drv->list);
 
         ret = iwl_request_firmware(drv, true);
 
@@ -928,6 +990,16 @@ void iwl_drv_stop(struct iwl_drv *drv)
 
         iwl_dealloc_ucode(drv);
 
+        mutex_lock(&iwlwifi_opmode_table_mtx);
+        /*
+         * List is empty (this item wasn't added)
+         * when firmware loading failed -- in that
+         * case we can't remove it from any list.
+         */
+        if (!list_empty(&drv->list))
+                list_del(&drv->list);
+        mutex_unlock(&iwlwifi_opmode_table_mtx);
+
         kfree(drv);
 }
 
@@ -943,6 +1015,75 @@ struct iwl_mod_params iwlwifi_mod_params = {
         .auto_agg = true,
         /* the rest are 0 by default */
 };
+EXPORT_SYMBOL_GPL(iwlwifi_mod_params);
+
+int iwl_opmode_register(const char *name, const struct iwl_op_mode_ops *ops)
+{
+        int i;
+        struct iwl_drv *drv;
+
+        mutex_lock(&iwlwifi_opmode_table_mtx);
+        for (i = 0; i < ARRAY_SIZE(iwlwifi_opmode_table); i++) {
+                if (strcmp(iwlwifi_opmode_table[i].name, name))
+                        continue;
+                iwlwifi_opmode_table[i].ops = ops;
+                list_for_each_entry(drv, &iwlwifi_opmode_table[i].drv, list)
+                        drv->op_mode = ops->start(drv->trans, drv->cfg,
+                                                  &drv->fw);
+                mutex_unlock(&iwlwifi_opmode_table_mtx);
+                return 0;
+        }
+        mutex_unlock(&iwlwifi_opmode_table_mtx);
+        return -EIO;
+}
+EXPORT_SYMBOL_GPL(iwl_opmode_register);
+
+void iwl_opmode_deregister(const char *name)
+{
+        int i;
+        struct iwl_drv *drv;
+
+        mutex_lock(&iwlwifi_opmode_table_mtx);
+        for (i = 0; i < ARRAY_SIZE(iwlwifi_opmode_table); i++) {
+                if (strcmp(iwlwifi_opmode_table[i].name, name))
+                        continue;
+                iwlwifi_opmode_table[i].ops = NULL;
+
+                /* call the stop routine for all devices */
+                list_for_each_entry(drv, &iwlwifi_opmode_table[i].drv, list) {
+                        if (drv->op_mode) {
+                                iwl_op_mode_stop(drv->op_mode);
+                                drv->op_mode = NULL;
+                        }
+                }
+                mutex_unlock(&iwlwifi_opmode_table_mtx);
+                return;
+        }
+        mutex_unlock(&iwlwifi_opmode_table_mtx);
+}
+EXPORT_SYMBOL_GPL(iwl_opmode_deregister);
+
+static int __init iwl_drv_init(void)
+{
+        int i;
+
+        mutex_init(&iwlwifi_opmode_table_mtx);
+
+        for (i = 0; i < ARRAY_SIZE(iwlwifi_opmode_table); i++)
+                INIT_LIST_HEAD(&iwlwifi_opmode_table[i].drv);
+
+        pr_info(DRV_DESCRIPTION ", " DRV_VERSION "\n");
+        pr_info(DRV_COPYRIGHT "\n");
+
+        return iwl_pci_register_driver();
+}
+module_init(iwl_drv_init);
+
+static void __exit iwl_drv_exit(void)
+{
+        iwl_pci_unregister_driver();
+}
+module_exit(iwl_drv_exit);
 
 #ifdef CONFIG_IWLWIFI_DEBUG
 module_param_named(debug, iwlwifi_mod_params.debug_level, uint,
diff --git a/drivers/net/wireless/iwlwifi/iwl-eeprom-parse.c b/drivers/net/wireless/iwlwifi/iwl-eeprom-parse.c
new file mode 100644
index 00000000000..f10170fe879
--- /dev/null
+++ b/drivers/net/wireless/iwlwifi/iwl-eeprom-parse.c
@@ -0,0 +1,903 @@
+/******************************************************************************
+ *
+ * This file is provided under a dual BSD/GPLv2 license.  When using or
+ * redistributing this file, you may do so under either license.
+ *
+ * GPL LICENSE SUMMARY
+ *
+ * Copyright(c) 2008 - 2012 Intel Corporation. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110,
+ * USA
+ *
+ * The full GNU General Public License is included in this distribution
+ * in the file called LICENSE.GPL.
+ *
+ * Contact Information:
+ *  Intel Linux Wireless <ilw@linux.intel.com>
+ * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
+ *
+ * BSD LICENSE
+ *
+ * Copyright(c) 2005 - 2012 Intel Corporation. All rights reserved.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *  * Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *  * Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *  * Neither the name Intel Corporation nor the names of its
+ *    contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *****************************************************************************/
+#include <linux/types.h>
+#include <linux/slab.h>
+#include <linux/export.h>
+#include "iwl-modparams.h"
+#include "iwl-eeprom-parse.h"
+
+/* EEPROM offset definitions */
+
+/* indirect access definitions */
+#define ADDRESS_MSK                 0x0000FFFF
+#define INDIRECT_TYPE_MSK           0x000F0000
+#define INDIRECT_HOST               0x00010000
+#define INDIRECT_GENERAL            0x00020000
+#define INDIRECT_REGULATORY         0x00030000
+#define INDIRECT_CALIBRATION        0x00040000
+#define INDIRECT_PROCESS_ADJST      0x00050000
+#define INDIRECT_OTHERS             0x00060000
+#define INDIRECT_TXP_LIMIT          0x00070000
+#define INDIRECT_TXP_LIMIT_SIZE     0x00080000
+#define INDIRECT_ADDRESS            0x00100000
+
+/* corresponding link offsets in EEPROM */
+#define EEPROM_LINK_HOST             (2*0x64)
+#define EEPROM_LINK_GENERAL          (2*0x65)
+#define EEPROM_LINK_REGULATORY       (2*0x66)
+#define EEPROM_LINK_CALIBRATION      (2*0x67)
+#define EEPROM_LINK_PROCESS_ADJST    (2*0x68)
+#define EEPROM_LINK_OTHERS           (2*0x69)
+#define EEPROM_LINK_TXP_LIMIT        (2*0x6a)
+#define EEPROM_LINK_TXP_LIMIT_SIZE   (2*0x6b)
+
+/* General */
+#define EEPROM_DEVICE_ID                    (2*0x08)    /* 2 bytes */
+#define EEPROM_SUBSYSTEM_ID                 (2*0x0A)    /* 2 bytes */
+#define EEPROM_MAC_ADDRESS                  (2*0x15)    /* 6  bytes */
+#define EEPROM_BOARD_REVISION               (2*0x35)    /* 2  bytes */
+#define EEPROM_BOARD_PBA_NUMBER             (2*0x3B+1)  /* 9  bytes */
+#define EEPROM_VERSION                      (2*0x44)    /* 2  bytes */
+#define EEPROM_SKU_CAP                      (2*0x45)    /* 2  bytes */
+#define EEPROM_OEM_MODE                     (2*0x46)    /* 2  bytes */
+#define EEPROM_RADIO_CONFIG                 (2*0x48)    /* 2  bytes */
+#define EEPROM_NUM_MAC_ADDRESS              (2*0x4C)    /* 2  bytes */
+
+/* calibration */
+struct iwl_eeprom_calib_hdr {
+        u8 version;
+        u8 pa_type;
+        __le16 voltage;
+} __packed;
+
+#define EEPROM_CALIB_ALL        (INDIRECT_ADDRESS | INDIRECT_CALIBRATION)
+#define EEPROM_XTAL             ((2*0x128) | EEPROM_CALIB_ALL)
+
+/* temperature */
+#define EEPROM_KELVIN_TEMPERATURE       ((2*0x12A) | EEPROM_CALIB_ALL)
+#define EEPROM_RAW_TEMPERATURE          ((2*0x12B) | EEPROM_CALIB_ALL)
+
+/*
+ * EEPROM bands
+ * These are the channel numbers from each band in the order
+ * that they are stored in the EEPROM band information. Note
+ * that EEPROM bands aren't the same as mac80211 bands, and
+ * there are even special "ht40 bands" in the EEPROM.
+ */
+static const u8 iwl_eeprom_band_1[14] = { /* 2.4 GHz */
+        1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14
+};
+
+static const u8 iwl_eeprom_band_2[] = { /* 4915-5080MHz */
+        183, 184, 185, 187, 188, 189, 192, 196, 7, 8, 11, 12, 16
+};
+
+static const u8 iwl_eeprom_band_3[] = { /* 5170-5320MHz */
+        34, 36, 38, 40, 42, 44, 46, 48, 52, 56, 60, 64
+};
+
+static const u8 iwl_eeprom_band_4[] = { /* 5500-5700MHz */
+        100, 104, 108, 112, 116, 120, 124, 128, 132, 136, 140
+};
+
+static const u8 iwl_eeprom_band_5[] = { /* 5725-5825MHz */
+        145, 149, 153, 157, 161, 165
+};
+
+static const u8 iwl_eeprom_band_6[] = { /* 2.4 ht40 channel */
+        1, 2, 3, 4, 5, 6, 7
+};
+
+static const u8 iwl_eeprom_band_7[] = { /* 5.2 ht40 channel */
+        36, 44, 52, 60, 100, 108, 116, 124, 132, 149, 157
+};
+
+#define IWL_NUM_CHANNELS        (ARRAY_SIZE(iwl_eeprom_band_1) + \
+                                 ARRAY_SIZE(iwl_eeprom_band_2) + \
+                                 ARRAY_SIZE(iwl_eeprom_band_3) + \
+                                 ARRAY_SIZE(iwl_eeprom_band_4) + \
+                                 ARRAY_SIZE(iwl_eeprom_band_5))
+
+/* rate data (static) */
+static struct ieee80211_rate iwl_cfg80211_rates[] = {
+        { .bitrate = 1 * 10, .hw_value = 0, .hw_value_short = 0, },
+        { .bitrate = 2 * 10, .hw_value = 1, .hw_value_short = 1,
+          .flags = IEEE80211_RATE_SHORT_PREAMBLE, },
+        { .bitrate = 5.5 * 10, .hw_value = 2, .hw_value_short = 2,
+          .flags = IEEE80211_RATE_SHORT_PREAMBLE, },
+        { .bitrate = 11 * 10, .hw_value = 3, .hw_value_short = 3,
+          .flags = IEEE80211_RATE_SHORT_PREAMBLE, },
+        { .bitrate = 6 * 10, .hw_value = 4, .hw_value_short = 4, },
+        { .bitrate = 9 * 10, .hw_value = 5, .hw_value_short = 5, },
+        { .bitrate = 12 * 10, .hw_value = 6, .hw_value_short = 6, },
+        { .bitrate = 18 * 10, .hw_value = 7, .hw_value_short = 7, },
+        { .bitrate = 24 * 10, .hw_value = 8, .hw_value_short = 8, },
+        { .bitrate = 36 * 10, .hw_value = 9, .hw_value_short = 9, },
+        { .bitrate = 48 * 10, .hw_value = 10, .hw_value_short = 10, },
+        { .bitrate = 54 * 10, .hw_value = 11, .hw_value_short = 11, },
+};
+#define RATES_24_OFFS   0
+#define N_RATES_24      ARRAY_SIZE(iwl_cfg80211_rates)
+#define RATES_52_OFFS   4
+#define N_RATES_52      (N_RATES_24 - RATES_52_OFFS)
+
+/* EEPROM reading functions */
+
+static u16 iwl_eeprom_query16(const u8 *eeprom, size_t eeprom_size, int offset)
+{
+        if (WARN_ON(offset + sizeof(u16) > eeprom_size))
+                return 0;
+        return le16_to_cpup((__le16 *)(eeprom + offset));
+}
+
+static u32 eeprom_indirect_address(const u8 *eeprom, size_t eeprom_size,
+                                   u32 address)
+{
+        u16 offset = 0;
+
+        if ((address & INDIRECT_ADDRESS) == 0)
+                return address;
+
+        switch (address & INDIRECT_TYPE_MSK) {
+        case INDIRECT_HOST:
+                offset = iwl_eeprom_query16(eeprom, eeprom_size,
+                                            EEPROM_LINK_HOST);
+                break;
+        case INDIRECT_GENERAL:
+                offset = iwl_eeprom_query16(eeprom, eeprom_size,
+                                            EEPROM_LINK_GENERAL);
+                break;
+        case INDIRECT_REGULATORY:
+                offset = iwl_eeprom_query16(eeprom, eeprom_size,
+                                            EEPROM_LINK_REGULATORY);
+                break;
+        case INDIRECT_TXP_LIMIT:
+                offset = iwl_eeprom_query16(eeprom, eeprom_size,
+                                            EEPROM_LINK_TXP_LIMIT);
+                break;
+        case INDIRECT_TXP_LIMIT_SIZE:
+                offset = iwl_eeprom_query16(eeprom, eeprom_size,
+                                            EEPROM_LINK_TXP_LIMIT_SIZE);
+                break;
+        case INDIRECT_CALIBRATION:
+                offset = iwl_eeprom_query16(eeprom, eeprom_size,
+                                            EEPROM_LINK_CALIBRATION);
+                break;
+        case INDIRECT_PROCESS_ADJST:
+                offset = iwl_eeprom_query16(eeprom, eeprom_size,
+                                            EEPROM_LINK_PROCESS_ADJST);
+                break;
+        case INDIRECT_OTHERS:
+                offset = iwl_eeprom_query16(eeprom, eeprom_size,
+                                            EEPROM_LINK_OTHERS);
+                break;
+        default:
+                WARN_ON(1);
+                break;
+        }
+
+        /* translate the offset from words to byte */
+        return (address & ADDRESS_MSK) + (offset << 1);
+}
+
+static const u8 *iwl_eeprom_query_addr(const u8 *eeprom, size_t eeprom_size,
+                                       u32 offset)
+{
+        u32 address = eeprom_indirect_address(eeprom, eeprom_size, offset);
+
+        if (WARN_ON(address >= eeprom_size))
+                return NULL;
+
+        return &eeprom[address];
+}
+
+static int iwl_eeprom_read_calib(const u8 *eeprom, size_t eeprom_size,
+                                 struct iwl_eeprom_data *data)
+{
+        struct iwl_eeprom_calib_hdr *hdr;
+
+        hdr = (void *)iwl_eeprom_query_addr(eeprom, eeprom_size,
+                                            EEPROM_CALIB_ALL);
+        if (!hdr)
+                return -ENODATA;
+        data->calib_version = hdr->version;
+        data->calib_voltage = hdr->voltage;
+
+        return 0;
+}
+
+/**
+ * enum iwl_eeprom_channel_flags - channel flags in EEPROM
+ * @EEPROM_CHANNEL_VALID: channel is usable for this SKU/geo
+ * @EEPROM_CHANNEL_IBSS: usable as an IBSS channel
+ * @EEPROM_CHANNEL_ACTIVE: active scanning allowed
+ * @EEPROM_CHANNEL_RADAR: radar detection required
+ * @EEPROM_CHANNEL_WIDE: 20 MHz channel okay (?)
+ * @EEPROM_CHANNEL_DFS: dynamic freq selection candidate
+ */
+enum iwl_eeprom_channel_flags {
+        EEPROM_CHANNEL_VALID = BIT(0),
+        EEPROM_CHANNEL_IBSS = BIT(1),
+        EEPROM_CHANNEL_ACTIVE = BIT(3),
+        EEPROM_CHANNEL_RADAR = BIT(4),
+        EEPROM_CHANNEL_WIDE = BIT(5),
+        EEPROM_CHANNEL_DFS = BIT(7),
+};
+
+/**
+ * struct iwl_eeprom_channel - EEPROM channel data
+ * @flags: %EEPROM_CHANNEL_* flags
+ * @max_power_avg: max power (in dBm) on this channel, at most 31 dBm
+ */
+struct iwl_eeprom_channel {
+        u8 flags;
+        s8 max_power_avg;
+} __packed;
+
+
+enum iwl_eeprom_enhanced_txpwr_flags {
+        IWL_EEPROM_ENH_TXP_FL_VALID = BIT(0),
+        IWL_EEPROM_ENH_TXP_FL_BAND_52G = BIT(1),
+        IWL_EEPROM_ENH_TXP_FL_OFDM = BIT(2),
+        IWL_EEPROM_ENH_TXP_FL_40MHZ = BIT(3),
+        IWL_EEPROM_ENH_TXP_FL_HT_AP = BIT(4),
+        IWL_EEPROM_ENH_TXP_FL_RES1 = BIT(5),
+        IWL_EEPROM_ENH_TXP_FL_RES2 = BIT(6),
+        IWL_EEPROM_ENH_TXP_FL_COMMON_TYPE = BIT(7),
+};
+
+/**
+ * iwl_eeprom_enhanced_txpwr structure
+ * @flags: entry flags
+ * @channel: channel number
+ * @chain_a_max_pwr: chain a max power in 1/2 dBm
+ * @chain_b_max_pwr: chain b max power in 1/2 dBm
+ * @chain_c_max_pwr: chain c max power in 1/2 dBm
+ * @delta_20_in_40: 20-in-40 deltas (hi/lo)
+ * @mimo2_max_pwr: mimo2 max power in 1/2 dBm
+ * @mimo3_max_pwr: mimo3 max power in 1/2 dBm
+ *
+ * This structure presents the enhanced regulatory tx power limit layout
+ * in an EEPROM image.
+ */
+struct iwl_eeprom_enhanced_txpwr {
+        u8 flags;
+        u8 channel;
+        s8 chain_a_max;
+        s8 chain_b_max;
+        s8 chain_c_max;
+        u8 delta_20_in_40;
+        s8 mimo2_max;
+        s8 mimo3_max;
+} __packed;
+
+static s8 iwl_get_max_txpwr_half_dbm(const struct iwl_eeprom_data *data,
+                                     struct iwl_eeprom_enhanced_txpwr *txp)
+{
+        s8 result = 0; /* (.5 dBm) */
+
+        /* Take the highest tx power from any valid chains */
+        if (data->valid_tx_ant & ANT_A && txp->chain_a_max > result)
+                result = txp->chain_a_max;
+
+        if (data->valid_tx_ant & ANT_B && txp->chain_b_max > result)
+                result = txp->chain_b_max;
+
+        if (data->valid_tx_ant & ANT_C && txp->chain_c_max > result)
+                result = txp->chain_c_max;
+
+        if ((data->valid_tx_ant == ANT_AB ||
+             data->valid_tx_ant == ANT_BC ||
+             data->valid_tx_ant == ANT_AC) && txp->mimo2_max > result)
+                result = txp->mimo2_max;
+
+        if (data->valid_tx_ant == ANT_ABC && txp->mimo3_max > result)
+                result = txp->mimo3_max;
+
+        return result;
+}
+
+#define EEPROM_TXP_OFFS (0x00 | INDIRECT_ADDRESS | INDIRECT_TXP_LIMIT)
+#define EEPROM_TXP_ENTRY_LEN sizeof(struct iwl_eeprom_enhanced_txpwr)
+#define EEPROM_TXP_SZ_OFFS (0x00 | INDIRECT_ADDRESS | INDIRECT_TXP_LIMIT_SIZE)
+
+#define TXP_CHECK_AND_PRINT(x) \
+        ((txp->flags & IWL_EEPROM_ENH_TXP_FL_##x) ? # x " " : "")
+
+static void
+iwl_eeprom_enh_txp_read_element(struct iwl_eeprom_data *data,
+                                struct iwl_eeprom_enhanced_txpwr *txp,
+                                int n_channels, s8 max_txpower_avg)
+{
+        int ch_idx;
+        enum ieee80211_band band;
+
+        band = txp->flags & IWL_EEPROM_ENH_TXP_FL_BAND_52G ?
+                IEEE80211_BAND_5GHZ : IEEE80211_BAND_2GHZ;
+
+        for (ch_idx = 0; ch_idx < n_channels; ch_idx++) {
+                struct ieee80211_channel *chan = &data->channels[ch_idx];
+
+                /* update matching channel or from common data only */
+                if (txp->channel != 0 && chan->hw_value != txp->channel)
+                        continue;
+
+                /* update matching band only */
+                if (band != chan->band)
+                        continue;
+
+                if (chan->max_power < max_txpower_avg &&
+                    !(txp->flags & IWL_EEPROM_ENH_TXP_FL_40MHZ))
+                        chan->max_power = max_txpower_avg;
+        }
+}
+
+static void iwl_eeprom_enhanced_txpower(struct device *dev,
+                                        struct iwl_eeprom_data *data,
+                                        const u8 *eeprom, size_t eeprom_size,
+                                        int n_channels)
+{
+        struct iwl_eeprom_enhanced_txpwr *txp_array, *txp;
+        int idx, entries;
+        __le16 *txp_len;
+        s8 max_txp_avg_halfdbm;
+
+        BUILD_BUG_ON(sizeof(struct iwl_eeprom_enhanced_txpwr) != 8);
+
+        /* the length is in 16-bit words, but we want entries */
+        txp_len = (__le16 *)iwl_eeprom_query_addr(eeprom, eeprom_size,
+                                                  EEPROM_TXP_SZ_OFFS);
+        entries = le16_to_cpup(txp_len) * 2 / EEPROM_TXP_ENTRY_LEN;
+
+        txp_array = (void *)iwl_eeprom_query_addr(eeprom, eeprom_size,
+                                                  EEPROM_TXP_OFFS);
+
+        for (idx = 0; idx < entries; idx++) {
+                txp = &txp_array[idx];
+                /* skip invalid entries */
+                if (!(txp->flags & IWL_EEPROM_ENH_TXP_FL_VALID))
+                        continue;
+
+                IWL_DEBUG_EEPROM(dev, "%s %d:\t %s%s%s%s%s%s%s%s (0x%02x)\n",
+                                 (txp->channel && (txp->flags &
+                                        IWL_EEPROM_ENH_TXP_FL_COMMON_TYPE)) ?
+                                        "Common " : (txp->channel) ?
+                                        "Channel" : "Common",
+                                 (txp->channel),
+                                 TXP_CHECK_AND_PRINT(VALID),
+                                 TXP_CHECK_AND_PRINT(BAND_52G),
+                                 TXP_CHECK_AND_PRINT(OFDM),
+                                 TXP_CHECK_AND_PRINT(40MHZ),
+                                 TXP_CHECK_AND_PRINT(HT_AP),
+                                 TXP_CHECK_AND_PRINT(RES1),
+                                 TXP_CHECK_AND_PRINT(RES2),
+                                 TXP_CHECK_AND_PRINT(COMMON_TYPE),
+                                 txp->flags);
+                IWL_DEBUG_EEPROM(dev,
+                                 "\t\t chain_A: 0x%02x chain_B: 0X%02x chain_C: 0X%02x\n",
+                                 txp->chain_a_max, txp->chain_b_max,
+                                 txp->chain_c_max);
+                IWL_DEBUG_EEPROM(dev,
+                                 "\t\t MIMO2: 0x%02x MIMO3: 0x%02x High 20_on_40: 0x%02x Low 20_on_40: 0x%02x\n",
+                                 txp->mimo2_max, txp->mimo3_max,
+                                 ((txp->delta_20_in_40 & 0xf0) >> 4),
+                                 (txp->delta_20_in_40 & 0x0f));
+
+                max_txp_avg_halfdbm = iwl_get_max_txpwr_half_dbm(data, txp);
+
+                iwl_eeprom_enh_txp_read_element(data, txp, n_channels,
+                                DIV_ROUND_UP(max_txp_avg_halfdbm, 2));
+
+                if (max_txp_avg_halfdbm > data->max_tx_pwr_half_dbm)
+                        data->max_tx_pwr_half_dbm = max_txp_avg_halfdbm;
+        }
+}
+
+static void iwl_init_band_reference(const struct iwl_cfg *cfg,
+                                    const u8 *eeprom, size_t eeprom_size,
+                                    int eeprom_band, int *eeprom_ch_count,
+                                    const struct iwl_eeprom_channel **ch_info,
+                                    const u8 **eeprom_ch_array)
+{
+        u32 offset = cfg->eeprom_params->regulatory_bands[eeprom_band - 1];
+
+        offset |= INDIRECT_ADDRESS | INDIRECT_REGULATORY;
+
+        *ch_info = (void *)iwl_eeprom_query_addr(eeprom, eeprom_size, offset);
+
+        switch (eeprom_band) {
+        case 1:         /* 2.4GHz band */
+                *eeprom_ch_count = ARRAY_SIZE(iwl_eeprom_band_1);
+                *eeprom_ch_array = iwl_eeprom_band_1;
+                break;
+        case 2:         /* 4.9GHz band */
+                *eeprom_ch_count = ARRAY_SIZE(iwl_eeprom_band_2);
+                *eeprom_ch_array = iwl_eeprom_band_2;
+                break;
+        case 3:         /* 5.2GHz band */
+                *eeprom_ch_count = ARRAY_SIZE(iwl_eeprom_band_3);
+                *eeprom_ch_array = iwl_eeprom_band_3;
+                break;
+        case 4:         /* 5.5GHz band */
+                *eeprom_ch_count = ARRAY_SIZE(iwl_eeprom_band_4);
+                *eeprom_ch_array = iwl_eeprom_band_4;
+                break;
+        case 5:         /* 5.7GHz band */
+                *eeprom_ch_count = ARRAY_SIZE(iwl_eeprom_band_5);
+                *eeprom_ch_array = iwl_eeprom_band_5;
+                break;
+        case 6:         /* 2.4GHz ht40 channels */
+                *eeprom_ch_count = ARRAY_SIZE(iwl_eeprom_band_6);
+                *eeprom_ch_array = iwl_eeprom_band_6;
+                break;
+        case 7:         /* 5 GHz ht40 channels */
+                *eeprom_ch_count = ARRAY_SIZE(iwl_eeprom_band_7);
+                *eeprom_ch_array = iwl_eeprom_band_7;
+                break;
+        default:
+                *eeprom_ch_count = 0;
+                *eeprom_ch_array = NULL;
+                WARN_ON(1);
+        }
+}
+
+#define CHECK_AND_PRINT(x) \
+        ((eeprom_ch->flags & EEPROM_CHANNEL_##x) ? # x " " : "")
+
+static void iwl_mod_ht40_chan_info(struct device *dev,
+                                   struct iwl_eeprom_data *data, int n_channels,
+                                   enum ieee80211_band band, u16 channel,
+                                   const struct iwl_eeprom_channel *eeprom_ch,
+                                   u8 clear_ht40_extension_channel)
+{
+        struct ieee80211_channel *chan = NULL;
+        int i;
+
+        for (i = 0; i < n_channels; i++) {
+                if (data->channels[i].band != band)
+                        continue;
+                if (data->channels[i].hw_value != channel)
+                        continue;
+                chan = &data->channels[i];
+                break;
+        }
+
+        if (!chan)
+                return;
+
+        IWL_DEBUG_EEPROM(dev,
+                         "HT40 Ch. %d [%sGHz] %s%s%s%s%s(0x%02x %ddBm): Ad-Hoc %ssupported\n",
+                         channel,
+                         band == IEEE80211_BAND_5GHZ ? "5.2" : "2.4",
+                         CHECK_AND_PRINT(IBSS),
+                         CHECK_AND_PRINT(ACTIVE),
+                         CHECK_AND_PRINT(RADAR),
+                         CHECK_AND_PRINT(WIDE),
+                         CHECK_AND_PRINT(DFS),
+                         eeprom_ch->flags,
+                         eeprom_ch->max_power_avg,
+                         ((eeprom_ch->flags & EEPROM_CHANNEL_IBSS) &&
+                          !(eeprom_ch->flags & EEPROM_CHANNEL_RADAR)) ? ""
+                                                                      : "not ");
+
+        if (eeprom_ch->flags & EEPROM_CHANNEL_VALID)
+                chan->flags &= ~clear_ht40_extension_channel;
+}
+
+#define CHECK_AND_PRINT_I(x)    \
+        ((eeprom_ch_info[ch_idx].flags & EEPROM_CHANNEL_##x) ? # x " " : "")
+
+static int iwl_init_channel_map(struct device *dev, const struct iwl_cfg *cfg,
+                                struct iwl_eeprom_data *data,
+                                const u8 *eeprom, size_t eeprom_size)
+{
+        int band, ch_idx;
+        const struct iwl_eeprom_channel *eeprom_ch_info;
+        const u8 *eeprom_ch_array;
+        int eeprom_ch_count;
+        int n_channels = 0;
+
+        /*
+         * Loop through the 5 EEPROM bands and add them to the parse list
+         */
+        for (band = 1; band <= 5; band++) {
+                struct ieee80211_channel *channel;
+
+                iwl_init_band_reference(cfg, eeprom, eeprom_size, band,
+                                        &eeprom_ch_count, &eeprom_ch_info,
+                                        &eeprom_ch_array);
+
+                /* Loop through each band adding each of the channels */
+                for (ch_idx = 0; ch_idx < eeprom_ch_count; ch_idx++) {
+                        const struct iwl_eeprom_channel *eeprom_ch;
+
+                        eeprom_ch = &eeprom_ch_info[ch_idx];
+
+                        if (!(eeprom_ch->flags & EEPROM_CHANNEL_VALID)) {
+                                IWL_DEBUG_EEPROM(dev,
+                                                 "Ch. %d Flags %x [%sGHz] - No traffic\n",
+                                                 eeprom_ch_array[ch_idx],
+                                                 eeprom_ch_info[ch_idx].flags,
+                                                 (band != 1) ? "5.2" : "2.4");
+                                continue;
+                        }
+
+                        channel = &data->channels[n_channels];
+                        n_channels++;
+
+                        channel->hw_value = eeprom_ch_array[ch_idx];
+                        channel->band = (band == 1) ? IEEE80211_BAND_2GHZ
+                                                    : IEEE80211_BAND_5GHZ;
+                        channel->center_freq =
+                                ieee80211_channel_to_frequency(
+                                        channel->hw_value, channel->band);
+
+                        /* set no-HT40, will enable as appropriate later */
+                        channel->flags = IEEE80211_CHAN_NO_HT40;
+
+                        if (!(eeprom_ch->flags & EEPROM_CHANNEL_IBSS))
+                                channel->flags |= IEEE80211_CHAN_NO_IBSS;
+
+                        if (!(eeprom_ch->flags & EEPROM_CHANNEL_ACTIVE))
+                                channel->flags |= IEEE80211_CHAN_PASSIVE_SCAN;
+
+                        if (eeprom_ch->flags & EEPROM_CHANNEL_RADAR)
+                                channel->flags |= IEEE80211_CHAN_RADAR;
+
+                        /* Initialize regulatory-based run-time data */
+                        channel->max_power =
+                                eeprom_ch_info[ch_idx].max_power_avg;
+                        IWL_DEBUG_EEPROM(dev,
+                                         "Ch. %d [%sGHz] %s%s%s%s%s%s(0x%02x %ddBm): Ad-Hoc %ssupported\n",
+                                         channel->hw_value,
+                                         (band != 1) ? "5.2" : "2.4",
+                                         CHECK_AND_PRINT_I(VALID),
+                                         CHECK_AND_PRINT_I(IBSS),
+                                         CHECK_AND_PRINT_I(ACTIVE),
+                                         CHECK_AND_PRINT_I(RADAR),
+                                         CHECK_AND_PRINT_I(WIDE),
+                                         CHECK_AND_PRINT_I(DFS),
+                                         eeprom_ch_info[ch_idx].flags,
+                                         eeprom_ch_info[ch_idx].max_power_avg,
+                                         ((eeprom_ch_info[ch_idx].flags &
+                                                        EEPROM_CHANNEL_IBSS) &&
+                                          !(eeprom_ch_info[ch_idx].flags &
+                                                        EEPROM_CHANNEL_RADAR))
+                                                ? "" : "not ");
+                }
+        }
+
+        if (cfg->eeprom_params->enhanced_txpower) {
+                /*
+                 * for newer device (6000 series and up)
+                 * EEPROM contain enhanced tx power information
+                 * driver need to process addition information
+                 * to determine the max channel tx power limits
+                 */
+                iwl_eeprom_enhanced_txpower(dev, data, eeprom, eeprom_size,
+                                            n_channels);
+        } else {
+                /* All others use data from channel map */
+                int i;
+
+                data->max_tx_pwr_half_dbm = -128;
+
+                for (i = 0; i < n_channels; i++)
+                        data->max_tx_pwr_half_dbm =
+                                max_t(s8, data->max_tx_pwr_half_dbm,
+                                      data->channels[i].max_power * 2);
+        }
+
+        /* Check if we do have HT40 channels */
+        if (cfg->eeprom_params->regulatory_bands[5] ==
+                                EEPROM_REGULATORY_BAND_NO_HT40 &&
+            cfg->eeprom_params->regulatory_bands[6] ==
+                                EEPROM_REGULATORY_BAND_NO_HT40)
+                return n_channels;
+
+        /* Two additional EEPROM bands for 2.4 and 5 GHz HT40 channels */
+        for (band = 6; band <= 7; band++) {
+                enum ieee80211_band ieeeband;
+
+                iwl_init_band_reference(cfg, eeprom, eeprom_size, band,
+                                        &eeprom_ch_count, &eeprom_ch_info,
+                                        &eeprom_ch_array);
+
+                /* EEPROM band 6 is 2.4, band 7 is 5 GHz */
+                ieeeband = (band == 6) ? IEEE80211_BAND_2GHZ
+                                       : IEEE80211_BAND_5GHZ;
+
+                /* Loop through each band adding each of the channels */
+                for (ch_idx = 0; ch_idx < eeprom_ch_count; ch_idx++) {
+                        /* Set up driver's info for lower half */
+                        iwl_mod_ht40_chan_info(dev, data, n_channels, ieeeband,
+                                               eeprom_ch_array[ch_idx],
+                                               &eeprom_ch_info[ch_idx],
+                                               IEEE80211_CHAN_NO_HT40PLUS);
+
+                        /* Set up driver's info for upper half */
+                        iwl_mod_ht40_chan_info(dev, data, n_channels, ieeeband,
+                                               eeprom_ch_array[ch_idx] + 4,
+                                               &eeprom_ch_info[ch_idx],
+                                               IEEE80211_CHAN_NO_HT40MINUS);
+                }
+        }
+
+        return n_channels;
+}
+
+static int iwl_init_sband_channels(struct iwl_eeprom_data *data,
+                                   struct ieee80211_supported_band *sband,
+                                   int n_channels, enum ieee80211_band band)
+{
+        struct ieee80211_channel *chan = &data->channels[0];
+        int n = 0, idx = 0;
+
+        while (chan->band != band && idx < n_channels)
+                chan = &data->channels[++idx];
+
+        sband->channels = &data->channels[idx];
+
+        while (chan->band == band && idx < n_channels) {
+                chan = &data->channels[++idx];
+                n++;
+        }
+
+        sband->n_channels = n;
+
+        return n;
+}
+
+#define MAX_BIT_RATE_40_MHZ     150 /* Mbps */
+#define MAX_BIT_RATE_20_MHZ     72 /* Mbps */
+
+static void iwl_init_ht_hw_capab(const struct iwl_cfg *cfg,
+                                 struct iwl_eeprom_data *data,
+                                 struct ieee80211_sta_ht_cap *ht_info,
+                                 enum ieee80211_band band)
+{
+        int max_bit_rate = 0;
+        u8 rx_chains;
+        u8 tx_chains;
+
+        tx_chains = hweight8(data->valid_tx_ant);
+        if (cfg->rx_with_siso_diversity)
+                rx_chains = 1;
+        else
+                rx_chains = hweight8(data->valid_rx_ant);
+
+        if (!(data->sku & EEPROM_SKU_CAP_11N_ENABLE) || !cfg->ht_params) {
+                ht_info->ht_supported = false;
+                return;
+        }
+
+        ht_info->ht_supported = true;
+        ht_info->cap = 0;
+
+        if (iwlwifi_mod_params.amsdu_size_8K)
+                ht_info->cap |= IEEE80211_HT_CAP_MAX_AMSDU;
+
+        ht_info->ampdu_factor = IEEE80211_HT_MAX_AMPDU_64K;
+        ht_info->ampdu_density = IEEE80211_HT_MPDU_DENSITY_4;
+
+        ht_info->mcs.rx_mask[0] = 0xFF;
+        if (rx_chains >= 2)
+                ht_info->mcs.rx_mask[1] = 0xFF;
+        if (rx_chains >= 3)
+                ht_info->mcs.rx_mask[2] = 0xFF;
+
+        if (cfg->ht_params->ht_greenfield_support)
+                ht_info->cap |= IEEE80211_HT_CAP_GRN_FLD;
+        ht_info->cap |= IEEE80211_HT_CAP_SGI_20;
+
+        max_bit_rate = MAX_BIT_RATE_20_MHZ;
+
+        if (cfg->ht_params->ht40_bands & BIT(band)) {
+                ht_info->cap |= IEEE80211_HT_CAP_SUP_WIDTH_20_40;
+                ht_info->cap |= IEEE80211_HT_CAP_SGI_40;
+                ht_info->mcs.rx_mask[4] = 0x01;
+                max_bit_rate = MAX_BIT_RATE_40_MHZ;
+        }
+
+        /* Highest supported Rx data rate */
+        max_bit_rate *= rx_chains;
+        WARN_ON(max_bit_rate & ~IEEE80211_HT_MCS_RX_HIGHEST_MASK);
+        ht_info->mcs.rx_highest = cpu_to_le16(max_bit_rate);
+
+        /* Tx MCS capabilities */
+        ht_info->mcs.tx_params = IEEE80211_HT_MCS_TX_DEFINED;
+        if (tx_chains != rx_chains) {
+                ht_info->mcs.tx_params |= IEEE80211_HT_MCS_TX_RX_DIFF;
+                ht_info->mcs.tx_params |= ((tx_chains - 1) <<
+                                IEEE80211_HT_MCS_TX_MAX_STREAMS_SHIFT);
+        }
+}
+
+static void iwl_init_sbands(struct device *dev, const struct iwl_cfg *cfg,
+                            struct iwl_eeprom_data *data,
+                            const u8 *eeprom, size_t eeprom_size)
+{
+        int n_channels = iwl_init_channel_map(dev, cfg, data,
+                                              eeprom, eeprom_size);
+        int n_used = 0;
+        struct ieee80211_supported_band *sband;
+
+        sband = &data->bands[IEEE80211_BAND_2GHZ];
+        sband->band = IEEE80211_BAND_2GHZ;
+        sband->bitrates = &iwl_cfg80211_rates[RATES_24_OFFS];
+        sband->n_bitrates = N_RATES_24;
+        n_used += iwl_init_sband_channels(data, sband, n_channels,
+                                          IEEE80211_BAND_2GHZ);
+        iwl_init_ht_hw_capab(cfg, data, &sband->ht_cap, IEEE80211_BAND_2GHZ);
+
+        sband = &data->bands[IEEE80211_BAND_5GHZ];
+        sband->band = IEEE80211_BAND_5GHZ;
+        sband->bitrates = &iwl_cfg80211_rates[RATES_52_OFFS];
+        sband->n_bitrates = N_RATES_52;
+        n_used += iwl_init_sband_channels(data, sband, n_channels,
+                                          IEEE80211_BAND_5GHZ);
+        iwl_init_ht_hw_capab(cfg, data, &sband->ht_cap, IEEE80211_BAND_5GHZ);
+
+        if (n_channels != n_used)
+                IWL_ERR_DEV(dev, "EEPROM: used only %d of %d channels\n",
+                            n_used, n_channels);
+}
+
+/* EEPROM data functions */
+
+struct iwl_eeprom_data *
+iwl_parse_eeprom_data(struct device *dev, const struct iwl_cfg *cfg,
+                      const u8 *eeprom, size_t eeprom_size)
+{
+        struct iwl_eeprom_data *data;
+        const void *tmp;
+
+        if (WARN_ON(!cfg || !cfg->eeprom_params))
+                return NULL;
+
+        data = kzalloc(sizeof(*data) +
+                       sizeof(struct ieee80211_channel) * IWL_NUM_CHANNELS,
+                       GFP_KERNEL);
+        if (!data)
+                return NULL;
+
+        /* get MAC address(es) */
+        tmp = iwl_eeprom_query_addr(eeprom, eeprom_size, EEPROM_MAC_ADDRESS);
+        if (!tmp)
+                goto err_free;
+        memcpy(data->hw_addr, tmp, ETH_ALEN);
+        data->n_hw_addrs = iwl_eeprom_query16(eeprom, eeprom_size,
+                                              EEPROM_NUM_MAC_ADDRESS);
+
+        if (iwl_eeprom_read_calib(eeprom, eeprom_size, data))
+                goto err_free;
+
+        tmp = iwl_eeprom_query_addr(eeprom, eeprom_size, EEPROM_XTAL);
+        if (!tmp)
+                goto err_free;
+        memcpy(data->xtal_calib, tmp, sizeof(data->xtal_calib));
+
+        tmp = iwl_eeprom_query_addr(eeprom, eeprom_size,
+                                    EEPROM_RAW_TEMPERATURE);
+        if (!tmp)
+                goto err_free;
+        data->raw_temperature = *(__le16 *)tmp;
+
+        tmp = iwl_eeprom_query_addr(eeprom, eeprom_size,
+                                    EEPROM_KELVIN_TEMPERATURE);
+        if (!tmp)
+                goto err_free;
+        data->kelvin_temperature = *(__le16 *)tmp;
+        data->kelvin_voltage = *((__le16 *)tmp + 1);
+
+        data->radio_cfg = iwl_eeprom_query16(eeprom, eeprom_size,
+                                             EEPROM_RADIO_CONFIG);
+        data->sku = iwl_eeprom_query16(eeprom, eeprom_size,
+                                       EEPROM_SKU_CAP);
+        if (iwlwifi_mod_params.disable_11n & IWL_DISABLE_HT_ALL)
+                data->sku &= ~EEPROM_SKU_CAP_11N_ENABLE;
+
+        data->eeprom_version = iwl_eeprom_query16(eeprom, eeprom_size,
+                                                  EEPROM_VERSION);
+
+        data->valid_tx_ant = EEPROM_RF_CFG_TX_ANT_MSK(data->radio_cfg);
+        data->valid_rx_ant = EEPROM_RF_CFG_RX_ANT_MSK(data->radio_cfg);
+
+        /* check overrides (some devices have wrong EEPROM) */
+        if (cfg->valid_tx_ant)
+                data->valid_tx_ant = cfg->valid_tx_ant;
+        if (cfg->valid_rx_ant)
+                data->valid_rx_ant = cfg->valid_rx_ant;
+
+        if (!data->valid_tx_ant || !data->valid_rx_ant) {
+                IWL_ERR_DEV(dev, "invalid antennas (0x%x, 0x%x)\n",
+                            data->valid_tx_ant, data->valid_rx_ant);
+                goto err_free;
+        }
+
+        iwl_init_sbands(dev, cfg, data, eeprom, eeprom_size);
+
+        return data;
+ err_free:
+        kfree(data);
+        return NULL;
+}
+EXPORT_SYMBOL_GPL(iwl_parse_eeprom_data);
+
+/* helper functions */
+int iwl_eeprom_check_version(struct iwl_eeprom_data *data,
+                             struct iwl_trans *trans)
+{
+        if (data->eeprom_version >= trans->cfg->eeprom_ver ||
+            data->calib_version >= trans->cfg->eeprom_calib_ver) {
+                IWL_INFO(trans, "device EEPROM VER=0x%x, CALIB=0x%x\n",
+                         data->eeprom_version, data->calib_version);
+                return 0;
+        }
+
+        IWL_ERR(trans,
+                "Unsupported (too old) EEPROM VER=0x%x < 0x%x CALIB=0x%x < 0x%x\n",
+                data->eeprom_version, trans->cfg->eeprom_ver,
+                data->calib_version,  trans->cfg->eeprom_calib_ver);
+        return -EINVAL;
+}
+EXPORT_SYMBOL_GPL(iwl_eeprom_check_version);
diff --git a/drivers/net/wireless/iwlwifi/iwl-eeprom-parse.h b/drivers/net/wireless/iwlwifi/iwl-eeprom-parse.h
new file mode 100644
index 00000000000..9c07c670a1c
--- /dev/null
+++ b/drivers/net/wireless/iwlwifi/iwl-eeprom-parse.h
@@ -0,0 +1,138 @@
+/******************************************************************************
+ *
+ * This file is provided under a dual BSD/GPLv2 license.  When using or
+ * redistributing this file, you may do so under either license.
+ *
+ * GPL LICENSE SUMMARY
+ *
+ * Copyright(c) 2008 - 2012 Intel Corporation. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110,
+ * USA
+ *
+ * The full GNU General Public License is included in this distribution
+ * in the file called LICENSE.GPL.
+ *
+ * Contact Information:
+ *  Intel Linux Wireless <ilw@linux.intel.com>
+ * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
+ *
+ * BSD LICENSE
+ *
+ * Copyright(c) 2005 - 2012 Intel Corporation. All rights reserved.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *  * Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *  * Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *  * Neither the name Intel Corporation nor the names of its
+ *    contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *****************************************************************************/
+#ifndef __iwl_eeprom_parse_h__
+#define __iwl_eeprom_parse_h__
+
+#include <linux/types.h>
+#include <linux/if_ether.h>
+#include "iwl-trans.h"
+
+/* SKU Capabilities (actual values from EEPROM definition) */
+#define EEPROM_SKU_CAP_BAND_24GHZ       (1 << 4)
+#define EEPROM_SKU_CAP_BAND_52GHZ       (1 << 5)
+#define EEPROM_SKU_CAP_11N_ENABLE       (1 << 6)
+#define EEPROM_SKU_CAP_AMT_ENABLE       (1 << 7)
+#define EEPROM_SKU_CAP_IPAN_ENABLE      (1 << 8)
+
+/* radio config bits (actual values from EEPROM definition) */
+#define EEPROM_RF_CFG_TYPE_MSK(x)   (x & 0x3)         /* bits 0-1   */
+#define EEPROM_RF_CFG_STEP_MSK(x)   ((x >> 2)  & 0x3) /* bits 2-3   */
+#define EEPROM_RF_CFG_DASH_MSK(x)   ((x >> 4)  & 0x3) /* bits 4-5   */
+#define EEPROM_RF_CFG_PNUM_MSK(x)   ((x >> 6)  & 0x3) /* bits 6-7   */
+#define EEPROM_RF_CFG_TX_ANT_MSK(x) ((x >> 8)  & 0xF) /* bits 8-11  */
+#define EEPROM_RF_CFG_RX_ANT_MSK(x) ((x >> 12) & 0xF) /* bits 12-15 */
+
+struct iwl_eeprom_data {
+        int n_hw_addrs;
+        u8 hw_addr[ETH_ALEN];
+
+        u16 radio_config;
+
+        u8 calib_version;
+        __le16 calib_voltage;
+
+        __le16 raw_temperature;
+        __le16 kelvin_temperature;
+        __le16 kelvin_voltage;
+        __le16 xtal_calib[2];
+
+        u16 sku;
+        u16 radio_cfg;
+        u16 eeprom_version;
+        s8 max_tx_pwr_half_dbm;
+
+        u8 valid_tx_ant, valid_rx_ant;
+
+        struct ieee80211_supported_band bands[IEEE80211_NUM_BANDS];
+        struct ieee80211_channel channels[];
+};
+
+/**
+ * iwl_parse_eeprom_data - parse EEPROM data and return values
+ *
+ * @dev: device pointer we're parsing for, for debug only
+ * @cfg: device configuration for parsing and overrides
+ * @eeprom: the EEPROM data
+ * @eeprom_size: length of the EEPROM data
+ *
+ * This function parses all EEPROM values we need and then
+ * returns a (newly allocated) struct containing all the
+ * relevant values for driver use. The struct must be freed
+ * later with iwl_free_eeprom_data().
+ */
+struct iwl_eeprom_data *
+iwl_parse_eeprom_data(struct device *dev, const struct iwl_cfg *cfg,
+                      const u8 *eeprom, size_t eeprom_size);
+
+/**
+ * iwl_free_eeprom_data - free EEPROM data
+ * @data: the data to free
+ */
+static inline void iwl_free_eeprom_data(struct iwl_eeprom_data *data)
+{
+        kfree(data);
+}
+
+int iwl_eeprom_check_version(struct iwl_eeprom_data *data,
+                             struct iwl_trans *trans);
+
+#endif /* __iwl_eeprom_parse_h__ */
diff --git a/drivers/net/wireless/iwlwifi/iwl-eeprom-read.c b/drivers/net/wireless/iwlwifi/iwl-eeprom-read.c
new file mode 100644
index 00000000000..27c7da3c6ed
--- /dev/null
+++ b/drivers/net/wireless/iwlwifi/iwl-eeprom-read.c
@@ -0,0 +1,463 @@
+/******************************************************************************
+ *
+ * This file is provided under a dual BSD/GPLv2 license.  When using or
+ * redistributing this file, you may do so under either license.
+ *
+ * GPL LICENSE SUMMARY
+ *
+ * Copyright(c) 2008 - 2012 Intel Corporation. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110,
+ * USA
+ *
+ * The full GNU General Public License is included in this distribution
+ * in the file called LICENSE.GPL.
+ *
+ * Contact Information:
+ *  Intel Linux Wireless <ilw@linux.intel.com>
+ * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
+ *
+ * BSD LICENSE
+ *
+ * Copyright(c) 2005 - 2012 Intel Corporation. All rights reserved.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *  * Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *  * Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *  * Neither the name Intel Corporation nor the names of its
+ *    contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *****************************************************************************/
+#include <linux/types.h>
+#include <linux/slab.h>
+#include <linux/export.h>
+
+#include "iwl-debug.h"
+#include "iwl-eeprom-read.h"
+#include "iwl-io.h"
+#include "iwl-prph.h"
+#include "iwl-csr.h"
+
+/*
+ * EEPROM access time values:
+ *
+ * Driver initiates EEPROM read by writing byte address << 1 to CSR_EEPROM_REG.
+ * Driver then polls CSR_EEPROM_REG for CSR_EEPROM_REG_READ_VALID_MSK (0x1).
+ * When polling, wait 10 uSec between polling loops, up to a maximum 5000 uSec.
+ * Driver reads 16-bit value from bits 31-16 of CSR_EEPROM_REG.
+ */
+#define IWL_EEPROM_ACCESS_TIMEOUT       5000 /* uSec */
+
+#define IWL_EEPROM_SEM_TIMEOUT          10   /* microseconds */
+#define IWL_EEPROM_SEM_RETRY_LIMIT      1000 /* number of attempts (not time) */
+
+
+/*
+ * The device's EEPROM semaphore prevents conflicts between driver and uCode
+ * when accessing the EEPROM; each access is a series of pulses to/from the
+ * EEPROM chip, not a single event, so even reads could conflict if they
+ * weren't arbitrated by the semaphore.
+ */
+
+#define EEPROM_SEM_TIMEOUT 10           /* milliseconds */
+#define EEPROM_SEM_RETRY_LIMIT 1000     /* number of attempts (not time) */
+
+static int iwl_eeprom_acquire_semaphore(struct iwl_trans *trans)
+{
+        u16 count;
+        int ret;
+
+        for (count = 0; count < EEPROM_SEM_RETRY_LIMIT; count++) {
+                /* Request semaphore */
+                iwl_set_bit(trans, CSR_HW_IF_CONFIG_REG,
+                            CSR_HW_IF_CONFIG_REG_BIT_EEPROM_OWN_SEM);
+
+                /* See if we got it */
+                ret = iwl_poll_bit(trans, CSR_HW_IF_CONFIG_REG,
+                                CSR_HW_IF_CONFIG_REG_BIT_EEPROM_OWN_SEM,
+                                CSR_HW_IF_CONFIG_REG_BIT_EEPROM_OWN_SEM,
+                                EEPROM_SEM_TIMEOUT);
+                if (ret >= 0) {
+                        IWL_DEBUG_EEPROM(trans->dev,
+                                         "Acquired semaphore after %d tries.\n",
+                                         count+1);
+                        return ret;
+                }
+        }
+
+        return ret;
+}
+
+static void iwl_eeprom_release_semaphore(struct iwl_trans *trans)
+{
+        iwl_clear_bit(trans, CSR_HW_IF_CONFIG_REG,
+                      CSR_HW_IF_CONFIG_REG_BIT_EEPROM_OWN_SEM);
+}
+
+static int iwl_eeprom_verify_signature(struct iwl_trans *trans, bool nvm_is_otp)
+{
+        u32 gp = iwl_read32(trans, CSR_EEPROM_GP) & CSR_EEPROM_GP_VALID_MSK;
+
+        IWL_DEBUG_EEPROM(trans->dev, "EEPROM signature=0x%08x\n", gp);
+
+        switch (gp) {
+        case CSR_EEPROM_GP_BAD_SIG_EEP_GOOD_SIG_OTP:
+                if (!nvm_is_otp) {
+                        IWL_ERR(trans, "EEPROM with bad signature: 0x%08x\n",
+                                gp);
+                        return -ENOENT;
+                }
+                return 0;
+        case CSR_EEPROM_GP_GOOD_SIG_EEP_LESS_THAN_4K:
+        case CSR_EEPROM_GP_GOOD_SIG_EEP_MORE_THAN_4K:
+                if (nvm_is_otp) {
+                        IWL_ERR(trans, "OTP with bad signature: 0x%08x\n", gp);
+                        return -ENOENT;
+                }
+                return 0;
+        case CSR_EEPROM_GP_BAD_SIGNATURE_BOTH_EEP_AND_OTP:
+        default:
+                IWL_ERR(trans,
+                        "bad EEPROM/OTP signature, type=%s, EEPROM_GP=0x%08x\n",
+                        nvm_is_otp ? "OTP" : "EEPROM", gp);
+                return -ENOENT;
+        }
+}
+
+/******************************************************************************
+ *
+ * OTP related functions
+ *
+******************************************************************************/
+
+static void iwl_set_otp_access_absolute(struct iwl_trans *trans)
+{
+        iwl_read32(trans, CSR_OTP_GP_REG);
+
+        iwl_clear_bit(trans, CSR_OTP_GP_REG,
+                      CSR_OTP_GP_REG_OTP_ACCESS_MODE);
+}
+
+static int iwl_nvm_is_otp(struct iwl_trans *trans)
+{
+        u32 otpgp;
+
+        /* OTP only valid for CP/PP and after */
+        switch (trans->hw_rev & CSR_HW_REV_TYPE_MSK) {
+        case CSR_HW_REV_TYPE_NONE:
+                IWL_ERR(trans, "Unknown hardware type\n");
+                return -EIO;
+        case CSR_HW_REV_TYPE_5300:
+        case CSR_HW_REV_TYPE_5350:
+        case CSR_HW_REV_TYPE_5100:
+        case CSR_HW_REV_TYPE_5150:
+                return 0;
+        default:
+                otpgp = iwl_read32(trans, CSR_OTP_GP_REG);
+                if (otpgp & CSR_OTP_GP_REG_DEVICE_SELECT)
+                        return 1;
+                return 0;
+        }
+}
+
+static int iwl_init_otp_access(struct iwl_trans *trans)
+{
+        int ret;
+
+        /* Enable 40MHz radio clock */
+        iwl_write32(trans, CSR_GP_CNTRL,
+                    iwl_read32(trans, CSR_GP_CNTRL) |
+                    CSR_GP_CNTRL_REG_FLAG_INIT_DONE);
+
+        /* wait for clock to be ready */
+        ret = iwl_poll_bit(trans, CSR_GP_CNTRL,
+                           CSR_GP_CNTRL_REG_FLAG_MAC_CLOCK_READY,
+                           CSR_GP_CNTRL_REG_FLAG_MAC_CLOCK_READY,
+                           25000);
+        if (ret < 0) {
+                IWL_ERR(trans, "Time out access OTP\n");
+        } else {
+                iwl_set_bits_prph(trans, APMG_PS_CTRL_REG,
+                                  APMG_PS_CTRL_VAL_RESET_REQ);
+                udelay(5);
+                iwl_clear_bits_prph(trans, APMG_PS_CTRL_REG,
+                                    APMG_PS_CTRL_VAL_RESET_REQ);
+
+                /*
+                 * CSR auto clock gate disable bit -
+                 * this is only applicable for HW with OTP shadow RAM
+                 */
+                if (trans->cfg->base_params->shadow_ram_support)
+                        iwl_set_bit(trans, CSR_DBG_LINK_PWR_MGMT_REG,
+                                    CSR_RESET_LINK_PWR_MGMT_DISABLED);
+        }
+        return ret;
+}
+
+static int iwl_read_otp_word(struct iwl_trans *trans, u16 addr,
+                             __le16 *eeprom_data)
+{
+        int ret = 0;
+        u32 r;
+        u32 otpgp;
+
+        iwl_write32(trans, CSR_EEPROM_REG,
+                    CSR_EEPROM_REG_MSK_ADDR & (addr << 1));
+        ret = iwl_poll_bit(trans, CSR_EEPROM_REG,
+                                 CSR_EEPROM_REG_READ_VALID_MSK,
+                                 CSR_EEPROM_REG_READ_VALID_MSK,
+                                 IWL_EEPROM_ACCESS_TIMEOUT);
+        if (ret < 0) {
+                IWL_ERR(trans, "Time out reading OTP[%d]\n", addr);
+                return ret;
+        }
+        r = iwl_read32(trans, CSR_EEPROM_REG);
+        /* check for ECC errors: */
+        otpgp = iwl_read32(trans, CSR_OTP_GP_REG);
+        if (otpgp & CSR_OTP_GP_REG_ECC_UNCORR_STATUS_MSK) {
+                /* stop in this case */
+                /* set the uncorrectable OTP ECC bit for acknowledgement */
+                iwl_set_bit(trans, CSR_OTP_GP_REG,
+                            CSR_OTP_GP_REG_ECC_UNCORR_STATUS_MSK);
+                IWL_ERR(trans, "Uncorrectable OTP ECC error, abort OTP read\n");
+                return -EINVAL;
+        }
+        if (otpgp & CSR_OTP_GP_REG_ECC_CORR_STATUS_MSK) {
+                /* continue in this case */
+                /* set the correctable OTP ECC bit for acknowledgement */
+                iwl_set_bit(trans, CSR_OTP_GP_REG,
+                            CSR_OTP_GP_REG_ECC_CORR_STATUS_MSK);
+                IWL_ERR(trans, "Correctable OTP ECC error, continue read\n");
+        }
+        *eeprom_data = cpu_to_le16(r >> 16);
+        return 0;
+}
+
+/*
+ * iwl_is_otp_empty: check for empty OTP
+ */
+static bool iwl_is_otp_empty(struct iwl_trans *trans)
+{
+        u16 next_link_addr = 0;
+        __le16 link_value;
+        bool is_empty = false;
+
+        /* locate the beginning of OTP link list */
+        if (!iwl_read_otp_word(trans, next_link_addr, &link_value)) {
+                if (!link_value) {
+                        IWL_ERR(trans, "OTP is empty\n");
+                        is_empty = true;
+                }
+        } else {
+                IWL_ERR(trans, "Unable to read first block of OTP list.\n");
+                is_empty = true;
+        }
+
+        return is_empty;
+}
+
+
+/*
+ * iwl_find_otp_image: find EEPROM image in OTP
+ *   finding the OTP block that contains the EEPROM image.
+ *   the last valid block on the link list (the block _before_ the last block)
+ *   is the block we should read and used to configure the device.
+ *   If all the available OTP blocks are full, the last block will be the block
+ *   we should read and used to configure the device.
+ *   only perform this operation if shadow RAM is disabled
+ */
+static int iwl_find_otp_image(struct iwl_trans *trans,
+                                        u16 *validblockaddr)
+{
+        u16 next_link_addr = 0, valid_addr;
+        __le16 link_value = 0;
+        int usedblocks = 0;
+
+        /* set addressing mode to absolute to traverse the link list */
+        iwl_set_otp_access_absolute(trans);
+
+        /* checking for empty OTP or error */
+        if (iwl_is_otp_empty(trans))
+                return -EINVAL;
+
+        /*
+         * start traverse link list
+         * until reach the max number of OTP blocks
+         * different devices have different number of OTP blocks
+         */
+        do {
+                /* save current valid block address
+                 * check for more block on the link list
+                 */
+                valid_addr = next_link_addr;
+                next_link_addr = le16_to_cpu(link_value) * sizeof(u16);
+                IWL_DEBUG_EEPROM(trans->dev, "OTP blocks %d addr 0x%x\n",
+                                 usedblocks, next_link_addr);
+                if (iwl_read_otp_word(trans, next_link_addr, &link_value))
+                        return -EINVAL;
+                if (!link_value) {
+                        /*
+                         * reach the end of link list, return success and
+                         * set address point to the starting address
+                         * of the image
+                         */
+                        *validblockaddr = valid_addr;
+                        /* skip first 2 bytes (link list pointer) */
+                        *validblockaddr += 2;
+                        return 0;
+                }
+                /* more in the link list, continue */
+                usedblocks++;
+        } while (usedblocks <= trans->cfg->base_params->max_ll_items);
+
+        /* OTP has no valid blocks */
+        IWL_DEBUG_EEPROM(trans->dev, "OTP has no valid blocks\n");
+        return -EINVAL;
+}
+
+/**
+ * iwl_read_eeprom - read EEPROM contents
+ *
+ * Load the EEPROM contents from adapter and return it
+ * and its size.
+ *
+ * NOTE:  This routine uses the non-debug IO access functions.
+ */
+int iwl_read_eeprom(struct iwl_trans *trans, u8 **eeprom, size_t *eeprom_size)
+{
+        __le16 *e;
+        u32 gp = iwl_read32(trans, CSR_EEPROM_GP);
+        int sz;
+        int ret;
+        u16 addr;
+        u16 validblockaddr = 0;
+        u16 cache_addr = 0;
+        int nvm_is_otp;
+
+        if (!eeprom || !eeprom_size)
+                return -EINVAL;
+
+        nvm_is_otp = iwl_nvm_is_otp(trans);
+        if (nvm_is_otp < 0)
+                return nvm_is_otp;
+
+        sz = trans->cfg->base_params->eeprom_size;
+        IWL_DEBUG_EEPROM(trans->dev, "NVM size = %d\n", sz);
+
+        e = kmalloc(sz, GFP_KERNEL);
+        if (!e)
+                return -ENOMEM;
+
+        ret = iwl_eeprom_verify_signature(trans, nvm_is_otp);
+        if (ret < 0) {
+                IWL_ERR(trans, "EEPROM not found, EEPROM_GP=0x%08x\n", gp);
+                goto err_free;
+        }
+
+        /* Make sure driver (instead of uCode) is allowed to read EEPROM */
+        ret = iwl_eeprom_acquire_semaphore(trans);
+        if (ret < 0) {
+                IWL_ERR(trans, "Failed to acquire EEPROM semaphore.\n");
+                goto err_free;
+        }
+
+        if (nvm_is_otp) {
+                ret = iwl_init_otp_access(trans);
+                if (ret) {
+                        IWL_ERR(trans, "Failed to initialize OTP access.\n");
+                        goto err_unlock;
+                }
+
+                iwl_write32(trans, CSR_EEPROM_GP,
+                            iwl_read32(trans, CSR_EEPROM_GP) &
+                            ~CSR_EEPROM_GP_IF_OWNER_MSK);
+
+                iwl_set_bit(trans, CSR_OTP_GP_REG,
+                            CSR_OTP_GP_REG_ECC_CORR_STATUS_MSK |
+                            CSR_OTP_GP_REG_ECC_UNCORR_STATUS_MSK);
+                /* traversing the linked list if no shadow ram supported */
+                if (!trans->cfg->base_params->shadow_ram_support) {
+                        ret = iwl_find_otp_image(trans, &validblockaddr);
+                        if (ret)
+                                goto err_unlock;
+                }
+                for (addr = validblockaddr; addr < validblockaddr + sz;
+                     addr += sizeof(u16)) {
+                        __le16 eeprom_data;
+
+                        ret = iwl_read_otp_word(trans, addr, &eeprom_data);
+                        if (ret)
+                                goto err_unlock;
+                        e[cache_addr / 2] = eeprom_data;
+                        cache_addr += sizeof(u16);
+                }
+        } else {
+                /* eeprom is an array of 16bit values */
+                for (addr = 0; addr < sz; addr += sizeof(u16)) {
+                        u32 r;
+
+                        iwl_write32(trans, CSR_EEPROM_REG,
+                                    CSR_EEPROM_REG_MSK_ADDR & (addr << 1));
+
+                        ret = iwl_poll_bit(trans, CSR_EEPROM_REG,
+                                           CSR_EEPROM_REG_READ_VALID_MSK,
+                                           CSR_EEPROM_REG_READ_VALID_MSK,
+                                           IWL_EEPROM_ACCESS_TIMEOUT);
+                        if (ret < 0) {
+                                IWL_ERR(trans,
+                                        "Time out reading EEPROM[%d]\n", addr);
+                                goto err_unlock;
+                        }
+                        r = iwl_read32(trans, CSR_EEPROM_REG);
+                        e[addr / 2] = cpu_to_le16(r >> 16);
+                }
+        }
+
+        IWL_DEBUG_EEPROM(trans->dev, "NVM Type: %s\n",
+                         nvm_is_otp ? "OTP" : "EEPROM");
+
+        iwl_eeprom_release_semaphore(trans);
+
+        *eeprom_size = sz;
+        *eeprom = (u8 *)e;
+        return 0;
+
+ err_unlock:
+        iwl_eeprom_release_semaphore(trans);
+ err_free:
+        kfree(e);
+
+        return ret;
+}
+EXPORT_SYMBOL_GPL(iwl_read_eeprom);
diff --git a/drivers/net/wireless/iwlwifi/iwl-eeprom-read.h b/drivers/net/wireless/iwlwifi/iwl-eeprom-read.h
new file mode 100644
index 00000000000..1337c9d36fe
--- /dev/null
+++ b/drivers/net/wireless/iwlwifi/iwl-eeprom-read.h
@@ -0,0 +1,70 @@
+/******************************************************************************
+ *
+ * This file is provided under a dual BSD/GPLv2 license.  When using or
+ * redistributing this file, you may do so under either license.
+ *
+ * GPL LICENSE SUMMARY
+ *
+ * Copyright(c) 2008 - 2012 Intel Corporation. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110,
+ * USA
+ *
+ * The full GNU General Public License is included in this distribution
+ * in the file called LICENSE.GPL.
+ *
+ * Contact Information:
+ *  Intel Linux Wireless <ilw@linux.intel.com>
+ * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
+ *
+ * BSD LICENSE
+ *
+ * Copyright(c) 2005 - 2012 Intel Corporation. All rights reserved.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *  * Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *  * Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *  * Neither the name Intel Corporation nor the names of its
+ *    contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *****************************************************************************/
+
+#ifndef __iwl_eeprom_h__
+#define __iwl_eeprom_h__
+
+#include "iwl-trans.h"
+
+int iwl_read_eeprom(struct iwl_trans *trans, u8 **eeprom, size_t *eeprom_size);
+
+#endif  /* __iwl_eeprom_h__ */
diff --git a/drivers/net/wireless/iwlwifi/iwl-eeprom.c b/drivers/net/wireless/iwlwifi/iwl-eeprom.c
deleted file mode 100644
index b8e2b223ac3..00000000000
--- a/drivers/net/wireless/iwlwifi/iwl-eeprom.c
+++ /dev/null
@@ -1,1148 +0,0 @@
-/******************************************************************************
- *
- * This file is provided under a dual BSD/GPLv2 license.  When using or
- * redistributing this file, you may do so under either license.
- *
- * GPL LICENSE SUMMARY
- *
- * Copyright(c) 2008 - 2012 Intel Corporation. All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110,
- * USA
- *
- * The full GNU General Public License is included in this distribution
- * in the file called LICENSE.GPL.
- *
- * Contact Information:
- *  Intel Linux Wireless <ilw@linux.intel.com>
- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
- *
- * BSD LICENSE
- *
- * Copyright(c) 2005 - 2012 Intel Corporation. All rights reserved.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *  * Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *  * Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *  * Neither the name Intel Corporation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *****************************************************************************/
-
-
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/slab.h>
-#include <linux/init.h>
-
-#include <net/mac80211.h>
-
-#include "iwl-dev.h"
-#include "iwl-debug.h"
-#include "iwl-agn.h"
-#include "iwl-eeprom.h"
-#include "iwl-io.h"
-#include "iwl-prph.h"
-
-/************************** EEPROM BANDS ****************************
- *
- * The iwl_eeprom_band definitions below provide the mapping from the
- * EEPROM contents to the specific channel number supported for each
- * band.
- *
- * For example, iwl_priv->eeprom.band_3_channels[4] from the band_3
- * definition below maps to physical channel 42 in the 5.2GHz spectrum.
- * The specific geography and calibration information for that channel
- * is contained in the eeprom map itself.
- *
- * During init, we copy the eeprom information and channel map
- * information into priv->channel_info_24/52 and priv->channel_map_24/52
- *
- * channel_map_24/52 provides the index in the channel_info array for a
- * given channel.  We have to have two separate maps as there is channel
- * overlap with the 2.4GHz and 5.2GHz spectrum as seen in band_1 and
- * band_2
- *
- * A value of 0xff stored in the channel_map indicates that the channel
- * is not supported by the hardware at all.
- *
- * A value of 0xfe in the channel_map indicates that the channel is not
- * valid for Tx with the current hardware.  This means that
- * while the system can tune and receive on a given channel, it may not
- * be able to associate or transmit any frames on that
- * channel.  There is no corresponding channel information for that
- * entry.
- *
- *********************************************************************/
-
-/* 2.4 GHz */
-const u8 iwl_eeprom_band_1[14] = {
-        1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14
-};
-
-/* 5.2 GHz bands */
-static const u8 iwl_eeprom_band_2[] = { /* 4915-5080MHz */
-        183, 184, 185, 187, 188, 189, 192, 196, 7, 8, 11, 12, 16
-};
-
-static const u8 iwl_eeprom_band_3[] = { /* 5170-5320MHz */
-        34, 36, 38, 40, 42, 44, 46, 48, 52, 56, 60, 64
-};
-
-static const u8 iwl_eeprom_band_4[] = { /* 5500-5700MHz */
-        100, 104, 108, 112, 116, 120, 124, 128, 132, 136, 140
-};
-
-static const u8 iwl_eeprom_band_5[] = { /* 5725-5825MHz */
-        145, 149, 153, 157, 161, 165
-};
-
-static const u8 iwl_eeprom_band_6[] = {       /* 2.4 ht40 channel */
-        1, 2, 3, 4, 5, 6, 7
-};
-
-static const u8 iwl_eeprom_band_7[] = {       /* 5.2 ht40 channel */
-        36, 44, 52, 60, 100, 108, 116, 124, 132, 149, 157
-};
-
-/******************************************************************************
- *
- * generic NVM functions
- *
-******************************************************************************/
-
-/*
- * The device's EEPROM semaphore prevents conflicts between driver and uCode
- * when accessing the EEPROM; each access is a series of pulses to/from the
- * EEPROM chip, not a single event, so even reads could conflict if they
- * weren't arbitrated by the semaphore.
- */
-
-#define EEPROM_SEM_TIMEOUT 10           /* milliseconds */
-#define EEPROM_SEM_RETRY_LIMIT 1000     /* number of attempts (not time) */
-
-static int iwl_eeprom_acquire_semaphore(struct iwl_trans *trans)
-{
-        u16 count;
-        int ret;
-
-        for (count = 0; count < EEPROM_SEM_RETRY_LIMIT; count++) {
-                /* Request semaphore */
-                iwl_set_bit(trans, CSR_HW_IF_CONFIG_REG,
-                            CSR_HW_IF_CONFIG_REG_BIT_EEPROM_OWN_SEM);
-
-                /* See if we got it */
-                ret = iwl_poll_bit(trans, CSR_HW_IF_CONFIG_REG,
-                                CSR_HW_IF_CONFIG_REG_BIT_EEPROM_OWN_SEM,
-                                CSR_HW_IF_CONFIG_REG_BIT_EEPROM_OWN_SEM,
-                                EEPROM_SEM_TIMEOUT);
-                if (ret >= 0) {
-                        IWL_DEBUG_EEPROM(trans,
-                                "Acquired semaphore after %d tries.\n",
-                                count+1);
-                        return ret;
-                }
-        }
-
-        return ret;
-}
-
-static void iwl_eeprom_release_semaphore(struct iwl_trans *trans)
-{
-        iwl_clear_bit(trans, CSR_HW_IF_CONFIG_REG,
-                CSR_HW_IF_CONFIG_REG_BIT_EEPROM_OWN_SEM);
-
-}
-
-static int iwl_eeprom_verify_signature(struct iwl_priv *priv)
-{
-        u32 gp = iwl_read32(priv->trans, CSR_EEPROM_GP) &
-                           CSR_EEPROM_GP_VALID_MSK;
-        int ret = 0;
-
-        IWL_DEBUG_EEPROM(priv, "EEPROM signature=0x%08x\n", gp);
-        switch (gp) {
-        case CSR_EEPROM_GP_BAD_SIG_EEP_GOOD_SIG_OTP:
-                if (priv->nvm_device_type != NVM_DEVICE_TYPE_OTP) {
-                        IWL_ERR(priv, "EEPROM with bad signature: 0x%08x\n",
-                                gp);
-                        ret = -ENOENT;
-                }
-                break;
-        case CSR_EEPROM_GP_GOOD_SIG_EEP_LESS_THAN_4K:
-        case CSR_EEPROM_GP_GOOD_SIG_EEP_MORE_THAN_4K:
-                if (priv->nvm_device_type != NVM_DEVICE_TYPE_EEPROM) {
-                        IWL_ERR(priv, "OTP with bad signature: 0x%08x\n", gp);
-                        ret = -ENOENT;
-                }
-                break;
-        case CSR_EEPROM_GP_BAD_SIGNATURE_BOTH_EEP_AND_OTP:
-        default:
-                IWL_ERR(priv, "bad EEPROM/OTP signature, type=%s, "
-                        "EEPROM_GP=0x%08x\n",
-                        (priv->nvm_device_type == NVM_DEVICE_TYPE_OTP)
-                        ? "OTP" : "EEPROM", gp);
-                ret = -ENOENT;
-                break;
-        }
-        return ret;
-}
-
-u16 iwl_eeprom_query16(struct iwl_priv *priv, size_t offset)
-{
-        if (!priv->eeprom)
-                return 0;
-        return (u16)priv->eeprom[offset] | ((u16)priv->eeprom[offset + 1] << 8);
-}
-
-int iwl_eeprom_check_version(struct iwl_priv *priv)
-{
-        u16 eeprom_ver;
-        u16 calib_ver;
-
-        eeprom_ver = iwl_eeprom_query16(priv, EEPROM_VERSION);
-        calib_ver = iwl_eeprom_calib_version(priv);
-
-        if (eeprom_ver < priv->cfg->eeprom_ver ||
-            calib_ver < priv->cfg->eeprom_calib_ver)
-                goto err;
-
-        IWL_INFO(priv, "device EEPROM VER=0x%x, CALIB=0x%x\n",
-                 eeprom_ver, calib_ver);
-
-        return 0;
-err:
-        IWL_ERR(priv, "Unsupported (too old) EEPROM VER=0x%x < 0x%x "
-                  "CALIB=0x%x < 0x%x\n",
-                  eeprom_ver, priv->cfg->eeprom_ver,
-                  calib_ver,  priv->cfg->eeprom_calib_ver);
-        return -EINVAL;
-
-}
-
-int iwl_eeprom_init_hw_params(struct iwl_priv *priv)
-{
-        u16 radio_cfg;
-
-        priv->hw_params.sku = iwl_eeprom_query16(priv, EEPROM_SKU_CAP);
-        if (priv->hw_params.sku & EEPROM_SKU_CAP_11N_ENABLE &&
-            !priv->cfg->ht_params) {
-                IWL_ERR(priv, "Invalid 11n configuration\n");
-                return -EINVAL;
-        }
-
-        if (!priv->hw_params.sku) {
-                IWL_ERR(priv, "Invalid device sku\n");
-                return -EINVAL;
-        }
-
-        IWL_INFO(priv, "Device SKU: 0x%X\n", priv->hw_params.sku);
-
-        radio_cfg = iwl_eeprom_query16(priv, EEPROM_RADIO_CONFIG);
-
-        priv->hw_params.valid_tx_ant = EEPROM_RF_CFG_TX_ANT_MSK(radio_cfg);
-        priv->hw_params.valid_rx_ant = EEPROM_RF_CFG_RX_ANT_MSK(radio_cfg);
-
-        /* check overrides (some devices have wrong EEPROM) */
-        if (priv->cfg->valid_tx_ant)
-                priv->hw_params.valid_tx_ant = priv->cfg->valid_tx_ant;
-        if (priv->cfg->valid_rx_ant)
-                priv->hw_params.valid_rx_ant = priv->cfg->valid_rx_ant;
-
-        if (!priv->hw_params.valid_tx_ant || !priv->hw_params.valid_rx_ant) {
-                IWL_ERR(priv, "Invalid chain (0x%X, 0x%X)\n",
-                        priv->hw_params.valid_tx_ant,
-                        priv->hw_params.valid_rx_ant);
-                return -EINVAL;
-        }
-
-        IWL_INFO(priv, "Valid Tx ant: 0x%X, Valid Rx ant: 0x%X\n",
-                 priv->hw_params.valid_tx_ant, priv->hw_params.valid_rx_ant);
-
-        return 0;
-}
-
-u16 iwl_eeprom_calib_version(struct iwl_priv *priv)
-{
-        struct iwl_eeprom_calib_hdr *hdr;
-
-        hdr = (struct iwl_eeprom_calib_hdr *)iwl_eeprom_query_addr(priv,
-                                                        EEPROM_CALIB_ALL);
-        return hdr->version;
-}
-
-static u32 eeprom_indirect_address(struct iwl_priv *priv, u32 address)
-{
-        u16 offset = 0;
-
-        if ((address & INDIRECT_ADDRESS) == 0)
-                return address;
-
-        switch (address & INDIRECT_TYPE_MSK) {
-        case INDIRECT_HOST:
-                offset = iwl_eeprom_query16(priv, EEPROM_LINK_HOST);
-                break;
-        case INDIRECT_GENERAL:
-                offset = iwl_eeprom_query16(priv, EEPROM_LINK_GENERAL);
-                break;
-        case INDIRECT_REGULATORY:
-                offset = iwl_eeprom_query16(priv, EEPROM_LINK_REGULATORY);
-                break;
-        case INDIRECT_TXP_LIMIT:
-                offset = iwl_eeprom_query16(priv, EEPROM_LINK_TXP_LIMIT);
-                break;
-        case INDIRECT_TXP_LIMIT_SIZE:
-                offset = iwl_eeprom_query16(priv, EEPROM_LINK_TXP_LIMIT_SIZE);
-                break;
-        case INDIRECT_CALIBRATION:
-                offset = iwl_eeprom_query16(priv, EEPROM_LINK_CALIBRATION);
-                break;
-        case INDIRECT_PROCESS_ADJST:
-                offset = iwl_eeprom_query16(priv, EEPROM_LINK_PROCESS_ADJST);
-                break;
-        case INDIRECT_OTHERS:
-                offset = iwl_eeprom_query16(priv, EEPROM_LINK_OTHERS);
-                break;
-        default:
-                IWL_ERR(priv, "illegal indirect type: 0x%X\n",
-                address & INDIRECT_TYPE_MSK);
-                break;
-        }
-
-        /* translate the offset from words to byte */
-        return (address & ADDRESS_MSK) + (offset << 1);
-}
-
-const u8 *iwl_eeprom_query_addr(struct iwl_priv *priv, size_t offset)
-{
-        u32 address = eeprom_indirect_address(priv, offset);
-        BUG_ON(address >= priv->cfg->base_params->eeprom_size);
-        return &priv->eeprom[address];
-}
-
-void iwl_eeprom_get_mac(struct iwl_priv *priv, u8 *mac)
-{
-        const u8 *addr = iwl_eeprom_query_addr(priv,
-                                        EEPROM_MAC_ADDRESS);
-        memcpy(mac, addr, ETH_ALEN);
-}
-
-/******************************************************************************
- *
- * OTP related functions
- *
-******************************************************************************/
-
-static void iwl_set_otp_access(struct iwl_trans *trans,
-                               enum iwl_access_mode mode)
-{
-        iwl_read32(trans, CSR_OTP_GP_REG);
-
-        if (mode == IWL_OTP_ACCESS_ABSOLUTE)
-                iwl_clear_bit(trans, CSR_OTP_GP_REG,
-                              CSR_OTP_GP_REG_OTP_ACCESS_MODE);
-        else
-                iwl_set_bit(trans, CSR_OTP_GP_REG,
-                            CSR_OTP_GP_REG_OTP_ACCESS_MODE);
-}
-
-static int iwl_get_nvm_type(struct iwl_trans *trans, u32 hw_rev)
-{
-        u32 otpgp;
-        int nvm_type;
-
-        /* OTP only valid for CP/PP and after */
-        switch (hw_rev & CSR_HW_REV_TYPE_MSK) {
-        case CSR_HW_REV_TYPE_NONE:
-                IWL_ERR(trans, "Unknown hardware type\n");
-                return -ENOENT;
-        case CSR_HW_REV_TYPE_5300:
-        case CSR_HW_REV_TYPE_5350:
-        case CSR_HW_REV_TYPE_5100:
-        case CSR_HW_REV_TYPE_5150:
-                nvm_type = NVM_DEVICE_TYPE_EEPROM;
-                break;
-        default:
-                otpgp = iwl_read32(trans, CSR_OTP_GP_REG);
-                if (otpgp & CSR_OTP_GP_REG_DEVICE_SELECT)
-                        nvm_type = NVM_DEVICE_TYPE_OTP;
-                else
-                        nvm_type = NVM_DEVICE_TYPE_EEPROM;
-                break;
-        }
-        return  nvm_type;
-}
-
-static int iwl_init_otp_access(struct iwl_trans *trans)
-{
-        int ret;
-
-        /* Enable 40MHz radio clock */
-        iwl_write32(trans, CSR_GP_CNTRL,
-                    iwl_read32(trans, CSR_GP_CNTRL) |
-                    CSR_GP_CNTRL_REG_FLAG_INIT_DONE);
-
-        /* wait for clock to be ready */
-        ret = iwl_poll_bit(trans, CSR_GP_CNTRL,
-                                 CSR_GP_CNTRL_REG_FLAG_MAC_CLOCK_READY,
-                                 CSR_GP_CNTRL_REG_FLAG_MAC_CLOCK_READY,
-                                 25000);
-        if (ret < 0)
-                IWL_ERR(trans, "Time out access OTP\n");
-        else {
-                iwl_set_bits_prph(trans, APMG_PS_CTRL_REG,
-                                  APMG_PS_CTRL_VAL_RESET_REQ);
-                udelay(5);
-                iwl_clear_bits_prph(trans, APMG_PS_CTRL_REG,
-                                    APMG_PS_CTRL_VAL_RESET_REQ);
-
-                /*
-                 * CSR auto clock gate disable bit -
-                 * this is only applicable for HW with OTP shadow RAM
-                 */
-                if (trans->cfg->base_params->shadow_ram_support)
-                        iwl_set_bit(trans, CSR_DBG_LINK_PWR_MGMT_REG,
-                                CSR_RESET_LINK_PWR_MGMT_DISABLED);
-        }
-        return ret;
-}
-
-static int iwl_read_otp_word(struct iwl_trans *trans, u16 addr,
-                             __le16 *eeprom_data)
-{
-        int ret = 0;
-        u32 r;
-        u32 otpgp;
-
-        iwl_write32(trans, CSR_EEPROM_REG,
-                    CSR_EEPROM_REG_MSK_ADDR & (addr << 1));
-        ret = iwl_poll_bit(trans, CSR_EEPROM_REG,
-                                 CSR_EEPROM_REG_READ_VALID_MSK,
-                                 CSR_EEPROM_REG_READ_VALID_MSK,
-                                 IWL_EEPROM_ACCESS_TIMEOUT);
-        if (ret < 0) {
-                IWL_ERR(trans, "Time out reading OTP[%d]\n", addr);
-                return ret;
-        }
-        r = iwl_read32(trans, CSR_EEPROM_REG);
-        /* check for ECC errors: */
-        otpgp = iwl_read32(trans, CSR_OTP_GP_REG);
-        if (otpgp & CSR_OTP_GP_REG_ECC_UNCORR_STATUS_MSK) {
-                /* stop in this case */
-                /* set the uncorrectable OTP ECC bit for acknowledgement */
-                iwl_set_bit(trans, CSR_OTP_GP_REG,
-                        CSR_OTP_GP_REG_ECC_UNCORR_STATUS_MSK);
-                IWL_ERR(trans, "Uncorrectable OTP ECC error, abort OTP read\n");
-                return -EINVAL;
-        }
-        if (otpgp & CSR_OTP_GP_REG_ECC_CORR_STATUS_MSK) {
-                /* continue in this case */
-                /* set the correctable OTP ECC bit for acknowledgement */
-                iwl_set_bit(trans, CSR_OTP_GP_REG,
-                                CSR_OTP_GP_REG_ECC_CORR_STATUS_MSK);
-                IWL_ERR(trans, "Correctable OTP ECC error, continue read\n");
-        }
-        *eeprom_data = cpu_to_le16(r >> 16);
-        return 0;
-}
-
-/*
- * iwl_is_otp_empty: check for empty OTP
- */
-static bool iwl_is_otp_empty(struct iwl_trans *trans)
-{
-        u16 next_link_addr = 0;
-        __le16 link_value;
-        bool is_empty = false;
-
-        /* locate the beginning of OTP link list */
-        if (!iwl_read_otp_word(trans, next_link_addr, &link_value)) {
-                if (!link_value) {
-                        IWL_ERR(trans, "OTP is empty\n");
-                        is_empty = true;
-                }
-        } else {
-                IWL_ERR(trans, "Unable to read first block of OTP list.\n");
-                is_empty = true;
-        }
-
-        return is_empty;
-}
-
-
-/*
- * iwl_find_otp_image: find EEPROM image in OTP
- *   finding the OTP block that contains the EEPROM image.
- *   the last valid block on the link list (the block _before_ the last block)
- *   is the block we should read and used to configure the device.
- *   If all the available OTP blocks are full, the last block will be the block
- *   we should read and used to configure the device.
- *   only perform this operation if shadow RAM is disabled
- */
-static int iwl_find_otp_image(struct iwl_trans *trans,
-                                        u16 *validblockaddr)
-{
-        u16 next_link_addr = 0, valid_addr;
-        __le16 link_value = 0;
-        int usedblocks = 0;
-
-        /* set addressing mode to absolute to traverse the link list */
-        iwl_set_otp_access(trans, IWL_OTP_ACCESS_ABSOLUTE);
-
-        /* checking for empty OTP or error */
-        if (iwl_is_otp_empty(trans))
-                return -EINVAL;
-
-        /*
-         * start traverse link list
-         * until reach the max number of OTP blocks
-         * different devices have different number of OTP blocks
-         */
-        do {
-                /* save current valid block address
-                 * check for more block on the link list
-                 */
-                valid_addr = next_link_addr;
-                next_link_addr = le16_to_cpu(link_value) * sizeof(u16);
-                IWL_DEBUG_EEPROM(trans, "OTP blocks %d addr 0x%x\n",
-                               usedblocks, next_link_addr);
-                if (iwl_read_otp_word(trans, next_link_addr, &link_value))
-                        return -EINVAL;
-                if (!link_value) {
-                        /*
-                         * reach the end of link list, return success and
-                         * set address point to the starting address
-                         * of the image
-                         */
-                        *validblockaddr = valid_addr;
-                        /* skip first 2 bytes (link list pointer) */
-                        *validblockaddr += 2;
-                        return 0;
-                }
-                /* more in the link list, continue */
-                usedblocks++;
-        } while (usedblocks <= trans->cfg->base_params->max_ll_items);
-
-        /* OTP has no valid blocks */
-        IWL_DEBUG_EEPROM(trans, "OTP has no valid blocks\n");
-        return -EINVAL;
-}
-
-/******************************************************************************
- *
- * Tx Power related functions
- *
-******************************************************************************/
-/**
- * iwl_get_max_txpower_avg - get the highest tx power from all chains.
- *     find the highest tx power from all chains for the channel
- */
-static s8 iwl_get_max_txpower_avg(struct iwl_priv *priv,
-                struct iwl_eeprom_enhanced_txpwr *enhanced_txpower,
-                int element, s8 *max_txpower_in_half_dbm)
-{
-        s8 max_txpower_avg = 0; /* (dBm) */
-
-        /* Take the highest tx power from any valid chains */
-        if ((priv->hw_params.valid_tx_ant & ANT_A) &&
-            (enhanced_txpower[element].chain_a_max > max_txpower_avg))
-                max_txpower_avg = enhanced_txpower[element].chain_a_max;
-        if ((priv->hw_params.valid_tx_ant & ANT_B) &&
-            (enhanced_txpower[element].chain_b_max > max_txpower_avg))
-                max_txpower_avg = enhanced_txpower[element].chain_b_max;
-        if ((priv->hw_params.valid_tx_ant & ANT_C) &&
-            (enhanced_txpower[element].chain_c_max > max_txpower_avg))
-                max_txpower_avg = enhanced_txpower[element].chain_c_max;
-        if (((priv->hw_params.valid_tx_ant == ANT_AB) |
-            (priv->hw_params.valid_tx_ant == ANT_BC) |
-            (priv->hw_params.valid_tx_ant == ANT_AC)) &&
-            (enhanced_txpower[element].mimo2_max > max_txpower_avg))
-                max_txpower_avg =  enhanced_txpower[element].mimo2_max;
-        if ((priv->hw_params.valid_tx_ant == ANT_ABC) &&
-            (enhanced_txpower[element].mimo3_max > max_txpower_avg))
-                max_txpower_avg = enhanced_txpower[element].mimo3_max;
-
-        /*
-         * max. tx power in EEPROM is in 1/2 dBm format
-         * convert from 1/2 dBm to dBm (round-up convert)
-         * but we also do not want to loss 1/2 dBm resolution which
-         * will impact performance
-         */
-        *max_txpower_in_half_dbm = max_txpower_avg;
-        return (max_txpower_avg & 0x01) + (max_txpower_avg >> 1);
-}
-
-static void
-iwl_eeprom_enh_txp_read_element(struct iwl_priv *priv,
-                                    struct iwl_eeprom_enhanced_txpwr *txp,
-                                    s8 max_txpower_avg)
-{
-        int ch_idx;
-        bool is_ht40 = txp->flags & IWL_EEPROM_ENH_TXP_FL_40MHZ;
-        enum ieee80211_band band;
-
-        band = txp->flags & IWL_EEPROM_ENH_TXP_FL_BAND_52G ?
-                IEEE80211_BAND_5GHZ : IEEE80211_BAND_2GHZ;
-
-        for (ch_idx = 0; ch_idx < priv->channel_count; ch_idx++) {
-                struct iwl_channel_info *ch_info = &priv->channel_info[ch_idx];
-
-                /* update matching channel or from common data only */
-                if (txp->channel != 0 && ch_info->channel != txp->channel)
-                        continue;
-
-                /* update matching band only */
-                if (band != ch_info->band)
-                        continue;
-
-                if (ch_info->max_power_avg < max_txpower_avg && !is_ht40) {
-                        ch_info->max_power_avg = max_txpower_avg;
-                        ch_info->curr_txpow = max_txpower_avg;
-                        ch_info->scan_power = max_txpower_avg;
-                }
-
-                if (is_ht40 && ch_info->ht40_max_power_avg < max_txpower_avg)
-                        ch_info->ht40_max_power_avg = max_txpower_avg;
-        }
-}
-
-#define EEPROM_TXP_OFFS (0x00 | INDIRECT_ADDRESS | INDIRECT_TXP_LIMIT)
-#define EEPROM_TXP_ENTRY_LEN sizeof(struct iwl_eeprom_enhanced_txpwr)
-#define EEPROM_TXP_SZ_OFFS (0x00 | INDIRECT_ADDRESS | INDIRECT_TXP_LIMIT_SIZE)
-
-#define TXP_CHECK_AND_PRINT(x) ((txp->flags & IWL_EEPROM_ENH_TXP_FL_##x) \
-                            ? # x " " : "")
-
-static void iwl_eeprom_enhanced_txpower(struct iwl_priv *priv)
-{
-        struct iwl_eeprom_enhanced_txpwr *txp_array, *txp;
-        int idx, entries;
-        __le16 *txp_len;
-        s8 max_txp_avg, max_txp_avg_halfdbm;
-
-        BUILD_BUG_ON(sizeof(struct iwl_eeprom_enhanced_txpwr) != 8);
-
-        /* the length is in 16-bit words, but we want entries */
-        txp_len = (__le16 *) iwl_eeprom_query_addr(priv, EEPROM_TXP_SZ_OFFS);
-        entries = le16_to_cpup(txp_len) * 2 / EEPROM_TXP_ENTRY_LEN;
-
-        txp_array = (void *) iwl_eeprom_query_addr(priv, EEPROM_TXP_OFFS);
-
-        for (idx = 0; idx < entries; idx++) {
-                txp = &txp_array[idx];
-                /* skip invalid entries */
-                if (!(txp->flags & IWL_EEPROM_ENH_TXP_FL_VALID))
-                        continue;
-
-                IWL_DEBUG_EEPROM(priv, "%s %d:\t %s%s%s%s%s%s%s%s (0x%02x)\n",
-                                 (txp->channel && (txp->flags &
-                                        IWL_EEPROM_ENH_TXP_FL_COMMON_TYPE)) ?
-                                        "Common " : (txp->channel) ?
-                                        "Channel" : "Common",
-                                 (txp->channel),
-                                 TXP_CHECK_AND_PRINT(VALID),
-                                 TXP_CHECK_AND_PRINT(BAND_52G),
-                                 TXP_CHECK_AND_PRINT(OFDM),
-                                 TXP_CHECK_AND_PRINT(40MHZ),
-                                 TXP_CHECK_AND_PRINT(HT_AP),
-                                 TXP_CHECK_AND_PRINT(RES1),
-                                 TXP_CHECK_AND_PRINT(RES2),
-                                 TXP_CHECK_AND_PRINT(COMMON_TYPE),
-                                 txp->flags);
-                IWL_DEBUG_EEPROM(priv, "\t\t chain_A: 0x%02x "
-                                 "chain_B: 0X%02x chain_C: 0X%02x\n",
-                                 txp->chain_a_max, txp->chain_b_max,
-                                 txp->chain_c_max);
-                IWL_DEBUG_EEPROM(priv, "\t\t MIMO2: 0x%02x "
-                                 "MIMO3: 0x%02x High 20_on_40: 0x%02x "
-                                 "Low 20_on_40: 0x%02x\n",
-                                 txp->mimo2_max, txp->mimo3_max,
-                                 ((txp->delta_20_in_40 & 0xf0) >> 4),
-                                 (txp->delta_20_in_40 & 0x0f));
-
-                max_txp_avg = iwl_get_max_txpower_avg(priv, txp_array, idx,
-                                                      &max_txp_avg_halfdbm);
-
-                /*
-                 * Update the user limit values values to the highest
-                 * power supported by any channel
-                 */
-                if (max_txp_avg > priv->tx_power_user_lmt)
-                        priv->tx_power_user_lmt = max_txp_avg;
-                if (max_txp_avg_halfdbm > priv->tx_power_lmt_in_half_dbm)
-                        priv->tx_power_lmt_in_half_dbm = max_txp_avg_halfdbm;
-
-                iwl_eeprom_enh_txp_read_element(priv, txp, max_txp_avg);
-        }
-}
-
-/**
- * iwl_eeprom_init - read EEPROM contents
- *
- * Load the EEPROM contents from adapter into priv->eeprom
- *
- * NOTE:  This routine uses the non-debug IO access functions.
- */
-int iwl_eeprom_init(struct iwl_priv *priv, u32 hw_rev)
-{
-        __le16 *e;
-        u32 gp = iwl_read32(priv->trans, CSR_EEPROM_GP);
-        int sz;
-        int ret;
-        u16 addr;
-        u16 validblockaddr = 0;
-        u16 cache_addr = 0;
-
-        priv->nvm_device_type = iwl_get_nvm_type(priv->trans, hw_rev);
-        if (priv->nvm_device_type == -ENOENT)
-                return -ENOENT;
-        /* allocate eeprom */
-        sz = priv->cfg->base_params->eeprom_size;
-        IWL_DEBUG_EEPROM(priv, "NVM size = %d\n", sz);
-        priv->eeprom = kzalloc(sz, GFP_KERNEL);
-        if (!priv->eeprom) {
-                ret = -ENOMEM;
-                goto alloc_err;
-        }
-        e = (__le16 *)priv->eeprom;
-
-        ret = iwl_eeprom_verify_signature(priv);
-        if (ret < 0) {
-                IWL_ERR(priv, "EEPROM not found, EEPROM_GP=0x%08x\n", gp);
-                ret = -ENOENT;
-                goto err;
-        }
-
-        /* Make sure driver (instead of uCode) is allowed to read EEPROM */
-        ret = iwl_eeprom_acquire_semaphore(priv->trans);
-        if (ret < 0) {
-                IWL_ERR(priv, "Failed to acquire EEPROM semaphore.\n");
-                ret = -ENOENT;
-                goto err;
-        }
-
-        if (priv->nvm_device_type == NVM_DEVICE_TYPE_OTP) {
-
-                ret = iwl_init_otp_access(priv->trans);
-                if (ret) {
-                        IWL_ERR(priv, "Failed to initialize OTP access.\n");
-                        ret = -ENOENT;
-                        goto done;
-                }
-                iwl_write32(priv->trans, CSR_EEPROM_GP,
-                            iwl_read32(priv->trans, CSR_EEPROM_GP) &
-                            ~CSR_EEPROM_GP_IF_OWNER_MSK);
-
-                iwl_set_bit(priv->trans, CSR_OTP_GP_REG,
-                             CSR_OTP_GP_REG_ECC_CORR_STATUS_MSK |
-                             CSR_OTP_GP_REG_ECC_UNCORR_STATUS_MSK);
-                /* traversing the linked list if no shadow ram supported */
-                if (!priv->cfg->base_params->shadow_ram_support) {
-                        if (iwl_find_otp_image(priv->trans, &validblockaddr)) {
-                                ret = -ENOENT;
-                                goto done;
-                        }
-                }
-                for (addr = validblockaddr; addr < validblockaddr + sz;
-                     addr += sizeof(u16)) {
-                        __le16 eeprom_data;
-
-                        ret = iwl_read_otp_word(priv->trans, addr,
-                                                &eeprom_data);
-                        if (ret)
-                                goto done;
-                        e[cache_addr / 2] = eeprom_data;
-                        cache_addr += sizeof(u16);
-                }
-        } else {
-                /* eeprom is an array of 16bit values */
-                for (addr = 0; addr < sz; addr += sizeof(u16)) {
-                        u32 r;
-
-                        iwl_write32(priv->trans, CSR_EEPROM_REG,
-                                    CSR_EEPROM_REG_MSK_ADDR & (addr << 1));
-
-                        ret = iwl_poll_bit(priv->trans, CSR_EEPROM_REG,
-                                                  CSR_EEPROM_REG_READ_VALID_MSK,
-                                                  CSR_EEPROM_REG_READ_VALID_MSK,
-                                                  IWL_EEPROM_ACCESS_TIMEOUT);
-                        if (ret < 0) {
-                                IWL_ERR(priv,
-                                        "Time out reading EEPROM[%d]\n", addr);
-                                goto done;
-                        }
-                        r = iwl_read32(priv->trans, CSR_EEPROM_REG);
-                        e[addr / 2] = cpu_to_le16(r >> 16);
-                }
-        }
-
-        IWL_DEBUG_EEPROM(priv, "NVM Type: %s, version: 0x%x\n",
-                       (priv->nvm_device_type == NVM_DEVICE_TYPE_OTP)
-                       ? "OTP" : "EEPROM",
-                       iwl_eeprom_query16(priv, EEPROM_VERSION));
-
-        ret = 0;
-done:
-        iwl_eeprom_release_semaphore(priv->trans);
-
-err:
-        if (ret)
-                iwl_eeprom_free(priv);
-alloc_err:
-        return ret;
-}
-
-void iwl_eeprom_free(struct iwl_priv *priv)
-{
-        kfree(priv->eeprom);
-        priv->eeprom = NULL;
-}
-
-static void iwl_init_band_reference(struct iwl_priv *priv,
-                        int eep_band, int *eeprom_ch_count,
-                        const struct iwl_eeprom_channel **eeprom_ch_info,
-                        const u8 **eeprom_ch_index)
-{
-        u32 offset = priv->lib->
-                        eeprom_ops.regulatory_bands[eep_band - 1];
-        switch (eep_band) {
-        case 1:         /* 2.4GHz band */
-                *eeprom_ch_count = ARRAY_SIZE(iwl_eeprom_band_1);
-                *eeprom_ch_info = (struct iwl_eeprom_channel *)
-                                iwl_eeprom_query_addr(priv, offset);
-                *eeprom_ch_index = iwl_eeprom_band_1;
-                break;
-        case 2:         /* 4.9GHz band */
-                *eeprom_ch_count = ARRAY_SIZE(iwl_eeprom_band_2);
-                *eeprom_ch_info = (struct iwl_eeprom_channel *)
-                                iwl_eeprom_query_addr(priv, offset);
-                *eeprom_ch_index = iwl_eeprom_band_2;
-                break;
-        case 3:         /* 5.2GHz band */
-                *eeprom_ch_count = ARRAY_SIZE(iwl_eeprom_band_3);
-                *eeprom_ch_info = (struct iwl_eeprom_channel *)
-                                iwl_eeprom_query_addr(priv, offset);
-                *eeprom_ch_index = iwl_eeprom_band_3;
-                break;
-        case 4:         /* 5.5GHz band */
-                *eeprom_ch_count = ARRAY_SIZE(iwl_eeprom_band_4);
-                *eeprom_ch_info = (struct iwl_eeprom_channel *)
-                                iwl_eeprom_query_addr(priv, offset);
-                *eeprom_ch_index = iwl_eeprom_band_4;
-                break;
-        case 5:         /* 5.7GHz band */
-                *eeprom_ch_count = ARRAY_SIZE(iwl_eeprom_band_5);
-                *eeprom_ch_info = (struct iwl_eeprom_channel *)
-                                iwl_eeprom_query_addr(priv, offset);
-                *eeprom_ch_index = iwl_eeprom_band_5;
-                break;
-        case 6:         /* 2.4GHz ht40 channels */
-                *eeprom_ch_count = ARRAY_SIZE(iwl_eeprom_band_6);
-                *eeprom_ch_info = (struct iwl_eeprom_channel *)
-                                iwl_eeprom_query_addr(priv, offset);
-                *eeprom_ch_index = iwl_eeprom_band_6;
-                break;
-        case 7:         /* 5 GHz ht40 channels */
-                *eeprom_ch_count = ARRAY_SIZE(iwl_eeprom_band_7);
-                *eeprom_ch_info = (struct iwl_eeprom_channel *)
-                                iwl_eeprom_query_addr(priv, offset);
-                *eeprom_ch_index = iwl_eeprom_band_7;
-                break;
-        default:
-                BUG();
-                return;
-        }
-}
-
-#define CHECK_AND_PRINT(x) ((eeprom_ch->flags & EEPROM_CHANNEL_##x) \
-                            ? # x " " : "")
-/**
- * iwl_mod_ht40_chan_info - Copy ht40 channel info into driver's priv.
- *
- * Does not set up a command, or touch hardware.
- */
-static int iwl_mod_ht40_chan_info(struct iwl_priv *priv,
-                              enum ieee80211_band band, u16 channel,
-                              const struct iwl_eeprom_channel *eeprom_ch,
-                              u8 clear_ht40_extension_channel)
-{
-        struct iwl_channel_info *ch_info;
-
-        ch_info = (struct iwl_channel_info *)
-                        iwl_get_channel_info(priv, band, channel);
-
-        if (!is_channel_valid(ch_info))
-                return -1;
-
-        IWL_DEBUG_EEPROM(priv, "HT40 Ch. %d [%sGHz] %s%s%s%s%s(0x%02x %ddBm):"
-                        " Ad-Hoc %ssupported\n",
-                        ch_info->channel,
-                        is_channel_a_band(ch_info) ?
-                        "5.2" : "2.4",
-                        CHECK_AND_PRINT(IBSS),
-                        CHECK_AND_PRINT(ACTIVE),
-                        CHECK_AND_PRINT(RADAR),
-                        CHECK_AND_PRINT(WIDE),
-                        CHECK_AND_PRINT(DFS),
-                        eeprom_ch->flags,
-                        eeprom_ch->max_power_avg,
-                        ((eeprom_ch->flags & EEPROM_CHANNEL_IBSS)
-                         && !(eeprom_ch->flags & EEPROM_CHANNEL_RADAR)) ?
-                        "" : "not ");
-
-        ch_info->ht40_eeprom = *eeprom_ch;
-        ch_info->ht40_max_power_avg = eeprom_ch->max_power_avg;
-        ch_info->ht40_flags = eeprom_ch->flags;
-        if (eeprom_ch->flags & EEPROM_CHANNEL_VALID)
-                ch_info->ht40_extension_channel &= ~clear_ht40_extension_channel;
-
-        return 0;
-}
-
-#define CHECK_AND_PRINT_I(x) ((eeprom_ch_info[ch].flags & EEPROM_CHANNEL_##x) \
-                            ? # x " " : "")
-
-/**
- * iwl_init_channel_map - Set up driver's info for all possible channels
- */
-int iwl_init_channel_map(struct iwl_priv *priv)
-{
-        int eeprom_ch_count = 0;
-        const u8 *eeprom_ch_index = NULL;
-        const struct iwl_eeprom_channel *eeprom_ch_info = NULL;
-        int band, ch;
-        struct iwl_channel_info *ch_info;
-
-        if (priv->channel_count) {
-                IWL_DEBUG_EEPROM(priv, "Channel map already initialized.\n");
-                return 0;
-        }
-
-        IWL_DEBUG_EEPROM(priv, "Initializing regulatory info from EEPROM\n");
-
-        priv->channel_count =
-            ARRAY_SIZE(iwl_eeprom_band_1) +
-            ARRAY_SIZE(iwl_eeprom_band_2) +
-            ARRAY_SIZE(iwl_eeprom_band_3) +
-            ARRAY_SIZE(iwl_eeprom_band_4) +
-            ARRAY_SIZE(iwl_eeprom_band_5);
-
-        IWL_DEBUG_EEPROM(priv, "Parsing data for %d channels.\n",
-                        priv->channel_count);
-
-        priv->channel_info = kcalloc(priv->channel_count,
-                                     sizeof(struct iwl_channel_info),
-                                     GFP_KERNEL);
-        if (!priv->channel_info) {
-                IWL_ERR(priv, "Could not allocate channel_info\n");
-                priv->channel_count = 0;
-                return -ENOMEM;
-        }
-
-        ch_info = priv->channel_info;
-
-        /* Loop through the 5 EEPROM bands adding them in order to the
-         * channel map we maintain (that contains additional information than
-         * what just in the EEPROM) */
-        for (band = 1; band <= 5; band++) {
-
-                iwl_init_band_reference(priv, band, &eeprom_ch_count,
-                                        &eeprom_ch_info, &eeprom_ch_index);
-
-                /* Loop through each band adding each of the channels */
-                for (ch = 0; ch < eeprom_ch_count; ch++) {
-                        ch_info->channel = eeprom_ch_index[ch];
-                        ch_info->band = (band == 1) ? IEEE80211_BAND_2GHZ :
-                            IEEE80211_BAND_5GHZ;
-
-                        /* permanently store EEPROM's channel regulatory flags
-                         *   and max power in channel info database. */
-                        ch_info->eeprom = eeprom_ch_info[ch];
-
-                        /* Copy the run-time flags so they are there even on
-                         * invalid channels */
-                        ch_info->flags = eeprom_ch_info[ch].flags;
-                        /* First write that ht40 is not enabled, and then enable
-                         * one by one */
-                        ch_info->ht40_extension_channel =
-                                        IEEE80211_CHAN_NO_HT40;
-
-                        if (!(is_channel_valid(ch_info))) {
-                                IWL_DEBUG_EEPROM(priv,
-                                               "Ch. %d Flags %x [%sGHz] - "
-                                               "No traffic\n",
-                                               ch_info->channel,
-                                               ch_info->flags,
-                                               is_channel_a_band(ch_info) ?
-                                               "5.2" : "2.4");
-                                ch_info++;
-                                continue;
-                        }
-
-                        /* Initialize regulatory-based run-time data */
-                        ch_info->max_power_avg = ch_info->curr_txpow =
-                            eeprom_ch_info[ch].max_power_avg;
-                        ch_info->scan_power = eeprom_ch_info[ch].max_power_avg;
-                        ch_info->min_power = 0;
-
-                        IWL_DEBUG_EEPROM(priv, "Ch. %d [%sGHz] "
-                                       "%s%s%s%s%s%s(0x%02x %ddBm):"
-                                       " Ad-Hoc %ssupported\n",
-                                       ch_info->channel,
-                                       is_channel_a_band(ch_info) ?
-                                       "5.2" : "2.4",
-                                       CHECK_AND_PRINT_I(VALID),
-                                       CHECK_AND_PRINT_I(IBSS),
-                                       CHECK_AND_PRINT_I(ACTIVE),
-                                       CHECK_AND_PRINT_I(RADAR),
-                                       CHECK_AND_PRINT_I(WIDE),
-                                       CHECK_AND_PRINT_I(DFS),
-                                       eeprom_ch_info[ch].flags,
-                                       eeprom_ch_info[ch].max_power_avg,
-                                       ((eeprom_ch_info[ch].
-                                         flags & EEPROM_CHANNEL_IBSS)
-                                        && !(eeprom_ch_info[ch].
-                                             flags & EEPROM_CHANNEL_RADAR))
-                                       ? "" : "not ");
-
-                        ch_info++;
-                }
-        }
-
-        /* Check if we do have HT40 channels */
-        if (priv->lib->eeprom_ops.regulatory_bands[5] ==
-            EEPROM_REGULATORY_BAND_NO_HT40 &&
-            priv->lib->eeprom_ops.regulatory_bands[6] ==
-            EEPROM_REGULATORY_BAND_NO_HT40)
-                return 0;
-
-        /* Two additional EEPROM bands for 2.4 and 5 GHz HT40 channels */
-        for (band = 6; band <= 7; band++) {
-                enum ieee80211_band ieeeband;
-
-                iwl_init_band_reference(priv, band, &eeprom_ch_count,
-                                        &eeprom_ch_info, &eeprom_ch_index);
-
-                /* EEPROM band 6 is 2.4, band 7 is 5 GHz */
-                ieeeband =
-                        (band == 6) ? IEEE80211_BAND_2GHZ : IEEE80211_BAND_5GHZ;
-
-                /* Loop through each band adding each of the channels */
-                for (ch = 0; ch < eeprom_ch_count; ch++) {
-                        /* Set up driver's info for lower half */
-                        iwl_mod_ht40_chan_info(priv, ieeeband,
-                                                eeprom_ch_index[ch],
-                                                &eeprom_ch_info[ch],
-                                                IEEE80211_CHAN_NO_HT40PLUS);
-
-                        /* Set up driver's info for upper half */
-                        iwl_mod_ht40_chan_info(priv, ieeeband,
-                                                eeprom_ch_index[ch] + 4,
-                                                &eeprom_ch_info[ch],
-                                                IEEE80211_CHAN_NO_HT40MINUS);
-                }
-        }
-
-        /* for newer device (6000 series and up)
-         * EEPROM contain enhanced tx power information
-         * driver need to process addition information
-         * to determine the max channel tx power limits
-         */
-        if (priv->lib->eeprom_ops.enhanced_txpower)
-                iwl_eeprom_enhanced_txpower(priv);
-
-        return 0;
-}
-
-/*
- * iwl_free_channel_map - undo allocations in iwl_init_channel_map
- */
-void iwl_free_channel_map(struct iwl_priv *priv)
-{
-        kfree(priv->channel_info);
-        priv->channel_count = 0;
-}
-
-/**
- * iwl_get_channel_info - Find driver's private channel info
- *
- * Based on band and channel number.
- */
-const struct iwl_channel_info *iwl_get_channel_info(const struct iwl_priv *priv,
-                                        enum ieee80211_band band, u16 channel)
-{
-        int i;
-
-        switch (band) {
-        case IEEE80211_BAND_5GHZ:
-                for (i = 14; i < priv->channel_count; i++) {
-                        if (priv->channel_info[i].channel == channel)
-                                return &priv->channel_info[i];
-                }
-                break;
-        case IEEE80211_BAND_2GHZ:
-                if (channel >= 1 && channel <= 14)
-                        return &priv->channel_info[channel - 1];
-                break;
-        default:
-                BUG();
-        }
-
-        return NULL;
-}
-
-void iwl_rf_config(struct iwl_priv *priv)
-{
-        u16 radio_cfg;
-
-        radio_cfg = iwl_eeprom_query16(priv, EEPROM_RADIO_CONFIG);
-
-        /* write radio config values to register */
-        if (EEPROM_RF_CFG_TYPE_MSK(radio_cfg) <= EEPROM_RF_CONFIG_TYPE_MAX) {
-                iwl_set_bit(priv->trans, CSR_HW_IF_CONFIG_REG,
-                            EEPROM_RF_CFG_TYPE_MSK(radio_cfg) |
-                            EEPROM_RF_CFG_STEP_MSK(radio_cfg) |
-                            EEPROM_RF_CFG_DASH_MSK(radio_cfg));
-                IWL_INFO(priv, "Radio type=0x%x-0x%x-0x%x\n",
-                         EEPROM_RF_CFG_TYPE_MSK(radio_cfg),
-                         EEPROM_RF_CFG_STEP_MSK(radio_cfg),
-                         EEPROM_RF_CFG_DASH_MSK(radio_cfg));
-        } else
-                WARN_ON(1);
-
-        /* set CSR_HW_CONFIG_REG for uCode use */
-        iwl_set_bit(priv->trans, CSR_HW_IF_CONFIG_REG,
-                    CSR_HW_IF_CONFIG_REG_BIT_RADIO_SI |
-                    CSR_HW_IF_CONFIG_REG_BIT_MAC_SI);
-}
diff --git a/drivers/net/wireless/iwlwifi/iwl-eeprom.h b/drivers/net/wireless/iwlwifi/iwl-eeprom.h
deleted file mode 100644
index 64bfd947cae..00000000000
--- a/drivers/net/wireless/iwlwifi/iwl-eeprom.h
+++ /dev/null
@@ -1,269 +0,0 @@
-/******************************************************************************
- *
- * This file is provided under a dual BSD/GPLv2 license.  When using or
- * redistributing this file, you may do so under either license.
- *
- * GPL LICENSE SUMMARY
- *
- * Copyright(c) 2008 - 2012 Intel Corporation. All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110,
- * USA
- *
- * The full GNU General Public License is included in this distribution
- * in the file called LICENSE.GPL.
- *
- * Contact Information:
- *  Intel Linux Wireless <ilw@linux.intel.com>
- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
- *
- * BSD LICENSE
- *
- * Copyright(c) 2005 - 2012 Intel Corporation. All rights reserved.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *  * Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *  * Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *  * Neither the name Intel Corporation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *****************************************************************************/
-
-#ifndef __iwl_eeprom_h__
-#define __iwl_eeprom_h__
-
-#include <net/mac80211.h>
-
-struct iwl_priv;
-
-/*
- * EEPROM access time values:
- *
- * Driver initiates EEPROM read by writing byte address << 1 to CSR_EEPROM_REG.
- * Driver then polls CSR_EEPROM_REG for CSR_EEPROM_REG_READ_VALID_MSK (0x1).
- * When polling, wait 10 uSec between polling loops, up to a maximum 5000 uSec.
- * Driver reads 16-bit value from bits 31-16 of CSR_EEPROM_REG.
- */
-#define IWL_EEPROM_ACCESS_TIMEOUT       5000 /* uSec */
-
-#define IWL_EEPROM_SEM_TIMEOUT          10   /* microseconds */
-#define IWL_EEPROM_SEM_RETRY_LIMIT      1000 /* number of attempts (not time) */
-
-
-/*
- * Regulatory channel usage flags in EEPROM struct iwl4965_eeprom_channel.flags.
- *
- * IBSS and/or AP operation is allowed *only* on those channels with
- * (VALID && IBSS && ACTIVE && !RADAR).  This restriction is in place because
- * RADAR detection is not supported by the 4965 driver, but is a
- * requirement for establishing a new network for legal operation on channels
- * requiring RADAR detection or restricting ACTIVE scanning.
- *
- * NOTE:  "WIDE" flag does not indicate anything about "HT40" 40 MHz channels.
- *        It only indicates that 20 MHz channel use is supported; HT40 channel
- *        usage is indicated by a separate set of regulatory flags for each
- *        HT40 channel pair.
- *
- * NOTE:  Using a channel inappropriately will result in a uCode error!
- */
-#define IWL_NUM_TX_CALIB_GROUPS 5
-enum {
-        EEPROM_CHANNEL_VALID = (1 << 0),        /* usable for this SKU/geo */
-        EEPROM_CHANNEL_IBSS = (1 << 1),         /* usable as an IBSS channel */
-        /* Bit 2 Reserved */
-        EEPROM_CHANNEL_ACTIVE = (1 << 3),       /* active scanning allowed */
-        EEPROM_CHANNEL_RADAR = (1 << 4),        /* radar detection required */
-        EEPROM_CHANNEL_WIDE = (1 << 5),         /* 20 MHz channel okay */
-        /* Bit 6 Reserved (was Narrow Channel) */
-        EEPROM_CHANNEL_DFS = (1 << 7),  /* dynamic freq selection candidate */
-};
-
-/* SKU Capabilities */
-#define EEPROM_SKU_CAP_BAND_24GHZ                       (1 << 4)
-#define EEPROM_SKU_CAP_BAND_52GHZ                       (1 << 5)
-#define EEPROM_SKU_CAP_11N_ENABLE                       (1 << 6)
-#define EEPROM_SKU_CAP_AMT_ENABLE                       (1 << 7)
-#define EEPROM_SKU_CAP_IPAN_ENABLE                      (1 << 8)
-
-/* *regulatory* channel data format in eeprom, one for each channel.
- * There are separate entries for HT40 (40 MHz) vs. normal (20 MHz) channels. */
-struct iwl_eeprom_channel {
-        u8 flags;               /* EEPROM_CHANNEL_* flags copied from EEPROM */
-        s8 max_power_avg;       /* max power (dBm) on this chnl, limit 31 */
-} __packed;
-
-enum iwl_eeprom_enhanced_txpwr_flags {
-        IWL_EEPROM_ENH_TXP_FL_VALID             = BIT(0),
-        IWL_EEPROM_ENH_TXP_FL_BAND_52G          = BIT(1),
-        IWL_EEPROM_ENH_TXP_FL_OFDM              = BIT(2),
-        IWL_EEPROM_ENH_TXP_FL_40MHZ             = BIT(3),
-        IWL_EEPROM_ENH_TXP_FL_HT_AP             = BIT(4),
-        IWL_EEPROM_ENH_TXP_FL_RES1              = BIT(5),
-        IWL_EEPROM_ENH_TXP_FL_RES2              = BIT(6),
-        IWL_EEPROM_ENH_TXP_FL_COMMON_TYPE       = BIT(7),
-};
-
-/**
- * iwl_eeprom_enhanced_txpwr structure
- *    This structure presents the enhanced regulatory tx power limit layout
- *    in eeprom image
- *    Enhanced regulatory tx power portion of eeprom image can be broken down
- *    into individual structures; each one is 8 bytes in size and contain the
- *    following information
- * @flags: entry flags
- * @channel: channel number
- * @chain_a_max_pwr: chain a max power in 1/2 dBm
- * @chain_b_max_pwr: chain b max power in 1/2 dBm
- * @chain_c_max_pwr: chain c max power in 1/2 dBm
- * @delta_20_in_40: 20-in-40 deltas (hi/lo)
- * @mimo2_max_pwr: mimo2 max power in 1/2 dBm
- * @mimo3_max_pwr: mimo3 max power in 1/2 dBm
- *
- */
-struct iwl_eeprom_enhanced_txpwr {
-        u8 flags;
-        u8 channel;
-        s8 chain_a_max;
-        s8 chain_b_max;
-        s8 chain_c_max;
-        u8 delta_20_in_40;
-        s8 mimo2_max;
-        s8 mimo3_max;
-} __packed;
-
-/* calibration */
-struct iwl_eeprom_calib_hdr {
-        u8 version;
-        u8 pa_type;
-        __le16 voltage;
-} __packed;
-
-#define EEPROM_CALIB_ALL        (INDIRECT_ADDRESS | INDIRECT_CALIBRATION)
-#define EEPROM_XTAL             ((2*0x128) | EEPROM_CALIB_ALL)
-
-/* temperature */
-#define EEPROM_KELVIN_TEMPERATURE       ((2*0x12A) | EEPROM_CALIB_ALL)
-#define EEPROM_RAW_TEMPERATURE          ((2*0x12B) | EEPROM_CALIB_ALL)
-
-
-/* agn links */
-#define EEPROM_LINK_HOST             (2*0x64)
-#define EEPROM_LINK_GENERAL          (2*0x65)
-#define EEPROM_LINK_REGULATORY       (2*0x66)
-#define EEPROM_LINK_CALIBRATION      (2*0x67)
-#define EEPROM_LINK_PROCESS_ADJST    (2*0x68)
-#define EEPROM_LINK_OTHERS           (2*0x69)
-#define EEPROM_LINK_TXP_LIMIT        (2*0x6a)
-#define EEPROM_LINK_TXP_LIMIT_SIZE   (2*0x6b)
-
-/* agn regulatory - indirect access */
-#define EEPROM_REG_BAND_1_CHANNELS       ((0x08)\
-                | INDIRECT_ADDRESS | INDIRECT_REGULATORY)   /* 28 bytes */
-#define EEPROM_REG_BAND_2_CHANNELS       ((0x26)\
-                | INDIRECT_ADDRESS | INDIRECT_REGULATORY)   /* 26 bytes */
-#define EEPROM_REG_BAND_3_CHANNELS       ((0x42)\
-                | INDIRECT_ADDRESS | INDIRECT_REGULATORY)   /* 24 bytes */
-#define EEPROM_REG_BAND_4_CHANNELS       ((0x5C)\
-                | INDIRECT_ADDRESS | INDIRECT_REGULATORY)   /* 22 bytes */
-#define EEPROM_REG_BAND_5_CHANNELS       ((0x74)\
-                | INDIRECT_ADDRESS | INDIRECT_REGULATORY)   /* 12 bytes */
-#define EEPROM_REG_BAND_24_HT40_CHANNELS  ((0x82)\
-                | INDIRECT_ADDRESS | INDIRECT_REGULATORY)   /* 14  bytes */
-#define EEPROM_REG_BAND_52_HT40_CHANNELS  ((0x92)\
-                | INDIRECT_ADDRESS | INDIRECT_REGULATORY)   /* 22  bytes */
-
-/* 6000 regulatory - indirect access */
-#define EEPROM_6000_REG_BAND_24_HT40_CHANNELS  ((0x80)\
-                | INDIRECT_ADDRESS | INDIRECT_REGULATORY)   /* 14  bytes */
-/* 2.4 GHz */
-extern const u8 iwl_eeprom_band_1[14];
-
-#define ADDRESS_MSK                 0x0000FFFF
-#define INDIRECT_TYPE_MSK           0x000F0000
-#define INDIRECT_HOST               0x00010000
-#define INDIRECT_GENERAL            0x00020000
-#define INDIRECT_REGULATORY         0x00030000
-#define INDIRECT_CALIBRATION        0x00040000
-#define INDIRECT_PROCESS_ADJST      0x00050000
-#define INDIRECT_OTHERS             0x00060000
-#define INDIRECT_TXP_LIMIT          0x00070000
-#define INDIRECT_TXP_LIMIT_SIZE     0x00080000
-#define INDIRECT_ADDRESS            0x00100000
-
-/* General */
-#define EEPROM_DEVICE_ID                    (2*0x08)    /* 2 bytes */
-#define EEPROM_SUBSYSTEM_ID                 (2*0x0A)    /* 2 bytes */
-#define EEPROM_MAC_ADDRESS                  (2*0x15)    /* 6  bytes */
-#define EEPROM_BOARD_REVISION               (2*0x35)    /* 2  bytes */
-#define EEPROM_BOARD_PBA_NUMBER             (2*0x3B+1)  /* 9  bytes */
-#define EEPROM_VERSION                      (2*0x44)    /* 2  bytes */
-#define EEPROM_SKU_CAP                      (2*0x45)    /* 2  bytes */
-#define EEPROM_OEM_MODE                     (2*0x46)    /* 2  bytes */
-#define EEPROM_RADIO_CONFIG                 (2*0x48)    /* 2  bytes */
-#define EEPROM_NUM_MAC_ADDRESS              (2*0x4C)    /* 2  bytes */
-
-/* The following masks are to be applied on EEPROM_RADIO_CONFIG */
-#define EEPROM_RF_CFG_TYPE_MSK(x)   (x & 0x3)         /* bits 0-1   */
-#define EEPROM_RF_CFG_STEP_MSK(x)   ((x >> 2)  & 0x3) /* bits 2-3   */
-#define EEPROM_RF_CFG_DASH_MSK(x)   ((x >> 4)  & 0x3) /* bits 4-5   */
-#define EEPROM_RF_CFG_PNUM_MSK(x)   ((x >> 6)  & 0x3) /* bits 6-7   */
-#define EEPROM_RF_CFG_TX_ANT_MSK(x) ((x >> 8)  & 0xF) /* bits 8-11  */
-#define EEPROM_RF_CFG_RX_ANT_MSK(x) ((x >> 12) & 0xF) /* bits 12-15 */
-
-#define EEPROM_RF_CONFIG_TYPE_MAX       0x3
-
-#define EEPROM_REGULATORY_BAND_NO_HT40                  (0)
-
-struct iwl_eeprom_ops {
-        const u32 regulatory_bands[7];
-        bool enhanced_txpower;
-};
-
-
-int iwl_eeprom_init(struct iwl_priv *priv, u32 hw_rev);
-void iwl_eeprom_free(struct iwl_priv *priv);
-int iwl_eeprom_check_version(struct iwl_priv *priv);
-int iwl_eeprom_init_hw_params(struct iwl_priv *priv);
-u16 iwl_eeprom_calib_version(struct iwl_priv *priv);
-const u8 *iwl_eeprom_query_addr(struct iwl_priv *priv, size_t offset);
-u16 iwl_eeprom_query16(struct iwl_priv *priv, size_t offset);
-void iwl_eeprom_get_mac(struct iwl_priv *priv, u8 *mac);
-int iwl_init_channel_map(struct iwl_priv *priv);
-void iwl_free_channel_map(struct iwl_priv *priv);
-const struct iwl_channel_info *iwl_get_channel_info(
-                const struct iwl_priv *priv,
-                enum ieee80211_band band, u16 channel);
-void iwl_rf_config(struct iwl_priv *priv);
-
-#endif  /* __iwl_eeprom_h__ */
diff --git a/drivers/net/wireless/iwlwifi/iwl-fh.h b/drivers/net/wireless/iwlwifi/iwl-fh.h
index 74bce97a860..80604664174 100644
--- a/drivers/net/wireless/iwlwifi/iwl-fh.h
+++ b/drivers/net/wireless/iwlwifi/iwl-fh.h
@@ -421,6 +421,8 @@ static inline unsigned int FH_MEM_CBBC_QUEUE(unsigned int chnl)
                 (FH_SRVC_LOWER_BOUND + ((_chnl) - 9) * 0x4)
 
 #define FH_TX_CHICKEN_BITS_REG  (FH_MEM_LOWER_BOUND + 0xE98)
+#define FH_TX_TRB_REG(_chan)    (FH_MEM_LOWER_BOUND + 0x958 + (_chan) * 4)
+
 /* Instruct FH to increment the retry count of a packet when
  * it is brought from the memory to TX-FIFO
  */
diff --git a/drivers/net/wireless/iwlwifi/iwl-io.c b/drivers/net/wireless/iwlwifi/iwl-io.c
index 081dd34d238..66c873399ab 100644
--- a/drivers/net/wireless/iwlwifi/iwl-io.c
+++ b/drivers/net/wireless/iwlwifi/iwl-io.c
@@ -27,6 +27,7 @@
  *****************************************************************************/
 #include <linux/delay.h>
 #include <linux/device.h>
+#include <linux/export.h>
 
 #include "iwl-io.h"
 #include"iwl-csr.h"
@@ -52,6 +53,7 @@ void iwl_set_bit(struct iwl_trans *trans, u32 reg, u32 mask)
         __iwl_set_bit(trans, reg, mask);
         spin_unlock_irqrestore(&trans->reg_lock, flags);
 }
+EXPORT_SYMBOL_GPL(iwl_set_bit);
 
 void iwl_clear_bit(struct iwl_trans *trans, u32 reg, u32 mask)
 {
@@ -61,6 +63,25 @@ void iwl_clear_bit(struct iwl_trans *trans, u32 reg, u32 mask)
         __iwl_clear_bit(trans, reg, mask);
         spin_unlock_irqrestore(&trans->reg_lock, flags);
 }
+EXPORT_SYMBOL_GPL(iwl_clear_bit);
+
+void iwl_set_bits_mask(struct iwl_trans *trans, u32 reg, u32 mask, u32 value)
+{
+        unsigned long flags;
+        u32 v;
+
+#ifdef CONFIG_IWLWIFI_DEBUG
+        WARN_ON_ONCE(value & ~mask);
+#endif
+
+        spin_lock_irqsave(&trans->reg_lock, flags);
+        v = iwl_read32(trans, reg);
+        v &= ~mask;
+        v |= value;
+        iwl_write32(trans, reg, v);
+        spin_unlock_irqrestore(&trans->reg_lock, flags);
+}
+EXPORT_SYMBOL_GPL(iwl_set_bits_mask);
 
 int iwl_poll_bit(struct iwl_trans *trans, u32 addr,
                  u32 bits, u32 mask, int timeout)
@@ -76,6 +97,7 @@ int iwl_poll_bit(struct iwl_trans *trans, u32 addr,
 
         return -ETIMEDOUT;
 }
+EXPORT_SYMBOL_GPL(iwl_poll_bit);
 
 int iwl_grab_nic_access_silent(struct iwl_trans *trans)
 {
@@ -117,6 +139,7 @@ int iwl_grab_nic_access_silent(struct iwl_trans *trans)
 
         return 0;
 }
+EXPORT_SYMBOL_GPL(iwl_grab_nic_access_silent);
 
 bool iwl_grab_nic_access(struct iwl_trans *trans)
 {
@@ -130,6 +153,7 @@ bool iwl_grab_nic_access(struct iwl_trans *trans)
 
         return true;
 }
+EXPORT_SYMBOL_GPL(iwl_grab_nic_access);
 
 void iwl_release_nic_access(struct iwl_trans *trans)
 {
@@ -144,6 +168,7 @@ void iwl_release_nic_access(struct iwl_trans *trans)
          */
         mmiowb();
 }
+EXPORT_SYMBOL_GPL(iwl_release_nic_access);
 
 u32 iwl_read_direct32(struct iwl_trans *trans, u32 reg)
 {
@@ -158,6 +183,7 @@ u32 iwl_read_direct32(struct iwl_trans *trans, u32 reg)
 
         return value;
 }
+EXPORT_SYMBOL_GPL(iwl_read_direct32);
 
 void iwl_write_direct32(struct iwl_trans *trans, u32 reg, u32 value)
 {
@@ -170,6 +196,7 @@ void iwl_write_direct32(struct iwl_trans *trans, u32 reg, u32 value)
         }
         spin_unlock_irqrestore(&trans->reg_lock, flags);
 }
+EXPORT_SYMBOL_GPL(iwl_write_direct32);
 
 int iwl_poll_direct_bit(struct iwl_trans *trans, u32 addr, u32 mask,
                         int timeout)
@@ -185,6 +212,7 @@ int iwl_poll_direct_bit(struct iwl_trans *trans, u32 addr, u32 mask,
 
         return -ETIMEDOUT;
 }
+EXPORT_SYMBOL_GPL(iwl_poll_direct_bit);
 
 static inline u32 __iwl_read_prph(struct iwl_trans *trans, u32 reg)
 {
@@ -211,6 +239,7 @@ u32 iwl_read_prph(struct iwl_trans *trans, u32 reg)
         spin_unlock_irqrestore(&trans->reg_lock, flags);
         return val;
 }
+EXPORT_SYMBOL_GPL(iwl_read_prph);
 
 void iwl_write_prph(struct iwl_trans *trans, u32 addr, u32 val)
 {
@@ -223,6 +252,7 @@ void iwl_write_prph(struct iwl_trans *trans, u32 addr, u32 val)
         }
         spin_unlock_irqrestore(&trans->reg_lock, flags);
 }
+EXPORT_SYMBOL_GPL(iwl_write_prph);
 
 void iwl_set_bits_prph(struct iwl_trans *trans, u32 reg, u32 mask)
 {
@@ -236,6 +266,7 @@ void iwl_set_bits_prph(struct iwl_trans *trans, u32 reg, u32 mask)
         }
         spin_unlock_irqrestore(&trans->reg_lock, flags);
 }
+EXPORT_SYMBOL_GPL(iwl_set_bits_prph);
 
 void iwl_set_bits_mask_prph(struct iwl_trans *trans, u32 reg,
                             u32 bits, u32 mask)
@@ -250,6 +281,7 @@ void iwl_set_bits_mask_prph(struct iwl_trans *trans, u32 reg,
         }
         spin_unlock_irqrestore(&trans->reg_lock, flags);
 }
+EXPORT_SYMBOL_GPL(iwl_set_bits_mask_prph);
 
 void iwl_clear_bits_prph(struct iwl_trans *trans, u32 reg, u32 mask)
 {
@@ -264,9 +296,10 @@ void iwl_clear_bits_prph(struct iwl_trans *trans, u32 reg, u32 mask)
         }
         spin_unlock_irqrestore(&trans->reg_lock, flags);
 }
+EXPORT_SYMBOL_GPL(iwl_clear_bits_prph);
 
-void _iwl_read_targ_mem_words(struct iwl_trans *trans, u32 addr,
-                              void *buf, int words)
+void _iwl_read_targ_mem_dwords(struct iwl_trans *trans, u32 addr,
+                               void *buf, int dwords)
 {
         unsigned long flags;
         int offs;
@@ -275,24 +308,26 @@ void _iwl_read_targ_mem_words(struct iwl_trans *trans, u32 addr,
         spin_lock_irqsave(&trans->reg_lock, flags);
         if (likely(iwl_grab_nic_access(trans))) {
                 iwl_write32(trans, HBUS_TARG_MEM_RADDR, addr);
-                for (offs = 0; offs < words; offs++)
+                for (offs = 0; offs < dwords; offs++)
                         vals[offs] = iwl_read32(trans, HBUS_TARG_MEM_RDAT);
                 iwl_release_nic_access(trans);
         }
         spin_unlock_irqrestore(&trans->reg_lock, flags);
 }
+EXPORT_SYMBOL_GPL(_iwl_read_targ_mem_dwords);
 
 u32 iwl_read_targ_mem(struct iwl_trans *trans, u32 addr)
 {
         u32 value;
 
-        _iwl_read_targ_mem_words(trans, addr, &value, 1);
+        _iwl_read_targ_mem_dwords(trans, addr, &value, 1);
 
         return value;
 }
+EXPORT_SYMBOL_GPL(iwl_read_targ_mem);
 
-int _iwl_write_targ_mem_words(struct iwl_trans *trans, u32 addr,
-                                void *buf, int words)
+int _iwl_write_targ_mem_dwords(struct iwl_trans *trans, u32 addr,
+                               void *buf, int dwords)
 {
         unsigned long flags;
         int offs, result = 0;
@@ -301,7 +336,7 @@ int _iwl_write_targ_mem_words(struct iwl_trans *trans, u32 addr,
         spin_lock_irqsave(&trans->reg_lock, flags);
         if (likely(iwl_grab_nic_access(trans))) {
                 iwl_write32(trans, HBUS_TARG_MEM_WADDR, addr);
-                for (offs = 0; offs < words; offs++)
+                for (offs = 0; offs < dwords; offs++)
                         iwl_write32(trans, HBUS_TARG_MEM_WDAT, vals[offs]);
                 iwl_release_nic_access(trans);
         } else
@@ -310,8 +345,10 @@ int _iwl_write_targ_mem_words(struct iwl_trans *trans, u32 addr,
 
         return result;
 }
+EXPORT_SYMBOL_GPL(_iwl_write_targ_mem_dwords);
 
 int iwl_write_targ_mem(struct iwl_trans *trans, u32 addr, u32 val)
 {
-        return _iwl_write_targ_mem_words(trans, addr, &val, 1);
+        return _iwl_write_targ_mem_dwords(trans, addr, &val, 1);
 }
+EXPORT_SYMBOL_GPL(iwl_write_targ_mem);
diff --git a/drivers/net/wireless/iwlwifi/iwl-io.h b/drivers/net/wireless/iwlwifi/iwl-io.h
index abb3250164b..50d3819739d 100644
--- a/drivers/net/wireless/iwlwifi/iwl-io.h
+++ b/drivers/net/wireless/iwlwifi/iwl-io.h
@@ -54,6 +54,8 @@ static inline u32 iwl_read32(struct iwl_trans *trans, u32 ofs)
 void iwl_set_bit(struct iwl_trans *trans, u32 reg, u32 mask);
 void iwl_clear_bit(struct iwl_trans *trans, u32 reg, u32 mask);
 
+void iwl_set_bits_mask(struct iwl_trans *trans, u32 reg, u32 mask, u32 value);
+
 int iwl_poll_bit(struct iwl_trans *trans, u32 addr,
                  u32 bits, u32 mask, int timeout);
 int iwl_poll_direct_bit(struct iwl_trans *trans, u32 addr, u32 mask,
@@ -74,18 +76,18 @@ void iwl_set_bits_mask_prph(struct iwl_trans *trans, u32 reg,
                             u32 bits, u32 mask);
 void iwl_clear_bits_prph(struct iwl_trans *trans, u32 reg, u32 mask);
 
-void _iwl_read_targ_mem_words(struct iwl_trans *trans, u32 addr,
-                              void *buf, int words);
+void _iwl_read_targ_mem_dwords(struct iwl_trans *trans, u32 addr,
+                               void *buf, int dwords);
 
-#define iwl_read_targ_mem_words(trans, addr, buf, bufsize)      \
+#define iwl_read_targ_mem_bytes(trans, addr, buf, bufsize)      \
         do {                                                    \
                 BUILD_BUG_ON((bufsize) % sizeof(u32));          \
-                _iwl_read_targ_mem_words(trans, addr, buf,      \
-                                         (bufsize) / sizeof(u32));\
+                _iwl_read_targ_mem_dwords(trans, addr, buf,     \
+                                          (bufsize) / sizeof(u32));\
         } while (0)
 
-int _iwl_write_targ_mem_words(struct iwl_trans *trans, u32 addr,
-                              void *buf, int words);
+int _iwl_write_targ_mem_dwords(struct iwl_trans *trans, u32 addr,
+                               void *buf, int dwords);
 
 u32 iwl_read_targ_mem(struct iwl_trans *trans, u32 addr);
 int iwl_write_targ_mem(struct iwl_trans *trans, u32 addr, u32 val);
diff --git a/drivers/net/wireless/iwlwifi/iwl-notif-wait.c b/drivers/net/wireless/iwlwifi/iwl-notif-wait.c
index 0066b899fe5..c61f2070f15 100644
--- a/drivers/net/wireless/iwlwifi/iwl-notif-wait.c
+++ b/drivers/net/wireless/iwlwifi/iwl-notif-wait.c
@@ -61,6 +61,7 @@
  *
  *****************************************************************************/
 #include <linux/sched.h>
+#include <linux/export.h>
 
 #include "iwl-notif-wait.h"
 
@@ -71,6 +72,7 @@ void iwl_notification_wait_init(struct iwl_notif_wait_data *notif_wait)
         INIT_LIST_HEAD(&notif_wait->notif_waits);
         init_waitqueue_head(&notif_wait->notif_waitq);
 }
+EXPORT_SYMBOL_GPL(iwl_notification_wait_init);
 
 void iwl_notification_wait_notify(struct iwl_notif_wait_data *notif_wait,
                                   struct iwl_rx_packet *pkt)
@@ -115,20 +117,20 @@ void iwl_notification_wait_notify(struct iwl_notif_wait_data *notif_wait,
         if (triggered)
                 wake_up_all(&notif_wait->notif_waitq);
 }
+EXPORT_SYMBOL_GPL(iwl_notification_wait_notify);
 
 void iwl_abort_notification_waits(struct iwl_notif_wait_data *notif_wait)
 {
-        unsigned long flags;
         struct iwl_notification_wait *wait_entry;
 
-        spin_lock_irqsave(&notif_wait->notif_wait_lock, flags);
+        spin_lock(&notif_wait->notif_wait_lock);
         list_for_each_entry(wait_entry, &notif_wait->notif_waits, list)
                 wait_entry->aborted = true;
-        spin_unlock_irqrestore(&notif_wait->notif_wait_lock, flags);
+        spin_unlock(&notif_wait->notif_wait_lock);
 
         wake_up_all(&notif_wait->notif_waitq);
 }
-
+EXPORT_SYMBOL_GPL(iwl_abort_notification_waits);
 
 void
 iwl_init_notification_wait(struct iwl_notif_wait_data *notif_wait,
@@ -152,6 +154,7 @@ iwl_init_notification_wait(struct iwl_notif_wait_data *notif_wait,
         list_add(&wait_entry->list, &notif_wait->notif_waits);
         spin_unlock_bh(&notif_wait->notif_wait_lock);
 }
+EXPORT_SYMBOL_GPL(iwl_init_notification_wait);
 
 int iwl_wait_notification(struct iwl_notif_wait_data *notif_wait,
                           struct iwl_notification_wait *wait_entry,
@@ -175,6 +178,7 @@ int iwl_wait_notification(struct iwl_notif_wait_data *notif_wait,
                 return -ETIMEDOUT;
         return 0;
 }
+EXPORT_SYMBOL_GPL(iwl_wait_notification);
 
 void iwl_remove_notification(struct iwl_notif_wait_data *notif_wait,
                              struct iwl_notification_wait *wait_entry)
@@ -183,3 +187,4 @@ void iwl_remove_notification(struct iwl_notif_wait_data *notif_wait,
         list_del(&wait_entry->list);
         spin_unlock_bh(&notif_wait->notif_wait_lock);
 }
+EXPORT_SYMBOL_GPL(iwl_remove_notification);
diff --git a/drivers/net/wireless/iwlwifi/iwl-op-mode.h b/drivers/net/wireless/iwlwifi/iwl-op-mode.h
index 4ef742b28e0..64886f95664 100644
--- a/drivers/net/wireless/iwlwifi/iwl-op-mode.h
+++ b/drivers/net/wireless/iwlwifi/iwl-op-mode.h
@@ -111,22 +111,25 @@ struct iwl_cfg;
  *      May sleep
  * @rx: Rx notification to the op_mode. rxb is the Rx buffer itself. Cmd is the
  *      HCMD the this Rx responds to.
- *      Must be atomic.
+ *      Must be atomic and called with BH disabled.
  * @queue_full: notifies that a HW queue is full.
- *      Must be atomic
+ *      Must be atomic and called with BH disabled.
  * @queue_not_full: notifies that a HW queue is not full any more.
- *      Must be atomic
+ *      Must be atomic and called with BH disabled.
  * @hw_rf_kill:notifies of a change in the HW rf kill switch. True means that
  *      the radio is killed. Must be atomic.
  * @free_skb: allows the transport layer to free skbs that haven't been
  *      reclaimed by the op_mode. This can happen when the driver is freed and
  *      there are Tx packets pending in the transport layer.
  *      Must be atomic
- * @nic_error: error notification. Must be atomic
- * @cmd_queue_full: Called when the command queue gets full. Must be atomic.
+ * @nic_error: error notification. Must be atomic and must be called with BH
+ *      disabled.
+ * @cmd_queue_full: Called when the command queue gets full. Must be atomic and
+ *      called with BH disabled.
  * @nic_config: configure NIC, called before firmware is started.
  *      May sleep
- * @wimax_active: invoked when WiMax becomes active.  Must be atomic.
+ * @wimax_active: invoked when WiMax becomes active.  Must be atomic and called
+ *      with BH disabled.
  */
 struct iwl_op_mode_ops {
         struct iwl_op_mode *(*start)(struct iwl_trans *trans,
@@ -145,6 +148,9 @@ struct iwl_op_mode_ops {
         void (*wimax_active)(struct iwl_op_mode *op_mode);
 };
 
+int iwl_opmode_register(const char *name, const struct iwl_op_mode_ops *ops);
+void iwl_opmode_deregister(const char *name);
+
 /**
  * struct iwl_op_mode - operational mode
  *
@@ -162,7 +168,6 @@ struct iwl_op_mode {
 static inline void iwl_op_mode_stop(struct iwl_op_mode *op_mode)
 {
         might_sleep();
-
         op_mode->ops->stop(op_mode);
 }
 
@@ -218,9 +223,4 @@ static inline void iwl_op_mode_wimax_active(struct iwl_op_mode *op_mode)
         op_mode->ops->wimax_active(op_mode);
 }
 
-/*****************************************************
-* Op mode layers implementations
-******************************************************/
-extern const struct iwl_op_mode_ops iwl_dvm_ops;
-
 #endif /* __iwl_op_mode_h__ */
diff --git a/drivers/net/wireless/iwlwifi/iwl-prph.h b/drivers/net/wireless/iwlwifi/iwl-prph.h
index dfd54662e3e..9253ef1dba7 100644
--- a/drivers/net/wireless/iwlwifi/iwl-prph.h
+++ b/drivers/net/wireless/iwlwifi/iwl-prph.h
@@ -187,7 +187,7 @@
 #define SCD_QUEUE_STTS_REG_POS_ACTIVE   (3)
 #define SCD_QUEUE_STTS_REG_POS_WSL      (4)
 #define SCD_QUEUE_STTS_REG_POS_SCD_ACT_EN (19)
-#define SCD_QUEUE_STTS_REG_MSK          (0x00FF0000)
+#define SCD_QUEUE_STTS_REG_MSK          (0x017F0000)
 
 #define SCD_QUEUE_CTX_REG1_CREDIT_POS           (8)
 #define SCD_QUEUE_CTX_REG1_CREDIT_MSK           (0x00FFFF00)
diff --git a/drivers/net/wireless/iwlwifi/iwl-test.c b/drivers/net/wireless/iwlwifi/iwl-test.c
new file mode 100644
index 00000000000..81e8c7126d7
--- /dev/null
+++ b/drivers/net/wireless/iwlwifi/iwl-test.c
@@ -0,0 +1,856 @@
+/******************************************************************************
+ *
+ * This file is provided under a dual BSD/GPLv2 license.  When using or
+ * redistributing this file, you may do so under either license.
+ *
+ * GPL LICENSE SUMMARY
+ *
+ * Copyright(c) 2010 - 2012 Intel Corporation. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110,
+ * USA
+ *
+ * The full GNU General Public License is included in this distribution
+ * in the file called LICENSE.GPL.
+ *
+ * Contact Information:
+ *  Intel Linux Wireless <ilw@linux.intel.com>
+ * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
+ *
+ * BSD LICENSE
+ *
+ * Copyright(c) 2010 - 2012 Intel Corporation. All rights reserved.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *  * Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *  * Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *  * Neither the name Intel Corporation nor the names of its
+ *    contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *****************************************************************************/
+
+#include <linux/export.h>
+#include <net/netlink.h>
+
+#include "iwl-io.h"
+#include "iwl-fh.h"
+#include "iwl-prph.h"
+#include "iwl-trans.h"
+#include "iwl-test.h"
+#include "iwl-csr.h"
+#include "iwl-testmode.h"
+
+/*
+ * Periphery registers absolute lower bound. This is used in order to
+ * differentiate registery access through HBUS_TARG_PRPH_* and
+ * HBUS_TARG_MEM_* accesses.
+ */
+#define IWL_ABS_PRPH_START (0xA00000)
+
+/*
+ * The TLVs used in the gnl message policy between the kernel module and
+ * user space application. iwl_testmode_gnl_msg_policy is to be carried
+ * through the NL80211_CMD_TESTMODE channel regulated by nl80211.
+ * See iwl-testmode.h
+ */
+static
+struct nla_policy iwl_testmode_gnl_msg_policy[IWL_TM_ATTR_MAX] = {
+        [IWL_TM_ATTR_COMMAND] = { .type = NLA_U32, },
+
+        [IWL_TM_ATTR_UCODE_CMD_ID] = { .type = NLA_U8, },
+        [IWL_TM_ATTR_UCODE_CMD_DATA] = { .type = NLA_UNSPEC, },
+
+        [IWL_TM_ATTR_REG_OFFSET] = { .type = NLA_U32, },
+        [IWL_TM_ATTR_REG_VALUE8] = { .type = NLA_U8, },
+        [IWL_TM_ATTR_REG_VALUE32] = { .type = NLA_U32, },
+
+        [IWL_TM_ATTR_SYNC_RSP] = { .type = NLA_UNSPEC, },
+        [IWL_TM_ATTR_UCODE_RX_PKT] = { .type = NLA_UNSPEC, },
+
+        [IWL_TM_ATTR_EEPROM] = { .type = NLA_UNSPEC, },
+
+        [IWL_TM_ATTR_TRACE_ADDR] = { .type = NLA_UNSPEC, },
+        [IWL_TM_ATTR_TRACE_DUMP] = { .type = NLA_UNSPEC, },
+        [IWL_TM_ATTR_TRACE_SIZE] = { .type = NLA_U32, },
+
+        [IWL_TM_ATTR_FIXRATE] = { .type = NLA_U32, },
+
+        [IWL_TM_ATTR_UCODE_OWNER] = { .type = NLA_U8, },
+
+        [IWL_TM_ATTR_MEM_ADDR] = { .type = NLA_U32, },
+        [IWL_TM_ATTR_BUFFER_SIZE] = { .type = NLA_U32, },
+        [IWL_TM_ATTR_BUFFER_DUMP] = { .type = NLA_UNSPEC, },
+
+        [IWL_TM_ATTR_FW_VERSION] = { .type = NLA_U32, },
+        [IWL_TM_ATTR_DEVICE_ID] = { .type = NLA_U32, },
+        [IWL_TM_ATTR_FW_TYPE] = { .type = NLA_U32, },
+        [IWL_TM_ATTR_FW_INST_SIZE] = { .type = NLA_U32, },
+        [IWL_TM_ATTR_FW_DATA_SIZE] = { .type = NLA_U32, },
+
+        [IWL_TM_ATTR_ENABLE_NOTIFICATION] = {.type = NLA_FLAG, },
+};
+
+static inline void iwl_test_trace_clear(struct iwl_test *tst)
+{
+        memset(&tst->trace, 0, sizeof(struct iwl_test_trace));
+}
+
+static void iwl_test_trace_stop(struct iwl_test *tst)
+{
+        if (!tst->trace.enabled)
+                return;
+
+        if (tst->trace.cpu_addr && tst->trace.dma_addr)
+                dma_free_coherent(tst->trans->dev,
+                                  tst->trace.tsize,
+                                  tst->trace.cpu_addr,
+                                  tst->trace.dma_addr);
+
+        iwl_test_trace_clear(tst);
+}
+
+static inline void iwl_test_mem_clear(struct iwl_test *tst)
+{
+        memset(&tst->mem, 0, sizeof(struct iwl_test_mem));
+}
+
+static inline void iwl_test_mem_stop(struct iwl_test *tst)
+{
+        if (!tst->mem.in_read)
+                return;
+
+        iwl_test_mem_clear(tst);
+}
+
+/*
+ * Initializes the test object
+ * During the lifetime of the test object it is assumed that the transport is
+ * started. The test object should be stopped before the transport is stopped.
+ */
+void iwl_test_init(struct iwl_test *tst, struct iwl_trans *trans,
+                   struct iwl_test_ops *ops)
+{
+        tst->trans = trans;
+        tst->ops = ops;
+
+        iwl_test_trace_clear(tst);
+        iwl_test_mem_clear(tst);
+}
+EXPORT_SYMBOL_GPL(iwl_test_init);
+
+/*
+ * Stop the test object
+ */
+void iwl_test_free(struct iwl_test *tst)
+{
+        iwl_test_mem_stop(tst);
+        iwl_test_trace_stop(tst);
+}
+EXPORT_SYMBOL_GPL(iwl_test_free);
+
+static inline int iwl_test_send_cmd(struct iwl_test *tst,
+                                    struct iwl_host_cmd *cmd)
+{
+        return tst->ops->send_cmd(tst->trans->op_mode, cmd);
+}
+
+static inline bool iwl_test_valid_hw_addr(struct iwl_test *tst, u32 addr)
+{
+        return tst->ops->valid_hw_addr(addr);
+}
+
+static inline u32 iwl_test_fw_ver(struct iwl_test *tst)
+{
+        return tst->ops->get_fw_ver(tst->trans->op_mode);
+}
+
+static inline struct sk_buff*
+iwl_test_alloc_reply(struct iwl_test *tst, int len)
+{
+        return tst->ops->alloc_reply(tst->trans->op_mode, len);
+}
+
+static inline int iwl_test_reply(struct iwl_test *tst, struct sk_buff *skb)
+{
+        return tst->ops->reply(tst->trans->op_mode, skb);
+}
+
+static inline struct sk_buff*
+iwl_test_alloc_event(struct iwl_test *tst, int len)
+{
+        return tst->ops->alloc_event(tst->trans->op_mode, len);
+}
+
+static inline void
+iwl_test_event(struct iwl_test *tst, struct sk_buff *skb)
+{
+        return tst->ops->event(tst->trans->op_mode, skb);
+}
+
+/*
+ * This function handles the user application commands to the fw. The fw
+ * commands are sent in a synchronuous manner. In case that the user requested
+ * to get commands response, it is send to the user.
+ */
+static int iwl_test_fw_cmd(struct iwl_test *tst, struct nlattr **tb)
+{
+        struct iwl_host_cmd cmd;
+        struct iwl_rx_packet *pkt;
+        struct sk_buff *skb;
+        void *reply_buf;
+        u32 reply_len;
+        int ret;
+        bool cmd_want_skb;
+
+        memset(&cmd, 0, sizeof(struct iwl_host_cmd));
+
+        if (!tb[IWL_TM_ATTR_UCODE_CMD_ID] ||
+            !tb[IWL_TM_ATTR_UCODE_CMD_DATA]) {
+                IWL_ERR(tst->trans, "Missing fw command mandatory fields\n");
+                return -ENOMSG;
+        }
+
+        cmd.flags = CMD_ON_DEMAND | CMD_SYNC;
+        cmd_want_skb = nla_get_flag(tb[IWL_TM_ATTR_UCODE_CMD_SKB]);
+        if (cmd_want_skb)
+                cmd.flags |= CMD_WANT_SKB;
+
+        cmd.id = nla_get_u8(tb[IWL_TM_ATTR_UCODE_CMD_ID]);
+        cmd.data[0] = nla_data(tb[IWL_TM_ATTR_UCODE_CMD_DATA]);
+        cmd.len[0] = nla_len(tb[IWL_TM_ATTR_UCODE_CMD_DATA]);
+        cmd.dataflags[0] = IWL_HCMD_DFL_NOCOPY;
+        IWL_DEBUG_INFO(tst->trans, "test fw cmd=0x%x, flags 0x%x, len %d\n",
+                       cmd.id, cmd.flags, cmd.len[0]);
+
+        ret = iwl_test_send_cmd(tst, &cmd);
+        if (ret) {
+                IWL_ERR(tst->trans, "Failed to send hcmd\n");
+                return ret;
+        }
+        if (!cmd_want_skb)
+                return ret;
+
+        /* Handling return of SKB to the user */
+        pkt = cmd.resp_pkt;
+        if (!pkt) {
+                IWL_ERR(tst->trans, "HCMD received a null response packet\n");
+                return ret;
+        }
+
+        reply_len = le32_to_cpu(pkt->len_n_flags) & FH_RSCSR_FRAME_SIZE_MSK;
+        skb = iwl_test_alloc_reply(tst, reply_len + 20);
+        reply_buf = kmalloc(reply_len, GFP_KERNEL);
+        if (!skb || !reply_buf) {
+                kfree_skb(skb);
+                kfree(reply_buf);
+                return -ENOMEM;
+        }
+
+        /* The reply is in a page, that we cannot send to user space. */
+        memcpy(reply_buf, &(pkt->hdr), reply_len);
+        iwl_free_resp(&cmd);
+
+        if (nla_put_u32(skb, IWL_TM_ATTR_COMMAND,
+                        IWL_TM_CMD_DEV2APP_UCODE_RX_PKT) ||
+            nla_put(skb, IWL_TM_ATTR_UCODE_RX_PKT, reply_len, reply_buf))
+                goto nla_put_failure;
+        return iwl_test_reply(tst, skb);
+
+nla_put_failure:
+        IWL_DEBUG_INFO(tst->trans, "Failed creating NL attributes\n");
+        kfree(reply_buf);
+        kfree_skb(skb);
+        return -ENOMSG;
+}
+
+/*
+ * Handles the user application commands for register access.
+ */
+static int iwl_test_reg(struct iwl_test *tst, struct nlattr **tb)
+{
+        u32 ofs, val32, cmd;
+        u8 val8;
+        struct sk_buff *skb;
+        int status = 0;
+        struct iwl_trans *trans = tst->trans;
+
+        if (!tb[IWL_TM_ATTR_REG_OFFSET]) {
+                IWL_ERR(trans, "Missing reg offset\n");
+                return -ENOMSG;
+        }
+
+        ofs = nla_get_u32(tb[IWL_TM_ATTR_REG_OFFSET]);
+        IWL_DEBUG_INFO(trans, "test reg access cmd offset=0x%x\n", ofs);
+
+        cmd = nla_get_u32(tb[IWL_TM_ATTR_COMMAND]);
+
+        /*
+         * Allow access only to FH/CSR/HBUS in direct mode.
+         * Since we don't have the upper bounds for the CSR and HBUS segments,
+         * we will use only the upper bound of FH for sanity check.
+         */
+        if (ofs >= FH_MEM_UPPER_BOUND) {
+                IWL_ERR(trans, "offset out of segment (0x0 - 0x%x)\n",
+                        FH_MEM_UPPER_BOUND);
+                return -EINVAL;
+        }
+
+        switch (cmd) {
+        case IWL_TM_CMD_APP2DEV_DIRECT_REG_READ32:
+                val32 = iwl_read_direct32(tst->trans, ofs);
+                IWL_DEBUG_INFO(trans, "32 value to read 0x%x\n", val32);
+
+                skb = iwl_test_alloc_reply(tst, 20);
+                if (!skb) {
+                        IWL_ERR(trans, "Memory allocation fail\n");
+                        return -ENOMEM;
+                }
+                if (nla_put_u32(skb, IWL_TM_ATTR_REG_VALUE32, val32))
+                        goto nla_put_failure;
+                status = iwl_test_reply(tst, skb);
+                if (status < 0)
+                        IWL_ERR(trans, "Error sending msg : %d\n", status);
+                break;
+
+        case IWL_TM_CMD_APP2DEV_DIRECT_REG_WRITE32:
+                if (!tb[IWL_TM_ATTR_REG_VALUE32]) {
+                        IWL_ERR(trans, "Missing value to write\n");
+                        return -ENOMSG;
+                } else {
+                        val32 = nla_get_u32(tb[IWL_TM_ATTR_REG_VALUE32]);
+                        IWL_DEBUG_INFO(trans, "32b write val=0x%x\n", val32);
+                        iwl_write_direct32(tst->trans, ofs, val32);
+                }
+                break;
+
+        case IWL_TM_CMD_APP2DEV_DIRECT_REG_WRITE8:
+                if (!tb[IWL_TM_ATTR_REG_VALUE8]) {
+                        IWL_ERR(trans, "Missing value to write\n");
+                        return -ENOMSG;
+                } else {
+                        val8 = nla_get_u8(tb[IWL_TM_ATTR_REG_VALUE8]);
+                        IWL_DEBUG_INFO(trans, "8b write val=0x%x\n", val8);
+                        iwl_write8(tst->trans, ofs, val8);
+                }
+                break;
+
+        default:
+                IWL_ERR(trans, "Unknown test register cmd ID\n");
+                return -ENOMSG;
+        }
+
+        return status;
+
+nla_put_failure:
+        kfree_skb(skb);
+        return -EMSGSIZE;
+}
+
+/*
+ * Handles the request to start FW tracing. Allocates of the trace buffer
+ * and sends a reply to user space with the address of the allocated buffer.
+ */
+static int iwl_test_trace_begin(struct iwl_test *tst, struct nlattr **tb)
+{
+        struct sk_buff *skb;
+        int status = 0;
+
+        if (tst->trace.enabled)
+                return -EBUSY;
+
+        if (!tb[IWL_TM_ATTR_TRACE_SIZE])
+                tst->trace.size = TRACE_BUFF_SIZE_DEF;
+        else
+                tst->trace.size =
+                        nla_get_u32(tb[IWL_TM_ATTR_TRACE_SIZE]);
+
+        if (!tst->trace.size)
+                return -EINVAL;
+
+        if (tst->trace.size < TRACE_BUFF_SIZE_MIN ||
+            tst->trace.size > TRACE_BUFF_SIZE_MAX)
+                return -EINVAL;
+
+        tst->trace.tsize = tst->trace.size + TRACE_BUFF_PADD;
+        tst->trace.cpu_addr = dma_alloc_coherent(tst->trans->dev,
+                                                 tst->trace.tsize,
+                                                 &tst->trace.dma_addr,
+                                                 GFP_KERNEL);
+        if (!tst->trace.cpu_addr)
+                return -ENOMEM;
+
+        tst->trace.enabled = true;
+        tst->trace.trace_addr = (u8 *)PTR_ALIGN(tst->trace.cpu_addr, 0x100);
+
+        memset(tst->trace.trace_addr, 0x03B, tst->trace.size);
+
+        skb = iwl_test_alloc_reply(tst, sizeof(tst->trace.dma_addr) + 20);
+        if (!skb) {
+                IWL_ERR(tst->trans, "Memory allocation fail\n");
+                iwl_test_trace_stop(tst);
+                return -ENOMEM;
+        }
+
+        if (nla_put(skb, IWL_TM_ATTR_TRACE_ADDR,
+                    sizeof(tst->trace.dma_addr),
+                    (u64 *)&tst->trace.dma_addr))
+                goto nla_put_failure;
+
+        status = iwl_test_reply(tst, skb);
+        if (status < 0)
+                IWL_ERR(tst->trans, "Error sending msg : %d\n", status);
+
+        tst->trace.nchunks = DIV_ROUND_UP(tst->trace.size,
+                                          DUMP_CHUNK_SIZE);
+
+        return status;
+
+nla_put_failure:
+        kfree_skb(skb);
+        if (nla_get_u32(tb[IWL_TM_ATTR_COMMAND]) ==
+            IWL_TM_CMD_APP2DEV_BEGIN_TRACE)
+                iwl_test_trace_stop(tst);
+        return -EMSGSIZE;
+}
+
+/*
+ * Handles indirect read from the periphery or the SRAM. The read is performed
+ * to a temporary buffer. The user space application should later issue a dump
+ */
+static int iwl_test_indirect_read(struct iwl_test *tst, u32 addr, u32 size)
+{
+        struct iwl_trans *trans = tst->trans;
+        unsigned long flags;
+        int i;
+
+        if (size & 0x3)
+                return -EINVAL;
+
+        tst->mem.size = size;
+        tst->mem.addr = kmalloc(tst->mem.size, GFP_KERNEL);
+        if (tst->mem.addr == NULL)
+                return -ENOMEM;
+
+        /* Hard-coded periphery absolute address */
+        if (IWL_ABS_PRPH_START <= addr &&
+            addr < IWL_ABS_PRPH_START + PRPH_END) {
+                        spin_lock_irqsave(&trans->reg_lock, flags);
+                        iwl_grab_nic_access(trans);
+                        iwl_write32(trans, HBUS_TARG_PRPH_RADDR,
+                                    addr | (3 << 24));
+                        for (i = 0; i < size; i += 4)
+                                *(u32 *)(tst->mem.addr + i) =
+                                        iwl_read32(trans, HBUS_TARG_PRPH_RDAT);
+                        iwl_release_nic_access(trans);
+                        spin_unlock_irqrestore(&trans->reg_lock, flags);
+        } else { /* target memory (SRAM) */
+                _iwl_read_targ_mem_dwords(trans, addr,
+                                          tst->mem.addr,
+                                          tst->mem.size / 4);
+        }
+
+        tst->mem.nchunks =
+                DIV_ROUND_UP(tst->mem.size, DUMP_CHUNK_SIZE);
+        tst->mem.in_read = true;
+        return 0;
+
+}
+
+/*
+ * Handles indirect write to the periphery or SRAM. The  is performed to a
+ * temporary buffer.
+ */
+static int iwl_test_indirect_write(struct iwl_test *tst, u32 addr,
+        u32 size, unsigned char *buf)
+{
+        struct iwl_trans *trans = tst->trans;
+        u32 val, i;
+        unsigned long flags;
+
+        if (IWL_ABS_PRPH_START <= addr &&
+            addr < IWL_ABS_PRPH_START + PRPH_END) {
+                        /* Periphery writes can be 1-3 bytes long, or DWORDs */
+                        if (size < 4) {
+                                memcpy(&val, buf, size);
+                                spin_lock_irqsave(&trans->reg_lock, flags);
+                                iwl_grab_nic_access(trans);
+                                iwl_write32(trans, HBUS_TARG_PRPH_WADDR,
+                                            (addr & 0x0000FFFF) |
+                                            ((size - 1) << 24));
+                                iwl_write32(trans, HBUS_TARG_PRPH_WDAT, val);
+                                iwl_release_nic_access(trans);
+                                /* needed after consecutive writes w/o read */
+                                mmiowb();
+                                spin_unlock_irqrestore(&trans->reg_lock, flags);
+                        } else {
+                                if (size % 4)
+                                        return -EINVAL;
+                                for (i = 0; i < size; i += 4)
+                                        iwl_write_prph(trans, addr+i,
+                                                       *(u32 *)(buf+i));
+                        }
+        } else if (iwl_test_valid_hw_addr(tst, addr)) {
+                _iwl_write_targ_mem_dwords(trans, addr, buf, size / 4);
+        } else {
+                return -EINVAL;
+        }
+        return 0;
+}
+
+/*
+ * Handles the user application commands for indirect read/write
+ * to/from the periphery or the SRAM.
+ */
+static int iwl_test_indirect_mem(struct iwl_test *tst, struct nlattr **tb)
+{
+        u32 addr, size, cmd;
+        unsigned char *buf;
+
+        /* Both read and write should be blocked, for atomicity */
+        if (tst->mem.in_read)
+                return -EBUSY;
+
+        cmd = nla_get_u32(tb[IWL_TM_ATTR_COMMAND]);
+        if (!tb[IWL_TM_ATTR_MEM_ADDR]) {
+                IWL_ERR(tst->trans, "Error finding memory offset address\n");
+                return -ENOMSG;
+        }
+        addr = nla_get_u32(tb[IWL_TM_ATTR_MEM_ADDR]);
+        if (!tb[IWL_TM_ATTR_BUFFER_SIZE]) {
+                IWL_ERR(tst->trans, "Error finding size for memory reading\n");
+                return -ENOMSG;
+        }
+        size = nla_get_u32(tb[IWL_TM_ATTR_BUFFER_SIZE]);
+
+        if (cmd == IWL_TM_CMD_APP2DEV_INDIRECT_BUFFER_READ) {
+                return iwl_test_indirect_read(tst, addr,  size);
+        } else {
+                if (!tb[IWL_TM_ATTR_BUFFER_DUMP])
+                        return -EINVAL;
+                buf = (unsigned char *)nla_data(tb[IWL_TM_ATTR_BUFFER_DUMP]);
+                return iwl_test_indirect_write(tst, addr, size, buf);
+        }
+}
+
+/*
+ * Enable notifications to user space
+ */
+static int iwl_test_notifications(struct iwl_test *tst,
+                                  struct nlattr **tb)
+{
+        tst->notify = nla_get_flag(tb[IWL_TM_ATTR_ENABLE_NOTIFICATION]);
+        return 0;
+}
+
+/*
+ * Handles the request to get the device id
+ */
+static int iwl_test_get_dev_id(struct iwl_test *tst, struct nlattr **tb)
+{
+        u32 devid = tst->trans->hw_id;
+        struct sk_buff *skb;
+        int status;
+
+        IWL_DEBUG_INFO(tst->trans, "hw version: 0x%x\n", devid);
+
+        skb = iwl_test_alloc_reply(tst, 20);
+        if (!skb) {
+                IWL_ERR(tst->trans, "Memory allocation fail\n");
+                return -ENOMEM;
+        }
+
+        if (nla_put_u32(skb, IWL_TM_ATTR_DEVICE_ID, devid))
+                goto nla_put_failure;
+        status = iwl_test_reply(tst, skb);
+        if (status < 0)
+                IWL_ERR(tst->trans, "Error sending msg : %d\n", status);
+
+        return 0;
+
+nla_put_failure:
+        kfree_skb(skb);
+        return -EMSGSIZE;
+}
+
+/*
+ * Handles the request to get the FW version
+ */
+static int iwl_test_get_fw_ver(struct iwl_test *tst, struct nlattr **tb)
+{
+        struct sk_buff *skb;
+        int status;
+        u32 ver = iwl_test_fw_ver(tst);
+
+        IWL_DEBUG_INFO(tst->trans, "uCode version raw: 0x%x\n", ver);
+
+        skb = iwl_test_alloc_reply(tst, 20);
+        if (!skb) {
+                IWL_ERR(tst->trans, "Memory allocation fail\n");
+                return -ENOMEM;
+        }
+
+        if (nla_put_u32(skb, IWL_TM_ATTR_FW_VERSION, ver))
+                goto nla_put_failure;
+
+        status = iwl_test_reply(tst, skb);
+        if (status < 0)
+                IWL_ERR(tst->trans, "Error sending msg : %d\n", status);
+
+        return 0;
+
+nla_put_failure:
+        kfree_skb(skb);
+        return -EMSGSIZE;
+}
+
+/*
+ * Parse the netlink message and validate that the IWL_TM_ATTR_CMD exists
+ */
+int iwl_test_parse(struct iwl_test *tst, struct nlattr **tb,
+                   void *data, int len)
+{
+        int result;
+
+        result = nla_parse(tb, IWL_TM_ATTR_MAX - 1, data, len,
+                        iwl_testmode_gnl_msg_policy);
+        if (result) {
+                IWL_ERR(tst->trans, "Fail parse gnl msg: %d\n", result);
+                return result;
+        }
+
+        /* IWL_TM_ATTR_COMMAND is absolutely mandatory */
+        if (!tb[IWL_TM_ATTR_COMMAND]) {
+                IWL_ERR(tst->trans, "Missing testmode command type\n");
+                return -ENOMSG;
+        }
+        return 0;
+}
+EXPORT_SYMBOL_GPL(iwl_test_parse);
+
+/*
+ * Handle test commands.
+ * Returns 1 for unknown commands (not handled by the test object); negative
+ * value in case of error.
+ */
+int iwl_test_handle_cmd(struct iwl_test *tst, struct nlattr **tb)
+{
+        int result;
+
+        switch (nla_get_u32(tb[IWL_TM_ATTR_COMMAND])) {
+        case IWL_TM_CMD_APP2DEV_UCODE:
+                IWL_DEBUG_INFO(tst->trans, "test cmd to uCode\n");
+                result = iwl_test_fw_cmd(tst, tb);
+                break;
+
+        case IWL_TM_CMD_APP2DEV_DIRECT_REG_READ32:
+        case IWL_TM_CMD_APP2DEV_DIRECT_REG_WRITE32:
+        case IWL_TM_CMD_APP2DEV_DIRECT_REG_WRITE8:
+                IWL_DEBUG_INFO(tst->trans, "test cmd to register\n");
+                result = iwl_test_reg(tst, tb);
+                break;
+
+        case IWL_TM_CMD_APP2DEV_BEGIN_TRACE:
+                IWL_DEBUG_INFO(tst->trans, "test uCode trace cmd to driver\n");
+                result = iwl_test_trace_begin(tst, tb);
+                break;
+
+        case IWL_TM_CMD_APP2DEV_END_TRACE:
+                iwl_test_trace_stop(tst);
+                result = 0;
+                break;
+
+        case IWL_TM_CMD_APP2DEV_INDIRECT_BUFFER_READ:
+        case IWL_TM_CMD_APP2DEV_INDIRECT_BUFFER_WRITE:
+                IWL_DEBUG_INFO(tst->trans, "test indirect memory cmd\n");
+                result = iwl_test_indirect_mem(tst, tb);
+                break;
+
+        case IWL_TM_CMD_APP2DEV_NOTIFICATIONS:
+                IWL_DEBUG_INFO(tst->trans, "test notifications cmd\n");
+                result = iwl_test_notifications(tst, tb);
+                break;
+
+        case IWL_TM_CMD_APP2DEV_GET_FW_VERSION:
+                IWL_DEBUG_INFO(tst->trans, "test get FW ver cmd\n");
+                result = iwl_test_get_fw_ver(tst, tb);
+                break;
+
+        case IWL_TM_CMD_APP2DEV_GET_DEVICE_ID:
+                IWL_DEBUG_INFO(tst->trans, "test Get device ID cmd\n");
+                result = iwl_test_get_dev_id(tst, tb);
+                break;
+
+        default:
+                IWL_DEBUG_INFO(tst->trans, "Unknown test command\n");
+                result = 1;
+                break;
+        }
+        return result;
+}
+EXPORT_SYMBOL_GPL(iwl_test_handle_cmd);
+
+static int iwl_test_trace_dump(struct iwl_test *tst, struct sk_buff *skb,
+                               struct netlink_callback *cb)
+{
+        int idx, length;
+
+        if (!tst->trace.enabled || !tst->trace.trace_addr)
+                return -EFAULT;
+
+        idx = cb->args[4];
+        if (idx >= tst->trace.nchunks)
+                return -ENOENT;
+
+        length = DUMP_CHUNK_SIZE;
+        if (((idx + 1) == tst->trace.nchunks) &&
+            (tst->trace.size % DUMP_CHUNK_SIZE))
+                length = tst->trace.size %
+                        DUMP_CHUNK_SIZE;
+
+        if (nla_put(skb, IWL_TM_ATTR_TRACE_DUMP, length,
+                    tst->trace.trace_addr + (DUMP_CHUNK_SIZE * idx)))
+                goto nla_put_failure;
+
+        cb->args[4] = ++idx;
+        return 0;
+
+ nla_put_failure:
+        return -ENOBUFS;
+}
+
+static int iwl_test_buffer_dump(struct iwl_test *tst, struct sk_buff *skb,
+                                struct netlink_callback *cb)
+{
+        int idx, length;
+
+        if (!tst->mem.in_read)
+                return -EFAULT;
+
+        idx = cb->args[4];
+        if (idx >= tst->mem.nchunks) {
+                iwl_test_mem_stop(tst);
+                return -ENOENT;
+        }
+
+        length = DUMP_CHUNK_SIZE;
+        if (((idx + 1) == tst->mem.nchunks) &&
+            (tst->mem.size % DUMP_CHUNK_SIZE))
+                length = tst->mem.size % DUMP_CHUNK_SIZE;
+
+        if (nla_put(skb, IWL_TM_ATTR_BUFFER_DUMP, length,
+                    tst->mem.addr + (DUMP_CHUNK_SIZE * idx)))
+                goto nla_put_failure;
+
+        cb->args[4] = ++idx;
+        return 0;
+
+ nla_put_failure:
+        return -ENOBUFS;
+}
+
+/*
+ * Handle dump commands.
+ * Returns 1 for unknown commands (not handled by the test object); negative
+ * value in case of error.
+ */
+int iwl_test_dump(struct iwl_test *tst, u32 cmd, struct sk_buff *skb,
+                  struct netlink_callback *cb)
+{
+        int result;
+
+        switch (cmd) {
+        case IWL_TM_CMD_APP2DEV_READ_TRACE:
+                IWL_DEBUG_INFO(tst->trans, "uCode trace cmd\n");
+                result = iwl_test_trace_dump(tst, skb, cb);
+                break;
+
+        case IWL_TM_CMD_APP2DEV_INDIRECT_BUFFER_DUMP:
+                IWL_DEBUG_INFO(tst->trans, "testmode sram dump cmd\n");
+                result = iwl_test_buffer_dump(tst, skb, cb);
+                break;
+
+        default:
+                result = 1;
+                break;
+        }
+        return result;
+}
+EXPORT_SYMBOL_GPL(iwl_test_dump);
+
+/*
+ * Multicast a spontaneous messages from the device to the user space.
+ */
+static void iwl_test_send_rx(struct iwl_test *tst,
+                             struct iwl_rx_cmd_buffer *rxb)
+{
+        struct sk_buff *skb;
+        struct iwl_rx_packet *data;
+        int length;
+
+        data = rxb_addr(rxb);
+        length = le32_to_cpu(data->len_n_flags) & FH_RSCSR_FRAME_SIZE_MSK;
+
+        /* the length doesn't include len_n_flags field, so add it manually */
+        length += sizeof(__le32);
+
+        skb = iwl_test_alloc_event(tst, length + 20);
+        if (skb == NULL) {
+                IWL_ERR(tst->trans, "Out of memory for message to user\n");
+                return;
+        }
+
+        if (nla_put_u32(skb, IWL_TM_ATTR_COMMAND,
+                        IWL_TM_CMD_DEV2APP_UCODE_RX_PKT) ||
+            nla_put(skb, IWL_TM_ATTR_UCODE_RX_PKT, length, data))
+                goto nla_put_failure;
+
+        iwl_test_event(tst, skb);
+        return;
+
+nla_put_failure:
+        kfree_skb(skb);
+        IWL_ERR(tst->trans, "Ouch, overran buffer, check allocation!\n");
+}
+
+/*
+ * Called whenever a Rx frames is recevied from the device. If notifications to
+ * the user space are requested, sends the frames to the user.
+ */
+void iwl_test_rx(struct iwl_test *tst, struct iwl_rx_cmd_buffer *rxb)
+{
+        if (tst->notify)
+                iwl_test_send_rx(tst, rxb);
+}
+EXPORT_SYMBOL_GPL(iwl_test_rx);
diff --git a/drivers/net/wireless/iwlwifi/iwl-test.h b/drivers/net/wireless/iwlwifi/iwl-test.h
new file mode 100644
index 00000000000..e13ffa8acc0
--- /dev/null
+++ b/drivers/net/wireless/iwlwifi/iwl-test.h
@@ -0,0 +1,161 @@
+/******************************************************************************
+ *
+ * This file is provided under a dual BSD/GPLv2 license.  When using or
+ * redistributing this file, you may do so under either license.
+ *
+ * GPL LICENSE SUMMARY
+ *
+ * Copyright(c) 2010 - 2012 Intel Corporation. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110,
+ * USA
+ *
+ * The full GNU General Public License is included in this distribution
+ * in the file called LICENSE.GPL.
+ *
+ * Contact Information:
+ *  Intel Linux Wireless <ilw@linux.intel.com>
+ * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
+ *
+ * BSD LICENSE
+ *
+ * Copyright(c) 2010 - 2012 Intel Corporation. All rights reserved.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *  * Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *  * Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *  * Neither the name Intel Corporation nor the names of its
+ *    contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *****************************************************************************/
+
+#ifndef __IWL_TEST_H__
+#define __IWL_TEST_H__
+
+#include <linux/types.h>
+#include "iwl-trans.h"
+
+struct iwl_test_trace {
+        u32 size;
+        u32 tsize;
+        u32 nchunks;
+        u8 *cpu_addr;
+        u8 *trace_addr;
+        dma_addr_t dma_addr;
+        bool enabled;
+};
+
+struct iwl_test_mem {
+        u32 size;
+        u32 nchunks;
+        u8 *addr;
+        bool in_read;
+};
+
+/*
+ * struct iwl_test_ops: callback to the op mode
+ *
+ * The structure defines the callbacks that the op_mode should handle,
+ * inorder to handle logic that is out of the scope of iwl_test. The
+ * op_mode must set all the callbacks.
+
+ * @send_cmd: handler that is used by the test object to request the
+ *  op_mode to send a command to the fw.
+ *
+ * @valid_hw_addr: handler that is used by the test object to request the
+ *  op_mode to check if the given address is a valid address.
+ *
+ * @get_fw_ver: handler used to get the FW version.
+ *
+ * @alloc_reply: handler used by the test object to request the op_mode
+ *  to allocate an skb for sending a reply to the user, and initialize
+ *  the skb. It is assumed that the test object only fills the required
+ *  attributes.
+ *
+ * @reply: handler used by the test object to request the op_mode to reply
+ *  to a request. The skb is an skb previously allocated by the the
+ *  alloc_reply callback.
+ I
+ * @alloc_event: handler used by the test object to request the op_mode
+ *  to allocate an skb for sending an event, and initialize
+ *  the skb. It is assumed that the test object only fills the required
+ *  attributes.
+ *
+ * @reply: handler used by the test object to request the op_mode to send
+ *  an event. The skb is an skb previously allocated by the the
+ *  alloc_event callback.
+ */
+struct iwl_test_ops {
+        int (*send_cmd)(struct iwl_op_mode *op_modes,
+                        struct iwl_host_cmd *cmd);
+        bool (*valid_hw_addr)(u32 addr);
+        u32 (*get_fw_ver)(struct iwl_op_mode *op_mode);
+
+        struct sk_buff *(*alloc_reply)(struct iwl_op_mode *op_mode, int len);
+        int (*reply)(struct iwl_op_mode *op_mode, struct sk_buff *skb);
+        struct sk_buff* (*alloc_event)(struct iwl_op_mode *op_mode, int len);
+        void (*event)(struct iwl_op_mode *op_mode, struct sk_buff *skb);
+};
+
+struct iwl_test {
+        struct iwl_trans *trans;
+        struct iwl_test_ops *ops;
+        struct iwl_test_trace trace;
+        struct iwl_test_mem mem;
+        bool notify;
+};
+
+void iwl_test_init(struct iwl_test *tst, struct iwl_trans *trans,
+                   struct iwl_test_ops *ops);
+
+void iwl_test_free(struct iwl_test *tst);
+
+int iwl_test_parse(struct iwl_test *tst, struct nlattr **tb,
+                   void *data, int len);
+
+int iwl_test_handle_cmd(struct iwl_test *tst, struct nlattr **tb);
+
+int iwl_test_dump(struct iwl_test *tst, u32 cmd, struct sk_buff *skb,
+                  struct netlink_callback *cb);
+
+void iwl_test_rx(struct iwl_test *tst, struct iwl_rx_cmd_buffer *rxb);
+
+static inline void iwl_test_enable_notifications(struct iwl_test *tst,
+                                                 bool enable)
+{
+        tst->notify = enable;
+}
+
+#endif
diff --git a/drivers/net/wireless/iwlwifi/iwl-testmode.c b/drivers/net/wireless/iwlwifi/iwl-testmode.c
deleted file mode 100644
index 060aac3e22f..00000000000
--- a/drivers/net/wireless/iwlwifi/iwl-testmode.c
+++ /dev/null
@@ -1,1114 +0,0 @@
-/******************************************************************************
- *
- * This file is provided under a dual BSD/GPLv2 license.  When using or
- * redistributing this file, you may do so under either license.
- *
- * GPL LICENSE SUMMARY
- *
- * Copyright(c) 2010 - 2012 Intel Corporation. All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110,
- * USA
- *
- * The full GNU General Public License is included in this distribution
- * in the file called LICENSE.GPL.
- *
- * Contact Information:
- *  Intel Linux Wireless <ilw@linux.intel.com>
- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
- *
- * BSD LICENSE
- *
- * Copyright(c) 2010 - 2012 Intel Corporation. All rights reserved.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *  * Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *  * Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *  * Neither the name Intel Corporation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *****************************************************************************/
-#include <linux/init.h>
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/dma-mapping.h>
-#include <net/net_namespace.h>
-#include <linux/netdevice.h>
-#include <net/cfg80211.h>
-#include <net/mac80211.h>
-#include <net/netlink.h>
-
-#include "iwl-dev.h"
-#include "iwl-debug.h"
-#include "iwl-io.h"
-#include "iwl-agn.h"
-#include "iwl-testmode.h"
-#include "iwl-trans.h"
-#include "iwl-fh.h"
-#include "iwl-prph.h"
-
-
-/* Periphery registers absolute lower bound. This is used in order to
- * differentiate registery access through HBUS_TARG_PRPH_* and
- * HBUS_TARG_MEM_* accesses.
- */
-#define IWL_TM_ABS_PRPH_START (0xA00000)
-
-/* The TLVs used in the gnl message policy between the kernel module and
- * user space application. iwl_testmode_gnl_msg_policy is to be carried
- * through the NL80211_CMD_TESTMODE channel regulated by nl80211.
- * See iwl-testmode.h
- */
-static
-struct nla_policy iwl_testmode_gnl_msg_policy[IWL_TM_ATTR_MAX] = {
-        [IWL_TM_ATTR_COMMAND] = { .type = NLA_U32, },
-
-        [IWL_TM_ATTR_UCODE_CMD_ID] = { .type = NLA_U8, },
-        [IWL_TM_ATTR_UCODE_CMD_DATA] = { .type = NLA_UNSPEC, },
-
-        [IWL_TM_ATTR_REG_OFFSET] = { .type = NLA_U32, },
-        [IWL_TM_ATTR_REG_VALUE8] = { .type = NLA_U8, },
-        [IWL_TM_ATTR_REG_VALUE32] = { .type = NLA_U32, },
-
-        [IWL_TM_ATTR_SYNC_RSP] = { .type = NLA_UNSPEC, },
-        [IWL_TM_ATTR_UCODE_RX_PKT] = { .type = NLA_UNSPEC, },
-
-        [IWL_TM_ATTR_EEPROM] = { .type = NLA_UNSPEC, },
-
-        [IWL_TM_ATTR_TRACE_ADDR] = { .type = NLA_UNSPEC, },
-        [IWL_TM_ATTR_TRACE_DUMP] = { .type = NLA_UNSPEC, },
-        [IWL_TM_ATTR_TRACE_SIZE] = { .type = NLA_U32, },
-
-        [IWL_TM_ATTR_FIXRATE] = { .type = NLA_U32, },
-
-        [IWL_TM_ATTR_UCODE_OWNER] = { .type = NLA_U8, },
-
-        [IWL_TM_ATTR_MEM_ADDR] = { .type = NLA_U32, },
-        [IWL_TM_ATTR_BUFFER_SIZE] = { .type = NLA_U32, },
-        [IWL_TM_ATTR_BUFFER_DUMP] = { .type = NLA_UNSPEC, },
-
-        [IWL_TM_ATTR_FW_VERSION] = { .type = NLA_U32, },
-        [IWL_TM_ATTR_DEVICE_ID] = { .type = NLA_U32, },
-        [IWL_TM_ATTR_FW_TYPE] = { .type = NLA_U32, },
-        [IWL_TM_ATTR_FW_INST_SIZE] = { .type = NLA_U32, },
-        [IWL_TM_ATTR_FW_DATA_SIZE] = { .type = NLA_U32, },
-
-        [IWL_TM_ATTR_ENABLE_NOTIFICATION] = {.type = NLA_FLAG, },
-};
-
-/*
- * See the struct iwl_rx_packet in iwl-commands.h for the format of the
- * received events from the device
- */
-static inline int get_event_length(struct iwl_rx_cmd_buffer *rxb)
-{
-        struct iwl_rx_packet *pkt = rxb_addr(rxb);
-        if (pkt)
-                return le32_to_cpu(pkt->len_n_flags) & FH_RSCSR_FRAME_SIZE_MSK;
-        else
-                return 0;
-}
-
-
-/*
- * This function multicasts the spontaneous messages from the device to the
- * user space. It is invoked whenever there is a received messages
- * from the device. This function is called within the ISR of the rx handlers
- * in iwlagn driver.
- *
- * The parsing of the message content is left to the user space application,
- * The message content is treated as unattacked raw data and is encapsulated
- * with IWL_TM_ATTR_UCODE_RX_PKT multicasting to the user space.
- *
- * @priv: the instance of iwlwifi device
- * @rxb: pointer to rx data content received by the ISR
- *
- * See the message policies and TLVs in iwl_testmode_gnl_msg_policy[].
- * For the messages multicasting to the user application, the mandatory
- * TLV fields are :
- *      IWL_TM_ATTR_COMMAND must be IWL_TM_CMD_DEV2APP_UCODE_RX_PKT
- *      IWL_TM_ATTR_UCODE_RX_PKT for carrying the message content
- */
-
-static void iwl_testmode_ucode_rx_pkt(struct iwl_priv *priv,
-                                      struct iwl_rx_cmd_buffer *rxb)
-{
-        struct ieee80211_hw *hw = priv->hw;
-        struct sk_buff *skb;
-        void *data;
-        int length;
-
-        data = (void *)rxb_addr(rxb);
-        length = get_event_length(rxb);
-
-        if (!data || length == 0)
-                return;
-
-        skb = cfg80211_testmode_alloc_event_skb(hw->wiphy, 20 + length,
-                                                                GFP_ATOMIC);
-        if (skb == NULL) {
-                IWL_ERR(priv,
-                         "Run out of memory for messages to user space ?\n");
-                return;
-        }
-        if (nla_put_u32(skb, IWL_TM_ATTR_COMMAND, IWL_TM_CMD_DEV2APP_UCODE_RX_PKT) ||
-            /* the length doesn't include len_n_flags field, so add it manually */
-            nla_put(skb, IWL_TM_ATTR_UCODE_RX_PKT, length + sizeof(__le32), data))
-                goto nla_put_failure;
-        cfg80211_testmode_event(skb, GFP_ATOMIC);
-        return;
-
-nla_put_failure:
-        kfree_skb(skb);
-        IWL_ERR(priv, "Ouch, overran buffer, check allocation!\n");
-}
-
-void iwl_testmode_init(struct iwl_priv *priv)
-{
-        priv->pre_rx_handler = NULL;
-        priv->testmode_trace.trace_enabled = false;
-        priv->testmode_mem.read_in_progress = false;
-}
-
-static void iwl_mem_cleanup(struct iwl_priv *priv)
-{
-        if (priv->testmode_mem.read_in_progress) {
-                kfree(priv->testmode_mem.buff_addr);
-                priv->testmode_mem.buff_addr = NULL;
-                priv->testmode_mem.buff_size = 0;
-                priv->testmode_mem.num_chunks = 0;
-                priv->testmode_mem.read_in_progress = false;
-        }
-}
-
-static void iwl_trace_cleanup(struct iwl_priv *priv)
-{
-        if (priv->testmode_trace.trace_enabled) {
-                if (priv->testmode_trace.cpu_addr &&
-                    priv->testmode_trace.dma_addr)
-                        dma_free_coherent(priv->trans->dev,
-                                        priv->testmode_trace.total_size,
-                                        priv->testmode_trace.cpu_addr,
-                                        priv->testmode_trace.dma_addr);
-                priv->testmode_trace.trace_enabled = false;
-                priv->testmode_trace.cpu_addr = NULL;
-                priv->testmode_trace.trace_addr = NULL;
-                priv->testmode_trace.dma_addr = 0;
-                priv->testmode_trace.buff_size = 0;
-                priv->testmode_trace.total_size = 0;
-        }
-}
-
-
-void iwl_testmode_cleanup(struct iwl_priv *priv)
-{
-        iwl_trace_cleanup(priv);
-        iwl_mem_cleanup(priv);
-}
-
-
-/*
- * This function handles the user application commands to the ucode.
- *
- * It retrieves the mandatory fields IWL_TM_ATTR_UCODE_CMD_ID and
- * IWL_TM_ATTR_UCODE_CMD_DATA and calls to the handler to send the
- * host command to the ucode.
- *
- * If any mandatory field is missing, -ENOMSG is replied to the user space
- * application; otherwise, waits for the host command to be sent and checks
- * the return code. In case or error, it is returned, otherwise a reply is
- * allocated and the reply RX packet
- * is returned.
- *
- * @hw: ieee80211_hw object that represents the device
- * @tb: gnl message fields from the user space
- */
-static int iwl_testmode_ucode(struct ieee80211_hw *hw, struct nlattr **tb)
-{
-        struct iwl_priv *priv = IWL_MAC80211_GET_DVM(hw);
-        struct iwl_host_cmd cmd;
-        struct iwl_rx_packet *pkt;
-        struct sk_buff *skb;
-        void *reply_buf;
-        u32 reply_len;
-        int ret;
-        bool cmd_want_skb;
-
-        memset(&cmd, 0, sizeof(struct iwl_host_cmd));
-
-        if (!tb[IWL_TM_ATTR_UCODE_CMD_ID] ||
-            !tb[IWL_TM_ATTR_UCODE_CMD_DATA]) {
-                IWL_ERR(priv, "Missing ucode command mandatory fields\n");
-                return -ENOMSG;
-        }
-
-        cmd.flags = CMD_ON_DEMAND | CMD_SYNC;
-        cmd_want_skb = nla_get_flag(tb[IWL_TM_ATTR_UCODE_CMD_SKB]);
-        if (cmd_want_skb)
-                cmd.flags |= CMD_WANT_SKB;
-
-        cmd.id = nla_get_u8(tb[IWL_TM_ATTR_UCODE_CMD_ID]);
-        cmd.data[0] = nla_data(tb[IWL_TM_ATTR_UCODE_CMD_DATA]);
-        cmd.len[0] = nla_len(tb[IWL_TM_ATTR_UCODE_CMD_DATA]);
-        cmd.dataflags[0] = IWL_HCMD_DFL_NOCOPY;
-        IWL_DEBUG_INFO(priv, "testmode ucode command ID 0x%x, flags 0x%x,"
-                                " len %d\n", cmd.id, cmd.flags, cmd.len[0]);
-
-        ret = iwl_dvm_send_cmd(priv, &cmd);
-        if (ret) {
-                IWL_ERR(priv, "Failed to send hcmd\n");
-                return ret;
-        }
-        if (!cmd_want_skb)
-                return ret;
-
-        /* Handling return of SKB to the user */
-        pkt = cmd.resp_pkt;
-        if (!pkt) {
-                IWL_ERR(priv, "HCMD received a null response packet\n");
-                return ret;
-        }
-
-        reply_len = le32_to_cpu(pkt->len_n_flags) & FH_RSCSR_FRAME_SIZE_MSK;
-        skb = cfg80211_testmode_alloc_reply_skb(hw->wiphy, reply_len + 20);
-        reply_buf = kmalloc(reply_len, GFP_KERNEL);
-        if (!skb || !reply_buf) {
-                kfree_skb(skb);
-                kfree(reply_buf);
-                return -ENOMEM;
-        }
-
-        /* The reply is in a page, that we cannot send to user space. */
-        memcpy(reply_buf, &(pkt->hdr), reply_len);
-        iwl_free_resp(&cmd);
-
-        if (nla_put_u32(skb, IWL_TM_ATTR_COMMAND, IWL_TM_CMD_DEV2APP_UCODE_RX_PKT) ||
-            nla_put(skb, IWL_TM_ATTR_UCODE_RX_PKT, reply_len, reply_buf))
-                goto nla_put_failure;
-        return cfg80211_testmode_reply(skb);
-
-nla_put_failure:
-        IWL_DEBUG_INFO(priv, "Failed creating NL attributes\n");
-        return -ENOMSG;
-}
-
-
-/*
- * This function handles the user application commands for register access.
- *
- * It retrieves command ID carried with IWL_TM_ATTR_COMMAND and calls to the
- * handlers respectively.
- *
- * If it's an unknown commdn ID, -ENOSYS is returned; or -ENOMSG if the
- * mandatory fields(IWL_TM_ATTR_REG_OFFSET,IWL_TM_ATTR_REG_VALUE32,
- * IWL_TM_ATTR_REG_VALUE8) are missing; Otherwise 0 is replied indicating
- * the success of the command execution.
- *
- * If IWL_TM_ATTR_COMMAND is IWL_TM_CMD_APP2DEV_REG_READ32, the register read
- * value is returned with IWL_TM_ATTR_REG_VALUE32.
- *
- * @hw: ieee80211_hw object that represents the device
- * @tb: gnl message fields from the user space
- */
-static int iwl_testmode_reg(struct ieee80211_hw *hw, struct nlattr **tb)
-{
-        struct iwl_priv *priv = IWL_MAC80211_GET_DVM(hw);
-        u32 ofs, val32, cmd;
-        u8 val8;
-        struct sk_buff *skb;
-        int status = 0;
-
-        if (!tb[IWL_TM_ATTR_REG_OFFSET]) {
-                IWL_ERR(priv, "Missing register offset\n");
-                return -ENOMSG;
-        }
-        ofs = nla_get_u32(tb[IWL_TM_ATTR_REG_OFFSET]);
-        IWL_INFO(priv, "testmode register access command offset 0x%x\n", ofs);
-
-        /* Allow access only to FH/CSR/HBUS in direct mode.
-        Since we don't have the upper bounds for the CSR and HBUS segments,
-        we will use only the upper bound of FH for sanity check. */
-        cmd = nla_get_u32(tb[IWL_TM_ATTR_COMMAND]);
-        if ((cmd == IWL_TM_CMD_APP2DEV_DIRECT_REG_READ32 ||
-                cmd == IWL_TM_CMD_APP2DEV_DIRECT_REG_WRITE32 ||
-                cmd == IWL_TM_CMD_APP2DEV_DIRECT_REG_WRITE8) &&
-                (ofs >= FH_MEM_UPPER_BOUND)) {
-                IWL_ERR(priv, "offset out of segment (0x0 - 0x%x)\n",
-                        FH_MEM_UPPER_BOUND);
-                return -EINVAL;
-        }
-
-        switch (cmd) {
-        case IWL_TM_CMD_APP2DEV_DIRECT_REG_READ32:
-                val32 = iwl_read_direct32(priv->trans, ofs);
-                IWL_INFO(priv, "32bit value to read 0x%x\n", val32);
-
-                skb = cfg80211_testmode_alloc_reply_skb(hw->wiphy, 20);
-                if (!skb) {
-                        IWL_ERR(priv, "Memory allocation fail\n");
-                        return -ENOMEM;
-                }
-                if (nla_put_u32(skb, IWL_TM_ATTR_REG_VALUE32, val32))
-                        goto nla_put_failure;
-                status = cfg80211_testmode_reply(skb);
-                if (status < 0)
-                        IWL_ERR(priv, "Error sending msg : %d\n", status);
-                break;
-        case IWL_TM_CMD_APP2DEV_DIRECT_REG_WRITE32:
-                if (!tb[IWL_TM_ATTR_REG_VALUE32]) {
-                        IWL_ERR(priv, "Missing value to write\n");
-                        return -ENOMSG;
-                } else {
-                        val32 = nla_get_u32(tb[IWL_TM_ATTR_REG_VALUE32]);
-                        IWL_INFO(priv, "32bit value to write 0x%x\n", val32);
-                        iwl_write_direct32(priv->trans, ofs, val32);
-                }
-                break;
-        case IWL_TM_CMD_APP2DEV_DIRECT_REG_WRITE8:
-                if (!tb[IWL_TM_ATTR_REG_VALUE8]) {
-                        IWL_ERR(priv, "Missing value to write\n");
-                        return -ENOMSG;
-                } else {
-                        val8 = nla_get_u8(tb[IWL_TM_ATTR_REG_VALUE8]);
-                        IWL_INFO(priv, "8bit value to write 0x%x\n", val8);
-                        iwl_write8(priv->trans, ofs, val8);
-                }
-                break;
-        default:
-                IWL_ERR(priv, "Unknown testmode register command ID\n");
-                return -ENOSYS;
-        }
-
-        return status;
-
-nla_put_failure:
-        kfree_skb(skb);
-        return -EMSGSIZE;
-}
-
-
-static int iwl_testmode_cfg_init_calib(struct iwl_priv *priv)
-{
-        struct iwl_notification_wait calib_wait;
-        static const u8 calib_complete[] = {
-                CALIBRATION_COMPLETE_NOTIFICATION
-        };
-        int ret;
-
-        iwl_init_notification_wait(&priv->notif_wait, &calib_wait,
-                                   calib_complete, ARRAY_SIZE(calib_complete),
-                                   NULL, NULL);
-        ret = iwl_init_alive_start(priv);
-        if (ret) {
-                IWL_ERR(priv, "Fail init calibration: %d\n", ret);
-                goto cfg_init_calib_error;
-        }
-
-        ret = iwl_wait_notification(&priv->notif_wait, &calib_wait, 2 * HZ);
-        if (ret)
-                IWL_ERR(priv, "Error detecting"
-                        " CALIBRATION_COMPLETE_NOTIFICATION: %d\n", ret);
-        return ret;
-
-cfg_init_calib_error:
-        iwl_remove_notification(&priv->notif_wait, &calib_wait);
-        return ret;
-}
-
-/*
- * This function handles the user application commands for driver.
- *
- * It retrieves command ID carried with IWL_TM_ATTR_COMMAND and calls to the
- * handlers respectively.
- *
- * If it's an unknown commdn ID, -ENOSYS is replied; otherwise, the returned
- * value of the actual command execution is replied to the user application.
- *
- * If there's any message responding to the user space, IWL_TM_ATTR_SYNC_RSP
- * is used for carry the message while IWL_TM_ATTR_COMMAND must set to
- * IWL_TM_CMD_DEV2APP_SYNC_RSP.
- *
- * @hw: ieee80211_hw object that represents the device
- * @tb: gnl message fields from the user space
- */
-static int iwl_testmode_driver(struct ieee80211_hw *hw, struct nlattr **tb)
-{
-        struct iwl_priv *priv = IWL_MAC80211_GET_DVM(hw);
-        struct iwl_trans *trans = priv->trans;
-        struct sk_buff *skb;
-        unsigned char *rsp_data_ptr = NULL;
-        int status = 0, rsp_data_len = 0;
-        u32 devid, inst_size = 0, data_size = 0;
-        const struct fw_img *img;
-
-        switch (nla_get_u32(tb[IWL_TM_ATTR_COMMAND])) {
-        case IWL_TM_CMD_APP2DEV_GET_DEVICENAME:
-                rsp_data_ptr = (unsigned char *)priv->cfg->name;
-                rsp_data_len = strlen(priv->cfg->name);
-                skb = cfg80211_testmode_alloc_reply_skb(hw->wiphy,
-                                                        rsp_data_len + 20);
-                if (!skb) {
-                        IWL_ERR(priv, "Memory allocation fail\n");
-                        return -ENOMEM;
-                }
-                if (nla_put_u32(skb, IWL_TM_ATTR_COMMAND,
-                                IWL_TM_CMD_DEV2APP_SYNC_RSP) ||
-                    nla_put(skb, IWL_TM_ATTR_SYNC_RSP,
-                            rsp_data_len, rsp_data_ptr))
-                        goto nla_put_failure;
-                status = cfg80211_testmode_reply(skb);
-                if (status < 0)
-                        IWL_ERR(priv, "Error sending msg : %d\n", status);
-                break;
-
-        case IWL_TM_CMD_APP2DEV_LOAD_INIT_FW:
-                status = iwl_load_ucode_wait_alive(priv, IWL_UCODE_INIT);
-                if (status)
-                        IWL_ERR(priv, "Error loading init ucode: %d\n", status);
-                break;
-
-        case IWL_TM_CMD_APP2DEV_CFG_INIT_CALIB:
-                iwl_testmode_cfg_init_calib(priv);
-                priv->ucode_loaded = false;
-                iwl_trans_stop_device(trans);
-                break;
-
-        case IWL_TM_CMD_APP2DEV_LOAD_RUNTIME_FW:
-                status = iwl_load_ucode_wait_alive(priv, IWL_UCODE_REGULAR);
-                if (status) {
-                        IWL_ERR(priv,
-                                "Error loading runtime ucode: %d\n", status);
-                        break;
-                }
-                status = iwl_alive_start(priv);
-                if (status)
-                        IWL_ERR(priv,
-                                "Error starting the device: %d\n", status);
-                break;
-
-        case IWL_TM_CMD_APP2DEV_LOAD_WOWLAN_FW:
-                iwl_scan_cancel_timeout(priv, 200);
-                priv->ucode_loaded = false;
-                iwl_trans_stop_device(trans);
-                status = iwl_load_ucode_wait_alive(priv, IWL_UCODE_WOWLAN);
-                if (status) {
-                        IWL_ERR(priv,
-                                "Error loading WOWLAN ucode: %d\n", status);
-                        break;
-                }
-                status = iwl_alive_start(priv);
-                if (status)
-                        IWL_ERR(priv,
-                                "Error starting the device: %d\n", status);
-                break;
-
-        case IWL_TM_CMD_APP2DEV_GET_EEPROM:
-                if (priv->eeprom) {
-                        skb = cfg80211_testmode_alloc_reply_skb(hw->wiphy,
-                                priv->cfg->base_params->eeprom_size + 20);
-                        if (!skb) {
-                                IWL_ERR(priv, "Memory allocation fail\n");
-                                return -ENOMEM;
-                        }
-                        if (nla_put_u32(skb, IWL_TM_ATTR_COMMAND,
-                                        IWL_TM_CMD_DEV2APP_EEPROM_RSP) ||
-                            nla_put(skb, IWL_TM_ATTR_EEPROM,
-                                    priv->cfg->base_params->eeprom_size,
-                                    priv->eeprom))
-                                goto nla_put_failure;
-                        status = cfg80211_testmode_reply(skb);
-                        if (status < 0)
-                                IWL_ERR(priv, "Error sending msg : %d\n",
-                                        status);
-                } else
-                        return -EFAULT;
-                break;
-
-        case IWL_TM_CMD_APP2DEV_FIXRATE_REQ:
-                if (!tb[IWL_TM_ATTR_FIXRATE]) {
-                        IWL_ERR(priv, "Missing fixrate setting\n");
-                        return -ENOMSG;
-                }
-                priv->tm_fixed_rate = nla_get_u32(tb[IWL_TM_ATTR_FIXRATE]);
-                break;
-
-        case IWL_TM_CMD_APP2DEV_GET_FW_VERSION:
-                IWL_INFO(priv, "uCode version raw: 0x%x\n",
-                         priv->fw->ucode_ver);
-
-                skb = cfg80211_testmode_alloc_reply_skb(hw->wiphy, 20);
-                if (!skb) {
-                        IWL_ERR(priv, "Memory allocation fail\n");
-                        return -ENOMEM;
-                }
-                if (nla_put_u32(skb, IWL_TM_ATTR_FW_VERSION,
-                                priv->fw->ucode_ver))
-                        goto nla_put_failure;
-                status = cfg80211_testmode_reply(skb);
-                if (status < 0)
-                        IWL_ERR(priv, "Error sending msg : %d\n", status);
-                break;
-
-        case IWL_TM_CMD_APP2DEV_GET_DEVICE_ID:
-                devid = priv->trans->hw_id;
-                IWL_INFO(priv, "hw version: 0x%x\n", devid);
-
-                skb = cfg80211_testmode_alloc_reply_skb(hw->wiphy, 20);
-                if (!skb) {
-                        IWL_ERR(priv, "Memory allocation fail\n");
-                        return -ENOMEM;
-                }
-                if (nla_put_u32(skb, IWL_TM_ATTR_DEVICE_ID, devid))
-                        goto nla_put_failure;
-                status = cfg80211_testmode_reply(skb);
-                if (status < 0)
-                        IWL_ERR(priv, "Error sending msg : %d\n", status);
-                break;
-
-        case IWL_TM_CMD_APP2DEV_GET_FW_INFO:
-                skb = cfg80211_testmode_alloc_reply_skb(hw->wiphy, 20 + 8);
-                if (!skb) {
-                        IWL_ERR(priv, "Memory allocation fail\n");
-                        return -ENOMEM;
-                }
-                if (!priv->ucode_loaded) {
-                        IWL_ERR(priv, "No uCode has not been loaded\n");
-                        return -EINVAL;
-                } else {
-                        img = &priv->fw->img[priv->cur_ucode];
-                        inst_size = img->sec[IWL_UCODE_SECTION_INST].len;
-                        data_size = img->sec[IWL_UCODE_SECTION_DATA].len;
-                }
-                if (nla_put_u32(skb, IWL_TM_ATTR_FW_TYPE, priv->cur_ucode) ||
-                    nla_put_u32(skb, IWL_TM_ATTR_FW_INST_SIZE, inst_size) ||
-                    nla_put_u32(skb, IWL_TM_ATTR_FW_DATA_SIZE, data_size))
-                        goto nla_put_failure;
-                status = cfg80211_testmode_reply(skb);
-                if (status < 0)
-                        IWL_ERR(priv, "Error sending msg : %d\n", status);
-                break;
-
-        default:
-                IWL_ERR(priv, "Unknown testmode driver command ID\n");
-                return -ENOSYS;
-        }
-        return status;
-
-nla_put_failure:
-        kfree_skb(skb);
-        return -EMSGSIZE;
-}
-
-
-/*
- * This function handles the user application commands for uCode trace
- *
- * It retrieves command ID carried with IWL_TM_ATTR_COMMAND and calls to the
- * handlers respectively.
- *
- * If it's an unknown commdn ID, -ENOSYS is replied; otherwise, the returned
- * value of the actual command execution is replied to the user application.
- *
- * @hw: ieee80211_hw object that represents the device
- * @tb: gnl message fields from the user space
- */
-static int iwl_testmode_trace(struct ieee80211_hw *hw, struct nlattr **tb)
-{
-        struct iwl_priv *priv = IWL_MAC80211_GET_DVM(hw);
-        struct sk_buff *skb;
-        int status = 0;
-        struct device *dev = priv->trans->dev;
-
-        switch (nla_get_u32(tb[IWL_TM_ATTR_COMMAND])) {
-        case IWL_TM_CMD_APP2DEV_BEGIN_TRACE:
-                if (priv->testmode_trace.trace_enabled)
-                        return -EBUSY;
-
-                if (!tb[IWL_TM_ATTR_TRACE_SIZE])
-                        priv->testmode_trace.buff_size = TRACE_BUFF_SIZE_DEF;
-                else
-                        priv->testmode_trace.buff_size =
-                                nla_get_u32(tb[IWL_TM_ATTR_TRACE_SIZE]);
-                if (!priv->testmode_trace.buff_size)
-                        return -EINVAL;
-                if (priv->testmode_trace.buff_size < TRACE_BUFF_SIZE_MIN ||
-                    priv->testmode_trace.buff_size > TRACE_BUFF_SIZE_MAX)
-                        return -EINVAL;
-
-                priv->testmode_trace.total_size =
-                        priv->testmode_trace.buff_size + TRACE_BUFF_PADD;
-                priv->testmode_trace.cpu_addr =
-                        dma_alloc_coherent(dev,
-                                           priv->testmode_trace.total_size,
-                                           &priv->testmode_trace.dma_addr,
-                                           GFP_KERNEL);
-                if (!priv->testmode_trace.cpu_addr)
-                        return -ENOMEM;
-                priv->testmode_trace.trace_enabled = true;
-                priv->testmode_trace.trace_addr = (u8 *)PTR_ALIGN(
-                        priv->testmode_trace.cpu_addr, 0x100);
-                memset(priv->testmode_trace.trace_addr, 0x03B,
-                        priv->testmode_trace.buff_size);
-                skb = cfg80211_testmode_alloc_reply_skb(hw->wiphy,
-                        sizeof(priv->testmode_trace.dma_addr) + 20);
-                if (!skb) {
-                        IWL_ERR(priv, "Memory allocation fail\n");
-                        iwl_trace_cleanup(priv);
-                        return -ENOMEM;
-                }
-                if (nla_put(skb, IWL_TM_ATTR_TRACE_ADDR,
-                            sizeof(priv->testmode_trace.dma_addr),
-                            (u64 *)&priv->testmode_trace.dma_addr))
-                        goto nla_put_failure;
-                status = cfg80211_testmode_reply(skb);
-                if (status < 0) {
-                        IWL_ERR(priv, "Error sending msg : %d\n", status);
-                }
-                priv->testmode_trace.num_chunks =
-                        DIV_ROUND_UP(priv->testmode_trace.buff_size,
-                                     DUMP_CHUNK_SIZE);
-                break;
-
-        case IWL_TM_CMD_APP2DEV_END_TRACE:
-                iwl_trace_cleanup(priv);
-                break;
-        default:
-                IWL_ERR(priv, "Unknown testmode mem command ID\n");
-                return -ENOSYS;
-        }
-        return status;
-
-nla_put_failure:
-        kfree_skb(skb);
-        if (nla_get_u32(tb[IWL_TM_ATTR_COMMAND]) ==
-            IWL_TM_CMD_APP2DEV_BEGIN_TRACE)
-                iwl_trace_cleanup(priv);
-        return -EMSGSIZE;
-}
-
-static int iwl_testmode_trace_dump(struct ieee80211_hw *hw,
-                                   struct sk_buff *skb,
-                                   struct netlink_callback *cb)
-{
-        struct iwl_priv *priv = IWL_MAC80211_GET_DVM(hw);
-        int idx, length;
-
-        if (priv->testmode_trace.trace_enabled &&
-            priv->testmode_trace.trace_addr) {
-                idx = cb->args[4];
-                if (idx >= priv->testmode_trace.num_chunks)
-                        return -ENOENT;
-                length = DUMP_CHUNK_SIZE;
-                if (((idx + 1) == priv->testmode_trace.num_chunks) &&
-                    (priv->testmode_trace.buff_size % DUMP_CHUNK_SIZE))
-                        length = priv->testmode_trace.buff_size %
-                                DUMP_CHUNK_SIZE;
-
-                if (nla_put(skb, IWL_TM_ATTR_TRACE_DUMP, length,
-                            priv->testmode_trace.trace_addr +
-                            (DUMP_CHUNK_SIZE * idx)))
-                        goto nla_put_failure;
-                idx++;
-                cb->args[4] = idx;
-                return 0;
-        } else
-                return -EFAULT;
-
- nla_put_failure:
-        return -ENOBUFS;
-}
-
-/*
- * This function handles the user application switch ucode ownership.
- *
- * It retrieves the mandatory fields IWL_TM_ATTR_UCODE_OWNER and
- * decide who the current owner of the uCode
- *
- * If the current owner is OWNERSHIP_TM, then the only host command
- * can deliver to uCode is from testmode, all the other host commands
- * will dropped.
- *
- * default driver is the owner of uCode in normal operational mode
- *
- * @hw: ieee80211_hw object that represents the device
- * @tb: gnl message fields from the user space
- */
-static int iwl_testmode_ownership(struct ieee80211_hw *hw, struct nlattr **tb)
-{
-        struct iwl_priv *priv = IWL_MAC80211_GET_DVM(hw);
-        u8 owner;
-
-        if (!tb[IWL_TM_ATTR_UCODE_OWNER]) {
-                IWL_ERR(priv, "Missing ucode owner\n");
-                return -ENOMSG;
-        }
-
-        owner = nla_get_u8(tb[IWL_TM_ATTR_UCODE_OWNER]);
-        if (owner == IWL_OWNERSHIP_DRIVER) {
-                priv->ucode_owner = owner;
-                priv->pre_rx_handler = NULL;
-        } else if (owner == IWL_OWNERSHIP_TM) {
-                priv->pre_rx_handler = iwl_testmode_ucode_rx_pkt;
-                priv->ucode_owner = owner;
-        } else {
-                IWL_ERR(priv, "Invalid owner\n");
-                return -EINVAL;
-        }
-        return 0;
-}
-
-static int iwl_testmode_indirect_read(struct iwl_priv *priv, u32 addr, u32 size)
-{
-        struct iwl_trans *trans = priv->trans;
-        unsigned long flags;
-        int i;
-
-        if (size & 0x3)
-                return -EINVAL;
-        priv->testmode_mem.buff_size = size;
-        priv->testmode_mem.buff_addr =
-                kmalloc(priv->testmode_mem.buff_size, GFP_KERNEL);
-        if (priv->testmode_mem.buff_addr == NULL)
-                return -ENOMEM;
-
-        /* Hard-coded periphery absolute address */
-        if (IWL_TM_ABS_PRPH_START <= addr &&
-                addr < IWL_TM_ABS_PRPH_START + PRPH_END) {
-                        spin_lock_irqsave(&trans->reg_lock, flags);
-                        iwl_grab_nic_access(trans);
-                        iwl_write32(trans, HBUS_TARG_PRPH_RADDR,
-                                addr | (3 << 24));
-                        for (i = 0; i < size; i += 4)
-                                *(u32 *)(priv->testmode_mem.buff_addr + i) =
-                                        iwl_read32(trans, HBUS_TARG_PRPH_RDAT);
-                        iwl_release_nic_access(trans);
-                        spin_unlock_irqrestore(&trans->reg_lock, flags);
-        } else { /* target memory (SRAM) */
-                _iwl_read_targ_mem_words(trans, addr,
-                        priv->testmode_mem.buff_addr,
-                        priv->testmode_mem.buff_size / 4);
-        }
-
-        priv->testmode_mem.num_chunks =
-                DIV_ROUND_UP(priv->testmode_mem.buff_size, DUMP_CHUNK_SIZE);
-        priv->testmode_mem.read_in_progress = true;
-        return 0;
-
-}
-
-static int iwl_testmode_indirect_write(struct iwl_priv *priv, u32 addr,
-        u32 size, unsigned char *buf)
-{
-        struct iwl_trans *trans = priv->trans;
-        u32 val, i;
-        unsigned long flags;
-
-        if (IWL_TM_ABS_PRPH_START <= addr &&
-                addr < IWL_TM_ABS_PRPH_START + PRPH_END) {
-                        /* Periphery writes can be 1-3 bytes long, or DWORDs */
-                        if (size < 4) {
-                                memcpy(&val, buf, size);
-                                spin_lock_irqsave(&trans->reg_lock, flags);
-                                iwl_grab_nic_access(trans);
-                                iwl_write32(trans, HBUS_TARG_PRPH_WADDR,
-                                            (addr & 0x0000FFFF) |
-                                            ((size - 1) << 24));
-                                iwl_write32(trans, HBUS_TARG_PRPH_WDAT, val);
-                                iwl_release_nic_access(trans);
-                                /* needed after consecutive writes w/o read */
-                                mmiowb();
-                                spin_unlock_irqrestore(&trans->reg_lock, flags);
-                        } else {
-                                if (size % 4)
-                                        return -EINVAL;
-                                for (i = 0; i < size; i += 4)
-                                        iwl_write_prph(trans, addr+i,
-                                                *(u32 *)(buf+i));
-                        }
-        } else if (iwlagn_hw_valid_rtc_data_addr(addr) ||
-                (IWLAGN_RTC_INST_LOWER_BOUND <= addr &&
-                addr < IWLAGN_RTC_INST_UPPER_BOUND)) {
-                        _iwl_write_targ_mem_words(trans, addr, buf, size/4);
-        } else
-                return -EINVAL;
-        return 0;
-}
-
-/*
- * This function handles the user application commands for SRAM data dump
- *
- * It retrieves the mandatory fields IWL_TM_ATTR_SRAM_ADDR and
- * IWL_TM_ATTR_SRAM_SIZE to decide the memory area for SRAM data reading
- *
- * Several error will be retured, -EBUSY if the SRAM data retrieved by
- * previous command has not been delivered to userspace, or -ENOMSG if
- * the mandatory fields (IWL_TM_ATTR_SRAM_ADDR,IWL_TM_ATTR_SRAM_SIZE)
- * are missing, or -ENOMEM if the buffer allocation fails.
- *
- * Otherwise 0 is replied indicating the success of the SRAM reading.
- *
- * @hw: ieee80211_hw object that represents the device
- * @tb: gnl message fields from the user space
- */
-static int iwl_testmode_indirect_mem(struct ieee80211_hw *hw,
-        struct nlattr **tb)
-{
-        struct iwl_priv *priv = IWL_MAC80211_GET_DVM(hw);
-        u32 addr, size, cmd;
-        unsigned char *buf;
-
-        /* Both read and write should be blocked, for atomicity */
-        if (priv->testmode_mem.read_in_progress)
-                return -EBUSY;
-
-        cmd = nla_get_u32(tb[IWL_TM_ATTR_COMMAND]);
-        if (!tb[IWL_TM_ATTR_MEM_ADDR]) {
-                IWL_ERR(priv, "Error finding memory offset address\n");
-                return -ENOMSG;
-        }
-        addr = nla_get_u32(tb[IWL_TM_ATTR_MEM_ADDR]);
-        if (!tb[IWL_TM_ATTR_BUFFER_SIZE]) {
-                IWL_ERR(priv, "Error finding size for memory reading\n");
-                return -ENOMSG;
-        }
-        size = nla_get_u32(tb[IWL_TM_ATTR_BUFFER_SIZE]);
-
-        if (cmd == IWL_TM_CMD_APP2DEV_INDIRECT_BUFFER_READ)
-                return iwl_testmode_indirect_read(priv, addr,  size);
-        else {
-                if (!tb[IWL_TM_ATTR_BUFFER_DUMP])
-                        return -EINVAL;
-                buf = (unsigned char *) nla_data(tb[IWL_TM_ATTR_BUFFER_DUMP]);
-                return iwl_testmode_indirect_write(priv, addr, size, buf);
-        }
-}
-
-static int iwl_testmode_buffer_dump(struct ieee80211_hw *hw,
-                                    struct sk_buff *skb,
-                                    struct netlink_callback *cb)
-{
-        struct iwl_priv *priv = IWL_MAC80211_GET_DVM(hw);
-        int idx, length;
-
-        if (priv->testmode_mem.read_in_progress) {
-                idx = cb->args[4];
-                if (idx >= priv->testmode_mem.num_chunks) {
-                        iwl_mem_cleanup(priv);
-                        return -ENOENT;
-                }
-                length = DUMP_CHUNK_SIZE;
-                if (((idx + 1) == priv->testmode_mem.num_chunks) &&
-                    (priv->testmode_mem.buff_size % DUMP_CHUNK_SIZE))
-                        length = priv->testmode_mem.buff_size %
-                                DUMP_CHUNK_SIZE;
-
-                if (nla_put(skb, IWL_TM_ATTR_BUFFER_DUMP, length,
-                            priv->testmode_mem.buff_addr +
-                            (DUMP_CHUNK_SIZE * idx)))
-                        goto nla_put_failure;
-                idx++;
-                cb->args[4] = idx;
-                return 0;
-        } else
-                return -EFAULT;
-
- nla_put_failure:
-        return -ENOBUFS;
-}
-
-static int iwl_testmode_notifications(struct ieee80211_hw *hw,
-        struct nlattr **tb)
-{
-        struct iwl_priv *priv = IWL_MAC80211_GET_DVM(hw);
-        bool enable;
-
-        enable = nla_get_flag(tb[IWL_TM_ATTR_ENABLE_NOTIFICATION]);
-        if (enable)
-                priv->pre_rx_handler = iwl_testmode_ucode_rx_pkt;
-        else
-                priv->pre_rx_handler = NULL;
-        return 0;
-}
-
-
-/* The testmode gnl message handler that takes the gnl message from the
- * user space and parses it per the policy iwl_testmode_gnl_msg_policy, then
- * invoke the corresponding handlers.
- *
- * This function is invoked when there is user space application sending
- * gnl message through the testmode tunnel NL80211_CMD_TESTMODE regulated
- * by nl80211.
- *
- * It retrieves the mandatory field, IWL_TM_ATTR_COMMAND, before
- * dispatching it to the corresponding handler.
- *
- * If IWL_TM_ATTR_COMMAND is missing, -ENOMSG is replied to user application;
- * -ENOSYS is replied to the user application if the command is unknown;
- * Otherwise, the command is dispatched to the respective handler.
- *
- * @hw: ieee80211_hw object that represents the device
- * @data: pointer to user space message
- * @len: length in byte of @data
- */
-int iwlagn_mac_testmode_cmd(struct ieee80211_hw *hw, void *data, int len)
-{
-        struct nlattr *tb[IWL_TM_ATTR_MAX];
-        struct iwl_priv *priv = IWL_MAC80211_GET_DVM(hw);
-        int result;
-
-        result = nla_parse(tb, IWL_TM_ATTR_MAX - 1, data, len,
-                        iwl_testmode_gnl_msg_policy);
-        if (result != 0) {
-                IWL_ERR(priv, "Error parsing the gnl message : %d\n", result);
-                return result;
-        }
-
-        /* IWL_TM_ATTR_COMMAND is absolutely mandatory */
-        if (!tb[IWL_TM_ATTR_COMMAND]) {
-                IWL_ERR(priv, "Missing testmode command type\n");
-                return -ENOMSG;
-        }
-        /* in case multiple accesses to the device happens */
-        mutex_lock(&priv->mutex);
-
-        switch (nla_get_u32(tb[IWL_TM_ATTR_COMMAND])) {
-        case IWL_TM_CMD_APP2DEV_UCODE:
-                IWL_DEBUG_INFO(priv, "testmode cmd to uCode\n");
-                result = iwl_testmode_ucode(hw, tb);
-                break;
-        case IWL_TM_CMD_APP2DEV_DIRECT_REG_READ32:
-        case IWL_TM_CMD_APP2DEV_DIRECT_REG_WRITE32:
-        case IWL_TM_CMD_APP2DEV_DIRECT_REG_WRITE8:
-                IWL_DEBUG_INFO(priv, "testmode cmd to register\n");
-                result = iwl_testmode_reg(hw, tb);
-                break;
-        case IWL_TM_CMD_APP2DEV_GET_DEVICENAME:
-        case IWL_TM_CMD_APP2DEV_LOAD_INIT_FW:
-        case IWL_TM_CMD_APP2DEV_CFG_INIT_CALIB:
-        case IWL_TM_CMD_APP2DEV_LOAD_RUNTIME_FW:
-        case IWL_TM_CMD_APP2DEV_GET_EEPROM:
-        case IWL_TM_CMD_APP2DEV_FIXRATE_REQ:
-        case IWL_TM_CMD_APP2DEV_LOAD_WOWLAN_FW:
-        case IWL_TM_CMD_APP2DEV_GET_FW_VERSION:
-        case IWL_TM_CMD_APP2DEV_GET_DEVICE_ID:
-        case IWL_TM_CMD_APP2DEV_GET_FW_INFO:
-                IWL_DEBUG_INFO(priv, "testmode cmd to driver\n");
-                result = iwl_testmode_driver(hw, tb);
-                break;
-
-        case IWL_TM_CMD_APP2DEV_BEGIN_TRACE:
-        case IWL_TM_CMD_APP2DEV_END_TRACE:
-        case IWL_TM_CMD_APP2DEV_READ_TRACE:
-                IWL_DEBUG_INFO(priv, "testmode uCode trace cmd to driver\n");
-                result = iwl_testmode_trace(hw, tb);
-                break;
-
-        case IWL_TM_CMD_APP2DEV_OWNERSHIP:
-                IWL_DEBUG_INFO(priv, "testmode change uCode ownership\n");
-                result = iwl_testmode_ownership(hw, tb);
-                break;
-
-        case IWL_TM_CMD_APP2DEV_INDIRECT_BUFFER_READ:
-        case IWL_TM_CMD_APP2DEV_INDIRECT_BUFFER_WRITE:
-                IWL_DEBUG_INFO(priv, "testmode indirect memory cmd "
-                        "to driver\n");
-                result = iwl_testmode_indirect_mem(hw, tb);
-                break;
-
-        case IWL_TM_CMD_APP2DEV_NOTIFICATIONS:
-                IWL_DEBUG_INFO(priv, "testmode notifications cmd "
-                        "to driver\n");
-                result = iwl_testmode_notifications(hw, tb);
-                break;
-
-        default:
-                IWL_ERR(priv, "Unknown testmode command\n");
-                result = -ENOSYS;
-                break;
-        }
-
-        mutex_unlock(&priv->mutex);
-        return result;
-}
-
-int iwlagn_mac_testmode_dump(struct ieee80211_hw *hw, struct sk_buff *skb,
-                      struct netlink_callback *cb,
-                      void *data, int len)
-{
-        struct nlattr *tb[IWL_TM_ATTR_MAX];
-        struct iwl_priv *priv = IWL_MAC80211_GET_DVM(hw);
-        int result;
-        u32 cmd;
-
-        if (cb->args[3]) {
-                /* offset by 1 since commands start at 0 */
-                cmd = cb->args[3] - 1;
-        } else {
-                result = nla_parse(tb, IWL_TM_ATTR_MAX - 1, data, len,
-                                iwl_testmode_gnl_msg_policy);
-                if (result) {
-                        IWL_ERR(priv,
-                                "Error parsing the gnl message : %d\n", result);
-                        return result;
-                }
-
-                /* IWL_TM_ATTR_COMMAND is absolutely mandatory */
-                if (!tb[IWL_TM_ATTR_COMMAND]) {
-                        IWL_ERR(priv, "Missing testmode command type\n");
-                        return -ENOMSG;
-                }
-                cmd = nla_get_u32(tb[IWL_TM_ATTR_COMMAND]);
-                cb->args[3] = cmd + 1;
-        }
-
-        /* in case multiple accesses to the device happens */
-        mutex_lock(&priv->mutex);
-        switch (cmd) {
-        case IWL_TM_CMD_APP2DEV_READ_TRACE:
-                IWL_DEBUG_INFO(priv, "uCode trace cmd to driver\n");
-                result = iwl_testmode_trace_dump(hw, skb, cb);
-                break;
-        case IWL_TM_CMD_APP2DEV_INDIRECT_BUFFER_DUMP:
-                IWL_DEBUG_INFO(priv, "testmode sram dump cmd to driver\n");
-                result = iwl_testmode_buffer_dump(hw, skb, cb);
-                break;
-        default:
-                result = -EINVAL;
-                break;
-        }
-
-        mutex_unlock(&priv->mutex);
-        return result;
-}
diff --git a/drivers/net/wireless/iwlwifi/iwl-trans.h b/drivers/net/wireless/iwlwifi/iwl-trans.h
index 79a1e7ae499..00efde8e553 100644
--- a/drivers/net/wireless/iwlwifi/iwl-trans.h
+++ b/drivers/net/wireless/iwlwifi/iwl-trans.h
@@ -154,6 +154,9 @@ struct iwl_cmd_header {
         __le16 sequence;
 } __packed;
 
+/* iwl_cmd_header flags value */
+#define IWL_CMD_FAILED_MSK 0x40
+
 
 #define FH_RSCSR_FRAME_SIZE_MSK         0x00003FFF      /* bits 0-13 */
 #define FH_RSCSR_FRAME_INVALID          0x55550000
@@ -280,6 +283,8 @@ static inline struct page *rxb_steal_page(struct iwl_rx_cmd_buffer *r)
 
 #define MAX_NO_RECLAIM_CMDS     6
 
+#define IWL_MASK(lo, hi) ((1 << (hi)) | ((1 << (hi)) - (1 << (lo))))
+
 /*
  * Maximum number of HW queues the transport layer
  * currently supports
@@ -350,10 +355,10 @@ struct iwl_trans;
  *      Must be atomic
  * @reclaim: free packet until ssn. Returns a list of freed packets.
  *      Must be atomic
- * @tx_agg_setup: setup a tx queue for AMPDU - will be called once the HW is
+ * @txq_enable: setup a tx queue for AMPDU - will be called once the HW is
  *      ready and a successful ADDBA response has been received.
  *      May sleep
- * @tx_agg_disable: de-configure a Tx queue to send AMPDUs
+ * @txq_disable: de-configure a Tx queue to send AMPDUs
  *      Must be atomic
  * @wait_tx_queue_empty: wait until all tx queues are empty
  *      May sleep
@@ -386,9 +391,9 @@ struct iwl_trans_ops {
         void (*reclaim)(struct iwl_trans *trans, int queue, int ssn,
                         struct sk_buff_head *skbs);
 
-        void (*tx_agg_setup)(struct iwl_trans *trans, int queue, int fifo,
-                             int sta_id, int tid, int frame_limit, u16 ssn);
-        void (*tx_agg_disable)(struct iwl_trans *trans, int queue);
+        void (*txq_enable)(struct iwl_trans *trans, int queue, int fifo,
+                           int sta_id, int tid, int frame_limit, u16 ssn);
+        void (*txq_disable)(struct iwl_trans *trans, int queue);
 
         int (*dbgfs_register)(struct iwl_trans *trans, struct dentry* dir);
         int (*wait_tx_queue_empty)(struct iwl_trans *trans);
@@ -428,6 +433,11 @@ enum iwl_trans_state {
  * @hw_id_str: a string with info about HW ID. Set during transport allocation.
  * @pm_support: set to true in start_hw if link pm is supported
  * @wait_command_queue: the wait_queue for SYNC host commands
+ * @dev_cmd_pool: pool for Tx cmd allocation - for internal use only.
+ *      The user should use iwl_trans_{alloc,free}_tx_cmd.
+ * @dev_cmd_headroom: room needed for the transport's private use before the
+ *      device_cmd for Tx - for internal use only
+ *      The user should use iwl_trans_{alloc,free}_tx_cmd.
  */
 struct iwl_trans {
         const struct iwl_trans_ops *ops;
@@ -445,6 +455,10 @@ struct iwl_trans {
 
         wait_queue_head_t wait_command_queue;
 
+        /* The following fields are internal only */
+        struct kmem_cache *dev_cmd_pool;
+        size_t dev_cmd_headroom;
+
         /* pointer to trans specific struct */
         /*Ensure that this pointer will always be aligned to sizeof pointer */
         char trans_specific[0] __aligned(sizeof(void *));
@@ -520,6 +534,26 @@ static inline int iwl_trans_send_cmd(struct iwl_trans *trans,
         return trans->ops->send_cmd(trans, cmd);
 }
 
+static inline struct iwl_device_cmd *
+iwl_trans_alloc_tx_cmd(struct iwl_trans *trans)
+{
+        u8 *dev_cmd_ptr = kmem_cache_alloc(trans->dev_cmd_pool, GFP_ATOMIC);
+
+        if (unlikely(dev_cmd_ptr == NULL))
+                return NULL;
+
+        return (struct iwl_device_cmd *)
+                        (dev_cmd_ptr + trans->dev_cmd_headroom);
+}
+
+static inline void iwl_trans_free_tx_cmd(struct iwl_trans *trans,
+                                         struct iwl_device_cmd *dev_cmd)
+{
+        u8 *dev_cmd_ptr = (u8 *)dev_cmd - trans->dev_cmd_headroom;
+
+        kmem_cache_free(trans->dev_cmd_pool, dev_cmd_ptr);
+}
+
 static inline int iwl_trans_tx(struct iwl_trans *trans, struct sk_buff *skb,
                                struct iwl_device_cmd *dev_cmd, int queue)
 {
@@ -538,24 +572,24 @@ static inline void iwl_trans_reclaim(struct iwl_trans *trans, int queue,
         trans->ops->reclaim(trans, queue, ssn, skbs);
 }
 
-static inline void iwl_trans_tx_agg_disable(struct iwl_trans *trans, int queue)
+static inline void iwl_trans_txq_disable(struct iwl_trans *trans, int queue)
 {
         WARN_ONCE(trans->state != IWL_TRANS_FW_ALIVE,
                   "%s bad state = %d", __func__, trans->state);
 
-        trans->ops->tx_agg_disable(trans, queue);
+        trans->ops->txq_disable(trans, queue);
 }
 
-static inline void iwl_trans_tx_agg_setup(struct iwl_trans *trans, int queue,
-                                          int fifo, int sta_id, int tid,
-                                          int frame_limit, u16 ssn)
+static inline void iwl_trans_txq_enable(struct iwl_trans *trans, int queue,
+                                        int fifo, int sta_id, int tid,
+                                        int frame_limit, u16 ssn)
 {
         might_sleep();
 
         WARN_ONCE(trans->state != IWL_TRANS_FW_ALIVE,
                   "%s bad state = %d", __func__, trans->state);
 
-        trans->ops->tx_agg_setup(trans, queue, fifo, sta_id, tid,
+        trans->ops->txq_enable(trans, queue, fifo, sta_id, tid,
                                  frame_limit, ssn);
 }
 
diff --git a/drivers/net/wireless/iwlwifi/iwl-1000.c b/drivers/net/wireless/iwlwifi/pcie/1000.c
index 2629a6602df..81b83f484f0 100644
--- a/drivers/net/wireless/iwlwifi/iwl-1000.c
+++ b/drivers/net/wireless/iwlwifi/pcie/1000.c
@@ -27,9 +27,9 @@
 #include <linux/module.h>
 #include <linux/stringify.h>
 #include "iwl-config.h"
-#include "iwl-cfg.h"
 #include "iwl-csr.h"
 #include "iwl-agn-hw.h"
+#include "cfg.h"
 
 /* Highest firmware API version supported */
 #define IWL1000_UCODE_API_MAX 5
@@ -64,13 +64,26 @@ static const struct iwl_base_params iwl1000_base_params = {
         .support_ct_kill_exit = true,
         .plcp_delta_threshold = IWL_MAX_PLCP_ERR_EXT_LONG_THRESHOLD_DEF,
         .chain_noise_scale = 1000,
-        .wd_timeout = IWL_WATCHHDOG_DISABLED,
+        .wd_timeout = IWL_WATCHDOG_DISABLED,
         .max_event_log_size = 128,
 };
 
 static const struct iwl_ht_params iwl1000_ht_params = {
         .ht_greenfield_support = true,
         .use_rts_for_aggregation = true, /* use rts/cts protection */
+        .ht40_bands = BIT(IEEE80211_BAND_2GHZ),
+};
+
+static const struct iwl_eeprom_params iwl1000_eeprom_params = {
+        .regulatory_bands = {
+                EEPROM_REG_BAND_1_CHANNELS,
+                EEPROM_REG_BAND_2_CHANNELS,
+                EEPROM_REG_BAND_3_CHANNELS,
+                EEPROM_REG_BAND_4_CHANNELS,
+                EEPROM_REG_BAND_5_CHANNELS,
+                EEPROM_REG_BAND_24_HT40_CHANNELS,
+                EEPROM_REGULATORY_BAND_NO_HT40,
+        }
 };
 
 #define IWL_DEVICE_1000                                         \
@@ -84,6 +97,7 @@ static const struct iwl_ht_params iwl1000_ht_params = {
         .eeprom_ver = EEPROM_1000_EEPROM_VERSION,               \
         .eeprom_calib_ver = EEPROM_1000_TX_POWER_VERSION,       \
         .base_params = &iwl1000_base_params,                    \
+        .eeprom_params = &iwl1000_eeprom_params,                \
         .led_mode = IWL_LED_BLINK
 
 const struct iwl_cfg iwl1000_bgn_cfg = {
@@ -108,6 +122,7 @@ const struct iwl_cfg iwl1000_bg_cfg = {
         .eeprom_ver = EEPROM_1000_EEPROM_VERSION,               \
         .eeprom_calib_ver = EEPROM_1000_TX_POWER_VERSION,       \
         .base_params = &iwl1000_base_params,                    \
+        .eeprom_params = &iwl1000_eeprom_params,                \
         .led_mode = IWL_LED_RF_STATE,                           \
         .rx_with_siso_diversity = true
 
diff --git a/drivers/net/wireless/iwlwifi/iwl-2000.c b/drivers/net/wireless/iwlwifi/pcie/2000.c
index 8133105ac64..fd4e78f56fa 100644
--- a/drivers/net/wireless/iwlwifi/iwl-2000.c
+++ b/drivers/net/wireless/iwlwifi/pcie/2000.c
@@ -27,9 +27,9 @@
 #include <linux/module.h>
 #include <linux/stringify.h>
 #include "iwl-config.h"
-#include "iwl-cfg.h"
 #include "iwl-agn-hw.h"
-#include "iwl-commands.h" /* needed for BT for now */
+#include "cfg.h"
+#include "dvm/commands.h" /* needed for BT for now */
 
 /* Highest firmware API version supported */
 #define IWL2030_UCODE_API_MAX 6
@@ -104,6 +104,7 @@ static const struct iwl_base_params iwl2030_base_params = {
 static const struct iwl_ht_params iwl2000_ht_params = {
         .ht_greenfield_support = true,
         .use_rts_for_aggregation = true, /* use rts/cts protection */
+        .ht40_bands = BIT(IEEE80211_BAND_2GHZ),
 };
 
 static const struct iwl_bt_params iwl2030_bt_params = {
@@ -116,6 +117,19 @@ static const struct iwl_bt_params iwl2030_bt_params = {
         .bt_session_2 = true,
 };
 
+static const struct iwl_eeprom_params iwl20x0_eeprom_params = {
+        .regulatory_bands = {
+                EEPROM_REG_BAND_1_CHANNELS,
+                EEPROM_REG_BAND_2_CHANNELS,
+                EEPROM_REG_BAND_3_CHANNELS,
+                EEPROM_REG_BAND_4_CHANNELS,
+                EEPROM_REG_BAND_5_CHANNELS,
+                EEPROM_6000_REG_BAND_24_HT40_CHANNELS,
+                EEPROM_REGULATORY_BAND_NO_HT40,
+        },
+        .enhanced_txpower = true,
+};
+
 #define IWL_DEVICE_2000                                         \
         .fw_name_pre = IWL2000_FW_PRE,                          \
         .ucode_api_max = IWL2000_UCODE_API_MAX,                 \
@@ -127,6 +141,7 @@ static const struct iwl_bt_params iwl2030_bt_params = {
         .eeprom_ver = EEPROM_2000_EEPROM_VERSION,               \
         .eeprom_calib_ver = EEPROM_2000_TX_POWER_VERSION,       \
         .base_params = &iwl2000_base_params,                    \
+        .eeprom_params = &iwl20x0_eeprom_params,                \
         .need_temp_offset_calib = true,                         \
         .temp_offset_v2 = true,                                 \
         .led_mode = IWL_LED_RF_STATE
@@ -155,6 +170,7 @@ const struct iwl_cfg iwl2000_2bgn_d_cfg = {
         .eeprom_calib_ver = EEPROM_2000_TX_POWER_VERSION,       \
         .base_params = &iwl2030_base_params,                    \
         .bt_params = &iwl2030_bt_params,                        \
+        .eeprom_params = &iwl20x0_eeprom_params,                \
         .need_temp_offset_calib = true,                         \
         .temp_offset_v2 = true,                                 \
         .led_mode = IWL_LED_RF_STATE,                           \
@@ -177,6 +193,7 @@ const struct iwl_cfg iwl2030_2bgn_cfg = {
         .eeprom_ver = EEPROM_2000_EEPROM_VERSION,               \
         .eeprom_calib_ver = EEPROM_2000_TX_POWER_VERSION,       \
         .base_params = &iwl2000_base_params,                    \
+        .eeprom_params = &iwl20x0_eeprom_params,                \
         .need_temp_offset_calib = true,                         \
         .temp_offset_v2 = true,                                 \
         .led_mode = IWL_LED_RF_STATE,                           \
@@ -207,6 +224,7 @@ const struct iwl_cfg iwl105_bgn_d_cfg = {
         .eeprom_calib_ver = EEPROM_2000_TX_POWER_VERSION,       \
         .base_params = &iwl2030_base_params,                    \
         .bt_params = &iwl2030_bt_params,                        \
+        .eeprom_params = &iwl20x0_eeprom_params,                \
         .need_temp_offset_calib = true,                         \
         .temp_offset_v2 = true,                                 \
         .led_mode = IWL_LED_RF_STATE,                           \
diff --git a/drivers/net/wireless/iwlwifi/iwl-5000.c b/drivers/net/wireless/iwlwifi/pcie/5000.c
index 8e26bc825f2..d1665fa6d15 100644
--- a/drivers/net/wireless/iwlwifi/iwl-5000.c
+++ b/drivers/net/wireless/iwlwifi/pcie/5000.c
@@ -27,9 +27,9 @@
 #include <linux/module.h>
 #include <linux/stringify.h>
 #include "iwl-config.h"
-#include "iwl-cfg.h"
 #include "iwl-agn-hw.h"
 #include "iwl-csr.h"
+#include "cfg.h"
 
 /* Highest firmware API version supported */
 #define IWL5000_UCODE_API_MAX 5
@@ -62,13 +62,26 @@ static const struct iwl_base_params iwl5000_base_params = {
         .led_compensation = 51,
         .plcp_delta_threshold = IWL_MAX_PLCP_ERR_LONG_THRESHOLD_DEF,
         .chain_noise_scale = 1000,
-        .wd_timeout = IWL_WATCHHDOG_DISABLED,
+        .wd_timeout = IWL_WATCHDOG_DISABLED,
         .max_event_log_size = 512,
         .no_idle_support = true,
 };
 
 static const struct iwl_ht_params iwl5000_ht_params = {
         .ht_greenfield_support = true,
+        .ht40_bands = BIT(IEEE80211_BAND_2GHZ) | BIT(IEEE80211_BAND_5GHZ),
+};
+
+static const struct iwl_eeprom_params iwl5000_eeprom_params = {
+        .regulatory_bands = {
+                EEPROM_REG_BAND_1_CHANNELS,
+                EEPROM_REG_BAND_2_CHANNELS,
+                EEPROM_REG_BAND_3_CHANNELS,
+                EEPROM_REG_BAND_4_CHANNELS,
+                EEPROM_REG_BAND_5_CHANNELS,
+                EEPROM_REG_BAND_24_HT40_CHANNELS,
+                EEPROM_REG_BAND_52_HT40_CHANNELS
+        },
 };
 
 #define IWL_DEVICE_5000                                         \
@@ -82,6 +95,7 @@ static const struct iwl_ht_params iwl5000_ht_params = {
         .eeprom_ver = EEPROM_5000_EEPROM_VERSION,               \
         .eeprom_calib_ver = EEPROM_5000_TX_POWER_VERSION,       \
         .base_params = &iwl5000_base_params,                    \
+        .eeprom_params = &iwl5000_eeprom_params,                \
         .led_mode = IWL_LED_BLINK
 
 const struct iwl_cfg iwl5300_agn_cfg = {
@@ -128,6 +142,7 @@ const struct iwl_cfg iwl5350_agn_cfg = {
         .eeprom_ver = EEPROM_5050_EEPROM_VERSION,
         .eeprom_calib_ver = EEPROM_5050_TX_POWER_VERSION,
         .base_params = &iwl5000_base_params,
+        .eeprom_params = &iwl5000_eeprom_params,
         .ht_params = &iwl5000_ht_params,
         .led_mode = IWL_LED_BLINK,
         .internal_wimax_coex = true,
@@ -144,6 +159,7 @@ const struct iwl_cfg iwl5350_agn_cfg = {
         .eeprom_ver = EEPROM_5050_EEPROM_VERSION,               \
         .eeprom_calib_ver = EEPROM_5050_TX_POWER_VERSION,       \
         .base_params = &iwl5000_base_params,                    \
+        .eeprom_params = &iwl5000_eeprom_params,                \
         .no_xtal_calib = true,                                  \
         .led_mode = IWL_LED_BLINK,                              \
         .internal_wimax_coex = true
diff --git a/drivers/net/wireless/iwlwifi/iwl-6000.c b/drivers/net/wireless/iwlwifi/pcie/6000.c
index e5e8ada4aaf..4a57624afc4 100644
--- a/drivers/net/wireless/iwlwifi/iwl-6000.c
+++ b/drivers/net/wireless/iwlwifi/pcie/6000.c
@@ -27,9 +27,9 @@
 #include <linux/module.h>
 #include <linux/stringify.h>
 #include "iwl-config.h"
-#include "iwl-cfg.h"
 #include "iwl-agn-hw.h"
-#include "iwl-commands.h" /* needed for BT for now */
+#include "cfg.h"
+#include "dvm/commands.h" /* needed for BT for now */
 
 /* Highest firmware API version supported */
 #define IWL6000_UCODE_API_MAX 6
@@ -127,6 +127,7 @@ static const struct iwl_base_params iwl6000_g2_base_params = {
 static const struct iwl_ht_params iwl6000_ht_params = {
         .ht_greenfield_support = true,
         .use_rts_for_aggregation = true, /* use rts/cts protection */
+        .ht40_bands = BIT(IEEE80211_BAND_2GHZ) | BIT(IEEE80211_BAND_5GHZ),
 };
 
 static const struct iwl_bt_params iwl6000_bt_params = {
@@ -138,6 +139,19 @@ static const struct iwl_bt_params iwl6000_bt_params = {
         .bt_sco_disable = true,
 };
 
+static const struct iwl_eeprom_params iwl6000_eeprom_params = {
+        .regulatory_bands = {
+                EEPROM_REG_BAND_1_CHANNELS,
+                EEPROM_REG_BAND_2_CHANNELS,
+                EEPROM_REG_BAND_3_CHANNELS,
+                EEPROM_REG_BAND_4_CHANNELS,
+                EEPROM_REG_BAND_5_CHANNELS,
+                EEPROM_6000_REG_BAND_24_HT40_CHANNELS,
+                EEPROM_REG_BAND_52_HT40_CHANNELS
+        },
+        .enhanced_txpower = true,
+};
+
 #define IWL_DEVICE_6005                                         \
         .fw_name_pre = IWL6005_FW_PRE,                          \
         .ucode_api_max = IWL6000G2_UCODE_API_MAX,               \
@@ -149,6 +163,7 @@ static const struct iwl_bt_params iwl6000_bt_params = {
         .eeprom_ver = EEPROM_6005_EEPROM_VERSION,               \
         .eeprom_calib_ver = EEPROM_6005_TX_POWER_VERSION,       \
         .base_params = &iwl6000_g2_base_params,                 \
+        .eeprom_params = &iwl6000_eeprom_params,                \
         .need_temp_offset_calib = true,                         \
         .led_mode = IWL_LED_RF_STATE
 
@@ -204,6 +219,7 @@ const struct iwl_cfg iwl6005_2agn_mow2_cfg = {
         .eeprom_calib_ver = EEPROM_6030_TX_POWER_VERSION,       \
         .base_params = &iwl6000_g2_base_params,                 \
         .bt_params = &iwl6000_bt_params,                        \
+        .eeprom_params = &iwl6000_eeprom_params,                \
         .need_temp_offset_calib = true,                         \
         .led_mode = IWL_LED_RF_STATE,                           \
         .adv_pm = true                                          \
@@ -242,6 +258,7 @@ const struct iwl_cfg iwl6030_2bg_cfg = {
         .eeprom_calib_ver = EEPROM_6030_TX_POWER_VERSION,       \
         .base_params = &iwl6000_g2_base_params,                 \
         .bt_params = &iwl6000_bt_params,                        \
+        .eeprom_params = &iwl6000_eeprom_params,                \
         .need_temp_offset_calib = true,                         \
         .led_mode = IWL_LED_RF_STATE,                           \
         .adv_pm = true
@@ -292,6 +309,7 @@ const struct iwl_cfg iwl130_bg_cfg = {
         .eeprom_ver = EEPROM_6000_EEPROM_VERSION,               \
         .eeprom_calib_ver = EEPROM_6000_TX_POWER_VERSION,       \
         .base_params = &iwl6000_base_params,                    \
+        .eeprom_params = &iwl6000_eeprom_params,                \
         .led_mode = IWL_LED_BLINK
 
 const struct iwl_cfg iwl6000i_2agn_cfg = {
@@ -322,6 +340,7 @@ const struct iwl_cfg iwl6000i_2bg_cfg = {
         .eeprom_ver = EEPROM_6050_EEPROM_VERSION,               \
         .eeprom_calib_ver = EEPROM_6050_TX_POWER_VERSION,       \
         .base_params = &iwl6050_base_params,                    \
+        .eeprom_params = &iwl6000_eeprom_params,                \
         .led_mode = IWL_LED_BLINK,                              \
         .internal_wimax_coex = true
 
@@ -346,6 +365,7 @@ const struct iwl_cfg iwl6050_2abg_cfg = {
         .eeprom_ver = EEPROM_6150_EEPROM_VERSION,               \
         .eeprom_calib_ver = EEPROM_6150_TX_POWER_VERSION,       \
         .base_params = &iwl6050_base_params,                    \
+        .eeprom_params = &iwl6000_eeprom_params,                \
         .led_mode = IWL_LED_BLINK,                              \
         .internal_wimax_coex = true
 
@@ -372,6 +392,7 @@ const struct iwl_cfg iwl6000_3agn_cfg = {
         .eeprom_ver = EEPROM_6000_EEPROM_VERSION,
         .eeprom_calib_ver = EEPROM_6000_TX_POWER_VERSION,
         .base_params = &iwl6000_base_params,
+        .eeprom_params = &iwl6000_eeprom_params,
         .ht_params = &iwl6000_ht_params,
         .led_mode = IWL_LED_BLINK,
 };
diff --git a/drivers/net/wireless/iwlwifi/iwl-cfg.h b/drivers/net/wireless/iwlwifi/pcie/cfg.h
index 82152311d73..82152311d73 100644
--- a/drivers/net/wireless/iwlwifi/iwl-cfg.h
+++ b/drivers/net/wireless/iwlwifi/pcie/cfg.h
diff --git a/drivers/net/wireless/iwlwifi/iwl-pci.c b/drivers/net/wireless/iwlwifi/pcie/drv.c
index 0c8a1c2d884..f4c3500b68c 100644
--- a/drivers/net/wireless/iwlwifi/iwl-pci.c
+++ b/drivers/net/wireless/iwlwifi/pcie/drv.c
@@ -68,10 +68,11 @@
 #include <linux/pci-aspm.h>
 
 #include "iwl-trans.h"
-#include "iwl-cfg.h"
 #include "iwl-drv.h"
 #include "iwl-trans.h"
-#include "iwl-trans-pcie-int.h"
+
+#include "cfg.h"
+#include "internal.h"
 
 #define IWL_PCI_DEVICE(dev, subdev, cfg) \
         .vendor = PCI_VENDOR_ID_INTEL,  .device = (dev), \
diff --git a/drivers/net/wireless/iwlwifi/iwl-trans-pcie-int.h b/drivers/net/wireless/iwlwifi/pcie/internal.h
index e959207c630..5024fb662bf 100644
--- a/drivers/net/wireless/iwlwifi/iwl-trans-pcie-int.h
+++ b/drivers/net/wireless/iwlwifi/pcie/internal.h
@@ -313,7 +313,7 @@ void iwl_bg_rx_replenish(struct work_struct *data);
 void iwl_irq_tasklet(struct iwl_trans *trans);
 void iwlagn_rx_replenish(struct iwl_trans *trans);
 void iwl_rx_queue_update_write_ptr(struct iwl_trans *trans,
-                        struct iwl_rx_queue *q);
+                                   struct iwl_rx_queue *q);
 
 /*****************************************************
 * ICT
@@ -328,7 +328,7 @@ irqreturn_t iwl_isr_ict(int irq, void *data);
 * TX / HCMD
 ******************************************************/
 void iwl_txq_update_write_ptr(struct iwl_trans *trans,
-                        struct iwl_tx_queue *txq);
+                              struct iwl_tx_queue *txq);
 int iwlagn_txq_attach_buf_to_tfd(struct iwl_trans *trans,
                                  struct iwl_tx_queue *txq,
                                  dma_addr_t addr, u16 len, u8 reset);
@@ -337,17 +337,13 @@ int iwl_trans_pcie_send_cmd(struct iwl_trans *trans, struct iwl_host_cmd *cmd);
 void iwl_tx_cmd_complete(struct iwl_trans *trans,
                          struct iwl_rx_cmd_buffer *rxb, int handler_status);
 void iwl_trans_txq_update_byte_cnt_tbl(struct iwl_trans *trans,
-                                           struct iwl_tx_queue *txq,
-                                           u16 byte_cnt);
-void iwl_trans_pcie_tx_agg_disable(struct iwl_trans *trans, int queue);
-void iwl_trans_set_wr_ptrs(struct iwl_trans *trans, int txq_id, u32 index);
-void iwl_trans_tx_queue_set_status(struct iwl_trans *trans,
-                                   struct iwl_tx_queue *txq,
-                                   int tx_fifo_id, bool active);
-void iwl_trans_pcie_tx_agg_setup(struct iwl_trans *trans, int queue, int fifo,
-                                 int sta_id, int tid, int frame_limit, u16 ssn);
-void iwlagn_txq_free_tfd(struct iwl_trans *trans, struct iwl_tx_queue *txq,
-                         enum dma_data_direction dma_dir);
+                                       struct iwl_tx_queue *txq,
+                                       u16 byte_cnt);
+void iwl_trans_pcie_txq_enable(struct iwl_trans *trans, int txq_id, int fifo,
+                               int sta_id, int tid, int frame_limit, u16 ssn);
+void iwl_trans_pcie_txq_disable(struct iwl_trans *trans, int queue);
+void iwl_txq_free_tfd(struct iwl_trans *trans, struct iwl_tx_queue *txq,
+                      enum dma_data_direction dma_dir);
 int iwl_tx_queue_reclaim(struct iwl_trans *trans, int txq_id, int index,
                          struct sk_buff_head *skbs);
 int iwl_queue_space(const struct iwl_queue *q);
diff --git a/drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c b/drivers/net/wireless/iwlwifi/pcie/rx.c
index 08517d3c80b..be143eb4aa4 100644
--- a/drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c
+++ b/drivers/net/wireless/iwlwifi/pcie/rx.c
@@ -32,7 +32,7 @@
 
 #include "iwl-prph.h"
 #include "iwl-io.h"
-#include "iwl-trans-pcie-int.h"
+#include "internal.h"
 #include "iwl-op-mode.h"
 
 #ifdef CONFIG_IWLWIFI_IDI
@@ -130,7 +130,7 @@ static int iwl_rx_queue_space(const struct iwl_rx_queue *q)
  * iwl_rx_queue_update_write_ptr - Update the write pointer for the RX queue
  */
 void iwl_rx_queue_update_write_ptr(struct iwl_trans *trans,
-                        struct iwl_rx_queue *q)
+                                   struct iwl_rx_queue *q)
 {
         unsigned long flags;
         u32 reg;
@@ -201,9 +201,7 @@ static inline __le32 iwlagn_dma_addr2rbd_ptr(dma_addr_t dma_addr)
  */
 static void iwlagn_rx_queue_restock(struct iwl_trans *trans)
 {
-        struct iwl_trans_pcie *trans_pcie =
-                IWL_TRANS_GET_PCIE_TRANS(trans);
-
+        struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
         struct iwl_rx_queue *rxq = &trans_pcie->rxq;
         struct list_head *element;
         struct iwl_rx_mem_buffer *rxb;
@@ -253,9 +251,7 @@ static void iwlagn_rx_queue_restock(struct iwl_trans *trans)
  */
 static void iwlagn_rx_allocate(struct iwl_trans *trans, gfp_t priority)
 {
-        struct iwl_trans_pcie *trans_pcie =
-                IWL_TRANS_GET_PCIE_TRANS(trans);
-
+        struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
         struct iwl_rx_queue *rxq = &trans_pcie->rxq;
         struct list_head *element;
         struct iwl_rx_mem_buffer *rxb;
@@ -278,8 +274,7 @@ static void iwlagn_rx_allocate(struct iwl_trans *trans, gfp_t priority)
                         gfp_mask |= __GFP_COMP;
 
                 /* Alloc a new receive buffer */
-                page = alloc_pages(gfp_mask,
-                                  trans_pcie->rx_page_order);
+                page = alloc_pages(gfp_mask, trans_pcie->rx_page_order);
                 if (!page) {
                         if (net_ratelimit())
                                 IWL_DEBUG_INFO(trans, "alloc_pages failed, "
@@ -315,9 +310,10 @@ static void iwlagn_rx_allocate(struct iwl_trans *trans, gfp_t priority)
                 BUG_ON(rxb->page);
                 rxb->page = page;
                 /* Get physical address of the RB */
-                rxb->page_dma = dma_map_page(trans->dev, page, 0,
-                                PAGE_SIZE << trans_pcie->rx_page_order,
-                                DMA_FROM_DEVICE);
+                rxb->page_dma =
+                        dma_map_page(trans->dev, page, 0,
+                                     PAGE_SIZE << trans_pcie->rx_page_order,
+                                     DMA_FROM_DEVICE);
                 /* dma address must be no more than 36 bits */
                 BUG_ON(rxb->page_dma & ~DMA_BIT_MASK(36));
                 /* and also 256 byte aligned! */
@@ -465,8 +461,8 @@ static void iwl_rx_handle_rxbuf(struct iwl_trans *trans,
         if (rxb->page != NULL) {
                 rxb->page_dma =
                         dma_map_page(trans->dev, rxb->page, 0,
-                                PAGE_SIZE << trans_pcie->rx_page_order,
-                                DMA_FROM_DEVICE);
+                                     PAGE_SIZE << trans_pcie->rx_page_order,
+                                     DMA_FROM_DEVICE);
                 list_add_tail(&rxb->list, &rxq->rx_free);
                 rxq->free_count++;
         } else
@@ -497,7 +493,7 @@ static void iwl_rx_handle(struct iwl_trans *trans)
 
         /* Rx interrupt, but nothing sent from uCode */
         if (i == r)
-                IWL_DEBUG_RX(trans, "r = %d, i = %d\n", r, i);
+                IWL_DEBUG_RX(trans, "HW = SW = %d\n", r);
 
         /* calculate total frames need to be restock after handling RX */
         total_empty = r - rxq->write_actual;
@@ -513,8 +509,8 @@ static void iwl_rx_handle(struct iwl_trans *trans)
                 rxb = rxq->queue[i];
                 rxq->queue[i] = NULL;
 
-                IWL_DEBUG_RX(trans, "rxbuf: r = %d, i = %d (%p)\n", rxb);
-
+                IWL_DEBUG_RX(trans, "rxbuf: HW = %d, SW = %d (%p)\n",
+                             r, i, rxb);
                 iwl_rx_handle_rxbuf(trans, rxb);
 
                 i = (i + 1) & RX_QUEUE_MASK;
@@ -546,12 +542,12 @@ static void iwl_irq_handle_error(struct iwl_trans *trans)
         /* W/A for WiFi/WiMAX coex and WiMAX own the RF */
         if (trans->cfg->internal_wimax_coex &&
             (!(iwl_read_prph(trans, APMG_CLK_CTRL_REG) &
-                        APMS_CLK_VAL_MRB_FUNC_MODE) ||
+                             APMS_CLK_VAL_MRB_FUNC_MODE) ||
              (iwl_read_prph(trans, APMG_PS_CTRL_REG) &
-                        APMG_PS_CTRL_VAL_RESET_REQ))) {
-                struct iwl_trans_pcie *trans_pcie;
+                            APMG_PS_CTRL_VAL_RESET_REQ))) {
+                struct iwl_trans_pcie *trans_pcie =
+                        IWL_TRANS_GET_PCIE_TRANS(trans);
 
-                trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
                 clear_bit(STATUS_HCMD_ACTIVE, &trans_pcie->status);
                 iwl_op_mode_wimax_active(trans->op_mode);
                 wake_up(&trans->wait_command_queue);
@@ -567,6 +563,8 @@ static void iwl_irq_handle_error(struct iwl_trans *trans)
 /* tasklet for iwlagn interrupt */
 void iwl_irq_tasklet(struct iwl_trans *trans)
 {
+        struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
+        struct isr_statistics *isr_stats = &trans_pcie->isr_stats;
         u32 inta = 0;
         u32 handled = 0;
         unsigned long flags;
@@ -575,10 +573,6 @@ void iwl_irq_tasklet(struct iwl_trans *trans)
         u32 inta_mask;
 #endif
 
-        struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
-        struct isr_statistics *isr_stats = &trans_pcie->isr_stats;
-
-
         spin_lock_irqsave(&trans_pcie->irq_lock, flags);
 
         /* Ack/clear/reset pending uCode interrupts.
@@ -593,7 +587,7 @@ void iwl_irq_tasklet(struct iwl_trans *trans)
          * interrupt coalescing can still be achieved.
          */
         iwl_write32(trans, CSR_INT,
-                trans_pcie->inta | ~trans_pcie->inta_mask);
+                    trans_pcie->inta | ~trans_pcie->inta_mask);
 
         inta = trans_pcie->inta;
 
@@ -602,7 +596,7 @@ void iwl_irq_tasklet(struct iwl_trans *trans)
                 /* just for debug */
                 inta_mask = iwl_read32(trans, CSR_INT_MASK);
                 IWL_DEBUG_ISR(trans, "inta 0x%08x, enabled 0x%08x\n",
-                                inta, inta_mask);
+                              inta, inta_mask);
         }
 #endif
 
@@ -651,7 +645,7 @@ void iwl_irq_tasklet(struct iwl_trans *trans)
 
                 hw_rfkill = iwl_is_rfkill_set(trans);
                 IWL_WARN(trans, "RF_KILL bit toggled to %s.\n",
-                                hw_rfkill ? "disable radio" : "enable radio");
+                         hw_rfkill ? "disable radio" : "enable radio");
 
                 isr_stats->rfkill++;
 
@@ -693,7 +687,7 @@ void iwl_irq_tasklet(struct iwl_trans *trans)
          * Rx "responses" (frame-received notification), and other
          * notifications from uCode come through here*/
         if (inta & (CSR_INT_BIT_FH_RX | CSR_INT_BIT_SW_RX |
-                        CSR_INT_BIT_RX_PERIODIC)) {
+                    CSR_INT_BIT_RX_PERIODIC)) {
                 IWL_DEBUG_ISR(trans, "Rx interrupt\n");
                 if (inta & (CSR_INT_BIT_FH_RX | CSR_INT_BIT_SW_RX)) {
                         handled |= (CSR_INT_BIT_FH_RX | CSR_INT_BIT_SW_RX);
@@ -733,7 +727,7 @@ void iwl_irq_tasklet(struct iwl_trans *trans)
                  */
                 if (inta & (CSR_INT_BIT_FH_RX | CSR_INT_BIT_SW_RX))
                         iwl_write8(trans, CSR_INT_PERIODIC_REG,
-                                    CSR_INT_PERIODIC_ENA);
+                                   CSR_INT_PERIODIC_ENA);
 
                 isr_stats->rx++;
         }
@@ -782,8 +776,7 @@ void iwl_irq_tasklet(struct iwl_trans *trans)
 /* Free dram table */
 void iwl_free_isr_ict(struct iwl_trans *trans)
 {
-        struct iwl_trans_pcie *trans_pcie =
-                IWL_TRANS_GET_PCIE_TRANS(trans);
+        struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
 
         if (trans_pcie->ict_tbl) {
                 dma_free_coherent(trans->dev, ICT_SIZE,
@@ -802,8 +795,7 @@ void iwl_free_isr_ict(struct iwl_trans *trans)
  */
 int iwl_alloc_isr_ict(struct iwl_trans *trans)
 {
-        struct iwl_trans_pcie *trans_pcie =
-                IWL_TRANS_GET_PCIE_TRANS(trans);
+        struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
 
         trans_pcie->ict_tbl =
                 dma_alloc_coherent(trans->dev, ICT_SIZE,
@@ -837,10 +829,9 @@ int iwl_alloc_isr_ict(struct iwl_trans *trans)
  */
 void iwl_reset_ict(struct iwl_trans *trans)
 {
+        struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
         u32 val;
         unsigned long flags;
-        struct iwl_trans_pcie *trans_pcie =
-                IWL_TRANS_GET_PCIE_TRANS(trans);
 
         if (!trans_pcie->ict_tbl)
                 return;
@@ -868,9 +859,7 @@ void iwl_reset_ict(struct iwl_trans *trans)
 /* Device is going down disable ict interrupt usage */
 void iwl_disable_ict(struct iwl_trans *trans)
 {
-        struct iwl_trans_pcie *trans_pcie =
-                IWL_TRANS_GET_PCIE_TRANS(trans);
-
+        struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
         unsigned long flags;
 
         spin_lock_irqsave(&trans_pcie->irq_lock, flags);
@@ -878,24 +867,23 @@ void iwl_disable_ict(struct iwl_trans *trans)
         spin_unlock_irqrestore(&trans_pcie->irq_lock, flags);
 }
 
+/* legacy (non-ICT) ISR. Assumes that trans_pcie->irq_lock is held */
 static irqreturn_t iwl_isr(int irq, void *data)
 {
         struct iwl_trans *trans = data;
-        struct iwl_trans_pcie *trans_pcie;
+        struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
         u32 inta, inta_mask;
-        unsigned long flags;
 #ifdef CONFIG_IWLWIFI_DEBUG
         u32 inta_fh;
 #endif
+
+        lockdep_assert_held(&trans_pcie->irq_lock);
+
         if (!trans)
                 return IRQ_NONE;
 
         trace_iwlwifi_dev_irq(trans->dev);
 
-        trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
-
-        spin_lock_irqsave(&trans_pcie->irq_lock, flags);
-
         /* Disable (but don't clear!) interrupts here to avoid
          *    back-to-back ISRs and sporadic interrupts from our NIC.
          * If we have something to service, the tasklet will re-enable ints.
@@ -918,7 +906,7 @@ static irqreturn_t iwl_isr(int irq, void *data)
                 /* Hardware disappeared. It might have already raised
                  * an interrupt */
                 IWL_WARN(trans, "HARDWARE GONE?? INTA == 0x%08x\n", inta);
-                goto unplugged;
+                return IRQ_HANDLED;
         }
 
 #ifdef CONFIG_IWLWIFI_DEBUG
@@ -934,21 +922,16 @@ static irqreturn_t iwl_isr(int irq, void *data)
         if (likely(inta))
                 tasklet_schedule(&trans_pcie->irq_tasklet);
         else if (test_bit(STATUS_INT_ENABLED, &trans_pcie->status) &&
-                        !trans_pcie->inta)
+                 !trans_pcie->inta)
                 iwl_enable_interrupts(trans);
 
- unplugged:
-        spin_unlock_irqrestore(&trans_pcie->irq_lock, flags);
-        return IRQ_HANDLED;
-
- none:
+none:
         /* re-enable interrupts here since we don't have anything to service. */
         /* only Re-enable if disabled by irq  and no schedules tasklet. */
         if (test_bit(STATUS_INT_ENABLED, &trans_pcie->status) &&
-                !trans_pcie->inta)
+            !trans_pcie->inta)
                 iwl_enable_interrupts(trans);
 
-        spin_unlock_irqrestore(&trans_pcie->irq_lock, flags);
         return IRQ_NONE;
 }
 
@@ -974,15 +957,19 @@ irqreturn_t iwl_isr_ict(int irq, void *data)
 
         trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
 
+        spin_lock_irqsave(&trans_pcie->irq_lock, flags);
+
         /* dram interrupt table not set yet,
          * use legacy interrupt.
          */
-        if (!trans_pcie->use_ict)
-                return iwl_isr(irq, data);
+        if (unlikely(!trans_pcie->use_ict)) {
+                irqreturn_t ret = iwl_isr(irq, data);
+                spin_unlock_irqrestore(&trans_pcie->irq_lock, flags);
+                return ret;
+        }
 
         trace_iwlwifi_dev_irq(trans->dev);
 
-        spin_lock_irqsave(&trans_pcie->irq_lock, flags);
 
         /* Disable (but don't clear!) interrupts here to avoid
          * back-to-back ISRs and sporadic interrupts from our NIC.
@@ -1036,7 +1023,7 @@ irqreturn_t iwl_isr_ict(int irq, void *data)
 
         inta = (0xff & val) | ((0xff00 & val) << 16);
         IWL_DEBUG_ISR(trans, "ISR inta 0x%08x, enabled 0x%08x ict 0x%08x\n",
-                        inta, inta_mask, val);
+                      inta, inta_mask, val);
 
         inta &= trans_pcie->inta_mask;
         trans_pcie->inta |= inta;
diff --git a/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c b/drivers/net/wireless/iwlwifi/pcie/trans.c
index 79c6b91417f..d1950838f17 100644
--- a/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c
+++ b/drivers/net/wireless/iwlwifi/pcie/trans.c
@@ -70,15 +70,12 @@
 
 #include "iwl-drv.h"
 #include "iwl-trans.h"
-#include "iwl-trans-pcie-int.h"
 #include "iwl-csr.h"
 #include "iwl-prph.h"
-#include "iwl-eeprom.h"
 #include "iwl-agn-hw.h"
+#include "internal.h"
 /* FIXME: need to abstract out TX command (once we know what it looks like) */
-#include "iwl-commands.h"
-
-#define IWL_MASK(lo, hi) ((1 << (hi)) | ((1 << (hi)) - (1 << (lo))))
+#include "dvm/commands.h"
 
 #define SCD_QUEUECHAIN_SEL_ALL(trans, trans_pcie)       \
         (((1<<trans->cfg->base_params->num_of_queues) - 1) &\
@@ -86,8 +83,7 @@
 
 static int iwl_trans_rx_alloc(struct iwl_trans *trans)
 {
-        struct iwl_trans_pcie *trans_pcie =
-                IWL_TRANS_GET_PCIE_TRANS(trans);
+        struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
         struct iwl_rx_queue *rxq = &trans_pcie->rxq;
         struct device *dev = trans->dev;
 
@@ -114,7 +110,7 @@ static int iwl_trans_rx_alloc(struct iwl_trans *trans)
 
 err_rb_stts:
         dma_free_coherent(dev, sizeof(__le32) * RX_QUEUE_SIZE,
-                        rxq->bd, rxq->bd_dma);
+                          rxq->bd, rxq->bd_dma);
         memset(&rxq->bd_dma, 0, sizeof(rxq->bd_dma));
         rxq->bd = NULL;
 err_bd:
@@ -123,8 +119,7 @@ err_bd:
 
 static void iwl_trans_rxq_free_rx_bufs(struct iwl_trans *trans)
 {
-        struct iwl_trans_pcie *trans_pcie =
-                IWL_TRANS_GET_PCIE_TRANS(trans);
+        struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
         struct iwl_rx_queue *rxq = &trans_pcie->rxq;
         int i;
 
@@ -134,8 +129,8 @@ static void iwl_trans_rxq_free_rx_bufs(struct iwl_trans *trans)
                  * to an SKB, so we need to unmap and free potential storage */
                 if (rxq->pool[i].page != NULL) {
                         dma_unmap_page(trans->dev, rxq->pool[i].page_dma,
-                                PAGE_SIZE << trans_pcie->rx_page_order,
-                                DMA_FROM_DEVICE);
+                                       PAGE_SIZE << trans_pcie->rx_page_order,
+                                       DMA_FROM_DEVICE);
                         __free_pages(rxq->pool[i].page,
                                      trans_pcie->rx_page_order);
                         rxq->pool[i].page = NULL;
@@ -193,8 +188,7 @@ static void iwl_trans_rx_hw_init(struct iwl_trans *trans,
 
 static int iwl_rx_init(struct iwl_trans *trans)
 {
-        struct iwl_trans_pcie *trans_pcie =
-                IWL_TRANS_GET_PCIE_TRANS(trans);
+        struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
         struct iwl_rx_queue *rxq = &trans_pcie->rxq;
 
         int i, err;
@@ -236,10 +230,8 @@ static int iwl_rx_init(struct iwl_trans *trans)
 
 static void iwl_trans_pcie_rx_free(struct iwl_trans *trans)
 {
-        struct iwl_trans_pcie *trans_pcie =
-                IWL_TRANS_GET_PCIE_TRANS(trans);
+        struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
         struct iwl_rx_queue *rxq = &trans_pcie->rxq;
-
         unsigned long flags;
 
         /*if rxq->bd is NULL, it means that nothing has been allocated,
@@ -274,11 +266,11 @@ static int iwl_trans_rx_stop(struct iwl_trans *trans)
         /* stop Rx DMA */
         iwl_write_direct32(trans, FH_MEM_RCSR_CHNL0_CONFIG_REG, 0);
         return iwl_poll_direct_bit(trans, FH_MEM_RSSR_RX_STATUS_REG,
-                            FH_RSSR_CHNL0_RX_STATUS_CHNL_IDLE, 1000);
+                                   FH_RSSR_CHNL0_RX_STATUS_CHNL_IDLE, 1000);
 }
 
-static inline int iwlagn_alloc_dma_ptr(struct iwl_trans *trans,
-                                    struct iwl_dma_ptr *ptr, size_t size)
+static int iwlagn_alloc_dma_ptr(struct iwl_trans *trans,
+                                struct iwl_dma_ptr *ptr, size_t size)
 {
         if (WARN_ON(ptr->addr))
                 return -EINVAL;
@@ -291,8 +283,8 @@ static inline int iwlagn_alloc_dma_ptr(struct iwl_trans *trans,
         return 0;
 }
 
-static inline void iwlagn_free_dma_ptr(struct iwl_trans *trans,
-                                    struct iwl_dma_ptr *ptr)
+static void iwlagn_free_dma_ptr(struct iwl_trans *trans,
+                                struct iwl_dma_ptr *ptr)
 {
         if (unlikely(!ptr->addr))
                 return;
@@ -304,8 +296,13 @@ static inline void iwlagn_free_dma_ptr(struct iwl_trans *trans,
 static void iwl_trans_pcie_queue_stuck_timer(unsigned long data)
 {
         struct iwl_tx_queue *txq = (void *)data;
+        struct iwl_queue *q = &txq->q;
         struct iwl_trans_pcie *trans_pcie = txq->trans_pcie;
         struct iwl_trans *trans = iwl_trans_pcie_get_trans(trans_pcie);
+        u32 scd_sram_addr = trans_pcie->scd_base_addr +
+                SCD_TX_STTS_MEM_LOWER_BOUND + (16 * txq->q.id);
+        u8 buf[16];
+        int i;
 
         spin_lock(&txq->lock);
         /* check if triggered erroneously */
@@ -315,26 +312,59 @@ static void iwl_trans_pcie_queue_stuck_timer(unsigned long data)
         }
         spin_unlock(&txq->lock);
 
-
         IWL_ERR(trans, "Queue %d stuck for %u ms.\n", txq->q.id,
                 jiffies_to_msecs(trans_pcie->wd_timeout));
         IWL_ERR(trans, "Current SW read_ptr %d write_ptr %d\n",
                 txq->q.read_ptr, txq->q.write_ptr);
-        IWL_ERR(trans, "Current HW read_ptr %d write_ptr %d\n",
-                iwl_read_prph(trans, SCD_QUEUE_RDPTR(txq->q.id))
-                                        & (TFD_QUEUE_SIZE_MAX - 1),
-                iwl_read_prph(trans, SCD_QUEUE_WRPTR(txq->q.id)));
+
+        iwl_read_targ_mem_bytes(trans, scd_sram_addr, buf, sizeof(buf));
+
+        iwl_print_hex_error(trans, buf, sizeof(buf));
+
+        for (i = 0; i < FH_TCSR_CHNL_NUM; i++)
+                IWL_ERR(trans, "FH TRBs(%d) = 0x%08x\n", i,
+                        iwl_read_direct32(trans, FH_TX_TRB_REG(i)));
+
+        for (i = 0; i < trans->cfg->base_params->num_of_queues; i++) {
+                u32 status = iwl_read_prph(trans, SCD_QUEUE_STATUS_BITS(i));
+                u8 fifo = (status >> SCD_QUEUE_STTS_REG_POS_TXF) & 0x7;
+                bool active = !!(status & BIT(SCD_QUEUE_STTS_REG_POS_ACTIVE));
+                u32 tbl_dw =
+                        iwl_read_targ_mem(trans,
+                                          trans_pcie->scd_base_addr +
+                                          SCD_TRANS_TBL_OFFSET_QUEUE(i));
+
+                if (i & 0x1)
+                        tbl_dw = (tbl_dw & 0xFFFF0000) >> 16;
+                else
+                        tbl_dw = tbl_dw & 0x0000FFFF;
+
+                IWL_ERR(trans,
+                        "Q %d is %sactive and mapped to fifo %d ra_tid 0x%04x [%d,%d]\n",
+                        i, active ? "" : "in", fifo, tbl_dw,
+                        iwl_read_prph(trans,
+                                      SCD_QUEUE_RDPTR(i)) & (txq->q.n_bd - 1),
+                        iwl_read_prph(trans, SCD_QUEUE_WRPTR(i)));
+        }
+
+        for (i = q->read_ptr; i != q->write_ptr;
+             i = iwl_queue_inc_wrap(i, q->n_bd)) {
+                struct iwl_tx_cmd *tx_cmd =
+                        (struct iwl_tx_cmd *)txq->entries[i].cmd->payload;
+                IWL_ERR(trans, "scratch %d = 0x%08x\n", i,
+                        get_unaligned_le32(&tx_cmd->scratch));
+        }
 
         iwl_op_mode_nic_error(trans->op_mode);
 }
 
 static int iwl_trans_txq_alloc(struct iwl_trans *trans,
-                                struct iwl_tx_queue *txq, int slots_num,
-                                u32 txq_id)
+                               struct iwl_tx_queue *txq, int slots_num,
+                               u32 txq_id)
 {
+        struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
         size_t tfd_sz = sizeof(struct iwl_tfd) * TFD_QUEUE_SIZE_MAX;
         int i;
-        struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
 
         if (WARN_ON(txq->entries || txq->tfds))
                 return -EINVAL;
@@ -435,7 +465,7 @@ static void iwl_tx_queue_unmap(struct iwl_trans *trans, int txq_id)
 
         spin_lock_bh(&txq->lock);
         while (q->write_ptr != q->read_ptr) {
-                iwlagn_txq_free_tfd(trans, txq, dma_dir);
+                iwl_txq_free_tfd(trans, txq, dma_dir);
                 q->read_ptr = iwl_queue_inc_wrap(q->read_ptr, q->n_bd);
         }
         spin_unlock_bh(&txq->lock);
@@ -455,6 +485,7 @@ static void iwl_tx_queue_free(struct iwl_trans *trans, int txq_id)
         struct iwl_tx_queue *txq = &trans_pcie->txq[txq_id];
         struct device *dev = trans->dev;
         int i;
+
         if (WARN_ON(!txq))
                 return;
 
@@ -574,11 +605,11 @@ error:
 }
 static int iwl_tx_init(struct iwl_trans *trans)
 {
+        struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
         int ret;
         int txq_id, slots_num;
         unsigned long flags;
         bool alloc = false;
-        struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
 
         if (!trans_pcie->txq) {
                 ret = iwl_trans_tx_alloc(trans);
@@ -643,10 +674,9 @@ static void iwl_set_pwr_vmain(struct iwl_trans *trans)
 
 static u16 iwl_pciexp_link_ctrl(struct iwl_trans *trans)
 {
+        struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
         int pos;
         u16 pci_lnk_ctl;
-        struct iwl_trans_pcie *trans_pcie =
-                IWL_TRANS_GET_PCIE_TRANS(trans);
 
         struct pci_dev *pci_dev = trans_pcie->pci_dev;
 
@@ -700,14 +730,14 @@ static int iwl_apm_init(struct iwl_trans *trans)
 
         /* Disable L0S exit timer (platform NMI Work/Around) */
         iwl_set_bit(trans, CSR_GIO_CHICKEN_BITS,
-                          CSR_GIO_CHICKEN_BITS_REG_BIT_DIS_L0S_EXIT_TIMER);
+                    CSR_GIO_CHICKEN_BITS_REG_BIT_DIS_L0S_EXIT_TIMER);
 
         /*
          * Disable L0s without affecting L1;
          *  don't wait for ICH L0s (ICH bug W/A)
          */
         iwl_set_bit(trans, CSR_GIO_CHICKEN_BITS,
-                          CSR_GIO_CHICKEN_BITS_REG_BIT_L1A_NO_L0S_RX);
+                    CSR_GIO_CHICKEN_BITS_REG_BIT_L1A_NO_L0S_RX);
 
         /* Set FH wait threshold to maximum (HW error during stress W/A) */
         iwl_set_bit(trans, CSR_DBG_HPET_MEM_REG, CSR_DBG_HPET_MEM_REG_VAL);
@@ -717,7 +747,7 @@ static int iwl_apm_init(struct iwl_trans *trans)
          * wake device's PCI Express link L1a -> L0s
          */
         iwl_set_bit(trans, CSR_HW_IF_CONFIG_REG,
-                                    CSR_HW_IF_CONFIG_REG_BIT_HAP_WAKE_L1A);
+                    CSR_HW_IF_CONFIG_REG_BIT_HAP_WAKE_L1A);
 
         iwl_apm_config(trans);
 
@@ -738,8 +768,8 @@ static int iwl_apm_init(struct iwl_trans *trans)
          * and accesses to uCode SRAM.
          */
         ret = iwl_poll_bit(trans, CSR_GP_CNTRL,
-                        CSR_GP_CNTRL_REG_FLAG_MAC_CLOCK_READY,
-                        CSR_GP_CNTRL_REG_FLAG_MAC_CLOCK_READY, 25000);
+                           CSR_GP_CNTRL_REG_FLAG_MAC_CLOCK_READY,
+                           CSR_GP_CNTRL_REG_FLAG_MAC_CLOCK_READY, 25000);
         if (ret < 0) {
                 IWL_DEBUG_INFO(trans, "Failed to init the card\n");
                 goto out;
@@ -773,8 +803,8 @@ static int iwl_apm_stop_master(struct iwl_trans *trans)
         iwl_set_bit(trans, CSR_RESET, CSR_RESET_REG_FLAG_STOP_MASTER);
 
         ret = iwl_poll_bit(trans, CSR_RESET,
-                        CSR_RESET_REG_FLAG_MASTER_DISABLED,
-                        CSR_RESET_REG_FLAG_MASTER_DISABLED, 100);
+                           CSR_RESET_REG_FLAG_MASTER_DISABLED,
+                           CSR_RESET_REG_FLAG_MASTER_DISABLED, 100);
         if (ret)
                 IWL_WARN(trans, "Master Disable Timed Out, 100 usec\n");
 
@@ -816,8 +846,7 @@ static int iwl_nic_init(struct iwl_trans *trans)
         iwl_apm_init(trans);
 
         /* Set interrupt coalescing calibration timer to default (512 usecs) */
-        iwl_write8(trans, CSR_INT_COALESCING,
-                IWL_HOST_INT_CALIB_TIMEOUT_DEF);
+        iwl_write8(trans, CSR_INT_COALESCING, IWL_HOST_INT_CALIB_TIMEOUT_DEF);
 
         spin_unlock_irqrestore(&trans_pcie->irq_lock, flags);
 
@@ -836,8 +865,8 @@ static int iwl_nic_init(struct iwl_trans *trans)
 
         if (trans->cfg->base_params->shadow_reg_enable) {
                 /* enable shadow regs in HW */
-                iwl_set_bit(trans, CSR_MAC_SHADOW_REG_CTRL,
-                        0x800FFFFF);
+                iwl_set_bit(trans, CSR_MAC_SHADOW_REG_CTRL, 0x800FFFFF);
+                IWL_DEBUG_INFO(trans, "Enabling shadow registers in device\n");
         }
 
         return 0;
@@ -851,13 +880,13 @@ static int iwl_set_hw_ready(struct iwl_trans *trans)
         int ret;
 
         iwl_set_bit(trans, CSR_HW_IF_CONFIG_REG,
-                CSR_HW_IF_CONFIG_REG_BIT_NIC_READY);
+                    CSR_HW_IF_CONFIG_REG_BIT_NIC_READY);
 
         /* See if we got it */
         ret = iwl_poll_bit(trans, CSR_HW_IF_CONFIG_REG,
-                                CSR_HW_IF_CONFIG_REG_BIT_NIC_READY,
-                                CSR_HW_IF_CONFIG_REG_BIT_NIC_READY,
-                                HW_READY_TIMEOUT);
+                           CSR_HW_IF_CONFIG_REG_BIT_NIC_READY,
+                           CSR_HW_IF_CONFIG_REG_BIT_NIC_READY,
+                           HW_READY_TIMEOUT);
 
         IWL_DEBUG_INFO(trans, "hardware%s ready\n", ret < 0 ? " not" : "");
         return ret;
@@ -877,11 +906,11 @@ static int iwl_prepare_card_hw(struct iwl_trans *trans)
 
         /* If HW is not ready, prepare the conditions to check again */
         iwl_set_bit(trans, CSR_HW_IF_CONFIG_REG,
-                        CSR_HW_IF_CONFIG_REG_PREPARE);
+                    CSR_HW_IF_CONFIG_REG_PREPARE);
 
         ret = iwl_poll_bit(trans, CSR_HW_IF_CONFIG_REG,
-                        ~CSR_HW_IF_CONFIG_REG_BIT_NIC_PREPARE_DONE,
-                        CSR_HW_IF_CONFIG_REG_BIT_NIC_PREPARE_DONE, 150000);
+                           ~CSR_HW_IF_CONFIG_REG_BIT_NIC_PREPARE_DONE,
+                           CSR_HW_IF_CONFIG_REG_BIT_NIC_PREPARE_DONE, 150000);
 
         if (ret < 0)
                 return ret;
@@ -908,32 +937,33 @@ static int iwl_load_section(struct iwl_trans *trans, u8 section_num,
         trans_pcie->ucode_write_complete = false;
 
         iwl_write_direct32(trans,
-                FH_TCSR_CHNL_TX_CONFIG_REG(FH_SRVC_CHNL),
-                FH_TCSR_TX_CONFIG_REG_VAL_DMA_CHNL_PAUSE);
+                           FH_TCSR_CHNL_TX_CONFIG_REG(FH_SRVC_CHNL),
+                           FH_TCSR_TX_CONFIG_REG_VAL_DMA_CHNL_PAUSE);
 
         iwl_write_direct32(trans,
-                FH_SRVC_CHNL_SRAM_ADDR_REG(FH_SRVC_CHNL), dst_addr);
+                           FH_SRVC_CHNL_SRAM_ADDR_REG(FH_SRVC_CHNL),
+                           dst_addr);
 
         iwl_write_direct32(trans,
                 FH_TFDIB_CTRL0_REG(FH_SRVC_CHNL),
                 phy_addr & FH_MEM_TFDIB_DRAM_ADDR_LSB_MSK);
 
         iwl_write_direct32(trans,
-                FH_TFDIB_CTRL1_REG(FH_SRVC_CHNL),
-                (iwl_get_dma_hi_addr(phy_addr)
-                        << FH_MEM_TFDIB_REG1_ADDR_BITSHIFT) | byte_cnt);
+                           FH_TFDIB_CTRL1_REG(FH_SRVC_CHNL),
+                           (iwl_get_dma_hi_addr(phy_addr)
+                                << FH_MEM_TFDIB_REG1_ADDR_BITSHIFT) | byte_cnt);
 
         iwl_write_direct32(trans,
-                FH_TCSR_CHNL_TX_BUF_STS_REG(FH_SRVC_CHNL),
-                1 << FH_TCSR_CHNL_TX_BUF_STS_REG_POS_TB_NUM |
-                1 << FH_TCSR_CHNL_TX_BUF_STS_REG_POS_TB_IDX |
-                FH_TCSR_CHNL_TX_BUF_STS_REG_VAL_TFDB_VALID);
+                           FH_TCSR_CHNL_TX_BUF_STS_REG(FH_SRVC_CHNL),
+                           1 << FH_TCSR_CHNL_TX_BUF_STS_REG_POS_TB_NUM |
+                           1 << FH_TCSR_CHNL_TX_BUF_STS_REG_POS_TB_IDX |
+                           FH_TCSR_CHNL_TX_BUF_STS_REG_VAL_TFDB_VALID);
 
         iwl_write_direct32(trans,
-                FH_TCSR_CHNL_TX_CONFIG_REG(FH_SRVC_CHNL),
-                FH_TCSR_TX_CONFIG_REG_VAL_DMA_CHNL_ENABLE       |
-                FH_TCSR_TX_CONFIG_REG_VAL_DMA_CREDIT_DISABLE    |
-                FH_TCSR_TX_CONFIG_REG_VAL_CIRQ_HOST_ENDTFD);
+                           FH_TCSR_CHNL_TX_CONFIG_REG(FH_SRVC_CHNL),
+                           FH_TCSR_TX_CONFIG_REG_VAL_DMA_CHNL_ENABLE    |
+                           FH_TCSR_TX_CONFIG_REG_VAL_DMA_CREDIT_DISABLE |
+                           FH_TCSR_TX_CONFIG_REG_VAL_CIRQ_HOST_ENDTFD);
 
         IWL_DEBUG_FW(trans, "[%d] uCode section being loaded...\n",
                      section_num);
@@ -1016,15 +1046,12 @@ static int iwl_trans_pcie_start_fw(struct iwl_trans *trans,
 
 /*
  * Activate/Deactivate Tx DMA/FIFO channels according tx fifos mask
- * must be called under the irq lock and with MAC access
  */
 static void iwl_trans_txq_set_sched(struct iwl_trans *trans, u32 mask)
 {
         struct iwl_trans_pcie __maybe_unused *trans_pcie =
                 IWL_TRANS_GET_PCIE_TRANS(trans);
 
-        lockdep_assert_held(&trans_pcie->irq_lock);
-
         iwl_write_prph(trans, SCD_TXFACT, mask);
 }
 
@@ -1032,11 +1059,12 @@ static void iwl_tx_start(struct iwl_trans *trans)
 {
         struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
         u32 a;
-        unsigned long flags;
         int i, chan;
         u32 reg_val;
 
-        spin_lock_irqsave(&trans_pcie->irq_lock, flags);
+        /* make sure all queue are not stopped/used */
+        memset(trans_pcie->queue_stopped, 0, sizeof(trans_pcie->queue_stopped));
+        memset(trans_pcie->queue_used, 0, sizeof(trans_pcie->queue_used));
 
         trans_pcie->scd_base_addr =
                 iwl_read_prph(trans, SCD_SRAM_BASE_ADDR);
@@ -1063,64 +1091,30 @@ static void iwl_tx_start(struct iwl_trans *trans)
          */
         iwl_write_prph(trans, SCD_CHAINEXT_EN, 0);
 
+        for (i = 0; i < trans_pcie->n_q_to_fifo; i++) {
+                int fifo = trans_pcie->setup_q_to_fifo[i];
+
+                iwl_trans_pcie_txq_enable(trans, i, fifo, IWL_INVALID_STATION,
+                                          IWL_TID_NON_QOS, SCD_FRAME_LIMIT, 0);
+        }
+
+        /* Activate all Tx DMA/FIFO channels */
+        iwl_trans_txq_set_sched(trans, IWL_MASK(0, 7));
+
         /* Enable DMA channel */
         for (chan = 0; chan < FH_TCSR_CHNL_NUM ; chan++)
                 iwl_write_direct32(trans, FH_TCSR_CHNL_TX_CONFIG_REG(chan),
-                                FH_TCSR_TX_CONFIG_REG_VAL_DMA_CHNL_ENABLE |
-                                FH_TCSR_TX_CONFIG_REG_VAL_DMA_CREDIT_ENABLE);
+                                   FH_TCSR_TX_CONFIG_REG_VAL_DMA_CHNL_ENABLE |
+                                   FH_TCSR_TX_CONFIG_REG_VAL_DMA_CREDIT_ENABLE);
 
         /* Update FH chicken bits */
         reg_val = iwl_read_direct32(trans, FH_TX_CHICKEN_BITS_REG);
         iwl_write_direct32(trans, FH_TX_CHICKEN_BITS_REG,
                            reg_val | FH_TX_CHICKEN_BITS_SCD_AUTO_RETRY_EN);
 
-        iwl_write_prph(trans, SCD_QUEUECHAIN_SEL,
-                SCD_QUEUECHAIN_SEL_ALL(trans, trans_pcie));
-        iwl_write_prph(trans, SCD_AGGR_SEL, 0);
-
-        /* initiate the queues */
-        for (i = 0; i < trans->cfg->base_params->num_of_queues; i++) {
-                iwl_write_prph(trans, SCD_QUEUE_RDPTR(i), 0);
-                iwl_write_direct32(trans, HBUS_TARG_WRPTR, 0 | (i << 8));
-                iwl_write_targ_mem(trans, trans_pcie->scd_base_addr +
-                                SCD_CONTEXT_QUEUE_OFFSET(i), 0);
-                iwl_write_targ_mem(trans, trans_pcie->scd_base_addr +
-                                SCD_CONTEXT_QUEUE_OFFSET(i) +
-                                sizeof(u32),
-                                ((SCD_WIN_SIZE <<
-                                SCD_QUEUE_CTX_REG2_WIN_SIZE_POS) &
-                                SCD_QUEUE_CTX_REG2_WIN_SIZE_MSK) |
-                                ((SCD_FRAME_LIMIT <<
-                                SCD_QUEUE_CTX_REG2_FRAME_LIMIT_POS) &
-                                SCD_QUEUE_CTX_REG2_FRAME_LIMIT_MSK));
-        }
-
-        iwl_write_prph(trans, SCD_INTERRUPT_MASK,
-                        IWL_MASK(0, trans->cfg->base_params->num_of_queues));
-
-        /* Activate all Tx DMA/FIFO channels */
-        iwl_trans_txq_set_sched(trans, IWL_MASK(0, 7));
-
-        iwl_trans_set_wr_ptrs(trans, trans_pcie->cmd_queue, 0);
-
-        /* make sure all queue are not stopped/used */
-        memset(trans_pcie->queue_stopped, 0, sizeof(trans_pcie->queue_stopped));
-        memset(trans_pcie->queue_used, 0, sizeof(trans_pcie->queue_used));
-
-        for (i = 0; i < trans_pcie->n_q_to_fifo; i++) {
-                int fifo = trans_pcie->setup_q_to_fifo[i];
-
-                set_bit(i, trans_pcie->queue_used);
-
-                iwl_trans_tx_queue_set_status(trans, &trans_pcie->txq[i],
-                                              fifo, true);
-        }
-
-        spin_unlock_irqrestore(&trans_pcie->irq_lock, flags);
-
         /* Enable L1-Active */
         iwl_clear_bits_prph(trans, APMG_PCIDEV_STT_REG,
-                          APMG_PCIDEV_STT_VAL_L1_ACT_DIS);
+                            APMG_PCIDEV_STT_VAL_L1_ACT_DIS);
 }
 
 static void iwl_trans_pcie_fw_alive(struct iwl_trans *trans)
@@ -1134,9 +1128,9 @@ static void iwl_trans_pcie_fw_alive(struct iwl_trans *trans)
  */
 static int iwl_trans_tx_stop(struct iwl_trans *trans)
 {
+        struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
         int ch, txq_id, ret;
         unsigned long flags;
-        struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
 
         /* Turn off all Tx DMA fifos */
         spin_lock_irqsave(&trans_pcie->irq_lock, flags);
@@ -1148,13 +1142,13 @@ static int iwl_trans_tx_stop(struct iwl_trans *trans)
                 iwl_write_direct32(trans,
                                    FH_TCSR_CHNL_TX_CONFIG_REG(ch), 0x0);
                 ret = iwl_poll_direct_bit(trans, FH_TSSR_TX_STATUS_REG,
-                                    FH_TSSR_TX_STATUS_REG_MSK_CHNL_IDLE(ch),
-                                    1000);
+                        FH_TSSR_TX_STATUS_REG_MSK_CHNL_IDLE(ch), 1000);
                 if (ret < 0)
-                        IWL_ERR(trans, "Failing on timeout while stopping"
-                            " DMA channel %d [0x%08x]", ch,
-                            iwl_read_direct32(trans,
-                                              FH_TSSR_TX_STATUS_REG));
+                        IWL_ERR(trans,
+                                "Failing on timeout while stopping DMA channel %d [0x%08x]",
+                                ch,
+                                iwl_read_direct32(trans,
+                                                  FH_TSSR_TX_STATUS_REG));
         }
         spin_unlock_irqrestore(&trans_pcie->irq_lock, flags);
 
@@ -1173,8 +1167,8 @@ static int iwl_trans_tx_stop(struct iwl_trans *trans)
 
 static void iwl_trans_pcie_stop_device(struct iwl_trans *trans)
 {
-        unsigned long flags;
         struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
+        unsigned long flags;
 
         /* tell the device to stop sending interrupts */
         spin_lock_irqsave(&trans_pcie->irq_lock, flags);
@@ -1204,7 +1198,7 @@ static void iwl_trans_pcie_stop_device(struct iwl_trans *trans)
 
         /* Make sure (redundant) we've released our request to stay awake */
         iwl_clear_bit(trans, CSR_GP_CNTRL,
-                        CSR_GP_CNTRL_REG_FLAG_MAC_ACCESS_REQ);
+                      CSR_GP_CNTRL_REG_FLAG_MAC_ACCESS_REQ);
 
         /* Stop the device, and put it in low power state */
         iwl_apm_stop(trans);
@@ -1273,13 +1267,27 @@ static int iwl_trans_pcie_tx(struct iwl_trans *trans, struct sk_buff *skb,
 
         spin_lock(&txq->lock);
 
+        /* In AGG mode, the index in the ring must correspond to the WiFi
+         * sequence number. This is a HW requirements to help the SCD to parse
+         * the BA.
+         * Check here that the packets are in the right place on the ring.
+         */
+#ifdef CONFIG_IWLWIFI_DEBUG
+        wifi_seq = SEQ_TO_SN(le16_to_cpu(hdr->seq_ctrl));
+        WARN_ONCE((iwl_read_prph(trans, SCD_AGGR_SEL) & BIT(txq_id)) &&
+                  ((wifi_seq & 0xff) != q->write_ptr),
+                  "Q: %d WiFi Seq %d tfdNum %d",
+                  txq_id, wifi_seq, q->write_ptr);
+#endif
+
         /* Set up driver data for this TFD */
         txq->entries[q->write_ptr].skb = skb;
         txq->entries[q->write_ptr].cmd = dev_cmd;
 
         dev_cmd->hdr.cmd = REPLY_TX;
-        dev_cmd->hdr.sequence = cpu_to_le16((u16)(QUEUE_TO_SEQ(txq_id) |
-                                INDEX_TO_SEQ(q->write_ptr)));
+        dev_cmd->hdr.sequence =
+                cpu_to_le16((u16)(QUEUE_TO_SEQ(txq_id) |
+                            INDEX_TO_SEQ(q->write_ptr)));
 
         /* Set up first empty entry in queue's array of Tx/cmd buffers */
         out_meta = &txq->entries[q->write_ptr].meta;
@@ -1344,7 +1352,7 @@ static int iwl_trans_pcie_tx(struct iwl_trans *trans, struct sk_buff *skb,
 
         /* take back ownership of DMA buffer to enable update */
         dma_sync_single_for_cpu(trans->dev, txcmd_phys, firstlen,
-                        DMA_BIDIRECTIONAL);
+                                DMA_BIDIRECTIONAL);
         tx_cmd->dram_lsb_ptr = cpu_to_le32(scratch_phys);
         tx_cmd->dram_msb_ptr = iwl_get_dma_hi_addr(scratch_phys);
 
@@ -1356,16 +1364,17 @@ static int iwl_trans_pcie_tx(struct iwl_trans *trans, struct sk_buff *skb,
         iwl_trans_txq_update_byte_cnt_tbl(trans, txq, le16_to_cpu(tx_cmd->len));
 
         dma_sync_single_for_device(trans->dev, txcmd_phys, firstlen,
-                        DMA_BIDIRECTIONAL);
+                                   DMA_BIDIRECTIONAL);
 
         trace_iwlwifi_dev_tx(trans->dev,
-                             &((struct iwl_tfd *)txq->tfds)[txq->q.write_ptr],
+                             &txq->tfds[txq->q.write_ptr],
                              sizeof(struct iwl_tfd),
                              &dev_cmd->hdr, firstlen,
                              skb->data + hdr_len, secondlen);
 
         /* start timer if queue currently empty */
-        if (q->read_ptr == q->write_ptr && trans_pcie->wd_timeout)
+        if (txq->need_update && q->read_ptr == q->write_ptr &&
+            trans_pcie->wd_timeout)
                 mod_timer(&txq->stuck_timer, jiffies + trans_pcie->wd_timeout);
 
         /* Tell device the write index *just past* this latest filled TFD */
@@ -1395,8 +1404,7 @@ static int iwl_trans_pcie_tx(struct iwl_trans *trans, struct sk_buff *skb,
 
 static int iwl_trans_pcie_start_hw(struct iwl_trans *trans)
 {
-        struct iwl_trans_pcie *trans_pcie =
-                IWL_TRANS_GET_PCIE_TRANS(trans);
+        struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
         int err;
         bool hw_rfkill;
 
@@ -1409,7 +1417,7 @@ static int iwl_trans_pcie_start_hw(struct iwl_trans *trans)
                 iwl_alloc_isr_ict(trans);
 
                 err = request_irq(trans_pcie->irq, iwl_isr_ict, IRQF_SHARED,
-                        DRV_NAME, trans);
+                                  DRV_NAME, trans);
                 if (err) {
                         IWL_ERR(trans, "Error allocating IRQ %d\n",
                                 trans_pcie->irq);
@@ -1447,9 +1455,9 @@ error:
 static void iwl_trans_pcie_stop_hw(struct iwl_trans *trans,
                                    bool op_mode_leaving)
 {
+        struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
         bool hw_rfkill;
         unsigned long flags;
-        struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
 
         iwl_apm_stop(trans);
 
@@ -1553,8 +1561,7 @@ static void iwl_trans_pcie_configure(struct iwl_trans *trans,
 
 void iwl_trans_pcie_free(struct iwl_trans *trans)
 {
-        struct iwl_trans_pcie *trans_pcie =
-                IWL_TRANS_GET_PCIE_TRANS(trans);
+        struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
 
         iwl_trans_pcie_tx_free(trans);
 #ifndef CONFIG_IWLWIFI_IDI
@@ -1569,6 +1576,7 @@ void iwl_trans_pcie_free(struct iwl_trans *trans)
         iounmap(trans_pcie->hw_base);
         pci_release_regions(trans_pcie->pci_dev);
         pci_disable_device(trans_pcie->pci_dev);
+        kmem_cache_destroy(trans->dev_cmd_pool);
 
         kfree(trans);
 }
@@ -1816,8 +1824,8 @@ static const struct file_operations iwl_dbgfs_##name##_ops = {		\
 };
 
 static ssize_t iwl_dbgfs_tx_queue_read(struct file *file,
-                                                char __user *user_buf,
-                                                size_t count, loff_t *ppos)
+                                       char __user *user_buf,
+                                       size_t count, loff_t *ppos)
 {
         struct iwl_trans *trans = file->private_data;
         struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
@@ -1853,11 +1861,11 @@ static ssize_t iwl_dbgfs_tx_queue_read(struct file *file,
 }
 
 static ssize_t iwl_dbgfs_rx_queue_read(struct file *file,
-                                                char __user *user_buf,
-                                                size_t count, loff_t *ppos) {
+                                       char __user *user_buf,
+                                       size_t count, loff_t *ppos)
+{
         struct iwl_trans *trans = file->private_data;
-        struct iwl_trans_pcie *trans_pcie =
-                IWL_TRANS_GET_PCIE_TRANS(trans);
+        struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
         struct iwl_rx_queue *rxq = &trans_pcie->rxq;
         char buf[256];
         int pos = 0;
@@ -1881,11 +1889,10 @@ static ssize_t iwl_dbgfs_rx_queue_read(struct file *file,
 
 static ssize_t iwl_dbgfs_interrupt_read(struct file *file,
                                         char __user *user_buf,
-                                        size_t count, loff_t *ppos) {
-
+                                        size_t count, loff_t *ppos)
+{
         struct iwl_trans *trans = file->private_data;
-        struct iwl_trans_pcie *trans_pcie =
-                IWL_TRANS_GET_PCIE_TRANS(trans);
+        struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
         struct isr_statistics *isr_stats = &trans_pcie->isr_stats;
 
         int pos = 0;
@@ -1943,8 +1950,7 @@ static ssize_t iwl_dbgfs_interrupt_write(struct file *file,
                                          size_t count, loff_t *ppos)
 {
         struct iwl_trans *trans = file->private_data;
-        struct iwl_trans_pcie *trans_pcie =
-                IWL_TRANS_GET_PCIE_TRANS(trans);
+        struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
         struct isr_statistics *isr_stats = &trans_pcie->isr_stats;
 
         char buf[8];
@@ -1964,8 +1970,8 @@ static ssize_t iwl_dbgfs_interrupt_write(struct file *file,
 }
 
 static ssize_t iwl_dbgfs_csr_write(struct file *file,
-                                         const char __user *user_buf,
-                                         size_t count, loff_t *ppos)
+                                   const char __user *user_buf,
+                                   size_t count, loff_t *ppos)
 {
         struct iwl_trans *trans = file->private_data;
         char buf[8];
@@ -1985,8 +1991,8 @@ static ssize_t iwl_dbgfs_csr_write(struct file *file,
 }
 
 static ssize_t iwl_dbgfs_fh_reg_read(struct file *file,
-                                         char __user *user_buf,
-                                         size_t count, loff_t *ppos)
+                                     char __user *user_buf,
+                                     size_t count, loff_t *ppos)
 {
         struct iwl_trans *trans = file->private_data;
         char *buf;
@@ -2012,7 +2018,9 @@ static ssize_t iwl_dbgfs_fw_restart_write(struct file *file,
         if (!trans->op_mode)
                 return -EAGAIN;
 
+        local_bh_disable();
         iwl_op_mode_nic_error(trans->op_mode);
+        local_bh_enable();
 
         return count;
 }
@@ -2029,7 +2037,7 @@ DEBUGFS_WRITE_FILE_OPS(fw_restart);
  *
  */
 static int iwl_trans_pcie_dbgfs_register(struct iwl_trans *trans,
-                                        struct dentry *dir)
+                                         struct dentry *dir)
 {
         DEBUGFS_ADD_FILE(rx_queue, dir, S_IRUSR);
         DEBUGFS_ADD_FILE(tx_queue, dir, S_IRUSR);
@@ -2041,9 +2049,10 @@ static int iwl_trans_pcie_dbgfs_register(struct iwl_trans *trans,
 }
 #else
 static int iwl_trans_pcie_dbgfs_register(struct iwl_trans *trans,
-                                        struct dentry *dir)
-{ return 0; }
-
+                                         struct dentry *dir)
+{
+        return 0;
+}
 #endif /*CONFIG_IWLWIFI_DEBUGFS */
 
 static const struct iwl_trans_ops trans_ops_pcie = {
@@ -2060,8 +2069,8 @@ static const struct iwl_trans_ops trans_ops_pcie = {
         .tx = iwl_trans_pcie_tx,
         .reclaim = iwl_trans_pcie_reclaim,
 
-        .tx_agg_disable = iwl_trans_pcie_tx_agg_disable,
-        .tx_agg_setup = iwl_trans_pcie_tx_agg_setup,
+        .txq_disable = iwl_trans_pcie_txq_disable,
+        .txq_enable = iwl_trans_pcie_txq_enable,
 
         .dbgfs_register = iwl_trans_pcie_dbgfs_register,
 
@@ -2084,11 +2093,12 @@ struct iwl_trans *iwl_trans_pcie_alloc(struct pci_dev *pdev,
 {
         struct iwl_trans_pcie *trans_pcie;
         struct iwl_trans *trans;
+        char cmd_pool_name[100];
         u16 pci_cmd;
         int err;
 
         trans = kzalloc(sizeof(struct iwl_trans) +
-                             sizeof(struct iwl_trans_pcie), GFP_KERNEL);
+                        sizeof(struct iwl_trans_pcie), GFP_KERNEL);
 
         if (WARN_ON(!trans))
                 return NULL;
@@ -2104,7 +2114,7 @@ struct iwl_trans *iwl_trans_pcie_alloc(struct pci_dev *pdev,
         /* W/A - seems to solve weird behavior. We need to remove this if we
          * don't want to stay in L1 all the time. This wastes a lot of power */
         pci_disable_link_state(pdev, PCIE_LINK_STATE_L0S | PCIE_LINK_STATE_L1 |
-                                PCIE_LINK_STATE_CLKPM);
+                               PCIE_LINK_STATE_CLKPM);
 
         if (pci_enable_device(pdev)) {
                 err = -ENODEV;
@@ -2120,7 +2130,7 @@ struct iwl_trans *iwl_trans_pcie_alloc(struct pci_dev *pdev,
                 err = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
                 if (!err)
                         err = pci_set_consistent_dma_mask(pdev,
-                                                        DMA_BIT_MASK(32));
+                                                          DMA_BIT_MASK(32));
                 /* both attempts failed: */
                 if (err) {
                         dev_printk(KERN_ERR, &pdev->dev,
@@ -2143,13 +2153,13 @@ struct iwl_trans *iwl_trans_pcie_alloc(struct pci_dev *pdev,
         }
 
         dev_printk(KERN_INFO, &pdev->dev,
-                "pci_resource_len = 0x%08llx\n",
-                (unsigned long long) pci_resource_len(pdev, 0));
+                   "pci_resource_len = 0x%08llx\n",
+                   (unsigned long long) pci_resource_len(pdev, 0));
         dev_printk(KERN_INFO, &pdev->dev,
-                "pci_resource_base = %p\n", trans_pcie->hw_base);
+                   "pci_resource_base = %p\n", trans_pcie->hw_base);
 
         dev_printk(KERN_INFO, &pdev->dev,
-                "HW Revision ID = 0x%X\n", pdev->revision);
+                   "HW Revision ID = 0x%X\n", pdev->revision);
 
         /* We disable the RETRY_TIMEOUT register (0x41) to keep
          * PCI Tx retries from interfering with C3 CPU state */
@@ -2158,7 +2168,7 @@ struct iwl_trans *iwl_trans_pcie_alloc(struct pci_dev *pdev,
         err = pci_enable_msi(pdev);
         if (err)
                 dev_printk(KERN_ERR, &pdev->dev,
-                        "pci_enable_msi failed(0X%x)", err);
+                           "pci_enable_msi failed(0X%x)", err);
 
         trans->dev = &pdev->dev;
         trans_pcie->irq = pdev->irq;
@@ -2180,8 +2190,25 @@ struct iwl_trans *iwl_trans_pcie_alloc(struct pci_dev *pdev,
         init_waitqueue_head(&trans->wait_command_queue);
         spin_lock_init(&trans->reg_lock);
 
+        snprintf(cmd_pool_name, sizeof(cmd_pool_name), "iwl_cmd_pool:%s",
+                 dev_name(trans->dev));
+
+        trans->dev_cmd_headroom = 0;
+        trans->dev_cmd_pool =
+                kmem_cache_create(cmd_pool_name,
+                                  sizeof(struct iwl_device_cmd)
+                                  + trans->dev_cmd_headroom,
+                                  sizeof(void *),
+                                  SLAB_HWCACHE_ALIGN,
+                                  NULL);
+
+        if (!trans->dev_cmd_pool)
+                goto out_pci_disable_msi;
+
         return trans;
 
+out_pci_disable_msi:
+        pci_disable_msi(pdev);
 out_pci_release_regions:
         pci_release_regions(pdev);
 out_pci_disable_device:
@@ -2190,4 +2217,3 @@ out_no_pci:
         kfree(trans);
         return NULL;
 }
-
diff --git a/drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c b/drivers/net/wireless/iwlwifi/pcie/tx.c
index a8750238ee0..6baf8deef51 100644
--- a/drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c
+++ b/drivers/net/wireless/iwlwifi/pcie/tx.c
@@ -34,11 +34,10 @@
 #include "iwl-csr.h"
 #include "iwl-prph.h"
 #include "iwl-io.h"
-#include "iwl-agn-hw.h"
 #include "iwl-op-mode.h"
-#include "iwl-trans-pcie-int.h"
+#include "internal.h"
 /* FIXME: need to abstract out TX command (once we know what it looks like) */
-#include "iwl-commands.h"
+#include "dvm/commands.h"
 
 #define IWL_TX_CRC_SIZE 4
 #define IWL_TX_DELIMITER_SIZE 4
@@ -47,12 +46,11 @@
  * iwl_trans_txq_update_byte_cnt_tbl - Set up entry in Tx byte-count array
  */
 void iwl_trans_txq_update_byte_cnt_tbl(struct iwl_trans *trans,
-                                           struct iwl_tx_queue *txq,
-                                           u16 byte_cnt)
+                                       struct iwl_tx_queue *txq,
+                                       u16 byte_cnt)
 {
         struct iwlagn_scd_bc_tbl *scd_bc_tbl;
-        struct iwl_trans_pcie *trans_pcie =
-                IWL_TRANS_GET_PCIE_TRANS(trans);
+        struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
         int write_ptr = txq->q.write_ptr;
         int txq_id = txq->q.id;
         u8 sec_ctl = 0;
@@ -178,8 +176,8 @@ static inline u8 iwl_tfd_get_num_tbs(struct iwl_tfd *tfd)
         return tfd->num_tbs & 0x1f;
 }
 
-static void iwlagn_unmap_tfd(struct iwl_trans *trans, struct iwl_cmd_meta *meta,
-                     struct iwl_tfd *tfd, enum dma_data_direction dma_dir)
+static void iwl_unmap_tfd(struct iwl_trans *trans, struct iwl_cmd_meta *meta,
+                          struct iwl_tfd *tfd, enum dma_data_direction dma_dir)
 {
         int i;
         int num_tbs;
@@ -209,7 +207,7 @@ static void iwlagn_unmap_tfd(struct iwl_trans *trans, struct iwl_cmd_meta *meta,
 }
 
 /**
- * iwlagn_txq_free_tfd - Free all chunks referenced by TFD [txq->q.read_ptr]
+ * iwl_txq_free_tfd - Free all chunks referenced by TFD [txq->q.read_ptr]
  * @trans - transport private data
  * @txq - tx queue
  * @dma_dir - the direction of the DMA mapping
@@ -217,8 +215,8 @@ static void iwlagn_unmap_tfd(struct iwl_trans *trans, struct iwl_cmd_meta *meta,
  * Does NOT advance any TFD circular buffer read/write indexes
  * Does NOT free the TFD itself (which is within circular buffer)
  */
-void iwlagn_txq_free_tfd(struct iwl_trans *trans, struct iwl_tx_queue *txq,
-                         enum dma_data_direction dma_dir)
+void iwl_txq_free_tfd(struct iwl_trans *trans, struct iwl_tx_queue *txq,
+                      enum dma_data_direction dma_dir)
 {
         struct iwl_tfd *tfd_tmp = txq->tfds;
 
@@ -229,8 +227,8 @@ void iwlagn_txq_free_tfd(struct iwl_trans *trans, struct iwl_tx_queue *txq,
         lockdep_assert_held(&txq->lock);
 
         /* We have only q->n_window txq->entries, but we use q->n_bd tfds */
-        iwlagn_unmap_tfd(trans, &txq->entries[idx].meta,
-                         &tfd_tmp[rd_ptr], dma_dir);
+        iwl_unmap_tfd(trans, &txq->entries[idx].meta, &tfd_tmp[rd_ptr],
+                      dma_dir);
 
         /* free SKB */
         if (txq->entries) {
@@ -270,7 +268,7 @@ int iwlagn_txq_attach_buf_to_tfd(struct iwl_trans *trans,
         /* Each TFD can point to a maximum 20 Tx buffers */
         if (num_tbs >= IWL_NUM_OF_TBS) {
                 IWL_ERR(trans, "Error can not send more than %d chunks\n",
-                          IWL_NUM_OF_TBS);
+                        IWL_NUM_OF_TBS);
                 return -EINVAL;
         }
 
@@ -279,7 +277,7 @@ int iwlagn_txq_attach_buf_to_tfd(struct iwl_trans *trans,
 
         if (unlikely(addr & ~IWL_TX_DMA_MASK))
                 IWL_ERR(trans, "Unaligned address = %llx\n",
-                          (unsigned long long)addr);
+                        (unsigned long long)addr);
 
         iwl_tfd_set_tb(tfd, num_tbs, addr, len);
 
@@ -382,16 +380,14 @@ static void iwlagn_txq_inval_byte_cnt_tbl(struct iwl_trans *trans,
                         tfd_offset[TFD_QUEUE_SIZE_MAX + read_ptr] = bc_ent;
 }
 
-static int iwlagn_tx_queue_set_q2ratid(struct iwl_trans *trans, u16 ra_tid,
-                                        u16 txq_id)
+static int iwl_txq_set_ratid_map(struct iwl_trans *trans, u16 ra_tid,
+                                 u16 txq_id)
 {
+        struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
         u32 tbl_dw_addr;
         u32 tbl_dw;
         u16 scd_q2ratid;
 
-        struct iwl_trans_pcie *trans_pcie =
-                IWL_TRANS_GET_PCIE_TRANS(trans);
-
         scd_q2ratid = ra_tid & SCD_QUEUE_RA_TID_MAP_RATID_MSK;
 
         tbl_dw_addr = trans_pcie->scd_base_addr +
@@ -409,7 +405,7 @@ static int iwlagn_tx_queue_set_q2ratid(struct iwl_trans *trans, u16 ra_tid,
         return 0;
 }
 
-static void iwlagn_tx_queue_stop_scheduler(struct iwl_trans *trans, u16 txq_id)
+static inline void iwl_txq_set_inactive(struct iwl_trans *trans, u16 txq_id)
 {
         /* Simply stop the queue, but don't change any configuration;
          * the SCD_ACT_EN bit is the write-enable mask for the ACTIVE bit. */
@@ -419,102 +415,87 @@ static void iwlagn_tx_queue_stop_scheduler(struct iwl_trans *trans, u16 txq_id)
                 (1 << SCD_QUEUE_STTS_REG_POS_SCD_ACT_EN));
 }
 
-void iwl_trans_set_wr_ptrs(struct iwl_trans *trans,
-                                int txq_id, u32 index)
-{
-        IWL_DEBUG_TX_QUEUES(trans, "Q %d  WrPtr: %d\n", txq_id, index & 0xff);
-        iwl_write_direct32(trans, HBUS_TARG_WRPTR,
-                        (index & 0xff) | (txq_id << 8));
-        iwl_write_prph(trans, SCD_QUEUE_RDPTR(txq_id), index);
-}
-
-void iwl_trans_tx_queue_set_status(struct iwl_trans *trans,
-                                   struct iwl_tx_queue *txq,
-                                   int tx_fifo_id, bool active)
-{
-        int txq_id = txq->q.id;
-
-        iwl_write_prph(trans, SCD_QUEUE_STATUS_BITS(txq_id),
-                        (active << SCD_QUEUE_STTS_REG_POS_ACTIVE) |
-                        (tx_fifo_id << SCD_QUEUE_STTS_REG_POS_TXF) |
-                        (1 << SCD_QUEUE_STTS_REG_POS_WSL) |
-                        SCD_QUEUE_STTS_REG_MSK);
-
-        if (active)
-                IWL_DEBUG_TX_QUEUES(trans, "Activate queue %d on FIFO %d\n",
-                                    txq_id, tx_fifo_id);
-        else
-                IWL_DEBUG_TX_QUEUES(trans, "Deactivate queue %d\n", txq_id);
-}
-
-void iwl_trans_pcie_tx_agg_setup(struct iwl_trans *trans, int txq_id, int fifo,
-                                 int sta_id, int tid, int frame_limit, u16 ssn)
+void iwl_trans_pcie_txq_enable(struct iwl_trans *trans, int txq_id, int fifo,
+                               int sta_id, int tid, int frame_limit, u16 ssn)
 {
         struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
-        unsigned long flags;
-        u16 ra_tid = BUILD_RAxTID(sta_id, tid);
 
         if (test_and_set_bit(txq_id, trans_pcie->queue_used))
                 WARN_ONCE(1, "queue %d already used - expect issues", txq_id);
 
-        spin_lock_irqsave(&trans_pcie->irq_lock, flags);
-
         /* Stop this Tx queue before configuring it */
-        iwlagn_tx_queue_stop_scheduler(trans, txq_id);
+        iwl_txq_set_inactive(trans, txq_id);
 
-        /* Map receiver-address / traffic-ID to this queue */
-        iwlagn_tx_queue_set_q2ratid(trans, ra_tid, txq_id);
+        /* Set this queue as a chain-building queue unless it is CMD queue */
+        if (txq_id != trans_pcie->cmd_queue)
+                iwl_set_bits_prph(trans, SCD_QUEUECHAIN_SEL, BIT(txq_id));
 
-        /* Set this queue as a chain-building queue */
-        iwl_set_bits_prph(trans, SCD_QUEUECHAIN_SEL, BIT(txq_id));
+        /* If this queue is mapped to a certain station: it is an AGG queue */
+        if (sta_id != IWL_INVALID_STATION) {
+                u16 ra_tid = BUILD_RAxTID(sta_id, tid);
 
-        /* enable aggregations for the queue */
-        iwl_set_bits_prph(trans, SCD_AGGR_SEL, BIT(txq_id));
+                /* Map receiver-address / traffic-ID to this queue */
+                iwl_txq_set_ratid_map(trans, ra_tid, txq_id);
+
+                /* enable aggregations for the queue */
+                iwl_set_bits_prph(trans, SCD_AGGR_SEL, BIT(txq_id));
+        } else {
+                /*
+                 * disable aggregations for the queue, this will also make the
+                 * ra_tid mapping configuration irrelevant since it is now a
+                 * non-AGG queue.
+                 */
+                iwl_clear_bits_prph(trans, SCD_AGGR_SEL, BIT(txq_id));
+        }
 
         /* Place first TFD at index corresponding to start sequence number.
          * Assumes that ssn_idx is valid (!= 0xFFF) */
         trans_pcie->txq[txq_id].q.read_ptr = (ssn & 0xff);
         trans_pcie->txq[txq_id].q.write_ptr = (ssn & 0xff);
-        iwl_trans_set_wr_ptrs(trans, txq_id, ssn);
+
+        iwl_write_direct32(trans, HBUS_TARG_WRPTR,
+                           (ssn & 0xff) | (txq_id << 8));
+        iwl_write_prph(trans, SCD_QUEUE_RDPTR(txq_id), ssn);
 
         /* Set up Tx window size and frame limit for this queue */
         iwl_write_targ_mem(trans, trans_pcie->scd_base_addr +
+                        SCD_CONTEXT_QUEUE_OFFSET(txq_id), 0);
+        iwl_write_targ_mem(trans, trans_pcie->scd_base_addr +
                         SCD_CONTEXT_QUEUE_OFFSET(txq_id) + sizeof(u32),
                         ((frame_limit << SCD_QUEUE_CTX_REG2_WIN_SIZE_POS) &
                                 SCD_QUEUE_CTX_REG2_WIN_SIZE_MSK) |
                         ((frame_limit << SCD_QUEUE_CTX_REG2_FRAME_LIMIT_POS) &
                                 SCD_QUEUE_CTX_REG2_FRAME_LIMIT_MSK));
 
-        iwl_set_bits_prph(trans, SCD_INTERRUPT_MASK, (1 << txq_id));
-
         /* Set up Status area in SRAM, map to Tx DMA/FIFO, activate the queue */
-        iwl_trans_tx_queue_set_status(trans, &trans_pcie->txq[txq_id],
-                                      fifo, true);
-
-        spin_unlock_irqrestore(&trans_pcie->irq_lock, flags);
+        iwl_write_prph(trans, SCD_QUEUE_STATUS_BITS(txq_id),
+                       (1 << SCD_QUEUE_STTS_REG_POS_ACTIVE) |
+                       (fifo << SCD_QUEUE_STTS_REG_POS_TXF) |
+                       (1 << SCD_QUEUE_STTS_REG_POS_WSL) |
+                       SCD_QUEUE_STTS_REG_MSK);
+        IWL_DEBUG_TX_QUEUES(trans, "Activate queue %d on FIFO %d WrPtr: %d\n",
+                            txq_id, fifo, ssn & 0xff);
 }
 
-void iwl_trans_pcie_tx_agg_disable(struct iwl_trans *trans, int txq_id)
+void iwl_trans_pcie_txq_disable(struct iwl_trans *trans, int txq_id)
 {
         struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
+        u16 rd_ptr, wr_ptr;
+        int n_bd = trans_pcie->txq[txq_id].q.n_bd;
 
         if (!test_and_clear_bit(txq_id, trans_pcie->queue_used)) {
                 WARN_ONCE(1, "queue %d not used", txq_id);
                 return;
         }
 
-        iwlagn_tx_queue_stop_scheduler(trans, txq_id);
-
-        iwl_clear_bits_prph(trans, SCD_AGGR_SEL, BIT(txq_id));
+        rd_ptr = iwl_read_prph(trans, SCD_QUEUE_RDPTR(txq_id)) & (n_bd - 1);
+        wr_ptr = iwl_read_prph(trans, SCD_QUEUE_WRPTR(txq_id));
 
-        trans_pcie->txq[txq_id].q.read_ptr = 0;
-        trans_pcie->txq[txq_id].q.write_ptr = 0;
-        iwl_trans_set_wr_ptrs(trans, txq_id, 0);
+        WARN_ONCE(rd_ptr != wr_ptr, "queue %d isn't empty: [%d,%d]",
+                  txq_id, rd_ptr, wr_ptr);
 
-        iwl_clear_bits_prph(trans, SCD_INTERRUPT_MASK, BIT(txq_id));
-
-        iwl_trans_tx_queue_set_status(trans, &trans_pcie->txq[txq_id],
-                                      0, false);
+        iwl_txq_set_inactive(trans, txq_id);
+        IWL_DEBUG_TX_QUEUES(trans, "Deactivate queue %d\n", txq_id);
 }
 
 /*************** HOST COMMAND QUEUE FUNCTIONS   *****/
@@ -615,13 +596,13 @@ static int iwl_enqueue_hcmd(struct iwl_trans *trans, struct iwl_host_cmd *cmd)
         }
 
         IWL_DEBUG_HC(trans,
-                "Sending command %s (#%x), seq: 0x%04X, %d bytes at %d[%d]:%d\n",
-                trans_pcie_get_cmd_string(trans_pcie, out_cmd->hdr.cmd),
-                out_cmd->hdr.cmd, le16_to_cpu(out_cmd->hdr.sequence), cmd_size,
-                q->write_ptr, idx, trans_pcie->cmd_queue);
+                     "Sending command %s (#%x), seq: 0x%04X, %d bytes at %d[%d]:%d\n",
+                     trans_pcie_get_cmd_string(trans_pcie, out_cmd->hdr.cmd),
+                     out_cmd->hdr.cmd, le16_to_cpu(out_cmd->hdr.sequence),
+                     cmd_size, q->write_ptr, idx, trans_pcie->cmd_queue);
 
         phys_addr = dma_map_single(trans->dev, &out_cmd->hdr, copy_size,
-                                DMA_BIDIRECTIONAL);
+                                   DMA_BIDIRECTIONAL);
         if (unlikely(dma_mapping_error(trans->dev, phys_addr))) {
                 idx = -ENOMEM;
                 goto out;
@@ -630,8 +611,7 @@ static int iwl_enqueue_hcmd(struct iwl_trans *trans, struct iwl_host_cmd *cmd)
         dma_unmap_addr_set(out_meta, mapping, phys_addr);
         dma_unmap_len_set(out_meta, len, copy_size);
 
-        iwlagn_txq_attach_buf_to_tfd(trans, txq,
-                                        phys_addr, copy_size, 1);
+        iwlagn_txq_attach_buf_to_tfd(trans, txq, phys_addr, copy_size, 1);
 #ifdef CONFIG_IWLWIFI_DEVICE_TRACING
         trace_bufs[0] = &out_cmd->hdr;
         trace_lens[0] = copy_size;
@@ -643,13 +623,12 @@ static int iwl_enqueue_hcmd(struct iwl_trans *trans, struct iwl_host_cmd *cmd)
                         continue;
                 if (!(cmd->dataflags[i] & IWL_HCMD_DFL_NOCOPY))
                         continue;
-                phys_addr = dma_map_single(trans->dev,
-                                           (void *)cmd->data[i],
+                phys_addr = dma_map_single(trans->dev, (void *)cmd->data[i],
                                            cmd->len[i], DMA_BIDIRECTIONAL);
                 if (dma_mapping_error(trans->dev, phys_addr)) {
-                        iwlagn_unmap_tfd(trans, out_meta,
-                                         &txq->tfds[q->write_ptr],
-                                         DMA_BIDIRECTIONAL);
+                        iwl_unmap_tfd(trans, out_meta,
+                                      &txq->tfds[q->write_ptr],
+                                      DMA_BIDIRECTIONAL);
                         idx = -ENOMEM;
                         goto out;
                 }
@@ -723,9 +702,10 @@ static void iwl_hcmd_queue_reclaim(struct iwl_trans *trans, int txq_id,
         lockdep_assert_held(&txq->lock);
 
         if ((idx >= q->n_bd) || (iwl_queue_used(q, idx) == 0)) {
-                IWL_ERR(trans, "%s: Read index for DMA queue txq id (%d), "
-                          "index %d is out of range [0-%d] %d %d.\n", __func__,
-                          txq_id, idx, q->n_bd, q->write_ptr, q->read_ptr);
+                IWL_ERR(trans,
+                        "%s: Read index for DMA queue txq id (%d), index %d is out of range [0-%d] %d %d.\n",
+                        __func__, txq_id, idx, q->n_bd,
+                        q->write_ptr, q->read_ptr);
                 return;
         }
 
@@ -733,8 +713,8 @@ static void iwl_hcmd_queue_reclaim(struct iwl_trans *trans, int txq_id,
              q->read_ptr = iwl_queue_inc_wrap(q->read_ptr, q->n_bd)) {
 
                 if (nfreed++ > 0) {
-                        IWL_ERR(trans, "HCMD skipped: index (%d) %d %d\n", idx,
-                                        q->write_ptr, q->read_ptr);
+                        IWL_ERR(trans, "HCMD skipped: index (%d) %d %d\n",
+                                idx, q->write_ptr, q->read_ptr);
                         iwl_op_mode_nic_error(trans->op_mode);
                 }
 
@@ -771,9 +751,9 @@ void iwl_tx_cmd_complete(struct iwl_trans *trans, struct iwl_rx_cmd_buffer *rxb,
          * in the queue management code. */
         if (WARN(txq_id != trans_pcie->cmd_queue,
                  "wrong command queue %d (should be %d), sequence 0x%X readp=%d writep=%d\n",
-                  txq_id, trans_pcie->cmd_queue, sequence,
-                  trans_pcie->txq[trans_pcie->cmd_queue].q.read_ptr,
-                  trans_pcie->txq[trans_pcie->cmd_queue].q.write_ptr)) {
+                 txq_id, trans_pcie->cmd_queue, sequence,
+                 trans_pcie->txq[trans_pcie->cmd_queue].q.read_ptr,
+                 trans_pcie->txq[trans_pcie->cmd_queue].q.write_ptr)) {
                 iwl_print_hex_error(trans, pkt, 32);
                 return;
         }
@@ -784,8 +764,7 @@ void iwl_tx_cmd_complete(struct iwl_trans *trans, struct iwl_rx_cmd_buffer *rxb,
         cmd = txq->entries[cmd_index].cmd;
         meta = &txq->entries[cmd_index].meta;
 
-        iwlagn_unmap_tfd(trans, meta, &txq->tfds[index],
-                         DMA_BIDIRECTIONAL);
+        iwl_unmap_tfd(trans, meta, &txq->tfds[index], DMA_BIDIRECTIONAL);
 
         /* Input error checking is done when commands are added to queue. */
         if (meta->flags & CMD_WANT_SKB) {
@@ -870,8 +849,9 @@ static int iwl_send_cmd_sync(struct iwl_trans *trans, struct iwl_host_cmd *cmd)
         }
 
         ret = wait_event_timeout(trans->wait_command_queue,
-                        !test_bit(STATUS_HCMD_ACTIVE, &trans_pcie->status),
-                        HOST_COMPLETE_TIMEOUT);
+                                 !test_bit(STATUS_HCMD_ACTIVE,
+                                           &trans_pcie->status),
+                                 HOST_COMPLETE_TIMEOUT);
         if (!ret) {
                 if (test_bit(STATUS_HCMD_ACTIVE, &trans_pcie->status)) {
                         struct iwl_tx_queue *txq =
@@ -956,10 +936,10 @@ int iwl_tx_queue_reclaim(struct iwl_trans *trans, int txq_id, int index,
 
         if ((index >= q->n_bd) ||
            (iwl_queue_used(q, last_to_free) == 0)) {
-                IWL_ERR(trans, "%s: Read index for DMA queue txq id (%d), "
-                          "last_to_free %d is out of range [0-%d] %d %d.\n",
-                          __func__, txq_id, last_to_free, q->n_bd,
-                          q->write_ptr, q->read_ptr);
+                IWL_ERR(trans,
+                        "%s: Read index for DMA queue txq id (%d), last_to_free %d is out of range [0-%d] %d %d.\n",
+                        __func__, txq_id, last_to_free, q->n_bd,
+                        q->write_ptr, q->read_ptr);
                 return 0;
         }
 
@@ -979,7 +959,7 @@ int iwl_tx_queue_reclaim(struct iwl_trans *trans, int txq_id, int index,
 
                 iwlagn_txq_inval_byte_cnt_tbl(trans, txq);
 
-                iwlagn_txq_free_tfd(trans, txq, DMA_TO_DEVICE);
+                iwl_txq_free_tfd(trans, txq, DMA_TO_DEVICE);
                 freed++;
         }
 
diff --git a/drivers/net/wireless/libertas/cfg.c b/drivers/net/wireless/libertas/cfg.c
index 2fa879b015b..f4a203049fb 100644
--- a/drivers/net/wireless/libertas/cfg.c
+++ b/drivers/net/wireless/libertas/cfg.c
@@ -435,24 +435,40 @@ static int lbs_add_wpa_tlv(u8 *tlv, const u8 *ie, u8 ie_len)
  * Set Channel
  */
 
-static int lbs_cfg_set_channel(struct wiphy *wiphy,
-        struct net_device *netdev,
-        struct ieee80211_channel *channel,
-        enum nl80211_channel_type channel_type)
+static int lbs_cfg_set_monitor_channel(struct wiphy *wiphy,
+                                       struct ieee80211_channel *channel,
+                                       enum nl80211_channel_type channel_type)
 {
         struct lbs_private *priv = wiphy_priv(wiphy);
         int ret = -ENOTSUPP;
 
-        lbs_deb_enter_args(LBS_DEB_CFG80211, "iface %s freq %d, type %d",
-                           netdev_name(netdev), channel->center_freq, channel_type);
+        lbs_deb_enter_args(LBS_DEB_CFG80211, "freq %d, type %d",
+                           channel->center_freq, channel_type);
 
         if (channel_type != NL80211_CHAN_NO_HT)
                 goto out;
 
-        if (netdev == priv->mesh_dev)
-                ret = lbs_mesh_set_channel(priv, channel->hw_value);
-        else
-                ret = lbs_set_channel(priv, channel->hw_value);
+        ret = lbs_set_channel(priv, channel->hw_value);
+
+ out:
+        lbs_deb_leave_args(LBS_DEB_CFG80211, "ret %d", ret);
+        return ret;
+}
+
+static int lbs_cfg_set_mesh_channel(struct wiphy *wiphy,
+                                    struct net_device *netdev,
+                                    struct ieee80211_channel *channel)
+{
+        struct lbs_private *priv = wiphy_priv(wiphy);
+        int ret = -ENOTSUPP;
+
+        lbs_deb_enter_args(LBS_DEB_CFG80211, "iface %s freq %d",
+                           netdev_name(netdev), channel->center_freq);
+
+        if (netdev != priv->mesh_dev)
+                goto out;
+
+        ret = lbs_mesh_set_channel(priv, channel->hw_value);
 
  out:
         lbs_deb_leave_args(LBS_DEB_CFG80211, "ret %d", ret);
@@ -2029,7 +2045,8 @@ static int lbs_leave_ibss(struct wiphy *wiphy, struct net_device *dev)
  */
 
 static struct cfg80211_ops lbs_cfg80211_ops = {
-        .set_channel = lbs_cfg_set_channel,
+        .set_monitor_channel = lbs_cfg_set_monitor_channel,
+        .libertas_set_mesh_channel = lbs_cfg_set_mesh_channel,
         .scan = lbs_cfg_scan,
         .connect = lbs_cfg_connect,
         .disconnect = lbs_cfg_disconnect,
diff --git a/drivers/net/wireless/libertas/debugfs.c b/drivers/net/wireless/libertas/debugfs.c
index a06cc283e23..668dd27616a 100644
--- a/drivers/net/wireless/libertas/debugfs.c
+++ b/drivers/net/wireless/libertas/debugfs.c
@@ -483,7 +483,7 @@ static ssize_t lbs_rdmac_write(struct file *file,
                 res = -EFAULT;
                 goto out_unlock;
         }
-        priv->mac_offset = simple_strtoul((char *)buf, NULL, 16);
+        priv->mac_offset = simple_strtoul(buf, NULL, 16);
         res = count;
 out_unlock:
         free_page(addr);
@@ -565,7 +565,7 @@ static ssize_t lbs_rdbbp_write(struct file *file,
                 res = -EFAULT;
                 goto out_unlock;
         }
-        priv->bbp_offset = simple_strtoul((char *)buf, NULL, 16);
+        priv->bbp_offset = simple_strtoul(buf, NULL, 16);
         res = count;
 out_unlock:
         free_page(addr);
diff --git a/drivers/net/wireless/libertas/dev.h b/drivers/net/wireless/libertas/dev.h
index 672005430ac..60996ce89f7 100644
--- a/drivers/net/wireless/libertas/dev.h
+++ b/drivers/net/wireless/libertas/dev.h
@@ -58,6 +58,7 @@ struct lbs_private {
         uint16_t mesh_tlv;
         u8 mesh_ssid[IEEE80211_MAX_SSID_LEN + 1];
         u8 mesh_ssid_len;
+        u8 mesh_channel;
 #endif
 
         /* Debugfs */
diff --git a/drivers/net/wireless/libertas/if_usb.c b/drivers/net/wireless/libertas/if_usb.c
index cd3b0d40061..64b7dc5de12 100644
--- a/drivers/net/wireless/libertas/if_usb.c
+++ b/drivers/net/wireless/libertas/if_usb.c
@@ -302,7 +302,7 @@ error:
 static void if_usb_disconnect(struct usb_interface *intf)
 {
         struct if_usb_card *cardp = usb_get_intfdata(intf);
-        struct lbs_private *priv = (struct lbs_private *) cardp->priv;
+        struct lbs_private *priv = cardp->priv;
 
         lbs_deb_enter(LBS_DEB_MAIN);
 
diff --git a/drivers/net/wireless/libertas/mesh.c b/drivers/net/wireless/libertas/mesh.c
index e87c031b298..97807751ebc 100644
--- a/drivers/net/wireless/libertas/mesh.c
+++ b/drivers/net/wireless/libertas/mesh.c
@@ -131,16 +131,13 @@ static int lbs_mesh_config(struct lbs_private *priv, uint16_t action,
 
 int lbs_mesh_set_channel(struct lbs_private *priv, u8 channel)
 {
+        priv->mesh_channel = channel;
         return lbs_mesh_config(priv, CMD_ACT_MESH_CONFIG_START, channel);
 }
 
 static uint16_t lbs_mesh_get_channel(struct lbs_private *priv)
 {
-        struct wireless_dev *mesh_wdev = priv->mesh_dev->ieee80211_ptr;
-        if (mesh_wdev->channel)
-                return mesh_wdev->channel->hw_value;
-        else
-                return 1;
+        return priv->mesh_channel ?: 1;
 }
 
 /***************************************************************************
diff --git a/drivers/net/wireless/libertas_tf/if_usb.c b/drivers/net/wireless/libertas_tf/if_usb.c
index 19a5a92dd77..d576dd6665d 100644
--- a/drivers/net/wireless/libertas_tf/if_usb.c
+++ b/drivers/net/wireless/libertas_tf/if_usb.c
@@ -253,7 +253,7 @@ lbtf_deb_leave(LBTF_DEB_MAIN);
 static void if_usb_disconnect(struct usb_interface *intf)
 {
         struct if_usb_card *cardp = usb_get_intfdata(intf);
-        struct lbtf_private *priv = (struct lbtf_private *) cardp->priv;
+        struct lbtf_private *priv = cardp->priv;
 
         lbtf_deb_enter(LBTF_DEB_MAIN);
 
diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c
index a0b7cfd3468..f578d0b2172 100644
--- a/drivers/net/wireless/mac80211_hwsim.c
+++ b/drivers/net/wireless/mac80211_hwsim.c
@@ -571,7 +571,7 @@ static void mac80211_hwsim_tx_frame_nl(struct ieee80211_hw *hw,
                         skb_dequeue(&data->pending);
         }
 
-        skb = genlmsg_new(NLMSG_GOODSIZE, GFP_ATOMIC);
+        skb = genlmsg_new(GENLMSG_DEFAULT_SIZE, GFP_ATOMIC);
         if (skb == NULL)
                 goto nla_put_failure;
 
@@ -678,8 +678,7 @@ static bool mac80211_hwsim_tx_frame_no_nl(struct ieee80211_hw *hw,
                         continue;
 
                 if (data2->idle || !data2->started ||
-                    !hwsim_ps_rx_ok(data2, skb) ||
-                    !data->channel || !data2->channel ||
+                    !hwsim_ps_rx_ok(data2, skb) || !data2->channel ||
                     data->channel->center_freq != data2->channel->center_freq ||
                     !(data->group & data2->group))
                         continue;
@@ -1486,7 +1485,7 @@ static int hwsim_tx_info_frame_received_nl(struct sk_buff *skb_2,
         struct mac80211_hwsim_data *data2;
         struct ieee80211_tx_info *txi;
         struct hwsim_tx_rate *tx_attempts;
-        struct sk_buff __user *ret_skb;
+        unsigned long ret_skb_ptr;
         struct sk_buff *skb, *tmp;
         struct mac_address *src;
         unsigned int hwsim_flags;
@@ -1504,8 +1503,7 @@ static int hwsim_tx_info_frame_received_nl(struct sk_buff *skb_2,
                                    info->attrs[HWSIM_ATTR_ADDR_TRANSMITTER]);
         hwsim_flags = nla_get_u32(info->attrs[HWSIM_ATTR_FLAGS]);
 
-        ret_skb = (struct sk_buff __user *)
-                  (unsigned long) nla_get_u64(info->attrs[HWSIM_ATTR_COOKIE]);
+        ret_skb_ptr = nla_get_u64(info->attrs[HWSIM_ATTR_COOKIE]);
 
         data2 = get_hwsim_data_ref_from_addr(src);
 
@@ -1514,7 +1512,7 @@ static int hwsim_tx_info_frame_received_nl(struct sk_buff *skb_2,
 
         /* look for the skb matching the cookie passed back from user */
         skb_queue_walk_safe(&data2->pending, skb, tmp) {
-                if (skb == ret_skb) {
+                if ((unsigned long)skb == ret_skb_ptr) {
                         skb_unlink(skb, &data2->pending);
                         found = true;
                         break;
diff --git a/drivers/net/wireless/mwifiex/11n.c b/drivers/net/wireless/mwifiex/11n.c
index fe8ebfebcc0..e535c937628 100644
--- a/drivers/net/wireless/mwifiex/11n.c
+++ b/drivers/net/wireless/mwifiex/11n.c
@@ -101,8 +101,7 @@ int mwifiex_ret_11n_delba(struct mwifiex_private *priv,
 {
         int tid;
         struct mwifiex_tx_ba_stream_tbl *tx_ba_tbl;
-        struct host_cmd_ds_11n_delba *del_ba =
-                (struct host_cmd_ds_11n_delba *) &resp->params.del_ba;
+        struct host_cmd_ds_11n_delba *del_ba = &resp->params.del_ba;
         uint16_t del_ba_param_set = le16_to_cpu(del_ba->del_ba_param_set);
 
         tid = del_ba_param_set >> DELBA_TID_POS;
@@ -147,8 +146,7 @@ int mwifiex_ret_11n_addba_req(struct mwifiex_private *priv,
                               struct host_cmd_ds_command *resp)
 {
         int tid;
-        struct host_cmd_ds_11n_addba_rsp *add_ba_rsp =
-                (struct host_cmd_ds_11n_addba_rsp *) &resp->params.add_ba_rsp;
+        struct host_cmd_ds_11n_addba_rsp *add_ba_rsp = &resp->params.add_ba_rsp;
         struct mwifiex_tx_ba_stream_tbl *tx_ba_tbl;
 
         add_ba_rsp->ssn = cpu_to_le16((le16_to_cpu(add_ba_rsp->ssn))
@@ -412,7 +410,7 @@ mwifiex_cmd_append_11n_tlv(struct mwifiex_private *priv,
 
                 memcpy((u8 *) bss_co_2040 +
                        sizeof(struct mwifiex_ie_types_header),
-                       (u8 *) bss_desc->bcn_bss_co_2040 +
+                       bss_desc->bcn_bss_co_2040 +
                        sizeof(struct ieee_types_header),
                        le16_to_cpu(bss_co_2040->header.len));
 
@@ -426,10 +424,8 @@ mwifiex_cmd_append_11n_tlv(struct mwifiex_private *priv,
                 ext_cap->header.type = cpu_to_le16(WLAN_EID_EXT_CAPABILITY);
                 ext_cap->header.len = cpu_to_le16(sizeof(ext_cap->ext_cap));
 
-                memcpy((u8 *) ext_cap +
-                       sizeof(struct mwifiex_ie_types_header),
-                       (u8 *) bss_desc->bcn_ext_cap +
-                       sizeof(struct ieee_types_header),
+                memcpy((u8 *)ext_cap + sizeof(struct mwifiex_ie_types_header),
+                       bss_desc->bcn_ext_cap + sizeof(struct ieee_types_header),
                        le16_to_cpu(ext_cap->header.len));
 
                 *buffer += sizeof(struct mwifiex_ie_types_extcap);
diff --git a/drivers/net/wireless/mwifiex/11n.h b/drivers/net/wireless/mwifiex/11n.h
index 77646d777dc..28366e9211f 100644
--- a/drivers/net/wireless/mwifiex/11n.h
+++ b/drivers/net/wireless/mwifiex/11n.h
@@ -105,8 +105,7 @@ static inline u8 mwifiex_space_avail_for_new_ba_stream(
                 priv = adapter->priv[i];
                 if (priv)
                         ba_stream_num += mwifiex_wmm_list_len(
-                                                (struct list_head *)
-                                                &priv->tx_ba_stream_tbl_ptr);
+                                &priv->tx_ba_stream_tbl_ptr);
         }
 
         return ((ba_stream_num <
diff --git a/drivers/net/wireless/mwifiex/11n_rxreorder.c b/drivers/net/wireless/mwifiex/11n_rxreorder.c
index 900ee129e82..591ccd33f83 100644
--- a/drivers/net/wireless/mwifiex/11n_rxreorder.c
+++ b/drivers/net/wireless/mwifiex/11n_rxreorder.c
@@ -297,9 +297,7 @@ mwifiex_11n_create_rx_reorder_tbl(struct mwifiex_private *priv, u8 *ta,
  */
 int mwifiex_cmd_11n_addba_req(struct host_cmd_ds_command *cmd, void *data_buf)
 {
-        struct host_cmd_ds_11n_addba_req *add_ba_req =
-                (struct host_cmd_ds_11n_addba_req *)
-                &cmd->params.add_ba_req;
+        struct host_cmd_ds_11n_addba_req *add_ba_req = &cmd->params.add_ba_req;
 
         cmd->command = cpu_to_le16(HostCmd_CMD_11N_ADDBA_REQ);
         cmd->size = cpu_to_le16(sizeof(*add_ba_req) + S_DS_GEN);
@@ -321,9 +319,7 @@ int mwifiex_cmd_11n_addba_rsp_gen(struct mwifiex_private *priv,
                                   struct host_cmd_ds_11n_addba_req
                                   *cmd_addba_req)
 {
-        struct host_cmd_ds_11n_addba_rsp *add_ba_rsp =
-                (struct host_cmd_ds_11n_addba_rsp *)
-                &cmd->params.add_ba_rsp;
+        struct host_cmd_ds_11n_addba_rsp *add_ba_rsp = &cmd->params.add_ba_rsp;
         u8 tid;
         int win_size;
         uint16_t block_ack_param_set;
@@ -368,8 +364,7 @@ int mwifiex_cmd_11n_addba_rsp_gen(struct mwifiex_private *priv,
  */
 int mwifiex_cmd_11n_delba(struct host_cmd_ds_command *cmd, void *data_buf)
 {
-        struct host_cmd_ds_11n_delba *del_ba = (struct host_cmd_ds_11n_delba *)
-                &cmd->params.del_ba;
+        struct host_cmd_ds_11n_delba *del_ba = &cmd->params.del_ba;
 
         cmd->command = cpu_to_le16(HostCmd_CMD_11N_DELBA);
         cmd->size = cpu_to_le16(sizeof(*del_ba) + S_DS_GEN);
@@ -399,8 +394,7 @@ int mwifiex_11n_rx_reorder_pkt(struct mwifiex_private *priv,
         int start_win, end_win, win_size;
         u16 pkt_index;
 
-        tbl = mwifiex_11n_get_rx_reorder_tbl((struct mwifiex_private *) priv,
-                                             tid, ta);
+        tbl = mwifiex_11n_get_rx_reorder_tbl(priv, tid, ta);
         if (!tbl) {
                 if (pkt_type != PKT_TYPE_BAR)
                         mwifiex_process_rx_packet(priv->adapter, payload);
@@ -521,9 +515,7 @@ mwifiex_del_ba_tbl(struct mwifiex_private *priv, int tid, u8 *peer_mac,
 int mwifiex_ret_11n_addba_resp(struct mwifiex_private *priv,
                                struct host_cmd_ds_command *resp)
 {
-        struct host_cmd_ds_11n_addba_rsp *add_ba_rsp =
-                (struct host_cmd_ds_11n_addba_rsp *)
-                &resp->params.add_ba_rsp;
+        struct host_cmd_ds_11n_addba_rsp *add_ba_rsp = &resp->params.add_ba_rsp;
         int tid, win_size;
         struct mwifiex_rx_reorder_tbl *tbl;
         uint16_t block_ack_param_set;
diff --git a/drivers/net/wireless/mwifiex/cfg80211.c b/drivers/net/wireless/mwifiex/cfg80211.c
index 5c7fd185373..3af88b8cfcb 100644
--- a/drivers/net/wireless/mwifiex/cfg80211.c
+++ b/drivers/net/wireless/mwifiex/cfg80211.c
@@ -170,7 +170,9 @@ mwifiex_cfg80211_set_default_key(struct wiphy *wiphy, struct net_device *netdev,
         if (!priv->sec_info.wep_enabled)
                 return 0;
 
-        if (mwifiex_set_encode(priv, NULL, 0, key_index, NULL, 0)) {
+        if (priv->bss_type == MWIFIEX_BSS_TYPE_UAP) {
+                priv->wep_key_curr_index = key_index;
+        } else if (mwifiex_set_encode(priv, NULL, 0, key_index, NULL, 0)) {
                 wiphy_err(wiphy, "set default Tx key index\n");
                 return -EFAULT;
         }
@@ -187,9 +189,25 @@ mwifiex_cfg80211_add_key(struct wiphy *wiphy, struct net_device *netdev,
                          struct key_params *params)
 {
         struct mwifiex_private *priv = mwifiex_netdev_get_priv(netdev);
+        struct mwifiex_wep_key *wep_key;
         const u8 bc_mac[] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
         const u8 *peer_mac = pairwise ? mac_addr : bc_mac;
 
+        if (GET_BSS_ROLE(priv) == MWIFIEX_BSS_ROLE_UAP &&
+            (params->cipher == WLAN_CIPHER_SUITE_WEP40 ||
+             params->cipher == WLAN_CIPHER_SUITE_WEP104)) {
+                if (params->key && params->key_len) {
+                        wep_key = &priv->wep_key[key_index];
+                        memset(wep_key, 0, sizeof(struct mwifiex_wep_key));
+                        memcpy(wep_key->key_material, params->key,
+                               params->key_len);
+                        wep_key->key_index = key_index;
+                        wep_key->key_length = params->key_len;
+                        priv->sec_info.wep_enabled = 1;
+                }
+                return 0;
+        }
+
         if (mwifiex_set_encode(priv, params->key, params->key_len,
                                key_index, peer_mac, 0)) {
                 wiphy_err(wiphy, "crypto keys added\n");
@@ -242,13 +260,13 @@ static int mwifiex_send_domain_info_cmd_fw(struct wiphy *wiphy)
                         flag = 1;
                         first_chan = (u32) ch->hw_value;
                         next_chan = first_chan;
-                        max_pwr = ch->max_power;
+                        max_pwr = ch->max_reg_power;
                         no_of_parsed_chan = 1;
                         continue;
                 }
 
                 if (ch->hw_value == next_chan + 1 &&
-                    ch->max_power == max_pwr) {
+                    ch->max_reg_power == max_pwr) {
                         next_chan++;
                         no_of_parsed_chan++;
                 } else {
@@ -259,7 +277,7 @@ static int mwifiex_send_domain_info_cmd_fw(struct wiphy *wiphy)
                         no_of_triplet++;
                         first_chan = (u32) ch->hw_value;
                         next_chan = first_chan;
-                        max_pwr = ch->max_power;
+                        max_pwr = ch->max_reg_power;
                         no_of_parsed_chan = 1;
                 }
         }
@@ -384,13 +402,13 @@ mwifiex_set_rf_channel(struct mwifiex_private *priv,
         cfp.freq = chan->center_freq;
         cfp.channel = ieee80211_frequency_to_channel(chan->center_freq);
 
-        if (mwifiex_bss_set_channel(priv, &cfp))
-                return -EFAULT;
-
-        if (priv->bss_type == MWIFIEX_BSS_TYPE_STA)
+        if (priv->bss_type == MWIFIEX_BSS_TYPE_STA) {
+                if (mwifiex_bss_set_channel(priv, &cfp))
+                        return -EFAULT;
                 return mwifiex_drv_change_adhoc_chan(priv, cfp.channel);
-        else
-                return mwifiex_uap_set_channel(priv, cfp.channel);
+        }
+
+        return 0;
 }
 
 /*
@@ -962,12 +980,25 @@ static int mwifiex_cfg80211_start_ap(struct wiphy *wiphy,
                 return -EINVAL;
         }
 
+        bss_cfg->channel =
+            (u8)ieee80211_frequency_to_channel(params->channel->center_freq);
+        bss_cfg->band_cfg = BAND_CONFIG_MANUAL;
+
+        if (mwifiex_set_rf_channel(priv, params->channel,
+                                   params->channel_type)) {
+                kfree(bss_cfg);
+                wiphy_err(wiphy, "Failed to set band config information!\n");
+                return -1;
+        }
+
         if (mwifiex_set_secure_params(priv, bss_cfg, params)) {
                 kfree(bss_cfg);
                 wiphy_err(wiphy, "Failed to parse secuirty parameters!\n");
                 return -1;
         }
 
+        mwifiex_set_ht_params(priv, bss_cfg, params);
+
         if (mwifiex_send_cmd_sync(priv, HostCmd_CMD_UAP_BSS_STOP,
                                   HostCmd_ACT_GEN_SET, 0, NULL)) {
                 wiphy_err(wiphy, "Failed to stop the BSS\n");
@@ -991,6 +1022,16 @@ static int mwifiex_cfg80211_start_ap(struct wiphy *wiphy,
                 return -1;
         }
 
+        if (priv->sec_info.wep_enabled)
+                priv->curr_pkt_filter |= HostCmd_ACT_MAC_WEP_ENABLE;
+        else
+                priv->curr_pkt_filter &= ~HostCmd_ACT_MAC_WEP_ENABLE;
+
+        if (mwifiex_send_cmd_sync(priv, HostCmd_CMD_MAC_CONTROL,
+                                  HostCmd_ACT_GEN_SET, 0,
+                                  &priv->curr_pkt_filter))
+                return -1;
+
         return 0;
 }
 
@@ -1382,7 +1423,7 @@ mwifiex_cfg80211_scan(struct wiphy *wiphy, struct net_device *dev,
 
                 priv->user_scan_cfg->chan_list[i].scan_time = 0;
         }
-        if (mwifiex_set_user_scan_ioctl(priv, priv->user_scan_cfg))
+        if (mwifiex_scan_networks(priv, priv->user_scan_cfg))
                 return -EFAULT;
 
         if (request->ie && request->ie_len) {
@@ -1703,7 +1744,7 @@ int mwifiex_register_cfg80211(struct mwifiex_adapter *adapter)
 
         memcpy(wiphy->perm_addr, priv->curr_addr, ETH_ALEN);
         wiphy->signal_type = CFG80211_SIGNAL_TYPE_MBM;
-        wiphy->flags |= WIPHY_FLAG_HAVE_AP_SME | WIPHY_FLAG_CUSTOM_REGULATORY;
+        wiphy->flags |= WIPHY_FLAG_HAVE_AP_SME;
 
         /* Reserve space for mwifiex specific private data for BSS */
         wiphy->bss_priv_size = sizeof(struct mwifiex_bss_priv);
@@ -1714,7 +1755,7 @@ int mwifiex_register_cfg80211(struct mwifiex_adapter *adapter)
         wdev_priv = wiphy_priv(wiphy);
         *(unsigned long *)wdev_priv = (unsigned long)adapter;
 
-        set_wiphy_dev(wiphy, (struct device *)priv->adapter->dev);
+        set_wiphy_dev(wiphy, priv->adapter->dev);
 
         ret = wiphy_register(wiphy);
         if (ret < 0) {
diff --git a/drivers/net/wireless/mwifiex/cmdevt.c b/drivers/net/wireless/mwifiex/cmdevt.c
index 51e023ec1de..c68adec3cc8 100644
--- a/drivers/net/wireless/mwifiex/cmdevt.c
+++ b/drivers/net/wireless/mwifiex/cmdevt.c
@@ -578,6 +578,7 @@ int mwifiex_send_cmd_async(struct mwifiex_private *priv, uint16_t cmd_no,
         } else {
                 adapter->cmd_queued = cmd_node;
                 mwifiex_insert_cmd_to_pending_q(adapter, cmd_node, true);
+                queue_work(adapter->workqueue, &adapter->main_work);
         }
 
         return ret;
@@ -1102,7 +1103,8 @@ int mwifiex_ret_802_11_hs_cfg(struct mwifiex_private *priv,
                 &resp->params.opt_hs_cfg;
         uint32_t conditions = le32_to_cpu(phs_cfg->params.hs_config.conditions);
 
-        if (phs_cfg->action == cpu_to_le16(HS_ACTIVATE)) {
+        if (phs_cfg->action == cpu_to_le16(HS_ACTIVATE) &&
+            adapter->iface_type == MWIFIEX_SDIO) {
                 mwifiex_hs_activated_event(priv, true);
                 return 0;
         } else {
@@ -1114,6 +1116,9 @@ int mwifiex_ret_802_11_hs_cfg(struct mwifiex_private *priv,
         }
         if (conditions != HOST_SLEEP_CFG_CANCEL) {
                 adapter->is_hs_configured = true;
+                if (adapter->iface_type == MWIFIEX_USB ||
+                    adapter->iface_type == MWIFIEX_PCIE)
+                        mwifiex_hs_activated_event(priv, true);
         } else {
                 adapter->is_hs_configured = false;
                 if (adapter->hs_activated)
diff --git a/drivers/net/wireless/mwifiex/fw.h b/drivers/net/wireless/mwifiex/fw.h
index 561452a5c81..ffb6cdfdb79 100644
--- a/drivers/net/wireless/mwifiex/fw.h
+++ b/drivers/net/wireless/mwifiex/fw.h
@@ -124,6 +124,7 @@ enum MWIFIEX_802_11_PRIVACY_FILTER {
 #define TLV_TYPE_UAP_DTIM_PERIOD    (PROPRIETARY_TLV_BASE_ID + 45)
 #define TLV_TYPE_UAP_BCAST_SSID     (PROPRIETARY_TLV_BASE_ID + 48)
 #define TLV_TYPE_UAP_RTS_THRESHOLD  (PROPRIETARY_TLV_BASE_ID + 51)
+#define TLV_TYPE_UAP_WEP_KEY        (PROPRIETARY_TLV_BASE_ID + 59)
 #define TLV_TYPE_UAP_WPA_PASSPHRASE (PROPRIETARY_TLV_BASE_ID + 60)
 #define TLV_TYPE_UAP_ENCRY_PROTOCOL (PROPRIETARY_TLV_BASE_ID + 64)
 #define TLV_TYPE_UAP_AKMP           (PROPRIETARY_TLV_BASE_ID + 65)
@@ -162,6 +163,12 @@ enum MWIFIEX_802_11_PRIVACY_FILTER {
 
 #define ISSUPP_11NENABLED(FwCapInfo) (FwCapInfo & BIT(11))
 
+#define MWIFIEX_DEF_HT_CAP      (IEEE80211_HT_CAP_DSSSCCK40 | \
+                                 (1 << IEEE80211_HT_CAP_RX_STBC_SHIFT) | \
+                                 IEEE80211_HT_CAP_SM_PS)
+
+#define MWIFIEX_DEF_AMPDU       IEEE80211_HT_AMPDU_PARM_FACTOR
+
 /* dev_cap bitmap
  * BIT
  * 0-16         reserved
@@ -219,6 +226,7 @@ enum MWIFIEX_802_11_PRIVACY_FILTER {
 #define HostCmd_CMD_RF_REG_ACCESS                     0x001b
 #define HostCmd_CMD_PMIC_REG_ACCESS                   0x00ad
 #define HostCmd_CMD_802_11_RF_CHANNEL                 0x001d
+#define HostCmd_CMD_RF_TX_PWR                         0x001e
 #define HostCmd_CMD_802_11_DEAUTHENTICATE             0x0024
 #define HostCmd_CMD_MAC_CONTROL                       0x0028
 #define HostCmd_CMD_802_11_AD_HOC_START               0x002b
@@ -869,6 +877,13 @@ struct host_cmd_ds_txpwr_cfg {
         __le32 mode;
 } __packed;
 
+struct host_cmd_ds_rf_tx_pwr {
+        __le16 action;
+        __le16 cur_level;
+        u8 max_power;
+        u8 min_power;
+} __packed;
+
 struct mwifiex_bcn_param {
         u8 bssid[ETH_ALEN];
         u8 rssi;
@@ -1195,6 +1210,13 @@ struct host_cmd_tlv_passphrase {
         u8 passphrase[0];
 } __packed;
 
+struct host_cmd_tlv_wep_key {
+        struct host_cmd_tlv tlv;
+        u8 key_index;
+        u8 is_default;
+        u8 key[1];
+};
+
 struct host_cmd_tlv_auth_type {
         struct host_cmd_tlv tlv;
         u8 auth_type;
@@ -1347,6 +1369,7 @@ struct host_cmd_ds_command {
                 struct host_cmd_ds_tx_rate_query tx_rate;
                 struct host_cmd_ds_tx_rate_cfg tx_rate_cfg;
                 struct host_cmd_ds_txpwr_cfg txp_cfg;
+                struct host_cmd_ds_rf_tx_pwr txp;
                 struct host_cmd_ds_802_11_ps_mode_enh psmode_enh;
                 struct host_cmd_ds_802_11_hs_cfg_enh opt_hs_cfg;
                 struct host_cmd_ds_802_11_scan scan;
diff --git a/drivers/net/wireless/mwifiex/ie.c b/drivers/net/wireless/mwifiex/ie.c
index 383820a52be..8374e33f195 100644
--- a/drivers/net/wireless/mwifiex/ie.c
+++ b/drivers/net/wireless/mwifiex/ie.c
@@ -225,29 +225,46 @@ int mwifiex_set_mgmt_ies(struct mwifiex_private *priv,
                          struct cfg80211_ap_settings *params)
 {
         struct mwifiex_ie *beacon_ie = NULL, *pr_ie = NULL;
-        struct mwifiex_ie *ar_ie = NULL, *rsn_ie = NULL;
-        struct ieee_types_header *ie = NULL;
+        struct mwifiex_ie *ar_ie = NULL, *gen_ie = NULL;
+        struct ieee_types_header *rsn_ie = NULL, *wpa_ie = NULL;
         u16 beacon_idx = MWIFIEX_AUTO_IDX_MASK, pr_idx = MWIFIEX_AUTO_IDX_MASK;
         u16 ar_idx = MWIFIEX_AUTO_IDX_MASK, rsn_idx = MWIFIEX_AUTO_IDX_MASK;
-        u16 mask;
+        u16 mask, ie_len = 0;
+        const u8 *vendor_ie;
         int ret = 0;
 
         if (params->beacon.tail && params->beacon.tail_len) {
-                ie = (void *)cfg80211_find_ie(WLAN_EID_RSN, params->beacon.tail,
-                                              params->beacon.tail_len);
-                if (ie) {
-                        rsn_ie = kmalloc(sizeof(struct mwifiex_ie), GFP_KERNEL);
-                        if (!rsn_ie)
-                                return -ENOMEM;
-
-                        rsn_ie->ie_index = cpu_to_le16(rsn_idx);
-                        mask = MGMT_MASK_BEACON | MGMT_MASK_PROBE_RESP |
-                               MGMT_MASK_ASSOC_RESP;
-                        rsn_ie->mgmt_subtype_mask = cpu_to_le16(mask);
-                        rsn_ie->ie_length = cpu_to_le16(ie->len + 2);
-                        memcpy(rsn_ie->ie_buffer, ie, ie->len + 2);
-
-                        if (mwifiex_update_uap_custom_ie(priv, rsn_ie, &rsn_idx,
+                gen_ie = kzalloc(sizeof(struct mwifiex_ie), GFP_KERNEL);
+                if (!gen_ie)
+                        return -ENOMEM;
+                gen_ie->ie_index = cpu_to_le16(rsn_idx);
+                mask = MGMT_MASK_BEACON | MGMT_MASK_PROBE_RESP |
+                       MGMT_MASK_ASSOC_RESP;
+                gen_ie->mgmt_subtype_mask = cpu_to_le16(mask);
+
+                rsn_ie = (void *)cfg80211_find_ie(WLAN_EID_RSN,
+                                                  params->beacon.tail,
+                                                  params->beacon.tail_len);
+                if (rsn_ie) {
+                        memcpy(gen_ie->ie_buffer, rsn_ie, rsn_ie->len + 2);
+                        ie_len = rsn_ie->len + 2;
+                        gen_ie->ie_length = cpu_to_le16(ie_len);
+                }
+
+                vendor_ie = cfg80211_find_vendor_ie(WLAN_OUI_MICROSOFT,
+                                                    WLAN_OUI_TYPE_MICROSOFT_WPA,
+                                                    params->beacon.tail,
+                                                    params->beacon.tail_len);
+                if (vendor_ie) {
+                        wpa_ie = (struct ieee_types_header *)vendor_ie;
+                        memcpy(gen_ie->ie_buffer + ie_len,
+                               wpa_ie, wpa_ie->len + 2);
+                        ie_len += wpa_ie->len + 2;
+                        gen_ie->ie_length = cpu_to_le16(ie_len);
+                }
+
+                if (rsn_ie || wpa_ie) {
+                        if (mwifiex_update_uap_custom_ie(priv, gen_ie, &rsn_idx,
                                                          NULL, NULL,
                                                          NULL, NULL)) {
                                 ret = -1;
@@ -320,7 +337,7 @@ done:
         kfree(beacon_ie);
         kfree(pr_ie);
         kfree(ar_ie);
-        kfree(rsn_ie);
+        kfree(gen_ie);
 
         return ret;
 }
diff --git a/drivers/net/wireless/mwifiex/init.c b/drivers/net/wireless/mwifiex/init.c
index c1cb004db91..b543a4d82ff 100644
--- a/drivers/net/wireless/mwifiex/init.c
+++ b/drivers/net/wireless/mwifiex/init.c
@@ -57,6 +57,69 @@ static int mwifiex_add_bss_prio_tbl(struct mwifiex_private *priv)
         return 0;
 }
 
+static void scan_delay_timer_fn(unsigned long data)
+{
+        struct mwifiex_private *priv = (struct mwifiex_private *)data;
+        struct mwifiex_adapter *adapter = priv->adapter;
+        struct cmd_ctrl_node *cmd_node, *tmp_node;
+        unsigned long flags;
+
+        if (!mwifiex_wmm_lists_empty(adapter)) {
+                if (adapter->scan_delay_cnt == MWIFIEX_MAX_SCAN_DELAY_CNT) {
+                        /*
+                         * Abort scan operation by cancelling all pending scan
+                         * command
+                         */
+                        spin_lock_irqsave(&adapter->scan_pending_q_lock, flags);
+                        list_for_each_entry_safe(cmd_node, tmp_node,
+                                                 &adapter->scan_pending_q,
+                                                 list) {
+                                list_del(&cmd_node->list);
+                                cmd_node->wait_q_enabled = false;
+                                mwifiex_insert_cmd_to_free_q(adapter, cmd_node);
+                        }
+                        spin_unlock_irqrestore(&adapter->scan_pending_q_lock,
+                                               flags);
+
+                        spin_lock_irqsave(&adapter->mwifiex_cmd_lock, flags);
+                        adapter->scan_processing = false;
+                        spin_unlock_irqrestore(&adapter->mwifiex_cmd_lock,
+                                               flags);
+
+                        if (priv->user_scan_cfg) {
+                                dev_dbg(priv->adapter->dev,
+                                        "info: %s: scan aborted\n", __func__);
+                                cfg80211_scan_done(priv->scan_request, 1);
+                                priv->scan_request = NULL;
+                                kfree(priv->user_scan_cfg);
+                                priv->user_scan_cfg = NULL;
+                        }
+                } else {
+                        /*
+                         * Tx data queue is still not empty, delay scan
+                         * operation further by 20msec.
+                         */
+                        mod_timer(&priv->scan_delay_timer, jiffies +
+                                  msecs_to_jiffies(MWIFIEX_SCAN_DELAY_MSEC));
+                        adapter->scan_delay_cnt++;
+                }
+                queue_work(priv->adapter->workqueue, &priv->adapter->main_work);
+        } else {
+                /*
+                 * Tx data queue is empty. Get scan command from scan_pending_q
+                 * and put to cmd_pending_q to resume scan operation
+                 */
+                adapter->scan_delay_cnt = 0;
+                spin_lock_irqsave(&adapter->scan_pending_q_lock, flags);
+                cmd_node = list_first_entry(&adapter->scan_pending_q,
+                                            struct cmd_ctrl_node, list);
+                list_del(&cmd_node->list);
+                spin_unlock_irqrestore(&adapter->scan_pending_q_lock, flags);
+
+                mwifiex_insert_cmd_to_pending_q(adapter, cmd_node, true);
+        }
+}
+
 /*
  * This function initializes the private structure and sets default
  * values to the members.
@@ -136,6 +199,9 @@ static int mwifiex_init_priv(struct mwifiex_private *priv)
 
         priv->scan_block = false;
 
+        setup_timer(&priv->scan_delay_timer, scan_delay_timer_fn,
+                    (unsigned long)priv);
+
         return mwifiex_add_bss_prio_tbl(priv);
 }
 
diff --git a/drivers/net/wireless/mwifiex/ioctl.h b/drivers/net/wireless/mwifiex/ioctl.h
index e6be6ee7595..9f088fb88cb 100644
--- a/drivers/net/wireless/mwifiex/ioctl.h
+++ b/drivers/net/wireless/mwifiex/ioctl.h
@@ -21,6 +21,7 @@
 #define _MWIFIEX_IOCTL_H_
 
 #include <net/mac80211.h>
+#include <net/lib80211.h>
 
 enum {
         MWIFIEX_SCAN_TYPE_UNCHANGED = 0,
@@ -71,6 +72,13 @@ struct wpa_param {
         u8 passphrase[MWIFIEX_WPA_PASSHPHRASE_LEN];
 };
 
+struct wep_key {
+        u8 key_index;
+        u8 is_default;
+        u16 length;
+        u8 key[WLAN_KEY_LEN_WEP104];
+};
+
 #define KEY_MGMT_ON_HOST        0x03
 #define MWIFIEX_AUTH_MODE_AUTO  0xFF
 #define BAND_CONFIG_MANUAL      0x00
@@ -90,6 +98,8 @@ struct mwifiex_uap_bss_param {
         u16 key_mgmt;
         u16 key_mgmt_operation;
         struct wpa_param wpa_cfg;
+        struct wep_key wep_cfg[NUM_WEP_KEYS];
+        struct ieee80211_ht_cap ht_cap;
 };
 
 enum {
diff --git a/drivers/net/wireless/mwifiex/join.c b/drivers/net/wireless/mwifiex/join.c
index d6b4fb04011..82e63cee1e9 100644
--- a/drivers/net/wireless/mwifiex/join.c
+++ b/drivers/net/wireless/mwifiex/join.c
@@ -1349,22 +1349,16 @@ static int mwifiex_deauthenticate_infra(struct mwifiex_private *priv, u8 *mac)
 {
         u8 mac_address[ETH_ALEN];
         int ret;
-        u8 zero_mac[ETH_ALEN] = { 0, 0, 0, 0, 0, 0 };
 
-        if (mac) {
-                if (!memcmp(mac, zero_mac, sizeof(zero_mac)))
-                        memcpy((u8 *) &mac_address,
-                               (u8 *) &priv->curr_bss_params.bss_descriptor.
-                               mac_address, ETH_ALEN);
-                else
-                        memcpy((u8 *) &mac_address, (u8 *) mac, ETH_ALEN);
-        } else {
-                memcpy((u8 *) &mac_address, (u8 *) &priv->curr_bss_params.
-                       bss_descriptor.mac_address, ETH_ALEN);
-        }
+        if (!mac || is_zero_ether_addr(mac))
+                memcpy(mac_address,
+                       priv->curr_bss_params.bss_descriptor.mac_address,
+                       ETH_ALEN);
+        else
+                memcpy(mac_address, mac, ETH_ALEN);
 
         ret = mwifiex_send_cmd_sync(priv, HostCmd_CMD_802_11_DEAUTHENTICATE,
-                                    HostCmd_ACT_GEN_SET, 0, &mac_address);
+                                    HostCmd_ACT_GEN_SET, 0, mac_address);
 
         return ret;
 }
diff --git a/drivers/net/wireless/mwifiex/main.c b/drivers/net/wireless/mwifiex/main.c
index 3192855c31c..f0219efc895 100644
--- a/drivers/net/wireless/mwifiex/main.c
+++ b/drivers/net/wireless/mwifiex/main.c
@@ -190,7 +190,8 @@ process_start:
                             adapter->tx_lock_flag)
                                 break;
 
-                        if (adapter->scan_processing || adapter->data_sent ||
+                        if ((adapter->scan_processing &&
+                             !adapter->scan_delay_cnt) || adapter->data_sent ||
                             mwifiex_wmm_lists_empty(adapter)) {
                                 if (adapter->cmd_sent || adapter->curr_cmd ||
                                     (!is_command_pending(adapter)))
@@ -244,8 +245,8 @@ process_start:
                         }
                 }
 
-                if (!adapter->scan_processing && !adapter->data_sent &&
-                    !mwifiex_wmm_lists_empty(adapter)) {
+                if ((!adapter->scan_processing || adapter->scan_delay_cnt) &&
+                    !adapter->data_sent && !mwifiex_wmm_lists_empty(adapter)) {
                         mwifiex_wmm_process_tx(adapter);
                         if (adapter->hs_activated) {
                                 adapter->is_hs_configured = false;
diff --git a/drivers/net/wireless/mwifiex/main.h b/drivers/net/wireless/mwifiex/main.h
index bd3b0bf94b9..7cd95cc99a8 100644
--- a/drivers/net/wireless/mwifiex/main.h
+++ b/drivers/net/wireless/mwifiex/main.h
@@ -79,14 +79,17 @@ enum {
 
 #define SCAN_BEACON_ENTRY_PAD                   6
 
-#define MWIFIEX_PASSIVE_SCAN_CHAN_TIME  200
-#define MWIFIEX_ACTIVE_SCAN_CHAN_TIME   200
-#define MWIFIEX_SPECIFIC_SCAN_CHAN_TIME 110
+#define MWIFIEX_PASSIVE_SCAN_CHAN_TIME  110
+#define MWIFIEX_ACTIVE_SCAN_CHAN_TIME   30
+#define MWIFIEX_SPECIFIC_SCAN_CHAN_TIME 30
 
 #define SCAN_RSSI(RSSI)                                 (0x100 - ((u8)(RSSI)))
 
 #define MWIFIEX_MAX_TOTAL_SCAN_TIME     (MWIFIEX_TIMER_10S - MWIFIEX_TIMER_1S)
 
+#define MWIFIEX_MAX_SCAN_DELAY_CNT                      50
+#define MWIFIEX_SCAN_DELAY_MSEC                         20
+
 #define RSN_GTK_OUI_OFFSET                              2
 
 #define MWIFIEX_OUI_NOT_PRESENT                 0
@@ -482,6 +485,7 @@ struct mwifiex_private {
         u16 proberesp_idx;
         u16 assocresp_idx;
         u16 rsn_idx;
+        struct timer_list scan_delay_timer;
 };
 
 enum mwifiex_ba_status {
@@ -686,6 +690,7 @@ struct mwifiex_adapter {
         struct completion fw_load;
         u8 country_code[IEEE80211_COUNTRY_STRING_LEN];
         u16 max_mgmt_ie_index;
+        u8 scan_delay_cnt;
 };
 
 int mwifiex_init_lock_list(struct mwifiex_adapter *adapter);
@@ -835,6 +840,9 @@ void mwifiex_init_priv_params(struct mwifiex_private *priv,
 int mwifiex_set_secure_params(struct mwifiex_private *priv,
                               struct mwifiex_uap_bss_param *bss_config,
                               struct cfg80211_ap_settings *params);
+void mwifiex_set_ht_params(struct mwifiex_private *priv,
+                           struct mwifiex_uap_bss_param *bss_cfg,
+                           struct cfg80211_ap_settings *params);
 
 /*
  * This function checks if the queuing is RA based or not.
@@ -941,8 +949,8 @@ int mwifiex_drv_get_data_rate(struct mwifiex_private *priv,
                               struct mwifiex_rate_cfg *rate);
 int mwifiex_request_scan(struct mwifiex_private *priv,
                          struct cfg80211_ssid *req_ssid);
-int mwifiex_set_user_scan_ioctl(struct mwifiex_private *priv,
-                                struct mwifiex_user_scan_cfg *scan_req);
+int mwifiex_scan_networks(struct mwifiex_private *priv,
+                          const struct mwifiex_user_scan_cfg *user_scan_in);
 int mwifiex_set_radio(struct mwifiex_private *priv, u8 option);
 
 int mwifiex_drv_change_adhoc_chan(struct mwifiex_private *priv, u16 channel);
@@ -985,7 +993,6 @@ int mwifiex_set_tx_power(struct mwifiex_private *priv,
 
 int mwifiex_main_process(struct mwifiex_adapter *);
 
-int mwifiex_uap_set_channel(struct mwifiex_private *priv, int channel);
 int mwifiex_bss_set_channel(struct mwifiex_private *,
                             struct mwifiex_chan_freq_power *cfp);
 int mwifiex_get_bss_info(struct mwifiex_private *,
diff --git a/drivers/net/wireless/mwifiex/scan.c b/drivers/net/wireless/mwifiex/scan.c
index 74f04571572..04dc7ca4ac2 100644
--- a/drivers/net/wireless/mwifiex/scan.c
+++ b/drivers/net/wireless/mwifiex/scan.c
@@ -28,7 +28,10 @@
 /* The maximum number of channels the firmware can scan per command */
 #define MWIFIEX_MAX_CHANNELS_PER_SPECIFIC_SCAN   14
 
-#define MWIFIEX_CHANNELS_PER_SCAN_CMD            4
+#define MWIFIEX_DEF_CHANNELS_PER_SCAN_CMD       4
+#define MWIFIEX_LIMIT_1_CHANNEL_PER_SCAN_CMD    15
+#define MWIFIEX_LIMIT_2_CHANNELS_PER_SCAN_CMD   27
+#define MWIFIEX_LIMIT_3_CHANNELS_PER_SCAN_CMD   35
 
 /* Memory needed to store a max sized Channel List TLV for a firmware scan */
 #define CHAN_TLV_MAX_SIZE  (sizeof(struct mwifiex_ie_types_header)         \
@@ -471,7 +474,7 @@ mwifiex_is_network_compatible(struct mwifiex_private *priv,
  * This routine is used for any scan that is not provided with a
  * specific channel list to scan.
  */
-static void
+static int
 mwifiex_scan_create_channel_list(struct mwifiex_private *priv,
                                  const struct mwifiex_user_scan_cfg
                                                         *user_scan_in,
@@ -528,6 +531,7 @@ mwifiex_scan_create_channel_list(struct mwifiex_private *priv,
                 }
 
         }
+        return chan_idx;
 }
 
 /*
@@ -727,6 +731,7 @@ mwifiex_config_scan(struct mwifiex_private *priv,
         u32 num_probes;
         u32 ssid_len;
         u32 chan_idx;
+        u32 chan_num;
         u32 scan_type;
         u16 scan_dur;
         u8 channel;
@@ -850,7 +855,7 @@ mwifiex_config_scan(struct mwifiex_private *priv,
         if (*filtered_scan)
                 *max_chan_per_scan = MWIFIEX_MAX_CHANNELS_PER_SPECIFIC_SCAN;
         else
-                *max_chan_per_scan = MWIFIEX_CHANNELS_PER_SCAN_CMD;
+                *max_chan_per_scan = MWIFIEX_DEF_CHANNELS_PER_SCAN_CMD;
 
         /* If the input config or adapter has the number of Probes set,
            add tlv */
@@ -962,13 +967,28 @@ mwifiex_config_scan(struct mwifiex_private *priv,
                         dev_dbg(adapter->dev,
                                 "info: Scan: Scanning current channel only\n");
                 }
-
+                chan_num = chan_idx;
         } else {
                 dev_dbg(adapter->dev,
                         "info: Scan: Creating full region channel list\n");
-                mwifiex_scan_create_channel_list(priv, user_scan_in,
-                                                 scan_chan_list,
-                                                 *filtered_scan);
+                chan_num = mwifiex_scan_create_channel_list(priv, user_scan_in,
+                                                            scan_chan_list,
+                                                            *filtered_scan);
+        }
+
+        /*
+         * In associated state we will reduce the number of channels scanned per
+         * scan command to avoid any traffic delay/loss. This number is decided
+         * based on total number of channels to be scanned due to constraints
+         * of command buffers.
+         */
+        if (priv->media_connected) {
+                if (chan_num < MWIFIEX_LIMIT_1_CHANNEL_PER_SCAN_CMD)
+                        *max_chan_per_scan = 1;
+                else if (chan_num < MWIFIEX_LIMIT_2_CHANNELS_PER_SCAN_CMD)
+                        *max_chan_per_scan = 2;
+                else if (chan_num < MWIFIEX_LIMIT_3_CHANNELS_PER_SCAN_CMD)
+                        *max_chan_per_scan = 3;
         }
 }
 
@@ -1014,14 +1034,12 @@ mwifiex_ret_802_11_scan_get_tlv_ptrs(struct mwifiex_adapter *adapter,
                         case TLV_TYPE_TSFTIMESTAMP:
                                 dev_dbg(adapter->dev, "info: SCAN_RESP: TSF "
                                         "timestamp TLV, len = %d\n", tlv_len);
-                                *tlv_data = (struct mwifiex_ie_types_data *)
-                                        current_tlv;
+                                *tlv_data = current_tlv;
                                 break;
                         case TLV_TYPE_CHANNELBANDLIST:
                                 dev_dbg(adapter->dev, "info: SCAN_RESP: channel"
                                         " band list TLV, len = %d\n", tlv_len);
-                                *tlv_data = (struct mwifiex_ie_types_data *)
-                                        current_tlv;
+                                *tlv_data = current_tlv;
                                 break;
                         default:
                                 dev_err(adapter->dev,
@@ -1226,15 +1244,15 @@ int mwifiex_update_bss_desc_with_ie(struct mwifiex_adapter *adapter,
                                         bss_entry->beacon_buf);
                         break;
                 case WLAN_EID_BSS_COEX_2040:
-                        bss_entry->bcn_bss_co_2040 = (u8 *) (current_ptr +
-                                        sizeof(struct ieee_types_header));
+                        bss_entry->bcn_bss_co_2040 = current_ptr +
+                                sizeof(struct ieee_types_header);
                         bss_entry->bss_co_2040_offset = (u16) (current_ptr +
                                         sizeof(struct ieee_types_header) -
                                                 bss_entry->beacon_buf);
                         break;
                 case WLAN_EID_EXT_CAPABILITY:
-                        bss_entry->bcn_ext_cap = (u8 *) (current_ptr +
-                                        sizeof(struct ieee_types_header));
+                        bss_entry->bcn_ext_cap = current_ptr +
+                                sizeof(struct ieee_types_header);
                         bss_entry->ext_cap_offset = (u16) (current_ptr +
                                         sizeof(struct ieee_types_header) -
                                         bss_entry->beacon_buf);
@@ -1276,8 +1294,8 @@ mwifiex_radio_type_to_band(u8 radio_type)
  * order to send the appropriate scan commands to firmware to populate or
  * update the internal driver scan table.
  */
-static int mwifiex_scan_networks(struct mwifiex_private *priv,
-                const struct mwifiex_user_scan_cfg *user_scan_in)
+int mwifiex_scan_networks(struct mwifiex_private *priv,
+                          const struct mwifiex_user_scan_cfg *user_scan_in)
 {
         int ret = 0;
         struct mwifiex_adapter *adapter = priv->adapter;
@@ -1342,6 +1360,7 @@ static int mwifiex_scan_networks(struct mwifiex_private *priv,
                         adapter->cmd_queued = cmd_node;
                         mwifiex_insert_cmd_to_pending_q(adapter, cmd_node,
                                                         true);
+                        queue_work(adapter->workqueue, &adapter->main_work);
                 } else {
                         spin_unlock_irqrestore(&adapter->scan_pending_q_lock,
                                                flags);
@@ -1358,26 +1377,6 @@ static int mwifiex_scan_networks(struct mwifiex_private *priv,
 }
 
 /*
- * Sends IOCTL request to start a scan with user configurations.
- *
- * This function allocates the IOCTL request buffer, fills it
- * with requisite parameters and calls the IOCTL handler.
- *
- * Upon completion, it also generates a wireless event to notify
- * applications.
- */
-int mwifiex_set_user_scan_ioctl(struct mwifiex_private *priv,
-                                struct mwifiex_user_scan_cfg *scan_req)
-{
-        int status;
-
-        status = mwifiex_scan_networks(priv, scan_req);
-        queue_work(priv->adapter->workqueue, &priv->adapter->main_work);
-
-        return status;
-}
-
-/*
  * This function prepares a scan command to be sent to the firmware.
  *
  * This uses the scan command configuration sent to the command processing
@@ -1683,8 +1682,7 @@ int mwifiex_ret_802_11_scan(struct mwifiex_private *priv,
                                 goto done;
                         }
                         if (element_id == WLAN_EID_DS_PARAMS) {
-                                channel = *(u8 *) (current_ptr +
-                                        sizeof(struct ieee_types_header));
+                                channel = *(current_ptr + sizeof(struct ieee_types_header));
                                 break;
                         }
 
@@ -1772,14 +1770,23 @@ int mwifiex_ret_802_11_scan(struct mwifiex_private *priv,
                         priv->user_scan_cfg = NULL;
                 }
         } else {
-                /* Get scan command from scan_pending_q and put to
-                   cmd_pending_q */
-                cmd_node = list_first_entry(&adapter->scan_pending_q,
-                                            struct cmd_ctrl_node, list);
-                list_del(&cmd_node->list);
-                spin_unlock_irqrestore(&adapter->scan_pending_q_lock, flags);
-
-                mwifiex_insert_cmd_to_pending_q(adapter, cmd_node, true);
+                if (!mwifiex_wmm_lists_empty(adapter)) {
+                        spin_unlock_irqrestore(&adapter->scan_pending_q_lock,
+                                               flags);
+                        adapter->scan_delay_cnt = 1;
+                        mod_timer(&priv->scan_delay_timer, jiffies +
+                                  msecs_to_jiffies(MWIFIEX_SCAN_DELAY_MSEC));
+                } else {
+                        /* Get scan command from scan_pending_q and put to
+                           cmd_pending_q */
+                        cmd_node = list_first_entry(&adapter->scan_pending_q,
+                                                    struct cmd_ctrl_node, list);
+                        list_del(&cmd_node->list);
+                        spin_unlock_irqrestore(&adapter->scan_pending_q_lock,
+                                               flags);
+                        mwifiex_insert_cmd_to_pending_q(adapter, cmd_node,
+                                                        true);
+                }
         }
 
 done:
@@ -2010,12 +2017,11 @@ mwifiex_save_curr_bcn(struct mwifiex_private *priv)
 
         if (curr_bss->bcn_bss_co_2040)
                 curr_bss->bcn_bss_co_2040 =
-                        (u8 *) (curr_bss->beacon_buf +
-                                        curr_bss->bss_co_2040_offset);
+                        (curr_bss->beacon_buf + curr_bss->bss_co_2040_offset);
 
         if (curr_bss->bcn_ext_cap)
-                curr_bss->bcn_ext_cap = (u8 *) (curr_bss->beacon_buf +
-                                curr_bss->ext_cap_offset);
+                curr_bss->bcn_ext_cap = curr_bss->beacon_buf +
+                        curr_bss->ext_cap_offset;
 }
 
 /*
diff --git a/drivers/net/wireless/mwifiex/sta_cmd.c b/drivers/net/wireless/mwifiex/sta_cmd.c
index 40e025da6bc..b9cd9ed48c4 100644
--- a/drivers/net/wireless/mwifiex/sta_cmd.c
+++ b/drivers/net/wireless/mwifiex/sta_cmd.c
@@ -260,6 +260,23 @@ static int mwifiex_cmd_tx_power_cfg(struct host_cmd_ds_command *cmd,
 }
 
 /*
+ * This function prepares command to get RF Tx power.
+ */
+static int mwifiex_cmd_rf_tx_power(struct mwifiex_private *priv,
+                                   struct host_cmd_ds_command *cmd,
+                                   u16 cmd_action, void *data_buf)
+{
+        struct host_cmd_ds_rf_tx_pwr *txp = &cmd->params.txp;
+
+        cmd->size = cpu_to_le16(sizeof(struct host_cmd_ds_rf_tx_pwr)
+                                + S_DS_GEN);
+        cmd->command = cpu_to_le16(HostCmd_CMD_RF_TX_PWR);
+        txp->action = cpu_to_le16(cmd_action);
+
+        return 0;
+}
+
+/*
  * This function prepares command to set Host Sleep configuration.
  *
  * Preparation includes -
@@ -793,8 +810,7 @@ static int mwifiex_cmd_reg_access(struct host_cmd_ds_command *cmd,
                 struct host_cmd_ds_mac_reg_access *mac_reg;
 
                 cmd->size = cpu_to_le16(sizeof(*mac_reg) + S_DS_GEN);
-                mac_reg = (struct host_cmd_ds_mac_reg_access *) &cmd->
-                                                                params.mac_reg;
+                mac_reg = &cmd->params.mac_reg;
                 mac_reg->action = cpu_to_le16(cmd_action);
                 mac_reg->offset =
                         cpu_to_le16((u16) le32_to_cpu(reg_rw->offset));
@@ -806,8 +822,7 @@ static int mwifiex_cmd_reg_access(struct host_cmd_ds_command *cmd,
                 struct host_cmd_ds_bbp_reg_access *bbp_reg;
 
                 cmd->size = cpu_to_le16(sizeof(*bbp_reg) + S_DS_GEN);
-                bbp_reg = (struct host_cmd_ds_bbp_reg_access *)
-                                                        &cmd->params.bbp_reg;
+                bbp_reg = &cmd->params.bbp_reg;
                 bbp_reg->action = cpu_to_le16(cmd_action);
                 bbp_reg->offset =
                         cpu_to_le16((u16) le32_to_cpu(reg_rw->offset));
@@ -819,8 +834,7 @@ static int mwifiex_cmd_reg_access(struct host_cmd_ds_command *cmd,
                 struct host_cmd_ds_rf_reg_access *rf_reg;
 
                 cmd->size = cpu_to_le16(sizeof(*rf_reg) + S_DS_GEN);
-                rf_reg = (struct host_cmd_ds_rf_reg_access *)
-                                                        &cmd->params.rf_reg;
+                rf_reg = &cmd->params.rf_reg;
                 rf_reg->action = cpu_to_le16(cmd_action);
                 rf_reg->offset = cpu_to_le16((u16) le32_to_cpu(reg_rw->offset));
                 rf_reg->value = (u8) le32_to_cpu(reg_rw->value);
@@ -831,8 +845,7 @@ static int mwifiex_cmd_reg_access(struct host_cmd_ds_command *cmd,
                 struct host_cmd_ds_pmic_reg_access *pmic_reg;
 
                 cmd->size = cpu_to_le16(sizeof(*pmic_reg) + S_DS_GEN);
-                pmic_reg = (struct host_cmd_ds_pmic_reg_access *) &cmd->
-                                params.pmic_reg;
+                pmic_reg = &cmd->params.pmic_reg;
                 pmic_reg->action = cpu_to_le16(cmd_action);
                 pmic_reg->offset =
                                 cpu_to_le16((u16) le32_to_cpu(reg_rw->offset));
@@ -844,8 +857,7 @@ static int mwifiex_cmd_reg_access(struct host_cmd_ds_command *cmd,
                 struct host_cmd_ds_rf_reg_access *cau_reg;
 
                 cmd->size = cpu_to_le16(sizeof(*cau_reg) + S_DS_GEN);
-                cau_reg = (struct host_cmd_ds_rf_reg_access *)
-                                                        &cmd->params.rf_reg;
+                cau_reg = &cmd->params.rf_reg;
                 cau_reg->action = cpu_to_le16(cmd_action);
                 cau_reg->offset =
                                 cpu_to_le16((u16) le32_to_cpu(reg_rw->offset));
@@ -856,7 +868,6 @@ static int mwifiex_cmd_reg_access(struct host_cmd_ds_command *cmd,
         {
                 struct mwifiex_ds_read_eeprom *rd_eeprom = data_buf;
                 struct host_cmd_ds_802_11_eeprom_access *cmd_eeprom =
-                        (struct host_cmd_ds_802_11_eeprom_access *)
                         &cmd->params.eeprom;
 
                 cmd->size = cpu_to_le16(sizeof(*cmd_eeprom) + S_DS_GEN);
@@ -1055,6 +1066,10 @@ int mwifiex_sta_prepare_cmd(struct mwifiex_private *priv, uint16_t cmd_no,
                 ret = mwifiex_cmd_tx_power_cfg(cmd_ptr, cmd_action,
                                                data_buf);
                 break;
+        case HostCmd_CMD_RF_TX_PWR:
+                ret = mwifiex_cmd_rf_tx_power(priv, cmd_ptr, cmd_action,
+                                              data_buf);
+                break;
         case HostCmd_CMD_802_11_PS_MODE_ENH:
                 ret = mwifiex_cmd_enh_power_mode(priv, cmd_ptr, cmd_action,
                                                  (uint16_t)cmd_oid, data_buf);
@@ -1283,7 +1298,7 @@ int mwifiex_sta_init_cmd(struct mwifiex_private *priv, u8 first_sta)
         priv->data_rate = 0;
 
         /* get tx power */
-        ret = mwifiex_send_cmd_async(priv, HostCmd_CMD_TXPWR_CFG,
+        ret = mwifiex_send_cmd_async(priv, HostCmd_CMD_RF_TX_PWR,
                                      HostCmd_ACT_GEN_GET, 0, NULL);
         if (ret)
                 return -1;
diff --git a/drivers/net/wireless/mwifiex/sta_cmdresp.c b/drivers/net/wireless/mwifiex/sta_cmdresp.c
index a79ed9bd969..78fc352c85c 100644
--- a/drivers/net/wireless/mwifiex/sta_cmdresp.c
+++ b/drivers/net/wireless/mwifiex/sta_cmdresp.c
@@ -227,7 +227,7 @@ static int mwifiex_ret_get_log(struct mwifiex_private *priv,
                                struct mwifiex_ds_get_stats *stats)
 {
         struct host_cmd_ds_802_11_get_log *get_log =
-                (struct host_cmd_ds_802_11_get_log *) &resp->params.get_log;
+                &resp->params.get_log;
 
         if (stats) {
                 stats->mcast_tx_frame = le32_to_cpu(get_log->mcast_tx_frame);
@@ -282,7 +282,7 @@ static int mwifiex_ret_tx_rate_cfg(struct mwifiex_private *priv,
         u32 i;
         int ret = 0;
 
-        tlv_buf = (u8 *) ((u8 *) rate_cfg) +
+        tlv_buf = ((u8 *)rate_cfg) +
                         sizeof(struct host_cmd_ds_tx_rate_cfg);
         tlv_buf_len = *(u16 *) (tlv_buf + sizeof(u16));
 
@@ -451,6 +451,30 @@ static int mwifiex_ret_tx_power_cfg(struct mwifiex_private *priv,
 }
 
 /*
+ * This function handles the command response of get RF Tx power.
+ */
+static int mwifiex_ret_rf_tx_power(struct mwifiex_private *priv,
+                                   struct host_cmd_ds_command *resp)
+{
+        struct host_cmd_ds_rf_tx_pwr *txp = &resp->params.txp;
+        u16 action = le16_to_cpu(txp->action);
+
+        priv->tx_power_level = le16_to_cpu(txp->cur_level);
+
+        if (action == HostCmd_ACT_GEN_GET) {
+                priv->max_tx_power_level = txp->max_power;
+                priv->min_tx_power_level = txp->min_power;
+        }
+
+        dev_dbg(priv->adapter->dev,
+                "Current TxPower Level=%d, Max Power=%d, Min Power=%d\n",
+                priv->tx_power_level, priv->max_tx_power_level,
+                priv->min_tx_power_level);
+
+        return 0;
+}
+
+/*
  * This function handles the command response of set/get MAC address.
  *
  * Handling includes saving the MAC address in driver.
@@ -679,39 +703,33 @@ static int mwifiex_ret_reg_access(u16 type, struct host_cmd_ds_command *resp,
         eeprom = data_buf;
         switch (type) {
         case HostCmd_CMD_MAC_REG_ACCESS:
-                r.mac = (struct host_cmd_ds_mac_reg_access *)
-                        &resp->params.mac_reg;
+                r.mac = &resp->params.mac_reg;
                 reg_rw->offset = cpu_to_le32((u32) le16_to_cpu(r.mac->offset));
                 reg_rw->value = r.mac->value;
                 break;
         case HostCmd_CMD_BBP_REG_ACCESS:
-                r.bbp = (struct host_cmd_ds_bbp_reg_access *)
-                        &resp->params.bbp_reg;
+                r.bbp = &resp->params.bbp_reg;
                 reg_rw->offset = cpu_to_le32((u32) le16_to_cpu(r.bbp->offset));
                 reg_rw->value = cpu_to_le32((u32) r.bbp->value);
                 break;
 
         case HostCmd_CMD_RF_REG_ACCESS:
-                r.rf = (struct host_cmd_ds_rf_reg_access *)
-                       &resp->params.rf_reg;
+                r.rf = &resp->params.rf_reg;
                 reg_rw->offset = cpu_to_le32((u32) le16_to_cpu(r.rf->offset));
                 reg_rw->value = cpu_to_le32((u32) r.bbp->value);
                 break;
         case HostCmd_CMD_PMIC_REG_ACCESS:
-                r.pmic = (struct host_cmd_ds_pmic_reg_access *)
-                         &resp->params.pmic_reg;
+                r.pmic = &resp->params.pmic_reg;
                 reg_rw->offset = cpu_to_le32((u32) le16_to_cpu(r.pmic->offset));
                 reg_rw->value = cpu_to_le32((u32) r.pmic->value);
                 break;
         case HostCmd_CMD_CAU_REG_ACCESS:
-                r.rf = (struct host_cmd_ds_rf_reg_access *)
-                       &resp->params.rf_reg;
+                r.rf = &resp->params.rf_reg;
                 reg_rw->offset = cpu_to_le32((u32) le16_to_cpu(r.rf->offset));
                 reg_rw->value = cpu_to_le32((u32) r.rf->value);
                 break;
         case HostCmd_CMD_802_11_EEPROM_ACCESS:
-                r.eeprom = (struct host_cmd_ds_802_11_eeprom_access *)
-                           &resp->params.eeprom;
+                r.eeprom = &resp->params.eeprom;
                 pr_debug("info: EEPROM read len=%x\n", r.eeprom->byte_count);
                 if (le16_to_cpu(eeprom->byte_count) <
                     le16_to_cpu(r.eeprom->byte_count)) {
@@ -787,7 +805,7 @@ static int mwifiex_ret_subsc_evt(struct mwifiex_private *priv,
                                  struct mwifiex_ds_misc_subsc_evt *sub_event)
 {
         struct host_cmd_ds_802_11_subsc_evt *cmd_sub_event =
-                (struct host_cmd_ds_802_11_subsc_evt *)&resp->params.subsc_evt;
+                &resp->params.subsc_evt;
 
         /* For every subscribe event command (Get/Set/Clear), FW reports the
          * current set of subscribed events*/
@@ -847,6 +865,9 @@ int mwifiex_process_sta_cmdresp(struct mwifiex_private *priv, u16 cmdresp_no,
         case HostCmd_CMD_TXPWR_CFG:
                 ret = mwifiex_ret_tx_power_cfg(priv, resp);
                 break;
+        case HostCmd_CMD_RF_TX_PWR:
+                ret = mwifiex_ret_rf_tx_power(priv, resp);
+                break;
         case HostCmd_CMD_802_11_PS_MODE_ENH:
                 ret = mwifiex_ret_enh_power_mode(priv, resp, data_buf);
                 break;
diff --git a/drivers/net/wireless/mwifiex/sta_event.c b/drivers/net/wireless/mwifiex/sta_event.c
index 11e731f3581..b8614a82546 100644
--- a/drivers/net/wireless/mwifiex/sta_event.c
+++ b/drivers/net/wireless/mwifiex/sta_event.c
@@ -422,7 +422,7 @@ int mwifiex_process_sta_event(struct mwifiex_private *priv)
 
                         if (len != -1) {
                                 sinfo.filled = STATION_INFO_ASSOC_REQ_IES;
-                                sinfo.assoc_req_ies = (u8 *)&event->data[len];
+                                sinfo.assoc_req_ies = &event->data[len];
                                 len = (u8 *)sinfo.assoc_req_ies -
                                       (u8 *)&event->frame_control;
                                 sinfo.assoc_req_ies_len =
diff --git a/drivers/net/wireless/mwifiex/sta_ioctl.c b/drivers/net/wireless/mwifiex/sta_ioctl.c
index 106c449477b..f2fd2423214 100644
--- a/drivers/net/wireless/mwifiex/sta_ioctl.c
+++ b/drivers/net/wireless/mwifiex/sta_ioctl.c
@@ -66,9 +66,6 @@ int mwifiex_wait_queue_complete(struct mwifiex_adapter *adapter)
         dev_dbg(adapter->dev, "cmd pending\n");
         atomic_inc(&adapter->cmd_pending);
 
-        /* Status pending, wake up main process */
-        queue_work(adapter->workqueue, &adapter->main_work);
-
         /* Wait for completion */
         wait_event_interruptible(adapter->cmd_wait_q.wait,
                                  *(cmd_queued->condition));
diff --git a/drivers/net/wireless/mwifiex/uap_cmd.c b/drivers/net/wireless/mwifiex/uap_cmd.c
index 89f9a2a45de..f40e93fe894 100644
--- a/drivers/net/wireless/mwifiex/uap_cmd.c
+++ b/drivers/net/wireless/mwifiex/uap_cmd.c
@@ -26,6 +26,7 @@ int mwifiex_set_secure_params(struct mwifiex_private *priv,
                               struct mwifiex_uap_bss_param *bss_config,
                               struct cfg80211_ap_settings *params) {
         int i;
+        struct mwifiex_wep_key wep_key;
 
         if (!params->privacy) {
                 bss_config->protocol = PROTOCOL_NO_SECURITY;
@@ -65,7 +66,7 @@ int mwifiex_set_secure_params(struct mwifiex_private *priv,
                         }
                         if (params->crypto.wpa_versions &
                             NL80211_WPA_VERSION_2) {
-                                bss_config->protocol = PROTOCOL_WPA2;
+                                bss_config->protocol |= PROTOCOL_WPA2;
                                 bss_config->key_mgmt = KEY_MGMT_EAP;
                         }
                         break;
@@ -77,7 +78,7 @@ int mwifiex_set_secure_params(struct mwifiex_private *priv,
                         }
                         if (params->crypto.wpa_versions &
                             NL80211_WPA_VERSION_2) {
-                                bss_config->protocol = PROTOCOL_WPA2;
+                                bss_config->protocol |= PROTOCOL_WPA2;
                                 bss_config->key_mgmt = KEY_MGMT_PSK;
                         }
                         break;
@@ -91,10 +92,19 @@ int mwifiex_set_secure_params(struct mwifiex_private *priv,
                 case WLAN_CIPHER_SUITE_WEP104:
                         break;
                 case WLAN_CIPHER_SUITE_TKIP:
-                        bss_config->wpa_cfg.pairwise_cipher_wpa = CIPHER_TKIP;
+                        if (params->crypto.wpa_versions & NL80211_WPA_VERSION_1)
+                                bss_config->wpa_cfg.pairwise_cipher_wpa |=
+                                                                CIPHER_TKIP;
+                        if (params->crypto.wpa_versions & NL80211_WPA_VERSION_2)
+                                bss_config->wpa_cfg.pairwise_cipher_wpa2 |=
+                                                                CIPHER_TKIP;
                         break;
                 case WLAN_CIPHER_SUITE_CCMP:
-                        bss_config->wpa_cfg.pairwise_cipher_wpa2 =
+                        if (params->crypto.wpa_versions & NL80211_WPA_VERSION_1)
+                                bss_config->wpa_cfg.pairwise_cipher_wpa |=
+                                                                CIPHER_AES_CCMP;
+                        if (params->crypto.wpa_versions & NL80211_WPA_VERSION_2)
+                                bss_config->wpa_cfg.pairwise_cipher_wpa2 |=
                                                                 CIPHER_AES_CCMP;
                 default:
                         break;
@@ -104,6 +114,27 @@ int mwifiex_set_secure_params(struct mwifiex_private *priv,
         switch (params->crypto.cipher_group) {
         case WLAN_CIPHER_SUITE_WEP40:
         case WLAN_CIPHER_SUITE_WEP104:
+                if (priv->sec_info.wep_enabled) {
+                        bss_config->protocol = PROTOCOL_STATIC_WEP;
+                        bss_config->key_mgmt = KEY_MGMT_NONE;
+                        bss_config->wpa_cfg.length = 0;
+
+                        for (i = 0; i < NUM_WEP_KEYS; i++) {
+                                wep_key = priv->wep_key[i];
+                                bss_config->wep_cfg[i].key_index = i;
+
+                                if (priv->wep_key_curr_index == i)
+                                        bss_config->wep_cfg[i].is_default = 1;
+                                else
+                                        bss_config->wep_cfg[i].is_default = 0;
+
+                                bss_config->wep_cfg[i].length =
+                                                             wep_key.key_length;
+                                memcpy(&bss_config->wep_cfg[i].key,
+                                       &wep_key.key_material,
+                                       wep_key.key_length);
+                        }
+                }
                 break;
         case WLAN_CIPHER_SUITE_TKIP:
                 bss_config->wpa_cfg.group_cipher = CIPHER_TKIP;
@@ -118,6 +149,33 @@ int mwifiex_set_secure_params(struct mwifiex_private *priv,
         return 0;
 }
 
+/* This function updates 11n related parameters from IE and sets them into
+ * bss_config structure.
+ */
+void
+mwifiex_set_ht_params(struct mwifiex_private *priv,
+                      struct mwifiex_uap_bss_param *bss_cfg,
+                      struct cfg80211_ap_settings *params)
+{
+        const u8 *ht_ie;
+
+        if (!ISSUPP_11NENABLED(priv->adapter->fw_cap_info))
+                return;
+
+        ht_ie = cfg80211_find_ie(WLAN_EID_HT_CAPABILITY, params->beacon.tail,
+                                 params->beacon.tail_len);
+        if (ht_ie) {
+                memcpy(&bss_cfg->ht_cap, ht_ie + 2,
+                       sizeof(struct ieee80211_ht_cap));
+        } else {
+                memset(&bss_cfg->ht_cap , 0, sizeof(struct ieee80211_ht_cap));
+                bss_cfg->ht_cap.cap_info = cpu_to_le16(MWIFIEX_DEF_HT_CAP);
+                bss_cfg->ht_cap.ampdu_params_info = MWIFIEX_DEF_AMPDU;
+        }
+
+        return;
+}
+
 /* This function initializes some of mwifiex_uap_bss_param variables.
  * This helps FW in ignoring invalid values. These values may or may not
  * be get updated to valid ones at later stage.
@@ -135,6 +193,120 @@ void mwifiex_set_sys_config_invalid_data(struct mwifiex_uap_bss_param *config)
 }
 
 /* This function parses BSS related parameters from structure
+ * and prepares TLVs specific to WPA/WPA2 security.
+ * These TLVs are appended to command buffer.
+ */
+static void
+mwifiex_uap_bss_wpa(u8 **tlv_buf, void *cmd_buf, u16 *param_size)
+{
+        struct host_cmd_tlv_pwk_cipher *pwk_cipher;
+        struct host_cmd_tlv_gwk_cipher *gwk_cipher;
+        struct host_cmd_tlv_passphrase *passphrase;
+        struct host_cmd_tlv_akmp *tlv_akmp;
+        struct mwifiex_uap_bss_param *bss_cfg = cmd_buf;
+        u16 cmd_size = *param_size;
+        u8 *tlv = *tlv_buf;
+
+        tlv_akmp = (struct host_cmd_tlv_akmp *)tlv;
+        tlv_akmp->tlv.type = cpu_to_le16(TLV_TYPE_UAP_AKMP);
+        tlv_akmp->tlv.len = cpu_to_le16(sizeof(struct host_cmd_tlv_akmp) -
+                                        sizeof(struct host_cmd_tlv));
+        tlv_akmp->key_mgmt_operation = cpu_to_le16(bss_cfg->key_mgmt_operation);
+        tlv_akmp->key_mgmt = cpu_to_le16(bss_cfg->key_mgmt);
+        cmd_size += sizeof(struct host_cmd_tlv_akmp);
+        tlv += sizeof(struct host_cmd_tlv_akmp);
+
+        if (bss_cfg->wpa_cfg.pairwise_cipher_wpa & VALID_CIPHER_BITMAP) {
+                pwk_cipher = (struct host_cmd_tlv_pwk_cipher *)tlv;
+                pwk_cipher->tlv.type = cpu_to_le16(TLV_TYPE_PWK_CIPHER);
+                pwk_cipher->tlv.len =
+                        cpu_to_le16(sizeof(struct host_cmd_tlv_pwk_cipher) -
+                                    sizeof(struct host_cmd_tlv));
+                pwk_cipher->proto = cpu_to_le16(PROTOCOL_WPA);
+                pwk_cipher->cipher = bss_cfg->wpa_cfg.pairwise_cipher_wpa;
+                cmd_size += sizeof(struct host_cmd_tlv_pwk_cipher);
+                tlv += sizeof(struct host_cmd_tlv_pwk_cipher);
+        }
+
+        if (bss_cfg->wpa_cfg.pairwise_cipher_wpa2 & VALID_CIPHER_BITMAP) {
+                pwk_cipher = (struct host_cmd_tlv_pwk_cipher *)tlv;
+                pwk_cipher->tlv.type = cpu_to_le16(TLV_TYPE_PWK_CIPHER);
+                pwk_cipher->tlv.len =
+                        cpu_to_le16(sizeof(struct host_cmd_tlv_pwk_cipher) -
+                                    sizeof(struct host_cmd_tlv));
+                pwk_cipher->proto = cpu_to_le16(PROTOCOL_WPA2);
+                pwk_cipher->cipher = bss_cfg->wpa_cfg.pairwise_cipher_wpa2;
+                cmd_size += sizeof(struct host_cmd_tlv_pwk_cipher);
+                tlv += sizeof(struct host_cmd_tlv_pwk_cipher);
+        }
+
+        if (bss_cfg->wpa_cfg.group_cipher & VALID_CIPHER_BITMAP) {
+                gwk_cipher = (struct host_cmd_tlv_gwk_cipher *)tlv;
+                gwk_cipher->tlv.type = cpu_to_le16(TLV_TYPE_GWK_CIPHER);
+                gwk_cipher->tlv.len =
+                        cpu_to_le16(sizeof(struct host_cmd_tlv_gwk_cipher) -
+                                    sizeof(struct host_cmd_tlv));
+                gwk_cipher->cipher = bss_cfg->wpa_cfg.group_cipher;
+                cmd_size += sizeof(struct host_cmd_tlv_gwk_cipher);
+                tlv += sizeof(struct host_cmd_tlv_gwk_cipher);
+        }
+
+        if (bss_cfg->wpa_cfg.length) {
+                passphrase = (struct host_cmd_tlv_passphrase *)tlv;
+                passphrase->tlv.type = cpu_to_le16(TLV_TYPE_UAP_WPA_PASSPHRASE);
+                passphrase->tlv.len = cpu_to_le16(bss_cfg->wpa_cfg.length);
+                memcpy(passphrase->passphrase, bss_cfg->wpa_cfg.passphrase,
+                       bss_cfg->wpa_cfg.length);
+                cmd_size += sizeof(struct host_cmd_tlv) +
+                            bss_cfg->wpa_cfg.length;
+                tlv += sizeof(struct host_cmd_tlv) + bss_cfg->wpa_cfg.length;
+        }
+
+        *param_size = cmd_size;
+        *tlv_buf = tlv;
+
+        return;
+}
+
+/* This function parses BSS related parameters from structure
+ * and prepares TLVs specific to WEP encryption.
+ * These TLVs are appended to command buffer.
+ */
+static void
+mwifiex_uap_bss_wep(u8 **tlv_buf, void *cmd_buf, u16 *param_size)
+{
+        struct host_cmd_tlv_wep_key *wep_key;
+        u16 cmd_size = *param_size;
+        int i;
+        u8 *tlv = *tlv_buf;
+        struct mwifiex_uap_bss_param *bss_cfg = cmd_buf;
+
+        for (i = 0; i < NUM_WEP_KEYS; i++) {
+                if (bss_cfg->wep_cfg[i].length &&
+                    (bss_cfg->wep_cfg[i].length == WLAN_KEY_LEN_WEP40 ||
+                     bss_cfg->wep_cfg[i].length == WLAN_KEY_LEN_WEP104)) {
+                        wep_key = (struct host_cmd_tlv_wep_key *)tlv;
+                        wep_key->tlv.type = cpu_to_le16(TLV_TYPE_UAP_WEP_KEY);
+                        wep_key->tlv.len =
+                                cpu_to_le16(bss_cfg->wep_cfg[i].length + 2);
+                        wep_key->key_index = bss_cfg->wep_cfg[i].key_index;
+                        wep_key->is_default = bss_cfg->wep_cfg[i].is_default;
+                        memcpy(wep_key->key, bss_cfg->wep_cfg[i].key,
+                               bss_cfg->wep_cfg[i].length);
+                        cmd_size += sizeof(struct host_cmd_tlv) + 2 +
+                                    bss_cfg->wep_cfg[i].length;
+                        tlv += sizeof(struct host_cmd_tlv) + 2 +
+                                    bss_cfg->wep_cfg[i].length;
+                }
+        }
+
+        *param_size = cmd_size;
+        *tlv_buf = tlv;
+
+        return;
+}
+
+/* This function parses BSS related parameters from structure
  * and prepares TLVs. These TLVs are appended to command buffer.
 */
 static int
@@ -148,12 +320,9 @@ mwifiex_uap_bss_param_prepare(u8 *tlv, void *cmd_buf, u16 *param_size)
         struct host_cmd_tlv_frag_threshold *frag_threshold;
         struct host_cmd_tlv_rts_threshold *rts_threshold;
         struct host_cmd_tlv_retry_limit *retry_limit;
-        struct host_cmd_tlv_pwk_cipher *pwk_cipher;
-        struct host_cmd_tlv_gwk_cipher *gwk_cipher;
         struct host_cmd_tlv_encrypt_protocol *encrypt_protocol;
         struct host_cmd_tlv_auth_type *auth_type;
-        struct host_cmd_tlv_passphrase *passphrase;
-        struct host_cmd_tlv_akmp *tlv_akmp;
+        struct mwifiex_ie_types_htcap *htcap;
         struct mwifiex_uap_bss_param *bss_cfg = cmd_buf;
         u16 cmd_size = *param_size;
 
@@ -243,70 +412,11 @@ mwifiex_uap_bss_param_prepare(u8 *tlv, void *cmd_buf, u16 *param_size)
         }
         if ((bss_cfg->protocol & PROTOCOL_WPA) ||
             (bss_cfg->protocol & PROTOCOL_WPA2) ||
-            (bss_cfg->protocol & PROTOCOL_EAP)) {
-                tlv_akmp = (struct host_cmd_tlv_akmp *)tlv;
-                tlv_akmp->tlv.type = cpu_to_le16(TLV_TYPE_UAP_AKMP);
-                tlv_akmp->tlv.len =
-                    cpu_to_le16(sizeof(struct host_cmd_tlv_akmp) -
-                                sizeof(struct host_cmd_tlv));
-                tlv_akmp->key_mgmt_operation =
-                        cpu_to_le16(bss_cfg->key_mgmt_operation);
-                tlv_akmp->key_mgmt = cpu_to_le16(bss_cfg->key_mgmt);
-                cmd_size += sizeof(struct host_cmd_tlv_akmp);
-                tlv += sizeof(struct host_cmd_tlv_akmp);
-
-                if (bss_cfg->wpa_cfg.pairwise_cipher_wpa &
-                                VALID_CIPHER_BITMAP) {
-                        pwk_cipher = (struct host_cmd_tlv_pwk_cipher *)tlv;
-                        pwk_cipher->tlv.type =
-                                cpu_to_le16(TLV_TYPE_PWK_CIPHER);
-                        pwk_cipher->tlv.len = cpu_to_le16(
-                                sizeof(struct host_cmd_tlv_pwk_cipher) -
-                                sizeof(struct host_cmd_tlv));
-                        pwk_cipher->proto = cpu_to_le16(PROTOCOL_WPA);
-                        pwk_cipher->cipher =
-                                bss_cfg->wpa_cfg.pairwise_cipher_wpa;
-                        cmd_size += sizeof(struct host_cmd_tlv_pwk_cipher);
-                        tlv += sizeof(struct host_cmd_tlv_pwk_cipher);
-                }
-                if (bss_cfg->wpa_cfg.pairwise_cipher_wpa2 &
-                                VALID_CIPHER_BITMAP) {
-                        pwk_cipher = (struct host_cmd_tlv_pwk_cipher *)tlv;
-                        pwk_cipher->tlv.type = cpu_to_le16(TLV_TYPE_PWK_CIPHER);
-                        pwk_cipher->tlv.len = cpu_to_le16(
-                                sizeof(struct host_cmd_tlv_pwk_cipher) -
-                                sizeof(struct host_cmd_tlv));
-                        pwk_cipher->proto = cpu_to_le16(PROTOCOL_WPA2);
-                        pwk_cipher->cipher =
-                                bss_cfg->wpa_cfg.pairwise_cipher_wpa2;
-                        cmd_size += sizeof(struct host_cmd_tlv_pwk_cipher);
-                        tlv += sizeof(struct host_cmd_tlv_pwk_cipher);
-                }
-                if (bss_cfg->wpa_cfg.group_cipher & VALID_CIPHER_BITMAP) {
-                        gwk_cipher = (struct host_cmd_tlv_gwk_cipher *)tlv;
-                        gwk_cipher->tlv.type = cpu_to_le16(TLV_TYPE_GWK_CIPHER);
-                        gwk_cipher->tlv.len = cpu_to_le16(
-                                sizeof(struct host_cmd_tlv_gwk_cipher) -
-                                sizeof(struct host_cmd_tlv));
-                        gwk_cipher->cipher = bss_cfg->wpa_cfg.group_cipher;
-                        cmd_size += sizeof(struct host_cmd_tlv_gwk_cipher);
-                        tlv += sizeof(struct host_cmd_tlv_gwk_cipher);
-                }
-                if (bss_cfg->wpa_cfg.length) {
-                        passphrase = (struct host_cmd_tlv_passphrase *)tlv;
-                        passphrase->tlv.type =
-                                cpu_to_le16(TLV_TYPE_UAP_WPA_PASSPHRASE);
-                        passphrase->tlv.len =
-                                cpu_to_le16(bss_cfg->wpa_cfg.length);
-                        memcpy(passphrase->passphrase,
-                               bss_cfg->wpa_cfg.passphrase,
-                               bss_cfg->wpa_cfg.length);
-                        cmd_size += sizeof(struct host_cmd_tlv) +
-                                    bss_cfg->wpa_cfg.length;
-                        tlv += sizeof(struct host_cmd_tlv) +
-                               bss_cfg->wpa_cfg.length;
-                }
-        }
+            (bss_cfg->protocol & PROTOCOL_EAP))
+                mwifiex_uap_bss_wpa(&tlv, cmd_buf, &cmd_size);
+        else
+                mwifiex_uap_bss_wep(&tlv, cmd_buf, &cmd_size);
+
         if ((bss_cfg->auth_mode <= WLAN_AUTH_SHARED_KEY) ||
             (bss_cfg->auth_mode == MWIFIEX_AUTH_MODE_AUTO)) {
                 auth_type = (struct host_cmd_tlv_auth_type *)tlv;
@@ -330,6 +440,25 @@ mwifiex_uap_bss_param_prepare(u8 *tlv, void *cmd_buf, u16 *param_size)
                 tlv += sizeof(struct host_cmd_tlv_encrypt_protocol);
         }
 
+        if (bss_cfg->ht_cap.cap_info) {
+                htcap = (struct mwifiex_ie_types_htcap *)tlv;
+                htcap->header.type = cpu_to_le16(WLAN_EID_HT_CAPABILITY);
+                htcap->header.len =
+                                cpu_to_le16(sizeof(struct ieee80211_ht_cap));
+                htcap->ht_cap.cap_info = bss_cfg->ht_cap.cap_info;
+                htcap->ht_cap.ampdu_params_info =
+                                             bss_cfg->ht_cap.ampdu_params_info;
+                memcpy(&htcap->ht_cap.mcs, &bss_cfg->ht_cap.mcs,
+                       sizeof(struct ieee80211_mcs_info));
+                htcap->ht_cap.extended_ht_cap_info =
+                                        bss_cfg->ht_cap.extended_ht_cap_info;
+                htcap->ht_cap.tx_BF_cap_info = bss_cfg->ht_cap.tx_BF_cap_info;
+                htcap->ht_cap.antenna_selection_info =
+                                        bss_cfg->ht_cap.antenna_selection_info;
+                cmd_size += sizeof(struct mwifiex_ie_types_htcap);
+                tlv += sizeof(struct mwifiex_ie_types_htcap);
+        }
+
         *param_size = cmd_size;
 
         return 0;
@@ -421,33 +550,3 @@ int mwifiex_uap_prepare_cmd(struct mwifiex_private *priv, u16 cmd_no,
 
         return 0;
 }
-
-/* This function sets the RF channel for AP.
- *
- * This function populates channel information in AP config structure
- * and sends command to configure channel information in AP.
- */
-int mwifiex_uap_set_channel(struct mwifiex_private *priv, int channel)
-{
-        struct mwifiex_uap_bss_param *bss_cfg;
-        struct wiphy *wiphy = priv->wdev->wiphy;
-
-        bss_cfg = kzalloc(sizeof(struct mwifiex_uap_bss_param), GFP_KERNEL);
-        if (!bss_cfg)
-                return -ENOMEM;
-
-        mwifiex_set_sys_config_invalid_data(bss_cfg);
-        bss_cfg->band_cfg = BAND_CONFIG_MANUAL;
-        bss_cfg->channel = channel;
-
-        if (mwifiex_send_cmd_async(priv, HostCmd_CMD_UAP_SYS_CONFIG,
-                                   HostCmd_ACT_GEN_SET,
-                                   UAP_BSS_PARAMS_I, bss_cfg)) {
-                wiphy_err(wiphy, "Failed to set the uAP channel\n");
-                kfree(bss_cfg);
-                return -1;
-        }
-
-        kfree(bss_cfg);
-        return 0;
-}
diff --git a/drivers/net/wireless/orinoco/cfg.c b/drivers/net/wireless/orinoco/cfg.c
index f7b15b8934f..e15675585fb 100644
--- a/drivers/net/wireless/orinoco/cfg.c
+++ b/drivers/net/wireless/orinoco/cfg.c
@@ -160,10 +160,9 @@ static int orinoco_scan(struct wiphy *wiphy, struct net_device *dev,
         return err;
 }
 
-static int orinoco_set_channel(struct wiphy *wiphy,
-                        struct net_device *netdev,
-                        struct ieee80211_channel *chan,
-                        enum nl80211_channel_type channel_type)
+static int orinoco_set_monitor_channel(struct wiphy *wiphy,
+                                       struct ieee80211_channel *chan,
+                                       enum nl80211_channel_type channel_type)
 {
         struct orinoco_private *priv = wiphy_priv(wiphy);
         int err = 0;
@@ -286,7 +285,7 @@ static int orinoco_set_wiphy_params(struct wiphy *wiphy, u32 changed)
 
 const struct cfg80211_ops orinoco_cfg_ops = {
         .change_virtual_intf = orinoco_change_vif,
-        .set_channel = orinoco_set_channel,
+        .set_monitor_channel = orinoco_set_monitor_channel,
         .scan = orinoco_scan,
         .set_wiphy_params = orinoco_set_wiphy_params,
 };
diff --git a/drivers/net/wireless/p54/eeprom.c b/drivers/net/wireless/p54/eeprom.c
index fa8ce510478..636daf2860c 100644
--- a/drivers/net/wireless/p54/eeprom.c
+++ b/drivers/net/wireless/p54/eeprom.c
@@ -905,7 +905,7 @@ int p54_read_eeprom(struct ieee80211_hw *dev)
 
         while (eeprom_size) {
                 blocksize = min(eeprom_size, maxblocksize);
-                ret = p54_download_eeprom(priv, (void *) (eeprom + offset),
+                ret = p54_download_eeprom(priv, eeprom + offset,
                                           offset, blocksize);
                 if (unlikely(ret))
                         goto free;
diff --git a/drivers/net/wireless/p54/fwio.c b/drivers/net/wireless/p54/fwio.c
index 18e82b31afa..9ba85106eec 100644
--- a/drivers/net/wireless/p54/fwio.c
+++ b/drivers/net/wireless/p54/fwio.c
@@ -478,7 +478,7 @@ int p54_scan(struct p54_common *priv, u16 mode, u16 dwell)
 
                 if (priv->rxhw == PDR_SYNTH_FRONTEND_LONGBOW) {
                         memcpy(&body->longbow.curve_data,
-                                (void *) entry + sizeof(__le16),
+                                entry + sizeof(__le16),
                                 priv->curve_data->entry_size);
                 } else {
                         struct p54_scan_body *chan = &body->normal;
diff --git a/drivers/net/wireless/prism54/islpci_eth.c b/drivers/net/wireless/prism54/islpci_eth.c
index 266d45bf86f..799e148d037 100644
--- a/drivers/net/wireless/prism54/islpci_eth.c
+++ b/drivers/net/wireless/prism54/islpci_eth.c
@@ -455,7 +455,7 @@ islpci_eth_receive(islpci_private *priv)
                               "Error mapping DMA address\n");
 
                         /* free the skbuf structure before aborting */
-                        dev_kfree_skb_irq((struct sk_buff *) skb);
+                        dev_kfree_skb_irq(skb);
                         skb = NULL;
                         break;
                 }
diff --git a/drivers/net/wireless/ray_cs.c b/drivers/net/wireless/ray_cs.c
index 86a738bf591..598ca1cafb9 100644
--- a/drivers/net/wireless/ray_cs.c
+++ b/drivers/net/wireless/ray_cs.c
@@ -1849,7 +1849,7 @@ static irqreturn_t ray_interrupt(int irq, void *dev_id)
         pr_debug("ray_cs: interrupt for *dev=%p\n", dev);
 
         local = netdev_priv(dev);
-        link = (struct pcmcia_device *)local->finder;
+        link = local->finder;
         if (!pcmcia_dev_present(link)) {
                 pr_debug(
                         "ray_cs interrupt from device not present or suspended.\n");
diff --git a/drivers/net/wireless/rt2x00/Kconfig b/drivers/net/wireless/rt2x00/Kconfig
index 299c3879582..c7548da6573 100644
--- a/drivers/net/wireless/rt2x00/Kconfig
+++ b/drivers/net/wireless/rt2x00/Kconfig
@@ -99,6 +99,14 @@ config RT2800PCI_RT53XX
          rt2800pci driver.
          Supported chips: RT5390
 
+config RT2800PCI_RT3290
+       bool "rt2800pci - Include support for rt3290 devices (EXPERIMENTAL)"
+       depends on EXPERIMENTAL
+       default y
+       ---help---
+         This adds support for rt3290 wireless chipset family to the
+         rt2800pci driver.
+         Supported chips: RT3290
 endif
 
 config RT2500USB
diff --git a/drivers/net/wireless/rt2x00/rt2800.h b/drivers/net/wireless/rt2x00/rt2800.h
index 9348521e083..e252e9bafd0 100644
--- a/drivers/net/wireless/rt2x00/rt2800.h
+++ b/drivers/net/wireless/rt2x00/rt2800.h
@@ -51,6 +51,7 @@
  * RF3320 2.4G 1T1R(RT3350/RT3370/RT3390)
  * RF3322 2.4G 2T2R(RT3352/RT3371/RT3372/RT3391/RT3392)
  * RF3053 2.4G/5G 3T3R(RT3883/RT3563/RT3573/RT3593/RT3662)
+ * RF5360 2.4G 1T1R
  * RF5370 2.4G 1T1R
  * RF5390 2.4G 1T1R
  */
@@ -67,9 +68,12 @@
 #define RF3320                          0x000b
 #define RF3322                          0x000c
 #define RF3053                          0x000d
+#define RF3290                          0x3290
+#define RF5360                          0x5360
 #define RF5370                          0x5370
 #define RF5372                          0x5372
 #define RF5390                          0x5390
+#define RF5392                          0x5392
 
 /*
  * Chipset revisions.
@@ -114,6 +118,12 @@
  * Registers.
  */
 
+
+/*
+ * MAC_CSR0_3290: MAC_CSR0 for RT3290 to identity MAC version number.
+ */
+#define MAC_CSR0_3290                           0x0000
+
 /*
  * E2PROM_CSR: PCI EEPROM control register.
  * RELOAD: Write 1 to reload eeprom content.
@@ -130,6 +140,150 @@
 #define E2PROM_CSR_RELOAD               FIELD32(0x00000080)
 
 /*
+ * CMB_CTRL_CFG
+ */
+#define CMB_CTRL                0x0020
+#define AUX_OPT_BIT0            FIELD32(0x00000001)
+#define AUX_OPT_BIT1            FIELD32(0x00000002)
+#define AUX_OPT_BIT2            FIELD32(0x00000004)
+#define AUX_OPT_BIT3            FIELD32(0x00000008)
+#define AUX_OPT_BIT4            FIELD32(0x00000010)
+#define AUX_OPT_BIT5            FIELD32(0x00000020)
+#define AUX_OPT_BIT6            FIELD32(0x00000040)
+#define AUX_OPT_BIT7            FIELD32(0x00000080)
+#define AUX_OPT_BIT8            FIELD32(0x00000100)
+#define AUX_OPT_BIT9            FIELD32(0x00000200)
+#define AUX_OPT_BIT10           FIELD32(0x00000400)
+#define AUX_OPT_BIT11           FIELD32(0x00000800)
+#define AUX_OPT_BIT12           FIELD32(0x00001000)
+#define AUX_OPT_BIT13           FIELD32(0x00002000)
+#define AUX_OPT_BIT14           FIELD32(0x00004000)
+#define AUX_OPT_BIT15           FIELD32(0x00008000)
+#define LDO25_LEVEL             FIELD32(0x00030000)
+#define LDO25_LARGEA            FIELD32(0x00040000)
+#define LDO25_FRC_ON            FIELD32(0x00080000)
+#define CMB_RSV                 FIELD32(0x00300000)
+#define XTAL_RDY                FIELD32(0x00400000)
+#define PLL_LD                  FIELD32(0x00800000)
+#define LDO_CORE_LEVEL          FIELD32(0x0F000000)
+#define LDO_BGSEL               FIELD32(0x30000000)
+#define LDO3_EN                 FIELD32(0x40000000)
+#define LDO0_EN                 FIELD32(0x80000000)
+
+/*
+ * EFUSE_CSR_3290: RT3290 EEPROM
+ */
+#define EFUSE_CTRL_3290                 0x0024
+
+/*
+ * EFUSE_DATA3 of 3290
+ */
+#define EFUSE_DATA3_3290                0x0028
+
+/*
+ * EFUSE_DATA2 of 3290
+ */
+#define EFUSE_DATA2_3290                0x002c
+
+/*
+ * EFUSE_DATA1 of 3290
+ */
+#define EFUSE_DATA1_3290                0x0030
+
+/*
+ * EFUSE_DATA0 of 3290
+ */
+#define EFUSE_DATA0_3290                0x0034
+
+/*
+ * OSC_CTRL_CFG
+ * Ring oscillator configuration
+ */
+#define OSC_CTRL                0x0038
+#define OSC_REF_CYCLE           FIELD32(0x00001fff)
+#define OSC_RSV                 FIELD32(0x0000e000)
+#define OSC_CAL_CNT             FIELD32(0x0fff0000)
+#define OSC_CAL_ACK             FIELD32(0x10000000)
+#define OSC_CLK_32K_VLD         FIELD32(0x20000000)
+#define OSC_CAL_REQ             FIELD32(0x40000000)
+#define OSC_ROSC_EN             FIELD32(0x80000000)
+
+/*
+ * COEX_CFG_0
+ */
+#define COEX_CFG0                       0x0040
+#define COEX_CFG_ANT            FIELD32(0xff000000)
+/*
+ * COEX_CFG_1
+ */
+#define COEX_CFG1                       0x0044
+
+/*
+ * COEX_CFG_2
+ */
+#define COEX_CFG2                       0x0048
+#define BT_COEX_CFG1            FIELD32(0xff000000)
+#define BT_COEX_CFG0            FIELD32(0x00ff0000)
+#define WL_COEX_CFG1            FIELD32(0x0000ff00)
+#define WL_COEX_CFG0            FIELD32(0x000000ff)
+/*
+ * PLL_CTRL_CFG
+ * PLL configuration register
+ */
+#define PLL_CTRL                0x0050
+#define PLL_RESERVED_INPUT1     FIELD32(0x000000ff)
+#define PLL_RESERVED_INPUT2     FIELD32(0x0000ff00)
+#define PLL_CONTROL             FIELD32(0x00070000)
+#define PLL_LPF_R1              FIELD32(0x00080000)
+#define PLL_LPF_C1_CTRL FIELD32(0x00300000)
+#define PLL_LPF_C2_CTRL FIELD32(0x00c00000)
+#define PLL_CP_CURRENT_CTRL     FIELD32(0x03000000)
+#define PLL_PFD_DELAY_CTRL      FIELD32(0x0c000000)
+#define PLL_LOCK_CTRL           FIELD32(0x70000000)
+#define PLL_VBGBK_EN            FIELD32(0x80000000)
+
+
+/*
+ * WLAN_CTRL_CFG
+ * RT3290 wlan configuration
+ */
+#define WLAN_FUN_CTRL                   0x0080
+#define WLAN_EN                         FIELD32(0x00000001)
+#define WLAN_CLK_EN                     FIELD32(0x00000002)
+#define WLAN_RSV1                       FIELD32(0x00000004)
+#define WLAN_RESET                      FIELD32(0x00000008)
+#define PCIE_APP0_CLK_REQ               FIELD32(0x00000010)
+#define FRC_WL_ANT_SET                  FIELD32(0x00000020)
+#define INV_TR_SW0                      FIELD32(0x00000040)
+#define WLAN_GPIO_IN_BIT0               FIELD32(0x00000100)
+#define WLAN_GPIO_IN_BIT1               FIELD32(0x00000200)
+#define WLAN_GPIO_IN_BIT2               FIELD32(0x00000400)
+#define WLAN_GPIO_IN_BIT3               FIELD32(0x00000800)
+#define WLAN_GPIO_IN_BIT4               FIELD32(0x00001000)
+#define WLAN_GPIO_IN_BIT5               FIELD32(0x00002000)
+#define WLAN_GPIO_IN_BIT6               FIELD32(0x00004000)
+#define WLAN_GPIO_IN_BIT7               FIELD32(0x00008000)
+#define WLAN_GPIO_IN_BIT_ALL            FIELD32(0x0000ff00)
+#define WLAN_GPIO_OUT_BIT0              FIELD32(0x00010000)
+#define WLAN_GPIO_OUT_BIT1              FIELD32(0x00020000)
+#define WLAN_GPIO_OUT_BIT2              FIELD32(0x00040000)
+#define WLAN_GPIO_OUT_BIT3              FIELD32(0x00050000)
+#define WLAN_GPIO_OUT_BIT4              FIELD32(0x00100000)
+#define WLAN_GPIO_OUT_BIT5              FIELD32(0x00200000)
+#define WLAN_GPIO_OUT_BIT6              FIELD32(0x00400000)
+#define WLAN_GPIO_OUT_BIT7              FIELD32(0x00800000)
+#define WLAN_GPIO_OUT_BIT_ALL           FIELD32(0x00ff0000)
+#define WLAN_GPIO_OUT_OE_BIT0           FIELD32(0x01000000)
+#define WLAN_GPIO_OUT_OE_BIT1           FIELD32(0x02000000)
+#define WLAN_GPIO_OUT_OE_BIT2           FIELD32(0x04000000)
+#define WLAN_GPIO_OUT_OE_BIT3           FIELD32(0x08000000)
+#define WLAN_GPIO_OUT_OE_BIT4           FIELD32(0x10000000)
+#define WLAN_GPIO_OUT_OE_BIT5           FIELD32(0x20000000)
+#define WLAN_GPIO_OUT_OE_BIT6           FIELD32(0x40000000)
+#define WLAN_GPIO_OUT_OE_BIT7           FIELD32(0x80000000)
+#define WLAN_GPIO_OUT_OE_BIT_ALL        FIELD32(0xff000000)
+
+/*
  * AUX_CTRL: Aux/PCI-E related configuration
  */
 #define AUX_CTRL                        0x10c
@@ -1760,9 +1914,11 @@ struct mac_iveiv_entry {
 /*
  * BBP 3: RX Antenna
  */
-#define BBP3_RX_ADC                             FIELD8(0x03)
+#define BBP3_RX_ADC                     FIELD8(0x03)
 #define BBP3_RX_ANTENNA                 FIELD8(0x18)
 #define BBP3_HT40_MINUS                 FIELD8(0x20)
+#define BBP3_ADC_MODE_SWITCH            FIELD8(0x40)
+#define BBP3_ADC_INIT_MODE              FIELD8(0x80)
 
 /*
  * BBP 4: Bandwidth
@@ -1772,6 +1928,14 @@ struct mac_iveiv_entry {
 #define BBP4_MAC_IF_CTRL                FIELD8(0x40)
 
 /*
+ * BBP 47: Bandwidth
+ */
+#define BBP47_TSSI_REPORT_SEL           FIELD8(0x03)
+#define BBP47_TSSI_UPDATE_REQ           FIELD8(0x04)
+#define BBP47_TSSI_TSSI_MODE            FIELD8(0x18)
+#define BBP47_TSSI_ADC6                 FIELD8(0x80)
+
+/*
  * BBP 109
  */
 #define BBP109_TX0_POWER                FIELD8(0x0f)
@@ -1914,6 +2078,16 @@ struct mac_iveiv_entry {
 #define RFCSR27_R4                      FIELD8(0x40)
 
 /*
+ * RFCSR 29:
+ */
+#define RFCSR29_ADC6_TEST               FIELD8(0x01)
+#define RFCSR29_ADC6_INT_TEST           FIELD8(0x02)
+#define RFCSR29_RSSI_RESET              FIELD8(0x04)
+#define RFCSR29_RSSI_ON                 FIELD8(0x08)
+#define RFCSR29_RSSI_RIP_CTRL           FIELD8(0x30)
+#define RFCSR29_RSSI_GAIN               FIELD8(0xc0)
+
+/*
  * RFCSR 30:
  */
 #define RFCSR30_TX_H20M                 FIELD8(0x02)
@@ -1944,6 +2118,11 @@ struct mac_iveiv_entry {
 #define RFCSR49_TX                      FIELD8(0x3f)
 
 /*
+ * RFCSR 50:
+ */
+#define RFCSR50_TX                      FIELD8(0x3f)
+
+/*
  * RF registers
  */
 
diff --git a/drivers/net/wireless/rt2x00/rt2800lib.c b/drivers/net/wireless/rt2x00/rt2800lib.c
index dfc90d34be6..068276ee8af 100644
--- a/drivers/net/wireless/rt2x00/rt2800lib.c
+++ b/drivers/net/wireless/rt2x00/rt2800lib.c
@@ -354,16 +354,15 @@ int rt2800_check_firmware(struct rt2x00_dev *rt2x00dev,
          * of 4kb. Certain USB chipsets however require different firmware,
          * which Ralink only provides attached to the original firmware
          * file. Thus for USB devices, firmware files have a length
-         * which is a multiple of 4kb.
+         * which is a multiple of 4kb. The firmware for rt3290 chip also
+         * have a length which is a multiple of 4kb.
          */
-        if (rt2x00_is_usb(rt2x00dev)) {
+        if (rt2x00_is_usb(rt2x00dev) || rt2x00_rt(rt2x00dev, RT3290))
                 fw_len = 4096;
-                multiple = true;
-        } else {
+        else
                 fw_len = 8192;
-                multiple = true;
-        }
 
+        multiple = true;
         /*
          * Validate the firmware length
          */
@@ -415,7 +414,8 @@ int rt2800_load_firmware(struct rt2x00_dev *rt2x00dev,
                 return -EBUSY;
 
         if (rt2x00_is_pci(rt2x00dev)) {
-                if (rt2x00_rt(rt2x00dev, RT3572) ||
+                if (rt2x00_rt(rt2x00dev, RT3290) ||
+                    rt2x00_rt(rt2x00dev, RT3572) ||
                     rt2x00_rt(rt2x00dev, RT5390) ||
                     rt2x00_rt(rt2x00dev, RT5392)) {
                         rt2800_register_read(rt2x00dev, AUX_CTRL, &reg);
@@ -851,8 +851,13 @@ int rt2800_rfkill_poll(struct rt2x00_dev *rt2x00dev)
 {
         u32 reg;
 
-        rt2800_register_read(rt2x00dev, GPIO_CTRL_CFG, &reg);
-        return rt2x00_get_field32(reg, GPIO_CTRL_CFG_BIT2);
+        if (rt2x00_rt(rt2x00dev, RT3290)) {
+                rt2800_register_read(rt2x00dev, WLAN_FUN_CTRL, &reg);
+                return rt2x00_get_field32(reg, WLAN_GPIO_IN_BIT0);
+        } else {
+                rt2800_register_read(rt2x00dev, GPIO_CTRL_CFG, &reg);
+                return rt2x00_get_field32(reg, GPIO_CTRL_CFG_BIT2);
+        }
 }
 EXPORT_SYMBOL_GPL(rt2800_rfkill_poll);
 
@@ -1935,9 +1940,54 @@ static void rt2800_config_channel_rf3052(struct rt2x00_dev *rt2x00dev,
         rt2800_rfcsr_write(rt2x00dev, 7, rfcsr);
 }
 
+#define RT3290_POWER_BOUND     0x27
+#define RT3290_FREQ_OFFSET_BOUND       0x5f
 #define RT5390_POWER_BOUND     0x27
 #define RT5390_FREQ_OFFSET_BOUND       0x5f
 
+static void rt2800_config_channel_rf3290(struct rt2x00_dev *rt2x00dev,
+                                         struct ieee80211_conf *conf,
+                                         struct rf_channel *rf,
+                                         struct channel_info *info)
+{
+        u8 rfcsr;
+
+        rt2800_rfcsr_write(rt2x00dev, 8, rf->rf1);
+        rt2800_rfcsr_write(rt2x00dev, 9, rf->rf3);
+        rt2800_rfcsr_read(rt2x00dev, 11, &rfcsr);
+        rt2x00_set_field8(&rfcsr, RFCSR11_R, rf->rf2);
+        rt2800_rfcsr_write(rt2x00dev, 11, rfcsr);
+
+        rt2800_rfcsr_read(rt2x00dev, 49, &rfcsr);
+        if (info->default_power1 > RT3290_POWER_BOUND)
+                rt2x00_set_field8(&rfcsr, RFCSR49_TX, RT3290_POWER_BOUND);
+        else
+                rt2x00_set_field8(&rfcsr, RFCSR49_TX, info->default_power1);
+        rt2800_rfcsr_write(rt2x00dev, 49, rfcsr);
+
+        rt2800_rfcsr_read(rt2x00dev, 17, &rfcsr);
+        if (rt2x00dev->freq_offset > RT3290_FREQ_OFFSET_BOUND)
+                rt2x00_set_field8(&rfcsr, RFCSR17_CODE,
+                                  RT3290_FREQ_OFFSET_BOUND);
+        else
+                rt2x00_set_field8(&rfcsr, RFCSR17_CODE, rt2x00dev->freq_offset);
+        rt2800_rfcsr_write(rt2x00dev, 17, rfcsr);
+
+        if (rf->channel <= 14) {
+                if (rf->channel == 6)
+                        rt2800_bbp_write(rt2x00dev, 68, 0x0c);
+                else
+                        rt2800_bbp_write(rt2x00dev, 68, 0x0b);
+
+                if (rf->channel >= 1 && rf->channel <= 6)
+                        rt2800_bbp_write(rt2x00dev, 59, 0x0f);
+                else if (rf->channel >= 7 && rf->channel <= 11)
+                        rt2800_bbp_write(rt2x00dev, 59, 0x0e);
+                else if (rf->channel >= 12 && rf->channel <= 14)
+                        rt2800_bbp_write(rt2x00dev, 59, 0x0d);
+        }
+}
+
 static void rt2800_config_channel_rf53xx(struct rt2x00_dev *rt2x00dev,
                                          struct ieee80211_conf *conf,
                                          struct rf_channel *rf,
@@ -1958,7 +2008,22 @@ static void rt2800_config_channel_rf53xx(struct rt2x00_dev *rt2x00dev,
                 rt2x00_set_field8(&rfcsr, RFCSR49_TX, info->default_power1);
         rt2800_rfcsr_write(rt2x00dev, 49, rfcsr);
 
+        if (rt2x00_rt(rt2x00dev, RT5392)) {
+                rt2800_rfcsr_read(rt2x00dev, 50, &rfcsr);
+                if (info->default_power1 > RT5390_POWER_BOUND)
+                        rt2x00_set_field8(&rfcsr, RFCSR50_TX,
+                                          RT5390_POWER_BOUND);
+                else
+                        rt2x00_set_field8(&rfcsr, RFCSR50_TX,
+                                          info->default_power2);
+                rt2800_rfcsr_write(rt2x00dev, 50, rfcsr);
+        }
+
         rt2800_rfcsr_read(rt2x00dev, 1, &rfcsr);
+        if (rt2x00_rt(rt2x00dev, RT5392)) {
+                rt2x00_set_field8(&rfcsr, RFCSR1_RX1_PD, 1);
+                rt2x00_set_field8(&rfcsr, RFCSR1_TX1_PD, 1);
+        }
         rt2x00_set_field8(&rfcsr, RFCSR1_RF_BLOCK_EN, 1);
         rt2x00_set_field8(&rfcsr, RFCSR1_PLL_PD, 1);
         rt2x00_set_field8(&rfcsr, RFCSR1_RX0_PD, 1);
@@ -2021,15 +2086,6 @@ static void rt2800_config_channel_rf53xx(struct rt2x00_dev *rt2x00dev,
                         }
                 }
         }
-
-        rt2800_rfcsr_read(rt2x00dev, 30, &rfcsr);
-        rt2x00_set_field8(&rfcsr, RFCSR30_TX_H20M, 0);
-        rt2x00_set_field8(&rfcsr, RFCSR30_RX_H20M, 0);
-        rt2800_rfcsr_write(rt2x00dev, 30, rfcsr);
-
-        rt2800_rfcsr_read(rt2x00dev, 3, &rfcsr);
-        rt2x00_set_field8(&rfcsr, RFCSR30_RF_CALIBRATION, 1);
-        rt2800_rfcsr_write(rt2x00dev, 3, rfcsr);
 }
 
 static void rt2800_config_channel(struct rt2x00_dev *rt2x00dev,
@@ -2039,7 +2095,7 @@ static void rt2800_config_channel(struct rt2x00_dev *rt2x00dev,
 {
         u32 reg;
         unsigned int tx_pin;
-        u8 bbp;
+        u8 bbp, rfcsr;
 
         if (rf->channel <= 14) {
                 info->default_power1 = TXPOWER_G_TO_DEV(info->default_power1);
@@ -2060,15 +2116,36 @@ static void rt2800_config_channel(struct rt2x00_dev *rt2x00dev,
         case RF3052:
                 rt2800_config_channel_rf3052(rt2x00dev, conf, rf, info);
                 break;
+        case RF3290:
+                rt2800_config_channel_rf3290(rt2x00dev, conf, rf, info);
+                break;
+        case RF5360:
         case RF5370:
         case RF5372:
         case RF5390:
+        case RF5392:
                 rt2800_config_channel_rf53xx(rt2x00dev, conf, rf, info);
                 break;
         default:
                 rt2800_config_channel_rf2xxx(rt2x00dev, conf, rf, info);
         }
 
+        if (rt2x00_rf(rt2x00dev, RF3290) ||
+            rt2x00_rf(rt2x00dev, RF5360) ||
+            rt2x00_rf(rt2x00dev, RF5370) ||
+            rt2x00_rf(rt2x00dev, RF5372) ||
+            rt2x00_rf(rt2x00dev, RF5390) ||
+            rt2x00_rf(rt2x00dev, RF5392)) {
+                rt2800_rfcsr_read(rt2x00dev, 30, &rfcsr);
+                rt2x00_set_field8(&rfcsr, RFCSR30_TX_H20M, 0);
+                rt2x00_set_field8(&rfcsr, RFCSR30_RX_H20M, 0);
+                rt2800_rfcsr_write(rt2x00dev, 30, rfcsr);
+
+                rt2800_rfcsr_read(rt2x00dev, 3, &rfcsr);
+                rt2x00_set_field8(&rfcsr, RFCSR30_RF_CALIBRATION, 1);
+                rt2800_rfcsr_write(rt2x00dev, 3, rfcsr);
+        }
+
         /*
          * Change BBP settings
          */
@@ -2549,9 +2626,12 @@ void rt2800_vco_calibration(struct rt2x00_dev *rt2x00dev)
                 rt2x00_set_field8(&rfcsr, RFCSR7_RF_TUNING, 1);
                 rt2800_rfcsr_write(rt2x00dev, 7, rfcsr);
                 break;
+        case RF3290:
+        case RF5360:
         case RF5370:
         case RF5372:
         case RF5390:
+        case RF5392:
                 rt2800_rfcsr_read(rt2x00dev, 3, &rfcsr);
                 rt2x00_set_field8(&rfcsr, RFCSR30_RF_CALIBRATION, 1);
                 rt2800_rfcsr_write(rt2x00dev, 3, rfcsr);
@@ -2682,6 +2762,7 @@ static u8 rt2800_get_default_vgc(struct rt2x00_dev *rt2x00dev)
                 if (rt2x00_rt(rt2x00dev, RT3070) ||
                     rt2x00_rt(rt2x00dev, RT3071) ||
                     rt2x00_rt(rt2x00dev, RT3090) ||
+                    rt2x00_rt(rt2x00dev, RT3290) ||
                     rt2x00_rt(rt2x00dev, RT3390) ||
                     rt2x00_rt(rt2x00dev, RT5390) ||
                     rt2x00_rt(rt2x00dev, RT5392))
@@ -2778,10 +2859,54 @@ static int rt2800_init_registers(struct rt2x00_dev *rt2x00dev)
         rt2x00_set_field32(&reg, BKOFF_SLOT_CFG_CC_DELAY_TIME, 2);
         rt2800_register_write(rt2x00dev, BKOFF_SLOT_CFG, reg);
 
+        if (rt2x00_rt(rt2x00dev, RT3290)) {
+                rt2800_register_read(rt2x00dev, WLAN_FUN_CTRL, &reg);
+                if (rt2x00_get_field32(reg, WLAN_EN) == 1) {
+                        rt2x00_set_field32(&reg, PCIE_APP0_CLK_REQ, 1);
+                        rt2800_register_write(rt2x00dev, WLAN_FUN_CTRL, reg);
+                }
+
+                rt2800_register_read(rt2x00dev, CMB_CTRL, &reg);
+                if (!(rt2x00_get_field32(reg, LDO0_EN) == 1)) {
+                        rt2x00_set_field32(&reg, LDO0_EN, 1);
+                        rt2x00_set_field32(&reg, LDO_BGSEL, 3);
+                        rt2800_register_write(rt2x00dev, CMB_CTRL, reg);
+                }
+
+                rt2800_register_read(rt2x00dev, OSC_CTRL, &reg);
+                rt2x00_set_field32(&reg, OSC_ROSC_EN, 1);
+                rt2x00_set_field32(&reg, OSC_CAL_REQ, 1);
+                rt2x00_set_field32(&reg, OSC_REF_CYCLE, 0x27);
+                rt2800_register_write(rt2x00dev, OSC_CTRL, reg);
+
+                rt2800_register_read(rt2x00dev, COEX_CFG0, &reg);
+                rt2x00_set_field32(&reg, COEX_CFG_ANT, 0x5e);
+                rt2800_register_write(rt2x00dev, COEX_CFG0, reg);
+
+                rt2800_register_read(rt2x00dev, COEX_CFG2, &reg);
+                rt2x00_set_field32(&reg, BT_COEX_CFG1, 0x00);
+                rt2x00_set_field32(&reg, BT_COEX_CFG0, 0x17);
+                rt2x00_set_field32(&reg, WL_COEX_CFG1, 0x93);
+                rt2x00_set_field32(&reg, WL_COEX_CFG0, 0x7f);
+                rt2800_register_write(rt2x00dev, COEX_CFG2, reg);
+
+                rt2800_register_read(rt2x00dev, PLL_CTRL, &reg);
+                rt2x00_set_field32(&reg, PLL_CONTROL, 1);
+                rt2800_register_write(rt2x00dev, PLL_CTRL, reg);
+        }
+
         if (rt2x00_rt(rt2x00dev, RT3071) ||
             rt2x00_rt(rt2x00dev, RT3090) ||
+            rt2x00_rt(rt2x00dev, RT3290) ||
             rt2x00_rt(rt2x00dev, RT3390)) {
-                rt2800_register_write(rt2x00dev, TX_SW_CFG0, 0x00000400);
+
+                if (rt2x00_rt(rt2x00dev, RT3290))
+                        rt2800_register_write(rt2x00dev, TX_SW_CFG0,
+                                              0x00000404);
+                else
+                        rt2800_register_write(rt2x00dev, TX_SW_CFG0,
+                                              0x00000400);
+
                 rt2800_register_write(rt2x00dev, TX_SW_CFG1, 0x00000000);
                 if (rt2x00_rt_rev_lt(rt2x00dev, RT3071, REV_RT3071E) ||
                     rt2x00_rt_rev_lt(rt2x00dev, RT3090, REV_RT3090E) ||
@@ -3190,14 +3315,16 @@ static int rt2800_init_bbp(struct rt2x00_dev *rt2x00dev)
                      rt2800_wait_bbp_ready(rt2x00dev)))
                 return -EACCES;
 
-        if (rt2x00_rt(rt2x00dev, RT5390) ||
-                rt2x00_rt(rt2x00dev, RT5392)) {
+        if (rt2x00_rt(rt2x00dev, RT3290) ||
+            rt2x00_rt(rt2x00dev, RT5390) ||
+            rt2x00_rt(rt2x00dev, RT5392)) {
                 rt2800_bbp_read(rt2x00dev, 4, &value);
                 rt2x00_set_field8(&value, BBP4_MAC_IF_CTRL, 1);
                 rt2800_bbp_write(rt2x00dev, 4, value);
         }
 
         if (rt2800_is_305x_soc(rt2x00dev) ||
+            rt2x00_rt(rt2x00dev, RT3290) ||
             rt2x00_rt(rt2x00dev, RT3572) ||
             rt2x00_rt(rt2x00dev, RT5390) ||
             rt2x00_rt(rt2x00dev, RT5392))
@@ -3206,20 +3333,26 @@ static int rt2800_init_bbp(struct rt2x00_dev *rt2x00dev)
         rt2800_bbp_write(rt2x00dev, 65, 0x2c);
         rt2800_bbp_write(rt2x00dev, 66, 0x38);
 
-        if (rt2x00_rt(rt2x00dev, RT5390) ||
-                rt2x00_rt(rt2x00dev, RT5392))
+        if (rt2x00_rt(rt2x00dev, RT3290) ||
+            rt2x00_rt(rt2x00dev, RT5390) ||
+            rt2x00_rt(rt2x00dev, RT5392))
                 rt2800_bbp_write(rt2x00dev, 68, 0x0b);
 
         if (rt2x00_rt_rev(rt2x00dev, RT2860, REV_RT2860C)) {
                 rt2800_bbp_write(rt2x00dev, 69, 0x16);
                 rt2800_bbp_write(rt2x00dev, 73, 0x12);
-        } else if (rt2x00_rt(rt2x00dev, RT5390) ||
-                           rt2x00_rt(rt2x00dev, RT5392)) {
+        } else if (rt2x00_rt(rt2x00dev, RT3290) ||
+                   rt2x00_rt(rt2x00dev, RT5390) ||
+                   rt2x00_rt(rt2x00dev, RT5392)) {
                 rt2800_bbp_write(rt2x00dev, 69, 0x12);
                 rt2800_bbp_write(rt2x00dev, 73, 0x13);
                 rt2800_bbp_write(rt2x00dev, 75, 0x46);
                 rt2800_bbp_write(rt2x00dev, 76, 0x28);
-                rt2800_bbp_write(rt2x00dev, 77, 0x59);
+
+                if (rt2x00_rt(rt2x00dev, RT3290))
+                        rt2800_bbp_write(rt2x00dev, 77, 0x58);
+                else
+                        rt2800_bbp_write(rt2x00dev, 77, 0x59);
         } else {
                 rt2800_bbp_write(rt2x00dev, 69, 0x12);
                 rt2800_bbp_write(rt2x00dev, 73, 0x10);
@@ -3244,23 +3377,33 @@ static int rt2800_init_bbp(struct rt2x00_dev *rt2x00dev)
                 rt2800_bbp_write(rt2x00dev, 81, 0x37);
         }
 
+        if (rt2x00_rt(rt2x00dev, RT3290)) {
+                rt2800_bbp_write(rt2x00dev, 74, 0x0b);
+                rt2800_bbp_write(rt2x00dev, 79, 0x18);
+                rt2800_bbp_write(rt2x00dev, 80, 0x09);
+                rt2800_bbp_write(rt2x00dev, 81, 0x33);
+        }
+
         rt2800_bbp_write(rt2x00dev, 82, 0x62);
-        if (rt2x00_rt(rt2x00dev, RT5390) ||
-                rt2x00_rt(rt2x00dev, RT5392))
+        if (rt2x00_rt(rt2x00dev, RT3290) ||
+            rt2x00_rt(rt2x00dev, RT5390) ||
+            rt2x00_rt(rt2x00dev, RT5392))
                 rt2800_bbp_write(rt2x00dev, 83, 0x7a);
         else
                 rt2800_bbp_write(rt2x00dev, 83, 0x6a);
 
         if (rt2x00_rt_rev(rt2x00dev, RT2860, REV_RT2860D))
                 rt2800_bbp_write(rt2x00dev, 84, 0x19);
-        else if (rt2x00_rt(rt2x00dev, RT5390) ||
-                         rt2x00_rt(rt2x00dev, RT5392))
+        else if (rt2x00_rt(rt2x00dev, RT3290) ||
+                     rt2x00_rt(rt2x00dev, RT5390) ||
+                     rt2x00_rt(rt2x00dev, RT5392))
                 rt2800_bbp_write(rt2x00dev, 84, 0x9a);
         else
                 rt2800_bbp_write(rt2x00dev, 84, 0x99);
 
-        if (rt2x00_rt(rt2x00dev, RT5390) ||
-                rt2x00_rt(rt2x00dev, RT5392))
+        if (rt2x00_rt(rt2x00dev, RT3290) ||
+            rt2x00_rt(rt2x00dev, RT5390) ||
+            rt2x00_rt(rt2x00dev, RT5392))
                 rt2800_bbp_write(rt2x00dev, 86, 0x38);
         else
                 rt2800_bbp_write(rt2x00dev, 86, 0x00);
@@ -3270,8 +3413,9 @@ static int rt2800_init_bbp(struct rt2x00_dev *rt2x00dev)
 
         rt2800_bbp_write(rt2x00dev, 91, 0x04);
 
-        if (rt2x00_rt(rt2x00dev, RT5390) ||
-                rt2x00_rt(rt2x00dev, RT5392))
+        if (rt2x00_rt(rt2x00dev, RT3290) ||
+            rt2x00_rt(rt2x00dev, RT5390) ||
+            rt2x00_rt(rt2x00dev, RT5392))
                 rt2800_bbp_write(rt2x00dev, 92, 0x02);
         else
                 rt2800_bbp_write(rt2x00dev, 92, 0x00);
@@ -3285,6 +3429,7 @@ static int rt2800_init_bbp(struct rt2x00_dev *rt2x00dev)
             rt2x00_rt_rev_gte(rt2x00dev, RT3071, REV_RT3071E) ||
             rt2x00_rt_rev_gte(rt2x00dev, RT3090, REV_RT3090E) ||
             rt2x00_rt_rev_gte(rt2x00dev, RT3390, REV_RT3390E) ||
+            rt2x00_rt(rt2x00dev, RT3290) ||
             rt2x00_rt(rt2x00dev, RT3572) ||
             rt2x00_rt(rt2x00dev, RT5390) ||
             rt2x00_rt(rt2x00dev, RT5392) ||
@@ -3293,27 +3438,32 @@ static int rt2800_init_bbp(struct rt2x00_dev *rt2x00dev)
         else
                 rt2800_bbp_write(rt2x00dev, 103, 0x00);
 
-        if (rt2x00_rt(rt2x00dev, RT5390) ||
-                rt2x00_rt(rt2x00dev, RT5392))
+        if (rt2x00_rt(rt2x00dev, RT3290) ||
+            rt2x00_rt(rt2x00dev, RT5390) ||
+            rt2x00_rt(rt2x00dev, RT5392))
                 rt2800_bbp_write(rt2x00dev, 104, 0x92);
 
         if (rt2800_is_305x_soc(rt2x00dev))
                 rt2800_bbp_write(rt2x00dev, 105, 0x01);
+        else if (rt2x00_rt(rt2x00dev, RT3290))
+                rt2800_bbp_write(rt2x00dev, 105, 0x1c);
         else if (rt2x00_rt(rt2x00dev, RT5390) ||
                          rt2x00_rt(rt2x00dev, RT5392))
                 rt2800_bbp_write(rt2x00dev, 105, 0x3c);
         else
                 rt2800_bbp_write(rt2x00dev, 105, 0x05);
 
-        if (rt2x00_rt(rt2x00dev, RT5390))
+        if (rt2x00_rt(rt2x00dev, RT3290) ||
+            rt2x00_rt(rt2x00dev, RT5390))
                 rt2800_bbp_write(rt2x00dev, 106, 0x03);
         else if (rt2x00_rt(rt2x00dev, RT5392))
                 rt2800_bbp_write(rt2x00dev, 106, 0x12);
         else
                 rt2800_bbp_write(rt2x00dev, 106, 0x35);
 
-        if (rt2x00_rt(rt2x00dev, RT5390) ||
-                rt2x00_rt(rt2x00dev, RT5392))
+        if (rt2x00_rt(rt2x00dev, RT3290) ||
+            rt2x00_rt(rt2x00dev, RT5390) ||
+            rt2x00_rt(rt2x00dev, RT5392))
                 rt2800_bbp_write(rt2x00dev, 128, 0x12);
 
         if (rt2x00_rt(rt2x00dev, RT5392)) {
@@ -3338,6 +3488,29 @@ static int rt2800_init_bbp(struct rt2x00_dev *rt2x00dev)
                 rt2800_bbp_write(rt2x00dev, 138, value);
         }
 
+        if (rt2x00_rt(rt2x00dev, RT3290)) {
+                rt2800_bbp_write(rt2x00dev, 67, 0x24);
+                rt2800_bbp_write(rt2x00dev, 143, 0x04);
+                rt2800_bbp_write(rt2x00dev, 142, 0x99);
+                rt2800_bbp_write(rt2x00dev, 150, 0x30);
+                rt2800_bbp_write(rt2x00dev, 151, 0x2e);
+                rt2800_bbp_write(rt2x00dev, 152, 0x20);
+                rt2800_bbp_write(rt2x00dev, 153, 0x34);
+                rt2800_bbp_write(rt2x00dev, 154, 0x40);
+                rt2800_bbp_write(rt2x00dev, 155, 0x3b);
+                rt2800_bbp_write(rt2x00dev, 253, 0x04);
+
+                rt2800_bbp_read(rt2x00dev, 47, &value);
+                rt2x00_set_field8(&value, BBP47_TSSI_ADC6, 1);
+                rt2800_bbp_write(rt2x00dev, 47, value);
+
+                /* Use 5-bit ADC for Acquisition and 8-bit ADC for data */
+                rt2800_bbp_read(rt2x00dev, 3, &value);
+                rt2x00_set_field8(&value, BBP3_ADC_MODE_SWITCH, 1);
+                rt2x00_set_field8(&value, BBP3_ADC_INIT_MODE, 1);
+                rt2800_bbp_write(rt2x00dev, 3, value);
+        }
+
         if (rt2x00_rt(rt2x00dev, RT5390) ||
                 rt2x00_rt(rt2x00dev, RT5392)) {
                 int ant, div_mode;
@@ -3470,6 +3643,7 @@ static int rt2800_init_rfcsr(struct rt2x00_dev *rt2x00dev)
         if (!rt2x00_rt(rt2x00dev, RT3070) &&
             !rt2x00_rt(rt2x00dev, RT3071) &&
             !rt2x00_rt(rt2x00dev, RT3090) &&
+            !rt2x00_rt(rt2x00dev, RT3290) &&
             !rt2x00_rt(rt2x00dev, RT3390) &&
             !rt2x00_rt(rt2x00dev, RT3572) &&
             !rt2x00_rt(rt2x00dev, RT5390) &&
@@ -3480,8 +3654,9 @@ static int rt2800_init_rfcsr(struct rt2x00_dev *rt2x00dev)
         /*
          * Init RF calibration.
          */
-        if (rt2x00_rt(rt2x00dev, RT5390) ||
-                rt2x00_rt(rt2x00dev, RT5392)) {
+        if (rt2x00_rt(rt2x00dev, RT3290) ||
+            rt2x00_rt(rt2x00dev, RT5390) ||
+            rt2x00_rt(rt2x00dev, RT5392)) {
                 rt2800_rfcsr_read(rt2x00dev, 2, &rfcsr);
                 rt2x00_set_field8(&rfcsr, RFCSR2_RESCAL_EN, 1);
                 rt2800_rfcsr_write(rt2x00dev, 2, rfcsr);
@@ -3519,6 +3694,53 @@ static int rt2800_init_rfcsr(struct rt2x00_dev *rt2x00dev)
                 rt2800_rfcsr_write(rt2x00dev, 24, 0x16);
                 rt2800_rfcsr_write(rt2x00dev, 25, 0x01);
                 rt2800_rfcsr_write(rt2x00dev, 29, 0x1f);
+        } else if (rt2x00_rt(rt2x00dev, RT3290)) {
+                rt2800_rfcsr_write(rt2x00dev, 1, 0x0f);
+                rt2800_rfcsr_write(rt2x00dev, 2, 0x80);
+                rt2800_rfcsr_write(rt2x00dev, 3, 0x08);
+                rt2800_rfcsr_write(rt2x00dev, 4, 0x00);
+                rt2800_rfcsr_write(rt2x00dev, 6, 0xa0);
+                rt2800_rfcsr_write(rt2x00dev, 8, 0xf3);
+                rt2800_rfcsr_write(rt2x00dev, 9, 0x02);
+                rt2800_rfcsr_write(rt2x00dev, 10, 0x53);
+                rt2800_rfcsr_write(rt2x00dev, 11, 0x4a);
+                rt2800_rfcsr_write(rt2x00dev, 12, 0x46);
+                rt2800_rfcsr_write(rt2x00dev, 13, 0x9f);
+                rt2800_rfcsr_write(rt2x00dev, 18, 0x02);
+                rt2800_rfcsr_write(rt2x00dev, 22, 0x20);
+                rt2800_rfcsr_write(rt2x00dev, 25, 0x83);
+                rt2800_rfcsr_write(rt2x00dev, 26, 0x82);
+                rt2800_rfcsr_write(rt2x00dev, 27, 0x09);
+                rt2800_rfcsr_write(rt2x00dev, 29, 0x10);
+                rt2800_rfcsr_write(rt2x00dev, 30, 0x10);
+                rt2800_rfcsr_write(rt2x00dev, 31, 0x80);
+                rt2800_rfcsr_write(rt2x00dev, 32, 0x80);
+                rt2800_rfcsr_write(rt2x00dev, 33, 0x00);
+                rt2800_rfcsr_write(rt2x00dev, 34, 0x05);
+                rt2800_rfcsr_write(rt2x00dev, 35, 0x12);
+                rt2800_rfcsr_write(rt2x00dev, 36, 0x00);
+                rt2800_rfcsr_write(rt2x00dev, 38, 0x85);
+                rt2800_rfcsr_write(rt2x00dev, 39, 0x1b);
+                rt2800_rfcsr_write(rt2x00dev, 40, 0x0b);
+                rt2800_rfcsr_write(rt2x00dev, 41, 0xbb);
+                rt2800_rfcsr_write(rt2x00dev, 42, 0xd5);
+                rt2800_rfcsr_write(rt2x00dev, 43, 0x7b);
+                rt2800_rfcsr_write(rt2x00dev, 44, 0x0e);
+                rt2800_rfcsr_write(rt2x00dev, 45, 0xa2);
+                rt2800_rfcsr_write(rt2x00dev, 46, 0x73);
+                rt2800_rfcsr_write(rt2x00dev, 47, 0x00);
+                rt2800_rfcsr_write(rt2x00dev, 48, 0x10);
+                rt2800_rfcsr_write(rt2x00dev, 49, 0x98);
+                rt2800_rfcsr_write(rt2x00dev, 52, 0x38);
+                rt2800_rfcsr_write(rt2x00dev, 53, 0x00);
+                rt2800_rfcsr_write(rt2x00dev, 54, 0x78);
+                rt2800_rfcsr_write(rt2x00dev, 55, 0x43);
+                rt2800_rfcsr_write(rt2x00dev, 56, 0x02);
+                rt2800_rfcsr_write(rt2x00dev, 57, 0x80);
+                rt2800_rfcsr_write(rt2x00dev, 58, 0x7f);
+                rt2800_rfcsr_write(rt2x00dev, 59, 0x09);
+                rt2800_rfcsr_write(rt2x00dev, 60, 0x45);
+                rt2800_rfcsr_write(rt2x00dev, 61, 0xc1);
         } else if (rt2x00_rt(rt2x00dev, RT3390)) {
                 rt2800_rfcsr_write(rt2x00dev, 0, 0xa0);
                 rt2800_rfcsr_write(rt2x00dev, 1, 0xe1);
@@ -3927,6 +4149,12 @@ static int rt2800_init_rfcsr(struct rt2x00_dev *rt2x00dev)
                 rt2800_rfcsr_write(rt2x00dev, 27, rfcsr);
         }
 
+        if (rt2x00_rt(rt2x00dev, RT3290)) {
+                rt2800_rfcsr_read(rt2x00dev, 29, &rfcsr);
+                rt2x00_set_field8(&rfcsr, RFCSR29_RSSI_GAIN, 3);
+                rt2800_rfcsr_write(rt2x00dev, 29, rfcsr);
+        }
+
         if (rt2x00_rt(rt2x00dev, RT5390) ||
                 rt2x00_rt(rt2x00dev, RT5392)) {
                 rt2800_rfcsr_read(rt2x00dev, 38, &rfcsr);
@@ -4033,9 +4261,14 @@ EXPORT_SYMBOL_GPL(rt2800_disable_radio);
 int rt2800_efuse_detect(struct rt2x00_dev *rt2x00dev)
 {
         u32 reg;
+        u16 efuse_ctrl_reg;
 
-        rt2800_register_read(rt2x00dev, EFUSE_CTRL, &reg);
+        if (rt2x00_rt(rt2x00dev, RT3290))
+                efuse_ctrl_reg = EFUSE_CTRL_3290;
+        else
+                efuse_ctrl_reg = EFUSE_CTRL;
 
+        rt2800_register_read(rt2x00dev, efuse_ctrl_reg, &reg);
         return rt2x00_get_field32(reg, EFUSE_CTRL_PRESENT);
 }
 EXPORT_SYMBOL_GPL(rt2800_efuse_detect);
@@ -4043,27 +4276,44 @@ EXPORT_SYMBOL_GPL(rt2800_efuse_detect);
 static void rt2800_efuse_read(struct rt2x00_dev *rt2x00dev, unsigned int i)
 {
         u32 reg;
-
+        u16 efuse_ctrl_reg;
+        u16 efuse_data0_reg;
+        u16 efuse_data1_reg;
+        u16 efuse_data2_reg;
+        u16 efuse_data3_reg;
+
+        if (rt2x00_rt(rt2x00dev, RT3290)) {
+                efuse_ctrl_reg = EFUSE_CTRL_3290;
+                efuse_data0_reg = EFUSE_DATA0_3290;
+                efuse_data1_reg = EFUSE_DATA1_3290;
+                efuse_data2_reg = EFUSE_DATA2_3290;
+                efuse_data3_reg = EFUSE_DATA3_3290;
+        } else {
+                efuse_ctrl_reg = EFUSE_CTRL;
+                efuse_data0_reg = EFUSE_DATA0;
+                efuse_data1_reg = EFUSE_DATA1;
+                efuse_data2_reg = EFUSE_DATA2;
+                efuse_data3_reg = EFUSE_DATA3;
+        }
         mutex_lock(&rt2x00dev->csr_mutex);
 
-        rt2800_register_read_lock(rt2x00dev, EFUSE_CTRL, &reg);
+        rt2800_register_read_lock(rt2x00dev, efuse_ctrl_reg, &reg);
         rt2x00_set_field32(&reg, EFUSE_CTRL_ADDRESS_IN, i);
         rt2x00_set_field32(&reg, EFUSE_CTRL_MODE, 0);
         rt2x00_set_field32(&reg, EFUSE_CTRL_KICK, 1);
-        rt2800_register_write_lock(rt2x00dev, EFUSE_CTRL, reg);
+        rt2800_register_write_lock(rt2x00dev, efuse_ctrl_reg, reg);
 
         /* Wait until the EEPROM has been loaded */
-        rt2800_regbusy_read(rt2x00dev, EFUSE_CTRL, EFUSE_CTRL_KICK, &reg);
-
+        rt2800_regbusy_read(rt2x00dev, efuse_ctrl_reg, EFUSE_CTRL_KICK, &reg);
         /* Apparently the data is read from end to start */
-        rt2800_register_read_lock(rt2x00dev, EFUSE_DATA3, &reg);
+        rt2800_register_read_lock(rt2x00dev, efuse_data3_reg, &reg);
         /* The returned value is in CPU order, but eeprom is le */
         *(u32 *)&rt2x00dev->eeprom[i] = cpu_to_le32(reg);
-        rt2800_register_read_lock(rt2x00dev, EFUSE_DATA2, &reg);
+        rt2800_register_read_lock(rt2x00dev, efuse_data2_reg, &reg);
         *(u32 *)&rt2x00dev->eeprom[i + 2] = cpu_to_le32(reg);
-        rt2800_register_read_lock(rt2x00dev, EFUSE_DATA1, &reg);
+        rt2800_register_read_lock(rt2x00dev, efuse_data1_reg, &reg);
         *(u32 *)&rt2x00dev->eeprom[i + 4] = cpu_to_le32(reg);
-        rt2800_register_read_lock(rt2x00dev, EFUSE_DATA0, &reg);
+        rt2800_register_read_lock(rt2x00dev, efuse_data0_reg, &reg);
         *(u32 *)&rt2x00dev->eeprom[i + 6] = cpu_to_le32(reg);
 
         mutex_unlock(&rt2x00dev->csr_mutex);
@@ -4225,9 +4475,14 @@ int rt2800_init_eeprom(struct rt2x00_dev *rt2x00dev)
          * RT28xx/RT30xx: defined in "EEPROM_NIC_CONF0_RF_TYPE" field
          * RT53xx: defined in "EEPROM_CHIP_ID" field
          */
-        rt2800_register_read(rt2x00dev, MAC_CSR0, &reg);
-        if (rt2x00_get_field32(reg, MAC_CSR0_CHIPSET) == RT5390 ||
-                rt2x00_get_field32(reg, MAC_CSR0_CHIPSET) == RT5392)
+        if (rt2x00_rt(rt2x00dev, RT3290))
+                rt2800_register_read(rt2x00dev, MAC_CSR0_3290, &reg);
+        else
+                rt2800_register_read(rt2x00dev, MAC_CSR0, &reg);
+
+        if (rt2x00_get_field32(reg, MAC_CSR0_CHIPSET) == RT3290 ||
+            rt2x00_get_field32(reg, MAC_CSR0_CHIPSET) == RT5390 ||
+            rt2x00_get_field32(reg, MAC_CSR0_CHIPSET) == RT5392)
                 rt2x00_eeprom_read(rt2x00dev, EEPROM_CHIP_ID, &value);
         else
                 value = rt2x00_get_field16(eeprom, EEPROM_NIC_CONF0_RF_TYPE);
@@ -4242,6 +4497,7 @@ int rt2800_init_eeprom(struct rt2x00_dev *rt2x00dev)
         case RT3070:
         case RT3071:
         case RT3090:
+        case RT3290:
         case RT3390:
         case RT3572:
         case RT5390:
@@ -4262,10 +4518,13 @@ int rt2800_init_eeprom(struct rt2x00_dev *rt2x00dev)
         case RF3021:
         case RF3022:
         case RF3052:
+        case RF3290:
         case RF3320:
+        case RF5360:
         case RF5370:
         case RF5372:
         case RF5390:
+        case RF5392:
                 break;
         default:
                 ERROR(rt2x00dev, "Invalid RF chipset 0x%04x detected.\n",
@@ -4576,10 +4835,13 @@ int rt2800_probe_hw_mode(struct rt2x00_dev *rt2x00dev)
                    rt2x00_rf(rt2x00dev, RF2020) ||
                    rt2x00_rf(rt2x00dev, RF3021) ||
                    rt2x00_rf(rt2x00dev, RF3022) ||
+                   rt2x00_rf(rt2x00dev, RF3290) ||
                    rt2x00_rf(rt2x00dev, RF3320) ||
+                   rt2x00_rf(rt2x00dev, RF5360) ||
                    rt2x00_rf(rt2x00dev, RF5370) ||
                    rt2x00_rf(rt2x00dev, RF5372) ||
-                   rt2x00_rf(rt2x00dev, RF5390)) {
+                   rt2x00_rf(rt2x00dev, RF5390) ||
+                   rt2x00_rf(rt2x00dev, RF5392)) {
                 spec->num_channels = 14;
                 spec->channels = rf_vals_3x;
         } else if (rt2x00_rf(rt2x00dev, RF3052)) {
@@ -4662,9 +4924,12 @@ int rt2800_probe_hw_mode(struct rt2x00_dev *rt2x00dev)
         case RF3022:
         case RF3320:
         case RF3052:
+        case RF3290:
+        case RF5360:
         case RF5370:
         case RF5372:
         case RF5390:
+        case RF5392:
                 __set_bit(CAPABILITY_VCO_RECALIBRATION, &rt2x00dev->cap_flags);
                 break;
         }
diff --git a/drivers/net/wireless/rt2x00/rt2800pci.c b/drivers/net/wireless/rt2x00/rt2800pci.c
index cad25bfebd7..dd436125fe3 100644
--- a/drivers/net/wireless/rt2x00/rt2800pci.c
+++ b/drivers/net/wireless/rt2x00/rt2800pci.c
@@ -280,7 +280,13 @@ static void rt2800pci_stop_queue(struct data_queue *queue)
  */
 static char *rt2800pci_get_firmware_name(struct rt2x00_dev *rt2x00dev)
 {
-        return FIRMWARE_RT2860;
+        /*
+         * Chip rt3290 use specific 4KB firmware named rt3290.bin.
+         */
+        if (rt2x00_rt(rt2x00dev, RT3290))
+                return FIRMWARE_RT3290;
+        else
+                return FIRMWARE_RT2860;
 }
 
 static int rt2800pci_write_firmware(struct rt2x00_dev *rt2x00dev,
@@ -974,6 +980,66 @@ static int rt2800pci_validate_eeprom(struct rt2x00_dev *rt2x00dev)
         return rt2800_validate_eeprom(rt2x00dev);
 }
 
+static int rt2800_enable_wlan_rt3290(struct rt2x00_dev *rt2x00dev)
+{
+        u32 reg;
+        int i, count;
+
+        rt2800_register_read(rt2x00dev, WLAN_FUN_CTRL, &reg);
+        if ((rt2x00_get_field32(reg, WLAN_EN) == 1))
+                return 0;
+
+        rt2x00_set_field32(&reg, WLAN_GPIO_OUT_OE_BIT_ALL, 0xff);
+        rt2x00_set_field32(&reg, FRC_WL_ANT_SET, 1);
+        rt2x00_set_field32(&reg, WLAN_CLK_EN, 0);
+        rt2x00_set_field32(&reg, WLAN_EN, 1);
+        rt2800_register_write(rt2x00dev, WLAN_FUN_CTRL, reg);
+
+        udelay(REGISTER_BUSY_DELAY);
+
+        count = 0;
+        do {
+                /*
+                 * Check PLL_LD & XTAL_RDY.
+                 */
+                for (i = 0; i < REGISTER_BUSY_COUNT; i++) {
+                        rt2800_register_read(rt2x00dev, CMB_CTRL, &reg);
+                        if ((rt2x00_get_field32(reg, PLL_LD) == 1) &&
+                                (rt2x00_get_field32(reg, XTAL_RDY) == 1))
+                                        break;
+                        udelay(REGISTER_BUSY_DELAY);
+                }
+
+                if (i >= REGISTER_BUSY_COUNT) {
+
+                        if (count >= 10)
+                                return -EIO;
+
+                        rt2800_register_write(rt2x00dev, 0x58, 0x018);
+                        udelay(REGISTER_BUSY_DELAY);
+                        rt2800_register_write(rt2x00dev, 0x58, 0x418);
+                        udelay(REGISTER_BUSY_DELAY);
+                        rt2800_register_write(rt2x00dev, 0x58, 0x618);
+                        udelay(REGISTER_BUSY_DELAY);
+                        count++;
+                } else {
+                        count = 0;
+                }
+
+                rt2800_register_read(rt2x00dev, WLAN_FUN_CTRL, &reg);
+                rt2x00_set_field32(&reg, PCIE_APP0_CLK_REQ, 0);
+                rt2x00_set_field32(&reg, WLAN_CLK_EN, 1);
+                rt2x00_set_field32(&reg, WLAN_RESET, 1);
+                rt2800_register_write(rt2x00dev, WLAN_FUN_CTRL, reg);
+                udelay(10);
+                rt2x00_set_field32(&reg, WLAN_RESET, 0);
+                rt2800_register_write(rt2x00dev, WLAN_FUN_CTRL, reg);
+                udelay(10);
+                rt2800_register_write(rt2x00dev, INT_SOURCE_CSR, 0x7fffffff);
+        } while (count != 0);
+
+        return 0;
+}
 static int rt2800pci_probe_hw(struct rt2x00_dev *rt2x00dev)
 {
         int retval;
@@ -997,6 +1063,17 @@ static int rt2800pci_probe_hw(struct rt2x00_dev *rt2x00dev)
                 return retval;
 
         /*
+         * In probe phase call rt2800_enable_wlan_rt3290 to enable wlan
+         * clk for rt3290. That avoid the MCU fail in start phase.
+         */
+        if (rt2x00_rt(rt2x00dev, RT3290)) {
+                retval = rt2800_enable_wlan_rt3290(rt2x00dev);
+
+                if (retval)
+                        return retval;
+        }
+
+        /*
          * This device has multiple filters for control frames
          * and has a separate filter for PS Poll frames.
          */
@@ -1175,6 +1252,9 @@ static DEFINE_PCI_DEVICE_TABLE(rt2800pci_device_table) = {
         { PCI_DEVICE(0x1432, 0x7768) },
         { PCI_DEVICE(0x1462, 0x891a) },
         { PCI_DEVICE(0x1a3b, 0x1059) },
+#ifdef CONFIG_RT2800PCI_RT3290
+        { PCI_DEVICE(0x1814, 0x3290) },
+#endif
 #ifdef CONFIG_RT2800PCI_RT33XX
         { PCI_DEVICE(0x1814, 0x3390) },
 #endif
@@ -1188,6 +1268,7 @@ static DEFINE_PCI_DEVICE_TABLE(rt2800pci_device_table) = {
         { PCI_DEVICE(0x1814, 0x3593) },
 #endif
 #ifdef CONFIG_RT2800PCI_RT53XX
+        { PCI_DEVICE(0x1814, 0x5360) },
         { PCI_DEVICE(0x1814, 0x5362) },
         { PCI_DEVICE(0x1814, 0x5390) },
         { PCI_DEVICE(0x1814, 0x5392) },
diff --git a/drivers/net/wireless/rt2x00/rt2800pci.h b/drivers/net/wireless/rt2x00/rt2800pci.h
index 70e050d904c..ab22a087c50 100644
--- a/drivers/net/wireless/rt2x00/rt2800pci.h
+++ b/drivers/net/wireless/rt2x00/rt2800pci.h
@@ -47,6 +47,7 @@
  * 8051 firmware image.
  */
 #define FIRMWARE_RT2860                 "rt2860.bin"
+#define FIRMWARE_RT3290                 "rt3290.bin"
 #define FIRMWARE_IMAGE_BASE             0x2000
 
 /*
diff --git a/drivers/net/wireless/rt2x00/rt2800usb.c b/drivers/net/wireless/rt2x00/rt2800usb.c
index bf78317a6ad..6cf336595e2 100644
--- a/drivers/net/wireless/rt2x00/rt2800usb.c
+++ b/drivers/net/wireless/rt2x00/rt2800usb.c
@@ -971,6 +971,7 @@ static struct usb_device_id rt2800usb_device_table[] = {
         { USB_DEVICE(0x0411, 0x015d) },
         { USB_DEVICE(0x0411, 0x016f) },
         { USB_DEVICE(0x0411, 0x01a2) },
+        { USB_DEVICE(0x0411, 0x01ee) },
         /* Corega */
         { USB_DEVICE(0x07aa, 0x002f) },
         { USB_DEVICE(0x07aa, 0x003c) },
@@ -1137,6 +1138,8 @@ static struct usb_device_id rt2800usb_device_table[] = {
 #ifdef CONFIG_RT2800USB_RT33XX
         /* Belkin */
         { USB_DEVICE(0x050d, 0x945b) },
+        /* D-Link */
+        { USB_DEVICE(0x2001, 0x3c17) },
         /* Panasonic */
         { USB_DEVICE(0x083a, 0xb511) },
         /* Philips */
@@ -1237,7 +1240,6 @@ static struct usb_device_id rt2800usb_device_table[] = {
         /* D-Link */
         { USB_DEVICE(0x07d1, 0x3c0b) },
         { USB_DEVICE(0x07d1, 0x3c17) },
-        { USB_DEVICE(0x2001, 0x3c17) },
         /* Encore */
         { USB_DEVICE(0x203d, 0x14a1) },
         /* Gemtek */
diff --git a/drivers/net/wireless/rt2x00/rt2x00.h b/drivers/net/wireless/rt2x00/rt2x00.h
index 8f754025b06..8afb546c2b2 100644
--- a/drivers/net/wireless/rt2x00/rt2x00.h
+++ b/drivers/net/wireless/rt2x00/rt2x00.h
@@ -187,6 +187,7 @@ struct rt2x00_chip {
 #define RT3070          0x3070
 #define RT3071          0x3071
 #define RT3090          0x3090  /* 2.4GHz PCIe */
+#define RT3290          0x3290
 #define RT3390          0x3390
 #define RT3572          0x3572
 #define RT3593          0x3593
diff --git a/drivers/net/wireless/rt2x00/rt2x00dev.c b/drivers/net/wireless/rt2x00/rt2x00dev.c
index e5404e57625..a6b88bd4a1a 100644
--- a/drivers/net/wireless/rt2x00/rt2x00dev.c
+++ b/drivers/net/wireless/rt2x00/rt2x00dev.c
@@ -1161,6 +1161,8 @@ int rt2x00lib_probe_dev(struct rt2x00_dev *rt2x00dev)
                     BIT(NL80211_IFTYPE_MESH_POINT) |
                     BIT(NL80211_IFTYPE_WDS);
 
+        rt2x00dev->hw->wiphy->flags |= WIPHY_FLAG_IBSS_RSN;
+
         /*
          * Initialize work.
          */
diff --git a/drivers/net/wireless/rt2x00/rt2x00mac.c b/drivers/net/wireless/rt2x00/rt2x00mac.c
index dd24b2663b5..4ff26c2159b 100644
--- a/drivers/net/wireless/rt2x00/rt2x00mac.c
+++ b/drivers/net/wireless/rt2x00/rt2x00mac.c
@@ -506,9 +506,19 @@ int rt2x00mac_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
 
         if (!test_bit(DEVICE_STATE_PRESENT, &rt2x00dev->flags))
                 return 0;
-        else if (!test_bit(CAPABILITY_HW_CRYPTO, &rt2x00dev->cap_flags))
+
+        if (!test_bit(CAPABILITY_HW_CRYPTO, &rt2x00dev->cap_flags))
+                return -EOPNOTSUPP;
+
+        /*
+         * To support IBSS RSN, don't program group keys in IBSS, the
+         * hardware will then not attempt to decrypt the frames.
+         */
+        if (vif->type == NL80211_IFTYPE_ADHOC &&
+            !(key->flags & IEEE80211_KEY_FLAG_PAIRWISE))
                 return -EOPNOTSUPP;
-        else if (key->keylen > 32)
+
+        if (key->keylen > 32)
                 return -ENOSPC;
 
         memset(&crypto, 0, sizeof(crypto));
diff --git a/drivers/net/wireless/rt2x00/rt2x00pci.c b/drivers/net/wireless/rt2x00/rt2x00pci.c
index 0a4653a92ca..a0c8caef3b0 100644
--- a/drivers/net/wireless/rt2x00/rt2x00pci.c
+++ b/drivers/net/wireless/rt2x00/rt2x00pci.c
@@ -256,6 +256,7 @@ int rt2x00pci_probe(struct pci_dev *pci_dev, const struct rt2x00_ops *ops)
         struct ieee80211_hw *hw;
         struct rt2x00_dev *rt2x00dev;
         int retval;
+        u16 chip;
 
         retval = pci_enable_device(pci_dev);
         if (retval) {
@@ -305,6 +306,14 @@ int rt2x00pci_probe(struct pci_dev *pci_dev, const struct rt2x00_ops *ops)
         if (retval)
                 goto exit_free_device;
 
+        /*
+         * Because rt3290 chip use different efuse offset to read efuse data.
+         * So before read efuse it need to indicate it is the
+         * rt3290 or not.
+         */
+        pci_read_config_word(pci_dev, PCI_DEVICE_ID, &chip);
+        rt2x00dev->chip.rt = chip;
+
         retval = rt2x00lib_probe_dev(rt2x00dev);
         if (retval)
                 goto exit_free_reg;
diff --git a/drivers/net/wireless/rtl818x/rtl8180/dev.c b/drivers/net/wireless/rtl818x/rtl8180/dev.c
index 2bebcb71a1e..3b505395d86 100644
--- a/drivers/net/wireless/rtl818x/rtl8180/dev.c
+++ b/drivers/net/wireless/rtl818x/rtl8180/dev.c
@@ -47,6 +47,8 @@ static DEFINE_PCI_DEVICE_TABLE(rtl8180_table) = {
         { PCI_DEVICE(0x1799, 0x6001) },
         { PCI_DEVICE(0x1799, 0x6020) },
         { PCI_DEVICE(PCI_VENDOR_ID_DLINK, 0x3300) },
+        { PCI_DEVICE(0x1186, 0x3301) },
+        { PCI_DEVICE(0x1432, 0x7106) },
         { }
 };
 
diff --git a/drivers/net/wireless/rtlwifi/base.c b/drivers/net/wireless/rtlwifi/base.c
index f4c852c6749..58e1f7bb4df 100644
--- a/drivers/net/wireless/rtlwifi/base.c
+++ b/drivers/net/wireless/rtlwifi/base.c
@@ -907,7 +907,7 @@ bool rtl_action_proc(struct ieee80211_hw *hw, struct sk_buff *skb, u8 is_tx)
         struct ieee80211_hdr *hdr = rtl_get_hdr(skb);
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         __le16 fc = hdr->frame_control;
-        u8 *act = (u8 *) (((u8 *) skb->data + MAC80211_3ADDR_LEN));
+        u8 *act = (u8 *)skb->data + MAC80211_3ADDR_LEN;
         u8 category;
 
         if (!ieee80211_is_action(fc))
diff --git a/drivers/net/wireless/rtlwifi/cam.c b/drivers/net/wireless/rtlwifi/cam.c
index 3d8cc4a0c86..5b4b4d4eaf9 100644
--- a/drivers/net/wireless/rtlwifi/cam.c
+++ b/drivers/net/wireless/rtlwifi/cam.c
@@ -128,7 +128,7 @@ u8 rtl_cam_add_one_entry(struct ieee80211_hw *hw, u8 *mac_addr,
         u32 us_config;
         struct rtl_priv *rtlpriv = rtl_priv(hw);
 
-        RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,
+        RT_TRACE(rtlpriv, COMP_SEC, DBG_LOUD,
                  "EntryNo:%x, ulKeyId=%x, ulEncAlg=%x, ulUseDK=%x MacAddr %pM\n",
                  ul_entry_idx, ul_key_id, ul_enc_alg,
                  ul_default_key, mac_addr);
@@ -146,7 +146,7 @@ u8 rtl_cam_add_one_entry(struct ieee80211_hw *hw, u8 *mac_addr,
         }
 
         rtl_cam_program_entry(hw, ul_entry_idx, mac_addr,
-                              (u8 *) key_content, us_config);
+                              key_content, us_config);
 
         RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG, "<===\n");
 
@@ -342,7 +342,8 @@ void rtl_cam_del_entry(struct ieee80211_hw *hw, u8 *sta_addr)
                         /* Remove from HW Security CAM */
                         memset(rtlpriv->sec.hwsec_cam_sta_addr[i], 0, ETH_ALEN);
                         rtlpriv->sec.hwsec_cam_bitmap &= ~(BIT(0) << i);
-                        pr_info("&&&&&&&&&del entry %d\n", i);
+                        RT_TRACE(rtlpriv, COMP_SEC, DBG_LOUD,
+                                 "del CAM entry %d\n", i);
                 }
         }
         return;
diff --git a/drivers/net/wireless/rtlwifi/core.c b/drivers/net/wireless/rtlwifi/core.c
index 278e9f957e0..a18ad2a9893 100644
--- a/drivers/net/wireless/rtlwifi/core.c
+++ b/drivers/net/wireless/rtlwifi/core.c
@@ -680,7 +680,7 @@ static void rtl_op_bss_info_changed(struct ieee80211_hw *hw,
 
                 mac->short_preamble = bss_conf->use_short_preamble;
                 rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_ACK_PREAMBLE,
-                                              (u8 *) (&mac->short_preamble));
+                                              &mac->short_preamble);
         }
 
         if (changed & BSS_CHANGED_ERP_SLOT) {
@@ -693,7 +693,7 @@ static void rtl_op_bss_info_changed(struct ieee80211_hw *hw,
                         mac->slot_time = RTL_SLOT_TIME_20;
 
                 rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_SLOT_TIME,
-                                              (u8 *) (&mac->slot_time));
+                                              &mac->slot_time);
         }
 
         if (changed & BSS_CHANGED_HT) {
@@ -713,7 +713,7 @@ static void rtl_op_bss_info_changed(struct ieee80211_hw *hw,
                 rcu_read_unlock();
 
                 rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_SHORTGI_DENSITY,
-                                              (u8 *) (&mac->max_mss_density));
+                                              &mac->max_mss_density);
                 rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_AMPDU_FACTOR,
                                               &mac->current_ampdu_factor);
                 rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_AMPDU_MIN_SPACE,
@@ -801,7 +801,7 @@ static void rtl_op_bss_info_changed(struct ieee80211_hw *hw,
                                 u8 mstatus = RT_MEDIA_CONNECT;
                                 rtlpriv->cfg->ops->set_hw_reg(hw,
                                                       HW_VAR_H2C_FW_JOINBSSRPT,
-                                                      (u8 *) (&mstatus));
+                                                      &mstatus);
                                 ppsc->report_linked = true;
                         }
                 } else {
@@ -809,7 +809,7 @@ static void rtl_op_bss_info_changed(struct ieee80211_hw *hw,
                                 u8 mstatus = RT_MEDIA_DISCONNECT;
                                 rtlpriv->cfg->ops->set_hw_reg(hw,
                                                       HW_VAR_H2C_FW_JOINBSSRPT,
-                                                      (u8 *)(&mstatus));
+                                                      &mstatus);
                                 ppsc->report_linked = false;
                         }
                 }
@@ -836,7 +836,7 @@ static void rtl_op_set_tsf(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
         u8 bibss = (mac->opmode == NL80211_IFTYPE_ADHOC) ? 1 : 0;
 
         mac->tsf = tsf;
-        rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_CORRECT_TSF, (u8 *) (&bibss));
+        rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_CORRECT_TSF, &bibss);
 }
 
 static void rtl_op_reset_tsf(struct ieee80211_hw *hw,
@@ -845,7 +845,7 @@ static void rtl_op_reset_tsf(struct ieee80211_hw *hw,
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         u8 tmp = 0;
 
-        rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_DUAL_TSF_RST, (u8 *) (&tmp));
+        rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_DUAL_TSF_RST, &tmp);
 }
 
 static void rtl_op_sta_notify(struct ieee80211_hw *hw,
diff --git a/drivers/net/wireless/rtlwifi/efuse.c b/drivers/net/wireless/rtlwifi/efuse.c
index 1f143800a8d..8e2f9afb125 100644
--- a/drivers/net/wireless/rtlwifi/efuse.c
+++ b/drivers/net/wireless/rtlwifi/efuse.c
@@ -352,7 +352,7 @@ void read_efuse(struct ieee80211_hw *hw, u16 _offset, u16 _size_byte, u8 *pbuf)
         rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_EFUSE_BYTES,
                                       (u8 *)&efuse_utilized);
         rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_EFUSE_USAGE,
-                                      (u8 *)&efuse_usage);
+                                      &efuse_usage);
 done:
         for (i = 0; i < EFUSE_MAX_WORD_UNIT; i++)
                 kfree(efuse_word[i]);
@@ -409,7 +409,7 @@ void efuse_shadow_read(struct ieee80211_hw *hw, u8 type,
         else if (type == 2)
                 efuse_shadow_read_2byte(hw, offset, (u16 *) value);
         else if (type == 4)
-                efuse_shadow_read_4byte(hw, offset, (u32 *) value);
+                efuse_shadow_read_4byte(hw, offset, value);
 
 }
 
diff --git a/drivers/net/wireless/rtlwifi/pci.c b/drivers/net/wireless/rtlwifi/pci.c
index 2062ea1d7c8..31138fdad1f 100644
--- a/drivers/net/wireless/rtlwifi/pci.c
+++ b/drivers/net/wireless/rtlwifi/pci.c
@@ -756,10 +756,10 @@ done:
                 if (index == rtlpci->rxringcount - 1)
                         rtlpriv->cfg->ops->set_desc((u8 *)pdesc, false,
                                                     HW_DESC_RXERO,
-                                                    (u8 *)&tmp_one);
+                                                    &tmp_one);
 
                 rtlpriv->cfg->ops->set_desc((u8 *)pdesc, false, HW_DESC_RXOWN,
-                                            (u8 *)&tmp_one);
+                                            &tmp_one);
 
                 index = (index + 1) % rtlpci->rxringcount;
         }
@@ -934,7 +934,7 @@ static void _rtl_pci_prepare_bcn_tasklet(struct ieee80211_hw *hw)
         __skb_queue_tail(&ring->queue, pskb);
 
         rtlpriv->cfg->ops->set_desc((u8 *) pdesc, true, HW_DESC_OWN,
-                                    (u8 *)&temp_one);
+                                    &temp_one);
 
         return;
 }
@@ -1126,11 +1126,11 @@ static int _rtl_pci_init_rx_ring(struct ieee80211_hw *hw)
                                                     rxbuffersize);
                         rtlpriv->cfg->ops->set_desc((u8 *) entry, false,
                                                     HW_DESC_RXOWN,
-                                                    (u8 *)&tmp_one);
+                                                    &tmp_one);
                 }
 
                 rtlpriv->cfg->ops->set_desc((u8 *) entry, false,
-                                            HW_DESC_RXERO, (u8 *)&tmp_one);
+                                            HW_DESC_RXERO, &tmp_one);
         }
         return 0;
 }
@@ -1263,7 +1263,7 @@ int rtl_pci_reset_trx_ring(struct ieee80211_hw *hw)
                                 rtlpriv->cfg->ops->set_desc((u8 *) entry,
                                                             false,
                                                             HW_DESC_RXOWN,
-                                                            (u8 *)&tmp_one);
+                                                            &tmp_one);
                         }
                         rtlpci->rx_ring[rx_queue_idx].idx = 0;
                 }
@@ -1273,17 +1273,18 @@ int rtl_pci_reset_trx_ring(struct ieee80211_hw *hw)
          *after reset, release previous pending packet,
          *and force the  tx idx to the first one
          */
-        spin_lock_irqsave(&rtlpriv->locks.irq_th_lock, flags);
         for (i = 0; i < RTL_PCI_MAX_TX_QUEUE_COUNT; i++) {
                 if (rtlpci->tx_ring[i].desc) {
                         struct rtl8192_tx_ring *ring = &rtlpci->tx_ring[i];
 
                         while (skb_queue_len(&ring->queue)) {
-                                struct rtl_tx_desc *entry =
-                                    &ring->desc[ring->idx];
-                                struct sk_buff *skb =
-                                    __skb_dequeue(&ring->queue);
+                                struct rtl_tx_desc *entry;
+                                struct sk_buff *skb;
 
+                                spin_lock_irqsave(&rtlpriv->locks.irq_th_lock,
+                                                  flags);
+                                entry = &ring->desc[ring->idx];
+                                skb = __skb_dequeue(&ring->queue);
                                 pci_unmap_single(rtlpci->pdev,
                                                  rtlpriv->cfg->ops->
                                                          get_desc((u8 *)
@@ -1291,15 +1292,15 @@ int rtl_pci_reset_trx_ring(struct ieee80211_hw *hw)
                                                          true,
                                                          HW_DESC_TXBUFF_ADDR),
                                                  skb->len, PCI_DMA_TODEVICE);
-                                kfree_skb(skb);
                                 ring->idx = (ring->idx + 1) % ring->entries;
+                                spin_unlock_irqrestore(&rtlpriv->locks.irq_th_lock,
+                                                  flags);
+                                kfree_skb(skb);
                         }
                         ring->idx = 0;
                 }
         }
 
-        spin_unlock_irqrestore(&rtlpriv->locks.irq_th_lock, flags);
-
         return 0;
 }
 
@@ -1422,7 +1423,7 @@ static int rtl_pci_tx(struct ieee80211_hw *hw, struct sk_buff *skb,
         __skb_queue_tail(&ring->queue, skb);
 
         rtlpriv->cfg->ops->set_desc((u8 *)pdesc, true,
-                                    HW_DESC_OWN, (u8 *)&temp_one);
+                                    HW_DESC_OWN, &temp_one);
 
 
         if ((ring->entries - skb_queue_len(&ring->queue)) < 2 &&
diff --git a/drivers/net/wireless/rtlwifi/ps.c b/drivers/net/wireless/rtlwifi/ps.c
index 5ae26647f34..13ad33e8557 100644
--- a/drivers/net/wireless/rtlwifi/ps.c
+++ b/drivers/net/wireless/rtlwifi/ps.c
@@ -333,10 +333,10 @@ static void rtl_lps_set_psmode(struct ieee80211_hw *hw, u8 rt_psmode)
                         rpwm_val = 0x0C;        /* RF on */
                         fw_pwrmode = FW_PS_ACTIVE_MODE;
                         rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_SET_RPWM,
-                                        (u8 *) (&rpwm_val));
+                                        &rpwm_val);
                         rtlpriv->cfg->ops->set_hw_reg(hw,
                                         HW_VAR_H2C_FW_PWRMODE,
-                                        (u8 *) (&fw_pwrmode));
+                                        &fw_pwrmode);
                         fw_current_inps = false;
 
                         rtlpriv->cfg->ops->set_hw_reg(hw,
@@ -356,11 +356,11 @@ static void rtl_lps_set_psmode(struct ieee80211_hw *hw, u8 rt_psmode)
                                                 (u8 *) (&fw_current_inps));
                                 rtlpriv->cfg->ops->set_hw_reg(hw,
                                                 HW_VAR_H2C_FW_PWRMODE,
-                                                (u8 *) (&ppsc->fwctrl_psmode));
+                                                &ppsc->fwctrl_psmode);
 
                                 rtlpriv->cfg->ops->set_hw_reg(hw,
                                                 HW_VAR_SET_RPWM,
-                                                (u8 *) (&rpwm_val));
+                                                &rpwm_val);
                         } else {
                                 /* Reset the power save related parameters. */
                                 ppsc->dot11_psmode = EACTIVE;
@@ -446,7 +446,7 @@ void rtl_swlps_beacon(struct ieee80211_hw *hw, void *data, unsigned int len)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
-        struct ieee80211_hdr *hdr = (void *) data;
+        struct ieee80211_hdr *hdr = data;
         struct ieee80211_tim_ie *tim_ie;
         u8 *tim;
         u8 tim_len;
diff --git a/drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c b/drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c
index f7f48c7ac85..a45afda8259 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c
@@ -656,9 +656,8 @@ static void rtl92c_dm_check_edca_turbo(struct ieee80211_hw *hw)
         } else {
                 if (rtlpriv->dm.current_turbo_edca) {
                         u8 tmp = AC0_BE;
-                        rtlpriv->cfg->ops->set_hw_reg(hw,
-                                                      HW_VAR_AC_PARAM,
-                                                      (u8 *) (&tmp));
+                        rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_AC_PARAM,
+                                                      &tmp);
                         rtlpriv->dm.current_turbo_edca = false;
                 }
         }
diff --git a/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c b/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c
index 692c8ef5ee8..44febfde949 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c
@@ -168,7 +168,7 @@ static void _rtl92c_write_fw(struct ieee80211_hw *hw,
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
-        u8 *bufferPtr = (u8 *) buffer;
+        u8 *bufferPtr = buffer;
 
         RT_TRACE(rtlpriv, COMP_FW, DBG_TRACE, "FW size is %d bytes\n", size);
 
@@ -262,7 +262,7 @@ int rtl92c_download_fw(struct ieee80211_hw *hw)
                 return 1;
 
         pfwheader = (struct rtl92c_firmware_header *)rtlhal->pfirmware;
-        pfwdata = (u8 *) rtlhal->pfirmware;
+        pfwdata = rtlhal->pfirmware;
         fwsize = rtlhal->fwsize;
 
         if (IS_FW_HEADER_EXIST(pfwheader)) {
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/hw.c b/drivers/net/wireless/rtlwifi/rtl8192ce/hw.c
index 5c4d9bc040f..bd0da7ef290 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192ce/hw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192ce/hw.c
@@ -214,13 +214,13 @@ void rtl92ce_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                         for (e_aci = 0; e_aci < AC_MAX; e_aci++) {
                                 rtlpriv->cfg->ops->set_hw_reg(hw,
                                                               HW_VAR_AC_PARAM,
-                                                              (u8 *) (&e_aci));
+                                                              &e_aci);
                         }
                         break;
                 }
         case HW_VAR_ACK_PREAMBLE:{
                         u8 reg_tmp;
-                        u8 short_preamble = (bool) (*(u8 *) val);
+                        u8 short_preamble = (bool)*val;
                         reg_tmp = (mac->cur_40_prime_sc) << 5;
                         if (short_preamble)
                                 reg_tmp |= 0x80;
@@ -232,7 +232,7 @@ void rtl92ce_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                         u8 min_spacing_to_set;
                         u8 sec_min_space;
 
-                        min_spacing_to_set = *((u8 *) val);
+                        min_spacing_to_set = *val;
                         if (min_spacing_to_set <= 7) {
                                 sec_min_space = 0;
 
@@ -257,7 +257,7 @@ void rtl92ce_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
         case HW_VAR_SHORTGI_DENSITY:{
                         u8 density_to_set;
 
-                        density_to_set = *((u8 *) val);
+                        density_to_set = *val;
                         mac->min_space_cfg |= (density_to_set << 3);
 
                         RT_TRACE(rtlpriv, COMP_MLME, DBG_LOUD,
@@ -284,7 +284,7 @@ void rtl92ce_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                         else
                                 p_regtoset = regtoset_normal;
 
-                        factor_toset = *((u8 *) val);
+                        factor_toset = *(val);
                         if (factor_toset <= 3) {
                                 factor_toset = (1 << (factor_toset + 2));
                                 if (factor_toset > 0xf)
@@ -316,17 +316,17 @@ void rtl92ce_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                         break;
                 }
         case HW_VAR_AC_PARAM:{
-                        u8 e_aci = *((u8 *) val);
+                        u8 e_aci = *(val);
                         rtl92c_dm_init_edca_turbo(hw);
 
                         if (rtlpci->acm_method != eAcmWay2_SW)
                                 rtlpriv->cfg->ops->set_hw_reg(hw,
                                                               HW_VAR_ACM_CTRL,
-                                                              (u8 *) (&e_aci));
+                                                              (&e_aci));
                         break;
                 }
         case HW_VAR_ACM_CTRL:{
-                        u8 e_aci = *((u8 *) val);
+                        u8 e_aci = *(val);
                         union aci_aifsn *p_aci_aifsn =
                             (union aci_aifsn *)(&(mac->ac[0].aifs));
                         u8 acm = p_aci_aifsn->f.acm;
@@ -382,7 +382,7 @@ void rtl92ce_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                         break;
                 }
         case HW_VAR_RETRY_LIMIT:{
-                        u8 retry_limit = ((u8 *) (val))[0];
+                        u8 retry_limit = val[0];
 
                         rtl_write_word(rtlpriv, REG_RL,
                                        retry_limit << RETRY_LIMIT_SHORT_SHIFT |
@@ -396,13 +396,13 @@ void rtl92ce_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                 rtlefuse->efuse_usedbytes = *((u16 *) val);
                 break;
         case HW_VAR_EFUSE_USAGE:
-                rtlefuse->efuse_usedpercentage = *((u8 *) val);
+                rtlefuse->efuse_usedpercentage = *val;
                 break;
         case HW_VAR_IO_CMD:
                 rtl92c_phy_set_io_cmd(hw, (*(enum io_type *)val));
                 break;
         case HW_VAR_WPA_CONFIG:
-                rtl_write_byte(rtlpriv, REG_SECCFG, *((u8 *) val));
+                rtl_write_byte(rtlpriv, REG_SECCFG, *val);
                 break;
         case HW_VAR_SET_RPWM:{
                         u8 rpwm_val;
@@ -411,31 +411,30 @@ void rtl92ce_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                         udelay(1);
 
                         if (rpwm_val & BIT(7)) {
-                                rtl_write_byte(rtlpriv, REG_PCIE_HRPWM,
-                                               (*(u8 *) val));
+                                rtl_write_byte(rtlpriv, REG_PCIE_HRPWM, *val);
                         } else {
                                 rtl_write_byte(rtlpriv, REG_PCIE_HRPWM,
-                                               ((*(u8 *) val) | BIT(7)));
+                                               *val | BIT(7));
                         }
 
                         break;
                 }
         case HW_VAR_H2C_FW_PWRMODE:{
-                        u8 psmode = (*(u8 *) val);
+                        u8 psmode = *val;
 
                         if ((psmode != FW_PS_ACTIVE_MODE) &&
                             (!IS_92C_SERIAL(rtlhal->version))) {
                                 rtl92c_dm_rf_saving(hw, true);
                         }
 
-                        rtl92c_set_fw_pwrmode_cmd(hw, (*(u8 *) val));
+                        rtl92c_set_fw_pwrmode_cmd(hw, *val);
                         break;
                 }
         case HW_VAR_FW_PSMODE_STATUS:
                 ppsc->fw_current_inpsmode = *((bool *) val);
                 break;
         case HW_VAR_H2C_FW_JOINBSSRPT:{
-                        u8 mstatus = (*(u8 *) val);
+                        u8 mstatus = *val;
                         u8 tmp_regcr, tmp_reg422;
                         bool recover = false;
 
@@ -472,7 +471,7 @@ void rtl92ce_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                                 rtl_write_byte(rtlpriv, REG_CR + 1,
                                                (tmp_regcr & ~(BIT(0))));
                         }
-                        rtl92c_set_fw_joinbss_report_cmd(hw, (*(u8 *) val));
+                        rtl92c_set_fw_joinbss_report_cmd(hw, *val);
 
                         break;
                 }
@@ -486,7 +485,7 @@ void rtl92ce_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                         break;
                 }
         case HW_VAR_CORRECT_TSF:{
-                        u8 btype_ibss = ((u8 *) (val))[0];
+                        u8 btype_ibss = val[0];
 
                         if (btype_ibss)
                                 _rtl92ce_stop_tx_beacon(hw);
@@ -1589,10 +1588,10 @@ static void _rtl92ce_read_adapter_info(struct ieee80211_hw *hw)
                                                  rtlefuse->autoload_failflag,
                                                  hwinfo);
 
-        rtlefuse->eeprom_channelplan = *(u8 *)&hwinfo[EEPROM_CHANNELPLAN];
+        rtlefuse->eeprom_channelplan = *&hwinfo[EEPROM_CHANNELPLAN];
         rtlefuse->eeprom_version = *(u16 *)&hwinfo[EEPROM_VERSION];
         rtlefuse->txpwr_fromeprom = true;
-        rtlefuse->eeprom_oemid = *(u8 *)&hwinfo[EEPROM_CUSTOMER_ID];
+        rtlefuse->eeprom_oemid = *&hwinfo[EEPROM_CUSTOMER_ID];
 
         RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
                  "EEPROM Customer ID: 0x%2x\n", rtlefuse->eeprom_oemid);
@@ -1939,7 +1938,7 @@ void rtl92ce_update_channel_access_setting(struct ieee80211_hw *hw)
         u16 sifs_timer;
 
         rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_SLOT_TIME,
-                                      (u8 *)&mac->slot_time);
+                                      &mac->slot_time);
         if (!mac->ht_enable)
                 sifs_timer = 0x0a0a;
         else
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/trx.c b/drivers/net/wireless/rtlwifi/rtl8192ce/trx.c
index 3af874e6959..52166640f16 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192ce/trx.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192ce/trx.c
@@ -605,7 +605,7 @@ void rtl92ce_tx_fill_desc(struct ieee80211_hw *hw,
         struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw));
         bool defaultadapter = true;
         struct ieee80211_sta *sta;
-        u8 *pdesc = (u8 *) pdesc_tx;
+        u8 *pdesc = pdesc_tx;
         u16 seq_number;
         __le16 fc = hdr->frame_control;
         u8 fw_qsel = _rtl92ce_map_hwqueue_to_fwqueue(skb, hw_queue);
@@ -806,7 +806,7 @@ void rtl92ce_tx_fill_cmddesc(struct ieee80211_hw *hw,
 
         SET_TX_DESC_OWN(pdesc, 1);
 
-        SET_TX_DESC_PKT_SIZE((u8 *) pdesc, (u16) (skb->len));
+        SET_TX_DESC_PKT_SIZE(pdesc, (u16) (skb->len));
 
         SET_TX_DESC_FIRST_SEG(pdesc, 1);
         SET_TX_DESC_LAST_SEG(pdesc, 1);
diff --git a/drivers/net/wireless/rtlwifi/rtl8192cu/hw.c b/drivers/net/wireless/rtlwifi/rtl8192cu/hw.c
index 0c74d4f2eeb..4bbb711a36c 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192cu/hw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192cu/hw.c
@@ -381,11 +381,11 @@ static void _rtl92cu_read_adapter_info(struct ieee80211_hw *hw)
         rtlefuse->eeprom_did = le16_to_cpu(*(__le16 *)&hwinfo[EEPROM_DID]);
         RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, " VID = 0x%02x PID = 0x%02x\n",
                  rtlefuse->eeprom_vid, rtlefuse->eeprom_did);
-        rtlefuse->eeprom_channelplan = *(u8 *)&hwinfo[EEPROM_CHANNELPLAN];
+        rtlefuse->eeprom_channelplan = hwinfo[EEPROM_CHANNELPLAN];
         rtlefuse->eeprom_version =
                          le16_to_cpu(*(__le16 *)&hwinfo[EEPROM_VERSION]);
         rtlefuse->txpwr_fromeprom = true;
-        rtlefuse->eeprom_oemid = *(u8 *)&hwinfo[EEPROM_CUSTOMER_ID];
+        rtlefuse->eeprom_oemid = hwinfo[EEPROM_CUSTOMER_ID];
         RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "EEPROM Customer ID: 0x%2x\n",
                  rtlefuse->eeprom_oemid);
         if (rtlhal->oem_id == RT_CID_DEFAULT) {
@@ -1660,7 +1660,7 @@ void rtl92cu_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                                 for (e_aci = 0; e_aci < AC_MAX; e_aci++)
                                         rtlpriv->cfg->ops->set_hw_reg(hw,
                                                                 HW_VAR_AC_PARAM,
-                                                                (u8 *)(&e_aci));
+                                                                &e_aci);
                         } else {
                                 u8 sifstime = 0;
                                 u8      u1bAIFS;
@@ -1685,7 +1685,7 @@ void rtl92cu_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                 }
         case HW_VAR_ACK_PREAMBLE:{
                         u8 reg_tmp;
-                        u8 short_preamble = (bool) (*(u8 *) val);
+                        u8 short_preamble = (bool)*val;
                         reg_tmp = 0;
                         if (short_preamble)
                                 reg_tmp |= 0x80;
@@ -1696,7 +1696,7 @@ void rtl92cu_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                         u8 min_spacing_to_set;
                         u8 sec_min_space;
 
-                        min_spacing_to_set = *((u8 *) val);
+                        min_spacing_to_set = *val;
                         if (min_spacing_to_set <= 7) {
                                 switch (rtlpriv->sec.pairwise_enc_algorithm) {
                                 case NO_ENCRYPTION:
@@ -1729,7 +1729,7 @@ void rtl92cu_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
         case HW_VAR_SHORTGI_DENSITY:{
                         u8 density_to_set;
 
-                        density_to_set = *((u8 *) val);
+                        density_to_set = *val;
                         density_to_set &= 0x1f;
                         mac->min_space_cfg &= 0x07;
                         mac->min_space_cfg |= (density_to_set << 3);
@@ -1747,7 +1747,7 @@ void rtl92cu_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                         u8 index = 0;
 
                         p_regtoset = regtoset_normal;
-                        factor_toset = *((u8 *) val);
+                        factor_toset = *val;
                         if (factor_toset <= 3) {
                                 factor_toset = (1 << (factor_toset + 2));
                                 if (factor_toset > 0xf)
@@ -1774,7 +1774,7 @@ void rtl92cu_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                         break;
                 }
         case HW_VAR_AC_PARAM:{
-                        u8 e_aci = *((u8 *) val);
+                        u8 e_aci = *val;
                         u32 u4b_ac_param;
                         u16 cw_min = le16_to_cpu(mac->ac[e_aci].cw_min);
                         u16 cw_max = le16_to_cpu(mac->ac[e_aci].cw_max);
@@ -1814,11 +1814,11 @@ void rtl92cu_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                         }
                         if (rtlusb->acm_method != eAcmWay2_SW)
                                 rtlpriv->cfg->ops->set_hw_reg(hw,
-                                         HW_VAR_ACM_CTRL, (u8 *)(&e_aci));
+                                         HW_VAR_ACM_CTRL, &e_aci);
                         break;
                 }
         case HW_VAR_ACM_CTRL:{
-                        u8 e_aci = *((u8 *) val);
+                        u8 e_aci = *val;
                         union aci_aifsn *p_aci_aifsn = (union aci_aifsn *)
                                                         (&(mac->ac[0].aifs));
                         u8 acm = p_aci_aifsn->f.acm;
@@ -1874,7 +1874,7 @@ void rtl92cu_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                         break;
                 }
         case HW_VAR_RETRY_LIMIT:{
-                        u8 retry_limit = ((u8 *) (val))[0];
+                        u8 retry_limit = val[0];
 
                         rtl_write_word(rtlpriv, REG_RL,
                                        retry_limit << RETRY_LIMIT_SHORT_SHIFT |
@@ -1891,39 +1891,38 @@ void rtl92cu_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                 rtlefuse->efuse_usedbytes = *((u16 *) val);
                 break;
         case HW_VAR_EFUSE_USAGE:
-                rtlefuse->efuse_usedpercentage = *((u8 *) val);
+                rtlefuse->efuse_usedpercentage = *val;
                 break;
         case HW_VAR_IO_CMD:
                 rtl92c_phy_set_io_cmd(hw, (*(enum io_type *)val));
                 break;
         case HW_VAR_WPA_CONFIG:
-                rtl_write_byte(rtlpriv, REG_SECCFG, *((u8 *) val));
+                rtl_write_byte(rtlpriv, REG_SECCFG, *val);
                 break;
         case HW_VAR_SET_RPWM:{
                         u8 rpwm_val = rtl_read_byte(rtlpriv, REG_USB_HRPWM);
 
                         if (rpwm_val & BIT(7))
-                                rtl_write_byte(rtlpriv, REG_USB_HRPWM,
-                                               (*(u8 *)val));
+                                rtl_write_byte(rtlpriv, REG_USB_HRPWM, *val);
                         else
                                 rtl_write_byte(rtlpriv, REG_USB_HRPWM,
-                                               ((*(u8 *)val) | BIT(7)));
+                                               *val | BIT(7));
                         break;
                 }
         case HW_VAR_H2C_FW_PWRMODE:{
-                        u8 psmode = (*(u8 *) val);
+                        u8 psmode = *val;
 
                         if ((psmode != FW_PS_ACTIVE_MODE) &&
                            (!IS_92C_SERIAL(rtlhal->version)))
                                 rtl92c_dm_rf_saving(hw, true);
-                        rtl92c_set_fw_pwrmode_cmd(hw, (*(u8 *) val));
+                        rtl92c_set_fw_pwrmode_cmd(hw, (*val));
                         break;
                 }
         case HW_VAR_FW_PSMODE_STATUS:
                 ppsc->fw_current_inpsmode = *((bool *) val);
                 break;
         case HW_VAR_H2C_FW_JOINBSSRPT:{
-                        u8 mstatus = (*(u8 *) val);
+                        u8 mstatus = *val;
                         u8 tmp_reg422;
                         bool recover = false;
 
@@ -1948,7 +1947,7 @@ void rtl92cu_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                                                 tmp_reg422 | BIT(6));
                                 rtl_write_byte(rtlpriv, REG_CR + 1, 0x02);
                         }
-                        rtl92c_set_fw_joinbss_report_cmd(hw, (*(u8 *) val));
+                        rtl92c_set_fw_joinbss_report_cmd(hw, (*val));
                         break;
                 }
         case HW_VAR_AID:{
@@ -1961,7 +1960,7 @@ void rtl92cu_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                         break;
                 }
         case HW_VAR_CORRECT_TSF:{
-                        u8 btype_ibss = ((u8 *) (val))[0];
+                        u8 btype_ibss = val[0];
 
                         if (btype_ibss)
                                 _rtl92cu_stop_tx_beacon(hw);
@@ -2184,7 +2183,7 @@ void rtl92cu_update_channel_access_setting(struct ieee80211_hw *hw)
         u16 sifs_timer;
 
         rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_SLOT_TIME,
-                                      (u8 *)&mac->slot_time);
+                                      &mac->slot_time);
         if (!mac->ht_enable)
                 sifs_timer = 0x0a0a;
         else
diff --git a/drivers/net/wireless/rtlwifi/rtl8192cu/trx.c b/drivers/net/wireless/rtlwifi/rtl8192cu/trx.c
index 21bc827c5fa..2e6eb356a93 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192cu/trx.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192cu/trx.c
@@ -668,7 +668,7 @@ void rtl92cu_tx_fill_cmddesc(struct ieee80211_hw *hw,
         SET_TX_DESC_RATE_ID(pdesc, 7);
         SET_TX_DESC_MACID(pdesc, 0);
         SET_TX_DESC_OWN(pdesc, 1);
-        SET_TX_DESC_PKT_SIZE((u8 *) pdesc, (u16) (skb->len));
+        SET_TX_DESC_PKT_SIZE(pdesc, (u16)skb->len);
         SET_TX_DESC_FIRST_SEG(pdesc, 1);
         SET_TX_DESC_LAST_SEG(pdesc, 1);
         SET_TX_DESC_OFFSET(pdesc, 0x20);
diff --git a/drivers/net/wireless/rtlwifi/rtl8192de/dm.c b/drivers/net/wireless/rtlwifi/rtl8192de/dm.c
index a7d63a84551..c0201ed69dd 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192de/dm.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192de/dm.c
@@ -696,7 +696,7 @@ static void rtl92d_dm_check_edca_turbo(struct ieee80211_hw *hw)
                 if (rtlpriv->dm.current_turbo_edca) {
                         u8 tmp = AC0_BE;
                         rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_AC_PARAM,
-                                                      (u8 *) (&tmp));
+                                                      &tmp);
                         rtlpriv->dm.current_turbo_edca = false;
                 }
         }
diff --git a/drivers/net/wireless/rtlwifi/rtl8192de/fw.c b/drivers/net/wireless/rtlwifi/rtl8192de/fw.c
index f548a8d0068..895ae6c1f35 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192de/fw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192de/fw.c
@@ -120,7 +120,7 @@ static void _rtl92d_write_fw(struct ieee80211_hw *hw,
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
-        u8 *bufferPtr = (u8 *) buffer;
+        u8 *bufferPtr = buffer;
         u32 pagenums, remainSize;
         u32 page, offset;
 
@@ -256,8 +256,8 @@ int rtl92d_download_fw(struct ieee80211_hw *hw)
         if (rtlpriv->max_fw_size == 0 || !rtlhal->pfirmware)
                 return 1;
         fwsize = rtlhal->fwsize;
-        pfwheader = (u8 *) rtlhal->pfirmware;
-        pfwdata = (u8 *) rtlhal->pfirmware;
+        pfwheader = rtlhal->pfirmware;
+        pfwdata = rtlhal->pfirmware;
         rtlhal->fw_version = (u16) GET_FIRMWARE_HDR_VERSION(pfwheader);
         rtlhal->fw_subversion = (u16) GET_FIRMWARE_HDR_SUB_VER(pfwheader);
         RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
diff --git a/drivers/net/wireless/rtlwifi/rtl8192de/hw.c b/drivers/net/wireless/rtlwifi/rtl8192de/hw.c
index b338d526c42..f4051f4f039 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192de/hw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192de/hw.c
@@ -235,12 +235,12 @@ void rtl92de_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                 for (e_aci = 0; e_aci < AC_MAX; e_aci++)
                         rtlpriv->cfg->ops->set_hw_reg(hw,
                                                       HW_VAR_AC_PARAM,
-                                                      (u8 *) (&e_aci));
+                                                      (&e_aci));
                 break;
         }
         case HW_VAR_ACK_PREAMBLE: {
                 u8 reg_tmp;
-                u8 short_preamble = (bool) (*(u8 *) val);
+                u8 short_preamble = (bool) (*val);
 
                 reg_tmp = (mac->cur_40_prime_sc) << 5;
                 if (short_preamble)
@@ -252,7 +252,7 @@ void rtl92de_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                 u8 min_spacing_to_set;
                 u8 sec_min_space;
 
-                min_spacing_to_set = *((u8 *) val);
+                min_spacing_to_set = *val;
                 if (min_spacing_to_set <= 7) {
                         sec_min_space = 0;
                         if (min_spacing_to_set < sec_min_space)
@@ -271,7 +271,7 @@ void rtl92de_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
         case HW_VAR_SHORTGI_DENSITY: {
                 u8 density_to_set;
 
-                density_to_set = *((u8 *) val);
+                density_to_set = *val;
                 mac->min_space_cfg = rtlpriv->rtlhal.minspace_cfg;
                 mac->min_space_cfg |= (density_to_set << 3);
                 RT_TRACE(rtlpriv, COMP_MLME, DBG_LOUD,
@@ -293,7 +293,7 @@ void rtl92de_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                         regtoSet = 0x66626641;
                 else
                         regtoSet = 0xb972a841;
-                factor_toset = *((u8 *) val);
+                factor_toset = *val;
                 if (factor_toset <= 3) {
                         factor_toset = (1 << (factor_toset + 2));
                         if (factor_toset > 0xf)
@@ -316,15 +316,15 @@ void rtl92de_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                 break;
         }
         case HW_VAR_AC_PARAM: {
-                u8 e_aci = *((u8 *) val);
+                u8 e_aci = *val;
                 rtl92d_dm_init_edca_turbo(hw);
                 if (rtlpci->acm_method != eAcmWay2_SW)
                         rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_ACM_CTRL,
-                                                      (u8 *) (&e_aci));
+                                                      &e_aci);
                 break;
         }
         case HW_VAR_ACM_CTRL: {
-                u8 e_aci = *((u8 *) val);
+                u8 e_aci = *val;
                 union aci_aifsn *p_aci_aifsn =
                     (union aci_aifsn *)(&(mac->ac[0].aifs));
                 u8 acm = p_aci_aifsn->f.acm;
@@ -376,7 +376,7 @@ void rtl92de_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                 rtlpci->receive_config = ((u32 *) (val))[0];
                 break;
         case HW_VAR_RETRY_LIMIT: {
-                u8 retry_limit = ((u8 *) (val))[0];
+                u8 retry_limit = val[0];
 
                 rtl_write_word(rtlpriv, REG_RL,
                                retry_limit << RETRY_LIMIT_SHORT_SHIFT |
@@ -390,16 +390,16 @@ void rtl92de_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                 rtlefuse->efuse_usedbytes = *((u16 *) val);
                 break;
         case HW_VAR_EFUSE_USAGE:
-                rtlefuse->efuse_usedpercentage = *((u8 *) val);
+                rtlefuse->efuse_usedpercentage = *val;
                 break;
         case HW_VAR_IO_CMD:
                 rtl92d_phy_set_io_cmd(hw, (*(enum io_type *)val));
                 break;
         case HW_VAR_WPA_CONFIG:
-                rtl_write_byte(rtlpriv, REG_SECCFG, *((u8 *) val));
+                rtl_write_byte(rtlpriv, REG_SECCFG, *val);
                 break;
         case HW_VAR_SET_RPWM:
-                rtl92d_fill_h2c_cmd(hw, H2C_PWRM, 1, (u8 *) (val));
+                rtl92d_fill_h2c_cmd(hw, H2C_PWRM, 1, (val));
                 break;
         case HW_VAR_H2C_FW_PWRMODE:
                 break;
@@ -407,7 +407,7 @@ void rtl92de_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                 ppsc->fw_current_inpsmode = *((bool *) val);
                 break;
         case HW_VAR_H2C_FW_JOINBSSRPT: {
-                u8 mstatus = (*(u8 *) val);
+                u8 mstatus = (*val);
                 u8 tmp_regcr, tmp_reg422;
                 bool recover = false;
 
@@ -435,7 +435,7 @@ void rtl92de_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                         rtl_write_byte(rtlpriv, REG_CR + 1,
                                        (tmp_regcr & ~(BIT(0))));
                 }
-                rtl92d_set_fw_joinbss_report_cmd(hw, (*(u8 *) val));
+                rtl92d_set_fw_joinbss_report_cmd(hw, (*val));
                 break;
         }
         case HW_VAR_AID: {
@@ -447,7 +447,7 @@ void rtl92de_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                 break;
         }
         case HW_VAR_CORRECT_TSF: {
-                u8 btype_ibss = ((u8 *) (val))[0];
+                u8 btype_ibss = val[0];
 
                 if (btype_ibss)
                         _rtl92de_stop_tx_beacon(hw);
@@ -1794,7 +1794,7 @@ static void _rtl92de_read_adapter_info(struct ieee80211_hw *hw)
                          "RTL819X Not boot from eeprom, check it !!\n");
                 return;
         }
-        rtlefuse->eeprom_oemid = *(u8 *)&hwinfo[EEPROM_CUSTOMER_ID];
+        rtlefuse->eeprom_oemid = hwinfo[EEPROM_CUSTOMER_ID];
         _rtl92de_read_macphymode_and_bandtype(hw, hwinfo);
 
         /* VID, DID  SE     0xA-D */
@@ -2115,7 +2115,7 @@ void rtl92de_update_channel_access_setting(struct ieee80211_hw *hw)
         u16 sifs_timer;
 
         rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_SLOT_TIME,
-                                      (u8 *)&mac->slot_time);
+                                      &mac->slot_time);
         if (!mac->ht_enable)
                 sifs_timer = 0x0a0a;
         else
diff --git a/drivers/net/wireless/rtlwifi/rtl8192de/trx.c b/drivers/net/wireless/rtlwifi/rtl8192de/trx.c
index 1666ef7fd87..f80690d82c1 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192de/trx.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192de/trx.c
@@ -560,7 +560,7 @@ void rtl92de_tx_fill_desc(struct ieee80211_hw *hw,
         struct rtl_hal *rtlhal = rtl_hal(rtlpriv);
         struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw));
         struct ieee80211_sta *sta = info->control.sta;
-        u8 *pdesc = (u8 *) pdesc_tx;
+        u8 *pdesc = pdesc_tx;
         u16 seq_number;
         __le16 fc = hdr->frame_control;
         unsigned int buf_len = 0;
@@ -761,11 +761,11 @@ void rtl92de_tx_fill_cmddesc(struct ieee80211_hw *hw,
         SET_TX_DESC_QUEUE_SEL(pdesc, fw_queue);
         SET_TX_DESC_FIRST_SEG(pdesc, 1);
         SET_TX_DESC_LAST_SEG(pdesc, 1);
-        SET_TX_DESC_TX_BUFFER_SIZE(pdesc, (u16) (skb->len));
+        SET_TX_DESC_TX_BUFFER_SIZE(pdesc, (u16)skb->len);
         SET_TX_DESC_TX_BUFFER_ADDRESS(pdesc, mapping);
         SET_TX_DESC_RATE_ID(pdesc, 7);
         SET_TX_DESC_MACID(pdesc, 0);
-        SET_TX_DESC_PKT_SIZE((u8 *) pdesc, (u16) (skb->len));
+        SET_TX_DESC_PKT_SIZE(pdesc, (u16) (skb->len));
         SET_TX_DESC_FIRST_SEG(pdesc, 1);
         SET_TX_DESC_LAST_SEG(pdesc, 1);
         SET_TX_DESC_OFFSET(pdesc, 0x20);
diff --git a/drivers/net/wireless/rtlwifi/rtl8192se/dm.c b/drivers/net/wireless/rtlwifi/rtl8192se/dm.c
index 2e1158026fb..465f5815710 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192se/dm.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192se/dm.c
@@ -146,7 +146,7 @@ static void _rtl92s_dm_check_edca_turbo(struct ieee80211_hw *hw)
                 if (rtlpriv->dm.current_turbo_edca) {
                         u8 tmp = AC0_BE;
                         rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_AC_PARAM,
-                                                      (u8 *)(&tmp));
+                                                      &tmp);
                         rtlpriv->dm.current_turbo_edca = false;
                 }
         }
diff --git a/drivers/net/wireless/rtlwifi/rtl8192se/hw.c b/drivers/net/wireless/rtlwifi/rtl8192se/hw.c
index b141c35bf92..4542e6952b9 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192se/hw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192se/hw.c
@@ -145,13 +145,13 @@ void rtl92se_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                         for (e_aci = 0; e_aci < AC_MAX; e_aci++) {
                                 rtlpriv->cfg->ops->set_hw_reg(hw,
                                                 HW_VAR_AC_PARAM,
-                                                (u8 *)(&e_aci));
+                                                (&e_aci));
                         }
                         break;
                 }
         case HW_VAR_ACK_PREAMBLE:{
                         u8 reg_tmp;
-                        u8 short_preamble = (bool) (*(u8 *) val);
+                        u8 short_preamble = (bool) (*val);
                         reg_tmp = (mac->cur_40_prime_sc) << 5;
                         if (short_preamble)
                                 reg_tmp |= 0x80;
@@ -163,7 +163,7 @@ void rtl92se_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                         u8 min_spacing_to_set;
                         u8 sec_min_space;
 
-                        min_spacing_to_set = *((u8 *)val);
+                        min_spacing_to_set = *val;
                         if (min_spacing_to_set <= 7) {
                                 if (rtlpriv->sec.pairwise_enc_algorithm ==
                                     NO_ENCRYPTION)
@@ -194,7 +194,7 @@ void rtl92se_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
         case HW_VAR_SHORTGI_DENSITY:{
                         u8 density_to_set;
 
-                        density_to_set = *((u8 *) val);
+                        density_to_set = *val;
                         mac->min_space_cfg = rtlpriv->rtlhal.minspace_cfg;
                         mac->min_space_cfg |= (density_to_set << 3);
 
@@ -216,7 +216,7 @@ void rtl92se_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                                 15, 15, 15, 15, 0};
                         u8 index = 0;
 
-                        factor_toset = *((u8 *) val);
+                        factor_toset = *val;
                         if (factor_toset <= 3) {
                                 factor_toset = (1 << (factor_toset + 2));
                                 if (factor_toset > 0xf)
@@ -248,17 +248,17 @@ void rtl92se_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                         break;
                 }
         case HW_VAR_AC_PARAM:{
-                        u8 e_aci = *((u8 *) val);
+                        u8 e_aci = *val;
                         rtl92s_dm_init_edca_turbo(hw);
 
                         if (rtlpci->acm_method != eAcmWay2_SW)
                                 rtlpriv->cfg->ops->set_hw_reg(hw,
                                                  HW_VAR_ACM_CTRL,
-                                                 (u8 *)(&e_aci));
+                                                 &e_aci);
                         break;
                 }
         case HW_VAR_ACM_CTRL:{
-                        u8 e_aci = *((u8 *) val);
+                        u8 e_aci = *val;
                         union aci_aifsn *p_aci_aifsn = (union aci_aifsn *)(&(
                                                         mac->ac[0].aifs));
                         u8 acm = p_aci_aifsn->f.acm;
@@ -313,7 +313,7 @@ void rtl92se_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                         break;
                 }
         case HW_VAR_RETRY_LIMIT:{
-                        u8 retry_limit = ((u8 *) (val))[0];
+                        u8 retry_limit = val[0];
 
                         rtl_write_word(rtlpriv, RETRY_LIMIT,
                                        retry_limit << RETRY_LIMIT_SHORT_SHIFT |
@@ -328,14 +328,14 @@ void rtl92se_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                         break;
                 }
         case HW_VAR_EFUSE_USAGE: {
-                        rtlefuse->efuse_usedpercentage = *((u8 *) val);
+                        rtlefuse->efuse_usedpercentage = *val;
                         break;
                 }
         case HW_VAR_IO_CMD: {
                         break;
                 }
         case HW_VAR_WPA_CONFIG: {
-                        rtl_write_byte(rtlpriv, REG_SECR, *((u8 *) val));
+                        rtl_write_byte(rtlpriv, REG_SECR, *val);
                         break;
                 }
         case HW_VAR_SET_RPWM:{
@@ -1813,8 +1813,7 @@ static void _rtl92se_read_adapter_info(struct ieee80211_hw *hw)
                 else
                         index = 2;
 
-                tempval = (*(u8 *)&hwinfo[EEPROM_TX_PWR_HT20_DIFF +
-                           index]) & 0xff;
+                tempval = hwinfo[EEPROM_TX_PWR_HT20_DIFF + index] & 0xff;
                 rtlefuse->txpwr_ht20diff[RF90_PATH_A][i] = (tempval & 0xF);
                 rtlefuse->txpwr_ht20diff[RF90_PATH_B][i] =
                                                  ((tempval >> 4) & 0xF);
@@ -1830,14 +1829,13 @@ static void _rtl92se_read_adapter_info(struct ieee80211_hw *hw)
                 else
                         index = 1;
 
-                tempval = (*(u8 *)&hwinfo[EEPROM_TX_PWR_OFDM_DIFF + index])
-                                  & 0xff;
+                tempval = hwinfo[EEPROM_TX_PWR_OFDM_DIFF + index] & 0xff;
                 rtlefuse->txpwr_legacyhtdiff[RF90_PATH_A][i] =
                                  (tempval & 0xF);
                 rtlefuse->txpwr_legacyhtdiff[RF90_PATH_B][i] =
                                  ((tempval >> 4) & 0xF);
 
-                tempval = (*(u8 *)&hwinfo[TX_PWR_SAFETY_CHK]);
+                tempval = hwinfo[TX_PWR_SAFETY_CHK];
                 rtlefuse->txpwr_safetyflag = (tempval & 0x01);
         }
 
@@ -1876,7 +1874,7 @@ static void _rtl92se_read_adapter_info(struct ieee80211_hw *hw)
 
         /* Read RF-indication and Tx Power gain
          * index diff of legacy to HT OFDM rate. */
-        tempval = (*(u8 *)&hwinfo[EEPROM_RFIND_POWERDIFF]) & 0xff;
+        tempval = hwinfo[EEPROM_RFIND_POWERDIFF] & 0xff;
         rtlefuse->eeprom_txpowerdiff = tempval;
         rtlefuse->legacy_httxpowerdiff =
                 rtlefuse->txpwr_legacyhtdiff[RF90_PATH_A][0];
@@ -1887,7 +1885,7 @@ static void _rtl92se_read_adapter_info(struct ieee80211_hw *hw)
         /* Get TSSI value for each path. */
         usvalue = *(u16 *)&hwinfo[EEPROM_TSSI_A];
         rtlefuse->eeprom_tssi[RF90_PATH_A] = (u8)((usvalue & 0xff00) >> 8);
-        usvalue = *(u8 *)&hwinfo[EEPROM_TSSI_B];
+        usvalue = hwinfo[EEPROM_TSSI_B];
         rtlefuse->eeprom_tssi[RF90_PATH_B] = (u8)(usvalue & 0xff);
 
         RTPRINT(rtlpriv, FINIT, INIT_TxPower, "TSSI_A = 0x%x, TSSI_B = 0x%x\n",
@@ -1896,7 +1894,7 @@ static void _rtl92se_read_adapter_info(struct ieee80211_hw *hw)
 
         /* Read antenna tx power offset of B/C/D to A  from EEPROM */
         /* and read ThermalMeter from EEPROM */
-        tempval = *(u8 *)&hwinfo[EEPROM_THERMALMETER];
+        tempval = hwinfo[EEPROM_THERMALMETER];
         rtlefuse->eeprom_thermalmeter = tempval;
         RTPRINT(rtlpriv, FINIT, INIT_TxPower,
                 "thermalmeter = 0x%x\n", rtlefuse->eeprom_thermalmeter);
@@ -1906,20 +1904,20 @@ static void _rtl92se_read_adapter_info(struct ieee80211_hw *hw)
         rtlefuse->tssi_13dbm = rtlefuse->eeprom_thermalmeter * 100;
 
         /* Read CrystalCap from EEPROM */
-        tempval = (*(u8 *)&hwinfo[EEPROM_CRYSTALCAP]) >> 4;
+        tempval = hwinfo[EEPROM_CRYSTALCAP] >> 4;
         rtlefuse->eeprom_crystalcap = tempval;
         /* CrystalCap, BIT(12)~15 */
         rtlefuse->crystalcap = rtlefuse->eeprom_crystalcap;
 
         /* Read IC Version && Channel Plan */
         /* Version ID, Channel plan */
-        rtlefuse->eeprom_channelplan = *(u8 *)&hwinfo[EEPROM_CHANNELPLAN];
+        rtlefuse->eeprom_channelplan = hwinfo[EEPROM_CHANNELPLAN];
         rtlefuse->txpwr_fromeprom = true;
         RTPRINT(rtlpriv, FINIT, INIT_TxPower,
                 "EEPROM ChannelPlan = 0x%4x\n", rtlefuse->eeprom_channelplan);
 
         /* Read Customer ID or Board Type!!! */
-        tempval = *(u8 *)&hwinfo[EEPROM_BOARDTYPE];
+        tempval = hwinfo[EEPROM_BOARDTYPE];
         /* Change RF type definition */
         if (tempval == 0)
                 rtlphy->rf_type = RF_2T2R;
@@ -1941,7 +1939,7 @@ static void _rtl92se_read_adapter_info(struct ieee80211_hw *hw)
                 }
         }
         rtlefuse->b1ss_support = rtlefuse->b1x1_recvcombine;
-        rtlefuse->eeprom_oemid = *(u8 *)&hwinfo[EEPROM_CUSTOMID];
+        rtlefuse->eeprom_oemid = *&hwinfo[EEPROM_CUSTOMID];
 
         RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "EEPROM Customer ID: 0x%2x",
                  rtlefuse->eeprom_oemid);
@@ -2251,7 +2249,7 @@ void rtl92se_update_channel_access_setting(struct ieee80211_hw *hw)
         u16 sifs_timer;
 
         rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_SLOT_TIME,
-                                      (u8 *)&mac->slot_time);
+                                      &mac->slot_time);
         sifs_timer = 0x0e0e;
         rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_SIFS, (u8 *)&sifs_timer);
 
diff --git a/drivers/net/wireless/rtlwifi/rtl8192se/phy.c b/drivers/net/wireless/rtlwifi/rtl8192se/phy.c
index 8d7099bc472..b917a2a3caf 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192se/phy.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192se/phy.c
@@ -1247,6 +1247,9 @@ static void _rtl92s_phy_get_txpower_index(struct ieee80211_hw *hw, u8 channel,
                 /* Read HT 40 OFDM TX power */
                 ofdmpowerLevel[0] = rtlefuse->txpwrlevel_ht40_2s[0][index];
                 ofdmpowerLevel[1] = rtlefuse->txpwrlevel_ht40_2s[1][index];
+        } else {
+                ofdmpowerLevel[0] = 0;
+                ofdmpowerLevel[1] = 0;
         }
 }
 
diff --git a/drivers/net/wireless/rtlwifi/rtl8192se/sw.c b/drivers/net/wireless/rtlwifi/rtl8192se/sw.c
index 730bcc91952..ad4b4803482 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192se/sw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192se/sw.c
@@ -29,7 +29,6 @@
 
 #include "../wifi.h"
 #include "../core.h"
-#include "../pci.h"
 #include "../base.h"
 #include "../pci.h"
 #include "reg.h"
diff --git a/drivers/net/wireless/rtlwifi/rtl8192se/trx.c b/drivers/net/wireless/rtlwifi/rtl8192se/trx.c
index 812b5858f14..36d1cb3aef8 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192se/trx.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192se/trx.c
@@ -599,7 +599,7 @@ void rtl92se_tx_fill_desc(struct ieee80211_hw *hw,
         struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
         struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
         struct ieee80211_sta *sta = info->control.sta;
-        u8 *pdesc = (u8 *) pdesc_tx;
+        u8 *pdesc = pdesc_tx;
         u16 seq_number;
         __le16 fc = hdr->frame_control;
         u8 reserved_macid = 0;
diff --git a/drivers/net/wireless/ti/Kconfig b/drivers/net/wireless/ti/Kconfig
index 1a72932e221..be800119d0a 100644
--- a/drivers/net/wireless/ti/Kconfig
+++ b/drivers/net/wireless/ti/Kconfig
@@ -8,6 +8,7 @@ menuconfig WL_TI
 if WL_TI
 source "drivers/net/wireless/ti/wl1251/Kconfig"
 source "drivers/net/wireless/ti/wl12xx/Kconfig"
+source "drivers/net/wireless/ti/wl18xx/Kconfig"
 
 # keep last for automatic dependencies
 source "drivers/net/wireless/ti/wlcore/Kconfig"
diff --git a/drivers/net/wireless/ti/Makefile b/drivers/net/wireless/ti/Makefile
index 0a565622d4a..4d6823983c0 100644
--- a/drivers/net/wireless/ti/Makefile
+++ b/drivers/net/wireless/ti/Makefile
@@ -2,3 +2,4 @@ obj-$(CONFIG_WLCORE)			+= wlcore/
 obj-$(CONFIG_WL12XX)                    += wl12xx/
 obj-$(CONFIG_WL12XX_PLATFORM_DATA)      += wlcore/
 obj-$(CONFIG_WL1251)                    += wl1251/
+obj-$(CONFIG_WL18XX)                    += wl18xx/
diff --git a/drivers/net/wireless/ti/wl1251/cmd.c b/drivers/net/wireless/ti/wl1251/cmd.c
index d14d69d733a..6822b845efc 100644
--- a/drivers/net/wireless/ti/wl1251/cmd.c
+++ b/drivers/net/wireless/ti/wl1251/cmd.c
@@ -277,15 +277,6 @@ int wl1251_cmd_join(struct wl1251 *wl, u8 bss_type, u8 channel,
         join->rx_config_options = wl->rx_config;
         join->rx_filter_options = wl->rx_filter;
 
-        /*
-         * FIXME: disable temporarily all filters because after commit
-         * 9cef8737 "mac80211: fix managed mode BSSID handling" broke
-         * association. The filter logic needs to be implemented properly
-         * and once that is done, this hack can be removed.
-         */
-        join->rx_config_options = 0;
-        join->rx_filter_options = WL1251_DEFAULT_RX_FILTER;
-
         join->basic_rate_set = RATE_MASK_1MBPS | RATE_MASK_2MBPS |
                 RATE_MASK_5_5MBPS | RATE_MASK_11MBPS;
 
diff --git a/drivers/net/wireless/ti/wl1251/main.c b/drivers/net/wireless/ti/wl1251/main.c
index d1afb8e3b2e..3118c425bcf 100644
--- a/drivers/net/wireless/ti/wl1251/main.c
+++ b/drivers/net/wireless/ti/wl1251/main.c
@@ -334,6 +334,12 @@ static int wl1251_join(struct wl1251 *wl, u8 bss_type, u8 channel,
         if (ret < 0)
                 goto out;
 
+        /*
+         * Join command applies filters, and if we are not associated,
+         * BSSID filter must be disabled for association to work.
+         */
+        if (is_zero_ether_addr(wl->bssid))
+                wl->rx_config &= ~CFG_BSSID_FILTER_EN;
 
         ret = wl1251_cmd_join(wl, bss_type, channel, beacon_interval,
                               dtim_period);
@@ -348,33 +354,6 @@ out:
         return ret;
 }
 
-static void wl1251_filter_work(struct work_struct *work)
-{
-        struct wl1251 *wl =
-                container_of(work, struct wl1251, filter_work);
-        int ret;
-
-        mutex_lock(&wl->mutex);
-
-        if (wl->state == WL1251_STATE_OFF)
-                goto out;
-
-        ret = wl1251_ps_elp_wakeup(wl);
-        if (ret < 0)
-                goto out;
-
-        ret = wl1251_join(wl, wl->bss_type, wl->channel, wl->beacon_int,
-                          wl->dtim_period);
-        if (ret < 0)
-                goto out_sleep;
-
-out_sleep:
-        wl1251_ps_elp_sleep(wl);
-
-out:
-        mutex_unlock(&wl->mutex);
-}
-
 static void wl1251_op_tx(struct ieee80211_hw *hw, struct sk_buff *skb)
 {
         struct wl1251 *wl = hw->priv;
@@ -478,7 +457,6 @@ static void wl1251_op_stop(struct ieee80211_hw *hw)
 
         cancel_work_sync(&wl->irq_work);
         cancel_work_sync(&wl->tx_work);
-        cancel_work_sync(&wl->filter_work);
         cancel_delayed_work_sync(&wl->elp_work);
 
         mutex_lock(&wl->mutex);
@@ -681,13 +659,15 @@ out:
                                   FIF_FCSFAIL | \
                                   FIF_BCN_PRBRESP_PROMISC | \
                                   FIF_CONTROL | \
-                                  FIF_OTHER_BSS)
+                                  FIF_OTHER_BSS | \
+                                  FIF_PROBE_REQ)
 
 static void wl1251_op_configure_filter(struct ieee80211_hw *hw,
                                        unsigned int changed,
                                        unsigned int *total,u64 multicast)
 {
         struct wl1251 *wl = hw->priv;
+        int ret;
 
         wl1251_debug(DEBUG_MAC80211, "mac80211 configure filter");
 
@@ -698,7 +678,7 @@ static void wl1251_op_configure_filter(struct ieee80211_hw *hw,
                 /* no filters which we support changed */
                 return;
 
-        /* FIXME: wl->rx_config and wl->rx_filter are not protected */
+        mutex_lock(&wl->mutex);
 
         wl->rx_config = WL1251_DEFAULT_RX_CONFIG;
         wl->rx_filter = WL1251_DEFAULT_RX_FILTER;
@@ -721,15 +701,25 @@ static void wl1251_op_configure_filter(struct ieee80211_hw *hw,
         }
         if (*total & FIF_CONTROL)
                 wl->rx_filter |= CFG_RX_CTL_EN;
-        if (*total & FIF_OTHER_BSS)
-                wl->rx_filter &= ~CFG_BSSID_FILTER_EN;
+        if (*total & FIF_OTHER_BSS || is_zero_ether_addr(wl->bssid))
+                wl->rx_config &= ~CFG_BSSID_FILTER_EN;
+        if (*total & FIF_PROBE_REQ)
+                wl->rx_filter |= CFG_RX_PREQ_EN;
 
-        /*
-         * FIXME: workqueues need to be properly cancelled on stop(), for
-         * now let's just disable changing the filter settings. They will
-         * be updated any on config().
-         */
-        /* schedule_work(&wl->filter_work); */
+        if (wl->state == WL1251_STATE_OFF)
+                goto out;
+
+        ret = wl1251_ps_elp_wakeup(wl);
+        if (ret < 0)
+                goto out;
+
+        /* send filters to firmware */
+        wl1251_acx_rx_config(wl, wl->rx_config, wl->rx_filter);
+
+        wl1251_ps_elp_sleep(wl);
+
+out:
+        mutex_unlock(&wl->mutex);
 }
 
 /* HW encryption */
@@ -1390,7 +1380,6 @@ struct ieee80211_hw *wl1251_alloc_hw(void)
 
         skb_queue_head_init(&wl->tx_queue);
 
-        INIT_WORK(&wl->filter_work, wl1251_filter_work);
         INIT_DELAYED_WORK(&wl->elp_work, wl1251_elp_work);
         wl->channel = WL1251_DEFAULT_CHANNEL;
         wl->scanning = false;
diff --git a/drivers/net/wireless/ti/wl1251/wl1251.h b/drivers/net/wireless/ti/wl1251/wl1251.h
index 9d8f5816c6f..fd02060038d 100644
--- a/drivers/net/wireless/ti/wl1251/wl1251.h
+++ b/drivers/net/wireless/ti/wl1251/wl1251.h
@@ -315,7 +315,6 @@ struct wl1251 {
         bool tx_queue_stopped;
 
         struct work_struct tx_work;
-        struct work_struct filter_work;
 
         /* Pending TX frames */
         struct sk_buff *tx_frames[16];
diff --git a/drivers/net/wireless/ti/wl12xx/Makefile b/drivers/net/wireless/ti/wl12xx/Makefile
index 87f64b14db3..da509aa7d00 100644
--- a/drivers/net/wireless/ti/wl12xx/Makefile
+++ b/drivers/net/wireless/ti/wl12xx/Makefile
@@ -1,3 +1,3 @@
-wl12xx-objs     = main.o cmd.o acx.o
+wl12xx-objs     = main.o cmd.o acx.o debugfs.o
 
 obj-$(CONFIG_WL12XX)            += wl12xx.o
diff --git a/drivers/net/wireless/ti/wl12xx/acx.h b/drivers/net/wireless/ti/wl12xx/acx.h
index d1f5aba0afc..2a26868b837 100644
--- a/drivers/net/wireless/ti/wl12xx/acx.h
+++ b/drivers/net/wireless/ti/wl12xx/acx.h
@@ -24,6 +24,21 @@
 #define __WL12XX_ACX_H__
 
 #include "../wlcore/wlcore.h"
+#include "../wlcore/acx.h"
+
+#define WL12XX_ACX_ALL_EVENTS_VECTOR    (WL1271_ACX_INTR_WATCHDOG      | \
+                                        WL1271_ACX_INTR_INIT_COMPLETE | \
+                                        WL1271_ACX_INTR_EVENT_A       | \
+                                        WL1271_ACX_INTR_EVENT_B       | \
+                                        WL1271_ACX_INTR_CMD_COMPLETE  | \
+                                        WL1271_ACX_INTR_HW_AVAILABLE  | \
+                                        WL1271_ACX_INTR_DATA)
+
+#define WL12XX_INTR_MASK                (WL1271_ACX_INTR_WATCHDOG      | \
+                                        WL1271_ACX_INTR_EVENT_A       | \
+                                        WL1271_ACX_INTR_EVENT_B       | \
+                                        WL1271_ACX_INTR_HW_AVAILABLE  | \
+                                        WL1271_ACX_INTR_DATA)
 
 struct wl1271_acx_host_config_bitmap {
         struct acx_header header;
@@ -31,6 +46,228 @@ struct wl1271_acx_host_config_bitmap {
         __le32 host_cfg_bitmap;
 } __packed;
 
+struct wl12xx_acx_tx_statistics {
+        __le32 internal_desc_overflow;
+}  __packed;
+
+struct wl12xx_acx_rx_statistics {
+        __le32 out_of_mem;
+        __le32 hdr_overflow;
+        __le32 hw_stuck;
+        __le32 dropped;
+        __le32 fcs_err;
+        __le32 xfr_hint_trig;
+        __le32 path_reset;
+        __le32 reset_counter;
+} __packed;
+
+struct wl12xx_acx_dma_statistics {
+        __le32 rx_requested;
+        __le32 rx_errors;
+        __le32 tx_requested;
+        __le32 tx_errors;
+}  __packed;
+
+struct wl12xx_acx_isr_statistics {
+        /* host command complete */
+        __le32 cmd_cmplt;
+
+        /* fiqisr() */
+        __le32 fiqs;
+
+        /* (INT_STS_ND & INT_TRIG_RX_HEADER) */
+        __le32 rx_headers;
+
+        /* (INT_STS_ND & INT_TRIG_RX_CMPLT) */
+        __le32 rx_completes;
+
+        /* (INT_STS_ND & INT_TRIG_NO_RX_BUF) */
+        __le32 rx_mem_overflow;
+
+        /* (INT_STS_ND & INT_TRIG_S_RX_RDY) */
+        __le32 rx_rdys;
+
+        /* irqisr() */
+        __le32 irqs;
+
+        /* (INT_STS_ND & INT_TRIG_TX_PROC) */
+        __le32 tx_procs;
+
+        /* (INT_STS_ND & INT_TRIG_DECRYPT_DONE) */
+        __le32 decrypt_done;
+
+        /* (INT_STS_ND & INT_TRIG_DMA0) */
+        __le32 dma0_done;
+
+        /* (INT_STS_ND & INT_TRIG_DMA1) */
+        __le32 dma1_done;
+
+        /* (INT_STS_ND & INT_TRIG_TX_EXC_CMPLT) */
+        __le32 tx_exch_complete;
+
+        /* (INT_STS_ND & INT_TRIG_COMMAND) */
+        __le32 commands;
+
+        /* (INT_STS_ND & INT_TRIG_RX_PROC) */
+        __le32 rx_procs;
+
+        /* (INT_STS_ND & INT_TRIG_PM_802) */
+        __le32 hw_pm_mode_changes;
+
+        /* (INT_STS_ND & INT_TRIG_ACKNOWLEDGE) */
+        __le32 host_acknowledges;
+
+        /* (INT_STS_ND & INT_TRIG_PM_PCI) */
+        __le32 pci_pm;
+
+        /* (INT_STS_ND & INT_TRIG_ACM_WAKEUP) */
+        __le32 wakeups;
+
+        /* (INT_STS_ND & INT_TRIG_LOW_RSSI) */
+        __le32 low_rssi;
+} __packed;
+
+struct wl12xx_acx_wep_statistics {
+        /* WEP address keys configured */
+        __le32 addr_key_count;
+
+        /* default keys configured */
+        __le32 default_key_count;
+
+        __le32 reserved;
+
+        /* number of times that WEP key not found on lookup */
+        __le32 key_not_found;
+
+        /* number of times that WEP key decryption failed */
+        __le32 decrypt_fail;
+
+        /* WEP packets decrypted */
+        __le32 packets;
+
+        /* WEP decrypt interrupts */
+        __le32 interrupt;
+} __packed;
+
+#define ACX_MISSED_BEACONS_SPREAD 10
+
+struct wl12xx_acx_pwr_statistics {
+        /* the amount of enters into power save mode (both PD & ELP) */
+        __le32 ps_enter;
+
+        /* the amount of enters into ELP mode */
+        __le32 elp_enter;
+
+        /* the amount of missing beacon interrupts to the host */
+        __le32 missing_bcns;
+
+        /* the amount of wake on host-access times */
+        __le32 wake_on_host;
+
+        /* the amount of wake on timer-expire */
+        __le32 wake_on_timer_exp;
+
+        /* the number of packets that were transmitted with PS bit set */
+        __le32 tx_with_ps;
+
+        /* the number of packets that were transmitted with PS bit clear */
+        __le32 tx_without_ps;
+
+        /* the number of received beacons */
+        __le32 rcvd_beacons;
+
+        /* the number of entering into PowerOn (power save off) */
+        __le32 power_save_off;
+
+        /* the number of entries into power save mode */
+        __le16 enable_ps;
+
+        /*
+         * the number of exits from power save, not including failed PS
+         * transitions
+         */
+        __le16 disable_ps;
+
+        /*
+         * the number of times the TSF counter was adjusted because
+         * of drift
+         */
+        __le32 fix_tsf_ps;
+
+        /* Gives statistics about the spread continuous missed beacons.
+         * The 16 LSB are dedicated for the PS mode.
+         * The 16 MSB are dedicated for the PS mode.
+         * cont_miss_bcns_spread[0] - single missed beacon.
+         * cont_miss_bcns_spread[1] - two continuous missed beacons.
+         * cont_miss_bcns_spread[2] - three continuous missed beacons.
+         * ...
+         * cont_miss_bcns_spread[9] - ten and more continuous missed beacons.
+        */
+        __le32 cont_miss_bcns_spread[ACX_MISSED_BEACONS_SPREAD];
+
+        /* the number of beacons in awake mode */
+        __le32 rcvd_awake_beacons;
+} __packed;
+
+struct wl12xx_acx_mic_statistics {
+        __le32 rx_pkts;
+        __le32 calc_failure;
+} __packed;
+
+struct wl12xx_acx_aes_statistics {
+        __le32 encrypt_fail;
+        __le32 decrypt_fail;
+        __le32 encrypt_packets;
+        __le32 decrypt_packets;
+        __le32 encrypt_interrupt;
+        __le32 decrypt_interrupt;
+} __packed;
+
+struct wl12xx_acx_event_statistics {
+        __le32 heart_beat;
+        __le32 calibration;
+        __le32 rx_mismatch;
+        __le32 rx_mem_empty;
+        __le32 rx_pool;
+        __le32 oom_late;
+        __le32 phy_transmit_error;
+        __le32 tx_stuck;
+} __packed;
+
+struct wl12xx_acx_ps_statistics {
+        __le32 pspoll_timeouts;
+        __le32 upsd_timeouts;
+        __le32 upsd_max_sptime;
+        __le32 upsd_max_apturn;
+        __le32 pspoll_max_apturn;
+        __le32 pspoll_utilization;
+        __le32 upsd_utilization;
+} __packed;
+
+struct wl12xx_acx_rxpipe_statistics {
+        __le32 rx_prep_beacon_drop;
+        __le32 descr_host_int_trig_rx_data;
+        __le32 beacon_buffer_thres_host_int_trig_rx_data;
+        __le32 missed_beacon_host_int_trig_rx_data;
+        __le32 tx_xfr_host_int_trig_rx_data;
+} __packed;
+
+struct wl12xx_acx_statistics {
+        struct acx_header header;
+
+        struct wl12xx_acx_tx_statistics tx;
+        struct wl12xx_acx_rx_statistics rx;
+        struct wl12xx_acx_dma_statistics dma;
+        struct wl12xx_acx_isr_statistics isr;
+        struct wl12xx_acx_wep_statistics wep;
+        struct wl12xx_acx_pwr_statistics pwr;
+        struct wl12xx_acx_aes_statistics aes;
+        struct wl12xx_acx_mic_statistics mic;
+        struct wl12xx_acx_event_statistics event;
+        struct wl12xx_acx_ps_statistics ps;
+        struct wl12xx_acx_rxpipe_statistics rxpipe;
+} __packed;
+
 int wl1271_acx_host_if_cfg_bitmap(struct wl1271 *wl, u32 host_cfg_bitmap);
 
 #endif /* __WL12XX_ACX_H__ */
diff --git a/drivers/net/wireless/ti/wl12xx/cmd.c b/drivers/net/wireless/ti/wl12xx/cmd.c
index 8ffaeb5f214..30be784a40d 100644
--- a/drivers/net/wireless/ti/wl12xx/cmd.c
+++ b/drivers/net/wireless/ti/wl12xx/cmd.c
@@ -65,6 +65,7 @@ int wl1271_cmd_general_parms(struct wl1271 *wl)
         struct wl1271_general_parms_cmd *gen_parms;
         struct wl1271_ini_general_params *gp =
                 &((struct wl1271_nvs_file *)wl->nvs)->general_params;
+        struct wl12xx_priv *priv = wl->priv;
         bool answer = false;
         int ret;
 
@@ -88,7 +89,7 @@ int wl1271_cmd_general_parms(struct wl1271 *wl)
                 answer = true;
 
         /* Override the REF CLK from the NVS with the one from platform data */
-        gen_parms->general_params.ref_clock = wl->ref_clock;
+        gen_parms->general_params.ref_clock = priv->ref_clock;
 
         ret = wl1271_cmd_test(wl, gen_parms, sizeof(*gen_parms), answer);
         if (ret < 0) {
@@ -118,6 +119,7 @@ int wl128x_cmd_general_parms(struct wl1271 *wl)
         struct wl128x_general_parms_cmd *gen_parms;
         struct wl128x_ini_general_params *gp =
                 &((struct wl128x_nvs_file *)wl->nvs)->general_params;
+        struct wl12xx_priv *priv = wl->priv;
         bool answer = false;
         int ret;
 
@@ -141,8 +143,8 @@ int wl128x_cmd_general_parms(struct wl1271 *wl)
                 answer = true;
 
         /* Replace REF and TCXO CLKs with the ones from platform data */
-        gen_parms->general_params.ref_clock = wl->ref_clock;
-        gen_parms->general_params.tcxo_ref_clock = wl->tcxo_clock;
+        gen_parms->general_params.ref_clock = priv->ref_clock;
+        gen_parms->general_params.tcxo_ref_clock = priv->tcxo_clock;
 
         ret = wl1271_cmd_test(wl, gen_parms, sizeof(*gen_parms), answer);
         if (ret < 0) {
@@ -172,7 +174,7 @@ int wl1271_cmd_radio_parms(struct wl1271 *wl)
         struct wl1271_nvs_file *nvs = (struct wl1271_nvs_file *)wl->nvs;
         struct wl1271_radio_parms_cmd *radio_parms;
         struct wl1271_ini_general_params *gp = &nvs->general_params;
-        int ret;
+        int ret, fem_idx;
 
         if (!wl->nvs)
                 return -ENODEV;
@@ -183,11 +185,13 @@ int wl1271_cmd_radio_parms(struct wl1271 *wl)
 
         radio_parms->test.id = TEST_CMD_INI_FILE_RADIO_PARAM;
 
+        fem_idx = WL12XX_FEM_TO_NVS_ENTRY(gp->tx_bip_fem_manufacturer);
+
         /* 2.4GHz parameters */
         memcpy(&radio_parms->static_params_2, &nvs->stat_radio_params_2,
                sizeof(struct wl1271_ini_band_params_2));
         memcpy(&radio_parms->dyn_params_2,
-               &nvs->dyn_radio_params_2[gp->tx_bip_fem_manufacturer].params,
+               &nvs->dyn_radio_params_2[fem_idx].params,
                sizeof(struct wl1271_ini_fem_params_2));
 
         /* 5GHz parameters */
@@ -195,7 +199,7 @@ int wl1271_cmd_radio_parms(struct wl1271 *wl)
                &nvs->stat_radio_params_5,
                sizeof(struct wl1271_ini_band_params_5));
         memcpy(&radio_parms->dyn_params_5,
-               &nvs->dyn_radio_params_5[gp->tx_bip_fem_manufacturer].params,
+               &nvs->dyn_radio_params_5[fem_idx].params,
                sizeof(struct wl1271_ini_fem_params_5));
 
         wl1271_dump(DEBUG_CMD, "TEST_CMD_INI_FILE_RADIO_PARAM: ",
@@ -214,7 +218,7 @@ int wl128x_cmd_radio_parms(struct wl1271 *wl)
         struct wl128x_nvs_file *nvs = (struct wl128x_nvs_file *)wl->nvs;
         struct wl128x_radio_parms_cmd *radio_parms;
         struct wl128x_ini_general_params *gp = &nvs->general_params;
-        int ret;
+        int ret, fem_idx;
 
         if (!wl->nvs)
                 return -ENODEV;
@@ -225,11 +229,13 @@ int wl128x_cmd_radio_parms(struct wl1271 *wl)
 
         radio_parms->test.id = TEST_CMD_INI_FILE_RADIO_PARAM;
 
+        fem_idx = WL12XX_FEM_TO_NVS_ENTRY(gp->tx_bip_fem_manufacturer);
+
         /* 2.4GHz parameters */
         memcpy(&radio_parms->static_params_2, &nvs->stat_radio_params_2,
                sizeof(struct wl128x_ini_band_params_2));
         memcpy(&radio_parms->dyn_params_2,
-               &nvs->dyn_radio_params_2[gp->tx_bip_fem_manufacturer].params,
+               &nvs->dyn_radio_params_2[fem_idx].params,
                sizeof(struct wl128x_ini_fem_params_2));
 
         /* 5GHz parameters */
@@ -237,7 +243,7 @@ int wl128x_cmd_radio_parms(struct wl1271 *wl)
                &nvs->stat_radio_params_5,
                sizeof(struct wl128x_ini_band_params_5));
         memcpy(&radio_parms->dyn_params_5,
-               &nvs->dyn_radio_params_5[gp->tx_bip_fem_manufacturer].params,
+               &nvs->dyn_radio_params_5[fem_idx].params,
                sizeof(struct wl128x_ini_fem_params_5));
 
         radio_parms->fem_vendor_and_options = nvs->fem_vendor_and_options;
diff --git a/drivers/net/wireless/ti/wl12xx/debugfs.c b/drivers/net/wireless/ti/wl12xx/debugfs.c
new file mode 100644
index 00000000000..0521cbf858c
--- /dev/null
+++ b/drivers/net/wireless/ti/wl12xx/debugfs.c
@@ -0,0 +1,243 @@
+/*
+ * This file is part of wl12xx
+ *
+ * Copyright (C) 2009 Nokia Corporation
+ * Copyright (C) 2011-2012 Texas Instruments
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ *
+ */
+
+#include "../wlcore/debugfs.h"
+#include "../wlcore/wlcore.h"
+
+#include "wl12xx.h"
+#include "acx.h"
+#include "debugfs.h"
+
+#define WL12XX_DEBUGFS_FWSTATS_FILE(a, b, c) \
+        DEBUGFS_FWSTATS_FILE(a, b, c, wl12xx_acx_statistics)
+
+WL12XX_DEBUGFS_FWSTATS_FILE(tx, internal_desc_overflow, "%u");
+
+WL12XX_DEBUGFS_FWSTATS_FILE(rx, out_of_mem, "%u");
+WL12XX_DEBUGFS_FWSTATS_FILE(rx, hdr_overflow, "%u");
+WL12XX_DEBUGFS_FWSTATS_FILE(rx, hw_stuck, "%u");
+WL12XX_DEBUGFS_FWSTATS_FILE(rx, dropped, "%u");
+WL12XX_DEBUGFS_FWSTATS_FILE(rx, fcs_err, "%u");
+WL12XX_DEBUGFS_FWSTATS_FILE(rx, xfr_hint_trig, "%u");
+WL12XX_DEBUGFS_FWSTATS_FILE(rx, path_reset, "%u");
+WL12XX_DEBUGFS_FWSTATS_FILE(rx, reset_counter, "%u");
+
+WL12XX_DEBUGFS_FWSTATS_FILE(dma, rx_requested, "%u");
+WL12XX_DEBUGFS_FWSTATS_FILE(dma, rx_errors, "%u");
+WL12XX_DEBUGFS_FWSTATS_FILE(dma, tx_requested, "%u");
+WL12XX_DEBUGFS_FWSTATS_FILE(dma, tx_errors, "%u");
+
+WL12XX_DEBUGFS_FWSTATS_FILE(isr, cmd_cmplt, "%u");
+WL12XX_DEBUGFS_FWSTATS_FILE(isr, fiqs, "%u");
+WL12XX_DEBUGFS_FWSTATS_FILE(isr, rx_headers, "%u");
+WL12XX_DEBUGFS_FWSTATS_FILE(isr, rx_mem_overflow, "%u");
+WL12XX_DEBUGFS_FWSTATS_FILE(isr, rx_rdys, "%u");
+WL12XX_DEBUGFS_FWSTATS_FILE(isr, irqs, "%u");
+WL12XX_DEBUGFS_FWSTATS_FILE(isr, tx_procs, "%u");
+WL12XX_DEBUGFS_FWSTATS_FILE(isr, decrypt_done, "%u");
+WL12XX_DEBUGFS_FWSTATS_FILE(isr, dma0_done, "%u");
+WL12XX_DEBUGFS_FWSTATS_FILE(isr, dma1_done, "%u");
+WL12XX_DEBUGFS_FWSTATS_FILE(isr, tx_exch_complete, "%u");
+WL12XX_DEBUGFS_FWSTATS_FILE(isr, commands, "%u");
+WL12XX_DEBUGFS_FWSTATS_FILE(isr, rx_procs, "%u");
+WL12XX_DEBUGFS_FWSTATS_FILE(isr, hw_pm_mode_changes, "%u");
+WL12XX_DEBUGFS_FWSTATS_FILE(isr, host_acknowledges, "%u");
+WL12XX_DEBUGFS_FWSTATS_FILE(isr, pci_pm, "%u");
+WL12XX_DEBUGFS_FWSTATS_FILE(isr, wakeups, "%u");
+WL12XX_DEBUGFS_FWSTATS_FILE(isr, low_rssi, "%u");
+
+WL12XX_DEBUGFS_FWSTATS_FILE(wep, addr_key_count, "%u");
+WL12XX_DEBUGFS_FWSTATS_FILE(wep, default_key_count, "%u");
+/* skipping wep.reserved */
+WL12XX_DEBUGFS_FWSTATS_FILE(wep, key_not_found, "%u");
+WL12XX_DEBUGFS_FWSTATS_FILE(wep, decrypt_fail, "%u");
+WL12XX_DEBUGFS_FWSTATS_FILE(wep, packets, "%u");
+WL12XX_DEBUGFS_FWSTATS_FILE(wep, interrupt, "%u");
+
+WL12XX_DEBUGFS_FWSTATS_FILE(pwr, ps_enter, "%u");
+WL12XX_DEBUGFS_FWSTATS_FILE(pwr, elp_enter, "%u");
+WL12XX_DEBUGFS_FWSTATS_FILE(pwr, missing_bcns, "%u");
+WL12XX_DEBUGFS_FWSTATS_FILE(pwr, wake_on_host, "%u");
+WL12XX_DEBUGFS_FWSTATS_FILE(pwr, wake_on_timer_exp, "%u");
+WL12XX_DEBUGFS_FWSTATS_FILE(pwr, tx_with_ps, "%u");
+WL12XX_DEBUGFS_FWSTATS_FILE(pwr, tx_without_ps, "%u");
+WL12XX_DEBUGFS_FWSTATS_FILE(pwr, rcvd_beacons, "%u");
+WL12XX_DEBUGFS_FWSTATS_FILE(pwr, power_save_off, "%u");
+WL12XX_DEBUGFS_FWSTATS_FILE(pwr, enable_ps, "%u");
+WL12XX_DEBUGFS_FWSTATS_FILE(pwr, disable_ps, "%u");
+WL12XX_DEBUGFS_FWSTATS_FILE(pwr, fix_tsf_ps, "%u");
+/* skipping cont_miss_bcns_spread for now */
+WL12XX_DEBUGFS_FWSTATS_FILE(pwr, rcvd_awake_beacons, "%u");
+
+WL12XX_DEBUGFS_FWSTATS_FILE(mic, rx_pkts, "%u");
+WL12XX_DEBUGFS_FWSTATS_FILE(mic, calc_failure, "%u");
+
+WL12XX_DEBUGFS_FWSTATS_FILE(aes, encrypt_fail, "%u");
+WL12XX_DEBUGFS_FWSTATS_FILE(aes, decrypt_fail, "%u");
+WL12XX_DEBUGFS_FWSTATS_FILE(aes, encrypt_packets, "%u");
+WL12XX_DEBUGFS_FWSTATS_FILE(aes, decrypt_packets, "%u");
+WL12XX_DEBUGFS_FWSTATS_FILE(aes, encrypt_interrupt, "%u");
+WL12XX_DEBUGFS_FWSTATS_FILE(aes, decrypt_interrupt, "%u");
+
+WL12XX_DEBUGFS_FWSTATS_FILE(event, heart_beat, "%u");
+WL12XX_DEBUGFS_FWSTATS_FILE(event, calibration, "%u");
+WL12XX_DEBUGFS_FWSTATS_FILE(event, rx_mismatch, "%u");
+WL12XX_DEBUGFS_FWSTATS_FILE(event, rx_mem_empty, "%u");
+WL12XX_DEBUGFS_FWSTATS_FILE(event, rx_pool, "%u");
+WL12XX_DEBUGFS_FWSTATS_FILE(event, oom_late, "%u");
+WL12XX_DEBUGFS_FWSTATS_FILE(event, phy_transmit_error, "%u");
+WL12XX_DEBUGFS_FWSTATS_FILE(event, tx_stuck, "%u");
+
+WL12XX_DEBUGFS_FWSTATS_FILE(ps, pspoll_timeouts, "%u");
+WL12XX_DEBUGFS_FWSTATS_FILE(ps, upsd_timeouts, "%u");
+WL12XX_DEBUGFS_FWSTATS_FILE(ps, upsd_max_sptime, "%u");
+WL12XX_DEBUGFS_FWSTATS_FILE(ps, upsd_max_apturn, "%u");
+WL12XX_DEBUGFS_FWSTATS_FILE(ps, pspoll_max_apturn, "%u");
+WL12XX_DEBUGFS_FWSTATS_FILE(ps, pspoll_utilization, "%u");
+WL12XX_DEBUGFS_FWSTATS_FILE(ps, upsd_utilization, "%u");
+
+WL12XX_DEBUGFS_FWSTATS_FILE(rxpipe, rx_prep_beacon_drop, "%u");
+WL12XX_DEBUGFS_FWSTATS_FILE(rxpipe, descr_host_int_trig_rx_data, "%u");
+WL12XX_DEBUGFS_FWSTATS_FILE(rxpipe, beacon_buffer_thres_host_int_trig_rx_data,
+                            "%u");
+WL12XX_DEBUGFS_FWSTATS_FILE(rxpipe, missed_beacon_host_int_trig_rx_data, "%u");
+WL12XX_DEBUGFS_FWSTATS_FILE(rxpipe, tx_xfr_host_int_trig_rx_data, "%u");
+
+int wl12xx_debugfs_add_files(struct wl1271 *wl,
+                             struct dentry *rootdir)
+{
+        int ret = 0;
+        struct dentry *entry, *stats, *moddir;
+
+        moddir = debugfs_create_dir(KBUILD_MODNAME, rootdir);
+        if (!moddir || IS_ERR(moddir)) {
+                entry = moddir;
+                goto err;
+        }
+
+        stats = debugfs_create_dir("fw_stats", moddir);
+        if (!stats || IS_ERR(stats)) {
+                entry = stats;
+                goto err;
+        }
+
+        DEBUGFS_FWSTATS_ADD(tx, internal_desc_overflow);
+
+        DEBUGFS_FWSTATS_ADD(rx, out_of_mem);
+        DEBUGFS_FWSTATS_ADD(rx, hdr_overflow);
+        DEBUGFS_FWSTATS_ADD(rx, hw_stuck);
+        DEBUGFS_FWSTATS_ADD(rx, dropped);
+        DEBUGFS_FWSTATS_ADD(rx, fcs_err);
+        DEBUGFS_FWSTATS_ADD(rx, xfr_hint_trig);
+        DEBUGFS_FWSTATS_ADD(rx, path_reset);
+        DEBUGFS_FWSTATS_ADD(rx, reset_counter);
+
+        DEBUGFS_FWSTATS_ADD(dma, rx_requested);
+        DEBUGFS_FWSTATS_ADD(dma, rx_errors);
+        DEBUGFS_FWSTATS_ADD(dma, tx_requested);
+        DEBUGFS_FWSTATS_ADD(dma, tx_errors);
+
+        DEBUGFS_FWSTATS_ADD(isr, cmd_cmplt);
+        DEBUGFS_FWSTATS_ADD(isr, fiqs);
+        DEBUGFS_FWSTATS_ADD(isr, rx_headers);
+        DEBUGFS_FWSTATS_ADD(isr, rx_mem_overflow);
+        DEBUGFS_FWSTATS_ADD(isr, rx_rdys);
+        DEBUGFS_FWSTATS_ADD(isr, irqs);
+        DEBUGFS_FWSTATS_ADD(isr, tx_procs);
+        DEBUGFS_FWSTATS_ADD(isr, decrypt_done);
+        DEBUGFS_FWSTATS_ADD(isr, dma0_done);
+        DEBUGFS_FWSTATS_ADD(isr, dma1_done);
+        DEBUGFS_FWSTATS_ADD(isr, tx_exch_complete);
+        DEBUGFS_FWSTATS_ADD(isr, commands);
+        DEBUGFS_FWSTATS_ADD(isr, rx_procs);
+        DEBUGFS_FWSTATS_ADD(isr, hw_pm_mode_changes);
+        DEBUGFS_FWSTATS_ADD(isr, host_acknowledges);
+        DEBUGFS_FWSTATS_ADD(isr, pci_pm);
+        DEBUGFS_FWSTATS_ADD(isr, wakeups);
+        DEBUGFS_FWSTATS_ADD(isr, low_rssi);
+
+        DEBUGFS_FWSTATS_ADD(wep, addr_key_count);
+        DEBUGFS_FWSTATS_ADD(wep, default_key_count);
+        /* skipping wep.reserved */
+        DEBUGFS_FWSTATS_ADD(wep, key_not_found);
+        DEBUGFS_FWSTATS_ADD(wep, decrypt_fail);
+        DEBUGFS_FWSTATS_ADD(wep, packets);
+        DEBUGFS_FWSTATS_ADD(wep, interrupt);
+
+        DEBUGFS_FWSTATS_ADD(pwr, ps_enter);
+        DEBUGFS_FWSTATS_ADD(pwr, elp_enter);
+        DEBUGFS_FWSTATS_ADD(pwr, missing_bcns);
+        DEBUGFS_FWSTATS_ADD(pwr, wake_on_host);
+        DEBUGFS_FWSTATS_ADD(pwr, wake_on_timer_exp);
+        DEBUGFS_FWSTATS_ADD(pwr, tx_with_ps);
+        DEBUGFS_FWSTATS_ADD(pwr, tx_without_ps);
+        DEBUGFS_FWSTATS_ADD(pwr, rcvd_beacons);
+        DEBUGFS_FWSTATS_ADD(pwr, power_save_off);
+        DEBUGFS_FWSTATS_ADD(pwr, enable_ps);
+        DEBUGFS_FWSTATS_ADD(pwr, disable_ps);
+        DEBUGFS_FWSTATS_ADD(pwr, fix_tsf_ps);
+        /* skipping cont_miss_bcns_spread for now */
+        DEBUGFS_FWSTATS_ADD(pwr, rcvd_awake_beacons);
+
+        DEBUGFS_FWSTATS_ADD(mic, rx_pkts);
+        DEBUGFS_FWSTATS_ADD(mic, calc_failure);
+
+        DEBUGFS_FWSTATS_ADD(aes, encrypt_fail);
+        DEBUGFS_FWSTATS_ADD(aes, decrypt_fail);
+        DEBUGFS_FWSTATS_ADD(aes, encrypt_packets);
+        DEBUGFS_FWSTATS_ADD(aes, decrypt_packets);
+        DEBUGFS_FWSTATS_ADD(aes, encrypt_interrupt);
+        DEBUGFS_FWSTATS_ADD(aes, decrypt_interrupt);
+
+        DEBUGFS_FWSTATS_ADD(event, heart_beat);
+        DEBUGFS_FWSTATS_ADD(event, calibration);
+        DEBUGFS_FWSTATS_ADD(event, rx_mismatch);
+        DEBUGFS_FWSTATS_ADD(event, rx_mem_empty);
+        DEBUGFS_FWSTATS_ADD(event, rx_pool);
+        DEBUGFS_FWSTATS_ADD(event, oom_late);
+        DEBUGFS_FWSTATS_ADD(event, phy_transmit_error);
+        DEBUGFS_FWSTATS_ADD(event, tx_stuck);
+
+        DEBUGFS_FWSTATS_ADD(ps, pspoll_timeouts);
+        DEBUGFS_FWSTATS_ADD(ps, upsd_timeouts);
+        DEBUGFS_FWSTATS_ADD(ps, upsd_max_sptime);
+        DEBUGFS_FWSTATS_ADD(ps, upsd_max_apturn);
+        DEBUGFS_FWSTATS_ADD(ps, pspoll_max_apturn);
+        DEBUGFS_FWSTATS_ADD(ps, pspoll_utilization);
+        DEBUGFS_FWSTATS_ADD(ps, upsd_utilization);
+
+        DEBUGFS_FWSTATS_ADD(rxpipe, rx_prep_beacon_drop);
+        DEBUGFS_FWSTATS_ADD(rxpipe, descr_host_int_trig_rx_data);
+        DEBUGFS_FWSTATS_ADD(rxpipe, beacon_buffer_thres_host_int_trig_rx_data);
+        DEBUGFS_FWSTATS_ADD(rxpipe, missed_beacon_host_int_trig_rx_data);
+        DEBUGFS_FWSTATS_ADD(rxpipe, tx_xfr_host_int_trig_rx_data);
+
+        return 0;
+
+err:
+        if (IS_ERR(entry))
+                ret = PTR_ERR(entry);
+        else
+                ret = -ENOMEM;
+
+        return ret;
+}
diff --git a/drivers/net/wireless/ti/wl12xx/debugfs.h b/drivers/net/wireless/ti/wl12xx/debugfs.h
new file mode 100644
index 00000000000..96898e291b7
--- /dev/null
+++ b/drivers/net/wireless/ti/wl12xx/debugfs.h
@@ -0,0 +1,28 @@
+/*
+ * This file is part of wl12xx
+ *
+ * Copyright (C) 2012 Texas Instruments. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ *
+ */
+
+#ifndef __WL12XX_DEBUGFS_H__
+#define __WL12XX_DEBUGFS_H__
+
+int wl12xx_debugfs_add_files(struct wl1271 *wl,
+                             struct dentry *rootdir);
+
+#endif /* __WL12XX_DEBUGFS_H__ */
diff --git a/drivers/net/wireless/ti/wl12xx/main.c b/drivers/net/wireless/ti/wl12xx/main.c
index d7dd3def07b..47ba2e0017f 100644
--- a/drivers/net/wireless/ti/wl12xx/main.c
+++ b/drivers/net/wireless/ti/wl12xx/main.c
@@ -39,6 +39,10 @@
 #include "reg.h"
 #include "cmd.h"
 #include "acx.h"
+#include "debugfs.h"
+
+static char *fref_param;
+static char *tcxo_param;
 
 static struct wlcore_conf wl12xx_conf = {
         .sg = {
@@ -212,7 +216,7 @@ static struct wlcore_conf wl12xx_conf = {
                 .suspend_wake_up_event       = CONF_WAKE_UP_EVENT_N_DTIM,
                 .suspend_listen_interval     = 3,
                 .bcn_filt_mode               = CONF_BCN_FILT_MODE_ENABLED,
-                .bcn_filt_ie_count           = 2,
+                .bcn_filt_ie_count           = 3,
                 .bcn_filt_ie = {
                         [0] = {
                                 .ie          = WLAN_EID_CHANNEL_SWITCH,
@@ -222,9 +226,13 @@ static struct wlcore_conf wl12xx_conf = {
                                 .ie          = WLAN_EID_HT_OPERATION,
                                 .rule        = CONF_BCN_RULE_PASS_ON_CHANGE,
                         },
+                        [2] = {
+                                .ie          = WLAN_EID_ERP_INFO,
+                                .rule        = CONF_BCN_RULE_PASS_ON_CHANGE,
+                        },
                 },
-                .synch_fail_thold            = 10,
-                .bss_lose_timeout            = 100,
+                .synch_fail_thold            = 12,
+                .bss_lose_timeout            = 400,
                 .beacon_rx_timeout           = 10000,
                 .broadcast_timeout           = 20000,
                 .rx_broadcast_in_ps          = 1,
@@ -234,10 +242,11 @@ static struct wlcore_conf wl12xx_conf = {
                 .psm_entry_retries           = 8,
                 .psm_exit_retries            = 16,
                 .psm_entry_nullfunc_retries  = 3,
-                .dynamic_ps_timeout          = 40,
+                .dynamic_ps_timeout          = 200,
                 .forced_ps                   = false,
                 .keep_alive_interval         = 55000,
                 .max_listen_interval         = 20,
+                .sta_sleep_auth              = WL1271_PSM_ILLEGAL,
         },
         .itrim = {
                 .enable = false,
@@ -245,7 +254,7 @@ static struct wlcore_conf wl12xx_conf = {
         },
         .pm_config = {
                 .host_clk_settling_time = 5000,
-                .host_fast_wakeup_support = false
+                .host_fast_wakeup_support = CONF_FAST_WAKEUP_DISABLE,
         },
         .roam_trigger = {
                 .trigger_pacing               = 1,
@@ -305,8 +314,8 @@ static struct wlcore_conf wl12xx_conf = {
                 .swallow_period               = 5,
                 .n_divider_fref_set_1         = 0xff,       /* default */
                 .n_divider_fref_set_2         = 12,
-                .m_divider_fref_set_1         = 148,
-                .m_divider_fref_set_2         = 0xffff,     /* default */
+                .m_divider_fref_set_1         = 0xffff,
+                .m_divider_fref_set_2         = 148,        /* default */
                 .coex_pll_stabilization_time  = 0xffffffff, /* default */
                 .ldo_stabilization_time       = 0xffff,     /* default */
                 .fm_disturbed_band_margin     = 0xff,       /* default */
@@ -589,11 +598,13 @@ static const int wl12xx_rtable[REG_TABLE_LEN] = {
 #define WL128X_FW_NAME_SINGLE   "ti-connectivity/wl128x-fw-4-sr.bin"
 #define WL128X_PLT_FW_NAME      "ti-connectivity/wl128x-fw-4-plt.bin"
 
-static void wl127x_prepare_read(struct wl1271 *wl, u32 rx_desc, u32 len)
+static int wl127x_prepare_read(struct wl1271 *wl, u32 rx_desc, u32 len)
 {
+        int ret;
+
         if (wl->chip.id != CHIP_ID_1283_PG20) {
                 struct wl1271_acx_mem_map *wl_mem_map = wl->target_mem_map;
-                struct wl1271_rx_mem_pool_addr rx_mem_addr;
+                struct wl127x_rx_mem_pool_addr rx_mem_addr;
 
                 /*
                  * Choose the block we want to read
@@ -607,9 +618,13 @@ static void wl127x_prepare_read(struct wl1271 *wl, u32 rx_desc, u32 len)
 
                 rx_mem_addr.addr_extra = rx_mem_addr.addr + 4;
 
-                wl1271_write(wl, WL1271_SLV_REG_DATA,
-                             &rx_mem_addr, sizeof(rx_mem_addr), false);
+                ret = wlcore_write(wl, WL1271_SLV_REG_DATA, &rx_mem_addr,
+                                   sizeof(rx_mem_addr), false);
+                if (ret < 0)
+                        return ret;
         }
+
+        return 0;
 }
 
 static int wl12xx_identify_chip(struct wl1271 *wl)
@@ -621,10 +636,8 @@ static int wl12xx_identify_chip(struct wl1271 *wl)
                 wl1271_warning("chip id 0x%x (1271 PG10) support is obsolete",
                                wl->chip.id);
 
-                /* clear the alignment quirk, since we don't support it */
-                wl->quirks &= ~WLCORE_QUIRK_TX_BLOCKSIZE_ALIGN;
-
-                wl->quirks |= WLCORE_QUIRK_LEGACY_NVS;
+                wl->quirks |= WLCORE_QUIRK_LEGACY_NVS |
+                              WLCORE_QUIRK_TKIP_HEADER_SPACE;
                 wl->sr_fw_name = WL127X_FW_NAME_SINGLE;
                 wl->mr_fw_name = WL127X_FW_NAME_MULTI;
                 memcpy(&wl->conf.mem, &wl12xx_default_priv_conf.mem_wl127x,
@@ -639,10 +652,8 @@ static int wl12xx_identify_chip(struct wl1271 *wl)
                 wl1271_debug(DEBUG_BOOT, "chip id 0x%x (1271 PG20)",
                              wl->chip.id);
 
-                /* clear the alignment quirk, since we don't support it */
-                wl->quirks &= ~WLCORE_QUIRK_TX_BLOCKSIZE_ALIGN;
-
-                wl->quirks |= WLCORE_QUIRK_LEGACY_NVS;
+                wl->quirks |= WLCORE_QUIRK_LEGACY_NVS |
+                              WLCORE_QUIRK_TKIP_HEADER_SPACE;
                 wl->plt_fw_name = WL127X_PLT_FW_NAME;
                 wl->sr_fw_name = WL127X_FW_NAME_SINGLE;
                 wl->mr_fw_name = WL127X_FW_NAME_MULTI;
@@ -660,6 +671,11 @@ static int wl12xx_identify_chip(struct wl1271 *wl)
                 wl->plt_fw_name = WL128X_PLT_FW_NAME;
                 wl->sr_fw_name = WL128X_FW_NAME_SINGLE;
                 wl->mr_fw_name = WL128X_FW_NAME_MULTI;
+
+                /* wl128x requires TX blocksize alignment */
+                wl->quirks |= WLCORE_QUIRK_TX_BLOCKSIZE_ALIGN |
+                              WLCORE_QUIRK_TKIP_HEADER_SPACE;
+
                 break;
         case CHIP_ID_1283_PG10:
         default:
@@ -672,64 +688,95 @@ out:
         return ret;
 }
 
-static void wl12xx_top_reg_write(struct wl1271 *wl, int addr, u16 val)
+static int __must_check wl12xx_top_reg_write(struct wl1271 *wl, int addr,
+                                             u16 val)
 {
+        int ret;
+
         /* write address >> 1 + 0x30000 to OCP_POR_CTR */
         addr = (addr >> 1) + 0x30000;
-        wl1271_write32(wl, WL12XX_OCP_POR_CTR, addr);
+        ret = wlcore_write32(wl, WL12XX_OCP_POR_CTR, addr);
+        if (ret < 0)
+                goto out;
 
         /* write value to OCP_POR_WDATA */
-        wl1271_write32(wl, WL12XX_OCP_DATA_WRITE, val);
+        ret = wlcore_write32(wl, WL12XX_OCP_DATA_WRITE, val);
+        if (ret < 0)
+                goto out;
 
         /* write 1 to OCP_CMD */
-        wl1271_write32(wl, WL12XX_OCP_CMD, OCP_CMD_WRITE);
+        ret = wlcore_write32(wl, WL12XX_OCP_CMD, OCP_CMD_WRITE);
+        if (ret < 0)
+                goto out;
+
+out:
+        return ret;
 }
 
-static u16 wl12xx_top_reg_read(struct wl1271 *wl, int addr)
+static int __must_check wl12xx_top_reg_read(struct wl1271 *wl, int addr,
+                                            u16 *out)
 {
         u32 val;
         int timeout = OCP_CMD_LOOP;
+        int ret;
 
         /* write address >> 1 + 0x30000 to OCP_POR_CTR */
         addr = (addr >> 1) + 0x30000;
-        wl1271_write32(wl, WL12XX_OCP_POR_CTR, addr);
+        ret = wlcore_write32(wl, WL12XX_OCP_POR_CTR, addr);
+        if (ret < 0)
+                return ret;
 
         /* write 2 to OCP_CMD */
-        wl1271_write32(wl, WL12XX_OCP_CMD, OCP_CMD_READ);
+        ret = wlcore_write32(wl, WL12XX_OCP_CMD, OCP_CMD_READ);
+        if (ret < 0)
+                return ret;
 
         /* poll for data ready */
         do {
-                val = wl1271_read32(wl, WL12XX_OCP_DATA_READ);
+                ret = wlcore_read32(wl, WL12XX_OCP_DATA_READ, &val);
+                if (ret < 0)
+                        return ret;
         } while (!(val & OCP_READY_MASK) && --timeout);
 
         if (!timeout) {
                 wl1271_warning("Top register access timed out.");
-                return 0xffff;
+                return -ETIMEDOUT;
         }
 
         /* check data status and return if OK */
-        if ((val & OCP_STATUS_MASK) == OCP_STATUS_OK)
-                return val & 0xffff;
-        else {
+        if ((val & OCP_STATUS_MASK) != OCP_STATUS_OK) {
                 wl1271_warning("Top register access returned error.");
-                return 0xffff;
+                return -EIO;
         }
+
+        if (out)
+                *out = val & 0xffff;
+
+        return 0;
 }
 
 static int wl128x_switch_tcxo_to_fref(struct wl1271 *wl)
 {
         u16 spare_reg;
+        int ret;
 
         /* Mask bits [2] & [8:4] in the sys_clk_cfg register */
-        spare_reg = wl12xx_top_reg_read(wl, WL_SPARE_REG);
+        ret = wl12xx_top_reg_read(wl, WL_SPARE_REG, &spare_reg);
+        if (ret < 0)
+                return ret;
+
         if (spare_reg == 0xFFFF)
                 return -EFAULT;
         spare_reg |= (BIT(3) | BIT(5) | BIT(6));
-        wl12xx_top_reg_write(wl, WL_SPARE_REG, spare_reg);
+        ret = wl12xx_top_reg_write(wl, WL_SPARE_REG, spare_reg);
+        if (ret < 0)
+                return ret;
 
         /* Enable FREF_CLK_REQ & mux MCS and coex PLLs to FREF */
-        wl12xx_top_reg_write(wl, SYS_CLK_CFG_REG,
-                             WL_CLK_REQ_TYPE_PG2 | MCS_PLL_CLK_SEL_FREF);
+        ret = wl12xx_top_reg_write(wl, SYS_CLK_CFG_REG,
+                                   WL_CLK_REQ_TYPE_PG2 | MCS_PLL_CLK_SEL_FREF);
+        if (ret < 0)
+                return ret;
 
         /* Delay execution for 15msec, to let the HW settle */
         mdelay(15);
@@ -740,8 +787,12 @@ static int wl128x_switch_tcxo_to_fref(struct wl1271 *wl)
 static bool wl128x_is_tcxo_valid(struct wl1271 *wl)
 {
         u16 tcxo_detection;
+        int ret;
+
+        ret = wl12xx_top_reg_read(wl, TCXO_CLK_DETECT_REG, &tcxo_detection);
+        if (ret < 0)
+                return false;
 
-        tcxo_detection = wl12xx_top_reg_read(wl, TCXO_CLK_DETECT_REG);
         if (tcxo_detection & TCXO_DET_FAILED)
                 return false;
 
@@ -751,8 +802,12 @@ static bool wl128x_is_tcxo_valid(struct wl1271 *wl)
 static bool wl128x_is_fref_valid(struct wl1271 *wl)
 {
         u16 fref_detection;
+        int ret;
+
+        ret = wl12xx_top_reg_read(wl, FREF_CLK_DETECT_REG, &fref_detection);
+        if (ret < 0)
+                return false;
 
-        fref_detection = wl12xx_top_reg_read(wl, FREF_CLK_DETECT_REG);
         if (fref_detection & FREF_CLK_DETECT_FAIL)
                 return false;
 
@@ -761,11 +816,21 @@ static bool wl128x_is_fref_valid(struct wl1271 *wl)
 
 static int wl128x_manually_configure_mcs_pll(struct wl1271 *wl)
 {
-        wl12xx_top_reg_write(wl, MCS_PLL_M_REG, MCS_PLL_M_REG_VAL);
-        wl12xx_top_reg_write(wl, MCS_PLL_N_REG, MCS_PLL_N_REG_VAL);
-        wl12xx_top_reg_write(wl, MCS_PLL_CONFIG_REG, MCS_PLL_CONFIG_REG_VAL);
+        int ret;
 
-        return 0;
+        ret = wl12xx_top_reg_write(wl, MCS_PLL_M_REG, MCS_PLL_M_REG_VAL);
+        if (ret < 0)
+                goto out;
+
+        ret = wl12xx_top_reg_write(wl, MCS_PLL_N_REG, MCS_PLL_N_REG_VAL);
+        if (ret < 0)
+                goto out;
+
+        ret = wl12xx_top_reg_write(wl, MCS_PLL_CONFIG_REG,
+                                   MCS_PLL_CONFIG_REG_VAL);
+
+out:
+        return ret;
 }
 
 static int wl128x_configure_mcs_pll(struct wl1271 *wl, int clk)
@@ -773,30 +838,40 @@ static int wl128x_configure_mcs_pll(struct wl1271 *wl, int clk)
         u16 spare_reg;
         u16 pll_config;
         u8 input_freq;
+        struct wl12xx_priv *priv = wl->priv;
+        int ret;
 
         /* Mask bits [3:1] in the sys_clk_cfg register */
-        spare_reg = wl12xx_top_reg_read(wl, WL_SPARE_REG);
+        ret = wl12xx_top_reg_read(wl, WL_SPARE_REG, &spare_reg);
+        if (ret < 0)
+                return ret;
+
         if (spare_reg == 0xFFFF)
                 return -EFAULT;
         spare_reg |= BIT(2);
-        wl12xx_top_reg_write(wl, WL_SPARE_REG, spare_reg);
+        ret = wl12xx_top_reg_write(wl, WL_SPARE_REG, spare_reg);
+        if (ret < 0)
+                return ret;
 
         /* Handle special cases of the TCXO clock */
-        if (wl->tcxo_clock == WL12XX_TCXOCLOCK_16_8 ||
-            wl->tcxo_clock == WL12XX_TCXOCLOCK_33_6)
+        if (priv->tcxo_clock == WL12XX_TCXOCLOCK_16_8 ||
+            priv->tcxo_clock == WL12XX_TCXOCLOCK_33_6)
                 return wl128x_manually_configure_mcs_pll(wl);
 
         /* Set the input frequency according to the selected clock source */
         input_freq = (clk & 1) + 1;
 
-        pll_config = wl12xx_top_reg_read(wl, MCS_PLL_CONFIG_REG);
+        ret = wl12xx_top_reg_read(wl, MCS_PLL_CONFIG_REG, &pll_config);
+        if (ret < 0)
+                return ret;
+
         if (pll_config == 0xFFFF)
                 return -EFAULT;
         pll_config |= (input_freq << MCS_SEL_IN_FREQ_SHIFT);
         pll_config |= MCS_PLL_ENABLE_HP;
-        wl12xx_top_reg_write(wl, MCS_PLL_CONFIG_REG, pll_config);
+        ret = wl12xx_top_reg_write(wl, MCS_PLL_CONFIG_REG, pll_config);
 
-        return 0;
+        return ret;
 }
 
 /*
@@ -808,26 +883,31 @@ static int wl128x_configure_mcs_pll(struct wl1271 *wl, int clk)
  */
 static int wl128x_boot_clk(struct wl1271 *wl, int *selected_clock)
 {
+        struct wl12xx_priv *priv = wl->priv;
         u16 sys_clk_cfg;
+        int ret;
 
         /* For XTAL-only modes, FREF will be used after switching from TCXO */
-        if (wl->ref_clock == WL12XX_REFCLOCK_26_XTAL ||
-            wl->ref_clock == WL12XX_REFCLOCK_38_XTAL) {
+        if (priv->ref_clock == WL12XX_REFCLOCK_26_XTAL ||
+            priv->ref_clock == WL12XX_REFCLOCK_38_XTAL) {
                 if (!wl128x_switch_tcxo_to_fref(wl))
                         return -EINVAL;
                 goto fref_clk;
         }
 
         /* Query the HW, to determine which clock source we should use */
-        sys_clk_cfg = wl12xx_top_reg_read(wl, SYS_CLK_CFG_REG);
+        ret = wl12xx_top_reg_read(wl, SYS_CLK_CFG_REG, &sys_clk_cfg);
+        if (ret < 0)
+                return ret;
+
         if (sys_clk_cfg == 0xFFFF)
                 return -EINVAL;
         if (sys_clk_cfg & PRCM_CM_EN_MUX_WLAN_FREF)
                 goto fref_clk;
 
         /* If TCXO is either 32.736MHz or 16.368MHz, switch to FREF */
-        if (wl->tcxo_clock == WL12XX_TCXOCLOCK_16_368 ||
-            wl->tcxo_clock == WL12XX_TCXOCLOCK_32_736) {
+        if (priv->tcxo_clock == WL12XX_TCXOCLOCK_16_368 ||
+            priv->tcxo_clock == WL12XX_TCXOCLOCK_32_736) {
                 if (!wl128x_switch_tcxo_to_fref(wl))
                         return -EINVAL;
                 goto fref_clk;
@@ -836,14 +916,14 @@ static int wl128x_boot_clk(struct wl1271 *wl, int *selected_clock)
         /* TCXO clock is selected */
         if (!wl128x_is_tcxo_valid(wl))
                 return -EINVAL;
-        *selected_clock = wl->tcxo_clock;
+        *selected_clock = priv->tcxo_clock;
         goto config_mcs_pll;
 
 fref_clk:
         /* FREF clock is selected */
         if (!wl128x_is_fref_valid(wl))
                 return -EINVAL;
-        *selected_clock = wl->ref_clock;
+        *selected_clock = priv->ref_clock;
 
 config_mcs_pll:
         return wl128x_configure_mcs_pll(wl, *selected_clock);
@@ -851,69 +931,98 @@ config_mcs_pll:
 
 static int wl127x_boot_clk(struct wl1271 *wl)
 {
+        struct wl12xx_priv *priv = wl->priv;
         u32 pause;
         u32 clk;
+        int ret;
 
         if (WL127X_PG_GET_MAJOR(wl->hw_pg_ver) < 3)
                 wl->quirks |= WLCORE_QUIRK_END_OF_TRANSACTION;
 
-        if (wl->ref_clock == CONF_REF_CLK_19_2_E ||
-            wl->ref_clock == CONF_REF_CLK_38_4_E ||
-            wl->ref_clock == CONF_REF_CLK_38_4_M_XTAL)
+        if (priv->ref_clock == CONF_REF_CLK_19_2_E ||
+            priv->ref_clock == CONF_REF_CLK_38_4_E ||
+            priv->ref_clock == CONF_REF_CLK_38_4_M_XTAL)
                 /* ref clk: 19.2/38.4/38.4-XTAL */
                 clk = 0x3;
-        else if (wl->ref_clock == CONF_REF_CLK_26_E ||
-                 wl->ref_clock == CONF_REF_CLK_52_E)
+        else if (priv->ref_clock == CONF_REF_CLK_26_E ||
+                 priv->ref_clock == CONF_REF_CLK_26_M_XTAL ||
+                 priv->ref_clock == CONF_REF_CLK_52_E)
                 /* ref clk: 26/52 */
                 clk = 0x5;
         else
                 return -EINVAL;
 
-        if (wl->ref_clock != CONF_REF_CLK_19_2_E) {
+        if (priv->ref_clock != CONF_REF_CLK_19_2_E) {
                 u16 val;
                 /* Set clock type (open drain) */
-                val = wl12xx_top_reg_read(wl, OCP_REG_CLK_TYPE);
+                ret = wl12xx_top_reg_read(wl, OCP_REG_CLK_TYPE, &val);
+                if (ret < 0)
+                        goto out;
+
                 val &= FREF_CLK_TYPE_BITS;
-                wl12xx_top_reg_write(wl, OCP_REG_CLK_TYPE, val);
+                ret = wl12xx_top_reg_write(wl, OCP_REG_CLK_TYPE, val);
+                if (ret < 0)
+                        goto out;
 
                 /* Set clock pull mode (no pull) */
-                val = wl12xx_top_reg_read(wl, OCP_REG_CLK_PULL);
+                ret = wl12xx_top_reg_read(wl, OCP_REG_CLK_PULL, &val);
+                if (ret < 0)
+                        goto out;
+
                 val |= NO_PULL;
-                wl12xx_top_reg_write(wl, OCP_REG_CLK_PULL, val);
+                ret = wl12xx_top_reg_write(wl, OCP_REG_CLK_PULL, val);
+                if (ret < 0)
+                        goto out;
         } else {
                 u16 val;
                 /* Set clock polarity */
-                val = wl12xx_top_reg_read(wl, OCP_REG_CLK_POLARITY);
+                ret = wl12xx_top_reg_read(wl, OCP_REG_CLK_POLARITY, &val);
+                if (ret < 0)
+                        goto out;
+
                 val &= FREF_CLK_POLARITY_BITS;
                 val |= CLK_REQ_OUTN_SEL;
-                wl12xx_top_reg_write(wl, OCP_REG_CLK_POLARITY, val);
+                ret = wl12xx_top_reg_write(wl, OCP_REG_CLK_POLARITY, val);
+                if (ret < 0)
+                        goto out;
         }
 
-        wl1271_write32(wl, WL12XX_PLL_PARAMETERS, clk);
+        ret = wlcore_write32(wl, WL12XX_PLL_PARAMETERS, clk);
+        if (ret < 0)
+                goto out;
 
-        pause = wl1271_read32(wl, WL12XX_PLL_PARAMETERS);
+        ret = wlcore_read32(wl, WL12XX_PLL_PARAMETERS, &pause);
+        if (ret < 0)
+                goto out;
 
         wl1271_debug(DEBUG_BOOT, "pause1 0x%x", pause);
 
         pause &= ~(WU_COUNTER_PAUSE_VAL);
         pause |= WU_COUNTER_PAUSE_VAL;
-        wl1271_write32(wl, WL12XX_WU_COUNTER_PAUSE, pause);
+        ret = wlcore_write32(wl, WL12XX_WU_COUNTER_PAUSE, pause);
 
-        return 0;
+out:
+        return ret;
 }
 
 static int wl1271_boot_soft_reset(struct wl1271 *wl)
 {
         unsigned long timeout;
         u32 boot_data;
+        int ret = 0;
 
         /* perform soft reset */
-        wl1271_write32(wl, WL12XX_SLV_SOFT_RESET, ACX_SLV_SOFT_RESET_BIT);
+        ret = wlcore_write32(wl, WL12XX_SLV_SOFT_RESET, ACX_SLV_SOFT_RESET_BIT);
+        if (ret < 0)
+                goto out;
 
         /* SOFT_RESET is self clearing */
         timeout = jiffies + usecs_to_jiffies(SOFT_RESET_MAX_TIME);
         while (1) {
-                boot_data = wl1271_read32(wl, WL12XX_SLV_SOFT_RESET);
+                ret = wlcore_read32(wl, WL12XX_SLV_SOFT_RESET, &boot_data);
+                if (ret < 0)
+                        goto out;
+
                 wl1271_debug(DEBUG_BOOT, "soft reset bootdata 0x%x", boot_data);
                 if ((boot_data & ACX_SLV_SOFT_RESET_BIT) == 0)
                         break;
@@ -929,16 +1038,20 @@ static int wl1271_boot_soft_reset(struct wl1271 *wl)
         }
 
         /* disable Rx/Tx */
-        wl1271_write32(wl, WL12XX_ENABLE, 0x0);
+        ret = wlcore_write32(wl, WL12XX_ENABLE, 0x0);
+        if (ret < 0)
+                goto out;
 
         /* disable auto calibration on start*/
-        wl1271_write32(wl, WL12XX_SPARE_A2, 0xffff);
+        ret = wlcore_write32(wl, WL12XX_SPARE_A2, 0xffff);
 
-        return 0;
+out:
+        return ret;
 }
 
 static int wl12xx_pre_boot(struct wl1271 *wl)
 {
+        struct wl12xx_priv *priv = wl->priv;
         int ret = 0;
         u32 clk;
         int selected_clock = -1;
@@ -954,30 +1067,43 @@ static int wl12xx_pre_boot(struct wl1271 *wl)
         }
 
         /* Continue the ELP wake up sequence */
-        wl1271_write32(wl, WL12XX_WELP_ARM_COMMAND, WELP_ARM_COMMAND_VAL);
+        ret = wlcore_write32(wl, WL12XX_WELP_ARM_COMMAND, WELP_ARM_COMMAND_VAL);
+        if (ret < 0)
+                goto out;
+
         udelay(500);
 
-        wlcore_set_partition(wl, &wl->ptable[PART_DRPW]);
+        ret = wlcore_set_partition(wl, &wl->ptable[PART_DRPW]);
+        if (ret < 0)
+                goto out;
 
         /* Read-modify-write DRPW_SCRATCH_START register (see next state)
            to be used by DRPw FW. The RTRIM value will be added by the FW
            before taking DRPw out of reset */
 
-        clk = wl1271_read32(wl, WL12XX_DRPW_SCRATCH_START);
+        ret = wlcore_read32(wl, WL12XX_DRPW_SCRATCH_START, &clk);
+        if (ret < 0)
+                goto out;
 
         wl1271_debug(DEBUG_BOOT, "clk2 0x%x", clk);
 
         if (wl->chip.id == CHIP_ID_1283_PG20)
                 clk |= ((selected_clock & 0x3) << 1) << 4;
         else
-                clk |= (wl->ref_clock << 1) << 4;
+                clk |= (priv->ref_clock << 1) << 4;
 
-        wl1271_write32(wl, WL12XX_DRPW_SCRATCH_START, clk);
+        ret = wlcore_write32(wl, WL12XX_DRPW_SCRATCH_START, clk);
+        if (ret < 0)
+                goto out;
 
-        wlcore_set_partition(wl, &wl->ptable[PART_WORK]);
+        ret = wlcore_set_partition(wl, &wl->ptable[PART_WORK]);
+        if (ret < 0)
+                goto out;
 
         /* Disable interrupts */
-        wlcore_write_reg(wl, REG_INTERRUPT_MASK, WL1271_ACX_INTR_ALL);
+        ret = wlcore_write_reg(wl, REG_INTERRUPT_MASK, WL1271_ACX_INTR_ALL);
+        if (ret < 0)
+                goto out;
 
         ret = wl1271_boot_soft_reset(wl);
         if (ret < 0)
@@ -987,47 +1113,72 @@ out:
         return ret;
 }
 
-static void wl12xx_pre_upload(struct wl1271 *wl)
+static int wl12xx_pre_upload(struct wl1271 *wl)
 {
         u32 tmp;
+        u16 polarity;
+        int ret;
 
         /* write firmware's last address (ie. it's length) to
          * ACX_EEPROMLESS_IND_REG */
         wl1271_debug(DEBUG_BOOT, "ACX_EEPROMLESS_IND_REG");
 
-        wl1271_write32(wl, WL12XX_EEPROMLESS_IND, WL12XX_EEPROMLESS_IND);
+        ret = wlcore_write32(wl, WL12XX_EEPROMLESS_IND, WL12XX_EEPROMLESS_IND);
+        if (ret < 0)
+                goto out;
 
-        tmp = wlcore_read_reg(wl, REG_CHIP_ID_B);
+        ret = wlcore_read_reg(wl, REG_CHIP_ID_B, &tmp);
+        if (ret < 0)
+                goto out;
 
         wl1271_debug(DEBUG_BOOT, "chip id 0x%x", tmp);
 
         /* 6. read the EEPROM parameters */
-        tmp = wl1271_read32(wl, WL12XX_SCR_PAD2);
+        ret = wlcore_read32(wl, WL12XX_SCR_PAD2, &tmp);
+        if (ret < 0)
+                goto out;
 
         /* WL1271: The reference driver skips steps 7 to 10 (jumps directly
          * to upload_fw) */
 
-        if (wl->chip.id == CHIP_ID_1283_PG20)
-                wl12xx_top_reg_write(wl, SDIO_IO_DS, HCI_IO_DS_6MA);
-}
-
-static void wl12xx_enable_interrupts(struct wl1271 *wl)
-{
-        u32 polarity;
+        if (wl->chip.id == CHIP_ID_1283_PG20) {
+                ret = wl12xx_top_reg_write(wl, SDIO_IO_DS, HCI_IO_DS_6MA);
+                if (ret < 0)
+                        goto out;
+        }
 
-        polarity = wl12xx_top_reg_read(wl, OCP_REG_POLARITY);
+        /* polarity must be set before the firmware is loaded */
+        ret = wl12xx_top_reg_read(wl, OCP_REG_POLARITY, &polarity);
+        if (ret < 0)
+                goto out;
 
         /* We use HIGH polarity, so unset the LOW bit */
         polarity &= ~POLARITY_LOW;
-        wl12xx_top_reg_write(wl, OCP_REG_POLARITY, polarity);
+        ret = wl12xx_top_reg_write(wl, OCP_REG_POLARITY, polarity);
 
-        wlcore_write_reg(wl, REG_INTERRUPT_MASK, WL1271_ACX_ALL_EVENTS_VECTOR);
+out:
+        return ret;
+}
+
+static int wl12xx_enable_interrupts(struct wl1271 *wl)
+{
+        int ret;
+
+        ret = wlcore_write_reg(wl, REG_INTERRUPT_MASK,
+                               WL12XX_ACX_ALL_EVENTS_VECTOR);
+        if (ret < 0)
+                goto out;
 
         wlcore_enable_interrupts(wl);
-        wlcore_write_reg(wl, REG_INTERRUPT_MASK,
-                         WL1271_ACX_INTR_ALL & ~(WL1271_INTR_MASK));
+        ret = wlcore_write_reg(wl, REG_INTERRUPT_MASK,
+                               WL1271_ACX_INTR_ALL & ~(WL12XX_INTR_MASK));
+        if (ret < 0)
+                goto out;
+
+        ret = wlcore_write32(wl, WL12XX_HI_CFG, HI_CFG_DEF_VAL);
 
-        wl1271_write32(wl, WL12XX_HI_CFG, HI_CFG_DEF_VAL);
+out:
+        return ret;
 }
 
 static int wl12xx_boot(struct wl1271 *wl)
@@ -1042,7 +1193,9 @@ static int wl12xx_boot(struct wl1271 *wl)
         if (ret < 0)
                 goto out;
 
-        wl12xx_pre_upload(wl);
+        ret = wl12xx_pre_upload(wl);
+        if (ret < 0)
+                goto out;
 
         ret = wlcore_boot_upload_firmware(wl);
         if (ret < 0)
@@ -1052,22 +1205,30 @@ static int wl12xx_boot(struct wl1271 *wl)
         if (ret < 0)
                 goto out;
 
-        wl12xx_enable_interrupts(wl);
+        ret = wl12xx_enable_interrupts(wl);
 
 out:
         return ret;
 }
 
-static void wl12xx_trigger_cmd(struct wl1271 *wl, int cmd_box_addr,
+static int wl12xx_trigger_cmd(struct wl1271 *wl, int cmd_box_addr,
                                void *buf, size_t len)
 {
-        wl1271_write(wl, cmd_box_addr, buf, len, false);
-        wlcore_write_reg(wl, REG_INTERRUPT_TRIG, WL12XX_INTR_TRIG_CMD);
+        int ret;
+
+        ret = wlcore_write(wl, cmd_box_addr, buf, len, false);
+        if (ret < 0)
+                return ret;
+
+        ret = wlcore_write_reg(wl, REG_INTERRUPT_TRIG, WL12XX_INTR_TRIG_CMD);
+
+        return ret;
 }
 
-static void wl12xx_ack_event(struct wl1271 *wl)
+static int wl12xx_ack_event(struct wl1271 *wl)
 {
-        wlcore_write_reg(wl, REG_INTERRUPT_TRIG, WL12XX_INTR_TRIG_EVENT_ACK);
+        return wlcore_write_reg(wl, REG_INTERRUPT_TRIG,
+                                WL12XX_INTR_TRIG_EVENT_ACK);
 }
 
 static u32 wl12xx_calc_tx_blocks(struct wl1271 *wl, u32 len, u32 spare_blks)
@@ -1147,12 +1308,13 @@ static u32 wl12xx_get_rx_packet_len(struct wl1271 *wl, void *rx_data,
         return data_len - sizeof(*desc) - desc->pad_len;
 }
 
-static void wl12xx_tx_delayed_compl(struct wl1271 *wl)
+static int wl12xx_tx_delayed_compl(struct wl1271 *wl)
 {
-        if (wl->fw_status->tx_results_counter == (wl->tx_results_count & 0xff))
-                return;
+        if (wl->fw_status_1->tx_results_counter ==
+            (wl->tx_results_count & 0xff))
+                return 0;
 
-        wl1271_tx_complete(wl);
+        return wlcore_tx_complete(wl);
 }
 
 static int wl12xx_hw_init(struct wl1271 *wl)
@@ -1253,45 +1415,144 @@ static bool wl12xx_mac_in_fuse(struct wl1271 *wl)
         return supported;
 }
 
-static void wl12xx_get_fuse_mac(struct wl1271 *wl)
+static int wl12xx_get_fuse_mac(struct wl1271 *wl)
 {
         u32 mac1, mac2;
+        int ret;
 
-        wlcore_set_partition(wl, &wl->ptable[PART_DRPW]);
+        ret = wlcore_set_partition(wl, &wl->ptable[PART_DRPW]);
+        if (ret < 0)
+                goto out;
 
-        mac1 = wl1271_read32(wl, WL12XX_REG_FUSE_BD_ADDR_1);
-        mac2 = wl1271_read32(wl, WL12XX_REG_FUSE_BD_ADDR_2);
+        ret = wlcore_read32(wl, WL12XX_REG_FUSE_BD_ADDR_1, &mac1);
+        if (ret < 0)
+                goto out;
+
+        ret = wlcore_read32(wl, WL12XX_REG_FUSE_BD_ADDR_2, &mac2);
+        if (ret < 0)
+                goto out;
 
         /* these are the two parts of the BD_ADDR */
         wl->fuse_oui_addr = ((mac2 & 0xffff) << 8) +
                 ((mac1 & 0xff000000) >> 24);
         wl->fuse_nic_addr = mac1 & 0xffffff;
 
-        wlcore_set_partition(wl, &wl->ptable[PART_DOWN]);
+        ret = wlcore_set_partition(wl, &wl->ptable[PART_DOWN]);
+
+out:
+        return ret;
 }
 
-static s8 wl12xx_get_pg_ver(struct wl1271 *wl)
+static int wl12xx_get_pg_ver(struct wl1271 *wl, s8 *ver)
 {
-        u32 die_info;
+        u16 die_info;
+        int ret;
 
         if (wl->chip.id == CHIP_ID_1283_PG20)
-                die_info = wl12xx_top_reg_read(wl, WL128X_REG_FUSE_DATA_2_1);
+                ret = wl12xx_top_reg_read(wl, WL128X_REG_FUSE_DATA_2_1,
+                                          &die_info);
         else
-                die_info = wl12xx_top_reg_read(wl, WL127X_REG_FUSE_DATA_2_1);
+                ret = wl12xx_top_reg_read(wl, WL127X_REG_FUSE_DATA_2_1,
+                                          &die_info);
+
+        if (ret >= 0 && ver)
+                *ver = (s8)((die_info & PG_VER_MASK) >> PG_VER_OFFSET);
 
-        return (s8) (die_info & PG_VER_MASK) >> PG_VER_OFFSET;
+        return ret;
 }
 
-static void wl12xx_get_mac(struct wl1271 *wl)
+static int wl12xx_get_mac(struct wl1271 *wl)
 {
         if (wl12xx_mac_in_fuse(wl))
-                wl12xx_get_fuse_mac(wl);
+                return wl12xx_get_fuse_mac(wl);
+
+        return 0;
+}
+
+static void wl12xx_set_tx_desc_csum(struct wl1271 *wl,
+                                    struct wl1271_tx_hw_descr *desc,
+                                    struct sk_buff *skb)
+{
+        desc->wl12xx_reserved = 0;
+}
+
+static int wl12xx_plt_init(struct wl1271 *wl)
+{
+        int ret;
+
+        ret = wl->ops->boot(wl);
+        if (ret < 0)
+                goto out;
+
+        ret = wl->ops->hw_init(wl);
+        if (ret < 0)
+                goto out_irq_disable;
+
+        ret = wl1271_acx_init_mem_config(wl);
+        if (ret < 0)
+                goto out_irq_disable;
+
+        ret = wl12xx_acx_mem_cfg(wl);
+        if (ret < 0)
+                goto out_free_memmap;
+
+        /* Enable data path */
+        ret = wl1271_cmd_data_path(wl, 1);
+        if (ret < 0)
+                goto out_free_memmap;
+
+        /* Configure for CAM power saving (ie. always active) */
+        ret = wl1271_acx_sleep_auth(wl, WL1271_PSM_CAM);
+        if (ret < 0)
+                goto out_free_memmap;
+
+        /* configure PM */
+        ret = wl1271_acx_pm_config(wl);
+        if (ret < 0)
+                goto out_free_memmap;
+
+        goto out;
+
+out_free_memmap:
+        kfree(wl->target_mem_map);
+        wl->target_mem_map = NULL;
+
+out_irq_disable:
+        mutex_unlock(&wl->mutex);
+        /* Unlocking the mutex in the middle of handling is
+           inherently unsafe. In this case we deem it safe to do,
+           because we need to let any possibly pending IRQ out of
+           the system (and while we are WL1271_STATE_OFF the IRQ
+           work function will not do anything.) Also, any other
+           possible concurrent operations will fail due to the
+           current state, hence the wl1271 struct should be safe. */
+        wlcore_disable_interrupts(wl);
+        mutex_lock(&wl->mutex);
+out:
+        return ret;
+}
+
+static int wl12xx_get_spare_blocks(struct wl1271 *wl, bool is_gem)
+{
+        if (is_gem)
+                return WL12XX_TX_HW_BLOCK_GEM_SPARE;
+
+        return WL12XX_TX_HW_BLOCK_SPARE_DEFAULT;
+}
+
+static int wl12xx_set_key(struct wl1271 *wl, enum set_key_cmd cmd,
+                          struct ieee80211_vif *vif,
+                          struct ieee80211_sta *sta,
+                          struct ieee80211_key_conf *key_conf)
+{
+        return wlcore_set_key(wl, cmd, vif, sta, key_conf);
 }
 
 static struct wlcore_ops wl12xx_ops = {
         .identify_chip          = wl12xx_identify_chip,
         .identify_fw            = wl12xx_identify_fw,
         .boot                   = wl12xx_boot,
+        .plt_init               = wl12xx_plt_init,
         .trigger_cmd            = wl12xx_trigger_cmd,
         .ack_event              = wl12xx_ack_event,
         .calc_tx_blocks         = wl12xx_calc_tx_blocks,
@@ -1306,6 +1567,13 @@ static struct wlcore_ops wl12xx_ops = {
         .sta_get_ap_rate_mask   = wl12xx_sta_get_ap_rate_mask,
         .get_pg_ver             = wl12xx_get_pg_ver,
         .get_mac                = wl12xx_get_mac,
+        .set_tx_desc_csum       = wl12xx_set_tx_desc_csum,
+        .set_rx_csum            = NULL,
+        .ap_get_mimo_wide_rate_mask = NULL,
+        .debugfs_init           = wl12xx_debugfs_add_files,
+        .get_spare_blocks       = wl12xx_get_spare_blocks,
+        .set_key                = wl12xx_set_key,
+        .pre_pkt_send           = NULL,
 };
 
 static struct ieee80211_sta_ht_cap wl12xx_ht_cap = {
@@ -1323,6 +1591,7 @@ static struct ieee80211_sta_ht_cap wl12xx_ht_cap = {
 
 static int __devinit wl12xx_probe(struct platform_device *pdev)
 {
+        struct wl12xx_platform_data *pdata = pdev->dev.platform_data;
         struct wl1271 *wl;
         struct ieee80211_hw *hw;
         struct wl12xx_priv *priv;
@@ -1334,19 +1603,63 @@ static int __devinit wl12xx_probe(struct platform_device *pdev)
         }
 
         wl = hw->priv;
+        priv = wl->priv;
         wl->ops = &wl12xx_ops;
         wl->ptable = wl12xx_ptable;
         wl->rtable = wl12xx_rtable;
         wl->num_tx_desc = 16;
-        wl->normal_tx_spare = WL12XX_TX_HW_BLOCK_SPARE_DEFAULT;
-        wl->gem_tx_spare = WL12XX_TX_HW_BLOCK_GEM_SPARE;
+        wl->num_rx_desc = 8;
         wl->band_rate_to_idx = wl12xx_band_rate_to_idx;
         wl->hw_tx_rate_tbl_size = WL12XX_CONF_HW_RXTX_RATE_MAX;
         wl->hw_min_ht_rate = WL12XX_CONF_HW_RXTX_RATE_MCS0;
         wl->fw_status_priv_len = 0;
-        memcpy(&wl->ht_cap, &wl12xx_ht_cap, sizeof(wl12xx_ht_cap));
+        wl->stats.fw_stats_len = sizeof(struct wl12xx_acx_statistics);
+        wlcore_set_ht_cap(wl, IEEE80211_BAND_2GHZ, &wl12xx_ht_cap);
+        wlcore_set_ht_cap(wl, IEEE80211_BAND_5GHZ, &wl12xx_ht_cap);
         wl12xx_conf_init(wl);
 
+        if (!fref_param) {
+                priv->ref_clock = pdata->board_ref_clock;
+        } else {
+                if (!strcmp(fref_param, "19.2"))
+                        priv->ref_clock = WL12XX_REFCLOCK_19;
+                else if (!strcmp(fref_param, "26"))
+                        priv->ref_clock = WL12XX_REFCLOCK_26;
+                else if (!strcmp(fref_param, "26x"))
+                        priv->ref_clock = WL12XX_REFCLOCK_26_XTAL;
+                else if (!strcmp(fref_param, "38.4"))
+                        priv->ref_clock = WL12XX_REFCLOCK_38;
+                else if (!strcmp(fref_param, "38.4x"))
+                        priv->ref_clock = WL12XX_REFCLOCK_38_XTAL;
+                else if (!strcmp(fref_param, "52"))
+                        priv->ref_clock = WL12XX_REFCLOCK_52;
+                else
+                        wl1271_error("Invalid fref parameter %s", fref_param);
+        }
+
+        if (!tcxo_param) {
+                priv->tcxo_clock = pdata->board_tcxo_clock;
+        } else {
+                if (!strcmp(tcxo_param, "19.2"))
+                        priv->tcxo_clock = WL12XX_TCXOCLOCK_19_2;
+                else if (!strcmp(tcxo_param, "26"))
+                        priv->tcxo_clock = WL12XX_TCXOCLOCK_26;
+                else if (!strcmp(tcxo_param, "38.4"))
+                        priv->tcxo_clock = WL12XX_TCXOCLOCK_38_4;
+                else if (!strcmp(tcxo_param, "52"))
+                        priv->tcxo_clock = WL12XX_TCXOCLOCK_52;
+                else if (!strcmp(tcxo_param, "16.368"))
+                        priv->tcxo_clock = WL12XX_TCXOCLOCK_16_368;
+                else if (!strcmp(tcxo_param, "32.736"))
+                        priv->tcxo_clock = WL12XX_TCXOCLOCK_32_736;
+                else if (!strcmp(tcxo_param, "16.8"))
+                        priv->tcxo_clock = WL12XX_TCXOCLOCK_16_8;
+                else if (!strcmp(tcxo_param, "33.6"))
+                        priv->tcxo_clock = WL12XX_TCXOCLOCK_33_6;
+                else
+                        wl1271_error("Invalid tcxo parameter %s", tcxo_param);
+        }
+
         return wlcore_probe(wl, pdev);
 }
 
@@ -1378,6 +1691,13 @@ static void __exit wl12xx_exit(void)
 }
 module_exit(wl12xx_exit);
 
+module_param_named(fref, fref_param, charp, 0);
+MODULE_PARM_DESC(fref, "FREF clock: 19.2, 26, 26x, 38.4, 38.4x, 52");
+
+module_param_named(tcxo, tcxo_param, charp, 0);
+MODULE_PARM_DESC(tcxo,
+                 "TCXO clock: 19.2, 26, 38.4, 52, 16.368, 32.736, 16.8, 33.6");
+
 MODULE_LICENSE("GPL v2");
 MODULE_AUTHOR("Luciano Coelho <coelho@ti.com>");
 MODULE_FIRMWARE(WL127X_FW_NAME_SINGLE);
diff --git a/drivers/net/wireless/ti/wl12xx/wl12xx.h b/drivers/net/wireless/ti/wl12xx/wl12xx.h
index 74cd332e23e..de113241087 100644
--- a/drivers/net/wireless/ti/wl12xx/wl12xx.h
+++ b/drivers/net/wireless/ti/wl12xx/wl12xx.h
@@ -24,8 +24,16 @@
 
 #include "conf.h"
 
+struct wl127x_rx_mem_pool_addr {
+        u32 addr;
+        u32 addr_extra;
+};
+
 struct wl12xx_priv {
         struct wl12xx_priv_conf conf;
+
+        int ref_clock;
+        int tcxo_clock;
 };
 
 #endif /* __WL12XX_PRIV_H__ */
diff --git a/drivers/net/wireless/ti/wl18xx/Kconfig b/drivers/net/wireless/ti/wl18xx/Kconfig
new file mode 100644
index 00000000000..1cfdb254882
--- /dev/null
+++ b/drivers/net/wireless/ti/wl18xx/Kconfig
@@ -0,0 +1,7 @@
+config WL18XX
+        tristate "TI wl18xx support"
+        depends on MAC80211
+        select WLCORE
+        ---help---
+          This module adds support for wireless adapters based on TI
+          WiLink 8 chipsets.
diff --git a/drivers/net/wireless/ti/wl18xx/Makefile b/drivers/net/wireless/ti/wl18xx/Makefile
new file mode 100644
index 00000000000..67c098734c7
--- /dev/null
+++ b/drivers/net/wireless/ti/wl18xx/Makefile
@@ -0,0 +1,3 @@
+wl18xx-objs     = main.o acx.o tx.o io.o debugfs.o
+
+obj-$(CONFIG_WL18XX)            += wl18xx.o
diff --git a/drivers/net/wireless/ti/wl18xx/acx.c b/drivers/net/wireless/ti/wl18xx/acx.c
new file mode 100644
index 00000000000..72840e23bf5
--- /dev/null
+++ b/drivers/net/wireless/ti/wl18xx/acx.c
@@ -0,0 +1,111 @@
+/*
+ * This file is part of wl18xx
+ *
+ * Copyright (C) 2011 Texas Instruments Inc.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ *
+ */
+
+#include "../wlcore/cmd.h"
+#include "../wlcore/debug.h"
+#include "../wlcore/acx.h"
+
+#include "acx.h"
+
+int wl18xx_acx_host_if_cfg_bitmap(struct wl1271 *wl, u32 host_cfg_bitmap,
+                                  u32 sdio_blk_size, u32 extra_mem_blks,
+                                  u32 len_field_size)
+{
+        struct wl18xx_acx_host_config_bitmap *bitmap_conf;
+        int ret;
+
+        wl1271_debug(DEBUG_ACX, "acx cfg bitmap %d blk %d spare %d field %d",
+                     host_cfg_bitmap, sdio_blk_size, extra_mem_blks,
+                     len_field_size);
+
+        bitmap_conf = kzalloc(sizeof(*bitmap_conf), GFP_KERNEL);
+        if (!bitmap_conf) {
+                ret = -ENOMEM;
+                goto out;
+        }
+
+        bitmap_conf->host_cfg_bitmap = cpu_to_le32(host_cfg_bitmap);
+        bitmap_conf->host_sdio_block_size = cpu_to_le32(sdio_blk_size);
+        bitmap_conf->extra_mem_blocks = cpu_to_le32(extra_mem_blks);
+        bitmap_conf->length_field_size = cpu_to_le32(len_field_size);
+
+        ret = wl1271_cmd_configure(wl, ACX_HOST_IF_CFG_BITMAP,
+                                   bitmap_conf, sizeof(*bitmap_conf));
+        if (ret < 0) {
+                wl1271_warning("wl1271 bitmap config opt failed: %d", ret);
+                goto out;
+        }
+
+out:
+        kfree(bitmap_conf);
+
+        return ret;
+}
+
+int wl18xx_acx_set_checksum_state(struct wl1271 *wl)
+{
+        struct wl18xx_acx_checksum_state *acx;
+        int ret;
+
+        wl1271_debug(DEBUG_ACX, "acx checksum state");
+
+        acx = kzalloc(sizeof(*acx), GFP_KERNEL);
+        if (!acx) {
+                ret = -ENOMEM;
+                goto out;
+        }
+
+        acx->checksum_state = CHECKSUM_OFFLOAD_ENABLED;
+
+        ret = wl1271_cmd_configure(wl, ACX_CHECKSUM_CONFIG, acx, sizeof(*acx));
+        if (ret < 0) {
+                wl1271_warning("failed to set Tx checksum state: %d", ret);
+                goto out;
+        }
+
+out:
+        kfree(acx);
+        return ret;
+}
+
+int wl18xx_acx_clear_statistics(struct wl1271 *wl)
+{
+        struct wl18xx_acx_clear_statistics *acx;
+        int ret = 0;
+
+        wl1271_debug(DEBUG_ACX, "acx clear statistics");
+
+        acx = kzalloc(sizeof(*acx), GFP_KERNEL);
+        if (!acx) {
+                ret = -ENOMEM;
+                goto out;
+        }
+
+        ret = wl1271_cmd_configure(wl, ACX_CLEAR_STATISTICS, acx, sizeof(*acx));
+        if (ret < 0) {
+                wl1271_warning("failed to clear firmware statistics: %d", ret);
+                goto out;
+        }
+
+out:
+        kfree(acx);
+        return ret;
+}
diff --git a/drivers/net/wireless/ti/wl18xx/acx.h b/drivers/net/wireless/ti/wl18xx/acx.h
new file mode 100644
index 00000000000..e2609a6b734
--- /dev/null
+++ b/drivers/net/wireless/ti/wl18xx/acx.h
@@ -0,0 +1,287 @@
+/*
+ * This file is part of wl18xx
+ *
+ * Copyright (C) 2011 Texas Instruments. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ *
+ */
+
+#ifndef __WL18XX_ACX_H__
+#define __WL18XX_ACX_H__
+
+#include "../wlcore/wlcore.h"
+#include "../wlcore/acx.h"
+
+enum {
+        ACX_CLEAR_STATISTICS             = 0x0047,
+};
+
+/* numbers of bits the length field takes (add 1 for the actual number) */
+#define WL18XX_HOST_IF_LEN_SIZE_FIELD 15
+
+#define WL18XX_ACX_EVENTS_VECTOR        (WL1271_ACX_INTR_WATCHDOG       | \
+                                         WL1271_ACX_INTR_INIT_COMPLETE  | \
+                                         WL1271_ACX_INTR_EVENT_A        | \
+                                         WL1271_ACX_INTR_EVENT_B        | \
+                                         WL1271_ACX_INTR_CMD_COMPLETE   | \
+                                         WL1271_ACX_INTR_HW_AVAILABLE   | \
+                                         WL1271_ACX_INTR_DATA           | \
+                                         WL1271_ACX_SW_INTR_WATCHDOG)
+
+#define WL18XX_INTR_MASK                (WL1271_ACX_INTR_WATCHDOG       | \
+                                         WL1271_ACX_INTR_EVENT_A        | \
+                                         WL1271_ACX_INTR_EVENT_B        | \
+                                         WL1271_ACX_INTR_HW_AVAILABLE   | \
+                                         WL1271_ACX_INTR_DATA           | \
+                                         WL1271_ACX_SW_INTR_WATCHDOG)
+
+struct wl18xx_acx_host_config_bitmap {
+        struct acx_header header;
+
+        __le32 host_cfg_bitmap;
+
+        __le32 host_sdio_block_size;
+
+        /* extra mem blocks per frame in TX. */
+        __le32 extra_mem_blocks;
+
+        /*
+         * number of bits of the length field in the first TX word
+         * (up to 15 - for using the entire 16 bits).
+         */
+        __le32 length_field_size;
+
+} __packed;
+
+enum {
+        CHECKSUM_OFFLOAD_DISABLED = 0,
+        CHECKSUM_OFFLOAD_ENABLED  = 1,
+        CHECKSUM_OFFLOAD_FAKE_RX  = 2,
+        CHECKSUM_OFFLOAD_INVALID  = 0xFF
+};
+
+struct wl18xx_acx_checksum_state {
+        struct acx_header header;
+
+         /* enum acx_checksum_state */
+        u8 checksum_state;
+        u8 pad[3];
+} __packed;
+
+
+struct wl18xx_acx_error_stats {
+        u32 error_frame;
+        u32 error_null_Frame_tx_start;
+        u32 error_numll_frame_cts_start;
+        u32 error_bar_retry;
+        u32 error_frame_cts_nul_flid;
+} __packed;
+
+struct wl18xx_acx_debug_stats {
+        u32 debug1;
+        u32 debug2;
+        u32 debug3;
+        u32 debug4;
+        u32 debug5;
+        u32 debug6;
+} __packed;
+
+struct wl18xx_acx_ring_stats {
+        u32 prepared_descs;
+        u32 tx_cmplt;
+} __packed;
+
+struct wl18xx_acx_tx_stats {
+        u32 tx_prepared_descs;
+        u32 tx_cmplt;
+        u32 tx_template_prepared;
+        u32 tx_data_prepared;
+        u32 tx_template_programmed;
+        u32 tx_data_programmed;
+        u32 tx_burst_programmed;
+        u32 tx_starts;
+        u32 tx_imm_resp;
+        u32 tx_start_templates;
+        u32 tx_start_int_templates;
+        u32 tx_start_fw_gen;
+        u32 tx_start_data;
+        u32 tx_start_null_frame;
+        u32 tx_exch;
+        u32 tx_retry_template;
+        u32 tx_retry_data;
+        u32 tx_exch_pending;
+        u32 tx_exch_expiry;
+        u32 tx_done_template;
+        u32 tx_done_data;
+        u32 tx_done_int_template;
+        u32 tx_frame_checksum;
+        u32 tx_checksum_result;
+        u32 frag_called;
+        u32 frag_mpdu_alloc_failed;
+        u32 frag_init_called;
+        u32 frag_in_process_called;
+        u32 frag_tkip_called;
+        u32 frag_key_not_found;
+        u32 frag_need_fragmentation;
+        u32 frag_bad_mblk_num;
+        u32 frag_failed;
+        u32 frag_cache_hit;
+        u32 frag_cache_miss;
+} __packed;
+
+struct wl18xx_acx_rx_stats {
+        u32 rx_beacon_early_term;
+        u32 rx_out_of_mpdu_nodes;
+        u32 rx_hdr_overflow;
+        u32 rx_dropped_frame;
+        u32 rx_done_stage;
+        u32 rx_done;
+        u32 rx_defrag;
+        u32 rx_defrag_end;
+        u32 rx_cmplt;
+        u32 rx_pre_complt;
+        u32 rx_cmplt_task;
+        u32 rx_phy_hdr;
+        u32 rx_timeout;
+        u32 rx_timeout_wa;
+        u32 rx_wa_density_dropped_frame;
+        u32 rx_wa_ba_not_expected;
+        u32 rx_frame_checksum;
+        u32 rx_checksum_result;
+        u32 defrag_called;
+        u32 defrag_init_called;
+        u32 defrag_in_process_called;
+        u32 defrag_tkip_called;
+        u32 defrag_need_defrag;
+        u32 defrag_decrypt_failed;
+        u32 decrypt_key_not_found;
+        u32 defrag_need_decrypt;
+        u32 rx_tkip_replays;
+} __packed;
+
+struct wl18xx_acx_isr_stats {
+        u32 irqs;
+} __packed;
+
+#define PWR_STAT_MAX_CONT_MISSED_BCNS_SPREAD 10
+
+struct wl18xx_acx_pwr_stats {
+        u32 missing_bcns_cnt;
+        u32 rcvd_bcns_cnt;
+        u32 connection_out_of_sync;
+        u32 cont_miss_bcns_spread[PWR_STAT_MAX_CONT_MISSED_BCNS_SPREAD];
+        u32 rcvd_awake_bcns_cnt;
+} __packed;
+
+struct wl18xx_acx_event_stats {
+        u32 calibration;
+        u32 rx_mismatch;
+        u32 rx_mem_empty;
+} __packed;
+
+struct wl18xx_acx_ps_poll_stats {
+        u32 ps_poll_timeouts;
+        u32 upsd_timeouts;
+        u32 upsd_max_ap_turn;
+        u32 ps_poll_max_ap_turn;
+        u32 ps_poll_utilization;
+        u32 upsd_utilization;
+} __packed;
+
+struct wl18xx_acx_rx_filter_stats {
+        u32 beacon_filter;
+        u32 arp_filter;
+        u32 mc_filter;
+        u32 dup_filter;
+        u32 data_filter;
+        u32 ibss_filter;
+        u32 protection_filter;
+        u32 accum_arp_pend_requests;
+        u32 max_arp_queue_dep;
+} __packed;
+
+struct wl18xx_acx_rx_rate_stats {
+        u32 rx_frames_per_rates[50];
+} __packed;
+
+#define AGGR_STATS_TX_AGG       16
+#define AGGR_STATS_TX_RATE      16
+#define AGGR_STATS_RX_SIZE_LEN  16
+
+struct wl18xx_acx_aggr_stats {
+        u32 tx_agg_vs_rate[AGGR_STATS_TX_AGG * AGGR_STATS_TX_RATE];
+        u32 rx_size[AGGR_STATS_RX_SIZE_LEN];
+} __packed;
+
+#define PIPE_STATS_HW_FIFO      11
+
+struct wl18xx_acx_pipeline_stats {
+        u32 hs_tx_stat_fifo_int;
+        u32 hs_rx_stat_fifo_int;
+        u32 tcp_tx_stat_fifo_int;
+        u32 tcp_rx_stat_fifo_int;
+        u32 enc_tx_stat_fifo_int;
+        u32 enc_rx_stat_fifo_int;
+        u32 rx_complete_stat_fifo_int;
+        u32 pre_proc_swi;
+        u32 post_proc_swi;
+        u32 sec_frag_swi;
+        u32 pre_to_defrag_swi;
+        u32 defrag_to_csum_swi;
+        u32 csum_to_rx_xfer_swi;
+        u32 dec_packet_in;
+        u32 dec_packet_in_fifo_full;
+        u32 dec_packet_out;
+        u32 cs_rx_packet_in;
+        u32 cs_rx_packet_out;
+        u16 pipeline_fifo_full[PIPE_STATS_HW_FIFO];
+} __packed;
+
+struct wl18xx_acx_mem_stats {
+        u32 rx_free_mem_blks;
+        u32 tx_free_mem_blks;
+        u32 fwlog_free_mem_blks;
+        u32 fw_gen_free_mem_blks;
+} __packed;
+
+struct wl18xx_acx_statistics {
+        struct acx_header header;
+
+        struct wl18xx_acx_error_stats           error;
+        struct wl18xx_acx_debug_stats           debug;
+        struct wl18xx_acx_tx_stats              tx;
+        struct wl18xx_acx_rx_stats              rx;
+        struct wl18xx_acx_isr_stats             isr;
+        struct wl18xx_acx_pwr_stats             pwr;
+        struct wl18xx_acx_ps_poll_stats         ps_poll;
+        struct wl18xx_acx_rx_filter_stats       rx_filter;
+        struct wl18xx_acx_rx_rate_stats         rx_rate;
+        struct wl18xx_acx_aggr_stats            aggr_size;
+        struct wl18xx_acx_pipeline_stats        pipeline;
+        struct wl18xx_acx_mem_stats             mem;
+} __packed;
+
+struct wl18xx_acx_clear_statistics {
+        struct acx_header header;
+};
+
+int wl18xx_acx_host_if_cfg_bitmap(struct wl1271 *wl, u32 host_cfg_bitmap,
+                                  u32 sdio_blk_size, u32 extra_mem_blks,
+                                  u32 len_field_size);
+int wl18xx_acx_set_checksum_state(struct wl1271 *wl);
+int wl18xx_acx_clear_statistics(struct wl1271 *wl);
+
+#endif /* __WL18XX_ACX_H__ */
diff --git a/drivers/net/wireless/ti/wl18xx/conf.h b/drivers/net/wireless/ti/wl18xx/conf.h
new file mode 100644
index 00000000000..fac0b7e87e7
--- /dev/null
+++ b/drivers/net/wireless/ti/wl18xx/conf.h
@@ -0,0 +1,92 @@
+/*
+ * This file is part of wl18xx
+ *
+ * Copyright (C) 2011 Texas Instruments Inc.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ *
+ */
+
+#ifndef __WL18XX_CONF_H__
+#define __WL18XX_CONF_H__
+
+#define WL18XX_CONF_MAGIC       0x10e100ca
+#define WL18XX_CONF_VERSION     (WLCORE_CONF_VERSION | 0x0002)
+#define WL18XX_CONF_MASK        0x0000ffff
+#define WL18XX_CONF_SIZE        (WLCORE_CONF_SIZE + \
+                                 sizeof(struct wl18xx_priv_conf))
+
+#define NUM_OF_CHANNELS_11_ABG 150
+#define NUM_OF_CHANNELS_11_P 7
+#define WL18XX_NUM_OF_SUB_BANDS 9
+#define SRF_TABLE_LEN 16
+#define PIN_MUXING_SIZE 2
+
+struct wl18xx_mac_and_phy_params {
+        u8 phy_standalone;
+        u8 rdl;
+        u8 enable_clpc;
+        u8 enable_tx_low_pwr_on_siso_rdl;
+        u8 auto_detect;
+        u8 dedicated_fem;
+
+        u8 low_band_component;
+
+        /* Bit 0: One Hot, Bit 1: Control Enable, Bit 2: 1.8V, Bit 3: 3V */
+        u8 low_band_component_type;
+
+        u8 high_band_component;
+
+        /* Bit 0: One Hot, Bit 1: Control Enable, Bit 2: 1.8V, Bit 3: 3V */
+        u8 high_band_component_type;
+        u8 number_of_assembled_ant2_4;
+        u8 number_of_assembled_ant5;
+        u8 pin_muxing_platform_options[PIN_MUXING_SIZE];
+        u8 external_pa_dc2dc;
+        u8 tcxo_ldo_voltage;
+        u8 xtal_itrim_val;
+        u8 srf_state;
+        u8 srf1[SRF_TABLE_LEN];
+        u8 srf2[SRF_TABLE_LEN];
+        u8 srf3[SRF_TABLE_LEN];
+        u8 io_configuration;
+        u8 sdio_configuration;
+        u8 settings;
+        u8 rx_profile;
+        u8 per_chan_pwr_limit_arr_11abg[NUM_OF_CHANNELS_11_ABG];
+        u8 pwr_limit_reference_11_abg;
+        u8 per_chan_pwr_limit_arr_11p[NUM_OF_CHANNELS_11_P];
+        u8 pwr_limit_reference_11p;
+        u8 per_sub_band_tx_trace_loss[WL18XX_NUM_OF_SUB_BANDS];
+        u8 per_sub_band_rx_trace_loss[WL18XX_NUM_OF_SUB_BANDS];
+        u8 primary_clock_setting_time;
+        u8 clock_valid_on_wake_up;
+        u8 secondary_clock_setting_time;
+        u8 board_type;
+        /* enable point saturation */
+        u8 psat;
+        /* low/medium/high Tx power in dBm */
+        s8 low_power_val;
+        s8 med_power_val;
+        s8 high_power_val;
+        u8 padding[1];
+} __packed;
+
+struct wl18xx_priv_conf {
+        /* this structure is copied wholesale to FW */
+        struct wl18xx_mac_and_phy_params phy;
+} __packed;
+
+#endif /* __WL18XX_CONF_H__ */
diff --git a/drivers/net/wireless/ti/wl18xx/debugfs.c b/drivers/net/wireless/ti/wl18xx/debugfs.c
new file mode 100644
index 00000000000..3ce6f1039af
--- /dev/null
+++ b/drivers/net/wireless/ti/wl18xx/debugfs.c
@@ -0,0 +1,403 @@
+/*
+ * This file is part of wl18xx
+ *
+ * Copyright (C) 2009 Nokia Corporation
+ * Copyright (C) 2011-2012 Texas Instruments
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ *
+ */
+
+#include "../wlcore/debugfs.h"
+#include "../wlcore/wlcore.h"
+
+#include "wl18xx.h"
+#include "acx.h"
+#include "debugfs.h"
+
+#define WL18XX_DEBUGFS_FWSTATS_FILE(a, b, c) \
+        DEBUGFS_FWSTATS_FILE(a, b, c, wl18xx_acx_statistics)
+#define WL18XX_DEBUGFS_FWSTATS_FILE_ARRAY(a, b, c) \
+        DEBUGFS_FWSTATS_FILE_ARRAY(a, b, c, wl18xx_acx_statistics)
+
+
+WL18XX_DEBUGFS_FWSTATS_FILE(debug, debug1, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(debug, debug2, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(debug, debug3, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(debug, debug4, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(debug, debug5, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(debug, debug6, "%u");
+
+WL18XX_DEBUGFS_FWSTATS_FILE(error, error_frame, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(error, error_null_Frame_tx_start, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(error, error_numll_frame_cts_start, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(error, error_bar_retry, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(error, error_frame_cts_nul_flid, "%u");
+
+WL18XX_DEBUGFS_FWSTATS_FILE(tx, tx_prepared_descs, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(tx, tx_cmplt, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(tx, tx_template_prepared, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(tx, tx_data_prepared, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(tx, tx_template_programmed, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(tx, tx_data_programmed, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(tx, tx_burst_programmed, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(tx, tx_starts, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(tx, tx_imm_resp, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(tx, tx_start_templates, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(tx, tx_start_int_templates, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(tx, tx_start_fw_gen, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(tx, tx_start_data, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(tx, tx_start_null_frame, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(tx, tx_exch, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(tx, tx_retry_template, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(tx, tx_retry_data, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(tx, tx_exch_pending, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(tx, tx_exch_expiry, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(tx, tx_done_template, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(tx, tx_done_data, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(tx, tx_done_int_template, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(tx, tx_frame_checksum, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(tx, tx_checksum_result, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(tx, frag_called, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(tx, frag_mpdu_alloc_failed, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(tx, frag_init_called, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(tx, frag_in_process_called, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(tx, frag_tkip_called, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(tx, frag_key_not_found, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(tx, frag_need_fragmentation, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(tx, frag_bad_mblk_num, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(tx, frag_failed, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(tx, frag_cache_hit, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(tx, frag_cache_miss, "%u");
+
+WL18XX_DEBUGFS_FWSTATS_FILE(rx, rx_beacon_early_term, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(rx, rx_out_of_mpdu_nodes, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(rx, rx_hdr_overflow, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(rx, rx_dropped_frame, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(rx, rx_done, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(rx, rx_defrag, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(rx, rx_defrag_end, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(rx, rx_cmplt, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(rx, rx_pre_complt, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(rx, rx_cmplt_task, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(rx, rx_phy_hdr, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(rx, rx_timeout, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(rx, rx_timeout_wa, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(rx, rx_wa_density_dropped_frame, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(rx, rx_wa_ba_not_expected, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(rx, rx_frame_checksum, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(rx, rx_checksum_result, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(rx, defrag_called, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(rx, defrag_init_called, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(rx, defrag_in_process_called, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(rx, defrag_tkip_called, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(rx, defrag_need_defrag, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(rx, defrag_decrypt_failed, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(rx, decrypt_key_not_found, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(rx, defrag_need_decrypt, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(rx, rx_tkip_replays, "%u");
+
+WL18XX_DEBUGFS_FWSTATS_FILE(isr, irqs, "%u");
+
+WL18XX_DEBUGFS_FWSTATS_FILE(pwr, missing_bcns_cnt, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(pwr, rcvd_bcns_cnt, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(pwr, connection_out_of_sync, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE_ARRAY(pwr, cont_miss_bcns_spread,
+                                  PWR_STAT_MAX_CONT_MISSED_BCNS_SPREAD);
+WL18XX_DEBUGFS_FWSTATS_FILE(pwr, rcvd_awake_bcns_cnt, "%u");
+
+
+WL18XX_DEBUGFS_FWSTATS_FILE(ps_poll, ps_poll_timeouts, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(ps_poll, upsd_timeouts, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(ps_poll, upsd_max_ap_turn, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(ps_poll, ps_poll_max_ap_turn, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(ps_poll, ps_poll_utilization, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(ps_poll, upsd_utilization, "%u");
+
+WL18XX_DEBUGFS_FWSTATS_FILE(rx_filter, beacon_filter, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(rx_filter, arp_filter, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(rx_filter, mc_filter, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(rx_filter, dup_filter, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(rx_filter, data_filter, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(rx_filter, ibss_filter, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(rx_filter, protection_filter, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(rx_filter, accum_arp_pend_requests, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(rx_filter, max_arp_queue_dep, "%u");
+
+WL18XX_DEBUGFS_FWSTATS_FILE(rx_rate, rx_frames_per_rates, "%u");
+
+WL18XX_DEBUGFS_FWSTATS_FILE_ARRAY(aggr_size, tx_agg_vs_rate,
+                                  AGGR_STATS_TX_AGG*AGGR_STATS_TX_RATE);
+WL18XX_DEBUGFS_FWSTATS_FILE_ARRAY(aggr_size, rx_size,
+                                  AGGR_STATS_RX_SIZE_LEN);
+
+WL18XX_DEBUGFS_FWSTATS_FILE(pipeline, hs_tx_stat_fifo_int, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(pipeline, tcp_tx_stat_fifo_int, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(pipeline, tcp_rx_stat_fifo_int, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(pipeline, enc_tx_stat_fifo_int, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(pipeline, enc_rx_stat_fifo_int, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(pipeline, rx_complete_stat_fifo_int, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(pipeline, pre_proc_swi, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(pipeline, post_proc_swi, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(pipeline, sec_frag_swi, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(pipeline, pre_to_defrag_swi, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(pipeline, defrag_to_csum_swi, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(pipeline, csum_to_rx_xfer_swi, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(pipeline, dec_packet_in, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(pipeline, dec_packet_in_fifo_full, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(pipeline, dec_packet_out, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(pipeline, cs_rx_packet_in, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(pipeline, cs_rx_packet_out, "%u");
+
+WL18XX_DEBUGFS_FWSTATS_FILE_ARRAY(pipeline, pipeline_fifo_full,
+                                  PIPE_STATS_HW_FIFO);
+
+WL18XX_DEBUGFS_FWSTATS_FILE(mem, rx_free_mem_blks, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(mem, tx_free_mem_blks, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(mem, fwlog_free_mem_blks, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(mem, fw_gen_free_mem_blks, "%u");
+
+static ssize_t conf_read(struct file *file, char __user *user_buf,
+                         size_t count, loff_t *ppos)
+{
+        struct wl1271 *wl = file->private_data;
+        struct wl18xx_priv *priv = wl->priv;
+        struct wlcore_conf_header header;
+        char *buf, *pos;
+        size_t len;
+        int ret;
+
+        len = WL18XX_CONF_SIZE;
+        buf = kmalloc(len, GFP_KERNEL);
+        if (!buf)
+                return -ENOMEM;
+
+        header.magic    = cpu_to_le32(WL18XX_CONF_MAGIC);
+        header.version  = cpu_to_le32(WL18XX_CONF_VERSION);
+        header.checksum = 0;
+
+        mutex_lock(&wl->mutex);
+
+        pos = buf;
+        memcpy(pos, &header, sizeof(header));
+        pos += sizeof(header);
+        memcpy(pos, &wl->conf, sizeof(wl->conf));
+        pos += sizeof(wl->conf);
+        memcpy(pos, &priv->conf, sizeof(priv->conf));
+
+        mutex_unlock(&wl->mutex);
+
+        ret = simple_read_from_buffer(user_buf, count, ppos, buf, len);
+
+        kfree(buf);
+        return ret;
+}
+
+static const struct file_operations conf_ops = {
+        .read = conf_read,
+        .open = simple_open,
+        .llseek = default_llseek,
+};
+
+static ssize_t clear_fw_stats_write(struct file *file,
+                              const char __user *user_buf,
+                              size_t count, loff_t *ppos)
+{
+        struct wl1271 *wl = file->private_data;
+        int ret;
+
+        mutex_lock(&wl->mutex);
+
+        if (wl->state == WL1271_STATE_OFF)
+                goto out;
+
+        ret = wl18xx_acx_clear_statistics(wl);
+        if (ret < 0) {
+                count = ret;
+                goto out;
+        }
+out:
+        mutex_unlock(&wl->mutex);
+        return count;
+}
+
+static const struct file_operations clear_fw_stats_ops = {
+        .write = clear_fw_stats_write,
+        .open = simple_open,
+        .llseek = default_llseek,
+};
+
+int wl18xx_debugfs_add_files(struct wl1271 *wl,
+                             struct dentry *rootdir)
+{
+        int ret = 0;
+        struct dentry *entry, *stats, *moddir;
+
+        moddir = debugfs_create_dir(KBUILD_MODNAME, rootdir);
+        if (!moddir || IS_ERR(moddir)) {
+                entry = moddir;
+                goto err;
+        }
+
+        stats = debugfs_create_dir("fw_stats", moddir);
+        if (!stats || IS_ERR(stats)) {
+                entry = stats;
+                goto err;
+        }
+
+        DEBUGFS_ADD(clear_fw_stats, stats);
+
+        DEBUGFS_FWSTATS_ADD(debug, debug1);
+        DEBUGFS_FWSTATS_ADD(debug, debug2);
+        DEBUGFS_FWSTATS_ADD(debug, debug3);
+        DEBUGFS_FWSTATS_ADD(debug, debug4);
+        DEBUGFS_FWSTATS_ADD(debug, debug5);
+        DEBUGFS_FWSTATS_ADD(debug, debug6);
+
+        DEBUGFS_FWSTATS_ADD(error, error_frame);
+        DEBUGFS_FWSTATS_ADD(error, error_null_Frame_tx_start);
+        DEBUGFS_FWSTATS_ADD(error, error_numll_frame_cts_start);
+        DEBUGFS_FWSTATS_ADD(error, error_bar_retry);
+        DEBUGFS_FWSTATS_ADD(error, error_frame_cts_nul_flid);
+
+        DEBUGFS_FWSTATS_ADD(tx, tx_prepared_descs);
+        DEBUGFS_FWSTATS_ADD(tx, tx_cmplt);
+        DEBUGFS_FWSTATS_ADD(tx, tx_template_prepared);
+        DEBUGFS_FWSTATS_ADD(tx, tx_data_prepared);
+        DEBUGFS_FWSTATS_ADD(tx, tx_template_programmed);
+        DEBUGFS_FWSTATS_ADD(tx, tx_data_programmed);
+        DEBUGFS_FWSTATS_ADD(tx, tx_burst_programmed);
+        DEBUGFS_FWSTATS_ADD(tx, tx_starts);
+        DEBUGFS_FWSTATS_ADD(tx, tx_imm_resp);
+        DEBUGFS_FWSTATS_ADD(tx, tx_start_templates);
+        DEBUGFS_FWSTATS_ADD(tx, tx_start_int_templates);
+        DEBUGFS_FWSTATS_ADD(tx, tx_start_fw_gen);
+        DEBUGFS_FWSTATS_ADD(tx, tx_start_data);
+        DEBUGFS_FWSTATS_ADD(tx, tx_start_null_frame);
+        DEBUGFS_FWSTATS_ADD(tx, tx_exch);
+        DEBUGFS_FWSTATS_ADD(tx, tx_retry_template);
+        DEBUGFS_FWSTATS_ADD(tx, tx_retry_data);
+        DEBUGFS_FWSTATS_ADD(tx, tx_exch_pending);
+        DEBUGFS_FWSTATS_ADD(tx, tx_exch_expiry);
+        DEBUGFS_FWSTATS_ADD(tx, tx_done_template);
+        DEBUGFS_FWSTATS_ADD(tx, tx_done_data);
+        DEBUGFS_FWSTATS_ADD(tx, tx_done_int_template);
+        DEBUGFS_FWSTATS_ADD(tx, tx_frame_checksum);
+        DEBUGFS_FWSTATS_ADD(tx, tx_checksum_result);
+        DEBUGFS_FWSTATS_ADD(tx, frag_called);
+        DEBUGFS_FWSTATS_ADD(tx, frag_mpdu_alloc_failed);
+        DEBUGFS_FWSTATS_ADD(tx, frag_init_called);
+        DEBUGFS_FWSTATS_ADD(tx, frag_in_process_called);
+        DEBUGFS_FWSTATS_ADD(tx, frag_tkip_called);
+        DEBUGFS_FWSTATS_ADD(tx, frag_key_not_found);
+        DEBUGFS_FWSTATS_ADD(tx, frag_need_fragmentation);
+        DEBUGFS_FWSTATS_ADD(tx, frag_bad_mblk_num);
+        DEBUGFS_FWSTATS_ADD(tx, frag_failed);
+        DEBUGFS_FWSTATS_ADD(tx, frag_cache_hit);
+        DEBUGFS_FWSTATS_ADD(tx, frag_cache_miss);
+
+        DEBUGFS_FWSTATS_ADD(rx, rx_beacon_early_term);
+        DEBUGFS_FWSTATS_ADD(rx, rx_out_of_mpdu_nodes);
+        DEBUGFS_FWSTATS_ADD(rx, rx_hdr_overflow);
+        DEBUGFS_FWSTATS_ADD(rx, rx_dropped_frame);
+        DEBUGFS_FWSTATS_ADD(rx, rx_done);
+        DEBUGFS_FWSTATS_ADD(rx, rx_defrag);
+        DEBUGFS_FWSTATS_ADD(rx, rx_defrag_end);
+        DEBUGFS_FWSTATS_ADD(rx, rx_cmplt);
+        DEBUGFS_FWSTATS_ADD(rx, rx_pre_complt);
+        DEBUGFS_FWSTATS_ADD(rx, rx_cmplt_task);
+        DEBUGFS_FWSTATS_ADD(rx, rx_phy_hdr);
+        DEBUGFS_FWSTATS_ADD(rx, rx_timeout);
+        DEBUGFS_FWSTATS_ADD(rx, rx_timeout_wa);
+        DEBUGFS_FWSTATS_ADD(rx, rx_wa_density_dropped_frame);
+        DEBUGFS_FWSTATS_ADD(rx, rx_wa_ba_not_expected);
+        DEBUGFS_FWSTATS_ADD(rx, rx_frame_checksum);
+        DEBUGFS_FWSTATS_ADD(rx, rx_checksum_result);
+        DEBUGFS_FWSTATS_ADD(rx, defrag_called);
+        DEBUGFS_FWSTATS_ADD(rx, defrag_init_called);
+        DEBUGFS_FWSTATS_ADD(rx, defrag_in_process_called);
+        DEBUGFS_FWSTATS_ADD(rx, defrag_tkip_called);
+        DEBUGFS_FWSTATS_ADD(rx, defrag_need_defrag);
+        DEBUGFS_FWSTATS_ADD(rx, defrag_decrypt_failed);
+        DEBUGFS_FWSTATS_ADD(rx, decrypt_key_not_found);
+        DEBUGFS_FWSTATS_ADD(rx, defrag_need_decrypt);
+        DEBUGFS_FWSTATS_ADD(rx, rx_tkip_replays);
+
+        DEBUGFS_FWSTATS_ADD(isr, irqs);
+
+        DEBUGFS_FWSTATS_ADD(pwr, missing_bcns_cnt);
+        DEBUGFS_FWSTATS_ADD(pwr, rcvd_bcns_cnt);
+        DEBUGFS_FWSTATS_ADD(pwr, connection_out_of_sync);
+        DEBUGFS_FWSTATS_ADD(pwr, cont_miss_bcns_spread);
+        DEBUGFS_FWSTATS_ADD(pwr, rcvd_awake_bcns_cnt);
+
+        DEBUGFS_FWSTATS_ADD(ps_poll, ps_poll_timeouts);
+        DEBUGFS_FWSTATS_ADD(ps_poll, upsd_timeouts);
+        DEBUGFS_FWSTATS_ADD(ps_poll, upsd_max_ap_turn);
+        DEBUGFS_FWSTATS_ADD(ps_poll, ps_poll_max_ap_turn);
+        DEBUGFS_FWSTATS_ADD(ps_poll, ps_poll_utilization);
+        DEBUGFS_FWSTATS_ADD(ps_poll, upsd_utilization);
+
+        DEBUGFS_FWSTATS_ADD(rx_filter, beacon_filter);
+        DEBUGFS_FWSTATS_ADD(rx_filter, arp_filter);
+        DEBUGFS_FWSTATS_ADD(rx_filter, mc_filter);
+        DEBUGFS_FWSTATS_ADD(rx_filter, dup_filter);
+        DEBUGFS_FWSTATS_ADD(rx_filter, data_filter);
+        DEBUGFS_FWSTATS_ADD(rx_filter, ibss_filter);
+        DEBUGFS_FWSTATS_ADD(rx_filter, protection_filter);
+        DEBUGFS_FWSTATS_ADD(rx_filter, accum_arp_pend_requests);
+        DEBUGFS_FWSTATS_ADD(rx_filter, max_arp_queue_dep);
+
+        DEBUGFS_FWSTATS_ADD(rx_rate, rx_frames_per_rates);
+
+        DEBUGFS_FWSTATS_ADD(aggr_size, tx_agg_vs_rate);
+        DEBUGFS_FWSTATS_ADD(aggr_size, rx_size);
+
+        DEBUGFS_FWSTATS_ADD(pipeline, hs_tx_stat_fifo_int);
+        DEBUGFS_FWSTATS_ADD(pipeline, tcp_tx_stat_fifo_int);
+        DEBUGFS_FWSTATS_ADD(pipeline, tcp_rx_stat_fifo_int);
+        DEBUGFS_FWSTATS_ADD(pipeline, enc_tx_stat_fifo_int);
+        DEBUGFS_FWSTATS_ADD(pipeline, enc_rx_stat_fifo_int);
+        DEBUGFS_FWSTATS_ADD(pipeline, rx_complete_stat_fifo_int);
+        DEBUGFS_FWSTATS_ADD(pipeline, pre_proc_swi);
+        DEBUGFS_FWSTATS_ADD(pipeline, post_proc_swi);
+        DEBUGFS_FWSTATS_ADD(pipeline, sec_frag_swi);
+        DEBUGFS_FWSTATS_ADD(pipeline, pre_to_defrag_swi);
+        DEBUGFS_FWSTATS_ADD(pipeline, defrag_to_csum_swi);
+        DEBUGFS_FWSTATS_ADD(pipeline, csum_to_rx_xfer_swi);
+        DEBUGFS_FWSTATS_ADD(pipeline, dec_packet_in);
+        DEBUGFS_FWSTATS_ADD(pipeline, dec_packet_in_fifo_full);
+        DEBUGFS_FWSTATS_ADD(pipeline, dec_packet_out);
+        DEBUGFS_FWSTATS_ADD(pipeline, cs_rx_packet_in);
+        DEBUGFS_FWSTATS_ADD(pipeline, cs_rx_packet_out);
+        DEBUGFS_FWSTATS_ADD(pipeline, pipeline_fifo_full);
+
+        DEBUGFS_FWSTATS_ADD(mem, rx_free_mem_blks);
+        DEBUGFS_FWSTATS_ADD(mem, tx_free_mem_blks);
+        DEBUGFS_FWSTATS_ADD(mem, fwlog_free_mem_blks);
+        DEBUGFS_FWSTATS_ADD(mem, fw_gen_free_mem_blks);
+
+        DEBUGFS_ADD(conf, moddir);
+
+        return 0;
+
+err:
+        if (IS_ERR(entry))
+                ret = PTR_ERR(entry);
+        else
+                ret = -ENOMEM;
+
+        return ret;
+}
diff --git a/drivers/net/wireless/ti/wl18xx/debugfs.h b/drivers/net/wireless/ti/wl18xx/debugfs.h
new file mode 100644
index 00000000000..ed679bebf62
--- /dev/null
+++ b/drivers/net/wireless/ti/wl18xx/debugfs.h
@@ -0,0 +1,28 @@
+/*
+ * This file is part of wl18xx
+ *
+ * Copyright (C) 2012 Texas Instruments. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ *
+ */
+
+#ifndef __WL18XX_DEBUGFS_H__
+#define __WL18XX_DEBUGFS_H__
+
+int wl18xx_debugfs_add_files(struct wl1271 *wl,
+                             struct dentry *rootdir);
+
+#endif /* __WL18XX_DEBUGFS_H__ */
diff --git a/drivers/net/wireless/ti/wl18xx/io.c b/drivers/net/wireless/ti/wl18xx/io.c
new file mode 100644
index 00000000000..0c06ccfd1b8
--- /dev/null
+++ b/drivers/net/wireless/ti/wl18xx/io.c
@@ -0,0 +1,75 @@
+/*
+ * This file is part of wl18xx
+ *
+ * Copyright (C) 2011 Texas Instruments
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ *
+ */
+
+#include "../wlcore/wlcore.h"
+#include "../wlcore/io.h"
+
+#include "io.h"
+
+int wl18xx_top_reg_write(struct wl1271 *wl, int addr, u16 val)
+{
+        u32 tmp;
+        int ret;
+
+        if (WARN_ON(addr % 2))
+                return -EINVAL;
+
+        if ((addr % 4) == 0) {
+                ret = wlcore_read32(wl, addr, &tmp);
+                if (ret < 0)
+                        goto out;
+
+                tmp = (tmp & 0xffff0000) | val;
+                ret = wlcore_write32(wl, addr, tmp);
+        } else {
+                ret = wlcore_read32(wl, addr - 2, &tmp);
+                if (ret < 0)
+                        goto out;
+
+                tmp = (tmp & 0xffff) | (val << 16);
+                ret = wlcore_write32(wl, addr - 2, tmp);
+        }
+
+out:
+        return ret;
+}
+
+int wl18xx_top_reg_read(struct wl1271 *wl, int addr, u16 *out)
+{
+        u32 val;
+        int ret;
+
+        if (WARN_ON(addr % 2))
+                return -EINVAL;
+
+        if ((addr % 4) == 0) {
+                /* address is 4-bytes aligned */
+                ret = wlcore_read32(wl, addr, &val);
+                if (ret >= 0 && out)
+                        *out = val & 0xffff;
+        } else {
+                ret = wlcore_read32(wl, addr - 2, &val);
+                if (ret >= 0 && out)
+                        *out = (val & 0xffff0000) >> 16;
+        }
+
+        return ret;
+}
diff --git a/drivers/net/wireless/ti/wl18xx/io.h b/drivers/net/wireless/ti/wl18xx/io.h
new file mode 100644
index 00000000000..c32ae30277d
--- /dev/null
+++ b/drivers/net/wireless/ti/wl18xx/io.h
@@ -0,0 +1,28 @@
+/*
+ * This file is part of wl18xx
+ *
+ * Copyright (C) 2011 Texas Instruments
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ *
+ */
+
+#ifndef __WL18XX_IO_H__
+#define __WL18XX_IO_H__
+
+int __must_check wl18xx_top_reg_write(struct wl1271 *wl, int addr, u16 val);
+int __must_check wl18xx_top_reg_read(struct wl1271 *wl, int addr, u16 *out);
+
+#endif /* __WL18XX_IO_H__ */
diff --git a/drivers/net/wireless/ti/wl18xx/main.c b/drivers/net/wireless/ti/wl18xx/main.c
new file mode 100644
index 00000000000..5e583be8f67
--- /dev/null
+++ b/drivers/net/wireless/ti/wl18xx/main.c
@@ -0,0 +1,1542 @@
+/*
+ * This file is part of wl18xx
+ *
+ * Copyright (C) 2011 Texas Instruments
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ *
+ */
+
+#include <linux/module.h>
+#include <linux/platform_device.h>
+#include <linux/ip.h>
+#include <linux/firmware.h>
+
+#include "../wlcore/wlcore.h"
+#include "../wlcore/debug.h"
+#include "../wlcore/io.h"
+#include "../wlcore/acx.h"
+#include "../wlcore/tx.h"
+#include "../wlcore/rx.h"
+#include "../wlcore/io.h"
+#include "../wlcore/boot.h"
+
+#include "reg.h"
+#include "conf.h"
+#include "acx.h"
+#include "tx.h"
+#include "wl18xx.h"
+#include "io.h"
+#include "debugfs.h"
+
+#define WL18XX_RX_CHECKSUM_MASK      0x40
+
+static char *ht_mode_param = "default";
+static char *board_type_param = "hdk";
+static bool checksum_param = false;
+static bool enable_11a_param = true;
+static int num_rx_desc_param = -1;
+
+/* phy paramters */
+static int dc2dc_param = -1;
+static int n_antennas_2_param = -1;
+static int n_antennas_5_param = -1;
+static int low_band_component_param = -1;
+static int low_band_component_type_param = -1;
+static int high_band_component_param = -1;
+static int high_band_component_type_param = -1;
+static int pwr_limit_reference_11_abg_param = -1;
+
+static const u8 wl18xx_rate_to_idx_2ghz[] = {
+        /* MCS rates are used only with 11n */
+        15,                            /* WL18XX_CONF_HW_RXTX_RATE_MCS15 */
+        14,                            /* WL18XX_CONF_HW_RXTX_RATE_MCS14 */
+        13,                            /* WL18XX_CONF_HW_RXTX_RATE_MCS13 */
+        12,                            /* WL18XX_CONF_HW_RXTX_RATE_MCS12 */
+        11,                            /* WL18XX_CONF_HW_RXTX_RATE_MCS11 */
+        10,                            /* WL18XX_CONF_HW_RXTX_RATE_MCS10 */
+        9,                             /* WL18XX_CONF_HW_RXTX_RATE_MCS9 */
+        8,                             /* WL18XX_CONF_HW_RXTX_RATE_MCS8 */
+        7,                             /* WL18XX_CONF_HW_RXTX_RATE_MCS7 */
+        6,                             /* WL18XX_CONF_HW_RXTX_RATE_MCS6 */
+        5,                             /* WL18XX_CONF_HW_RXTX_RATE_MCS5 */
+        4,                             /* WL18XX_CONF_HW_RXTX_RATE_MCS4 */
+        3,                             /* WL18XX_CONF_HW_RXTX_RATE_MCS3 */
+        2,                             /* WL18XX_CONF_HW_RXTX_RATE_MCS2 */
+        1,                             /* WL18XX_CONF_HW_RXTX_RATE_MCS1 */
+        0,                             /* WL18XX_CONF_HW_RXTX_RATE_MCS0 */
+
+        11,                            /* WL18XX_CONF_HW_RXTX_RATE_54   */
+        10,                            /* WL18XX_CONF_HW_RXTX_RATE_48   */
+        9,                             /* WL18XX_CONF_HW_RXTX_RATE_36   */
+        8,                             /* WL18XX_CONF_HW_RXTX_RATE_24   */
+
+        /* TI-specific rate */
+        CONF_HW_RXTX_RATE_UNSUPPORTED, /* WL18XX_CONF_HW_RXTX_RATE_22   */
+
+        7,                             /* WL18XX_CONF_HW_RXTX_RATE_18   */
+        6,                             /* WL18XX_CONF_HW_RXTX_RATE_12   */
+        3,                             /* WL18XX_CONF_HW_RXTX_RATE_11   */
+        5,                             /* WL18XX_CONF_HW_RXTX_RATE_9    */
+        4,                             /* WL18XX_CONF_HW_RXTX_RATE_6    */
+        2,                             /* WL18XX_CONF_HW_RXTX_RATE_5_5  */
+        1,                             /* WL18XX_CONF_HW_RXTX_RATE_2    */
+        0                              /* WL18XX_CONF_HW_RXTX_RATE_1    */
+};
+
+static const u8 wl18xx_rate_to_idx_5ghz[] = {
+        /* MCS rates are used only with 11n */
+        15,                           /* WL18XX_CONF_HW_RXTX_RATE_MCS15 */
+        14,                           /* WL18XX_CONF_HW_RXTX_RATE_MCS14 */
+        13,                           /* WL18XX_CONF_HW_RXTX_RATE_MCS13 */
+        12,                           /* WL18XX_CONF_HW_RXTX_RATE_MCS12 */
+        11,                           /* WL18XX_CONF_HW_RXTX_RATE_MCS11 */
+        10,                           /* WL18XX_CONF_HW_RXTX_RATE_MCS10 */
+        9,                            /* WL18XX_CONF_HW_RXTX_RATE_MCS9 */
+        8,                            /* WL18XX_CONF_HW_RXTX_RATE_MCS8 */
+        7,                            /* WL18XX_CONF_HW_RXTX_RATE_MCS7 */
+        6,                            /* WL18XX_CONF_HW_RXTX_RATE_MCS6 */
+        5,                            /* WL18XX_CONF_HW_RXTX_RATE_MCS5 */
+        4,                            /* WL18XX_CONF_HW_RXTX_RATE_MCS4 */
+        3,                            /* WL18XX_CONF_HW_RXTX_RATE_MCS3 */
+        2,                            /* WL18XX_CONF_HW_RXTX_RATE_MCS2 */
+        1,                            /* WL18XX_CONF_HW_RXTX_RATE_MCS1 */
+        0,                            /* WL18XX_CONF_HW_RXTX_RATE_MCS0 */
+
+        7,                             /* WL18XX_CONF_HW_RXTX_RATE_54   */
+        6,                             /* WL18XX_CONF_HW_RXTX_RATE_48   */
+        5,                             /* WL18XX_CONF_HW_RXTX_RATE_36   */
+        4,                             /* WL18XX_CONF_HW_RXTX_RATE_24   */
+
+        /* TI-specific rate */
+        CONF_HW_RXTX_RATE_UNSUPPORTED, /* WL18XX_CONF_HW_RXTX_RATE_22   */
+
+        3,                             /* WL18XX_CONF_HW_RXTX_RATE_18   */
+        2,                             /* WL18XX_CONF_HW_RXTX_RATE_12   */
+        CONF_HW_RXTX_RATE_UNSUPPORTED, /* WL18XX_CONF_HW_RXTX_RATE_11   */
+        1,                             /* WL18XX_CONF_HW_RXTX_RATE_9    */
+        0,                             /* WL18XX_CONF_HW_RXTX_RATE_6    */
+        CONF_HW_RXTX_RATE_UNSUPPORTED, /* WL18XX_CONF_HW_RXTX_RATE_5_5  */
+        CONF_HW_RXTX_RATE_UNSUPPORTED, /* WL18XX_CONF_HW_RXTX_RATE_2    */
+        CONF_HW_RXTX_RATE_UNSUPPORTED, /* WL18XX_CONF_HW_RXTX_RATE_1    */
+};
+
+static const u8 *wl18xx_band_rate_to_idx[] = {
+        [IEEE80211_BAND_2GHZ] = wl18xx_rate_to_idx_2ghz,
+        [IEEE80211_BAND_5GHZ] = wl18xx_rate_to_idx_5ghz
+};
+
+enum wl18xx_hw_rates {
+        WL18XX_CONF_HW_RXTX_RATE_MCS15 = 0,
+        WL18XX_CONF_HW_RXTX_RATE_MCS14,
+        WL18XX_CONF_HW_RXTX_RATE_MCS13,
+        WL18XX_CONF_HW_RXTX_RATE_MCS12,
+        WL18XX_CONF_HW_RXTX_RATE_MCS11,
+        WL18XX_CONF_HW_RXTX_RATE_MCS10,
+        WL18XX_CONF_HW_RXTX_RATE_MCS9,
+        WL18XX_CONF_HW_RXTX_RATE_MCS8,
+        WL18XX_CONF_HW_RXTX_RATE_MCS7,
+        WL18XX_CONF_HW_RXTX_RATE_MCS6,
+        WL18XX_CONF_HW_RXTX_RATE_MCS5,
+        WL18XX_CONF_HW_RXTX_RATE_MCS4,
+        WL18XX_CONF_HW_RXTX_RATE_MCS3,
+        WL18XX_CONF_HW_RXTX_RATE_MCS2,
+        WL18XX_CONF_HW_RXTX_RATE_MCS1,
+        WL18XX_CONF_HW_RXTX_RATE_MCS0,
+        WL18XX_CONF_HW_RXTX_RATE_54,
+        WL18XX_CONF_HW_RXTX_RATE_48,
+        WL18XX_CONF_HW_RXTX_RATE_36,
+        WL18XX_CONF_HW_RXTX_RATE_24,
+        WL18XX_CONF_HW_RXTX_RATE_22,
+        WL18XX_CONF_HW_RXTX_RATE_18,
+        WL18XX_CONF_HW_RXTX_RATE_12,
+        WL18XX_CONF_HW_RXTX_RATE_11,
+        WL18XX_CONF_HW_RXTX_RATE_9,
+        WL18XX_CONF_HW_RXTX_RATE_6,
+        WL18XX_CONF_HW_RXTX_RATE_5_5,
+        WL18XX_CONF_HW_RXTX_RATE_2,
+        WL18XX_CONF_HW_RXTX_RATE_1,
+        WL18XX_CONF_HW_RXTX_RATE_MAX,
+};
+
+static struct wlcore_conf wl18xx_conf = {
+        .sg = {
+                .params = {
+                        [CONF_SG_ACL_BT_MASTER_MIN_BR] = 10,
+                        [CONF_SG_ACL_BT_MASTER_MAX_BR] = 180,
+                        [CONF_SG_ACL_BT_SLAVE_MIN_BR] = 10,
+                        [CONF_SG_ACL_BT_SLAVE_MAX_BR] = 180,
+                        [CONF_SG_ACL_BT_MASTER_MIN_EDR] = 10,
+                        [CONF_SG_ACL_BT_MASTER_MAX_EDR] = 80,
+                        [CONF_SG_ACL_BT_SLAVE_MIN_EDR] = 10,
+                        [CONF_SG_ACL_BT_SLAVE_MAX_EDR] = 80,
+                        [CONF_SG_ACL_WLAN_PS_MASTER_BR] = 8,
+                        [CONF_SG_ACL_WLAN_PS_SLAVE_BR] = 8,
+                        [CONF_SG_ACL_WLAN_PS_MASTER_EDR] = 20,
+                        [CONF_SG_ACL_WLAN_PS_SLAVE_EDR] = 20,
+                        [CONF_SG_ACL_WLAN_ACTIVE_MASTER_MIN_BR] = 20,
+                        [CONF_SG_ACL_WLAN_ACTIVE_MASTER_MAX_BR] = 35,
+                        [CONF_SG_ACL_WLAN_ACTIVE_SLAVE_MIN_BR] = 16,
+                        [CONF_SG_ACL_WLAN_ACTIVE_SLAVE_MAX_BR] = 35,
+                        [CONF_SG_ACL_WLAN_ACTIVE_MASTER_MIN_EDR] = 32,
+                        [CONF_SG_ACL_WLAN_ACTIVE_MASTER_MAX_EDR] = 50,
+                        [CONF_SG_ACL_WLAN_ACTIVE_SLAVE_MIN_EDR] = 28,
+                        [CONF_SG_ACL_WLAN_ACTIVE_SLAVE_MAX_EDR] = 50,
+                        [CONF_SG_ACL_ACTIVE_SCAN_WLAN_BR] = 10,
+                        [CONF_SG_ACL_ACTIVE_SCAN_WLAN_EDR] = 20,
+                        [CONF_SG_ACL_PASSIVE_SCAN_BT_BR] = 75,
+                        [CONF_SG_ACL_PASSIVE_SCAN_WLAN_BR] = 15,
+                        [CONF_SG_ACL_PASSIVE_SCAN_BT_EDR] = 27,
+                        [CONF_SG_ACL_PASSIVE_SCAN_WLAN_EDR] = 17,
+                        /* active scan params */
+                        [CONF_SG_AUTO_SCAN_PROBE_REQ] = 170,
+                        [CONF_SG_ACTIVE_SCAN_DURATION_FACTOR_HV3] = 50,
+                        [CONF_SG_ACTIVE_SCAN_DURATION_FACTOR_A2DP] = 100,
+                        /* passive scan params */
+                        [CONF_SG_PASSIVE_SCAN_DURATION_FACTOR_A2DP_BR] = 800,
+                        [CONF_SG_PASSIVE_SCAN_DURATION_FACTOR_A2DP_EDR] = 200,
+                        [CONF_SG_PASSIVE_SCAN_DURATION_FACTOR_HV3] = 200,
+                        /* passive scan in dual antenna params */
+                        [CONF_SG_CONSECUTIVE_HV3_IN_PASSIVE_SCAN] = 0,
+                        [CONF_SG_BCN_HV3_COLLISION_THRESH_IN_PASSIVE_SCAN] = 0,
+                        [CONF_SG_TX_RX_PROTECTION_BWIDTH_IN_PASSIVE_SCAN] = 0,
+                        /* general params */
+                        [CONF_SG_STA_FORCE_PS_IN_BT_SCO] = 1,
+                        [CONF_SG_ANTENNA_CONFIGURATION] = 0,
+                        [CONF_SG_BEACON_MISS_PERCENT] = 60,
+                        [CONF_SG_DHCP_TIME] = 5000,
+                        [CONF_SG_RXT] = 1200,
+                        [CONF_SG_TXT] = 1000,
+                        [CONF_SG_ADAPTIVE_RXT_TXT] = 1,
+                        [CONF_SG_GENERAL_USAGE_BIT_MAP] = 3,
+                        [CONF_SG_HV3_MAX_SERVED] = 6,
+                        [CONF_SG_PS_POLL_TIMEOUT] = 10,
+                        [CONF_SG_UPSD_TIMEOUT] = 10,
+                        [CONF_SG_CONSECUTIVE_CTS_THRESHOLD] = 2,
+                        [CONF_SG_STA_RX_WINDOW_AFTER_DTIM] = 5,
+                        [CONF_SG_STA_CONNECTION_PROTECTION_TIME] = 30,
+                        /* AP params */
+                        [CONF_AP_BEACON_MISS_TX] = 3,
+                        [CONF_AP_RX_WINDOW_AFTER_BEACON] = 10,
+                        [CONF_AP_BEACON_WINDOW_INTERVAL] = 2,
+                        [CONF_AP_CONNECTION_PROTECTION_TIME] = 0,
+                        [CONF_AP_BT_ACL_VAL_BT_SERVE_TIME] = 25,
+                        [CONF_AP_BT_ACL_VAL_WL_SERVE_TIME] = 25,
+                        /* CTS Diluting params */
+                        [CONF_SG_CTS_DILUTED_BAD_RX_PACKETS_TH] = 0,
+                        [CONF_SG_CTS_CHOP_IN_DUAL_ANT_SCO_MASTER] = 0,
+                },
+                .state = CONF_SG_PROTECTIVE,
+        },
+        .rx = {
+                .rx_msdu_life_time           = 512000,
+                .packet_detection_threshold  = 0,
+                .ps_poll_timeout             = 15,
+                .upsd_timeout                = 15,
+                .rts_threshold               = IEEE80211_MAX_RTS_THRESHOLD,
+                .rx_cca_threshold            = 0,
+                .irq_blk_threshold           = 0xFFFF,
+                .irq_pkt_threshold           = 0,
+                .irq_timeout                 = 600,
+                .queue_type                  = CONF_RX_QUEUE_TYPE_LOW_PRIORITY,
+        },
+        .tx = {
+                .tx_energy_detection         = 0,
+                .sta_rc_conf                 = {
+                        .enabled_rates       = 0,
+                        .short_retry_limit   = 10,
+                        .long_retry_limit    = 10,
+                        .aflags              = 0,
+                },
+                .ac_conf_count               = 4,
+                .ac_conf                     = {
+                        [CONF_TX_AC_BE] = {
+                                .ac          = CONF_TX_AC_BE,
+                                .cw_min      = 15,
+                                .cw_max      = 63,
+                                .aifsn       = 3,
+                                .tx_op_limit = 0,
+                        },
+                        [CONF_TX_AC_BK] = {
+                                .ac          = CONF_TX_AC_BK,
+                                .cw_min      = 15,
+                                .cw_max      = 63,
+                                .aifsn       = 7,
+                                .tx_op_limit = 0,
+                        },
+                        [CONF_TX_AC_VI] = {
+                                .ac          = CONF_TX_AC_VI,
+                                .cw_min      = 15,
+                                .cw_max      = 63,
+                                .aifsn       = CONF_TX_AIFS_PIFS,
+                                .tx_op_limit = 3008,
+                        },
+                        [CONF_TX_AC_VO] = {
+                                .ac          = CONF_TX_AC_VO,
+                                .cw_min      = 15,
+                                .cw_max      = 63,
+                                .aifsn       = CONF_TX_AIFS_PIFS,
+                                .tx_op_limit = 1504,
+                        },
+                },
+                .max_tx_retries = 100,
+                .ap_aging_period = 300,
+                .tid_conf_count = 4,
+                .tid_conf = {
+                        [CONF_TX_AC_BE] = {
+                                .queue_id    = CONF_TX_AC_BE,
+                                .channel_type = CONF_CHANNEL_TYPE_EDCF,
+                                .tsid        = CONF_TX_AC_BE,
+                                .ps_scheme   = CONF_PS_SCHEME_LEGACY,
+                                .ack_policy  = CONF_ACK_POLICY_LEGACY,
+                                .apsd_conf   = {0, 0},
+                        },
+                        [CONF_TX_AC_BK] = {
+                                .queue_id    = CONF_TX_AC_BK,
+                                .channel_type = CONF_CHANNEL_TYPE_EDCF,
+                                .tsid        = CONF_TX_AC_BK,
+                                .ps_scheme   = CONF_PS_SCHEME_LEGACY,
+                                .ack_policy  = CONF_ACK_POLICY_LEGACY,
+                                .apsd_conf   = {0, 0},
+                        },
+                        [CONF_TX_AC_VI] = {
+                                .queue_id    = CONF_TX_AC_VI,
+                                .channel_type = CONF_CHANNEL_TYPE_EDCF,
+                                .tsid        = CONF_TX_AC_VI,
+                                .ps_scheme   = CONF_PS_SCHEME_LEGACY,
+                                .ack_policy  = CONF_ACK_POLICY_LEGACY,
+                                .apsd_conf   = {0, 0},
+                        },
+                        [CONF_TX_AC_VO] = {
+                                .queue_id    = CONF_TX_AC_VO,
+                                .channel_type = CONF_CHANNEL_TYPE_EDCF,
+                                .tsid        = CONF_TX_AC_VO,
+                                .ps_scheme   = CONF_PS_SCHEME_LEGACY,
+                                .ack_policy  = CONF_ACK_POLICY_LEGACY,
+                                .apsd_conf   = {0, 0},
+                        },
+                },
+                .frag_threshold              = IEEE80211_MAX_FRAG_THRESHOLD,
+                .tx_compl_timeout            = 350,
+                .tx_compl_threshold          = 10,
+                .basic_rate                  = CONF_HW_BIT_RATE_1MBPS,
+                .basic_rate_5                = CONF_HW_BIT_RATE_6MBPS,
+                .tmpl_short_retry_limit      = 10,
+                .tmpl_long_retry_limit       = 10,
+                .tx_watchdog_timeout         = 5000,
+        },
+        .conn = {
+                .wake_up_event               = CONF_WAKE_UP_EVENT_DTIM,
+                .listen_interval             = 1,
+                .suspend_wake_up_event       = CONF_WAKE_UP_EVENT_N_DTIM,
+                .suspend_listen_interval     = 3,
+                .bcn_filt_mode               = CONF_BCN_FILT_MODE_ENABLED,
+                .bcn_filt_ie_count           = 3,
+                .bcn_filt_ie = {
+                        [0] = {
+                                .ie          = WLAN_EID_CHANNEL_SWITCH,
+                                .rule        = CONF_BCN_RULE_PASS_ON_APPEARANCE,
+                        },
+                        [1] = {
+                                .ie          = WLAN_EID_HT_OPERATION,
+                                .rule        = CONF_BCN_RULE_PASS_ON_CHANGE,
+                        },
+                        [2] = {
+                                .ie          = WLAN_EID_ERP_INFO,
+                                .rule        = CONF_BCN_RULE_PASS_ON_CHANGE,
+                        },
+                },
+                .synch_fail_thold            = 12,
+                .bss_lose_timeout            = 400,
+                .beacon_rx_timeout           = 10000,
+                .broadcast_timeout           = 20000,
+                .rx_broadcast_in_ps          = 1,
+                .ps_poll_threshold           = 10,
+                .bet_enable                  = CONF_BET_MODE_ENABLE,
+                .bet_max_consecutive         = 50,
+                .psm_entry_retries           = 8,
+                .psm_exit_retries            = 16,
+                .psm_entry_nullfunc_retries  = 3,
+                .dynamic_ps_timeout          = 200,
+                .forced_ps                   = false,
+                .keep_alive_interval         = 55000,
+                .max_listen_interval         = 20,
+                .sta_sleep_auth              = WL1271_PSM_ILLEGAL,
+        },
+        .itrim = {
+                .enable = false,
+                .timeout = 50000,
+        },
+        .pm_config = {
+                .host_clk_settling_time = 5000,
+                .host_fast_wakeup_support = CONF_FAST_WAKEUP_DISABLE,
+        },
+        .roam_trigger = {
+                .trigger_pacing               = 1,
+                .avg_weight_rssi_beacon       = 20,
+                .avg_weight_rssi_data         = 10,
+                .avg_weight_snr_beacon        = 20,
+                .avg_weight_snr_data          = 10,
+        },
+        .scan = {
+                .min_dwell_time_active        = 7500,
+                .max_dwell_time_active        = 30000,
+                .min_dwell_time_passive       = 100000,
+                .max_dwell_time_passive       = 100000,
+                .num_probe_reqs               = 2,
+                .split_scan_timeout           = 50000,
+        },
+        .sched_scan = {
+                /*
+                 * Values are in TU/1000 but since sched scan FW command
+                 * params are in TUs rounding up may occur.
+                 */
+                .base_dwell_time                = 7500,
+                .max_dwell_time_delta           = 22500,
+                /* based on 250bits per probe @1Mbps */
+                .dwell_time_delta_per_probe     = 2000,
+                /* based on 250bits per probe @6Mbps (plus a bit more) */
+                .dwell_time_delta_per_probe_5   = 350,
+                .dwell_time_passive             = 100000,
+                .dwell_time_dfs                 = 150000,
+                .num_probe_reqs                 = 2,
+                .rssi_threshold                 = -90,
+                .snr_threshold                  = 0,
+        },
+        .ht = {
+                .rx_ba_win_size = 10,
+                .tx_ba_win_size = 64,
+                .inactivity_timeout = 10000,
+                .tx_ba_tid_bitmap = CONF_TX_BA_ENABLED_TID_BITMAP,
+        },
+        .mem = {
+                .num_stations                 = 1,
+                .ssid_profiles                = 1,
+                .rx_block_num                 = 40,
+                .tx_min_block_num             = 40,
+                .dynamic_memory               = 1,
+                .min_req_tx_blocks            = 45,
+                .min_req_rx_blocks            = 22,
+                .tx_min                       = 27,
+        },
+        .fm_coex = {
+                .enable                       = true,
+                .swallow_period               = 5,
+                .n_divider_fref_set_1         = 0xff,       /* default */
+                .n_divider_fref_set_2         = 12,
+                .m_divider_fref_set_1         = 0xffff,
+                .m_divider_fref_set_2         = 148,        /* default */
+                .coex_pll_stabilization_time  = 0xffffffff, /* default */
+                .ldo_stabilization_time       = 0xffff,     /* default */
+                .fm_disturbed_band_margin     = 0xff,       /* default */
+                .swallow_clk_diff             = 0xff,       /* default */
+        },
+        .rx_streaming = {
+                .duration                      = 150,
+                .queues                        = 0x1,
+                .interval                      = 20,
+                .always                        = 0,
+        },
+        .fwlog = {
+                .mode                         = WL12XX_FWLOG_ON_DEMAND,
+                .mem_blocks                   = 2,
+                .severity                     = 0,
+                .timestamp                    = WL12XX_FWLOG_TIMESTAMP_DISABLED,
+                .output                       = WL12XX_FWLOG_OUTPUT_HOST,
+                .threshold                    = 0,
+        },
+        .rate = {
+                .rate_retry_score = 32000,
+                .per_add = 8192,
+                .per_th1 = 2048,
+                .per_th2 = 4096,
+                .max_per = 8100,
+                .inverse_curiosity_factor = 5,
+                .tx_fail_low_th = 4,
+                .tx_fail_high_th = 10,
+                .per_alpha_shift = 4,
+                .per_add_shift = 13,
+                .per_beta1_shift = 10,
+                .per_beta2_shift = 8,
+                .rate_check_up = 2,
+                .rate_check_down = 12,
+                .rate_retry_policy = {
+                        0x00, 0x00, 0x00, 0x00, 0x00,
+                        0x00, 0x00, 0x00, 0x00, 0x00,
+                        0x00, 0x00, 0x00,
+                },
+        },
+        .hangover = {
+                .recover_time               = 0,
+                .hangover_period            = 20,
+                .dynamic_mode               = 1,
+                .early_termination_mode     = 1,
+                .max_period                 = 20,
+                .min_period                 = 1,
+                .increase_delta             = 1,
+                .decrease_delta             = 2,
+                .quiet_time                 = 4,
+                .increase_time              = 1,
+                .window_size                = 16,
+        },
+};
+
+static struct wl18xx_priv_conf wl18xx_default_priv_conf = {
+        .phy = {
+                .phy_standalone                 = 0x00,
+                .primary_clock_setting_time     = 0x05,
+                .clock_valid_on_wake_up         = 0x00,
+                .secondary_clock_setting_time   = 0x05,
+                .rdl                            = 0x01,
+                .auto_detect                    = 0x00,
+                .dedicated_fem                  = FEM_NONE,
+                .low_band_component             = COMPONENT_2_WAY_SWITCH,
+                .low_band_component_type        = 0x05,
+                .high_band_component            = COMPONENT_2_WAY_SWITCH,
+                .high_band_component_type       = 0x09,
+                .tcxo_ldo_voltage               = 0x00,
+                .xtal_itrim_val                 = 0x04,
+                .srf_state                      = 0x00,
+                .io_configuration               = 0x01,
+                .sdio_configuration             = 0x00,
+                .settings                       = 0x00,
+                .enable_clpc                    = 0x00,
+                .enable_tx_low_pwr_on_siso_rdl  = 0x00,
+                .rx_profile                     = 0x00,
+                .pwr_limit_reference_11_abg     = 0xc8,
+                .psat                           = 0,
+                .low_power_val                  = 0x00,
+                .med_power_val                  = 0x0a,
+                .high_power_val                 = 0x1e,
+                .external_pa_dc2dc              = 0,
+                .number_of_assembled_ant2_4     = 1,
+                .number_of_assembled_ant5       = 1,
+        },
+};
+
+static const struct wlcore_partition_set wl18xx_ptable[PART_TABLE_LEN] = {
+        [PART_TOP_PRCM_ELP_SOC] = {
+                .mem  = { .start = 0x00A02000, .size  = 0x00010000 },
+                .reg  = { .start = 0x00807000, .size  = 0x00005000 },
+                .mem2 = { .start = 0x00800000, .size  = 0x0000B000 },
+                .mem3 = { .start = 0x00000000, .size  = 0x00000000 },
+        },
+        [PART_DOWN] = {
+                .mem  = { .start = 0x00000000, .size  = 0x00014000 },
+                .reg  = { .start = 0x00810000, .size  = 0x0000BFFF },
+                .mem2 = { .start = 0x00000000, .size  = 0x00000000 },
+                .mem3 = { .start = 0x00000000, .size  = 0x00000000 },
+        },
+        [PART_BOOT] = {
+                .mem  = { .start = 0x00700000, .size = 0x0000030c },
+                .reg  = { .start = 0x00802000, .size = 0x00014578 },
+                .mem2 = { .start = 0x00B00404, .size = 0x00001000 },
+                .mem3 = { .start = 0x00C00000, .size = 0x00000400 },
+        },
+        [PART_WORK] = {
+                .mem  = { .start = 0x00800000, .size  = 0x000050FC },
+                .reg  = { .start = 0x00B00404, .size  = 0x00001000 },
+                .mem2 = { .start = 0x00C00000, .size  = 0x00000400 },
+                .mem3 = { .start = 0x00000000, .size  = 0x00000000 },
+        },
+        [PART_PHY_INIT] = {
+                .mem  = { .start = 0x80926000,
+                          .size = sizeof(struct wl18xx_mac_and_phy_params) },
+                .reg  = { .start = 0x00000000, .size = 0x00000000 },
+                .mem2 = { .start = 0x00000000, .size = 0x00000000 },
+                .mem3 = { .start = 0x00000000, .size = 0x00000000 },
+        },
+};
+
+static const int wl18xx_rtable[REG_TABLE_LEN] = {
+        [REG_ECPU_CONTROL]              = WL18XX_REG_ECPU_CONTROL,
+        [REG_INTERRUPT_NO_CLEAR]        = WL18XX_REG_INTERRUPT_NO_CLEAR,
+        [REG_INTERRUPT_ACK]             = WL18XX_REG_INTERRUPT_ACK,
+        [REG_COMMAND_MAILBOX_PTR]       = WL18XX_REG_COMMAND_MAILBOX_PTR,
+        [REG_EVENT_MAILBOX_PTR]         = WL18XX_REG_EVENT_MAILBOX_PTR,
+        [REG_INTERRUPT_TRIG]            = WL18XX_REG_INTERRUPT_TRIG_H,
+        [REG_INTERRUPT_MASK]            = WL18XX_REG_INTERRUPT_MASK,
+        [REG_PC_ON_RECOVERY]            = WL18XX_SCR_PAD4,
+        [REG_CHIP_ID_B]                 = WL18XX_REG_CHIP_ID_B,
+        [REG_CMD_MBOX_ADDRESS]          = WL18XX_CMD_MBOX_ADDRESS,
+
+        /* data access memory addresses, used with partition translation */
+        [REG_SLV_MEM_DATA]              = WL18XX_SLV_MEM_DATA,
+        [REG_SLV_REG_DATA]              = WL18XX_SLV_REG_DATA,
+
+        /* raw data access memory addresses */
+        [REG_RAW_FW_STATUS_ADDR]        = WL18XX_FW_STATUS_ADDR,
+};
+
+static const struct wl18xx_clk_cfg wl18xx_clk_table[NUM_CLOCK_CONFIGS] = {
+        [CLOCK_CONFIG_16_2_M]   = { 7,  104,  801, 4,  true },
+        [CLOCK_CONFIG_16_368_M] = { 9,  132, 3751, 4,  true },
+        [CLOCK_CONFIG_16_8_M]   = { 7,  100,    0, 0, false },
+        [CLOCK_CONFIG_19_2_M]   = { 8,  100,    0, 0, false },
+        [CLOCK_CONFIG_26_M]     = { 13, 120,    0, 0, false },
+        [CLOCK_CONFIG_32_736_M] = { 9,  132, 3751, 4,  true },
+        [CLOCK_CONFIG_33_6_M]   = { 7,  100,    0, 0, false },
+        [CLOCK_CONFIG_38_468_M] = { 8,  100,    0, 0, false },
+        [CLOCK_CONFIG_52_M]     = { 13, 120,    0, 0, false },
+};
+
+/* TODO: maybe move to a new header file? */
+#define WL18XX_FW_NAME "ti-connectivity/wl18xx-fw.bin"
+
+static int wl18xx_identify_chip(struct wl1271 *wl)
+{
+        int ret = 0;
+
+        switch (wl->chip.id) {
+        case CHIP_ID_185x_PG20:
+                wl1271_debug(DEBUG_BOOT, "chip id 0x%x (185x PG20)",
+                                 wl->chip.id);
+                wl->sr_fw_name = WL18XX_FW_NAME;
+                /* wl18xx uses the same firmware for PLT */
+                wl->plt_fw_name = WL18XX_FW_NAME;
+                wl->quirks |= WLCORE_QUIRK_NO_ELP |
+                              WLCORE_QUIRK_RX_BLOCKSIZE_ALIGN |
+                              WLCORE_QUIRK_TX_BLOCKSIZE_ALIGN |
+                              WLCORE_QUIRK_TX_PAD_LAST_FRAME;
+                break;
+        case CHIP_ID_185x_PG10:
+                wl1271_warning("chip id 0x%x (185x PG10) is deprecated",
+                               wl->chip.id);
+                ret = -ENODEV;
+                goto out;
+
+        default:
+                wl1271_warning("unsupported chip id: 0x%x", wl->chip.id);
+                ret = -ENODEV;
+                goto out;
+        }
+
+out:
+        return ret;
+}
+
+static int wl18xx_set_clk(struct wl1271 *wl)
+{
+        u16 clk_freq;
+        int ret;
+
+        ret = wlcore_set_partition(wl, &wl->ptable[PART_TOP_PRCM_ELP_SOC]);
+        if (ret < 0)
+                goto out;
+
+        /* TODO: PG2: apparently we need to read the clk type */
+
+        ret = wl18xx_top_reg_read(wl, PRIMARY_CLK_DETECT, &clk_freq);
+        if (ret < 0)
+                goto out;
+
+        wl1271_debug(DEBUG_BOOT, "clock freq %d (%d, %d, %d, %d, %s)", clk_freq,
+                     wl18xx_clk_table[clk_freq].n, wl18xx_clk_table[clk_freq].m,
+                     wl18xx_clk_table[clk_freq].p, wl18xx_clk_table[clk_freq].q,
+                     wl18xx_clk_table[clk_freq].swallow ? "swallow" : "spit");
+
+        ret = wl18xx_top_reg_write(wl, PLLSH_WCS_PLL_N,
+                                   wl18xx_clk_table[clk_freq].n);
+        if (ret < 0)
+                goto out;
+
+        ret = wl18xx_top_reg_write(wl, PLLSH_WCS_PLL_M,
+                                   wl18xx_clk_table[clk_freq].m);
+        if (ret < 0)
+                goto out;
+
+        if (wl18xx_clk_table[clk_freq].swallow) {
+                /* first the 16 lower bits */
+                ret = wl18xx_top_reg_write(wl, PLLSH_WCS_PLL_Q_FACTOR_CFG_1,
+                                           wl18xx_clk_table[clk_freq].q &
+                                           PLLSH_WCS_PLL_Q_FACTOR_CFG_1_MASK);
+                if (ret < 0)
+                        goto out;
+
+                /* then the 16 higher bits, masked out */
+                ret = wl18xx_top_reg_write(wl, PLLSH_WCS_PLL_Q_FACTOR_CFG_2,
+                                        (wl18xx_clk_table[clk_freq].q >> 16) &
+                                        PLLSH_WCS_PLL_Q_FACTOR_CFG_2_MASK);
+                if (ret < 0)
+                        goto out;
+
+                /* first the 16 lower bits */
+                ret = wl18xx_top_reg_write(wl, PLLSH_WCS_PLL_P_FACTOR_CFG_1,
+                                           wl18xx_clk_table[clk_freq].p &
+                                           PLLSH_WCS_PLL_P_FACTOR_CFG_1_MASK);
+                if (ret < 0)
+                        goto out;
+
+                /* then the 16 higher bits, masked out */
+                ret = wl18xx_top_reg_write(wl, PLLSH_WCS_PLL_P_FACTOR_CFG_2,
+                                        (wl18xx_clk_table[clk_freq].p >> 16) &
+                                        PLLSH_WCS_PLL_P_FACTOR_CFG_2_MASK);
+        } else {
+                ret = wl18xx_top_reg_write(wl, PLLSH_WCS_PLL_SWALLOW_EN,
+                                           PLLSH_WCS_PLL_SWALLOW_EN_VAL2);
+        }
+
+out:
+        return ret;
+}
+
+static int wl18xx_boot_soft_reset(struct wl1271 *wl)
+{
+        int ret;
+
+        /* disable Rx/Tx */
+        ret = wlcore_write32(wl, WL18XX_ENABLE, 0x0);
+        if (ret < 0)
+                goto out;
+
+        /* disable auto calibration on start*/
+        ret = wlcore_write32(wl, WL18XX_SPARE_A2, 0xffff);
+
+out:
+        return ret;
+}
+
+static int wl18xx_pre_boot(struct wl1271 *wl)
+{
+        int ret;
+
+        ret = wl18xx_set_clk(wl);
+        if (ret < 0)
+                goto out;
+
+        /* Continue the ELP wake up sequence */
+        ret = wlcore_write32(wl, WL18XX_WELP_ARM_COMMAND, WELP_ARM_COMMAND_VAL);
+        if (ret < 0)
+                goto out;
+
+        udelay(500);
+
+        ret = wlcore_set_partition(wl, &wl->ptable[PART_BOOT]);
+        if (ret < 0)
+                goto out;
+
+        /* Disable interrupts */
+        ret = wlcore_write_reg(wl, REG_INTERRUPT_MASK, WL1271_ACX_INTR_ALL);
+        if (ret < 0)
+                goto out;
+
+        ret = wl18xx_boot_soft_reset(wl);
+
+out:
+        return ret;
+}
+
+static int wl18xx_pre_upload(struct wl1271 *wl)
+{
+        u32 tmp;
+        int ret;
+
+        ret = wlcore_set_partition(wl, &wl->ptable[PART_BOOT]);
+        if (ret < 0)
+                goto out;
+
+        /* TODO: check if this is all needed */
+        ret = wlcore_write32(wl, WL18XX_EEPROMLESS_IND, WL18XX_EEPROMLESS_IND);
+        if (ret < 0)
+                goto out;
+
+        ret = wlcore_read_reg(wl, REG_CHIP_ID_B, &tmp);
+        if (ret < 0)
+                goto out;
+
+        wl1271_debug(DEBUG_BOOT, "chip id 0x%x", tmp);
+
+        ret = wlcore_read32(wl, WL18XX_SCR_PAD2, &tmp);
+
+out:
+        return ret;
+}
+
+static int wl18xx_set_mac_and_phy(struct wl1271 *wl)
+{
+        struct wl18xx_priv *priv = wl->priv;
+        int ret;
+
+        ret = wlcore_set_partition(wl, &wl->ptable[PART_PHY_INIT]);
+        if (ret < 0)
+                goto out;
+
+        ret = wlcore_write(wl, WL18XX_PHY_INIT_MEM_ADDR, (u8 *)&priv->conf.phy,
+                           sizeof(struct wl18xx_mac_and_phy_params), false);
+
+out:
+        return ret;
+}
+
+static int wl18xx_enable_interrupts(struct wl1271 *wl)
+{
+        u32 event_mask, intr_mask;
+        int ret;
+
+        event_mask = WL18XX_ACX_EVENTS_VECTOR;
+        intr_mask = WL18XX_INTR_MASK;
+
+        ret = wlcore_write_reg(wl, REG_INTERRUPT_MASK, event_mask);
+        if (ret < 0)
+                goto out;
+
+        wlcore_enable_interrupts(wl);
+
+        ret = wlcore_write_reg(wl, REG_INTERRUPT_MASK,
+                               WL1271_ACX_INTR_ALL & ~intr_mask);
+
+out:
+        return ret;
+}
+
+static int wl18xx_boot(struct wl1271 *wl)
+{
+        int ret;
+
+        ret = wl18xx_pre_boot(wl);
+        if (ret < 0)
+                goto out;
+
+        ret = wl18xx_pre_upload(wl);
+        if (ret < 0)
+                goto out;
+
+        ret = wlcore_boot_upload_firmware(wl);
+        if (ret < 0)
+                goto out;
+
+        ret = wl18xx_set_mac_and_phy(wl);
+        if (ret < 0)
+                goto out;
+
+        ret = wlcore_boot_run_firmware(wl);
+        if (ret < 0)
+                goto out;
+
+        ret = wl18xx_enable_interrupts(wl);
+
+out:
+        return ret;
+}
+
+static int wl18xx_trigger_cmd(struct wl1271 *wl, int cmd_box_addr,
+                               void *buf, size_t len)
+{
+        struct wl18xx_priv *priv = wl->priv;
+
+        memcpy(priv->cmd_buf, buf, len);
+        memset(priv->cmd_buf + len, 0, WL18XX_CMD_MAX_SIZE - len);
+
+        return wlcore_write(wl, cmd_box_addr, priv->cmd_buf,
+                            WL18XX_CMD_MAX_SIZE, false);
+}
+
+static int wl18xx_ack_event(struct wl1271 *wl)
+{
+        return wlcore_write_reg(wl, REG_INTERRUPT_TRIG,
+                                WL18XX_INTR_TRIG_EVENT_ACK);
+}
+
+static u32 wl18xx_calc_tx_blocks(struct wl1271 *wl, u32 len, u32 spare_blks)
+{
+        u32 blk_size = WL18XX_TX_HW_BLOCK_SIZE;
+        return (len + blk_size - 1) / blk_size + spare_blks;
+}
+
+static void
+wl18xx_set_tx_desc_blocks(struct wl1271 *wl, struct wl1271_tx_hw_descr *desc,
+                          u32 blks, u32 spare_blks)
+{
+        desc->wl18xx_mem.total_mem_blocks = blks;
+}
+
+static void
+wl18xx_set_tx_desc_data_len(struct wl1271 *wl, struct wl1271_tx_hw_descr *desc,
+                            struct sk_buff *skb)
+{
+        desc->length = cpu_to_le16(skb->len);
+
+        /* if only the last frame is to be padded, we unset this bit on Tx */
+        if (wl->quirks & WLCORE_QUIRK_TX_PAD_LAST_FRAME)
+                desc->wl18xx_mem.ctrl = WL18XX_TX_CTRL_NOT_PADDED;
+        else
+                desc->wl18xx_mem.ctrl = 0;
+
+        wl1271_debug(DEBUG_TX, "tx_fill_hdr: hlid: %d "
+                     "len: %d life: %d mem: %d", desc->hlid,
+                     le16_to_cpu(desc->length),
+                     le16_to_cpu(desc->life_time),
+                     desc->wl18xx_mem.total_mem_blocks);
+}
+
+static enum wl_rx_buf_align
+wl18xx_get_rx_buf_align(struct wl1271 *wl, u32 rx_desc)
+{
+        if (rx_desc & RX_BUF_PADDED_PAYLOAD)
+                return WLCORE_RX_BUF_PADDED;
+
+        return WLCORE_RX_BUF_ALIGNED;
+}
+
+static u32 wl18xx_get_rx_packet_len(struct wl1271 *wl, void *rx_data,
+                                    u32 data_len)
+{
+        struct wl1271_rx_descriptor *desc = rx_data;
+
+        /* invalid packet */
+        if (data_len < sizeof(*desc))
+                return 0;
+
+        return data_len - sizeof(*desc);
+}
+
+static void wl18xx_tx_immediate_completion(struct wl1271 *wl)
+{
+        wl18xx_tx_immediate_complete(wl);
+}
+
+static int wl18xx_set_host_cfg_bitmap(struct wl1271 *wl, u32 extra_mem_blk)
+{
+        int ret;
+        u32 sdio_align_size = 0;
+        u32 host_cfg_bitmap = HOST_IF_CFG_RX_FIFO_ENABLE |
+                              HOST_IF_CFG_ADD_RX_ALIGNMENT;
+
+        /* Enable Tx SDIO padding */
+        if (wl->quirks & WLCORE_QUIRK_TX_BLOCKSIZE_ALIGN) {
+                host_cfg_bitmap |= HOST_IF_CFG_TX_PAD_TO_SDIO_BLK;
+                sdio_align_size = WL12XX_BUS_BLOCK_SIZE;
+        }
+
+        /* Enable Rx SDIO padding */
+        if (wl->quirks & WLCORE_QUIRK_RX_BLOCKSIZE_ALIGN) {
+                host_cfg_bitmap |= HOST_IF_CFG_RX_PAD_TO_SDIO_BLK;
+                sdio_align_size = WL12XX_BUS_BLOCK_SIZE;
+        }
+
+        ret = wl18xx_acx_host_if_cfg_bitmap(wl, host_cfg_bitmap,
+                                            sdio_align_size, extra_mem_blk,
+                                            WL18XX_HOST_IF_LEN_SIZE_FIELD);
+        if (ret < 0)
+                return ret;
+
+        return 0;
+}
+
+static int wl18xx_hw_init(struct wl1271 *wl)
+{
+        int ret;
+        struct wl18xx_priv *priv = wl->priv;
+
+        /* (re)init private structures. Relevant on recovery as well. */
+        priv->last_fw_rls_idx = 0;
+        priv->extra_spare_vif_count = 0;
+
+        /* set the default amount of spare blocks in the bitmap */
+        ret = wl18xx_set_host_cfg_bitmap(wl, WL18XX_TX_HW_BLOCK_SPARE);
+        if (ret < 0)
+                return ret;
+
+        if (checksum_param) {
+                ret = wl18xx_acx_set_checksum_state(wl);
+                if (ret != 0)
+                        return ret;
+        }
+
+        return ret;
+}
+
+static void wl18xx_set_tx_desc_csum(struct wl1271 *wl,
+                                    struct wl1271_tx_hw_descr *desc,
+                                    struct sk_buff *skb)
+{
+        u32 ip_hdr_offset;
+        struct iphdr *ip_hdr;
+
+        if (!checksum_param) {
+                desc->wl18xx_checksum_data = 0;
+                return;
+        }
+
+        if (skb->ip_summed != CHECKSUM_PARTIAL) {
+                desc->wl18xx_checksum_data = 0;
+                return;
+        }
+
+        ip_hdr_offset = skb_network_header(skb) - skb_mac_header(skb);
+        if (WARN_ON(ip_hdr_offset >= (1<<7))) {
+                desc->wl18xx_checksum_data = 0;
+                return;
+        }
+
+        desc->wl18xx_checksum_data = ip_hdr_offset << 1;
+
+        /* FW is interested only in the LSB of the protocol  TCP=0 UDP=1 */
+        ip_hdr = (void *)skb_network_header(skb);
+        desc->wl18xx_checksum_data |= (ip_hdr->protocol & 0x01);
+}
+
+static void wl18xx_set_rx_csum(struct wl1271 *wl,
+                               struct wl1271_rx_descriptor *desc,
+                               struct sk_buff *skb)
+{
+        if (desc->status & WL18XX_RX_CHECKSUM_MASK)
+                skb->ip_summed = CHECKSUM_UNNECESSARY;
+}
+
+/*
+ * TODO: instead of having these two functions to get the rate mask,
+ * we should modify the wlvif->rate_set instead
+ */
+static u32 wl18xx_sta_get_ap_rate_mask(struct wl1271 *wl,
+                                       struct wl12xx_vif *wlvif)
+{
+        u32 hw_rate_set = wlvif->rate_set;
+
+        if (wlvif->channel_type == NL80211_CHAN_HT40MINUS ||
+            wlvif->channel_type == NL80211_CHAN_HT40PLUS) {
+                wl1271_debug(DEBUG_ACX, "using wide channel rate mask");
+                hw_rate_set |= CONF_TX_RATE_USE_WIDE_CHAN;
+
+                /* we don't support MIMO in wide-channel mode */
+                hw_rate_set &= ~CONF_TX_MIMO_RATES;
+        }
+
+        return hw_rate_set;
+}
+
+static u32 wl18xx_ap_get_mimo_wide_rate_mask(struct wl1271 *wl,
+                                             struct wl12xx_vif *wlvif)
+{
+        if ((wlvif->channel_type == NL80211_CHAN_HT40MINUS ||
+             wlvif->channel_type == NL80211_CHAN_HT40PLUS) &&
+            !strcmp(ht_mode_param, "wide")) {
+                wl1271_debug(DEBUG_ACX, "using wide channel rate mask");
+                return CONF_TX_RATE_USE_WIDE_CHAN;
+        } else if (!strcmp(ht_mode_param, "mimo")) {
+                wl1271_debug(DEBUG_ACX, "using MIMO rate mask");
+
+                return CONF_TX_MIMO_RATES;
+        } else {
+                return 0;
+        }
+}
+
+static int wl18xx_get_pg_ver(struct wl1271 *wl, s8 *ver)
+{
+        u32 fuse;
+        int ret;
+
+        ret = wlcore_set_partition(wl, &wl->ptable[PART_TOP_PRCM_ELP_SOC]);
+        if (ret < 0)
+                goto out;
+
+        ret = wlcore_read32(wl, WL18XX_REG_FUSE_DATA_1_3, &fuse);
+        if (ret < 0)
+                goto out;
+
+        if (ver)
+                *ver = (fuse & WL18XX_PG_VER_MASK) >> WL18XX_PG_VER_OFFSET;
+
+        ret = wlcore_set_partition(wl, &wl->ptable[PART_BOOT]);
+
+out:
+        return ret;
+}
+
+#define WL18XX_CONF_FILE_NAME "ti-connectivity/wl18xx-conf.bin"
+static int wl18xx_conf_init(struct wl1271 *wl, struct device *dev)
+{
+        struct wl18xx_priv *priv = wl->priv;
+        struct wlcore_conf_file *conf_file;
+        const struct firmware *fw;
+        int ret;
+
+        ret = request_firmware(&fw, WL18XX_CONF_FILE_NAME, dev);
+        if (ret < 0) {
+                wl1271_error("could not get configuration binary %s: %d",
+                             WL18XX_CONF_FILE_NAME, ret);
+                goto out_fallback;
+        }
+
+        if (fw->size != WL18XX_CONF_SIZE) {
+                wl1271_error("configuration binary file size is wrong, expected %zu got %zu",
+                             WL18XX_CONF_SIZE, fw->size);
+                ret = -EINVAL;
+                goto out;
+        }
+
+        conf_file = (struct wlcore_conf_file *) fw->data;
+
+        if (conf_file->header.magic != cpu_to_le32(WL18XX_CONF_MAGIC)) {
+                wl1271_error("configuration binary file magic number mismatch, "
+                             "expected 0x%0x got 0x%0x", WL18XX_CONF_MAGIC,
+                             conf_file->header.magic);
+                ret = -EINVAL;
+                goto out;
+        }
+
+        if (conf_file->header.version != cpu_to_le32(WL18XX_CONF_VERSION)) {
+                wl1271_error("configuration binary file version not supported, "
+                             "expected 0x%08x got 0x%08x",
+                             WL18XX_CONF_VERSION, conf_file->header.version);
+                ret = -EINVAL;
+                goto out;
+        }
+
+        memcpy(&wl->conf, &conf_file->core, sizeof(wl18xx_conf));
+        memcpy(&priv->conf, &conf_file->priv, sizeof(priv->conf));
+
+        goto out;
+
+out_fallback:
+        wl1271_warning("falling back to default config");
+
+        /* apply driver default configuration */
+        memcpy(&wl->conf, &wl18xx_conf, sizeof(wl18xx_conf));
+        /* apply default private configuration */
+        memcpy(&priv->conf, &wl18xx_default_priv_conf, sizeof(priv->conf));
+
+        /* For now we just fallback */
+        return 0;
+
+out:
+        release_firmware(fw);
+        return ret;
+}
+
+static int wl18xx_plt_init(struct wl1271 *wl)
+{
+        int ret;
+
+        ret = wlcore_write32(wl, WL18XX_SCR_PAD8, WL18XX_SCR_PAD8_PLT);
+        if (ret < 0)
+                return ret;
+
+        return wl->ops->boot(wl);
+}
+
+static int wl18xx_get_mac(struct wl1271 *wl)
+{
+        u32 mac1, mac2;
+        int ret;
+
+        ret = wlcore_set_partition(wl, &wl->ptable[PART_TOP_PRCM_ELP_SOC]);
+        if (ret < 0)
+                goto out;
+
+        ret = wlcore_read32(wl, WL18XX_REG_FUSE_BD_ADDR_1, &mac1);
+        if (ret < 0)
+                goto out;
+
+        ret = wlcore_read32(wl, WL18XX_REG_FUSE_BD_ADDR_2, &mac2);
+        if (ret < 0)
+                goto out;
+
+        /* these are the two parts of the BD_ADDR */
+        wl->fuse_oui_addr = ((mac2 & 0xffff) << 8) +
+                ((mac1 & 0xff000000) >> 24);
+        wl->fuse_nic_addr = (mac1 & 0xffffff);
+
+        ret = wlcore_set_partition(wl, &wl->ptable[PART_DOWN]);
+
+out:
+        return ret;
+}
+
+static int wl18xx_handle_static_data(struct wl1271 *wl,
+                                     struct wl1271_static_data *static_data)
+{
+        struct wl18xx_static_data_priv *static_data_priv =
+                (struct wl18xx_static_data_priv *) static_data->priv;
+
+        wl1271_info("PHY firmware version: %s", static_data_priv->phy_version);
+
+        return 0;
+}
+
+static int wl18xx_get_spare_blocks(struct wl1271 *wl, bool is_gem)
+{
+        struct wl18xx_priv *priv = wl->priv;
+
+        /* If we have VIFs requiring extra spare, indulge them */
+        if (priv->extra_spare_vif_count)
+                return WL18XX_TX_HW_EXTRA_BLOCK_SPARE;
+
+        return WL18XX_TX_HW_BLOCK_SPARE;
+}
+
+static int wl18xx_set_key(struct wl1271 *wl, enum set_key_cmd cmd,
+                          struct ieee80211_vif *vif,
+                          struct ieee80211_sta *sta,
+                          struct ieee80211_key_conf *key_conf)
+{
+        struct wl18xx_priv *priv = wl->priv;
+        bool change_spare = false;
+        int ret;
+
+        /*
+         * when adding the first or removing the last GEM/TKIP interface,
+         * we have to adjust the number of spare blocks.
+         */
+        change_spare = (key_conf->cipher == WL1271_CIPHER_SUITE_GEM ||
+                key_conf->cipher == WLAN_CIPHER_SUITE_TKIP) &&
+                ((priv->extra_spare_vif_count == 0 && cmd == SET_KEY) ||
+                 (priv->extra_spare_vif_count == 1 && cmd == DISABLE_KEY));
+
+        /* no need to change spare - just regular set_key */
+        if (!change_spare)
+                return wlcore_set_key(wl, cmd, vif, sta, key_conf);
+
+        /*
+         * stop the queues and flush to ensure the next packets are
+         * in sync with FW spare block accounting
+         */
+        wlcore_stop_queues(wl, WLCORE_QUEUE_STOP_REASON_SPARE_BLK);
+        wl1271_tx_flush(wl);
+
+        ret = wlcore_set_key(wl, cmd, vif, sta, key_conf);
+        if (ret < 0)
+                goto out;
+
+        /* key is now set, change the spare blocks */
+        if (cmd == SET_KEY) {
+                ret = wl18xx_set_host_cfg_bitmap(wl,
+                                        WL18XX_TX_HW_EXTRA_BLOCK_SPARE);
+                if (ret < 0)
+                        goto out;
+
+                priv->extra_spare_vif_count++;
+        } else {
+                ret = wl18xx_set_host_cfg_bitmap(wl,
+                                        WL18XX_TX_HW_BLOCK_SPARE);
+                if (ret < 0)
+                        goto out;
+
+                priv->extra_spare_vif_count--;
+        }
+
+out:
+        wlcore_wake_queues(wl, WLCORE_QUEUE_STOP_REASON_SPARE_BLK);
+        return ret;
+}
+
+static u32 wl18xx_pre_pkt_send(struct wl1271 *wl,
+                               u32 buf_offset, u32 last_len)
+{
+        if (wl->quirks & WLCORE_QUIRK_TX_PAD_LAST_FRAME) {
+                struct wl1271_tx_hw_descr *last_desc;
+
+                /* get the last TX HW descriptor written to the aggr buf */
+                last_desc = (struct wl1271_tx_hw_descr *)(wl->aggr_buf +
+                                                        buf_offset - last_len);
+
+                /* the last frame is padded up to an SDIO block */
+                last_desc->wl18xx_mem.ctrl &= ~WL18XX_TX_CTRL_NOT_PADDED;
+                return ALIGN(buf_offset, WL12XX_BUS_BLOCK_SIZE);
+        }
+
+        /* no modifications */
+        return buf_offset;
+}
+
+static struct wlcore_ops wl18xx_ops = {
+        .identify_chip  = wl18xx_identify_chip,
+        .boot           = wl18xx_boot,
+        .plt_init       = wl18xx_plt_init,
+        .trigger_cmd    = wl18xx_trigger_cmd,
+        .ack_event      = wl18xx_ack_event,
+        .calc_tx_blocks = wl18xx_calc_tx_blocks,
+        .set_tx_desc_blocks = wl18xx_set_tx_desc_blocks,
+        .set_tx_desc_data_len = wl18xx_set_tx_desc_data_len,
+        .get_rx_buf_align = wl18xx_get_rx_buf_align,
+        .get_rx_packet_len = wl18xx_get_rx_packet_len,
+        .tx_immediate_compl = wl18xx_tx_immediate_completion,
+        .tx_delayed_compl = NULL,
+        .hw_init        = wl18xx_hw_init,
+        .set_tx_desc_csum = wl18xx_set_tx_desc_csum,
+        .get_pg_ver     = wl18xx_get_pg_ver,
+        .set_rx_csum = wl18xx_set_rx_csum,
+        .sta_get_ap_rate_mask = wl18xx_sta_get_ap_rate_mask,
+        .ap_get_mimo_wide_rate_mask = wl18xx_ap_get_mimo_wide_rate_mask,
+        .get_mac        = wl18xx_get_mac,
+        .debugfs_init   = wl18xx_debugfs_add_files,
+        .handle_static_data     = wl18xx_handle_static_data,
+        .get_spare_blocks = wl18xx_get_spare_blocks,
+        .set_key        = wl18xx_set_key,
+        .pre_pkt_send   = wl18xx_pre_pkt_send,
+};
+
+/* HT cap appropriate for wide channels in 2Ghz */
+static struct ieee80211_sta_ht_cap wl18xx_siso40_ht_cap_2ghz = {
+        .cap = IEEE80211_HT_CAP_SGI_20 | IEEE80211_HT_CAP_SGI_40 |
+               IEEE80211_HT_CAP_SUP_WIDTH_20_40 | IEEE80211_HT_CAP_DSSSCCK40,
+        .ht_supported = true,
+        .ampdu_factor = IEEE80211_HT_MAX_AMPDU_16K,
+        .ampdu_density = IEEE80211_HT_MPDU_DENSITY_16,
+        .mcs = {
+                .rx_mask = { 0xff, 0, 0, 0, 0, 0, 0, 0, 0, 0, },
+                .rx_highest = cpu_to_le16(150),
+                .tx_params = IEEE80211_HT_MCS_TX_DEFINED,
+                },
+};
+
+/* HT cap appropriate for wide channels in 5Ghz */
+static struct ieee80211_sta_ht_cap wl18xx_siso40_ht_cap_5ghz = {
+        .cap = IEEE80211_HT_CAP_SGI_20 | IEEE80211_HT_CAP_SGI_40 |
+               IEEE80211_HT_CAP_SUP_WIDTH_20_40,
+        .ht_supported = true,
+        .ampdu_factor = IEEE80211_HT_MAX_AMPDU_16K,
+        .ampdu_density = IEEE80211_HT_MPDU_DENSITY_16,
+        .mcs = {
+                .rx_mask = { 0xff, 0, 0, 0, 0, 0, 0, 0, 0, 0, },
+                .rx_highest = cpu_to_le16(150),
+                .tx_params = IEEE80211_HT_MCS_TX_DEFINED,
+                },
+};
+
+/* HT cap appropriate for SISO 20 */
+static struct ieee80211_sta_ht_cap wl18xx_siso20_ht_cap = {
+        .cap = IEEE80211_HT_CAP_SGI_20,
+        .ht_supported = true,
+        .ampdu_factor = IEEE80211_HT_MAX_AMPDU_16K,
+        .ampdu_density = IEEE80211_HT_MPDU_DENSITY_16,
+        .mcs = {
+                .rx_mask = { 0xff, 0, 0, 0, 0, 0, 0, 0, 0, 0, },
+                .rx_highest = cpu_to_le16(72),
+                .tx_params = IEEE80211_HT_MCS_TX_DEFINED,
+                },
+};
+
+/* HT cap appropriate for MIMO rates in 20mhz channel */
+static struct ieee80211_sta_ht_cap wl18xx_mimo_ht_cap_2ghz = {
+        .cap = IEEE80211_HT_CAP_SGI_20,
+        .ht_supported = true,
+        .ampdu_factor = IEEE80211_HT_MAX_AMPDU_16K,
+        .ampdu_density = IEEE80211_HT_MPDU_DENSITY_16,
+        .mcs = {
+                .rx_mask = { 0xff, 0xff, 0, 0, 0, 0, 0, 0, 0, 0, },
+                .rx_highest = cpu_to_le16(144),
+                .tx_params = IEEE80211_HT_MCS_TX_DEFINED,
+                },
+};
+
+static int __devinit wl18xx_probe(struct platform_device *pdev)
+{
+        struct wl1271 *wl;
+        struct ieee80211_hw *hw;
+        struct wl18xx_priv *priv;
+        int ret;
+
+        hw = wlcore_alloc_hw(sizeof(*priv));
+        if (IS_ERR(hw)) {
+                wl1271_error("can't allocate hw");
+                ret = PTR_ERR(hw);
+                goto out;
+        }
+
+        wl = hw->priv;
+        priv = wl->priv;
+        wl->ops = &wl18xx_ops;
+        wl->ptable = wl18xx_ptable;
+        wl->rtable = wl18xx_rtable;
+        wl->num_tx_desc = 32;
+        wl->num_rx_desc = 32;
+        wl->band_rate_to_idx = wl18xx_band_rate_to_idx;
+        wl->hw_tx_rate_tbl_size = WL18XX_CONF_HW_RXTX_RATE_MAX;
+        wl->hw_min_ht_rate = WL18XX_CONF_HW_RXTX_RATE_MCS0;
+        wl->fw_status_priv_len = sizeof(struct wl18xx_fw_status_priv);
+        wl->stats.fw_stats_len = sizeof(struct wl18xx_acx_statistics);
+        wl->static_data_priv_len = sizeof(struct wl18xx_static_data_priv);
+
+        if (num_rx_desc_param != -1)
+                wl->num_rx_desc = num_rx_desc_param;
+
+        ret = wl18xx_conf_init(wl, &pdev->dev);
+        if (ret < 0)
+                goto out_free;
+
+        if (!strcmp(board_type_param, "fpga")) {
+                priv->conf.phy.board_type = BOARD_TYPE_FPGA_18XX;
+        } else if (!strcmp(board_type_param, "hdk")) {
+                priv->conf.phy.board_type = BOARD_TYPE_HDK_18XX;
+                /* HACK! Just for now we hardcode HDK to 0x06 */
+                priv->conf.phy.low_band_component_type = 0x06;
+        } else if (!strcmp(board_type_param, "dvp")) {
+                priv->conf.phy.board_type = BOARD_TYPE_DVP_18XX;
+        } else if (!strcmp(board_type_param, "evb")) {
+                priv->conf.phy.board_type = BOARD_TYPE_EVB_18XX;
+        } else if (!strcmp(board_type_param, "com8")) {
+                priv->conf.phy.board_type = BOARD_TYPE_COM8_18XX;
+                /* HACK! Just for now we hardcode COM8 to 0x06 */
+                priv->conf.phy.low_band_component_type = 0x06;
+        } else {
+                wl1271_error("invalid board type '%s'", board_type_param);
+                ret = -EINVAL;
+                goto out_free;
+        }
+
+        /* If the module param is set, update it in conf */
+        if (low_band_component_param != -1)
+                priv->conf.phy.low_band_component = low_band_component_param;
+        if (low_band_component_type_param != -1)
+                priv->conf.phy.low_band_component_type =
+                        low_band_component_type_param;
+        if (high_band_component_param != -1)
+                priv->conf.phy.high_band_component = high_band_component_param;
+        if (high_band_component_type_param != -1)
+                priv->conf.phy.high_band_component_type =
+                        high_band_component_type_param;
+        if (pwr_limit_reference_11_abg_param != -1)
+                priv->conf.phy.pwr_limit_reference_11_abg =
+                        pwr_limit_reference_11_abg_param;
+        if (n_antennas_2_param != -1)
+                priv->conf.phy.number_of_assembled_ant2_4 = n_antennas_2_param;
+        if (n_antennas_5_param != -1)
+                priv->conf.phy.number_of_assembled_ant5 = n_antennas_5_param;
+        if (dc2dc_param != -1)
+                priv->conf.phy.external_pa_dc2dc = dc2dc_param;
+
+        if (!strcmp(ht_mode_param, "default")) {
+                /*
+                 * Only support mimo with multiple antennas. Fall back to
+                 * siso20.
+                 */
+                if (priv->conf.phy.number_of_assembled_ant2_4 >= 2)
+                        wlcore_set_ht_cap(wl, IEEE80211_BAND_2GHZ,
+                                          &wl18xx_mimo_ht_cap_2ghz);
+                else
+                        wlcore_set_ht_cap(wl, IEEE80211_BAND_2GHZ,
+                                          &wl18xx_siso20_ht_cap);
+
+                /* 5Ghz is always wide */
+                wlcore_set_ht_cap(wl, IEEE80211_BAND_5GHZ,
+                                  &wl18xx_siso40_ht_cap_5ghz);
+        } else if (!strcmp(ht_mode_param, "wide")) {
+                wlcore_set_ht_cap(wl, IEEE80211_BAND_2GHZ,
+                                  &wl18xx_siso40_ht_cap_2ghz);
+                wlcore_set_ht_cap(wl, IEEE80211_BAND_5GHZ,
+                                  &wl18xx_siso40_ht_cap_5ghz);
+        } else if (!strcmp(ht_mode_param, "siso20")) {
+                wlcore_set_ht_cap(wl, IEEE80211_BAND_2GHZ,
+                                  &wl18xx_siso20_ht_cap);
+                wlcore_set_ht_cap(wl, IEEE80211_BAND_5GHZ,
+                                  &wl18xx_siso20_ht_cap);
+        } else {
+                wl1271_error("invalid ht_mode '%s'", ht_mode_param);
+                ret = -EINVAL;
+                goto out_free;
+        }
+
+        if (!checksum_param) {
+                wl18xx_ops.set_rx_csum = NULL;
+                wl18xx_ops.init_vif = NULL;
+        }
+
+        wl->enable_11a = enable_11a_param;
+
+        return wlcore_probe(wl, pdev);
+
+out_free:
+        wlcore_free_hw(wl);
+out:
+        return ret;
+}
+
+static const struct platform_device_id wl18xx_id_table[] __devinitconst = {
+        { "wl18xx", 0 },
+        {  } /* Terminating Entry */
+};
+MODULE_DEVICE_TABLE(platform, wl18xx_id_table);
+
+static struct platform_driver wl18xx_driver = {
+        .probe          = wl18xx_probe,
+        .remove         = __devexit_p(wlcore_remove),
+        .id_table       = wl18xx_id_table,
+        .driver = {
+                .name   = "wl18xx_driver",
+                .owner  = THIS_MODULE,
+        }
+};
+
+static int __init wl18xx_init(void)
+{
+        return platform_driver_register(&wl18xx_driver);
+}
+module_init(wl18xx_init);
+
+static void __exit wl18xx_exit(void)
+{
+        platform_driver_unregister(&wl18xx_driver);
+}
+module_exit(wl18xx_exit);
+
+module_param_named(ht_mode, ht_mode_param, charp, S_IRUSR);
+MODULE_PARM_DESC(ht_mode, "Force HT mode: wide or siso20");
+
+module_param_named(board_type, board_type_param, charp, S_IRUSR);
+MODULE_PARM_DESC(board_type, "Board type: fpga, hdk (default), evb, com8 or "
+                 "dvp");
+
+module_param_named(checksum, checksum_param, bool, S_IRUSR);
+MODULE_PARM_DESC(checksum, "Enable TCP checksum: boolean (defaults to false)");
+
+module_param_named(enable_11a, enable_11a_param, bool, S_IRUSR);
+MODULE_PARM_DESC(enable_11a, "Enable 11a (5GHz): boolean (defaults to true)");
+
+module_param_named(dc2dc, dc2dc_param, int, S_IRUSR);
+MODULE_PARM_DESC(dc2dc, "External DC2DC: u8 (defaults to 0)");
+
+module_param_named(n_antennas_2, n_antennas_2_param, int, S_IRUSR);
+MODULE_PARM_DESC(n_antennas_2,
+                 "Number of installed 2.4GHz antennas: 1 (default) or 2");
+
+module_param_named(n_antennas_5, n_antennas_5_param, int, S_IRUSR);
+MODULE_PARM_DESC(n_antennas_5,
+                 "Number of installed 5GHz antennas: 1 (default) or 2");
+
+module_param_named(low_band_component, low_band_component_param, int,
+                   S_IRUSR);
+MODULE_PARM_DESC(low_band_component, "Low band component: u8 "
+                 "(default is 0x01)");
+
+module_param_named(low_band_component_type, low_band_component_type_param,
+                   int, S_IRUSR);
+MODULE_PARM_DESC(low_band_component_type, "Low band component type: u8 "
+                 "(default is 0x05 or 0x06 depending on the board_type)");
+
+module_param_named(high_band_component, high_band_component_param, int,
+                   S_IRUSR);
+MODULE_PARM_DESC(high_band_component, "High band component: u8, "
+                 "(default is 0x01)");
+
+module_param_named(high_band_component_type, high_band_component_type_param,
+                   int, S_IRUSR);
+MODULE_PARM_DESC(high_band_component_type, "High band component type: u8 "
+                 "(default is 0x09)");
+
+module_param_named(pwr_limit_reference_11_abg,
+                   pwr_limit_reference_11_abg_param, int, S_IRUSR);
+MODULE_PARM_DESC(pwr_limit_reference_11_abg, "Power limit reference: u8 "
+                 "(default is 0xc8)");
+
+module_param_named(num_rx_desc,
+                   num_rx_desc_param, int, S_IRUSR);
+MODULE_PARM_DESC(num_rx_desc_param,
+                 "Number of Rx descriptors: u8 (default is 32)");
+
+MODULE_LICENSE("GPL v2");
+MODULE_AUTHOR("Luciano Coelho <coelho@ti.com>");
+MODULE_FIRMWARE(WL18XX_FW_NAME);
diff --git a/drivers/net/wireless/ti/wl18xx/reg.h b/drivers/net/wireless/ti/wl18xx/reg.h
new file mode 100644
index 00000000000..937b71d8783
--- /dev/null
+++ b/drivers/net/wireless/ti/wl18xx/reg.h
@@ -0,0 +1,191 @@
+/*
+ * This file is part of wlcore
+ *
+ * Copyright (C) 2011 Texas Instruments Inc.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ *
+ */
+
+#ifndef __REG_H__
+#define __REG_H__
+
+#define WL18XX_REGISTERS_BASE      0x00800000
+#define WL18XX_CODE_BASE           0x00000000
+#define WL18XX_DATA_BASE           0x00400000
+#define WL18XX_DOUBLE_BUFFER_BASE  0x00600000
+#define WL18XX_MCU_KEY_SEARCH_BASE 0x00700000
+#define WL18XX_PHY_BASE            0x00900000
+#define WL18XX_TOP_OCP_BASE        0x00A00000
+#define WL18XX_PACKET_RAM_BASE     0x00B00000
+#define WL18XX_HOST_BASE           0x00C00000
+
+#define WL18XX_REGISTERS_DOWN_SIZE 0x0000B000
+
+#define WL18XX_REG_BOOT_PART_START 0x00802000
+#define WL18XX_REG_BOOT_PART_SIZE  0x00014578
+
+#define WL18XX_PHY_INIT_MEM_ADDR   0x80926000
+
+#define WL18XX_SDIO_WSPI_BASE           (WL18XX_REGISTERS_BASE)
+#define WL18XX_REG_CONFIG_BASE          (WL18XX_REGISTERS_BASE + 0x02000)
+#define WL18XX_WGCM_REGS_BASE           (WL18XX_REGISTERS_BASE + 0x03000)
+#define WL18XX_ENC_BASE                 (WL18XX_REGISTERS_BASE + 0x04000)
+#define WL18XX_INTERRUPT_BASE           (WL18XX_REGISTERS_BASE + 0x05000)
+#define WL18XX_UART_BASE                (WL18XX_REGISTERS_BASE + 0x06000)
+#define WL18XX_WELP_BASE                (WL18XX_REGISTERS_BASE + 0x07000)
+#define WL18XX_TCP_CKSM_BASE            (WL18XX_REGISTERS_BASE + 0x08000)
+#define WL18XX_FIFO_BASE                (WL18XX_REGISTERS_BASE + 0x09000)
+#define WL18XX_OCP_BRIDGE_BASE          (WL18XX_REGISTERS_BASE + 0x0A000)
+#define WL18XX_PMAC_RX_BASE             (WL18XX_REGISTERS_BASE + 0x14800)
+#define WL18XX_PMAC_ACM_BASE            (WL18XX_REGISTERS_BASE + 0x14C00)
+#define WL18XX_PMAC_TX_BASE             (WL18XX_REGISTERS_BASE + 0x15000)
+#define WL18XX_PMAC_CSR_BASE            (WL18XX_REGISTERS_BASE + 0x15400)
+
+#define WL18XX_REG_ECPU_CONTROL         (WL18XX_REGISTERS_BASE + 0x02004)
+#define WL18XX_REG_INTERRUPT_NO_CLEAR   (WL18XX_REGISTERS_BASE + 0x050E8)
+#define WL18XX_REG_INTERRUPT_ACK        (WL18XX_REGISTERS_BASE + 0x050F0)
+#define WL18XX_REG_INTERRUPT_TRIG       (WL18XX_REGISTERS_BASE + 0x5074)
+#define WL18XX_REG_INTERRUPT_TRIG_H     (WL18XX_REGISTERS_BASE + 0x5078)
+#define WL18XX_REG_INTERRUPT_MASK       (WL18XX_REGISTERS_BASE + 0x0050DC)
+
+#define WL18XX_REG_CHIP_ID_B            (WL18XX_REGISTERS_BASE + 0x01542C)
+
+#define WL18XX_SLV_MEM_DATA             (WL18XX_HOST_BASE + 0x0018)
+#define WL18XX_SLV_REG_DATA             (WL18XX_HOST_BASE + 0x0008)
+
+/* Scratch Pad registers*/
+#define WL18XX_SCR_PAD0                 (WL18XX_REGISTERS_BASE + 0x0154EC)
+#define WL18XX_SCR_PAD1                 (WL18XX_REGISTERS_BASE + 0x0154F0)
+#define WL18XX_SCR_PAD2                 (WL18XX_REGISTERS_BASE + 0x0154F4)
+#define WL18XX_SCR_PAD3                 (WL18XX_REGISTERS_BASE + 0x0154F8)
+#define WL18XX_SCR_PAD4                 (WL18XX_REGISTERS_BASE + 0x0154FC)
+#define WL18XX_SCR_PAD4_SET             (WL18XX_REGISTERS_BASE + 0x015504)
+#define WL18XX_SCR_PAD4_CLR             (WL18XX_REGISTERS_BASE + 0x015500)
+#define WL18XX_SCR_PAD5                 (WL18XX_REGISTERS_BASE + 0x015508)
+#define WL18XX_SCR_PAD5_SET             (WL18XX_REGISTERS_BASE + 0x015510)
+#define WL18XX_SCR_PAD5_CLR             (WL18XX_REGISTERS_BASE + 0x01550C)
+#define WL18XX_SCR_PAD6                 (WL18XX_REGISTERS_BASE + 0x015514)
+#define WL18XX_SCR_PAD7                 (WL18XX_REGISTERS_BASE + 0x015518)
+#define WL18XX_SCR_PAD8                 (WL18XX_REGISTERS_BASE + 0x01551C)
+#define WL18XX_SCR_PAD9                 (WL18XX_REGISTERS_BASE + 0x015520)
+
+/* Spare registers*/
+#define WL18XX_SPARE_A1                 (WL18XX_REGISTERS_BASE + 0x002194)
+#define WL18XX_SPARE_A2                 (WL18XX_REGISTERS_BASE + 0x002198)
+#define WL18XX_SPARE_A3                 (WL18XX_REGISTERS_BASE + 0x00219C)
+#define WL18XX_SPARE_A4                 (WL18XX_REGISTERS_BASE + 0x0021A0)
+#define WL18XX_SPARE_A5                 (WL18XX_REGISTERS_BASE + 0x0021A4)
+#define WL18XX_SPARE_A6                 (WL18XX_REGISTERS_BASE + 0x0021A8)
+#define WL18XX_SPARE_A7                 (WL18XX_REGISTERS_BASE + 0x0021AC)
+#define WL18XX_SPARE_A8                 (WL18XX_REGISTERS_BASE + 0x0021B0)
+#define WL18XX_SPARE_B1                 (WL18XX_REGISTERS_BASE + 0x015524)
+#define WL18XX_SPARE_B2                 (WL18XX_REGISTERS_BASE + 0x015528)
+#define WL18XX_SPARE_B3                 (WL18XX_REGISTERS_BASE + 0x01552C)
+#define WL18XX_SPARE_B4                 (WL18XX_REGISTERS_BASE + 0x015530)
+#define WL18XX_SPARE_B5                 (WL18XX_REGISTERS_BASE + 0x015534)
+#define WL18XX_SPARE_B6                 (WL18XX_REGISTERS_BASE + 0x015538)
+#define WL18XX_SPARE_B7                 (WL18XX_REGISTERS_BASE + 0x01553C)
+#define WL18XX_SPARE_B8                 (WL18XX_REGISTERS_BASE + 0x015540)
+
+#define WL18XX_REG_COMMAND_MAILBOX_PTR  (WL18XX_SCR_PAD0)
+#define WL18XX_REG_EVENT_MAILBOX_PTR    (WL18XX_SCR_PAD1)
+#define WL18XX_EEPROMLESS_IND           (WL18XX_SCR_PAD4)
+
+#define WL18XX_WELP_ARM_COMMAND         (WL18XX_REGISTERS_BASE + 0x7100)
+#define WL18XX_ENABLE                   (WL18XX_REGISTERS_BASE + 0x01543C)
+
+/* PRCM registers */
+#define PLATFORM_DETECTION              0xA0E3E0
+#define OCS_EN                          0xA02080
+#define PRIMARY_CLK_DETECT              0xA020A6
+#define PLLSH_WCS_PLL_N                 0xA02362
+#define PLLSH_WCS_PLL_M                 0xA02360
+#define PLLSH_WCS_PLL_Q_FACTOR_CFG_1    0xA02364
+#define PLLSH_WCS_PLL_Q_FACTOR_CFG_2    0xA02366
+#define PLLSH_WCS_PLL_P_FACTOR_CFG_1    0xA02368
+#define PLLSH_WCS_PLL_P_FACTOR_CFG_2    0xA0236A
+#define PLLSH_WCS_PLL_SWALLOW_EN        0xA0236C
+#define PLLSH_WL_PLL_EN                 0xA02392
+
+#define PLLSH_WCS_PLL_Q_FACTOR_CFG_1_MASK       0xFFFF
+#define PLLSH_WCS_PLL_Q_FACTOR_CFG_2_MASK       0x007F
+#define PLLSH_WCS_PLL_P_FACTOR_CFG_1_MASK       0xFFFF
+#define PLLSH_WCS_PLL_P_FACTOR_CFG_2_MASK       0x000F
+
+#define PLLSH_WCS_PLL_SWALLOW_EN_VAL1   0x1
+#define PLLSH_WCS_PLL_SWALLOW_EN_VAL2   0x12
+
+#define WL18XX_REG_FUSE_DATA_1_3        0xA0260C
+#define WL18XX_PG_VER_MASK              0x70
+#define WL18XX_PG_VER_OFFSET            4
+
+#define WL18XX_REG_FUSE_BD_ADDR_1       0xA02602
+#define WL18XX_REG_FUSE_BD_ADDR_2       0xA02606
+
+#define WL18XX_CMD_MBOX_ADDRESS         0xB007B4
+
+#define WL18XX_FW_STATUS_ADDR           0x50F8
+
+#define CHIP_ID_185x_PG10              (0x06030101)
+#define CHIP_ID_185x_PG20              (0x06030111)
+
+/*
+ * Host Command Interrupt. Setting this bit masks
+ * the interrupt that the host issues to inform
+ * the FW that it has sent a command
+ * to the Wlan hardware Command Mailbox.
+ */
+#define WL18XX_INTR_TRIG_CMD       BIT(28)
+
+/*
+ * Host Event Acknowlegde Interrupt. The host
+ * sets this bit to acknowledge that it received
+ * the unsolicited information from the event
+ * mailbox.
+ */
+#define WL18XX_INTR_TRIG_EVENT_ACK BIT(29)
+
+/*
+ * To boot the firmware in PLT mode we need to write this value in
+ * SCR_PAD8 before starting.
+ */
+#define WL18XX_SCR_PAD8_PLT     0xBABABEBE
+
+enum {
+        COMPONENT_NO_SWITCH     = 0x0,
+        COMPONENT_2_WAY_SWITCH  = 0x1,
+        COMPONENT_3_WAY_SWITCH  = 0x2,
+        COMPONENT_MATCHING      = 0x3,
+};
+
+enum {
+        FEM_NONE        = 0x0,
+        FEM_VENDOR_1    = 0x1,
+        FEM_VENDOR_2    = 0x2,
+        FEM_VENDOR_3    = 0x3,
+};
+
+enum {
+        BOARD_TYPE_EVB_18XX     = 0,
+        BOARD_TYPE_DVP_18XX     = 1,
+        BOARD_TYPE_HDK_18XX     = 2,
+        BOARD_TYPE_FPGA_18XX    = 3,
+        BOARD_TYPE_COM8_18XX    = 4,
+
+        NUM_BOARD_TYPES,
+};
+
+#endif /* __REG_H__ */
diff --git a/drivers/net/wireless/ti/wl18xx/tx.c b/drivers/net/wireless/ti/wl18xx/tx.c
new file mode 100644
index 00000000000..5b1fb10d9fd
--- /dev/null
+++ b/drivers/net/wireless/ti/wl18xx/tx.c
@@ -0,0 +1,127 @@
+/*
+ * This file is part of wl18xx
+ *
+ * Copyright (C) 2011 Texas Instruments Inc.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ *
+ */
+
+#include "../wlcore/wlcore.h"
+#include "../wlcore/cmd.h"
+#include "../wlcore/debug.h"
+#include "../wlcore/acx.h"
+#include "../wlcore/tx.h"
+
+#include "wl18xx.h"
+#include "tx.h"
+
+static void wl18xx_tx_complete_packet(struct wl1271 *wl, u8 tx_stat_byte)
+{
+        struct ieee80211_tx_info *info;
+        struct sk_buff *skb;
+        int id = tx_stat_byte & WL18XX_TX_STATUS_DESC_ID_MASK;
+        bool tx_success;
+
+        /* check for id legality */
+        if (unlikely(id >= wl->num_tx_desc || wl->tx_frames[id] == NULL)) {
+                wl1271_warning("illegal id in tx completion: %d", id);
+                return;
+        }
+
+        /* a zero bit indicates Tx success */
+        tx_success = !(tx_stat_byte & BIT(WL18XX_TX_STATUS_STAT_BIT_IDX));
+
+
+        skb = wl->tx_frames[id];
+        info = IEEE80211_SKB_CB(skb);
+
+        if (wl12xx_is_dummy_packet(wl, skb)) {
+                wl1271_free_tx_id(wl, id);
+                return;
+        }
+
+        /* update the TX status info */
+        if (tx_success && !(info->flags & IEEE80211_TX_CTL_NO_ACK))
+                info->flags |= IEEE80211_TX_STAT_ACK;
+
+        /* no real data about Tx completion */
+        info->status.rates[0].idx = -1;
+        info->status.rates[0].count = 0;
+        info->status.rates[0].flags = 0;
+        info->status.ack_signal = -1;
+
+        if (!tx_success)
+                wl->stats.retry_count++;
+
+        /*
+         * TODO: update sequence number for encryption? seems to be
+         * unsupported for now. needed for recovery with encryption.
+         */
+
+        /* remove private header from packet */
+        skb_pull(skb, sizeof(struct wl1271_tx_hw_descr));
+
+        /* remove TKIP header space if present */
+        if ((wl->quirks & WLCORE_QUIRK_TKIP_HEADER_SPACE) &&
+            info->control.hw_key &&
+            info->control.hw_key->cipher == WLAN_CIPHER_SUITE_TKIP) {
+                int hdrlen = ieee80211_get_hdrlen_from_skb(skb);
+                memmove(skb->data + WL1271_EXTRA_SPACE_TKIP, skb->data, hdrlen);
+                skb_pull(skb, WL1271_EXTRA_SPACE_TKIP);
+        }
+
+        wl1271_debug(DEBUG_TX, "tx status id %u skb 0x%p success %d",
+                     id, skb, tx_success);
+
+        /* return the packet to the stack */
+        skb_queue_tail(&wl->deferred_tx_queue, skb);
+        queue_work(wl->freezable_wq, &wl->netstack_work);
+        wl1271_free_tx_id(wl, id);
+}
+
+void wl18xx_tx_immediate_complete(struct wl1271 *wl)
+{
+        struct wl18xx_fw_status_priv *status_priv =
+                (struct wl18xx_fw_status_priv *)wl->fw_status_2->priv;
+        struct wl18xx_priv *priv = wl->priv;
+        u8 i;
+
+        /* nothing to do here */
+        if (priv->last_fw_rls_idx == status_priv->fw_release_idx)
+                return;
+
+        /* freed Tx descriptors */
+        wl1271_debug(DEBUG_TX, "last released desc = %d, current idx = %d",
+                     priv->last_fw_rls_idx, status_priv->fw_release_idx);
+
+        if (status_priv->fw_release_idx >= WL18XX_FW_MAX_TX_STATUS_DESC) {
+                wl1271_error("invalid desc release index %d",
+                             status_priv->fw_release_idx);
+                WARN_ON(1);
+                return;
+        }
+
+        for (i = priv->last_fw_rls_idx;
+             i != status_priv->fw_release_idx;
+             i = (i + 1) % WL18XX_FW_MAX_TX_STATUS_DESC) {
+                wl18xx_tx_complete_packet(wl,
+                        status_priv->released_tx_desc[i]);
+
+                wl->tx_results_count++;
+        }
+
+        priv->last_fw_rls_idx = status_priv->fw_release_idx;
+}
diff --git a/drivers/net/wireless/ti/wl18xx/tx.h b/drivers/net/wireless/ti/wl18xx/tx.h
new file mode 100644
index 00000000000..ccddc548e44
--- /dev/null
+++ b/drivers/net/wireless/ti/wl18xx/tx.h
@@ -0,0 +1,46 @@
+/*
+ * This file is part of wl18xx
+ *
+ * Copyright (C) 2011 Texas Instruments. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ *
+ */
+
+#ifndef __WL18XX_TX_H__
+#define __WL18XX_TX_H__
+
+#include "../wlcore/wlcore.h"
+
+#define WL18XX_TX_HW_BLOCK_SPARE        1
+/* for special cases - namely, TKIP and GEM */
+#define WL18XX_TX_HW_EXTRA_BLOCK_SPARE  2
+#define WL18XX_TX_HW_BLOCK_SIZE         268
+
+#define WL18XX_TX_STATUS_DESC_ID_MASK    0x7F
+#define WL18XX_TX_STATUS_STAT_BIT_IDX    7
+
+/* Indicates this TX HW frame is not padded to SDIO block size */
+#define WL18XX_TX_CTRL_NOT_PADDED       BIT(7)
+
+/*
+ * The FW uses a special bit to indicate a wide channel should be used in
+ * the rate policy.
+ */
+#define CONF_TX_RATE_USE_WIDE_CHAN BIT(31)
+
+void wl18xx_tx_immediate_complete(struct wl1271 *wl);
+
+#endif /* __WL12XX_TX_H__ */
diff --git a/drivers/net/wireless/ti/wl18xx/wl18xx.h b/drivers/net/wireless/ti/wl18xx/wl18xx.h
new file mode 100644
index 00000000000..bc67a475061
--- /dev/null
+++ b/drivers/net/wireless/ti/wl18xx/wl18xx.h
@@ -0,0 +1,88 @@
+/*
+ * This file is part of wl18xx
+ *
+ * Copyright (C) 2011 Texas Instruments Inc.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ *
+ */
+
+#ifndef __WL18XX_PRIV_H__
+#define __WL18XX_PRIV_H__
+
+#include "conf.h"
+
+#define WL18XX_CMD_MAX_SIZE          740
+
+struct wl18xx_priv {
+        /* buffer for sending commands to FW */
+        u8 cmd_buf[WL18XX_CMD_MAX_SIZE];
+
+        struct wl18xx_priv_conf conf;
+
+        /* Index of last released Tx desc in FW */
+        u8 last_fw_rls_idx;
+
+        /* number of VIFs requiring extra spare mem-blocks */
+        int extra_spare_vif_count;
+};
+
+#define WL18XX_FW_MAX_TX_STATUS_DESC 33
+
+struct wl18xx_fw_status_priv {
+        /*
+         * Index in released_tx_desc for first byte that holds
+         * released tx host desc
+         */
+        u8 fw_release_idx;
+
+        /*
+         * Array of host Tx descriptors, where fw_release_idx
+         * indicated the first released idx.
+         */
+        u8 released_tx_desc[WL18XX_FW_MAX_TX_STATUS_DESC];
+
+        u8 padding[2];
+};
+
+#define WL18XX_PHY_VERSION_MAX_LEN 20
+
+struct wl18xx_static_data_priv {
+        char phy_version[WL18XX_PHY_VERSION_MAX_LEN];
+};
+
+struct wl18xx_clk_cfg {
+        u32 n;
+        u32 m;
+        u32 p;
+        u32 q;
+        bool swallow;
+};
+
+enum {
+        CLOCK_CONFIG_16_2_M     = 1,
+        CLOCK_CONFIG_16_368_M,
+        CLOCK_CONFIG_16_8_M,
+        CLOCK_CONFIG_19_2_M,
+        CLOCK_CONFIG_26_M,
+        CLOCK_CONFIG_32_736_M,
+        CLOCK_CONFIG_33_6_M,
+        CLOCK_CONFIG_38_468_M,
+        CLOCK_CONFIG_52_M,
+
+        NUM_CLOCK_CONFIGS,
+};
+
+#endif /* __WL18XX_PRIV_H__ */
diff --git a/drivers/net/wireless/ti/wlcore/acx.c b/drivers/net/wireless/ti/wlcore/acx.c
index f3d6fa50826..ce108a736bd 100644
--- a/drivers/net/wireless/ti/wlcore/acx.c
+++ b/drivers/net/wireless/ti/wlcore/acx.c
@@ -70,7 +70,7 @@ int wl1271_acx_sleep_auth(struct wl1271 *wl, u8 sleep_auth)
         struct acx_sleep_auth *auth;
         int ret;
 
-        wl1271_debug(DEBUG_ACX, "acx sleep auth");
+        wl1271_debug(DEBUG_ACX, "acx sleep auth %d", sleep_auth);
 
         auth = kzalloc(sizeof(*auth), GFP_KERNEL);
         if (!auth) {
@@ -81,11 +81,18 @@ int wl1271_acx_sleep_auth(struct wl1271 *wl, u8 sleep_auth)
         auth->sleep_auth = sleep_auth;
 
         ret = wl1271_cmd_configure(wl, ACX_SLEEP_AUTH, auth, sizeof(*auth));
+        if (ret < 0) {
+                wl1271_error("could not configure sleep_auth to %d: %d",
+                             sleep_auth, ret);
+                goto out;
+        }
 
+        wl->sleep_auth = sleep_auth;
 out:
         kfree(auth);
         return ret;
 }
+EXPORT_SYMBOL_GPL(wl1271_acx_sleep_auth);
 
 int wl1271_acx_tx_power(struct wl1271 *wl, struct wl12xx_vif *wlvif,
                         int power)
@@ -708,14 +715,14 @@ out:
         return ret;
 }
 
-int wl1271_acx_statistics(struct wl1271 *wl, struct acx_statistics *stats)
+int wl1271_acx_statistics(struct wl1271 *wl, void *stats)
 {
         int ret;
 
         wl1271_debug(DEBUG_ACX, "acx statistics");
 
         ret = wl1271_cmd_interrogate(wl, ACX_STATISTICS, stats,
-                                     sizeof(*stats));
+                                     wl->stats.fw_stats_len);
         if (ret < 0) {
                 wl1271_warning("acx statistics failed: %d", ret);
                 return -ENOMEM;
@@ -997,6 +1004,7 @@ out:
         kfree(mem_conf);
         return ret;
 }
+EXPORT_SYMBOL_GPL(wl12xx_acx_mem_cfg);
 
 int wl1271_acx_init_mem_config(struct wl1271 *wl)
 {
@@ -1027,6 +1035,7 @@ int wl1271_acx_init_mem_config(struct wl1271 *wl)
 
         return 0;
 }
+EXPORT_SYMBOL_GPL(wl1271_acx_init_mem_config);
 
 int wl1271_acx_init_rx_interrupt(struct wl1271 *wl)
 {
@@ -1150,6 +1159,7 @@ out:
         kfree(acx);
         return ret;
 }
+EXPORT_SYMBOL_GPL(wl1271_acx_pm_config);
 
 int wl1271_acx_keep_alive_mode(struct wl1271 *wl, struct wl12xx_vif *wlvif,
                                bool enable)
diff --git a/drivers/net/wireless/ti/wlcore/acx.h b/drivers/net/wireless/ti/wlcore/acx.h
index e6a74869a5f..d03215d6b3b 100644
--- a/drivers/net/wireless/ti/wlcore/acx.h
+++ b/drivers/net/wireless/ti/wlcore/acx.h
@@ -51,21 +51,18 @@
 #define WL1271_ACX_INTR_TRACE_A            BIT(7)
 /* Trace message on MBOX #B */
 #define WL1271_ACX_INTR_TRACE_B            BIT(8)
+/* SW FW Initiated interrupt Watchdog timer expiration */
+#define WL1271_ACX_SW_INTR_WATCHDOG        BIT(9)
 
-#define WL1271_ACX_INTR_ALL                0xFFFFFFFF
-#define WL1271_ACX_ALL_EVENTS_VECTOR       (WL1271_ACX_INTR_WATCHDOG      | \
-                                            WL1271_ACX_INTR_INIT_COMPLETE | \
-                                            WL1271_ACX_INTR_EVENT_A       | \
-                                            WL1271_ACX_INTR_EVENT_B       | \
-                                            WL1271_ACX_INTR_CMD_COMPLETE  | \
-                                            WL1271_ACX_INTR_HW_AVAILABLE  | \
-                                            WL1271_ACX_INTR_DATA)
-
-#define WL1271_INTR_MASK                   (WL1271_ACX_INTR_WATCHDOG     | \
-                                            WL1271_ACX_INTR_EVENT_A      | \
-                                            WL1271_ACX_INTR_EVENT_B      | \
-                                            WL1271_ACX_INTR_HW_AVAILABLE | \
-                                            WL1271_ACX_INTR_DATA)
+#define WL1271_ACX_INTR_ALL             0xFFFFFFFF
+
+/* all possible interrupts - only appropriate ones will be masked in */
+#define WLCORE_ALL_INTR_MASK            (WL1271_ACX_INTR_WATCHDOG     | \
+                                        WL1271_ACX_INTR_EVENT_A       | \
+                                        WL1271_ACX_INTR_EVENT_B       | \
+                                        WL1271_ACX_INTR_HW_AVAILABLE  | \
+                                        WL1271_ACX_INTR_DATA          | \
+                                        WL1271_ACX_SW_INTR_WATCHDOG)
 
 /* Target's information element */
 struct acx_header {
@@ -121,6 +118,11 @@ enum wl1271_psm_mode {
 
         /* Extreme low power */
         WL1271_PSM_ELP = 2,
+
+        WL1271_PSM_MAX = WL1271_PSM_ELP,
+
+        /* illegal out of band value of PSM mode */
+        WL1271_PSM_ILLEGAL = 0xff
 };
 
 struct acx_sleep_auth {
@@ -417,228 +419,6 @@ struct acx_ctsprotect {
         u8 padding[2];
 } __packed;
 
-struct acx_tx_statistics {
-        __le32 internal_desc_overflow;
-}  __packed;
-
-struct acx_rx_statistics {
-        __le32 out_of_mem;
-        __le32 hdr_overflow;
-        __le32 hw_stuck;
-        __le32 dropped;
-        __le32 fcs_err;
-        __le32 xfr_hint_trig;
-        __le32 path_reset;
-        __le32 reset_counter;
-} __packed;
-
-struct acx_dma_statistics {
-        __le32 rx_requested;
-        __le32 rx_errors;
-        __le32 tx_requested;
-        __le32 tx_errors;
-}  __packed;
-
-struct acx_isr_statistics {
-        /* host command complete */
-        __le32 cmd_cmplt;
-
-        /* fiqisr() */
-        __le32 fiqs;
-
-        /* (INT_STS_ND & INT_TRIG_RX_HEADER) */
-        __le32 rx_headers;
-
-        /* (INT_STS_ND & INT_TRIG_RX_CMPLT) */
-        __le32 rx_completes;
-
-        /* (INT_STS_ND & INT_TRIG_NO_RX_BUF) */
-        __le32 rx_mem_overflow;
-
-        /* (INT_STS_ND & INT_TRIG_S_RX_RDY) */
-        __le32 rx_rdys;
-
-        /* irqisr() */
-        __le32 irqs;
-
-        /* (INT_STS_ND & INT_TRIG_TX_PROC) */
-        __le32 tx_procs;
-
-        /* (INT_STS_ND & INT_TRIG_DECRYPT_DONE) */
-        __le32 decrypt_done;
-
-        /* (INT_STS_ND & INT_TRIG_DMA0) */
-        __le32 dma0_done;
-
-        /* (INT_STS_ND & INT_TRIG_DMA1) */
-        __le32 dma1_done;
-
-        /* (INT_STS_ND & INT_TRIG_TX_EXC_CMPLT) */
-        __le32 tx_exch_complete;
-
-        /* (INT_STS_ND & INT_TRIG_COMMAND) */
-        __le32 commands;
-
-        /* (INT_STS_ND & INT_TRIG_RX_PROC) */
-        __le32 rx_procs;
-
-        /* (INT_STS_ND & INT_TRIG_PM_802) */
-        __le32 hw_pm_mode_changes;
-
-        /* (INT_STS_ND & INT_TRIG_ACKNOWLEDGE) */
-        __le32 host_acknowledges;
-
-        /* (INT_STS_ND & INT_TRIG_PM_PCI) */
-        __le32 pci_pm;
-
-        /* (INT_STS_ND & INT_TRIG_ACM_WAKEUP) */
-        __le32 wakeups;
-
-        /* (INT_STS_ND & INT_TRIG_LOW_RSSI) */
-        __le32 low_rssi;
-} __packed;
-
-struct acx_wep_statistics {
-        /* WEP address keys configured */
-        __le32 addr_key_count;
-
-        /* default keys configured */
-        __le32 default_key_count;
-
-        __le32 reserved;
-
-        /* number of times that WEP key not found on lookup */
-        __le32 key_not_found;
-
-        /* number of times that WEP key decryption failed */
-        __le32 decrypt_fail;
-
-        /* WEP packets decrypted */
-        __le32 packets;
-
-        /* WEP decrypt interrupts */
-        __le32 interrupt;
-} __packed;
-
-#define ACX_MISSED_BEACONS_SPREAD 10
-
-struct acx_pwr_statistics {
-        /* the amount of enters into power save mode (both PD & ELP) */
-        __le32 ps_enter;
-
-        /* the amount of enters into ELP mode */
-        __le32 elp_enter;
-
-        /* the amount of missing beacon interrupts to the host */
-        __le32 missing_bcns;
-
-        /* the amount of wake on host-access times */
-        __le32 wake_on_host;
-
-        /* the amount of wake on timer-expire */
-        __le32 wake_on_timer_exp;
-
-        /* the number of packets that were transmitted with PS bit set */
-        __le32 tx_with_ps;
-
-        /* the number of packets that were transmitted with PS bit clear */
-        __le32 tx_without_ps;
-
-        /* the number of received beacons */
-        __le32 rcvd_beacons;
-
-        /* the number of entering into PowerOn (power save off) */
-        __le32 power_save_off;
-
-        /* the number of entries into power save mode */
-        __le16 enable_ps;
-
-        /*
-         * the number of exits from power save, not including failed PS
-         * transitions
-         */
-        __le16 disable_ps;
-
-        /*
-         * the number of times the TSF counter was adjusted because
-         * of drift
-         */
-        __le32 fix_tsf_ps;
-
-        /* Gives statistics about the spread continuous missed beacons.
-         * The 16 LSB are dedicated for the PS mode.
-         * The 16 MSB are dedicated for the PS mode.
-         * cont_miss_bcns_spread[0] - single missed beacon.
-         * cont_miss_bcns_spread[1] - two continuous missed beacons.
-         * cont_miss_bcns_spread[2] - three continuous missed beacons.
-         * ...
-         * cont_miss_bcns_spread[9] - ten and more continuous missed beacons.
-        */
-        __le32 cont_miss_bcns_spread[ACX_MISSED_BEACONS_SPREAD];
-
-        /* the number of beacons in awake mode */
-        __le32 rcvd_awake_beacons;
-} __packed;
-
-struct acx_mic_statistics {
-        __le32 rx_pkts;
-        __le32 calc_failure;
-} __packed;
-
-struct acx_aes_statistics {
-        __le32 encrypt_fail;
-        __le32 decrypt_fail;
-        __le32 encrypt_packets;
-        __le32 decrypt_packets;
-        __le32 encrypt_interrupt;
-        __le32 decrypt_interrupt;
-} __packed;
-
-struct acx_event_statistics {
-        __le32 heart_beat;
-        __le32 calibration;
-        __le32 rx_mismatch;
-        __le32 rx_mem_empty;
-        __le32 rx_pool;
-        __le32 oom_late;
-        __le32 phy_transmit_error;
-        __le32 tx_stuck;
-} __packed;
-
-struct acx_ps_statistics {
-        __le32 pspoll_timeouts;
-        __le32 upsd_timeouts;
-        __le32 upsd_max_sptime;
-        __le32 upsd_max_apturn;
-        __le32 pspoll_max_apturn;
-        __le32 pspoll_utilization;
-        __le32 upsd_utilization;
-} __packed;
-
-struct acx_rxpipe_statistics {
-        __le32 rx_prep_beacon_drop;
-        __le32 descr_host_int_trig_rx_data;
-        __le32 beacon_buffer_thres_host_int_trig_rx_data;
-        __le32 missed_beacon_host_int_trig_rx_data;
-        __le32 tx_xfr_host_int_trig_rx_data;
-} __packed;
-
-struct acx_statistics {
-        struct acx_header header;
-
-        struct acx_tx_statistics tx;
-        struct acx_rx_statistics rx;
-        struct acx_dma_statistics dma;
-        struct acx_isr_statistics isr;
-        struct acx_wep_statistics wep;
-        struct acx_pwr_statistics pwr;
-        struct acx_aes_statistics aes;
-        struct acx_mic_statistics mic;
-        struct acx_event_statistics event;
-        struct acx_ps_statistics ps;
-        struct acx_rxpipe_statistics rxpipe;
-} __packed;
-
 struct acx_rate_class {
         __le32 enabled_rates;
         u8 short_retry_limit;
@@ -828,6 +608,8 @@ struct wl1271_acx_keep_alive_config {
 #define HOST_IF_CFG_RX_FIFO_ENABLE     BIT(0)
 #define HOST_IF_CFG_TX_EXTRA_BLKS_SWAP BIT(1)
 #define HOST_IF_CFG_TX_PAD_TO_SDIO_BLK BIT(3)
+#define HOST_IF_CFG_RX_PAD_TO_SDIO_BLK BIT(4)
+#define HOST_IF_CFG_ADD_RX_ALIGNMENT   BIT(6)
 
 enum {
         WL1271_ACX_TRIG_TYPE_LEVEL = 0,
@@ -946,7 +728,7 @@ struct wl1271_acx_ht_information {
         u8 padding[2];
 } __packed;
 
-#define RX_BA_MAX_SESSIONS 2
+#define RX_BA_MAX_SESSIONS 3
 
 struct wl1271_acx_ba_initiator_policy {
         struct acx_header header;
@@ -1243,6 +1025,7 @@ enum {
         ACX_CONFIG_HANGOVER              = 0x0042,
         ACX_FEATURE_CFG                  = 0x0043,
         ACX_PROTECTION_CFG               = 0x0044,
+        ACX_CHECKSUM_CONFIG              = 0x0045,
 };
 
 
@@ -1281,7 +1064,7 @@ int wl1271_acx_set_preamble(struct wl1271 *wl, struct wl12xx_vif *wlvif,
                             enum acx_preamble_type preamble);
 int wl1271_acx_cts_protect(struct wl1271 *wl, struct wl12xx_vif *wlvif,
                            enum acx_ctsprotect_type ctsprotect);
-int wl1271_acx_statistics(struct wl1271 *wl, struct acx_statistics *stats);
+int wl1271_acx_statistics(struct wl1271 *wl, void *stats);
 int wl1271_acx_sta_rate_policies(struct wl1271 *wl, struct wl12xx_vif *wlvif);
 int wl1271_acx_ap_rate_policy(struct wl1271 *wl, struct conf_tx_rate_class *c,
                       u8 idx);
diff --git a/drivers/net/wireless/ti/wlcore/boot.c b/drivers/net/wireless/ti/wlcore/boot.c
index 9b98230f84c..8965960b841 100644
--- a/drivers/net/wireless/ti/wlcore/boot.c
+++ b/drivers/net/wireless/ti/wlcore/boot.c
@@ -33,22 +33,35 @@
 #include "rx.h"
 #include "hw_ops.h"
 
-static void wl1271_boot_set_ecpu_ctrl(struct wl1271 *wl, u32 flag)
+static int wl1271_boot_set_ecpu_ctrl(struct wl1271 *wl, u32 flag)
 {
         u32 cpu_ctrl;
+        int ret;
 
         /* 10.5.0 run the firmware (I) */
-        cpu_ctrl = wlcore_read_reg(wl, REG_ECPU_CONTROL);
+        ret = wlcore_read_reg(wl, REG_ECPU_CONTROL, &cpu_ctrl);
+        if (ret < 0)
+                goto out;
 
         /* 10.5.1 run the firmware (II) */
         cpu_ctrl |= flag;
-        wlcore_write_reg(wl, REG_ECPU_CONTROL, cpu_ctrl);
+        ret = wlcore_write_reg(wl, REG_ECPU_CONTROL, cpu_ctrl);
+
+out:
+        return ret;
 }
 
-static int wlcore_parse_fw_ver(struct wl1271 *wl)
+static int wlcore_boot_parse_fw_ver(struct wl1271 *wl,
+                                    struct wl1271_static_data *static_data)
 {
         int ret;
 
+        strncpy(wl->chip.fw_ver_str, static_data->fw_version,
+                sizeof(wl->chip.fw_ver_str));
+
+        /* make sure the string is NULL-terminated */
+        wl->chip.fw_ver_str[sizeof(wl->chip.fw_ver_str) - 1] = '\0';
+
         ret = sscanf(wl->chip.fw_ver_str + 4, "%u.%u.%u.%u.%u",
                      &wl->chip.fw_ver[0], &wl->chip.fw_ver[1],
                      &wl->chip.fw_ver[2], &wl->chip.fw_ver[3],
@@ -57,43 +70,45 @@ static int wlcore_parse_fw_ver(struct wl1271 *wl)
         if (ret != 5) {
                 wl1271_warning("fw version incorrect value");
                 memset(wl->chip.fw_ver, 0, sizeof(wl->chip.fw_ver));
-                return -EINVAL;
+                ret = -EINVAL;
+                goto out;
         }
 
         ret = wlcore_identify_fw(wl);
         if (ret < 0)
-                return ret;
-
-        return 0;
+                goto out;
+out:
+        return ret;
 }
 
-static int wlcore_boot_fw_version(struct wl1271 *wl)
+static int wlcore_boot_static_data(struct wl1271 *wl)
 {
         struct wl1271_static_data *static_data;
+        size_t len = sizeof(*static_data) + wl->static_data_priv_len;
         int ret;
 
-        static_data = kmalloc(sizeof(*static_data), GFP_KERNEL | GFP_DMA);
+        static_data = kmalloc(len, GFP_KERNEL);
         if (!static_data) {
-                wl1271_error("Couldn't allocate memory for static data!");
-                return -ENOMEM;
+                ret = -ENOMEM;
+                goto out;
         }
 
-        wl1271_read(wl, wl->cmd_box_addr, static_data, sizeof(*static_data),
-                    false);
-
-        strncpy(wl->chip.fw_ver_str, static_data->fw_version,
-                sizeof(wl->chip.fw_ver_str));
-
-        kfree(static_data);
+        ret = wlcore_read(wl, wl->cmd_box_addr, static_data, len, false);
+        if (ret < 0)
+                goto out_free;
 
-        /* make sure the string is NULL-terminated */
-        wl->chip.fw_ver_str[sizeof(wl->chip.fw_ver_str) - 1] = '\0';
+        ret = wlcore_boot_parse_fw_ver(wl, static_data);
+        if (ret < 0)
+                goto out_free;
 
-        ret = wlcore_parse_fw_ver(wl);
+        ret = wlcore_handle_static_data(wl, static_data);
         if (ret < 0)
-                return ret;
+                goto out_free;
 
-        return 0;
+out_free:
+        kfree(static_data);
+out:
+        return ret;
 }
 
 static int wl1271_boot_upload_firmware_chunk(struct wl1271 *wl, void *buf,
@@ -102,6 +117,7 @@ static int wl1271_boot_upload_firmware_chunk(struct wl1271 *wl, void *buf,
         struct wlcore_partition_set partition;
         int addr, chunk_num, partition_limit;
         u8 *p, *chunk;
+        int ret;
 
         /* whal_FwCtrl_LoadFwImageSm() */
 
@@ -123,7 +139,9 @@ static int wl1271_boot_upload_firmware_chunk(struct wl1271 *wl, void *buf,
 
         memcpy(&partition, &wl->ptable[PART_DOWN], sizeof(partition));
         partition.mem.start = dest;
-        wlcore_set_partition(wl, &partition);
+        ret = wlcore_set_partition(wl, &partition);
+        if (ret < 0)
+                return ret;
 
         /* 10.1 set partition limit and chunk num */
         chunk_num = 0;
@@ -137,7 +155,9 @@ static int wl1271_boot_upload_firmware_chunk(struct wl1271 *wl, void *buf,
                         partition_limit = chunk_num * CHUNK_SIZE +
                                 wl->ptable[PART_DOWN].mem.size;
                         partition.mem.start = addr;
-                        wlcore_set_partition(wl, &partition);
+                        ret = wlcore_set_partition(wl, &partition);
+                        if (ret < 0)
+                                return ret;
                 }
 
                 /* 10.3 upload the chunk */
@@ -146,7 +166,9 @@ static int wl1271_boot_upload_firmware_chunk(struct wl1271 *wl, void *buf,
                 memcpy(chunk, p, CHUNK_SIZE);
                 wl1271_debug(DEBUG_BOOT, "uploading fw chunk 0x%p to 0x%x",
                              p, addr);
-                wl1271_write(wl, addr, chunk, CHUNK_SIZE, false);
+                ret = wlcore_write(wl, addr, chunk, CHUNK_SIZE, false);
+                if (ret < 0)
+                        goto out;
 
                 chunk_num++;
         }
@@ -157,10 +179,11 @@ static int wl1271_boot_upload_firmware_chunk(struct wl1271 *wl, void *buf,
         memcpy(chunk, p, fw_data_len % CHUNK_SIZE);
         wl1271_debug(DEBUG_BOOT, "uploading fw last chunk (%zd B) 0x%p to 0x%x",
                      fw_data_len % CHUNK_SIZE, p, addr);
-        wl1271_write(wl, addr, chunk, fw_data_len % CHUNK_SIZE, false);
+        ret = wlcore_write(wl, addr, chunk, fw_data_len % CHUNK_SIZE, false);
 
+out:
         kfree(chunk);
-        return 0;
+        return ret;
 }
 
 int wlcore_boot_upload_firmware(struct wl1271 *wl)
@@ -203,9 +226,12 @@ int wlcore_boot_upload_nvs(struct wl1271 *wl)
         int i;
         u32 dest_addr, val;
         u8 *nvs_ptr, *nvs_aligned;
+        int ret;
 
-        if (wl->nvs == NULL)
+        if (wl->nvs == NULL) {
+                wl1271_error("NVS file is needed during boot");
                 return -ENODEV;
+        }
 
         if (wl->quirks & WLCORE_QUIRK_LEGACY_NVS) {
                 struct wl1271_nvs_file *nvs =
@@ -298,7 +324,9 @@ int wlcore_boot_upload_nvs(struct wl1271 *wl)
                         wl1271_debug(DEBUG_BOOT,
                                      "nvs burst write 0x%x: 0x%x",
                                      dest_addr, val);
-                        wl1271_write32(wl, dest_addr, val);
+                        ret = wlcore_write32(wl, dest_addr, val);
+                        if (ret < 0)
+                                return ret;
 
                         nvs_ptr += 4;
                         dest_addr += 4;
@@ -324,7 +352,9 @@ int wlcore_boot_upload_nvs(struct wl1271 *wl)
         nvs_len -= nvs_ptr - (u8 *)wl->nvs;
 
         /* Now we must set the partition correctly */
-        wlcore_set_partition(wl, &wl->ptable[PART_WORK]);
+        ret = wlcore_set_partition(wl, &wl->ptable[PART_WORK]);
+        if (ret < 0)
+                return ret;
 
         /* Copy the NVS tables to a new block to ensure alignment */
         nvs_aligned = kmemdup(nvs_ptr, nvs_len, GFP_KERNEL);
@@ -332,11 +362,11 @@ int wlcore_boot_upload_nvs(struct wl1271 *wl)
                 return -ENOMEM;
 
         /* And finally we upload the NVS tables */
-        wlcore_write_data(wl, REG_CMD_MBOX_ADDRESS,
-                          nvs_aligned, nvs_len, false);
+        ret = wlcore_write_data(wl, REG_CMD_MBOX_ADDRESS, nvs_aligned, nvs_len,
+                                false);
 
         kfree(nvs_aligned);
-        return 0;
+        return ret;
 
 out_badnvs:
         wl1271_error("nvs data is malformed");
@@ -350,11 +380,17 @@ int wlcore_boot_run_firmware(struct wl1271 *wl)
         u32 chip_id, intr;
 
         /* Make sure we have the boot partition */
-        wlcore_set_partition(wl, &wl->ptable[PART_BOOT]);
+        ret = wlcore_set_partition(wl, &wl->ptable[PART_BOOT]);
+        if (ret < 0)
+                return ret;
 
-        wl1271_boot_set_ecpu_ctrl(wl, ECPU_CONTROL_HALT);
+        ret = wl1271_boot_set_ecpu_ctrl(wl, ECPU_CONTROL_HALT);
+        if (ret < 0)
+                return ret;
 
-        chip_id = wlcore_read_reg(wl, REG_CHIP_ID_B);
+        ret = wlcore_read_reg(wl, REG_CHIP_ID_B, &chip_id);
+        if (ret < 0)
+                return ret;
 
         wl1271_debug(DEBUG_BOOT, "chip id after firmware boot: 0x%x", chip_id);
 
@@ -367,7 +403,9 @@ int wlcore_boot_run_firmware(struct wl1271 *wl)
         loop = 0;
         while (loop++ < INIT_LOOP) {
                 udelay(INIT_LOOP_DELAY);
-                intr = wlcore_read_reg(wl, REG_INTERRUPT_NO_CLEAR);
+                ret = wlcore_read_reg(wl, REG_INTERRUPT_NO_CLEAR, &intr);
+                if (ret < 0)
+                        return ret;
 
                 if (intr == 0xffffffff) {
                         wl1271_error("error reading hardware complete "
@@ -376,8 +414,10 @@ int wlcore_boot_run_firmware(struct wl1271 *wl)
                 }
                 /* check that ACX_INTR_INIT_COMPLETE is enabled */
                 else if (intr & WL1271_ACX_INTR_INIT_COMPLETE) {
-                        wlcore_write_reg(wl, REG_INTERRUPT_ACK,
-                                         WL1271_ACX_INTR_INIT_COMPLETE);
+                        ret = wlcore_write_reg(wl, REG_INTERRUPT_ACK,
+                                               WL1271_ACX_INTR_INIT_COMPLETE);
+                        if (ret < 0)
+                                return ret;
                         break;
                 }
         }
@@ -389,20 +429,25 @@ int wlcore_boot_run_firmware(struct wl1271 *wl)
         }
 
         /* get hardware config command mail box */
-        wl->cmd_box_addr = wlcore_read_reg(wl, REG_COMMAND_MAILBOX_PTR);
+        ret = wlcore_read_reg(wl, REG_COMMAND_MAILBOX_PTR, &wl->cmd_box_addr);
+        if (ret < 0)
+                return ret;
 
         wl1271_debug(DEBUG_MAILBOX, "cmd_box_addr 0x%x", wl->cmd_box_addr);
 
         /* get hardware config event mail box */
-        wl->mbox_ptr[0] = wlcore_read_reg(wl, REG_EVENT_MAILBOX_PTR);
+        ret = wlcore_read_reg(wl, REG_EVENT_MAILBOX_PTR, &wl->mbox_ptr[0]);
+        if (ret < 0)
+                return ret;
+
         wl->mbox_ptr[1] = wl->mbox_ptr[0] + sizeof(struct event_mailbox);
 
         wl1271_debug(DEBUG_MAILBOX, "MBOX ptrs: 0x%x 0x%x",
                      wl->mbox_ptr[0], wl->mbox_ptr[1]);
 
-        ret = wlcore_boot_fw_version(wl);
+        ret = wlcore_boot_static_data(wl);
         if (ret < 0) {
-                wl1271_error("couldn't boot firmware");
+                wl1271_error("error getting static data");
                 return ret;
         }
 
@@ -436,9 +481,9 @@ int wlcore_boot_run_firmware(struct wl1271 *wl)
         }
 
         /* set the working partition to its "running" mode offset */
-        wlcore_set_partition(wl, &wl->ptable[PART_WORK]);
+        ret = wlcore_set_partition(wl, &wl->ptable[PART_WORK]);
 
         /* firmware startup completed */
-        return 0;
+        return ret;
 }
 EXPORT_SYMBOL_GPL(wlcore_boot_run_firmware);
diff --git a/drivers/net/wireless/ti/wlcore/boot.h b/drivers/net/wireless/ti/wlcore/boot.h
index 094981dd222..a525225f990 100644
--- a/drivers/net/wireless/ti/wlcore/boot.h
+++ b/drivers/net/wireless/ti/wlcore/boot.h
@@ -40,6 +40,7 @@ struct wl1271_static_data {
         u8 fw_version[WL1271_FW_VERSION_MAX_LEN];
         u32 hw_version;
         u8 tx_power_table[WL1271_NO_SUBBANDS][WL1271_NO_POWER_LEVELS];
+        u8 priv[0];
 };
 
 /* number of times we try to read the INIT interrupt */
diff --git a/drivers/net/wireless/ti/wlcore/cmd.c b/drivers/net/wireless/ti/wlcore/cmd.c
index 5b128a97144..56c7a2342fd 100644
--- a/drivers/net/wireless/ti/wlcore/cmd.c
+++ b/drivers/net/wireless/ti/wlcore/cmd.c
@@ -36,6 +36,7 @@
 #include "cmd.h"
 #include "event.h"
 #include "tx.h"
+#include "hw_ops.h"
 
 #define WL1271_CMD_FAST_POLL_COUNT       50
 
@@ -64,17 +65,24 @@ int wl1271_cmd_send(struct wl1271 *wl, u16 id, void *buf, size_t len,
         WARN_ON(len % 4 != 0);
         WARN_ON(test_bit(WL1271_FLAG_IN_ELP, &wl->flags));
 
-        wl1271_write(wl, wl->cmd_box_addr, buf, len, false);
+        ret = wlcore_write(wl, wl->cmd_box_addr, buf, len, false);
+        if (ret < 0)
+                goto fail;
 
         /*
          * TODO: we just need this because one bit is in a different
          * place.  Is there any better way?
          */
-        wl->ops->trigger_cmd(wl, wl->cmd_box_addr, buf, len);
+        ret = wl->ops->trigger_cmd(wl, wl->cmd_box_addr, buf, len);
+        if (ret < 0)
+                goto fail;
 
         timeout = jiffies + msecs_to_jiffies(WL1271_COMMAND_TIMEOUT);
 
-        intr = wlcore_read_reg(wl, REG_INTERRUPT_NO_CLEAR);
+        ret = wlcore_read_reg(wl, REG_INTERRUPT_NO_CLEAR, &intr);
+        if (ret < 0)
+                goto fail;
+
         while (!(intr & WL1271_ACX_INTR_CMD_COMPLETE)) {
                 if (time_after(jiffies, timeout)) {
                         wl1271_error("command complete timeout");
@@ -88,13 +96,18 @@ int wl1271_cmd_send(struct wl1271 *wl, u16 id, void *buf, size_t len,
                 else
                         msleep(1);
 
-                intr = wlcore_read_reg(wl, REG_INTERRUPT_NO_CLEAR);
+                ret = wlcore_read_reg(wl, REG_INTERRUPT_NO_CLEAR, &intr);
+                if (ret < 0)
+                        goto fail;
         }
 
         /* read back the status code of the command */
         if (res_len == 0)
                 res_len = sizeof(struct wl1271_cmd_header);
-        wl1271_read(wl, wl->cmd_box_addr, cmd, res_len, false);
+
+        ret = wlcore_read(wl, wl->cmd_box_addr, cmd, res_len, false);
+        if (ret < 0)
+                goto fail;
 
         status = le16_to_cpu(cmd->status);
         if (status != CMD_STATUS_SUCCESS) {
@@ -103,11 +116,14 @@ int wl1271_cmd_send(struct wl1271 *wl, u16 id, void *buf, size_t len,
                 goto fail;
         }
 
-        wlcore_write_reg(wl, REG_INTERRUPT_ACK, WL1271_ACX_INTR_CMD_COMPLETE);
+        ret = wlcore_write_reg(wl, REG_INTERRUPT_ACK,
+                               WL1271_ACX_INTR_CMD_COMPLETE);
+        if (ret < 0)
+                goto fail;
+
         return 0;
 
 fail:
-        WARN_ON(1);
         wl12xx_queue_recovery_work(wl);
         return ret;
 }
@@ -116,35 +132,45 @@ fail:
  * Poll the mailbox event field until any of the bits in the mask is set or a
  * timeout occurs (WL1271_EVENT_TIMEOUT in msecs)
  */
-static int wl1271_cmd_wait_for_event_or_timeout(struct wl1271 *wl, u32 mask)
+static int wl1271_cmd_wait_for_event_or_timeout(struct wl1271 *wl,
+                                                u32 mask, bool *timeout)
 {
         u32 *events_vector;
         u32 event;
-        unsigned long timeout;
+        unsigned long timeout_time;
         int ret = 0;
 
+        *timeout = false;
+
         events_vector = kmalloc(sizeof(*events_vector), GFP_KERNEL | GFP_DMA);
         if (!events_vector)
                 return -ENOMEM;
 
-        timeout = jiffies + msecs_to_jiffies(WL1271_EVENT_TIMEOUT);
+        timeout_time = jiffies + msecs_to_jiffies(WL1271_EVENT_TIMEOUT);
 
         do {
-                if (time_after(jiffies, timeout)) {
+                if (time_after(jiffies, timeout_time)) {
                         wl1271_debug(DEBUG_CMD, "timeout waiting for event %d",
                                      (int)mask);
-                        ret = -ETIMEDOUT;
+                        *timeout = true;
                         goto out;
                 }
 
                 msleep(1);
 
                 /* read from both event fields */
-                wl1271_read(wl, wl->mbox_ptr[0], events_vector,
-                            sizeof(*events_vector), false);
+                ret = wlcore_read(wl, wl->mbox_ptr[0], events_vector,
+                                  sizeof(*events_vector), false);
+                if (ret < 0)
+                        goto out;
+
                 event = *events_vector & mask;
-                wl1271_read(wl, wl->mbox_ptr[1], events_vector,
-                            sizeof(*events_vector), false);
+
+                ret = wlcore_read(wl, wl->mbox_ptr[1], events_vector,
+                                  sizeof(*events_vector), false);
+                if (ret < 0)
+                        goto out;
+
                 event |= *events_vector & mask;
         } while (!event);
 
@@ -156,9 +182,10 @@ out:
 static int wl1271_cmd_wait_for_event(struct wl1271 *wl, u32 mask)
 {
         int ret;
+        bool timeout = false;
 
-        ret = wl1271_cmd_wait_for_event_or_timeout(wl, mask);
-        if (ret != 0) {
+        ret = wl1271_cmd_wait_for_event_or_timeout(wl, mask, &timeout);
+        if (ret != 0 || timeout) {
                 wl12xx_queue_recovery_work(wl);
                 return ret;
         }
@@ -291,6 +318,23 @@ static int wl12xx_get_new_session_id(struct wl1271 *wl,
         return wlvif->session_counter;
 }
 
+static u8 wlcore_get_native_channel_type(u8 nl_channel_type)
+{
+        switch (nl_channel_type) {
+        case NL80211_CHAN_NO_HT:
+                return WLCORE_CHAN_NO_HT;
+        case NL80211_CHAN_HT20:
+                return WLCORE_CHAN_HT20;
+        case NL80211_CHAN_HT40MINUS:
+                return WLCORE_CHAN_HT40MINUS;
+        case NL80211_CHAN_HT40PLUS:
+                return WLCORE_CHAN_HT40PLUS;
+        default:
+                WARN_ON(1);
+                return WLCORE_CHAN_NO_HT;
+        }
+}
+
 static int wl12xx_cmd_role_start_dev(struct wl1271 *wl,
                                      struct wl12xx_vif *wlvif)
 {
@@ -407,6 +451,7 @@ int wl12xx_cmd_role_start_sta(struct wl1271 *wl, struct wl12xx_vif *wlvif)
         memcpy(cmd->sta.ssid, wlvif->ssid, wlvif->ssid_len);
         memcpy(cmd->sta.bssid, vif->bss_conf.bssid, ETH_ALEN);
         cmd->sta.local_rates = cpu_to_le32(wlvif->rate_set);
+        cmd->channel_type = wlcore_get_native_channel_type(wlvif->channel_type);
 
         if (wlvif->sta.hlid == WL12XX_INVALID_LINK_ID) {
                 ret = wl12xx_allocate_link(wl, wlvif, &wlvif->sta.hlid);
@@ -482,6 +527,7 @@ int wl12xx_cmd_role_start_ap(struct wl1271 *wl, struct wl12xx_vif *wlvif)
         struct wl12xx_cmd_role_start *cmd;
         struct ieee80211_vif *vif = wl12xx_wlvif_to_vif(wlvif);
         struct ieee80211_bss_conf *bss_conf = &vif->bss_conf;
+        u32 supported_rates;
         int ret;
 
         wl1271_debug(DEBUG_CMD, "cmd role start ap %d", wlvif->role_id);
@@ -519,6 +565,7 @@ int wl12xx_cmd_role_start_ap(struct wl1271 *wl, struct wl12xx_vif *wlvif)
         /* FIXME: Change when adding DFS */
         cmd->ap.reset_tsf = 1;  /* By default reset AP TSF */
         cmd->channel = wlvif->channel;
+        cmd->channel_type = wlcore_get_native_channel_type(wlvif->channel_type);
 
         if (!bss_conf->hidden_ssid) {
                 /* take the SSID from the beacon for backward compatibility */
@@ -531,7 +578,13 @@ int wl12xx_cmd_role_start_ap(struct wl1271 *wl, struct wl12xx_vif *wlvif)
                 memcpy(cmd->ap.ssid, bss_conf->ssid, bss_conf->ssid_len);
         }
 
-        cmd->ap.local_rates = cpu_to_le32(0xffffffff);
+        supported_rates = CONF_TX_AP_ENABLED_RATES | CONF_TX_MCS_RATES |
+                wlcore_hw_ap_get_mimo_wide_rate_mask(wl, wlvif);
+
+        wl1271_debug(DEBUG_CMD, "cmd role start ap with supported_rates 0x%08x",
+                     supported_rates);
+
+        cmd->ap.local_rates = cpu_to_le32(supported_rates);
 
         switch (wlvif->band) {
         case IEEE80211_BAND_2GHZ:
@@ -797,6 +850,7 @@ out:
         kfree(cmd);
         return ret;
 }
+EXPORT_SYMBOL_GPL(wl1271_cmd_data_path);
 
 int wl1271_cmd_ps_mode(struct wl1271 *wl, struct wl12xx_vif *wlvif,
                        u8 ps_mode, u16 auto_ps_timeout)
@@ -1018,7 +1072,7 @@ out:
 
 int wl1271_cmd_build_arp_rsp(struct wl1271 *wl, struct wl12xx_vif *wlvif)
 {
-        int ret, extra;
+        int ret, extra = 0;
         u16 fc;
         struct ieee80211_vif *vif = wl12xx_wlvif_to_vif(wlvif);
         struct sk_buff *skb;
@@ -1057,7 +1111,8 @@ int wl1271_cmd_build_arp_rsp(struct wl1271 *wl, struct wl12xx_vif *wlvif)
         /* encryption space */
         switch (wlvif->encryption_type) {
         case KEY_TKIP:
-                extra = WL1271_EXTRA_SPACE_TKIP;
+                if (wl->quirks & WLCORE_QUIRK_TKIP_HEADER_SPACE)
+                        extra = WL1271_EXTRA_SPACE_TKIP;
                 break;
         case KEY_AES:
                 extra = WL1271_EXTRA_SPACE_AES;
@@ -1346,13 +1401,18 @@ int wl12xx_cmd_add_peer(struct wl1271 *wl, struct wl12xx_vif *wlvif,
 
         for (i = 0; i < NUM_ACCESS_CATEGORIES_COPY; i++)
                 if (sta->wme && (sta->uapsd_queues & BIT(i)))
-                        cmd->psd_type[i] = WL1271_PSD_UPSD_TRIGGER;
+                        cmd->psd_type[NUM_ACCESS_CATEGORIES_COPY-1-i] =
+                                        WL1271_PSD_UPSD_TRIGGER;
                 else
-                        cmd->psd_type[i] = WL1271_PSD_LEGACY;
+                        cmd->psd_type[NUM_ACCESS_CATEGORIES_COPY-1-i] =
+                                        WL1271_PSD_LEGACY;
+
 
         sta_rates = sta->supp_rates[wlvif->band];
         if (sta->ht_cap.ht_supported)
-                sta_rates |= sta->ht_cap.mcs.rx_mask[0] << HW_HT_RATES_OFFSET;
+                sta_rates |=
+                        (sta->ht_cap.mcs.rx_mask[0] << HW_HT_RATES_OFFSET) |
+                        (sta->ht_cap.mcs.rx_mask[1] << HW_MIMO_RATES_OFFSET);
 
         cmd->supported_rates =
                 cpu_to_le32(wl1271_tx_enabled_rates_get(wl, sta_rates,
@@ -1378,6 +1438,7 @@ int wl12xx_cmd_remove_peer(struct wl1271 *wl, u8 hlid)
 {
         struct wl12xx_cmd_remove_peer *cmd;
         int ret;
+        bool timeout = false;
 
         wl1271_debug(DEBUG_CMD, "cmd remove peer %d", (int)hlid);
 
@@ -1398,12 +1459,16 @@ int wl12xx_cmd_remove_peer(struct wl1271 *wl, u8 hlid)
                 goto out_free;
         }
 
+        ret = wl1271_cmd_wait_for_event_or_timeout(wl,
+                                           PEER_REMOVE_COMPLETE_EVENT_ID,
+                                           &timeout);
         /*
          * We are ok with a timeout here. The event is sometimes not sent
-         * due to a firmware bug.
+         * due to a firmware bug. In case of another error (like SDIO timeout)
+         * queue a recovery.
          */
-        wl1271_cmd_wait_for_event_or_timeout(wl,
-                                             PEER_REMOVE_COMPLETE_EVENT_ID);
+        if (ret)
+                wl12xx_queue_recovery_work(wl);
 
 out_free:
         kfree(cmd);
@@ -1573,19 +1638,25 @@ out:
 int wl12xx_roc(struct wl1271 *wl, struct wl12xx_vif *wlvif, u8 role_id)
 {
         int ret = 0;
+        bool is_first_roc;
 
         if (WARN_ON(test_bit(role_id, wl->roc_map)))
                 return 0;
 
+        is_first_roc = (find_first_bit(wl->roc_map, WL12XX_MAX_ROLES) >=
+                        WL12XX_MAX_ROLES);
+
         ret = wl12xx_cmd_roc(wl, wlvif, role_id);
         if (ret < 0)
                 goto out;
 
-        ret = wl1271_cmd_wait_for_event(wl,
-                                        REMAIN_ON_CHANNEL_COMPLETE_EVENT_ID);
-        if (ret < 0) {
-                wl1271_error("cmd roc event completion error");
-                goto out;
+        if (is_first_roc) {
+                ret = wl1271_cmd_wait_for_event(wl,
+                                           REMAIN_ON_CHANNEL_COMPLETE_EVENT_ID);
+                if (ret < 0) {
+                        wl1271_error("cmd roc event completion error");
+                        goto out;
+                }
         }
 
         __set_bit(role_id, wl->roc_map);
@@ -1714,7 +1785,9 @@ int wl12xx_stop_dev(struct wl1271 *wl, struct wl12xx_vif *wlvif)
                 return -EINVAL;
 
         /* flush all pending packets */
-        wl1271_tx_work_locked(wl);
+        ret = wlcore_tx_work_locked(wl);
+        if (ret < 0)
+                goto out;
 
         if (test_bit(wlvif->dev_role_id, wl->roc_map)) {
                 ret = wl12xx_croc(wl, wlvif->dev_role_id);
diff --git a/drivers/net/wireless/ti/wlcore/cmd.h b/drivers/net/wireless/ti/wlcore/cmd.h
index a46ae07cb77..c8a6510c72c 100644
--- a/drivers/net/wireless/ti/wlcore/cmd.h
+++ b/drivers/net/wireless/ti/wlcore/cmd.h
@@ -192,7 +192,7 @@ enum cmd_templ {
 #define WL1271_COMMAND_TIMEOUT     2000
 #define WL1271_CMD_TEMPL_DFLT_SIZE 252
 #define WL1271_CMD_TEMPL_MAX_SIZE  512
-#define WL1271_EVENT_TIMEOUT       750
+#define WL1271_EVENT_TIMEOUT       1000
 
 struct wl1271_cmd_header {
         __le16 id;
@@ -266,13 +266,22 @@ enum wlcore_band {
         WLCORE_BAND_MAX_RADIO           = 0x7F,
 };
 
+enum wlcore_channel_type {
+        WLCORE_CHAN_NO_HT,
+        WLCORE_CHAN_HT20,
+        WLCORE_CHAN_HT40MINUS,
+        WLCORE_CHAN_HT40PLUS
+};
+
 struct wl12xx_cmd_role_start {
         struct wl1271_cmd_header header;
 
         u8 role_id;
         u8 band;
         u8 channel;
-        u8 padding;
+
+        /* enum wlcore_channel_type */
+        u8 channel_type;
 
         union {
                 struct {
@@ -643,4 +652,25 @@ struct wl12xx_cmd_stop_channel_switch {
         struct wl1271_cmd_header header;
 } __packed;
 
+/* Used to check radio status after calibration */
+#define MAX_TLV_LENGTH          500
+#define TEST_CMD_P2G_CAL        2       /* TX BiP */
+
+struct wl1271_cmd_cal_p2g {
+        struct wl1271_cmd_header header;
+
+        struct wl1271_cmd_test_header test;
+
+        __le32 ver;
+        __le16 len;
+        u8 buf[MAX_TLV_LENGTH];
+        u8 type;
+        u8 padding;
+
+        __le16 radio_status;
+
+        u8 sub_band_mask;
+        u8 padding2;
+} __packed;
+
 #endif /* __WL1271_CMD_H__ */
diff --git a/drivers/net/wireless/ti/wlcore/conf.h b/drivers/net/wireless/ti/wlcore/conf.h
index fef0db4213b..d77224f2ac6 100644
--- a/drivers/net/wireless/ti/wlcore/conf.h
+++ b/drivers/net/wireless/ti/wlcore/conf.h
@@ -45,7 +45,15 @@ enum {
         CONF_HW_BIT_RATE_MCS_4   = BIT(17),
         CONF_HW_BIT_RATE_MCS_5   = BIT(18),
         CONF_HW_BIT_RATE_MCS_6   = BIT(19),
-        CONF_HW_BIT_RATE_MCS_7   = BIT(20)
+        CONF_HW_BIT_RATE_MCS_7   = BIT(20),
+        CONF_HW_BIT_RATE_MCS_8   = BIT(21),
+        CONF_HW_BIT_RATE_MCS_9   = BIT(22),
+        CONF_HW_BIT_RATE_MCS_10  = BIT(23),
+        CONF_HW_BIT_RATE_MCS_11  = BIT(24),
+        CONF_HW_BIT_RATE_MCS_12  = BIT(25),
+        CONF_HW_BIT_RATE_MCS_13  = BIT(26),
+        CONF_HW_BIT_RATE_MCS_14  = BIT(27),
+        CONF_HW_BIT_RATE_MCS_15  = BIT(28),
 };
 
 enum {
@@ -310,7 +318,7 @@ enum {
 struct conf_sg_settings {
         u32 params[CONF_SG_PARAMS_MAX];
         u8 state;
-};
+} __packed;
 
 enum conf_rx_queue_type {
         CONF_RX_QUEUE_TYPE_LOW_PRIORITY,  /* All except the high priority */
@@ -394,7 +402,7 @@ struct conf_rx_settings {
          * Range: RX_QUEUE_TYPE_RX_LOW_PRIORITY, RX_QUEUE_TYPE_RX_HIGH_PRIORITY,
          */
         u8 queue_type;
-};
+} __packed;
 
 #define CONF_TX_MAX_RATE_CLASSES       10
 
@@ -435,6 +443,12 @@ struct conf_rx_settings {
         CONF_HW_BIT_RATE_MCS_5 | CONF_HW_BIT_RATE_MCS_6 |        \
         CONF_HW_BIT_RATE_MCS_7)
 
+#define CONF_TX_MIMO_RATES (CONF_HW_BIT_RATE_MCS_8 |             \
+        CONF_HW_BIT_RATE_MCS_9 | CONF_HW_BIT_RATE_MCS_10 |       \
+        CONF_HW_BIT_RATE_MCS_11 | CONF_HW_BIT_RATE_MCS_12 |      \
+        CONF_HW_BIT_RATE_MCS_13 | CONF_HW_BIT_RATE_MCS_14 |      \
+        CONF_HW_BIT_RATE_MCS_15)
+
 /*
  * Default rates for management traffic when operating in AP mode. This
  * should be configured according to the basic rate set of the AP
@@ -487,7 +501,7 @@ struct conf_tx_rate_class {
          *               the policy (0 - long preamble, 1 - short preamble.
          */
         u8 aflags;
-};
+} __packed;
 
 #define CONF_TX_MAX_AC_COUNT 4
 
@@ -504,7 +518,7 @@ enum conf_tx_ac {
         CONF_TX_AC_VI = 2,         /* video */
         CONF_TX_AC_VO = 3,         /* voice */
         CONF_TX_AC_CTS2SELF = 4,   /* fictitious AC, follows AC_VO */
-        CONF_TX_AC_ANY_TID = 0x1f
+        CONF_TX_AC_ANY_TID = 0xff
 };
 
 struct conf_tx_ac_category {
@@ -544,7 +558,7 @@ struct conf_tx_ac_category {
          * Range: u16
          */
         u16 tx_op_limit;
-};
+} __packed;
 
 #define CONF_TX_MAX_TID_COUNT 8
 
@@ -578,7 +592,7 @@ struct conf_tx_tid {
         u8 ps_scheme;
         u8 ack_policy;
         u32 apsd_conf[2];
-};
+} __packed;
 
 struct conf_tx_settings {
         /*
@@ -664,7 +678,7 @@ struct conf_tx_settings {
 
         /* Time in ms for Tx watchdog timer to expire */
         u32 tx_watchdog_timeout;
-};
+} __packed;
 
 enum {
         CONF_WAKE_UP_EVENT_BEACON    = 0x01, /* Wake on every Beacon*/
@@ -711,7 +725,7 @@ struct conf_bcn_filt_rule {
          * Version for the vendor specifie IE (221)
          */
         u8 version[CONF_BCN_IE_VER_LEN];
-};
+} __packed;
 
 #define CONF_MAX_RSSI_SNR_TRIGGERS 8
 
@@ -762,7 +776,7 @@ struct conf_sig_weights {
          * Range: u8
          */
         u8 snr_pkt_avg_weight;
-};
+} __packed;
 
 enum conf_bcn_filt_mode {
         CONF_BCN_FILT_MODE_DISABLED = 0,
@@ -810,7 +824,7 @@ struct conf_conn_settings {
          *
          * Range: CONF_BCN_FILT_MODE_*
          */
-        enum conf_bcn_filt_mode bcn_filt_mode;
+        u8 bcn_filt_mode;
 
         /*
          * Configure Beacon filter pass-thru rules.
@@ -937,7 +951,13 @@ struct conf_conn_settings {
          * Range: u16
          */
         u8 max_listen_interval;
-};
+
+        /*
+         * Default sleep authorization for a new STA interface. This determines
+         * whether we can go to ELP.
+         */
+        u8 sta_sleep_auth;
+} __packed;
 
 enum {
         CONF_REF_CLK_19_2_E,
@@ -965,6 +985,11 @@ struct conf_itrim_settings {
 
         /* moderation timeout in microsecs from the last TX */
         u32 timeout;
+} __packed;
+
+enum conf_fast_wakeup {
+        CONF_FAST_WAKEUP_ENABLE,
+        CONF_FAST_WAKEUP_DISABLE,
 };
 
 struct conf_pm_config_settings {
@@ -978,10 +1003,10 @@ struct conf_pm_config_settings {
         /*
          * Host fast wakeup support
          *
-         * Range: true, false
+         * Range: enum conf_fast_wakeup
          */
-        bool host_fast_wakeup_support;
-};
+        u8 host_fast_wakeup_support;
+} __packed;
 
 struct conf_roam_trigger_settings {
         /*
@@ -1018,7 +1043,7 @@ struct conf_roam_trigger_settings {
          * Range: 0 - 255
          */
         u8 avg_weight_snr_data;
-};
+} __packed;
 
 struct conf_scan_settings {
         /*
@@ -1064,7 +1089,7 @@ struct conf_scan_settings {
          * Range: u32 Microsecs
          */
         u32 split_scan_timeout;
-};
+} __packed;
 
 struct conf_sched_scan_settings {
         /*
@@ -1102,7 +1127,7 @@ struct conf_sched_scan_settings {
 
         /* SNR threshold to be used for filtering */
         s8 snr_threshold;
-};
+} __packed;
 
 struct conf_ht_setting {
         u8 rx_ba_win_size;
@@ -1111,7 +1136,7 @@ struct conf_ht_setting {
 
         /* bitmap of enabled TIDs for TX BA sessions */
         u8 tx_ba_tid_bitmap;
-};
+} __packed;
 
 struct conf_memory_settings {
         /* Number of stations supported in IBSS mode */
@@ -1151,7 +1176,7 @@ struct conf_memory_settings {
          * Range: 0-120
          */
         u8 tx_min;
-};
+} __packed;
 
 struct conf_fm_coex {
         u8 enable;
@@ -1164,7 +1189,7 @@ struct conf_fm_coex {
         u16 ldo_stabilization_time;
         u8 fm_disturbed_band_margin;
         u8 swallow_clk_diff;
-};
+} __packed;
 
 struct conf_rx_streaming_settings {
         /*
@@ -1193,7 +1218,7 @@ struct conf_rx_streaming_settings {
          * enable rx streaming also when there is no coex activity
          */
         u8 always;
-};
+} __packed;
 
 struct conf_fwlog {
         /* Continuous or on-demand */
@@ -1217,7 +1242,7 @@ struct conf_fwlog {
 
         /* Regulates the frequency of log messages */
         u8 threshold;
-};
+} __packed;
 
 #define ACX_RATE_MGMT_NUM_OF_RATES 13
 struct conf_rate_policy_settings {
@@ -1236,7 +1261,7 @@ struct conf_rate_policy_settings {
         u8 rate_check_up;
         u8 rate_check_down;
         u8 rate_retry_policy[ACX_RATE_MGMT_NUM_OF_RATES];
-};
+} __packed;
 
 struct conf_hangover_settings {
         u32 recover_time;
@@ -1250,7 +1275,23 @@ struct conf_hangover_settings {
         u8 quiet_time;
         u8 increase_time;
         u8 window_size;
-};
+} __packed;
+
+/*
+ * The conf version consists of 4 bytes.  The two MSB are the wlcore
+ * version, the two LSB are the lower driver's private conf
+ * version.
+ */
+#define WLCORE_CONF_VERSION     (0x0002 << 16)
+#define WLCORE_CONF_MASK        0xffff0000
+#define WLCORE_CONF_SIZE        (sizeof(struct wlcore_conf_header) +    \
+                                 sizeof(struct wlcore_conf))
+
+struct wlcore_conf_header {
+        __le32 magic;
+        __le32 version;
+        __le32 checksum;
+} __packed;
 
 struct wlcore_conf {
         struct conf_sg_settings sg;
@@ -1269,6 +1310,12 @@ struct wlcore_conf {
         struct conf_fwlog fwlog;
         struct conf_rate_policy_settings rate;
         struct conf_hangover_settings hangover;
-};
+} __packed;
+
+struct wlcore_conf_file {
+        struct wlcore_conf_header header;
+        struct wlcore_conf core;
+        u8 priv[0];
+} __packed;
 
 #endif
diff --git a/drivers/net/wireless/ti/wlcore/debugfs.c b/drivers/net/wireless/ti/wlcore/debugfs.c
index d5aea1ff5ad..80dbc5304fa 100644
--- a/drivers/net/wireless/ti/wlcore/debugfs.c
+++ b/drivers/net/wireless/ti/wlcore/debugfs.c
@@ -25,6 +25,7 @@
 
 #include <linux/skbuff.h>
 #include <linux/slab.h>
+#include <linux/module.h>
 
 #include "wlcore.h"
 #include "debug.h"
@@ -32,14 +33,16 @@
 #include "ps.h"
 #include "io.h"
 #include "tx.h"
+#include "hw_ops.h"
 
 /* ms */
 #define WL1271_DEBUGFS_STATS_LIFETIME 1000
 
+#define WLCORE_MAX_BLOCK_SIZE ((size_t)(4*PAGE_SIZE))
+
 /* debugfs macros idea from mac80211 */
-#define DEBUGFS_FORMAT_BUFFER_SIZE 100
-static int wl1271_format_buffer(char __user *userbuf, size_t count,
-                                    loff_t *ppos, char *fmt, ...)
+int wl1271_format_buffer(char __user *userbuf, size_t count,
+                         loff_t *ppos, char *fmt, ...)
 {
         va_list args;
         char buf[DEBUGFS_FORMAT_BUFFER_SIZE];
@@ -51,59 +54,9 @@ static int wl1271_format_buffer(char __user *userbuf, size_t count,
 
         return simple_read_from_buffer(userbuf, count, ppos, buf, res);
 }
+EXPORT_SYMBOL_GPL(wl1271_format_buffer);
 
-#define DEBUGFS_READONLY_FILE(name, fmt, value...)                      \
-static ssize_t name## _read(struct file *file, char __user *userbuf,    \
-                            size_t count, loff_t *ppos)                 \
-{                                                                       \
-        struct wl1271 *wl = file->private_data;                         \
-        return wl1271_format_buffer(userbuf, count, ppos,               \
-                                    fmt "\n", ##value);                 \
-}                                                                       \
-                                                                        \
-static const struct file_operations name## _ops = {                     \
-        .read = name## _read,                                           \
-        .open = simple_open,                                            \
-        .llseek = generic_file_llseek,                                  \
-};
-
-#define DEBUGFS_ADD(name, parent)                                       \
-        entry = debugfs_create_file(#name, 0400, parent,                \
-                                    wl, &name## _ops);                  \
-        if (!entry || IS_ERR(entry))                                    \
-                goto err;                                               \
-
-#define DEBUGFS_ADD_PREFIX(prefix, name, parent)                        \
-        do {                                                            \
-                entry = debugfs_create_file(#name, 0400, parent,        \
-                                    wl, &prefix## _## name## _ops);     \
-                if (!entry || IS_ERR(entry))                            \
-                        goto err;                                       \
-        } while (0);
-
-#define DEBUGFS_FWSTATS_FILE(sub, name, fmt)                            \
-static ssize_t sub## _ ##name## _read(struct file *file,                \
-                                      char __user *userbuf,             \
-                                      size_t count, loff_t *ppos)       \
-{                                                                       \
-        struct wl1271 *wl = file->private_data;                         \
-                                                                        \
-        wl1271_debugfs_update_stats(wl);                                \
-                                                                        \
-        return wl1271_format_buffer(userbuf, count, ppos, fmt "\n",     \
-                                    wl->stats.fw_stats->sub.name);      \
-}                                                                       \
-                                                                        \
-static const struct file_operations sub## _ ##name## _ops = {           \
-        .read = sub## _ ##name## _read,                                 \
-        .open = simple_open,                                            \
-        .llseek = generic_file_llseek,                                  \
-};
-
-#define DEBUGFS_FWSTATS_ADD(sub, name)                          \
-        DEBUGFS_ADD(sub## _ ##name, stats)
-
-static void wl1271_debugfs_update_stats(struct wl1271 *wl)
+void wl1271_debugfs_update_stats(struct wl1271 *wl)
 {
         int ret;
 
@@ -125,97 +78,7 @@ static void wl1271_debugfs_update_stats(struct wl1271 *wl)
 out:
         mutex_unlock(&wl->mutex);
 }
-
-DEBUGFS_FWSTATS_FILE(tx, internal_desc_overflow, "%u");
-
-DEBUGFS_FWSTATS_FILE(rx, out_of_mem, "%u");
-DEBUGFS_FWSTATS_FILE(rx, hdr_overflow, "%u");
-DEBUGFS_FWSTATS_FILE(rx, hw_stuck, "%u");
-DEBUGFS_FWSTATS_FILE(rx, dropped, "%u");
-DEBUGFS_FWSTATS_FILE(rx, fcs_err, "%u");
-DEBUGFS_FWSTATS_FILE(rx, xfr_hint_trig, "%u");
-DEBUGFS_FWSTATS_FILE(rx, path_reset, "%u");
-DEBUGFS_FWSTATS_FILE(rx, reset_counter, "%u");
-
-DEBUGFS_FWSTATS_FILE(dma, rx_requested, "%u");
-DEBUGFS_FWSTATS_FILE(dma, rx_errors, "%u");
-DEBUGFS_FWSTATS_FILE(dma, tx_requested, "%u");
-DEBUGFS_FWSTATS_FILE(dma, tx_errors, "%u");
-
-DEBUGFS_FWSTATS_FILE(isr, cmd_cmplt, "%u");
-DEBUGFS_FWSTATS_FILE(isr, fiqs, "%u");
-DEBUGFS_FWSTATS_FILE(isr, rx_headers, "%u");
-DEBUGFS_FWSTATS_FILE(isr, rx_mem_overflow, "%u");
-DEBUGFS_FWSTATS_FILE(isr, rx_rdys, "%u");
-DEBUGFS_FWSTATS_FILE(isr, irqs, "%u");
-DEBUGFS_FWSTATS_FILE(isr, tx_procs, "%u");
-DEBUGFS_FWSTATS_FILE(isr, decrypt_done, "%u");
-DEBUGFS_FWSTATS_FILE(isr, dma0_done, "%u");
-DEBUGFS_FWSTATS_FILE(isr, dma1_done, "%u");
-DEBUGFS_FWSTATS_FILE(isr, tx_exch_complete, "%u");
-DEBUGFS_FWSTATS_FILE(isr, commands, "%u");
-DEBUGFS_FWSTATS_FILE(isr, rx_procs, "%u");
-DEBUGFS_FWSTATS_FILE(isr, hw_pm_mode_changes, "%u");
-DEBUGFS_FWSTATS_FILE(isr, host_acknowledges, "%u");
-DEBUGFS_FWSTATS_FILE(isr, pci_pm, "%u");
-DEBUGFS_FWSTATS_FILE(isr, wakeups, "%u");
-DEBUGFS_FWSTATS_FILE(isr, low_rssi, "%u");
-
-DEBUGFS_FWSTATS_FILE(wep, addr_key_count, "%u");
-DEBUGFS_FWSTATS_FILE(wep, default_key_count, "%u");
-/* skipping wep.reserved */
-DEBUGFS_FWSTATS_FILE(wep, key_not_found, "%u");
-DEBUGFS_FWSTATS_FILE(wep, decrypt_fail, "%u");
-DEBUGFS_FWSTATS_FILE(wep, packets, "%u");
-DEBUGFS_FWSTATS_FILE(wep, interrupt, "%u");
-
-DEBUGFS_FWSTATS_FILE(pwr, ps_enter, "%u");
-DEBUGFS_FWSTATS_FILE(pwr, elp_enter, "%u");
-DEBUGFS_FWSTATS_FILE(pwr, missing_bcns, "%u");
-DEBUGFS_FWSTATS_FILE(pwr, wake_on_host, "%u");
-DEBUGFS_FWSTATS_FILE(pwr, wake_on_timer_exp, "%u");
-DEBUGFS_FWSTATS_FILE(pwr, tx_with_ps, "%u");
-DEBUGFS_FWSTATS_FILE(pwr, tx_without_ps, "%u");
-DEBUGFS_FWSTATS_FILE(pwr, rcvd_beacons, "%u");
-DEBUGFS_FWSTATS_FILE(pwr, power_save_off, "%u");
-DEBUGFS_FWSTATS_FILE(pwr, enable_ps, "%u");
-DEBUGFS_FWSTATS_FILE(pwr, disable_ps, "%u");
-DEBUGFS_FWSTATS_FILE(pwr, fix_tsf_ps, "%u");
-/* skipping cont_miss_bcns_spread for now */
-DEBUGFS_FWSTATS_FILE(pwr, rcvd_awake_beacons, "%u");
-
-DEBUGFS_FWSTATS_FILE(mic, rx_pkts, "%u");
-DEBUGFS_FWSTATS_FILE(mic, calc_failure, "%u");
-
-DEBUGFS_FWSTATS_FILE(aes, encrypt_fail, "%u");
-DEBUGFS_FWSTATS_FILE(aes, decrypt_fail, "%u");
-DEBUGFS_FWSTATS_FILE(aes, encrypt_packets, "%u");
-DEBUGFS_FWSTATS_FILE(aes, decrypt_packets, "%u");
-DEBUGFS_FWSTATS_FILE(aes, encrypt_interrupt, "%u");
-DEBUGFS_FWSTATS_FILE(aes, decrypt_interrupt, "%u");
-
-DEBUGFS_FWSTATS_FILE(event, heart_beat, "%u");
-DEBUGFS_FWSTATS_FILE(event, calibration, "%u");
-DEBUGFS_FWSTATS_FILE(event, rx_mismatch, "%u");
-DEBUGFS_FWSTATS_FILE(event, rx_mem_empty, "%u");
-DEBUGFS_FWSTATS_FILE(event, rx_pool, "%u");
-DEBUGFS_FWSTATS_FILE(event, oom_late, "%u");
-DEBUGFS_FWSTATS_FILE(event, phy_transmit_error, "%u");
-DEBUGFS_FWSTATS_FILE(event, tx_stuck, "%u");
-
-DEBUGFS_FWSTATS_FILE(ps, pspoll_timeouts, "%u");
-DEBUGFS_FWSTATS_FILE(ps, upsd_timeouts, "%u");
-DEBUGFS_FWSTATS_FILE(ps, upsd_max_sptime, "%u");
-DEBUGFS_FWSTATS_FILE(ps, upsd_max_apturn, "%u");
-DEBUGFS_FWSTATS_FILE(ps, pspoll_max_apturn, "%u");
-DEBUGFS_FWSTATS_FILE(ps, pspoll_utilization, "%u");
-DEBUGFS_FWSTATS_FILE(ps, upsd_utilization, "%u");
-
-DEBUGFS_FWSTATS_FILE(rxpipe, rx_prep_beacon_drop, "%u");
-DEBUGFS_FWSTATS_FILE(rxpipe, descr_host_int_trig_rx_data, "%u");
-DEBUGFS_FWSTATS_FILE(rxpipe, beacon_buffer_thres_host_int_trig_rx_data, "%u");
-DEBUGFS_FWSTATS_FILE(rxpipe, missed_beacon_host_int_trig_rx_data, "%u");
-DEBUGFS_FWSTATS_FILE(rxpipe, tx_xfr_host_int_trig_rx_data, "%u");
+EXPORT_SYMBOL_GPL(wl1271_debugfs_update_stats);
 
 DEBUGFS_READONLY_FILE(retry_count, "%u", wl->stats.retry_count);
 DEBUGFS_READONLY_FILE(excessive_retries, "%u",
@@ -241,6 +104,89 @@ static const struct file_operations tx_queue_len_ops = {
         .llseek = default_llseek,
 };
 
+static void chip_op_handler(struct wl1271 *wl, unsigned long value,
+                            void *arg)
+{
+        int ret;
+        int (*chip_op) (struct wl1271 *wl);
+
+        if (!arg) {
+                wl1271_warning("debugfs chip_op_handler with no callback");
+                return;
+        }
+
+        ret = wl1271_ps_elp_wakeup(wl);
+        if (ret < 0)
+                return;
+
+        chip_op = arg;
+        chip_op(wl);
+
+        wl1271_ps_elp_sleep(wl);
+}
+
+
+static inline void no_write_handler(struct wl1271 *wl,
+                                    unsigned long value,
+                                    unsigned long param)
+{
+}
+
+#define WL12XX_CONF_DEBUGFS(param, conf_sub_struct,                     \
+                            min_val, max_val, write_handler_locked,     \
+                            write_handler_arg)                          \
+        static ssize_t param##_read(struct file *file,                  \
+                                      char __user *user_buf,            \
+                                      size_t count, loff_t *ppos)       \
+        {                                                               \
+        struct wl1271 *wl = file->private_data;                         \
+        return wl1271_format_buffer(user_buf, count,                    \
+                                    ppos, "%d\n",                       \
+                                    wl->conf.conf_sub_struct.param);    \
+        }                                                               \
+                                                                        \
+        static ssize_t param##_write(struct file *file,                 \
+                                     const char __user *user_buf,       \
+                                     size_t count, loff_t *ppos)        \
+        {                                                               \
+        struct wl1271 *wl = file->private_data;                         \
+        unsigned long value;                                            \
+        int ret;                                                        \
+                                                                        \
+        ret = kstrtoul_from_user(user_buf, count, 10, &value);          \
+        if (ret < 0) {                                                  \
+                wl1271_warning("illegal value for " #param);            \
+                return -EINVAL;                                         \
+        }                                                               \
+                                                                        \
+        if (value < min_val || value > max_val) {                       \
+                wl1271_warning(#param " is not in valid range");        \
+                return -ERANGE;                                         \
+        }                                                               \
+                                                                        \
+        mutex_lock(&wl->mutex);                                         \
+        wl->conf.conf_sub_struct.param = value;                         \
+                                                                        \
+        write_handler_locked(wl, value, write_handler_arg);             \
+                                                                        \
+        mutex_unlock(&wl->mutex);                                       \
+        return count;                                                   \
+        }                                                               \
+                                                                        \
+        static const struct file_operations param##_ops = {             \
+                .read = param##_read,                                   \
+                .write = param##_write,                                 \
+                .open = simple_open,                                    \
+                .llseek = default_llseek,                               \
+        };
+
+WL12XX_CONF_DEBUGFS(irq_pkt_threshold, rx, 0, 65535,
+                    chip_op_handler, wl1271_acx_init_rx_interrupt)
+WL12XX_CONF_DEBUGFS(irq_blk_threshold, rx, 0, 65535,
+                    chip_op_handler, wl1271_acx_init_rx_interrupt)
+WL12XX_CONF_DEBUGFS(irq_timeout, rx, 0, 100,
+                    chip_op_handler, wl1271_acx_init_rx_interrupt)
+
 static ssize_t gpio_power_read(struct file *file, char __user *user_buf,
                           size_t count, loff_t *ppos)
 {
@@ -535,8 +481,7 @@ static ssize_t driver_state_read(struct file *file, char __user *user_buf,
         DRIVER_STATE_PRINT_LHEX(ap_ps_map);
         DRIVER_STATE_PRINT_HEX(quirks);
         DRIVER_STATE_PRINT_HEX(irq);
-        DRIVER_STATE_PRINT_HEX(ref_clock);
-        DRIVER_STATE_PRINT_HEX(tcxo_clock);
+        /* TODO: ref_clock and tcxo_clock were moved to wl12xx priv */
         DRIVER_STATE_PRINT_HEX(hw_pg_ver);
         DRIVER_STATE_PRINT_HEX(platform_quirks);
         DRIVER_STATE_PRINT_HEX(chip.id);
@@ -647,7 +592,6 @@ static ssize_t vifs_state_read(struct file *file, char __user *user_buf,
                 VIF_STATE_PRINT_INT(last_rssi_event);
                 VIF_STATE_PRINT_INT(ba_support);
                 VIF_STATE_PRINT_INT(ba_allowed);
-                VIF_STATE_PRINT_INT(is_gem);
                 VIF_STATE_PRINT_LLHEX(tx_security_seq);
                 VIF_STATE_PRINT_INT(tx_security_last_seq_lsb);
         }
@@ -1002,108 +946,281 @@ static const struct file_operations beacon_filtering_ops = {
         .llseek = default_llseek,
 };
 
-static int wl1271_debugfs_add_files(struct wl1271 *wl,
-                                     struct dentry *rootdir)
+static ssize_t fw_stats_raw_read(struct file *file,
+                                 char __user *userbuf,
+                                 size_t count, loff_t *ppos)
 {
-        int ret = 0;
-        struct dentry *entry, *stats, *streaming;
+        struct wl1271 *wl = file->private_data;
 
-        stats = debugfs_create_dir("fw-statistics", rootdir);
-        if (!stats || IS_ERR(stats)) {
-                entry = stats;
-                goto err;
+        wl1271_debugfs_update_stats(wl);
+
+        return simple_read_from_buffer(userbuf, count, ppos,
+                                       wl->stats.fw_stats,
+                                       wl->stats.fw_stats_len);
+}
+
+static const struct file_operations fw_stats_raw_ops = {
+        .read = fw_stats_raw_read,
+        .open = simple_open,
+        .llseek = default_llseek,
+};
+
+static ssize_t sleep_auth_read(struct file *file, char __user *user_buf,
+                               size_t count, loff_t *ppos)
+{
+        struct wl1271 *wl = file->private_data;
+
+        return wl1271_format_buffer(user_buf, count,
+                                    ppos, "%d\n",
+                                    wl->sleep_auth);
+}
+
+static ssize_t sleep_auth_write(struct file *file,
+                                const char __user *user_buf,
+                                size_t count, loff_t *ppos)
+{
+        struct wl1271 *wl = file->private_data;
+        unsigned long value;
+        int ret;
+
+        ret = kstrtoul_from_user(user_buf, count, 0, &value);
+        if (ret < 0) {
+                wl1271_warning("illegal value in sleep_auth");
+                return -EINVAL;
+        }
+
+        if (value < 0 || value > WL1271_PSM_MAX) {
+                wl1271_warning("sleep_auth must be between 0 and %d",
+                               WL1271_PSM_MAX);
+                return -ERANGE;
+        }
+
+        mutex_lock(&wl->mutex);
+
+        wl->conf.conn.sta_sleep_auth = value;
+
+        if (wl->state == WL1271_STATE_OFF) {
+                /* this will show up on "read" in case we are off */
+                wl->sleep_auth = value;
+                goto out;
         }
 
-        DEBUGFS_FWSTATS_ADD(tx, internal_desc_overflow);
-
-        DEBUGFS_FWSTATS_ADD(rx, out_of_mem);
-        DEBUGFS_FWSTATS_ADD(rx, hdr_overflow);
-        DEBUGFS_FWSTATS_ADD(rx, hw_stuck);
-        DEBUGFS_FWSTATS_ADD(rx, dropped);
-        DEBUGFS_FWSTATS_ADD(rx, fcs_err);
-        DEBUGFS_FWSTATS_ADD(rx, xfr_hint_trig);
-        DEBUGFS_FWSTATS_ADD(rx, path_reset);
-        DEBUGFS_FWSTATS_ADD(rx, reset_counter);
-
-        DEBUGFS_FWSTATS_ADD(dma, rx_requested);
-        DEBUGFS_FWSTATS_ADD(dma, rx_errors);
-        DEBUGFS_FWSTATS_ADD(dma, tx_requested);
-        DEBUGFS_FWSTATS_ADD(dma, tx_errors);
-
-        DEBUGFS_FWSTATS_ADD(isr, cmd_cmplt);
-        DEBUGFS_FWSTATS_ADD(isr, fiqs);
-        DEBUGFS_FWSTATS_ADD(isr, rx_headers);
-        DEBUGFS_FWSTATS_ADD(isr, rx_mem_overflow);
-        DEBUGFS_FWSTATS_ADD(isr, rx_rdys);
-        DEBUGFS_FWSTATS_ADD(isr, irqs);
-        DEBUGFS_FWSTATS_ADD(isr, tx_procs);
-        DEBUGFS_FWSTATS_ADD(isr, decrypt_done);
-        DEBUGFS_FWSTATS_ADD(isr, dma0_done);
-        DEBUGFS_FWSTATS_ADD(isr, dma1_done);
-        DEBUGFS_FWSTATS_ADD(isr, tx_exch_complete);
-        DEBUGFS_FWSTATS_ADD(isr, commands);
-        DEBUGFS_FWSTATS_ADD(isr, rx_procs);
-        DEBUGFS_FWSTATS_ADD(isr, hw_pm_mode_changes);
-        DEBUGFS_FWSTATS_ADD(isr, host_acknowledges);
-        DEBUGFS_FWSTATS_ADD(isr, pci_pm);
-        DEBUGFS_FWSTATS_ADD(isr, wakeups);
-        DEBUGFS_FWSTATS_ADD(isr, low_rssi);
-
-        DEBUGFS_FWSTATS_ADD(wep, addr_key_count);
-        DEBUGFS_FWSTATS_ADD(wep, default_key_count);
-        /* skipping wep.reserved */
-        DEBUGFS_FWSTATS_ADD(wep, key_not_found);
-        DEBUGFS_FWSTATS_ADD(wep, decrypt_fail);
-        DEBUGFS_FWSTATS_ADD(wep, packets);
-        DEBUGFS_FWSTATS_ADD(wep, interrupt);
-
-        DEBUGFS_FWSTATS_ADD(pwr, ps_enter);
-        DEBUGFS_FWSTATS_ADD(pwr, elp_enter);
-        DEBUGFS_FWSTATS_ADD(pwr, missing_bcns);
-        DEBUGFS_FWSTATS_ADD(pwr, wake_on_host);
-        DEBUGFS_FWSTATS_ADD(pwr, wake_on_timer_exp);
-        DEBUGFS_FWSTATS_ADD(pwr, tx_with_ps);
-        DEBUGFS_FWSTATS_ADD(pwr, tx_without_ps);
-        DEBUGFS_FWSTATS_ADD(pwr, rcvd_beacons);
-        DEBUGFS_FWSTATS_ADD(pwr, power_save_off);
-        DEBUGFS_FWSTATS_ADD(pwr, enable_ps);
-        DEBUGFS_FWSTATS_ADD(pwr, disable_ps);
-        DEBUGFS_FWSTATS_ADD(pwr, fix_tsf_ps);
-        /* skipping cont_miss_bcns_spread for now */
-        DEBUGFS_FWSTATS_ADD(pwr, rcvd_awake_beacons);
-
-        DEBUGFS_FWSTATS_ADD(mic, rx_pkts);
-        DEBUGFS_FWSTATS_ADD(mic, calc_failure);
-
-        DEBUGFS_FWSTATS_ADD(aes, encrypt_fail);
-        DEBUGFS_FWSTATS_ADD(aes, decrypt_fail);
-        DEBUGFS_FWSTATS_ADD(aes, encrypt_packets);
-        DEBUGFS_FWSTATS_ADD(aes, decrypt_packets);
-        DEBUGFS_FWSTATS_ADD(aes, encrypt_interrupt);
-        DEBUGFS_FWSTATS_ADD(aes, decrypt_interrupt);
-
-        DEBUGFS_FWSTATS_ADD(event, heart_beat);
-        DEBUGFS_FWSTATS_ADD(event, calibration);
-        DEBUGFS_FWSTATS_ADD(event, rx_mismatch);
-        DEBUGFS_FWSTATS_ADD(event, rx_mem_empty);
-        DEBUGFS_FWSTATS_ADD(event, rx_pool);
-        DEBUGFS_FWSTATS_ADD(event, oom_late);
-        DEBUGFS_FWSTATS_ADD(event, phy_transmit_error);
-        DEBUGFS_FWSTATS_ADD(event, tx_stuck);
-
-        DEBUGFS_FWSTATS_ADD(ps, pspoll_timeouts);
-        DEBUGFS_FWSTATS_ADD(ps, upsd_timeouts);
-        DEBUGFS_FWSTATS_ADD(ps, upsd_max_sptime);
-        DEBUGFS_FWSTATS_ADD(ps, upsd_max_apturn);
-        DEBUGFS_FWSTATS_ADD(ps, pspoll_max_apturn);
-        DEBUGFS_FWSTATS_ADD(ps, pspoll_utilization);
-        DEBUGFS_FWSTATS_ADD(ps, upsd_utilization);
-
-        DEBUGFS_FWSTATS_ADD(rxpipe, rx_prep_beacon_drop);
-        DEBUGFS_FWSTATS_ADD(rxpipe, descr_host_int_trig_rx_data);
-        DEBUGFS_FWSTATS_ADD(rxpipe, beacon_buffer_thres_host_int_trig_rx_data);
-        DEBUGFS_FWSTATS_ADD(rxpipe, missed_beacon_host_int_trig_rx_data);
-        DEBUGFS_FWSTATS_ADD(rxpipe, tx_xfr_host_int_trig_rx_data);
+        ret = wl1271_ps_elp_wakeup(wl);
+        if (ret < 0)
+                goto out;
+
+        ret = wl1271_acx_sleep_auth(wl, value);
+        if (ret < 0)
+                goto out_sleep;
+
+out_sleep:
+        wl1271_ps_elp_sleep(wl);
+out:
+        mutex_unlock(&wl->mutex);
+        return count;
+}
+
+static const struct file_operations sleep_auth_ops = {
+        .read = sleep_auth_read,
+        .write = sleep_auth_write,
+        .open = simple_open,
+        .llseek = default_llseek,
+};
+
+static ssize_t dev_mem_read(struct file *file,
+             char __user *user_buf, size_t count,
+             loff_t *ppos)
+{
+        struct wl1271 *wl = file->private_data;
+        struct wlcore_partition_set part, old_part;
+        size_t bytes = count;
+        int ret;
+        char *buf;
+
+        /* only requests of dword-aligned size and offset are supported */
+        if (bytes % 4)
+                return -EINVAL;
+
+        if (*ppos % 4)
+                return -EINVAL;
+
+        /* function should return in reasonable time */
+        bytes = min(bytes, WLCORE_MAX_BLOCK_SIZE);
+
+        if (bytes == 0)
+                return -EINVAL;
+
+        memset(&part, 0, sizeof(part));
+        part.mem.start = file->f_pos;
+        part.mem.size = bytes;
+
+        buf = kmalloc(bytes, GFP_KERNEL);
+        if (!buf)
+                return -ENOMEM;
+
+        mutex_lock(&wl->mutex);
+
+        if (wl->state == WL1271_STATE_OFF) {
+                ret = -EFAULT;
+                goto skip_read;
+        }
+
+        ret = wl1271_ps_elp_wakeup(wl);
+        if (ret < 0)
+                goto skip_read;
+
+        /* store current partition and switch partition */
+        memcpy(&old_part, &wl->curr_part, sizeof(old_part));
+        ret = wlcore_set_partition(wl, &part);
+        if (ret < 0)
+                goto part_err;
+
+        ret = wlcore_raw_read(wl, 0, buf, bytes, false);
+        if (ret < 0)
+                goto read_err;
+
+read_err:
+        /* recover partition */
+        ret = wlcore_set_partition(wl, &old_part);
+        if (ret < 0)
+                goto part_err;
+
+part_err:
+        wl1271_ps_elp_sleep(wl);
+
+skip_read:
+        mutex_unlock(&wl->mutex);
+
+        if (ret == 0) {
+                ret = copy_to_user(user_buf, buf, bytes);
+                if (ret < bytes) {
+                        bytes -= ret;
+                        *ppos += bytes;
+                        ret = 0;
+                } else {
+                        ret = -EFAULT;
+                }
+        }
+
+        kfree(buf);
+
+        return ((ret == 0) ? bytes : ret);
+}
+
+static ssize_t dev_mem_write(struct file *file, const char __user *user_buf,
+                size_t count, loff_t *ppos)
+{
+        struct wl1271 *wl = file->private_data;
+        struct wlcore_partition_set part, old_part;
+        size_t bytes = count;
+        int ret;
+        char *buf;
+
+        /* only requests of dword-aligned size and offset are supported */
+        if (bytes % 4)
+                return -EINVAL;
+
+        if (*ppos % 4)
+                return -EINVAL;
+
+        /* function should return in reasonable time */
+        bytes = min(bytes, WLCORE_MAX_BLOCK_SIZE);
+
+        if (bytes == 0)
+                return -EINVAL;
+
+        memset(&part, 0, sizeof(part));
+        part.mem.start = file->f_pos;
+        part.mem.size = bytes;
+
+        buf = kmalloc(bytes, GFP_KERNEL);
+        if (!buf)
+                return -ENOMEM;
+
+        ret = copy_from_user(buf, user_buf, bytes);
+        if (ret) {
+                ret = -EFAULT;
+                goto err_out;
+        }
+
+        mutex_lock(&wl->mutex);
+
+        if (wl->state == WL1271_STATE_OFF) {
+                ret = -EFAULT;
+                goto skip_write;
+        }
+
+        ret = wl1271_ps_elp_wakeup(wl);
+        if (ret < 0)
+                goto skip_write;
+
+        /* store current partition and switch partition */
+        memcpy(&old_part, &wl->curr_part, sizeof(old_part));
+        ret = wlcore_set_partition(wl, &part);
+        if (ret < 0)
+                goto part_err;
+
+        ret = wlcore_raw_write(wl, 0, buf, bytes, false);
+        if (ret < 0)
+                goto write_err;
+
+write_err:
+        /* recover partition */
+        ret = wlcore_set_partition(wl, &old_part);
+        if (ret < 0)
+                goto part_err;
+
+part_err:
+        wl1271_ps_elp_sleep(wl);
+
+skip_write:
+        mutex_unlock(&wl->mutex);
+
+        if (ret == 0)
+                *ppos += bytes;
+
+err_out:
+        kfree(buf);
+
+        return ((ret == 0) ? bytes : ret);
+}
+
+static loff_t dev_mem_seek(struct file *file, loff_t offset, int orig)
+{
+        loff_t ret;
+
+        /* only requests of dword-aligned size and offset are supported */
+        if (offset % 4)
+                return -EINVAL;
+
+        switch (orig) {
+        case SEEK_SET:
+                file->f_pos = offset;
+                ret = file->f_pos;
+                break;
+        case SEEK_CUR:
+                file->f_pos += offset;
+                ret = file->f_pos;
+                break;
+        default:
+                ret = -EINVAL;
+        }
+
+        return ret;
+}
+
+static const struct file_operations dev_mem_ops = {
+        .open = simple_open,
+        .read = dev_mem_read,
+        .write = dev_mem_write,
+        .llseek = dev_mem_seek,
+};
+
+static int wl1271_debugfs_add_files(struct wl1271 *wl,
+                                    struct dentry *rootdir)
+{
+        int ret = 0;
+        struct dentry *entry, *streaming;
 
         DEBUGFS_ADD(tx_queue_len, rootdir);
         DEBUGFS_ADD(retry_count, rootdir);
@@ -1120,6 +1237,11 @@ static int wl1271_debugfs_add_files(struct wl1271 *wl,
         DEBUGFS_ADD(dynamic_ps_timeout, rootdir);
         DEBUGFS_ADD(forced_ps, rootdir);
         DEBUGFS_ADD(split_scan_timeout, rootdir);
+        DEBUGFS_ADD(irq_pkt_threshold, rootdir);
+        DEBUGFS_ADD(irq_blk_threshold, rootdir);
+        DEBUGFS_ADD(irq_timeout, rootdir);
+        DEBUGFS_ADD(fw_stats_raw, rootdir);
+        DEBUGFS_ADD(sleep_auth, rootdir);
 
         streaming = debugfs_create_dir("rx_streaming", rootdir);
         if (!streaming || IS_ERR(streaming))
@@ -1128,6 +1250,7 @@ static int wl1271_debugfs_add_files(struct wl1271 *wl,
         DEBUGFS_ADD_PREFIX(rx_streaming, interval, streaming);
         DEBUGFS_ADD_PREFIX(rx_streaming, always, streaming);
 
+        DEBUGFS_ADD_PREFIX(dev, mem, rootdir);
 
         return 0;
 
@@ -1145,7 +1268,7 @@ void wl1271_debugfs_reset(struct wl1271 *wl)
         if (!wl->stats.fw_stats)
                 return;
 
-        memset(wl->stats.fw_stats, 0, sizeof(*wl->stats.fw_stats));
+        memset(wl->stats.fw_stats, 0, wl->stats.fw_stats_len);
         wl->stats.retry_count = 0;
         wl->stats.excessive_retries = 0;
 }
@@ -1160,34 +1283,34 @@ int wl1271_debugfs_init(struct wl1271 *wl)
 
         if (IS_ERR(rootdir)) {
                 ret = PTR_ERR(rootdir);
-                goto err;
+                goto out;
         }
 
-        wl->stats.fw_stats = kzalloc(sizeof(*wl->stats.fw_stats),
-                                      GFP_KERNEL);
-
+        wl->stats.fw_stats = kzalloc(wl->stats.fw_stats_len, GFP_KERNEL);
         if (!wl->stats.fw_stats) {
                 ret = -ENOMEM;
-                goto err_fw;
+                goto out_remove;
         }
 
         wl->stats.fw_stats_update = jiffies;
 
         ret = wl1271_debugfs_add_files(wl, rootdir);
+        if (ret < 0)
+                goto out_exit;
 
+        ret = wlcore_debugfs_init(wl, rootdir);
         if (ret < 0)
-                goto err_file;
+                goto out_exit;
 
-        return 0;
+        goto out;
 
-err_file:
-        kfree(wl->stats.fw_stats);
-        wl->stats.fw_stats = NULL;
+out_exit:
+        wl1271_debugfs_exit(wl);
 
-err_fw:
+out_remove:
         debugfs_remove_recursive(rootdir);
 
-err:
+out:
         return ret;
 }
 
diff --git a/drivers/net/wireless/ti/wlcore/debugfs.h b/drivers/net/wireless/ti/wlcore/debugfs.h
index a8d3aef011f..f7381dd6900 100644
--- a/drivers/net/wireless/ti/wlcore/debugfs.h
+++ b/drivers/net/wireless/ti/wlcore/debugfs.h
@@ -26,8 +26,95 @@
 
 #include "wlcore.h"
 
+int wl1271_format_buffer(char __user *userbuf, size_t count,
+                         loff_t *ppos, char *fmt, ...);
+
 int wl1271_debugfs_init(struct wl1271 *wl);
 void wl1271_debugfs_exit(struct wl1271 *wl);
 void wl1271_debugfs_reset(struct wl1271 *wl);
+void wl1271_debugfs_update_stats(struct wl1271 *wl);
+
+#define DEBUGFS_FORMAT_BUFFER_SIZE 256
+
+#define DEBUGFS_READONLY_FILE(name, fmt, value...)                      \
+static ssize_t name## _read(struct file *file, char __user *userbuf,    \
+                            size_t count, loff_t *ppos)                 \
+{                                                                       \
+        struct wl1271 *wl = file->private_data;                         \
+        return wl1271_format_buffer(userbuf, count, ppos,               \
+                                    fmt "\n", ##value);                 \
+}                                                                       \
+                                                                        \
+static const struct file_operations name## _ops = {                     \
+        .read = name## _read,                                           \
+        .open = simple_open,                                            \
+        .llseek = generic_file_llseek,                                  \
+};
+
+#define DEBUGFS_ADD(name, parent)                                       \
+        do {                                                            \
+                entry = debugfs_create_file(#name, 0400, parent,        \
+                                            wl, &name## _ops);          \
+                if (!entry || IS_ERR(entry))                            \
+                        goto err;                                       \
+        } while (0);
+
+
+#define DEBUGFS_ADD_PREFIX(prefix, name, parent)                        \
+        do {                                                            \
+                entry = debugfs_create_file(#name, 0400, parent,        \
+                                    wl, &prefix## _## name## _ops);     \
+                if (!entry || IS_ERR(entry))                            \
+                        goto err;                                       \
+        } while (0);
+
+#define DEBUGFS_FWSTATS_FILE(sub, name, fmt, struct_type)               \
+static ssize_t sub## _ ##name## _read(struct file *file,                \
+                                      char __user *userbuf,             \
+                                      size_t count, loff_t *ppos)       \
+{                                                                       \
+        struct wl1271 *wl = file->private_data;                         \
+        struct struct_type *stats = wl->stats.fw_stats;                 \
+                                                                        \
+        wl1271_debugfs_update_stats(wl);                                \
+                                                                        \
+        return wl1271_format_buffer(userbuf, count, ppos, fmt "\n",     \
+                                    stats->sub.name);                   \
+}                                                                       \
+                                                                        \
+static const struct file_operations sub## _ ##name## _ops = {           \
+        .read = sub## _ ##name## _read,                                 \
+        .open = simple_open,                                            \
+        .llseek = generic_file_llseek,                                  \
+};
+
+#define DEBUGFS_FWSTATS_FILE_ARRAY(sub, name, len, struct_type)         \
+static ssize_t sub## _ ##name## _read(struct file *file,                \
+                                      char __user *userbuf,             \
+                                      size_t count, loff_t *ppos)       \
+{                                                                       \
+        struct wl1271 *wl = file->private_data;                         \
+        struct struct_type *stats = wl->stats.fw_stats;                 \
+        char buf[DEBUGFS_FORMAT_BUFFER_SIZE] = "";                      \
+        int res, i;                                                     \
+                                                                        \
+        wl1271_debugfs_update_stats(wl);                                \
+                                                                        \
+        for (i = 0; i < len; i++)                                       \
+                res = snprintf(buf, sizeof(buf), "%s[%d] = %d\n",       \
+                               buf, i, stats->sub.name[i]);             \
+                                                                        \
+        return wl1271_format_buffer(userbuf, count, ppos, "%s", buf);   \
+}                                                                       \
+                                                                        \
+static const struct file_operations sub## _ ##name## _ops = {           \
+        .read = sub## _ ##name## _read,                                 \
+        .open = simple_open,                                            \
+        .llseek = generic_file_llseek,                                  \
+};
+
+#define DEBUGFS_FWSTATS_ADD(sub, name)                                  \
+        DEBUGFS_ADD(sub## _ ##name, stats)
+
 
 #endif /* WL1271_DEBUGFS_H */
diff --git a/drivers/net/wireless/ti/wlcore/event.c b/drivers/net/wireless/ti/wlcore/event.c
index 28e2a633c3b..48907054d49 100644
--- a/drivers/net/wireless/ti/wlcore/event.c
+++ b/drivers/net/wireless/ti/wlcore/event.c
@@ -105,6 +105,7 @@ static int wl1271_event_process(struct wl1271 *wl)
         u32 vector;
         bool disconnect_sta = false;
         unsigned long sta_bitmap = 0;
+        int ret;
 
         wl1271_event_mbox_dump(mbox);
 
@@ -148,15 +149,33 @@ static int wl1271_event_process(struct wl1271 *wl)
                 int delay = wl->conf.conn.synch_fail_thold *
                                         wl->conf.conn.bss_lose_timeout;
                 wl1271_info("Beacon loss detected.");
-                cancel_delayed_work_sync(&wl->connection_loss_work);
+
+                /*
+                 * if the work is already queued, it should take place. We
+                 * don't want to delay the connection loss indication
+                 * any more.
+                 */
                 ieee80211_queue_delayed_work(wl->hw, &wl->connection_loss_work,
-                      msecs_to_jiffies(delay));
+                                             msecs_to_jiffies(delay));
+
+                wl12xx_for_each_wlvif_sta(wl, wlvif) {
+                        vif = wl12xx_wlvif_to_vif(wlvif);
+
+                        ieee80211_cqm_rssi_notify(
+                                        vif,
+                                        NL80211_CQM_RSSI_BEACON_LOSS_EVENT,
+                                        GFP_KERNEL);
+                }
         }
 
         if (vector & REGAINED_BSS_EVENT_ID) {
                 /* TODO: check for multi-role */
                 wl1271_info("Beacon regained.");
-                cancel_delayed_work_sync(&wl->connection_loss_work);
+                cancel_delayed_work(&wl->connection_loss_work);
+
+                /* sanity check - we can't lose and gain the beacon together */
+                WARN(vector & BSS_LOSE_EVENT_ID,
+                     "Concurrent beacon loss and gain from FW");
         }
 
         if (vector & RSSI_SNR_TRIGGER_0_EVENT_ID) {
@@ -210,7 +229,9 @@ static int wl1271_event_process(struct wl1271 *wl)
 
         if ((vector & DUMMY_PACKET_EVENT_ID)) {
                 wl1271_debug(DEBUG_EVENT, "DUMMY_PACKET_ID_EVENT_ID");
-                wl1271_tx_dummy_packet(wl);
+                ret = wl1271_tx_dummy_packet(wl);
+                if (ret < 0)
+                        return ret;
         }
 
         /*
@@ -283,8 +304,10 @@ int wl1271_event_handle(struct wl1271 *wl, u8 mbox_num)
                 return -EINVAL;
 
         /* first we read the mbox descriptor */
-        wl1271_read(wl, wl->mbox_ptr[mbox_num], wl->mbox,
-                    sizeof(*wl->mbox), false);
+        ret = wlcore_read(wl, wl->mbox_ptr[mbox_num], wl->mbox,
+                          sizeof(*wl->mbox), false);
+        if (ret < 0)
+                return ret;
 
         /* process the descriptor */
         ret = wl1271_event_process(wl);
@@ -295,7 +318,7 @@ int wl1271_event_handle(struct wl1271 *wl, u8 mbox_num)
          * TODO: we just need this because one bit is in a different
          * place.  Is there any better way?
          */
-        wl->ops->ack_event(wl);
+        ret = wl->ops->ack_event(wl);
 
-        return 0;
+        return ret;
 }
diff --git a/drivers/net/wireless/ti/wlcore/hw_ops.h b/drivers/net/wireless/ti/wlcore/hw_ops.h
index 9384b4d56c2..2673d783ec1 100644
--- a/drivers/net/wireless/ti/wlcore/hw_ops.h
+++ b/drivers/net/wireless/ti/wlcore/hw_ops.h
@@ -65,11 +65,13 @@ wlcore_hw_get_rx_buf_align(struct wl1271 *wl, u32 rx_desc)
         return wl->ops->get_rx_buf_align(wl, rx_desc);
 }
 
-static inline void
+static inline int
 wlcore_hw_prepare_read(struct wl1271 *wl, u32 rx_desc, u32 len)
 {
         if (wl->ops->prepare_read)
-                wl->ops->prepare_read(wl, rx_desc, len);
+                return wl->ops->prepare_read(wl, rx_desc, len);
+
+        return 0;
 }
 
 static inline u32
@@ -81,10 +83,12 @@ wlcore_hw_get_rx_packet_len(struct wl1271 *wl, void *rx_data, u32 data_len)
         return wl->ops->get_rx_packet_len(wl, rx_data, data_len);
 }
 
-static inline void wlcore_hw_tx_delayed_compl(struct wl1271 *wl)
+static inline int wlcore_hw_tx_delayed_compl(struct wl1271 *wl)
 {
         if (wl->ops->tx_delayed_compl)
-                wl->ops->tx_delayed_compl(wl);
+                return wl->ops->tx_delayed_compl(wl);
+
+        return 0;
 }
 
 static inline void wlcore_hw_tx_immediate_compl(struct wl1271 *wl)
@@ -119,4 +123,82 @@ static inline int wlcore_identify_fw(struct wl1271 *wl)
         return 0;
 }
 
+static inline void
+wlcore_hw_set_tx_desc_csum(struct wl1271 *wl,
+                           struct wl1271_tx_hw_descr *desc,
+                           struct sk_buff *skb)
+{
+        if (!wl->ops->set_tx_desc_csum)
+                BUG_ON(1);
+
+        wl->ops->set_tx_desc_csum(wl, desc, skb);
+}
+
+static inline void
+wlcore_hw_set_rx_csum(struct wl1271 *wl,
+                      struct wl1271_rx_descriptor *desc,
+                      struct sk_buff *skb)
+{
+        if (wl->ops->set_rx_csum)
+                wl->ops->set_rx_csum(wl, desc, skb);
+}
+
+static inline u32
+wlcore_hw_ap_get_mimo_wide_rate_mask(struct wl1271 *wl,
+                                     struct wl12xx_vif *wlvif)
+{
+        if (wl->ops->ap_get_mimo_wide_rate_mask)
+                return wl->ops->ap_get_mimo_wide_rate_mask(wl, wlvif);
+
+        return 0;
+}
+
+static inline int
+wlcore_debugfs_init(struct wl1271 *wl, struct dentry *rootdir)
+{
+        if (wl->ops->debugfs_init)
+                return wl->ops->debugfs_init(wl, rootdir);
+
+        return 0;
+}
+
+static inline int
+wlcore_handle_static_data(struct wl1271 *wl, void *static_data)
+{
+        if (wl->ops->handle_static_data)
+                return wl->ops->handle_static_data(wl, static_data);
+
+        return 0;
+}
+
+static inline int
+wlcore_hw_get_spare_blocks(struct wl1271 *wl, bool is_gem)
+{
+        if (!wl->ops->get_spare_blocks)
+                BUG_ON(1);
+
+        return wl->ops->get_spare_blocks(wl, is_gem);
+}
+
+static inline int
+wlcore_hw_set_key(struct wl1271 *wl, enum set_key_cmd cmd,
+                  struct ieee80211_vif *vif,
+                  struct ieee80211_sta *sta,
+                  struct ieee80211_key_conf *key_conf)
+{
+        if (!wl->ops->set_key)
+                BUG_ON(1);
+
+        return wl->ops->set_key(wl, cmd, vif, sta, key_conf);
+}
+
+static inline u32
+wlcore_hw_pre_pkt_send(struct wl1271 *wl, u32 buf_offset, u32 last_len)
+{
+        if (wl->ops->pre_pkt_send)
+                return wl->ops->pre_pkt_send(wl, buf_offset, last_len);
+
+        return buf_offset;
+}
+
 #endif
diff --git a/drivers/net/wireless/ti/wlcore/ini.h b/drivers/net/wireless/ti/wlcore/ini.h
index 4cf9ecc5621..d24fe3bbc67 100644
--- a/drivers/net/wireless/ti/wlcore/ini.h
+++ b/drivers/net/wireless/ti/wlcore/ini.h
@@ -172,7 +172,19 @@ struct wl128x_ini_fem_params_5 {
 
 /* NVS data structure */
 #define WL1271_INI_NVS_SECTION_SIZE                  468
-#define WL1271_INI_FEM_MODULE_COUNT                  2
+
+/* We have four FEM module types: 0-RFMD, 1-TQS, 2-SKW, 3-TQS_HP */
+#define WL1271_INI_FEM_MODULE_COUNT                  4
+
+/*
+ * In NVS we only store two FEM module entries -
+ *        FEM modules 0,2,3 are stored in entry 0
+ *        FEM module 1 is stored in entry 1
+ */
+#define WL12XX_NVS_FEM_MODULE_COUNT                  2
+
+#define WL12XX_FEM_TO_NVS_ENTRY(ini_fem_module)      \
+        ((ini_fem_module) == 1 ? 1 : 0)
 
 #define WL1271_INI_LEGACY_NVS_FILE_SIZE              800
 
@@ -188,13 +200,13 @@ struct wl1271_nvs_file {
         struct {
                 struct wl1271_ini_fem_params_2 params;
                 u8 padding;
-        } dyn_radio_params_2[WL1271_INI_FEM_MODULE_COUNT];
+        } dyn_radio_params_2[WL12XX_NVS_FEM_MODULE_COUNT];
         struct wl1271_ini_band_params_5 stat_radio_params_5;
         u8 padding3;
         struct {
                 struct wl1271_ini_fem_params_5 params;
                 u8 padding;
-        } dyn_radio_params_5[WL1271_INI_FEM_MODULE_COUNT];
+        } dyn_radio_params_5[WL12XX_NVS_FEM_MODULE_COUNT];
 } __packed;
 
 struct wl128x_nvs_file {
@@ -209,12 +221,12 @@ struct wl128x_nvs_file {
         struct {
                 struct wl128x_ini_fem_params_2 params;
                 u8 padding;
-        } dyn_radio_params_2[WL1271_INI_FEM_MODULE_COUNT];
+        } dyn_radio_params_2[WL12XX_NVS_FEM_MODULE_COUNT];
         struct wl128x_ini_band_params_5 stat_radio_params_5;
         u8 padding3;
         struct {
                 struct wl128x_ini_fem_params_5 params;
                 u8 padding;
-        } dyn_radio_params_5[WL1271_INI_FEM_MODULE_COUNT];
+        } dyn_radio_params_5[WL12XX_NVS_FEM_MODULE_COUNT];
 } __packed;
 #endif
diff --git a/drivers/net/wireless/ti/wlcore/init.c b/drivers/net/wireless/ti/wlcore/init.c
index 9f89255eb6e..8a8a8971bef 100644
--- a/drivers/net/wireless/ti/wlcore/init.c
+++ b/drivers/net/wireless/ti/wlcore/init.c
@@ -460,6 +460,9 @@ int wl1271_init_ap_rates(struct wl1271 *wl, struct wl12xx_vif *wlvif)
         /* unconditionally enable HT rates */
         supported_rates |= CONF_TX_MCS_RATES;
 
+        /* get extra MIMO or wide-chan rates where the HW supports it */
+        supported_rates |= wlcore_hw_ap_get_mimo_wide_rate_mask(wl, wlvif);
+
         /* configure unicast TX rate classes */
         for (i = 0; i < wl->conf.tx.ac_conf_count; i++) {
                 rc.enabled_rates = supported_rates;
@@ -551,29 +554,28 @@ int wl1271_init_vif_specific(struct wl1271 *wl, struct ieee80211_vif *vif)
         bool is_ap = (wlvif->bss_type == BSS_TYPE_AP_BSS);
         int ret, i;
 
-        /*
-         * consider all existing roles before configuring psm.
-         * TODO: reconfigure on interface removal.
-         */
-        if (!wl->ap_count) {
-                if (is_ap) {
-                        /* Configure for power always on */
+        /* consider all existing roles before configuring psm. */
+
+        if (wl->ap_count == 0 && is_ap) { /* first AP */
+                /* Configure for power always on */
+                ret = wl1271_acx_sleep_auth(wl, WL1271_PSM_CAM);
+                if (ret < 0)
+                        return ret;
+        /* first STA, no APs */
+        } else if (wl->sta_count == 0 && wl->ap_count == 0 && !is_ap) {
+                u8 sta_auth = wl->conf.conn.sta_sleep_auth;
+                /* Configure for power according to debugfs */
+                if (sta_auth != WL1271_PSM_ILLEGAL)
+                        ret = wl1271_acx_sleep_auth(wl, sta_auth);
+                /* Configure for power always on */
+                else if (wl->quirks & WLCORE_QUIRK_NO_ELP)
                         ret = wl1271_acx_sleep_auth(wl, WL1271_PSM_CAM);
-                        if (ret < 0)
-                                return ret;
-                } else if (!wl->sta_count) {
-                        if (wl->quirks & WLCORE_QUIRK_NO_ELP) {
-                                /* Configure for power always on */
-                                ret = wl1271_acx_sleep_auth(wl, WL1271_PSM_CAM);
-                                if (ret < 0)
-                                        return ret;
-                        } else {
-                                /* Configure for ELP power saving */
-                                ret = wl1271_acx_sleep_auth(wl, WL1271_PSM_ELP);
-                                if (ret < 0)
-                                        return ret;
-                        }
-                }
+                /* Configure for ELP power saving */
+                else
+                        ret = wl1271_acx_sleep_auth(wl, WL1271_PSM_ELP);
+
+                if (ret < 0)
+                        return ret;
         }
 
         /* Mode specific init */
diff --git a/drivers/net/wireless/ti/wlcore/io.c b/drivers/net/wireless/ti/wlcore/io.c
index 7cd0081aede..9976219c4e4 100644
--- a/drivers/net/wireless/ti/wlcore/io.c
+++ b/drivers/net/wireless/ti/wlcore/io.c
@@ -48,6 +48,12 @@ void wlcore_disable_interrupts(struct wl1271 *wl)
 }
 EXPORT_SYMBOL_GPL(wlcore_disable_interrupts);
 
+void wlcore_disable_interrupts_nosync(struct wl1271 *wl)
+{
+        disable_irq_nosync(wl->irq);
+}
+EXPORT_SYMBOL_GPL(wlcore_disable_interrupts_nosync);
+
 void wlcore_enable_interrupts(struct wl1271 *wl)
 {
         enable_irq(wl->irq);
@@ -122,9 +128,11 @@ EXPORT_SYMBOL_GPL(wlcore_translate_addr);
  *                                    |    |
  *
  */
-void wlcore_set_partition(struct wl1271 *wl,
-                          const struct wlcore_partition_set *p)
+int wlcore_set_partition(struct wl1271 *wl,
+                         const struct wlcore_partition_set *p)
 {
+        int ret;
+
         /* copy partition info */
         memcpy(&wl->curr_part, p, sizeof(*p));
 
@@ -137,28 +145,41 @@ void wlcore_set_partition(struct wl1271 *wl,
         wl1271_debug(DEBUG_IO, "mem3_start %08X mem3_size %08X",
                      p->mem3.start, p->mem3.size);
 
-        wl1271_raw_write32(wl, HW_PART0_START_ADDR, p->mem.start);
-        wl1271_raw_write32(wl, HW_PART0_SIZE_ADDR, p->mem.size);
-        wl1271_raw_write32(wl, HW_PART1_START_ADDR, p->reg.start);
-        wl1271_raw_write32(wl, HW_PART1_SIZE_ADDR, p->reg.size);
-        wl1271_raw_write32(wl, HW_PART2_START_ADDR, p->mem2.start);
-        wl1271_raw_write32(wl, HW_PART2_SIZE_ADDR, p->mem2.size);
+        ret = wlcore_raw_write32(wl, HW_PART0_START_ADDR, p->mem.start);
+        if (ret < 0)
+                goto out;
+
+        ret = wlcore_raw_write32(wl, HW_PART0_SIZE_ADDR, p->mem.size);
+        if (ret < 0)
+                goto out;
+
+        ret = wlcore_raw_write32(wl, HW_PART1_START_ADDR, p->reg.start);
+        if (ret < 0)
+                goto out;
+
+        ret = wlcore_raw_write32(wl, HW_PART1_SIZE_ADDR, p->reg.size);
+        if (ret < 0)
+                goto out;
+
+        ret = wlcore_raw_write32(wl, HW_PART2_START_ADDR, p->mem2.start);
+        if (ret < 0)
+                goto out;
+
+        ret = wlcore_raw_write32(wl, HW_PART2_SIZE_ADDR, p->mem2.size);
+        if (ret < 0)
+                goto out;
+
         /*
          * We don't need the size of the last partition, as it is
          * automatically calculated based on the total memory size and
          * the sizes of the previous partitions.
          */
-        wl1271_raw_write32(wl, HW_PART3_START_ADDR, p->mem3.start);
-}
-EXPORT_SYMBOL_GPL(wlcore_set_partition);
+        ret = wlcore_raw_write32(wl, HW_PART3_START_ADDR, p->mem3.start);
 
-void wlcore_select_partition(struct wl1271 *wl, u8 part)
-{
-        wl1271_debug(DEBUG_IO, "setting partition %d", part);
-
-        wlcore_set_partition(wl, &wl->ptable[part]);
+out:
+        return ret;
 }
-EXPORT_SYMBOL_GPL(wlcore_select_partition);
+EXPORT_SYMBOL_GPL(wlcore_set_partition);
 
 void wl1271_io_reset(struct wl1271 *wl)
 {
diff --git a/drivers/net/wireless/ti/wlcore/io.h b/drivers/net/wireless/ti/wlcore/io.h
index 8942954b56a..fef80adc8bf 100644
--- a/drivers/net/wireless/ti/wlcore/io.h
+++ b/drivers/net/wireless/ti/wlcore/io.h
@@ -45,6 +45,7 @@
 struct wl1271;
 
 void wlcore_disable_interrupts(struct wl1271 *wl);
+void wlcore_disable_interrupts_nosync(struct wl1271 *wl);
 void wlcore_enable_interrupts(struct wl1271 *wl);
 
 void wl1271_io_reset(struct wl1271 *wl);
@@ -52,79 +53,113 @@ void wl1271_io_init(struct wl1271 *wl);
 int wlcore_translate_addr(struct wl1271 *wl, int addr);
 
 /* Raw target IO, address is not translated */
-static inline void wl1271_raw_write(struct wl1271 *wl, int addr, void *buf,
-                                    size_t len, bool fixed)
+static inline int __must_check wlcore_raw_write(struct wl1271 *wl, int addr,
+                                                void *buf, size_t len,
+                                                bool fixed)
 {
-        wl->if_ops->write(wl->dev, addr, buf, len, fixed);
+        int ret;
+
+        if (test_bit(WL1271_FLAG_SDIO_FAILED, &wl->flags))
+                return -EIO;
+
+        ret = wl->if_ops->write(wl->dev, addr, buf, len, fixed);
+        if (ret)
+                set_bit(WL1271_FLAG_SDIO_FAILED, &wl->flags);
+
+        return ret;
 }
 
-static inline void wl1271_raw_read(struct wl1271 *wl, int addr, void *buf,
-                                   size_t len, bool fixed)
+static inline int __must_check wlcore_raw_read(struct wl1271 *wl, int addr,
+                                               void *buf, size_t len,
+                                               bool fixed)
 {
-        wl->if_ops->read(wl->dev, addr, buf, len, fixed);
+        int ret;
+
+        if (test_bit(WL1271_FLAG_SDIO_FAILED, &wl->flags))
+                return -EIO;
+
+        ret = wl->if_ops->read(wl->dev, addr, buf, len, fixed);
+        if (ret)
+                set_bit(WL1271_FLAG_SDIO_FAILED, &wl->flags);
+
+        return ret;
 }
 
-static inline void wlcore_raw_read_data(struct wl1271 *wl, int reg, void *buf,
-                                        size_t len, bool fixed)
+static inline int __must_check wlcore_raw_read_data(struct wl1271 *wl, int reg,
+                                                    void *buf, size_t len,
+                                                    bool fixed)
 {
-        wl1271_raw_read(wl, wl->rtable[reg], buf, len, fixed);
+        return wlcore_raw_read(wl, wl->rtable[reg], buf, len, fixed);
 }
 
-static inline void wlcore_raw_write_data(struct wl1271 *wl, int reg, void *buf,
-                                         size_t len, bool fixed)
+static inline int __must_check wlcore_raw_write_data(struct wl1271 *wl, int reg,
+                                                     void *buf, size_t len,
+                                                     bool fixed)
 {
-        wl1271_raw_write(wl, wl->rtable[reg], buf, len, fixed);
+        return wlcore_raw_write(wl, wl->rtable[reg], buf, len, fixed);
 }
 
-static inline u32 wl1271_raw_read32(struct wl1271 *wl, int addr)
+static inline int __must_check wlcore_raw_read32(struct wl1271 *wl, int addr,
+                                                 u32 *val)
 {
-        wl1271_raw_read(wl, addr, &wl->buffer_32,
-                            sizeof(wl->buffer_32), false);
+        int ret;
+
+        ret = wlcore_raw_read(wl, addr, &wl->buffer_32,
+                              sizeof(wl->buffer_32), false);
+        if (ret < 0)
+                return ret;
+
+        if (val)
+                *val = le32_to_cpu(wl->buffer_32);
 
-        return le32_to_cpu(wl->buffer_32);
+        return 0;
 }
 
-static inline void wl1271_raw_write32(struct wl1271 *wl, int addr, u32 val)
+static inline int __must_check wlcore_raw_write32(struct wl1271 *wl, int addr,
+                                                  u32 val)
 {
         wl->buffer_32 = cpu_to_le32(val);
-        wl1271_raw_write(wl, addr, &wl->buffer_32,
-                             sizeof(wl->buffer_32), false);
+        return wlcore_raw_write(wl, addr, &wl->buffer_32,
+                                sizeof(wl->buffer_32), false);
 }
 
-static inline void wl1271_read(struct wl1271 *wl, int addr, void *buf,
-                               size_t len, bool fixed)
+static inline int __must_check wlcore_read(struct wl1271 *wl, int addr,
+                                           void *buf, size_t len, bool fixed)
 {
         int physical;
 
         physical = wlcore_translate_addr(wl, addr);
 
-        wl1271_raw_read(wl, physical, buf, len, fixed);
+        return wlcore_raw_read(wl, physical, buf, len, fixed);
 }
 
-static inline void wl1271_write(struct wl1271 *wl, int addr, void *buf,
-                                size_t len, bool fixed)
+static inline int __must_check wlcore_write(struct wl1271 *wl, int addr,
+                                            void *buf, size_t len, bool fixed)
 {
         int physical;
 
         physical = wlcore_translate_addr(wl, addr);
 
-        wl1271_raw_write(wl, physical, buf, len, fixed);
+        return wlcore_raw_write(wl, physical, buf, len, fixed);
 }
 
-static inline void wlcore_write_data(struct wl1271 *wl, int reg, void *buf,
-                                     size_t len, bool fixed)
+static inline int __must_check wlcore_write_data(struct wl1271 *wl, int reg,
+                                                 void *buf, size_t len,
+                                                 bool fixed)
 {
-        wl1271_write(wl, wl->rtable[reg], buf, len, fixed);
+        return wlcore_write(wl, wl->rtable[reg], buf, len, fixed);
 }
 
-static inline void wlcore_read_data(struct wl1271 *wl, int reg, void *buf,
-                                    size_t len, bool fixed)
+static inline int __must_check wlcore_read_data(struct wl1271 *wl, int reg,
+                                                void *buf, size_t len,
+                                                bool fixed)
 {
-        wl1271_read(wl, wl->rtable[reg], buf, len, fixed);
+        return wlcore_read(wl, wl->rtable[reg], buf, len, fixed);
 }
 
-static inline void wl1271_read_hwaddr(struct wl1271 *wl, int hwaddr,
-                                      void *buf, size_t len, bool fixed)
+static inline int __must_check wlcore_read_hwaddr(struct wl1271 *wl, int hwaddr,
+                                                  void *buf, size_t len,
+                                                  bool fixed)
 {
         int physical;
         int addr;
@@ -134,34 +169,47 @@ static inline void wl1271_read_hwaddr(struct wl1271 *wl, int hwaddr,
 
         physical = wlcore_translate_addr(wl, addr);
 
-        wl1271_raw_read(wl, physical, buf, len, fixed);
+        return wlcore_raw_read(wl, physical, buf, len, fixed);
 }
 
-static inline u32 wl1271_read32(struct wl1271 *wl, int addr)
+static inline int __must_check wlcore_read32(struct wl1271 *wl, int addr,
+                                             u32 *val)
 {
-        return wl1271_raw_read32(wl, wlcore_translate_addr(wl, addr));
+        return wlcore_raw_read32(wl, wlcore_translate_addr(wl, addr), val);
 }
 
-static inline void wl1271_write32(struct wl1271 *wl, int addr, u32 val)
+static inline int __must_check wlcore_write32(struct wl1271 *wl, int addr,
+                                              u32 val)
 {
-        wl1271_raw_write32(wl, wlcore_translate_addr(wl, addr), val);
+        return wlcore_raw_write32(wl, wlcore_translate_addr(wl, addr), val);
 }
 
-static inline u32 wlcore_read_reg(struct wl1271 *wl, int reg)
+static inline int __must_check wlcore_read_reg(struct wl1271 *wl, int reg,
+                                               u32 *val)
 {
-        return wl1271_raw_read32(wl,
-                                 wlcore_translate_addr(wl, wl->rtable[reg]));
+        return wlcore_raw_read32(wl,
+                                 wlcore_translate_addr(wl, wl->rtable[reg]),
+                                 val);
 }
 
-static inline void wlcore_write_reg(struct wl1271 *wl, int reg, u32 val)
+static inline int __must_check wlcore_write_reg(struct wl1271 *wl, int reg,
+                                                u32 val)
 {
-        wl1271_raw_write32(wl, wlcore_translate_addr(wl, wl->rtable[reg]), val);
+        return wlcore_raw_write32(wl,
+                                  wlcore_translate_addr(wl, wl->rtable[reg]),
+                                  val);
 }
 
 static inline void wl1271_power_off(struct wl1271 *wl)
 {
-        wl->if_ops->power(wl->dev, false);
-        clear_bit(WL1271_FLAG_GPIO_POWER, &wl->flags);
+        int ret;
+
+        if (!test_bit(WL1271_FLAG_GPIO_POWER, &wl->flags))
+                return;
+
+        ret = wl->if_ops->power(wl->dev, false);
+        if (!ret)
+                clear_bit(WL1271_FLAG_GPIO_POWER, &wl->flags);
 }
 
 static inline int wl1271_power_on(struct wl1271 *wl)
@@ -173,8 +221,8 @@ static inline int wl1271_power_on(struct wl1271 *wl)
         return ret;
 }
 
-void wlcore_set_partition(struct wl1271 *wl,
-                          const struct wlcore_partition_set *p);
+int wlcore_set_partition(struct wl1271 *wl,
+                         const struct wlcore_partition_set *p);
 
 bool wl1271_set_block_size(struct wl1271 *wl);
 
@@ -182,6 +230,4 @@ bool wl1271_set_block_size(struct wl1271 *wl);
 
 int wl1271_tx_dummy_packet(struct wl1271 *wl);
 
-void wlcore_select_partition(struct wl1271 *wl, u8 part);
-
 #endif
diff --git a/drivers/net/wireless/ti/wlcore/main.c b/drivers/net/wireless/ti/wlcore/main.c
index acef93390d3..2240cca597a 100644
--- a/drivers/net/wireless/ti/wlcore/main.c
+++ b/drivers/net/wireless/ti/wlcore/main.c
@@ -320,46 +320,6 @@ static void wlcore_adjust_conf(struct wl1271 *wl)
         }
 }
 
-static int wl1271_plt_init(struct wl1271 *wl)
-{
-        int ret;
-
-        ret = wl->ops->hw_init(wl);
-        if (ret < 0)
-                return ret;
-
-        ret = wl1271_acx_init_mem_config(wl);
-        if (ret < 0)
-                return ret;
-
-        ret = wl12xx_acx_mem_cfg(wl);
-        if (ret < 0)
-                goto out_free_memmap;
-
-        /* Enable data path */
-        ret = wl1271_cmd_data_path(wl, 1);
-        if (ret < 0)
-                goto out_free_memmap;
-
-        /* Configure for CAM power saving (ie. always active) */
-        ret = wl1271_acx_sleep_auth(wl, WL1271_PSM_CAM);
-        if (ret < 0)
-                goto out_free_memmap;
-
-        /* configure PM */
-        ret = wl1271_acx_pm_config(wl);
-        if (ret < 0)
-                goto out_free_memmap;
-
-        return 0;
-
- out_free_memmap:
-        kfree(wl->target_mem_map);
-        wl->target_mem_map = NULL;
-
-        return ret;
-}
-
 static void wl12xx_irq_ps_regulate_link(struct wl1271 *wl,
                                         struct wl12xx_vif *wlvif,
                                         u8 hlid, u8 tx_pkts)
@@ -387,7 +347,7 @@ static void wl12xx_irq_ps_regulate_link(struct wl1271 *wl,
 
 static void wl12xx_irq_update_links_status(struct wl1271 *wl,
                                            struct wl12xx_vif *wlvif,
-                                           struct wl_fw_status *status)
+                                           struct wl_fw_status_2 *status)
 {
         struct wl1271_link *lnk;
         u32 cur_fw_ps_map;
@@ -418,8 +378,9 @@ static void wl12xx_irq_update_links_status(struct wl1271 *wl,
         }
 }
 
-static void wl12xx_fw_status(struct wl1271 *wl,
-                             struct wl_fw_status *status)
+static int wlcore_fw_status(struct wl1271 *wl,
+                            struct wl_fw_status_1 *status_1,
+                            struct wl_fw_status_2 *status_2)
 {
         struct wl12xx_vif *wlvif;
         struct timespec ts;
@@ -427,38 +388,42 @@ static void wl12xx_fw_status(struct wl1271 *wl,
         int avail, freed_blocks;
         int i;
         size_t status_len;
+        int ret;
 
-        status_len = sizeof(*status) + wl->fw_status_priv_len;
+        status_len = WLCORE_FW_STATUS_1_LEN(wl->num_rx_desc) +
+                sizeof(*status_2) + wl->fw_status_priv_len;
 
-        wlcore_raw_read_data(wl, REG_RAW_FW_STATUS_ADDR, status,
-                             status_len, false);
+        ret = wlcore_raw_read_data(wl, REG_RAW_FW_STATUS_ADDR, status_1,
+                                   status_len, false);
+        if (ret < 0)
+                return ret;
 
         wl1271_debug(DEBUG_IRQ, "intr: 0x%x (fw_rx_counter = %d, "
                      "drv_rx_counter = %d, tx_results_counter = %d)",
-                     status->intr,
-                     status->fw_rx_counter,
-                     status->drv_rx_counter,
-                     status->tx_results_counter);
+                     status_1->intr,
+                     status_1->fw_rx_counter,
+                     status_1->drv_rx_counter,
+                     status_1->tx_results_counter);
 
         for (i = 0; i < NUM_TX_QUEUES; i++) {
                 /* prevent wrap-around in freed-packets counter */
                 wl->tx_allocated_pkts[i] -=
-                                (status->counters.tx_released_pkts[i] -
+                                (status_2->counters.tx_released_pkts[i] -
                                 wl->tx_pkts_freed[i]) & 0xff;
 
-                wl->tx_pkts_freed[i] = status->counters.tx_released_pkts[i];
+                wl->tx_pkts_freed[i] = status_2->counters.tx_released_pkts[i];
         }
 
         /* prevent wrap-around in total blocks counter */
         if (likely(wl->tx_blocks_freed <=
-                   le32_to_cpu(status->total_released_blks)))
-                freed_blocks = le32_to_cpu(status->total_released_blks) -
+                   le32_to_cpu(status_2->total_released_blks)))
+                freed_blocks = le32_to_cpu(status_2->total_released_blks) -
                                wl->tx_blocks_freed;
         else
                 freed_blocks = 0x100000000LL - wl->tx_blocks_freed +
-                               le32_to_cpu(status->total_released_blks);
+                               le32_to_cpu(status_2->total_released_blks);
 
-        wl->tx_blocks_freed = le32_to_cpu(status->total_released_blks);
+        wl->tx_blocks_freed = le32_to_cpu(status_2->total_released_blks);
 
         wl->tx_allocated_blocks -= freed_blocks;
 
@@ -474,7 +439,7 @@ static void wl12xx_fw_status(struct wl1271 *wl,
                         cancel_delayed_work(&wl->tx_watchdog_work);
         }
 
-        avail = le32_to_cpu(status->tx_total) - wl->tx_allocated_blocks;
+        avail = le32_to_cpu(status_2->tx_total) - wl->tx_allocated_blocks;
 
         /*
          * The FW might change the total number of TX memblocks before
@@ -493,13 +458,15 @@ static void wl12xx_fw_status(struct wl1271 *wl,
 
         /* for AP update num of allocated TX blocks per link and ps status */
         wl12xx_for_each_wlvif_ap(wl, wlvif) {
-                wl12xx_irq_update_links_status(wl, wlvif, status);
+                wl12xx_irq_update_links_status(wl, wlvif, status_2);
         }
 
         /* update the host-chipset time offset */
         getnstimeofday(&ts);
         wl->time_offset = (timespec_to_ns(&ts) >> 10) -
-                (s64)le32_to_cpu(status->fw_localtime);
+                (s64)le32_to_cpu(status_2->fw_localtime);
+
+        return 0;
 }
 
 static void wl1271_flush_deferred_work(struct wl1271 *wl)
@@ -527,20 +494,15 @@ static void wl1271_netstack_work(struct work_struct *work)
 
 #define WL1271_IRQ_MAX_LOOPS 256
 
-static irqreturn_t wl1271_irq(int irq, void *cookie)
+static int wlcore_irq_locked(struct wl1271 *wl)
 {
-        int ret;
+        int ret = 0;
         u32 intr;
         int loopcount = WL1271_IRQ_MAX_LOOPS;
-        struct wl1271 *wl = (struct wl1271 *)cookie;
         bool done = false;
         unsigned int defer_count;
         unsigned long flags;
 
-        /* TX might be handled here, avoid redundant work */
-        set_bit(WL1271_FLAG_TX_PENDING, &wl->flags);
-        cancel_work_sync(&wl->tx_work);
-
         /*
          * In case edge triggered interrupt must be used, we cannot iterate
          * more than once without introducing race conditions with the hardirq.
@@ -548,8 +510,6 @@ static irqreturn_t wl1271_irq(int irq, void *cookie)
         if (wl->platform_quirks & WL12XX_PLATFORM_QUIRK_EDGE_IRQ)
                 loopcount = 1;
 
-        mutex_lock(&wl->mutex);
-
         wl1271_debug(DEBUG_IRQ, "IRQ work");
 
         if (unlikely(wl->state == WL1271_STATE_OFF))
@@ -568,21 +528,33 @@ static irqreturn_t wl1271_irq(int irq, void *cookie)
                 clear_bit(WL1271_FLAG_IRQ_RUNNING, &wl->flags);
                 smp_mb__after_clear_bit();
 
-                wl12xx_fw_status(wl, wl->fw_status);
+                ret = wlcore_fw_status(wl, wl->fw_status_1, wl->fw_status_2);
+                if (ret < 0)
+                        goto out;
 
                 wlcore_hw_tx_immediate_compl(wl);
 
-                intr = le32_to_cpu(wl->fw_status->intr);
-                intr &= WL1271_INTR_MASK;
+                intr = le32_to_cpu(wl->fw_status_1->intr);
+                intr &= WLCORE_ALL_INTR_MASK;
                 if (!intr) {
                         done = true;
                         continue;
                 }
 
                 if (unlikely(intr & WL1271_ACX_INTR_WATCHDOG)) {
-                        wl1271_error("watchdog interrupt received! "
+                        wl1271_error("HW watchdog interrupt received! starting recovery.");
+                        wl->watchdog_recovery = true;
+                        ret = -EIO;
+
+                        /* restarting the chip. ignore any other interrupt. */
+                        goto out;
+                }
+
+                if (unlikely(intr & WL1271_ACX_SW_INTR_WATCHDOG)) {
+                        wl1271_error("SW watchdog interrupt received! "
                                      "starting recovery.");
-                        wl12xx_queue_recovery_work(wl);
+                        wl->watchdog_recovery = true;
+                        ret = -EIO;
 
                         /* restarting the chip. ignore any other interrupt. */
                         goto out;
@@ -591,7 +563,9 @@ static irqreturn_t wl1271_irq(int irq, void *cookie)
                 if (likely(intr & WL1271_ACX_INTR_DATA)) {
                         wl1271_debug(DEBUG_IRQ, "WL1271_ACX_INTR_DATA");
 
-                        wl12xx_rx(wl, wl->fw_status);
+                        ret = wlcore_rx(wl, wl->fw_status_1);
+                        if (ret < 0)
+                                goto out;
 
                         /* Check if any tx blocks were freed */
                         spin_lock_irqsave(&wl->wl_lock, flags);
@@ -602,13 +576,17 @@ static irqreturn_t wl1271_irq(int irq, void *cookie)
                                  * In order to avoid starvation of the TX path,
                                  * call the work function directly.
                                  */
-                                wl1271_tx_work_locked(wl);
+                                ret = wlcore_tx_work_locked(wl);
+                                if (ret < 0)
+                                        goto out;
                         } else {
                                 spin_unlock_irqrestore(&wl->wl_lock, flags);
                         }
 
                         /* check for tx results */
-                        wlcore_hw_tx_delayed_compl(wl);
+                        ret = wlcore_hw_tx_delayed_compl(wl);
+                        if (ret < 0)
+                                goto out;
 
                         /* Make sure the deferred queues don't get too long */
                         defer_count = skb_queue_len(&wl->deferred_tx_queue) +
@@ -619,12 +597,16 @@ static irqreturn_t wl1271_irq(int irq, void *cookie)
 
                 if (intr & WL1271_ACX_INTR_EVENT_A) {
                         wl1271_debug(DEBUG_IRQ, "WL1271_ACX_INTR_EVENT_A");
-                        wl1271_event_handle(wl, 0);
+                        ret = wl1271_event_handle(wl, 0);
+                        if (ret < 0)
+                                goto out;
                 }
 
                 if (intr & WL1271_ACX_INTR_EVENT_B) {
                         wl1271_debug(DEBUG_IRQ, "WL1271_ACX_INTR_EVENT_B");
-                        wl1271_event_handle(wl, 1);
+                        ret = wl1271_event_handle(wl, 1);
+                        if (ret < 0)
+                                goto out;
                 }
 
                 if (intr & WL1271_ACX_INTR_INIT_COMPLETE)
@@ -638,6 +620,25 @@ static irqreturn_t wl1271_irq(int irq, void *cookie)
         wl1271_ps_elp_sleep(wl);
 
 out:
+        return ret;
+}
+
+static irqreturn_t wlcore_irq(int irq, void *cookie)
+{
+        int ret;
+        unsigned long flags;
+        struct wl1271 *wl = cookie;
+
+        /* TX might be handled here, avoid redundant work */
+        set_bit(WL1271_FLAG_TX_PENDING, &wl->flags);
+        cancel_work_sync(&wl->tx_work);
+
+        mutex_lock(&wl->mutex);
+
+        ret = wlcore_irq_locked(wl);
+        if (ret)
+                wl12xx_queue_recovery_work(wl);
+
         spin_lock_irqsave(&wl->wl_lock, flags);
         /* In case TX was not handled here, queue TX work */
         clear_bit(WL1271_FLAG_TX_PENDING, &wl->flags);
@@ -743,7 +744,7 @@ out:
         return ret;
 }
 
-static int wl1271_fetch_nvs(struct wl1271 *wl)
+static void wl1271_fetch_nvs(struct wl1271 *wl)
 {
         const struct firmware *fw;
         int ret;
@@ -751,16 +752,15 @@ static int wl1271_fetch_nvs(struct wl1271 *wl)
         ret = request_firmware(&fw, WL12XX_NVS_NAME, wl->dev);
 
         if (ret < 0) {
-                wl1271_error("could not get nvs file %s: %d", WL12XX_NVS_NAME,
-                             ret);
-                return ret;
+                wl1271_debug(DEBUG_BOOT, "could not get nvs file %s: %d",
+                             WL12XX_NVS_NAME, ret);
+                return;
         }
 
         wl->nvs = kmemdup(fw->data, fw->size, GFP_KERNEL);
 
         if (!wl->nvs) {
                 wl1271_error("could not allocate memory for the nvs file");
-                ret = -ENOMEM;
                 goto out;
         }
 
@@ -768,14 +768,17 @@ static int wl1271_fetch_nvs(struct wl1271 *wl)
 
 out:
         release_firmware(fw);
-
-        return ret;
 }
 
 void wl12xx_queue_recovery_work(struct wl1271 *wl)
 {
-        if (!test_bit(WL1271_FLAG_RECOVERY_IN_PROGRESS, &wl->flags))
+        WARN_ON(!test_bit(WL1271_FLAG_INTENDED_FW_RECOVERY, &wl->flags));
+
+        /* Avoid a recursive recovery */
+        if (!test_and_set_bit(WL1271_FLAG_RECOVERY_IN_PROGRESS, &wl->flags)) {
+                wlcore_disable_interrupts_nosync(wl);
                 ieee80211_queue_work(wl->hw, &wl->recovery_work);
+        }
 }
 
 size_t wl12xx_copy_fwlog(struct wl1271 *wl, u8 *memblock, size_t maxlen)
@@ -801,14 +804,17 @@ size_t wl12xx_copy_fwlog(struct wl1271 *wl, u8 *memblock, size_t maxlen)
         return len;
 }
 
+#define WLCORE_FW_LOG_END 0x2000000
+
 static void wl12xx_read_fwlog_panic(struct wl1271 *wl)
 {
         u32 addr;
-        u32 first_addr;
+        u32 offset;
+        u32 end_of_log;
         u8 *block;
+        int ret;
 
         if ((wl->quirks & WLCORE_QUIRK_FWLOG_NOT_IMPLEMENTED) ||
-            (wl->conf.fwlog.mode != WL12XX_FWLOG_ON_DEMAND) ||
             (wl->conf.fwlog.mem_blocks == 0))
                 return;
 
@@ -820,34 +826,49 @@ static void wl12xx_read_fwlog_panic(struct wl1271 *wl)
 
         /*
          * Make sure the chip is awake and the logger isn't active.
-         * This might fail if the firmware hanged.
+         * Do not send a stop fwlog command if the fw is hanged.
          */
-        if (!wl1271_ps_elp_wakeup(wl))
+        if (wl1271_ps_elp_wakeup(wl))
+                goto out;
+        if (!wl->watchdog_recovery)
                 wl12xx_cmd_stop_fwlog(wl);
 
         /* Read the first memory block address */
-        wl12xx_fw_status(wl, wl->fw_status);
-        first_addr = le32_to_cpu(wl->fw_status->log_start_addr);
-        if (!first_addr)
+        ret = wlcore_fw_status(wl, wl->fw_status_1, wl->fw_status_2);
+        if (ret < 0)
+                goto out;
+
+        addr = le32_to_cpu(wl->fw_status_2->log_start_addr);
+        if (!addr)
                 goto out;
 
+        if (wl->conf.fwlog.mode == WL12XX_FWLOG_CONTINUOUS) {
+                offset = sizeof(addr) + sizeof(struct wl1271_rx_descriptor);
+                end_of_log = WLCORE_FW_LOG_END;
+        } else {
+                offset = sizeof(addr);
+                end_of_log = addr;
+        }
+
         /* Traverse the memory blocks linked list */
-        addr = first_addr;
         do {
                 memset(block, 0, WL12XX_HW_BLOCK_SIZE);
-                wl1271_read_hwaddr(wl, addr, block, WL12XX_HW_BLOCK_SIZE,
-                                   false);
+                ret = wlcore_read_hwaddr(wl, addr, block, WL12XX_HW_BLOCK_SIZE,
+                                         false);
+                if (ret < 0)
+                        goto out;
 
                 /*
                  * Memory blocks are linked to one another. The first 4 bytes
                  * of each memory block hold the hardware address of the next
-                 * one. The last memory block points to the first one.
+                 * one. The last memory block points to the first one in
+                 * on demand mode and is equal to 0x2000000 in continuous mode.
                  */
                 addr = le32_to_cpup((__le32 *)block);
-                if (!wl12xx_copy_fwlog(wl, block + sizeof(addr),
-                                       WL12XX_HW_BLOCK_SIZE - sizeof(addr)))
+                if (!wl12xx_copy_fwlog(wl, block + offset,
+                                       WL12XX_HW_BLOCK_SIZE - offset))
                         break;
-        } while (addr && (addr != first_addr));
+        } while (addr && (addr != end_of_log));
 
         wake_up_interruptible(&wl->fwlog_waitq);
 
@@ -855,6 +876,34 @@ out:
         kfree(block);
 }
 
+static void wlcore_print_recovery(struct wl1271 *wl)
+{
+        u32 pc = 0;
+        u32 hint_sts = 0;
+        int ret;
+
+        wl1271_info("Hardware recovery in progress. FW ver: %s",
+                    wl->chip.fw_ver_str);
+
+        /* change partitions momentarily so we can read the FW pc */
+        ret = wlcore_set_partition(wl, &wl->ptable[PART_BOOT]);
+        if (ret < 0)
+                return;
+
+        ret = wlcore_read_reg(wl, REG_PC_ON_RECOVERY, &pc);
+        if (ret < 0)
+                return;
+
+        ret = wlcore_read_reg(wl, REG_INTERRUPT_NO_CLEAR, &hint_sts);
+        if (ret < 0)
+                return;
+
+        wl1271_info("pc: 0x%x, hint_sts: 0x%08x", pc, hint_sts);
+
+        wlcore_set_partition(wl, &wl->ptable[PART_WORK]);
+}
+
+
 static void wl1271_recovery_work(struct work_struct *work)
 {
         struct wl1271 *wl =
@@ -867,14 +916,9 @@ static void wl1271_recovery_work(struct work_struct *work)
         if (wl->state != WL1271_STATE_ON || wl->plt)
                 goto out_unlock;
 
-        /* Avoid a recursive recovery */
-        set_bit(WL1271_FLAG_RECOVERY_IN_PROGRESS, &wl->flags);
-
         wl12xx_read_fwlog_panic(wl);
 
-        wl1271_info("Hardware recovery in progress. FW ver: %s pc: 0x%x",
-                    wl->chip.fw_ver_str,
-                    wlcore_read_reg(wl, REG_PC_ON_RECOVERY));
+        wlcore_print_recovery(wl);
 
         BUG_ON(bug_on_recovery &&
                !test_bit(WL1271_FLAG_INTENDED_FW_RECOVERY, &wl->flags));
@@ -885,8 +929,6 @@ static void wl1271_recovery_work(struct work_struct *work)
                 goto out_unlock;
         }
 
-        BUG_ON(bug_on_recovery);
-
         /*
          * Advance security sequence number to overcome potential progress
          * in the firmware during recovery. This doens't hurt if the network is
@@ -900,7 +942,7 @@ static void wl1271_recovery_work(struct work_struct *work)
         }
 
         /* Prevent spurious TX during FW restart */
-        ieee80211_stop_queues(wl->hw);
+        wlcore_stop_queues(wl, WLCORE_QUEUE_STOP_REASON_FW_RESTART);
 
         if (wl->sched_scanning) {
                 ieee80211_sched_scan_stopped(wl->hw);
@@ -914,37 +956,43 @@ static void wl1271_recovery_work(struct work_struct *work)
                 vif = wl12xx_wlvif_to_vif(wlvif);
                 __wl1271_op_remove_interface(wl, vif, false);
         }
+        wl->watchdog_recovery = false;
         mutex_unlock(&wl->mutex);
         wl1271_op_stop(wl->hw);
 
-        clear_bit(WL1271_FLAG_RECOVERY_IN_PROGRESS, &wl->flags);
-
         ieee80211_restart_hw(wl->hw);
 
         /*
          * Its safe to enable TX now - the queues are stopped after a request
          * to restart the HW.
          */
-        ieee80211_wake_queues(wl->hw);
+        wlcore_wake_queues(wl, WLCORE_QUEUE_STOP_REASON_FW_RESTART);
         return;
 out_unlock:
+        wl->watchdog_recovery = false;
         mutex_unlock(&wl->mutex);
 }
 
-static void wl1271_fw_wakeup(struct wl1271 *wl)
+static int wlcore_fw_wakeup(struct wl1271 *wl)
 {
-        wl1271_raw_write32(wl, HW_ACCESS_ELP_CTRL_REG, ELPCTRL_WAKE_UP);
+        return wlcore_raw_write32(wl, HW_ACCESS_ELP_CTRL_REG, ELPCTRL_WAKE_UP);
 }
 
 static int wl1271_setup(struct wl1271 *wl)
 {
-        wl->fw_status = kmalloc(sizeof(*wl->fw_status), GFP_KERNEL);
-        if (!wl->fw_status)
+        wl->fw_status_1 = kmalloc(WLCORE_FW_STATUS_1_LEN(wl->num_rx_desc) +
+                                  sizeof(*wl->fw_status_2) +
+                                  wl->fw_status_priv_len, GFP_KERNEL);
+        if (!wl->fw_status_1)
                 return -ENOMEM;
 
+        wl->fw_status_2 = (struct wl_fw_status_2 *)
+                                (((u8 *) wl->fw_status_1) +
+                                WLCORE_FW_STATUS_1_LEN(wl->num_rx_desc));
+
         wl->tx_res_if = kmalloc(sizeof(*wl->tx_res_if), GFP_KERNEL);
         if (!wl->tx_res_if) {
-                kfree(wl->fw_status);
+                kfree(wl->fw_status_1);
                 return -ENOMEM;
         }
 
@@ -963,13 +1011,21 @@ static int wl12xx_set_power_on(struct wl1271 *wl)
         wl1271_io_reset(wl);
         wl1271_io_init(wl);
 
-        wlcore_set_partition(wl, &wl->ptable[PART_BOOT]);
+        ret = wlcore_set_partition(wl, &wl->ptable[PART_BOOT]);
+        if (ret < 0)
+                goto fail;
 
         /* ELP module wake up */
-        wl1271_fw_wakeup(wl);
+        ret = wlcore_fw_wakeup(wl);
+        if (ret < 0)
+                goto fail;
 
 out:
         return ret;
+
+fail:
+        wl1271_power_off(wl);
+        return ret;
 }
 
 static int wl12xx_chip_wakeup(struct wl1271 *wl, bool plt)
@@ -987,13 +1043,12 @@ static int wl12xx_chip_wakeup(struct wl1271 *wl, bool plt)
          * simplify the code and since the performance impact is
          * negligible, we use the same block size for all different
          * chip types.
+         *
+         * Check if the bus supports blocksize alignment and, if it
+         * doesn't, make sure we don't have the quirk.
          */
-        if (wl1271_set_block_size(wl))
-                wl->quirks |= WLCORE_QUIRK_TX_BLOCKSIZE_ALIGN;
-
-        ret = wl->ops->identify_chip(wl);
-        if (ret < 0)
-                goto out;
+        if (!wl1271_set_block_size(wl))
+                wl->quirks &= ~WLCORE_QUIRK_TX_BLOCKSIZE_ALIGN;
 
         /* TODO: make sure the lower driver has set things up correctly */
 
@@ -1005,13 +1060,6 @@ static int wl12xx_chip_wakeup(struct wl1271 *wl, bool plt)
         if (ret < 0)
                 goto out;
 
-        /* No NVS from netlink, try to get it from the filesystem */
-        if (wl->nvs == NULL) {
-                ret = wl1271_fetch_nvs(wl);
-                if (ret < 0)
-                        goto out;
-        }
-
 out:
         return ret;
 }
@@ -1039,14 +1087,10 @@ int wl1271_plt_start(struct wl1271 *wl)
                 if (ret < 0)
                         goto power_off;
 
-                ret = wl->ops->boot(wl);
+                ret = wl->ops->plt_init(wl);
                 if (ret < 0)
                         goto power_off;
 
-                ret = wl1271_plt_init(wl);
-                if (ret < 0)
-                        goto irq_disable;
-
                 wl->plt = true;
                 wl->state = WL1271_STATE_ON;
                 wl1271_notice("firmware booted in PLT mode (%s)",
@@ -1059,19 +1103,6 @@ int wl1271_plt_start(struct wl1271 *wl)
 
                 goto out;
 
-irq_disable:
-                mutex_unlock(&wl->mutex);
-                /* Unlocking the mutex in the middle of handling is
-                   inherently unsafe. In this case we deem it safe to do,
-                   because we need to let any possibly pending IRQ out of
-                   the system (and while we are WL1271_STATE_OFF the IRQ
-                   work function will not do anything.) Also, any other
-                   possible concurrent operations will fail due to the
-                   current state, hence the wl1271 struct should be safe. */
-                wlcore_disable_interrupts(wl);
-                wl1271_flush_deferred_work(wl);
-                cancel_work_sync(&wl->netstack_work);
-                mutex_lock(&wl->mutex);
 power_off:
                 wl1271_power_off(wl);
         }
@@ -1125,6 +1156,7 @@ int wl1271_plt_stop(struct wl1271 *wl)
         mutex_lock(&wl->mutex);
         wl1271_power_off(wl);
         wl->flags = 0;
+        wl->sleep_auth = WL1271_PSM_ILLEGAL;
         wl->state = WL1271_STATE_OFF;
         wl->plt = false;
         wl->rx_counter = 0;
@@ -1154,9 +1186,16 @@ static void wl1271_op_tx(struct ieee80211_hw *hw, struct sk_buff *skb)
 
         spin_lock_irqsave(&wl->wl_lock, flags);
 
-        /* queue the packet */
+        /*
+         * drop the packet if the link is invalid or the queue is stopped
+         * for any reason but watermark. Watermark is a "soft"-stop so we
+         * allow these packets through.
+         */
         if (hlid == WL12XX_INVALID_LINK_ID ||
-            (wlvif && !test_bit(hlid, wlvif->links_map))) {
+            (wlvif && !test_bit(hlid, wlvif->links_map)) ||
+             (wlcore_is_queue_stopped(wl, q) &&
+              !wlcore_is_queue_stopped_by_reason(wl, q,
+                        WLCORE_QUEUE_STOP_REASON_WATERMARK))) {
                 wl1271_debug(DEBUG_TX, "DROP skb hlid %d q %d", hlid, q);
                 ieee80211_free_txskb(hw, skb);
                 goto out;
@@ -1174,8 +1213,8 @@ static void wl1271_op_tx(struct ieee80211_hw *hw, struct sk_buff *skb)
          */
         if (wl->tx_queue_count[q] >= WL1271_TX_QUEUE_HIGH_WATERMARK) {
                 wl1271_debug(DEBUG_TX, "op_tx: stopping queues for q %d", q);
-                ieee80211_stop_queue(wl->hw, mapping);
-                set_bit(q, &wl->stopped_queues_map);
+                wlcore_stop_queue_locked(wl, q,
+                                         WLCORE_QUEUE_STOP_REASON_WATERMARK);
         }
 
         /*
@@ -1209,7 +1248,7 @@ int wl1271_tx_dummy_packet(struct wl1271 *wl)
 
         /* The FW is low on RX memory blocks, so send the dummy packet asap */
         if (!test_bit(WL1271_FLAG_FW_TX_BUSY, &wl->flags))
-                wl1271_tx_work_locked(wl);
+                return wlcore_tx_work_locked(wl);
 
         /*
          * If the FW TX is busy, TX work will be scheduled by the threaded
@@ -1476,8 +1515,15 @@ static int wl1271_configure_wowlan(struct wl1271 *wl,
         int i, ret;
 
         if (!wow || wow->any || !wow->n_patterns) {
-                wl1271_acx_default_rx_filter_enable(wl, 0, FILTER_SIGNAL);
-                wl1271_rx_filter_clear_all(wl);
+                ret = wl1271_acx_default_rx_filter_enable(wl, 0,
+                                                          FILTER_SIGNAL);
+                if (ret)
+                        goto out;
+
+                ret = wl1271_rx_filter_clear_all(wl);
+                if (ret)
+                        goto out;
+
                 return 0;
         }
 
@@ -1493,8 +1539,13 @@ static int wl1271_configure_wowlan(struct wl1271 *wl,
                 }
         }
 
-        wl1271_acx_default_rx_filter_enable(wl, 0, FILTER_SIGNAL);
-        wl1271_rx_filter_clear_all(wl);
+        ret = wl1271_acx_default_rx_filter_enable(wl, 0, FILTER_SIGNAL);
+        if (ret)
+                goto out;
+
+        ret = wl1271_rx_filter_clear_all(wl);
+        if (ret)
+                goto out;
 
         /* Translate WoWLAN patterns into filters */
         for (i = 0; i < wow->n_patterns; i++) {
@@ -1536,7 +1587,10 @@ static int wl1271_configure_suspend_sta(struct wl1271 *wl,
         if (ret < 0)
                 goto out;
 
-        wl1271_configure_wowlan(wl, wow);
+        ret = wl1271_configure_wowlan(wl, wow);
+        if (ret < 0)
+                goto out_sleep;
+
         ret = wl1271_acx_wake_up_conditions(wl, wlvif,
                                     wl->conf.conn.suspend_wake_up_event,
                                     wl->conf.conn.suspend_listen_interval);
@@ -1544,8 +1598,8 @@ static int wl1271_configure_suspend_sta(struct wl1271 *wl,
         if (ret < 0)
                 wl1271_error("suspend: set wake up conditions failed: %d", ret);
 
+out_sleep:
         wl1271_ps_elp_sleep(wl);
-
 out:
         return ret;
 
@@ -1624,6 +1678,12 @@ static int wl1271_op_suspend(struct ieee80211_hw *hw,
         wl1271_debug(DEBUG_MAC80211, "mac80211 suspend wow=%d", !!wow);
         WARN_ON(!wow);
 
+        /* we want to perform the recovery before suspending */
+        if (test_bit(WL1271_FLAG_RECOVERY_IN_PROGRESS, &wl->flags)) {
+                wl1271_warning("postponing suspend to perform recovery");
+                return -EBUSY;
+        }
+
         wl1271_tx_flush(wl);
 
         mutex_lock(&wl->mutex);
@@ -1664,7 +1724,8 @@ static int wl1271_op_resume(struct ieee80211_hw *hw)
         struct wl1271 *wl = hw->priv;
         struct wl12xx_vif *wlvif;
         unsigned long flags;
-        bool run_irq_work = false;
+        bool run_irq_work = false, pending_recovery;
+        int ret;
 
         wl1271_debug(DEBUG_MAC80211, "mac80211 resume wow=%d",
                      wl->wow_enabled);
@@ -1680,17 +1741,37 @@ static int wl1271_op_resume(struct ieee80211_hw *hw)
                 run_irq_work = true;
         spin_unlock_irqrestore(&wl->wl_lock, flags);
 
+        mutex_lock(&wl->mutex);
+
+        /* test the recovery flag before calling any SDIO functions */
+        pending_recovery = test_bit(WL1271_FLAG_RECOVERY_IN_PROGRESS,
+                                    &wl->flags);
+
         if (run_irq_work) {
                 wl1271_debug(DEBUG_MAC80211,
                              "run postponed irq_work directly");
-                wl1271_irq(0, wl);
+
+                /* don't talk to the HW if recovery is pending */
+                if (!pending_recovery) {
+                        ret = wlcore_irq_locked(wl);
+                        if (ret)
+                                wl12xx_queue_recovery_work(wl);
+                }
+
                 wlcore_enable_interrupts(wl);
         }
 
-        mutex_lock(&wl->mutex);
+        if (pending_recovery) {
+                wl1271_warning("queuing forgotten recovery on resume");
+                ieee80211_queue_work(wl->hw, &wl->recovery_work);
+                goto out;
+        }
+
         wl12xx_for_each_wlvif(wl, wlvif) {
                 wl1271_configure_resume(wl, wlvif);
         }
+
+out:
         wl->wow_enabled = false;
         mutex_unlock(&wl->mutex);
 
@@ -1731,6 +1812,10 @@ static void wl1271_op_stop(struct ieee80211_hw *hw)
         wlcore_disable_interrupts(wl);
         mutex_lock(&wl->mutex);
         if (wl->state == WL1271_STATE_OFF) {
+                if (test_and_clear_bit(WL1271_FLAG_RECOVERY_IN_PROGRESS,
+                                        &wl->flags))
+                        wlcore_enable_interrupts(wl);
+
                 mutex_unlock(&wl->mutex);
 
                 /*
@@ -1758,15 +1843,23 @@ static void wl1271_op_stop(struct ieee80211_hw *hw)
         cancel_delayed_work_sync(&wl->connection_loss_work);
 
         /* let's notify MAC80211 about the remaining pending TX frames */
-        wl12xx_tx_reset(wl, true);
+        wl12xx_tx_reset(wl);
         mutex_lock(&wl->mutex);
 
         wl1271_power_off(wl);
+        /*
+         * In case a recovery was scheduled, interrupts were disabled to avoid
+         * an interrupt storm. Now that the power is down, it is safe to
+         * re-enable interrupts to balance the disable depth
+         */
+        if (test_and_clear_bit(WL1271_FLAG_RECOVERY_IN_PROGRESS, &wl->flags))
+                wlcore_enable_interrupts(wl);
 
         wl->band = IEEE80211_BAND_2GHZ;
 
         wl->rx_counter = 0;
         wl->power_level = WL1271_DEFAULT_POWER_LEVEL;
+        wl->channel_type = NL80211_CHAN_NO_HT;
         wl->tx_blocks_available = 0;
         wl->tx_allocated_blocks = 0;
         wl->tx_results_count = 0;
@@ -1775,6 +1868,7 @@ static void wl1271_op_stop(struct ieee80211_hw *hw)
         wl->ap_fw_ps_map = 0;
         wl->ap_ps_map = 0;
         wl->sched_scanning = false;
+        wl->sleep_auth = WL1271_PSM_ILLEGAL;
         memset(wl->roles_map, 0, sizeof(wl->roles_map));
         memset(wl->links_map, 0, sizeof(wl->links_map));
         memset(wl->roc_map, 0, sizeof(wl->roc_map));
@@ -1799,8 +1893,9 @@ static void wl1271_op_stop(struct ieee80211_hw *hw)
 
         wl1271_debugfs_reset(wl);
 
-        kfree(wl->fw_status);
-        wl->fw_status = NULL;
+        kfree(wl->fw_status_1);
+        wl->fw_status_1 = NULL;
+        wl->fw_status_2 = NULL;
         kfree(wl->tx_res_if);
         wl->tx_res_if = NULL;
         kfree(wl->target_mem_map);
@@ -1894,6 +1989,9 @@ static int wl12xx_init_vif_data(struct wl1271 *wl, struct ieee80211_vif *vif)
                 wl12xx_allocate_rate_policy(wl, &wlvif->sta.basic_rate_idx);
                 wl12xx_allocate_rate_policy(wl, &wlvif->sta.ap_rate_idx);
                 wl12xx_allocate_rate_policy(wl, &wlvif->sta.p2p_rate_idx);
+                wlvif->basic_rate_set = CONF_TX_RATE_MASK_BASIC;
+                wlvif->basic_rate = CONF_TX_RATE_MASK_BASIC;
+                wlvif->rate_set = CONF_TX_RATE_MASK_BASIC;
         } else {
                 /* init ap data */
                 wlvif->ap.bcast_hlid = WL12XX_INVALID_LINK_ID;
@@ -1903,13 +2001,19 @@ static int wl12xx_init_vif_data(struct wl1271 *wl, struct ieee80211_vif *vif)
                 for (i = 0; i < CONF_TX_MAX_AC_COUNT; i++)
                         wl12xx_allocate_rate_policy(wl,
                                                 &wlvif->ap.ucast_rate_idx[i]);
+                wlvif->basic_rate_set = CONF_TX_AP_ENABLED_RATES;
+                /*
+                 * TODO: check if basic_rate shouldn't be
+                 * wl1271_tx_min_rate_get(wl, wlvif->basic_rate_set);
+                 * instead (the same thing for STA above).
+                */
+                wlvif->basic_rate = CONF_TX_AP_ENABLED_RATES;
+                /* TODO: this seems to be used only for STA, check it */
+                wlvif->rate_set = CONF_TX_AP_ENABLED_RATES;
         }
 
         wlvif->bitrate_masks[IEEE80211_BAND_2GHZ] = wl->conf.tx.basic_rate;
         wlvif->bitrate_masks[IEEE80211_BAND_5GHZ] = wl->conf.tx.basic_rate_5;
-        wlvif->basic_rate_set = CONF_TX_RATE_MASK_BASIC;
-        wlvif->basic_rate = CONF_TX_RATE_MASK_BASIC;
-        wlvif->rate_set = CONF_TX_RATE_MASK_BASIC;
         wlvif->beacon_int = WL1271_DEFAULT_BEACON_INT;
 
         /*
@@ -1919,6 +2023,7 @@ static int wl12xx_init_vif_data(struct wl1271 *wl, struct ieee80211_vif *vif)
         wlvif->band = wl->band;
         wlvif->channel = wl->channel;
         wlvif->power_level = wl->power_level;
+        wlvif->channel_type = wl->channel_type;
 
         INIT_WORK(&wlvif->rx_streaming_enable_work,
                   wl1271_rx_streaming_enable_work);
@@ -2170,6 +2275,7 @@ static void __wl1271_op_remove_interface(struct wl1271 *wl,
 {
         struct wl12xx_vif *wlvif = wl12xx_vif_to_data(vif);
         int i, ret;
+        bool is_ap = (wlvif->bss_type == BSS_TYPE_AP_BSS);
 
         wl1271_debug(DEBUG_MAC80211, "mac80211 remove interface");
 
@@ -2250,11 +2356,25 @@ deinit:
         wlvif->role_id = WL12XX_INVALID_ROLE_ID;
         wlvif->dev_role_id = WL12XX_INVALID_ROLE_ID;
 
-        if (wlvif->bss_type == BSS_TYPE_AP_BSS)
+        if (is_ap)
                 wl->ap_count--;
         else
                 wl->sta_count--;
 
+        /* Last AP, have more stations. Configure according to STA. */
+        if (wl->ap_count == 0 && is_ap && wl->sta_count) {
+                u8 sta_auth = wl->conf.conn.sta_sleep_auth;
+                /* Configure for power according to debugfs */
+                if (sta_auth != WL1271_PSM_ILLEGAL)
+                        wl1271_acx_sleep_auth(wl, sta_auth);
+                /* Configure for power always on */
+                else if (wl->quirks & WLCORE_QUIRK_NO_ELP)
+                        wl1271_acx_sleep_auth(wl, WL1271_PSM_CAM);
+                /* Configure for ELP power saving */
+                else
+                        wl1271_acx_sleep_auth(wl, WL1271_PSM_ELP);
+        }
+
         mutex_unlock(&wl->mutex);
 
         del_timer_sync(&wlvif->rx_streaming_timer);
@@ -2444,7 +2564,7 @@ static int wl1271_sta_handle_idle(struct wl1271 *wl, struct wl12xx_vif *wlvif,
         } else {
                 /* The current firmware only supports sched_scan in idle */
                 if (wl->sched_scanning) {
-                        wl1271_scan_sched_scan_stop(wl);
+                        wl1271_scan_sched_scan_stop(wl, wlvif);
                         ieee80211_sched_scan_stopped(wl->hw);
                 }
 
@@ -2469,13 +2589,24 @@ static int wl12xx_config_vif(struct wl1271 *wl, struct wl12xx_vif *wlvif,
         /* if the channel changes while joined, join again */
         if (changed & IEEE80211_CONF_CHANGE_CHANNEL &&
             ((wlvif->band != conf->channel->band) ||
-             (wlvif->channel != channel))) {
+             (wlvif->channel != channel) ||
+             (wlvif->channel_type != conf->channel_type))) {
                 /* send all pending packets */
-                wl1271_tx_work_locked(wl);
+                ret = wlcore_tx_work_locked(wl);
+                if (ret < 0)
+                        return ret;
+
                 wlvif->band = conf->channel->band;
                 wlvif->channel = channel;
+                wlvif->channel_type = conf->channel_type;
 
-                if (!is_ap) {
+                if (is_ap) {
+                        wl1271_set_band_rate(wl, wlvif);
+                        ret = wl1271_init_ap_rates(wl, wlvif);
+                        if (ret < 0)
+                                wl1271_error("AP rate policy change failed %d",
+                                             ret);
+                } else {
                         /*
                          * FIXME: the mac80211 should really provide a fixed
                          * rate to use here. for now, just use the smallest
@@ -2583,8 +2714,9 @@ static int wl1271_op_config(struct ieee80211_hw *hw, u32 changed)
          * frames, such as the deauth. To make sure those frames reach the air,
          * wait here until the TX queue is fully flushed.
          */
-        if ((changed & IEEE80211_CONF_CHANGE_IDLE) &&
-            (conf->flags & IEEE80211_CONF_IDLE))
+        if ((changed & IEEE80211_CONF_CHANGE_CHANNEL) ||
+            ((changed & IEEE80211_CONF_CHANGE_IDLE) &&
+             (conf->flags & IEEE80211_CONF_IDLE)))
                 wl1271_tx_flush(wl);
 
         mutex_lock(&wl->mutex);
@@ -2593,6 +2725,7 @@ static int wl1271_op_config(struct ieee80211_hw *hw, u32 changed)
         if (changed & IEEE80211_CONF_CHANGE_CHANNEL) {
                 wl->band = conf->channel->band;
                 wl->channel = channel;
+                wl->channel_type = conf->channel_type;
         }
 
         if (changed & IEEE80211_CONF_CHANGE_POWER)
@@ -2825,17 +2958,6 @@ static int wl1271_set_key(struct wl1271 *wl, struct wl12xx_vif *wlvif,
         int ret;
         bool is_ap = (wlvif->bss_type == BSS_TYPE_AP_BSS);
 
-        /*
-         * A role set to GEM cipher requires different Tx settings (namely
-         * spare blocks). Note when we are in this mode so the HW can adjust.
-         */
-        if (key_type == KEY_GEM) {
-                if (action == KEY_ADD_OR_REPLACE)
-                        wlvif->is_gem = true;
-                else if (action == KEY_REMOVE)
-                        wlvif->is_gem = false;
-        }
-
         if (is_ap) {
                 struct wl1271_station *wl_sta;
                 u8 hlid;
@@ -2913,12 +3035,21 @@ static int wl1271_set_key(struct wl1271 *wl, struct wl12xx_vif *wlvif,
         return 0;
 }
 
-static int wl1271_op_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
+static int wlcore_op_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
                              struct ieee80211_vif *vif,
                              struct ieee80211_sta *sta,
                              struct ieee80211_key_conf *key_conf)
 {
         struct wl1271 *wl = hw->priv;
+
+        return wlcore_hw_set_key(wl, cmd, vif, sta, key_conf);
+}
+
+int wlcore_set_key(struct wl1271 *wl, enum set_key_cmd cmd,
+                   struct ieee80211_vif *vif,
+                   struct ieee80211_sta *sta,
+                   struct ieee80211_key_conf *key_conf)
+{
         struct wl12xx_vif *wlvif = wl12xx_vif_to_data(vif);
         int ret;
         u32 tx_seq_32 = 0;
@@ -3029,6 +3160,7 @@ out_unlock:
 
         return ret;
 }
+EXPORT_SYMBOL_GPL(wlcore_set_key);
 
 static int wl1271_op_hw_scan(struct ieee80211_hw *hw,
                              struct ieee80211_vif *vif,
@@ -3167,6 +3299,7 @@ static void wl1271_op_sched_scan_stop(struct ieee80211_hw *hw,
                                       struct ieee80211_vif *vif)
 {
         struct wl1271 *wl = hw->priv;
+        struct wl12xx_vif *wlvif = wl12xx_vif_to_data(vif);
         int ret;
 
         wl1271_debug(DEBUG_MAC80211, "wl1271_op_sched_scan_stop");
@@ -3180,7 +3313,7 @@ static void wl1271_op_sched_scan_stop(struct ieee80211_hw *hw,
         if (ret < 0)
                 goto out;
 
-        wl1271_scan_sched_scan_stop(wl);
+        wl1271_scan_sched_scan_stop(wl, wlvif);
 
         wl1271_ps_elp_sleep(wl);
 out:
@@ -3316,8 +3449,15 @@ static int wl1271_ap_set_probe_resp_tmpl(struct wl1271 *wl, u32 rates,
                                       skb->data,
                                       skb->len, 0,
                                       rates);
-
         dev_kfree_skb(skb);
+
+        if (ret < 0)
+                goto out;
+
+        wl1271_debug(DEBUG_AP, "probe response updated");
+        set_bit(WLVIF_FLAG_AP_PROBE_RESP_SET, &wlvif->flags);
+
+out:
         return ret;
 }
 
@@ -3422,6 +3562,87 @@ out:
         return ret;
 }
 
+static int wlcore_set_beacon_template(struct wl1271 *wl,
+                                      struct ieee80211_vif *vif,
+                                      bool is_ap)
+{
+        struct wl12xx_vif *wlvif = wl12xx_vif_to_data(vif);
+        struct ieee80211_hdr *hdr;
+        u32 min_rate;
+        int ret;
+        int ieoffset = offsetof(struct ieee80211_mgmt,
+                                u.beacon.variable);
+        struct sk_buff *beacon = ieee80211_beacon_get(wl->hw, vif);
+        u16 tmpl_id;
+
+        if (!beacon) {
+                ret = -EINVAL;
+                goto out;
+        }
+
+        wl1271_debug(DEBUG_MASTER, "beacon updated");
+
+        ret = wl1271_ssid_set(vif, beacon, ieoffset);
+        if (ret < 0) {
+                dev_kfree_skb(beacon);
+                goto out;
+        }
+        min_rate = wl1271_tx_min_rate_get(wl, wlvif->basic_rate_set);
+        tmpl_id = is_ap ? CMD_TEMPL_AP_BEACON :
+                CMD_TEMPL_BEACON;
+        ret = wl1271_cmd_template_set(wl, wlvif->role_id, tmpl_id,
+                                      beacon->data,
+                                      beacon->len, 0,
+                                      min_rate);
+        if (ret < 0) {
+                dev_kfree_skb(beacon);
+                goto out;
+        }
+
+        /*
+         * In case we already have a probe-resp beacon set explicitly
+         * by usermode, don't use the beacon data.
+         */
+        if (test_bit(WLVIF_FLAG_AP_PROBE_RESP_SET, &wlvif->flags))
+                goto end_bcn;
+
+        /* remove TIM ie from probe response */
+        wl12xx_remove_ie(beacon, WLAN_EID_TIM, ieoffset);
+
+        /*
+         * remove p2p ie from probe response.
+         * the fw reponds to probe requests that don't include
+         * the p2p ie. probe requests with p2p ie will be passed,
+         * and will be responded by the supplicant (the spec
+         * forbids including the p2p ie when responding to probe
+         * requests that didn't include it).
+         */
+        wl12xx_remove_vendor_ie(beacon, WLAN_OUI_WFA,
+                                WLAN_OUI_TYPE_WFA_P2P, ieoffset);
+
+        hdr = (struct ieee80211_hdr *) beacon->data;
+        hdr->frame_control = cpu_to_le16(IEEE80211_FTYPE_MGMT |
+                                         IEEE80211_STYPE_PROBE_RESP);
+        if (is_ap)
+                ret = wl1271_ap_set_probe_resp_tmpl_legacy(wl, vif,
+                                                           beacon->data,
+                                                           beacon->len,
+                                                           min_rate);
+        else
+                ret = wl1271_cmd_template_set(wl, wlvif->role_id,
+                                              CMD_TEMPL_PROBE_RESPONSE,
+                                              beacon->data,
+                                              beacon->len, 0,
+                                              min_rate);
+end_bcn:
+        dev_kfree_skb(beacon);
+        if (ret < 0)
+                goto out;
+
+out:
+        return ret;
+}
+
 static int wl1271_bss_beacon_info_changed(struct wl1271 *wl,
                                           struct ieee80211_vif *vif,
                                           struct ieee80211_bss_conf *bss_conf,
@@ -3440,81 +3661,12 @@ static int wl1271_bss_beacon_info_changed(struct wl1271 *wl,
 
         if ((changed & BSS_CHANGED_AP_PROBE_RESP) && is_ap) {
                 u32 rate = wl1271_tx_min_rate_get(wl, wlvif->basic_rate_set);
-                if (!wl1271_ap_set_probe_resp_tmpl(wl, rate, vif)) {
-                        wl1271_debug(DEBUG_AP, "probe response updated");
-                        set_bit(WLVIF_FLAG_AP_PROBE_RESP_SET, &wlvif->flags);
-                }
+
+                wl1271_ap_set_probe_resp_tmpl(wl, rate, vif);
         }
 
         if ((changed & BSS_CHANGED_BEACON)) {
-                struct ieee80211_hdr *hdr;
-                u32 min_rate;
-                int ieoffset = offsetof(struct ieee80211_mgmt,
-                                        u.beacon.variable);
-                struct sk_buff *beacon = ieee80211_beacon_get(wl->hw, vif);
-                u16 tmpl_id;
-
-                if (!beacon) {
-                        ret = -EINVAL;
-                        goto out;
-                }
-
-                wl1271_debug(DEBUG_MASTER, "beacon updated");
-
-                ret = wl1271_ssid_set(vif, beacon, ieoffset);
-                if (ret < 0) {
-                        dev_kfree_skb(beacon);
-                        goto out;
-                }
-                min_rate = wl1271_tx_min_rate_get(wl, wlvif->basic_rate_set);
-                tmpl_id = is_ap ? CMD_TEMPL_AP_BEACON :
-                                  CMD_TEMPL_BEACON;
-                ret = wl1271_cmd_template_set(wl, wlvif->role_id, tmpl_id,
-                                              beacon->data,
-                                              beacon->len, 0,
-                                              min_rate);
-                if (ret < 0) {
-                        dev_kfree_skb(beacon);
-                        goto out;
-                }
-
-                /*
-                 * In case we already have a probe-resp beacon set explicitly
-                 * by usermode, don't use the beacon data.
-                 */
-                if (test_bit(WLVIF_FLAG_AP_PROBE_RESP_SET, &wlvif->flags))
-                        goto end_bcn;
-
-                /* remove TIM ie from probe response */
-                wl12xx_remove_ie(beacon, WLAN_EID_TIM, ieoffset);
-
-                /*
-                 * remove p2p ie from probe response.
-                 * the fw reponds to probe requests that don't include
-                 * the p2p ie. probe requests with p2p ie will be passed,
-                 * and will be responded by the supplicant (the spec
-                 * forbids including the p2p ie when responding to probe
-                 * requests that didn't include it).
-                 */
-                wl12xx_remove_vendor_ie(beacon, WLAN_OUI_WFA,
-                                        WLAN_OUI_TYPE_WFA_P2P, ieoffset);
-
-                hdr = (struct ieee80211_hdr *) beacon->data;
-                hdr->frame_control = cpu_to_le16(IEEE80211_FTYPE_MGMT |
-                                                 IEEE80211_STYPE_PROBE_RESP);
-                if (is_ap)
-                        ret = wl1271_ap_set_probe_resp_tmpl_legacy(wl, vif,
-                                                beacon->data,
-                                                beacon->len,
-                                                min_rate);
-                else
-                        ret = wl1271_cmd_template_set(wl, wlvif->role_id,
-                                                CMD_TEMPL_PROBE_RESPONSE,
-                                                beacon->data,
-                                                beacon->len, 0,
-                                                min_rate);
-end_bcn:
-                dev_kfree_skb(beacon);
+                ret = wlcore_set_beacon_template(wl, vif, is_ap);
                 if (ret < 0)
                         goto out;
         }
@@ -3551,6 +3703,14 @@ static void wl1271_bss_info_changed_ap(struct wl1271 *wl,
                 ret = wl1271_ap_init_templates(wl, vif);
                 if (ret < 0)
                         goto out;
+
+                ret = wl1271_ap_set_probe_resp_tmpl(wl, wlvif->basic_rate, vif);
+                if (ret < 0)
+                        goto out;
+
+                ret = wlcore_set_beacon_template(wl, vif, true);
+                if (ret < 0)
+                        goto out;
         }
 
         ret = wl1271_bss_beacon_info_changed(wl, vif, bss_conf, changed);
@@ -3691,7 +3851,8 @@ static void wl1271_bss_info_changed_sta(struct wl1271 *wl,
                 sta_rate_set = sta->supp_rates[wl->hw->conf.channel->band];
                 if (sta->ht_cap.ht_supported)
                         sta_rate_set |=
-                            (sta->ht_cap.mcs.rx_mask[0] << HW_HT_RATES_OFFSET);
+                          (sta->ht_cap.mcs.rx_mask[0] << HW_HT_RATES_OFFSET) |
+                          (sta->ht_cap.mcs.rx_mask[1] << HW_MIMO_RATES_OFFSET);
                 sta_ht_cap = sta->ht_cap;
                 sta_exists = true;
 
@@ -3704,13 +3865,11 @@ sta_not_found:
                         u32 rates;
                         int ieoffset;
                         wlvif->aid = bss_conf->aid;
+                        wlvif->channel_type = bss_conf->channel_type;
                         wlvif->beacon_int = bss_conf->beacon_int;
                         do_join = true;
                         set_assoc = true;
 
-                        /* Cancel connection_loss_work */
-                        cancel_delayed_work_sync(&wl->connection_loss_work);
-
                         /*
                          * use basic rates from AP, and determine lowest rate
                          * to use with control frames.
@@ -3960,6 +4119,17 @@ static void wl1271_op_bss_info_changed(struct ieee80211_hw *hw,
         wl1271_debug(DEBUG_MAC80211, "mac80211 bss info changed 0x%x",
                      (int)changed);
 
+        /*
+         * make sure to cancel pending disconnections if our association
+         * state changed
+         */
+        if (!is_ap && (changed & BSS_CHANGED_ASSOC))
+                cancel_delayed_work_sync(&wl->connection_loss_work);
+
+        if (is_ap && (changed & BSS_CHANGED_BEACON_ENABLED) &&
+            !bss_conf->enable_beacon)
+                wl1271_tx_flush(wl);
+
         mutex_lock(&wl->mutex);
 
         if (unlikely(wl->state == WL1271_STATE_OFF))
@@ -4068,16 +4238,13 @@ out:
 static int wl1271_op_get_survey(struct ieee80211_hw *hw, int idx,
                                 struct survey_info *survey)
 {
-        struct wl1271 *wl = hw->priv;
         struct ieee80211_conf *conf = &hw->conf;
 
         if (idx != 0)
                 return -ENOENT;
 
         survey->channel = conf->channel;
-        survey->filled = SURVEY_INFO_NOISE_DBM;
-        survey->noise = wl->noise;
-
+        survey->filled = 0;
         return 0;
 }
 
@@ -4343,9 +4510,14 @@ static int wl1271_op_ampdu_action(struct ieee80211_hw *hw,
 
         case IEEE80211_AMPDU_RX_STOP:
                 if (!(*ba_bitmap & BIT(tid))) {
-                        ret = -EINVAL;
-                        wl1271_error("no active RX BA session on tid: %d",
+                        /*
+                         * this happens on reconfig - so only output a debug
+                         * message for now, and don't fail the function.
+                         */
+                        wl1271_debug(DEBUG_MAC80211,
+                                     "no active RX BA session on tid: %d",
                                      tid);
+                        ret = 0;
                         break;
                 }
 
@@ -4636,7 +4808,7 @@ static const struct ieee80211_ops wl1271_ops = {
         .prepare_multicast = wl1271_op_prepare_multicast,
         .configure_filter = wl1271_op_configure_filter,
         .tx = wl1271_op_tx,
-        .set_key = wl1271_op_set_key,
+        .set_key = wlcore_op_set_key,
         .hw_scan = wl1271_op_hw_scan,
         .cancel_hw_scan = wl1271_op_cancel_hw_scan,
         .sched_scan_start = wl1271_op_sched_scan_start,
@@ -4882,18 +5054,22 @@ static int wl12xx_get_hw_info(struct wl1271 *wl)
         if (ret < 0)
                 goto out;
 
-        wl->chip.id = wlcore_read_reg(wl, REG_CHIP_ID_B);
+        ret = wlcore_read_reg(wl, REG_CHIP_ID_B, &wl->chip.id);
+        if (ret < 0)
+                goto out;
 
         wl->fuse_oui_addr = 0;
         wl->fuse_nic_addr = 0;
 
-        wl->hw_pg_ver = wl->ops->get_pg_ver(wl);
+        ret = wl->ops->get_pg_ver(wl, &wl->hw_pg_ver);
+        if (ret < 0)
+                goto out;
 
         if (wl->ops->get_mac)
-                wl->ops->get_mac(wl);
+                ret = wl->ops->get_mac(wl);
 
-        wl1271_power_off(wl);
 out:
+        wl1271_power_off(wl);
         return ret;
 }
 
@@ -4905,14 +5081,8 @@ static int wl1271_register_hw(struct wl1271 *wl)
         if (wl->mac80211_registered)
                 return 0;
 
-        ret = wl12xx_get_hw_info(wl);
-        if (ret < 0) {
-                wl1271_error("couldn't get hw info");
-                goto out;
-        }
-
-        ret = wl1271_fetch_nvs(wl);
-        if (ret == 0) {
+        wl1271_fetch_nvs(wl);
+        if (wl->nvs != NULL) {
                 /* NOTE: The wl->nvs->nvs element must be first, in
                  * order to simplify the casting, we assume it is at
                  * the beginning of the wl->nvs structure.
@@ -4960,6 +5130,29 @@ static void wl1271_unregister_hw(struct wl1271 *wl)
 
 }
 
+static const struct ieee80211_iface_limit wlcore_iface_limits[] = {
+        {
+                .max = 2,
+                .types = BIT(NL80211_IFTYPE_STATION),
+        },
+        {
+                .max = 1,
+                .types = BIT(NL80211_IFTYPE_AP) |
+                         BIT(NL80211_IFTYPE_P2P_GO) |
+                         BIT(NL80211_IFTYPE_P2P_CLIENT),
+        },
+};
+
+static const struct ieee80211_iface_combination
+wlcore_iface_combinations[] = {
+        {
+          .num_different_channels = 1,
+          .max_interfaces = 2,
+          .limits = wlcore_iface_limits,
+          .n_limits = ARRAY_SIZE(wlcore_iface_limits),
+        },
+};
+
 static int wl1271_init_ieee80211(struct wl1271 *wl)
 {
         static const u32 cipher_suites[] = {
@@ -4970,9 +5163,11 @@ static int wl1271_init_ieee80211(struct wl1271 *wl)
                 WL1271_CIPHER_SUITE_GEM,
         };
 
-        /* The tx descriptor buffer and the TKIP space. */
-        wl->hw->extra_tx_headroom = WL1271_EXTRA_SPACE_TKIP +
-                sizeof(struct wl1271_tx_hw_descr);
+        /* The tx descriptor buffer */
+        wl->hw->extra_tx_headroom = sizeof(struct wl1271_tx_hw_descr);
+
+        if (wl->quirks & WLCORE_QUIRK_TKIP_HEADER_SPACE)
+                wl->hw->extra_tx_headroom += WL1271_EXTRA_SPACE_TKIP;
 
         /* unit us */
         /* FIXME: find a proper value */
@@ -5025,12 +5220,14 @@ static int wl1271_init_ieee80211(struct wl1271 *wl)
          */
         memcpy(&wl->bands[IEEE80211_BAND_2GHZ], &wl1271_band_2ghz,
                sizeof(wl1271_band_2ghz));
-        memcpy(&wl->bands[IEEE80211_BAND_2GHZ].ht_cap, &wl->ht_cap,
-               sizeof(wl->ht_cap));
+        memcpy(&wl->bands[IEEE80211_BAND_2GHZ].ht_cap,
+               &wl->ht_cap[IEEE80211_BAND_2GHZ],
+               sizeof(*wl->ht_cap));
         memcpy(&wl->bands[IEEE80211_BAND_5GHZ], &wl1271_band_5ghz,
                sizeof(wl1271_band_5ghz));
-        memcpy(&wl->bands[IEEE80211_BAND_5GHZ].ht_cap, &wl->ht_cap,
-               sizeof(wl->ht_cap));
+        memcpy(&wl->bands[IEEE80211_BAND_5GHZ].ht_cap,
+               &wl->ht_cap[IEEE80211_BAND_5GHZ],
+               sizeof(*wl->ht_cap));
 
         wl->hw->wiphy->bands[IEEE80211_BAND_2GHZ] =
                 &wl->bands[IEEE80211_BAND_2GHZ];
@@ -5049,6 +5246,11 @@ static int wl1271_init_ieee80211(struct wl1271 *wl)
                 NL80211_PROBE_RESP_OFFLOAD_SUPPORT_WPS2 |
                 NL80211_PROBE_RESP_OFFLOAD_SUPPORT_P2P;
 
+        /* allowed interface combinations */
+        wl->hw->wiphy->iface_combinations = wlcore_iface_combinations;
+        wl->hw->wiphy->n_iface_combinations =
+                ARRAY_SIZE(wlcore_iface_combinations);
+
         SET_IEEE80211_DEV(wl->hw, wl->dev);
 
         wl->hw->sta_data_size = sizeof(struct wl1271_station);
@@ -5117,8 +5319,10 @@ struct ieee80211_hw *wlcore_alloc_hw(size_t priv_size)
         wl->rx_counter = 0;
         wl->power_level = WL1271_DEFAULT_POWER_LEVEL;
         wl->band = IEEE80211_BAND_2GHZ;
+        wl->channel_type = NL80211_CHAN_NO_HT;
         wl->flags = 0;
         wl->sg_enabled = true;
+        wl->sleep_auth = WL1271_PSM_ILLEGAL;
         wl->hw_pg_ver = -1;
         wl->ap_ps_map = 0;
         wl->ap_fw_ps_map = 0;
@@ -5142,6 +5346,7 @@ struct ieee80211_hw *wlcore_alloc_hw(size_t priv_size)
         wl->state = WL1271_STATE_OFF;
         wl->fw_type = WL12XX_FW_TYPE_NONE;
         mutex_init(&wl->mutex);
+        mutex_init(&wl->flush_mutex);
 
         order = get_order(WL1271_AGGR_BUFFER_SIZE);
         wl->aggr_buf = (u8 *)__get_free_pages(GFP_KERNEL, order);
@@ -5222,7 +5427,7 @@ int wlcore_free_hw(struct wl1271 *wl)
         kfree(wl->nvs);
         wl->nvs = NULL;
 
-        kfree(wl->fw_status);
+        kfree(wl->fw_status_1);
         kfree(wl->tx_res_if);
         destroy_workqueue(wl->freezable_wq);
 
@@ -5279,8 +5484,6 @@ int __devinit wlcore_probe(struct wl1271 *wl, struct platform_device *pdev)
         wlcore_adjust_conf(wl);
 
         wl->irq = platform_get_irq(pdev, 0);
-        wl->ref_clock = pdata->board_ref_clock;
-        wl->tcxo_clock = pdata->board_tcxo_clock;
         wl->platform_quirks = pdata->platform_quirks;
         wl->set_power = pdata->set_power;
         wl->dev = &pdev->dev;
@@ -5293,7 +5496,7 @@ int __devinit wlcore_probe(struct wl1271 *wl, struct platform_device *pdev)
         else
                 irqflags = IRQF_TRIGGER_HIGH | IRQF_ONESHOT;
 
-        ret = request_threaded_irq(wl->irq, wl12xx_hardirq, wl1271_irq,
+        ret = request_threaded_irq(wl->irq, wl12xx_hardirq, wlcore_irq,
                                    irqflags,
                                    pdev->name, wl);
         if (ret < 0) {
@@ -5316,6 +5519,16 @@ int __devinit wlcore_probe(struct wl1271 *wl, struct platform_device *pdev)
         }
         disable_irq(wl->irq);
 
+        ret = wl12xx_get_hw_info(wl);
+        if (ret < 0) {
+                wl1271_error("couldn't get hw info");
+                goto out_irq;
+        }
+
+        ret = wl->ops->identify_chip(wl);
+        if (ret < 0)
+                goto out_irq;
+
         ret = wl1271_init_ieee80211(wl);
         if (ret)
                 goto out_irq;
@@ -5328,7 +5541,7 @@ int __devinit wlcore_probe(struct wl1271 *wl, struct platform_device *pdev)
         ret = device_create_file(wl->dev, &dev_attr_bt_coex_state);
         if (ret < 0) {
                 wl1271_error("failed to create sysfs file bt_coex_state");
-                goto out_irq;
+                goto out_unreg;
         }
 
         /* Create sysfs file to get HW PG version */
@@ -5353,6 +5566,9 @@ out_hw_pg_ver:
 out_bt_coex_state:
         device_remove_file(wl->dev, &dev_attr_bt_coex_state);
 
+out_unreg:
+        wl1271_unregister_hw(wl);
+
 out_irq:
         free_irq(wl->irq, wl);
 
diff --git a/drivers/net/wireless/ti/wlcore/ps.c b/drivers/net/wireless/ti/wlcore/ps.c
index 756eee2257b..46d36fd30eb 100644
--- a/drivers/net/wireless/ti/wlcore/ps.c
+++ b/drivers/net/wireless/ti/wlcore/ps.c
@@ -28,11 +28,14 @@
 
 #define WL1271_WAKEUP_TIMEOUT 500
 
+#define ELP_ENTRY_DELAY  5
+
 void wl1271_elp_work(struct work_struct *work)
 {
         struct delayed_work *dwork;
         struct wl1271 *wl;
         struct wl12xx_vif *wlvif;
+        int ret;
 
         dwork = container_of(work, struct delayed_work, work);
         wl = container_of(dwork, struct wl1271, elp_work);
@@ -61,7 +64,12 @@ void wl1271_elp_work(struct work_struct *work)
         }
 
         wl1271_debug(DEBUG_PSM, "chip to elp");
-        wl1271_raw_write32(wl, HW_ACCESS_ELP_CTRL_REG, ELPCTRL_SLEEP);
+        ret = wlcore_raw_write32(wl, HW_ACCESS_ELP_CTRL_REG, ELPCTRL_SLEEP);
+        if (ret < 0) {
+                wl12xx_queue_recovery_work(wl);
+                goto out;
+        }
+
         set_bit(WL1271_FLAG_IN_ELP, &wl->flags);
 
 out:
@@ -72,8 +80,9 @@ out:
 void wl1271_ps_elp_sleep(struct wl1271 *wl)
 {
         struct wl12xx_vif *wlvif;
+        u32 timeout;
 
-        if (wl->quirks & WLCORE_QUIRK_NO_ELP)
+        if (wl->sleep_auth != WL1271_PSM_ELP)
                 return;
 
         /* we shouldn't get consecutive sleep requests */
@@ -89,8 +98,13 @@ void wl1271_ps_elp_sleep(struct wl1271 *wl)
                         return;
         }
 
+        if (wl->conf.conn.forced_ps)
+                timeout = ELP_ENTRY_DELAY;
+        else
+                timeout = wl->conf.conn.dynamic_ps_timeout;
+
         ieee80211_queue_delayed_work(wl->hw, &wl->elp_work,
-                msecs_to_jiffies(wl->conf.conn.dynamic_ps_timeout));
+                                     msecs_to_jiffies(timeout));
 }
 
 int wl1271_ps_elp_wakeup(struct wl1271 *wl)
@@ -127,7 +141,11 @@ int wl1271_ps_elp_wakeup(struct wl1271 *wl)
                 wl->elp_compl = &compl;
         spin_unlock_irqrestore(&wl->wl_lock, flags);
 
-        wl1271_raw_write32(wl, HW_ACCESS_ELP_CTRL_REG, ELPCTRL_WAKE_UP);
+        ret = wlcore_raw_write32(wl, HW_ACCESS_ELP_CTRL_REG, ELPCTRL_WAKE_UP);
+        if (ret < 0) {
+                wl12xx_queue_recovery_work(wl);
+                goto err;
+        }
 
         if (!pending) {
                 ret = wait_for_completion_timeout(
@@ -185,8 +203,12 @@ int wl1271_ps_set_mode(struct wl1271 *wl, struct wl12xx_vif *wlvif,
 
                 set_bit(WLVIF_FLAG_IN_PS, &wlvif->flags);
 
-                /* enable beacon early termination. Not relevant for 5GHz */
-                if (wlvif->band == IEEE80211_BAND_2GHZ) {
+                /*
+                 * enable beacon early termination.
+                 * Not relevant for 5GHz and for high rates.
+                 */
+                if ((wlvif->band == IEEE80211_BAND_2GHZ) &&
+                    (wlvif->basic_rate < CONF_HW_BIT_RATE_9MBPS)) {
                         ret = wl1271_acx_bet_enable(wl, wlvif, true);
                         if (ret < 0)
                                 return ret;
@@ -196,7 +218,8 @@ int wl1271_ps_set_mode(struct wl1271 *wl, struct wl12xx_vif *wlvif,
                 wl1271_debug(DEBUG_PSM, "leaving psm");
 
                 /* disable beacon early termination */
-                if (wlvif->band == IEEE80211_BAND_2GHZ) {
+                if ((wlvif->band == IEEE80211_BAND_2GHZ) &&
+                    (wlvif->basic_rate < CONF_HW_BIT_RATE_9MBPS)) {
                         ret = wl1271_acx_bet_enable(wl, wlvif, false);
                         if (ret < 0)
                                 return ret;
diff --git a/drivers/net/wireless/ti/wlcore/rx.c b/drivers/net/wireless/ti/wlcore/rx.c
index d6a3c6b0782..f55e2f9e7ac 100644
--- a/drivers/net/wireless/ti/wlcore/rx.c
+++ b/drivers/net/wireless/ti/wlcore/rx.c
@@ -127,7 +127,7 @@ static int wl1271_rx_handle_data(struct wl1271 *wl, u8 *data, u32 length,
         }
 
         if (rx_align == WLCORE_RX_BUF_UNALIGNED)
-                reserved = NET_IP_ALIGN;
+                reserved = RX_BUF_ALIGN;
 
         /* the data read starts with the descriptor */
         desc = (struct wl1271_rx_descriptor *) data;
@@ -175,7 +175,7 @@ static int wl1271_rx_handle_data(struct wl1271 *wl, u8 *data, u32 length,
          */
         memcpy(buf, data + sizeof(*desc), pkt_data_len);
         if (rx_align == WLCORE_RX_BUF_PADDED)
-                skb_pull(skb, NET_IP_ALIGN);
+                skb_pull(skb, RX_BUF_ALIGN);
 
         *hlid = desc->hlid;
 
@@ -186,6 +186,7 @@ static int wl1271_rx_handle_data(struct wl1271 *wl, u8 *data, u32 length,
                 is_data = 1;
 
         wl1271_rx_status(wl, desc, IEEE80211_SKB_RXCB(skb), beacon);
+        wlcore_hw_set_rx_csum(wl, desc, skb);
 
         seq_num = (le16_to_cpu(hdr->seq_ctrl) & IEEE80211_SCTL_SEQ) >> 4;
         wl1271_debug(DEBUG_RX, "rx skb 0x%p: %d B %s seq %d hlid %d", skb,
@@ -199,17 +200,18 @@ static int wl1271_rx_handle_data(struct wl1271 *wl, u8 *data, u32 length,
         return is_data;
 }
 
-void wl12xx_rx(struct wl1271 *wl, struct wl_fw_status *status)
+int wlcore_rx(struct wl1271 *wl, struct wl_fw_status_1 *status)
 {
         unsigned long active_hlids[BITS_TO_LONGS(WL12XX_MAX_LINKS)] = {0};
         u32 buf_size;
-        u32 fw_rx_counter  = status->fw_rx_counter & NUM_RX_PKT_DESC_MOD_MASK;
-        u32 drv_rx_counter = wl->rx_counter & NUM_RX_PKT_DESC_MOD_MASK;
+        u32 fw_rx_counter = status->fw_rx_counter % wl->num_rx_desc;
+        u32 drv_rx_counter = wl->rx_counter % wl->num_rx_desc;
         u32 rx_counter;
         u32 pkt_len, align_pkt_len;
         u32 pkt_offset, des;
         u8 hlid;
         enum wl_rx_buf_align rx_align;
+        int ret = 0;
 
         while (drv_rx_counter != fw_rx_counter) {
                 buf_size = 0;
@@ -223,7 +225,7 @@ void wl12xx_rx(struct wl1271 *wl, struct wl_fw_status *status)
                                 break;
                         buf_size += align_pkt_len;
                         rx_counter++;
-                        rx_counter &= NUM_RX_PKT_DESC_MOD_MASK;
+                        rx_counter %= wl->num_rx_desc;
                 }
 
                 if (buf_size == 0) {
@@ -233,9 +235,14 @@ void wl12xx_rx(struct wl1271 *wl, struct wl_fw_status *status)
 
                 /* Read all available packets at once */
                 des = le32_to_cpu(status->rx_pkt_descs[drv_rx_counter]);
-                wlcore_hw_prepare_read(wl, des, buf_size);
-                wlcore_read_data(wl, REG_SLV_MEM_DATA, wl->aggr_buf,
-                                 buf_size, true);
+                ret = wlcore_hw_prepare_read(wl, des, buf_size);
+                if (ret < 0)
+                        goto out;
+
+                ret = wlcore_read_data(wl, REG_SLV_MEM_DATA, wl->aggr_buf,
+                                       buf_size, true);
+                if (ret < 0)
+                        goto out;
 
                 /* Split data into separate packets */
                 pkt_offset = 0;
@@ -263,7 +270,7 @@ void wl12xx_rx(struct wl1271 *wl, struct wl_fw_status *status)
 
                         wl->rx_counter++;
                         drv_rx_counter++;
-                        drv_rx_counter &= NUM_RX_PKT_DESC_MOD_MASK;
+                        drv_rx_counter %= wl->num_rx_desc;
                         pkt_offset += wlcore_rx_get_align_buf_size(wl, pkt_len);
                 }
         }
@@ -272,11 +279,17 @@ void wl12xx_rx(struct wl1271 *wl, struct wl_fw_status *status)
          * Write the driver's packet counter to the FW. This is only required
          * for older hardware revisions
          */
-        if (wl->quirks & WLCORE_QUIRK_END_OF_TRANSACTION)
-                wl1271_write32(wl, WL12XX_REG_RX_DRIVER_COUNTER,
-                               wl->rx_counter);
+        if (wl->quirks & WLCORE_QUIRK_END_OF_TRANSACTION) {
+                ret = wlcore_write32(wl, WL12XX_REG_RX_DRIVER_COUNTER,
+                                     wl->rx_counter);
+                if (ret < 0)
+                        goto out;
+        }
 
         wl12xx_rearm_rx_streaming(wl, active_hlids);
+
+out:
+        return ret;
 }
 
 #ifdef CONFIG_PM
@@ -305,14 +318,19 @@ int wl1271_rx_filter_enable(struct wl1271 *wl,
         return 0;
 }
 
-void wl1271_rx_filter_clear_all(struct wl1271 *wl)
+int wl1271_rx_filter_clear_all(struct wl1271 *wl)
 {
-        int i;
+        int i, ret = 0;
 
         for (i = 0; i < WL1271_MAX_RX_FILTERS; i++) {
                 if (!wl->rx_filter_enabled[i])
                         continue;
-                wl1271_rx_filter_enable(wl, i, 0, NULL);
+                ret = wl1271_rx_filter_enable(wl, i, 0, NULL);
+                if (ret)
+                        goto out;
         }
+
+out:
+        return ret;
 }
 #endif /* CONFIG_PM */
diff --git a/drivers/net/wireless/ti/wlcore/rx.h b/drivers/net/wireless/ti/wlcore/rx.h
index e9a162a864c..71eba189991 100644
--- a/drivers/net/wireless/ti/wlcore/rx.h
+++ b/drivers/net/wireless/ti/wlcore/rx.h
@@ -38,8 +38,6 @@
 #define RX_DESC_PACKETID_SHIFT 11
 #define RX_MAX_PACKET_ID 3
 
-#define NUM_RX_PKT_DESC_MOD_MASK   7
-
 #define RX_DESC_VALID_FCS         0x0001
 #define RX_DESC_MATCH_RXADDR1     0x0002
 #define RX_DESC_MCAST             0x0004
@@ -102,6 +100,15 @@
 /* If set, the start of IP payload is not 4 bytes aligned */
 #define RX_BUF_UNALIGNED_PAYLOAD     BIT(20)
 
+/* If set, the buffer was padded by the FW to be 4 bytes aligned */
+#define RX_BUF_PADDED_PAYLOAD        BIT(30)
+
+/*
+ * Account for the padding inserted by the FW in case of RX_ALIGNMENT
+ * or for fixing alignment in case the packet wasn't aligned.
+ */
+#define RX_BUF_ALIGN                 2
+
 /* Describes the alignment state of a Rx buffer */
 enum wl_rx_buf_align {
         WLCORE_RX_BUF_ALIGNED,
@@ -136,11 +143,11 @@ struct wl1271_rx_descriptor {
         u8  reserved;
 } __packed;
 
-void wl12xx_rx(struct wl1271 *wl, struct wl_fw_status *status);
+int wlcore_rx(struct wl1271 *wl, struct wl_fw_status_1 *status);
 u8 wl1271_rate_to_idx(int rate, enum ieee80211_band band);
 int wl1271_rx_filter_enable(struct wl1271 *wl,
                             int index, bool enable,
                             struct wl12xx_rx_filter *filter);
-void wl1271_rx_filter_clear_all(struct wl1271 *wl);
+int wl1271_rx_filter_clear_all(struct wl1271 *wl);
 
 #endif
diff --git a/drivers/net/wireless/ti/wlcore/scan.c b/drivers/net/wireless/ti/wlcore/scan.c
index ade21a011c4..d9daed53ceb 100644
--- a/drivers/net/wireless/ti/wlcore/scan.c
+++ b/drivers/net/wireless/ti/wlcore/scan.c
@@ -411,7 +411,8 @@ wl1271_scan_get_sched_scan_channels(struct wl1271 *wl,
                                     struct cfg80211_sched_scan_request *req,
                                     struct conn_scan_ch_params *channels,
                                     u32 band, bool radar, bool passive,
-                                    int start, int max_channels)
+                                    int start, int max_channels,
+                                    u8 *n_pactive_ch)
 {
         struct conf_sched_scan_settings *c = &wl->conf.sched_scan;
         int i, j;
@@ -479,6 +480,23 @@ wl1271_scan_get_sched_scan_channels(struct wl1271 *wl,
                         channels[j].tx_power_att = req->channels[i]->max_power;
                         channels[j].channel = req->channels[i]->hw_value;
 
+                        if ((band == IEEE80211_BAND_2GHZ) &&
+                            (channels[j].channel >= 12) &&
+                            (channels[j].channel <= 14) &&
+                            (flags & IEEE80211_CHAN_PASSIVE_SCAN) &&
+                            !force_passive) {
+                                /* pactive channels treated as DFS */
+                                channels[j].flags = SCAN_CHANNEL_FLAGS_DFS;
+
+                                /*
+                                 * n_pactive_ch is counted down from the end of
+                                 * the passive channel list
+                                 */
+                                (*n_pactive_ch)++;
+                                wl1271_debug(DEBUG_SCAN, "n_pactive_ch = %d",
+                                             *n_pactive_ch);
+                        }
+
                         j++;
                 }
         }
@@ -491,38 +509,47 @@ wl1271_scan_sched_scan_channels(struct wl1271 *wl,
                                 struct cfg80211_sched_scan_request *req,
                                 struct wl1271_cmd_sched_scan_config *cfg)
 {
+        u8 n_pactive_ch = 0;
+
         cfg->passive[0] =
                 wl1271_scan_get_sched_scan_channels(wl, req, cfg->channels_2,
                                                     IEEE80211_BAND_2GHZ,
                                                     false, true, 0,
-                                                    MAX_CHANNELS_2GHZ);
+                                                    MAX_CHANNELS_2GHZ,
+                                                    &n_pactive_ch);
         cfg->active[0] =
                 wl1271_scan_get_sched_scan_channels(wl, req, cfg->channels_2,
                                                     IEEE80211_BAND_2GHZ,
                                                     false, false,
                                                     cfg->passive[0],
-                                                    MAX_CHANNELS_2GHZ);
+                                                    MAX_CHANNELS_2GHZ,
+                                                    &n_pactive_ch);
         cfg->passive[1] =
                 wl1271_scan_get_sched_scan_channels(wl, req, cfg->channels_5,
                                                     IEEE80211_BAND_5GHZ,
                                                     false, true, 0,
-                                                    MAX_CHANNELS_5GHZ);
+                                                    MAX_CHANNELS_5GHZ,
+                                                    &n_pactive_ch);
         cfg->dfs =
                 wl1271_scan_get_sched_scan_channels(wl, req, cfg->channels_5,
                                                     IEEE80211_BAND_5GHZ,
                                                     true, true,
                                                     cfg->passive[1],
-                                                    MAX_CHANNELS_5GHZ);
+                                                    MAX_CHANNELS_5GHZ,
+                                                    &n_pactive_ch);
         cfg->active[1] =
                 wl1271_scan_get_sched_scan_channels(wl, req, cfg->channels_5,
                                                     IEEE80211_BAND_5GHZ,
                                                     false, false,
                                                     cfg->passive[1] + cfg->dfs,
-                                                    MAX_CHANNELS_5GHZ);
+                                                    MAX_CHANNELS_5GHZ,
+                                                    &n_pactive_ch);
         /* 802.11j channels are not supported yet */
         cfg->passive[2] = 0;
         cfg->active[2] = 0;
 
+        cfg->n_pactive_ch = n_pactive_ch;
+
         wl1271_debug(DEBUG_SCAN, "    2.4GHz: active %d passive %d",
                      cfg->active[0], cfg->passive[0]);
         wl1271_debug(DEBUG_SCAN, "    5GHz: active %d passive %d",
@@ -537,6 +564,7 @@ wl1271_scan_sched_scan_channels(struct wl1271 *wl,
 /* Returns the scan type to be used or a negative value on error */
 static int
 wl12xx_scan_sched_scan_ssid_list(struct wl1271 *wl,
+                                 struct wl12xx_vif *wlvif,
                                  struct cfg80211_sched_scan_request *req)
 {
         struct wl1271_cmd_sched_scan_ssid_list *cmd = NULL;
@@ -565,6 +593,7 @@ wl12xx_scan_sched_scan_ssid_list(struct wl1271 *wl,
                 goto out;
         }
 
+        cmd->role_id = wlvif->dev_role_id;
         if (!n_match_ssids) {
                 /* No filter, with ssids */
                 type = SCAN_SSID_FILTER_DISABLED;
@@ -603,7 +632,9 @@ wl12xx_scan_sched_scan_ssid_list(struct wl1271 *wl,
                                         continue;
 
                                 for (j = 0; j < cmd->n_ssids; j++)
-                                        if (!memcmp(req->ssids[i].ssid,
+                                        if ((req->ssids[i].ssid_len ==
+                                             req->ssids[j].ssid_len) &&
+                                            !memcmp(req->ssids[i].ssid,
                                                    cmd->ssids[j].ssid,
                                                    req->ssids[i].ssid_len)) {
                                                 cmd->ssids[j].type =
@@ -652,6 +683,7 @@ int wl1271_scan_sched_scan_config(struct wl1271 *wl,
         if (!cfg)
                 return -ENOMEM;
 
+        cfg->role_id = wlvif->dev_role_id;
         cfg->rssi_threshold = c->rssi_threshold;
         cfg->snr_threshold  = c->snr_threshold;
         cfg->n_probe_reqs = c->num_probe_reqs;
@@ -669,7 +701,7 @@ int wl1271_scan_sched_scan_config(struct wl1271 *wl,
                 cfg->intervals[i] = cpu_to_le32(req->interval);
 
         cfg->ssid_len = 0;
-        ret = wl12xx_scan_sched_scan_ssid_list(wl, req);
+        ret = wl12xx_scan_sched_scan_ssid_list(wl, wlvif, req);
         if (ret < 0)
                 goto out;
 
@@ -741,6 +773,7 @@ int wl1271_scan_sched_scan_start(struct wl1271 *wl, struct wl12xx_vif *wlvif)
         if (!start)
                 return -ENOMEM;
 
+        start->role_id = wlvif->dev_role_id;
         start->tag = WL1271_SCAN_DEFAULT_TAG;
 
         ret = wl1271_cmd_send(wl, CMD_START_PERIODIC_SCAN, start,
@@ -762,7 +795,7 @@ void wl1271_scan_sched_scan_results(struct wl1271 *wl)
         ieee80211_sched_scan_results(wl->hw);
 }
 
-void wl1271_scan_sched_scan_stop(struct wl1271 *wl)
+void wl1271_scan_sched_scan_stop(struct wl1271 *wl,  struct wl12xx_vif *wlvif)
 {
         struct wl1271_cmd_sched_scan_stop *stop;
         int ret = 0;
@@ -776,6 +809,7 @@ void wl1271_scan_sched_scan_stop(struct wl1271 *wl)
                 return;
         }
 
+        stop->role_id = wlvif->dev_role_id;
         stop->tag = WL1271_SCAN_DEFAULT_TAG;
 
         ret = wl1271_cmd_send(wl, CMD_STOP_PERIODIC_SCAN, stop,
diff --git a/drivers/net/wireless/ti/wlcore/scan.h b/drivers/net/wireless/ti/wlcore/scan.h
index 81ee36ac207..29f3c8d6b04 100644
--- a/drivers/net/wireless/ti/wlcore/scan.h
+++ b/drivers/net/wireless/ti/wlcore/scan.h
@@ -40,7 +40,7 @@ int wl1271_scan_sched_scan_config(struct wl1271 *wl,
                                      struct cfg80211_sched_scan_request *req,
                                      struct ieee80211_sched_scan_ies *ies);
 int wl1271_scan_sched_scan_start(struct wl1271 *wl, struct wl12xx_vif *wlvif);
-void wl1271_scan_sched_scan_stop(struct wl1271 *wl);
+void wl1271_scan_sched_scan_stop(struct wl1271 *wl,  struct wl12xx_vif *wlvif);
 void wl1271_scan_sched_scan_results(struct wl1271 *wl);
 
 #define WL1271_SCAN_MAX_CHANNELS       24
@@ -142,7 +142,8 @@ enum {
         SCAN_BSS_TYPE_ANY,
 };
 
-#define SCAN_CHANNEL_FLAGS_DFS          BIT(0)
+#define SCAN_CHANNEL_FLAGS_DFS          BIT(0) /* channel is passive until an
+                                                  activity is detected on it */
 #define SCAN_CHANNEL_FLAGS_DFS_ENABLED  BIT(1)
 
 struct conn_scan_ch_params {
@@ -185,7 +186,10 @@ struct wl1271_cmd_sched_scan_config {
 
         u8 dfs;
 
-        u8 padding[3];
+        u8 n_pactive_ch; /* number of pactive (passive until fw detects energy)
+                            channels in BG band */
+        u8 role_id;
+        u8 padding[1];
 
         struct conn_scan_ch_params channels_2[MAX_CHANNELS_2GHZ];
         struct conn_scan_ch_params channels_5[MAX_CHANNELS_5GHZ];
@@ -212,21 +216,24 @@ struct wl1271_cmd_sched_scan_ssid_list {
 
         u8 n_ssids;
         struct wl1271_ssid ssids[SCHED_SCAN_MAX_SSIDS];
-        u8 padding[3];
+        u8 role_id;
+        u8 padding[2];
 } __packed;
 
 struct wl1271_cmd_sched_scan_start {
         struct wl1271_cmd_header header;
 
         u8 tag;
-        u8 padding[3];
+        u8 role_id;
+        u8 padding[2];
 } __packed;
 
 struct wl1271_cmd_sched_scan_stop {
         struct wl1271_cmd_header header;
 
         u8 tag;
-        u8 padding[3];
+        u8 role_id;
+        u8 padding[2];
 } __packed;
 
 
diff --git a/drivers/net/wireless/ti/wlcore/sdio.c b/drivers/net/wireless/ti/wlcore/sdio.c
index 0a72347cfc4..204e69fa932 100644
--- a/drivers/net/wireless/ti/wlcore/sdio.c
+++ b/drivers/net/wireless/ti/wlcore/sdio.c
@@ -25,6 +25,7 @@
 #include <linux/module.h>
 #include <linux/vmalloc.h>
 #include <linux/platform_device.h>
+#include <linux/mmc/sdio.h>
 #include <linux/mmc/sdio_func.h>
 #include <linux/mmc/sdio_ids.h>
 #include <linux/mmc/card.h>
@@ -32,6 +33,7 @@
 #include <linux/gpio.h>
 #include <linux/wl12xx.h>
 #include <linux/pm_runtime.h>
+#include <linux/printk.h>
 
 #include "wlcore.h"
 #include "wl12xx_80211.h"
@@ -45,6 +47,8 @@
 #define SDIO_DEVICE_ID_TI_WL1271        0x4076
 #endif
 
+static bool dump = false;
+
 struct wl12xx_sdio_glue {
         struct device *dev;
         struct platform_device *core;
@@ -67,8 +71,8 @@ static void wl1271_sdio_set_block_size(struct device *child,
         sdio_release_host(func);
 }
 
-static void wl12xx_sdio_raw_read(struct device *child, int addr, void *buf,
-                                 size_t len, bool fixed)
+static int __must_check wl12xx_sdio_raw_read(struct device *child, int addr,
+                                             void *buf, size_t len, bool fixed)
 {
         int ret;
         struct wl12xx_sdio_glue *glue = dev_get_drvdata(child->parent);
@@ -76,6 +80,13 @@ static void wl12xx_sdio_raw_read(struct device *child, int addr, void *buf,
 
         sdio_claim_host(func);
 
+        if (unlikely(dump)) {
+                printk(KERN_DEBUG "wlcore_sdio: READ from 0x%04x\n", addr);
+                print_hex_dump(KERN_DEBUG, "wlcore_sdio: READ ",
+                                DUMP_PREFIX_OFFSET, 16, 1,
+                                buf, len, false);
+        }
+
         if (unlikely(addr == HW_ACCESS_ELP_CTRL_REG)) {
                 ((u8 *)buf)[0] = sdio_f0_readb(func, addr, &ret);
                 dev_dbg(child->parent, "sdio read 52 addr 0x%x, byte 0x%02x\n",
@@ -92,12 +103,14 @@ static void wl12xx_sdio_raw_read(struct device *child, int addr, void *buf,
 
         sdio_release_host(func);
 
-        if (ret)
+        if (WARN_ON(ret))
                 dev_err(child->parent, "sdio read failed (%d)\n", ret);
+
+        return ret;
 }
 
-static void wl12xx_sdio_raw_write(struct device *child, int addr, void *buf,
-                                  size_t len, bool fixed)
+static int __must_check wl12xx_sdio_raw_write(struct device *child, int addr,
+                                              void *buf, size_t len, bool fixed)
 {
         int ret;
         struct wl12xx_sdio_glue *glue = dev_get_drvdata(child->parent);
@@ -105,6 +118,13 @@ static void wl12xx_sdio_raw_write(struct device *child, int addr, void *buf,
 
         sdio_claim_host(func);
 
+        if (unlikely(dump)) {
+                printk(KERN_DEBUG "wlcore_sdio: WRITE to 0x%04x\n", addr);
+                print_hex_dump(KERN_DEBUG, "wlcore_sdio: WRITE ",
+                                DUMP_PREFIX_OFFSET, 16, 1,
+                                buf, len, false);
+        }
+
         if (unlikely(addr == HW_ACCESS_ELP_CTRL_REG)) {
                 sdio_f0_writeb(func, ((u8 *)buf)[0], addr, &ret);
                 dev_dbg(child->parent, "sdio write 52 addr 0x%x, byte 0x%02x\n",
@@ -121,25 +141,30 @@ static void wl12xx_sdio_raw_write(struct device *child, int addr, void *buf,
 
         sdio_release_host(func);
 
-        if (ret)
+        if (WARN_ON(ret))
                 dev_err(child->parent, "sdio write failed (%d)\n", ret);
+
+        return ret;
 }
 
 static int wl12xx_sdio_power_on(struct wl12xx_sdio_glue *glue)
 {
         int ret;
         struct sdio_func *func = dev_to_sdio_func(glue->dev);
+        struct mmc_card *card = func->card;
 
-        /* If enabled, tell runtime PM not to power off the card */
-        if (pm_runtime_enabled(&func->dev)) {
-                ret = pm_runtime_get_sync(&func->dev);
-                if (ret < 0)
-                        goto out;
-        } else {
-                /* Runtime PM is disabled: power up the card manually */
-                ret = mmc_power_restore_host(func->card->host);
-                if (ret < 0)
+        ret = pm_runtime_get_sync(&card->dev);
+        if (ret) {
+                /*
+                 * Runtime PM might be temporarily disabled, or the device
+                 * might have a positive reference counter. Make sure it is
+                 * really powered on.
+                 */
+                ret = mmc_power_restore_host(card->host);
+                if (ret < 0) {
+                        pm_runtime_put_sync(&card->dev);
                         goto out;
+                }
         }
 
         sdio_claim_host(func);
@@ -154,20 +179,21 @@ static int wl12xx_sdio_power_off(struct wl12xx_sdio_glue *glue)
 {
         int ret;
         struct sdio_func *func = dev_to_sdio_func(glue->dev);
+        struct mmc_card *card = func->card;
 
         sdio_claim_host(func);
         sdio_disable_func(func);
         sdio_release_host(func);
 
-        /* Power off the card manually, even if runtime PM is enabled. */
-        ret = mmc_power_save_host(func->card->host);
+        /* Power off the card manually in case it wasn't powered off above */
+        ret = mmc_power_save_host(card->host);
         if (ret < 0)
-                return ret;
+                goto out;
 
-        /* If enabled, let runtime PM know the card is powered off */
-        if (pm_runtime_enabled(&func->dev))
-                ret = pm_runtime_put_sync(&func->dev);
+        /* Let runtime PM know the card is powered off */
+        pm_runtime_put_sync(&card->dev);
 
+out:
         return ret;
 }
 
@@ -196,6 +222,7 @@ static int __devinit wl1271_probe(struct sdio_func *func,
         struct resource res[1];
         mmc_pm_flag_t mmcflags;
         int ret = -ENOMEM;
+        const char *chip_family;
 
         /* We are only able to handle the wlan function */
         if (func->num != 0x02)
@@ -236,7 +263,18 @@ static int __devinit wl1271_probe(struct sdio_func *func,
         /* Tell PM core that we don't need the card to be powered now */
         pm_runtime_put_noidle(&func->dev);
 
-        glue->core = platform_device_alloc("wl12xx", -1);
+        /*
+         * Due to a hardware bug, we can't differentiate wl18xx from
+         * wl12xx, because both report the same device ID.  The only
+         * way to differentiate is by checking the SDIO revision,
+         * which is 3.00 on the wl18xx chips.
+         */
+        if (func->card->cccr.sdio_vsn == SDIO_SDIO_REV_3_00)
+                chip_family = "wl18xx";
+        else
+                chip_family = "wl12xx";
+
+        glue->core = platform_device_alloc(chip_family, -1);
         if (!glue->core) {
                 dev_err(glue->dev, "can't allocate platform_device");
                 ret = -ENOMEM;
@@ -367,6 +405,9 @@ static void __exit wl1271_exit(void)
 module_init(wl1271_init);
 module_exit(wl1271_exit);
 
+module_param(dump, bool, S_IRUSR | S_IWUSR);
+MODULE_PARM_DESC(dump, "Enable sdio read/write dumps.");
+
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Luciano Coelho <coelho@ti.com>");
 MODULE_AUTHOR("Juuso Oikarinen <juuso.oikarinen@nokia.com>");
diff --git a/drivers/net/wireless/ti/wlcore/spi.c b/drivers/net/wireless/ti/wlcore/spi.c
index 553cd3cbb98..6420abae40e 100644
--- a/drivers/net/wireless/ti/wlcore/spi.c
+++ b/drivers/net/wireless/ti/wlcore/spi.c
@@ -193,8 +193,8 @@ static int wl12xx_spi_read_busy(struct device *child)
         return -ETIMEDOUT;
 }
 
-static void wl12xx_spi_raw_read(struct device *child, int addr, void *buf,
-                                size_t len, bool fixed)
+static int __must_check wl12xx_spi_raw_read(struct device *child, int addr,
+                                            void *buf, size_t len, bool fixed)
 {
         struct wl12xx_spi_glue *glue = dev_get_drvdata(child->parent);
         struct wl1271 *wl = dev_get_drvdata(child);
@@ -238,7 +238,7 @@ static void wl12xx_spi_raw_read(struct device *child, int addr, void *buf,
                 if (!(busy_buf[WL1271_BUSY_WORD_CNT - 1] & 0x1) &&
                     wl12xx_spi_read_busy(child)) {
                         memset(buf, 0, chunk_len);
-                        return;
+                        return 0;
                 }
 
                 spi_message_init(&m);
@@ -256,10 +256,12 @@ static void wl12xx_spi_raw_read(struct device *child, int addr, void *buf,
                 buf += chunk_len;
                 len -= chunk_len;
         }
+
+        return 0;
 }
 
-static void wl12xx_spi_raw_write(struct device *child, int addr, void *buf,
-                                 size_t len, bool fixed)
+static int __must_check wl12xx_spi_raw_write(struct device *child, int addr,
+                                             void *buf, size_t len, bool fixed)
 {
         struct wl12xx_spi_glue *glue = dev_get_drvdata(child->parent);
         struct spi_transfer t[2 * WSPI_MAX_NUM_OF_CHUNKS];
@@ -304,6 +306,8 @@ static void wl12xx_spi_raw_write(struct device *child, int addr, void *buf,
         }
 
         spi_sync(to_spi_device(glue->dev), &m);
+
+        return 0;
 }
 
 static struct wl1271_if_operations spi_ops = {
diff --git a/drivers/net/wireless/ti/wlcore/testmode.c b/drivers/net/wireless/ti/wlcore/testmode.c
index 0e59ea2cdd3..eeb339d61d1 100644
--- a/drivers/net/wireless/ti/wlcore/testmode.c
+++ b/drivers/net/wireless/ti/wlcore/testmode.c
@@ -108,6 +108,20 @@ static int wl1271_tm_cmd_test(struct wl1271 *wl, struct nlattr *tb[])
         }
 
         if (answer) {
+                /* If we got bip calibration answer print radio status */
+                struct wl1271_cmd_cal_p2g *params =
+                        (struct wl1271_cmd_cal_p2g *) buf;
+
+                s16 radio_status = (s16) le16_to_cpu(params->radio_status);
+
+                if (params->test.id == TEST_CMD_P2G_CAL &&
+                    radio_status < 0)
+                        wl1271_warning("testmode cmd: radio status=%d",
+                                        radio_status);
+                else
+                        wl1271_info("testmode cmd: radio status=%d",
+                                        radio_status);
+
                 len = nla_total_size(buf_len);
                 skb = cfg80211_testmode_alloc_reply_skb(wl->hw->wiphy, len);
                 if (!skb) {
diff --git a/drivers/net/wireless/ti/wlcore/tx.c b/drivers/net/wireless/ti/wlcore/tx.c
index 6893bc20799..8038a502693 100644
--- a/drivers/net/wireless/ti/wlcore/tx.c
+++ b/drivers/net/wireless/ti/wlcore/tx.c
@@ -72,7 +72,7 @@ static int wl1271_alloc_tx_id(struct wl1271 *wl, struct sk_buff *skb)
         return id;
 }
 
-static void wl1271_free_tx_id(struct wl1271 *wl, int id)
+void wl1271_free_tx_id(struct wl1271 *wl, int id)
 {
         if (__test_and_clear_bit(id, wl->tx_frames_map)) {
                 if (unlikely(wl->tx_frames_cnt == wl->num_tx_desc))
@@ -82,6 +82,7 @@ static void wl1271_free_tx_id(struct wl1271 *wl, int id)
                 wl->tx_frames_cnt--;
         }
 }
+EXPORT_SYMBOL(wl1271_free_tx_id);
 
 static void wl1271_tx_ap_update_inconnection_sta(struct wl1271 *wl,
                                                  struct sk_buff *skb)
@@ -127,6 +128,7 @@ bool wl12xx_is_dummy_packet(struct wl1271 *wl, struct sk_buff *skb)
 {
         return wl->dummy_packet == skb;
 }
+EXPORT_SYMBOL(wl12xx_is_dummy_packet);
 
 u8 wl12xx_tx_get_hlid_ap(struct wl1271 *wl, struct wl12xx_vif *wlvif,
                          struct sk_buff *skb)
@@ -146,10 +148,10 @@ u8 wl12xx_tx_get_hlid_ap(struct wl1271 *wl, struct wl12xx_vif *wlvif,
                         return wl->system_hlid;
 
                 hdr = (struct ieee80211_hdr *)skb->data;
-                if (ieee80211_is_mgmt(hdr->frame_control))
-                        return wlvif->ap.global_hlid;
-                else
+                if (is_multicast_ether_addr(ieee80211_get_DA(hdr)))
                         return wlvif->ap.bcast_hlid;
+                else
+                        return wlvif->ap.global_hlid;
         }
 }
 
@@ -176,37 +178,34 @@ u8 wl12xx_tx_get_hlid(struct wl1271 *wl, struct wl12xx_vif *wlvif,
 unsigned int wlcore_calc_packet_alignment(struct wl1271 *wl,
                                           unsigned int packet_length)
 {
-        if (wl->quirks & WLCORE_QUIRK_TX_BLOCKSIZE_ALIGN)
-                return ALIGN(packet_length, WL12XX_BUS_BLOCK_SIZE);
-        else
+        if ((wl->quirks & WLCORE_QUIRK_TX_PAD_LAST_FRAME) ||
+            !(wl->quirks & WLCORE_QUIRK_TX_BLOCKSIZE_ALIGN))
                 return ALIGN(packet_length, WL1271_TX_ALIGN_TO);
+        else
+                return ALIGN(packet_length, WL12XX_BUS_BLOCK_SIZE);
 }
 EXPORT_SYMBOL(wlcore_calc_packet_alignment);
 
 static int wl1271_tx_allocate(struct wl1271 *wl, struct wl12xx_vif *wlvif,
                               struct sk_buff *skb, u32 extra, u32 buf_offset,
-                              u8 hlid)
+                              u8 hlid, bool is_gem)
 {
         struct wl1271_tx_hw_descr *desc;
         u32 total_len = skb->len + sizeof(struct wl1271_tx_hw_descr) + extra;
         u32 total_blocks;
         int id, ret = -EBUSY, ac;
-        u32 spare_blocks = wl->normal_tx_spare;
-        bool is_dummy = false;
+        u32 spare_blocks;
 
         if (buf_offset + total_len > WL1271_AGGR_BUFFER_SIZE)
                 return -EAGAIN;
 
+        spare_blocks = wlcore_hw_get_spare_blocks(wl, is_gem);
+
         /* allocate free identifier for the packet */
         id = wl1271_alloc_tx_id(wl, skb);
         if (id < 0)
                 return id;
 
-        if (unlikely(wl12xx_is_dummy_packet(wl, skb)))
-                is_dummy = true;
-        else if (wlvif->is_gem)
-                spare_blocks = wl->gem_tx_spare;
-
         total_blocks = wlcore_hw_calc_tx_blocks(wl, total_len, spare_blocks);
 
         if (total_blocks <= wl->tx_blocks_available) {
@@ -228,7 +227,7 @@ static int wl1271_tx_allocate(struct wl1271 *wl, struct wl12xx_vif *wlvif,
                 ac = wl1271_tx_get_queue(skb_get_queue_mapping(skb));
                 wl->tx_allocated_pkts[ac]++;
 
-                if (!is_dummy && wlvif &&
+                if (!wl12xx_is_dummy_packet(wl, skb) && wlvif &&
                     wlvif->bss_type == BSS_TYPE_AP_BSS &&
                     test_bit(hlid, wlvif->ap.sta_hlid_map))
                         wl->links[hlid].allocated_pkts++;
@@ -268,6 +267,7 @@ static void wl1271_tx_fill_hdr(struct wl1271 *wl, struct wl12xx_vif *wlvif,
         if (extra) {
                 int hdrlen = ieee80211_hdrlen(frame_control);
                 memmove(frame_start, hdr, hdrlen);
+                skb_set_network_header(skb, skb_network_offset(skb) + extra);
         }
 
         /* configure packet life time */
@@ -305,11 +305,15 @@ static void wl1271_tx_fill_hdr(struct wl1271 *wl, struct wl12xx_vif *wlvif,
         if (is_dummy || !wlvif)
                 rate_idx = 0;
         else if (wlvif->bss_type != BSS_TYPE_AP_BSS) {
-                /* if the packets are destined for AP (have a STA entry)
-                   send them with AP rate policies, otherwise use default
-                   basic rates */
+                /*
+                 * if the packets are destined for AP (have a STA entry)
+                 * send them with AP rate policies (EAPOLs are an exception),
+                 * otherwise use default basic rates
+                 */
                 if (control->flags & IEEE80211_TX_CTL_NO_CCK_RATE)
                         rate_idx = wlvif->sta.p2p_rate_idx;
+                else if (skb->protocol == cpu_to_be16(ETH_P_PAE))
+                        rate_idx = wlvif->sta.basic_rate_idx;
                 else if (control->control.sta)
                         rate_idx = wlvif->sta.ap_rate_idx;
                 else
@@ -330,9 +334,9 @@ static void wl1271_tx_fill_hdr(struct wl1271 *wl, struct wl12xx_vif *wlvif,
             ieee80211_has_protected(frame_control))
                 tx_attr |= TX_HW_ATTR_HOST_ENCRYPT;
 
-        desc->reserved = 0;
         desc->tx_attr = cpu_to_le16(tx_attr);
 
+        wlcore_hw_set_tx_desc_csum(wl, desc, skb);
         wlcore_hw_set_tx_desc_data_len(wl, desc, skb);
 }
 
@@ -346,16 +350,20 @@ static int wl1271_prepare_tx_frame(struct wl1271 *wl, struct wl12xx_vif *wlvif,
         u32 total_len;
         u8 hlid;
         bool is_dummy;
+        bool is_gem = false;
 
-        if (!skb)
+        if (!skb) {
+                wl1271_error("discarding null skb");
                 return -EINVAL;
+        }
 
         info = IEEE80211_SKB_CB(skb);
 
         /* TODO: handle dummy packets on multi-vifs */
         is_dummy = wl12xx_is_dummy_packet(wl, skb);
 
-        if (info->control.hw_key &&
+        if ((wl->quirks & WLCORE_QUIRK_TKIP_HEADER_SPACE) &&
+            info->control.hw_key &&
             info->control.hw_key->cipher == WLAN_CIPHER_SUITE_TKIP)
                 extra = WL1271_EXTRA_SPACE_TKIP;
 
@@ -373,6 +381,8 @@ static int wl1271_prepare_tx_frame(struct wl1271 *wl, struct wl12xx_vif *wlvif,
                                 return ret;
                         wlvif->default_key = idx;
                 }
+
+                is_gem = (cipher == WL1271_CIPHER_SUITE_GEM);
         }
         hlid = wl12xx_tx_get_hlid(wl, wlvif, skb);
         if (hlid == WL12XX_INVALID_LINK_ID) {
@@ -380,7 +390,8 @@ static int wl1271_prepare_tx_frame(struct wl1271 *wl, struct wl12xx_vif *wlvif,
                 return -EINVAL;
         }
 
-        ret = wl1271_tx_allocate(wl, wlvif, skb, extra, buf_offset, hlid);
+        ret = wl1271_tx_allocate(wl, wlvif, skb, extra, buf_offset, hlid,
+                                 is_gem);
         if (ret < 0)
                 return ret;
 
@@ -425,10 +436,10 @@ u32 wl1271_tx_enabled_rates_get(struct wl1271 *wl, u32 rate_set,
                 rate_set >>= 1;
         }
 
-        /* MCS rates indication are on bits 16 - 23 */
+        /* MCS rates indication are on bits 16 - 31 */
         rate_set >>= HW_HT_RATES_OFFSET - band->n_bitrates;
 
-        for (bit = 0; bit < 8; bit++) {
+        for (bit = 0; bit < 16; bit++) {
                 if (rate_set & 0x1)
                         enabled_rates |= (CONF_HW_BIT_RATE_MCS_0 << bit);
                 rate_set >>= 1;
@@ -439,18 +450,15 @@ u32 wl1271_tx_enabled_rates_get(struct wl1271 *wl, u32 rate_set,
 
 void wl1271_handle_tx_low_watermark(struct wl1271 *wl)
 {
-        unsigned long flags;
         int i;
 
         for (i = 0; i < NUM_TX_QUEUES; i++) {
-                if (test_bit(i, &wl->stopped_queues_map) &&
+                if (wlcore_is_queue_stopped_by_reason(wl, i,
+                        WLCORE_QUEUE_STOP_REASON_WATERMARK) &&
                     wl->tx_queue_count[i] <= WL1271_TX_QUEUE_LOW_WATERMARK) {
                         /* firmware buffer has space, restart queues */
-                        spin_lock_irqsave(&wl->wl_lock, flags);
-                        ieee80211_wake_queue(wl->hw,
-                                             wl1271_tx_get_mac80211_queue(i));
-                        clear_bit(i, &wl->stopped_queues_map);
-                        spin_unlock_irqrestore(&wl->wl_lock, flags);
+                        wlcore_wake_queue(wl, i,
+                                          WLCORE_QUEUE_STOP_REASON_WATERMARK);
                 }
         }
 }
@@ -656,18 +664,29 @@ void wl12xx_rearm_rx_streaming(struct wl1271 *wl, unsigned long *active_hlids)
         }
 }
 
-void wl1271_tx_work_locked(struct wl1271 *wl)
+/*
+ * Returns failure values only in case of failed bus ops within this function.
+ * wl1271_prepare_tx_frame retvals won't be returned in order to avoid
+ * triggering recovery by higher layers when not necessary.
+ * In case a FW command fails within wl1271_prepare_tx_frame fails a recovery
+ * will be queued in wl1271_cmd_send. -EAGAIN/-EBUSY from prepare_tx_frame
+ * can occur and are legitimate so don't propagate. -EINVAL will emit a WARNING
+ * within prepare_tx_frame code but there's nothing we should do about those
+ * as well.
+ */
+int wlcore_tx_work_locked(struct wl1271 *wl)
 {
         struct wl12xx_vif *wlvif;
         struct sk_buff *skb;
         struct wl1271_tx_hw_descr *desc;
-        u32 buf_offset = 0;
+        u32 buf_offset = 0, last_len = 0;
         bool sent_packets = false;
         unsigned long active_hlids[BITS_TO_LONGS(WL12XX_MAX_LINKS)] = {0};
-        int ret;
+        int ret = 0;
+        int bus_ret = 0;
 
         if (unlikely(wl->state == WL1271_STATE_OFF))
-                return;
+                return 0;
 
         while ((skb = wl1271_skb_dequeue(wl))) {
                 struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
@@ -685,8 +704,14 @@ void wl1271_tx_work_locked(struct wl1271 *wl)
                          * Flush buffer and try again.
                          */
                         wl1271_skb_queue_head(wl, wlvif, skb);
-                        wlcore_write_data(wl, REG_SLV_MEM_DATA, wl->aggr_buf,
-                                          buf_offset, true);
+
+                        buf_offset = wlcore_hw_pre_pkt_send(wl, buf_offset,
+                                                            last_len);
+                        bus_ret = wlcore_write_data(wl, REG_SLV_MEM_DATA,
+                                             wl->aggr_buf, buf_offset, true);
+                        if (bus_ret < 0)
+                                goto out;
+
                         sent_packets = true;
                         buf_offset = 0;
                         continue;
@@ -710,7 +735,8 @@ void wl1271_tx_work_locked(struct wl1271 *wl)
                                 ieee80211_free_txskb(wl->hw, skb);
                         goto out_ack;
                 }
-                buf_offset += ret;
+                last_len = ret;
+                buf_offset += last_len;
                 wl->tx_packets_count++;
                 if (has_data) {
                         desc = (struct wl1271_tx_hw_descr *) skb->data;
@@ -720,8 +746,12 @@ void wl1271_tx_work_locked(struct wl1271 *wl)
 
 out_ack:
         if (buf_offset) {
-                wlcore_write_data(wl, REG_SLV_MEM_DATA, wl->aggr_buf,
-                                  buf_offset, true);
+                buf_offset = wlcore_hw_pre_pkt_send(wl, buf_offset, last_len);
+                bus_ret = wlcore_write_data(wl, REG_SLV_MEM_DATA, wl->aggr_buf,
+                                             buf_offset, true);
+                if (bus_ret < 0)
+                        goto out;
+
                 sent_packets = true;
         }
         if (sent_packets) {
@@ -729,13 +759,19 @@ out_ack:
                  * Interrupt the firmware with the new packets. This is only
                  * required for older hardware revisions
                  */
-                if (wl->quirks & WLCORE_QUIRK_END_OF_TRANSACTION)
-                        wl1271_write32(wl, WL12XX_HOST_WR_ACCESS,
-                                       wl->tx_packets_count);
+                if (wl->quirks & WLCORE_QUIRK_END_OF_TRANSACTION) {
+                        bus_ret = wlcore_write32(wl, WL12XX_HOST_WR_ACCESS,
+                                             wl->tx_packets_count);
+                        if (bus_ret < 0)
+                                goto out;
+                }
 
                 wl1271_handle_tx_low_watermark(wl);
         }
         wl12xx_rearm_rx_streaming(wl, active_hlids);
+
+out:
+        return bus_ret;
 }
 
 void wl1271_tx_work(struct work_struct *work)
@@ -748,7 +784,11 @@ void wl1271_tx_work(struct work_struct *work)
         if (ret < 0)
                 goto out;
 
-        wl1271_tx_work_locked(wl);
+        ret = wlcore_tx_work_locked(wl);
+        if (ret < 0) {
+                wl12xx_queue_recovery_work(wl);
+                goto out;
+        }
 
         wl1271_ps_elp_sleep(wl);
 out:
@@ -849,7 +889,8 @@ static void wl1271_tx_complete_packet(struct wl1271 *wl,
         skb_pull(skb, sizeof(struct wl1271_tx_hw_descr));
 
         /* remove TKIP header space if present */
-        if (info->control.hw_key &&
+        if ((wl->quirks & WLCORE_QUIRK_TKIP_HEADER_SPACE) &&
+            info->control.hw_key &&
             info->control.hw_key->cipher == WLAN_CIPHER_SUITE_TKIP) {
                 int hdrlen = ieee80211_get_hdrlen_from_skb(skb);
                 memmove(skb->data + WL1271_EXTRA_SPACE_TKIP, skb->data,
@@ -869,22 +910,27 @@ static void wl1271_tx_complete_packet(struct wl1271 *wl,
 }
 
 /* Called upon reception of a TX complete interrupt */
-void wl1271_tx_complete(struct wl1271 *wl)
+int wlcore_tx_complete(struct wl1271 *wl)
 {
-        struct wl1271_acx_mem_map *memmap =
-                (struct wl1271_acx_mem_map *)wl->target_mem_map;
+        struct wl1271_acx_mem_map *memmap = wl->target_mem_map;
         u32 count, fw_counter;
         u32 i;
+        int ret;
 
         /* read the tx results from the chipset */
-        wl1271_read(wl, le32_to_cpu(memmap->tx_result),
-                    wl->tx_res_if, sizeof(*wl->tx_res_if), false);
+        ret = wlcore_read(wl, le32_to_cpu(memmap->tx_result),
+                          wl->tx_res_if, sizeof(*wl->tx_res_if), false);
+        if (ret < 0)
+                goto out;
+
         fw_counter = le32_to_cpu(wl->tx_res_if->tx_result_fw_counter);
 
         /* write host counter to chipset (to ack) */
-        wl1271_write32(wl, le32_to_cpu(memmap->tx_result) +
-                       offsetof(struct wl1271_tx_hw_res_if,
-                                tx_result_host_counter), fw_counter);
+        ret = wlcore_write32(wl, le32_to_cpu(memmap->tx_result) +
+                             offsetof(struct wl1271_tx_hw_res_if,
+                                      tx_result_host_counter), fw_counter);
+        if (ret < 0)
+                goto out;
 
         count = fw_counter - wl->tx_results_count;
         wl1271_debug(DEBUG_TX, "tx_complete received, packets: %d", count);
@@ -904,8 +950,11 @@ void wl1271_tx_complete(struct wl1271 *wl)
 
                 wl->tx_results_count++;
         }
+
+out:
+        return ret;
 }
-EXPORT_SYMBOL(wl1271_tx_complete);
+EXPORT_SYMBOL(wlcore_tx_complete);
 
 void wl1271_tx_reset_link_queues(struct wl1271 *wl, u8 hlid)
 {
@@ -958,7 +1007,7 @@ void wl12xx_tx_reset_wlvif(struct wl1271 *wl, struct wl12xx_vif *wlvif)
 
 }
 /* caller must hold wl->mutex and TX must be stopped */
-void wl12xx_tx_reset(struct wl1271 *wl, bool reset_tx_queues)
+void wl12xx_tx_reset(struct wl1271 *wl)
 {
         int i;
         struct sk_buff *skb;
@@ -973,15 +1022,12 @@ void wl12xx_tx_reset(struct wl1271 *wl, bool reset_tx_queues)
                         wl->tx_queue_count[i] = 0;
         }
 
-        wl->stopped_queues_map = 0;
-
         /*
          * Make sure the driver is at a consistent state, in case this
          * function is called from a context other than interface removal.
          * This call will always wake the TX queues.
          */
-        if (reset_tx_queues)
-                wl1271_handle_tx_low_watermark(wl);
+        wl1271_handle_tx_low_watermark(wl);
 
         for (i = 0; i < wl->num_tx_desc; i++) {
                 if (wl->tx_frames[i] == NULL)
@@ -998,7 +1044,8 @@ void wl12xx_tx_reset(struct wl1271 *wl, bool reset_tx_queues)
                          */
                         info = IEEE80211_SKB_CB(skb);
                         skb_pull(skb, sizeof(struct wl1271_tx_hw_descr));
-                        if (info->control.hw_key &&
+                        if ((wl->quirks & WLCORE_QUIRK_TKIP_HEADER_SPACE) &&
+                            info->control.hw_key &&
                             info->control.hw_key->cipher ==
                             WLAN_CIPHER_SUITE_TKIP) {
                                 int hdrlen = ieee80211_get_hdrlen_from_skb(skb);
@@ -1024,6 +1071,11 @@ void wl1271_tx_flush(struct wl1271 *wl)
         int i;
         timeout = jiffies + usecs_to_jiffies(WL1271_TX_FLUSH_TIMEOUT);
 
+        /* only one flush should be in progress, for consistent queue state */
+        mutex_lock(&wl->flush_mutex);
+
+        wlcore_stop_queues(wl, WLCORE_QUEUE_STOP_REASON_FLUSH);
+
         while (!time_after(jiffies, timeout)) {
                 mutex_lock(&wl->mutex);
                 wl1271_debug(DEBUG_TX, "flushing tx buffer: %d %d",
@@ -1032,7 +1084,7 @@ void wl1271_tx_flush(struct wl1271 *wl)
                 if ((wl->tx_frames_cnt == 0) &&
                     (wl1271_tx_total_queue_count(wl) == 0)) {
                         mutex_unlock(&wl->mutex);
-                        return;
+                        goto out;
                 }
                 mutex_unlock(&wl->mutex);
                 msleep(1);
@@ -1045,7 +1097,12 @@ void wl1271_tx_flush(struct wl1271 *wl)
         for (i = 0; i < WL12XX_MAX_LINKS; i++)
                 wl1271_tx_reset_link_queues(wl, i);
         mutex_unlock(&wl->mutex);
+
+out:
+        wlcore_wake_queues(wl, WLCORE_QUEUE_STOP_REASON_FLUSH);
+        mutex_unlock(&wl->flush_mutex);
 }
+EXPORT_SYMBOL_GPL(wl1271_tx_flush);
 
 u32 wl1271_tx_min_rate_get(struct wl1271 *wl, u32 rate_set)
 {
@@ -1054,3 +1111,96 @@ u32 wl1271_tx_min_rate_get(struct wl1271 *wl, u32 rate_set)
 
         return BIT(__ffs(rate_set));
 }
+
+void wlcore_stop_queue_locked(struct wl1271 *wl, u8 queue,
+                              enum wlcore_queue_stop_reason reason)
+{
+        bool stopped = !!wl->queue_stop_reasons[queue];
+
+        /* queue should not be stopped for this reason */
+        WARN_ON(test_and_set_bit(reason, &wl->queue_stop_reasons[queue]));
+
+        if (stopped)
+                return;
+
+        ieee80211_stop_queue(wl->hw, wl1271_tx_get_mac80211_queue(queue));
+}
+
+void wlcore_stop_queue(struct wl1271 *wl, u8 queue,
+                       enum wlcore_queue_stop_reason reason)
+{
+        unsigned long flags;
+
+        spin_lock_irqsave(&wl->wl_lock, flags);
+        wlcore_stop_queue_locked(wl, queue, reason);
+        spin_unlock_irqrestore(&wl->wl_lock, flags);
+}
+
+void wlcore_wake_queue(struct wl1271 *wl, u8 queue,
+                       enum wlcore_queue_stop_reason reason)
+{
+        unsigned long flags;
+
+        spin_lock_irqsave(&wl->wl_lock, flags);
+
+        /* queue should not be clear for this reason */
+        WARN_ON(!test_and_clear_bit(reason, &wl->queue_stop_reasons[queue]));
+
+        if (wl->queue_stop_reasons[queue])
+                goto out;
+
+        ieee80211_wake_queue(wl->hw, wl1271_tx_get_mac80211_queue(queue));
+
+out:
+        spin_unlock_irqrestore(&wl->wl_lock, flags);
+}
+
+void wlcore_stop_queues(struct wl1271 *wl,
+                        enum wlcore_queue_stop_reason reason)
+{
+        int i;
+
+        for (i = 0; i < NUM_TX_QUEUES; i++)
+                wlcore_stop_queue(wl, i, reason);
+}
+EXPORT_SYMBOL_GPL(wlcore_stop_queues);
+
+void wlcore_wake_queues(struct wl1271 *wl,
+                        enum wlcore_queue_stop_reason reason)
+{
+        int i;
+
+        for (i = 0; i < NUM_TX_QUEUES; i++)
+                wlcore_wake_queue(wl, i, reason);
+}
+EXPORT_SYMBOL_GPL(wlcore_wake_queues);
+
+void wlcore_reset_stopped_queues(struct wl1271 *wl)
+{
+        int i;
+        unsigned long flags;
+
+        spin_lock_irqsave(&wl->wl_lock, flags);
+
+        for (i = 0; i < NUM_TX_QUEUES; i++) {
+                if (!wl->queue_stop_reasons[i])
+                        continue;
+
+                wl->queue_stop_reasons[i] = 0;
+                ieee80211_wake_queue(wl->hw,
+                                     wl1271_tx_get_mac80211_queue(i));
+        }
+
+        spin_unlock_irqrestore(&wl->wl_lock, flags);
+}
+
+bool wlcore_is_queue_stopped_by_reason(struct wl1271 *wl, u8 queue,
+                             enum wlcore_queue_stop_reason reason)
+{
+        return test_bit(reason, &wl->queue_stop_reasons[queue]);
+}
+
+bool wlcore_is_queue_stopped(struct wl1271 *wl, u8 queue)
+{
+        return !!wl->queue_stop_reasons[queue];
+}
diff --git a/drivers/net/wireless/ti/wlcore/tx.h b/drivers/net/wireless/ti/wlcore/tx.h
index 2fd6e5dc6f7..1e939b01615 100644
--- a/drivers/net/wireless/ti/wlcore/tx.h
+++ b/drivers/net/wireless/ti/wlcore/tx.h
@@ -85,6 +85,19 @@ struct wl128x_tx_mem {
         u8 extra_bytes;
 } __packed;
 
+struct wl18xx_tx_mem {
+        /*
+         * Total number of memory blocks allocated by the host for
+         * this packet.
+         */
+        u8 total_mem_blocks;
+
+        /*
+         * control bits
+         */
+        u8 ctrl;
+} __packed;
+
 /*
  * On wl128x based devices, when TX packets are aggregated, each packet
  * size must be aligned to the SDIO block size. The maximum block size
@@ -100,6 +113,7 @@ struct wl1271_tx_hw_descr {
         union {
                 struct wl127x_tx_mem wl127x_mem;
                 struct wl128x_tx_mem wl128x_mem;
+                struct wl18xx_tx_mem wl18xx_mem;
         } __packed;
         /* Device time (in us) when the packet arrived to the driver */
         __le32 start_time;
@@ -116,7 +130,16 @@ struct wl1271_tx_hw_descr {
         u8 tid;
         /* host link ID (HLID) */
         u8 hlid;
-        u8 reserved;
+
+        union {
+                u8 wl12xx_reserved;
+
+                /*
+                 * bit 0   -> 0 = udp, 1 = tcp
+                 * bit 1:7 -> IP header offset
+                 */
+                u8 wl18xx_checksum_data;
+        } __packed;
 } __packed;
 
 enum wl1271_tx_hw_res_status {
@@ -161,6 +184,13 @@ struct wl1271_tx_hw_res_if {
         struct wl1271_tx_hw_res_descr tx_results_queue[TX_HW_RESULT_QUEUE_LEN];
 } __packed;
 
+enum wlcore_queue_stop_reason {
+        WLCORE_QUEUE_STOP_REASON_WATERMARK,
+        WLCORE_QUEUE_STOP_REASON_FW_RESTART,
+        WLCORE_QUEUE_STOP_REASON_FLUSH,
+        WLCORE_QUEUE_STOP_REASON_SPARE_BLK, /* 18xx specific */
+};
+
 static inline int wl1271_tx_get_queue(int queue)
 {
         switch (queue) {
@@ -204,10 +234,10 @@ static inline int wl1271_tx_total_queue_count(struct wl1271 *wl)
 }
 
 void wl1271_tx_work(struct work_struct *work);
-void wl1271_tx_work_locked(struct wl1271 *wl);
-void wl1271_tx_complete(struct wl1271 *wl);
+int wlcore_tx_work_locked(struct wl1271 *wl);
+int wlcore_tx_complete(struct wl1271 *wl);
 void wl12xx_tx_reset_wlvif(struct wl1271 *wl, struct wl12xx_vif *wlvif);
-void wl12xx_tx_reset(struct wl1271 *wl, bool reset_tx_queues);
+void wl12xx_tx_reset(struct wl1271 *wl);
 void wl1271_tx_flush(struct wl1271 *wl);
 u8 wlcore_rate_to_idx(struct wl1271 *wl, u8 rate, enum ieee80211_band band);
 u32 wl1271_tx_enabled_rates_get(struct wl1271 *wl, u32 rate_set,
@@ -223,6 +253,21 @@ bool wl12xx_is_dummy_packet(struct wl1271 *wl, struct sk_buff *skb);
 void wl12xx_rearm_rx_streaming(struct wl1271 *wl, unsigned long *active_hlids);
 unsigned int wlcore_calc_packet_alignment(struct wl1271 *wl,
                                           unsigned int packet_length);
+void wl1271_free_tx_id(struct wl1271 *wl, int id);
+void wlcore_stop_queue_locked(struct wl1271 *wl, u8 queue,
+                              enum wlcore_queue_stop_reason reason);
+void wlcore_stop_queue(struct wl1271 *wl, u8 queue,
+                       enum wlcore_queue_stop_reason reason);
+void wlcore_wake_queue(struct wl1271 *wl, u8 queue,
+                       enum wlcore_queue_stop_reason reason);
+void wlcore_stop_queues(struct wl1271 *wl,
+                        enum wlcore_queue_stop_reason reason);
+void wlcore_wake_queues(struct wl1271 *wl,
+                        enum wlcore_queue_stop_reason reason);
+void wlcore_reset_stopped_queues(struct wl1271 *wl);
+bool wlcore_is_queue_stopped_by_reason(struct wl1271 *wl, u8 queue,
+                                       enum wlcore_queue_stop_reason reason);
+bool wlcore_is_queue_stopped(struct wl1271 *wl, u8 queue);
 
 /* from main.c */
 void wl1271_free_sta(struct wl1271 *wl, struct wl12xx_vif *wlvif, u8 hlid);
diff --git a/drivers/net/wireless/ti/wlcore/wlcore.h b/drivers/net/wireless/ti/wlcore/wlcore.h
index 0b3f0b586f4..e796974df59 100644
--- a/drivers/net/wireless/ti/wlcore/wlcore.h
+++ b/drivers/net/wireless/ti/wlcore/wlcore.h
@@ -24,8 +24,9 @@
 
 #include <linux/platform_device.h>
 
-#include "wl12xx.h"
+#include "wlcore_i.h"
 #include "event.h"
+#include "boot.h"
 
 /* The maximum number of Tx descriptors in all chip families */
 #define WLCORE_MAX_TX_DESCRIPTORS 32
@@ -33,14 +34,16 @@
 /* forward declaration */
 struct wl1271_tx_hw_descr;
 enum wl_rx_buf_align;
+struct wl1271_rx_descriptor;
 
 struct wlcore_ops {
         int (*identify_chip)(struct wl1271 *wl);
         int (*identify_fw)(struct wl1271 *wl);
         int (*boot)(struct wl1271 *wl);
-        void (*trigger_cmd)(struct wl1271 *wl, int cmd_box_addr,
-                            void *buf, size_t len);
-        void (*ack_event)(struct wl1271 *wl);
+        int (*plt_init)(struct wl1271 *wl);
+        int (*trigger_cmd)(struct wl1271 *wl, int cmd_box_addr,
+                           void *buf, size_t len);
+        int (*ack_event)(struct wl1271 *wl);
         u32 (*calc_tx_blocks)(struct wl1271 *wl, u32 len, u32 spare_blks);
         void (*set_tx_desc_blocks)(struct wl1271 *wl,
                                    struct wl1271_tx_hw_descr *desc,
@@ -50,17 +53,34 @@ struct wlcore_ops {
                                      struct sk_buff *skb);
         enum wl_rx_buf_align (*get_rx_buf_align)(struct wl1271 *wl,
                                                  u32 rx_desc);
-        void (*prepare_read)(struct wl1271 *wl, u32 rx_desc, u32 len);
+        int (*prepare_read)(struct wl1271 *wl, u32 rx_desc, u32 len);
         u32 (*get_rx_packet_len)(struct wl1271 *wl, void *rx_data,
                                  u32 data_len);
-        void (*tx_delayed_compl)(struct wl1271 *wl);
+        int (*tx_delayed_compl)(struct wl1271 *wl);
         void (*tx_immediate_compl)(struct wl1271 *wl);
         int (*hw_init)(struct wl1271 *wl);
         int (*init_vif)(struct wl1271 *wl, struct wl12xx_vif *wlvif);
         u32 (*sta_get_ap_rate_mask)(struct wl1271 *wl,
                                     struct wl12xx_vif *wlvif);
-        s8 (*get_pg_ver)(struct wl1271 *wl);
-        void (*get_mac)(struct wl1271 *wl);
+        int (*get_pg_ver)(struct wl1271 *wl, s8 *ver);
+        int (*get_mac)(struct wl1271 *wl);
+        void (*set_tx_desc_csum)(struct wl1271 *wl,
+                                 struct wl1271_tx_hw_descr *desc,
+                                 struct sk_buff *skb);
+        void (*set_rx_csum)(struct wl1271 *wl,
+                            struct wl1271_rx_descriptor *desc,
+                            struct sk_buff *skb);
+        u32 (*ap_get_mimo_wide_rate_mask)(struct wl1271 *wl,
+                                          struct wl12xx_vif *wlvif);
+        int (*debugfs_init)(struct wl1271 *wl, struct dentry *rootdir);
+        int (*handle_static_data)(struct wl1271 *wl,
+                                  struct wl1271_static_data *static_data);
+        int (*get_spare_blocks)(struct wl1271 *wl, bool is_gem);
+        int (*set_key)(struct wl1271 *wl, enum set_key_cmd cmd,
+                       struct ieee80211_vif *vif,
+                       struct ieee80211_sta *sta,
+                       struct ieee80211_key_conf *key_conf);
+        u32 (*pre_pkt_send)(struct wl1271 *wl, u32 buf_offset, u32 last_len);
 };
 
 enum wlcore_partitions {
@@ -109,6 +129,15 @@ enum wlcore_registers {
         REG_TABLE_LEN,
 };
 
+struct wl1271_stats {
+        void *fw_stats;
+        unsigned long fw_stats_update;
+        size_t fw_stats_len;
+
+        unsigned int retry_count;
+        unsigned int excessive_retries;
+};
+
 struct wl1271 {
         struct ieee80211_hw *hw;
         bool mac80211_registered;
@@ -121,7 +150,6 @@ struct wl1271 {
 
         void (*set_power)(bool enable);
         int irq;
-        int ref_clock;
 
         spinlock_t wl_lock;
 
@@ -186,7 +214,7 @@ struct wl1271 {
 
         /* Frames scheduled for transmission, not handled yet */
         int tx_queue_count[NUM_TX_QUEUES];
-        long stopped_queues_map;
+        unsigned long queue_stop_reasons[NUM_TX_QUEUES];
 
         /* Frames received, not handled yet by mac80211 */
         struct sk_buff_head deferred_rx_queue;
@@ -205,9 +233,6 @@ struct wl1271 {
         /* FW Rx counter */
         u32 rx_counter;
 
-        /* Rx memory pool address */
-        struct wl1271_rx_mem_pool_addr rx_mem_pool_addr;
-
         /* Intermediate buffer, used for packet aggregation */
         u8 *aggr_buf;
 
@@ -228,6 +253,7 @@ struct wl1271 {
 
         /* Hardware recovery work */
         struct work_struct recovery_work;
+        bool watchdog_recovery;
 
         /* Pointer that holds DMA-friendly block for the mailbox */
         struct event_mailbox *mbox;
@@ -263,7 +289,8 @@ struct wl1271 {
         u32 buffer_cmd;
         u32 buffer_busyword[WL1271_BUSY_WORD_CNT];
 
-        struct wl_fw_status *fw_status;
+        struct wl_fw_status_1 *fw_status_1;
+        struct wl_fw_status_2 *fw_status_2;
         struct wl1271_tx_hw_res_if *tx_res_if;
 
         /* Current chipset configuration */
@@ -279,8 +306,6 @@ struct wl1271 {
         /* bands supported by this instance of wl12xx */
         struct ieee80211_supported_band bands[IEEE80211_NUM_BANDS];
 
-        int tcxo_clock;
-
         /*
          * wowlan trigger was configured during suspend.
          * (currently, only "ANY" trigger is supported)
@@ -333,10 +358,8 @@ struct wl1271 {
 
         /* number of TX descriptors the HW supports. */
         u32 num_tx_desc;
-
-        /* spare Tx blocks for normal/GEM operating modes */
-        u32 normal_tx_spare;
-        u32 gem_tx_spare;
+        /* number of RX descriptors the HW supports. */
+        u32 num_rx_desc;
 
         /* translate HW Tx rates to standard rate-indices */
         const u8 **band_rate_to_idx;
@@ -348,19 +371,42 @@ struct wl1271 {
         u8 hw_min_ht_rate;
 
         /* HW HT (11n) capabilities */
-        struct ieee80211_sta_ht_cap ht_cap;
+        struct ieee80211_sta_ht_cap ht_cap[IEEE80211_NUM_BANDS];
 
         /* size of the private FW status data */
         size_t fw_status_priv_len;
 
         /* RX Data filter rule state - enabled/disabled */
         bool rx_filter_enabled[WL1271_MAX_RX_FILTERS];
+
+        /* size of the private static data */
+        size_t static_data_priv_len;
+
+        /* the current channel type */
+        enum nl80211_channel_type channel_type;
+
+        /* mutex for protecting the tx_flush function */
+        struct mutex flush_mutex;
+
+        /* sleep auth value currently configured to FW */
+        int sleep_auth;
 };
 
 int __devinit wlcore_probe(struct wl1271 *wl, struct platform_device *pdev);
 int __devexit wlcore_remove(struct platform_device *pdev);
 struct ieee80211_hw *wlcore_alloc_hw(size_t priv_size);
 int wlcore_free_hw(struct wl1271 *wl);
+int wlcore_set_key(struct wl1271 *wl, enum set_key_cmd cmd,
+                   struct ieee80211_vif *vif,
+                   struct ieee80211_sta *sta,
+                   struct ieee80211_key_conf *key_conf);
+
+static inline void
+wlcore_set_ht_cap(struct wl1271 *wl, enum ieee80211_band band,
+                  struct ieee80211_sta_ht_cap *ht_cap)
+{
+        memcpy(&wl->ht_cap[band], ht_cap, sizeof(*ht_cap));
+}
 
 /* Firmware image load chunk size */
 #define CHUNK_SIZE      16384
@@ -385,6 +431,12 @@ int wlcore_free_hw(struct wl1271 *wl);
 /* Some firmwares may not support ELP */
 #define WLCORE_QUIRK_NO_ELP                     BIT(6)
 
+/* pad only the last frame in the aggregate buffer */
+#define WLCORE_QUIRK_TX_PAD_LAST_FRAME          BIT(7)
+
+/* extra header space is required for TKIP */
+#define WLCORE_QUIRK_TKIP_HEADER_SPACE          BIT(8)
+
 /* TODO: move to the lower drivers when all usages are abstracted */
 #define CHIP_ID_1271_PG10              (0x4030101)
 #define CHIP_ID_1271_PG20              (0x4030111)
diff --git a/drivers/net/wireless/ti/wlcore/wl12xx.h b/drivers/net/wireless/ti/wlcore/wlcore_i.h
index f12bdf74518..4273a21cdde 100644
--- a/drivers/net/wireless/ti/wlcore/wl12xx.h
+++ b/drivers/net/wireless/ti/wlcore/wlcore_i.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef __WL12XX_H__
-#define __WL12XX_H__
+#ifndef __WLCORE_I_H__
+#define __WLCORE_I_H__
 
 #include <linux/mutex.h>
 #include <linux/completion.h>
@@ -89,7 +89,7 @@
 #define WL1271_AP_BSS_INDEX        0
 #define WL1271_AP_DEF_BEACON_EXP   20
 
-#define WL1271_AGGR_BUFFER_SIZE (4 * PAGE_SIZE)
+#define WL1271_AGGR_BUFFER_SIZE (5 * PAGE_SIZE)
 
 enum wl1271_state {
         WL1271_STATE_OFF,
@@ -132,16 +132,7 @@ struct wl1271_chip {
         unsigned int fw_ver[NUM_FW_VER];
 };
 
-struct wl1271_stats {
-        struct acx_statistics *fw_stats;
-        unsigned long fw_stats_update;
-
-        unsigned int retry_count;
-        unsigned int excessive_retries;
-};
-
 #define NUM_TX_QUEUES              4
-#define NUM_RX_PKT_DESC            8
 
 #define AP_MAX_STATIONS            8
 
@@ -159,13 +150,26 @@ struct wl_fw_packet_counters {
 } __packed;
 
 /* FW status registers */
-struct wl_fw_status {
+struct wl_fw_status_1 {
         __le32 intr;
         u8  fw_rx_counter;
         u8  drv_rx_counter;
         u8  reserved;
         u8  tx_results_counter;
-        __le32 rx_pkt_descs[NUM_RX_PKT_DESC];
+        __le32 rx_pkt_descs[0];
+} __packed;
+
+/*
+ * Each HW arch has a different number of Rx descriptors.
+ * The length of the status depends on it, since it holds an array
+ * of descriptors.
+ */
+#define WLCORE_FW_STATUS_1_LEN(num_rx_desc) \
+                (sizeof(struct wl_fw_status_1) + \
+                (sizeof(((struct wl_fw_status_1 *)0)->rx_pkt_descs[0])) * \
+                num_rx_desc)
+
+struct wl_fw_status_2 {
         __le32 fw_localtime;
 
         /*
@@ -194,11 +198,6 @@ struct wl_fw_status {
         u8 priv[0];
 } __packed;
 
-struct wl1271_rx_mem_pool_addr {
-        u32 addr;
-        u32 addr_extra;
-};
-
 #define WL1271_MAX_CHANNELS 64
 struct wl1271_scan {
         struct cfg80211_scan_request *req;
@@ -210,10 +209,10 @@ struct wl1271_scan {
 };
 
 struct wl1271_if_operations {
-        void (*read)(struct device *child, int addr, void *buf, size_t len,
-                     bool fixed);
-        void (*write)(struct device *child, int addr, void *buf, size_t len,
-                     bool fixed);
+        int __must_check (*read)(struct device *child, int addr, void *buf,
+                                 size_t len, bool fixed);
+        int __must_check (*write)(struct device *child, int addr, void *buf,
+                                  size_t len, bool fixed);
         void (*reset)(struct device *child);
         void (*init)(struct device *child);
         int (*power)(struct device *child, bool enable);
@@ -248,6 +247,7 @@ enum wl12xx_flags {
         WL1271_FLAG_RECOVERY_IN_PROGRESS,
         WL1271_FLAG_VIF_CHANGE_IN_PROGRESS,
         WL1271_FLAG_INTENDED_FW_RECOVERY,
+        WL1271_FLAG_SDIO_FAILED,
 };
 
 enum wl12xx_vif_flags {
@@ -367,6 +367,7 @@ struct wl12xx_vif {
         /* The current band */
         enum ieee80211_band band;
         int channel;
+        enum nl80211_channel_type channel_type;
 
         u32 bitrate_masks[IEEE80211_NUM_BANDS];
         u32 basic_rate_set;
@@ -417,9 +418,6 @@ struct wl12xx_vif {
         struct work_struct rx_streaming_disable_work;
         struct timer_list rx_streaming_timer;
 
-        /* does the current role use GEM for encryption (AP or STA) */
-        bool is_gem;
-
         /*
          * This struct must be last!
          * data that has to be saved acrossed reconfigs (e.g. recovery)
@@ -501,7 +499,8 @@ void wl1271_rx_filter_flatten_fields(struct wl12xx_rx_filter *filter,
 /* Macros to handle wl1271.sta_rate_set */
 #define HW_BG_RATES_MASK        0xffff
 #define HW_HT_RATES_OFFSET      16
+#define HW_MIMO_RATES_OFFSET    24
 
 #define WL12XX_HW_BLOCK_SIZE    256
 
-#endif
+#endif /* __WLCORE_I_H__ */
diff --git a/drivers/net/wireless/zd1211rw/zd_chip.h b/drivers/net/wireless/zd1211rw/zd_chip.h
index 117c4123943..7ab922209b2 100644
--- a/drivers/net/wireless/zd1211rw/zd_chip.h
+++ b/drivers/net/wireless/zd1211rw/zd_chip.h
@@ -827,7 +827,7 @@ int zd_ioread32v_locked(struct zd_chip *chip, u32 *values,
 static inline int zd_ioread32_locked(struct zd_chip *chip, u32 *value,
                                      const zd_addr_t addr)
 {
-        return zd_ioread32v_locked(chip, value, (const zd_addr_t *)&addr, 1);
+        return zd_ioread32v_locked(chip, value, &addr, 1);
 }
 
 static inline int zd_iowrite16_locked(struct zd_chip *chip, u16 value,
diff --git a/drivers/net/wireless/zd1211rw/zd_usb.h b/drivers/net/wireless/zd1211rw/zd_usb.h
index 99193b456a7..45e3bb28a01 100644
--- a/drivers/net/wireless/zd1211rw/zd_usb.h
+++ b/drivers/net/wireless/zd1211rw/zd_usb.h
@@ -274,7 +274,7 @@ int zd_usb_ioread16v(struct zd_usb *usb, u16 *values,
 static inline int zd_usb_ioread16(struct zd_usb *usb, u16 *value,
                               const zd_addr_t addr)
 {
-        return zd_usb_ioread16v(usb, value, (const zd_addr_t *)&addr, 1);
+        return zd_usb_ioread16v(usb, value, &addr, 1);
 }
 
 void zd_usb_iowrite16v_async_start(struct zd_usb *usb);
diff --git a/drivers/net/xen-netback/netback.c b/drivers/net/xen-netback/netback.c
index f4a6fcaeffb..682633bfe00 100644
--- a/drivers/net/xen-netback/netback.c
+++ b/drivers/net/xen-netback/netback.c
@@ -1363,8 +1363,6 @@ static unsigned xen_netbk_tx_build_gops(struct xen_netbk *netbk)
                                              INVALID_PENDING_IDX);
                 }
 
-                __skb_queue_tail(&netbk->tx_queue, skb);
-
                 netbk->pending_cons++;
 
                 request_gop = xen_netbk_get_requests(netbk, vif,
@@ -1376,6 +1374,8 @@ static unsigned xen_netbk_tx_build_gops(struct xen_netbk *netbk)
                 }
                 gop = request_gop;
 
+                __skb_queue_tail(&netbk->tx_queue, skb);
+
                 vif->tx.req_cons = idx;
                 xen_netbk_check_rx_xenvif(vif);
 
diff --git a/drivers/nfc/pn533.c b/drivers/nfc/pn533.c
index 19110f0eb15..9ac829e22e7 100644
--- a/drivers/nfc/pn533.c
+++ b/drivers/nfc/pn533.c
@@ -45,6 +45,9 @@ static const struct usb_device_id pn533_table[] = {
 };
 MODULE_DEVICE_TABLE(usb, pn533_table);
 
+/* How much time we spend listening for initiators */
+#define PN533_LISTEN_TIME 2
+
 /* frame definitions */
 #define PN533_FRAME_TAIL_SIZE 2
 #define PN533_FRAME_SIZE(f) (sizeof(struct pn533_frame) + f->datalen + \
@@ -74,6 +77,10 @@ MODULE_DEVICE_TABLE(usb, pn533_table);
 #define PN533_CMD_IN_RELEASE 0x52
 #define PN533_CMD_IN_JUMP_FOR_DEP 0x56
 
+#define PN533_CMD_TG_INIT_AS_TARGET 0x8c
+#define PN533_CMD_TG_GET_DATA 0x86
+#define PN533_CMD_TG_SET_DATA 0x8e
+
 #define PN533_CMD_RESPONSE(cmd) (cmd + 1)
 
 /* PN533 Return codes */
@@ -81,6 +88,9 @@ MODULE_DEVICE_TABLE(usb, pn533_table);
 #define PN533_CMD_MI_MASK 0x40
 #define PN533_CMD_RET_SUCCESS 0x00
 
+/* PN533 status codes */
+#define PN533_STATUS_TARGET_RELEASED 0x29
+
 struct pn533;
 
 typedef int (*pn533_cmd_complete_t) (struct pn533 *dev, void *arg,
@@ -97,8 +107,14 @@ struct pn533_fw_version {
 };
 
 /* PN533_CMD_RF_CONFIGURATION */
+#define PN533_CFGITEM_TIMING 0x02
 #define PN533_CFGITEM_MAX_RETRIES 0x05
 
+#define PN533_CONFIG_TIMING_102 0xb
+#define PN533_CONFIG_TIMING_204 0xc
+#define PN533_CONFIG_TIMING_409 0xd
+#define PN533_CONFIG_TIMING_819 0xe
+
 #define PN533_CONFIG_MAX_RETRIES_NO_RETRY 0x00
 #define PN533_CONFIG_MAX_RETRIES_ENDLESS 0xFF
 
@@ -108,6 +124,12 @@ struct pn533_config_max_retries {
         u8 mx_rty_passive_act;
 } __packed;
 
+struct pn533_config_timing {
+        u8 rfu;
+        u8 atr_res_timeout;
+        u8 dep_timeout;
+} __packed;
+
 /* PN533_CMD_IN_LIST_PASSIVE_TARGET */
 
 /* felica commands opcode */
@@ -144,6 +166,7 @@ enum {
         PN533_POLL_MOD_424KBPS_FELICA,
         PN533_POLL_MOD_106KBPS_JEWEL,
         PN533_POLL_MOD_847KBPS_B,
+        PN533_LISTEN_MOD,
 
         __PN533_POLL_MOD_AFTER_LAST,
 };
@@ -211,6 +234,9 @@ const struct pn533_poll_modulations poll_mod[] = {
                 },
                 .len = 3,
         },
+        [PN533_LISTEN_MOD] = {
+                .len = 0,
+        },
 };
 
 /* PN533_CMD_IN_ATR */
@@ -237,7 +263,7 @@ struct pn533_cmd_jump_dep {
         u8 active;
         u8 baud;
         u8 next;
-        u8 gt[];
+        u8 data[];
 } __packed;
 
 struct pn533_cmd_jump_dep_response {
@@ -253,6 +279,29 @@ struct pn533_cmd_jump_dep_response {
         u8 gt[];
 } __packed;
 
+
+/* PN533_TG_INIT_AS_TARGET */
+#define PN533_INIT_TARGET_PASSIVE 0x1
+#define PN533_INIT_TARGET_DEP 0x2
+
+#define PN533_INIT_TARGET_RESP_FRAME_MASK 0x3
+#define PN533_INIT_TARGET_RESP_ACTIVE     0x1
+#define PN533_INIT_TARGET_RESP_DEP        0x4
+
+struct pn533_cmd_init_target {
+        u8 mode;
+        u8 mifare[6];
+        u8 felica[18];
+        u8 nfcid3[10];
+        u8 gb_len;
+        u8 gb[];
+} __packed;
+
+struct pn533_cmd_init_target_response {
+        u8 mode;
+        u8 cmd[];
+} __packed;
+
 struct pn533 {
         struct usb_device *udev;
         struct usb_interface *interface;
@@ -270,22 +319,31 @@ struct pn533 {
 
         struct workqueue_struct *wq;
         struct work_struct cmd_work;
+        struct work_struct poll_work;
         struct work_struct mi_work;
+        struct work_struct tg_work;
+        struct timer_list listen_timer;
         struct pn533_frame *wq_in_frame;
         int wq_in_error;
+        int cancel_listen;
 
         pn533_cmd_complete_t cmd_complete;
         void *cmd_complete_arg;
-        struct semaphore cmd_lock;
+        struct mutex cmd_lock;
         u8 cmd;
 
         struct pn533_poll_modulations *poll_mod_active[PN533_POLL_MOD_MAX + 1];
         u8 poll_mod_count;
         u8 poll_mod_curr;
         u32 poll_protocols;
+        u32 listen_protocols;
+
+        u8 *gb;
+        size_t gb_len;
 
         u8 tgt_available_prots;
         u8 tgt_active_prot;
+        u8 tgt_mode;
 };
 
 struct pn533_frame {
@@ -405,7 +463,7 @@ static void pn533_wq_cmd_complete(struct work_struct *work)
                                         PN533_FRAME_CMD_PARAMS_LEN(in_frame));
 
         if (rc != -EINPROGRESS)
-                up(&dev->cmd_lock);
+                mutex_unlock(&dev->cmd_lock);
 }
 
 static void pn533_recv_response(struct urb *urb)
@@ -583,7 +641,7 @@ static int pn533_send_cmd_frame_async(struct pn533 *dev,
 
         nfc_dev_dbg(&dev->interface->dev, "%s", __func__);
 
-        if (down_trylock(&dev->cmd_lock))
+        if (!mutex_trylock(&dev->cmd_lock))
                 return -EBUSY;
 
         rc = __pn533_send_cmd_frame_async(dev, out_frame, in_frame,
@@ -593,7 +651,7 @@ static int pn533_send_cmd_frame_async(struct pn533 *dev,
 
         return 0;
 error:
-        up(&dev->cmd_lock);
+        mutex_unlock(&dev->cmd_lock);
         return rc;
 }
 
@@ -963,6 +1021,11 @@ static int pn533_target_found(struct pn533 *dev,
         return 0;
 }
 
+static inline void pn533_poll_next_mod(struct pn533 *dev)
+{
+        dev->poll_mod_curr = (dev->poll_mod_curr + 1) % dev->poll_mod_count;
+}
+
 static void pn533_poll_reset_mod_list(struct pn533 *dev)
 {
         dev->poll_mod_count = 0;
@@ -975,102 +1038,283 @@ static void pn533_poll_add_mod(struct pn533 *dev, u8 mod_index)
         dev->poll_mod_count++;
 }
 
-static void pn533_poll_create_mod_list(struct pn533 *dev, u32 protocols)
+static void pn533_poll_create_mod_list(struct pn533 *dev,
+                                       u32 im_protocols, u32 tm_protocols)
 {
         pn533_poll_reset_mod_list(dev);
 
-        if (protocols & NFC_PROTO_MIFARE_MASK
-                                        || protocols & NFC_PROTO_ISO14443_MASK
-                                        || protocols & NFC_PROTO_NFC_DEP_MASK)
+        if (im_protocols & NFC_PROTO_MIFARE_MASK
+            || im_protocols & NFC_PROTO_ISO14443_MASK
+            || im_protocols & NFC_PROTO_NFC_DEP_MASK)
                 pn533_poll_add_mod(dev, PN533_POLL_MOD_106KBPS_A);
 
-        if (protocols & NFC_PROTO_FELICA_MASK
-                                        || protocols & NFC_PROTO_NFC_DEP_MASK) {
+        if (im_protocols & NFC_PROTO_FELICA_MASK
+            || im_protocols & NFC_PROTO_NFC_DEP_MASK) {
                 pn533_poll_add_mod(dev, PN533_POLL_MOD_212KBPS_FELICA);
                 pn533_poll_add_mod(dev, PN533_POLL_MOD_424KBPS_FELICA);
         }
 
-        if (protocols & NFC_PROTO_JEWEL_MASK)
+        if (im_protocols & NFC_PROTO_JEWEL_MASK)
                 pn533_poll_add_mod(dev, PN533_POLL_MOD_106KBPS_JEWEL);
 
-        if (protocols & NFC_PROTO_ISO14443_MASK)
+        if (im_protocols & NFC_PROTO_ISO14443_MASK)
                 pn533_poll_add_mod(dev, PN533_POLL_MOD_847KBPS_B);
+
+        if (tm_protocols)
+                pn533_poll_add_mod(dev, PN533_LISTEN_MOD);
+}
+
+static int pn533_start_poll_complete(struct pn533 *dev, void *arg,
+                                     u8 *params, int params_len)
+{
+        struct pn533_poll_response *resp;
+        int rc;
+
+        nfc_dev_dbg(&dev->interface->dev, "%s", __func__);
+
+        resp = (struct pn533_poll_response *) params;
+        if (resp->nbtg) {
+                rc = pn533_target_found(dev, resp, params_len);
+
+                /* We must stop the poll after a valid target found */
+                if (rc == 0) {
+                        pn533_poll_reset_mod_list(dev);
+                        return 0;
+                }
+        }
+
+        return -EAGAIN;
 }
 
-static void pn533_start_poll_frame(struct pn533_frame *frame,
-                                        struct pn533_poll_modulations *mod)
+static int pn533_init_target_frame(struct pn533_frame *frame,
+                                   u8 *gb, size_t gb_len)
 {
+        struct pn533_cmd_init_target *cmd;
+        size_t cmd_len;
+        u8 felica_params[18] = {0x1, 0xfe, /* DEP */
+                                0x0, 0x0, 0x0, 0x0, 0x0, 0x0, /* random */
+                                0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+                                0xff, 0xff}; /* System code */
+        u8 mifare_params[6] = {0x1, 0x1, /* SENS_RES */
+                               0x0, 0x0, 0x0,
+                               0x40}; /* SEL_RES for DEP */
+
+        cmd_len = sizeof(struct pn533_cmd_init_target) + gb_len + 1;
+        cmd = kzalloc(cmd_len, GFP_KERNEL);
+        if (cmd == NULL)
+                return -ENOMEM;
+
+        pn533_tx_frame_init(frame, PN533_CMD_TG_INIT_AS_TARGET);
+
+        /* DEP support only */
+        cmd->mode |= PN533_INIT_TARGET_DEP;
+
+        /* Felica params */
+        memcpy(cmd->felica, felica_params, 18);
+        get_random_bytes(cmd->felica + 2, 6);
+
+        /* NFCID3 */
+        memset(cmd->nfcid3, 0, 10);
+        memcpy(cmd->nfcid3, cmd->felica, 8);
 
-        pn533_tx_frame_init(frame, PN533_CMD_IN_LIST_PASSIVE_TARGET);
+        /* MIFARE params */
+        memcpy(cmd->mifare, mifare_params, 6);
 
-        memcpy(PN533_FRAME_CMD_PARAMS_PTR(frame), &mod->data, mod->len);
-        frame->datalen += mod->len;
+        /* General bytes */
+        cmd->gb_len = gb_len;
+        memcpy(cmd->gb, gb, gb_len);
+
+        /* Len Tk */
+        cmd->gb[gb_len] = 0;
+
+        memcpy(PN533_FRAME_CMD_PARAMS_PTR(frame), cmd, cmd_len);
+
+        frame->datalen += cmd_len;
 
         pn533_tx_frame_finish(frame);
+
+        kfree(cmd);
+
+        return 0;
 }
 
-static int pn533_start_poll_complete(struct pn533 *dev, void *arg,
-                                                u8 *params, int params_len)
+#define PN533_CMD_DATAEXCH_HEAD_LEN (sizeof(struct pn533_frame) + 3)
+#define PN533_CMD_DATAEXCH_DATA_MAXLEN 262
+static int pn533_tm_get_data_complete(struct pn533 *dev, void *arg,
+                                      u8 *params, int params_len)
 {
-        struct pn533_poll_response *resp;
-        struct pn533_poll_modulations *next_mod;
-        int rc;
+        struct sk_buff *skb_resp = arg;
+        struct pn533_frame *in_frame = (struct pn533_frame *) skb_resp->data;
 
         nfc_dev_dbg(&dev->interface->dev, "%s", __func__);
 
-        if (params_len == -ENOENT) {
-                nfc_dev_dbg(&dev->interface->dev, "Polling operation has been"
-                                                                " stopped");
-                goto stop_poll;
+        if (params_len < 0) {
+                nfc_dev_err(&dev->interface->dev,
+                            "Error %d when starting as a target",
+                            params_len);
+
+                return params_len;
         }
 
+        if (params_len > 0 && params[0] != 0) {
+                nfc_tm_deactivated(dev->nfc_dev);
+
+                dev->tgt_mode = 0;
+
+                kfree_skb(skb_resp);
+                return 0;
+        }
+
+        skb_put(skb_resp, PN533_FRAME_SIZE(in_frame));
+        skb_pull(skb_resp, PN533_CMD_DATAEXCH_HEAD_LEN);
+        skb_trim(skb_resp, skb_resp->len - PN533_FRAME_TAIL_SIZE);
+
+        return nfc_tm_data_received(dev->nfc_dev, skb_resp);
+}
+
+static void pn533_wq_tg_get_data(struct work_struct *work)
+{
+        struct pn533 *dev = container_of(work, struct pn533, tg_work);
+        struct pn533_frame *in_frame;
+        struct sk_buff *skb_resp;
+        size_t skb_resp_len;
+
+        nfc_dev_dbg(&dev->interface->dev, "%s", __func__);
+
+        skb_resp_len = PN533_CMD_DATAEXCH_HEAD_LEN +
+                PN533_CMD_DATAEXCH_DATA_MAXLEN +
+                PN533_FRAME_TAIL_SIZE;
+
+        skb_resp = nfc_alloc_recv_skb(skb_resp_len, GFP_KERNEL);
+        if (!skb_resp)
+                return;
+
+        in_frame = (struct pn533_frame *)skb_resp->data;
+
+        pn533_tx_frame_init(dev->out_frame, PN533_CMD_TG_GET_DATA);
+        pn533_tx_frame_finish(dev->out_frame);
+
+        pn533_send_cmd_frame_async(dev, dev->out_frame, in_frame,
+                                   skb_resp_len,
+                                   pn533_tm_get_data_complete,
+                                   skb_resp, GFP_KERNEL);
+
+        return;
+}
+
+#define ATR_REQ_GB_OFFSET 17
+static int pn533_init_target_complete(struct pn533 *dev, void *arg,
+                                      u8 *params, int params_len)
+{
+        struct pn533_cmd_init_target_response *resp;
+        u8 frame, comm_mode = NFC_COMM_PASSIVE, *gb;
+        size_t gb_len;
+        int rc;
+
+        nfc_dev_dbg(&dev->interface->dev, "%s", __func__);
+
         if (params_len < 0) {
-                nfc_dev_err(&dev->interface->dev, "Error %d when running poll",
-                                                                params_len);
-                goto stop_poll;
+                nfc_dev_err(&dev->interface->dev,
+                            "Error %d when starting as a target",
+                            params_len);
+
+                return params_len;
         }
 
-        resp = (struct pn533_poll_response *) params;
-        if (resp->nbtg) {
-                rc = pn533_target_found(dev, resp, params_len);
+        if (params_len < ATR_REQ_GB_OFFSET + 1)
+                return -EINVAL;
 
-                /* We must stop the poll after a valid target found */
-                if (rc == 0)
-                        goto stop_poll;
+        resp = (struct pn533_cmd_init_target_response *) params;
+
+        nfc_dev_dbg(&dev->interface->dev, "Target mode 0x%x param len %d\n",
+                    resp->mode, params_len);
+
+        frame = resp->mode & PN533_INIT_TARGET_RESP_FRAME_MASK;
+        if (frame == PN533_INIT_TARGET_RESP_ACTIVE)
+                comm_mode = NFC_COMM_ACTIVE;
 
-                if (rc != -EAGAIN)
-                        nfc_dev_err(&dev->interface->dev, "The target found is"
-                                        " not valid - continuing to poll");
+        /* Again, only DEP */
+        if ((resp->mode & PN533_INIT_TARGET_RESP_DEP) == 0)
+                return -EOPNOTSUPP;
+
+        gb = resp->cmd + ATR_REQ_GB_OFFSET;
+        gb_len = params_len - (ATR_REQ_GB_OFFSET + 1);
+
+        rc = nfc_tm_activated(dev->nfc_dev, NFC_PROTO_NFC_DEP_MASK,
+                              comm_mode, gb, gb_len);
+        if (rc < 0) {
+                nfc_dev_err(&dev->interface->dev,
+                            "Error when signaling target activation");
+                return rc;
         }
 
-        dev->poll_mod_curr = (dev->poll_mod_curr + 1) % dev->poll_mod_count;
+        dev->tgt_mode = 1;
 
-        next_mod = dev->poll_mod_active[dev->poll_mod_curr];
+        queue_work(dev->wq, &dev->tg_work);
 
-        nfc_dev_dbg(&dev->interface->dev, "Polling next modulation (0x%x)",
-                                                        dev->poll_mod_curr);
+        return 0;
+}
+
+static void pn533_listen_mode_timer(unsigned long data)
+{
+        struct pn533 *dev = (struct pn533 *) data;
+
+        nfc_dev_dbg(&dev->interface->dev, "Listen mode timeout");
+
+        /* An ack will cancel the last issued command (poll) */
+        pn533_send_ack(dev, GFP_ATOMIC);
+
+        dev->cancel_listen = 1;
+
+        mutex_unlock(&dev->cmd_lock);
+
+        pn533_poll_next_mod(dev);
+
+        queue_work(dev->wq, &dev->poll_work);
+}
 
-        pn533_start_poll_frame(dev->out_frame, next_mod);
+static int pn533_poll_complete(struct pn533 *dev, void *arg,
+                               u8 *params, int params_len)
+{
+        struct pn533_poll_modulations *cur_mod;
+        int rc;
 
-        /* Don't need to down the semaphore again */
-        rc = __pn533_send_cmd_frame_async(dev, dev->out_frame, dev->in_frame,
-                                dev->in_maxlen, pn533_start_poll_complete,
-                                NULL, GFP_ATOMIC);
+        nfc_dev_dbg(&dev->interface->dev, "%s", __func__);
+
+        if (params_len == -ENOENT) {
+                if (dev->poll_mod_count != 0)
+                        return 0;
+
+                nfc_dev_err(&dev->interface->dev,
+                            "Polling operation has been stopped");
 
-        if (rc == -EPERM) {
-                nfc_dev_dbg(&dev->interface->dev, "Cannot poll next modulation"
-                                        " because poll has been stopped");
                 goto stop_poll;
         }
 
-        if (rc) {
-                nfc_dev_err(&dev->interface->dev, "Error %d when trying to poll"
-                                                        " next modulation", rc);
+        if (params_len < 0) {
+                nfc_dev_err(&dev->interface->dev,
+                            "Error %d when running poll", params_len);
+
                 goto stop_poll;
         }
 
-        /* Inform caller function to do not up the semaphore */
-        return -EINPROGRESS;
+        cur_mod = dev->poll_mod_active[dev->poll_mod_curr];
+
+        if (cur_mod->len == 0) {
+                del_timer(&dev->listen_timer);
+
+                return pn533_init_target_complete(dev, arg, params, params_len);
+        } else {
+                rc = pn533_start_poll_complete(dev, arg, params, params_len);
+                if (!rc)
+                        return rc;
+        }
+
+        pn533_poll_next_mod(dev);
+
+        queue_work(dev->wq, &dev->poll_work);
+
+        return 0;
 
 stop_poll:
         pn533_poll_reset_mod_list(dev);
@@ -1078,61 +1322,104 @@ stop_poll:
         return 0;
 }
 
-static int pn533_start_poll(struct nfc_dev *nfc_dev, u32 protocols)
+static void pn533_build_poll_frame(struct pn533 *dev,
+                                   struct pn533_frame *frame,
+                                   struct pn533_poll_modulations *mod)
 {
-        struct pn533 *dev = nfc_get_drvdata(nfc_dev);
-        struct pn533_poll_modulations *start_mod;
-        int rc;
+        nfc_dev_dbg(&dev->interface->dev, "mod len %d\n", mod->len);
 
-        nfc_dev_dbg(&dev->interface->dev, "%s - protocols=0x%x", __func__,
-                                                                protocols);
+        if (mod->len == 0) {
+                /* Listen mode */
+                pn533_init_target_frame(frame, dev->gb, dev->gb_len);
+        } else {
+                /* Polling mode */
+                pn533_tx_frame_init(frame, PN533_CMD_IN_LIST_PASSIVE_TARGET);
 
-        if (dev->poll_mod_count) {
-                nfc_dev_err(&dev->interface->dev, "Polling operation already"
-                                                                " active");
-                return -EBUSY;
-        }
+                memcpy(PN533_FRAME_CMD_PARAMS_PTR(frame), &mod->data, mod->len);
+                frame->datalen += mod->len;
 
-        if (dev->tgt_active_prot) {
-                nfc_dev_err(&dev->interface->dev, "Cannot poll with a target"
-                                                        " already activated");
-                return -EBUSY;
+                pn533_tx_frame_finish(frame);
         }
+}
 
-        pn533_poll_create_mod_list(dev, protocols);
+static int pn533_send_poll_frame(struct pn533 *dev)
+{
+        struct pn533_poll_modulations *cur_mod;
+        int rc;
 
-        if (!dev->poll_mod_count) {
-                nfc_dev_err(&dev->interface->dev, "No valid protocols"
-                                                                " specified");
-                rc = -EINVAL;
-                goto error;
+        cur_mod = dev->poll_mod_active[dev->poll_mod_curr];
+
+        pn533_build_poll_frame(dev, dev->out_frame, cur_mod);
+
+        rc = pn533_send_cmd_frame_async(dev, dev->out_frame, dev->in_frame,
+                                dev->in_maxlen, pn533_poll_complete,
+                                NULL, GFP_KERNEL);
+        if (rc)
+                nfc_dev_err(&dev->interface->dev, "Polling loop error %d", rc);
+
+        return rc;
+}
+
+static void pn533_wq_poll(struct work_struct *work)
+{
+        struct pn533 *dev = container_of(work, struct pn533, poll_work);
+        struct pn533_poll_modulations *cur_mod;
+        int rc;
+
+        cur_mod = dev->poll_mod_active[dev->poll_mod_curr];
+
+        nfc_dev_dbg(&dev->interface->dev,
+                    "%s cancel_listen %d modulation len %d",
+                    __func__, dev->cancel_listen, cur_mod->len);
+
+        if (dev->cancel_listen == 1) {
+                dev->cancel_listen = 0;
+                usb_kill_urb(dev->in_urb);
         }
 
-        nfc_dev_dbg(&dev->interface->dev, "It will poll %d modulations types",
-                                                        dev->poll_mod_count);
+        rc = pn533_send_poll_frame(dev);
+        if (rc)
+                return;
 
-        dev->poll_mod_curr = 0;
-        start_mod = dev->poll_mod_active[dev->poll_mod_curr];
+        if (cur_mod->len == 0 && dev->poll_mod_count > 1)
+                mod_timer(&dev->listen_timer, jiffies + PN533_LISTEN_TIME * HZ);
 
-        pn533_start_poll_frame(dev->out_frame, start_mod);
+        return;
+}
 
-        rc = pn533_send_cmd_frame_async(dev, dev->out_frame, dev->in_frame,
-                                dev->in_maxlen, pn533_start_poll_complete,
-                                NULL, GFP_KERNEL);
+static int pn533_start_poll(struct nfc_dev *nfc_dev,
+                            u32 im_protocols, u32 tm_protocols)
+{
+        struct pn533 *dev = nfc_get_drvdata(nfc_dev);
 
-        if (rc) {
-                nfc_dev_err(&dev->interface->dev, "Error %d when trying to"
-                                                        " start poll", rc);
-                goto error;
+        nfc_dev_dbg(&dev->interface->dev,
+                    "%s: im protocols 0x%x tm protocols 0x%x",
+                    __func__, im_protocols, tm_protocols);
+
+        if (dev->tgt_active_prot) {
+                nfc_dev_err(&dev->interface->dev,
+                            "Cannot poll with a target already activated");
+                return -EBUSY;
         }
 
-        dev->poll_protocols = protocols;
+        if (dev->tgt_mode) {
+                nfc_dev_err(&dev->interface->dev,
+                            "Cannot poll while already being activated");
+                return -EBUSY;
+        }
 
-        return 0;
+        if (tm_protocols) {
+                dev->gb = nfc_get_local_general_bytes(nfc_dev, &dev->gb_len);
+                if (dev->gb == NULL)
+                        tm_protocols = 0;
+        }
 
-error:
-        pn533_poll_reset_mod_list(dev);
-        return rc;
+        dev->poll_mod_curr = 0;
+        pn533_poll_create_mod_list(dev, im_protocols, tm_protocols);
+        dev->poll_protocols = im_protocols;
+        dev->listen_protocols = tm_protocols;
+
+        return pn533_send_poll_frame(dev);
 }
 
 static void pn533_stop_poll(struct nfc_dev *nfc_dev)
@@ -1141,6 +1428,8 @@ static void pn533_stop_poll(struct nfc_dev *nfc_dev)
 
         nfc_dev_dbg(&dev->interface->dev, "%s", __func__);
 
+        del_timer(&dev->listen_timer);
+
         if (!dev->poll_mod_count) {
                 nfc_dev_dbg(&dev->interface->dev, "Polling operation was not"
                                                                 " running");
@@ -1152,6 +1441,8 @@ static void pn533_stop_poll(struct nfc_dev *nfc_dev)
 
         /* prevent pn533_start_poll_complete to issue a new poll meanwhile */
         usb_kill_urb(dev->in_urb);
+
+        pn533_poll_reset_mod_list(dev);
 }
 
 static int pn533_activate_target_nfcdep(struct pn533 *dev)
@@ -1349,13 +1640,29 @@ static int pn533_in_dep_link_up_complete(struct pn533 *dev, void *arg,
         return 0;
 }
 
+static int pn533_mod_to_baud(struct pn533 *dev)
+{
+        switch (dev->poll_mod_curr) {
+        case PN533_POLL_MOD_106KBPS_A:
+                return 0;
+        case PN533_POLL_MOD_212KBPS_FELICA:
+                return 1;
+        case PN533_POLL_MOD_424KBPS_FELICA:
+                return 2;
+        default:
+                return -EINVAL;
+        }
+}
+
+#define PASSIVE_DATA_LEN 5
 static int pn533_dep_link_up(struct nfc_dev *nfc_dev, struct nfc_target *target,
                              u8 comm_mode, u8* gb, size_t gb_len)
 {
         struct pn533 *dev = nfc_get_drvdata(nfc_dev);
         struct pn533_cmd_jump_dep *cmd;
-        u8 cmd_len;
-        int rc;
+        u8 cmd_len, *data_ptr;
+        u8 passive_data[PASSIVE_DATA_LEN] = {0x00, 0xff, 0xff, 0x00, 0x3};
+        int rc, baud;
 
         nfc_dev_dbg(&dev->interface->dev, "%s", __func__);
 
@@ -1371,7 +1678,17 @@ static int pn533_dep_link_up(struct nfc_dev *nfc_dev, struct nfc_target *target,
                 return -EBUSY;
         }
 
+        baud = pn533_mod_to_baud(dev);
+        if (baud < 0) {
+                nfc_dev_err(&dev->interface->dev,
+                            "Invalid curr modulation %d", dev->poll_mod_curr);
+                return baud;
+        }
+
         cmd_len = sizeof(struct pn533_cmd_jump_dep) + gb_len;
+        if (comm_mode == NFC_COMM_PASSIVE)
+                cmd_len += PASSIVE_DATA_LEN;
+
         cmd = kzalloc(cmd_len, GFP_KERNEL);
         if (cmd == NULL)
                 return -ENOMEM;
@@ -1379,10 +1696,18 @@ static int pn533_dep_link_up(struct nfc_dev *nfc_dev, struct nfc_target *target,
         pn533_tx_frame_init(dev->out_frame, PN533_CMD_IN_JUMP_FOR_DEP);
 
         cmd->active = !comm_mode;
-        cmd->baud = 0;
+        cmd->next = 0;
+        cmd->baud = baud;
+        data_ptr = cmd->data;
+        if (comm_mode == NFC_COMM_PASSIVE && cmd->baud > 0) {
+                memcpy(data_ptr, passive_data, PASSIVE_DATA_LEN);
+                cmd->next |= 1;
+                data_ptr += PASSIVE_DATA_LEN;
+        }
+
         if (gb != NULL && gb_len > 0) {
-                cmd->next = 4; /* We have some Gi */
-                memcpy(cmd->gt, gb, gb_len);
+                cmd->next |= 4; /* We have some Gi */
+                memcpy(data_ptr, gb, gb_len);
         } else {
                 cmd->next = 0;
         }
@@ -1407,15 +1732,25 @@ out:
 
 static int pn533_dep_link_down(struct nfc_dev *nfc_dev)
 {
-        pn533_deactivate_target(nfc_dev, 0);
+        struct pn533 *dev = nfc_get_drvdata(nfc_dev);
+
+        pn533_poll_reset_mod_list(dev);
+
+        if (dev->tgt_mode || dev->tgt_active_prot) {
+                pn533_send_ack(dev, GFP_KERNEL);
+                usb_kill_urb(dev->in_urb);
+        }
+
+        dev->tgt_active_prot = 0;
+        dev->tgt_mode = 0;
+
+        skb_queue_purge(&dev->resp_q);
 
         return 0;
 }
 
-#define PN533_CMD_DATAEXCH_HEAD_LEN (sizeof(struct pn533_frame) + 3)
-#define PN533_CMD_DATAEXCH_DATA_MAXLEN 262
-
-static int pn533_data_exchange_tx_frame(struct pn533 *dev, struct sk_buff *skb)
+static int pn533_build_tx_frame(struct pn533 *dev, struct sk_buff *skb,
+                                bool target)
 {
         int payload_len = skb->len;
         struct pn533_frame *out_frame;
@@ -1432,14 +1767,20 @@ static int pn533_data_exchange_tx_frame(struct pn533 *dev, struct sk_buff *skb)
                 return -ENOSYS;
         }
 
-        skb_push(skb, PN533_CMD_DATAEXCH_HEAD_LEN);
-        out_frame = (struct pn533_frame *) skb->data;
+        if (target == true) {
+                skb_push(skb, PN533_CMD_DATAEXCH_HEAD_LEN);
+                out_frame = (struct pn533_frame *) skb->data;
 
-        pn533_tx_frame_init(out_frame, PN533_CMD_IN_DATA_EXCHANGE);
+                pn533_tx_frame_init(out_frame, PN533_CMD_IN_DATA_EXCHANGE);
+                tg = 1;
+                memcpy(PN533_FRAME_CMD_PARAMS_PTR(out_frame), &tg, sizeof(u8));
+                out_frame->datalen += sizeof(u8);
+        } else {
+                skb_push(skb, PN533_CMD_DATAEXCH_HEAD_LEN - 1);
+                out_frame = (struct pn533_frame *) skb->data;
+                pn533_tx_frame_init(out_frame, PN533_CMD_TG_SET_DATA);
+        }
 
-        tg = 1;
-        memcpy(PN533_FRAME_CMD_PARAMS_PTR(out_frame), &tg, sizeof(u8));
-        out_frame->datalen += sizeof(u8);
 
         /* The data is already in the out_frame, just update the datalen */
         out_frame->datalen += payload_len;
@@ -1550,9 +1891,9 @@ error:
         return 0;
 }
 
-static int pn533_data_exchange(struct nfc_dev *nfc_dev,
-                               struct nfc_target *target, struct sk_buff *skb,
-                               data_exchange_cb_t cb, void *cb_context)
+static int pn533_transceive(struct nfc_dev *nfc_dev,
+                            struct nfc_target *target, struct sk_buff *skb,
+                            data_exchange_cb_t cb, void *cb_context)
 {
         struct pn533 *dev = nfc_get_drvdata(nfc_dev);
         struct pn533_frame *out_frame, *in_frame;
@@ -1570,7 +1911,7 @@ static int pn533_data_exchange(struct nfc_dev *nfc_dev,
                 goto error;
         }
 
-        rc = pn533_data_exchange_tx_frame(dev, skb);
+        rc = pn533_build_tx_frame(dev, skb, true);
         if (rc)
                 goto error;
 
@@ -1618,6 +1959,63 @@ error:
         return rc;
 }
 
+static int pn533_tm_send_complete(struct pn533 *dev, void *arg,
+                                  u8 *params, int params_len)
+{
+        nfc_dev_dbg(&dev->interface->dev, "%s", __func__);
+
+        if (params_len < 0) {
+                nfc_dev_err(&dev->interface->dev,
+                            "Error %d when sending data",
+                            params_len);
+
+                return params_len;
+        }
+
+        if (params_len > 0 && params[0] != 0) {
+                nfc_tm_deactivated(dev->nfc_dev);
+
+                dev->tgt_mode = 0;
+
+                return 0;
+        }
+
+        queue_work(dev->wq, &dev->tg_work);
+
+        return 0;
+}
+
+static int pn533_tm_send(struct nfc_dev *nfc_dev, struct sk_buff *skb)
+{
+        struct pn533 *dev = nfc_get_drvdata(nfc_dev);
+        struct pn533_frame *out_frame;
+        int rc;
+
+        nfc_dev_dbg(&dev->interface->dev, "%s", __func__);
+
+        rc = pn533_build_tx_frame(dev, skb, false);
+        if (rc)
+                goto error;
+
+        out_frame = (struct pn533_frame *) skb->data;
+
+        rc = pn533_send_cmd_frame_async(dev, out_frame, dev->in_frame,
+                                        dev->in_maxlen, pn533_tm_send_complete,
+                                        NULL, GFP_KERNEL);
+        if (rc) {
+                nfc_dev_err(&dev->interface->dev,
+                            "Error %d when trying to send data", rc);
+                goto error;
+        }
+
+        return 0;
+
+error:
+        kfree_skb(skb);
+
+        return rc;
+}
+
 static void pn533_wq_mi_recv(struct work_struct *work)
 {
         struct pn533 *dev = container_of(work, struct pn533, mi_work);
@@ -1638,7 +2036,7 @@ static void pn533_wq_mi_recv(struct work_struct *work)
 
         skb_reserve(skb_cmd, PN533_CMD_DATAEXCH_HEAD_LEN);
 
-        rc = pn533_data_exchange_tx_frame(dev, skb_cmd);
+        rc = pn533_build_tx_frame(dev, skb_cmd, true);
         if (rc)
                 goto error_frame;
 
@@ -1677,7 +2075,7 @@ error_cmd:
 
         kfree(arg);
 
-        up(&dev->cmd_lock);
+        mutex_unlock(&dev->cmd_lock);
 }
 
 static int pn533_set_configuration(struct pn533 *dev, u8 cfgitem, u8 *cfgdata,
@@ -1712,7 +2110,8 @@ struct nfc_ops pn533_nfc_ops = {
         .stop_poll = pn533_stop_poll,
         .activate_target = pn533_activate_target,
         .deactivate_target = pn533_deactivate_target,
-        .data_exchange = pn533_data_exchange,
+        .im_transceive = pn533_transceive,
+        .tm_send = pn533_tm_send,
 };
 
 static int pn533_probe(struct usb_interface *interface,
@@ -1723,6 +2122,7 @@ static int pn533_probe(struct usb_interface *interface,
         struct usb_host_interface *iface_desc;
         struct usb_endpoint_descriptor *endpoint;
         struct pn533_config_max_retries max_retries;
+        struct pn533_config_timing timing;
         int in_endpoint = 0;
         int out_endpoint = 0;
         int rc = -ENOMEM;
@@ -1735,7 +2135,7 @@ static int pn533_probe(struct usb_interface *interface,
 
         dev->udev = usb_get_dev(interface_to_usbdev(interface));
         dev->interface = interface;
-        sema_init(&dev->cmd_lock, 1);
+        mutex_init(&dev->cmd_lock);
 
         iface_desc = interface->cur_altsetting;
         for (i = 0; i < iface_desc->desc.bNumEndpoints; ++i) {
@@ -1779,12 +2179,18 @@ static int pn533_probe(struct usb_interface *interface,
 
         INIT_WORK(&dev->cmd_work, pn533_wq_cmd_complete);
         INIT_WORK(&dev->mi_work, pn533_wq_mi_recv);
+        INIT_WORK(&dev->tg_work, pn533_wq_tg_get_data);
+        INIT_WORK(&dev->poll_work, pn533_wq_poll);
         dev->wq = alloc_workqueue("pn533",
                                   WQ_NON_REENTRANT | WQ_UNBOUND | WQ_MEM_RECLAIM,
                                   1);
         if (dev->wq == NULL)
                 goto error;
 
+        init_timer(&dev->listen_timer);
+        dev->listen_timer.data = (unsigned long) dev;
+        dev->listen_timer.function = pn533_listen_mode_timer;
+
         skb_queue_head_init(&dev->resp_q);
 
         usb_set_intfdata(interface, dev);
@@ -1830,13 +2236,29 @@ static int pn533_probe(struct usb_interface *interface,
         if (rc) {
                 nfc_dev_err(&dev->interface->dev, "Error on setting MAX_RETRIES"
                                                                 " config");
-                goto free_nfc_dev;
+                goto unregister_nfc_dev;
+        }
+
+        timing.rfu = PN533_CONFIG_TIMING_102;
+        timing.atr_res_timeout = PN533_CONFIG_TIMING_204;
+        timing.dep_timeout = PN533_CONFIG_TIMING_409;
+
+        rc = pn533_set_configuration(dev, PN533_CFGITEM_TIMING,
+                                (u8 *) &timing, sizeof(timing));
+        if (rc) {
+                nfc_dev_err(&dev->interface->dev,
+                            "Error on setting RF timings");
+                goto unregister_nfc_dev;
         }
 
         return 0;
 
+unregister_nfc_dev:
+        nfc_unregister_device(dev->nfc_dev);
+
 free_nfc_dev:
         nfc_free_device(dev->nfc_dev);
+
 destroy_wq:
         destroy_workqueue(dev->wq);
 error:
@@ -1865,6 +2287,8 @@ static void pn533_disconnect(struct usb_interface *interface)
 
         skb_queue_purge(&dev->resp_q);
 
+        del_timer(&dev->listen_timer);
+
         kfree(dev->in_frame);
         usb_free_urb(dev->in_urb);
         kfree(dev->out_frame);
diff --git a/drivers/nfc/pn544_hci.c b/drivers/nfc/pn544_hci.c
index 281f18c2fb8..457eac35dc7 100644
--- a/drivers/nfc/pn544_hci.c
+++ b/drivers/nfc/pn544_hci.c
@@ -576,7 +576,8 @@ static int pn544_hci_xmit(struct nfc_shdlc *shdlc, struct sk_buff *skb)
         return pn544_hci_i2c_write(client, skb->data, skb->len);
 }
 
-static int pn544_hci_start_poll(struct nfc_shdlc *shdlc, u32 protocols)
+static int pn544_hci_start_poll(struct nfc_shdlc *shdlc,
+                                u32 im_protocols, u32 tm_protocols)
 {
         struct nfc_hci_dev *hdev = nfc_shdlc_get_hci_dev(shdlc);
         u8 phases = 0;
@@ -584,7 +585,8 @@ static int pn544_hci_start_poll(struct nfc_shdlc *shdlc, u32 protocols)
         u8 duration[2];
         u8 activated;
 
-        pr_info(DRIVER_DESC ": %s protocols = %d\n", __func__, protocols);
+        pr_info(DRIVER_DESC ": %s protocols 0x%x 0x%x\n",
+                __func__, im_protocols, tm_protocols);
 
         r = nfc_hci_send_event(hdev, NFC_HCI_RF_READER_A_GATE,
                                NFC_HCI_EVT_END_OPERATION, NULL, 0);
@@ -604,10 +606,10 @@ static int pn544_hci_start_poll(struct nfc_shdlc *shdlc, u32 protocols)
         if (r < 0)
                 return r;
 
-        if (protocols & (NFC_PROTO_ISO14443_MASK | NFC_PROTO_MIFARE_MASK |
+        if (im_protocols & (NFC_PROTO_ISO14443_MASK | NFC_PROTO_MIFARE_MASK |
                          NFC_PROTO_JEWEL_MASK))
                 phases |= 1;            /* Type A */
-        if (protocols & NFC_PROTO_FELICA_MASK) {
+        if (im_protocols & NFC_PROTO_FELICA_MASK) {
                 phases |= (1 << 2);     /* Type F 212 */
                 phases |= (1 << 3);     /* Type F 424 */
         }
diff --git a/drivers/of/of_mdio.c b/drivers/of/of_mdio.c
index 2574abde8d9..8e6c25f3504 100644
--- a/drivers/of/of_mdio.c
+++ b/drivers/of/of_mdio.c
@@ -57,6 +57,7 @@ int of_mdiobus_register(struct mii_bus *mdio, struct device_node *np)
                 const __be32 *paddr;
                 u32 addr;
                 int len;
+                bool is_c45;
 
                 /* A PHY must have a reg property in the range [0-31] */
                 paddr = of_get_property(child, "reg", &len);
@@ -79,11 +80,18 @@ int of_mdiobus_register(struct mii_bus *mdio, struct device_node *np)
                                 mdio->irq[addr] = PHY_POLL;
                 }
 
-                phy = get_phy_device(mdio, addr);
+                is_c45 = of_device_is_compatible(child,
+                                                 "ethernet-phy-ieee802.3-c45");
+                phy = get_phy_device(mdio, addr, is_c45);
+
                 if (!phy || IS_ERR(phy)) {
-                        dev_err(&mdio->dev, "error probing PHY at address %i\n",
-                                addr);
-                        continue;
+                        phy = phy_device_create(mdio, addr, 0, false, NULL);
+                        if (!phy || IS_ERR(phy)) {
+                                dev_err(&mdio->dev,
+                                        "error creating PHY at address %i\n",
+                                        addr);
+                                continue;
+                        }
                 }
 
                 /* Associate the OF node with the device structure so it
diff --git a/drivers/s390/net/qeth_l3_main.c b/drivers/s390/net/qeth_l3_main.c
index 7be5e977569..73ac63d901c 100644
--- a/drivers/s390/net/qeth_l3_main.c
+++ b/drivers/s390/net/qeth_l3_main.c
@@ -2700,10 +2700,11 @@ int inline qeth_l3_get_cast_type(struct qeth_card *card, struct sk_buff *skb)
         rcu_read_lock();
         dst = skb_dst(skb);
         if (dst)
-                n = dst_get_neighbour_noref(dst);
+                n = dst_neigh_lookup_skb(dst, skb);
         if (n) {
                 cast_type = n->type;
                 rcu_read_unlock();
+                neigh_release(n);
                 if ((cast_type == RTN_BROADCAST) ||
                     (cast_type == RTN_MULTICAST) ||
                     (cast_type == RTN_ANYCAST))
diff --git a/drivers/scsi/bnx2fc/bnx2fc.h b/drivers/scsi/bnx2fc/bnx2fc.h
index 0578fa0dc14..42969e8a45b 100644
--- a/drivers/scsi/bnx2fc/bnx2fc.h
+++ b/drivers/scsi/bnx2fc/bnx2fc.h
@@ -59,6 +59,7 @@
 #include "57xx_hsi_bnx2fc.h"
 #include "bnx2fc_debug.h"
 #include "../../net/ethernet/broadcom/cnic_if.h"
+#include  "../../net/ethernet/broadcom/bnx2x/bnx2x_mfw_req.h"
 #include "bnx2fc_constants.h"
 
 #define BNX2FC_NAME             "bnx2fc"
@@ -84,6 +85,8 @@
 #define BNX2FC_NUM_MAX_SESS     1024
 #define BNX2FC_NUM_MAX_SESS_LOG (ilog2(BNX2FC_NUM_MAX_SESS))
 
+#define BNX2FC_MAX_NPIV         256
+
 #define BNX2FC_MAX_OUTSTANDING_CMNDS    2048
 #define BNX2FC_CAN_QUEUE                BNX2FC_MAX_OUTSTANDING_CMNDS
 #define BNX2FC_ELSTM_XIDS               BNX2FC_CAN_QUEUE
@@ -206,6 +209,7 @@ struct bnx2fc_hba {
         struct fcoe_statistics_params *stats_buffer;
         dma_addr_t stats_buf_dma;
         struct completion stat_req_done;
+        struct fcoe_capabilities fcoe_cap;
 
         /*destroy handling */
         struct timer_list destroy_timer;
diff --git a/drivers/scsi/bnx2fc/bnx2fc_fcoe.c b/drivers/scsi/bnx2fc/bnx2fc_fcoe.c
index f52f668fd24..05fe6620b3f 100644
--- a/drivers/scsi/bnx2fc/bnx2fc_fcoe.c
+++ b/drivers/scsi/bnx2fc/bnx2fc_fcoe.c
@@ -1326,6 +1326,7 @@ static void bnx2fc_hba_destroy(struct bnx2fc_hba *hba)
 static struct bnx2fc_hba *bnx2fc_hba_create(struct cnic_dev *cnic)
 {
         struct bnx2fc_hba *hba;
+        struct fcoe_capabilities *fcoe_cap;
         int rc;
 
         hba = kzalloc(sizeof(*hba), GFP_KERNEL);
@@ -1361,6 +1362,21 @@ static struct bnx2fc_hba *bnx2fc_hba_create(struct cnic_dev *cnic)
                 printk(KERN_ERR PFX "em_config:bnx2fc_cmd_mgr_alloc failed\n");
                 goto cmgr_err;
         }
+        fcoe_cap = &hba->fcoe_cap;
+
+        fcoe_cap->capability1 = BNX2FC_TM_MAX_SQES <<
+                                        FCOE_IOS_PER_CONNECTION_SHIFT;
+        fcoe_cap->capability1 |= BNX2FC_NUM_MAX_SESS <<
+                                        FCOE_LOGINS_PER_PORT_SHIFT;
+        fcoe_cap->capability2 = BNX2FC_MAX_OUTSTANDING_CMNDS <<
+                                        FCOE_NUMBER_OF_EXCHANGES_SHIFT;
+        fcoe_cap->capability2 |= BNX2FC_MAX_NPIV <<
+                                        FCOE_NPIV_WWN_PER_PORT_SHIFT;
+        fcoe_cap->capability3 = BNX2FC_NUM_MAX_SESS <<
+                                        FCOE_TARGETS_SUPPORTED_SHIFT;
+        fcoe_cap->capability3 |= BNX2FC_MAX_OUTSTANDING_CMNDS <<
+                                        FCOE_OUTSTANDING_COMMANDS_SHIFT;
+        fcoe_cap->capability4 = FCOE_CAPABILITY4_STATEFUL;
 
         init_waitqueue_head(&hba->shutdown_wait);
         init_waitqueue_head(&hba->destroy_wait);
@@ -1691,6 +1707,32 @@ static void bnx2fc_unbind_pcidev(struct bnx2fc_hba *hba)
         hba->pcidev = NULL;
 }
 
+/**
+ * bnx2fc_ulp_get_stats - cnic callback to populate FCoE stats
+ *
+ * @handle:    transport handle pointing to adapter struture
+ */
+static int bnx2fc_ulp_get_stats(void *handle)
+{
+        struct bnx2fc_hba *hba = handle;
+        struct cnic_dev *cnic;
+        struct fcoe_stats_info *stats_addr;
+
+        if (!hba)
+                return -EINVAL;
+
+        cnic = hba->cnic;
+        stats_addr = &cnic->stats_addr->fcoe_stat;
+        if (!stats_addr)
+                return -EINVAL;
+
+        strncpy(stats_addr->version, BNX2FC_VERSION,
+                sizeof(stats_addr->version));
+        stats_addr->txq_size = BNX2FC_SQ_WQES_MAX;
+        stats_addr->rxq_size = BNX2FC_CQ_WQES_MAX;
+
+        return 0;
+}
 
 
 /**
@@ -1944,6 +1986,7 @@ static void bnx2fc_ulp_init(struct cnic_dev *dev)
         adapter_count++;
         mutex_unlock(&bnx2fc_dev_lock);
 
+        dev->fcoe_cap = &hba->fcoe_cap;
         clear_bit(BNX2FC_CNIC_REGISTERED, &hba->reg_with_cnic);
         rc = dev->register_device(dev, CNIC_ULP_FCOE,
                                                 (void *) hba);
@@ -2643,4 +2686,5 @@ static struct cnic_ulp_ops bnx2fc_cnic_cb = {
         .cnic_stop              = bnx2fc_ulp_stop,
         .indicate_kcqes         = bnx2fc_indicate_kcqe,
         .indicate_netevent      = bnx2fc_indicate_netevent,
+        .cnic_get_stats         = bnx2fc_ulp_get_stats,
 };
diff --git a/drivers/scsi/bnx2i/57xx_iscsi_hsi.h b/drivers/scsi/bnx2i/57xx_iscsi_hsi.h
index dc0a08e69c8..f2db5fe7bdc 100644
--- a/drivers/scsi/bnx2i/57xx_iscsi_hsi.h
+++ b/drivers/scsi/bnx2i/57xx_iscsi_hsi.h
@@ -267,7 +267,13 @@ struct bnx2i_cmd_request {
  * task statistics for write response
  */
 struct bnx2i_write_resp_task_stat {
-        u32 num_data_ins;
+#if defined(__BIG_ENDIAN)
+        u16 num_r2ts;
+        u16 num_data_outs;
+#elif defined(__LITTLE_ENDIAN)
+        u16 num_data_outs;
+        u16 num_r2ts;
+#endif
 };
 
 /*
@@ -275,11 +281,11 @@ struct bnx2i_write_resp_task_stat {
  */
 struct bnx2i_read_resp_task_stat {
 #if defined(__BIG_ENDIAN)
-        u16 num_data_outs;
-        u16 num_r2ts;
+        u16 reserved;
+        u16 num_data_ins;
 #elif defined(__LITTLE_ENDIAN)
-        u16 num_r2ts;
-        u16 num_data_outs;
+        u16 num_data_ins;
+        u16 reserved;
 #endif
 };
 
diff --git a/drivers/scsi/bnx2i/bnx2i.h b/drivers/scsi/bnx2i/bnx2i.h
index 0c53c28dc3d..2e326145825 100644
--- a/drivers/scsi/bnx2i/bnx2i.h
+++ b/drivers/scsi/bnx2i/bnx2i.h
@@ -44,6 +44,8 @@
 #include "57xx_iscsi_hsi.h"
 #include "57xx_iscsi_constants.h"
 
+#include "../../net/ethernet/broadcom/bnx2x/bnx2x_mfw_req.h"
+
 #define BNX2_ISCSI_DRIVER_NAME          "bnx2i"
 
 #define BNX2I_MAX_ADAPTERS              8
@@ -126,6 +128,43 @@
 #define REG_WR(__hba, offset, val)                      \
                 writel(val, __hba->regview + offset)
 
+#ifdef CONFIG_32BIT
+#define GET_STATS_64(__hba, dst, field)                         \
+        do {                                                    \
+                spin_lock_bh(&__hba->stat_lock);                \
+                dst->field##_lo = __hba->stats.field##_lo;      \
+                dst->field##_hi = __hba->stats.field##_hi;      \
+                spin_unlock_bh(&__hba->stat_lock);              \
+        } while (0)
+
+#define ADD_STATS_64(__hba, field, len)                         \
+        do {                                                    \
+                if (spin_trylock(&__hba->stat_lock)) {          \
+                        if (__hba->stats.field##_lo + len <     \
+                            __hba->stats.field##_lo)            \
+                                __hba->stats.field##_hi++;      \
+                        __hba->stats.field##_lo += len;         \
+                        spin_unlock(&__hba->stat_lock);         \
+                }                                               \
+        } while (0)
+
+#else
+#define GET_STATS_64(__hba, dst, field)                         \
+        do {                                                    \
+                u64 val, *out;                                  \
+                                                                \
+                val = __hba->bnx2i_stats.field;                 \
+                out = (u64 *)&__hba->stats.field##_lo;          \
+                *out = cpu_to_le64(val);                        \
+                out = (u64 *)&dst->field##_lo;                  \
+                *out = cpu_to_le64(val);                        \
+        } while (0)
+
+#define ADD_STATS_64(__hba, field, len)                         \
+        do {                                                    \
+                __hba->bnx2i_stats.field += len;                \
+        } while (0)
+#endif
 
 /**
  * struct generic_pdu_resc - login pdu resource structure
@@ -288,6 +327,15 @@ struct iscsi_cid_queue {
         struct bnx2i_conn **conn_cid_tbl;
 };
 
+
+struct bnx2i_stats_info {
+        u64 rx_pdus;
+        u64 rx_bytes;
+        u64 tx_pdus;
+        u64 tx_bytes;
+};
+
+
 /**
  * struct bnx2i_hba - bnx2i adapter structure
  *
@@ -341,6 +389,8 @@ struct iscsi_cid_queue {
  * @ctx_ccell_tasks:       captures number of ccells and tasks supported by
  *                         currently offloaded connection, used to decode
  *                         context memory
+ * @stat_lock:             spin lock used by the statistic collector (32 bit)
+ * @stats:                 local iSCSI statistic collection place holder
  *
  * Adapter Data Structure
  */
@@ -426,6 +476,12 @@ struct bnx2i_hba {
         u32 num_sess_opened;
         u32 num_conn_opened;
         unsigned int ctx_ccell_tasks;
+
+#ifdef CONFIG_32BIT
+        spinlock_t stat_lock;
+#endif
+        struct bnx2i_stats_info bnx2i_stats;
+        struct iscsi_stats_info stats;
 };
 
 
@@ -749,6 +805,8 @@ extern void bnx2i_ulp_init(struct cnic_dev *dev);
 extern void bnx2i_ulp_exit(struct cnic_dev *dev);
 extern void bnx2i_start(void *handle);
 extern void bnx2i_stop(void *handle);
+extern int bnx2i_get_stats(void *handle);
+
 extern struct bnx2i_hba *get_adapter_list_head(void);
 
 struct bnx2i_conn *bnx2i_get_conn_from_id(struct bnx2i_hba *hba,
diff --git a/drivers/scsi/bnx2i/bnx2i_hwi.c b/drivers/scsi/bnx2i/bnx2i_hwi.c
index ece47e50228..49e8b056ca1 100644
--- a/drivers/scsi/bnx2i/bnx2i_hwi.c
+++ b/drivers/scsi/bnx2i/bnx2i_hwi.c
@@ -1350,6 +1350,7 @@ int bnx2i_process_scsi_cmd_resp(struct iscsi_session *session,
                                 struct cqe *cqe)
 {
         struct iscsi_conn *conn = bnx2i_conn->cls_conn->dd_data;
+        struct bnx2i_hba *hba = bnx2i_conn->hba;
         struct bnx2i_cmd_response *resp_cqe;
         struct bnx2i_cmd *bnx2i_cmd;
         struct iscsi_task *task;
@@ -1367,16 +1368,26 @@ int bnx2i_process_scsi_cmd_resp(struct iscsi_session *session,
 
         if (bnx2i_cmd->req.op_attr & ISCSI_CMD_REQUEST_READ) {
                 conn->datain_pdus_cnt +=
-                        resp_cqe->task_stat.read_stat.num_data_outs;
+                        resp_cqe->task_stat.read_stat.num_data_ins;
                 conn->rxdata_octets +=
                         bnx2i_cmd->req.total_data_transfer_length;
+                ADD_STATS_64(hba, rx_pdus,
+                             resp_cqe->task_stat.read_stat.num_data_ins);
+                ADD_STATS_64(hba, rx_bytes,
+                             bnx2i_cmd->req.total_data_transfer_length);
         } else {
                 conn->dataout_pdus_cnt +=
-                        resp_cqe->task_stat.read_stat.num_data_outs;
+                        resp_cqe->task_stat.write_stat.num_data_outs;
                 conn->r2t_pdus_cnt +=
-                        resp_cqe->task_stat.read_stat.num_r2ts;
+                        resp_cqe->task_stat.write_stat.num_r2ts;
                 conn->txdata_octets +=
                         bnx2i_cmd->req.total_data_transfer_length;
+                ADD_STATS_64(hba, tx_pdus,
+                             resp_cqe->task_stat.write_stat.num_data_outs);
+                ADD_STATS_64(hba, tx_bytes,
+                             bnx2i_cmd->req.total_data_transfer_length);
+                ADD_STATS_64(hba, rx_pdus,
+                             resp_cqe->task_stat.write_stat.num_r2ts);
         }
         bnx2i_iscsi_unmap_sg_list(bnx2i_cmd);
 
@@ -1961,6 +1972,7 @@ static int bnx2i_process_new_cqes(struct bnx2i_conn *bnx2i_conn)
 {
         struct iscsi_conn *conn = bnx2i_conn->cls_conn->dd_data;
         struct iscsi_session *session = conn->session;
+        struct bnx2i_hba *hba = bnx2i_conn->hba;
         struct qp_info *qp;
         struct bnx2i_nop_in_msg *nopin;
         int tgt_async_msg;
@@ -1973,7 +1985,7 @@ static int bnx2i_process_new_cqes(struct bnx2i_conn *bnx2i_conn)
 
         if (!qp->cq_virt) {
                 printk(KERN_ALERT "bnx2i (%s): cq resr freed in bh execution!",
-                        bnx2i_conn->hba->netdev->name);
+                       hba->netdev->name);
                 goto out;
         }
         while (1) {
@@ -1985,9 +1997,9 @@ static int bnx2i_process_new_cqes(struct bnx2i_conn *bnx2i_conn)
                         if (nopin->op_code == ISCSI_OP_NOOP_IN &&
                             nopin->itt == (u16) RESERVED_ITT) {
                                 printk(KERN_ALERT "bnx2i: Unsolicited "
-                                        "NOP-In detected for suspended "
-                                        "connection dev=%s!\n",
-                                        bnx2i_conn->hba->netdev->name);
+                                       "NOP-In detected for suspended "
+                                       "connection dev=%s!\n",
+                                       hba->netdev->name);
                                 bnx2i_unsol_pdu_adjust_rq(bnx2i_conn);
                                 goto cqe_out;
                         }
@@ -2001,7 +2013,7 @@ static int bnx2i_process_new_cqes(struct bnx2i_conn *bnx2i_conn)
                         /* Run the kthread engine only for data cmds
                            All other cmds will be completed in this bh! */
                         bnx2i_queue_scsi_cmd_resp(session, bnx2i_conn, nopin);
-                        break;
+                        goto done;
                 case ISCSI_OP_LOGIN_RSP:
                         bnx2i_process_login_resp(session, bnx2i_conn,
                                                  qp->cq_cons_qe);
@@ -2044,11 +2056,15 @@ static int bnx2i_process_new_cqes(struct bnx2i_conn *bnx2i_conn)
                         printk(KERN_ALERT "bnx2i: unknown opcode 0x%x\n",
                                           nopin->op_code);
                 }
+
+                ADD_STATS_64(hba, rx_pdus, 1);
+                ADD_STATS_64(hba, rx_bytes, nopin->data_length);
+done:
                 if (!tgt_async_msg) {
                         if (!atomic_read(&bnx2i_conn->ep->num_active_cmds))
                                 printk(KERN_ALERT "bnx2i (%s): no active cmd! "
                                        "op 0x%x\n",
-                                       bnx2i_conn->hba->netdev->name,
+                                       hba->netdev->name,
                                        nopin->op_code);
                         else
                                 atomic_dec(&bnx2i_conn->ep->num_active_cmds);
@@ -2692,6 +2708,7 @@ struct cnic_ulp_ops bnx2i_cnic_cb = {
         .cm_remote_close = bnx2i_cm_remote_close,
         .cm_remote_abort = bnx2i_cm_remote_abort,
         .iscsi_nl_send_msg = bnx2i_send_nl_mesg,
+        .cnic_get_stats = bnx2i_get_stats,
         .owner = THIS_MODULE
 };
 
diff --git a/drivers/scsi/bnx2i/bnx2i_init.c b/drivers/scsi/bnx2i/bnx2i_init.c
index 8b6816706ee..b17637aab9a 100644
--- a/drivers/scsi/bnx2i/bnx2i_init.c
+++ b/drivers/scsi/bnx2i/bnx2i_init.c
@@ -381,6 +381,46 @@ void bnx2i_ulp_exit(struct cnic_dev *dev)
 
 
 /**
+ * bnx2i_get_stats - Retrieve various statistic from iSCSI offload
+ * @handle:     bnx2i_hba
+ *
+ * function callback exported via bnx2i - cnic driver interface to
+ *      retrieve various iSCSI offload related statistics.
+ */
+int bnx2i_get_stats(void *handle)
+{
+        struct bnx2i_hba *hba = handle;
+        struct iscsi_stats_info *stats;
+
+        if (!hba)
+                return -EINVAL;
+
+        stats = (struct iscsi_stats_info *)hba->cnic->stats_addr;
+
+        if (!stats)
+                return -ENOMEM;
+
+        strlcpy(stats->version, DRV_MODULE_VERSION, sizeof(stats->version));
+        memcpy(stats->mac_add1 + 2, hba->cnic->mac_addr, ETH_ALEN);
+
+        stats->max_frame_size = hba->netdev->mtu;
+        stats->txq_size = hba->max_sqes;
+        stats->rxq_size = hba->max_cqes;
+
+        stats->txq_avg_depth = 0;
+        stats->rxq_avg_depth = 0;
+
+        GET_STATS_64(hba, stats, rx_pdus);
+        GET_STATS_64(hba, stats, rx_bytes);
+
+        GET_STATS_64(hba, stats, tx_pdus);
+        GET_STATS_64(hba, stats, tx_bytes);
+
+        return 0;
+}
+
+
+/**
  * bnx2i_percpu_thread_create - Create a receive thread for an
  *                              online CPU
  *
diff --git a/drivers/scsi/bnx2i/bnx2i_iscsi.c b/drivers/scsi/bnx2i/bnx2i_iscsi.c
index f8d516b5316..b40ac017012 100644
--- a/drivers/scsi/bnx2i/bnx2i_iscsi.c
+++ b/drivers/scsi/bnx2i/bnx2i_iscsi.c
@@ -874,6 +874,11 @@ struct bnx2i_hba *bnx2i_alloc_hba(struct cnic_dev *cnic)
                 hba->conn_ctx_destroy_tmo = 2 * HZ;
         }
 
+#ifdef CONFIG_32BIT
+        spin_lock_init(&hba->stat_lock);
+#endif
+        memset(&hba->stats, 0, sizeof(struct iscsi_stats_info));
+
         if (iscsi_host_add(shost, &hba->pcidev->dev))
                 goto free_dump_mem;
         return hba;
@@ -1181,12 +1186,18 @@ static int
 bnx2i_mtask_xmit(struct iscsi_conn *conn, struct iscsi_task *task)
 {
         struct bnx2i_conn *bnx2i_conn = conn->dd_data;
+        struct bnx2i_hba *hba = bnx2i_conn->hba;
         struct bnx2i_cmd *cmd = task->dd_data;
 
         memset(bnx2i_conn->gen_pdu.req_buf, 0, ISCSI_DEF_MAX_RECV_SEG_LEN);
 
         bnx2i_setup_cmd_wqe_template(cmd);
         bnx2i_conn->gen_pdu.req_buf_size = task->data_count;
+
+        /* Tx PDU/data length count */
+        ADD_STATS_64(hba, tx_pdus, 1);
+        ADD_STATS_64(hba, tx_bytes, task->data_count);
+
         if (task->data_count) {
                 memcpy(bnx2i_conn->gen_pdu.req_buf, task->data,
                        task->data_count);
diff --git a/drivers/scsi/cxgbi/cxgb3i/cxgb3i.c b/drivers/scsi/cxgbi/cxgb3i/cxgb3i.c
index 36739da8bc1..49692a1ac44 100644
--- a/drivers/scsi/cxgbi/cxgb3i/cxgb3i.c
+++ b/drivers/scsi/cxgbi/cxgb3i/cxgb3i.c
@@ -966,7 +966,8 @@ static int init_act_open(struct cxgbi_sock *csk)
                 csk->saddr.sin_addr.s_addr = chba->ipv4addr;
 
         csk->rss_qid = 0;
-        csk->l2t = t3_l2t_get(t3dev, dst, ndev);
+        csk->l2t = t3_l2t_get(t3dev, dst, ndev,
+                              &csk->daddr.sin_addr.s_addr);
         if (!csk->l2t) {
                 pr_err("NO l2t available.\n");
                 return -EINVAL;
diff --git a/drivers/scsi/cxgbi/cxgb4i/cxgb4i.c b/drivers/scsi/cxgbi/cxgb4i/cxgb4i.c
index 5a4a3bfc60c..cc9a06897f3 100644
--- a/drivers/scsi/cxgbi/cxgb4i/cxgb4i.c
+++ b/drivers/scsi/cxgbi/cxgb4i/cxgb4i.c
@@ -1142,7 +1142,7 @@ static int init_act_open(struct cxgbi_sock *csk)
         cxgbi_sock_set_flag(csk, CTPF_HAS_ATID);
         cxgbi_sock_get(csk);
 
-        n = dst_get_neighbour_noref(csk->dst);
+        n = dst_neigh_lookup(csk->dst, &csk->daddr.sin_addr.s_addr);
         if (!n) {
                 pr_err("%s, can't get neighbour of csk->dst.\n", ndev->name);
                 goto rel_resource;
@@ -1182,9 +1182,12 @@ static int init_act_open(struct cxgbi_sock *csk)
 
         cxgbi_sock_set_state(csk, CTP_ACTIVE_OPEN);
         send_act_open_req(csk, skb, csk->l2t);
+        neigh_release(n);
         return 0;
 
 rel_resource:
+        if (n)
+                neigh_release(n);
         if (skb)
                 __kfree_skb(skb);
         return -EINVAL;
diff --git a/drivers/scsi/cxgbi/libcxgbi.c b/drivers/scsi/cxgbi/libcxgbi.c
index d9253db1d0e..b44c1cff311 100644
--- a/drivers/scsi/cxgbi/libcxgbi.c
+++ b/drivers/scsi/cxgbi/libcxgbi.c
@@ -494,7 +494,7 @@ static struct cxgbi_sock *cxgbi_check_route(struct sockaddr *dst_addr)
                 goto err_out;
         }
         dst = &rt->dst;
-        n = dst_get_neighbour_noref(dst);
+        n = dst_neigh_lookup(dst, &daddr->sin_addr.s_addr);
         if (!n) {
                 err = -ENODEV;
                 goto rel_rt;
@@ -506,7 +506,7 @@ static struct cxgbi_sock *cxgbi_check_route(struct sockaddr *dst_addr)
                         &daddr->sin_addr.s_addr, ntohs(daddr->sin_port),
                         ndev->name);
                 err = -ENETUNREACH;
-                goto rel_rt;
+                goto rel_neigh;
         }
 
         if (ndev->flags & IFF_LOOPBACK) {
@@ -521,7 +521,7 @@ static struct cxgbi_sock *cxgbi_check_route(struct sockaddr *dst_addr)
                 pr_info("dst %pI4, %s, NOT cxgbi device.\n",
                         &daddr->sin_addr.s_addr, ndev->name);
                 err = -ENETUNREACH;
-                goto rel_rt;
+                goto rel_neigh;
         }
         log_debug(1 << CXGBI_DBG_SOCK,
                 "route to %pI4 :%u, ndev p#%d,%s, cdev 0x%p.\n",
@@ -531,7 +531,7 @@ static struct cxgbi_sock *cxgbi_check_route(struct sockaddr *dst_addr)
         csk = cxgbi_sock_create(cdev);
         if (!csk) {
                 err = -ENOMEM;
-                goto rel_rt;
+                goto rel_neigh;
         }
         csk->cdev = cdev;
         csk->port_id = port;
@@ -541,9 +541,13 @@ static struct cxgbi_sock *cxgbi_check_route(struct sockaddr *dst_addr)
         csk->daddr.sin_port = daddr->sin_port;
         csk->daddr.sin_family = daddr->sin_family;
         csk->saddr.sin_addr.s_addr = fl4.saddr;
+        neigh_release(n);
 
         return csk;
 
+rel_neigh:
+        neigh_release(n);
+
 rel_rt:
         ip_rt_put(rt);
         if (csk)
diff --git a/drivers/scsi/scsi_netlink.c b/drivers/scsi/scsi_netlink.c
index c77628afbf9..8818dd681c1 100644
--- a/drivers/scsi/scsi_netlink.c
+++ b/drivers/scsi/scsi_netlink.c
@@ -486,6 +486,10 @@ void
 scsi_netlink_init(void)
 {
         int error;
+        struct netlink_kernel_cfg cfg = {
+                .input  = scsi_nl_rcv_msg,
+                .groups = SCSI_NL_GRP_CNT,
+        };
 
         INIT_LIST_HEAD(&scsi_nl_drivers);
 
@@ -497,8 +501,7 @@ scsi_netlink_init(void)
         }
 
         scsi_nl_sock = netlink_kernel_create(&init_net, NETLINK_SCSITRANSPORT,
-                                SCSI_NL_GRP_CNT, scsi_nl_rcv_msg, NULL,
-                                THIS_MODULE);
+                                             THIS_MODULE, &cfg);
         if (!scsi_nl_sock) {
                 printk(KERN_ERR "%s: register of receive handler failed\n",
                                 __func__);
diff --git a/drivers/scsi/scsi_transport_iscsi.c b/drivers/scsi/scsi_transport_iscsi.c
index 1cf640e575d..6042954d8f3 100644
--- a/drivers/scsi/scsi_transport_iscsi.c
+++ b/drivers/scsi/scsi_transport_iscsi.c
@@ -2936,7 +2936,10 @@ EXPORT_SYMBOL_GPL(iscsi_unregister_transport);
 static __init int iscsi_transport_init(void)
 {
         int err;
-
+        struct netlink_kernel_cfg cfg = {
+                .groups = 1,
+                .input  = iscsi_if_rx,
+        };
         printk(KERN_INFO "Loading iSCSI transport class v%s.\n",
                 ISCSI_TRANSPORT_VERSION);
 
@@ -2966,8 +2969,8 @@ static __init int iscsi_transport_init(void)
         if (err)
                 goto unregister_conn_class;
 
-        nls = netlink_kernel_create(&init_net, NETLINK_ISCSI, 1, iscsi_if_rx,
-                                    NULL, THIS_MODULE);
+        nls = netlink_kernel_create(&init_net, NETLINK_ISCSI,
+                                    THIS_MODULE, &cfg);
         if (!nls) {
                 err = -ENOBUFS;
                 goto unregister_session_class;
diff --git a/drivers/ssb/b43_pci_bridge.c b/drivers/ssb/b43_pci_bridge.c
index f551e537614..266aa1648a0 100644
--- a/drivers/ssb/b43_pci_bridge.c
+++ b/drivers/ssb/b43_pci_bridge.c
@@ -36,6 +36,7 @@ static const struct pci_device_id b43_pci_bridge_tbl[] = {
         { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4328) },
         { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4329) },
         { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x432b) },
+        { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x432c) },
         { 0, },
 };
 MODULE_DEVICE_TABLE(pci, b43_pci_bridge_tbl);
diff --git a/drivers/ssb/scan.c b/drivers/ssb/scan.c
index 266c7c5c86d..ab4627cf111 100644
--- a/drivers/ssb/scan.c
+++ b/drivers/ssb/scan.c
@@ -90,6 +90,8 @@ const char *ssb_core_name(u16 coreid)
                 return "ARM 1176";
         case SSB_DEV_ARM_7TDMI:
                 return "ARM 7TDMI";
+        case SSB_DEV_ARM_CM3:
+                return "ARM Cortex M3";
         }
         return "UNKNOWN";
 }
diff --git a/drivers/staging/gdm72xx/netlink_k.c b/drivers/staging/gdm72xx/netlink_k.c
index 51665132c61..87c3a07ed80 100644
--- a/drivers/staging/gdm72xx/netlink_k.c
+++ b/drivers/staging/gdm72xx/netlink_k.c
@@ -88,13 +88,15 @@ struct sock *netlink_init(int unit, void (*cb)(struct net_device *dev, u16 type,
                                                 void *msg, int len))
 {
         struct sock *sock;
+        struct netlink_kernel_cfg cfg = {
+                .input  = netlink_rcv,
+        };
 
 #if !defined(DEFINE_MUTEX)
         init_MUTEX(&netlink_mutex);
 #endif
 
-        sock = netlink_kernel_create(&init_net, unit, 0, netlink_rcv, NULL,
-                                        THIS_MODULE);
+        sock = netlink_kernel_create(&init_net, unit, THIS_MODULE, &cfg);
 
         if (sock)
                 rcv_cb = cb;
@@ -127,8 +129,12 @@ int netlink_send(struct sock *sock, int group, u16 type, void *msg, int len)
         }
 
         seq++;
-        nlh = NLMSG_PUT(skb, 0, seq, type, len);
-        memcpy(NLMSG_DATA(nlh), msg, len);
+        nlh = nlmsg_put(skb, 0, seq, type, len, 0);
+        if (!nlh) {
+                kfree_skb(skb);
+                return -EMSGSIZE;
+        }
+        memcpy(nlmsg_data(nlh), msg, len);
 
         NETLINK_CB(skb).pid = 0;
         NETLINK_CB(skb).dst_group = 0;
@@ -144,7 +150,5 @@ int netlink_send(struct sock *sock, int group, u16 type, void *msg, int len)
                 }
                 ret = 0;
         }
-
-nlmsg_failure:
         return ret;
 }
diff --git a/include/linux/bcma/bcma.h b/include/linux/bcma/bcma.h
index 8deaf6d050c..12334f9190c 100644
--- a/include/linux/bcma/bcma.h
+++ b/include/linux/bcma/bcma.h
@@ -70,6 +70,13 @@ struct bcma_host_ops {
 
 /* Core-ID values. */
 #define BCMA_CORE_OOB_ROUTER            0x367   /* Out of band */
+#define BCMA_CORE_4706_CHIPCOMMON       0x500
+#define BCMA_CORE_4706_SOC_RAM          0x50E
+#define BCMA_CORE_4706_MAC_GBIT         0x52D
+#define BCMA_CORE_AMEMC                 0x52E   /* DDR1/2 memory controller core */
+#define BCMA_CORE_ALTA                  0x534   /* I2S core */
+#define BCMA_CORE_4706_MAC_GBIT_COMMON  0x5DC
+#define BCMA_CORE_DDR23_PHY             0x5DD
 #define BCMA_CORE_INVALID               0x700
 #define BCMA_CORE_CHIPCOMMON            0x800
 #define BCMA_CORE_ILINE20               0x801
diff --git a/include/linux/can.h b/include/linux/can.h
index 9a19bcb3eea..018055efc03 100644
--- a/include/linux/can.h
+++ b/include/linux/can.h
@@ -21,7 +21,7 @@
 /* special address description flags for the CAN_ID */
 #define CAN_EFF_FLAG 0x80000000U /* EFF/SFF is set in the MSB */
 #define CAN_RTR_FLAG 0x40000000U /* remote transmission request */
-#define CAN_ERR_FLAG 0x20000000U /* error frame */
+#define CAN_ERR_FLAG 0x20000000U /* error message frame */
 
 /* valid bits in CAN ID for frame formats */
 #define CAN_SFF_MASK 0x000007FFU /* standard frame format (SFF) */
@@ -32,32 +32,84 @@
  * Controller Area Network Identifier structure
  *
  * bit 0-28     : CAN identifier (11/29 bit)
- * bit 29       : error frame flag (0 = data frame, 1 = error frame)
+ * bit 29       : error message frame flag (0 = data frame, 1 = error message)
  * bit 30       : remote transmission request flag (1 = rtr frame)
  * bit 31       : frame format flag (0 = standard 11 bit, 1 = extended 29 bit)
  */
 typedef __u32 canid_t;
 
+#define CAN_SFF_ID_BITS         11
+#define CAN_EFF_ID_BITS         29
+
 /*
- * Controller Area Network Error Frame Mask structure
+ * Controller Area Network Error Message Frame Mask structure
  *
  * bit 0-28     : error class mask (see include/linux/can/error.h)
  * bit 29-31    : set to zero
  */
 typedef __u32 can_err_mask_t;
 
+/* CAN payload length and DLC definitions according to ISO 11898-1 */
+#define CAN_MAX_DLC 8
+#define CAN_MAX_DLEN 8
+
+/* CAN FD payload length and DLC definitions according to ISO 11898-7 */
+#define CANFD_MAX_DLC 15
+#define CANFD_MAX_DLEN 64
+
 /**
  * struct can_frame - basic CAN frame structure
- * @can_id:  the CAN ID of the frame and CAN_*_FLAG flags, see above.
- * @can_dlc: the data length field of the CAN frame
- * @data:    the CAN frame payload.
+ * @can_id:  CAN ID of the frame and CAN_*_FLAG flags, see canid_t definition
+ * @can_dlc: frame payload length in byte (0 .. 8) aka data length code
+ *           N.B. the DLC field from ISO 11898-1 Chapter 8.4.2.3 has a 1:1
+ *           mapping of the 'data length code' to the real payload length
+ * @data:    CAN frame payload (up to 8 byte)
  */
 struct can_frame {
         canid_t can_id;  /* 32 bit CAN_ID + EFF/RTR/ERR flags */
-        __u8    can_dlc; /* data length code: 0 .. 8 */
-        __u8    data[8] __attribute__((aligned(8)));
+        __u8    can_dlc; /* frame payload length in byte (0 .. CAN_MAX_DLEN) */
+        __u8    data[CAN_MAX_DLEN] __attribute__((aligned(8)));
+};
+
+/*
+ * defined bits for canfd_frame.flags
+ *
+ * As the default for CAN FD should be to support the high data rate in the
+ * payload section of the frame (HDR) and to support up to 64 byte in the
+ * data section (EDL) the bits are only set in the non-default case.
+ * Btw. as long as there's no real implementation for CAN FD network driver
+ * these bits are only preliminary.
+ *
+ * RX: NOHDR/NOEDL - info about received CAN FD frame
+ *     ESI         - bit from originating CAN controller
+ * TX: NOHDR/NOEDL - control per-frame settings if supported by CAN controller
+ *     ESI         - bit is set by local CAN controller
+ */
+#define CANFD_NOHDR 0x01 /* frame without high data rate */
+#define CANFD_NOEDL 0x02 /* frame without extended data length */
+#define CANFD_ESI   0x04 /* error state indicator */
+
+/**
+ * struct canfd_frame - CAN flexible data rate frame structure
+ * @can_id: CAN ID of the frame and CAN_*_FLAG flags, see canid_t definition
+ * @len:    frame payload length in byte (0 .. CANFD_MAX_DLEN)
+ * @flags:  additional flags for CAN FD
+ * @__res0: reserved / padding
+ * @__res1: reserved / padding
+ * @data:   CAN FD frame payload (up to CANFD_MAX_DLEN byte)
+ */
+struct canfd_frame {
+        canid_t can_id;  /* 32 bit CAN_ID + EFF/RTR/ERR flags */
+        __u8    len;     /* frame payload length in byte */
+        __u8    flags;   /* additional flags for CAN FD */
+        __u8    __res0;  /* reserved / padding */
+        __u8    __res1;  /* reserved / padding */
+        __u8    data[CANFD_MAX_DLEN] __attribute__((aligned(8)));
 };
 
+#define CAN_MTU         (sizeof(struct can_frame))
+#define CANFD_MTU       (sizeof(struct canfd_frame))
+
 /* particular protocols of the protocol family PF_CAN */
 #define CAN_RAW         1 /* RAW sockets */
 #define CAN_BCM         2 /* Broadcast Manager */
@@ -97,7 +149,7 @@ struct sockaddr_can {
  *          <received_can_id> & mask == can_id & mask
  *
  * The filter can be inverted (CAN_INV_FILTER bit set in can_id) or it can
- * filter for error frames (CAN_ERR_FLAG bit set in mask).
+ * filter for error message frames (CAN_ERR_FLAG bit set in mask).
  */
 struct can_filter {
         canid_t can_id;
diff --git a/include/linux/can/core.h b/include/linux/can/core.h
index 0ccc1cd28b9..78c6c52073a 100644
--- a/include/linux/can/core.h
+++ b/include/linux/can/core.h
@@ -17,10 +17,10 @@
 #include <linux/skbuff.h>
 #include <linux/netdevice.h>
 
-#define CAN_VERSION "20090105"
+#define CAN_VERSION "20120528"
 
 /* increment this number each time you change some user-space interface */
-#define CAN_ABI_VERSION "8"
+#define CAN_ABI_VERSION "9"
 
 #define CAN_VERSION_STRING "rev " CAN_VERSION " abi " CAN_ABI_VERSION
 
diff --git a/include/linux/can/dev.h b/include/linux/can/dev.h
index 5d2efe7e3f1..ee5a771fb20 100644
--- a/include/linux/can/dev.h
+++ b/include/linux/can/dev.h
@@ -61,23 +61,40 @@ struct can_priv {
  * 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))
+#define get_can_dlc(i)          (min_t(__u8, (i), CAN_MAX_DLC))
+#define get_canfd_dlc(i)        (min_t(__u8, (i), CANFD_MAX_DLC))
 
 /* Drop a given socketbuffer if it does not contain a valid CAN frame. */
 static inline int can_dropped_invalid_skb(struct net_device *dev,
                                           struct sk_buff *skb)
 {
-        const struct can_frame *cf = (struct can_frame *)skb->data;
-
-        if (unlikely(skb->len != sizeof(*cf) || cf->can_dlc > 8)) {
-                kfree_skb(skb);
-                dev->stats.tx_dropped++;
-                return 1;
-        }
+        const struct canfd_frame *cfd = (struct canfd_frame *)skb->data;
+
+        if (skb->protocol == htons(ETH_P_CAN)) {
+                if (unlikely(skb->len != CAN_MTU ||
+                             cfd->len > CAN_MAX_DLEN))
+                        goto inval_skb;
+        } else if (skb->protocol == htons(ETH_P_CANFD)) {
+                if (unlikely(skb->len != CANFD_MTU ||
+                             cfd->len > CANFD_MAX_DLEN))
+                        goto inval_skb;
+        } else
+                goto inval_skb;
 
         return 0;
+
+inval_skb:
+        kfree_skb(skb);
+        dev->stats.tx_dropped++;
+        return 1;
 }
 
+/* get data length from can_dlc with sanitized can_dlc */
+u8 can_dlc2len(u8 can_dlc);
+
+/* map the sanitized data length to an appropriate data length code */
+u8 can_len2dlc(u8 len);
+
 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/can/error.h b/include/linux/can/error.h
index 63e855ea6b8..7b7148bded7 100644
--- a/include/linux/can/error.h
+++ b/include/linux/can/error.h
@@ -1,7 +1,7 @@
 /*
  * linux/can/error.h
  *
- * Definitions of the CAN error frame to be filtered and passed to the user.
+ * Definitions of the CAN error messages to be filtered and passed to the user.
  *
  * Author: Oliver Hartkopp <oliver.hartkopp@volkswagen.de>
  * Copyright (c) 2002-2007 Volkswagen Group Electronic Research
@@ -12,7 +12,7 @@
 #ifndef CAN_ERROR_H
 #define CAN_ERROR_H
 
-#define CAN_ERR_DLC 8 /* dlc for error frames */
+#define CAN_ERR_DLC 8 /* dlc for error message frames */
 
 /* error class (mask) in can_id */
 #define CAN_ERR_TX_TIMEOUT   0x00000001U /* TX timeout (by netdevice driver) */
diff --git a/include/linux/can/raw.h b/include/linux/can/raw.h
index 781f3a3701b..a814062b071 100644
--- a/include/linux/can/raw.h
+++ b/include/linux/can/raw.h
@@ -23,7 +23,8 @@ enum {
         CAN_RAW_FILTER = 1,     /* set 0 .. n can_filter(s)          */
         CAN_RAW_ERR_FILTER,     /* set filter for error frames       */
         CAN_RAW_LOOPBACK,       /* local loopback (default:on)       */
-        CAN_RAW_RECV_OWN_MSGS   /* receive my own msgs (default:off) */
+        CAN_RAW_RECV_OWN_MSGS,  /* receive my own msgs (default:off) */
+        CAN_RAW_FD_FRAMES,      /* allow CAN FD frames (default:off) */
 };
 
 #endif
diff --git a/include/linux/etherdevice.h b/include/linux/etherdevice.h
index 3d406e0ede6..98a27cccedf 100644
--- a/include/linux/etherdevice.h
+++ b/include/linux/etherdevice.h
@@ -138,6 +138,17 @@ static inline void random_ether_addr(u8 *addr)
 }
 
 /**
+ * eth_broadcast_addr - Assign broadcast address
+ * @addr: Pointer to a six-byte array containing the Ethernet address
+ *
+ * Assign the broadcast address to the given address array.
+ */
+static inline void eth_broadcast_addr(u8 *addr)
+{
+        memset(addr, 0xff, ETH_ALEN);
+}
+
+/**
  * eth_hw_addr_random - Generate software assigned random Ethernet and
  * set device flag
  * @dev: pointer to net_device structure
diff --git a/include/linux/ethtool.h b/include/linux/ethtool.h
index e17fa714058..21eff418091 100644
--- a/include/linux/ethtool.h
+++ b/include/linux/ethtool.h
@@ -137,6 +137,35 @@ struct ethtool_eeprom {
 };
 
 /**
+ * struct ethtool_eee - Energy Efficient Ethernet information
+ * @cmd: ETHTOOL_{G,S}EEE
+ * @supported: Mask of %SUPPORTED_* flags for the speed/duplex combinations
+ *      for which there is EEE support.
+ * @advertised: Mask of %ADVERTISED_* flags for the speed/duplex combinations
+ *      advertised as eee capable.
+ * @lp_advertised: Mask of %ADVERTISED_* flags for the speed/duplex
+ *      combinations advertised by the link partner as eee capable.
+ * @eee_active: Result of the eee auto negotiation.
+ * @eee_enabled: EEE configured mode (enabled/disabled).
+ * @tx_lpi_enabled: Whether the interface should assert its tx lpi, given
+ *      that eee was negotiated.
+ * @tx_lpi_timer: Time in microseconds the interface delays prior to asserting
+ *      its tx lpi (after reaching 'idle' state). Effective only when eee
+ *      was negotiated and tx_lpi_enabled was set.
+ */
+struct ethtool_eee {
+        __u32   cmd;
+        __u32   supported;
+        __u32   advertised;
+        __u32   lp_advertised;
+        __u32   eee_active;
+        __u32   eee_enabled;
+        __u32   tx_lpi_enabled;
+        __u32   tx_lpi_timer;
+        __u32   reserved[2];
+};
+
+/**
  * struct ethtool_modinfo - plugin module eeprom information
  * @cmd: %ETHTOOL_GMODULEINFO
  * @type: Standard the module information conforms to %ETH_MODULE_SFF_xxxx
@@ -945,6 +974,8 @@ static inline u32 ethtool_rxfh_indir_default(u32 index, u32 n_rx_rings)
  * @get_module_info: Get the size and type of the eeprom contained within
  *      a plug-in module.
  * @get_module_eeprom: Get the eeprom information from the plug-in module
+ * @get_eee: Get Energy-Efficient (EEE) supported and status.
+ * @set_eee: Set EEE status (enable/disable) as well as LPI timers.
  *
  * All operations are optional (i.e. the function pointer may be set
  * to %NULL) and callers must take this into account.  Callers must
@@ -1011,6 +1042,8 @@ struct ethtool_ops {
                                    struct ethtool_modinfo *);
         int     (*get_module_eeprom)(struct net_device *,
                                      struct ethtool_eeprom *, u8 *);
+        int     (*get_eee)(struct net_device *, struct ethtool_eee *);
+        int     (*set_eee)(struct net_device *, struct ethtool_eee *);
 
 
 };
@@ -1089,6 +1122,8 @@ struct ethtool_ops {
 #define ETHTOOL_GET_TS_INFO     0x00000041 /* Get time stamping and PHC info */
 #define ETHTOOL_GMODULEINFO     0x00000042 /* Get plug-in module information */
 #define ETHTOOL_GMODULEEEPROM   0x00000043 /* Get plug-in module eeprom */
+#define ETHTOOL_GEEE            0x00000044 /* Get EEE settings */
+#define ETHTOOL_SEEE            0x00000045 /* Set EEE settings */
 
 /* compatibility with older code */
 #define SPARC_ETH_GSET          ETHTOOL_GSET
@@ -1118,6 +1153,10 @@ struct ethtool_ops {
 #define SUPPORTED_10000baseR_FEC        (1 << 20)
 #define SUPPORTED_20000baseMLD2_Full    (1 << 21)
 #define SUPPORTED_20000baseKR2_Full     (1 << 22)
+#define SUPPORTED_40000baseKR4_Full     (1 << 23)
+#define SUPPORTED_40000baseCR4_Full     (1 << 24)
+#define SUPPORTED_40000baseSR4_Full     (1 << 25)
+#define SUPPORTED_40000baseLR4_Full     (1 << 26)
 
 /* Indicates what features are advertised by the interface. */
 #define ADVERTISED_10baseT_Half         (1 << 0)
@@ -1143,6 +1182,10 @@ struct ethtool_ops {
 #define ADVERTISED_10000baseR_FEC       (1 << 20)
 #define ADVERTISED_20000baseMLD2_Full   (1 << 21)
 #define ADVERTISED_20000baseKR2_Full    (1 << 22)
+#define ADVERTISED_40000baseKR4_Full    (1 << 23)
+#define ADVERTISED_40000baseCR4_Full    (1 << 24)
+#define ADVERTISED_40000baseSR4_Full    (1 << 25)
+#define ADVERTISED_40000baseLR4_Full    (1 << 26)
 
 /* The following are all involved in forcing a particular link
  * mode for the device for setting things.  When getting the
diff --git a/include/linux/ieee80211.h b/include/linux/ieee80211.h
index ce9af891851..318fc1f705b 100644
--- a/include/linux/ieee80211.h
+++ b/include/linux/ieee80211.h
@@ -568,6 +568,26 @@ struct ieee80211s_hdr {
 #define MESH_FLAGS_PS_DEEP      0x4
 
 /**
+ * enum ieee80211_preq_flags - mesh PREQ element flags
+ *
+ * @IEEE80211_PREQ_PROACTIVE_PREP_FLAG: proactive PREP subfield
+ */
+enum ieee80211_preq_flags {
+        IEEE80211_PREQ_PROACTIVE_PREP_FLAG      = 1<<2,
+};
+
+/**
+ * enum ieee80211_preq_target_flags - mesh PREQ element per target flags
+ *
+ * @IEEE80211_PREQ_TO_FLAG: target only subfield
+ * @IEEE80211_PREQ_USN_FLAG: unknown target HWMP sequence number subfield
+ */
+enum ieee80211_preq_target_flags {
+        IEEE80211_PREQ_TO_FLAG  = 1<<0,
+        IEEE80211_PREQ_USN_FLAG = 1<<2,
+};
+
+/**
  * struct ieee80211_quiet_ie
  *
  * This structure refers to "Quiet information element"
@@ -1443,7 +1463,7 @@ enum ieee80211_tdls_actioncode {
  *
  * @IEEE80211_SYNC_METHOD_NEIGHBOR_OFFSET: the default synchronization method
  * @IEEE80211_SYNC_METHOD_VENDOR: a vendor specific synchronization method
- * that will be specified in a vendor specific information element
+ *      that will be specified in a vendor specific information element
  */
 enum {
         IEEE80211_SYNC_METHOD_NEIGHBOR_OFFSET = 1,
@@ -1455,7 +1475,7 @@ enum {
  *
  * @IEEE80211_PATH_PROTOCOL_HWMP: the default path selection protocol
  * @IEEE80211_PATH_PROTOCOL_VENDOR: a vendor specific protocol that will
- * be specified in a vendor specific information element
+ *      be specified in a vendor specific information element
  */
 enum {
         IEEE80211_PATH_PROTOCOL_HWMP = 1,
@@ -1467,13 +1487,35 @@ enum {
  *
  * @IEEE80211_PATH_METRIC_AIRTIME: the default path selection metric
  * @IEEE80211_PATH_METRIC_VENDOR: a vendor specific metric that will be
- * specified in a vendor specific information element
+ *      specified in a vendor specific information element
  */
 enum {
         IEEE80211_PATH_METRIC_AIRTIME = 1,
         IEEE80211_PATH_METRIC_VENDOR = 255,
 };
 
+/**
+ * enum ieee80211_root_mode_identifier - root mesh STA mode identifier
+ *
+ * These attribute are used by dot11MeshHWMPRootMode to set root mesh STA mode
+ *
+ * @IEEE80211_ROOTMODE_NO_ROOT: the mesh STA is not a root mesh STA (default)
+ * @IEEE80211_ROOTMODE_ROOT: the mesh STA is a root mesh STA if greater than
+ *      this value
+ * @IEEE80211_PROACTIVE_PREQ_NO_PREP: the mesh STA is a root mesh STA supports
+ *      the proactive PREQ with proactive PREP subfield set to 0
+ * @IEEE80211_PROACTIVE_PREQ_WITH_PREP: the mesh STA is a root mesh STA
+ *      supports the proactive PREQ with proactive PREP subfield set to 1
+ * @IEEE80211_PROACTIVE_RANN: the mesh STA is a root mesh STA supports
+ *      the proactive RANN
+ */
+enum ieee80211_root_mode_identifier {
+        IEEE80211_ROOTMODE_NO_ROOT = 0,
+        IEEE80211_ROOTMODE_ROOT = 1,
+        IEEE80211_PROACTIVE_PREQ_NO_PREP = 2,
+        IEEE80211_PROACTIVE_PREQ_WITH_PREP = 3,
+        IEEE80211_PROACTIVE_RANN = 4,
+};
 
 /*
  * IEEE 802.11-2007 7.3.2.9 Country information element
@@ -1589,6 +1631,10 @@ enum ieee80211_sa_query_action {
 
 #define WLAN_OUI_WFA                    0x506f9a
 #define WLAN_OUI_TYPE_WFA_P2P           9
+#define WLAN_OUI_MICROSOFT              0x0050f2
+#define WLAN_OUI_TYPE_MICROSOFT_WPA     1
+#define WLAN_OUI_TYPE_MICROSOFT_WMM     2
+#define WLAN_OUI_TYPE_MICROSOFT_WPS     4
 
 /*
  * WMM/802.11e Tspec Element
diff --git a/include/linux/if.h b/include/linux/if.h
index f995c663c49..1ec407b01e4 100644
--- a/include/linux/if.h
+++ b/include/linux/if.h
@@ -81,6 +81,8 @@
 #define IFF_UNICAST_FLT 0x20000         /* Supports unicast filtering   */
 #define IFF_TEAM_PORT   0x40000         /* device used as team port */
 #define IFF_SUPP_NOFCS  0x80000         /* device supports sending custom FCS */
+#define IFF_LIVE_ADDR_CHANGE 0x100000   /* device supports hardware address
+                                         * change when it's running */
 
 
 #define IF_GET_IFACE    0x0001          /* for querying only */
diff --git a/include/linux/if_ether.h b/include/linux/if_ether.h
index 56d907a2c80..167ce5b363d 100644
--- a/include/linux/if_ether.h
+++ b/include/linux/if_ether.h
@@ -105,7 +105,8 @@
 #define ETH_P_WAN_PPP   0x0007          /* Dummy type for WAN PPP frames*/
 #define ETH_P_PPP_MP    0x0008          /* Dummy type for PPP MP frames */
 #define ETH_P_LOCALTALK 0x0009          /* Localtalk pseudo type        */
-#define ETH_P_CAN       0x000C          /* Controller Area Network      */
+#define ETH_P_CAN       0x000C          /* CAN: Controller Area Network */
+#define ETH_P_CANFD     0x000D          /* CANFD: CAN flexible data rate*/
 #define ETH_P_PPPTALK   0x0010          /* Dummy type for Atalk over PPP*/
 #define ETH_P_TR_802_2  0x0011          /* 802.2 frames                 */
 #define ETH_P_MOBITEX   0x0015          /* Mobitex (kaz@cafe.net)       */
diff --git a/include/linux/if_team.h b/include/linux/if_team.h
index 8185f57a9c7..99efd60fa8c 100644
--- a/include/linux/if_team.h
+++ b/include/linux/if_team.h
@@ -60,9 +60,11 @@ struct team_port {
                 unsigned int mtu;
         } orig;
 
-        struct rcu_head rcu;
+        long mode_priv[0];
 };
 
+extern bool team_port_enabled(struct team_port *port);
+
 struct team_mode_ops {
         int (*init)(struct team *team);
         void (*exit)(struct team *team);
@@ -73,6 +75,8 @@ struct team_mode_ops {
         int (*port_enter)(struct team *team, struct team_port *port);
         void (*port_leave)(struct team *team, struct team_port *port);
         void (*port_change_mac)(struct team *team, struct team_port *port);
+        void (*port_enabled)(struct team *team, struct team_port *port);
+        void (*port_disabled)(struct team *team, struct team_port *port);
 };
 
 enum team_option_type {
@@ -82,6 +86,11 @@ enum team_option_type {
         TEAM_OPTION_TYPE_BOOL,
 };
 
+struct team_option_inst_info {
+        u32 array_index;
+        struct team_port *port; /* != NULL if per-port */
+};
+
 struct team_gsetter_ctx {
         union {
                 u32 u32_val;
@@ -92,23 +101,28 @@ struct team_gsetter_ctx {
                 } bin_val;
                 bool bool_val;
         } data;
-        struct team_port *port;
+        struct team_option_inst_info *info;
 };
 
 struct team_option {
         struct list_head list;
         const char *name;
         bool per_port;
+        unsigned int array_size; /* != 0 means the option is array */
         enum team_option_type type;
+        int (*init)(struct team *team, struct team_option_inst_info *info);
         int (*getter)(struct team *team, struct team_gsetter_ctx *ctx);
         int (*setter)(struct team *team, struct team_gsetter_ctx *ctx);
 };
 
+extern void team_option_inst_set_change(struct team_option_inst_info *opt_inst_info);
+extern void team_options_change_check(struct team *team);
+
 struct team_mode {
-        struct list_head list;
         const char *kind;
         struct module *owner;
         size_t priv_size;
+        size_t port_priv_size;
         const struct team_mode_ops *ops;
 };
 
@@ -178,8 +192,8 @@ extern int team_options_register(struct team *team,
 extern void team_options_unregister(struct team *team,
                                     const struct team_option *option,
                                     size_t option_count);
-extern int team_mode_register(struct team_mode *mode);
-extern int team_mode_unregister(struct team_mode *mode);
+extern int team_mode_register(const struct team_mode *mode);
+extern void team_mode_unregister(const struct team_mode *mode);
 
 #endif /* __KERNEL__ */
 
@@ -241,6 +255,7 @@ enum {
         TEAM_ATTR_OPTION_DATA,          /* dynamic */
         TEAM_ATTR_OPTION_REMOVED,       /* flag */
         TEAM_ATTR_OPTION_PORT_IFINDEX,  /* u32 */ /* for per-port options */
+        TEAM_ATTR_OPTION_ARRAY_INDEX,   /* u32 */ /* for array options */
 
         __TEAM_ATTR_OPTION_MAX,
         TEAM_ATTR_OPTION_MAX = __TEAM_ATTR_OPTION_MAX - 1,
diff --git a/include/linux/inetdevice.h b/include/linux/inetdevice.h
index 597f4a9f324..67f9ddacb70 100644
--- a/include/linux/inetdevice.h
+++ b/include/linux/inetdevice.h
@@ -38,6 +38,7 @@ enum
         IPV4_DEVCONF_ACCEPT_LOCAL,
         IPV4_DEVCONF_SRC_VMARK,
         IPV4_DEVCONF_PROXY_ARP_PVLAN,
+        IPV4_DEVCONF_ROUTE_LOCALNET,
         __IPV4_DEVCONF_MAX
 };
 
@@ -131,6 +132,7 @@ static inline void ipv4_devconf_setall(struct in_device *in_dev)
 #define IN_DEV_PROMOTE_SECONDARIES(in_dev) \
                                         IN_DEV_ORCONF((in_dev), \
                                                       PROMOTE_SECONDARIES)
+#define IN_DEV_ROUTE_LOCALNET(in_dev)   IN_DEV_ORCONF(in_dev, ROUTE_LOCALNET)
 
 #define IN_DEV_RX_REDIRECTS(in_dev) \
         ((IN_DEV_FORWARD(in_dev) && \
diff --git a/include/linux/ks8851_mll.h b/include/linux/ks8851_mll.h
new file mode 100644
index 00000000000..e9ccfb59ed3
--- /dev/null
+++ b/include/linux/ks8851_mll.h
@@ -0,0 +1,33 @@
+/*
+ * ks8861_mll platform data struct definition
+ * Copyright (c) 2012 BTicino S.p.A.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#ifndef _LINUX_KS8851_MLL_H
+#define _LINUX_KS8851_MLL_H
+
+#include <linux/if_ether.h>
+
+/**
+ * struct ks8851_mll_platform_data - Platform data of the KS8851_MLL network driver
+ * @macaddr:    The MAC address of the device, set to all 0:s to use the on in
+ *              the chip.
+ */
+struct ks8851_mll_platform_data {
+        u8 mac_addr[ETH_ALEN];
+};
+
+#endif
diff --git a/include/linux/mdio.h b/include/linux/mdio.h
index dfb947959ec..7cccafe50e7 100644
--- a/include/linux/mdio.h
+++ b/include/linux/mdio.h
@@ -43,7 +43,11 @@
 #define MDIO_PKGID2             15
 #define MDIO_AN_ADVERTISE       16      /* AN advertising (base page) */
 #define MDIO_AN_LPA             19      /* AN LP abilities (base page) */
+#define MDIO_PCS_EEE_ABLE       20      /* EEE Capability register */
+#define MDIO_PCS_EEE_WK_ERR     22      /* EEE wake error counter */
 #define MDIO_PHYXS_LNSTAT       24      /* PHY XGXS lane state */
+#define MDIO_AN_EEE_ADV         60      /* EEE advertisement */
+#define MDIO_AN_EEE_LPABLE      61      /* EEE link partner ability */
 
 /* Media-dependent registers. */
 #define MDIO_PMA_10GBT_SWAPPOL  130     /* 10GBASE-T pair swap & polarity */
@@ -56,7 +60,6 @@
 #define MDIO_PCS_10GBRT_STAT2   33      /* 10GBASE-R/-T PCS status 2 */
 #define MDIO_AN_10GBT_CTRL      32      /* 10GBASE-T auto-negotiation control */
 #define MDIO_AN_10GBT_STAT      33      /* 10GBASE-T auto-negotiation status */
-#define MDIO_AN_EEE_ADV         60      /* EEE advertisement */
 
 /* LASI (Link Alarm Status Interrupt) registers, defined by XENPAK MSA. */
 #define MDIO_PMA_LASI_RXCTRL    0x9000  /* RX_ALARM control */
@@ -82,6 +85,7 @@
 #define MDIO_AN_CTRL1_RESTART           BMCR_ANRESTART
 #define MDIO_AN_CTRL1_ENABLE            BMCR_ANENABLE
 #define MDIO_AN_CTRL1_XNP               0x2000  /* Enable extended next page */
+#define MDIO_PCS_CTRL1_CLKSTOP_EN       0x400   /* Stop the clock during LPI */
 
 /* 10 Gb/s */
 #define MDIO_CTRL1_SPEED10G             (MDIO_CTRL1_SPEEDSELEXT | 0x00)
@@ -237,9 +241,25 @@
 #define MDIO_AN_10GBT_STAT_MS           0x4000  /* Master/slave config */
 #define MDIO_AN_10GBT_STAT_MSFLT        0x8000  /* Master/slave config fault */
 
-/* AN EEE Advertisement register. */
-#define MDIO_AN_EEE_ADV_100TX           0x0002  /* Advertise 100TX EEE cap */
-#define MDIO_AN_EEE_ADV_1000T           0x0004  /* Advertise 1000T EEE cap */
+/* EEE Supported/Advertisement/LP Advertisement registers.
+ *
+ * EEE capability Register (3.20), Advertisement (7.60) and
+ * Link partner ability (7.61) registers have and can use the same identical
+ * bit masks.
+ */
+#define MDIO_AN_EEE_ADV_100TX   0x0002  /* Advertise 100TX EEE cap */
+#define MDIO_AN_EEE_ADV_1000T   0x0004  /* Advertise 1000T EEE cap */
+/* Note: the two defines above can be potentially used by the user-land
+ * and cannot remove them now.
+ * So, we define the new generic MDIO_EEE_100TX and MDIO_EEE_1000T macros
+ * using the previous ones (that can be considered obsolete).
+ */
+#define MDIO_EEE_100TX          MDIO_AN_EEE_ADV_100TX   /* 100TX EEE cap */
+#define MDIO_EEE_1000T          MDIO_AN_EEE_ADV_1000T   /* 1000T EEE cap */
+#define MDIO_EEE_10GT           0x0008  /* 10GT EEE cap */
+#define MDIO_EEE_1000KX         0x0010  /* 1000KX EEE cap */
+#define MDIO_EEE_10GKX4         0x0020  /* 10G KX4 EEE cap */
+#define MDIO_EEE_10GKR          0x0040  /* 10G KR EEE cap */
 
 /* LASI RX_ALARM control/status registers. */
 #define MDIO_PMA_LASI_RX_PHYXSLFLT      0x0001  /* PHY XS RX local fault */
diff --git a/include/linux/mii.h b/include/linux/mii.h
index 2783eca629a..8ef3a7a1159 100644
--- a/include/linux/mii.h
+++ b/include/linux/mii.h
@@ -21,6 +21,8 @@
 #define MII_EXPANSION           0x06    /* Expansion register          */
 #define MII_CTRL1000            0x09    /* 1000BASE-T control          */
 #define MII_STAT1000            0x0a    /* 1000BASE-T status           */
+#define MII_MMD_CTRL            0x0d    /* MMD Access Control Register */
+#define MII_MMD_DATA            0x0e    /* MMD Access Data Register */
 #define MII_ESTATUS             0x0f    /* Extended Status             */
 #define MII_DCOUNTER            0x12    /* Disconnect counter          */
 #define MII_FCSCOUNTER          0x13    /* False carrier counter       */
@@ -141,6 +143,13 @@
 #define FLOW_CTRL_TX            0x01
 #define FLOW_CTRL_RX            0x02
 
+/* MMD Access Control register fields */
+#define MII_MMD_CTRL_DEVAD_MASK 0x1f    /* Mask MMD DEVAD*/
+#define MII_MMD_CTRL_ADDR       0x0000  /* Address */
+#define MII_MMD_CTRL_NOINCR     0x4000  /* no post increment */
+#define MII_MMD_CTRL_INCR_RDWT  0x8000  /* post increment on reads & writes */
+#define MII_MMD_CTRL_INCR_ON_WT 0xC000  /* post increment on writes only */
+
 /* This structure is used in all SIOCxMIIxxx ioctl calls */
 struct mii_ioctl_data {
         __u16           phy_id;
diff --git a/include/linux/mlx4/cmd.h b/include/linux/mlx4/cmd.h
index 1f3860a8a10..26069518625 100644
--- a/include/linux/mlx4/cmd.h
+++ b/include/linux/mlx4/cmd.h
@@ -154,6 +154,10 @@ enum {
         /* set port opcode modifiers */
         MLX4_SET_PORT_PRIO2TC = 0x8,
         MLX4_SET_PORT_SCHEDULER  = 0x9,
+
+        /* register/delete flow steering network rules */
+        MLX4_QP_FLOW_STEERING_ATTACH = 0x65,
+        MLX4_QP_FLOW_STEERING_DETACH = 0x66,
 };
 
 enum {
diff --git a/include/linux/mlx4/device.h b/include/linux/mlx4/device.h
index 6a8f002b8ed..6f0d133cc7a 100644
--- a/include/linux/mlx4/device.h
+++ b/include/linux/mlx4/device.h
@@ -70,6 +70,36 @@ enum {
         MLX4_MFUNC_EQE_MASK     = (MLX4_MFUNC_MAX_EQES - 1)
 };
 
+/* Driver supports 3 diffrent device methods to manage traffic steering:
+ *      -device managed - High level API for ib and eth flow steering. FW is
+ *                        managing flow steering tables.
+ *      - B0 steering mode - Common low level API for ib and (if supported) eth.
+ *      - A0 steering mode - Limited low level API for eth. In case of IB,
+ *                           B0 mode is in use.
+ */
+enum {
+        MLX4_STEERING_MODE_A0,
+        MLX4_STEERING_MODE_B0,
+        MLX4_STEERING_MODE_DEVICE_MANAGED
+};
+
+static inline const char *mlx4_steering_mode_str(int steering_mode)
+{
+        switch (steering_mode) {
+        case MLX4_STEERING_MODE_A0:
+                return "A0 steering";
+
+        case MLX4_STEERING_MODE_B0:
+                return "B0 steering";
+
+        case MLX4_STEERING_MODE_DEVICE_MANAGED:
+                return "Device managed flow steering";
+
+        default:
+                return "Unrecognize steering mode";
+        }
+}
+
 enum {
         MLX4_DEV_CAP_FLAG_RC            = 1LL <<  0,
         MLX4_DEV_CAP_FLAG_UC            = 1LL <<  1,
@@ -102,7 +132,8 @@ enum {
 enum {
         MLX4_DEV_CAP_FLAG2_RSS                  = 1LL <<  0,
         MLX4_DEV_CAP_FLAG2_RSS_TOP              = 1LL <<  1,
-        MLX4_DEV_CAP_FLAG2_RSS_XOR              = 1LL <<  2
+        MLX4_DEV_CAP_FLAG2_RSS_XOR              = 1LL <<  2,
+        MLX4_DEV_CAP_FLAG2_FS_EN                = 1LL <<  3
 };
 
 #define MLX4_ATTR_EXTENDED_PORT_INFO    cpu_to_be16(0xff90)
@@ -295,6 +326,8 @@ struct mlx4_caps {
         int                     num_amgms;
         int                     reserved_mcgs;
         int                     num_qp_per_mgm;
+        int                     steering_mode;
+        int                     fs_log_max_ucast_qp_range_size;
         int                     num_pds;
         int                     reserved_pds;
         int                     max_xrcds;
@@ -509,6 +542,8 @@ struct mlx4_dev {
         u8                      rev_id;
         char                    board_id[MLX4_BOARD_ID_LEN];
         int                     num_vfs;
+        u64                     regid_promisc_array[MLX4_MAX_PORTS + 1];
+        u64                     regid_allmulti_array[MLX4_MAX_PORTS + 1];
 };
 
 struct mlx4_init_port_param {
@@ -623,9 +658,99 @@ int mlx4_unicast_attach(struct mlx4_dev *dev, struct mlx4_qp *qp, u8 gid[16],
 int mlx4_unicast_detach(struct mlx4_dev *dev, struct mlx4_qp *qp, u8 gid[16],
                         enum mlx4_protocol prot);
 int mlx4_multicast_attach(struct mlx4_dev *dev, struct mlx4_qp *qp, u8 gid[16],
-                          int block_mcast_loopback, enum mlx4_protocol protocol);
+                          u8 port, int block_mcast_loopback,
+                          enum mlx4_protocol protocol, u64 *reg_id);
 int mlx4_multicast_detach(struct mlx4_dev *dev, struct mlx4_qp *qp, u8 gid[16],
-                          enum mlx4_protocol protocol);
+                          enum mlx4_protocol protocol, u64 reg_id);
+
+enum {
+        MLX4_DOMAIN_UVERBS      = 0x1000,
+        MLX4_DOMAIN_ETHTOOL     = 0x2000,
+        MLX4_DOMAIN_RFS         = 0x3000,
+        MLX4_DOMAIN_NIC    = 0x5000,
+};
+
+enum mlx4_net_trans_rule_id {
+        MLX4_NET_TRANS_RULE_ID_ETH = 0,
+        MLX4_NET_TRANS_RULE_ID_IB,
+        MLX4_NET_TRANS_RULE_ID_IPV6,
+        MLX4_NET_TRANS_RULE_ID_IPV4,
+        MLX4_NET_TRANS_RULE_ID_TCP,
+        MLX4_NET_TRANS_RULE_ID_UDP,
+        MLX4_NET_TRANS_RULE_NUM, /* should be last */
+};
+
+enum mlx4_net_trans_promisc_mode {
+        MLX4_FS_PROMISC_NONE = 0,
+        MLX4_FS_PROMISC_UPLINK,
+        /* For future use. Not implemented yet */
+        MLX4_FS_PROMISC_FUNCTION_PORT,
+        MLX4_FS_PROMISC_ALL_MULTI,
+};
+
+struct mlx4_spec_eth {
+        u8      dst_mac[6];
+        u8      dst_mac_msk[6];
+        u8      src_mac[6];
+        u8      src_mac_msk[6];
+        u8      ether_type_enable;
+        __be16  ether_type;
+        __be16  vlan_id_msk;
+        __be16  vlan_id;
+};
+
+struct mlx4_spec_tcp_udp {
+        __be16 dst_port;
+        __be16 dst_port_msk;
+        __be16 src_port;
+        __be16 src_port_msk;
+};
+
+struct mlx4_spec_ipv4 {
+        __be32 dst_ip;
+        __be32 dst_ip_msk;
+        __be32 src_ip;
+        __be32 src_ip_msk;
+};
+
+struct mlx4_spec_ib {
+        __be32  r_qpn;
+        __be32  qpn_msk;
+        u8      dst_gid[16];
+        u8      dst_gid_msk[16];
+};
+
+struct mlx4_spec_list {
+        struct  list_head list;
+        enum    mlx4_net_trans_rule_id id;
+        union {
+                struct mlx4_spec_eth eth;
+                struct mlx4_spec_ib ib;
+                struct mlx4_spec_ipv4 ipv4;
+                struct mlx4_spec_tcp_udp tcp_udp;
+        };
+};
+
+enum mlx4_net_trans_hw_rule_queue {
+        MLX4_NET_TRANS_Q_FIFO,
+        MLX4_NET_TRANS_Q_LIFO,
+};
+
+struct mlx4_net_trans_rule {
+        struct  list_head list;
+        enum    mlx4_net_trans_hw_rule_queue queue_mode;
+        bool    exclusive;
+        bool    allow_loopback;
+        enum    mlx4_net_trans_promisc_mode promisc_mode;
+        u8      port;
+        u16     priority;
+        u32     qpn;
+};
+
+int mlx4_flow_steer_promisc_add(struct mlx4_dev *dev, u8 port, u32 qpn,
+                                enum mlx4_net_trans_promisc_mode mode);
+int mlx4_flow_steer_promisc_remove(struct mlx4_dev *dev, u8 port,
+                                   enum mlx4_net_trans_promisc_mode mode);
 int mlx4_multicast_promisc_add(struct mlx4_dev *dev, u32 qpn, u8 port);
 int mlx4_multicast_promisc_remove(struct mlx4_dev *dev, u32 qpn, u8 port);
 int mlx4_unicast_promisc_add(struct mlx4_dev *dev, u32 qpn, u8 port);
@@ -668,4 +793,8 @@ int mlx4_wol_write(struct mlx4_dev *dev, u64 config, int port);
 int mlx4_counter_alloc(struct mlx4_dev *dev, u32 *idx);
 void mlx4_counter_free(struct mlx4_dev *dev, u32 idx);
 
+int mlx4_flow_attach(struct mlx4_dev *dev,
+                     struct mlx4_net_trans_rule *rule, u64 *reg_id);
+int mlx4_flow_detach(struct mlx4_dev *dev, u64 reg_id);
+
 #endif /* MLX4_DEVICE_H */
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index d94cb143151..ab0251d541a 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -1046,10 +1046,9 @@ struct net_device {
          */
         char                    name[IFNAMSIZ];
 
-        struct pm_qos_request   pm_qos_req;
-
-        /* device name hash chain */
+        /* device name hash chain, please keep it close to name[] */
         struct hlist_node       name_hlist;
+
         /* snmp alias */
         char                    *ifalias;
 
@@ -1322,6 +1321,8 @@ struct net_device {
 
         /* group the device belongs to */
         int group;
+
+        struct pm_qos_request   pm_qos_req;
 };
 #define to_net_dev(d) container_of(d, struct net_device, dev)
 
@@ -1626,6 +1627,7 @@ extern int		dev_alloc_name(struct net_device *dev, const char *name);
 extern int              dev_open(struct net_device *dev);
 extern int              dev_close(struct net_device *dev);
 extern void             dev_disable_lro(struct net_device *dev);
+extern int              dev_loopback_xmit(struct sk_buff *newskb);
 extern int              dev_queue_xmit(struct sk_buff *skb);
 extern int              register_netdevice(struct net_device *dev);
 extern void             unregister_netdevice_queue(struct net_device *dev,
@@ -2117,6 +2119,9 @@ static inline int netif_copy_real_num_queues(struct net_device *to_dev,
 #endif
 }
 
+#define DEFAULT_MAX_NUM_RSS_QUEUES      (8)
+extern int netif_get_num_default_rss_queues(void);
+
 /* Use this variant when it is known for sure that it
  * is executing from hardware interrupt context or with hardware interrupts
  * disabled.
diff --git a/include/linux/netfilter.h b/include/linux/netfilter.h
index ff9c84c29b2..c613cf0d788 100644
--- a/include/linux/netfilter.h
+++ b/include/linux/netfilter.h
@@ -94,6 +94,16 @@ static inline int nf_inet_addr_cmp(const union nf_inet_addr *a1,
                a1->all[3] == a2->all[3];
 }
 
+static inline void nf_inet_addr_mask(const union nf_inet_addr *a1,
+                                     union nf_inet_addr *result,
+                                     const union nf_inet_addr *mask)
+{
+        result->all[0] = a1->all[0] & mask->all[0];
+        result->all[1] = a1->all[1] & mask->all[1];
+        result->all[2] = a1->all[2] & mask->all[2];
+        result->all[3] = a1->all[3] & mask->all[3];
+}
+
 extern void netfilter_init(void);
 
 /* Largest hook number + 1 */
@@ -383,6 +393,22 @@ nf_nat_decode_session(struct sk_buff *skb, struct flowi *fl, u_int8_t family)
 extern void (*ip_ct_attach)(struct sk_buff *, struct sk_buff *) __rcu;
 extern void nf_ct_attach(struct sk_buff *, struct sk_buff *);
 extern void (*nf_ct_destroy)(struct nf_conntrack *) __rcu;
+
+struct nf_conn;
+struct nlattr;
+
+struct nfq_ct_hook {
+        size_t (*build_size)(const struct nf_conn *ct);
+        int (*build)(struct sk_buff *skb, struct nf_conn *ct);
+        int (*parse)(const struct nlattr *attr, struct nf_conn *ct);
+};
+extern struct nfq_ct_hook __rcu *nfq_ct_hook;
+
+struct nfq_ct_nat_hook {
+        void (*seq_adjust)(struct sk_buff *skb, struct nf_conn *ct,
+                           u32 ctinfo, int off);
+};
+extern struct nfq_ct_nat_hook __rcu *nfq_ct_nat_hook;
 #else
 static inline void nf_ct_attach(struct sk_buff *new, struct sk_buff *skb) {}
 #endif
diff --git a/include/linux/netfilter/Kbuild b/include/linux/netfilter/Kbuild
index 1697036336b..874ae8f2706 100644
--- a/include/linux/netfilter/Kbuild
+++ b/include/linux/netfilter/Kbuild
@@ -10,6 +10,7 @@ header-y += nfnetlink.h
 header-y += nfnetlink_acct.h
 header-y += nfnetlink_compat.h
 header-y += nfnetlink_conntrack.h
+header-y += nfnetlink_cthelper.h
 header-y += nfnetlink_cttimeout.h
 header-y += nfnetlink_log.h
 header-y += nfnetlink_queue.h
diff --git a/include/linux/netfilter/nf_conntrack_sip.h b/include/linux/netfilter/nf_conntrack_sip.h
index 0ce91d56a5f..0dfc8b7210a 100644
--- a/include/linux/netfilter/nf_conntrack_sip.h
+++ b/include/linux/netfilter/nf_conntrack_sip.h
@@ -2,6 +2,8 @@
 #define __NF_CONNTRACK_SIP_H__
 #ifdef __KERNEL__
 
+#include <net/netfilter/nf_conntrack_expect.h>
+
 #define SIP_PORT        5060
 #define SIP_TIMEOUT     3600
 
diff --git a/include/linux/netfilter/nfnetlink.h b/include/linux/netfilter/nfnetlink.h
index a1048c1587d..18341cdb244 100644
--- a/include/linux/netfilter/nfnetlink.h
+++ b/include/linux/netfilter/nfnetlink.h
@@ -50,7 +50,8 @@ struct nfgenmsg {
 #define NFNL_SUBSYS_IPSET               6
 #define NFNL_SUBSYS_ACCT                7
 #define NFNL_SUBSYS_CTNETLINK_TIMEOUT   8
-#define NFNL_SUBSYS_COUNT               9
+#define NFNL_SUBSYS_CTHELPER            9
+#define NFNL_SUBSYS_COUNT               10
 
 #ifdef __KERNEL__
 
diff --git a/include/linux/netfilter/nfnetlink_conntrack.h b/include/linux/netfilter/nfnetlink_conntrack.h
index e58e4b93c10..f649f7423ca 100644
--- a/include/linux/netfilter/nfnetlink_conntrack.h
+++ b/include/linux/netfilter/nfnetlink_conntrack.h
@@ -7,6 +7,8 @@ enum cntl_msg_types {
         IPCTNL_MSG_CT_GET,
         IPCTNL_MSG_CT_DELETE,
         IPCTNL_MSG_CT_GET_CTRZERO,
+        IPCTNL_MSG_CT_GET_STATS_CPU,
+        IPCTNL_MSG_CT_GET_STATS,
 
         IPCTNL_MSG_MAX
 };
@@ -15,6 +17,7 @@ enum ctnl_exp_msg_types {
         IPCTNL_MSG_EXP_NEW,
         IPCTNL_MSG_EXP_GET,
         IPCTNL_MSG_EXP_DELETE,
+        IPCTNL_MSG_EXP_GET_STATS_CPU,
 
         IPCTNL_MSG_EXP_MAX
 };
@@ -191,6 +194,7 @@ enum ctattr_expect_nat {
 enum ctattr_help {
         CTA_HELP_UNSPEC,
         CTA_HELP_NAME,
+        CTA_HELP_INFO,
         __CTA_HELP_MAX
 };
 #define CTA_HELP_MAX (__CTA_HELP_MAX - 1)
@@ -202,4 +206,39 @@ enum ctattr_secctx {
 };
 #define CTA_SECCTX_MAX (__CTA_SECCTX_MAX - 1)
 
+enum ctattr_stats_cpu {
+        CTA_STATS_UNSPEC,
+        CTA_STATS_SEARCHED,
+        CTA_STATS_FOUND,
+        CTA_STATS_NEW,
+        CTA_STATS_INVALID,
+        CTA_STATS_IGNORE,
+        CTA_STATS_DELETE,
+        CTA_STATS_DELETE_LIST,
+        CTA_STATS_INSERT,
+        CTA_STATS_INSERT_FAILED,
+        CTA_STATS_DROP,
+        CTA_STATS_EARLY_DROP,
+        CTA_STATS_ERROR,
+        CTA_STATS_SEARCH_RESTART,
+        __CTA_STATS_MAX,
+};
+#define CTA_STATS_MAX (__CTA_STATS_MAX - 1)
+
+enum ctattr_stats_global {
+        CTA_STATS_GLOBAL_UNSPEC,
+        CTA_STATS_GLOBAL_ENTRIES,
+        __CTA_STATS_GLOBAL_MAX,
+};
+#define CTA_STATS_GLOBAL_MAX (__CTA_STATS_GLOBAL_MAX - 1)
+
+enum ctattr_expect_stats {
+        CTA_STATS_EXP_UNSPEC,
+        CTA_STATS_EXP_NEW,
+        CTA_STATS_EXP_CREATE,
+        CTA_STATS_EXP_DELETE,
+        __CTA_STATS_EXP_MAX,
+};
+#define CTA_STATS_EXP_MAX (__CTA_STATS_EXP_MAX - 1)
+
 #endif /* _IPCONNTRACK_NETLINK_H */
diff --git a/include/linux/netfilter/nfnetlink_cthelper.h b/include/linux/netfilter/nfnetlink_cthelper.h
new file mode 100644
index 00000000000..33659f6fad3
--- /dev/null
+++ b/include/linux/netfilter/nfnetlink_cthelper.h
@@ -0,0 +1,55 @@
+#ifndef _NFNL_CTHELPER_H_
+#define _NFNL_CTHELPER_H_
+
+#define NFCT_HELPER_STATUS_DISABLED     0
+#define NFCT_HELPER_STATUS_ENABLED      1
+
+enum nfnl_acct_msg_types {
+        NFNL_MSG_CTHELPER_NEW,
+        NFNL_MSG_CTHELPER_GET,
+        NFNL_MSG_CTHELPER_DEL,
+        NFNL_MSG_CTHELPER_MAX
+};
+
+enum nfnl_cthelper_type {
+        NFCTH_UNSPEC,
+        NFCTH_NAME,
+        NFCTH_TUPLE,
+        NFCTH_QUEUE_NUM,
+        NFCTH_POLICY,
+        NFCTH_PRIV_DATA_LEN,
+        NFCTH_STATUS,
+        __NFCTH_MAX
+};
+#define NFCTH_MAX (__NFCTH_MAX - 1)
+
+enum nfnl_cthelper_policy_type {
+        NFCTH_POLICY_SET_UNSPEC,
+        NFCTH_POLICY_SET_NUM,
+        NFCTH_POLICY_SET,
+        NFCTH_POLICY_SET1       = NFCTH_POLICY_SET,
+        NFCTH_POLICY_SET2,
+        NFCTH_POLICY_SET3,
+        NFCTH_POLICY_SET4,
+        __NFCTH_POLICY_SET_MAX
+};
+#define NFCTH_POLICY_SET_MAX (__NFCTH_POLICY_SET_MAX - 1)
+
+enum nfnl_cthelper_pol_type {
+        NFCTH_POLICY_UNSPEC,
+        NFCTH_POLICY_NAME,
+        NFCTH_POLICY_EXPECT_MAX,
+        NFCTH_POLICY_EXPECT_TIMEOUT,
+        __NFCTH_POLICY_MAX
+};
+#define NFCTH_POLICY_MAX (__NFCTH_POLICY_MAX - 1)
+
+enum nfnl_cthelper_tuple_type {
+        NFCTH_TUPLE_UNSPEC,
+        NFCTH_TUPLE_L3PROTONUM,
+        NFCTH_TUPLE_L4PROTONUM,
+        __NFCTH_TUPLE_MAX,
+};
+#define NFCTH_TUPLE_MAX (__NFCTH_TUPLE_MAX - 1)
+
+#endif /* _NFNL_CTHELPER_H */
diff --git a/include/linux/netfilter/nfnetlink_queue.h b/include/linux/netfilter/nfnetlink_queue.h
index 24b32e6c009..3b1c1360aed 100644
--- a/include/linux/netfilter/nfnetlink_queue.h
+++ b/include/linux/netfilter/nfnetlink_queue.h
@@ -42,6 +42,8 @@ enum nfqnl_attr_type {
         NFQA_IFINDEX_PHYSOUTDEV,        /* __u32 ifindex */
         NFQA_HWADDR,                    /* nfqnl_msg_packet_hw */
         NFQA_PAYLOAD,                   /* opaque data payload */
+        NFQA_CT,                        /* nf_conntrack_netlink.h */
+        NFQA_CT_INFO,                   /* enum ip_conntrack_info */
 
         __NFQA_MAX
 };
@@ -84,8 +86,15 @@ enum nfqnl_attr_config {
         NFQA_CFG_CMD,                   /* nfqnl_msg_config_cmd */
         NFQA_CFG_PARAMS,                /* nfqnl_msg_config_params */
         NFQA_CFG_QUEUE_MAXLEN,          /* __u32 */
+        NFQA_CFG_MASK,                  /* identify which flags to change */
+        NFQA_CFG_FLAGS,                 /* value of these flags (__u32) */
         __NFQA_CFG_MAX
 };
 #define NFQA_CFG_MAX (__NFQA_CFG_MAX-1)
 
+/* Flags for NFQA_CFG_FLAGS */
+#define NFQA_CFG_F_FAIL_OPEN                    (1 << 0)
+#define NFQA_CFG_F_CONNTRACK                    (1 << 1)
+#define NFQA_CFG_F_MAX                          (1 << 2)
+
 #endif /* _NFNETLINK_QUEUE_H */
diff --git a/include/linux/netfilter/xt_connlimit.h b/include/linux/netfilter/xt_connlimit.h
index d1366f05d1b..f1656096121 100644
--- a/include/linux/netfilter/xt_connlimit.h
+++ b/include/linux/netfilter/xt_connlimit.h
@@ -22,13 +22,8 @@ struct xt_connlimit_info {
 #endif
         };
         unsigned int limit;
-        union {
-                /* revision 0 */
-                unsigned int inverse;
-
-                /* revision 1 */
-                __u32 flags;
-        };
+        /* revision 1 */
+        __u32 flags;
 
         /* Used internally by the kernel */
         struct xt_connlimit_data *data __attribute__((aligned(8)));
diff --git a/include/linux/netfilter/xt_recent.h b/include/linux/netfilter/xt_recent.h
index 83318e01425..6ef36c113e8 100644
--- a/include/linux/netfilter/xt_recent.h
+++ b/include/linux/netfilter/xt_recent.h
@@ -32,4 +32,14 @@ struct xt_recent_mtinfo {
         __u8 side;
 };
 
+struct xt_recent_mtinfo_v1 {
+        __u32 seconds;
+        __u32 hit_count;
+        __u8 check_set;
+        __u8 invert;
+        char name[XT_RECENT_NAME_LEN];
+        __u8 side;
+        union nf_inet_addr mask;
+};
+
 #endif /* _LINUX_NETFILTER_XT_RECENT_H */
diff --git a/include/linux/netfilter_ipv4.h b/include/linux/netfilter_ipv4.h
index fa0946c549d..e2b12801378 100644
--- a/include/linux/netfilter_ipv4.h
+++ b/include/linux/netfilter_ipv4.h
@@ -66,6 +66,7 @@ enum nf_ip_hook_priorities {
         NF_IP_PRI_SECURITY = 50,
         NF_IP_PRI_NAT_SRC = 100,
         NF_IP_PRI_SELINUX_LAST = 225,
+        NF_IP_PRI_CONNTRACK_HELPER = 300,
         NF_IP_PRI_CONNTRACK_CONFIRM = INT_MAX,
         NF_IP_PRI_LAST = INT_MAX,
 };
diff --git a/include/linux/netfilter_ipv4/Kbuild b/include/linux/netfilter_ipv4/Kbuild
index c61b8fb1a9e..8ba0c5b72ea 100644
--- a/include/linux/netfilter_ipv4/Kbuild
+++ b/include/linux/netfilter_ipv4/Kbuild
@@ -5,7 +5,6 @@ header-y += ipt_LOG.h
 header-y += ipt_REJECT.h
 header-y += ipt_TTL.h
 header-y += ipt_ULOG.h
-header-y += ipt_addrtype.h
 header-y += ipt_ah.h
 header-y += ipt_ecn.h
 header-y += ipt_ttl.h
diff --git a/include/linux/netfilter_ipv4/ipt_addrtype.h b/include/linux/netfilter_ipv4/ipt_addrtype.h
deleted file mode 100644
index 0da42237c8d..00000000000
--- a/include/linux/netfilter_ipv4/ipt_addrtype.h
+++ /dev/null
@@ -1,27 +0,0 @@
-#ifndef _IPT_ADDRTYPE_H
-#define _IPT_ADDRTYPE_H
-
-#include <linux/types.h>
-
-enum {
-        IPT_ADDRTYPE_INVERT_SOURCE      = 0x0001,
-        IPT_ADDRTYPE_INVERT_DEST        = 0x0002,
-        IPT_ADDRTYPE_LIMIT_IFACE_IN     = 0x0004,
-        IPT_ADDRTYPE_LIMIT_IFACE_OUT    = 0x0008,
-};
-
-struct ipt_addrtype_info_v1 {
-        __u16   source;         /* source-type mask */
-        __u16   dest;           /* dest-type mask */
-        __u32   flags;
-};
-
-/* revision 0 */
-struct ipt_addrtype_info {
-        __u16   source;         /* source-type mask */
-        __u16   dest;           /* dest-type mask */
-        __u32   invert_source;
-        __u32   invert_dest;
-};
-
-#endif
diff --git a/include/linux/netfilter_ipv6.h b/include/linux/netfilter_ipv6.h
index 57c025127f1..7c8a513ce7a 100644
--- a/include/linux/netfilter_ipv6.h
+++ b/include/linux/netfilter_ipv6.h
@@ -71,6 +71,7 @@ enum nf_ip6_hook_priorities {
         NF_IP6_PRI_SECURITY = 50,
         NF_IP6_PRI_NAT_SRC = 100,
         NF_IP6_PRI_SELINUX_LAST = 225,
+        NF_IP6_PRI_CONNTRACK_HELPER = 300,
         NF_IP6_PRI_LAST = INT_MAX,
 };
 
diff --git a/include/linux/netlink.h b/include/linux/netlink.h
index 0f628ffa420..f74dd133788 100644
--- a/include/linux/netlink.h
+++ b/include/linux/netlink.h
@@ -174,11 +174,17 @@ struct netlink_skb_parms {
 extern void netlink_table_grab(void);
 extern void netlink_table_ungrab(void);
 
-extern struct sock *netlink_kernel_create(struct net *net,
-                                          int unit,unsigned int groups,
-                                          void (*input)(struct sk_buff *skb),
-                                          struct mutex *cb_mutex,
-                                          struct module *module);
+/* optional Netlink kernel configuration parameters */
+struct netlink_kernel_cfg {
+        unsigned int    groups;
+        void            (*input)(struct sk_buff *skb);
+        struct mutex    *cb_mutex;
+        void            (*bind)(int group);
+};
+
+extern struct sock *netlink_kernel_create(struct net *net, int unit,
+                                          struct module *module,
+                                          struct netlink_kernel_cfg *cfg);
 extern void netlink_kernel_release(struct sock *sk);
 extern int __netlink_change_ngroups(struct sock *sk, unsigned int groups);
 extern int netlink_change_ngroups(struct sock *sk, unsigned int groups);
@@ -241,14 +247,6 @@ struct netlink_notify {
 struct nlmsghdr *
 __nlmsg_put(struct sk_buff *skb, u32 pid, u32 seq, int type, int len, int flags);
 
-#define NLMSG_NEW(skb, pid, seq, type, len, flags) \
-({      if (unlikely(skb_tailroom(skb) < (int)NLMSG_SPACE(len))) \
-                goto nlmsg_failure; \
-        __nlmsg_put(skb, pid, seq, type, len, flags); })
-
-#define NLMSG_PUT(skb, pid, seq, type, len) \
-        NLMSG_NEW(skb, pid, seq, type, len, 0)
-
 struct netlink_dump_control {
         int (*dump)(struct sk_buff *skb, struct netlink_callback *);
         int (*done)(struct netlink_callback*);
diff --git a/include/linux/nfc.h b/include/linux/nfc.h
index 0ae9b5857c8..f4e6dd915b1 100644
--- a/include/linux/nfc.h
+++ b/include/linux/nfc.h
@@ -56,6 +56,10 @@
  *      %NFC_ATTR_PROTOCOLS)
  * @NFC_EVENT_DEVICE_REMOVED: event emitted when a device is removed
  *      (it sends %NFC_ATTR_DEVICE_INDEX)
+ * @NFC_EVENT_TM_ACTIVATED: event emitted when the adapter is activated in
+ *      target mode.
+ * @NFC_EVENT_DEVICE_DEACTIVATED: event emitted when the adapter is deactivated
+ *      from target mode.
  */
 enum nfc_commands {
         NFC_CMD_UNSPEC,
@@ -71,6 +75,8 @@ enum nfc_commands {
         NFC_EVENT_DEVICE_ADDED,
         NFC_EVENT_DEVICE_REMOVED,
         NFC_EVENT_TARGET_LOST,
+        NFC_EVENT_TM_ACTIVATED,
+        NFC_EVENT_TM_DEACTIVATED,
 /* private: internal use only */
         __NFC_CMD_AFTER_LAST
 };
@@ -94,6 +100,8 @@ enum nfc_commands {
  * @NFC_ATTR_TARGET_SENSF_RES: NFC-F targets extra information, max 18 bytes
  * @NFC_ATTR_COMM_MODE: Passive or active mode
  * @NFC_ATTR_RF_MODE: Initiator or target
+ * @NFC_ATTR_IM_PROTOCOLS: Initiator mode protocols to poll for
+ * @NFC_ATTR_TM_PROTOCOLS: Target mode protocols to listen for
  */
 enum nfc_attrs {
         NFC_ATTR_UNSPEC,
@@ -109,6 +117,8 @@ enum nfc_attrs {
         NFC_ATTR_COMM_MODE,
         NFC_ATTR_RF_MODE,
         NFC_ATTR_DEVICE_POWERED,
+        NFC_ATTR_IM_PROTOCOLS,
+        NFC_ATTR_TM_PROTOCOLS,
 /* private: internal use only */
         __NFC_ATTR_AFTER_LAST
 };
@@ -118,6 +128,7 @@ enum nfc_attrs {
 #define NFC_NFCID1_MAXSIZE 10
 #define NFC_SENSB_RES_MAXSIZE 12
 #define NFC_SENSF_RES_MAXSIZE 18
+#define NFC_GB_MAXSIZE        48
 
 /* NFC protocols */
 #define NFC_PROTO_JEWEL         1
@@ -135,6 +146,7 @@ enum nfc_attrs {
 /* NFC RF modes */
 #define NFC_RF_INITIATOR 0
 #define NFC_RF_TARGET    1
+#define NFC_RF_NONE      2
 
 /* NFC protocols masks used in bitsets */
 #define NFC_PROTO_JEWEL_MASK    (1 << NFC_PROTO_JEWEL)
diff --git a/include/linux/nl80211.h b/include/linux/nl80211.h
index a6959f72745..c0fc5d27733 100644
--- a/include/linux/nl80211.h
+++ b/include/linux/nl80211.h
@@ -170,6 +170,8 @@
  *      %NL80211_ATTR_CIPHER_GROUP, %NL80211_ATTR_WPA_VERSIONS,
  *      %NL80211_ATTR_AKM_SUITES, %NL80211_ATTR_PRIVACY,
  *      %NL80211_ATTR_AUTH_TYPE and %NL80211_ATTR_INACTIVITY_TIMEOUT.
+ *      The channel to use can be set on the interface or be given using the
+ *      %NL80211_ATTR_WIPHY_FREQ and %NL80211_ATTR_WIPHY_CHANNEL_TYPE attrs.
  * @NL80211_CMD_NEW_BEACON: old alias for %NL80211_CMD_START_AP
  * @NL80211_CMD_STOP_AP: Stop AP operation on the given interface
  * @NL80211_CMD_DEL_BEACON: old alias for %NL80211_CMD_STOP_AP
@@ -275,6 +277,12 @@
  * @NL80211_CMD_NEW_SURVEY_RESULTS: survey data notification (as a reply to
  *      NL80211_CMD_GET_SURVEY and on the "scan" multicast group)
  *
+ * @NL80211_CMD_SET_PMKSA: Add a PMKSA cache entry, using %NL80211_ATTR_MAC
+ *      (for the BSSID) and %NL80211_ATTR_PMKID.
+ * @NL80211_CMD_DEL_PMKSA: Delete a PMKSA cache entry, using %NL80211_ATTR_MAC
+ *      (for the BSSID) and %NL80211_ATTR_PMKID.
+ * @NL80211_CMD_FLUSH_PMKSA: Flush all PMKSA cache entries.
+ *
  * @NL80211_CMD_REG_CHANGE: indicates to userspace the regulatory domain
  *      has been changed and provides details of the request information
  *      that caused the change such as who initiated the regulatory request
@@ -454,6 +462,10 @@
  *      the frame.
  * @NL80211_CMD_ACTION_TX_STATUS: Alias for @NL80211_CMD_FRAME_TX_STATUS for
  *      backward compatibility.
+ *
+ * @NL80211_CMD_SET_POWER_SAVE: Set powersave, using %NL80211_ATTR_PS_STATE
+ * @NL80211_CMD_GET_POWER_SAVE: Get powersave status in %NL80211_ATTR_PS_STATE
+ *
  * @NL80211_CMD_SET_CQM: Connection quality monitor configuration. This command
  *      is used to configure connection quality monitoring notification trigger
  *      levels.
@@ -769,6 +781,13 @@ enum nl80211_commands {
  *      section 7.3.2.25.1, e.g. 0x000FAC04)
  * @NL80211_ATTR_KEY_SEQ: transmit key sequence number (IV/PN) for TKIP and
  *      CCMP keys, each six bytes in little endian
+ * @NL80211_ATTR_KEY_DEFAULT: Flag attribute indicating the key is default key
+ * @NL80211_ATTR_KEY_DEFAULT_MGMT: Flag attribute indicating the key is the
+ *      default management key
+ * @NL80211_ATTR_CIPHER_SUITES_PAIRWISE: For crypto settings for connect or
+ *      other commands, indicates which pairwise cipher suites are used
+ * @NL80211_ATTR_CIPHER_SUITE_GROUP: For crypto settings for connect or
+ *      other commands, indicates which group cipher suite is used
  *
  * @NL80211_ATTR_BEACON_INTERVAL: beacon interval in TU
  * @NL80211_ATTR_DTIM_PERIOD: DTIM period for beaconing
@@ -1004,6 +1023,8 @@ enum nl80211_commands {
  * @NL80211_ATTR_ACK: Flag attribute indicating that the frame was
  *      acknowledged by the recipient.
  *
+ * @NL80211_ATTR_PS_STATE: powersave state, using &enum nl80211_ps_state values.
+ *
  * @NL80211_ATTR_CQM: connection quality monitor configuration in a
  *      nested attribute with %NL80211_ATTR_CQM_* sub-attributes.
  *
@@ -1061,7 +1082,7 @@ enum nl80211_commands {
  *      flag isn't set, the frame will be rejected. This is also used as an
  *      nl80211 capability flag.
  *
- * @NL80211_ATTR_BSS_HTOPMODE: HT operation mode (u16)
+ * @NL80211_ATTR_BSS_HT_OPMODE: HT operation mode (u16)
  *
  * @NL80211_ATTR_KEY_DEFAULT_TYPES: A nested attribute containing flags
  *      attributes, specifying what a key should be set as default as.
@@ -1085,10 +1106,10 @@ enum nl80211_commands {
  *      indicate which WoW triggers should be enabled. This is also
  *      used by %NL80211_CMD_GET_WOWLAN to get the currently enabled WoWLAN
  *      triggers.
-
+ *
  * @NL80211_ATTR_SCHED_SCAN_INTERVAL: Interval between scheduled scan
  *      cycles, in msecs.
-
+ *
  * @NL80211_ATTR_SCHED_SCAN_MATCH: Nested attribute with one or more
  *      sets of attributes to match during scheduled scans.  Only BSSs
  *      that match any of the sets will be reported.  These are
@@ -1115,7 +1136,7 @@ enum nl80211_commands {
  *      are managed in software: interfaces of these types aren't subject to
  *      any restrictions in their number or combinations.
  *
- * @%NL80211_ATTR_REKEY_DATA: nested attribute containing the information
+ * @NL80211_ATTR_REKEY_DATA: nested attribute containing the information
  *      necessary for GTK rekeying in the device, see &enum nl80211_rekey_data.
  *
  * @NL80211_ATTR_SCAN_SUPP_RATES: rates per to be advertised as supported in scan,
@@ -1182,7 +1203,6 @@ enum nl80211_commands {
  * @NL80211_ATTR_FEATURE_FLAGS: This u32 attribute contains flags from
  *      &enum nl80211_feature_flags and is advertised in wiphy information.
  * @NL80211_ATTR_PROBE_RESP_OFFLOAD: Indicates that the HW responds to probe
- *
  *      requests while operating in AP-mode.
  *      This attribute holds a bitmap of the supported protocols for
  *      offloading (see &enum nl80211_probe_resp_offload_support_attr).
@@ -1520,6 +1540,11 @@ enum nl80211_attrs {
 #define NL80211_MAX_NR_CIPHER_SUITES            5
 #define NL80211_MAX_NR_AKM_SUITES               2
 
+#define NL80211_MIN_REMAIN_ON_CHANNEL_TIME      10
+
+/* default RSSI threshold for scan results if none specified. */
+#define NL80211_SCAN_RSSI_THOLD_OFF             -300
+
 /**
  * enum nl80211_iftype - (virtual) interface types
  *
@@ -1952,6 +1977,8 @@ enum nl80211_reg_rule_attr {
  * @__NL80211_SCHED_SCAN_MATCH_ATTR_INVALID: attribute number 0 is reserved
  * @NL80211_SCHED_SCAN_MATCH_ATTR_SSID: SSID to be used for matching,
  * only report BSS with matching SSID.
+ * @NL80211_SCHED_SCAN_MATCH_ATTR_RSSI: RSSI threshold (in dBm) for reporting a
+ *      BSS in scan results. Filtering is turned off if not specified.
  * @NL80211_SCHED_SCAN_MATCH_ATTR_MAX: highest scheduled scan filter
  *      attribute number currently defined
  * @__NL80211_SCHED_SCAN_MATCH_ATTR_AFTER_LAST: internal use
@@ -1959,7 +1986,8 @@ enum nl80211_reg_rule_attr {
 enum nl80211_sched_scan_match_attr {
         __NL80211_SCHED_SCAN_MATCH_ATTR_INVALID,
 
-        NL80211_ATTR_SCHED_SCAN_MATCH_SSID,
+        NL80211_SCHED_SCAN_MATCH_ATTR_SSID,
+        NL80211_SCHED_SCAN_MATCH_ATTR_RSSI,
 
         /* keep last */
         __NL80211_SCHED_SCAN_MATCH_ATTR_AFTER_LAST,
@@ -1967,6 +1995,9 @@ enum nl80211_sched_scan_match_attr {
                 __NL80211_SCHED_SCAN_MATCH_ATTR_AFTER_LAST - 1
 };
 
+/* only for backward compatibility */
+#define NL80211_ATTR_SCHED_SCAN_MATCH_SSID NL80211_SCHED_SCAN_MATCH_ATTR_SSID
+
 /**
  * enum nl80211_reg_rule_flags - regulatory rule flags
  *
@@ -2086,78 +2117,91 @@ enum nl80211_mntr_flags {
  * @__NL80211_MESHCONF_INVALID: internal use
  *
  * @NL80211_MESHCONF_RETRY_TIMEOUT: specifies the initial retry timeout in
- * millisecond units, used by the Peer Link Open message
+ *      millisecond units, used by the Peer Link Open message
  *
  * @NL80211_MESHCONF_CONFIRM_TIMEOUT: specifies the initial confirm timeout, in
- * millisecond units, used by the peer link management to close a peer link
+ *      millisecond units, used by the peer link management to close a peer link
  *
  * @NL80211_MESHCONF_HOLDING_TIMEOUT: specifies the holding timeout, in
- * millisecond units
+ *      millisecond units
  *
  * @NL80211_MESHCONF_MAX_PEER_LINKS: maximum number of peer links allowed
- * on this mesh interface
+ *      on this mesh interface
  *
  * @NL80211_MESHCONF_MAX_RETRIES: specifies the maximum number of peer link
- * open retries that can be sent to establish a new peer link instance in a
- * mesh
+ *      open retries that can be sent to establish a new peer link instance in a
+ *      mesh
  *
  * @NL80211_MESHCONF_TTL: specifies the value of TTL field set at a source mesh
- * point.
+ *      point.
  *
  * @NL80211_MESHCONF_AUTO_OPEN_PLINKS: whether we should automatically
- * open peer links when we detect compatible mesh peers.
+ *      open peer links when we detect compatible mesh peers.
  *
  * @NL80211_MESHCONF_HWMP_MAX_PREQ_RETRIES: the number of action frames
- * containing a PREQ that an MP can send to a particular destination (path
- * target)
+ *      containing a PREQ that an MP can send to a particular destination (path
+ *      target)
  *
  * @NL80211_MESHCONF_PATH_REFRESH_TIME: how frequently to refresh mesh paths
- * (in milliseconds)
+ *      (in milliseconds)
  *
  * @NL80211_MESHCONF_MIN_DISCOVERY_TIMEOUT: minimum length of time to wait
- * until giving up on a path discovery (in milliseconds)
+ *      until giving up on a path discovery (in milliseconds)
  *
  * @NL80211_MESHCONF_HWMP_ACTIVE_PATH_TIMEOUT: The time (in TUs) for which mesh
- * points receiving a PREQ shall consider the forwarding information from the
- * root to be valid. (TU = time unit)
+ *      points receiving a PREQ shall consider the forwarding information from
+ *      the root to be valid. (TU = time unit)
  *
  * @NL80211_MESHCONF_HWMP_PREQ_MIN_INTERVAL: The minimum interval of time (in
- * TUs) during which an MP can send only one action frame containing a PREQ
- * reference element
+ *      TUs) during which an MP can send only one action frame containing a PREQ
+ *      reference element
  *
  * @NL80211_MESHCONF_HWMP_NET_DIAM_TRVS_TIME: The interval of time (in TUs)
- * that it takes for an HWMP information element to propagate across the mesh
+ *      that it takes for an HWMP information element to propagate across the
+ *      mesh
  *
  * @NL80211_MESHCONF_HWMP_ROOTMODE: whether root mode is enabled or not
  *
  * @NL80211_MESHCONF_ELEMENT_TTL: specifies the value of TTL field set at a
- * source mesh point for path selection elements.
+ *      source mesh point for path selection elements.
  *
  * @NL80211_MESHCONF_HWMP_RANN_INTERVAL:  The interval of time (in TUs) between
- * root announcements are transmitted.
+ *      root announcements are transmitted.
  *
  * @NL80211_MESHCONF_GATE_ANNOUNCEMENTS: Advertise that this mesh station has
- * access to a broader network beyond the MBSS.  This is done via Root
- * Announcement frames.
+ *      access to a broader network beyond the MBSS.  This is done via Root
+ *      Announcement frames.
  *
  * @NL80211_MESHCONF_HWMP_PERR_MIN_INTERVAL: The minimum interval of time (in
- * TUs) during which a mesh STA can send only one Action frame containing a
- * PERR element.
+ *      TUs) during which a mesh STA can send only one Action frame containing a
+ *      PERR element.
  *
  * @NL80211_MESHCONF_FORWARDING: set Mesh STA as forwarding or non-forwarding
- * or forwarding entity (default is TRUE - forwarding entity)
+ *      or forwarding entity (default is TRUE - forwarding entity)
  *
  * @NL80211_MESHCONF_RSSI_THRESHOLD: RSSI threshold in dBm. This specifies the
- * threshold for average signal strength of candidate station to establish
- * a peer link.
- *
- * @NL80211_MESHCONF_ATTR_MAX: highest possible mesh configuration attribute
+ *      threshold for average signal strength of candidate station to establish
+ *      a peer link.
  *
  * @NL80211_MESHCONF_SYNC_OFFSET_MAX_NEIGHBOR: maximum number of neighbors
- * to synchronize to for 11s default synchronization method (see 11C.12.2.2)
+ *      to synchronize to for 11s default synchronization method
+ *      (see 11C.12.2.2)
  *
  * @NL80211_MESHCONF_HT_OPMODE: set mesh HT protection mode.
  *
+ * @NL80211_MESHCONF_ATTR_MAX: highest possible mesh configuration attribute
+ *
+ * @NL80211_MESHCONF_HWMP_PATH_TO_ROOT_TIMEOUT: The time (in TUs) for
+ *      which mesh STAs receiving a proactive PREQ shall consider the forwarding
+ *      information to the root mesh STA to be valid.
+ *
+ * @NL80211_MESHCONF_HWMP_ROOT_INTERVAL: The interval of time (in TUs) between
+ *      proactive PREQs are transmitted.
+ *
+ * @NL80211_MESHCONF_HWMP_CONFIRMATION_INTERVAL: The minimum interval of time
+ *      (in TUs) during which a mesh STA can send only one Action frame
+ *      containing a PREQ element for root path confirmation.
+ *
  * @__NL80211_MESHCONF_ATTR_AFTER_LAST: internal use
  */
 enum nl80211_meshconf_params {
@@ -2184,6 +2228,9 @@ enum nl80211_meshconf_params {
         NL80211_MESHCONF_RSSI_THRESHOLD,
         NL80211_MESHCONF_SYNC_OFFSET_MAX_NEIGHBOR,
         NL80211_MESHCONF_HT_OPMODE,
+        NL80211_MESHCONF_HWMP_PATH_TO_ROOT_TIMEOUT,
+        NL80211_MESHCONF_HWMP_ROOT_INTERVAL,
+        NL80211_MESHCONF_HWMP_CONFIRMATION_INTERVAL,
 
         /* keep last */
         __NL80211_MESHCONF_ATTR_AFTER_LAST,
@@ -2199,34 +2246,36 @@ enum nl80211_meshconf_params {
  * @__NL80211_MESH_SETUP_INVALID: Internal use
  *
  * @NL80211_MESH_SETUP_ENABLE_VENDOR_PATH_SEL: Enable this option to use a
- * vendor specific path selection algorithm or disable it to use the default
- * HWMP.
+ *      vendor specific path selection algorithm or disable it to use the
+ *      default HWMP.
  *
  * @NL80211_MESH_SETUP_ENABLE_VENDOR_METRIC: Enable this option to use a
- * vendor specific path metric or disable it to use the default Airtime
- * metric.
+ *      vendor specific path metric or disable it to use the default Airtime
+ *      metric.
  *
  * @NL80211_MESH_SETUP_IE: Information elements for this mesh, for instance, a
- * robust security network ie, or a vendor specific information element that
- * vendors will use to identify the path selection methods and metrics in use.
+ *      robust security network ie, or a vendor specific information element
+ *      that vendors will use to identify the path selection methods and
+ *      metrics in use.
  *
  * @NL80211_MESH_SETUP_USERSPACE_AUTH: Enable this option if an authentication
- * daemon will be authenticating mesh candidates.
+ *      daemon will be authenticating mesh candidates.
  *
  * @NL80211_MESH_SETUP_USERSPACE_AMPE: Enable this option if an authentication
- * daemon will be securing peer link frames.  AMPE is a secured version of Mesh
- * Peering Management (MPM) and is implemented with the assistance of a
- * userspace daemon.  When this flag is set, the kernel will send peer
- * management frames to a userspace daemon that will implement AMPE
- * functionality (security capabilities selection, key confirmation, and key
- * management).  When the flag is unset (default), the kernel can autonomously
- * complete (unsecured) mesh peering without the need of a userspace daemon.
- *
- * @NL80211_MESH_SETUP_ATTR_MAX: highest possible mesh setup attribute number
+ *      daemon will be securing peer link frames.  AMPE is a secured version of
+ *      Mesh Peering Management (MPM) and is implemented with the assistance of
+ *      a userspace daemon.  When this flag is set, the kernel will send peer
+ *      management frames to a userspace daemon that will implement AMPE
+ *      functionality (security capabilities selection, key confirmation, and
+ *      key management).  When the flag is unset (default), the kernel can
+ *      autonomously complete (unsecured) mesh peering without the need of a
+ *      userspace daemon.
  *
  * @NL80211_MESH_SETUP_ENABLE_VENDOR_SYNC: Enable this option to use a
- * vendor specific synchronization method or disable it to use the default
- * neighbor offset synchronization
+ *      vendor specific synchronization method or disable it to use the default
+ *      neighbor offset synchronization
+ *
+ * @NL80211_MESH_SETUP_ATTR_MAX: highest possible mesh setup attribute number
  *
  * @__NL80211_MESH_SETUP_ATTR_AFTER_LAST: Internal use
  */
@@ -2496,6 +2545,11 @@ enum nl80211_band {
         NL80211_BAND_5GHZ,
 };
 
+/**
+ * enum nl80211_ps_state - powersave state
+ * @NL80211_PS_DISABLED: powersave is disabled
+ * @NL80211_PS_ENABLED: powersave is enabled
+ */
 enum nl80211_ps_state {
         NL80211_PS_DISABLED,
         NL80211_PS_ENABLED,
@@ -2534,10 +2588,14 @@ enum nl80211_attr_cqm {
  *      configured threshold
  * @NL80211_CQM_RSSI_THRESHOLD_EVENT_HIGH: The RSSI is higher than the
  *      configured threshold
+ * @NL80211_CQM_RSSI_BEACON_LOSS_EVENT: The device experienced beacon loss.
+ *      (Note that deauth/disassoc will still follow if the AP is not
+ *      available. This event might get used as roaming event, etc.)
  */
 enum nl80211_cqm_rssi_threshold_event {
         NL80211_CQM_RSSI_THRESHOLD_EVENT_LOW,
         NL80211_CQM_RSSI_THRESHOLD_EVENT_HIGH,
+        NL80211_CQM_RSSI_BEACON_LOSS_EVENT,
 };
 
 
diff --git a/include/linux/nl802154.h b/include/linux/nl802154.h
index 5a3db3aa5f1..fd4f2d1cdf6 100644
--- a/include/linux/nl802154.h
+++ b/include/linux/nl802154.h
@@ -130,18 +130,8 @@ enum {
 enum {
         __IEEE802154_DEV_INVALID = -1,
 
-         /* TODO:
-         * Nowadays three device types supported by this stack at linux-zigbee
-         * project: WPAN = 0, MONITOR = 1 and SMAC = 2.
-         *
-         * Since this stack implementation exists many years, it's definitely
-         * bad idea to change the assigned values due to they are already used
-         * by third-party userspace software like: iz-tools, wireshark...
-         *
-         * Currently only monitor device is added and initialized by '1' for
-         * compatibility.
-         */
-        IEEE802154_DEV_MONITOR = 1,
+        IEEE802154_DEV_WPAN,
+        IEEE802154_DEV_MONITOR,
 
         __IEEE802154_DEV_MAX,
 };
diff --git a/include/linux/phy.h b/include/linux/phy.h
index c291cae8ce3..93b3cf77f56 100644
--- a/include/linux/phy.h
+++ b/include/linux/phy.h
@@ -243,6 +243,15 @@ enum phy_state {
         PHY_RESUMING
 };
 
+/**
+ * struct phy_c45_device_ids - 802.3-c45 Device Identifiers
+ * @devices_in_package: Bit vector of devices present.
+ * @device_ids: The device identifer for each present device.
+ */
+struct phy_c45_device_ids {
+        u32 devices_in_package;
+        u32 device_ids[8];
+};
 
 /* phy_device: An instance of a PHY
  *
@@ -250,6 +259,8 @@ enum phy_state {
  * bus: Pointer to the bus this PHY is on
  * dev: driver model device structure for this PHY
  * phy_id: UID for this device found during discovery
+ * c45_ids: 802.3-c45 Device Identifers if is_c45.
+ * is_c45:  Set to true if this phy uses clause 45 addressing.
  * state: state of the PHY for management purposes
  * dev_flags: Device-specific flags used by the PHY driver.
  * addr: Bus address of PHY
@@ -285,6 +296,9 @@ struct phy_device {
 
         u32 phy_id;
 
+        struct phy_c45_device_ids c45_ids;
+        bool is_c45;
+
         enum phy_state state;
 
         u32 dev_flags;
@@ -412,6 +426,12 @@ struct phy_driver {
         /* Clears up any memory if needed */
         void (*remove)(struct phy_device *phydev);
 
+        /* Returns true if this is a suitable driver for the given
+         * phydev.  If NULL, matching is based on phy_id and
+         * phy_id_mask.
+         */
+        int (*match_phy_device)(struct phy_device *phydev);
+
         /* Handles ethtool queries for hardware time stamping. */
         int (*ts_info)(struct phy_device *phydev, struct ethtool_ts_info *ti);
 
@@ -480,7 +500,9 @@ static inline int phy_write(struct phy_device *phydev, u32 regnum, u16 val)
         return mdiobus_write(phydev->bus, phydev->addr, regnum, val);
 }
 
-struct phy_device* get_phy_device(struct mii_bus *bus, int addr);
+struct phy_device *phy_device_create(struct mii_bus *bus, int addr, int phy_id,
+                bool is_c45, struct phy_c45_device_ids *c45_ids);
+struct phy_device *get_phy_device(struct mii_bus *bus, int addr, bool is_c45);
 int phy_device_register(struct phy_device *phy);
 int phy_init_hw(struct phy_device *phydev);
 struct phy_device * phy_attach(struct net_device *dev,
@@ -511,7 +533,9 @@ int genphy_read_status(struct phy_device *phydev);
 int genphy_suspend(struct phy_device *phydev);
 int genphy_resume(struct phy_device *phydev);
 void phy_driver_unregister(struct phy_driver *drv);
+void phy_drivers_unregister(struct phy_driver *drv, int n);
 int phy_driver_register(struct phy_driver *new_driver);
+int phy_drivers_register(struct phy_driver *new_driver, int n);
 void phy_state_machine(struct work_struct *work);
 void phy_start_machine(struct phy_device *phydev,
                 void (*handler)(struct net_device *));
@@ -532,6 +556,11 @@ int phy_register_fixup_for_uid(u32 phy_uid, u32 phy_uid_mask,
                 int (*run)(struct phy_device *));
 int phy_scan_fixups(struct phy_device *phydev);
 
+int phy_init_eee(struct phy_device *phydev, bool clk_stop_enable);
+int phy_get_eee_err(struct phy_device *phydev);
+int phy_ethtool_set_eee(struct phy_device *phydev, struct ethtool_eee *data);
+int phy_ethtool_get_eee(struct phy_device *phydev, struct ethtool_eee *data);
+
 int __init mdio_bus_init(void);
 void mdio_bus_exit(void);
 
diff --git a/include/linux/pkt_cls.h b/include/linux/pkt_cls.h
index defbde203d0..38fbd4bc20a 100644
--- a/include/linux/pkt_cls.h
+++ b/include/linux/pkt_cls.h
@@ -451,8 +451,9 @@ enum {
 #define TCF_EM_U32              3
 #define TCF_EM_META             4
 #define TCF_EM_TEXT             5
-#define        TCF_EM_VLAN              6
-#define TCF_EM_MAX              6
+#define TCF_EM_VLAN             6
+#define TCF_EM_CANID            7
+#define TCF_EM_MAX              7
 
 enum {
         TCF_EM_PROG_TC
diff --git a/include/linux/rtnetlink.h b/include/linux/rtnetlink.h
index 2c1de8982c8..db71c4ad862 100644
--- a/include/linux/rtnetlink.h
+++ b/include/linux/rtnetlink.h
@@ -612,12 +612,6 @@ struct tcamsg {
 #include <linux/mutex.h>
 #include <linux/netdevice.h>
 
-static __inline__ int rtattr_strcmp(const struct rtattr *rta, const char *str)
-{
-        int len = strlen(str) + 1;
-        return len > rta->rta_len || memcmp(RTA_DATA(rta), str, len);
-}
-
 extern int rtnetlink_send(struct sk_buff *skb, struct net *net, u32 pid, u32 group, int echo);
 extern int rtnl_unicast(struct sk_buff *skb, struct net *net, u32 pid);
 extern void rtnl_notify(struct sk_buff *skb, struct net *net, u32 pid,
@@ -625,124 +619,7 @@ extern void rtnl_notify(struct sk_buff *skb, struct net *net, u32 pid,
 extern void rtnl_set_sk_err(struct net *net, u32 group, int error);
 extern int rtnetlink_put_metrics(struct sk_buff *skb, u32 *metrics);
 extern int rtnl_put_cacheinfo(struct sk_buff *skb, struct dst_entry *dst,
-                              u32 id, u32 ts, u32 tsage, long expires,
-                              u32 error);
-
-extern void __rta_fill(struct sk_buff *skb, int attrtype, int attrlen, const void *data);
-
-#define RTA_PUT(skb, attrtype, attrlen, data) \
-({      if (unlikely(skb_tailroom(skb) < (int)RTA_SPACE(attrlen))) \
-                 goto rtattr_failure; \
-        __rta_fill(skb, attrtype, attrlen, data); }) 
-
-#define RTA_APPEND(skb, attrlen, data) \
-({      if (unlikely(skb_tailroom(skb) < (int)(attrlen))) \
-                goto rtattr_failure; \
-        memcpy(skb_put(skb, attrlen), data, attrlen); })
-
-#define RTA_PUT_NOHDR(skb, attrlen, data) \
-({      RTA_APPEND(skb, RTA_ALIGN(attrlen), data); \
-        memset(skb_tail_pointer(skb) - (RTA_ALIGN(attrlen) - attrlen), 0, \
-               RTA_ALIGN(attrlen) - attrlen); })
-
-#define RTA_PUT_U8(skb, attrtype, value) \
-({      u8 _tmp = (value); \
-        RTA_PUT(skb, attrtype, sizeof(u8), &_tmp); })
-
-#define RTA_PUT_U16(skb, attrtype, value) \
-({      u16 _tmp = (value); \
-        RTA_PUT(skb, attrtype, sizeof(u16), &_tmp); })
-
-#define RTA_PUT_U32(skb, attrtype, value) \
-({      u32 _tmp = (value); \
-        RTA_PUT(skb, attrtype, sizeof(u32), &_tmp); })
-
-#define RTA_PUT_U64(skb, attrtype, value) \
-({      u64 _tmp = (value); \
-        RTA_PUT(skb, attrtype, sizeof(u64), &_tmp); })
-
-#define RTA_PUT_SECS(skb, attrtype, value) \
-        RTA_PUT_U64(skb, attrtype, (value) / HZ)
-
-#define RTA_PUT_MSECS(skb, attrtype, value) \
-        RTA_PUT_U64(skb, attrtype, jiffies_to_msecs(value))
-
-#define RTA_PUT_STRING(skb, attrtype, value) \
-        RTA_PUT(skb, attrtype, strlen(value) + 1, value)
-
-#define RTA_PUT_FLAG(skb, attrtype) \
-        RTA_PUT(skb, attrtype, 0, NULL);
-
-#define RTA_NEST(skb, type) \
-({      struct rtattr *__start = (struct rtattr *)skb_tail_pointer(skb); \
-        RTA_PUT(skb, type, 0, NULL); \
-        __start;  })
-
-#define RTA_NEST_END(skb, start) \
-({      (start)->rta_len = skb_tail_pointer(skb) - (unsigned char *)(start); \
-        (skb)->len; })
-
-#define RTA_NEST_COMPAT(skb, type, attrlen, data) \
-({      struct rtattr *__start = (struct rtattr *)skb_tail_pointer(skb); \
-        RTA_PUT(skb, type, attrlen, data); \
-        RTA_NEST(skb, type); \
-        __start; })
-
-#define RTA_NEST_COMPAT_END(skb, start) \
-({      struct rtattr *__nest = (void *)(start) + NLMSG_ALIGN((start)->rta_len); \
-        (start)->rta_len = skb_tail_pointer(skb) - (unsigned char *)(start); \
-        RTA_NEST_END(skb, __nest); \
-        (skb)->len; })
-
-#define RTA_NEST_CANCEL(skb, start) \
-({      if (start) \
-                skb_trim(skb, (unsigned char *) (start) - (skb)->data); \
-        -1; })
-
-#define RTA_GET_U8(rta) \
-({      if (!rta || RTA_PAYLOAD(rta) < sizeof(u8)) \
-                goto rtattr_failure; \
-        *(u8 *) RTA_DATA(rta); })
-
-#define RTA_GET_U16(rta) \
-({      if (!rta || RTA_PAYLOAD(rta) < sizeof(u16)) \
-                goto rtattr_failure; \
-        *(u16 *) RTA_DATA(rta); })
-
-#define RTA_GET_U32(rta) \
-({      if (!rta || RTA_PAYLOAD(rta) < sizeof(u32)) \
-                goto rtattr_failure; \
-        *(u32 *) RTA_DATA(rta); })
-
-#define RTA_GET_U64(rta) \
-({      u64 _tmp; \
-        if (!rta || RTA_PAYLOAD(rta) < sizeof(u64)) \
-                goto rtattr_failure; \
-        memcpy(&_tmp, RTA_DATA(rta), sizeof(_tmp)); \
-        _tmp; })
-
-#define RTA_GET_FLAG(rta) (!!(rta))
-
-#define RTA_GET_SECS(rta) ((unsigned long) RTA_GET_U64(rta) * HZ)
-#define RTA_GET_MSECS(rta) (msecs_to_jiffies((unsigned long) RTA_GET_U64(rta)))
-                
-static inline struct rtattr *
-__rta_reserve(struct sk_buff *skb, int attrtype, int attrlen)
-{
-        struct rtattr *rta;
-        int size = RTA_LENGTH(attrlen);
-
-        rta = (struct rtattr*)skb_put(skb, RTA_ALIGN(size));
-        rta->rta_type = attrtype;
-        rta->rta_len = size;
-        memset(RTA_DATA(rta) + attrlen, 0, RTA_ALIGN(size) - size);
-        return rta;
-}
-
-#define __RTA_PUT(skb, attrtype, attrlen) \
-({      if (unlikely(skb_tailroom(skb) < (int)RTA_SPACE(attrlen))) \
-                goto rtattr_failure; \
-        __rta_reserve(skb, attrtype, attrlen); })
+                              u32 id, long expires, u32 error);
 
 extern void rtmsg_ifinfo(int type, struct net_device *dev, unsigned change);
 
@@ -794,13 +671,6 @@ extern void __rtnl_unlock(void);
         } \
 } while(0)
 
-static inline u32 rtm_get_table(struct rtattr **rta, u8 table)
-{
-        return RTA_GET_U32(rta[RTA_TABLE-1]);
-rtattr_failure:
-        return table;
-}
-
 extern int ndo_dflt_fdb_dump(struct sk_buff *skb,
                              struct netlink_callback *cb,
                              struct net_device *dev,
diff --git a/include/linux/sock_diag.h b/include/linux/sock_diag.h
index db4bae78bda..6793fac5eab 100644
--- a/include/linux/sock_diag.h
+++ b/include/linux/sock_diag.h
@@ -18,6 +18,7 @@ enum {
         SK_MEMINFO_FWD_ALLOC,
         SK_MEMINFO_WMEM_QUEUED,
         SK_MEMINFO_OPTMEM,
+        SK_MEMINFO_BACKLOG,
 
         SK_MEMINFO_VARS,
 };
diff --git a/include/linux/spi/at86rf230.h b/include/linux/spi/at86rf230.h
new file mode 100644
index 00000000000..b2b1afbb320
--- /dev/null
+++ b/include/linux/spi/at86rf230.h
@@ -0,0 +1,31 @@
+/*
+ * AT86RF230/RF231 driver
+ *
+ * Copyright (C) 2009-2012 Siemens AG
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Written by:
+ * Dmitry Eremin-Solenikov <dmitry.baryshkov@siemens.com>
+ */
+#ifndef AT86RF230_H
+#define AT86RF230_H
+
+struct at86rf230_platform_data {
+        int rstn;
+        int slp_tr;
+        int dig2;
+};
+
+#endif
diff --git a/include/linux/ssb/ssb.h b/include/linux/ssb/ssb.h
index bc14bd738ad..bb674c02f30 100644
--- a/include/linux/ssb/ssb.h
+++ b/include/linux/ssb/ssb.h
@@ -243,6 +243,7 @@ struct ssb_bus_ops {
 #define SSB_DEV_MINI_MACPHY     0x823
 #define SSB_DEV_ARM_1176        0x824
 #define SSB_DEV_ARM_7TDMI       0x825
+#define SSB_DEV_ARM_CM3         0x82A
 
 /* Vendor-ID values */
 #define SSB_VENDOR_BROADCOM     0x4243
diff --git a/include/linux/tcp.h b/include/linux/tcp.h
index 5f359dbfcdc..2de9cf46f9f 100644
--- a/include/linux/tcp.h
+++ b/include/linux/tcp.h
@@ -507,7 +507,7 @@ struct tcp_timewait_sock {
         u32                       tw_ts_recent;
         long                      tw_ts_recent_stamp;
 #ifdef CONFIG_TCP_MD5SIG
-        struct tcp_md5sig_key   *tw_md5_key;
+        struct tcp_md5sig_key     *tw_md5_key;
 #endif
         /* Few sockets in timewait have cookies; in that case, then this
          * object holds a reference to them (tw_cookie_values->kref).
diff --git a/include/linux/usb/usbnet.h b/include/linux/usb/usbnet.h
index 76f439647c4..f87cf622317 100644
--- a/include/linux/usb/usbnet.h
+++ b/include/linux/usb/usbnet.h
@@ -66,9 +66,8 @@ struct usbnet {
 #               define EVENT_STS_SPLIT  3
 #               define EVENT_LINK_RESET 4
 #               define EVENT_RX_PAUSED  5
-#               define EVENT_DEV_WAKING 6
-#               define EVENT_DEV_ASLEEP 7
-#               define EVENT_DEV_OPEN   8
+#               define EVENT_DEV_ASLEEP 6
+#               define EVENT_DEV_OPEN   7
 };
 
 static inline struct usb_driver *driver_of(struct usb_interface *intf)
diff --git a/include/net/af_unix.h b/include/net/af_unix.h
index 2ee33da36a7..b5f8988e428 100644
--- a/include/net/af_unix.h
+++ b/include/net/af_unix.h
@@ -14,10 +14,11 @@ extern struct sock *unix_get_socket(struct file *filp);
 extern struct sock *unix_peer_get(struct sock *);
 
 #define UNIX_HASH_SIZE  256
+#define UNIX_HASH_BITS  8
 
 extern unsigned int unix_tot_inflight;
 extern spinlock_t unix_table_lock;
-extern struct hlist_head unix_socket_table[UNIX_HASH_SIZE + 1];
+extern struct hlist_head unix_socket_table[2 * UNIX_HASH_SIZE];
 
 struct unix_address {
         atomic_t        refcnt;
diff --git a/include/net/arp.h b/include/net/arp.h
index 4a1f3fb562e..4617d984113 100644
--- a/include/net/arp.h
+++ b/include/net/arp.h
@@ -15,24 +15,34 @@ static inline u32 arp_hashfn(u32 key, const struct net_device *dev, u32 hash_rnd
         return val * hash_rnd;
 }
 
-static inline struct neighbour *__ipv4_neigh_lookup(struct net_device *dev, u32 key)
+static inline struct neighbour *__ipv4_neigh_lookup_noref(struct net_device *dev, u32 key)
 {
-        struct neigh_hash_table *nht;
+        struct neigh_hash_table *nht = rcu_dereference_bh(arp_tbl.nht);
         struct neighbour *n;
         u32 hash_val;
 
-        rcu_read_lock_bh();
-        nht = rcu_dereference_bh(arp_tbl.nht);
+        if (dev->flags & (IFF_LOOPBACK | IFF_POINTOPOINT))
+                key = 0;
+
         hash_val = arp_hashfn(key, dev, nht->hash_rnd[0]) >> (32 - nht->hash_shift);
         for (n = rcu_dereference_bh(nht->hash_buckets[hash_val]);
              n != NULL;
              n = rcu_dereference_bh(n->next)) {
-                if (n->dev == dev && *(u32 *)n->primary_key == key) {
-                        if (!atomic_inc_not_zero(&n->refcnt))
-                                n = NULL;
-                        break;
-                }
+                if (n->dev == dev && *(u32 *)n->primary_key == key)
+                        return n;
         }
+
+        return NULL;
+}
+
+static inline struct neighbour *__ipv4_neigh_lookup(struct net_device *dev, u32 key)
+{
+        struct neighbour *n;
+
+        rcu_read_lock_bh();
+        n = __ipv4_neigh_lookup_noref(dev, key);
+        if (n && !atomic_inc_not_zero(&n->refcnt))
+                n = NULL;
         rcu_read_unlock_bh();
 
         return n;
diff --git a/include/net/bluetooth/a2mp.h b/include/net/bluetooth/a2mp.h
new file mode 100644
index 00000000000..6a76e0a0705
--- /dev/null
+++ b/include/net/bluetooth/a2mp.h
@@ -0,0 +1,126 @@
+/*
+   Copyright (c) 2010,2011 Code Aurora Forum.  All rights reserved.
+   Copyright (c) 2011,2012 Intel Corp.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License version 2 and
+   only version 2 as published by the Free Software Foundation.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+*/
+
+#ifndef __A2MP_H
+#define __A2MP_H
+
+#include <net/bluetooth/l2cap.h>
+
+#define A2MP_FEAT_EXT   0x8000
+
+struct amp_mgr {
+        struct l2cap_conn       *l2cap_conn;
+        struct l2cap_chan       *a2mp_chan;
+        struct kref             kref;
+        __u8                    ident;
+        __u8                    handle;
+        unsigned long           flags;
+};
+
+struct a2mp_cmd {
+        __u8    code;
+        __u8    ident;
+        __le16  len;
+        __u8    data[0];
+} __packed;
+
+/* A2MP command codes */
+#define A2MP_COMMAND_REJ         0x01
+struct a2mp_cmd_rej {
+        __le16  reason;
+        __u8    data[0];
+} __packed;
+
+#define A2MP_DISCOVER_REQ        0x02
+struct a2mp_discov_req {
+        __le16  mtu;
+        __le16  ext_feat;
+} __packed;
+
+struct a2mp_cl {
+        __u8    id;
+        __u8    type;
+        __u8    status;
+} __packed;
+
+#define A2MP_DISCOVER_RSP        0x03
+struct a2mp_discov_rsp {
+        __le16     mtu;
+        __le16     ext_feat;
+        struct a2mp_cl cl[0];
+} __packed;
+
+#define A2MP_CHANGE_NOTIFY       0x04
+#define A2MP_CHANGE_RSP          0x05
+
+#define A2MP_GETINFO_REQ         0x06
+struct a2mp_info_req {
+        __u8       id;
+} __packed;
+
+#define A2MP_GETINFO_RSP         0x07
+struct a2mp_info_rsp {
+        __u8    id;
+        __u8    status;
+        __le32  total_bw;
+        __le32  max_bw;
+        __le32  min_latency;
+        __le16  pal_cap;
+        __le16  assoc_size;
+} __packed;
+
+#define A2MP_GETAMPASSOC_REQ     0x08
+struct a2mp_amp_assoc_req {
+        __u8    id;
+} __packed;
+
+#define A2MP_GETAMPASSOC_RSP     0x09
+struct a2mp_amp_assoc_rsp {
+        __u8    id;
+        __u8    status;
+        __u8    amp_assoc[0];
+} __packed;
+
+#define A2MP_CREATEPHYSLINK_REQ  0x0A
+#define A2MP_DISCONNPHYSLINK_REQ 0x0C
+struct a2mp_physlink_req {
+        __u8    local_id;
+        __u8    remote_id;
+        __u8    amp_assoc[0];
+} __packed;
+
+#define A2MP_CREATEPHYSLINK_RSP  0x0B
+#define A2MP_DISCONNPHYSLINK_RSP 0x0D
+struct a2mp_physlink_rsp {
+        __u8    local_id;
+        __u8    remote_id;
+        __u8    status;
+} __packed;
+
+/* A2MP response status */
+#define A2MP_STATUS_SUCCESS                     0x00
+#define A2MP_STATUS_INVALID_CTRL_ID             0x01
+#define A2MP_STATUS_UNABLE_START_LINK_CREATION  0x02
+#define A2MP_STATUS_NO_PHYSICAL_LINK_EXISTS     0x02
+#define A2MP_STATUS_COLLISION_OCCURED           0x03
+#define A2MP_STATUS_DISCONN_REQ_RECVD           0x04
+#define A2MP_STATUS_PHYS_LINK_EXISTS            0x05
+#define A2MP_STATUS_SECURITY_VIOLATION          0x06
+
+void amp_mgr_get(struct amp_mgr *mgr);
+int amp_mgr_put(struct amp_mgr *mgr);
+struct l2cap_chan *a2mp_channel_create(struct l2cap_conn *conn,
+                                       struct sk_buff *skb);
+
+#endif /* __A2MP_H */
diff --git a/include/net/bluetooth/bluetooth.h b/include/net/bluetooth/bluetooth.h
index 961669b648f..565d4bee1e4 100644
--- a/include/net/bluetooth/bluetooth.h
+++ b/include/net/bluetooth/bluetooth.h
@@ -1,4 +1,4 @@
-/* 
+/*
    BlueZ - Bluetooth protocol stack for Linux
    Copyright (C) 2000-2001 Qualcomm Incorporated
 
@@ -12,22 +12,19 @@
    OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.
    IN NO EVENT SHALL THE COPYRIGHT HOLDER(S) AND AUTHOR(S) BE LIABLE FOR ANY
-   CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES 
-   WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN 
-   ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF 
+   CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES
+   WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+   ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-   ALL LIABILITY, INCLUDING LIABILITY FOR INFRINGEMENT OF ANY PATENTS, 
-   COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS, RELATING TO USE OF THIS 
+   ALL LIABILITY, INCLUDING LIABILITY FOR INFRINGEMENT OF ANY PATENTS,
+   COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS, RELATING TO USE OF THIS
    SOFTWARE IS DISCLAIMED.
 */
 
 #ifndef __BLUETOOTH_H
 #define __BLUETOOTH_H
 
-#include <asm/types.h>
-#include <asm/byteorder.h>
-#include <linux/list.h>
 #include <linux/poll.h>
 #include <net/sock.h>
 
@@ -168,8 +165,8 @@ typedef struct {
 #define BDADDR_LE_PUBLIC        0x01
 #define BDADDR_LE_RANDOM        0x02
 
-#define BDADDR_ANY   (&(bdaddr_t) {{0, 0, 0, 0, 0, 0}})
-#define BDADDR_LOCAL (&(bdaddr_t) {{0, 0, 0, 0xff, 0xff, 0xff}})
+#define BDADDR_ANY   (&(bdaddr_t) {{0, 0, 0, 0, 0, 0} })
+#define BDADDR_LOCAL (&(bdaddr_t) {{0, 0, 0, 0xff, 0xff, 0xff} })
 
 /* Copy, swap, convert BD Address */
 static inline int bacmp(bdaddr_t *ba1, bdaddr_t *ba2)
@@ -215,7 +212,7 @@ int  bt_sock_recvmsg(struct kiocb *iocb, struct socket *sock,
                                 struct msghdr *msg, size_t len, int flags);
 int  bt_sock_stream_recvmsg(struct kiocb *iocb, struct socket *sock,
                         struct msghdr *msg, size_t len, int flags);
-uint bt_sock_poll(struct file * file, struct socket *sock, poll_table *wait);
+uint bt_sock_poll(struct file *file, struct socket *sock, poll_table *wait);
 int  bt_sock_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg);
 int  bt_sock_wait_state(struct sock *sk, int state, unsigned long timeo);
 
@@ -225,12 +222,12 @@ struct sock *bt_accept_dequeue(struct sock *parent, struct socket *newsock);
 
 /* Skb helpers */
 struct l2cap_ctrl {
-        unsigned int    sframe  : 1,
-                        poll    : 1,
-                        final   : 1,
-                        fcs     : 1,
-                        sar     : 2,
-                        super   : 2;
+        unsigned int    sframe:1,
+                        poll:1,
+                        final:1,
+                        fcs:1,
+                        sar:2,
+                        super:2;
         __u16           reqseq;
         __u16           txseq;
         __u8            retries;
@@ -249,7 +246,8 @@ static inline struct sk_buff *bt_skb_alloc(unsigned int len, gfp_t how)
 {
         struct sk_buff *skb;
 
-        if ((skb = alloc_skb(len + BT_SKB_RESERVE, how))) {
+        skb = alloc_skb(len + BT_SKB_RESERVE, how);
+        if (skb) {
                 skb_reserve(skb, BT_SKB_RESERVE);
                 bt_cb(skb)->incoming  = 0;
         }
@@ -261,7 +259,8 @@ static inline struct sk_buff *bt_skb_send_alloc(struct sock *sk,
 {
         struct sk_buff *skb;
 
-        if ((skb = sock_alloc_send_skb(sk, len + BT_SKB_RESERVE, nb, err))) {
+        skb = sock_alloc_send_skb(sk, len + BT_SKB_RESERVE, nb, err);
+        if (skb) {
                 skb_reserve(skb, BT_SKB_RESERVE);
                 bt_cb(skb)->incoming  = 0;
         }
diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h
index 3def64ba77f..2a6b0b8b712 100644
--- a/include/net/bluetooth/hci.h
+++ b/include/net/bluetooth/hci.h
@@ -30,6 +30,9 @@
 #define HCI_MAX_EVENT_SIZE      260
 #define HCI_MAX_FRAME_SIZE      (HCI_MAX_ACL_SIZE + 4)
 
+#define HCI_LINK_KEY_SIZE       16
+#define HCI_AMP_LINK_KEY_SIZE   (2 * HCI_LINK_KEY_SIZE)
+
 /* HCI dev events */
 #define HCI_DEV_REG                     1
 #define HCI_DEV_UNREG                   2
@@ -56,9 +59,12 @@
 #define HCI_BREDR       0x00
 #define HCI_AMP         0x01
 
+/* First BR/EDR Controller shall have ID = 0 */
+#define HCI_BREDR_ID    0
+
 /* HCI device quirks */
 enum {
-        HCI_QUIRK_NO_RESET,
+        HCI_QUIRK_RESET_ON_CLOSE,
         HCI_QUIRK_RAW_DEVICE,
         HCI_QUIRK_FIXUP_BUFFER_SIZE
 };
@@ -133,10 +139,8 @@ enum {
 #define HCIINQUIRY      _IOR('H', 240, int)
 
 /* HCI timeouts */
-#define HCI_CONNECT_TIMEOUT     (40000) /* 40 seconds */
 #define HCI_DISCONN_TIMEOUT     (2000)  /* 2 seconds */
 #define HCI_PAIRING_TIMEOUT     (60000) /* 60 seconds */
-#define HCI_IDLE_TIMEOUT        (6000)  /* 6 seconds */
 #define HCI_INIT_TIMEOUT        (10000) /* 10 seconds */
 #define HCI_CMD_TIMEOUT         (1000)  /* 1 seconds */
 #define HCI_ACL_TX_TIMEOUT      (45000) /* 45 seconds */
@@ -371,7 +375,7 @@ struct hci_cp_reject_conn_req {
 #define HCI_OP_LINK_KEY_REPLY           0x040b
 struct hci_cp_link_key_reply {
         bdaddr_t bdaddr;
-        __u8     link_key[16];
+        __u8     link_key[HCI_LINK_KEY_SIZE];
 } __packed;
 
 #define HCI_OP_LINK_KEY_NEG_REPLY       0x040c
@@ -523,6 +527,28 @@ struct hci_cp_io_capability_neg_reply {
         __u8     reason;
 } __packed;
 
+#define HCI_OP_CREATE_PHY_LINK          0x0435
+struct hci_cp_create_phy_link {
+        __u8     phy_handle;
+        __u8     key_len;
+        __u8     key_type;
+        __u8     key[HCI_AMP_LINK_KEY_SIZE];
+} __packed;
+
+#define HCI_OP_ACCEPT_PHY_LINK          0x0436
+struct hci_cp_accept_phy_link {
+        __u8     phy_handle;
+        __u8     key_len;
+        __u8     key_type;
+        __u8     key[HCI_AMP_LINK_KEY_SIZE];
+} __packed;
+
+#define HCI_OP_DISCONN_PHY_LINK 0x0437
+struct hci_cp_disconn_phy_link {
+        __u8     phy_handle;
+        __u8     reason;
+} __packed;
+
 #define HCI_OP_SNIFF_MODE               0x0803
 struct hci_cp_sniff_mode {
         __le16   handle;
@@ -818,6 +844,31 @@ struct hci_rp_read_local_amp_info {
         __le32   be_flush_to;
 } __packed;
 
+#define HCI_OP_READ_LOCAL_AMP_ASSOC     0x140a
+struct hci_cp_read_local_amp_assoc {
+        __u8     phy_handle;
+        __le16   len_so_far;
+        __le16   max_len;
+} __packed;
+struct hci_rp_read_local_amp_assoc {
+        __u8     status;
+        __u8     phy_handle;
+        __le16   rem_len;
+        __u8     frag[0];
+} __packed;
+
+#define HCI_OP_WRITE_REMOTE_AMP_ASSOC   0x140b
+struct hci_cp_write_remote_amp_assoc {
+        __u8     phy_handle;
+        __le16   len_so_far;
+        __le16   rem_len;
+        __u8     frag[0];
+} __packed;
+struct hci_rp_write_remote_amp_assoc {
+        __u8     status;
+        __u8     phy_handle;
+} __packed;
+
 #define HCI_OP_LE_SET_EVENT_MASK        0x2001
 struct hci_cp_le_set_event_mask {
         __u8     mask[8];
@@ -1048,7 +1099,7 @@ struct hci_ev_link_key_req {
 #define HCI_EV_LINK_KEY_NOTIFY          0x18
 struct hci_ev_link_key_notify {
         bdaddr_t bdaddr;
-        __u8     link_key[16];
+        __u8     link_key[HCI_LINK_KEY_SIZE];
         __u8     key_type;
 } __packed;
 
@@ -1196,6 +1247,39 @@ struct hci_ev_le_meta {
         __u8     subevent;
 } __packed;
 
+#define HCI_EV_PHY_LINK_COMPLETE        0x40
+struct hci_ev_phy_link_complete {
+        __u8     status;
+        __u8     phy_handle;
+} __packed;
+
+#define HCI_EV_CHANNEL_SELECTED         0x41
+struct hci_ev_channel_selected {
+        __u8     phy_handle;
+} __packed;
+
+#define HCI_EV_DISCONN_PHY_LINK_COMPLETE        0x42
+struct hci_ev_disconn_phy_link_complete {
+        __u8     status;
+        __u8     phy_handle;
+        __u8     reason;
+} __packed;
+
+#define HCI_EV_LOGICAL_LINK_COMPLETE            0x45
+struct hci_ev_logical_link_complete {
+        __u8     status;
+        __le16   handle;
+        __u8     phy_handle;
+        __u8     flow_spec_id;
+} __packed;
+
+#define HCI_EV_DISCONN_LOGICAL_LINK_COMPLETE    0x46
+struct hci_ev_disconn_logical_link_complete {
+        __u8     status;
+        __le16   handle;
+        __u8     reason;
+} __packed;
+
 #define HCI_EV_NUM_COMP_BLOCKS          0x48
 struct hci_comp_blocks_info {
         __le16   handle;
@@ -1296,7 +1380,6 @@ struct hci_sco_hdr {
         __u8    dlen;
 } __packed;
 
-#include <linux/skbuff.h>
 static inline struct hci_event_hdr *hci_event_hdr(const struct sk_buff *skb)
 {
         return (struct hci_event_hdr *) skb->data;
@@ -1313,12 +1396,12 @@ static inline struct hci_sco_hdr *hci_sco_hdr(const struct sk_buff *skb)
 }
 
 /* Command opcode pack/unpack */
-#define hci_opcode_pack(ogf, ocf)       (__u16) ((ocf & 0x03ff)|(ogf << 10))
+#define hci_opcode_pack(ogf, ocf)       ((__u16) ((ocf & 0x03ff)|(ogf << 10)))
 #define hci_opcode_ogf(op)              (op >> 10)
 #define hci_opcode_ocf(op)              (op & 0x03ff)
 
 /* ACL handle and flags pack/unpack */
-#define hci_handle_pack(h, f)   (__u16) ((h & 0x0fff)|(f << 12))
+#define hci_handle_pack(h, f)   ((__u16) ((h & 0x0fff)|(f << 12)))
 #define hci_handle(h)           (h & 0x0fff)
 #define hci_flags(h)            (h >> 12)
 
diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h
index 9fc7728f94e..20fd57367dd 100644
--- a/include/net/bluetooth/hci_core.h
+++ b/include/net/bluetooth/hci_core.h
@@ -25,7 +25,6 @@
 #ifndef __HCI_CORE_H
 #define __HCI_CORE_H
 
-#include <linux/interrupt.h>
 #include <net/bluetooth/hci.h>
 
 /* HCI priority */
@@ -65,7 +64,7 @@ struct discovery_state {
                 DISCOVERY_RESOLVING,
                 DISCOVERY_STOPPING,
         } state;
-        struct list_head        all;            /* All devices found during inquiry */
+        struct list_head        all;    /* All devices found during inquiry */
         struct list_head        unknown;        /* Name state not known */
         struct list_head        resolve;        /* Name needs to be resolved */
         __u32                   timestamp;
@@ -105,7 +104,7 @@ struct link_key {
         struct list_head list;
         bdaddr_t bdaddr;
         u8 type;
-        u8 val[16];
+        u8 val[HCI_LINK_KEY_SIZE];
         u8 pin_len;
 };
 
@@ -333,6 +332,7 @@ struct hci_conn {
         void            *l2cap_data;
         void            *sco_data;
         void            *smp_conn;
+        struct amp_mgr  *amp_mgr;
 
         struct hci_conn *link;
 
@@ -360,7 +360,8 @@ extern int l2cap_connect_cfm(struct hci_conn *hcon, u8 status);
 extern int l2cap_disconn_ind(struct hci_conn *hcon);
 extern int l2cap_disconn_cfm(struct hci_conn *hcon, u8 reason);
 extern int l2cap_security_cfm(struct hci_conn *hcon, u8 status, u8 encrypt);
-extern int l2cap_recv_acldata(struct hci_conn *hcon, struct sk_buff *skb, u16 flags);
+extern int l2cap_recv_acldata(struct hci_conn *hcon, struct sk_buff *skb,
+                              u16 flags);
 
 extern int sco_connect_ind(struct hci_dev *hdev, bdaddr_t *bdaddr);
 extern int sco_connect_cfm(struct hci_conn *hcon, __u8 status);
@@ -429,8 +430,8 @@ enum {
 static inline bool hci_conn_ssp_enabled(struct hci_conn *conn)
 {
         struct hci_dev *hdev = conn->hdev;
-        return (test_bit(HCI_SSP_ENABLED, &hdev->dev_flags) &&
-                                test_bit(HCI_CONN_SSP_ENABLED, &conn->flags));
+        return test_bit(HCI_SSP_ENABLED, &hdev->dev_flags) &&
+               test_bit(HCI_CONN_SSP_ENABLED, &conn->flags);
 }
 
 static inline void hci_conn_hash_init(struct hci_dev *hdev)
@@ -640,6 +641,19 @@ static inline void hci_set_drvdata(struct hci_dev *hdev, void *data)
         dev_set_drvdata(&hdev->dev, data);
 }
 
+/* hci_dev_list shall be locked */
+static inline uint8_t __hci_num_ctrl(void)
+{
+        uint8_t count = 0;
+        struct list_head *p;
+
+        list_for_each(p, &hci_dev_list) {
+                count++;
+        }
+
+        return count;
+}
+
 struct hci_dev *hci_dev_get(int index);
 struct hci_dev *hci_get_route(bdaddr_t *src, bdaddr_t *dst);
 
@@ -661,7 +675,8 @@ int hci_get_conn_info(struct hci_dev *hdev, void __user *arg);
 int hci_get_auth_info(struct hci_dev *hdev, void __user *arg);
 int hci_inquiry(void __user *arg);
 
-struct bdaddr_list *hci_blacklist_lookup(struct hci_dev *hdev, bdaddr_t *bdaddr);
+struct bdaddr_list *hci_blacklist_lookup(struct hci_dev *hdev,
+                                         bdaddr_t *bdaddr);
 int hci_blacklist_clear(struct hci_dev *hdev);
 int hci_blacklist_add(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 type);
 int hci_blacklist_del(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 type);
diff --git a/include/net/bluetooth/l2cap.h b/include/net/bluetooth/l2cap.h
index 1c7d1cd5e67..d80e3f0691b 100644
--- a/include/net/bluetooth/l2cap.h
+++ b/include/net/bluetooth/l2cap.h
@@ -40,11 +40,11 @@
 #define L2CAP_DEFAULT_MONITOR_TO        12000   /* 12 seconds */
 #define L2CAP_DEFAULT_MAX_PDU_SIZE      1009    /* Sized for 3-DH5 packet */
 #define L2CAP_DEFAULT_ACK_TO            200
-#define L2CAP_LE_DEFAULT_MTU            23
 #define L2CAP_DEFAULT_MAX_SDU_SIZE      0xFFFF
 #define L2CAP_DEFAULT_SDU_ITIME         0xFFFFFFFF
 #define L2CAP_DEFAULT_ACC_LAT           0xFFFFFFFF
 #define L2CAP_BREDR_MAX_PAYLOAD         1019    /* 3-DH5 packet */
+#define L2CAP_LE_MIN_MTU                23
 
 #define L2CAP_DISC_TIMEOUT              msecs_to_jiffies(100)
 #define L2CAP_DISC_REJ_TIMEOUT          msecs_to_jiffies(5000)
@@ -52,6 +52,8 @@
 #define L2CAP_CONN_TIMEOUT              msecs_to_jiffies(40000)
 #define L2CAP_INFO_TIMEOUT              msecs_to_jiffies(4000)
 
+#define L2CAP_A2MP_DEFAULT_MTU          670
+
 /* L2CAP socket address */
 struct sockaddr_l2 {
         sa_family_t     l2_family;
@@ -229,9 +231,14 @@ struct l2cap_conn_rsp {
         __le16     status;
 } __packed;
 
+/* protocol/service multiplexer (PSM) */
+#define L2CAP_PSM_SDP           0x0001
+#define L2CAP_PSM_RFCOMM        0x0003
+
 /* channel indentifier */
 #define L2CAP_CID_SIGNALING     0x0001
 #define L2CAP_CID_CONN_LESS     0x0002
+#define L2CAP_CID_A2MP          0x0003
 #define L2CAP_CID_LE_DATA       0x0004
 #define L2CAP_CID_LE_SIGNALING  0x0005
 #define L2CAP_CID_SMP           0x0006
@@ -271,6 +278,9 @@ struct l2cap_conf_rsp {
 #define L2CAP_CONF_PENDING      0x0004
 #define L2CAP_CONF_EFS_REJECT   0x0005
 
+/* configuration req/rsp continuation flag */
+#define L2CAP_CONF_FLAG_CONTINUATION    0x0001
+
 struct l2cap_conf_opt {
         __u8       type;
         __u8       len;
@@ -419,11 +429,6 @@ struct l2cap_seq_list {
 #define L2CAP_SEQ_LIST_CLEAR    0xFFFF
 #define L2CAP_SEQ_LIST_TAIL     0x8000
 
-struct srej_list {
-        __u16   tx_seq;
-        struct list_head list;
-};
-
 struct l2cap_chan {
         struct sock *sk;
 
@@ -475,14 +480,12 @@ struct l2cap_chan {
         __u16           expected_ack_seq;
         __u16           expected_tx_seq;
         __u16           buffer_seq;
-        __u16           buffer_seq_srej;
         __u16           srej_save_reqseq;
         __u16           last_acked_seq;
         __u16           frames_sent;
         __u16           unacked_frames;
         __u8            retry_count;
         __u16           srej_queue_next;
-        __u8            num_acked;
         __u16           sdu_len;
         struct sk_buff  *sdu;
         struct sk_buff  *sdu_last_frag;
@@ -515,7 +518,6 @@ struct l2cap_chan {
         struct sk_buff_head     srej_q;
         struct l2cap_seq_list   srej_list;
         struct l2cap_seq_list   retrans_list;
-        struct list_head        srej_l;
 
         struct list_head        list;
         struct list_head        global_l;
@@ -528,10 +530,14 @@ struct l2cap_chan {
 struct l2cap_ops {
         char                    *name;
 
-        struct l2cap_chan       *(*new_connection) (void *data);
-        int                     (*recv) (void *data, struct sk_buff *skb);
-        void                    (*close) (void *data);
-        void                    (*state_change) (void *data, int state);
+        struct l2cap_chan       *(*new_connection) (struct l2cap_chan *chan);
+        int                     (*recv) (struct l2cap_chan * chan,
+                                         struct sk_buff *skb);
+        void                    (*teardown) (struct l2cap_chan *chan, int err);
+        void                    (*close) (struct l2cap_chan *chan);
+        void                    (*state_change) (struct l2cap_chan *chan,
+                                                 int state);
+        void                    (*ready) (struct l2cap_chan *chan);
         struct sk_buff          *(*alloc_skb) (struct l2cap_chan *chan,
                                                unsigned long len, int nb);
 };
@@ -575,6 +581,7 @@ struct l2cap_conn {
 #define L2CAP_CHAN_RAW                  1
 #define L2CAP_CHAN_CONN_LESS            2
 #define L2CAP_CHAN_CONN_ORIENTED        3
+#define L2CAP_CHAN_CONN_FIX_A2MP        4
 
 /* ----- L2CAP socket info ----- */
 #define l2cap_pi(sk) ((struct l2cap_pinfo *) sk)
@@ -597,6 +604,7 @@ enum {
         CONF_EWS_RECV,
         CONF_LOC_CONF_PEND,
         CONF_REM_CONF_PEND,
+        CONF_NOT_COMPLETE,
 };
 
 #define L2CAP_CONF_MAX_CONF_REQ 2
@@ -713,11 +721,7 @@ static inline bool l2cap_clear_timer(struct l2cap_chan *chan,
 
 #define __set_chan_timer(c, t) l2cap_set_timer(c, &c->chan_timer, (t))
 #define __clear_chan_timer(c) l2cap_clear_timer(c, &c->chan_timer)
-#define __set_retrans_timer(c) l2cap_set_timer(c, &c->retrans_timer, \
-                msecs_to_jiffies(L2CAP_DEFAULT_RETRANS_TO));
 #define __clear_retrans_timer(c) l2cap_clear_timer(c, &c->retrans_timer)
-#define __set_monitor_timer(c) l2cap_set_timer(c, &c->monitor_timer, \
-                msecs_to_jiffies(L2CAP_DEFAULT_MONITOR_TO));
 #define __clear_monitor_timer(c) l2cap_clear_timer(c, &c->monitor_timer)
 #define __set_ack_timer(c) l2cap_set_timer(c, &chan->ack_timer, \
                 msecs_to_jiffies(L2CAP_DEFAULT_ACK_TO));
@@ -736,173 +740,17 @@ static inline __u16 __next_seq(struct l2cap_chan *chan, __u16 seq)
         return (seq + 1) % (chan->tx_win_max + 1);
 }
 
-static inline int l2cap_tx_window_full(struct l2cap_chan *ch)
-{
-        int sub;
-
-        sub = (ch->next_tx_seq - ch->expected_ack_seq) % 64;
-
-        if (sub < 0)
-                sub += 64;
-
-        return sub == ch->remote_tx_win;
-}
-
-static inline __u16 __get_reqseq(struct l2cap_chan *chan, __u32 ctrl)
-{
-        if (test_bit(FLAG_EXT_CTRL, &chan->flags))
-                return (ctrl & L2CAP_EXT_CTRL_REQSEQ) >>
-                                                L2CAP_EXT_CTRL_REQSEQ_SHIFT;
-        else
-                return (ctrl & L2CAP_CTRL_REQSEQ) >> L2CAP_CTRL_REQSEQ_SHIFT;
-}
-
-static inline __u32 __set_reqseq(struct l2cap_chan *chan, __u32 reqseq)
+static inline struct l2cap_chan *l2cap_chan_no_new_connection(struct l2cap_chan *chan)
 {
-        if (test_bit(FLAG_EXT_CTRL, &chan->flags))
-                return (reqseq << L2CAP_EXT_CTRL_REQSEQ_SHIFT) &
-                                                        L2CAP_EXT_CTRL_REQSEQ;
-        else
-                return (reqseq << L2CAP_CTRL_REQSEQ_SHIFT) & L2CAP_CTRL_REQSEQ;
+        return NULL;
 }
 
-static inline __u16 __get_txseq(struct l2cap_chan *chan, __u32 ctrl)
+static inline void l2cap_chan_no_teardown(struct l2cap_chan *chan, int err)
 {
-        if (test_bit(FLAG_EXT_CTRL, &chan->flags))
-                return (ctrl & L2CAP_EXT_CTRL_TXSEQ) >>
-                                                L2CAP_EXT_CTRL_TXSEQ_SHIFT;
-        else
-                return (ctrl & L2CAP_CTRL_TXSEQ) >> L2CAP_CTRL_TXSEQ_SHIFT;
 }
 
-static inline __u32 __set_txseq(struct l2cap_chan *chan, __u32 txseq)
+static inline void l2cap_chan_no_ready(struct l2cap_chan *chan)
 {
-        if (test_bit(FLAG_EXT_CTRL, &chan->flags))
-                return (txseq << L2CAP_EXT_CTRL_TXSEQ_SHIFT) &
-                                                        L2CAP_EXT_CTRL_TXSEQ;
-        else
-                return (txseq << L2CAP_CTRL_TXSEQ_SHIFT) & L2CAP_CTRL_TXSEQ;
-}
-
-static inline bool __is_sframe(struct l2cap_chan *chan, __u32 ctrl)
-{
-        if (test_bit(FLAG_EXT_CTRL, &chan->flags))
-                return ctrl & L2CAP_EXT_CTRL_FRAME_TYPE;
-        else
-                return ctrl & L2CAP_CTRL_FRAME_TYPE;
-}
-
-static inline __u32 __set_sframe(struct l2cap_chan *chan)
-{
-        if (test_bit(FLAG_EXT_CTRL, &chan->flags))
-                return L2CAP_EXT_CTRL_FRAME_TYPE;
-        else
-                return L2CAP_CTRL_FRAME_TYPE;
-}
-
-static inline __u8 __get_ctrl_sar(struct l2cap_chan *chan, __u32 ctrl)
-{
-        if (test_bit(FLAG_EXT_CTRL, &chan->flags))
-                return (ctrl & L2CAP_EXT_CTRL_SAR) >> L2CAP_EXT_CTRL_SAR_SHIFT;
-        else
-                return (ctrl & L2CAP_CTRL_SAR) >> L2CAP_CTRL_SAR_SHIFT;
-}
-
-static inline __u32 __set_ctrl_sar(struct l2cap_chan *chan, __u32 sar)
-{
-        if (test_bit(FLAG_EXT_CTRL, &chan->flags))
-                return (sar << L2CAP_EXT_CTRL_SAR_SHIFT) & L2CAP_EXT_CTRL_SAR;
-        else
-                return (sar << L2CAP_CTRL_SAR_SHIFT) & L2CAP_CTRL_SAR;
-}
-
-static inline bool __is_sar_start(struct l2cap_chan *chan, __u32 ctrl)
-{
-        return __get_ctrl_sar(chan, ctrl) == L2CAP_SAR_START;
-}
-
-static inline __u32 __get_sar_mask(struct l2cap_chan *chan)
-{
-        if (test_bit(FLAG_EXT_CTRL, &chan->flags))
-                return L2CAP_EXT_CTRL_SAR;
-        else
-                return L2CAP_CTRL_SAR;
-}
-
-static inline __u8 __get_ctrl_super(struct l2cap_chan *chan, __u32 ctrl)
-{
-        if (test_bit(FLAG_EXT_CTRL, &chan->flags))
-                return (ctrl & L2CAP_EXT_CTRL_SUPERVISE) >>
-                                                L2CAP_EXT_CTRL_SUPER_SHIFT;
-        else
-                return (ctrl & L2CAP_CTRL_SUPERVISE) >> L2CAP_CTRL_SUPER_SHIFT;
-}
-
-static inline __u32 __set_ctrl_super(struct l2cap_chan *chan, __u32 super)
-{
-        if (test_bit(FLAG_EXT_CTRL, &chan->flags))
-                return (super << L2CAP_EXT_CTRL_SUPER_SHIFT) &
-                                                L2CAP_EXT_CTRL_SUPERVISE;
-        else
-                return (super << L2CAP_CTRL_SUPER_SHIFT) &
-                                                        L2CAP_CTRL_SUPERVISE;
-}
-
-static inline __u32 __set_ctrl_final(struct l2cap_chan *chan)
-{
-        if (test_bit(FLAG_EXT_CTRL, &chan->flags))
-                return L2CAP_EXT_CTRL_FINAL;
-        else
-                return L2CAP_CTRL_FINAL;
-}
-
-static inline bool __is_ctrl_final(struct l2cap_chan *chan, __u32 ctrl)
-{
-        if (test_bit(FLAG_EXT_CTRL, &chan->flags))
-                return ctrl & L2CAP_EXT_CTRL_FINAL;
-        else
-                return ctrl & L2CAP_CTRL_FINAL;
-}
-
-static inline __u32 __set_ctrl_poll(struct l2cap_chan *chan)
-{
-        if (test_bit(FLAG_EXT_CTRL, &chan->flags))
-                return L2CAP_EXT_CTRL_POLL;
-        else
-                return L2CAP_CTRL_POLL;
-}
-
-static inline bool __is_ctrl_poll(struct l2cap_chan *chan, __u32 ctrl)
-{
-        if (test_bit(FLAG_EXT_CTRL, &chan->flags))
-                return ctrl & L2CAP_EXT_CTRL_POLL;
-        else
-                return ctrl & L2CAP_CTRL_POLL;
-}
-
-static inline __u32 __get_control(struct l2cap_chan *chan, void *p)
-{
-        if (test_bit(FLAG_EXT_CTRL, &chan->flags))
-                return get_unaligned_le32(p);
-        else
-                return get_unaligned_le16(p);
-}
-
-static inline void __put_control(struct l2cap_chan *chan, __u32 control,
-                                                                void *p)
-{
-        if (test_bit(FLAG_EXT_CTRL, &chan->flags))
-                return put_unaligned_le32(control, p);
-        else
-                return put_unaligned_le16(control, p);
-}
-
-static inline __u8 __ctrl_size(struct l2cap_chan *chan)
-{
-        if (test_bit(FLAG_EXT_CTRL, &chan->flags))
-                return L2CAP_EXT_HDR_SIZE - L2CAP_HDR_SIZE;
-        else
-                return L2CAP_ENH_HDR_SIZE - L2CAP_HDR_SIZE;
 }
 
 extern bool disable_ertm;
@@ -926,5 +774,8 @@ int l2cap_chan_send(struct l2cap_chan *chan, struct msghdr *msg, size_t len,
 void l2cap_chan_busy(struct l2cap_chan *chan, int busy);
 int l2cap_chan_check_security(struct l2cap_chan *chan);
 void l2cap_chan_set_defaults(struct l2cap_chan *chan);
+int l2cap_ertm_init(struct l2cap_chan *chan);
+void l2cap_chan_add(struct l2cap_conn *conn, struct l2cap_chan *chan);
+void l2cap_chan_del(struct l2cap_chan *chan, int err);
 
 #endif /* __L2CAP_H */
diff --git a/include/net/caif/caif_hsi.h b/include/net/caif/caif_hsi.h
index 439dadc8102..bcb9cc3ce98 100644
--- a/include/net/caif/caif_hsi.h
+++ b/include/net/caif/caif_hsi.h
@@ -93,25 +93,25 @@ struct cfhsi_desc {
 #endif
 
 /* Structure implemented by the CAIF HSI driver. */
-struct cfhsi_drv {
-        void (*tx_done_cb) (struct cfhsi_drv *drv);
-        void (*rx_done_cb) (struct cfhsi_drv *drv);
-        void (*wake_up_cb) (struct cfhsi_drv *drv);
-        void (*wake_down_cb) (struct cfhsi_drv *drv);
+struct cfhsi_cb_ops {
+        void (*tx_done_cb) (struct cfhsi_cb_ops *drv);
+        void (*rx_done_cb) (struct cfhsi_cb_ops *drv);
+        void (*wake_up_cb) (struct cfhsi_cb_ops *drv);
+        void (*wake_down_cb) (struct cfhsi_cb_ops *drv);
 };
 
 /* Structure implemented by HSI device. */
-struct cfhsi_dev {
-        int (*cfhsi_up) (struct cfhsi_dev *dev);
-        int (*cfhsi_down) (struct cfhsi_dev *dev);
-        int (*cfhsi_tx) (u8 *ptr, int len, struct cfhsi_dev *dev);
-        int (*cfhsi_rx) (u8 *ptr, int len, struct cfhsi_dev *dev);
-        int (*cfhsi_wake_up) (struct cfhsi_dev *dev);
-        int (*cfhsi_wake_down) (struct cfhsi_dev *dev);
-        int (*cfhsi_get_peer_wake) (struct cfhsi_dev *dev, bool *status);
-        int (*cfhsi_fifo_occupancy)(struct cfhsi_dev *dev, size_t *occupancy);
-        int (*cfhsi_rx_cancel)(struct cfhsi_dev *dev);
-        struct cfhsi_drv *drv;
+struct cfhsi_ops {
+        int (*cfhsi_up) (struct cfhsi_ops *dev);
+        int (*cfhsi_down) (struct cfhsi_ops *dev);
+        int (*cfhsi_tx) (u8 *ptr, int len, struct cfhsi_ops *dev);
+        int (*cfhsi_rx) (u8 *ptr, int len, struct cfhsi_ops *dev);
+        int (*cfhsi_wake_up) (struct cfhsi_ops *dev);
+        int (*cfhsi_wake_down) (struct cfhsi_ops *dev);
+        int (*cfhsi_get_peer_wake) (struct cfhsi_ops *dev, bool *status);
+        int (*cfhsi_fifo_occupancy) (struct cfhsi_ops *dev, size_t *occupancy);
+        int (*cfhsi_rx_cancel)(struct cfhsi_ops *dev);
+        struct cfhsi_cb_ops *cb_ops;
 };
 
 /* Structure holds status of received CAIF frames processing */
@@ -132,17 +132,26 @@ enum {
         CFHSI_PRIO_LAST,
 };
 
+struct cfhsi_config {
+        u32 inactivity_timeout;
+        u32 aggregation_timeout;
+        u32 head_align;
+        u32 tail_align;
+        u32 q_high_mark;
+        u32 q_low_mark;
+};
+
 /* Structure implemented by CAIF HSI drivers. */
 struct cfhsi {
         struct caif_dev_common cfdev;
         struct net_device *ndev;
         struct platform_device *pdev;
         struct sk_buff_head qhead[CFHSI_PRIO_LAST];
-        struct cfhsi_drv drv;
-        struct cfhsi_dev *dev;
+        struct cfhsi_cb_ops cb_ops;
+        struct cfhsi_ops *ops;
         int tx_state;
         struct cfhsi_rx_state rx_state;
-        unsigned long inactivity_timeout;
+        struct cfhsi_config cfg;
         int rx_len;
         u8 *rx_ptr;
         u8 *tx_buf;
@@ -150,8 +159,6 @@ struct cfhsi {
         u8 *rx_flip_buf;
         spinlock_t lock;
         int flow_off_sent;
-        u32 q_low_mark;
-        u32 q_high_mark;
         struct list_head list;
         struct work_struct wake_up_work;
         struct work_struct wake_down_work;
@@ -164,13 +171,31 @@ struct cfhsi {
         struct timer_list rx_slowpath_timer;
 
         /* TX aggregation */
-        unsigned long aggregation_timeout;
         int aggregation_len;
         struct timer_list aggregation_timer;
 
         unsigned long bits;
 };
-
 extern struct platform_driver cfhsi_driver;
 
+/**
+ * enum ifla_caif_hsi - CAIF HSI NetlinkRT parameters.
+ * @IFLA_CAIF_HSI_INACTIVITY_TOUT: Inactivity timeout before
+ *                      taking the HSI wakeline down, in milliseconds.
+ * When using RT Netlink to create, destroy or configure a CAIF HSI interface,
+ * enum ifla_caif_hsi is used to specify the configuration attributes.
+ */
+enum ifla_caif_hsi {
+        __IFLA_CAIF_HSI_UNSPEC,
+        __IFLA_CAIF_HSI_INACTIVITY_TOUT,
+        __IFLA_CAIF_HSI_AGGREGATION_TOUT,
+        __IFLA_CAIF_HSI_HEAD_ALIGN,
+        __IFLA_CAIF_HSI_TAIL_ALIGN,
+        __IFLA_CAIF_HSI_QHIGH_WATERMARK,
+        __IFLA_CAIF_HSI_QLOW_WATERMARK,
+        __IFLA_CAIF_HSI_MAX
+};
+
+extern struct cfhsi_ops *cfhsi_get_ops(void);
+
 #endif          /* CAIF_HSI_H_ */
diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h
index 0289d4ce707..061c01957e5 100644
--- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h
@@ -404,6 +404,8 @@ struct cfg80211_beacon_data {
  *
  * Used to configure an AP interface.
  *
+ * @channel: the channel to start the AP on
+ * @channel_type: the channel type to use
  * @beacon: beacon data
  * @beacon_interval: beacon interval
  * @dtim_period: DTIM period
@@ -417,6 +419,9 @@ struct cfg80211_beacon_data {
  * @inactivity_timeout: time in seconds to determine station's inactivity.
  */
 struct cfg80211_ap_settings {
+        struct ieee80211_channel *channel;
+        enum nl80211_channel_type channel_type;
+
         struct cfg80211_beacon_data beacon;
 
         int beacon_interval, dtim_period;
@@ -622,10 +627,10 @@ struct sta_bss_parameters {
  * @llid: mesh local link id
  * @plid: mesh peer link id
  * @plink_state: mesh peer link state
- * @signal: the signal strength, type depends on the wiphy's signal_type
-        NOTE: For CFG80211_SIGNAL_TYPE_MBM, value is expressed in _dBm_.
- * @signal_avg: avg signal strength, type depends on the wiphy's signal_type
-        NOTE: For CFG80211_SIGNAL_TYPE_MBM, value is expressed in _dBm_.
+ * @signal: The signal strength, type depends on the wiphy's signal_type.
+ *      For CFG80211_SIGNAL_TYPE_MBM, value is expressed in _dBm_.
+ * @signal_avg: Average signal strength, type depends on the wiphy's signal_type.
+ *      For CFG80211_SIGNAL_TYPE_MBM, value is expressed in _dBm_.
  * @txrate: current unicast bitrate from this station
  * @rxrate: current unicast bitrate to this station
  * @rx_packets: packets received from this station
@@ -785,47 +790,101 @@ struct bss_parameters {
         int ht_opmode;
 };
 
-/*
+/**
  * struct mesh_config - 802.11s mesh configuration
  *
  * These parameters can be changed while the mesh is active.
+ *
+ * @dot11MeshRetryTimeout: the initial retry timeout in millisecond units used
+ *      by the Mesh Peering Open message
+ * @dot11MeshConfirmTimeout: the initial retry timeout in millisecond units
+ *      used by the Mesh Peering Open message
+ * @dot11MeshHoldingTimeout: the confirm timeout in millisecond units used by
+ *      the mesh peering management to close a mesh peering
+ * @dot11MeshMaxPeerLinks: the maximum number of peer links allowed on this
+ *      mesh interface
+ * @dot11MeshMaxRetries: the maximum number of peer link open retries that can
+ *      be sent to establish a new peer link instance in a mesh
+ * @dot11MeshTTL: the value of TTL field set at a source mesh STA
+ * @element_ttl: the value of TTL field set at a mesh STA for path selection
+ *      elements
+ * @auto_open_plinks: whether we should automatically open peer links when we
+ *      detect compatible mesh peers
+ * @dot11MeshNbrOffsetMaxNeighbor: the maximum number of neighbors to
+ *      synchronize to for 11s default synchronization method
+ * @dot11MeshHWMPmaxPREQretries: the number of action frames containing a PREQ
+ *      that an originator mesh STA can send to a particular path target
+ * @path_refresh_time: how frequently to refresh mesh paths in milliseconds
+ * @min_discovery_timeout: the minimum length of time to wait until giving up on
+ *      a path discovery in milliseconds
+ * @dot11MeshHWMPactivePathTimeout: the time (in TUs) for which mesh STAs
+ *      receiving a PREQ shall consider the forwarding information from the
+ *      root to be valid. (TU = time unit)
+ * @dot11MeshHWMPpreqMinInterval: the minimum interval of time (in TUs) during
+ *      which a mesh STA can send only one action frame containing a PREQ
+ *      element
+ * @dot11MeshHWMPperrMinInterval: the minimum interval of time (in TUs) during
+ *      which a mesh STA can send only one Action frame containing a PERR
+ *      element
+ * @dot11MeshHWMPnetDiameterTraversalTime: the interval of time (in TUs) that
+ *      it takes for an HWMP information element to propagate across the mesh
+ * @dot11MeshHWMPRootMode: the configuration of a mesh STA as root mesh STA
+ * @dot11MeshHWMPRannInterval: the interval of time (in TUs) between root
+ *      announcements are transmitted
+ * @dot11MeshGateAnnouncementProtocol: whether to advertise that this mesh
+ *      station has access to a broader network beyond the MBSS. (This is
+ *      missnamed in draft 12.0: dot11MeshGateAnnouncementProtocol set to true
+ *      only means that the station will announce others it's a mesh gate, but
+ *      not necessarily using the gate announcement protocol. Still keeping the
+ *      same nomenclature to be in sync with the spec)
+ * @dot11MeshForwarding: whether the Mesh STA is forwarding or non-forwarding
+ *      entity (default is TRUE - forwarding entity)
+ * @rssi_threshold: the threshold for average signal strength of candidate
+ *      station to establish a peer link
+ * @ht_opmode: mesh HT protection mode
+ *
+ * @dot11MeshHWMPactivePathToRootTimeout: The time (in TUs) for which mesh STAs
+ *      receiving a proactive PREQ shall consider the forwarding information to
+ *      the root mesh STA to be valid.
+ *
+ * @dot11MeshHWMProotInterval: The interval of time (in TUs) between proactive
+ *      PREQs are transmitted.
+ * @dot11MeshHWMPconfirmationInterval: The minimum interval of time (in TUs)
+ *      during which a mesh STA can send only one Action frame containing
+ *      a PREQ element for root path confirmation.
  */
 struct mesh_config {
-        /* Timeouts in ms */
-        /* Mesh plink management parameters */
         u16 dot11MeshRetryTimeout;
         u16 dot11MeshConfirmTimeout;
         u16 dot11MeshHoldingTimeout;
         u16 dot11MeshMaxPeerLinks;
-        u8  dot11MeshMaxRetries;
-        u8  dot11MeshTTL;
-        /* ttl used in path selection information elements */
-        u8  element_ttl;
+        u8 dot11MeshMaxRetries;
+        u8 dot11MeshTTL;
+        u8 element_ttl;
         bool auto_open_plinks;
-        /* neighbor offset synchronization */
         u32 dot11MeshNbrOffsetMaxNeighbor;
-        /* HWMP parameters */
-        u8  dot11MeshHWMPmaxPREQretries;
+        u8 dot11MeshHWMPmaxPREQretries;
         u32 path_refresh_time;
         u16 min_discovery_timeout;
         u32 dot11MeshHWMPactivePathTimeout;
         u16 dot11MeshHWMPpreqMinInterval;
         u16 dot11MeshHWMPperrMinInterval;
         u16 dot11MeshHWMPnetDiameterTraversalTime;
-        u8  dot11MeshHWMPRootMode;
+        u8 dot11MeshHWMPRootMode;
         u16 dot11MeshHWMPRannInterval;
-        /* This is missnamed in draft 12.0: dot11MeshGateAnnouncementProtocol
-         * set to true only means that the station will announce others it's a
-         * mesh gate, but not necessarily using the gate announcement protocol.
-         * Still keeping the same nomenclature to be in sync with the spec. */
-        bool  dot11MeshGateAnnouncementProtocol;
+        bool dot11MeshGateAnnouncementProtocol;
         bool dot11MeshForwarding;
         s32 rssi_threshold;
         u16 ht_opmode;
+        u32 dot11MeshHWMPactivePathToRootTimeout;
+        u16 dot11MeshHWMProotInterval;
+        u16 dot11MeshHWMPconfirmationInterval;
 };
 
 /**
  * struct mesh_setup - 802.11s mesh setup configuration
+ * @channel: the channel to start the mesh network on
+ * @channel_type: the channel type to use
  * @mesh_id: the mesh ID
  * @mesh_id_len: length of the mesh ID, at least 1 and at most 32 bytes
  * @sync_method: which synchronization method to use
@@ -840,6 +899,8 @@ struct mesh_config {
  * These parameters are fixed when the mesh is created.
  */
 struct mesh_setup {
+        struct ieee80211_channel *channel;
+        enum nl80211_channel_type channel_type;
         const u8 *mesh_id;
         u8 mesh_id_len;
         u8 sync_method;
@@ -966,6 +1027,7 @@ struct cfg80211_match_set {
  * @wiphy: the wiphy this was for
  * @dev: the interface
  * @channels: channels to scan
+ * @rssi_thold: don't report scan results below this threshold (in s32 dBm)
  */
 struct cfg80211_sched_scan_request {
         struct cfg80211_ssid *ssids;
@@ -976,6 +1038,7 @@ struct cfg80211_sched_scan_request {
         size_t ie_len;
         struct cfg80211_match_set *match_sets;
         int n_match_sets;
+        s32 rssi_thold;
 
         /* internal */
         struct wiphy *wiphy;
@@ -1411,11 +1474,14 @@ struct cfg80211_gtk_rekey_data {
  *
  * @set_txq_params: Set TX queue parameters
  *
- * @set_channel: Set channel for a given wireless interface. Some devices
- *      may support multi-channel operation (by channel hopping) so cfg80211
- *      doesn't verify much. Note, however, that the passed netdev may be
- *      %NULL as well if the user requested changing the channel for the
- *      device itself, or for a monitor interface.
+ * @libertas_set_mesh_channel: Only for backward compatibility for libertas,
+ *      as it doesn't implement join_mesh and needs to set the channel to
+ *      join the mesh instead.
+ *
+ * @set_monitor_channel: Set the monitor mode channel for the device. If other
+ *      interfaces are active this callback should reject the configuration.
+ *      If no interfaces are active or the device is down, the channel should
+ *      be stored for when a monitor interface becomes active.
  * @get_channel: Get the current operating channel, should return %NULL if
  *      there's no single defined operating channel if for example the
  *      device implements channel hopping for multi-channel virtual interfaces.
@@ -1605,9 +1671,13 @@ struct cfg80211_ops {
         int     (*set_txq_params)(struct wiphy *wiphy, struct net_device *dev,
                                   struct ieee80211_txq_params *params);
 
-        int     (*set_channel)(struct wiphy *wiphy, struct net_device *dev,
-                               struct ieee80211_channel *chan,
-                               enum nl80211_channel_type channel_type);
+        int     (*libertas_set_mesh_channel)(struct wiphy *wiphy,
+                                             struct net_device *dev,
+                                             struct ieee80211_channel *chan);
+
+        int     (*set_monitor_channel)(struct wiphy *wiphy,
+                                       struct ieee80211_channel *chan,
+                                       enum nl80211_channel_type channel_type);
 
         int     (*scan)(struct wiphy *wiphy, struct net_device *dev,
                         struct cfg80211_scan_request *request);
@@ -2263,7 +2333,10 @@ struct cfg80211_cached_keys;
  * @netdev: (private) Used to reference back to the netdev
  * @current_bss: (private) Used by the internal configuration code
  * @channel: (private) Used by the internal configuration code to track
- *      user-set AP, monitor and WDS channels for wireless extensions
+ *      the user-set AP, monitor and WDS channel
+ * @preset_chan: (private) Used by the internal configuration code to
+ *      track the channel to be used for AP later
+ * @preset_chantype: (private) the corresponding channel type
  * @bssid: (private) Used by the internal configuration code
  * @ssid: (private) Used by the internal configuration code
  * @ssid_len: (private) Used by the internal configuration code
@@ -2313,7 +2386,8 @@ struct wireless_dev {
         spinlock_t event_lock;
 
         struct cfg80211_internal_bss *current_bss; /* associated / joined */
-        struct ieee80211_channel *channel;
+        struct ieee80211_channel *preset_chan;
+        enum nl80211_channel_type preset_chantype;
 
         bool ps;
         int ps_timeout;
@@ -3359,11 +3433,14 @@ void cfg80211_report_obss_beacon(struct wiphy *wiphy,
                                  const u8 *frame, size_t len,
                                  int freq, int sig_dbm, gfp_t gfp);
 
-/*
+/**
  * cfg80211_can_beacon_sec_chan - test if ht40 on extension channel can be used
  * @wiphy: the wiphy
  * @chan: main channel
  * @channel_type: HT mode
+ *
+ * This function returns true if there is no secondary channel or the secondary
+ * channel can be used for beaconing (i.e. is not a radar channel etc.)
  */
 bool cfg80211_can_beacon_sec_chan(struct wiphy *wiphy,
                                   struct ieee80211_channel *chan,
diff --git a/include/net/dn_route.h b/include/net/dn_route.h
index c507e05d172..4f7d6a18238 100644
--- a/include/net/dn_route.h
+++ b/include/net/dn_route.h
@@ -67,6 +67,8 @@ extern void dn_rt_cache_flush(int delay);
 struct dn_route {
         struct dst_entry dst;
 
+        struct neighbour *n;
+
         struct flowidn fld;
 
         __le16 rt_saddr;
diff --git a/include/net/dst.h b/include/net/dst.h
index 8197eadca81..51610468c63 100644
--- a/include/net/dst.h
+++ b/include/net/dst.h
@@ -42,16 +42,16 @@ struct dst_entry {
                 struct dst_entry        *from;
         };
         struct dst_entry        *path;
-        struct neighbour __rcu  *_neighbour;
+        void                    *__pad0;
 #ifdef CONFIG_XFRM
         struct xfrm_state       *xfrm;
 #else
         void                    *__pad1;
 #endif
-        int                     (*input)(struct sk_buff*);
-        int                     (*output)(struct sk_buff*);
+        int                     (*input)(struct sk_buff *);
+        int                     (*output)(struct sk_buff *);
 
-        int                     flags;
+        unsigned short          flags;
 #define DST_HOST                0x0001
 #define DST_NOXFRM              0x0002
 #define DST_NOPOLICY            0x0004
@@ -62,6 +62,8 @@ struct dst_entry {
 #define DST_FAKE_RTABLE         0x0080
 #define DST_XFRM_TUNNEL         0x0100
 
+        unsigned short          pending_confirm;
+
         short                   error;
         short                   obsolete;
         unsigned short          header_len;     /* more space at head required */
@@ -94,21 +96,6 @@ struct dst_entry {
         };
 };
 
-static inline struct neighbour *dst_get_neighbour_noref(struct dst_entry *dst)
-{
-        return rcu_dereference(dst->_neighbour);
-}
-
-static inline struct neighbour *dst_get_neighbour_noref_raw(struct dst_entry *dst)
-{
-        return rcu_dereference_raw(dst->_neighbour);
-}
-
-static inline void dst_set_neighbour(struct dst_entry *dst, struct neighbour *neigh)
-{
-        rcu_assign_pointer(dst->_neighbour, neigh);
-}
-
 extern u32 *dst_cow_metrics_generic(struct dst_entry *dst, unsigned long old);
 extern const u32 dst_default_metrics[RTAX_MAX];
 
@@ -222,12 +209,6 @@ static inline unsigned long dst_metric_rtt(const struct dst_entry *dst, int metr
         return msecs_to_jiffies(dst_metric(dst, metric));
 }
 
-static inline void set_dst_metric_rtt(struct dst_entry *dst, int metric,
-                                      unsigned long rtt)
-{
-        dst_metric_set(dst, metric, jiffies_to_msecs(rtt));
-}
-
 static inline u32
 dst_allfrag(const struct dst_entry *dst)
 {
@@ -241,7 +222,7 @@ dst_metric_locked(const struct dst_entry *dst, int metric)
         return dst_metric(dst, RTAX_LOCK) & (1<<metric);
 }
 
-static inline void dst_hold(struct dst_entry * dst)
+static inline void dst_hold(struct dst_entry *dst)
 {
         /*
          * If your kernel compilation stops here, please check
@@ -264,8 +245,7 @@ static inline void dst_use_noref(struct dst_entry *dst, unsigned long time)
         dst->lastuse = time;
 }
 
-static inline
-struct dst_entry * dst_clone(struct dst_entry * dst)
+static inline struct dst_entry *dst_clone(struct dst_entry *dst)
 {
         if (dst)
                 atomic_inc(&dst->__refcnt);
@@ -371,12 +351,13 @@ static inline struct dst_entry *skb_dst_pop(struct sk_buff *skb)
 }
 
 extern int dst_discard(struct sk_buff *skb);
-extern void *dst_alloc(struct dst_ops * ops, struct net_device *dev,
-                       int initial_ref, int initial_obsolete, int flags);
-extern void __dst_free(struct dst_entry * dst);
-extern struct dst_entry *dst_destroy(struct dst_entry * dst);
+extern void *dst_alloc(struct dst_ops *ops, struct net_device *dev,
+                       int initial_ref, int initial_obsolete,
+                       unsigned short flags);
+extern void __dst_free(struct dst_entry *dst);
+extern struct dst_entry *dst_destroy(struct dst_entry *dst);
 
-static inline void dst_free(struct dst_entry * dst)
+static inline void dst_free(struct dst_entry *dst)
 {
         if (dst->obsolete > 1)
                 return;
@@ -396,19 +377,35 @@ static inline void dst_rcu_free(struct rcu_head *head)
 
 static inline void dst_confirm(struct dst_entry *dst)
 {
-        if (dst) {
-                struct neighbour *n;
+        dst->pending_confirm = 1;
+}
+
+static inline int dst_neigh_output(struct dst_entry *dst, struct neighbour *n,
+                                   struct sk_buff *skb)
+{
+        struct hh_cache *hh;
 
-                rcu_read_lock();
-                n = dst_get_neighbour_noref(dst);
-                neigh_confirm(n);
-                rcu_read_unlock();
+        if (unlikely(dst->pending_confirm)) {
+                n->confirmed = jiffies;
+                dst->pending_confirm = 0;
         }
+
+        hh = &n->hh;
+        if ((n->nud_state & NUD_CONNECTED) && hh->hh_len)
+                return neigh_hh_output(hh, skb);
+        else
+                return n->output(n, skb);
 }
 
 static inline struct neighbour *dst_neigh_lookup(const struct dst_entry *dst, const void *daddr)
 {
-        return dst->ops->neigh_lookup(dst, daddr);
+        return dst->ops->neigh_lookup(dst, NULL, daddr);
+}
+
+static inline struct neighbour *dst_neigh_lookup_skb(const struct dst_entry *dst,
+                                                     struct sk_buff *skb)
+{
+        return dst->ops->neigh_lookup(dst, skb, NULL);
 }
 
 static inline void dst_link_failure(struct sk_buff *skb)
diff --git a/include/net/dst_ops.h b/include/net/dst_ops.h
index 3682a0a076c..4badc86e45d 100644
--- a/include/net/dst_ops.h
+++ b/include/net/dst_ops.h
@@ -26,7 +26,9 @@ struct dst_ops {
         void                    (*link_failure)(struct sk_buff *);
         void                    (*update_pmtu)(struct dst_entry *dst, u32 mtu);
         int                     (*local_out)(struct sk_buff *skb);
-        struct neighbour *      (*neigh_lookup)(const struct dst_entry *dst, const void *daddr);
+        struct neighbour *      (*neigh_lookup)(const struct dst_entry *dst,
+                                                struct sk_buff *skb,
+                                                const void *daddr);
 
         struct kmem_cache       *kmem_cachep;
 
diff --git a/include/net/fib_rules.h b/include/net/fib_rules.h
index 075f1e3a0fe..e361f488242 100644
--- a/include/net/fib_rules.h
+++ b/include/net/fib_rules.h
@@ -52,6 +52,7 @@ struct fib_rules_ops {
                                              struct sk_buff *,
                                              struct fib_rule_hdr *,
                                              struct nlattr **);
+        void                    (*delete)(struct fib_rule *);
         int                     (*compare)(struct fib_rule *,
                                            struct fib_rule_hdr *,
                                            struct nlattr **);
diff --git a/include/net/flow.h b/include/net/flow.h
index 6c469dbdb91..ce9cb7656b4 100644
--- a/include/net/flow.h
+++ b/include/net/flow.h
@@ -20,8 +20,8 @@ struct flowi_common {
         __u8    flowic_proto;
         __u8    flowic_flags;
 #define FLOWI_FLAG_ANYSRC               0x01
-#define FLOWI_FLAG_PRECOW_METRICS       0x02
-#define FLOWI_FLAG_CAN_SLEEP            0x04
+#define FLOWI_FLAG_CAN_SLEEP            0x02
+#define FLOWI_FLAG_RT_NOCACHE           0x04
         __u32   flowic_secid;
 };
 
diff --git a/include/net/genetlink.h b/include/net/genetlink.h
index ccb68880abf..48905cd3884 100644
--- a/include/net/genetlink.h
+++ b/include/net/genetlink.h
@@ -5,6 +5,8 @@
 #include <net/netlink.h>
 #include <net/net_namespace.h>
 
+#define GENLMSG_DEFAULT_SIZE (NLMSG_DEFAULT_SIZE - GENL_HDRLEN)
+
 /**
  * struct genl_multicast_group - generic netlink multicast group
  * @name: name of the multicast group, names are per-family
diff --git a/include/net/inet6_connection_sock.h b/include/net/inet6_connection_sock.h
index 1866a676c81..df2a857e853 100644
--- a/include/net/inet6_connection_sock.h
+++ b/include/net/inet6_connection_sock.h
@@ -26,6 +26,7 @@ extern int inet6_csk_bind_conflict(const struct sock *sk,
                                    const struct inet_bind_bucket *tb, bool relax);
 
 extern struct dst_entry* inet6_csk_route_req(struct sock *sk,
+                                             struct flowi6 *fl6,
                                              const struct request_sock *req);
 
 extern struct request_sock *inet6_csk_search_req(const struct sock *sk,
diff --git a/include/net/inet_connection_sock.h b/include/net/inet_connection_sock.h
index 7d83f90f203..291e7cee14e 100644
--- a/include/net/inet_connection_sock.h
+++ b/include/net/inet_connection_sock.h
@@ -43,7 +43,6 @@ struct inet_connection_sock_af_ops {
         struct sock *(*syn_recv_sock)(struct sock *sk, struct sk_buff *skb,
                                       struct request_sock *req,
                                       struct dst_entry *dst);
-        struct inet_peer *(*get_peer)(struct sock *sk, bool *release_it);
         u16         net_header_len;
         u16         net_frag_header_len;
         u16         sockaddr_len;
@@ -251,7 +250,8 @@ extern int inet_csk_get_port(struct sock *sk, unsigned short snum);
 
 extern struct dst_entry* inet_csk_route_req(struct sock *sk,
                                             struct flowi4 *fl4,
-                                            const struct request_sock *req);
+                                            const struct request_sock *req,
+                                            bool nocache);
 extern struct dst_entry* inet_csk_route_child_sock(struct sock *sk,
                                                    struct sock *newsk,
                                                    const struct request_sock *req);
diff --git a/include/net/inet_hashtables.h b/include/net/inet_hashtables.h
index 808fc5f76b0..54be0287eb9 100644
--- a/include/net/inet_hashtables.h
+++ b/include/net/inet_hashtables.h
@@ -379,10 +379,10 @@ static inline struct sock *__inet_lookup_skb(struct inet_hashinfo *hashinfo,
                                              const __be16 sport,
                                              const __be16 dport)
 {
-        struct sock *sk;
+        struct sock *sk = skb_steal_sock(skb);
         const struct iphdr *iph = ip_hdr(skb);
 
-        if (unlikely(sk = skb_steal_sock(skb)))
+        if (sk)
                 return sk;
         else
                 return __inet_lookup(dev_net(skb_dst(skb)->dev), hashinfo,
diff --git a/include/net/inet_sock.h b/include/net/inet_sock.h
index ae17e1352d7..924d7b98ab6 100644
--- a/include/net/inet_sock.h
+++ b/include/net/inet_sock.h
@@ -245,8 +245,6 @@ static inline __u8 inet_sk_flowi_flags(const struct sock *sk)
 
         if (inet_sk(sk)->transparent || inet_sk(sk)->hdrincl)
                 flags |= FLOWI_FLAG_ANYSRC;
-        if (sk->sk_protocol == IPPROTO_TCP)
-                flags |= FLOWI_FLAG_PRECOW_METRICS;
         return flags;
 }
 
diff --git a/include/net/inetpeer.h b/include/net/inetpeer.h
index 2040bff945d..53f464d7cdd 100644
--- a/include/net/inetpeer.h
+++ b/include/net/inetpeer.h
@@ -36,25 +36,19 @@ struct inet_peer {
         u32                     metrics[RTAX_MAX];
         u32                     rate_tokens;    /* rate limiting for ICMP */
         unsigned long           rate_last;
-        unsigned long           pmtu_expires;
-        u32                     pmtu_orig;
-        u32                     pmtu_learned;
-        struct inetpeer_addr_base redirect_learned;
         union {
                 struct list_head        gc_list;
                 struct rcu_head     gc_rcu;
         };
         /*
          * Once inet_peer is queued for deletion (refcnt == -1), following fields
-         * are not available: rid, ip_id_count, tcp_ts, tcp_ts_stamp
+         * are not available: rid, ip_id_count
          * We can share memory with rcu_head to help keep inet_peer small.
          */
         union {
                 struct {
                         atomic_t                        rid;            /* Frag reception counter */
                         atomic_t                        ip_id_count;    /* IP ID for the next packet */
-                        __u32                           tcp_ts;
-                        __u32                           tcp_ts_stamp;
                 };
                 struct rcu_head         rcu;
                 struct inet_peer        *gc_next;
@@ -65,6 +59,69 @@ struct inet_peer {
         atomic_t                refcnt;
 };
 
+struct inet_peer_base {
+        struct inet_peer __rcu  *root;
+        seqlock_t               lock;
+        u32                     flush_seq;
+        int                     total;
+};
+
+#define INETPEER_BASE_BIT       0x1UL
+
+static inline struct inet_peer *inetpeer_ptr(unsigned long val)
+{
+        BUG_ON(val & INETPEER_BASE_BIT);
+        return (struct inet_peer *) val;
+}
+
+static inline struct inet_peer_base *inetpeer_base_ptr(unsigned long val)
+{
+        if (!(val & INETPEER_BASE_BIT))
+                return NULL;
+        val &= ~INETPEER_BASE_BIT;
+        return (struct inet_peer_base *) val;
+}
+
+static inline bool inetpeer_ptr_is_peer(unsigned long val)
+{
+        return !(val & INETPEER_BASE_BIT);
+}
+
+static inline void __inetpeer_ptr_set_peer(unsigned long *val, struct inet_peer *peer)
+{
+        /* This implicitly clears INETPEER_BASE_BIT */
+        *val = (unsigned long) peer;
+}
+
+static inline bool inetpeer_ptr_set_peer(unsigned long *ptr, struct inet_peer *peer)
+{
+        unsigned long val = (unsigned long) peer;
+        unsigned long orig = *ptr;
+
+        if (!(orig & INETPEER_BASE_BIT) ||
+            cmpxchg(ptr, orig, val) != orig)
+                return false;
+        return true;
+}
+
+static inline void inetpeer_init_ptr(unsigned long *ptr, struct inet_peer_base *base)
+{
+        *ptr = (unsigned long) base | INETPEER_BASE_BIT;
+}
+
+static inline void inetpeer_transfer_peer(unsigned long *to, unsigned long *from)
+{
+        unsigned long val = *from;
+
+        *to = val;
+        if (inetpeer_ptr_is_peer(val)) {
+                struct inet_peer *peer = inetpeer_ptr(val);
+                atomic_inc(&peer->refcnt);
+        }
+}
+
+extern void inet_peer_base_init(struct inet_peer_base *);
+
 void                    inet_initpeers(void) __init;
 
 #define INETPEER_METRICS_NEW    (~(u32) 0)
@@ -75,31 +132,38 @@ static inline bool inet_metrics_new(const struct inet_peer *p)
 }
 
 /* can be called with or without local BH being disabled */
-struct inet_peer        *inet_getpeer(const struct inetpeer_addr *daddr, int create);
+struct inet_peer *inet_getpeer(struct inet_peer_base *base,
+                               const struct inetpeer_addr *daddr,
+                               int create);
 
-static inline struct inet_peer *inet_getpeer_v4(__be32 v4daddr, int create)
+static inline struct inet_peer *inet_getpeer_v4(struct inet_peer_base *base,
+                                                __be32 v4daddr,
+                                                int create)
 {
         struct inetpeer_addr daddr;
 
         daddr.addr.a4 = v4daddr;
         daddr.family = AF_INET;
-        return inet_getpeer(&daddr, create);
+        return inet_getpeer(base, &daddr, create);
 }
 
-static inline struct inet_peer *inet_getpeer_v6(const struct in6_addr *v6daddr, int create)
+static inline struct inet_peer *inet_getpeer_v6(struct inet_peer_base *base,
+                                                const struct in6_addr *v6daddr,
+                                                int create)
 {
         struct inetpeer_addr daddr;
 
         *(struct in6_addr *)daddr.addr.a6 = *v6daddr;
         daddr.family = AF_INET6;
-        return inet_getpeer(&daddr, create);
+        return inet_getpeer(base, &daddr, create);
 }
 
 /* can be called from BH context or outside */
 extern void inet_putpeer(struct inet_peer *p);
 extern bool inet_peer_xrlim_allow(struct inet_peer *peer, int timeout);
 
-extern void inetpeer_invalidate_tree(int family);
+extern void inetpeer_invalidate_tree(struct inet_peer_base *);
+extern void inetpeer_invalidate_family(int family);
 
 /*
  * temporary check to make sure we dont access rid, ip_id_count, tcp_ts,
diff --git a/include/net/ip.h b/include/net/ip.h
index 83e0619f59d..ec5cfde85e9 100644
--- a/include/net/ip.h
+++ b/include/net/ip.h
@@ -158,8 +158,9 @@ static inline __u8 ip_reply_arg_flowi_flags(const struct ip_reply_arg *arg)
         return (arg->flags & IP_REPLY_ARG_NOSRCCHECK) ? FLOWI_FLAG_ANYSRC : 0;
 }
 
-void ip_send_reply(struct sock *sk, struct sk_buff *skb, __be32 daddr,
-                   const struct ip_reply_arg *arg, unsigned int len);
+void ip_send_unicast_reply(struct sock *sk, struct sk_buff *skb, __be32 daddr,
+                           __be32 saddr, const struct ip_reply_arg *arg,
+                           unsigned int len);
 
 struct ipv4_config {
         int     log_martians;
@@ -210,6 +211,9 @@ extern int inet_peer_threshold;
 extern int inet_peer_minttl;
 extern int inet_peer_maxttl;
 
+/* From ip_input.c */
+extern int sysctl_ip_early_demux;
+
 /* From ip_output.c */
 extern int sysctl_ip_dynaddr;
 
diff --git a/include/net/ip6_fib.h b/include/net/ip6_fib.h
index 0ae759a6c76..0fedbd8d747 100644
--- a/include/net/ip6_fib.h
+++ b/include/net/ip6_fib.h
@@ -86,6 +86,8 @@ struct fib6_table;
 struct rt6_info {
         struct dst_entry                dst;
 
+        struct neighbour                *n;
+
         /*
          * Tail elements of dst_entry (__refcnt etc.)
          * and these elements (rarely used in hot path) are in
@@ -107,7 +109,7 @@ struct rt6_info {
         u32                             rt6i_peer_genid;
 
         struct inet6_dev                *rt6i_idev;
-        struct inet_peer                *rt6i_peer;
+        unsigned long                   _rt6i_peer;
 
 #ifdef CONFIG_XFRM
         u32                             rt6i_flow_cache_genid;
@@ -118,6 +120,36 @@ struct rt6_info {
         u8                              rt6i_protocol;
 };
 
+static inline struct inet_peer *rt6_peer_ptr(struct rt6_info *rt)
+{
+        return inetpeer_ptr(rt->_rt6i_peer);
+}
+
+static inline bool rt6_has_peer(struct rt6_info *rt)
+{
+        return inetpeer_ptr_is_peer(rt->_rt6i_peer);
+}
+
+static inline void __rt6_set_peer(struct rt6_info *rt, struct inet_peer *peer)
+{
+        __inetpeer_ptr_set_peer(&rt->_rt6i_peer, peer);
+}
+
+static inline bool rt6_set_peer(struct rt6_info *rt, struct inet_peer *peer)
+{
+        return inetpeer_ptr_set_peer(&rt->_rt6i_peer, peer);
+}
+
+static inline void rt6_init_peer(struct rt6_info *rt, struct inet_peer_base *base)
+{
+        inetpeer_init_ptr(&rt->_rt6i_peer, base);
+}
+
+static inline void rt6_transfer_peer(struct rt6_info *rt, struct rt6_info *ort)
+{
+        inetpeer_transfer_peer(&rt->_rt6i_peer, &ort->_rt6i_peer);
+}
+
 static inline struct inet6_dev *ip6_dst_idev(struct dst_entry *dst)
 {
         return ((struct rt6_info *)dst)->rt6i_idev;
@@ -207,6 +239,7 @@ struct fib6_table {
         u32                     tb6_id;
         rwlock_t                tb6_lock;
         struct fib6_node        tb6_root;
+        struct inet_peer_base   tb6_peers;
 };
 
 #define RT6_TABLE_UNSPEC        RT_TABLE_UNSPEC
diff --git a/include/net/ip6_route.h b/include/net/ip6_route.h
index 37c1a1ed82c..58cb3fc3487 100644
--- a/include/net/ip6_route.h
+++ b/include/net/ip6_route.h
@@ -53,16 +53,25 @@ static inline unsigned int rt6_flags2srcprefs(int flags)
         return (flags >> 3) & 7;
 }
 
-extern void                     rt6_bind_peer(struct rt6_info *rt,
-                                              int create);
+extern void rt6_bind_peer(struct rt6_info *rt, int create);
+
+static inline struct inet_peer *__rt6_get_peer(struct rt6_info *rt, int create)
+{
+        if (rt6_has_peer(rt))
+                return rt6_peer_ptr(rt);
+
+        rt6_bind_peer(rt, create);
+        return (rt6_has_peer(rt) ? rt6_peer_ptr(rt) : NULL);
+}
 
 static inline struct inet_peer *rt6_get_peer(struct rt6_info *rt)
 {
-        if (rt->rt6i_peer)
-                return rt->rt6i_peer;
+        return __rt6_get_peer(rt, 0);
+}
 
-        rt6_bind_peer(rt, 0);
-        return rt->rt6i_peer;
+static inline struct inet_peer *rt6_get_peer_create(struct rt6_info *rt)
+{
+        return __rt6_get_peer(rt, 1);
 }
 
 extern void                     ip6_route_input(struct sk_buff *skb);
@@ -131,10 +140,10 @@ extern void			rt6_redirect(const struct in6_addr *dest,
                                              u8 *lladdr,
                                              int on_link);
 
-extern void                     rt6_pmtu_discovery(const struct in6_addr *daddr,
-                                                   const struct in6_addr *saddr,
-                                                   struct net_device *dev,
-                                                   u32 pmtu);
+extern void ip6_update_pmtu(struct sk_buff *skb, struct net *net, __be32 mtu,
+                            int oif, u32 mark);
+extern void ip6_sk_update_pmtu(struct sk_buff *skb, struct sock *sk,
+                               __be32 mtu);
 
 struct netlink_callback;
 
diff --git a/include/net/ip6_tunnel.h b/include/net/ip6_tunnel.h
index fc73e667b50..358fb86f57e 100644
--- a/include/net/ip6_tunnel.h
+++ b/include/net/ip6_tunnel.h
@@ -9,6 +9,8 @@
 #define IP6_TNL_F_CAP_XMIT 0x10000
 /* capable of receiving packets */
 #define IP6_TNL_F_CAP_RCV 0x20000
+/* determine capability on a per-packet basis */
+#define IP6_TNL_F_CAP_PER_PACKET 0x40000
 
 /* IPv6 tunnel */
 
diff --git a/include/net/ip_fib.h b/include/net/ip_fib.h
index 78df0866cc3..000c4674e18 100644
--- a/include/net/ip_fib.h
+++ b/include/net/ip_fib.h
@@ -19,6 +19,7 @@
 #include <net/flow.h>
 #include <linux/seq_file.h>
 #include <net/fib_rules.h>
+#include <net/inetpeer.h>
 
 struct fib_config {
         u8                      fc_dst_len;
@@ -157,11 +158,12 @@ extern __be32 fib_info_update_nh_saddr(struct net *net, struct fib_nh *nh);
                                          FIB_RES_SADDR(net, res))
 
 struct fib_table {
-        struct hlist_node tb_hlist;
-        u32             tb_id;
-        int             tb_default;
-        int             tb_num_default;
-        unsigned long   tb_data[0];
+        struct hlist_node       tb_hlist;
+        u32                     tb_id;
+        int                     tb_default;
+        int                     tb_num_default;
+        struct inet_peer_base   tb_peers;
+        unsigned long           tb_data[0];
 };
 
 extern int fib_table_lookup(struct fib_table *tb, const struct flowi4 *flp,
@@ -218,20 +220,55 @@ extern void __net_exit fib4_rules_exit(struct net *net);
 extern u32 fib_rules_tclass(const struct fib_result *res);
 #endif
 
-extern int fib_lookup(struct net *n, struct flowi4 *flp, struct fib_result *res);
-
 extern struct fib_table *fib_new_table(struct net *net, u32 id);
 extern struct fib_table *fib_get_table(struct net *net, u32 id);
 
+extern int __fib_lookup(struct net *net, struct flowi4 *flp,
+                        struct fib_result *res);
+
+static inline int fib_lookup(struct net *net, struct flowi4 *flp,
+                             struct fib_result *res)
+{
+        if (!net->ipv4.fib_has_custom_rules) {
+                res->r = NULL;
+                if (net->ipv4.fib_local &&
+                    !fib_table_lookup(net->ipv4.fib_local, flp, res,
+                                      FIB_LOOKUP_NOREF))
+                        return 0;
+                if (net->ipv4.fib_main &&
+                    !fib_table_lookup(net->ipv4.fib_main, flp, res,
+                                      FIB_LOOKUP_NOREF))
+                        return 0;
+                if (net->ipv4.fib_default &&
+                    !fib_table_lookup(net->ipv4.fib_default, flp, res,
+                                      FIB_LOOKUP_NOREF))
+                        return 0;
+                return -ENETUNREACH;
+        }
+        return __fib_lookup(net, flp, res);
+}
+
 #endif /* CONFIG_IP_MULTIPLE_TABLES */
 
 /* Exported by fib_frontend.c */
 extern const struct nla_policy rtm_ipv4_policy[];
 extern void             ip_fib_init(void);
+extern __be32 fib_compute_spec_dst(struct sk_buff *skb);
 extern int fib_validate_source(struct sk_buff *skb, __be32 src, __be32 dst,
                                u8 tos, int oif, struct net_device *dev,
-                               __be32 *spec_dst, u32 *itag);
+                               struct in_device *idev, u32 *itag);
 extern void fib_select_default(struct fib_result *res);
+#ifdef CONFIG_IP_ROUTE_CLASSID
+static inline int fib_num_tclassid_users(struct net *net)
+{
+        return net->ipv4.fib_num_tclassid_users;
+}
+#else
+static inline int fib_num_tclassid_users(struct net *net)
+{
+        return 0;
+}
+#endif
 
 /* Exported by fib_semantics.c */
 extern int ip_fib_check_default(__be32 gw, struct net_device *dev);
diff --git a/include/net/ipv6.h b/include/net/ipv6.h
index aecf88436ab..d4261d4d6c4 100644
--- a/include/net/ipv6.h
+++ b/include/net/ipv6.h
@@ -298,14 +298,23 @@ static inline int ipv6_addr_cmp(const struct in6_addr *a1, const struct in6_addr
         return memcmp(a1, a2, sizeof(struct in6_addr));
 }
 
-static inline int
+static inline bool
 ipv6_masked_addr_cmp(const struct in6_addr *a1, const struct in6_addr *m,
                      const struct in6_addr *a2)
 {
+#if defined(CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS) && BITS_PER_LONG == 64
+        const unsigned long *ul1 = (const unsigned long *)a1;
+        const unsigned long *ulm = (const unsigned long *)m;
+        const unsigned long *ul2 = (const unsigned long *)a2;
+
+        return !!(((ul1[0] ^ ul2[0]) & ulm[0]) |
+                  ((ul1[1] ^ ul2[1]) & ulm[1]));
+#else
         return !!(((a1->s6_addr32[0] ^ a2->s6_addr32[0]) & m->s6_addr32[0]) |
                   ((a1->s6_addr32[1] ^ a2->s6_addr32[1]) & m->s6_addr32[1]) |
                   ((a1->s6_addr32[2] ^ a2->s6_addr32[2]) & m->s6_addr32[2]) |
                   ((a1->s6_addr32[3] ^ a2->s6_addr32[3]) & m->s6_addr32[3]));
+#endif
 }
 
 static inline void ipv6_addr_prefix(struct in6_addr *pfx, 
@@ -335,10 +344,17 @@ static inline void ipv6_addr_set(struct in6_addr *addr,
 static inline bool ipv6_addr_equal(const struct in6_addr *a1,
                                    const struct in6_addr *a2)
 {
+#if defined(CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS) && BITS_PER_LONG == 64
+        const unsigned long *ul1 = (const unsigned long *)a1;
+        const unsigned long *ul2 = (const unsigned long *)a2;
+
+        return ((ul1[0] ^ ul2[0]) | (ul1[1] ^ ul2[1])) == 0UL;
+#else
         return ((a1->s6_addr32[0] ^ a2->s6_addr32[0]) |
                 (a1->s6_addr32[1] ^ a2->s6_addr32[1]) |
                 (a1->s6_addr32[2] ^ a2->s6_addr32[2]) |
                 (a1->s6_addr32[3] ^ a2->s6_addr32[3])) == 0;
+#endif
 }
 
 static inline bool __ipv6_prefix_equal(const __be32 *a1, const __be32 *a2,
@@ -391,8 +407,14 @@ bool ip6_frag_match(struct inet_frag_queue *q, void *a);
 
 static inline bool ipv6_addr_any(const struct in6_addr *a)
 {
+#if defined(CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS) && BITS_PER_LONG == 64
+        const unsigned long *ul = (const unsigned long *)a;
+
+        return (ul[0] | ul[1]) == 0UL;
+#else
         return (a->s6_addr32[0] | a->s6_addr32[1] |
                 a->s6_addr32[2] | a->s6_addr32[3]) == 0;
+#endif
 }
 
 static inline bool ipv6_addr_loopback(const struct in6_addr *a)
diff --git a/include/net/mac80211.h b/include/net/mac80211.h
index 95e39b6a02e..670a58ba8a4 100644
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -1297,6 +1297,10 @@ enum ieee80211_hw_flags {
  *      reports, by default it is set to _MCS, _GI and _BW but doesn't
  *      include _FMT. Use %IEEE80211_RADIOTAP_MCS_HAVE_* values, only
  *      adding _BW is supported today.
+ *
+ * @netdev_features: netdev features to be set in each netdev created
+ *      from this HW. Note only HW checksum features are currently
+ *      compatible with mac80211. Other feature bits will be rejected.
  */
 struct ieee80211_hw {
         struct ieee80211_conf conf;
@@ -1319,6 +1323,7 @@ struct ieee80211_hw {
         u8 max_tx_aggregation_subframes;
         u8 offchannel_tx_hw_queue;
         u8 radiotap_mcs_details;
+        netdev_features_t netdev_features;
 };
 
 /**
@@ -2183,7 +2188,10 @@ enum ieee80211_rate_control_changed {
  *      offload. Frames to transmit on the off-channel channel are transmitted
  *      normally except for the %IEEE80211_TX_CTL_TX_OFFCHAN flag. When the
  *      duration (which will always be non-zero) expires, the driver must call
- *      ieee80211_remain_on_channel_expired(). This callback may sleep.
+ *      ieee80211_remain_on_channel_expired().
+ *      Note that this callback may be called while the device is in IDLE and
+ *      must be accepted in this case.
+ *      This callback may sleep.
  * @cancel_remain_on_channel: Requests that an ongoing off-channel period is
  *      aborted before it expires. This callback may sleep.
  *
@@ -2246,6 +2254,9 @@ enum ieee80211_rate_control_changed {
  * @get_et_strings:  Ethtool API to get a set of strings to describe stats
  *      and perhaps other supported types of ethtool data-sets.
  *
+ * @get_rssi: Get current signal strength in dBm, the function is optional
+ *      and can sleep.
+ *
  */
 struct ieee80211_ops {
         void (*tx)(struct ieee80211_hw *hw, struct sk_buff *skb);
@@ -2385,6 +2396,8 @@ struct ieee80211_ops {
         void    (*get_et_strings)(struct ieee80211_hw *hw,
                                   struct ieee80211_vif *vif,
                                   u32 sset, u8 *data);
+        int     (*get_rssi)(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
+                            struct ieee80211_sta *sta, s8 *rssi_dbm);
 };
 
 /**
@@ -3557,16 +3570,6 @@ void ieee80211_cqm_rssi_notify(struct ieee80211_vif *vif,
                                gfp_t gfp);
 
 /**
- * ieee80211_get_operstate - get the operstate of the vif
- *
- * @vif: &struct ieee80211_vif pointer from the add_interface callback.
- *
- * The driver might need to know the operstate of the net_device
- * (specifically, whether the link is IF_OPER_UP after resume)
- */
-unsigned char ieee80211_get_operstate(struct ieee80211_vif *vif);
-
-/**
  * ieee80211_chswitch_done - Complete channel switch process
  * @vif: &struct ieee80211_vif pointer from the add_interface callback.
  * @success: make the channel switch successful or not
diff --git a/include/net/mac802154.h b/include/net/mac802154.h
index c9f8ab5cc68..d0d11df9cba 100644
--- a/include/net/mac802154.h
+++ b/include/net/mac802154.h
@@ -21,6 +21,14 @@
 
 #include <net/af_ieee802154.h>
 
+/* General MAC frame format:
+ *  2 bytes: Frame Control
+ *  1 byte:  Sequence Number
+ * 20 bytes: Addressing fields
+ * 14 bytes: Auxiliary Security Header
+ */
+#define MAC802154_FRAME_HARD_HEADER_LEN         (2 + 1 + 20 + 14)
+
 /* The following flags are used to indicate changed address settings from
  * the stack to the hardware.
  */
diff --git a/include/net/neighbour.h b/include/net/neighbour.h
index 6cdfeedb650..344d8988842 100644
--- a/include/net/neighbour.h
+++ b/include/net/neighbour.h
@@ -202,9 +202,16 @@ extern struct neighbour *	neigh_lookup(struct neigh_table *tbl,
 extern struct neighbour *       neigh_lookup_nodev(struct neigh_table *tbl,
                                                    struct net *net,
                                                    const void *pkey);
-extern struct neighbour *       neigh_create(struct neigh_table *tbl,
+extern struct neighbour *       __neigh_create(struct neigh_table *tbl,
+                                               const void *pkey,
+                                               struct net_device *dev,
+                                               bool want_ref);
+static inline struct neighbour *neigh_create(struct neigh_table *tbl,
                                              const void *pkey,
-                                             struct net_device *dev);
+                                             struct net_device *dev)
+{
+        return __neigh_create(tbl, pkey, dev, true);
+}
 extern void                     neigh_destroy(struct neighbour *neigh);
 extern int                      __neigh_event_send(struct neighbour *neigh, struct sk_buff *skb);
 extern int                      neigh_update(struct neighbour *neigh, const u8 *lladdr, u8 new, 
@@ -302,12 +309,6 @@ static inline struct neighbour * neigh_clone(struct neighbour *neigh)
 
 #define neigh_hold(n)   atomic_inc(&(n)->refcnt)
 
-static inline void neigh_confirm(struct neighbour *neigh)
-{
-        if (neigh)
-                neigh->confirmed = jiffies;
-}
-
 static inline int neigh_event_send(struct neighbour *neigh, struct sk_buff *skb)
 {
         unsigned long now = jiffies;
@@ -351,15 +352,6 @@ static inline int neigh_hh_output(struct hh_cache *hh, struct sk_buff *skb)
         return dev_queue_xmit(skb);
 }
 
-static inline int neigh_output(struct neighbour *n, struct sk_buff *skb)
-{
-        struct hh_cache *hh = &n->hh;
-        if ((n->nud_state & NUD_CONNECTED) && hh->hh_len)
-                return neigh_hh_output(hh, skb);
-        else
-                return n->output(n, skb);
-}
-
 static inline struct neighbour *
 __neigh_lookup(struct neigh_table *tbl, const void *pkey, struct net_device *dev, int creat)
 {
diff --git a/include/net/netevent.h b/include/net/netevent.h
index 086f8a5b59d..3ce4988c9c0 100644
--- a/include/net/netevent.h
+++ b/include/net/netevent.h
@@ -12,10 +12,14 @@
  */
 
 struct dst_entry;
+struct neighbour;
 
 struct netevent_redirect {
         struct dst_entry *old;
+        struct neighbour *old_neigh;
         struct dst_entry *new;
+        struct neighbour *new_neigh;
+        const void *daddr;
 };
 
 enum netevent_notif_type {
diff --git a/include/net/netfilter/nf_conntrack.h b/include/net/netfilter/nf_conntrack.h
index cce7f6a798b..f1494feba79 100644
--- a/include/net/netfilter/nf_conntrack.h
+++ b/include/net/netfilter/nf_conntrack.h
@@ -39,36 +39,6 @@ union nf_conntrack_expect_proto {
         /* insert expect proto private data here */
 };
 
-/* Add protocol helper include file here */
-#include <linux/netfilter/nf_conntrack_ftp.h>
-#include <linux/netfilter/nf_conntrack_pptp.h>
-#include <linux/netfilter/nf_conntrack_h323.h>
-#include <linux/netfilter/nf_conntrack_sane.h>
-#include <linux/netfilter/nf_conntrack_sip.h>
-
-/* per conntrack: application helper private data */
-union nf_conntrack_help {
-        /* insert conntrack helper private data (master) here */
-#if defined(CONFIG_NF_CONNTRACK_FTP) || defined(CONFIG_NF_CONNTRACK_FTP_MODULE)
-        struct nf_ct_ftp_master ct_ftp_info;
-#endif
-#if defined(CONFIG_NF_CONNTRACK_PPTP) || \
-    defined(CONFIG_NF_CONNTRACK_PPTP_MODULE)
-        struct nf_ct_pptp_master ct_pptp_info;
-#endif
-#if defined(CONFIG_NF_CONNTRACK_H323) || \
-    defined(CONFIG_NF_CONNTRACK_H323_MODULE)
-        struct nf_ct_h323_master ct_h323_info;
-#endif
-#if defined(CONFIG_NF_CONNTRACK_SANE) || \
-    defined(CONFIG_NF_CONNTRACK_SANE_MODULE)
-        struct nf_ct_sane_master ct_sane_info;
-#endif
-#if defined(CONFIG_NF_CONNTRACK_SIP) || defined(CONFIG_NF_CONNTRACK_SIP_MODULE)
-        struct nf_ct_sip_master ct_sip_info;
-#endif
-};
-
 #include <linux/types.h>
 #include <linux/skbuff.h>
 #include <linux/timer.h>
@@ -89,12 +59,13 @@ struct nf_conn_help {
         /* Helper. if any */
         struct nf_conntrack_helper __rcu *helper;
 
-        union nf_conntrack_help help;
-
         struct hlist_head expectations;
 
         /* Current number of expected connections */
         u8 expecting[NF_CT_MAX_EXPECT_CLASSES];
+
+        /* private helper information. */
+        char data[];
 };
 
 #include <net/netfilter/ipv4/nf_conntrack_ipv4.h>
diff --git a/include/net/netfilter/nf_conntrack_core.h b/include/net/netfilter/nf_conntrack_core.h
index aced085132e..d8f5b9f5216 100644
--- a/include/net/netfilter/nf_conntrack_core.h
+++ b/include/net/netfilter/nf_conntrack_core.h
@@ -28,8 +28,8 @@ extern unsigned int nf_conntrack_in(struct net *net,
 extern int nf_conntrack_init(struct net *net);
 extern void nf_conntrack_cleanup(struct net *net);
 
-extern int nf_conntrack_proto_init(void);
-extern void nf_conntrack_proto_fini(void);
+extern int nf_conntrack_proto_init(struct net *net);
+extern void nf_conntrack_proto_fini(struct net *net);
 
 extern bool
 nf_ct_get_tuple(const struct sk_buff *skb,
diff --git a/include/net/netfilter/nf_conntrack_expect.h b/include/net/netfilter/nf_conntrack_expect.h
index 4619caadd9d..983f0026324 100644
--- a/include/net/netfilter/nf_conntrack_expect.h
+++ b/include/net/netfilter/nf_conntrack_expect.h
@@ -59,10 +59,12 @@ static inline struct net *nf_ct_exp_net(struct nf_conntrack_expect *exp)
         return nf_ct_net(exp->master);
 }
 
+#define NF_CT_EXP_POLICY_NAME_LEN       16
+
 struct nf_conntrack_expect_policy {
         unsigned int    max_expected;
         unsigned int    timeout;
-        const char      *name;
+        char            name[NF_CT_EXP_POLICY_NAME_LEN];
 };
 
 #define NF_CT_EXPECT_CLASS_DEFAULT      0
diff --git a/include/net/netfilter/nf_conntrack_extend.h b/include/net/netfilter/nf_conntrack_extend.h
index 96755c3798a..8b4d1fc2909 100644
--- a/include/net/netfilter/nf_conntrack_extend.h
+++ b/include/net/netfilter/nf_conntrack_extend.h
@@ -80,10 +80,13 @@ static inline void nf_ct_ext_free(struct nf_conn *ct)
 }
 
 /* Add this type, returns pointer to data or NULL. */
-void *
-__nf_ct_ext_add(struct nf_conn *ct, enum nf_ct_ext_id id, gfp_t gfp);
+void *__nf_ct_ext_add_length(struct nf_conn *ct, enum nf_ct_ext_id id,
+                             size_t var_alloc_len, gfp_t gfp);
+
 #define nf_ct_ext_add(ct, id, gfp) \
-        ((id##_TYPE *)__nf_ct_ext_add((ct), (id), (gfp)))
+        ((id##_TYPE *)__nf_ct_ext_add_length((ct), (id), 0, (gfp)))
+#define nf_ct_ext_add_length(ct, id, len, gfp) \
+        ((id##_TYPE *)__nf_ct_ext_add_length((ct), (id), (len), (gfp)))
 
 #define NF_CT_EXT_F_PREALLOC    0x0001
 
diff --git a/include/net/netfilter/nf_conntrack_helper.h b/include/net/netfilter/nf_conntrack_helper.h
index 1d1889409b9..9aad956d100 100644
--- a/include/net/netfilter/nf_conntrack_helper.h
+++ b/include/net/netfilter/nf_conntrack_helper.h
@@ -11,18 +11,27 @@
 #define _NF_CONNTRACK_HELPER_H
 #include <net/netfilter/nf_conntrack.h>
 #include <net/netfilter/nf_conntrack_extend.h>
+#include <net/netfilter/nf_conntrack_expect.h>
 
 struct module;
 
+enum nf_ct_helper_flags {
+        NF_CT_HELPER_F_USERSPACE        = (1 << 0),
+        NF_CT_HELPER_F_CONFIGURED       = (1 << 1),
+};
+
 #define NF_CT_HELPER_NAME_LEN   16
 
 struct nf_conntrack_helper {
         struct hlist_node hnode;        /* Internal use. */
 
-        const char *name;               /* name of the module */
+        char name[NF_CT_HELPER_NAME_LEN]; /* name of the module */
         struct module *me;              /* pointer to self */
         const struct nf_conntrack_expect_policy *expect_policy;
 
+        /* length of internal data, ie. sizeof(struct nf_ct_*_master) */
+        size_t data_len;
+
         /* Tuple of things we will help (compared against server response) */
         struct nf_conntrack_tuple tuple;
 
@@ -35,8 +44,12 @@ struct nf_conntrack_helper {
 
         void (*destroy)(struct nf_conn *ct);
 
+        int (*from_nlattr)(struct nlattr *attr, struct nf_conn *ct);
         int (*to_nlattr)(struct sk_buff *skb, const struct nf_conn *ct);
         unsigned int expect_class_max;
+
+        unsigned int flags;
+        unsigned int queue_num;         /* For user-space helpers. */
 };
 
 extern struct nf_conntrack_helper *
@@ -48,7 +61,7 @@ nf_conntrack_helper_try_module_get(const char *name, u16 l3num, u8 protonum);
 extern int nf_conntrack_helper_register(struct nf_conntrack_helper *);
 extern void nf_conntrack_helper_unregister(struct nf_conntrack_helper *);
 
-extern struct nf_conn_help *nf_ct_helper_ext_add(struct nf_conn *ct, gfp_t gfp);
+extern struct nf_conn_help *nf_ct_helper_ext_add(struct nf_conn *ct, struct nf_conntrack_helper *helper, gfp_t gfp);
 
 extern int __nf_ct_try_assign_helper(struct nf_conn *ct, struct nf_conn *tmpl,
                                      gfp_t flags);
@@ -60,6 +73,15 @@ static inline struct nf_conn_help *nfct_help(const struct nf_conn *ct)
         return nf_ct_ext_find(ct, NF_CT_EXT_HELPER);
 }
 
+static inline void *nfct_help_data(const struct nf_conn *ct)
+{
+        struct nf_conn_help *help;
+
+        help = nf_ct_ext_find(ct, NF_CT_EXT_HELPER);
+
+        return (void *)help->data;
+}
+
 extern int nf_conntrack_helper_init(struct net *net);
 extern void nf_conntrack_helper_fini(struct net *net);
 
@@ -82,4 +104,7 @@ nf_ct_helper_expectfn_find_by_name(const char *name);
 struct nf_ct_helper_expectfn *
 nf_ct_helper_expectfn_find_by_symbol(const void *symbol);
 
+extern struct hlist_head *nf_ct_helper_hash;
+extern unsigned int nf_ct_helper_hsize;
+
 #endif /*_NF_CONNTRACK_HELPER_H*/
diff --git a/include/net/netfilter/nf_conntrack_l3proto.h b/include/net/netfilter/nf_conntrack_l3proto.h
index 9699c028b74..6f7c13f4ac0 100644
--- a/include/net/netfilter/nf_conntrack_l3proto.h
+++ b/include/net/netfilter/nf_conntrack_l3proto.h
@@ -64,11 +64,12 @@ struct nf_conntrack_l3proto {
         size_t nla_size;
 
 #ifdef CONFIG_SYSCTL
-        struct ctl_table_header *ctl_table_header;
         const char              *ctl_table_path;
-        struct ctl_table        *ctl_table;
 #endif /* CONFIG_SYSCTL */
 
+        /* Init l3proto pernet data */
+        int (*init_net)(struct net *net);
+
         /* Module (if any) which this is connected to. */
         struct module *me;
 };
@@ -76,8 +77,10 @@ struct nf_conntrack_l3proto {
 extern struct nf_conntrack_l3proto __rcu *nf_ct_l3protos[AF_MAX];
 
 /* Protocol registration. */
-extern int nf_conntrack_l3proto_register(struct nf_conntrack_l3proto *proto);
-extern void nf_conntrack_l3proto_unregister(struct nf_conntrack_l3proto *proto);
+extern int nf_conntrack_l3proto_register(struct net *net,
+                                         struct nf_conntrack_l3proto *proto);
+extern void nf_conntrack_l3proto_unregister(struct net *net,
+                                            struct nf_conntrack_l3proto *proto);
 extern struct nf_conntrack_l3proto *nf_ct_l3proto_find_get(u_int16_t l3proto);
 extern void nf_ct_l3proto_put(struct nf_conntrack_l3proto *p);
 
diff --git a/include/net/netfilter/nf_conntrack_l4proto.h b/include/net/netfilter/nf_conntrack_l4proto.h
index 3b572bb20aa..c3be4aef6bf 100644
--- a/include/net/netfilter/nf_conntrack_l4proto.h
+++ b/include/net/netfilter/nf_conntrack_l4proto.h
@@ -12,6 +12,7 @@
 #include <linux/netlink.h>
 #include <net/netlink.h>
 #include <net/netfilter/nf_conntrack.h>
+#include <net/netns/generic.h>
 
 struct seq_file;
 
@@ -86,23 +87,21 @@ struct nf_conntrack_l4proto {
 #if IS_ENABLED(CONFIG_NF_CT_NETLINK_TIMEOUT)
         struct {
                 size_t obj_size;
-                int (*nlattr_to_obj)(struct nlattr *tb[], void *data);
+                int (*nlattr_to_obj)(struct nlattr *tb[],
+                                     struct net *net, void *data);
                 int (*obj_to_nlattr)(struct sk_buff *skb, const void *data);
 
                 unsigned int nlattr_max;
                 const struct nla_policy *nla_policy;
         } ctnl_timeout;
 #endif
+        int     *net_id;
+        /* Init l4proto pernet data */
+        int (*init_net)(struct net *net, u_int16_t proto);
+
+        /* Return the per-net protocol part. */
+        struct nf_proto_net *(*get_net_proto)(struct net *net);
 
-#ifdef CONFIG_SYSCTL
-        struct ctl_table_header **ctl_table_header;
-        struct ctl_table        *ctl_table;
-        unsigned int            *ctl_table_users;
-#ifdef CONFIG_NF_CONNTRACK_PROC_COMPAT
-        struct ctl_table_header *ctl_compat_table_header;
-        struct ctl_table        *ctl_compat_table;
-#endif
-#endif
         /* Protocol name */
         const char *name;
 
@@ -123,8 +122,18 @@ nf_ct_l4proto_find_get(u_int16_t l3proto, u_int8_t l4proto);
 extern void nf_ct_l4proto_put(struct nf_conntrack_l4proto *p);
 
 /* Protocol registration. */
-extern int nf_conntrack_l4proto_register(struct nf_conntrack_l4proto *proto);
-extern void nf_conntrack_l4proto_unregister(struct nf_conntrack_l4proto *proto);
+extern int nf_conntrack_l4proto_register(struct net *net,
+                                         struct nf_conntrack_l4proto *proto);
+extern void nf_conntrack_l4proto_unregister(struct net *net,
+                                            struct nf_conntrack_l4proto *proto);
+
+static inline void nf_ct_kfree_compat_sysctl_table(struct nf_proto_net *pn)
+{
+#if defined(CONFIG_SYSCTL) && defined(CONFIG_NF_CONNTRACK_PROC_COMPAT)
+        kfree(pn->ctl_compat_table);
+        pn->ctl_compat_table = NULL;
+#endif
+}
 
 /* Generic netlink helpers */
 extern int nf_ct_port_tuple_to_nlattr(struct sk_buff *skb,
diff --git a/include/net/netfilter/nf_nat_helper.h b/include/net/netfilter/nf_nat_helper.h
index 02bb6c29dc3..7d8fb7b46c4 100644
--- a/include/net/netfilter/nf_nat_helper.h
+++ b/include/net/netfilter/nf_nat_helper.h
@@ -54,4 +54,8 @@ extern void nf_nat_follow_master(struct nf_conn *ct,
 extern s16 nf_nat_get_offset(const struct nf_conn *ct,
                              enum ip_conntrack_dir dir,
                              u32 seq);
+
+extern void nf_nat_tcp_seq_adjust(struct sk_buff *skb, struct nf_conn *ct,
+                                  u32 dir, int off);
+
 #endif
diff --git a/include/net/netfilter/nfnetlink_queue.h b/include/net/netfilter/nfnetlink_queue.h
new file mode 100644
index 00000000000..86267a52951
--- /dev/null
+++ b/include/net/netfilter/nfnetlink_queue.h
@@ -0,0 +1,43 @@
+#ifndef _NET_NFNL_QUEUE_H_
+#define _NET_NFNL_QUEUE_H_
+
+#include <linux/netfilter/nf_conntrack_common.h>
+
+struct nf_conn;
+
+#ifdef CONFIG_NETFILTER_NETLINK_QUEUE_CT
+struct nf_conn *nfqnl_ct_get(struct sk_buff *entskb, size_t *size,
+                             enum ip_conntrack_info *ctinfo);
+struct nf_conn *nfqnl_ct_parse(const struct sk_buff *skb,
+                               const struct nlattr *attr,
+                               enum ip_conntrack_info *ctinfo);
+int nfqnl_ct_put(struct sk_buff *skb, struct nf_conn *ct,
+                 enum ip_conntrack_info ctinfo);
+void nfqnl_ct_seq_adjust(struct sk_buff *skb, struct nf_conn *ct,
+                         enum ip_conntrack_info ctinfo, int diff);
+#else
+inline struct nf_conn *
+nfqnl_ct_get(struct sk_buff *entskb, size_t *size, enum ip_conntrack_info *ctinfo)
+{
+        return NULL;
+}
+
+inline struct nf_conn *nfqnl_ct_parse(const struct sk_buff *skb,
+                                      const struct nlattr *attr,
+                                      enum ip_conntrack_info *ctinfo)
+{
+        return NULL;
+}
+
+inline int
+nfqnl_ct_put(struct sk_buff *skb, struct nf_conn *ct, enum ip_conntrack_info ctinfo)
+{
+        return 0;
+}
+
+inline void nfqnl_ct_seq_adjust(struct sk_buff *skb, struct nf_conn *ct,
+                                enum ip_conntrack_info ctinfo, int diff)
+{
+}
+#endif /* NF_CONNTRACK */
+#endif
diff --git a/include/net/netns/conntrack.h b/include/net/netns/conntrack.h
index a053a19870c..3aecdc7a84f 100644
--- a/include/net/netns/conntrack.h
+++ b/include/net/netns/conntrack.h
@@ -4,10 +4,64 @@
 #include <linux/list.h>
 #include <linux/list_nulls.h>
 #include <linux/atomic.h>
+#include <linux/netfilter/nf_conntrack_tcp.h>
 
 struct ctl_table_header;
 struct nf_conntrack_ecache;
 
+struct nf_proto_net {
+#ifdef CONFIG_SYSCTL
+        struct ctl_table_header *ctl_table_header;
+        struct ctl_table        *ctl_table;
+#ifdef CONFIG_NF_CONNTRACK_PROC_COMPAT
+        struct ctl_table_header *ctl_compat_header;
+        struct ctl_table        *ctl_compat_table;
+#endif
+#endif
+        unsigned int            users;
+};
+
+struct nf_generic_net {
+        struct nf_proto_net pn;
+        unsigned int timeout;
+};
+
+struct nf_tcp_net {
+        struct nf_proto_net pn;
+        unsigned int timeouts[TCP_CONNTRACK_TIMEOUT_MAX];
+        unsigned int tcp_loose;
+        unsigned int tcp_be_liberal;
+        unsigned int tcp_max_retrans;
+};
+
+enum udp_conntrack {
+        UDP_CT_UNREPLIED,
+        UDP_CT_REPLIED,
+        UDP_CT_MAX
+};
+
+struct nf_udp_net {
+        struct nf_proto_net pn;
+        unsigned int timeouts[UDP_CT_MAX];
+};
+
+struct nf_icmp_net {
+        struct nf_proto_net pn;
+        unsigned int timeout;
+};
+
+struct nf_ip_net {
+        struct nf_generic_net   generic;
+        struct nf_tcp_net       tcp;
+        struct nf_udp_net       udp;
+        struct nf_icmp_net      icmp;
+        struct nf_icmp_net      icmpv6;
+#if defined(CONFIG_SYSCTL) && defined(CONFIG_NF_CONNTRACK_PROC_COMPAT)
+        struct ctl_table_header *ctl_table_header;
+        struct ctl_table        *ctl_table;
+#endif
+};
+
 struct netns_ct {
         atomic_t                count;
         unsigned int            expect_count;
@@ -28,6 +82,7 @@ struct netns_ct {
         unsigned int            sysctl_log_invalid; /* Log invalid packets */
         int                     sysctl_auto_assign_helper;
         bool                    auto_assign_helper_warned;
+        struct nf_ip_net        nf_ct_proto;
 #ifdef CONFIG_SYSCTL
         struct ctl_table_header *sysctl_header;
         struct ctl_table_header *acct_sysctl_header;
diff --git a/include/net/netns/ipv4.h b/include/net/netns/ipv4.h
index bbd023a1c9b..2e089a99d60 100644
--- a/include/net/netns/ipv4.h
+++ b/include/net/netns/ipv4.h
@@ -7,10 +7,12 @@
 
 #include <net/inet_frag.h>
 
+struct tcpm_hash_bucket;
 struct ctl_table_header;
 struct ipv4_devconf;
 struct fib_rules_ops;
 struct hlist_head;
+struct fib_table;
 struct sock;
 
 struct netns_ipv4 {
@@ -24,13 +26,22 @@ struct netns_ipv4 {
         struct ipv4_devconf     *devconf_dflt;
 #ifdef CONFIG_IP_MULTIPLE_TABLES
         struct fib_rules_ops    *rules_ops;
+        bool                    fib_has_custom_rules;
+        struct fib_table        *fib_local;
+        struct fib_table        *fib_main;
+        struct fib_table        *fib_default;
+#endif
+#ifdef CONFIG_IP_ROUTE_CLASSID
+        int                     fib_num_tclassid_users;
 #endif
         struct hlist_head       *fib_table_hash;
         struct sock             *fibnl;
 
         struct sock             **icmp_sk;
         struct sock             *tcp_sock;
-
+        struct inet_peer_base   *peers;
+        struct tcpm_hash_bucket *tcp_metrics_hash;
+        unsigned int            tcp_metrics_hash_mask;
         struct netns_frags      frags;
 #ifdef CONFIG_NETFILTER
         struct xt_table         *iptable_filter;
diff --git a/include/net/netns/ipv6.h b/include/net/netns/ipv6.h
index b42be53587b..df0a5456a3f 100644
--- a/include/net/netns/ipv6.h
+++ b/include/net/netns/ipv6.h
@@ -33,6 +33,7 @@ struct netns_ipv6 {
         struct netns_sysctl_ipv6 sysctl;
         struct ipv6_devconf     *devconf_all;
         struct ipv6_devconf     *devconf_dflt;
+        struct inet_peer_base   *peers;
         struct netns_frags      frags;
 #ifdef CONFIG_NETFILTER
         struct xt_table         *ip6table_filter;
diff --git a/include/net/nfc/hci.h b/include/net/nfc/hci.h
index 4467c946085..e30e6a86971 100644
--- a/include/net/nfc/hci.h
+++ b/include/net/nfc/hci.h
@@ -31,7 +31,8 @@ struct nfc_hci_ops {
         void (*close) (struct nfc_hci_dev *hdev);
         int (*hci_ready) (struct nfc_hci_dev *hdev);
         int (*xmit) (struct nfc_hci_dev *hdev, struct sk_buff *skb);
-        int (*start_poll) (struct nfc_hci_dev *hdev, u32 protocols);
+        int (*start_poll) (struct nfc_hci_dev *hdev,
+                           u32 im_protocols, u32 tm_protocols);
         int (*target_from_gate) (struct nfc_hci_dev *hdev, u8 gate,
                                  struct nfc_target *target);
         int (*complete_target_discovered) (struct nfc_hci_dev *hdev, u8 gate,
diff --git a/include/net/nfc/nfc.h b/include/net/nfc/nfc.h
index b7ca4a2a1d7..180964b954a 100644
--- a/include/net/nfc/nfc.h
+++ b/include/net/nfc/nfc.h
@@ -53,7 +53,8 @@ struct nfc_target;
 struct nfc_ops {
         int (*dev_up)(struct nfc_dev *dev);
         int (*dev_down)(struct nfc_dev *dev);
-        int (*start_poll)(struct nfc_dev *dev, u32 protocols);
+        int (*start_poll)(struct nfc_dev *dev,
+                          u32 im_protocols, u32 tm_protocols);
         void (*stop_poll)(struct nfc_dev *dev);
         int (*dep_link_up)(struct nfc_dev *dev, struct nfc_target *target,
                            u8 comm_mode, u8 *gb, size_t gb_len);
@@ -62,9 +63,10 @@ struct nfc_ops {
                                u32 protocol);
         void (*deactivate_target)(struct nfc_dev *dev,
                                   struct nfc_target *target);
-        int (*data_exchange)(struct nfc_dev *dev, struct nfc_target *target,
+        int (*im_transceive)(struct nfc_dev *dev, struct nfc_target *target,
                              struct sk_buff *skb, data_exchange_cb_t cb,
                              void *cb_context);
+        int (*tm_send)(struct nfc_dev *dev, struct sk_buff *skb);
         int (*check_presence)(struct nfc_dev *dev, struct nfc_target *target);
 };
 
@@ -99,10 +101,10 @@ struct nfc_dev {
         int targets_generation;
         struct device dev;
         bool dev_up;
+        u8 rf_mode;
         bool polling;
         struct nfc_target *active_target;
         bool dep_link_up;
-        u32 dep_rf_mode;
         struct nfc_genl_data genl_data;
         u32 supported_protocols;
 
@@ -188,6 +190,7 @@ struct sk_buff *nfc_alloc_recv_skb(unsigned int size, gfp_t gfp);
 
 int nfc_set_remote_general_bytes(struct nfc_dev *dev,
                                  u8 *gt, u8 gt_len);
+u8 *nfc_get_local_general_bytes(struct nfc_dev *dev, size_t *gb_len);
 
 int nfc_targets_found(struct nfc_dev *dev,
                       struct nfc_target *targets, int ntargets);
@@ -196,4 +199,9 @@ int nfc_target_lost(struct nfc_dev *dev, u32 target_idx);
 int nfc_dep_link_is_up(struct nfc_dev *dev, u32 target_idx,
                        u8 comm_mode, u8 rf_mode);
 
+int nfc_tm_activated(struct nfc_dev *dev, u32 protocol, u8 comm_mode,
+                     u8 *gb, size_t gb_len);
+int nfc_tm_deactivated(struct nfc_dev *dev);
+int nfc_tm_data_received(struct nfc_dev *dev, struct sk_buff *skb);
+
 #endif /* __NET_NFC_H */
diff --git a/include/net/nfc/shdlc.h b/include/net/nfc/shdlc.h
index ab06afd462d..35e930d2f63 100644
--- a/include/net/nfc/shdlc.h
+++ b/include/net/nfc/shdlc.h
@@ -27,7 +27,8 @@ struct nfc_shdlc_ops {
         void (*close) (struct nfc_shdlc *shdlc);
         int (*hci_ready) (struct nfc_shdlc *shdlc);
         int (*xmit) (struct nfc_shdlc *shdlc, struct sk_buff *skb);
-        int (*start_poll) (struct nfc_shdlc *shdlc, u32 protocols);
+        int (*start_poll) (struct nfc_shdlc *shdlc,
+                           u32 im_protocols, u32 tm_protocols);
         int (*target_from_gate) (struct nfc_shdlc *shdlc, u8 gate,
                                  struct nfc_target *target);
         int (*complete_target_discovered) (struct nfc_shdlc *shdlc, u8 gate,
diff --git a/include/net/protocol.h b/include/net/protocol.h
index 875f4895b03..057f2d31556 100644
--- a/include/net/protocol.h
+++ b/include/net/protocol.h
@@ -29,11 +29,15 @@
 #include <linux/ipv6.h>
 #endif
 
-#define MAX_INET_PROTOS 256             /* Must be a power of 2         */
-
+/* This is one larger than the largest protocol value that can be
+ * found in an ipv4 or ipv6 header.  Since in both cases the protocol
+ * value is presented in a __u8, this is defined to be 256.
+ */
+#define MAX_INET_PROTOS         256
 
 /* This is used to register protocols. */
 struct net_protocol {
+        void                    (*early_demux)(struct sk_buff *skb);
         int                     (*handler)(struct sk_buff *skb);
         void                    (*err_handler)(struct sk_buff *skb, u32 info);
         int                     (*gso_send_check)(struct sk_buff *skb);
diff --git a/include/net/route.h b/include/net/route.h
index 98705468ac0..52362368af0 100644
--- a/include/net/route.h
+++ b/include/net/route.h
@@ -40,7 +40,6 @@
 #define RT_CONN_FLAGS(sk)   (RT_TOS(inet_sk(sk)->tos) | sock_flag(sk, SOCK_LOCALROUTE))
 
 struct fib_nh;
-struct inet_peer;
 struct fib_info;
 struct rtable {
         struct dst_entry        dst;
@@ -65,9 +64,7 @@ struct rtable {
         __be32                  rt_gateway;
 
         /* Miscellaneous cached information */
-        __be32                  rt_spec_dst; /* RFC1122 specific destination */
-        u32                     rt_peer_genid;
-        struct inet_peer        *peer; /* long-living peer info */
+        u32                     rt_pmtu;
         struct fib_info         *fi; /* for client ref to shared metrics */
 };
 
@@ -181,9 +178,10 @@ static inline int ip_route_input_noref(struct sk_buff *skb, __be32 dst, __be32 s
         return ip_route_input_common(skb, dst, src, tos, devin, true);
 }
 
-extern unsigned short   ip_rt_frag_needed(struct net *net, const struct iphdr *iph,
-                                          unsigned short new_mtu, struct net_device *dev);
-extern void             ip_rt_send_redirect(struct sk_buff *skb);
+extern void ipv4_update_pmtu(struct sk_buff *skb, struct net *net, u32 mtu,
+                             int oif, u32 mark, u8 protocol, int flow_flags);
+extern void ipv4_sk_update_pmtu(struct sk_buff *skb, struct sock *sk, u32 mtu);
+extern void ip_rt_send_redirect(struct sk_buff *skb);
 
 extern unsigned int             inet_addr_type(struct net *net, __be32 addr);
 extern unsigned int             inet_dev_addr_type(struct net *net, const struct net_device *dev, __be32 addr);
@@ -244,8 +242,6 @@ static inline void ip_route_connect_init(struct flowi4 *fl4, __be32 dst, __be32
 
         if (inet_sk(sk)->transparent)
                 flow_flags |= FLOWI_FLAG_ANYSRC;
-        if (protocol == IPPROTO_TCP)
-                flow_flags |= FLOWI_FLAG_PRECOW_METRICS;
         if (can_sleep)
                 flow_flags |= FLOWI_FLAG_CAN_SLEEP;
 
@@ -294,17 +290,6 @@ static inline struct rtable *ip_route_newports(struct flowi4 *fl4, struct rtable
         return rt;
 }
 
-extern void rt_bind_peer(struct rtable *rt, __be32 daddr, int create);
-
-static inline struct inet_peer *rt_get_peer(struct rtable *rt, __be32 daddr)
-{
-        if (rt->peer)
-                return rt->peer;
-
-        rt_bind_peer(rt, daddr, 0);
-        return rt->peer;
-}
-
 static inline int inet_iif(const struct sk_buff *skb)
 {
         return skb_rtable(skb)->rt_iif;
diff --git a/include/net/sock.h b/include/net/sock.h
index 4a452169956..dcb54a0793e 100644
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -198,6 +198,7 @@ struct cg_proto;
   *     @sk_lock:       synchronizer
   *     @sk_rcvbuf: size of receive buffer in bytes
   *     @sk_wq: sock wait queue and async head
+  *     @sk_rx_dst: receive input route used by early tcp demux
   *     @sk_dst_cache: destination cache
   *     @sk_dst_lock: destination cache lock
   *     @sk_policy: flow policy
@@ -317,6 +318,7 @@ struct sock {
         struct xfrm_policy      *sk_policy[2];
 #endif
         unsigned long           sk_flags;
+        struct dst_entry        *sk_rx_dst;
         struct dst_entry        *sk_dst_cache;
         spinlock_t              sk_dst_lock;
         atomic_t                sk_wmem_alloc;
@@ -1426,6 +1428,7 @@ extern struct sk_buff		*sock_rmalloc(struct sock *sk,
                                               gfp_t priority);
 extern void                     sock_wfree(struct sk_buff *skb);
 extern void                     sock_rfree(struct sk_buff *skb);
+extern void                     sock_edemux(struct sk_buff *skb);
 
 extern int                      sock_setsockopt(struct socket *sock, int level,
                                                 int op, char __user *optval,
@@ -2152,7 +2155,7 @@ static inline void sk_change_net(struct sock *sk, struct net *net)
 
 static inline struct sock *skb_steal_sock(struct sk_buff *skb)
 {
-        if (unlikely(skb->sk)) {
+        if (skb->sk) {
                 struct sock *sk = skb->sk;
 
                 skb->destructor = NULL;
diff --git a/include/net/tcp.h b/include/net/tcp.h
index e79aa48d9fc..3618fefae04 100644
--- a/include/net/tcp.h
+++ b/include/net/tcp.h
@@ -325,10 +325,10 @@ extern void tcp_v4_err(struct sk_buff *skb, u32);
 
 extern void tcp_shutdown (struct sock *sk, int how);
 
+extern void tcp_v4_early_demux(struct sk_buff *skb);
 extern int tcp_v4_rcv(struct sk_buff *skb);
 
-extern struct inet_peer *tcp_v4_get_peer(struct sock *sk, bool *release_it);
-extern void *tcp_v4_tw_get_peer(struct sock *sk);
+extern struct inet_peer *tcp_v4_get_peer(struct sock *sk);
 extern int tcp_v4_tw_remember_stamp(struct inet_timewait_sock *tw);
 extern int tcp_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
                        size_t size);
@@ -388,6 +388,13 @@ extern void tcp_enter_frto(struct sock *sk);
 extern void tcp_enter_loss(struct sock *sk, int how);
 extern void tcp_clear_retrans(struct tcp_sock *tp);
 extern void tcp_update_metrics(struct sock *sk);
+extern void tcp_init_metrics(struct sock *sk);
+extern void tcp_metrics_init(void);
+extern bool tcp_peer_is_proven(struct request_sock *req, struct dst_entry *dst, bool paws_check);
+extern bool tcp_remember_stamp(struct sock *sk);
+extern bool tcp_tw_remember_stamp(struct inet_timewait_sock *tw);
+extern void tcp_fetch_timewait_stamp(struct sock *sk, struct dst_entry *dst);
+extern void tcp_disable_fack(struct tcp_sock *tp);
 extern void tcp_close(struct sock *sk, long timeout);
 extern void tcp_init_sock(struct sock *sk);
 extern unsigned int tcp_poll(struct file * file, struct socket *sock,
@@ -556,6 +563,8 @@ static inline u32 __tcp_set_rto(const struct tcp_sock *tp)
         return (tp->srtt >> 3) + tp->rttvar;
 }
 
+extern void tcp_set_rto(struct sock *sk);
+
 static inline void __tcp_fast_path_on(struct tcp_sock *tp, u32 snd_wnd)
 {
         tp->pred_flags = htonl((tp->tcp_header_len << 26) |
diff --git a/include/net/timewait_sock.h b/include/net/timewait_sock.h
index 8d6689cb2c6..68f0ecad6c6 100644
--- a/include/net/timewait_sock.h
+++ b/include/net/timewait_sock.h
@@ -22,7 +22,6 @@ struct timewait_sock_ops {
         int             (*twsk_unique)(struct sock *sk,
                                        struct sock *sktw, void *twp);
         void            (*twsk_destructor)(struct sock *sk);
-        void            *(*twsk_getpeer)(struct sock *sk);
 };
 
 static inline int twsk_unique(struct sock *sk, struct sock *sktw, void *twp)
@@ -41,11 +40,4 @@ static inline void twsk_destructor(struct sock *sk)
                 sk->sk_prot->twsk_prot->twsk_destructor(sk);
 }
 
-static inline void *twsk_getpeer(struct sock *sk)
-{
-        if (sk->sk_prot->twsk_prot->twsk_getpeer)
-                return sk->sk_prot->twsk_prot->twsk_getpeer(sk);
-        return NULL;
-}
-
 #endif /* _TIMEWAIT_SOCK_H */
diff --git a/include/net/xfrm.h b/include/net/xfrm.h
index e0a55df5bde..17acbc92476 100644
--- a/include/net/xfrm.h
+++ b/include/net/xfrm.h
@@ -1682,13 +1682,11 @@ static inline int xfrm_mark_get(struct nlattr **attrs, struct xfrm_mark *m)
 
 static inline int xfrm_mark_put(struct sk_buff *skb, const struct xfrm_mark *m)
 {
-        if ((m->m | m->v) &&
-            nla_put(skb, XFRMA_MARK, sizeof(struct xfrm_mark), m))
-                goto nla_put_failure;
-        return 0;
+        int ret = 0;
 
-nla_put_failure:
-        return -1;
+        if (m->m | m->v)
+                ret = nla_put(skb, XFRMA_MARK, sizeof(struct xfrm_mark), m);
+        return ret;
 }
 
 #endif  /* _NET_XFRM_H */
diff --git a/kernel/audit.c b/kernel/audit.c
index 1c7f2c61416..4a3f28d2ca6 100644
--- a/kernel/audit.c
+++ b/kernel/audit.c
@@ -384,7 +384,7 @@ static void audit_hold_skb(struct sk_buff *skb)
 static void audit_printk_skb(struct sk_buff *skb)
 {
         struct nlmsghdr *nlh = nlmsg_hdr(skb);
-        char *data = NLMSG_DATA(nlh);
+        char *data = nlmsg_data(nlh);
 
         if (nlh->nlmsg_type != AUDIT_EOE) {
                 if (printk_ratelimit())
@@ -516,14 +516,15 @@ struct sk_buff *audit_make_reply(int pid, int seq, int type, int done,
         if (!skb)
                 return NULL;
 
-        nlh     = NLMSG_NEW(skb, pid, seq, t, size, flags);
-        data    = NLMSG_DATA(nlh);
+        nlh     = nlmsg_put(skb, pid, seq, t, size, flags);
+        if (!nlh)
+                goto out_kfree_skb;
+        data = nlmsg_data(nlh);
         memcpy(data, payload, size);
         return skb;
 
-nlmsg_failure:                  /* Used by NLMSG_NEW */
-        if (skb)
-                kfree_skb(skb);
+out_kfree_skb:
+        kfree_skb(skb);
         return NULL;
 }
 
@@ -680,7 +681,7 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
         sessionid = audit_get_sessionid(current);
         security_task_getsecid(current, &sid);
         seq  = nlh->nlmsg_seq;
-        data = NLMSG_DATA(nlh);
+        data = nlmsg_data(nlh);
 
         switch (msg_type) {
         case AUDIT_GET:
@@ -961,14 +962,17 @@ static void audit_receive(struct sk_buff  *skb)
 static int __init audit_init(void)
 {
         int i;
+        struct netlink_kernel_cfg cfg = {
+                .input  = audit_receive,
+        };
 
         if (audit_initialized == AUDIT_DISABLED)
                 return 0;
 
         printk(KERN_INFO "audit: initializing netlink socket (%s)\n",
                audit_default ? "enabled" : "disabled");
-        audit_sock = netlink_kernel_create(&init_net, NETLINK_AUDIT, 0,
-                                           audit_receive, NULL, THIS_MODULE);
+        audit_sock = netlink_kernel_create(&init_net, NETLINK_AUDIT,
+                                           THIS_MODULE, &cfg);
         if (!audit_sock)
                 audit_panic("cannot initialize netlink socket");
         else
@@ -1060,13 +1064,15 @@ static struct audit_buffer * audit_buffer_alloc(struct audit_context *ctx,
 
         ab->skb = nlmsg_new(AUDIT_BUFSIZ, gfp_mask);
         if (!ab->skb)
-                goto nlmsg_failure;
+                goto err;
 
-        nlh = NLMSG_NEW(ab->skb, 0, 0, type, 0, 0);
+        nlh = nlmsg_put(ab->skb, 0, 0, type, 0, 0);
+        if (!nlh)
+                goto out_kfree_skb;
 
         return ab;
 
-nlmsg_failure:                  /* Used by NLMSG_NEW */
+out_kfree_skb:
         kfree_skb(ab->skb);
         ab->skb = NULL;
 err:
diff --git a/lib/kobject_uevent.c b/lib/kobject_uevent.c
index 1a91efa6d12..0401d2916d9 100644
--- a/lib/kobject_uevent.c
+++ b/lib/kobject_uevent.c
@@ -373,13 +373,16 @@ EXPORT_SYMBOL_GPL(add_uevent_var);
 static int uevent_net_init(struct net *net)
 {
         struct uevent_sock *ue_sk;
+        struct netlink_kernel_cfg cfg = {
+                .groups = 1,
+        };
 
         ue_sk = kzalloc(sizeof(*ue_sk), GFP_KERNEL);
         if (!ue_sk)
                 return -ENOMEM;
 
         ue_sk->sk = netlink_kernel_create(net, NETLINK_KOBJECT_UEVENT,
-                                          1, NULL, NULL, THIS_MODULE);
+                                          THIS_MODULE, &cfg);
         if (!ue_sk->sk) {
                 printk(KERN_ERR
                        "kobject_uevent: unable to create netlink socket!\n");
diff --git a/net/9p/client.c b/net/9p/client.c
index a170893d70e..8260f132b32 100644
--- a/net/9p/client.c
+++ b/net/9p/client.c
@@ -1548,7 +1548,7 @@ p9_client_read(struct p9_fid *fid, char *data, char __user *udata, u64 offset,
                         kernel_buf = 1;
                         indata = data;
                 } else
-                        indata = (char *)udata;
+                        indata = (__force char *)udata;
                 /*
                  * response header len is 11
                  * PDU Header(7) + IO Size (4)
diff --git a/net/9p/trans_virtio.c b/net/9p/trans_virtio.c
index 2a167658bb9..35b8911b1c8 100644
--- a/net/9p/trans_virtio.c
+++ b/net/9p/trans_virtio.c
@@ -212,7 +212,7 @@ static int p9_virtio_cancel(struct p9_client *client, struct p9_req_t *req)
  * this takes a list of pages.
  * @sg: scatter/gather list to pack into
  * @start: which segment of the sg_list to start at
- * @**pdata: a list of pages to add into sg.
+ * @pdata: a list of pages to add into sg.
  * @nr_pages: number of pages to pack into the scatter/gather list
  * @data: data to pack into scatter/gather list
  * @count: amount of data to pack into the scatter/gather list
diff --git a/net/appletalk/ddp.c b/net/appletalk/ddp.c
index 86852963b7f..33475291c9c 100644
--- a/net/appletalk/ddp.c
+++ b/net/appletalk/ddp.c
@@ -129,8 +129,8 @@ found:
 
 /**
  * atalk_find_or_insert_socket - Try to find a socket matching ADDR
- * @sk - socket to insert in the list if it is not there already
- * @sat - address to search for
+ * @sk: socket to insert in the list if it is not there already
+ * @sat: address to search for
  *
  * Try to find a socket matching ADDR in the socket list, if found then return
  * it. If not, insert SK into the socket list.
@@ -1066,8 +1066,8 @@ static int atalk_release(struct socket *sock)
 
 /**
  * atalk_pick_and_bind_port - Pick a source port when one is not given
- * @sk - socket to insert into the tables
- * @sat - address to search for
+ * @sk: socket to insert into the tables
+ * @sat: address to search for
  *
  * Pick a source port when one is not given. If we can find a suitable free
  * one, we insert the socket into the tables using it.
diff --git a/net/atm/lec.c b/net/atm/lec.c
index a7d172105c9..2e3d942e77f 100644
--- a/net/atm/lec.c
+++ b/net/atm/lec.c
@@ -231,9 +231,11 @@ static netdev_tx_t lec_start_xmit(struct sk_buff *skb,
         if (skb_headroom(skb) < 2) {
                 pr_debug("reallocating skb\n");
                 skb2 = skb_realloc_headroom(skb, LEC_HEADER_LEN);
-                kfree_skb(skb);
-                if (skb2 == NULL)
+                if (unlikely(!skb2)) {
+                        kfree_skb(skb);
                         return NETDEV_TX_OK;
+                }
+                consume_skb(skb);
                 skb = skb2;
         }
         skb_push(skb, 2);
@@ -1602,7 +1604,7 @@ static void lec_arp_expire_vcc(unsigned long data)
 {
         unsigned long flags;
         struct lec_arp_table *to_remove = (struct lec_arp_table *)data;
-        struct lec_priv *priv = (struct lec_priv *)to_remove->priv;
+        struct lec_priv *priv = to_remove->priv;
 
         del_timer(&to_remove->timer);
 
diff --git a/net/atm/pppoatm.c b/net/atm/pppoatm.c
index ce1e59fdae7..226dca98944 100644
--- a/net/atm/pppoatm.c
+++ b/net/atm/pppoatm.c
@@ -283,7 +283,7 @@ static int pppoatm_send(struct ppp_channel *chan, struct sk_buff *skb)
                                 kfree_skb(n);
                                 goto nospace;
                         }
-                        kfree_skb(skb);
+                        consume_skb(skb);
                         skb = n;
                         if (skb == NULL)
                                 return DROP_PACKET;
diff --git a/net/ax25/ax25_addr.c b/net/ax25/ax25_addr.c
index 9162409559c..e7c9b0ea17a 100644
--- a/net/ax25/ax25_addr.c
+++ b/net/ax25/ax25_addr.c
@@ -189,8 +189,10 @@ const unsigned char *ax25_addr_parse(const unsigned char *buf, int len,
         digi->ndigi      = 0;
 
         while (!(buf[-1] & AX25_EBIT)) {
-                if (d >= AX25_MAX_DIGIS)  return NULL;  /* Max of 6 digis */
-                if (len < 7) return NULL;       /* Short packet */
+                if (d >= AX25_MAX_DIGIS)
+                        return NULL;
+                if (len < AX25_ADDR_LEN)
+                        return NULL;
 
                 memcpy(&digi->calls[d], buf, AX25_ADDR_LEN);
                 digi->ndigi = d + 1;
diff --git a/net/ax25/ax25_out.c b/net/ax25/ax25_out.c
index be8a25e0db6..be2acab9be9 100644
--- a/net/ax25/ax25_out.c
+++ b/net/ax25/ax25_out.c
@@ -350,7 +350,7 @@ void ax25_transmit_buffer(ax25_cb *ax25, struct sk_buff *skb, int type)
                 if (skb->sk != NULL)
                         skb_set_owner_w(skbn, skb->sk);
 
-                kfree_skb(skb);
+                consume_skb(skb);
                 skb = skbn;
         }
 
diff --git a/net/ax25/ax25_route.c b/net/ax25/ax25_route.c
index a65588040b9..d39097737e3 100644
--- a/net/ax25/ax25_route.c
+++ b/net/ax25/ax25_route.c
@@ -474,7 +474,7 @@ struct sk_buff *ax25_rt_build_path(struct sk_buff *skb, ax25_address *src,
                 if (skb->sk != NULL)
                         skb_set_owner_w(skbn, skb->sk);
 
-                kfree_skb(skb);
+                consume_skb(skb);
 
                 skb = skbn;
         }
diff --git a/net/batman-adv/Makefile b/net/batman-adv/Makefile
index 6d5c1940667..8676d2b1d57 100644
--- a/net/batman-adv/Makefile
+++ b/net/batman-adv/Makefile
@@ -19,11 +19,10 @@
 #
 
 obj-$(CONFIG_BATMAN_ADV) += batman-adv.o
-batman-adv-y += bat_debugfs.o
 batman-adv-y += bat_iv_ogm.o
-batman-adv-y += bat_sysfs.o
 batman-adv-y += bitarray.o
 batman-adv-$(CONFIG_BATMAN_ADV_BLA) += bridge_loop_avoidance.o
+batman-adv-y += debugfs.o
 batman-adv-y += gateway_client.o
 batman-adv-y += gateway_common.o
 batman-adv-y += hard-interface.o
@@ -35,6 +34,7 @@ batman-adv-y += ring_buffer.o
 batman-adv-y += routing.o
 batman-adv-y += send.o
 batman-adv-y += soft-interface.o
+batman-adv-y += sysfs.o
 batman-adv-y += translation-table.o
 batman-adv-y += unicast.o
 batman-adv-y += vis.o
diff --git a/net/batman-adv/bat_algo.h b/net/batman-adv/bat_algo.h
index 9852a688ba4..a0ba3bff9b3 100644
--- a/net/batman-adv/bat_algo.h
+++ b/net/batman-adv/bat_algo.h
@@ -1,5 +1,4 @@
-/*
- * Copyright (C) 2011-2012 B.A.T.M.A.N. contributors:
+/* Copyright (C) 2011-2012 B.A.T.M.A.N. contributors:
  *
  * Marek Lindner
  *
@@ -16,12 +15,11 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA
- *
  */
 
 #ifndef _NET_BATMAN_ADV_BAT_ALGO_H_
 #define _NET_BATMAN_ADV_BAT_ALGO_H_
 
-int bat_iv_init(void);
+int batadv_iv_init(void);
 
 #endif /* _NET_BATMAN_ADV_BAT_ALGO_H_ */
diff --git a/net/batman-adv/bat_debugfs.c b/net/batman-adv/bat_debugfs.c
deleted file mode 100644
index 3b588f86d77..00000000000
--- a/net/batman-adv/bat_debugfs.c
+++ /dev/null
@@ -1,388 +0,0 @@
-/*
- * Copyright (C) 2010-2012 B.A.T.M.A.N. contributors:
- *
- * Marek Lindner
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA
- *
- */
-
-#include "main.h"
-
-#include <linux/debugfs.h>
-
-#include "bat_debugfs.h"
-#include "translation-table.h"
-#include "originator.h"
-#include "hard-interface.h"
-#include "gateway_common.h"
-#include "gateway_client.h"
-#include "soft-interface.h"
-#include "vis.h"
-#include "icmp_socket.h"
-#include "bridge_loop_avoidance.h"
-
-static struct dentry *bat_debugfs;
-
-#ifdef CONFIG_BATMAN_ADV_DEBUG
-#define LOG_BUFF_MASK (log_buff_len-1)
-#define LOG_BUFF(idx) (debug_log->log_buff[(idx) & LOG_BUFF_MASK])
-
-static int log_buff_len = LOG_BUF_LEN;
-
-static void emit_log_char(struct debug_log *debug_log, char c)
-{
-        LOG_BUFF(debug_log->log_end) = c;
-        debug_log->log_end++;
-
-        if (debug_log->log_end - debug_log->log_start > log_buff_len)
-                debug_log->log_start = debug_log->log_end - log_buff_len;
-}
-
-__printf(2, 3)
-static int fdebug_log(struct debug_log *debug_log, const char *fmt, ...)
-{
-        va_list args;
-        static char debug_log_buf[256];
-        char *p;
-
-        if (!debug_log)
-                return 0;
-
-        spin_lock_bh(&debug_log->lock);
-        va_start(args, fmt);
-        vscnprintf(debug_log_buf, sizeof(debug_log_buf), fmt, args);
-        va_end(args);
-
-        for (p = debug_log_buf; *p != 0; p++)
-                emit_log_char(debug_log, *p);
-
-        spin_unlock_bh(&debug_log->lock);
-
-        wake_up(&debug_log->queue_wait);
-
-        return 0;
-}
-
-int debug_log(struct bat_priv *bat_priv, const char *fmt, ...)
-{
-        va_list args;
-        char tmp_log_buf[256];
-
-        va_start(args, fmt);
-        vscnprintf(tmp_log_buf, sizeof(tmp_log_buf), fmt, args);
-        fdebug_log(bat_priv->debug_log, "[%10u] %s",
-                   jiffies_to_msecs(jiffies), tmp_log_buf);
-        va_end(args);
-
-        return 0;
-}
-
-static int log_open(struct inode *inode, struct file *file)
-{
-        nonseekable_open(inode, file);
-        file->private_data = inode->i_private;
-        inc_module_count();
-        return 0;
-}
-
-static int log_release(struct inode *inode, struct file *file)
-{
-        dec_module_count();
-        return 0;
-}
-
-static ssize_t log_read(struct file *file, char __user *buf,
-                        size_t count, loff_t *ppos)
-{
-        struct bat_priv *bat_priv = file->private_data;
-        struct debug_log *debug_log = bat_priv->debug_log;
-        int error, i = 0;
-        char c;
-
-        if ((file->f_flags & O_NONBLOCK) &&
-            !(debug_log->log_end - debug_log->log_start))
-                return -EAGAIN;
-
-        if (!buf)
-                return -EINVAL;
-
-        if (count == 0)
-                return 0;
-
-        if (!access_ok(VERIFY_WRITE, buf, count))
-                return -EFAULT;
-
-        error = wait_event_interruptible(debug_log->queue_wait,
-                                (debug_log->log_start - debug_log->log_end));
-
-        if (error)
-                return error;
-
-        spin_lock_bh(&debug_log->lock);
-
-        while ((!error) && (i < count) &&
-               (debug_log->log_start != debug_log->log_end)) {
-                c = LOG_BUFF(debug_log->log_start);
-
-                debug_log->log_start++;
-
-                spin_unlock_bh(&debug_log->lock);
-
-                error = __put_user(c, buf);
-
-                spin_lock_bh(&debug_log->lock);
-
-                buf++;
-                i++;
-
-        }
-
-        spin_unlock_bh(&debug_log->lock);
-
-        if (!error)
-                return i;
-
-        return error;
-}
-
-static unsigned int log_poll(struct file *file, poll_table *wait)
-{
-        struct bat_priv *bat_priv = file->private_data;
-        struct debug_log *debug_log = bat_priv->debug_log;
-
-        poll_wait(file, &debug_log->queue_wait, wait);
-
-        if (debug_log->log_end - debug_log->log_start)
-                return POLLIN | POLLRDNORM;
-
-        return 0;
-}
-
-static const struct file_operations log_fops = {
-        .open           = log_open,
-        .release        = log_release,
-        .read           = log_read,
-        .poll           = log_poll,
-        .llseek         = no_llseek,
-};
-
-static int debug_log_setup(struct bat_priv *bat_priv)
-{
-        struct dentry *d;
-
-        if (!bat_priv->debug_dir)
-                goto err;
-
-        bat_priv->debug_log = kzalloc(sizeof(*bat_priv->debug_log), GFP_ATOMIC);
-        if (!bat_priv->debug_log)
-                goto err;
-
-        spin_lock_init(&bat_priv->debug_log->lock);
-        init_waitqueue_head(&bat_priv->debug_log->queue_wait);
-
-        d = debugfs_create_file("log", S_IFREG | S_IRUSR,
-                                bat_priv->debug_dir, bat_priv, &log_fops);
-        if (d)
-                goto err;
-
-        return 0;
-
-err:
-        return 1;
-}
-
-static void debug_log_cleanup(struct bat_priv *bat_priv)
-{
-        kfree(bat_priv->debug_log);
-        bat_priv->debug_log = NULL;
-}
-#else /* CONFIG_BATMAN_ADV_DEBUG */
-static int debug_log_setup(struct bat_priv *bat_priv)
-{
-        bat_priv->debug_log = NULL;
-        return 0;
-}
-
-static void debug_log_cleanup(struct bat_priv *bat_priv)
-{
-        return;
-}
-#endif
-
-static int bat_algorithms_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, bat_algo_seq_print_text, NULL);
-}
-
-static int originators_open(struct inode *inode, struct file *file)
-{
-        struct net_device *net_dev = (struct net_device *)inode->i_private;
-        return single_open(file, orig_seq_print_text, net_dev);
-}
-
-static int gateways_open(struct inode *inode, struct file *file)
-{
-        struct net_device *net_dev = (struct net_device *)inode->i_private;
-        return single_open(file, gw_client_seq_print_text, net_dev);
-}
-
-static int transtable_global_open(struct inode *inode, struct file *file)
-{
-        struct net_device *net_dev = (struct net_device *)inode->i_private;
-        return single_open(file, tt_global_seq_print_text, net_dev);
-}
-
-#ifdef CONFIG_BATMAN_ADV_BLA
-static int bla_claim_table_open(struct inode *inode, struct file *file)
-{
-        struct net_device *net_dev = (struct net_device *)inode->i_private;
-        return single_open(file, bla_claim_table_seq_print_text, net_dev);
-}
-#endif
-
-static int transtable_local_open(struct inode *inode, struct file *file)
-{
-        struct net_device *net_dev = (struct net_device *)inode->i_private;
-        return single_open(file, tt_local_seq_print_text, net_dev);
-}
-
-static int vis_data_open(struct inode *inode, struct file *file)
-{
-        struct net_device *net_dev = (struct net_device *)inode->i_private;
-        return single_open(file, vis_seq_print_text, net_dev);
-}
-
-struct bat_debuginfo {
-        struct attribute attr;
-        const struct file_operations fops;
-};
-
-#define BAT_DEBUGINFO(_name, _mode, _open)      \
-struct bat_debuginfo bat_debuginfo_##_name = {  \
-        .attr = { .name = __stringify(_name),   \
-                  .mode = _mode, },             \
-        .fops = { .owner = THIS_MODULE,         \
-                  .open = _open,                \
-                  .read = seq_read,             \
-                  .llseek = seq_lseek,          \
-                  .release = single_release,    \
-                }                               \
-};
-
-static BAT_DEBUGINFO(routing_algos, S_IRUGO, bat_algorithms_open);
-static BAT_DEBUGINFO(originators, S_IRUGO, originators_open);
-static BAT_DEBUGINFO(gateways, S_IRUGO, gateways_open);
-static BAT_DEBUGINFO(transtable_global, S_IRUGO, transtable_global_open);
-#ifdef CONFIG_BATMAN_ADV_BLA
-static BAT_DEBUGINFO(bla_claim_table, S_IRUGO, bla_claim_table_open);
-#endif
-static BAT_DEBUGINFO(transtable_local, S_IRUGO, transtable_local_open);
-static BAT_DEBUGINFO(vis_data, S_IRUGO, vis_data_open);
-
-static struct bat_debuginfo *mesh_debuginfos[] = {
-        &bat_debuginfo_originators,
-        &bat_debuginfo_gateways,
-        &bat_debuginfo_transtable_global,
-#ifdef CONFIG_BATMAN_ADV_BLA
-        &bat_debuginfo_bla_claim_table,
-#endif
-        &bat_debuginfo_transtable_local,
-        &bat_debuginfo_vis_data,
-        NULL,
-};
-
-void debugfs_init(void)
-{
-        struct bat_debuginfo *bat_debug;
-        struct dentry *file;
-
-        bat_debugfs = debugfs_create_dir(DEBUGFS_BAT_SUBDIR, NULL);
-        if (bat_debugfs == ERR_PTR(-ENODEV))
-                bat_debugfs = NULL;
-
-        if (!bat_debugfs)
-                goto out;
-
-        bat_debug = &bat_debuginfo_routing_algos;
-        file = debugfs_create_file(bat_debug->attr.name,
-                                   S_IFREG | bat_debug->attr.mode,
-                                   bat_debugfs, NULL, &bat_debug->fops);
-        if (!file)
-                pr_err("Can't add debugfs file: %s\n", bat_debug->attr.name);
-
-out:
-        return;
-}
-
-void debugfs_destroy(void)
-{
-        if (bat_debugfs) {
-                debugfs_remove_recursive(bat_debugfs);
-                bat_debugfs = NULL;
-        }
-}
-
-int debugfs_add_meshif(struct net_device *dev)
-{
-        struct bat_priv *bat_priv = netdev_priv(dev);
-        struct bat_debuginfo **bat_debug;
-        struct dentry *file;
-
-        if (!bat_debugfs)
-                goto out;
-
-        bat_priv->debug_dir = debugfs_create_dir(dev->name, bat_debugfs);
-        if (!bat_priv->debug_dir)
-                goto out;
-
-        bat_socket_setup(bat_priv);
-        debug_log_setup(bat_priv);
-
-        for (bat_debug = mesh_debuginfos; *bat_debug; ++bat_debug) {
-                file = debugfs_create_file(((*bat_debug)->attr).name,
-                                          S_IFREG | ((*bat_debug)->attr).mode,
-                                          bat_priv->debug_dir,
-                                          dev, &(*bat_debug)->fops);
-                if (!file) {
-                        bat_err(dev, "Can't add debugfs file: %s/%s\n",
-                                dev->name, ((*bat_debug)->attr).name);
-                        goto rem_attr;
-                }
-        }
-
-        return 0;
-rem_attr:
-        debugfs_remove_recursive(bat_priv->debug_dir);
-        bat_priv->debug_dir = NULL;
-out:
-#ifdef CONFIG_DEBUG_FS
-        return -ENOMEM;
-#else
-        return 0;
-#endif /* CONFIG_DEBUG_FS */
-}
-
-void debugfs_del_meshif(struct net_device *dev)
-{
-        struct bat_priv *bat_priv = netdev_priv(dev);
-
-        debug_log_cleanup(bat_priv);
-
-        if (bat_debugfs) {
-                debugfs_remove_recursive(bat_priv->debug_dir);
-                bat_priv->debug_dir = NULL;
-        }
-}
diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c
index dc53798ebb4..e877af8bdd1 100644
--- a/net/batman-adv/bat_iv_ogm.c
+++ b/net/batman-adv/bat_iv_ogm.c
@@ -1,5 +1,4 @@
-/*
- * Copyright (C) 2007-2012 B.A.T.M.A.N. contributors:
+/* Copyright (C) 2007-2012 B.A.T.M.A.N. contributors:
  *
  * Marek Lindner, Simon Wunderlich
  *
@@ -16,7 +15,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA
- *
  */
 
 #include "main.h"
@@ -30,15 +28,16 @@
 #include "send.h"
 #include "bat_algo.h"
 
-static struct neigh_node *bat_iv_ogm_neigh_new(struct hard_iface *hard_iface,
-                                               const uint8_t *neigh_addr,
-                                               struct orig_node *orig_node,
-                                               struct orig_node *orig_neigh,
-                                               uint32_t seqno)
+static struct batadv_neigh_node *
+batadv_iv_ogm_neigh_new(struct batadv_hard_iface *hard_iface,
+                        const uint8_t *neigh_addr,
+                        struct batadv_orig_node *orig_node,
+                        struct batadv_orig_node *orig_neigh, __be32 seqno)
 {
-        struct neigh_node *neigh_node;
+        struct batadv_neigh_node *neigh_node;
 
-        neigh_node = batadv_neigh_node_new(hard_iface, neigh_addr, seqno);
+        neigh_node = batadv_neigh_node_new(hard_iface, neigh_addr,
+                                           ntohl(seqno));
         if (!neigh_node)
                 goto out;
 
@@ -55,30 +54,30 @@ out:
         return neigh_node;
 }
 
-static int bat_iv_ogm_iface_enable(struct hard_iface *hard_iface)
+static int batadv_iv_ogm_iface_enable(struct batadv_hard_iface *hard_iface)
 {
-        struct batman_ogm_packet *batman_ogm_packet;
+        struct batadv_ogm_packet *batadv_ogm_packet;
         uint32_t random_seqno;
-        int res = -1;
+        int res = -ENOMEM;
 
         /* randomize initial seqno to avoid collision */
         get_random_bytes(&random_seqno, sizeof(random_seqno));
         atomic_set(&hard_iface->seqno, random_seqno);
 
-        hard_iface->packet_len = BATMAN_OGM_HLEN;
+        hard_iface->packet_len = BATADV_OGM_HLEN;
         hard_iface->packet_buff = kmalloc(hard_iface->packet_len, GFP_ATOMIC);
 
         if (!hard_iface->packet_buff)
                 goto out;
 
-        batman_ogm_packet = (struct batman_ogm_packet *)hard_iface->packet_buff;
-        batman_ogm_packet->header.packet_type = BAT_IV_OGM;
-        batman_ogm_packet->header.version = COMPAT_VERSION;
-        batman_ogm_packet->header.ttl = 2;
-        batman_ogm_packet->flags = NO_FLAGS;
-        batman_ogm_packet->tq = TQ_MAX_VALUE;
-        batman_ogm_packet->tt_num_changes = 0;
-        batman_ogm_packet->ttvn = 0;
+        batadv_ogm_packet = (struct batadv_ogm_packet *)hard_iface->packet_buff;
+        batadv_ogm_packet->header.packet_type = BATADV_IV_OGM;
+        batadv_ogm_packet->header.version = BATADV_COMPAT_VERSION;
+        batadv_ogm_packet->header.ttl = 2;
+        batadv_ogm_packet->flags = BATADV_NO_FLAGS;
+        batadv_ogm_packet->tq = BATADV_TQ_MAX_VALUE;
+        batadv_ogm_packet->tt_num_changes = 0;
+        batadv_ogm_packet->ttvn = 0;
 
         res = 0;
 
@@ -86,133 +85,152 @@ out:
         return res;
 }
 
-static void bat_iv_ogm_iface_disable(struct hard_iface *hard_iface)
+static void batadv_iv_ogm_iface_disable(struct batadv_hard_iface *hard_iface)
 {
         kfree(hard_iface->packet_buff);
         hard_iface->packet_buff = NULL;
 }
 
-static void bat_iv_ogm_iface_update_mac(struct hard_iface *hard_iface)
+static void batadv_iv_ogm_iface_update_mac(struct batadv_hard_iface *hard_iface)
 {
-        struct batman_ogm_packet *batman_ogm_packet;
+        struct batadv_ogm_packet *batadv_ogm_packet;
 
-        batman_ogm_packet = (struct batman_ogm_packet *)hard_iface->packet_buff;
-        memcpy(batman_ogm_packet->orig,
+        batadv_ogm_packet = (struct batadv_ogm_packet *)hard_iface->packet_buff;
+        memcpy(batadv_ogm_packet->orig,
                hard_iface->net_dev->dev_addr, ETH_ALEN);
-        memcpy(batman_ogm_packet->prev_sender,
+        memcpy(batadv_ogm_packet->prev_sender,
                hard_iface->net_dev->dev_addr, ETH_ALEN);
 }
 
-static void bat_iv_ogm_primary_iface_set(struct hard_iface *hard_iface)
+static void
+batadv_iv_ogm_primary_iface_set(struct batadv_hard_iface *hard_iface)
 {
-        struct batman_ogm_packet *batman_ogm_packet;
+        struct batadv_ogm_packet *batadv_ogm_packet;
 
-        batman_ogm_packet = (struct batman_ogm_packet *)hard_iface->packet_buff;
-        batman_ogm_packet->flags = PRIMARIES_FIRST_HOP;
-        batman_ogm_packet->header.ttl = TTL;
+        batadv_ogm_packet = (struct batadv_ogm_packet *)hard_iface->packet_buff;
+        batadv_ogm_packet->flags = BATADV_PRIMARIES_FIRST_HOP;
+        batadv_ogm_packet->header.ttl = BATADV_TTL;
 }
 
 /* when do we schedule our own ogm to be sent */
-static unsigned long bat_iv_ogm_emit_send_time(const struct bat_priv *bat_priv)
+static unsigned long
+batadv_iv_ogm_emit_send_time(const struct batadv_priv *bat_priv)
 {
-        return jiffies + msecs_to_jiffies(
-                   atomic_read(&bat_priv->orig_interval) -
-                   JITTER + (random32() % 2*JITTER));
+        unsigned int msecs;
+
+        msecs = atomic_read(&bat_priv->orig_interval) - BATADV_JITTER;
+        msecs += (random32() % 2 * BATADV_JITTER);
+
+        return jiffies + msecs_to_jiffies(msecs);
 }
 
 /* when do we schedule a ogm packet to be sent */
-static unsigned long bat_iv_ogm_fwd_send_time(void)
+static unsigned long batadv_iv_ogm_fwd_send_time(void)
 {
-        return jiffies + msecs_to_jiffies(random32() % (JITTER/2));
+        return jiffies + msecs_to_jiffies(random32() % (BATADV_JITTER / 2));
 }
 
 /* apply hop penalty for a normal link */
-static uint8_t hop_penalty(uint8_t tq, const struct bat_priv *bat_priv)
+static uint8_t batadv_hop_penalty(uint8_t tq,
+                                  const struct batadv_priv *bat_priv)
 {
         int hop_penalty = atomic_read(&bat_priv->hop_penalty);
-        return (tq * (TQ_MAX_VALUE - hop_penalty)) / (TQ_MAX_VALUE);
+        int new_tq;
+
+        new_tq = tq * (BATADV_TQ_MAX_VALUE - hop_penalty);
+        new_tq /= BATADV_TQ_MAX_VALUE;
+
+        return new_tq;
 }
 
 /* is there another aggregated packet here? */
-static int bat_iv_ogm_aggr_packet(int buff_pos, int packet_len,
-                                  int tt_num_changes)
+static int batadv_iv_ogm_aggr_packet(int buff_pos, int packet_len,
+                                     int tt_num_changes)
 {
-        int next_buff_pos = buff_pos + BATMAN_OGM_HLEN + tt_len(tt_num_changes);
+        int next_buff_pos = 0;
+
+        next_buff_pos += buff_pos + BATADV_OGM_HLEN;
+        next_buff_pos += batadv_tt_len(tt_num_changes);
 
         return (next_buff_pos <= packet_len) &&
-                (next_buff_pos <= MAX_AGGREGATION_BYTES);
+               (next_buff_pos <= BATADV_MAX_AGGREGATION_BYTES);
 }
 
 /* send a batman ogm to a given interface */
-static void bat_iv_ogm_send_to_if(struct forw_packet *forw_packet,
-                                  struct hard_iface *hard_iface)
+static void batadv_iv_ogm_send_to_if(struct batadv_forw_packet *forw_packet,
+                                     struct batadv_hard_iface *hard_iface)
 {
-        struct bat_priv *bat_priv = netdev_priv(hard_iface->soft_iface);
+        struct batadv_priv *bat_priv = netdev_priv(hard_iface->soft_iface);
         char *fwd_str;
         uint8_t packet_num;
         int16_t buff_pos;
-        struct batman_ogm_packet *batman_ogm_packet;
+        struct batadv_ogm_packet *batadv_ogm_packet;
         struct sk_buff *skb;
 
-        if (hard_iface->if_status != IF_ACTIVE)
+        if (hard_iface->if_status != BATADV_IF_ACTIVE)
                 return;
 
         packet_num = 0;
         buff_pos = 0;
-        batman_ogm_packet = (struct batman_ogm_packet *)forw_packet->skb->data;
+        batadv_ogm_packet = (struct batadv_ogm_packet *)forw_packet->skb->data;
 
         /* adjust all flags and log packets */
-        while (bat_iv_ogm_aggr_packet(buff_pos, forw_packet->packet_len,
-                                      batman_ogm_packet->tt_num_changes)) {
+        while (batadv_iv_ogm_aggr_packet(buff_pos, forw_packet->packet_len,
+                                         batadv_ogm_packet->tt_num_changes)) {
 
                 /* we might have aggregated direct link packets with an
-                 * ordinary base packet */
+                 * ordinary base packet
+                 */
                 if ((forw_packet->direct_link_flags & (1 << packet_num)) &&
                     (forw_packet->if_incoming == hard_iface))
-                        batman_ogm_packet->flags |= DIRECTLINK;
+                        batadv_ogm_packet->flags |= BATADV_DIRECTLINK;
                 else
-                        batman_ogm_packet->flags &= ~DIRECTLINK;
+                        batadv_ogm_packet->flags &= ~BATADV_DIRECTLINK;
 
                 fwd_str = (packet_num > 0 ? "Forwarding" : (forw_packet->own ?
                                                             "Sending own" :
                                                             "Forwarding"));
-                bat_dbg(DBG_BATMAN, bat_priv,
-                        "%s %spacket (originator %pM, seqno %u, TQ %d, TTL %d, IDF %s, ttvn %d) on interface %s [%pM]\n",
-                        fwd_str, (packet_num > 0 ? "aggregated " : ""),
-                        batman_ogm_packet->orig,
-                        ntohl(batman_ogm_packet->seqno),
-                        batman_ogm_packet->tq, batman_ogm_packet->header.ttl,
-                        (batman_ogm_packet->flags & DIRECTLINK ?
-                         "on" : "off"),
-                        batman_ogm_packet->ttvn, hard_iface->net_dev->name,
-                        hard_iface->net_dev->dev_addr);
-
-                buff_pos += BATMAN_OGM_HLEN +
-                                tt_len(batman_ogm_packet->tt_num_changes);
+                batadv_dbg(BATADV_DBG_BATMAN, bat_priv,
+                           "%s %spacket (originator %pM, seqno %u, TQ %d, TTL %d, IDF %s, ttvn %d) on interface %s [%pM]\n",
+                           fwd_str, (packet_num > 0 ? "aggregated " : ""),
+                           batadv_ogm_packet->orig,
+                           ntohl(batadv_ogm_packet->seqno),
+                           batadv_ogm_packet->tq, batadv_ogm_packet->header.ttl,
+                           (batadv_ogm_packet->flags & BATADV_DIRECTLINK ?
+                            "on" : "off"),
+                           batadv_ogm_packet->ttvn, hard_iface->net_dev->name,
+                           hard_iface->net_dev->dev_addr);
+
+                buff_pos += BATADV_OGM_HLEN;
+                buff_pos += batadv_tt_len(batadv_ogm_packet->tt_num_changes);
                 packet_num++;
-                batman_ogm_packet = (struct batman_ogm_packet *)
+                batadv_ogm_packet = (struct batadv_ogm_packet *)
                                         (forw_packet->skb->data + buff_pos);
         }
 
         /* create clone because function is called more than once */
         skb = skb_clone(forw_packet->skb, GFP_ATOMIC);
-        if (skb)
-                send_skb_packet(skb, hard_iface, broadcast_addr);
+        if (skb) {
+                batadv_inc_counter(bat_priv, BATADV_CNT_MGMT_TX);
+                batadv_add_counter(bat_priv, BATADV_CNT_MGMT_TX_BYTES,
+                                   skb->len + ETH_HLEN);
+                batadv_send_skb_packet(skb, hard_iface, batadv_broadcast_addr);
+        }
 }
 
 /* send a batman ogm packet */
-static void bat_iv_ogm_emit(struct forw_packet *forw_packet)
+static void batadv_iv_ogm_emit(struct batadv_forw_packet *forw_packet)
 {
-        struct hard_iface *hard_iface;
+        struct batadv_hard_iface *hard_iface;
         struct net_device *soft_iface;
-        struct bat_priv *bat_priv;
-        struct hard_iface *primary_if = NULL;
-        struct batman_ogm_packet *batman_ogm_packet;
+        struct batadv_priv *bat_priv;
+        struct batadv_hard_iface *primary_if = NULL;
+        struct batadv_ogm_packet *batadv_ogm_packet;
         unsigned char directlink;
 
-        batman_ogm_packet = (struct batman_ogm_packet *)
+        batadv_ogm_packet = (struct batadv_ogm_packet *)
                                                 (forw_packet->skb->data);
-        directlink = (batman_ogm_packet->flags & DIRECTLINK ? 1 : 0);
+        directlink = (batadv_ogm_packet->flags & BATADV_DIRECTLINK ? 1 : 0);
 
         if (!forw_packet->if_incoming) {
                 pr_err("Error - can't forward packet: incoming iface not specified\n");
@@ -222,31 +240,33 @@ static void bat_iv_ogm_emit(struct forw_packet *forw_packet)
         soft_iface = forw_packet->if_incoming->soft_iface;
         bat_priv = netdev_priv(soft_iface);
 
-        if (forw_packet->if_incoming->if_status != IF_ACTIVE)
+        if (forw_packet->if_incoming->if_status != BATADV_IF_ACTIVE)
                 goto out;
 
-        primary_if = primary_if_get_selected(bat_priv);
+        primary_if = batadv_primary_if_get_selected(bat_priv);
         if (!primary_if)
                 goto out;
 
-        /* multihomed peer assumed */
-        /* non-primary OGMs are only broadcasted on their interface */
-        if ((directlink && (batman_ogm_packet->header.ttl == 1)) ||
+        /* multihomed peer assumed
+         * non-primary OGMs are only broadcasted on their interface
+         */
+        if ((directlink && (batadv_ogm_packet->header.ttl == 1)) ||
             (forw_packet->own && (forw_packet->if_incoming != primary_if))) {
 
                 /* FIXME: what about aggregated packets ? */
-                bat_dbg(DBG_BATMAN, bat_priv,
-                        "%s packet (originator %pM, seqno %u, TTL %d) on interface %s [%pM]\n",
-                        (forw_packet->own ? "Sending own" : "Forwarding"),
-                        batman_ogm_packet->orig,
-                        ntohl(batman_ogm_packet->seqno),
-                        batman_ogm_packet->header.ttl,
-                        forw_packet->if_incoming->net_dev->name,
-                        forw_packet->if_incoming->net_dev->dev_addr);
+                batadv_dbg(BATADV_DBG_BATMAN, bat_priv,
+                           "%s packet (originator %pM, seqno %u, TTL %d) on interface %s [%pM]\n",
+                           (forw_packet->own ? "Sending own" : "Forwarding"),
+                           batadv_ogm_packet->orig,
+                           ntohl(batadv_ogm_packet->seqno),
+                           batadv_ogm_packet->header.ttl,
+                           forw_packet->if_incoming->net_dev->name,
+                           forw_packet->if_incoming->net_dev->dev_addr);
 
                 /* skb is only used once and than forw_packet is free'd */
-                send_skb_packet(forw_packet->skb, forw_packet->if_incoming,
-                                broadcast_addr);
+                batadv_send_skb_packet(forw_packet->skb,
+                                       forw_packet->if_incoming,
+                                       batadv_broadcast_addr);
                 forw_packet->skb = NULL;
 
                 goto out;
@@ -254,70 +274,70 @@ static void bat_iv_ogm_emit(struct forw_packet *forw_packet)
 
         /* broadcast on every interface */
         rcu_read_lock();
-        list_for_each_entry_rcu(hard_iface, &hardif_list, list) {
+        list_for_each_entry_rcu(hard_iface, &batadv_hardif_list, list) {
                 if (hard_iface->soft_iface != soft_iface)
                         continue;
 
-                bat_iv_ogm_send_to_if(forw_packet, hard_iface);
+                batadv_iv_ogm_send_to_if(forw_packet, hard_iface);
         }
         rcu_read_unlock();
 
 out:
         if (primary_if)
-                hardif_free_ref(primary_if);
+                batadv_hardif_free_ref(primary_if);
 }
 
 /* return true if new_packet can be aggregated with forw_packet */
-static bool bat_iv_ogm_can_aggregate(const struct batman_ogm_packet
-                                                        *new_batman_ogm_packet,
-                                     struct bat_priv *bat_priv,
-                                     int packet_len, unsigned long send_time,
-                                     bool directlink,
-                                     const struct hard_iface *if_incoming,
-                                     const struct forw_packet *forw_packet)
+static bool
+batadv_iv_ogm_can_aggregate(const struct batadv_ogm_packet *new_bat_ogm_packet,
+                            struct batadv_priv *bat_priv,
+                            int packet_len, unsigned long send_time,
+                            bool directlink,
+                            const struct batadv_hard_iface *if_incoming,
+                            const struct batadv_forw_packet *forw_packet)
 {
-        struct batman_ogm_packet *batman_ogm_packet;
+        struct batadv_ogm_packet *batadv_ogm_packet;
         int aggregated_bytes = forw_packet->packet_len + packet_len;
-        struct hard_iface *primary_if = NULL;
+        struct batadv_hard_iface *primary_if = NULL;
         bool res = false;
+        unsigned long aggregation_end_time;
 
-        batman_ogm_packet = (struct batman_ogm_packet *)forw_packet->skb->data;
+        batadv_ogm_packet = (struct batadv_ogm_packet *)forw_packet->skb->data;
+        aggregation_end_time = send_time;
+        aggregation_end_time += msecs_to_jiffies(BATADV_MAX_AGGREGATION_MS);
 
-        /**
-         * we can aggregate the current packet to this aggregated packet
+        /* we can aggregate the current packet to this aggregated packet
          * if:
          *
          * - the send time is within our MAX_AGGREGATION_MS time
          * - the resulting packet wont be bigger than
          *   MAX_AGGREGATION_BYTES
          */
-
         if (time_before(send_time, forw_packet->send_time) &&
-            time_after_eq(send_time + msecs_to_jiffies(MAX_AGGREGATION_MS),
-                                        forw_packet->send_time) &&
-            (aggregated_bytes <= MAX_AGGREGATION_BYTES)) {
+            time_after_eq(aggregation_end_time, forw_packet->send_time) &&
+            (aggregated_bytes <= BATADV_MAX_AGGREGATION_BYTES)) {
 
-                /**
-                 * check aggregation compatibility
+                /* check aggregation compatibility
                  * -> direct link packets are broadcasted on
                  *    their interface only
                  * -> aggregate packet if the current packet is
                  *    a "global" packet as well as the base
                  *    packet
                  */
-
-                primary_if = primary_if_get_selected(bat_priv);
+                primary_if = batadv_primary_if_get_selected(bat_priv);
                 if (!primary_if)
                         goto out;
 
                 /* packets without direct link flag and high TTL
-                 * are flooded through the net  */
+                 * are flooded through the net
+                 */
                 if ((!directlink) &&
-                    (!(batman_ogm_packet->flags & DIRECTLINK)) &&
-                    (batman_ogm_packet->header.ttl != 1) &&
+                    (!(batadv_ogm_packet->flags & BATADV_DIRECTLINK)) &&
+                    (batadv_ogm_packet->header.ttl != 1) &&
 
                     /* own packets originating non-primary
-                     * interfaces leave only that interface */
+                     * interfaces leave only that interface
+                     */
                     ((!forw_packet->own) ||
                      (forw_packet->if_incoming == primary_if))) {
                         res = true;
@@ -325,15 +345,17 @@ static bool bat_iv_ogm_can_aggregate(const struct batman_ogm_packet
                 }
 
                 /* if the incoming packet is sent via this one
-                 * interface only - we still can aggregate */
+                 * interface only - we still can aggregate
+                 */
                 if ((directlink) &&
-                    (new_batman_ogm_packet->header.ttl == 1) &&
+                    (new_bat_ogm_packet->header.ttl == 1) &&
                     (forw_packet->if_incoming == if_incoming) &&
 
                     /* packets from direct neighbors or
                      * own secondary interface packets
-                     * (= secondary interface packets in general) */
-                    (batman_ogm_packet->flags & DIRECTLINK ||
+                     * (= secondary interface packets in general)
+                     */
+                    (batadv_ogm_packet->flags & BATADV_DIRECTLINK ||
                      (forw_packet->own &&
                       forw_packet->if_incoming != primary_if))) {
                         res = true;
@@ -343,29 +365,30 @@ static bool bat_iv_ogm_can_aggregate(const struct batman_ogm_packet
 
 out:
         if (primary_if)
-                hardif_free_ref(primary_if);
+                batadv_hardif_free_ref(primary_if);
         return res;
 }
 
 /* create a new aggregated packet and add this packet to it */
-static void bat_iv_ogm_aggregate_new(const unsigned char *packet_buff,
-                                     int packet_len, unsigned long send_time,
-                                     bool direct_link,
-                                     struct hard_iface *if_incoming,
-                                     int own_packet)
+static void batadv_iv_ogm_aggregate_new(const unsigned char *packet_buff,
+                                        int packet_len, unsigned long send_time,
+                                        bool direct_link,
+                                        struct batadv_hard_iface *if_incoming,
+                                        int own_packet)
 {
-        struct bat_priv *bat_priv = netdev_priv(if_incoming->soft_iface);
-        struct forw_packet *forw_packet_aggr;
+        struct batadv_priv *bat_priv = netdev_priv(if_incoming->soft_iface);
+        struct batadv_forw_packet *forw_packet_aggr;
         unsigned char *skb_buff;
+        unsigned int skb_size;
 
         if (!atomic_inc_not_zero(&if_incoming->refcount))
                 return;
 
         /* own packet should always be scheduled */
         if (!own_packet) {
-                if (!atomic_dec_not_zero(&bat_priv->batman_queue_left)) {
-                        bat_dbg(DBG_BATMAN, bat_priv,
-                                "batman packet queue full\n");
+                if (!batadv_atomic_dec_not_zero(&bat_priv->batman_queue_left)) {
+                        batadv_dbg(BATADV_DBG_BATMAN, bat_priv,
+                                   "batman packet queue full\n");
                         goto out;
                 }
         }
@@ -378,12 +401,12 @@ static void bat_iv_ogm_aggregate_new(const unsigned char *packet_buff,
         }
 
         if ((atomic_read(&bat_priv->aggregated_ogms)) &&
-            (packet_len < MAX_AGGREGATION_BYTES))
-                forw_packet_aggr->skb = dev_alloc_skb(MAX_AGGREGATION_BYTES +
-                                                      ETH_HLEN);
+            (packet_len < BATADV_MAX_AGGREGATION_BYTES))
+                skb_size = BATADV_MAX_AGGREGATION_BYTES + ETH_HLEN;
         else
-                forw_packet_aggr->skb = dev_alloc_skb(packet_len + ETH_HLEN);
+                skb_size = packet_len + ETH_HLEN;
 
+        forw_packet_aggr->skb = dev_alloc_skb(skb_size);
         if (!forw_packet_aggr->skb) {
                 if (!own_packet)
                         atomic_inc(&bat_priv->batman_queue_left);
@@ -401,7 +424,7 @@ static void bat_iv_ogm_aggregate_new(const unsigned char *packet_buff,
         forw_packet_aggr->own = own_packet;
         forw_packet_aggr->if_incoming = if_incoming;
         forw_packet_aggr->num_packets = 0;
-        forw_packet_aggr->direct_link_flags = NO_FLAGS;
+        forw_packet_aggr->direct_link_flags = BATADV_NO_FLAGS;
         forw_packet_aggr->send_time = send_time;
 
         /* save packet direct link flag status */
@@ -415,20 +438,20 @@ static void bat_iv_ogm_aggregate_new(const unsigned char *packet_buff,
 
         /* start timer for this packet */
         INIT_DELAYED_WORK(&forw_packet_aggr->delayed_work,
-                          send_outstanding_bat_ogm_packet);
-        queue_delayed_work(bat_event_workqueue,
+                          batadv_send_outstanding_bat_ogm_packet);
+        queue_delayed_work(batadv_event_workqueue,
                            &forw_packet_aggr->delayed_work,
                            send_time - jiffies);
 
         return;
 out:
-        hardif_free_ref(if_incoming);
+        batadv_hardif_free_ref(if_incoming);
 }
 
 /* aggregate a new packet into the existing ogm packet */
-static void bat_iv_ogm_aggregate(struct forw_packet *forw_packet_aggr,
-                                 const unsigned char *packet_buff,
-                                 int packet_len, bool direct_link)
+static void batadv_iv_ogm_aggregate(struct batadv_forw_packet *forw_packet_aggr,
+                                    const unsigned char *packet_buff,
+                                    int packet_len, bool direct_link)
 {
         unsigned char *skb_buff;
 
@@ -443,22 +466,25 @@ static void bat_iv_ogm_aggregate(struct forw_packet *forw_packet_aggr,
                         (1 << forw_packet_aggr->num_packets);
 }
 
-static void bat_iv_ogm_queue_add(struct bat_priv *bat_priv,
-                                 unsigned char *packet_buff,
-                                 int packet_len, struct hard_iface *if_incoming,
-                                 int own_packet, unsigned long send_time)
+static void batadv_iv_ogm_queue_add(struct batadv_priv *bat_priv,
+                                    unsigned char *packet_buff,
+                                    int packet_len,
+                                    struct batadv_hard_iface *if_incoming,
+                                    int own_packet, unsigned long send_time)
 {
-        /**
-         * _aggr -> pointer to the packet we want to aggregate with
+        /* _aggr -> pointer to the packet we want to aggregate with
          * _pos -> pointer to the position in the queue
          */
-        struct forw_packet *forw_packet_aggr = NULL, *forw_packet_pos = NULL;
+        struct batadv_forw_packet *forw_packet_aggr = NULL;
+        struct batadv_forw_packet *forw_packet_pos = NULL;
         struct hlist_node *tmp_node;
-        struct batman_ogm_packet *batman_ogm_packet;
+        struct batadv_ogm_packet *batadv_ogm_packet;
         bool direct_link;
+        unsigned long max_aggregation_jiffies;
 
-        batman_ogm_packet = (struct batman_ogm_packet *)packet_buff;
-        direct_link = batman_ogm_packet->flags & DIRECTLINK ? 1 : 0;
+        batadv_ogm_packet = (struct batadv_ogm_packet *)packet_buff;
+        direct_link = batadv_ogm_packet->flags & BATADV_DIRECTLINK ? 1 : 0;
+        max_aggregation_jiffies = msecs_to_jiffies(BATADV_MAX_AGGREGATION_MS);
 
         /* find position for the packet in the forward queue */
         spin_lock_bh(&bat_priv->forw_bat_list_lock);
@@ -466,11 +492,11 @@ static void bat_iv_ogm_queue_add(struct bat_priv *bat_priv,
         if ((atomic_read(&bat_priv->aggregated_ogms)) && (!own_packet)) {
                 hlist_for_each_entry(forw_packet_pos, tmp_node,
                                      &bat_priv->forw_bat_list, list) {
-                        if (bat_iv_ogm_can_aggregate(batman_ogm_packet,
-                                                     bat_priv, packet_len,
-                                                     send_time, direct_link,
-                                                     if_incoming,
-                                                     forw_packet_pos)) {
+                        if (batadv_iv_ogm_can_aggregate(batadv_ogm_packet,
+                                                        bat_priv, packet_len,
+                                                        send_time, direct_link,
+                                                        if_incoming,
+                                                        forw_packet_pos)) {
                                 forw_packet_aggr = forw_packet_pos;
                                 break;
                         }
@@ -478,42 +504,41 @@ static void bat_iv_ogm_queue_add(struct bat_priv *bat_priv,
         }
 
         /* nothing to aggregate with - either aggregation disabled or no
-         * suitable aggregation packet found */
+         * suitable aggregation packet found
+         */
         if (!forw_packet_aggr) {
                 /* the following section can run without the lock */
                 spin_unlock_bh(&bat_priv->forw_bat_list_lock);
 
-                /**
-                 * if we could not aggregate this packet with one of the others
+                /* if we could not aggregate this packet with one of the others
                  * we hold it back for a while, so that it might be aggregated
                  * later on
                  */
-                if ((!own_packet) &&
-                    (atomic_read(&bat_priv->aggregated_ogms)))
-                        send_time += msecs_to_jiffies(MAX_AGGREGATION_MS);
+                if (!own_packet && atomic_read(&bat_priv->aggregated_ogms))
+                        send_time += max_aggregation_jiffies;
 
-                bat_iv_ogm_aggregate_new(packet_buff, packet_len,
-                                         send_time, direct_link,
-                                         if_incoming, own_packet);
+                batadv_iv_ogm_aggregate_new(packet_buff, packet_len,
+                                            send_time, direct_link,
+                                            if_incoming, own_packet);
         } else {
-                bat_iv_ogm_aggregate(forw_packet_aggr, packet_buff,
-                                     packet_len, direct_link);
+                batadv_iv_ogm_aggregate(forw_packet_aggr, packet_buff,
+                                        packet_len, direct_link);
                 spin_unlock_bh(&bat_priv->forw_bat_list_lock);
         }
 }
 
-static void bat_iv_ogm_forward(struct orig_node *orig_node,
-                               const struct ethhdr *ethhdr,
-                               struct batman_ogm_packet *batman_ogm_packet,
-                               bool is_single_hop_neigh,
-                               bool is_from_best_next_hop,
-                               struct hard_iface *if_incoming)
+static void batadv_iv_ogm_forward(struct batadv_orig_node *orig_node,
+                                  const struct ethhdr *ethhdr,
+                                  struct batadv_ogm_packet *batadv_ogm_packet,
+                                  bool is_single_hop_neigh,
+                                  bool is_from_best_next_hop,
+                                  struct batadv_hard_iface *if_incoming)
 {
-        struct bat_priv *bat_priv = netdev_priv(if_incoming->soft_iface);
+        struct batadv_priv *bat_priv = netdev_priv(if_incoming->soft_iface);
         uint8_t tt_num_changes;
 
-        if (batman_ogm_packet->header.ttl <= 1) {
-                bat_dbg(DBG_BATMAN, bat_priv, "ttl exceeded\n");
+        if (batadv_ogm_packet->header.ttl <= 1) {
+                batadv_dbg(BATADV_DBG_BATMAN, bat_priv, "ttl exceeded\n");
                 return;
         }
 
@@ -525,110 +550,113 @@ static void bat_iv_ogm_forward(struct orig_node *orig_node,
                  * simply drop the ogm.
                  */
                 if (is_single_hop_neigh)
-                        batman_ogm_packet->flags |= NOT_BEST_NEXT_HOP;
+                        batadv_ogm_packet->flags |= BATADV_NOT_BEST_NEXT_HOP;
                 else
                         return;
         }
 
-        tt_num_changes = batman_ogm_packet->tt_num_changes;
+        tt_num_changes = batadv_ogm_packet->tt_num_changes;
 
-        batman_ogm_packet->header.ttl--;
-        memcpy(batman_ogm_packet->prev_sender, ethhdr->h_source, ETH_ALEN);
+        batadv_ogm_packet->header.ttl--;
+        memcpy(batadv_ogm_packet->prev_sender, ethhdr->h_source, ETH_ALEN);
 
         /* apply hop penalty */
-        batman_ogm_packet->tq = hop_penalty(batman_ogm_packet->tq, bat_priv);
+        batadv_ogm_packet->tq = batadv_hop_penalty(batadv_ogm_packet->tq,
+                                                   bat_priv);
 
-        bat_dbg(DBG_BATMAN, bat_priv,
-                "Forwarding packet: tq: %i, ttl: %i\n",
-                batman_ogm_packet->tq, batman_ogm_packet->header.ttl);
-
-        batman_ogm_packet->seqno = htonl(batman_ogm_packet->seqno);
-        batman_ogm_packet->tt_crc = htons(batman_ogm_packet->tt_crc);
+        batadv_dbg(BATADV_DBG_BATMAN, bat_priv,
+                   "Forwarding packet: tq: %i, ttl: %i\n",
+                   batadv_ogm_packet->tq, batadv_ogm_packet->header.ttl);
 
         /* switch of primaries first hop flag when forwarding */
-        batman_ogm_packet->flags &= ~PRIMARIES_FIRST_HOP;
+        batadv_ogm_packet->flags &= ~BATADV_PRIMARIES_FIRST_HOP;
         if (is_single_hop_neigh)
-                batman_ogm_packet->flags |= DIRECTLINK;
+                batadv_ogm_packet->flags |= BATADV_DIRECTLINK;
         else
-                batman_ogm_packet->flags &= ~DIRECTLINK;
+                batadv_ogm_packet->flags &= ~BATADV_DIRECTLINK;
 
-        bat_iv_ogm_queue_add(bat_priv, (unsigned char *)batman_ogm_packet,
-                             BATMAN_OGM_HLEN + tt_len(tt_num_changes),
-                             if_incoming, 0, bat_iv_ogm_fwd_send_time());
+        batadv_iv_ogm_queue_add(bat_priv, (unsigned char *)batadv_ogm_packet,
+                                BATADV_OGM_HLEN + batadv_tt_len(tt_num_changes),
+                                if_incoming, 0, batadv_iv_ogm_fwd_send_time());
 }
 
-static void bat_iv_ogm_schedule(struct hard_iface *hard_iface,
-                                int tt_num_changes)
+static void batadv_iv_ogm_schedule(struct batadv_hard_iface *hard_iface)
 {
-        struct bat_priv *bat_priv = netdev_priv(hard_iface->soft_iface);
-        struct batman_ogm_packet *batman_ogm_packet;
-        struct hard_iface *primary_if;
-        int vis_server;
+        struct batadv_priv *bat_priv = netdev_priv(hard_iface->soft_iface);
+        struct batadv_ogm_packet *batadv_ogm_packet;
+        struct batadv_hard_iface *primary_if;
+        int vis_server, tt_num_changes = 0;
 
         vis_server = atomic_read(&bat_priv->vis_mode);
-        primary_if = primary_if_get_selected(bat_priv);
+        primary_if = batadv_primary_if_get_selected(bat_priv);
+
+        if (hard_iface == primary_if)
+                tt_num_changes = batadv_tt_append_diff(bat_priv,
+                                                       &hard_iface->packet_buff,
+                                                       &hard_iface->packet_len,
+                                                       BATADV_OGM_HLEN);
 
-        batman_ogm_packet = (struct batman_ogm_packet *)hard_iface->packet_buff;
+        batadv_ogm_packet = (struct batadv_ogm_packet *)hard_iface->packet_buff;
 
         /* change sequence number to network order */
-        batman_ogm_packet->seqno =
+        batadv_ogm_packet->seqno =
                         htonl((uint32_t)atomic_read(&hard_iface->seqno));
+        atomic_inc(&hard_iface->seqno);
 
-        batman_ogm_packet->ttvn = atomic_read(&bat_priv->ttvn);
-        batman_ogm_packet->tt_crc = htons((uint16_t)
-                                                atomic_read(&bat_priv->tt_crc));
+        batadv_ogm_packet->ttvn = atomic_read(&bat_priv->ttvn);
+        batadv_ogm_packet->tt_crc = htons(bat_priv->tt_crc);
         if (tt_num_changes >= 0)
-                batman_ogm_packet->tt_num_changes = tt_num_changes;
+                batadv_ogm_packet->tt_num_changes = tt_num_changes;
 
-        if (vis_server == VIS_TYPE_SERVER_SYNC)
-                batman_ogm_packet->flags |= VIS_SERVER;
+        if (vis_server == BATADV_VIS_TYPE_SERVER_SYNC)
+                batadv_ogm_packet->flags |= BATADV_VIS_SERVER;
         else
-                batman_ogm_packet->flags &= ~VIS_SERVER;
+                batadv_ogm_packet->flags &= ~BATADV_VIS_SERVER;
 
         if ((hard_iface == primary_if) &&
-            (atomic_read(&bat_priv->gw_mode) == GW_MODE_SERVER))
-                batman_ogm_packet->gw_flags =
+            (atomic_read(&bat_priv->gw_mode) == BATADV_GW_MODE_SERVER))
+                batadv_ogm_packet->gw_flags =
                                 (uint8_t)atomic_read(&bat_priv->gw_bandwidth);
         else
-                batman_ogm_packet->gw_flags = NO_FLAGS;
-
-        atomic_inc(&hard_iface->seqno);
+                batadv_ogm_packet->gw_flags = BATADV_NO_FLAGS;
 
-        slide_own_bcast_window(hard_iface);
-        bat_iv_ogm_queue_add(bat_priv, hard_iface->packet_buff,
-                             hard_iface->packet_len, hard_iface, 1,
-                             bat_iv_ogm_emit_send_time(bat_priv));
+        batadv_slide_own_bcast_window(hard_iface);
+        batadv_iv_ogm_queue_add(bat_priv, hard_iface->packet_buff,
+                                hard_iface->packet_len, hard_iface, 1,
+                                batadv_iv_ogm_emit_send_time(bat_priv));
 
         if (primary_if)
-                hardif_free_ref(primary_if);
+                batadv_hardif_free_ref(primary_if);
 }
 
-static void bat_iv_ogm_orig_update(struct bat_priv *bat_priv,
-                                   struct orig_node *orig_node,
-                                   const struct ethhdr *ethhdr,
-                                   const struct batman_ogm_packet
-                                                        *batman_ogm_packet,
-                                   struct hard_iface *if_incoming,
-                                   const unsigned char *tt_buff,
-                                   int is_duplicate)
+static void
+batadv_iv_ogm_orig_update(struct batadv_priv *bat_priv,
+                          struct batadv_orig_node *orig_node,
+                          const struct ethhdr *ethhdr,
+                          const struct batadv_ogm_packet *batadv_ogm_packet,
+                          struct batadv_hard_iface *if_incoming,
+                          const unsigned char *tt_buff,
+                          int is_duplicate)
 {
-        struct neigh_node *neigh_node = NULL, *tmp_neigh_node = NULL;
-        struct neigh_node *router = NULL;
-        struct orig_node *orig_node_tmp;
+        struct batadv_neigh_node *neigh_node = NULL, *tmp_neigh_node = NULL;
+        struct batadv_neigh_node *router = NULL;
+        struct batadv_orig_node *orig_node_tmp;
         struct hlist_node *node;
         uint8_t bcast_own_sum_orig, bcast_own_sum_neigh;
+        uint8_t *neigh_addr;
 
-        bat_dbg(DBG_BATMAN, bat_priv,
-                "update_originator(): Searching and updating originator entry of received packet\n");
+        batadv_dbg(BATADV_DBG_BATMAN, bat_priv,
+                   "update_originator(): Searching and updating originator entry of received packet\n");
 
         rcu_read_lock();
         hlist_for_each_entry_rcu(tmp_neigh_node, node,
                                  &orig_node->neigh_list, list) {
-                if (compare_eth(tmp_neigh_node->addr, ethhdr->h_source) &&
-                    (tmp_neigh_node->if_incoming == if_incoming) &&
-                     atomic_inc_not_zero(&tmp_neigh_node->refcount)) {
+                neigh_addr = tmp_neigh_node->addr;
+                if (batadv_compare_eth(neigh_addr, ethhdr->h_source) &&
+                    tmp_neigh_node->if_incoming == if_incoming &&
+                    atomic_inc_not_zero(&tmp_neigh_node->refcount)) {
                         if (neigh_node)
-                                neigh_node_free_ref(neigh_node);
+                                batadv_neigh_node_free_ref(neigh_node);
                         neigh_node = tmp_neigh_node;
                         continue;
                 }
@@ -637,53 +665,55 @@ static void bat_iv_ogm_orig_update(struct bat_priv *bat_priv,
                         continue;
 
                 spin_lock_bh(&tmp_neigh_node->lq_update_lock);
-                ring_buffer_set(tmp_neigh_node->tq_recv,
-                                &tmp_neigh_node->tq_index, 0);
+                batadv_ring_buffer_set(tmp_neigh_node->tq_recv,
+                                       &tmp_neigh_node->tq_index, 0);
                 tmp_neigh_node->tq_avg =
-                        ring_buffer_avg(tmp_neigh_node->tq_recv);
+                        batadv_ring_buffer_avg(tmp_neigh_node->tq_recv);
                 spin_unlock_bh(&tmp_neigh_node->lq_update_lock);
         }
 
         if (!neigh_node) {
-                struct orig_node *orig_tmp;
+                struct batadv_orig_node *orig_tmp;
 
-                orig_tmp = get_orig_node(bat_priv, ethhdr->h_source);
+                orig_tmp = batadv_get_orig_node(bat_priv, ethhdr->h_source);
                 if (!orig_tmp)
                         goto unlock;
 
-                neigh_node = bat_iv_ogm_neigh_new(if_incoming, ethhdr->h_source,
-                                                  orig_node, orig_tmp,
-                                                  batman_ogm_packet->seqno);
+                neigh_node = batadv_iv_ogm_neigh_new(if_incoming,
+                                                     ethhdr->h_source,
+                                                     orig_node, orig_tmp,
+                                                     batadv_ogm_packet->seqno);
 
-                orig_node_free_ref(orig_tmp);
+                batadv_orig_node_free_ref(orig_tmp);
                 if (!neigh_node)
                         goto unlock;
         } else
-                bat_dbg(DBG_BATMAN, bat_priv,
-                        "Updating existing last-hop neighbor of originator\n");
+                batadv_dbg(BATADV_DBG_BATMAN, bat_priv,
+                           "Updating existing last-hop neighbor of originator\n");
 
         rcu_read_unlock();
 
-        orig_node->flags = batman_ogm_packet->flags;
+        orig_node->flags = batadv_ogm_packet->flags;
         neigh_node->last_seen = jiffies;
 
         spin_lock_bh(&neigh_node->lq_update_lock);
-        ring_buffer_set(neigh_node->tq_recv,
-                        &neigh_node->tq_index,
-                        batman_ogm_packet->tq);
-        neigh_node->tq_avg = ring_buffer_avg(neigh_node->tq_recv);
+        batadv_ring_buffer_set(neigh_node->tq_recv,
+                               &neigh_node->tq_index,
+                               batadv_ogm_packet->tq);
+        neigh_node->tq_avg = batadv_ring_buffer_avg(neigh_node->tq_recv);
         spin_unlock_bh(&neigh_node->lq_update_lock);
 
         if (!is_duplicate) {
-                orig_node->last_ttl = batman_ogm_packet->header.ttl;
-                neigh_node->last_ttl = batman_ogm_packet->header.ttl;
+                orig_node->last_ttl = batadv_ogm_packet->header.ttl;
+                neigh_node->last_ttl = batadv_ogm_packet->header.ttl;
         }
 
-        bonding_candidate_add(orig_node, neigh_node);
+        batadv_bonding_candidate_add(orig_node, neigh_node);
 
         /* if this neighbor already is our next hop there is nothing
-         * to change */
-        router = orig_node_get_router(orig_node);
+         * to change
+         */
+        router = batadv_orig_node_get_router(orig_node);
         if (router == neigh_node)
                 goto update_tt;
 
@@ -692,7 +722,8 @@ static void bat_iv_ogm_orig_update(struct bat_priv *bat_priv,
                 goto update_tt;
 
         /* if the TQ is the same and the link not more symmetric we
-         * won't consider it either */
+         * won't consider it either
+         */
         if (router && (neigh_node->tq_avg == router->tq_avg)) {
                 orig_node_tmp = router->orig_node;
                 spin_lock_bh(&orig_node_tmp->ogm_cnt_lock);
@@ -710,30 +741,31 @@ static void bat_iv_ogm_orig_update(struct bat_priv *bat_priv,
                         goto update_tt;
         }
 
-        update_route(bat_priv, orig_node, neigh_node);
+        batadv_update_route(bat_priv, orig_node, neigh_node);
 
 update_tt:
         /* I have to check for transtable changes only if the OGM has been
-         * sent through a primary interface */
-        if (((batman_ogm_packet->orig != ethhdr->h_source) &&
-             (batman_ogm_packet->header.ttl > 2)) ||
-            (batman_ogm_packet->flags & PRIMARIES_FIRST_HOP))
-                tt_update_orig(bat_priv, orig_node, tt_buff,
-                               batman_ogm_packet->tt_num_changes,
-                               batman_ogm_packet->ttvn,
-                               batman_ogm_packet->tt_crc);
+         * sent through a primary interface
+         */
+        if (((batadv_ogm_packet->orig != ethhdr->h_source) &&
+             (batadv_ogm_packet->header.ttl > 2)) ||
+            (batadv_ogm_packet->flags & BATADV_PRIMARIES_FIRST_HOP))
+                batadv_tt_update_orig(bat_priv, orig_node, tt_buff,
+                                      batadv_ogm_packet->tt_num_changes,
+                                      batadv_ogm_packet->ttvn,
+                                      ntohs(batadv_ogm_packet->tt_crc));
 
-        if (orig_node->gw_flags != batman_ogm_packet->gw_flags)
-                gw_node_update(bat_priv, orig_node,
-                               batman_ogm_packet->gw_flags);
+        if (orig_node->gw_flags != batadv_ogm_packet->gw_flags)
+                batadv_gw_node_update(bat_priv, orig_node,
+                                      batadv_ogm_packet->gw_flags);
 
-        orig_node->gw_flags = batman_ogm_packet->gw_flags;
+        orig_node->gw_flags = batadv_ogm_packet->gw_flags;
 
         /* restart gateway selection if fast or late switching was enabled */
         if ((orig_node->gw_flags) &&
-            (atomic_read(&bat_priv->gw_mode) == GW_MODE_CLIENT) &&
+            (atomic_read(&bat_priv->gw_mode) == BATADV_GW_MODE_CLIENT) &&
             (atomic_read(&bat_priv->gw_sel_class) > 2))
-                gw_check_election(bat_priv, orig_node);
+                batadv_gw_check_election(bat_priv, orig_node);
 
         goto out;
 
@@ -741,29 +773,32 @@ unlock:
         rcu_read_unlock();
 out:
         if (neigh_node)
-                neigh_node_free_ref(neigh_node);
+                batadv_neigh_node_free_ref(neigh_node);
         if (router)
-                neigh_node_free_ref(router);
+                batadv_neigh_node_free_ref(router);
 }
 
-static int bat_iv_ogm_calc_tq(struct orig_node *orig_node,
-                              struct orig_node *orig_neigh_node,
-                              struct batman_ogm_packet *batman_ogm_packet,
-                              struct hard_iface *if_incoming)
+static int batadv_iv_ogm_calc_tq(struct batadv_orig_node *orig_node,
+                                 struct batadv_orig_node *orig_neigh_node,
+                                 struct batadv_ogm_packet *batadv_ogm_packet,
+                                 struct batadv_hard_iface *if_incoming)
 {
-        struct bat_priv *bat_priv = netdev_priv(if_incoming->soft_iface);
-        struct neigh_node *neigh_node = NULL, *tmp_neigh_node;
+        struct batadv_priv *bat_priv = netdev_priv(if_incoming->soft_iface);
+        struct batadv_neigh_node *neigh_node = NULL, *tmp_neigh_node;
         struct hlist_node *node;
         uint8_t total_count;
-        uint8_t orig_eq_count, neigh_rq_count, tq_own;
-        int tq_asym_penalty, ret = 0;
+        uint8_t orig_eq_count, neigh_rq_count, neigh_rq_inv, tq_own;
+        unsigned int neigh_rq_inv_cube, neigh_rq_max_cube;
+        int tq_asym_penalty, inv_asym_penalty, ret = 0;
+        unsigned int combined_tq;
 
         /* find corresponding one hop neighbor */
         rcu_read_lock();
         hlist_for_each_entry_rcu(tmp_neigh_node, node,
                                  &orig_neigh_node->neigh_list, list) {
 
-                if (!compare_eth(tmp_neigh_node->addr, orig_neigh_node->orig))
+                if (!batadv_compare_eth(tmp_neigh_node->addr,
+                                        orig_neigh_node->orig))
                         continue;
 
                 if (tmp_neigh_node->if_incoming != if_incoming)
@@ -778,11 +813,11 @@ static int bat_iv_ogm_calc_tq(struct orig_node *orig_node,
         rcu_read_unlock();
 
         if (!neigh_node)
-                neigh_node = bat_iv_ogm_neigh_new(if_incoming,
-                                                  orig_neigh_node->orig,
-                                                  orig_neigh_node,
-                                                  orig_neigh_node,
-                                                  batman_ogm_packet->seqno);
+                neigh_node = batadv_iv_ogm_neigh_new(if_incoming,
+                                                     orig_neigh_node->orig,
+                                                     orig_neigh_node,
+                                                     orig_neigh_node,
+                                                     batadv_ogm_packet->seqno);
 
         if (!neigh_node)
                 goto out;
@@ -803,47 +838,52 @@ static int bat_iv_ogm_calc_tq(struct orig_node *orig_node,
         total_count = (orig_eq_count > neigh_rq_count ?
                        neigh_rq_count : orig_eq_count);
 
-        /* if we have too few packets (too less data) we set tq_own to zero */
-        /* if we receive too few packets it is not considered bidirectional */
-        if ((total_count < TQ_LOCAL_BIDRECT_SEND_MINIMUM) ||
-            (neigh_rq_count < TQ_LOCAL_BIDRECT_RECV_MINIMUM))
+        /* if we have too few packets (too less data) we set tq_own to zero
+         * if we receive too few packets it is not considered bidirectional
+         */
+        if (total_count < BATADV_TQ_LOCAL_BIDRECT_SEND_MINIMUM ||
+            neigh_rq_count < BATADV_TQ_LOCAL_BIDRECT_RECV_MINIMUM)
                 tq_own = 0;
         else
                 /* neigh_node->real_packet_count is never zero as we
                  * only purge old information when getting new
-                 * information */
-                tq_own = (TQ_MAX_VALUE * total_count) / neigh_rq_count;
+                 * information
+                 */
+                tq_own = (BATADV_TQ_MAX_VALUE * total_count) /  neigh_rq_count;
 
         /* 1 - ((1-x) ** 3), normalized to TQ_MAX_VALUE this does
          * affect the nearly-symmetric links only a little, but
          * punishes asymmetric links more.  This will give a value
          * between 0 and TQ_MAX_VALUE
          */
-        tq_asym_penalty = TQ_MAX_VALUE - (TQ_MAX_VALUE *
-                                (TQ_LOCAL_WINDOW_SIZE - neigh_rq_count) *
-                                (TQ_LOCAL_WINDOW_SIZE - neigh_rq_count) *
-                                (TQ_LOCAL_WINDOW_SIZE - neigh_rq_count)) /
-                                        (TQ_LOCAL_WINDOW_SIZE *
-                                         TQ_LOCAL_WINDOW_SIZE *
-                                         TQ_LOCAL_WINDOW_SIZE);
-
-        batman_ogm_packet->tq = ((batman_ogm_packet->tq * tq_own
-                                                        * tq_asym_penalty) /
-                                                (TQ_MAX_VALUE * TQ_MAX_VALUE));
-
-        bat_dbg(DBG_BATMAN, bat_priv,
-                "bidirectional: orig = %-15pM neigh = %-15pM => own_bcast = %2i, real recv = %2i, local tq: %3i, asym_penalty: %3i, total tq: %3i\n",
-                orig_node->orig, orig_neigh_node->orig, total_count,
-                neigh_rq_count, tq_own, tq_asym_penalty, batman_ogm_packet->tq);
+        neigh_rq_inv = BATADV_TQ_LOCAL_WINDOW_SIZE - neigh_rq_count;
+        neigh_rq_inv_cube = neigh_rq_inv * neigh_rq_inv * neigh_rq_inv;
+        neigh_rq_max_cube = BATADV_TQ_LOCAL_WINDOW_SIZE *
+                            BATADV_TQ_LOCAL_WINDOW_SIZE *
+                            BATADV_TQ_LOCAL_WINDOW_SIZE;
+        inv_asym_penalty = BATADV_TQ_MAX_VALUE * neigh_rq_inv_cube;
+        inv_asym_penalty /= neigh_rq_max_cube;
+        tq_asym_penalty = BATADV_TQ_MAX_VALUE - inv_asym_penalty;
+
+        combined_tq = batadv_ogm_packet->tq * tq_own * tq_asym_penalty;
+        combined_tq /= BATADV_TQ_MAX_VALUE * BATADV_TQ_MAX_VALUE;
+        batadv_ogm_packet->tq = combined_tq;
+
+        batadv_dbg(BATADV_DBG_BATMAN, bat_priv,
+                   "bidirectional: orig = %-15pM neigh = %-15pM => own_bcast = %2i, real recv = %2i, local tq: %3i, asym_penalty: %3i, total tq: %3i\n",
+                   orig_node->orig, orig_neigh_node->orig, total_count,
+                   neigh_rq_count, tq_own,
+                   tq_asym_penalty, batadv_ogm_packet->tq);
 
         /* if link has the minimum required transmission quality
-         * consider it bidirectional */
-        if (batman_ogm_packet->tq >= TQ_TOTAL_BIDRECT_LIMIT)
+         * consider it bidirectional
+         */
+        if (batadv_ogm_packet->tq >= BATADV_TQ_TOTAL_BIDRECT_LIMIT)
                 ret = 1;
 
 out:
         if (neigh_node)
-                neigh_node_free_ref(neigh_node);
+                batadv_neigh_node_free_ref(neigh_node);
         return ret;
 }
 
@@ -855,90 +895,94 @@ out:
  *  -1 the packet is old and has been received while the seqno window
  *     was protected. Caller should drop it.
  */
-static int bat_iv_ogm_update_seqnos(const struct ethhdr *ethhdr,
-                                    const struct batman_ogm_packet
-                                                        *batman_ogm_packet,
-                                    const struct hard_iface *if_incoming)
+static int
+batadv_iv_ogm_update_seqnos(const struct ethhdr *ethhdr,
+                            const struct batadv_ogm_packet *batadv_ogm_packet,
+                            const struct batadv_hard_iface *if_incoming)
 {
-        struct bat_priv *bat_priv = netdev_priv(if_incoming->soft_iface);
-        struct orig_node *orig_node;
-        struct neigh_node *tmp_neigh_node;
+        struct batadv_priv *bat_priv = netdev_priv(if_incoming->soft_iface);
+        struct batadv_orig_node *orig_node;
+        struct batadv_neigh_node *tmp_neigh_node;
         struct hlist_node *node;
         int is_duplicate = 0;
         int32_t seq_diff;
         int need_update = 0;
         int set_mark, ret = -1;
+        uint32_t seqno = ntohl(batadv_ogm_packet->seqno);
+        uint8_t *neigh_addr;
 
-        orig_node = get_orig_node(bat_priv, batman_ogm_packet->orig);
+        orig_node = batadv_get_orig_node(bat_priv, batadv_ogm_packet->orig);
         if (!orig_node)
                 return 0;
 
         spin_lock_bh(&orig_node->ogm_cnt_lock);
-        seq_diff = batman_ogm_packet->seqno - orig_node->last_real_seqno;
+        seq_diff = seqno - orig_node->last_real_seqno;
 
         /* signalize caller that the packet is to be dropped. */
         if (!hlist_empty(&orig_node->neigh_list) &&
-            window_protected(bat_priv, seq_diff,
-                             &orig_node->batman_seqno_reset))
+            batadv_window_protected(bat_priv, seq_diff,
+                                    &orig_node->batman_seqno_reset))
                 goto out;
 
         rcu_read_lock();
         hlist_for_each_entry_rcu(tmp_neigh_node, node,
                                  &orig_node->neigh_list, list) {
 
-                is_duplicate |= bat_test_bit(tmp_neigh_node->real_bits,
-                                             orig_node->last_real_seqno,
-                                             batman_ogm_packet->seqno);
+                is_duplicate |= batadv_test_bit(tmp_neigh_node->real_bits,
+                                                orig_node->last_real_seqno,
+                                                seqno);
 
-                if (compare_eth(tmp_neigh_node->addr, ethhdr->h_source) &&
-                    (tmp_neigh_node->if_incoming == if_incoming))
+                neigh_addr = tmp_neigh_node->addr;
+                if (batadv_compare_eth(neigh_addr, ethhdr->h_source) &&
+                    tmp_neigh_node->if_incoming == if_incoming)
                         set_mark = 1;
                 else
                         set_mark = 0;
 
                 /* if the window moved, set the update flag. */
-                need_update |= bit_get_packet(bat_priv,
-                                              tmp_neigh_node->real_bits,
-                                              seq_diff, set_mark);
+                need_update |= batadv_bit_get_packet(bat_priv,
+                                                     tmp_neigh_node->real_bits,
+                                                     seq_diff, set_mark);
 
                 tmp_neigh_node->real_packet_count =
                         bitmap_weight(tmp_neigh_node->real_bits,
-                                      TQ_LOCAL_WINDOW_SIZE);
+                                      BATADV_TQ_LOCAL_WINDOW_SIZE);
         }
         rcu_read_unlock();
 
         if (need_update) {
-                bat_dbg(DBG_BATMAN, bat_priv,
-                        "updating last_seqno: old %u, new %u\n",
-                        orig_node->last_real_seqno, batman_ogm_packet->seqno);
-                orig_node->last_real_seqno = batman_ogm_packet->seqno;
+                batadv_dbg(BATADV_DBG_BATMAN, bat_priv,
+                           "updating last_seqno: old %u, new %u\n",
+                           orig_node->last_real_seqno, seqno);
+                orig_node->last_real_seqno = seqno;
         }
 
         ret = is_duplicate;
 
 out:
         spin_unlock_bh(&orig_node->ogm_cnt_lock);
-        orig_node_free_ref(orig_node);
+        batadv_orig_node_free_ref(orig_node);
         return ret;
 }
 
-static void bat_iv_ogm_process(const struct ethhdr *ethhdr,
-                               struct batman_ogm_packet *batman_ogm_packet,
-                               const unsigned char *tt_buff,
-                               struct hard_iface *if_incoming)
+static void batadv_iv_ogm_process(const struct ethhdr *ethhdr,
+                                  struct batadv_ogm_packet *batadv_ogm_packet,
+                                  const unsigned char *tt_buff,
+                                  struct batadv_hard_iface *if_incoming)
 {
-        struct bat_priv *bat_priv = netdev_priv(if_incoming->soft_iface);
-        struct hard_iface *hard_iface;
-        struct orig_node *orig_neigh_node, *orig_node;
-        struct neigh_node *router = NULL, *router_router = NULL;
-        struct neigh_node *orig_neigh_router = NULL;
+        struct batadv_priv *bat_priv = netdev_priv(if_incoming->soft_iface);
+        struct batadv_hard_iface *hard_iface;
+        struct batadv_orig_node *orig_neigh_node, *orig_node;
+        struct batadv_neigh_node *router = NULL, *router_router = NULL;
+        struct batadv_neigh_node *orig_neigh_router = NULL;
         int has_directlink_flag;
         int is_my_addr = 0, is_my_orig = 0, is_my_oldorig = 0;
-        int is_broadcast = 0, is_bidirectional;
+        int is_broadcast = 0, is_bidirect;
         bool is_single_hop_neigh = false;
         bool is_from_best_next_hop = false;
-        int is_duplicate;
+        int is_duplicate, sameseq, simlar_ttl;
         uint32_t if_incoming_seqno;
+        uint8_t *prev_sender;
 
         /* Silently drop when the batman packet is actually not a
          * correct packet.
@@ -948,49 +992,53 @@ static void bat_iv_ogm_process(const struct ethhdr *ethhdr,
          * it as an additional length.
          *
          * TODO: A more sane solution would be to have a bit in the
-         * batman_ogm_packet to detect whether the packet is the last
+         * batadv_ogm_packet to detect whether the packet is the last
          * packet in an aggregation.  Here we expect that the padding
          * is always zero (or not 0x01)
          */
-        if (batman_ogm_packet->header.packet_type != BAT_IV_OGM)
+        if (batadv_ogm_packet->header.packet_type != BATADV_IV_OGM)
                 return;
 
         /* could be changed by schedule_own_packet() */
         if_incoming_seqno = atomic_read(&if_incoming->seqno);
 
-        has_directlink_flag = (batman_ogm_packet->flags & DIRECTLINK ? 1 : 0);
+        if (batadv_ogm_packet->flags & BATADV_DIRECTLINK)
+                has_directlink_flag = 1;
+        else
+                has_directlink_flag = 0;
 
-        if (compare_eth(ethhdr->h_source, batman_ogm_packet->orig))
+        if (batadv_compare_eth(ethhdr->h_source, batadv_ogm_packet->orig))
                 is_single_hop_neigh = true;
 
-        bat_dbg(DBG_BATMAN, bat_priv,
-                "Received BATMAN packet via NB: %pM, IF: %s [%pM] (from OG: %pM, via prev OG: %pM, seqno %u, ttvn %u, crc %u, changes %u, td %d, TTL %d, V %d, IDF %d)\n",
-                ethhdr->h_source, if_incoming->net_dev->name,
-                if_incoming->net_dev->dev_addr, batman_ogm_packet->orig,
-                batman_ogm_packet->prev_sender, batman_ogm_packet->seqno,
-                batman_ogm_packet->ttvn, batman_ogm_packet->tt_crc,
-                batman_ogm_packet->tt_num_changes, batman_ogm_packet->tq,
-                batman_ogm_packet->header.ttl,
-                batman_ogm_packet->header.version, has_directlink_flag);
+        batadv_dbg(BATADV_DBG_BATMAN, bat_priv,
+                   "Received BATMAN packet via NB: %pM, IF: %s [%pM] (from OG: %pM, via prev OG: %pM, seqno %u, ttvn %u, crc %u, changes %u, td %d, TTL %d, V %d, IDF %d)\n",
+                   ethhdr->h_source, if_incoming->net_dev->name,
+                   if_incoming->net_dev->dev_addr, batadv_ogm_packet->orig,
+                   batadv_ogm_packet->prev_sender,
+                   ntohl(batadv_ogm_packet->seqno), batadv_ogm_packet->ttvn,
+                   ntohs(batadv_ogm_packet->tt_crc),
+                   batadv_ogm_packet->tt_num_changes, batadv_ogm_packet->tq,
+                   batadv_ogm_packet->header.ttl,
+                   batadv_ogm_packet->header.version, has_directlink_flag);
 
         rcu_read_lock();
-        list_for_each_entry_rcu(hard_iface, &hardif_list, list) {
-                if (hard_iface->if_status != IF_ACTIVE)
+        list_for_each_entry_rcu(hard_iface, &batadv_hardif_list, list) {
+                if (hard_iface->if_status != BATADV_IF_ACTIVE)
                         continue;
 
                 if (hard_iface->soft_iface != if_incoming->soft_iface)
                         continue;
 
-                if (compare_eth(ethhdr->h_source,
-                                hard_iface->net_dev->dev_addr))
+                if (batadv_compare_eth(ethhdr->h_source,
+                                       hard_iface->net_dev->dev_addr))
                         is_my_addr = 1;
 
-                if (compare_eth(batman_ogm_packet->orig,
-                                hard_iface->net_dev->dev_addr))
+                if (batadv_compare_eth(batadv_ogm_packet->orig,
+                                       hard_iface->net_dev->dev_addr))
                         is_my_orig = 1;
 
-                if (compare_eth(batman_ogm_packet->prev_sender,
-                                hard_iface->net_dev->dev_addr))
+                if (batadv_compare_eth(batadv_ogm_packet->prev_sender,
+                                       hard_iface->net_dev->dev_addr))
                         is_my_oldorig = 1;
 
                 if (is_broadcast_ether_addr(ethhdr->h_source))
@@ -998,268 +1046,278 @@ static void bat_iv_ogm_process(const struct ethhdr *ethhdr,
         }
         rcu_read_unlock();
 
-        if (batman_ogm_packet->header.version != COMPAT_VERSION) {
-                bat_dbg(DBG_BATMAN, bat_priv,
-                        "Drop packet: incompatible batman version (%i)\n",
-                        batman_ogm_packet->header.version);
+        if (batadv_ogm_packet->header.version != BATADV_COMPAT_VERSION) {
+                batadv_dbg(BATADV_DBG_BATMAN, bat_priv,
+                           "Drop packet: incompatible batman version (%i)\n",
+                           batadv_ogm_packet->header.version);
                 return;
         }
 
         if (is_my_addr) {
-                bat_dbg(DBG_BATMAN, bat_priv,
-                        "Drop packet: received my own broadcast (sender: %pM)\n",
-                        ethhdr->h_source);
+                batadv_dbg(BATADV_DBG_BATMAN, bat_priv,
+                           "Drop packet: received my own broadcast (sender: %pM)\n",
+                           ethhdr->h_source);
                 return;
         }
 
         if (is_broadcast) {
-                bat_dbg(DBG_BATMAN, bat_priv,
-                        "Drop packet: ignoring all packets with broadcast source addr (sender: %pM)\n",
-                        ethhdr->h_source);
+                batadv_dbg(BATADV_DBG_BATMAN, bat_priv,
+                           "Drop packet: ignoring all packets with broadcast source addr (sender: %pM)\n",
+                           ethhdr->h_source);
                 return;
         }
 
         if (is_my_orig) {
                 unsigned long *word;
                 int offset;
+                int32_t bit_pos;
+                int16_t if_num;
+                uint8_t *weight;
 
-                orig_neigh_node = get_orig_node(bat_priv, ethhdr->h_source);
+                orig_neigh_node = batadv_get_orig_node(bat_priv,
+                                                       ethhdr->h_source);
                 if (!orig_neigh_node)
                         return;
 
                 /* neighbor has to indicate direct link and it has to
-                 * come via the corresponding interface */
-                /* save packet seqno for bidirectional check */
+                 * come via the corresponding interface
+                 * save packet seqno for bidirectional check
+                 */
                 if (has_directlink_flag &&
-                    compare_eth(if_incoming->net_dev->dev_addr,
-                                batman_ogm_packet->orig)) {
-                        offset = if_incoming->if_num * NUM_WORDS;
+                    batadv_compare_eth(if_incoming->net_dev->dev_addr,
+                                       batadv_ogm_packet->orig)) {
+                        if_num = if_incoming->if_num;
+                        offset = if_num * BATADV_NUM_WORDS;
 
                         spin_lock_bh(&orig_neigh_node->ogm_cnt_lock);
                         word = &(orig_neigh_node->bcast_own[offset]);
-                        bat_set_bit(word,
-                                    if_incoming_seqno -
-                                                batman_ogm_packet->seqno - 2);
-                        orig_neigh_node->bcast_own_sum[if_incoming->if_num] =
-                                bitmap_weight(word, TQ_LOCAL_WINDOW_SIZE);
+                        bit_pos = if_incoming_seqno - 2;
+                        bit_pos -= ntohl(batadv_ogm_packet->seqno);
+                        batadv_set_bit(word, bit_pos);
+                        weight = &orig_neigh_node->bcast_own_sum[if_num];
+                        *weight = bitmap_weight(word,
+                                                BATADV_TQ_LOCAL_WINDOW_SIZE);
                         spin_unlock_bh(&orig_neigh_node->ogm_cnt_lock);
                 }
 
-                bat_dbg(DBG_BATMAN, bat_priv,
-                        "Drop packet: originator packet from myself (via neighbor)\n");
-                orig_node_free_ref(orig_neigh_node);
+                batadv_dbg(BATADV_DBG_BATMAN, bat_priv,
+                           "Drop packet: originator packet from myself (via neighbor)\n");
+                batadv_orig_node_free_ref(orig_neigh_node);
                 return;
         }
 
         if (is_my_oldorig) {
-                bat_dbg(DBG_BATMAN, bat_priv,
-                        "Drop packet: ignoring all rebroadcast echos (sender: %pM)\n",
-                        ethhdr->h_source);
+                batadv_dbg(BATADV_DBG_BATMAN, bat_priv,
+                           "Drop packet: ignoring all rebroadcast echos (sender: %pM)\n",
+                           ethhdr->h_source);
                 return;
         }
 
-        if (batman_ogm_packet->flags & NOT_BEST_NEXT_HOP) {
-                bat_dbg(DBG_BATMAN, bat_priv,
-                        "Drop packet: ignoring all packets not forwarded from the best next hop (sender: %pM)\n",
-                        ethhdr->h_source);
+        if (batadv_ogm_packet->flags & BATADV_NOT_BEST_NEXT_HOP) {
+                batadv_dbg(BATADV_DBG_BATMAN, bat_priv,
+                           "Drop packet: ignoring all packets not forwarded from the best next hop (sender: %pM)\n",
+                           ethhdr->h_source);
                 return;
         }
 
-        orig_node = get_orig_node(bat_priv, batman_ogm_packet->orig);
+        orig_node = batadv_get_orig_node(bat_priv, batadv_ogm_packet->orig);
         if (!orig_node)
                 return;
 
-        is_duplicate = bat_iv_ogm_update_seqnos(ethhdr, batman_ogm_packet,
-                                                if_incoming);
+        is_duplicate = batadv_iv_ogm_update_seqnos(ethhdr, batadv_ogm_packet,
+                                                   if_incoming);
 
         if (is_duplicate == -1) {
-                bat_dbg(DBG_BATMAN, bat_priv,
-                        "Drop packet: packet within seqno protection time (sender: %pM)\n",
-                        ethhdr->h_source);
+                batadv_dbg(BATADV_DBG_BATMAN, bat_priv,
+                           "Drop packet: packet within seqno protection time (sender: %pM)\n",
+                           ethhdr->h_source);
                 goto out;
         }
 
-        if (batman_ogm_packet->tq == 0) {
-                bat_dbg(DBG_BATMAN, bat_priv,
-                        "Drop packet: originator packet with tq equal 0\n");
+        if (batadv_ogm_packet->tq == 0) {
+                batadv_dbg(BATADV_DBG_BATMAN, bat_priv,
+                           "Drop packet: originator packet with tq equal 0\n");
                 goto out;
         }
 
-        router = orig_node_get_router(orig_node);
+        router = batadv_orig_node_get_router(orig_node);
         if (router)
-                router_router = orig_node_get_router(router->orig_node);
+                router_router = batadv_orig_node_get_router(router->orig_node);
 
         if ((router && router->tq_avg != 0) &&
-            (compare_eth(router->addr, ethhdr->h_source)))
+            (batadv_compare_eth(router->addr, ethhdr->h_source)))
                 is_from_best_next_hop = true;
 
+        prev_sender = batadv_ogm_packet->prev_sender;
         /* avoid temporary routing loops */
         if (router && router_router &&
-            (compare_eth(router->addr, batman_ogm_packet->prev_sender)) &&
-            !(compare_eth(batman_ogm_packet->orig,
-                          batman_ogm_packet->prev_sender)) &&
-            (compare_eth(router->addr, router_router->addr))) {
-                bat_dbg(DBG_BATMAN, bat_priv,
-                        "Drop packet: ignoring all rebroadcast packets that may make me loop (sender: %pM)\n",
-                        ethhdr->h_source);
+            (batadv_compare_eth(router->addr, prev_sender)) &&
+            !(batadv_compare_eth(batadv_ogm_packet->orig, prev_sender)) &&
+            (batadv_compare_eth(router->addr, router_router->addr))) {
+                batadv_dbg(BATADV_DBG_BATMAN, bat_priv,
+                           "Drop packet: ignoring all rebroadcast packets that may make me loop (sender: %pM)\n",
+                           ethhdr->h_source);
                 goto out;
         }
 
         /* if sender is a direct neighbor the sender mac equals
-         * originator mac */
+         * originator mac
+         */
         orig_neigh_node = (is_single_hop_neigh ?
                            orig_node :
-                           get_orig_node(bat_priv, ethhdr->h_source));
+                           batadv_get_orig_node(bat_priv, ethhdr->h_source));
         if (!orig_neigh_node)
                 goto out;
 
-        orig_neigh_router = orig_node_get_router(orig_neigh_node);
+        orig_neigh_router = batadv_orig_node_get_router(orig_neigh_node);
 
         /* drop packet if sender is not a direct neighbor and if we
-         * don't route towards it */
+         * don't route towards it
+         */
         if (!is_single_hop_neigh && (!orig_neigh_router)) {
-                bat_dbg(DBG_BATMAN, bat_priv,
-                        "Drop packet: OGM via unknown neighbor!\n");
+                batadv_dbg(BATADV_DBG_BATMAN, bat_priv,
+                           "Drop packet: OGM via unknown neighbor!\n");
                 goto out_neigh;
         }
 
-        is_bidirectional = bat_iv_ogm_calc_tq(orig_node, orig_neigh_node,
-                                              batman_ogm_packet, if_incoming);
+        is_bidirect = batadv_iv_ogm_calc_tq(orig_node, orig_neigh_node,
+                                            batadv_ogm_packet, if_incoming);
 
-        bonding_save_primary(orig_node, orig_neigh_node, batman_ogm_packet);
+        batadv_bonding_save_primary(orig_node, orig_neigh_node,
+                                    batadv_ogm_packet);
 
         /* update ranking if it is not a duplicate or has the same
-         * seqno and similar ttl as the non-duplicate */
-        if (is_bidirectional &&
-            (!is_duplicate ||
-             ((orig_node->last_real_seqno == batman_ogm_packet->seqno) &&
-              (orig_node->last_ttl - 3 <= batman_ogm_packet->header.ttl))))
-                bat_iv_ogm_orig_update(bat_priv, orig_node, ethhdr,
-                                       batman_ogm_packet, if_incoming,
-                                       tt_buff, is_duplicate);
+         * seqno and similar ttl as the non-duplicate
+         */
+        sameseq = orig_node->last_real_seqno == ntohl(batadv_ogm_packet->seqno);
+        simlar_ttl = orig_node->last_ttl - 3 <= batadv_ogm_packet->header.ttl;
+        if (is_bidirect && (!is_duplicate || (sameseq && simlar_ttl)))
+                batadv_iv_ogm_orig_update(bat_priv, orig_node, ethhdr,
+                                          batadv_ogm_packet, if_incoming,
+                                          tt_buff, is_duplicate);
 
         /* is single hop (direct) neighbor */
         if (is_single_hop_neigh) {
 
                 /* mark direct link on incoming interface */
-                bat_iv_ogm_forward(orig_node, ethhdr, batman_ogm_packet,
-                                   is_single_hop_neigh, is_from_best_next_hop,
-                                   if_incoming);
+                batadv_iv_ogm_forward(orig_node, ethhdr, batadv_ogm_packet,
+                                      is_single_hop_neigh,
+                                      is_from_best_next_hop, if_incoming);
 
-                bat_dbg(DBG_BATMAN, bat_priv,
-                        "Forwarding packet: rebroadcast neighbor packet with direct link flag\n");
+                batadv_dbg(BATADV_DBG_BATMAN, bat_priv,
+                           "Forwarding packet: rebroadcast neighbor packet with direct link flag\n");
                 goto out_neigh;
         }
 
         /* multihop originator */
-        if (!is_bidirectional) {
-                bat_dbg(DBG_BATMAN, bat_priv,
-                        "Drop packet: not received via bidirectional link\n");
+        if (!is_bidirect) {
+                batadv_dbg(BATADV_DBG_BATMAN, bat_priv,
+                           "Drop packet: not received via bidirectional link\n");
                 goto out_neigh;
         }
 
         if (is_duplicate) {
-                bat_dbg(DBG_BATMAN, bat_priv,
-                        "Drop packet: duplicate packet received\n");
+                batadv_dbg(BATADV_DBG_BATMAN, bat_priv,
+                           "Drop packet: duplicate packet received\n");
                 goto out_neigh;
         }
 
-        bat_dbg(DBG_BATMAN, bat_priv,
-                "Forwarding packet: rebroadcast originator packet\n");
-        bat_iv_ogm_forward(orig_node, ethhdr, batman_ogm_packet,
-                           is_single_hop_neigh, is_from_best_next_hop,
-                           if_incoming);
+        batadv_dbg(BATADV_DBG_BATMAN, bat_priv,
+                   "Forwarding packet: rebroadcast originator packet\n");
+        batadv_iv_ogm_forward(orig_node, ethhdr, batadv_ogm_packet,
+                              is_single_hop_neigh, is_from_best_next_hop,
+                              if_incoming);
 
 out_neigh:
         if ((orig_neigh_node) && (!is_single_hop_neigh))
-                orig_node_free_ref(orig_neigh_node);
+                batadv_orig_node_free_ref(orig_neigh_node);
 out:
         if (router)
-                neigh_node_free_ref(router);
+                batadv_neigh_node_free_ref(router);
         if (router_router)
-                neigh_node_free_ref(router_router);
+                batadv_neigh_node_free_ref(router_router);
         if (orig_neigh_router)
-                neigh_node_free_ref(orig_neigh_router);
+                batadv_neigh_node_free_ref(orig_neigh_router);
 
-        orig_node_free_ref(orig_node);
+        batadv_orig_node_free_ref(orig_node);
 }
 
-static int bat_iv_ogm_receive(struct sk_buff *skb,
-                              struct hard_iface *if_incoming)
+static int batadv_iv_ogm_receive(struct sk_buff *skb,
+                                 struct batadv_hard_iface *if_incoming)
 {
-        struct bat_priv *bat_priv = netdev_priv(if_incoming->soft_iface);
-        struct batman_ogm_packet *batman_ogm_packet;
+        struct batadv_priv *bat_priv = netdev_priv(if_incoming->soft_iface);
+        struct batadv_ogm_packet *batadv_ogm_packet;
         struct ethhdr *ethhdr;
         int buff_pos = 0, packet_len;
         unsigned char *tt_buff, *packet_buff;
         bool ret;
 
-        ret = check_management_packet(skb, if_incoming, BATMAN_OGM_HLEN);
+        ret = batadv_check_management_packet(skb, if_incoming, BATADV_OGM_HLEN);
         if (!ret)
                 return NET_RX_DROP;
 
         /* did we receive a B.A.T.M.A.N. IV OGM packet on an interface
          * that does not have B.A.T.M.A.N. IV enabled ?
          */
-        if (bat_priv->bat_algo_ops->bat_ogm_emit != bat_iv_ogm_emit)
+        if (bat_priv->bat_algo_ops->bat_ogm_emit != batadv_iv_ogm_emit)
                 return NET_RX_DROP;
 
+        batadv_inc_counter(bat_priv, BATADV_CNT_MGMT_RX);
+        batadv_add_counter(bat_priv, BATADV_CNT_MGMT_RX_BYTES,
+                           skb->len + ETH_HLEN);
+
         packet_len = skb_headlen(skb);
         ethhdr = (struct ethhdr *)skb_mac_header(skb);
         packet_buff = skb->data;
-        batman_ogm_packet = (struct batman_ogm_packet *)packet_buff;
+        batadv_ogm_packet = (struct batadv_ogm_packet *)packet_buff;
 
         /* unpack the aggregated packets and process them one by one */
         do {
-                /* network to host order for our 32bit seqno and the
-                   orig_interval */
-                batman_ogm_packet->seqno = ntohl(batman_ogm_packet->seqno);
-                batman_ogm_packet->tt_crc = ntohs(batman_ogm_packet->tt_crc);
-
-                tt_buff = packet_buff + buff_pos + BATMAN_OGM_HLEN;
+                tt_buff = packet_buff + buff_pos + BATADV_OGM_HLEN;
 
-                bat_iv_ogm_process(ethhdr, batman_ogm_packet,
-                                   tt_buff, if_incoming);
+                batadv_iv_ogm_process(ethhdr, batadv_ogm_packet, tt_buff,
+                                      if_incoming);
 
-                buff_pos += BATMAN_OGM_HLEN +
-                                tt_len(batman_ogm_packet->tt_num_changes);
+                buff_pos += BATADV_OGM_HLEN;
+                buff_pos += batadv_tt_len(batadv_ogm_packet->tt_num_changes);
 
-                batman_ogm_packet = (struct batman_ogm_packet *)
+                batadv_ogm_packet = (struct batadv_ogm_packet *)
                                                 (packet_buff + buff_pos);
-        } while (bat_iv_ogm_aggr_packet(buff_pos, packet_len,
-                                        batman_ogm_packet->tt_num_changes));
+        } while (batadv_iv_ogm_aggr_packet(buff_pos, packet_len,
+                                           batadv_ogm_packet->tt_num_changes));
 
         kfree_skb(skb);
         return NET_RX_SUCCESS;
 }
 
-static struct bat_algo_ops batman_iv __read_mostly = {
-        .name = "BATMAN IV",
-        .bat_iface_enable = bat_iv_ogm_iface_enable,
-        .bat_iface_disable = bat_iv_ogm_iface_disable,
-        .bat_iface_update_mac = bat_iv_ogm_iface_update_mac,
-        .bat_primary_iface_set = bat_iv_ogm_primary_iface_set,
-        .bat_ogm_schedule = bat_iv_ogm_schedule,
-        .bat_ogm_emit = bat_iv_ogm_emit,
+static struct batadv_algo_ops batadv_batman_iv __read_mostly = {
+        .name = "BATMAN_IV",
+        .bat_iface_enable = batadv_iv_ogm_iface_enable,
+        .bat_iface_disable = batadv_iv_ogm_iface_disable,
+        .bat_iface_update_mac = batadv_iv_ogm_iface_update_mac,
+        .bat_primary_iface_set = batadv_iv_ogm_primary_iface_set,
+        .bat_ogm_schedule = batadv_iv_ogm_schedule,
+        .bat_ogm_emit = batadv_iv_ogm_emit,
 };
 
-int __init bat_iv_init(void)
+int __init batadv_iv_init(void)
 {
         int ret;
 
         /* batman originator packet */
-        ret = recv_handler_register(BAT_IV_OGM, bat_iv_ogm_receive);
+        ret = batadv_recv_handler_register(BATADV_IV_OGM,
+                                           batadv_iv_ogm_receive);
         if (ret < 0)
                 goto out;
 
-        ret = bat_algo_register(&batman_iv);
+        ret = batadv_algo_register(&batadv_batman_iv);
         if (ret < 0)
                 goto handler_unregister;
 
         goto out;
 
 handler_unregister:
-        recv_handler_unregister(BAT_IV_OGM);
+        batadv_recv_handler_unregister(BATADV_IV_OGM);
 out:
         return ret;
 }
diff --git a/net/batman-adv/bat_sysfs.c b/net/batman-adv/bat_sysfs.c
deleted file mode 100644
index 5bc7b66d32d..00000000000
--- a/net/batman-adv/bat_sysfs.c
+++ /dev/null
@@ -1,735 +0,0 @@
-/*
- * Copyright (C) 2010-2012 B.A.T.M.A.N. contributors:
- *
- * Marek Lindner
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA
- *
- */
-
-#include "main.h"
-#include "bat_sysfs.h"
-#include "translation-table.h"
-#include "originator.h"
-#include "hard-interface.h"
-#include "gateway_common.h"
-#include "gateway_client.h"
-#include "vis.h"
-
-static struct net_device *kobj_to_netdev(struct kobject *obj)
-{
-        struct device *dev = container_of(obj->parent, struct device, kobj);
-        return to_net_dev(dev);
-}
-
-static struct bat_priv *kobj_to_batpriv(struct kobject *obj)
-{
-        struct net_device *net_dev = kobj_to_netdev(obj);
-        return netdev_priv(net_dev);
-}
-
-#define UEV_TYPE_VAR    "BATTYPE="
-#define UEV_ACTION_VAR  "BATACTION="
-#define UEV_DATA_VAR    "BATDATA="
-
-static char *uev_action_str[] = {
-        "add",
-        "del",
-        "change"
-};
-
-static char *uev_type_str[] = {
-        "gw"
-};
-
-/* Use this, if you have customized show and store functions */
-#define BAT_ATTR(_name, _mode, _show, _store)   \
-struct bat_attribute bat_attr_##_name = {       \
-        .attr = {.name = __stringify(_name),    \
-                 .mode = _mode },               \
-        .show   = _show,                        \
-        .store  = _store,                       \
-};
-
-#define BAT_ATTR_SIF_STORE_BOOL(_name, _post_func)                      \
-ssize_t store_##_name(struct kobject *kobj, struct attribute *attr,     \
-                      char *buff, size_t count)                         \
-{                                                                       \
-        struct net_device *net_dev = kobj_to_netdev(kobj);              \
-        struct bat_priv *bat_priv = netdev_priv(net_dev);               \
-        return __store_bool_attr(buff, count, _post_func, attr,         \
-                                 &bat_priv->_name, net_dev);            \
-}
-
-#define BAT_ATTR_SIF_SHOW_BOOL(_name)                                   \
-ssize_t show_##_name(struct kobject *kobj,                              \
-                     struct attribute *attr, char *buff)                \
-{                                                                       \
-        struct bat_priv *bat_priv = kobj_to_batpriv(kobj);              \
-        return sprintf(buff, "%s\n",                                    \
-                       atomic_read(&bat_priv->_name) == 0 ?             \
-                       "disabled" : "enabled");                         \
-}                                                                       \
-
-/* Use this, if you are going to turn a [name] in the soft-interface
- * (bat_priv) on or off */
-#define BAT_ATTR_SIF_BOOL(_name, _mode, _post_func)                     \
-        static BAT_ATTR_SIF_STORE_BOOL(_name, _post_func)               \
-        static BAT_ATTR_SIF_SHOW_BOOL(_name)                            \
-        static BAT_ATTR(_name, _mode, show_##_name, store_##_name)
-
-
-#define BAT_ATTR_SIF_STORE_UINT(_name, _min, _max, _post_func)          \
-ssize_t store_##_name(struct kobject *kobj, struct attribute *attr,     \
-                      char *buff, size_t count)                         \
-{                                                                       \
-        struct net_device *net_dev = kobj_to_netdev(kobj);              \
-        struct bat_priv *bat_priv = netdev_priv(net_dev);               \
-        return __store_uint_attr(buff, count, _min, _max, _post_func,   \
-                                 attr, &bat_priv->_name, net_dev);      \
-}
-
-#define BAT_ATTR_SIF_SHOW_UINT(_name)                                   \
-ssize_t show_##_name(struct kobject *kobj,                              \
-                     struct attribute *attr, char *buff)                \
-{                                                                       \
-        struct bat_priv *bat_priv = kobj_to_batpriv(kobj);              \
-        return sprintf(buff, "%i\n", atomic_read(&bat_priv->_name));    \
-}                                                                       \
-
-/* Use this, if you are going to set [name] in the soft-interface
- * (bat_priv) to an unsigned integer value */
-#define BAT_ATTR_SIF_UINT(_name, _mode, _min, _max, _post_func)         \
-        static BAT_ATTR_SIF_STORE_UINT(_name, _min, _max, _post_func)   \
-        static BAT_ATTR_SIF_SHOW_UINT(_name)                            \
-        static BAT_ATTR(_name, _mode, show_##_name, store_##_name)
-
-
-#define BAT_ATTR_HIF_STORE_UINT(_name, _min, _max, _post_func)          \
-ssize_t store_##_name(struct kobject *kobj, struct attribute *attr,     \
-                      char *buff, size_t count)                         \
-{                                                                       \
-        struct net_device *net_dev = kobj_to_netdev(kobj);              \
-        struct hard_iface *hard_iface = hardif_get_by_netdev(net_dev);  \
-        ssize_t length;                                                 \
-                                                                        \
-        if (!hard_iface)                                                \
-                return 0;                                               \
-                                                                        \
-        length = __store_uint_attr(buff, count, _min, _max, _post_func, \
-                                   attr, &hard_iface->_name, net_dev);  \
-                                                                        \
-        hardif_free_ref(hard_iface);                                    \
-        return length;                                                  \
-}
-
-#define BAT_ATTR_HIF_SHOW_UINT(_name)                                   \
-ssize_t show_##_name(struct kobject *kobj,                              \
-                     struct attribute *attr, char *buff)                \
-{                                                                       \
-        struct net_device *net_dev = kobj_to_netdev(kobj);              \
-        struct hard_iface *hard_iface = hardif_get_by_netdev(net_dev);  \
-        ssize_t length;                                                 \
-                                                                        \
-        if (!hard_iface)                                                \
-                return 0;                                               \
-                                                                        \
-        length = sprintf(buff, "%i\n", atomic_read(&hard_iface->_name));\
-                                                                        \
-        hardif_free_ref(hard_iface);                                    \
-        return length;                                                  \
-}
-
-/* Use this, if you are going to set [name] in hard_iface to an
- * unsigned integer value*/
-#define BAT_ATTR_HIF_UINT(_name, _mode, _min, _max, _post_func)         \
-        static BAT_ATTR_HIF_STORE_UINT(_name, _min, _max, _post_func)   \
-        static BAT_ATTR_HIF_SHOW_UINT(_name)                            \
-        static BAT_ATTR(_name, _mode, show_##_name, store_##_name)
-
-
-static int store_bool_attr(char *buff, size_t count,
-                           struct net_device *net_dev,
-                           const char *attr_name, atomic_t *attr)
-{
-        int enabled = -1;
-
-        if (buff[count - 1] == '\n')
-                buff[count - 1] = '\0';
-
-        if ((strncmp(buff, "1", 2) == 0) ||
-            (strncmp(buff, "enable", 7) == 0) ||
-            (strncmp(buff, "enabled", 8) == 0))
-                enabled = 1;
-
-        if ((strncmp(buff, "0", 2) == 0) ||
-            (strncmp(buff, "disable", 8) == 0) ||
-            (strncmp(buff, "disabled", 9) == 0))
-                enabled = 0;
-
-        if (enabled < 0) {
-                bat_info(net_dev,
-                         "%s: Invalid parameter received: %s\n",
-                         attr_name, buff);
-                return -EINVAL;
-        }
-
-        if (atomic_read(attr) == enabled)
-                return count;
-
-        bat_info(net_dev, "%s: Changing from: %s to: %s\n", attr_name,
-                 atomic_read(attr) == 1 ? "enabled" : "disabled",
-                 enabled == 1 ? "enabled" : "disabled");
-
-        atomic_set(attr, (unsigned int)enabled);
-        return count;
-}
-
-static inline ssize_t __store_bool_attr(char *buff, size_t count,
-                        void (*post_func)(struct net_device *),
-                        struct attribute *attr,
-                        atomic_t *attr_store, struct net_device *net_dev)
-{
-        int ret;
-
-        ret = store_bool_attr(buff, count, net_dev, attr->name, attr_store);
-        if (post_func && ret)
-                post_func(net_dev);
-
-        return ret;
-}
-
-static int store_uint_attr(const char *buff, size_t count,
-                           struct net_device *net_dev, const char *attr_name,
-                           unsigned int min, unsigned int max, atomic_t *attr)
-{
-        unsigned long uint_val;
-        int ret;
-
-        ret = kstrtoul(buff, 10, &uint_val);
-        if (ret) {
-                bat_info(net_dev,
-                         "%s: Invalid parameter received: %s\n",
-                         attr_name, buff);
-                return -EINVAL;
-        }
-
-        if (uint_val < min) {
-                bat_info(net_dev, "%s: Value is too small: %lu min: %u\n",
-                         attr_name, uint_val, min);
-                return -EINVAL;
-        }
-
-        if (uint_val > max) {
-                bat_info(net_dev, "%s: Value is too big: %lu max: %u\n",
-                         attr_name, uint_val, max);
-                return -EINVAL;
-        }
-
-        if (atomic_read(attr) == uint_val)
-                return count;
-
-        bat_info(net_dev, "%s: Changing from: %i to: %lu\n",
-                 attr_name, atomic_read(attr), uint_val);
-
-        atomic_set(attr, uint_val);
-        return count;
-}
-
-static inline ssize_t __store_uint_attr(const char *buff, size_t count,
-                        int min, int max,
-                        void (*post_func)(struct net_device *),
-                        const struct attribute *attr,
-                        atomic_t *attr_store, struct net_device *net_dev)
-{
-        int ret;
-
-        ret = store_uint_attr(buff, count, net_dev, attr->name,
-                              min, max, attr_store);
-        if (post_func && ret)
-                post_func(net_dev);
-
-        return ret;
-}
-
-static ssize_t show_vis_mode(struct kobject *kobj, struct attribute *attr,
-                             char *buff)
-{
-        struct bat_priv *bat_priv = kobj_to_batpriv(kobj);
-        int vis_mode = atomic_read(&bat_priv->vis_mode);
-
-        return sprintf(buff, "%s\n",
-                       vis_mode == VIS_TYPE_CLIENT_UPDATE ?
-                                                        "client" : "server");
-}
-
-static ssize_t store_vis_mode(struct kobject *kobj, struct attribute *attr,
-                              char *buff, size_t count)
-{
-        struct net_device *net_dev = kobj_to_netdev(kobj);
-        struct bat_priv *bat_priv = netdev_priv(net_dev);
-        unsigned long val;
-        int ret, vis_mode_tmp = -1;
-
-        ret = kstrtoul(buff, 10, &val);
-
-        if (((count == 2) && (!ret) && (val == VIS_TYPE_CLIENT_UPDATE)) ||
-            (strncmp(buff, "client", 6) == 0) ||
-            (strncmp(buff, "off", 3) == 0))
-                vis_mode_tmp = VIS_TYPE_CLIENT_UPDATE;
-
-        if (((count == 2) && (!ret) && (val == VIS_TYPE_SERVER_SYNC)) ||
-            (strncmp(buff, "server", 6) == 0))
-                vis_mode_tmp = VIS_TYPE_SERVER_SYNC;
-
-        if (vis_mode_tmp < 0) {
-                if (buff[count - 1] == '\n')
-                        buff[count - 1] = '\0';
-
-                bat_info(net_dev,
-                         "Invalid parameter for 'vis mode' setting received: %s\n",
-                         buff);
-                return -EINVAL;
-        }
-
-        if (atomic_read(&bat_priv->vis_mode) == vis_mode_tmp)
-                return count;
-
-        bat_info(net_dev, "Changing vis mode from: %s to: %s\n",
-                 atomic_read(&bat_priv->vis_mode) == VIS_TYPE_CLIENT_UPDATE ?
-                 "client" : "server", vis_mode_tmp == VIS_TYPE_CLIENT_UPDATE ?
-                 "client" : "server");
-
-        atomic_set(&bat_priv->vis_mode, (unsigned int)vis_mode_tmp);
-        return count;
-}
-
-static ssize_t show_bat_algo(struct kobject *kobj, struct attribute *attr,
-                            char *buff)
-{
-        struct bat_priv *bat_priv = kobj_to_batpriv(kobj);
-        return sprintf(buff, "%s\n", bat_priv->bat_algo_ops->name);
-}
-
-static void post_gw_deselect(struct net_device *net_dev)
-{
-        struct bat_priv *bat_priv = netdev_priv(net_dev);
-        gw_deselect(bat_priv);
-}
-
-static ssize_t show_gw_mode(struct kobject *kobj, struct attribute *attr,
-                            char *buff)
-{
-        struct bat_priv *bat_priv = kobj_to_batpriv(kobj);
-        int bytes_written;
-
-        switch (atomic_read(&bat_priv->gw_mode)) {
-        case GW_MODE_CLIENT:
-                bytes_written = sprintf(buff, "%s\n", GW_MODE_CLIENT_NAME);
-                break;
-        case GW_MODE_SERVER:
-                bytes_written = sprintf(buff, "%s\n", GW_MODE_SERVER_NAME);
-                break;
-        default:
-                bytes_written = sprintf(buff, "%s\n", GW_MODE_OFF_NAME);
-                break;
-        }
-
-        return bytes_written;
-}
-
-static ssize_t store_gw_mode(struct kobject *kobj, struct attribute *attr,
-                             char *buff, size_t count)
-{
-        struct net_device *net_dev = kobj_to_netdev(kobj);
-        struct bat_priv *bat_priv = netdev_priv(net_dev);
-        char *curr_gw_mode_str;
-        int gw_mode_tmp = -1;
-
-        if (buff[count - 1] == '\n')
-                buff[count - 1] = '\0';
-
-        if (strncmp(buff, GW_MODE_OFF_NAME, strlen(GW_MODE_OFF_NAME)) == 0)
-                gw_mode_tmp = GW_MODE_OFF;
-
-        if (strncmp(buff, GW_MODE_CLIENT_NAME,
-                    strlen(GW_MODE_CLIENT_NAME)) == 0)
-                gw_mode_tmp = GW_MODE_CLIENT;
-
-        if (strncmp(buff, GW_MODE_SERVER_NAME,
-                    strlen(GW_MODE_SERVER_NAME)) == 0)
-                gw_mode_tmp = GW_MODE_SERVER;
-
-        if (gw_mode_tmp < 0) {
-                bat_info(net_dev,
-                         "Invalid parameter for 'gw mode' setting received: %s\n",
-                         buff);
-                return -EINVAL;
-        }
-
-        if (atomic_read(&bat_priv->gw_mode) == gw_mode_tmp)
-                return count;
-
-        switch (atomic_read(&bat_priv->gw_mode)) {
-        case GW_MODE_CLIENT:
-                curr_gw_mode_str = GW_MODE_CLIENT_NAME;
-                break;
-        case GW_MODE_SERVER:
-                curr_gw_mode_str = GW_MODE_SERVER_NAME;
-                break;
-        default:
-                curr_gw_mode_str = GW_MODE_OFF_NAME;
-                break;
-        }
-
-        bat_info(net_dev, "Changing gw mode from: %s to: %s\n",
-                 curr_gw_mode_str, buff);
-
-        gw_deselect(bat_priv);
-        atomic_set(&bat_priv->gw_mode, (unsigned int)gw_mode_tmp);
-        return count;
-}
-
-static ssize_t show_gw_bwidth(struct kobject *kobj, struct attribute *attr,
-                              char *buff)
-{
-        struct bat_priv *bat_priv = kobj_to_batpriv(kobj);
-        int down, up;
-        int gw_bandwidth = atomic_read(&bat_priv->gw_bandwidth);
-
-        gw_bandwidth_to_kbit(gw_bandwidth, &down, &up);
-        return sprintf(buff, "%i%s/%i%s\n",
-                       (down > 2048 ? down / 1024 : down),
-                       (down > 2048 ? "MBit" : "KBit"),
-                       (up > 2048 ? up / 1024 : up),
-                       (up > 2048 ? "MBit" : "KBit"));
-}
-
-static ssize_t store_gw_bwidth(struct kobject *kobj, struct attribute *attr,
-                               char *buff, size_t count)
-{
-        struct net_device *net_dev = kobj_to_netdev(kobj);
-
-        if (buff[count - 1] == '\n')
-                buff[count - 1] = '\0';
-
-        return gw_bandwidth_set(net_dev, buff, count);
-}
-
-BAT_ATTR_SIF_BOOL(aggregated_ogms, S_IRUGO | S_IWUSR, NULL);
-BAT_ATTR_SIF_BOOL(bonding, S_IRUGO | S_IWUSR, NULL);
-#ifdef CONFIG_BATMAN_ADV_BLA
-BAT_ATTR_SIF_BOOL(bridge_loop_avoidance, S_IRUGO | S_IWUSR, NULL);
-#endif
-BAT_ATTR_SIF_BOOL(fragmentation, S_IRUGO | S_IWUSR, update_min_mtu);
-BAT_ATTR_SIF_BOOL(ap_isolation, S_IRUGO | S_IWUSR, NULL);
-static BAT_ATTR(vis_mode, S_IRUGO | S_IWUSR, show_vis_mode, store_vis_mode);
-static BAT_ATTR(routing_algo, S_IRUGO, show_bat_algo, NULL);
-static BAT_ATTR(gw_mode, S_IRUGO | S_IWUSR, show_gw_mode, store_gw_mode);
-BAT_ATTR_SIF_UINT(orig_interval, S_IRUGO | S_IWUSR, 2 * JITTER, INT_MAX, NULL);
-BAT_ATTR_SIF_UINT(hop_penalty, S_IRUGO | S_IWUSR, 0, TQ_MAX_VALUE, NULL);
-BAT_ATTR_SIF_UINT(gw_sel_class, S_IRUGO | S_IWUSR, 1, TQ_MAX_VALUE,
-                  post_gw_deselect);
-static BAT_ATTR(gw_bandwidth, S_IRUGO | S_IWUSR, show_gw_bwidth,
-                store_gw_bwidth);
-#ifdef CONFIG_BATMAN_ADV_DEBUG
-BAT_ATTR_SIF_UINT(log_level, S_IRUGO | S_IWUSR, 0, 15, NULL);
-#endif
-
-static struct bat_attribute *mesh_attrs[] = {
-        &bat_attr_aggregated_ogms,
-        &bat_attr_bonding,
-#ifdef CONFIG_BATMAN_ADV_BLA
-        &bat_attr_bridge_loop_avoidance,
-#endif
-        &bat_attr_fragmentation,
-        &bat_attr_ap_isolation,
-        &bat_attr_vis_mode,
-        &bat_attr_routing_algo,
-        &bat_attr_gw_mode,
-        &bat_attr_orig_interval,
-        &bat_attr_hop_penalty,
-        &bat_attr_gw_sel_class,
-        &bat_attr_gw_bandwidth,
-#ifdef CONFIG_BATMAN_ADV_DEBUG
-        &bat_attr_log_level,
-#endif
-        NULL,
-};
-
-int sysfs_add_meshif(struct net_device *dev)
-{
-        struct kobject *batif_kobject = &dev->dev.kobj;
-        struct bat_priv *bat_priv = netdev_priv(dev);
-        struct bat_attribute **bat_attr;
-        int err;
-
-        bat_priv->mesh_obj = kobject_create_and_add(SYSFS_IF_MESH_SUBDIR,
-                                                    batif_kobject);
-        if (!bat_priv->mesh_obj) {
-                bat_err(dev, "Can't add sysfs directory: %s/%s\n", dev->name,
-                        SYSFS_IF_MESH_SUBDIR);
-                goto out;
-        }
-
-        for (bat_attr = mesh_attrs; *bat_attr; ++bat_attr) {
-                err = sysfs_create_file(bat_priv->mesh_obj,
-                                        &((*bat_attr)->attr));
-                if (err) {
-                        bat_err(dev, "Can't add sysfs file: %s/%s/%s\n",
-                                dev->name, SYSFS_IF_MESH_SUBDIR,
-                                ((*bat_attr)->attr).name);
-                        goto rem_attr;
-                }
-        }
-
-        return 0;
-
-rem_attr:
-        for (bat_attr = mesh_attrs; *bat_attr; ++bat_attr)
-                sysfs_remove_file(bat_priv->mesh_obj, &((*bat_attr)->attr));
-
-        kobject_put(bat_priv->mesh_obj);
-        bat_priv->mesh_obj = NULL;
-out:
-        return -ENOMEM;
-}
-
-void sysfs_del_meshif(struct net_device *dev)
-{
-        struct bat_priv *bat_priv = netdev_priv(dev);
-        struct bat_attribute **bat_attr;
-
-        for (bat_attr = mesh_attrs; *bat_attr; ++bat_attr)
-                sysfs_remove_file(bat_priv->mesh_obj, &((*bat_attr)->attr));
-
-        kobject_put(bat_priv->mesh_obj);
-        bat_priv->mesh_obj = NULL;
-}
-
-static ssize_t show_mesh_iface(struct kobject *kobj, struct attribute *attr,
-                               char *buff)
-{
-        struct net_device *net_dev = kobj_to_netdev(kobj);
-        struct hard_iface *hard_iface = hardif_get_by_netdev(net_dev);
-        ssize_t length;
-
-        if (!hard_iface)
-                return 0;
-
-        length = sprintf(buff, "%s\n", hard_iface->if_status == IF_NOT_IN_USE ?
-                         "none" : hard_iface->soft_iface->name);
-
-        hardif_free_ref(hard_iface);
-
-        return length;
-}
-
-static ssize_t store_mesh_iface(struct kobject *kobj, struct attribute *attr,
-                                char *buff, size_t count)
-{
-        struct net_device *net_dev = kobj_to_netdev(kobj);
-        struct hard_iface *hard_iface = hardif_get_by_netdev(net_dev);
-        int status_tmp = -1;
-        int ret = count;
-
-        if (!hard_iface)
-                return count;
-
-        if (buff[count - 1] == '\n')
-                buff[count - 1] = '\0';
-
-        if (strlen(buff) >= IFNAMSIZ) {
-                pr_err("Invalid parameter for 'mesh_iface' setting received: interface name too long '%s'\n",
-                       buff);
-                hardif_free_ref(hard_iface);
-                return -EINVAL;
-        }
-
-        if (strncmp(buff, "none", 4) == 0)
-                status_tmp = IF_NOT_IN_USE;
-        else
-                status_tmp = IF_I_WANT_YOU;
-
-        if (hard_iface->if_status == status_tmp)
-                goto out;
-
-        if ((hard_iface->soft_iface) &&
-            (strncmp(hard_iface->soft_iface->name, buff, IFNAMSIZ) == 0))
-                goto out;
-
-        if (!rtnl_trylock()) {
-                ret = -ERESTARTSYS;
-                goto out;
-        }
-
-        if (status_tmp == IF_NOT_IN_USE) {
-                hardif_disable_interface(hard_iface);
-                goto unlock;
-        }
-
-        /* if the interface already is in use */
-        if (hard_iface->if_status != IF_NOT_IN_USE)
-                hardif_disable_interface(hard_iface);
-
-        ret = hardif_enable_interface(hard_iface, buff);
-
-unlock:
-        rtnl_unlock();
-out:
-        hardif_free_ref(hard_iface);
-        return ret;
-}
-
-static ssize_t show_iface_status(struct kobject *kobj, struct attribute *attr,
-                                 char *buff)
-{
-        struct net_device *net_dev = kobj_to_netdev(kobj);
-        struct hard_iface *hard_iface = hardif_get_by_netdev(net_dev);
-        ssize_t length;
-
-        if (!hard_iface)
-                return 0;
-
-        switch (hard_iface->if_status) {
-        case IF_TO_BE_REMOVED:
-                length = sprintf(buff, "disabling\n");
-                break;
-        case IF_INACTIVE:
-                length = sprintf(buff, "inactive\n");
-                break;
-        case IF_ACTIVE:
-                length = sprintf(buff, "active\n");
-                break;
-        case IF_TO_BE_ACTIVATED:
-                length = sprintf(buff, "enabling\n");
-                break;
-        case IF_NOT_IN_USE:
-        default:
-                length = sprintf(buff, "not in use\n");
-                break;
-        }
-
-        hardif_free_ref(hard_iface);
-
-        return length;
-}
-
-static BAT_ATTR(mesh_iface, S_IRUGO | S_IWUSR,
-                show_mesh_iface, store_mesh_iface);
-static BAT_ATTR(iface_status, S_IRUGO, show_iface_status, NULL);
-
-static struct bat_attribute *batman_attrs[] = {
-        &bat_attr_mesh_iface,
-        &bat_attr_iface_status,
-        NULL,
-};
-
-int sysfs_add_hardif(struct kobject **hardif_obj, struct net_device *dev)
-{
-        struct kobject *hardif_kobject = &dev->dev.kobj;
-        struct bat_attribute **bat_attr;
-        int err;
-
-        *hardif_obj = kobject_create_and_add(SYSFS_IF_BAT_SUBDIR,
-                                                    hardif_kobject);
-
-        if (!*hardif_obj) {
-                bat_err(dev, "Can't add sysfs directory: %s/%s\n", dev->name,
-                        SYSFS_IF_BAT_SUBDIR);
-                goto out;
-        }
-
-        for (bat_attr = batman_attrs; *bat_attr; ++bat_attr) {
-                err = sysfs_create_file(*hardif_obj, &((*bat_attr)->attr));
-                if (err) {
-                        bat_err(dev, "Can't add sysfs file: %s/%s/%s\n",
-                                dev->name, SYSFS_IF_BAT_SUBDIR,
-                                ((*bat_attr)->attr).name);
-                        goto rem_attr;
-                }
-        }
-
-        return 0;
-
-rem_attr:
-        for (bat_attr = batman_attrs; *bat_attr; ++bat_attr)
-                sysfs_remove_file(*hardif_obj, &((*bat_attr)->attr));
-out:
-        return -ENOMEM;
-}
-
-void sysfs_del_hardif(struct kobject **hardif_obj)
-{
-        kobject_put(*hardif_obj);
-        *hardif_obj = NULL;
-}
-
-int throw_uevent(struct bat_priv *bat_priv, enum uev_type type,
-                 enum uev_action action, const char *data)
-{
-        int ret = -1;
-        struct hard_iface *primary_if = NULL;
-        struct kobject *bat_kobj;
-        char *uevent_env[4] = { NULL, NULL, NULL, NULL };
-
-        primary_if = primary_if_get_selected(bat_priv);
-        if (!primary_if)
-                goto out;
-
-        bat_kobj = &primary_if->soft_iface->dev.kobj;
-
-        uevent_env[0] = kmalloc(strlen(UEV_TYPE_VAR) +
-                                strlen(uev_type_str[type]) + 1,
-                                GFP_ATOMIC);
-        if (!uevent_env[0])
-                goto out;
-
-        sprintf(uevent_env[0], "%s%s", UEV_TYPE_VAR, uev_type_str[type]);
-
-        uevent_env[1] = kmalloc(strlen(UEV_ACTION_VAR) +
-                                strlen(uev_action_str[action]) + 1,
-                                GFP_ATOMIC);
-        if (!uevent_env[1])
-                goto out;
-
-        sprintf(uevent_env[1], "%s%s", UEV_ACTION_VAR, uev_action_str[action]);
-
-        /* If the event is DEL, ignore the data field */
-        if (action != UEV_DEL) {
-                uevent_env[2] = kmalloc(strlen(UEV_DATA_VAR) +
-                                        strlen(data) + 1, GFP_ATOMIC);
-                if (!uevent_env[2])
-                        goto out;
-
-                sprintf(uevent_env[2], "%s%s", UEV_DATA_VAR, data);
-        }
-
-        ret = kobject_uevent_env(bat_kobj, KOBJ_CHANGE, uevent_env);
-out:
-        kfree(uevent_env[0]);
-        kfree(uevent_env[1]);
-        kfree(uevent_env[2]);
-
-        if (primary_if)
-                hardif_free_ref(primary_if);
-
-        if (ret)
-                bat_dbg(DBG_BATMAN, bat_priv,
-                        "Impossible to send uevent for (%s,%s,%s) event (err: %d)\n",
-                        uev_type_str[type], uev_action_str[action],
-                        (action == UEV_DEL ? "NULL" : data), ret);
-        return ret;
-}
diff --git a/net/batman-adv/bitarray.c b/net/batman-adv/bitarray.c
index 07ae6e1b8ac..aea174cdbfb 100644
--- a/net/batman-adv/bitarray.c
+++ b/net/batman-adv/bitarray.c
@@ -1,5 +1,4 @@
-/*
- * Copyright (C) 2006-2012 B.A.T.M.A.N. contributors:
+/* Copyright (C) 2006-2012 B.A.T.M.A.N. contributors:
  *
  * Simon Wunderlich, Marek Lindner
  *
@@ -16,7 +15,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA
- *
  */
 
 #include "main.h"
@@ -25,12 +23,12 @@
 #include <linux/bitops.h>
 
 /* shift the packet array by n places. */
-static void bat_bitmap_shift_left(unsigned long *seq_bits, int32_t n)
+static void batadv_bitmap_shift_left(unsigned long *seq_bits, int32_t n)
 {
-        if (n <= 0 || n >= TQ_LOCAL_WINDOW_SIZE)
+        if (n <= 0 || n >= BATADV_TQ_LOCAL_WINDOW_SIZE)
                 return;
 
-        bitmap_shift_left(seq_bits, seq_bits, n, TQ_LOCAL_WINDOW_SIZE);
+        bitmap_shift_left(seq_bits, seq_bits, n, BATADV_TQ_LOCAL_WINDOW_SIZE);
 }
 
 
@@ -40,58 +38,57 @@ static void bat_bitmap_shift_left(unsigned long *seq_bits, int32_t n)
  *  1 if the window was moved (either new or very old)
  *  0 if the window was not moved/shifted.
  */
-int bit_get_packet(void *priv, unsigned long *seq_bits,
-                    int32_t seq_num_diff, int set_mark)
+int batadv_bit_get_packet(void *priv, unsigned long *seq_bits,
+                          int32_t seq_num_diff, int set_mark)
 {
-        struct bat_priv *bat_priv = priv;
+        struct batadv_priv *bat_priv = priv;
 
         /* sequence number is slightly older. We already got a sequence number
-         * higher than this one, so we just mark it. */
-
-        if ((seq_num_diff <= 0) && (seq_num_diff > -TQ_LOCAL_WINDOW_SIZE)) {
+         * higher than this one, so we just mark it.
+         */
+        if (seq_num_diff <= 0 && seq_num_diff > -BATADV_TQ_LOCAL_WINDOW_SIZE) {
                 if (set_mark)
-                        bat_set_bit(seq_bits, -seq_num_diff);
+                        batadv_set_bit(seq_bits, -seq_num_diff);
                 return 0;
         }
 
         /* sequence number is slightly newer, so we shift the window and
-         * set the mark if required */
-
-        if ((seq_num_diff > 0) && (seq_num_diff < TQ_LOCAL_WINDOW_SIZE)) {
-                bat_bitmap_shift_left(seq_bits, seq_num_diff);
+         * set the mark if required
+         */
+        if (seq_num_diff > 0 && seq_num_diff < BATADV_TQ_LOCAL_WINDOW_SIZE) {
+                batadv_bitmap_shift_left(seq_bits, seq_num_diff);
 
                 if (set_mark)
-                        bat_set_bit(seq_bits, 0);
+                        batadv_set_bit(seq_bits, 0);
                 return 1;
         }
 
         /* sequence number is much newer, probably missed a lot of packets */
-
-        if ((seq_num_diff >= TQ_LOCAL_WINDOW_SIZE) &&
-            (seq_num_diff < EXPECTED_SEQNO_RANGE)) {
-                bat_dbg(DBG_BATMAN, bat_priv,
-                        "We missed a lot of packets (%i) !\n",
-                        seq_num_diff - 1);
-                bitmap_zero(seq_bits, TQ_LOCAL_WINDOW_SIZE);
+        if (seq_num_diff >= BATADV_TQ_LOCAL_WINDOW_SIZE &&
+            seq_num_diff < BATADV_EXPECTED_SEQNO_RANGE) {
+                batadv_dbg(BATADV_DBG_BATMAN, bat_priv,
+                           "We missed a lot of packets (%i) !\n",
+                           seq_num_diff - 1);
+                bitmap_zero(seq_bits, BATADV_TQ_LOCAL_WINDOW_SIZE);
                 if (set_mark)
-                        bat_set_bit(seq_bits, 0);
+                        batadv_set_bit(seq_bits, 0);
                 return 1;
         }
 
         /* received a much older packet. The other host either restarted
          * or the old packet got delayed somewhere in the network. The
          * packet should be dropped without calling this function if the
-         * seqno window is protected. */
-
-        if ((seq_num_diff <= -TQ_LOCAL_WINDOW_SIZE) ||
-            (seq_num_diff >= EXPECTED_SEQNO_RANGE)) {
+         * seqno window is protected.
+         */
+        if (seq_num_diff <= -BATADV_TQ_LOCAL_WINDOW_SIZE ||
+            seq_num_diff >= BATADV_EXPECTED_SEQNO_RANGE) {
 
-                bat_dbg(DBG_BATMAN, bat_priv,
-                        "Other host probably restarted!\n");
+                batadv_dbg(BATADV_DBG_BATMAN, bat_priv,
+                           "Other host probably restarted!\n");
 
-                bitmap_zero(seq_bits, TQ_LOCAL_WINDOW_SIZE);
+                bitmap_zero(seq_bits, BATADV_TQ_LOCAL_WINDOW_SIZE);
                 if (set_mark)
-                        bat_set_bit(seq_bits, 0);
+                        batadv_set_bit(seq_bits, 0);
 
                 return 1;
         }
diff --git a/net/batman-adv/bitarray.h b/net/batman-adv/bitarray.h
index 1835c15cda4..a081ce1c051 100644
--- a/net/batman-adv/bitarray.h
+++ b/net/batman-adv/bitarray.h
@@ -1,5 +1,4 @@
-/*
- * Copyright (C) 2006-2012 B.A.T.M.A.N. contributors:
+/* Copyright (C) 2006-2012 B.A.T.M.A.N. contributors:
  *
  * Simon Wunderlich, Marek Lindner
  *
@@ -16,39 +15,40 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA
- *
  */
 
 #ifndef _NET_BATMAN_ADV_BITARRAY_H_
 #define _NET_BATMAN_ADV_BITARRAY_H_
 
 /* returns true if the corresponding bit in the given seq_bits indicates true
- * and curr_seqno is within range of last_seqno */
-static inline int bat_test_bit(const unsigned long *seq_bits,
-                               uint32_t last_seqno, uint32_t curr_seqno)
+ * and curr_seqno is within range of last_seqno
+ */
+static inline int batadv_test_bit(const unsigned long *seq_bits,
+                                  uint32_t last_seqno, uint32_t curr_seqno)
 {
         int32_t diff;
 
         diff = last_seqno - curr_seqno;
-        if (diff < 0 || diff >= TQ_LOCAL_WINDOW_SIZE)
+        if (diff < 0 || diff >= BATADV_TQ_LOCAL_WINDOW_SIZE)
                 return 0;
         else
                 return  test_bit(diff, seq_bits);
 }
 
 /* turn corresponding bit on, so we can remember that we got the packet */
-static inline void bat_set_bit(unsigned long *seq_bits, int32_t n)
+static inline void batadv_set_bit(unsigned long *seq_bits, int32_t n)
 {
         /* if too old, just drop it */
-        if (n < 0 || n >= TQ_LOCAL_WINDOW_SIZE)
+        if (n < 0 || n >= BATADV_TQ_LOCAL_WINDOW_SIZE)
                 return;
 
         set_bit(n, seq_bits); /* turn the position on */
 }
 
 /* receive and process one packet, returns 1 if received seq_num is considered
- * new, 0 if old  */
-int bit_get_packet(void *priv, unsigned long *seq_bits,
-                   int32_t seq_num_diff, int set_mark);
+ * new, 0 if old
+ */
+int batadv_bit_get_packet(void *priv, unsigned long *seq_bits,
+                          int32_t seq_num_diff, int set_mark);
 
 #endif /* _NET_BATMAN_ADV_BITARRAY_H_ */
diff --git a/net/batman-adv/bridge_loop_avoidance.c b/net/batman-adv/bridge_loop_avoidance.c
index c5863f49913..6705d35b17c 100644
--- a/net/batman-adv/bridge_loop_avoidance.c
+++ b/net/batman-adv/bridge_loop_avoidance.c
@@ -1,5 +1,4 @@
-/*
- * Copyright (C) 2011-2012 B.A.T.M.A.N. contributors:
+/* Copyright (C) 2011-2012 B.A.T.M.A.N. contributors:
  *
  * Simon Wunderlich
  *
@@ -16,7 +15,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA
- *
  */
 
 #include "main.h"
@@ -33,14 +31,14 @@
 #include <net/arp.h>
 #include <linux/if_vlan.h>
 
-static const uint8_t announce_mac[4] = {0x43, 0x05, 0x43, 0x05};
+static const uint8_t batadv_announce_mac[4] = {0x43, 0x05, 0x43, 0x05};
 
-static void bla_periodic_work(struct work_struct *work);
-static void bla_send_announce(struct bat_priv *bat_priv,
-                              struct backbone_gw *backbone_gw);
+static void batadv_bla_periodic_work(struct work_struct *work);
+static void batadv_bla_send_announce(struct batadv_priv *bat_priv,
+                                     struct batadv_backbone_gw *backbone_gw);
 
 /* return the index of the claim */
-static inline uint32_t choose_claim(const void *data, uint32_t size)
+static inline uint32_t batadv_choose_claim(const void *data, uint32_t size)
 {
         const unsigned char *key = data;
         uint32_t hash = 0;
@@ -60,7 +58,8 @@ static inline uint32_t choose_claim(const void *data, uint32_t size)
 }
 
 /* return the index of the backbone gateway */
-static inline uint32_t choose_backbone_gw(const void *data, uint32_t size)
+static inline uint32_t batadv_choose_backbone_gw(const void *data,
+                                                 uint32_t size)
 {
         const unsigned char *key = data;
         uint32_t hash = 0;
@@ -81,74 +80,75 @@ static inline uint32_t choose_backbone_gw(const void *data, uint32_t size)
 
 
 /* compares address and vid of two backbone gws */
-static int compare_backbone_gw(const struct hlist_node *node, const void *data2)
+static int batadv_compare_backbone_gw(const struct hlist_node *node,
+                                      const void *data2)
 {
-        const void *data1 = container_of(node, struct backbone_gw,
+        const void *data1 = container_of(node, struct batadv_backbone_gw,
                                          hash_entry);
 
         return (memcmp(data1, data2, ETH_ALEN + sizeof(short)) == 0 ? 1 : 0);
 }
 
 /* compares address and vid of two claims */
-static int compare_claim(const struct hlist_node *node, const void *data2)
+static int batadv_compare_claim(const struct hlist_node *node,
+                                const void *data2)
 {
-        const void *data1 = container_of(node, struct claim,
+        const void *data1 = container_of(node, struct batadv_claim,
                                          hash_entry);
 
         return (memcmp(data1, data2, ETH_ALEN + sizeof(short)) == 0 ? 1 : 0);
 }
 
 /* free a backbone gw */
-static void backbone_gw_free_ref(struct backbone_gw *backbone_gw)
+static void batadv_backbone_gw_free_ref(struct batadv_backbone_gw *backbone_gw)
 {
         if (atomic_dec_and_test(&backbone_gw->refcount))
                 kfree_rcu(backbone_gw, rcu);
 }
 
 /* finally deinitialize the claim */
-static void claim_free_rcu(struct rcu_head *rcu)
+static void batadv_claim_free_rcu(struct rcu_head *rcu)
 {
-        struct claim *claim;
+        struct batadv_claim *claim;
 
-        claim = container_of(rcu, struct claim, rcu);
+        claim = container_of(rcu, struct batadv_claim, rcu);
 
-        backbone_gw_free_ref(claim->backbone_gw);
+        batadv_backbone_gw_free_ref(claim->backbone_gw);
         kfree(claim);
 }
 
 /* free a claim, call claim_free_rcu if its the last reference */
-static void claim_free_ref(struct claim *claim)
+static void batadv_claim_free_ref(struct batadv_claim *claim)
 {
         if (atomic_dec_and_test(&claim->refcount))
-                call_rcu(&claim->rcu, claim_free_rcu);
+                call_rcu(&claim->rcu, batadv_claim_free_rcu);
 }
 
-/**
- * @bat_priv: the bat priv with all the soft interface information
+/* @bat_priv: the bat priv with all the soft interface information
  * @data: search data (may be local/static data)
  *
  * looks for a claim in the hash, and returns it if found
  * or NULL otherwise.
  */
-static struct claim *claim_hash_find(struct bat_priv *bat_priv,
-                                     struct claim *data)
+static struct batadv_claim *batadv_claim_hash_find(struct batadv_priv *bat_priv,
+                                                   struct batadv_claim *data)
 {
-        struct hashtable_t *hash = bat_priv->claim_hash;
+        struct batadv_hashtable *hash = bat_priv->claim_hash;
         struct hlist_head *head;
         struct hlist_node *node;
-        struct claim *claim;
-        struct claim *claim_tmp = NULL;
+        struct batadv_claim *claim;
+        struct batadv_claim *claim_tmp = NULL;
         int index;
 
         if (!hash)
                 return NULL;
 
-        index = choose_claim(data, hash->size);
+        index = batadv_choose_claim(data, hash->size);
         head = &hash->table[index];
 
         rcu_read_lock();
         hlist_for_each_entry_rcu(claim, node, head, hash_entry) {
-                if (!compare_claim(&claim->hash_entry, data))
+                if (!batadv_compare_claim(&claim->hash_entry, data))
                         continue;
 
                 if (!atomic_inc_not_zero(&claim->refcount))
@@ -163,21 +163,22 @@ static struct claim *claim_hash_find(struct bat_priv *bat_priv,
 }
 
 /**
+ * batadv_backbone_hash_find - looks for a claim in the hash
  * @bat_priv: the bat priv with all the soft interface information
  * @addr: the address of the originator
  * @vid: the VLAN ID
  *
- * looks for a claim in the hash, and returns it if found
- * or NULL otherwise.
+ * Returns claim if found or NULL otherwise.
  */
-static struct backbone_gw *backbone_hash_find(struct bat_priv *bat_priv,
-                                              uint8_t *addr, short vid)
+static struct batadv_backbone_gw *
+batadv_backbone_hash_find(struct batadv_priv *bat_priv,
+                          uint8_t *addr, short vid)
 {
-        struct hashtable_t *hash = bat_priv->backbone_hash;
+        struct batadv_hashtable *hash = bat_priv->backbone_hash;
         struct hlist_head *head;
         struct hlist_node *node;
-        struct backbone_gw search_entry, *backbone_gw;
-        struct backbone_gw *backbone_gw_tmp = NULL;
+        struct batadv_backbone_gw search_entry, *backbone_gw;
+        struct batadv_backbone_gw *backbone_gw_tmp = NULL;
         int index;
 
         if (!hash)
@@ -186,13 +187,13 @@ static struct backbone_gw *backbone_hash_find(struct bat_priv *bat_priv,
         memcpy(search_entry.orig, addr, ETH_ALEN);
         search_entry.vid = vid;
 
-        index = choose_backbone_gw(&search_entry, hash->size);
+        index = batadv_choose_backbone_gw(&search_entry, hash->size);
         head = &hash->table[index];
 
         rcu_read_lock();
         hlist_for_each_entry_rcu(backbone_gw, node, head, hash_entry) {
-                if (!compare_backbone_gw(&backbone_gw->hash_entry,
-                                         &search_entry))
+                if (!batadv_compare_backbone_gw(&backbone_gw->hash_entry,
+                                                &search_entry))
                         continue;
 
                 if (!atomic_inc_not_zero(&backbone_gw->refcount))
@@ -207,12 +208,13 @@ static struct backbone_gw *backbone_hash_find(struct bat_priv *bat_priv,
 }
 
 /* delete all claims for a backbone */
-static void bla_del_backbone_claims(struct backbone_gw *backbone_gw)
+static void
+batadv_bla_del_backbone_claims(struct batadv_backbone_gw *backbone_gw)
 {
-        struct hashtable_t *hash;
+        struct batadv_hashtable *hash;
         struct hlist_node *node, *node_tmp;
         struct hlist_head *head;
-        struct claim *claim;
+        struct batadv_claim *claim;
         int i;
         spinlock_t *list_lock;  /* protects write access to the hash lists */
 
@@ -231,36 +233,35 @@ static void bla_del_backbone_claims(struct backbone_gw *backbone_gw)
                         if (claim->backbone_gw != backbone_gw)
                                 continue;
 
-                        claim_free_ref(claim);
+                        batadv_claim_free_ref(claim);
                         hlist_del_rcu(node);
                 }
                 spin_unlock_bh(list_lock);
         }
 
         /* all claims gone, intialize CRC */
-        backbone_gw->crc = BLA_CRC_INIT;
+        backbone_gw->crc = BATADV_BLA_CRC_INIT;
 }
 
 /**
+ * batadv_bla_send_claim - sends a claim frame according to the provided info
  * @bat_priv: the bat priv with all the soft interface information
  * @orig: the mac address to be announced within the claim
  * @vid: the VLAN ID
  * @claimtype: the type of the claim (CLAIM, UNCLAIM, ANNOUNCE, ...)
- *
- * sends a claim frame according to the provided info.
  */
-static void bla_send_claim(struct bat_priv *bat_priv, uint8_t *mac,
-                           short vid, int claimtype)
+static void batadv_bla_send_claim(struct batadv_priv *bat_priv, uint8_t *mac,
+                                  short vid, int claimtype)
 {
         struct sk_buff *skb;
         struct ethhdr *ethhdr;
-        struct hard_iface *primary_if;
+        struct batadv_hard_iface *primary_if;
         struct net_device *soft_iface;
         uint8_t *hw_src;
-        struct bla_claim_dst local_claim_dest;
-        uint32_t zeroip = 0;
+        struct batadv_bla_claim_dst local_claim_dest;
+        __be32 zeroip = 0;
 
-        primary_if = primary_if_get_selected(bat_priv);
+        primary_if = batadv_primary_if_get_selected(bat_priv);
         if (!primary_if)
                 return;
 
@@ -294,40 +295,41 @@ static void bla_send_claim(struct bat_priv *bat_priv, uint8_t *mac,
 
         /* now we pretend that the client would have sent this ... */
         switch (claimtype) {
-        case CLAIM_TYPE_ADD:
+        case BATADV_CLAIM_TYPE_ADD:
                 /* normal claim frame
                  * set Ethernet SRC to the clients mac
                  */
                 memcpy(ethhdr->h_source, mac, ETH_ALEN);
-                bat_dbg(DBG_BLA, bat_priv,
-                        "bla_send_claim(): CLAIM %pM on vid %d\n", mac, vid);
+                batadv_dbg(BATADV_DBG_BLA, bat_priv,
+                           "bla_send_claim(): CLAIM %pM on vid %d\n", mac, vid);
                 break;
-        case CLAIM_TYPE_DEL:
+        case BATADV_CLAIM_TYPE_DEL:
                 /* unclaim frame
                  * set HW SRC to the clients mac
                  */
                 memcpy(hw_src, mac, ETH_ALEN);
-                bat_dbg(DBG_BLA, bat_priv,
-                        "bla_send_claim(): UNCLAIM %pM on vid %d\n", mac, vid);
+                batadv_dbg(BATADV_DBG_BLA, bat_priv,
+                           "bla_send_claim(): UNCLAIM %pM on vid %d\n", mac,
+                           vid);
                 break;
-        case CLAIM_TYPE_ANNOUNCE:
+        case BATADV_CLAIM_TYPE_ANNOUNCE:
                 /* announcement frame
                  * set HW SRC to the special mac containg the crc
                  */
                 memcpy(hw_src, mac, ETH_ALEN);
-                bat_dbg(DBG_BLA, bat_priv,
-                        "bla_send_claim(): ANNOUNCE of %pM on vid %d\n",
-                        ethhdr->h_source, vid);
+                batadv_dbg(BATADV_DBG_BLA, bat_priv,
+                           "bla_send_claim(): ANNOUNCE of %pM on vid %d\n",
+                           ethhdr->h_source, vid);
                 break;
-        case CLAIM_TYPE_REQUEST:
+        case BATADV_CLAIM_TYPE_REQUEST:
                 /* request frame
                  * set HW SRC to the special mac containg the crc
                  */
                 memcpy(hw_src, mac, ETH_ALEN);
                 memcpy(ethhdr->h_dest, mac, ETH_ALEN);
-                bat_dbg(DBG_BLA, bat_priv,
-                        "bla_send_claim(): REQUEST of %pM to %pMon vid %d\n",
-                        ethhdr->h_source, ethhdr->h_dest, vid);
+                batadv_dbg(BATADV_DBG_BLA, bat_priv,
+                           "bla_send_claim(): REQUEST of %pM to %pMon vid %d\n",
+                           ethhdr->h_source, ethhdr->h_dest, vid);
                 break;
 
         }
@@ -344,10 +346,11 @@ static void bla_send_claim(struct bat_priv *bat_priv, uint8_t *mac,
         netif_rx(skb);
 out:
         if (primary_if)
-                hardif_free_ref(primary_if);
+                batadv_hardif_free_ref(primary_if);
 }
 
 /**
+ * batadv_bla_get_backbone_gw
  * @bat_priv: the bat priv with all the soft interface information
  * @orig: the mac address of the originator
  * @vid: the VLAN ID
@@ -355,21 +358,22 @@ out:
  * searches for the backbone gw or creates a new one if it could not
  * be found.
  */
-static struct backbone_gw *bla_get_backbone_gw(struct bat_priv *bat_priv,
-                                               uint8_t *orig, short vid)
+static struct batadv_backbone_gw *
+batadv_bla_get_backbone_gw(struct batadv_priv *bat_priv, uint8_t *orig,
+                           short vid)
 {
-        struct backbone_gw *entry;
-        struct orig_node *orig_node;
+        struct batadv_backbone_gw *entry;
+        struct batadv_orig_node *orig_node;
         int hash_added;
 
-        entry = backbone_hash_find(bat_priv, orig, vid);
+        entry = batadv_backbone_hash_find(bat_priv, orig, vid);
 
         if (entry)
                 return entry;
 
-        bat_dbg(DBG_BLA, bat_priv,
-                "bla_get_backbone_gw(): not found (%pM, %d), creating new entry\n",
-                orig, vid);
+        batadv_dbg(BATADV_DBG_BLA, bat_priv,
+                   "bla_get_backbone_gw(): not found (%pM, %d), creating new entry\n",
+                   orig, vid);
 
         entry = kzalloc(sizeof(*entry), GFP_ATOMIC);
         if (!entry)
@@ -377,7 +381,7 @@ static struct backbone_gw *bla_get_backbone_gw(struct bat_priv *bat_priv,
 
         entry->vid = vid;
         entry->lasttime = jiffies;
-        entry->crc = BLA_CRC_INIT;
+        entry->crc = BATADV_BLA_CRC_INIT;
         entry->bat_priv = bat_priv;
         atomic_set(&entry->request_sent, 0);
         memcpy(entry->orig, orig, ETH_ALEN);
@@ -385,8 +389,10 @@ static struct backbone_gw *bla_get_backbone_gw(struct bat_priv *bat_priv,
         /* one for the hash, one for returning */
         atomic_set(&entry->refcount, 2);
 
-        hash_added = hash_add(bat_priv->backbone_hash, compare_backbone_gw,
-                              choose_backbone_gw, entry, &entry->hash_entry);
+        hash_added = batadv_hash_add(bat_priv->backbone_hash,
+                                     batadv_compare_backbone_gw,
+                                     batadv_choose_backbone_gw, entry,
+                                     &entry->hash_entry);
 
         if (unlikely(hash_added != 0)) {
                 /* hash failed, free the structure */
@@ -395,11 +401,11 @@ static struct backbone_gw *bla_get_backbone_gw(struct bat_priv *bat_priv,
         }
 
         /* this is a gateway now, remove any tt entries */
-        orig_node = orig_hash_find(bat_priv, orig);
+        orig_node = batadv_orig_hash_find(bat_priv, orig);
         if (orig_node) {
-                tt_global_del_orig(bat_priv, orig_node,
-                                   "became a backbone gateway");
-                orig_node_free_ref(orig_node);
+                batadv_tt_global_del_orig(bat_priv, orig_node,
+                                          "became a backbone gateway");
+                batadv_orig_node_free_ref(orig_node);
         }
         return entry;
 }
@@ -407,43 +413,46 @@ static struct backbone_gw *bla_get_backbone_gw(struct bat_priv *bat_priv,
 /* update or add the own backbone gw to make sure we announce
  * where we receive other backbone gws
  */
-static void bla_update_own_backbone_gw(struct bat_priv *bat_priv,
-                                       struct hard_iface *primary_if,
-                                       short vid)
+static void
+batadv_bla_update_own_backbone_gw(struct batadv_priv *bat_priv,
+                                  struct batadv_hard_iface *primary_if,
+                                  short vid)
 {
-        struct backbone_gw *backbone_gw;
+        struct batadv_backbone_gw *backbone_gw;
 
-        backbone_gw = bla_get_backbone_gw(bat_priv,
-                                          primary_if->net_dev->dev_addr, vid);
+        backbone_gw = batadv_bla_get_backbone_gw(bat_priv,
+                                                 primary_if->net_dev->dev_addr,
+                                                 vid);
         if (unlikely(!backbone_gw))
                 return;
 
         backbone_gw->lasttime = jiffies;
-        backbone_gw_free_ref(backbone_gw);
+        batadv_backbone_gw_free_ref(backbone_gw);
 }
 
-/**
- * @bat_priv: the bat priv with all the soft interface information
+/* @bat_priv: the bat priv with all the soft interface information
  * @vid: the vid where the request came on
  *
  * Repeat all of our own claims, and finally send an ANNOUNCE frame
  * to allow the requester another check if the CRC is correct now.
  */
-static void bla_answer_request(struct bat_priv *bat_priv,
-                               struct hard_iface *primary_if, short vid)
+static void batadv_bla_answer_request(struct batadv_priv *bat_priv,
+                                      struct batadv_hard_iface *primary_if,
+                                      short vid)
 {
         struct hlist_node *node;
         struct hlist_head *head;
-        struct hashtable_t *hash;
-        struct claim *claim;
-        struct backbone_gw *backbone_gw;
+        struct batadv_hashtable *hash;
+        struct batadv_claim *claim;
+        struct batadv_backbone_gw *backbone_gw;
         int i;
 
-        bat_dbg(DBG_BLA, bat_priv,
-                "bla_answer_request(): received a claim request, send all of our own claims again\n");
+        batadv_dbg(BATADV_DBG_BLA, bat_priv,
+                   "bla_answer_request(): received a claim request, send all of our own claims again\n");
 
-        backbone_gw = backbone_hash_find(bat_priv,
-                                         primary_if->net_dev->dev_addr, vid);
+        backbone_gw = batadv_backbone_hash_find(bat_priv,
+                                                primary_if->net_dev->dev_addr,
+                                                vid);
         if (!backbone_gw)
                 return;
 
@@ -457,36 +466,34 @@ static void bla_answer_request(struct bat_priv *bat_priv,
                         if (claim->backbone_gw != backbone_gw)
                                 continue;
 
-                        bla_send_claim(bat_priv, claim->addr, claim->vid,
-                                       CLAIM_TYPE_ADD);
+                        batadv_bla_send_claim(bat_priv, claim->addr, claim->vid,
+                                              BATADV_CLAIM_TYPE_ADD);
                 }
                 rcu_read_unlock();
         }
 
         /* finally, send an announcement frame */
-        bla_send_announce(bat_priv, backbone_gw);
-        backbone_gw_free_ref(backbone_gw);
+        batadv_bla_send_announce(bat_priv, backbone_gw);
+        batadv_backbone_gw_free_ref(backbone_gw);
 }
 
-/**
- * @backbone_gw: the backbone gateway from whom we are out of sync
+/* @backbone_gw: the backbone gateway from whom we are out of sync
  *
  * When the crc is wrong, ask the backbone gateway for a full table update.
  * After the request, it will repeat all of his own claims and finally
  * send an announcement claim with which we can check again.
  */
-static void bla_send_request(struct backbone_gw *backbone_gw)
+static void batadv_bla_send_request(struct batadv_backbone_gw *backbone_gw)
 {
         /* first, remove all old entries */
-        bla_del_backbone_claims(backbone_gw);
+        batadv_bla_del_backbone_claims(backbone_gw);
 
-        bat_dbg(DBG_BLA, backbone_gw->bat_priv,
-                "Sending REQUEST to %pM\n",
-                backbone_gw->orig);
+        batadv_dbg(BATADV_DBG_BLA, backbone_gw->bat_priv,
+                   "Sending REQUEST to %pM\n", backbone_gw->orig);
 
         /* send request */
-        bla_send_claim(backbone_gw->bat_priv, backbone_gw->orig,
-                       backbone_gw->vid, CLAIM_TYPE_REQUEST);
+        batadv_bla_send_claim(backbone_gw->bat_priv, backbone_gw->orig,
+                              backbone_gw->vid, BATADV_CLAIM_TYPE_REQUEST);
 
         /* no local broadcasts should be sent or received, for now. */
         if (!atomic_read(&backbone_gw->request_sent)) {
@@ -495,45 +502,45 @@ static void bla_send_request(struct backbone_gw *backbone_gw)
         }
 }
 
-/**
- * @bat_priv: the bat priv with all the soft interface information
+/* @bat_priv: the bat priv with all the soft interface information
  * @backbone_gw: our backbone gateway which should be announced
  *
  * This function sends an announcement. It is called from multiple
  * places.
  */
-static void bla_send_announce(struct bat_priv *bat_priv,
-                              struct backbone_gw *backbone_gw)
+static void batadv_bla_send_announce(struct batadv_priv *bat_priv,
+                                     struct batadv_backbone_gw *backbone_gw)
 {
         uint8_t mac[ETH_ALEN];
-        uint16_t crc;
+        __be16 crc;
 
-        memcpy(mac, announce_mac, 4);
+        memcpy(mac, batadv_announce_mac, 4);
         crc = htons(backbone_gw->crc);
-        memcpy(&mac[4], (uint8_t *)&crc, 2);
+        memcpy(&mac[4], &crc, 2);
 
-        bla_send_claim(bat_priv, mac, backbone_gw->vid, CLAIM_TYPE_ANNOUNCE);
+        batadv_bla_send_claim(bat_priv, mac, backbone_gw->vid,
+                              BATADV_CLAIM_TYPE_ANNOUNCE);
 
 }
 
 /**
+ * batadv_bla_add_claim - Adds a claim in the claim hash
  * @bat_priv: the bat priv with all the soft interface information
  * @mac: the mac address of the claim
  * @vid: the VLAN ID of the frame
  * @backbone_gw: the backbone gateway which claims it
- *
- * Adds a claim in the claim hash.
  */
-static void bla_add_claim(struct bat_priv *bat_priv, const uint8_t *mac,
-                          const short vid, struct backbone_gw *backbone_gw)
+static void batadv_bla_add_claim(struct batadv_priv *bat_priv,
+                                 const uint8_t *mac, const short vid,
+                                 struct batadv_backbone_gw *backbone_gw)
 {
-        struct claim *claim;
-        struct claim search_claim;
+        struct batadv_claim *claim;
+        struct batadv_claim search_claim;
         int hash_added;
 
         memcpy(search_claim.addr, mac, ETH_ALEN);
         search_claim.vid = vid;
-        claim = claim_hash_find(bat_priv, &search_claim);
+        claim = batadv_claim_hash_find(bat_priv, &search_claim);
 
         /* create a new claim entry if it does not exist yet. */
         if (!claim) {
@@ -547,11 +554,13 @@ static void bla_add_claim(struct bat_priv *bat_priv, const uint8_t *mac,
                 claim->backbone_gw = backbone_gw;
 
                 atomic_set(&claim->refcount, 2);
-                bat_dbg(DBG_BLA, bat_priv,
-                        "bla_add_claim(): adding new entry %pM, vid %d to hash ...\n",
-                        mac, vid);
-                hash_added = hash_add(bat_priv->claim_hash, compare_claim,
-                                      choose_claim, claim, &claim->hash_entry);
+                batadv_dbg(BATADV_DBG_BLA, bat_priv,
+                           "bla_add_claim(): adding new entry %pM, vid %d to hash ...\n",
+                           mac, vid);
+                hash_added = batadv_hash_add(bat_priv->claim_hash,
+                                             batadv_compare_claim,
+                                             batadv_choose_claim, claim,
+                                             &claim->hash_entry);
 
                 if (unlikely(hash_added != 0)) {
                         /* only local changes happened. */
@@ -564,13 +573,13 @@ static void bla_add_claim(struct bat_priv *bat_priv, const uint8_t *mac,
                         /* no need to register a new backbone */
                         goto claim_free_ref;
 
-                bat_dbg(DBG_BLA, bat_priv,
-                        "bla_add_claim(): changing ownership for %pM, vid %d\n",
-                        mac, vid);
+                batadv_dbg(BATADV_DBG_BLA, bat_priv,
+                           "bla_add_claim(): changing ownership for %pM, vid %d\n",
+                           mac, vid);
 
                 claim->backbone_gw->crc ^=
                         crc16(0, claim->addr, ETH_ALEN);
-                backbone_gw_free_ref(claim->backbone_gw);
+                batadv_backbone_gw_free_ref(claim->backbone_gw);
 
         }
         /* set (new) backbone gw */
@@ -581,45 +590,48 @@ static void bla_add_claim(struct bat_priv *bat_priv, const uint8_t *mac,
         backbone_gw->lasttime = jiffies;
 
 claim_free_ref:
-        claim_free_ref(claim);
+        batadv_claim_free_ref(claim);
 }
 
 /* Delete a claim from the claim hash which has the
  * given mac address and vid.
  */
-static void bla_del_claim(struct bat_priv *bat_priv, const uint8_t *mac,
-                          const short vid)
+static void batadv_bla_del_claim(struct batadv_priv *bat_priv,
+                                 const uint8_t *mac, const short vid)
 {
-        struct claim search_claim, *claim;
+        struct batadv_claim search_claim, *claim;
 
         memcpy(search_claim.addr, mac, ETH_ALEN);
         search_claim.vid = vid;
-        claim = claim_hash_find(bat_priv, &search_claim);
+        claim = batadv_claim_hash_find(bat_priv, &search_claim);
         if (!claim)
                 return;
 
-        bat_dbg(DBG_BLA, bat_priv, "bla_del_claim(): %pM, vid %d\n", mac, vid);
+        batadv_dbg(BATADV_DBG_BLA, bat_priv, "bla_del_claim(): %pM, vid %d\n",
+                   mac, vid);
 
-        hash_remove(bat_priv->claim_hash, compare_claim, choose_claim, claim);
-        claim_free_ref(claim); /* reference from the hash is gone */
+        batadv_hash_remove(bat_priv->claim_hash, batadv_compare_claim,
+                           batadv_choose_claim, claim);
+        batadv_claim_free_ref(claim); /* reference from the hash is gone */
 
         claim->backbone_gw->crc ^= crc16(0, claim->addr, ETH_ALEN);
 
         /* don't need the reference from hash_find() anymore */
-        claim_free_ref(claim);
+        batadv_claim_free_ref(claim);
 }
 
 /* check for ANNOUNCE frame, return 1 if handled */
-static int handle_announce(struct bat_priv *bat_priv,
-                           uint8_t *an_addr, uint8_t *backbone_addr, short vid)
+static int batadv_handle_announce(struct batadv_priv *bat_priv,
+                                  uint8_t *an_addr, uint8_t *backbone_addr,
+                                  short vid)
 {
-        struct backbone_gw *backbone_gw;
+        struct batadv_backbone_gw *backbone_gw;
         uint16_t crc;
 
-        if (memcmp(an_addr, announce_mac, 4) != 0)
+        if (memcmp(an_addr, batadv_announce_mac, 4) != 0)
                 return 0;
 
-        backbone_gw = bla_get_backbone_gw(bat_priv, backbone_addr, vid);
+        backbone_gw = batadv_bla_get_backbone_gw(bat_priv, backbone_addr, vid);
 
         if (unlikely(!backbone_gw))
                 return 1;
@@ -627,19 +639,19 @@ static int handle_announce(struct bat_priv *bat_priv,
 
         /* handle as ANNOUNCE frame */
         backbone_gw->lasttime = jiffies;
-        crc = ntohs(*((uint16_t *)(&an_addr[4])));
+        crc = ntohs(*((__be16 *)(&an_addr[4])));
 
-        bat_dbg(DBG_BLA, bat_priv,
-                "handle_announce(): ANNOUNCE vid %d (sent by %pM)... CRC = %04x\n",
-                vid, backbone_gw->orig, crc);
+        batadv_dbg(BATADV_DBG_BLA, bat_priv,
+                   "handle_announce(): ANNOUNCE vid %d (sent by %pM)... CRC = %04x\n",
+                   vid, backbone_gw->orig, crc);
 
         if (backbone_gw->crc != crc) {
-                bat_dbg(DBG_BLA, backbone_gw->bat_priv,
-                        "handle_announce(): CRC FAILED for %pM/%d (my = %04x, sent = %04x)\n",
-                        backbone_gw->orig, backbone_gw->vid, backbone_gw->crc,
-                        crc);
+                batadv_dbg(BATADV_DBG_BLA, backbone_gw->bat_priv,
+                           "handle_announce(): CRC FAILED for %pM/%d (my = %04x, sent = %04x)\n",
+                           backbone_gw->orig, backbone_gw->vid,
+                           backbone_gw->crc, crc);
 
-                bla_send_request(backbone_gw);
+                batadv_bla_send_request(backbone_gw);
         } else {
                 /* if we have sent a request and the crc was OK,
                  * we can allow traffic again.
@@ -650,88 +662,92 @@ static int handle_announce(struct bat_priv *bat_priv,
                 }
         }
 
-        backbone_gw_free_ref(backbone_gw);
+        batadv_backbone_gw_free_ref(backbone_gw);
         return 1;
 }
 
 /* check for REQUEST frame, return 1 if handled */
-static int handle_request(struct bat_priv *bat_priv,
-                          struct hard_iface *primary_if,
-                          uint8_t *backbone_addr,
-                          struct ethhdr *ethhdr, short vid)
+static int batadv_handle_request(struct batadv_priv *bat_priv,
+                                 struct batadv_hard_iface *primary_if,
+                                 uint8_t *backbone_addr,
+                                 struct ethhdr *ethhdr, short vid)
 {
         /* check for REQUEST frame */
-        if (!compare_eth(backbone_addr, ethhdr->h_dest))
+        if (!batadv_compare_eth(backbone_addr, ethhdr->h_dest))
                 return 0;
 
         /* sanity check, this should not happen on a normal switch,
          * we ignore it in this case.
          */
-        if (!compare_eth(ethhdr->h_dest, primary_if->net_dev->dev_addr))
+        if (!batadv_compare_eth(ethhdr->h_dest, primary_if->net_dev->dev_addr))
                 return 1;
 
-        bat_dbg(DBG_BLA, bat_priv,
-                "handle_request(): REQUEST vid %d (sent by %pM)...\n",
-                vid, ethhdr->h_source);
+        batadv_dbg(BATADV_DBG_BLA, bat_priv,
+                   "handle_request(): REQUEST vid %d (sent by %pM)...\n",
+                   vid, ethhdr->h_source);
 
-        bla_answer_request(bat_priv, primary_if, vid);
+        batadv_bla_answer_request(bat_priv, primary_if, vid);
         return 1;
 }
 
 /* check for UNCLAIM frame, return 1 if handled */
-static int handle_unclaim(struct bat_priv *bat_priv,
-                          struct hard_iface *primary_if,
-                          uint8_t *backbone_addr,
-                          uint8_t *claim_addr, short vid)
+static int batadv_handle_unclaim(struct batadv_priv *bat_priv,
+                                 struct batadv_hard_iface *primary_if,
+                                 uint8_t *backbone_addr,
+                                 uint8_t *claim_addr, short vid)
 {
-        struct backbone_gw *backbone_gw;
+        struct batadv_backbone_gw *backbone_gw;
 
         /* unclaim in any case if it is our own */
-        if (primary_if && compare_eth(backbone_addr,
-                                      primary_if->net_dev->dev_addr))
-                bla_send_claim(bat_priv, claim_addr, vid, CLAIM_TYPE_DEL);
+        if (primary_if && batadv_compare_eth(backbone_addr,
+                                             primary_if->net_dev->dev_addr))
+                batadv_bla_send_claim(bat_priv, claim_addr, vid,
+                                      BATADV_CLAIM_TYPE_DEL);
 
-        backbone_gw = backbone_hash_find(bat_priv, backbone_addr, vid);
+        backbone_gw = batadv_backbone_hash_find(bat_priv, backbone_addr, vid);
 
         if (!backbone_gw)
                 return 1;
 
         /* this must be an UNCLAIM frame */
-        bat_dbg(DBG_BLA, bat_priv,
-                "handle_unclaim(): UNCLAIM %pM on vid %d (sent by %pM)...\n",
-                claim_addr, vid, backbone_gw->orig);
+        batadv_dbg(BATADV_DBG_BLA, bat_priv,
+                   "handle_unclaim(): UNCLAIM %pM on vid %d (sent by %pM)...\n",
+                   claim_addr, vid, backbone_gw->orig);
 
-        bla_del_claim(bat_priv, claim_addr, vid);
-        backbone_gw_free_ref(backbone_gw);
+        batadv_bla_del_claim(bat_priv, claim_addr, vid);
+        batadv_backbone_gw_free_ref(backbone_gw);
         return 1;
 }
 
 /* check for CLAIM frame, return 1 if handled */
-static int handle_claim(struct bat_priv *bat_priv,
-                        struct hard_iface *primary_if, uint8_t *backbone_addr,
-                        uint8_t *claim_addr, short vid)
+static int batadv_handle_claim(struct batadv_priv *bat_priv,
+                               struct batadv_hard_iface *primary_if,
+                               uint8_t *backbone_addr, uint8_t *claim_addr,
+                               short vid)
 {
-        struct backbone_gw *backbone_gw;
+        struct batadv_backbone_gw *backbone_gw;
 
         /* register the gateway if not yet available, and add the claim. */
 
-        backbone_gw = bla_get_backbone_gw(bat_priv, backbone_addr, vid);
+        backbone_gw = batadv_bla_get_backbone_gw(bat_priv, backbone_addr, vid);
 
         if (unlikely(!backbone_gw))
                 return 1;
 
         /* this must be a CLAIM frame */
-        bla_add_claim(bat_priv, claim_addr, vid, backbone_gw);
-        if (compare_eth(backbone_addr, primary_if->net_dev->dev_addr))
-                bla_send_claim(bat_priv, claim_addr, vid, CLAIM_TYPE_ADD);
+        batadv_bla_add_claim(bat_priv, claim_addr, vid, backbone_gw);
+        if (batadv_compare_eth(backbone_addr, primary_if->net_dev->dev_addr))
+                batadv_bla_send_claim(bat_priv, claim_addr, vid,
+                                      BATADV_CLAIM_TYPE_ADD);
 
         /* TODO: we could call something like tt_local_del() here. */
 
-        backbone_gw_free_ref(backbone_gw);
+        batadv_backbone_gw_free_ref(backbone_gw);
         return 1;
 }
 
 /**
+ * batadv_check_claim_group
  * @bat_priv: the bat priv with all the soft interface information
  * @hw_src: the Hardware source in the ARP Header
  * @hw_dst: the Hardware destination in the ARP Header
@@ -746,16 +762,16 @@ static int handle_claim(struct bat_priv *bat_priv,
  *      1  - if is a claim packet from another group
  *      0  - if it is not a claim packet
  */
-static int check_claim_group(struct bat_priv *bat_priv,
-                             struct hard_iface *primary_if,
-                             uint8_t *hw_src, uint8_t *hw_dst,
-                             struct ethhdr *ethhdr)
+static int batadv_check_claim_group(struct batadv_priv *bat_priv,
+                                    struct batadv_hard_iface *primary_if,
+                                    uint8_t *hw_src, uint8_t *hw_dst,
+                                    struct ethhdr *ethhdr)
 {
         uint8_t *backbone_addr;
-        struct orig_node *orig_node;
-        struct bla_claim_dst *bla_dst, *bla_dst_own;
+        struct batadv_orig_node *orig_node;
+        struct batadv_bla_claim_dst *bla_dst, *bla_dst_own;
 
-        bla_dst = (struct bla_claim_dst *)hw_dst;
+        bla_dst = (struct batadv_bla_claim_dst *)hw_dst;
         bla_dst_own = &bat_priv->claim_dest;
 
         /* check if it is a claim packet in general */
@@ -767,12 +783,12 @@ static int check_claim_group(struct bat_priv *bat_priv,
          * otherwise assume it is in the hw_src
          */
         switch (bla_dst->type) {
-        case CLAIM_TYPE_ADD:
+        case BATADV_CLAIM_TYPE_ADD:
                 backbone_addr = hw_src;
                 break;
-        case CLAIM_TYPE_REQUEST:
-        case CLAIM_TYPE_ANNOUNCE:
-        case CLAIM_TYPE_DEL:
+        case BATADV_CLAIM_TYPE_REQUEST:
+        case BATADV_CLAIM_TYPE_ANNOUNCE:
+        case BATADV_CLAIM_TYPE_DEL:
                 backbone_addr = ethhdr->h_source;
                 break;
         default:
@@ -780,7 +796,7 @@ static int check_claim_group(struct bat_priv *bat_priv,
         }
 
         /* don't accept claim frames from ourselves */
-        if (compare_eth(backbone_addr, primary_if->net_dev->dev_addr))
+        if (batadv_compare_eth(backbone_addr, primary_if->net_dev->dev_addr))
                 return 0;
 
         /* if its already the same group, it is fine. */
@@ -788,7 +804,7 @@ static int check_claim_group(struct bat_priv *bat_priv,
                 return 2;
 
         /* lets see if this originator is in our mesh */
-        orig_node = orig_hash_find(bat_priv, backbone_addr);
+        orig_node = batadv_orig_hash_find(bat_priv, backbone_addr);
 
         /* dont accept claims from gateways which are not in
          * the same mesh or group.
@@ -798,20 +814,19 @@ static int check_claim_group(struct bat_priv *bat_priv,
 
         /* if our mesh friends mac is bigger, use it for ourselves. */
         if (ntohs(bla_dst->group) > ntohs(bla_dst_own->group)) {
-                bat_dbg(DBG_BLA, bat_priv,
-                        "taking other backbones claim group: %04x\n",
-                        ntohs(bla_dst->group));
+                batadv_dbg(BATADV_DBG_BLA, bat_priv,
+                           "taking other backbones claim group: %04x\n",
+                           ntohs(bla_dst->group));
                 bla_dst_own->group = bla_dst->group;
         }
 
-        orig_node_free_ref(orig_node);
+        batadv_orig_node_free_ref(orig_node);
 
         return 2;
 }
 
 
-/**
- * @bat_priv: the bat priv with all the soft interface information
+/* @bat_priv: the bat priv with all the soft interface information
  * @skb: the frame to be checked
  *
  * Check if this is a claim frame, and process it accordingly.
@@ -819,15 +834,15 @@ static int check_claim_group(struct bat_priv *bat_priv,
  * returns 1 if it was a claim frame, otherwise return 0 to
  * tell the callee that it can use the frame on its own.
  */
-static int bla_process_claim(struct bat_priv *bat_priv,
-                             struct hard_iface *primary_if,
-                             struct sk_buff *skb)
+static int batadv_bla_process_claim(struct batadv_priv *bat_priv,
+                                    struct batadv_hard_iface *primary_if,
+                                    struct sk_buff *skb)
 {
         struct ethhdr *ethhdr;
         struct vlan_ethhdr *vhdr;
         struct arphdr *arphdr;
         uint8_t *hw_src, *hw_dst;
-        struct bla_claim_dst *bla_dst;
+        struct batadv_bla_claim_dst *bla_dst;
         uint16_t proto;
         int headlen;
         short vid = -1;
@@ -860,7 +875,6 @@ static int bla_process_claim(struct bat_priv *bat_priv,
         /* Check whether the ARP frame carries a valid
          * IP information
          */
-
         if (arphdr->ar_hrd != htons(ARPHRD_ETHER))
                 return 0;
         if (arphdr->ar_pro != htons(ETH_P_IP))
@@ -872,59 +886,62 @@ static int bla_process_claim(struct bat_priv *bat_priv,
 
         hw_src = (uint8_t *)arphdr + sizeof(struct arphdr);
         hw_dst = hw_src + ETH_ALEN + 4;
-        bla_dst = (struct bla_claim_dst *)hw_dst;
+        bla_dst = (struct batadv_bla_claim_dst *)hw_dst;
 
         /* check if it is a claim frame. */
-        ret = check_claim_group(bat_priv, primary_if, hw_src, hw_dst, ethhdr);
+        ret = batadv_check_claim_group(bat_priv, primary_if, hw_src, hw_dst,
+                                       ethhdr);
         if (ret == 1)
-                bat_dbg(DBG_BLA, bat_priv,
-                        "bla_process_claim(): received a claim frame from another group. From: %pM on vid %d ...(hw_src %pM, hw_dst %pM)\n",
-                        ethhdr->h_source, vid, hw_src, hw_dst);
+                batadv_dbg(BATADV_DBG_BLA, bat_priv,
+                           "bla_process_claim(): received a claim frame from another group. From: %pM on vid %d ...(hw_src %pM, hw_dst %pM)\n",
+                           ethhdr->h_source, vid, hw_src, hw_dst);
 
         if (ret < 2)
                 return ret;
 
         /* become a backbone gw ourselves on this vlan if not happened yet */
-        bla_update_own_backbone_gw(bat_priv, primary_if, vid);
+        batadv_bla_update_own_backbone_gw(bat_priv, primary_if, vid);
 
         /* check for the different types of claim frames ... */
         switch (bla_dst->type) {
-        case CLAIM_TYPE_ADD:
-                if (handle_claim(bat_priv, primary_if, hw_src,
-                                 ethhdr->h_source, vid))
+        case BATADV_CLAIM_TYPE_ADD:
+                if (batadv_handle_claim(bat_priv, primary_if, hw_src,
+                                        ethhdr->h_source, vid))
                         return 1;
                 break;
-        case CLAIM_TYPE_DEL:
-                if (handle_unclaim(bat_priv, primary_if,
-                                   ethhdr->h_source, hw_src, vid))
+        case BATADV_CLAIM_TYPE_DEL:
+                if (batadv_handle_unclaim(bat_priv, primary_if,
+                                          ethhdr->h_source, hw_src, vid))
                         return 1;
                 break;
 
-        case CLAIM_TYPE_ANNOUNCE:
-                if (handle_announce(bat_priv, hw_src, ethhdr->h_source, vid))
+        case BATADV_CLAIM_TYPE_ANNOUNCE:
+                if (batadv_handle_announce(bat_priv, hw_src, ethhdr->h_source,
+                                           vid))
                         return 1;
                 break;
-        case CLAIM_TYPE_REQUEST:
-                if (handle_request(bat_priv, primary_if, hw_src, ethhdr, vid))
+        case BATADV_CLAIM_TYPE_REQUEST:
+                if (batadv_handle_request(bat_priv, primary_if, hw_src, ethhdr,
+                                          vid))
                         return 1;
                 break;
         }
 
-        bat_dbg(DBG_BLA, bat_priv,
-                "bla_process_claim(): ERROR - this looks like a claim frame, but is useless. eth src %pM on vid %d ...(hw_src %pM, hw_dst %pM)\n",
-                ethhdr->h_source, vid, hw_src, hw_dst);
+        batadv_dbg(BATADV_DBG_BLA, bat_priv,
+                   "bla_process_claim(): ERROR - this looks like a claim frame, but is useless. eth src %pM on vid %d ...(hw_src %pM, hw_dst %pM)\n",
+                   ethhdr->h_source, vid, hw_src, hw_dst);
         return 1;
 }
 
 /* Check when we last heard from other nodes, and remove them in case of
  * a time out, or clean all backbone gws if now is set.
  */
-static void bla_purge_backbone_gw(struct bat_priv *bat_priv, int now)
+static void batadv_bla_purge_backbone_gw(struct batadv_priv *bat_priv, int now)
 {
-        struct backbone_gw *backbone_gw;
+        struct batadv_backbone_gw *backbone_gw;
         struct hlist_node *node, *node_tmp;
         struct hlist_head *head;
-        struct hashtable_t *hash;
+        struct batadv_hashtable *hash;
         spinlock_t *list_lock;  /* protects write access to the hash lists */
         int i;
 
@@ -941,29 +958,30 @@ static void bla_purge_backbone_gw(struct bat_priv *bat_priv, int now)
                                           head, hash_entry) {
                         if (now)
                                 goto purge_now;
-                        if (!has_timed_out(backbone_gw->lasttime,
-                                           BLA_BACKBONE_TIMEOUT))
+                        if (!batadv_has_timed_out(backbone_gw->lasttime,
+                                                  BATADV_BLA_BACKBONE_TIMEOUT))
                                 continue;
 
-                        bat_dbg(DBG_BLA, backbone_gw->bat_priv,
-                                "bla_purge_backbone_gw(): backbone gw %pM timed out\n",
-                                backbone_gw->orig);
+                        batadv_dbg(BATADV_DBG_BLA, backbone_gw->bat_priv,
+                                   "bla_purge_backbone_gw(): backbone gw %pM timed out\n",
+                                   backbone_gw->orig);
 
 purge_now:
                         /* don't wait for the pending request anymore */
                         if (atomic_read(&backbone_gw->request_sent))
                                 atomic_dec(&bat_priv->bla_num_requests);
 
-                        bla_del_backbone_claims(backbone_gw);
+                        batadv_bla_del_backbone_claims(backbone_gw);
 
                         hlist_del_rcu(node);
-                        backbone_gw_free_ref(backbone_gw);
+                        batadv_backbone_gw_free_ref(backbone_gw);
                 }
                 spin_unlock_bh(list_lock);
         }
 }
 
 /**
+ * batadv_bla_purge_claims
  * @bat_priv: the bat priv with all the soft interface information
  * @primary_if: the selected primary interface, may be NULL if now is set
  * @now: whether the whole hash shall be wiped now
@@ -971,13 +989,14 @@ purge_now:
  * Check when we heard last time from our own claims, and remove them in case of
  * a time out, or clean all claims if now is set
  */
-static void bla_purge_claims(struct bat_priv *bat_priv,
-                             struct hard_iface *primary_if, int now)
+static void batadv_bla_purge_claims(struct batadv_priv *bat_priv,
+                                    struct batadv_hard_iface *primary_if,
+                                    int now)
 {
-        struct claim *claim;
+        struct batadv_claim *claim;
         struct hlist_node *node;
         struct hlist_head *head;
-        struct hashtable_t *hash;
+        struct batadv_hashtable *hash;
         int i;
 
         hash = bat_priv->claim_hash;
@@ -991,42 +1010,42 @@ static void bla_purge_claims(struct bat_priv *bat_priv,
                 hlist_for_each_entry_rcu(claim, node, head, hash_entry) {
                         if (now)
                                 goto purge_now;
-                        if (!compare_eth(claim->backbone_gw->orig,
-                                         primary_if->net_dev->dev_addr))
+                        if (!batadv_compare_eth(claim->backbone_gw->orig,
+                                                primary_if->net_dev->dev_addr))
                                 continue;
-                        if (!has_timed_out(claim->lasttime,
-                                           BLA_CLAIM_TIMEOUT))
+                        if (!batadv_has_timed_out(claim->lasttime,
+                                                  BATADV_BLA_CLAIM_TIMEOUT))
                                 continue;
 
-                        bat_dbg(DBG_BLA, bat_priv,
-                                "bla_purge_claims(): %pM, vid %d, time out\n",
-                                claim->addr, claim->vid);
+                        batadv_dbg(BATADV_DBG_BLA, bat_priv,
+                                   "bla_purge_claims(): %pM, vid %d, time out\n",
+                                   claim->addr, claim->vid);
 
 purge_now:
-                        handle_unclaim(bat_priv, primary_if,
-                                       claim->backbone_gw->orig,
-                                       claim->addr, claim->vid);
+                        batadv_handle_unclaim(bat_priv, primary_if,
+                                              claim->backbone_gw->orig,
+                                              claim->addr, claim->vid);
                 }
                 rcu_read_unlock();
         }
 }
 
 /**
+ * batadv_bla_update_orig_address
  * @bat_priv: the bat priv with all the soft interface information
  * @primary_if: the new selected primary_if
  * @oldif: the old primary interface, may be NULL
  *
  * Update the backbone gateways when the own orig address changes.
- *
  */
-void bla_update_orig_address(struct bat_priv *bat_priv,
-                             struct hard_iface *primary_if,
-                             struct hard_iface *oldif)
+void batadv_bla_update_orig_address(struct batadv_priv *bat_priv,
+                                    struct batadv_hard_iface *primary_if,
+                                    struct batadv_hard_iface *oldif)
 {
-        struct backbone_gw *backbone_gw;
+        struct batadv_backbone_gw *backbone_gw;
         struct hlist_node *node;
         struct hlist_head *head;
-        struct hashtable_t *hash;
+        struct batadv_hashtable *hash;
         int i;
 
         /* reset bridge loop avoidance group id */
@@ -1034,8 +1053,8 @@ void bla_update_orig_address(struct bat_priv *bat_priv,
                 htons(crc16(0, primary_if->net_dev->dev_addr, ETH_ALEN));
 
         if (!oldif) {
-                bla_purge_claims(bat_priv, NULL, 1);
-                bla_purge_backbone_gw(bat_priv, 1);
+                batadv_bla_purge_claims(bat_priv, NULL, 1);
+                batadv_bla_purge_backbone_gw(bat_priv, 1);
                 return;
         }
 
@@ -1049,8 +1068,8 @@ void bla_update_orig_address(struct bat_priv *bat_priv,
                 rcu_read_lock();
                 hlist_for_each_entry_rcu(backbone_gw, node, head, hash_entry) {
                         /* own orig still holds the old value. */
-                        if (!compare_eth(backbone_gw->orig,
-                                         oldif->net_dev->dev_addr))
+                        if (!batadv_compare_eth(backbone_gw->orig,
+                                                oldif->net_dev->dev_addr))
                                 continue;
 
                         memcpy(backbone_gw->orig,
@@ -1058,7 +1077,7 @@ void bla_update_orig_address(struct bat_priv *bat_priv,
                         /* send an announce frame so others will ask for our
                          * claims and update their tables.
                          */
-                        bla_send_announce(bat_priv, backbone_gw);
+                        batadv_bla_send_announce(bat_priv, backbone_gw);
                 }
                 rcu_read_unlock();
         }
@@ -1067,36 +1086,36 @@ void bla_update_orig_address(struct bat_priv *bat_priv,
 
 
 /* (re)start the timer */
-static void bla_start_timer(struct bat_priv *bat_priv)
+static void batadv_bla_start_timer(struct batadv_priv *bat_priv)
 {
-        INIT_DELAYED_WORK(&bat_priv->bla_work, bla_periodic_work);
-        queue_delayed_work(bat_event_workqueue, &bat_priv->bla_work,
-                           msecs_to_jiffies(BLA_PERIOD_LENGTH));
+        INIT_DELAYED_WORK(&bat_priv->bla_work, batadv_bla_periodic_work);
+        queue_delayed_work(batadv_event_workqueue, &bat_priv->bla_work,
+                           msecs_to_jiffies(BATADV_BLA_PERIOD_LENGTH));
 }
 
 /* periodic work to do:
  *  * purge structures when they are too old
  *  * send announcements
  */
-static void bla_periodic_work(struct work_struct *work)
+static void batadv_bla_periodic_work(struct work_struct *work)
 {
         struct delayed_work *delayed_work =
                 container_of(work, struct delayed_work, work);
-        struct bat_priv *bat_priv =
-                container_of(delayed_work, struct bat_priv, bla_work);
+        struct batadv_priv *bat_priv;
         struct hlist_node *node;
         struct hlist_head *head;
-        struct backbone_gw *backbone_gw;
-        struct hashtable_t *hash;
-        struct hard_iface *primary_if;
+        struct batadv_backbone_gw *backbone_gw;
+        struct batadv_hashtable *hash;
+        struct batadv_hard_iface *primary_if;
         int i;
 
-        primary_if = primary_if_get_selected(bat_priv);
+        bat_priv = container_of(delayed_work, struct batadv_priv, bla_work);
+        primary_if = batadv_primary_if_get_selected(bat_priv);
         if (!primary_if)
                 goto out;
 
-        bla_purge_claims(bat_priv, primary_if, 0);
-        bla_purge_backbone_gw(bat_priv, 0);
+        batadv_bla_purge_claims(bat_priv, primary_if, 0);
+        batadv_bla_purge_backbone_gw(bat_priv, 0);
 
         if (!atomic_read(&bat_priv->bridge_loop_avoidance))
                 goto out;
@@ -1110,67 +1129,81 @@ static void bla_periodic_work(struct work_struct *work)
 
                 rcu_read_lock();
                 hlist_for_each_entry_rcu(backbone_gw, node, head, hash_entry) {
-                        if (!compare_eth(backbone_gw->orig,
-                                         primary_if->net_dev->dev_addr))
+                        if (!batadv_compare_eth(backbone_gw->orig,
+                                                primary_if->net_dev->dev_addr))
                                 continue;
 
                         backbone_gw->lasttime = jiffies;
 
-                        bla_send_announce(bat_priv, backbone_gw);
+                        batadv_bla_send_announce(bat_priv, backbone_gw);
                 }
                 rcu_read_unlock();
         }
 out:
         if (primary_if)
-                hardif_free_ref(primary_if);
+                batadv_hardif_free_ref(primary_if);
 
-        bla_start_timer(bat_priv);
+        batadv_bla_start_timer(bat_priv);
 }
 
+/* The hash for claim and backbone hash receive the same key because they
+ * are getting initialized by hash_new with the same key. Reinitializing
+ * them with to different keys to allow nested locking without generating
+ * lockdep warnings
+ */
+static struct lock_class_key batadv_claim_hash_lock_class_key;
+static struct lock_class_key batadv_backbone_hash_lock_class_key;
+
 /* initialize all bla structures */
-int bla_init(struct bat_priv *bat_priv)
+int batadv_bla_init(struct batadv_priv *bat_priv)
 {
         int i;
         uint8_t claim_dest[ETH_ALEN] = {0xff, 0x43, 0x05, 0x00, 0x00, 0x00};
-        struct hard_iface *primary_if;
+        struct batadv_hard_iface *primary_if;
 
-        bat_dbg(DBG_BLA, bat_priv, "bla hash registering\n");
+        batadv_dbg(BATADV_DBG_BLA, bat_priv, "bla hash registering\n");
 
         /* setting claim destination address */
         memcpy(&bat_priv->claim_dest.magic, claim_dest, 3);
         bat_priv->claim_dest.type = 0;
-        primary_if = primary_if_get_selected(bat_priv);
+        primary_if = batadv_primary_if_get_selected(bat_priv);
         if (primary_if) {
                 bat_priv->claim_dest.group =
                         htons(crc16(0, primary_if->net_dev->dev_addr,
                                     ETH_ALEN));
-                hardif_free_ref(primary_if);
+                batadv_hardif_free_ref(primary_if);
         } else {
                 bat_priv->claim_dest.group = 0; /* will be set later */
         }
 
         /* initialize the duplicate list */
-        for (i = 0; i < DUPLIST_SIZE; i++)
+        for (i = 0; i < BATADV_DUPLIST_SIZE; i++)
                 bat_priv->bcast_duplist[i].entrytime =
-                        jiffies - msecs_to_jiffies(DUPLIST_TIMEOUT);
+                        jiffies - msecs_to_jiffies(BATADV_DUPLIST_TIMEOUT);
         bat_priv->bcast_duplist_curr = 0;
 
         if (bat_priv->claim_hash)
-                return 1;
+                return 0;
 
-        bat_priv->claim_hash = hash_new(128);
-        bat_priv->backbone_hash = hash_new(32);
+        bat_priv->claim_hash = batadv_hash_new(128);
+        bat_priv->backbone_hash = batadv_hash_new(32);
 
         if (!bat_priv->claim_hash || !bat_priv->backbone_hash)
-                return -1;
+                return -ENOMEM;
 
-        bat_dbg(DBG_BLA, bat_priv, "bla hashes initialized\n");
+        batadv_hash_set_lock_class(bat_priv->claim_hash,
+                                   &batadv_claim_hash_lock_class_key);
+        batadv_hash_set_lock_class(bat_priv->backbone_hash,
+                                   &batadv_backbone_hash_lock_class_key);
 
-        bla_start_timer(bat_priv);
-        return 1;
+        batadv_dbg(BATADV_DBG_BLA, bat_priv, "bla hashes initialized\n");
+
+        batadv_bla_start_timer(bat_priv);
+        return 0;
 }
 
 /**
+ * batadv_bla_check_bcast_duplist
  * @bat_priv: the bat priv with all the soft interface information
  * @bcast_packet: originator mac address
  * @hdr_size: maximum length of the frame
@@ -1183,17 +1216,15 @@ int bla_init(struct bat_priv *bat_priv)
  * with a good chance that it is the same packet. If it is furthermore
  * sent by another host, drop it. We allow equal packets from
  * the same host however as this might be intended.
- *
- **/
-
-int bla_check_bcast_duplist(struct bat_priv *bat_priv,
-                            struct bcast_packet *bcast_packet,
-                            int hdr_size)
+ */
+int batadv_bla_check_bcast_duplist(struct batadv_priv *bat_priv,
+                                   struct batadv_bcast_packet *bcast_packet,
+                                   int hdr_size)
 {
         int i, length, curr;
         uint8_t *content;
         uint16_t crc;
-        struct bcast_duplist_entry *entry;
+        struct batadv_bcast_duplist_entry *entry;
 
         length = hdr_size - sizeof(*bcast_packet);
         content = (uint8_t *)bcast_packet;
@@ -1202,20 +1233,21 @@ int bla_check_bcast_duplist(struct bat_priv *bat_priv,
         /* calculate the crc ... */
         crc = crc16(0, content, length);
 
-        for (i = 0 ; i < DUPLIST_SIZE; i++) {
-                curr = (bat_priv->bcast_duplist_curr + i) % DUPLIST_SIZE;
+        for (i = 0; i < BATADV_DUPLIST_SIZE; i++) {
+                curr = (bat_priv->bcast_duplist_curr + i) % BATADV_DUPLIST_SIZE;
                 entry = &bat_priv->bcast_duplist[curr];
 
                 /* we can stop searching if the entry is too old ;
                  * later entries will be even older
                  */
-                if (has_timed_out(entry->entrytime, DUPLIST_TIMEOUT))
+                if (batadv_has_timed_out(entry->entrytime,
+                                         BATADV_DUPLIST_TIMEOUT))
                         break;
 
                 if (entry->crc != crc)
                         continue;
 
-                if (compare_eth(entry->orig, bcast_packet->orig))
+                if (batadv_compare_eth(entry->orig, bcast_packet->orig))
                         continue;
 
                 /* this entry seems to match: same crc, not too old,
@@ -1224,7 +1256,8 @@ int bla_check_bcast_duplist(struct bat_priv *bat_priv,
                 return 1;
         }
         /* not found, add a new entry (overwrite the oldest entry) */
-        curr = (bat_priv->bcast_duplist_curr + DUPLIST_SIZE - 1) % DUPLIST_SIZE;
+        curr = (bat_priv->bcast_duplist_curr + BATADV_DUPLIST_SIZE - 1);
+        curr %= BATADV_DUPLIST_SIZE;
         entry = &bat_priv->bcast_duplist[curr];
         entry->crc = crc;
         entry->entrytime = jiffies;
@@ -1237,22 +1270,19 @@ int bla_check_bcast_duplist(struct bat_priv *bat_priv,
 
 
 
-/**
- * @bat_priv: the bat priv with all the soft interface information
+/* @bat_priv: the bat priv with all the soft interface information
  * @orig: originator mac address
  *
  * check if the originator is a gateway for any VLAN ID.
  *
  * returns 1 if it is found, 0 otherwise
- *
  */
-
-int bla_is_backbone_gw_orig(struct bat_priv *bat_priv, uint8_t *orig)
+int batadv_bla_is_backbone_gw_orig(struct batadv_priv *bat_priv, uint8_t *orig)
 {
-        struct hashtable_t *hash = bat_priv->backbone_hash;
+        struct batadv_hashtable *hash = bat_priv->backbone_hash;
         struct hlist_head *head;
         struct hlist_node *node;
-        struct backbone_gw *backbone_gw;
+        struct batadv_backbone_gw *backbone_gw;
         int i;
 
         if (!atomic_read(&bat_priv->bridge_loop_avoidance))
@@ -1266,7 +1296,7 @@ int bla_is_backbone_gw_orig(struct bat_priv *bat_priv, uint8_t *orig)
 
                 rcu_read_lock();
                 hlist_for_each_entry_rcu(backbone_gw, node, head, hash_entry) {
-                        if (compare_eth(backbone_gw->orig, orig)) {
+                        if (batadv_compare_eth(backbone_gw->orig, orig)) {
                                 rcu_read_unlock();
                                 return 1;
                         }
@@ -1279,6 +1309,7 @@ int bla_is_backbone_gw_orig(struct bat_priv *bat_priv, uint8_t *orig)
 
 
 /**
+ * batadv_bla_is_backbone_gw
  * @skb: the frame to be checked
  * @orig_node: the orig_node of the frame
  * @hdr_size: maximum length of the frame
@@ -1286,14 +1317,13 @@ int bla_is_backbone_gw_orig(struct bat_priv *bat_priv, uint8_t *orig)
  * bla_is_backbone_gw inspects the skb for the VLAN ID and returns 1
  * if the orig_node is also a gateway on the soft interface, otherwise it
  * returns 0.
- *
  */
-int bla_is_backbone_gw(struct sk_buff *skb,
-                       struct orig_node *orig_node, int hdr_size)
+int batadv_bla_is_backbone_gw(struct sk_buff *skb,
+                              struct batadv_orig_node *orig_node, int hdr_size)
 {
         struct ethhdr *ethhdr;
         struct vlan_ethhdr *vhdr;
-        struct backbone_gw *backbone_gw;
+        struct batadv_backbone_gw *backbone_gw;
         short vid = -1;
 
         if (!atomic_read(&orig_node->bat_priv->bridge_loop_avoidance))
@@ -1315,39 +1345,39 @@ int bla_is_backbone_gw(struct sk_buff *skb,
         }
 
         /* see if this originator is a backbone gw for this VLAN */
-
-        backbone_gw = backbone_hash_find(orig_node->bat_priv,
-                                         orig_node->orig, vid);
+        backbone_gw = batadv_backbone_hash_find(orig_node->bat_priv,
+                                                orig_node->orig, vid);
         if (!backbone_gw)
                 return 0;
 
-        backbone_gw_free_ref(backbone_gw);
+        batadv_backbone_gw_free_ref(backbone_gw);
         return 1;
 }
 
 /* free all bla structures (for softinterface free or module unload) */
-void bla_free(struct bat_priv *bat_priv)
+void batadv_bla_free(struct batadv_priv *bat_priv)
 {
-        struct hard_iface *primary_if;
+        struct batadv_hard_iface *primary_if;
 
         cancel_delayed_work_sync(&bat_priv->bla_work);
-        primary_if = primary_if_get_selected(bat_priv);
+        primary_if = batadv_primary_if_get_selected(bat_priv);
 
         if (bat_priv->claim_hash) {
-                bla_purge_claims(bat_priv, primary_if, 1);
-                hash_destroy(bat_priv->claim_hash);
+                batadv_bla_purge_claims(bat_priv, primary_if, 1);
+                batadv_hash_destroy(bat_priv->claim_hash);
                 bat_priv->claim_hash = NULL;
         }
         if (bat_priv->backbone_hash) {
-                bla_purge_backbone_gw(bat_priv, 1);
-                hash_destroy(bat_priv->backbone_hash);
+                batadv_bla_purge_backbone_gw(bat_priv, 1);
+                batadv_hash_destroy(bat_priv->backbone_hash);
                 bat_priv->backbone_hash = NULL;
         }
         if (primary_if)
-                hardif_free_ref(primary_if);
+                batadv_hardif_free_ref(primary_if);
 }
 
 /**
+ * batadv_bla_rx
  * @bat_priv: the bat priv with all the soft interface information
  * @skb: the frame to be checked
  * @vid: the VLAN ID of the frame
@@ -1360,19 +1390,18 @@ void bla_free(struct bat_priv *bat_priv)
  * in these cases, the skb is further handled by this function and
  * returns 1, otherwise it returns 0 and the caller shall further
  * process the skb.
- *
  */
-int bla_rx(struct bat_priv *bat_priv, struct sk_buff *skb, short vid,
-           bool is_bcast)
+int batadv_bla_rx(struct batadv_priv *bat_priv, struct sk_buff *skb, short vid,
+                  bool is_bcast)
 {
         struct ethhdr *ethhdr;
-        struct claim search_claim, *claim = NULL;
-        struct hard_iface *primary_if;
+        struct batadv_claim search_claim, *claim = NULL;
+        struct batadv_hard_iface *primary_if;
         int ret;
 
         ethhdr = (struct ethhdr *)skb_mac_header(skb);
 
-        primary_if = primary_if_get_selected(bat_priv);
+        primary_if = batadv_primary_if_get_selected(bat_priv);
         if (!primary_if)
                 goto handled;
 
@@ -1387,21 +1416,21 @@ int bla_rx(struct bat_priv *bat_priv, struct sk_buff *skb, short vid,
 
         memcpy(search_claim.addr, ethhdr->h_source, ETH_ALEN);
         search_claim.vid = vid;
-        claim = claim_hash_find(bat_priv, &search_claim);
+        claim = batadv_claim_hash_find(bat_priv, &search_claim);
 
         if (!claim) {
                 /* possible optimization: race for a claim */
                 /* No claim exists yet, claim it for us!
                  */
-                handle_claim(bat_priv, primary_if,
-                             primary_if->net_dev->dev_addr,
-                             ethhdr->h_source, vid);
+                batadv_handle_claim(bat_priv, primary_if,
+                                    primary_if->net_dev->dev_addr,
+                                    ethhdr->h_source, vid);
                 goto allow;
         }
 
         /* if it is our own claim ... */
-        if (compare_eth(claim->backbone_gw->orig,
-                        primary_if->net_dev->dev_addr)) {
+        if (batadv_compare_eth(claim->backbone_gw->orig,
+                               primary_if->net_dev->dev_addr)) {
                 /* ... allow it in any case */
                 claim->lasttime = jiffies;
                 goto allow;
@@ -1421,13 +1450,13 @@ int bla_rx(struct bat_priv *bat_priv, struct sk_buff *skb, short vid,
                  * send a claim and update the claim table
                  * immediately.
                  */
-                handle_claim(bat_priv, primary_if,
-                             primary_if->net_dev->dev_addr,
-                             ethhdr->h_source, vid);
+                batadv_handle_claim(bat_priv, primary_if,
+                                    primary_if->net_dev->dev_addr,
+                                    ethhdr->h_source, vid);
                 goto allow;
         }
 allow:
-        bla_update_own_backbone_gw(bat_priv, primary_if, vid);
+        batadv_bla_update_own_backbone_gw(bat_priv, primary_if, vid);
         ret = 0;
         goto out;
 
@@ -1437,13 +1466,14 @@ handled:
 
 out:
         if (primary_if)
-                hardif_free_ref(primary_if);
+                batadv_hardif_free_ref(primary_if);
         if (claim)
-                claim_free_ref(claim);
+                batadv_claim_free_ref(claim);
         return ret;
 }
 
 /**
+ * batadv_bla_tx
  * @bat_priv: the bat priv with all the soft interface information
  * @skb: the frame to be checked
  * @vid: the VLAN ID of the frame
@@ -1455,16 +1485,15 @@ out:
  * in these cases, the skb is further handled by this function and
  * returns 1, otherwise it returns 0 and the caller shall further
  * process the skb.
- *
  */
-int bla_tx(struct bat_priv *bat_priv, struct sk_buff *skb, short vid)
+int batadv_bla_tx(struct batadv_priv *bat_priv, struct sk_buff *skb, short vid)
 {
         struct ethhdr *ethhdr;
-        struct claim search_claim, *claim = NULL;
-        struct hard_iface *primary_if;
+        struct batadv_claim search_claim, *claim = NULL;
+        struct batadv_hard_iface *primary_if;
         int ret = 0;
 
-        primary_if = primary_if_get_selected(bat_priv);
+        primary_if = batadv_primary_if_get_selected(bat_priv);
         if (!primary_if)
                 goto out;
 
@@ -1474,7 +1503,7 @@ int bla_tx(struct bat_priv *bat_priv, struct sk_buff *skb, short vid)
         /* in VLAN case, the mac header might not be set. */
         skb_reset_mac_header(skb);
 
-        if (bla_process_claim(bat_priv, primary_if, skb))
+        if (batadv_bla_process_claim(bat_priv, primary_if, skb))
                 goto handled;
 
         ethhdr = (struct ethhdr *)skb_mac_header(skb);
@@ -1487,21 +1516,21 @@ int bla_tx(struct bat_priv *bat_priv, struct sk_buff *skb, short vid)
         memcpy(search_claim.addr, ethhdr->h_source, ETH_ALEN);
         search_claim.vid = vid;
 
-        claim = claim_hash_find(bat_priv, &search_claim);
+        claim = batadv_claim_hash_find(bat_priv, &search_claim);
 
         /* if no claim exists, allow it. */
         if (!claim)
                 goto allow;
 
         /* check if we are responsible. */
-        if (compare_eth(claim->backbone_gw->orig,
-                        primary_if->net_dev->dev_addr)) {
+        if (batadv_compare_eth(claim->backbone_gw->orig,
+                               primary_if->net_dev->dev_addr)) {
                 /* if yes, the client has roamed and we have
                  * to unclaim it.
                  */
-                handle_unclaim(bat_priv, primary_if,
-                               primary_if->net_dev->dev_addr,
-                               ethhdr->h_source, vid);
+                batadv_handle_unclaim(bat_priv, primary_if,
+                                      primary_if->net_dev->dev_addr,
+                                      ethhdr->h_source, vid);
                 goto allow;
         }
 
@@ -1518,33 +1547,34 @@ int bla_tx(struct bat_priv *bat_priv, struct sk_buff *skb, short vid)
                 goto allow;
         }
 allow:
-        bla_update_own_backbone_gw(bat_priv, primary_if, vid);
+        batadv_bla_update_own_backbone_gw(bat_priv, primary_if, vid);
         ret = 0;
         goto out;
 handled:
         ret = 1;
 out:
         if (primary_if)
-                hardif_free_ref(primary_if);
+                batadv_hardif_free_ref(primary_if);
         if (claim)
-                claim_free_ref(claim);
+                batadv_claim_free_ref(claim);
         return ret;
 }
 
-int bla_claim_table_seq_print_text(struct seq_file *seq, void *offset)
+int batadv_bla_claim_table_seq_print_text(struct seq_file *seq, void *offset)
 {
         struct net_device *net_dev = (struct net_device *)seq->private;
-        struct bat_priv *bat_priv = netdev_priv(net_dev);
-        struct hashtable_t *hash = bat_priv->claim_hash;
-        struct claim *claim;
-        struct hard_iface *primary_if;
+        struct batadv_priv *bat_priv = netdev_priv(net_dev);
+        struct batadv_hashtable *hash = bat_priv->claim_hash;
+        struct batadv_claim *claim;
+        struct batadv_hard_iface *primary_if;
         struct hlist_node *node;
         struct hlist_head *head;
         uint32_t i;
         bool is_own;
         int ret = 0;
+        uint8_t *primary_addr;
 
-        primary_if = primary_if_get_selected(bat_priv);
+        primary_if = batadv_primary_if_get_selected(bat_priv);
         if (!primary_if) {
                 ret = seq_printf(seq,
                                  "BATMAN mesh %s disabled - please specify interfaces to enable it\n",
@@ -1552,16 +1582,17 @@ int bla_claim_table_seq_print_text(struct seq_file *seq, void *offset)
                 goto out;
         }
 
-        if (primary_if->if_status != IF_ACTIVE) {
+        if (primary_if->if_status != BATADV_IF_ACTIVE) {
                 ret = seq_printf(seq,
                                  "BATMAN mesh %s disabled - primary interface not active\n",
                                  net_dev->name);
                 goto out;
         }
 
+        primary_addr = primary_if->net_dev->dev_addr;
         seq_printf(seq,
                    "Claims announced for the mesh %s (orig %pM, group id %04x)\n",
-                   net_dev->name, primary_if->net_dev->dev_addr,
+                   net_dev->name, primary_addr,
                    ntohs(bat_priv->claim_dest.group));
         seq_printf(seq, "   %-17s    %-5s    %-17s [o] (%-4s)\n",
                    "Client", "VID", "Originator", "CRC");
@@ -1570,8 +1601,8 @@ int bla_claim_table_seq_print_text(struct seq_file *seq, void *offset)
 
                 rcu_read_lock();
                 hlist_for_each_entry_rcu(claim, node, head, hash_entry) {
-                        is_own = compare_eth(claim->backbone_gw->orig,
-                                             primary_if->net_dev->dev_addr);
+                        is_own = batadv_compare_eth(claim->backbone_gw->orig,
+                                                    primary_addr);
                         seq_printf(seq, " * %pM on % 5d by %pM [%c] (%04x)\n",
                                    claim->addr, claim->vid,
                                    claim->backbone_gw->orig,
@@ -1582,6 +1613,6 @@ int bla_claim_table_seq_print_text(struct seq_file *seq, void *offset)
         }
 out:
         if (primary_if)
-                hardif_free_ref(primary_if);
+                batadv_hardif_free_ref(primary_if);
         return ret;
 }
diff --git a/net/batman-adv/bridge_loop_avoidance.h b/net/batman-adv/bridge_loop_avoidance.h
index dc5227b398d..563cfbf94a7 100644
--- a/net/batman-adv/bridge_loop_avoidance.h
+++ b/net/batman-adv/bridge_loop_avoidance.h
@@ -1,5 +1,4 @@
-/*
- * Copyright (C) 2011-2012 B.A.T.M.A.N. contributors:
+/* Copyright (C) 2011-2012 B.A.T.M.A.N. contributors:
  *
  * Simon Wunderlich
  *
@@ -16,81 +15,84 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA
- *
  */
 
 #ifndef _NET_BATMAN_ADV_BLA_H_
 #define _NET_BATMAN_ADV_BLA_H_
 
 #ifdef CONFIG_BATMAN_ADV_BLA
-int bla_rx(struct bat_priv *bat_priv, struct sk_buff *skb, short vid,
-           bool is_bcast);
-int bla_tx(struct bat_priv *bat_priv, struct sk_buff *skb, short vid);
-int bla_is_backbone_gw(struct sk_buff *skb,
-                       struct orig_node *orig_node, int hdr_size);
-int bla_claim_table_seq_print_text(struct seq_file *seq, void *offset);
-int bla_is_backbone_gw_orig(struct bat_priv *bat_priv, uint8_t *orig);
-int bla_check_bcast_duplist(struct bat_priv *bat_priv,
-                            struct bcast_packet *bcast_packet, int hdr_size);
-void bla_update_orig_address(struct bat_priv *bat_priv,
-                             struct hard_iface *primary_if,
-                             struct hard_iface *oldif);
-int bla_init(struct bat_priv *bat_priv);
-void bla_free(struct bat_priv *bat_priv);
+int batadv_bla_rx(struct batadv_priv *bat_priv, struct sk_buff *skb, short vid,
+                  bool is_bcast);
+int batadv_bla_tx(struct batadv_priv *bat_priv, struct sk_buff *skb, short vid);
+int batadv_bla_is_backbone_gw(struct sk_buff *skb,
+                              struct batadv_orig_node *orig_node, int hdr_size);
+int batadv_bla_claim_table_seq_print_text(struct seq_file *seq, void *offset);
+int batadv_bla_is_backbone_gw_orig(struct batadv_priv *bat_priv, uint8_t *orig);
+int batadv_bla_check_bcast_duplist(struct batadv_priv *bat_priv,
+                                   struct batadv_bcast_packet *bcast_packet,
+                                   int hdr_size);
+void batadv_bla_update_orig_address(struct batadv_priv *bat_priv,
+                                    struct batadv_hard_iface *primary_if,
+                                    struct batadv_hard_iface *oldif);
+int batadv_bla_init(struct batadv_priv *bat_priv);
+void batadv_bla_free(struct batadv_priv *bat_priv);
 
-#define BLA_CRC_INIT    0
+#define BATADV_BLA_CRC_INIT     0
 #else /* ifdef CONFIG_BATMAN_ADV_BLA */
 
-static inline int bla_rx(struct bat_priv *bat_priv, struct sk_buff *skb,
-                         short vid, bool is_bcast)
+static inline int batadv_bla_rx(struct batadv_priv *bat_priv,
+                                struct sk_buff *skb, short vid,
+                                bool is_bcast)
 {
         return 0;
 }
 
-static inline int bla_tx(struct bat_priv *bat_priv, struct sk_buff *skb,
-                         short vid)
+static inline int batadv_bla_tx(struct batadv_priv *bat_priv,
+                                struct sk_buff *skb, short vid)
 {
         return 0;
 }
 
-static inline int bla_is_backbone_gw(struct sk_buff *skb,
-                                     struct orig_node *orig_node,
-                                     int hdr_size)
+static inline int batadv_bla_is_backbone_gw(struct sk_buff *skb,
+                                            struct batadv_orig_node *orig_node,
+                                            int hdr_size)
 {
         return 0;
 }
 
-static inline int bla_claim_table_seq_print_text(struct seq_file *seq,
-                                                 void *offset)
+static inline int batadv_bla_claim_table_seq_print_text(struct seq_file *seq,
+                                                        void *offset)
 {
         return 0;
 }
 
-static inline int bla_is_backbone_gw_orig(struct bat_priv *bat_priv,
-                                          uint8_t *orig)
+static inline int batadv_bla_is_backbone_gw_orig(struct batadv_priv *bat_priv,
+                                                 uint8_t *orig)
 {
         return 0;
 }
 
-static inline int bla_check_bcast_duplist(struct bat_priv *bat_priv,
-                                          struct bcast_packet *bcast_packet,
-                                          int hdr_size)
+static inline int
+batadv_bla_check_bcast_duplist(struct batadv_priv *bat_priv,
+                               struct batadv_bcast_packet *bcast_packet,
+                               int hdr_size)
 {
         return 0;
 }
 
-static inline void bla_update_orig_address(struct bat_priv *bat_priv,
-                                           struct hard_iface *primary_if,
-                                           struct hard_iface *oldif)
+static inline void
+batadv_bla_update_orig_address(struct batadv_priv *bat_priv,
+                               struct batadv_hard_iface *primary_if,
+                               struct batadv_hard_iface *oldif)
 {
 }
 
-static inline int bla_init(struct bat_priv *bat_priv)
+static inline int batadv_bla_init(struct batadv_priv *bat_priv)
 {
         return 1;
 }
 
-static inline void bla_free(struct bat_priv *bat_priv)
+static inline void batadv_bla_free(struct batadv_priv *bat_priv)
 {
 }
 
diff --git a/net/batman-adv/debugfs.c b/net/batman-adv/debugfs.c
new file mode 100644
index 00000000000..34fbb1667bc
--- /dev/null
+++ b/net/batman-adv/debugfs.c
@@ -0,0 +1,409 @@
+/* Copyright (C) 2010-2012 B.A.T.M.A.N. contributors:
+ *
+ * Marek Lindner
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of version 2 of the GNU General Public
+ * License as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA
+ */
+
+#include "main.h"
+
+#include <linux/debugfs.h>
+
+#include "debugfs.h"
+#include "translation-table.h"
+#include "originator.h"
+#include "hard-interface.h"
+#include "gateway_common.h"
+#include "gateway_client.h"
+#include "soft-interface.h"
+#include "vis.h"
+#include "icmp_socket.h"
+#include "bridge_loop_avoidance.h"
+
+static struct dentry *batadv_debugfs;
+
+#ifdef CONFIG_BATMAN_ADV_DEBUG
+#define BATADV_LOG_BUFF_MASK (batadv_log_buff_len - 1)
+
+static const int batadv_log_buff_len = BATADV_LOG_BUF_LEN;
+
+static char *batadv_log_char_addr(struct batadv_debug_log *debug_log,
+                                  size_t idx)
+{
+        return &debug_log->log_buff[idx & BATADV_LOG_BUFF_MASK];
+}
+
+static void batadv_emit_log_char(struct batadv_debug_log *debug_log, char c)
+{
+        char *char_addr;
+
+        char_addr = batadv_log_char_addr(debug_log, debug_log->log_end);
+        *char_addr = c;
+        debug_log->log_end++;
+
+        if (debug_log->log_end - debug_log->log_start > batadv_log_buff_len)
+                debug_log->log_start = debug_log->log_end - batadv_log_buff_len;
+}
+
+__printf(2, 3)
+static int batadv_fdebug_log(struct batadv_debug_log *debug_log,
+                             const char *fmt, ...)
+{
+        va_list args;
+        static char debug_log_buf[256];
+        char *p;
+
+        if (!debug_log)
+                return 0;
+
+        spin_lock_bh(&debug_log->lock);
+        va_start(args, fmt);
+        vscnprintf(debug_log_buf, sizeof(debug_log_buf), fmt, args);
+        va_end(args);
+
+        for (p = debug_log_buf; *p != 0; p++)
+                batadv_emit_log_char(debug_log, *p);
+
+        spin_unlock_bh(&debug_log->lock);
+
+        wake_up(&debug_log->queue_wait);
+
+        return 0;
+}
+
+int batadv_debug_log(struct batadv_priv *bat_priv, const char *fmt, ...)
+{
+        va_list args;
+        char tmp_log_buf[256];
+
+        va_start(args, fmt);
+        vscnprintf(tmp_log_buf, sizeof(tmp_log_buf), fmt, args);
+        batadv_fdebug_log(bat_priv->debug_log, "[%10u] %s",
+                          jiffies_to_msecs(jiffies), tmp_log_buf);
+        va_end(args);
+
+        return 0;
+}
+
+static int batadv_log_open(struct inode *inode, struct file *file)
+{
+        nonseekable_open(inode, file);
+        file->private_data = inode->i_private;
+        batadv_inc_module_count();
+        return 0;
+}
+
+static int batadv_log_release(struct inode *inode, struct file *file)
+{
+        batadv_dec_module_count();
+        return 0;
+}
+
+static int batadv_log_empty(struct batadv_debug_log *debug_log)
+{
+        return !(debug_log->log_start - debug_log->log_end);
+}
+
+static ssize_t batadv_log_read(struct file *file, char __user *buf,
+                               size_t count, loff_t *ppos)
+{
+        struct batadv_priv *bat_priv = file->private_data;
+        struct batadv_debug_log *debug_log = bat_priv->debug_log;
+        int error, i = 0;
+        char *char_addr;
+        char c;
+
+        if ((file->f_flags & O_NONBLOCK) && batadv_log_empty(debug_log))
+                return -EAGAIN;
+
+        if (!buf)
+                return -EINVAL;
+
+        if (count == 0)
+                return 0;
+
+        if (!access_ok(VERIFY_WRITE, buf, count))
+                return -EFAULT;
+
+        error = wait_event_interruptible(debug_log->queue_wait,
+                                         (!batadv_log_empty(debug_log)));
+
+        if (error)
+                return error;
+
+        spin_lock_bh(&debug_log->lock);
+
+        while ((!error) && (i < count) &&
+               (debug_log->log_start != debug_log->log_end)) {
+                char_addr = batadv_log_char_addr(debug_log,
+                                                 debug_log->log_start);
+                c = *char_addr;
+
+                debug_log->log_start++;
+
+                spin_unlock_bh(&debug_log->lock);
+
+                error = __put_user(c, buf);
+
+                spin_lock_bh(&debug_log->lock);
+
+                buf++;
+                i++;
+
+        }
+
+        spin_unlock_bh(&debug_log->lock);
+
+        if (!error)
+                return i;
+
+        return error;
+}
+
+static unsigned int batadv_log_poll(struct file *file, poll_table *wait)
+{
+        struct batadv_priv *bat_priv = file->private_data;
+        struct batadv_debug_log *debug_log = bat_priv->debug_log;
+
+        poll_wait(file, &debug_log->queue_wait, wait);
+
+        if (!batadv_log_empty(debug_log))
+                return POLLIN | POLLRDNORM;
+
+        return 0;
+}
+
+static const struct file_operations batadv_log_fops = {
+        .open           = batadv_log_open,
+        .release        = batadv_log_release,
+        .read           = batadv_log_read,
+        .poll           = batadv_log_poll,
+        .llseek         = no_llseek,
+};
+
+static int batadv_debug_log_setup(struct batadv_priv *bat_priv)
+{
+        struct dentry *d;
+
+        if (!bat_priv->debug_dir)
+                goto err;
+
+        bat_priv->debug_log = kzalloc(sizeof(*bat_priv->debug_log), GFP_ATOMIC);
+        if (!bat_priv->debug_log)
+                goto err;
+
+        spin_lock_init(&bat_priv->debug_log->lock);
+        init_waitqueue_head(&bat_priv->debug_log->queue_wait);
+
+        d = debugfs_create_file("log", S_IFREG | S_IRUSR,
+                                bat_priv->debug_dir, bat_priv,
+                                &batadv_log_fops);
+        if (!d)
+                goto err;
+
+        return 0;
+
+err:
+        return -ENOMEM;
+}
+
+static void batadv_debug_log_cleanup(struct batadv_priv *bat_priv)
+{
+        kfree(bat_priv->debug_log);
+        bat_priv->debug_log = NULL;
+}
+#else /* CONFIG_BATMAN_ADV_DEBUG */
+static int batadv_debug_log_setup(struct batadv_priv *bat_priv)
+{
+        bat_priv->debug_log = NULL;
+        return 0;
+}
+
+static void batadv_debug_log_cleanup(struct batadv_priv *bat_priv)
+{
+        return;
+}
+#endif
+
+static int batadv_algorithms_open(struct inode *inode, struct file *file)
+{
+        return single_open(file, batadv_algo_seq_print_text, NULL);
+}
+
+static int batadv_originators_open(struct inode *inode, struct file *file)
+{
+        struct net_device *net_dev = (struct net_device *)inode->i_private;
+        return single_open(file, batadv_orig_seq_print_text, net_dev);
+}
+
+static int batadv_gateways_open(struct inode *inode, struct file *file)
+{
+        struct net_device *net_dev = (struct net_device *)inode->i_private;
+        return single_open(file, batadv_gw_client_seq_print_text, net_dev);
+}
+
+static int batadv_transtable_global_open(struct inode *inode, struct file *file)
+{
+        struct net_device *net_dev = (struct net_device *)inode->i_private;
+        return single_open(file, batadv_tt_global_seq_print_text, net_dev);
+}
+
+#ifdef CONFIG_BATMAN_ADV_BLA
+static int batadv_bla_claim_table_open(struct inode *inode, struct file *file)
+{
+        struct net_device *net_dev = (struct net_device *)inode->i_private;
+        return single_open(file, batadv_bla_claim_table_seq_print_text,
+                           net_dev);
+}
+#endif
+
+static int batadv_transtable_local_open(struct inode *inode, struct file *file)
+{
+        struct net_device *net_dev = (struct net_device *)inode->i_private;
+        return single_open(file, batadv_tt_local_seq_print_text, net_dev);
+}
+
+static int batadv_vis_data_open(struct inode *inode, struct file *file)
+{
+        struct net_device *net_dev = (struct net_device *)inode->i_private;
+        return single_open(file, batadv_vis_seq_print_text, net_dev);
+}
+
+struct batadv_debuginfo {
+        struct attribute attr;
+        const struct file_operations fops;
+};
+
+#define BATADV_DEBUGINFO(_name, _mode, _open)           \
+struct batadv_debuginfo batadv_debuginfo_##_name = {    \
+        .attr = { .name = __stringify(_name),           \
+                  .mode = _mode, },                     \
+        .fops = { .owner = THIS_MODULE,                 \
+                  .open = _open,                        \
+                  .read = seq_read,                     \
+                  .llseek = seq_lseek,                  \
+                  .release = single_release,            \
+                }                                       \
+};
+
+static BATADV_DEBUGINFO(routing_algos, S_IRUGO, batadv_algorithms_open);
+static BATADV_DEBUGINFO(originators, S_IRUGO, batadv_originators_open);
+static BATADV_DEBUGINFO(gateways, S_IRUGO, batadv_gateways_open);
+static BATADV_DEBUGINFO(transtable_global, S_IRUGO,
+                        batadv_transtable_global_open);
+#ifdef CONFIG_BATMAN_ADV_BLA
+static BATADV_DEBUGINFO(bla_claim_table, S_IRUGO, batadv_bla_claim_table_open);
+#endif
+static BATADV_DEBUGINFO(transtable_local, S_IRUGO,
+                        batadv_transtable_local_open);
+static BATADV_DEBUGINFO(vis_data, S_IRUGO, batadv_vis_data_open);
+
+static struct batadv_debuginfo *batadv_mesh_debuginfos[] = {
+        &batadv_debuginfo_originators,
+        &batadv_debuginfo_gateways,
+        &batadv_debuginfo_transtable_global,
+#ifdef CONFIG_BATMAN_ADV_BLA
+        &batadv_debuginfo_bla_claim_table,
+#endif
+        &batadv_debuginfo_transtable_local,
+        &batadv_debuginfo_vis_data,
+        NULL,
+};
+
+void batadv_debugfs_init(void)
+{
+        struct batadv_debuginfo *bat_debug;
+        struct dentry *file;
+
+        batadv_debugfs = debugfs_create_dir(BATADV_DEBUGFS_SUBDIR, NULL);
+        if (batadv_debugfs == ERR_PTR(-ENODEV))
+                batadv_debugfs = NULL;
+
+        if (!batadv_debugfs)
+                goto out;
+
+        bat_debug = &batadv_debuginfo_routing_algos;
+        file = debugfs_create_file(bat_debug->attr.name,
+                                   S_IFREG | bat_debug->attr.mode,
+                                   batadv_debugfs, NULL, &bat_debug->fops);
+        if (!file)
+                pr_err("Can't add debugfs file: %s\n", bat_debug->attr.name);
+
+out:
+        return;
+}
+
+void batadv_debugfs_destroy(void)
+{
+        if (batadv_debugfs) {
+                debugfs_remove_recursive(batadv_debugfs);
+                batadv_debugfs = NULL;
+        }
+}
+
+int batadv_debugfs_add_meshif(struct net_device *dev)
+{
+        struct batadv_priv *bat_priv = netdev_priv(dev);
+        struct batadv_debuginfo **bat_debug;
+        struct dentry *file;
+
+        if (!batadv_debugfs)
+                goto out;
+
+        bat_priv->debug_dir = debugfs_create_dir(dev->name, batadv_debugfs);
+        if (!bat_priv->debug_dir)
+                goto out;
+
+        if (batadv_socket_setup(bat_priv) < 0)
+                goto rem_attr;
+
+        if (batadv_debug_log_setup(bat_priv) < 0)
+                goto rem_attr;
+
+        for (bat_debug = batadv_mesh_debuginfos; *bat_debug; ++bat_debug) {
+                file = debugfs_create_file(((*bat_debug)->attr).name,
+                                           S_IFREG | ((*bat_debug)->attr).mode,
+                                           bat_priv->debug_dir,
+                                           dev, &(*bat_debug)->fops);
+                if (!file) {
+                        batadv_err(dev, "Can't add debugfs file: %s/%s\n",
+                                   dev->name, ((*bat_debug)->attr).name);
+                        goto rem_attr;
+                }
+        }
+
+        return 0;
+rem_attr:
+        debugfs_remove_recursive(bat_priv->debug_dir);
+        bat_priv->debug_dir = NULL;
+out:
+#ifdef CONFIG_DEBUG_FS
+        return -ENOMEM;
+#else
+        return 0;
+#endif /* CONFIG_DEBUG_FS */
+}
+
+void batadv_debugfs_del_meshif(struct net_device *dev)
+{
+        struct batadv_priv *bat_priv = netdev_priv(dev);
+
+        batadv_debug_log_cleanup(bat_priv);
+
+        if (batadv_debugfs) {
+                debugfs_remove_recursive(bat_priv->debug_dir);
+                bat_priv->debug_dir = NULL;
+        }
+}
diff --git a/net/batman-adv/bat_debugfs.h b/net/batman-adv/debugfs.h
index d605c674642..3319e1f21f5 100644
--- a/net/batman-adv/bat_debugfs.h
+++ b/net/batman-adv/debugfs.h
@@ -1,5 +1,4 @@
-/*
- * Copyright (C) 2010-2012 B.A.T.M.A.N. contributors:
+/* Copyright (C) 2010-2012 B.A.T.M.A.N. contributors:
  *
  * Marek Lindner
  *
@@ -16,18 +15,16 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA
- *
  */
 
-
 #ifndef _NET_BATMAN_ADV_DEBUGFS_H_
 #define _NET_BATMAN_ADV_DEBUGFS_H_
 
-#define DEBUGFS_BAT_SUBDIR "batman_adv"
+#define BATADV_DEBUGFS_SUBDIR "batman_adv"
 
-void debugfs_init(void);
-void debugfs_destroy(void);
-int debugfs_add_meshif(struct net_device *dev);
-void debugfs_del_meshif(struct net_device *dev);
+void batadv_debugfs_init(void);
+void batadv_debugfs_destroy(void);
+int batadv_debugfs_add_meshif(struct net_device *dev);
+void batadv_debugfs_del_meshif(struct net_device *dev);
 
 #endif /* _NET_BATMAN_ADV_DEBUGFS_H_ */
diff --git a/net/batman-adv/gateway_client.c b/net/batman-adv/gateway_client.c
index 47f7186dcef..b421cc49d2c 100644
--- a/net/batman-adv/gateway_client.c
+++ b/net/batman-adv/gateway_client.c
@@ -1,5 +1,4 @@
-/*
- * Copyright (C) 2009-2012 B.A.T.M.A.N. contributors:
+/* Copyright (C) 2009-2012 B.A.T.M.A.N. contributors:
  *
  * Marek Lindner
  *
@@ -16,11 +15,10 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA
- *
  */
 
 #include "main.h"
-#include "bat_sysfs.h"
+#include "sysfs.h"
 #include "gateway_client.h"
 #include "gateway_common.h"
 #include "hard-interface.h"
@@ -33,19 +31,21 @@
 #include <linux/if_vlan.h>
 
 /* This is the offset of the options field in a dhcp packet starting at
- * the beginning of the dhcp header */
-#define DHCP_OPTIONS_OFFSET 240
-#define DHCP_REQUEST 3
+ * the beginning of the dhcp header
+ */
+#define BATADV_DHCP_OPTIONS_OFFSET 240
+#define BATADV_DHCP_REQUEST 3
 
-static void gw_node_free_ref(struct gw_node *gw_node)
+static void batadv_gw_node_free_ref(struct batadv_gw_node *gw_node)
 {
         if (atomic_dec_and_test(&gw_node->refcount))
                 kfree_rcu(gw_node, rcu);
 }
 
-static struct gw_node *gw_get_selected_gw_node(struct bat_priv *bat_priv)
+static struct batadv_gw_node *
+batadv_gw_get_selected_gw_node(struct batadv_priv *bat_priv)
 {
-        struct gw_node *gw_node;
+        struct batadv_gw_node *gw_node;
 
         rcu_read_lock();
         gw_node = rcu_dereference(bat_priv->curr_gw);
@@ -60,12 +60,13 @@ out:
         return gw_node;
 }
 
-struct orig_node *gw_get_selected_orig(struct bat_priv *bat_priv)
+struct batadv_orig_node *
+batadv_gw_get_selected_orig(struct batadv_priv *bat_priv)
 {
-        struct gw_node *gw_node;
-        struct orig_node *orig_node = NULL;
+        struct batadv_gw_node *gw_node;
+        struct batadv_orig_node *orig_node = NULL;
 
-        gw_node = gw_get_selected_gw_node(bat_priv);
+        gw_node = batadv_gw_get_selected_gw_node(bat_priv);
         if (!gw_node)
                 goto out;
 
@@ -81,13 +82,14 @@ unlock:
         rcu_read_unlock();
 out:
         if (gw_node)
-                gw_node_free_ref(gw_node);
+                batadv_gw_node_free_ref(gw_node);
         return orig_node;
 }
 
-static void gw_select(struct bat_priv *bat_priv, struct gw_node *new_gw_node)
+static void batadv_gw_select(struct batadv_priv *bat_priv,
+                             struct batadv_gw_node *new_gw_node)
 {
-        struct gw_node *curr_gw_node;
+        struct batadv_gw_node *curr_gw_node;
 
         spin_lock_bh(&bat_priv->gw_list_lock);
 
@@ -98,31 +100,34 @@ static void gw_select(struct bat_priv *bat_priv, struct gw_node *new_gw_node)
         rcu_assign_pointer(bat_priv->curr_gw, new_gw_node);
 
         if (curr_gw_node)
-                gw_node_free_ref(curr_gw_node);
+                batadv_gw_node_free_ref(curr_gw_node);
 
         spin_unlock_bh(&bat_priv->gw_list_lock);
 }
 
-void gw_deselect(struct bat_priv *bat_priv)
+void batadv_gw_deselect(struct batadv_priv *bat_priv)
 {
         atomic_set(&bat_priv->gw_reselect, 1);
 }
 
-static struct gw_node *gw_get_best_gw_node(struct bat_priv *bat_priv)
+static struct batadv_gw_node *
+batadv_gw_get_best_gw_node(struct batadv_priv *bat_priv)
 {
-        struct neigh_node *router;
+        struct batadv_neigh_node *router;
         struct hlist_node *node;
-        struct gw_node *gw_node, *curr_gw = NULL;
+        struct batadv_gw_node *gw_node, *curr_gw = NULL;
         uint32_t max_gw_factor = 0, tmp_gw_factor = 0;
         uint8_t max_tq = 0;
         int down, up;
+        struct batadv_orig_node *orig_node;
 
         rcu_read_lock();
         hlist_for_each_entry_rcu(gw_node, node, &bat_priv->gw_list, list) {
                 if (gw_node->deleted)
                         continue;
 
-                router = orig_node_get_router(gw_node->orig_node);
+                orig_node = gw_node->orig_node;
+                router = batadv_orig_node_get_router(orig_node);
                 if (!router)
                         continue;
 
@@ -131,35 +136,34 @@ static struct gw_node *gw_get_best_gw_node(struct bat_priv *bat_priv)
 
                 switch (atomic_read(&bat_priv->gw_sel_class)) {
                 case 1: /* fast connection */
-                        gw_bandwidth_to_kbit(gw_node->orig_node->gw_flags,
-                                             &down, &up);
+                        batadv_gw_bandwidth_to_kbit(orig_node->gw_flags,
+                                                    &down, &up);
 
                         tmp_gw_factor = (router->tq_avg * router->tq_avg *
                                          down * 100 * 100) /
-                                         (TQ_LOCAL_WINDOW_SIZE *
-                                         TQ_LOCAL_WINDOW_SIZE * 64);
+                                         (BATADV_TQ_LOCAL_WINDOW_SIZE *
+                                          BATADV_TQ_LOCAL_WINDOW_SIZE * 64);
 
                         if ((tmp_gw_factor > max_gw_factor) ||
                             ((tmp_gw_factor == max_gw_factor) &&
                              (router->tq_avg > max_tq))) {
                                 if (curr_gw)
-                                        gw_node_free_ref(curr_gw);
+                                        batadv_gw_node_free_ref(curr_gw);
                                 curr_gw = gw_node;
                                 atomic_inc(&curr_gw->refcount);
                         }
                         break;
 
-                default: /**
-                          * 2:  stable connection (use best statistic)
+                default: /* 2:  stable connection (use best statistic)
                           * 3:  fast-switch (use best statistic but change as
                           *     soon as a better gateway appears)
                           * XX: late-switch (use best statistic but change as
                           *     soon as a better gateway appears which has
                           *     $routing_class more tq points)
-                          **/
+                          */
                         if (router->tq_avg > max_tq) {
                                 if (curr_gw)
-                                        gw_node_free_ref(curr_gw);
+                                        batadv_gw_node_free_ref(curr_gw);
                                 curr_gw = gw_node;
                                 atomic_inc(&curr_gw->refcount);
                         }
@@ -172,37 +176,36 @@ static struct gw_node *gw_get_best_gw_node(struct bat_priv *bat_priv)
                 if (tmp_gw_factor > max_gw_factor)
                         max_gw_factor = tmp_gw_factor;
 
-                gw_node_free_ref(gw_node);
+                batadv_gw_node_free_ref(gw_node);
 
 next:
-                neigh_node_free_ref(router);
+                batadv_neigh_node_free_ref(router);
         }
         rcu_read_unlock();
 
         return curr_gw;
 }
 
-void gw_election(struct bat_priv *bat_priv)
+void batadv_gw_election(struct batadv_priv *bat_priv)
 {
-        struct gw_node *curr_gw = NULL, *next_gw = NULL;
-        struct neigh_node *router = NULL;
+        struct batadv_gw_node *curr_gw = NULL, *next_gw = NULL;
+        struct batadv_neigh_node *router = NULL;
         char gw_addr[18] = { '\0' };
 
-        /**
-         * The batman daemon checks here if we already passed a full originator
+        /* The batman daemon checks here if we already passed a full originator
          * cycle in order to make sure we don't choose the first gateway we
          * hear about. This check is based on the daemon's uptime which we
          * don't have.
-         **/
-        if (atomic_read(&bat_priv->gw_mode) != GW_MODE_CLIENT)
+         */
+        if (atomic_read(&bat_priv->gw_mode) != BATADV_GW_MODE_CLIENT)
                 goto out;
 
-        if (!atomic_dec_not_zero(&bat_priv->gw_reselect))
+        if (!batadv_atomic_dec_not_zero(&bat_priv->gw_reselect))
                 goto out;
 
-        curr_gw = gw_get_selected_gw_node(bat_priv);
+        curr_gw = batadv_gw_get_selected_gw_node(bat_priv);
 
-        next_gw = gw_get_best_gw_node(bat_priv);
+        next_gw = batadv_gw_get_best_gw_node(bat_priv);
 
         if (curr_gw == next_gw)
                 goto out;
@@ -210,53 +213,57 @@ void gw_election(struct bat_priv *bat_priv)
         if (next_gw) {
                 sprintf(gw_addr, "%pM", next_gw->orig_node->orig);
 
-                router = orig_node_get_router(next_gw->orig_node);
+                router = batadv_orig_node_get_router(next_gw->orig_node);
                 if (!router) {
-                        gw_deselect(bat_priv);
+                        batadv_gw_deselect(bat_priv);
                         goto out;
                 }
         }
 
         if ((curr_gw) && (!next_gw)) {
-                bat_dbg(DBG_BATMAN, bat_priv,
-                        "Removing selected gateway - no gateway in range\n");
-                throw_uevent(bat_priv, UEV_GW, UEV_DEL, NULL);
+                batadv_dbg(BATADV_DBG_BATMAN, bat_priv,
+                           "Removing selected gateway - no gateway in range\n");
+                batadv_throw_uevent(bat_priv, BATADV_UEV_GW, BATADV_UEV_DEL,
+                                    NULL);
         } else if ((!curr_gw) && (next_gw)) {
-                bat_dbg(DBG_BATMAN, bat_priv,
-                        "Adding route to gateway %pM (gw_flags: %i, tq: %i)\n",
-                        next_gw->orig_node->orig, next_gw->orig_node->gw_flags,
-                        router->tq_avg);
-                throw_uevent(bat_priv, UEV_GW, UEV_ADD, gw_addr);
+                batadv_dbg(BATADV_DBG_BATMAN, bat_priv,
+                           "Adding route to gateway %pM (gw_flags: %i, tq: %i)\n",
+                           next_gw->orig_node->orig,
+                           next_gw->orig_node->gw_flags, router->tq_avg);
+                batadv_throw_uevent(bat_priv, BATADV_UEV_GW, BATADV_UEV_ADD,
+                                    gw_addr);
         } else {
-                bat_dbg(DBG_BATMAN, bat_priv,
-                        "Changing route to gateway %pM (gw_flags: %i, tq: %i)\n",
-                        next_gw->orig_node->orig, next_gw->orig_node->gw_flags,
-                        router->tq_avg);
-                throw_uevent(bat_priv, UEV_GW, UEV_CHANGE, gw_addr);
+                batadv_dbg(BATADV_DBG_BATMAN, bat_priv,
+                           "Changing route to gateway %pM (gw_flags: %i, tq: %i)\n",
+                           next_gw->orig_node->orig,
+                           next_gw->orig_node->gw_flags, router->tq_avg);
+                batadv_throw_uevent(bat_priv, BATADV_UEV_GW, BATADV_UEV_CHANGE,
+                                    gw_addr);
         }
 
-        gw_select(bat_priv, next_gw);
+        batadv_gw_select(bat_priv, next_gw);
 
 out:
         if (curr_gw)
-                gw_node_free_ref(curr_gw);
+                batadv_gw_node_free_ref(curr_gw);
         if (next_gw)
-                gw_node_free_ref(next_gw);
+                batadv_gw_node_free_ref(next_gw);
         if (router)
-                neigh_node_free_ref(router);
+                batadv_neigh_node_free_ref(router);
 }
 
-void gw_check_election(struct bat_priv *bat_priv, struct orig_node *orig_node)
+void batadv_gw_check_election(struct batadv_priv *bat_priv,
+                              struct batadv_orig_node *orig_node)
 {
-        struct orig_node *curr_gw_orig;
-        struct neigh_node *router_gw = NULL, *router_orig = NULL;
+        struct batadv_orig_node *curr_gw_orig;
+        struct batadv_neigh_node *router_gw = NULL, *router_orig = NULL;
         uint8_t gw_tq_avg, orig_tq_avg;
 
-        curr_gw_orig = gw_get_selected_orig(bat_priv);
+        curr_gw_orig = batadv_gw_get_selected_orig(bat_priv);
         if (!curr_gw_orig)
                 goto deselect;
 
-        router_gw = orig_node_get_router(curr_gw_orig);
+        router_gw = batadv_orig_node_get_router(curr_gw_orig);
         if (!router_gw)
                 goto deselect;
 
@@ -264,7 +271,7 @@ void gw_check_election(struct bat_priv *bat_priv, struct orig_node *orig_node)
         if (curr_gw_orig == orig_node)
                 goto out;
 
-        router_orig = orig_node_get_router(orig_node);
+        router_orig = batadv_orig_node_get_router(orig_node);
         if (!router_orig)
                 goto out;
 
@@ -275,35 +282,35 @@ void gw_check_election(struct bat_priv *bat_priv, struct orig_node *orig_node)
         if (orig_tq_avg < gw_tq_avg)
                 goto out;
 
-        /**
-         * if the routing class is greater than 3 the value tells us how much
+        /* if the routing class is greater than 3 the value tells us how much
          * greater the TQ value of the new gateway must be
-         **/
+         */
         if ((atomic_read(&bat_priv->gw_sel_class) > 3) &&
             (orig_tq_avg - gw_tq_avg < atomic_read(&bat_priv->gw_sel_class)))
                 goto out;
 
-        bat_dbg(DBG_BATMAN, bat_priv,
-                "Restarting gateway selection: better gateway found (tq curr: %i, tq new: %i)\n",
-                gw_tq_avg, orig_tq_avg);
+        batadv_dbg(BATADV_DBG_BATMAN, bat_priv,
+                   "Restarting gateway selection: better gateway found (tq curr: %i, tq new: %i)\n",
+                   gw_tq_avg, orig_tq_avg);
 
 deselect:
-        gw_deselect(bat_priv);
+        batadv_gw_deselect(bat_priv);
 out:
         if (curr_gw_orig)
-                orig_node_free_ref(curr_gw_orig);
+                batadv_orig_node_free_ref(curr_gw_orig);
         if (router_gw)
-                neigh_node_free_ref(router_gw);
+                batadv_neigh_node_free_ref(router_gw);
         if (router_orig)
-                neigh_node_free_ref(router_orig);
+                batadv_neigh_node_free_ref(router_orig);
 
         return;
 }
 
-static void gw_node_add(struct bat_priv *bat_priv,
-                        struct orig_node *orig_node, uint8_t new_gwflags)
+static void batadv_gw_node_add(struct batadv_priv *bat_priv,
+                               struct batadv_orig_node *orig_node,
+                               uint8_t new_gwflags)
 {
-        struct gw_node *gw_node;
+        struct batadv_gw_node *gw_node;
         int down, up;
 
         gw_node = kzalloc(sizeof(*gw_node), GFP_ATOMIC);
@@ -318,47 +325,47 @@ static void gw_node_add(struct bat_priv *bat_priv,
         hlist_add_head_rcu(&gw_node->list, &bat_priv->gw_list);
         spin_unlock_bh(&bat_priv->gw_list_lock);
 
-        gw_bandwidth_to_kbit(new_gwflags, &down, &up);
-        bat_dbg(DBG_BATMAN, bat_priv,
-                "Found new gateway %pM -> gw_class: %i - %i%s/%i%s\n",
-                orig_node->orig, new_gwflags,
-                (down > 2048 ? down / 1024 : down),
-                (down > 2048 ? "MBit" : "KBit"),
-                (up > 2048 ? up / 1024 : up),
-                (up > 2048 ? "MBit" : "KBit"));
+        batadv_gw_bandwidth_to_kbit(new_gwflags, &down, &up);
+        batadv_dbg(BATADV_DBG_BATMAN, bat_priv,
+                   "Found new gateway %pM -> gw_class: %i - %i%s/%i%s\n",
+                   orig_node->orig, new_gwflags,
+                   (down > 2048 ? down / 1024 : down),
+                   (down > 2048 ? "MBit" : "KBit"),
+                   (up > 2048 ? up / 1024 : up),
+                   (up > 2048 ? "MBit" : "KBit"));
 }
 
-void gw_node_update(struct bat_priv *bat_priv,
-                    struct orig_node *orig_node, uint8_t new_gwflags)
+void batadv_gw_node_update(struct batadv_priv *bat_priv,
+                           struct batadv_orig_node *orig_node,
+                           uint8_t new_gwflags)
 {
         struct hlist_node *node;
-        struct gw_node *gw_node, *curr_gw;
+        struct batadv_gw_node *gw_node, *curr_gw;
 
-        /**
-         * Note: We don't need a NULL check here, since curr_gw never gets
+        /* Note: We don't need a NULL check here, since curr_gw never gets
          * dereferenced. If curr_gw is NULL we also should not exit as we may
          * have this gateway in our list (duplication check!) even though we
          * have no currently selected gateway.
          */
-        curr_gw = gw_get_selected_gw_node(bat_priv);
+        curr_gw = batadv_gw_get_selected_gw_node(bat_priv);
 
         rcu_read_lock();
         hlist_for_each_entry_rcu(gw_node, node, &bat_priv->gw_list, list) {
                 if (gw_node->orig_node != orig_node)
                         continue;
 
-                bat_dbg(DBG_BATMAN, bat_priv,
-                        "Gateway class of originator %pM changed from %i to %i\n",
-                        orig_node->orig, gw_node->orig_node->gw_flags,
-                        new_gwflags);
+                batadv_dbg(BATADV_DBG_BATMAN, bat_priv,
+                           "Gateway class of originator %pM changed from %i to %i\n",
+                           orig_node->orig, gw_node->orig_node->gw_flags,
+                           new_gwflags);
 
                 gw_node->deleted = 0;
 
-                if (new_gwflags == NO_FLAGS) {
+                if (new_gwflags == BATADV_NO_FLAGS) {
                         gw_node->deleted = jiffies;
-                        bat_dbg(DBG_BATMAN, bat_priv,
-                                "Gateway %pM removed from gateway list\n",
-                                orig_node->orig);
+                        batadv_dbg(BATADV_DBG_BATMAN, bat_priv,
+                                   "Gateway %pM removed from gateway list\n",
+                                   orig_node->orig);
 
                         if (gw_node == curr_gw)
                                 goto deselect;
@@ -367,34 +374,35 @@ void gw_node_update(struct bat_priv *bat_priv,
                 goto unlock;
         }
 
-        if (new_gwflags == NO_FLAGS)
+        if (new_gwflags == BATADV_NO_FLAGS)
                 goto unlock;
 
-        gw_node_add(bat_priv, orig_node, new_gwflags);
+        batadv_gw_node_add(bat_priv, orig_node, new_gwflags);
         goto unlock;
 
 deselect:
-        gw_deselect(bat_priv);
+        batadv_gw_deselect(bat_priv);
 unlock:
         rcu_read_unlock();
 
         if (curr_gw)
-                gw_node_free_ref(curr_gw);
+                batadv_gw_node_free_ref(curr_gw);
 }
 
-void gw_node_delete(struct bat_priv *bat_priv, struct orig_node *orig_node)
+void batadv_gw_node_delete(struct batadv_priv *bat_priv,
+                           struct batadv_orig_node *orig_node)
 {
-        gw_node_update(bat_priv, orig_node, 0);
+        batadv_gw_node_update(bat_priv, orig_node, 0);
 }
 
-void gw_node_purge(struct bat_priv *bat_priv)
+void batadv_gw_node_purge(struct batadv_priv *bat_priv)
 {
-        struct gw_node *gw_node, *curr_gw;
+        struct batadv_gw_node *gw_node, *curr_gw;
         struct hlist_node *node, *node_tmp;
-        unsigned long timeout = msecs_to_jiffies(2 * PURGE_TIMEOUT);
+        unsigned long timeout = msecs_to_jiffies(2 * BATADV_PURGE_TIMEOUT);
         int do_deselect = 0;
 
-        curr_gw = gw_get_selected_gw_node(bat_priv);
+        curr_gw = batadv_gw_get_selected_gw_node(bat_priv);
 
         spin_lock_bh(&bat_priv->gw_list_lock);
 
@@ -402,43 +410,42 @@ void gw_node_purge(struct bat_priv *bat_priv)
                                   &bat_priv->gw_list, list) {
                 if (((!gw_node->deleted) ||
                      (time_before(jiffies, gw_node->deleted + timeout))) &&
-                    atomic_read(&bat_priv->mesh_state) == MESH_ACTIVE)
+                    atomic_read(&bat_priv->mesh_state) == BATADV_MESH_ACTIVE)
                         continue;
 
                 if (curr_gw == gw_node)
                         do_deselect = 1;
 
                 hlist_del_rcu(&gw_node->list);
-                gw_node_free_ref(gw_node);
+                batadv_gw_node_free_ref(gw_node);
         }
 
         spin_unlock_bh(&bat_priv->gw_list_lock);
 
         /* gw_deselect() needs to acquire the gw_list_lock */
         if (do_deselect)
-                gw_deselect(bat_priv);
+                batadv_gw_deselect(bat_priv);
 
         if (curr_gw)
-                gw_node_free_ref(curr_gw);
+                batadv_gw_node_free_ref(curr_gw);
 }
 
-/**
- * fails if orig_node has no router
- */
-static int _write_buffer_text(struct bat_priv *bat_priv, struct seq_file *seq,
-                              const struct gw_node *gw_node)
+/* fails if orig_node has no router */
+static int batadv_write_buffer_text(struct batadv_priv *bat_priv,
+                                    struct seq_file *seq,
+                                    const struct batadv_gw_node *gw_node)
 {
-        struct gw_node *curr_gw;
-        struct neigh_node *router;
+        struct batadv_gw_node *curr_gw;
+        struct batadv_neigh_node *router;
         int down, up, ret = -1;
 
-        gw_bandwidth_to_kbit(gw_node->orig_node->gw_flags, &down, &up);
+        batadv_gw_bandwidth_to_kbit(gw_node->orig_node->gw_flags, &down, &up);
 
-        router = orig_node_get_router(gw_node->orig_node);
+        router = batadv_orig_node_get_router(gw_node->orig_node);
         if (!router)
                 goto out;
 
-        curr_gw = gw_get_selected_gw_node(bat_priv);
+        curr_gw = batadv_gw_get_selected_gw_node(bat_priv);
 
         ret = seq_printf(seq, "%s %pM (%3i) %pM [%10s]: %3i - %i%s/%i%s\n",
                          (curr_gw == gw_node ? "=>" : "  "),
@@ -451,23 +458,23 @@ static int _write_buffer_text(struct bat_priv *bat_priv, struct seq_file *seq,
                          (up > 2048 ? up / 1024 : up),
                          (up > 2048 ? "MBit" : "KBit"));
 
-        neigh_node_free_ref(router);
+        batadv_neigh_node_free_ref(router);
         if (curr_gw)
-                gw_node_free_ref(curr_gw);
+                batadv_gw_node_free_ref(curr_gw);
 out:
         return ret;
 }
 
-int gw_client_seq_print_text(struct seq_file *seq, void *offset)
+int batadv_gw_client_seq_print_text(struct seq_file *seq, void *offset)
 {
         struct net_device *net_dev = (struct net_device *)seq->private;
-        struct bat_priv *bat_priv = netdev_priv(net_dev);
-        struct hard_iface *primary_if;
-        struct gw_node *gw_node;
+        struct batadv_priv *bat_priv = netdev_priv(net_dev);
+        struct batadv_hard_iface *primary_if;
+        struct batadv_gw_node *gw_node;
         struct hlist_node *node;
         int gw_count = 0, ret = 0;
 
-        primary_if = primary_if_get_selected(bat_priv);
+        primary_if = batadv_primary_if_get_selected(bat_priv);
         if (!primary_if) {
                 ret = seq_printf(seq,
                                  "BATMAN mesh %s disabled - please specify interfaces to enable it\n",
@@ -475,7 +482,7 @@ int gw_client_seq_print_text(struct seq_file *seq, void *offset)
                 goto out;
         }
 
-        if (primary_if->if_status != IF_ACTIVE) {
+        if (primary_if->if_status != BATADV_IF_ACTIVE) {
                 ret = seq_printf(seq,
                                  "BATMAN mesh %s disabled - primary interface not active\n",
                                  net_dev->name);
@@ -484,8 +491,8 @@ int gw_client_seq_print_text(struct seq_file *seq, void *offset)
 
         seq_printf(seq,
                    "      %-12s (%s/%i) %17s [%10s]: gw_class ... [B.A.T.M.A.N. adv %s, MainIF/MAC: %s/%pM (%s)]\n",
-                   "Gateway", "#", TQ_MAX_VALUE, "Nexthop", "outgoingIF",
-                   SOURCE_VERSION, primary_if->net_dev->name,
+                   "Gateway", "#", BATADV_TQ_MAX_VALUE, "Nexthop", "outgoingIF",
+                   BATADV_SOURCE_VERSION, primary_if->net_dev->name,
                    primary_if->net_dev->dev_addr, net_dev->name);
 
         rcu_read_lock();
@@ -494,7 +501,7 @@ int gw_client_seq_print_text(struct seq_file *seq, void *offset)
                         continue;
 
                 /* fails if orig_node has no router */
-                if (_write_buffer_text(bat_priv, seq, gw_node) < 0)
+                if (batadv_write_buffer_text(bat_priv, seq, gw_node) < 0)
                         continue;
 
                 gw_count++;
@@ -506,11 +513,11 @@ int gw_client_seq_print_text(struct seq_file *seq, void *offset)
 
 out:
         if (primary_if)
-                hardif_free_ref(primary_if);
+                batadv_hardif_free_ref(primary_if);
         return ret;
 }
 
-static bool is_type_dhcprequest(struct sk_buff *skb, int header_len)
+static bool batadv_is_type_dhcprequest(struct sk_buff *skb, int header_len)
 {
         int ret = false;
         unsigned char *p;
@@ -521,27 +528,29 @@ static bool is_type_dhcprequest(struct sk_buff *skb, int header_len)
 
         pkt_len = skb_headlen(skb);
 
-        if (pkt_len < header_len + DHCP_OPTIONS_OFFSET + 1)
+        if (pkt_len < header_len + BATADV_DHCP_OPTIONS_OFFSET + 1)
                 goto out;
 
-        p = skb->data + header_len + DHCP_OPTIONS_OFFSET;
-        pkt_len -= header_len + DHCP_OPTIONS_OFFSET + 1;
+        p = skb->data + header_len + BATADV_DHCP_OPTIONS_OFFSET;
+        pkt_len -= header_len + BATADV_DHCP_OPTIONS_OFFSET + 1;
 
         /* Access the dhcp option lists. Each entry is made up by:
          * - octet 1: option type
          * - octet 2: option data len (only if type != 255 and 0)
-         * - octet 3: option data */
+         * - octet 3: option data
+         */
         while (*p != 255 && !ret) {
                 /* p now points to the first octet: option type */
                 if (*p == 53) {
                         /* type 53 is the message type option.
-                         * Jump the len octet and go to the data octet */
+                         * Jump the len octet and go to the data octet
+                         */
                         if (pkt_len < 2)
                                 goto out;
                         p += 2;
 
                         /* check if the message type is what we need */
-                        if (*p == DHCP_REQUEST)
+                        if (*p == BATADV_DHCP_REQUEST)
                                 ret = true;
                         break;
                 } else if (*p == 0) {
@@ -568,7 +577,7 @@ out:
         return ret;
 }
 
-bool gw_is_dhcp_target(struct sk_buff *skb, unsigned int *header_len)
+bool batadv_gw_is_dhcp_target(struct sk_buff *skb, unsigned int *header_len)
 {
         struct ethhdr *ethhdr;
         struct iphdr *iphdr;
@@ -634,40 +643,41 @@ bool gw_is_dhcp_target(struct sk_buff *skb, unsigned int *header_len)
         return true;
 }
 
-bool gw_out_of_range(struct bat_priv *bat_priv,
-                     struct sk_buff *skb, struct ethhdr *ethhdr)
+bool batadv_gw_out_of_range(struct batadv_priv *bat_priv,
+                            struct sk_buff *skb, struct ethhdr *ethhdr)
 {
-        struct neigh_node *neigh_curr = NULL, *neigh_old = NULL;
-        struct orig_node *orig_dst_node = NULL;
-        struct gw_node *curr_gw = NULL;
+        struct batadv_neigh_node *neigh_curr = NULL, *neigh_old = NULL;
+        struct batadv_orig_node *orig_dst_node = NULL;
+        struct batadv_gw_node *curr_gw = NULL;
         bool ret, out_of_range = false;
         unsigned int header_len = 0;
         uint8_t curr_tq_avg;
 
-        ret = gw_is_dhcp_target(skb, &header_len);
+        ret = batadv_gw_is_dhcp_target(skb, &header_len);
         if (!ret)
                 goto out;
 
-        orig_dst_node = transtable_search(bat_priv, ethhdr->h_source,
-                                          ethhdr->h_dest);
+        orig_dst_node = batadv_transtable_search(bat_priv, ethhdr->h_source,
+                                                 ethhdr->h_dest);
         if (!orig_dst_node)
                 goto out;
 
         if (!orig_dst_node->gw_flags)
                 goto out;
 
-        ret = is_type_dhcprequest(skb, header_len);
+        ret = batadv_is_type_dhcprequest(skb, header_len);
         if (!ret)
                 goto out;
 
         switch (atomic_read(&bat_priv->gw_mode)) {
-        case GW_MODE_SERVER:
+        case BATADV_GW_MODE_SERVER:
                 /* If we are a GW then we are our best GW. We can artificially
-                 * set the tq towards ourself as the maximum value */
-                curr_tq_avg = TQ_MAX_VALUE;
+                 * set the tq towards ourself as the maximum value
+                 */
+                curr_tq_avg = BATADV_TQ_MAX_VALUE;
                 break;
-        case GW_MODE_CLIENT:
-                curr_gw = gw_get_selected_gw_node(bat_priv);
+        case BATADV_GW_MODE_CLIENT:
+                curr_gw = batadv_gw_get_selected_gw_node(bat_priv);
                 if (!curr_gw)
                         goto out;
 
@@ -677,33 +687,35 @@ bool gw_out_of_range(struct bat_priv *bat_priv,
 
                 /* If the dhcp packet has been sent to a different gw,
                  * we have to evaluate whether the old gw is still
-                 * reliable enough */
-                neigh_curr = find_router(bat_priv, curr_gw->orig_node, NULL);
+                 * reliable enough
+                 */
+                neigh_curr = batadv_find_router(bat_priv, curr_gw->orig_node,
+                                                NULL);
                 if (!neigh_curr)
                         goto out;
 
                 curr_tq_avg = neigh_curr->tq_avg;
                 break;
-        case GW_MODE_OFF:
+        case BATADV_GW_MODE_OFF:
         default:
                 goto out;
         }
 
-        neigh_old = find_router(bat_priv, orig_dst_node, NULL);
+        neigh_old = batadv_find_router(bat_priv, orig_dst_node, NULL);
         if (!neigh_old)
                 goto out;
 
-        if (curr_tq_avg - neigh_old->tq_avg > GW_THRESHOLD)
+        if (curr_tq_avg - neigh_old->tq_avg > BATADV_GW_THRESHOLD)
                 out_of_range = true;
 
 out:
         if (orig_dst_node)
-                orig_node_free_ref(orig_dst_node);
+                batadv_orig_node_free_ref(orig_dst_node);
         if (curr_gw)
-                gw_node_free_ref(curr_gw);
+                batadv_gw_node_free_ref(curr_gw);
         if (neigh_old)
-                neigh_node_free_ref(neigh_old);
+                batadv_neigh_node_free_ref(neigh_old);
         if (neigh_curr)
-                neigh_node_free_ref(neigh_curr);
+                batadv_neigh_node_free_ref(neigh_curr);
         return out_of_range;
 }
diff --git a/net/batman-adv/gateway_client.h b/net/batman-adv/gateway_client.h
index bf56a5aea10..f0d129e323c 100644
--- a/net/batman-adv/gateway_client.h
+++ b/net/batman-adv/gateway_client.h
@@ -1,5 +1,4 @@
-/*
- * Copyright (C) 2009-2012 B.A.T.M.A.N. contributors:
+/* Copyright (C) 2009-2012 B.A.T.M.A.N. contributors:
  *
  * Marek Lindner
  *
@@ -16,23 +15,26 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA
- *
  */
 
 #ifndef _NET_BATMAN_ADV_GATEWAY_CLIENT_H_
 #define _NET_BATMAN_ADV_GATEWAY_CLIENT_H_
 
-void gw_deselect(struct bat_priv *bat_priv);
-void gw_election(struct bat_priv *bat_priv);
-struct orig_node *gw_get_selected_orig(struct bat_priv *bat_priv);
-void gw_check_election(struct bat_priv *bat_priv, struct orig_node *orig_node);
-void gw_node_update(struct bat_priv *bat_priv,
-                    struct orig_node *orig_node, uint8_t new_gwflags);
-void gw_node_delete(struct bat_priv *bat_priv, struct orig_node *orig_node);
-void gw_node_purge(struct bat_priv *bat_priv);
-int gw_client_seq_print_text(struct seq_file *seq, void *offset);
-bool gw_is_dhcp_target(struct sk_buff *skb, unsigned int *header_len);
-bool gw_out_of_range(struct bat_priv *bat_priv,
-                     struct sk_buff *skb, struct ethhdr *ethhdr);
+void batadv_gw_deselect(struct batadv_priv *bat_priv);
+void batadv_gw_election(struct batadv_priv *bat_priv);
+struct batadv_orig_node *
+batadv_gw_get_selected_orig(struct batadv_priv *bat_priv);
+void batadv_gw_check_election(struct batadv_priv *bat_priv,
+                              struct batadv_orig_node *orig_node);
+void batadv_gw_node_update(struct batadv_priv *bat_priv,
+                           struct batadv_orig_node *orig_node,
+                           uint8_t new_gwflags);
+void batadv_gw_node_delete(struct batadv_priv *bat_priv,
+                           struct batadv_orig_node *orig_node);
+void batadv_gw_node_purge(struct batadv_priv *bat_priv);
+int batadv_gw_client_seq_print_text(struct seq_file *seq, void *offset);
+bool batadv_gw_is_dhcp_target(struct sk_buff *skb, unsigned int *header_len);
+bool batadv_gw_out_of_range(struct batadv_priv *bat_priv,
+                            struct sk_buff *skb, struct ethhdr *ethhdr);
 
 #endif /* _NET_BATMAN_ADV_GATEWAY_CLIENT_H_ */
diff --git a/net/batman-adv/gateway_common.c b/net/batman-adv/gateway_common.c
index ca57ac7d73b..9001208d175 100644
--- a/net/batman-adv/gateway_common.c
+++ b/net/batman-adv/gateway_common.c
@@ -1,5 +1,4 @@
-/*
- * Copyright (C) 2009-2012 B.A.T.M.A.N. contributors:
+/* Copyright (C) 2009-2012 B.A.T.M.A.N. contributors:
  *
  * Marek Lindner
  *
@@ -16,7 +15,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA
- *
  */
 
 #include "main.h"
@@ -24,7 +22,7 @@
 #include "gateway_client.h"
 
 /* calculates the gateway class from kbit */
-static void kbit_to_gw_bandwidth(int down, int up, long *gw_srv_class)
+static void batadv_kbit_to_gw_bandwidth(int down, int up, long *gw_srv_class)
 {
         int mdown = 0, tdown, tup, difference;
         uint8_t sbit, part;
@@ -59,7 +57,7 @@ static void kbit_to_gw_bandwidth(int down, int up, long *gw_srv_class)
 }
 
 /* returns the up and downspeeds in kbit, calculated from the class */
-void gw_bandwidth_to_kbit(uint8_t gw_srv_class, int *down, int *up)
+void batadv_gw_bandwidth_to_kbit(uint8_t gw_srv_class, int *down, int *up)
 {
         int sbit = (gw_srv_class & 0x80) >> 7;
         int dpart = (gw_srv_class & 0x78) >> 3;
@@ -75,8 +73,8 @@ void gw_bandwidth_to_kbit(uint8_t gw_srv_class, int *down, int *up)
         *up = ((upart + 1) * (*down)) / 8;
 }
 
-static bool parse_gw_bandwidth(struct net_device *net_dev, char *buff,
-                               int *up, int *down)
+static bool batadv_parse_gw_bandwidth(struct net_device *net_dev, char *buff,
+                                      int *up, int *down)
 {
         int ret, multi = 1;
         char *slash_ptr, *tmp_ptr;
@@ -99,9 +97,9 @@ static bool parse_gw_bandwidth(struct net_device *net_dev, char *buff,
 
         ret = kstrtol(buff, 10, &ldown);
         if (ret) {
-                bat_err(net_dev,
-                        "Download speed of gateway mode invalid: %s\n",
-                        buff);
+                batadv_err(net_dev,
+                           "Download speed of gateway mode invalid: %s\n",
+                           buff);
                 return false;
         }
 
@@ -124,9 +122,9 @@ static bool parse_gw_bandwidth(struct net_device *net_dev, char *buff,
 
                 ret = kstrtol(slash_ptr + 1, 10, &lup);
                 if (ret) {
-                        bat_err(net_dev,
-                                "Upload speed of gateway mode invalid: %s\n",
-                                slash_ptr + 1);
+                        batadv_err(net_dev,
+                                   "Upload speed of gateway mode invalid: %s\n",
+                                   slash_ptr + 1);
                         return false;
                 }
 
@@ -136,14 +134,15 @@ static bool parse_gw_bandwidth(struct net_device *net_dev, char *buff,
         return true;
 }
 
-ssize_t gw_bandwidth_set(struct net_device *net_dev, char *buff, size_t count)
+ssize_t batadv_gw_bandwidth_set(struct net_device *net_dev, char *buff,
+                                size_t count)
 {
-        struct bat_priv *bat_priv = netdev_priv(net_dev);
+        struct batadv_priv *bat_priv = netdev_priv(net_dev);
         long gw_bandwidth_tmp = 0;
         int up = 0, down = 0;
         bool ret;
 
-        ret = parse_gw_bandwidth(net_dev, buff, &up, &down);
+        ret = batadv_parse_gw_bandwidth(net_dev, buff, &up, &down);
         if (!ret)
                 goto end;
 
@@ -153,23 +152,25 @@ ssize_t gw_bandwidth_set(struct net_device *net_dev, char *buff, size_t count)
         if (!up)
                 up = down / 5;
 
-        kbit_to_gw_bandwidth(down, up, &gw_bandwidth_tmp);
+        batadv_kbit_to_gw_bandwidth(down, up, &gw_bandwidth_tmp);
 
-        /**
-         * the gw bandwidth we guessed above might not match the given
+        /* the gw bandwidth we guessed above might not match the given
          * speeds, hence we need to calculate it back to show the number
          * that is going to be propagated
-         **/
-        gw_bandwidth_to_kbit((uint8_t)gw_bandwidth_tmp, &down, &up);
-
-        gw_deselect(bat_priv);
-        bat_info(net_dev,
-                 "Changing gateway bandwidth from: '%i' to: '%ld' (propagating: %d%s/%d%s)\n",
-                 atomic_read(&bat_priv->gw_bandwidth), gw_bandwidth_tmp,
-                 (down > 2048 ? down / 1024 : down),
-                 (down > 2048 ? "MBit" : "KBit"),
-                 (up > 2048 ? up / 1024 : up),
-                 (up > 2048 ? "MBit" : "KBit"));
+         */
+        batadv_gw_bandwidth_to_kbit((uint8_t)gw_bandwidth_tmp, &down, &up);
+
+        if (atomic_read(&bat_priv->gw_bandwidth) == gw_bandwidth_tmp)
+                return count;
+
+        batadv_gw_deselect(bat_priv);
+        batadv_info(net_dev,
+                    "Changing gateway bandwidth from: '%i' to: '%ld' (propagating: %d%s/%d%s)\n",
+                    atomic_read(&bat_priv->gw_bandwidth), gw_bandwidth_tmp,
+                    (down > 2048 ? down / 1024 : down),
+                    (down > 2048 ? "MBit" : "KBit"),
+                    (up > 2048 ? up / 1024 : up),
+                    (up > 2048 ? "MBit" : "KBit"));
 
         atomic_set(&bat_priv->gw_bandwidth, gw_bandwidth_tmp);
 
diff --git a/net/batman-adv/gateway_common.h b/net/batman-adv/gateway_common.h
index b8fb11c4f92..13697f6e711 100644
--- a/net/batman-adv/gateway_common.h
+++ b/net/batman-adv/gateway_common.h
@@ -1,5 +1,4 @@
-/*
- * Copyright (C) 2009-2012 B.A.T.M.A.N. contributors:
+/* Copyright (C) 2009-2012 B.A.T.M.A.N. contributors:
  *
  * Marek Lindner
  *
@@ -16,23 +15,23 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA
- *
  */
 
 #ifndef _NET_BATMAN_ADV_GATEWAY_COMMON_H_
 #define _NET_BATMAN_ADV_GATEWAY_COMMON_H_
 
-enum gw_modes {
-        GW_MODE_OFF,
-        GW_MODE_CLIENT,
-        GW_MODE_SERVER,
+enum batadv_gw_modes {
+        BATADV_GW_MODE_OFF,
+        BATADV_GW_MODE_CLIENT,
+        BATADV_GW_MODE_SERVER,
 };
 
-#define GW_MODE_OFF_NAME        "off"
-#define GW_MODE_CLIENT_NAME     "client"
-#define GW_MODE_SERVER_NAME     "server"
+#define BATADV_GW_MODE_OFF_NAME "off"
+#define BATADV_GW_MODE_CLIENT_NAME      "client"
+#define BATADV_GW_MODE_SERVER_NAME      "server"
 
-void gw_bandwidth_to_kbit(uint8_t gw_class, int *down, int *up);
-ssize_t gw_bandwidth_set(struct net_device *net_dev, char *buff, size_t count);
+void batadv_gw_bandwidth_to_kbit(uint8_t gw_class, int *down, int *up);
+ssize_t batadv_gw_bandwidth_set(struct net_device *net_dev, char *buff,
+                                size_t count);
 
 #endif /* _NET_BATMAN_ADV_GATEWAY_COMMON_H_ */
diff --git a/net/batman-adv/hard-interface.c b/net/batman-adv/hard-interface.c
index dc334fa8984..282bf6e9353 100644
--- a/net/batman-adv/hard-interface.c
+++ b/net/batman-adv/hard-interface.c
@@ -1,5 +1,4 @@
-/*
- * Copyright (C) 2007-2012 B.A.T.M.A.N. contributors:
+/* Copyright (C) 2007-2012 B.A.T.M.A.N. contributors:
  *
  * Marek Lindner, Simon Wunderlich
  *
@@ -16,7 +15,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA
- *
  */
 
 #include "main.h"
@@ -25,28 +23,29 @@
 #include "send.h"
 #include "translation-table.h"
 #include "routing.h"
-#include "bat_sysfs.h"
+#include "sysfs.h"
 #include "originator.h"
 #include "hash.h"
 #include "bridge_loop_avoidance.h"
 
 #include <linux/if_arp.h>
 
-void hardif_free_rcu(struct rcu_head *rcu)
+void batadv_hardif_free_rcu(struct rcu_head *rcu)
 {
-        struct hard_iface *hard_iface;
+        struct batadv_hard_iface *hard_iface;
 
-        hard_iface = container_of(rcu, struct hard_iface, rcu);
+        hard_iface = container_of(rcu, struct batadv_hard_iface, rcu);
         dev_put(hard_iface->net_dev);
         kfree(hard_iface);
 }
 
-struct hard_iface *hardif_get_by_netdev(const struct net_device *net_dev)
+struct batadv_hard_iface *
+batadv_hardif_get_by_netdev(const struct net_device *net_dev)
 {
-        struct hard_iface *hard_iface;
+        struct batadv_hard_iface *hard_iface;
 
         rcu_read_lock();
-        list_for_each_entry_rcu(hard_iface, &hardif_list, list) {
+        list_for_each_entry_rcu(hard_iface, &batadv_hardif_list, list) {
                 if (hard_iface->net_dev == net_dev &&
                     atomic_inc_not_zero(&hard_iface->refcount))
                         goto out;
@@ -59,7 +58,7 @@ out:
         return hard_iface;
 }
 
-static int is_valid_iface(const struct net_device *net_dev)
+static int batadv_is_valid_iface(const struct net_device *net_dev)
 {
         if (net_dev->flags & IFF_LOOPBACK)
                 return 0;
@@ -71,26 +70,23 @@ static int is_valid_iface(const struct net_device *net_dev)
                 return 0;
 
         /* no batman over batman */
-        if (softif_is_valid(net_dev))
+        if (batadv_softif_is_valid(net_dev))
                 return 0;
 
-        /* Device is being bridged */
-        /* if (net_dev->priv_flags & IFF_BRIDGE_PORT)
-                return 0; */
-
         return 1;
 }
 
-static struct hard_iface *hardif_get_active(const struct net_device *soft_iface)
+static struct batadv_hard_iface *
+batadv_hardif_get_active(const struct net_device *soft_iface)
 {
-        struct hard_iface *hard_iface;
+        struct batadv_hard_iface *hard_iface;
 
         rcu_read_lock();
-        list_for_each_entry_rcu(hard_iface, &hardif_list, list) {
+        list_for_each_entry_rcu(hard_iface, &batadv_hardif_list, list) {
                 if (hard_iface->soft_iface != soft_iface)
                         continue;
 
-                if (hard_iface->if_status == IF_ACTIVE &&
+                if (hard_iface->if_status == BATADV_IF_ACTIVE &&
                     atomic_inc_not_zero(&hard_iface->refcount))
                         goto out;
         }
@@ -102,32 +98,32 @@ out:
         return hard_iface;
 }
 
-static void primary_if_update_addr(struct bat_priv *bat_priv,
-                                   struct hard_iface *oldif)
+static void batadv_primary_if_update_addr(struct batadv_priv *bat_priv,
+                                          struct batadv_hard_iface *oldif)
 {
-        struct vis_packet *vis_packet;
-        struct hard_iface *primary_if;
+        struct batadv_vis_packet *vis_packet;
+        struct batadv_hard_iface *primary_if;
 
-        primary_if = primary_if_get_selected(bat_priv);
+        primary_if = batadv_primary_if_get_selected(bat_priv);
         if (!primary_if)
                 goto out;
 
-        vis_packet = (struct vis_packet *)
+        vis_packet = (struct batadv_vis_packet *)
                                 bat_priv->my_vis_info->skb_packet->data;
         memcpy(vis_packet->vis_orig, primary_if->net_dev->dev_addr, ETH_ALEN);
         memcpy(vis_packet->sender_orig,
                primary_if->net_dev->dev_addr, ETH_ALEN);
 
-        bla_update_orig_address(bat_priv, primary_if, oldif);
+        batadv_bla_update_orig_address(bat_priv, primary_if, oldif);
 out:
         if (primary_if)
-                hardif_free_ref(primary_if);
+                batadv_hardif_free_ref(primary_if);
 }
 
-static void primary_if_select(struct bat_priv *bat_priv,
-                              struct hard_iface *new_hard_iface)
+static void batadv_primary_if_select(struct batadv_priv *bat_priv,
+                                     struct batadv_hard_iface *new_hard_iface)
 {
-        struct hard_iface *curr_hard_iface;
+        struct batadv_hard_iface *curr_hard_iface;
 
         ASSERT_RTNL();
 
@@ -141,14 +137,15 @@ static void primary_if_select(struct bat_priv *bat_priv,
                 goto out;
 
         bat_priv->bat_algo_ops->bat_primary_iface_set(new_hard_iface);
-        primary_if_update_addr(bat_priv, curr_hard_iface);
+        batadv_primary_if_update_addr(bat_priv, curr_hard_iface);
 
 out:
         if (curr_hard_iface)
-                hardif_free_ref(curr_hard_iface);
+                batadv_hardif_free_ref(curr_hard_iface);
 }
 
-static bool hardif_is_iface_up(const struct hard_iface *hard_iface)
+static bool
+batadv_hardif_is_iface_up(const struct batadv_hard_iface *hard_iface)
 {
         if (hard_iface->net_dev->flags & IFF_UP)
                 return true;
@@ -156,21 +153,21 @@ static bool hardif_is_iface_up(const struct hard_iface *hard_iface)
         return false;
 }
 
-static void check_known_mac_addr(const struct net_device *net_dev)
+static void batadv_check_known_mac_addr(const struct net_device *net_dev)
 {
-        const struct hard_iface *hard_iface;
+        const struct batadv_hard_iface *hard_iface;
 
         rcu_read_lock();
-        list_for_each_entry_rcu(hard_iface, &hardif_list, list) {
-                if ((hard_iface->if_status != IF_ACTIVE) &&
-                    (hard_iface->if_status != IF_TO_BE_ACTIVATED))
+        list_for_each_entry_rcu(hard_iface, &batadv_hardif_list, list) {
+                if ((hard_iface->if_status != BATADV_IF_ACTIVE) &&
+                    (hard_iface->if_status != BATADV_IF_TO_BE_ACTIVATED))
                         continue;
 
                 if (hard_iface->net_dev == net_dev)
                         continue;
 
-                if (!compare_eth(hard_iface->net_dev->dev_addr,
-                                 net_dev->dev_addr))
+                if (!batadv_compare_eth(hard_iface->net_dev->dev_addr,
+                                        net_dev->dev_addr))
                         continue;
 
                 pr_warn("The newly added mac address (%pM) already exists on: %s\n",
@@ -180,27 +177,29 @@ static void check_known_mac_addr(const struct net_device *net_dev)
         rcu_read_unlock();
 }
 
-int hardif_min_mtu(struct net_device *soft_iface)
+int batadv_hardif_min_mtu(struct net_device *soft_iface)
 {
-        const struct bat_priv *bat_priv = netdev_priv(soft_iface);
-        const struct hard_iface *hard_iface;
+        const struct batadv_priv *bat_priv = netdev_priv(soft_iface);
+        const struct batadv_hard_iface *hard_iface;
         /* allow big frames if all devices are capable to do so
-         * (have MTU > 1500 + BAT_HEADER_LEN) */
+         * (have MTU > 1500 + BAT_HEADER_LEN)
+         */
         int min_mtu = ETH_DATA_LEN;
 
         if (atomic_read(&bat_priv->fragmentation))
                 goto out;
 
         rcu_read_lock();
-        list_for_each_entry_rcu(hard_iface, &hardif_list, list) {
-                if ((hard_iface->if_status != IF_ACTIVE) &&
-                    (hard_iface->if_status != IF_TO_BE_ACTIVATED))
+        list_for_each_entry_rcu(hard_iface, &batadv_hardif_list, list) {
+                if ((hard_iface->if_status != BATADV_IF_ACTIVE) &&
+                    (hard_iface->if_status != BATADV_IF_TO_BE_ACTIVATED))
                         continue;
 
                 if (hard_iface->soft_iface != soft_iface)
                         continue;
 
-                min_mtu = min_t(int, hard_iface->net_dev->mtu - BAT_HEADER_LEN,
+                min_mtu = min_t(int,
+                                hard_iface->net_dev->mtu - BATADV_HEADER_LEN,
                                 min_mtu);
         }
         rcu_read_unlock();
@@ -209,68 +208,70 @@ out:
 }
 
 /* adjusts the MTU if a new interface with a smaller MTU appeared. */
-void update_min_mtu(struct net_device *soft_iface)
+void batadv_update_min_mtu(struct net_device *soft_iface)
 {
         int min_mtu;
 
-        min_mtu = hardif_min_mtu(soft_iface);
+        min_mtu = batadv_hardif_min_mtu(soft_iface);
         if (soft_iface->mtu != min_mtu)
                 soft_iface->mtu = min_mtu;
 }
 
-static void hardif_activate_interface(struct hard_iface *hard_iface)
+static void
+batadv_hardif_activate_interface(struct batadv_hard_iface *hard_iface)
 {
-        struct bat_priv *bat_priv;
-        struct hard_iface *primary_if = NULL;
+        struct batadv_priv *bat_priv;
+        struct batadv_hard_iface *primary_if = NULL;
 
-        if (hard_iface->if_status != IF_INACTIVE)
+        if (hard_iface->if_status != BATADV_IF_INACTIVE)
                 goto out;
 
         bat_priv = netdev_priv(hard_iface->soft_iface);
 
         bat_priv->bat_algo_ops->bat_iface_update_mac(hard_iface);
-        hard_iface->if_status = IF_TO_BE_ACTIVATED;
+        hard_iface->if_status = BATADV_IF_TO_BE_ACTIVATED;
 
-        /**
-         * the first active interface becomes our primary interface or
+        /* the first active interface becomes our primary interface or
          * the next active interface after the old primary interface was removed
          */
-        primary_if = primary_if_get_selected(bat_priv);
+        primary_if = batadv_primary_if_get_selected(bat_priv);
         if (!primary_if)
-                primary_if_select(bat_priv, hard_iface);
+                batadv_primary_if_select(bat_priv, hard_iface);
 
-        bat_info(hard_iface->soft_iface, "Interface activated: %s\n",
-                 hard_iface->net_dev->name);
+        batadv_info(hard_iface->soft_iface, "Interface activated: %s\n",
+                    hard_iface->net_dev->name);
 
-        update_min_mtu(hard_iface->soft_iface);
+        batadv_update_min_mtu(hard_iface->soft_iface);
 
 out:
         if (primary_if)
-                hardif_free_ref(primary_if);
+                batadv_hardif_free_ref(primary_if);
 }
 
-static void hardif_deactivate_interface(struct hard_iface *hard_iface)
+static void
+batadv_hardif_deactivate_interface(struct batadv_hard_iface *hard_iface)
 {
-        if ((hard_iface->if_status != IF_ACTIVE) &&
-            (hard_iface->if_status != IF_TO_BE_ACTIVATED))
+        if ((hard_iface->if_status != BATADV_IF_ACTIVE) &&
+            (hard_iface->if_status != BATADV_IF_TO_BE_ACTIVATED))
                 return;
 
-        hard_iface->if_status = IF_INACTIVE;
+        hard_iface->if_status = BATADV_IF_INACTIVE;
 
-        bat_info(hard_iface->soft_iface, "Interface deactivated: %s\n",
-                 hard_iface->net_dev->name);
+        batadv_info(hard_iface->soft_iface, "Interface deactivated: %s\n",
+                    hard_iface->net_dev->name);
 
-        update_min_mtu(hard_iface->soft_iface);
+        batadv_update_min_mtu(hard_iface->soft_iface);
 }
 
-int hardif_enable_interface(struct hard_iface *hard_iface,
-                            const char *iface_name)
+int batadv_hardif_enable_interface(struct batadv_hard_iface *hard_iface,
+                                   const char *iface_name)
 {
-        struct bat_priv *bat_priv;
+        struct batadv_priv *bat_priv;
         struct net_device *soft_iface;
+        __be16 ethertype = __constant_htons(BATADV_ETH_P_BATMAN);
         int ret;
 
-        if (hard_iface->if_status != IF_NOT_IN_USE)
+        if (hard_iface->if_status != BATADV_IF_NOT_IN_USE)
                 goto out;
 
         if (!atomic_inc_not_zero(&hard_iface->refcount))
@@ -284,7 +285,7 @@ int hardif_enable_interface(struct hard_iface *hard_iface,
         soft_iface = dev_get_by_name(&init_net, iface_name);
 
         if (!soft_iface) {
-                soft_iface = softif_create(iface_name);
+                soft_iface = batadv_softif_create(iface_name);
 
                 if (!soft_iface) {
                         ret = -ENOMEM;
@@ -295,7 +296,7 @@ int hardif_enable_interface(struct hard_iface *hard_iface,
                 dev_hold(soft_iface);
         }
 
-        if (!softif_is_valid(soft_iface)) {
+        if (!batadv_softif_is_valid(soft_iface)) {
                 pr_err("Can't create batman mesh interface %s: already exists as regular interface\n",
                        soft_iface->name);
                 ret = -EINVAL;
@@ -306,48 +307,46 @@ int hardif_enable_interface(struct hard_iface *hard_iface,
         bat_priv = netdev_priv(hard_iface->soft_iface);
 
         ret = bat_priv->bat_algo_ops->bat_iface_enable(hard_iface);
-        if (ret < 0) {
-                ret = -ENOMEM;
+        if (ret < 0)
                 goto err_dev;
-        }
 
         hard_iface->if_num = bat_priv->num_ifaces;
         bat_priv->num_ifaces++;
-        hard_iface->if_status = IF_INACTIVE;
-        orig_hash_add_if(hard_iface, bat_priv->num_ifaces);
+        hard_iface->if_status = BATADV_IF_INACTIVE;
+        batadv_orig_hash_add_if(hard_iface, bat_priv->num_ifaces);
 
-        hard_iface->batman_adv_ptype.type = __constant_htons(ETH_P_BATMAN);
-        hard_iface->batman_adv_ptype.func = batman_skb_recv;
+        hard_iface->batman_adv_ptype.type = ethertype;
+        hard_iface->batman_adv_ptype.func = batadv_batman_skb_recv;
         hard_iface->batman_adv_ptype.dev = hard_iface->net_dev;
         dev_add_pack(&hard_iface->batman_adv_ptype);
 
         atomic_set(&hard_iface->frag_seqno, 1);
-        bat_info(hard_iface->soft_iface, "Adding interface: %s\n",
-                 hard_iface->net_dev->name);
-
-        if (atomic_read(&bat_priv->fragmentation) && hard_iface->net_dev->mtu <
-                ETH_DATA_LEN + BAT_HEADER_LEN)
-                bat_info(hard_iface->soft_iface,
-                         "The MTU of interface %s is too small (%i) to handle the transport of batman-adv packets. Packets going over this interface will be fragmented on layer2 which could impact the performance. Setting the MTU to %zi would solve the problem.\n",
-                         hard_iface->net_dev->name, hard_iface->net_dev->mtu,
-                         ETH_DATA_LEN + BAT_HEADER_LEN);
-
-        if (!atomic_read(&bat_priv->fragmentation) && hard_iface->net_dev->mtu <
-                ETH_DATA_LEN + BAT_HEADER_LEN)
-                bat_info(hard_iface->soft_iface,
-                         "The MTU of interface %s is too small (%i) to handle the transport of batman-adv packets. If you experience problems getting traffic through try increasing the MTU to %zi.\n",
-                         hard_iface->net_dev->name, hard_iface->net_dev->mtu,
-                         ETH_DATA_LEN + BAT_HEADER_LEN);
-
-        if (hardif_is_iface_up(hard_iface))
-                hardif_activate_interface(hard_iface);
+        batadv_info(hard_iface->soft_iface, "Adding interface: %s\n",
+                    hard_iface->net_dev->name);
+
+        if (atomic_read(&bat_priv->fragmentation) &&
+            hard_iface->net_dev->mtu < ETH_DATA_LEN + BATADV_HEADER_LEN)
+                batadv_info(hard_iface->soft_iface,
+                            "The MTU of interface %s is too small (%i) to handle the transport of batman-adv packets. Packets going over this interface will be fragmented on layer2 which could impact the performance. Setting the MTU to %zi would solve the problem.\n",
+                            hard_iface->net_dev->name, hard_iface->net_dev->mtu,
+                            ETH_DATA_LEN + BATADV_HEADER_LEN);
+
+        if (!atomic_read(&bat_priv->fragmentation) &&
+            hard_iface->net_dev->mtu < ETH_DATA_LEN + BATADV_HEADER_LEN)
+                batadv_info(hard_iface->soft_iface,
+                            "The MTU of interface %s is too small (%i) to handle the transport of batman-adv packets. If you experience problems getting traffic through try increasing the MTU to %zi.\n",
+                            hard_iface->net_dev->name, hard_iface->net_dev->mtu,
+                            ETH_DATA_LEN + BATADV_HEADER_LEN);
+
+        if (batadv_hardif_is_iface_up(hard_iface))
+                batadv_hardif_activate_interface(hard_iface);
         else
-                bat_err(hard_iface->soft_iface,
-                        "Not using interface %s (retrying later): interface not active\n",
-                        hard_iface->net_dev->name);
+                batadv_err(hard_iface->soft_iface,
+                           "Not using interface %s (retrying later): interface not active\n",
+                           hard_iface->net_dev->name);
 
         /* begin scheduling originator messages on that interface */
-        schedule_bat_ogm(hard_iface);
+        batadv_schedule_bat_ogm(hard_iface);
 
 out:
         return 0;
@@ -355,67 +354,68 @@ out:
 err_dev:
         dev_put(soft_iface);
 err:
-        hardif_free_ref(hard_iface);
+        batadv_hardif_free_ref(hard_iface);
         return ret;
 }
 
-void hardif_disable_interface(struct hard_iface *hard_iface)
+void batadv_hardif_disable_interface(struct batadv_hard_iface *hard_iface)
 {
-        struct bat_priv *bat_priv = netdev_priv(hard_iface->soft_iface);
-        struct hard_iface *primary_if = NULL;
+        struct batadv_priv *bat_priv = netdev_priv(hard_iface->soft_iface);
+        struct batadv_hard_iface *primary_if = NULL;
 
-        if (hard_iface->if_status == IF_ACTIVE)
-                hardif_deactivate_interface(hard_iface);
+        if (hard_iface->if_status == BATADV_IF_ACTIVE)
+                batadv_hardif_deactivate_interface(hard_iface);
 
-        if (hard_iface->if_status != IF_INACTIVE)
+        if (hard_iface->if_status != BATADV_IF_INACTIVE)
                 goto out;
 
-        bat_info(hard_iface->soft_iface, "Removing interface: %s\n",
-                 hard_iface->net_dev->name);
+        batadv_info(hard_iface->soft_iface, "Removing interface: %s\n",
+                    hard_iface->net_dev->name);
         dev_remove_pack(&hard_iface->batman_adv_ptype);
 
         bat_priv->num_ifaces--;
-        orig_hash_del_if(hard_iface, bat_priv->num_ifaces);
+        batadv_orig_hash_del_if(hard_iface, bat_priv->num_ifaces);
 
-        primary_if = primary_if_get_selected(bat_priv);
+        primary_if = batadv_primary_if_get_selected(bat_priv);
         if (hard_iface == primary_if) {
-                struct hard_iface *new_if;
+                struct batadv_hard_iface *new_if;
 
-                new_if = hardif_get_active(hard_iface->soft_iface);
-                primary_if_select(bat_priv, new_if);
+                new_if = batadv_hardif_get_active(hard_iface->soft_iface);
+                batadv_primary_if_select(bat_priv, new_if);
 
                 if (new_if)
-                        hardif_free_ref(new_if);
+                        batadv_hardif_free_ref(new_if);
         }
 
         bat_priv->bat_algo_ops->bat_iface_disable(hard_iface);
-        hard_iface->if_status = IF_NOT_IN_USE;
+        hard_iface->if_status = BATADV_IF_NOT_IN_USE;
 
         /* delete all references to this hard_iface */
-        purge_orig_ref(bat_priv);
-        purge_outstanding_packets(bat_priv, hard_iface);
+        batadv_purge_orig_ref(bat_priv);
+        batadv_purge_outstanding_packets(bat_priv, hard_iface);
         dev_put(hard_iface->soft_iface);
 
         /* nobody uses this interface anymore */
         if (!bat_priv->num_ifaces)
-                softif_destroy(hard_iface->soft_iface);
+                batadv_softif_destroy(hard_iface->soft_iface);
 
         hard_iface->soft_iface = NULL;
-        hardif_free_ref(hard_iface);
+        batadv_hardif_free_ref(hard_iface);
 
 out:
         if (primary_if)
-                hardif_free_ref(primary_if);
+                batadv_hardif_free_ref(primary_if);
 }
 
-static struct hard_iface *hardif_add_interface(struct net_device *net_dev)
+static struct batadv_hard_iface *
+batadv_hardif_add_interface(struct net_device *net_dev)
 {
-        struct hard_iface *hard_iface;
+        struct batadv_hard_iface *hard_iface;
         int ret;
 
         ASSERT_RTNL();
 
-        ret = is_valid_iface(net_dev);
+        ret = batadv_is_valid_iface(net_dev);
         if (ret != 1)
                 goto out;
 
@@ -425,23 +425,22 @@ static struct hard_iface *hardif_add_interface(struct net_device *net_dev)
         if (!hard_iface)
                 goto release_dev;
 
-        ret = sysfs_add_hardif(&hard_iface->hardif_obj, net_dev);
+        ret = batadv_sysfs_add_hardif(&hard_iface->hardif_obj, net_dev);
         if (ret)
                 goto free_if;
 
         hard_iface->if_num = -1;
         hard_iface->net_dev = net_dev;
         hard_iface->soft_iface = NULL;
-        hard_iface->if_status = IF_NOT_IN_USE;
+        hard_iface->if_status = BATADV_IF_NOT_IN_USE;
         INIT_LIST_HEAD(&hard_iface->list);
         /* extra reference for return */
         atomic_set(&hard_iface->refcount, 2);
 
-        check_known_mac_addr(hard_iface->net_dev);
-        list_add_tail_rcu(&hard_iface->list, &hardif_list);
+        batadv_check_known_mac_addr(hard_iface->net_dev);
+        list_add_tail_rcu(&hard_iface->list, &batadv_hardif_list);
 
-        /**
-         * This can't be called via a bat_priv callback because
+        /* This can't be called via a bat_priv callback because
          * we have no bat_priv yet.
          */
         atomic_set(&hard_iface->seqno, 1);
@@ -457,102 +456,104 @@ out:
         return NULL;
 }
 
-static void hardif_remove_interface(struct hard_iface *hard_iface)
+static void batadv_hardif_remove_interface(struct batadv_hard_iface *hard_iface)
 {
         ASSERT_RTNL();
 
         /* first deactivate interface */
-        if (hard_iface->if_status != IF_NOT_IN_USE)
-                hardif_disable_interface(hard_iface);
+        if (hard_iface->if_status != BATADV_IF_NOT_IN_USE)
+                batadv_hardif_disable_interface(hard_iface);
 
-        if (hard_iface->if_status != IF_NOT_IN_USE)
+        if (hard_iface->if_status != BATADV_IF_NOT_IN_USE)
                 return;
 
-        hard_iface->if_status = IF_TO_BE_REMOVED;
-        sysfs_del_hardif(&hard_iface->hardif_obj);
-        hardif_free_ref(hard_iface);
+        hard_iface->if_status = BATADV_IF_TO_BE_REMOVED;
+        batadv_sysfs_del_hardif(&hard_iface->hardif_obj);
+        batadv_hardif_free_ref(hard_iface);
 }
 
-void hardif_remove_interfaces(void)
+void batadv_hardif_remove_interfaces(void)
 {
-        struct hard_iface *hard_iface, *hard_iface_tmp;
+        struct batadv_hard_iface *hard_iface, *hard_iface_tmp;
 
         rtnl_lock();
         list_for_each_entry_safe(hard_iface, hard_iface_tmp,
-                                 &hardif_list, list) {
+                                 &batadv_hardif_list, list) {
                 list_del_rcu(&hard_iface->list);
-                hardif_remove_interface(hard_iface);
+                batadv_hardif_remove_interface(hard_iface);
         }
         rtnl_unlock();
 }
 
-static int hard_if_event(struct notifier_block *this,
-                         unsigned long event, void *ptr)
+static int batadv_hard_if_event(struct notifier_block *this,
+                                unsigned long event, void *ptr)
 {
         struct net_device *net_dev = ptr;
-        struct hard_iface *hard_iface = hardif_get_by_netdev(net_dev);
-        struct hard_iface *primary_if = NULL;
-        struct bat_priv *bat_priv;
+        struct batadv_hard_iface *hard_iface;
+        struct batadv_hard_iface *primary_if = NULL;
+        struct batadv_priv *bat_priv;
 
+        hard_iface = batadv_hardif_get_by_netdev(net_dev);
         if (!hard_iface && event == NETDEV_REGISTER)
-                hard_iface = hardif_add_interface(net_dev);
+                hard_iface = batadv_hardif_add_interface(net_dev);
 
         if (!hard_iface)
                 goto out;
 
         switch (event) {
         case NETDEV_UP:
-                hardif_activate_interface(hard_iface);
+                batadv_hardif_activate_interface(hard_iface);
                 break;
         case NETDEV_GOING_DOWN:
         case NETDEV_DOWN:
-                hardif_deactivate_interface(hard_iface);
+                batadv_hardif_deactivate_interface(hard_iface);
                 break;
         case NETDEV_UNREGISTER:
                 list_del_rcu(&hard_iface->list);
 
-                hardif_remove_interface(hard_iface);
+                batadv_hardif_remove_interface(hard_iface);
                 break;
         case NETDEV_CHANGEMTU:
                 if (hard_iface->soft_iface)
-                        update_min_mtu(hard_iface->soft_iface);
+                        batadv_update_min_mtu(hard_iface->soft_iface);
                 break;
         case NETDEV_CHANGEADDR:
-                if (hard_iface->if_status == IF_NOT_IN_USE)
+                if (hard_iface->if_status == BATADV_IF_NOT_IN_USE)
                         goto hardif_put;
 
-                check_known_mac_addr(hard_iface->net_dev);
+                batadv_check_known_mac_addr(hard_iface->net_dev);
 
                 bat_priv = netdev_priv(hard_iface->soft_iface);
                 bat_priv->bat_algo_ops->bat_iface_update_mac(hard_iface);
 
-                primary_if = primary_if_get_selected(bat_priv);
+                primary_if = batadv_primary_if_get_selected(bat_priv);
                 if (!primary_if)
                         goto hardif_put;
 
                 if (hard_iface == primary_if)
-                        primary_if_update_addr(bat_priv, NULL);
+                        batadv_primary_if_update_addr(bat_priv, NULL);
                 break;
         default:
                 break;
         }
 
 hardif_put:
-        hardif_free_ref(hard_iface);
+        batadv_hardif_free_ref(hard_iface);
 out:
         if (primary_if)
-                hardif_free_ref(primary_if);
+                batadv_hardif_free_ref(primary_if);
         return NOTIFY_DONE;
 }
 
 /* This function returns true if the interface represented by ifindex is a
- * 802.11 wireless device */
-bool is_wifi_iface(int ifindex)
+ * 802.11 wireless device
+ */
+bool batadv_is_wifi_iface(int ifindex)
 {
         struct net_device *net_device = NULL;
         bool ret = false;
 
-        if (ifindex == NULL_IFINDEX)
+        if (ifindex == BATADV_NULL_IFINDEX)
                 goto out;
 
         net_device = dev_get_by_index(&init_net, ifindex);
@@ -561,7 +562,8 @@ bool is_wifi_iface(int ifindex)
 
 #ifdef CONFIG_WIRELESS_EXT
         /* pre-cfg80211 drivers have to implement WEXT, so it is possible to
-         * check for wireless_handlers != NULL */
+         * check for wireless_handlers != NULL
+         */
         if (net_device->wireless_handlers)
                 ret = true;
         else
@@ -575,6 +577,6 @@ out:
         return ret;
 }
 
-struct notifier_block hard_if_notifier = {
-        .notifier_call = hard_if_event,
+struct notifier_block batadv_hard_if_notifier = {
+        .notifier_call = batadv_hard_if_event,
 };
diff --git a/net/batman-adv/hard-interface.h b/net/batman-adv/hard-interface.h
index e68c5655e61..3732366e744 100644
--- a/net/batman-adv/hard-interface.h
+++ b/net/batman-adv/hard-interface.h
@@ -1,5 +1,4 @@
-/*
- * Copyright (C) 2007-2012 B.A.T.M.A.N. contributors:
+/* Copyright (C) 2007-2012 B.A.T.M.A.N. contributors:
  *
  * Marek Lindner, Simon Wunderlich
  *
@@ -16,44 +15,44 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA
- *
  */
 
 #ifndef _NET_BATMAN_ADV_HARD_INTERFACE_H_
 #define _NET_BATMAN_ADV_HARD_INTERFACE_H_
 
-enum hard_if_state {
-        IF_NOT_IN_USE,
-        IF_TO_BE_REMOVED,
-        IF_INACTIVE,
-        IF_ACTIVE,
-        IF_TO_BE_ACTIVATED,
-        IF_I_WANT_YOU
+enum batadv_hard_if_state {
+        BATADV_IF_NOT_IN_USE,
+        BATADV_IF_TO_BE_REMOVED,
+        BATADV_IF_INACTIVE,
+        BATADV_IF_ACTIVE,
+        BATADV_IF_TO_BE_ACTIVATED,
+        BATADV_IF_I_WANT_YOU,
 };
 
-extern struct notifier_block hard_if_notifier;
+extern struct notifier_block batadv_hard_if_notifier;
 
-struct hard_iface*
-hardif_get_by_netdev(const struct net_device *net_dev);
-int hardif_enable_interface(struct hard_iface *hard_iface,
-                            const char *iface_name);
-void hardif_disable_interface(struct hard_iface *hard_iface);
-void hardif_remove_interfaces(void);
-int hardif_min_mtu(struct net_device *soft_iface);
-void update_min_mtu(struct net_device *soft_iface);
-void hardif_free_rcu(struct rcu_head *rcu);
-bool is_wifi_iface(int ifindex);
+struct batadv_hard_iface*
+batadv_hardif_get_by_netdev(const struct net_device *net_dev);
+int batadv_hardif_enable_interface(struct batadv_hard_iface *hard_iface,
+                                   const char *iface_name);
+void batadv_hardif_disable_interface(struct batadv_hard_iface *hard_iface);
+void batadv_hardif_remove_interfaces(void);
+int batadv_hardif_min_mtu(struct net_device *soft_iface);
+void batadv_update_min_mtu(struct net_device *soft_iface);
+void batadv_hardif_free_rcu(struct rcu_head *rcu);
+bool batadv_is_wifi_iface(int ifindex);
 
-static inline void hardif_free_ref(struct hard_iface *hard_iface)
+static inline void
+batadv_hardif_free_ref(struct batadv_hard_iface *hard_iface)
 {
         if (atomic_dec_and_test(&hard_iface->refcount))
-                call_rcu(&hard_iface->rcu, hardif_free_rcu);
+                call_rcu(&hard_iface->rcu, batadv_hardif_free_rcu);
 }
 
-static inline struct hard_iface *primary_if_get_selected(
-                                                struct bat_priv *bat_priv)
+static inline struct batadv_hard_iface *
+batadv_primary_if_get_selected(struct batadv_priv *bat_priv)
 {
-        struct hard_iface *hard_iface;
+        struct batadv_hard_iface *hard_iface;
 
         rcu_read_lock();
         hard_iface = rcu_dereference(bat_priv->primary_if);
diff --git a/net/batman-adv/hash.c b/net/batman-adv/hash.c
index 117687bedf2..15a849c2d41 100644
--- a/net/batman-adv/hash.c
+++ b/net/batman-adv/hash.c
@@ -1,5 +1,4 @@
-/*
- * Copyright (C) 2006-2012 B.A.T.M.A.N. contributors:
+/* Copyright (C) 2006-2012 B.A.T.M.A.N. contributors:
  *
  * Simon Wunderlich, Marek Lindner
  *
@@ -16,25 +15,24 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA
- *
  */
 
 #include "main.h"
 #include "hash.h"
 
 /* clears the hash */
-static void hash_init(struct hashtable_t *hash)
+static void batadv_hash_init(struct batadv_hashtable *hash)
 {
         uint32_t i;
 
-        for (i = 0 ; i < hash->size; i++) {
+        for (i = 0; i < hash->size; i++) {
                 INIT_HLIST_HEAD(&hash->table[i]);
                 spin_lock_init(&hash->list_locks[i]);
         }
 }
 
 /* free only the hashtable and the hash itself. */
-void hash_destroy(struct hashtable_t *hash)
+void batadv_hash_destroy(struct batadv_hashtable *hash)
 {
         kfree(hash->list_locks);
         kfree(hash->table);
@@ -42,9 +40,9 @@ void hash_destroy(struct hashtable_t *hash)
 }
 
 /* allocates and clears the hash */
-struct hashtable_t *hash_new(uint32_t size)
+struct batadv_hashtable *batadv_hash_new(uint32_t size)
 {
-        struct hashtable_t *hash;
+        struct batadv_hashtable *hash;
 
         hash = kmalloc(sizeof(*hash), GFP_ATOMIC);
         if (!hash)
@@ -60,7 +58,7 @@ struct hashtable_t *hash_new(uint32_t size)
                 goto free_table;
 
         hash->size = size;
-        hash_init(hash);
+        batadv_hash_init(hash);
         return hash;
 
 free_table:
@@ -69,3 +67,12 @@ free_hash:
         kfree(hash);
         return NULL;
 }
+
+void batadv_hash_set_lock_class(struct batadv_hashtable *hash,
+                                struct lock_class_key *key)
+{
+        uint32_t i;
+
+        for (i = 0; i < hash->size; i++)
+                lockdep_set_class(&hash->list_locks[i], key);
+}
diff --git a/net/batman-adv/hash.h b/net/batman-adv/hash.h
index d4bd7862719..977de9c75fc 100644
--- a/net/batman-adv/hash.h
+++ b/net/batman-adv/hash.h
@@ -1,5 +1,4 @@
-/*
- * Copyright (C) 2006-2012 B.A.T.M.A.N. contributors:
+/* Copyright (C) 2006-2012 B.A.T.M.A.N. contributors:
  *
  * Simon Wunderlich, Marek Lindner
  *
@@ -16,7 +15,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA
- *
  */
 
 #ifndef _NET_BATMAN_ADV_HASH_H_
@@ -24,35 +22,42 @@
 
 #include <linux/list.h>
 
-/* callback to a compare function.  should
- * compare 2 element datas for their keys,
- * return 0 if same and not 0 if not
- * same */
-typedef int (*hashdata_compare_cb)(const struct hlist_node *, const void *);
+/* callback to a compare function.  should compare 2 element datas for their
+ * keys, return 0 if same and not 0 if not same
+ */
+typedef int (*batadv_hashdata_compare_cb)(const struct hlist_node *,
+                                          const void *);
 
 /* the hashfunction, should return an index
  * based on the key in the data of the first
- * argument and the size the second */
-typedef uint32_t (*hashdata_choose_cb)(const void *, uint32_t);
-typedef void (*hashdata_free_cb)(struct hlist_node *, void *);
+ * argument and the size the second
+ */
+typedef uint32_t (*batadv_hashdata_choose_cb)(const void *, uint32_t);
+typedef void (*batadv_hashdata_free_cb)(struct hlist_node *, void *);
 
-struct hashtable_t {
+struct batadv_hashtable {
         struct hlist_head *table;   /* the hashtable itself with the buckets */
         spinlock_t *list_locks;     /* spinlock for each hash list entry */
         uint32_t size;              /* size of hashtable */
 };
 
 /* allocates and clears the hash */
-struct hashtable_t *hash_new(uint32_t size);
+struct batadv_hashtable *batadv_hash_new(uint32_t size);
+
+/* set class key for all locks */
+void batadv_hash_set_lock_class(struct batadv_hashtable *hash,
+                                struct lock_class_key *key);
 
 /* free only the hashtable and the hash itself. */
-void hash_destroy(struct hashtable_t *hash);
+void batadv_hash_destroy(struct batadv_hashtable *hash);
 
 /* remove the hash structure. if hashdata_free_cb != NULL, this function will be
  * called to remove the elements inside of the hash.  if you don't remove the
- * elements, memory might be leaked. */
-static inline void hash_delete(struct hashtable_t *hash,
-                               hashdata_free_cb free_cb, void *arg)
+ * elements, memory might be leaked.
+ */
+static inline void batadv_hash_delete(struct batadv_hashtable *hash,
+                                      batadv_hashdata_free_cb free_cb,
+                                      void *arg)
 {
         struct hlist_head *head;
         struct hlist_node *node, *node_tmp;
@@ -73,11 +78,11 @@ static inline void hash_delete(struct hashtable_t *hash,
                 spin_unlock_bh(list_lock);
         }
 
-        hash_destroy(hash);
+        batadv_hash_destroy(hash);
 }
 
 /**
- *      hash_add - adds data to the hashtable
+ *      batadv_hash_add - adds data to the hashtable
  *      @hash: storage hash table
  *      @compare: callback to determine if 2 hash elements are identical
  *      @choose: callback calculating the hash index
@@ -87,11 +92,11 @@ static inline void hash_delete(struct hashtable_t *hash,
  *      Returns 0 on success, 1 if the element already is in the hash
  *      and -1 on error.
  */
-
-static inline int hash_add(struct hashtable_t *hash,
-                           hashdata_compare_cb compare,
-                           hashdata_choose_cb choose,
-                           const void *data, struct hlist_node *data_node)
+static inline int batadv_hash_add(struct batadv_hashtable *hash,
+                                  batadv_hashdata_compare_cb compare,
+                                  batadv_hashdata_choose_cb choose,
+                                  const void *data,
+                                  struct hlist_node *data_node)
 {
         uint32_t index;
         int ret = -1;
@@ -106,26 +111,23 @@ static inline int hash_add(struct hashtable_t *hash,
         head = &hash->table[index];
         list_lock = &hash->list_locks[index];
 
-        rcu_read_lock();
-        __hlist_for_each_rcu(node, head) {
+        spin_lock_bh(list_lock);
+
+        hlist_for_each(node, head) {
                 if (!compare(node, data))
                         continue;
 
                 ret = 1;
-                goto err_unlock;
+                goto unlock;
         }
-        rcu_read_unlock();
 
         /* no duplicate found in list, add new element */
-        spin_lock_bh(list_lock);
         hlist_add_head_rcu(data_node, head);
-        spin_unlock_bh(list_lock);
 
         ret = 0;
-        goto out;
 
-err_unlock:
-        rcu_read_unlock();
+unlock:
+        spin_unlock_bh(list_lock);
 out:
         return ret;
 }
@@ -133,10 +135,12 @@ out:
 /* removes data from hash, if found. returns pointer do data on success, so you
  * can remove the used structure yourself, or NULL on error .  data could be the
  * structure you use with just the key filled, we just need the key for
- * comparing. */
-static inline void *hash_remove(struct hashtable_t *hash,
-                                hashdata_compare_cb compare,
-                                hashdata_choose_cb choose, void *data)
+ * comparing.
+ */
+static inline void *batadv_hash_remove(struct batadv_hashtable *hash,
+                                       batadv_hashdata_compare_cb compare,
+                                       batadv_hashdata_choose_cb choose,
+                                       void *data)
 {
         uint32_t index;
         struct hlist_node *node;
diff --git a/net/batman-adv/icmp_socket.c b/net/batman-adv/icmp_socket.c
index 2e98a57f340..bde3cf74750 100644
--- a/net/batman-adv/icmp_socket.c
+++ b/net/batman-adv/icmp_socket.c
@@ -1,5 +1,4 @@
-/*
- * Copyright (C) 2007-2012 B.A.T.M.A.N. contributors:
+/* Copyright (C) 2007-2012 B.A.T.M.A.N. contributors:
  *
  * Marek Lindner
  *
@@ -16,7 +15,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA
- *
  */
 
 #include "main.h"
@@ -28,21 +26,21 @@
 #include "originator.h"
 #include "hard-interface.h"
 
-static struct socket_client *socket_client_hash[256];
+static struct batadv_socket_client *batadv_socket_client_hash[256];
 
-static void bat_socket_add_packet(struct socket_client *socket_client,
-                                  struct icmp_packet_rr *icmp_packet,
-                                  size_t icmp_len);
+static void batadv_socket_add_packet(struct batadv_socket_client *socket_client,
+                                     struct batadv_icmp_packet_rr *icmp_packet,
+                                     size_t icmp_len);
 
-void bat_socket_init(void)
+void batadv_socket_init(void)
 {
-        memset(socket_client_hash, 0, sizeof(socket_client_hash));
+        memset(batadv_socket_client_hash, 0, sizeof(batadv_socket_client_hash));
 }
 
-static int bat_socket_open(struct inode *inode, struct file *file)
+static int batadv_socket_open(struct inode *inode, struct file *file)
 {
         unsigned int i;
-        struct socket_client *socket_client;
+        struct batadv_socket_client *socket_client;
 
         nonseekable_open(inode, file);
 
@@ -51,14 +49,14 @@ static int bat_socket_open(struct inode *inode, struct file *file)
         if (!socket_client)
                 return -ENOMEM;
 
-        for (i = 0; i < ARRAY_SIZE(socket_client_hash); i++) {
-                if (!socket_client_hash[i]) {
-                        socket_client_hash[i] = socket_client;
+        for (i = 0; i < ARRAY_SIZE(batadv_socket_client_hash); i++) {
+                if (!batadv_socket_client_hash[i]) {
+                        batadv_socket_client_hash[i] = socket_client;
                         break;
                 }
         }
 
-        if (i == ARRAY_SIZE(socket_client_hash)) {
+        if (i == ARRAY_SIZE(batadv_socket_client_hash)) {
                 pr_err("Error - can't add another packet client: maximum number of clients reached\n");
                 kfree(socket_client);
                 return -EXFULL;
@@ -73,14 +71,14 @@ static int bat_socket_open(struct inode *inode, struct file *file)
 
         file->private_data = socket_client;
 
-        inc_module_count();
+        batadv_inc_module_count();
         return 0;
 }
 
-static int bat_socket_release(struct inode *inode, struct file *file)
+static int batadv_socket_release(struct inode *inode, struct file *file)
 {
-        struct socket_client *socket_client = file->private_data;
-        struct socket_packet *socket_packet;
+        struct batadv_socket_client *socket_client = file->private_data;
+        struct batadv_socket_packet *socket_packet;
         struct list_head *list_pos, *list_pos_tmp;
 
         spin_lock_bh(&socket_client->lock);
@@ -88,33 +86,33 @@ static int bat_socket_release(struct inode *inode, struct file *file)
         /* for all packets in the queue ... */
         list_for_each_safe(list_pos, list_pos_tmp, &socket_client->queue_list) {
                 socket_packet = list_entry(list_pos,
-                                           struct socket_packet, list);
+                                           struct batadv_socket_packet, list);
 
                 list_del(list_pos);
                 kfree(socket_packet);
         }
 
-        socket_client_hash[socket_client->index] = NULL;
+        batadv_socket_client_hash[socket_client->index] = NULL;
         spin_unlock_bh(&socket_client->lock);
 
         kfree(socket_client);
-        dec_module_count();
+        batadv_dec_module_count();
 
         return 0;
 }
 
-static ssize_t bat_socket_read(struct file *file, char __user *buf,
-                               size_t count, loff_t *ppos)
+static ssize_t batadv_socket_read(struct file *file, char __user *buf,
+                                  size_t count, loff_t *ppos)
 {
-        struct socket_client *socket_client = file->private_data;
-        struct socket_packet *socket_packet;
+        struct batadv_socket_client *socket_client = file->private_data;
+        struct batadv_socket_packet *socket_packet;
         size_t packet_len;
         int error;
 
         if ((file->f_flags & O_NONBLOCK) && (socket_client->queue_len == 0))
                 return -EAGAIN;
 
-        if ((!buf) || (count < sizeof(struct icmp_packet)))
+        if ((!buf) || (count < sizeof(struct batadv_icmp_packet)))
                 return -EINVAL;
 
         if (!access_ok(VERIFY_WRITE, buf, count))
@@ -129,7 +127,7 @@ static ssize_t bat_socket_read(struct file *file, char __user *buf,
         spin_lock_bh(&socket_client->lock);
 
         socket_packet = list_first_entry(&socket_client->queue_list,
-                                         struct socket_packet, list);
+                                         struct batadv_socket_packet, list);
         list_del(&socket_packet->list);
         socket_client->queue_len--;
 
@@ -146,34 +144,34 @@ static ssize_t bat_socket_read(struct file *file, char __user *buf,
         return packet_len;
 }
 
-static ssize_t bat_socket_write(struct file *file, const char __user *buff,
-                                size_t len, loff_t *off)
+static ssize_t batadv_socket_write(struct file *file, const char __user *buff,
+                                   size_t len, loff_t *off)
 {
-        struct socket_client *socket_client = file->private_data;
-        struct bat_priv *bat_priv = socket_client->bat_priv;
-        struct hard_iface *primary_if = NULL;
+        struct batadv_socket_client *socket_client = file->private_data;
+        struct batadv_priv *bat_priv = socket_client->bat_priv;
+        struct batadv_hard_iface *primary_if = NULL;
         struct sk_buff *skb;
-        struct icmp_packet_rr *icmp_packet;
+        struct batadv_icmp_packet_rr *icmp_packet;
 
-        struct orig_node *orig_node = NULL;
-        struct neigh_node *neigh_node = NULL;
-        size_t packet_len = sizeof(struct icmp_packet);
+        struct batadv_orig_node *orig_node = NULL;
+        struct batadv_neigh_node *neigh_node = NULL;
+        size_t packet_len = sizeof(struct batadv_icmp_packet);
 
-        if (len < sizeof(struct icmp_packet)) {
-                bat_dbg(DBG_BATMAN, bat_priv,
-                        "Error - can't send packet from char device: invalid packet size\n");
+        if (len < sizeof(struct batadv_icmp_packet)) {
+                batadv_dbg(BATADV_DBG_BATMAN, bat_priv,
+                           "Error - can't send packet from char device: invalid packet size\n");
                 return -EINVAL;
         }
 
-        primary_if = primary_if_get_selected(bat_priv);
+        primary_if = batadv_primary_if_get_selected(bat_priv);
 
         if (!primary_if) {
                 len = -EFAULT;
                 goto out;
         }
 
-        if (len >= sizeof(struct icmp_packet_rr))
-                packet_len = sizeof(struct icmp_packet_rr);
+        if (len >= sizeof(struct batadv_icmp_packet_rr))
+                packet_len = sizeof(struct batadv_icmp_packet_rr);
 
         skb = dev_alloc_skb(packet_len + ETH_HLEN);
         if (!skb) {
@@ -182,81 +180,82 @@ static ssize_t bat_socket_write(struct file *file, const char __user *buff,
         }
 
         skb_reserve(skb, ETH_HLEN);
-        icmp_packet = (struct icmp_packet_rr *)skb_put(skb, packet_len);
+        icmp_packet = (struct batadv_icmp_packet_rr *)skb_put(skb, packet_len);
 
         if (copy_from_user(icmp_packet, buff, packet_len)) {
                 len = -EFAULT;
                 goto free_skb;
         }
 
-        if (icmp_packet->header.packet_type != BAT_ICMP) {
-                bat_dbg(DBG_BATMAN, bat_priv,
-                        "Error - can't send packet from char device: got bogus packet type (expected: BAT_ICMP)\n");
+        if (icmp_packet->header.packet_type != BATADV_ICMP) {
+                batadv_dbg(BATADV_DBG_BATMAN, bat_priv,
+                           "Error - can't send packet from char device: got bogus packet type (expected: BAT_ICMP)\n");
                 len = -EINVAL;
                 goto free_skb;
         }
 
-        if (icmp_packet->msg_type != ECHO_REQUEST) {
-                bat_dbg(DBG_BATMAN, bat_priv,
-                        "Error - can't send packet from char device: got bogus message type (expected: ECHO_REQUEST)\n");
+        if (icmp_packet->msg_type != BATADV_ECHO_REQUEST) {
+                batadv_dbg(BATADV_DBG_BATMAN, bat_priv,
+                           "Error - can't send packet from char device: got bogus message type (expected: ECHO_REQUEST)\n");
                 len = -EINVAL;
                 goto free_skb;
         }
 
         icmp_packet->uid = socket_client->index;
 
-        if (icmp_packet->header.version != COMPAT_VERSION) {
-                icmp_packet->msg_type = PARAMETER_PROBLEM;
-                icmp_packet->header.version = COMPAT_VERSION;
-                bat_socket_add_packet(socket_client, icmp_packet, packet_len);
+        if (icmp_packet->header.version != BATADV_COMPAT_VERSION) {
+                icmp_packet->msg_type = BATADV_PARAMETER_PROBLEM;
+                icmp_packet->header.version = BATADV_COMPAT_VERSION;
+                batadv_socket_add_packet(socket_client, icmp_packet,
+                                         packet_len);
                 goto free_skb;
         }
 
-        if (atomic_read(&bat_priv->mesh_state) != MESH_ACTIVE)
+        if (atomic_read(&bat_priv->mesh_state) != BATADV_MESH_ACTIVE)
                 goto dst_unreach;
 
-        orig_node = orig_hash_find(bat_priv, icmp_packet->dst);
+        orig_node = batadv_orig_hash_find(bat_priv, icmp_packet->dst);
         if (!orig_node)
                 goto dst_unreach;
 
-        neigh_node = orig_node_get_router(orig_node);
+        neigh_node = batadv_orig_node_get_router(orig_node);
         if (!neigh_node)
                 goto dst_unreach;
 
         if (!neigh_node->if_incoming)
                 goto dst_unreach;
 
-        if (neigh_node->if_incoming->if_status != IF_ACTIVE)
+        if (neigh_node->if_incoming->if_status != BATADV_IF_ACTIVE)
                 goto dst_unreach;
 
         memcpy(icmp_packet->orig,
                primary_if->net_dev->dev_addr, ETH_ALEN);
 
-        if (packet_len == sizeof(struct icmp_packet_rr))
+        if (packet_len == sizeof(struct batadv_icmp_packet_rr))
                 memcpy(icmp_packet->rr,
                        neigh_node->if_incoming->net_dev->dev_addr, ETH_ALEN);
 
-        send_skb_packet(skb, neigh_node->if_incoming, neigh_node->addr);
+        batadv_send_skb_packet(skb, neigh_node->if_incoming, neigh_node->addr);
         goto out;
 
 dst_unreach:
-        icmp_packet->msg_type = DESTINATION_UNREACHABLE;
-        bat_socket_add_packet(socket_client, icmp_packet, packet_len);
+        icmp_packet->msg_type = BATADV_DESTINATION_UNREACHABLE;
+        batadv_socket_add_packet(socket_client, icmp_packet, packet_len);
 free_skb:
         kfree_skb(skb);
 out:
         if (primary_if)
-                hardif_free_ref(primary_if);
+                batadv_hardif_free_ref(primary_if);
         if (neigh_node)
-                neigh_node_free_ref(neigh_node);
+                batadv_neigh_node_free_ref(neigh_node);
         if (orig_node)
-                orig_node_free_ref(orig_node);
+                batadv_orig_node_free_ref(orig_node);
         return len;
 }
 
-static unsigned int bat_socket_poll(struct file *file, poll_table *wait)
+static unsigned int batadv_socket_poll(struct file *file, poll_table *wait)
 {
-        struct socket_client *socket_client = file->private_data;
+        struct batadv_socket_client *socket_client = file->private_data;
 
         poll_wait(file, &socket_client->queue_wait, wait);
 
@@ -266,39 +265,39 @@ static unsigned int bat_socket_poll(struct file *file, poll_table *wait)
         return 0;
 }
 
-static const struct file_operations fops = {
+static const struct file_operations batadv_fops = {
         .owner = THIS_MODULE,
-        .open = bat_socket_open,
-        .release = bat_socket_release,
-        .read = bat_socket_read,
-        .write = bat_socket_write,
-        .poll = bat_socket_poll,
+        .open = batadv_socket_open,
+        .release = batadv_socket_release,
+        .read = batadv_socket_read,
+        .write = batadv_socket_write,
+        .poll = batadv_socket_poll,
         .llseek = no_llseek,
 };
 
-int bat_socket_setup(struct bat_priv *bat_priv)
+int batadv_socket_setup(struct batadv_priv *bat_priv)
 {
         struct dentry *d;
 
         if (!bat_priv->debug_dir)
                 goto err;
 
-        d = debugfs_create_file(ICMP_SOCKET, S_IFREG | S_IWUSR | S_IRUSR,
-                                bat_priv->debug_dir, bat_priv, &fops);
-        if (d)
+        d = debugfs_create_file(BATADV_ICMP_SOCKET, S_IFREG | S_IWUSR | S_IRUSR,
+                                bat_priv->debug_dir, bat_priv, &batadv_fops);
+        if (!d)
                 goto err;
 
         return 0;
 
 err:
-        return 1;
+        return -ENOMEM;
 }
 
-static void bat_socket_add_packet(struct socket_client *socket_client,
-                                  struct icmp_packet_rr *icmp_packet,
-                                  size_t icmp_len)
+static void batadv_socket_add_packet(struct batadv_socket_client *socket_client,
+                                     struct batadv_icmp_packet_rr *icmp_packet,
+                                     size_t icmp_len)
 {
-        struct socket_packet *socket_packet;
+        struct batadv_socket_packet *socket_packet;
 
         socket_packet = kmalloc(sizeof(*socket_packet), GFP_ATOMIC);
 
@@ -312,8 +311,9 @@ static void bat_socket_add_packet(struct socket_client *socket_client,
         spin_lock_bh(&socket_client->lock);
 
         /* while waiting for the lock the socket_client could have been
-         * deleted */
-        if (!socket_client_hash[icmp_packet->uid]) {
+         * deleted
+         */
+        if (!batadv_socket_client_hash[icmp_packet->uid]) {
                 spin_unlock_bh(&socket_client->lock);
                 kfree(socket_packet);
                 return;
@@ -324,7 +324,8 @@ static void bat_socket_add_packet(struct socket_client *socket_client,
 
         if (socket_client->queue_len > 100) {
                 socket_packet = list_first_entry(&socket_client->queue_list,
-                                                 struct socket_packet, list);
+                                                 struct batadv_socket_packet,
+                                                 list);
 
                 list_del(&socket_packet->list);
                 kfree(socket_packet);
@@ -336,11 +337,12 @@ static void bat_socket_add_packet(struct socket_client *socket_client,
         wake_up(&socket_client->queue_wait);
 }
 
-void bat_socket_receive_packet(struct icmp_packet_rr *icmp_packet,
-                               size_t icmp_len)
+void batadv_socket_receive_packet(struct batadv_icmp_packet_rr *icmp_packet,
+                                  size_t icmp_len)
 {
-        struct socket_client *hash = socket_client_hash[icmp_packet->uid];
+        struct batadv_socket_client *hash;
 
+        hash = batadv_socket_client_hash[icmp_packet->uid];
         if (hash)
-                bat_socket_add_packet(hash, icmp_packet, icmp_len);
+                batadv_socket_add_packet(hash, icmp_packet, icmp_len);
 }
diff --git a/net/batman-adv/icmp_socket.h b/net/batman-adv/icmp_socket.h
index 380ed4c2443..29443a1dbb5 100644
--- a/net/batman-adv/icmp_socket.h
+++ b/net/batman-adv/icmp_socket.h
@@ -1,5 +1,4 @@
-/*
- * Copyright (C) 2007-2012 B.A.T.M.A.N. contributors:
+/* Copyright (C) 2007-2012 B.A.T.M.A.N. contributors:
  *
  * Marek Lindner
  *
@@ -16,17 +15,16 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA
- *
  */
 
 #ifndef _NET_BATMAN_ADV_ICMP_SOCKET_H_
 #define _NET_BATMAN_ADV_ICMP_SOCKET_H_
 
-#define ICMP_SOCKET "socket"
+#define BATADV_ICMP_SOCKET "socket"
 
-void bat_socket_init(void);
-int bat_socket_setup(struct bat_priv *bat_priv);
-void bat_socket_receive_packet(struct icmp_packet_rr *icmp_packet,
-                               size_t icmp_len);
+void batadv_socket_init(void);
+int batadv_socket_setup(struct batadv_priv *bat_priv);
+void batadv_socket_receive_packet(struct batadv_icmp_packet_rr *icmp_packet,
+                                  size_t icmp_len);
 
 #endif /* _NET_BATMAN_ADV_ICMP_SOCKET_H_ */
diff --git a/net/batman-adv/main.c b/net/batman-adv/main.c
index 083a2993efe..13c88b25ab3 100644
--- a/net/batman-adv/main.c
+++ b/net/batman-adv/main.c
@@ -1,5 +1,4 @@
-/*
- * Copyright (C) 2007-2012 B.A.T.M.A.N. contributors:
+/* Copyright (C) 2007-2012 B.A.T.M.A.N. contributors:
  *
  * Marek Lindner, Simon Wunderlich
  *
@@ -16,12 +15,11 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA
- *
  */
 
 #include "main.h"
-#include "bat_sysfs.h"
-#include "bat_debugfs.h"
+#include "sysfs.h"
+#include "debugfs.h"
 #include "routing.h"
 #include "send.h"
 #include "originator.h"
@@ -37,61 +35,65 @@
 
 
 /* List manipulations on hardif_list have to be rtnl_lock()'ed,
- * list traversals just rcu-locked */
-struct list_head hardif_list;
-static int (*recv_packet_handler[256])(struct sk_buff *, struct hard_iface *);
-char bat_routing_algo[20] = "BATMAN IV";
-static struct hlist_head bat_algo_list;
+ * list traversals just rcu-locked
+ */
+struct list_head batadv_hardif_list;
+static int (*batadv_rx_handler[256])(struct sk_buff *,
+                                     struct batadv_hard_iface *);
+char batadv_routing_algo[20] = "BATMAN_IV";
+static struct hlist_head batadv_algo_list;
 
-unsigned char broadcast_addr[] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
+unsigned char batadv_broadcast_addr[] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
 
-struct workqueue_struct *bat_event_workqueue;
+struct workqueue_struct *batadv_event_workqueue;
 
-static void recv_handler_init(void);
+static void batadv_recv_handler_init(void);
 
-static int __init batman_init(void)
+static int __init batadv_init(void)
 {
-        INIT_LIST_HEAD(&hardif_list);
-        INIT_HLIST_HEAD(&bat_algo_list);
+        INIT_LIST_HEAD(&batadv_hardif_list);
+        INIT_HLIST_HEAD(&batadv_algo_list);
 
-        recv_handler_init();
+        batadv_recv_handler_init();
 
-        bat_iv_init();
+        batadv_iv_init();
 
         /* the name should not be longer than 10 chars - see
-         * http://lwn.net/Articles/23634/ */
-        bat_event_workqueue = create_singlethread_workqueue("bat_events");
+         * http://lwn.net/Articles/23634/
+         */
+        batadv_event_workqueue = create_singlethread_workqueue("bat_events");
 
-        if (!bat_event_workqueue)
+        if (!batadv_event_workqueue)
                 return -ENOMEM;
 
-        bat_socket_init();
-        debugfs_init();
+        batadv_socket_init();
+        batadv_debugfs_init();
 
-        register_netdevice_notifier(&hard_if_notifier);
+        register_netdevice_notifier(&batadv_hard_if_notifier);
 
         pr_info("B.A.T.M.A.N. advanced %s (compatibility version %i) loaded\n",
-                SOURCE_VERSION, COMPAT_VERSION);
+                BATADV_SOURCE_VERSION, BATADV_COMPAT_VERSION);
 
         return 0;
 }
 
-static void __exit batman_exit(void)
+static void __exit batadv_exit(void)
 {
-        debugfs_destroy();
-        unregister_netdevice_notifier(&hard_if_notifier);
-        hardif_remove_interfaces();
+        batadv_debugfs_destroy();
+        unregister_netdevice_notifier(&batadv_hard_if_notifier);
+        batadv_hardif_remove_interfaces();
 
-        flush_workqueue(bat_event_workqueue);
-        destroy_workqueue(bat_event_workqueue);
-        bat_event_workqueue = NULL;
+        flush_workqueue(batadv_event_workqueue);
+        destroy_workqueue(batadv_event_workqueue);
+        batadv_event_workqueue = NULL;
 
         rcu_barrier();
 }
 
-int mesh_init(struct net_device *soft_iface)
+int batadv_mesh_init(struct net_device *soft_iface)
 {
-        struct bat_priv *bat_priv = netdev_priv(soft_iface);
+        struct batadv_priv *bat_priv = netdev_priv(soft_iface);
+        int ret;
 
         spin_lock_init(&bat_priv->forw_bat_list_lock);
         spin_lock_init(&bat_priv->forw_bcast_list_lock);
@@ -110,72 +112,77 @@ int mesh_init(struct net_device *soft_iface)
         INIT_LIST_HEAD(&bat_priv->tt_req_list);
         INIT_LIST_HEAD(&bat_priv->tt_roam_list);
 
-        if (originator_init(bat_priv) < 1)
+        ret = batadv_originator_init(bat_priv);
+        if (ret < 0)
                 goto err;
 
-        if (tt_init(bat_priv) < 1)
+        ret = batadv_tt_init(bat_priv);
+        if (ret < 0)
                 goto err;
 
-        tt_local_add(soft_iface, soft_iface->dev_addr, NULL_IFINDEX);
+        batadv_tt_local_add(soft_iface, soft_iface->dev_addr,
+                            BATADV_NULL_IFINDEX);
 
-        if (vis_init(bat_priv) < 1)
+        ret = batadv_vis_init(bat_priv);
+        if (ret < 0)
                 goto err;
 
-        if (bla_init(bat_priv) < 1)
+        ret = batadv_bla_init(bat_priv);
+        if (ret < 0)
                 goto err;
 
         atomic_set(&bat_priv->gw_reselect, 0);
-        atomic_set(&bat_priv->mesh_state, MESH_ACTIVE);
-        goto end;
-
-err:
-        mesh_free(soft_iface);
-        return -1;
+        atomic_set(&bat_priv->mesh_state, BATADV_MESH_ACTIVE);
 
-end:
         return 0;
+
+err:
+        batadv_mesh_free(soft_iface);
+        return ret;
 }
 
-void mesh_free(struct net_device *soft_iface)
+void batadv_mesh_free(struct net_device *soft_iface)
 {
-        struct bat_priv *bat_priv = netdev_priv(soft_iface);
+        struct batadv_priv *bat_priv = netdev_priv(soft_iface);
 
-        atomic_set(&bat_priv->mesh_state, MESH_DEACTIVATING);
+        atomic_set(&bat_priv->mesh_state, BATADV_MESH_DEACTIVATING);
 
-        purge_outstanding_packets(bat_priv, NULL);
+        batadv_purge_outstanding_packets(bat_priv, NULL);
 
-        vis_quit(bat_priv);
+        batadv_vis_quit(bat_priv);
 
-        gw_node_purge(bat_priv);
-        originator_free(bat_priv);
+        batadv_gw_node_purge(bat_priv);
+        batadv_originator_free(bat_priv);
 
-        tt_free(bat_priv);
+        batadv_tt_free(bat_priv);
 
-        bla_free(bat_priv);
+        batadv_bla_free(bat_priv);
 
-        atomic_set(&bat_priv->mesh_state, MESH_INACTIVE);
+        free_percpu(bat_priv->bat_counters);
+
+        atomic_set(&bat_priv->mesh_state, BATADV_MESH_INACTIVE);
 }
 
-void inc_module_count(void)
+void batadv_inc_module_count(void)
 {
         try_module_get(THIS_MODULE);
 }
 
-void dec_module_count(void)
+void batadv_dec_module_count(void)
 {
         module_put(THIS_MODULE);
 }
 
-int is_my_mac(const uint8_t *addr)
+int batadv_is_my_mac(const uint8_t *addr)
 {
-        const struct hard_iface *hard_iface;
+        const struct batadv_hard_iface *hard_iface;
 
         rcu_read_lock();
-        list_for_each_entry_rcu(hard_iface, &hardif_list, list) {
-                if (hard_iface->if_status != IF_ACTIVE)
+        list_for_each_entry_rcu(hard_iface, &batadv_hardif_list, list) {
+                if (hard_iface->if_status != BATADV_IF_ACTIVE)
                         continue;
 
-                if (compare_eth(hard_iface->net_dev->dev_addr, addr)) {
+                if (batadv_compare_eth(hard_iface->net_dev->dev_addr, addr)) {
                         rcu_read_unlock();
                         return 1;
                 }
@@ -184,8 +191,8 @@ int is_my_mac(const uint8_t *addr)
         return 0;
 }
 
-static int recv_unhandled_packet(struct sk_buff *skb,
-                                 struct hard_iface *recv_if)
+static int batadv_recv_unhandled_packet(struct sk_buff *skb,
+                                        struct batadv_hard_iface *recv_if)
 {
         return NET_RX_DROP;
 }
@@ -193,16 +200,18 @@ static int recv_unhandled_packet(struct sk_buff *skb,
 /* incoming packets with the batman ethertype received on any active hard
  * interface
  */
-int batman_skb_recv(struct sk_buff *skb, struct net_device *dev,
-                    struct packet_type *ptype, struct net_device *orig_dev)
+int batadv_batman_skb_recv(struct sk_buff *skb, struct net_device *dev,
+                           struct packet_type *ptype,
+                           struct net_device *orig_dev)
 {
-        struct bat_priv *bat_priv;
-        struct batman_ogm_packet *batman_ogm_packet;
-        struct hard_iface *hard_iface;
+        struct batadv_priv *bat_priv;
+        struct batadv_ogm_packet *batadv_ogm_packet;
+        struct batadv_hard_iface *hard_iface;
         uint8_t idx;
         int ret;
 
-        hard_iface = container_of(ptype, struct hard_iface, batman_adv_ptype);
+        hard_iface = container_of(ptype, struct batadv_hard_iface,
+                                  batman_adv_ptype);
         skb = skb_share_check(skb, GFP_ATOMIC);
 
         /* skb was released by skb_share_check() */
@@ -222,27 +231,27 @@ int batman_skb_recv(struct sk_buff *skb, struct net_device *dev,
 
         bat_priv = netdev_priv(hard_iface->soft_iface);
 
-        if (atomic_read(&bat_priv->mesh_state) != MESH_ACTIVE)
+        if (atomic_read(&bat_priv->mesh_state) != BATADV_MESH_ACTIVE)
                 goto err_free;
 
         /* discard frames on not active interfaces */
-        if (hard_iface->if_status != IF_ACTIVE)
+        if (hard_iface->if_status != BATADV_IF_ACTIVE)
                 goto err_free;
 
-        batman_ogm_packet = (struct batman_ogm_packet *)skb->data;
+        batadv_ogm_packet = (struct batadv_ogm_packet *)skb->data;
 
-        if (batman_ogm_packet->header.version != COMPAT_VERSION) {
-                bat_dbg(DBG_BATMAN, bat_priv,
-                        "Drop packet: incompatible batman version (%i)\n",
-                        batman_ogm_packet->header.version);
+        if (batadv_ogm_packet->header.version != BATADV_COMPAT_VERSION) {
+                batadv_dbg(BATADV_DBG_BATMAN, bat_priv,
+                           "Drop packet: incompatible batman version (%i)\n",
+                           batadv_ogm_packet->header.version);
                 goto err_free;
         }
 
         /* all receive handlers return whether they received or reused
          * the supplied skb. if not, we have to free the skb.
          */
-        idx = batman_ogm_packet->header.packet_type;
-        ret = (*recv_packet_handler[idx])(skb, hard_iface);
+        idx = batadv_ogm_packet->header.packet_type;
+        ret = (*batadv_rx_handler[idx])(skb, hard_iface);
 
         if (ret == NET_RX_DROP)
                 kfree_skb(skb);
@@ -259,51 +268,52 @@ err_out:
         return NET_RX_DROP;
 }
 
-static void recv_handler_init(void)
+static void batadv_recv_handler_init(void)
 {
         int i;
 
-        for (i = 0; i < ARRAY_SIZE(recv_packet_handler); i++)
-                recv_packet_handler[i] = recv_unhandled_packet;
+        for (i = 0; i < ARRAY_SIZE(batadv_rx_handler); i++)
+                batadv_rx_handler[i] = batadv_recv_unhandled_packet;
 
         /* batman icmp packet */
-        recv_packet_handler[BAT_ICMP] = recv_icmp_packet;
+        batadv_rx_handler[BATADV_ICMP] = batadv_recv_icmp_packet;
         /* unicast packet */
-        recv_packet_handler[BAT_UNICAST] = recv_unicast_packet;
+        batadv_rx_handler[BATADV_UNICAST] = batadv_recv_unicast_packet;
         /* fragmented unicast packet */
-        recv_packet_handler[BAT_UNICAST_FRAG] = recv_ucast_frag_packet;
+        batadv_rx_handler[BATADV_UNICAST_FRAG] = batadv_recv_ucast_frag_packet;
         /* broadcast packet */
-        recv_packet_handler[BAT_BCAST] = recv_bcast_packet;
+        batadv_rx_handler[BATADV_BCAST] = batadv_recv_bcast_packet;
         /* vis packet */
-        recv_packet_handler[BAT_VIS] = recv_vis_packet;
+        batadv_rx_handler[BATADV_VIS] = batadv_recv_vis_packet;
         /* Translation table query (request or response) */
-        recv_packet_handler[BAT_TT_QUERY] = recv_tt_query;
+        batadv_rx_handler[BATADV_TT_QUERY] = batadv_recv_tt_query;
         /* Roaming advertisement */
-        recv_packet_handler[BAT_ROAM_ADV] = recv_roam_adv;
+        batadv_rx_handler[BATADV_ROAM_ADV] = batadv_recv_roam_adv;
 }
 
-int recv_handler_register(uint8_t packet_type,
-                          int (*recv_handler)(struct sk_buff *,
-                                              struct hard_iface *))
+int
+batadv_recv_handler_register(uint8_t packet_type,
+                             int (*recv_handler)(struct sk_buff *,
+                                                 struct batadv_hard_iface *))
 {
-        if (recv_packet_handler[packet_type] != &recv_unhandled_packet)
+        if (batadv_rx_handler[packet_type] != &batadv_recv_unhandled_packet)
                 return -EBUSY;
 
-        recv_packet_handler[packet_type] = recv_handler;
+        batadv_rx_handler[packet_type] = recv_handler;
         return 0;
 }
 
-void recv_handler_unregister(uint8_t packet_type)
+void batadv_recv_handler_unregister(uint8_t packet_type)
 {
-        recv_packet_handler[packet_type] = recv_unhandled_packet;
+        batadv_rx_handler[packet_type] = batadv_recv_unhandled_packet;
 }
 
-static struct bat_algo_ops *bat_algo_get(char *name)
+static struct batadv_algo_ops *batadv_algo_get(char *name)
 {
-        struct bat_algo_ops *bat_algo_ops = NULL, *bat_algo_ops_tmp;
+        struct batadv_algo_ops *bat_algo_ops = NULL, *bat_algo_ops_tmp;
         struct hlist_node *node;
 
-        hlist_for_each_entry(bat_algo_ops_tmp, node, &bat_algo_list, list) {
+        hlist_for_each_entry(bat_algo_ops_tmp, node, &batadv_algo_list, list) {
                 if (strcmp(bat_algo_ops_tmp->name, name) != 0)
                         continue;
 
@@ -314,15 +324,16 @@ static struct bat_algo_ops *bat_algo_get(char *name)
         return bat_algo_ops;
 }
 
-int bat_algo_register(struct bat_algo_ops *bat_algo_ops)
+int batadv_algo_register(struct batadv_algo_ops *bat_algo_ops)
 {
-        struct bat_algo_ops *bat_algo_ops_tmp;
-        int ret = -1;
+        struct batadv_algo_ops *bat_algo_ops_tmp;
+        int ret;
 
-        bat_algo_ops_tmp = bat_algo_get(bat_algo_ops->name);
+        bat_algo_ops_tmp = batadv_algo_get(bat_algo_ops->name);
         if (bat_algo_ops_tmp) {
                 pr_info("Trying to register already registered routing algorithm: %s\n",
                         bat_algo_ops->name);
+                ret = -EEXIST;
                 goto out;
         }
 
@@ -335,23 +346,24 @@ int bat_algo_register(struct bat_algo_ops *bat_algo_ops)
             !bat_algo_ops->bat_ogm_emit) {
                 pr_info("Routing algo '%s' does not implement required ops\n",
                         bat_algo_ops->name);
+                ret = -EINVAL;
                 goto out;
         }
 
         INIT_HLIST_NODE(&bat_algo_ops->list);
-        hlist_add_head(&bat_algo_ops->list, &bat_algo_list);
+        hlist_add_head(&bat_algo_ops->list, &batadv_algo_list);
         ret = 0;
 
 out:
         return ret;
 }
 
-int bat_algo_select(struct bat_priv *bat_priv, char *name)
+int batadv_algo_select(struct batadv_priv *bat_priv, char *name)
 {
-        struct bat_algo_ops *bat_algo_ops;
-        int ret = -1;
+        struct batadv_algo_ops *bat_algo_ops;
+        int ret = -EINVAL;
 
-        bat_algo_ops = bat_algo_get(name);
+        bat_algo_ops = batadv_algo_get(name);
         if (!bat_algo_ops)
                 goto out;
 
@@ -362,50 +374,56 @@ out:
         return ret;
 }
 
-int bat_algo_seq_print_text(struct seq_file *seq, void *offset)
+int batadv_algo_seq_print_text(struct seq_file *seq, void *offset)
 {
-        struct bat_algo_ops *bat_algo_ops;
+        struct batadv_algo_ops *bat_algo_ops;
         struct hlist_node *node;
 
         seq_printf(seq, "Available routing algorithms:\n");
 
-        hlist_for_each_entry(bat_algo_ops, node, &bat_algo_list, list) {
+        hlist_for_each_entry(bat_algo_ops, node, &batadv_algo_list, list) {
                 seq_printf(seq, "%s\n", bat_algo_ops->name);
         }
 
         return 0;
 }
 
-static int param_set_ra(const char *val, const struct kernel_param *kp)
+static int batadv_param_set_ra(const char *val, const struct kernel_param *kp)
 {
-        struct bat_algo_ops *bat_algo_ops;
+        struct batadv_algo_ops *bat_algo_ops;
+        char *algo_name = (char *)val;
+        size_t name_len = strlen(algo_name);
+
+        if (algo_name[name_len - 1] == '\n')
+                algo_name[name_len - 1] = '\0';
 
-        bat_algo_ops = bat_algo_get((char *)val);
+        bat_algo_ops = batadv_algo_get(algo_name);
         if (!bat_algo_ops) {
-                pr_err("Routing algorithm '%s' is not supported\n", val);
+                pr_err("Routing algorithm '%s' is not supported\n", algo_name);
                 return -EINVAL;
         }
 
-        return param_set_copystring(val, kp);
+        return param_set_copystring(algo_name, kp);
 }
 
-static const struct kernel_param_ops param_ops_ra = {
-        .set = param_set_ra,
+static const struct kernel_param_ops batadv_param_ops_ra = {
+        .set = batadv_param_set_ra,
         .get = param_get_string,
 };
 
-static struct kparam_string __param_string_ra = {
-        .maxlen = sizeof(bat_routing_algo),
-        .string = bat_routing_algo,
+static struct kparam_string batadv_param_string_ra = {
+        .maxlen = sizeof(batadv_routing_algo),
+        .string = batadv_routing_algo,
 };
 
-module_param_cb(routing_algo, &param_ops_ra, &__param_string_ra, 0644);
-module_init(batman_init);
-module_exit(batman_exit);
+module_param_cb(routing_algo, &batadv_param_ops_ra, &batadv_param_string_ra,
+                0644);
+module_init(batadv_init);
+module_exit(batadv_exit);
 
 MODULE_LICENSE("GPL");
 
-MODULE_AUTHOR(DRIVER_AUTHOR);
-MODULE_DESCRIPTION(DRIVER_DESC);
-MODULE_SUPPORTED_DEVICE(DRIVER_DEVICE);
-MODULE_VERSION(SOURCE_VERSION);
+MODULE_AUTHOR(BATADV_DRIVER_AUTHOR);
+MODULE_DESCRIPTION(BATADV_DRIVER_DESC);
+MODULE_SUPPORTED_DEVICE(BATADV_DRIVER_DEVICE);
+MODULE_VERSION(BATADV_SOURCE_VERSION);
diff --git a/net/batman-adv/main.h b/net/batman-adv/main.h
index f4a3ec00347..5d8fa075794 100644
--- a/net/batman-adv/main.h
+++ b/net/batman-adv/main.h
@@ -1,5 +1,4 @@
-/*
- * Copyright (C) 2007-2012 B.A.T.M.A.N. contributors:
+/* Copyright (C) 2007-2012 B.A.T.M.A.N. contributors:
  *
  * Marek Lindner, Simon Wunderlich
  *
@@ -16,100 +15,106 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA
- *
  */
 
 #ifndef _NET_BATMAN_ADV_MAIN_H_
 #define _NET_BATMAN_ADV_MAIN_H_
 
-#define DRIVER_AUTHOR "Marek Lindner <lindner_marek@yahoo.de>, " \
-                      "Simon Wunderlich <siwu@hrz.tu-chemnitz.de>"
-#define DRIVER_DESC   "B.A.T.M.A.N. advanced"
-#define DRIVER_DEVICE "batman-adv"
+#define BATADV_DRIVER_AUTHOR "Marek Lindner <lindner_marek@yahoo.de>, " \
+                             "Simon Wunderlich <siwu@hrz.tu-chemnitz.de>"
+#define BATADV_DRIVER_DESC   "B.A.T.M.A.N. advanced"
+#define BATADV_DRIVER_DEVICE "batman-adv"
 
-#ifndef SOURCE_VERSION
-#define SOURCE_VERSION "2012.2.0"
+#ifndef BATADV_SOURCE_VERSION
+#define BATADV_SOURCE_VERSION "2012.3.0"
 #endif
 
 /* B.A.T.M.A.N. parameters */
 
-#define TQ_MAX_VALUE 255
-#define JITTER 20
+#define BATADV_TQ_MAX_VALUE 255
+#define BATADV_JITTER 20
 
- /* Time To Live of broadcast messages */
-#define TTL 50
+/* Time To Live of broadcast messages */
+#define BATADV_TTL 50
 
 /* purge originators after time in seconds if no valid packet comes in
- * -> TODO: check influence on TQ_LOCAL_WINDOW_SIZE */
-#define PURGE_TIMEOUT 200000 /* 200 seconds */
-#define TT_LOCAL_TIMEOUT 3600000 /* in miliseconds */
-#define TT_CLIENT_ROAM_TIMEOUT 600000 /* in miliseconds */
+ * -> TODO: check influence on BATADV_TQ_LOCAL_WINDOW_SIZE
+ */
+#define BATADV_PURGE_TIMEOUT 200000 /* 200 seconds */
+#define BATADV_TT_LOCAL_TIMEOUT 3600000 /* in miliseconds */
+#define BATADV_TT_CLIENT_ROAM_TIMEOUT 600000 /* in miliseconds */
 /* sliding packet range of received originator messages in sequence numbers
- * (should be a multiple of our word size) */
-#define TQ_LOCAL_WINDOW_SIZE 64
-#define TT_REQUEST_TIMEOUT 3000 /* miliseconds we have to keep
-                                 * pending tt_req */
+ * (should be a multiple of our word size)
+ */
+#define BATADV_TQ_LOCAL_WINDOW_SIZE 64
+/* miliseconds we have to keep pending tt_req */
+#define BATADV_TT_REQUEST_TIMEOUT 3000
 
-#define TQ_GLOBAL_WINDOW_SIZE 5
-#define TQ_LOCAL_BIDRECT_SEND_MINIMUM 1
-#define TQ_LOCAL_BIDRECT_RECV_MINIMUM 1
-#define TQ_TOTAL_BIDRECT_LIMIT 1
+#define BATADV_TQ_GLOBAL_WINDOW_SIZE 5
+#define BATADV_TQ_LOCAL_BIDRECT_SEND_MINIMUM 1
+#define BATADV_TQ_LOCAL_BIDRECT_RECV_MINIMUM 1
+#define BATADV_TQ_TOTAL_BIDRECT_LIMIT 1
 
-#define TT_OGM_APPEND_MAX 3 /* number of OGMs sent with the last tt diff */
+/* number of OGMs sent with the last tt diff */
+#define BATADV_TT_OGM_APPEND_MAX 3
 
-#define ROAMING_MAX_TIME 20000 /* Time in which a client can roam at most
-                                * ROAMING_MAX_COUNT times in miliseconds*/
-#define ROAMING_MAX_COUNT 5
+/* Time in which a client can roam at most ROAMING_MAX_COUNT times in
+ * miliseconds
+ */
+#define BATADV_ROAMING_MAX_TIME 20000
+#define BATADV_ROAMING_MAX_COUNT 5
 
-#define NO_FLAGS 0
+#define BATADV_NO_FLAGS 0
 
-#define NULL_IFINDEX 0 /* dummy ifindex used to avoid iface checks */
+#define BATADV_NULL_IFINDEX 0 /* dummy ifindex used to avoid iface checks */
 
-#define NUM_WORDS BITS_TO_LONGS(TQ_LOCAL_WINDOW_SIZE)
+#define BATADV_NUM_WORDS BITS_TO_LONGS(BATADV_TQ_LOCAL_WINDOW_SIZE)
 
-#define LOG_BUF_LEN 8192          /* has to be a power of 2 */
+#define BATADV_LOG_BUF_LEN 8192   /* has to be a power of 2 */
 
-#define VIS_INTERVAL 5000       /* 5 seconds */
+#define BATADV_VIS_INTERVAL 5000        /* 5 seconds */
 
 /* how much worse secondary interfaces may be to be considered as bonding
- * candidates */
-#define BONDING_TQ_THRESHOLD    50
+ * candidates
+ */
+#define BATADV_BONDING_TQ_THRESHOLD     50
 
 /* should not be bigger than 512 bytes or change the size of
- * forw_packet->direct_link_flags */
-#define MAX_AGGREGATION_BYTES 512
-#define MAX_AGGREGATION_MS 100
+ * forw_packet->direct_link_flags
+ */
+#define BATADV_MAX_AGGREGATION_BYTES 512
+#define BATADV_MAX_AGGREGATION_MS 100
 
-#define BLA_PERIOD_LENGTH       10000   /* 10 seconds */
-#define BLA_BACKBONE_TIMEOUT    (BLA_PERIOD_LENGTH * 3)
-#define BLA_CLAIM_TIMEOUT       (BLA_PERIOD_LENGTH * 10)
+#define BATADV_BLA_PERIOD_LENGTH        10000   /* 10 seconds */
+#define BATADV_BLA_BACKBONE_TIMEOUT     (BATADV_BLA_PERIOD_LENGTH * 3)
+#define BATADV_BLA_CLAIM_TIMEOUT        (BATADV_BLA_PERIOD_LENGTH * 10)
 
-#define DUPLIST_SIZE            16
-#define DUPLIST_TIMEOUT         500     /* 500 ms */
+#define BATADV_DUPLIST_SIZE             16
+#define BATADV_DUPLIST_TIMEOUT          500     /* 500 ms */
 /* don't reset again within 30 seconds */
-#define RESET_PROTECTION_MS 30000
-#define EXPECTED_SEQNO_RANGE    65536
+#define BATADV_RESET_PROTECTION_MS 30000
+#define BATADV_EXPECTED_SEQNO_RANGE     65536
 
-enum mesh_state {
-        MESH_INACTIVE,
-        MESH_ACTIVE,
-        MESH_DEACTIVATING
+enum batadv_mesh_state {
+        BATADV_MESH_INACTIVE,
+        BATADV_MESH_ACTIVE,
+        BATADV_MESH_DEACTIVATING,
 };
 
-#define BCAST_QUEUE_LEN         256
-#define BATMAN_QUEUE_LEN        256
+#define BATADV_BCAST_QUEUE_LEN          256
+#define BATADV_BATMAN_QUEUE_LEN 256
 
-enum uev_action {
-        UEV_ADD = 0,
-        UEV_DEL,
-        UEV_CHANGE
+enum batadv_uev_action {
+        BATADV_UEV_ADD = 0,
+        BATADV_UEV_DEL,
+        BATADV_UEV_CHANGE,
 };
 
-enum uev_type {
-        UEV_GW = 0
+enum batadv_uev_type {
+        BATADV_UEV_GW = 0,
 };
 
-#define GW_THRESHOLD    50
+#define BATADV_GW_THRESHOLD     50
 
 /* Debug Messages */
 #ifdef pr_fmt
@@ -119,12 +124,12 @@ enum uev_type {
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
 /* all messages related to routing / flooding / broadcasting / etc */
-enum dbg_level {
-        DBG_BATMAN = 1 << 0,
-        DBG_ROUTES = 1 << 1, /* route added / changed / deleted */
-        DBG_TT     = 1 << 2, /* translation table operations */
-        DBG_BLA    = 1 << 3, /* bridge loop avoidance */
-        DBG_ALL    = 15
+enum batadv_dbg_level {
+        BATADV_DBG_BATMAN = 1 << 0,
+        BATADV_DBG_ROUTES = 1 << 1, /* route added / changed / deleted */
+        BATADV_DBG_TT     = 1 << 2, /* translation table operations */
+        BATADV_DBG_BLA    = 1 << 3, /* bridge loop avoidance */
+        BATADV_DBG_ALL    = 15,
 };
 
 /* Kernel headers */
@@ -138,73 +143,75 @@ enum dbg_level {
 #include <linux/kthread.h>      /* kernel threads */
 #include <linux/pkt_sched.h>    /* schedule types */
 #include <linux/workqueue.h>    /* workqueue */
+#include <linux/percpu.h>
 #include <linux/slab.h>
 #include <net/sock.h>           /* struct sock */
 #include <linux/jiffies.h>
 #include <linux/seq_file.h>
 #include "types.h"
 
-extern char bat_routing_algo[];
-extern struct list_head hardif_list;
-
-extern unsigned char broadcast_addr[];
-extern struct workqueue_struct *bat_event_workqueue;
-
-int mesh_init(struct net_device *soft_iface);
-void mesh_free(struct net_device *soft_iface);
-void inc_module_count(void);
-void dec_module_count(void);
-int is_my_mac(const uint8_t *addr);
-int batman_skb_recv(struct sk_buff *skb, struct net_device *dev,
-                    struct packet_type *ptype, struct net_device *orig_dev);
-int recv_handler_register(uint8_t packet_type,
-                          int (*recv_handler)(struct sk_buff *,
-                                              struct hard_iface *));
-void recv_handler_unregister(uint8_t packet_type);
-int bat_algo_register(struct bat_algo_ops *bat_algo_ops);
-int bat_algo_select(struct bat_priv *bat_priv, char *name);
-int bat_algo_seq_print_text(struct seq_file *seq, void *offset);
+extern char batadv_routing_algo[];
+extern struct list_head batadv_hardif_list;
+
+extern unsigned char batadv_broadcast_addr[];
+extern struct workqueue_struct *batadv_event_workqueue;
+
+int batadv_mesh_init(struct net_device *soft_iface);
+void batadv_mesh_free(struct net_device *soft_iface);
+void batadv_inc_module_count(void);
+void batadv_dec_module_count(void);
+int batadv_is_my_mac(const uint8_t *addr);
+int batadv_batman_skb_recv(struct sk_buff *skb, struct net_device *dev,
+                           struct packet_type *ptype,
+                           struct net_device *orig_dev);
+int
+batadv_recv_handler_register(uint8_t packet_type,
+                             int (*recv_handler)(struct sk_buff *,
+                                                 struct batadv_hard_iface *));
+void batadv_recv_handler_unregister(uint8_t packet_type);
+int batadv_algo_register(struct batadv_algo_ops *bat_algo_ops);
+int batadv_algo_select(struct batadv_priv *bat_priv, char *name);
+int batadv_algo_seq_print_text(struct seq_file *seq, void *offset);
 
 #ifdef CONFIG_BATMAN_ADV_DEBUG
-int debug_log(struct bat_priv *bat_priv, const char *fmt, ...) __printf(2, 3);
+int batadv_debug_log(struct batadv_priv *bat_priv, const char *fmt, ...)
+__printf(2, 3);
 
-#define bat_dbg(type, bat_priv, fmt, arg...)                    \
+#define batadv_dbg(type, bat_priv, fmt, arg...)                 \
         do {                                                    \
                 if (atomic_read(&bat_priv->log_level) & type)   \
-                        debug_log(bat_priv, fmt, ## arg);       \
+                        batadv_debug_log(bat_priv, fmt, ## arg);\
         }                                                       \
         while (0)
 #else /* !CONFIG_BATMAN_ADV_DEBUG */
 __printf(3, 4)
-static inline void bat_dbg(int type __always_unused,
-                           struct bat_priv *bat_priv __always_unused,
-                           const char *fmt __always_unused, ...)
+static inline void batadv_dbg(int type __always_unused,
+                              struct batadv_priv *bat_priv __always_unused,
+                              const char *fmt __always_unused, ...)
 {
 }
 #endif
 
-#define bat_info(net_dev, fmt, arg...)                                  \
+#define batadv_info(net_dev, fmt, arg...)                               \
         do {                                                            \
                 struct net_device *_netdev = (net_dev);                 \
-                struct bat_priv *_batpriv = netdev_priv(_netdev);       \
-                bat_dbg(DBG_ALL, _batpriv, fmt, ## arg);                \
+                struct batadv_priv *_batpriv = netdev_priv(_netdev);    \
+                batadv_dbg(BATADV_DBG_ALL, _batpriv, fmt, ## arg);      \
                 pr_info("%s: " fmt, _netdev->name, ## arg);             \
         } while (0)
-#define bat_err(net_dev, fmt, arg...)                                   \
+#define batadv_err(net_dev, fmt, arg...)                                \
         do {                                                            \
                 struct net_device *_netdev = (net_dev);                 \
-                struct bat_priv *_batpriv = netdev_priv(_netdev);       \
-                bat_dbg(DBG_ALL, _batpriv, fmt, ## arg);                \
+                struct batadv_priv *_batpriv = netdev_priv(_netdev);    \
+                batadv_dbg(BATADV_DBG_ALL, _batpriv, fmt, ## arg);      \
                 pr_err("%s: " fmt, _netdev->name, ## arg);              \
         } while (0)
 
-/**
- * returns 1 if they are the same ethernet addr
+/* returns 1 if they are the same ethernet addr
  *
  * note: can't use compare_ether_addr() as it requires aligned memory
  */
-
-static inline int compare_eth(const void *data1, const void *data2)
+static inline int batadv_compare_eth(const void *data1, const void *data2)
 {
         return (memcmp(data1, data2, ETH_ALEN) == 0 ? 1 : 0);
 }
@@ -216,15 +223,16 @@ static inline int compare_eth(const void *data1, const void *data2)
  *
  * Returns true if current time is after timestamp + timeout
  */
-static inline bool has_timed_out(unsigned long timestamp, unsigned int timeout)
+static inline bool batadv_has_timed_out(unsigned long timestamp,
+                                        unsigned int timeout)
 {
         return time_is_before_jiffies(timestamp + msecs_to_jiffies(timeout));
 }
 
-#define atomic_dec_not_zero(v)  atomic_add_unless((v), -1, 0)
+#define batadv_atomic_dec_not_zero(v)   atomic_add_unless((v), -1, 0)
 
 /* Returns the smallest signed integer in two's complement with the sizeof x */
-#define smallest_signed_int(x) (1u << (7u + 8u * (sizeof(x) - 1u)))
+#define batadv_smallest_signed_int(x) (1u << (7u + 8u * (sizeof(x) - 1u)))
 
 /* Checks if a sequence number x is a predecessor/successor of y.
  * they handle overflows/underflows and can correctly check for a
@@ -234,12 +242,39 @@ static inline bool has_timed_out(unsigned long timestamp, unsigned int timeout)
  *  - when adding nothing - it is neither a predecessor nor a successor
  *  - before adding more than 127 to the starting value - it is a predecessor,
  *  - when adding 128 - it is neither a predecessor nor a successor,
- *  - after adding more than 127 to the starting value - it is a successor */
-#define seq_before(x, y) ({typeof(x) _d1 = (x); \
-                          typeof(y) _d2 = (y); \
-                          typeof(x) _dummy = (_d1 - _d2); \
-                          (void) (&_d1 == &_d2); \
-                          _dummy > smallest_signed_int(_dummy); })
-#define seq_after(x, y) seq_before(y, x)
+ *  - after adding more than 127 to the starting value - it is a successor
+ */
+#define batadv_seq_before(x, y) ({typeof(x) _d1 = (x); \
+                                 typeof(y) _d2 = (y); \
+                                 typeof(x) _dummy = (_d1 - _d2); \
+                                 (void) (&_d1 == &_d2); \
+                                 _dummy > batadv_smallest_signed_int(_dummy); })
+#define batadv_seq_after(x, y) batadv_seq_before(y, x)
+
+/* Stop preemption on local cpu while incrementing the counter */
+static inline void batadv_add_counter(struct batadv_priv *bat_priv, size_t idx,
+                                      size_t count)
+{
+        int cpu = get_cpu();
+        per_cpu_ptr(bat_priv->bat_counters, cpu)[idx] += count;
+        put_cpu();
+}
+
+#define batadv_inc_counter(b, i) batadv_add_counter(b, i, 1)
+
+/* Sum and return the cpu-local counters for index 'idx' */
+static inline uint64_t batadv_sum_counter(struct batadv_priv *bat_priv,
+                                          size_t idx)
+{
+        uint64_t *counters, sum = 0;
+        int cpu;
+
+        for_each_possible_cpu(cpu) {
+                counters = per_cpu_ptr(bat_priv->bat_counters, cpu);
+                sum += counters[idx];
+        }
+
+        return sum;
+}
 
 #endif /* _NET_BATMAN_ADV_MAIN_H_ */
diff --git a/net/batman-adv/originator.c b/net/batman-adv/originator.c
index 41147942ba5..ac9bdf8f80a 100644
--- a/net/batman-adv/originator.c
+++ b/net/batman-adv/originator.c
@@ -1,5 +1,4 @@
-/*
- * Copyright (C) 2009-2012 B.A.T.M.A.N. contributors:
+/* Copyright (C) 2009-2012 B.A.T.M.A.N. contributors:
  *
  * Marek Lindner, Simon Wunderlich
  *
@@ -16,7 +15,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA
- *
  */
 
 #include "main.h"
@@ -30,50 +28,52 @@
 #include "soft-interface.h"
 #include "bridge_loop_avoidance.h"
 
-static void purge_orig(struct work_struct *work);
+static void batadv_purge_orig(struct work_struct *work);
 
-static void start_purge_timer(struct bat_priv *bat_priv)
+static void batadv_start_purge_timer(struct batadv_priv *bat_priv)
 {
-        INIT_DELAYED_WORK(&bat_priv->orig_work, purge_orig);
-        queue_delayed_work(bat_event_workqueue,
+        INIT_DELAYED_WORK(&bat_priv->orig_work, batadv_purge_orig);
+        queue_delayed_work(batadv_event_workqueue,
                            &bat_priv->orig_work, msecs_to_jiffies(1000));
 }
 
 /* returns 1 if they are the same originator */
-static int compare_orig(const struct hlist_node *node, const void *data2)
+static int batadv_compare_orig(const struct hlist_node *node, const void *data2)
 {
-        const void *data1 = container_of(node, struct orig_node, hash_entry);
+        const void *data1 = container_of(node, struct batadv_orig_node,
+                                         hash_entry);
 
         return (memcmp(data1, data2, ETH_ALEN) == 0 ? 1 : 0);
 }
 
-int originator_init(struct bat_priv *bat_priv)
+int batadv_originator_init(struct batadv_priv *bat_priv)
 {
         if (bat_priv->orig_hash)
-                return 1;
+                return 0;
 
-        bat_priv->orig_hash = hash_new(1024);
+        bat_priv->orig_hash = batadv_hash_new(1024);
 
         if (!bat_priv->orig_hash)
                 goto err;
 
-        start_purge_timer(bat_priv);
-        return 1;
+        batadv_start_purge_timer(bat_priv);
+        return 0;
 
 err:
-        return 0;
+        return -ENOMEM;
 }
 
-void neigh_node_free_ref(struct neigh_node *neigh_node)
+void batadv_neigh_node_free_ref(struct batadv_neigh_node *neigh_node)
 {
         if (atomic_dec_and_test(&neigh_node->refcount))
                 kfree_rcu(neigh_node, rcu);
 }
 
 /* increases the refcounter of a found router */
-struct neigh_node *orig_node_get_router(struct orig_node *orig_node)
+struct batadv_neigh_node *
+batadv_orig_node_get_router(struct batadv_orig_node *orig_node)
 {
-        struct neigh_node *router;
+        struct batadv_neigh_node *router;
 
         rcu_read_lock();
         router = rcu_dereference(orig_node->router);
@@ -85,12 +85,12 @@ struct neigh_node *orig_node_get_router(struct orig_node *orig_node)
         return router;
 }
 
-struct neigh_node *batadv_neigh_node_new(struct hard_iface *hard_iface,
-                                         const uint8_t *neigh_addr,
-                                         uint32_t seqno)
+struct batadv_neigh_node *
+batadv_neigh_node_new(struct batadv_hard_iface *hard_iface,
+                      const uint8_t *neigh_addr, uint32_t seqno)
 {
-        struct bat_priv *bat_priv = netdev_priv(hard_iface->soft_iface);
-        struct neigh_node *neigh_node;
+        struct batadv_priv *bat_priv = netdev_priv(hard_iface->soft_iface);
+        struct batadv_neigh_node *neigh_node;
 
         neigh_node = kzalloc(sizeof(*neigh_node), GFP_ATOMIC);
         if (!neigh_node)
@@ -104,21 +104,21 @@ struct neigh_node *batadv_neigh_node_new(struct hard_iface *hard_iface,
         /* extra reference for return */
         atomic_set(&neigh_node->refcount, 2);
 
-        bat_dbg(DBG_BATMAN, bat_priv,
-                "Creating new neighbor %pM, initial seqno %d\n",
-                neigh_addr, seqno);
+        batadv_dbg(BATADV_DBG_BATMAN, bat_priv,
+                   "Creating new neighbor %pM, initial seqno %d\n",
+                   neigh_addr, seqno);
 
 out:
         return neigh_node;
 }
 
-static void orig_node_free_rcu(struct rcu_head *rcu)
+static void batadv_orig_node_free_rcu(struct rcu_head *rcu)
 {
         struct hlist_node *node, *node_tmp;
-        struct neigh_node *neigh_node, *tmp_neigh_node;
-        struct orig_node *orig_node;
+        struct batadv_neigh_node *neigh_node, *tmp_neigh_node;
+        struct batadv_orig_node *orig_node;
 
-        orig_node = container_of(rcu, struct orig_node, rcu);
+        orig_node = container_of(rcu, struct batadv_orig_node, rcu);
 
         spin_lock_bh(&orig_node->neigh_list_lock);
 
@@ -126,21 +126,21 @@ static void orig_node_free_rcu(struct rcu_head *rcu)
         list_for_each_entry_safe(neigh_node, tmp_neigh_node,
                                  &orig_node->bond_list, bonding_list) {
                 list_del_rcu(&neigh_node->bonding_list);
-                neigh_node_free_ref(neigh_node);
+                batadv_neigh_node_free_ref(neigh_node);
         }
 
         /* for all neighbors towards this originator ... */
         hlist_for_each_entry_safe(neigh_node, node, node_tmp,
                                   &orig_node->neigh_list, list) {
                 hlist_del_rcu(&neigh_node->list);
-                neigh_node_free_ref(neigh_node);
+                batadv_neigh_node_free_ref(neigh_node);
         }
 
         spin_unlock_bh(&orig_node->neigh_list_lock);
 
-        frag_list_free(&orig_node->frag_list);
-        tt_global_del_orig(orig_node->bat_priv, orig_node,
-                           "originator timed out");
+        batadv_frag_list_free(&orig_node->frag_list);
+        batadv_tt_global_del_orig(orig_node->bat_priv, orig_node,
+                                  "originator timed out");
 
         kfree(orig_node->tt_buff);
         kfree(orig_node->bcast_own);
@@ -148,19 +148,19 @@ static void orig_node_free_rcu(struct rcu_head *rcu)
         kfree(orig_node);
 }
 
-void orig_node_free_ref(struct orig_node *orig_node)
+void batadv_orig_node_free_ref(struct batadv_orig_node *orig_node)
 {
         if (atomic_dec_and_test(&orig_node->refcount))
-                call_rcu(&orig_node->rcu, orig_node_free_rcu);
+                call_rcu(&orig_node->rcu, batadv_orig_node_free_rcu);
 }
 
-void originator_free(struct bat_priv *bat_priv)
+void batadv_originator_free(struct batadv_priv *bat_priv)
 {
-        struct hashtable_t *hash = bat_priv->orig_hash;
+        struct batadv_hashtable *hash = bat_priv->orig_hash;
         struct hlist_node *node, *node_tmp;
         struct hlist_head *head;
         spinlock_t *list_lock; /* spinlock to protect write access */
-        struct orig_node *orig_node;
+        struct batadv_orig_node *orig_node;
         uint32_t i;
 
         if (!hash)
@@ -179,28 +179,31 @@ void originator_free(struct bat_priv *bat_priv)
                                           head, hash_entry) {
 
                         hlist_del_rcu(node);
-                        orig_node_free_ref(orig_node);
+                        batadv_orig_node_free_ref(orig_node);
                 }
                 spin_unlock_bh(list_lock);
         }
 
-        hash_destroy(hash);
+        batadv_hash_destroy(hash);
 }
 
 /* this function finds or creates an originator entry for the given
- * address if it does not exits */
-struct orig_node *get_orig_node(struct bat_priv *bat_priv, const uint8_t *addr)
+ * address if it does not exits
+ */
+struct batadv_orig_node *batadv_get_orig_node(struct batadv_priv *bat_priv,
+                                              const uint8_t *addr)
 {
-        struct orig_node *orig_node;
+        struct batadv_orig_node *orig_node;
         int size;
         int hash_added;
+        unsigned long reset_time;
 
-        orig_node = orig_hash_find(bat_priv, addr);
+        orig_node = batadv_orig_hash_find(bat_priv, addr);
         if (orig_node)
                 return orig_node;
 
-        bat_dbg(DBG_BATMAN, bat_priv,
-                "Creating new originator: %pM\n", addr);
+        batadv_dbg(BATADV_DBG_BATMAN, bat_priv,
+                   "Creating new originator: %pM\n", addr);
 
         orig_node = kzalloc(sizeof(*orig_node), GFP_ATOMIC);
         if (!orig_node)
@@ -226,14 +229,13 @@ struct orig_node *get_orig_node(struct bat_priv *bat_priv, const uint8_t *addr)
         orig_node->tt_buff = NULL;
         orig_node->tt_buff_len = 0;
         atomic_set(&orig_node->tt_size, 0);
-        orig_node->bcast_seqno_reset = jiffies - 1
-                                        - msecs_to_jiffies(RESET_PROTECTION_MS);
-        orig_node->batman_seqno_reset = jiffies - 1
-                                        - msecs_to_jiffies(RESET_PROTECTION_MS);
+        reset_time = jiffies - 1 - msecs_to_jiffies(BATADV_RESET_PROTECTION_MS);
+        orig_node->bcast_seqno_reset = reset_time;
+        orig_node->batman_seqno_reset = reset_time;
 
         atomic_set(&orig_node->bond_candidates, 0);
 
-        size = bat_priv->num_ifaces * sizeof(unsigned long) * NUM_WORDS;
+        size = bat_priv->num_ifaces * sizeof(unsigned long) * BATADV_NUM_WORDS;
 
         orig_node->bcast_own = kzalloc(size, GFP_ATOMIC);
         if (!orig_node->bcast_own)
@@ -248,8 +250,9 @@ struct orig_node *get_orig_node(struct bat_priv *bat_priv, const uint8_t *addr)
         if (!orig_node->bcast_own_sum)
                 goto free_bcast_own;
 
-        hash_added = hash_add(bat_priv->orig_hash, compare_orig,
-                              choose_orig, orig_node, &orig_node->hash_entry);
+        hash_added = batadv_hash_add(bat_priv->orig_hash, batadv_compare_orig,
+                                     batadv_choose_orig, orig_node,
+                                     &orig_node->hash_entry);
         if (hash_added != 0)
                 goto free_bcast_own_sum;
 
@@ -263,14 +266,16 @@ free_orig_node:
         return NULL;
 }
 
-static bool purge_orig_neighbors(struct bat_priv *bat_priv,
-                                 struct orig_node *orig_node,
-                                 struct neigh_node **best_neigh_node)
+static bool
+batadv_purge_orig_neighbors(struct batadv_priv *bat_priv,
+                            struct batadv_orig_node *orig_node,
+                            struct batadv_neigh_node **best_neigh_node)
 {
         struct hlist_node *node, *node_tmp;
-        struct neigh_node *neigh_node;
+        struct batadv_neigh_node *neigh_node;
         bool neigh_purged = false;
         unsigned long last_seen;
+        struct batadv_hard_iface *if_incoming;
 
         *best_neigh_node = NULL;
 
@@ -280,34 +285,32 @@ static bool purge_orig_neighbors(struct bat_priv *bat_priv,
         hlist_for_each_entry_safe(neigh_node, node, node_tmp,
                                   &orig_node->neigh_list, list) {
 
-                if ((has_timed_out(neigh_node->last_seen, PURGE_TIMEOUT)) ||
-                    (neigh_node->if_incoming->if_status == IF_INACTIVE) ||
-                    (neigh_node->if_incoming->if_status == IF_NOT_IN_USE) ||
-                    (neigh_node->if_incoming->if_status == IF_TO_BE_REMOVED)) {
-
-                        last_seen = neigh_node->last_seen;
-
-                        if ((neigh_node->if_incoming->if_status ==
-                                                                IF_INACTIVE) ||
-                            (neigh_node->if_incoming->if_status ==
-                                                        IF_NOT_IN_USE) ||
-                            (neigh_node->if_incoming->if_status ==
-                                                        IF_TO_BE_REMOVED))
-                                bat_dbg(DBG_BATMAN, bat_priv,
-                                        "neighbor purge: originator %pM, neighbor: %pM, iface: %s\n",
-                                        orig_node->orig, neigh_node->addr,
-                                        neigh_node->if_incoming->net_dev->name);
+                last_seen = neigh_node->last_seen;
+                if_incoming = neigh_node->if_incoming;
+
+                if ((batadv_has_timed_out(last_seen, BATADV_PURGE_TIMEOUT)) ||
+                    (if_incoming->if_status == BATADV_IF_INACTIVE) ||
+                    (if_incoming->if_status == BATADV_IF_NOT_IN_USE) ||
+                    (if_incoming->if_status == BATADV_IF_TO_BE_REMOVED)) {
+
+                        if ((if_incoming->if_status == BATADV_IF_INACTIVE) ||
+                            (if_incoming->if_status == BATADV_IF_NOT_IN_USE) ||
+                            (if_incoming->if_status == BATADV_IF_TO_BE_REMOVED))
+                                batadv_dbg(BATADV_DBG_BATMAN, bat_priv,
+                                           "neighbor purge: originator %pM, neighbor: %pM, iface: %s\n",
+                                           orig_node->orig, neigh_node->addr,
+                                           if_incoming->net_dev->name);
                         else
-                                bat_dbg(DBG_BATMAN, bat_priv,
-                                        "neighbor timeout: originator %pM, neighbor: %pM, last_seen: %u\n",
-                                        orig_node->orig, neigh_node->addr,
-                                        jiffies_to_msecs(last_seen));
+                                batadv_dbg(BATADV_DBG_BATMAN, bat_priv,
+                                           "neighbor timeout: originator %pM, neighbor: %pM, last_seen: %u\n",
+                                           orig_node->orig, neigh_node->addr,
+                                           jiffies_to_msecs(last_seen));
 
                         neigh_purged = true;
 
                         hlist_del_rcu(&neigh_node->list);
-                        bonding_candidate_del(orig_node, neigh_node);
-                        neigh_node_free_ref(neigh_node);
+                        batadv_bonding_candidate_del(orig_node, neigh_node);
+                        batadv_neigh_node_free_ref(neigh_node);
                 } else {
                         if ((!*best_neigh_node) ||
                             (neigh_node->tq_avg > (*best_neigh_node)->tq_avg))
@@ -319,33 +322,35 @@ static bool purge_orig_neighbors(struct bat_priv *bat_priv,
         return neigh_purged;
 }
 
-static bool purge_orig_node(struct bat_priv *bat_priv,
-                            struct orig_node *orig_node)
+static bool batadv_purge_orig_node(struct batadv_priv *bat_priv,
+                                   struct batadv_orig_node *orig_node)
 {
-        struct neigh_node *best_neigh_node;
-
-        if (has_timed_out(orig_node->last_seen, 2 * PURGE_TIMEOUT)) {
-                bat_dbg(DBG_BATMAN, bat_priv,
-                        "Originator timeout: originator %pM, last_seen %u\n",
-                        orig_node->orig,
-                        jiffies_to_msecs(orig_node->last_seen));
+        struct batadv_neigh_node *best_neigh_node;
+
+        if (batadv_has_timed_out(orig_node->last_seen,
+                                 2 * BATADV_PURGE_TIMEOUT)) {
+                batadv_dbg(BATADV_DBG_BATMAN, bat_priv,
+                           "Originator timeout: originator %pM, last_seen %u\n",
+                           orig_node->orig,
+                           jiffies_to_msecs(orig_node->last_seen));
                 return true;
         } else {
-                if (purge_orig_neighbors(bat_priv, orig_node,
-                                         &best_neigh_node))
-                        update_route(bat_priv, orig_node, best_neigh_node);
+                if (batadv_purge_orig_neighbors(bat_priv, orig_node,
+                                                &best_neigh_node))
+                        batadv_update_route(bat_priv, orig_node,
+                                            best_neigh_node);
         }
 
         return false;
 }
 
-static void _purge_orig(struct bat_priv *bat_priv)
+static void _batadv_purge_orig(struct batadv_priv *bat_priv)
 {
-        struct hashtable_t *hash = bat_priv->orig_hash;
+        struct batadv_hashtable *hash = bat_priv->orig_hash;
         struct hlist_node *node, *node_tmp;
         struct hlist_head *head;
         spinlock_t *list_lock; /* spinlock to protect write access */
-        struct orig_node *orig_node;
+        struct batadv_orig_node *orig_node;
         uint32_t i;
 
         if (!hash)
@@ -359,58 +364,60 @@ static void _purge_orig(struct bat_priv *bat_priv)
                 spin_lock_bh(list_lock);
                 hlist_for_each_entry_safe(orig_node, node, node_tmp,
                                           head, hash_entry) {
-                        if (purge_orig_node(bat_priv, orig_node)) {
+                        if (batadv_purge_orig_node(bat_priv, orig_node)) {
                                 if (orig_node->gw_flags)
-                                        gw_node_delete(bat_priv, orig_node);
+                                        batadv_gw_node_delete(bat_priv,
+                                                              orig_node);
                                 hlist_del_rcu(node);
-                                orig_node_free_ref(orig_node);
+                                batadv_orig_node_free_ref(orig_node);
                                 continue;
                         }
 
-                        if (has_timed_out(orig_node->last_frag_packet,
-                                          FRAG_TIMEOUT))
-                                frag_list_free(&orig_node->frag_list);
+                        if (batadv_has_timed_out(orig_node->last_frag_packet,
+                                                 BATADV_FRAG_TIMEOUT))
+                                batadv_frag_list_free(&orig_node->frag_list);
                 }
                 spin_unlock_bh(list_lock);
         }
 
-        gw_node_purge(bat_priv);
-        gw_election(bat_priv);
+        batadv_gw_node_purge(bat_priv);
+        batadv_gw_election(bat_priv);
 }
 
-static void purge_orig(struct work_struct *work)
+static void batadv_purge_orig(struct work_struct *work)
 {
-        struct delayed_work *delayed_work =
-                container_of(work, struct delayed_work, work);
-        struct bat_priv *bat_priv =
-                container_of(delayed_work, struct bat_priv, orig_work);
+        struct delayed_work *delayed_work;
+        struct batadv_priv *bat_priv;
 
-        _purge_orig(bat_priv);
-        start_purge_timer(bat_priv);
+        delayed_work = container_of(work, struct delayed_work, work);
+        bat_priv = container_of(delayed_work, struct batadv_priv, orig_work);
+        _batadv_purge_orig(bat_priv);
+        batadv_start_purge_timer(bat_priv);
 }
 
-void purge_orig_ref(struct bat_priv *bat_priv)
+void batadv_purge_orig_ref(struct batadv_priv *bat_priv)
 {
-        _purge_orig(bat_priv);
+        _batadv_purge_orig(bat_priv);
 }
 
-int orig_seq_print_text(struct seq_file *seq, void *offset)
+int batadv_orig_seq_print_text(struct seq_file *seq, void *offset)
 {
         struct net_device *net_dev = (struct net_device *)seq->private;
-        struct bat_priv *bat_priv = netdev_priv(net_dev);
-        struct hashtable_t *hash = bat_priv->orig_hash;
+        struct batadv_priv *bat_priv = netdev_priv(net_dev);
+        struct batadv_hashtable *hash = bat_priv->orig_hash;
         struct hlist_node *node, *node_tmp;
         struct hlist_head *head;
-        struct hard_iface *primary_if;
-        struct orig_node *orig_node;
-        struct neigh_node *neigh_node, *neigh_node_tmp;
+        struct batadv_hard_iface *primary_if;
+        struct batadv_orig_node *orig_node;
+        struct batadv_neigh_node *neigh_node, *neigh_node_tmp;
         int batman_count = 0;
         int last_seen_secs;
         int last_seen_msecs;
+        unsigned long last_seen_jiffies;
         uint32_t i;
         int ret = 0;
 
-        primary_if = primary_if_get_selected(bat_priv);
+        primary_if = batadv_primary_if_get_selected(bat_priv);
 
         if (!primary_if) {
                 ret = seq_printf(seq,
@@ -419,7 +426,7 @@ int orig_seq_print_text(struct seq_file *seq, void *offset)
                 goto out;
         }
 
-        if (primary_if->if_status != IF_ACTIVE) {
+        if (primary_if->if_status != BATADV_IF_ACTIVE) {
                 ret = seq_printf(seq,
                                  "BATMAN mesh %s disabled - primary interface not active\n",
                                  net_dev->name);
@@ -427,28 +434,28 @@ int orig_seq_print_text(struct seq_file *seq, void *offset)
         }
 
         seq_printf(seq, "[B.A.T.M.A.N. adv %s, MainIF/MAC: %s/%pM (%s)]\n",
-                   SOURCE_VERSION, primary_if->net_dev->name,
+                   BATADV_SOURCE_VERSION, primary_if->net_dev->name,
                    primary_if->net_dev->dev_addr, net_dev->name);
         seq_printf(seq, "  %-15s %s (%s/%i) %17s [%10s]: %20s ...\n",
-                   "Originator", "last-seen", "#", TQ_MAX_VALUE, "Nexthop",
-                   "outgoingIF", "Potential nexthops");
+                   "Originator", "last-seen", "#", BATADV_TQ_MAX_VALUE,
+                   "Nexthop", "outgoingIF", "Potential nexthops");
 
         for (i = 0; i < hash->size; i++) {
                 head = &hash->table[i];
 
                 rcu_read_lock();
                 hlist_for_each_entry_rcu(orig_node, node, head, hash_entry) {
-                        neigh_node = orig_node_get_router(orig_node);
+                        neigh_node = batadv_orig_node_get_router(orig_node);
                         if (!neigh_node)
                                 continue;
 
                         if (neigh_node->tq_avg == 0)
                                 goto next;
 
-                        last_seen_secs = jiffies_to_msecs(jiffies -
-                                                orig_node->last_seen) / 1000;
-                        last_seen_msecs = jiffies_to_msecs(jiffies -
-                                                orig_node->last_seen) % 1000;
+                        last_seen_jiffies = jiffies - orig_node->last_seen;
+                        last_seen_msecs = jiffies_to_msecs(last_seen_jiffies);
+                        last_seen_secs = last_seen_msecs / 1000;
+                        last_seen_msecs = last_seen_msecs % 1000;
 
                         seq_printf(seq, "%pM %4i.%03is   (%3i) %pM [%10s]:",
                                    orig_node->orig, last_seen_secs,
@@ -467,7 +474,7 @@ int orig_seq_print_text(struct seq_file *seq, void *offset)
                         batman_count++;
 
 next:
-                        neigh_node_free_ref(neigh_node);
+                        batadv_neigh_node_free_ref(neigh_node);
                 }
                 rcu_read_unlock();
         }
@@ -477,27 +484,29 @@ next:
 
 out:
         if (primary_if)
-                hardif_free_ref(primary_if);
+                batadv_hardif_free_ref(primary_if);
         return ret;
 }
 
-static int orig_node_add_if(struct orig_node *orig_node, int max_if_num)
+static int batadv_orig_node_add_if(struct batadv_orig_node *orig_node,
+                                   int max_if_num)
 {
         void *data_ptr;
+        size_t data_size, old_size;
 
-        data_ptr = kmalloc(max_if_num * sizeof(unsigned long) * NUM_WORDS,
-                           GFP_ATOMIC);
+        data_size = max_if_num * sizeof(unsigned long) * BATADV_NUM_WORDS;
+        old_size = (max_if_num - 1) * sizeof(unsigned long) * BATADV_NUM_WORDS;
+        data_ptr = kmalloc(data_size, GFP_ATOMIC);
         if (!data_ptr)
-                return -1;
+                return -ENOMEM;
 
-        memcpy(data_ptr, orig_node->bcast_own,
-               (max_if_num - 1) * sizeof(unsigned long) * NUM_WORDS);
+        memcpy(data_ptr, orig_node->bcast_own, old_size);
         kfree(orig_node->bcast_own);
         orig_node->bcast_own = data_ptr;
 
         data_ptr = kmalloc(max_if_num * sizeof(uint8_t), GFP_ATOMIC);
         if (!data_ptr)
-                return -1;
+                return -ENOMEM;
 
         memcpy(data_ptr, orig_node->bcast_own_sum,
                (max_if_num - 1) * sizeof(uint8_t));
@@ -507,28 +516,30 @@ static int orig_node_add_if(struct orig_node *orig_node, int max_if_num)
         return 0;
 }
 
-int orig_hash_add_if(struct hard_iface *hard_iface, int max_if_num)
+int batadv_orig_hash_add_if(struct batadv_hard_iface *hard_iface,
+                            int max_if_num)
 {
-        struct bat_priv *bat_priv = netdev_priv(hard_iface->soft_iface);
-        struct hashtable_t *hash = bat_priv->orig_hash;
+        struct batadv_priv *bat_priv = netdev_priv(hard_iface->soft_iface);
+        struct batadv_hashtable *hash = bat_priv->orig_hash;
         struct hlist_node *node;
         struct hlist_head *head;
-        struct orig_node *orig_node;
+        struct batadv_orig_node *orig_node;
         uint32_t i;
         int ret;
 
         /* resize all orig nodes because orig_node->bcast_own(_sum) depend on
-         * if_num */
+         * if_num
+         */
         for (i = 0; i < hash->size; i++) {
                 head = &hash->table[i];
 
                 rcu_read_lock();
                 hlist_for_each_entry_rcu(orig_node, node, head, hash_entry) {
                         spin_lock_bh(&orig_node->ogm_cnt_lock);
-                        ret = orig_node_add_if(orig_node, max_if_num);
+                        ret = batadv_orig_node_add_if(orig_node, max_if_num);
                         spin_unlock_bh(&orig_node->ogm_cnt_lock);
 
-                        if (ret == -1)
+                        if (ret == -ENOMEM)
                                 goto err;
                 }
                 rcu_read_unlock();
@@ -541,8 +552,8 @@ err:
         return -ENOMEM;
 }
 
-static int orig_node_del_if(struct orig_node *orig_node,
-                     int max_if_num, int del_if_num)
+static int batadv_orig_node_del_if(struct batadv_orig_node *orig_node,
+                                   int max_if_num, int del_if_num)
 {
         void *data_ptr = NULL;
         int chunk_size;
@@ -551,10 +562,10 @@ static int orig_node_del_if(struct orig_node *orig_node,
         if (max_if_num == 0)
                 goto free_bcast_own;
 
-        chunk_size = sizeof(unsigned long) * NUM_WORDS;
+        chunk_size = sizeof(unsigned long) * BATADV_NUM_WORDS;
         data_ptr = kmalloc(max_if_num * chunk_size, GFP_ATOMIC);
         if (!data_ptr)
-                return -1;
+                return -ENOMEM;
 
         /* copy first part */
         memcpy(data_ptr, orig_node->bcast_own, del_if_num * chunk_size);
@@ -573,7 +584,7 @@ free_bcast_own:
 
         data_ptr = kmalloc(max_if_num * sizeof(uint8_t), GFP_ATOMIC);
         if (!data_ptr)
-                return -1;
+                return -ENOMEM;
 
         memcpy(data_ptr, orig_node->bcast_own_sum,
                del_if_num * sizeof(uint8_t));
@@ -589,30 +600,32 @@ free_own_sum:
         return 0;
 }
 
-int orig_hash_del_if(struct hard_iface *hard_iface, int max_if_num)
+int batadv_orig_hash_del_if(struct batadv_hard_iface *hard_iface,
+                            int max_if_num)
 {
-        struct bat_priv *bat_priv = netdev_priv(hard_iface->soft_iface);
-        struct hashtable_t *hash = bat_priv->orig_hash;
+        struct batadv_priv *bat_priv = netdev_priv(hard_iface->soft_iface);
+        struct batadv_hashtable *hash = bat_priv->orig_hash;
         struct hlist_node *node;
         struct hlist_head *head;
-        struct hard_iface *hard_iface_tmp;
-        struct orig_node *orig_node;
+        struct batadv_hard_iface *hard_iface_tmp;
+        struct batadv_orig_node *orig_node;
         uint32_t i;
         int ret;
 
         /* resize all orig nodes because orig_node->bcast_own(_sum) depend on
-         * if_num */
+         * if_num
+         */
         for (i = 0; i < hash->size; i++) {
                 head = &hash->table[i];
 
                 rcu_read_lock();
                 hlist_for_each_entry_rcu(orig_node, node, head, hash_entry) {
                         spin_lock_bh(&orig_node->ogm_cnt_lock);
-                        ret = orig_node_del_if(orig_node, max_if_num,
-                                        hard_iface->if_num);
+                        ret = batadv_orig_node_del_if(orig_node, max_if_num,
+                                                      hard_iface->if_num);
                         spin_unlock_bh(&orig_node->ogm_cnt_lock);
 
-                        if (ret == -1)
+                        if (ret == -ENOMEM)
                                 goto err;
                 }
                 rcu_read_unlock();
@@ -620,8 +633,8 @@ int orig_hash_del_if(struct hard_iface *hard_iface, int max_if_num)
 
         /* renumber remaining batman interfaces _inside_ of orig_hash_lock */
         rcu_read_lock();
-        list_for_each_entry_rcu(hard_iface_tmp, &hardif_list, list) {
-                if (hard_iface_tmp->if_status == IF_NOT_IN_USE)
+        list_for_each_entry_rcu(hard_iface_tmp, &batadv_hardif_list, list) {
+                if (hard_iface_tmp->if_status == BATADV_IF_NOT_IN_USE)
                         continue;
 
                 if (hard_iface == hard_iface_tmp)
diff --git a/net/batman-adv/originator.h b/net/batman-adv/originator.h
index f74d0d69335..9778e656dec 100644
--- a/net/batman-adv/originator.h
+++ b/net/batman-adv/originator.h
@@ -1,5 +1,4 @@
-/*
- * Copyright (C) 2007-2012 B.A.T.M.A.N. contributors:
+/* Copyright (C) 2007-2012 B.A.T.M.A.N. contributors:
  *
  * Marek Lindner, Simon Wunderlich
  *
@@ -16,7 +15,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA
- *
  */
 
 #ifndef _NET_BATMAN_ADV_ORIGINATOR_H_
@@ -24,24 +22,29 @@
 
 #include "hash.h"
 
-int originator_init(struct bat_priv *bat_priv);
-void originator_free(struct bat_priv *bat_priv);
-void purge_orig_ref(struct bat_priv *bat_priv);
-void orig_node_free_ref(struct orig_node *orig_node);
-struct orig_node *get_orig_node(struct bat_priv *bat_priv, const uint8_t *addr);
-struct neigh_node *batadv_neigh_node_new(struct hard_iface *hard_iface,
-                                         const uint8_t *neigh_addr,
-                                         uint32_t seqno);
-void neigh_node_free_ref(struct neigh_node *neigh_node);
-struct neigh_node *orig_node_get_router(struct orig_node *orig_node);
-int orig_seq_print_text(struct seq_file *seq, void *offset);
-int orig_hash_add_if(struct hard_iface *hard_iface, int max_if_num);
-int orig_hash_del_if(struct hard_iface *hard_iface, int max_if_num);
-
-
-/* hashfunction to choose an entry in a hash table of given size */
-/* hash algorithm from http://en.wikipedia.org/wiki/Hash_table */
-static inline uint32_t choose_orig(const void *data, uint32_t size)
+int batadv_originator_init(struct batadv_priv *bat_priv);
+void batadv_originator_free(struct batadv_priv *bat_priv);
+void batadv_purge_orig_ref(struct batadv_priv *bat_priv);
+void batadv_orig_node_free_ref(struct batadv_orig_node *orig_node);
+struct batadv_orig_node *batadv_get_orig_node(struct batadv_priv *bat_priv,
+                                              const uint8_t *addr);
+struct batadv_neigh_node *
+batadv_neigh_node_new(struct batadv_hard_iface *hard_iface,
+                      const uint8_t *neigh_addr, uint32_t seqno);
+void batadv_neigh_node_free_ref(struct batadv_neigh_node *neigh_node);
+struct batadv_neigh_node *
+batadv_orig_node_get_router(struct batadv_orig_node *orig_node);
+int batadv_orig_seq_print_text(struct seq_file *seq, void *offset);
+int batadv_orig_hash_add_if(struct batadv_hard_iface *hard_iface,
+                            int max_if_num);
+int batadv_orig_hash_del_if(struct batadv_hard_iface *hard_iface,
+                            int max_if_num);
+
+
+/* hashfunction to choose an entry in a hash table of given size
+ * hash algorithm from http://en.wikipedia.org/wiki/Hash_table
+ */
+static inline uint32_t batadv_choose_orig(const void *data, uint32_t size)
 {
         const unsigned char *key = data;
         uint32_t hash = 0;
@@ -60,24 +63,24 @@ static inline uint32_t choose_orig(const void *data, uint32_t size)
         return hash % size;
 }
 
-static inline struct orig_node *orig_hash_find(struct bat_priv *bat_priv,
-                                               const void *data)
+static inline struct batadv_orig_node *
+batadv_orig_hash_find(struct batadv_priv *bat_priv, const void *data)
 {
-        struct hashtable_t *hash = bat_priv->orig_hash;
+        struct batadv_hashtable *hash = bat_priv->orig_hash;
         struct hlist_head *head;
         struct hlist_node *node;
-        struct orig_node *orig_node, *orig_node_tmp = NULL;
+        struct batadv_orig_node *orig_node, *orig_node_tmp = NULL;
         int index;
 
         if (!hash)
                 return NULL;
 
-        index = choose_orig(data, hash->size);
+        index = batadv_choose_orig(data, hash->size);
         head = &hash->table[index];
 
         rcu_read_lock();
         hlist_for_each_entry_rcu(orig_node, node, head, hash_entry) {
-                if (!compare_eth(orig_node, data))
+                if (!batadv_compare_eth(orig_node, data))
                         continue;
 
                 if (!atomic_inc_not_zero(&orig_node->refcount))
diff --git a/net/batman-adv/packet.h b/net/batman-adv/packet.h
index 0ee1af77079..8d3e55a96ad 100644
--- a/net/batman-adv/packet.h
+++ b/net/batman-adv/packet.h
@@ -1,5 +1,4 @@
-/*
- * Copyright (C) 2007-2012 B.A.T.M.A.N. contributors:
+/* Copyright (C) 2007-2012 B.A.T.M.A.N. contributors:
  *
  * Marek Lindner, Simon Wunderlich
  *
@@ -16,171 +15,172 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA
- *
  */
 
 #ifndef _NET_BATMAN_ADV_PACKET_H_
 #define _NET_BATMAN_ADV_PACKET_H_
 
-#define ETH_P_BATMAN  0x4305    /* unofficial/not registered Ethertype */
-
-enum bat_packettype {
-        BAT_IV_OGM       = 0x01,
-        BAT_ICMP         = 0x02,
-        BAT_UNICAST      = 0x03,
-        BAT_BCAST        = 0x04,
-        BAT_VIS          = 0x05,
-        BAT_UNICAST_FRAG = 0x06,
-        BAT_TT_QUERY     = 0x07,
-        BAT_ROAM_ADV     = 0x08
+#define BATADV_ETH_P_BATMAN  0x4305 /* unofficial/not registered Ethertype */
+
+enum batadv_packettype {
+        BATADV_IV_OGM       = 0x01,
+        BATADV_ICMP         = 0x02,
+        BATADV_UNICAST      = 0x03,
+        BATADV_BCAST        = 0x04,
+        BATADV_VIS          = 0x05,
+        BATADV_UNICAST_FRAG = 0x06,
+        BATADV_TT_QUERY     = 0x07,
+        BATADV_ROAM_ADV     = 0x08,
 };
 
 /* this file is included by batctl which needs these defines */
-#define COMPAT_VERSION 14
+#define BATADV_COMPAT_VERSION 14
 
-enum batman_iv_flags {
-        NOT_BEST_NEXT_HOP   = 1 << 3,
-        PRIMARIES_FIRST_HOP = 1 << 4,
-        VIS_SERVER          = 1 << 5,
-        DIRECTLINK          = 1 << 6
+enum batadv_iv_flags {
+        BATADV_NOT_BEST_NEXT_HOP   = 1 << 3,
+        BATADV_PRIMARIES_FIRST_HOP = 1 << 4,
+        BATADV_VIS_SERVER          = 1 << 5,
+        BATADV_DIRECTLINK          = 1 << 6,
 };
 
 /* ICMP message types */
-enum icmp_packettype {
-        ECHO_REPLY              = 0,
-        DESTINATION_UNREACHABLE = 3,
-        ECHO_REQUEST            = 8,
-        TTL_EXCEEDED            = 11,
-        PARAMETER_PROBLEM       = 12
+enum batadv_icmp_packettype {
+        BATADV_ECHO_REPLY              = 0,
+        BATADV_DESTINATION_UNREACHABLE = 3,
+        BATADV_ECHO_REQUEST            = 8,
+        BATADV_TTL_EXCEEDED            = 11,
+        BATADV_PARAMETER_PROBLEM       = 12,
 };
 
 /* vis defines */
-enum vis_packettype {
-        VIS_TYPE_SERVER_SYNC   = 0,
-        VIS_TYPE_CLIENT_UPDATE = 1
+enum batadv_vis_packettype {
+        BATADV_VIS_TYPE_SERVER_SYNC   = 0,
+        BATADV_VIS_TYPE_CLIENT_UPDATE = 1,
 };
 
 /* fragmentation defines */
-enum unicast_frag_flags {
-        UNI_FRAG_HEAD      = 1 << 0,
-        UNI_FRAG_LARGETAIL = 1 << 1
+enum batadv_unicast_frag_flags {
+        BATADV_UNI_FRAG_HEAD      = 1 << 0,
+        BATADV_UNI_FRAG_LARGETAIL = 1 << 1,
 };
 
 /* TT_QUERY subtypes */
-#define TT_QUERY_TYPE_MASK 0x3
+#define BATADV_TT_QUERY_TYPE_MASK 0x3
 
-enum tt_query_packettype {
-        TT_REQUEST    = 0,
-        TT_RESPONSE   = 1
+enum batadv_tt_query_packettype {
+        BATADV_TT_REQUEST  = 0,
+        BATADV_TT_RESPONSE = 1,
 };
 
 /* TT_QUERY flags */
-enum tt_query_flags {
-        TT_FULL_TABLE = 1 << 2
+enum batadv_tt_query_flags {
+        BATADV_TT_FULL_TABLE = 1 << 2,
 };
 
-/* TT_CLIENT flags.
+/* BATADV_TT_CLIENT flags.
  * Flags from 1 to 1 << 7 are sent on the wire, while flags from 1 << 8 to
- * 1 << 15 are used for local computation only */
-enum tt_client_flags {
-        TT_CLIENT_DEL     = 1 << 0,
-        TT_CLIENT_ROAM    = 1 << 1,
-        TT_CLIENT_WIFI    = 1 << 2,
-        TT_CLIENT_NOPURGE = 1 << 8,
-        TT_CLIENT_NEW     = 1 << 9,
-        TT_CLIENT_PENDING = 1 << 10
+ * 1 << 15 are used for local computation only
+ */
+enum batadv_tt_client_flags {
+        BATADV_TT_CLIENT_DEL     = 1 << 0,
+        BATADV_TT_CLIENT_ROAM    = 1 << 1,
+        BATADV_TT_CLIENT_WIFI    = 1 << 2,
+        BATADV_TT_CLIENT_NOPURGE = 1 << 8,
+        BATADV_TT_CLIENT_NEW     = 1 << 9,
+        BATADV_TT_CLIENT_PENDING = 1 << 10,
 };
 
 /* claim frame types for the bridge loop avoidance */
-enum bla_claimframe {
-        CLAIM_TYPE_ADD          = 0x00,
-        CLAIM_TYPE_DEL          = 0x01,
-        CLAIM_TYPE_ANNOUNCE     = 0x02,
-        CLAIM_TYPE_REQUEST      = 0x03
+enum batadv_bla_claimframe {
+        BATADV_CLAIM_TYPE_ADD           = 0x00,
+        BATADV_CLAIM_TYPE_DEL           = 0x01,
+        BATADV_CLAIM_TYPE_ANNOUNCE      = 0x02,
+        BATADV_CLAIM_TYPE_REQUEST       = 0x03,
 };
 
 /* the destination hardware field in the ARP frame is used to
  * transport the claim type and the group id
  */
-struct bla_claim_dst {
+struct batadv_bla_claim_dst {
         uint8_t magic[3];       /* FF:43:05 */
         uint8_t type;           /* bla_claimframe */
-        uint16_t group;         /* group id */
+        __be16 group;           /* group id */
 } __packed;
 
-struct batman_header {
+struct batadv_header {
         uint8_t  packet_type;
         uint8_t  version;  /* batman version field */
         uint8_t  ttl;
 } __packed;
 
-struct batman_ogm_packet {
-        struct batman_header header;
+struct batadv_ogm_packet {
+        struct batadv_header header;
         uint8_t  flags;    /* 0x40: DIRECTLINK flag, 0x20 VIS_SERVER flag... */
-        uint32_t seqno;
+        __be32   seqno;
         uint8_t  orig[ETH_ALEN];
         uint8_t  prev_sender[ETH_ALEN];
         uint8_t  gw_flags;  /* flags related to gateway class */
         uint8_t  tq;
         uint8_t  tt_num_changes;
         uint8_t  ttvn; /* translation table version number */
-        uint16_t tt_crc;
+        __be16   tt_crc;
 } __packed;
 
-#define BATMAN_OGM_HLEN sizeof(struct batman_ogm_packet)
+#define BATADV_OGM_HLEN sizeof(struct batadv_ogm_packet)
 
-struct icmp_packet {
-        struct batman_header header;
+struct batadv_icmp_packet {
+        struct batadv_header header;
         uint8_t  msg_type; /* see ICMP message types above */
         uint8_t  dst[ETH_ALEN];
         uint8_t  orig[ETH_ALEN];
-        uint16_t seqno;
+        __be16   seqno;
         uint8_t  uid;
         uint8_t  reserved;
 } __packed;
 
-#define BAT_RR_LEN 16
+#define BATADV_RR_LEN 16
 
 /* icmp_packet_rr must start with all fields from imcp_packet
- * as this is assumed by code that handles ICMP packets */
-struct icmp_packet_rr {
-        struct batman_header header;
+ * as this is assumed by code that handles ICMP packets
+ */
+struct batadv_icmp_packet_rr {
+        struct batadv_header header;
         uint8_t  msg_type; /* see ICMP message types above */
         uint8_t  dst[ETH_ALEN];
         uint8_t  orig[ETH_ALEN];
-        uint16_t seqno;
+        __be16   seqno;
         uint8_t  uid;
         uint8_t  rr_cur;
-        uint8_t  rr[BAT_RR_LEN][ETH_ALEN];
+        uint8_t  rr[BATADV_RR_LEN][ETH_ALEN];
 } __packed;
 
-struct unicast_packet {
-        struct batman_header header;
+struct batadv_unicast_packet {
+        struct batadv_header header;
         uint8_t  ttvn; /* destination translation table version number */
         uint8_t  dest[ETH_ALEN];
 } __packed;
 
-struct unicast_frag_packet {
-        struct batman_header header;
+struct batadv_unicast_frag_packet {
+        struct batadv_header header;
         uint8_t  ttvn; /* destination translation table version number */
         uint8_t  dest[ETH_ALEN];
         uint8_t  flags;
         uint8_t  align;
         uint8_t  orig[ETH_ALEN];
-        uint16_t seqno;
+        __be16   seqno;
 } __packed;
 
-struct bcast_packet {
-        struct batman_header header;
+struct batadv_bcast_packet {
+        struct batadv_header header;
         uint8_t  reserved;
-        uint32_t seqno;
+        __be32   seqno;
         uint8_t  orig[ETH_ALEN];
 } __packed;
 
-struct vis_packet {
-        struct batman_header header;
+struct batadv_vis_packet {
+        struct batadv_header header;
         uint8_t  vis_type;       /* which type of vis-participant sent this? */
-        uint32_t seqno;          /* sequence number */
+        __be32   seqno;          /* sequence number */
         uint8_t  entries;        /* number of entries behind this struct */
         uint8_t  reserved;
         uint8_t  vis_orig[ETH_ALEN];    /* originator reporting its neighbors */
@@ -188,11 +188,12 @@ struct vis_packet {
         uint8_t  sender_orig[ETH_ALEN]; /* who sent or forwarded this packet */
 } __packed;
 
-struct tt_query_packet {
-        struct batman_header header;
+struct batadv_tt_query_packet {
+        struct batadv_header header;
         /* the flag field is a combination of:
          * - TT_REQUEST or TT_RESPONSE
-         * - TT_FULL_TABLE */
+         * - TT_FULL_TABLE
+         */
         uint8_t  flags;
         uint8_t  dst[ETH_ALEN];
         uint8_t  src[ETH_ALEN];
@@ -200,24 +201,26 @@ struct tt_query_packet {
          * if TT_REQUEST: ttvn that triggered the
          *                request
          * if TT_RESPONSE: new ttvn for the src
-         *                 orig_node */
+         *                 orig_node
+         */
         uint8_t  ttvn;
         /* tt_data field is:
          * if TT_REQUEST: crc associated with the
          *                ttvn
-         * if TT_RESPONSE: table_size */
-        uint16_t tt_data;
+         * if TT_RESPONSE: table_size
+         */
+        __be16 tt_data;
 } __packed;
 
-struct roam_adv_packet {
-        struct batman_header header;
+struct batadv_roam_adv_packet {
+        struct batadv_header header;
         uint8_t  reserved;
         uint8_t  dst[ETH_ALEN];
         uint8_t  src[ETH_ALEN];
         uint8_t  client[ETH_ALEN];
 } __packed;
 
-struct tt_change {
+struct batadv_tt_change {
         uint8_t flags;
         uint8_t addr[ETH_ALEN];
 } __packed;
diff --git a/net/batman-adv/ring_buffer.c b/net/batman-adv/ring_buffer.c
index fd63951d118..c8f61e395b7 100644
--- a/net/batman-adv/ring_buffer.c
+++ b/net/batman-adv/ring_buffer.c
@@ -1,5 +1,4 @@
-/*
- * Copyright (C) 2007-2012 B.A.T.M.A.N. contributors:
+/* Copyright (C) 2007-2012 B.A.T.M.A.N. contributors:
  *
  * Marek Lindner
  *
@@ -16,26 +15,26 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA
- *
  */
 
 #include "main.h"
 #include "ring_buffer.h"
 
-void ring_buffer_set(uint8_t lq_recv[], uint8_t *lq_index, uint8_t value)
+void batadv_ring_buffer_set(uint8_t lq_recv[], uint8_t *lq_index,
+                            uint8_t value)
 {
         lq_recv[*lq_index] = value;
-        *lq_index = (*lq_index + 1) % TQ_GLOBAL_WINDOW_SIZE;
+        *lq_index = (*lq_index + 1) % BATADV_TQ_GLOBAL_WINDOW_SIZE;
 }
 
-uint8_t ring_buffer_avg(const uint8_t lq_recv[])
+uint8_t batadv_ring_buffer_avg(const uint8_t lq_recv[])
 {
         const uint8_t *ptr;
         uint16_t count = 0, i = 0, sum = 0;
 
         ptr = lq_recv;
 
-        while (i < TQ_GLOBAL_WINDOW_SIZE) {
+        while (i < BATADV_TQ_GLOBAL_WINDOW_SIZE) {
                 if (*ptr != 0) {
                         count++;
                         sum += *ptr;
diff --git a/net/batman-adv/ring_buffer.h b/net/batman-adv/ring_buffer.h
index 8b58bd82767..fda8c17df27 100644
--- a/net/batman-adv/ring_buffer.h
+++ b/net/batman-adv/ring_buffer.h
@@ -1,5 +1,4 @@
-/*
- * Copyright (C) 2007-2012 B.A.T.M.A.N. contributors:
+/* Copyright (C) 2007-2012 B.A.T.M.A.N. contributors:
  *
  * Marek Lindner
  *
@@ -16,13 +15,13 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA
- *
  */
 
 #ifndef _NET_BATMAN_ADV_RING_BUFFER_H_
 #define _NET_BATMAN_ADV_RING_BUFFER_H_
 
-void ring_buffer_set(uint8_t lq_recv[], uint8_t *lq_index, uint8_t value);
-uint8_t ring_buffer_avg(const uint8_t lq_recv[]);
+void batadv_ring_buffer_set(uint8_t lq_recv[], uint8_t *lq_index,
+                            uint8_t value);
+uint8_t batadv_ring_buffer_avg(const uint8_t lq_recv[]);
 
 #endif /* _NET_BATMAN_ADV_RING_BUFFER_H_ */
diff --git a/net/batman-adv/routing.c b/net/batman-adv/routing.c
index 015471d801b..bc2b88bbea1 100644
--- a/net/batman-adv/routing.c
+++ b/net/batman-adv/routing.c
@@ -1,5 +1,4 @@
-/*
- * Copyright (C) 2007-2012 B.A.T.M.A.N. contributors:
+/* Copyright (C) 2007-2012 B.A.T.M.A.N. contributors:
  *
  * Marek Lindner, Simon Wunderlich
  *
@@ -16,7 +15,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA
- *
  */
 
 #include "main.h"
@@ -31,19 +29,20 @@
 #include "unicast.h"
 #include "bridge_loop_avoidance.h"
 
-static int route_unicast_packet(struct sk_buff *skb,
-                                struct hard_iface *recv_if);
+static int batadv_route_unicast_packet(struct sk_buff *skb,
+                                       struct batadv_hard_iface *recv_if);
 
-void slide_own_bcast_window(struct hard_iface *hard_iface)
+void batadv_slide_own_bcast_window(struct batadv_hard_iface *hard_iface)
 {
-        struct bat_priv *bat_priv = netdev_priv(hard_iface->soft_iface);
-        struct hashtable_t *hash = bat_priv->orig_hash;
+        struct batadv_priv *bat_priv = netdev_priv(hard_iface->soft_iface);
+        struct batadv_hashtable *hash = bat_priv->orig_hash;
         struct hlist_node *node;
         struct hlist_head *head;
-        struct orig_node *orig_node;
+        struct batadv_orig_node *orig_node;
         unsigned long *word;
         uint32_t i;
         size_t word_index;
+        uint8_t *w;
 
         for (i = 0; i < hash->size; i++) {
                 head = &hash->table[i];
@@ -51,49 +50,49 @@ void slide_own_bcast_window(struct hard_iface *hard_iface)
                 rcu_read_lock();
                 hlist_for_each_entry_rcu(orig_node, node, head, hash_entry) {
                         spin_lock_bh(&orig_node->ogm_cnt_lock);
-                        word_index = hard_iface->if_num * NUM_WORDS;
+                        word_index = hard_iface->if_num * BATADV_NUM_WORDS;
                         word = &(orig_node->bcast_own[word_index]);
 
-                        bit_get_packet(bat_priv, word, 1, 0);
-                        orig_node->bcast_own_sum[hard_iface->if_num] =
-                                bitmap_weight(word, TQ_LOCAL_WINDOW_SIZE);
+                        batadv_bit_get_packet(bat_priv, word, 1, 0);
+                        w = &orig_node->bcast_own_sum[hard_iface->if_num];
+                        *w = bitmap_weight(word, BATADV_TQ_LOCAL_WINDOW_SIZE);
                         spin_unlock_bh(&orig_node->ogm_cnt_lock);
                 }
                 rcu_read_unlock();
         }
 }
 
-static void _update_route(struct bat_priv *bat_priv,
-                          struct orig_node *orig_node,
-                          struct neigh_node *neigh_node)
+static void _batadv_update_route(struct batadv_priv *bat_priv,
+                                 struct batadv_orig_node *orig_node,
+                                 struct batadv_neigh_node *neigh_node)
 {
-        struct neigh_node *curr_router;
+        struct batadv_neigh_node *curr_router;
 
-        curr_router = orig_node_get_router(orig_node);
+        curr_router = batadv_orig_node_get_router(orig_node);
 
         /* route deleted */
         if ((curr_router) && (!neigh_node)) {
-                bat_dbg(DBG_ROUTES, bat_priv, "Deleting route towards: %pM\n",
-                        orig_node->orig);
-                tt_global_del_orig(bat_priv, orig_node,
-                                   "Deleted route towards originator");
+                batadv_dbg(BATADV_DBG_ROUTES, bat_priv,
+                           "Deleting route towards: %pM\n", orig_node->orig);
+                batadv_tt_global_del_orig(bat_priv, orig_node,
+                                          "Deleted route towards originator");
 
         /* route added */
         } else if ((!curr_router) && (neigh_node)) {
 
-                bat_dbg(DBG_ROUTES, bat_priv,
-                        "Adding route towards: %pM (via %pM)\n",
-                        orig_node->orig, neigh_node->addr);
+                batadv_dbg(BATADV_DBG_ROUTES, bat_priv,
+                           "Adding route towards: %pM (via %pM)\n",
+                           orig_node->orig, neigh_node->addr);
         /* route changed */
         } else if (neigh_node && curr_router) {
-                bat_dbg(DBG_ROUTES, bat_priv,
-                        "Changing route towards: %pM (now via %pM - was via %pM)\n",
-                        orig_node->orig, neigh_node->addr,
-                        curr_router->addr);
+                batadv_dbg(BATADV_DBG_ROUTES, bat_priv,
+                           "Changing route towards: %pM (now via %pM - was via %pM)\n",
+                           orig_node->orig, neigh_node->addr,
+                           curr_router->addr);
         }
 
         if (curr_router)
-                neigh_node_free_ref(curr_router);
+                batadv_neigh_node_free_ref(curr_router);
 
         /* increase refcount of new best neighbor */
         if (neigh_node && !atomic_inc_not_zero(&neigh_node->refcount))
@@ -105,30 +104,31 @@ static void _update_route(struct bat_priv *bat_priv,
 
         /* decrease refcount of previous best neighbor */
         if (curr_router)
-                neigh_node_free_ref(curr_router);
+                batadv_neigh_node_free_ref(curr_router);
 }
 
-void update_route(struct bat_priv *bat_priv, struct orig_node *orig_node,
-                  struct neigh_node *neigh_node)
+void batadv_update_route(struct batadv_priv *bat_priv,
+                         struct batadv_orig_node *orig_node,
+                         struct batadv_neigh_node *neigh_node)
 {
-        struct neigh_node *router = NULL;
+        struct batadv_neigh_node *router = NULL;
 
         if (!orig_node)
                 goto out;
 
-        router = orig_node_get_router(orig_node);
+        router = batadv_orig_node_get_router(orig_node);
 
         if (router != neigh_node)
-                _update_route(bat_priv, orig_node, neigh_node);
+                _batadv_update_route(bat_priv, orig_node, neigh_node);
 
 out:
         if (router)
-                neigh_node_free_ref(router);
+                batadv_neigh_node_free_ref(router);
 }
 
 /* caller must hold the neigh_list_lock */
-void bonding_candidate_del(struct orig_node *orig_node,
-                           struct neigh_node *neigh_node)
+void batadv_bonding_candidate_del(struct batadv_orig_node *orig_node,
+                                  struct batadv_neigh_node *neigh_node)
 {
         /* this neighbor is not part of our candidate list */
         if (list_empty(&neigh_node->bonding_list))
@@ -136,37 +136,36 @@ void bonding_candidate_del(struct orig_node *orig_node,
 
         list_del_rcu(&neigh_node->bonding_list);
         INIT_LIST_HEAD(&neigh_node->bonding_list);
-        neigh_node_free_ref(neigh_node);
+        batadv_neigh_node_free_ref(neigh_node);
         atomic_dec(&orig_node->bond_candidates);
 
 out:
         return;
 }
 
-void bonding_candidate_add(struct orig_node *orig_node,
-                           struct neigh_node *neigh_node)
+void batadv_bonding_candidate_add(struct batadv_orig_node *orig_node,
+                                  struct batadv_neigh_node *neigh_node)
 {
         struct hlist_node *node;
-        struct neigh_node *tmp_neigh_node, *router = NULL;
+        struct batadv_neigh_node *tmp_neigh_node, *router = NULL;
         uint8_t interference_candidate = 0;
 
         spin_lock_bh(&orig_node->neigh_list_lock);
 
         /* only consider if it has the same primary address ...  */
-        if (!compare_eth(orig_node->orig,
-                         neigh_node->orig_node->primary_addr))
+        if (!batadv_compare_eth(orig_node->orig,
+                                neigh_node->orig_node->primary_addr))
                 goto candidate_del;
 
-        router = orig_node_get_router(orig_node);
+        router = batadv_orig_node_get_router(orig_node);
         if (!router)
                 goto candidate_del;
 
         /* ... and is good enough to be considered */
-        if (neigh_node->tq_avg < router->tq_avg - BONDING_TQ_THRESHOLD)
+        if (neigh_node->tq_avg < router->tq_avg - BATADV_BONDING_TQ_THRESHOLD)
                 goto candidate_del;
 
-        /**
-         * check if we have another candidate with the same mac address or
+        /* check if we have another candidate with the same mac address or
          * interface. If we do, we won't select this candidate because of
          * possible interference.
          */
@@ -177,12 +176,14 @@ void bonding_candidate_add(struct orig_node *orig_node,
                         continue;
 
                 /* we only care if the other candidate is even
-                * considered as candidate. */
+                 * considered as candidate.
+                 */
                 if (list_empty(&tmp_neigh_node->bonding_list))
                         continue;
 
                 if ((neigh_node->if_incoming == tmp_neigh_node->if_incoming) ||
-                    (compare_eth(neigh_node->addr, tmp_neigh_node->addr))) {
+                    (batadv_compare_eth(neigh_node->addr,
+                                        tmp_neigh_node->addr))) {
                         interference_candidate = 1;
                         break;
                 }
@@ -204,21 +205,22 @@ void bonding_candidate_add(struct orig_node *orig_node,
         goto out;
 
 candidate_del:
-        bonding_candidate_del(orig_node, neigh_node);
+        batadv_bonding_candidate_del(orig_node, neigh_node);
 
 out:
         spin_unlock_bh(&orig_node->neigh_list_lock);
 
         if (router)
-                neigh_node_free_ref(router);
+                batadv_neigh_node_free_ref(router);
 }
 
 /* copy primary address for bonding */
-void bonding_save_primary(const struct orig_node *orig_node,
-                          struct orig_node *orig_neigh_node,
-                          const struct batman_ogm_packet *batman_ogm_packet)
+void
+batadv_bonding_save_primary(const struct batadv_orig_node *orig_node,
+                            struct batadv_orig_node *orig_neigh_node,
+                            const struct batadv_ogm_packet *batman_ogm_packet)
 {
-        if (!(batman_ogm_packet->flags & PRIMARIES_FIRST_HOP))
+        if (!(batman_ogm_packet->flags & BATADV_PRIMARIES_FIRST_HOP))
                 return;
 
         memcpy(orig_neigh_node->primary_addr, orig_node->orig, ETH_ALEN);
@@ -229,25 +231,26 @@ void bonding_save_primary(const struct orig_node *orig_node,
  *  0 if the packet is to be accepted
  *  1 if the packet is to be ignored.
  */
-int window_protected(struct bat_priv *bat_priv, int32_t seq_num_diff,
-                     unsigned long *last_reset)
+int batadv_window_protected(struct batadv_priv *bat_priv, int32_t seq_num_diff,
+                            unsigned long *last_reset)
 {
-        if ((seq_num_diff <= -TQ_LOCAL_WINDOW_SIZE) ||
-            (seq_num_diff >= EXPECTED_SEQNO_RANGE)) {
-                if (!has_timed_out(*last_reset, RESET_PROTECTION_MS))
+        if (seq_num_diff <= -BATADV_TQ_LOCAL_WINDOW_SIZE ||
+            seq_num_diff >= BATADV_EXPECTED_SEQNO_RANGE) {
+                if (!batadv_has_timed_out(*last_reset,
+                                          BATADV_RESET_PROTECTION_MS))
                         return 1;
 
                 *last_reset = jiffies;
-                bat_dbg(DBG_BATMAN, bat_priv,
-                        "old packet received, start protection\n");
+                batadv_dbg(BATADV_DBG_BATMAN, bat_priv,
+                           "old packet received, start protection\n");
         }
 
         return 0;
 }
 
-bool check_management_packet(struct sk_buff *skb,
-                             struct hard_iface *hard_iface,
-                             int header_len)
+bool batadv_check_management_packet(struct sk_buff *skb,
+                                    struct batadv_hard_iface *hard_iface,
+                                    int header_len)
 {
         struct ethhdr *ethhdr;
 
@@ -276,34 +279,34 @@ bool check_management_packet(struct sk_buff *skb,
         return true;
 }
 
-static int recv_my_icmp_packet(struct bat_priv *bat_priv,
-                               struct sk_buff *skb, size_t icmp_len)
+static int batadv_recv_my_icmp_packet(struct batadv_priv *bat_priv,
+                                      struct sk_buff *skb, size_t icmp_len)
 {
-        struct hard_iface *primary_if = NULL;
-        struct orig_node *orig_node = NULL;
-        struct neigh_node *router = NULL;
-        struct icmp_packet_rr *icmp_packet;
+        struct batadv_hard_iface *primary_if = NULL;
+        struct batadv_orig_node *orig_node = NULL;
+        struct batadv_neigh_node *router = NULL;
+        struct batadv_icmp_packet_rr *icmp_packet;
         int ret = NET_RX_DROP;
 
-        icmp_packet = (struct icmp_packet_rr *)skb->data;
+        icmp_packet = (struct batadv_icmp_packet_rr *)skb->data;
 
         /* add data to device queue */
-        if (icmp_packet->msg_type != ECHO_REQUEST) {
-                bat_socket_receive_packet(icmp_packet, icmp_len);
+        if (icmp_packet->msg_type != BATADV_ECHO_REQUEST) {
+                batadv_socket_receive_packet(icmp_packet, icmp_len);
                 goto out;
         }
 
-        primary_if = primary_if_get_selected(bat_priv);
+        primary_if = batadv_primary_if_get_selected(bat_priv);
         if (!primary_if)
                 goto out;
 
         /* answer echo request (ping) */
         /* get routing information */
-        orig_node = orig_hash_find(bat_priv, icmp_packet->orig);
+        orig_node = batadv_orig_hash_find(bat_priv, icmp_packet->orig);
         if (!orig_node)
                 goto out;
 
-        router = orig_node_get_router(orig_node);
+        router = batadv_orig_node_get_router(orig_node);
         if (!router)
                 goto out;
 
@@ -311,54 +314,54 @@ static int recv_my_icmp_packet(struct bat_priv *bat_priv,
         if (skb_cow(skb, ETH_HLEN) < 0)
                 goto out;
 
-        icmp_packet = (struct icmp_packet_rr *)skb->data;
+        icmp_packet = (struct batadv_icmp_packet_rr *)skb->data;
 
         memcpy(icmp_packet->dst, icmp_packet->orig, ETH_ALEN);
         memcpy(icmp_packet->orig, primary_if->net_dev->dev_addr, ETH_ALEN);
-        icmp_packet->msg_type = ECHO_REPLY;
-        icmp_packet->header.ttl = TTL;
+        icmp_packet->msg_type = BATADV_ECHO_REPLY;
+        icmp_packet->header.ttl = BATADV_TTL;
 
-        send_skb_packet(skb, router->if_incoming, router->addr);
+        batadv_send_skb_packet(skb, router->if_incoming, router->addr);
         ret = NET_RX_SUCCESS;
 
 out:
         if (primary_if)
-                hardif_free_ref(primary_if);
+                batadv_hardif_free_ref(primary_if);
         if (router)
-                neigh_node_free_ref(router);
+                batadv_neigh_node_free_ref(router);
         if (orig_node)
-                orig_node_free_ref(orig_node);
+                batadv_orig_node_free_ref(orig_node);
         return ret;
 }
 
-static int recv_icmp_ttl_exceeded(struct bat_priv *bat_priv,
-                                  struct sk_buff *skb)
+static int batadv_recv_icmp_ttl_exceeded(struct batadv_priv *bat_priv,
+                                         struct sk_buff *skb)
 {
-        struct hard_iface *primary_if = NULL;
-        struct orig_node *orig_node = NULL;
-        struct neigh_node *router = NULL;
-        struct icmp_packet *icmp_packet;
+        struct batadv_hard_iface *primary_if = NULL;
+        struct batadv_orig_node *orig_node = NULL;
+        struct batadv_neigh_node *router = NULL;
+        struct batadv_icmp_packet *icmp_packet;
         int ret = NET_RX_DROP;
 
-        icmp_packet = (struct icmp_packet *)skb->data;
+        icmp_packet = (struct batadv_icmp_packet *)skb->data;
 
         /* send TTL exceeded if packet is an echo request (traceroute) */
-        if (icmp_packet->msg_type != ECHO_REQUEST) {
+        if (icmp_packet->msg_type != BATADV_ECHO_REQUEST) {
                 pr_debug("Warning - can't forward icmp packet from %pM to %pM: ttl exceeded\n",
                          icmp_packet->orig, icmp_packet->dst);
                 goto out;
         }
 
-        primary_if = primary_if_get_selected(bat_priv);
+        primary_if = batadv_primary_if_get_selected(bat_priv);
         if (!primary_if)
                 goto out;
 
         /* get routing information */
-        orig_node = orig_hash_find(bat_priv, icmp_packet->orig);
+        orig_node = batadv_orig_hash_find(bat_priv, icmp_packet->orig);
         if (!orig_node)
                 goto out;
 
-        router = orig_node_get_router(orig_node);
+        router = batadv_orig_node_get_router(orig_node);
         if (!router)
                 goto out;
 
@@ -366,42 +369,41 @@ static int recv_icmp_ttl_exceeded(struct bat_priv *bat_priv,
         if (skb_cow(skb, ETH_HLEN) < 0)
                 goto out;
 
-        icmp_packet = (struct icmp_packet *)skb->data;
+        icmp_packet = (struct batadv_icmp_packet *)skb->data;
 
         memcpy(icmp_packet->dst, icmp_packet->orig, ETH_ALEN);
         memcpy(icmp_packet->orig, primary_if->net_dev->dev_addr, ETH_ALEN);
-        icmp_packet->msg_type = TTL_EXCEEDED;
-        icmp_packet->header.ttl = TTL;
+        icmp_packet->msg_type = BATADV_TTL_EXCEEDED;
+        icmp_packet->header.ttl = BATADV_TTL;
 
-        send_skb_packet(skb, router->if_incoming, router->addr);
+        batadv_send_skb_packet(skb, router->if_incoming, router->addr);
         ret = NET_RX_SUCCESS;
 
 out:
         if (primary_if)
-                hardif_free_ref(primary_if);
+                batadv_hardif_free_ref(primary_if);
         if (router)
-                neigh_node_free_ref(router);
+                batadv_neigh_node_free_ref(router);
         if (orig_node)
-                orig_node_free_ref(orig_node);
+                batadv_orig_node_free_ref(orig_node);
         return ret;
 }
 
 
-int recv_icmp_packet(struct sk_buff *skb, struct hard_iface *recv_if)
+int batadv_recv_icmp_packet(struct sk_buff *skb,
+                            struct batadv_hard_iface *recv_if)
 {
-        struct bat_priv *bat_priv = netdev_priv(recv_if->soft_iface);
-        struct icmp_packet_rr *icmp_packet;
+        struct batadv_priv *bat_priv = netdev_priv(recv_if->soft_iface);
+        struct batadv_icmp_packet_rr *icmp_packet;
         struct ethhdr *ethhdr;
-        struct orig_node *orig_node = NULL;
-        struct neigh_node *router = NULL;
-        int hdr_size = sizeof(struct icmp_packet);
+        struct batadv_orig_node *orig_node = NULL;
+        struct batadv_neigh_node *router = NULL;
+        int hdr_size = sizeof(struct batadv_icmp_packet);
         int ret = NET_RX_DROP;
 
-        /**
-         * we truncate all incoming icmp packets if they don't match our size
-         */
-        if (skb->len >= sizeof(struct icmp_packet_rr))
-                hdr_size = sizeof(struct icmp_packet_rr);
+        /* we truncate all incoming icmp packets if they don't match our size */
+        if (skb->len >= sizeof(struct batadv_icmp_packet_rr))
+                hdr_size = sizeof(struct batadv_icmp_packet_rr);
 
         /* drop packet if it has not necessary minimum size */
         if (unlikely(!pskb_may_pull(skb, hdr_size)))
@@ -418,33 +420,33 @@ int recv_icmp_packet(struct sk_buff *skb, struct hard_iface *recv_if)
                 goto out;
 
         /* not for me */
-        if (!is_my_mac(ethhdr->h_dest))
+        if (!batadv_is_my_mac(ethhdr->h_dest))
                 goto out;
 
-        icmp_packet = (struct icmp_packet_rr *)skb->data;
+        icmp_packet = (struct batadv_icmp_packet_rr *)skb->data;
 
         /* add record route information if not full */
-        if ((hdr_size == sizeof(struct icmp_packet_rr)) &&
-            (icmp_packet->rr_cur < BAT_RR_LEN)) {
+        if ((hdr_size == sizeof(struct batadv_icmp_packet_rr)) &&
+            (icmp_packet->rr_cur < BATADV_RR_LEN)) {
                 memcpy(&(icmp_packet->rr[icmp_packet->rr_cur]),
                        ethhdr->h_dest, ETH_ALEN);
                 icmp_packet->rr_cur++;
         }
 
         /* packet for me */
-        if (is_my_mac(icmp_packet->dst))
-                return recv_my_icmp_packet(bat_priv, skb, hdr_size);
+        if (batadv_is_my_mac(icmp_packet->dst))
+                return batadv_recv_my_icmp_packet(bat_priv, skb, hdr_size);
 
         /* TTL exceeded */
         if (icmp_packet->header.ttl < 2)
-                return recv_icmp_ttl_exceeded(bat_priv, skb);
+                return batadv_recv_icmp_ttl_exceeded(bat_priv, skb);
 
         /* get routing information */
-        orig_node = orig_hash_find(bat_priv, icmp_packet->dst);
+        orig_node = batadv_orig_hash_find(bat_priv, icmp_packet->dst);
         if (!orig_node)
                 goto out;
 
-        router = orig_node_get_router(orig_node);
+        router = batadv_orig_node_get_router(orig_node);
         if (!router)
                 goto out;
 
@@ -452,20 +454,20 @@ int recv_icmp_packet(struct sk_buff *skb, struct hard_iface *recv_if)
         if (skb_cow(skb, ETH_HLEN) < 0)
                 goto out;
 
-        icmp_packet = (struct icmp_packet_rr *)skb->data;
+        icmp_packet = (struct batadv_icmp_packet_rr *)skb->data;
 
         /* decrement ttl */
         icmp_packet->header.ttl--;
 
         /* route it */
-        send_skb_packet(skb, router->if_incoming, router->addr);
+        batadv_send_skb_packet(skb, router->if_incoming, router->addr);
         ret = NET_RX_SUCCESS;
 
 out:
         if (router)
-                neigh_node_free_ref(router);
+                batadv_neigh_node_free_ref(router);
         if (orig_node)
-                orig_node_free_ref(orig_node);
+                batadv_orig_node_free_ref(orig_node);
         return ret;
 }
 
@@ -473,12 +475,14 @@ out:
  * robin fashion over the remaining interfaces.
  *
  * This method rotates the bonding list and increases the
- * returned router's refcount. */
-static struct neigh_node *find_bond_router(struct orig_node *primary_orig,
-                                           const struct hard_iface *recv_if)
+ * returned router's refcount.
+ */
+static struct batadv_neigh_node *
+batadv_find_bond_router(struct batadv_orig_node *primary_orig,
+                        const struct batadv_hard_iface *recv_if)
 {
-        struct neigh_node *tmp_neigh_node;
-        struct neigh_node *router = NULL, *first_candidate = NULL;
+        struct batadv_neigh_node *tmp_neigh_node;
+        struct batadv_neigh_node *router = NULL, *first_candidate = NULL;
 
         rcu_read_lock();
         list_for_each_entry_rcu(tmp_neigh_node, &primary_orig->bond_list,
@@ -506,10 +510,12 @@ static struct neigh_node *find_bond_router(struct orig_node *primary_orig,
                 goto out;
 
         /* selected should point to the next element
-         * after the current router */
+         * after the current router
+         */
         spin_lock_bh(&primary_orig->neigh_list_lock);
         /* this is a list_move(), which unfortunately
-         * does not exist as rcu version */
+         * does not exist as rcu version
+         */
         list_del_rcu(&primary_orig->bond_list);
         list_add_rcu(&primary_orig->bond_list,
                      &router->bonding_list);
@@ -524,12 +530,14 @@ out:
  * remaining candidates which are not using
  * this interface.
  *
- * Increases the returned router's refcount */
-static struct neigh_node *find_ifalter_router(struct orig_node *primary_orig,
-                                              const struct hard_iface *recv_if)
+ * Increases the returned router's refcount
+ */
+static struct batadv_neigh_node *
+batadv_find_ifalter_router(struct batadv_orig_node *primary_orig,
+                           const struct batadv_hard_iface *recv_if)
 {
-        struct neigh_node *tmp_neigh_node;
-        struct neigh_node *router = NULL, *first_candidate = NULL;
+        struct batadv_neigh_node *tmp_neigh_node;
+        struct batadv_neigh_node *router = NULL, *first_candidate = NULL;
 
         rcu_read_lock();
         list_for_each_entry_rcu(tmp_neigh_node, &primary_orig->bond_list,
@@ -545,19 +553,21 @@ static struct neigh_node *find_ifalter_router(struct orig_node *primary_orig,
                         continue;
 
                 /* if we don't have a router yet
-                 * or this one is better, choose it. */
+                 * or this one is better, choose it.
+                 */
                 if ((!router) ||
                     (tmp_neigh_node->tq_avg > router->tq_avg)) {
                         /* decrement refcount of
-                         * previously selected router */
+                         * previously selected router
+                         */
                         if (router)
-                                neigh_node_free_ref(router);
+                                batadv_neigh_node_free_ref(router);
 
                         router = tmp_neigh_node;
                         atomic_inc_not_zero(&router->refcount);
                 }
 
-                neigh_node_free_ref(tmp_neigh_node);
+                batadv_neigh_node_free_ref(tmp_neigh_node);
         }
 
         /* use the first candidate if nothing was found. */
@@ -569,19 +579,22 @@ static struct neigh_node *find_ifalter_router(struct orig_node *primary_orig,
         return router;
 }
 
-int recv_tt_query(struct sk_buff *skb, struct hard_iface *recv_if)
+int batadv_recv_tt_query(struct sk_buff *skb, struct batadv_hard_iface *recv_if)
 {
-        struct bat_priv *bat_priv = netdev_priv(recv_if->soft_iface);
-        struct tt_query_packet *tt_query;
-        uint16_t tt_len;
+        struct batadv_priv *bat_priv = netdev_priv(recv_if->soft_iface);
+        struct batadv_tt_query_packet *tt_query;
+        uint16_t tt_size;
         struct ethhdr *ethhdr;
+        char tt_flag;
+        size_t packet_size;
 
         /* drop packet if it has not necessary minimum size */
-        if (unlikely(!pskb_may_pull(skb, sizeof(struct tt_query_packet))))
+        if (unlikely(!pskb_may_pull(skb,
+                                    sizeof(struct batadv_tt_query_packet))))
                 goto out;
 
         /* I could need to modify it */
-        if (skb_cow(skb, sizeof(struct tt_query_packet)) < 0)
+        if (skb_cow(skb, sizeof(struct batadv_tt_query_packet)) < 0)
                 goto out;
 
         ethhdr = (struct ethhdr *)skb_mac_header(skb);
@@ -594,47 +607,59 @@ int recv_tt_query(struct sk_buff *skb, struct hard_iface *recv_if)
         if (is_broadcast_ether_addr(ethhdr->h_source))
                 goto out;
 
-        tt_query = (struct tt_query_packet *)skb->data;
+        tt_query = (struct batadv_tt_query_packet *)skb->data;
 
-        tt_query->tt_data = ntohs(tt_query->tt_data);
+        switch (tt_query->flags & BATADV_TT_QUERY_TYPE_MASK) {
+        case BATADV_TT_REQUEST:
+                batadv_inc_counter(bat_priv, BATADV_CNT_TT_REQUEST_RX);
 
-        switch (tt_query->flags & TT_QUERY_TYPE_MASK) {
-        case TT_REQUEST:
                 /* If we cannot provide an answer the tt_request is
-                 * forwarded */
-                if (!send_tt_response(bat_priv, tt_query)) {
-                        bat_dbg(DBG_TT, bat_priv,
-                                "Routing TT_REQUEST to %pM [%c]\n",
-                                tt_query->dst,
-                                (tt_query->flags & TT_FULL_TABLE ? 'F' : '.'));
-                        tt_query->tt_data = htons(tt_query->tt_data);
-                        return route_unicast_packet(skb, recv_if);
+                 * forwarded
+                 */
+                if (!batadv_send_tt_response(bat_priv, tt_query)) {
+                        if (tt_query->flags & BATADV_TT_FULL_TABLE)
+                                tt_flag = 'F';
+                        else
+                                tt_flag = '.';
+
+                        batadv_dbg(BATADV_DBG_TT, bat_priv,
+                                   "Routing TT_REQUEST to %pM [%c]\n",
+                                   tt_query->dst,
+                                   tt_flag);
+                        return batadv_route_unicast_packet(skb, recv_if);
                 }
                 break;
-        case TT_RESPONSE:
-                if (is_my_mac(tt_query->dst)) {
+        case BATADV_TT_RESPONSE:
+                batadv_inc_counter(bat_priv, BATADV_CNT_TT_RESPONSE_RX);
+
+                if (batadv_is_my_mac(tt_query->dst)) {
                         /* packet needs to be linearized to access the TT
-                         * changes */
+                         * changes
+                         */
                         if (skb_linearize(skb) < 0)
                                 goto out;
                         /* skb_linearize() possibly changed skb->data */
-                        tt_query = (struct tt_query_packet *)skb->data;
+                        tt_query = (struct batadv_tt_query_packet *)skb->data;
 
-                        tt_len = tt_query->tt_data * sizeof(struct tt_change);
+                        tt_size = batadv_tt_len(ntohs(tt_query->tt_data));
 
                         /* Ensure we have all the claimed data */
-                        if (unlikely(skb_headlen(skb) <
-                                     sizeof(struct tt_query_packet) + tt_len))
+                        packet_size = sizeof(struct batadv_tt_query_packet);
+                        packet_size += tt_size;
+                        if (unlikely(skb_headlen(skb) < packet_size))
                                 goto out;
 
-                        handle_tt_response(bat_priv, tt_query);
+                        batadv_handle_tt_response(bat_priv, tt_query);
                 } else {
-                        bat_dbg(DBG_TT, bat_priv,
-                                "Routing TT_RESPONSE to %pM [%c]\n",
-                                tt_query->dst,
-                                (tt_query->flags & TT_FULL_TABLE ? 'F' : '.'));
-                        tt_query->tt_data = htons(tt_query->tt_data);
-                        return route_unicast_packet(skb, recv_if);
+                        if (tt_query->flags & BATADV_TT_FULL_TABLE)
+                                tt_flag =  'F';
+                        else
+                                tt_flag = '.';
+                        batadv_dbg(BATADV_DBG_TT, bat_priv,
+                                   "Routing TT_RESPONSE to %pM [%c]\n",
+                                   tt_query->dst,
+                                   tt_flag);
+                        return batadv_route_unicast_packet(skb, recv_if);
                 }
                 break;
         }
@@ -644,15 +669,16 @@ out:
         return NET_RX_DROP;
 }
 
-int recv_roam_adv(struct sk_buff *skb, struct hard_iface *recv_if)
+int batadv_recv_roam_adv(struct sk_buff *skb, struct batadv_hard_iface *recv_if)
 {
-        struct bat_priv *bat_priv = netdev_priv(recv_if->soft_iface);
-        struct roam_adv_packet *roam_adv_packet;
-        struct orig_node *orig_node;
+        struct batadv_priv *bat_priv = netdev_priv(recv_if->soft_iface);
+        struct batadv_roam_adv_packet *roam_adv_packet;
+        struct batadv_orig_node *orig_node;
         struct ethhdr *ethhdr;
 
         /* drop packet if it has not necessary minimum size */
-        if (unlikely(!pskb_may_pull(skb, sizeof(struct roam_adv_packet))))
+        if (unlikely(!pskb_may_pull(skb,
+                                    sizeof(struct batadv_roam_adv_packet))))
                 goto out;
 
         ethhdr = (struct ethhdr *)skb_mac_header(skb);
@@ -665,35 +691,39 @@ int recv_roam_adv(struct sk_buff *skb, struct hard_iface *recv_if)
         if (is_broadcast_ether_addr(ethhdr->h_source))
                 goto out;
 
-        roam_adv_packet = (struct roam_adv_packet *)skb->data;
+        batadv_inc_counter(bat_priv, BATADV_CNT_TT_ROAM_ADV_RX);
+
+        roam_adv_packet = (struct batadv_roam_adv_packet *)skb->data;
 
-        if (!is_my_mac(roam_adv_packet->dst))
-                return route_unicast_packet(skb, recv_if);
+        if (!batadv_is_my_mac(roam_adv_packet->dst))
+                return batadv_route_unicast_packet(skb, recv_if);
 
         /* check if it is a backbone gateway. we don't accept
          * roaming advertisement from it, as it has the same
          * entries as we have.
          */
-        if (bla_is_backbone_gw_orig(bat_priv, roam_adv_packet->src))
+        if (batadv_bla_is_backbone_gw_orig(bat_priv, roam_adv_packet->src))
                 goto out;
 
-        orig_node = orig_hash_find(bat_priv, roam_adv_packet->src);
+        orig_node = batadv_orig_hash_find(bat_priv, roam_adv_packet->src);
         if (!orig_node)
                 goto out;
 
-        bat_dbg(DBG_TT, bat_priv,
-                "Received ROAMING_ADV from %pM (client %pM)\n",
-                roam_adv_packet->src, roam_adv_packet->client);
+        batadv_dbg(BATADV_DBG_TT, bat_priv,
+                   "Received ROAMING_ADV from %pM (client %pM)\n",
+                   roam_adv_packet->src, roam_adv_packet->client);
 
-        tt_global_add(bat_priv, orig_node, roam_adv_packet->client,
-                      atomic_read(&orig_node->last_ttvn) + 1, true, false);
+        batadv_tt_global_add(bat_priv, orig_node, roam_adv_packet->client,
+                             BATADV_TT_CLIENT_ROAM,
+                             atomic_read(&orig_node->last_ttvn) + 1);
 
         /* Roaming phase starts: I have new information but the ttvn has not
          * been incremented yet. This flag will make me check all the incoming
-         * packets for the correct destination. */
+         * packets for the correct destination.
+         */
         bat_priv->tt_poss_change = true;
 
-        orig_node_free_ref(orig_node);
+        batadv_orig_node_free_ref(orig_node);
 out:
         /* returning NET_RX_DROP will make the caller function kfree the skb */
         return NET_RX_DROP;
@@ -701,26 +731,30 @@ out:
 
 /* find a suitable router for this originator, and use
  * bonding if possible. increases the found neighbors
- * refcount.*/
-struct neigh_node *find_router(struct bat_priv *bat_priv,
-                               struct orig_node *orig_node,
-                               const struct hard_iface *recv_if)
+ * refcount.
+ */
+struct batadv_neigh_node *
+batadv_find_router(struct batadv_priv *bat_priv,
+                   struct batadv_orig_node *orig_node,
+                   const struct batadv_hard_iface *recv_if)
 {
-        struct orig_node *primary_orig_node;
-        struct orig_node *router_orig;
-        struct neigh_node *router;
+        struct batadv_orig_node *primary_orig_node;
+        struct batadv_orig_node *router_orig;
+        struct batadv_neigh_node *router;
         static uint8_t zero_mac[ETH_ALEN] = {0, 0, 0, 0, 0, 0};
         int bonding_enabled;
+        uint8_t *primary_addr;
 
         if (!orig_node)
                 return NULL;
 
-        router = orig_node_get_router(orig_node);
+        router = batadv_orig_node_get_router(orig_node);
         if (!router)
                 goto err;
 
         /* without bonding, the first node should
-         * always choose the default router. */
+         * always choose the default router.
+         */
         bonding_enabled = atomic_read(&bat_priv->bonding);
 
         rcu_read_lock();
@@ -732,43 +766,47 @@ struct neigh_node *find_router(struct bat_priv *bat_priv,
         if ((!recv_if) && (!bonding_enabled))
                 goto return_router;
 
+        primary_addr = router_orig->primary_addr;
+
         /* if we have something in the primary_addr, we can search
-         * for a potential bonding candidate. */
-        if (compare_eth(router_orig->primary_addr, zero_mac))
+         * for a potential bonding candidate.
+         */
+        if (batadv_compare_eth(primary_addr, zero_mac))
                 goto return_router;
 
         /* find the orig_node which has the primary interface. might
-         * even be the same as our router_orig in many cases */
-
-        if (compare_eth(router_orig->primary_addr, router_orig->orig)) {
+         * even be the same as our router_orig in many cases
+         */
+        if (batadv_compare_eth(primary_addr, router_orig->orig)) {
                 primary_orig_node = router_orig;
         } else {
-                primary_orig_node = orig_hash_find(bat_priv,
-                                                   router_orig->primary_addr);
+                primary_orig_node = batadv_orig_hash_find(bat_priv,
+                                                          primary_addr);
                 if (!primary_orig_node)
                         goto return_router;
 
-                orig_node_free_ref(primary_orig_node);
+                batadv_orig_node_free_ref(primary_orig_node);
         }
 
         /* with less than 2 candidates, we can't do any
-         * bonding and prefer the original router. */
+         * bonding and prefer the original router.
+         */
         if (atomic_read(&primary_orig_node->bond_candidates) < 2)
                 goto return_router;
 
         /* all nodes between should choose a candidate which
          * is is not on the interface where the packet came
-         * in. */
-
-        neigh_node_free_ref(router);
+         * in.
+         */
+        batadv_neigh_node_free_ref(router);
 
         if (bonding_enabled)
-                router = find_bond_router(primary_orig_node, recv_if);
+                router = batadv_find_bond_router(primary_orig_node, recv_if);
         else
-                router = find_ifalter_router(primary_orig_node, recv_if);
+                router = batadv_find_ifalter_router(primary_orig_node, recv_if);
 
 return_router:
-        if (router && router->if_incoming->if_status != IF_ACTIVE)
+        if (router && router->if_incoming->if_status != BATADV_IF_ACTIVE)
                 goto err_unlock;
 
         rcu_read_unlock();
@@ -777,11 +815,11 @@ err_unlock:
         rcu_read_unlock();
 err:
         if (router)
-                neigh_node_free_ref(router);
+                batadv_neigh_node_free_ref(router);
         return NULL;
 }
 
-static int check_unicast_packet(struct sk_buff *skb, int hdr_size)
+static int batadv_check_unicast_packet(struct sk_buff *skb, int hdr_size)
 {
         struct ethhdr *ethhdr;
 
@@ -800,23 +838,24 @@ static int check_unicast_packet(struct sk_buff *skb, int hdr_size)
                 return -1;
 
         /* not for me */
-        if (!is_my_mac(ethhdr->h_dest))
+        if (!batadv_is_my_mac(ethhdr->h_dest))
                 return -1;
 
         return 0;
 }
 
-static int route_unicast_packet(struct sk_buff *skb, struct hard_iface *recv_if)
+static int batadv_route_unicast_packet(struct sk_buff *skb,
+                                       struct batadv_hard_iface *recv_if)
 {
-        struct bat_priv *bat_priv = netdev_priv(recv_if->soft_iface);
-        struct orig_node *orig_node = NULL;
-        struct neigh_node *neigh_node = NULL;
-        struct unicast_packet *unicast_packet;
+        struct batadv_priv *bat_priv = netdev_priv(recv_if->soft_iface);
+        struct batadv_orig_node *orig_node = NULL;
+        struct batadv_neigh_node *neigh_node = NULL;
+        struct batadv_unicast_packet *unicast_packet;
         struct ethhdr *ethhdr = (struct ethhdr *)skb_mac_header(skb);
         int ret = NET_RX_DROP;
         struct sk_buff *new_skb;
 
-        unicast_packet = (struct unicast_packet *)skb->data;
+        unicast_packet = (struct batadv_unicast_packet *)skb->data;
 
         /* TTL exceeded */
         if (unicast_packet->header.ttl < 2) {
@@ -826,13 +865,13 @@ static int route_unicast_packet(struct sk_buff *skb, struct hard_iface *recv_if)
         }
 
         /* get routing information */
-        orig_node = orig_hash_find(bat_priv, unicast_packet->dest);
+        orig_node = batadv_orig_hash_find(bat_priv, unicast_packet->dest);
 
         if (!orig_node)
                 goto out;
 
         /* find_router() increases neigh_nodes refcount if found. */
-        neigh_node = find_router(bat_priv, orig_node, recv_if);
+        neigh_node = batadv_find_router(bat_priv, orig_node, recv_if);
 
         if (!neigh_node)
                 goto out;
@@ -841,20 +880,22 @@ static int route_unicast_packet(struct sk_buff *skb, struct hard_iface *recv_if)
         if (skb_cow(skb, ETH_HLEN) < 0)
                 goto out;
 
-        unicast_packet = (struct unicast_packet *)skb->data;
+        unicast_packet = (struct batadv_unicast_packet *)skb->data;
 
-        if (unicast_packet->header.packet_type == BAT_UNICAST &&
+        if (unicast_packet->header.packet_type == BATADV_UNICAST &&
             atomic_read(&bat_priv->fragmentation) &&
             skb->len > neigh_node->if_incoming->net_dev->mtu) {
-                ret = frag_send_skb(skb, bat_priv,
-                                    neigh_node->if_incoming, neigh_node->addr);
+                ret = batadv_frag_send_skb(skb, bat_priv,
+                                           neigh_node->if_incoming,
+                                           neigh_node->addr);
                 goto out;
         }
 
-        if (unicast_packet->header.packet_type == BAT_UNICAST_FRAG &&
-            frag_can_reassemble(skb, neigh_node->if_incoming->net_dev->mtu)) {
+        if (unicast_packet->header.packet_type == BATADV_UNICAST_FRAG &&
+            batadv_frag_can_reassemble(skb,
+                                       neigh_node->if_incoming->net_dev->mtu)) {
 
-                ret = frag_reassemble_skb(skb, bat_priv, &new_skb);
+                ret = batadv_frag_reassemble_skb(skb, bat_priv, &new_skb);
 
                 if (ret == NET_RX_DROP)
                         goto out;
@@ -866,141 +907,153 @@ static int route_unicast_packet(struct sk_buff *skb, struct hard_iface *recv_if)
                 }
 
                 skb = new_skb;
-                unicast_packet = (struct unicast_packet *)skb->data;
+                unicast_packet = (struct batadv_unicast_packet *)skb->data;
         }
 
         /* decrement ttl */
         unicast_packet->header.ttl--;
 
+        /* Update stats counter */
+        batadv_inc_counter(bat_priv, BATADV_CNT_FORWARD);
+        batadv_add_counter(bat_priv, BATADV_CNT_FORWARD_BYTES,
+                           skb->len + ETH_HLEN);
+
         /* route it */
-        send_skb_packet(skb, neigh_node->if_incoming, neigh_node->addr);
+        batadv_send_skb_packet(skb, neigh_node->if_incoming, neigh_node->addr);
         ret = NET_RX_SUCCESS;
 
 out:
         if (neigh_node)
-                neigh_node_free_ref(neigh_node);
+                batadv_neigh_node_free_ref(neigh_node);
         if (orig_node)
-                orig_node_free_ref(orig_node);
+                batadv_orig_node_free_ref(orig_node);
         return ret;
 }
 
-static int check_unicast_ttvn(struct bat_priv *bat_priv,
-                               struct sk_buff *skb) {
+static int batadv_check_unicast_ttvn(struct batadv_priv *bat_priv,
+                                     struct sk_buff *skb) {
         uint8_t curr_ttvn;
-        struct orig_node *orig_node;
+        struct batadv_orig_node *orig_node;
         struct ethhdr *ethhdr;
-        struct hard_iface *primary_if;
-        struct unicast_packet *unicast_packet;
+        struct batadv_hard_iface *primary_if;
+        struct batadv_unicast_packet *unicast_packet;
         bool tt_poss_change;
+        int is_old_ttvn;
 
         /* I could need to modify it */
-        if (skb_cow(skb, sizeof(struct unicast_packet)) < 0)
+        if (skb_cow(skb, sizeof(struct batadv_unicast_packet)) < 0)
                 return 0;
 
-        unicast_packet = (struct unicast_packet *)skb->data;
+        unicast_packet = (struct batadv_unicast_packet *)skb->data;
 
-        if (is_my_mac(unicast_packet->dest)) {
+        if (batadv_is_my_mac(unicast_packet->dest)) {
                 tt_poss_change = bat_priv->tt_poss_change;
                 curr_ttvn = (uint8_t)atomic_read(&bat_priv->ttvn);
         } else {
-                orig_node = orig_hash_find(bat_priv, unicast_packet->dest);
+                orig_node = batadv_orig_hash_find(bat_priv,
+                                                  unicast_packet->dest);
 
                 if (!orig_node)
                         return 0;
 
                 curr_ttvn = (uint8_t)atomic_read(&orig_node->last_ttvn);
                 tt_poss_change = orig_node->tt_poss_change;
-                orig_node_free_ref(orig_node);
+                batadv_orig_node_free_ref(orig_node);
         }
 
         /* Check whether I have to reroute the packet */
-        if (seq_before(unicast_packet->ttvn, curr_ttvn) || tt_poss_change) {
+        is_old_ttvn = batadv_seq_before(unicast_packet->ttvn, curr_ttvn);
+        if (is_old_ttvn || tt_poss_change) {
                 /* check if there is enough data before accessing it */
-                if (pskb_may_pull(skb, sizeof(struct unicast_packet) +
+                if (pskb_may_pull(skb, sizeof(struct batadv_unicast_packet) +
                                   ETH_HLEN) < 0)
                         return 0;
 
-                ethhdr = (struct ethhdr *)(skb->data +
-                        sizeof(struct unicast_packet));
+                ethhdr = (struct ethhdr *)(skb->data + sizeof(*unicast_packet));
 
                 /* we don't have an updated route for this client, so we should
                  * not try to reroute the packet!!
                  */
-                if (tt_global_client_is_roaming(bat_priv, ethhdr->h_dest))
+                if (batadv_tt_global_client_is_roaming(bat_priv,
+                                                       ethhdr->h_dest))
                         return 1;
 
-                orig_node = transtable_search(bat_priv, NULL, ethhdr->h_dest);
+                orig_node = batadv_transtable_search(bat_priv, NULL,
+                                                     ethhdr->h_dest);
 
                 if (!orig_node) {
-                        if (!is_my_client(bat_priv, ethhdr->h_dest))
+                        if (!batadv_is_my_client(bat_priv, ethhdr->h_dest))
                                 return 0;
-                        primary_if = primary_if_get_selected(bat_priv);
+                        primary_if = batadv_primary_if_get_selected(bat_priv);
                         if (!primary_if)
                                 return 0;
                         memcpy(unicast_packet->dest,
                                primary_if->net_dev->dev_addr, ETH_ALEN);
-                        hardif_free_ref(primary_if);
+                        batadv_hardif_free_ref(primary_if);
                 } else {
                         memcpy(unicast_packet->dest, orig_node->orig,
                                ETH_ALEN);
                         curr_ttvn = (uint8_t)
                                 atomic_read(&orig_node->last_ttvn);
-                        orig_node_free_ref(orig_node);
+                        batadv_orig_node_free_ref(orig_node);
                 }
 
-                bat_dbg(DBG_ROUTES, bat_priv,
-                        "TTVN mismatch (old_ttvn %u new_ttvn %u)! Rerouting unicast packet (for %pM) to %pM\n",
-                        unicast_packet->ttvn, curr_ttvn, ethhdr->h_dest,
-                        unicast_packet->dest);
+                batadv_dbg(BATADV_DBG_ROUTES, bat_priv,
+                           "TTVN mismatch (old_ttvn %u new_ttvn %u)! Rerouting unicast packet (for %pM) to %pM\n",
+                           unicast_packet->ttvn, curr_ttvn, ethhdr->h_dest,
+                           unicast_packet->dest);
 
                 unicast_packet->ttvn = curr_ttvn;
         }
         return 1;
 }
 
-int recv_unicast_packet(struct sk_buff *skb, struct hard_iface *recv_if)
+int batadv_recv_unicast_packet(struct sk_buff *skb,
+                               struct batadv_hard_iface *recv_if)
 {
-        struct bat_priv *bat_priv = netdev_priv(recv_if->soft_iface);
-        struct unicast_packet *unicast_packet;
+        struct batadv_priv *bat_priv = netdev_priv(recv_if->soft_iface);
+        struct batadv_unicast_packet *unicast_packet;
         int hdr_size = sizeof(*unicast_packet);
 
-        if (check_unicast_packet(skb, hdr_size) < 0)
+        if (batadv_check_unicast_packet(skb, hdr_size) < 0)
                 return NET_RX_DROP;
 
-        if (!check_unicast_ttvn(bat_priv, skb))
+        if (!batadv_check_unicast_ttvn(bat_priv, skb))
                 return NET_RX_DROP;
 
-        unicast_packet = (struct unicast_packet *)skb->data;
+        unicast_packet = (struct batadv_unicast_packet *)skb->data;
 
         /* packet for me */
-        if (is_my_mac(unicast_packet->dest)) {
-                interface_rx(recv_if->soft_iface, skb, recv_if, hdr_size);
+        if (batadv_is_my_mac(unicast_packet->dest)) {
+                batadv_interface_rx(recv_if->soft_iface, skb, recv_if,
+                                    hdr_size);
                 return NET_RX_SUCCESS;
         }
 
-        return route_unicast_packet(skb, recv_if);
+        return batadv_route_unicast_packet(skb, recv_if);
 }
 
-int recv_ucast_frag_packet(struct sk_buff *skb, struct hard_iface *recv_if)
+int batadv_recv_ucast_frag_packet(struct sk_buff *skb,
+                                  struct batadv_hard_iface *recv_if)
 {
-        struct bat_priv *bat_priv = netdev_priv(recv_if->soft_iface);
-        struct unicast_frag_packet *unicast_packet;
+        struct batadv_priv *bat_priv = netdev_priv(recv_if->soft_iface);
+        struct batadv_unicast_frag_packet *unicast_packet;
         int hdr_size = sizeof(*unicast_packet);
         struct sk_buff *new_skb = NULL;
         int ret;
 
-        if (check_unicast_packet(skb, hdr_size) < 0)
+        if (batadv_check_unicast_packet(skb, hdr_size) < 0)
                 return NET_RX_DROP;
 
-        if (!check_unicast_ttvn(bat_priv, skb))
+        if (!batadv_check_unicast_ttvn(bat_priv, skb))
                 return NET_RX_DROP;
 
-        unicast_packet = (struct unicast_frag_packet *)skb->data;
+        unicast_packet = (struct batadv_unicast_frag_packet *)skb->data;
 
         /* packet for me */
-        if (is_my_mac(unicast_packet->dest)) {
+        if (batadv_is_my_mac(unicast_packet->dest)) {
 
-                ret = frag_reassemble_skb(skb, bat_priv, &new_skb);
+                ret = batadv_frag_reassemble_skb(skb, bat_priv, &new_skb);
 
                 if (ret == NET_RX_DROP)
                         return NET_RX_DROP;
@@ -1009,20 +1062,21 @@ int recv_ucast_frag_packet(struct sk_buff *skb, struct hard_iface *recv_if)
                 if (!new_skb)
                         return NET_RX_SUCCESS;
 
-                interface_rx(recv_if->soft_iface, new_skb, recv_if,
-                             sizeof(struct unicast_packet));
+                batadv_interface_rx(recv_if->soft_iface, new_skb, recv_if,
+                                    sizeof(struct batadv_unicast_packet));
                 return NET_RX_SUCCESS;
         }
 
-        return route_unicast_packet(skb, recv_if);
+        return batadv_route_unicast_packet(skb, recv_if);
 }
 
 
-int recv_bcast_packet(struct sk_buff *skb, struct hard_iface *recv_if)
+int batadv_recv_bcast_packet(struct sk_buff *skb,
+                             struct batadv_hard_iface *recv_if)
 {
-        struct bat_priv *bat_priv = netdev_priv(recv_if->soft_iface);
-        struct orig_node *orig_node = NULL;
-        struct bcast_packet *bcast_packet;
+        struct batadv_priv *bat_priv = netdev_priv(recv_if->soft_iface);
+        struct batadv_orig_node *orig_node = NULL;
+        struct batadv_bcast_packet *bcast_packet;
         struct ethhdr *ethhdr;
         int hdr_size = sizeof(*bcast_packet);
         int ret = NET_RX_DROP;
@@ -1043,19 +1097,19 @@ int recv_bcast_packet(struct sk_buff *skb, struct hard_iface *recv_if)
                 goto out;
 
         /* ignore broadcasts sent by myself */
-        if (is_my_mac(ethhdr->h_source))
+        if (batadv_is_my_mac(ethhdr->h_source))
                 goto out;
 
-        bcast_packet = (struct bcast_packet *)skb->data;
+        bcast_packet = (struct batadv_bcast_packet *)skb->data;
 
         /* ignore broadcasts originated by myself */
-        if (is_my_mac(bcast_packet->orig))
+        if (batadv_is_my_mac(bcast_packet->orig))
                 goto out;
 
         if (bcast_packet->header.ttl < 2)
                 goto out;
 
-        orig_node = orig_hash_find(bat_priv, bcast_packet->orig);
+        orig_node = batadv_orig_hash_find(bat_priv, bcast_packet->orig);
 
         if (!orig_node)
                 goto out;
@@ -1063,39 +1117,40 @@ int recv_bcast_packet(struct sk_buff *skb, struct hard_iface *recv_if)
         spin_lock_bh(&orig_node->bcast_seqno_lock);
 
         /* check whether the packet is a duplicate */
-        if (bat_test_bit(orig_node->bcast_bits, orig_node->last_bcast_seqno,
-                         ntohl(bcast_packet->seqno)))
+        if (batadv_test_bit(orig_node->bcast_bits, orig_node->last_bcast_seqno,
+                            ntohl(bcast_packet->seqno)))
                 goto spin_unlock;
 
         seq_diff = ntohl(bcast_packet->seqno) - orig_node->last_bcast_seqno;
 
         /* check whether the packet is old and the host just restarted. */
-        if (window_protected(bat_priv, seq_diff,
-                             &orig_node->bcast_seqno_reset))
+        if (batadv_window_protected(bat_priv, seq_diff,
+                                    &orig_node->bcast_seqno_reset))
                 goto spin_unlock;
 
         /* mark broadcast in flood history, update window position
-         * if required. */
-        if (bit_get_packet(bat_priv, orig_node->bcast_bits, seq_diff, 1))
+         * if required.
+         */
+        if (batadv_bit_get_packet(bat_priv, orig_node->bcast_bits, seq_diff, 1))
                 orig_node->last_bcast_seqno = ntohl(bcast_packet->seqno);
 
         spin_unlock_bh(&orig_node->bcast_seqno_lock);
 
         /* check whether this has been sent by another originator before */
-        if (bla_check_bcast_duplist(bat_priv, bcast_packet, hdr_size))
+        if (batadv_bla_check_bcast_duplist(bat_priv, bcast_packet, hdr_size))
                 goto out;
 
         /* rebroadcast packet */
-        add_bcast_packet_to_list(bat_priv, skb, 1);
+        batadv_add_bcast_packet_to_list(bat_priv, skb, 1);
 
         /* don't hand the broadcast up if it is from an originator
          * from the same backbone.
          */
-        if (bla_is_backbone_gw(skb, orig_node, hdr_size))
+        if (batadv_bla_is_backbone_gw(skb, orig_node, hdr_size))
                 goto out;
 
         /* broadcast for me */
-        interface_rx(recv_if->soft_iface, skb, recv_if, hdr_size);
+        batadv_interface_rx(recv_if->soft_iface, skb, recv_if, hdr_size);
         ret = NET_RX_SUCCESS;
         goto out;
 
@@ -1103,15 +1158,16 @@ spin_unlock:
         spin_unlock_bh(&orig_node->bcast_seqno_lock);
 out:
         if (orig_node)
-                orig_node_free_ref(orig_node);
+                batadv_orig_node_free_ref(orig_node);
         return ret;
 }
 
-int recv_vis_packet(struct sk_buff *skb, struct hard_iface *recv_if)
+int batadv_recv_vis_packet(struct sk_buff *skb,
+                           struct batadv_hard_iface *recv_if)
 {
-        struct vis_packet *vis_packet;
+        struct batadv_vis_packet *vis_packet;
         struct ethhdr *ethhdr;
-        struct bat_priv *bat_priv = netdev_priv(recv_if->soft_iface);
+        struct batadv_priv *bat_priv = netdev_priv(recv_if->soft_iface);
         int hdr_size = sizeof(*vis_packet);
 
         /* keep skb linear */
@@ -1121,29 +1177,29 @@ int recv_vis_packet(struct sk_buff *skb, struct hard_iface *recv_if)
         if (unlikely(!pskb_may_pull(skb, hdr_size)))
                 return NET_RX_DROP;
 
-        vis_packet = (struct vis_packet *)skb->data;
+        vis_packet = (struct batadv_vis_packet *)skb->data;
         ethhdr = (struct ethhdr *)skb_mac_header(skb);
 
         /* not for me */
-        if (!is_my_mac(ethhdr->h_dest))
+        if (!batadv_is_my_mac(ethhdr->h_dest))
                 return NET_RX_DROP;
 
         /* ignore own packets */
-        if (is_my_mac(vis_packet->vis_orig))
+        if (batadv_is_my_mac(vis_packet->vis_orig))
                 return NET_RX_DROP;
 
-        if (is_my_mac(vis_packet->sender_orig))
+        if (batadv_is_my_mac(vis_packet->sender_orig))
                 return NET_RX_DROP;
 
         switch (vis_packet->vis_type) {
-        case VIS_TYPE_SERVER_SYNC:
-                receive_server_sync_packet(bat_priv, vis_packet,
-                                           skb_headlen(skb));
+        case BATADV_VIS_TYPE_SERVER_SYNC:
+                batadv_receive_server_sync_packet(bat_priv, vis_packet,
+                                                  skb_headlen(skb));
                 break;
 
-        case VIS_TYPE_CLIENT_UPDATE:
-                receive_client_update_packet(bat_priv, vis_packet,
-                                             skb_headlen(skb));
+        case BATADV_VIS_TYPE_CLIENT_UPDATE:
+                batadv_receive_client_update_packet(bat_priv, vis_packet,
+                                                    skb_headlen(skb));
                 break;
 
         default:        /* ignore unknown packet */
@@ -1151,6 +1207,7 @@ int recv_vis_packet(struct sk_buff *skb, struct hard_iface *recv_if)
         }
 
         /* We take a copy of the data in the packet, so we should
-           always free the skbuf. */
+         * always free the skbuf.
+         */
         return NET_RX_DROP;
 }
diff --git a/net/batman-adv/routing.h b/net/batman-adv/routing.h
index d6bbbebb656..9262279ea66 100644
--- a/net/batman-adv/routing.h
+++ b/net/batman-adv/routing.h
@@ -1,5 +1,4 @@
-/*
- * Copyright (C) 2007-2012 B.A.T.M.A.N. contributors:
+/* Copyright (C) 2007-2012 B.A.T.M.A.N. contributors:
  *
  * Marek Lindner, Simon Wunderlich
  *
@@ -16,36 +15,45 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA
- *
  */
 
 #ifndef _NET_BATMAN_ADV_ROUTING_H_
 #define _NET_BATMAN_ADV_ROUTING_H_
 
-void slide_own_bcast_window(struct hard_iface *hard_iface);
-bool check_management_packet(struct sk_buff *skb,
-                             struct hard_iface *hard_iface,
-                             int header_len);
-void update_route(struct bat_priv *bat_priv, struct orig_node *orig_node,
-                  struct neigh_node *neigh_node);
-int recv_icmp_packet(struct sk_buff *skb, struct hard_iface *recv_if);
-int recv_unicast_packet(struct sk_buff *skb, struct hard_iface *recv_if);
-int recv_ucast_frag_packet(struct sk_buff *skb, struct hard_iface *recv_if);
-int recv_bcast_packet(struct sk_buff *skb, struct hard_iface *recv_if);
-int recv_vis_packet(struct sk_buff *skb, struct hard_iface *recv_if);
-int recv_tt_query(struct sk_buff *skb, struct hard_iface *recv_if);
-int recv_roam_adv(struct sk_buff *skb, struct hard_iface *recv_if);
-struct neigh_node *find_router(struct bat_priv *bat_priv,
-                               struct orig_node *orig_node,
-                               const struct hard_iface *recv_if);
-void bonding_candidate_del(struct orig_node *orig_node,
-                           struct neigh_node *neigh_node);
-void bonding_candidate_add(struct orig_node *orig_node,
-                           struct neigh_node *neigh_node);
-void bonding_save_primary(const struct orig_node *orig_node,
-                          struct orig_node *orig_neigh_node,
-                          const struct batman_ogm_packet *batman_ogm_packet);
-int window_protected(struct bat_priv *bat_priv, int32_t seq_num_diff,
-                     unsigned long *last_reset);
+void batadv_slide_own_bcast_window(struct batadv_hard_iface *hard_iface);
+bool batadv_check_management_packet(struct sk_buff *skb,
+                                    struct batadv_hard_iface *hard_iface,
+                                    int header_len);
+void batadv_update_route(struct batadv_priv *bat_priv,
+                         struct batadv_orig_node *orig_node,
+                         struct batadv_neigh_node *neigh_node);
+int batadv_recv_icmp_packet(struct sk_buff *skb,
+                            struct batadv_hard_iface *recv_if);
+int batadv_recv_unicast_packet(struct sk_buff *skb,
+                               struct batadv_hard_iface *recv_if);
+int batadv_recv_ucast_frag_packet(struct sk_buff *skb,
+                                  struct batadv_hard_iface *recv_if);
+int batadv_recv_bcast_packet(struct sk_buff *skb,
+                             struct batadv_hard_iface *recv_if);
+int batadv_recv_vis_packet(struct sk_buff *skb,
+                           struct batadv_hard_iface *recv_if);
+int batadv_recv_tt_query(struct sk_buff *skb,
+                         struct batadv_hard_iface *recv_if);
+int batadv_recv_roam_adv(struct sk_buff *skb,
+                         struct batadv_hard_iface *recv_if);
+struct batadv_neigh_node *
+batadv_find_router(struct batadv_priv *bat_priv,
+                   struct batadv_orig_node *orig_node,
+                   const struct batadv_hard_iface *recv_if);
+void batadv_bonding_candidate_del(struct batadv_orig_node *orig_node,
+                                  struct batadv_neigh_node *neigh_node);
+void batadv_bonding_candidate_add(struct batadv_orig_node *orig_node,
+                                  struct batadv_neigh_node *neigh_node);
+void batadv_bonding_save_primary(const struct batadv_orig_node *orig_node,
+                                 struct batadv_orig_node *orig_neigh_node,
+                                 const struct batadv_ogm_packet
+                                 *batman_ogm_packet);
+int batadv_window_protected(struct batadv_priv *bat_priv, int32_t seq_num_diff,
+                            unsigned long *last_reset);
 
 #endif /* _NET_BATMAN_ADV_ROUTING_H_ */
diff --git a/net/batman-adv/send.c b/net/batman-adv/send.c
index f47299f22c6..3b4b2daa3b3 100644
--- a/net/batman-adv/send.c
+++ b/net/batman-adv/send.c
@@ -1,5 +1,4 @@
-/*
- * Copyright (C) 2007-2012 B.A.T.M.A.N. contributors:
+/* Copyright (C) 2007-2012 B.A.T.M.A.N. contributors:
  *
  * Marek Lindner, Simon Wunderlich
  *
@@ -16,7 +15,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA
- *
  */
 
 #include "main.h"
@@ -29,16 +27,18 @@
 #include "gateway_common.h"
 #include "originator.h"
 
-static void send_outstanding_bcast_packet(struct work_struct *work);
+static void batadv_send_outstanding_bcast_packet(struct work_struct *work);
 
 /* send out an already prepared packet to the given address via the
- * specified batman interface */
-int send_skb_packet(struct sk_buff *skb, struct hard_iface *hard_iface,
-                    const uint8_t *dst_addr)
+ * specified batman interface
+ */
+int batadv_send_skb_packet(struct sk_buff *skb,
+                           struct batadv_hard_iface *hard_iface,
+                           const uint8_t *dst_addr)
 {
         struct ethhdr *ethhdr;
 
-        if (hard_iface->if_status != IF_ACTIVE)
+        if (hard_iface->if_status != BATADV_IF_ACTIVE)
                 goto send_skb_err;
 
         if (unlikely(!hard_iface->net_dev))
@@ -51,7 +51,7 @@ int send_skb_packet(struct sk_buff *skb, struct hard_iface *hard_iface,
         }
 
         /* push to the ethernet header. */
-        if (my_skb_head_push(skb, ETH_HLEN) < 0)
+        if (batadv_skb_head_push(skb, ETH_HLEN) < 0)
                 goto send_skb_err;
 
         skb_reset_mac_header(skb);
@@ -59,129 +59,57 @@ int send_skb_packet(struct sk_buff *skb, struct hard_iface *hard_iface,
         ethhdr = (struct ethhdr *)skb_mac_header(skb);
         memcpy(ethhdr->h_source, hard_iface->net_dev->dev_addr, ETH_ALEN);
         memcpy(ethhdr->h_dest, dst_addr, ETH_ALEN);
-        ethhdr->h_proto = __constant_htons(ETH_P_BATMAN);
+        ethhdr->h_proto = __constant_htons(BATADV_ETH_P_BATMAN);
 
         skb_set_network_header(skb, ETH_HLEN);
         skb->priority = TC_PRIO_CONTROL;
-        skb->protocol = __constant_htons(ETH_P_BATMAN);
+        skb->protocol = __constant_htons(BATADV_ETH_P_BATMAN);
 
         skb->dev = hard_iface->net_dev;
 
         /* dev_queue_xmit() returns a negative result on error.  However on
          * congestion and traffic shaping, it drops and returns NET_XMIT_DROP
-         * (which is > 0). This will not be treated as an error. */
-
+         * (which is > 0). This will not be treated as an error.
+         */
         return dev_queue_xmit(skb);
 send_skb_err:
         kfree_skb(skb);
         return NET_XMIT_DROP;
 }
 
-static void realloc_packet_buffer(struct hard_iface *hard_iface,
-                                  int new_len)
+void batadv_schedule_bat_ogm(struct batadv_hard_iface *hard_iface)
 {
-        unsigned char *new_buff;
-
-        new_buff = kmalloc(new_len, GFP_ATOMIC);
-
-        /* keep old buffer if kmalloc should fail */
-        if (new_buff) {
-                memcpy(new_buff, hard_iface->packet_buff,
-                       BATMAN_OGM_HLEN);
-
-                kfree(hard_iface->packet_buff);
-                hard_iface->packet_buff = new_buff;
-                hard_iface->packet_len = new_len;
-        }
-}
+        struct batadv_priv *bat_priv = netdev_priv(hard_iface->soft_iface);
 
-/* when calling this function (hard_iface == primary_if) has to be true */
-static int prepare_packet_buffer(struct bat_priv *bat_priv,
-                                  struct hard_iface *hard_iface)
-{
-        int new_len;
-
-        new_len = BATMAN_OGM_HLEN +
-                  tt_len((uint8_t)atomic_read(&bat_priv->tt_local_changes));
-
-        /* if we have too many changes for one packet don't send any
-         * and wait for the tt table request which will be fragmented */
-        if (new_len > hard_iface->soft_iface->mtu)
-                new_len = BATMAN_OGM_HLEN;
-
-        realloc_packet_buffer(hard_iface, new_len);
-
-        atomic_set(&bat_priv->tt_crc, tt_local_crc(bat_priv));
-
-        /* reset the sending counter */
-        atomic_set(&bat_priv->tt_ogm_append_cnt, TT_OGM_APPEND_MAX);
-
-        return tt_changes_fill_buffer(bat_priv,
-                                      hard_iface->packet_buff + BATMAN_OGM_HLEN,
-                                      hard_iface->packet_len - BATMAN_OGM_HLEN);
-}
-
-static int reset_packet_buffer(struct bat_priv *bat_priv,
-                                struct hard_iface *hard_iface)
-{
-        realloc_packet_buffer(hard_iface, BATMAN_OGM_HLEN);
-        return 0;
-}
-
-void schedule_bat_ogm(struct hard_iface *hard_iface)
-{
-        struct bat_priv *bat_priv = netdev_priv(hard_iface->soft_iface);
-        struct hard_iface *primary_if;
-        int tt_num_changes = -1;
-
-        if ((hard_iface->if_status == IF_NOT_IN_USE) ||
-            (hard_iface->if_status == IF_TO_BE_REMOVED))
+        if ((hard_iface->if_status == BATADV_IF_NOT_IN_USE) ||
+            (hard_iface->if_status == BATADV_IF_TO_BE_REMOVED))
                 return;
 
-        /**
-         * the interface gets activated here to avoid race conditions between
+        /* the interface gets activated here to avoid race conditions between
          * the moment of activating the interface in
          * hardif_activate_interface() where the originator mac is set and
          * outdated packets (especially uninitialized mac addresses) in the
          * packet queue
          */
-        if (hard_iface->if_status == IF_TO_BE_ACTIVATED)
-                hard_iface->if_status = IF_ACTIVE;
-
-        primary_if = primary_if_get_selected(bat_priv);
-
-        if (hard_iface == primary_if) {
-                /* if at least one change happened */
-                if (atomic_read(&bat_priv->tt_local_changes) > 0) {
-                        tt_commit_changes(bat_priv);
-                        tt_num_changes = prepare_packet_buffer(bat_priv,
-                                                               hard_iface);
-                }
-
-                /* if the changes have been sent often enough */
-                if (!atomic_dec_not_zero(&bat_priv->tt_ogm_append_cnt))
-                        tt_num_changes = reset_packet_buffer(bat_priv,
-                                                             hard_iface);
-        }
-
-        if (primary_if)
-                hardif_free_ref(primary_if);
+        if (hard_iface->if_status == BATADV_IF_TO_BE_ACTIVATED)
+                hard_iface->if_status = BATADV_IF_ACTIVE;
 
-        bat_priv->bat_algo_ops->bat_ogm_schedule(hard_iface, tt_num_changes);
+        bat_priv->bat_algo_ops->bat_ogm_schedule(hard_iface);
 }
 
-static void forw_packet_free(struct forw_packet *forw_packet)
+static void batadv_forw_packet_free(struct batadv_forw_packet *forw_packet)
 {
         if (forw_packet->skb)
                 kfree_skb(forw_packet->skb);
         if (forw_packet->if_incoming)
-                hardif_free_ref(forw_packet->if_incoming);
+                batadv_hardif_free_ref(forw_packet->if_incoming);
         kfree(forw_packet);
 }
 
-static void _add_bcast_packet_to_list(struct bat_priv *bat_priv,
-                                      struct forw_packet *forw_packet,
-                                      unsigned long send_time)
+static void
+_batadv_add_bcast_packet_to_list(struct batadv_priv *bat_priv,
+                                 struct batadv_forw_packet *forw_packet,
+                                 unsigned long send_time)
 {
         INIT_HLIST_NODE(&forw_packet->list);
 
@@ -192,8 +120,8 @@ static void _add_bcast_packet_to_list(struct bat_priv *bat_priv,
 
         /* start timer for this packet */
         INIT_DELAYED_WORK(&forw_packet->delayed_work,
-                          send_outstanding_bcast_packet);
-        queue_delayed_work(bat_event_workqueue, &forw_packet->delayed_work,
+                          batadv_send_outstanding_bcast_packet);
+        queue_delayed_work(batadv_event_workqueue, &forw_packet->delayed_work,
                            send_time);
 }
 
@@ -204,21 +132,24 @@ static void _add_bcast_packet_to_list(struct bat_priv *bat_priv,
  * errors.
  *
  * The skb is not consumed, so the caller should make sure that the
- * skb is freed. */
-int add_bcast_packet_to_list(struct bat_priv *bat_priv,
-                             const struct sk_buff *skb, unsigned long delay)
+ * skb is freed.
+ */
+int batadv_add_bcast_packet_to_list(struct batadv_priv *bat_priv,
+                                    const struct sk_buff *skb,
+                                    unsigned long delay)
 {
-        struct hard_iface *primary_if = NULL;
-        struct forw_packet *forw_packet;
-        struct bcast_packet *bcast_packet;
+        struct batadv_hard_iface *primary_if = NULL;
+        struct batadv_forw_packet *forw_packet;
+        struct batadv_bcast_packet *bcast_packet;
         struct sk_buff *newskb;
 
-        if (!atomic_dec_not_zero(&bat_priv->bcast_queue_left)) {
-                bat_dbg(DBG_BATMAN, bat_priv, "bcast packet queue full\n");
+        if (!batadv_atomic_dec_not_zero(&bat_priv->bcast_queue_left)) {
+                batadv_dbg(BATADV_DBG_BATMAN, bat_priv,
+                           "bcast packet queue full\n");
                 goto out;
         }
 
-        primary_if = primary_if_get_selected(bat_priv);
+        primary_if = batadv_primary_if_get_selected(bat_priv);
         if (!primary_if)
                 goto out_and_inc;
 
@@ -232,7 +163,7 @@ int add_bcast_packet_to_list(struct bat_priv *bat_priv,
                 goto packet_free;
 
         /* as we have a copy now, it is safe to decrease the TTL */
-        bcast_packet = (struct bcast_packet *)newskb->data;
+        bcast_packet = (struct batadv_bcast_packet *)newskb->data;
         bcast_packet->header.ttl--;
 
         skb_reset_mac_header(newskb);
@@ -243,7 +174,7 @@ int add_bcast_packet_to_list(struct bat_priv *bat_priv,
         /* how often did we send the bcast packet ? */
         forw_packet->num_packets = 0;
 
-        _add_bcast_packet_to_list(bat_priv, forw_packet, delay);
+        _batadv_add_bcast_packet_to_list(bat_priv, forw_packet, delay);
         return NETDEV_TX_OK;
 
 packet_free:
@@ -252,38 +183,43 @@ out_and_inc:
         atomic_inc(&bat_priv->bcast_queue_left);
 out:
         if (primary_if)
-                hardif_free_ref(primary_if);
+                batadv_hardif_free_ref(primary_if);
         return NETDEV_TX_BUSY;
 }
 
-static void send_outstanding_bcast_packet(struct work_struct *work)
+static void batadv_send_outstanding_bcast_packet(struct work_struct *work)
 {
-        struct hard_iface *hard_iface;
+        struct batadv_hard_iface *hard_iface;
         struct delayed_work *delayed_work =
                 container_of(work, struct delayed_work, work);
-        struct forw_packet *forw_packet =
-                container_of(delayed_work, struct forw_packet, delayed_work);
+        struct batadv_forw_packet *forw_packet;
         struct sk_buff *skb1;
-        struct net_device *soft_iface = forw_packet->if_incoming->soft_iface;
-        struct bat_priv *bat_priv = netdev_priv(soft_iface);
+        struct net_device *soft_iface;
+        struct batadv_priv *bat_priv;
+
+        forw_packet = container_of(delayed_work, struct batadv_forw_packet,
+                                   delayed_work);
+        soft_iface = forw_packet->if_incoming->soft_iface;
+        bat_priv = netdev_priv(soft_iface);
 
         spin_lock_bh(&bat_priv->forw_bcast_list_lock);
         hlist_del(&forw_packet->list);
         spin_unlock_bh(&bat_priv->forw_bcast_list_lock);
 
-        if (atomic_read(&bat_priv->mesh_state) == MESH_DEACTIVATING)
+        if (atomic_read(&bat_priv->mesh_state) == BATADV_MESH_DEACTIVATING)
                 goto out;
 
         /* rebroadcast packet */
         rcu_read_lock();
-        list_for_each_entry_rcu(hard_iface, &hardif_list, list) {
+        list_for_each_entry_rcu(hard_iface, &batadv_hardif_list, list) {
                 if (hard_iface->soft_iface != soft_iface)
                         continue;
 
                 /* send a copy of the saved skb */
                 skb1 = skb_clone(forw_packet->skb, GFP_ATOMIC);
                 if (skb1)
-                        send_skb_packet(skb1, hard_iface, broadcast_addr);
+                        batadv_send_skb_packet(skb1, hard_iface,
+                                               batadv_broadcast_addr);
         }
         rcu_read_unlock();
 
@@ -291,72 +227,72 @@ static void send_outstanding_bcast_packet(struct work_struct *work)
 
         /* if we still have some more bcasts to send */
         if (forw_packet->num_packets < 3) {
-                _add_bcast_packet_to_list(bat_priv, forw_packet,
-                                          msecs_to_jiffies(5));
+                _batadv_add_bcast_packet_to_list(bat_priv, forw_packet,
+                                                 msecs_to_jiffies(5));
                 return;
         }
 
 out:
-        forw_packet_free(forw_packet);
+        batadv_forw_packet_free(forw_packet);
         atomic_inc(&bat_priv->bcast_queue_left);
 }
 
-void send_outstanding_bat_ogm_packet(struct work_struct *work)
+void batadv_send_outstanding_bat_ogm_packet(struct work_struct *work)
 {
         struct delayed_work *delayed_work =
                 container_of(work, struct delayed_work, work);
-        struct forw_packet *forw_packet =
-                container_of(delayed_work, struct forw_packet, delayed_work);
-        struct bat_priv *bat_priv;
+        struct batadv_forw_packet *forw_packet;
+        struct batadv_priv *bat_priv;
 
+        forw_packet = container_of(delayed_work, struct batadv_forw_packet,
+                                   delayed_work);
         bat_priv = netdev_priv(forw_packet->if_incoming->soft_iface);
         spin_lock_bh(&bat_priv->forw_bat_list_lock);
         hlist_del(&forw_packet->list);
         spin_unlock_bh(&bat_priv->forw_bat_list_lock);
 
-        if (atomic_read(&bat_priv->mesh_state) == MESH_DEACTIVATING)
+        if (atomic_read(&bat_priv->mesh_state) == BATADV_MESH_DEACTIVATING)
                 goto out;
 
         bat_priv->bat_algo_ops->bat_ogm_emit(forw_packet);
 
-        /**
-         * we have to have at least one packet in the queue
+        /* we have to have at least one packet in the queue
          * to determine the queues wake up time unless we are
          * shutting down
          */
         if (forw_packet->own)
-                schedule_bat_ogm(forw_packet->if_incoming);
+                batadv_schedule_bat_ogm(forw_packet->if_incoming);
 
 out:
         /* don't count own packet */
         if (!forw_packet->own)
                 atomic_inc(&bat_priv->batman_queue_left);
 
-        forw_packet_free(forw_packet);
+        batadv_forw_packet_free(forw_packet);
 }
 
-void purge_outstanding_packets(struct bat_priv *bat_priv,
-                               const struct hard_iface *hard_iface)
+void
+batadv_purge_outstanding_packets(struct batadv_priv *bat_priv,
+                                 const struct batadv_hard_iface *hard_iface)
 {
-        struct forw_packet *forw_packet;
+        struct batadv_forw_packet *forw_packet;
         struct hlist_node *tmp_node, *safe_tmp_node;
         bool pending;
 
         if (hard_iface)
-                bat_dbg(DBG_BATMAN, bat_priv,
-                        "purge_outstanding_packets(): %s\n",
-                        hard_iface->net_dev->name);
+                batadv_dbg(BATADV_DBG_BATMAN, bat_priv,
+                           "purge_outstanding_packets(): %s\n",
+                           hard_iface->net_dev->name);
         else
-                bat_dbg(DBG_BATMAN, bat_priv,
-                        "purge_outstanding_packets()\n");
+                batadv_dbg(BATADV_DBG_BATMAN, bat_priv,
+                           "purge_outstanding_packets()\n");
 
         /* free bcast list */
         spin_lock_bh(&bat_priv->forw_bcast_list_lock);
         hlist_for_each_entry_safe(forw_packet, tmp_node, safe_tmp_node,
                                   &bat_priv->forw_bcast_list, list) {
 
-                /**
-                 * if purge_outstanding_packets() was called with an argument
+                /* if purge_outstanding_packets() was called with an argument
                  * we delete only packets belonging to the given interface
                  */
                 if ((hard_iface) &&
@@ -365,8 +301,7 @@ void purge_outstanding_packets(struct bat_priv *bat_priv,
 
                 spin_unlock_bh(&bat_priv->forw_bcast_list_lock);
 
-                /**
-                 * send_outstanding_bcast_packet() will lock the list to
+                /* batadv_send_outstanding_bcast_packet() will lock the list to
                  * delete the item from the list
                  */
                 pending = cancel_delayed_work_sync(&forw_packet->delayed_work);
@@ -374,7 +309,7 @@ void purge_outstanding_packets(struct bat_priv *bat_priv,
 
                 if (pending) {
                         hlist_del(&forw_packet->list);
-                        forw_packet_free(forw_packet);
+                        batadv_forw_packet_free(forw_packet);
                 }
         }
         spin_unlock_bh(&bat_priv->forw_bcast_list_lock);
@@ -384,8 +319,7 @@ void purge_outstanding_packets(struct bat_priv *bat_priv,
         hlist_for_each_entry_safe(forw_packet, tmp_node, safe_tmp_node,
                                   &bat_priv->forw_bat_list, list) {
 
-                /**
-                 * if purge_outstanding_packets() was called with an argument
+                /* if purge_outstanding_packets() was called with an argument
                  * we delete only packets belonging to the given interface
                  */
                 if ((hard_iface) &&
@@ -394,8 +328,7 @@ void purge_outstanding_packets(struct bat_priv *bat_priv,
 
                 spin_unlock_bh(&bat_priv->forw_bat_list_lock);
 
-                /**
-                 * send_outstanding_bat_packet() will lock the list to
+                /* send_outstanding_bat_packet() will lock the list to
                  * delete the item from the list
                  */
                 pending = cancel_delayed_work_sync(&forw_packet->delayed_work);
@@ -403,7 +336,7 @@ void purge_outstanding_packets(struct bat_priv *bat_priv,
 
                 if (pending) {
                         hlist_del(&forw_packet->list);
-                        forw_packet_free(forw_packet);
+                        batadv_forw_packet_free(forw_packet);
                 }
         }
         spin_unlock_bh(&bat_priv->forw_bat_list_lock);
diff --git a/net/batman-adv/send.h b/net/batman-adv/send.h
index 824ef06f9b0..643329b787e 100644
--- a/net/batman-adv/send.h
+++ b/net/batman-adv/send.h
@@ -1,5 +1,4 @@
-/*
- * Copyright (C) 2007-2012 B.A.T.M.A.N. contributors:
+/* Copyright (C) 2007-2012 B.A.T.M.A.N. contributors:
  *
  * Marek Lindner, Simon Wunderlich
  *
@@ -16,19 +15,21 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA
- *
  */
 
 #ifndef _NET_BATMAN_ADV_SEND_H_
 #define _NET_BATMAN_ADV_SEND_H_
 
-int send_skb_packet(struct sk_buff *skb, struct hard_iface *hard_iface,
-                    const uint8_t *dst_addr);
-void schedule_bat_ogm(struct hard_iface *hard_iface);
-int add_bcast_packet_to_list(struct bat_priv *bat_priv,
-                             const struct sk_buff *skb, unsigned long delay);
-void send_outstanding_bat_ogm_packet(struct work_struct *work);
-void purge_outstanding_packets(struct bat_priv *bat_priv,
-                               const struct hard_iface *hard_iface);
+int batadv_send_skb_packet(struct sk_buff *skb,
+                           struct batadv_hard_iface *hard_iface,
+                           const uint8_t *dst_addr);
+void batadv_schedule_bat_ogm(struct batadv_hard_iface *hard_iface);
+int batadv_add_bcast_packet_to_list(struct batadv_priv *bat_priv,
+                                    const struct sk_buff *skb,
+                                    unsigned long delay);
+void batadv_send_outstanding_bat_ogm_packet(struct work_struct *work);
+void
+batadv_purge_outstanding_packets(struct batadv_priv *bat_priv,
+                                 const struct batadv_hard_iface *hard_iface);
 
 #endif /* _NET_BATMAN_ADV_SEND_H_ */
diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c
index a0ec0e4ada4..109ea2aae96 100644
--- a/net/batman-adv/soft-interface.c
+++ b/net/batman-adv/soft-interface.c
@@ -1,5 +1,4 @@
-/*
- * Copyright (C) 2007-2012 B.A.T.M.A.N. contributors:
+/* Copyright (C) 2007-2012 B.A.T.M.A.N. contributors:
  *
  * Marek Lindner, Simon Wunderlich
  *
@@ -16,7 +15,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA
- *
  */
 
 #include "main.h"
@@ -24,12 +22,12 @@
 #include "hard-interface.h"
 #include "routing.h"
 #include "send.h"
-#include "bat_debugfs.h"
+#include "debugfs.h"
 #include "translation-table.h"
 #include "hash.h"
 #include "gateway_common.h"
 #include "gateway_client.h"
-#include "bat_sysfs.h"
+#include "sysfs.h"
 #include "originator.h"
 #include <linux/slab.h>
 #include <linux/ethtool.h>
@@ -39,27 +37,33 @@
 #include "bridge_loop_avoidance.h"
 
 
-static int bat_get_settings(struct net_device *dev, struct ethtool_cmd *cmd);
-static void bat_get_drvinfo(struct net_device *dev,
-                            struct ethtool_drvinfo *info);
-static u32 bat_get_msglevel(struct net_device *dev);
-static void bat_set_msglevel(struct net_device *dev, u32 value);
-static u32 bat_get_link(struct net_device *dev);
-
-static const struct ethtool_ops bat_ethtool_ops = {
-        .get_settings = bat_get_settings,
-        .get_drvinfo = bat_get_drvinfo,
-        .get_msglevel = bat_get_msglevel,
-        .set_msglevel = bat_set_msglevel,
-        .get_link = bat_get_link,
+static int batadv_get_settings(struct net_device *dev, struct ethtool_cmd *cmd);
+static void batadv_get_drvinfo(struct net_device *dev,
+                               struct ethtool_drvinfo *info);
+static u32 batadv_get_msglevel(struct net_device *dev);
+static void batadv_set_msglevel(struct net_device *dev, u32 value);
+static u32 batadv_get_link(struct net_device *dev);
+static void batadv_get_strings(struct net_device *dev, u32 stringset, u8 *data);
+static void batadv_get_ethtool_stats(struct net_device *dev,
+                                     struct ethtool_stats *stats, u64 *data);
+static int batadv_get_sset_count(struct net_device *dev, int stringset);
+
+static const struct ethtool_ops batadv_ethtool_ops = {
+        .get_settings = batadv_get_settings,
+        .get_drvinfo = batadv_get_drvinfo,
+        .get_msglevel = batadv_get_msglevel,
+        .set_msglevel = batadv_set_msglevel,
+        .get_link = batadv_get_link,
+        .get_strings = batadv_get_strings,
+        .get_ethtool_stats = batadv_get_ethtool_stats,
+        .get_sset_count = batadv_get_sset_count,
 };
 
-int my_skb_head_push(struct sk_buff *skb, unsigned int len)
+int batadv_skb_head_push(struct sk_buff *skb, unsigned int len)
 {
         int result;
 
-        /**
-         * TODO: We must check if we can release all references to non-payload
+        /* TODO: We must check if we can release all references to non-payload
          * data using skb_header_release in our skbs to allow skb_cow_header to
          * work optimally. This means that those skbs are not allowed to read
          * or write any data which is before the current position of skb->data
@@ -74,37 +78,37 @@ int my_skb_head_push(struct sk_buff *skb, unsigned int len)
         return 0;
 }
 
-static int interface_open(struct net_device *dev)
+static int batadv_interface_open(struct net_device *dev)
 {
         netif_start_queue(dev);
         return 0;
 }
 
-static int interface_release(struct net_device *dev)
+static int batadv_interface_release(struct net_device *dev)
 {
         netif_stop_queue(dev);
         return 0;
 }
 
-static struct net_device_stats *interface_stats(struct net_device *dev)
+static struct net_device_stats *batadv_interface_stats(struct net_device *dev)
 {
-        struct bat_priv *bat_priv = netdev_priv(dev);
+        struct batadv_priv *bat_priv = netdev_priv(dev);
         return &bat_priv->stats;
 }
 
-static int interface_set_mac_addr(struct net_device *dev, void *p)
+static int batadv_interface_set_mac_addr(struct net_device *dev, void *p)
 {
-        struct bat_priv *bat_priv = netdev_priv(dev);
+        struct batadv_priv *bat_priv = netdev_priv(dev);
         struct sockaddr *addr = p;
 
         if (!is_valid_ether_addr(addr->sa_data))
                 return -EADDRNOTAVAIL;
 
         /* only modify transtable if it has been initialized before */
-        if (atomic_read(&bat_priv->mesh_state) == MESH_ACTIVE) {
-                tt_local_remove(bat_priv, dev->dev_addr,
-                                "mac address changed", false);
-                tt_local_add(dev, addr->sa_data, NULL_IFINDEX);
+        if (atomic_read(&bat_priv->mesh_state) == BATADV_MESH_ACTIVE) {
+                batadv_tt_local_remove(bat_priv, dev->dev_addr,
+                                       "mac address changed", false);
+                batadv_tt_local_add(dev, addr->sa_data, BATADV_NULL_IFINDEX);
         }
 
         memcpy(dev->dev_addr, addr->sa_data, ETH_ALEN);
@@ -112,10 +116,10 @@ static int interface_set_mac_addr(struct net_device *dev, void *p)
         return 0;
 }
 
-static int interface_change_mtu(struct net_device *dev, int new_mtu)
+static int batadv_interface_change_mtu(struct net_device *dev, int new_mtu)
 {
         /* check ranges */
-        if ((new_mtu < 68) || (new_mtu > hardif_min_mtu(dev)))
+        if ((new_mtu < 68) || (new_mtu > batadv_hardif_min_mtu(dev)))
                 return -EINVAL;
 
         dev->mtu = new_mtu;
@@ -123,13 +127,15 @@ static int interface_change_mtu(struct net_device *dev, int new_mtu)
         return 0;
 }
 
-static int interface_tx(struct sk_buff *skb, struct net_device *soft_iface)
+static int batadv_interface_tx(struct sk_buff *skb,
+                               struct net_device *soft_iface)
 {
         struct ethhdr *ethhdr = (struct ethhdr *)skb->data;
-        struct bat_priv *bat_priv = netdev_priv(soft_iface);
-        struct hard_iface *primary_if = NULL;
-        struct bcast_packet *bcast_packet;
+        struct batadv_priv *bat_priv = netdev_priv(soft_iface);
+        struct batadv_hard_iface *primary_if = NULL;
+        struct batadv_bcast_packet *bcast_packet;
         struct vlan_ethhdr *vhdr;
+        __be16 ethertype = __constant_htons(BATADV_ETH_P_BATMAN);
         static const uint8_t stp_addr[ETH_ALEN] = {0x01, 0x80, 0xC2, 0x00, 0x00,
                                                    0x00};
         unsigned int header_len = 0;
@@ -137,7 +143,7 @@ static int interface_tx(struct sk_buff *skb, struct net_device *soft_iface)
         short vid __maybe_unused = -1;
         bool do_bcast = false;
 
-        if (atomic_read(&bat_priv->mesh_state) != MESH_ACTIVE)
+        if (atomic_read(&bat_priv->mesh_state) != BATADV_MESH_ACTIVE)
                 goto dropped;
 
         soft_iface->trans_start = jiffies;
@@ -147,45 +153,47 @@ static int interface_tx(struct sk_buff *skb, struct net_device *soft_iface)
                 vhdr = (struct vlan_ethhdr *)skb->data;
                 vid = ntohs(vhdr->h_vlan_TCI) & VLAN_VID_MASK;
 
-                if (ntohs(vhdr->h_vlan_encapsulated_proto) != ETH_P_BATMAN)
+                if (vhdr->h_vlan_encapsulated_proto != ethertype)
                         break;
 
                 /* fall through */
-        case ETH_P_BATMAN:
+        case BATADV_ETH_P_BATMAN:
                 goto dropped;
         }
 
-        if (bla_tx(bat_priv, skb, vid))
+        if (batadv_bla_tx(bat_priv, skb, vid))
                 goto dropped;
 
         /* Register the client MAC in the transtable */
-        tt_local_add(soft_iface, ethhdr->h_source, skb->skb_iif);
+        batadv_tt_local_add(soft_iface, ethhdr->h_source, skb->skb_iif);
 
         /* don't accept stp packets. STP does not help in meshes.
          * better use the bridge loop avoidance ...
          */
-        if (compare_eth(ethhdr->h_dest, stp_addr))
+        if (batadv_compare_eth(ethhdr->h_dest, stp_addr))
                 goto dropped;
 
         if (is_multicast_ether_addr(ethhdr->h_dest)) {
                 do_bcast = true;
 
                 switch (atomic_read(&bat_priv->gw_mode)) {
-                case GW_MODE_SERVER:
+                case BATADV_GW_MODE_SERVER:
                         /* gateway servers should not send dhcp
-                         * requests into the mesh */
-                        ret = gw_is_dhcp_target(skb, &header_len);
+                         * requests into the mesh
+                         */
+                        ret = batadv_gw_is_dhcp_target(skb, &header_len);
                         if (ret)
                                 goto dropped;
                         break;
-                case GW_MODE_CLIENT:
+                case BATADV_GW_MODE_CLIENT:
                         /* gateway clients should send dhcp requests
-                         * via unicast to their gateway */
-                        ret = gw_is_dhcp_target(skb, &header_len);
+                         * via unicast to their gateway
+                         */
+                        ret = batadv_gw_is_dhcp_target(skb, &header_len);
                         if (ret)
                                 do_bcast = false;
                         break;
-                case GW_MODE_OFF:
+                case BATADV_GW_MODE_OFF:
                 default:
                         break;
                 }
@@ -193,22 +201,24 @@ static int interface_tx(struct sk_buff *skb, struct net_device *soft_iface)
 
         /* ethernet packet should be broadcasted */
         if (do_bcast) {
-                primary_if = primary_if_get_selected(bat_priv);
+                primary_if = batadv_primary_if_get_selected(bat_priv);
                 if (!primary_if)
                         goto dropped;
 
-                if (my_skb_head_push(skb, sizeof(*bcast_packet)) < 0)
+                if (batadv_skb_head_push(skb, sizeof(*bcast_packet)) < 0)
                         goto dropped;
 
-                bcast_packet = (struct bcast_packet *)skb->data;
-                bcast_packet->header.version = COMPAT_VERSION;
-                bcast_packet->header.ttl = TTL;
+                bcast_packet = (struct batadv_bcast_packet *)skb->data;
+                bcast_packet->header.version = BATADV_COMPAT_VERSION;
+                bcast_packet->header.ttl = BATADV_TTL;
 
                 /* batman packet type: broadcast */
-                bcast_packet->header.packet_type = BAT_BCAST;
+                bcast_packet->header.packet_type = BATADV_BCAST;
+                bcast_packet->reserved = 0;
 
                 /* hw address of first interface is the orig mac because only
-                 * this mac is known throughout the mesh */
+                 * this mac is known throughout the mesh
+                 */
                 memcpy(bcast_packet->orig,
                        primary_if->net_dev->dev_addr, ETH_ALEN);
 
@@ -216,21 +226,22 @@ static int interface_tx(struct sk_buff *skb, struct net_device *soft_iface)
                 bcast_packet->seqno =
                         htonl(atomic_inc_return(&bat_priv->bcast_seqno));
 
-                add_bcast_packet_to_list(bat_priv, skb, 1);
+                batadv_add_bcast_packet_to_list(bat_priv, skb, 1);
 
                 /* a copy is stored in the bcast list, therefore removing
-                 * the original skb. */
+                 * the original skb.
+                 */
                 kfree_skb(skb);
 
         /* unicast packet */
         } else {
-                if (atomic_read(&bat_priv->gw_mode) != GW_MODE_OFF) {
-                        ret = gw_out_of_range(bat_priv, skb, ethhdr);
+                if (atomic_read(&bat_priv->gw_mode) != BATADV_GW_MODE_OFF) {
+                        ret = batadv_gw_out_of_range(bat_priv, skb, ethhdr);
                         if (ret)
                                 goto dropped;
                 }
 
-                ret = unicast_send_skb(skb, bat_priv);
+                ret = batadv_unicast_send_skb(skb, bat_priv);
                 if (ret != 0)
                         goto dropped_freed;
         }
@@ -245,22 +256,23 @@ dropped_freed:
         bat_priv->stats.tx_dropped++;
 end:
         if (primary_if)
-                hardif_free_ref(primary_if);
+                batadv_hardif_free_ref(primary_if);
         return NETDEV_TX_OK;
 }
 
-void interface_rx(struct net_device *soft_iface,
-                  struct sk_buff *skb, struct hard_iface *recv_if,
-                  int hdr_size)
+void batadv_interface_rx(struct net_device *soft_iface,
+                         struct sk_buff *skb, struct batadv_hard_iface *recv_if,
+                         int hdr_size)
 {
-        struct bat_priv *bat_priv = netdev_priv(soft_iface);
+        struct batadv_priv *bat_priv = netdev_priv(soft_iface);
         struct ethhdr *ethhdr;
         struct vlan_ethhdr *vhdr;
-        struct batman_header *batadv_header = (struct batman_header *)skb->data;
+        struct batadv_header *batadv_header = (struct batadv_header *)skb->data;
         short vid __maybe_unused = -1;
+        __be16 ethertype = __constant_htons(BATADV_ETH_P_BATMAN);
         bool is_bcast;
 
-        is_bcast = (batadv_header->packet_type == BAT_BCAST);
+        is_bcast = (batadv_header->packet_type == BATADV_BCAST);
 
         /* check if enough space is available for pulling, and pull */
         if (!pskb_may_pull(skb, hdr_size))
@@ -276,11 +288,11 @@ void interface_rx(struct net_device *soft_iface,
                 vhdr = (struct vlan_ethhdr *)skb->data;
                 vid = ntohs(vhdr->h_vlan_TCI) & VLAN_VID_MASK;
 
-                if (ntohs(vhdr->h_vlan_encapsulated_proto) != ETH_P_BATMAN)
+                if (vhdr->h_vlan_encapsulated_proto != ethertype)
                         break;
 
                 /* fall through */
-        case ETH_P_BATMAN:
+        case BATADV_ETH_P_BATMAN:
                 goto dropped;
         }
 
@@ -291,22 +303,23 @@ void interface_rx(struct net_device *soft_iface,
 
         /* should not be necessary anymore as we use skb_pull_rcsum()
          * TODO: please verify this and remove this TODO
-         * -- Dec 21st 2009, Simon Wunderlich */
+         * -- Dec 21st 2009, Simon Wunderlich
+         */
 
-/*      skb->ip_summed = CHECKSUM_UNNECESSARY;*/
+        /* skb->ip_summed = CHECKSUM_UNNECESSARY; */
 
         bat_priv->stats.rx_packets++;
         bat_priv->stats.rx_bytes += skb->len + ETH_HLEN;
 
         soft_iface->last_rx = jiffies;
 
-        if (is_ap_isolated(bat_priv, ethhdr->h_source, ethhdr->h_dest))
+        if (batadv_is_ap_isolated(bat_priv, ethhdr->h_source, ethhdr->h_dest))
                 goto dropped;
 
         /* Let the bridge loop avoidance check the packet. If will
          * not handle it, we can safely push it up.
          */
-        if (bla_rx(bat_priv, skb, vid, is_bcast))
+        if (batadv_bla_rx(bat_priv, skb, vid, is_bcast))
                 goto out;
 
         netif_rx(skb);
@@ -318,49 +331,50 @@ out:
         return;
 }
 
-static const struct net_device_ops bat_netdev_ops = {
-        .ndo_open = interface_open,
-        .ndo_stop = interface_release,
-        .ndo_get_stats = interface_stats,
-        .ndo_set_mac_address = interface_set_mac_addr,
-        .ndo_change_mtu = interface_change_mtu,
-        .ndo_start_xmit = interface_tx,
+static const struct net_device_ops batadv_netdev_ops = {
+        .ndo_open = batadv_interface_open,
+        .ndo_stop = batadv_interface_release,
+        .ndo_get_stats = batadv_interface_stats,
+        .ndo_set_mac_address = batadv_interface_set_mac_addr,
+        .ndo_change_mtu = batadv_interface_change_mtu,
+        .ndo_start_xmit = batadv_interface_tx,
         .ndo_validate_addr = eth_validate_addr
 };
 
-static void interface_setup(struct net_device *dev)
+static void batadv_interface_setup(struct net_device *dev)
 {
-        struct bat_priv *priv = netdev_priv(dev);
+        struct batadv_priv *priv = netdev_priv(dev);
 
         ether_setup(dev);
 
-        dev->netdev_ops = &bat_netdev_ops;
+        dev->netdev_ops = &batadv_netdev_ops;
         dev->destructor = free_netdev;
         dev->tx_queue_len = 0;
 
-        /**
-         * can't call min_mtu, because the needed variables
+        /* can't call min_mtu, because the needed variables
          * have not been initialized yet
          */
         dev->mtu = ETH_DATA_LEN;
         /* reserve more space in the skbuff for our header */
-        dev->hard_header_len = BAT_HEADER_LEN;
+        dev->hard_header_len = BATADV_HEADER_LEN;
 
         /* generate random address */
         eth_hw_addr_random(dev);
 
-        SET_ETHTOOL_OPS(dev, &bat_ethtool_ops);
+        SET_ETHTOOL_OPS(dev, &batadv_ethtool_ops);
 
         memset(priv, 0, sizeof(*priv));
 }
 
-struct net_device *softif_create(const char *name)
+struct net_device *batadv_softif_create(const char *name)
 {
         struct net_device *soft_iface;
-        struct bat_priv *bat_priv;
+        struct batadv_priv *bat_priv;
         int ret;
+        size_t cnt_len = sizeof(uint64_t) * BATADV_CNT_NUM;
 
-        soft_iface = alloc_netdev(sizeof(*bat_priv), name, interface_setup);
+        soft_iface = alloc_netdev(sizeof(*bat_priv), name,
+                                  batadv_interface_setup);
 
         if (!soft_iface)
                 goto out;
@@ -378,18 +392,18 @@ struct net_device *softif_create(const char *name)
         atomic_set(&bat_priv->bonding, 0);
         atomic_set(&bat_priv->bridge_loop_avoidance, 0);
         atomic_set(&bat_priv->ap_isolation, 0);
-        atomic_set(&bat_priv->vis_mode, VIS_TYPE_CLIENT_UPDATE);
-        atomic_set(&bat_priv->gw_mode, GW_MODE_OFF);
+        atomic_set(&bat_priv->vis_mode, BATADV_VIS_TYPE_CLIENT_UPDATE);
+        atomic_set(&bat_priv->gw_mode, BATADV_GW_MODE_OFF);
         atomic_set(&bat_priv->gw_sel_class, 20);
         atomic_set(&bat_priv->gw_bandwidth, 41);
         atomic_set(&bat_priv->orig_interval, 1000);
         atomic_set(&bat_priv->hop_penalty, 30);
         atomic_set(&bat_priv->log_level, 0);
         atomic_set(&bat_priv->fragmentation, 1);
-        atomic_set(&bat_priv->bcast_queue_left, BCAST_QUEUE_LEN);
-        atomic_set(&bat_priv->batman_queue_left, BATMAN_QUEUE_LEN);
+        atomic_set(&bat_priv->bcast_queue_left, BATADV_BCAST_QUEUE_LEN);
+        atomic_set(&bat_priv->batman_queue_left, BATADV_BATMAN_QUEUE_LEN);
 
-        atomic_set(&bat_priv->mesh_state, MESH_INACTIVE);
+        atomic_set(&bat_priv->mesh_state, BATADV_MESH_INACTIVE);
         atomic_set(&bat_priv->bcast_seqno, 1);
         atomic_set(&bat_priv->ttvn, 0);
         atomic_set(&bat_priv->tt_local_changes, 0);
@@ -403,28 +417,34 @@ struct net_device *softif_create(const char *name)
         bat_priv->primary_if = NULL;
         bat_priv->num_ifaces = 0;
 
-        ret = bat_algo_select(bat_priv, bat_routing_algo);
-        if (ret < 0)
+        bat_priv->bat_counters = __alloc_percpu(cnt_len, __alignof__(uint64_t));
+        if (!bat_priv->bat_counters)
                 goto unreg_soft_iface;
 
-        ret = sysfs_add_meshif(soft_iface);
+        ret = batadv_algo_select(bat_priv, batadv_routing_algo);
         if (ret < 0)
-                goto unreg_soft_iface;
+                goto free_bat_counters;
 
-        ret = debugfs_add_meshif(soft_iface);
+        ret = batadv_sysfs_add_meshif(soft_iface);
+        if (ret < 0)
+                goto free_bat_counters;
+
+        ret = batadv_debugfs_add_meshif(soft_iface);
         if (ret < 0)
                 goto unreg_sysfs;
 
-        ret = mesh_init(soft_iface);
+        ret = batadv_mesh_init(soft_iface);
         if (ret < 0)
                 goto unreg_debugfs;
 
         return soft_iface;
 
 unreg_debugfs:
-        debugfs_del_meshif(soft_iface);
+        batadv_debugfs_del_meshif(soft_iface);
 unreg_sysfs:
-        sysfs_del_meshif(soft_iface);
+        batadv_sysfs_del_meshif(soft_iface);
+free_bat_counters:
+        free_percpu(bat_priv->bat_counters);
 unreg_soft_iface:
         unregister_netdevice(soft_iface);
         return NULL;
@@ -435,24 +455,24 @@ out:
         return NULL;
 }
 
-void softif_destroy(struct net_device *soft_iface)
+void batadv_softif_destroy(struct net_device *soft_iface)
 {
-        debugfs_del_meshif(soft_iface);
-        sysfs_del_meshif(soft_iface);
-        mesh_free(soft_iface);
+        batadv_debugfs_del_meshif(soft_iface);
+        batadv_sysfs_del_meshif(soft_iface);
+        batadv_mesh_free(soft_iface);
         unregister_netdevice(soft_iface);
 }
 
-int softif_is_valid(const struct net_device *net_dev)
+int batadv_softif_is_valid(const struct net_device *net_dev)
 {
-        if (net_dev->netdev_ops->ndo_start_xmit == interface_tx)
+        if (net_dev->netdev_ops->ndo_start_xmit == batadv_interface_tx)
                 return 1;
 
         return 0;
 }
 
 /* ethtool */
-static int bat_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
+static int batadv_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
 {
         cmd->supported = 0;
         cmd->advertising = 0;
@@ -468,25 +488,73 @@ static int bat_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
         return 0;
 }
 
-static void bat_get_drvinfo(struct net_device *dev,
-                            struct ethtool_drvinfo *info)
+static void batadv_get_drvinfo(struct net_device *dev,
+                               struct ethtool_drvinfo *info)
 {
         strcpy(info->driver, "B.A.T.M.A.N. advanced");
-        strcpy(info->version, SOURCE_VERSION);
+        strcpy(info->version, BATADV_SOURCE_VERSION);
         strcpy(info->fw_version, "N/A");
         strcpy(info->bus_info, "batman");
 }
 
-static u32 bat_get_msglevel(struct net_device *dev)
+static u32 batadv_get_msglevel(struct net_device *dev)
 {
         return -EOPNOTSUPP;
 }
 
-static void bat_set_msglevel(struct net_device *dev, u32 value)
+static void batadv_set_msglevel(struct net_device *dev, u32 value)
 {
 }
 
-static u32 bat_get_link(struct net_device *dev)
+static u32 batadv_get_link(struct net_device *dev)
 {
         return 1;
 }
+
+/* Inspired by drivers/net/ethernet/dlink/sundance.c:1702
+ * Declare each description string in struct.name[] to get fixed sized buffer
+ * and compile time checking for strings longer than ETH_GSTRING_LEN.
+ */
+static const struct {
+        const char name[ETH_GSTRING_LEN];
+} batadv_counters_strings[] = {
+        { "forward" },
+        { "forward_bytes" },
+        { "mgmt_tx" },
+        { "mgmt_tx_bytes" },
+        { "mgmt_rx" },
+        { "mgmt_rx_bytes" },
+        { "tt_request_tx" },
+        { "tt_request_rx" },
+        { "tt_response_tx" },
+        { "tt_response_rx" },
+        { "tt_roam_adv_tx" },
+        { "tt_roam_adv_rx" },
+};
+
+static void batadv_get_strings(struct net_device *dev, uint32_t stringset,
+                               uint8_t *data)
+{
+        if (stringset == ETH_SS_STATS)
+                memcpy(data, batadv_counters_strings,
+                       sizeof(batadv_counters_strings));
+}
+
+static void batadv_get_ethtool_stats(struct net_device *dev,
+                                     struct ethtool_stats *stats,
+                                     uint64_t *data)
+{
+        struct batadv_priv *bat_priv = netdev_priv(dev);
+        int i;
+
+        for (i = 0; i < BATADV_CNT_NUM; i++)
+                data[i] = batadv_sum_counter(bat_priv, i);
+}
+
+static int batadv_get_sset_count(struct net_device *dev, int stringset)
+{
+        if (stringset == ETH_SS_STATS)
+                return BATADV_CNT_NUM;
+
+        return -EOPNOTSUPP;
+}
diff --git a/net/batman-adv/soft-interface.h b/net/batman-adv/soft-interface.h
index 02030067388..852c683b06a 100644
--- a/net/batman-adv/soft-interface.h
+++ b/net/batman-adv/soft-interface.h
@@ -1,5 +1,4 @@
-/*
- * Copyright (C) 2007-2012 B.A.T.M.A.N. contributors:
+/* Copyright (C) 2007-2012 B.A.T.M.A.N. contributors:
  *
  * Marek Lindner
  *
@@ -16,18 +15,16 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA
- *
  */
 
 #ifndef _NET_BATMAN_ADV_SOFT_INTERFACE_H_
 #define _NET_BATMAN_ADV_SOFT_INTERFACE_H_
 
-int my_skb_head_push(struct sk_buff *skb, unsigned int len);
-void interface_rx(struct net_device *soft_iface,
-                  struct sk_buff *skb, struct hard_iface *recv_if,
-                  int hdr_size);
-struct net_device *softif_create(const char *name);
-void softif_destroy(struct net_device *soft_iface);
-int softif_is_valid(const struct net_device *net_dev);
+int batadv_skb_head_push(struct sk_buff *skb, unsigned int len);
+void batadv_interface_rx(struct net_device *soft_iface, struct sk_buff *skb,
+                         struct batadv_hard_iface *recv_if, int hdr_size);
+struct net_device *batadv_softif_create(const char *name);
+void batadv_softif_destroy(struct net_device *soft_iface);
+int batadv_softif_is_valid(const struct net_device *net_dev);
 
 #endif /* _NET_BATMAN_ADV_SOFT_INTERFACE_H_ */
diff --git a/net/batman-adv/sysfs.c b/net/batman-adv/sysfs.c
new file mode 100644
index 00000000000..66518c75c21
--- /dev/null
+++ b/net/batman-adv/sysfs.c
@@ -0,0 +1,787 @@
+/* Copyright (C) 2010-2012 B.A.T.M.A.N. contributors:
+ *
+ * Marek Lindner
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of version 2 of the GNU General Public
+ * License as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA
+ */
+
+#include "main.h"
+#include "sysfs.h"
+#include "translation-table.h"
+#include "originator.h"
+#include "hard-interface.h"
+#include "gateway_common.h"
+#include "gateway_client.h"
+#include "vis.h"
+
+static struct net_device *batadv_kobj_to_netdev(struct kobject *obj)
+{
+        struct device *dev = container_of(obj->parent, struct device, kobj);
+        return to_net_dev(dev);
+}
+
+static struct batadv_priv *batadv_kobj_to_batpriv(struct kobject *obj)
+{
+        struct net_device *net_dev = batadv_kobj_to_netdev(obj);
+        return netdev_priv(net_dev);
+}
+
+#define BATADV_UEV_TYPE_VAR     "BATTYPE="
+#define BATADV_UEV_ACTION_VAR   "BATACTION="
+#define BATADV_UEV_DATA_VAR     "BATDATA="
+
+static char *batadv_uev_action_str[] = {
+        "add",
+        "del",
+        "change"
+};
+
+static char *batadv_uev_type_str[] = {
+        "gw"
+};
+
+/* Use this, if you have customized show and store functions */
+#define BATADV_ATTR(_name, _mode, _show, _store)        \
+struct batadv_attribute batadv_attr_##_name = {         \
+        .attr = {.name = __stringify(_name),            \
+                 .mode = _mode },                       \
+        .show   = _show,                                \
+        .store  = _store,                               \
+};
+
+#define BATADV_ATTR_SIF_STORE_BOOL(_name, _post_func)                   \
+ssize_t batadv_store_##_name(struct kobject *kobj,                      \
+                             struct attribute *attr, char *buff,        \
+                             size_t count)                              \
+{                                                                       \
+        struct net_device *net_dev = batadv_kobj_to_netdev(kobj);       \
+        struct batadv_priv *bat_priv = netdev_priv(net_dev);            \
+        return __batadv_store_bool_attr(buff, count, _post_func, attr,  \
+                                        &bat_priv->_name, net_dev);     \
+}
+
+#define BATADV_ATTR_SIF_SHOW_BOOL(_name)                                \
+ssize_t batadv_show_##_name(struct kobject *kobj,                       \
+                            struct attribute *attr, char *buff)         \
+{                                                                       \
+        struct batadv_priv *bat_priv = batadv_kobj_to_batpriv(kobj);    \
+        return sprintf(buff, "%s\n",                                    \
+                       atomic_read(&bat_priv->_name) == 0 ?             \
+                       "disabled" : "enabled");                         \
+}                                                                       \
+
+/* Use this, if you are going to turn a [name] in the soft-interface
+ * (bat_priv) on or off
+ */
+#define BATADV_ATTR_SIF_BOOL(_name, _mode, _post_func)                  \
+        static BATADV_ATTR_SIF_STORE_BOOL(_name, _post_func)            \
+        static BATADV_ATTR_SIF_SHOW_BOOL(_name)                         \
+        static BATADV_ATTR(_name, _mode, batadv_show_##_name,           \
+                           batadv_store_##_name)
+
+
+#define BATADV_ATTR_SIF_STORE_UINT(_name, _min, _max, _post_func)       \
+ssize_t batadv_store_##_name(struct kobject *kobj,                      \
+                             struct attribute *attr, char *buff,        \
+                             size_t count)                              \
+{                                                                       \
+        struct net_device *net_dev = batadv_kobj_to_netdev(kobj);       \
+        struct batadv_priv *bat_priv = netdev_priv(net_dev);            \
+        return __batadv_store_uint_attr(buff, count, _min, _max,        \
+                                        _post_func, attr,               \
+                                        &bat_priv->_name, net_dev);     \
+}
+
+#define BATADV_ATTR_SIF_SHOW_UINT(_name)                                \
+ssize_t batadv_show_##_name(struct kobject *kobj,                       \
+                            struct attribute *attr, char *buff)         \
+{                                                                       \
+        struct batadv_priv *bat_priv = batadv_kobj_to_batpriv(kobj);    \
+        return sprintf(buff, "%i\n", atomic_read(&bat_priv->_name));    \
+}                                                                       \
+
+/* Use this, if you are going to set [name] in the soft-interface
+ * (bat_priv) to an unsigned integer value
+ */
+#define BATADV_ATTR_SIF_UINT(_name, _mode, _min, _max, _post_func)      \
+        static BATADV_ATTR_SIF_STORE_UINT(_name, _min, _max, _post_func)\
+        static BATADV_ATTR_SIF_SHOW_UINT(_name)                         \
+        static BATADV_ATTR(_name, _mode, batadv_show_##_name,           \
+                           batadv_store_##_name)
+
+
+#define BATADV_ATTR_HIF_STORE_UINT(_name, _min, _max, _post_func)       \
+ssize_t batadv_store_##_name(struct kobject *kobj,                      \
+                             struct attribute *attr, char *buff,        \
+                             size_t count)                              \
+{                                                                       \
+        struct net_device *net_dev = batadv_kobj_to_netdev(kobj);       \
+        struct batadv_hard_iface *hard_iface;                           \
+        ssize_t length;                                                 \
+                                                                        \
+        hard_iface = batadv_hardif_get_by_netdev(net_dev);              \
+        if (!hard_iface)                                                \
+                return 0;                                               \
+                                                                        \
+        length = __batadv_store_uint_attr(buff, count, _min, _max,      \
+                                          _post_func, attr,             \
+                                          &hard_iface->_name, net_dev); \
+                                                                        \
+        batadv_hardif_free_ref(hard_iface);                             \
+        return length;                                                  \
+}
+
+#define BATADV_ATTR_HIF_SHOW_UINT(_name)                                \
+ssize_t batadv_show_##_name(struct kobject *kobj,                       \
+                            struct attribute *attr, char *buff)         \
+{                                                                       \
+        struct net_device *net_dev = batadv_kobj_to_netdev(kobj);       \
+        struct batadv_hard_iface *hard_iface;                           \
+        ssize_t length;                                                 \
+                                                                        \
+        hard_iface = batadv_hardif_get_by_netdev(net_dev);              \
+        if (!hard_iface)                                                \
+                return 0;                                               \
+                                                                        \
+        length = sprintf(buff, "%i\n", atomic_read(&hard_iface->_name));\
+                                                                        \
+        batadv_hardif_free_ref(hard_iface);                             \
+        return length;                                                  \
+}
+
+/* Use this, if you are going to set [name] in hard_iface to an
+ * unsigned integer value
+ */
+#define BATADV_ATTR_HIF_UINT(_name, _mode, _min, _max, _post_func)      \
+        static BATADV_ATTR_HIF_STORE_UINT(_name, _min, _max, _post_func)\
+        static BATADV_ATTR_HIF_SHOW_UINT(_name)                         \
+        static BATADV_ATTR(_name, _mode, batadv_show_##_name,           \
+                           batadv_store_##_name)
+
+
+static int batadv_store_bool_attr(char *buff, size_t count,
+                                  struct net_device *net_dev,
+                                  const char *attr_name, atomic_t *attr)
+{
+        int enabled = -1;
+
+        if (buff[count - 1] == '\n')
+                buff[count - 1] = '\0';
+
+        if ((strncmp(buff, "1", 2) == 0) ||
+            (strncmp(buff, "enable", 7) == 0) ||
+            (strncmp(buff, "enabled", 8) == 0))
+                enabled = 1;
+
+        if ((strncmp(buff, "0", 2) == 0) ||
+            (strncmp(buff, "disable", 8) == 0) ||
+            (strncmp(buff, "disabled", 9) == 0))
+                enabled = 0;
+
+        if (enabled < 0) {
+                batadv_info(net_dev, "%s: Invalid parameter received: %s\n",
+                            attr_name, buff);
+                return -EINVAL;
+        }
+
+        if (atomic_read(attr) == enabled)
+                return count;
+
+        batadv_info(net_dev, "%s: Changing from: %s to: %s\n", attr_name,
+                    atomic_read(attr) == 1 ? "enabled" : "disabled",
+                    enabled == 1 ? "enabled" : "disabled");
+
+        atomic_set(attr, (unsigned int)enabled);
+        return count;
+}
+
+static inline ssize_t
+__batadv_store_bool_attr(char *buff, size_t count,
+                         void (*post_func)(struct net_device *),
+                         struct attribute *attr,
+                         atomic_t *attr_store, struct net_device *net_dev)
+{
+        int ret;
+
+        ret = batadv_store_bool_attr(buff, count, net_dev, attr->name,
+                                     attr_store);
+        if (post_func && ret)
+                post_func(net_dev);
+
+        return ret;
+}
+
+static int batadv_store_uint_attr(const char *buff, size_t count,
+                                  struct net_device *net_dev,
+                                  const char *attr_name,
+                                  unsigned int min, unsigned int max,
+                                  atomic_t *attr)
+{
+        unsigned long uint_val;
+        int ret;
+
+        ret = kstrtoul(buff, 10, &uint_val);
+        if (ret) {
+                batadv_info(net_dev, "%s: Invalid parameter received: %s\n",
+                            attr_name, buff);
+                return -EINVAL;
+        }
+
+        if (uint_val < min) {
+                batadv_info(net_dev, "%s: Value is too small: %lu min: %u\n",
+                            attr_name, uint_val, min);
+                return -EINVAL;
+        }
+
+        if (uint_val > max) {
+                batadv_info(net_dev, "%s: Value is too big: %lu max: %u\n",
+                            attr_name, uint_val, max);
+                return -EINVAL;
+        }
+
+        if (atomic_read(attr) == uint_val)
+                return count;
+
+        batadv_info(net_dev, "%s: Changing from: %i to: %lu\n",
+                    attr_name, atomic_read(attr), uint_val);
+
+        atomic_set(attr, uint_val);
+        return count;
+}
+
+static inline ssize_t
+__batadv_store_uint_attr(const char *buff, size_t count,
+                         int min, int max,
+                         void (*post_func)(struct net_device *),
+                         const struct attribute *attr,
+                         atomic_t *attr_store, struct net_device *net_dev)
+{
+        int ret;
+
+        ret = batadv_store_uint_attr(buff, count, net_dev, attr->name, min, max,
+                                     attr_store);
+        if (post_func && ret)
+                post_func(net_dev);
+
+        return ret;
+}
+
+static ssize_t batadv_show_vis_mode(struct kobject *kobj,
+                                    struct attribute *attr, char *buff)
+{
+        struct batadv_priv *bat_priv = batadv_kobj_to_batpriv(kobj);
+        int vis_mode = atomic_read(&bat_priv->vis_mode);
+        const char *mode;
+
+        if (vis_mode == BATADV_VIS_TYPE_CLIENT_UPDATE)
+                mode = "client";
+        else
+                mode = "server";
+
+        return sprintf(buff, "%s\n", mode);
+}
+
+static ssize_t batadv_store_vis_mode(struct kobject *kobj,
+                                     struct attribute *attr, char *buff,
+                                     size_t count)
+{
+        struct net_device *net_dev = batadv_kobj_to_netdev(kobj);
+        struct batadv_priv *bat_priv = netdev_priv(net_dev);
+        unsigned long val;
+        int ret, vis_mode_tmp = -1;
+        const char *old_mode, *new_mode;
+
+        ret = kstrtoul(buff, 10, &val);
+
+        if (((count == 2) && (!ret) &&
+             (val == BATADV_VIS_TYPE_CLIENT_UPDATE)) ||
+            (strncmp(buff, "client", 6) == 0) ||
+            (strncmp(buff, "off", 3) == 0))
+                vis_mode_tmp = BATADV_VIS_TYPE_CLIENT_UPDATE;
+
+        if (((count == 2) && (!ret) &&
+             (val == BATADV_VIS_TYPE_SERVER_SYNC)) ||
+            (strncmp(buff, "server", 6) == 0))
+                vis_mode_tmp = BATADV_VIS_TYPE_SERVER_SYNC;
+
+        if (vis_mode_tmp < 0) {
+                if (buff[count - 1] == '\n')
+                        buff[count - 1] = '\0';
+
+                batadv_info(net_dev,
+                            "Invalid parameter for 'vis mode' setting received: %s\n",
+                            buff);
+                return -EINVAL;
+        }
+
+        if (atomic_read(&bat_priv->vis_mode) == vis_mode_tmp)
+                return count;
+
+        if (atomic_read(&bat_priv->vis_mode) == BATADV_VIS_TYPE_CLIENT_UPDATE)
+                old_mode =  "client";
+        else
+                old_mode = "server";
+
+        if (vis_mode_tmp == BATADV_VIS_TYPE_CLIENT_UPDATE)
+                new_mode =  "client";
+        else
+                new_mode = "server";
+
+        batadv_info(net_dev, "Changing vis mode from: %s to: %s\n", old_mode,
+                    new_mode);
+
+        atomic_set(&bat_priv->vis_mode, (unsigned int)vis_mode_tmp);
+        return count;
+}
+
+static ssize_t batadv_show_bat_algo(struct kobject *kobj,
+                                    struct attribute *attr, char *buff)
+{
+        struct batadv_priv *bat_priv = batadv_kobj_to_batpriv(kobj);
+        return sprintf(buff, "%s\n", bat_priv->bat_algo_ops->name);
+}
+
+static void batadv_post_gw_deselect(struct net_device *net_dev)
+{
+        struct batadv_priv *bat_priv = netdev_priv(net_dev);
+        batadv_gw_deselect(bat_priv);
+}
+
+static ssize_t batadv_show_gw_mode(struct kobject *kobj, struct attribute *attr,
+                                   char *buff)
+{
+        struct batadv_priv *bat_priv = batadv_kobj_to_batpriv(kobj);
+        int bytes_written;
+
+        switch (atomic_read(&bat_priv->gw_mode)) {
+        case BATADV_GW_MODE_CLIENT:
+                bytes_written = sprintf(buff, "%s\n",
+                                        BATADV_GW_MODE_CLIENT_NAME);
+                break;
+        case BATADV_GW_MODE_SERVER:
+                bytes_written = sprintf(buff, "%s\n",
+                                        BATADV_GW_MODE_SERVER_NAME);
+                break;
+        default:
+                bytes_written = sprintf(buff, "%s\n",
+                                        BATADV_GW_MODE_OFF_NAME);
+                break;
+        }
+
+        return bytes_written;
+}
+
+static ssize_t batadv_store_gw_mode(struct kobject *kobj,
+                                    struct attribute *attr, char *buff,
+                                    size_t count)
+{
+        struct net_device *net_dev = batadv_kobj_to_netdev(kobj);
+        struct batadv_priv *bat_priv = netdev_priv(net_dev);
+        char *curr_gw_mode_str;
+        int gw_mode_tmp = -1;
+
+        if (buff[count - 1] == '\n')
+                buff[count - 1] = '\0';
+
+        if (strncmp(buff, BATADV_GW_MODE_OFF_NAME,
+                    strlen(BATADV_GW_MODE_OFF_NAME)) == 0)
+                gw_mode_tmp = BATADV_GW_MODE_OFF;
+
+        if (strncmp(buff, BATADV_GW_MODE_CLIENT_NAME,
+                    strlen(BATADV_GW_MODE_CLIENT_NAME)) == 0)
+                gw_mode_tmp = BATADV_GW_MODE_CLIENT;
+
+        if (strncmp(buff, BATADV_GW_MODE_SERVER_NAME,
+                    strlen(BATADV_GW_MODE_SERVER_NAME)) == 0)
+                gw_mode_tmp = BATADV_GW_MODE_SERVER;
+
+        if (gw_mode_tmp < 0) {
+                batadv_info(net_dev,
+                            "Invalid parameter for 'gw mode' setting received: %s\n",
+                            buff);
+                return -EINVAL;
+        }
+
+        if (atomic_read(&bat_priv->gw_mode) == gw_mode_tmp)
+                return count;
+
+        switch (atomic_read(&bat_priv->gw_mode)) {
+        case BATADV_GW_MODE_CLIENT:
+                curr_gw_mode_str = BATADV_GW_MODE_CLIENT_NAME;
+                break;
+        case BATADV_GW_MODE_SERVER:
+                curr_gw_mode_str = BATADV_GW_MODE_SERVER_NAME;
+                break;
+        default:
+                curr_gw_mode_str = BATADV_GW_MODE_OFF_NAME;
+                break;
+        }
+
+        batadv_info(net_dev, "Changing gw mode from: %s to: %s\n",
+                    curr_gw_mode_str, buff);
+
+        batadv_gw_deselect(bat_priv);
+        atomic_set(&bat_priv->gw_mode, (unsigned int)gw_mode_tmp);
+        return count;
+}
+
+static ssize_t batadv_show_gw_bwidth(struct kobject *kobj,
+                                     struct attribute *attr, char *buff)
+{
+        struct batadv_priv *bat_priv = batadv_kobj_to_batpriv(kobj);
+        int down, up;
+        int gw_bandwidth = atomic_read(&bat_priv->gw_bandwidth);
+
+        batadv_gw_bandwidth_to_kbit(gw_bandwidth, &down, &up);
+        return sprintf(buff, "%i%s/%i%s\n",
+                       (down > 2048 ? down / 1024 : down),
+                       (down > 2048 ? "MBit" : "KBit"),
+                       (up > 2048 ? up / 1024 : up),
+                       (up > 2048 ? "MBit" : "KBit"));
+}
+
+static ssize_t batadv_store_gw_bwidth(struct kobject *kobj,
+                                      struct attribute *attr, char *buff,
+                                      size_t count)
+{
+        struct net_device *net_dev = batadv_kobj_to_netdev(kobj);
+
+        if (buff[count - 1] == '\n')
+                buff[count - 1] = '\0';
+
+        return batadv_gw_bandwidth_set(net_dev, buff, count);
+}
+
+BATADV_ATTR_SIF_BOOL(aggregated_ogms, S_IRUGO | S_IWUSR, NULL);
+BATADV_ATTR_SIF_BOOL(bonding, S_IRUGO | S_IWUSR, NULL);
+#ifdef CONFIG_BATMAN_ADV_BLA
+BATADV_ATTR_SIF_BOOL(bridge_loop_avoidance, S_IRUGO | S_IWUSR, NULL);
+#endif
+BATADV_ATTR_SIF_BOOL(fragmentation, S_IRUGO | S_IWUSR, batadv_update_min_mtu);
+BATADV_ATTR_SIF_BOOL(ap_isolation, S_IRUGO | S_IWUSR, NULL);
+static BATADV_ATTR(vis_mode, S_IRUGO | S_IWUSR, batadv_show_vis_mode,
+                   batadv_store_vis_mode);
+static BATADV_ATTR(routing_algo, S_IRUGO, batadv_show_bat_algo, NULL);
+static BATADV_ATTR(gw_mode, S_IRUGO | S_IWUSR, batadv_show_gw_mode,
+                   batadv_store_gw_mode);
+BATADV_ATTR_SIF_UINT(orig_interval, S_IRUGO | S_IWUSR, 2 * BATADV_JITTER,
+                     INT_MAX, NULL);
+BATADV_ATTR_SIF_UINT(hop_penalty, S_IRUGO | S_IWUSR, 0, BATADV_TQ_MAX_VALUE,
+                     NULL);
+BATADV_ATTR_SIF_UINT(gw_sel_class, S_IRUGO | S_IWUSR, 1, BATADV_TQ_MAX_VALUE,
+                     batadv_post_gw_deselect);
+static BATADV_ATTR(gw_bandwidth, S_IRUGO | S_IWUSR, batadv_show_gw_bwidth,
+                   batadv_store_gw_bwidth);
+#ifdef CONFIG_BATMAN_ADV_DEBUG
+BATADV_ATTR_SIF_UINT(log_level, S_IRUGO | S_IWUSR, 0, BATADV_DBG_ALL, NULL);
+#endif
+
+static struct batadv_attribute *batadv_mesh_attrs[] = {
+        &batadv_attr_aggregated_ogms,
+        &batadv_attr_bonding,
+#ifdef CONFIG_BATMAN_ADV_BLA
+        &batadv_attr_bridge_loop_avoidance,
+#endif
+        &batadv_attr_fragmentation,
+        &batadv_attr_ap_isolation,
+        &batadv_attr_vis_mode,
+        &batadv_attr_routing_algo,
+        &batadv_attr_gw_mode,
+        &batadv_attr_orig_interval,
+        &batadv_attr_hop_penalty,
+        &batadv_attr_gw_sel_class,
+        &batadv_attr_gw_bandwidth,
+#ifdef CONFIG_BATMAN_ADV_DEBUG
+        &batadv_attr_log_level,
+#endif
+        NULL,
+};
+
+int batadv_sysfs_add_meshif(struct net_device *dev)
+{
+        struct kobject *batif_kobject = &dev->dev.kobj;
+        struct batadv_priv *bat_priv = netdev_priv(dev);
+        struct batadv_attribute **bat_attr;
+        int err;
+
+        bat_priv->mesh_obj = kobject_create_and_add(BATADV_SYSFS_IF_MESH_SUBDIR,
+                                                    batif_kobject);
+        if (!bat_priv->mesh_obj) {
+                batadv_err(dev, "Can't add sysfs directory: %s/%s\n", dev->name,
+                           BATADV_SYSFS_IF_MESH_SUBDIR);
+                goto out;
+        }
+
+        for (bat_attr = batadv_mesh_attrs; *bat_attr; ++bat_attr) {
+                err = sysfs_create_file(bat_priv->mesh_obj,
+                                        &((*bat_attr)->attr));
+                if (err) {
+                        batadv_err(dev, "Can't add sysfs file: %s/%s/%s\n",
+                                   dev->name, BATADV_SYSFS_IF_MESH_SUBDIR,
+                                   ((*bat_attr)->attr).name);
+                        goto rem_attr;
+                }
+        }
+
+        return 0;
+
+rem_attr:
+        for (bat_attr = batadv_mesh_attrs; *bat_attr; ++bat_attr)
+                sysfs_remove_file(bat_priv->mesh_obj, &((*bat_attr)->attr));
+
+        kobject_put(bat_priv->mesh_obj);
+        bat_priv->mesh_obj = NULL;
+out:
+        return -ENOMEM;
+}
+
+void batadv_sysfs_del_meshif(struct net_device *dev)
+{
+        struct batadv_priv *bat_priv = netdev_priv(dev);
+        struct batadv_attribute **bat_attr;
+
+        for (bat_attr = batadv_mesh_attrs; *bat_attr; ++bat_attr)
+                sysfs_remove_file(bat_priv->mesh_obj, &((*bat_attr)->attr));
+
+        kobject_put(bat_priv->mesh_obj);
+        bat_priv->mesh_obj = NULL;
+}
+
+static ssize_t batadv_show_mesh_iface(struct kobject *kobj,
+                                      struct attribute *attr, char *buff)
+{
+        struct net_device *net_dev = batadv_kobj_to_netdev(kobj);
+        struct batadv_hard_iface *hard_iface;
+        ssize_t length;
+        const char *ifname;
+
+        hard_iface = batadv_hardif_get_by_netdev(net_dev);
+        if (!hard_iface)
+                return 0;
+
+        if (hard_iface->if_status == BATADV_IF_NOT_IN_USE)
+                ifname =  "none";
+        else
+                ifname = hard_iface->soft_iface->name;
+
+        length = sprintf(buff, "%s\n", ifname);
+
+        batadv_hardif_free_ref(hard_iface);
+
+        return length;
+}
+
+static ssize_t batadv_store_mesh_iface(struct kobject *kobj,
+                                       struct attribute *attr, char *buff,
+                                       size_t count)
+{
+        struct net_device *net_dev = batadv_kobj_to_netdev(kobj);
+        struct batadv_hard_iface *hard_iface;
+        int status_tmp = -1;
+        int ret = count;
+
+        hard_iface = batadv_hardif_get_by_netdev(net_dev);
+        if (!hard_iface)
+                return count;
+
+        if (buff[count - 1] == '\n')
+                buff[count - 1] = '\0';
+
+        if (strlen(buff) >= IFNAMSIZ) {
+                pr_err("Invalid parameter for 'mesh_iface' setting received: interface name too long '%s'\n",
+                       buff);
+                batadv_hardif_free_ref(hard_iface);
+                return -EINVAL;
+        }
+
+        if (strncmp(buff, "none", 4) == 0)
+                status_tmp = BATADV_IF_NOT_IN_USE;
+        else
+                status_tmp = BATADV_IF_I_WANT_YOU;
+
+        if (hard_iface->if_status == status_tmp)
+                goto out;
+
+        if ((hard_iface->soft_iface) &&
+            (strncmp(hard_iface->soft_iface->name, buff, IFNAMSIZ) == 0))
+                goto out;
+
+        if (!rtnl_trylock()) {
+                ret = -ERESTARTSYS;
+                goto out;
+        }
+
+        if (status_tmp == BATADV_IF_NOT_IN_USE) {
+                batadv_hardif_disable_interface(hard_iface);
+                goto unlock;
+        }
+
+        /* if the interface already is in use */
+        if (hard_iface->if_status != BATADV_IF_NOT_IN_USE)
+                batadv_hardif_disable_interface(hard_iface);
+
+        ret = batadv_hardif_enable_interface(hard_iface, buff);
+
+unlock:
+        rtnl_unlock();
+out:
+        batadv_hardif_free_ref(hard_iface);
+        return ret;
+}
+
+static ssize_t batadv_show_iface_status(struct kobject *kobj,
+                                        struct attribute *attr, char *buff)
+{
+        struct net_device *net_dev = batadv_kobj_to_netdev(kobj);
+        struct batadv_hard_iface *hard_iface;
+        ssize_t length;
+
+        hard_iface = batadv_hardif_get_by_netdev(net_dev);
+        if (!hard_iface)
+                return 0;
+
+        switch (hard_iface->if_status) {
+        case BATADV_IF_TO_BE_REMOVED:
+                length = sprintf(buff, "disabling\n");
+                break;
+        case BATADV_IF_INACTIVE:
+                length = sprintf(buff, "inactive\n");
+                break;
+        case BATADV_IF_ACTIVE:
+                length = sprintf(buff, "active\n");
+                break;
+        case BATADV_IF_TO_BE_ACTIVATED:
+                length = sprintf(buff, "enabling\n");
+                break;
+        case BATADV_IF_NOT_IN_USE:
+        default:
+                length = sprintf(buff, "not in use\n");
+                break;
+        }
+
+        batadv_hardif_free_ref(hard_iface);
+
+        return length;
+}
+
+static BATADV_ATTR(mesh_iface, S_IRUGO | S_IWUSR, batadv_show_mesh_iface,
+                   batadv_store_mesh_iface);
+static BATADV_ATTR(iface_status, S_IRUGO, batadv_show_iface_status, NULL);
+
+static struct batadv_attribute *batadv_batman_attrs[] = {
+        &batadv_attr_mesh_iface,
+        &batadv_attr_iface_status,
+        NULL,
+};
+
+int batadv_sysfs_add_hardif(struct kobject **hardif_obj, struct net_device *dev)
+{
+        struct kobject *hardif_kobject = &dev->dev.kobj;
+        struct batadv_attribute **bat_attr;
+        int err;
+
+        *hardif_obj = kobject_create_and_add(BATADV_SYSFS_IF_BAT_SUBDIR,
+                                             hardif_kobject);
+
+        if (!*hardif_obj) {
+                batadv_err(dev, "Can't add sysfs directory: %s/%s\n", dev->name,
+                           BATADV_SYSFS_IF_BAT_SUBDIR);
+                goto out;
+        }
+
+        for (bat_attr = batadv_batman_attrs; *bat_attr; ++bat_attr) {
+                err = sysfs_create_file(*hardif_obj, &((*bat_attr)->attr));
+                if (err) {
+                        batadv_err(dev, "Can't add sysfs file: %s/%s/%s\n",
+                                   dev->name, BATADV_SYSFS_IF_BAT_SUBDIR,
+                                   ((*bat_attr)->attr).name);
+                        goto rem_attr;
+                }
+        }
+
+        return 0;
+
+rem_attr:
+        for (bat_attr = batadv_batman_attrs; *bat_attr; ++bat_attr)
+                sysfs_remove_file(*hardif_obj, &((*bat_attr)->attr));
+out:
+        return -ENOMEM;
+}
+
+void batadv_sysfs_del_hardif(struct kobject **hardif_obj)
+{
+        kobject_put(*hardif_obj);
+        *hardif_obj = NULL;
+}
+
+int batadv_throw_uevent(struct batadv_priv *bat_priv, enum batadv_uev_type type,
+                        enum batadv_uev_action action, const char *data)
+{
+        int ret = -ENOMEM;
+        struct batadv_hard_iface *primary_if = NULL;
+        struct kobject *bat_kobj;
+        char *uevent_env[4] = { NULL, NULL, NULL, NULL };
+
+        primary_if = batadv_primary_if_get_selected(bat_priv);
+        if (!primary_if)
+                goto out;
+
+        bat_kobj = &primary_if->soft_iface->dev.kobj;
+
+        uevent_env[0] = kmalloc(strlen(BATADV_UEV_TYPE_VAR) +
+                                strlen(batadv_uev_type_str[type]) + 1,
+                                GFP_ATOMIC);
+        if (!uevent_env[0])
+                goto out;
+
+        sprintf(uevent_env[0], "%s%s", BATADV_UEV_TYPE_VAR,
+                batadv_uev_type_str[type]);
+
+        uevent_env[1] = kmalloc(strlen(BATADV_UEV_ACTION_VAR) +
+                                strlen(batadv_uev_action_str[action]) + 1,
+                                GFP_ATOMIC);
+        if (!uevent_env[1])
+                goto out;
+
+        sprintf(uevent_env[1], "%s%s", BATADV_UEV_ACTION_VAR,
+                batadv_uev_action_str[action]);
+
+        /* If the event is DEL, ignore the data field */
+        if (action != BATADV_UEV_DEL) {
+                uevent_env[2] = kmalloc(strlen(BATADV_UEV_DATA_VAR) +
+                                        strlen(data) + 1, GFP_ATOMIC);
+                if (!uevent_env[2])
+                        goto out;
+
+                sprintf(uevent_env[2], "%s%s", BATADV_UEV_DATA_VAR, data);
+        }
+
+        ret = kobject_uevent_env(bat_kobj, KOBJ_CHANGE, uevent_env);
+out:
+        kfree(uevent_env[0]);
+        kfree(uevent_env[1]);
+        kfree(uevent_env[2]);
+
+        if (primary_if)
+                batadv_hardif_free_ref(primary_if);
+
+        if (ret)
+                batadv_dbg(BATADV_DBG_BATMAN, bat_priv,
+                           "Impossible to send uevent for (%s,%s,%s) event (err: %d)\n",
+                           batadv_uev_type_str[type],
+                           batadv_uev_action_str[action],
+                           (action == BATADV_UEV_DEL ? "NULL" : data), ret);
+        return ret;
+}
diff --git a/net/batman-adv/bat_sysfs.h b/net/batman-adv/sysfs.h
index fece77ae586..3fd1412b062 100644
--- a/net/batman-adv/bat_sysfs.h
+++ b/net/batman-adv/sysfs.h
@@ -1,5 +1,4 @@
-/*
- * Copyright (C) 2010-2012 B.A.T.M.A.N. contributors:
+/* Copyright (C) 2010-2012 B.A.T.M.A.N. contributors:
  *
  * Marek Lindner
  *
@@ -16,17 +15,15 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA
- *
  */
 
-
 #ifndef _NET_BATMAN_ADV_SYSFS_H_
 #define _NET_BATMAN_ADV_SYSFS_H_
 
-#define SYSFS_IF_MESH_SUBDIR "mesh"
-#define SYSFS_IF_BAT_SUBDIR "batman_adv"
+#define BATADV_SYSFS_IF_MESH_SUBDIR "mesh"
+#define BATADV_SYSFS_IF_BAT_SUBDIR "batman_adv"
 
-struct bat_attribute {
+struct batadv_attribute {
         struct attribute attr;
         ssize_t (*show)(struct kobject *kobj, struct attribute *attr,
                         char *buf);
@@ -34,11 +31,12 @@ struct bat_attribute {
                          char *buf, size_t count);
 };
 
-int sysfs_add_meshif(struct net_device *dev);
-void sysfs_del_meshif(struct net_device *dev);
-int sysfs_add_hardif(struct kobject **hardif_obj, struct net_device *dev);
-void sysfs_del_hardif(struct kobject **hardif_obj);
-int throw_uevent(struct bat_priv *bat_priv, enum uev_type type,
-                 enum uev_action action, const char *data);
+int batadv_sysfs_add_meshif(struct net_device *dev);
+void batadv_sysfs_del_meshif(struct net_device *dev);
+int batadv_sysfs_add_hardif(struct kobject **hardif_obj,
+                            struct net_device *dev);
+void batadv_sysfs_del_hardif(struct kobject **hardif_obj);
+int batadv_throw_uevent(struct batadv_priv *bat_priv, enum batadv_uev_type type,
+                        enum batadv_uev_action action, const char *data);
 
 #endif /* _NET_BATMAN_ADV_SYSFS_H_ */
diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c
index 2ab83d7fb1f..a438f4b582f 100644
--- a/net/batman-adv/translation-table.c
+++ b/net/batman-adv/translation-table.c
@@ -1,5 +1,4 @@
-/*
- * Copyright (C) 2007-2012 B.A.T.M.A.N. contributors:
+/* Copyright (C) 2007-2012 B.A.T.M.A.N. contributors:
  *
  * Marek Lindner, Simon Wunderlich, Antonio Quartulli
  *
@@ -16,7 +15,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA
- *
  */
 
 #include "main.h"
@@ -31,44 +29,46 @@
 
 #include <linux/crc16.h>
 
-static void send_roam_adv(struct bat_priv *bat_priv, uint8_t *client,
-                          struct orig_node *orig_node);
-static void tt_purge(struct work_struct *work);
-static void tt_global_del_orig_list(struct tt_global_entry *tt_global_entry);
+static void batadv_send_roam_adv(struct batadv_priv *bat_priv, uint8_t *client,
+                                 struct batadv_orig_node *orig_node);
+static void batadv_tt_purge(struct work_struct *work);
+static void
+batadv_tt_global_del_orig_list(struct batadv_tt_global_entry *tt_global_entry);
 
 /* returns 1 if they are the same mac addr */
-static int compare_tt(const struct hlist_node *node, const void *data2)
+static int batadv_compare_tt(const struct hlist_node *node, const void *data2)
 {
-        const void *data1 = container_of(node, struct tt_common_entry,
+        const void *data1 = container_of(node, struct batadv_tt_common_entry,
                                          hash_entry);
 
         return (memcmp(data1, data2, ETH_ALEN) == 0 ? 1 : 0);
 }
 
-static void tt_start_timer(struct bat_priv *bat_priv)
+static void batadv_tt_start_timer(struct batadv_priv *bat_priv)
 {
-        INIT_DELAYED_WORK(&bat_priv->tt_work, tt_purge);
-        queue_delayed_work(bat_event_workqueue, &bat_priv->tt_work,
+        INIT_DELAYED_WORK(&bat_priv->tt_work, batadv_tt_purge);
+        queue_delayed_work(batadv_event_workqueue, &bat_priv->tt_work,
                            msecs_to_jiffies(5000));
 }
 
-static struct tt_common_entry *tt_hash_find(struct hashtable_t *hash,
-                                            const void *data)
+static struct batadv_tt_common_entry *
+batadv_tt_hash_find(struct batadv_hashtable *hash, const void *data)
 {
         struct hlist_head *head;
         struct hlist_node *node;
-        struct tt_common_entry *tt_common_entry, *tt_common_entry_tmp = NULL;
+        struct batadv_tt_common_entry *tt_common_entry;
+        struct batadv_tt_common_entry *tt_common_entry_tmp = NULL;
         uint32_t index;
 
         if (!hash)
                 return NULL;
 
-        index = choose_orig(data, hash->size);
+        index = batadv_choose_orig(data, hash->size);
         head = &hash->table[index];
 
         rcu_read_lock();
         hlist_for_each_entry_rcu(tt_common_entry, node, head, hash_entry) {
-                if (!compare_eth(tt_common_entry, data))
+                if (!batadv_compare_eth(tt_common_entry, data))
                         continue;
 
                 if (!atomic_inc_not_zero(&tt_common_entry->refcount))
@@ -82,80 +82,87 @@ static struct tt_common_entry *tt_hash_find(struct hashtable_t *hash,
         return tt_common_entry_tmp;
 }
 
-static struct tt_local_entry *tt_local_hash_find(struct bat_priv *bat_priv,
-                                                 const void *data)
+static struct batadv_tt_local_entry *
+batadv_tt_local_hash_find(struct batadv_priv *bat_priv, const void *data)
 {
-        struct tt_common_entry *tt_common_entry;
-        struct tt_local_entry *tt_local_entry = NULL;
+        struct batadv_tt_common_entry *tt_common_entry;
+        struct batadv_tt_local_entry *tt_local_entry = NULL;
 
-        tt_common_entry = tt_hash_find(bat_priv->tt_local_hash, data);
+        tt_common_entry = batadv_tt_hash_find(bat_priv->tt_local_hash, data);
         if (tt_common_entry)
                 tt_local_entry = container_of(tt_common_entry,
-                                              struct tt_local_entry, common);
+                                              struct batadv_tt_local_entry,
+                                              common);
         return tt_local_entry;
 }
 
-static struct tt_global_entry *tt_global_hash_find(struct bat_priv *bat_priv,
-                                                   const void *data)
+static struct batadv_tt_global_entry *
+batadv_tt_global_hash_find(struct batadv_priv *bat_priv, const void *data)
 {
-        struct tt_common_entry *tt_common_entry;
-        struct tt_global_entry *tt_global_entry = NULL;
+        struct batadv_tt_common_entry *tt_common_entry;
+        struct batadv_tt_global_entry *tt_global_entry = NULL;
 
-        tt_common_entry = tt_hash_find(bat_priv->tt_global_hash, data);
+        tt_common_entry = batadv_tt_hash_find(bat_priv->tt_global_hash, data);
         if (tt_common_entry)
                 tt_global_entry = container_of(tt_common_entry,
-                                               struct tt_global_entry, common);
+                                               struct batadv_tt_global_entry,
+                                               common);
         return tt_global_entry;
 
 }
 
-static void tt_local_entry_free_ref(struct tt_local_entry *tt_local_entry)
+static void
+batadv_tt_local_entry_free_ref(struct batadv_tt_local_entry *tt_local_entry)
 {
         if (atomic_dec_and_test(&tt_local_entry->common.refcount))
                 kfree_rcu(tt_local_entry, common.rcu);
 }
 
-static void tt_global_entry_free_rcu(struct rcu_head *rcu)
+static void batadv_tt_global_entry_free_rcu(struct rcu_head *rcu)
 {
-        struct tt_common_entry *tt_common_entry;
-        struct tt_global_entry *tt_global_entry;
+        struct batadv_tt_common_entry *tt_common_entry;
+        struct batadv_tt_global_entry *tt_global_entry;
 
-        tt_common_entry = container_of(rcu, struct tt_common_entry, rcu);
-        tt_global_entry = container_of(tt_common_entry, struct tt_global_entry,
-                                       common);
+        tt_common_entry = container_of(rcu, struct batadv_tt_common_entry, rcu);
+        tt_global_entry = container_of(tt_common_entry,
+                                       struct batadv_tt_global_entry, common);
 
         kfree(tt_global_entry);
 }
 
-static void tt_global_entry_free_ref(struct tt_global_entry *tt_global_entry)
+static void
+batadv_tt_global_entry_free_ref(struct batadv_tt_global_entry *tt_global_entry)
 {
         if (atomic_dec_and_test(&tt_global_entry->common.refcount)) {
-                tt_global_del_orig_list(tt_global_entry);
+                batadv_tt_global_del_orig_list(tt_global_entry);
                 call_rcu(&tt_global_entry->common.rcu,
-                         tt_global_entry_free_rcu);
+                         batadv_tt_global_entry_free_rcu);
         }
 }
 
-static void tt_orig_list_entry_free_rcu(struct rcu_head *rcu)
+static void batadv_tt_orig_list_entry_free_rcu(struct rcu_head *rcu)
 {
-        struct tt_orig_list_entry *orig_entry;
+        struct batadv_tt_orig_list_entry *orig_entry;
 
-        orig_entry = container_of(rcu, struct tt_orig_list_entry, rcu);
-        orig_node_free_ref(orig_entry->orig_node);
+        orig_entry = container_of(rcu, struct batadv_tt_orig_list_entry, rcu);
+        batadv_orig_node_free_ref(orig_entry->orig_node);
         kfree(orig_entry);
 }
 
-static void tt_orig_list_entry_free_ref(struct tt_orig_list_entry *orig_entry)
+static void
+batadv_tt_orig_list_entry_free_ref(struct batadv_tt_orig_list_entry *orig_entry)
 {
         /* to avoid race conditions, immediately decrease the tt counter */
         atomic_dec(&orig_entry->orig_node->tt_size);
-        call_rcu(&orig_entry->rcu, tt_orig_list_entry_free_rcu);
+        call_rcu(&orig_entry->rcu, batadv_tt_orig_list_entry_free_rcu);
 }
 
-static void tt_local_event(struct bat_priv *bat_priv, const uint8_t *addr,
-                           uint8_t flags)
+static void batadv_tt_local_event(struct batadv_priv *bat_priv,
+                                  const uint8_t *addr, uint8_t flags)
 {
-        struct tt_change_node *tt_change_node;
+        struct batadv_tt_change_node *tt_change_node, *entry, *safe;
+        bool event_removed = false;
+        bool del_op_requested, del_op_entry;
 
         tt_change_node = kmalloc(sizeof(*tt_change_node), GFP_ATOMIC);
 
@@ -165,50 +172,82 @@ static void tt_local_event(struct bat_priv *bat_priv, const uint8_t *addr,
         tt_change_node->change.flags = flags;
         memcpy(tt_change_node->change.addr, addr, ETH_ALEN);
 
+        del_op_requested = flags & BATADV_TT_CLIENT_DEL;
+
+        /* check for ADD+DEL or DEL+ADD events */
         spin_lock_bh(&bat_priv->tt_changes_list_lock);
+        list_for_each_entry_safe(entry, safe, &bat_priv->tt_changes_list,
+                                 list) {
+                if (!batadv_compare_eth(entry->change.addr, addr))
+                        continue;
+
+                /* DEL+ADD in the same orig interval have no effect and can be
+                 * removed to avoid silly behaviour on the receiver side. The
+                 * other way around (ADD+DEL) can happen in case of roaming of
+                 * a client still in the NEW state. Roaming of NEW clients is
+                 * now possible due to automatically recognition of "temporary"
+                 * clients
+                 */
+                del_op_entry = entry->change.flags & BATADV_TT_CLIENT_DEL;
+                if (!del_op_requested && del_op_entry)
+                        goto del;
+                if (del_op_requested && !del_op_entry)
+                        goto del;
+                continue;
+del:
+                list_del(&entry->list);
+                kfree(entry);
+                event_removed = true;
+                goto unlock;
+        }
+
         /* track the change in the OGMinterval list */
         list_add_tail(&tt_change_node->list, &bat_priv->tt_changes_list);
-        atomic_inc(&bat_priv->tt_local_changes);
+
+unlock:
         spin_unlock_bh(&bat_priv->tt_changes_list_lock);
 
-        atomic_set(&bat_priv->tt_ogm_append_cnt, 0);
+        if (event_removed)
+                atomic_dec(&bat_priv->tt_local_changes);
+        else
+                atomic_inc(&bat_priv->tt_local_changes);
 }
 
-int tt_len(int changes_num)
+int batadv_tt_len(int changes_num)
 {
-        return changes_num * sizeof(struct tt_change);
+        return changes_num * sizeof(struct batadv_tt_change);
 }
 
-static int tt_local_init(struct bat_priv *bat_priv)
+static int batadv_tt_local_init(struct batadv_priv *bat_priv)
 {
         if (bat_priv->tt_local_hash)
-                return 1;
+                return 0;
 
-        bat_priv->tt_local_hash = hash_new(1024);
+        bat_priv->tt_local_hash = batadv_hash_new(1024);
 
         if (!bat_priv->tt_local_hash)
-                return 0;
+                return -ENOMEM;
 
-        return 1;
+        return 0;
 }
 
-void tt_local_add(struct net_device *soft_iface, const uint8_t *addr,
-                  int ifindex)
+void batadv_tt_local_add(struct net_device *soft_iface, const uint8_t *addr,
+                         int ifindex)
 {
-        struct bat_priv *bat_priv = netdev_priv(soft_iface);
-        struct tt_local_entry *tt_local_entry = NULL;
-        struct tt_global_entry *tt_global_entry = NULL;
+        struct batadv_priv *bat_priv = netdev_priv(soft_iface);
+        struct batadv_tt_local_entry *tt_local_entry = NULL;
+        struct batadv_tt_global_entry *tt_global_entry = NULL;
         struct hlist_head *head;
         struct hlist_node *node;
-        struct tt_orig_list_entry *orig_entry;
+        struct batadv_tt_orig_list_entry *orig_entry;
         int hash_added;
 
-        tt_local_entry = tt_local_hash_find(bat_priv, addr);
+        tt_local_entry = batadv_tt_local_hash_find(bat_priv, addr);
 
         if (tt_local_entry) {
                 tt_local_entry->last_seen = jiffies;
-                /* possibly unset the TT_CLIENT_PENDING flag */
-                tt_local_entry->common.flags &= ~TT_CLIENT_PENDING;
+                /* possibly unset the BATADV_TT_CLIENT_PENDING flag */
+                tt_local_entry->common.flags &= ~BATADV_TT_CLIENT_PENDING;
                 goto out;
         }
 
@@ -216,40 +255,42 @@ void tt_local_add(struct net_device *soft_iface, const uint8_t *addr,
         if (!tt_local_entry)
                 goto out;
 
-        bat_dbg(DBG_TT, bat_priv,
-                "Creating new local tt entry: %pM (ttvn: %d)\n", addr,
-                (uint8_t)atomic_read(&bat_priv->ttvn));
+        batadv_dbg(BATADV_DBG_TT, bat_priv,
+                   "Creating new local tt entry: %pM (ttvn: %d)\n", addr,
+                   (uint8_t)atomic_read(&bat_priv->ttvn));
 
         memcpy(tt_local_entry->common.addr, addr, ETH_ALEN);
-        tt_local_entry->common.flags = NO_FLAGS;
-        if (is_wifi_iface(ifindex))
-                tt_local_entry->common.flags |= TT_CLIENT_WIFI;
+        tt_local_entry->common.flags = BATADV_NO_FLAGS;
+        if (batadv_is_wifi_iface(ifindex))
+                tt_local_entry->common.flags |= BATADV_TT_CLIENT_WIFI;
         atomic_set(&tt_local_entry->common.refcount, 2);
         tt_local_entry->last_seen = jiffies;
 
         /* the batman interface mac address should never be purged */
-        if (compare_eth(addr, soft_iface->dev_addr))
-                tt_local_entry->common.flags |= TT_CLIENT_NOPURGE;
+        if (batadv_compare_eth(addr, soft_iface->dev_addr))
+                tt_local_entry->common.flags |= BATADV_TT_CLIENT_NOPURGE;
 
         /* The local entry has to be marked as NEW to avoid to send it in
          * a full table response going out before the next ttvn increment
-         * (consistency check) */
-        tt_local_entry->common.flags |= TT_CLIENT_NEW;
+         * (consistency check)
+         */
+        tt_local_entry->common.flags |= BATADV_TT_CLIENT_NEW;
 
-        hash_added = hash_add(bat_priv->tt_local_hash, compare_tt, choose_orig,
-                         &tt_local_entry->common,
-                         &tt_local_entry->common.hash_entry);
+        hash_added = batadv_hash_add(bat_priv->tt_local_hash, batadv_compare_tt,
+                                     batadv_choose_orig,
+                                     &tt_local_entry->common,
+                                     &tt_local_entry->common.hash_entry);
 
         if (unlikely(hash_added != 0)) {
                 /* remove the reference for the hash */
-                tt_local_entry_free_ref(tt_local_entry);
+                batadv_tt_local_entry_free_ref(tt_local_entry);
                 goto out;
         }
 
-        tt_local_event(bat_priv, addr, tt_local_entry->common.flags);
+        batadv_tt_local_event(bat_priv, addr, tt_local_entry->common.flags);
 
         /* remove address from global hash if present */
-        tt_global_entry = tt_global_hash_find(bat_priv, addr);
+        tt_global_entry = batadv_tt_global_hash_find(bat_priv, addr);
 
         /* Check whether it is a roaming! */
         if (tt_global_entry) {
@@ -259,31 +300,85 @@ void tt_local_add(struct net_device *soft_iface, const uint8_t *addr,
                 hlist_for_each_entry_rcu(orig_entry, node, head, list) {
                         orig_entry->orig_node->tt_poss_change = true;
 
-                        send_roam_adv(bat_priv, tt_global_entry->common.addr,
-                                      orig_entry->orig_node);
+                        batadv_send_roam_adv(bat_priv,
+                                             tt_global_entry->common.addr,
+                                             orig_entry->orig_node);
                 }
                 rcu_read_unlock();
                 /* The global entry has to be marked as ROAMING and
                  * has to be kept for consistency purpose
                  */
-                tt_global_entry->common.flags |= TT_CLIENT_ROAM;
+                tt_global_entry->common.flags |= BATADV_TT_CLIENT_ROAM;
                 tt_global_entry->roam_at = jiffies;
         }
 out:
         if (tt_local_entry)
-                tt_local_entry_free_ref(tt_local_entry);
+                batadv_tt_local_entry_free_ref(tt_local_entry);
         if (tt_global_entry)
-                tt_global_entry_free_ref(tt_global_entry);
+                batadv_tt_global_entry_free_ref(tt_global_entry);
+}
+
+static void batadv_tt_realloc_packet_buff(unsigned char **packet_buff,
+                                          int *packet_buff_len,
+                                          int min_packet_len,
+                                          int new_packet_len)
+{
+        unsigned char *new_buff;
+
+        new_buff = kmalloc(new_packet_len, GFP_ATOMIC);
+
+        /* keep old buffer if kmalloc should fail */
+        if (new_buff) {
+                memcpy(new_buff, *packet_buff, min_packet_len);
+                kfree(*packet_buff);
+                *packet_buff = new_buff;
+                *packet_buff_len = new_packet_len;
+        }
+}
+
+static void batadv_tt_prepare_packet_buff(struct batadv_priv *bat_priv,
+                                          unsigned char **packet_buff,
+                                          int *packet_buff_len,
+                                          int min_packet_len)
+{
+        struct batadv_hard_iface *primary_if;
+        int req_len;
+
+        primary_if = batadv_primary_if_get_selected(bat_priv);
+
+        req_len = min_packet_len;
+        req_len += batadv_tt_len(atomic_read(&bat_priv->tt_local_changes));
+
+        /* if we have too many changes for one packet don't send any
+         * and wait for the tt table request which will be fragmented
+         */
+        if ((!primary_if) || (req_len > primary_if->soft_iface->mtu))
+                req_len = min_packet_len;
+
+        batadv_tt_realloc_packet_buff(packet_buff, packet_buff_len,
+                                      min_packet_len, req_len);
+
+        if (primary_if)
+                batadv_hardif_free_ref(primary_if);
 }
 
-int tt_changes_fill_buffer(struct bat_priv *bat_priv,
-                           unsigned char *buff, int buff_len)
+static int batadv_tt_changes_fill_buff(struct batadv_priv *bat_priv,
+                                       unsigned char **packet_buff,
+                                       int *packet_buff_len,
+                                       int min_packet_len)
 {
-        int count = 0, tot_changes = 0;
-        struct tt_change_node *entry, *safe;
+        struct batadv_tt_change_node *entry, *safe;
+        int count = 0, tot_changes = 0, new_len;
+        unsigned char *tt_buff;
 
-        if (buff_len > 0)
-                tot_changes = buff_len / tt_len(1);
+        batadv_tt_prepare_packet_buff(bat_priv, packet_buff,
+                                      packet_buff_len, min_packet_len);
+
+        new_len = *packet_buff_len - min_packet_len;
+        tt_buff = *packet_buff + min_packet_len;
+
+        if (new_len > 0)
+                tot_changes = new_len / batadv_tt_len(1);
 
         spin_lock_bh(&bat_priv->tt_changes_list_lock);
         atomic_set(&bat_priv->tt_local_changes, 0);
@@ -291,8 +386,8 @@ int tt_changes_fill_buffer(struct bat_priv *bat_priv,
         list_for_each_entry_safe(entry, safe, &bat_priv->tt_changes_list,
                                  list) {
                 if (count < tot_changes) {
-                        memcpy(buff + tt_len(count),
-                               &entry->change, sizeof(struct tt_change));
+                        memcpy(tt_buff + batadv_tt_len(count),
+                               &entry->change, sizeof(struct batadv_tt_change));
                         count++;
                 }
                 list_del(&entry->list);
@@ -305,37 +400,35 @@ int tt_changes_fill_buffer(struct bat_priv *bat_priv,
         kfree(bat_priv->tt_buff);
         bat_priv->tt_buff_len = 0;
         bat_priv->tt_buff = NULL;
-        /* We check whether this new OGM has no changes due to size
-         * problems */
-        if (buff_len > 0) {
-                /**
-                 * if kmalloc() fails we will reply with the full table
+        /* check whether this new OGM has no changes due to size problems */
+        if (new_len > 0) {
+                /* if kmalloc() fails we will reply with the full table
                  * instead of providing the diff
                  */
-                bat_priv->tt_buff = kmalloc(buff_len, GFP_ATOMIC);
+                bat_priv->tt_buff = kmalloc(new_len, GFP_ATOMIC);
                 if (bat_priv->tt_buff) {
-                        memcpy(bat_priv->tt_buff, buff, buff_len);
-                        bat_priv->tt_buff_len = buff_len;
+                        memcpy(bat_priv->tt_buff, tt_buff, new_len);
+                        bat_priv->tt_buff_len = new_len;
                 }
         }
         spin_unlock_bh(&bat_priv->tt_buff_lock);
 
-        return tot_changes;
+        return count;
 }
 
-int tt_local_seq_print_text(struct seq_file *seq, void *offset)
+int batadv_tt_local_seq_print_text(struct seq_file *seq, void *offset)
 {
         struct net_device *net_dev = (struct net_device *)seq->private;
-        struct bat_priv *bat_priv = netdev_priv(net_dev);
-        struct hashtable_t *hash = bat_priv->tt_local_hash;
-        struct tt_common_entry *tt_common_entry;
-        struct hard_iface *primary_if;
+        struct batadv_priv *bat_priv = netdev_priv(net_dev);
+        struct batadv_hashtable *hash = bat_priv->tt_local_hash;
+        struct batadv_tt_common_entry *tt_common_entry;
+        struct batadv_hard_iface *primary_if;
         struct hlist_node *node;
         struct hlist_head *head;
         uint32_t i;
         int ret = 0;
 
-        primary_if = primary_if_get_selected(bat_priv);
+        primary_if = batadv_primary_if_get_selected(bat_priv);
         if (!primary_if) {
                 ret = seq_printf(seq,
                                  "BATMAN mesh %s disabled - please specify interfaces to enable it\n",
@@ -343,7 +436,7 @@ int tt_local_seq_print_text(struct seq_file *seq, void *offset)
                 goto out;
         }
 
-        if (primary_if->if_status != IF_ACTIVE) {
+        if (primary_if->if_status != BATADV_IF_ACTIVE) {
                 ret = seq_printf(seq,
                                  "BATMAN mesh %s disabled - primary interface not active\n",
                                  net_dev->name);
@@ -363,63 +456,94 @@ int tt_local_seq_print_text(struct seq_file *seq, void *offset)
                         seq_printf(seq, " * %pM [%c%c%c%c%c]\n",
                                    tt_common_entry->addr,
                                    (tt_common_entry->flags &
-                                    TT_CLIENT_ROAM ? 'R' : '.'),
+                                    BATADV_TT_CLIENT_ROAM ? 'R' : '.'),
                                    (tt_common_entry->flags &
-                                    TT_CLIENT_NOPURGE ? 'P' : '.'),
+                                    BATADV_TT_CLIENT_NOPURGE ? 'P' : '.'),
                                    (tt_common_entry->flags &
-                                    TT_CLIENT_NEW ? 'N' : '.'),
+                                    BATADV_TT_CLIENT_NEW ? 'N' : '.'),
                                    (tt_common_entry->flags &
-                                    TT_CLIENT_PENDING ? 'X' : '.'),
+                                    BATADV_TT_CLIENT_PENDING ? 'X' : '.'),
                                    (tt_common_entry->flags &
-                                    TT_CLIENT_WIFI ? 'W' : '.'));
+                                    BATADV_TT_CLIENT_WIFI ? 'W' : '.'));
                 }
                 rcu_read_unlock();
         }
 out:
         if (primary_if)
-                hardif_free_ref(primary_if);
+                batadv_hardif_free_ref(primary_if);
         return ret;
 }
 
-static void tt_local_set_pending(struct bat_priv *bat_priv,
-                                 struct tt_local_entry *tt_local_entry,
-                                 uint16_t flags, const char *message)
+static void
+batadv_tt_local_set_pending(struct batadv_priv *bat_priv,
+                            struct batadv_tt_local_entry *tt_local_entry,
+                            uint16_t flags, const char *message)
 {
-        tt_local_event(bat_priv, tt_local_entry->common.addr,
-                       tt_local_entry->common.flags | flags);
+        batadv_tt_local_event(bat_priv, tt_local_entry->common.addr,
+                              tt_local_entry->common.flags | flags);
 
         /* The local client has to be marked as "pending to be removed" but has
          * to be kept in the table in order to send it in a full table
-         * response issued before the net ttvn increment (consistency check) */
-        tt_local_entry->common.flags |= TT_CLIENT_PENDING;
+         * response issued before the net ttvn increment (consistency check)
+         */
+        tt_local_entry->common.flags |= BATADV_TT_CLIENT_PENDING;
 
-        bat_dbg(DBG_TT, bat_priv,
-                "Local tt entry (%pM) pending to be removed: %s\n",
-                tt_local_entry->common.addr, message);
+        batadv_dbg(BATADV_DBG_TT, bat_priv,
+                   "Local tt entry (%pM) pending to be removed: %s\n",
+                   tt_local_entry->common.addr, message);
 }
 
-void tt_local_remove(struct bat_priv *bat_priv, const uint8_t *addr,
-                     const char *message, bool roaming)
+void batadv_tt_local_remove(struct batadv_priv *bat_priv, const uint8_t *addr,
+                            const char *message, bool roaming)
 {
-        struct tt_local_entry *tt_local_entry = NULL;
+        struct batadv_tt_local_entry *tt_local_entry = NULL;
+        uint16_t flags;
 
-        tt_local_entry = tt_local_hash_find(bat_priv, addr);
+        tt_local_entry = batadv_tt_local_hash_find(bat_priv, addr);
         if (!tt_local_entry)
                 goto out;
 
-        tt_local_set_pending(bat_priv, tt_local_entry, TT_CLIENT_DEL |
-                             (roaming ? TT_CLIENT_ROAM : NO_FLAGS), message);
+        flags = BATADV_TT_CLIENT_DEL;
+        if (roaming)
+                flags |= BATADV_TT_CLIENT_ROAM;
+
+        batadv_tt_local_set_pending(bat_priv, tt_local_entry, flags, message);
 out:
         if (tt_local_entry)
-                tt_local_entry_free_ref(tt_local_entry);
+                batadv_tt_local_entry_free_ref(tt_local_entry);
 }
 
-static void tt_local_purge(struct bat_priv *bat_priv)
+static void batadv_tt_local_purge_list(struct batadv_priv *bat_priv,
+                                       struct hlist_head *head)
 {
-        struct hashtable_t *hash = bat_priv->tt_local_hash;
-        struct tt_local_entry *tt_local_entry;
-        struct tt_common_entry *tt_common_entry;
+        struct batadv_tt_local_entry *tt_local_entry;
+        struct batadv_tt_common_entry *tt_common_entry;
         struct hlist_node *node, *node_tmp;
+
+        hlist_for_each_entry_safe(tt_common_entry, node, node_tmp, head,
+                                  hash_entry) {
+                tt_local_entry = container_of(tt_common_entry,
+                                              struct batadv_tt_local_entry,
+                                              common);
+                if (tt_local_entry->common.flags & BATADV_TT_CLIENT_NOPURGE)
+                        continue;
+
+                /* entry already marked for deletion */
+                if (tt_local_entry->common.flags & BATADV_TT_CLIENT_PENDING)
+                        continue;
+
+                if (!batadv_has_timed_out(tt_local_entry->last_seen,
+                                          BATADV_TT_LOCAL_TIMEOUT))
+                        continue;
+
+                batadv_tt_local_set_pending(bat_priv, tt_local_entry,
+                                            BATADV_TT_CLIENT_DEL, "timed out");
+        }
+}
+
+static void batadv_tt_local_purge(struct batadv_priv *bat_priv)
+{
+        struct batadv_hashtable *hash = bat_priv->tt_local_hash;
         struct hlist_head *head;
         spinlock_t *list_lock; /* protects write access to the hash lists */
         uint32_t i;
@@ -429,36 +553,18 @@ static void tt_local_purge(struct bat_priv *bat_priv)
                 list_lock = &hash->list_locks[i];
 
                 spin_lock_bh(list_lock);
-                hlist_for_each_entry_safe(tt_common_entry, node, node_tmp,
-                                          head, hash_entry) {
-                        tt_local_entry = container_of(tt_common_entry,
-                                                      struct tt_local_entry,
-                                                      common);
-                        if (tt_local_entry->common.flags & TT_CLIENT_NOPURGE)
-                                continue;
-
-                        /* entry already marked for deletion */
-                        if (tt_local_entry->common.flags & TT_CLIENT_PENDING)
-                                continue;
-
-                        if (!has_timed_out(tt_local_entry->last_seen,
-                                           TT_LOCAL_TIMEOUT))
-                                continue;
-
-                        tt_local_set_pending(bat_priv, tt_local_entry,
-                                             TT_CLIENT_DEL, "timed out");
-                }
+                batadv_tt_local_purge_list(bat_priv, head);
                 spin_unlock_bh(list_lock);
         }
 
 }
 
-static void tt_local_table_free(struct bat_priv *bat_priv)
+static void batadv_tt_local_table_free(struct batadv_priv *bat_priv)
 {
-        struct hashtable_t *hash;
+        struct batadv_hashtable *hash;
         spinlock_t *list_lock; /* protects write access to the hash lists */
-        struct tt_common_entry *tt_common_entry;
-        struct tt_local_entry *tt_local_entry;
+        struct batadv_tt_common_entry *tt_common_entry;
+        struct batadv_tt_local_entry *tt_local;
         struct hlist_node *node, *node_tmp;
         struct hlist_head *head;
         uint32_t i;
@@ -476,35 +582,35 @@ static void tt_local_table_free(struct bat_priv *bat_priv)
                 hlist_for_each_entry_safe(tt_common_entry, node, node_tmp,
                                           head, hash_entry) {
                         hlist_del_rcu(node);
-                        tt_local_entry = container_of(tt_common_entry,
-                                                      struct tt_local_entry,
-                                                      common);
-                        tt_local_entry_free_ref(tt_local_entry);
+                        tt_local = container_of(tt_common_entry,
+                                                struct batadv_tt_local_entry,
+                                                common);
+                        batadv_tt_local_entry_free_ref(tt_local);
                 }
                 spin_unlock_bh(list_lock);
         }
 
-        hash_destroy(hash);
+        batadv_hash_destroy(hash);
 
         bat_priv->tt_local_hash = NULL;
 }
 
-static int tt_global_init(struct bat_priv *bat_priv)
+static int batadv_tt_global_init(struct batadv_priv *bat_priv)
 {
         if (bat_priv->tt_global_hash)
-                return 1;
+                return 0;
 
-        bat_priv->tt_global_hash = hash_new(1024);
+        bat_priv->tt_global_hash = batadv_hash_new(1024);
 
         if (!bat_priv->tt_global_hash)
-                return 0;
+                return -ENOMEM;
 
-        return 1;
+        return 0;
 }
 
-static void tt_changes_list_free(struct bat_priv *bat_priv)
+static void batadv_tt_changes_list_free(struct batadv_priv *bat_priv)
 {
-        struct tt_change_node *entry, *safe;
+        struct batadv_tt_change_node *entry, *safe;
 
         spin_lock_bh(&bat_priv->tt_changes_list_lock);
 
@@ -521,10 +627,11 @@ static void tt_changes_list_free(struct bat_priv *bat_priv)
 /* find out if an orig_node is already in the list of a tt_global_entry.
  * returns 1 if found, 0 otherwise
  */
-static bool tt_global_entry_has_orig(const struct tt_global_entry *entry,
-                                     const struct orig_node *orig_node)
+static bool
+batadv_tt_global_entry_has_orig(const struct batadv_tt_global_entry *entry,
+                                const struct batadv_orig_node *orig_node)
 {
-        struct tt_orig_list_entry *tmp_orig_entry;
+        struct batadv_tt_orig_list_entry *tmp_orig_entry;
         const struct hlist_head *head;
         struct hlist_node *node;
         bool found = false;
@@ -541,11 +648,11 @@ static bool tt_global_entry_has_orig(const struct tt_global_entry *entry,
         return found;
 }
 
-static void tt_global_add_orig_entry(struct tt_global_entry *tt_global_entry,
-                                     struct orig_node *orig_node,
-                                     int ttvn)
+static void
+batadv_tt_global_add_orig_entry(struct batadv_tt_global_entry *tt_global_entry,
+                                struct batadv_orig_node *orig_node, int ttvn)
 {
-        struct tt_orig_list_entry *orig_entry;
+        struct batadv_tt_orig_list_entry *orig_entry;
 
         orig_entry = kzalloc(sizeof(*orig_entry), GFP_ATOMIC);
         if (!orig_entry)
@@ -564,91 +671,95 @@ static void tt_global_add_orig_entry(struct tt_global_entry *tt_global_entry,
 }
 
 /* caller must hold orig_node refcount */
-int tt_global_add(struct bat_priv *bat_priv, struct orig_node *orig_node,
-                  const unsigned char *tt_addr, uint8_t ttvn, bool roaming,
-                  bool wifi)
+int batadv_tt_global_add(struct batadv_priv *bat_priv,
+                         struct batadv_orig_node *orig_node,
+                         const unsigned char *tt_addr, uint8_t flags,
+                         uint8_t ttvn)
 {
-        struct tt_global_entry *tt_global_entry = NULL;
+        struct batadv_tt_global_entry *tt_global_entry = NULL;
         int ret = 0;
         int hash_added;
+        struct batadv_tt_common_entry *common;
 
-        tt_global_entry = tt_global_hash_find(bat_priv, tt_addr);
+        tt_global_entry = batadv_tt_global_hash_find(bat_priv, tt_addr);
 
         if (!tt_global_entry) {
-                tt_global_entry = kzalloc(sizeof(*tt_global_entry),
-                                          GFP_ATOMIC);
+                tt_global_entry = kzalloc(sizeof(*tt_global_entry), GFP_ATOMIC);
                 if (!tt_global_entry)
                         goto out;
 
-                memcpy(tt_global_entry->common.addr, tt_addr, ETH_ALEN);
+                common = &tt_global_entry->common;
+                memcpy(common->addr, tt_addr, ETH_ALEN);
 
-                tt_global_entry->common.flags = NO_FLAGS;
+                common->flags = flags;
                 tt_global_entry->roam_at = 0;
-                atomic_set(&tt_global_entry->common.refcount, 2);
+                atomic_set(&common->refcount, 2);
 
                 INIT_HLIST_HEAD(&tt_global_entry->orig_list);
                 spin_lock_init(&tt_global_entry->list_lock);
 
-                hash_added = hash_add(bat_priv->tt_global_hash, compare_tt,
-                                 choose_orig, &tt_global_entry->common,
-                                 &tt_global_entry->common.hash_entry);
+                hash_added = batadv_hash_add(bat_priv->tt_global_hash,
+                                             batadv_compare_tt,
+                                             batadv_choose_orig, common,
+                                             &common->hash_entry);
 
                 if (unlikely(hash_added != 0)) {
                         /* remove the reference for the hash */
-                        tt_global_entry_free_ref(tt_global_entry);
+                        batadv_tt_global_entry_free_ref(tt_global_entry);
                         goto out_remove;
                 }
 
-                tt_global_add_orig_entry(tt_global_entry, orig_node, ttvn);
+                batadv_tt_global_add_orig_entry(tt_global_entry, orig_node,
+                                                ttvn);
         } else {
                 /* there is already a global entry, use this one. */
 
-                /* If there is the TT_CLIENT_ROAM flag set, there is only one
-                 * originator left in the list and we previously received a
+                /* If there is the BATADV_TT_CLIENT_ROAM flag set, there is only
+                 * one originator left in the list and we previously received a
                  * delete + roaming change for this originator.
                  *
                  * We should first delete the old originator before adding the
                  * new one.
                  */
-                if (tt_global_entry->common.flags & TT_CLIENT_ROAM) {
-                        tt_global_del_orig_list(tt_global_entry);
-                        tt_global_entry->common.flags &= ~TT_CLIENT_ROAM;
+                if (tt_global_entry->common.flags & BATADV_TT_CLIENT_ROAM) {
+                        batadv_tt_global_del_orig_list(tt_global_entry);
+                        tt_global_entry->common.flags &= ~BATADV_TT_CLIENT_ROAM;
                         tt_global_entry->roam_at = 0;
                 }
 
-                if (!tt_global_entry_has_orig(tt_global_entry, orig_node))
-                        tt_global_add_orig_entry(tt_global_entry, orig_node,
-                                                 ttvn);
+                if (!batadv_tt_global_entry_has_orig(tt_global_entry,
+                                                     orig_node))
+                        batadv_tt_global_add_orig_entry(tt_global_entry,
+                                                        orig_node, ttvn);
         }
 
-        if (wifi)
-                tt_global_entry->common.flags |= TT_CLIENT_WIFI;
-
-        bat_dbg(DBG_TT, bat_priv,
-                "Creating new global tt entry: %pM (via %pM)\n",
-                tt_global_entry->common.addr, orig_node->orig);
+        batadv_dbg(BATADV_DBG_TT, bat_priv,
+                   "Creating new global tt entry: %pM (via %pM)\n",
+                   tt_global_entry->common.addr, orig_node->orig);
 
 out_remove:
         /* remove address from local hash if present */
-        tt_local_remove(bat_priv, tt_global_entry->common.addr,
-                        "global tt received", roaming);
+        batadv_tt_local_remove(bat_priv, tt_global_entry->common.addr,
+                               "global tt received",
+                               flags & BATADV_TT_CLIENT_ROAM);
         ret = 1;
 out:
         if (tt_global_entry)
-                tt_global_entry_free_ref(tt_global_entry);
+                batadv_tt_global_entry_free_ref(tt_global_entry);
         return ret;
 }
 
 /* print all orig nodes who announce the address for this global entry.
  * it is assumed that the caller holds rcu_read_lock();
  */
-static void tt_global_print_entry(struct tt_global_entry *tt_global_entry,
-                                  struct seq_file *seq)
+static void
+batadv_tt_global_print_entry(struct batadv_tt_global_entry *tt_global_entry,
+                             struct seq_file *seq)
 {
         struct hlist_head *head;
         struct hlist_node *node;
-        struct tt_orig_list_entry *orig_entry;
-        struct tt_common_entry *tt_common_entry;
+        struct batadv_tt_orig_list_entry *orig_entry;
+        struct batadv_tt_common_entry *tt_common_entry;
         uint16_t flags;
         uint8_t last_ttvn;
 
@@ -662,25 +773,25 @@ static void tt_global_print_entry(struct tt_global_entry *tt_global_entry,
                 seq_printf(seq, " * %pM  (%3u) via %pM     (%3u)   [%c%c]\n",
                            tt_global_entry->common.addr, orig_entry->ttvn,
                            orig_entry->orig_node->orig, last_ttvn,
-                           (flags & TT_CLIENT_ROAM ? 'R' : '.'),
-                           (flags & TT_CLIENT_WIFI ? 'W' : '.'));
+                           (flags & BATADV_TT_CLIENT_ROAM ? 'R' : '.'),
+                           (flags & BATADV_TT_CLIENT_WIFI ? 'W' : '.'));
         }
 }
 
-int tt_global_seq_print_text(struct seq_file *seq, void *offset)
+int batadv_tt_global_seq_print_text(struct seq_file *seq, void *offset)
 {
         struct net_device *net_dev = (struct net_device *)seq->private;
-        struct bat_priv *bat_priv = netdev_priv(net_dev);
-        struct hashtable_t *hash = bat_priv->tt_global_hash;
-        struct tt_common_entry *tt_common_entry;
-        struct tt_global_entry *tt_global_entry;
-        struct hard_iface *primary_if;
+        struct batadv_priv *bat_priv = netdev_priv(net_dev);
+        struct batadv_hashtable *hash = bat_priv->tt_global_hash;
+        struct batadv_tt_common_entry *tt_common_entry;
+        struct batadv_tt_global_entry *tt_global;
+        struct batadv_hard_iface *primary_if;
         struct hlist_node *node;
         struct hlist_head *head;
         uint32_t i;
         int ret = 0;
 
-        primary_if = primary_if_get_selected(bat_priv);
+        primary_if = batadv_primary_if_get_selected(bat_priv);
         if (!primary_if) {
                 ret = seq_printf(seq,
                                  "BATMAN mesh %s disabled - please specify interfaces to enable it\n",
@@ -688,7 +799,7 @@ int tt_global_seq_print_text(struct seq_file *seq, void *offset)
                 goto out;
         }
 
-        if (primary_if->if_status != IF_ACTIVE) {
+        if (primary_if->if_status != BATADV_IF_ACTIVE) {
                 ret = seq_printf(seq,
                                  "BATMAN mesh %s disabled - primary interface not active\n",
                                  net_dev->name);
@@ -707,87 +818,91 @@ int tt_global_seq_print_text(struct seq_file *seq, void *offset)
                 rcu_read_lock();
                 hlist_for_each_entry_rcu(tt_common_entry, node,
                                          head, hash_entry) {
-                        tt_global_entry = container_of(tt_common_entry,
-                                                       struct tt_global_entry,
-                                                       common);
-                        tt_global_print_entry(tt_global_entry, seq);
+                        tt_global = container_of(tt_common_entry,
+                                                 struct batadv_tt_global_entry,
+                                                 common);
+                        batadv_tt_global_print_entry(tt_global, seq);
                 }
                 rcu_read_unlock();
         }
 out:
         if (primary_if)
-                hardif_free_ref(primary_if);
+                batadv_hardif_free_ref(primary_if);
         return ret;
 }
 
 /* deletes the orig list of a tt_global_entry */
-static void tt_global_del_orig_list(struct tt_global_entry *tt_global_entry)
+static void
+batadv_tt_global_del_orig_list(struct batadv_tt_global_entry *tt_global_entry)
 {
         struct hlist_head *head;
         struct hlist_node *node, *safe;
-        struct tt_orig_list_entry *orig_entry;
+        struct batadv_tt_orig_list_entry *orig_entry;
 
         spin_lock_bh(&tt_global_entry->list_lock);
         head = &tt_global_entry->orig_list;
         hlist_for_each_entry_safe(orig_entry, node, safe, head, list) {
                 hlist_del_rcu(node);
-                tt_orig_list_entry_free_ref(orig_entry);
+                batadv_tt_orig_list_entry_free_ref(orig_entry);
         }
         spin_unlock_bh(&tt_global_entry->list_lock);
 
 }
 
-static void tt_global_del_orig_entry(struct bat_priv *bat_priv,
-                                     struct tt_global_entry *tt_global_entry,
-                                     struct orig_node *orig_node,
-                                     const char *message)
+static void
+batadv_tt_global_del_orig_entry(struct batadv_priv *bat_priv,
+                                struct batadv_tt_global_entry *tt_global_entry,
+                                struct batadv_orig_node *orig_node,
+                                const char *message)
 {
         struct hlist_head *head;
         struct hlist_node *node, *safe;
-        struct tt_orig_list_entry *orig_entry;
+        struct batadv_tt_orig_list_entry *orig_entry;
 
         spin_lock_bh(&tt_global_entry->list_lock);
         head = &tt_global_entry->orig_list;
         hlist_for_each_entry_safe(orig_entry, node, safe, head, list) {
                 if (orig_entry->orig_node == orig_node) {
-                        bat_dbg(DBG_TT, bat_priv,
-                                "Deleting %pM from global tt entry %pM: %s\n",
-                                orig_node->orig, tt_global_entry->common.addr,
-                                message);
+                        batadv_dbg(BATADV_DBG_TT, bat_priv,
+                                   "Deleting %pM from global tt entry %pM: %s\n",
+                                   orig_node->orig,
+                                   tt_global_entry->common.addr, message);
                         hlist_del_rcu(node);
-                        tt_orig_list_entry_free_ref(orig_entry);
+                        batadv_tt_orig_list_entry_free_ref(orig_entry);
                 }
         }
         spin_unlock_bh(&tt_global_entry->list_lock);
 }
 
-static void tt_global_del_struct(struct bat_priv *bat_priv,
-                                 struct tt_global_entry *tt_global_entry,
-                                 const char *message)
+static void
+batadv_tt_global_del_struct(struct batadv_priv *bat_priv,
+                            struct batadv_tt_global_entry *tt_global_entry,
+                            const char *message)
 {
-        bat_dbg(DBG_TT, bat_priv,
-                "Deleting global tt entry %pM: %s\n",
-                tt_global_entry->common.addr, message);
+        batadv_dbg(BATADV_DBG_TT, bat_priv,
+                   "Deleting global tt entry %pM: %s\n",
+                   tt_global_entry->common.addr, message);
 
-        hash_remove(bat_priv->tt_global_hash, compare_tt, choose_orig,
-                    tt_global_entry->common.addr);
-        tt_global_entry_free_ref(tt_global_entry);
+        batadv_hash_remove(bat_priv->tt_global_hash, batadv_compare_tt,
+                           batadv_choose_orig, tt_global_entry->common.addr);
+        batadv_tt_global_entry_free_ref(tt_global_entry);
 
 }
 
 /* If the client is to be deleted, we check if it is the last origantor entry
- * within tt_global entry. If yes, we set the TT_CLIENT_ROAM flag and the timer,
- * otherwise we simply remove the originator scheduled for deletion.
+ * within tt_global entry. If yes, we set the BATADV_TT_CLIENT_ROAM flag and the
+ * timer, otherwise we simply remove the originator scheduled for deletion.
  */
-static void tt_global_del_roaming(struct bat_priv *bat_priv,
-                                  struct tt_global_entry *tt_global_entry,
-                                  struct orig_node *orig_node,
-                                  const char *message)
+static void
+batadv_tt_global_del_roaming(struct batadv_priv *bat_priv,
+                             struct batadv_tt_global_entry *tt_global_entry,
+                             struct batadv_orig_node *orig_node,
+                             const char *message)
 {
         bool last_entry = true;
         struct hlist_head *head;
         struct hlist_node *node;
-        struct tt_orig_list_entry *orig_entry;
+        struct batadv_tt_orig_list_entry *orig_entry;
 
         /* no local entry exists, case 1:
          * Check if this is the last one or if other entries exist.
@@ -805,37 +920,37 @@ static void tt_global_del_roaming(struct bat_priv *bat_priv,
 
         if (last_entry) {
                 /* its the last one, mark for roaming. */
-                tt_global_entry->common.flags |= TT_CLIENT_ROAM;
+                tt_global_entry->common.flags |= BATADV_TT_CLIENT_ROAM;
                 tt_global_entry->roam_at = jiffies;
         } else
                 /* there is another entry, we can simply delete this
                  * one and can still use the other one.
                  */
-                tt_global_del_orig_entry(bat_priv, tt_global_entry,
-                                         orig_node, message);
+                batadv_tt_global_del_orig_entry(bat_priv, tt_global_entry,
+                                                orig_node, message);
 }
 
 
 
-static void tt_global_del(struct bat_priv *bat_priv,
-                          struct orig_node *orig_node,
-                          const unsigned char *addr,
-                          const char *message, bool roaming)
+static void batadv_tt_global_del(struct batadv_priv *bat_priv,
+                                 struct batadv_orig_node *orig_node,
+                                 const unsigned char *addr,
+                                 const char *message, bool roaming)
 {
-        struct tt_global_entry *tt_global_entry = NULL;
-        struct tt_local_entry *tt_local_entry = NULL;
+        struct batadv_tt_global_entry *tt_global_entry = NULL;
+        struct batadv_tt_local_entry *local_entry = NULL;
 
-        tt_global_entry = tt_global_hash_find(bat_priv, addr);
+        tt_global_entry = batadv_tt_global_hash_find(bat_priv, addr);
         if (!tt_global_entry)
                 goto out;
 
         if (!roaming) {
-                tt_global_del_orig_entry(bat_priv, tt_global_entry, orig_node,
-                                         message);
+                batadv_tt_global_del_orig_entry(bat_priv, tt_global_entry,
+                                                orig_node, message);
 
                 if (hlist_empty(&tt_global_entry->orig_list))
-                        tt_global_del_struct(bat_priv, tt_global_entry,
-                                             message);
+                        batadv_tt_global_del_struct(bat_priv, tt_global_entry,
+                                                    message);
 
                 goto out;
         }
@@ -844,41 +959,42 @@ static void tt_global_del(struct bat_priv *bat_priv,
          * event, there are two possibilities:
          * 1) the client roamed from node A to node B => if there
          *    is only one originator left for this client, we mark
-         *    it with TT_CLIENT_ROAM, we start a timer and we
+         *    it with BATADV_TT_CLIENT_ROAM, we start a timer and we
          *    wait for node B to claim it. In case of timeout
          *    the entry is purged.
          *
          *    If there are other originators left, we directly delete
          *    the originator.
          * 2) the client roamed to us => we can directly delete
-         *    the global entry, since it is useless now. */
-
-        tt_local_entry = tt_local_hash_find(bat_priv,
-                                            tt_global_entry->common.addr);
-        if (tt_local_entry) {
+         *    the global entry, since it is useless now.
+         */
+        local_entry = batadv_tt_local_hash_find(bat_priv,
+                                                tt_global_entry->common.addr);
+        if (local_entry) {
                 /* local entry exists, case 2: client roamed to us. */
-                tt_global_del_orig_list(tt_global_entry);
-                tt_global_del_struct(bat_priv, tt_global_entry, message);
+                batadv_tt_global_del_orig_list(tt_global_entry);
+                batadv_tt_global_del_struct(bat_priv, tt_global_entry, message);
         } else
                 /* no local entry exists, case 1: check for roaming */
-                tt_global_del_roaming(bat_priv, tt_global_entry, orig_node,
-                                      message);
+                batadv_tt_global_del_roaming(bat_priv, tt_global_entry,
+                                             orig_node, message);
 
 
 out:
         if (tt_global_entry)
-                tt_global_entry_free_ref(tt_global_entry);
-        if (tt_local_entry)
-                tt_local_entry_free_ref(tt_local_entry);
+                batadv_tt_global_entry_free_ref(tt_global_entry);
+        if (local_entry)
+                batadv_tt_local_entry_free_ref(local_entry);
 }
 
-void tt_global_del_orig(struct bat_priv *bat_priv,
-                        struct orig_node *orig_node, const char *message)
+void batadv_tt_global_del_orig(struct batadv_priv *bat_priv,
+                               struct batadv_orig_node *orig_node,
+                               const char *message)
 {
-        struct tt_global_entry *tt_global_entry;
-        struct tt_common_entry *tt_common_entry;
+        struct batadv_tt_global_entry *tt_global;
+        struct batadv_tt_common_entry *tt_common_entry;
         uint32_t i;
-        struct hashtable_t *hash = bat_priv->tt_global_hash;
+        struct batadv_hashtable *hash = bat_priv->tt_global_hash;
         struct hlist_node *node, *safe;
         struct hlist_head *head;
         spinlock_t *list_lock; /* protects write access to the hash lists */
@@ -893,20 +1009,19 @@ void tt_global_del_orig(struct bat_priv *bat_priv,
                 spin_lock_bh(list_lock);
                 hlist_for_each_entry_safe(tt_common_entry, node, safe,
                                           head, hash_entry) {
-                        tt_global_entry = container_of(tt_common_entry,
-                                                       struct tt_global_entry,
-                                                       common);
-
-                        tt_global_del_orig_entry(bat_priv, tt_global_entry,
-                                                 orig_node, message);
-
-                        if (hlist_empty(&tt_global_entry->orig_list)) {
-                                bat_dbg(DBG_TT, bat_priv,
-                                        "Deleting global tt entry %pM: %s\n",
-                                        tt_global_entry->common.addr,
-                                        message);
+                        tt_global = container_of(tt_common_entry,
+                                                 struct batadv_tt_global_entry,
+                                                 common);
+
+                        batadv_tt_global_del_orig_entry(bat_priv, tt_global,
+                                                        orig_node, message);
+
+                        if (hlist_empty(&tt_global->orig_list)) {
+                                batadv_dbg(BATADV_DBG_TT, bat_priv,
+                                           "Deleting global tt entry %pM: %s\n",
+                                           tt_global->common.addr, message);
                                 hlist_del_rcu(node);
-                                tt_global_entry_free_ref(tt_global_entry);
+                                batadv_tt_global_entry_free_ref(tt_global);
                         }
                 }
                 spin_unlock_bh(list_lock);
@@ -914,12 +1029,36 @@ void tt_global_del_orig(struct bat_priv *bat_priv,
         orig_node->tt_initialised = false;
 }
 
-static void tt_global_roam_purge(struct bat_priv *bat_priv)
+static void batadv_tt_global_roam_purge_list(struct batadv_priv *bat_priv,
+                                             struct hlist_head *head)
 {
-        struct hashtable_t *hash = bat_priv->tt_global_hash;
-        struct tt_common_entry *tt_common_entry;
-        struct tt_global_entry *tt_global_entry;
+        struct batadv_tt_common_entry *tt_common_entry;
+        struct batadv_tt_global_entry *tt_global_entry;
         struct hlist_node *node, *node_tmp;
+
+        hlist_for_each_entry_safe(tt_common_entry, node, node_tmp, head,
+                                  hash_entry) {
+                tt_global_entry = container_of(tt_common_entry,
+                                               struct batadv_tt_global_entry,
+                                               common);
+                if (!(tt_global_entry->common.flags & BATADV_TT_CLIENT_ROAM))
+                        continue;
+                if (!batadv_has_timed_out(tt_global_entry->roam_at,
+                                          BATADV_TT_CLIENT_ROAM_TIMEOUT))
+                        continue;
+
+                batadv_dbg(BATADV_DBG_TT, bat_priv,
+                           "Deleting global tt entry (%pM): Roaming timeout\n",
+                           tt_global_entry->common.addr);
+
+                hlist_del_rcu(node);
+                batadv_tt_global_entry_free_ref(tt_global_entry);
+        }
+}
+
+static void batadv_tt_global_roam_purge(struct batadv_priv *bat_priv)
+{
+        struct batadv_hashtable *hash = bat_priv->tt_global_hash;
         struct hlist_head *head;
         spinlock_t *list_lock; /* protects write access to the hash lists */
         uint32_t i;
@@ -929,35 +1068,18 @@ static void tt_global_roam_purge(struct bat_priv *bat_priv)
                 list_lock = &hash->list_locks[i];
 
                 spin_lock_bh(list_lock);
-                hlist_for_each_entry_safe(tt_common_entry, node, node_tmp,
-                                          head, hash_entry) {
-                        tt_global_entry = container_of(tt_common_entry,
-                                                       struct tt_global_entry,
-                                                       common);
-                        if (!(tt_global_entry->common.flags & TT_CLIENT_ROAM))
-                                continue;
-                        if (!has_timed_out(tt_global_entry->roam_at,
-                                           TT_CLIENT_ROAM_TIMEOUT))
-                                continue;
-
-                        bat_dbg(DBG_TT, bat_priv,
-                                "Deleting global tt entry (%pM): Roaming timeout\n",
-                                tt_global_entry->common.addr);
-
-                        hlist_del_rcu(node);
-                        tt_global_entry_free_ref(tt_global_entry);
-                }
+                batadv_tt_global_roam_purge_list(bat_priv, head);
                 spin_unlock_bh(list_lock);
         }
 
 }
 
-static void tt_global_table_free(struct bat_priv *bat_priv)
+static void batadv_tt_global_table_free(struct batadv_priv *bat_priv)
 {
-        struct hashtable_t *hash;
+        struct batadv_hashtable *hash;
         spinlock_t *list_lock; /* protects write access to the hash lists */
-        struct tt_common_entry *tt_common_entry;
-        struct tt_global_entry *tt_global_entry;
+        struct batadv_tt_common_entry *tt_common_entry;
+        struct batadv_tt_global_entry *tt_global;
         struct hlist_node *node, *node_tmp;
         struct hlist_head *head;
         uint32_t i;
@@ -975,56 +1097,60 @@ static void tt_global_table_free(struct bat_priv *bat_priv)
                 hlist_for_each_entry_safe(tt_common_entry, node, node_tmp,
                                           head, hash_entry) {
                         hlist_del_rcu(node);
-                        tt_global_entry = container_of(tt_common_entry,
-                                                       struct tt_global_entry,
-                                                       common);
-                        tt_global_entry_free_ref(tt_global_entry);
+                        tt_global = container_of(tt_common_entry,
+                                                 struct batadv_tt_global_entry,
+                                                 common);
+                        batadv_tt_global_entry_free_ref(tt_global);
                 }
                 spin_unlock_bh(list_lock);
         }
 
-        hash_destroy(hash);
+        batadv_hash_destroy(hash);
 
         bat_priv->tt_global_hash = NULL;
 }
 
-static bool _is_ap_isolated(struct tt_local_entry *tt_local_entry,
-                            struct tt_global_entry *tt_global_entry)
+static bool
+_batadv_is_ap_isolated(struct batadv_tt_local_entry *tt_local_entry,
+                       struct batadv_tt_global_entry *tt_global_entry)
 {
         bool ret = false;
 
-        if (tt_local_entry->common.flags & TT_CLIENT_WIFI &&
-            tt_global_entry->common.flags & TT_CLIENT_WIFI)
+        if (tt_local_entry->common.flags & BATADV_TT_CLIENT_WIFI &&
+            tt_global_entry->common.flags & BATADV_TT_CLIENT_WIFI)
                 ret = true;
 
         return ret;
 }
 
-struct orig_node *transtable_search(struct bat_priv *bat_priv,
-                                    const uint8_t *src, const uint8_t *addr)
+struct batadv_orig_node *batadv_transtable_search(struct batadv_priv *bat_priv,
+                                                  const uint8_t *src,
+                                                  const uint8_t *addr)
 {
-        struct tt_local_entry *tt_local_entry = NULL;
-        struct tt_global_entry *tt_global_entry = NULL;
-        struct orig_node *orig_node = NULL;
-        struct neigh_node *router = NULL;
+        struct batadv_tt_local_entry *tt_local_entry = NULL;
+        struct batadv_tt_global_entry *tt_global_entry = NULL;
+        struct batadv_orig_node *orig_node = NULL;
+        struct batadv_neigh_node *router = NULL;
         struct hlist_head *head;
         struct hlist_node *node;
-        struct tt_orig_list_entry *orig_entry;
+        struct batadv_tt_orig_list_entry *orig_entry;
         int best_tq;
 
         if (src && atomic_read(&bat_priv->ap_isolation)) {
-                tt_local_entry = tt_local_hash_find(bat_priv, src);
+                tt_local_entry = batadv_tt_local_hash_find(bat_priv, src);
                 if (!tt_local_entry)
                         goto out;
         }
 
-        tt_global_entry = tt_global_hash_find(bat_priv, addr);
+        tt_global_entry = batadv_tt_global_hash_find(bat_priv, addr);
         if (!tt_global_entry)
                 goto out;
 
         /* check whether the clients should not communicate due to AP
-         * isolation */
-        if (tt_local_entry && _is_ap_isolated(tt_local_entry, tt_global_entry))
+         * isolation
+         */
+        if (tt_local_entry &&
+            _batadv_is_ap_isolated(tt_local_entry, tt_global_entry))
                 goto out;
 
         best_tq = 0;
@@ -1032,7 +1158,7 @@ struct orig_node *transtable_search(struct bat_priv *bat_priv,
         rcu_read_lock();
         head = &tt_global_entry->orig_list;
         hlist_for_each_entry_rcu(orig_entry, node, head, list) {
-                router = orig_node_get_router(orig_entry->orig_node);
+                router = batadv_orig_node_get_router(orig_entry->orig_node);
                 if (!router)
                         continue;
 
@@ -1040,7 +1166,7 @@ struct orig_node *transtable_search(struct bat_priv *bat_priv,
                         orig_node = orig_entry->orig_node;
                         best_tq = router->tq_avg;
                 }
-                neigh_node_free_ref(router);
+                batadv_neigh_node_free_ref(router);
         }
         /* found anything? */
         if (orig_node && !atomic_inc_not_zero(&orig_node->refcount))
@@ -1048,21 +1174,21 @@ struct orig_node *transtable_search(struct bat_priv *bat_priv,
         rcu_read_unlock();
 out:
         if (tt_global_entry)
-                tt_global_entry_free_ref(tt_global_entry);
+                batadv_tt_global_entry_free_ref(tt_global_entry);
         if (tt_local_entry)
-                tt_local_entry_free_ref(tt_local_entry);
+                batadv_tt_local_entry_free_ref(tt_local_entry);
 
         return orig_node;
 }
 
 /* Calculates the checksum of the local table of a given orig_node */
-static uint16_t tt_global_crc(struct bat_priv *bat_priv,
-                              struct orig_node *orig_node)
+static uint16_t batadv_tt_global_crc(struct batadv_priv *bat_priv,
+                                     struct batadv_orig_node *orig_node)
 {
         uint16_t total = 0, total_one;
-        struct hashtable_t *hash = bat_priv->tt_global_hash;
-        struct tt_common_entry *tt_common_entry;
-        struct tt_global_entry *tt_global_entry;
+        struct batadv_hashtable *hash = bat_priv->tt_global_hash;
+        struct batadv_tt_common_entry *tt_common;
+        struct batadv_tt_global_entry *tt_global;
         struct hlist_node *node;
         struct hlist_head *head;
         uint32_t i;
@@ -1072,30 +1198,29 @@ static uint16_t tt_global_crc(struct bat_priv *bat_priv,
                 head = &hash->table[i];
 
                 rcu_read_lock();
-                hlist_for_each_entry_rcu(tt_common_entry, node,
-                                         head, hash_entry) {
-                        tt_global_entry = container_of(tt_common_entry,
-                                                       struct tt_global_entry,
-                                                       common);
+                hlist_for_each_entry_rcu(tt_common, node, head, hash_entry) {
+                        tt_global = container_of(tt_common,
+                                                 struct batadv_tt_global_entry,
+                                                 common);
                         /* Roaming clients are in the global table for
                          * consistency only. They don't have to be
                          * taken into account while computing the
                          * global crc
                          */
-                        if (tt_global_entry->common.flags & TT_CLIENT_ROAM)
+                        if (tt_common->flags & BATADV_TT_CLIENT_ROAM)
                                 continue;
 
                         /* find out if this global entry is announced by this
                          * originator
                          */
-                        if (!tt_global_entry_has_orig(tt_global_entry,
-                                                      orig_node))
+                        if (!batadv_tt_global_entry_has_orig(tt_global,
+                                                             orig_node))
                                 continue;
 
                         total_one = 0;
                         for (j = 0; j < ETH_ALEN; j++)
                                 total_one = crc16_byte(total_one,
-                                        tt_global_entry->common.addr[j]);
+                                                       tt_common->addr[j]);
                         total ^= total_one;
                 }
                 rcu_read_unlock();
@@ -1105,11 +1230,11 @@ static uint16_t tt_global_crc(struct bat_priv *bat_priv,
 }
 
 /* Calculates the checksum of the local table */
-uint16_t tt_local_crc(struct bat_priv *bat_priv)
+static uint16_t batadv_tt_local_crc(struct batadv_priv *bat_priv)
 {
         uint16_t total = 0, total_one;
-        struct hashtable_t *hash = bat_priv->tt_local_hash;
-        struct tt_common_entry *tt_common_entry;
+        struct batadv_hashtable *hash = bat_priv->tt_local_hash;
+        struct batadv_tt_common_entry *tt_common;
         struct hlist_node *node;
         struct hlist_head *head;
         uint32_t i;
@@ -1119,16 +1244,16 @@ uint16_t tt_local_crc(struct bat_priv *bat_priv)
                 head = &hash->table[i];
 
                 rcu_read_lock();
-                hlist_for_each_entry_rcu(tt_common_entry, node,
-                                         head, hash_entry) {
+                hlist_for_each_entry_rcu(tt_common, node, head, hash_entry) {
                         /* not yet committed clients have not to be taken into
-                         * account while computing the CRC */
-                        if (tt_common_entry->flags & TT_CLIENT_NEW)
+                         * account while computing the CRC
+                         */
+                        if (tt_common->flags & BATADV_TT_CLIENT_NEW)
                                 continue;
                         total_one = 0;
                         for (j = 0; j < ETH_ALEN; j++)
                                 total_one = crc16_byte(total_one,
-                                                   tt_common_entry->addr[j]);
+                                                       tt_common->addr[j]);
                         total ^= total_one;
                 }
                 rcu_read_unlock();
@@ -1137,9 +1262,9 @@ uint16_t tt_local_crc(struct bat_priv *bat_priv)
         return total;
 }
 
-static void tt_req_list_free(struct bat_priv *bat_priv)
+static void batadv_tt_req_list_free(struct batadv_priv *bat_priv)
 {
-        struct tt_req_node *node, *safe;
+        struct batadv_tt_req_node *node, *safe;
 
         spin_lock_bh(&bat_priv->tt_req_list_lock);
 
@@ -1151,15 +1276,16 @@ static void tt_req_list_free(struct bat_priv *bat_priv)
         spin_unlock_bh(&bat_priv->tt_req_list_lock);
 }
 
-static void tt_save_orig_buffer(struct bat_priv *bat_priv,
-                                struct orig_node *orig_node,
-                                const unsigned char *tt_buff,
-                                uint8_t tt_num_changes)
+static void batadv_tt_save_orig_buffer(struct batadv_priv *bat_priv,
+                                       struct batadv_orig_node *orig_node,
+                                       const unsigned char *tt_buff,
+                                       uint8_t tt_num_changes)
 {
-        uint16_t tt_buff_len = tt_len(tt_num_changes);
+        uint16_t tt_buff_len = batadv_tt_len(tt_num_changes);
 
         /* Replace the old buffer only if I received something in the
-         * last OGM (the OGM could carry no changes) */
+         * last OGM (the OGM could carry no changes)
+         */
         spin_lock_bh(&orig_node->tt_buff_lock);
         if (tt_buff_len > 0) {
                 kfree(orig_node->tt_buff);
@@ -1173,13 +1299,14 @@ static void tt_save_orig_buffer(struct bat_priv *bat_priv,
         spin_unlock_bh(&orig_node->tt_buff_lock);
 }
 
-static void tt_req_purge(struct bat_priv *bat_priv)
+static void batadv_tt_req_purge(struct batadv_priv *bat_priv)
 {
-        struct tt_req_node *node, *safe;
+        struct batadv_tt_req_node *node, *safe;
 
         spin_lock_bh(&bat_priv->tt_req_list_lock);
         list_for_each_entry_safe(node, safe, &bat_priv->tt_req_list, list) {
-                if (has_timed_out(node->issued_at, TT_REQUEST_TIMEOUT)) {
+                if (batadv_has_timed_out(node->issued_at,
+                                         BATADV_TT_REQUEST_TIMEOUT)) {
                         list_del(&node->list);
                         kfree(node);
                 }
@@ -1188,17 +1315,19 @@ static void tt_req_purge(struct bat_priv *bat_priv)
 }
 
 /* returns the pointer to the new tt_req_node struct if no request
- * has already been issued for this orig_node, NULL otherwise */
-static struct tt_req_node *new_tt_req_node(struct bat_priv *bat_priv,
-                                          struct orig_node *orig_node)
+ * has already been issued for this orig_node, NULL otherwise
+ */
+static struct batadv_tt_req_node *
+batadv_new_tt_req_node(struct batadv_priv *bat_priv,
+                       struct batadv_orig_node *orig_node)
 {
-        struct tt_req_node *tt_req_node_tmp, *tt_req_node = NULL;
+        struct batadv_tt_req_node *tt_req_node_tmp, *tt_req_node = NULL;
 
         spin_lock_bh(&bat_priv->tt_req_list_lock);
         list_for_each_entry(tt_req_node_tmp, &bat_priv->tt_req_list, list) {
-                if (compare_eth(tt_req_node_tmp, orig_node) &&
-                    !has_timed_out(tt_req_node_tmp->issued_at,
-                                   TT_REQUEST_TIMEOUT))
+                if (batadv_compare_eth(tt_req_node_tmp, orig_node) &&
+                    !batadv_has_timed_out(tt_req_node_tmp->issued_at,
+                                          BATADV_TT_REQUEST_TIMEOUT))
                         goto unlock;
         }
 
@@ -1216,63 +1345,67 @@ unlock:
 }
 
 /* data_ptr is useless here, but has to be kept to respect the prototype */
-static int tt_local_valid_entry(const void *entry_ptr, const void *data_ptr)
+static int batadv_tt_local_valid_entry(const void *entry_ptr,
+                                       const void *data_ptr)
 {
-        const struct tt_common_entry *tt_common_entry = entry_ptr;
+        const struct batadv_tt_common_entry *tt_common_entry = entry_ptr;
 
-        if (tt_common_entry->flags & TT_CLIENT_NEW)
+        if (tt_common_entry->flags & BATADV_TT_CLIENT_NEW)
                 return 0;
         return 1;
 }
 
-static int tt_global_valid_entry(const void *entry_ptr, const void *data_ptr)
+static int batadv_tt_global_valid(const void *entry_ptr,
+                                  const void *data_ptr)
 {
-        const struct tt_common_entry *tt_common_entry = entry_ptr;
-        const struct tt_global_entry *tt_global_entry;
-        const struct orig_node *orig_node = data_ptr;
+        const struct batadv_tt_common_entry *tt_common_entry = entry_ptr;
+        const struct batadv_tt_global_entry *tt_global_entry;
+        const struct batadv_orig_node *orig_node = data_ptr;
 
-        if (tt_common_entry->flags & TT_CLIENT_ROAM)
+        if (tt_common_entry->flags & BATADV_TT_CLIENT_ROAM)
                 return 0;
 
-        tt_global_entry = container_of(tt_common_entry, struct tt_global_entry,
+        tt_global_entry = container_of(tt_common_entry,
+                                       struct batadv_tt_global_entry,
                                        common);
 
-        return tt_global_entry_has_orig(tt_global_entry, orig_node);
+        return batadv_tt_global_entry_has_orig(tt_global_entry, orig_node);
 }
 
-static struct sk_buff *tt_response_fill_table(uint16_t tt_len, uint8_t ttvn,
-                                              struct hashtable_t *hash,
-                                              struct hard_iface *primary_if,
-                                              int (*valid_cb)(const void *,
-                                                              const void *),
-                                              void *cb_data)
+static struct sk_buff *
+batadv_tt_response_fill_table(uint16_t tt_len, uint8_t ttvn,
+                              struct batadv_hashtable *hash,
+                              struct batadv_hard_iface *primary_if,
+                              int (*valid_cb)(const void *, const void *),
+                              void *cb_data)
 {
-        struct tt_common_entry *tt_common_entry;
-        struct tt_query_packet *tt_response;
-        struct tt_change *tt_change;
+        struct batadv_tt_common_entry *tt_common_entry;
+        struct batadv_tt_query_packet *tt_response;
+        struct batadv_tt_change *tt_change;
         struct hlist_node *node;
         struct hlist_head *head;
         struct sk_buff *skb = NULL;
         uint16_t tt_tot, tt_count;
-        ssize_t tt_query_size = sizeof(struct tt_query_packet);
+        ssize_t tt_query_size = sizeof(struct batadv_tt_query_packet);
         uint32_t i;
+        size_t len;
 
         if (tt_query_size + tt_len > primary_if->soft_iface->mtu) {
                 tt_len = primary_if->soft_iface->mtu - tt_query_size;
-                tt_len -= tt_len % sizeof(struct tt_change);
+                tt_len -= tt_len % sizeof(struct batadv_tt_change);
         }
-        tt_tot = tt_len / sizeof(struct tt_change);
+        tt_tot = tt_len / sizeof(struct batadv_tt_change);
 
-        skb = dev_alloc_skb(tt_query_size + tt_len + ETH_HLEN);
+        len = tt_query_size + tt_len;
+        skb = dev_alloc_skb(len + ETH_HLEN);
         if (!skb)
                 goto out;
 
         skb_reserve(skb, ETH_HLEN);
-        tt_response = (struct tt_query_packet *)skb_put(skb,
-                                                     tt_query_size + tt_len);
+        tt_response = (struct batadv_tt_query_packet *)skb_put(skb, len);
         tt_response->ttvn = ttvn;
 
-        tt_change = (struct tt_change *)(skb->data + tt_query_size);
+        tt_change = (struct batadv_tt_change *)(skb->data + tt_query_size);
         tt_count = 0;
 
         rcu_read_lock();
@@ -1289,7 +1422,7 @@ static struct sk_buff *tt_response_fill_table(uint16_t tt_len, uint8_t ttvn,
 
                         memcpy(tt_change->addr, tt_common_entry->addr,
                                ETH_ALEN);
-                        tt_change->flags = NO_FLAGS;
+                        tt_change->flags = BATADV_NO_FLAGS;
 
                         tt_count++;
                         tt_change++;
@@ -1298,72 +1431,78 @@ static struct sk_buff *tt_response_fill_table(uint16_t tt_len, uint8_t ttvn,
         rcu_read_unlock();
 
         /* store in the message the number of entries we have successfully
-         * copied */
+         * copied
+         */
         tt_response->tt_data = htons(tt_count);
 
 out:
         return skb;
 }
 
-static int send_tt_request(struct bat_priv *bat_priv,
-                           struct orig_node *dst_orig_node,
-                           uint8_t ttvn, uint16_t tt_crc, bool full_table)
+static int batadv_send_tt_request(struct batadv_priv *bat_priv,
+                                  struct batadv_orig_node *dst_orig_node,
+                                  uint8_t ttvn, uint16_t tt_crc,
+                                  bool full_table)
 {
         struct sk_buff *skb = NULL;
-        struct tt_query_packet *tt_request;
-        struct neigh_node *neigh_node = NULL;
-        struct hard_iface *primary_if;
-        struct tt_req_node *tt_req_node = NULL;
+        struct batadv_tt_query_packet *tt_request;
+        struct batadv_neigh_node *neigh_node = NULL;
+        struct batadv_hard_iface *primary_if;
+        struct batadv_tt_req_node *tt_req_node = NULL;
         int ret = 1;
+        size_t tt_req_len;
 
-        primary_if = primary_if_get_selected(bat_priv);
+        primary_if = batadv_primary_if_get_selected(bat_priv);
         if (!primary_if)
                 goto out;
 
         /* The new tt_req will be issued only if I'm not waiting for a
-         * reply from the same orig_node yet */
-        tt_req_node = new_tt_req_node(bat_priv, dst_orig_node);
+         * reply from the same orig_node yet
+         */
+        tt_req_node = batadv_new_tt_req_node(bat_priv, dst_orig_node);
         if (!tt_req_node)
                 goto out;
 
-        skb = dev_alloc_skb(sizeof(struct tt_query_packet) + ETH_HLEN);
+        skb = dev_alloc_skb(sizeof(*tt_request) + ETH_HLEN);
         if (!skb)
                 goto out;
 
         skb_reserve(skb, ETH_HLEN);
 
-        tt_request = (struct tt_query_packet *)skb_put(skb,
-                                sizeof(struct tt_query_packet));
+        tt_req_len = sizeof(*tt_request);
+        tt_request = (struct batadv_tt_query_packet *)skb_put(skb, tt_req_len);
 
-        tt_request->header.packet_type = BAT_TT_QUERY;
-        tt_request->header.version = COMPAT_VERSION;
+        tt_request->header.packet_type = BATADV_TT_QUERY;
+        tt_request->header.version = BATADV_COMPAT_VERSION;
         memcpy(tt_request->src, primary_if->net_dev->dev_addr, ETH_ALEN);
         memcpy(tt_request->dst, dst_orig_node->orig, ETH_ALEN);
-        tt_request->header.ttl = TTL;
+        tt_request->header.ttl = BATADV_TTL;
         tt_request->ttvn = ttvn;
         tt_request->tt_data = htons(tt_crc);
-        tt_request->flags = TT_REQUEST;
+        tt_request->flags = BATADV_TT_REQUEST;
 
         if (full_table)
-                tt_request->flags |= TT_FULL_TABLE;
+                tt_request->flags |= BATADV_TT_FULL_TABLE;
 
-        neigh_node = orig_node_get_router(dst_orig_node);
+        neigh_node = batadv_orig_node_get_router(dst_orig_node);
         if (!neigh_node)
                 goto out;
 
-        bat_dbg(DBG_TT, bat_priv,
-                "Sending TT_REQUEST to %pM via %pM [%c]\n",
-                dst_orig_node->orig, neigh_node->addr,
-                (full_table ? 'F' : '.'));
+        batadv_dbg(BATADV_DBG_TT, bat_priv,
+                   "Sending TT_REQUEST to %pM via %pM [%c]\n",
+                   dst_orig_node->orig, neigh_node->addr,
+                   (full_table ? 'F' : '.'));
+
+        batadv_inc_counter(bat_priv, BATADV_CNT_TT_REQUEST_TX);
 
-        send_skb_packet(skb, neigh_node->if_incoming, neigh_node->addr);
+        batadv_send_skb_packet(skb, neigh_node->if_incoming, neigh_node->addr);
         ret = 0;
 
 out:
         if (neigh_node)
-                neigh_node_free_ref(neigh_node);
+                batadv_neigh_node_free_ref(neigh_node);
         if (primary_if)
-                hardif_free_ref(primary_if);
+                batadv_hardif_free_ref(primary_if);
         if (ret)
                 kfree_skb(skb);
         if (ret && tt_req_node) {
@@ -1375,39 +1514,42 @@ out:
         return ret;
 }
 
-static bool send_other_tt_response(struct bat_priv *bat_priv,
-                                   struct tt_query_packet *tt_request)
+static bool
+batadv_send_other_tt_response(struct batadv_priv *bat_priv,
+                              struct batadv_tt_query_packet *tt_request)
 {
-        struct orig_node *req_dst_orig_node = NULL, *res_dst_orig_node = NULL;
-        struct neigh_node *neigh_node = NULL;
-        struct hard_iface *primary_if = NULL;
+        struct batadv_orig_node *req_dst_orig_node = NULL;
+        struct batadv_orig_node *res_dst_orig_node = NULL;
+        struct batadv_neigh_node *neigh_node = NULL;
+        struct batadv_hard_iface *primary_if = NULL;
         uint8_t orig_ttvn, req_ttvn, ttvn;
         int ret = false;
         unsigned char *tt_buff;
         bool full_table;
         uint16_t tt_len, tt_tot;
         struct sk_buff *skb = NULL;
-        struct tt_query_packet *tt_response;
+        struct batadv_tt_query_packet *tt_response;
+        size_t len;
 
-        bat_dbg(DBG_TT, bat_priv,
-                "Received TT_REQUEST from %pM for ttvn: %u (%pM) [%c]\n",
-                tt_request->src, tt_request->ttvn, tt_request->dst,
-                (tt_request->flags & TT_FULL_TABLE ? 'F' : '.'));
+        batadv_dbg(BATADV_DBG_TT, bat_priv,
+                   "Received TT_REQUEST from %pM for ttvn: %u (%pM) [%c]\n",
+                   tt_request->src, tt_request->ttvn, tt_request->dst,
+                   (tt_request->flags & BATADV_TT_FULL_TABLE ? 'F' : '.'));
 
         /* Let's get the orig node of the REAL destination */
-        req_dst_orig_node = orig_hash_find(bat_priv, tt_request->dst);
+        req_dst_orig_node = batadv_orig_hash_find(bat_priv, tt_request->dst);
         if (!req_dst_orig_node)
                 goto out;
 
-        res_dst_orig_node = orig_hash_find(bat_priv, tt_request->src);
+        res_dst_orig_node = batadv_orig_hash_find(bat_priv, tt_request->src);
         if (!res_dst_orig_node)
                 goto out;
 
-        neigh_node = orig_node_get_router(res_dst_orig_node);
+        neigh_node = batadv_orig_node_get_router(res_dst_orig_node);
         if (!neigh_node)
                 goto out;
 
-        primary_if = primary_if_get_selected(bat_priv);
+        primary_if = batadv_primary_if_get_selected(bat_priv);
         if (!primary_if)
                 goto out;
 
@@ -1416,71 +1558,75 @@ static bool send_other_tt_response(struct bat_priv *bat_priv,
 
         /* I don't have the requested data */
         if (orig_ttvn != req_ttvn ||
-            tt_request->tt_data != req_dst_orig_node->tt_crc)
+            tt_request->tt_data != htons(req_dst_orig_node->tt_crc))
                 goto out;
 
         /* If the full table has been explicitly requested */
-        if (tt_request->flags & TT_FULL_TABLE ||
+        if (tt_request->flags & BATADV_TT_FULL_TABLE ||
             !req_dst_orig_node->tt_buff)
                 full_table = true;
         else
                 full_table = false;
 
         /* In this version, fragmentation is not implemented, then
-         * I'll send only one packet with as much TT entries as I can */
+         * I'll send only one packet with as much TT entries as I can
+         */
         if (!full_table) {
                 spin_lock_bh(&req_dst_orig_node->tt_buff_lock);
                 tt_len = req_dst_orig_node->tt_buff_len;
-                tt_tot = tt_len / sizeof(struct tt_change);
+                tt_tot = tt_len / sizeof(struct batadv_tt_change);
 
-                skb = dev_alloc_skb(sizeof(struct tt_query_packet) +
-                                    tt_len + ETH_HLEN);
+                len = sizeof(*tt_response) + tt_len;
+                skb = dev_alloc_skb(len + ETH_HLEN);
                 if (!skb)
                         goto unlock;
 
                 skb_reserve(skb, ETH_HLEN);
-                tt_response = (struct tt_query_packet *)skb_put(skb,
-                                sizeof(struct tt_query_packet) + tt_len);
+                tt_response = (struct batadv_tt_query_packet *)skb_put(skb,
+                                                                       len);
                 tt_response->ttvn = req_ttvn;
                 tt_response->tt_data = htons(tt_tot);
 
-                tt_buff = skb->data + sizeof(struct tt_query_packet);
+                tt_buff = skb->data + sizeof(*tt_response);
                 /* Copy the last orig_node's OGM buffer */
                 memcpy(tt_buff, req_dst_orig_node->tt_buff,
                        req_dst_orig_node->tt_buff_len);
 
                 spin_unlock_bh(&req_dst_orig_node->tt_buff_lock);
         } else {
-                tt_len = (uint16_t)atomic_read(&req_dst_orig_node->tt_size) *
-                                                sizeof(struct tt_change);
+                tt_len = (uint16_t)atomic_read(&req_dst_orig_node->tt_size);
+                tt_len *= sizeof(struct batadv_tt_change);
                 ttvn = (uint8_t)atomic_read(&req_dst_orig_node->last_ttvn);
 
-                skb = tt_response_fill_table(tt_len, ttvn,
-                                             bat_priv->tt_global_hash,
-                                             primary_if, tt_global_valid_entry,
-                                             req_dst_orig_node);
+                skb = batadv_tt_response_fill_table(tt_len, ttvn,
+                                                    bat_priv->tt_global_hash,
+                                                    primary_if,
+                                                    batadv_tt_global_valid,
+                                                    req_dst_orig_node);
                 if (!skb)
                         goto out;
 
-                tt_response = (struct tt_query_packet *)skb->data;
+                tt_response = (struct batadv_tt_query_packet *)skb->data;
         }
 
-        tt_response->header.packet_type = BAT_TT_QUERY;
-        tt_response->header.version = COMPAT_VERSION;
-        tt_response->header.ttl = TTL;
+        tt_response->header.packet_type = BATADV_TT_QUERY;
+        tt_response->header.version = BATADV_COMPAT_VERSION;
+        tt_response->header.ttl = BATADV_TTL;
         memcpy(tt_response->src, req_dst_orig_node->orig, ETH_ALEN);
         memcpy(tt_response->dst, tt_request->src, ETH_ALEN);
-        tt_response->flags = TT_RESPONSE;
+        tt_response->flags = BATADV_TT_RESPONSE;
 
         if (full_table)
-                tt_response->flags |= TT_FULL_TABLE;
+                tt_response->flags |= BATADV_TT_FULL_TABLE;
 
-        bat_dbg(DBG_TT, bat_priv,
-                "Sending TT_RESPONSE %pM via %pM for %pM (ttvn: %u)\n",
-                res_dst_orig_node->orig, neigh_node->addr,
-                req_dst_orig_node->orig, req_ttvn);
+        batadv_dbg(BATADV_DBG_TT, bat_priv,
+                   "Sending TT_RESPONSE %pM via %pM for %pM (ttvn: %u)\n",
+                   res_dst_orig_node->orig, neigh_node->addr,
+                   req_dst_orig_node->orig, req_ttvn);
 
-        send_skb_packet(skb, neigh_node->if_incoming, neigh_node->addr);
+        batadv_inc_counter(bat_priv, BATADV_CNT_TT_RESPONSE_TX);
+
+        batadv_send_skb_packet(skb, neigh_node->if_incoming, neigh_node->addr);
         ret = true;
         goto out;
 
@@ -1489,114 +1635,122 @@ unlock:
 
 out:
         if (res_dst_orig_node)
-                orig_node_free_ref(res_dst_orig_node);
+                batadv_orig_node_free_ref(res_dst_orig_node);
         if (req_dst_orig_node)
-                orig_node_free_ref(req_dst_orig_node);
+                batadv_orig_node_free_ref(req_dst_orig_node);
         if (neigh_node)
-                neigh_node_free_ref(neigh_node);
+                batadv_neigh_node_free_ref(neigh_node);
         if (primary_if)
-                hardif_free_ref(primary_if);
+                batadv_hardif_free_ref(primary_if);
         if (!ret)
                 kfree_skb(skb);
         return ret;
 
 }
-static bool send_my_tt_response(struct bat_priv *bat_priv,
-                                struct tt_query_packet *tt_request)
+
+static bool
+batadv_send_my_tt_response(struct batadv_priv *bat_priv,
+                           struct batadv_tt_query_packet *tt_request)
 {
-        struct orig_node *orig_node = NULL;
-        struct neigh_node *neigh_node = NULL;
-        struct hard_iface *primary_if = NULL;
+        struct batadv_orig_node *orig_node = NULL;
+        struct batadv_neigh_node *neigh_node = NULL;
+        struct batadv_hard_iface *primary_if = NULL;
         uint8_t my_ttvn, req_ttvn, ttvn;
         int ret = false;
         unsigned char *tt_buff;
         bool full_table;
         uint16_t tt_len, tt_tot;
         struct sk_buff *skb = NULL;
-        struct tt_query_packet *tt_response;
+        struct batadv_tt_query_packet *tt_response;
+        size_t len;
 
-        bat_dbg(DBG_TT, bat_priv,
-                "Received TT_REQUEST from %pM for ttvn: %u (me) [%c]\n",
-                tt_request->src, tt_request->ttvn,
-                (tt_request->flags & TT_FULL_TABLE ? 'F' : '.'));
+        batadv_dbg(BATADV_DBG_TT, bat_priv,
+                   "Received TT_REQUEST from %pM for ttvn: %u (me) [%c]\n",
+                   tt_request->src, tt_request->ttvn,
+                   (tt_request->flags & BATADV_TT_FULL_TABLE ? 'F' : '.'));
 
 
         my_ttvn = (uint8_t)atomic_read(&bat_priv->ttvn);
         req_ttvn = tt_request->ttvn;
 
-        orig_node = orig_hash_find(bat_priv, tt_request->src);
+        orig_node = batadv_orig_hash_find(bat_priv, tt_request->src);
         if (!orig_node)
                 goto out;
 
-        neigh_node = orig_node_get_router(orig_node);
+        neigh_node = batadv_orig_node_get_router(orig_node);
         if (!neigh_node)
                 goto out;
 
-        primary_if = primary_if_get_selected(bat_priv);
+        primary_if = batadv_primary_if_get_selected(bat_priv);
         if (!primary_if)
                 goto out;
 
         /* If the full table has been explicitly requested or the gap
-         * is too big send the whole local translation table */
-        if (tt_request->flags & TT_FULL_TABLE || my_ttvn != req_ttvn ||
+         * is too big send the whole local translation table
+         */
+        if (tt_request->flags & BATADV_TT_FULL_TABLE || my_ttvn != req_ttvn ||
             !bat_priv->tt_buff)
                 full_table = true;
         else
                 full_table = false;
 
         /* In this version, fragmentation is not implemented, then
-         * I'll send only one packet with as much TT entries as I can */
+         * I'll send only one packet with as much TT entries as I can
+         */
         if (!full_table) {
                 spin_lock_bh(&bat_priv->tt_buff_lock);
                 tt_len = bat_priv->tt_buff_len;
-                tt_tot = tt_len / sizeof(struct tt_change);
+                tt_tot = tt_len / sizeof(struct batadv_tt_change);
 
-                skb = dev_alloc_skb(sizeof(struct tt_query_packet) +
-                                    tt_len + ETH_HLEN);
+                len = sizeof(*tt_response) + tt_len;
+                skb = dev_alloc_skb(len + ETH_HLEN);
                 if (!skb)
                         goto unlock;
 
                 skb_reserve(skb, ETH_HLEN);
-                tt_response = (struct tt_query_packet *)skb_put(skb,
-                                sizeof(struct tt_query_packet) + tt_len);
+                tt_response = (struct batadv_tt_query_packet *)skb_put(skb,
+                                                                       len);
                 tt_response->ttvn = req_ttvn;
                 tt_response->tt_data = htons(tt_tot);
 
-                tt_buff = skb->data + sizeof(struct tt_query_packet);
+                tt_buff = skb->data + sizeof(*tt_response);
                 memcpy(tt_buff, bat_priv->tt_buff,
                        bat_priv->tt_buff_len);
                 spin_unlock_bh(&bat_priv->tt_buff_lock);
         } else {
-                tt_len = (uint16_t)atomic_read(&bat_priv->num_local_tt) *
-                                                sizeof(struct tt_change);
+                tt_len = (uint16_t)atomic_read(&bat_priv->num_local_tt);
+                tt_len *= sizeof(struct batadv_tt_change);
                 ttvn = (uint8_t)atomic_read(&bat_priv->ttvn);
 
-                skb = tt_response_fill_table(tt_len, ttvn,
-                                             bat_priv->tt_local_hash,
-                                             primary_if, tt_local_valid_entry,
-                                             NULL);
+                skb = batadv_tt_response_fill_table(tt_len, ttvn,
+                                                    bat_priv->tt_local_hash,
+                                                    primary_if,
+                                                    batadv_tt_local_valid_entry,
+                                                    NULL);
                 if (!skb)
                         goto out;
 
-                tt_response = (struct tt_query_packet *)skb->data;
+                tt_response = (struct batadv_tt_query_packet *)skb->data;
         }
 
-        tt_response->header.packet_type = BAT_TT_QUERY;
-        tt_response->header.version = COMPAT_VERSION;
-        tt_response->header.ttl = TTL;
+        tt_response->header.packet_type = BATADV_TT_QUERY;
+        tt_response->header.version = BATADV_COMPAT_VERSION;
+        tt_response->header.ttl = BATADV_TTL;
         memcpy(tt_response->src, primary_if->net_dev->dev_addr, ETH_ALEN);
         memcpy(tt_response->dst, tt_request->src, ETH_ALEN);
-        tt_response->flags = TT_RESPONSE;
+        tt_response->flags = BATADV_TT_RESPONSE;
 
         if (full_table)
-                tt_response->flags |= TT_FULL_TABLE;
+                tt_response->flags |= BATADV_TT_FULL_TABLE;
 
-        bat_dbg(DBG_TT, bat_priv,
-                "Sending TT_RESPONSE to %pM via %pM [%c]\n",
-                orig_node->orig, neigh_node->addr,
-                (tt_response->flags & TT_FULL_TABLE ? 'F' : '.'));
+        batadv_dbg(BATADV_DBG_TT, bat_priv,
+                   "Sending TT_RESPONSE to %pM via %pM [%c]\n",
+                   orig_node->orig, neigh_node->addr,
+                   (tt_response->flags & BATADV_TT_FULL_TABLE ? 'F' : '.'));
 
-        send_skb_packet(skb, neigh_node->if_incoming, neigh_node->addr);
+        batadv_inc_counter(bat_priv, BATADV_CNT_TT_RESPONSE_TX);
+
+        batadv_send_skb_packet(skb, neigh_node->if_incoming, neigh_node->addr);
         ret = true;
         goto out;
 
@@ -1604,49 +1758,50 @@ unlock:
         spin_unlock_bh(&bat_priv->tt_buff_lock);
 out:
         if (orig_node)
-                orig_node_free_ref(orig_node);
+                batadv_orig_node_free_ref(orig_node);
         if (neigh_node)
-                neigh_node_free_ref(neigh_node);
+                batadv_neigh_node_free_ref(neigh_node);
         if (primary_if)
-                hardif_free_ref(primary_if);
+                batadv_hardif_free_ref(primary_if);
         if (!ret)
                 kfree_skb(skb);
         /* This packet was for me, so it doesn't need to be re-routed */
         return true;
 }
 
-bool send_tt_response(struct bat_priv *bat_priv,
-                      struct tt_query_packet *tt_request)
+bool batadv_send_tt_response(struct batadv_priv *bat_priv,
+                             struct batadv_tt_query_packet *tt_request)
 {
-        if (is_my_mac(tt_request->dst)) {
+        if (batadv_is_my_mac(tt_request->dst)) {
                 /* don't answer backbone gws! */
-                if (bla_is_backbone_gw_orig(bat_priv, tt_request->src))
+                if (batadv_bla_is_backbone_gw_orig(bat_priv, tt_request->src))
                         return true;
 
-                return send_my_tt_response(bat_priv, tt_request);
+                return batadv_send_my_tt_response(bat_priv, tt_request);
         } else {
-                return send_other_tt_response(bat_priv, tt_request);
+                return batadv_send_other_tt_response(bat_priv, tt_request);
         }
 }
 
-static void _tt_update_changes(struct bat_priv *bat_priv,
-                               struct orig_node *orig_node,
-                               struct tt_change *tt_change,
-                               uint16_t tt_num_changes, uint8_t ttvn)
+static void _batadv_tt_update_changes(struct batadv_priv *bat_priv,
+                                      struct batadv_orig_node *orig_node,
+                                      struct batadv_tt_change *tt_change,
+                                      uint16_t tt_num_changes, uint8_t ttvn)
 {
         int i;
+        int roams;
 
         for (i = 0; i < tt_num_changes; i++) {
-                if ((tt_change + i)->flags & TT_CLIENT_DEL)
-                        tt_global_del(bat_priv, orig_node,
-                                      (tt_change + i)->addr,
-                                      "tt removed by changes",
-                                      (tt_change + i)->flags & TT_CLIENT_ROAM);
-                else
-                        if (!tt_global_add(bat_priv, orig_node,
-                                           (tt_change + i)->addr, ttvn, false,
-                                           (tt_change + i)->flags &
-                                                        TT_CLIENT_WIFI))
+                if ((tt_change + i)->flags & BATADV_TT_CLIENT_DEL) {
+                        roams = (tt_change + i)->flags & BATADV_TT_CLIENT_ROAM;
+                        batadv_tt_global_del(bat_priv, orig_node,
+                                             (tt_change + i)->addr,
+                                             "tt removed by changes",
+                                             roams);
+                } else {
+                        if (!batadv_tt_global_add(bat_priv, orig_node,
+                                                  (tt_change + i)->addr,
+                                                  (tt_change + i)->flags, ttvn))
                                 /* In case of problem while storing a
                                  * global_entry, we stop the updating
                                  * procedure without committing the
@@ -1654,25 +1809,27 @@ static void _tt_update_changes(struct bat_priv *bat_priv,
                                  * corrupted data on tt_request
                                  */
                                 return;
+                }
         }
         orig_node->tt_initialised = true;
 }
 
-static void tt_fill_gtable(struct bat_priv *bat_priv,
-                           struct tt_query_packet *tt_response)
+static void batadv_tt_fill_gtable(struct batadv_priv *bat_priv,
+                                  struct batadv_tt_query_packet *tt_response)
 {
-        struct orig_node *orig_node = NULL;
+        struct batadv_orig_node *orig_node = NULL;
 
-        orig_node = orig_hash_find(bat_priv, tt_response->src);
+        orig_node = batadv_orig_hash_find(bat_priv, tt_response->src);
         if (!orig_node)
                 goto out;
 
         /* Purge the old table first.. */
-        tt_global_del_orig(bat_priv, orig_node, "Received full table");
+        batadv_tt_global_del_orig(bat_priv, orig_node, "Received full table");
 
-        _tt_update_changes(bat_priv, orig_node,
-                           (struct tt_change *)(tt_response + 1),
-                           tt_response->tt_data, tt_response->ttvn);
+        _batadv_tt_update_changes(bat_priv, orig_node,
+                                  (struct batadv_tt_change *)(tt_response + 1),
+                                  ntohs(tt_response->tt_data),
+                                  tt_response->ttvn);
 
         spin_lock_bh(&orig_node->tt_buff_lock);
         kfree(orig_node->tt_buff);
@@ -1684,71 +1841,76 @@ static void tt_fill_gtable(struct bat_priv *bat_priv,
 
 out:
         if (orig_node)
-                orig_node_free_ref(orig_node);
+                batadv_orig_node_free_ref(orig_node);
 }
 
-static void tt_update_changes(struct bat_priv *bat_priv,
-                              struct orig_node *orig_node,
-                              uint16_t tt_num_changes, uint8_t ttvn,
-                              struct tt_change *tt_change)
+static void batadv_tt_update_changes(struct batadv_priv *bat_priv,
+                                     struct batadv_orig_node *orig_node,
+                                     uint16_t tt_num_changes, uint8_t ttvn,
+                                     struct batadv_tt_change *tt_change)
 {
-        _tt_update_changes(bat_priv, orig_node, tt_change, tt_num_changes,
-                           ttvn);
+        _batadv_tt_update_changes(bat_priv, orig_node, tt_change,
+                                  tt_num_changes, ttvn);
 
-        tt_save_orig_buffer(bat_priv, orig_node, (unsigned char *)tt_change,
-                            tt_num_changes);
+        batadv_tt_save_orig_buffer(bat_priv, orig_node,
+                                   (unsigned char *)tt_change, tt_num_changes);
         atomic_set(&orig_node->last_ttvn, ttvn);
 }
 
-bool is_my_client(struct bat_priv *bat_priv, const uint8_t *addr)
+bool batadv_is_my_client(struct batadv_priv *bat_priv, const uint8_t *addr)
 {
-        struct tt_local_entry *tt_local_entry = NULL;
+        struct batadv_tt_local_entry *tt_local_entry = NULL;
         bool ret = false;
 
-        tt_local_entry = tt_local_hash_find(bat_priv, addr);
+        tt_local_entry = batadv_tt_local_hash_find(bat_priv, addr);
         if (!tt_local_entry)
                 goto out;
         /* Check if the client has been logically deleted (but is kept for
-         * consistency purpose) */
-        if (tt_local_entry->common.flags & TT_CLIENT_PENDING)
+         * consistency purpose)
+         */
+        if (tt_local_entry->common.flags & BATADV_TT_CLIENT_PENDING)
                 goto out;
         ret = true;
 out:
         if (tt_local_entry)
-                tt_local_entry_free_ref(tt_local_entry);
+                batadv_tt_local_entry_free_ref(tt_local_entry);
         return ret;
 }
 
-void handle_tt_response(struct bat_priv *bat_priv,
-                        struct tt_query_packet *tt_response)
+void batadv_handle_tt_response(struct batadv_priv *bat_priv,
+                               struct batadv_tt_query_packet *tt_response)
 {
-        struct tt_req_node *node, *safe;
-        struct orig_node *orig_node = NULL;
+        struct batadv_tt_req_node *node, *safe;
+        struct batadv_orig_node *orig_node = NULL;
+        struct batadv_tt_change *tt_change;
 
-        bat_dbg(DBG_TT, bat_priv,
-                "Received TT_RESPONSE from %pM for ttvn %d t_size: %d [%c]\n",
-                tt_response->src, tt_response->ttvn, tt_response->tt_data,
-                (tt_response->flags & TT_FULL_TABLE ? 'F' : '.'));
+        batadv_dbg(BATADV_DBG_TT, bat_priv,
+                   "Received TT_RESPONSE from %pM for ttvn %d t_size: %d [%c]\n",
+                   tt_response->src, tt_response->ttvn,
+                   ntohs(tt_response->tt_data),
+                   (tt_response->flags & BATADV_TT_FULL_TABLE ? 'F' : '.'));
 
         /* we should have never asked a backbone gw */
-        if (bla_is_backbone_gw_orig(bat_priv, tt_response->src))
+        if (batadv_bla_is_backbone_gw_orig(bat_priv, tt_response->src))
                 goto out;
 
-        orig_node = orig_hash_find(bat_priv, tt_response->src);
+        orig_node = batadv_orig_hash_find(bat_priv, tt_response->src);
         if (!orig_node)
                 goto out;
 
-        if (tt_response->flags & TT_FULL_TABLE)
-                tt_fill_gtable(bat_priv, tt_response);
-        else
-                tt_update_changes(bat_priv, orig_node, tt_response->tt_data,
-                                  tt_response->ttvn,
-                                  (struct tt_change *)(tt_response + 1));
+        if (tt_response->flags & BATADV_TT_FULL_TABLE) {
+                batadv_tt_fill_gtable(bat_priv, tt_response);
+        } else {
+                tt_change = (struct batadv_tt_change *)(tt_response + 1);
+                batadv_tt_update_changes(bat_priv, orig_node,
+                                         ntohs(tt_response->tt_data),
+                                         tt_response->ttvn, tt_change);
+        }
 
         /* Delete the tt_req_node from pending tt_requests list */
         spin_lock_bh(&bat_priv->tt_req_list_lock);
         list_for_each_entry_safe(node, safe, &bat_priv->tt_req_list, list) {
-                if (!compare_eth(node->addr, tt_response->src))
+                if (!batadv_compare_eth(node->addr, tt_response->src))
                         continue;
                 list_del(&node->list);
                 kfree(node);
@@ -1756,31 +1918,36 @@ void handle_tt_response(struct bat_priv *bat_priv,
         spin_unlock_bh(&bat_priv->tt_req_list_lock);
 
         /* Recalculate the CRC for this orig_node and store it */
-        orig_node->tt_crc = tt_global_crc(bat_priv, orig_node);
+        orig_node->tt_crc = batadv_tt_global_crc(bat_priv, orig_node);
         /* Roaming phase is over: tables are in sync again. I can
-         * unset the flag */
+         * unset the flag
+         */
         orig_node->tt_poss_change = false;
 out:
         if (orig_node)
-                orig_node_free_ref(orig_node);
+                batadv_orig_node_free_ref(orig_node);
 }
 
-int tt_init(struct bat_priv *bat_priv)
+int batadv_tt_init(struct batadv_priv *bat_priv)
 {
-        if (!tt_local_init(bat_priv))
-                return 0;
+        int ret;
 
-        if (!tt_global_init(bat_priv))
-                return 0;
+        ret = batadv_tt_local_init(bat_priv);
+        if (ret < 0)
+                return ret;
 
-        tt_start_timer(bat_priv);
+        ret = batadv_tt_global_init(bat_priv);
+        if (ret < 0)
+                return ret;
+
+        batadv_tt_start_timer(bat_priv);
 
         return 1;
 }
 
-static void tt_roam_list_free(struct bat_priv *bat_priv)
+static void batadv_tt_roam_list_free(struct batadv_priv *bat_priv)
 {
-        struct tt_roam_node *node, *safe;
+        struct batadv_tt_roam_node *node, *safe;
 
         spin_lock_bh(&bat_priv->tt_roam_list_lock);
 
@@ -1792,13 +1959,14 @@ static void tt_roam_list_free(struct bat_priv *bat_priv)
         spin_unlock_bh(&bat_priv->tt_roam_list_lock);
 }
 
-static void tt_roam_purge(struct bat_priv *bat_priv)
+static void batadv_tt_roam_purge(struct batadv_priv *bat_priv)
 {
-        struct tt_roam_node *node, *safe;
+        struct batadv_tt_roam_node *node, *safe;
 
         spin_lock_bh(&bat_priv->tt_roam_list_lock);
         list_for_each_entry_safe(node, safe, &bat_priv->tt_roam_list, list) {
-                if (!has_timed_out(node->first_time, ROAMING_MAX_TIME))
+                if (!batadv_has_timed_out(node->first_time,
+                                          BATADV_ROAMING_MAX_TIME))
                         continue;
 
                 list_del(&node->list);
@@ -1811,24 +1979,27 @@ static void tt_roam_purge(struct bat_priv *bat_priv)
  * maximum number of possible roaming phases. In this case the ROAMING_ADV
  * will not be sent.
  *
- * returns true if the ROAMING_ADV can be sent, false otherwise */
-static bool tt_check_roam_count(struct bat_priv *bat_priv,
-                                uint8_t *client)
+ * returns true if the ROAMING_ADV can be sent, false otherwise
+ */
+static bool batadv_tt_check_roam_count(struct batadv_priv *bat_priv,
+                                       uint8_t *client)
 {
-        struct tt_roam_node *tt_roam_node;
+        struct batadv_tt_roam_node *tt_roam_node;
         bool ret = false;
 
         spin_lock_bh(&bat_priv->tt_roam_list_lock);
         /* The new tt_req will be issued only if I'm not waiting for a
-         * reply from the same orig_node yet */
+         * reply from the same orig_node yet
+         */
         list_for_each_entry(tt_roam_node, &bat_priv->tt_roam_list, list) {
-                if (!compare_eth(tt_roam_node->addr, client))
+                if (!batadv_compare_eth(tt_roam_node->addr, client))
                         continue;
 
-                if (has_timed_out(tt_roam_node->first_time, ROAMING_MAX_TIME))
+                if (batadv_has_timed_out(tt_roam_node->first_time,
+                                         BATADV_ROAMING_MAX_TIME))
                         continue;
 
-                if (!atomic_dec_not_zero(&tt_roam_node->counter))
+                if (!batadv_atomic_dec_not_zero(&tt_roam_node->counter))
                         /* Sorry, you roamed too many times! */
                         goto unlock;
                 ret = true;
@@ -1841,7 +2012,8 @@ static bool tt_check_roam_count(struct bat_priv *bat_priv,
                         goto unlock;
 
                 tt_roam_node->first_time = jiffies;
-                atomic_set(&tt_roam_node->counter, ROAMING_MAX_COUNT - 1);
+                atomic_set(&tt_roam_node->counter,
+                           BATADV_ROAMING_MAX_COUNT - 1);
                 memcpy(tt_roam_node->addr, client, ETH_ALEN);
 
                 list_add(&tt_roam_node->list, &bat_priv->tt_roam_list);
@@ -1853,97 +2025,103 @@ unlock:
         return ret;
 }
 
-static void send_roam_adv(struct bat_priv *bat_priv, uint8_t *client,
-                          struct orig_node *orig_node)
+static void batadv_send_roam_adv(struct batadv_priv *bat_priv, uint8_t *client,
+                                 struct batadv_orig_node *orig_node)
 {
-        struct neigh_node *neigh_node = NULL;
+        struct batadv_neigh_node *neigh_node = NULL;
         struct sk_buff *skb = NULL;
-        struct roam_adv_packet *roam_adv_packet;
+        struct batadv_roam_adv_packet *roam_adv_packet;
         int ret = 1;
-        struct hard_iface *primary_if;
+        struct batadv_hard_iface *primary_if;
+        size_t len = sizeof(*roam_adv_packet);
 
         /* before going on we have to check whether the client has
-         * already roamed to us too many times */
-        if (!tt_check_roam_count(bat_priv, client))
+         * already roamed to us too many times
+         */
+        if (!batadv_tt_check_roam_count(bat_priv, client))
                 goto out;
 
-        skb = dev_alloc_skb(sizeof(struct roam_adv_packet) + ETH_HLEN);
+        skb = dev_alloc_skb(sizeof(*roam_adv_packet) + ETH_HLEN);
         if (!skb)
                 goto out;
 
         skb_reserve(skb, ETH_HLEN);
 
-        roam_adv_packet = (struct roam_adv_packet *)skb_put(skb,
-                                        sizeof(struct roam_adv_packet));
+        roam_adv_packet = (struct batadv_roam_adv_packet *)skb_put(skb, len);
 
-        roam_adv_packet->header.packet_type = BAT_ROAM_ADV;
-        roam_adv_packet->header.version = COMPAT_VERSION;
-        roam_adv_packet->header.ttl = TTL;
-        primary_if = primary_if_get_selected(bat_priv);
+        roam_adv_packet->header.packet_type = BATADV_ROAM_ADV;
+        roam_adv_packet->header.version = BATADV_COMPAT_VERSION;
+        roam_adv_packet->header.ttl = BATADV_TTL;
+        roam_adv_packet->reserved = 0;
+        primary_if = batadv_primary_if_get_selected(bat_priv);
         if (!primary_if)
                 goto out;
         memcpy(roam_adv_packet->src, primary_if->net_dev->dev_addr, ETH_ALEN);
-        hardif_free_ref(primary_if);
+        batadv_hardif_free_ref(primary_if);
         memcpy(roam_adv_packet->dst, orig_node->orig, ETH_ALEN);
         memcpy(roam_adv_packet->client, client, ETH_ALEN);
 
-        neigh_node = orig_node_get_router(orig_node);
+        neigh_node = batadv_orig_node_get_router(orig_node);
         if (!neigh_node)
                 goto out;
 
-        bat_dbg(DBG_TT, bat_priv,
-                "Sending ROAMING_ADV to %pM (client %pM) via %pM\n",
-                orig_node->orig, client, neigh_node->addr);
+        batadv_dbg(BATADV_DBG_TT, bat_priv,
+                   "Sending ROAMING_ADV to %pM (client %pM) via %pM\n",
+                   orig_node->orig, client, neigh_node->addr);
+
+        batadv_inc_counter(bat_priv, BATADV_CNT_TT_ROAM_ADV_TX);
 
-        send_skb_packet(skb, neigh_node->if_incoming, neigh_node->addr);
+        batadv_send_skb_packet(skb, neigh_node->if_incoming, neigh_node->addr);
         ret = 0;
 
 out:
         if (neigh_node)
-                neigh_node_free_ref(neigh_node);
+                batadv_neigh_node_free_ref(neigh_node);
         if (ret)
                 kfree_skb(skb);
         return;
 }
 
-static void tt_purge(struct work_struct *work)
+static void batadv_tt_purge(struct work_struct *work)
 {
-        struct delayed_work *delayed_work =
-                container_of(work, struct delayed_work, work);
-        struct bat_priv *bat_priv =
-                container_of(delayed_work, struct bat_priv, tt_work);
+        struct delayed_work *delayed_work;
+        struct batadv_priv *bat_priv;
 
-        tt_local_purge(bat_priv);
-        tt_global_roam_purge(bat_priv);
-        tt_req_purge(bat_priv);
-        tt_roam_purge(bat_priv);
+        delayed_work = container_of(work, struct delayed_work, work);
+        bat_priv = container_of(delayed_work, struct batadv_priv, tt_work);
 
-        tt_start_timer(bat_priv);
+        batadv_tt_local_purge(bat_priv);
+        batadv_tt_global_roam_purge(bat_priv);
+        batadv_tt_req_purge(bat_priv);
+        batadv_tt_roam_purge(bat_priv);
+
+        batadv_tt_start_timer(bat_priv);
 }
 
-void tt_free(struct bat_priv *bat_priv)
+void batadv_tt_free(struct batadv_priv *bat_priv)
 {
         cancel_delayed_work_sync(&bat_priv->tt_work);
 
-        tt_local_table_free(bat_priv);
-        tt_global_table_free(bat_priv);
-        tt_req_list_free(bat_priv);
-        tt_changes_list_free(bat_priv);
-        tt_roam_list_free(bat_priv);
+        batadv_tt_local_table_free(bat_priv);
+        batadv_tt_global_table_free(bat_priv);
+        batadv_tt_req_list_free(bat_priv);
+        batadv_tt_changes_list_free(bat_priv);
+        batadv_tt_roam_list_free(bat_priv);
 
         kfree(bat_priv->tt_buff);
 }
 
 /* This function will enable or disable the specified flags for all the entries
- * in the given hash table and returns the number of modified entries */
-static uint16_t tt_set_flags(struct hashtable_t *hash, uint16_t flags,
-                             bool enable)
+ * in the given hash table and returns the number of modified entries
+ */
+static uint16_t batadv_tt_set_flags(struct batadv_hashtable *hash,
+                                    uint16_t flags, bool enable)
 {
         uint32_t i;
         uint16_t changed_num = 0;
         struct hlist_head *head;
         struct hlist_node *node;
-        struct tt_common_entry *tt_common_entry;
+        struct batadv_tt_common_entry *tt_common_entry;
 
         if (!hash)
                 goto out;
@@ -1971,12 +2149,12 @@ out:
         return changed_num;
 }
 
-/* Purge out all the tt local entries marked with TT_CLIENT_PENDING */
-static void tt_local_purge_pending_clients(struct bat_priv *bat_priv)
+/* Purge out all the tt local entries marked with BATADV_TT_CLIENT_PENDING */
+static void batadv_tt_local_purge_pending_clients(struct batadv_priv *bat_priv)
 {
-        struct hashtable_t *hash = bat_priv->tt_local_hash;
-        struct tt_common_entry *tt_common_entry;
-        struct tt_local_entry *tt_local_entry;
+        struct batadv_hashtable *hash = bat_priv->tt_local_hash;
+        struct batadv_tt_common_entry *tt_common;
+        struct batadv_tt_local_entry *tt_local;
         struct hlist_node *node, *node_tmp;
         struct hlist_head *head;
         spinlock_t *list_lock; /* protects write access to the hash lists */
@@ -1990,103 +2168,149 @@ static void tt_local_purge_pending_clients(struct bat_priv *bat_priv)
                 list_lock = &hash->list_locks[i];
 
                 spin_lock_bh(list_lock);
-                hlist_for_each_entry_safe(tt_common_entry, node, node_tmp,
-                                          head, hash_entry) {
-                        if (!(tt_common_entry->flags & TT_CLIENT_PENDING))
+                hlist_for_each_entry_safe(tt_common, node, node_tmp, head,
+                                          hash_entry) {
+                        if (!(tt_common->flags & BATADV_TT_CLIENT_PENDING))
                                 continue;
 
-                        bat_dbg(DBG_TT, bat_priv,
-                                "Deleting local tt entry (%pM): pending\n",
-                                tt_common_entry->addr);
+                        batadv_dbg(BATADV_DBG_TT, bat_priv,
+                                   "Deleting local tt entry (%pM): pending\n",
+                                   tt_common->addr);
 
                         atomic_dec(&bat_priv->num_local_tt);
                         hlist_del_rcu(node);
-                        tt_local_entry = container_of(tt_common_entry,
-                                                      struct tt_local_entry,
-                                                      common);
-                        tt_local_entry_free_ref(tt_local_entry);
+                        tt_local = container_of(tt_common,
+                                                struct batadv_tt_local_entry,
+                                                common);
+                        batadv_tt_local_entry_free_ref(tt_local);
                 }
                 spin_unlock_bh(list_lock);
         }
 
 }
 
-void tt_commit_changes(struct bat_priv *bat_priv)
+static int batadv_tt_commit_changes(struct batadv_priv *bat_priv,
+                                    unsigned char **packet_buff,
+                                    int *packet_buff_len, int packet_min_len)
 {
-        uint16_t changed_num = tt_set_flags(bat_priv->tt_local_hash,
-                                            TT_CLIENT_NEW, false);
-        /* all the reset entries have now to be effectively counted as local
-         * entries */
+        uint16_t changed_num = 0;
+
+        if (atomic_read(&bat_priv->tt_local_changes) < 1)
+                return -ENOENT;
+
+        changed_num = batadv_tt_set_flags(bat_priv->tt_local_hash,
+                                          BATADV_TT_CLIENT_NEW, false);
+
+        /* all reset entries have to be counted as local entries */
         atomic_add(changed_num, &bat_priv->num_local_tt);
-        tt_local_purge_pending_clients(bat_priv);
+        batadv_tt_local_purge_pending_clients(bat_priv);
+        bat_priv->tt_crc = batadv_tt_local_crc(bat_priv);
 
         /* Increment the TTVN only once per OGM interval */
         atomic_inc(&bat_priv->ttvn);
-        bat_dbg(DBG_TT, bat_priv, "Local changes committed, updating to ttvn %u\n",
-                (uint8_t)atomic_read(&bat_priv->ttvn));
+        batadv_dbg(BATADV_DBG_TT, bat_priv,
+                   "Local changes committed, updating to ttvn %u\n",
+                   (uint8_t)atomic_read(&bat_priv->ttvn));
         bat_priv->tt_poss_change = false;
+
+        /* reset the sending counter */
+        atomic_set(&bat_priv->tt_ogm_append_cnt, BATADV_TT_OGM_APPEND_MAX);
+
+        return batadv_tt_changes_fill_buff(bat_priv, packet_buff,
+                                           packet_buff_len, packet_min_len);
+}
+
+/* when calling this function (hard_iface == primary_if) has to be true */
+int batadv_tt_append_diff(struct batadv_priv *bat_priv,
+                          unsigned char **packet_buff, int *packet_buff_len,
+                          int packet_min_len)
+{
+        int tt_num_changes;
+
+        /* if at least one change happened */
+        tt_num_changes = batadv_tt_commit_changes(bat_priv, packet_buff,
+                                                  packet_buff_len,
+                                                  packet_min_len);
+
+        /* if the changes have been sent often enough */
+        if ((tt_num_changes < 0) &&
+            (!batadv_atomic_dec_not_zero(&bat_priv->tt_ogm_append_cnt))) {
+                batadv_tt_realloc_packet_buff(packet_buff, packet_buff_len,
+                                              packet_min_len, packet_min_len);
+                tt_num_changes = 0;
+        }
+
+        return tt_num_changes;
 }
 
-bool is_ap_isolated(struct bat_priv *bat_priv, uint8_t *src, uint8_t *dst)
+bool batadv_is_ap_isolated(struct batadv_priv *bat_priv, uint8_t *src,
+                           uint8_t *dst)
 {
-        struct tt_local_entry *tt_local_entry = NULL;
-        struct tt_global_entry *tt_global_entry = NULL;
+        struct batadv_tt_local_entry *tt_local_entry = NULL;
+        struct batadv_tt_global_entry *tt_global_entry = NULL;
         bool ret = false;
 
         if (!atomic_read(&bat_priv->ap_isolation))
                 goto out;
 
-        tt_local_entry = tt_local_hash_find(bat_priv, dst);
+        tt_local_entry = batadv_tt_local_hash_find(bat_priv, dst);
         if (!tt_local_entry)
                 goto out;
 
-        tt_global_entry = tt_global_hash_find(bat_priv, src);
+        tt_global_entry = batadv_tt_global_hash_find(bat_priv, src);
         if (!tt_global_entry)
                 goto out;
 
-        if (!_is_ap_isolated(tt_local_entry, tt_global_entry))
+        if (!_batadv_is_ap_isolated(tt_local_entry, tt_global_entry))
                 goto out;
 
         ret = true;
 
 out:
         if (tt_global_entry)
-                tt_global_entry_free_ref(tt_global_entry);
+                batadv_tt_global_entry_free_ref(tt_global_entry);
         if (tt_local_entry)
-                tt_local_entry_free_ref(tt_local_entry);
+                batadv_tt_local_entry_free_ref(tt_local_entry);
         return ret;
 }
 
-void tt_update_orig(struct bat_priv *bat_priv, struct orig_node *orig_node,
-                    const unsigned char *tt_buff, uint8_t tt_num_changes,
-                    uint8_t ttvn, uint16_t tt_crc)
+void batadv_tt_update_orig(struct batadv_priv *bat_priv,
+                           struct batadv_orig_node *orig_node,
+                           const unsigned char *tt_buff, uint8_t tt_num_changes,
+                           uint8_t ttvn, uint16_t tt_crc)
 {
         uint8_t orig_ttvn = (uint8_t)atomic_read(&orig_node->last_ttvn);
         bool full_table = true;
+        struct batadv_tt_change *tt_change;
 
         /* don't care about a backbone gateways updates. */
-        if (bla_is_backbone_gw_orig(bat_priv, orig_node->orig))
+        if (batadv_bla_is_backbone_gw_orig(bat_priv, orig_node->orig))
                 return;
 
         /* orig table not initialised AND first diff is in the OGM OR the ttvn
-         * increased by one -> we can apply the attached changes */
+         * increased by one -> we can apply the attached changes
+         */
         if ((!orig_node->tt_initialised && ttvn == 1) ||
             ttvn - orig_ttvn == 1) {
                 /* the OGM could not contain the changes due to their size or
-                 * because they have already been sent TT_OGM_APPEND_MAX times.
-                 * In this case send a tt request */
+                 * because they have already been sent BATADV_TT_OGM_APPEND_MAX
+                 * times.
+                 * In this case send a tt request
+                 */
                 if (!tt_num_changes) {
                         full_table = false;
                         goto request_table;
                 }
 
-                tt_update_changes(bat_priv, orig_node, tt_num_changes, ttvn,
-                                  (struct tt_change *)tt_buff);
+                tt_change = (struct batadv_tt_change *)tt_buff;
+                batadv_tt_update_changes(bat_priv, orig_node, tt_num_changes,
+                                         ttvn, tt_change);
 
                 /* Even if we received the precomputed crc with the OGM, we
                  * prefer to recompute it to spot any possible inconsistency
-                 * in the global table */
-                orig_node->tt_crc = tt_global_crc(bat_priv, orig_node);
+                 * in the global table
+                 */
+                orig_node->tt_crc = batadv_tt_global_crc(bat_priv, orig_node);
 
                 /* The ttvn alone is not enough to guarantee consistency
                  * because a single value could represent different states
@@ -2095,26 +2319,28 @@ void tt_update_orig(struct bat_priv *bat_priv, struct orig_node *orig_node,
                  * consistent or not. E.g. a node could disconnect while its
                  * ttvn is X and reconnect on ttvn = X + TTVN_MAX: in this case
                  * checking the CRC value is mandatory to detect the
-                 * inconsistency */
+                 * inconsistency
+                 */
                 if (orig_node->tt_crc != tt_crc)
                         goto request_table;
 
                 /* Roaming phase is over: tables are in sync again. I can
-                 * unset the flag */
+                 * unset the flag
+                 */
                 orig_node->tt_poss_change = false;
         } else {
                 /* if we missed more than one change or our tables are not
-                 * in sync anymore -> request fresh tt data */
-
+                 * in sync anymore -> request fresh tt data
+                 */
                 if (!orig_node->tt_initialised || ttvn != orig_ttvn ||
                     orig_node->tt_crc != tt_crc) {
 request_table:
-                        bat_dbg(DBG_TT, bat_priv,
-                                "TT inconsistency for %pM. Need to retrieve the correct information (ttvn: %u last_ttvn: %u crc: %u last_crc: %u num_changes: %u)\n",
-                                orig_node->orig, ttvn, orig_ttvn, tt_crc,
-                                orig_node->tt_crc, tt_num_changes);
-                        send_tt_request(bat_priv, orig_node, ttvn, tt_crc,
-                                        full_table);
+                        batadv_dbg(BATADV_DBG_TT, bat_priv,
+                                   "TT inconsistency for %pM. Need to retrieve the correct information (ttvn: %u last_ttvn: %u crc: %u last_crc: %u num_changes: %u)\n",
+                                   orig_node->orig, ttvn, orig_ttvn, tt_crc,
+                                   orig_node->tt_crc, tt_num_changes);
+                        batadv_send_tt_request(bat_priv, orig_node, ttvn,
+                                               tt_crc, full_table);
                         return;
                 }
         }
@@ -2124,17 +2350,18 @@ request_table:
  * originator to another one. This entry is kept is still kept for consistency
  * purposes
  */
-bool tt_global_client_is_roaming(struct bat_priv *bat_priv, uint8_t *addr)
+bool batadv_tt_global_client_is_roaming(struct batadv_priv *bat_priv,
+                                        uint8_t *addr)
 {
-        struct tt_global_entry *tt_global_entry;
+        struct batadv_tt_global_entry *tt_global_entry;
         bool ret = false;
 
-        tt_global_entry = tt_global_hash_find(bat_priv, addr);
+        tt_global_entry = batadv_tt_global_hash_find(bat_priv, addr);
         if (!tt_global_entry)
                 goto out;
 
-        ret = tt_global_entry->common.flags & TT_CLIENT_ROAM;
-        tt_global_entry_free_ref(tt_global_entry);
+        ret = tt_global_entry->common.flags & BATADV_TT_CLIENT_ROAM;
+        batadv_tt_global_entry_free_ref(tt_global_entry);
 out:
         return ret;
 }
diff --git a/net/batman-adv/translation-table.h b/net/batman-adv/translation-table.h
index c43374dc364..ffa87355096 100644
--- a/net/batman-adv/translation-table.h
+++ b/net/batman-adv/translation-table.h
@@ -1,5 +1,4 @@
-/*
- * Copyright (C) 2007-2012 B.A.T.M.A.N. contributors:
+/* Copyright (C) 2007-2012 B.A.T.M.A.N. contributors:
  *
  * Marek Lindner, Simon Wunderlich, Antonio Quartulli
  *
@@ -16,44 +15,50 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA
- *
  */
 
 #ifndef _NET_BATMAN_ADV_TRANSLATION_TABLE_H_
 #define _NET_BATMAN_ADV_TRANSLATION_TABLE_H_
 
-int tt_len(int changes_num);
-int tt_changes_fill_buffer(struct bat_priv *bat_priv,
-                           unsigned char *buff, int buff_len);
-int tt_init(struct bat_priv *bat_priv);
-void tt_local_add(struct net_device *soft_iface, const uint8_t *addr,
-                  int ifindex);
-void tt_local_remove(struct bat_priv *bat_priv,
-                     const uint8_t *addr, const char *message, bool roaming);
-int tt_local_seq_print_text(struct seq_file *seq, void *offset);
-void tt_global_add_orig(struct bat_priv *bat_priv, struct orig_node *orig_node,
-                        const unsigned char *tt_buff, int tt_buff_len);
-int tt_global_add(struct bat_priv *bat_priv, struct orig_node *orig_node,
-                  const unsigned char *addr, uint8_t ttvn, bool roaming,
-                  bool wifi);
-int tt_global_seq_print_text(struct seq_file *seq, void *offset);
-void tt_global_del_orig(struct bat_priv *bat_priv,
-                        struct orig_node *orig_node, const char *message);
-struct orig_node *transtable_search(struct bat_priv *bat_priv,
-                                    const uint8_t *src, const uint8_t *addr);
-uint16_t tt_local_crc(struct bat_priv *bat_priv);
-void tt_free(struct bat_priv *bat_priv);
-bool send_tt_response(struct bat_priv *bat_priv,
-                      struct tt_query_packet *tt_request);
-bool is_my_client(struct bat_priv *bat_priv, const uint8_t *addr);
-void handle_tt_response(struct bat_priv *bat_priv,
-                        struct tt_query_packet *tt_response);
-void tt_commit_changes(struct bat_priv *bat_priv);
-bool is_ap_isolated(struct bat_priv *bat_priv, uint8_t *src, uint8_t *dst);
-void tt_update_orig(struct bat_priv *bat_priv, struct orig_node *orig_node,
-                    const unsigned char *tt_buff, uint8_t tt_num_changes,
-                    uint8_t ttvn, uint16_t tt_crc);
-bool tt_global_client_is_roaming(struct bat_priv *bat_priv, uint8_t *addr);
+int batadv_tt_len(int changes_num);
+int batadv_tt_init(struct batadv_priv *bat_priv);
+void batadv_tt_local_add(struct net_device *soft_iface, const uint8_t *addr,
+                         int ifindex);
+void batadv_tt_local_remove(struct batadv_priv *bat_priv,
+                            const uint8_t *addr, const char *message,
+                            bool roaming);
+int batadv_tt_local_seq_print_text(struct seq_file *seq, void *offset);
+void batadv_tt_global_add_orig(struct batadv_priv *bat_priv,
+                               struct batadv_orig_node *orig_node,
+                               const unsigned char *tt_buff, int tt_buff_len);
+int batadv_tt_global_add(struct batadv_priv *bat_priv,
+                         struct batadv_orig_node *orig_node,
+                         const unsigned char *addr, uint8_t flags,
+                         uint8_t ttvn);
+int batadv_tt_global_seq_print_text(struct seq_file *seq, void *offset);
+void batadv_tt_global_del_orig(struct batadv_priv *bat_priv,
+                               struct batadv_orig_node *orig_node,
+                               const char *message);
+struct batadv_orig_node *batadv_transtable_search(struct batadv_priv *bat_priv,
+                                                  const uint8_t *src,
+                                                  const uint8_t *addr);
+void batadv_tt_free(struct batadv_priv *bat_priv);
+bool batadv_send_tt_response(struct batadv_priv *bat_priv,
+                             struct batadv_tt_query_packet *tt_request);
+bool batadv_is_my_client(struct batadv_priv *bat_priv, const uint8_t *addr);
+void batadv_handle_tt_response(struct batadv_priv *bat_priv,
+                               struct batadv_tt_query_packet *tt_response);
+bool batadv_is_ap_isolated(struct batadv_priv *bat_priv, uint8_t *src,
+                           uint8_t *dst);
+void batadv_tt_update_orig(struct batadv_priv *bat_priv,
+                           struct batadv_orig_node *orig_node,
+                           const unsigned char *tt_buff, uint8_t tt_num_changes,
+                           uint8_t ttvn, uint16_t tt_crc);
+int batadv_tt_append_diff(struct batadv_priv *bat_priv,
+                          unsigned char **packet_buff, int *packet_buff_len,
+                          int packet_min_len);
+bool batadv_tt_global_client_is_roaming(struct batadv_priv *bat_priv,
+                                        uint8_t *addr);
 
 
 #endif /* _NET_BATMAN_ADV_TRANSLATION_TABLE_H_ */
diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h
index 61308e8016f..12635fd2c3d 100644
--- a/net/batman-adv/types.h
+++ b/net/batman-adv/types.h
@@ -1,5 +1,4 @@
-/*
- * Copyright (C) 2007-2012 B.A.T.M.A.N. contributors:
+/* Copyright (C) 2007-2012 B.A.T.M.A.N. contributors:
  *
  * Marek Lindner, Simon Wunderlich
  *
@@ -16,24 +15,20 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA
- *
  */
 
-
-
 #ifndef _NET_BATMAN_ADV_TYPES_H_
 #define _NET_BATMAN_ADV_TYPES_H_
 
 #include "packet.h"
 #include "bitarray.h"
+#include <linux/kernel.h>
 
-#define BAT_HEADER_LEN (ETH_HLEN + \
-        ((sizeof(struct unicast_packet) > sizeof(struct bcast_packet) ? \
-         sizeof(struct unicast_packet) : \
-         sizeof(struct bcast_packet))))
-
+#define BATADV_HEADER_LEN \
+        (ETH_HLEN + max(sizeof(struct batadv_unicast_packet), \
+                        sizeof(struct batadv_bcast_packet)))
 
-struct hard_iface {
+struct batadv_hard_iface {
         struct list_head list;
         int16_t if_num;
         char if_status;
@@ -50,7 +45,7 @@ struct hard_iface {
 };
 
 /**
- *      orig_node - structure for orig_list maintaining nodes of mesh
+ *      struct batadv_orig_node - structure for orig_list maintaining nodes of mesh
  *      @primary_addr: hosts primary interface address
  *      @last_seen: when last packet from this node was received
  *      @bcast_seqno_reset: time when the broadcast seqno window was reset
@@ -64,10 +59,10 @@ struct hard_iface {
  *      @candidates: how many candidates are available
  *      @selected: next bonding candidate
  */
-struct orig_node {
+struct batadv_orig_node {
         uint8_t orig[ETH_ALEN];
         uint8_t primary_addr[ETH_ALEN];
-        struct neigh_node __rcu *router; /* rcu protected pointer */
+        struct batadv_neigh_node __rcu *router; /* rcu protected pointer */
         unsigned long *bcast_own;
         uint8_t *bcast_own_sum;
         unsigned long last_seen;
@@ -86,11 +81,12 @@ struct orig_node {
          * If true, then I sent a Roaming_adv to this orig_node and I have to
          * inspect every packet directed to it to check whether it is still
          * the true destination or not. This flag will be reset to false as
-         * soon as I receive a new TTVN from this orig_node */
+         * soon as I receive a new TTVN from this orig_node
+         */
         bool tt_poss_change;
         uint32_t last_real_seqno;
         uint8_t last_ttl;
-        DECLARE_BITMAP(bcast_bits, TQ_LOCAL_WINDOW_SIZE);
+        DECLARE_BITMAP(bcast_bits, BATADV_TQ_LOCAL_WINDOW_SIZE);
         uint32_t last_bcast_seqno;
         struct hlist_head neigh_list;
         struct list_head frag_list;
@@ -98,10 +94,11 @@ struct orig_node {
         atomic_t refcount;
         struct rcu_head rcu;
         struct hlist_node hash_entry;
-        struct bat_priv *bat_priv;
+        struct batadv_priv *bat_priv;
         unsigned long last_frag_packet;
         /* ogm_cnt_lock protects: bcast_own, bcast_own_sum,
-         * neigh_node->real_bits, neigh_node->real_packet_count */
+         * neigh_node->real_bits, neigh_node->real_packet_count
+         */
         spinlock_t ogm_cnt_lock;
         /* bcast_seqno_lock protects bcast_bits, last_bcast_seqno */
         spinlock_t bcast_seqno_lock;
@@ -110,47 +107,63 @@ struct orig_node {
         struct list_head bond_list;
 };
 
-struct gw_node {
+struct batadv_gw_node {
         struct hlist_node list;
-        struct orig_node *orig_node;
+        struct batadv_orig_node *orig_node;
         unsigned long deleted;
         atomic_t refcount;
         struct rcu_head rcu;
 };
 
-/**
- *      neigh_node
+/*      batadv_neigh_node
  *      @last_seen: when last packet via this neighbor was received
  */
-struct neigh_node {
+struct batadv_neigh_node {
         struct hlist_node list;
         uint8_t addr[ETH_ALEN];
         uint8_t real_packet_count;
-        uint8_t tq_recv[TQ_GLOBAL_WINDOW_SIZE];
+        uint8_t tq_recv[BATADV_TQ_GLOBAL_WINDOW_SIZE];
         uint8_t tq_index;
         uint8_t tq_avg;
         uint8_t last_ttl;
         struct list_head bonding_list;
         unsigned long last_seen;
-        DECLARE_BITMAP(real_bits, TQ_LOCAL_WINDOW_SIZE);
+        DECLARE_BITMAP(real_bits, BATADV_TQ_LOCAL_WINDOW_SIZE);
         atomic_t refcount;
         struct rcu_head rcu;
-        struct orig_node *orig_node;
-        struct hard_iface *if_incoming;
+        struct batadv_orig_node *orig_node;
+        struct batadv_hard_iface *if_incoming;
         spinlock_t lq_update_lock;      /* protects: tq_recv, tq_index */
 };
 
 #ifdef CONFIG_BATMAN_ADV_BLA
-struct bcast_duplist_entry {
+struct batadv_bcast_duplist_entry {
         uint8_t orig[ETH_ALEN];
         uint16_t crc;
         unsigned long entrytime;
 };
 #endif
 
-struct bat_priv {
+enum batadv_counters {
+        BATADV_CNT_FORWARD,
+        BATADV_CNT_FORWARD_BYTES,
+        BATADV_CNT_MGMT_TX,
+        BATADV_CNT_MGMT_TX_BYTES,
+        BATADV_CNT_MGMT_RX,
+        BATADV_CNT_MGMT_RX_BYTES,
+        BATADV_CNT_TT_REQUEST_TX,
+        BATADV_CNT_TT_REQUEST_RX,
+        BATADV_CNT_TT_RESPONSE_TX,
+        BATADV_CNT_TT_RESPONSE_RX,
+        BATADV_CNT_TT_ROAM_ADV_TX,
+        BATADV_CNT_TT_ROAM_ADV_RX,
+        BATADV_CNT_NUM,
+};
+
+struct batadv_priv {
         atomic_t mesh_state;
         struct net_device_stats stats;
+        uint64_t __percpu *bat_counters; /* Per cpu counters */
         atomic_t aggregated_ogms;       /* boolean */
         atomic_t bonding;               /* boolean */
         atomic_t fragmentation;         /* boolean */
@@ -174,10 +187,11 @@ struct bat_priv {
          * If true, then I received a Roaming_adv and I have to inspect every
          * packet directed to me to check whether I am still the true
          * destination or not. This flag will be reset to false as soon as I
-         * increase my TTVN */
+         * increase my TTVN
+         */
         bool tt_poss_change;
         char num_ifaces;
-        struct debug_log *debug_log;
+        struct batadv_debug_log *debug_log;
         struct kobject *mesh_obj;
         struct dentry *debug_dir;
         struct hlist_head forw_bat_list;
@@ -185,20 +199,20 @@ struct bat_priv {
         struct hlist_head gw_list;
         struct list_head tt_changes_list; /* tracks changes in a OGM int */
         struct list_head vis_send_list;
-        struct hashtable_t *orig_hash;
-        struct hashtable_t *tt_local_hash;
-        struct hashtable_t *tt_global_hash;
+        struct batadv_hashtable *orig_hash;
+        struct batadv_hashtable *tt_local_hash;
+        struct batadv_hashtable *tt_global_hash;
 #ifdef CONFIG_BATMAN_ADV_BLA
-        struct hashtable_t *claim_hash;
-        struct hashtable_t *backbone_hash;
+        struct batadv_hashtable *claim_hash;
+        struct batadv_hashtable *backbone_hash;
 #endif
         struct list_head tt_req_list; /* list of pending tt_requests */
         struct list_head tt_roam_list;
-        struct hashtable_t *vis_hash;
+        struct batadv_hashtable *vis_hash;
 #ifdef CONFIG_BATMAN_ADV_BLA
-        struct bcast_duplist_entry bcast_duplist[DUPLIST_SIZE];
+        struct batadv_bcast_duplist_entry bcast_duplist[BATADV_DUPLIST_SIZE];
         int bcast_duplist_curr;
-        struct bla_claim_dst claim_dest;
+        struct batadv_bla_claim_dst claim_dest;
 #endif
         spinlock_t forw_bat_list_lock; /* protects forw_bat_list */
         spinlock_t forw_bcast_list_lock; /* protects  */
@@ -210,7 +224,7 @@ struct bat_priv {
         spinlock_t vis_list_lock; /* protects vis_info::recv_list */
         atomic_t num_local_tt;
         /* Checksum of the local table, recomputed before sending a new OGM */
-        atomic_t tt_crc;
+        uint16_t tt_crc;
         unsigned char *tt_buff;
         int16_t tt_buff_len;
         spinlock_t tt_buff_lock; /* protects tt_buff */
@@ -218,29 +232,29 @@ struct bat_priv {
         struct delayed_work orig_work;
         struct delayed_work vis_work;
         struct delayed_work bla_work;
-        struct gw_node __rcu *curr_gw;  /* rcu protected pointer */
+        struct batadv_gw_node __rcu *curr_gw;  /* rcu protected pointer */
         atomic_t gw_reselect;
-        struct hard_iface __rcu *primary_if;  /* rcu protected pointer */
-        struct vis_info *my_vis_info;
-        struct bat_algo_ops *bat_algo_ops;
+        struct batadv_hard_iface __rcu *primary_if;  /* rcu protected pointer */
+        struct batadv_vis_info *my_vis_info;
+        struct batadv_algo_ops *bat_algo_ops;
 };
 
-struct socket_client {
+struct batadv_socket_client {
         struct list_head queue_list;
         unsigned int queue_len;
         unsigned char index;
         spinlock_t lock; /* protects queue_list, queue_len, index */
         wait_queue_head_t queue_wait;
-        struct bat_priv *bat_priv;
+        struct batadv_priv *bat_priv;
 };
 
-struct socket_packet {
+struct batadv_socket_packet {
         struct list_head list;
         size_t icmp_len;
-        struct icmp_packet_rr icmp_packet;
+        struct batadv_icmp_packet_rr icmp_packet;
 };
 
-struct tt_common_entry {
+struct batadv_tt_common_entry {
         uint8_t addr[ETH_ALEN];
         struct hlist_node hash_entry;
         uint16_t flags;
@@ -248,31 +262,31 @@ struct tt_common_entry {
         struct rcu_head rcu;
 };
 
-struct tt_local_entry {
-        struct tt_common_entry common;
+struct batadv_tt_local_entry {
+        struct batadv_tt_common_entry common;
         unsigned long last_seen;
 };
 
-struct tt_global_entry {
-        struct tt_common_entry common;
+struct batadv_tt_global_entry {
+        struct batadv_tt_common_entry common;
         struct hlist_head orig_list;
         spinlock_t list_lock;   /* protects the list */
         unsigned long roam_at; /* time at which TT_GLOBAL_ROAM was set */
 };
 
-struct tt_orig_list_entry {
-        struct orig_node *orig_node;
+struct batadv_tt_orig_list_entry {
+        struct batadv_orig_node *orig_node;
         uint8_t ttvn;
         struct rcu_head rcu;
         struct hlist_node list;
 };
 
 #ifdef CONFIG_BATMAN_ADV_BLA
-struct backbone_gw {
+struct batadv_backbone_gw {
         uint8_t orig[ETH_ALEN];
         short vid;              /* used VLAN ID */
         struct hlist_node hash_entry;
-        struct bat_priv *bat_priv;
+        struct batadv_priv *bat_priv;
         unsigned long lasttime; /* last time we heard of this backbone gw */
         atomic_t request_sent;
         atomic_t refcount;
@@ -280,10 +294,10 @@ struct backbone_gw {
         uint16_t crc;           /* crc checksum over all claims */
 };
 
-struct claim {
+struct batadv_claim {
         uint8_t addr[ETH_ALEN];
         short vid;
-        struct backbone_gw *backbone_gw;
+        struct batadv_backbone_gw *backbone_gw;
         unsigned long lasttime; /* last time we heard of claim (locals only) */
         struct rcu_head rcu;
         atomic_t refcount;
@@ -291,29 +305,28 @@ struct claim {
 };
 #endif
 
-struct tt_change_node {
+struct batadv_tt_change_node {
         struct list_head list;
-        struct tt_change change;
+        struct batadv_tt_change change;
 };
 
-struct tt_req_node {
+struct batadv_tt_req_node {
         uint8_t addr[ETH_ALEN];
         unsigned long issued_at;
         struct list_head list;
 };
 
-struct tt_roam_node {
+struct batadv_tt_roam_node {
         uint8_t addr[ETH_ALEN];
         atomic_t counter;
         unsigned long first_time;
         struct list_head list;
 };
 
-/**
- *      forw_packet - structure for forw_list maintaining packets to be
+/*      forw_packet - structure for forw_list maintaining packets to be
  *                    send/forwarded
  */
-struct forw_packet {
+struct batadv_forw_packet {
         struct hlist_node list;
         unsigned long send_time;
         uint8_t own;
@@ -322,76 +335,76 @@ struct forw_packet {
         uint32_t direct_link_flags;
         uint8_t num_packets;
         struct delayed_work delayed_work;
-        struct hard_iface *if_incoming;
+        struct batadv_hard_iface *if_incoming;
 };
 
 /* While scanning for vis-entries of a particular vis-originator
  * this list collects its interfaces to create a subgraph/cluster
  * out of them later
  */
-struct if_list_entry {
+struct batadv_if_list_entry {
         uint8_t addr[ETH_ALEN];
         bool primary;
         struct hlist_node list;
 };
 
-struct debug_log {
-        char log_buff[LOG_BUF_LEN];
+struct batadv_debug_log {
+        char log_buff[BATADV_LOG_BUF_LEN];
         unsigned long log_start;
         unsigned long log_end;
         spinlock_t lock; /* protects log_buff, log_start and log_end */
         wait_queue_head_t queue_wait;
 };
 
-struct frag_packet_list_entry {
+struct batadv_frag_packet_list_entry {
         struct list_head list;
         uint16_t seqno;
         struct sk_buff *skb;
 };
 
-struct vis_info {
+struct batadv_vis_info {
         unsigned long first_seen;
         /* list of server-neighbors we received a vis-packet
-         * from.  we should not reply to them. */
+         * from.  we should not reply to them.
+         */
         struct list_head recv_list;
         struct list_head send_list;
         struct kref refcount;
         struct hlist_node hash_entry;
-        struct bat_priv *bat_priv;
+        struct batadv_priv *bat_priv;
         /* this packet might be part of the vis send queue. */
         struct sk_buff *skb_packet;
-        /* vis_info may follow here*/
+        /* vis_info may follow here */
 } __packed;
 
-struct vis_info_entry {
+struct batadv_vis_info_entry {
         uint8_t  src[ETH_ALEN];
         uint8_t  dest[ETH_ALEN];
         uint8_t  quality;       /* quality = 0 client */
 } __packed;
 
-struct recvlist_node {
+struct batadv_recvlist_node {
         struct list_head list;
         uint8_t mac[ETH_ALEN];
 };
 
-struct bat_algo_ops {
+struct batadv_algo_ops {
         struct hlist_node list;
         char *name;
         /* init routing info when hard-interface is enabled */
-        int (*bat_iface_enable)(struct hard_iface *hard_iface);
+        int (*bat_iface_enable)(struct batadv_hard_iface *hard_iface);
         /* de-init routing info when hard-interface is disabled */
-        void (*bat_iface_disable)(struct hard_iface *hard_iface);
+        void (*bat_iface_disable)(struct batadv_hard_iface *hard_iface);
         /* (re-)init mac addresses of the protocol information
          * belonging to this hard-interface
          */
-        void (*bat_iface_update_mac)(struct hard_iface *hard_iface);
+        void (*bat_iface_update_mac)(struct batadv_hard_iface *hard_iface);
         /* called when primary interface is selected / changed */
-        void (*bat_primary_iface_set)(struct hard_iface *hard_iface);
+        void (*bat_primary_iface_set)(struct batadv_hard_iface *hard_iface);
         /* prepare a new outgoing OGM for the send queue */
-        void (*bat_ogm_schedule)(struct hard_iface *hard_iface,
-                                 int tt_num_changes);
+        void (*bat_ogm_schedule)(struct batadv_hard_iface *hard_iface);
         /* send scheduled OGM */
-        void (*bat_ogm_emit)(struct forw_packet *forw_packet);
+        void (*bat_ogm_emit)(struct batadv_forw_packet *forw_packet);
 };
 
 #endif /* _NET_BATMAN_ADV_TYPES_H_ */
diff --git a/net/batman-adv/unicast.c b/net/batman-adv/unicast.c
index 74175c21085..00164645b3f 100644
--- a/net/batman-adv/unicast.c
+++ b/net/batman-adv/unicast.c
@@ -1,5 +1,4 @@
-/*
- * Copyright (C) 2010-2012 B.A.T.M.A.N. contributors:
+/* Copyright (C) 2010-2012 B.A.T.M.A.N. contributors:
  *
  * Andreas Langer
  *
@@ -16,7 +15,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA
- *
  */
 
 #include "main.h"
@@ -31,19 +29,20 @@
 #include "hard-interface.h"
 
 
-static struct sk_buff *frag_merge_packet(struct list_head *head,
-                                         struct frag_packet_list_entry *tfp,
-                                         struct sk_buff *skb)
+static struct sk_buff *
+batadv_frag_merge_packet(struct list_head *head,
+                         struct batadv_frag_packet_list_entry *tfp,
+                         struct sk_buff *skb)
 {
-        struct unicast_frag_packet *up =
-                (struct unicast_frag_packet *)skb->data;
+        struct batadv_unicast_frag_packet *up;
         struct sk_buff *tmp_skb;
-        struct unicast_packet *unicast_packet;
+        struct batadv_unicast_packet *unicast_packet;
         int hdr_len = sizeof(*unicast_packet);
         int uni_diff = sizeof(*up) - hdr_len;
 
+        up = (struct batadv_unicast_frag_packet *)skb->data;
         /* set skb to the first part and tmp_skb to the second part */
-        if (up->flags & UNI_FRAG_HEAD) {
+        if (up->flags & BATADV_UNI_FRAG_HEAD) {
                 tmp_skb = tfp->skb;
         } else {
                 tmp_skb = skb;
@@ -66,8 +65,9 @@ static struct sk_buff *frag_merge_packet(struct list_head *head,
         kfree_skb(tmp_skb);
 
         memmove(skb->data + uni_diff, skb->data, hdr_len);
-        unicast_packet = (struct unicast_packet *)skb_pull(skb, uni_diff);
-        unicast_packet->header.packet_type = BAT_UNICAST;
+        unicast_packet = (struct batadv_unicast_packet *)skb_pull(skb,
+                                                                  uni_diff);
+        unicast_packet->header.packet_type = BATADV_UNICAST;
 
         return skb;
 
@@ -77,11 +77,13 @@ err:
         return NULL;
 }
 
-static void frag_create_entry(struct list_head *head, struct sk_buff *skb)
+static void batadv_frag_create_entry(struct list_head *head,
+                                     struct sk_buff *skb)
 {
-        struct frag_packet_list_entry *tfp;
-        struct unicast_frag_packet *up =
-                (struct unicast_frag_packet *)skb->data;
+        struct batadv_frag_packet_list_entry *tfp;
+        struct batadv_unicast_frag_packet *up;
+
+        up = (struct batadv_unicast_frag_packet *)skb->data;
 
         /* free and oldest packets stand at the end */
         tfp = list_entry((head)->prev, typeof(*tfp), list);
@@ -93,15 +95,15 @@ static void frag_create_entry(struct list_head *head, struct sk_buff *skb)
         return;
 }
 
-static int frag_create_buffer(struct list_head *head)
+static int batadv_frag_create_buffer(struct list_head *head)
 {
         int i;
-        struct frag_packet_list_entry *tfp;
+        struct batadv_frag_packet_list_entry *tfp;
 
-        for (i = 0; i < FRAG_BUFFER_SIZE; i++) {
+        for (i = 0; i < BATADV_FRAG_BUFFER_SIZE; i++) {
                 tfp = kmalloc(sizeof(*tfp), GFP_ATOMIC);
                 if (!tfp) {
-                        frag_list_free(head);
+                        batadv_frag_list_free(head);
                         return -ENOMEM;
                 }
                 tfp->skb = NULL;
@@ -113,14 +115,15 @@ static int frag_create_buffer(struct list_head *head)
         return 0;
 }
 
-static struct frag_packet_list_entry *frag_search_packet(struct list_head *head,
-                                           const struct unicast_frag_packet *up)
+static struct batadv_frag_packet_list_entry *
+batadv_frag_search_packet(struct list_head *head,
+                          const struct batadv_unicast_frag_packet *up)
 {
-        struct frag_packet_list_entry *tfp;
-        struct unicast_frag_packet *tmp_up = NULL;
+        struct batadv_frag_packet_list_entry *tfp;
+        struct batadv_unicast_frag_packet *tmp_up = NULL;
         uint16_t search_seqno;
 
-        if (up->flags & UNI_FRAG_HEAD)
+        if (up->flags & BATADV_UNI_FRAG_HEAD)
                 search_seqno = ntohs(up->seqno)+1;
         else
                 search_seqno = ntohs(up->seqno)-1;
@@ -133,12 +136,12 @@ static struct frag_packet_list_entry *frag_search_packet(struct list_head *head,
                 if (tfp->seqno == ntohs(up->seqno))
                         goto mov_tail;
 
-                tmp_up = (struct unicast_frag_packet *)tfp->skb->data;
+                tmp_up = (struct batadv_unicast_frag_packet *)tfp->skb->data;
 
                 if (tfp->seqno == search_seqno) {
 
-                        if ((tmp_up->flags & UNI_FRAG_HEAD) !=
-                            (up->flags & UNI_FRAG_HEAD))
+                        if ((tmp_up->flags & BATADV_UNI_FRAG_HEAD) !=
+                            (up->flags & BATADV_UNI_FRAG_HEAD))
                                 return tfp;
                         else
                                 goto mov_tail;
@@ -151,9 +154,9 @@ mov_tail:
         return NULL;
 }
 
-void frag_list_free(struct list_head *head)
+void batadv_frag_list_free(struct list_head *head)
 {
-        struct frag_packet_list_entry *pf, *tmp_pf;
+        struct batadv_frag_packet_list_entry *pf, *tmp_pf;
 
         if (!list_empty(head)) {
 
@@ -172,64 +175,66 @@ void frag_list_free(struct list_head *head)
  * or the skb could be reassembled (skb_new will point to the new packet and
  * skb was freed)
  */
-int frag_reassemble_skb(struct sk_buff *skb, struct bat_priv *bat_priv,
-                        struct sk_buff **new_skb)
+int batadv_frag_reassemble_skb(struct sk_buff *skb,
+                               struct batadv_priv *bat_priv,
+                               struct sk_buff **new_skb)
 {
-        struct orig_node *orig_node;
-        struct frag_packet_list_entry *tmp_frag_entry;
+        struct batadv_orig_node *orig_node;
+        struct batadv_frag_packet_list_entry *tmp_frag_entry;
         int ret = NET_RX_DROP;
-        struct unicast_frag_packet *unicast_packet =
-                (struct unicast_frag_packet *)skb->data;
+        struct batadv_unicast_frag_packet *unicast_packet;
 
+        unicast_packet = (struct batadv_unicast_frag_packet *)skb->data;
         *new_skb = NULL;
 
-        orig_node = orig_hash_find(bat_priv, unicast_packet->orig);
+        orig_node = batadv_orig_hash_find(bat_priv, unicast_packet->orig);
         if (!orig_node)
                 goto out;
 
         orig_node->last_frag_packet = jiffies;
 
         if (list_empty(&orig_node->frag_list) &&
-            frag_create_buffer(&orig_node->frag_list)) {
+            batadv_frag_create_buffer(&orig_node->frag_list)) {
                 pr_debug("couldn't create frag buffer\n");
                 goto out;
         }
 
-        tmp_frag_entry = frag_search_packet(&orig_node->frag_list,
-                                            unicast_packet);
+        tmp_frag_entry = batadv_frag_search_packet(&orig_node->frag_list,
+                                                   unicast_packet);
 
         if (!tmp_frag_entry) {
-                frag_create_entry(&orig_node->frag_list, skb);
+                batadv_frag_create_entry(&orig_node->frag_list, skb);
                 ret = NET_RX_SUCCESS;
                 goto out;
         }
 
-        *new_skb = frag_merge_packet(&orig_node->frag_list, tmp_frag_entry,
-                                     skb);
+        *new_skb = batadv_frag_merge_packet(&orig_node->frag_list,
+                                            tmp_frag_entry, skb);
         /* if not, merge failed */
         if (*new_skb)
                 ret = NET_RX_SUCCESS;
 
 out:
         if (orig_node)
-                orig_node_free_ref(orig_node);
+                batadv_orig_node_free_ref(orig_node);
         return ret;
 }
 
-int frag_send_skb(struct sk_buff *skb, struct bat_priv *bat_priv,
-                  struct hard_iface *hard_iface, const uint8_t dstaddr[])
+int batadv_frag_send_skb(struct sk_buff *skb, struct batadv_priv *bat_priv,
+                         struct batadv_hard_iface *hard_iface,
+                         const uint8_t dstaddr[])
 {
-        struct unicast_packet tmp_uc, *unicast_packet;
-        struct hard_iface *primary_if;
+        struct batadv_unicast_packet tmp_uc, *unicast_packet;
+        struct batadv_hard_iface *primary_if;
         struct sk_buff *frag_skb;
-        struct unicast_frag_packet *frag1, *frag2;
+        struct batadv_unicast_frag_packet *frag1, *frag2;
         int uc_hdr_len = sizeof(*unicast_packet);
         int ucf_hdr_len = sizeof(*frag1);
         int data_len = skb->len - uc_hdr_len;
         int large_tail = 0, ret = NET_RX_DROP;
         uint16_t seqno;
 
-        primary_if = primary_if_get_selected(bat_priv);
+        primary_if = batadv_primary_if_get_selected(bat_priv);
         if (!primary_if)
                 goto dropped;
 
@@ -238,38 +243,38 @@ int frag_send_skb(struct sk_buff *skb, struct bat_priv *bat_priv,
                 goto dropped;
         skb_reserve(frag_skb, ucf_hdr_len);
 
-        unicast_packet = (struct unicast_packet *)skb->data;
+        unicast_packet = (struct batadv_unicast_packet *)skb->data;
         memcpy(&tmp_uc, unicast_packet, uc_hdr_len);
         skb_split(skb, frag_skb, data_len / 2 + uc_hdr_len);
 
-        if (my_skb_head_push(skb, ucf_hdr_len - uc_hdr_len) < 0 ||
-            my_skb_head_push(frag_skb, ucf_hdr_len) < 0)
+        if (batadv_skb_head_push(skb, ucf_hdr_len - uc_hdr_len) < 0 ||
+            batadv_skb_head_push(frag_skb, ucf_hdr_len) < 0)
                 goto drop_frag;
 
-        frag1 = (struct unicast_frag_packet *)skb->data;
-        frag2 = (struct unicast_frag_packet *)frag_skb->data;
+        frag1 = (struct batadv_unicast_frag_packet *)skb->data;
+        frag2 = (struct batadv_unicast_frag_packet *)frag_skb->data;
 
         memcpy(frag1, &tmp_uc, sizeof(tmp_uc));
 
         frag1->header.ttl--;
-        frag1->header.version = COMPAT_VERSION;
-        frag1->header.packet_type = BAT_UNICAST_FRAG;
+        frag1->header.version = BATADV_COMPAT_VERSION;
+        frag1->header.packet_type = BATADV_UNICAST_FRAG;
 
         memcpy(frag1->orig, primary_if->net_dev->dev_addr, ETH_ALEN);
         memcpy(frag2, frag1, sizeof(*frag2));
 
         if (data_len & 1)
-                large_tail = UNI_FRAG_LARGETAIL;
+                large_tail = BATADV_UNI_FRAG_LARGETAIL;
 
-        frag1->flags = UNI_FRAG_HEAD | large_tail;
+        frag1->flags = BATADV_UNI_FRAG_HEAD | large_tail;
         frag2->flags = large_tail;
 
         seqno = atomic_add_return(2, &hard_iface->frag_seqno);
         frag1->seqno = htons(seqno - 1);
         frag2->seqno = htons(seqno);
 
-        send_skb_packet(skb, hard_iface, dstaddr);
-        send_skb_packet(frag_skb, hard_iface, dstaddr);
+        batadv_send_skb_packet(skb, hard_iface, dstaddr);
+        batadv_send_skb_packet(frag_skb, hard_iface, dstaddr);
         ret = NET_RX_SUCCESS;
         goto out;
 
@@ -279,52 +284,53 @@ dropped:
         kfree_skb(skb);
 out:
         if (primary_if)
-                hardif_free_ref(primary_if);
+                batadv_hardif_free_ref(primary_if);
         return ret;
 }
 
-int unicast_send_skb(struct sk_buff *skb, struct bat_priv *bat_priv)
+int batadv_unicast_send_skb(struct sk_buff *skb, struct batadv_priv *bat_priv)
 {
         struct ethhdr *ethhdr = (struct ethhdr *)skb->data;
-        struct unicast_packet *unicast_packet;
-        struct orig_node *orig_node;
-        struct neigh_node *neigh_node;
+        struct batadv_unicast_packet *unicast_packet;
+        struct batadv_orig_node *orig_node;
+        struct batadv_neigh_node *neigh_node;
         int data_len = skb->len;
         int ret = 1;
+        unsigned int dev_mtu;
 
         /* get routing information */
         if (is_multicast_ether_addr(ethhdr->h_dest)) {
-                orig_node = gw_get_selected_orig(bat_priv);
+                orig_node = batadv_gw_get_selected_orig(bat_priv);
                 if (orig_node)
                         goto find_router;
         }
 
         /* check for tt host - increases orig_node refcount.
-         * returns NULL in case of AP isolation */
-        orig_node = transtable_search(bat_priv, ethhdr->h_source,
-                                      ethhdr->h_dest);
+         * returns NULL in case of AP isolation
+         */
+        orig_node = batadv_transtable_search(bat_priv, ethhdr->h_source,
+                                             ethhdr->h_dest);
 
 find_router:
-        /**
-         * find_router():
+        /* find_router():
          *  - if orig_node is NULL it returns NULL
          *  - increases neigh_nodes refcount if found.
          */
-        neigh_node = find_router(bat_priv, orig_node, NULL);
+        neigh_node = batadv_find_router(bat_priv, orig_node, NULL);
 
         if (!neigh_node)
                 goto out;
 
-        if (my_skb_head_push(skb, sizeof(*unicast_packet)) < 0)
+        if (batadv_skb_head_push(skb, sizeof(*unicast_packet)) < 0)
                 goto out;
 
-        unicast_packet = (struct unicast_packet *)skb->data;
+        unicast_packet = (struct batadv_unicast_packet *)skb->data;
 
-        unicast_packet->header.version = COMPAT_VERSION;
+        unicast_packet->header.version = BATADV_COMPAT_VERSION;
         /* batman packet type: unicast */
-        unicast_packet->header.packet_type = BAT_UNICAST;
+        unicast_packet->header.packet_type = BATADV_UNICAST;
         /* set unicast ttl */
-        unicast_packet->header.ttl = TTL;
+        unicast_packet->header.ttl = BATADV_TTL;
         /* copy the destination for faster routing */
         memcpy(unicast_packet->dest, orig_node->orig, ETH_ALEN);
         /* set the destination tt version number */
@@ -336,28 +342,29 @@ find_router:
          * try to reroute it because the ttvn contained in the header is less
          * than the current one
          */
-        if (tt_global_client_is_roaming(bat_priv, ethhdr->h_dest))
+        if (batadv_tt_global_client_is_roaming(bat_priv, ethhdr->h_dest))
                 unicast_packet->ttvn = unicast_packet->ttvn - 1;
 
+        dev_mtu = neigh_node->if_incoming->net_dev->mtu;
         if (atomic_read(&bat_priv->fragmentation) &&
-            data_len + sizeof(*unicast_packet) >
-                                neigh_node->if_incoming->net_dev->mtu) {
+            data_len + sizeof(*unicast_packet) > dev_mtu) {
                 /* send frag skb decreases ttl */
                 unicast_packet->header.ttl++;
-                ret = frag_send_skb(skb, bat_priv,
-                                    neigh_node->if_incoming, neigh_node->addr);
+                ret = batadv_frag_send_skb(skb, bat_priv,
+                                           neigh_node->if_incoming,
+                                           neigh_node->addr);
                 goto out;
         }
 
-        send_skb_packet(skb, neigh_node->if_incoming, neigh_node->addr);
+        batadv_send_skb_packet(skb, neigh_node->if_incoming, neigh_node->addr);
         ret = 0;
         goto out;
 
 out:
         if (neigh_node)
-                neigh_node_free_ref(neigh_node);
+                batadv_neigh_node_free_ref(neigh_node);
         if (orig_node)
-                orig_node_free_ref(orig_node);
+                batadv_orig_node_free_ref(orig_node);
         if (ret == 1)
                 kfree_skb(skb);
         return ret;
diff --git a/net/batman-adv/unicast.h b/net/batman-adv/unicast.h
index a9faf6b1db1..1c46e2eb1ef 100644
--- a/net/batman-adv/unicast.h
+++ b/net/batman-adv/unicast.h
@@ -1,5 +1,4 @@
-/*
- * Copyright (C) 2010-2012 B.A.T.M.A.N. contributors:
+/* Copyright (C) 2010-2012 B.A.T.M.A.N. contributors:
  *
  * Andreas Langer
  *
@@ -16,7 +15,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA
- *
  */
 
 #ifndef _NET_BATMAN_ADV_UNICAST_H_
@@ -24,33 +22,35 @@
 
 #include "packet.h"
 
-#define FRAG_TIMEOUT 10000      /* purge frag list entries after time in ms */
-#define FRAG_BUFFER_SIZE 6      /* number of list elements in buffer */
+#define BATADV_FRAG_TIMEOUT 10000 /* purge frag list entries after time in ms */
+#define BATADV_FRAG_BUFFER_SIZE 6 /* number of list elements in buffer */
 
-int frag_reassemble_skb(struct sk_buff *skb, struct bat_priv *bat_priv,
-                        struct sk_buff **new_skb);
-void frag_list_free(struct list_head *head);
-int unicast_send_skb(struct sk_buff *skb, struct bat_priv *bat_priv);
-int frag_send_skb(struct sk_buff *skb, struct bat_priv *bat_priv,
-                  struct hard_iface *hard_iface, const uint8_t dstaddr[]);
+int batadv_frag_reassemble_skb(struct sk_buff *skb,
+                               struct batadv_priv *bat_priv,
+                               struct sk_buff **new_skb);
+void batadv_frag_list_free(struct list_head *head);
+int batadv_unicast_send_skb(struct sk_buff *skb, struct batadv_priv *bat_priv);
+int batadv_frag_send_skb(struct sk_buff *skb, struct batadv_priv *bat_priv,
+                         struct batadv_hard_iface *hard_iface,
+                         const uint8_t dstaddr[]);
 
-static inline int frag_can_reassemble(const struct sk_buff *skb, int mtu)
+static inline int batadv_frag_can_reassemble(const struct sk_buff *skb, int mtu)
 {
-        const struct unicast_frag_packet *unicast_packet;
+        const struct batadv_unicast_frag_packet *unicast_packet;
         int uneven_correction = 0;
         unsigned int merged_size;
 
-        unicast_packet = (struct unicast_frag_packet *)skb->data;
+        unicast_packet = (struct batadv_unicast_frag_packet *)skb->data;
 
-        if (unicast_packet->flags & UNI_FRAG_LARGETAIL) {
-                if (unicast_packet->flags & UNI_FRAG_HEAD)
+        if (unicast_packet->flags & BATADV_UNI_FRAG_LARGETAIL) {
+                if (unicast_packet->flags & BATADV_UNI_FRAG_HEAD)
                         uneven_correction = 1;
                 else
                         uneven_correction = -1;
         }
 
         merged_size = (skb->len - sizeof(*unicast_packet)) * 2;
-        merged_size += sizeof(struct unicast_packet) + uneven_correction;
+        merged_size += sizeof(struct batadv_unicast_packet) + uneven_correction;
 
         return merged_size <= mtu;
 }
diff --git a/net/batman-adv/vis.c b/net/batman-adv/vis.c
index cec216fb77c..2a2ea068146 100644
--- a/net/batman-adv/vis.c
+++ b/net/batman-adv/vis.c
@@ -1,5 +1,4 @@
-/*
- * Copyright (C) 2008-2012 B.A.T.M.A.N. contributors:
+/* Copyright (C) 2008-2012 B.A.T.M.A.N. contributors:
  *
  * Simon Wunderlich
  *
@@ -16,7 +15,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA
- *
  */
 
 #include "main.h"
@@ -28,16 +26,19 @@
 #include "hash.h"
 #include "originator.h"
 
-#define MAX_VIS_PACKET_SIZE 1000
+#define BATADV_MAX_VIS_PACKET_SIZE 1000
 
-static void start_vis_timer(struct bat_priv *bat_priv);
+static void batadv_start_vis_timer(struct batadv_priv *bat_priv);
 
 /* free the info */
-static void free_info(struct kref *ref)
+static void batadv_free_info(struct kref *ref)
 {
-        struct vis_info *info = container_of(ref, struct vis_info, refcount);
-        struct bat_priv *bat_priv = info->bat_priv;
-        struct recvlist_node *entry, *tmp;
+        struct batadv_vis_info *info;
+        struct batadv_priv *bat_priv;
+        struct batadv_recvlist_node *entry, *tmp;
+
+        info = container_of(ref, struct batadv_vis_info, refcount);
+        bat_priv = info->bat_priv;
 
         list_del_init(&info->send_list);
         spin_lock_bh(&bat_priv->vis_list_lock);
@@ -52,29 +53,30 @@ static void free_info(struct kref *ref)
 }
 
 /* Compare two vis packets, used by the hashing algorithm */
-static int vis_info_cmp(const struct hlist_node *node, const void *data2)
+static int batadv_vis_info_cmp(const struct hlist_node *node, const void *data2)
 {
-        const struct vis_info *d1, *d2;
-        const struct vis_packet *p1, *p2;
+        const struct batadv_vis_info *d1, *d2;
+        const struct batadv_vis_packet *p1, *p2;
 
-        d1 = container_of(node, struct vis_info, hash_entry);
+        d1 = container_of(node, struct batadv_vis_info, hash_entry);
         d2 = data2;
-        p1 = (struct vis_packet *)d1->skb_packet->data;
-        p2 = (struct vis_packet *)d2->skb_packet->data;
-        return compare_eth(p1->vis_orig, p2->vis_orig);
+        p1 = (struct batadv_vis_packet *)d1->skb_packet->data;
+        p2 = (struct batadv_vis_packet *)d2->skb_packet->data;
+        return batadv_compare_eth(p1->vis_orig, p2->vis_orig);
 }
 
-/* hash function to choose an entry in a hash table of given size */
-/* hash algorithm from http://en.wikipedia.org/wiki/Hash_table */
-static uint32_t vis_info_choose(const void *data, uint32_t size)
+/* hash function to choose an entry in a hash table of given size
+ * hash algorithm from http://en.wikipedia.org/wiki/Hash_table
+ */
+static uint32_t batadv_vis_info_choose(const void *data, uint32_t size)
 {
-        const struct vis_info *vis_info = data;
-        const struct vis_packet *packet;
+        const struct batadv_vis_info *vis_info = data;
+        const struct batadv_vis_packet *packet;
         const unsigned char *key;
         uint32_t hash = 0;
         size_t i;
 
-        packet = (struct vis_packet *)vis_info->skb_packet->data;
+        packet = (struct batadv_vis_packet *)vis_info->skb_packet->data;
         key = packet->vis_orig;
         for (i = 0; i < ETH_ALEN; i++) {
                 hash += key[i];
@@ -89,24 +91,24 @@ static uint32_t vis_info_choose(const void *data, uint32_t size)
         return hash % size;
 }
 
-static struct vis_info *vis_hash_find(struct bat_priv *bat_priv,
-                                      const void *data)
+static struct batadv_vis_info *
+batadv_vis_hash_find(struct batadv_priv *bat_priv, const void *data)
 {
-        struct hashtable_t *hash = bat_priv->vis_hash;
+        struct batadv_hashtable *hash = bat_priv->vis_hash;
         struct hlist_head *head;
         struct hlist_node *node;
-        struct vis_info *vis_info, *vis_info_tmp = NULL;
+        struct batadv_vis_info *vis_info, *vis_info_tmp = NULL;
         uint32_t index;
 
         if (!hash)
                 return NULL;
 
-        index = vis_info_choose(data, hash->size);
+        index = batadv_vis_info_choose(data, hash->size);
         head = &hash->table[index];
 
         rcu_read_lock();
         hlist_for_each_entry_rcu(vis_info, node, head, hash_entry) {
-                if (!vis_info_cmp(node, data))
+                if (!batadv_vis_info_cmp(node, data))
                         continue;
 
                 vis_info_tmp = vis_info;
@@ -118,16 +120,17 @@ static struct vis_info *vis_hash_find(struct bat_priv *bat_priv,
 }
 
 /* insert interface to the list of interfaces of one originator, if it
- * does not already exist in the list */
-static void vis_data_insert_interface(const uint8_t *interface,
-                                      struct hlist_head *if_list,
-                                      bool primary)
+ * does not already exist in the list
+ */
+static void batadv_vis_data_insert_interface(const uint8_t *interface,
+                                             struct hlist_head *if_list,
+                                             bool primary)
 {
-        struct if_list_entry *entry;
+        struct batadv_if_list_entry *entry;
         struct hlist_node *pos;
 
         hlist_for_each_entry(entry, pos, if_list, list) {
-                if (compare_eth(entry->addr, interface))
+                if (batadv_compare_eth(entry->addr, interface))
                         return;
         }
 
@@ -140,195 +143,145 @@ static void vis_data_insert_interface(const uint8_t *interface,
         hlist_add_head(&entry->list, if_list);
 }
 
-static ssize_t vis_data_read_prim_sec(char *buff,
-                                      const struct hlist_head *if_list)
+static void batadv_vis_data_read_prim_sec(struct seq_file *seq,
+                                          const struct hlist_head *if_list)
 {
-        struct if_list_entry *entry;
+        struct batadv_if_list_entry *entry;
         struct hlist_node *pos;
-        size_t len = 0;
 
         hlist_for_each_entry(entry, pos, if_list, list) {
                 if (entry->primary)
-                        len += sprintf(buff + len, "PRIMARY, ");
+                        seq_printf(seq, "PRIMARY, ");
                 else
-                        len += sprintf(buff + len,  "SEC %pM, ", entry->addr);
+                        seq_printf(seq,  "SEC %pM, ", entry->addr);
         }
+}
 
-        return len;
+/* read an entry  */
+static ssize_t
+batadv_vis_data_read_entry(struct seq_file *seq,
+                           const struct batadv_vis_info_entry *entry,
+                           const uint8_t *src, bool primary)
+{
+        if (primary && entry->quality == 0)
+                return seq_printf(seq, "TT %pM, ", entry->dest);
+        else if (batadv_compare_eth(entry->src, src))
+                return seq_printf(seq, "TQ %pM %d, ", entry->dest,
+                                  entry->quality);
+
+        return 0;
 }
 
-static size_t vis_data_count_prim_sec(struct hlist_head *if_list)
+static void
+batadv_vis_data_insert_interfaces(struct hlist_head *list,
+                                  struct batadv_vis_packet *packet,
+                                  struct batadv_vis_info_entry *entries)
 {
-        struct if_list_entry *entry;
-        struct hlist_node *pos;
-        size_t count = 0;
+        int i;
 
-        hlist_for_each_entry(entry, pos, if_list, list) {
-                if (entry->primary)
-                        count += 9;
-                else
-                        count += 23;
-        }
+        for (i = 0; i < packet->entries; i++) {
+                if (entries[i].quality == 0)
+                        continue;
 
-        return count;
+                if (batadv_compare_eth(entries[i].src, packet->vis_orig))
+                        continue;
+
+                batadv_vis_data_insert_interface(entries[i].src, list, false);
+        }
 }
 
-/* read an entry  */
-static ssize_t vis_data_read_entry(char *buff,
-                                   const struct vis_info_entry *entry,
-                                   const uint8_t *src, bool primary)
+static void batadv_vis_data_read_entries(struct seq_file *seq,
+                                         struct hlist_head *list,
+                                         struct batadv_vis_packet *packet,
+                                         struct batadv_vis_info_entry *entries)
 {
-        /* maximal length: max(4+17+2, 3+17+1+3+2) == 26 */
-        if (primary && entry->quality == 0)
-                return sprintf(buff, "TT %pM, ", entry->dest);
-        else if (compare_eth(entry->src, src))
-                return sprintf(buff, "TQ %pM %d, ", entry->dest,
-                               entry->quality);
+        int i;
+        struct batadv_if_list_entry *entry;
+        struct hlist_node *pos;
 
-        return 0;
+        hlist_for_each_entry(entry, pos, list, list) {
+                seq_printf(seq, "%pM,", entry->addr);
+
+                for (i = 0; i < packet->entries; i++)
+                        batadv_vis_data_read_entry(seq, &entries[i],
+                                                   entry->addr, entry->primary);
+
+                /* add primary/secondary records */
+                if (batadv_compare_eth(entry->addr, packet->vis_orig))
+                        batadv_vis_data_read_prim_sec(seq, list);
+
+                seq_printf(seq, "\n");
+        }
 }
 
-int vis_seq_print_text(struct seq_file *seq, void *offset)
+static void batadv_vis_seq_print_text_bucket(struct seq_file *seq,
+                                             const struct hlist_head *head)
 {
-        struct hard_iface *primary_if;
         struct hlist_node *node;
+        struct batadv_vis_info *info;
+        struct batadv_vis_packet *packet;
+        uint8_t *entries_pos;
+        struct batadv_vis_info_entry *entries;
+        struct batadv_if_list_entry *entry;
+        struct hlist_node *pos, *n;
+
+        HLIST_HEAD(vis_if_list);
+
+        hlist_for_each_entry_rcu(info, node, head, hash_entry) {
+                packet = (struct batadv_vis_packet *)info->skb_packet->data;
+                entries_pos = (uint8_t *)packet + sizeof(*packet);
+                entries = (struct batadv_vis_info_entry *)entries_pos;
+
+                batadv_vis_data_insert_interface(packet->vis_orig, &vis_if_list,
+                                                 true);
+                batadv_vis_data_insert_interfaces(&vis_if_list, packet,
+                                                  entries);
+                batadv_vis_data_read_entries(seq, &vis_if_list, packet,
+                                             entries);
+
+                hlist_for_each_entry_safe(entry, pos, n, &vis_if_list, list) {
+                        hlist_del(&entry->list);
+                        kfree(entry);
+                }
+        }
+}
+
+int batadv_vis_seq_print_text(struct seq_file *seq, void *offset)
+{
+        struct batadv_hard_iface *primary_if;
         struct hlist_head *head;
-        struct vis_info *info;
-        struct vis_packet *packet;
-        struct vis_info_entry *entries;
         struct net_device *net_dev = (struct net_device *)seq->private;
-        struct bat_priv *bat_priv = netdev_priv(net_dev);
-        struct hashtable_t *hash = bat_priv->vis_hash;
-        HLIST_HEAD(vis_if_list);
-        struct if_list_entry *entry;
-        struct hlist_node *pos, *n;
+        struct batadv_priv *bat_priv = netdev_priv(net_dev);
+        struct batadv_hashtable *hash = bat_priv->vis_hash;
         uint32_t i;
-        int j, ret = 0;
+        int ret = 0;
         int vis_server = atomic_read(&bat_priv->vis_mode);
-        size_t buff_pos, buf_size;
-        char *buff;
-        int compare;
 
-        primary_if = primary_if_get_selected(bat_priv);
+        primary_if = batadv_primary_if_get_selected(bat_priv);
         if (!primary_if)
                 goto out;
 
-        if (vis_server == VIS_TYPE_CLIENT_UPDATE)
+        if (vis_server == BATADV_VIS_TYPE_CLIENT_UPDATE)
                 goto out;
 
-        buf_size = 1;
-        /* Estimate length */
         spin_lock_bh(&bat_priv->vis_hash_lock);
         for (i = 0; i < hash->size; i++) {
                 head = &hash->table[i];
-
-                rcu_read_lock();
-                hlist_for_each_entry_rcu(info, node, head, hash_entry) {
-                        packet = (struct vis_packet *)info->skb_packet->data;
-                        entries = (struct vis_info_entry *)
-                                ((char *)packet + sizeof(*packet));
-
-                        for (j = 0; j < packet->entries; j++) {
-                                if (entries[j].quality == 0)
-                                        continue;
-                                compare =
-                                 compare_eth(entries[j].src, packet->vis_orig);
-                                vis_data_insert_interface(entries[j].src,
-                                                          &vis_if_list,
-                                                          compare);
-                        }
-
-                        hlist_for_each_entry(entry, pos, &vis_if_list, list) {
-                                buf_size += 18 + 26 * packet->entries;
-
-                                /* add primary/secondary records */
-                                if (compare_eth(entry->addr, packet->vis_orig))
-                                        buf_size +=
-                                          vis_data_count_prim_sec(&vis_if_list);
-
-                                buf_size += 1;
-                        }
-
-                        hlist_for_each_entry_safe(entry, pos, n, &vis_if_list,
-                                                  list) {
-                                hlist_del(&entry->list);
-                                kfree(entry);
-                        }
-                }
-                rcu_read_unlock();
-        }
-
-        buff = kmalloc(buf_size, GFP_ATOMIC);
-        if (!buff) {
-                spin_unlock_bh(&bat_priv->vis_hash_lock);
-                ret = -ENOMEM;
-                goto out;
-        }
-        buff[0] = '\0';
-        buff_pos = 0;
-
-        for (i = 0; i < hash->size; i++) {
-                head = &hash->table[i];
-
-                rcu_read_lock();
-                hlist_for_each_entry_rcu(info, node, head, hash_entry) {
-                        packet = (struct vis_packet *)info->skb_packet->data;
-                        entries = (struct vis_info_entry *)
-                                ((char *)packet + sizeof(*packet));
-
-                        for (j = 0; j < packet->entries; j++) {
-                                if (entries[j].quality == 0)
-                                        continue;
-                                compare =
-                                 compare_eth(entries[j].src, packet->vis_orig);
-                                vis_data_insert_interface(entries[j].src,
-                                                          &vis_if_list,
-                                                          compare);
-                        }
-
-                        hlist_for_each_entry(entry, pos, &vis_if_list, list) {
-                                buff_pos += sprintf(buff + buff_pos, "%pM,",
-                                                entry->addr);
-
-                                for (j = 0; j < packet->entries; j++)
-                                        buff_pos += vis_data_read_entry(
-                                                        buff + buff_pos,
-                                                        &entries[j],
-                                                        entry->addr,
-                                                        entry->primary);
-
-                                /* add primary/secondary records */
-                                if (compare_eth(entry->addr, packet->vis_orig))
-                                        buff_pos +=
-                                         vis_data_read_prim_sec(buff + buff_pos,
-                                                                &vis_if_list);
-
-                                buff_pos += sprintf(buff + buff_pos, "\n");
-                        }
-
-                        hlist_for_each_entry_safe(entry, pos, n, &vis_if_list,
-                                                  list) {
-                                hlist_del(&entry->list);
-                                kfree(entry);
-                        }
-                }
-                rcu_read_unlock();
+                batadv_vis_seq_print_text_bucket(seq, head);
         }
-
         spin_unlock_bh(&bat_priv->vis_hash_lock);
 
-        seq_printf(seq, "%s", buff);
-        kfree(buff);
-
 out:
         if (primary_if)
-                hardif_free_ref(primary_if);
+                batadv_hardif_free_ref(primary_if);
         return ret;
 }
 
 /* add the info packet to the send list, if it was not
- * already linked in. */
-static void send_list_add(struct bat_priv *bat_priv, struct vis_info *info)
+ * already linked in.
+ */
+static void batadv_send_list_add(struct batadv_priv *bat_priv,
+                                 struct batadv_vis_info *info)
 {
         if (list_empty(&info->send_list)) {
                 kref_get(&info->refcount);
@@ -337,20 +290,21 @@ static void send_list_add(struct bat_priv *bat_priv, struct vis_info *info)
 }
 
 /* delete the info packet from the send list, if it was
- * linked in. */
-static void send_list_del(struct vis_info *info)
+ * linked in.
+ */
+static void batadv_send_list_del(struct batadv_vis_info *info)
 {
         if (!list_empty(&info->send_list)) {
                 list_del_init(&info->send_list);
-                kref_put(&info->refcount, free_info);
+                kref_put(&info->refcount, batadv_free_info);
         }
 }
 
 /* tries to add one entry to the receive list. */
-static void recv_list_add(struct bat_priv *bat_priv,
-                          struct list_head *recv_list, const char *mac)
+static void batadv_recv_list_add(struct batadv_priv *bat_priv,
+                                 struct list_head *recv_list, const char *mac)
 {
-        struct recvlist_node *entry;
+        struct batadv_recvlist_node *entry;
 
         entry = kmalloc(sizeof(*entry), GFP_ATOMIC);
         if (!entry)
@@ -363,14 +317,15 @@ static void recv_list_add(struct bat_priv *bat_priv,
 }
 
 /* returns 1 if this mac is in the recv_list */
-static int recv_list_is_in(struct bat_priv *bat_priv,
-                           const struct list_head *recv_list, const char *mac)
+static int batadv_recv_list_is_in(struct batadv_priv *bat_priv,
+                                  const struct list_head *recv_list,
+                                  const char *mac)
 {
-        const struct recvlist_node *entry;
+        const struct batadv_recvlist_node *entry;
 
         spin_lock_bh(&bat_priv->vis_list_lock);
         list_for_each_entry(entry, recv_list, list) {
-                if (compare_eth(entry->mac, mac)) {
+                if (batadv_compare_eth(entry->mac, mac)) {
                         spin_unlock_bh(&bat_priv->vis_list_lock);
                         return 1;
                 }
@@ -381,17 +336,21 @@ static int recv_list_is_in(struct bat_priv *bat_priv,
 
 /* try to add the packet to the vis_hash. return NULL if invalid (e.g. too old,
  * broken.. ).  vis hash must be locked outside.  is_new is set when the packet
- * is newer than old entries in the hash. */
-static struct vis_info *add_packet(struct bat_priv *bat_priv,
-                                   struct vis_packet *vis_packet,
-                                   int vis_info_len, int *is_new,
-                                   int make_broadcast)
+ * is newer than old entries in the hash.
+ */
+static struct batadv_vis_info *
+batadv_add_packet(struct batadv_priv *bat_priv,
+                  struct batadv_vis_packet *vis_packet, int vis_info_len,
+                  int *is_new, int make_broadcast)
 {
-        struct vis_info *info, *old_info;
-        struct vis_packet *search_packet, *old_packet;
-        struct vis_info search_elem;
-        struct vis_packet *packet;
+        struct batadv_vis_info *info, *old_info;
+        struct batadv_vis_packet *search_packet, *old_packet;
+        struct batadv_vis_info search_elem;
+        struct batadv_vis_packet *packet;
+        struct sk_buff *tmp_skb;
         int hash_added;
+        size_t len;
+        size_t max_entries;
 
         *is_new = 0;
         /* sanity check */
@@ -402,20 +361,23 @@ static struct vis_info *add_packet(struct bat_priv *bat_priv,
         search_elem.skb_packet = dev_alloc_skb(sizeof(*search_packet));
         if (!search_elem.skb_packet)
                 return NULL;
-        search_packet = (struct vis_packet *)skb_put(search_elem.skb_packet,
-                                                     sizeof(*search_packet));
+        len = sizeof(*search_packet);
+        tmp_skb = search_elem.skb_packet;
+        search_packet = (struct batadv_vis_packet *)skb_put(tmp_skb, len);
 
         memcpy(search_packet->vis_orig, vis_packet->vis_orig, ETH_ALEN);
-        old_info = vis_hash_find(bat_priv, &search_elem);
+        old_info = batadv_vis_hash_find(bat_priv, &search_elem);
         kfree_skb(search_elem.skb_packet);
 
         if (old_info) {
-                old_packet = (struct vis_packet *)old_info->skb_packet->data;
-                if (!seq_after(ntohl(vis_packet->seqno),
-                               ntohl(old_packet->seqno))) {
+                tmp_skb = old_info->skb_packet;
+                old_packet = (struct batadv_vis_packet *)tmp_skb->data;
+                if (!batadv_seq_after(ntohl(vis_packet->seqno),
+                                      ntohl(old_packet->seqno))) {
                         if (old_packet->seqno == vis_packet->seqno) {
-                                recv_list_add(bat_priv, &old_info->recv_list,
-                                              vis_packet->sender_orig);
+                                batadv_recv_list_add(bat_priv,
+                                                     &old_info->recv_list,
+                                                     vis_packet->sender_orig);
                                 return old_info;
                         } else {
                                 /* newer packet is already in hash. */
@@ -423,52 +385,53 @@ static struct vis_info *add_packet(struct bat_priv *bat_priv,
                         }
                 }
                 /* remove old entry */
-                hash_remove(bat_priv->vis_hash, vis_info_cmp, vis_info_choose,
-                            old_info);
-                send_list_del(old_info);
-                kref_put(&old_info->refcount, free_info);
+                batadv_hash_remove(bat_priv->vis_hash, batadv_vis_info_cmp,
+                                   batadv_vis_info_choose, old_info);
+                batadv_send_list_del(old_info);
+                kref_put(&old_info->refcount, batadv_free_info);
         }
 
         info = kmalloc(sizeof(*info), GFP_ATOMIC);
         if (!info)
                 return NULL;
 
-        info->skb_packet = dev_alloc_skb(sizeof(*packet) + vis_info_len +
-                                         ETH_HLEN);
+        len = sizeof(*packet) + vis_info_len;
+        info->skb_packet = dev_alloc_skb(len + ETH_HLEN);
         if (!info->skb_packet) {
                 kfree(info);
                 return NULL;
         }
         skb_reserve(info->skb_packet, ETH_HLEN);
-        packet = (struct vis_packet *)skb_put(info->skb_packet, sizeof(*packet)
-                                              + vis_info_len);
+        packet = (struct batadv_vis_packet *)skb_put(info->skb_packet, len);
 
         kref_init(&info->refcount);
         INIT_LIST_HEAD(&info->send_list);
         INIT_LIST_HEAD(&info->recv_list);
         info->first_seen = jiffies;
         info->bat_priv = bat_priv;
-        memcpy(packet, vis_packet, sizeof(*packet) + vis_info_len);
+        memcpy(packet, vis_packet, len);
 
         /* initialize and add new packet. */
         *is_new = 1;
 
         /* Make it a broadcast packet, if required */
         if (make_broadcast)
-                memcpy(packet->target_orig, broadcast_addr, ETH_ALEN);
+                memcpy(packet->target_orig, batadv_broadcast_addr, ETH_ALEN);
 
         /* repair if entries is longer than packet. */
-        if (packet->entries * sizeof(struct vis_info_entry) > vis_info_len)
-                packet->entries = vis_info_len / sizeof(struct vis_info_entry);
+        max_entries = vis_info_len / sizeof(struct batadv_vis_info_entry);
+        if (packet->entries > max_entries)
+                packet->entries = max_entries;
 
-        recv_list_add(bat_priv, &info->recv_list, packet->sender_orig);
+        batadv_recv_list_add(bat_priv, &info->recv_list, packet->sender_orig);
 
         /* try to add it */
-        hash_added = hash_add(bat_priv->vis_hash, vis_info_cmp, vis_info_choose,
-                              info, &info->hash_entry);
+        hash_added = batadv_hash_add(bat_priv->vis_hash, batadv_vis_info_cmp,
+                                     batadv_vis_info_choose, info,
+                                     &info->hash_entry);
         if (hash_added != 0) {
                 /* did not work (for some reason) */
-                kref_put(&info->refcount, free_info);
+                kref_put(&info->refcount, batadv_free_info);
                 info = NULL;
         }
 
@@ -476,37 +439,38 @@ static struct vis_info *add_packet(struct bat_priv *bat_priv,
 }
 
 /* handle the server sync packet, forward if needed. */
-void receive_server_sync_packet(struct bat_priv *bat_priv,
-                                struct vis_packet *vis_packet,
-                                int vis_info_len)
+void batadv_receive_server_sync_packet(struct batadv_priv *bat_priv,
+                                       struct batadv_vis_packet *vis_packet,
+                                       int vis_info_len)
 {
-        struct vis_info *info;
+        struct batadv_vis_info *info;
         int is_new, make_broadcast;
         int vis_server = atomic_read(&bat_priv->vis_mode);
 
-        make_broadcast = (vis_server == VIS_TYPE_SERVER_SYNC);
+        make_broadcast = (vis_server == BATADV_VIS_TYPE_SERVER_SYNC);
 
         spin_lock_bh(&bat_priv->vis_hash_lock);
-        info = add_packet(bat_priv, vis_packet, vis_info_len,
-                          &is_new, make_broadcast);
+        info = batadv_add_packet(bat_priv, vis_packet, vis_info_len,
+                                 &is_new, make_broadcast);
         if (!info)
                 goto end;
 
         /* only if we are server ourselves and packet is newer than the one in
-         * hash.*/
-        if (vis_server == VIS_TYPE_SERVER_SYNC && is_new)
-                send_list_add(bat_priv, info);
+         * hash.
+         */
+        if (vis_server == BATADV_VIS_TYPE_SERVER_SYNC && is_new)
+                batadv_send_list_add(bat_priv, info);
 end:
         spin_unlock_bh(&bat_priv->vis_hash_lock);
 }
 
 /* handle an incoming client update packet and schedule forward if needed. */
-void receive_client_update_packet(struct bat_priv *bat_priv,
-                                  struct vis_packet *vis_packet,
-                                  int vis_info_len)
+void batadv_receive_client_update_packet(struct batadv_priv *bat_priv,
+                                         struct batadv_vis_packet *vis_packet,
+                                         int vis_info_len)
 {
-        struct vis_info *info;
-        struct vis_packet *packet;
+        struct batadv_vis_info *info;
+        struct batadv_vis_packet *packet;
         int is_new;
         int vis_server = atomic_read(&bat_priv->vis_mode);
         int are_target = 0;
@@ -516,28 +480,28 @@ void receive_client_update_packet(struct bat_priv *bat_priv,
                 return;
 
         /* Are we the target for this VIS packet? */
-        if (vis_server == VIS_TYPE_SERVER_SYNC  &&
-            is_my_mac(vis_packet->target_orig))
+        if (vis_server == BATADV_VIS_TYPE_SERVER_SYNC   &&
+            batadv_is_my_mac(vis_packet->target_orig))
                 are_target = 1;
 
         spin_lock_bh(&bat_priv->vis_hash_lock);
-        info = add_packet(bat_priv, vis_packet, vis_info_len,
-                          &is_new, are_target);
+        info = batadv_add_packet(bat_priv, vis_packet, vis_info_len,
+                                 &is_new, are_target);
 
         if (!info)
                 goto end;
         /* note that outdated packets will be dropped at this point. */
 
-        packet = (struct vis_packet *)info->skb_packet->data;
+        packet = (struct batadv_vis_packet *)info->skb_packet->data;
 
         /* send only if we're the target server or ... */
         if (are_target && is_new) {
-                packet->vis_type = VIS_TYPE_SERVER_SYNC;        /* upgrade! */
-                send_list_add(bat_priv, info);
+                packet->vis_type = BATADV_VIS_TYPE_SERVER_SYNC; /* upgrade! */
+                batadv_send_list_add(bat_priv, info);
 
                 /* ... we're not the recipient (and thus need to forward). */
-        } else if (!is_my_mac(packet->target_orig)) {
-                send_list_add(bat_priv, info);
+        } else if (!batadv_is_my_mac(packet->target_orig)) {
+                batadv_send_list_add(bat_priv, info);
         }
 
 end:
@@ -547,37 +511,38 @@ end:
 /* Walk the originators and find the VIS server with the best tq. Set the packet
  * address to its address and return the best_tq.
  *
- * Must be called with the originator hash locked */
-static int find_best_vis_server(struct bat_priv *bat_priv,
-                                struct vis_info *info)
+ * Must be called with the originator hash locked
+ */
+static int batadv_find_best_vis_server(struct batadv_priv *bat_priv,
+                                       struct batadv_vis_info *info)
 {
-        struct hashtable_t *hash = bat_priv->orig_hash;
-        struct neigh_node *router;
+        struct batadv_hashtable *hash = bat_priv->orig_hash;
+        struct batadv_neigh_node *router;
         struct hlist_node *node;
         struct hlist_head *head;
-        struct orig_node *orig_node;
-        struct vis_packet *packet;
+        struct batadv_orig_node *orig_node;
+        struct batadv_vis_packet *packet;
         int best_tq = -1;
         uint32_t i;
 
-        packet = (struct vis_packet *)info->skb_packet->data;
+        packet = (struct batadv_vis_packet *)info->skb_packet->data;
 
         for (i = 0; i < hash->size; i++) {
                 head = &hash->table[i];
 
                 rcu_read_lock();
                 hlist_for_each_entry_rcu(orig_node, node, head, hash_entry) {
-                        router = orig_node_get_router(orig_node);
+                        router = batadv_orig_node_get_router(orig_node);
                         if (!router)
                                 continue;
 
-                        if ((orig_node->flags & VIS_SERVER) &&
+                        if ((orig_node->flags & BATADV_VIS_SERVER) &&
                             (router->tq_avg > best_tq)) {
                                 best_tq = router->tq_avg;
                                 memcpy(packet->target_orig, orig_node->orig,
                                        ETH_ALEN);
                         }
-                        neigh_node_free_ref(router);
+                        batadv_neigh_node_free_ref(router);
                 }
                 rcu_read_unlock();
         }
@@ -586,47 +551,52 @@ static int find_best_vis_server(struct bat_priv *bat_priv,
 }
 
 /* Return true if the vis packet is full. */
-static bool vis_packet_full(const struct vis_info *info)
+static bool batadv_vis_packet_full(const struct batadv_vis_info *info)
 {
-        const struct vis_packet *packet;
-        packet = (struct vis_packet *)info->skb_packet->data;
+        const struct batadv_vis_packet *packet;
+        size_t num;
+
+        packet = (struct batadv_vis_packet *)info->skb_packet->data;
+        num = BATADV_MAX_VIS_PACKET_SIZE / sizeof(struct batadv_vis_info_entry);
 
-        if (MAX_VIS_PACKET_SIZE / sizeof(struct vis_info_entry)
-                < packet->entries + 1)
+        if (num < packet->entries + 1)
                 return true;
         return false;
 }
 
 /* generates a packet of own vis data,
- * returns 0 on success, -1 if no packet could be generated */
-static int generate_vis_packet(struct bat_priv *bat_priv)
+ * returns 0 on success, -1 if no packet could be generated
+ */
+static int batadv_generate_vis_packet(struct batadv_priv *bat_priv)
 {
-        struct hashtable_t *hash = bat_priv->orig_hash;
+        struct batadv_hashtable *hash = bat_priv->orig_hash;
         struct hlist_node *node;
         struct hlist_head *head;
-        struct orig_node *orig_node;
-        struct neigh_node *router;
-        struct vis_info *info = bat_priv->my_vis_info;
-        struct vis_packet *packet = (struct vis_packet *)info->skb_packet->data;
-        struct vis_info_entry *entry;
-        struct tt_common_entry *tt_common_entry;
+        struct batadv_orig_node *orig_node;
+        struct batadv_neigh_node *router;
+        struct batadv_vis_info *info = bat_priv->my_vis_info;
+        struct batadv_vis_packet *packet;
+        struct batadv_vis_info_entry *entry;
+        struct batadv_tt_common_entry *tt_common_entry;
         int best_tq = -1;
         uint32_t i;
 
         info->first_seen = jiffies;
+        packet = (struct batadv_vis_packet *)info->skb_packet->data;
         packet->vis_type = atomic_read(&bat_priv->vis_mode);
 
-        memcpy(packet->target_orig, broadcast_addr, ETH_ALEN);
-        packet->header.ttl = TTL;
+        memcpy(packet->target_orig, batadv_broadcast_addr, ETH_ALEN);
+        packet->header.ttl = BATADV_TTL;
         packet->seqno = htonl(ntohl(packet->seqno) + 1);
         packet->entries = 0;
+        packet->reserved = 0;
         skb_trim(info->skb_packet, sizeof(*packet));
 
-        if (packet->vis_type == VIS_TYPE_CLIENT_UPDATE) {
-                best_tq = find_best_vis_server(bat_priv, info);
+        if (packet->vis_type == BATADV_VIS_TYPE_CLIENT_UPDATE) {
+                best_tq = batadv_find_best_vis_server(bat_priv, info);
 
                 if (best_tq < 0)
-                        return -1;
+                        return best_tq;
         }
 
         for (i = 0; i < hash->size; i++) {
@@ -634,21 +604,21 @@ static int generate_vis_packet(struct bat_priv *bat_priv)
 
                 rcu_read_lock();
                 hlist_for_each_entry_rcu(orig_node, node, head, hash_entry) {
-                        router = orig_node_get_router(orig_node);
+                        router = batadv_orig_node_get_router(orig_node);
                         if (!router)
                                 continue;
 
-                        if (!compare_eth(router->addr, orig_node->orig))
+                        if (!batadv_compare_eth(router->addr, orig_node->orig))
                                 goto next;
 
-                        if (router->if_incoming->if_status != IF_ACTIVE)
+                        if (router->if_incoming->if_status != BATADV_IF_ACTIVE)
                                 goto next;
 
                         if (router->tq_avg < 1)
                                 goto next;
 
                         /* fill one entry into buffer. */
-                        entry = (struct vis_info_entry *)
+                        entry = (struct batadv_vis_info_entry *)
                                       skb_put(info->skb_packet, sizeof(*entry));
                         memcpy(entry->src,
                                router->if_incoming->net_dev->dev_addr,
@@ -658,9 +628,9 @@ static int generate_vis_packet(struct bat_priv *bat_priv)
                         packet->entries++;
 
 next:
-                        neigh_node_free_ref(router);
+                        batadv_neigh_node_free_ref(router);
 
-                        if (vis_packet_full(info))
+                        if (batadv_vis_packet_full(info))
                                 goto unlock;
                 }
                 rcu_read_unlock();
@@ -674,7 +644,7 @@ next:
                 rcu_read_lock();
                 hlist_for_each_entry_rcu(tt_common_entry, node, head,
                                          hash_entry) {
-                        entry = (struct vis_info_entry *)
+                        entry = (struct batadv_vis_info_entry *)
                                         skb_put(info->skb_packet,
                                                 sizeof(*entry));
                         memset(entry->src, 0, ETH_ALEN);
@@ -682,7 +652,7 @@ next:
                         entry->quality = 0; /* 0 means TT */
                         packet->entries++;
 
-                        if (vis_packet_full(info))
+                        if (batadv_vis_packet_full(info))
                                 goto unlock;
                 }
                 rcu_read_unlock();
@@ -696,14 +666,15 @@ unlock:
 }
 
 /* free old vis packets. Must be called with this vis_hash_lock
- * held */
-static void purge_vis_packets(struct bat_priv *bat_priv)
+ * held
+ */
+static void batadv_purge_vis_packets(struct batadv_priv *bat_priv)
 {
         uint32_t i;
-        struct hashtable_t *hash = bat_priv->vis_hash;
+        struct batadv_hashtable *hash = bat_priv->vis_hash;
         struct hlist_node *node, *node_tmp;
         struct hlist_head *head;
-        struct vis_info *info;
+        struct batadv_vis_info *info;
 
         for (i = 0; i < hash->size; i++) {
                 head = &hash->table[i];
@@ -714,31 +685,32 @@ static void purge_vis_packets(struct bat_priv *bat_priv)
                         if (info == bat_priv->my_vis_info)
                                 continue;
 
-                        if (has_timed_out(info->first_seen, VIS_TIMEOUT)) {
+                        if (batadv_has_timed_out(info->first_seen,
+                                                 BATADV_VIS_TIMEOUT)) {
                                 hlist_del(node);
-                                send_list_del(info);
-                                kref_put(&info->refcount, free_info);
+                                batadv_send_list_del(info);
+                                kref_put(&info->refcount, batadv_free_info);
                         }
                 }
         }
 }
 
-static void broadcast_vis_packet(struct bat_priv *bat_priv,
-                                 struct vis_info *info)
+static void batadv_broadcast_vis_packet(struct batadv_priv *bat_priv,
+                                        struct batadv_vis_info *info)
 {
-        struct neigh_node *router;
-        struct hashtable_t *hash = bat_priv->orig_hash;
+        struct batadv_neigh_node *router;
+        struct batadv_hashtable *hash = bat_priv->orig_hash;
         struct hlist_node *node;
         struct hlist_head *head;
-        struct orig_node *orig_node;
-        struct vis_packet *packet;
+        struct batadv_orig_node *orig_node;
+        struct batadv_vis_packet *packet;
         struct sk_buff *skb;
-        struct hard_iface *hard_iface;
+        struct batadv_hard_iface *hard_iface;
         uint8_t dstaddr[ETH_ALEN];
         uint32_t i;
 
 
-        packet = (struct vis_packet *)info->skb_packet->data;
+        packet = (struct batadv_vis_packet *)info->skb_packet->data;
 
         /* send to all routers in range. */
         for (i = 0; i < hash->size; i++) {
@@ -747,18 +719,19 @@ static void broadcast_vis_packet(struct bat_priv *bat_priv,
                 rcu_read_lock();
                 hlist_for_each_entry_rcu(orig_node, node, head, hash_entry) {
                         /* if it's a vis server and reachable, send it. */
-                        if (!(orig_node->flags & VIS_SERVER))
+                        if (!(orig_node->flags & BATADV_VIS_SERVER))
                                 continue;
 
-                        router = orig_node_get_router(orig_node);
+                        router = batadv_orig_node_get_router(orig_node);
                         if (!router)
                                 continue;
 
                         /* don't send it if we already received the packet from
-                         * this node. */
-                        if (recv_list_is_in(bat_priv, &info->recv_list,
-                                            orig_node->orig)) {
-                                neigh_node_free_ref(router);
+                         * this node.
+                         */
+                        if (batadv_recv_list_is_in(bat_priv, &info->recv_list,
+                                                   orig_node->orig)) {
+                                batadv_neigh_node_free_ref(router);
                                 continue;
                         }
 
@@ -766,57 +739,59 @@ static void broadcast_vis_packet(struct bat_priv *bat_priv,
                         hard_iface = router->if_incoming;
                         memcpy(dstaddr, router->addr, ETH_ALEN);
 
-                        neigh_node_free_ref(router);
+                        batadv_neigh_node_free_ref(router);
 
                         skb = skb_clone(info->skb_packet, GFP_ATOMIC);
                         if (skb)
-                                send_skb_packet(skb, hard_iface, dstaddr);
+                                batadv_send_skb_packet(skb, hard_iface,
+                                                       dstaddr);
 
                 }
                 rcu_read_unlock();
         }
 }
 
-static void unicast_vis_packet(struct bat_priv *bat_priv,
-                               struct vis_info *info)
+static void batadv_unicast_vis_packet(struct batadv_priv *bat_priv,
+                                      struct batadv_vis_info *info)
 {
-        struct orig_node *orig_node;
-        struct neigh_node *router = NULL;
+        struct batadv_orig_node *orig_node;
+        struct batadv_neigh_node *router = NULL;
         struct sk_buff *skb;
-        struct vis_packet *packet;
+        struct batadv_vis_packet *packet;
 
-        packet = (struct vis_packet *)info->skb_packet->data;
+        packet = (struct batadv_vis_packet *)info->skb_packet->data;
 
-        orig_node = orig_hash_find(bat_priv, packet->target_orig);
+        orig_node = batadv_orig_hash_find(bat_priv, packet->target_orig);
         if (!orig_node)
                 goto out;
 
-        router = orig_node_get_router(orig_node);
+        router = batadv_orig_node_get_router(orig_node);
         if (!router)
                 goto out;
 
         skb = skb_clone(info->skb_packet, GFP_ATOMIC);
         if (skb)
-                send_skb_packet(skb, router->if_incoming, router->addr);
+                batadv_send_skb_packet(skb, router->if_incoming, router->addr);
 
 out:
         if (router)
-                neigh_node_free_ref(router);
+                batadv_neigh_node_free_ref(router);
         if (orig_node)
-                orig_node_free_ref(orig_node);
+                batadv_orig_node_free_ref(orig_node);
 }
 
-/* only send one vis packet. called from send_vis_packets() */
-static void send_vis_packet(struct bat_priv *bat_priv, struct vis_info *info)
+/* only send one vis packet. called from batadv_send_vis_packets() */
+static void batadv_send_vis_packet(struct batadv_priv *bat_priv,
+                                   struct batadv_vis_info *info)
 {
-        struct hard_iface *primary_if;
-        struct vis_packet *packet;
+        struct batadv_hard_iface *primary_if;
+        struct batadv_vis_packet *packet;
 
-        primary_if = primary_if_get_selected(bat_priv);
+        primary_if = batadv_primary_if_get_selected(bat_priv);
         if (!primary_if)
                 goto out;
 
-        packet = (struct vis_packet *)info->skb_packet->data;
+        packet = (struct batadv_vis_packet *)info->skb_packet->data;
         if (packet->header.ttl < 2) {
                 pr_debug("Error - can't send vis packet: ttl exceeded\n");
                 goto out;
@@ -826,31 +801,31 @@ static void send_vis_packet(struct bat_priv *bat_priv, struct vis_info *info)
         packet->header.ttl--;
 
         if (is_broadcast_ether_addr(packet->target_orig))
-                broadcast_vis_packet(bat_priv, info);
+                batadv_broadcast_vis_packet(bat_priv, info);
         else
-                unicast_vis_packet(bat_priv, info);
+                batadv_unicast_vis_packet(bat_priv, info);
         packet->header.ttl++; /* restore TTL */
 
 out:
         if (primary_if)
-                hardif_free_ref(primary_if);
+                batadv_hardif_free_ref(primary_if);
 }
 
 /* called from timer; send (and maybe generate) vis packet. */
-static void send_vis_packets(struct work_struct *work)
+static void batadv_send_vis_packets(struct work_struct *work)
 {
         struct delayed_work *delayed_work =
                 container_of(work, struct delayed_work, work);
-        struct bat_priv *bat_priv =
-                container_of(delayed_work, struct bat_priv, vis_work);
-        struct vis_info *info;
+        struct batadv_priv *bat_priv;
+        struct batadv_vis_info *info;
 
+        bat_priv = container_of(delayed_work, struct batadv_priv, vis_work);
         spin_lock_bh(&bat_priv->vis_hash_lock);
-        purge_vis_packets(bat_priv);
+        batadv_purge_vis_packets(bat_priv);
 
-        if (generate_vis_packet(bat_priv) == 0) {
+        if (batadv_generate_vis_packet(bat_priv) == 0) {
                 /* schedule if generation was successful */
-                send_list_add(bat_priv, bat_priv->my_vis_info);
+                batadv_send_list_add(bat_priv, bat_priv->my_vis_info);
         }
 
         while (!list_empty(&bat_priv->vis_send_list)) {
@@ -860,98 +835,103 @@ static void send_vis_packets(struct work_struct *work)
                 kref_get(&info->refcount);
                 spin_unlock_bh(&bat_priv->vis_hash_lock);
 
-                send_vis_packet(bat_priv, info);
+                batadv_send_vis_packet(bat_priv, info);
 
                 spin_lock_bh(&bat_priv->vis_hash_lock);
-                send_list_del(info);
-                kref_put(&info->refcount, free_info);
+                batadv_send_list_del(info);
+                kref_put(&info->refcount, batadv_free_info);
         }
         spin_unlock_bh(&bat_priv->vis_hash_lock);
-        start_vis_timer(bat_priv);
+        batadv_start_vis_timer(bat_priv);
 }
 
 /* init the vis server. this may only be called when if_list is already
- * initialized (e.g. bat0 is initialized, interfaces have been added) */
-int vis_init(struct bat_priv *bat_priv)
+ * initialized (e.g. bat0 is initialized, interfaces have been added)
+ */
+int batadv_vis_init(struct batadv_priv *bat_priv)
 {
-        struct vis_packet *packet;
+        struct batadv_vis_packet *packet;
         int hash_added;
+        unsigned int len;
+        unsigned long first_seen;
+        struct sk_buff *tmp_skb;
 
         if (bat_priv->vis_hash)
-                return 1;
+                return 0;
 
         spin_lock_bh(&bat_priv->vis_hash_lock);
 
-        bat_priv->vis_hash = hash_new(256);
+        bat_priv->vis_hash = batadv_hash_new(256);
         if (!bat_priv->vis_hash) {
                 pr_err("Can't initialize vis_hash\n");
                 goto err;
         }
 
-        bat_priv->my_vis_info = kmalloc(MAX_VIS_PACKET_SIZE, GFP_ATOMIC);
+        bat_priv->my_vis_info = kmalloc(BATADV_MAX_VIS_PACKET_SIZE, GFP_ATOMIC);
         if (!bat_priv->my_vis_info)
                 goto err;
 
-        bat_priv->my_vis_info->skb_packet = dev_alloc_skb(sizeof(*packet) +
-                                                          MAX_VIS_PACKET_SIZE +
-                                                          ETH_HLEN);
+        len = sizeof(*packet) + BATADV_MAX_VIS_PACKET_SIZE + ETH_HLEN;
+        bat_priv->my_vis_info->skb_packet = dev_alloc_skb(len);
         if (!bat_priv->my_vis_info->skb_packet)
                 goto free_info;
 
         skb_reserve(bat_priv->my_vis_info->skb_packet, ETH_HLEN);
-        packet = (struct vis_packet *)skb_put(bat_priv->my_vis_info->skb_packet,
-                                              sizeof(*packet));
+        tmp_skb = bat_priv->my_vis_info->skb_packet;
+        packet = (struct batadv_vis_packet *)skb_put(tmp_skb, sizeof(*packet));
 
         /* prefill the vis info */
-        bat_priv->my_vis_info->first_seen = jiffies -
-                                                msecs_to_jiffies(VIS_INTERVAL);
+        first_seen = jiffies - msecs_to_jiffies(BATADV_VIS_INTERVAL);
+        bat_priv->my_vis_info->first_seen = first_seen;
         INIT_LIST_HEAD(&bat_priv->my_vis_info->recv_list);
         INIT_LIST_HEAD(&bat_priv->my_vis_info->send_list);
         kref_init(&bat_priv->my_vis_info->refcount);
         bat_priv->my_vis_info->bat_priv = bat_priv;
-        packet->header.version = COMPAT_VERSION;
-        packet->header.packet_type = BAT_VIS;
-        packet->header.ttl = TTL;
+        packet->header.version = BATADV_COMPAT_VERSION;
+        packet->header.packet_type = BATADV_VIS;
+        packet->header.ttl = BATADV_TTL;
         packet->seqno = 0;
+        packet->reserved = 0;
         packet->entries = 0;
 
         INIT_LIST_HEAD(&bat_priv->vis_send_list);
 
-        hash_added = hash_add(bat_priv->vis_hash, vis_info_cmp, vis_info_choose,
-                              bat_priv->my_vis_info,
-                              &bat_priv->my_vis_info->hash_entry);
+        hash_added = batadv_hash_add(bat_priv->vis_hash, batadv_vis_info_cmp,
+                                     batadv_vis_info_choose,
+                                     bat_priv->my_vis_info,
+                                     &bat_priv->my_vis_info->hash_entry);
         if (hash_added != 0) {
                 pr_err("Can't add own vis packet into hash\n");
                 /* not in hash, need to remove it manually. */
-                kref_put(&bat_priv->my_vis_info->refcount, free_info);
+                kref_put(&bat_priv->my_vis_info->refcount, batadv_free_info);
                 goto err;
         }
 
         spin_unlock_bh(&bat_priv->vis_hash_lock);
-        start_vis_timer(bat_priv);
-        return 1;
+        batadv_start_vis_timer(bat_priv);
+        return 0;
 
 free_info:
         kfree(bat_priv->my_vis_info);
         bat_priv->my_vis_info = NULL;
 err:
         spin_unlock_bh(&bat_priv->vis_hash_lock);
-        vis_quit(bat_priv);
-        return 0;
+        batadv_vis_quit(bat_priv);
+        return -ENOMEM;
 }
 
 /* Decrease the reference count on a hash item info */
-static void free_info_ref(struct hlist_node *node, void *arg)
+static void batadv_free_info_ref(struct hlist_node *node, void *arg)
 {
-        struct vis_info *info;
+        struct batadv_vis_info *info;
 
-        info = container_of(node, struct vis_info, hash_entry);
-        send_list_del(info);
-        kref_put(&info->refcount, free_info);
+        info = container_of(node, struct batadv_vis_info, hash_entry);
+        batadv_send_list_del(info);
+        kref_put(&info->refcount, batadv_free_info);
 }
 
 /* shutdown vis-server */
-void vis_quit(struct bat_priv *bat_priv)
+void batadv_vis_quit(struct batadv_priv *bat_priv)
 {
         if (!bat_priv->vis_hash)
                 return;
@@ -960,16 +940,16 @@ void vis_quit(struct bat_priv *bat_priv)
 
         spin_lock_bh(&bat_priv->vis_hash_lock);
         /* properly remove, kill timers ... */
-        hash_delete(bat_priv->vis_hash, free_info_ref, NULL);
+        batadv_hash_delete(bat_priv->vis_hash, batadv_free_info_ref, NULL);
         bat_priv->vis_hash = NULL;
         bat_priv->my_vis_info = NULL;
         spin_unlock_bh(&bat_priv->vis_hash_lock);
 }
 
 /* schedule packets for (re)transmission */
-static void start_vis_timer(struct bat_priv *bat_priv)
+static void batadv_start_vis_timer(struct batadv_priv *bat_priv)
 {
-        INIT_DELAYED_WORK(&bat_priv->vis_work, send_vis_packets);
-        queue_delayed_work(bat_event_workqueue, &bat_priv->vis_work,
-                           msecs_to_jiffies(VIS_INTERVAL));
+        INIT_DELAYED_WORK(&bat_priv->vis_work, batadv_send_vis_packets);
+        queue_delayed_work(batadv_event_workqueue, &bat_priv->vis_work,
+                           msecs_to_jiffies(BATADV_VIS_INTERVAL));
 }
diff --git a/net/batman-adv/vis.h b/net/batman-adv/vis.h
index ee2e46e5347..84e716ed896 100644
--- a/net/batman-adv/vis.h
+++ b/net/batman-adv/vis.h
@@ -1,5 +1,4 @@
-/*
- * Copyright (C) 2008-2012 B.A.T.M.A.N. contributors:
+/* Copyright (C) 2008-2012 B.A.T.M.A.N. contributors:
  *
  * Simon Wunderlich, Marek Lindner
  *
@@ -16,23 +15,22 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA
- *
  */
 
 #ifndef _NET_BATMAN_ADV_VIS_H_
 #define _NET_BATMAN_ADV_VIS_H_
 
-#define VIS_TIMEOUT             200000  /* timeout of vis packets
-                                         * in miliseconds */
+/* timeout of vis packets in miliseconds */
+#define BATADV_VIS_TIMEOUT              200000
 
-int vis_seq_print_text(struct seq_file *seq, void *offset);
-void receive_server_sync_packet(struct bat_priv *bat_priv,
-                                struct vis_packet *vis_packet,
-                                int vis_info_len);
-void receive_client_update_packet(struct bat_priv *bat_priv,
-                                  struct vis_packet *vis_packet,
-                                  int vis_info_len);
-int vis_init(struct bat_priv *bat_priv);
-void vis_quit(struct bat_priv *bat_priv);
+int batadv_vis_seq_print_text(struct seq_file *seq, void *offset);
+void batadv_receive_server_sync_packet(struct batadv_priv *bat_priv,
+                                       struct batadv_vis_packet *vis_packet,
+                                       int vis_info_len);
+void batadv_receive_client_update_packet(struct batadv_priv *bat_priv,
+                                         struct batadv_vis_packet *vis_packet,
+                                         int vis_info_len);
+int batadv_vis_init(struct batadv_priv *bat_priv);
+void batadv_vis_quit(struct batadv_priv *bat_priv);
 
 #endif /* _NET_BATMAN_ADV_VIS_H_ */
diff --git a/net/bluetooth/Makefile b/net/bluetooth/Makefile
index 2dc5a5700f5..fa6d94a4602 100644
--- a/net/bluetooth/Makefile
+++ b/net/bluetooth/Makefile
@@ -9,4 +9,5 @@ obj-$(CONFIG_BT_CMTP)	+= cmtp/
 obj-$(CONFIG_BT_HIDP)   += hidp/
 
 bluetooth-y := af_bluetooth.o hci_core.o hci_conn.o hci_event.o mgmt.o \
-        hci_sock.o hci_sysfs.o l2cap_core.o l2cap_sock.o smp.o sco.o lib.o
+        hci_sock.o hci_sysfs.o l2cap_core.o l2cap_sock.o smp.o sco.o lib.o \
+        a2mp.o
diff --git a/net/bluetooth/a2mp.c b/net/bluetooth/a2mp.c
new file mode 100644
index 00000000000..fb93250b393
--- /dev/null
+++ b/net/bluetooth/a2mp.c
@@ -0,0 +1,568 @@
+/*
+   Copyright (c) 2010,2011 Code Aurora Forum.  All rights reserved.
+   Copyright (c) 2011,2012 Intel Corp.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License version 2 and
+   only version 2 as published by the Free Software Foundation.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+*/
+
+#include <net/bluetooth/bluetooth.h>
+#include <net/bluetooth/hci_core.h>
+#include <net/bluetooth/l2cap.h>
+#include <net/bluetooth/a2mp.h>
+
+/* A2MP build & send command helper functions */
+static struct a2mp_cmd *__a2mp_build(u8 code, u8 ident, u16 len, void *data)
+{
+        struct a2mp_cmd *cmd;
+        int plen;
+
+        plen = sizeof(*cmd) + len;
+        cmd = kzalloc(plen, GFP_KERNEL);
+        if (!cmd)
+                return NULL;
+
+        cmd->code = code;
+        cmd->ident = ident;
+        cmd->len = cpu_to_le16(len);
+
+        memcpy(cmd->data, data, len);
+
+        return cmd;
+}
+
+static void a2mp_send(struct amp_mgr *mgr, u8 code, u8 ident, u16 len,
+                      void *data)
+{
+        struct l2cap_chan *chan = mgr->a2mp_chan;
+        struct a2mp_cmd *cmd;
+        u16 total_len = len + sizeof(*cmd);
+        struct kvec iv;
+        struct msghdr msg;
+
+        cmd = __a2mp_build(code, ident, len, data);
+        if (!cmd)
+                return;
+
+        iv.iov_base = cmd;
+        iv.iov_len = total_len;
+
+        memset(&msg, 0, sizeof(msg));
+
+        msg.msg_iov = (struct iovec *) &iv;
+        msg.msg_iovlen = 1;
+
+        l2cap_chan_send(chan, &msg, total_len, 0);
+
+        kfree(cmd);
+}
+
+static inline void __a2mp_cl_bredr(struct a2mp_cl *cl)
+{
+        cl->id = 0;
+        cl->type = 0;
+        cl->status = 1;
+}
+
+/* hci_dev_list shall be locked */
+static void __a2mp_add_cl(struct amp_mgr *mgr, struct a2mp_cl *cl, u8 num_ctrl)
+{
+        int i = 0;
+        struct hci_dev *hdev;
+
+        __a2mp_cl_bredr(cl);
+
+        list_for_each_entry(hdev, &hci_dev_list, list) {
+                /* Iterate through AMP controllers */
+                if (hdev->id == HCI_BREDR_ID)
+                        continue;
+
+                /* Starting from second entry */
+                if (++i >= num_ctrl)
+                        return;
+
+                cl[i].id = hdev->id;
+                cl[i].type = hdev->amp_type;
+                cl[i].status = hdev->amp_status;
+        }
+}
+
+/* Processing A2MP messages */
+static int a2mp_command_rej(struct amp_mgr *mgr, struct sk_buff *skb,
+                            struct a2mp_cmd *hdr)
+{
+        struct a2mp_cmd_rej *rej = (void *) skb->data;
+
+        if (le16_to_cpu(hdr->len) < sizeof(*rej))
+                return -EINVAL;
+
+        BT_DBG("ident %d reason %d", hdr->ident, le16_to_cpu(rej->reason));
+
+        skb_pull(skb, sizeof(*rej));
+
+        return 0;
+}
+
+static int a2mp_discover_req(struct amp_mgr *mgr, struct sk_buff *skb,
+                             struct a2mp_cmd *hdr)
+{
+        struct a2mp_discov_req *req = (void *) skb->data;
+        u16 len = le16_to_cpu(hdr->len);
+        struct a2mp_discov_rsp *rsp;
+        u16 ext_feat;
+        u8 num_ctrl;
+
+        if (len < sizeof(*req))
+                return -EINVAL;
+
+        skb_pull(skb, sizeof(*req));
+
+        ext_feat = le16_to_cpu(req->ext_feat);
+
+        BT_DBG("mtu %d efm 0x%4.4x", le16_to_cpu(req->mtu), ext_feat);
+
+        /* check that packet is not broken for now */
+        while (ext_feat & A2MP_FEAT_EXT) {
+                if (len < sizeof(ext_feat))
+                        return -EINVAL;
+
+                ext_feat = get_unaligned_le16(skb->data);
+                BT_DBG("efm 0x%4.4x", ext_feat);
+                len -= sizeof(ext_feat);
+                skb_pull(skb, sizeof(ext_feat));
+        }
+
+        read_lock(&hci_dev_list_lock);
+
+        num_ctrl = __hci_num_ctrl();
+        len = num_ctrl * sizeof(struct a2mp_cl) + sizeof(*rsp);
+        rsp = kmalloc(len, GFP_ATOMIC);
+        if (!rsp) {
+                read_unlock(&hci_dev_list_lock);
+                return -ENOMEM;
+        }
+
+        rsp->mtu = __constant_cpu_to_le16(L2CAP_A2MP_DEFAULT_MTU);
+        rsp->ext_feat = 0;
+
+        __a2mp_add_cl(mgr, rsp->cl, num_ctrl);
+
+        read_unlock(&hci_dev_list_lock);
+
+        a2mp_send(mgr, A2MP_DISCOVER_RSP, hdr->ident, len, rsp);
+
+        kfree(rsp);
+        return 0;
+}
+
+static int a2mp_change_notify(struct amp_mgr *mgr, struct sk_buff *skb,
+                              struct a2mp_cmd *hdr)
+{
+        struct a2mp_cl *cl = (void *) skb->data;
+
+        while (skb->len >= sizeof(*cl)) {
+                BT_DBG("Controller id %d type %d status %d", cl->id, cl->type,
+                       cl->status);
+                cl = (struct a2mp_cl *) skb_pull(skb, sizeof(*cl));
+        }
+
+        /* TODO send A2MP_CHANGE_RSP */
+
+        return 0;
+}
+
+static int a2mp_getinfo_req(struct amp_mgr *mgr, struct sk_buff *skb,
+                            struct a2mp_cmd *hdr)
+{
+        struct a2mp_info_req *req  = (void *) skb->data;
+        struct a2mp_info_rsp rsp;
+        struct hci_dev *hdev;
+
+        if (le16_to_cpu(hdr->len) < sizeof(*req))
+                return -EINVAL;
+
+        BT_DBG("id %d", req->id);
+
+        rsp.id = req->id;
+        rsp.status = A2MP_STATUS_INVALID_CTRL_ID;
+
+        hdev = hci_dev_get(req->id);
+        if (hdev && hdev->amp_type != HCI_BREDR) {
+                rsp.status = 0;
+                rsp.total_bw = cpu_to_le32(hdev->amp_total_bw);
+                rsp.max_bw = cpu_to_le32(hdev->amp_max_bw);
+                rsp.min_latency = cpu_to_le32(hdev->amp_min_latency);
+                rsp.pal_cap = cpu_to_le16(hdev->amp_pal_cap);
+                rsp.assoc_size = cpu_to_le16(hdev->amp_assoc_size);
+        }
+
+        if (hdev)
+                hci_dev_put(hdev);
+
+        a2mp_send(mgr, A2MP_GETINFO_RSP, hdr->ident, sizeof(rsp), &rsp);
+
+        skb_pull(skb, sizeof(*req));
+        return 0;
+}
+
+static int a2mp_getampassoc_req(struct amp_mgr *mgr, struct sk_buff *skb,
+                                struct a2mp_cmd *hdr)
+{
+        struct a2mp_amp_assoc_req *req = (void *) skb->data;
+        struct hci_dev *hdev;
+
+        if (le16_to_cpu(hdr->len) < sizeof(*req))
+                return -EINVAL;
+
+        BT_DBG("id %d", req->id);
+
+        hdev = hci_dev_get(req->id);
+        if (!hdev || hdev->amp_type == HCI_BREDR) {
+                struct a2mp_amp_assoc_rsp rsp;
+                rsp.id = req->id;
+                rsp.status = A2MP_STATUS_INVALID_CTRL_ID;
+
+                a2mp_send(mgr, A2MP_GETAMPASSOC_RSP, hdr->ident, sizeof(rsp),
+                          &rsp);
+                goto clean;
+        }
+
+        /* Placeholder for HCI Read AMP Assoc */
+
+clean:
+        if (hdev)
+                hci_dev_put(hdev);
+
+        skb_pull(skb, sizeof(*req));
+        return 0;
+}
+
+static int a2mp_createphyslink_req(struct amp_mgr *mgr, struct sk_buff *skb,
+                                   struct a2mp_cmd *hdr)
+{
+        struct a2mp_physlink_req *req = (void *) skb->data;
+
+        struct a2mp_physlink_rsp rsp;
+        struct hci_dev *hdev;
+
+        if (le16_to_cpu(hdr->len) < sizeof(*req))
+                return -EINVAL;
+
+        BT_DBG("local_id %d, remote_id %d", req->local_id, req->remote_id);
+
+        rsp.local_id = req->remote_id;
+        rsp.remote_id = req->local_id;
+
+        hdev = hci_dev_get(req->remote_id);
+        if (!hdev || hdev->amp_type != HCI_AMP) {
+                rsp.status = A2MP_STATUS_INVALID_CTRL_ID;
+                goto send_rsp;
+        }
+
+        /* TODO process physlink create */
+
+        rsp.status = A2MP_STATUS_SUCCESS;
+
+send_rsp:
+        if (hdev)
+                hci_dev_put(hdev);
+
+        a2mp_send(mgr, A2MP_CREATEPHYSLINK_RSP, hdr->ident, sizeof(rsp),
+                  &rsp);
+
+        skb_pull(skb, le16_to_cpu(hdr->len));
+        return 0;
+}
+
+static int a2mp_discphyslink_req(struct amp_mgr *mgr, struct sk_buff *skb,
+                                 struct a2mp_cmd *hdr)
+{
+        struct a2mp_physlink_req *req = (void *) skb->data;
+        struct a2mp_physlink_rsp rsp;
+        struct hci_dev *hdev;
+
+        if (le16_to_cpu(hdr->len) < sizeof(*req))
+                return -EINVAL;
+
+        BT_DBG("local_id %d remote_id %d", req->local_id, req->remote_id);
+
+        rsp.local_id = req->remote_id;
+        rsp.remote_id = req->local_id;
+        rsp.status = A2MP_STATUS_SUCCESS;
+
+        hdev = hci_dev_get(req->local_id);
+        if (!hdev) {
+                rsp.status = A2MP_STATUS_INVALID_CTRL_ID;
+                goto send_rsp;
+        }
+
+        /* TODO Disconnect Phys Link here */
+
+        hci_dev_put(hdev);
+
+send_rsp:
+        a2mp_send(mgr, A2MP_DISCONNPHYSLINK_RSP, hdr->ident, sizeof(rsp), &rsp);
+
+        skb_pull(skb, sizeof(*req));
+        return 0;
+}
+
+static inline int a2mp_cmd_rsp(struct amp_mgr *mgr, struct sk_buff *skb,
+                               struct a2mp_cmd *hdr)
+{
+        BT_DBG("ident %d code %d", hdr->ident, hdr->code);
+
+        skb_pull(skb, le16_to_cpu(hdr->len));
+        return 0;
+}
+
+/* Handle A2MP signalling */
+static int a2mp_chan_recv_cb(struct l2cap_chan *chan, struct sk_buff *skb)
+{
+        struct a2mp_cmd *hdr = (void *) skb->data;
+        struct amp_mgr *mgr = chan->data;
+        int err = 0;
+
+        amp_mgr_get(mgr);
+
+        while (skb->len >= sizeof(*hdr)) {
+                struct a2mp_cmd *hdr = (void *) skb->data;
+                u16 len = le16_to_cpu(hdr->len);
+
+                BT_DBG("code 0x%02x id %d len %d", hdr->code, hdr->ident, len);
+
+                skb_pull(skb, sizeof(*hdr));
+
+                if (len > skb->len || !hdr->ident) {
+                        err = -EINVAL;
+                        break;
+                }
+
+                mgr->ident = hdr->ident;
+
+                switch (hdr->code) {
+                case A2MP_COMMAND_REJ:
+                        a2mp_command_rej(mgr, skb, hdr);
+                        break;
+
+                case A2MP_DISCOVER_REQ:
+                        err = a2mp_discover_req(mgr, skb, hdr);
+                        break;
+
+                case A2MP_CHANGE_NOTIFY:
+                        err = a2mp_change_notify(mgr, skb, hdr);
+                        break;
+
+                case A2MP_GETINFO_REQ:
+                        err = a2mp_getinfo_req(mgr, skb, hdr);
+                        break;
+
+                case A2MP_GETAMPASSOC_REQ:
+                        err = a2mp_getampassoc_req(mgr, skb, hdr);
+                        break;
+
+                case A2MP_CREATEPHYSLINK_REQ:
+                        err = a2mp_createphyslink_req(mgr, skb, hdr);
+                        break;
+
+                case A2MP_DISCONNPHYSLINK_REQ:
+                        err = a2mp_discphyslink_req(mgr, skb, hdr);
+                        break;
+
+                case A2MP_CHANGE_RSP:
+                case A2MP_DISCOVER_RSP:
+                case A2MP_GETINFO_RSP:
+                case A2MP_GETAMPASSOC_RSP:
+                case A2MP_CREATEPHYSLINK_RSP:
+                case A2MP_DISCONNPHYSLINK_RSP:
+                        err = a2mp_cmd_rsp(mgr, skb, hdr);
+                        break;
+
+                default:
+                        BT_ERR("Unknown A2MP sig cmd 0x%2.2x", hdr->code);
+                        err = -EINVAL;
+                        break;
+                }
+        }
+
+        if (err) {
+                struct a2mp_cmd_rej rej;
+                rej.reason = __constant_cpu_to_le16(0);
+
+                BT_DBG("Send A2MP Rej: cmd 0x%2.2x err %d", hdr->code, err);
+
+                a2mp_send(mgr, A2MP_COMMAND_REJ, hdr->ident, sizeof(rej),
+                          &rej);
+        }
+
+        /* Always free skb and return success error code to prevent
+           from sending L2CAP Disconnect over A2MP channel */
+        kfree_skb(skb);
+
+        amp_mgr_put(mgr);
+
+        return 0;
+}
+
+static void a2mp_chan_close_cb(struct l2cap_chan *chan)
+{
+        l2cap_chan_destroy(chan);
+}
+
+static void a2mp_chan_state_change_cb(struct l2cap_chan *chan, int state)
+{
+        struct amp_mgr *mgr = chan->data;
+
+        if (!mgr)
+                return;
+
+        BT_DBG("chan %p state %s", chan, state_to_string(state));
+
+        chan->state = state;
+
+        switch (state) {
+        case BT_CLOSED:
+                if (mgr)
+                        amp_mgr_put(mgr);
+                break;
+        }
+}
+
+static struct sk_buff *a2mp_chan_alloc_skb_cb(struct l2cap_chan *chan,
+                                              unsigned long len, int nb)
+{
+        return bt_skb_alloc(len, GFP_KERNEL);
+}
+
+static struct l2cap_ops a2mp_chan_ops = {
+        .name = "L2CAP A2MP channel",
+        .recv = a2mp_chan_recv_cb,
+        .close = a2mp_chan_close_cb,
+        .state_change = a2mp_chan_state_change_cb,
+        .alloc_skb = a2mp_chan_alloc_skb_cb,
+
+        /* Not implemented for A2MP */
+        .new_connection = l2cap_chan_no_new_connection,
+        .teardown = l2cap_chan_no_teardown,
+        .ready = l2cap_chan_no_ready,
+};
+
+static struct l2cap_chan *a2mp_chan_open(struct l2cap_conn *conn)
+{
+        struct l2cap_chan *chan;
+        int err;
+
+        chan = l2cap_chan_create();
+        if (!chan)
+                return NULL;
+
+        BT_DBG("chan %p", chan);
+
+        chan->chan_type = L2CAP_CHAN_CONN_FIX_A2MP;
+        chan->flush_to = L2CAP_DEFAULT_FLUSH_TO;
+
+        chan->ops = &a2mp_chan_ops;
+
+        l2cap_chan_set_defaults(chan);
+        chan->remote_max_tx = chan->max_tx;
+        chan->remote_tx_win = chan->tx_win;
+
+        chan->retrans_timeout = L2CAP_DEFAULT_RETRANS_TO;
+        chan->monitor_timeout = L2CAP_DEFAULT_MONITOR_TO;
+
+        skb_queue_head_init(&chan->tx_q);
+
+        chan->mode = L2CAP_MODE_ERTM;
+
+        err = l2cap_ertm_init(chan);
+        if (err < 0) {
+                l2cap_chan_del(chan, 0);
+                return NULL;
+        }
+
+        chan->conf_state = 0;
+
+        l2cap_chan_add(conn, chan);
+
+        chan->remote_mps = chan->omtu;
+        chan->mps = chan->omtu;
+
+        chan->state = BT_CONNECTED;
+
+        return chan;
+}
+
+/* AMP Manager functions */
+void amp_mgr_get(struct amp_mgr *mgr)
+{
+        BT_DBG("mgr %p", mgr);
+
+        kref_get(&mgr->kref);
+}
+
+static void amp_mgr_destroy(struct kref *kref)
+{
+        struct amp_mgr *mgr = container_of(kref, struct amp_mgr, kref);
+
+        BT_DBG("mgr %p", mgr);
+
+        kfree(mgr);
+}
+
+int amp_mgr_put(struct amp_mgr *mgr)
+{
+        BT_DBG("mgr %p", mgr);
+
+        return kref_put(&mgr->kref, &amp_mgr_destroy);
+}
+
+static struct amp_mgr *amp_mgr_create(struct l2cap_conn *conn)
+{
+        struct amp_mgr *mgr;
+        struct l2cap_chan *chan;
+
+        mgr = kzalloc(sizeof(*mgr), GFP_KERNEL);
+        if (!mgr)
+                return NULL;
+
+        BT_DBG("conn %p mgr %p", conn, mgr);
+
+        mgr->l2cap_conn = conn;
+
+        chan = a2mp_chan_open(conn);
+        if (!chan) {
+                kfree(mgr);
+                return NULL;
+        }
+
+        mgr->a2mp_chan = chan;
+        chan->data = mgr;
+
+        conn->hcon->amp_mgr = mgr;
+
+        kref_init(&mgr->kref);
+
+        return mgr;
+}
+
+struct l2cap_chan *a2mp_channel_create(struct l2cap_conn *conn,
+                                       struct sk_buff *skb)
+{
+        struct amp_mgr *mgr;
+
+        mgr = amp_mgr_create(conn);
+        if (!mgr) {
+                BT_ERR("Could not create AMP manager");
+                return NULL;
+        }
+
+        BT_DBG("mgr: %p chan %p", mgr, mgr->a2mp_chan);
+
+        return mgr->a2mp_chan;
+}
diff --git a/net/bluetooth/af_bluetooth.c b/net/bluetooth/af_bluetooth.c
index 3e18af4dadc..f7db5792ec6 100644
--- a/net/bluetooth/af_bluetooth.c
+++ b/net/bluetooth/af_bluetooth.c
@@ -25,18 +25,7 @@
 /* Bluetooth address family and sockets. */
 
 #include <linux/module.h>
-
-#include <linux/types.h>
-#include <linux/list.h>
-#include <linux/errno.h>
-#include <linux/kernel.h>
-#include <linux/sched.h>
-#include <linux/skbuff.h>
-#include <linux/init.h>
-#include <linux/poll.h>
-#include <net/sock.h>
 #include <asm/ioctls.h>
-#include <linux/kmod.h>
 
 #include <net/bluetooth/bluetooth.h>
 
@@ -418,7 +407,8 @@ static inline unsigned int bt_accept_poll(struct sock *parent)
         return 0;
 }
 
-unsigned int bt_sock_poll(struct file *file, struct socket *sock, poll_table *wait)
+unsigned int bt_sock_poll(struct file *file, struct socket *sock,
+                          poll_table *wait)
 {
         struct sock *sk = sock->sk;
         unsigned int mask = 0;
diff --git a/net/bluetooth/bnep/core.c b/net/bluetooth/bnep/core.c
index 031d7d65675..4a6620bc157 100644
--- a/net/bluetooth/bnep/core.c
+++ b/net/bluetooth/bnep/core.c
@@ -26,26 +26,9 @@
 */
 
 #include <linux/module.h>
-
-#include <linux/kernel.h>
-#include <linux/sched.h>
-#include <linux/signal.h>
-#include <linux/init.h>
-#include <linux/wait.h>
-#include <linux/freezer.h>
-#include <linux/errno.h>
-#include <linux/net.h>
-#include <linux/slab.h>
 #include <linux/kthread.h>
-#include <net/sock.h>
-
-#include <linux/socket.h>
 #include <linux/file.h>
-
-#include <linux/netdevice.h>
 #include <linux/etherdevice.h>
-#include <linux/skbuff.h>
-
 #include <asm/unaligned.h>
 
 #include <net/bluetooth/bluetooth.h>
@@ -306,7 +289,7 @@ static u8 __bnep_rx_hlen[] = {
         ETH_ALEN + 2  /* BNEP_COMPRESSED_DST_ONLY */
 };
 
-static inline int bnep_rx_frame(struct bnep_session *s, struct sk_buff *skb)
+static int bnep_rx_frame(struct bnep_session *s, struct sk_buff *skb)
 {
         struct net_device *dev = s->dev;
         struct sk_buff *nskb;
@@ -404,7 +387,7 @@ static u8 __bnep_tx_types[] = {
         BNEP_COMPRESSED
 };
 
-static inline int bnep_tx_frame(struct bnep_session *s, struct sk_buff *skb)
+static int bnep_tx_frame(struct bnep_session *s, struct sk_buff *skb)
 {
         struct ethhdr *eh = (void *) skb->data;
         struct socket *sock = s->sock;
diff --git a/net/bluetooth/bnep/netdev.c b/net/bluetooth/bnep/netdev.c
index bc4086480d9..98f86f91d47 100644
--- a/net/bluetooth/bnep/netdev.c
+++ b/net/bluetooth/bnep/netdev.c
@@ -25,16 +25,8 @@
    SOFTWARE IS DISCLAIMED.
 */
 
-#include <linux/module.h>
-#include <linux/slab.h>
-
-#include <linux/socket.h>
-#include <linux/netdevice.h>
+#include <linux/export.h>
 #include <linux/etherdevice.h>
-#include <linux/skbuff.h>
-#include <linux/wait.h>
-
-#include <asm/unaligned.h>
 
 #include <net/bluetooth/bluetooth.h>
 #include <net/bluetooth/hci_core.h>
@@ -128,7 +120,7 @@ static void bnep_net_timeout(struct net_device *dev)
 }
 
 #ifdef CONFIG_BT_BNEP_MC_FILTER
-static inline int bnep_net_mc_filter(struct sk_buff *skb, struct bnep_session *s)
+static int bnep_net_mc_filter(struct sk_buff *skb, struct bnep_session *s)
 {
         struct ethhdr *eh = (void *) skb->data;
 
@@ -140,7 +132,7 @@ static inline int bnep_net_mc_filter(struct sk_buff *skb, struct bnep_session *s
 
 #ifdef CONFIG_BT_BNEP_PROTO_FILTER
 /* Determine ether protocol. Based on eth_type_trans. */
-static inline u16 bnep_net_eth_proto(struct sk_buff *skb)
+static u16 bnep_net_eth_proto(struct sk_buff *skb)
 {
         struct ethhdr *eh = (void *) skb->data;
         u16 proto = ntohs(eh->h_proto);
@@ -154,7 +146,7 @@ static inline u16 bnep_net_eth_proto(struct sk_buff *skb)
         return ETH_P_802_2;
 }
 
-static inline int bnep_net_proto_filter(struct sk_buff *skb, struct bnep_session *s)
+static int bnep_net_proto_filter(struct sk_buff *skb, struct bnep_session *s)
 {
         u16 proto = bnep_net_eth_proto(skb);
         struct bnep_proto_filter *f = s->proto_filter;
diff --git a/net/bluetooth/bnep/sock.c b/net/bluetooth/bnep/sock.c
index 180bfc45810..5e5f5b410e0 100644
--- a/net/bluetooth/bnep/sock.c
+++ b/net/bluetooth/bnep/sock.c
@@ -24,24 +24,8 @@
    SOFTWARE IS DISCLAIMED.
 */
 
-#include <linux/module.h>
-
-#include <linux/types.h>
-#include <linux/capability.h>
-#include <linux/errno.h>
-#include <linux/kernel.h>
-#include <linux/poll.h>
-#include <linux/fcntl.h>
-#include <linux/skbuff.h>
-#include <linux/socket.h>
-#include <linux/ioctl.h>
+#include <linux/export.h>
 #include <linux/file.h>
-#include <linux/init.h>
-#include <linux/compat.h>
-#include <linux/gfp.h>
-#include <linux/uaccess.h>
-#include <net/sock.h>
-
 
 #include "bnep.h"
 
diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c
index 3f18a6ed973..2fcced377e5 100644
--- a/net/bluetooth/hci_conn.c
+++ b/net/bluetooth/hci_conn.c
@@ -24,24 +24,11 @@
 
 /* Bluetooth HCI connection handling. */
 
-#include <linux/module.h>
-
-#include <linux/types.h>
-#include <linux/errno.h>
-#include <linux/kernel.h>
-#include <linux/slab.h>
-#include <linux/poll.h>
-#include <linux/fcntl.h>
-#include <linux/init.h>
-#include <linux/skbuff.h>
-#include <linux/interrupt.h>
-#include <net/sock.h>
-
-#include <linux/uaccess.h>
-#include <asm/unaligned.h>
+#include <linux/export.h>
 
 #include <net/bluetooth/bluetooth.h>
 #include <net/bluetooth/hci_core.h>
+#include <net/bluetooth/a2mp.h>
 
 static void hci_le_connect(struct hci_conn *conn)
 {
@@ -54,15 +41,15 @@ static void hci_le_connect(struct hci_conn *conn)
         conn->sec_level = BT_SECURITY_LOW;
 
         memset(&cp, 0, sizeof(cp));
-        cp.scan_interval = cpu_to_le16(0x0060);
-        cp.scan_window = cpu_to_le16(0x0030);
+        cp.scan_interval = __constant_cpu_to_le16(0x0060);
+        cp.scan_window = __constant_cpu_to_le16(0x0030);
         bacpy(&cp.peer_addr, &conn->dst);
         cp.peer_addr_type = conn->dst_type;
-        cp.conn_interval_min = cpu_to_le16(0x0028);
-        cp.conn_interval_max = cpu_to_le16(0x0038);
-        cp.supervision_timeout = cpu_to_le16(0x002a);
-        cp.min_ce_len = cpu_to_le16(0x0000);
-        cp.max_ce_len = cpu_to_le16(0x0000);
+        cp.conn_interval_min = __constant_cpu_to_le16(0x0028);
+        cp.conn_interval_max = __constant_cpu_to_le16(0x0038);
+        cp.supervision_timeout = __constant_cpu_to_le16(0x002a);
+        cp.min_ce_len = __constant_cpu_to_le16(0x0000);
+        cp.max_ce_len = __constant_cpu_to_le16(0x0000);
 
         hci_send_cmd(hdev, HCI_OP_LE_CREATE_CONN, sizeof(cp), &cp);
 }
@@ -99,7 +86,7 @@ void hci_acl_connect(struct hci_conn *conn)
                         cp.pscan_rep_mode = ie->data.pscan_rep_mode;
                         cp.pscan_mode     = ie->data.pscan_mode;
                         cp.clock_offset   = ie->data.clock_offset |
-                                                        cpu_to_le16(0x8000);
+                                            __constant_cpu_to_le16(0x8000);
                 }
 
                 memcpy(conn->dev_class, ie->data.dev_class, 3);
@@ -175,9 +162,9 @@ void hci_setup_sync(struct hci_conn *conn, __u16 handle)
         cp.handle   = cpu_to_le16(handle);
         cp.pkt_type = cpu_to_le16(conn->pkt_type);
 
-        cp.tx_bandwidth   = cpu_to_le32(0x00001f40);
-        cp.rx_bandwidth   = cpu_to_le32(0x00001f40);
-        cp.max_latency    = cpu_to_le16(0xffff);
+        cp.tx_bandwidth   = __constant_cpu_to_le32(0x00001f40);
+        cp.rx_bandwidth   = __constant_cpu_to_le32(0x00001f40);
+        cp.max_latency    = __constant_cpu_to_le16(0xffff);
         cp.voice_setting  = cpu_to_le16(hdev->voice_setting);
         cp.retrans_effort = 0xff;
 
@@ -185,7 +172,7 @@ void hci_setup_sync(struct hci_conn *conn, __u16 handle)
 }
 
 void hci_le_conn_update(struct hci_conn *conn, u16 min, u16 max,
-                                        u16 latency, u16 to_multiplier)
+                        u16 latency, u16 to_multiplier)
 {
         struct hci_cp_le_conn_update cp;
         struct hci_dev *hdev = conn->hdev;
@@ -197,15 +184,14 @@ void hci_le_conn_update(struct hci_conn *conn, u16 min, u16 max,
         cp.conn_interval_max    = cpu_to_le16(max);
         cp.conn_latency         = cpu_to_le16(latency);
         cp.supervision_timeout  = cpu_to_le16(to_multiplier);
-        cp.min_ce_len           = cpu_to_le16(0x0001);
-        cp.max_ce_len           = cpu_to_le16(0x0001);
+        cp.min_ce_len           = __constant_cpu_to_le16(0x0001);
+        cp.max_ce_len           = __constant_cpu_to_le16(0x0001);
 
         hci_send_cmd(hdev, HCI_OP_LE_CONN_UPDATE, sizeof(cp), &cp);
 }
-EXPORT_SYMBOL(hci_le_conn_update);
 
 void hci_le_start_enc(struct hci_conn *conn, __le16 ediv, __u8 rand[8],
-                                                        __u8 ltk[16])
+                      __u8 ltk[16])
 {
         struct hci_dev *hdev = conn->hdev;
         struct hci_cp_le_start_enc cp;
@@ -221,7 +207,6 @@ void hci_le_start_enc(struct hci_conn *conn, __le16 ediv, __u8 rand[8],
 
         hci_send_cmd(hdev, HCI_OP_LE_START_ENC, sizeof(cp), &cp);
 }
-EXPORT_SYMBOL(hci_le_start_enc);
 
 /* Device _must_ be locked */
 void hci_sco_setup(struct hci_conn *conn, __u8 status)
@@ -247,7 +232,7 @@ void hci_sco_setup(struct hci_conn *conn, __u8 status)
 static void hci_conn_timeout(struct work_struct *work)
 {
         struct hci_conn *conn = container_of(work, struct hci_conn,
-                                                        disc_work.work);
+                                             disc_work.work);
         __u8 reason;
 
         BT_DBG("conn %p state %s", conn, state_to_string(conn->state));
@@ -295,9 +280,9 @@ static void hci_conn_enter_sniff_mode(struct hci_conn *conn)
         if (lmp_sniffsubr_capable(hdev) && lmp_sniffsubr_capable(conn)) {
                 struct hci_cp_sniff_subrate cp;
                 cp.handle             = cpu_to_le16(conn->handle);
-                cp.max_latency        = cpu_to_le16(0);
-                cp.min_remote_timeout = cpu_to_le16(0);
-                cp.min_local_timeout  = cpu_to_le16(0);
+                cp.max_latency        = __constant_cpu_to_le16(0);
+                cp.min_remote_timeout = __constant_cpu_to_le16(0);
+                cp.min_local_timeout  = __constant_cpu_to_le16(0);
                 hci_send_cmd(hdev, HCI_OP_SNIFF_SUBRATE, sizeof(cp), &cp);
         }
 
@@ -306,8 +291,8 @@ static void hci_conn_enter_sniff_mode(struct hci_conn *conn)
                 cp.handle       = cpu_to_le16(conn->handle);
                 cp.max_interval = cpu_to_le16(hdev->sniff_max_interval);
                 cp.min_interval = cpu_to_le16(hdev->sniff_min_interval);
-                cp.attempt      = cpu_to_le16(4);
-                cp.timeout      = cpu_to_le16(1);
+                cp.attempt      = __constant_cpu_to_le16(4);
+                cp.timeout      = __constant_cpu_to_le16(1);
                 hci_send_cmd(hdev, HCI_OP_SNIFF_MODE, sizeof(cp), &cp);
         }
 }
@@ -327,7 +312,7 @@ static void hci_conn_auto_accept(unsigned long arg)
         struct hci_dev *hdev = conn->hdev;
 
         hci_send_cmd(hdev, HCI_OP_USER_CONFIRM_REPLY, sizeof(conn->dst),
-                                                                &conn->dst);
+                     &conn->dst);
 }
 
 struct hci_conn *hci_conn_add(struct hci_dev *hdev, int type, bdaddr_t *dst)
@@ -376,7 +361,7 @@ struct hci_conn *hci_conn_add(struct hci_dev *hdev, int type, bdaddr_t *dst)
         INIT_DELAYED_WORK(&conn->disc_work, hci_conn_timeout);
         setup_timer(&conn->idle_timer, hci_conn_idle, (unsigned long)conn);
         setup_timer(&conn->auto_accept_timer, hci_conn_auto_accept,
-                                                        (unsigned long) conn);
+                    (unsigned long) conn);
 
         atomic_set(&conn->refcnt, 0);
 
@@ -425,9 +410,11 @@ int hci_conn_del(struct hci_conn *conn)
                 }
         }
 
-
         hci_chan_list_flush(conn);
 
+        if (conn->amp_mgr)
+                amp_mgr_put(conn->amp_mgr);
+
         hci_conn_hash_del(hdev, conn);
         if (hdev->notify)
                 hdev->notify(hdev, HCI_NOTIFY_CONN_DEL);
@@ -454,7 +441,8 @@ struct hci_dev *hci_get_route(bdaddr_t *dst, bdaddr_t *src)
         read_lock(&hci_dev_list_lock);
 
         list_for_each_entry(d, &hci_dev_list, list) {
-                if (!test_bit(HCI_UP, &d->flags) || test_bit(HCI_RAW, &d->flags))
+                if (!test_bit(HCI_UP, &d->flags) ||
+                    test_bit(HCI_RAW, &d->flags))
                         continue;
 
                 /* Simple routing:
@@ -495,6 +483,11 @@ struct hci_conn *hci_connect(struct hci_dev *hdev, int type, bdaddr_t *dst,
         if (type == LE_LINK) {
                 le = hci_conn_hash_lookup_ba(hdev, LE_LINK, dst);
                 if (!le) {
+                        le = hci_conn_hash_lookup_state(hdev, LE_LINK,
+                                                        BT_CONNECT);
+                        if (le)
+                                return ERR_PTR(-EBUSY);
+
                         le = hci_conn_add(hdev, LE_LINK, dst);
                         if (!le)
                                 return ERR_PTR(-ENOMEM);
@@ -545,7 +538,7 @@ struct hci_conn *hci_connect(struct hci_dev *hdev, int type, bdaddr_t *dst,
         hci_conn_hold(sco);
 
         if (acl->state == BT_CONNECTED &&
-                        (sco->state == BT_OPEN || sco->state == BT_CLOSED)) {
+            (sco->state == BT_OPEN || sco->state == BT_CLOSED)) {
                 set_bit(HCI_CONN_POWER_SAVE, &acl->flags);
                 hci_conn_enter_active_mode(acl, BT_POWER_FORCE_ACTIVE_ON);
 
@@ -560,7 +553,6 @@ struct hci_conn *hci_connect(struct hci_dev *hdev, int type, bdaddr_t *dst,
 
         return sco;
 }
-EXPORT_SYMBOL(hci_connect);
 
 /* Check link security requirement */
 int hci_conn_check_link_mode(struct hci_conn *conn)
@@ -572,7 +564,6 @@ int hci_conn_check_link_mode(struct hci_conn *conn)
 
         return 1;
 }
-EXPORT_SYMBOL(hci_conn_check_link_mode);
 
 /* Authenticate remote device */
 static int hci_conn_auth(struct hci_conn *conn, __u8 sec_level, __u8 auth_type)
@@ -600,7 +591,7 @@ static int hci_conn_auth(struct hci_conn *conn, __u8 sec_level, __u8 auth_type)
 
                 cp.handle = cpu_to_le16(conn->handle);
                 hci_send_cmd(conn->hdev, HCI_OP_AUTH_REQUESTED,
-                                                        sizeof(cp), &cp);
+                             sizeof(cp), &cp);
                 if (conn->key_type != 0xff)
                         set_bit(HCI_CONN_REAUTH_PEND, &conn->flags);
         }
@@ -618,7 +609,7 @@ static void hci_conn_encrypt(struct hci_conn *conn)
                 cp.handle  = cpu_to_le16(conn->handle);
                 cp.encrypt = 0x01;
                 hci_send_cmd(conn->hdev, HCI_OP_SET_CONN_ENCRYPT, sizeof(cp),
-                                                                        &cp);
+                             &cp);
         }
 }
 
@@ -648,8 +639,7 @@ int hci_conn_security(struct hci_conn *conn, __u8 sec_level, __u8 auth_type)
         /* An unauthenticated combination key has sufficient security for
            security level 1 and 2. */
         if (conn->key_type == HCI_LK_UNAUTH_COMBINATION &&
-                        (sec_level == BT_SECURITY_MEDIUM ||
-                        sec_level == BT_SECURITY_LOW))
+            (sec_level == BT_SECURITY_MEDIUM || sec_level == BT_SECURITY_LOW))
                 goto encrypt;
 
         /* A combination key has always sufficient security for the security
@@ -657,8 +647,7 @@ int hci_conn_security(struct hci_conn *conn, __u8 sec_level, __u8 auth_type)
            is generated using maximum PIN code length (16).
            For pre 2.1 units. */
         if (conn->key_type == HCI_LK_COMBINATION &&
-                        (sec_level != BT_SECURITY_HIGH ||
-                        conn->pin_length == 16))
+            (sec_level != BT_SECURITY_HIGH || conn->pin_length == 16))
                 goto encrypt;
 
 auth:
@@ -701,12 +690,11 @@ int hci_conn_change_link_key(struct hci_conn *conn)
                 struct hci_cp_change_conn_link_key cp;
                 cp.handle = cpu_to_le16(conn->handle);
                 hci_send_cmd(conn->hdev, HCI_OP_CHANGE_CONN_LINK_KEY,
-                                                        sizeof(cp), &cp);
+                             sizeof(cp), &cp);
         }
 
         return 0;
 }
-EXPORT_SYMBOL(hci_conn_change_link_key);
 
 /* Switch role */
 int hci_conn_switch_role(struct hci_conn *conn, __u8 role)
@@ -752,7 +740,7 @@ void hci_conn_enter_active_mode(struct hci_conn *conn, __u8 force_active)
 timer:
         if (hdev->idle_timeout > 0)
                 mod_timer(&conn->idle_timer,
-                        jiffies + msecs_to_jiffies(hdev->idle_timeout));
+                          jiffies + msecs_to_jiffies(hdev->idle_timeout));
 }
 
 /* Drop all connection on the device */
@@ -802,7 +790,7 @@ EXPORT_SYMBOL(hci_conn_put_device);
 
 int hci_get_conn_list(void __user *arg)
 {
-        register struct hci_conn *c;
+        struct hci_conn *c;
         struct hci_conn_list_req req, *cl;
         struct hci_conn_info *ci;
         struct hci_dev *hdev;
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
index 411ace8e647..08994ecc3b6 100644
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
@@ -25,28 +25,10 @@
 
 /* Bluetooth HCI core. */
 
-#include <linux/jiffies.h>
-#include <linux/module.h>
-#include <linux/kmod.h>
-
-#include <linux/types.h>
-#include <linux/errno.h>
-#include <linux/kernel.h>
-#include <linux/sched.h>
-#include <linux/slab.h>
-#include <linux/poll.h>
-#include <linux/fcntl.h>
-#include <linux/init.h>
-#include <linux/skbuff.h>
-#include <linux/workqueue.h>
-#include <linux/interrupt.h>
-#include <linux/rfkill.h>
-#include <linux/timer.h>
-#include <linux/crypto.h>
-#include <net/sock.h>
+#include <linux/export.h>
+#include <linux/idr.h>
 
-#include <linux/uaccess.h>
-#include <asm/unaligned.h>
+#include <linux/rfkill.h>
 
 #include <net/bluetooth/bluetooth.h>
 #include <net/bluetooth/hci_core.h>
@@ -65,6 +47,9 @@ DEFINE_RWLOCK(hci_dev_list_lock);
 LIST_HEAD(hci_cb_list);
 DEFINE_RWLOCK(hci_cb_list_lock);
 
+/* HCI ID Numbering */
+static DEFINE_IDA(hci_index_ida);
+
 /* ---- HCI notifications ---- */
 
 static void hci_notify(struct hci_dev *hdev, int event)
@@ -124,8 +109,9 @@ static void hci_req_cancel(struct hci_dev *hdev, int err)
 }
 
 /* Execute request and wait for completion. */
-static int __hci_request(struct hci_dev *hdev, void (*req)(struct hci_dev *hdev, unsigned long opt),
-                                        unsigned long opt, __u32 timeout)
+static int __hci_request(struct hci_dev *hdev,
+                         void (*req)(struct hci_dev *hdev, unsigned long opt),
+                         unsigned long opt, __u32 timeout)
 {
         DECLARE_WAITQUEUE(wait, current);
         int err = 0;
@@ -166,8 +152,9 @@ static int __hci_request(struct hci_dev *hdev, void (*req)(struct hci_dev *hdev,
         return err;
 }
 
-static inline int hci_request(struct hci_dev *hdev, void (*req)(struct hci_dev *hdev, unsigned long opt),
-                                        unsigned long opt, __u32 timeout)
+static int hci_request(struct hci_dev *hdev,
+                       void (*req)(struct hci_dev *hdev, unsigned long opt),
+                       unsigned long opt, __u32 timeout)
 {
         int ret;
 
@@ -202,7 +189,7 @@ static void bredr_init(struct hci_dev *hdev)
         /* Mandatory initialization */
 
         /* Reset */
-        if (!test_bit(HCI_QUIRK_NO_RESET, &hdev->quirks)) {
+        if (!test_bit(HCI_QUIRK_RESET_ON_CLOSE, &hdev->quirks)) {
                 set_bit(HCI_RESET, &hdev->flags);
                 hci_send_cmd(hdev, HCI_OP_RESET, 0, NULL);
         }
@@ -235,7 +222,7 @@ static void bredr_init(struct hci_dev *hdev)
         hci_send_cmd(hdev, HCI_OP_SET_EVENT_FLT, 1, &flt_type);
 
         /* Connection accept timeout ~20 secs */
-        param = cpu_to_le16(0x7d00);
+        param = __constant_cpu_to_le16(0x7d00);
         hci_send_cmd(hdev, HCI_OP_WRITE_CA_TIMEOUT, 2, &param);
 
         bacpy(&cp.bdaddr, BDADDR_ANY);
@@ -417,7 +404,8 @@ static void inquiry_cache_flush(struct hci_dev *hdev)
         INIT_LIST_HEAD(&cache->resolve);
 }
 
-struct inquiry_entry *hci_inquiry_cache_lookup(struct hci_dev *hdev, bdaddr_t *bdaddr)
+struct inquiry_entry *hci_inquiry_cache_lookup(struct hci_dev *hdev,
+                                               bdaddr_t *bdaddr)
 {
         struct discovery_state *cache = &hdev->discovery;
         struct inquiry_entry *e;
@@ -478,7 +466,7 @@ void hci_inquiry_cache_update_resolve(struct hci_dev *hdev,
 
         list_for_each_entry(p, &cache->resolve, list) {
                 if (p->name_state != NAME_PENDING &&
-                                abs(p->data.rssi) >= abs(ie->data.rssi))
+                    abs(p->data.rssi) >= abs(ie->data.rssi))
                         break;
                 pos = &p->list;
         }
@@ -503,7 +491,7 @@ bool hci_inquiry_cache_update(struct hci_dev *hdev, struct inquiry_data *data,
                         *ssp = true;
 
                 if (ie->name_state == NAME_NEEDED &&
-                                                data->rssi != ie->data.rssi) {
+                    data->rssi != ie->data.rssi) {
                         ie->data.rssi = data->rssi;
                         hci_inquiry_cache_update_resolve(hdev, ie);
                 }
@@ -527,7 +515,7 @@ bool hci_inquiry_cache_update(struct hci_dev *hdev, struct inquiry_data *data,
 
 update:
         if (name_known && ie->name_state != NAME_KNOWN &&
-                                        ie->name_state != NAME_PENDING) {
+            ie->name_state != NAME_PENDING) {
                 ie->name_state = NAME_KNOWN;
                 list_del(&ie->list);
         }
@@ -605,8 +593,7 @@ int hci_inquiry(void __user *arg)
 
         hci_dev_lock(hdev);
         if (inquiry_cache_age(hdev) > INQUIRY_CACHE_AGE_MAX ||
-                                inquiry_cache_empty(hdev) ||
-                                ir.flags & IREQ_CACHE_FLUSH) {
+            inquiry_cache_empty(hdev) || ir.flags & IREQ_CACHE_FLUSH) {
                 inquiry_cache_flush(hdev);
                 do_inquiry = 1;
         }
@@ -620,7 +607,9 @@ int hci_inquiry(void __user *arg)
                         goto done;
         }
 
-        /* for unlimited number of responses we will use buffer with 255 entries */
+        /* for unlimited number of responses we will use buffer with
+         * 255 entries
+         */
         max_rsp = (ir.num_rsp == 0) ? 255 : ir.num_rsp;
 
         /* cache_dump can't sleep. Therefore we allocate temp buffer and then
@@ -641,7 +630,7 @@ int hci_inquiry(void __user *arg)
         if (!copy_to_user(ptr, &ir, sizeof(ir))) {
                 ptr += sizeof(ir);
                 if (copy_to_user(ptr, buf, sizeof(struct inquiry_info) *
-                                        ir.num_rsp))
+                                 ir.num_rsp))
                         err = -EFAULT;
         } else
                 err = -EFAULT;
@@ -702,11 +691,11 @@ int hci_dev_open(__u16 dev)
                 hdev->init_last_cmd = 0;
 
                 ret = __hci_request(hdev, hci_init_req, 0,
-                                        msecs_to_jiffies(HCI_INIT_TIMEOUT));
+                                    msecs_to_jiffies(HCI_INIT_TIMEOUT));
 
                 if (lmp_host_le_capable(hdev))
                         ret = __hci_request(hdev, hci_le_init_req, 0,
-                                        msecs_to_jiffies(HCI_INIT_TIMEOUT));
+                                            msecs_to_jiffies(HCI_INIT_TIMEOUT));
 
                 clear_bit(HCI_INIT, &hdev->flags);
         }
@@ -791,10 +780,10 @@ static int hci_dev_do_close(struct hci_dev *hdev)
         skb_queue_purge(&hdev->cmd_q);
         atomic_set(&hdev->cmd_cnt, 1);
         if (!test_bit(HCI_RAW, &hdev->flags) &&
-                                test_bit(HCI_QUIRK_NO_RESET, &hdev->quirks)) {
+            test_bit(HCI_QUIRK_RESET_ON_CLOSE, &hdev->quirks)) {
                 set_bit(HCI_INIT, &hdev->flags);
                 __hci_request(hdev, hci_reset_req, 0,
-                                        msecs_to_jiffies(250));
+                              msecs_to_jiffies(250));
                 clear_bit(HCI_INIT, &hdev->flags);
         }
 
@@ -884,7 +873,7 @@ int hci_dev_reset(__u16 dev)
 
         if (!test_bit(HCI_RAW, &hdev->flags))
                 ret = __hci_request(hdev, hci_reset_req, 0,
-                                        msecs_to_jiffies(HCI_INIT_TIMEOUT));
+                                    msecs_to_jiffies(HCI_INIT_TIMEOUT));
 
 done:
         hci_req_unlock(hdev);
@@ -924,7 +913,7 @@ int hci_dev_cmd(unsigned int cmd, void __user *arg)
         switch (cmd) {
         case HCISETAUTH:
                 err = hci_request(hdev, hci_auth_req, dr.dev_opt,
-                                        msecs_to_jiffies(HCI_INIT_TIMEOUT));
+                                  msecs_to_jiffies(HCI_INIT_TIMEOUT));
                 break;
 
         case HCISETENCRYPT:
@@ -936,23 +925,23 @@ int hci_dev_cmd(unsigned int cmd, void __user *arg)
                 if (!test_bit(HCI_AUTH, &hdev->flags)) {
                         /* Auth must be enabled first */
                         err = hci_request(hdev, hci_auth_req, dr.dev_opt,
-                                        msecs_to_jiffies(HCI_INIT_TIMEOUT));
+                                          msecs_to_jiffies(HCI_INIT_TIMEOUT));
                         if (err)
                                 break;
                 }
 
                 err = hci_request(hdev, hci_encrypt_req, dr.dev_opt,
-                                        msecs_to_jiffies(HCI_INIT_TIMEOUT));
+                                  msecs_to_jiffies(HCI_INIT_TIMEOUT));
                 break;
 
         case HCISETSCAN:
                 err = hci_request(hdev, hci_scan_req, dr.dev_opt,
-                                        msecs_to_jiffies(HCI_INIT_TIMEOUT));
+                                  msecs_to_jiffies(HCI_INIT_TIMEOUT));
                 break;
 
         case HCISETLINKPOL:
                 err = hci_request(hdev, hci_linkpol_req, dr.dev_opt,
-                                        msecs_to_jiffies(HCI_INIT_TIMEOUT));
+                                  msecs_to_jiffies(HCI_INIT_TIMEOUT));
                 break;
 
         case HCISETLINKMODE:
@@ -1103,7 +1092,7 @@ static void hci_power_on(struct work_struct *work)
 
         if (test_bit(HCI_AUTO_OFF, &hdev->dev_flags))
                 schedule_delayed_work(&hdev->power_off,
-                                        msecs_to_jiffies(AUTO_OFF_TIMEOUT));
+                                      msecs_to_jiffies(AUTO_OFF_TIMEOUT));
 
         if (test_and_clear_bit(HCI_SETUP, &hdev->dev_flags))
                 mgmt_index_added(hdev);
@@ -1112,7 +1101,7 @@ static void hci_power_on(struct work_struct *work)
 static void hci_power_off(struct work_struct *work)
 {
         struct hci_dev *hdev = container_of(work, struct hci_dev,
-                                                        power_off.work);
+                                            power_off.work);
 
         BT_DBG("%s", hdev->name);
 
@@ -1193,7 +1182,7 @@ struct link_key *hci_find_link_key(struct hci_dev *hdev, bdaddr_t *bdaddr)
 }
 
 static bool hci_persistent_key(struct hci_dev *hdev, struct hci_conn *conn,
-                                                u8 key_type, u8 old_key_type)
+                               u8 key_type, u8 old_key_type)
 {
         /* Legacy key */
         if (key_type < 0x03)
@@ -1234,7 +1223,7 @@ struct smp_ltk *hci_find_ltk(struct hci_dev *hdev, __le16 ediv, u8 rand[8])
 
         list_for_each_entry(k, &hdev->long_term_keys, list) {
                 if (k->ediv != ediv ||
-                                memcmp(rand, k->rand, sizeof(k->rand)))
+                    memcmp(rand, k->rand, sizeof(k->rand)))
                         continue;
 
                 return k;
@@ -1242,7 +1231,6 @@ struct smp_ltk *hci_find_ltk(struct hci_dev *hdev, __le16 ediv, u8 rand[8])
 
         return NULL;
 }
-EXPORT_SYMBOL(hci_find_ltk);
 
 struct smp_ltk *hci_find_ltk_by_addr(struct hci_dev *hdev, bdaddr_t *bdaddr,
                                      u8 addr_type)
@@ -1251,12 +1239,11 @@ struct smp_ltk *hci_find_ltk_by_addr(struct hci_dev *hdev, bdaddr_t *bdaddr,
 
         list_for_each_entry(k, &hdev->long_term_keys, list)
                 if (addr_type == k->bdaddr_type &&
-                                        bacmp(bdaddr, &k->bdaddr) == 0)
+                    bacmp(bdaddr, &k->bdaddr) == 0)
                         return k;
 
         return NULL;
 }
-EXPORT_SYMBOL(hci_find_ltk_by_addr);
 
 int hci_add_link_key(struct hci_dev *hdev, struct hci_conn *conn, int new_key,
                      bdaddr_t *bdaddr, u8 *val, u8 type, u8 pin_len)
@@ -1283,15 +1270,14 @@ int hci_add_link_key(struct hci_dev *hdev, struct hci_conn *conn, int new_key,
          * combination key for legacy pairing even when there's no
          * previous key */
         if (type == HCI_LK_CHANGED_COMBINATION &&
-                                        (!conn || conn->remote_auth == 0xff) &&
-                                        old_key_type == 0xff) {
+            (!conn || conn->remote_auth == 0xff) && old_key_type == 0xff) {
                 type = HCI_LK_COMBINATION;
                 if (conn)
                         conn->key_type = type;
         }
 
         bacpy(&key->bdaddr, bdaddr);
-        memcpy(key->val, val, 16);
+        memcpy(key->val, val, HCI_LINK_KEY_SIZE);
         key->pin_len = pin_len;
 
         if (type == HCI_LK_CHANGED_COMBINATION)
@@ -1540,6 +1526,7 @@ static void le_scan_enable_req(struct hci_dev *hdev, unsigned long opt)
 
         memset(&cp, 0, sizeof(cp));
         cp.enable = 1;
+        cp.filter_dup = 1;
 
         hci_send_cmd(hdev, HCI_OP_LE_SET_SCAN_ENABLE, sizeof(cp), &cp);
 }
@@ -1707,41 +1694,39 @@ EXPORT_SYMBOL(hci_free_dev);
 /* Register HCI device */
 int hci_register_dev(struct hci_dev *hdev)
 {
-        struct list_head *head, *p;
         int id, error;
 
         if (!hdev->open || !hdev->close)
                 return -EINVAL;
 
-        write_lock(&hci_dev_list_lock);
-
         /* Do not allow HCI_AMP devices to register at index 0,
          * so the index can be used as the AMP controller ID.
          */
-        id = (hdev->dev_type == HCI_BREDR) ? 0 : 1;
-        head = &hci_dev_list;
-
-        /* Find first available device id */
-        list_for_each(p, &hci_dev_list) {
-                int nid = list_entry(p, struct hci_dev, list)->id;
-                if (nid > id)
-                        break;
-                if (nid == id)
-                        id++;
-                head = p;
+        switch (hdev->dev_type) {
+        case HCI_BREDR:
+                id = ida_simple_get(&hci_index_ida, 0, 0, GFP_KERNEL);
+                break;
+        case HCI_AMP:
+                id = ida_simple_get(&hci_index_ida, 1, 0, GFP_KERNEL);
+                break;
+        default:
+                return -EINVAL;
         }
 
+        if (id < 0)
+                return id;
+
         sprintf(hdev->name, "hci%d", id);
         hdev->id = id;
 
         BT_DBG("%p name %s bus %d", hdev, hdev->name, hdev->bus);
 
-        list_add(&hdev->list, head);
-
+        write_lock(&hci_dev_list_lock);
+        list_add(&hdev->list, &hci_dev_list);
         write_unlock(&hci_dev_list_lock);
 
         hdev->workqueue = alloc_workqueue(hdev->name, WQ_HIGHPRI | WQ_UNBOUND |
-                                                        WQ_MEM_RECLAIM, 1);
+                                          WQ_MEM_RECLAIM, 1);
         if (!hdev->workqueue) {
                 error = -ENOMEM;
                 goto err;
@@ -1752,7 +1737,8 @@ int hci_register_dev(struct hci_dev *hdev)
                 goto err_wqueue;
 
         hdev->rfkill = rfkill_alloc(hdev->name, &hdev->dev,
-                                RFKILL_TYPE_BLUETOOTH, &hci_rfkill_ops, hdev);
+                                    RFKILL_TYPE_BLUETOOTH, &hci_rfkill_ops,
+                                    hdev);
         if (hdev->rfkill) {
                 if (rfkill_register(hdev->rfkill) < 0) {
                         rfkill_destroy(hdev->rfkill);
@@ -1772,6 +1758,7 @@ int hci_register_dev(struct hci_dev *hdev)
 err_wqueue:
         destroy_workqueue(hdev->workqueue);
 err:
+        ida_simple_remove(&hci_index_ida, hdev->id);
         write_lock(&hci_dev_list_lock);
         list_del(&hdev->list);
         write_unlock(&hci_dev_list_lock);
@@ -1783,12 +1770,14 @@ EXPORT_SYMBOL(hci_register_dev);
 /* Unregister HCI device */
 void hci_unregister_dev(struct hci_dev *hdev)
 {
-        int i;
+        int i, id;
 
         BT_DBG("%p name %s bus %d", hdev, hdev->name, hdev->bus);
 
         set_bit(HCI_UNREGISTER, &hdev->dev_flags);
 
+        id = hdev->id;
+
         write_lock(&hci_dev_list_lock);
         list_del(&hdev->list);
         write_unlock(&hci_dev_list_lock);
@@ -1799,7 +1788,7 @@ void hci_unregister_dev(struct hci_dev *hdev)
                 kfree_skb(hdev->reassembly[i]);
 
         if (!test_bit(HCI_INIT, &hdev->flags) &&
-                                !test_bit(HCI_SETUP, &hdev->dev_flags)) {
+            !test_bit(HCI_SETUP, &hdev->dev_flags)) {
                 hci_dev_lock(hdev);
                 mgmt_index_removed(hdev);
                 hci_dev_unlock(hdev);
@@ -1829,6 +1818,8 @@ void hci_unregister_dev(struct hci_dev *hdev)
         hci_dev_unlock(hdev);
 
         hci_dev_put(hdev);
+
+        ida_simple_remove(&hci_index_ida, id);
 }
 EXPORT_SYMBOL(hci_unregister_dev);
 
@@ -1853,7 +1844,7 @@ int hci_recv_frame(struct sk_buff *skb)
 {
         struct hci_dev *hdev = (struct hci_dev *) skb->dev;
         if (!hdev || (!test_bit(HCI_UP, &hdev->flags)
-                                && !test_bit(HCI_INIT, &hdev->flags))) {
+                      && !test_bit(HCI_INIT, &hdev->flags))) {
                 kfree_skb(skb);
                 return -ENXIO;
         }
@@ -1872,7 +1863,7 @@ int hci_recv_frame(struct sk_buff *skb)
 EXPORT_SYMBOL(hci_recv_frame);
 
 static int hci_reassembly(struct hci_dev *hdev, int type, void *data,
-                                                  int count, __u8 index)
+                          int count, __u8 index)
 {
         int len = 0;
         int hlen = 0;
@@ -1881,7 +1872,7 @@ static int hci_reassembly(struct hci_dev *hdev, int type, void *data,
         struct bt_skb_cb *scb;
 
         if ((type < HCI_ACLDATA_PKT || type > HCI_EVENT_PKT) ||
-                                index >= NUM_REASSEMBLY)
+            index >= NUM_REASSEMBLY)
                 return -EILSEQ;
 
         skb = hdev->reassembly[index];
@@ -2023,7 +2014,7 @@ int hci_recv_stream_fragment(struct hci_dev *hdev, void *data, int count)
                         type = bt_cb(skb)->pkt_type;
 
                 rem = hci_reassembly(hdev, type, data, count,
-                                                        STREAM_REASSEMBLY);
+                                     STREAM_REASSEMBLY);
                 if (rem < 0)
                         return rem;
 
@@ -2157,7 +2148,7 @@ static void hci_add_acl_hdr(struct sk_buff *skb, __u16 handle, __u16 flags)
 }
 
 static void hci_queue_acl(struct hci_conn *conn, struct sk_buff_head *queue,
-                                struct sk_buff *skb, __u16 flags)
+                          struct sk_buff *skb, __u16 flags)
 {
         struct hci_dev *hdev = conn->hdev;
         struct sk_buff *list;
@@ -2216,7 +2207,6 @@ void hci_send_acl(struct hci_chan *chan, struct sk_buff *skb, __u16 flags)
 
         queue_work(hdev->workqueue, &hdev->tx_work);
 }
-EXPORT_SYMBOL(hci_send_acl);
 
 /* Send SCO data */
 void hci_send_sco(struct hci_conn *conn, struct sk_buff *skb)
@@ -2239,12 +2229,12 @@ void hci_send_sco(struct hci_conn *conn, struct sk_buff *skb)
         skb_queue_tail(&conn->data_q, skb);
         queue_work(hdev->workqueue, &hdev->tx_work);
 }
-EXPORT_SYMBOL(hci_send_sco);
 
 /* ---- HCI TX task (outgoing data) ---- */
 
 /* HCI Connection scheduler */
-static inline struct hci_conn *hci_low_sent(struct hci_dev *hdev, __u8 type, int *quote)
+static struct hci_conn *hci_low_sent(struct hci_dev *hdev, __u8 type,
+                                     int *quote)
 {
         struct hci_conn_hash *h = &hdev->conn_hash;
         struct hci_conn *conn = NULL, *c;
@@ -2303,7 +2293,7 @@ static inline struct hci_conn *hci_low_sent(struct hci_dev *hdev, __u8 type, int
         return conn;
 }
 
-static inline void hci_link_tx_to(struct hci_dev *hdev, __u8 type)
+static void hci_link_tx_to(struct hci_dev *hdev, __u8 type)
 {
         struct hci_conn_hash *h = &hdev->conn_hash;
         struct hci_conn *c;
@@ -2316,16 +2306,16 @@ static inline void hci_link_tx_to(struct hci_dev *hdev, __u8 type)
         list_for_each_entry_rcu(c, &h->list, list) {
                 if (c->type == type && c->sent) {
                         BT_ERR("%s killing stalled connection %s",
-                                hdev->name, batostr(&c->dst));
-                        hci_acl_disconn(c, 0x13);
+                               hdev->name, batostr(&c->dst));
+                        hci_acl_disconn(c, HCI_ERROR_REMOTE_USER_TERM);
                 }
         }
 
         rcu_read_unlock();
 }
 
-static inline struct hci_chan *hci_chan_sent(struct hci_dev *hdev, __u8 type,
-                                                int *quote)
+static struct hci_chan *hci_chan_sent(struct hci_dev *hdev, __u8 type,
+                                      int *quote)
 {
         struct hci_conn_hash *h = &hdev->conn_hash;
         struct hci_chan *chan = NULL;
@@ -2442,7 +2432,7 @@ static void hci_prio_recalculate(struct hci_dev *hdev, __u8 type)
                         skb->priority = HCI_PRIO_MAX - 1;
 
                         BT_DBG("chan %p skb %p promoted to %d", chan, skb,
-                                                                skb->priority);
+                               skb->priority);
                 }
 
                 if (hci_conn_num(hdev, type) == num)
@@ -2459,18 +2449,18 @@ static inline int __get_blocks(struct hci_dev *hdev, struct sk_buff *skb)
         return DIV_ROUND_UP(skb->len - HCI_ACL_HDR_SIZE, hdev->block_len);
 }
 
-static inline void __check_timeout(struct hci_dev *hdev, unsigned int cnt)
+static void __check_timeout(struct hci_dev *hdev, unsigned int cnt)
 {
         if (!test_bit(HCI_RAW, &hdev->flags)) {
                 /* ACL tx timeout must be longer than maximum
                  * link supervision timeout (40.9 seconds) */
                 if (!cnt && time_after(jiffies, hdev->acl_last_tx +
-                                        msecs_to_jiffies(HCI_ACL_TX_TIMEOUT)))
+                                       msecs_to_jiffies(HCI_ACL_TX_TIMEOUT)))
                         hci_link_tx_to(hdev, ACL_LINK);
         }
 }
 
-static inline void hci_sched_acl_pkt(struct hci_dev *hdev)
+static void hci_sched_acl_pkt(struct hci_dev *hdev)
 {
         unsigned int cnt = hdev->acl_cnt;
         struct hci_chan *chan;
@@ -2480,11 +2470,11 @@ static inline void hci_sched_acl_pkt(struct hci_dev *hdev)
         __check_timeout(hdev, cnt);
 
         while (hdev->acl_cnt &&
-                        (chan = hci_chan_sent(hdev, ACL_LINK, &quote))) {
+               (chan = hci_chan_sent(hdev, ACL_LINK, &quote))) {
                 u32 priority = (skb_peek(&chan->data_q))->priority;
                 while (quote-- && (skb = skb_peek(&chan->data_q))) {
                         BT_DBG("chan %p skb %p len %d priority %u", chan, skb,
-                                        skb->len, skb->priority);
+                               skb->len, skb->priority);
 
                         /* Stop if priority has changed */
                         if (skb->priority < priority)
@@ -2508,7 +2498,7 @@ static inline void hci_sched_acl_pkt(struct hci_dev *hdev)
                 hci_prio_recalculate(hdev, ACL_LINK);
 }
 
-static inline void hci_sched_acl_blk(struct hci_dev *hdev)
+static void hci_sched_acl_blk(struct hci_dev *hdev)
 {
         unsigned int cnt = hdev->block_cnt;
         struct hci_chan *chan;
@@ -2518,13 +2508,13 @@ static inline void hci_sched_acl_blk(struct hci_dev *hdev)
         __check_timeout(hdev, cnt);
 
         while (hdev->block_cnt > 0 &&
-                        (chan = hci_chan_sent(hdev, ACL_LINK, &quote))) {
+               (chan = hci_chan_sent(hdev, ACL_LINK, &quote))) {
                 u32 priority = (skb_peek(&chan->data_q))->priority;
                 while (quote > 0 && (skb = skb_peek(&chan->data_q))) {
                         int blocks;
 
                         BT_DBG("chan %p skb %p len %d priority %u", chan, skb,
-                                                skb->len, skb->priority);
+                               skb->len, skb->priority);
 
                         /* Stop if priority has changed */
                         if (skb->priority < priority)
@@ -2537,7 +2527,7 @@ static inline void hci_sched_acl_blk(struct hci_dev *hdev)
                                 return;
 
                         hci_conn_enter_active_mode(chan->conn,
-                                                bt_cb(skb)->force_active);
+                                                   bt_cb(skb)->force_active);
 
                         hci_send_frame(skb);
                         hdev->acl_last_tx = jiffies;
@@ -2554,7 +2544,7 @@ static inline void hci_sched_acl_blk(struct hci_dev *hdev)
                 hci_prio_recalculate(hdev, ACL_LINK);
 }
 
-static inline void hci_sched_acl(struct hci_dev *hdev)
+static void hci_sched_acl(struct hci_dev *hdev)
 {
         BT_DBG("%s", hdev->name);
 
@@ -2573,7 +2563,7 @@ static inline void hci_sched_acl(struct hci_dev *hdev)
 }
 
 /* Schedule SCO */
-static inline void hci_sched_sco(struct hci_dev *hdev)
+static void hci_sched_sco(struct hci_dev *hdev)
 {
         struct hci_conn *conn;
         struct sk_buff *skb;
@@ -2596,7 +2586,7 @@ static inline void hci_sched_sco(struct hci_dev *hdev)
         }
 }
 
-static inline void hci_sched_esco(struct hci_dev *hdev)
+static void hci_sched_esco(struct hci_dev *hdev)
 {
         struct hci_conn *conn;
         struct sk_buff *skb;
@@ -2607,7 +2597,8 @@ static inline void hci_sched_esco(struct hci_dev *hdev)
         if (!hci_conn_num(hdev, ESCO_LINK))
                 return;
 
-        while (hdev->sco_cnt && (conn = hci_low_sent(hdev, ESCO_LINK, &quote))) {
+        while (hdev->sco_cnt && (conn = hci_low_sent(hdev, ESCO_LINK,
+                                                     &quote))) {
                 while (quote-- && (skb = skb_dequeue(&conn->data_q))) {
                         BT_DBG("skb %p len %d", skb, skb->len);
                         hci_send_frame(skb);
@@ -2619,7 +2610,7 @@ static inline void hci_sched_esco(struct hci_dev *hdev)
         }
 }
 
-static inline void hci_sched_le(struct hci_dev *hdev)
+static void hci_sched_le(struct hci_dev *hdev)
 {
         struct hci_chan *chan;
         struct sk_buff *skb;
@@ -2634,7 +2625,7 @@ static inline void hci_sched_le(struct hci_dev *hdev)
                 /* LE tx timeout must be longer than maximum
                  * link supervision timeout (40.9 seconds) */
                 if (!hdev->le_cnt && hdev->le_pkts &&
-                                time_after(jiffies, hdev->le_last_tx + HZ * 45))
+                    time_after(jiffies, hdev->le_last_tx + HZ * 45))
                         hci_link_tx_to(hdev, LE_LINK);
         }
 
@@ -2644,7 +2635,7 @@ static inline void hci_sched_le(struct hci_dev *hdev)
                 u32 priority = (skb_peek(&chan->data_q))->priority;
                 while (quote-- && (skb = skb_peek(&chan->data_q))) {
                         BT_DBG("chan %p skb %p len %d priority %u", chan, skb,
-                                        skb->len, skb->priority);
+                               skb->len, skb->priority);
 
                         /* Stop if priority has changed */
                         if (skb->priority < priority)
@@ -2676,7 +2667,7 @@ static void hci_tx_work(struct work_struct *work)
         struct sk_buff *skb;
 
         BT_DBG("%s acl %d sco %d le %d", hdev->name, hdev->acl_cnt,
-                hdev->sco_cnt, hdev->le_cnt);
+               hdev->sco_cnt, hdev->le_cnt);
 
         /* Schedule queues and send stuff to HCI driver */
 
@@ -2696,7 +2687,7 @@ static void hci_tx_work(struct work_struct *work)
 /* ----- HCI RX task (incoming data processing) ----- */
 
 /* ACL data packet */
-static inline void hci_acldata_packet(struct hci_dev *hdev, struct sk_buff *skb)
+static void hci_acldata_packet(struct hci_dev *hdev, struct sk_buff *skb)
 {
         struct hci_acl_hdr *hdr = (void *) skb->data;
         struct hci_conn *conn;
@@ -2708,7 +2699,8 @@ static inline void hci_acldata_packet(struct hci_dev *hdev, struct sk_buff *skb)
         flags  = hci_flags(handle);
         handle = hci_handle(handle);
 
-        BT_DBG("%s len %d handle 0x%x flags 0x%x", hdev->name, skb->len, handle, flags);
+        BT_DBG("%s len %d handle 0x%x flags 0x%x", hdev->name, skb->len,
+               handle, flags);
 
         hdev->stat.acl_rx++;
 
@@ -2732,14 +2724,14 @@ static inline void hci_acldata_packet(struct hci_dev *hdev, struct sk_buff *skb)
                 return;
         } else {
                 BT_ERR("%s ACL packet for unknown connection handle %d",
-                        hdev->name, handle);
+                       hdev->name, handle);
         }
 
         kfree_skb(skb);
 }
 
 /* SCO data packet */
-static inline void hci_scodata_packet(struct hci_dev *hdev, struct sk_buff *skb)
+static void hci_scodata_packet(struct hci_dev *hdev, struct sk_buff *skb)
 {
         struct hci_sco_hdr *hdr = (void *) skb->data;
         struct hci_conn *conn;
@@ -2763,7 +2755,7 @@ static inline void hci_scodata_packet(struct hci_dev *hdev, struct sk_buff *skb)
                 return;
         } else {
                 BT_ERR("%s SCO packet for unknown connection handle %d",
-                        hdev->name, handle);
+                       hdev->name, handle);
         }
 
         kfree_skb(skb);
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index 94ad124a4ea..1ba929c05d0 100644
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -24,20 +24,7 @@
 
 /* Bluetooth HCI event handling. */
 
-#include <linux/module.h>
-
-#include <linux/types.h>
-#include <linux/errno.h>
-#include <linux/kernel.h>
-#include <linux/slab.h>
-#include <linux/poll.h>
-#include <linux/fcntl.h>
-#include <linux/init.h>
-#include <linux/skbuff.h>
-#include <linux/interrupt.h>
-#include <net/sock.h>
-
-#include <linux/uaccess.h>
+#include <linux/export.h>
 #include <asm/unaligned.h>
 
 #include <net/bluetooth/bluetooth.h>
@@ -95,7 +82,8 @@ static void hci_cc_exit_periodic_inq(struct hci_dev *hdev, struct sk_buff *skb)
         hci_conn_check_pending(hdev);
 }
 
-static void hci_cc_remote_name_req_cancel(struct hci_dev *hdev, struct sk_buff *skb)
+static void hci_cc_remote_name_req_cancel(struct hci_dev *hdev,
+                                          struct sk_buff *skb)
 {
         BT_DBG("%s", hdev->name);
 }
@@ -166,7 +154,8 @@ static void hci_cc_write_link_policy(struct hci_dev *hdev, struct sk_buff *skb)
         hci_dev_unlock(hdev);
 }
 
-static void hci_cc_read_def_link_policy(struct hci_dev *hdev, struct sk_buff *skb)
+static void hci_cc_read_def_link_policy(struct hci_dev *hdev,
+                                        struct sk_buff *skb)
 {
         struct hci_rp_read_def_link_policy *rp = (void *) skb->data;
 
@@ -178,7 +167,8 @@ static void hci_cc_read_def_link_policy(struct hci_dev *hdev, struct sk_buff *sk
         hdev->link_policy = __le16_to_cpu(rp->policy);
 }
 
-static void hci_cc_write_def_link_policy(struct hci_dev *hdev, struct sk_buff *skb)
+static void hci_cc_write_def_link_policy(struct hci_dev *hdev,
+                                         struct sk_buff *skb)
 {
         __u8 status = *((__u8 *) skb->data);
         void *sent;
@@ -329,7 +319,7 @@ static void hci_cc_write_scan_enable(struct hci_dev *hdev, struct sk_buff *skb)
                 if (hdev->discov_timeout > 0) {
                         int to = msecs_to_jiffies(hdev->discov_timeout * 1000);
                         queue_delayed_work(hdev->workqueue, &hdev->discov_off,
-                                                                        to);
+                                           to);
                 }
         } else if (old_iscan)
                 mgmt_discoverable(hdev, 0);
@@ -358,7 +348,7 @@ static void hci_cc_read_class_of_dev(struct hci_dev *hdev, struct sk_buff *skb)
         memcpy(hdev->dev_class, rp->dev_class, 3);
 
         BT_DBG("%s class 0x%.2x%.2x%.2x", hdev->name,
-                hdev->dev_class[2], hdev->dev_class[1], hdev->dev_class[0]);
+               hdev->dev_class[2], hdev->dev_class[1], hdev->dev_class[0]);
 }
 
 static void hci_cc_write_class_of_dev(struct hci_dev *hdev, struct sk_buff *skb)
@@ -406,7 +396,8 @@ static void hci_cc_read_voice_setting(struct hci_dev *hdev, struct sk_buff *skb)
                 hdev->notify(hdev, HCI_NOTIFY_VOICE_SETTING);
 }
 
-static void hci_cc_write_voice_setting(struct hci_dev *hdev, struct sk_buff *skb)
+static void hci_cc_write_voice_setting(struct hci_dev *hdev,
+                                       struct sk_buff *skb)
 {
         __u8 status = *((__u8 *) skb->data);
         __u16 setting;
@@ -473,7 +464,7 @@ static u8 hci_get_inquiry_mode(struct hci_dev *hdev)
                 return 1;
 
         if (hdev->manufacturer == 11 && hdev->hci_rev == 0x00 &&
-                                                hdev->lmp_subver == 0x0757)
+            hdev->lmp_subver == 0x0757)
                 return 1;
 
         if (hdev->manufacturer == 15) {
@@ -486,7 +477,7 @@ static u8 hci_get_inquiry_mode(struct hci_dev *hdev)
         }
 
         if (hdev->manufacturer == 31 && hdev->hci_rev == 0x2005 &&
-                                                hdev->lmp_subver == 0x1805)
+            hdev->lmp_subver == 0x1805)
                 return 1;
 
         return 0;
@@ -566,7 +557,7 @@ static void hci_setup(struct hci_dev *hdev)
         if (hdev->hci_ver > BLUETOOTH_VER_1_1)
                 hci_send_cmd(hdev, HCI_OP_READ_LOCAL_COMMANDS, 0, NULL);
 
-        if (hdev->features[6] & LMP_SIMPLE_PAIR) {
+        if (lmp_ssp_capable(hdev)) {
                 if (test_bit(HCI_SSP_ENABLED, &hdev->dev_flags)) {
                         u8 mode = 0x01;
                         hci_send_cmd(hdev, HCI_OP_WRITE_SSP_MODE,
@@ -618,8 +609,7 @@ static void hci_cc_read_local_version(struct hci_dev *hdev, struct sk_buff *skb)
         hdev->lmp_subver = __le16_to_cpu(rp->lmp_subver);
 
         BT_DBG("%s manufacturer %d hci ver %d:%d", hdev->name,
-                                        hdev->manufacturer,
-                                        hdev->hci_ver, hdev->hci_rev);
+               hdev->manufacturer, hdev->hci_ver, hdev->hci_rev);
 
         if (test_bit(HCI_INIT, &hdev->flags))
                 hci_setup(hdev);
@@ -646,7 +636,8 @@ static void hci_setup_link_policy(struct hci_dev *hdev)
         hci_send_cmd(hdev, HCI_OP_WRITE_DEF_LINK_POLICY, sizeof(cp), &cp);
 }
 
-static void hci_cc_read_local_commands(struct hci_dev *hdev, struct sk_buff *skb)
+static void hci_cc_read_local_commands(struct hci_dev *hdev,
+                                       struct sk_buff *skb)
 {
         struct hci_rp_read_local_commands *rp = (void *) skb->data;
 
@@ -664,7 +655,8 @@ done:
         hci_req_complete(hdev, HCI_OP_READ_LOCAL_COMMANDS, rp->status);
 }
 
-static void hci_cc_read_local_features(struct hci_dev *hdev, struct sk_buff *skb)
+static void hci_cc_read_local_features(struct hci_dev *hdev,
+                                       struct sk_buff *skb)
 {
         struct hci_rp_read_local_features *rp = (void *) skb->data;
 
@@ -713,10 +705,10 @@ static void hci_cc_read_local_features(struct hci_dev *hdev, struct sk_buff *skb
                 hdev->esco_type |= (ESCO_2EV5 | ESCO_3EV5);
 
         BT_DBG("%s features 0x%.2x%.2x%.2x%.2x%.2x%.2x%.2x%.2x", hdev->name,
-                                        hdev->features[0], hdev->features[1],
-                                        hdev->features[2], hdev->features[3],
-                                        hdev->features[4], hdev->features[5],
-                                        hdev->features[6], hdev->features[7]);
+               hdev->features[0], hdev->features[1],
+               hdev->features[2], hdev->features[3],
+               hdev->features[4], hdev->features[5],
+               hdev->features[6], hdev->features[7]);
 }
 
 static void hci_set_le_support(struct hci_dev *hdev)
@@ -736,7 +728,7 @@ static void hci_set_le_support(struct hci_dev *hdev)
 }
 
 static void hci_cc_read_local_ext_features(struct hci_dev *hdev,
-                                                        struct sk_buff *skb)
+                                           struct sk_buff *skb)
 {
         struct hci_rp_read_local_ext_features *rp = (void *) skb->data;
 
@@ -762,7 +754,7 @@ done:
 }
 
 static void hci_cc_read_flow_control_mode(struct hci_dev *hdev,
-                                                struct sk_buff *skb)
+                                          struct sk_buff *skb)
 {
         struct hci_rp_read_flow_control_mode *rp = (void *) skb->data;
 
@@ -798,9 +790,8 @@ static void hci_cc_read_buffer_size(struct hci_dev *hdev, struct sk_buff *skb)
         hdev->acl_cnt = hdev->acl_pkts;
         hdev->sco_cnt = hdev->sco_pkts;
 
-        BT_DBG("%s acl mtu %d:%d sco mtu %d:%d", hdev->name,
-                                        hdev->acl_mtu, hdev->acl_pkts,
-                                        hdev->sco_mtu, hdev->sco_pkts);
+        BT_DBG("%s acl mtu %d:%d sco mtu %d:%d", hdev->name, hdev->acl_mtu,
+               hdev->acl_pkts, hdev->sco_mtu, hdev->sco_pkts);
 }
 
 static void hci_cc_read_bd_addr(struct hci_dev *hdev, struct sk_buff *skb)
@@ -816,7 +807,7 @@ static void hci_cc_read_bd_addr(struct hci_dev *hdev, struct sk_buff *skb)
 }
 
 static void hci_cc_read_data_block_size(struct hci_dev *hdev,
-                                                        struct sk_buff *skb)
+                                        struct sk_buff *skb)
 {
         struct hci_rp_read_data_block_size *rp = (void *) skb->data;
 
@@ -832,7 +823,7 @@ static void hci_cc_read_data_block_size(struct hci_dev *hdev,
         hdev->block_cnt = hdev->num_blocks;
 
         BT_DBG("%s blk mtu %d cnt %d len %d", hdev->name, hdev->block_mtu,
-                                        hdev->block_cnt, hdev->block_len);
+               hdev->block_cnt, hdev->block_len);
 
         hci_req_complete(hdev, HCI_OP_READ_DATA_BLOCK_SIZE, rp->status);
 }
@@ -847,7 +838,7 @@ static void hci_cc_write_ca_timeout(struct hci_dev *hdev, struct sk_buff *skb)
 }
 
 static void hci_cc_read_local_amp_info(struct hci_dev *hdev,
-                struct sk_buff *skb)
+                                       struct sk_buff *skb)
 {
         struct hci_rp_read_local_amp_info *rp = (void *) skb->data;
 
@@ -871,7 +862,7 @@ static void hci_cc_read_local_amp_info(struct hci_dev *hdev,
 }
 
 static void hci_cc_delete_stored_link_key(struct hci_dev *hdev,
-                                                        struct sk_buff *skb)
+                                          struct sk_buff *skb)
 {
         __u8 status = *((__u8 *) skb->data);
 
@@ -890,7 +881,7 @@ static void hci_cc_set_event_mask(struct hci_dev *hdev, struct sk_buff *skb)
 }
 
 static void hci_cc_write_inquiry_mode(struct hci_dev *hdev,
-                                                        struct sk_buff *skb)
+                                      struct sk_buff *skb)
 {
         __u8 status = *((__u8 *) skb->data);
 
@@ -900,7 +891,7 @@ static void hci_cc_write_inquiry_mode(struct hci_dev *hdev,
 }
 
 static void hci_cc_read_inq_rsp_tx_power(struct hci_dev *hdev,
-                                                        struct sk_buff *skb)
+                                         struct sk_buff *skb)
 {
         struct hci_rp_read_inq_rsp_tx_power *rp = (void *) skb->data;
 
@@ -959,7 +950,7 @@ static void hci_cc_pin_code_neg_reply(struct hci_dev *hdev, struct sk_buff *skb)
 
         if (test_bit(HCI_MGMT, &hdev->dev_flags))
                 mgmt_pin_code_neg_reply_complete(hdev, &rp->bdaddr,
-                                                                rp->status);
+                                                 rp->status);
 
         hci_dev_unlock(hdev);
 }
@@ -1000,7 +991,7 @@ static void hci_cc_user_confirm_reply(struct hci_dev *hdev, struct sk_buff *skb)
 }
 
 static void hci_cc_user_confirm_neg_reply(struct hci_dev *hdev,
-                                                        struct sk_buff *skb)
+                                          struct sk_buff *skb)
 {
         struct hci_rp_user_confirm_reply *rp = (void *) skb->data;
 
@@ -1031,7 +1022,7 @@ static void hci_cc_user_passkey_reply(struct hci_dev *hdev, struct sk_buff *skb)
 }
 
 static void hci_cc_user_passkey_neg_reply(struct hci_dev *hdev,
-                                                        struct sk_buff *skb)
+                                          struct sk_buff *skb)
 {
         struct hci_rp_user_confirm_reply *rp = (void *) skb->data;
 
@@ -1047,7 +1038,7 @@ static void hci_cc_user_passkey_neg_reply(struct hci_dev *hdev,
 }
 
 static void hci_cc_read_local_oob_data_reply(struct hci_dev *hdev,
-                                                        struct sk_buff *skb)
+                                             struct sk_buff *skb)
 {
         struct hci_rp_read_local_oob_data *rp = (void *) skb->data;
 
@@ -1076,7 +1067,7 @@ static void hci_cc_le_set_scan_param(struct hci_dev *hdev, struct sk_buff *skb)
 }
 
 static void hci_cc_le_set_scan_enable(struct hci_dev *hdev,
-                                        struct sk_buff *skb)
+                                      struct sk_buff *skb)
 {
         struct hci_cp_le_set_scan_enable *cp;
         __u8 status = *((__u8 *) skb->data);
@@ -1156,8 +1147,8 @@ static void hci_cc_le_ltk_neg_reply(struct hci_dev *hdev, struct sk_buff *skb)
         hci_req_complete(hdev, HCI_OP_LE_LTK_NEG_REPLY, rp->status);
 }
 
-static inline void hci_cc_write_le_host_supported(struct hci_dev *hdev,
-                                                        struct sk_buff *skb)
+static void hci_cc_write_le_host_supported(struct hci_dev *hdev,
+                                           struct sk_buff *skb)
 {
         struct hci_cp_write_le_host_supported *sent;
         __u8 status = *((__u8 *) skb->data);
@@ -1176,13 +1167,13 @@ static inline void hci_cc_write_le_host_supported(struct hci_dev *hdev,
         }
 
         if (test_bit(HCI_MGMT, &hdev->dev_flags) &&
-                                        !test_bit(HCI_INIT, &hdev->flags))
+            !test_bit(HCI_INIT, &hdev->flags))
                 mgmt_le_enable_complete(hdev, sent->le, status);
 
         hci_req_complete(hdev, HCI_OP_WRITE_LE_HOST_SUPPORTED, status);
 }
 
-static inline void hci_cs_inquiry(struct hci_dev *hdev, __u8 status)
+static void hci_cs_inquiry(struct hci_dev *hdev, __u8 status)
 {
         BT_DBG("%s status 0x%x", hdev->name, status);
 
@@ -1203,7 +1194,7 @@ static inline void hci_cs_inquiry(struct hci_dev *hdev, __u8 status)
         hci_dev_unlock(hdev);
 }
 
-static inline void hci_cs_create_conn(struct hci_dev *hdev, __u8 status)
+static void hci_cs_create_conn(struct hci_dev *hdev, __u8 status)
 {
         struct hci_cp_create_conn *cp;
         struct hci_conn *conn;
@@ -1333,7 +1324,7 @@ static void hci_cs_set_conn_encrypt(struct hci_dev *hdev, __u8 status)
 }
 
 static int hci_outgoing_auth_needed(struct hci_dev *hdev,
-                                                        struct hci_conn *conn)
+                                    struct hci_conn *conn)
 {
         if (conn->state != BT_CONFIG || !conn->out)
                 return 0;
@@ -1343,15 +1334,14 @@ static int hci_outgoing_auth_needed(struct hci_dev *hdev,
 
         /* Only request authentication for SSP connections or non-SSP
          * devices with sec_level HIGH or if MITM protection is requested */
-        if (!hci_conn_ssp_enabled(conn) &&
-                                conn->pending_sec_level != BT_SECURITY_HIGH &&
-                                !(conn->auth_type & 0x01))
+        if (!hci_conn_ssp_enabled(conn) && !(conn->auth_type & 0x01) &&
+            conn->pending_sec_level != BT_SECURITY_HIGH)
                 return 0;
 
         return 1;
 }
 
-static inline int hci_resolve_name(struct hci_dev *hdev,
+static int hci_resolve_name(struct hci_dev *hdev,
                                    struct inquiry_entry *e)
 {
         struct hci_cp_remote_name_req cp;
@@ -1638,7 +1628,7 @@ static void hci_cs_le_create_conn(struct hci_dev *hdev, __u8 status)
         conn = hci_conn_hash_lookup_ba(hdev, LE_LINK, &cp->peer_addr);
 
         BT_DBG("%s bdaddr %s conn %p", hdev->name, batostr(&cp->peer_addr),
-                conn);
+               conn);
 
         if (status) {
                 if (conn && conn->state == BT_CONNECT) {
@@ -1668,7 +1658,7 @@ static void hci_cs_le_start_enc(struct hci_dev *hdev, u8 status)
         BT_DBG("%s status 0x%x", hdev->name, status);
 }
 
-static inline void hci_inquiry_complete_evt(struct hci_dev *hdev, struct sk_buff *skb)
+static void hci_inquiry_complete_evt(struct hci_dev *hdev, struct sk_buff *skb)
 {
         __u8 status = *((__u8 *) skb->data);
         struct discovery_state *discov = &hdev->discovery;
@@ -1708,7 +1698,7 @@ unlock:
         hci_dev_unlock(hdev);
 }
 
-static inline void hci_inquiry_result_evt(struct hci_dev *hdev, struct sk_buff *skb)
+static void hci_inquiry_result_evt(struct hci_dev *hdev, struct sk_buff *skb)
 {
         struct inquiry_data data;
         struct inquiry_info *info = (void *) (skb->data + 1);
@@ -1745,7 +1735,7 @@ static inline void hci_inquiry_result_evt(struct hci_dev *hdev, struct sk_buff *
         hci_dev_unlock(hdev);
 }
 
-static inline void hci_conn_complete_evt(struct hci_dev *hdev, struct sk_buff *skb)
+static void hci_conn_complete_evt(struct hci_dev *hdev, struct sk_buff *skb)
 {
         struct hci_ev_conn_complete *ev = (void *) skb->data;
         struct hci_conn *conn;
@@ -1823,18 +1813,18 @@ unlock:
         hci_conn_check_pending(hdev);
 }
 
-static inline void hci_conn_request_evt(struct hci_dev *hdev, struct sk_buff *skb)
+static void hci_conn_request_evt(struct hci_dev *hdev, struct sk_buff *skb)
 {
         struct hci_ev_conn_request *ev = (void *) skb->data;
         int mask = hdev->link_mode;
 
-        BT_DBG("%s bdaddr %s type 0x%x", hdev->name,
-                                        batostr(&ev->bdaddr), ev->link_type);
+        BT_DBG("%s bdaddr %s type 0x%x", hdev->name, batostr(&ev->bdaddr),
+               ev->link_type);
 
         mask |= hci_proto_connect_ind(hdev, &ev->bdaddr, ev->link_type);
 
         if ((mask & HCI_LM_ACCEPT) &&
-                        !hci_blacklist_lookup(hdev, &ev->bdaddr)) {
+            !hci_blacklist_lookup(hdev, &ev->bdaddr)) {
                 /* Connection accepted */
                 struct inquiry_entry *ie;
                 struct hci_conn *conn;
@@ -1845,7 +1835,8 @@ static inline void hci_conn_request_evt(struct hci_dev *hdev, struct sk_buff *sk
                 if (ie)
                         memcpy(ie->data.dev_class, ev->dev_class, 3);
 
-                conn = hci_conn_hash_lookup_ba(hdev, ev->link_type, &ev->bdaddr);
+                conn = hci_conn_hash_lookup_ba(hdev, ev->link_type,
+                                               &ev->bdaddr);
                 if (!conn) {
                         conn = hci_conn_add(hdev, ev->link_type, &ev->bdaddr);
                         if (!conn) {
@@ -1878,9 +1869,9 @@ static inline void hci_conn_request_evt(struct hci_dev *hdev, struct sk_buff *sk
                         bacpy(&cp.bdaddr, &ev->bdaddr);
                         cp.pkt_type = cpu_to_le16(conn->pkt_type);
 
-                        cp.tx_bandwidth   = cpu_to_le32(0x00001f40);
-                        cp.rx_bandwidth   = cpu_to_le32(0x00001f40);
-                        cp.max_latency    = cpu_to_le16(0xffff);
+                        cp.tx_bandwidth   = __constant_cpu_to_le32(0x00001f40);
+                        cp.rx_bandwidth   = __constant_cpu_to_le32(0x00001f40);
+                        cp.max_latency    = __constant_cpu_to_le16(0xffff);
                         cp.content_format = cpu_to_le16(hdev->voice_setting);
                         cp.retrans_effort = 0xff;
 
@@ -1897,7 +1888,7 @@ static inline void hci_conn_request_evt(struct hci_dev *hdev, struct sk_buff *sk
         }
 }
 
-static inline void hci_disconn_complete_evt(struct hci_dev *hdev, struct sk_buff *skb)
+static void hci_disconn_complete_evt(struct hci_dev *hdev, struct sk_buff *skb)
 {
         struct hci_ev_disconn_complete *ev = (void *) skb->data;
         struct hci_conn *conn;
@@ -1914,10 +1905,10 @@ static inline void hci_disconn_complete_evt(struct hci_dev *hdev, struct sk_buff
                 conn->state = BT_CLOSED;
 
         if (test_and_clear_bit(HCI_CONN_MGMT_CONNECTED, &conn->flags) &&
-                        (conn->type == ACL_LINK || conn->type == LE_LINK)) {
+            (conn->type == ACL_LINK || conn->type == LE_LINK)) {
                 if (ev->status != 0)
                         mgmt_disconnect_failed(hdev, &conn->dst, conn->type,
-                                                conn->dst_type, ev->status);
+                                               conn->dst_type, ev->status);
                 else
                         mgmt_device_disconnected(hdev, &conn->dst, conn->type,
                                                  conn->dst_type);
@@ -1934,7 +1925,7 @@ unlock:
         hci_dev_unlock(hdev);
 }
 
-static inline void hci_auth_complete_evt(struct hci_dev *hdev, struct sk_buff *skb)
+static void hci_auth_complete_evt(struct hci_dev *hdev, struct sk_buff *skb)
 {
         struct hci_ev_auth_complete *ev = (void *) skb->data;
         struct hci_conn *conn;
@@ -1949,7 +1940,7 @@ static inline void hci_auth_complete_evt(struct hci_dev *hdev, struct sk_buff *s
 
         if (!ev->status) {
                 if (!hci_conn_ssp_enabled(conn) &&
-                                test_bit(HCI_CONN_REAUTH_PEND, &conn->flags)) {
+                    test_bit(HCI_CONN_REAUTH_PEND, &conn->flags)) {
                         BT_INFO("re-auth of legacy device is not possible.");
                 } else {
                         conn->link_mode |= HCI_LM_AUTH;
@@ -1969,7 +1960,7 @@ static inline void hci_auth_complete_evt(struct hci_dev *hdev, struct sk_buff *s
                         cp.handle  = ev->handle;
                         cp.encrypt = 0x01;
                         hci_send_cmd(hdev, HCI_OP_SET_CONN_ENCRYPT, sizeof(cp),
-                                                                        &cp);
+                                     &cp);
                 } else {
                         conn->state = BT_CONNECTED;
                         hci_proto_connect_cfm(conn, ev->status);
@@ -1989,7 +1980,7 @@ static inline void hci_auth_complete_evt(struct hci_dev *hdev, struct sk_buff *s
                         cp.handle  = ev->handle;
                         cp.encrypt = 0x01;
                         hci_send_cmd(hdev, HCI_OP_SET_CONN_ENCRYPT, sizeof(cp),
-                                                                        &cp);
+                                     &cp);
                 } else {
                         clear_bit(HCI_CONN_ENCRYPT_PEND, &conn->flags);
                         hci_encrypt_cfm(conn, ev->status, 0x00);
@@ -2000,7 +1991,7 @@ unlock:
         hci_dev_unlock(hdev);
 }
 
-static inline void hci_remote_name_evt(struct hci_dev *hdev, struct sk_buff *skb)
+static void hci_remote_name_evt(struct hci_dev *hdev, struct sk_buff *skb)
 {
         struct hci_ev_remote_name *ev = (void *) skb->data;
         struct hci_conn *conn;
@@ -2039,7 +2030,7 @@ unlock:
         hci_dev_unlock(hdev);
 }
 
-static inline void hci_encrypt_change_evt(struct hci_dev *hdev, struct sk_buff *skb)
+static void hci_encrypt_change_evt(struct hci_dev *hdev, struct sk_buff *skb)
 {
         struct hci_ev_encrypt_change *ev = (void *) skb->data;
         struct hci_conn *conn;
@@ -2082,7 +2073,8 @@ unlock:
         hci_dev_unlock(hdev);
 }
 
-static inline void hci_change_link_key_complete_evt(struct hci_dev *hdev, struct sk_buff *skb)
+static void hci_change_link_key_complete_evt(struct hci_dev *hdev,
+                                             struct sk_buff *skb)
 {
         struct hci_ev_change_link_key_complete *ev = (void *) skb->data;
         struct hci_conn *conn;
@@ -2104,7 +2096,8 @@ static inline void hci_change_link_key_complete_evt(struct hci_dev *hdev, struct
         hci_dev_unlock(hdev);
 }
 
-static inline void hci_remote_features_evt(struct hci_dev *hdev, struct sk_buff *skb)
+static void hci_remote_features_evt(struct hci_dev *hdev,
+                                    struct sk_buff *skb)
 {
         struct hci_ev_remote_features *ev = (void *) skb->data;
         struct hci_conn *conn;
@@ -2128,7 +2121,7 @@ static inline void hci_remote_features_evt(struct hci_dev *hdev, struct sk_buff
                 cp.handle = ev->handle;
                 cp.page = 0x01;
                 hci_send_cmd(hdev, HCI_OP_READ_REMOTE_EXT_FEATURES,
-                                                        sizeof(cp), &cp);
+                             sizeof(cp), &cp);
                 goto unlock;
         }
 
@@ -2153,17 +2146,18 @@ unlock:
         hci_dev_unlock(hdev);
 }
 
-static inline void hci_remote_version_evt(struct hci_dev *hdev, struct sk_buff *skb)
+static void hci_remote_version_evt(struct hci_dev *hdev, struct sk_buff *skb)
 {
         BT_DBG("%s", hdev->name);
 }
 
-static inline void hci_qos_setup_complete_evt(struct hci_dev *hdev, struct sk_buff *skb)
+static void hci_qos_setup_complete_evt(struct hci_dev *hdev,
+                                       struct sk_buff *skb)
 {
         BT_DBG("%s", hdev->name);
 }
 
-static inline void hci_cmd_complete_evt(struct hci_dev *hdev, struct sk_buff *skb)
+static void hci_cmd_complete_evt(struct hci_dev *hdev, struct sk_buff *skb)
 {
         struct hci_ev_cmd_complete *ev = (void *) skb->data;
         __u16 opcode;
@@ -2384,7 +2378,7 @@ static inline void hci_cmd_complete_evt(struct hci_dev *hdev, struct sk_buff *sk
         }
 }
 
-static inline void hci_cmd_status_evt(struct hci_dev *hdev, struct sk_buff *skb)
+static void hci_cmd_status_evt(struct hci_dev *hdev, struct sk_buff *skb)
 {
         struct hci_ev_cmd_status *ev = (void *) skb->data;
         __u16 opcode;
@@ -2465,7 +2459,7 @@ static inline void hci_cmd_status_evt(struct hci_dev *hdev, struct sk_buff *skb)
         }
 }
 
-static inline void hci_role_change_evt(struct hci_dev *hdev, struct sk_buff *skb)
+static void hci_role_change_evt(struct hci_dev *hdev, struct sk_buff *skb)
 {
         struct hci_ev_role_change *ev = (void *) skb->data;
         struct hci_conn *conn;
@@ -2491,7 +2485,7 @@ static inline void hci_role_change_evt(struct hci_dev *hdev, struct sk_buff *skb
         hci_dev_unlock(hdev);
 }
 
-static inline void hci_num_comp_pkts_evt(struct hci_dev *hdev, struct sk_buff *skb)
+static void hci_num_comp_pkts_evt(struct hci_dev *hdev, struct sk_buff *skb)
 {
         struct hci_ev_num_comp_pkts *ev = (void *) skb->data;
         int i;
@@ -2502,7 +2496,7 @@ static inline void hci_num_comp_pkts_evt(struct hci_dev *hdev, struct sk_buff *s
         }
 
         if (skb->len < sizeof(*ev) || skb->len < sizeof(*ev) +
-                        ev->num_hndl * sizeof(struct hci_comp_pkts_info)) {
+            ev->num_hndl * sizeof(struct hci_comp_pkts_info)) {
                 BT_DBG("%s bad parameters", hdev->name);
                 return;
         }
@@ -2557,8 +2551,7 @@ static inline void hci_num_comp_pkts_evt(struct hci_dev *hdev, struct sk_buff *s
         queue_work(hdev->workqueue, &hdev->tx_work);
 }
 
-static inline void hci_num_comp_blocks_evt(struct hci_dev *hdev,
-                                           struct sk_buff *skb)
+static void hci_num_comp_blocks_evt(struct hci_dev *hdev, struct sk_buff *skb)
 {
         struct hci_ev_num_comp_blocks *ev = (void *) skb->data;
         int i;
@@ -2569,13 +2562,13 @@ static inline void hci_num_comp_blocks_evt(struct hci_dev *hdev,
         }
 
         if (skb->len < sizeof(*ev) || skb->len < sizeof(*ev) +
-                        ev->num_hndl * sizeof(struct hci_comp_blocks_info)) {
+            ev->num_hndl * sizeof(struct hci_comp_blocks_info)) {
                 BT_DBG("%s bad parameters", hdev->name);
                 return;
         }
 
         BT_DBG("%s num_blocks %d num_hndl %d", hdev->name, ev->num_blocks,
-                                                                ev->num_hndl);
+               ev->num_hndl);
 
         for (i = 0; i < ev->num_hndl; i++) {
                 struct hci_comp_blocks_info *info = &ev->handles[i];
@@ -2607,7 +2600,7 @@ static inline void hci_num_comp_blocks_evt(struct hci_dev *hdev,
         queue_work(hdev->workqueue, &hdev->tx_work);
 }
 
-static inline void hci_mode_change_evt(struct hci_dev *hdev, struct sk_buff *skb)
+static void hci_mode_change_evt(struct hci_dev *hdev, struct sk_buff *skb)
 {
         struct hci_ev_mode_change *ev = (void *) skb->data;
         struct hci_conn *conn;
@@ -2621,7 +2614,8 @@ static inline void hci_mode_change_evt(struct hci_dev *hdev, struct sk_buff *skb
                 conn->mode = ev->mode;
                 conn->interval = __le16_to_cpu(ev->interval);
 
-                if (!test_and_clear_bit(HCI_CONN_MODE_CHANGE_PEND, &conn->flags)) {
+                if (!test_and_clear_bit(HCI_CONN_MODE_CHANGE_PEND,
+                                        &conn->flags)) {
                         if (conn->mode == HCI_CM_ACTIVE)
                                 set_bit(HCI_CONN_POWER_SAVE, &conn->flags);
                         else
@@ -2635,7 +2629,7 @@ static inline void hci_mode_change_evt(struct hci_dev *hdev, struct sk_buff *skb
         hci_dev_unlock(hdev);
 }
 
-static inline void hci_pin_code_request_evt(struct hci_dev *hdev, struct sk_buff *skb)
+static void hci_pin_code_request_evt(struct hci_dev *hdev, struct sk_buff *skb)
 {
         struct hci_ev_pin_code_req *ev = (void *) skb->data;
         struct hci_conn *conn;
@@ -2656,7 +2650,7 @@ static inline void hci_pin_code_request_evt(struct hci_dev *hdev, struct sk_buff
 
         if (!test_bit(HCI_PAIRABLE, &hdev->dev_flags))
                 hci_send_cmd(hdev, HCI_OP_PIN_CODE_NEG_REPLY,
-                                        sizeof(ev->bdaddr), &ev->bdaddr);
+                             sizeof(ev->bdaddr), &ev->bdaddr);
         else if (test_bit(HCI_MGMT, &hdev->dev_flags)) {
                 u8 secure;
 
@@ -2672,7 +2666,7 @@ unlock:
         hci_dev_unlock(hdev);
 }
 
-static inline void hci_link_key_request_evt(struct hci_dev *hdev, struct sk_buff *skb)
+static void hci_link_key_request_evt(struct hci_dev *hdev, struct sk_buff *skb)
 {
         struct hci_ev_link_key_req *ev = (void *) skb->data;
         struct hci_cp_link_key_reply cp;
@@ -2689,15 +2683,15 @@ static inline void hci_link_key_request_evt(struct hci_dev *hdev, struct sk_buff
         key = hci_find_link_key(hdev, &ev->bdaddr);
         if (!key) {
                 BT_DBG("%s link key not found for %s", hdev->name,
-                                                        batostr(&ev->bdaddr));
+                       batostr(&ev->bdaddr));
                 goto not_found;
         }
 
         BT_DBG("%s found key type %u for %s", hdev->name, key->type,
-                                                        batostr(&ev->bdaddr));
+               batostr(&ev->bdaddr));
 
         if (!test_bit(HCI_DEBUG_KEYS, &hdev->dev_flags) &&
-                                key->type == HCI_LK_DEBUG_COMBINATION) {
+            key->type == HCI_LK_DEBUG_COMBINATION) {
                 BT_DBG("%s ignoring debug key", hdev->name);
                 goto not_found;
         }
@@ -2705,16 +2699,15 @@ static inline void hci_link_key_request_evt(struct hci_dev *hdev, struct sk_buff
         conn = hci_conn_hash_lookup_ba(hdev, ACL_LINK, &ev->bdaddr);
         if (conn) {
                 if (key->type == HCI_LK_UNAUTH_COMBINATION &&
-                                conn->auth_type != 0xff &&
-                                (conn->auth_type & 0x01)) {
+                    conn->auth_type != 0xff && (conn->auth_type & 0x01)) {
                         BT_DBG("%s ignoring unauthenticated key", hdev->name);
                         goto not_found;
                 }
 
                 if (key->type == HCI_LK_COMBINATION && key->pin_len < 16 &&
-                                conn->pending_sec_level == BT_SECURITY_HIGH) {
-                        BT_DBG("%s ignoring key unauthenticated for high \
-                                                        security", hdev->name);
+                    conn->pending_sec_level == BT_SECURITY_HIGH) {
+                        BT_DBG("%s ignoring key unauthenticated for high security",
+                               hdev->name);
                         goto not_found;
                 }
 
@@ -2723,7 +2716,7 @@ static inline void hci_link_key_request_evt(struct hci_dev *hdev, struct sk_buff
         }
 
         bacpy(&cp.bdaddr, &ev->bdaddr);
-        memcpy(cp.link_key, key->val, 16);
+        memcpy(cp.link_key, key->val, HCI_LINK_KEY_SIZE);
 
         hci_send_cmd(hdev, HCI_OP_LINK_KEY_REPLY, sizeof(cp), &cp);
 
@@ -2736,7 +2729,7 @@ not_found:
         hci_dev_unlock(hdev);
 }
 
-static inline void hci_link_key_notify_evt(struct hci_dev *hdev, struct sk_buff *skb)
+static void hci_link_key_notify_evt(struct hci_dev *hdev, struct sk_buff *skb)
 {
         struct hci_ev_link_key_notify *ev = (void *) skb->data;
         struct hci_conn *conn;
@@ -2760,12 +2753,12 @@ static inline void hci_link_key_notify_evt(struct hci_dev *hdev, struct sk_buff
 
         if (test_bit(HCI_LINK_KEYS, &hdev->dev_flags))
                 hci_add_link_key(hdev, conn, 1, &ev->bdaddr, ev->link_key,
-                                                        ev->key_type, pin_len);
+                                 ev->key_type, pin_len);
 
         hci_dev_unlock(hdev);
 }
 
-static inline void hci_clock_offset_evt(struct hci_dev *hdev, struct sk_buff *skb)
+static void hci_clock_offset_evt(struct hci_dev *hdev, struct sk_buff *skb)
 {
         struct hci_ev_clock_offset *ev = (void *) skb->data;
         struct hci_conn *conn;
@@ -2788,7 +2781,7 @@ static inline void hci_clock_offset_evt(struct hci_dev *hdev, struct sk_buff *sk
         hci_dev_unlock(hdev);
 }
 
-static inline void hci_pkt_type_change_evt(struct hci_dev *hdev, struct sk_buff *skb)
+static void hci_pkt_type_change_evt(struct hci_dev *hdev, struct sk_buff *skb)
 {
         struct hci_ev_pkt_type_change *ev = (void *) skb->data;
         struct hci_conn *conn;
@@ -2804,7 +2797,7 @@ static inline void hci_pkt_type_change_evt(struct hci_dev *hdev, struct sk_buff
         hci_dev_unlock(hdev);
 }
 
-static inline void hci_pscan_rep_mode_evt(struct hci_dev *hdev, struct sk_buff *skb)
+static void hci_pscan_rep_mode_evt(struct hci_dev *hdev, struct sk_buff *skb)
 {
         struct hci_ev_pscan_rep_mode *ev = (void *) skb->data;
         struct inquiry_entry *ie;
@@ -2822,7 +2815,8 @@ static inline void hci_pscan_rep_mode_evt(struct hci_dev *hdev, struct sk_buff *
         hci_dev_unlock(hdev);
 }
 
-static inline void hci_inquiry_result_with_rssi_evt(struct hci_dev *hdev, struct sk_buff *skb)
+static void hci_inquiry_result_with_rssi_evt(struct hci_dev *hdev,
+                                             struct sk_buff *skb)
 {
         struct inquiry_data data;
         int num_rsp = *((__u8 *) skb->data);
@@ -2881,7 +2875,8 @@ static inline void hci_inquiry_result_with_rssi_evt(struct hci_dev *hdev, struct
         hci_dev_unlock(hdev);
 }
 
-static inline void hci_remote_ext_features_evt(struct hci_dev *hdev, struct sk_buff *skb)
+static void hci_remote_ext_features_evt(struct hci_dev *hdev,
+                                        struct sk_buff *skb)
 {
         struct hci_ev_remote_ext_features *ev = (void *) skb->data;
         struct hci_conn *conn;
@@ -2929,7 +2924,8 @@ unlock:
         hci_dev_unlock(hdev);
 }
 
-static inline void hci_sync_conn_complete_evt(struct hci_dev *hdev, struct sk_buff *skb)
+static void hci_sync_conn_complete_evt(struct hci_dev *hdev,
+                                       struct sk_buff *skb)
 {
         struct hci_ev_sync_conn_complete *ev = (void *) skb->data;
         struct hci_conn *conn;
@@ -2984,19 +2980,20 @@ unlock:
         hci_dev_unlock(hdev);
 }
 
-static inline void hci_sync_conn_changed_evt(struct hci_dev *hdev, struct sk_buff *skb)
+static void hci_sync_conn_changed_evt(struct hci_dev *hdev, struct sk_buff *skb)
 {
         BT_DBG("%s", hdev->name);
 }
 
-static inline void hci_sniff_subrate_evt(struct hci_dev *hdev, struct sk_buff *skb)
+static void hci_sniff_subrate_evt(struct hci_dev *hdev, struct sk_buff *skb)
 {
         struct hci_ev_sniff_subrate *ev = (void *) skb->data;
 
         BT_DBG("%s status %d", hdev->name, ev->status);
 }
 
-static inline void hci_extended_inquiry_result_evt(struct hci_dev *hdev, struct sk_buff *skb)
+static void hci_extended_inquiry_result_evt(struct hci_dev *hdev,
+                                            struct sk_buff *skb)
 {
         struct inquiry_data data;
         struct extended_inquiry_info *info = (void *) (skb->data + 1);
@@ -3087,7 +3084,7 @@ unlock:
         hci_dev_unlock(hdev);
 }
 
-static inline u8 hci_get_auth_req(struct hci_conn *conn)
+static u8 hci_get_auth_req(struct hci_conn *conn)
 {
         /* If remote requests dedicated bonding follow that lead */
         if (conn->remote_auth == 0x02 || conn->remote_auth == 0x03) {
@@ -3106,7 +3103,7 @@ static inline u8 hci_get_auth_req(struct hci_conn *conn)
         return conn->auth_type;
 }
 
-static inline void hci_io_capa_request_evt(struct hci_dev *hdev, struct sk_buff *skb)
+static void hci_io_capa_request_evt(struct hci_dev *hdev, struct sk_buff *skb)
 {
         struct hci_ev_io_capa_request *ev = (void *) skb->data;
         struct hci_conn *conn;
@@ -3125,7 +3122,7 @@ static inline void hci_io_capa_request_evt(struct hci_dev *hdev, struct sk_buff
                 goto unlock;
 
         if (test_bit(HCI_PAIRABLE, &hdev->dev_flags) ||
-                        (conn->remote_auth & ~0x01) == HCI_AT_NO_BONDING) {
+            (conn->remote_auth & ~0x01) == HCI_AT_NO_BONDING) {
                 struct hci_cp_io_capability_reply cp;
 
                 bacpy(&cp.bdaddr, &ev->bdaddr);
@@ -3136,14 +3133,14 @@ static inline void hci_io_capa_request_evt(struct hci_dev *hdev, struct sk_buff
                 conn->auth_type = hci_get_auth_req(conn);
                 cp.authentication = conn->auth_type;
 
-                if ((conn->out || test_bit(HCI_CONN_REMOTE_OOB, &conn->flags)) &&
-                                hci_find_remote_oob_data(hdev, &conn->dst))
+                if (hci_find_remote_oob_data(hdev, &conn->dst) &&
+                    (conn->out || test_bit(HCI_CONN_REMOTE_OOB, &conn->flags)))
                         cp.oob_data = 0x01;
                 else
                         cp.oob_data = 0x00;
 
                 hci_send_cmd(hdev, HCI_OP_IO_CAPABILITY_REPLY,
-                                                        sizeof(cp), &cp);
+                             sizeof(cp), &cp);
         } else {
                 struct hci_cp_io_capability_neg_reply cp;
 
@@ -3151,14 +3148,14 @@ static inline void hci_io_capa_request_evt(struct hci_dev *hdev, struct sk_buff
                 cp.reason = HCI_ERROR_PAIRING_NOT_ALLOWED;
 
                 hci_send_cmd(hdev, HCI_OP_IO_CAPABILITY_NEG_REPLY,
-                                                        sizeof(cp), &cp);
+                             sizeof(cp), &cp);
         }
 
 unlock:
         hci_dev_unlock(hdev);
 }
 
-static inline void hci_io_capa_reply_evt(struct hci_dev *hdev, struct sk_buff *skb)
+static void hci_io_capa_reply_evt(struct hci_dev *hdev, struct sk_buff *skb)
 {
         struct hci_ev_io_capa_reply *ev = (void *) skb->data;
         struct hci_conn *conn;
@@ -3180,8 +3177,8 @@ unlock:
         hci_dev_unlock(hdev);
 }
 
-static inline void hci_user_confirm_request_evt(struct hci_dev *hdev,
-                                                        struct sk_buff *skb)
+static void hci_user_confirm_request_evt(struct hci_dev *hdev,
+                                         struct sk_buff *skb)
 {
         struct hci_ev_user_confirm_req *ev = (void *) skb->data;
         int loc_mitm, rem_mitm, confirm_hint = 0;
@@ -3209,13 +3206,13 @@ static inline void hci_user_confirm_request_evt(struct hci_dev *hdev,
         if (!conn->connect_cfm_cb && loc_mitm && conn->remote_cap == 0x03) {
                 BT_DBG("Rejecting request: remote device can't provide MITM");
                 hci_send_cmd(hdev, HCI_OP_USER_CONFIRM_NEG_REPLY,
-                                        sizeof(ev->bdaddr), &ev->bdaddr);
+                             sizeof(ev->bdaddr), &ev->bdaddr);
                 goto unlock;
         }
 
         /* If no side requires MITM protection; auto-accept */
         if ((!loc_mitm || conn->remote_cap == 0x03) &&
-                                (!rem_mitm || conn->io_capability == 0x03)) {
+            (!rem_mitm || conn->io_capability == 0x03)) {
 
                 /* If we're not the initiators request authorization to
                  * proceed from user space (mgmt_user_confirm with
@@ -3227,7 +3224,7 @@ static inline void hci_user_confirm_request_evt(struct hci_dev *hdev,
                 }
 
                 BT_DBG("Auto-accept of user confirmation with %ums delay",
-                                                hdev->auto_accept_delay);
+                       hdev->auto_accept_delay);
 
                 if (hdev->auto_accept_delay > 0) {
                         int delay = msecs_to_jiffies(hdev->auto_accept_delay);
@@ -3236,7 +3233,7 @@ static inline void hci_user_confirm_request_evt(struct hci_dev *hdev,
                 }
 
                 hci_send_cmd(hdev, HCI_OP_USER_CONFIRM_REPLY,
-                                                sizeof(ev->bdaddr), &ev->bdaddr);
+                             sizeof(ev->bdaddr), &ev->bdaddr);
                 goto unlock;
         }
 
@@ -3248,8 +3245,8 @@ unlock:
         hci_dev_unlock(hdev);
 }
 
-static inline void hci_user_passkey_request_evt(struct hci_dev *hdev,
-                                                        struct sk_buff *skb)
+static void hci_user_passkey_request_evt(struct hci_dev *hdev,
+                                         struct sk_buff *skb)
 {
         struct hci_ev_user_passkey_req *ev = (void *) skb->data;
 
@@ -3263,7 +3260,8 @@ static inline void hci_user_passkey_request_evt(struct hci_dev *hdev,
         hci_dev_unlock(hdev);
 }
 
-static inline void hci_simple_pair_complete_evt(struct hci_dev *hdev, struct sk_buff *skb)
+static void hci_simple_pair_complete_evt(struct hci_dev *hdev,
+                                         struct sk_buff *skb)
 {
         struct hci_ev_simple_pair_complete *ev = (void *) skb->data;
         struct hci_conn *conn;
@@ -3291,7 +3289,8 @@ unlock:
         hci_dev_unlock(hdev);
 }
 
-static inline void hci_remote_host_features_evt(struct hci_dev *hdev, struct sk_buff *skb)
+static void hci_remote_host_features_evt(struct hci_dev *hdev,
+                                         struct sk_buff *skb)
 {
         struct hci_ev_remote_host_features *ev = (void *) skb->data;
         struct inquiry_entry *ie;
@@ -3307,8 +3306,8 @@ static inline void hci_remote_host_features_evt(struct hci_dev *hdev, struct sk_
         hci_dev_unlock(hdev);
 }
 
-static inline void hci_remote_oob_data_request_evt(struct hci_dev *hdev,
-                                                   struct sk_buff *skb)
+static void hci_remote_oob_data_request_evt(struct hci_dev *hdev,
+                                            struct sk_buff *skb)
 {
         struct hci_ev_remote_oob_data_request *ev = (void *) skb->data;
         struct oob_data *data;
@@ -3329,20 +3328,20 @@ static inline void hci_remote_oob_data_request_evt(struct hci_dev *hdev,
                 memcpy(cp.randomizer, data->randomizer, sizeof(cp.randomizer));
 
                 hci_send_cmd(hdev, HCI_OP_REMOTE_OOB_DATA_REPLY, sizeof(cp),
-                                                                        &cp);
+                             &cp);
         } else {
                 struct hci_cp_remote_oob_data_neg_reply cp;
 
                 bacpy(&cp.bdaddr, &ev->bdaddr);
                 hci_send_cmd(hdev, HCI_OP_REMOTE_OOB_DATA_NEG_REPLY, sizeof(cp),
-                                                                        &cp);
+                             &cp);
         }
 
 unlock:
         hci_dev_unlock(hdev);
 }
 
-static inline void hci_le_conn_complete_evt(struct hci_dev *hdev, struct sk_buff *skb)
+static void hci_le_conn_complete_evt(struct hci_dev *hdev, struct sk_buff *skb)
 {
         struct hci_ev_le_conn_complete *ev = (void *) skb->data;
         struct hci_conn *conn;
@@ -3351,6 +3350,19 @@ static inline void hci_le_conn_complete_evt(struct hci_dev *hdev, struct sk_buff
 
         hci_dev_lock(hdev);
 
+        if (ev->status) {
+                conn = hci_conn_hash_lookup_state(hdev, LE_LINK, BT_CONNECT);
+                if (!conn)
+                        goto unlock;
+
+                mgmt_connect_failed(hdev, &conn->dst, conn->type,
+                                    conn->dst_type, ev->status);
+                hci_proto_connect_cfm(conn, ev->status);
+                conn->state = BT_CLOSED;
+                hci_conn_del(conn);
+                goto unlock;
+        }
+
         conn = hci_conn_hash_lookup_ba(hdev, LE_LINK, &ev->bdaddr);
         if (!conn) {
                 conn = hci_conn_add(hdev, LE_LINK, &ev->bdaddr);
@@ -3363,15 +3375,6 @@ static inline void hci_le_conn_complete_evt(struct hci_dev *hdev, struct sk_buff
                 conn->dst_type = ev->bdaddr_type;
         }
 
-        if (ev->status) {
-                mgmt_connect_failed(hdev, &ev->bdaddr, conn->type,
-                                                conn->dst_type, ev->status);
-                hci_proto_connect_cfm(conn, ev->status);
-                conn->state = BT_CLOSED;
-                hci_conn_del(conn);
-                goto unlock;
-        }
-
         if (!test_and_set_bit(HCI_CONN_MGMT_CONNECTED, &conn->flags))
                 mgmt_device_connected(hdev, &ev->bdaddr, conn->type,
                                       conn->dst_type, 0, NULL, 0, NULL);
@@ -3389,8 +3392,7 @@ unlock:
         hci_dev_unlock(hdev);
 }
 
-static inline void hci_le_adv_report_evt(struct hci_dev *hdev,
-                                                struct sk_buff *skb)
+static void hci_le_adv_report_evt(struct hci_dev *hdev, struct sk_buff *skb)
 {
         u8 num_reports = skb->data[0];
         void *ptr = &skb->data[1];
@@ -3411,8 +3413,7 @@ static inline void hci_le_adv_report_evt(struct hci_dev *hdev,
         hci_dev_unlock(hdev);
 }
 
-static inline void hci_le_ltk_request_evt(struct hci_dev *hdev,
-                                                struct sk_buff *skb)
+static void hci_le_ltk_request_evt(struct hci_dev *hdev, struct sk_buff *skb)
 {
         struct hci_ev_le_ltk_req *ev = (void *) skb->data;
         struct hci_cp_le_ltk_reply cp;
@@ -3455,7 +3456,7 @@ not_found:
         hci_dev_unlock(hdev);
 }
 
-static inline void hci_le_meta_evt(struct hci_dev *hdev, struct sk_buff *skb)
+static void hci_le_meta_evt(struct hci_dev *hdev, struct sk_buff *skb)
 {
         struct hci_ev_le_meta *le_ev = (void *) skb->data;
 
diff --git a/net/bluetooth/hci_sock.c b/net/bluetooth/hci_sock.c
index 5914623f426..a7f04de03d7 100644
--- a/net/bluetooth/hci_sock.c
+++ b/net/bluetooth/hci_sock.c
@@ -24,25 +24,7 @@
 
 /* Bluetooth HCI sockets. */
 
-#include <linux/module.h>
-
-#include <linux/types.h>
-#include <linux/capability.h>
-#include <linux/errno.h>
-#include <linux/kernel.h>
-#include <linux/slab.h>
-#include <linux/poll.h>
-#include <linux/fcntl.h>
-#include <linux/init.h>
-#include <linux/skbuff.h>
-#include <linux/workqueue.h>
-#include <linux/interrupt.h>
-#include <linux/compat.h>
-#include <linux/socket.h>
-#include <linux/ioctl.h>
-#include <net/sock.h>
-
-#include <linux/uaccess.h>
+#include <linux/export.h>
 #include <asm/unaligned.h>
 
 #include <net/bluetooth/bluetooth.h>
@@ -113,11 +95,12 @@ void hci_send_to_sock(struct hci_dev *hdev, struct sk_buff *skb)
                 flt = &hci_pi(sk)->filter;
 
                 if (!test_bit((bt_cb(skb)->pkt_type == HCI_VENDOR_PKT) ?
-                                0 : (bt_cb(skb)->pkt_type & HCI_FLT_TYPE_BITS), &flt->type_mask))
+                              0 : (bt_cb(skb)->pkt_type & HCI_FLT_TYPE_BITS),
+                              &flt->type_mask))
                         continue;
 
                 if (bt_cb(skb)->pkt_type == HCI_EVENT_PKT) {
-                        register int evt = (*(__u8 *)skb->data & HCI_FLT_EVENT_BITS);
+                        int evt = (*(__u8 *)skb->data & HCI_FLT_EVENT_BITS);
 
                         if (!hci_test_bit(evt, &flt->event_mask))
                                 continue;
@@ -240,7 +223,8 @@ void hci_send_to_monitor(struct hci_dev *hdev, struct sk_buff *skb)
                         struct hci_mon_hdr *hdr;
 
                         /* Create a private copy with headroom */
-                        skb_copy = __pskb_copy(skb, HCI_MON_HDR_SIZE, GFP_ATOMIC);
+                        skb_copy = __pskb_copy(skb, HCI_MON_HDR_SIZE,
+                                               GFP_ATOMIC);
                         if (!skb_copy)
                                 continue;
 
@@ -495,7 +479,8 @@ static int hci_sock_blacklist_del(struct hci_dev *hdev, void __user *arg)
 }
 
 /* Ioctls that require bound socket */
-static inline int hci_sock_bound_ioctl(struct sock *sk, unsigned int cmd, unsigned long arg)
+static int hci_sock_bound_ioctl(struct sock *sk, unsigned int cmd,
+                                unsigned long arg)
 {
         struct hci_dev *hdev = hci_pi(sk)->hdev;
 
@@ -540,7 +525,8 @@ static inline int hci_sock_bound_ioctl(struct sock *sk, unsigned int cmd, unsign
         }
 }
 
-static int hci_sock_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
+static int hci_sock_ioctl(struct socket *sock, unsigned int cmd,
+                          unsigned long arg)
 {
         struct sock *sk = sock->sk;
         void __user *argp = (void __user *) arg;
@@ -601,7 +587,8 @@ static int hci_sock_ioctl(struct socket *sock, unsigned int cmd, unsigned long a
         }
 }
 
-static int hci_sock_bind(struct socket *sock, struct sockaddr *addr, int addr_len)
+static int hci_sock_bind(struct socket *sock, struct sockaddr *addr,
+                         int addr_len)
 {
         struct sockaddr_hci haddr;
         struct sock *sk = sock->sk;
@@ -690,7 +677,8 @@ done:
         return err;
 }
 
-static int hci_sock_getname(struct socket *sock, struct sockaddr *addr, int *addr_len, int peer)
+static int hci_sock_getname(struct socket *sock, struct sockaddr *addr,
+                            int *addr_len, int peer)
 {
         struct sockaddr_hci *haddr = (struct sockaddr_hci *) addr;
         struct sock *sk = sock->sk;
@@ -711,13 +699,15 @@ static int hci_sock_getname(struct socket *sock, struct sockaddr *addr, int *add
         return 0;
 }
 
-static inline void hci_sock_cmsg(struct sock *sk, struct msghdr *msg, struct sk_buff *skb)
+static void hci_sock_cmsg(struct sock *sk, struct msghdr *msg,
+                          struct sk_buff *skb)
 {
         __u32 mask = hci_pi(sk)->cmsg_mask;
 
         if (mask & HCI_CMSG_DIR) {
                 int incoming = bt_cb(skb)->incoming;
-                put_cmsg(msg, SOL_HCI, HCI_CMSG_DIR, sizeof(incoming), &incoming);
+                put_cmsg(msg, SOL_HCI, HCI_CMSG_DIR, sizeof(incoming),
+                         &incoming);
         }
 
         if (mask & HCI_CMSG_TSTAMP) {
@@ -747,7 +737,7 @@ static inline void hci_sock_cmsg(struct sock *sk, struct msghdr *msg, struct sk_
 }
 
 static int hci_sock_recvmsg(struct kiocb *iocb, struct socket *sock,
-                                struct msghdr *msg, size_t len, int flags)
+                            struct msghdr *msg, size_t len, int flags)
 {
         int noblock = flags & MSG_DONTWAIT;
         struct sock *sk = sock->sk;
@@ -857,8 +847,9 @@ static int hci_sock_sendmsg(struct kiocb *iocb, struct socket *sock,
                 u16 ocf = hci_opcode_ocf(opcode);
 
                 if (((ogf > HCI_SFLT_MAX_OGF) ||
-                                !hci_test_bit(ocf & HCI_FLT_OCF_BITS, &hci_sec_filter.ocf_mask[ogf])) &&
-                                        !capable(CAP_NET_RAW)) {
+                     !hci_test_bit(ocf & HCI_FLT_OCF_BITS,
+                                   &hci_sec_filter.ocf_mask[ogf])) &&
+                    !capable(CAP_NET_RAW)) {
                         err = -EPERM;
                         goto drop;
                 }
@@ -891,7 +882,8 @@ drop:
         goto done;
 }
 
-static int hci_sock_setsockopt(struct socket *sock, int level, int optname, char __user *optval, unsigned int len)
+static int hci_sock_setsockopt(struct socket *sock, int level, int optname,
+                               char __user *optval, unsigned int len)
 {
         struct hci_ufilter uf = { .opcode = 0 };
         struct sock *sk = sock->sk;
@@ -973,7 +965,8 @@ done:
         return err;
 }
 
-static int hci_sock_getsockopt(struct socket *sock, int level, int optname, char __user *optval, int __user *optlen)
+static int hci_sock_getsockopt(struct socket *sock, int level, int optname,
+                               char __user *optval, int __user *optlen)
 {
         struct hci_ufilter uf;
         struct sock *sk = sock->sk;
diff --git a/net/bluetooth/hci_sysfs.c b/net/bluetooth/hci_sysfs.c
index 937f3187eaf..a20e61c3653 100644
--- a/net/bluetooth/hci_sysfs.c
+++ b/net/bluetooth/hci_sysfs.c
@@ -1,10 +1,6 @@
 /* Bluetooth HCI driver model support. */
 
-#include <linux/kernel.h>
-#include <linux/slab.h>
-#include <linux/init.h>
 #include <linux/debugfs.h>
-#include <linux/seq_file.h>
 #include <linux/module.h>
 
 #include <net/bluetooth/bluetooth.h>
@@ -31,27 +27,30 @@ static inline char *link_typetostr(int type)
         }
 }
 
-static ssize_t show_link_type(struct device *dev, struct device_attribute *attr, char *buf)
+static ssize_t show_link_type(struct device *dev,
+                              struct device_attribute *attr, char *buf)
 {
         struct hci_conn *conn = to_hci_conn(dev);
         return sprintf(buf, "%s\n", link_typetostr(conn->type));
 }
 
-static ssize_t show_link_address(struct device *dev, struct device_attribute *attr, char *buf)
+static ssize_t show_link_address(struct device *dev,
+                                 struct device_attribute *attr, char *buf)
 {
         struct hci_conn *conn = to_hci_conn(dev);
         return sprintf(buf, "%s\n", batostr(&conn->dst));
 }
 
-static ssize_t show_link_features(struct device *dev, struct device_attribute *attr, char *buf)
+static ssize_t show_link_features(struct device *dev,
+                                  struct device_attribute *attr, char *buf)
 {
         struct hci_conn *conn = to_hci_conn(dev);
 
         return sprintf(buf, "0x%02x%02x%02x%02x%02x%02x%02x%02x\n",
-                                conn->features[0], conn->features[1],
-                                conn->features[2], conn->features[3],
-                                conn->features[4], conn->features[5],
-                                conn->features[6], conn->features[7]);
+                       conn->features[0], conn->features[1],
+                       conn->features[2], conn->features[3],
+                       conn->features[4], conn->features[5],
+                       conn->features[6], conn->features[7]);
 }
 
 #define LINK_ATTR(_name, _mode, _show, _store) \
@@ -185,19 +184,22 @@ static inline char *host_typetostr(int type)
         }
 }
 
-static ssize_t show_bus(struct device *dev, struct device_attribute *attr, char *buf)
+static ssize_t show_bus(struct device *dev,
+                        struct device_attribute *attr, char *buf)
 {
         struct hci_dev *hdev = to_hci_dev(dev);
         return sprintf(buf, "%s\n", host_bustostr(hdev->bus));
 }
 
-static ssize_t show_type(struct device *dev, struct device_attribute *attr, char *buf)
+static ssize_t show_type(struct device *dev,
+                         struct device_attribute *attr, char *buf)
 {
         struct hci_dev *hdev = to_hci_dev(dev);
         return sprintf(buf, "%s\n", host_typetostr(hdev->dev_type));
 }
 
-static ssize_t show_name(struct device *dev, struct device_attribute *attr, char *buf)
+static ssize_t show_name(struct device *dev,
+                         struct device_attribute *attr, char *buf)
 {
         struct hci_dev *hdev = to_hci_dev(dev);
         char name[HCI_MAX_NAME_LENGTH + 1];
@@ -210,55 +212,64 @@ static ssize_t show_name(struct device *dev, struct device_attribute *attr, char
         return sprintf(buf, "%s\n", name);
 }
 
-static ssize_t show_class(struct device *dev, struct device_attribute *attr, char *buf)
+static ssize_t show_class(struct device *dev,
+                          struct device_attribute *attr, char *buf)
 {
         struct hci_dev *hdev = to_hci_dev(dev);
-        return sprintf(buf, "0x%.2x%.2x%.2x\n",
-                        hdev->dev_class[2], hdev->dev_class[1], hdev->dev_class[0]);
+        return sprintf(buf, "0x%.2x%.2x%.2x\n", hdev->dev_class[2],
+                       hdev->dev_class[1], hdev->dev_class[0]);
 }
 
-static ssize_t show_address(struct device *dev, struct device_attribute *attr, char *buf)
+static ssize_t show_address(struct device *dev,
+                            struct device_attribute *attr, char *buf)
 {
         struct hci_dev *hdev = to_hci_dev(dev);
         return sprintf(buf, "%s\n", batostr(&hdev->bdaddr));
 }
 
-static ssize_t show_features(struct device *dev, struct device_attribute *attr, char *buf)
+static ssize_t show_features(struct device *dev,
+                             struct device_attribute *attr, char *buf)
 {
         struct hci_dev *hdev = to_hci_dev(dev);
 
         return sprintf(buf, "0x%02x%02x%02x%02x%02x%02x%02x%02x\n",
-                                hdev->features[0], hdev->features[1],
-                                hdev->features[2], hdev->features[3],
-                                hdev->features[4], hdev->features[5],
-                                hdev->features[6], hdev->features[7]);
+                       hdev->features[0], hdev->features[1],
+                       hdev->features[2], hdev->features[3],
+                       hdev->features[4], hdev->features[5],
+                       hdev->features[6], hdev->features[7]);
 }
 
-static ssize_t show_manufacturer(struct device *dev, struct device_attribute *attr, char *buf)
+static ssize_t show_manufacturer(struct device *dev,
+                                 struct device_attribute *attr, char *buf)
 {
         struct hci_dev *hdev = to_hci_dev(dev);
         return sprintf(buf, "%d\n", hdev->manufacturer);
 }
 
-static ssize_t show_hci_version(struct device *dev, struct device_attribute *attr, char *buf)
+static ssize_t show_hci_version(struct device *dev,
+                                struct device_attribute *attr, char *buf)
 {
         struct hci_dev *hdev = to_hci_dev(dev);
         return sprintf(buf, "%d\n", hdev->hci_ver);
 }
 
-static ssize_t show_hci_revision(struct device *dev, struct device_attribute *attr, char *buf)
+static ssize_t show_hci_revision(struct device *dev,
+                                 struct device_attribute *attr, char *buf)
 {
         struct hci_dev *hdev = to_hci_dev(dev);
         return sprintf(buf, "%d\n", hdev->hci_rev);
 }
 
-static ssize_t show_idle_timeout(struct device *dev, struct device_attribute *attr, char *buf)
+static ssize_t show_idle_timeout(struct device *dev,
+                                 struct device_attribute *attr, char *buf)
 {
         struct hci_dev *hdev = to_hci_dev(dev);
         return sprintf(buf, "%d\n", hdev->idle_timeout);
 }
 
-static ssize_t store_idle_timeout(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
+static ssize_t store_idle_timeout(struct device *dev,
+                                  struct device_attribute *attr,
+                                  const char *buf, size_t count)
 {
         struct hci_dev *hdev = to_hci_dev(dev);
         unsigned int val;
@@ -276,13 +287,16 @@ static ssize_t store_idle_timeout(struct device *dev, struct device_attribute *a
         return count;
 }
 
-static ssize_t show_sniff_max_interval(struct device *dev, struct device_attribute *attr, char *buf)
+static ssize_t show_sniff_max_interval(struct device *dev,
+                                       struct device_attribute *attr, char *buf)
 {
         struct hci_dev *hdev = to_hci_dev(dev);
         return sprintf(buf, "%d\n", hdev->sniff_max_interval);
 }
 
-static ssize_t store_sniff_max_interval(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
+static ssize_t store_sniff_max_interval(struct device *dev,
+                                        struct device_attribute *attr,
+                                        const char *buf, size_t count)
 {
         struct hci_dev *hdev = to_hci_dev(dev);
         u16 val;
@@ -300,13 +314,16 @@ static ssize_t store_sniff_max_interval(struct device *dev, struct device_attrib
         return count;
 }
 
-static ssize_t show_sniff_min_interval(struct device *dev, struct device_attribute *attr, char *buf)
+static ssize_t show_sniff_min_interval(struct device *dev,
+                                       struct device_attribute *attr, char *buf)
 {
         struct hci_dev *hdev = to_hci_dev(dev);
         return sprintf(buf, "%d\n", hdev->sniff_min_interval);
 }
 
-static ssize_t store_sniff_min_interval(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
+static ssize_t store_sniff_min_interval(struct device *dev,
+                                        struct device_attribute *attr,
+                                        const char *buf, size_t count)
 {
         struct hci_dev *hdev = to_hci_dev(dev);
         u16 val;
@@ -335,11 +352,11 @@ static DEVICE_ATTR(hci_version, S_IRUGO, show_hci_version, NULL);
 static DEVICE_ATTR(hci_revision, S_IRUGO, show_hci_revision, NULL);
 
 static DEVICE_ATTR(idle_timeout, S_IRUGO | S_IWUSR,
-                                show_idle_timeout, store_idle_timeout);
+                   show_idle_timeout, store_idle_timeout);
 static DEVICE_ATTR(sniff_max_interval, S_IRUGO | S_IWUSR,
-                                show_sniff_max_interval, store_sniff_max_interval);
+                   show_sniff_max_interval, store_sniff_max_interval);
 static DEVICE_ATTR(sniff_min_interval, S_IRUGO | S_IWUSR,
-                                show_sniff_min_interval, store_sniff_min_interval);
+                   show_sniff_min_interval, store_sniff_min_interval);
 
 static struct attribute *bt_host_attrs[] = {
         &dev_attr_bus.attr,
@@ -455,8 +472,8 @@ static void print_bt_uuid(struct seq_file *f, u8 *uuid)
         memcpy(&data5, &uuid[14], 2);
 
         seq_printf(f, "%.8x-%.4x-%.4x-%.4x-%.8x%.4x\n",
-                                ntohl(data0), ntohs(data1), ntohs(data2),
-                                ntohs(data3), ntohl(data4), ntohs(data5));
+                   ntohl(data0), ntohs(data1), ntohs(data2), ntohs(data3),
+                   ntohl(data4), ntohs(data5));
 }
 
 static int uuids_show(struct seq_file *f, void *p)
@@ -513,7 +530,7 @@ static int auto_accept_delay_get(void *data, u64 *val)
 }
 
 DEFINE_SIMPLE_ATTRIBUTE(auto_accept_delay_fops, auto_accept_delay_get,
-                                        auto_accept_delay_set, "%llu\n");
+                        auto_accept_delay_set, "%llu\n");
 
 void hci_init_sysfs(struct hci_dev *hdev)
 {
@@ -547,15 +564,15 @@ int hci_add_sysfs(struct hci_dev *hdev)
                 return 0;
 
         debugfs_create_file("inquiry_cache", 0444, hdev->debugfs,
-                                                hdev, &inquiry_cache_fops);
+                            hdev, &inquiry_cache_fops);
 
         debugfs_create_file("blacklist", 0444, hdev->debugfs,
-                                                hdev, &blacklist_fops);
+                            hdev, &blacklist_fops);
 
         debugfs_create_file("uuids", 0444, hdev->debugfs, hdev, &uuids_fops);
 
         debugfs_create_file("auto_accept_delay", 0444, hdev->debugfs, hdev,
-                                                &auto_accept_delay_fops);
+                            &auto_accept_delay_fops);
         return 0;
 }
 
diff --git a/net/bluetooth/hidp/core.c b/net/bluetooth/hidp/core.c
index 2c20d765b39..ccd985da651 100644
--- a/net/bluetooth/hidp/core.c
+++ b/net/bluetooth/hidp/core.c
@@ -21,27 +21,8 @@
 */
 
 #include <linux/module.h>
-
-#include <linux/types.h>
-#include <linux/errno.h>
-#include <linux/kernel.h>
-#include <linux/sched.h>
-#include <linux/slab.h>
-#include <linux/poll.h>
-#include <linux/freezer.h>
-#include <linux/fcntl.h>
-#include <linux/skbuff.h>
-#include <linux/socket.h>
-#include <linux/ioctl.h>
 #include <linux/file.h>
-#include <linux/init.h>
-#include <linux/wait.h>
-#include <linux/mutex.h>
 #include <linux/kthread.h>
-#include <net/sock.h>
-
-#include <linux/input.h>
-#include <linux/hid.h>
 #include <linux/hidraw.h>
 
 #include <net/bluetooth/bluetooth.h>
@@ -244,7 +225,8 @@ static void hidp_input_report(struct hidp_session *session, struct sk_buff *skb)
 }
 
 static int __hidp_send_ctrl_message(struct hidp_session *session,
-                        unsigned char hdr, unsigned char *data, int size)
+                                    unsigned char hdr, unsigned char *data,
+                                    int size)
 {
         struct sk_buff *skb;
 
@@ -268,7 +250,7 @@ static int __hidp_send_ctrl_message(struct hidp_session *session,
         return 0;
 }
 
-static inline int hidp_send_ctrl_message(struct hidp_session *session,
+static int hidp_send_ctrl_message(struct hidp_session *session,
                         unsigned char hdr, unsigned char *data, int size)
 {
         int err;
@@ -471,7 +453,7 @@ static void hidp_set_timer(struct hidp_session *session)
                 mod_timer(&session->timer, jiffies + HZ * session->idle_to);
 }
 
-static inline void hidp_del_timer(struct hidp_session *session)
+static void hidp_del_timer(struct hidp_session *session)
 {
         if (session->idle_to > 0)
                 del_timer(&session->timer);
diff --git a/net/bluetooth/hidp/sock.c b/net/bluetooth/hidp/sock.c
index 73a32d705c1..18b3f6892a3 100644
--- a/net/bluetooth/hidp/sock.c
+++ b/net/bluetooth/hidp/sock.c
@@ -20,22 +20,8 @@
    SOFTWARE IS DISCLAIMED.
 */
 
-#include <linux/module.h>
-
-#include <linux/types.h>
-#include <linux/capability.h>
-#include <linux/errno.h>
-#include <linux/kernel.h>
-#include <linux/poll.h>
-#include <linux/fcntl.h>
-#include <linux/skbuff.h>
-#include <linux/socket.h>
-#include <linux/ioctl.h>
+#include <linux/export.h>
 #include <linux/file.h>
-#include <linux/init.h>
-#include <linux/compat.h>
-#include <linux/gfp.h>
-#include <net/sock.h>
 
 #include "hidp.h"
 
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
index 4554e80d16a..d42dfdc83eb 100644
--- a/net/bluetooth/l2cap_core.c
+++ b/net/bluetooth/l2cap_core.c
@@ -30,32 +30,14 @@
 
 #include <linux/module.h>
 
-#include <linux/types.h>
-#include <linux/capability.h>
-#include <linux/errno.h>
-#include <linux/kernel.h>
-#include <linux/sched.h>
-#include <linux/slab.h>
-#include <linux/poll.h>
-#include <linux/fcntl.h>
-#include <linux/init.h>
-#include <linux/interrupt.h>
-#include <linux/socket.h>
-#include <linux/skbuff.h>
-#include <linux/list.h>
-#include <linux/device.h>
 #include <linux/debugfs.h>
-#include <linux/seq_file.h>
-#include <linux/uaccess.h>
 #include <linux/crc16.h>
-#include <net/sock.h>
-
-#include <asm/unaligned.h>
 
 #include <net/bluetooth/bluetooth.h>
 #include <net/bluetooth/hci_core.h>
 #include <net/bluetooth/l2cap.h>
 #include <net/bluetooth/smp.h>
+#include <net/bluetooth/a2mp.h>
 
 bool disable_ertm;
 
@@ -73,6 +55,9 @@ static int l2cap_build_conf_req(struct l2cap_chan *chan, void *data);
 static void l2cap_send_disconn_req(struct l2cap_conn *conn,
                                    struct l2cap_chan *chan, int err);
 
+static void l2cap_tx(struct l2cap_chan *chan, struct l2cap_ctrl *control,
+                    struct sk_buff_head *skbs, u8 event);
+
 /* ---- L2CAP channels ---- */
 
 static struct l2cap_chan *__l2cap_get_chan_by_dcid(struct l2cap_conn *conn, u16 cid)
@@ -196,7 +181,7 @@ static void __l2cap_state_change(struct l2cap_chan *chan, int state)
                                                 state_to_string(state));
 
         chan->state = state;
-        chan->ops->state_change(chan->data, state);
+        chan->ops->state_change(chan, state);
 }
 
 static void l2cap_state_change(struct l2cap_chan *chan, int state)
@@ -224,6 +209,37 @@ static inline void l2cap_chan_set_err(struct l2cap_chan *chan, int err)
         release_sock(sk);
 }
 
+static void __set_retrans_timer(struct l2cap_chan *chan)
+{
+        if (!delayed_work_pending(&chan->monitor_timer) &&
+            chan->retrans_timeout) {
+                l2cap_set_timer(chan, &chan->retrans_timer,
+                                msecs_to_jiffies(chan->retrans_timeout));
+        }
+}
+
+static void __set_monitor_timer(struct l2cap_chan *chan)
+{
+        __clear_retrans_timer(chan);
+        if (chan->monitor_timeout) {
+                l2cap_set_timer(chan, &chan->monitor_timer,
+                                msecs_to_jiffies(chan->monitor_timeout));
+        }
+}
+
+static struct sk_buff *l2cap_ertm_seq_in_queue(struct sk_buff_head *head,
+                                               u16 seq)
+{
+        struct sk_buff *skb;
+
+        skb_queue_walk(head, skb) {
+                if (bt_cb(skb)->control.txseq == seq)
+                        return skb;
+        }
+
+        return NULL;
+}
+
 /* ---- L2CAP sequence number lists ---- */
 
 /* For ERTM, ordered lists of sequence numbers must be tracked for
@@ -366,7 +382,7 @@ static void l2cap_chan_timeout(struct work_struct *work)
 
         l2cap_chan_unlock(chan);
 
-        chan->ops->close(chan->data);
+        chan->ops->close(chan);
         mutex_unlock(&conn->chan_lock);
 
         l2cap_chan_put(chan);
@@ -392,6 +408,9 @@ struct l2cap_chan *l2cap_chan_create(void)
 
         atomic_set(&chan->refcnt, 1);
 
+        /* This flag is cleared in l2cap_chan_ready() */
+        set_bit(CONF_NOT_COMPLETE, &chan->conf_state);
+
         BT_DBG("chan %p", chan);
 
         return chan;
@@ -430,7 +449,7 @@ static void __l2cap_chan_add(struct l2cap_conn *conn, struct l2cap_chan *chan)
         case L2CAP_CHAN_CONN_ORIENTED:
                 if (conn->hcon->type == LE_LINK) {
                         /* LE connection */
-                        chan->omtu = L2CAP_LE_DEFAULT_MTU;
+                        chan->omtu = L2CAP_DEFAULT_MTU;
                         chan->scid = L2CAP_CID_LE_DATA;
                         chan->dcid = L2CAP_CID_LE_DATA;
                 } else {
@@ -447,6 +466,13 @@ static void __l2cap_chan_add(struct l2cap_conn *conn, struct l2cap_chan *chan)
                 chan->omtu = L2CAP_DEFAULT_MTU;
                 break;
 
+        case L2CAP_CHAN_CONN_FIX_A2MP:
+                chan->scid = L2CAP_CID_A2MP;
+                chan->dcid = L2CAP_CID_A2MP;
+                chan->omtu = L2CAP_A2MP_DEFAULT_MTU;
+                chan->imtu = L2CAP_A2MP_DEFAULT_MTU;
+                break;
+
         default:
                 /* Raw socket can send/recv signalling messages only */
                 chan->scid = L2CAP_CID_SIGNALING;
@@ -466,18 +492,16 @@ static void __l2cap_chan_add(struct l2cap_conn *conn, struct l2cap_chan *chan)
         list_add(&chan->list, &conn->chan_l);
 }
 
-static void l2cap_chan_add(struct l2cap_conn *conn, struct l2cap_chan *chan)
+void l2cap_chan_add(struct l2cap_conn *conn, struct l2cap_chan *chan)
 {
         mutex_lock(&conn->chan_lock);
         __l2cap_chan_add(conn, chan);
         mutex_unlock(&conn->chan_lock);
 }
 
-static void l2cap_chan_del(struct l2cap_chan *chan, int err)
+void l2cap_chan_del(struct l2cap_chan *chan, int err)
 {
-        struct sock *sk = chan->sk;
         struct l2cap_conn *conn = chan->conn;
-        struct sock *parent = bt_sk(sk)->parent;
 
         __clear_chan_timer(chan);
 
@@ -490,34 +514,22 @@ static void l2cap_chan_del(struct l2cap_chan *chan, int err)
                 l2cap_chan_put(chan);
 
                 chan->conn = NULL;
-                hci_conn_put(conn->hcon);
-        }
-
-        lock_sock(sk);
-
-        __l2cap_state_change(chan, BT_CLOSED);
-        sock_set_flag(sk, SOCK_ZAPPED);
 
-        if (err)
-                __l2cap_chan_set_err(chan, err);
+                if (chan->chan_type != L2CAP_CHAN_CONN_FIX_A2MP)
+                        hci_conn_put(conn->hcon);
+        }
 
-        if (parent) {
-                bt_accept_unlink(sk);
-                parent->sk_data_ready(parent, 0);
-        } else
-                sk->sk_state_change(sk);
+        if (chan->ops->teardown)
+                chan->ops->teardown(chan, err);
 
-        release_sock(sk);
-
-        if (!(test_bit(CONF_OUTPUT_DONE, &chan->conf_state) &&
-                        test_bit(CONF_INPUT_DONE, &chan->conf_state)))
+        if (test_bit(CONF_NOT_COMPLETE, &chan->conf_state))
                 return;
 
-        skb_queue_purge(&chan->tx_q);
-
-        if (chan->mode == L2CAP_MODE_ERTM) {
-                struct srej_list *l, *tmp;
+        switch(chan->mode) {
+        case L2CAP_MODE_BASIC:
+                break;
 
+        case L2CAP_MODE_ERTM:
                 __clear_retrans_timer(chan);
                 __clear_monitor_timer(chan);
                 __clear_ack_timer(chan);
@@ -526,30 +538,15 @@ static void l2cap_chan_del(struct l2cap_chan *chan, int err)
 
                 l2cap_seq_list_free(&chan->srej_list);
                 l2cap_seq_list_free(&chan->retrans_list);
-                list_for_each_entry_safe(l, tmp, &chan->srej_l, list) {
-                        list_del(&l->list);
-                        kfree(l);
-                }
-        }
-}
-
-static void l2cap_chan_cleanup_listen(struct sock *parent)
-{
-        struct sock *sk;
-
-        BT_DBG("parent %p", parent);
 
-        /* Close not yet accepted channels */
-        while ((sk = bt_accept_dequeue(parent, NULL))) {
-                struct l2cap_chan *chan = l2cap_pi(sk)->chan;
-
-                l2cap_chan_lock(chan);
-                __clear_chan_timer(chan);
-                l2cap_chan_close(chan, ECONNRESET);
-                l2cap_chan_unlock(chan);
+                /* fall through */
 
-                chan->ops->close(chan->data);
+        case L2CAP_MODE_STREAMING:
+                skb_queue_purge(&chan->tx_q);
+                break;
         }
+
+        return;
 }
 
 void l2cap_chan_close(struct l2cap_chan *chan, int reason)
@@ -562,12 +559,8 @@ void l2cap_chan_close(struct l2cap_chan *chan, int reason)
 
         switch (chan->state) {
         case BT_LISTEN:
-                lock_sock(sk);
-                l2cap_chan_cleanup_listen(sk);
-
-                __l2cap_state_change(chan, BT_CLOSED);
-                sock_set_flag(sk, SOCK_ZAPPED);
-                release_sock(sk);
+                if (chan->ops->teardown)
+                        chan->ops->teardown(chan, 0);
                 break;
 
         case BT_CONNECTED:
@@ -595,7 +588,7 @@ void l2cap_chan_close(struct l2cap_chan *chan, int reason)
                         rsp.scid   = cpu_to_le16(chan->dcid);
                         rsp.dcid   = cpu_to_le16(chan->scid);
                         rsp.result = cpu_to_le16(result);
-                        rsp.status = cpu_to_le16(L2CAP_CS_NO_INFO);
+                        rsp.status = __constant_cpu_to_le16(L2CAP_CS_NO_INFO);
                         l2cap_send_cmd(conn, chan->ident, L2CAP_CONN_RSP,
                                                         sizeof(rsp), &rsp);
                 }
@@ -609,9 +602,8 @@ void l2cap_chan_close(struct l2cap_chan *chan, int reason)
                 break;
 
         default:
-                lock_sock(sk);
-                sock_set_flag(sk, SOCK_ZAPPED);
-                release_sock(sk);
+                if (chan->ops->teardown)
+                        chan->ops->teardown(chan, 0);
                 break;
         }
 }
@@ -627,7 +619,7 @@ static inline u8 l2cap_get_auth_type(struct l2cap_chan *chan)
                 default:
                         return HCI_AT_NO_BONDING;
                 }
-        } else if (chan->psm == cpu_to_le16(0x0001)) {
+        } else if (chan->psm == __constant_cpu_to_le16(L2CAP_PSM_SDP)) {
                 if (chan->sec_level == BT_SECURITY_LOW)
                         chan->sec_level = BT_SECURITY_SDP;
 
@@ -773,9 +765,11 @@ static inline void __unpack_control(struct l2cap_chan *chan,
         if (test_bit(FLAG_EXT_CTRL, &chan->flags)) {
                 __unpack_extended_control(get_unaligned_le32(skb->data),
                                           &bt_cb(skb)->control);
+                skb_pull(skb, L2CAP_EXT_CTRL_SIZE);
         } else {
                 __unpack_enhanced_control(get_unaligned_le16(skb->data),
                                           &bt_cb(skb)->control);
+                skb_pull(skb, L2CAP_ENH_CTRL_SIZE);
         }
 }
 
@@ -830,66 +824,102 @@ static inline void __pack_control(struct l2cap_chan *chan,
         }
 }
 
-static inline void l2cap_send_sframe(struct l2cap_chan *chan, u32 control)
+static inline unsigned int __ertm_hdr_size(struct l2cap_chan *chan)
 {
-        struct sk_buff *skb;
-        struct l2cap_hdr *lh;
-        struct l2cap_conn *conn = chan->conn;
-        int count, hlen;
-
-        if (chan->state != BT_CONNECTED)
-                return;
-
         if (test_bit(FLAG_EXT_CTRL, &chan->flags))
-                hlen = L2CAP_EXT_HDR_SIZE;
+                return L2CAP_EXT_HDR_SIZE;
         else
-                hlen = L2CAP_ENH_HDR_SIZE;
+                return L2CAP_ENH_HDR_SIZE;
+}
+
+static struct sk_buff *l2cap_create_sframe_pdu(struct l2cap_chan *chan,
+                                               u32 control)
+{
+        struct sk_buff *skb;
+        struct l2cap_hdr *lh;
+        int hlen = __ertm_hdr_size(chan);
 
         if (chan->fcs == L2CAP_FCS_CRC16)
                 hlen += L2CAP_FCS_SIZE;
 
-        BT_DBG("chan %p, control 0x%8.8x", chan, control);
-
-        count = min_t(unsigned int, conn->mtu, hlen);
-
-        control |= __set_sframe(chan);
+        skb = bt_skb_alloc(hlen, GFP_KERNEL);
 
-        if (test_and_clear_bit(CONN_SEND_FBIT, &chan->conn_state))
-                control |= __set_ctrl_final(chan);
-
-        if (test_and_clear_bit(CONN_SEND_PBIT, &chan->conn_state))
-                control |= __set_ctrl_poll(chan);
-
-        skb = bt_skb_alloc(count, GFP_ATOMIC);
         if (!skb)
-                return;
+                return ERR_PTR(-ENOMEM);
 
         lh = (struct l2cap_hdr *) skb_put(skb, L2CAP_HDR_SIZE);
         lh->len = cpu_to_le16(hlen - L2CAP_HDR_SIZE);
         lh->cid = cpu_to_le16(chan->dcid);
 
-        __put_control(chan, control, skb_put(skb, __ctrl_size(chan)));
+        if (test_bit(FLAG_EXT_CTRL, &chan->flags))
+                put_unaligned_le32(control, skb_put(skb, L2CAP_EXT_CTRL_SIZE));
+        else
+                put_unaligned_le16(control, skb_put(skb, L2CAP_ENH_CTRL_SIZE));
 
         if (chan->fcs == L2CAP_FCS_CRC16) {
-                u16 fcs = crc16(0, (u8 *)lh, count - L2CAP_FCS_SIZE);
+                u16 fcs = crc16(0, (u8 *)skb->data, skb->len);
                 put_unaligned_le16(fcs, skb_put(skb, L2CAP_FCS_SIZE));
         }
 
         skb->priority = HCI_PRIO_MAX;
-        l2cap_do_send(chan, skb);
+        return skb;
 }
 
-static inline void l2cap_send_rr_or_rnr(struct l2cap_chan *chan, u32 control)
+static void l2cap_send_sframe(struct l2cap_chan *chan,
+                              struct l2cap_ctrl *control)
 {
-        if (test_bit(CONN_LOCAL_BUSY, &chan->conn_state)) {
-                control |= __set_ctrl_super(chan, L2CAP_SUPER_RNR);
+        struct sk_buff *skb;
+        u32 control_field;
+
+        BT_DBG("chan %p, control %p", chan, control);
+
+        if (!control->sframe)
+                return;
+
+        if (test_and_clear_bit(CONN_SEND_FBIT, &chan->conn_state) &&
+            !control->poll)
+                control->final = 1;
+
+        if (control->super == L2CAP_SUPER_RR)
+                clear_bit(CONN_RNR_SENT, &chan->conn_state);
+        else if (control->super == L2CAP_SUPER_RNR)
                 set_bit(CONN_RNR_SENT, &chan->conn_state);
-        } else
-                control |= __set_ctrl_super(chan, L2CAP_SUPER_RR);
 
-        control |= __set_reqseq(chan, chan->buffer_seq);
+        if (control->super != L2CAP_SUPER_SREJ) {
+                chan->last_acked_seq = control->reqseq;
+                __clear_ack_timer(chan);
+        }
 
-        l2cap_send_sframe(chan, control);
+        BT_DBG("reqseq %d, final %d, poll %d, super %d", control->reqseq,
+               control->final, control->poll, control->super);
+
+        if (test_bit(FLAG_EXT_CTRL, &chan->flags))
+                control_field = __pack_extended_control(control);
+        else
+                control_field = __pack_enhanced_control(control);
+
+        skb = l2cap_create_sframe_pdu(chan, control_field);
+        if (!IS_ERR(skb))
+                l2cap_do_send(chan, skb);
+}
+
+static void l2cap_send_rr_or_rnr(struct l2cap_chan *chan, bool poll)
+{
+        struct l2cap_ctrl control;
+
+        BT_DBG("chan %p, poll %d", chan, poll);
+
+        memset(&control, 0, sizeof(control));
+        control.sframe = 1;
+        control.poll = poll;
+
+        if (test_bit(CONN_LOCAL_BUSY, &chan->conn_state))
+                control.super = L2CAP_SUPER_RNR;
+        else
+                control.super = L2CAP_SUPER_RR;
+
+        control.reqseq = chan->buffer_seq;
+        l2cap_send_sframe(chan, &control);
 }
 
 static inline int __l2cap_no_conn_pending(struct l2cap_chan *chan)
@@ -914,25 +944,13 @@ static void l2cap_send_conn_req(struct l2cap_chan *chan)
 
 static void l2cap_chan_ready(struct l2cap_chan *chan)
 {
-        struct sock *sk = chan->sk;
-        struct sock *parent;
-
-        lock_sock(sk);
-
-        parent = bt_sk(sk)->parent;
-
-        BT_DBG("sk %p, parent %p", sk, parent);
-
+        /* This clears all conf flags, including CONF_NOT_COMPLETE */
         chan->conf_state = 0;
         __clear_chan_timer(chan);
 
-        __l2cap_state_change(chan, BT_CONNECTED);
-        sk->sk_state_change(sk);
-
-        if (parent)
-                parent->sk_data_ready(parent, 0);
+        chan->state = BT_CONNECTED;
 
-        release_sock(sk);
+        chan->ops->ready(chan);
 }
 
 static void l2cap_do_start(struct l2cap_chan *chan)
@@ -953,7 +971,7 @@ static void l2cap_do_start(struct l2cap_chan *chan)
                         l2cap_send_conn_req(chan);
         } else {
                 struct l2cap_info_req req;
-                req.type = cpu_to_le16(L2CAP_IT_FEAT_MASK);
+                req.type = __constant_cpu_to_le16(L2CAP_IT_FEAT_MASK);
 
                 conn->info_state |= L2CAP_INFO_FEAT_MASK_REQ_SENT;
                 conn->info_ident = l2cap_get_ident(conn);
@@ -995,6 +1013,11 @@ static void l2cap_send_disconn_req(struct l2cap_conn *conn, struct l2cap_chan *c
                 __clear_ack_timer(chan);
         }
 
+        if (chan->chan_type == L2CAP_CHAN_CONN_FIX_A2MP) {
+                __l2cap_state_change(chan, BT_DISCONN);
+                return;
+        }
+
         req.dcid = cpu_to_le16(chan->dcid);
         req.scid = cpu_to_le16(chan->scid);
         l2cap_send_cmd(conn, l2cap_get_ident(conn),
@@ -1053,20 +1076,20 @@ static void l2cap_conn_start(struct l2cap_conn *conn)
                                 if (test_bit(BT_SK_DEFER_SETUP,
                                              &bt_sk(sk)->flags)) {
                                         struct sock *parent = bt_sk(sk)->parent;
-                                        rsp.result = cpu_to_le16(L2CAP_CR_PEND);
-                                        rsp.status = cpu_to_le16(L2CAP_CS_AUTHOR_PEND);
+                                        rsp.result = __constant_cpu_to_le16(L2CAP_CR_PEND);
+                                        rsp.status = __constant_cpu_to_le16(L2CAP_CS_AUTHOR_PEND);
                                         if (parent)
                                                 parent->sk_data_ready(parent, 0);
 
                                 } else {
                                         __l2cap_state_change(chan, BT_CONFIG);
-                                        rsp.result = cpu_to_le16(L2CAP_CR_SUCCESS);
-                                        rsp.status = cpu_to_le16(L2CAP_CS_NO_INFO);
+                                        rsp.result = __constant_cpu_to_le16(L2CAP_CR_SUCCESS);
+                                        rsp.status = __constant_cpu_to_le16(L2CAP_CS_NO_INFO);
                                 }
                                 release_sock(sk);
                         } else {
-                                rsp.result = cpu_to_le16(L2CAP_CR_PEND);
-                                rsp.status = cpu_to_le16(L2CAP_CS_AUTHEN_PEND);
+                                rsp.result = __constant_cpu_to_le16(L2CAP_CR_PEND);
+                                rsp.status = __constant_cpu_to_le16(L2CAP_CS_AUTHEN_PEND);
                         }
 
                         l2cap_send_cmd(conn, chan->ident, L2CAP_CONN_RSP,
@@ -1150,13 +1173,7 @@ static void l2cap_le_conn_ready(struct l2cap_conn *conn)
 
         lock_sock(parent);
 
-        /* Check for backlog size */
-        if (sk_acceptq_is_full(parent)) {
-                BT_DBG("backlog full %d", parent->sk_ack_backlog);
-                goto clean;
-        }
-
-        chan = pchan->ops->new_connection(pchan->data);
+        chan = pchan->ops->new_connection(pchan);
         if (!chan)
                 goto clean;
 
@@ -1171,10 +1188,7 @@ static void l2cap_le_conn_ready(struct l2cap_conn *conn)
 
         l2cap_chan_add(conn, chan);
 
-        __set_chan_timer(chan, sk->sk_sndtimeo);
-
-        __l2cap_state_change(chan, BT_CONNECTED);
-        parent->sk_data_ready(parent, 0);
+        l2cap_chan_ready(chan);
 
 clean:
         release_sock(parent);
@@ -1198,6 +1212,11 @@ static void l2cap_conn_ready(struct l2cap_conn *conn)
 
                 l2cap_chan_lock(chan);
 
+                if (chan->chan_type == L2CAP_CHAN_CONN_FIX_A2MP) {
+                        l2cap_chan_unlock(chan);
+                        continue;
+                }
+
                 if (conn->hcon->type == LE_LINK) {
                         if (smp_conn_security(conn, chan->sec_level))
                                 l2cap_chan_ready(chan);
@@ -1270,7 +1289,7 @@ static void l2cap_conn_del(struct hci_conn *hcon, int err)
 
                 l2cap_chan_unlock(chan);
 
-                chan->ops->close(chan->data);
+                chan->ops->close(chan);
                 l2cap_chan_put(chan);
         }
 
@@ -1444,21 +1463,17 @@ int l2cap_chan_connect(struct l2cap_chan *chan, __le16 psm, u16 cid,
                 goto done;
         }
 
-        lock_sock(sk);
-
-        switch (sk->sk_state) {
+        switch (chan->state) {
         case BT_CONNECT:
         case BT_CONNECT2:
         case BT_CONFIG:
                 /* Already connecting */
                 err = 0;
-                release_sock(sk);
                 goto done;
 
         case BT_CONNECTED:
                 /* Already connected */
                 err = -EISCONN;
-                release_sock(sk);
                 goto done;
 
         case BT_OPEN:
@@ -1468,13 +1483,12 @@ int l2cap_chan_connect(struct l2cap_chan *chan, __le16 psm, u16 cid,
 
         default:
                 err = -EBADFD;
-                release_sock(sk);
                 goto done;
         }
 
         /* Set destination address and psm */
+        lock_sock(sk);
         bacpy(&bt_sk(sk)->dst, dst);
-
         release_sock(sk);
 
         chan->psm = psm;
@@ -1576,23 +1590,20 @@ int __l2cap_wait_ack(struct sock *sk)
 static void l2cap_monitor_timeout(struct work_struct *work)
 {
         struct l2cap_chan *chan = container_of(work, struct l2cap_chan,
-                                                        monitor_timer.work);
+                                               monitor_timer.work);
 
         BT_DBG("chan %p", chan);
 
         l2cap_chan_lock(chan);
 
-        if (chan->retry_count >= chan->remote_max_tx) {
-                l2cap_send_disconn_req(chan->conn, chan, ECONNABORTED);
+        if (!chan->conn) {
                 l2cap_chan_unlock(chan);
                 l2cap_chan_put(chan);
                 return;
         }
 
-        chan->retry_count++;
-        __set_monitor_timer(chan);
+        l2cap_tx(chan, NULL, NULL, L2CAP_EV_MONITOR_TO);
 
-        l2cap_send_rr_or_rnr(chan, L2CAP_CTRL_POLL);
         l2cap_chan_unlock(chan);
         l2cap_chan_put(chan);
 }
@@ -1600,234 +1611,293 @@ static void l2cap_monitor_timeout(struct work_struct *work)
 static void l2cap_retrans_timeout(struct work_struct *work)
 {
         struct l2cap_chan *chan = container_of(work, struct l2cap_chan,
-                                                        retrans_timer.work);
+                                               retrans_timer.work);
 
         BT_DBG("chan %p", chan);
 
         l2cap_chan_lock(chan);
 
-        chan->retry_count = 1;
-        __set_monitor_timer(chan);
-
-        set_bit(CONN_WAIT_F, &chan->conn_state);
-
-        l2cap_send_rr_or_rnr(chan, L2CAP_CTRL_POLL);
+        if (!chan->conn) {
+                l2cap_chan_unlock(chan);
+                l2cap_chan_put(chan);
+                return;
+        }
 
+        l2cap_tx(chan, NULL, NULL, L2CAP_EV_RETRANS_TO);
         l2cap_chan_unlock(chan);
         l2cap_chan_put(chan);
 }
 
-static void l2cap_drop_acked_frames(struct l2cap_chan *chan)
+static void l2cap_streaming_send(struct l2cap_chan *chan,
+                                 struct sk_buff_head *skbs)
 {
         struct sk_buff *skb;
+        struct l2cap_ctrl *control;
 
-        while ((skb = skb_peek(&chan->tx_q)) &&
-                        chan->unacked_frames) {
-                if (bt_cb(skb)->control.txseq == chan->expected_ack_seq)
-                        break;
+        BT_DBG("chan %p, skbs %p", chan, skbs);
 
-                skb = skb_dequeue(&chan->tx_q);
-                kfree_skb(skb);
+        skb_queue_splice_tail_init(skbs, &chan->tx_q);
 
-                chan->unacked_frames--;
-        }
+        while (!skb_queue_empty(&chan->tx_q)) {
 
-        if (!chan->unacked_frames)
-                __clear_retrans_timer(chan);
-}
+                skb = skb_dequeue(&chan->tx_q);
 
-static void l2cap_streaming_send(struct l2cap_chan *chan)
-{
-        struct sk_buff *skb;
-        u32 control;
-        u16 fcs;
+                bt_cb(skb)->control.retries = 1;
+                control = &bt_cb(skb)->control;
 
-        while ((skb = skb_dequeue(&chan->tx_q))) {
-                control = __get_control(chan, skb->data + L2CAP_HDR_SIZE);
-                control |= __set_txseq(chan, chan->next_tx_seq);
-                control |= __set_ctrl_sar(chan, bt_cb(skb)->control.sar);
-                __put_control(chan, control, skb->data + L2CAP_HDR_SIZE);
+                control->reqseq = 0;
+                control->txseq = chan->next_tx_seq;
+
+                __pack_control(chan, control, skb);
 
                 if (chan->fcs == L2CAP_FCS_CRC16) {
-                        fcs = crc16(0, (u8 *)skb->data,
-                                                skb->len - L2CAP_FCS_SIZE);
-                        put_unaligned_le16(fcs,
-                                        skb->data + skb->len - L2CAP_FCS_SIZE);
+                        u16 fcs = crc16(0, (u8 *) skb->data, skb->len);
+                        put_unaligned_le16(fcs, skb_put(skb, L2CAP_FCS_SIZE));
                 }
 
                 l2cap_do_send(chan, skb);
 
+                BT_DBG("Sent txseq %d", (int)control->txseq);
+
                 chan->next_tx_seq = __next_seq(chan, chan->next_tx_seq);
+                chan->frames_sent++;
         }
 }
 
-static void l2cap_retransmit_one_frame(struct l2cap_chan *chan, u16 tx_seq)
+static int l2cap_ertm_send(struct l2cap_chan *chan)
 {
         struct sk_buff *skb, *tx_skb;
-        u16 fcs;
-        u32 control;
+        struct l2cap_ctrl *control;
+        int sent = 0;
 
-        skb = skb_peek(&chan->tx_q);
-        if (!skb)
-                return;
+        BT_DBG("chan %p", chan);
 
-        while (bt_cb(skb)->control.txseq != tx_seq) {
-                if (skb_queue_is_last(&chan->tx_q, skb))
-                        return;
+        if (chan->state != BT_CONNECTED)
+                return -ENOTCONN;
 
-                skb = skb_queue_next(&chan->tx_q, skb);
-        }
+        if (test_bit(CONN_REMOTE_BUSY, &chan->conn_state))
+                return 0;
 
-        if (bt_cb(skb)->control.retries == chan->remote_max_tx &&
-            chan->remote_max_tx) {
-                l2cap_send_disconn_req(chan->conn, chan, ECONNABORTED);
-                return;
-        }
+        while (chan->tx_send_head &&
+               chan->unacked_frames < chan->remote_tx_win &&
+               chan->tx_state == L2CAP_TX_STATE_XMIT) {
 
-        tx_skb = skb_clone(skb, GFP_ATOMIC);
-        bt_cb(skb)->control.retries++;
+                skb = chan->tx_send_head;
 
-        control = __get_control(chan, tx_skb->data + L2CAP_HDR_SIZE);
-        control &= __get_sar_mask(chan);
+                bt_cb(skb)->control.retries = 1;
+                control = &bt_cb(skb)->control;
 
-        if (test_and_clear_bit(CONN_SEND_FBIT, &chan->conn_state))
-                control |= __set_ctrl_final(chan);
+                if (test_and_clear_bit(CONN_SEND_FBIT, &chan->conn_state))
+                        control->final = 1;
 
-        control |= __set_reqseq(chan, chan->buffer_seq);
-        control |= __set_txseq(chan, tx_seq);
+                control->reqseq = chan->buffer_seq;
+                chan->last_acked_seq = chan->buffer_seq;
+                control->txseq = chan->next_tx_seq;
 
-        __put_control(chan, control, tx_skb->data + L2CAP_HDR_SIZE);
+                __pack_control(chan, control, skb);
 
-        if (chan->fcs == L2CAP_FCS_CRC16) {
-                fcs = crc16(0, (u8 *)tx_skb->data,
-                                                tx_skb->len - L2CAP_FCS_SIZE);
-                put_unaligned_le16(fcs,
-                                tx_skb->data + tx_skb->len - L2CAP_FCS_SIZE);
+                if (chan->fcs == L2CAP_FCS_CRC16) {
+                        u16 fcs = crc16(0, (u8 *) skb->data, skb->len);
+                        put_unaligned_le16(fcs, skb_put(skb, L2CAP_FCS_SIZE));
+                }
+
+                /* Clone after data has been modified. Data is assumed to be
+                   read-only (for locking purposes) on cloned sk_buffs.
+                 */
+                tx_skb = skb_clone(skb, GFP_KERNEL);
+
+                if (!tx_skb)
+                        break;
+
+                __set_retrans_timer(chan);
+
+                chan->next_tx_seq = __next_seq(chan, chan->next_tx_seq);
+                chan->unacked_frames++;
+                chan->frames_sent++;
+                sent++;
+
+                if (skb_queue_is_last(&chan->tx_q, skb))
+                        chan->tx_send_head = NULL;
+                else
+                        chan->tx_send_head = skb_queue_next(&chan->tx_q, skb);
+
+                l2cap_do_send(chan, tx_skb);
+                BT_DBG("Sent txseq %d", (int)control->txseq);
         }
 
-        l2cap_do_send(chan, tx_skb);
+        BT_DBG("Sent %d, %d unacked, %d in ERTM queue", sent,
+               (int) chan->unacked_frames, skb_queue_len(&chan->tx_q));
+
+        return sent;
 }
 
-static int l2cap_ertm_send(struct l2cap_chan *chan)
+static void l2cap_ertm_resend(struct l2cap_chan *chan)
 {
-        struct sk_buff *skb, *tx_skb;
-        u16 fcs;
-        u32 control;
-        int nsent = 0;
+        struct l2cap_ctrl control;
+        struct sk_buff *skb;
+        struct sk_buff *tx_skb;
+        u16 seq;
 
-        if (chan->state != BT_CONNECTED)
-                return -ENOTCONN;
+        BT_DBG("chan %p", chan);
 
         if (test_bit(CONN_REMOTE_BUSY, &chan->conn_state))
-                return 0;
+                return;
 
-        while ((skb = chan->tx_send_head) && (!l2cap_tx_window_full(chan))) {
+        while (chan->retrans_list.head != L2CAP_SEQ_LIST_CLEAR) {
+                seq = l2cap_seq_list_pop(&chan->retrans_list);
 
-                if (bt_cb(skb)->control.retries == chan->remote_max_tx &&
-                    chan->remote_max_tx) {
-                        l2cap_send_disconn_req(chan->conn, chan, ECONNABORTED);
-                        break;
+                skb = l2cap_ertm_seq_in_queue(&chan->tx_q, seq);
+                if (!skb) {
+                        BT_DBG("Error: Can't retransmit seq %d, frame missing",
+                                seq);
+                        continue;
                 }
 
-                tx_skb = skb_clone(skb, GFP_ATOMIC);
-
                 bt_cb(skb)->control.retries++;
+                control = bt_cb(skb)->control;
 
-                control = __get_control(chan, tx_skb->data + L2CAP_HDR_SIZE);
-                control &= __get_sar_mask(chan);
+                if (chan->max_tx != 0 &&
+                    bt_cb(skb)->control.retries > chan->max_tx) {
+                        BT_DBG("Retry limit exceeded (%d)", chan->max_tx);
+                        l2cap_send_disconn_req(chan->conn, chan, ECONNRESET);
+                        l2cap_seq_list_clear(&chan->retrans_list);
+                        break;
+                }
 
+                control.reqseq = chan->buffer_seq;
                 if (test_and_clear_bit(CONN_SEND_FBIT, &chan->conn_state))
-                        control |= __set_ctrl_final(chan);
+                        control.final = 1;
+                else
+                        control.final = 0;
 
-                control |= __set_reqseq(chan, chan->buffer_seq);
-                control |= __set_txseq(chan, chan->next_tx_seq);
-                control |= __set_ctrl_sar(chan, bt_cb(skb)->control.sar);
+                if (skb_cloned(skb)) {
+                        /* Cloned sk_buffs are read-only, so we need a
+                         * writeable copy
+                         */
+                        tx_skb = skb_copy(skb, GFP_ATOMIC);
+                } else {
+                        tx_skb = skb_clone(skb, GFP_ATOMIC);
+                }
 
-                __put_control(chan, control, tx_skb->data + L2CAP_HDR_SIZE);
+                if (!tx_skb) {
+                        l2cap_seq_list_clear(&chan->retrans_list);
+                        break;
+                }
+
+                /* Update skb contents */
+                if (test_bit(FLAG_EXT_CTRL, &chan->flags)) {
+                        put_unaligned_le32(__pack_extended_control(&control),
+                                           tx_skb->data + L2CAP_HDR_SIZE);
+                } else {
+                        put_unaligned_le16(__pack_enhanced_control(&control),
+                                           tx_skb->data + L2CAP_HDR_SIZE);
+                }
 
                 if (chan->fcs == L2CAP_FCS_CRC16) {
-                        fcs = crc16(0, (u8 *)skb->data,
-                                                tx_skb->len - L2CAP_FCS_SIZE);
-                        put_unaligned_le16(fcs, skb->data +
-                                                tx_skb->len - L2CAP_FCS_SIZE);
+                        u16 fcs = crc16(0, (u8 *) tx_skb->data, tx_skb->len);
+                        put_unaligned_le16(fcs, skb_put(tx_skb,
+                                                        L2CAP_FCS_SIZE));
                 }
 
                 l2cap_do_send(chan, tx_skb);
 
-                __set_retrans_timer(chan);
-
-                bt_cb(skb)->control.txseq = chan->next_tx_seq;
-
-                chan->next_tx_seq = __next_seq(chan, chan->next_tx_seq);
-
-                if (bt_cb(skb)->control.retries == 1) {
-                        chan->unacked_frames++;
-
-                        if (!nsent++)
-                                __clear_ack_timer(chan);
-                }
-
-                chan->frames_sent++;
+                BT_DBG("Resent txseq %d", control.txseq);
 
-                if (skb_queue_is_last(&chan->tx_q, skb))
-                        chan->tx_send_head = NULL;
-                else
-                        chan->tx_send_head = skb_queue_next(&chan->tx_q, skb);
+                chan->last_acked_seq = chan->buffer_seq;
         }
-
-        return nsent;
 }
 
-static int l2cap_retransmit_frames(struct l2cap_chan *chan)
+static void l2cap_retransmit(struct l2cap_chan *chan,
+                             struct l2cap_ctrl *control)
 {
-        int ret;
-
-        if (!skb_queue_empty(&chan->tx_q))
-                chan->tx_send_head = chan->tx_q.next;
+        BT_DBG("chan %p, control %p", chan, control);
 
-        chan->next_tx_seq = chan->expected_ack_seq;
-        ret = l2cap_ertm_send(chan);
-        return ret;
+        l2cap_seq_list_append(&chan->retrans_list, control->reqseq);
+        l2cap_ertm_resend(chan);
 }
 
-static void __l2cap_send_ack(struct l2cap_chan *chan)
+static void l2cap_retransmit_all(struct l2cap_chan *chan,
+                                 struct l2cap_ctrl *control)
 {
-        u32 control = 0;
+        struct sk_buff *skb;
 
-        control |= __set_reqseq(chan, chan->buffer_seq);
+        BT_DBG("chan %p, control %p", chan, control);
 
-        if (test_bit(CONN_LOCAL_BUSY, &chan->conn_state)) {
-                control |= __set_ctrl_super(chan, L2CAP_SUPER_RNR);
-                set_bit(CONN_RNR_SENT, &chan->conn_state);
-                l2cap_send_sframe(chan, control);
-                return;
-        }
+        if (control->poll)
+                set_bit(CONN_SEND_FBIT, &chan->conn_state);
 
-        if (l2cap_ertm_send(chan) > 0)
+        l2cap_seq_list_clear(&chan->retrans_list);
+
+        if (test_bit(CONN_REMOTE_BUSY, &chan->conn_state))
                 return;
 
-        control |= __set_ctrl_super(chan, L2CAP_SUPER_RR);
-        l2cap_send_sframe(chan, control);
+        if (chan->unacked_frames) {
+                skb_queue_walk(&chan->tx_q, skb) {
+                        if (bt_cb(skb)->control.txseq == control->reqseq ||
+                                skb == chan->tx_send_head)
+                                break;
+                }
+
+                skb_queue_walk_from(&chan->tx_q, skb) {
+                        if (skb == chan->tx_send_head)
+                                break;
+
+                        l2cap_seq_list_append(&chan->retrans_list,
+                                              bt_cb(skb)->control.txseq);
+                }
+
+                l2cap_ertm_resend(chan);
+        }
 }
 
 static void l2cap_send_ack(struct l2cap_chan *chan)
 {
-        __clear_ack_timer(chan);
-        __l2cap_send_ack(chan);
-}
+        struct l2cap_ctrl control;
+        u16 frames_to_ack = __seq_offset(chan, chan->buffer_seq,
+                                         chan->last_acked_seq);
+        int threshold;
 
-static void l2cap_send_srejtail(struct l2cap_chan *chan)
-{
-        struct srej_list *tail;
-        u32 control;
+        BT_DBG("chan %p last_acked_seq %d buffer_seq %d",
+               chan, chan->last_acked_seq, chan->buffer_seq);
 
-        control = __set_ctrl_super(chan, L2CAP_SUPER_SREJ);
-        control |= __set_ctrl_final(chan);
+        memset(&control, 0, sizeof(control));
+        control.sframe = 1;
 
-        tail = list_entry((&chan->srej_l)->prev, struct srej_list, list);
-        control |= __set_reqseq(chan, tail->tx_seq);
+        if (test_bit(CONN_LOCAL_BUSY, &chan->conn_state) &&
+            chan->rx_state == L2CAP_RX_STATE_RECV) {
+                __clear_ack_timer(chan);
+                control.super = L2CAP_SUPER_RNR;
+                control.reqseq = chan->buffer_seq;
+                l2cap_send_sframe(chan, &control);
+        } else {
+                if (!test_bit(CONN_REMOTE_BUSY, &chan->conn_state)) {
+                        l2cap_ertm_send(chan);
+                        /* If any i-frames were sent, they included an ack */
+                        if (chan->buffer_seq == chan->last_acked_seq)
+                                frames_to_ack = 0;
+                }
+
+                /* Ack now if the tx window is 3/4ths full.
+                 * Calculate without mul or div
+                 */
+                threshold = chan->tx_win;
+                threshold += threshold << 1;
+                threshold >>= 2;
+
+                BT_DBG("frames_to_ack %d, threshold %d", (int)frames_to_ack,
+                       threshold);
+
+                if (frames_to_ack >= threshold) {
+                        __clear_ack_timer(chan);
+                        control.super = L2CAP_SUPER_RR;
+                        control.reqseq = chan->buffer_seq;
+                        l2cap_send_sframe(chan, &control);
+                        frames_to_ack = 0;
+                }
 
-        l2cap_send_sframe(chan, control);
+                if (frames_to_ack)
+                        __set_ack_timer(chan);
+        }
 }
 
 static inline int l2cap_skbuff_fromiovec(struct l2cap_chan *chan,
@@ -1956,10 +2026,7 @@ static struct sk_buff *l2cap_create_iframe_pdu(struct l2cap_chan *chan,
         if (!conn)
                 return ERR_PTR(-ENOTCONN);
 
-        if (test_bit(FLAG_EXT_CTRL, &chan->flags))
-                hlen = L2CAP_EXT_HDR_SIZE;
-        else
-                hlen = L2CAP_ENH_HDR_SIZE;
+        hlen = __ertm_hdr_size(chan);
 
         if (sdulen)
                 hlen += L2CAP_SDULEN_SIZE;
@@ -1979,7 +2046,11 @@ static struct sk_buff *l2cap_create_iframe_pdu(struct l2cap_chan *chan,
         lh->cid = cpu_to_le16(chan->dcid);
         lh->len = cpu_to_le16(len + (hlen - L2CAP_HDR_SIZE));
 
-        __put_control(chan, 0, skb_put(skb, __ctrl_size(chan)));
+        /* Control header is populated later */
+        if (test_bit(FLAG_EXT_CTRL, &chan->flags))
+                put_unaligned_le32(0, skb_put(skb, L2CAP_EXT_CTRL_SIZE));
+        else
+                put_unaligned_le16(0, skb_put(skb, L2CAP_ENH_CTRL_SIZE));
 
         if (sdulen)
                 put_unaligned_le16(sdulen, skb_put(skb, L2CAP_SDULEN_SIZE));
@@ -1990,9 +2061,7 @@ static struct sk_buff *l2cap_create_iframe_pdu(struct l2cap_chan *chan,
                 return ERR_PTR(err);
         }
 
-        if (chan->fcs == L2CAP_FCS_CRC16)
-                put_unaligned_le16(0, skb_put(skb, L2CAP_FCS_SIZE));
-
+        bt_cb(skb)->control.fcs = chan->fcs;
         bt_cb(skb)->control.retries = 0;
         return skb;
 }
@@ -2004,7 +2073,6 @@ static int l2cap_segment_sdu(struct l2cap_chan *chan,
         struct sk_buff *skb;
         u16 sdu_len;
         size_t pdu_len;
-        int err = 0;
         u8 sar;
 
         BT_DBG("chan %p, msg %p, len %d", chan, msg, (int)len);
@@ -2020,7 +2088,10 @@ static int l2cap_segment_sdu(struct l2cap_chan *chan,
         pdu_len = min_t(size_t, pdu_len, L2CAP_BREDR_MAX_PAYLOAD);
 
         /* Adjust for largest possible L2CAP overhead. */
-        pdu_len -= L2CAP_EXT_HDR_SIZE + L2CAP_FCS_SIZE;
+        if (chan->fcs)
+                pdu_len -= L2CAP_FCS_SIZE;
+
+        pdu_len -= __ertm_hdr_size(chan);
 
         /* Remote device may have requested smaller PDUs */
         pdu_len = min_t(size_t, pdu_len, chan->remote_mps);
@@ -2060,7 +2131,7 @@ static int l2cap_segment_sdu(struct l2cap_chan *chan,
                 }
         }
 
-        return err;
+        return 0;
 }
 
 int l2cap_chan_send(struct l2cap_chan *chan, struct msghdr *msg, size_t len,
@@ -2122,17 +2193,12 @@ int l2cap_chan_send(struct l2cap_chan *chan, struct msghdr *msg, size_t len,
                 if (err)
                         break;
 
-                if (chan->mode == L2CAP_MODE_ERTM && chan->tx_send_head == NULL)
-                        chan->tx_send_head = seg_queue.next;
-                skb_queue_splice_tail_init(&seg_queue, &chan->tx_q);
-
                 if (chan->mode == L2CAP_MODE_ERTM)
-                        err = l2cap_ertm_send(chan);
+                        l2cap_tx(chan, NULL, &seg_queue, L2CAP_EV_DATA_REQUEST);
                 else
-                        l2cap_streaming_send(chan);
+                        l2cap_streaming_send(chan, &seg_queue);
 
-                if (err >= 0)
-                        err = len;
+                err = len;
 
                 /* If the skbs were not queued for sending, they'll still be in
                  * seg_queue and need to be purged.
@@ -2148,6 +2214,296 @@ int l2cap_chan_send(struct l2cap_chan *chan, struct msghdr *msg, size_t len,
         return err;
 }
 
+static void l2cap_send_srej(struct l2cap_chan *chan, u16 txseq)
+{
+        struct l2cap_ctrl control;
+        u16 seq;
+
+        BT_DBG("chan %p, txseq %d", chan, txseq);
+
+        memset(&control, 0, sizeof(control));
+        control.sframe = 1;
+        control.super = L2CAP_SUPER_SREJ;
+
+        for (seq = chan->expected_tx_seq; seq != txseq;
+             seq = __next_seq(chan, seq)) {
+                if (!l2cap_ertm_seq_in_queue(&chan->srej_q, seq)) {
+                        control.reqseq = seq;
+                        l2cap_send_sframe(chan, &control);
+                        l2cap_seq_list_append(&chan->srej_list, seq);
+                }
+        }
+
+        chan->expected_tx_seq = __next_seq(chan, txseq);
+}
+
+static void l2cap_send_srej_tail(struct l2cap_chan *chan)
+{
+        struct l2cap_ctrl control;
+
+        BT_DBG("chan %p", chan);
+
+        if (chan->srej_list.tail == L2CAP_SEQ_LIST_CLEAR)
+                return;
+
+        memset(&control, 0, sizeof(control));
+        control.sframe = 1;
+        control.super = L2CAP_SUPER_SREJ;
+        control.reqseq = chan->srej_list.tail;
+        l2cap_send_sframe(chan, &control);
+}
+
+static void l2cap_send_srej_list(struct l2cap_chan *chan, u16 txseq)
+{
+        struct l2cap_ctrl control;
+        u16 initial_head;
+        u16 seq;
+
+        BT_DBG("chan %p, txseq %d", chan, txseq);
+
+        memset(&control, 0, sizeof(control));
+        control.sframe = 1;
+        control.super = L2CAP_SUPER_SREJ;
+
+        /* Capture initial list head to allow only one pass through the list. */
+        initial_head = chan->srej_list.head;
+
+        do {
+                seq = l2cap_seq_list_pop(&chan->srej_list);
+                if (seq == txseq || seq == L2CAP_SEQ_LIST_CLEAR)
+                        break;
+
+                control.reqseq = seq;
+                l2cap_send_sframe(chan, &control);
+                l2cap_seq_list_append(&chan->srej_list, seq);
+        } while (chan->srej_list.head != initial_head);
+}
+
+static void l2cap_process_reqseq(struct l2cap_chan *chan, u16 reqseq)
+{
+        struct sk_buff *acked_skb;
+        u16 ackseq;
+
+        BT_DBG("chan %p, reqseq %d", chan, reqseq);
+
+        if (chan->unacked_frames == 0 || reqseq == chan->expected_ack_seq)
+                return;
+
+        BT_DBG("expected_ack_seq %d, unacked_frames %d",
+               chan->expected_ack_seq, chan->unacked_frames);
+
+        for (ackseq = chan->expected_ack_seq; ackseq != reqseq;
+             ackseq = __next_seq(chan, ackseq)) {
+
+                acked_skb = l2cap_ertm_seq_in_queue(&chan->tx_q, ackseq);
+                if (acked_skb) {
+                        skb_unlink(acked_skb, &chan->tx_q);
+                        kfree_skb(acked_skb);
+                        chan->unacked_frames--;
+                }
+        }
+
+        chan->expected_ack_seq = reqseq;
+
+        if (chan->unacked_frames == 0)
+                __clear_retrans_timer(chan);
+
+        BT_DBG("unacked_frames %d", (int) chan->unacked_frames);
+}
+
+static void l2cap_abort_rx_srej_sent(struct l2cap_chan *chan)
+{
+        BT_DBG("chan %p", chan);
+
+        chan->expected_tx_seq = chan->buffer_seq;
+        l2cap_seq_list_clear(&chan->srej_list);
+        skb_queue_purge(&chan->srej_q);
+        chan->rx_state = L2CAP_RX_STATE_RECV;
+}
+
+static void l2cap_tx_state_xmit(struct l2cap_chan *chan,
+                                struct l2cap_ctrl *control,
+                                struct sk_buff_head *skbs, u8 event)
+{
+        BT_DBG("chan %p, control %p, skbs %p, event %d", chan, control, skbs,
+               event);
+
+        switch (event) {
+        case L2CAP_EV_DATA_REQUEST:
+                if (chan->tx_send_head == NULL)
+                        chan->tx_send_head = skb_peek(skbs);
+
+                skb_queue_splice_tail_init(skbs, &chan->tx_q);
+                l2cap_ertm_send(chan);
+                break;
+        case L2CAP_EV_LOCAL_BUSY_DETECTED:
+                BT_DBG("Enter LOCAL_BUSY");
+                set_bit(CONN_LOCAL_BUSY, &chan->conn_state);
+
+                if (chan->rx_state == L2CAP_RX_STATE_SREJ_SENT) {
+                        /* The SREJ_SENT state must be aborted if we are to
+                         * enter the LOCAL_BUSY state.
+                         */
+                        l2cap_abort_rx_srej_sent(chan);
+                }
+
+                l2cap_send_ack(chan);
+
+                break;
+        case L2CAP_EV_LOCAL_BUSY_CLEAR:
+                BT_DBG("Exit LOCAL_BUSY");
+                clear_bit(CONN_LOCAL_BUSY, &chan->conn_state);
+
+                if (test_bit(CONN_RNR_SENT, &chan->conn_state)) {
+                        struct l2cap_ctrl local_control;
+
+                        memset(&local_control, 0, sizeof(local_control));
+                        local_control.sframe = 1;
+                        local_control.super = L2CAP_SUPER_RR;
+                        local_control.poll = 1;
+                        local_control.reqseq = chan->buffer_seq;
+                        l2cap_send_sframe(chan, &local_control);
+
+                        chan->retry_count = 1;
+                        __set_monitor_timer(chan);
+                        chan->tx_state = L2CAP_TX_STATE_WAIT_F;
+                }
+                break;
+        case L2CAP_EV_RECV_REQSEQ_AND_FBIT:
+                l2cap_process_reqseq(chan, control->reqseq);
+                break;
+        case L2CAP_EV_EXPLICIT_POLL:
+                l2cap_send_rr_or_rnr(chan, 1);
+                chan->retry_count = 1;
+                __set_monitor_timer(chan);
+                __clear_ack_timer(chan);
+                chan->tx_state = L2CAP_TX_STATE_WAIT_F;
+                break;
+        case L2CAP_EV_RETRANS_TO:
+                l2cap_send_rr_or_rnr(chan, 1);
+                chan->retry_count = 1;
+                __set_monitor_timer(chan);
+                chan->tx_state = L2CAP_TX_STATE_WAIT_F;
+                break;
+        case L2CAP_EV_RECV_FBIT:
+                /* Nothing to process */
+                break;
+        default:
+                break;
+        }
+}
+
+static void l2cap_tx_state_wait_f(struct l2cap_chan *chan,
+                                  struct l2cap_ctrl *control,
+                                  struct sk_buff_head *skbs, u8 event)
+{
+        BT_DBG("chan %p, control %p, skbs %p, event %d", chan, control, skbs,
+               event);
+
+        switch (event) {
+        case L2CAP_EV_DATA_REQUEST:
+                if (chan->tx_send_head == NULL)
+                        chan->tx_send_head = skb_peek(skbs);
+                /* Queue data, but don't send. */
+                skb_queue_splice_tail_init(skbs, &chan->tx_q);
+                break;
+        case L2CAP_EV_LOCAL_BUSY_DETECTED:
+                BT_DBG("Enter LOCAL_BUSY");
+                set_bit(CONN_LOCAL_BUSY, &chan->conn_state);
+
+                if (chan->rx_state == L2CAP_RX_STATE_SREJ_SENT) {
+                        /* The SREJ_SENT state must be aborted if we are to
+                         * enter the LOCAL_BUSY state.
+                         */
+                        l2cap_abort_rx_srej_sent(chan);
+                }
+
+                l2cap_send_ack(chan);
+
+                break;
+        case L2CAP_EV_LOCAL_BUSY_CLEAR:
+                BT_DBG("Exit LOCAL_BUSY");
+                clear_bit(CONN_LOCAL_BUSY, &chan->conn_state);
+
+                if (test_bit(CONN_RNR_SENT, &chan->conn_state)) {
+                        struct l2cap_ctrl local_control;
+                        memset(&local_control, 0, sizeof(local_control));
+                        local_control.sframe = 1;
+                        local_control.super = L2CAP_SUPER_RR;
+                        local_control.poll = 1;
+                        local_control.reqseq = chan->buffer_seq;
+                        l2cap_send_sframe(chan, &local_control);
+
+                        chan->retry_count = 1;
+                        __set_monitor_timer(chan);
+                        chan->tx_state = L2CAP_TX_STATE_WAIT_F;
+                }
+                break;
+        case L2CAP_EV_RECV_REQSEQ_AND_FBIT:
+                l2cap_process_reqseq(chan, control->reqseq);
+
+                /* Fall through */
+
+        case L2CAP_EV_RECV_FBIT:
+                if (control && control->final) {
+                        __clear_monitor_timer(chan);
+                        if (chan->unacked_frames > 0)
+                                __set_retrans_timer(chan);
+                        chan->retry_count = 0;
+                        chan->tx_state = L2CAP_TX_STATE_XMIT;
+                        BT_DBG("recv fbit tx_state 0x2.2%x", chan->tx_state);
+                }
+                break;
+        case L2CAP_EV_EXPLICIT_POLL:
+                /* Ignore */
+                break;
+        case L2CAP_EV_MONITOR_TO:
+                if (chan->max_tx == 0 || chan->retry_count < chan->max_tx) {
+                        l2cap_send_rr_or_rnr(chan, 1);
+                        __set_monitor_timer(chan);
+                        chan->retry_count++;
+                } else {
+                        l2cap_send_disconn_req(chan->conn, chan, ECONNABORTED);
+                }
+                break;
+        default:
+                break;
+        }
+}
+
+static void l2cap_tx(struct l2cap_chan *chan, struct l2cap_ctrl *control,
+                     struct sk_buff_head *skbs, u8 event)
+{
+        BT_DBG("chan %p, control %p, skbs %p, event %d, state %d",
+               chan, control, skbs, event, chan->tx_state);
+
+        switch (chan->tx_state) {
+        case L2CAP_TX_STATE_XMIT:
+                l2cap_tx_state_xmit(chan, control, skbs, event);
+                break;
+        case L2CAP_TX_STATE_WAIT_F:
+                l2cap_tx_state_wait_f(chan, control, skbs, event);
+                break;
+        default:
+                /* Ignore event */
+                break;
+        }
+}
+
+static void l2cap_pass_to_tx(struct l2cap_chan *chan,
+                             struct l2cap_ctrl *control)
+{
+        BT_DBG("chan %p, control %p", chan, control);
+        l2cap_tx(chan, control, NULL, L2CAP_EV_RECV_REQSEQ_AND_FBIT);
+}
+
+static void l2cap_pass_to_tx_fbit(struct l2cap_chan *chan,
+                                  struct l2cap_ctrl *control)
+{
+        BT_DBG("chan %p, control %p", chan, control);
+        l2cap_tx(chan, control, NULL, L2CAP_EV_RECV_FBIT);
+}
+
 /* Copy frame to all raw sockets on that connection */
 static void l2cap_raw_recv(struct l2cap_conn *conn, struct sk_buff *skb)
 {
@@ -2170,7 +2526,7 @@ static void l2cap_raw_recv(struct l2cap_conn *conn, struct sk_buff *skb)
                 if (!nskb)
                         continue;
 
-                if (chan->ops->recv(chan->data, nskb))
+                if (chan->ops->recv(chan, nskb))
                         kfree_skb(nskb);
         }
 
@@ -2200,9 +2556,9 @@ static struct sk_buff *l2cap_build_cmd(struct l2cap_conn *conn,
         lh->len = cpu_to_le16(L2CAP_CMD_HDR_SIZE + dlen);
 
         if (conn->hcon->type == LE_LINK)
-                lh->cid = cpu_to_le16(L2CAP_CID_LE_SIGNALING);
+                lh->cid = __constant_cpu_to_le16(L2CAP_CID_LE_SIGNALING);
         else
-                lh->cid = cpu_to_le16(L2CAP_CID_SIGNALING);
+                lh->cid = __constant_cpu_to_le16(L2CAP_CID_SIGNALING);
 
         cmd = (struct l2cap_cmd_hdr *) skb_put(skb, L2CAP_CMD_HDR_SIZE);
         cmd->code  = code;
@@ -2314,8 +2670,8 @@ static void l2cap_add_opt_efs(void **ptr, struct l2cap_chan *chan)
                 efs.stype       = chan->local_stype;
                 efs.msdu        = cpu_to_le16(chan->local_msdu);
                 efs.sdu_itime   = cpu_to_le32(chan->local_sdu_itime);
-                efs.acc_lat     = cpu_to_le32(L2CAP_DEFAULT_ACC_LAT);
-                efs.flush_to    = cpu_to_le32(L2CAP_DEFAULT_FLUSH_TO);
+                efs.acc_lat     = __constant_cpu_to_le32(L2CAP_DEFAULT_ACC_LAT);
+                efs.flush_to    = __constant_cpu_to_le32(L2CAP_DEFAULT_FLUSH_TO);
                 break;
 
         case L2CAP_MODE_STREAMING:
@@ -2338,20 +2694,24 @@ static void l2cap_add_opt_efs(void **ptr, struct l2cap_chan *chan)
 static void l2cap_ack_timeout(struct work_struct *work)
 {
         struct l2cap_chan *chan = container_of(work, struct l2cap_chan,
-                                                        ack_timer.work);
+                                               ack_timer.work);
+        u16 frames_to_ack;
 
         BT_DBG("chan %p", chan);
 
         l2cap_chan_lock(chan);
 
-        __l2cap_send_ack(chan);
+        frames_to_ack = __seq_offset(chan, chan->buffer_seq,
+                                     chan->last_acked_seq);
 
-        l2cap_chan_unlock(chan);
+        if (frames_to_ack)
+                l2cap_send_rr_or_rnr(chan, 0);
 
+        l2cap_chan_unlock(chan);
         l2cap_chan_put(chan);
 }
 
-static inline int l2cap_ertm_init(struct l2cap_chan *chan)
+int l2cap_ertm_init(struct l2cap_chan *chan)
 {
         int err;
 
@@ -2360,7 +2720,6 @@ static inline int l2cap_ertm_init(struct l2cap_chan *chan)
         chan->expected_ack_seq = 0;
         chan->unacked_frames = 0;
         chan->buffer_seq = 0;
-        chan->num_acked = 0;
         chan->frames_sent = 0;
         chan->last_acked_seq = 0;
         chan->sdu = NULL;
@@ -2381,12 +2740,15 @@ static inline int l2cap_ertm_init(struct l2cap_chan *chan)
 
         skb_queue_head_init(&chan->srej_q);
 
-        INIT_LIST_HEAD(&chan->srej_l);
         err = l2cap_seq_list_init(&chan->srej_list, chan->tx_win);
         if (err < 0)
                 return err;
 
-        return l2cap_seq_list_init(&chan->retrans_list, chan->remote_tx_win);
+        err = l2cap_seq_list_init(&chan->retrans_list, chan->remote_tx_win);
+        if (err < 0)
+                l2cap_seq_list_free(&chan->srej_list);
+
+        return err;
 }
 
 static inline __u8 l2cap_select_mode(__u8 mode, __u16 remote_feat_mask)
@@ -2512,6 +2874,7 @@ done:
                 break;
 
         case L2CAP_MODE_STREAMING:
+                l2cap_txwin_setup(chan);
                 rfc.mode            = L2CAP_MODE_STREAMING;
                 rfc.txwin_size      = 0;
                 rfc.max_transmit    = 0;
@@ -2542,7 +2905,7 @@ done:
         }
 
         req->dcid  = cpu_to_le16(chan->dcid);
-        req->flags = cpu_to_le16(0);
+        req->flags = __constant_cpu_to_le16(0);
 
         return ptr - data;
 }
@@ -2762,7 +3125,7 @@ done:
         }
         rsp->scid   = cpu_to_le16(chan->dcid);
         rsp->result = cpu_to_le16(result);
-        rsp->flags  = cpu_to_le16(0x0000);
+        rsp->flags  = __constant_cpu_to_le16(0);
 
         return ptr - data;
 }
@@ -2861,7 +3224,7 @@ static int l2cap_parse_conf_rsp(struct l2cap_chan *chan, void *rsp, int len, voi
         }
 
         req->dcid   = cpu_to_le16(chan->dcid);
-        req->flags  = cpu_to_le16(0x0000);
+        req->flags  = __constant_cpu_to_le16(0);
 
         return ptr - data;
 }
@@ -2888,8 +3251,8 @@ void __l2cap_connect_rsp_defer(struct l2cap_chan *chan)
 
         rsp.scid   = cpu_to_le16(chan->dcid);
         rsp.dcid   = cpu_to_le16(chan->scid);
-        rsp.result = cpu_to_le16(L2CAP_CR_SUCCESS);
-        rsp.status = cpu_to_le16(L2CAP_CS_NO_INFO);
+        rsp.result = __constant_cpu_to_le16(L2CAP_CR_SUCCESS);
+        rsp.status = __constant_cpu_to_le16(L2CAP_CS_NO_INFO);
         l2cap_send_cmd(conn, chan->ident,
                                 L2CAP_CONN_RSP, sizeof(rsp), &rsp);
 
@@ -2929,8 +3292,8 @@ static void l2cap_conf_rfc_get(struct l2cap_chan *chan, void *rsp, int len)
          * did not send an RFC option.
          */
         rfc.mode = chan->mode;
-        rfc.retrans_timeout = cpu_to_le16(L2CAP_DEFAULT_RETRANS_TO);
-        rfc.monitor_timeout = cpu_to_le16(L2CAP_DEFAULT_MONITOR_TO);
+        rfc.retrans_timeout = __constant_cpu_to_le16(L2CAP_DEFAULT_RETRANS_TO);
+        rfc.monitor_timeout = __constant_cpu_to_le16(L2CAP_DEFAULT_MONITOR_TO);
         rfc.max_pdu_size = cpu_to_le16(chan->imtu);
 
         BT_ERR("Expected RFC option was not found, using defaults");
@@ -2993,7 +3356,7 @@ static inline int l2cap_connect_req(struct l2cap_conn *conn, struct l2cap_cmd_hd
         lock_sock(parent);
 
         /* Check if the ACL is secure enough (if not SDP) */
-        if (psm != cpu_to_le16(0x0001) &&
+        if (psm != __constant_cpu_to_le16(L2CAP_PSM_SDP) &&
                                 !hci_conn_check_link_mode(conn->hcon)) {
                 conn->disc_reason = HCI_ERROR_AUTH_FAILURE;
                 result = L2CAP_CR_SEC_BLOCK;
@@ -3002,25 +3365,16 @@ static inline int l2cap_connect_req(struct l2cap_conn *conn, struct l2cap_cmd_hd
 
         result = L2CAP_CR_NO_MEM;
 
-        /* Check for backlog size */
-        if (sk_acceptq_is_full(parent)) {
-                BT_DBG("backlog full %d", parent->sk_ack_backlog);
+        /* Check if we already have channel with that dcid */
+        if (__l2cap_get_chan_by_dcid(conn, scid))
                 goto response;
-        }
 
-        chan = pchan->ops->new_connection(pchan->data);
+        chan = pchan->ops->new_connection(pchan);
         if (!chan)
                 goto response;
 
         sk = chan->sk;
 
-        /* Check if we already have channel with that dcid */
-        if (__l2cap_get_chan_by_dcid(conn, scid)) {
-                sock_set_flag(sk, SOCK_ZAPPED);
-                chan->ops->close(chan->data);
-                goto response;
-        }
-
         hci_conn_hold(conn->hcon);
 
         bacpy(&bt_sk(sk)->src, conn->src);
@@ -3074,7 +3428,7 @@ sendresp:
 
         if (result == L2CAP_CR_PEND && status == L2CAP_CS_NO_INFO) {
                 struct l2cap_info_req info;
-                info.type = cpu_to_le16(L2CAP_IT_FEAT_MASK);
+                info.type = __constant_cpu_to_le16(L2CAP_IT_FEAT_MASK);
 
                 conn->info_state |= L2CAP_INFO_FEAT_MASK_REQ_SENT;
                 conn->info_ident = l2cap_get_ident(conn);
@@ -3196,7 +3550,7 @@ static inline int l2cap_config_req(struct l2cap_conn *conn, struct l2cap_cmd_hdr
         if (chan->state != BT_CONFIG && chan->state != BT_CONNECT2) {
                 struct l2cap_cmd_rej_cid rej;
 
-                rej.reason = cpu_to_le16(L2CAP_REJ_INVALID_CID);
+                rej.reason = __constant_cpu_to_le16(L2CAP_REJ_INVALID_CID);
                 rej.scid = cpu_to_le16(chan->scid);
                 rej.dcid = cpu_to_le16(chan->dcid);
 
@@ -3218,11 +3572,11 @@ static inline int l2cap_config_req(struct l2cap_conn *conn, struct l2cap_cmd_hdr
         memcpy(chan->conf_req + chan->conf_len, req->data, len);
         chan->conf_len += len;
 
-        if (flags & 0x0001) {
+        if (flags & L2CAP_CONF_FLAG_CONTINUATION) {
                 /* Incomplete config. Send empty response. */
                 l2cap_send_cmd(conn, cmd->ident, L2CAP_CONF_RSP,
                                 l2cap_build_conf_rsp(chan, rsp,
-                                        L2CAP_CONF_SUCCESS, 0x0001), rsp);
+                                        L2CAP_CONF_SUCCESS, flags), rsp);
                 goto unlock;
         }
 
@@ -3245,8 +3599,6 @@ static inline int l2cap_config_req(struct l2cap_conn *conn, struct l2cap_cmd_hdr
         if (test_bit(CONF_INPUT_DONE, &chan->conf_state)) {
                 set_default_fcs(chan);
 
-                l2cap_state_change(chan, BT_CONNECTED);
-
                 if (chan->mode == L2CAP_MODE_ERTM ||
                     chan->mode == L2CAP_MODE_STREAMING)
                         err = l2cap_ertm_init(chan);
@@ -3278,7 +3630,7 @@ static inline int l2cap_config_req(struct l2cap_conn *conn, struct l2cap_cmd_hdr
 
                 l2cap_send_cmd(conn, cmd->ident, L2CAP_CONF_RSP,
                                         l2cap_build_conf_rsp(chan, rsp,
-                                        L2CAP_CONF_SUCCESS, 0x0000), rsp);
+                                        L2CAP_CONF_SUCCESS, flags), rsp);
         }
 
 unlock:
@@ -3369,7 +3721,7 @@ static inline int l2cap_config_rsp(struct l2cap_conn *conn, struct l2cap_cmd_hdr
                 goto done;
         }
 
-        if (flags & 0x01)
+        if (flags & L2CAP_CONF_FLAG_CONTINUATION)
                 goto done;
 
         set_bit(CONF_INPUT_DONE, &chan->conf_state);
@@ -3377,7 +3729,6 @@ static inline int l2cap_config_rsp(struct l2cap_conn *conn, struct l2cap_cmd_hdr
         if (test_bit(CONF_OUTPUT_DONE, &chan->conf_state)) {
                 set_default_fcs(chan);
 
-                l2cap_state_change(chan, BT_CONNECTED);
                 if (chan->mode == L2CAP_MODE_ERTM ||
                     chan->mode == L2CAP_MODE_STREAMING)
                         err = l2cap_ertm_init(chan);
@@ -3431,7 +3782,7 @@ static inline int l2cap_disconnect_req(struct l2cap_conn *conn, struct l2cap_cmd
 
         l2cap_chan_unlock(chan);
 
-        chan->ops->close(chan->data);
+        chan->ops->close(chan);
         l2cap_chan_put(chan);
 
         mutex_unlock(&conn->chan_lock);
@@ -3465,7 +3816,7 @@ static inline int l2cap_disconnect_rsp(struct l2cap_conn *conn, struct l2cap_cmd
 
         l2cap_chan_unlock(chan);
 
-        chan->ops->close(chan->data);
+        chan->ops->close(chan);
         l2cap_chan_put(chan);
 
         mutex_unlock(&conn->chan_lock);
@@ -3486,8 +3837,8 @@ static inline int l2cap_information_req(struct l2cap_conn *conn, struct l2cap_cm
                 u8 buf[8];
                 u32 feat_mask = l2cap_feat_mask;
                 struct l2cap_info_rsp *rsp = (struct l2cap_info_rsp *) buf;
-                rsp->type   = cpu_to_le16(L2CAP_IT_FEAT_MASK);
-                rsp->result = cpu_to_le16(L2CAP_IR_SUCCESS);
+                rsp->type   = __constant_cpu_to_le16(L2CAP_IT_FEAT_MASK);
+                rsp->result = __constant_cpu_to_le16(L2CAP_IR_SUCCESS);
                 if (!disable_ertm)
                         feat_mask |= L2CAP_FEAT_ERTM | L2CAP_FEAT_STREAMING
                                                          | L2CAP_FEAT_FCS;
@@ -3507,15 +3858,15 @@ static inline int l2cap_information_req(struct l2cap_conn *conn, struct l2cap_cm
                 else
                         l2cap_fixed_chan[0] &= ~L2CAP_FC_A2MP;
 
-                rsp->type   = cpu_to_le16(L2CAP_IT_FIXED_CHAN);
-                rsp->result = cpu_to_le16(L2CAP_IR_SUCCESS);
+                rsp->type   = __constant_cpu_to_le16(L2CAP_IT_FIXED_CHAN);
+                rsp->result = __constant_cpu_to_le16(L2CAP_IR_SUCCESS);
                 memcpy(rsp->data, l2cap_fixed_chan, sizeof(l2cap_fixed_chan));
                 l2cap_send_cmd(conn, cmd->ident,
                                         L2CAP_INFO_RSP, sizeof(buf), buf);
         } else {
                 struct l2cap_info_rsp rsp;
                 rsp.type   = cpu_to_le16(type);
-                rsp.result = cpu_to_le16(L2CAP_IR_NOTSUPP);
+                rsp.result = __constant_cpu_to_le16(L2CAP_IR_NOTSUPP);
                 l2cap_send_cmd(conn, cmd->ident,
                                         L2CAP_INFO_RSP, sizeof(rsp), &rsp);
         }
@@ -3555,7 +3906,7 @@ static inline int l2cap_information_rsp(struct l2cap_conn *conn, struct l2cap_cm
 
                 if (conn->feat_mask & L2CAP_FEAT_FIXED_CHAN) {
                         struct l2cap_info_req req;
-                        req.type = cpu_to_le16(L2CAP_IT_FIXED_CHAN);
+                        req.type = __constant_cpu_to_le16(L2CAP_IT_FIXED_CHAN);
 
                         conn->info_ident = l2cap_get_ident(conn);
 
@@ -3790,9 +4141,9 @@ static inline int l2cap_conn_param_update_req(struct l2cap_conn *conn,
 
         err = l2cap_check_conn_param(min, max, latency, to_multiplier);
         if (err)
-                rsp.result = cpu_to_le16(L2CAP_CONN_PARAM_REJECTED);
+                rsp.result = __constant_cpu_to_le16(L2CAP_CONN_PARAM_REJECTED);
         else
-                rsp.result = cpu_to_le16(L2CAP_CONN_PARAM_ACCEPTED);
+                rsp.result = __constant_cpu_to_le16(L2CAP_CONN_PARAM_ACCEPTED);
 
         l2cap_send_cmd(conn, cmd->ident, L2CAP_CONN_PARAM_UPDATE_RSP,
                                                         sizeof(rsp), &rsp);
@@ -3940,7 +4291,7 @@ static inline void l2cap_sig_channel(struct l2cap_conn *conn,
                         BT_ERR("Wrong link type (%d)", err);
 
                         /* FIXME: Map err to a valid reason */
-                        rej.reason = cpu_to_le16(L2CAP_REJ_NOT_UNDERSTOOD);
+                        rej.reason = __constant_cpu_to_le16(L2CAP_REJ_NOT_UNDERSTOOD);
                         l2cap_send_cmd(conn, cmd.ident, L2CAP_COMMAND_REJ, sizeof(rej), &rej);
                 }
 
@@ -3972,65 +4323,38 @@ static int l2cap_check_fcs(struct l2cap_chan *chan,  struct sk_buff *skb)
         return 0;
 }
 
-static inline void l2cap_send_i_or_rr_or_rnr(struct l2cap_chan *chan)
+static void l2cap_send_i_or_rr_or_rnr(struct l2cap_chan *chan)
 {
-        u32 control = 0;
+        struct l2cap_ctrl control;
 
-        chan->frames_sent = 0;
+        BT_DBG("chan %p", chan);
 
-        control |= __set_reqseq(chan, chan->buffer_seq);
+        memset(&control, 0, sizeof(control));
+        control.sframe = 1;
+        control.final = 1;
+        control.reqseq = chan->buffer_seq;
+        set_bit(CONN_SEND_FBIT, &chan->conn_state);
 
         if (test_bit(CONN_LOCAL_BUSY, &chan->conn_state)) {
-                control |= __set_ctrl_super(chan, L2CAP_SUPER_RNR);
-                l2cap_send_sframe(chan, control);
-                set_bit(CONN_RNR_SENT, &chan->conn_state);
+                control.super = L2CAP_SUPER_RNR;
+                l2cap_send_sframe(chan, &control);
         }
 
-        if (test_bit(CONN_REMOTE_BUSY, &chan->conn_state))
-                l2cap_retransmit_frames(chan);
+        if (test_and_clear_bit(CONN_REMOTE_BUSY, &chan->conn_state) &&
+            chan->unacked_frames > 0)
+                __set_retrans_timer(chan);
 
+        /* Send pending iframes */
         l2cap_ertm_send(chan);
 
         if (!test_bit(CONN_LOCAL_BUSY, &chan->conn_state) &&
-                        chan->frames_sent == 0) {
-                control |= __set_ctrl_super(chan, L2CAP_SUPER_RR);
-                l2cap_send_sframe(chan, control);
-        }
-}
-
-static int l2cap_add_to_srej_queue(struct l2cap_chan *chan, struct sk_buff *skb, u16 tx_seq, u8 sar)
-{
-        struct sk_buff *next_skb;
-        int tx_seq_offset, next_tx_seq_offset;
-
-        bt_cb(skb)->control.txseq = tx_seq;
-        bt_cb(skb)->control.sar = sar;
-
-        next_skb = skb_peek(&chan->srej_q);
-
-        tx_seq_offset = __seq_offset(chan, tx_seq, chan->buffer_seq);
-
-        while (next_skb) {
-                if (bt_cb(next_skb)->control.txseq == tx_seq)
-                        return -EINVAL;
-
-                next_tx_seq_offset = __seq_offset(chan,
-                        bt_cb(next_skb)->control.txseq, chan->buffer_seq);
-
-                if (next_tx_seq_offset > tx_seq_offset) {
-                        __skb_queue_before(&chan->srej_q, next_skb, skb);
-                        return 0;
-                }
-
-                if (skb_queue_is_last(&chan->srej_q, next_skb))
-                        next_skb = NULL;
-                else
-                        next_skb = skb_queue_next(&chan->srej_q, next_skb);
+            test_bit(CONN_SEND_FBIT, &chan->conn_state)) {
+                /* F-bit wasn't sent in an s-frame or i-frame yet, so
+                 * send it now.
+                 */
+                control.super = L2CAP_SUPER_RR;
+                l2cap_send_sframe(chan, &control);
         }
-
-        __skb_queue_tail(&chan->srej_q, skb);
-
-        return 0;
 }
 
 static void append_skb_frag(struct sk_buff *skb,
@@ -4052,16 +4376,17 @@ static void append_skb_frag(struct sk_buff *skb,
         skb->truesize += new_frag->truesize;
 }
 
-static int l2cap_reassemble_sdu(struct l2cap_chan *chan, struct sk_buff *skb, u32 control)
+static int l2cap_reassemble_sdu(struct l2cap_chan *chan, struct sk_buff *skb,
+                                struct l2cap_ctrl *control)
 {
         int err = -EINVAL;
 
-        switch (__get_ctrl_sar(chan, control)) {
+        switch (control->sar) {
         case L2CAP_SAR_UNSEGMENTED:
                 if (chan->sdu)
                         break;
 
-                err = chan->ops->recv(chan->data, skb);
+                err = chan->ops->recv(chan, skb);
                 break;
 
         case L2CAP_SAR_START:
@@ -4111,7 +4436,7 @@ static int l2cap_reassemble_sdu(struct l2cap_chan *chan, struct sk_buff *skb, u3
                 if (chan->sdu->len != chan->sdu_len)
                         break;
 
-                err = chan->ops->recv(chan->data, chan->sdu);
+                err = chan->ops->recv(chan, chan->sdu);
 
                 if (!err) {
                         /* Reassembly complete */
@@ -4133,448 +4458,609 @@ static int l2cap_reassemble_sdu(struct l2cap_chan *chan, struct sk_buff *skb, u3
         return err;
 }
 
-static void l2cap_ertm_enter_local_busy(struct l2cap_chan *chan)
+void l2cap_chan_busy(struct l2cap_chan *chan, int busy)
 {
-        BT_DBG("chan %p, Enter local busy", chan);
+        u8 event;
 
-        set_bit(CONN_LOCAL_BUSY, &chan->conn_state);
-        l2cap_seq_list_clear(&chan->srej_list);
+        if (chan->mode != L2CAP_MODE_ERTM)
+                return;
 
-        __set_ack_timer(chan);
+        event = busy ? L2CAP_EV_LOCAL_BUSY_DETECTED : L2CAP_EV_LOCAL_BUSY_CLEAR;
+        l2cap_tx(chan, NULL, NULL, event);
 }
 
-static void l2cap_ertm_exit_local_busy(struct l2cap_chan *chan)
+static int l2cap_rx_queued_iframes(struct l2cap_chan *chan)
 {
-        u32 control;
-
-        if (!test_bit(CONN_RNR_SENT, &chan->conn_state))
-                goto done;
+        int err = 0;
+        /* Pass sequential frames to l2cap_reassemble_sdu()
+         * until a gap is encountered.
+         */
 
-        control = __set_reqseq(chan, chan->buffer_seq);
-        control |= __set_ctrl_poll(chan);
-        control |= __set_ctrl_super(chan, L2CAP_SUPER_RR);
-        l2cap_send_sframe(chan, control);
-        chan->retry_count = 1;
+        BT_DBG("chan %p", chan);
 
-        __clear_retrans_timer(chan);
-        __set_monitor_timer(chan);
+        while (!test_bit(CONN_LOCAL_BUSY, &chan->conn_state)) {
+                struct sk_buff *skb;
+                BT_DBG("Searching for skb with txseq %d (queue len %d)",
+                       chan->buffer_seq, skb_queue_len(&chan->srej_q));
 
-        set_bit(CONN_WAIT_F, &chan->conn_state);
+                skb = l2cap_ertm_seq_in_queue(&chan->srej_q, chan->buffer_seq);
 
-done:
-        clear_bit(CONN_LOCAL_BUSY, &chan->conn_state);
-        clear_bit(CONN_RNR_SENT, &chan->conn_state);
+                if (!skb)
+                        break;
 
-        BT_DBG("chan %p, Exit local busy", chan);
-}
+                skb_unlink(skb, &chan->srej_q);
+                chan->buffer_seq = __next_seq(chan, chan->buffer_seq);
+                err = l2cap_reassemble_sdu(chan, skb, &bt_cb(skb)->control);
+                if (err)
+                        break;
+        }
 
-void l2cap_chan_busy(struct l2cap_chan *chan, int busy)
-{
-        if (chan->mode == L2CAP_MODE_ERTM) {
-                if (busy)
-                        l2cap_ertm_enter_local_busy(chan);
-                else
-                        l2cap_ertm_exit_local_busy(chan);
+        if (skb_queue_empty(&chan->srej_q)) {
+                chan->rx_state = L2CAP_RX_STATE_RECV;
+                l2cap_send_ack(chan);
         }
+
+        return err;
 }
 
-static void l2cap_check_srej_gap(struct l2cap_chan *chan, u16 tx_seq)
+static void l2cap_handle_srej(struct l2cap_chan *chan,
+                              struct l2cap_ctrl *control)
 {
         struct sk_buff *skb;
-        u32 control;
 
-        while ((skb = skb_peek(&chan->srej_q)) &&
-                        !test_bit(CONN_LOCAL_BUSY, &chan->conn_state)) {
-                int err;
+        BT_DBG("chan %p, control %p", chan, control);
 
-                if (bt_cb(skb)->control.txseq != tx_seq)
-                        break;
+        if (control->reqseq == chan->next_tx_seq) {
+                BT_DBG("Invalid reqseq %d, disconnecting", control->reqseq);
+                l2cap_send_disconn_req(chan->conn, chan, ECONNRESET);
+                return;
+        }
 
-                skb = skb_dequeue(&chan->srej_q);
-                control = __set_ctrl_sar(chan, bt_cb(skb)->control.sar);
-                err = l2cap_reassemble_sdu(chan, skb, control);
+        skb = l2cap_ertm_seq_in_queue(&chan->tx_q, control->reqseq);
 
-                if (err < 0) {
-                        l2cap_send_disconn_req(chan->conn, chan, ECONNRESET);
-                        break;
-                }
+        if (skb == NULL) {
+                BT_DBG("Seq %d not available for retransmission",
+                       control->reqseq);
+                return;
+        }
 
-                chan->buffer_seq_srej = __next_seq(chan, chan->buffer_seq_srej);
-                tx_seq = __next_seq(chan, tx_seq);
+        if (chan->max_tx != 0 && bt_cb(skb)->control.retries >= chan->max_tx) {
+                BT_DBG("Retry limit exceeded (%d)", chan->max_tx);
+                l2cap_send_disconn_req(chan->conn, chan, ECONNRESET);
+                return;
         }
-}
 
-static void l2cap_resend_srejframe(struct l2cap_chan *chan, u16 tx_seq)
-{
-        struct srej_list *l, *tmp;
-        u32 control;
+        clear_bit(CONN_REMOTE_BUSY, &chan->conn_state);
 
-        list_for_each_entry_safe(l, tmp, &chan->srej_l, list) {
-                if (l->tx_seq == tx_seq) {
-                        list_del(&l->list);
-                        kfree(l);
-                        return;
+        if (control->poll) {
+                l2cap_pass_to_tx(chan, control);
+
+                set_bit(CONN_SEND_FBIT, &chan->conn_state);
+                l2cap_retransmit(chan, control);
+                l2cap_ertm_send(chan);
+
+                if (chan->tx_state == L2CAP_TX_STATE_WAIT_F) {
+                        set_bit(CONN_SREJ_ACT, &chan->conn_state);
+                        chan->srej_save_reqseq = control->reqseq;
+                }
+        } else {
+                l2cap_pass_to_tx_fbit(chan, control);
+
+                if (control->final) {
+                        if (chan->srej_save_reqseq != control->reqseq ||
+                            !test_and_clear_bit(CONN_SREJ_ACT,
+                                                &chan->conn_state))
+                                l2cap_retransmit(chan, control);
+                } else {
+                        l2cap_retransmit(chan, control);
+                        if (chan->tx_state == L2CAP_TX_STATE_WAIT_F) {
+                                set_bit(CONN_SREJ_ACT, &chan->conn_state);
+                                chan->srej_save_reqseq = control->reqseq;
+                        }
                 }
-                control = __set_ctrl_super(chan, L2CAP_SUPER_SREJ);
-                control |= __set_reqseq(chan, l->tx_seq);
-                l2cap_send_sframe(chan, control);
-                list_del(&l->list);
-                list_add_tail(&l->list, &chan->srej_l);
         }
 }
 
-static int l2cap_send_srejframe(struct l2cap_chan *chan, u16 tx_seq)
+static void l2cap_handle_rej(struct l2cap_chan *chan,
+                             struct l2cap_ctrl *control)
 {
-        struct srej_list *new;
-        u32 control;
-
-        while (tx_seq != chan->expected_tx_seq) {
-                control = __set_ctrl_super(chan, L2CAP_SUPER_SREJ);
-                control |= __set_reqseq(chan, chan->expected_tx_seq);
-                l2cap_seq_list_append(&chan->srej_list, chan->expected_tx_seq);
-                l2cap_send_sframe(chan, control);
+        struct sk_buff *skb;
 
-                new = kzalloc(sizeof(struct srej_list), GFP_ATOMIC);
-                if (!new)
-                        return -ENOMEM;
+        BT_DBG("chan %p, control %p", chan, control);
 
-                new->tx_seq = chan->expected_tx_seq;
+        if (control->reqseq == chan->next_tx_seq) {
+                BT_DBG("Invalid reqseq %d, disconnecting", control->reqseq);
+                l2cap_send_disconn_req(chan->conn, chan, ECONNRESET);
+                return;
+        }
 
-                chan->expected_tx_seq = __next_seq(chan, chan->expected_tx_seq);
+        skb = l2cap_ertm_seq_in_queue(&chan->tx_q, control->reqseq);
 
-                list_add_tail(&new->list, &chan->srej_l);
+        if (chan->max_tx && skb &&
+            bt_cb(skb)->control.retries >= chan->max_tx) {
+                BT_DBG("Retry limit exceeded (%d)", chan->max_tx);
+                l2cap_send_disconn_req(chan->conn, chan, ECONNRESET);
+                return;
         }
 
-        chan->expected_tx_seq = __next_seq(chan, chan->expected_tx_seq);
+        clear_bit(CONN_REMOTE_BUSY, &chan->conn_state);
 
-        return 0;
+        l2cap_pass_to_tx(chan, control);
+
+        if (control->final) {
+                if (!test_and_clear_bit(CONN_REJ_ACT, &chan->conn_state))
+                        l2cap_retransmit_all(chan, control);
+        } else {
+                l2cap_retransmit_all(chan, control);
+                l2cap_ertm_send(chan);
+                if (chan->tx_state == L2CAP_TX_STATE_WAIT_F)
+                        set_bit(CONN_REJ_ACT, &chan->conn_state);
+        }
 }
 
-static inline int l2cap_data_channel_iframe(struct l2cap_chan *chan, u32 rx_control, struct sk_buff *skb)
+static u8 l2cap_classify_txseq(struct l2cap_chan *chan, u16 txseq)
 {
-        u16 tx_seq = __get_txseq(chan, rx_control);
-        u16 req_seq = __get_reqseq(chan, rx_control);
-        u8 sar = __get_ctrl_sar(chan, rx_control);
-        int tx_seq_offset, expected_tx_seq_offset;
-        int num_to_ack = (chan->tx_win/6) + 1;
-        int err = 0;
+        BT_DBG("chan %p, txseq %d", chan, txseq);
 
-        BT_DBG("chan %p len %d tx_seq %d rx_control 0x%8.8x", chan, skb->len,
-                                                        tx_seq, rx_control);
+        BT_DBG("last_acked_seq %d, expected_tx_seq %d", chan->last_acked_seq,
+               chan->expected_tx_seq);
 
-        if (__is_ctrl_final(chan, rx_control) &&
-                        test_bit(CONN_WAIT_F, &chan->conn_state)) {
-                __clear_monitor_timer(chan);
-                if (chan->unacked_frames > 0)
-                        __set_retrans_timer(chan);
-                clear_bit(CONN_WAIT_F, &chan->conn_state);
-        }
+        if (chan->rx_state == L2CAP_RX_STATE_SREJ_SENT) {
+                if (__seq_offset(chan, txseq, chan->last_acked_seq) >=
+                                                                chan->tx_win) {
+                        /* See notes below regarding "double poll" and
+                         * invalid packets.
+                         */
+                        if (chan->tx_win <= ((chan->tx_win_max + 1) >> 1)) {
+                                BT_DBG("Invalid/Ignore - after SREJ");
+                                return L2CAP_TXSEQ_INVALID_IGNORE;
+                        } else {
+                                BT_DBG("Invalid - in window after SREJ sent");
+                                return L2CAP_TXSEQ_INVALID;
+                        }
+                }
 
-        chan->expected_ack_seq = req_seq;
-        l2cap_drop_acked_frames(chan);
+                if (chan->srej_list.head == txseq) {
+                        BT_DBG("Expected SREJ");
+                        return L2CAP_TXSEQ_EXPECTED_SREJ;
+                }
 
-        tx_seq_offset = __seq_offset(chan, tx_seq, chan->buffer_seq);
+                if (l2cap_ertm_seq_in_queue(&chan->srej_q, txseq)) {
+                        BT_DBG("Duplicate SREJ - txseq already stored");
+                        return L2CAP_TXSEQ_DUPLICATE_SREJ;
+                }
 
-        /* invalid tx_seq */
-        if (tx_seq_offset >= chan->tx_win) {
-                l2cap_send_disconn_req(chan->conn, chan, ECONNRESET);
-                goto drop;
+                if (l2cap_seq_list_contains(&chan->srej_list, txseq)) {
+                        BT_DBG("Unexpected SREJ - not requested");
+                        return L2CAP_TXSEQ_UNEXPECTED_SREJ;
+                }
         }
 
-        if (test_bit(CONN_LOCAL_BUSY, &chan->conn_state)) {
-                if (!test_bit(CONN_RNR_SENT, &chan->conn_state))
-                        l2cap_send_ack(chan);
-                goto drop;
+        if (chan->expected_tx_seq == txseq) {
+                if (__seq_offset(chan, txseq, chan->last_acked_seq) >=
+                    chan->tx_win) {
+                        BT_DBG("Invalid - txseq outside tx window");
+                        return L2CAP_TXSEQ_INVALID;
+                } else {
+                        BT_DBG("Expected");
+                        return L2CAP_TXSEQ_EXPECTED;
+                }
         }
 
-        if (tx_seq == chan->expected_tx_seq)
-                goto expected;
+        if (__seq_offset(chan, txseq, chan->last_acked_seq) <
+                __seq_offset(chan, chan->expected_tx_seq,
+                             chan->last_acked_seq)){
+                BT_DBG("Duplicate - expected_tx_seq later than txseq");
+                return L2CAP_TXSEQ_DUPLICATE;
+        }
+
+        if (__seq_offset(chan, txseq, chan->last_acked_seq) >= chan->tx_win) {
+                /* A source of invalid packets is a "double poll" condition,
+                 * where delays cause us to send multiple poll packets.  If
+                 * the remote stack receives and processes both polls,
+                 * sequence numbers can wrap around in such a way that a
+                 * resent frame has a sequence number that looks like new data
+                 * with a sequence gap.  This would trigger an erroneous SREJ
+                 * request.
+                 *
+                 * Fortunately, this is impossible with a tx window that's
+                 * less than half of the maximum sequence number, which allows
+                 * invalid frames to be safely ignored.
+                 *
+                 * With tx window sizes greater than half of the tx window
+                 * maximum, the frame is invalid and cannot be ignored.  This
+                 * causes a disconnect.
+                 */
 
-        if (test_bit(CONN_SREJ_SENT, &chan->conn_state)) {
-                struct srej_list *first;
+                if (chan->tx_win <= ((chan->tx_win_max + 1) >> 1)) {
+                        BT_DBG("Invalid/Ignore - txseq outside tx window");
+                        return L2CAP_TXSEQ_INVALID_IGNORE;
+                } else {
+                        BT_DBG("Invalid - txseq outside tx window");
+                        return L2CAP_TXSEQ_INVALID;
+                }
+        } else {
+                BT_DBG("Unexpected - txseq indicates missing frames");
+                return L2CAP_TXSEQ_UNEXPECTED;
+        }
+}
+
+static int l2cap_rx_state_recv(struct l2cap_chan *chan,
+                               struct l2cap_ctrl *control,
+                               struct sk_buff *skb, u8 event)
+{
+        int err = 0;
+        bool skb_in_use = 0;
 
-                first = list_first_entry(&chan->srej_l,
-                                struct srej_list, list);
-                if (tx_seq == first->tx_seq) {
-                        l2cap_add_to_srej_queue(chan, skb, tx_seq, sar);
-                        l2cap_check_srej_gap(chan, tx_seq);
+        BT_DBG("chan %p, control %p, skb %p, event %d", chan, control, skb,
+               event);
 
-                        list_del(&first->list);
-                        kfree(first);
+        switch (event) {
+        case L2CAP_EV_RECV_IFRAME:
+                switch (l2cap_classify_txseq(chan, control->txseq)) {
+                case L2CAP_TXSEQ_EXPECTED:
+                        l2cap_pass_to_tx(chan, control);
 
-                        if (list_empty(&chan->srej_l)) {
-                                chan->buffer_seq = chan->buffer_seq_srej;
-                                clear_bit(CONN_SREJ_SENT, &chan->conn_state);
-                                l2cap_send_ack(chan);
-                                BT_DBG("chan %p, Exit SREJ_SENT", chan);
+                        if (test_bit(CONN_LOCAL_BUSY, &chan->conn_state)) {
+                                BT_DBG("Busy, discarding expected seq %d",
+                                       control->txseq);
+                                break;
                         }
-                } else {
-                        struct srej_list *l;
 
-                        /* duplicated tx_seq */
-                        if (l2cap_add_to_srej_queue(chan, skb, tx_seq, sar) < 0)
-                                goto drop;
+                        chan->expected_tx_seq = __next_seq(chan,
+                                                           control->txseq);
+
+                        chan->buffer_seq = chan->expected_tx_seq;
+                        skb_in_use = 1;
+
+                        err = l2cap_reassemble_sdu(chan, skb, control);
+                        if (err)
+                                break;
 
-                        list_for_each_entry(l, &chan->srej_l, list) {
-                                if (l->tx_seq == tx_seq) {
-                                        l2cap_resend_srejframe(chan, tx_seq);
-                                        return 0;
+                        if (control->final) {
+                                if (!test_and_clear_bit(CONN_REJ_ACT,
+                                                        &chan->conn_state)) {
+                                        control->final = 0;
+                                        l2cap_retransmit_all(chan, control);
+                                        l2cap_ertm_send(chan);
                                 }
                         }
 
-                        err = l2cap_send_srejframe(chan, tx_seq);
-                        if (err < 0) {
-                                l2cap_send_disconn_req(chan->conn, chan, -err);
-                                return err;
+                        if (!test_bit(CONN_LOCAL_BUSY, &chan->conn_state))
+                                l2cap_send_ack(chan);
+                        break;
+                case L2CAP_TXSEQ_UNEXPECTED:
+                        l2cap_pass_to_tx(chan, control);
+
+                        /* Can't issue SREJ frames in the local busy state.
+                         * Drop this frame, it will be seen as missing
+                         * when local busy is exited.
+                         */
+                        if (test_bit(CONN_LOCAL_BUSY, &chan->conn_state)) {
+                                BT_DBG("Busy, discarding unexpected seq %d",
+                                       control->txseq);
+                                break;
                         }
-                }
-        } else {
-                expected_tx_seq_offset = __seq_offset(chan,
-                                chan->expected_tx_seq, chan->buffer_seq);
 
-                /* duplicated tx_seq */
-                if (tx_seq_offset < expected_tx_seq_offset)
-                        goto drop;
+                        /* There was a gap in the sequence, so an SREJ
+                         * must be sent for each missing frame.  The
+                         * current frame is stored for later use.
+                         */
+                        skb_queue_tail(&chan->srej_q, skb);
+                        skb_in_use = 1;
+                        BT_DBG("Queued %p (queue len %d)", skb,
+                               skb_queue_len(&chan->srej_q));
 
-                set_bit(CONN_SREJ_SENT, &chan->conn_state);
-
-                BT_DBG("chan %p, Enter SREJ", chan);
+                        clear_bit(CONN_SREJ_ACT, &chan->conn_state);
+                        l2cap_seq_list_clear(&chan->srej_list);
+                        l2cap_send_srej(chan, control->txseq);
 
-                INIT_LIST_HEAD(&chan->srej_l);
-                chan->buffer_seq_srej = chan->buffer_seq;
+                        chan->rx_state = L2CAP_RX_STATE_SREJ_SENT;
+                        break;
+                case L2CAP_TXSEQ_DUPLICATE:
+                        l2cap_pass_to_tx(chan, control);
+                        break;
+                case L2CAP_TXSEQ_INVALID_IGNORE:
+                        break;
+                case L2CAP_TXSEQ_INVALID:
+                default:
+                        l2cap_send_disconn_req(chan->conn, chan,
+                                               ECONNRESET);
+                        break;
+                }
+                break;
+        case L2CAP_EV_RECV_RR:
+                l2cap_pass_to_tx(chan, control);
+                if (control->final) {
+                        clear_bit(CONN_REMOTE_BUSY, &chan->conn_state);
 
-                __skb_queue_head_init(&chan->srej_q);
-                l2cap_add_to_srej_queue(chan, skb, tx_seq, sar);
+                        if (!test_and_clear_bit(CONN_REJ_ACT,
+                                                &chan->conn_state)) {
+                                control->final = 0;
+                                l2cap_retransmit_all(chan, control);
+                        }
 
-                /* Set P-bit only if there are some I-frames to ack. */
-                if (__clear_ack_timer(chan))
-                        set_bit(CONN_SEND_PBIT, &chan->conn_state);
+                        l2cap_ertm_send(chan);
+                } else if (control->poll) {
+                        l2cap_send_i_or_rr_or_rnr(chan);
+                } else {
+                        if (test_and_clear_bit(CONN_REMOTE_BUSY,
+                                               &chan->conn_state) &&
+                            chan->unacked_frames)
+                                __set_retrans_timer(chan);
 
-                err = l2cap_send_srejframe(chan, tx_seq);
-                if (err < 0) {
-                        l2cap_send_disconn_req(chan->conn, chan, -err);
-                        return err;
+                        l2cap_ertm_send(chan);
                 }
+                break;
+        case L2CAP_EV_RECV_RNR:
+                set_bit(CONN_REMOTE_BUSY, &chan->conn_state);
+                l2cap_pass_to_tx(chan, control);
+                if (control && control->poll) {
+                        set_bit(CONN_SEND_FBIT, &chan->conn_state);
+                        l2cap_send_rr_or_rnr(chan, 0);
+                }
+                __clear_retrans_timer(chan);
+                l2cap_seq_list_clear(&chan->retrans_list);
+                break;
+        case L2CAP_EV_RECV_REJ:
+                l2cap_handle_rej(chan, control);
+                break;
+        case L2CAP_EV_RECV_SREJ:
+                l2cap_handle_srej(chan, control);
+                break;
+        default:
+                break;
         }
-        return 0;
-
-expected:
-        chan->expected_tx_seq = __next_seq(chan, chan->expected_tx_seq);
-
-        if (test_bit(CONN_SREJ_SENT, &chan->conn_state)) {
-                bt_cb(skb)->control.txseq = tx_seq;
-                bt_cb(skb)->control.sar = sar;
-                __skb_queue_tail(&chan->srej_q, skb);
-                return 0;
-        }
-
-        err = l2cap_reassemble_sdu(chan, skb, rx_control);
-        chan->buffer_seq = __next_seq(chan, chan->buffer_seq);
 
-        if (err < 0) {
-                l2cap_send_disconn_req(chan->conn, chan, ECONNRESET);
-                return err;
+        if (skb && !skb_in_use) {
+                BT_DBG("Freeing %p", skb);
+                kfree_skb(skb);
         }
 
-        if (__is_ctrl_final(chan, rx_control)) {
-                if (!test_and_clear_bit(CONN_REJ_ACT, &chan->conn_state))
-                        l2cap_retransmit_frames(chan);
-        }
+        return err;
+}
 
+static int l2cap_rx_state_srej_sent(struct l2cap_chan *chan,
+                                    struct l2cap_ctrl *control,
+                                    struct sk_buff *skb, u8 event)
+{
+        int err = 0;
+        u16 txseq = control->txseq;
+        bool skb_in_use = 0;
+
+        BT_DBG("chan %p, control %p, skb %p, event %d", chan, control, skb,
+               event);
+
+        switch (event) {
+        case L2CAP_EV_RECV_IFRAME:
+                switch (l2cap_classify_txseq(chan, txseq)) {
+                case L2CAP_TXSEQ_EXPECTED:
+                        /* Keep frame for reassembly later */
+                        l2cap_pass_to_tx(chan, control);
+                        skb_queue_tail(&chan->srej_q, skb);
+                        skb_in_use = 1;
+                        BT_DBG("Queued %p (queue len %d)", skb,
+                               skb_queue_len(&chan->srej_q));
+
+                        chan->expected_tx_seq = __next_seq(chan, txseq);
+                        break;
+                case L2CAP_TXSEQ_EXPECTED_SREJ:
+                        l2cap_seq_list_pop(&chan->srej_list);
 
-        chan->num_acked = (chan->num_acked + 1) % num_to_ack;
-        if (chan->num_acked == num_to_ack - 1)
-                l2cap_send_ack(chan);
-        else
-                __set_ack_timer(chan);
+                        l2cap_pass_to_tx(chan, control);
+                        skb_queue_tail(&chan->srej_q, skb);
+                        skb_in_use = 1;
+                        BT_DBG("Queued %p (queue len %d)", skb,
+                               skb_queue_len(&chan->srej_q));
 
-        return 0;
+                        err = l2cap_rx_queued_iframes(chan);
+                        if (err)
+                                break;
 
-drop:
-        kfree_skb(skb);
-        return 0;
-}
+                        break;
+                case L2CAP_TXSEQ_UNEXPECTED:
+                        /* Got a frame that can't be reassembled yet.
+                         * Save it for later, and send SREJs to cover
+                         * the missing frames.
+                         */
+                        skb_queue_tail(&chan->srej_q, skb);
+                        skb_in_use = 1;
+                        BT_DBG("Queued %p (queue len %d)", skb,
+                               skb_queue_len(&chan->srej_q));
+
+                        l2cap_pass_to_tx(chan, control);
+                        l2cap_send_srej(chan, control->txseq);
+                        break;
+                case L2CAP_TXSEQ_UNEXPECTED_SREJ:
+                        /* This frame was requested with an SREJ, but
+                         * some expected retransmitted frames are
+                         * missing.  Request retransmission of missing
+                         * SREJ'd frames.
+                         */
+                        skb_queue_tail(&chan->srej_q, skb);
+                        skb_in_use = 1;
+                        BT_DBG("Queued %p (queue len %d)", skb,
+                               skb_queue_len(&chan->srej_q));
+
+                        l2cap_pass_to_tx(chan, control);
+                        l2cap_send_srej_list(chan, control->txseq);
+                        break;
+                case L2CAP_TXSEQ_DUPLICATE_SREJ:
+                        /* We've already queued this frame.  Drop this copy. */
+                        l2cap_pass_to_tx(chan, control);
+                        break;
+                case L2CAP_TXSEQ_DUPLICATE:
+                        /* Expecting a later sequence number, so this frame
+                         * was already received.  Ignore it completely.
+                         */
+                        break;
+                case L2CAP_TXSEQ_INVALID_IGNORE:
+                        break;
+                case L2CAP_TXSEQ_INVALID:
+                default:
+                        l2cap_send_disconn_req(chan->conn, chan,
+                                               ECONNRESET);
+                        break;
+                }
+                break;
+        case L2CAP_EV_RECV_RR:
+                l2cap_pass_to_tx(chan, control);
+                if (control->final) {
+                        clear_bit(CONN_REMOTE_BUSY, &chan->conn_state);
 
-static inline void l2cap_data_channel_rrframe(struct l2cap_chan *chan, u32 rx_control)
-{
-        BT_DBG("chan %p, req_seq %d ctrl 0x%8.8x", chan,
-                                __get_reqseq(chan, rx_control), rx_control);
+                        if (!test_and_clear_bit(CONN_REJ_ACT,
+                                                &chan->conn_state)) {
+                                control->final = 0;
+                                l2cap_retransmit_all(chan, control);
+                        }
 
-        chan->expected_ack_seq = __get_reqseq(chan, rx_control);
-        l2cap_drop_acked_frames(chan);
+                        l2cap_ertm_send(chan);
+                } else if (control->poll) {
+                        if (test_and_clear_bit(CONN_REMOTE_BUSY,
+                                               &chan->conn_state) &&
+                            chan->unacked_frames) {
+                                __set_retrans_timer(chan);
+                        }
 
-        if (__is_ctrl_poll(chan, rx_control)) {
-                set_bit(CONN_SEND_FBIT, &chan->conn_state);
-                if (test_bit(CONN_SREJ_SENT, &chan->conn_state)) {
-                        if (test_bit(CONN_REMOTE_BUSY, &chan->conn_state) &&
-                                        (chan->unacked_frames > 0))
+                        set_bit(CONN_SEND_FBIT, &chan->conn_state);
+                        l2cap_send_srej_tail(chan);
+                } else {
+                        if (test_and_clear_bit(CONN_REMOTE_BUSY,
+                                               &chan->conn_state) &&
+                            chan->unacked_frames)
                                 __set_retrans_timer(chan);
 
-                        clear_bit(CONN_REMOTE_BUSY, &chan->conn_state);
-                        l2cap_send_srejtail(chan);
+                        l2cap_send_ack(chan);
+                }
+                break;
+        case L2CAP_EV_RECV_RNR:
+                set_bit(CONN_REMOTE_BUSY, &chan->conn_state);
+                l2cap_pass_to_tx(chan, control);
+                if (control->poll) {
+                        l2cap_send_srej_tail(chan);
                 } else {
-                        l2cap_send_i_or_rr_or_rnr(chan);
+                        struct l2cap_ctrl rr_control;
+                        memset(&rr_control, 0, sizeof(rr_control));
+                        rr_control.sframe = 1;
+                        rr_control.super = L2CAP_SUPER_RR;
+                        rr_control.reqseq = chan->buffer_seq;
+                        l2cap_send_sframe(chan, &rr_control);
                 }
 
-        } else if (__is_ctrl_final(chan, rx_control)) {
-                clear_bit(CONN_REMOTE_BUSY, &chan->conn_state);
-
-                if (!test_and_clear_bit(CONN_REJ_ACT, &chan->conn_state))
-                        l2cap_retransmit_frames(chan);
-
-        } else {
-                if (test_bit(CONN_REMOTE_BUSY, &chan->conn_state) &&
-                                (chan->unacked_frames > 0))
-                        __set_retrans_timer(chan);
+                break;
+        case L2CAP_EV_RECV_REJ:
+                l2cap_handle_rej(chan, control);
+                break;
+        case L2CAP_EV_RECV_SREJ:
+                l2cap_handle_srej(chan, control);
+                break;
+        }
 
-                clear_bit(CONN_REMOTE_BUSY, &chan->conn_state);
-                if (test_bit(CONN_SREJ_SENT, &chan->conn_state))
-                        l2cap_send_ack(chan);
-                else
-                        l2cap_ertm_send(chan);
+        if (skb && !skb_in_use) {
+                BT_DBG("Freeing %p", skb);
+                kfree_skb(skb);
         }
+
+        return err;
 }
 
-static inline void l2cap_data_channel_rejframe(struct l2cap_chan *chan, u32 rx_control)
+static bool __valid_reqseq(struct l2cap_chan *chan, u16 reqseq)
 {
-        u16 tx_seq = __get_reqseq(chan, rx_control);
-
-        BT_DBG("chan %p, req_seq %d ctrl 0x%8.8x", chan, tx_seq, rx_control);
-
-        clear_bit(CONN_REMOTE_BUSY, &chan->conn_state);
-
-        chan->expected_ack_seq = tx_seq;
-        l2cap_drop_acked_frames(chan);
-
-        if (__is_ctrl_final(chan, rx_control)) {
-                if (!test_and_clear_bit(CONN_REJ_ACT, &chan->conn_state))
-                        l2cap_retransmit_frames(chan);
-        } else {
-                l2cap_retransmit_frames(chan);
+        /* Make sure reqseq is for a packet that has been sent but not acked */
+        u16 unacked;
 
-                if (test_bit(CONN_WAIT_F, &chan->conn_state))
-                        set_bit(CONN_REJ_ACT, &chan->conn_state);
-        }
+        unacked = __seq_offset(chan, chan->next_tx_seq, chan->expected_ack_seq);
+        return __seq_offset(chan, chan->next_tx_seq, reqseq) <= unacked;
 }
-static inline void l2cap_data_channel_srejframe(struct l2cap_chan *chan, u32 rx_control)
-{
-        u16 tx_seq = __get_reqseq(chan, rx_control);
-
-        BT_DBG("chan %p, req_seq %d ctrl 0x%8.8x", chan, tx_seq, rx_control);
-
-        clear_bit(CONN_REMOTE_BUSY, &chan->conn_state);
 
-        if (__is_ctrl_poll(chan, rx_control)) {
-                chan->expected_ack_seq = tx_seq;
-                l2cap_drop_acked_frames(chan);
-
-                set_bit(CONN_SEND_FBIT, &chan->conn_state);
-                l2cap_retransmit_one_frame(chan, tx_seq);
+static int l2cap_rx(struct l2cap_chan *chan, struct l2cap_ctrl *control,
+                    struct sk_buff *skb, u8 event)
+{
+        int err = 0;
 
-                l2cap_ertm_send(chan);
+        BT_DBG("chan %p, control %p, skb %p, event %d, state %d", chan,
+               control, skb, event, chan->rx_state);
 
-                if (test_bit(CONN_WAIT_F, &chan->conn_state)) {
-                        chan->srej_save_reqseq = tx_seq;
-                        set_bit(CONN_SREJ_ACT, &chan->conn_state);
+        if (__valid_reqseq(chan, control->reqseq)) {
+                switch (chan->rx_state) {
+                case L2CAP_RX_STATE_RECV:
+                        err = l2cap_rx_state_recv(chan, control, skb, event);
+                        break;
+                case L2CAP_RX_STATE_SREJ_SENT:
+                        err = l2cap_rx_state_srej_sent(chan, control, skb,
+                                                       event);
+                        break;
+                default:
+                        /* shut it down */
+                        break;
                 }
-        } else if (__is_ctrl_final(chan, rx_control)) {
-                if (test_bit(CONN_SREJ_ACT, &chan->conn_state) &&
-                                chan->srej_save_reqseq == tx_seq)
-                        clear_bit(CONN_SREJ_ACT, &chan->conn_state);
-                else
-                        l2cap_retransmit_one_frame(chan, tx_seq);
         } else {
-                l2cap_retransmit_one_frame(chan, tx_seq);
-                if (test_bit(CONN_WAIT_F, &chan->conn_state)) {
-                        chan->srej_save_reqseq = tx_seq;
-                        set_bit(CONN_SREJ_ACT, &chan->conn_state);
-                }
+                BT_DBG("Invalid reqseq %d (next_tx_seq %d, expected_ack_seq %d",
+                       control->reqseq, chan->next_tx_seq,
+                       chan->expected_ack_seq);
+                l2cap_send_disconn_req(chan->conn, chan, ECONNRESET);
         }
+
+        return err;
 }
 
-static inline void l2cap_data_channel_rnrframe(struct l2cap_chan *chan, u32 rx_control)
+static int l2cap_stream_rx(struct l2cap_chan *chan, struct l2cap_ctrl *control,
+                           struct sk_buff *skb)
 {
-        u16 tx_seq = __get_reqseq(chan, rx_control);
+        int err = 0;
 
-        BT_DBG("chan %p, req_seq %d ctrl 0x%8.8x", chan, tx_seq, rx_control);
+        BT_DBG("chan %p, control %p, skb %p, state %d", chan, control, skb,
+               chan->rx_state);
 
-        set_bit(CONN_REMOTE_BUSY, &chan->conn_state);
-        chan->expected_ack_seq = tx_seq;
-        l2cap_drop_acked_frames(chan);
+        if (l2cap_classify_txseq(chan, control->txseq) ==
+            L2CAP_TXSEQ_EXPECTED) {
+                l2cap_pass_to_tx(chan, control);
 
-        if (__is_ctrl_poll(chan, rx_control))
-                set_bit(CONN_SEND_FBIT, &chan->conn_state);
+                BT_DBG("buffer_seq %d->%d", chan->buffer_seq,
+                       __next_seq(chan, chan->buffer_seq));
 
-        if (!test_bit(CONN_SREJ_SENT, &chan->conn_state)) {
-                __clear_retrans_timer(chan);
-                if (__is_ctrl_poll(chan, rx_control))
-                        l2cap_send_rr_or_rnr(chan, L2CAP_CTRL_FINAL);
-                return;
-        }
+                chan->buffer_seq = __next_seq(chan, chan->buffer_seq);
 
-        if (__is_ctrl_poll(chan, rx_control)) {
-                l2cap_send_srejtail(chan);
+                l2cap_reassemble_sdu(chan, skb, control);
         } else {
-                rx_control = __set_ctrl_super(chan, L2CAP_SUPER_RR);
-                l2cap_send_sframe(chan, rx_control);
-        }
-}
-
-static inline int l2cap_data_channel_sframe(struct l2cap_chan *chan, u32 rx_control, struct sk_buff *skb)
-{
-        BT_DBG("chan %p rx_control 0x%8.8x len %d", chan, rx_control, skb->len);
+                if (chan->sdu) {
+                        kfree_skb(chan->sdu);
+                        chan->sdu = NULL;
+                }
+                chan->sdu_last_frag = NULL;
+                chan->sdu_len = 0;
 
-        if (__is_ctrl_final(chan, rx_control) &&
-                        test_bit(CONN_WAIT_F, &chan->conn_state)) {
-                __clear_monitor_timer(chan);
-                if (chan->unacked_frames > 0)
-                        __set_retrans_timer(chan);
-                clear_bit(CONN_WAIT_F, &chan->conn_state);
+                if (skb) {
+                        BT_DBG("Freeing %p", skb);
+                        kfree_skb(skb);
+                }
         }
 
-        switch (__get_ctrl_super(chan, rx_control)) {
-        case L2CAP_SUPER_RR:
-                l2cap_data_channel_rrframe(chan, rx_control);
-                break;
+        chan->last_acked_seq = control->txseq;
+        chan->expected_tx_seq = __next_seq(chan, control->txseq);
 
-        case L2CAP_SUPER_REJ:
-                l2cap_data_channel_rejframe(chan, rx_control);
-                break;
-
-        case L2CAP_SUPER_SREJ:
-                l2cap_data_channel_srejframe(chan, rx_control);
-                break;
-
-        case L2CAP_SUPER_RNR:
-                l2cap_data_channel_rnrframe(chan, rx_control);
-                break;
-        }
-
-        kfree_skb(skb);
-        return 0;
+        return err;
 }
 
-static int l2cap_ertm_data_rcv(struct l2cap_chan *chan, struct sk_buff *skb)
+static int l2cap_data_rcv(struct l2cap_chan *chan, struct sk_buff *skb)
 {
-        u32 control;
-        u16 req_seq;
-        int len, next_tx_seq_offset, req_seq_offset;
+        struct l2cap_ctrl *control = &bt_cb(skb)->control;
+        u16 len;
+        u8 event;
 
         __unpack_control(chan, skb);
 
-        control = __get_control(chan, skb->data);
-        skb_pull(skb, __ctrl_size(chan));
         len = skb->len;
 
         /*
          * We can just drop the corrupted I-frame here.
          * Receiver will miss it and start proper recovery
-         * procedures and ask retransmission.
+         * procedures and ask for retransmission.
          */
         if (l2cap_check_fcs(chan, skb))
                 goto drop;
 
-        if (__is_sar_start(chan, control) && !__is_sframe(chan, control))
+        if (!control->sframe && control->sar == L2CAP_SAR_START)
                 len -= L2CAP_SDULEN_SIZE;
 
         if (chan->fcs == L2CAP_FCS_CRC16)
@@ -4585,34 +5071,57 @@ static int l2cap_ertm_data_rcv(struct l2cap_chan *chan, struct sk_buff *skb)
                 goto drop;
         }
 
-        req_seq = __get_reqseq(chan, control);
-
-        req_seq_offset = __seq_offset(chan, req_seq, chan->expected_ack_seq);
-
-        next_tx_seq_offset = __seq_offset(chan, chan->next_tx_seq,
-                                                chan->expected_ack_seq);
+        if (!control->sframe) {
+                int err;
 
-        /* check for invalid req-seq */
-        if (req_seq_offset > next_tx_seq_offset) {
-                l2cap_send_disconn_req(chan->conn, chan, ECONNRESET);
-                goto drop;
-        }
+                BT_DBG("iframe sar %d, reqseq %d, final %d, txseq %d",
+                       control->sar, control->reqseq, control->final,
+                       control->txseq);
 
-        if (!__is_sframe(chan, control)) {
-                if (len < 0) {
-                        l2cap_send_disconn_req(chan->conn, chan, ECONNRESET);
+                /* Validate F-bit - F=0 always valid, F=1 only
+                 * valid in TX WAIT_F
+                 */
+                if (control->final && chan->tx_state != L2CAP_TX_STATE_WAIT_F)
                         goto drop;
+
+                if (chan->mode != L2CAP_MODE_STREAMING) {
+                        event = L2CAP_EV_RECV_IFRAME;
+                        err = l2cap_rx(chan, control, skb, event);
+                } else {
+                        err = l2cap_stream_rx(chan, control, skb);
                 }
 
-                l2cap_data_channel_iframe(chan, control, skb);
+                if (err)
+                        l2cap_send_disconn_req(chan->conn, chan,
+                                               ECONNRESET);
         } else {
+                const u8 rx_func_to_event[4] = {
+                        L2CAP_EV_RECV_RR, L2CAP_EV_RECV_REJ,
+                        L2CAP_EV_RECV_RNR, L2CAP_EV_RECV_SREJ
+                };
+
+                /* Only I-frames are expected in streaming mode */
+                if (chan->mode == L2CAP_MODE_STREAMING)
+                        goto drop;
+
+                BT_DBG("sframe reqseq %d, final %d, poll %d, super %d",
+                       control->reqseq, control->final, control->poll,
+                       control->super);
+
                 if (len != 0) {
                         BT_ERR("%d", len);
                         l2cap_send_disconn_req(chan->conn, chan, ECONNRESET);
                         goto drop;
                 }
 
-                l2cap_data_channel_sframe(chan, control, skb);
+                /* Validate F and P bits */
+                if (control->final && (control->poll ||
+                                       chan->tx_state != L2CAP_TX_STATE_WAIT_F))
+                        goto drop;
+
+                event = rx_func_to_event[control->super];
+                if (l2cap_rx(chan, control, skb, event))
+                        l2cap_send_disconn_req(chan->conn, chan, ECONNRESET);
         }
 
         return 0;
@@ -4622,19 +5131,27 @@ drop:
         return 0;
 }
 
-static inline int l2cap_data_channel(struct l2cap_conn *conn, u16 cid, struct sk_buff *skb)
+static void l2cap_data_channel(struct l2cap_conn *conn, u16 cid,
+                               struct sk_buff *skb)
 {
         struct l2cap_chan *chan;
-        u32 control;
-        u16 tx_seq;
-        int len;
 
         chan = l2cap_get_chan_by_scid(conn, cid);
         if (!chan) {
-                BT_DBG("unknown cid 0x%4.4x", cid);
-                /* Drop packet and return */
-                kfree_skb(skb);
-                return 0;
+                if (cid == L2CAP_CID_A2MP) {
+                        chan = a2mp_channel_create(conn, skb);
+                        if (!chan) {
+                                kfree_skb(skb);
+                                return;
+                        }
+
+                        l2cap_chan_lock(chan);
+                } else {
+                        BT_DBG("unknown cid 0x%4.4x", cid);
+                        /* Drop packet and return */
+                        kfree_skb(skb);
+                        return;
+                }
         }
 
         BT_DBG("chan %p, len %d", chan, skb->len);
@@ -4652,49 +5169,13 @@ static inline int l2cap_data_channel(struct l2cap_conn *conn, u16 cid, struct sk
                 if (chan->imtu < skb->len)
                         goto drop;
 
-                if (!chan->ops->recv(chan->data, skb))
+                if (!chan->ops->recv(chan, skb))
                         goto done;
                 break;
 
         case L2CAP_MODE_ERTM:
-                l2cap_ertm_data_rcv(chan, skb);
-
-                goto done;
-
         case L2CAP_MODE_STREAMING:
-                control = __get_control(chan, skb->data);
-                skb_pull(skb, __ctrl_size(chan));
-                len = skb->len;
-
-                if (l2cap_check_fcs(chan, skb))
-                        goto drop;
-
-                if (__is_sar_start(chan, control))
-                        len -= L2CAP_SDULEN_SIZE;
-
-                if (chan->fcs == L2CAP_FCS_CRC16)
-                        len -= L2CAP_FCS_SIZE;
-
-                if (len > chan->mps || len < 0 || __is_sframe(chan, control))
-                        goto drop;
-
-                tx_seq = __get_txseq(chan, control);
-
-                if (chan->expected_tx_seq != tx_seq) {
-                        /* Frame(s) missing - must discard partial SDU */
-                        kfree_skb(chan->sdu);
-                        chan->sdu = NULL;
-                        chan->sdu_last_frag = NULL;
-                        chan->sdu_len = 0;
-
-                        /* TODO: Notify userland of missing data */
-                }
-
-                chan->expected_tx_seq = __next_seq(chan, tx_seq);
-
-                if (l2cap_reassemble_sdu(chan, skb, control) == -EMSGSIZE)
-                        l2cap_send_disconn_req(chan->conn, chan, ECONNRESET);
-
+                l2cap_data_rcv(chan, skb);
                 goto done;
 
         default:
@@ -4707,11 +5188,10 @@ drop:
 
 done:
         l2cap_chan_unlock(chan);
-
-        return 0;
 }
 
-static inline int l2cap_conless_channel(struct l2cap_conn *conn, __le16 psm, struct sk_buff *skb)
+static void l2cap_conless_channel(struct l2cap_conn *conn, __le16 psm,
+                                  struct sk_buff *skb)
 {
         struct l2cap_chan *chan;
 
@@ -4727,17 +5207,15 @@ static inline int l2cap_conless_channel(struct l2cap_conn *conn, __le16 psm, str
         if (chan->imtu < skb->len)
                 goto drop;
 
-        if (!chan->ops->recv(chan->data, skb))
-                return 0;
+        if (!chan->ops->recv(chan, skb))
+                return;
 
 drop:
         kfree_skb(skb);
-
-        return 0;
 }
 
-static inline int l2cap_att_channel(struct l2cap_conn *conn, u16 cid,
-                                    struct sk_buff *skb)
+static void l2cap_att_channel(struct l2cap_conn *conn, u16 cid,
+                              struct sk_buff *skb)
 {
         struct l2cap_chan *chan;
 
@@ -4753,13 +5231,11 @@ static inline int l2cap_att_channel(struct l2cap_conn *conn, u16 cid,
         if (chan->imtu < skb->len)
                 goto drop;
 
-        if (!chan->ops->recv(chan->data, skb))
-                return 0;
+        if (!chan->ops->recv(chan, skb))
+                return;
 
 drop:
         kfree_skb(skb);
-
-        return 0;
 }
 
 static void l2cap_recv_frame(struct l2cap_conn *conn, struct sk_buff *skb)
@@ -4787,7 +5263,7 @@ static void l2cap_recv_frame(struct l2cap_conn *conn, struct sk_buff *skb)
 
         case L2CAP_CID_CONN_LESS:
                 psm = get_unaligned((__le16 *) skb->data);
-                skb_pull(skb, 2);
+                skb_pull(skb, L2CAP_PSMLEN_SIZE);
                 l2cap_conless_channel(conn, psm, skb);
                 break;
 
@@ -4981,6 +5457,17 @@ int l2cap_security_cfm(struct hci_conn *hcon, u8 status, u8 encrypt)
                         rsp.status = cpu_to_le16(stat);
                         l2cap_send_cmd(conn, chan->ident, L2CAP_CONN_RSP,
                                                         sizeof(rsp), &rsp);
+
+                        if (!test_bit(CONF_REQ_SENT, &chan->conf_state) &&
+                            res == L2CAP_CR_SUCCESS) {
+                                char buf[128];
+                                set_bit(CONF_REQ_SENT, &chan->conf_state);
+                                l2cap_send_cmd(conn, l2cap_get_ident(conn),
+                                               L2CAP_CONF_REQ,
+                                               l2cap_build_conf_req(chan, buf),
+                                               buf);
+                                chan->num_conf_req++;
+                        }
                 }
 
                 l2cap_chan_unlock(chan);
diff --git a/net/bluetooth/l2cap_sock.c b/net/bluetooth/l2cap_sock.c
index 3bb1611b9d4..a4bb27e8427 100644
--- a/net/bluetooth/l2cap_sock.c
+++ b/net/bluetooth/l2cap_sock.c
@@ -27,7 +27,6 @@
 
 /* Bluetooth L2CAP sockets. */
 
-#include <linux/security.h>
 #include <linux/export.h>
 
 #include <net/bluetooth/bluetooth.h>
@@ -89,8 +88,8 @@ static int l2cap_sock_bind(struct socket *sock, struct sockaddr *addr, int alen)
         if (err < 0)
                 goto done;
 
-        if (__le16_to_cpu(la.l2_psm) == 0x0001 ||
-                                __le16_to_cpu(la.l2_psm) == 0x0003)
+        if (__le16_to_cpu(la.l2_psm) == L2CAP_PSM_SDP ||
+            __le16_to_cpu(la.l2_psm) == L2CAP_PSM_RFCOMM)
                 chan->sec_level = BT_SECURITY_SDP;
 
         bacpy(&bt_sk(sk)->src, &la.l2_bdaddr);
@@ -446,6 +445,22 @@ static int l2cap_sock_getsockopt(struct socket *sock, int level, int optname, ch
         return err;
 }
 
+static bool l2cap_valid_mtu(struct l2cap_chan *chan, u16 mtu)
+{
+        switch (chan->scid) {
+        case L2CAP_CID_LE_DATA:
+                if (mtu < L2CAP_LE_MIN_MTU)
+                        return false;
+                break;
+
+        default:
+                if (mtu < L2CAP_DEFAULT_MIN_MTU)
+                        return false;
+        }
+
+        return true;
+}
+
 static int l2cap_sock_setsockopt_old(struct socket *sock, int optname, char __user *optval, unsigned int optlen)
 {
         struct sock *sk = sock->sk;
@@ -484,6 +499,11 @@ static int l2cap_sock_setsockopt_old(struct socket *sock, int optname, char __us
                         break;
                 }
 
+                if (!l2cap_valid_mtu(chan, opts.imtu)) {
+                        err = -EINVAL;
+                        break;
+                }
+
                 chan->mode = opts.mode;
                 switch (chan->mode) {
                 case L2CAP_MODE_BASIC:
@@ -873,9 +893,34 @@ static int l2cap_sock_release(struct socket *sock)
         return err;
 }
 
-static struct l2cap_chan *l2cap_sock_new_connection_cb(void *data)
+static void l2cap_sock_cleanup_listen(struct sock *parent)
 {
-        struct sock *sk, *parent = data;
+        struct sock *sk;
+
+        BT_DBG("parent %p", parent);
+
+        /* Close not yet accepted channels */
+        while ((sk = bt_accept_dequeue(parent, NULL))) {
+                struct l2cap_chan *chan = l2cap_pi(sk)->chan;
+
+                l2cap_chan_lock(chan);
+                __clear_chan_timer(chan);
+                l2cap_chan_close(chan, ECONNRESET);
+                l2cap_chan_unlock(chan);
+
+                l2cap_sock_kill(sk);
+        }
+}
+
+static struct l2cap_chan *l2cap_sock_new_connection_cb(struct l2cap_chan *chan)
+{
+        struct sock *sk, *parent = chan->data;
+
+        /* Check for backlog size */
+        if (sk_acceptq_is_full(parent)) {
+                BT_DBG("backlog full %d", parent->sk_ack_backlog);
+                return NULL;
+        }
 
         sk = l2cap_sock_alloc(sock_net(parent), NULL, BTPROTO_L2CAP,
                                                                 GFP_ATOMIC);
@@ -889,10 +934,10 @@ static struct l2cap_chan *l2cap_sock_new_connection_cb(void *data)
         return l2cap_pi(sk)->chan;
 }
 
-static int l2cap_sock_recv_cb(void *data, struct sk_buff *skb)
+static int l2cap_sock_recv_cb(struct l2cap_chan *chan, struct sk_buff *skb)
 {
         int err;
-        struct sock *sk = data;
+        struct sock *sk = chan->data;
         struct l2cap_pinfo *pi = l2cap_pi(sk);
 
         lock_sock(sk);
@@ -925,16 +970,57 @@ done:
         return err;
 }
 
-static void l2cap_sock_close_cb(void *data)
+static void l2cap_sock_close_cb(struct l2cap_chan *chan)
 {
-        struct sock *sk = data;
+        struct sock *sk = chan->data;
 
         l2cap_sock_kill(sk);
 }
 
-static void l2cap_sock_state_change_cb(void *data, int state)
+static void l2cap_sock_teardown_cb(struct l2cap_chan *chan, int err)
 {
-        struct sock *sk = data;
+        struct sock *sk = chan->data;
+        struct sock *parent;
+
+        lock_sock(sk);
+
+        parent = bt_sk(sk)->parent;
+
+        sock_set_flag(sk, SOCK_ZAPPED);
+
+        switch (chan->state) {
+        case BT_OPEN:
+        case BT_BOUND:
+        case BT_CLOSED:
+                break;
+        case BT_LISTEN:
+                l2cap_sock_cleanup_listen(sk);
+                sk->sk_state = BT_CLOSED;
+                chan->state = BT_CLOSED;
+
+                break;
+        default:
+                sk->sk_state = BT_CLOSED;
+                chan->state = BT_CLOSED;
+
+                sk->sk_err = err;
+
+                if (parent) {
+                        bt_accept_unlink(sk);
+                        parent->sk_data_ready(parent, 0);
+                } else {
+                        sk->sk_state_change(sk);
+                }
+
+                break;
+        }
+
+        release_sock(sk);
+}
+
+static void l2cap_sock_state_change_cb(struct l2cap_chan *chan, int state)
+{
+        struct sock *sk = chan->data;
 
         sk->sk_state = state;
 }
@@ -955,12 +1041,34 @@ static struct sk_buff *l2cap_sock_alloc_skb_cb(struct l2cap_chan *chan,
         return skb;
 }
 
+static void l2cap_sock_ready_cb(struct l2cap_chan *chan)
+{
+        struct sock *sk = chan->data;
+        struct sock *parent;
+
+        lock_sock(sk);
+
+        parent = bt_sk(sk)->parent;
+
+        BT_DBG("sk %p, parent %p", sk, parent);
+
+        sk->sk_state = BT_CONNECTED;
+        sk->sk_state_change(sk);
+
+        if (parent)
+                parent->sk_data_ready(parent, 0);
+
+        release_sock(sk);
+}
+
 static struct l2cap_ops l2cap_chan_ops = {
         .name           = "L2CAP Socket Interface",
         .new_connection = l2cap_sock_new_connection_cb,
         .recv           = l2cap_sock_recv_cb,
         .close          = l2cap_sock_close_cb,
+        .teardown       = l2cap_sock_teardown_cb,
         .state_change   = l2cap_sock_state_change_cb,
+        .ready          = l2cap_sock_ready_cb,
         .alloc_skb      = l2cap_sock_alloc_skb_cb,
 };
 
diff --git a/net/bluetooth/lib.c b/net/bluetooth/lib.c
index 506628876f3..e1c97527e16 100644
--- a/net/bluetooth/lib.c
+++ b/net/bluetooth/lib.c
@@ -26,12 +26,7 @@
 
 #define pr_fmt(fmt) "Bluetooth: " fmt
 
-#include <linux/module.h>
-
-#include <linux/kernel.h>
-#include <linux/stddef.h>
-#include <linux/string.h>
-#include <asm/errno.h>
+#include <linux/export.h>
 
 #include <net/bluetooth/bluetooth.h>
 
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index 3e5e3362ea0..a6e0f3d8da6 100644
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -24,8 +24,6 @@
 
 /* Bluetooth HCI Management interface */
 
-#include <linux/kernel.h>
-#include <linux/uaccess.h>
 #include <linux/module.h>
 #include <asm/unaligned.h>
 
@@ -714,7 +712,8 @@ static struct pending_cmd *mgmt_pending_add(struct sock *sk, u16 opcode,
 }
 
 static void mgmt_pending_foreach(u16 opcode, struct hci_dev *hdev,
-                                 void (*cb)(struct pending_cmd *cmd, void *data),
+                                 void (*cb)(struct pending_cmd *cmd,
+                                            void *data),
                                  void *data)
 {
         struct list_head *p, *n;
@@ -871,7 +870,7 @@ static int set_discoverable(struct sock *sk, struct hci_dev *hdev, void *data,
         }
 
         if (mgmt_pending_find(MGMT_OP_SET_DISCOVERABLE, hdev) ||
-                        mgmt_pending_find(MGMT_OP_SET_CONNECTABLE, hdev)) {
+            mgmt_pending_find(MGMT_OP_SET_CONNECTABLE, hdev)) {
                 err = cmd_status(sk, hdev->id, MGMT_OP_SET_DISCOVERABLE,
                                  MGMT_STATUS_BUSY);
                 goto failed;
@@ -978,7 +977,7 @@ static int set_connectable(struct sock *sk, struct hci_dev *hdev, void *data,
         }
 
         if (mgmt_pending_find(MGMT_OP_SET_DISCOVERABLE, hdev) ||
-                        mgmt_pending_find(MGMT_OP_SET_CONNECTABLE, hdev)) {
+            mgmt_pending_find(MGMT_OP_SET_CONNECTABLE, hdev)) {
                 err = cmd_status(sk, hdev->id, MGMT_OP_SET_CONNECTABLE,
                                  MGMT_STATUS_BUSY);
                 goto failed;
@@ -1001,7 +1000,7 @@ static int set_connectable(struct sock *sk, struct hci_dev *hdev, void *data,
                 scan = 0;
 
                 if (test_bit(HCI_ISCAN, &hdev->flags) &&
-                                                hdev->discov_timeout > 0)
+                    hdev->discov_timeout > 0)
                         cancel_delayed_work(&hdev->discov_off);
         }
 
@@ -1056,7 +1055,7 @@ static int set_link_security(struct sock *sk, struct hci_dev *hdev, void *data,
                 bool changed = false;
 
                 if (!!cp->val != test_bit(HCI_LINK_SECURITY,
-                                                        &hdev->dev_flags)) {
+                                          &hdev->dev_flags)) {
                         change_bit(HCI_LINK_SECURITY, &hdev->dev_flags);
                         changed = true;
                 }
@@ -1317,7 +1316,7 @@ static bool enable_service_cache(struct hci_dev *hdev)
 }
 
 static int remove_uuid(struct sock *sk, struct hci_dev *hdev, void *data,
-                                                                u16 len)
+                       u16 len)
 {
         struct mgmt_cp_remove_uuid *cp = data;
         struct pending_cmd *cmd;
@@ -1442,7 +1441,7 @@ unlock:
 }
 
 static int load_link_keys(struct sock *sk, struct hci_dev *hdev, void *data,
-                                                                u16 len)
+                          u16 len)
 {
         struct mgmt_cp_load_link_keys *cp = data;
         u16 key_count, expected_len;
@@ -1454,13 +1453,13 @@ static int load_link_keys(struct sock *sk, struct hci_dev *hdev, void *data,
                                         sizeof(struct mgmt_link_key_info);
         if (expected_len != len) {
                 BT_ERR("load_link_keys: expected %u bytes, got %u bytes",
-                                                        len, expected_len);
+                       len, expected_len);
                 return cmd_status(sk, hdev->id, MGMT_OP_LOAD_LINK_KEYS,
                                   MGMT_STATUS_INVALID_PARAMS);
         }
 
         BT_DBG("%s debug_keys %u key_count %u", hdev->name, cp->debug_keys,
-                                                                key_count);
+               key_count);
 
         hci_dev_lock(hdev);
 
@@ -1535,10 +1534,10 @@ static int unpair_device(struct sock *sk, struct hci_dev *hdev, void *data,
         if (cp->disconnect) {
                 if (cp->addr.type == BDADDR_BREDR)
                         conn = hci_conn_hash_lookup_ba(hdev, ACL_LINK,
-                                                        &cp->addr.bdaddr);
+                                                       &cp->addr.bdaddr);
                 else
                         conn = hci_conn_hash_lookup_ba(hdev, LE_LINK,
-                                                        &cp->addr.bdaddr);
+                                                       &cp->addr.bdaddr);
         } else {
                 conn = NULL;
         }
@@ -1594,7 +1593,8 @@ static int disconnect(struct sock *sk, struct hci_dev *hdev, void *data,
         }
 
         if (cp->addr.type == BDADDR_BREDR)
-                conn = hci_conn_hash_lookup_ba(hdev, ACL_LINK, &cp->addr.bdaddr);
+                conn = hci_conn_hash_lookup_ba(hdev, ACL_LINK,
+                                               &cp->addr.bdaddr);
         else
                 conn = hci_conn_hash_lookup_ba(hdev, LE_LINK, &cp->addr.bdaddr);
 
@@ -1813,7 +1813,7 @@ static int set_io_capability(struct sock *sk, struct hci_dev *hdev, void *data,
         hdev->io_capability = cp->io_capability;
 
         BT_DBG("%s IO capability set to 0x%02x", hdev->name,
-                                                        hdev->io_capability);
+               hdev->io_capability);
 
         hci_dev_unlock(hdev);
 
@@ -1821,7 +1821,7 @@ static int set_io_capability(struct sock *sk, struct hci_dev *hdev, void *data,
                             0);
 }
 
-static inline struct pending_cmd *find_pairing(struct hci_conn *conn)
+static struct pending_cmd *find_pairing(struct hci_conn *conn)
 {
         struct hci_dev *hdev = conn->hdev;
         struct pending_cmd *cmd;
@@ -1927,8 +1927,15 @@ static int pair_device(struct sock *sk, struct hci_dev *hdev, void *data,
         rp.addr.type = cp->addr.type;
 
         if (IS_ERR(conn)) {
+                int status;
+
+                if (PTR_ERR(conn) == -EBUSY)
+                        status = MGMT_STATUS_BUSY;
+                else
+                        status = MGMT_STATUS_CONNECT_FAILED;
+
                 err = cmd_complete(sk, hdev->id, MGMT_OP_PAIR_DEVICE,
-                                   MGMT_STATUS_CONNECT_FAILED, &rp,
+                                   status, &rp,
                                    sizeof(rp));
                 goto unlock;
         }
@@ -1959,7 +1966,7 @@ static int pair_device(struct sock *sk, struct hci_dev *hdev, void *data,
         cmd->user_data = conn;
 
         if (conn->state == BT_CONNECTED &&
-                                hci_conn_security(conn, sec_level, auth_type))
+            hci_conn_security(conn, sec_level, auth_type))
                 pairing_complete(cmd, 0);
 
         err = 0;
@@ -2256,7 +2263,7 @@ unlock:
 }
 
 static int remove_remote_oob_data(struct sock *sk, struct hci_dev *hdev,
-                                                void *data, u16 len)
+                                  void *data, u16 len)
 {
         struct mgmt_cp_remove_remote_oob_data *cp = data;
         u8 status;
@@ -2425,7 +2432,7 @@ static int stop_discovery(struct sock *sk, struct hci_dev *hdev, void *data,
 
         case DISCOVERY_RESOLVING:
                 e = hci_inquiry_cache_lookup_resolve(hdev, BDADDR_ANY,
-                                                        NAME_PENDING);
+                                                     NAME_PENDING);
                 if (!e) {
                         mgmt_pending_remove(cmd);
                         err = cmd_complete(sk, hdev->id,
@@ -2647,7 +2654,7 @@ static int load_long_term_keys(struct sock *sk, struct hci_dev *hdev,
                                         sizeof(struct mgmt_ltk_info);
         if (expected_len != len) {
                 BT_ERR("load_keys: expected %u bytes, got %u bytes",
-                                                        len, expected_len);
+                       len, expected_len);
                 return cmd_status(sk, hdev->id, MGMT_OP_LOAD_LONG_TERM_KEYS,
                                   EINVAL);
         }
@@ -2772,7 +2779,7 @@ int mgmt_control(struct sock *sk, struct msghdr *msg, size_t msglen)
         }
 
         if (opcode >= ARRAY_SIZE(mgmt_handlers) ||
-                                        mgmt_handlers[opcode].func == NULL) {
+            mgmt_handlers[opcode].func == NULL) {
                 BT_DBG("Unknown op %u", opcode);
                 err = cmd_status(sk, index, opcode,
                                  MGMT_STATUS_UNKNOWN_COMMAND);
@@ -2780,7 +2787,7 @@ int mgmt_control(struct sock *sk, struct msghdr *msg, size_t msglen)
         }
 
         if ((hdev && opcode < MGMT_OP_READ_INFO) ||
-                        (!hdev && opcode >= MGMT_OP_READ_INFO)) {
+            (!hdev && opcode >= MGMT_OP_READ_INFO)) {
                 err = cmd_status(sk, index, opcode,
                                  MGMT_STATUS_INVALID_INDEX);
                 goto done;
@@ -2789,7 +2796,7 @@ int mgmt_control(struct sock *sk, struct msghdr *msg, size_t msglen)
         handler = &mgmt_handlers[opcode];
 
         if ((handler->var_len && len < handler->data_len) ||
-                        (!handler->var_len && len != handler->data_len)) {
+            (!handler->var_len && len != handler->data_len)) {
                 err = cmd_status(sk, index, opcode,
                                  MGMT_STATUS_INVALID_PARAMS);
                 goto done;
@@ -2973,7 +2980,7 @@ int mgmt_new_link_key(struct hci_dev *hdev, struct link_key *key,
         bacpy(&ev.key.addr.bdaddr, &key->bdaddr);
         ev.key.addr.type = BDADDR_BREDR;
         ev.key.type = key->type;
-        memcpy(ev.key.val, key->val, 16);
+        memcpy(ev.key.val, key->val, HCI_LINK_KEY_SIZE);
         ev.key.pin_len = key->pin_len;
 
         return mgmt_event(MGMT_EV_NEW_LINK_KEY, hdev, &ev, sizeof(ev), NULL);
@@ -3108,7 +3115,7 @@ int mgmt_disconnect_failed(struct hci_dev *hdev, bdaddr_t *bdaddr,
         mgmt_pending_remove(cmd);
 
         mgmt_pending_foreach(MGMT_OP_UNPAIR_DEVICE, hdev, unpair_device_rsp,
-                                                                        hdev);
+                             hdev);
         return err;
 }
 
@@ -3198,7 +3205,7 @@ int mgmt_user_confirm_request(struct hci_dev *hdev, bdaddr_t *bdaddr,
 }
 
 int mgmt_user_passkey_request(struct hci_dev *hdev, bdaddr_t *bdaddr,
-                                                u8 link_type, u8 addr_type)
+                              u8 link_type, u8 addr_type)
 {
         struct mgmt_ev_user_passkey_request ev;
 
@@ -3212,8 +3219,8 @@ int mgmt_user_passkey_request(struct hci_dev *hdev, bdaddr_t *bdaddr,
 }
 
 static int user_pairing_resp_complete(struct hci_dev *hdev, bdaddr_t *bdaddr,
-                                        u8 link_type, u8 addr_type, u8 status,
-                                        u8 opcode)
+                                      u8 link_type, u8 addr_type, u8 status,
+                                      u8 opcode)
 {
         struct pending_cmd *cmd;
         struct mgmt_rp_user_confirm_reply rp;
@@ -3244,7 +3251,8 @@ int mgmt_user_confirm_neg_reply_complete(struct hci_dev *hdev, bdaddr_t *bdaddr,
                                          u8 link_type, u8 addr_type, u8 status)
 {
         return user_pairing_resp_complete(hdev, bdaddr, link_type, addr_type,
-                                          status, MGMT_OP_USER_CONFIRM_NEG_REPLY);
+                                          status,
+                                          MGMT_OP_USER_CONFIRM_NEG_REPLY);
 }
 
 int mgmt_user_passkey_reply_complete(struct hci_dev *hdev, bdaddr_t *bdaddr,
@@ -3258,7 +3266,8 @@ int mgmt_user_passkey_neg_reply_complete(struct hci_dev *hdev, bdaddr_t *bdaddr,
                                          u8 link_type, u8 addr_type, u8 status)
 {
         return user_pairing_resp_complete(hdev, bdaddr, link_type, addr_type,
-                                          status, MGMT_OP_USER_PASSKEY_NEG_REPLY);
+                                          status,
+                                          MGMT_OP_USER_PASSKEY_NEG_REPLY);
 }
 
 int mgmt_auth_failed(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 link_type,
diff --git a/net/bluetooth/rfcomm/core.c b/net/bluetooth/rfcomm/core.c
index 8a602388f1e..c75107ef892 100644
--- a/net/bluetooth/rfcomm/core.c
+++ b/net/bluetooth/rfcomm/core.c
@@ -26,22 +26,8 @@
  */
 
 #include <linux/module.h>
-#include <linux/errno.h>
-#include <linux/kernel.h>
-#include <linux/sched.h>
-#include <linux/signal.h>
-#include <linux/init.h>
-#include <linux/wait.h>
-#include <linux/device.h>
 #include <linux/debugfs.h>
-#include <linux/seq_file.h>
-#include <linux/net.h>
-#include <linux/mutex.h>
 #include <linux/kthread.h>
-#include <linux/slab.h>
-
-#include <net/sock.h>
-#include <linux/uaccess.h>
 #include <asm/unaligned.h>
 
 #include <net/bluetooth/bluetooth.h>
@@ -115,14 +101,14 @@ static void rfcomm_session_del(struct rfcomm_session *s);
 #define __get_rpn_stop_bits(line) (((line) >> 2) & 0x1)
 #define __get_rpn_parity(line)    (((line) >> 3) & 0x7)
 
-static inline void rfcomm_schedule(void)
+static void rfcomm_schedule(void)
 {
         if (!rfcomm_thread)
                 return;
         wake_up_process(rfcomm_thread);
 }
 
-static inline void rfcomm_session_put(struct rfcomm_session *s)
+static void rfcomm_session_put(struct rfcomm_session *s)
 {
         if (atomic_dec_and_test(&s->refcnt))
                 rfcomm_session_del(s);
@@ -227,7 +213,7 @@ static int rfcomm_l2sock_create(struct socket **sock)
         return err;
 }
 
-static inline int rfcomm_check_security(struct rfcomm_dlc *d)
+static int rfcomm_check_security(struct rfcomm_dlc *d)
 {
         struct sock *sk = d->session->sock->sk;
         struct l2cap_conn *conn = l2cap_pi(sk)->chan->conn;
@@ -1750,7 +1736,7 @@ static void rfcomm_process_connect(struct rfcomm_session *s)
 /* Send data queued for the DLC.
  * Return number of frames left in the queue.
  */
-static inline int rfcomm_process_tx(struct rfcomm_dlc *d)
+static int rfcomm_process_tx(struct rfcomm_dlc *d)
 {
         struct sk_buff *skb;
         int err;
@@ -1798,7 +1784,7 @@ static inline int rfcomm_process_tx(struct rfcomm_dlc *d)
         return skb_queue_len(&d->tx_queue);
 }
 
-static inline void rfcomm_process_dlcs(struct rfcomm_session *s)
+static void rfcomm_process_dlcs(struct rfcomm_session *s)
 {
         struct rfcomm_dlc *d;
         struct list_head *p, *n;
@@ -1858,7 +1844,7 @@ static inline void rfcomm_process_dlcs(struct rfcomm_session *s)
         }
 }
 
-static inline void rfcomm_process_rx(struct rfcomm_session *s)
+static void rfcomm_process_rx(struct rfcomm_session *s)
 {
         struct socket *sock = s->sock;
         struct sock *sk = sock->sk;
@@ -1883,7 +1869,7 @@ static inline void rfcomm_process_rx(struct rfcomm_session *s)
         }
 }
 
-static inline void rfcomm_accept_connection(struct rfcomm_session *s)
+static void rfcomm_accept_connection(struct rfcomm_session *s)
 {
         struct socket *sock = s->sock, *nsock;
         int err;
@@ -1917,7 +1903,7 @@ static inline void rfcomm_accept_connection(struct rfcomm_session *s)
                 sock_release(nsock);
 }
 
-static inline void rfcomm_check_connection(struct rfcomm_session *s)
+static void rfcomm_check_connection(struct rfcomm_session *s)
 {
         struct sock *sk = s->sock->sk;
 
@@ -1941,7 +1927,7 @@ static inline void rfcomm_check_connection(struct rfcomm_session *s)
         }
 }
 
-static inline void rfcomm_process_sessions(void)
+static void rfcomm_process_sessions(void)
 {
         struct list_head *p, *n;
 
diff --git a/net/bluetooth/rfcomm/sock.c b/net/bluetooth/rfcomm/sock.c
index e8707debb86..7e1e59645c0 100644
--- a/net/bluetooth/rfcomm/sock.c
+++ b/net/bluetooth/rfcomm/sock.c
@@ -25,27 +25,8 @@
  * RFCOMM sockets.
  */
 
-#include <linux/module.h>
-
-#include <linux/types.h>
-#include <linux/errno.h>
-#include <linux/kernel.h>
-#include <linux/sched.h>
-#include <linux/slab.h>
-#include <linux/poll.h>
-#include <linux/fcntl.h>
-#include <linux/init.h>
-#include <linux/interrupt.h>
-#include <linux/socket.h>
-#include <linux/skbuff.h>
-#include <linux/list.h>
-#include <linux/device.h>
+#include <linux/export.h>
 #include <linux/debugfs.h>
-#include <linux/seq_file.h>
-#include <linux/security.h>
-#include <net/sock.h>
-
-#include <linux/uaccess.h>
 
 #include <net/bluetooth/bluetooth.h>
 #include <net/bluetooth/hci_core.h>
diff --git a/net/bluetooth/rfcomm/tty.c b/net/bluetooth/rfcomm/tty.c
index d1820ff14ae..cb960773c00 100644
--- a/net/bluetooth/rfcomm/tty.c
+++ b/net/bluetooth/rfcomm/tty.c
@@ -31,11 +31,6 @@
 #include <linux/tty_driver.h>
 #include <linux/tty_flip.h>
 
-#include <linux/capability.h>
-#include <linux/slab.h>
-#include <linux/skbuff.h>
-#include <linux/workqueue.h>
-
 #include <net/bluetooth/bluetooth.h>
 #include <net/bluetooth/hci_core.h>
 #include <net/bluetooth/rfcomm.h>
@@ -132,7 +127,7 @@ static struct rfcomm_dev *__rfcomm_dev_get(int id)
         return NULL;
 }
 
-static inline struct rfcomm_dev *rfcomm_dev_get(int id)
+static struct rfcomm_dev *rfcomm_dev_get(int id)
 {
         struct rfcomm_dev *dev;
 
@@ -345,7 +340,7 @@ static void rfcomm_wfree(struct sk_buff *skb)
         tty_port_put(&dev->port);
 }
 
-static inline void rfcomm_set_owner_w(struct sk_buff *skb, struct rfcomm_dev *dev)
+static void rfcomm_set_owner_w(struct sk_buff *skb, struct rfcomm_dev *dev)
 {
         tty_port_get(&dev->port);
         atomic_add(skb->truesize, &dev->wmem_alloc);
diff --git a/net/bluetooth/sco.c b/net/bluetooth/sco.c
index cbdd313659a..40bbe25dcff 100644
--- a/net/bluetooth/sco.c
+++ b/net/bluetooth/sco.c
@@ -25,26 +25,8 @@
 /* Bluetooth SCO sockets. */
 
 #include <linux/module.h>
-
-#include <linux/types.h>
-#include <linux/errno.h>
-#include <linux/kernel.h>
-#include <linux/sched.h>
-#include <linux/slab.h>
-#include <linux/poll.h>
-#include <linux/fcntl.h>
-#include <linux/init.h>
-#include <linux/interrupt.h>
-#include <linux/socket.h>
-#include <linux/skbuff.h>
-#include <linux/device.h>
 #include <linux/debugfs.h>
 #include <linux/seq_file.h>
-#include <linux/list.h>
-#include <linux/security.h>
-#include <net/sock.h>
-
-#include <linux/uaccess.h>
 
 #include <net/bluetooth/bluetooth.h>
 #include <net/bluetooth/hci_core.h>
@@ -123,7 +105,7 @@ static struct sco_conn *sco_conn_add(struct hci_conn *hcon)
         return conn;
 }
 
-static inline struct sock *sco_chan_get(struct sco_conn *conn)
+static struct sock *sco_chan_get(struct sco_conn *conn)
 {
         struct sock *sk = NULL;
         sco_conn_lock(conn);
@@ -157,7 +139,8 @@ static int sco_conn_del(struct hci_conn *hcon, int err)
         return 0;
 }
 
-static inline int sco_chan_add(struct sco_conn *conn, struct sock *sk, struct sock *parent)
+static int sco_chan_add(struct sco_conn *conn, struct sock *sk,
+                        struct sock *parent)
 {
         int err = 0;
 
@@ -228,7 +211,7 @@ done:
         return err;
 }
 
-static inline int sco_send_frame(struct sock *sk, struct msghdr *msg, int len)
+static int sco_send_frame(struct sock *sk, struct msghdr *msg, int len)
 {
         struct sco_conn *conn = sco_pi(sk)->conn;
         struct sk_buff *skb;
@@ -254,7 +237,7 @@ static inline int sco_send_frame(struct sock *sk, struct msghdr *msg, int len)
         return len;
 }
 
-static inline void sco_recv_frame(struct sco_conn *conn, struct sk_buff *skb)
+static void sco_recv_frame(struct sco_conn *conn, struct sk_buff *skb)
 {
         struct sock *sk = sco_chan_get(conn);
 
@@ -523,7 +506,7 @@ static int sco_sock_connect(struct socket *sock, struct sockaddr *addr, int alen
                 goto done;
 
         err = bt_sock_wait_state(sk, BT_CONNECTED,
-                        sock_sndtimeo(sk, flags & O_NONBLOCK));
+                                 sock_sndtimeo(sk, flags & O_NONBLOCK));
 
 done:
         release_sock(sk);
@@ -788,7 +771,7 @@ static int sco_sock_shutdown(struct socket *sock, int how)
 
                 if (sock_flag(sk, SOCK_LINGER) && sk->sk_lingertime)
                         err = bt_sock_wait_state(sk, BT_CLOSED,
-                                                        sk->sk_lingertime);
+                                                 sk->sk_lingertime);
         }
         release_sock(sk);
         return err;
@@ -878,7 +861,7 @@ static void sco_conn_ready(struct sco_conn *conn)
                 bh_lock_sock(parent);
 
                 sk = sco_sock_alloc(sock_net(parent), NULL,
-                                BTPROTO_SCO, GFP_ATOMIC);
+                                    BTPROTO_SCO, GFP_ATOMIC);
                 if (!sk) {
                         bh_unlock_sock(parent);
                         goto done;
@@ -907,7 +890,7 @@ done:
 /* ----- SCO interface with lower layer (HCI) ----- */
 int sco_connect_ind(struct hci_dev *hdev, bdaddr_t *bdaddr)
 {
-        register struct sock *sk;
+        struct sock *sk;
         struct hlist_node *node;
         int lm = 0;
 
@@ -920,7 +903,7 @@ int sco_connect_ind(struct hci_dev *hdev, bdaddr_t *bdaddr)
                         continue;
 
                 if (!bacmp(&bt_sk(sk)->src, &hdev->bdaddr) ||
-                                !bacmp(&bt_sk(sk)->src, BDADDR_ANY)) {
+                    !bacmp(&bt_sk(sk)->src, BDADDR_ANY)) {
                         lm |= HCI_LM_ACCEPT;
                         break;
                 }
@@ -981,7 +964,7 @@ static int sco_debugfs_show(struct seq_file *f, void *p)
 
         sk_for_each(sk, node, &sco_sk_list.head) {
                 seq_printf(f, "%s %s %d\n", batostr(&bt_sk(sk)->src),
-                                batostr(&bt_sk(sk)->dst), sk->sk_state);
+                           batostr(&bt_sk(sk)->dst), sk->sk_state);
         }
 
         read_unlock(&sco_sk_list.lock);
@@ -1044,8 +1027,8 @@ int __init sco_init(void)
         }
 
         if (bt_debugfs) {
-                sco_debugfs = debugfs_create_file("sco", 0444,
-                                        bt_debugfs, NULL, &sco_debugfs_fops);
+                sco_debugfs = debugfs_create_file("sco", 0444, bt_debugfs,
+                                                  NULL, &sco_debugfs_fops);
                 if (!sco_debugfs)
                         BT_ERR("Failed to create SCO debug file");
         }
diff --git a/net/bluetooth/smp.c b/net/bluetooth/smp.c
index 37df4e9b389..16ef0dc85a0 100644
--- a/net/bluetooth/smp.c
+++ b/net/bluetooth/smp.c
@@ -20,14 +20,15 @@
    SOFTWARE IS DISCLAIMED.
 */
 
+#include <linux/crypto.h>
+#include <linux/scatterlist.h>
+#include <crypto/b128ops.h>
+
 #include <net/bluetooth/bluetooth.h>
 #include <net/bluetooth/hci_core.h>
 #include <net/bluetooth/l2cap.h>
 #include <net/bluetooth/mgmt.h>
 #include <net/bluetooth/smp.h>
-#include <linux/crypto.h>
-#include <linux/scatterlist.h>
-#include <crypto/b128ops.h>
 
 #define SMP_TIMEOUT     msecs_to_jiffies(30000)
 
diff --git a/net/bridge/br_netfilter.c b/net/bridge/br_netfilter.c
index e41456bd3cc..b98d3d78ca7 100644
--- a/net/bridge/br_netfilter.c
+++ b/net/bridge/br_netfilter.c
@@ -120,7 +120,9 @@ static u32 *fake_cow_metrics(struct dst_entry *dst, unsigned long old)
         return NULL;
 }
 
-static struct neighbour *fake_neigh_lookup(const struct dst_entry *dst, const void *daddr)
+static struct neighbour *fake_neigh_lookup(const struct dst_entry *dst,
+                                           struct sk_buff *skb,
+                                           const void *daddr)
 {
         return NULL;
 }
@@ -373,19 +375,29 @@ static int br_nf_pre_routing_finish_bridge(struct sk_buff *skb)
         if (!skb->dev)
                 goto free_skb;
         dst = skb_dst(skb);
-        neigh = dst_get_neighbour_noref(dst);
-        if (neigh->hh.hh_len) {
-                neigh_hh_bridge(&neigh->hh, skb);
-                skb->dev = nf_bridge->physindev;
-                return br_handle_frame_finish(skb);
-        } else {
-                /* the neighbour function below overwrites the complete
-                 * MAC header, so we save the Ethernet source address and
-                 * protocol number. */
-                skb_copy_from_linear_data_offset(skb, -(ETH_HLEN-ETH_ALEN), skb->nf_bridge->data, ETH_HLEN-ETH_ALEN);
-                /* tell br_dev_xmit to continue with forwarding */
-                nf_bridge->mask |= BRNF_BRIDGED_DNAT;
-                return neigh->output(neigh, skb);
+        neigh = dst_neigh_lookup_skb(dst, skb);
+        if (neigh) {
+                int ret;
+
+                if (neigh->hh.hh_len) {
+                        neigh_hh_bridge(&neigh->hh, skb);
+                        skb->dev = nf_bridge->physindev;
+                        ret = br_handle_frame_finish(skb);
+                } else {
+                        /* the neighbour function below overwrites the complete
+                         * MAC header, so we save the Ethernet source address and
+                         * protocol number.
+                         */
+                        skb_copy_from_linear_data_offset(skb,
+                                                         -(ETH_HLEN-ETH_ALEN),
+                                                         skb->nf_bridge->data,
+                                                         ETH_HLEN-ETH_ALEN);
+                        /* tell br_dev_xmit to continue with forwarding */
+                        nf_bridge->mask |= BRNF_BRIDGED_DNAT;
+                        ret = neigh->output(neigh, skb);
+                }
+                neigh_release(neigh);
+                return ret;
         }
 free_skb:
         kfree_skb(skb);
@@ -764,9 +776,9 @@ static unsigned int br_nf_forward_ip(unsigned int hook, struct sk_buff *skb,
                 return NF_DROP;
 
         if (IS_IP(skb) || IS_VLAN_IP(skb) || IS_PPPOE_IP(skb))
-                pf = PF_INET;
+                pf = NFPROTO_IPV4;
         else if (IS_IPV6(skb) || IS_VLAN_IPV6(skb) || IS_PPPOE_IPV6(skb))
-                pf = PF_INET6;
+                pf = NFPROTO_IPV6;
         else
                 return NF_ACCEPT;
 
@@ -778,13 +790,13 @@ static unsigned int br_nf_forward_ip(unsigned int hook, struct sk_buff *skb,
                 nf_bridge->mask |= BRNF_PKT_TYPE;
         }
 
-        if (pf == PF_INET && br_parse_ip_options(skb))
+        if (pf == NFPROTO_IPV4 && br_parse_ip_options(skb))
                 return NF_DROP;
 
         /* The physdev module checks on this */
         nf_bridge->mask |= BRNF_BRIDGED;
         nf_bridge->physoutdev = skb->dev;
-        if (pf == PF_INET)
+        if (pf == NFPROTO_IPV4)
                 skb->protocol = htons(ETH_P_IP);
         else
                 skb->protocol = htons(ETH_P_IPV6);
@@ -871,9 +883,9 @@ static unsigned int br_nf_post_routing(unsigned int hook, struct sk_buff *skb,
                 return NF_DROP;
 
         if (IS_IP(skb) || IS_VLAN_IP(skb) || IS_PPPOE_IP(skb))
-                pf = PF_INET;
+                pf = NFPROTO_IPV4;
         else if (IS_IPV6(skb) || IS_VLAN_IPV6(skb) || IS_PPPOE_IPV6(skb))
-                pf = PF_INET6;
+                pf = NFPROTO_IPV6;
         else
                 return NF_ACCEPT;
 
@@ -886,7 +898,7 @@ static unsigned int br_nf_post_routing(unsigned int hook, struct sk_buff *skb,
 
         nf_bridge_pull_encap_header(skb);
         nf_bridge_save_header(skb);
-        if (pf == PF_INET)
+        if (pf == NFPROTO_IPV4)
                 skb->protocol = htons(ETH_P_IP);
         else
                 skb->protocol = htons(ETH_P_IPV6);
@@ -919,49 +931,49 @@ static struct nf_hook_ops br_nf_ops[] __read_mostly = {
         {
                 .hook = br_nf_pre_routing,
                 .owner = THIS_MODULE,
-                .pf = PF_BRIDGE,
+                .pf = NFPROTO_BRIDGE,
                 .hooknum = NF_BR_PRE_ROUTING,
                 .priority = NF_BR_PRI_BRNF,
         },
         {
                 .hook = br_nf_local_in,
                 .owner = THIS_MODULE,
-                .pf = PF_BRIDGE,
+                .pf = NFPROTO_BRIDGE,
                 .hooknum = NF_BR_LOCAL_IN,
                 .priority = NF_BR_PRI_BRNF,
         },
         {
                 .hook = br_nf_forward_ip,
                 .owner = THIS_MODULE,
-                .pf = PF_BRIDGE,
+                .pf = NFPROTO_BRIDGE,
                 .hooknum = NF_BR_FORWARD,
                 .priority = NF_BR_PRI_BRNF - 1,
         },
         {
                 .hook = br_nf_forward_arp,
                 .owner = THIS_MODULE,
-                .pf = PF_BRIDGE,
+                .pf = NFPROTO_BRIDGE,
                 .hooknum = NF_BR_FORWARD,
                 .priority = NF_BR_PRI_BRNF,
         },
         {
                 .hook = br_nf_post_routing,
                 .owner = THIS_MODULE,
-                .pf = PF_BRIDGE,
+                .pf = NFPROTO_BRIDGE,
                 .hooknum = NF_BR_POST_ROUTING,
                 .priority = NF_BR_PRI_LAST,
         },
         {
                 .hook = ip_sabotage_in,
                 .owner = THIS_MODULE,
-                .pf = PF_INET,
+                .pf = NFPROTO_IPV4,
                 .hooknum = NF_INET_PRE_ROUTING,
                 .priority = NF_IP_PRI_FIRST,
         },
         {
                 .hook = ip_sabotage_in,
                 .owner = THIS_MODULE,
-                .pf = PF_INET6,
+                .pf = NFPROTO_IPV6,
                 .hooknum = NF_INET_PRE_ROUTING,
                 .priority = NF_IP6_PRI_FIRST,
         },
diff --git a/net/bridge/netfilter/ebt_ulog.c b/net/bridge/netfilter/ebt_ulog.c
index 5449294bdd5..19063473c71 100644
--- a/net/bridge/netfilter/ebt_ulog.c
+++ b/net/bridge/netfilter/ebt_ulog.c
@@ -145,19 +145,24 @@ static void ebt_ulog_packet(unsigned int hooknr, const struct sk_buff *skb,
 
         if (!ub->skb) {
                 if (!(ub->skb = ulog_alloc_skb(size)))
-                        goto alloc_failure;
+                        goto unlock;
         } else if (size > skb_tailroom(ub->skb)) {
                 ulog_send(group);
 
                 if (!(ub->skb = ulog_alloc_skb(size)))
-                        goto alloc_failure;
+                        goto unlock;
         }
 
-        nlh = NLMSG_PUT(ub->skb, 0, ub->qlen, 0,
-                        size - NLMSG_ALIGN(sizeof(*nlh)));
+        nlh = nlmsg_put(ub->skb, 0, ub->qlen, 0,
+                        size - NLMSG_ALIGN(sizeof(*nlh)), 0);
+        if (!nlh) {
+                kfree_skb(ub->skb);
+                ub->skb = NULL;
+                goto unlock;
+        }
         ub->qlen++;
 
-        pm = NLMSG_DATA(nlh);
+        pm = nlmsg_data(nlh);
 
         /* Fill in the ulog data */
         pm->version = EBT_ULOG_VERSION;
@@ -209,14 +214,6 @@ static void ebt_ulog_packet(unsigned int hooknr, const struct sk_buff *skb,
 
 unlock:
         spin_unlock_bh(lock);
-
-        return;
-
-nlmsg_failure:
-        pr_debug("error during NLMSG_PUT. This should "
-                 "not happen, please report to author.\n");
-alloc_failure:
-        goto unlock;
 }
 
 /* this function is registered with the netfilter core */
@@ -285,6 +282,9 @@ static int __init ebt_ulog_init(void)
 {
         int ret;
         int i;
+        struct netlink_kernel_cfg cfg = {
+                .groups = EBT_ULOG_MAXNLGROUPS,
+        };
 
         if (nlbufsiz >= 128*1024) {
                 pr_warning("Netlink buffer has to be <= 128kB,"
@@ -299,8 +299,7 @@ static int __init ebt_ulog_init(void)
         }
 
         ebtulognl = netlink_kernel_create(&init_net, NETLINK_NFLOG,
-                                          EBT_ULOG_MAXNLGROUPS, NULL, NULL,
-                                          THIS_MODULE);
+                                          THIS_MODULE, &cfg);
         if (!ebtulognl)
                 ret = -ENOMEM;
         else if ((ret = xt_register_target(&ebt_ulog_tg_reg)) != 0)
diff --git a/net/caif/caif_dev.c b/net/caif/caif_dev.c
index 554b3128960..551d2fd6a80 100644
--- a/net/caif/caif_dev.c
+++ b/net/caif/caif_dev.c
@@ -90,11 +90,8 @@ static int caifd_refcnt_read(struct caif_device_entry *e)
 /* Allocate new CAIF device. */
 static struct caif_device_entry *caif_device_alloc(struct net_device *dev)
 {
-        struct caif_device_entry_list *caifdevs;
         struct caif_device_entry *caifd;
 
-        caifdevs = caif_device_list(dev_net(dev));
-
         caifd = kzalloc(sizeof(*caifd), GFP_KERNEL);
         if (!caifd)
                 return NULL;
@@ -131,6 +128,11 @@ void caif_flow_cb(struct sk_buff *skb)
 
         rcu_read_lock();
         caifd = caif_get(skb->dev);
+
+        WARN_ON(caifd == NULL);
+        if (caifd == NULL)
+                return;
+
         caifd_hold(caifd);
         rcu_read_unlock();
 
diff --git a/net/caif/cfctrl.c b/net/caif/cfctrl.c
index 047cd0eec02..44f270fc2d0 100644
--- a/net/caif/cfctrl.c
+++ b/net/caif/cfctrl.c
@@ -175,15 +175,17 @@ static void init_info(struct caif_payload_info *info, struct cfctrl *cfctrl)
 
 void cfctrl_enum_req(struct cflayer *layer, u8 physlinkid)
 {
+        struct cfpkt *pkt;
         struct cfctrl *cfctrl = container_obj(layer);
-        struct cfpkt *pkt = cfpkt_create(CFPKT_CTRL_PKT_LEN);
         struct cflayer *dn = cfctrl->serv.layer.dn;
-        if (!pkt)
-                return;
+
         if (!dn) {
                 pr_debug("not able to send enum request\n");
                 return;
         }
+        pkt = cfpkt_create(CFPKT_CTRL_PKT_LEN);
+        if (!pkt)
+                return;
         caif_assert(offsetof(struct cfctrl, serv.layer) == 0);
         init_info(cfpkt_info(pkt), cfctrl);
         cfpkt_info(pkt)->dev_info->id = physlinkid;
@@ -302,18 +304,17 @@ int cfctrl_linkdown_req(struct cflayer *layer, u8 channelid,
                                 struct cflayer *client)
 {
         int ret;
+        struct cfpkt *pkt;
         struct cfctrl *cfctrl = container_obj(layer);
-        struct cfpkt *pkt = cfpkt_create(CFPKT_CTRL_PKT_LEN);
         struct cflayer *dn = cfctrl->serv.layer.dn;
 
-        if (!pkt)
-                return -ENOMEM;
-
         if (!dn) {
                 pr_debug("not able to send link-down request\n");
                 return -ENODEV;
         }
-
+        pkt = cfpkt_create(CFPKT_CTRL_PKT_LEN);
+        if (!pkt)
+                return -ENOMEM;
         cfpkt_addbdy(pkt, CFCTRL_CMD_LINK_DESTROY);
         cfpkt_addbdy(pkt, channelid);
         init_info(cfpkt_info(pkt), cfctrl);
diff --git a/net/can/af_can.c b/net/can/af_can.c
index 0ce2ad0696d..821022a7214 100644
--- a/net/can/af_can.c
+++ b/net/can/af_can.c
@@ -41,6 +41,7 @@
  */
 
 #include <linux/module.h>
+#include <linux/stddef.h>
 #include <linux/init.h>
 #include <linux/kmod.h>
 #include <linux/slab.h>
@@ -220,30 +221,46 @@ static int can_create(struct net *net, struct socket *sock, int protocol,
  *  -ENOBUFS on full driver queue (see net_xmit_errno())
  *  -ENOMEM when local loopback failed at calling skb_clone()
  *  -EPERM when trying to send on a non-CAN interface
+ *  -EMSGSIZE CAN frame size is bigger than CAN interface MTU
  *  -EINVAL when the skb->data does not contain a valid CAN frame
  */
 int can_send(struct sk_buff *skb, int loop)
 {
         struct sk_buff *newskb = NULL;
-        struct can_frame *cf = (struct can_frame *)skb->data;
-        int err;
+        struct canfd_frame *cfd = (struct canfd_frame *)skb->data;
+        int err = -EINVAL;
+
+        if (skb->len == CAN_MTU) {
+                skb->protocol = htons(ETH_P_CAN);
+                if (unlikely(cfd->len > CAN_MAX_DLEN))
+                        goto inval_skb;
+        } else if (skb->len == CANFD_MTU) {
+                skb->protocol = htons(ETH_P_CANFD);
+                if (unlikely(cfd->len > CANFD_MAX_DLEN))
+                        goto inval_skb;
+        } else
+                goto inval_skb;
 
-        if (skb->len != sizeof(struct can_frame) || cf->can_dlc > 8) {
-                kfree_skb(skb);
-                return -EINVAL;
+        /*
+         * Make sure the CAN frame can pass the selected CAN netdevice.
+         * As structs can_frame and canfd_frame are similar, we can provide
+         * CAN FD frames to legacy CAN drivers as long as the length is <= 8
+         */
+        if (unlikely(skb->len > skb->dev->mtu && cfd->len > CAN_MAX_DLEN)) {
+                err = -EMSGSIZE;
+                goto inval_skb;
         }
 
-        if (skb->dev->type != ARPHRD_CAN) {
-                kfree_skb(skb);
-                return -EPERM;
+        if (unlikely(skb->dev->type != ARPHRD_CAN)) {
+                err = -EPERM;
+                goto inval_skb;
         }
 
-        if (!(skb->dev->flags & IFF_UP)) {
-                kfree_skb(skb);
-                return -ENETDOWN;
+        if (unlikely(!(skb->dev->flags & IFF_UP))) {
+                err = -ENETDOWN;
+                goto inval_skb;
         }
 
-        skb->protocol = htons(ETH_P_CAN);
         skb_reset_network_header(skb);
         skb_reset_transport_header(skb);
 
@@ -300,6 +317,10 @@ int can_send(struct sk_buff *skb, int loop)
         can_stats.tx_frames_delta++;
 
         return 0;
+
+inval_skb:
+        kfree_skb(skb);
+        return err;
 }
 EXPORT_SYMBOL(can_send);
 
@@ -334,8 +355,8 @@ static struct dev_rcv_lists *find_dev_rcv_lists(struct net_device *dev)
  *  relevant bits for the filter.
  *
  *  The filter can be inverted (CAN_INV_FILTER bit set in can_id) or it can
- *  filter for error frames (CAN_ERR_FLAG bit set in mask). For error frames
- *  there is a special filterlist and a special rx path filter handling.
+ *  filter for error messages (CAN_ERR_FLAG bit set in mask). For error msg
+ *  frames there is a special filterlist and a special rx path filter handling.
  *
  * Return:
  *  Pointer to optimal filterlist for the given can_id/mask pair.
@@ -347,7 +368,7 @@ static struct hlist_head *find_rcv_list(canid_t *can_id, canid_t *mask,
 {
         canid_t inv = *can_id & CAN_INV_FILTER; /* save flag before masking */
 
-        /* filter for error frames in extra filterlist */
+        /* filter for error message frames in extra filterlist */
         if (*mask & CAN_ERR_FLAG) {
                 /* clear CAN_ERR_FLAG in filter entry */
                 *mask &= CAN_ERR_MASK;
@@ -408,7 +429,7 @@ static struct hlist_head *find_rcv_list(canid_t *can_id, canid_t *mask,
  *          <received_can_id> & mask == can_id & mask
  *
  *  The filter can be inverted (CAN_INV_FILTER bit set in can_id) or it can
- *  filter for error frames (CAN_ERR_FLAG bit set in mask).
+ *  filter for error message frames (CAN_ERR_FLAG bit set in mask).
  *
  *  The provided pointer to the sk_buff is guaranteed to be valid as long as
  *  the callback function is running. The callback function must *not* free
@@ -578,7 +599,7 @@ static int can_rcv_filter(struct dev_rcv_lists *d, struct sk_buff *skb)
                 return 0;
 
         if (can_id & CAN_ERR_FLAG) {
-                /* check for error frame entries only */
+                /* check for error message frame entries only */
                 hlist_for_each_entry_rcu(r, n, &d->rx[RX_ERR], list) {
                         if (can_id & r->mask) {
                                 deliver(skb, r);
@@ -632,24 +653,11 @@ static int can_rcv_filter(struct dev_rcv_lists *d, struct sk_buff *skb)
         return matches;
 }
 
-static int can_rcv(struct sk_buff *skb, struct net_device *dev,
-                   struct packet_type *pt, struct net_device *orig_dev)
+static void can_receive(struct sk_buff *skb, struct net_device *dev)
 {
         struct dev_rcv_lists *d;
-        struct can_frame *cf = (struct can_frame *)skb->data;
         int matches;
 
-        if (!net_eq(dev_net(dev), &init_net))
-                goto drop;
-
-        if (WARN_ONCE(dev->type != ARPHRD_CAN ||
-                      skb->len != sizeof(struct can_frame) ||
-                      cf->can_dlc > 8,
-                      "PF_CAN: dropped non conform skbuf: "
-                      "dev type %d, len %d, can_dlc %d\n",
-                      dev->type, skb->len, cf->can_dlc))
-                goto drop;
-
         /* update statistics */
         can_stats.rx_frames++;
         can_stats.rx_frames_delta++;
@@ -673,7 +681,49 @@ static int can_rcv(struct sk_buff *skb, struct net_device *dev,
                 can_stats.matches++;
                 can_stats.matches_delta++;
         }
+}
 
+static int can_rcv(struct sk_buff *skb, struct net_device *dev,
+                   struct packet_type *pt, struct net_device *orig_dev)
+{
+        struct canfd_frame *cfd = (struct canfd_frame *)skb->data;
+
+        if (unlikely(!net_eq(dev_net(dev), &init_net)))
+                goto drop;
+
+        if (WARN_ONCE(dev->type != ARPHRD_CAN ||
+                      skb->len != CAN_MTU ||
+                      cfd->len > CAN_MAX_DLEN,
+                      "PF_CAN: dropped non conform CAN skbuf: "
+                      "dev type %d, len %d, datalen %d\n",
+                      dev->type, skb->len, cfd->len))
+                goto drop;
+
+        can_receive(skb, dev);
+        return NET_RX_SUCCESS;
+
+drop:
+        kfree_skb(skb);
+        return NET_RX_DROP;
+}
+
+static int canfd_rcv(struct sk_buff *skb, struct net_device *dev,
+                   struct packet_type *pt, struct net_device *orig_dev)
+{
+        struct canfd_frame *cfd = (struct canfd_frame *)skb->data;
+
+        if (unlikely(!net_eq(dev_net(dev), &init_net)))
+                goto drop;
+
+        if (WARN_ONCE(dev->type != ARPHRD_CAN ||
+                      skb->len != CANFD_MTU ||
+                      cfd->len > CANFD_MAX_DLEN,
+                      "PF_CAN: dropped non conform CAN FD skbuf: "
+                      "dev type %d, len %d, datalen %d\n",
+                      dev->type, skb->len, cfd->len))
+                goto drop;
+
+        can_receive(skb, dev);
         return NET_RX_SUCCESS;
 
 drop:
@@ -807,10 +857,14 @@ static int can_notifier(struct notifier_block *nb, unsigned long msg,
 
 static struct packet_type can_packet __read_mostly = {
         .type = cpu_to_be16(ETH_P_CAN),
-        .dev  = NULL,
         .func = can_rcv,
 };
 
+static struct packet_type canfd_packet __read_mostly = {
+        .type = cpu_to_be16(ETH_P_CANFD),
+        .func = canfd_rcv,
+};
+
 static const struct net_proto_family can_family_ops = {
         .family = PF_CAN,
         .create = can_create,
@@ -824,6 +878,12 @@ static struct notifier_block can_netdev_notifier __read_mostly = {
 
 static __init int can_init(void)
 {
+        /* check for correct padding to be able to use the structs similarly */
+        BUILD_BUG_ON(offsetof(struct can_frame, can_dlc) !=
+                     offsetof(struct canfd_frame, len) ||
+                     offsetof(struct can_frame, data) !=
+                     offsetof(struct canfd_frame, data));
+
         printk(banner);
 
         memset(&can_rx_alldev_list, 0, sizeof(can_rx_alldev_list));
@@ -846,6 +906,7 @@ static __init int can_init(void)
         sock_register(&can_family_ops);
         register_netdevice_notifier(&can_netdev_notifier);
         dev_add_pack(&can_packet);
+        dev_add_pack(&canfd_packet);
 
         return 0;
 }
@@ -860,6 +921,7 @@ static __exit void can_exit(void)
         can_remove_proc();
 
         /* protocol unregister */
+        dev_remove_pack(&canfd_packet);
         dev_remove_pack(&can_packet);
         unregister_netdevice_notifier(&can_netdev_notifier);
         sock_unregister(PF_CAN);
diff --git a/net/can/af_can.h b/net/can/af_can.h
index fd882dbadad..1dccb4c3389 100644
--- a/net/can/af_can.h
+++ b/net/can/af_can.h
@@ -104,6 +104,9 @@ struct s_pstats {
         unsigned long rcv_entries_max;
 };
 
+/* receive filters subscribed for 'all' CAN devices */
+extern struct dev_rcv_lists can_rx_alldev_list;
+
 /* function prototypes for the CAN networklayer procfs (proc.c) */
 extern void can_init_proc(void);
 extern void can_remove_proc(void);
diff --git a/net/can/proc.c b/net/can/proc.c
index ba873c36d2f..3b6dd318049 100644
--- a/net/can/proc.c
+++ b/net/can/proc.c
@@ -83,9 +83,6 @@ static const char rx_list_name[][8] = {
         [RX_EFF] = "rx_eff",
 };
 
-/* receive filters subscribed for 'all' CAN devices */
-extern struct dev_rcv_lists can_rx_alldev_list;
-
 /*
  * af_can statistics stuff
  */
diff --git a/net/can/raw.c b/net/can/raw.c
index 46cca3a91d1..3e9c89356a9 100644
--- a/net/can/raw.c
+++ b/net/can/raw.c
@@ -82,6 +82,7 @@ struct raw_sock {
         struct notifier_block notifier;
         int loopback;
         int recv_own_msgs;
+        int fd_frames;
         int count;                 /* number of active filters */
         struct can_filter dfilter; /* default/single filter */
         struct can_filter *filter; /* pointer to filter(s) */
@@ -119,6 +120,14 @@ static void raw_rcv(struct sk_buff *oskb, void *data)
         if (!ro->recv_own_msgs && oskb->sk == sk)
                 return;
 
+        /* do not pass frames with DLC > 8 to a legacy socket */
+        if (!ro->fd_frames) {
+                struct canfd_frame *cfd = (struct canfd_frame *)oskb->data;
+
+                if (unlikely(cfd->len > CAN_MAX_DLEN))
+                        return;
+        }
+
         /* clone the given skb to be able to enqueue it into the rcv queue */
         skb = skb_clone(oskb, GFP_ATOMIC);
         if (!skb)
@@ -291,6 +300,7 @@ static int raw_init(struct sock *sk)
         /* set default loopback behaviour */
         ro->loopback         = 1;
         ro->recv_own_msgs    = 0;
+        ro->fd_frames        = 0;
 
         /* set notifier */
         ro->notifier.notifier_call = raw_notifier;
@@ -569,6 +579,15 @@ static int raw_setsockopt(struct socket *sock, int level, int optname,
 
                 break;
 
+        case CAN_RAW_FD_FRAMES:
+                if (optlen != sizeof(ro->fd_frames))
+                        return -EINVAL;
+
+                if (copy_from_user(&ro->fd_frames, optval, optlen))
+                        return -EFAULT;
+
+                break;
+
         default:
                 return -ENOPROTOOPT;
         }
@@ -627,6 +646,12 @@ static int raw_getsockopt(struct socket *sock, int level, int optname,
                 val = &ro->recv_own_msgs;
                 break;
 
+        case CAN_RAW_FD_FRAMES:
+                if (len > sizeof(int))
+                        len = sizeof(int);
+                val = &ro->fd_frames;
+                break;
+
         default:
                 return -ENOPROTOOPT;
         }
@@ -662,8 +687,13 @@ static int raw_sendmsg(struct kiocb *iocb, struct socket *sock,
         } else
                 ifindex = ro->ifindex;
 
-        if (size != sizeof(struct can_frame))
-                return -EINVAL;
+        if (ro->fd_frames) {
+                if (unlikely(size != CANFD_MTU && size != CAN_MTU))
+                        return -EINVAL;
+        } else {
+                if (unlikely(size != CAN_MTU))
+                        return -EINVAL;
+        }
 
         dev = dev_get_by_index(&init_net, ifindex);
         if (!dev)
@@ -705,7 +735,9 @@ static int raw_recvmsg(struct kiocb *iocb, struct socket *sock,
                        struct msghdr *msg, size_t size, int flags)
 {
         struct sock *sk = sock->sk;
+        struct raw_sock *ro = raw_sk(sk);
         struct sk_buff *skb;
+        int rxmtu;
         int err = 0;
         int noblock;
 
@@ -716,10 +748,20 @@ static int raw_recvmsg(struct kiocb *iocb, struct socket *sock,
         if (!skb)
                 return err;
 
-        if (size < skb->len)
+        /*
+         * when serving a legacy socket the DLC <= 8 is already checked inside
+         * raw_rcv(). Now check if we need to pass a canfd_frame to a legacy
+         * socket and cut the possible CANFD_MTU/CAN_MTU length to CAN_MTU
+         */
+        if (!ro->fd_frames)
+                rxmtu = CAN_MTU;
+        else
+                rxmtu = skb->len;
+
+        if (size < rxmtu)
                 msg->msg_flags |= MSG_TRUNC;
         else
-                size = skb->len;
+                size = rxmtu;
 
         err = memcpy_toiovec(msg->msg_iov, skb->data, size);
         if (err < 0) {
diff --git a/net/ceph/pagelist.c b/net/ceph/pagelist.c
index 13cb409a7bb..665cd23020f 100644
--- a/net/ceph/pagelist.c
+++ b/net/ceph/pagelist.c
@@ -72,8 +72,7 @@ int ceph_pagelist_append(struct ceph_pagelist *pl, const void *buf, size_t len)
 }
 EXPORT_SYMBOL(ceph_pagelist_append);
 
-/**
- * Allocate enough pages for a pagelist to append the given amount
+/* Allocate enough pages for a pagelist to append the given amount
  * of data without without allocating.
  * Returns: 0 on success, -ENOMEM on error.
  */
@@ -95,9 +94,7 @@ int ceph_pagelist_reserve(struct ceph_pagelist *pl, size_t space)
 }
 EXPORT_SYMBOL(ceph_pagelist_reserve);
 
-/**
- * Free any pages that have been preallocated.
- */
+/* Free any pages that have been preallocated. */
 int ceph_pagelist_free_reserve(struct ceph_pagelist *pl)
 {
         while (!list_empty(&pl->free_list)) {
@@ -112,9 +109,7 @@ int ceph_pagelist_free_reserve(struct ceph_pagelist *pl)
 }
 EXPORT_SYMBOL(ceph_pagelist_free_reserve);
 
-/**
- * Create a truncation point.
- */
+/* Create a truncation point. */
 void ceph_pagelist_set_cursor(struct ceph_pagelist *pl,
                               struct ceph_pagelist_cursor *c)
 {
@@ -124,8 +119,7 @@ void ceph_pagelist_set_cursor(struct ceph_pagelist *pl,
 }
 EXPORT_SYMBOL(ceph_pagelist_set_cursor);
 
-/**
- * Truncate a pagelist to the given point. Move extra pages to reserve.
+/* Truncate a pagelist to the given point. Move extra pages to reserve.
  * This won't sleep.
  * Returns: 0 on success,
  *          -EINVAL if the pagelist doesn't match the trunc point pagelist
diff --git a/net/core/datagram.c b/net/core/datagram.c
index ae6acf6a3de..0337e2b7686 100644
--- a/net/core/datagram.c
+++ b/net/core/datagram.c
@@ -248,7 +248,6 @@ void skb_free_datagram_locked(struct sock *sk, struct sk_buff *skb)
         unlock_sock_fast(sk, slow);
 
         /* skb is now orphaned, can be freed outside of locked section */
-        trace_kfree_skb(skb, skb_free_datagram_locked);
         __kfree_skb(skb);
 }
 EXPORT_SYMBOL(skb_free_datagram_locked);
diff --git a/net/core/dev.c b/net/core/dev.c
index 0f28a9e0b8a..73e87c7b437 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -1691,7 +1691,8 @@ static void dev_queue_xmit_nit(struct sk_buff *skb, struct net_device *dev)
         rcu_read_unlock();
 }
 
-/* netif_setup_tc - Handle tc mappings on real_num_tx_queues change
+/**
+ * netif_setup_tc - Handle tc mappings on real_num_tx_queues change
  * @dev: Network device
  * @txq: number of queues available
  *
@@ -1793,6 +1794,18 @@ int netif_set_real_num_rx_queues(struct net_device *dev, unsigned int rxq)
 EXPORT_SYMBOL(netif_set_real_num_rx_queues);
 #endif
 
+/**
+ * netif_get_num_default_rss_queues - default number of RSS queues
+ *
+ * This routine should set an upper limit on the number of RSS queues
+ * used by default by multiqueue devices.
+ */
+int netif_get_num_default_rss_queues(void)
+{
+        return min_t(int, DEFAULT_MAX_NUM_RSS_QUEUES, num_online_cpus());
+}
+EXPORT_SYMBOL(netif_get_num_default_rss_queues);
+
 static inline void __netif_reschedule(struct Qdisc *q)
 {
         struct softnet_data *sd;
@@ -2459,6 +2472,23 @@ static DEFINE_PER_CPU(int, xmit_recursion);
 #define RECURSION_LIMIT 10
 
 /**
+ *      dev_loopback_xmit - loop back @skb
+ *      @skb: buffer to transmit
+ */
+int dev_loopback_xmit(struct sk_buff *skb)
+{
+        skb_reset_mac_header(skb);
+        __skb_pull(skb, skb_network_offset(skb));
+        skb->pkt_type = PACKET_LOOPBACK;
+        skb->ip_summed = CHECKSUM_UNNECESSARY;
+        WARN_ON(!skb_dst(skb));
+        skb_dst_force(skb);
+        netif_rx_ni(skb);
+        return 0;
+}
+EXPORT_SYMBOL(dev_loopback_xmit);
+
+/**
  *      dev_queue_xmit - transmit a buffer
  *      @skb: buffer to transmit
  *
@@ -5646,7 +5676,7 @@ int netdev_refcnt_read(const struct net_device *dev)
 }
 EXPORT_SYMBOL(netdev_refcnt_read);
 
-/*
+/**
  * netdev_wait_allrefs - wait until all references are gone.
  *
  * This is called when unregistering network devices.
diff --git a/net/core/dst.c b/net/core/dst.c
index 43d94cedbf7..07bacff84aa 100644
--- a/net/core/dst.c
+++ b/net/core/dst.c
@@ -152,7 +152,7 @@ EXPORT_SYMBOL(dst_discard);
 const u32 dst_default_metrics[RTAX_MAX];
 
 void *dst_alloc(struct dst_ops *ops, struct net_device *dev,
-                int initial_ref, int initial_obsolete, int flags)
+                int initial_ref, int initial_obsolete, unsigned short flags)
 {
         struct dst_entry *dst;
 
@@ -171,7 +171,6 @@ void *dst_alloc(struct dst_ops *ops, struct net_device *dev,
         dst_init_metrics(dst, dst_default_metrics, true);
         dst->expires = 0UL;
         dst->path = dst;
-        RCU_INIT_POINTER(dst->_neighbour, NULL);
 #ifdef CONFIG_XFRM
         dst->xfrm = NULL;
 #endif
@@ -188,6 +187,7 @@ void *dst_alloc(struct dst_ops *ops, struct net_device *dev,
         dst->__use = 0;
         dst->lastuse = jiffies;
         dst->flags = flags;
+        dst->pending_confirm = 0;
         dst->next = NULL;
         if (!(flags & DST_NOCOUNT))
                 dst_entries_add(ops, 1);
@@ -224,19 +224,12 @@ EXPORT_SYMBOL(__dst_free);
 struct dst_entry *dst_destroy(struct dst_entry * dst)
 {
         struct dst_entry *child;
-        struct neighbour *neigh;
 
         smp_rmb();
 
 again:
-        neigh = rcu_dereference_protected(dst->_neighbour, 1);
         child = dst->child;
 
-        if (neigh) {
-                RCU_INIT_POINTER(dst->_neighbour, NULL);
-                neigh_release(neigh);
-        }
-
         if (!(dst->flags & DST_NOCOUNT))
                 dst_entries_add(dst->ops, -1);
 
@@ -360,19 +353,9 @@ static void dst_ifdown(struct dst_entry *dst, struct net_device *dev,
         if (!unregister) {
                 dst->input = dst->output = dst_discard;
         } else {
-                struct neighbour *neigh;
-
                 dst->dev = dev_net(dst->dev)->loopback_dev;
                 dev_hold(dst->dev);
                 dev_put(dev);
-                rcu_read_lock();
-                neigh = dst_get_neighbour_noref(dst);
-                if (neigh && neigh->dev == dev) {
-                        neigh->dev = dst->dev;
-                        dev_hold(dst->dev);
-                        dev_put(dev);
-                }
-                rcu_read_unlock();
         }
 }
 
diff --git a/net/core/ethtool.c b/net/core/ethtool.c
index 9c2afb48027..cbf033dcaf1 100644
--- a/net/core/ethtool.c
+++ b/net/core/ethtool.c
@@ -729,6 +729,40 @@ static int ethtool_set_wol(struct net_device *dev, char __user *useraddr)
         return dev->ethtool_ops->set_wol(dev, &wol);
 }
 
+static int ethtool_get_eee(struct net_device *dev, char __user *useraddr)
+{
+        struct ethtool_eee edata;
+        int rc;
+
+        if (!dev->ethtool_ops->get_eee)
+                return -EOPNOTSUPP;
+
+        memset(&edata, 0, sizeof(struct ethtool_eee));
+        edata.cmd = ETHTOOL_GEEE;
+        rc = dev->ethtool_ops->get_eee(dev, &edata);
+
+        if (rc)
+                return rc;
+
+        if (copy_to_user(useraddr, &edata, sizeof(edata)))
+                return -EFAULT;
+
+        return 0;
+}
+
+static int ethtool_set_eee(struct net_device *dev, char __user *useraddr)
+{
+        struct ethtool_eee edata;
+
+        if (!dev->ethtool_ops->set_eee)
+                return -EOPNOTSUPP;
+
+        if (copy_from_user(&edata, useraddr, sizeof(edata)))
+                return -EFAULT;
+
+        return dev->ethtool_ops->set_eee(dev, &edata);
+}
+
 static int ethtool_nway_reset(struct net_device *dev)
 {
         if (!dev->ethtool_ops->nway_reset)
@@ -1409,6 +1443,7 @@ int dev_ethtool(struct net *net, struct ifreq *ifr)
         case ETHTOOL_GSET:
         case ETHTOOL_GDRVINFO:
         case ETHTOOL_GMSGLVL:
+        case ETHTOOL_GLINK:
         case ETHTOOL_GCOALESCE:
         case ETHTOOL_GRINGPARAM:
         case ETHTOOL_GPAUSEPARAM:
@@ -1417,6 +1452,7 @@ int dev_ethtool(struct net *net, struct ifreq *ifr)
         case ETHTOOL_GSG:
         case ETHTOOL_GSSET_INFO:
         case ETHTOOL_GSTRINGS:
+        case ETHTOOL_GSTATS:
         case ETHTOOL_GTSO:
         case ETHTOOL_GPERMADDR:
         case ETHTOOL_GUFO:
@@ -1429,8 +1465,11 @@ int dev_ethtool(struct net *net, struct ifreq *ifr)
         case ETHTOOL_GRXCLSRLCNT:
         case ETHTOOL_GRXCLSRULE:
         case ETHTOOL_GRXCLSRLALL:
+        case ETHTOOL_GRXFHINDIR:
         case ETHTOOL_GFEATURES:
+        case ETHTOOL_GCHANNELS:
         case ETHTOOL_GET_TS_INFO:
+        case ETHTOOL_GEEE:
                 break;
         default:
                 if (!capable(CAP_NET_ADMIN))
@@ -1471,6 +1510,12 @@ int dev_ethtool(struct net *net, struct ifreq *ifr)
                 rc = ethtool_set_value_void(dev, useraddr,
                                        dev->ethtool_ops->set_msglevel);
                 break;
+        case ETHTOOL_GEEE:
+                rc = ethtool_get_eee(dev, useraddr);
+                break;
+        case ETHTOOL_SEEE:
+                rc = ethtool_set_eee(dev, useraddr);
+                break;
         case ETHTOOL_NWAY_RST:
                 rc = ethtool_nway_reset(dev);
                 break;
diff --git a/net/core/fib_rules.c b/net/core/fib_rules.c
index 72cceb79d0d..ab7db83236c 100644
--- a/net/core/fib_rules.c
+++ b/net/core/fib_rules.c
@@ -151,6 +151,8 @@ static void fib_rules_cleanup_ops(struct fib_rules_ops *ops)
 
         list_for_each_entry_safe(rule, tmp, &ops->rules_list, list) {
                 list_del_rcu(&rule->list);
+                if (ops->delete)
+                        ops->delete(rule);
                 fib_rule_put(rule);
         }
 }
@@ -499,6 +501,8 @@ static int fib_nl_delrule(struct sk_buff *skb, struct nlmsghdr* nlh, void *arg)
 
                 notify_rule_change(RTM_DELRULE, rule, ops, nlh,
                                    NETLINK_CB(skb).pid);
+                if (ops->delete)
+                        ops->delete(rule);
                 fib_rule_put(rule);
                 flush_route_cache(ops);
                 rules_ops_put(ops);
diff --git a/net/core/neighbour.c b/net/core/neighbour.c
index d81d026138f..117afaf5126 100644
--- a/net/core/neighbour.c
+++ b/net/core/neighbour.c
@@ -474,8 +474,8 @@ struct neighbour *neigh_lookup_nodev(struct neigh_table *tbl, struct net *net,
 }
 EXPORT_SYMBOL(neigh_lookup_nodev);
 
-struct neighbour *neigh_create(struct neigh_table *tbl, const void *pkey,
-                               struct net_device *dev)
+struct neighbour *__neigh_create(struct neigh_table *tbl, const void *pkey,
+                                 struct net_device *dev, bool want_ref)
 {
         u32 hash_val;
         int key_len = tbl->key_len;
@@ -535,14 +535,16 @@ struct neighbour *neigh_create(struct neigh_table *tbl, const void *pkey,
              n1 = rcu_dereference_protected(n1->next,
                         lockdep_is_held(&tbl->lock))) {
                 if (dev == n1->dev && !memcmp(n1->primary_key, pkey, key_len)) {
-                        neigh_hold(n1);
+                        if (want_ref)
+                                neigh_hold(n1);
                         rc = n1;
                         goto out_tbl_unlock;
                 }
         }
 
         n->dead = 0;
-        neigh_hold(n);
+        if (want_ref)
+                neigh_hold(n);
         rcu_assign_pointer(n->next,
                            rcu_dereference_protected(nht->hash_buckets[hash_val],
                                                      lockdep_is_held(&tbl->lock)));
@@ -558,7 +560,7 @@ out_neigh_release:
         neigh_release(n);
         goto out;
 }
-EXPORT_SYMBOL(neigh_create);
+EXPORT_SYMBOL(__neigh_create);
 
 static u32 pneigh_hash(const void *pkey, int key_len)
 {
@@ -1199,10 +1201,23 @@ int neigh_update(struct neighbour *neigh, const u8 *lladdr, u8 new,
                         write_unlock_bh(&neigh->lock);
 
                         rcu_read_lock();
-                        /* On shaper/eql skb->dst->neighbour != neigh :( */
-                        if (dst && (n2 = dst_get_neighbour_noref(dst)) != NULL)
-                                n1 = n2;
+
+                        /* Why not just use 'neigh' as-is?  The problem is that
+                         * things such as shaper, eql, and sch_teql can end up
+                         * using alternative, different, neigh objects to output
+                         * the packet in the output path.  So what we need to do
+                         * here is re-lookup the top-level neigh in the path so
+                         * we can reinject the packet there.
+                         */
+                        n2 = NULL;
+                        if (dst) {
+                                n2 = dst_neigh_lookup_skb(dst, skb);
+                                if (n2)
+                                        n1 = n2;
+                        }
                         n1->output(n1, skb);
+                        if (n2)
+                                neigh_release(n2);
                         rcu_read_unlock();
 
                         write_lock_bh(&neigh->lock);
diff --git a/net/core/net-sysfs.c b/net/core/net-sysfs.c
index fdf9e61d065..72607174ea5 100644
--- a/net/core/net-sysfs.c
+++ b/net/core/net-sysfs.c
@@ -417,72 +417,6 @@ static struct attribute_group netstat_group = {
         .name  = "statistics",
         .attrs  = netstat_attrs,
 };
-
-#ifdef CONFIG_WIRELESS_EXT_SYSFS
-/* helper function that does all the locking etc for wireless stats */
-static ssize_t wireless_show(struct device *d, char *buf,
-                             ssize_t (*format)(const struct iw_statistics *,
-                                               char *))
-{
-        struct net_device *dev = to_net_dev(d);
-        const struct iw_statistics *iw;
-        ssize_t ret = -EINVAL;
-
-        if (!rtnl_trylock())
-                return restart_syscall();
-        if (dev_isalive(dev)) {
-                iw = get_wireless_stats(dev);
-                if (iw)
-                        ret = (*format)(iw, buf);
-        }
-        rtnl_unlock();
-
-        return ret;
-}
-
-/* show function template for wireless fields */
-#define WIRELESS_SHOW(name, field, format_string)                       \
-static ssize_t format_iw_##name(const struct iw_statistics *iw, char *buf) \
-{                                                                       \
-        return sprintf(buf, format_string, iw->field);                  \
-}                                                                       \
-static ssize_t show_iw_##name(struct device *d,                         \
-                              struct device_attribute *attr, char *buf) \
-{                                                                       \
-        return wireless_show(d, buf, format_iw_##name);                 \
-}                                                                       \
-static DEVICE_ATTR(name, S_IRUGO, show_iw_##name, NULL)
-
-WIRELESS_SHOW(status, status, fmt_hex);
-WIRELESS_SHOW(link, qual.qual, fmt_dec);
-WIRELESS_SHOW(level, qual.level, fmt_dec);
-WIRELESS_SHOW(noise, qual.noise, fmt_dec);
-WIRELESS_SHOW(nwid, discard.nwid, fmt_dec);
-WIRELESS_SHOW(crypt, discard.code, fmt_dec);
-WIRELESS_SHOW(fragment, discard.fragment, fmt_dec);
-WIRELESS_SHOW(misc, discard.misc, fmt_dec);
-WIRELESS_SHOW(retries, discard.retries, fmt_dec);
-WIRELESS_SHOW(beacon, miss.beacon, fmt_dec);
-
-static struct attribute *wireless_attrs[] = {
-        &dev_attr_status.attr,
-        &dev_attr_link.attr,
-        &dev_attr_level.attr,
-        &dev_attr_noise.attr,
-        &dev_attr_nwid.attr,
-        &dev_attr_crypt.attr,
-        &dev_attr_fragment.attr,
-        &dev_attr_retries.attr,
-        &dev_attr_misc.attr,
-        &dev_attr_beacon.attr,
-        NULL
-};
-
-static struct attribute_group wireless_group = {
-        .name = "wireless",
-        .attrs = wireless_attrs,
-};
-#endif
 #endif /* CONFIG_SYSFS */
 
 #ifdef CONFIG_RPS
@@ -1463,14 +1397,6 @@ int netdev_register_kobject(struct net_device *net)
                 groups++;
 
         *groups++ = &netstat_group;
-#ifdef CONFIG_WIRELESS_EXT_SYSFS
-        if (net->ieee80211_ptr)
-                *groups++ = &wireless_group;
-#ifdef CONFIG_WIRELESS_EXT
-        else if (net->wireless_handlers)
-                *groups++ = &wireless_group;
-#endif
-#endif
 #endif /* CONFIG_SYSFS */
 
         error = device_add(dev);
diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
index 21318d15bbc..045db8ad87c 100644
--- a/net/core/rtnetlink.c
+++ b/net/core/rtnetlink.c
@@ -541,19 +541,6 @@ static const int rta_max[RTM_NR_FAMILIES] =
         [RTM_FAM(RTM_NEWACTION)]    = TCAA_MAX,
 };
 
-void __rta_fill(struct sk_buff *skb, int attrtype, int attrlen, const void *data)
-{
-        struct rtattr *rta;
-        int size = RTA_LENGTH(attrlen);
-
-        rta = (struct rtattr *)skb_put(skb, RTA_ALIGN(size));
-        rta->rta_type = attrtype;
-        rta->rta_len = size;
-        memcpy(RTA_DATA(rta), data, attrlen);
-        memset(RTA_DATA(rta) + attrlen, 0, RTA_ALIGN(size) - size);
-}
-EXPORT_SYMBOL(__rta_fill);
-
 int rtnetlink_send(struct sk_buff *skb, struct net *net, u32 pid, unsigned int group, int echo)
 {
         struct sock *rtnl = net->rtnl;
@@ -628,7 +615,7 @@ nla_put_failure:
 EXPORT_SYMBOL(rtnetlink_put_metrics);
 
 int rtnl_put_cacheinfo(struct sk_buff *skb, struct dst_entry *dst, u32 id,
-                       u32 ts, u32 tsage, long expires, u32 error)
+                       long expires, u32 error)
 {
         struct rta_cacheinfo ci = {
                 .rta_lastuse = jiffies_to_clock_t(jiffies - dst->lastuse),
@@ -636,8 +623,6 @@ int rtnl_put_cacheinfo(struct sk_buff *skb, struct dst_entry *dst, u32 id,
                 .rta_clntref = atomic_read(&(dst->__refcnt)),
                 .rta_error = error,
                 .rta_id =  id,
-                .rta_ts = ts,
-                .rta_tsage = tsage,
         };
 
         if (expires)
@@ -2189,7 +2174,7 @@ skip:
 }
 
 /**
- * ndo_dflt_fdb_dump: default netdevice operation to dump an FDB table.
+ * ndo_dflt_fdb_dump - default netdevice operation to dump an FDB table.
  * @nlh: netlink message header
  * @dev: netdevice
  *
@@ -2366,8 +2351,13 @@ static struct notifier_block rtnetlink_dev_notifier = {
 static int __net_init rtnetlink_net_init(struct net *net)
 {
         struct sock *sk;
-        sk = netlink_kernel_create(net, NETLINK_ROUTE, RTNLGRP_MAX,
-                                   rtnetlink_rcv, &rtnl_mutex, THIS_MODULE);
+        struct netlink_kernel_cfg cfg = {
+                .groups         = RTNLGRP_MAX,
+                .input          = rtnetlink_rcv,
+                .cb_mutex       = &rtnl_mutex,
+        };
+
+        sk = netlink_kernel_create(net, NETLINK_ROUTE, THIS_MODULE, &cfg);
         if (!sk)
                 return -ENOMEM;
         net->rtnl = sk;
diff --git a/net/core/skbuff.c b/net/core/skbuff.c
index 46a3d23d259..506f678e9d9 100644
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
@@ -160,8 +160,8 @@ static void skb_under_panic(struct sk_buff *skb, int sz, void *here)
  *      @node: numa node to allocate memory on
  *
  *      Allocate a new &sk_buff. The returned buffer has no headroom and a
- *      tail room of size bytes. The object has a reference count of one.
- *      The return is the buffer. On a failure the return is %NULL.
+ *      tail room of at least size bytes. The object has a reference count
+ *      of one. The return is the buffer. On a failure the return is %NULL.
  *
  *      Buffers may only be allocated from interrupts using a @gfp_mask of
  *      %GFP_ATOMIC.
@@ -713,7 +713,8 @@ struct sk_buff *skb_morph(struct sk_buff *dst, struct sk_buff *src)
 }
 EXPORT_SYMBOL_GPL(skb_morph);
 
-/*      skb_copy_ubufs  -       copy userspace skb frags buffers to kernel
+/**
+ *      skb_copy_ubufs  -       copy userspace skb frags buffers to kernel
  *      @skb: the skb to modify
  *      @gfp_mask: allocation priority
  *
@@ -2614,7 +2615,7 @@ unsigned int skb_find_text(struct sk_buff *skb, unsigned int from,
 EXPORT_SYMBOL(skb_find_text);
 
 /**
- * skb_append_datato_frags: - append the user data to a skb
+ * skb_append_datato_frags - append the user data to a skb
  * @sk: sock  structure
  * @skb: skb structure to be appened with user data.
  * @getfrag: call back function to be used for getting the user data
diff --git a/net/core/sock.c b/net/core/sock.c
index 9e5b71fda6e..929bdcc2383 100644
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -1465,6 +1465,11 @@ void sock_rfree(struct sk_buff *skb)
 }
 EXPORT_SYMBOL(sock_rfree);
 
+void sock_edemux(struct sk_buff *skb)
+{
+        sock_put(skb->sk);
+}
+EXPORT_SYMBOL(sock_edemux);
 
 int sock_i_uid(struct sock *sk)
 {
diff --git a/net/core/sock_diag.c b/net/core/sock_diag.c
index 5fd146720f3..07a29eb34a4 100644
--- a/net/core/sock_diag.c
+++ b/net/core/sock_diag.c
@@ -4,7 +4,6 @@
 #include <net/netlink.h>
 #include <net/net_namespace.h>
 #include <linux/module.h>
-#include <linux/rtnetlink.h>
 #include <net/sock.h>
 
 #include <linux/inet_diag.h>
@@ -35,9 +34,7 @@ EXPORT_SYMBOL_GPL(sock_diag_save_cookie);
 
 int sock_diag_put_meminfo(struct sock *sk, struct sk_buff *skb, int attrtype)
 {
-        __u32 *mem;
-
-        mem = RTA_DATA(__RTA_PUT(skb, attrtype, SK_MEMINFO_VARS * sizeof(__u32)));
+        u32 mem[SK_MEMINFO_VARS];
 
         mem[SK_MEMINFO_RMEM_ALLOC] = sk_rmem_alloc_get(sk);
         mem[SK_MEMINFO_RCVBUF] = sk->sk_rcvbuf;
@@ -46,11 +43,9 @@ int sock_diag_put_meminfo(struct sock *sk, struct sk_buff *skb, int attrtype)
         mem[SK_MEMINFO_FWD_ALLOC] = sk->sk_forward_alloc;
         mem[SK_MEMINFO_WMEM_QUEUED] = sk->sk_wmem_queued;
         mem[SK_MEMINFO_OPTMEM] = atomic_read(&sk->sk_omem_alloc);
+        mem[SK_MEMINFO_BACKLOG] = sk->sk_backlog.len;
 
-        return 0;
-
-rtattr_failure:
-        return -EMSGSIZE;
+        return nla_put(skb, attrtype, sizeof(mem), &mem);
 }
 EXPORT_SYMBOL_GPL(sock_diag_put_meminfo);
 
@@ -120,7 +115,7 @@ static inline void sock_diag_unlock_handler(const struct sock_diag_handler *h)
 static int __sock_diag_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
 {
         int err;
-        struct sock_diag_req *req = NLMSG_DATA(nlh);
+        struct sock_diag_req *req = nlmsg_data(nlh);
         const struct sock_diag_handler *hndl;
 
         if (nlmsg_len(nlh) < sizeof(*req))
@@ -176,8 +171,12 @@ EXPORT_SYMBOL_GPL(sock_diag_nlsk);
 
 static int __init sock_diag_init(void)
 {
-        sock_diag_nlsk = netlink_kernel_create(&init_net, NETLINK_SOCK_DIAG, 0,
-                                        sock_diag_rcv, NULL, THIS_MODULE);
+        struct netlink_kernel_cfg cfg = {
+                .input  = sock_diag_rcv,
+        };
+
+        sock_diag_nlsk = netlink_kernel_create(&init_net, NETLINK_SOCK_DIAG,
+                                               THIS_MODULE, &cfg);
         return sock_diag_nlsk == NULL ? -ENOMEM : 0;
 }
 
diff --git a/net/dcb/dcbnl.c b/net/dcb/dcbnl.c
index 656c7c75b19..81f2bb62dea 100644
--- a/net/dcb/dcbnl.c
+++ b/net/dcb/dcbnl.c
@@ -28,8 +28,7 @@
 #include <linux/module.h>
 #include <net/sock.h>
 
-/**
- * Data Center Bridging (DCB) is a collection of Ethernet enhancements
+/* Data Center Bridging (DCB) is a collection of Ethernet enhancements
  * intended to allow network traffic with differing requirements
  * (highly reliable, no drops vs. best effort vs. low latency) to operate
  * and co-exist on Ethernet.  Current DCB features are:
@@ -196,92 +195,66 @@ static const struct nla_policy dcbnl_featcfg_nest[DCB_FEATCFG_ATTR_MAX + 1] = {
 static LIST_HEAD(dcb_app_list);
 static DEFINE_SPINLOCK(dcb_lock);
 
-/* standard netlink reply call */
-static int dcbnl_reply(u8 value, u8 event, u8 cmd, u8 attr, u32 pid,
-                       u32 seq, u16 flags)
+static struct sk_buff *dcbnl_newmsg(int type, u8 cmd, u32 port, u32 seq,
+                                    u32 flags, struct nlmsghdr **nlhp)
 {
-        struct sk_buff *dcbnl_skb;
+        struct sk_buff *skb;
         struct dcbmsg *dcb;
         struct nlmsghdr *nlh;
-        int ret = -EINVAL;
 
-        dcbnl_skb = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);
-        if (!dcbnl_skb)
-                return ret;
+        skb = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);
+        if (!skb)
+                return NULL;
 
-        nlh = NLMSG_NEW(dcbnl_skb, pid, seq, event, sizeof(*dcb), flags);
+        nlh = nlmsg_put(skb, port, seq, type, sizeof(*dcb), flags);
+        BUG_ON(!nlh);
 
-        dcb = NLMSG_DATA(nlh);
+        dcb = nlmsg_data(nlh);
         dcb->dcb_family = AF_UNSPEC;
         dcb->cmd = cmd;
         dcb->dcb_pad = 0;
 
-        ret = nla_put_u8(dcbnl_skb, attr, value);
-        if (ret)
-                goto err;
+        if (nlhp)
+                *nlhp = nlh;
 
-        /* end the message, assign the nlmsg_len. */
-        nlmsg_end(dcbnl_skb, nlh);
-        ret = rtnl_unicast(dcbnl_skb, &init_net, pid);
-        if (ret)
-                return -EINVAL;
-
-        return 0;
-nlmsg_failure:
-err:
-        kfree_skb(dcbnl_skb);
-        return ret;
+        return skb;
 }
 
-static int dcbnl_getstate(struct net_device *netdev, struct nlattr **tb,
-                          u32 pid, u32 seq, u16 flags)
+static int dcbnl_getstate(struct net_device *netdev, struct nlmsghdr *nlh,
+                          u32 seq, struct nlattr **tb, struct sk_buff *skb)
 {
-        int ret = -EINVAL;
-
         /* if (!tb[DCB_ATTR_STATE] || !netdev->dcbnl_ops->getstate) */
         if (!netdev->dcbnl_ops->getstate)
-                return ret;
-
-        ret = dcbnl_reply(netdev->dcbnl_ops->getstate(netdev), RTM_GETDCB,
-                          DCB_CMD_GSTATE, DCB_ATTR_STATE, pid, seq, flags);
+                return -EOPNOTSUPP;
 
-        return ret;
+        return nla_put_u8(skb, DCB_ATTR_STATE,
+                          netdev->dcbnl_ops->getstate(netdev));
 }
 
-static int dcbnl_getpfccfg(struct net_device *netdev, struct nlattr **tb,
-                           u32 pid, u32 seq, u16 flags)
+static int dcbnl_getpfccfg(struct net_device *netdev, struct nlmsghdr *nlh,
+                           u32 seq, struct nlattr **tb, struct sk_buff *skb)
 {
-        struct sk_buff *dcbnl_skb;
-        struct nlmsghdr *nlh;
-        struct dcbmsg *dcb;
         struct nlattr *data[DCB_PFC_UP_ATTR_MAX + 1], *nest;
         u8 value;
-        int ret = -EINVAL;
+        int ret;
         int i;
         int getall = 0;
 
-        if (!tb[DCB_ATTR_PFC_CFG] || !netdev->dcbnl_ops->getpfccfg)
-                return ret;
+        if (!tb[DCB_ATTR_PFC_CFG])
+                return -EINVAL;
+
+        if (!netdev->dcbnl_ops->getpfccfg)
+                return -EOPNOTSUPP;
 
         ret = nla_parse_nested(data, DCB_PFC_UP_ATTR_MAX,
                                tb[DCB_ATTR_PFC_CFG],
                                dcbnl_pfc_up_nest);
         if (ret)
-                goto err_out;
-
-        dcbnl_skb = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);
-        if (!dcbnl_skb)
-                goto err_out;
-
-        nlh = NLMSG_NEW(dcbnl_skb, pid, seq, RTM_GETDCB, sizeof(*dcb), flags);
-
-        dcb = NLMSG_DATA(nlh);
-        dcb->dcb_family = AF_UNSPEC;
-        dcb->cmd = DCB_CMD_PFC_GCFG;
+                return ret;
 
-        nest = nla_nest_start(dcbnl_skb, DCB_ATTR_PFC_CFG);
+        nest = nla_nest_start(skb, DCB_ATTR_PFC_CFG);
         if (!nest)
-                goto err;
+                return -EMSGSIZE;
 
         if (data[DCB_PFC_UP_ATTR_ALL])
                 getall = 1;
@@ -292,103 +265,53 @@ static int dcbnl_getpfccfg(struct net_device *netdev, struct nlattr **tb,
 
                 netdev->dcbnl_ops->getpfccfg(netdev, i - DCB_PFC_UP_ATTR_0,
                                              &value);
-                ret = nla_put_u8(dcbnl_skb, i, value);
-
+                ret = nla_put_u8(skb, i, value);
                 if (ret) {
-                        nla_nest_cancel(dcbnl_skb, nest);
-                        goto err;
+                        nla_nest_cancel(skb, nest);
+                        return ret;
                 }
         }
-        nla_nest_end(dcbnl_skb, nest);
-
-        nlmsg_end(dcbnl_skb, nlh);
-
-        ret = rtnl_unicast(dcbnl_skb, &init_net, pid);
-        if (ret)
-                goto err_out;
+        nla_nest_end(skb, nest);
 
         return 0;
-nlmsg_failure:
-err:
-        kfree_skb(dcbnl_skb);
-err_out:
-        return -EINVAL;
 }
 
-static int dcbnl_getperm_hwaddr(struct net_device *netdev, struct nlattr **tb,
-                                u32 pid, u32 seq, u16 flags)
+static int dcbnl_getperm_hwaddr(struct net_device *netdev, struct nlmsghdr *nlh,
+                                u32 seq, struct nlattr **tb, struct sk_buff *skb)
 {
-        struct sk_buff *dcbnl_skb;
-        struct nlmsghdr *nlh;
-        struct dcbmsg *dcb;
         u8 perm_addr[MAX_ADDR_LEN];
-        int ret = -EINVAL;
 
         if (!netdev->dcbnl_ops->getpermhwaddr)
-                return ret;
-
-        dcbnl_skb = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);
-        if (!dcbnl_skb)
-                goto err_out;
-
-        nlh = NLMSG_NEW(dcbnl_skb, pid, seq, RTM_GETDCB, sizeof(*dcb), flags);
-
-        dcb = NLMSG_DATA(nlh);
-        dcb->dcb_family = AF_UNSPEC;
-        dcb->cmd = DCB_CMD_GPERM_HWADDR;
+                return -EOPNOTSUPP;
 
         netdev->dcbnl_ops->getpermhwaddr(netdev, perm_addr);
 
-        ret = nla_put(dcbnl_skb, DCB_ATTR_PERM_HWADDR, sizeof(perm_addr),
-                      perm_addr);
-
-        nlmsg_end(dcbnl_skb, nlh);
-
-        ret = rtnl_unicast(dcbnl_skb, &init_net, pid);
-        if (ret)
-                goto err_out;
-
-        return 0;
-
-nlmsg_failure:
-        kfree_skb(dcbnl_skb);
-err_out:
-        return -EINVAL;
+        return nla_put(skb, DCB_ATTR_PERM_HWADDR, sizeof(perm_addr), perm_addr);
 }
 
-static int dcbnl_getcap(struct net_device *netdev, struct nlattr **tb,
-                        u32 pid, u32 seq, u16 flags)
+static int dcbnl_getcap(struct net_device *netdev, struct nlmsghdr *nlh,
+                        u32 seq, struct nlattr **tb, struct sk_buff *skb)
 {
-        struct sk_buff *dcbnl_skb;
-        struct nlmsghdr *nlh;
-        struct dcbmsg *dcb;
         struct nlattr *data[DCB_CAP_ATTR_MAX + 1], *nest;
         u8 value;
-        int ret = -EINVAL;
+        int ret;
         int i;
         int getall = 0;
 
-        if (!tb[DCB_ATTR_CAP] || !netdev->dcbnl_ops->getcap)
-                return ret;
+        if (!tb[DCB_ATTR_CAP])
+                return -EINVAL;
+
+        if (!netdev->dcbnl_ops->getcap)
+                return -EOPNOTSUPP;
 
         ret = nla_parse_nested(data, DCB_CAP_ATTR_MAX, tb[DCB_ATTR_CAP],
                                dcbnl_cap_nest);
         if (ret)
-                goto err_out;
-
-        dcbnl_skb = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);
-        if (!dcbnl_skb)
-                goto err_out;
-
-        nlh = NLMSG_NEW(dcbnl_skb, pid, seq, RTM_GETDCB, sizeof(*dcb), flags);
-
-        dcb = NLMSG_DATA(nlh);
-        dcb->dcb_family = AF_UNSPEC;
-        dcb->cmd = DCB_CMD_GCAP;
+                return ret;
 
-        nest = nla_nest_start(dcbnl_skb, DCB_ATTR_CAP);
+        nest = nla_nest_start(skb, DCB_ATTR_CAP);
         if (!nest)
-                goto err;
+                return -EMSGSIZE;
 
         if (data[DCB_CAP_ATTR_ALL])
                 getall = 1;
@@ -398,69 +321,41 @@ static int dcbnl_getcap(struct net_device *netdev, struct nlattr **tb,
                         continue;
 
                 if (!netdev->dcbnl_ops->getcap(netdev, i, &value)) {
-                        ret = nla_put_u8(dcbnl_skb, i, value);
-
+                        ret = nla_put_u8(skb, i, value);
                         if (ret) {
-                                nla_nest_cancel(dcbnl_skb, nest);
-                                goto err;
+                                nla_nest_cancel(skb, nest);
+                                return ret;
                         }
                 }
         }
-        nla_nest_end(dcbnl_skb, nest);
-
-        nlmsg_end(dcbnl_skb, nlh);
-
-        ret = rtnl_unicast(dcbnl_skb, &init_net, pid);
-        if (ret)
-                goto err_out;
+        nla_nest_end(skb, nest);
 
         return 0;
-nlmsg_failure:
-err:
-        kfree_skb(dcbnl_skb);
-err_out:
-        return -EINVAL;
 }
 
-static int dcbnl_getnumtcs(struct net_device *netdev, struct nlattr **tb,
-                           u32 pid, u32 seq, u16 flags)
+static int dcbnl_getnumtcs(struct net_device *netdev, struct nlmsghdr *nlh,
+                           u32 seq, struct nlattr **tb, struct sk_buff *skb)
 {
-        struct sk_buff *dcbnl_skb;
-        struct nlmsghdr *nlh;
-        struct dcbmsg *dcb;
         struct nlattr *data[DCB_NUMTCS_ATTR_MAX + 1], *nest;
         u8 value;
-        int ret = -EINVAL;
+        int ret;
         int i;
         int getall = 0;
 
-        if (!tb[DCB_ATTR_NUMTCS] || !netdev->dcbnl_ops->getnumtcs)
-                return ret;
+        if (!tb[DCB_ATTR_NUMTCS])
+                return -EINVAL;
+
+        if (!netdev->dcbnl_ops->getnumtcs)
+                return -EOPNOTSUPP;
 
         ret = nla_parse_nested(data, DCB_NUMTCS_ATTR_MAX, tb[DCB_ATTR_NUMTCS],
                                dcbnl_numtcs_nest);
-        if (ret) {
-                ret = -EINVAL;
-                goto err_out;
-        }
-
-        dcbnl_skb = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);
-        if (!dcbnl_skb) {
-                ret = -EINVAL;
-                goto err_out;
-        }
-
-        nlh = NLMSG_NEW(dcbnl_skb, pid, seq, RTM_GETDCB, sizeof(*dcb), flags);
-
-        dcb = NLMSG_DATA(nlh);
-        dcb->dcb_family = AF_UNSPEC;
-        dcb->cmd = DCB_CMD_GNUMTCS;
+        if (ret)
+                return ret;
 
-        nest = nla_nest_start(dcbnl_skb, DCB_ATTR_NUMTCS);
-        if (!nest) {
-                ret = -EINVAL;
-                goto err;
-        }
+        nest = nla_nest_start(skb, DCB_ATTR_NUMTCS);
+        if (!nest)
+                return -EMSGSIZE;
 
         if (data[DCB_NUMTCS_ATTR_ALL])
                 getall = 1;
@@ -471,53 +366,37 @@ static int dcbnl_getnumtcs(struct net_device *netdev, struct nlattr **tb,
 
                 ret = netdev->dcbnl_ops->getnumtcs(netdev, i, &value);
                 if (!ret) {
-                        ret = nla_put_u8(dcbnl_skb, i, value);
-
+                        ret = nla_put_u8(skb, i, value);
                         if (ret) {
-                                nla_nest_cancel(dcbnl_skb, nest);
-                                ret = -EINVAL;
-                                goto err;
+                                nla_nest_cancel(skb, nest);
+                                return ret;
                         }
-                } else {
-                        goto err;
-                }
-        }
-        nla_nest_end(dcbnl_skb, nest);
-
-        nlmsg_end(dcbnl_skb, nlh);
-
-        ret = rtnl_unicast(dcbnl_skb, &init_net, pid);
-        if (ret) {
-                ret = -EINVAL;
-                goto err_out;
+                } else
+                        return -EINVAL;
         }
+        nla_nest_end(skb, nest);
 
         return 0;
-nlmsg_failure:
-err:
-        kfree_skb(dcbnl_skb);
-err_out:
-        return ret;
 }
 
-static int dcbnl_setnumtcs(struct net_device *netdev, struct nlattr **tb,
-                           u32 pid, u32 seq, u16 flags)
+static int dcbnl_setnumtcs(struct net_device *netdev, struct nlmsghdr *nlh,
+                           u32 seq, struct nlattr **tb, struct sk_buff *skb)
 {
         struct nlattr *data[DCB_NUMTCS_ATTR_MAX + 1];
-        int ret = -EINVAL;
+        int ret;
         u8 value;
         int i;
 
-        if (!tb[DCB_ATTR_NUMTCS] || !netdev->dcbnl_ops->setnumtcs)
-                return ret;
+        if (!tb[DCB_ATTR_NUMTCS])
+                return -EINVAL;
+
+        if (!netdev->dcbnl_ops->setnumtcs)
+                return -EOPNOTSUPP;
 
         ret = nla_parse_nested(data, DCB_NUMTCS_ATTR_MAX, tb[DCB_ATTR_NUMTCS],
                                dcbnl_numtcs_nest);
-
-        if (ret) {
-                ret = -EINVAL;
-                goto err;
-        }
+        if (ret)
+                return ret;
 
         for (i = DCB_NUMTCS_ATTR_ALL+1; i <= DCB_NUMTCS_ATTR_MAX; i++) {
                 if (data[i] == NULL)
@@ -526,84 +405,68 @@ static int dcbnl_setnumtcs(struct net_device *netdev, struct nlattr **tb,
                 value = nla_get_u8(data[i]);
 
                 ret = netdev->dcbnl_ops->setnumtcs(netdev, i, value);
-
                 if (ret)
-                        goto operr;
+                        break;
         }
 
-operr:
-        ret = dcbnl_reply(!!ret, RTM_SETDCB, DCB_CMD_SNUMTCS,
-                          DCB_ATTR_NUMTCS, pid, seq, flags);
-
-err:
-        return ret;
+        return nla_put_u8(skb, DCB_ATTR_NUMTCS, !!ret);
 }
 
-static int dcbnl_getpfcstate(struct net_device *netdev, struct nlattr **tb,
-                             u32 pid, u32 seq, u16 flags)
+static int dcbnl_getpfcstate(struct net_device *netdev, struct nlmsghdr *nlh,
+                             u32 seq, struct nlattr **tb, struct sk_buff *skb)
 {
-        int ret = -EINVAL;
-
         if (!netdev->dcbnl_ops->getpfcstate)
-                return ret;
-
-        ret = dcbnl_reply(netdev->dcbnl_ops->getpfcstate(netdev), RTM_GETDCB,
-                          DCB_CMD_PFC_GSTATE, DCB_ATTR_PFC_STATE,
-                          pid, seq, flags);
+                return -EOPNOTSUPP;
 
-        return ret;
+        return nla_put_u8(skb, DCB_ATTR_PFC_STATE,
+                          netdev->dcbnl_ops->getpfcstate(netdev));
 }
 
-static int dcbnl_setpfcstate(struct net_device *netdev, struct nlattr **tb,
-                             u32 pid, u32 seq, u16 flags)
+static int dcbnl_setpfcstate(struct net_device *netdev, struct nlmsghdr *nlh,
+                             u32 seq, struct nlattr **tb, struct sk_buff *skb)
 {
-        int ret = -EINVAL;
         u8 value;
 
-        if (!tb[DCB_ATTR_PFC_STATE] || !netdev->dcbnl_ops->setpfcstate)
-                return ret;
+        if (!tb[DCB_ATTR_PFC_STATE])
+                return -EINVAL;
+
+        if (!netdev->dcbnl_ops->setpfcstate)
+                return -EOPNOTSUPP;
 
         value = nla_get_u8(tb[DCB_ATTR_PFC_STATE]);
 
         netdev->dcbnl_ops->setpfcstate(netdev, value);
 
-        ret = dcbnl_reply(0, RTM_SETDCB, DCB_CMD_PFC_SSTATE, DCB_ATTR_PFC_STATE,
-                          pid, seq, flags);
-
-        return ret;
+        return nla_put_u8(skb, DCB_ATTR_PFC_STATE, 0);
 }
 
-static int dcbnl_getapp(struct net_device *netdev, struct nlattr **tb,
-                        u32 pid, u32 seq, u16 flags)
+static int dcbnl_getapp(struct net_device *netdev, struct nlmsghdr *nlh,
+                        u32 seq, struct nlattr **tb, struct sk_buff *skb)
 {
-        struct sk_buff *dcbnl_skb;
-        struct nlmsghdr *nlh;
-        struct dcbmsg *dcb;
         struct nlattr *app_nest;
         struct nlattr *app_tb[DCB_APP_ATTR_MAX + 1];
         u16 id;
         u8 up, idtype;
-        int ret = -EINVAL;
+        int ret;
 
         if (!tb[DCB_ATTR_APP])
-                goto out;
+                return -EINVAL;
 
         ret = nla_parse_nested(app_tb, DCB_APP_ATTR_MAX, tb[DCB_ATTR_APP],
                                dcbnl_app_nest);
         if (ret)
-                goto out;
+                return ret;
 
-        ret = -EINVAL;
         /* all must be non-null */
         if ((!app_tb[DCB_APP_ATTR_IDTYPE]) ||
             (!app_tb[DCB_APP_ATTR_ID]))
-                goto out;
+                return -EINVAL;
 
         /* either by eth type or by socket number */
         idtype = nla_get_u8(app_tb[DCB_APP_ATTR_IDTYPE]);
         if ((idtype != DCB_APP_IDTYPE_ETHTYPE) &&
             (idtype != DCB_APP_IDTYPE_PORTNUM))
-                goto out;
+                return -EINVAL;
 
         id = nla_get_u16(app_tb[DCB_APP_ATTR_ID]);
 
@@ -617,138 +480,106 @@ static int dcbnl_getapp(struct net_device *netdev, struct nlattr **tb,
                 up = dcb_getapp(netdev, &app);
         }
 
-        /* send this back */
-        dcbnl_skb = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);
-        if (!dcbnl_skb)
-                goto out;
-
-        nlh = NLMSG_NEW(dcbnl_skb, pid, seq, RTM_GETDCB, sizeof(*dcb), flags);
-        dcb = NLMSG_DATA(nlh);
-        dcb->dcb_family = AF_UNSPEC;
-        dcb->cmd = DCB_CMD_GAPP;
-
-        app_nest = nla_nest_start(dcbnl_skb, DCB_ATTR_APP);
+        app_nest = nla_nest_start(skb, DCB_ATTR_APP);
         if (!app_nest)
-                goto out_cancel;
+                return -EMSGSIZE;
 
-        ret = nla_put_u8(dcbnl_skb, DCB_APP_ATTR_IDTYPE, idtype);
+        ret = nla_put_u8(skb, DCB_APP_ATTR_IDTYPE, idtype);
         if (ret)
                 goto out_cancel;
 
-        ret = nla_put_u16(dcbnl_skb, DCB_APP_ATTR_ID, id);
+        ret = nla_put_u16(skb, DCB_APP_ATTR_ID, id);
         if (ret)
                 goto out_cancel;
 
-        ret = nla_put_u8(dcbnl_skb, DCB_APP_ATTR_PRIORITY, up);
+        ret = nla_put_u8(skb, DCB_APP_ATTR_PRIORITY, up);
         if (ret)
                 goto out_cancel;
 
-        nla_nest_end(dcbnl_skb, app_nest);
-        nlmsg_end(dcbnl_skb, nlh);
-
-        ret = rtnl_unicast(dcbnl_skb, &init_net, pid);
-        if (ret)
-                goto nlmsg_failure;
+        nla_nest_end(skb, app_nest);
 
-        goto out;
+        return 0;
 
 out_cancel:
-        nla_nest_cancel(dcbnl_skb, app_nest);
-nlmsg_failure:
-        kfree_skb(dcbnl_skb);
-out:
+        nla_nest_cancel(skb, app_nest);
         return ret;
 }
 
-static int dcbnl_setapp(struct net_device *netdev, struct nlattr **tb,
-                        u32 pid, u32 seq, u16 flags)
+static int dcbnl_setapp(struct net_device *netdev, struct nlmsghdr *nlh,
+                        u32 seq, struct nlattr **tb, struct sk_buff *skb)
 {
-        int err, ret = -EINVAL;
+        int ret;
         u16 id;
         u8 up, idtype;
         struct nlattr *app_tb[DCB_APP_ATTR_MAX + 1];
 
         if (!tb[DCB_ATTR_APP])
-                goto out;
+                return -EINVAL;
 
         ret = nla_parse_nested(app_tb, DCB_APP_ATTR_MAX, tb[DCB_ATTR_APP],
                                dcbnl_app_nest);
         if (ret)
-                goto out;
+                return ret;
 
-        ret = -EINVAL;
         /* all must be non-null */
         if ((!app_tb[DCB_APP_ATTR_IDTYPE]) ||
             (!app_tb[DCB_APP_ATTR_ID]) ||
             (!app_tb[DCB_APP_ATTR_PRIORITY]))
-                goto out;
+                return -EINVAL;
 
         /* either by eth type or by socket number */
         idtype = nla_get_u8(app_tb[DCB_APP_ATTR_IDTYPE]);
         if ((idtype != DCB_APP_IDTYPE_ETHTYPE) &&
             (idtype != DCB_APP_IDTYPE_PORTNUM))
-                goto out;
+                return -EINVAL;
 
         id = nla_get_u16(app_tb[DCB_APP_ATTR_ID]);
         up = nla_get_u8(app_tb[DCB_APP_ATTR_PRIORITY]);
 
         if (netdev->dcbnl_ops->setapp) {
-                err = netdev->dcbnl_ops->setapp(netdev, idtype, id, up);
+                ret = netdev->dcbnl_ops->setapp(netdev, idtype, id, up);
         } else {
                 struct dcb_app app;
                 app.selector = idtype;
                 app.protocol = id;
                 app.priority = up;
-                err = dcb_setapp(netdev, &app);
+                ret = dcb_setapp(netdev, &app);
         }
 
-        ret = dcbnl_reply(err, RTM_SETDCB, DCB_CMD_SAPP, DCB_ATTR_APP,
-                          pid, seq, flags);
+        ret = nla_put_u8(skb, DCB_ATTR_APP, ret);
         dcbnl_cee_notify(netdev, RTM_SETDCB, DCB_CMD_SAPP, seq, 0);
-out:
+
         return ret;
 }
 
-static int __dcbnl_pg_getcfg(struct net_device *netdev, struct nlattr **tb,
-                             u32 pid, u32 seq, u16 flags, int dir)
+static int __dcbnl_pg_getcfg(struct net_device *netdev, struct nlmsghdr *nlh,
+                             struct nlattr **tb, struct sk_buff *skb, int dir)
 {
-        struct sk_buff *dcbnl_skb;
-        struct nlmsghdr *nlh;
-        struct dcbmsg *dcb;
         struct nlattr *pg_nest, *param_nest, *data;
         struct nlattr *pg_tb[DCB_PG_ATTR_MAX + 1];
         struct nlattr *param_tb[DCB_TC_ATTR_PARAM_MAX + 1];
         u8 prio, pgid, tc_pct, up_map;
-        int ret  = -EINVAL;
+        int ret;
         int getall = 0;
         int i;
 
-        if (!tb[DCB_ATTR_PG_CFG] ||
-            !netdev->dcbnl_ops->getpgtccfgtx ||
+        if (!tb[DCB_ATTR_PG_CFG])
+                return -EINVAL;
+
+        if (!netdev->dcbnl_ops->getpgtccfgtx ||
             !netdev->dcbnl_ops->getpgtccfgrx ||
             !netdev->dcbnl_ops->getpgbwgcfgtx ||
             !netdev->dcbnl_ops->getpgbwgcfgrx)
-                return ret;
+                return -EOPNOTSUPP;
 
         ret = nla_parse_nested(pg_tb, DCB_PG_ATTR_MAX,
                                tb[DCB_ATTR_PG_CFG], dcbnl_pg_nest);
-
         if (ret)
-                goto err_out;
-
-        dcbnl_skb = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);
-        if (!dcbnl_skb)
-                goto err_out;
-
-        nlh = NLMSG_NEW(dcbnl_skb, pid, seq, RTM_GETDCB, sizeof(*dcb), flags);
-
-        dcb = NLMSG_DATA(nlh);
-        dcb->dcb_family = AF_UNSPEC;
-        dcb->cmd = (dir) ? DCB_CMD_PGRX_GCFG : DCB_CMD_PGTX_GCFG;
+                return ret;
 
-        pg_nest = nla_nest_start(dcbnl_skb, DCB_ATTR_PG_CFG);
+        pg_nest = nla_nest_start(skb, DCB_ATTR_PG_CFG);
         if (!pg_nest)
-                goto err;
+                return -EMSGSIZE;
 
         if (pg_tb[DCB_PG_ATTR_TC_ALL])
                 getall = 1;
@@ -766,7 +597,7 @@ static int __dcbnl_pg_getcfg(struct net_device *netdev, struct nlattr **tb,
                 if (ret)
                         goto err_pg;
 
-                param_nest = nla_nest_start(dcbnl_skb, i);
+                param_nest = nla_nest_start(skb, i);
                 if (!param_nest)
                         goto err_pg;
 
@@ -789,33 +620,33 @@ static int __dcbnl_pg_getcfg(struct net_device *netdev, struct nlattr **tb,
 
                 if (param_tb[DCB_TC_ATTR_PARAM_PGID] ||
                     param_tb[DCB_TC_ATTR_PARAM_ALL]) {
-                        ret = nla_put_u8(dcbnl_skb,
+                        ret = nla_put_u8(skb,
                                          DCB_TC_ATTR_PARAM_PGID, pgid);
                         if (ret)
                                 goto err_param;
                 }
                 if (param_tb[DCB_TC_ATTR_PARAM_UP_MAPPING] ||
                     param_tb[DCB_TC_ATTR_PARAM_ALL]) {
-                        ret = nla_put_u8(dcbnl_skb,
+                        ret = nla_put_u8(skb,
                                          DCB_TC_ATTR_PARAM_UP_MAPPING, up_map);
                         if (ret)
                                 goto err_param;
                 }
                 if (param_tb[DCB_TC_ATTR_PARAM_STRICT_PRIO] ||
                     param_tb[DCB_TC_ATTR_PARAM_ALL]) {
-                        ret = nla_put_u8(dcbnl_skb,
+                        ret = nla_put_u8(skb,
                                          DCB_TC_ATTR_PARAM_STRICT_PRIO, prio);
                         if (ret)
                                 goto err_param;
                 }
                 if (param_tb[DCB_TC_ATTR_PARAM_BW_PCT] ||
                     param_tb[DCB_TC_ATTR_PARAM_ALL]) {
-                        ret = nla_put_u8(dcbnl_skb, DCB_TC_ATTR_PARAM_BW_PCT,
+                        ret = nla_put_u8(skb, DCB_TC_ATTR_PARAM_BW_PCT,
                                          tc_pct);
                         if (ret)
                                 goto err_param;
                 }
-                nla_nest_end(dcbnl_skb, param_nest);
+                nla_nest_end(skb, param_nest);
         }
 
         if (pg_tb[DCB_PG_ATTR_BW_ID_ALL])
@@ -838,80 +669,71 @@ static int __dcbnl_pg_getcfg(struct net_device *netdev, struct nlattr **tb,
                         netdev->dcbnl_ops->getpgbwgcfgtx(netdev,
                                         i - DCB_PG_ATTR_BW_ID_0, &tc_pct);
                 }
-                ret = nla_put_u8(dcbnl_skb, i, tc_pct);
-
+                ret = nla_put_u8(skb, i, tc_pct);
                 if (ret)
                         goto err_pg;
         }
 
-        nla_nest_end(dcbnl_skb, pg_nest);
-
-        nlmsg_end(dcbnl_skb, nlh);
-
-        ret = rtnl_unicast(dcbnl_skb, &init_net, pid);
-        if (ret)
-                goto err_out;
+        nla_nest_end(skb, pg_nest);
 
         return 0;
 
 err_param:
-        nla_nest_cancel(dcbnl_skb, param_nest);
+        nla_nest_cancel(skb, param_nest);
 err_pg:
-        nla_nest_cancel(dcbnl_skb, pg_nest);
-nlmsg_failure:
-err:
-        kfree_skb(dcbnl_skb);
-err_out:
-        ret  = -EINVAL;
-        return ret;
+        nla_nest_cancel(skb, pg_nest);
+
+        return -EMSGSIZE;
 }
 
-static int dcbnl_pgtx_getcfg(struct net_device *netdev, struct nlattr **tb,
-                             u32 pid, u32 seq, u16 flags)
+static int dcbnl_pgtx_getcfg(struct net_device *netdev, struct nlmsghdr *nlh,
+                             u32 seq, struct nlattr **tb, struct sk_buff *skb)
 {
-        return __dcbnl_pg_getcfg(netdev, tb, pid, seq, flags, 0);
+        return __dcbnl_pg_getcfg(netdev, nlh, tb, skb, 0);
 }
 
-static int dcbnl_pgrx_getcfg(struct net_device *netdev, struct nlattr **tb,
-                             u32 pid, u32 seq, u16 flags)
+static int dcbnl_pgrx_getcfg(struct net_device *netdev, struct nlmsghdr *nlh,
+                             u32 seq, struct nlattr **tb, struct sk_buff *skb)
 {
-        return __dcbnl_pg_getcfg(netdev, tb, pid, seq, flags, 1);
+        return __dcbnl_pg_getcfg(netdev, nlh, tb, skb, 1);
 }
 
-static int dcbnl_setstate(struct net_device *netdev, struct nlattr **tb,
-                          u32 pid, u32 seq, u16 flags)
+static int dcbnl_setstate(struct net_device *netdev, struct nlmsghdr *nlh,
+                          u32 seq, struct nlattr **tb, struct sk_buff *skb)
 {
-        int ret = -EINVAL;
         u8 value;
 
-        if (!tb[DCB_ATTR_STATE] || !netdev->dcbnl_ops->setstate)
-                return ret;
+        if (!tb[DCB_ATTR_STATE])
+                return -EINVAL;
 
-        value = nla_get_u8(tb[DCB_ATTR_STATE]);
+        if (!netdev->dcbnl_ops->setstate)
+                return -EOPNOTSUPP;
 
-        ret = dcbnl_reply(netdev->dcbnl_ops->setstate(netdev, value),
-                          RTM_SETDCB, DCB_CMD_SSTATE, DCB_ATTR_STATE,
-                          pid, seq, flags);
+        value = nla_get_u8(tb[DCB_ATTR_STATE]);
 
-        return ret;
+        return nla_put_u8(skb, DCB_ATTR_STATE,
+                          netdev->dcbnl_ops->setstate(netdev, value));
 }
 
-static int dcbnl_setpfccfg(struct net_device *netdev, struct nlattr **tb,
-                           u32 pid, u32 seq, u16 flags)
+static int dcbnl_setpfccfg(struct net_device *netdev, struct nlmsghdr *nlh,
+                           u32 seq, struct nlattr **tb, struct sk_buff *skb)
 {
         struct nlattr *data[DCB_PFC_UP_ATTR_MAX + 1];
         int i;
-        int ret = -EINVAL;
+        int ret;
         u8 value;
 
-        if (!tb[DCB_ATTR_PFC_CFG] || !netdev->dcbnl_ops->setpfccfg)
-                return ret;
+        if (!tb[DCB_ATTR_PFC_CFG])
+                return -EINVAL;
+
+        if (!netdev->dcbnl_ops->setpfccfg)
+                return -EOPNOTSUPP;
 
         ret = nla_parse_nested(data, DCB_PFC_UP_ATTR_MAX,
                                tb[DCB_ATTR_PFC_CFG],
                                dcbnl_pfc_up_nest);
         if (ret)
-                goto err;
+                return ret;
 
         for (i = DCB_PFC_UP_ATTR_0; i <= DCB_PFC_UP_ATTR_7; i++) {
                 if (data[i] == NULL)
@@ -921,50 +743,53 @@ static int dcbnl_setpfccfg(struct net_device *netdev, struct nlattr **tb,
                         data[i]->nla_type - DCB_PFC_UP_ATTR_0, value);
         }
 
-        ret = dcbnl_reply(0, RTM_SETDCB, DCB_CMD_PFC_SCFG, DCB_ATTR_PFC_CFG,
-                          pid, seq, flags);
-err:
-        return ret;
+        return nla_put_u8(skb, DCB_ATTR_PFC_CFG, 0);
 }
 
-static int dcbnl_setall(struct net_device *netdev, struct nlattr **tb,
-                        u32 pid, u32 seq, u16 flags)
+static int dcbnl_setall(struct net_device *netdev, struct nlmsghdr *nlh,
+                        u32 seq, struct nlattr **tb, struct sk_buff *skb)
 {
-        int ret = -EINVAL;
+        int ret;
 
-        if (!tb[DCB_ATTR_SET_ALL] || !netdev->dcbnl_ops->setall)
-                return ret;
+        if (!tb[DCB_ATTR_SET_ALL])
+                return -EINVAL;
+
+        if (!netdev->dcbnl_ops->setall)
+                return -EOPNOTSUPP;
 
-        ret = dcbnl_reply(netdev->dcbnl_ops->setall(netdev), RTM_SETDCB,
-                          DCB_CMD_SET_ALL, DCB_ATTR_SET_ALL, pid, seq, flags);
+        ret = nla_put_u8(skb, DCB_ATTR_SET_ALL,
+                         netdev->dcbnl_ops->setall(netdev));
         dcbnl_cee_notify(netdev, RTM_SETDCB, DCB_CMD_SET_ALL, seq, 0);
 
         return ret;
 }
 
-static int __dcbnl_pg_setcfg(struct net_device *netdev, struct nlattr **tb,
-                             u32 pid, u32 seq, u16 flags, int dir)
+static int __dcbnl_pg_setcfg(struct net_device *netdev, struct nlmsghdr *nlh,
+                             u32 seq, struct nlattr **tb, struct sk_buff *skb,
+                             int dir)
 {
         struct nlattr *pg_tb[DCB_PG_ATTR_MAX + 1];
         struct nlattr *param_tb[DCB_TC_ATTR_PARAM_MAX + 1];
-        int ret = -EINVAL;
+        int ret;
         int i;
         u8 pgid;
         u8 up_map;
         u8 prio;
         u8 tc_pct;
 
-        if (!tb[DCB_ATTR_PG_CFG] ||
-            !netdev->dcbnl_ops->setpgtccfgtx ||
+        if (!tb[DCB_ATTR_PG_CFG])
+                return -EINVAL;
+
+        if (!netdev->dcbnl_ops->setpgtccfgtx ||
             !netdev->dcbnl_ops->setpgtccfgrx ||
             !netdev->dcbnl_ops->setpgbwgcfgtx ||
             !netdev->dcbnl_ops->setpgbwgcfgrx)
-                return ret;
+                return -EOPNOTSUPP;
 
         ret = nla_parse_nested(pg_tb, DCB_PG_ATTR_MAX,
                                tb[DCB_ATTR_PG_CFG], dcbnl_pg_nest);
         if (ret)
-                goto err;
+                return ret;
 
         for (i = DCB_PG_ATTR_TC_0; i <= DCB_PG_ATTR_TC_7; i++) {
                 if (!pg_tb[i])
@@ -973,7 +798,7 @@ static int __dcbnl_pg_setcfg(struct net_device *netdev, struct nlattr **tb,
                 ret = nla_parse_nested(param_tb, DCB_TC_ATTR_PARAM_MAX,
                                        pg_tb[i], dcbnl_tc_param_nest);
                 if (ret)
-                        goto err;
+                        return ret;
 
                 pgid = DCB_ATTR_VALUE_UNDEFINED;
                 prio = DCB_ATTR_VALUE_UNDEFINED;
@@ -1026,63 +851,47 @@ static int __dcbnl_pg_setcfg(struct net_device *netdev, struct nlattr **tb,
                 }
         }
 
-        ret = dcbnl_reply(0, RTM_SETDCB,
-                          (dir ? DCB_CMD_PGRX_SCFG : DCB_CMD_PGTX_SCFG),
-                          DCB_ATTR_PG_CFG, pid, seq, flags);
-
-err:
-        return ret;
+        return nla_put_u8(skb, DCB_ATTR_PG_CFG, 0);
 }
 
-static int dcbnl_pgtx_setcfg(struct net_device *netdev, struct nlattr **tb,
-                             u32 pid, u32 seq, u16 flags)
+static int dcbnl_pgtx_setcfg(struct net_device *netdev, struct nlmsghdr *nlh,
+                             u32 seq, struct nlattr **tb, struct sk_buff *skb)
 {
-        return __dcbnl_pg_setcfg(netdev, tb, pid, seq, flags, 0);
+        return __dcbnl_pg_setcfg(netdev, nlh, seq, tb, skb, 0);
 }
 
-static int dcbnl_pgrx_setcfg(struct net_device *netdev, struct nlattr **tb,
-                             u32 pid, u32 seq, u16 flags)
+static int dcbnl_pgrx_setcfg(struct net_device *netdev, struct nlmsghdr *nlh,
+                             u32 seq, struct nlattr **tb, struct sk_buff *skb)
 {
-        return __dcbnl_pg_setcfg(netdev, tb, pid, seq, flags, 1);
+        return __dcbnl_pg_setcfg(netdev, nlh, seq, tb, skb, 1);
 }
 
-static int dcbnl_bcn_getcfg(struct net_device *netdev, struct nlattr **tb,
-                            u32 pid, u32 seq, u16 flags)
+static int dcbnl_bcn_getcfg(struct net_device *netdev, struct nlmsghdr *nlh,
+                            u32 seq, struct nlattr **tb, struct sk_buff *skb)
 {
-        struct sk_buff *dcbnl_skb;
-        struct nlmsghdr *nlh;
-        struct dcbmsg *dcb;
         struct nlattr *bcn_nest;
         struct nlattr *bcn_tb[DCB_BCN_ATTR_MAX + 1];
         u8 value_byte;
         u32 value_integer;
-        int ret  = -EINVAL;
+        int ret;
         bool getall = false;
         int i;
 
-        if (!tb[DCB_ATTR_BCN] || !netdev->dcbnl_ops->getbcnrp ||
+        if (!tb[DCB_ATTR_BCN])
+                return -EINVAL;
+
+        if (!netdev->dcbnl_ops->getbcnrp ||
             !netdev->dcbnl_ops->getbcncfg)
-                return ret;
+                return -EOPNOTSUPP;
 
         ret = nla_parse_nested(bcn_tb, DCB_BCN_ATTR_MAX,
                                tb[DCB_ATTR_BCN], dcbnl_bcn_nest);
-
         if (ret)
-                goto err_out;
-
-        dcbnl_skb = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);
-        if (!dcbnl_skb)
-                goto err_out;
-
-        nlh = NLMSG_NEW(dcbnl_skb, pid, seq, RTM_GETDCB, sizeof(*dcb), flags);
-
-        dcb = NLMSG_DATA(nlh);
-        dcb->dcb_family = AF_UNSPEC;
-        dcb->cmd = DCB_CMD_BCN_GCFG;
+                return ret;
 
-        bcn_nest = nla_nest_start(dcbnl_skb, DCB_ATTR_BCN);
+        bcn_nest = nla_nest_start(skb, DCB_ATTR_BCN);
         if (!bcn_nest)
-                goto err;
+                return -EMSGSIZE;
 
         if (bcn_tb[DCB_BCN_ATTR_ALL])
                 getall = true;
@@ -1093,7 +902,7 @@ static int dcbnl_bcn_getcfg(struct net_device *netdev, struct nlattr **tb,
 
                 netdev->dcbnl_ops->getbcnrp(netdev, i - DCB_BCN_ATTR_RP_0,
                                             &value_byte);
-                ret = nla_put_u8(dcbnl_skb, i, value_byte);
+                ret = nla_put_u8(skb, i, value_byte);
                 if (ret)
                         goto err_bcn;
         }
@@ -1104,49 +913,41 @@ static int dcbnl_bcn_getcfg(struct net_device *netdev, struct nlattr **tb,
 
                 netdev->dcbnl_ops->getbcncfg(netdev, i,
                                              &value_integer);
-                ret = nla_put_u32(dcbnl_skb, i, value_integer);
+                ret = nla_put_u32(skb, i, value_integer);
                 if (ret)
                         goto err_bcn;
         }
 
-        nla_nest_end(dcbnl_skb, bcn_nest);
-
-        nlmsg_end(dcbnl_skb, nlh);
-
-        ret = rtnl_unicast(dcbnl_skb, &init_net, pid);
-        if (ret)
-                goto err_out;
+        nla_nest_end(skb, bcn_nest);
 
         return 0;
 
 err_bcn:
-        nla_nest_cancel(dcbnl_skb, bcn_nest);
-nlmsg_failure:
-err:
-        kfree_skb(dcbnl_skb);
-err_out:
-        ret  = -EINVAL;
+        nla_nest_cancel(skb, bcn_nest);
         return ret;
 }
 
-static int dcbnl_bcn_setcfg(struct net_device *netdev, struct nlattr **tb,
-                            u32 pid, u32 seq, u16 flags)
+static int dcbnl_bcn_setcfg(struct net_device *netdev, struct nlmsghdr *nlh,
+                            u32 seq, struct nlattr **tb, struct sk_buff *skb)
 {
         struct nlattr *data[DCB_BCN_ATTR_MAX + 1];
         int i;
-        int ret = -EINVAL;
+        int ret;
         u8 value_byte;
         u32 value_int;
 
-        if (!tb[DCB_ATTR_BCN] || !netdev->dcbnl_ops->setbcncfg ||
+        if (!tb[DCB_ATTR_BCN])
+                return -EINVAL;
+
+        if (!netdev->dcbnl_ops->setbcncfg ||
             !netdev->dcbnl_ops->setbcnrp)
-                return ret;
+                return -EOPNOTSUPP;
 
         ret = nla_parse_nested(data, DCB_BCN_ATTR_MAX,
                                tb[DCB_ATTR_BCN],
                                dcbnl_pfc_up_nest);
         if (ret)
-                goto err;
+                return ret;
 
         for (i = DCB_BCN_ATTR_RP_0; i <= DCB_BCN_ATTR_RP_7; i++) {
                 if (data[i] == NULL)
@@ -1164,10 +965,7 @@ static int dcbnl_bcn_setcfg(struct net_device *netdev, struct nlattr **tb,
                                              i, value_int);
         }
 
-        ret = dcbnl_reply(0, RTM_SETDCB, DCB_CMD_BCN_SCFG, DCB_ATTR_BCN,
-                          pid, seq, flags);
-err:
-        return ret;
+        return nla_put_u8(skb, DCB_ATTR_BCN, 0);
 }
 
 static int dcbnl_build_peer_app(struct net_device *netdev, struct sk_buff* skb,
@@ -1233,20 +1031,21 @@ static int dcbnl_ieee_fill(struct sk_buff *skb, struct net_device *netdev)
         struct dcb_app_type *itr;
         const struct dcbnl_rtnl_ops *ops = netdev->dcbnl_ops;
         int dcbx;
-        int err = -EMSGSIZE;
+        int err;
 
         if (nla_put_string(skb, DCB_ATTR_IFNAME, netdev->name))
-                goto nla_put_failure;
+                return -EMSGSIZE;
+
         ieee = nla_nest_start(skb, DCB_ATTR_IEEE);
         if (!ieee)
-                goto nla_put_failure;
+                return -EMSGSIZE;
 
         if (ops->ieee_getets) {
                 struct ieee_ets ets;
                 err = ops->ieee_getets(netdev, &ets);
                 if (!err &&
                     nla_put(skb, DCB_ATTR_IEEE_ETS, sizeof(ets), &ets))
-                        goto nla_put_failure;
+                        return -EMSGSIZE;
         }
 
         if (ops->ieee_getmaxrate) {
@@ -1256,7 +1055,7 @@ static int dcbnl_ieee_fill(struct sk_buff *skb, struct net_device *netdev)
                         err = nla_put(skb, DCB_ATTR_IEEE_MAXRATE,
                                       sizeof(maxrate), &maxrate);
                         if (err)
-                                goto nla_put_failure;
+                                return -EMSGSIZE;
                 }
         }
 
@@ -1265,12 +1064,12 @@ static int dcbnl_ieee_fill(struct sk_buff *skb, struct net_device *netdev)
                 err = ops->ieee_getpfc(netdev, &pfc);
                 if (!err &&
                     nla_put(skb, DCB_ATTR_IEEE_PFC, sizeof(pfc), &pfc))
-                        goto nla_put_failure;
+                        return -EMSGSIZE;
         }
 
         app = nla_nest_start(skb, DCB_ATTR_IEEE_APP_TABLE);
         if (!app)
-                goto nla_put_failure;
+                return -EMSGSIZE;
 
         spin_lock(&dcb_lock);
         list_for_each_entry(itr, &dcb_app_list, list) {
@@ -1279,7 +1078,7 @@ static int dcbnl_ieee_fill(struct sk_buff *skb, struct net_device *netdev)
                                          &itr->app);
                         if (err) {
                                 spin_unlock(&dcb_lock);
-                                goto nla_put_failure;
+                                return -EMSGSIZE;
                         }
                 }
         }
@@ -1298,7 +1097,7 @@ static int dcbnl_ieee_fill(struct sk_buff *skb, struct net_device *netdev)
                 err = ops->ieee_peer_getets(netdev, &ets);
                 if (!err &&
                     nla_put(skb, DCB_ATTR_IEEE_PEER_ETS, sizeof(ets), &ets))
-                        goto nla_put_failure;
+                        return -EMSGSIZE;
         }
 
         if (ops->ieee_peer_getpfc) {
@@ -1306,7 +1105,7 @@ static int dcbnl_ieee_fill(struct sk_buff *skb, struct net_device *netdev)
                 err = ops->ieee_peer_getpfc(netdev, &pfc);
                 if (!err &&
                     nla_put(skb, DCB_ATTR_IEEE_PEER_PFC, sizeof(pfc), &pfc))
-                        goto nla_put_failure;
+                        return -EMSGSIZE;
         }
 
         if (ops->peer_getappinfo && ops->peer_getapptable) {
@@ -1315,20 +1114,17 @@ static int dcbnl_ieee_fill(struct sk_buff *skb, struct net_device *netdev)
                                            DCB_ATTR_IEEE_APP_UNSPEC,
                                            DCB_ATTR_IEEE_APP);
                 if (err)
-                        goto nla_put_failure;
+                        return -EMSGSIZE;
         }
 
         nla_nest_end(skb, ieee);
         if (dcbx >= 0) {
                 err = nla_put_u8(skb, DCB_ATTR_DCBX, dcbx);
                 if (err)
-                        goto nla_put_failure;
+                        return -EMSGSIZE;
         }
 
         return 0;
-
-nla_put_failure:
-        return err;
 }
 
 static int dcbnl_cee_pg_fill(struct sk_buff *skb, struct net_device *dev,
@@ -1340,13 +1136,13 @@ static int dcbnl_cee_pg_fill(struct sk_buff *skb, struct net_device *dev,
         struct nlattr *pg = nla_nest_start(skb, i);
 
         if (!pg)
-                goto nla_put_failure;
+                return -EMSGSIZE;
 
         for (i = DCB_PG_ATTR_TC_0; i <= DCB_PG_ATTR_TC_7; i++) {
                 struct nlattr *tc_nest = nla_nest_start(skb, i);
 
                 if (!tc_nest)
-                        goto nla_put_failure;
+                        return -EMSGSIZE;
 
                 pgid = DCB_ATTR_VALUE_UNDEFINED;
                 prio = DCB_ATTR_VALUE_UNDEFINED;
@@ -1364,7 +1160,7 @@ static int dcbnl_cee_pg_fill(struct sk_buff *skb, struct net_device *dev,
                     nla_put_u8(skb, DCB_TC_ATTR_PARAM_UP_MAPPING, up_map) ||
                     nla_put_u8(skb, DCB_TC_ATTR_PARAM_STRICT_PRIO, prio) ||
                     nla_put_u8(skb, DCB_TC_ATTR_PARAM_BW_PCT, tc_pct))
-                        goto nla_put_failure;
+                        return -EMSGSIZE;
                 nla_nest_end(skb, tc_nest);
         }
 
@@ -1378,13 +1174,10 @@ static int dcbnl_cee_pg_fill(struct sk_buff *skb, struct net_device *dev,
                         ops->getpgbwgcfgtx(dev, i - DCB_PG_ATTR_BW_ID_0,
                                            &tc_pct);
                 if (nla_put_u8(skb, i, tc_pct))
-                        goto nla_put_failure;
+                        return -EMSGSIZE;
         }
         nla_nest_end(skb, pg);
         return 0;
-
-nla_put_failure:
-        return -EMSGSIZE;
 }
 
 static int dcbnl_cee_fill(struct sk_buff *skb, struct net_device *netdev)
@@ -1531,27 +1324,16 @@ static int dcbnl_notify(struct net_device *dev, int event, int cmd,
         struct net *net = dev_net(dev);
         struct sk_buff *skb;
         struct nlmsghdr *nlh;
-        struct dcbmsg *dcb;
         const struct dcbnl_rtnl_ops *ops = dev->dcbnl_ops;
         int err;
 
         if (!ops)
                 return -EOPNOTSUPP;
 
-        skb = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);
+        skb = dcbnl_newmsg(event, cmd, pid, seq, 0, &nlh);
         if (!skb)
                 return -ENOBUFS;
 
-        nlh = nlmsg_put(skb, pid, 0, event, sizeof(*dcb), 0);
-        if (nlh == NULL) {
-                nlmsg_free(skb);
-                return -EMSGSIZE;
-        }
-
-        dcb = NLMSG_DATA(nlh);
-        dcb->dcb_family = AF_UNSPEC;
-        dcb->cmd = cmd;
-
         if (dcbx_ver == DCB_CAP_DCBX_VER_IEEE)
                 err = dcbnl_ieee_fill(skb, dev);
         else
@@ -1559,8 +1341,7 @@ static int dcbnl_notify(struct net_device *dev, int event, int cmd,
 
         if (err < 0) {
                 /* Report error to broadcast listeners */
-                nlmsg_cancel(skb, nlh);
-                kfree_skb(skb);
+                nlmsg_free(skb);
                 rtnl_set_sk_err(net, RTNLGRP_DCB, err);
         } else {
                 /* End nlmsg and notify broadcast listeners */
@@ -1590,15 +1371,15 @@ EXPORT_SYMBOL(dcbnl_cee_notify);
  * No attempt is made to reconcile the case where only part of the
  * cmd can be completed.
  */
-static int dcbnl_ieee_set(struct net_device *netdev, struct nlattr **tb,
-                          u32 pid, u32 seq, u16 flags)
+static int dcbnl_ieee_set(struct net_device *netdev, struct nlmsghdr *nlh,
+                          u32 seq, struct nlattr **tb, struct sk_buff *skb)
 {
         const struct dcbnl_rtnl_ops *ops = netdev->dcbnl_ops;
         struct nlattr *ieee[DCB_ATTR_IEEE_MAX + 1];
-        int err = -EOPNOTSUPP;
+        int err;
 
         if (!ops)
-                return err;
+                return -EOPNOTSUPP;
 
         if (!tb[DCB_ATTR_IEEE])
                 return -EINVAL;
@@ -1649,58 +1430,28 @@ static int dcbnl_ieee_set(struct net_device *netdev, struct nlattr **tb,
         }
 
 err:
-        dcbnl_reply(err, RTM_SETDCB, DCB_CMD_IEEE_SET, DCB_ATTR_IEEE,
-                    pid, seq, flags);
+        err = nla_put_u8(skb, DCB_ATTR_IEEE, err);
         dcbnl_ieee_notify(netdev, RTM_SETDCB, DCB_CMD_IEEE_SET, seq, 0);
         return err;
 }
 
-static int dcbnl_ieee_get(struct net_device *netdev, struct nlattr **tb,
-                          u32 pid, u32 seq, u16 flags)
+static int dcbnl_ieee_get(struct net_device *netdev, struct nlmsghdr *nlh,
+                          u32 seq, struct nlattr **tb, struct sk_buff *skb)
 {
-        struct net *net = dev_net(netdev);
-        struct sk_buff *skb;
-        struct nlmsghdr *nlh;
-        struct dcbmsg *dcb;
         const struct dcbnl_rtnl_ops *ops = netdev->dcbnl_ops;
-        int err;
 
         if (!ops)
                 return -EOPNOTSUPP;
 
-        skb = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);
-        if (!skb)
-                return -ENOBUFS;
-
-        nlh = nlmsg_put(skb, pid, seq, RTM_GETDCB, sizeof(*dcb), flags);
-        if (nlh == NULL) {
-                nlmsg_free(skb);
-                return -EMSGSIZE;
-        }
-
-        dcb = NLMSG_DATA(nlh);
-        dcb->dcb_family = AF_UNSPEC;
-        dcb->cmd = DCB_CMD_IEEE_GET;
-
-        err = dcbnl_ieee_fill(skb, netdev);
-
-        if (err < 0) {
-                nlmsg_cancel(skb, nlh);
-                kfree_skb(skb);
-        } else {
-                nlmsg_end(skb, nlh);
-                err = rtnl_unicast(skb, net, pid);
-        }
-
-        return err;
+        return dcbnl_ieee_fill(skb, netdev);
 }
 
-static int dcbnl_ieee_del(struct net_device *netdev, struct nlattr **tb,
-                          u32 pid, u32 seq, u16 flags)
+static int dcbnl_ieee_del(struct net_device *netdev, struct nlmsghdr *nlh,
+                          u32 seq, struct nlattr **tb, struct sk_buff *skb)
 {
         const struct dcbnl_rtnl_ops *ops = netdev->dcbnl_ops;
         struct nlattr *ieee[DCB_ATTR_IEEE_MAX + 1];
-        int err = -EOPNOTSUPP;
+        int err;
 
         if (!ops)
                 return -EOPNOTSUPP;
@@ -1733,32 +1484,26 @@ static int dcbnl_ieee_del(struct net_device *netdev, struct nlattr **tb,
         }
 
 err:
-        dcbnl_reply(err, RTM_SETDCB, DCB_CMD_IEEE_DEL, DCB_ATTR_IEEE,
-                    pid, seq, flags);
+        err = nla_put_u8(skb, DCB_ATTR_IEEE, err);
         dcbnl_ieee_notify(netdev, RTM_SETDCB, DCB_CMD_IEEE_DEL, seq, 0);
         return err;
 }
 
 
 /* DCBX configuration */
-static int dcbnl_getdcbx(struct net_device *netdev, struct nlattr **tb,
-                         u32 pid, u32 seq, u16 flags)
+static int dcbnl_getdcbx(struct net_device *netdev, struct nlmsghdr *nlh,
+                         u32 seq, struct nlattr **tb, struct sk_buff *skb)
 {
-        int ret;
-
         if (!netdev->dcbnl_ops->getdcbx)
                 return -EOPNOTSUPP;
 
-        ret = dcbnl_reply(netdev->dcbnl_ops->getdcbx(netdev), RTM_GETDCB,
-                          DCB_CMD_GDCBX, DCB_ATTR_DCBX, pid, seq, flags);
-
-        return ret;
+        return nla_put_u8(skb, DCB_ATTR_DCBX,
+                          netdev->dcbnl_ops->getdcbx(netdev));
 }
 
-static int dcbnl_setdcbx(struct net_device *netdev, struct nlattr **tb,
-                         u32 pid, u32 seq, u16 flags)
+static int dcbnl_setdcbx(struct net_device *netdev, struct nlmsghdr *nlh,
+                         u32 seq, struct nlattr **tb, struct sk_buff *skb)
 {
-        int ret;
         u8 value;
 
         if (!netdev->dcbnl_ops->setdcbx)
@@ -1769,19 +1514,13 @@ static int dcbnl_setdcbx(struct net_device *netdev, struct nlattr **tb,
 
         value = nla_get_u8(tb[DCB_ATTR_DCBX]);
 
-        ret = dcbnl_reply(netdev->dcbnl_ops->setdcbx(netdev, value),
-                          RTM_SETDCB, DCB_CMD_SDCBX, DCB_ATTR_DCBX,
-                          pid, seq, flags);
-
-        return ret;
+        return nla_put_u8(skb, DCB_ATTR_DCBX,
+                          netdev->dcbnl_ops->setdcbx(netdev, value));
 }
 
-static int dcbnl_getfeatcfg(struct net_device *netdev, struct nlattr **tb,
-                            u32 pid, u32 seq, u16 flags)
+static int dcbnl_getfeatcfg(struct net_device *netdev, struct nlmsghdr *nlh,
+                            u32 seq, struct nlattr **tb, struct sk_buff *skb)
 {
-        struct sk_buff *dcbnl_skb;
-        struct nlmsghdr *nlh;
-        struct dcbmsg *dcb;
         struct nlattr *data[DCB_FEATCFG_ATTR_MAX + 1], *nest;
         u8 value;
         int ret, i;
@@ -1796,25 +1535,11 @@ static int dcbnl_getfeatcfg(struct net_device *netdev, struct nlattr **tb,
         ret = nla_parse_nested(data, DCB_FEATCFG_ATTR_MAX, tb[DCB_ATTR_FEATCFG],
                                dcbnl_featcfg_nest);
         if (ret)
-                goto err_out;
-
-        dcbnl_skb = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);
-        if (!dcbnl_skb) {
-                ret = -ENOBUFS;
-                goto err_out;
-        }
-
-        nlh = NLMSG_NEW(dcbnl_skb, pid, seq, RTM_GETDCB, sizeof(*dcb), flags);
-
-        dcb = NLMSG_DATA(nlh);
-        dcb->dcb_family = AF_UNSPEC;
-        dcb->cmd = DCB_CMD_GFEATCFG;
+                return ret;
 
-        nest = nla_nest_start(dcbnl_skb, DCB_ATTR_FEATCFG);
-        if (!nest) {
-                ret = -EMSGSIZE;
-                goto nla_put_failure;
-        }
+        nest = nla_nest_start(skb, DCB_ATTR_FEATCFG);
+        if (!nest)
+                return -EMSGSIZE;
 
         if (data[DCB_FEATCFG_ATTR_ALL])
                 getall = 1;
@@ -1825,28 +1550,21 @@ static int dcbnl_getfeatcfg(struct net_device *netdev, struct nlattr **tb,
 
                 ret = netdev->dcbnl_ops->getfeatcfg(netdev, i, &value);
                 if (!ret)
-                        ret = nla_put_u8(dcbnl_skb, i, value);
+                        ret = nla_put_u8(skb, i, value);
 
                 if (ret) {
-                        nla_nest_cancel(dcbnl_skb, nest);
+                        nla_nest_cancel(skb, nest);
                         goto nla_put_failure;
                 }
         }
-        nla_nest_end(dcbnl_skb, nest);
+        nla_nest_end(skb, nest);
 
-        nlmsg_end(dcbnl_skb, nlh);
-
-        return rtnl_unicast(dcbnl_skb, &init_net, pid);
 nla_put_failure:
-        nlmsg_cancel(dcbnl_skb, nlh);
-nlmsg_failure:
-        kfree_skb(dcbnl_skb);
-err_out:
         return ret;
 }
 
-static int dcbnl_setfeatcfg(struct net_device *netdev, struct nlattr **tb,
-                            u32 pid, u32 seq, u16 flags)
+static int dcbnl_setfeatcfg(struct net_device *netdev, struct nlmsghdr *nlh,
+                            u32 seq, struct nlattr **tb, struct sk_buff *skb)
 {
         struct nlattr *data[DCB_FEATCFG_ATTR_MAX + 1];
         int ret, i;
@@ -1876,60 +1594,73 @@ static int dcbnl_setfeatcfg(struct net_device *netdev, struct nlattr **tb,
                         goto err;
         }
 err:
-        dcbnl_reply(ret, RTM_SETDCB, DCB_CMD_SFEATCFG, DCB_ATTR_FEATCFG,
-                    pid, seq, flags);
+        ret = nla_put_u8(skb, DCB_ATTR_FEATCFG, ret);
 
         return ret;
 }
 
 /* Handle CEE DCBX GET commands. */
-static int dcbnl_cee_get(struct net_device *netdev, struct nlattr **tb,
-                         u32 pid, u32 seq, u16 flags)
+static int dcbnl_cee_get(struct net_device *netdev, struct nlmsghdr *nlh,
+                         u32 seq, struct nlattr **tb, struct sk_buff *skb)
 {
-        struct net *net = dev_net(netdev);
-        struct sk_buff *skb;
-        struct nlmsghdr *nlh;
-        struct dcbmsg *dcb;
         const struct dcbnl_rtnl_ops *ops = netdev->dcbnl_ops;
-        int err;
 
         if (!ops)
                 return -EOPNOTSUPP;
 
-        skb = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);
-        if (!skb)
-                return -ENOBUFS;
-
-        nlh = nlmsg_put(skb, pid, seq, RTM_GETDCB, sizeof(*dcb), flags);
-        if (nlh == NULL) {
-                nlmsg_free(skb);
-                return -EMSGSIZE;
-        }
+        return dcbnl_cee_fill(skb, netdev);
+}
 
-        dcb = NLMSG_DATA(nlh);
-        dcb->dcb_family = AF_UNSPEC;
-        dcb->cmd = DCB_CMD_CEE_GET;
+struct reply_func {
+        /* reply netlink message type */
+        int     type;
 
-        err = dcbnl_cee_fill(skb, netdev);
+        /* function to fill message contents */
+        int   (*cb)(struct net_device *, struct nlmsghdr *, u32,
+                    struct nlattr **, struct sk_buff *);
+};
 
-        if (err < 0) {
-                nlmsg_cancel(skb, nlh);
-                nlmsg_free(skb);
-        } else {
-                nlmsg_end(skb, nlh);
-                err = rtnl_unicast(skb, net, pid);
-        }
-        return err;
-}
+static const struct reply_func reply_funcs[DCB_CMD_MAX+1] = {
+        [DCB_CMD_GSTATE]        = { RTM_GETDCB, dcbnl_getstate },
+        [DCB_CMD_SSTATE]        = { RTM_SETDCB, dcbnl_setstate },
+        [DCB_CMD_PFC_GCFG]      = { RTM_GETDCB, dcbnl_getpfccfg },
+        [DCB_CMD_PFC_SCFG]      = { RTM_SETDCB, dcbnl_setpfccfg },
+        [DCB_CMD_GPERM_HWADDR]  = { RTM_GETDCB, dcbnl_getperm_hwaddr },
+        [DCB_CMD_GCAP]          = { RTM_GETDCB, dcbnl_getcap },
+        [DCB_CMD_GNUMTCS]       = { RTM_GETDCB, dcbnl_getnumtcs },
+        [DCB_CMD_SNUMTCS]       = { RTM_SETDCB, dcbnl_setnumtcs },
+        [DCB_CMD_PFC_GSTATE]    = { RTM_GETDCB, dcbnl_getpfcstate },
+        [DCB_CMD_PFC_SSTATE]    = { RTM_SETDCB, dcbnl_setpfcstate },
+        [DCB_CMD_GAPP]          = { RTM_GETDCB, dcbnl_getapp },
+        [DCB_CMD_SAPP]          = { RTM_SETDCB, dcbnl_setapp },
+        [DCB_CMD_PGTX_GCFG]     = { RTM_GETDCB, dcbnl_pgtx_getcfg },
+        [DCB_CMD_PGTX_SCFG]     = { RTM_SETDCB, dcbnl_pgtx_setcfg },
+        [DCB_CMD_PGRX_GCFG]     = { RTM_GETDCB, dcbnl_pgrx_getcfg },
+        [DCB_CMD_PGRX_SCFG]     = { RTM_SETDCB, dcbnl_pgrx_setcfg },
+        [DCB_CMD_SET_ALL]       = { RTM_SETDCB, dcbnl_setall },
+        [DCB_CMD_BCN_GCFG]      = { RTM_GETDCB, dcbnl_bcn_getcfg },
+        [DCB_CMD_BCN_SCFG]      = { RTM_SETDCB, dcbnl_bcn_setcfg },
+        [DCB_CMD_IEEE_GET]      = { RTM_GETDCB, dcbnl_ieee_get },
+        [DCB_CMD_IEEE_SET]      = { RTM_SETDCB, dcbnl_ieee_set },
+        [DCB_CMD_IEEE_DEL]      = { RTM_SETDCB, dcbnl_ieee_del },
+        [DCB_CMD_GDCBX]         = { RTM_GETDCB, dcbnl_getdcbx },
+        [DCB_CMD_SDCBX]         = { RTM_SETDCB, dcbnl_setdcbx },
+        [DCB_CMD_GFEATCFG]      = { RTM_GETDCB, dcbnl_getfeatcfg },
+        [DCB_CMD_SFEATCFG]      = { RTM_SETDCB, dcbnl_setfeatcfg },
+        [DCB_CMD_CEE_GET]       = { RTM_GETDCB, dcbnl_cee_get },
+};
 
 static int dcb_doit(struct sk_buff *skb, struct nlmsghdr *nlh, void *arg)
 {
         struct net *net = sock_net(skb->sk);
         struct net_device *netdev;
-        struct dcbmsg  *dcb = (struct dcbmsg *)NLMSG_DATA(nlh);
+        struct dcbmsg *dcb = nlmsg_data(nlh);
         struct nlattr *tb[DCB_ATTR_MAX + 1];
         u32 pid = skb ? NETLINK_CB(skb).pid : 0;
         int ret = -EINVAL;
+        struct sk_buff *reply_skb;
+        struct nlmsghdr *reply_nlh = NULL;
+        const struct reply_func *fn;
 
         if (!net_eq(net, &init_net))
                 return -EINVAL;
@@ -1939,136 +1670,78 @@ static int dcb_doit(struct sk_buff *skb, struct nlmsghdr *nlh, void *arg)
         if (ret < 0)
                 return ret;
 
+        if (dcb->cmd > DCB_CMD_MAX)
+                return -EINVAL;
+
+        /* check if a reply function has been defined for the command */
+        fn = &reply_funcs[dcb->cmd];
+        if (!fn->cb)
+                return -EOPNOTSUPP;
+
         if (!tb[DCB_ATTR_IFNAME])
                 return -EINVAL;
 
         netdev = dev_get_by_name(&init_net, nla_data(tb[DCB_ATTR_IFNAME]));
         if (!netdev)
-                return -EINVAL;
+                return -ENODEV;
 
-        if (!netdev->dcbnl_ops)
-                goto errout;
-
-        switch (dcb->cmd) {
-        case DCB_CMD_GSTATE:
-                ret = dcbnl_getstate(netdev, tb, pid, nlh->nlmsg_seq,
-                                     nlh->nlmsg_flags);
-                goto out;
-        case DCB_CMD_PFC_GCFG:
-                ret = dcbnl_getpfccfg(netdev, tb, pid, nlh->nlmsg_seq,
-                                      nlh->nlmsg_flags);
-                goto out;
-        case DCB_CMD_GPERM_HWADDR:
-                ret = dcbnl_getperm_hwaddr(netdev, tb, pid, nlh->nlmsg_seq,
-                                           nlh->nlmsg_flags);
-                goto out;
-        case DCB_CMD_PGTX_GCFG:
-                ret = dcbnl_pgtx_getcfg(netdev, tb, pid, nlh->nlmsg_seq,
-                                        nlh->nlmsg_flags);
-                goto out;
-        case DCB_CMD_PGRX_GCFG:
-                ret = dcbnl_pgrx_getcfg(netdev, tb, pid, nlh->nlmsg_seq,
-                                        nlh->nlmsg_flags);
-                goto out;
-        case DCB_CMD_BCN_GCFG:
-                ret = dcbnl_bcn_getcfg(netdev, tb, pid, nlh->nlmsg_seq,
-                                       nlh->nlmsg_flags);
-                goto out;
-        case DCB_CMD_SSTATE:
-                ret = dcbnl_setstate(netdev, tb, pid, nlh->nlmsg_seq,
-                                     nlh->nlmsg_flags);
-                goto out;
-        case DCB_CMD_PFC_SCFG:
-                ret = dcbnl_setpfccfg(netdev, tb, pid, nlh->nlmsg_seq,
-                                      nlh->nlmsg_flags);
+        if (!netdev->dcbnl_ops) {
+                ret = -EOPNOTSUPP;
                 goto out;
+        }
 
-        case DCB_CMD_SET_ALL:
-                ret = dcbnl_setall(netdev, tb, pid, nlh->nlmsg_seq,
-                                   nlh->nlmsg_flags);
-                goto out;
-        case DCB_CMD_PGTX_SCFG:
-                ret = dcbnl_pgtx_setcfg(netdev, tb, pid, nlh->nlmsg_seq,
-                                        nlh->nlmsg_flags);
-                goto out;
-        case DCB_CMD_PGRX_SCFG:
-                ret = dcbnl_pgrx_setcfg(netdev, tb, pid, nlh->nlmsg_seq,
-                                        nlh->nlmsg_flags);
-                goto out;
-        case DCB_CMD_GCAP:
-                ret = dcbnl_getcap(netdev, tb, pid, nlh->nlmsg_seq,
-                                   nlh->nlmsg_flags);
-                goto out;
-        case DCB_CMD_GNUMTCS:
-                ret = dcbnl_getnumtcs(netdev, tb, pid, nlh->nlmsg_seq,
-                                      nlh->nlmsg_flags);
-                goto out;
-        case DCB_CMD_SNUMTCS:
-                ret = dcbnl_setnumtcs(netdev, tb, pid, nlh->nlmsg_seq,
-                                      nlh->nlmsg_flags);
-                goto out;
-        case DCB_CMD_PFC_GSTATE:
-                ret = dcbnl_getpfcstate(netdev, tb, pid, nlh->nlmsg_seq,
-                                        nlh->nlmsg_flags);
-                goto out;
-        case DCB_CMD_PFC_SSTATE:
-                ret = dcbnl_setpfcstate(netdev, tb, pid, nlh->nlmsg_seq,
-                                        nlh->nlmsg_flags);
-                goto out;
-        case DCB_CMD_BCN_SCFG:
-                ret = dcbnl_bcn_setcfg(netdev, tb, pid, nlh->nlmsg_seq,
-                                       nlh->nlmsg_flags);
-                goto out;
-        case DCB_CMD_GAPP:
-                ret = dcbnl_getapp(netdev, tb, pid, nlh->nlmsg_seq,
-                                   nlh->nlmsg_flags);
-                goto out;
-        case DCB_CMD_SAPP:
-                ret = dcbnl_setapp(netdev, tb, pid, nlh->nlmsg_seq,
-                                   nlh->nlmsg_flags);
-                goto out;
-        case DCB_CMD_IEEE_SET:
-                ret = dcbnl_ieee_set(netdev, tb, pid, nlh->nlmsg_seq,
-                                     nlh->nlmsg_flags);
-                goto out;
-        case DCB_CMD_IEEE_GET:
-                ret = dcbnl_ieee_get(netdev, tb, pid, nlh->nlmsg_seq,
-                                     nlh->nlmsg_flags);
-                goto out;
-        case DCB_CMD_IEEE_DEL:
-                ret = dcbnl_ieee_del(netdev, tb, pid, nlh->nlmsg_seq,
-                                     nlh->nlmsg_flags);
-                goto out;
-        case DCB_CMD_GDCBX:
-                ret = dcbnl_getdcbx(netdev, tb, pid, nlh->nlmsg_seq,
-                                    nlh->nlmsg_flags);
-                goto out;
-        case DCB_CMD_SDCBX:
-                ret = dcbnl_setdcbx(netdev, tb, pid, nlh->nlmsg_seq,
-                                    nlh->nlmsg_flags);
-                goto out;
-        case DCB_CMD_GFEATCFG:
-                ret = dcbnl_getfeatcfg(netdev, tb, pid, nlh->nlmsg_seq,
-                                       nlh->nlmsg_flags);
-                goto out;
-        case DCB_CMD_SFEATCFG:
-                ret = dcbnl_setfeatcfg(netdev, tb, pid, nlh->nlmsg_seq,
-                                       nlh->nlmsg_flags);
+        reply_skb = dcbnl_newmsg(fn->type, dcb->cmd, pid, nlh->nlmsg_seq,
+                                 nlh->nlmsg_flags, &reply_nlh);
+        if (!reply_skb) {
+                ret = -ENOBUFS;
                 goto out;
-        case DCB_CMD_CEE_GET:
-                ret = dcbnl_cee_get(netdev, tb, pid, nlh->nlmsg_seq,
-                                    nlh->nlmsg_flags);
+        }
+
+        ret = fn->cb(netdev, nlh, nlh->nlmsg_seq, tb, reply_skb);
+        if (ret < 0) {
+                nlmsg_free(reply_skb);
                 goto out;
-        default:
-                goto errout;
         }
-errout:
-        ret = -EINVAL;
+
+        nlmsg_end(reply_skb, reply_nlh);
+
+        ret = rtnl_unicast(reply_skb, &init_net, pid);
 out:
         dev_put(netdev);
         return ret;
 }
 
+static struct dcb_app_type *dcb_app_lookup(const struct dcb_app *app,
+                                           int ifindex, int prio)
+{
+        struct dcb_app_type *itr;
+
+        list_for_each_entry(itr, &dcb_app_list, list) {
+                if (itr->app.selector == app->selector &&
+                    itr->app.protocol == app->protocol &&
+                    itr->ifindex == ifindex &&
+                    (!prio || itr->app.priority == prio))
+                        return itr;
+        }
+
+        return NULL;
+}
+
+static int dcb_app_add(const struct dcb_app *app, int ifindex)
+{
+        struct dcb_app_type *entry;
+
+        entry = kmalloc(sizeof(*entry), GFP_ATOMIC);
+        if (!entry)
+                return -ENOMEM;
+
+        memcpy(&entry->app, app, sizeof(*app));
+        entry->ifindex = ifindex;
+        list_add(&entry->list, &dcb_app_list);
+
+        return 0;
+}
+
 /**
  * dcb_getapp - retrieve the DCBX application user priority
  *
@@ -2082,14 +1755,8 @@ u8 dcb_getapp(struct net_device *dev, struct dcb_app *app)
         u8 prio = 0;
 
         spin_lock(&dcb_lock);
-        list_for_each_entry(itr, &dcb_app_list, list) {
-                if (itr->app.selector == app->selector &&
-                    itr->app.protocol == app->protocol &&
-                    itr->ifindex == dev->ifindex) {
-                        prio = itr->app.priority;
-                        break;
-                }
-        }
+        if ((itr = dcb_app_lookup(app, dev->ifindex, 0)))
+                prio = itr->app.priority;
         spin_unlock(&dcb_lock);
 
         return prio;
@@ -2107,6 +1774,7 @@ int dcb_setapp(struct net_device *dev, struct dcb_app *new)
 {
         struct dcb_app_type *itr;
         struct dcb_app_type event;
+        int err = 0;
 
         event.ifindex = dev->ifindex;
         memcpy(&event.app, new, sizeof(event.app));
@@ -2115,36 +1783,23 @@ int dcb_setapp(struct net_device *dev, struct dcb_app *new)
 
         spin_lock(&dcb_lock);
         /* Search for existing match and replace */
-        list_for_each_entry(itr, &dcb_app_list, list) {
-                if (itr->app.selector == new->selector &&
-                    itr->app.protocol == new->protocol &&
-                    itr->ifindex == dev->ifindex) {
-                        if (new->priority)
-                                itr->app.priority = new->priority;
-                        else {
-                                list_del(&itr->list);
-                                kfree(itr);
-                        }
-                        goto out;
+        if ((itr = dcb_app_lookup(new, dev->ifindex, 0))) {
+                if (new->priority)
+                        itr->app.priority = new->priority;
+                else {
+                        list_del(&itr->list);
+                        kfree(itr);
                 }
+                goto out;
         }
         /* App type does not exist add new application type */
-        if (new->priority) {
-                struct dcb_app_type *entry;
-                entry = kmalloc(sizeof(struct dcb_app_type), GFP_ATOMIC);
-                if (!entry) {
-                        spin_unlock(&dcb_lock);
-                        return -ENOMEM;
-                }
-
-                memcpy(&entry->app, new, sizeof(*new));
-                entry->ifindex = dev->ifindex;
-                list_add(&entry->list, &dcb_app_list);
-        }
+        if (new->priority)
+                err = dcb_app_add(new, dev->ifindex);
 out:
         spin_unlock(&dcb_lock);
-        call_dcbevent_notifiers(DCB_APP_EVENT, &event);
-        return 0;
+        if (!err)
+                call_dcbevent_notifiers(DCB_APP_EVENT, &event);
+        return err;
 }
 EXPORT_SYMBOL(dcb_setapp);
 
@@ -2161,13 +1816,8 @@ u8 dcb_ieee_getapp_mask(struct net_device *dev, struct dcb_app *app)
         u8 prio = 0;
 
         spin_lock(&dcb_lock);
-        list_for_each_entry(itr, &dcb_app_list, list) {
-                if (itr->app.selector == app->selector &&
-                    itr->app.protocol == app->protocol &&
-                    itr->ifindex == dev->ifindex) {
-                        prio |= 1 << itr->app.priority;
-                }
-        }
+        if ((itr = dcb_app_lookup(app, dev->ifindex, 0)))
+                prio |= 1 << itr->app.priority;
         spin_unlock(&dcb_lock);
 
         return prio;
@@ -2183,7 +1833,6 @@ EXPORT_SYMBOL(dcb_ieee_getapp_mask);
  */
 int dcb_ieee_setapp(struct net_device *dev, struct dcb_app *new)
 {
-        struct dcb_app_type *itr, *entry;
         struct dcb_app_type event;
         int err = 0;
 
@@ -2194,26 +1843,12 @@ int dcb_ieee_setapp(struct net_device *dev, struct dcb_app *new)
 
         spin_lock(&dcb_lock);
         /* Search for existing match and abort if found */
-        list_for_each_entry(itr, &dcb_app_list, list) {
-                if (itr->app.selector == new->selector &&
-                    itr->app.protocol == new->protocol &&
-                    itr->app.priority == new->priority &&
-                    itr->ifindex == dev->ifindex) {
-                        err = -EEXIST;
-                        goto out;
-                }
-        }
-
-        /* App entry does not exist add new entry */
-        entry = kmalloc(sizeof(struct dcb_app_type), GFP_ATOMIC);
-        if (!entry) {
-                err = -ENOMEM;
+        if (dcb_app_lookup(new, dev->ifindex, new->priority)) {
+                err = -EEXIST;
                 goto out;
         }
 
-        memcpy(&entry->app, new, sizeof(*new));
-        entry->ifindex = dev->ifindex;
-        list_add(&entry->list, &dcb_app_list);
+        err = dcb_app_add(new, dev->ifindex);
 out:
         spin_unlock(&dcb_lock);
         if (!err)
@@ -2240,19 +1875,12 @@ int dcb_ieee_delapp(struct net_device *dev, struct dcb_app *del)
 
         spin_lock(&dcb_lock);
         /* Search for existing match and remove it. */
-        list_for_each_entry(itr, &dcb_app_list, list) {
-                if (itr->app.selector == del->selector &&
-                    itr->app.protocol == del->protocol &&
-                    itr->app.priority == del->priority &&
-                    itr->ifindex == dev->ifindex) {
-                        list_del(&itr->list);
-                        kfree(itr);
-                        err = 0;
-                        goto out;
-                }
+        if ((itr = dcb_app_lookup(del, dev->ifindex, del->priority))) {
+                list_del(&itr->list);
+                kfree(itr);
+                err = 0;
         }
 
-out:
         spin_unlock(&dcb_lock);
         if (!err)
                 call_dcbevent_notifiers(DCB_APP_EVENT, &event);
diff --git a/net/dccp/ackvec.h b/net/dccp/ackvec.h
index e2ab0627a5f..a269aa7f792 100644
--- a/net/dccp/ackvec.h
+++ b/net/dccp/ackvec.h
@@ -50,7 +50,8 @@ static inline u8 dccp_ackvec_state(const u8 *cell)
         return *cell & ~DCCPAV_MAX_RUNLEN;
 }
 
-/** struct dccp_ackvec - Ack Vector main data structure
+/**
+ * struct dccp_ackvec - Ack Vector main data structure
  *
  * This implements a fixed-size circular buffer within an array and is largely
  * based on Appendix A of RFC 4340.
@@ -76,7 +77,8 @@ struct dccp_ackvec {
         struct list_head        av_records;
 };
 
-/** struct dccp_ackvec_record - Records information about sent Ack Vectors
+/**
+ * struct dccp_ackvec_record - Records information about sent Ack Vectors
  *
  * These list entries define the additional information which the HC-Receiver
  * keeps about recently-sent Ack Vectors; again refer to RFC 4340, Appendix A.
@@ -121,6 +123,7 @@ static inline bool dccp_ackvec_is_empty(const struct dccp_ackvec *av)
  * @len:        length of @vec
  * @nonce:      whether @vec had an ECN nonce of 0 or 1
  * @node:       FIFO - arranged in descending order of ack_ackno
+ *
  * This structure is used by CCIDs to access Ack Vectors in a received skb.
  */
 struct dccp_ackvec_parsed {
diff --git a/net/dccp/ccid.c b/net/dccp/ccid.c
index 48b585a5cba..597557254dd 100644
--- a/net/dccp/ccid.c
+++ b/net/dccp/ccid.c
@@ -46,6 +46,7 @@ bool ccid_support_check(u8 const *ccid_array, u8 array_len)
  * ccid_get_builtin_ccids  -  Populate a list of built-in CCIDs
  * @ccid_array: pointer to copy into
  * @array_len: value to return length into
+ *
  * This function allocates memory - caller must see that it is freed after use.
  */
 int ccid_get_builtin_ccids(u8 **ccid_array, u8 *array_len)
diff --git a/net/dccp/ccids/ccid3.c b/net/dccp/ccids/ccid3.c
index 8c67bedf85b..d65e98798ec 100644
--- a/net/dccp/ccids/ccid3.c
+++ b/net/dccp/ccids/ccid3.c
@@ -113,6 +113,7 @@ static u32 ccid3_hc_tx_idle_rtt(struct ccid3_hc_tx_sock *hc, ktime_t now)
 /**
  * ccid3_hc_tx_update_x  -  Update allowed sending rate X
  * @stamp: most recent time if available - can be left NULL.
+ *
  * This function tracks draft rfc3448bis, check there for latest details.
  *
  * Note: X and X_recv are both stored in units of 64 * bytes/second, to support
@@ -161,9 +162,11 @@ static void ccid3_hc_tx_update_x(struct sock *sk, ktime_t *stamp)
         }
 }
 
-/*
- *      Track the mean packet size `s' (cf. RFC 4342, 5.3 and  RFC 3448, 4.1)
+/**
+ *      ccid3_hc_tx_update_s - Track the mean packet size `s'
  *      @len: DCCP packet payload size in bytes
+ *
+ *      cf. RFC 4342, 5.3 and  RFC 3448, 4.1
  */
 static inline void ccid3_hc_tx_update_s(struct ccid3_hc_tx_sock *hc, int len)
 {
@@ -270,6 +273,7 @@ out:
 /**
  * ccid3_hc_tx_send_packet  -  Delay-based dequeueing of TX packets
  * @skb: next packet candidate to send on @sk
+ *
  * This function uses the convention of ccid_packet_dequeue_eval() and
  * returns a millisecond-delay value between 0 and t_mbi = 64000 msec.
  */
diff --git a/net/dccp/ccids/lib/loss_interval.c b/net/dccp/ccids/lib/loss_interval.c
index 497723c4d4b..57f9fd78c4d 100644
--- a/net/dccp/ccids/lib/loss_interval.c
+++ b/net/dccp/ccids/lib/loss_interval.c
@@ -133,6 +133,7 @@ static inline u8 tfrc_lh_is_new_loss(struct tfrc_loss_interval *cur,
  * @rh:            Receive history containing a fresh loss event
  * @calc_first_li: Caller-dependent routine to compute length of first interval
  * @sk:            Used by @calc_first_li in caller-specific way (subtyping)
+ *
  * Updates I_mean and returns 1 if a new interval has in fact been added to @lh.
  */
 int tfrc_lh_interval_add(struct tfrc_loss_hist *lh, struct tfrc_rx_hist *rh,
diff --git a/net/dccp/ccids/lib/packet_history.c b/net/dccp/ccids/lib/packet_history.c
index de8fe294bf0..08df7a3acb3 100644
--- a/net/dccp/ccids/lib/packet_history.c
+++ b/net/dccp/ccids/lib/packet_history.c
@@ -315,6 +315,7 @@ static void __three_after_loss(struct tfrc_rx_hist *h)
  *  @ndp:           The NDP count belonging to @skb
  *  @calc_first_li: Caller-dependent computation of first loss interval in @lh
  *  @sk:            Used by @calc_first_li (see tfrc_lh_interval_add)
+ *
  *  Chooses action according to pending loss, updates LI database when a new
  *  loss was detected, and does required post-processing. Returns 1 when caller
  *  should send feedback, 0 otherwise.
@@ -387,7 +388,7 @@ static inline struct tfrc_rx_hist_entry *
 }
 
 /**
- * tfrc_rx_hist_rtt_prev_s: previously suitable (wrt rtt_last_s) RTT-sampling entry
+ * tfrc_rx_hist_rtt_prev_s - previously suitable (wrt rtt_last_s) RTT-sampling entry
  */
 static inline struct tfrc_rx_hist_entry *
                         tfrc_rx_hist_rtt_prev_s(const struct tfrc_rx_hist *h)
diff --git a/net/dccp/ccids/lib/tfrc_equation.c b/net/dccp/ccids/lib/tfrc_equation.c
index a052a4377e2..88ef98285be 100644
--- a/net/dccp/ccids/lib/tfrc_equation.c
+++ b/net/dccp/ccids/lib/tfrc_equation.c
@@ -611,6 +611,7 @@ static inline u32 tfrc_binsearch(u32 fval, u8 small)
  * @s: packet size          in bytes
  * @R: RTT                  scaled by 1000000   (i.e., microseconds)
  * @p: loss ratio estimate  scaled by 1000000
+ *
  * Returns X_calc           in bytes per second (not scaled).
  */
 u32 tfrc_calc_x(u16 s, u32 R, u32 p)
@@ -659,6 +660,7 @@ u32 tfrc_calc_x(u16 s, u32 R, u32 p)
 /**
  *  tfrc_calc_x_reverse_lookup  -  try to find p given f(p)
  *  @fvalue: function value to match, scaled by 1000000
+ *
  *  Returns closest match for p, also scaled by 1000000
  */
 u32 tfrc_calc_x_reverse_lookup(u32 fvalue)
diff --git a/net/dccp/dccp.h b/net/dccp/dccp.h
index 9040be049d8..708e75bf623 100644
--- a/net/dccp/dccp.h
+++ b/net/dccp/dccp.h
@@ -352,6 +352,7 @@ static inline int dccp_bad_service_code(const struct sock *sk,
  * @dccpd_opt_len: total length of all options (5.8) in the packet
  * @dccpd_seq: sequence number
  * @dccpd_ack_seq: acknowledgment number subheader field value
+ *
  * This is used for transmission as well as for reception.
  */
 struct dccp_skb_cb {
diff --git a/net/dccp/feat.c b/net/dccp/feat.c
index 78a2ad70e1b..9733ddbc96c 100644
--- a/net/dccp/feat.c
+++ b/net/dccp/feat.c
@@ -350,6 +350,7 @@ static int __dccp_feat_activate(struct sock *sk, const int idx,
  * @feat_num: feature to activate, one of %dccp_feature_numbers
  * @local: whether local (1) or remote (0) @feat_num is meant
  * @fval: the value (SP or NN) to activate, or NULL to use the default value
+ *
  * For general use this function is preferable over __dccp_feat_activate().
  */
 static int dccp_feat_activate(struct sock *sk, u8 feat_num, bool local,
@@ -446,6 +447,7 @@ static struct dccp_feat_entry *dccp_feat_list_lookup(struct list_head *fn_list,
  * @head:  list to add to
  * @feat:  feature number
  * @local: whether the local (1) or remote feature with number @feat is meant
+ *
  * This is the only constructor and serves to ensure the above invariants.
  */
 static struct dccp_feat_entry *
@@ -504,6 +506,7 @@ static int dccp_feat_push_change(struct list_head *fn_list, u8 feat, u8 local,
  * @feat: one of %dccp_feature_numbers
  * @local: whether local (1) or remote (0) @feat_num is being confirmed
  * @fval: pointer to NN/SP value to be inserted or NULL
+ *
  * Returns 0 on success, a Reset code for further processing otherwise.
  */
 static int dccp_feat_push_confirm(struct list_head *fn_list, u8 feat, u8 local,
@@ -691,6 +694,7 @@ int dccp_feat_insert_opts(struct dccp_sock *dp, struct dccp_request_sock *dreq,
  * @feat: an NN feature from %dccp_feature_numbers
  * @mandatory: use Mandatory option if 1
  * @nn_val: value to register (restricted to 4 bytes)
+ *
  * Note that NN features are local by definition (RFC 4340, 6.3.2).
  */
 static int __feat_register_nn(struct list_head *fn, u8 feat,
@@ -760,6 +764,7 @@ int dccp_feat_register_sp(struct sock *sk, u8 feat, u8 is_local,
  * dccp_feat_nn_get  -  Query current/pending value of NN feature
  * @sk: DCCP socket of an established connection
  * @feat: NN feature number from %dccp_feature_numbers
+ *
  * For a known NN feature, returns value currently being negotiated, or
  * current (confirmed) value if no negotiation is going on.
  */
@@ -790,6 +795,7 @@ EXPORT_SYMBOL_GPL(dccp_feat_nn_get);
  * @sk: DCCP socket of an established connection
  * @feat: NN feature number from %dccp_feature_numbers
  * @nn_val: the new value to use
+ *
  * This function is used to communicate NN updates out-of-band.
  */
 int dccp_feat_signal_nn_change(struct sock *sk, u8 feat, u64 nn_val)
@@ -930,6 +936,7 @@ static const struct ccid_dependency *dccp_feat_ccid_deps(u8 ccid, bool is_local)
  * @fn: feature-negotiation list to update
  * @id: CCID number to track
  * @is_local: whether TX CCID (1) or RX CCID (0) is meant
+ *
  * This function needs to be called after registering all other features.
  */
 static int dccp_feat_propagate_ccid(struct list_head *fn, u8 id, bool is_local)
@@ -953,6 +960,7 @@ static int dccp_feat_propagate_ccid(struct list_head *fn, u8 id, bool is_local)
 /**
  * dccp_feat_finalise_settings  -  Finalise settings before starting negotiation
  * @dp: client or listening socket (settings will be inherited)
+ *
  * This is called after all registrations (socket initialisation, sysctls, and
  * sockopt calls), and before sending the first packet containing Change options
  * (ie. client-Request or server-Response), to ensure internal consistency.
@@ -1284,6 +1292,7 @@ confirmation_failed:
  * @feat:       NN number, one of %dccp_feature_numbers
  * @val:        NN value
  * @len:        length of @val in bytes
+ *
  * This function combines the functionality of change_recv/confirm_recv, with
  * the following differences (reset codes are the same):
  *    - cleanup after receiving the Confirm;
@@ -1379,6 +1388,7 @@ fast_path_failed:
  * @feat: one of %dccp_feature_numbers
  * @val: value contents of @opt
  * @len: length of @val in bytes
+ *
  * Returns 0 on success, a Reset code for ending the connection otherwise.
  */
 int dccp_feat_parse_options(struct sock *sk, struct dccp_request_sock *dreq,
diff --git a/net/dccp/input.c b/net/dccp/input.c
index bc93a333931..14cdafad7a9 100644
--- a/net/dccp/input.c
+++ b/net/dccp/input.c
@@ -710,6 +710,7 @@ EXPORT_SYMBOL_GPL(dccp_rcv_state_process);
 /**
  *  dccp_sample_rtt  -  Validate and finalise computation of RTT sample
  *  @delta:     number of microseconds between packet and acknowledgment
+ *
  *  The routine is kept generic to work in different contexts. It should be
  *  called immediately when the ACK used for the RTT sample arrives.
  */
diff --git a/net/dccp/ipv4.c b/net/dccp/ipv4.c
index 07f5579ca75..3eb76b5f221 100644
--- a/net/dccp/ipv4.c
+++ b/net/dccp/ipv4.c
@@ -504,7 +504,7 @@ static int dccp_v4_send_response(struct sock *sk, struct request_sock *req,
         struct dst_entry *dst;
         struct flowi4 fl4;
 
-        dst = inet_csk_route_req(sk, &fl4, req);
+        dst = inet_csk_route_req(sk, &fl4, req, false);
         if (dst == NULL)
                 goto out;
 
diff --git a/net/dccp/ipv6.c b/net/dccp/ipv6.c
index fa9512d86f3..02162cfa504 100644
--- a/net/dccp/ipv6.c
+++ b/net/dccp/ipv6.c
@@ -165,6 +165,8 @@ static void dccp_v6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
                 } else
                         dst_hold(dst);
 
+                dst->ops->update_pmtu(dst, ntohl(info));
+
                 if (inet_csk(sk)->icsk_pmtu_cookie > dst_mtu(dst)) {
                         dccp_sync_mss(sk, dst_mtu(dst));
                 } /* else let the usual retransmit timer handle it */
@@ -237,7 +239,6 @@ static int dccp_v6_send_response(struct sock *sk, struct request_sock *req,
         struct inet6_request_sock *ireq6 = inet6_rsk(req);
         struct ipv6_pinfo *np = inet6_sk(sk);
         struct sk_buff *skb;
-        struct ipv6_txoptions *opt = NULL;
         struct in6_addr *final_p, final;
         struct flowi6 fl6;
         int err = -1;
@@ -253,9 +254,8 @@ static int dccp_v6_send_response(struct sock *sk, struct request_sock *req,
         fl6.fl6_sport = inet_rsk(req)->loc_port;
         security_req_classify_flow(req, flowi6_to_flowi(&fl6));
 
-        opt = np->opt;
 
-        final_p = fl6_update_dst(&fl6, opt, &final);
+        final_p = fl6_update_dst(&fl6, np->opt, &final);
 
         dst = ip6_dst_lookup_flow(sk, &fl6, final_p, false);
         if (IS_ERR(dst)) {
@@ -272,13 +272,11 @@ static int dccp_v6_send_response(struct sock *sk, struct request_sock *req,
                                                          &ireq6->loc_addr,
                                                          &ireq6->rmt_addr);
                 fl6.daddr = ireq6->rmt_addr;
-                err = ip6_xmit(sk, skb, &fl6, opt, np->tclass);
+                err = ip6_xmit(sk, skb, &fl6, np->opt, np->tclass);
                 err = net_xmit_eval(err);
         }
 
 done:
-        if (opt != NULL && opt != np->opt)
-                sock_kfree_s(sk, opt, opt->tot_len);
         dst_release(dst);
         return err;
 }
@@ -473,7 +471,6 @@ static struct sock *dccp_v6_request_recv_sock(struct sock *sk,
         struct inet_sock *newinet;
         struct dccp6_sock *newdp6;
         struct sock *newsk;
-        struct ipv6_txoptions *opt;
 
         if (skb->protocol == htons(ETH_P_IP)) {
                 /*
@@ -518,7 +515,6 @@ static struct sock *dccp_v6_request_recv_sock(struct sock *sk,
                 return newsk;
         }
 
-        opt = np->opt;
 
         if (sk_acceptq_is_full(sk))
                 goto out_overflow;
@@ -530,7 +526,7 @@ static struct sock *dccp_v6_request_recv_sock(struct sock *sk,
                 memset(&fl6, 0, sizeof(fl6));
                 fl6.flowi6_proto = IPPROTO_DCCP;
                 fl6.daddr = ireq6->rmt_addr;
-                final_p = fl6_update_dst(&fl6, opt, &final);
+                final_p = fl6_update_dst(&fl6, np->opt, &final);
                 fl6.saddr = ireq6->loc_addr;
                 fl6.flowi6_oif = sk->sk_bound_dev_if;
                 fl6.fl6_dport = inet_rsk(req)->rmt_port;
@@ -595,11 +591,8 @@ static struct sock *dccp_v6_request_recv_sock(struct sock *sk,
          * Yes, keeping reference count would be much more clever, but we make
          * one more one thing there: reattach optmem to newsk.
          */
-        if (opt != NULL) {
-                newnp->opt = ipv6_dup_options(newsk, opt);
-                if (opt != np->opt)
-                        sock_kfree_s(sk, opt, opt->tot_len);
-        }
+        if (np->opt != NULL)
+                newnp->opt = ipv6_dup_options(newsk, np->opt);
 
         inet_csk(newsk)->icsk_ext_hdr_len = 0;
         if (newnp->opt != NULL)
@@ -625,8 +618,6 @@ out_nonewsk:
         dst_release(dst);
 out:
         NET_INC_STATS_BH(sock_net(sk), LINUX_MIB_LISTENDROPS);
-        if (opt != NULL && opt != np->opt)
-                sock_kfree_s(sk, opt, opt->tot_len);
         return NULL;
 }
 
diff --git a/net/dccp/options.c b/net/dccp/options.c
index 68fa6b7a3e0..a58e0b63405 100644
--- a/net/dccp/options.c
+++ b/net/dccp/options.c
@@ -527,6 +527,7 @@ int dccp_insert_option_mandatory(struct sk_buff *skb)
  * @val: NN value or SP array (preferred element first) to copy
  * @len: true length of @val in bytes (excluding first element repetition)
  * @repeat_first: whether to copy the first element of @val twice
+ *
  * The last argument is used to construct Confirm options, where the preferred
  * value and the preference list appear separately (RFC 4340, 6.3.1). Preference
  * lists are kept such that the preferred entry is always first, so we only need
diff --git a/net/dccp/output.c b/net/dccp/output.c
index 78736730879..d17fc90a74b 100644
--- a/net/dccp/output.c
+++ b/net/dccp/output.c
@@ -214,6 +214,7 @@ void dccp_write_space(struct sock *sk)
  * dccp_wait_for_ccid  -  Await CCID send permission
  * @sk:    socket to wait for
  * @delay: timeout in jiffies
+ *
  * This is used by CCIDs which need to delay the send time in process context.
  */
 static int dccp_wait_for_ccid(struct sock *sk, unsigned long delay)
diff --git a/net/decnet/dn_fib.c b/net/decnet/dn_fib.c
index 7eaf9879972..102d6106a94 100644
--- a/net/decnet/dn_fib.c
+++ b/net/decnet/dn_fib.c
@@ -505,6 +505,14 @@ static int dn_fib_check_attr(struct rtmsg *r, struct rtattr **rta)
         return 0;
 }
 
+static inline u32 rtm_get_table(struct rtattr **rta, u8 table)
+{
+        if (rta[RTA_TABLE - 1])
+                table = nla_get_u32((struct nlattr *) rta[RTA_TABLE - 1]);
+
+        return table;
+}
+
 static int dn_fib_rtm_delroute(struct sk_buff *skb, struct nlmsghdr *nlh, void *arg)
 {
         struct net *net = sock_net(skb->sk);
diff --git a/net/decnet/dn_neigh.c b/net/decnet/dn_neigh.c
index ac90f658586..3aede1b459f 100644
--- a/net/decnet/dn_neigh.c
+++ b/net/decnet/dn_neigh.c
@@ -202,7 +202,7 @@ static int dn_neigh_output_packet(struct sk_buff *skb)
 {
         struct dst_entry *dst = skb_dst(skb);
         struct dn_route *rt = (struct dn_route *)dst;
-        struct neighbour *neigh = dst_get_neighbour_noref(dst);
+        struct neighbour *neigh = rt->n;
         struct net_device *dev = neigh->dev;
         char mac_addr[ETH_ALEN];
         unsigned int seq;
@@ -240,7 +240,7 @@ static int dn_long_output(struct neighbour *neigh, struct sk_buff *skb)
                         kfree_skb(skb);
                         return -ENOBUFS;
                 }
-                kfree_skb(skb);
+                consume_skb(skb);
                 skb = skb2;
                 net_info_ratelimited("dn_long_output: Increasing headroom\n");
         }
@@ -283,7 +283,7 @@ static int dn_short_output(struct neighbour *neigh, struct sk_buff *skb)
                         kfree_skb(skb);
                         return -ENOBUFS;
                 }
-                kfree_skb(skb);
+                consume_skb(skb);
                 skb = skb2;
                 net_info_ratelimited("dn_short_output: Increasing headroom\n");
         }
@@ -322,7 +322,7 @@ static int dn_phase3_output(struct neighbour *neigh, struct sk_buff *skb)
                         kfree_skb(skb);
                         return -ENOBUFS;
                 }
-                kfree_skb(skb);
+                consume_skb(skb);
                 skb = skb2;
                 net_info_ratelimited("dn_phase3_output: Increasing headroom\n");
         }
diff --git a/net/decnet/dn_nsp_out.c b/net/decnet/dn_nsp_out.c
index 564a6ad13ce..8a96047c7c9 100644
--- a/net/decnet/dn_nsp_out.c
+++ b/net/decnet/dn_nsp_out.c
@@ -322,7 +322,7 @@ static __le16 *dn_mk_ack_header(struct sock *sk, struct sk_buff *skb, unsigned c
         /* Set "cross subchannel" bit in ackcrs */
         ackcrs |= 0x2000;
 
-        ptr = (__le16 *)dn_mk_common_header(scp, skb, msgflag, hlen);
+        ptr = dn_mk_common_header(scp, skb, msgflag, hlen);
 
         *ptr++ = cpu_to_le16(acknum);
         *ptr++ = cpu_to_le16(ackcrs);
diff --git a/net/decnet/dn_route.c b/net/decnet/dn_route.c
index 586302e557a..b5594cc73ee 100644
--- a/net/decnet/dn_route.c
+++ b/net/decnet/dn_route.c
@@ -114,10 +114,13 @@ static struct dst_entry *dn_dst_check(struct dst_entry *, __u32);
 static unsigned int dn_dst_default_advmss(const struct dst_entry *dst);
 static unsigned int dn_dst_mtu(const struct dst_entry *dst);
 static void dn_dst_destroy(struct dst_entry *);
+static void dn_dst_ifdown(struct dst_entry *, struct net_device *dev, int how);
 static struct dst_entry *dn_dst_negative_advice(struct dst_entry *);
 static void dn_dst_link_failure(struct sk_buff *);
 static void dn_dst_update_pmtu(struct dst_entry *dst, u32 mtu);
-static struct neighbour *dn_dst_neigh_lookup(const struct dst_entry *dst, const void *daddr);
+static struct neighbour *dn_dst_neigh_lookup(const struct dst_entry *dst,
+                                             struct sk_buff *skb,
+                                             const void *daddr);
 static int dn_route_input(struct sk_buff *);
 static void dn_run_flush(unsigned long dummy);
 
@@ -138,6 +141,7 @@ static struct dst_ops dn_dst_ops = {
         .mtu =                  dn_dst_mtu,
         .cow_metrics =          dst_cow_metrics_generic,
         .destroy =              dn_dst_destroy,
+        .ifdown =               dn_dst_ifdown,
         .negative_advice =      dn_dst_negative_advice,
         .link_failure =         dn_dst_link_failure,
         .update_pmtu =          dn_dst_update_pmtu,
@@ -146,9 +150,27 @@ static struct dst_ops dn_dst_ops = {
 
 static void dn_dst_destroy(struct dst_entry *dst)
 {
+        struct dn_route *rt = (struct dn_route *) dst;
+
+        if (rt->n)
+                neigh_release(rt->n);
         dst_destroy_metrics_generic(dst);
 }
 
+static void dn_dst_ifdown(struct dst_entry *dst, struct net_device *dev, int how)
+{
+        if (how) {
+                struct dn_route *rt = (struct dn_route *) dst;
+                struct neighbour *n = rt->n;
+
+                if (n && n->dev == dev) {
+                        n->dev = dev_net(dev)->loopback_dev;
+                        dev_hold(n->dev);
+                        dev_put(dev);
+                }
+        }
+}
+
 static __inline__ unsigned int dn_hash(__le16 src, __le16 dst)
 {
         __u16 tmp = (__u16 __force)(src ^ dst);
@@ -244,7 +266,8 @@ static int dn_dst_gc(struct dst_ops *ops)
  */
 static void dn_dst_update_pmtu(struct dst_entry *dst, u32 mtu)
 {
-        struct neighbour *n = dst_get_neighbour_noref(dst);
+        struct dn_route *rt = (struct dn_route *) dst;
+        struct neighbour *n = rt->n;
         u32 min_mtu = 230;
         struct dn_dev *dn;
 
@@ -713,7 +736,8 @@ out:
 static int dn_to_neigh_output(struct sk_buff *skb)
 {
         struct dst_entry *dst = skb_dst(skb);
-        struct neighbour *n = dst_get_neighbour_noref(dst);
+        struct dn_route *rt = (struct dn_route *) dst;
+        struct neighbour *n = rt->n;
 
         return n->output(n, skb);
 }
@@ -727,7 +751,7 @@ static int dn_output(struct sk_buff *skb)
 
         int err = -EINVAL;
 
-        if (dst_get_neighbour_noref(dst) == NULL)
+        if (rt->n == NULL)
                 goto error;
 
         skb->dev = dev;
@@ -828,7 +852,9 @@ static unsigned int dn_dst_mtu(const struct dst_entry *dst)
         return mtu ? : dst->dev->mtu;
 }
 
-static struct neighbour *dn_dst_neigh_lookup(const struct dst_entry *dst, const void *daddr)
+static struct neighbour *dn_dst_neigh_lookup(const struct dst_entry *dst,
+                                             struct sk_buff *skb,
+                                             const void *daddr)
 {
         return __neigh_lookup_errno(&dn_neigh_table, daddr, dst->dev);
 }
@@ -848,11 +874,11 @@ static int dn_rt_set_next_hop(struct dn_route *rt, struct dn_fib_res *res)
         }
         rt->rt_type = res->type;
 
-        if (dev != NULL && dst_get_neighbour_noref(&rt->dst) == NULL) {
+        if (dev != NULL && rt->n == NULL) {
                 n = __neigh_lookup_errno(&dn_neigh_table, &rt->rt_gateway, dev);
                 if (IS_ERR(n))
                         return PTR_ERR(n);
-                dst_set_neighbour(&rt->dst, n);
+                rt->n = n;
         }
 
         if (dst_metric(&rt->dst, RTAX_MTU) > rt->dst.dev->mtu)
@@ -1159,7 +1185,7 @@ make_route:
         rt->rt_dst_map    = fld.daddr;
         rt->rt_src_map    = fld.saddr;
 
-        dst_set_neighbour(&rt->dst, neigh);
+        rt->n = neigh;
         neigh = NULL;
 
         rt->dst.lastuse = jiffies;
@@ -1429,7 +1455,7 @@ make_route:
         rt->fld.flowidn_iif  = in_dev->ifindex;
         rt->fld.flowidn_mark = fld.flowidn_mark;
 
-        dst_set_neighbour(&rt->dst, neigh);
+        rt->n = neigh;
         rt->dst.lastuse = jiffies;
         rt->dst.output = dn_rt_bug;
         switch (res.type) {
@@ -1515,54 +1541,68 @@ static int dn_rt_fill_info(struct sk_buff *skb, u32 pid, u32 seq,
         struct dn_route *rt = (struct dn_route *)skb_dst(skb);
         struct rtmsg *r;
         struct nlmsghdr *nlh;
-        unsigned char *b = skb_tail_pointer(skb);
         long expires;
 
-        nlh = NLMSG_NEW(skb, pid, seq, event, sizeof(*r), flags);
-        r = NLMSG_DATA(nlh);
+        nlh = nlmsg_put(skb, pid, seq, event, sizeof(*r), flags);
+        if (!nlh)
+                return -EMSGSIZE;
+
+        r = nlmsg_data(nlh);
         r->rtm_family = AF_DECnet;
         r->rtm_dst_len = 16;
         r->rtm_src_len = 0;
         r->rtm_tos = 0;
         r->rtm_table = RT_TABLE_MAIN;
-        RTA_PUT_U32(skb, RTA_TABLE, RT_TABLE_MAIN);
         r->rtm_type = rt->rt_type;
         r->rtm_flags = (rt->rt_flags & ~0xFFFF) | RTM_F_CLONED;
         r->rtm_scope = RT_SCOPE_UNIVERSE;
         r->rtm_protocol = RTPROT_UNSPEC;
+
         if (rt->rt_flags & RTCF_NOTIFY)
                 r->rtm_flags |= RTM_F_NOTIFY;
-        RTA_PUT(skb, RTA_DST, 2, &rt->rt_daddr);
+
+        if (nla_put_u32(skb, RTA_TABLE, RT_TABLE_MAIN) < 0 ||
+            nla_put_le16(skb, RTA_DST, rt->rt_daddr) < 0)
+                goto errout;
+
         if (rt->fld.saddr) {
                 r->rtm_src_len = 16;
-                RTA_PUT(skb, RTA_SRC, 2, &rt->fld.saddr);
+                if (nla_put_le16(skb, RTA_SRC, rt->fld.saddr) < 0)
+                        goto errout;
         }
-        if (rt->dst.dev)
-                RTA_PUT(skb, RTA_OIF, sizeof(int), &rt->dst.dev->ifindex);
+        if (rt->dst.dev &&
+            nla_put_u32(skb, RTA_OIF, rt->dst.dev->ifindex) < 0)
+                goto errout;
+
         /*
          * Note to self - change this if input routes reverse direction when
          * they deal only with inputs and not with replies like they do
          * currently.
          */
-        RTA_PUT(skb, RTA_PREFSRC, 2, &rt->rt_local_src);
-        if (rt->rt_daddr != rt->rt_gateway)
-                RTA_PUT(skb, RTA_GATEWAY, 2, &rt->rt_gateway);
+        if (nla_put_le16(skb, RTA_PREFSRC, rt->rt_local_src) < 0)
+                goto errout;
+
+        if (rt->rt_daddr != rt->rt_gateway &&
+            nla_put_le16(skb, RTA_GATEWAY, rt->rt_gateway) < 0)
+                goto errout;
+
         if (rtnetlink_put_metrics(skb, dst_metrics_ptr(&rt->dst)) < 0)
-                goto rtattr_failure;
+                goto errout;
+
         expires = rt->dst.expires ? rt->dst.expires - jiffies : 0;
-        if (rtnl_put_cacheinfo(skb, &rt->dst, 0, 0, 0, expires,
+        if (rtnl_put_cacheinfo(skb, &rt->dst, 0, expires,
                                rt->dst.error) < 0)
-                goto rtattr_failure;
-        if (dn_is_input_route(rt))
-                RTA_PUT(skb, RTA_IIF, sizeof(int), &rt->fld.flowidn_iif);
+                goto errout;
 
-        nlh->nlmsg_len = skb_tail_pointer(skb) - b;
-        return skb->len;
+        if (dn_is_input_route(rt) &&
+            nla_put_u32(skb, RTA_IIF, rt->fld.flowidn_iif) < 0)
+                goto errout;
 
-nlmsg_failure:
-rtattr_failure:
-        nlmsg_trim(skb, b);
-        return -1;
+        return nlmsg_end(skb, nlh);
+
+errout:
+        nlmsg_cancel(skb, nlh);
+        return -EMSGSIZE;
 }
 
 /*
@@ -1572,7 +1612,7 @@ static int dn_cache_getroute(struct sk_buff *in_skb, struct nlmsghdr *nlh, void
 {
         struct net *net = sock_net(in_skb->sk);
         struct rtattr **rta = arg;
-        struct rtmsg *rtm = NLMSG_DATA(nlh);
+        struct rtmsg *rtm = nlmsg_data(nlh);
         struct dn_route *rt = NULL;
         struct dn_skb_cb *cb;
         int err;
@@ -1585,7 +1625,7 @@ static int dn_cache_getroute(struct sk_buff *in_skb, struct nlmsghdr *nlh, void
         memset(&fld, 0, sizeof(fld));
         fld.flowidn_proto = DNPROTO_NSP;
 
-        skb = alloc_skb(NLMSG_GOODSIZE, GFP_KERNEL);
+        skb = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);
         if (skb == NULL)
                 return -ENOBUFS;
         skb_reset_mac_header(skb);
@@ -1663,13 +1703,16 @@ int dn_cache_dump(struct sk_buff *skb, struct netlink_callback *cb)
         struct dn_route *rt;
         int h, s_h;
         int idx, s_idx;
+        struct rtmsg *rtm;
 
         if (!net_eq(net, &init_net))
                 return 0;
 
-        if (NLMSG_PAYLOAD(cb->nlh, 0) < sizeof(struct rtmsg))
+        if (nlmsg_len(cb->nlh) < sizeof(struct rtmsg))
                 return -EINVAL;
-        if (!(((struct rtmsg *)NLMSG_DATA(cb->nlh))->rtm_flags&RTM_F_CLONED))
+
+        rtm = nlmsg_data(cb->nlh);
+        if (!(rtm->rtm_flags & RTM_F_CLONED))
                 return 0;
 
         s_h = cb->args[0];
@@ -1769,12 +1812,11 @@ static int dn_rt_cache_seq_show(struct seq_file *seq, void *v)
         char buf1[DN_ASCBUF_LEN], buf2[DN_ASCBUF_LEN];
 
         seq_printf(seq, "%-8s %-7s %-7s %04d %04d %04d\n",
-                        rt->dst.dev ? rt->dst.dev->name : "*",
-                        dn_addr2asc(le16_to_cpu(rt->rt_daddr), buf1),
-                        dn_addr2asc(le16_to_cpu(rt->rt_saddr), buf2),
-                        atomic_read(&rt->dst.__refcnt),
-                        rt->dst.__use,
-                        (int) dst_metric(&rt->dst, RTAX_RTT));
+                   rt->dst.dev ? rt->dst.dev->name : "*",
+                   dn_addr2asc(le16_to_cpu(rt->rt_daddr), buf1),
+                   dn_addr2asc(le16_to_cpu(rt->rt_saddr), buf2),
+                   atomic_read(&rt->dst.__refcnt),
+                   rt->dst.__use, 0);
         return 0;
 }
 
diff --git a/net/decnet/dn_table.c b/net/decnet/dn_table.c
index 650f3380c98..16c986ab122 100644
--- a/net/decnet/dn_table.c
+++ b/net/decnet/dn_table.c
@@ -297,61 +297,75 @@ static int dn_fib_dump_info(struct sk_buff *skb, u32 pid, u32 seq, int event,
 {
         struct rtmsg *rtm;
         struct nlmsghdr *nlh;
-        unsigned char *b = skb_tail_pointer(skb);
 
-        nlh = NLMSG_NEW(skb, pid, seq, event, sizeof(*rtm), flags);
-        rtm = NLMSG_DATA(nlh);
+        nlh = nlmsg_put(skb, pid, seq, event, sizeof(*rtm), flags);
+        if (!nlh)
+                return -EMSGSIZE;
+
+        rtm = nlmsg_data(nlh);
         rtm->rtm_family = AF_DECnet;
         rtm->rtm_dst_len = dst_len;
         rtm->rtm_src_len = 0;
         rtm->rtm_tos = 0;
         rtm->rtm_table = tb_id;
-        RTA_PUT_U32(skb, RTA_TABLE, tb_id);
         rtm->rtm_flags = fi->fib_flags;
         rtm->rtm_scope = scope;
         rtm->rtm_type  = type;
-        if (rtm->rtm_dst_len)
-                RTA_PUT(skb, RTA_DST, 2, dst);
         rtm->rtm_protocol = fi->fib_protocol;
-        if (fi->fib_priority)
-                RTA_PUT(skb, RTA_PRIORITY, 4, &fi->fib_priority);
+
+        if (nla_put_u32(skb, RTA_TABLE, tb_id) < 0)
+                goto errout;
+
+        if (rtm->rtm_dst_len &&
+            nla_put(skb, RTA_DST, 2, dst) < 0)
+                goto errout;
+
+        if (fi->fib_priority &&
+            nla_put_u32(skb, RTA_PRIORITY, fi->fib_priority) < 0)
+                goto errout;
+
         if (rtnetlink_put_metrics(skb, fi->fib_metrics) < 0)
-                goto rtattr_failure;
+                goto errout;
+
         if (fi->fib_nhs == 1) {
-                if (fi->fib_nh->nh_gw)
-                        RTA_PUT(skb, RTA_GATEWAY, 2, &fi->fib_nh->nh_gw);
-                if (fi->fib_nh->nh_oif)
-                        RTA_PUT(skb, RTA_OIF, sizeof(int), &fi->fib_nh->nh_oif);
+                if (fi->fib_nh->nh_gw &&
+                    nla_put_le16(skb, RTA_GATEWAY, fi->fib_nh->nh_gw) < 0)
+                        goto errout;
+
+                if (fi->fib_nh->nh_oif &&
+                    nla_put_u32(skb, RTA_OIF, fi->fib_nh->nh_oif) < 0)
+                        goto errout;
         }
+
         if (fi->fib_nhs > 1) {
                 struct rtnexthop *nhp;
-                struct rtattr *mp_head;
-                if (skb_tailroom(skb) <= RTA_SPACE(0))
-                        goto rtattr_failure;
-                mp_head = (struct rtattr *)skb_put(skb, RTA_SPACE(0));
+                struct nlattr *mp_head;
+
+                if (!(mp_head = nla_nest_start(skb, RTA_MULTIPATH)))
+                        goto errout;
 
                 for_nexthops(fi) {
-                        if (skb_tailroom(skb) < RTA_ALIGN(RTA_ALIGN(sizeof(*nhp)) + 4))
-                                goto rtattr_failure;
-                        nhp = (struct rtnexthop *)skb_put(skb, RTA_ALIGN(sizeof(*nhp)));
+                        if (!(nhp = nla_reserve_nohdr(skb, sizeof(*nhp))))
+                                goto errout;
+
                         nhp->rtnh_flags = nh->nh_flags & 0xFF;
                         nhp->rtnh_hops = nh->nh_weight - 1;
                         nhp->rtnh_ifindex = nh->nh_oif;
-                        if (nh->nh_gw)
-                                RTA_PUT(skb, RTA_GATEWAY, 2, &nh->nh_gw);
+
+                        if (nh->nh_gw &&
+                            nla_put_le16(skb, RTA_GATEWAY, nh->nh_gw) < 0)
+                                goto errout;
+
                         nhp->rtnh_len = skb_tail_pointer(skb) - (unsigned char *)nhp;
                 } endfor_nexthops(fi);
-                mp_head->rta_type = RTA_MULTIPATH;
-                mp_head->rta_len = skb_tail_pointer(skb) - (u8 *)mp_head;
-        }
 
-        nlh->nlmsg_len = skb_tail_pointer(skb) - b;
-        return skb->len;
+                nla_nest_end(skb, mp_head);
+        }
 
+        return nlmsg_end(skb, nlh);
 
-nlmsg_failure:
-rtattr_failure:
-        nlmsg_trim(skb, b);
+errout:
+        nlmsg_cancel(skb, nlh);
         return -EMSGSIZE;
 }
 
@@ -476,7 +490,7 @@ int dn_fib_dump(struct sk_buff *skb, struct netlink_callback *cb)
                 return 0;
 
         if (NLMSG_PAYLOAD(cb->nlh, 0) >= sizeof(struct rtmsg) &&
-                ((struct rtmsg *)NLMSG_DATA(cb->nlh))->rtm_flags&RTM_F_CLONED)
+                ((struct rtmsg *)nlmsg_data(cb->nlh))->rtm_flags&RTM_F_CLONED)
                         return dn_cache_dump(skb, cb);
 
         s_h = cb->args[0];
diff --git a/net/decnet/netfilter/dn_rtmsg.c b/net/decnet/netfilter/dn_rtmsg.c
index 44b890936fc..11db0ecf342 100644
--- a/net/decnet/netfilter/dn_rtmsg.c
+++ b/net/decnet/netfilter/dn_rtmsg.c
@@ -42,23 +42,23 @@ static struct sk_buff *dnrmg_build_message(struct sk_buff *rt_skb, int *errp)
         size = NLMSG_SPACE(rt_skb->len);
         size += NLMSG_ALIGN(sizeof(struct nf_dn_rtmsg));
         skb = alloc_skb(size, GFP_ATOMIC);
-        if (!skb)
-                goto nlmsg_failure;
+        if (!skb) {
+                *errp = -ENOMEM;
+                return NULL;
+        }
         old_tail = skb->tail;
-        nlh = NLMSG_PUT(skb, 0, 0, 0, size - sizeof(*nlh));
+        nlh = nlmsg_put(skb, 0, 0, 0, size - sizeof(*nlh), 0);
+        if (!nlh) {
+                kfree_skb(skb);
+                *errp = -ENOMEM;
+                return NULL;
+        }
         rtm = (struct nf_dn_rtmsg *)NLMSG_DATA(nlh);
         rtm->nfdn_ifindex = rt_skb->dev->ifindex;
         ptr = NFDN_RTMSG(rtm);
         skb_copy_from_linear_data(rt_skb, ptr, rt_skb->len);
         nlh->nlmsg_len = skb->tail - old_tail;
         return skb;
-
-nlmsg_failure:
-        if (skb)
-                kfree_skb(skb);
-        *errp = -ENOMEM;
-        net_err_ratelimited("dn_rtmsg: error creating netlink message\n");
-        return NULL;
 }
 
 static void dnrmg_send_peer(struct sk_buff *skb)
@@ -117,7 +117,7 @@ static inline void dnrmg_receive_user_skb(struct sk_buff *skb)
 
 static struct nf_hook_ops dnrmg_ops __read_mostly = {
         .hook           = dnrmg_hook,
-        .pf             = PF_DECnet,
+        .pf             = NFPROTO_DECNET,
         .hooknum        = NF_DN_ROUTE,
         .priority       = NF_DN_PRI_DNRTMSG,
 };
@@ -125,11 +125,13 @@ static struct nf_hook_ops dnrmg_ops __read_mostly = {
 static int __init dn_rtmsg_init(void)
 {
         int rv = 0;
+        struct netlink_kernel_cfg cfg = {
+                .groups = DNRNG_NLGRP_MAX,
+                .input  = dnrmg_receive_user_skb,
+        };
 
         dnrmg = netlink_kernel_create(&init_net,
-                                      NETLINK_DNRTMSG, DNRNG_NLGRP_MAX,
-                                      dnrmg_receive_user_skb,
-                                      NULL, THIS_MODULE);
+                                      NETLINK_DNRTMSG, THIS_MODULE, &cfg);
         if (dnrmg == NULL) {
                 printk(KERN_ERR "dn_rtmsg: Cannot create netlink socket");
                 return -ENOMEM;
diff --git a/net/ethernet/eth.c b/net/ethernet/eth.c
index 36e58800a9e..4efad533e5f 100644
--- a/net/ethernet/eth.c
+++ b/net/ethernet/eth.c
@@ -232,6 +232,7 @@ EXPORT_SYMBOL(eth_header_parse);
  * @neigh: source neighbour
  * @hh: destination cache entry
  * @type: Ethernet type field
+ *
  * Create an Ethernet header template from the neighbour.
  */
 int eth_header_cache(const struct neighbour *neigh, struct hh_cache *hh, __be16 type)
@@ -274,6 +275,7 @@ EXPORT_SYMBOL(eth_header_cache_update);
  * eth_mac_addr - set new Ethernet hardware address
  * @dev: network device
  * @p: socket address
+ *
  * Change hardware address of device.
  *
  * This doesn't change hardware matching, so needs to be overridden
@@ -283,7 +285,7 @@ int eth_mac_addr(struct net_device *dev, void *p)
 {
         struct sockaddr *addr = p;
 
-        if (netif_running(dev))
+        if (!(dev->priv_flags & IFF_LIVE_ADDR_CHANGE) && netif_running(dev))
                 return -EBUSY;
         if (!is_valid_ether_addr(addr->sa_data))
                 return -EADDRNOTAVAIL;
@@ -331,6 +333,7 @@ const struct header_ops eth_header_ops ____cacheline_aligned = {
 /**
  * ether_setup - setup Ethernet network device
  * @dev: network device
+ *
  * Fill in the fields of the device structure with Ethernet-generic values.
  */
 void ether_setup(struct net_device *dev)
diff --git a/net/ieee802154/6lowpan.c b/net/ieee802154/6lowpan.c
index 32eb4179e8f..f4070e54d1a 100644
--- a/net/ieee802154/6lowpan.c
+++ b/net/ieee802154/6lowpan.c
@@ -55,7 +55,6 @@
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/netdevice.h>
-#include <linux/etherdevice.h>
 #include <net/af_ieee802154.h>
 #include <net/ieee802154.h>
 #include <net/ieee802154_netdev.h>
@@ -240,8 +239,7 @@ lowpan_uncompress_addr(struct sk_buff *skb, struct in6_addr *ipaddr,
                 lowpan_uip_ds6_set_addr_iid(ipaddr, lladdr);
         }
 
-        pr_debug("(%s): uncompressing %d + %d => ", __func__, prefcount,
-                                                                postcount);
+        pr_debug("uncompressing %d + %d => ", prefcount, postcount);
         lowpan_raw_dump_inline(NULL, NULL, ipaddr->s6_addr, 16);
 
         return 0;
@@ -252,13 +250,11 @@ lowpan_compress_udp_header(u8 **hc06_ptr, struct sk_buff *skb)
 {
         struct udphdr *uh = udp_hdr(skb);
 
-        pr_debug("(%s): UDP header compression\n", __func__);
-
         if (((uh->source & LOWPAN_NHC_UDP_4BIT_MASK) ==
                                 LOWPAN_NHC_UDP_4BIT_PORT) &&
             ((uh->dest & LOWPAN_NHC_UDP_4BIT_MASK) ==
                                 LOWPAN_NHC_UDP_4BIT_PORT)) {
-                pr_debug("(%s): both ports compression to 4 bits\n", __func__);
+                pr_debug("UDP header: both ports compression to 4 bits\n");
                 **hc06_ptr = LOWPAN_NHC_UDP_CS_P_11;
                 **(hc06_ptr + 1) = /* subtraction is faster */
                    (u8)((uh->dest - LOWPAN_NHC_UDP_4BIT_PORT) +
@@ -266,20 +262,20 @@ lowpan_compress_udp_header(u8 **hc06_ptr, struct sk_buff *skb)
                 *hc06_ptr += 2;
         } else if ((uh->dest & LOWPAN_NHC_UDP_8BIT_MASK) ==
                         LOWPAN_NHC_UDP_8BIT_PORT) {
-                pr_debug("(%s): remove 8 bits of dest\n", __func__);
+                pr_debug("UDP header: remove 8 bits of dest\n");
                 **hc06_ptr = LOWPAN_NHC_UDP_CS_P_01;
                 memcpy(*hc06_ptr + 1, &uh->source, 2);
                 **(hc06_ptr + 3) = (u8)(uh->dest - LOWPAN_NHC_UDP_8BIT_PORT);
                 *hc06_ptr += 4;
         } else if ((uh->source & LOWPAN_NHC_UDP_8BIT_MASK) ==
                         LOWPAN_NHC_UDP_8BIT_PORT) {
-                pr_debug("(%s): remove 8 bits of source\n", __func__);
+                pr_debug("UDP header: remove 8 bits of source\n");
                 **hc06_ptr = LOWPAN_NHC_UDP_CS_P_10;
                 memcpy(*hc06_ptr + 1, &uh->dest, 2);
                 **(hc06_ptr + 3) = (u8)(uh->source - LOWPAN_NHC_UDP_8BIT_PORT);
                 *hc06_ptr += 4;
         } else {
-                pr_debug("(%s): can't compress header\n", __func__);
+                pr_debug("UDP header: can't compress\n");
                 **hc06_ptr = LOWPAN_NHC_UDP_CS_P_00;
                 memcpy(*hc06_ptr + 1, &uh->source, 2);
                 memcpy(*hc06_ptr + 3, &uh->dest, 2);
@@ -291,25 +287,26 @@ lowpan_compress_udp_header(u8 **hc06_ptr, struct sk_buff *skb)
         *hc06_ptr += 2;
 }
 
-static u8 lowpan_fetch_skb_u8(struct sk_buff *skb)
+static inline int lowpan_fetch_skb_u8(struct sk_buff *skb, u8 *val)
 {
-        u8 ret;
+        if (unlikely(!pskb_may_pull(skb, 1)))
+                return -EINVAL;
 
-        ret = skb->data[0];
+        *val = skb->data[0];
         skb_pull(skb, 1);
 
-        return ret;
+        return 0;
 }
 
-static u16 lowpan_fetch_skb_u16(struct sk_buff *skb)
+static inline int lowpan_fetch_skb_u16(struct sk_buff *skb, u16 *val)
 {
-        u16 ret;
-
-        BUG_ON(!pskb_may_pull(skb, 2));
+        if (unlikely(!pskb_may_pull(skb, 2)))
+                return -EINVAL;
 
-        ret = skb->data[0] | (skb->data[1] << 8);
+        *val = skb->data[0] | (skb->data[1] << 8);
         skb_pull(skb, 2);
-        return ret;
+
+        return 0;
 }
 
 static int
@@ -318,10 +315,11 @@ lowpan_uncompress_udp_header(struct sk_buff *skb)
         struct udphdr *uh = udp_hdr(skb);
         u8 tmp;
 
-        tmp = lowpan_fetch_skb_u8(skb);
+        if (lowpan_fetch_skb_u8(skb, &tmp))
+                goto err;
 
         if ((tmp & LOWPAN_NHC_UDP_MASK) == LOWPAN_NHC_UDP_ID) {
-                pr_debug("(%s): UDP header uncompression\n", __func__);
+                pr_debug("UDP header uncompression\n");
                 switch (tmp & LOWPAN_NHC_UDP_CS_P_11) {
                 case LOWPAN_NHC_UDP_CS_P_00:
                         memcpy(&uh->source, &skb->data[0], 2);
@@ -347,19 +345,19 @@ lowpan_uncompress_udp_header(struct sk_buff *skb)
                         skb_pull(skb, 1);
                         break;
                 default:
-                        pr_debug("(%s) ERROR: unknown UDP format\n", __func__);
+                        pr_debug("ERROR: unknown UDP format\n");
                         goto err;
                         break;
                 }
 
-                pr_debug("(%s): uncompressed UDP ports: src = %d, dst = %d\n",
-                                        __func__, uh->source, uh->dest);
+                pr_debug("uncompressed UDP ports: src = %d, dst = %d\n",
+                         uh->source, uh->dest);
 
                 /* copy checksum */
                 memcpy(&uh->check, &skb->data[0], 2);
                 skb_pull(skb, 2);
         } else {
-                pr_debug("(%s): ERROR: unsupported NH format\n", __func__);
+                pr_debug("ERROR: unsupported NH format\n");
                 goto err;
         }
 
@@ -392,10 +390,9 @@ static int lowpan_header_create(struct sk_buff *skb,
         hdr = ipv6_hdr(skb);
         hc06_ptr = head + 2;
 
-        pr_debug("(%s): IPv6 header dump:\n\tversion = %d\n\tlength  = %d\n"
-                 "\tnexthdr = 0x%02x\n\thop_lim = %d\n", __func__,
-                hdr->version, ntohs(hdr->payload_len), hdr->nexthdr,
-                hdr->hop_limit);
+        pr_debug("IPv6 header dump:\n\tversion = %d\n\tlength  = %d\n"
+                 "\tnexthdr = 0x%02x\n\thop_lim = %d\n", hdr->version,
+                 ntohs(hdr->payload_len), hdr->nexthdr, hdr->hop_limit);
 
         lowpan_raw_dump_table(__func__, "raw skb network header dump",
                 skb_network_header(skb), sizeof(struct ipv6hdr));
@@ -490,28 +487,28 @@ static int lowpan_header_create(struct sk_buff *skb,
                 break;
         default:
                 *hc06_ptr = hdr->hop_limit;
+                hc06_ptr += 1;
                 break;
         }
 
         /* source address compression */
         if (is_addr_unspecified(&hdr->saddr)) {
-                pr_debug("(%s): source address is unspecified, setting SAC\n",
-                                                                __func__);
+                pr_debug("source address is unspecified, setting SAC\n");
                 iphc1 |= LOWPAN_IPHC_SAC;
         /* TODO: context lookup */
         } else if (is_addr_link_local(&hdr->saddr)) {
-                pr_debug("(%s): source address is link-local\n", __func__);
+                pr_debug("source address is link-local\n");
                 iphc1 |= lowpan_compress_addr_64(&hc06_ptr,
                                 LOWPAN_IPHC_SAM_BIT, &hdr->saddr, saddr);
         } else {
-                pr_debug("(%s): send the full source address\n", __func__);
+                pr_debug("send the full source address\n");
                 memcpy(hc06_ptr, &hdr->saddr.s6_addr16[0], 16);
                 hc06_ptr += 16;
         }
 
         /* destination address compression */
         if (is_addr_mcast(&hdr->daddr)) {
-                pr_debug("(%s): destination address is multicast", __func__);
+                pr_debug("destination address is multicast: ");
                 iphc1 |= LOWPAN_IPHC_M;
                 if (lowpan_is_mcast_addr_compressable8(&hdr->daddr)) {
                         pr_debug("compressed to 1 octet\n");
@@ -540,14 +537,13 @@ static int lowpan_header_create(struct sk_buff *skb,
                         hc06_ptr += 16;
                 }
         } else {
-                pr_debug("(%s): destination address is unicast: ", __func__);
                 /* TODO: context lookup */
                 if (is_addr_link_local(&hdr->daddr)) {
-                        pr_debug("destination address is link-local\n");
+                        pr_debug("dest address is unicast and link-local\n");
                         iphc1 |= lowpan_compress_addr_64(&hc06_ptr,
                                 LOWPAN_IPHC_DAM_BIT, &hdr->daddr, daddr);
                 } else {
-                        pr_debug("using full address\n");
+                        pr_debug("dest address is unicast: using full one\n");
                         memcpy(hc06_ptr, &hdr->daddr.s6_addr16[0], 16);
                         hc06_ptr += 16;
                 }
@@ -639,8 +635,7 @@ static void lowpan_fragment_timer_expired(unsigned long entry_addr)
 {
         struct lowpan_fragment *entry = (struct lowpan_fragment *)entry_addr;
 
-        pr_debug("%s: timer expired for frame with tag %d\n", __func__,
-                                                                entry->tag);
+        pr_debug("timer expired for frame with tag %d\n", entry->tag);
 
         spin_lock(&flist_lock);
         list_del(&entry->list);
@@ -710,7 +705,9 @@ lowpan_process_data(struct sk_buff *skb)
         /* at least two bytes will be used for the encoding */
         if (skb->len < 2)
                 goto drop;
-        iphc0 = lowpan_fetch_skb_u8(skb);
+
+        if (lowpan_fetch_skb_u8(skb, &iphc0))
+                goto drop;
 
         /* fragments assembling */
         switch (iphc0 & LOWPAN_DISPATCH_MASK) {
@@ -722,8 +719,9 @@ lowpan_process_data(struct sk_buff *skb)
                 u16 tag;
                 bool found = false;
 
-                len = lowpan_fetch_skb_u8(skb); /* frame length */
-                tag = lowpan_fetch_skb_u16(skb);
+                if (lowpan_fetch_skb_u8(skb, &len) || /* frame length */
+                    lowpan_fetch_skb_u16(skb, &tag))  /* fragment tag */
+                        goto drop;
 
                 /*
                  * check if frame assembling with the same tag is
@@ -747,7 +745,8 @@ lowpan_process_data(struct sk_buff *skb)
                 if ((iphc0 & LOWPAN_DISPATCH_MASK) == LOWPAN_DISPATCH_FRAG1)
                         goto unlock_and_drop;
 
-                offset = lowpan_fetch_skb_u8(skb); /* fetch offset */
+                if (lowpan_fetch_skb_u8(skb, &offset)) /* fetch offset */
+                        goto unlock_and_drop;
 
                 /* if payload fits buffer, copy it */
                 if (likely((offset * 8 + skb->len) <= frame->length))
@@ -769,7 +768,10 @@ lowpan_process_data(struct sk_buff *skb)
                         dev_kfree_skb(skb);
                         skb = frame->skb;
                         kfree(frame);
-                        iphc0 = lowpan_fetch_skb_u8(skb);
+
+                        if (lowpan_fetch_skb_u8(skb, &iphc0))
+                                goto drop;
+
                         break;
                 }
                 spin_unlock(&flist_lock);
@@ -780,20 +782,19 @@ lowpan_process_data(struct sk_buff *skb)
                 break;
         }
 
-        iphc1 = lowpan_fetch_skb_u8(skb);
+        if (lowpan_fetch_skb_u8(skb, &iphc1))
+                goto drop;
 
         _saddr = mac_cb(skb)->sa.hwaddr;
         _daddr = mac_cb(skb)->da.hwaddr;
 
-        pr_debug("(%s): iphc0 = %02x, iphc1 = %02x\n", __func__, iphc0, iphc1);
+        pr_debug("iphc0 = %02x, iphc1 = %02x\n", iphc0, iphc1);
 
         /* another if the CID flag is set */
         if (iphc1 & LOWPAN_IPHC_CID) {
-                pr_debug("(%s): CID flag is set, increase header with one\n",
-                                                                __func__);
-                if (!skb->len)
+                pr_debug("CID flag is set, increase header with one\n");
+                if (lowpan_fetch_skb_u8(skb, &num_context))
                         goto drop;
-                num_context = lowpan_fetch_skb_u8(skb);
         }
 
         hdr.version = 6;
@@ -805,9 +806,9 @@ lowpan_process_data(struct sk_buff *skb)
          * ECN + DSCP + 4-bit Pad + Flow Label (4 bytes)
          */
         case 0: /* 00b */
-                if (!skb->len)
+                if (lowpan_fetch_skb_u8(skb, &tmp))
                         goto drop;
-                tmp = lowpan_fetch_skb_u8(skb);
+
                 memcpy(&hdr.flow_lbl, &skb->data[0], 3);
                 skb_pull(skb, 3);
                 hdr.priority = ((tmp >> 2) & 0x0f);
@@ -819,9 +820,9 @@ lowpan_process_data(struct sk_buff *skb)
          * ECN + DSCP (1 byte), Flow Label is elided
          */
         case 1: /* 10b */
-                if (!skb->len)
+                if (lowpan_fetch_skb_u8(skb, &tmp))
                         goto drop;
-                tmp = lowpan_fetch_skb_u8(skb);
+
                 hdr.priority = ((tmp >> 2) & 0x0f);
                 hdr.flow_lbl[0] = ((tmp << 6) & 0xC0) | ((tmp >> 2) & 0x30);
                 hdr.flow_lbl[1] = 0;
@@ -832,9 +833,9 @@ lowpan_process_data(struct sk_buff *skb)
          * ECN + 2-bit Pad + Flow Label (3 bytes), DSCP is elided
          */
         case 2: /* 01b */
-                if (!skb->len)
+                if (lowpan_fetch_skb_u8(skb, &tmp))
                         goto drop;
-                tmp = lowpan_fetch_skb_u8(skb);
+
                 hdr.flow_lbl[0] = (skb->data[0] & 0x0F) | ((tmp >> 2) & 0x30);
                 memcpy(&hdr.flow_lbl[1], &skb->data[0], 2);
                 skb_pull(skb, 2);
@@ -853,27 +854,26 @@ lowpan_process_data(struct sk_buff *skb)
         /* Next Header */
         if ((iphc0 & LOWPAN_IPHC_NH_C) == 0) {
                 /* Next header is carried inline */
-                if (!skb->len)
+                if (lowpan_fetch_skb_u8(skb, &(hdr.nexthdr)))
                         goto drop;
-                hdr.nexthdr = lowpan_fetch_skb_u8(skb);
-                pr_debug("(%s): NH flag is set, next header is carried "
-                         "inline: %02x\n", __func__, hdr.nexthdr);
+
+                pr_debug("NH flag is set, next header carried inline: %02x\n",
+                         hdr.nexthdr);
         }
 
         /* Hop Limit */
         if ((iphc0 & 0x03) != LOWPAN_IPHC_TTL_I)
                 hdr.hop_limit = lowpan_ttl_values[iphc0 & 0x03];
         else {
-                if (!skb->len)
+                if (lowpan_fetch_skb_u8(skb, &(hdr.hop_limit)))
                         goto drop;
-                hdr.hop_limit = lowpan_fetch_skb_u8(skb);
         }
 
         /* Extract SAM to the tmp variable */
         tmp = ((iphc1 & LOWPAN_IPHC_SAM) >> LOWPAN_IPHC_SAM_BIT) & 0x03;
 
         /* Source address uncompression */
-        pr_debug("(%s): source address stateless compression\n", __func__);
+        pr_debug("source address stateless compression\n");
         err = lowpan_uncompress_addr(skb, &hdr.saddr, lowpan_llprefix,
                                 lowpan_unc_llconf[tmp], skb->data);
         if (err)
@@ -885,19 +885,15 @@ lowpan_process_data(struct sk_buff *skb)
         /* check for Multicast Compression */
         if (iphc1 & LOWPAN_IPHC_M) {
                 if (iphc1 & LOWPAN_IPHC_DAC) {
-                        pr_debug("(%s): destination address context-based "
-                                 "multicast compression\n", __func__);
+                        pr_debug("dest: context-based mcast compression\n");
                         /* TODO: implement this */
                 } else {
                         u8 prefix[] = {0xff, 0x02};
 
-                        pr_debug("(%s): destination address non-context-based"
-                                 " multicast compression\n", __func__);
+                        pr_debug("dest: non context-based mcast compression\n");
                         if (0 < tmp && tmp < 3) {
-                                if (!skb->len)
+                                if (lowpan_fetch_skb_u8(skb, &prefix[1]))
                                         goto drop;
-                                else
-                                        prefix[1] = lowpan_fetch_skb_u8(skb);
                         }
 
                         err = lowpan_uncompress_addr(skb, &hdr.daddr, prefix,
@@ -906,8 +902,7 @@ lowpan_process_data(struct sk_buff *skb)
                                 goto drop;
                 }
         } else {
-                pr_debug("(%s): destination address stateless compression\n",
-                                                                __func__);
+                pr_debug("dest: stateless compression\n");
                 err = lowpan_uncompress_addr(skb, &hdr.daddr, lowpan_llprefix,
                                 lowpan_unc_llconf[tmp], skb->data);
                 if (err)
@@ -922,11 +917,11 @@ lowpan_process_data(struct sk_buff *skb)
         /* Not fragmented package */
         hdr.payload_len = htons(skb->len);
 
-        pr_debug("(%s): skb headroom size = %d, data length = %d\n", __func__,
-                                                skb_headroom(skb), skb->len);
+        pr_debug("skb headroom size = %d, data length = %d\n",
+                 skb_headroom(skb), skb->len);
 
-        pr_debug("(%s): IPv6 header dump:\n\tversion = %d\n\tlength  = %d\n\t"
-                 "nexthdr = 0x%02x\n\thop_lim = %d\n", __func__, hdr.version,
+        pr_debug("IPv6 header dump:\n\tversion = %d\n\tlength  = %d\n\t"
+                 "nexthdr = 0x%02x\n\thop_lim = %d\n", hdr.version,
                  ntohs(hdr.payload_len), hdr.nexthdr, hdr.hop_limit);
 
         lowpan_raw_dump_table(__func__, "raw header dump", (u8 *)&hdr,
@@ -940,6 +935,19 @@ drop:
         return -EINVAL;
 }
 
+static int lowpan_set_address(struct net_device *dev, void *p)
+{
+        struct sockaddr *sa = p;
+
+        if (netif_running(dev))
+                return -EBUSY;
+
+        /* TODO: validate addr */
+        memcpy(dev->dev_addr, sa->sa_data, dev->addr_len);
+
+        return 0;
+}
+
 static int lowpan_get_mac_header_length(struct sk_buff *skb)
 {
         /*
@@ -1028,11 +1036,11 @@ static netdev_tx_t lowpan_xmit(struct sk_buff *skb, struct net_device *dev)
 {
         int err = -1;
 
-        pr_debug("(%s): package xmit\n", __func__);
+        pr_debug("package xmit\n");
 
         skb->dev = lowpan_dev_info(dev)->real_dev;
         if (skb->dev == NULL) {
-                pr_debug("(%s) ERROR: no real wpan device found\n", __func__);
+                pr_debug("ERROR: no real wpan device found\n");
                 goto error;
         }
 
@@ -1041,14 +1049,13 @@ static netdev_tx_t lowpan_xmit(struct sk_buff *skb, struct net_device *dev)
                 goto out;
         }
 
-        pr_debug("(%s): frame is too big, fragmentation is needed\n",
-                                                                __func__);
+        pr_debug("frame is too big, fragmentation is needed\n");
         err = lowpan_skb_fragmentation(skb);
 error:
         dev_kfree_skb(skb);
 out:
         if (err < 0)
-                pr_debug("(%s): ERROR: xmit failed\n", __func__);
+                pr_debug("ERROR: xmit failed\n");
 
         return (err < 0 ? NETDEV_TX_BUSY : NETDEV_TX_OK);
 }
@@ -1083,7 +1090,7 @@ static struct header_ops lowpan_header_ops = {
 
 static const struct net_device_ops lowpan_netdev_ops = {
         .ndo_start_xmit         = lowpan_xmit,
-        .ndo_set_mac_address    = eth_mac_addr,
+        .ndo_set_mac_address    = lowpan_set_address,
 };
 
 static struct ieee802154_mlme_ops lowpan_mlme = {
@@ -1094,8 +1101,6 @@ static struct ieee802154_mlme_ops lowpan_mlme = {
 
 static void lowpan_setup(struct net_device *dev)
 {
-        pr_debug("(%s)\n", __func__);
-
         dev->addr_len           = IEEE802154_ADDR_LEN;
         memset(dev->broadcast, 0xff, IEEE802154_ADDR_LEN);
         dev->type               = ARPHRD_IEEE802154;
@@ -1115,8 +1120,6 @@ static void lowpan_setup(struct net_device *dev)
 
 static int lowpan_validate(struct nlattr *tb[], struct nlattr *data[])
 {
-        pr_debug("(%s)\n", __func__);
-
         if (tb[IFLA_ADDRESS]) {
                 if (nla_len(tb[IFLA_ADDRESS]) != IEEE802154_ADDR_LEN)
                         return -EINVAL;
@@ -1157,7 +1160,7 @@ static int lowpan_newlink(struct net *src_net, struct net_device *dev,
         struct net_device *real_dev;
         struct lowpan_dev_record *entry;
 
-        pr_debug("(%s)\n", __func__);
+        pr_debug("adding new link\n");
 
         if (!tb[IFLA_LINK])
                 return -EINVAL;
@@ -1252,8 +1255,6 @@ static int __init lowpan_init_module(void)
 {
         int err = 0;
 
-        pr_debug("(%s)\n", __func__);
-
         err = lowpan_netlink_init();
         if (err < 0)
                 goto out;
@@ -1265,8 +1266,6 @@ out:
 
 static void __exit lowpan_cleanup_module(void)
 {
-        pr_debug("(%s)\n", __func__);
-
         lowpan_netlink_fini();
 
         dev_remove_pack(&lowpan_packet_type);
diff --git a/net/ieee802154/netlink.c b/net/ieee802154/netlink.c
index c8097ae2482..97351e1d07a 100644
--- a/net/ieee802154/netlink.c
+++ b/net/ieee802154/netlink.c
@@ -44,7 +44,7 @@ struct genl_family nl802154_family = {
 struct sk_buff *ieee802154_nl_create(int flags, u8 req)
 {
         void *hdr;
-        struct sk_buff *msg = nlmsg_new(NLMSG_GOODSIZE, GFP_ATOMIC);
+        struct sk_buff *msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_ATOMIC);
         unsigned long f;
 
         if (!msg)
@@ -80,7 +80,7 @@ struct sk_buff *ieee802154_nl_new_reply(struct genl_info *info,
                 int flags, u8 req)
 {
         void *hdr;
-        struct sk_buff *msg = nlmsg_new(NLMSG_GOODSIZE, GFP_ATOMIC);
+        struct sk_buff *msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_ATOMIC);
 
         if (!msg)
                 return NULL;
diff --git a/net/ieee802154/nl-mac.c b/net/ieee802154/nl-mac.c
index ca92587720f..1e9917124e7 100644
--- a/net/ieee802154/nl-mac.c
+++ b/net/ieee802154/nl-mac.c
@@ -530,7 +530,7 @@ static int ieee802154_list_iface(struct sk_buff *skb,
         if (!dev)
                 return -ENODEV;
 
-        msg = nlmsg_new(NLMSG_GOODSIZE, GFP_KERNEL);
+        msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);
         if (!msg)
                 goto out_dev;
 
diff --git a/net/ieee802154/nl-phy.c b/net/ieee802154/nl-phy.c
index eed291626da..d54be34cca9 100644
--- a/net/ieee802154/nl-phy.c
+++ b/net/ieee802154/nl-phy.c
@@ -101,7 +101,7 @@ static int ieee802154_list_phy(struct sk_buff *skb,
         if (!phy)
                 return -ENODEV;
 
-        msg = nlmsg_new(NLMSG_GOODSIZE, GFP_KERNEL);
+        msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);
         if (!msg)
                 goto out_dev;
 
diff --git a/net/ipv4/Makefile b/net/ipv4/Makefile
index ff75d3bbcd6..5a23e8b3710 100644
--- a/net/ipv4/Makefile
+++ b/net/ipv4/Makefile
@@ -7,7 +7,7 @@ obj-y     := route.o inetpeer.o protocol.o \
              ip_output.o ip_sockglue.o inet_hashtables.o \
              inet_timewait_sock.o inet_connection_sock.o \
              tcp.o tcp_input.o tcp_output.o tcp_timer.o tcp_ipv4.o \
-             tcp_minisocks.o tcp_cong.o \
+             tcp_minisocks.o tcp_cong.o tcp_metrics.o \
              datagram.o raw.o udp.o udplite.o \
              arp.o icmp.o devinet.o af_inet.o  igmp.o \
              fib_frontend.o fib_semantics.o fib_trie.o \
diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c
index c8f7aee587d..07a02f6e969 100644
--- a/net/ipv4/af_inet.c
+++ b/net/ipv4/af_inet.c
@@ -157,6 +157,7 @@ void inet_sock_destruct(struct sock *sk)
 
         kfree(rcu_dereference_protected(inet->inet_opt, 1));
         dst_release(rcu_dereference_check(sk->sk_dst_cache, 1));
+        dst_release(sk->sk_rx_dst);
         sk_refcnt_debug_dec(sk);
 }
 EXPORT_SYMBOL(inet_sock_destruct);
@@ -242,20 +243,18 @@ void build_ehash_secret(void)
 }
 EXPORT_SYMBOL(build_ehash_secret);
 
-static inline int inet_netns_ok(struct net *net, int protocol)
+static inline int inet_netns_ok(struct net *net, __u8 protocol)
 {
-        int hash;
         const struct net_protocol *ipprot;
 
         if (net_eq(net, &init_net))
                 return 1;
 
-        hash = protocol & (MAX_INET_PROTOS - 1);
-        ipprot = rcu_dereference(inet_protos[hash]);
-
-        if (ipprot == NULL)
+        ipprot = rcu_dereference(inet_protos[protocol]);
+        if (ipprot == NULL) {
                 /* raw IP is OK */
                 return 1;
+        }
         return ipprot->netns_ok;
 }
 
@@ -553,7 +552,7 @@ int inet_dgram_connect(struct socket *sock, struct sockaddr *uaddr,
 
         if (!inet_sk(sk)->inet_num && inet_autobind(sk))
                 return -EAGAIN;
-        return sk->sk_prot->connect(sk, (struct sockaddr *)uaddr, addr_len);
+        return sk->sk_prot->connect(sk, uaddr, addr_len);
 }
 EXPORT_SYMBOL(inet_dgram_connect);
 
@@ -1216,8 +1215,8 @@ EXPORT_SYMBOL(inet_sk_rebuild_header);
 
 static int inet_gso_send_check(struct sk_buff *skb)
 {
-        const struct iphdr *iph;
         const struct net_protocol *ops;
+        const struct iphdr *iph;
         int proto;
         int ihl;
         int err = -EINVAL;
@@ -1236,7 +1235,7 @@ static int inet_gso_send_check(struct sk_buff *skb)
         __skb_pull(skb, ihl);
         skb_reset_transport_header(skb);
         iph = ip_hdr(skb);
-        proto = iph->protocol & (MAX_INET_PROTOS - 1);
+        proto = iph->protocol;
         err = -EPROTONOSUPPORT;
 
         rcu_read_lock();
@@ -1253,8 +1252,8 @@ static struct sk_buff *inet_gso_segment(struct sk_buff *skb,
         netdev_features_t features)
 {
         struct sk_buff *segs = ERR_PTR(-EINVAL);
-        struct iphdr *iph;
         const struct net_protocol *ops;
+        struct iphdr *iph;
         int proto;
         int ihl;
         int id;
@@ -1286,7 +1285,7 @@ static struct sk_buff *inet_gso_segment(struct sk_buff *skb,
         skb_reset_transport_header(skb);
         iph = ip_hdr(skb);
         id = ntohs(iph->id);
-        proto = iph->protocol & (MAX_INET_PROTOS - 1);
+        proto = iph->protocol;
         segs = ERR_PTR(-EPROTONOSUPPORT);
 
         rcu_read_lock();
@@ -1340,7 +1339,7 @@ static struct sk_buff **inet_gro_receive(struct sk_buff **head,
                         goto out;
         }
 
-        proto = iph->protocol & (MAX_INET_PROTOS - 1);
+        proto = iph->protocol;
 
         rcu_read_lock();
         ops = rcu_dereference(inet_protos[proto]);
@@ -1398,11 +1397,11 @@ out:
 
 static int inet_gro_complete(struct sk_buff *skb)
 {
-        const struct net_protocol *ops;
+        __be16 newlen = htons(skb->len - skb_network_offset(skb));
         struct iphdr *iph = ip_hdr(skb);
-        int proto = iph->protocol & (MAX_INET_PROTOS - 1);
+        const struct net_protocol *ops;
+        int proto = iph->protocol;
         int err = -ENOSYS;
-        __be16 newlen = htons(skb->len - skb_network_offset(skb));
 
         csum_replace2(&iph->check, iph->tot_len, newlen);
         iph->tot_len = newlen;
@@ -1520,14 +1519,15 @@ static const struct net_protocol igmp_protocol = {
 #endif
 
 static const struct net_protocol tcp_protocol = {
-        .handler =      tcp_v4_rcv,
-        .err_handler =  tcp_v4_err,
-        .gso_send_check = tcp_v4_gso_send_check,
-        .gso_segment =  tcp_tso_segment,
-        .gro_receive =  tcp4_gro_receive,
-        .gro_complete = tcp4_gro_complete,
-        .no_policy =    1,
-        .netns_ok =     1,
+        .early_demux    =       tcp_v4_early_demux,
+        .handler        =       tcp_v4_rcv,
+        .err_handler    =       tcp_v4_err,
+        .gso_send_check =       tcp_v4_gso_send_check,
+        .gso_segment    =       tcp_tso_segment,
+        .gro_receive    =       tcp4_gro_receive,
+        .gro_complete   =       tcp4_gro_complete,
+        .no_policy      =       1,
+        .netns_ok       =       1,
 };
 
 static const struct net_protocol udp_protocol = {
diff --git a/net/ipv4/ah4.c b/net/ipv4/ah4.c
index e8f2617ecd4..916d5ecaf6c 100644
--- a/net/ipv4/ah4.c
+++ b/net/ipv4/ah4.c
@@ -408,6 +408,7 @@ static void ah4_err(struct sk_buff *skb, u32 info)
                 return;
         pr_debug("pmtu discovery on SA AH/%08x/%08x\n",
                  ntohl(ah->spi), ntohl(iph->daddr));
+        ipv4_update_pmtu(skb, net, info, 0, 0, IPPROTO_AH, 0);
         xfrm_state_put(x);
 }
 
diff --git a/net/ipv4/arp.c b/net/ipv4/arp.c
index cda37be02f8..2e560f0c757 100644
--- a/net/ipv4/arp.c
+++ b/net/ipv4/arp.c
@@ -790,7 +790,8 @@ static int arp_process(struct sk_buff *skb)
  *      Check for bad requests for 127.x.x.x and requests for multicast
  *      addresses.  If this is one such, delete it.
  */
-        if (ipv4_is_loopback(tip) || ipv4_is_multicast(tip))
+        if (ipv4_is_multicast(tip) ||
+            (!IN_DEV_ROUTE_LOCALNET(in_dev) && ipv4_is_loopback(tip)))
                 goto out;
 
 /*
diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c
index 10e15a144e9..44bf82e3aef 100644
--- a/net/ipv4/devinet.c
+++ b/net/ipv4/devinet.c
@@ -1500,7 +1500,8 @@ static int devinet_conf_proc(ctl_table *ctl, int write,
 
                 if (cnf == net->ipv4.devconf_dflt)
                         devinet_copy_dflt_conf(net, i);
-                if (i == IPV4_DEVCONF_ACCEPT_LOCAL - 1)
+                if (i == IPV4_DEVCONF_ACCEPT_LOCAL - 1 ||
+                    i == IPV4_DEVCONF_ROUTE_LOCALNET - 1)
                         if ((new_value == 0) && (old_value != 0))
                                 rt_cache_flush(net, 0);
         }
@@ -1617,6 +1618,8 @@ static struct devinet_sysctl_table {
                                               "force_igmp_version"),
                 DEVINET_SYSCTL_FLUSHING_ENTRY(PROMOTE_SECONDARIES,
                                               "promote_secondaries"),
+                DEVINET_SYSCTL_FLUSHING_ENTRY(ROUTE_LOCALNET,
+                                              "route_localnet"),
         },
 };
 
diff --git a/net/ipv4/esp4.c b/net/ipv4/esp4.c
index cb982a61536..7b95b49a36c 100644
--- a/net/ipv4/esp4.c
+++ b/net/ipv4/esp4.c
@@ -494,6 +494,7 @@ static void esp4_err(struct sk_buff *skb, u32 info)
                 return;
         NETDEBUG(KERN_DEBUG "pmtu discovery on SA ESP/%08x/%08x\n",
                  ntohl(esph->spi), ntohl(iph->daddr));
+        ipv4_update_pmtu(skb, net, info, 0, 0, IPPROTO_ESP, 0);
         xfrm_state_put(x);
 }
 
diff --git a/net/ipv4/fib_frontend.c b/net/ipv4/fib_frontend.c
index 3854411fa37..81f85716a89 100644
--- a/net/ipv4/fib_frontend.c
+++ b/net/ipv4/fib_frontend.c
@@ -31,6 +31,7 @@
 #include <linux/if_addr.h>
 #include <linux/if_arp.h>
 #include <linux/skbuff.h>
+#include <linux/cache.h>
 #include <linux/init.h>
 #include <linux/list.h>
 #include <linux/slab.h>
@@ -85,6 +86,24 @@ struct fib_table *fib_new_table(struct net *net, u32 id)
         tb = fib_trie_table(id);
         if (!tb)
                 return NULL;
+
+        switch (id) {
+        case RT_TABLE_LOCAL:
+                net->ipv4.fib_local = tb;
+                break;
+
+        case RT_TABLE_MAIN:
+                net->ipv4.fib_main = tb;
+                break;
+
+        case RT_TABLE_DEFAULT:
+                net->ipv4.fib_default = tb;
+                break;
+
+        default:
+                break;
+        }
+
         h = id & (FIB_TABLE_HASHSZ - 1);
         hlist_add_head_rcu(&tb->tb_hlist, &net->ipv4.fib_table_hash[h]);
         return tb;
@@ -180,6 +199,43 @@ unsigned int inet_dev_addr_type(struct net *net, const struct net_device *dev,
 }
 EXPORT_SYMBOL(inet_dev_addr_type);
 
+__be32 fib_compute_spec_dst(struct sk_buff *skb)
+{
+        struct net_device *dev = skb->dev;
+        struct in_device *in_dev;
+        struct fib_result res;
+        struct rtable *rt;
+        struct flowi4 fl4;
+        struct net *net;
+        int scope;
+
+        rt = skb_rtable(skb);
+        if (!(rt->rt_flags & (RTCF_BROADCAST | RTCF_MULTICAST)))
+                return ip_hdr(skb)->daddr;
+
+        in_dev = __in_dev_get_rcu(dev);
+        BUG_ON(!in_dev);
+
+        net = dev_net(dev);
+
+        scope = RT_SCOPE_UNIVERSE;
+        if (!ipv4_is_zeronet(ip_hdr(skb)->saddr)) {
+                fl4.flowi4_oif = 0;
+                fl4.flowi4_iif = net->loopback_dev->ifindex;
+                fl4.daddr = ip_hdr(skb)->saddr;
+                fl4.saddr = 0;
+                fl4.flowi4_tos = RT_TOS(ip_hdr(skb)->tos);
+                fl4.flowi4_scope = scope;
+                fl4.flowi4_mark = IN_DEV_SRC_VMARK(in_dev) ? skb->mark : 0;
+                if (!fib_lookup(net, &fl4, &res))
+                        return FIB_RES_PREFSRC(net, res);
+        } else {
+                scope = RT_SCOPE_LINK;
+        }
+
+        return inet_select_addr(dev, ip_hdr(skb)->saddr, scope);
+}
+
 /* Given (packet source, input interface) and optional (dst, oif, tos):
  * - (main) check, that source is valid i.e. not broadcast or our local
  *   address.
@@ -188,17 +244,15 @@ EXPORT_SYMBOL(inet_dev_addr_type);
  * - check, that packet arrived from expected physical interface.
  * called with rcu_read_lock()
  */
-int fib_validate_source(struct sk_buff *skb, __be32 src, __be32 dst, u8 tos,
-                        int oif, struct net_device *dev, __be32 *spec_dst,
-                        u32 *itag)
+static int __fib_validate_source(struct sk_buff *skb, __be32 src, __be32 dst,
+                                 u8 tos, int oif, struct net_device *dev,
+                                 int rpf, struct in_device *idev, u32 *itag)
 {
-        struct in_device *in_dev;
-        struct flowi4 fl4;
+        int ret, no_addr, accept_local;
         struct fib_result res;
-        int no_addr, rpf, accept_local;
-        bool dev_match;
-        int ret;
+        struct flowi4 fl4;
         struct net *net;
+        bool dev_match;
 
         fl4.flowi4_oif = 0;
         fl4.flowi4_iif = oif;
@@ -207,20 +261,11 @@ int fib_validate_source(struct sk_buff *skb, __be32 src, __be32 dst, u8 tos,
         fl4.flowi4_tos = tos;
         fl4.flowi4_scope = RT_SCOPE_UNIVERSE;
 
-        no_addr = rpf = accept_local = 0;
-        in_dev = __in_dev_get_rcu(dev);
-        if (in_dev) {
-                no_addr = in_dev->ifa_list == NULL;
-
-                /* Ignore rp_filter for packets protected by IPsec. */
-                rpf = secpath_exists(skb) ? 0 : IN_DEV_RPFILTER(in_dev);
+        no_addr = accept_local = 0;
+        no_addr = idev->ifa_list == NULL;
 
-                accept_local = IN_DEV_ACCEPT_LOCAL(in_dev);
-                fl4.flowi4_mark = IN_DEV_SRC_VMARK(in_dev) ? skb->mark : 0;
-        }
-
-        if (in_dev == NULL)
-                goto e_inval;
+        accept_local = IN_DEV_ACCEPT_LOCAL(idev);
+        fl4.flowi4_mark = IN_DEV_SRC_VMARK(idev) ? skb->mark : 0;
 
         net = dev_net(dev);
         if (fib_lookup(net, &fl4, &res))
@@ -229,7 +274,6 @@ int fib_validate_source(struct sk_buff *skb, __be32 src, __be32 dst, u8 tos,
                 if (res.type != RTN_LOCAL || !accept_local)
                         goto e_inval;
         }
-        *spec_dst = FIB_RES_PREFSRC(net, res);
         fib_combine_itag(itag, &res);
         dev_match = false;
 
@@ -258,17 +302,14 @@ int fib_validate_source(struct sk_buff *skb, __be32 src, __be32 dst, u8 tos,
 
         ret = 0;
         if (fib_lookup(net, &fl4, &res) == 0) {
-                if (res.type == RTN_UNICAST) {
-                        *spec_dst = FIB_RES_PREFSRC(net, res);
+                if (res.type == RTN_UNICAST)
                         ret = FIB_RES_NH(res).nh_scope >= RT_SCOPE_HOST;
-                }
         }
         return ret;
 
 last_resort:
         if (rpf)
                 goto e_rpf;
-        *spec_dst = inet_select_addr(dev, 0, RT_SCOPE_UNIVERSE);
         *itag = 0;
         return 0;
 
@@ -278,6 +319,20 @@ e_rpf:
         return -EXDEV;
 }
 
+/* Ignore rp_filter for packets protected by IPsec. */
+int fib_validate_source(struct sk_buff *skb, __be32 src, __be32 dst,
+                        u8 tos, int oif, struct net_device *dev,
+                        struct in_device *idev, u32 *itag)
+{
+        int r = secpath_exists(skb) ? 0 : IN_DEV_RPFILTER(idev);
+
+        if (!r && !fib_num_tclassid_users(dev_net(dev))) {
+                *itag = 0;
+                return 0;
+        }
+        return __fib_validate_source(skb, src, dst, tos, oif, dev, r, idev, itag);
+}
+
 static inline __be32 sk_extract_addr(struct sockaddr *addr)
 {
         return ((struct sockaddr_in *) addr)->sin_addr.s_addr;
@@ -935,8 +990,11 @@ static void nl_fib_input(struct sk_buff *skb)
 static int __net_init nl_fib_lookup_init(struct net *net)
 {
         struct sock *sk;
-        sk = netlink_kernel_create(net, NETLINK_FIB_LOOKUP, 0,
-                                   nl_fib_input, NULL, THIS_MODULE);
+        struct netlink_kernel_cfg cfg = {
+                .input  = nl_fib_input,
+        };
+
+        sk = netlink_kernel_create(net, NETLINK_FIB_LOOKUP, THIS_MODULE, &cfg);
         if (sk == NULL)
                 return -EAFNOSUPPORT;
         net->ipv4.fibnl = sk;
@@ -1090,6 +1148,9 @@ static int __net_init fib_net_init(struct net *net)
 {
         int error;
 
+#ifdef CONFIG_IP_ROUTE_CLASSID
+        net->ipv4.fib_num_tclassid_users = 0;
+#endif
         error = ip_fib_net_init(net);
         if (error < 0)
                 goto out;
diff --git a/net/ipv4/fib_rules.c b/net/ipv4/fib_rules.c
index 2d043f71ef7..c06da93b0b7 100644
--- a/net/ipv4/fib_rules.c
+++ b/net/ipv4/fib_rules.c
@@ -54,7 +54,7 @@ u32 fib_rules_tclass(const struct fib_result *res)
 }
 #endif
 
-int fib_lookup(struct net *net, struct flowi4 *flp, struct fib_result *res)
+int __fib_lookup(struct net *net, struct flowi4 *flp, struct fib_result *res)
 {
         struct fib_lookup_arg arg = {
                 .result = res,
@@ -67,7 +67,7 @@ int fib_lookup(struct net *net, struct flowi4 *flp, struct fib_result *res)
 
         return err;
 }
-EXPORT_SYMBOL_GPL(fib_lookup);
+EXPORT_SYMBOL_GPL(__fib_lookup);
 
 static int fib4_rule_action(struct fib_rule *rule, struct flowi *flp,
                             int flags, struct fib_lookup_arg *arg)
@@ -169,8 +169,11 @@ static int fib4_rule_configure(struct fib_rule *rule, struct sk_buff *skb,
                 rule4->dst = nla_get_be32(tb[FRA_DST]);
 
 #ifdef CONFIG_IP_ROUTE_CLASSID
-        if (tb[FRA_FLOW])
+        if (tb[FRA_FLOW]) {
                 rule4->tclassid = nla_get_u32(tb[FRA_FLOW]);
+                if (rule4->tclassid)
+                        net->ipv4.fib_num_tclassid_users++;
+        }
 #endif
 
         rule4->src_len = frh->src_len;
@@ -179,11 +182,24 @@ static int fib4_rule_configure(struct fib_rule *rule, struct sk_buff *skb,
         rule4->dstmask = inet_make_mask(rule4->dst_len);
         rule4->tos = frh->tos;
 
+        net->ipv4.fib_has_custom_rules = true;
         err = 0;
 errout:
         return err;
 }
 
+static void fib4_rule_delete(struct fib_rule *rule)
+{
+        struct net *net = rule->fr_net;
+#ifdef CONFIG_IP_ROUTE_CLASSID
+        struct fib4_rule *rule4 = (struct fib4_rule *) rule;
+
+        if (rule4->tclassid)
+                net->ipv4.fib_num_tclassid_users--;
+#endif
+        net->ipv4.fib_has_custom_rules = true;
+}
+
 static int fib4_rule_compare(struct fib_rule *rule, struct fib_rule_hdr *frh,
                              struct nlattr **tb)
 {
@@ -256,6 +272,7 @@ static const struct fib_rules_ops __net_initdata fib4_rules_ops_template = {
         .action         = fib4_rule_action,
         .match          = fib4_rule_match,
         .configure      = fib4_rule_configure,
+        .delete         = fib4_rule_delete,
         .compare        = fib4_rule_compare,
         .fill           = fib4_rule_fill,
         .default_pref   = fib_default_rule_pref,
@@ -295,6 +312,7 @@ int __net_init fib4_rules_init(struct net *net)
         if (err < 0)
                 goto fail;
         net->ipv4.rules_ops = ops;
+        net->ipv4.fib_has_custom_rules = false;
         return 0;
 
 fail:
diff --git a/net/ipv4/fib_semantics.c b/net/ipv4/fib_semantics.c
index e5b7182fa09..d71bfbdc0bf 100644
--- a/net/ipv4/fib_semantics.c
+++ b/net/ipv4/fib_semantics.c
@@ -163,6 +163,12 @@ void free_fib_info(struct fib_info *fi)
                 return;
         }
         fib_info_cnt--;
+#ifdef CONFIG_IP_ROUTE_CLASSID
+        change_nexthops(fi) {
+                if (nexthop_nh->nh_tclassid)
+                        fi->fib_net->ipv4.fib_num_tclassid_users--;
+        } endfor_nexthops(fi);
+#endif
         call_rcu(&fi->rcu, free_fib_info_rcu);
 }
 
@@ -421,6 +427,8 @@ static int fib_get_nhs(struct fib_info *fi, struct rtnexthop *rtnh,
 #ifdef CONFIG_IP_ROUTE_CLASSID
                         nla = nla_find(attrs, attrlen, RTA_FLOW);
                         nexthop_nh->nh_tclassid = nla ? nla_get_u32(nla) : 0;
+                        if (nexthop_nh->nh_tclassid)
+                                fi->fib_net->ipv4.fib_num_tclassid_users++;
 #endif
                 }
 
@@ -779,9 +787,16 @@ struct fib_info *fib_create_info(struct fib_config *cfg)
                         int type = nla_type(nla);
 
                         if (type) {
+                                u32 val;
+
                                 if (type > RTAX_MAX)
                                         goto err_inval;
-                                fi->fib_metrics[type - 1] = nla_get_u32(nla);
+                                val = nla_get_u32(nla);
+                                if (type == RTAX_ADVMSS && val > 65535 - 40)
+                                        val = 65535 - 40;
+                                if (type == RTAX_MTU && val > 65535 - 15)
+                                        val = 65535 - 15;
+                                fi->fib_metrics[type - 1] = val;
                         }
                 }
         }
@@ -810,6 +825,8 @@ struct fib_info *fib_create_info(struct fib_config *cfg)
                 nh->nh_flags = cfg->fc_flags;
 #ifdef CONFIG_IP_ROUTE_CLASSID
                 nh->nh_tclassid = cfg->fc_flow;
+                if (nh->nh_tclassid)
+                        fi->fib_net->ipv4.fib_num_tclassid_users++;
 #endif
 #ifdef CONFIG_IP_ROUTE_MULTIPATH
                 nh->nh_weight = 1;
diff --git a/net/ipv4/fib_trie.c b/net/ipv4/fib_trie.c
index 30b88d7b4bd..9b0f25930fb 100644
--- a/net/ipv4/fib_trie.c
+++ b/net/ipv4/fib_trie.c
@@ -1007,9 +1007,9 @@ static void trie_rebalance(struct trie *t, struct tnode *tn)
         while (tn != NULL && (tp = node_parent((struct rt_trie_node *)tn)) != NULL) {
                 cindex = tkey_extract_bits(key, tp->pos, tp->bits);
                 wasfull = tnode_full(tp, tnode_get_child(tp, cindex));
-                tn = (struct tnode *) resize(t, (struct tnode *)tn);
+                tn = (struct tnode *)resize(t, tn);
 
-                tnode_put_child_reorg((struct tnode *)tp, cindex,
+                tnode_put_child_reorg(tp, cindex,
                                       (struct rt_trie_node *)tn, wasfull);
 
                 tp = node_parent((struct rt_trie_node *) tn);
@@ -1024,7 +1024,7 @@ static void trie_rebalance(struct trie *t, struct tnode *tn)
 
         /* Handle last (top) tnode */
         if (IS_TNODE(tn))
-                tn = (struct tnode *)resize(t, (struct tnode *)tn);
+                tn = (struct tnode *)resize(t, tn);
 
         rcu_assign_pointer(t->trie, (struct rt_trie_node *)tn);
         tnode_free_flush();
@@ -1125,7 +1125,7 @@ static struct list_head *fib_insert_node(struct trie *t, u32 key, int plen)
                 node_set_parent((struct rt_trie_node *)l, tp);
 
                 cindex = tkey_extract_bits(key, tp->pos, tp->bits);
-                put_child(t, (struct tnode *)tp, cindex, (struct rt_trie_node *)l);
+                put_child(t, tp, cindex, (struct rt_trie_node *)l);
         } else {
                 /* Case 3: n is a LEAF or a TNODE and the key doesn't match. */
                 /*
@@ -1160,8 +1160,7 @@ static struct list_head *fib_insert_node(struct trie *t, u32 key, int plen)
 
                 if (tp) {
                         cindex = tkey_extract_bits(key, tp->pos, tp->bits);
-                        put_child(t, (struct tnode *)tp, cindex,
-                                  (struct rt_trie_node *)tn);
+                        put_child(t, tp, cindex, (struct rt_trie_node *)tn);
                 } else {
                         rcu_assign_pointer(t->trie, (struct rt_trie_node *)tn);
                         tp = tn;
@@ -1620,7 +1619,7 @@ static void trie_leaf_remove(struct trie *t, struct leaf *l)
 
         if (tp) {
                 t_key cindex = tkey_extract_bits(l->key, tp->pos, tp->bits);
-                put_child(t, (struct tnode *)tp, cindex, NULL);
+                put_child(t, tp, cindex, NULL);
                 trie_rebalance(t, tp);
         } else
                 RCU_INIT_POINTER(t->trie, NULL);
@@ -1844,6 +1843,8 @@ int fib_table_flush(struct fib_table *tb)
         if (ll && hlist_empty(&ll->list))
                 trie_leaf_remove(t, ll);
 
+        inetpeer_invalidate_tree(&tb->tb_peers);
+
         pr_debug("trie_flush found=%d\n", found);
         return found;
 }
@@ -1992,6 +1993,7 @@ struct fib_table *fib_trie_table(u32 id)
         tb->tb_id = id;
         tb->tb_default = -1;
         tb->tb_num_default = 0;
+        inet_peer_base_init(&tb->tb_peers);
 
         t = (struct trie *) tb->tb_data;
         memset(t, 0, sizeof(*t));
diff --git a/net/ipv4/icmp.c b/net/ipv4/icmp.c
index c75efbdc71c..4a049449305 100644
--- a/net/ipv4/icmp.c
+++ b/net/ipv4/icmp.c
@@ -95,6 +95,7 @@
 #include <net/checksum.h>
 #include <net/xfrm.h>
 #include <net/inet_common.h>
+#include <net/ip_fib.h>
 
 /*
  *      Build xmit assembly blocks
@@ -253,10 +254,10 @@ static inline bool icmpv4_xrlim_allow(struct net *net, struct rtable *rt,
 
         /* Limit if icmp type is enabled in ratemask. */
         if ((1 << type) & net->ipv4.sysctl_icmp_ratemask) {
-                if (!rt->peer)
-                        rt_bind_peer(rt, fl4->daddr, 1);
-                rc = inet_peer_xrlim_allow(rt->peer,
+                struct inet_peer *peer = inet_getpeer_v4(net->ipv4.peers, fl4->daddr, 1);
+                rc = inet_peer_xrlim_allow(peer,
                                            net->ipv4.sysctl_icmp_ratelimit);
+                inet_putpeer(peer);
         }
 out:
         return rc;
@@ -334,7 +335,7 @@ static void icmp_reply(struct icmp_bxm *icmp_param, struct sk_buff *skb)
         struct flowi4 fl4;
         struct sock *sk;
         struct inet_sock *inet;
-        __be32 daddr;
+        __be32 daddr, saddr;
 
         if (ip_options_echo(&icmp_param->replyopts.opt.opt, skb))
                 return;
@@ -348,6 +349,7 @@ static void icmp_reply(struct icmp_bxm *icmp_param, struct sk_buff *skb)
 
         inet->tos = ip_hdr(skb)->tos;
         daddr = ipc.addr = ip_hdr(skb)->saddr;
+        saddr = fib_compute_spec_dst(skb);
         ipc.opt = NULL;
         ipc.tx_flags = 0;
         if (icmp_param->replyopts.opt.opt.optlen) {
@@ -357,7 +359,7 @@ static void icmp_reply(struct icmp_bxm *icmp_param, struct sk_buff *skb)
         }
         memset(&fl4, 0, sizeof(fl4));
         fl4.daddr = daddr;
-        fl4.saddr = rt->rt_spec_dst;
+        fl4.saddr = saddr;
         fl4.flowi4_tos = RT_TOS(ip_hdr(skb)->tos);
         fl4.flowi4_proto = IPPROTO_ICMP;
         security_skb_classify_flow(skb, flowi4_to_flowi(&fl4));
@@ -638,12 +640,12 @@ EXPORT_SYMBOL(icmp_send);
 
 static void icmp_unreach(struct sk_buff *skb)
 {
+        const struct net_protocol *ipprot;
         const struct iphdr *iph;
         struct icmphdr *icmph;
-        int hash, protocol;
-        const struct net_protocol *ipprot;
-        u32 info = 0;
         struct net *net;
+        u32 info = 0;
+        int protocol;
 
         net = dev_net(skb_dst(skb)->dev);
 
@@ -674,9 +676,7 @@ static void icmp_unreach(struct sk_buff *skb)
                                 LIMIT_NETDEBUG(KERN_INFO pr_fmt("%pI4: fragmentation needed and DF set\n"),
                                                &iph->daddr);
                         } else {
-                                info = ip_rt_frag_needed(net, iph,
-                                                         ntohs(icmph->un.frag.mtu),
-                                                         skb->dev);
+                                info = ntohs(icmph->un.frag.mtu);
                                 if (!info)
                                         goto out;
                         }
@@ -734,9 +734,8 @@ static void icmp_unreach(struct sk_buff *skb)
          */
         raw_icmp_error(skb, protocol, info);
 
-        hash = protocol & (MAX_INET_PROTOS - 1);
         rcu_read_lock();
-        ipprot = rcu_dereference(inet_protos[hash]);
+        ipprot = rcu_dereference(inet_protos[protocol]);
         if (ipprot && ipprot->err_handler)
                 ipprot->err_handler(skb, info);
         rcu_read_unlock();
diff --git a/net/ipv4/inet_connection_sock.c b/net/ipv4/inet_connection_sock.c
index f9ee7417f6a..76825be3b64 100644
--- a/net/ipv4/inet_connection_sock.c
+++ b/net/ipv4/inet_connection_sock.c
@@ -368,17 +368,21 @@ EXPORT_SYMBOL(inet_csk_reset_keepalive_timer);
 
 struct dst_entry *inet_csk_route_req(struct sock *sk,
                                      struct flowi4 *fl4,
-                                     const struct request_sock *req)
+                                     const struct request_sock *req,
+                                     bool nocache)
 {
         struct rtable *rt;
         const struct inet_request_sock *ireq = inet_rsk(req);
         struct ip_options_rcu *opt = inet_rsk(req)->opt;
         struct net *net = sock_net(sk);
+        int flags = inet_sk_flowi_flags(sk);
 
+        if (nocache)
+                flags |= FLOWI_FLAG_RT_NOCACHE;
         flowi4_init_output(fl4, sk->sk_bound_dev_if, sk->sk_mark,
                            RT_CONN_FLAGS(sk), RT_SCOPE_UNIVERSE,
                            sk->sk_protocol,
-                           inet_sk_flowi_flags(sk) & ~FLOWI_FLAG_PRECOW_METRICS,
+                           flags,
                            (opt && opt->opt.srr) ? opt->opt.faddr : ireq->rmt_addr,
                            ireq->loc_addr, ireq->rmt_port, inet_sk(sk)->inet_sport);
         security_req_classify_flow(req, flowi4_to_flowi(fl4));
diff --git a/net/ipv4/inet_diag.c b/net/ipv4/inet_diag.c
index 46d1e7199a8..38064a285cc 100644
--- a/net/ipv4/inet_diag.c
+++ b/net/ipv4/inet_diag.c
@@ -46,9 +46,6 @@ struct inet_diag_entry {
         u16 userlocks;
 };
 
-#define INET_DIAG_PUT(skb, attrtype, attrlen) \
-        RTA_DATA(__RTA_PUT(skb, attrtype, attrlen))
-
 static DEFINE_MUTEX(inet_diag_table_mutex);
 
 static const struct inet_diag_handler *inet_diag_lock_handler(int proto)
@@ -78,24 +75,22 @@ int inet_sk_diag_fill(struct sock *sk, struct inet_connection_sock *icsk,
         const struct inet_sock *inet = inet_sk(sk);
         struct inet_diag_msg *r;
         struct nlmsghdr  *nlh;
+        struct nlattr *attr;
         void *info = NULL;
-        struct inet_diag_meminfo  *minfo = NULL;
-        unsigned char    *b = skb_tail_pointer(skb);
         const struct inet_diag_handler *handler;
         int ext = req->idiag_ext;
 
         handler = inet_diag_table[req->sdiag_protocol];
         BUG_ON(handler == NULL);
 
-        nlh = NLMSG_PUT(skb, pid, seq, unlh->nlmsg_type, sizeof(*r));
-        nlh->nlmsg_flags = nlmsg_flags;
+        nlh = nlmsg_put(skb, pid, seq, unlh->nlmsg_type, sizeof(*r),
+                        nlmsg_flags);
+        if (!nlh)
+                return -EMSGSIZE;
 
-        r = NLMSG_DATA(nlh);
+        r = nlmsg_data(nlh);
         BUG_ON(sk->sk_state == TCP_TIME_WAIT);
 
-        if (ext & (1 << (INET_DIAG_MEMINFO - 1)))
-                minfo = INET_DIAG_PUT(skb, INET_DIAG_MEMINFO, sizeof(*minfo));
-
         r->idiag_family = sk->sk_family;
         r->idiag_state = sk->sk_state;
         r->idiag_timer = 0;
@@ -113,7 +108,8 @@ int inet_sk_diag_fill(struct sock *sk, struct inet_connection_sock *icsk,
          * hence this needs to be included regardless of socket family.
          */
         if (ext & (1 << (INET_DIAG_TOS - 1)))
-                RTA_PUT_U8(skb, INET_DIAG_TOS, inet->tos);
+                if (nla_put_u8(skb, INET_DIAG_TOS, inet->tos) < 0)
+                        goto errout;
 
 #if IS_ENABLED(CONFIG_IPV6)
         if (r->idiag_family == AF_INET6) {
@@ -121,24 +117,31 @@ int inet_sk_diag_fill(struct sock *sk, struct inet_connection_sock *icsk,
 
                 *(struct in6_addr *)r->id.idiag_src = np->rcv_saddr;
                 *(struct in6_addr *)r->id.idiag_dst = np->daddr;
+
                 if (ext & (1 << (INET_DIAG_TCLASS - 1)))
-                        RTA_PUT_U8(skb, INET_DIAG_TCLASS, np->tclass);
+                        if (nla_put_u8(skb, INET_DIAG_TCLASS, np->tclass) < 0)
+                                goto errout;
         }
 #endif
 
         r->idiag_uid = sock_i_uid(sk);
         r->idiag_inode = sock_i_ino(sk);
 
-        if (minfo) {
-                minfo->idiag_rmem = sk_rmem_alloc_get(sk);
-                minfo->idiag_wmem = sk->sk_wmem_queued;
-                minfo->idiag_fmem = sk->sk_forward_alloc;
-                minfo->idiag_tmem = sk_wmem_alloc_get(sk);
+        if (ext & (1 << (INET_DIAG_MEMINFO - 1))) {
+                struct inet_diag_meminfo minfo = {
+                        .idiag_rmem = sk_rmem_alloc_get(sk),
+                        .idiag_wmem = sk->sk_wmem_queued,
+                        .idiag_fmem = sk->sk_forward_alloc,
+                        .idiag_tmem = sk_wmem_alloc_get(sk),
+                };
+
+                if (nla_put(skb, INET_DIAG_MEMINFO, sizeof(minfo), &minfo) < 0)
+                        goto errout;
         }
 
         if (ext & (1 << (INET_DIAG_SKMEMINFO - 1)))
                 if (sock_diag_put_meminfo(sk, skb, INET_DIAG_SKMEMINFO))
-                        goto rtattr_failure;
+                        goto errout;
 
         if (icsk == NULL) {
                 handler->idiag_get_info(sk, r, NULL);
@@ -165,16 +168,20 @@ int inet_sk_diag_fill(struct sock *sk, struct inet_connection_sock *icsk,
         }
 #undef EXPIRES_IN_MS
 
-        if (ext & (1 << (INET_DIAG_INFO - 1)))
-                info = INET_DIAG_PUT(skb, INET_DIAG_INFO, sizeof(struct tcp_info));
+        if (ext & (1 << (INET_DIAG_INFO - 1))) {
+                attr = nla_reserve(skb, INET_DIAG_INFO,
+                                   sizeof(struct tcp_info));
+                if (!attr)
+                        goto errout;
 
-        if ((ext & (1 << (INET_DIAG_CONG - 1))) && icsk->icsk_ca_ops) {
-                const size_t len = strlen(icsk->icsk_ca_ops->name);
-
-                strcpy(INET_DIAG_PUT(skb, INET_DIAG_CONG, len + 1),
-                       icsk->icsk_ca_ops->name);
+                info = nla_data(attr);
         }
 
+        if ((ext & (1 << (INET_DIAG_CONG - 1))) && icsk->icsk_ca_ops)
+                if (nla_put_string(skb, INET_DIAG_CONG,
+                                   icsk->icsk_ca_ops->name) < 0)
+                        goto errout;
+
         handler->idiag_get_info(sk, r, info);
 
         if (sk->sk_state < TCP_TIME_WAIT &&
@@ -182,12 +189,10 @@ int inet_sk_diag_fill(struct sock *sk, struct inet_connection_sock *icsk,
                 icsk->icsk_ca_ops->get_info(sk, ext, skb);
 
 out:
-        nlh->nlmsg_len = skb_tail_pointer(skb) - b;
-        return skb->len;
+        return nlmsg_end(skb, nlh);
 
-rtattr_failure:
-nlmsg_failure:
-        nlmsg_trim(skb, b);
+errout:
+        nlmsg_cancel(skb, nlh);
         return -EMSGSIZE;
 }
 EXPORT_SYMBOL_GPL(inet_sk_diag_fill);
@@ -208,14 +213,15 @@ static int inet_twsk_diag_fill(struct inet_timewait_sock *tw,
 {
         long tmo;
         struct inet_diag_msg *r;
-        const unsigned char *previous_tail = skb_tail_pointer(skb);
-        struct nlmsghdr *nlh = NLMSG_PUT(skb, pid, seq,
-                                         unlh->nlmsg_type, sizeof(*r));
+        struct nlmsghdr *nlh;
 
-        r = NLMSG_DATA(nlh);
-        BUG_ON(tw->tw_state != TCP_TIME_WAIT);
+        nlh = nlmsg_put(skb, pid, seq, unlh->nlmsg_type, sizeof(*r),
+                        nlmsg_flags);
+        if (!nlh)
+                return -EMSGSIZE;
 
-        nlh->nlmsg_flags = nlmsg_flags;
+        r = nlmsg_data(nlh);
+        BUG_ON(tw->tw_state != TCP_TIME_WAIT);
 
         tmo = tw->tw_ttd - jiffies;
         if (tmo < 0)
@@ -245,11 +251,8 @@ static int inet_twsk_diag_fill(struct inet_timewait_sock *tw,
                 *(struct in6_addr *)r->id.idiag_dst = tw6->tw_v6_daddr;
         }
 #endif
-        nlh->nlmsg_len = skb_tail_pointer(skb) - previous_tail;
-        return skb->len;
-nlmsg_failure:
-        nlmsg_trim(skb, previous_tail);
-        return -EMSGSIZE;
+
+        return nlmsg_end(skb, nlh);
 }
 
 static int sk_diag_fill(struct sock *sk, struct sk_buff *skb,
@@ -298,20 +301,20 @@ int inet_diag_dump_one_icsk(struct inet_hashinfo *hashinfo, struct sk_buff *in_s
         if (err)
                 goto out;
 
-        err = -ENOMEM;
-        rep = alloc_skb(NLMSG_SPACE((sizeof(struct inet_diag_msg) +
-                                     sizeof(struct inet_diag_meminfo) +
-                                     sizeof(struct tcp_info) + 64)),
-                        GFP_KERNEL);
-        if (!rep)
+        rep = nlmsg_new(sizeof(struct inet_diag_msg) +
+                        sizeof(struct inet_diag_meminfo) +
+                        sizeof(struct tcp_info) + 64, GFP_KERNEL);
+        if (!rep) {
+                err = -ENOMEM;
                 goto out;
+        }
 
         err = sk_diag_fill(sk, rep, req,
                            NETLINK_CB(in_skb).pid,
                            nlh->nlmsg_seq, 0, nlh);
         if (err < 0) {
                 WARN_ON(err == -EMSGSIZE);
-                kfree_skb(rep);
+                nlmsg_free(rep);
                 goto out;
         }
         err = netlink_unicast(sock_diag_nlsk, rep, NETLINK_CB(in_skb).pid,
@@ -592,15 +595,16 @@ static int inet_diag_fill_req(struct sk_buff *skb, struct sock *sk,
 {
         const struct inet_request_sock *ireq = inet_rsk(req);
         struct inet_sock *inet = inet_sk(sk);
-        unsigned char *b = skb_tail_pointer(skb);
         struct inet_diag_msg *r;
         struct nlmsghdr *nlh;
         long tmo;
 
-        nlh = NLMSG_PUT(skb, pid, seq, unlh->nlmsg_type, sizeof(*r));
-        nlh->nlmsg_flags = NLM_F_MULTI;
-        r = NLMSG_DATA(nlh);
+        nlh = nlmsg_put(skb, pid, seq, unlh->nlmsg_type, sizeof(*r),
+                        NLM_F_MULTI);
+        if (!nlh)
+                return -EMSGSIZE;
 
+        r = nlmsg_data(nlh);
         r->idiag_family = sk->sk_family;
         r->idiag_state = TCP_SYN_RECV;
         r->idiag_timer = 1;
@@ -628,13 +632,8 @@ static int inet_diag_fill_req(struct sk_buff *skb, struct sock *sk,
                 *(struct in6_addr *)r->id.idiag_dst = inet6_rsk(req)->rmt_addr;
         }
 #endif
-        nlh->nlmsg_len = skb_tail_pointer(skb) - b;
-
-        return skb->len;
 
-nlmsg_failure:
-        nlmsg_trim(skb, b);
-        return -1;
+        return nlmsg_end(skb, nlh);
 }
 
 static int inet_diag_dump_reqs(struct sk_buff *skb, struct sock *sk,
@@ -892,7 +891,7 @@ static int inet_diag_dump(struct sk_buff *skb, struct netlink_callback *cb)
         if (nlmsg_attrlen(cb->nlh, hdrlen))
                 bc = nlmsg_find_attr(cb->nlh, hdrlen, INET_DIAG_REQ_BYTECODE);
 
-        return __inet_diag_dump(skb, cb, (struct inet_diag_req_v2 *)NLMSG_DATA(cb->nlh), bc);
+        return __inet_diag_dump(skb, cb, nlmsg_data(cb->nlh), bc);
 }
 
 static inline int inet_diag_type2proto(int type)
@@ -909,7 +908,7 @@ static inline int inet_diag_type2proto(int type)
 
 static int inet_diag_dump_compat(struct sk_buff *skb, struct netlink_callback *cb)
 {
-        struct inet_diag_req *rc = NLMSG_DATA(cb->nlh);
+        struct inet_diag_req *rc = nlmsg_data(cb->nlh);
         struct inet_diag_req_v2 req;
         struct nlattr *bc = NULL;
         int hdrlen = sizeof(struct inet_diag_req);
@@ -929,7 +928,7 @@ static int inet_diag_dump_compat(struct sk_buff *skb, struct netlink_callback *c
 static int inet_diag_get_exact_compat(struct sk_buff *in_skb,
                                const struct nlmsghdr *nlh)
 {
-        struct inet_diag_req *rc = NLMSG_DATA(nlh);
+        struct inet_diag_req *rc = nlmsg_data(nlh);
         struct inet_diag_req_v2 req;
 
         req.sdiag_family = rc->idiag_family;
@@ -996,7 +995,7 @@ static int inet_diag_handler_dump(struct sk_buff *skb, struct nlmsghdr *h)
                 }
         }
 
-        return inet_diag_get_exact(skb, h, (struct inet_diag_req_v2 *)NLMSG_DATA(h));
+        return inet_diag_get_exact(skb, h, nlmsg_data(h));
 }
 
 static const struct sock_diag_handler inet_diag_handler = {
diff --git a/net/ipv4/inet_fragment.c b/net/ipv4/inet_fragment.c
index 5ff2a51b6d0..85190e69297 100644
--- a/net/ipv4/inet_fragment.c
+++ b/net/ipv4/inet_fragment.c
@@ -243,12 +243,12 @@ static struct inet_frag_queue *inet_frag_alloc(struct netns_frags *nf,
         if (q == NULL)
                 return NULL;
 
+        q->net = nf;
         f->constructor(q, arg);
         atomic_add(f->qsize, &nf->mem);
         setup_timer(&q->timer, f->frag_expire, (unsigned long)q);
         spin_lock_init(&q->lock);
         atomic_set(&q->refcnt, 1);
-        q->net = nf;
 
         return q;
 }
diff --git a/net/ipv4/inetpeer.c b/net/ipv4/inetpeer.c
index dfba343b250..e1e0a4e8fd3 100644
--- a/net/ipv4/inetpeer.c
+++ b/net/ipv4/inetpeer.c
@@ -82,23 +82,39 @@ static const struct inet_peer peer_fake_node = {
         .avl_height     = 0
 };
 
-struct inet_peer_base {
-        struct inet_peer __rcu *root;
-        seqlock_t       lock;
-        int             total;
-};
+void inet_peer_base_init(struct inet_peer_base *bp)
+{
+        bp->root = peer_avl_empty_rcu;
+        seqlock_init(&bp->lock);
+        bp->flush_seq = ~0U;
+        bp->total = 0;
+}
+EXPORT_SYMBOL_GPL(inet_peer_base_init);
 
-static struct inet_peer_base v4_peers = {
-        .root           = peer_avl_empty_rcu,
-        .lock           = __SEQLOCK_UNLOCKED(v4_peers.lock),
-        .total          = 0,
-};
+static atomic_t v4_seq = ATOMIC_INIT(0);
+static atomic_t v6_seq = ATOMIC_INIT(0);
 
-static struct inet_peer_base v6_peers = {
-        .root           = peer_avl_empty_rcu,
-        .lock           = __SEQLOCK_UNLOCKED(v6_peers.lock),
-        .total          = 0,
-};
+static atomic_t *inetpeer_seq_ptr(int family)
+{
+        return (family == AF_INET ? &v4_seq : &v6_seq);
+}
+
+static inline void flush_check(struct inet_peer_base *base, int family)
+{
+        atomic_t *fp = inetpeer_seq_ptr(family);
+
+        if (unlikely(base->flush_seq != atomic_read(fp))) {
+                inetpeer_invalidate_tree(base);
+                base->flush_seq = atomic_read(fp);
+        }
+}
+
+void inetpeer_invalidate_family(int family)
+{
+        atomic_t *fp = inetpeer_seq_ptr(family);
+
+        atomic_inc(fp);
+}
 
 #define PEER_MAXDEPTH 40 /* sufficient for about 2^27 nodes */
 
@@ -110,7 +126,7 @@ int inet_peer_maxttl __read_mostly = 10 * 60 * HZ;	/* usual time to live: 10 min
 
 static void inetpeer_gc_worker(struct work_struct *work)
 {
-        struct inet_peer *p, *n;
+        struct inet_peer *p, *n, *c;
         LIST_HEAD(list);
 
         spin_lock_bh(&gc_lock);
@@ -122,17 +138,19 @@ static void inetpeer_gc_worker(struct work_struct *work)
 
         list_for_each_entry_safe(p, n, &list, gc_list) {
 
-                if(need_resched())
+                if (need_resched())
                         cond_resched();
 
-                if (p->avl_left != peer_avl_empty) {
-                        list_add_tail(&p->avl_left->gc_list, &list);
-                        p->avl_left = peer_avl_empty;
+                c = rcu_dereference_protected(p->avl_left, 1);
+                if (c != peer_avl_empty) {
+                        list_add_tail(&c->gc_list, &list);
+                        p->avl_left = peer_avl_empty_rcu;
                 }
 
-                if (p->avl_right != peer_avl_empty) {
-                        list_add_tail(&p->avl_right->gc_list, &list);
-                        p->avl_right = peer_avl_empty;
+                c = rcu_dereference_protected(p->avl_right, 1);
+                if (c != peer_avl_empty) {
+                        list_add_tail(&c->gc_list, &list);
+                        p->avl_right = peer_avl_empty_rcu;
                 }
 
                 n = list_entry(p->gc_list.next, struct inet_peer, gc_list);
@@ -401,11 +419,6 @@ static void unlink_from_pool(struct inet_peer *p, struct inet_peer_base *base,
         call_rcu(&p->rcu, inetpeer_free_rcu);
 }
 
-static struct inet_peer_base *family_to_base(int family)
-{
-        return family == AF_INET ? &v4_peers : &v6_peers;
-}
-
 /* perform garbage collect on all items stacked during a lookup */
 static int inet_peer_gc(struct inet_peer_base *base,
                         struct inet_peer __rcu **stack[PEER_MAXDEPTH],
@@ -443,14 +456,17 @@ static int inet_peer_gc(struct inet_peer_base *base,
         return cnt;
 }
 
-struct inet_peer *inet_getpeer(const struct inetpeer_addr *daddr, int create)
+struct inet_peer *inet_getpeer(struct inet_peer_base *base,
+                               const struct inetpeer_addr *daddr,
+                               int create)
 {
         struct inet_peer __rcu **stack[PEER_MAXDEPTH], ***stackptr;
-        struct inet_peer_base *base = family_to_base(daddr->family);
         struct inet_peer *p;
         unsigned int sequence;
         int invalidated, gccnt = 0;
 
+        flush_check(base, daddr->family);
+
         /* Attempt a lockless lookup first.
          * Because of a concurrent writer, we might not find an existing entry.
          */
@@ -492,13 +508,9 @@ relookup:
                                 (daddr->family == AF_INET) ?
                                         secure_ip_id(daddr->addr.a4) :
                                         secure_ipv6_id(daddr->addr.a6));
-                p->tcp_ts_stamp = 0;
                 p->metrics[RTAX_LOCK-1] = INETPEER_METRICS_NEW;
                 p->rate_tokens = 0;
                 p->rate_last = 0;
-                p->pmtu_expires = 0;
-                p->pmtu_orig = 0;
-                memset(&p->redirect_learned, 0, sizeof(p->redirect_learned));
                 INIT_LIST_HEAD(&p->gc_list);
 
                 /* Link the node. */
@@ -571,26 +583,19 @@ static void inetpeer_inval_rcu(struct rcu_head *head)
         schedule_delayed_work(&gc_work, gc_delay);
 }
 
-void inetpeer_invalidate_tree(int family)
+void inetpeer_invalidate_tree(struct inet_peer_base *base)
 {
-        struct inet_peer *old, *new, *prev;
-        struct inet_peer_base *base = family_to_base(family);
+        struct inet_peer *root;
 
         write_seqlock_bh(&base->lock);
 
-        old = base->root;
-        if (old == peer_avl_empty_rcu)
-                goto out;
-
-        new = peer_avl_empty_rcu;
-
-        prev = cmpxchg(&base->root, old, new);
-        if (prev == old) {
+        root = rcu_deref_locked(base->root, base);
+        if (root != peer_avl_empty) {
+                base->root = peer_avl_empty_rcu;
                 base->total = 0;
-                call_rcu(&prev->gc_rcu, inetpeer_inval_rcu);
+                call_rcu(&root->gc_rcu, inetpeer_inval_rcu);
         }
 
-out:
         write_sequnlock_bh(&base->lock);
 }
 EXPORT_SYMBOL(inetpeer_invalidate_tree);
diff --git a/net/ipv4/ip_fragment.c b/net/ipv4/ip_fragment.c
index 9dbd3dd6022..8d07c973409 100644
--- a/net/ipv4/ip_fragment.c
+++ b/net/ipv4/ip_fragment.c
@@ -171,6 +171,10 @@ static void frag_kfree_skb(struct netns_frags *nf, struct sk_buff *skb)
 static void ip4_frag_init(struct inet_frag_queue *q, void *a)
 {
         struct ipq *qp = container_of(q, struct ipq, q);
+        struct netns_ipv4 *ipv4 = container_of(q->net, struct netns_ipv4,
+                                               frags);
+        struct net *net = container_of(ipv4, struct net, ipv4);
+
         struct ip4_create_arg *arg = a;
 
         qp->protocol = arg->iph->protocol;
@@ -180,7 +184,7 @@ static void ip4_frag_init(struct inet_frag_queue *q, void *a)
         qp->daddr = arg->iph->daddr;
         qp->user = arg->user;
         qp->peer = sysctl_ipfrag_max_dist ?
-                inet_getpeer_v4(arg->iph->saddr, 1) : NULL;
+                inet_getpeer_v4(net->ipv4.peers, arg->iph->saddr, 1) : NULL;
 }
 
 static __inline__ void ip4_frag_free(struct inet_frag_queue *q)
diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c
index f49047b7960..594cec35ac4 100644
--- a/net/ipv4/ip_gre.c
+++ b/net/ipv4/ip_gre.c
@@ -516,9 +516,6 @@ static void ipgre_err(struct sk_buff *skb, u32 info)
                 case ICMP_PORT_UNREACH:
                         /* Impossible event. */
                         return;
-                case ICMP_FRAG_NEEDED:
-                        /* Soft state for pmtu is maintained by IP core. */
-                        return;
                 default:
                         /* All others are translated to HOST_UNREACH.
                            rfc2003 contains "deep thoughts" about NET_UNREACH,
@@ -538,7 +535,16 @@ static void ipgre_err(struct sk_buff *skb, u32 info)
                                 flags & GRE_KEY ?
                                 *(((__be32 *)p) + (grehlen / 4) - 1) : 0,
                                 p[1]);
-        if (t == NULL || t->parms.iph.daddr == 0 ||
+        if (t == NULL)
+                goto out;
+
+        if (type == ICMP_DEST_UNREACH && code == ICMP_FRAG_NEEDED) {
+                ipv4_update_pmtu(skb, dev_net(skb->dev), info,
+                                 t->parms.link, 0, IPPROTO_GRE, 0);
+                goto out;
+        }
+
+        if (t->parms.iph.daddr == 0 ||
             ipv4_is_multicast(t->parms.iph.daddr))
                 goto out;
 
diff --git a/net/ipv4/ip_input.c b/net/ipv4/ip_input.c
index 8590144ca33..b27d4440f52 100644
--- a/net/ipv4/ip_input.c
+++ b/net/ipv4/ip_input.c
@@ -198,14 +198,13 @@ static int ip_local_deliver_finish(struct sk_buff *skb)
         rcu_read_lock();
         {
                 int protocol = ip_hdr(skb)->protocol;
-                int hash, raw;
                 const struct net_protocol *ipprot;
+                int raw;
 
         resubmit:
                 raw = raw_local_deliver(skb, protocol);
 
-                hash = protocol & (MAX_INET_PROTOS - 1);
-                ipprot = rcu_dereference(inet_protos[hash]);
+                ipprot = rcu_dereference(inet_protos[protocol]);
                 if (ipprot != NULL) {
                         int ret;
 
@@ -314,26 +313,33 @@ drop:
         return true;
 }
 
+int sysctl_ip_early_demux __read_mostly = 1;
+
 static int ip_rcv_finish(struct sk_buff *skb)
 {
         const struct iphdr *iph = ip_hdr(skb);
         struct rtable *rt;
 
+        if (sysctl_ip_early_demux && !skb_dst(skb)) {
+                const struct net_protocol *ipprot;
+                int protocol = iph->protocol;
+
+                rcu_read_lock();
+                ipprot = rcu_dereference(inet_protos[protocol]);
+                if (ipprot && ipprot->early_demux)
+                        ipprot->early_demux(skb);
+                rcu_read_unlock();
+        }
+
         /*
          *      Initialise the virtual path cache for the packet. It describes
          *      how the packet travels inside Linux networking.
          */
-        if (skb_dst(skb) == NULL) {
+        if (!skb_dst(skb)) {
                 int err = ip_route_input_noref(skb, iph->daddr, iph->saddr,
                                                iph->tos, skb->dev);
                 if (unlikely(err)) {
-                        if (err == -EHOSTUNREACH)
-                                IP_INC_STATS_BH(dev_net(skb->dev),
-                                                IPSTATS_MIB_INADDRERRORS);
-                        else if (err == -ENETUNREACH)
-                                IP_INC_STATS_BH(dev_net(skb->dev),
-                                                IPSTATS_MIB_INNOROUTES);
-                        else if (err == -EXDEV)
+                        if (err == -EXDEV)
                                 NET_INC_STATS_BH(dev_net(skb->dev),
                                                  LINUX_MIB_IPRPFILTER);
                         goto drop;
diff --git a/net/ipv4/ip_options.c b/net/ipv4/ip_options.c
index 708b99494e2..a19d6471a31 100644
--- a/net/ipv4/ip_options.c
+++ b/net/ipv4/ip_options.c
@@ -27,6 +27,7 @@
 #include <net/icmp.h>
 #include <net/route.h>
 #include <net/cipso_ipv4.h>
+#include <net/ip_fib.h>
 
 /*
  * Write options to IP header, record destination address to
@@ -104,7 +105,7 @@ int ip_options_echo(struct ip_options *dopt, struct sk_buff *skb)
         sptr = skb_network_header(skb);
         dptr = dopt->__data;
 
-        daddr = skb_rtable(skb)->rt_spec_dst;
+        daddr = fib_compute_spec_dst(skb);
 
         if (sopt->rr) {
                 optlen  = sptr[sopt->rr+1];
@@ -241,6 +242,15 @@ void ip_options_fragment(struct sk_buff *skb)
         opt->ts_needtime = 0;
 }
 
+/* helper used by ip_options_compile() to call fib_compute_spec_dst()
+ * at most one time.
+ */
+static void spec_dst_fill(__be32 *spec_dst, struct sk_buff *skb)
+{
+        if (*spec_dst == htonl(INADDR_ANY))
+                *spec_dst = fib_compute_spec_dst(skb);
+}
+
 /*
  * Verify options and fill pointers in struct options.
  * Caller should clear *opt, and set opt->data.
@@ -250,12 +260,12 @@ void ip_options_fragment(struct sk_buff *skb)
 int ip_options_compile(struct net *net,
                        struct ip_options *opt, struct sk_buff *skb)
 {
-        int l;
-        unsigned char *iph;
-        unsigned char *optptr;
-        int optlen;
+        __be32 spec_dst = htonl(INADDR_ANY);
         unsigned char *pp_ptr = NULL;
         struct rtable *rt = NULL;
+        unsigned char *optptr;
+        unsigned char *iph;
+        int optlen, l;
 
         if (skb != NULL) {
                 rt = skb_rtable(skb);
@@ -331,7 +341,8 @@ int ip_options_compile(struct net *net,
                                         goto error;
                                 }
                                 if (rt) {
-                                        memcpy(&optptr[optptr[2]-1], &rt->rt_spec_dst, 4);
+                                        spec_dst_fill(&spec_dst, skb);
+                                        memcpy(&optptr[optptr[2]-1], &spec_dst, 4);
                                         opt->is_changed = 1;
                                 }
                                 optptr[2] += 4;
@@ -373,7 +384,8 @@ int ip_options_compile(struct net *net,
                                         }
                                         opt->ts = optptr - iph;
                                         if (rt)  {
-                                                memcpy(&optptr[optptr[2]-1], &rt->rt_spec_dst, 4);
+                                                spec_dst_fill(&spec_dst, skb);
+                                                memcpy(&optptr[optptr[2]-1], &spec_dst, 4);
                                                 timeptr = &optptr[optptr[2]+3];
                                         }
                                         opt->ts_needaddr = 1;
diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c
index 451f97c42eb..cc52679790b 100644
--- a/net/ipv4/ip_output.c
+++ b/net/ipv4/ip_output.c
@@ -113,19 +113,6 @@ int ip_local_out(struct sk_buff *skb)
 }
 EXPORT_SYMBOL_GPL(ip_local_out);
 
-/* dev_loopback_xmit for use with netfilter. */
-static int ip_dev_loopback_xmit(struct sk_buff *newskb)
-{
-        skb_reset_mac_header(newskb);
-        __skb_pull(newskb, skb_network_offset(newskb));
-        newskb->pkt_type = PACKET_LOOPBACK;
-        newskb->ip_summed = CHECKSUM_UNNECESSARY;
-        WARN_ON(!skb_dst(newskb));
-        skb_dst_force(newskb);
-        netif_rx_ni(newskb);
-        return 0;
-}
-
 static inline int ip_select_ttl(struct inet_sock *inet, struct dst_entry *dst)
 {
         int ttl = inet->uc_ttl;
@@ -183,6 +170,7 @@ static inline int ip_finish_output2(struct sk_buff *skb)
         struct net_device *dev = dst->dev;
         unsigned int hh_len = LL_RESERVED_SPACE(dev);
         struct neighbour *neigh;
+        u32 nexthop;
 
         if (rt->rt_type == RTN_MULTICAST) {
                 IP_UPD_PO_STATS(dev_net(dev), IPSTATS_MIB_OUTMCAST, skb->len);
@@ -200,19 +188,22 @@ static inline int ip_finish_output2(struct sk_buff *skb)
                 }
                 if (skb->sk)
                         skb_set_owner_w(skb2, skb->sk);
-                kfree_skb(skb);
+                consume_skb(skb);
                 skb = skb2;
         }
 
-        rcu_read_lock();
-        neigh = dst_get_neighbour_noref(dst);
+        rcu_read_lock_bh();
+        nexthop = rt->rt_gateway ? rt->rt_gateway : ip_hdr(skb)->daddr;
+        neigh = __ipv4_neigh_lookup_noref(dev, nexthop);
+        if (unlikely(!neigh))
+                neigh = __neigh_create(&arp_tbl, &nexthop, dev, false);
         if (neigh) {
-                int res = neigh_output(neigh, skb);
+                int res = dst_neigh_output(dst, neigh, skb);
 
-                rcu_read_unlock();
+                rcu_read_unlock_bh();
                 return res;
         }
-        rcu_read_unlock();
+        rcu_read_unlock_bh();
 
         net_dbg_ratelimited("%s: No header cache and no neighbour!\n",
                             __func__);
@@ -281,7 +272,7 @@ int ip_mc_output(struct sk_buff *skb)
                         if (newskb)
                                 NF_HOOK(NFPROTO_IPV4, NF_INET_POST_ROUTING,
                                         newskb, NULL, newskb->dev,
-                                        ip_dev_loopback_xmit);
+                                        dev_loopback_xmit);
                 }
 
                 /* Multicasts with ttl 0 must not go beyond the host */
@@ -296,7 +287,7 @@ int ip_mc_output(struct sk_buff *skb)
                 struct sk_buff *newskb = skb_clone(skb, GFP_ATOMIC);
                 if (newskb)
                         NF_HOOK(NFPROTO_IPV4, NF_INET_POST_ROUTING, newskb,
-                                NULL, newskb->dev, ip_dev_loopback_xmit);
+                                NULL, newskb->dev, dev_loopback_xmit);
         }
 
         return NF_HOOK_COND(NFPROTO_IPV4, NF_INET_POST_ROUTING, skb, NULL,
@@ -709,7 +700,7 @@ slow_path:
 
                 IP_INC_STATS(dev_net(dev), IPSTATS_MIB_FRAGCREATES);
         }
-        kfree_skb(skb);
+        consume_skb(skb);
         IP_INC_STATS(dev_net(dev), IPSTATS_MIB_FRAGOKS);
         return err;
 
@@ -1472,13 +1463,14 @@ static int ip_reply_glue_bits(void *dptr, char *to, int offset,
 
 /*
  *      Generic function to send a packet as reply to another packet.
- *      Used to send TCP resets so far. ICMP should use this function too.
+ *      Used to send TCP resets so far.
  *
  *      Should run single threaded per socket because it uses the sock
  *      structure to pass arguments.
  */
-void ip_send_reply(struct sock *sk, struct sk_buff *skb, __be32 daddr,
-                   const struct ip_reply_arg *arg, unsigned int len)
+void ip_send_unicast_reply(struct sock *sk, struct sk_buff *skb, __be32 daddr,
+                           __be32 saddr, const struct ip_reply_arg *arg,
+                           unsigned int len)
 {
         struct inet_sock *inet = inet_sk(sk);
         struct ip_options_data replyopts;
@@ -1504,7 +1496,7 @@ void ip_send_reply(struct sock *sk, struct sk_buff *skb, __be32 daddr,
                            RT_TOS(arg->tos),
                            RT_SCOPE_UNIVERSE, sk->sk_protocol,
                            ip_reply_arg_flowi_flags(arg),
-                           daddr, rt->rt_spec_dst,
+                           daddr, saddr,
                            tcp_hdr(skb)->source, tcp_hdr(skb)->dest);
         security_skb_classify_flow(skb, flowi4_to_flowi(&fl4));
         rt = ip_route_output_key(sock_net(sk), &fl4);
diff --git a/net/ipv4/ip_sockglue.c b/net/ipv4/ip_sockglue.c
index 0d11f234d61..de29f46f68b 100644
--- a/net/ipv4/ip_sockglue.c
+++ b/net/ipv4/ip_sockglue.c
@@ -40,6 +40,7 @@
 #if IS_ENABLED(CONFIG_IPV6)
 #include <net/transp_v6.h>
 #endif
+#include <net/ip_fib.h>
 
 #include <linux/errqueue.h>
 #include <asm/uaccess.h>
@@ -1019,8 +1020,8 @@ e_inval:
  * @sk: socket
  * @skb: buffer
  *
- * To support IP_CMSG_PKTINFO option, we store rt_iif and rt_spec_dst
- * in skb->cb[] before dst drop.
+ * To support IP_CMSG_PKTINFO option, we store rt_iif and specific
+ * destination in skb->cb[] before dst drop.
  * This way, receiver doesnt make cache line misses to read rtable.
  */
 void ipv4_pktinfo_prepare(struct sk_buff *skb)
@@ -1030,7 +1031,7 @@ void ipv4_pktinfo_prepare(struct sk_buff *skb)
 
         if (rt) {
                 pktinfo->ipi_ifindex = rt->rt_iif;
-                pktinfo->ipi_spec_dst.s_addr = rt->rt_spec_dst;
+                pktinfo->ipi_spec_dst.s_addr = fib_compute_spec_dst(skb);
         } else {
                 pktinfo->ipi_ifindex = 0;
                 pktinfo->ipi_spec_dst.s_addr = 0;
diff --git a/net/ipv4/ipcomp.c b/net/ipv4/ipcomp.c
index 63b64c45a82..b91375482d8 100644
--- a/net/ipv4/ipcomp.c
+++ b/net/ipv4/ipcomp.c
@@ -42,6 +42,7 @@ static void ipcomp4_err(struct sk_buff *skb, u32 info)
                 return;
         NETDEBUG(KERN_DEBUG "pmtu discovery on SA IPCOMP/%08x/%pI4\n",
                  spi, &iph->daddr);
+        ipv4_update_pmtu(skb, net, info, 0, 0, IPPROTO_COMP, 0);
         xfrm_state_put(x);
 }
 
diff --git a/net/ipv4/ipip.c b/net/ipv4/ipip.c
index 2d0f99bf61b..715338a1b20 100644
--- a/net/ipv4/ipip.c
+++ b/net/ipv4/ipip.c
@@ -348,9 +348,6 @@ static int ipip_err(struct sk_buff *skb, u32 info)
                 case ICMP_PORT_UNREACH:
                         /* Impossible event. */
                         return 0;
-                case ICMP_FRAG_NEEDED:
-                        /* Soft state for pmtu is maintained by IP core. */
-                        return 0;
                 default:
                         /* All others are translated to HOST_UNREACH.
                            rfc2003 contains "deep thoughts" about NET_UNREACH,
@@ -369,7 +366,17 @@ static int ipip_err(struct sk_buff *skb, u32 info)
 
         rcu_read_lock();
         t = ipip_tunnel_lookup(dev_net(skb->dev), iph->daddr, iph->saddr);
-        if (t == NULL || t->parms.iph.daddr == 0)
+        if (t == NULL)
+                goto out;
+
+        if (type == ICMP_DEST_UNREACH && code == ICMP_FRAG_NEEDED) {
+                ipv4_update_pmtu(skb, dev_net(skb->dev), info,
+                                 t->dev->ifindex, 0, IPPROTO_IPIP, 0);
+                err = 0;
+                goto out;
+        }
+
+        if (t->parms.iph.daddr == 0)
                 goto out;
 
         err = 0;
diff --git a/net/ipv4/ipmr.c b/net/ipv4/ipmr.c
index c94bbc6f2ba..5716c6b808d 100644
--- a/net/ipv4/ipmr.c
+++ b/net/ipv4/ipmr.c
@@ -524,8 +524,8 @@ failure:
 }
 #endif
 
-/*
- *      Delete a VIF entry
+/**
+ *      vif_delete - Delete a VIF entry
  *      @notify: Set to 1, if the caller is a notifier_call
  */
 
@@ -2006,37 +2006,37 @@ static int __ipmr_fill_mroute(struct mr_table *mrt, struct sk_buff *skb,
 {
         int ct;
         struct rtnexthop *nhp;
-        u8 *b = skb_tail_pointer(skb);
-        struct rtattr *mp_head;
+        struct nlattr *mp_attr;
 
         /* If cache is unresolved, don't try to parse IIF and OIF */
         if (c->mfc_parent >= MAXVIFS)
                 return -ENOENT;
 
-        if (VIF_EXISTS(mrt, c->mfc_parent))
-                RTA_PUT(skb, RTA_IIF, 4, &mrt->vif_table[c->mfc_parent].dev->ifindex);
+        if (VIF_EXISTS(mrt, c->mfc_parent) &&
+            nla_put_u32(skb, RTA_IIF, mrt->vif_table[c->mfc_parent].dev->ifindex) < 0)
+                return -EMSGSIZE;
 
-        mp_head = (struct rtattr *)skb_put(skb, RTA_LENGTH(0));
+        if (!(mp_attr = nla_nest_start(skb, RTA_MULTIPATH)))
+                return -EMSGSIZE;
 
         for (ct = c->mfc_un.res.minvif; ct < c->mfc_un.res.maxvif; ct++) {
                 if (VIF_EXISTS(mrt, ct) && c->mfc_un.res.ttls[ct] < 255) {
-                        if (skb_tailroom(skb) < RTA_ALIGN(RTA_ALIGN(sizeof(*nhp)) + 4))
-                                goto rtattr_failure;
-                        nhp = (struct rtnexthop *)skb_put(skb, RTA_ALIGN(sizeof(*nhp)));
+                        if (!(nhp = nla_reserve_nohdr(skb, sizeof(*nhp)))) {
+                                nla_nest_cancel(skb, mp_attr);
+                                return -EMSGSIZE;
+                        }
+
                         nhp->rtnh_flags = 0;
                         nhp->rtnh_hops = c->mfc_un.res.ttls[ct];
                         nhp->rtnh_ifindex = mrt->vif_table[ct].dev->ifindex;
                         nhp->rtnh_len = sizeof(*nhp);
                 }
         }
-        mp_head->rta_type = RTA_MULTIPATH;
-        mp_head->rta_len = skb_tail_pointer(skb) - (u8 *)mp_head;
+
+        nla_nest_end(skb, mp_attr);
+
         rtm->rtm_type = RTN_MULTICAST;
         return 1;
-
-rtattr_failure:
-        nlmsg_trim(skb, b);
-        return -EMSGSIZE;
 }
 
 int ipmr_get_route(struct net *net, struct sk_buff *skb,
diff --git a/net/ipv4/netfilter/ipt_ULOG.c b/net/ipv4/netfilter/ipt_ULOG.c
index ba5756d2016..1109f7f6c25 100644
--- a/net/ipv4/netfilter/ipt_ULOG.c
+++ b/net/ipv4/netfilter/ipt_ULOG.c
@@ -196,12 +196,15 @@ static void ipt_ulog_packet(unsigned int hooknum,
 
         pr_debug("qlen %d, qthreshold %Zu\n", ub->qlen, loginfo->qthreshold);
 
-        /* NLMSG_PUT contains a hidden goto nlmsg_failure !!! */
-        nlh = NLMSG_PUT(ub->skb, 0, ub->qlen, ULOG_NL_EVENT,
-                        sizeof(*pm)+copy_len);
+        nlh = nlmsg_put(ub->skb, 0, ub->qlen, ULOG_NL_EVENT,
+                        sizeof(*pm)+copy_len, 0);
+        if (!nlh) {
+                pr_debug("error during nlmsg_put\n");
+                goto out_unlock;
+        }
         ub->qlen++;
 
-        pm = NLMSG_DATA(nlh);
+        pm = nlmsg_data(nlh);
 
         /* We might not have a timestamp, get one */
         if (skb->tstamp.tv64 == 0)
@@ -261,13 +264,11 @@ static void ipt_ulog_packet(unsigned int hooknum,
                         nlh->nlmsg_type = NLMSG_DONE;
                 ulog_send(groupnum);
         }
-
+out_unlock:
         spin_unlock_bh(&ulog_lock);
 
         return;
 
-nlmsg_failure:
-        pr_debug("error during NLMSG_PUT\n");
 alloc_failure:
         pr_debug("Error building netlink message\n");
         spin_unlock_bh(&ulog_lock);
@@ -380,6 +381,9 @@ static struct nf_logger ipt_ulog_logger __read_mostly = {
 static int __init ulog_tg_init(void)
 {
         int ret, i;
+        struct netlink_kernel_cfg cfg = {
+                .groups = ULOG_MAXNLGROUPS,
+        };
 
         pr_debug("init module\n");
 
@@ -392,9 +396,8 @@ static int __init ulog_tg_init(void)
         for (i = 0; i < ULOG_MAXNLGROUPS; i++)
                 setup_timer(&ulog_buffers[i].timer, ulog_timer, i);
 
-        nflognl = netlink_kernel_create(&init_net,
-                                        NETLINK_NFLOG, ULOG_MAXNLGROUPS, NULL,
-                                        NULL, THIS_MODULE);
+        nflognl = netlink_kernel_create(&init_net, NETLINK_NFLOG,
+                                        THIS_MODULE, &cfg);
         if (!nflognl)
                 return -ENOMEM;
 
diff --git a/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c b/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c
index 91747d4ebc2..e7ff2dcab6c 100644
--- a/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c
+++ b/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c
@@ -95,11 +95,11 @@ static int ipv4_get_l4proto(const struct sk_buff *skb, unsigned int nhoff,
         return NF_ACCEPT;
 }
 
-static unsigned int ipv4_confirm(unsigned int hooknum,
-                                 struct sk_buff *skb,
-                                 const struct net_device *in,
-                                 const struct net_device *out,
-                                 int (*okfn)(struct sk_buff *))
+static unsigned int ipv4_helper(unsigned int hooknum,
+                                struct sk_buff *skb,
+                                const struct net_device *in,
+                                const struct net_device *out,
+                                int (*okfn)(struct sk_buff *))
 {
         struct nf_conn *ct;
         enum ip_conntrack_info ctinfo;
@@ -110,24 +110,38 @@ static unsigned int ipv4_confirm(unsigned int hooknum,
         /* This is where we call the helper: as the packet goes out. */
         ct = nf_ct_get(skb, &ctinfo);
         if (!ct || ctinfo == IP_CT_RELATED_REPLY)
-                goto out;
+                return NF_ACCEPT;
 
         help = nfct_help(ct);
         if (!help)
-                goto out;
+                return NF_ACCEPT;
 
         /* rcu_read_lock()ed by nf_hook_slow */
         helper = rcu_dereference(help->helper);
         if (!helper)
-                goto out;
+                return NF_ACCEPT;
 
         ret = helper->help(skb, skb_network_offset(skb) + ip_hdrlen(skb),
                            ct, ctinfo);
-        if (ret != NF_ACCEPT) {
+        if (ret != NF_ACCEPT && (ret & NF_VERDICT_MASK) != NF_QUEUE) {
                 nf_log_packet(NFPROTO_IPV4, hooknum, skb, in, out, NULL,
                               "nf_ct_%s: dropping packet", helper->name);
-                return ret;
         }
+        return ret;
+}
+
+static unsigned int ipv4_confirm(unsigned int hooknum,
+                                 struct sk_buff *skb,
+                                 const struct net_device *in,
+                                 const struct net_device *out,
+                                 int (*okfn)(struct sk_buff *))
+{
+        struct nf_conn *ct;
+        enum ip_conntrack_info ctinfo;
+
+        ct = nf_ct_get(skb, &ctinfo);
+        if (!ct || ctinfo == IP_CT_RELATED_REPLY)
+                goto out;
 
         /* adjust seqs for loopback traffic only in outgoing direction */
         if (test_bit(IPS_SEQ_ADJUST_BIT, &ct->status) &&
@@ -185,6 +199,13 @@ static struct nf_hook_ops ipv4_conntrack_ops[] __read_mostly = {
                 .priority       = NF_IP_PRI_CONNTRACK,
         },
         {
+                .hook           = ipv4_helper,
+                .owner          = THIS_MODULE,
+                .pf             = NFPROTO_IPV4,
+                .hooknum        = NF_INET_POST_ROUTING,
+                .priority       = NF_IP_PRI_CONNTRACK_HELPER,
+        },
+        {
                 .hook           = ipv4_confirm,
                 .owner          = THIS_MODULE,
                 .pf             = NFPROTO_IPV4,
@@ -192,6 +213,13 @@ static struct nf_hook_ops ipv4_conntrack_ops[] __read_mostly = {
                 .priority       = NF_IP_PRI_CONNTRACK_CONFIRM,
         },
         {
+                .hook           = ipv4_helper,
+                .owner          = THIS_MODULE,
+                .pf             = NFPROTO_IPV4,
+                .hooknum        = NF_INET_LOCAL_IN,
+                .priority       = NF_IP_PRI_CONNTRACK_HELPER,
+        },
+        {
                 .hook           = ipv4_confirm,
                 .owner          = THIS_MODULE,
                 .pf             = NFPROTO_IPV4,
@@ -207,35 +235,30 @@ static int log_invalid_proto_max = 255;
 static ctl_table ip_ct_sysctl_table[] = {
         {
                 .procname       = "ip_conntrack_max",
-                .data           = &nf_conntrack_max,
                 .maxlen         = sizeof(int),
                 .mode           = 0644,
                 .proc_handler   = proc_dointvec,
         },
         {
                 .procname       = "ip_conntrack_count",
-                .data           = &init_net.ct.count,
                 .maxlen         = sizeof(int),
                 .mode           = 0444,
                 .proc_handler   = proc_dointvec,
         },
         {
                 .procname       = "ip_conntrack_buckets",
-                .data           = &init_net.ct.htable_size,
                 .maxlen         = sizeof(unsigned int),
                 .mode           = 0444,
                 .proc_handler   = proc_dointvec,
         },
         {
                 .procname       = "ip_conntrack_checksum",
-                .data           = &init_net.ct.sysctl_checksum,
                 .maxlen         = sizeof(int),
                 .mode           = 0644,
                 .proc_handler   = proc_dointvec,
         },
         {
                 .procname       = "ip_conntrack_log_invalid",
-                .data           = &init_net.ct.sysctl_log_invalid,
                 .maxlen         = sizeof(unsigned int),
                 .mode           = 0644,
                 .proc_handler   = proc_dointvec_minmax,
@@ -351,6 +374,25 @@ static struct nf_sockopt_ops so_getorigdst = {
         .owner          = THIS_MODULE,
 };
 
+static int ipv4_init_net(struct net *net)
+{
+#if defined(CONFIG_SYSCTL) && defined(CONFIG_NF_CONNTRACK_PROC_COMPAT)
+        struct nf_ip_net *in = &net->ct.nf_ct_proto;
+        in->ctl_table = kmemdup(ip_ct_sysctl_table,
+                                sizeof(ip_ct_sysctl_table),
+                                GFP_KERNEL);
+        if (!in->ctl_table)
+                return -ENOMEM;
+
+        in->ctl_table[0].data = &nf_conntrack_max;
+        in->ctl_table[1].data = &net->ct.count;
+        in->ctl_table[2].data = &net->ct.htable_size;
+        in->ctl_table[3].data = &net->ct.sysctl_checksum;
+        in->ctl_table[4].data = &net->ct.sysctl_log_invalid;
+#endif
+        return 0;
+}
+
 struct nf_conntrack_l3proto nf_conntrack_l3proto_ipv4 __read_mostly = {
         .l3proto         = PF_INET,
         .name            = "ipv4",
@@ -366,8 +408,8 @@ struct nf_conntrack_l3proto nf_conntrack_l3proto_ipv4 __read_mostly = {
 #endif
 #if defined(CONFIG_SYSCTL) && defined(CONFIG_NF_CONNTRACK_PROC_COMPAT)
         .ctl_table_path  = "net/ipv4/netfilter",
-        .ctl_table       = ip_ct_sysctl_table,
 #endif
+        .init_net        = ipv4_init_net,
         .me              = THIS_MODULE,
 };
 
@@ -378,6 +420,65 @@ MODULE_ALIAS("nf_conntrack-" __stringify(AF_INET));
 MODULE_ALIAS("ip_conntrack");
 MODULE_LICENSE("GPL");
 
+static int ipv4_net_init(struct net *net)
+{
+        int ret = 0;
+
+        ret = nf_conntrack_l4proto_register(net,
+                                            &nf_conntrack_l4proto_tcp4);
+        if (ret < 0) {
+                pr_err("nf_conntrack_l4proto_tcp4 :protocol register failed\n");
+                goto out_tcp;
+        }
+        ret = nf_conntrack_l4proto_register(net,
+                                            &nf_conntrack_l4proto_udp4);
+        if (ret < 0) {
+                pr_err("nf_conntrack_l4proto_udp4 :protocol register failed\n");
+                goto out_udp;
+        }
+        ret = nf_conntrack_l4proto_register(net,
+                                            &nf_conntrack_l4proto_icmp);
+        if (ret < 0) {
+                pr_err("nf_conntrack_l4proto_icmp4 :protocol register failed\n");
+                goto out_icmp;
+        }
+        ret = nf_conntrack_l3proto_register(net,
+                                            &nf_conntrack_l3proto_ipv4);
+        if (ret < 0) {
+                pr_err("nf_conntrack_l3proto_ipv4 :protocol register failed\n");
+                goto out_ipv4;
+        }
+        return 0;
+out_ipv4:
+        nf_conntrack_l4proto_unregister(net,
+                                        &nf_conntrack_l4proto_icmp);
+out_icmp:
+        nf_conntrack_l4proto_unregister(net,
+                                        &nf_conntrack_l4proto_udp4);
+out_udp:
+        nf_conntrack_l4proto_unregister(net,
+                                        &nf_conntrack_l4proto_tcp4);
+out_tcp:
+        return ret;
+}
+
+static void ipv4_net_exit(struct net *net)
+{
+        nf_conntrack_l3proto_unregister(net,
+                                        &nf_conntrack_l3proto_ipv4);
+        nf_conntrack_l4proto_unregister(net,
+                                        &nf_conntrack_l4proto_icmp);
+        nf_conntrack_l4proto_unregister(net,
+                                        &nf_conntrack_l4proto_udp4);
+        nf_conntrack_l4proto_unregister(net,
+                                        &nf_conntrack_l4proto_tcp4);
+}
+
+static struct pernet_operations ipv4_net_ops = {
+        .init = ipv4_net_init,
+        .exit = ipv4_net_exit,
+};
+
 static int __init nf_conntrack_l3proto_ipv4_init(void)
 {
         int ret = 0;
@@ -391,35 +492,17 @@ static int __init nf_conntrack_l3proto_ipv4_init(void)
                 return ret;
         }
 
-        ret = nf_conntrack_l4proto_register(&nf_conntrack_l4proto_tcp4);
+        ret = register_pernet_subsys(&ipv4_net_ops);
         if (ret < 0) {
-                pr_err("nf_conntrack_ipv4: can't register tcp.\n");
+                pr_err("nf_conntrack_ipv4: can't register pernet ops\n");
                 goto cleanup_sockopt;
         }
 
-        ret = nf_conntrack_l4proto_register(&nf_conntrack_l4proto_udp4);
-        if (ret < 0) {
-                pr_err("nf_conntrack_ipv4: can't register udp.\n");
-                goto cleanup_tcp;
-        }
-
-        ret = nf_conntrack_l4proto_register(&nf_conntrack_l4proto_icmp);
-        if (ret < 0) {
-                pr_err("nf_conntrack_ipv4: can't register icmp.\n");
-                goto cleanup_udp;
-        }
-
-        ret = nf_conntrack_l3proto_register(&nf_conntrack_l3proto_ipv4);
-        if (ret < 0) {
-                pr_err("nf_conntrack_ipv4: can't register ipv4\n");
-                goto cleanup_icmp;
-        }
-
         ret = nf_register_hooks(ipv4_conntrack_ops,
                                 ARRAY_SIZE(ipv4_conntrack_ops));
         if (ret < 0) {
                 pr_err("nf_conntrack_ipv4: can't register hooks.\n");
-                goto cleanup_ipv4;
+                goto cleanup_pernet;
         }
 #if defined(CONFIG_PROC_FS) && defined(CONFIG_NF_CONNTRACK_PROC_COMPAT)
         ret = nf_conntrack_ipv4_compat_init();
@@ -431,14 +514,8 @@ static int __init nf_conntrack_l3proto_ipv4_init(void)
  cleanup_hooks:
         nf_unregister_hooks(ipv4_conntrack_ops, ARRAY_SIZE(ipv4_conntrack_ops));
 #endif
- cleanup_ipv4:
-        nf_conntrack_l3proto_unregister(&nf_conntrack_l3proto_ipv4);
- cleanup_icmp:
-        nf_conntrack_l4proto_unregister(&nf_conntrack_l4proto_icmp);
- cleanup_udp:
-        nf_conntrack_l4proto_unregister(&nf_conntrack_l4proto_udp4);
- cleanup_tcp:
-        nf_conntrack_l4proto_unregister(&nf_conntrack_l4proto_tcp4);
+ cleanup_pernet:
+        unregister_pernet_subsys(&ipv4_net_ops);
  cleanup_sockopt:
         nf_unregister_sockopt(&so_getorigdst);
         return ret;
@@ -451,10 +528,7 @@ static void __exit nf_conntrack_l3proto_ipv4_fini(void)
         nf_conntrack_ipv4_compat_fini();
 #endif
         nf_unregister_hooks(ipv4_conntrack_ops, ARRAY_SIZE(ipv4_conntrack_ops));
-        nf_conntrack_l3proto_unregister(&nf_conntrack_l3proto_ipv4);
-        nf_conntrack_l4proto_unregister(&nf_conntrack_l4proto_icmp);
-        nf_conntrack_l4proto_unregister(&nf_conntrack_l4proto_udp4);
-        nf_conntrack_l4proto_unregister(&nf_conntrack_l4proto_tcp4);
+        unregister_pernet_subsys(&ipv4_net_ops);
         nf_unregister_sockopt(&so_getorigdst);
 }
 
diff --git a/net/ipv4/netfilter/nf_conntrack_proto_icmp.c b/net/ipv4/netfilter/nf_conntrack_proto_icmp.c
index 0847e373d33..5241d997ab7 100644
--- a/net/ipv4/netfilter/nf_conntrack_proto_icmp.c
+++ b/net/ipv4/netfilter/nf_conntrack_proto_icmp.c
@@ -23,6 +23,11 @@
 
 static unsigned int nf_ct_icmp_timeout __read_mostly = 30*HZ;
 
+static inline struct nf_icmp_net *icmp_pernet(struct net *net)
+{
+        return &net->ct.nf_ct_proto.icmp;
+}
+
 static bool icmp_pkt_to_tuple(const struct sk_buff *skb, unsigned int dataoff,
                               struct nf_conntrack_tuple *tuple)
 {
@@ -77,7 +82,7 @@ static int icmp_print_tuple(struct seq_file *s,
 
 static unsigned int *icmp_get_timeouts(struct net *net)
 {
-        return &nf_ct_icmp_timeout;
+        return &icmp_pernet(net)->timeout;
 }
 
 /* Returns verdict for packet, or -1 for invalid. */
@@ -274,16 +279,18 @@ static int icmp_nlattr_tuple_size(void)
 #include <linux/netfilter/nfnetlink.h>
 #include <linux/netfilter/nfnetlink_cttimeout.h>
 
-static int icmp_timeout_nlattr_to_obj(struct nlattr *tb[], void *data)
+static int icmp_timeout_nlattr_to_obj(struct nlattr *tb[],
+                                      struct net *net, void *data)
 {
         unsigned int *timeout = data;
+        struct nf_icmp_net *in = icmp_pernet(net);
 
         if (tb[CTA_TIMEOUT_ICMP_TIMEOUT]) {
                 *timeout =
                         ntohl(nla_get_be32(tb[CTA_TIMEOUT_ICMP_TIMEOUT])) * HZ;
         } else {
                 /* Set default ICMP timeout. */
-                *timeout = nf_ct_icmp_timeout;
+                *timeout = in->timeout;
         }
         return 0;
 }
@@ -308,11 +315,9 @@ icmp_timeout_nla_policy[CTA_TIMEOUT_ICMP_MAX+1] = {
 #endif /* CONFIG_NF_CT_NETLINK_TIMEOUT */
 
 #ifdef CONFIG_SYSCTL
-static struct ctl_table_header *icmp_sysctl_header;
 static struct ctl_table icmp_sysctl_table[] = {
         {
                 .procname       = "nf_conntrack_icmp_timeout",
-                .data           = &nf_ct_icmp_timeout,
                 .maxlen         = sizeof(unsigned int),
                 .mode           = 0644,
                 .proc_handler   = proc_dointvec_jiffies,
@@ -323,7 +328,6 @@ static struct ctl_table icmp_sysctl_table[] = {
 static struct ctl_table icmp_compat_sysctl_table[] = {
         {
                 .procname       = "ip_conntrack_icmp_timeout",
-                .data           = &nf_ct_icmp_timeout,
                 .maxlen         = sizeof(unsigned int),
                 .mode           = 0644,
                 .proc_handler   = proc_dointvec_jiffies,
@@ -333,6 +337,62 @@ static struct ctl_table icmp_compat_sysctl_table[] = {
 #endif /* CONFIG_NF_CONNTRACK_PROC_COMPAT */
 #endif /* CONFIG_SYSCTL */
 
+static int icmp_kmemdup_sysctl_table(struct nf_proto_net *pn,
+                                     struct nf_icmp_net *in)
+{
+#ifdef CONFIG_SYSCTL
+        pn->ctl_table = kmemdup(icmp_sysctl_table,
+                                sizeof(icmp_sysctl_table),
+                                GFP_KERNEL);
+        if (!pn->ctl_table)
+                return -ENOMEM;
+
+        pn->ctl_table[0].data = &in->timeout;
+#endif
+        return 0;
+}
+
+static int icmp_kmemdup_compat_sysctl_table(struct nf_proto_net *pn,
+                                            struct nf_icmp_net *in)
+{
+#ifdef CONFIG_SYSCTL
+#ifdef CONFIG_NF_CONNTRACK_PROC_COMPAT
+        pn->ctl_compat_table = kmemdup(icmp_compat_sysctl_table,
+                                       sizeof(icmp_compat_sysctl_table),
+                                       GFP_KERNEL);
+        if (!pn->ctl_compat_table)
+                return -ENOMEM;
+
+        pn->ctl_compat_table[0].data = &in->timeout;
+#endif
+#endif
+        return 0;
+}
+
+static int icmp_init_net(struct net *net, u_int16_t proto)
+{
+        int ret;
+        struct nf_icmp_net *in = icmp_pernet(net);
+        struct nf_proto_net *pn = &in->pn;
+
+        in->timeout = nf_ct_icmp_timeout;
+
+        ret = icmp_kmemdup_compat_sysctl_table(pn, in);
+        if (ret < 0)
+                return ret;
+
+        ret = icmp_kmemdup_sysctl_table(pn, in);
+        if (ret < 0)
+                nf_ct_kfree_compat_sysctl_table(pn);
+
+        return ret;
+}
+
+static struct nf_proto_net *icmp_get_net_proto(struct net *net)
+{
+        return &net->ct.nf_ct_proto.icmp.pn;
+}
+
 struct nf_conntrack_l4proto nf_conntrack_l4proto_icmp __read_mostly =
 {
         .l3proto                = PF_INET,
@@ -362,11 +422,6 @@ struct nf_conntrack_l4proto nf_conntrack_l4proto_icmp __read_mostly =
                 .nla_policy     = icmp_timeout_nla_policy,
         },
 #endif /* CONFIG_NF_CT_NETLINK_TIMEOUT */
-#ifdef CONFIG_SYSCTL
-        .ctl_table_header       = &icmp_sysctl_header,
-        .ctl_table              = icmp_sysctl_table,
-#ifdef CONFIG_NF_CONNTRACK_PROC_COMPAT
-        .ctl_compat_table       = icmp_compat_sysctl_table,
-#endif
-#endif
+        .init_net               = icmp_init_net,
+        .get_net_proto          = icmp_get_net_proto,
 };
diff --git a/net/ipv4/netfilter/nf_defrag_ipv4.c b/net/ipv4/netfilter/nf_defrag_ipv4.c
index 9bb1b8a37a2..742815518b0 100644
--- a/net/ipv4/netfilter/nf_defrag_ipv4.c
+++ b/net/ipv4/netfilter/nf_defrag_ipv4.c
@@ -94,14 +94,14 @@ static struct nf_hook_ops ipv4_defrag_ops[] = {
         {
                 .hook           = ipv4_conntrack_defrag,
                 .owner          = THIS_MODULE,
-                .pf             = PF_INET,
+                .pf             = NFPROTO_IPV4,
                 .hooknum        = NF_INET_PRE_ROUTING,
                 .priority       = NF_IP_PRI_CONNTRACK_DEFRAG,
         },
         {
                 .hook           = ipv4_conntrack_defrag,
                 .owner          = THIS_MODULE,
-                .pf             = PF_INET,
+                .pf             = NFPROTO_IPV4,
                 .hooknum        = NF_INET_LOCAL_OUT,
                 .priority       = NF_IP_PRI_CONNTRACK_DEFRAG,
         },
diff --git a/net/ipv4/netfilter/nf_nat_amanda.c b/net/ipv4/netfilter/nf_nat_amanda.c
index 7b22382ff0e..3c04d24e297 100644
--- a/net/ipv4/netfilter/nf_nat_amanda.c
+++ b/net/ipv4/netfilter/nf_nat_amanda.c
@@ -13,10 +13,10 @@
 #include <linux/skbuff.h>
 #include <linux/udp.h>
 
-#include <net/netfilter/nf_nat_helper.h>
-#include <net/netfilter/nf_nat_rule.h>
 #include <net/netfilter/nf_conntrack_helper.h>
 #include <net/netfilter/nf_conntrack_expect.h>
+#include <net/netfilter/nf_nat_helper.h>
+#include <net/netfilter/nf_nat_rule.h>
 #include <linux/netfilter/nf_conntrack_amanda.h>
 
 MODULE_AUTHOR("Brian J. Murrell <netfilter@interlinx.bc.ca>");
diff --git a/net/ipv4/netfilter/nf_nat_core.c b/net/ipv4/netfilter/nf_nat_core.c
index abb52adf5ac..44b082fd48a 100644
--- a/net/ipv4/netfilter/nf_nat_core.c
+++ b/net/ipv4/netfilter/nf_nat_core.c
@@ -691,6 +691,10 @@ static struct nf_ct_helper_expectfn follow_master_nat = {
         .expectfn       = nf_nat_follow_master,
 };
 
+static struct nfq_ct_nat_hook nfq_ct_nat = {
+        .seq_adjust     = nf_nat_tcp_seq_adjust,
+};
+
 static int __init nf_nat_init(void)
 {
         size_t i;
@@ -731,6 +735,7 @@ static int __init nf_nat_init(void)
                            nfnetlink_parse_nat_setup);
         BUG_ON(nf_ct_nat_offset != NULL);
         RCU_INIT_POINTER(nf_ct_nat_offset, nf_nat_get_offset);
+        RCU_INIT_POINTER(nfq_ct_nat_hook, &nfq_ct_nat);
         return 0;
 
  cleanup_extend:
@@ -747,6 +752,7 @@ static void __exit nf_nat_cleanup(void)
         RCU_INIT_POINTER(nf_nat_seq_adjust_hook, NULL);
         RCU_INIT_POINTER(nfnetlink_parse_nat_setup_hook, NULL);
         RCU_INIT_POINTER(nf_ct_nat_offset, NULL);
+        RCU_INIT_POINTER(nfq_ct_nat_hook, NULL);
         synchronize_net();
 }
 
diff --git a/net/ipv4/netfilter/nf_nat_h323.c b/net/ipv4/netfilter/nf_nat_h323.c
index cad29c12131..c6784a18c1c 100644
--- a/net/ipv4/netfilter/nf_nat_h323.c
+++ b/net/ipv4/netfilter/nf_nat_h323.c
@@ -95,7 +95,7 @@ static int set_sig_addr(struct sk_buff *skb, struct nf_conn *ct,
                         unsigned char **data,
                         TransportAddress *taddr, int count)
 {
-        const struct nf_ct_h323_master *info = &nfct_help(ct)->help.ct_h323_info;
+        const struct nf_ct_h323_master *info = nfct_help_data(ct);
         int dir = CTINFO2DIR(ctinfo);
         int i;
         __be16 port;
@@ -178,7 +178,7 @@ static int nat_rtp_rtcp(struct sk_buff *skb, struct nf_conn *ct,
                         struct nf_conntrack_expect *rtp_exp,
                         struct nf_conntrack_expect *rtcp_exp)
 {
-        struct nf_ct_h323_master *info = &nfct_help(ct)->help.ct_h323_info;
+        struct nf_ct_h323_master *info = nfct_help_data(ct);
         int dir = CTINFO2DIR(ctinfo);
         int i;
         u_int16_t nated_port;
@@ -330,7 +330,7 @@ static int nat_h245(struct sk_buff *skb, struct nf_conn *ct,
                     TransportAddress *taddr, __be16 port,
                     struct nf_conntrack_expect *exp)
 {
-        struct nf_ct_h323_master *info = &nfct_help(ct)->help.ct_h323_info;
+        struct nf_ct_h323_master *info = nfct_help_data(ct);
         int dir = CTINFO2DIR(ctinfo);
         u_int16_t nated_port = ntohs(port);
 
@@ -419,7 +419,7 @@ static int nat_q931(struct sk_buff *skb, struct nf_conn *ct,
                     unsigned char **data, TransportAddress *taddr, int idx,
                     __be16 port, struct nf_conntrack_expect *exp)
 {
-        struct nf_ct_h323_master *info = &nfct_help(ct)->help.ct_h323_info;
+        struct nf_ct_h323_master *info = nfct_help_data(ct);
         int dir = CTINFO2DIR(ctinfo);
         u_int16_t nated_port = ntohs(port);
         union nf_inet_addr addr;
diff --git a/net/ipv4/netfilter/nf_nat_helper.c b/net/ipv4/netfilter/nf_nat_helper.c
index af65958f630..2e59ad0b90c 100644
--- a/net/ipv4/netfilter/nf_nat_helper.c
+++ b/net/ipv4/netfilter/nf_nat_helper.c
@@ -153,6 +153,19 @@ void nf_nat_set_seq_adjust(struct nf_conn *ct, enum ip_conntrack_info ctinfo,
 }
 EXPORT_SYMBOL_GPL(nf_nat_set_seq_adjust);
 
+void nf_nat_tcp_seq_adjust(struct sk_buff *skb, struct nf_conn *ct,
+                           u32 ctinfo, int off)
+{
+        const struct tcphdr *th;
+
+        if (nf_ct_protonum(ct) != IPPROTO_TCP)
+                return;
+
+        th = (struct tcphdr *)(skb_network_header(skb)+ ip_hdrlen(skb));
+        nf_nat_set_seq_adjust(ct, ctinfo, th->seq, off);
+}
+EXPORT_SYMBOL_GPL(nf_nat_tcp_seq_adjust);
+
 static void nf_nat_csum(struct sk_buff *skb, const struct iphdr *iph, void *data,
                         int datalen, __sum16 *check, int oldlen)
 {
diff --git a/net/ipv4/netfilter/nf_nat_pptp.c b/net/ipv4/netfilter/nf_nat_pptp.c
index c273d58980a..388140881eb 100644
--- a/net/ipv4/netfilter/nf_nat_pptp.c
+++ b/net/ipv4/netfilter/nf_nat_pptp.c
@@ -49,7 +49,7 @@ static void pptp_nat_expected(struct nf_conn *ct,
         const struct nf_nat_pptp *nat_pptp_info;
         struct nf_nat_ipv4_range range;
 
-        ct_pptp_info = &nfct_help(master)->help.ct_pptp_info;
+        ct_pptp_info = nfct_help_data(master);
         nat_pptp_info = &nfct_nat(master)->help.nat_pptp_info;
 
         /* And here goes the grand finale of corrosion... */
@@ -123,7 +123,7 @@ pptp_outbound_pkt(struct sk_buff *skb,
         __be16 new_callid;
         unsigned int cid_off;
 
-        ct_pptp_info  = &nfct_help(ct)->help.ct_pptp_info;
+        ct_pptp_info = nfct_help_data(ct);
         nat_pptp_info = &nfct_nat(ct)->help.nat_pptp_info;
 
         new_callid = ct_pptp_info->pns_call_id;
@@ -192,7 +192,7 @@ pptp_exp_gre(struct nf_conntrack_expect *expect_orig,
         struct nf_ct_pptp_master *ct_pptp_info;
         struct nf_nat_pptp *nat_pptp_info;
 
-        ct_pptp_info  = &nfct_help(ct)->help.ct_pptp_info;
+        ct_pptp_info = nfct_help_data(ct);
         nat_pptp_info = &nfct_nat(ct)->help.nat_pptp_info;
 
         /* save original PAC call ID in nat_info */
diff --git a/net/ipv4/netfilter/nf_nat_snmp_basic.c b/net/ipv4/netfilter/nf_nat_snmp_basic.c
index 746edec8b86..bac712293fd 100644
--- a/net/ipv4/netfilter/nf_nat_snmp_basic.c
+++ b/net/ipv4/netfilter/nf_nat_snmp_basic.c
@@ -405,7 +405,7 @@ static unsigned char asn1_octets_decode(struct asn1_ctx *ctx,
 
         ptr = *octets;
         while (ctx->pointer < eoc) {
-                if (!asn1_octet_decode(ctx, (unsigned char *)ptr++)) {
+                if (!asn1_octet_decode(ctx, ptr++)) {
                         kfree(*octets);
                         *octets = NULL;
                         return 0;
@@ -759,7 +759,7 @@ static unsigned char snmp_object_decode(struct asn1_ctx *ctx,
                 }
                 break;
         case SNMP_OBJECTID:
-                if (!asn1_oid_decode(ctx, end, (unsigned long **)&lp, &len)) {
+                if (!asn1_oid_decode(ctx, end, &lp, &len)) {
                         kfree(id);
                         return 0;
                 }
diff --git a/net/ipv4/netfilter/nf_nat_tftp.c b/net/ipv4/netfilter/nf_nat_tftp.c
index a2901bf829c..9dbb8d284f9 100644
--- a/net/ipv4/netfilter/nf_nat_tftp.c
+++ b/net/ipv4/netfilter/nf_nat_tftp.c
@@ -8,10 +8,10 @@
 #include <linux/module.h>
 #include <linux/udp.h>
 
-#include <net/netfilter/nf_nat_helper.h>
-#include <net/netfilter/nf_nat_rule.h>
 #include <net/netfilter/nf_conntrack_helper.h>
 #include <net/netfilter/nf_conntrack_expect.h>
+#include <net/netfilter/nf_nat_helper.h>
+#include <net/netfilter/nf_nat_rule.h>
 #include <linux/netfilter/nf_conntrack_tftp.h>
 
 MODULE_AUTHOR("Magnus Boden <mb@ozaba.mine.nu>");
diff --git a/net/ipv4/ping.c b/net/ipv4/ping.c
index 2c00e8bf684..340fcf29a96 100644
--- a/net/ipv4/ping.c
+++ b/net/ipv4/ping.c
@@ -371,6 +371,7 @@ void ping_err(struct sk_buff *skb, u32 info)
                 break;
         case ICMP_DEST_UNREACH:
                 if (code == ICMP_FRAG_NEEDED) { /* Path MTU discovery */
+                        ipv4_sk_update_pmtu(skb, sk, info);
                         if (inet_sock->pmtudisc != IP_PMTUDISC_DONT) {
                                 err = EMSGSIZE;
                                 harderr = 1;
diff --git a/net/ipv4/protocol.c b/net/ipv4/protocol.c
index 9ae5c01cd0b..8918eff1426 100644
--- a/net/ipv4/protocol.c
+++ b/net/ipv4/protocol.c
@@ -36,9 +36,7 @@ const struct net_protocol __rcu *inet_protos[MAX_INET_PROTOS] __read_mostly;
 
 int inet_add_protocol(const struct net_protocol *prot, unsigned char protocol)
 {
-        int hash = protocol & (MAX_INET_PROTOS - 1);
-
-        return !cmpxchg((const struct net_protocol **)&inet_protos[hash],
+        return !cmpxchg((const struct net_protocol **)&inet_protos[protocol],
                         NULL, prot) ? 0 : -1;
 }
 EXPORT_SYMBOL(inet_add_protocol);
@@ -49,9 +47,9 @@ EXPORT_SYMBOL(inet_add_protocol);
 
 int inet_del_protocol(const struct net_protocol *prot, unsigned char protocol)
 {
-        int ret, hash = protocol & (MAX_INET_PROTOS - 1);
+        int ret;
 
-        ret = (cmpxchg((const struct net_protocol **)&inet_protos[hash],
+        ret = (cmpxchg((const struct net_protocol **)&inet_protos[protocol],
                        prot, NULL) == prot) ? 0 : -1;
 
         synchronize_net();
diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c
index 4032b818f3e..659ddfb1094 100644
--- a/net/ipv4/raw.c
+++ b/net/ipv4/raw.c
@@ -216,6 +216,9 @@ static void raw_err(struct sock *sk, struct sk_buff *skb, u32 info)
         int err = 0;
         int harderr = 0;
 
+        if (type == ICMP_DEST_UNREACH && code == ICMP_FRAG_NEEDED)
+                ipv4_sk_update_pmtu(skb, sk, info);
+
         /* Report error on raw socket, if:
            1. User requested ip_recverr.
            2. Socket is connected (otherwise the error indication
diff --git a/net/ipv4/route.c b/net/ipv4/route.c
index 98b30d08efe..95bfa1ba5b2 100644
--- a/net/ipv4/route.c
+++ b/net/ipv4/route.c
@@ -158,40 +158,13 @@ static void ipv4_dst_ifdown(struct dst_entry *dst, struct net_device *dev,
 
 static u32 *ipv4_cow_metrics(struct dst_entry *dst, unsigned long old)
 {
-        struct rtable *rt = (struct rtable *) dst;
-        struct inet_peer *peer;
-        u32 *p = NULL;
-
-        if (!rt->peer)
-                rt_bind_peer(rt, rt->rt_dst, 1);
-
-        peer = rt->peer;
-        if (peer) {
-                u32 *old_p = __DST_METRICS_PTR(old);
-                unsigned long prev, new;
-
-                p = peer->metrics;
-                if (inet_metrics_new(peer))
-                        memcpy(p, old_p, sizeof(u32) * RTAX_MAX);
-
-                new = (unsigned long) p;
-                prev = cmpxchg(&dst->_metrics, old, new);
-
-                if (prev != old) {
-                        p = __DST_METRICS_PTR(prev);
-                        if (prev & DST_METRICS_READ_ONLY)
-                                p = NULL;
-                } else {
-                        if (rt->fi) {
-                                fib_info_put(rt->fi);
-                                rt->fi = NULL;
-                        }
-                }
-        }
-        return p;
+        WARN_ON(1);
+        return NULL;
 }
 
-static struct neighbour *ipv4_neigh_lookup(const struct dst_entry *dst, const void *daddr);
+static struct neighbour *ipv4_neigh_lookup(const struct dst_entry *dst,
+                                           struct sk_buff *skb,
+                                           const void *daddr);
 
 static struct dst_ops ipv4_dst_ops = {
         .family =               AF_INET,
@@ -421,29 +394,19 @@ static int rt_cache_seq_show(struct seq_file *seq, void *v)
                            "HHUptod\tSpecDst");
         else {
                 struct rtable *r = v;
-                struct neighbour *n;
-                int len, HHUptod;
-
-                rcu_read_lock();
-                n = dst_get_neighbour_noref(&r->dst);
-                HHUptod = (n && (n->nud_state & NUD_CONNECTED)) ? 1 : 0;
-                rcu_read_unlock();
+                int len;
 
                 seq_printf(seq, "%s\t%08X\t%08X\t%8X\t%d\t%u\t%d\t"
-                              "%08X\t%d\t%u\t%u\t%02X\t%d\t%1d\t%08X%n",
-                        r->dst.dev ? r->dst.dev->name : "*",
-                        (__force u32)r->rt_dst,
-                        (__force u32)r->rt_gateway,
-                        r->rt_flags, atomic_read(&r->dst.__refcnt),
-                        r->dst.__use, 0, (__force u32)r->rt_src,
-                        dst_metric_advmss(&r->dst) + 40,
-                        dst_metric(&r->dst, RTAX_WINDOW),
-                        (int)((dst_metric(&r->dst, RTAX_RTT) >> 3) +
-                              dst_metric(&r->dst, RTAX_RTTVAR)),
-                        r->rt_key_tos,
-                        -1,
-                        HHUptod,
-                        r->rt_spec_dst, &len);
+                           "%08X\t%d\t%u\t%u\t%02X\t%d\t%1d\t%08X%n",
+                           r->dst.dev ? r->dst.dev->name : "*",
+                           (__force u32)r->rt_dst,
+                           (__force u32)r->rt_gateway,
+                           r->rt_flags, atomic_read(&r->dst.__refcnt),
+                           r->dst.__use, 0, (__force u32)r->rt_src,
+                           dst_metric_advmss(&r->dst) + 40,
+                           dst_metric(&r->dst, RTAX_WINDOW), 0,
+                           r->rt_key_tos,
+                           -1, 0, 0, &len);
 
                 seq_printf(seq, "%*s\n", 127 - len, "");
         }
@@ -680,7 +643,7 @@ static inline int rt_fast_clean(struct rtable *rth)
 static inline int rt_valuable(struct rtable *rth)
 {
         return (rth->rt_flags & (RTCF_REDIRECTED | RTCF_NOTIFY)) ||
-                (rth->peer && rth->peer->pmtu_expires);
+                rth->dst.expires;
 }
 
 static int rt_may_expire(struct rtable *rth, unsigned long tmo1, unsigned long tmo2)
@@ -873,34 +836,22 @@ static void rt_check_expire(void)
                 while ((rth = rcu_dereference_protected(*rthp,
                                         lockdep_is_held(rt_hash_lock_addr(i)))) != NULL) {
                         prefetch(rth->dst.rt_next);
-                        if (rt_is_expired(rth)) {
+                        if (rt_is_expired(rth) ||
+                            rt_may_expire(rth, tmo, ip_rt_gc_timeout)) {
                                 *rthp = rth->dst.rt_next;
                                 rt_free(rth);
                                 continue;
                         }
-                        if (rth->dst.expires) {
-                                /* Entry is expired even if it is in use */
-                                if (time_before_eq(jiffies, rth->dst.expires)) {
-nofree:
-                                        tmo >>= 1;
-                                        rthp = &rth->dst.rt_next;
-                                        /*
-                                         * We only count entries on
-                                         * a chain with equal hash inputs once
-                                         * so that entries for different QOS
-                                         * levels, and other non-hash input
-                                         * attributes don't unfairly skew
-                                         * the length computation
-                                         */
-                                        length += has_noalias(rt_hash_table[i].chain, rth);
-                                        continue;
-                                }
-                        } else if (!rt_may_expire(rth, tmo, ip_rt_gc_timeout))
-                                goto nofree;
 
-                        /* Cleanup aged off entries. */
-                        *rthp = rth->dst.rt_next;
-                        rt_free(rth);
+                        /* We only count entries on a chain with equal
+                         * hash inputs once so that entries for
+                         * different QOS levels, and other non-hash
+                         * input attributes don't unfairly skew the
+                         * length computation
+                         */
+                        tmo >>= 1;
+                        rthp = &rth->dst.rt_next;
+                        length += has_noalias(rt_hash_table[i].chain, rth);
                 }
                 spin_unlock_bh(rt_hash_lock_addr(i));
                 sum += length;
@@ -938,7 +889,6 @@ static void rt_cache_invalidate(struct net *net)
 
         get_random_bytes(&shuffle, sizeof(shuffle));
         atomic_add(shuffle + 1U, &net->ipv4.rt_genid);
-        inetpeer_invalidate_tree(AF_INET);
 }
 
 /*
@@ -1111,20 +1061,20 @@ static int slow_chain_length(const struct rtable *head)
         return length >> FRACT_BITS;
 }
 
-static struct neighbour *ipv4_neigh_lookup(const struct dst_entry *dst, const void *daddr)
+static struct neighbour *ipv4_neigh_lookup(const struct dst_entry *dst,
+                                           struct sk_buff *skb,
+                                           const void *daddr)
 {
-        static const __be32 inaddr_any = 0;
         struct net_device *dev = dst->dev;
         const __be32 *pkey = daddr;
         const struct rtable *rt;
         struct neighbour *n;
 
         rt = (const struct rtable *) dst;
-
-        if (dev->flags & (IFF_LOOPBACK | IFF_POINTOPOINT))
-                pkey = &inaddr_any;
-        else if (rt->rt_gateway)
+        if (rt->rt_gateway)
                 pkey = (const __be32 *) &rt->rt_gateway;
+        else if (skb)
+                pkey = &ip_hdr(skb)->daddr;
 
         n = __ipv4_neigh_lookup(dev, *(__force u32 *)pkey);
         if (n)
@@ -1132,16 +1082,6 @@ static struct neighbour *ipv4_neigh_lookup(const struct dst_entry *dst, const vo
         return neigh_create(&arp_tbl, pkey, dev);
 }
 
-static int rt_bind_neighbour(struct rtable *rt)
-{
-        struct neighbour *n = ipv4_neigh_lookup(&rt->dst, &rt->rt_gateway);
-        if (IS_ERR(n))
-                return PTR_ERR(n);
-        dst_set_neighbour(&rt->dst, n);
-
-        return 0;
-}
-
 static struct rtable *rt_intern_hash(unsigned int hash, struct rtable *rt,
                                      struct sk_buff *skb, int ifindex)
 {
@@ -1150,7 +1090,6 @@ static struct rtable *rt_intern_hash(unsigned int hash, struct rtable *rt,
         unsigned long   now;
         u32             min_score;
         int             chain_length;
-        int attempts = !in_softirq();
 
 restart:
         chain_length = 0;
@@ -1159,7 +1098,7 @@ restart:
         candp = NULL;
         now = jiffies;
 
-        if (!rt_caching(dev_net(rt->dst.dev))) {
+        if (!rt_caching(dev_net(rt->dst.dev)) || (rt->dst.flags & DST_NOCACHE)) {
                 /*
                  * If we're not caching, just tell the caller we
                  * were successful and don't touch the route.  The
@@ -1177,15 +1116,6 @@ restart:
                  */
 
                 rt->dst.flags |= DST_NOCACHE;
-                if (rt->rt_type == RTN_UNICAST || rt_is_output_route(rt)) {
-                        int err = rt_bind_neighbour(rt);
-                        if (err) {
-                                net_warn_ratelimited("Neighbour table failure & not caching routes\n");
-                                ip_rt_put(rt);
-                                return ERR_PTR(err);
-                        }
-                }
-
                 goto skip_hashing;
         }
 
@@ -1268,40 +1198,6 @@ restart:
                 }
         }
 
-        /* Try to bind route to arp only if it is output
-           route or unicast forwarding path.
-         */
-        if (rt->rt_type == RTN_UNICAST || rt_is_output_route(rt)) {
-                int err = rt_bind_neighbour(rt);
-                if (err) {
-                        spin_unlock_bh(rt_hash_lock_addr(hash));
-
-                        if (err != -ENOBUFS) {
-                                rt_drop(rt);
-                                return ERR_PTR(err);
-                        }
-
-                        /* Neighbour tables are full and nothing
-                           can be released. Try to shrink route cache,
-                           it is most likely it holds some neighbour records.
-                         */
-                        if (attempts-- > 0) {
-                                int saved_elasticity = ip_rt_gc_elasticity;
-                                int saved_int = ip_rt_gc_min_interval;
-                                ip_rt_gc_elasticity     = 1;
-                                ip_rt_gc_min_interval   = 0;
-                                rt_garbage_collect(&ipv4_dst_ops);
-                                ip_rt_gc_min_interval   = saved_int;
-                                ip_rt_gc_elasticity     = saved_elasticity;
-                                goto restart;
-                        }
-
-                        net_warn_ratelimited("Neighbour table overflow\n");
-                        rt_drop(rt);
-                        return ERR_PTR(-ENOBUFS);
-                }
-        }
-
         rt->dst.rt_next = rt_hash_table[hash].chain;
 
         /*
@@ -1319,25 +1215,6 @@ skip_hashing:
         return rt;
 }
 
-static atomic_t __rt_peer_genid = ATOMIC_INIT(0);
-
-static u32 rt_peer_genid(void)
-{
-        return atomic_read(&__rt_peer_genid);
-}
-
-void rt_bind_peer(struct rtable *rt, __be32 daddr, int create)
-{
-        struct inet_peer *peer;
-
-        peer = inet_getpeer_v4(daddr, create);
-
-        if (peer && cmpxchg(&rt->peer, NULL, peer) != NULL)
-                inet_putpeer(peer);
-        else
-                rt->rt_peer_genid = rt_peer_genid();
-}
-
 /*
  * Peer allocation may fail only in serious out-of-memory conditions.  However
  * we still can generate some output.
@@ -1360,21 +1237,15 @@ static void ip_select_fb_ident(struct iphdr *iph)
 
 void __ip_select_ident(struct iphdr *iph, struct dst_entry *dst, int more)
 {
-        struct rtable *rt = (struct rtable *) dst;
-
-        if (rt && !(rt->dst.flags & DST_NOPEER)) {
-                if (rt->peer == NULL)
-                        rt_bind_peer(rt, rt->rt_dst, 1);
+        struct net *net = dev_net(dst->dev);
+        struct inet_peer *peer;
 
-                /* If peer is attached to destination, it is never detached,
-                   so that we need not to grab a lock to dereference it.
-                 */
-                if (rt->peer) {
-                        iph->id = htons(inet_getid(rt->peer, more));
-                        return;
-                }
-        } else if (!rt)
-                pr_debug("rt_bind_peer(0) @%p\n", __builtin_return_address(0));
+        peer = inet_getpeer_v4(net->ipv4.peers, iph->daddr, 1);
+        if (peer) {
+                iph->id = htons(inet_getid(peer, more));
+                inet_putpeer(peer);
+                return;
+        }
 
         ip_select_fb_ident(iph);
 }
@@ -1400,32 +1271,6 @@ static void rt_del(unsigned int hash, struct rtable *rt)
         spin_unlock_bh(rt_hash_lock_addr(hash));
 }
 
-static void check_peer_redir(struct dst_entry *dst, struct inet_peer *peer)
-{
-        struct rtable *rt = (struct rtable *) dst;
-        __be32 orig_gw = rt->rt_gateway;
-        struct neighbour *n, *old_n;
-
-        dst_confirm(&rt->dst);
-
-        rt->rt_gateway = peer->redirect_learned.a4;
-
-        n = ipv4_neigh_lookup(&rt->dst, &rt->rt_gateway);
-        if (IS_ERR(n)) {
-                rt->rt_gateway = orig_gw;
-                return;
-        }
-        old_n = xchg(&rt->dst._neighbour, n);
-        if (old_n)
-                neigh_release(old_n);
-        if (!(n->nud_state & NUD_VALID)) {
-                neigh_event_send(n, NULL);
-        } else {
-                rt->rt_flags |= RTCF_REDIRECTED;
-                call_netevent_notifiers(NETEVENT_NEIGH_UPDATE, n);
-        }
-}
-
 /* called in rcu_read_lock() section */
 void ip_rt_redirect(__be32 old_gw, __be32 daddr, __be32 new_gw,
                     __be32 saddr, struct net_device *dev)
@@ -1434,7 +1279,6 @@ void ip_rt_redirect(__be32 old_gw, __be32 daddr, __be32 new_gw,
         struct in_device *in_dev = __in_dev_get_rcu(dev);
         __be32 skeys[2] = { saddr, 0 };
         int    ikeys[2] = { dev->ifindex, 0 };
-        struct inet_peer *peer;
         struct net *net;
 
         if (!in_dev)
@@ -1467,6 +1311,8 @@ void ip_rt_redirect(__be32 old_gw, __be32 daddr, __be32 new_gw,
                         rthp = &rt_hash_table[hash].chain;
 
                         while ((rt = rcu_dereference(*rthp)) != NULL) {
+                                struct neighbour *n;
+
                                 rthp = &rt->dst.rt_next;
 
                                 if (rt->rt_key_dst != daddr ||
@@ -1480,16 +1326,16 @@ void ip_rt_redirect(__be32 old_gw, __be32 daddr, __be32 new_gw,
                                     rt->rt_gateway != old_gw)
                                         continue;
 
-                                if (!rt->peer)
-                                        rt_bind_peer(rt, rt->rt_dst, 1);
-
-                                peer = rt->peer;
-                                if (peer) {
-                                        if (peer->redirect_learned.a4 != new_gw) {
-                                                peer->redirect_learned.a4 = new_gw;
-                                                atomic_inc(&__rt_peer_genid);
+                                n = ipv4_neigh_lookup(&rt->dst, NULL, &new_gw);
+                                if (n) {
+                                        if (!(n->nud_state & NUD_VALID)) {
+                                                neigh_event_send(n, NULL);
+                                        } else {
+                                                rt->rt_gateway = new_gw;
+                                                rt->rt_flags |= RTCF_REDIRECTED;
+                                                call_netevent_notifiers(NETEVENT_NEIGH_UPDATE, n);
                                         }
-                                        check_peer_redir(&rt->dst, peer);
+                                        neigh_release(n);
                                 }
                         }
                 }
@@ -1507,23 +1353,6 @@ reject_redirect:
         ;
 }
 
-static bool peer_pmtu_expired(struct inet_peer *peer)
-{
-        unsigned long orig = ACCESS_ONCE(peer->pmtu_expires);
-
-        return orig &&
-               time_after_eq(jiffies, orig) &&
-               cmpxchg(&peer->pmtu_expires, orig, 0) == orig;
-}
-
-static bool peer_pmtu_cleaned(struct inet_peer *peer)
-{
-        unsigned long orig = ACCESS_ONCE(peer->pmtu_expires);
-
-        return orig &&
-               cmpxchg(&peer->pmtu_expires, orig, 0) == orig;
-}
-
 static struct dst_entry *ipv4_negative_advice(struct dst_entry *dst)
 {
         struct rtable *rt = (struct rtable *)dst;
@@ -1533,14 +1362,13 @@ static struct dst_entry *ipv4_negative_advice(struct dst_entry *dst)
                 if (dst->obsolete > 0) {
                         ip_rt_put(rt);
                         ret = NULL;
-                } else if (rt->rt_flags & RTCF_REDIRECTED) {
+                } else if ((rt->rt_flags & RTCF_REDIRECTED) ||
+                           rt->dst.expires) {
                         unsigned int hash = rt_hash(rt->rt_key_dst, rt->rt_key_src,
                                                 rt->rt_oif,
                                                 rt_genid(dev_net(dst->dev)));
                         rt_del(hash, rt);
                         ret = NULL;
-                } else if (rt->peer && peer_pmtu_expired(rt->peer)) {
-                        dst_metric_set(dst, RTAX_MTU, rt->peer->pmtu_orig);
                 }
         }
         return ret;
@@ -1567,6 +1395,7 @@ void ip_rt_send_redirect(struct sk_buff *skb)
         struct rtable *rt = skb_rtable(skb);
         struct in_device *in_dev;
         struct inet_peer *peer;
+        struct net *net;
         int log_martians;
 
         rcu_read_lock();
@@ -1578,9 +1407,8 @@ void ip_rt_send_redirect(struct sk_buff *skb)
         log_martians = IN_DEV_LOG_MARTIANS(in_dev);
         rcu_read_unlock();
 
-        if (!rt->peer)
-                rt_bind_peer(rt, rt->rt_dst, 1);
-        peer = rt->peer;
+        net = dev_net(rt->dst.dev);
+        peer = inet_getpeer_v4(net->ipv4.peers, ip_hdr(skb)->saddr, 1);
         if (!peer) {
                 icmp_send(skb, ICMP_REDIRECT, ICMP_REDIR_HOST, rt->rt_gateway);
                 return;
@@ -1597,7 +1425,7 @@ void ip_rt_send_redirect(struct sk_buff *skb)
          */
         if (peer->rate_tokens >= ip_rt_redirect_number) {
                 peer->rate_last = jiffies;
-                return;
+                goto out_put_peer;
         }
 
         /* Check for load limit; set rate_last to the latest sent
@@ -1618,16 +1446,34 @@ void ip_rt_send_redirect(struct sk_buff *skb)
                                              &rt->rt_dst, &rt->rt_gateway);
 #endif
         }
+out_put_peer:
+        inet_putpeer(peer);
 }
 
 static int ip_error(struct sk_buff *skb)
 {
+        struct in_device *in_dev = __in_dev_get_rcu(skb->dev);
         struct rtable *rt = skb_rtable(skb);
         struct inet_peer *peer;
         unsigned long now;
+        struct net *net;
         bool send;
         int code;
 
+        net = dev_net(rt->dst.dev);
+        if (!IN_DEV_FORWARD(in_dev)) {
+                switch (rt->dst.error) {
+                case EHOSTUNREACH:
+                        IP_INC_STATS_BH(net, IPSTATS_MIB_INADDRERRORS);
+                        break;
+
+                case ENETUNREACH:
+                        IP_INC_STATS_BH(net, IPSTATS_MIB_INNOROUTES);
+                        break;
+                }
+                goto out;
+        }
+
         switch (rt->dst.error) {
         case EINVAL:
         default:
@@ -1637,17 +1483,14 @@ static int ip_error(struct sk_buff *skb)
                 break;
         case ENETUNREACH:
                 code = ICMP_NET_UNREACH;
-                IP_INC_STATS_BH(dev_net(rt->dst.dev),
-                                IPSTATS_MIB_INNOROUTES);
+                IP_INC_STATS_BH(net, IPSTATS_MIB_INNOROUTES);
                 break;
         case EACCES:
                 code = ICMP_PKT_FILTERED;
                 break;
         }
 
-        if (!rt->peer)
-                rt_bind_peer(rt, rt->rt_dst, 1);
-        peer = rt->peer;
+        peer = inet_getpeer_v4(net->ipv4.peers, ip_hdr(skb)->saddr, 1);
 
         send = true;
         if (peer) {
@@ -1660,6 +1503,7 @@ static int ip_error(struct sk_buff *skb)
                         peer->rate_tokens -= ip_rt_error_cost;
                 else
                         send = false;
+                inet_putpeer(peer);
         }
         if (send)
                 icmp_send(skb, ICMP_DEST_UNREACH, code, 0);
@@ -1668,136 +1512,47 @@ out:	kfree_skb(skb);
         return 0;
 }
 
-/*
- *      The last two values are not from the RFC but
- *      are needed for AMPRnet AX.25 paths.
- */
-
-static const unsigned short mtu_plateau[] =
-{32000, 17914, 8166, 4352, 2002, 1492, 576, 296, 216, 128 };
-
-static inline unsigned short guess_mtu(unsigned short old_mtu)
-{
-        int i;
-
-        for (i = 0; i < ARRAY_SIZE(mtu_plateau); i++)
-                if (old_mtu > mtu_plateau[i])
-                        return mtu_plateau[i];
-        return 68;
-}
-
-unsigned short ip_rt_frag_needed(struct net *net, const struct iphdr *iph,
-                                 unsigned short new_mtu,
-                                 struct net_device *dev)
-{
-        unsigned short old_mtu = ntohs(iph->tot_len);
-        unsigned short est_mtu = 0;
-        struct inet_peer *peer;
-
-        peer = inet_getpeer_v4(iph->daddr, 1);
-        if (peer) {
-                unsigned short mtu = new_mtu;
-
-                if (new_mtu < 68 || new_mtu >= old_mtu) {
-                        /* BSD 4.2 derived systems incorrectly adjust
-                         * tot_len by the IP header length, and report
-                         * a zero MTU in the ICMP message.
-                         */
-                        if (mtu == 0 &&
-                            old_mtu >= 68 + (iph->ihl << 2))
-                                old_mtu -= iph->ihl << 2;
-                        mtu = guess_mtu(old_mtu);
-                }
-
-                if (mtu < ip_rt_min_pmtu)
-                        mtu = ip_rt_min_pmtu;
-                if (!peer->pmtu_expires || mtu < peer->pmtu_learned) {
-                        unsigned long pmtu_expires;
-
-                        pmtu_expires = jiffies + ip_rt_mtu_expires;
-                        if (!pmtu_expires)
-                                pmtu_expires = 1UL;
-
-                        est_mtu = mtu;
-                        peer->pmtu_learned = mtu;
-                        peer->pmtu_expires = pmtu_expires;
-                        atomic_inc(&__rt_peer_genid);
-                }
-
-                inet_putpeer(peer);
-        }
-        return est_mtu ? : new_mtu;
-}
-
-static void check_peer_pmtu(struct dst_entry *dst, struct inet_peer *peer)
-{
-        unsigned long expires = ACCESS_ONCE(peer->pmtu_expires);
-
-        if (!expires)
-                return;
-        if (time_before(jiffies, expires)) {
-                u32 orig_dst_mtu = dst_mtu(dst);
-                if (peer->pmtu_learned < orig_dst_mtu) {
-                        if (!peer->pmtu_orig)
-                                peer->pmtu_orig = dst_metric_raw(dst, RTAX_MTU);
-                        dst_metric_set(dst, RTAX_MTU, peer->pmtu_learned);
-                }
-        } else if (cmpxchg(&peer->pmtu_expires, expires, 0) == expires)
-                dst_metric_set(dst, RTAX_MTU, peer->pmtu_orig);
-}
-
 static void ip_rt_update_pmtu(struct dst_entry *dst, u32 mtu)
 {
         struct rtable *rt = (struct rtable *) dst;
-        struct inet_peer *peer;
 
         dst_confirm(dst);
 
-        if (!rt->peer)
-                rt_bind_peer(rt, rt->rt_dst, 1);
-        peer = rt->peer;
-        if (peer) {
-                unsigned long pmtu_expires = ACCESS_ONCE(peer->pmtu_expires);
-
-                if (mtu < ip_rt_min_pmtu)
-                        mtu = ip_rt_min_pmtu;
-                if (!pmtu_expires || mtu < peer->pmtu_learned) {
+        if (mtu < ip_rt_min_pmtu)
+                mtu = ip_rt_min_pmtu;
 
-                        pmtu_expires = jiffies + ip_rt_mtu_expires;
-                        if (!pmtu_expires)
-                                pmtu_expires = 1UL;
+        rt->rt_pmtu = mtu;
+        dst_set_expires(&rt->dst, ip_rt_mtu_expires);
+}
 
-                        peer->pmtu_learned = mtu;
-                        peer->pmtu_expires = pmtu_expires;
+void ipv4_update_pmtu(struct sk_buff *skb, struct net *net, u32 mtu,
+                      int oif, u32 mark, u8 protocol, int flow_flags)
+{
+        const struct iphdr *iph = (const struct iphdr *)skb->data;
+        struct flowi4 fl4;
+        struct rtable *rt;
 
-                        atomic_inc(&__rt_peer_genid);
-                        rt->rt_peer_genid = rt_peer_genid();
-                }
-                check_peer_pmtu(dst, peer);
+        flowi4_init_output(&fl4, oif, mark, RT_TOS(iph->tos), RT_SCOPE_UNIVERSE,
+                           protocol, flow_flags,
+                           iph->daddr, iph->saddr, 0, 0);
+        rt = __ip_route_output_key(net, &fl4);
+        if (!IS_ERR(rt)) {
+                ip_rt_update_pmtu(&rt->dst, mtu);
+                ip_rt_put(rt);
         }
 }
+EXPORT_SYMBOL_GPL(ipv4_update_pmtu);
 
-
-static void ipv4_validate_peer(struct rtable *rt)
+void ipv4_sk_update_pmtu(struct sk_buff *skb, struct sock *sk, u32 mtu)
 {
-        if (rt->rt_peer_genid != rt_peer_genid()) {
-                struct inet_peer *peer;
-
-                if (!rt->peer)
-                        rt_bind_peer(rt, rt->rt_dst, 0);
-
-                peer = rt->peer;
-                if (peer) {
-                        check_peer_pmtu(&rt->dst, peer);
+        const struct inet_sock *inet = inet_sk(sk);
 
-                        if (peer->redirect_learned.a4 &&
-                            peer->redirect_learned.a4 != rt->rt_gateway)
-                                check_peer_redir(&rt->dst, peer);
-                }
-
-                rt->rt_peer_genid = rt_peer_genid();
-        }
+        return ipv4_update_pmtu(skb, sock_net(sk), mtu,
+                                sk->sk_bound_dev_if, sk->sk_mark,
+                                inet->hdrincl ? IPPROTO_RAW : sk->sk_protocol,
+                                inet_sk_flowi_flags(sk));
 }
+EXPORT_SYMBOL_GPL(ipv4_sk_update_pmtu);
 
 static struct dst_entry *ipv4_dst_check(struct dst_entry *dst, u32 cookie)
 {
@@ -1805,23 +1560,17 @@ static struct dst_entry *ipv4_dst_check(struct dst_entry *dst, u32 cookie)
 
         if (rt_is_expired(rt))
                 return NULL;
-        ipv4_validate_peer(rt);
         return dst;
 }
 
 static void ipv4_dst_destroy(struct dst_entry *dst)
 {
         struct rtable *rt = (struct rtable *) dst;
-        struct inet_peer *peer = rt->peer;
 
         if (rt->fi) {
                 fib_info_put(rt->fi);
                 rt->fi = NULL;
         }
-        if (peer) {
-                rt->peer = NULL;
-                inet_putpeer(peer);
-        }
 }
 
 
@@ -1832,8 +1581,8 @@ static void ipv4_link_failure(struct sk_buff *skb)
         icmp_send(skb, ICMP_DEST_UNREACH, ICMP_HOST_UNREACH, 0);
 
         rt = skb_rtable(skb);
-        if (rt && rt->peer && peer_pmtu_cleaned(rt->peer))
-                dst_metric_set(&rt->dst, RTAX_MTU, rt->peer->pmtu_orig);
+        if (rt)
+                dst_set_expires(&rt->dst, 0);
 }
 
 static int ip_rt_bug(struct sk_buff *skb)
@@ -1913,7 +1662,13 @@ static unsigned int ipv4_default_advmss(const struct dst_entry *dst)
 static unsigned int ipv4_mtu(const struct dst_entry *dst)
 {
         const struct rtable *rt = (const struct rtable *) dst;
-        unsigned int mtu = dst_metric_raw(dst, RTAX_MTU);
+        unsigned int mtu = rt->rt_pmtu;
+
+        if (mtu && time_after_eq(jiffies, rt->dst.expires))
+                mtu = 0;
+
+        if (!mtu)
+                mtu = dst_metric_raw(dst, RTAX_MTU);
 
         if (mtu && rt_is_output_route(rt))
                 return mtu;
@@ -1935,60 +1690,27 @@ static unsigned int ipv4_mtu(const struct dst_entry *dst)
 static void rt_init_metrics(struct rtable *rt, const struct flowi4 *fl4,
                             struct fib_info *fi)
 {
-        struct inet_peer *peer;
-        int create = 0;
-
-        /* If a peer entry exists for this destination, we must hook
-         * it up in order to get at cached metrics.
-         */
-        if (fl4 && (fl4->flowi4_flags & FLOWI_FLAG_PRECOW_METRICS))
-                create = 1;
-
-        rt->peer = peer = inet_getpeer_v4(rt->rt_dst, create);
-        if (peer) {
-                rt->rt_peer_genid = rt_peer_genid();
-                if (inet_metrics_new(peer))
-                        memcpy(peer->metrics, fi->fib_metrics,
-                               sizeof(u32) * RTAX_MAX);
-                dst_init_metrics(&rt->dst, peer->metrics, false);
-
-                check_peer_pmtu(&rt->dst, peer);
-
-                if (peer->redirect_learned.a4 &&
-                    peer->redirect_learned.a4 != rt->rt_gateway) {
-                        rt->rt_gateway = peer->redirect_learned.a4;
-                        rt->rt_flags |= RTCF_REDIRECTED;
-                }
-        } else {
-                if (fi->fib_metrics != (u32 *) dst_default_metrics) {
-                        rt->fi = fi;
-                        atomic_inc(&fi->fib_clntref);
-                }
-                dst_init_metrics(&rt->dst, fi->fib_metrics, true);
+        if (fi->fib_metrics != (u32 *) dst_default_metrics) {
+                rt->fi = fi;
+                atomic_inc(&fi->fib_clntref);
         }
+        dst_init_metrics(&rt->dst, fi->fib_metrics, true);
 }
 
 static void rt_set_nexthop(struct rtable *rt, const struct flowi4 *fl4,
                            const struct fib_result *res,
                            struct fib_info *fi, u16 type, u32 itag)
 {
-        struct dst_entry *dst = &rt->dst;
-
         if (fi) {
                 if (FIB_RES_GW(*res) &&
                     FIB_RES_NH(*res).nh_scope == RT_SCOPE_LINK)
                         rt->rt_gateway = FIB_RES_GW(*res);
                 rt_init_metrics(rt, fl4, fi);
 #ifdef CONFIG_IP_ROUTE_CLASSID
-                dst->tclassid = FIB_RES_NH(*res).nh_tclassid;
+                rt->dst.tclassid = FIB_RES_NH(*res).nh_tclassid;
 #endif
         }
 
-        if (dst_mtu(dst) > IP_MAX_MTU)
-                dst_metric_set(dst, RTAX_MTU, IP_MAX_MTU);
-        if (dst_metric_raw(dst, RTAX_ADVMSS) > 65535 - 40)
-                dst_metric_set(dst, RTAX_ADVMSS, 65535 - 40);
-
 #ifdef CONFIG_IP_ROUTE_CLASSID
 #ifdef CONFIG_IP_MULTIPLE_TABLES
         set_class_tag(rt, fib_rules_tclass(res));
@@ -2012,7 +1734,6 @@ static int ip_route_input_mc(struct sk_buff *skb, __be32 daddr, __be32 saddr,
 {
         unsigned int hash;
         struct rtable *rth;
-        __be32 spec_dst;
         struct in_device *in_dev = __in_dev_get_rcu(dev);
         u32 itag = 0;
         int err;
@@ -2023,16 +1744,19 @@ static int ip_route_input_mc(struct sk_buff *skb, __be32 daddr, __be32 saddr,
                 return -EINVAL;
 
         if (ipv4_is_multicast(saddr) || ipv4_is_lbcast(saddr) ||
-            ipv4_is_loopback(saddr) || skb->protocol != htons(ETH_P_IP))
+            skb->protocol != htons(ETH_P_IP))
                 goto e_inval;
 
+        if (likely(!IN_DEV_ROUTE_LOCALNET(in_dev)))
+                if (ipv4_is_loopback(saddr))
+                        goto e_inval;
+
         if (ipv4_is_zeronet(saddr)) {
                 if (!ipv4_is_local_multicast(daddr))
                         goto e_inval;
-                spec_dst = inet_select_addr(dev, 0, RT_SCOPE_LINK);
         } else {
-                err = fib_validate_source(skb, saddr, 0, tos, 0, dev, &spec_dst,
-                                          &itag);
+                err = fib_validate_source(skb, saddr, 0, tos, 0, dev,
+                                          in_dev, &itag);
                 if (err < 0)
                         goto e_err;
         }
@@ -2058,10 +1782,8 @@ static int ip_route_input_mc(struct sk_buff *skb, __be32 daddr, __be32 saddr,
         rth->rt_iif     = dev->ifindex;
         rth->rt_oif     = 0;
         rth->rt_mark    = skb->mark;
+        rth->rt_pmtu    = 0;
         rth->rt_gateway = daddr;
-        rth->rt_spec_dst= spec_dst;
-        rth->rt_peer_genid = 0;
-        rth->peer = NULL;
         rth->fi = NULL;
         if (our) {
                 rth->dst.input= ip_local_deliver;
@@ -2123,7 +1845,6 @@ static int __mkroute_input(struct sk_buff *skb,
         int err;
         struct in_device *out_dev;
         unsigned int flags = 0;
-        __be32 spec_dst;
         u32 itag;
 
         /* get a working reference to the output device */
@@ -2135,7 +1856,7 @@ static int __mkroute_input(struct sk_buff *skb,
 
 
         err = fib_validate_source(skb, saddr, daddr, tos, FIB_RES_OIF(*res),
-                                  in_dev->dev, &spec_dst, &itag);
+                                  in_dev->dev, in_dev, &itag);
         if (err < 0) {
                 ip_handle_martian_source(in_dev->dev, in_dev, skb, daddr,
                                          saddr);
@@ -2186,10 +1907,8 @@ static int __mkroute_input(struct sk_buff *skb,
         rth->rt_iif     = in_dev->dev->ifindex;
         rth->rt_oif     = 0;
         rth->rt_mark    = skb->mark;
+        rth->rt_pmtu    = 0;
         rth->rt_gateway = daddr;
-        rth->rt_spec_dst= spec_dst;
-        rth->rt_peer_genid = 0;
-        rth->peer = NULL;
         rth->fi = NULL;
 
         rth->dst.input = ip_forward;
@@ -2253,7 +1972,6 @@ static int ip_route_input_slow(struct sk_buff *skb, __be32 daddr, __be32 saddr,
         u32             itag = 0;
         struct rtable   *rth;
         unsigned int    hash;
-        __be32          spec_dst;
         int             err = -EINVAL;
         struct net    *net = dev_net(dev);
 
@@ -2266,8 +1984,7 @@ static int ip_route_input_slow(struct sk_buff *skb, __be32 daddr, __be32 saddr,
            by fib_lookup.
          */
 
-        if (ipv4_is_multicast(saddr) || ipv4_is_lbcast(saddr) ||
-            ipv4_is_loopback(saddr))
+        if (ipv4_is_multicast(saddr) || ipv4_is_lbcast(saddr))
                 goto martian_source;
 
         if (ipv4_is_lbcast(daddr) || (saddr == 0 && daddr == 0))
@@ -2279,9 +1996,17 @@ static int ip_route_input_slow(struct sk_buff *skb, __be32 daddr, __be32 saddr,
         if (ipv4_is_zeronet(saddr))
                 goto martian_source;
 
-        if (ipv4_is_zeronet(daddr) || ipv4_is_loopback(daddr))
+        if (ipv4_is_zeronet(daddr))
                 goto martian_destination;
 
+        if (likely(!IN_DEV_ROUTE_LOCALNET(in_dev))) {
+                if (ipv4_is_loopback(daddr))
+                        goto martian_destination;
+
+                if (ipv4_is_loopback(saddr))
+                        goto martian_source;
+        }
+
         /*
          *      Now we are ready to route packet.
          */
@@ -2293,11 +2018,8 @@ static int ip_route_input_slow(struct sk_buff *skb, __be32 daddr, __be32 saddr,
         fl4.daddr = daddr;
         fl4.saddr = saddr;
         err = fib_lookup(net, &fl4, &res);
-        if (err != 0) {
-                if (!IN_DEV_FORWARD(in_dev))
-                        goto e_hostunreach;
+        if (err != 0)
                 goto no_route;
-        }
 
         RT_CACHE_STAT_INC(in_slow_tot);
 
@@ -2307,17 +2029,16 @@ static int ip_route_input_slow(struct sk_buff *skb, __be32 daddr, __be32 saddr,
         if (res.type == RTN_LOCAL) {
                 err = fib_validate_source(skb, saddr, daddr, tos,
                                           net->loopback_dev->ifindex,
-                                          dev, &spec_dst, &itag);
+                                          dev, in_dev, &itag);
                 if (err < 0)
                         goto martian_source_keep_err;
                 if (err)
                         flags |= RTCF_DIRECTSRC;
-                spec_dst = daddr;
                 goto local_input;
         }
 
         if (!IN_DEV_FORWARD(in_dev))
-                goto e_hostunreach;
+                goto no_route;
         if (res.type != RTN_UNICAST)
                 goto martian_destination;
 
@@ -2328,11 +2049,9 @@ brd_input:
         if (skb->protocol != htons(ETH_P_IP))
                 goto e_inval;
 
-        if (ipv4_is_zeronet(saddr))
-                spec_dst = inet_select_addr(dev, 0, RT_SCOPE_LINK);
-        else {
-                err = fib_validate_source(skb, saddr, 0, tos, 0, dev, &spec_dst,
-                                          &itag);
+        if (!ipv4_is_zeronet(saddr)) {
+                err = fib_validate_source(skb, saddr, 0, tos, 0, dev,
+                                          in_dev, &itag);
                 if (err < 0)
                         goto martian_source_keep_err;
                 if (err)
@@ -2362,17 +2081,12 @@ local_input:
         rth->rt_key_tos = tos;
         rth->rt_dst     = daddr;
         rth->rt_src     = saddr;
-#ifdef CONFIG_IP_ROUTE_CLASSID
-        rth->dst.tclassid = itag;
-#endif
         rth->rt_route_iif = dev->ifindex;
         rth->rt_iif     = dev->ifindex;
         rth->rt_oif     = 0;
         rth->rt_mark    = skb->mark;
+        rth->rt_pmtu    = 0;
         rth->rt_gateway = daddr;
-        rth->rt_spec_dst= spec_dst;
-        rth->rt_peer_genid = 0;
-        rth->peer = NULL;
         rth->fi = NULL;
         if (res.type == RTN_UNREACHABLE) {
                 rth->dst.input= ip_error;
@@ -2388,7 +2102,6 @@ local_input:
 
 no_route:
         RT_CACHE_STAT_INC(in_no_route);
-        spec_dst = inet_select_addr(dev, 0, RT_SCOPE_UNIVERSE);
         res.type = RTN_UNREACHABLE;
         if (err == -ESRCH)
                 err = -ENETUNREACH;
@@ -2405,10 +2118,6 @@ martian_destination:
                                      &daddr, &saddr, dev->name);
 #endif
 
-e_hostunreach:
-        err = -EHOSTUNREACH;
-        goto out;
-
 e_inval:
         err = -EINVAL;
         goto out;
@@ -2452,7 +2161,6 @@ int ip_route_input_common(struct sk_buff *skb, __be32 daddr, __be32 saddr,
                     rth->rt_mark == skb->mark &&
                     net_eq(dev_net(rth->dst.dev), net) &&
                     !rt_is_expired(rth)) {
-                        ipv4_validate_peer(rth);
                         if (noref) {
                                 dst_use_noref(&rth->dst, jiffies);
                                 skb_dst_set_noref(skb, &rth->dst);
@@ -2520,9 +2228,14 @@ static struct rtable *__mkroute_output(const struct fib_result *res,
         u16 type = res->type;
         struct rtable *rth;
 
-        if (ipv4_is_loopback(fl4->saddr) && !(dev_out->flags & IFF_LOOPBACK))
+        in_dev = __in_dev_get_rcu(dev_out);
+        if (!in_dev)
                 return ERR_PTR(-EINVAL);
 
+        if (likely(!IN_DEV_ROUTE_LOCALNET(in_dev)))
+                if (ipv4_is_loopback(fl4->saddr) && !(dev_out->flags & IFF_LOOPBACK))
+                        return ERR_PTR(-EINVAL);
+
         if (ipv4_is_lbcast(fl4->daddr))
                 type = RTN_BROADCAST;
         else if (ipv4_is_multicast(fl4->daddr))
@@ -2533,10 +2246,6 @@ static struct rtable *__mkroute_output(const struct fib_result *res,
         if (dev_out->flags & IFF_LOOPBACK)
                 flags |= RTCF_LOCAL;
 
-        in_dev = __in_dev_get_rcu(dev_out);
-        if (!in_dev)
-                return ERR_PTR(-EINVAL);
-
         if (type == RTN_BROADCAST) {
                 flags |= RTCF_BROADCAST | RTCF_LOCAL;
                 fi = NULL;
@@ -2573,20 +2282,15 @@ static struct rtable *__mkroute_output(const struct fib_result *res,
         rth->rt_iif     = orig_oif ? : dev_out->ifindex;
         rth->rt_oif     = orig_oif;
         rth->rt_mark    = fl4->flowi4_mark;
+        rth->rt_pmtu    = 0;
         rth->rt_gateway = fl4->daddr;
-        rth->rt_spec_dst= fl4->saddr;
-        rth->rt_peer_genid = 0;
-        rth->peer = NULL;
         rth->fi = NULL;
 
         RT_CACHE_STAT_INC(out_slow_tot);
 
-        if (flags & RTCF_LOCAL) {
+        if (flags & RTCF_LOCAL)
                 rth->dst.input = ip_local_deliver;
-                rth->rt_spec_dst = fl4->daddr;
-        }
         if (flags & (RTCF_BROADCAST | RTCF_MULTICAST)) {
-                rth->rt_spec_dst = fl4->saddr;
                 if (flags & RTCF_LOCAL &&
                     !(dev_out->flags & IFF_LOOPBACK)) {
                         rth->dst.output = ip_mc_output;
@@ -2605,6 +2309,9 @@ static struct rtable *__mkroute_output(const struct fib_result *res,
 
         rt_set_nexthop(rth, fl4, res, fi, type, 0);
 
+        if (fl4->flowi4_flags & FLOWI_FLAG_RT_NOCACHE)
+                rth->dst.flags |= DST_NOCACHE;
+
         return rth;
 }
 
@@ -2625,6 +2332,7 @@ static struct rtable *ip_route_output_slow(struct net *net, struct flowi4 *fl4)
         int orig_oif;
 
         res.fi          = NULL;
+        res.table       = NULL;
 #ifdef CONFIG_IP_MULTIPLE_TABLES
         res.r           = NULL;
 #endif
@@ -2730,6 +2438,7 @@ static struct rtable *ip_route_output_slow(struct net *net, struct flowi4 *fl4)
 
         if (fib_lookup(net, fl4, &res)) {
                 res.fi = NULL;
+                res.table = NULL;
                 if (fl4->flowi4_oif) {
                         /* Apparently, routing tables are wrong. Assume,
                            that the destination is on link.
@@ -2828,7 +2537,6 @@ struct rtable *__ip_route_output_key(struct net *net, struct flowi4 *flp4)
                             (IPTOS_RT_MASK | RTO_ONLINK)) &&
                     net_eq(dev_net(rth->dst.dev), net) &&
                     !rt_is_expired(rth)) {
-                        ipv4_validate_peer(rth);
                         dst_use(&rth->dst, jiffies);
                         RT_CACHE_STAT_INC(out_hit);
                         rcu_read_unlock_bh();
@@ -2892,7 +2600,6 @@ struct dst_entry *ipv4_blackhole_route(struct net *net, struct dst_entry *dst_or
                 new->__use = 1;
                 new->input = dst_discard;
                 new->output = dst_discard;
-                dst_copy_metrics(new, &ort->dst);
 
                 new->dev = ort->dst.dev;
                 if (new->dev)
@@ -2905,6 +2612,7 @@ struct dst_entry *ipv4_blackhole_route(struct net *net, struct dst_entry *dst_or
                 rt->rt_iif = ort->rt_iif;
                 rt->rt_oif = ort->rt_oif;
                 rt->rt_mark = ort->rt_mark;
+                rt->rt_pmtu = ort->rt_pmtu;
 
                 rt->rt_genid = rt_genid(net);
                 rt->rt_flags = ort->rt_flags;
@@ -2912,10 +2620,6 @@ struct dst_entry *ipv4_blackhole_route(struct net *net, struct dst_entry *dst_or
                 rt->rt_dst = ort->rt_dst;
                 rt->rt_src = ort->rt_src;
                 rt->rt_gateway = ort->rt_gateway;
-                rt->rt_spec_dst = ort->rt_spec_dst;
-                rt->peer = ort->peer;
-                if (rt->peer)
-                        atomic_inc(&rt->peer->refcnt);
                 rt->fi = ort->fi;
                 if (rt->fi)
                         atomic_inc(&rt->fi->fib_clntref);
@@ -2953,8 +2657,7 @@ static int rt_fill_info(struct net *net,
         struct rtmsg *r;
         struct nlmsghdr *nlh;
         unsigned long expires = 0;
-        const struct inet_peer *peer = rt->peer;
-        u32 id = 0, ts = 0, tsage = 0, error;
+        u32 error;
 
         nlh = nlmsg_put(skb, pid, seq, event, sizeof(*r), flags);
         if (nlh == NULL)
@@ -2990,10 +2693,8 @@ static int rt_fill_info(struct net *net,
             nla_put_u32(skb, RTA_FLOW, rt->dst.tclassid))
                 goto nla_put_failure;
 #endif
-        if (rt_is_input_route(rt)) {
-                if (nla_put_be32(skb, RTA_PREFSRC, rt->rt_spec_dst))
-                        goto nla_put_failure;
-        } else if (rt->rt_src != rt->rt_key_src) {
+        if (!rt_is_input_route(rt) &&
+            rt->rt_src != rt->rt_key_src) {
                 if (nla_put_be32(skb, RTA_PREFSRC, rt->rt_src))
                         goto nla_put_failure;
         }
@@ -3009,20 +2710,12 @@ static int rt_fill_info(struct net *net,
                 goto nla_put_failure;
 
         error = rt->dst.error;
-        if (peer) {
-                inet_peer_refcheck(rt->peer);
-                id = atomic_read(&peer->ip_id_count) & 0xffff;
-                if (peer->tcp_ts_stamp) {
-                        ts = peer->tcp_ts;
-                        tsage = get_seconds() - peer->tcp_ts_stamp;
-                }
-                expires = ACCESS_ONCE(peer->pmtu_expires);
-                if (expires) {
-                        if (time_before(jiffies, expires))
-                                expires -= jiffies;
-                        else
-                                expires = 0;
-                }
+        expires = rt->dst.expires;
+        if (expires) {
+                if (time_before(jiffies, expires))
+                        expires -= jiffies;
+                else
+                        expires = 0;
         }
 
         if (rt_is_input_route(rt)) {
@@ -3051,8 +2744,7 @@ static int rt_fill_info(struct net *net,
                                 goto nla_put_failure;
         }
 
-        if (rtnl_put_cacheinfo(skb, &rt->dst, id, ts, tsage,
-                               expires, error) < 0)
+        if (rtnl_put_cacheinfo(skb, &rt->dst, 0, expires, error) < 0)
                 goto nla_put_failure;
 
         return nlmsg_end(skb, nlh);
@@ -3400,6 +3092,30 @@ static __net_initdata struct pernet_operations rt_genid_ops = {
         .init = rt_genid_init,
 };
 
+static int __net_init ipv4_inetpeer_init(struct net *net)
+{
+        struct inet_peer_base *bp = kmalloc(sizeof(*bp), GFP_KERNEL);
+
+        if (!bp)
+                return -ENOMEM;
+        inet_peer_base_init(bp);
+        net->ipv4.peers = bp;
+        return 0;
+}
+
+static void __net_exit ipv4_inetpeer_exit(struct net *net)
+{
+        struct inet_peer_base *bp = net->ipv4.peers;
+
+        net->ipv4.peers = NULL;
+        inetpeer_invalidate_tree(bp);
+        kfree(bp);
+}
+
+static __net_initdata struct pernet_operations ipv4_inetpeer_ops = {
+        .init   =       ipv4_inetpeer_init,
+        .exit   =       ipv4_inetpeer_exit,
+};
 
 #ifdef CONFIG_IP_ROUTE_CLASSID
 struct ip_rt_acct __percpu *ip_rt_acct __read_mostly;
@@ -3480,6 +3196,7 @@ int __init ip_rt_init(void)
         register_pernet_subsys(&sysctl_route_ops);
 #endif
         register_pernet_subsys(&rt_genid_ops);
+        register_pernet_subsys(&ipv4_inetpeer_ops);
         return rc;
 }
 
diff --git a/net/ipv4/sysctl_net_ipv4.c b/net/ipv4/sysctl_net_ipv4.c
index ef32956ed65..12aa0c5867c 100644
--- a/net/ipv4/sysctl_net_ipv4.c
+++ b/net/ipv4/sysctl_net_ipv4.c
@@ -301,6 +301,13 @@ static struct ctl_table ipv4_table[] = {
                 .proc_handler   = proc_dointvec
         },
         {
+                .procname       = "ip_early_demux",
+                .data           = &sysctl_ip_early_demux,
+                .maxlen         = sizeof(int),
+                .mode           = 0644,
+                .proc_handler   = proc_dointvec
+        },
+        {
                 .procname       = "ip_dynaddr",
                 .data           = &sysctl_ip_dynaddr,
                 .maxlen         = sizeof(int),
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
index 3ba605f60e4..d902da96d15 100644
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@ -3310,8 +3310,7 @@ EXPORT_SYMBOL(tcp_md5_hash_key);
 
 #endif
 
-/**
- * Each Responder maintains up to two secret values concurrently for
+/* Each Responder maintains up to two secret values concurrently for
  * efficient secret rollover.  Each secret value has 4 states:
  *
  * Generating.  (tcp_secret_generating != tcp_secret_primary)
@@ -3563,6 +3562,8 @@ void __init tcp_init(void)
         pr_info("Hash tables configured (established %u bind %u)\n",
                 tcp_hashinfo.ehash_mask + 1, tcp_hashinfo.bhash_size);
 
+        tcp_metrics_init();
+
         tcp_register_congestion_control(&tcp_reno);
 
         memset(&tcp_secret_one.secrets[0], 0, sizeof(tcp_secret_one.secrets));
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
index b224eb8bce8..055ac49b8b4 100644
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
@@ -93,7 +93,6 @@ int sysctl_tcp_rfc1337 __read_mostly;
 int sysctl_tcp_max_orphans __read_mostly = NR_FILE;
 int sysctl_tcp_frto __read_mostly = 2;
 int sysctl_tcp_frto_response __read_mostly;
-int sysctl_tcp_nometrics_save __read_mostly;
 
 int sysctl_tcp_thin_dupack __read_mostly;
 
@@ -701,7 +700,7 @@ static void tcp_rtt_estimator(struct sock *sk, const __u32 mrtt)
 /* Calculate rto without backoff.  This is the second half of Van Jacobson's
  * routine referred to above.
  */
-static inline void tcp_set_rto(struct sock *sk)
+void tcp_set_rto(struct sock *sk)
 {
         const struct tcp_sock *tp = tcp_sk(sk);
         /* Old crap is replaced with new one. 8)
@@ -728,109 +727,6 @@ static inline void tcp_set_rto(struct sock *sk)
         tcp_bound_rto(sk);
 }
 
-/* Save metrics learned by this TCP session.
-   This function is called only, when TCP finishes successfully
-   i.e. when it enters TIME-WAIT or goes from LAST-ACK to CLOSE.
- */
-void tcp_update_metrics(struct sock *sk)
-{
-        struct tcp_sock *tp = tcp_sk(sk);
-        struct dst_entry *dst = __sk_dst_get(sk);
-
-        if (sysctl_tcp_nometrics_save)
-                return;
-
-        dst_confirm(dst);
-
-        if (dst && (dst->flags & DST_HOST)) {
-                const struct inet_connection_sock *icsk = inet_csk(sk);
-                int m;
-                unsigned long rtt;
-
-                if (icsk->icsk_backoff || !tp->srtt) {
-                        /* This session failed to estimate rtt. Why?
-                         * Probably, no packets returned in time.
-                         * Reset our results.
-                         */
-                        if (!(dst_metric_locked(dst, RTAX_RTT)))
-                                dst_metric_set(dst, RTAX_RTT, 0);
-                        return;
-                }
-
-                rtt = dst_metric_rtt(dst, RTAX_RTT);
-                m = rtt - tp->srtt;
-
-                /* If newly calculated rtt larger than stored one,
-                 * store new one. Otherwise, use EWMA. Remember,
-                 * rtt overestimation is always better than underestimation.
-                 */
-                if (!(dst_metric_locked(dst, RTAX_RTT))) {
-                        if (m <= 0)
-                                set_dst_metric_rtt(dst, RTAX_RTT, tp->srtt);
-                        else
-                                set_dst_metric_rtt(dst, RTAX_RTT, rtt - (m >> 3));
-                }
-
-                if (!(dst_metric_locked(dst, RTAX_RTTVAR))) {
-                        unsigned long var;
-                        if (m < 0)
-                                m = -m;
-
-                        /* Scale deviation to rttvar fixed point */
-                        m >>= 1;
-                        if (m < tp->mdev)
-                                m = tp->mdev;
-
-                        var = dst_metric_rtt(dst, RTAX_RTTVAR);
-                        if (m >= var)
-                                var = m;
-                        else
-                                var -= (var - m) >> 2;
-
-                        set_dst_metric_rtt(dst, RTAX_RTTVAR, var);
-                }
-
-                if (tcp_in_initial_slowstart(tp)) {
-                        /* Slow start still did not finish. */
-                        if (dst_metric(dst, RTAX_SSTHRESH) &&
-                            !dst_metric_locked(dst, RTAX_SSTHRESH) &&
-                            (tp->snd_cwnd >> 1) > dst_metric(dst, RTAX_SSTHRESH))
-                                dst_metric_set(dst, RTAX_SSTHRESH, tp->snd_cwnd >> 1);
-                        if (!dst_metric_locked(dst, RTAX_CWND) &&
-                            tp->snd_cwnd > dst_metric(dst, RTAX_CWND))
-                                dst_metric_set(dst, RTAX_CWND, tp->snd_cwnd);
-                } else if (tp->snd_cwnd > tp->snd_ssthresh &&
-                           icsk->icsk_ca_state == TCP_CA_Open) {
-                        /* Cong. avoidance phase, cwnd is reliable. */
-                        if (!dst_metric_locked(dst, RTAX_SSTHRESH))
-                                dst_metric_set(dst, RTAX_SSTHRESH,
-                                               max(tp->snd_cwnd >> 1, tp->snd_ssthresh));
-                        if (!dst_metric_locked(dst, RTAX_CWND))
-                                dst_metric_set(dst, RTAX_CWND,
-                                               (dst_metric(dst, RTAX_CWND) +
-                                                tp->snd_cwnd) >> 1);
-                } else {
-                        /* Else slow start did not finish, cwnd is non-sense,
-                           ssthresh may be also invalid.
-                         */
-                        if (!dst_metric_locked(dst, RTAX_CWND))
-                                dst_metric_set(dst, RTAX_CWND,
-                                               (dst_metric(dst, RTAX_CWND) +
-                                                tp->snd_ssthresh) >> 1);
-                        if (dst_metric(dst, RTAX_SSTHRESH) &&
-                            !dst_metric_locked(dst, RTAX_SSTHRESH) &&
-                            tp->snd_ssthresh > dst_metric(dst, RTAX_SSTHRESH))
-                                dst_metric_set(dst, RTAX_SSTHRESH, tp->snd_ssthresh);
-                }
-
-                if (!dst_metric_locked(dst, RTAX_REORDERING)) {
-                        if (dst_metric(dst, RTAX_REORDERING) < tp->reordering &&
-                            tp->reordering != sysctl_tcp_reordering)
-                                dst_metric_set(dst, RTAX_REORDERING, tp->reordering);
-                }
-        }
-}
-
 __u32 tcp_init_cwnd(const struct tcp_sock *tp, const struct dst_entry *dst)
 {
         __u32 cwnd = (dst ? dst_metric(dst, RTAX_INITCWND) : 0);
@@ -867,7 +763,7 @@ void tcp_enter_cwr(struct sock *sk, const int set_ssthresh)
  * Packet counting of FACK is based on in-order assumptions, therefore TCP
  * disables it when reordering is detected
  */
-static void tcp_disable_fack(struct tcp_sock *tp)
+void tcp_disable_fack(struct tcp_sock *tp)
 {
         /* RFC3517 uses different metric in lost marker => reset on change */
         if (tcp_is_fack(tp))
@@ -881,86 +777,6 @@ static void tcp_dsack_seen(struct tcp_sock *tp)
         tp->rx_opt.sack_ok |= TCP_DSACK_SEEN;
 }
 
-/* Initialize metrics on socket. */
-
-static void tcp_init_metrics(struct sock *sk)
-{
-        struct tcp_sock *tp = tcp_sk(sk);
-        struct dst_entry *dst = __sk_dst_get(sk);
-
-        if (dst == NULL)
-                goto reset;
-
-        dst_confirm(dst);
-
-        if (dst_metric_locked(dst, RTAX_CWND))
-                tp->snd_cwnd_clamp = dst_metric(dst, RTAX_CWND);
-        if (dst_metric(dst, RTAX_SSTHRESH)) {
-                tp->snd_ssthresh = dst_metric(dst, RTAX_SSTHRESH);
-                if (tp->snd_ssthresh > tp->snd_cwnd_clamp)
-                        tp->snd_ssthresh = tp->snd_cwnd_clamp;
-        } else {
-                /* ssthresh may have been reduced unnecessarily during.
-                 * 3WHS. Restore it back to its initial default.
-                 */
-                tp->snd_ssthresh = TCP_INFINITE_SSTHRESH;
-        }
-        if (dst_metric(dst, RTAX_REORDERING) &&
-            tp->reordering != dst_metric(dst, RTAX_REORDERING)) {
-                tcp_disable_fack(tp);
-                tcp_disable_early_retrans(tp);
-                tp->reordering = dst_metric(dst, RTAX_REORDERING);
-        }
-
-        if (dst_metric(dst, RTAX_RTT) == 0 || tp->srtt == 0)
-                goto reset;
-
-        /* Initial rtt is determined from SYN,SYN-ACK.
-         * The segment is small and rtt may appear much
-         * less than real one. Use per-dst memory
-         * to make it more realistic.
-         *
-         * A bit of theory. RTT is time passed after "normal" sized packet
-         * is sent until it is ACKed. In normal circumstances sending small
-         * packets force peer to delay ACKs and calculation is correct too.
-         * The algorithm is adaptive and, provided we follow specs, it
-         * NEVER underestimate RTT. BUT! If peer tries to make some clever
-         * tricks sort of "quick acks" for time long enough to decrease RTT
-         * to low value, and then abruptly stops to do it and starts to delay
-         * ACKs, wait for troubles.
-         */
-        if (dst_metric_rtt(dst, RTAX_RTT) > tp->srtt) {
-                tp->srtt = dst_metric_rtt(dst, RTAX_RTT);
-                tp->rtt_seq = tp->snd_nxt;
-        }
-        if (dst_metric_rtt(dst, RTAX_RTTVAR) > tp->mdev) {
-                tp->mdev = dst_metric_rtt(dst, RTAX_RTTVAR);
-                tp->mdev_max = tp->rttvar = max(tp->mdev, tcp_rto_min(sk));
-        }
-        tcp_set_rto(sk);
-reset:
-        if (tp->srtt == 0) {
-                /* RFC6298: 5.7 We've failed to get a valid RTT sample from
-                 * 3WHS. This is most likely due to retransmission,
-                 * including spurious one. Reset the RTO back to 3secs
-                 * from the more aggressive 1sec to avoid more spurious
-                 * retransmission.
-                 */
-                tp->mdev = tp->mdev_max = tp->rttvar = TCP_TIMEOUT_FALLBACK;
-                inet_csk(sk)->icsk_rto = TCP_TIMEOUT_FALLBACK;
-        }
-        /* Cut cwnd down to 1 per RFC5681 if SYN or SYN-ACK has been
-         * retransmitted. In light of RFC6298 more aggressive 1sec
-         * initRTO, we only reset cwnd when more than 1 SYN/SYN-ACK
-         * retransmission has occurred.
-         */
-        if (tp->total_retrans > 1)
-                tp->snd_cwnd = 1;
-        else
-                tp->snd_cwnd = tcp_init_cwnd(tp, dst);
-        tp->snd_cwnd_stamp = tcp_time_stamp;
-}
-
 static void tcp_update_reordering(struct sock *sk, const int metric,
                                   const int ts)
 {
@@ -3869,9 +3685,11 @@ static int tcp_ack(struct sock *sk, const struct sk_buff *skb, int flag)
                         tcp_cong_avoid(sk, ack, prior_in_flight);
         }
 
-        if ((flag & FLAG_FORWARD_PROGRESS) || !(flag & FLAG_NOT_DUP))
-                dst_confirm(__sk_dst_get(sk));
-
+        if ((flag & FLAG_FORWARD_PROGRESS) || !(flag & FLAG_NOT_DUP)) {
+                struct dst_entry *dst = __sk_dst_get(sk);
+                if (dst)
+                        dst_confirm(dst);
+        }
         return 1;
 
 no_queue:
@@ -5518,6 +5336,18 @@ int tcp_rcv_established(struct sock *sk, struct sk_buff *skb,
         struct tcp_sock *tp = tcp_sk(sk);
         int res;
 
+        if (sk->sk_rx_dst) {
+                struct dst_entry *dst = sk->sk_rx_dst;
+                if (unlikely(dst->obsolete)) {
+                        if (dst->ops->check(dst, 0) == NULL) {
+                                dst_release(dst);
+                                sk->sk_rx_dst = NULL;
+                        }
+                }
+        }
+        if (unlikely(sk->sk_rx_dst == NULL))
+                sk->sk_rx_dst = dst_clone(skb_dst(skb));
+
         /*
          *      Header prediction.
          *      The code loosely follows the one in the famous
@@ -5729,8 +5559,10 @@ void tcp_finish_connect(struct sock *sk, struct sk_buff *skb)
 
         tcp_set_state(sk, TCP_ESTABLISHED);
 
-        if (skb != NULL)
+        if (skb != NULL) {
+                sk->sk_rx_dst = dst_clone(skb_dst(skb));
                 security_inet_conn_established(sk, skb);
+        }
 
         /* Make sure socket is routed, for correct metrics.  */
         icsk->icsk_af_ops->rebuild_header(sk);
@@ -6126,9 +5958,14 @@ int tcp_rcv_state_process(struct sock *sk, struct sk_buff *skb,
 
                 case TCP_FIN_WAIT1:
                         if (tp->snd_una == tp->write_seq) {
+                                struct dst_entry *dst;
+
                                 tcp_set_state(sk, TCP_FIN_WAIT2);
                                 sk->sk_shutdown |= SEND_SHUTDOWN;
-                                dst_confirm(__sk_dst_get(sk));
+
+                                dst = __sk_dst_get(sk);
+                                if (dst)
+                                        dst_confirm(dst);
 
                                 if (!sock_flag(sk, SOCK_DEAD))
                                         /* Wake up lingering close() */
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
index c8d28c433b2..ddefd39ac0c 100644
--- a/net/ipv4/tcp_ipv4.c
+++ b/net/ipv4/tcp_ipv4.c
@@ -209,22 +209,8 @@ int tcp_v4_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len)
         }
 
         if (tcp_death_row.sysctl_tw_recycle &&
-            !tp->rx_opt.ts_recent_stamp && fl4->daddr == daddr) {
-                struct inet_peer *peer = rt_get_peer(rt, fl4->daddr);
-                /*
-                 * VJ's idea. We save last timestamp seen from
-                 * the destination in peer table, when entering state
-                 * TIME-WAIT * and initialize rx_opt.ts_recent from it,
-                 * when trying new connection.
-                 */
-                if (peer) {
-                        inet_peer_refcheck(peer);
-                        if ((u32)get_seconds() - peer->tcp_ts_stamp <= TCP_PAWS_MSL) {
-                                tp->rx_opt.ts_recent_stamp = peer->tcp_ts_stamp;
-                                tp->rx_opt.ts_recent = peer->tcp_ts;
-                        }
-                }
-        }
+            !tp->rx_opt.ts_recent_stamp && fl4->daddr == daddr)
+                tcp_fetch_timewait_stamp(sk, &rt->dst);
 
         inet->inet_dport = usin->sin_port;
         inet->inet_daddr = daddr;
@@ -698,8 +684,8 @@ static void tcp_v4_send_reset(struct sock *sk, struct sk_buff *skb)
 
         net = dev_net(skb_dst(skb)->dev);
         arg.tos = ip_hdr(skb)->tos;
-        ip_send_reply(net->ipv4.tcp_sock, skb, ip_hdr(skb)->saddr,
-                      &arg, arg.iov[0].iov_len);
+        ip_send_unicast_reply(net->ipv4.tcp_sock, skb, ip_hdr(skb)->saddr,
+                              ip_hdr(skb)->daddr, &arg, arg.iov[0].iov_len);
 
         TCP_INC_STATS_BH(net, TCP_MIB_OUTSEGS);
         TCP_INC_STATS_BH(net, TCP_MIB_OUTRSTS);
@@ -781,8 +767,8 @@ static void tcp_v4_send_ack(struct sk_buff *skb, u32 seq, u32 ack,
         if (oif)
                 arg.bound_dev_if = oif;
         arg.tos = tos;
-        ip_send_reply(net->ipv4.tcp_sock, skb, ip_hdr(skb)->saddr,
-                      &arg, arg.iov[0].iov_len);
+        ip_send_unicast_reply(net->ipv4.tcp_sock, skb, ip_hdr(skb)->saddr,
+                              ip_hdr(skb)->daddr, &arg, arg.iov[0].iov_len);
 
         TCP_INC_STATS_BH(net, TCP_MIB_OUTSEGS);
 }
@@ -825,7 +811,8 @@ static void tcp_v4_reqsk_send_ack(struct sock *sk, struct sk_buff *skb,
 static int tcp_v4_send_synack(struct sock *sk, struct dst_entry *dst,
                               struct request_sock *req,
                               struct request_values *rvp,
-                              u16 queue_mapping)
+                              u16 queue_mapping,
+                              bool nocache)
 {
         const struct inet_request_sock *ireq = inet_rsk(req);
         struct flowi4 fl4;
@@ -833,7 +820,7 @@ static int tcp_v4_send_synack(struct sock *sk, struct dst_entry *dst,
         struct sk_buff * skb;
 
         /* First, grab a route. */
-        if (!dst && (dst = inet_csk_route_req(sk, &fl4, req)) == NULL)
+        if (!dst && (dst = inet_csk_route_req(sk, &fl4, req, nocache)) == NULL)
                 return -1;
 
         skb = tcp_make_synack(sk, dst, req, rvp);
@@ -848,7 +835,6 @@ static int tcp_v4_send_synack(struct sock *sk, struct dst_entry *dst,
                 err = net_xmit_eval(err);
         }
 
-        dst_release(dst);
         return err;
 }
 
@@ -856,7 +842,7 @@ static int tcp_v4_rtx_synack(struct sock *sk, struct request_sock *req,
                               struct request_values *rvp)
 {
         TCP_INC_STATS_BH(sock_net(sk), TCP_MIB_RETRANSSEGS);
-        return tcp_v4_send_synack(sk, NULL, req, rvp, 0);
+        return tcp_v4_send_synack(sk, NULL, req, rvp, 0, false);
 }
 
 /*
@@ -1375,7 +1361,6 @@ int tcp_v4_conn_request(struct sock *sk, struct sk_buff *skb)
                 isn = cookie_v4_init_sequence(sk, skb, &req->mss);
                 req->cookie_ts = tmp_opt.tstamp_ok;
         } else if (!isn) {
-                struct inet_peer *peer = NULL;
                 struct flowi4 fl4;
 
                 /* VJ's idea. We save last timestamp seen
@@ -1389,13 +1374,9 @@ 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, &fl4, req)) != NULL &&
-                    fl4.daddr == saddr &&
-                    (peer = rt_get_peer((struct rtable *)dst, fl4.daddr)) != NULL) {
-                        inet_peer_refcheck(peer);
-                        if ((u32)get_seconds() - peer->tcp_ts_stamp < TCP_PAWS_MSL &&
-                            (s32)(peer->tcp_ts - req->ts_recent) >
-                                                        TCP_PAWS_WINDOW) {
+                    (dst = inet_csk_route_req(sk, &fl4, req, want_cookie)) != NULL &&
+                    fl4.daddr == saddr) {
+                        if (!tcp_peer_is_proven(req, dst, true)) {
                                 NET_INC_STATS_BH(sock_net(sk), LINUX_MIB_PAWSPASSIVEREJECTED);
                                 goto drop_and_release;
                         }
@@ -1404,8 +1385,7 @@ int tcp_v4_conn_request(struct sock *sk, struct sk_buff *skb)
                 else if (!sysctl_tcp_syncookies &&
                          (sysctl_max_syn_backlog - inet_csk_reqsk_queue_len(sk) <
                           (sysctl_max_syn_backlog >> 2)) &&
-                         (!peer || !peer->tcp_ts_stamp) &&
-                         (!dst || !dst_metric(dst, RTAX_RTT))) {
+                         !tcp_peer_is_proven(req, dst, false)) {
                         /* Without syncookies last quarter of
                          * backlog is filled with destinations,
                          * proven to be alive.
@@ -1425,7 +1405,8 @@ int tcp_v4_conn_request(struct sock *sk, struct sk_buff *skb)
 
         if (tcp_v4_send_synack(sk, dst, req,
                                (struct request_values *)&tmp_ext,
-                               skb_get_queue_mapping(skb)) ||
+                               skb_get_queue_mapping(skb),
+                               want_cookie) ||
             want_cookie)
                 goto drop_and_free;
 
@@ -1672,6 +1653,51 @@ csum_err:
 }
 EXPORT_SYMBOL(tcp_v4_do_rcv);
 
+void tcp_v4_early_demux(struct sk_buff *skb)
+{
+        struct net *net = dev_net(skb->dev);
+        const struct iphdr *iph;
+        const struct tcphdr *th;
+        struct net_device *dev;
+        struct sock *sk;
+
+        if (skb->pkt_type != PACKET_HOST)
+                return;
+
+        if (!pskb_may_pull(skb, ip_hdrlen(skb) + sizeof(struct tcphdr)))
+                return;
+
+        iph = ip_hdr(skb);
+        th = (struct tcphdr *) ((char *)iph + ip_hdrlen(skb));
+
+        if (th->doff < sizeof(struct tcphdr) / 4)
+                return;
+
+        if (!pskb_may_pull(skb, ip_hdrlen(skb) + th->doff * 4))
+                return;
+
+        dev = skb->dev;
+        sk = __inet_lookup_established(net, &tcp_hashinfo,
+                                       iph->saddr, th->source,
+                                       iph->daddr, ntohs(th->dest),
+                                       dev->ifindex);
+        if (sk) {
+                skb->sk = sk;
+                skb->destructor = sock_edemux;
+                if (sk->sk_state != TCP_TIME_WAIT) {
+                        struct dst_entry *dst = sk->sk_rx_dst;
+                        if (dst)
+                                dst = dst_check(dst, 0);
+                        if (dst) {
+                                struct rtable *rt = (struct rtable *) dst;
+
+                                if (rt->rt_iif == dev->ifindex)
+                                        skb_dst_set_noref(skb, dst);
+                        }
+                }
+        }
+}
+
 /*
  *      From tcp_input.c
  */
@@ -1821,40 +1847,10 @@ do_time_wait:
         goto discard_it;
 }
 
-struct inet_peer *tcp_v4_get_peer(struct sock *sk, bool *release_it)
-{
-        struct rtable *rt = (struct rtable *) __sk_dst_get(sk);
-        struct inet_sock *inet = inet_sk(sk);
-        struct inet_peer *peer;
-
-        if (!rt ||
-            inet->cork.fl.u.ip4.daddr != inet->inet_daddr) {
-                peer = inet_getpeer_v4(inet->inet_daddr, 1);
-                *release_it = true;
-        } else {
-                if (!rt->peer)
-                        rt_bind_peer(rt, inet->inet_daddr, 1);
-                peer = rt->peer;
-                *release_it = false;
-        }
-
-        return peer;
-}
-EXPORT_SYMBOL(tcp_v4_get_peer);
-
-void *tcp_v4_tw_get_peer(struct sock *sk)
-{
-        const struct inet_timewait_sock *tw = inet_twsk(sk);
-
-        return inet_getpeer_v4(tw->tw_daddr, 1);
-}
-EXPORT_SYMBOL(tcp_v4_tw_get_peer);
-
 static struct timewait_sock_ops tcp_timewait_sock_ops = {
         .twsk_obj_size  = sizeof(struct tcp_timewait_sock),
         .twsk_unique    = tcp_twsk_unique,
         .twsk_destructor= tcp_twsk_destructor,
-        .twsk_getpeer   = tcp_v4_tw_get_peer,
 };
 
 const struct inet_connection_sock_af_ops ipv4_specific = {
@@ -1863,7 +1859,6 @@ const struct inet_connection_sock_af_ops ipv4_specific = {
         .rebuild_header    = inet_sk_rebuild_header,
         .conn_request      = tcp_v4_conn_request,
         .syn_recv_sock     = tcp_v4_syn_recv_sock,
-        .get_peer          = tcp_v4_get_peer,
         .net_header_len    = sizeof(struct iphdr),
         .setsockopt        = ip_setsockopt,
         .getsockopt        = ip_getsockopt,
diff --git a/net/ipv4/tcp_metrics.c b/net/ipv4/tcp_metrics.c
new file mode 100644
index 00000000000..1fd83d3118f
--- /dev/null
+++ b/net/ipv4/tcp_metrics.c
@@ -0,0 +1,697 @@
+#include <linux/rcupdate.h>
+#include <linux/spinlock.h>
+#include <linux/jiffies.h>
+#include <linux/bootmem.h>
+#include <linux/module.h>
+#include <linux/cache.h>
+#include <linux/slab.h>
+#include <linux/init.h>
+#include <linux/tcp.h>
+
+#include <net/inet_connection_sock.h>
+#include <net/net_namespace.h>
+#include <net/request_sock.h>
+#include <net/inetpeer.h>
+#include <net/sock.h>
+#include <net/ipv6.h>
+#include <net/dst.h>
+#include <net/tcp.h>
+
+int sysctl_tcp_nometrics_save __read_mostly;
+
+enum tcp_metric_index {
+        TCP_METRIC_RTT,
+        TCP_METRIC_RTTVAR,
+        TCP_METRIC_SSTHRESH,
+        TCP_METRIC_CWND,
+        TCP_METRIC_REORDERING,
+
+        /* Always last.  */
+        TCP_METRIC_MAX,
+};
+
+struct tcp_metrics_block {
+        struct tcp_metrics_block __rcu  *tcpm_next;
+        struct inetpeer_addr            tcpm_addr;
+        unsigned long                   tcpm_stamp;
+        u32                             tcpm_ts;
+        u32                             tcpm_ts_stamp;
+        u32                             tcpm_lock;
+        u32                             tcpm_vals[TCP_METRIC_MAX];
+};
+
+static bool tcp_metric_locked(struct tcp_metrics_block *tm,
+                              enum tcp_metric_index idx)
+{
+        return tm->tcpm_lock & (1 << idx);
+}
+
+static u32 tcp_metric_get(struct tcp_metrics_block *tm,
+                          enum tcp_metric_index idx)
+{
+        return tm->tcpm_vals[idx];
+}
+
+static u32 tcp_metric_get_jiffies(struct tcp_metrics_block *tm,
+                                  enum tcp_metric_index idx)
+{
+        return msecs_to_jiffies(tm->tcpm_vals[idx]);
+}
+
+static void tcp_metric_set(struct tcp_metrics_block *tm,
+                           enum tcp_metric_index idx,
+                           u32 val)
+{
+        tm->tcpm_vals[idx] = val;
+}
+
+static void tcp_metric_set_msecs(struct tcp_metrics_block *tm,
+                                 enum tcp_metric_index idx,
+                                 u32 val)
+{
+        tm->tcpm_vals[idx] = jiffies_to_msecs(val);
+}
+
+static bool addr_same(const struct inetpeer_addr *a,
+                      const struct inetpeer_addr *b)
+{
+        const struct in6_addr *a6, *b6;
+
+        if (a->family != b->family)
+                return false;
+        if (a->family == AF_INET)
+                return a->addr.a4 == b->addr.a4;
+
+        a6 = (const struct in6_addr *) &a->addr.a6[0];
+        b6 = (const struct in6_addr *) &b->addr.a6[0];
+
+        return ipv6_addr_equal(a6, b6);
+}
+
+struct tcpm_hash_bucket {
+        struct tcp_metrics_block __rcu  *chain;
+};
+
+static DEFINE_SPINLOCK(tcp_metrics_lock);
+
+static void tcpm_suck_dst(struct tcp_metrics_block *tm, struct dst_entry *dst)
+{
+        u32 val;
+
+        val = 0;
+        if (dst_metric_locked(dst, RTAX_RTT))
+                val |= 1 << TCP_METRIC_RTT;
+        if (dst_metric_locked(dst, RTAX_RTTVAR))
+                val |= 1 << TCP_METRIC_RTTVAR;
+        if (dst_metric_locked(dst, RTAX_SSTHRESH))
+                val |= 1 << TCP_METRIC_SSTHRESH;
+        if (dst_metric_locked(dst, RTAX_CWND))
+                val |= 1 << TCP_METRIC_CWND;
+        if (dst_metric_locked(dst, RTAX_REORDERING))
+                val |= 1 << TCP_METRIC_REORDERING;
+        tm->tcpm_lock = val;
+
+        tm->tcpm_vals[TCP_METRIC_RTT] = dst_metric_raw(dst, RTAX_RTT);
+        tm->tcpm_vals[TCP_METRIC_RTTVAR] = dst_metric_raw(dst, RTAX_RTTVAR);
+        tm->tcpm_vals[TCP_METRIC_SSTHRESH] = dst_metric_raw(dst, RTAX_SSTHRESH);
+        tm->tcpm_vals[TCP_METRIC_CWND] = dst_metric_raw(dst, RTAX_CWND);
+        tm->tcpm_vals[TCP_METRIC_REORDERING] = dst_metric_raw(dst, RTAX_REORDERING);
+        tm->tcpm_ts = 0;
+        tm->tcpm_ts_stamp = 0;
+}
+
+static struct tcp_metrics_block *tcpm_new(struct dst_entry *dst,
+                                          struct inetpeer_addr *addr,
+                                          unsigned int hash,
+                                          bool reclaim)
+{
+        struct tcp_metrics_block *tm;
+        struct net *net;
+
+        spin_lock_bh(&tcp_metrics_lock);
+        net = dev_net(dst->dev);
+        if (unlikely(reclaim)) {
+                struct tcp_metrics_block *oldest;
+
+                oldest = rcu_dereference(net->ipv4.tcp_metrics_hash[hash].chain);
+                for (tm = rcu_dereference(oldest->tcpm_next); tm;
+                     tm = rcu_dereference(tm->tcpm_next)) {
+                        if (time_before(tm->tcpm_stamp, oldest->tcpm_stamp))
+                                oldest = tm;
+                }
+                tm = oldest;
+        } else {
+                tm = kmalloc(sizeof(*tm), GFP_ATOMIC);
+                if (!tm)
+                        goto out_unlock;
+        }
+        tm->tcpm_addr = *addr;
+        tm->tcpm_stamp = jiffies;
+
+        tcpm_suck_dst(tm, dst);
+
+        if (likely(!reclaim)) {
+                tm->tcpm_next = net->ipv4.tcp_metrics_hash[hash].chain;
+                rcu_assign_pointer(net->ipv4.tcp_metrics_hash[hash].chain, tm);
+        }
+
+out_unlock:
+        spin_unlock_bh(&tcp_metrics_lock);
+        return tm;
+}
+
+#define TCP_METRICS_TIMEOUT             (60 * 60 * HZ)
+
+static void tcpm_check_stamp(struct tcp_metrics_block *tm, struct dst_entry *dst)
+{
+        if (tm && unlikely(time_after(jiffies, tm->tcpm_stamp + TCP_METRICS_TIMEOUT)))
+                tcpm_suck_dst(tm, dst);
+}
+
+#define TCP_METRICS_RECLAIM_DEPTH       5
+#define TCP_METRICS_RECLAIM_PTR         (struct tcp_metrics_block *) 0x1UL
+
+static struct tcp_metrics_block *tcp_get_encode(struct tcp_metrics_block *tm, int depth)
+{
+        if (tm)
+                return tm;
+        if (depth > TCP_METRICS_RECLAIM_DEPTH)
+                return TCP_METRICS_RECLAIM_PTR;
+        return NULL;
+}
+
+static struct tcp_metrics_block *__tcp_get_metrics(const struct inetpeer_addr *addr,
+                                                   struct net *net, unsigned int hash)
+{
+        struct tcp_metrics_block *tm;
+        int depth = 0;
+
+        for (tm = rcu_dereference(net->ipv4.tcp_metrics_hash[hash].chain); tm;
+             tm = rcu_dereference(tm->tcpm_next)) {
+                if (addr_same(&tm->tcpm_addr, addr))
+                        break;
+                depth++;
+        }
+        return tcp_get_encode(tm, depth);
+}
+
+static struct tcp_metrics_block *__tcp_get_metrics_req(struct request_sock *req,
+                                                       struct dst_entry *dst)
+{
+        struct tcp_metrics_block *tm;
+        struct inetpeer_addr addr;
+        unsigned int hash;
+        struct net *net;
+
+        addr.family = req->rsk_ops->family;
+        switch (addr.family) {
+        case AF_INET:
+                addr.addr.a4 = inet_rsk(req)->rmt_addr;
+                hash = (__force unsigned int) addr.addr.a4;
+                break;
+        case AF_INET6:
+                *(struct in6_addr *)addr.addr.a6 = inet6_rsk(req)->rmt_addr;
+                hash = ((__force unsigned int) addr.addr.a6[0] ^
+                        (__force unsigned int) addr.addr.a6[1] ^
+                        (__force unsigned int) addr.addr.a6[2] ^
+                        (__force unsigned int) addr.addr.a6[3]);
+                break;
+        default:
+                return NULL;
+        }
+
+        hash ^= (hash >> 24) ^ (hash >> 16) ^ (hash >> 8);
+
+        net = dev_net(dst->dev);
+        hash &= net->ipv4.tcp_metrics_hash_mask;
+
+        for (tm = rcu_dereference(net->ipv4.tcp_metrics_hash[hash].chain); tm;
+             tm = rcu_dereference(tm->tcpm_next)) {
+                if (addr_same(&tm->tcpm_addr, &addr))
+                        break;
+        }
+        tcpm_check_stamp(tm, dst);
+        return tm;
+}
+
+static struct tcp_metrics_block *__tcp_get_metrics_tw(struct inet_timewait_sock *tw)
+{
+        struct inet6_timewait_sock *tw6;
+        struct tcp_metrics_block *tm;
+        struct inetpeer_addr addr;
+        unsigned int hash;
+        struct net *net;
+
+        addr.family = tw->tw_family;
+        switch (addr.family) {
+        case AF_INET:
+                addr.addr.a4 = tw->tw_daddr;
+                hash = (__force unsigned int) addr.addr.a4;
+                break;
+        case AF_INET6:
+                tw6 = inet6_twsk((struct sock *)tw);
+                *(struct in6_addr *)addr.addr.a6 = tw6->tw_v6_daddr;
+                hash = ((__force unsigned int) addr.addr.a6[0] ^
+                        (__force unsigned int) addr.addr.a6[1] ^
+                        (__force unsigned int) addr.addr.a6[2] ^
+                        (__force unsigned int) addr.addr.a6[3]);
+                break;
+        default:
+                return NULL;
+        }
+
+        hash ^= (hash >> 24) ^ (hash >> 16) ^ (hash >> 8);
+
+        net = twsk_net(tw);
+        hash &= net->ipv4.tcp_metrics_hash_mask;
+
+        for (tm = rcu_dereference(net->ipv4.tcp_metrics_hash[hash].chain); tm;
+             tm = rcu_dereference(tm->tcpm_next)) {
+                if (addr_same(&tm->tcpm_addr, &addr))
+                        break;
+        }
+        return tm;
+}
+
+static struct tcp_metrics_block *tcp_get_metrics(struct sock *sk,
+                                                 struct dst_entry *dst,
+                                                 bool create)
+{
+        struct tcp_metrics_block *tm;
+        struct inetpeer_addr addr;
+        unsigned int hash;
+        struct net *net;
+        bool reclaim;
+
+        addr.family = sk->sk_family;
+        switch (addr.family) {
+        case AF_INET:
+                addr.addr.a4 = inet_sk(sk)->inet_daddr;
+                hash = (__force unsigned int) addr.addr.a4;
+                break;
+        case AF_INET6:
+                *(struct in6_addr *)addr.addr.a6 = inet6_sk(sk)->daddr;
+                hash = ((__force unsigned int) addr.addr.a6[0] ^
+                        (__force unsigned int) addr.addr.a6[1] ^
+                        (__force unsigned int) addr.addr.a6[2] ^
+                        (__force unsigned int) addr.addr.a6[3]);
+                break;
+        default:
+                return NULL;
+        }
+
+        hash ^= (hash >> 24) ^ (hash >> 16) ^ (hash >> 8);
+
+        net = dev_net(dst->dev);
+        hash &= net->ipv4.tcp_metrics_hash_mask;
+
+        tm = __tcp_get_metrics(&addr, net, hash);
+        reclaim = false;
+        if (tm == TCP_METRICS_RECLAIM_PTR) {
+                reclaim = true;
+                tm = NULL;
+        }
+        if (!tm && create)
+                tm = tcpm_new(dst, &addr, hash, reclaim);
+        else
+                tcpm_check_stamp(tm, dst);
+
+        return tm;
+}
+
+/* Save metrics learned by this TCP session.  This function is called
+ * only, when TCP finishes successfully i.e. when it enters TIME-WAIT
+ * or goes from LAST-ACK to CLOSE.
+ */
+void tcp_update_metrics(struct sock *sk)
+{
+        const struct inet_connection_sock *icsk = inet_csk(sk);
+        struct dst_entry *dst = __sk_dst_get(sk);
+        struct tcp_sock *tp = tcp_sk(sk);
+        struct tcp_metrics_block *tm;
+        unsigned long rtt;
+        u32 val;
+        int m;
+
+        if (sysctl_tcp_nometrics_save || !dst)
+                return;
+
+        if (dst->flags & DST_HOST)
+                dst_confirm(dst);
+
+        rcu_read_lock();
+        if (icsk->icsk_backoff || !tp->srtt) {
+                /* This session failed to estimate rtt. Why?
+                 * Probably, no packets returned in time.  Reset our
+                 * results.
+                 */
+                tm = tcp_get_metrics(sk, dst, false);
+                if (tm && !tcp_metric_locked(tm, TCP_METRIC_RTT))
+                        tcp_metric_set(tm, TCP_METRIC_RTT, 0);
+                goto out_unlock;
+        } else
+                tm = tcp_get_metrics(sk, dst, true);
+
+        if (!tm)
+                goto out_unlock;
+
+        rtt = tcp_metric_get_jiffies(tm, TCP_METRIC_RTT);
+        m = rtt - tp->srtt;
+
+        /* If newly calculated rtt larger than stored one, store new
+         * one. Otherwise, use EWMA. Remember, rtt overestimation is
+         * always better than underestimation.
+         */
+        if (!tcp_metric_locked(tm, TCP_METRIC_RTT)) {
+                if (m <= 0)
+                        rtt = tp->srtt;
+                else
+                        rtt -= (m >> 3);
+                tcp_metric_set_msecs(tm, TCP_METRIC_RTT, rtt);
+        }
+
+        if (!tcp_metric_locked(tm, TCP_METRIC_RTTVAR)) {
+                unsigned long var;
+
+                if (m < 0)
+                        m = -m;
+
+                /* Scale deviation to rttvar fixed point */
+                m >>= 1;
+                if (m < tp->mdev)
+                        m = tp->mdev;
+
+                var = tcp_metric_get_jiffies(tm, TCP_METRIC_RTTVAR);
+                if (m >= var)
+                        var = m;
+                else
+                        var -= (var - m) >> 2;
+
+                tcp_metric_set_msecs(tm, TCP_METRIC_RTTVAR, var);
+        }
+
+        if (tcp_in_initial_slowstart(tp)) {
+                /* Slow start still did not finish. */
+                if (!tcp_metric_locked(tm, TCP_METRIC_SSTHRESH)) {
+                        val = tcp_metric_get(tm, TCP_METRIC_SSTHRESH);
+                        if (val && (tp->snd_cwnd >> 1) > val)
+                                tcp_metric_set(tm, TCP_METRIC_SSTHRESH,
+                                               tp->snd_cwnd >> 1);
+                }
+                if (!tcp_metric_locked(tm, TCP_METRIC_CWND)) {
+                        val = tcp_metric_get(tm, TCP_METRIC_CWND);
+                        if (tp->snd_cwnd > val)
+                                tcp_metric_set(tm, TCP_METRIC_CWND,
+                                               tp->snd_cwnd);
+                }
+        } else if (tp->snd_cwnd > tp->snd_ssthresh &&
+                   icsk->icsk_ca_state == TCP_CA_Open) {
+                /* Cong. avoidance phase, cwnd is reliable. */
+                if (!tcp_metric_locked(tm, TCP_METRIC_SSTHRESH))
+                        tcp_metric_set(tm, TCP_METRIC_SSTHRESH,
+                                       max(tp->snd_cwnd >> 1, tp->snd_ssthresh));
+                if (!tcp_metric_locked(tm, TCP_METRIC_CWND)) {
+                        val = tcp_metric_get(tm, TCP_METRIC_CWND);
+                        tcp_metric_set(tm, RTAX_CWND, (val + tp->snd_cwnd) >> 1);
+                }
+        } else {
+                /* Else slow start did not finish, cwnd is non-sense,
+                 * ssthresh may be also invalid.
+                 */
+                if (!tcp_metric_locked(tm, TCP_METRIC_CWND)) {
+                        val = tcp_metric_get(tm, TCP_METRIC_CWND);
+                        tcp_metric_set(tm, TCP_METRIC_CWND,
+                                       (val + tp->snd_ssthresh) >> 1);
+                }
+                if (!tcp_metric_locked(tm, TCP_METRIC_SSTHRESH)) {
+                        val = tcp_metric_get(tm, TCP_METRIC_SSTHRESH);
+                        if (val && tp->snd_ssthresh > val)
+                                tcp_metric_set(tm, TCP_METRIC_SSTHRESH,
+                                               tp->snd_ssthresh);
+                }
+                if (!tcp_metric_locked(tm, TCP_METRIC_REORDERING)) {
+                        val = tcp_metric_get(tm, TCP_METRIC_REORDERING);
+                        if (val < tp->reordering &&
+                            tp->reordering != sysctl_tcp_reordering)
+                                tcp_metric_set(tm, TCP_METRIC_REORDERING,
+                                               tp->reordering);
+                }
+        }
+        tm->tcpm_stamp = jiffies;
+out_unlock:
+        rcu_read_unlock();
+}
+
+/* Initialize metrics on socket. */
+
+void tcp_init_metrics(struct sock *sk)
+{
+        struct dst_entry *dst = __sk_dst_get(sk);
+        struct tcp_sock *tp = tcp_sk(sk);
+        struct tcp_metrics_block *tm;
+        u32 val;
+
+        if (dst == NULL)
+                goto reset;
+
+        dst_confirm(dst);
+
+        rcu_read_lock();
+        tm = tcp_get_metrics(sk, dst, true);
+        if (!tm) {
+                rcu_read_unlock();
+                goto reset;
+        }
+
+        if (tcp_metric_locked(tm, TCP_METRIC_CWND))
+                tp->snd_cwnd_clamp = tcp_metric_get(tm, TCP_METRIC_CWND);
+
+        val = tcp_metric_get(tm, TCP_METRIC_SSTHRESH);
+        if (val) {
+                tp->snd_ssthresh = val;
+                if (tp->snd_ssthresh > tp->snd_cwnd_clamp)
+                        tp->snd_ssthresh = tp->snd_cwnd_clamp;
+        } else {
+                /* ssthresh may have been reduced unnecessarily during.
+                 * 3WHS. Restore it back to its initial default.
+                 */
+                tp->snd_ssthresh = TCP_INFINITE_SSTHRESH;
+        }
+        val = tcp_metric_get(tm, TCP_METRIC_REORDERING);
+        if (val && tp->reordering != val) {
+                tcp_disable_fack(tp);
+                tcp_disable_early_retrans(tp);
+                tp->reordering = val;
+        }
+
+        val = tcp_metric_get(tm, TCP_METRIC_RTT);
+        if (val == 0 || tp->srtt == 0) {
+                rcu_read_unlock();
+                goto reset;
+        }
+        /* Initial rtt is determined from SYN,SYN-ACK.
+         * The segment is small and rtt may appear much
+         * less than real one. Use per-dst memory
+         * to make it more realistic.
+         *
+         * A bit of theory. RTT is time passed after "normal" sized packet
+         * is sent until it is ACKed. In normal circumstances sending small
+         * packets force peer to delay ACKs and calculation is correct too.
+         * The algorithm is adaptive and, provided we follow specs, it
+         * NEVER underestimate RTT. BUT! If peer tries to make some clever
+         * tricks sort of "quick acks" for time long enough to decrease RTT
+         * to low value, and then abruptly stops to do it and starts to delay
+         * ACKs, wait for troubles.
+         */
+        val = msecs_to_jiffies(val);
+        if (val > tp->srtt) {
+                tp->srtt = val;
+                tp->rtt_seq = tp->snd_nxt;
+        }
+        val = tcp_metric_get_jiffies(tm, TCP_METRIC_RTTVAR);
+        if (val > tp->mdev) {
+                tp->mdev = val;
+                tp->mdev_max = tp->rttvar = max(tp->mdev, tcp_rto_min(sk));
+        }
+        rcu_read_unlock();
+
+        tcp_set_rto(sk);
+reset:
+        if (tp->srtt == 0) {
+                /* RFC6298: 5.7 We've failed to get a valid RTT sample from
+                 * 3WHS. This is most likely due to retransmission,
+                 * including spurious one. Reset the RTO back to 3secs
+                 * from the more aggressive 1sec to avoid more spurious
+                 * retransmission.
+                 */
+                tp->mdev = tp->mdev_max = tp->rttvar = TCP_TIMEOUT_FALLBACK;
+                inet_csk(sk)->icsk_rto = TCP_TIMEOUT_FALLBACK;
+        }
+        /* Cut cwnd down to 1 per RFC5681 if SYN or SYN-ACK has been
+         * retransmitted. In light of RFC6298 more aggressive 1sec
+         * initRTO, we only reset cwnd when more than 1 SYN/SYN-ACK
+         * retransmission has occurred.
+         */
+        if (tp->total_retrans > 1)
+                tp->snd_cwnd = 1;
+        else
+                tp->snd_cwnd = tcp_init_cwnd(tp, dst);
+        tp->snd_cwnd_stamp = tcp_time_stamp;
+}
+
+bool tcp_peer_is_proven(struct request_sock *req, struct dst_entry *dst, bool paws_check)
+{
+        struct tcp_metrics_block *tm;
+        bool ret;
+
+        if (!dst)
+                return false;
+
+        rcu_read_lock();
+        tm = __tcp_get_metrics_req(req, dst);
+        if (paws_check) {
+                if (tm &&
+                    (u32)get_seconds() - tm->tcpm_ts_stamp < TCP_PAWS_MSL &&
+                    (s32)(tm->tcpm_ts - req->ts_recent) > TCP_PAWS_WINDOW)
+                        ret = false;
+                else
+                        ret = true;
+        } else {
+                if (tm && tcp_metric_get(tm, TCP_METRIC_RTT) && tm->tcpm_ts_stamp)
+                        ret = true;
+                else
+                        ret = false;
+        }
+        rcu_read_unlock();
+
+        return ret;
+}
+EXPORT_SYMBOL_GPL(tcp_peer_is_proven);
+
+void tcp_fetch_timewait_stamp(struct sock *sk, struct dst_entry *dst)
+{
+        struct tcp_metrics_block *tm;
+
+        rcu_read_lock();
+        tm = tcp_get_metrics(sk, dst, true);
+        if (tm) {
+                struct tcp_sock *tp = tcp_sk(sk);
+
+                if ((u32)get_seconds() - tm->tcpm_ts_stamp <= TCP_PAWS_MSL) {
+                        tp->rx_opt.ts_recent_stamp = tm->tcpm_ts_stamp;
+                        tp->rx_opt.ts_recent = tm->tcpm_ts;
+                }
+        }
+        rcu_read_unlock();
+}
+EXPORT_SYMBOL_GPL(tcp_fetch_timewait_stamp);
+
+/* VJ's idea. Save last timestamp seen from this destination and hold
+ * it at least for normal timewait interval to use for duplicate
+ * segment detection in subsequent connections, before they enter
+ * synchronized state.
+ */
+bool tcp_remember_stamp(struct sock *sk)
+{
+        struct dst_entry *dst = __sk_dst_get(sk);
+        bool ret = false;
+
+        if (dst) {
+                struct tcp_metrics_block *tm;
+
+                rcu_read_lock();
+                tm = tcp_get_metrics(sk, dst, true);
+                if (tm) {
+                        struct tcp_sock *tp = tcp_sk(sk);
+
+                        if ((s32)(tm->tcpm_ts - tp->rx_opt.ts_recent) <= 0 ||
+                            ((u32)get_seconds() - tm->tcpm_ts_stamp > TCP_PAWS_MSL &&
+                             tm->tcpm_ts_stamp <= (u32)tp->rx_opt.ts_recent_stamp)) {
+                                tm->tcpm_ts_stamp = (u32)tp->rx_opt.ts_recent_stamp;
+                                tm->tcpm_ts = tp->rx_opt.ts_recent;
+                        }
+                        ret = true;
+                }
+                rcu_read_unlock();
+        }
+        return ret;
+}
+
+bool tcp_tw_remember_stamp(struct inet_timewait_sock *tw)
+{
+        struct tcp_metrics_block *tm;
+        bool ret = false;
+
+        rcu_read_lock();
+        tm = __tcp_get_metrics_tw(tw);
+        if (tw) {
+                const struct tcp_timewait_sock *tcptw;
+                struct sock *sk = (struct sock *) tw;
+
+                tcptw = tcp_twsk(sk);
+                if ((s32)(tm->tcpm_ts - tcptw->tw_ts_recent) <= 0 ||
+                    ((u32)get_seconds() - tm->tcpm_ts_stamp > TCP_PAWS_MSL &&
+                     tm->tcpm_ts_stamp <= (u32)tcptw->tw_ts_recent_stamp)) {
+                        tm->tcpm_ts_stamp = (u32)tcptw->tw_ts_recent_stamp;
+                        tm->tcpm_ts        = tcptw->tw_ts_recent;
+                }
+                ret = true;
+        }
+        rcu_read_unlock();
+
+        return ret;
+}
+
+static unsigned long tcpmhash_entries;
+static int __init set_tcpmhash_entries(char *str)
+{
+        ssize_t ret;
+
+        if (!str)
+                return 0;
+
+        ret = kstrtoul(str, 0, &tcpmhash_entries);
+        if (ret)
+                return 0;
+
+        return 1;
+}
+__setup("tcpmhash_entries=", set_tcpmhash_entries);
+
+static int __net_init tcp_net_metrics_init(struct net *net)
+{
+        int slots, size;
+
+        slots = tcpmhash_entries;
+        if (!slots) {
+                if (totalram_pages >= 128 * 1024)
+                        slots = 16 * 1024;
+                else
+                        slots = 8 * 1024;
+        }
+
+        size = slots * sizeof(struct tcpm_hash_bucket);
+
+        net->ipv4.tcp_metrics_hash = kzalloc(size, GFP_KERNEL);
+        if (!net->ipv4.tcp_metrics_hash)
+                return -ENOMEM;
+
+        net->ipv4.tcp_metrics_hash_mask = (slots - 1);
+
+        return 0;
+}
+
+static void __net_exit tcp_net_metrics_exit(struct net *net)
+{
+        kfree(net->ipv4.tcp_metrics_hash);
+}
+
+static __net_initdata struct pernet_operations tcp_net_metrics_ops = {
+        .init   =       tcp_net_metrics_init,
+        .exit   =       tcp_net_metrics_exit,
+};
+
+void __init tcp_metrics_init(void)
+{
+        register_pernet_subsys(&tcp_net_metrics_ops);
+}
diff --git a/net/ipv4/tcp_minisocks.c b/net/ipv4/tcp_minisocks.c
index b85d9fe7d66..65608863fde 100644
--- a/net/ipv4/tcp_minisocks.c
+++ b/net/ipv4/tcp_minisocks.c
@@ -49,56 +49,6 @@ struct inet_timewait_death_row tcp_death_row = {
 };
 EXPORT_SYMBOL_GPL(tcp_death_row);
 
-/* VJ's idea. Save last timestamp seen from this destination
- * and hold it at least for normal timewait interval to use for duplicate
- * segment detection in subsequent connections, before they enter synchronized
- * state.
- */
-
-static bool tcp_remember_stamp(struct sock *sk)
-{
-        const struct inet_connection_sock *icsk = inet_csk(sk);
-        struct tcp_sock *tp = tcp_sk(sk);
-        struct inet_peer *peer;
-        bool release_it;
-
-        peer = icsk->icsk_af_ops->get_peer(sk, &release_it);
-        if (peer) {
-                if ((s32)(peer->tcp_ts - tp->rx_opt.ts_recent) <= 0 ||
-                    ((u32)get_seconds() - peer->tcp_ts_stamp > TCP_PAWS_MSL &&
-                     peer->tcp_ts_stamp <= (u32)tp->rx_opt.ts_recent_stamp)) {
-                        peer->tcp_ts_stamp = (u32)tp->rx_opt.ts_recent_stamp;
-                        peer->tcp_ts = tp->rx_opt.ts_recent;
-                }
-                if (release_it)
-                        inet_putpeer(peer);
-                return true;
-        }
-
-        return false;
-}
-
-static bool tcp_tw_remember_stamp(struct inet_timewait_sock *tw)
-{
-        struct sock *sk = (struct sock *) tw;
-        struct inet_peer *peer;
-
-        peer = twsk_getpeer(sk);
-        if (peer) {
-                const struct tcp_timewait_sock *tcptw = tcp_twsk(sk);
-
-                if ((s32)(peer->tcp_ts - tcptw->tw_ts_recent) <= 0 ||
-                    ((u32)get_seconds() - peer->tcp_ts_stamp > TCP_PAWS_MSL &&
-                     peer->tcp_ts_stamp <= (u32)tcptw->tw_ts_recent_stamp)) {
-                        peer->tcp_ts_stamp = (u32)tcptw->tw_ts_recent_stamp;
-                        peer->tcp_ts       = tcptw->tw_ts_recent;
-                }
-                inet_putpeer(peer);
-                return true;
-        }
-        return false;
-}
-
 static bool tcp_in_window(u32 seq, u32 end_seq, u32 s_win, u32 e_win)
 {
         if (seq == s_win)
@@ -327,8 +277,9 @@ void tcp_time_wait(struct sock *sk, int state, int timeo)
         if (tw != NULL) {
                 struct tcp_timewait_sock *tcptw = tcp_twsk((struct sock *)tw);
                 const int rto = (icsk->icsk_rto << 2) - (icsk->icsk_rto >> 1);
+                struct inet_sock *inet = inet_sk(sk);
 
-                tw->tw_transparent      = inet_sk(sk)->transparent;
+                tw->tw_transparent      = inet->transparent;
                 tw->tw_rcv_wscale       = tp->rx_opt.rcv_wscale;
                 tcptw->tw_rcv_nxt       = tp->rcv_nxt;
                 tcptw->tw_snd_nxt       = tp->snd_nxt;
@@ -403,6 +354,7 @@ void tcp_twsk_destructor(struct sock *sk)
 {
 #ifdef CONFIG_TCP_MD5SIG
         struct tcp_timewait_sock *twsk = tcp_twsk(sk);
+
         if (twsk->tw_md5_key) {
                 tcp_free_md5sig_pool();
                 kfree_rcu(twsk->tw_md5_key, rcu);
@@ -435,6 +387,8 @@ struct sock *tcp_create_openreq_child(struct sock *sk, struct request_sock *req,
                 struct tcp_sock *oldtp = tcp_sk(sk);
                 struct tcp_cookie_values *oldcvp = oldtp->cookie_values;
 
+                newsk->sk_rx_dst = dst_clone(skb_dst(skb));
+
                 /* TCP Cookie Transactions require space for the cookie pair,
                  * as it differs for each connection.  There is no need to
                  * copy any s_data_payload stored at the original socket.
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c
index 803cbfe82fb..c465d3e51e2 100644
--- a/net/ipv4/tcp_output.c
+++ b/net/ipv4/tcp_output.c
@@ -2442,7 +2442,16 @@ int tcp_send_synack(struct sock *sk)
         return tcp_transmit_skb(sk, skb, 1, GFP_ATOMIC);
 }
 
-/* Prepare a SYN-ACK. */
+/**
+ * tcp_make_synack - Prepare a SYN-ACK.
+ * sk: listener socket
+ * dst: dst entry attached to the SYNACK
+ * req: request_sock pointer
+ * rvp: request_values pointer
+ *
+ * Allocate one skb and build a SYNACK packet.
+ * @dst is consumed : Caller should not use it again.
+ */
 struct sk_buff *tcp_make_synack(struct sock *sk, struct dst_entry *dst,
                                 struct request_sock *req,
                                 struct request_values *rvp)
@@ -2461,14 +2470,15 @@ struct sk_buff *tcp_make_synack(struct sock *sk, struct dst_entry *dst,
 
         if (cvp != NULL && cvp->s_data_constant && cvp->s_data_desired)
                 s_data_desired = cvp->s_data_desired;
-        skb = sock_wmalloc(sk, MAX_TCP_HEADER + 15 + s_data_desired, 1, GFP_ATOMIC);
-        if (skb == NULL)
+        skb = alloc_skb(MAX_TCP_HEADER + 15 + s_data_desired, GFP_ATOMIC);
+        if (unlikely(!skb)) {
+                dst_release(dst);
                 return NULL;
-
+        }
         /* Reserve space for headers. */
         skb_reserve(skb, MAX_TCP_HEADER);
 
-        skb_dst_set(skb, dst_clone(dst));
+        skb_dst_set(skb, dst);
 
         mss = dst_metric_advmss(dst);
         if (tp->rx_opt.user_mss && tp->rx_opt.user_mss < mss)
diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
index eaca73644e7..ee37d47d472 100644
--- a/net/ipv4/udp.c
+++ b/net/ipv4/udp.c
@@ -108,6 +108,7 @@
 #include <net/xfrm.h>
 #include <trace/events/udp.h>
 #include <linux/static_key.h>
+#include <trace/events/skb.h>
 #include "udp_impl.h"
 
 struct udp_table udp_table __read_mostly;
@@ -615,6 +616,7 @@ void __udp4_lib_err(struct sk_buff *skb, u32 info, struct udp_table *udptable)
                 break;
         case ICMP_DEST_UNREACH:
                 if (code == ICMP_FRAG_NEEDED) { /* Path MTU discovery */
+                        ipv4_sk_update_pmtu(skb, sk, info);
                         if (inet->pmtudisc != IP_PMTUDISC_DONT) {
                                 err = EMSGSIZE;
                                 harderr = 1;
@@ -1219,8 +1221,10 @@ try_again:
                         goto csum_copy_err;
         }
 
-        if (err)
+        if (unlikely(err)) {
+                trace_kfree_skb(skb, udp_recvmsg);
                 goto out_free;
+        }
 
         if (!peeked)
                 UDP_INC_STATS_USER(sock_net(sk),
diff --git a/net/ipv4/xfrm4_policy.c b/net/ipv4/xfrm4_policy.c
index 0d3426cb5c4..87d3fcc302d 100644
--- a/net/ipv4/xfrm4_policy.c
+++ b/net/ipv4/xfrm4_policy.c
@@ -90,10 +90,6 @@ static int xfrm4_fill_dst(struct xfrm_dst *xdst, struct net_device *dev,
         xdst->u.dst.dev = dev;
         dev_hold(dev);
 
-        xdst->u.rt.peer = rt->peer;
-        if (rt->peer)
-                atomic_inc(&rt->peer->refcnt);
-
         /* Sheit... I remember I did this right. Apparently,
          * it was magically lost, so this code needs audit */
         xdst->u.rt.rt_flags = rt->rt_flags & (RTCF_BROADCAST | RTCF_MULTICAST |
@@ -102,7 +98,7 @@ static int xfrm4_fill_dst(struct xfrm_dst *xdst, struct net_device *dev,
         xdst->u.rt.rt_src = rt->rt_src;
         xdst->u.rt.rt_dst = rt->rt_dst;
         xdst->u.rt.rt_gateway = rt->rt_gateway;
-        xdst->u.rt.rt_spec_dst = rt->rt_spec_dst;
+        xdst->u.rt.rt_pmtu = rt->rt_pmtu;
 
         return 0;
 }
@@ -212,9 +208,6 @@ static void xfrm4_dst_destroy(struct dst_entry *dst)
 
         dst_destroy_metrics_generic(dst);
 
-        if (likely(xdst->u.rt.peer))
-                inet_putpeer(xdst->u.rt.peer);
-
         xfrm_dst_destroy(xdst);
 }
 
diff --git a/net/ipv6/ah6.c b/net/ipv6/ah6.c
index f1a4a2c28ed..49d4d26bda8 100644
--- a/net/ipv6/ah6.c
+++ b/net/ipv6/ah6.c
@@ -35,6 +35,7 @@
 #include <linux/pfkeyv2.h>
 #include <linux/string.h>
 #include <linux/scatterlist.h>
+#include <net/ip6_route.h>
 #include <net/icmp.h>
 #include <net/ipv6.h>
 #include <net/protocol.h>
@@ -621,7 +622,7 @@ static void ah6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
 
         NETDEBUG(KERN_DEBUG "pmtu discovery on SA AH/%08x/%pI6\n",
                  ntohl(ah->spi), &iph->daddr);
-
+        ip6_update_pmtu(skb, net, info, 0, 0);
         xfrm_state_put(x);
 }
 
diff --git a/net/ipv6/esp6.c b/net/ipv6/esp6.c
index db1521fcda5..89a615ba84f 100644
--- a/net/ipv6/esp6.c
+++ b/net/ipv6/esp6.c
@@ -39,6 +39,7 @@
 #include <linux/random.h>
 #include <linux/slab.h>
 #include <linux/spinlock.h>
+#include <net/ip6_route.h>
 #include <net/icmp.h>
 #include <net/ipv6.h>
 #include <net/protocol.h>
@@ -442,6 +443,7 @@ static void esp6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
                 return;
         pr_debug("pmtu discovery on SA ESP/%08x/%pI6\n",
                  ntohl(esph->spi), &iph->daddr);
+        ip6_update_pmtu(skb, net, info, 0, 0);
         xfrm_state_put(x);
 }
 
diff --git a/net/ipv6/exthdrs.c b/net/ipv6/exthdrs.c
index 6447dc49429..fa3d9c32809 100644
--- a/net/ipv6/exthdrs.c
+++ b/net/ipv6/exthdrs.c
@@ -791,14 +791,14 @@ static int ipv6_renew_option(void *ohdr,
                 if (ohdr) {
                         memcpy(*p, ohdr, ipv6_optlen((struct ipv6_opt_hdr *)ohdr));
                         *hdr = (struct ipv6_opt_hdr *)*p;
-                        *p += CMSG_ALIGN(ipv6_optlen(*(struct ipv6_opt_hdr **)hdr));
+                        *p += CMSG_ALIGN(ipv6_optlen(*hdr));
                 }
         } else {
                 if (newopt) {
                         if (copy_from_user(*p, newopt, newoptlen))
                                 return -EFAULT;
                         *hdr = (struct ipv6_opt_hdr *)*p;
-                        if (ipv6_optlen(*(struct ipv6_opt_hdr **)hdr) > newoptlen)
+                        if (ipv6_optlen(*hdr) > newoptlen)
                                 return -EINVAL;
                         *p += CMSG_ALIGN(newoptlen);
                 }
diff --git a/net/ipv6/icmp.c b/net/ipv6/icmp.c
index 091a2971c7b..a113f7d7e93 100644
--- a/net/ipv6/icmp.c
+++ b/net/ipv6/icmp.c
@@ -188,14 +188,16 @@ static inline bool icmpv6_xrlim_allow(struct sock *sk, u8 type,
         } else {
                 struct rt6_info *rt = (struct rt6_info *)dst;
                 int tmo = net->ipv6.sysctl.icmpv6_time;
+                struct inet_peer *peer;
 
                 /* Give more bandwidth to wider prefixes. */
                 if (rt->rt6i_dst.plen < 128)
                         tmo >>= ((128 - rt->rt6i_dst.plen)>>5);
 
-                if (!rt->rt6i_peer)
-                        rt6_bind_peer(rt, 1);
-                res = inet_peer_xrlim_allow(rt->rt6i_peer, tmo);
+                peer = inet_getpeer_v6(net->ipv6.peers, &rt->rt6i_dst.addr, 1);
+                res = inet_peer_xrlim_allow(peer, tmo);
+                if (peer)
+                        inet_putpeer(peer);
         }
         dst_release(dst);
         return res;
@@ -600,9 +602,8 @@ static void icmpv6_notify(struct sk_buff *skb, u8 type, u8 code, __be32 info)
 {
         const struct inet6_protocol *ipprot;
         int inner_offset;
-        int hash;
-        u8 nexthdr;
         __be16 frag_off;
+        u8 nexthdr;
 
         if (!pskb_may_pull(skb, sizeof(struct ipv6hdr)))
                 return;
@@ -629,10 +630,8 @@ static void icmpv6_notify(struct sk_buff *skb, u8 type, u8 code, __be32 info)
            --ANK (980726)
          */
 
-        hash = nexthdr & (MAX_INET_PROTOS - 1);
-
         rcu_read_lock();
-        ipprot = rcu_dereference(inet6_protos[hash]);
+        ipprot = rcu_dereference(inet6_protos[nexthdr]);
         if (ipprot && ipprot->err_handler)
                 ipprot->err_handler(skb, NULL, type, code, inner_offset, info);
         rcu_read_unlock();
@@ -649,7 +648,6 @@ static int icmpv6_rcv(struct sk_buff *skb)
         struct net_device *dev = skb->dev;
         struct inet6_dev *idev = __in6_dev_get(dev);
         const struct in6_addr *saddr, *daddr;
-        const struct ipv6hdr *orig_hdr;
         struct icmp6hdr *hdr;
         u8 type;
 
@@ -661,7 +659,7 @@ static int icmpv6_rcv(struct sk_buff *skb)
                                  XFRM_STATE_ICMP))
                         goto drop_no_count;
 
-                if (!pskb_may_pull(skb, sizeof(*hdr) + sizeof(*orig_hdr)))
+                if (!pskb_may_pull(skb, sizeof(*hdr) + sizeof(struct ipv6hdr)))
                         goto drop_no_count;
 
                 nh = skb_network_offset(skb);
@@ -722,9 +720,6 @@ static int icmpv6_rcv(struct sk_buff *skb)
                 if (!pskb_may_pull(skb, sizeof(struct ipv6hdr)))
                         goto discard_it;
                 hdr = icmp6_hdr(skb);
-                orig_hdr = (struct ipv6hdr *) (hdr + 1);
-                rt6_pmtu_discovery(&orig_hdr->daddr, &orig_hdr->saddr, dev,
-                                   ntohl(hdr->icmp6_mtu));
 
                 /*
                  *      Drop through to notify
diff --git a/net/ipv6/inet6_connection_sock.c b/net/ipv6/inet6_connection_sock.c
index e6cee5292a0..bceb14450a1 100644
--- a/net/ipv6/inet6_connection_sock.c
+++ b/net/ipv6/inet6_connection_sock.c
@@ -55,26 +55,26 @@ int inet6_csk_bind_conflict(const struct sock *sk,
 EXPORT_SYMBOL_GPL(inet6_csk_bind_conflict);
 
 struct dst_entry *inet6_csk_route_req(struct sock *sk,
+                                      struct flowi6 *fl6,
                                       const struct request_sock *req)
 {
         struct inet6_request_sock *treq = inet6_rsk(req);
         struct ipv6_pinfo *np = inet6_sk(sk);
         struct in6_addr *final_p, final;
         struct dst_entry *dst;
-        struct flowi6 fl6;
-
-        memset(&fl6, 0, sizeof(fl6));
-        fl6.flowi6_proto = IPPROTO_TCP;
-        fl6.daddr = treq->rmt_addr;
-        final_p = fl6_update_dst(&fl6, np->opt, &final);
-        fl6.saddr = treq->loc_addr;
-        fl6.flowi6_oif = sk->sk_bound_dev_if;
-        fl6.flowi6_mark = sk->sk_mark;
-        fl6.fl6_dport = inet_rsk(req)->rmt_port;
-        fl6.fl6_sport = inet_rsk(req)->loc_port;
-        security_req_classify_flow(req, flowi6_to_flowi(&fl6));
 
-        dst = ip6_dst_lookup_flow(sk, &fl6, final_p, false);
+        memset(fl6, 0, sizeof(*fl6));
+        fl6->flowi6_proto = IPPROTO_TCP;
+        fl6->daddr = treq->rmt_addr;
+        final_p = fl6_update_dst(fl6, np->opt, &final);
+        fl6->saddr = treq->loc_addr;
+        fl6->flowi6_oif = treq->iif;
+        fl6->flowi6_mark = sk->sk_mark;
+        fl6->fl6_dport = inet_rsk(req)->rmt_port;
+        fl6->fl6_sport = inet_rsk(req)->loc_port;
+        security_req_classify_flow(req, flowi6_to_flowi(fl6));
+
+        dst = ip6_dst_lookup_flow(sk, fl6, final_p, false);
         if (IS_ERR(dst))
                 return NULL;
 
diff --git a/net/ipv6/ip6_fib.c b/net/ipv6/ip6_fib.c
index 60832766196..13690d650c3 100644
--- a/net/ipv6/ip6_fib.c
+++ b/net/ipv6/ip6_fib.c
@@ -197,6 +197,7 @@ static struct fib6_table *fib6_alloc_table(struct net *net, u32 id)
                 table->tb6_id = id;
                 table->tb6_root.leaf = net->ipv6.ip6_null_entry;
                 table->tb6_root.fn_flags = RTN_ROOT | RTN_TL_ROOT | RTN_RTINFO;
+                inet_peer_base_init(&table->tb6_peers);
         }
 
         return table;
@@ -1633,6 +1634,7 @@ static int __net_init fib6_net_init(struct net *net)
         net->ipv6.fib6_main_tbl->tb6_root.leaf = net->ipv6.ip6_null_entry;
         net->ipv6.fib6_main_tbl->tb6_root.fn_flags =
                 RTN_ROOT | RTN_TL_ROOT | RTN_RTINFO;
+        inet_peer_base_init(&net->ipv6.fib6_main_tbl->tb6_peers);
 
 #ifdef CONFIG_IPV6_MULTIPLE_TABLES
         net->ipv6.fib6_local_tbl = kzalloc(sizeof(*net->ipv6.fib6_local_tbl),
@@ -1643,6 +1645,7 @@ static int __net_init fib6_net_init(struct net *net)
         net->ipv6.fib6_local_tbl->tb6_root.leaf = net->ipv6.ip6_null_entry;
         net->ipv6.fib6_local_tbl->tb6_root.fn_flags =
                 RTN_ROOT | RTN_TL_ROOT | RTN_RTINFO;
+        inet_peer_base_init(&net->ipv6.fib6_local_tbl->tb6_peers);
 #endif
         fib6_tables_init(net);
 
@@ -1666,8 +1669,10 @@ static void fib6_net_exit(struct net *net)
         del_timer_sync(&net->ipv6.ip6_fib_timer);
 
 #ifdef CONFIG_IPV6_MULTIPLE_TABLES
+        inetpeer_invalidate_tree(&net->ipv6.fib6_local_tbl->tb6_peers);
         kfree(net->ipv6.fib6_local_tbl);
 #endif
+        inetpeer_invalidate_tree(&net->ipv6.fib6_main_tbl->tb6_peers);
         kfree(net->ipv6.fib6_main_tbl);
         kfree(net->ipv6.fib_table_hash);
         kfree(net->ipv6.rt6_stats);
diff --git a/net/ipv6/ip6_input.c b/net/ipv6/ip6_input.c
index 21a15dfe4a9..5ab923e51af 100644
--- a/net/ipv6/ip6_input.c
+++ b/net/ipv6/ip6_input.c
@@ -168,13 +168,12 @@ drop:
 
 static int ip6_input_finish(struct sk_buff *skb)
 {
+        struct net *net = dev_net(skb_dst(skb)->dev);
         const struct inet6_protocol *ipprot;
+        struct inet6_dev *idev;
         unsigned int nhoff;
         int nexthdr;
         bool raw;
-        u8 hash;
-        struct inet6_dev *idev;
-        struct net *net = dev_net(skb_dst(skb)->dev);
 
         /*
          *      Parse extension headers
@@ -189,9 +188,7 @@ resubmit:
         nexthdr = skb_network_header(skb)[nhoff];
 
         raw = raw6_local_deliver(skb, nexthdr);
-
-        hash = nexthdr & (MAX_INET_PROTOS - 1);
-        if ((ipprot = rcu_dereference(inet6_protos[hash])) != NULL) {
+        if ((ipprot = rcu_dereference(inet6_protos[nexthdr])) != NULL) {
                 int ret;
 
                 if (ipprot->flags & INET6_PROTO_FINAL) {
diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c
index decc21d19c5..5b2d63ed793 100644
--- a/net/ipv6/ip6_output.c
+++ b/net/ipv6/ip6_output.c
@@ -83,24 +83,12 @@ int ip6_local_out(struct sk_buff *skb)
 }
 EXPORT_SYMBOL_GPL(ip6_local_out);
 
-/* dev_loopback_xmit for use with netfilter. */
-static int ip6_dev_loopback_xmit(struct sk_buff *newskb)
-{
-        skb_reset_mac_header(newskb);
-        __skb_pull(newskb, skb_network_offset(newskb));
-        newskb->pkt_type = PACKET_LOOPBACK;
-        newskb->ip_summed = CHECKSUM_UNNECESSARY;
-        WARN_ON(!skb_dst(newskb));
-
-        netif_rx_ni(newskb);
-        return 0;
-}
-
 static int ip6_finish_output2(struct sk_buff *skb)
 {
         struct dst_entry *dst = skb_dst(skb);
         struct net_device *dev = dst->dev;
         struct neighbour *neigh;
+        struct rt6_info *rt;
 
         skb->protocol = htons(ETH_P_IPV6);
         skb->dev = dev;
@@ -121,7 +109,7 @@ static int ip6_finish_output2(struct sk_buff *skb)
                         if (newskb)
                                 NF_HOOK(NFPROTO_IPV6, NF_INET_POST_ROUTING,
                                         newskb, NULL, newskb->dev,
-                                        ip6_dev_loopback_xmit);
+                                        dev_loopback_xmit);
 
                         if (ipv6_hdr(skb)->hop_limit == 0) {
                                 IP6_INC_STATS(dev_net(dev), idev,
@@ -136,9 +124,10 @@ static int ip6_finish_output2(struct sk_buff *skb)
         }
 
         rcu_read_lock();
-        neigh = dst_get_neighbour_noref(dst);
+        rt = (struct rt6_info *) dst;
+        neigh = rt->n;
         if (neigh) {
-                int res = neigh_output(neigh, skb);
+                int res = dst_neigh_output(dst, neigh, skb);
 
                 rcu_read_unlock();
                 return res;
@@ -463,6 +452,7 @@ int ip6_forward(struct sk_buff *skb)
          */
         if (skb->dev == dst->dev && opt->srcrt == 0 && !skb_sec_path(skb)) {
                 struct in6_addr *target = NULL;
+                struct inet_peer *peer;
                 struct rt6_info *rt;
 
                 /*
@@ -476,14 +466,15 @@ int ip6_forward(struct sk_buff *skb)
                 else
                         target = &hdr->daddr;
 
-                if (!rt->rt6i_peer)
-                        rt6_bind_peer(rt, 1);
+                peer = inet_getpeer_v6(net->ipv6.peers, &rt->rt6i_dst.addr, 1);
 
                 /* Limit redirects both by destination (here)
                    and by source (inside ndisc_send_redirect)
                  */
-                if (inet_peer_xrlim_allow(rt->rt6i_peer, 1*HZ))
+                if (inet_peer_xrlim_allow(peer, 1*HZ))
                         ndisc_send_redirect(skb, target);
+                if (peer)
+                        inet_putpeer(peer);
         } else {
                 int addrtype = ipv6_addr_type(&hdr->saddr);
 
@@ -604,12 +595,13 @@ void ipv6_select_ident(struct frag_hdr *fhdr, struct rt6_info *rt)
 
         if (rt && !(rt->dst.flags & DST_NOPEER)) {
                 struct inet_peer *peer;
+                struct net *net;
 
-                if (!rt->rt6i_peer)
-                        rt6_bind_peer(rt, 1);
-                peer = rt->rt6i_peer;
+                net = dev_net(rt->dst.dev);
+                peer = inet_getpeer_v6(net->ipv6.peers, &rt->rt6i_dst.addr, 1);
                 if (peer) {
                         fhdr->identification = htonl(inet_getid(peer, 0));
+                        inet_putpeer(peer);
                         return;
                 }
         }
@@ -960,6 +952,7 @@ static int ip6_dst_lookup_tail(struct sock *sk,
         struct net *net = sock_net(sk);
 #ifdef CONFIG_IPV6_OPTIMISTIC_DAD
         struct neighbour *n;
+        struct rt6_info *rt;
 #endif
         int err;
 
@@ -988,7 +981,8 @@ static int ip6_dst_lookup_tail(struct sock *sk,
          * dst entry of the nexthop router
          */
         rcu_read_lock();
-        n = dst_get_neighbour_noref(*dst);
+        rt = (struct rt6_info *) *dst;
+        n = rt->n;
         if (n && !(n->nud_state & NUD_VALID)) {
                 struct inet6_ifaddr *ifp;
                 struct flowi6 fl_gw6;
diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c
index c9015fad8d6..6af3fcfdcbb 100644
--- a/net/ipv6/ip6_tunnel.c
+++ b/net/ipv6/ip6_tunnel.c
@@ -252,7 +252,7 @@ static void ip6_dev_free(struct net_device *dev)
 }
 
 /**
- * ip6_tnl_create() - create a new tunnel
+ * ip6_tnl_create - create a new tunnel
  *   @p: tunnel parameters
  *   @pt: pointer to new tunnel
  *
@@ -684,24 +684,50 @@ static void ip6ip6_dscp_ecn_decapsulate(const struct ip6_tnl *t,
                 IP6_ECN_set_ce(ipv6_hdr(skb));
 }
 
+static __u32 ip6_tnl_get_cap(struct ip6_tnl *t,
+                             const struct in6_addr *laddr,
+                             const struct in6_addr *raddr)
+{
+        struct ip6_tnl_parm *p = &t->parms;
+        int ltype = ipv6_addr_type(laddr);
+        int rtype = ipv6_addr_type(raddr);
+        __u32 flags = 0;
+
+        if (ltype == IPV6_ADDR_ANY || rtype == IPV6_ADDR_ANY) {
+                flags = IP6_TNL_F_CAP_PER_PACKET;
+        } else if (ltype & (IPV6_ADDR_UNICAST|IPV6_ADDR_MULTICAST) &&
+                   rtype & (IPV6_ADDR_UNICAST|IPV6_ADDR_MULTICAST) &&
+                   !((ltype|rtype) & IPV6_ADDR_LOOPBACK) &&
+                   (!((ltype|rtype) & IPV6_ADDR_LINKLOCAL) || p->link)) {
+                if (ltype&IPV6_ADDR_UNICAST)
+                        flags |= IP6_TNL_F_CAP_XMIT;
+                if (rtype&IPV6_ADDR_UNICAST)
+                        flags |= IP6_TNL_F_CAP_RCV;
+        }
+        return flags;
+}
+
 /* called with rcu_read_lock() */
-static inline int ip6_tnl_rcv_ctl(struct ip6_tnl *t)
+static inline int ip6_tnl_rcv_ctl(struct ip6_tnl *t,
+                                  const struct in6_addr *laddr,
+                                  const struct in6_addr *raddr)
 {
         struct ip6_tnl_parm *p = &t->parms;
         int ret = 0;
         struct net *net = dev_net(t->dev);
 
-        if (p->flags & IP6_TNL_F_CAP_RCV) {
+        if ((p->flags & IP6_TNL_F_CAP_RCV) ||
+            ((p->flags & IP6_TNL_F_CAP_PER_PACKET) &&
+             (ip6_tnl_get_cap(t, laddr, raddr) & IP6_TNL_F_CAP_RCV))) {
                 struct net_device *ldev = NULL;
 
                 if (p->link)
                         ldev = dev_get_by_index_rcu(net, p->link);
 
-                if ((ipv6_addr_is_multicast(&p->laddr) ||
-                     likely(ipv6_chk_addr(net, &p->laddr, ldev, 0))) &&
-                    likely(!ipv6_chk_addr(net, &p->raddr, NULL, 0)))
+                if ((ipv6_addr_is_multicast(laddr) ||
+                     likely(ipv6_chk_addr(net, laddr, ldev, 0))) &&
+                    likely(!ipv6_chk_addr(net, raddr, NULL, 0)))
                         ret = 1;
-
         }
         return ret;
 }
@@ -740,7 +766,7 @@ static int ip6_tnl_rcv(struct sk_buff *skb, __u16 protocol,
                         goto discard;
                 }
 
-                if (!ip6_tnl_rcv_ctl(t)) {
+                if (!ip6_tnl_rcv_ctl(t, &ipv6h->daddr, &ipv6h->saddr)) {
                         t->dev->stats.rx_dropped++;
                         rcu_read_unlock();
                         goto discard;
@@ -1114,25 +1140,6 @@ tx_err:
         return NETDEV_TX_OK;
 }
 
-static void ip6_tnl_set_cap(struct ip6_tnl *t)
-{
-        struct ip6_tnl_parm *p = &t->parms;
-        int ltype = ipv6_addr_type(&p->laddr);
-        int rtype = ipv6_addr_type(&p->raddr);
-
-        p->flags &= ~(IP6_TNL_F_CAP_XMIT|IP6_TNL_F_CAP_RCV);
-
-        if (ltype & (IPV6_ADDR_UNICAST|IPV6_ADDR_MULTICAST) &&
-            rtype & (IPV6_ADDR_UNICAST|IPV6_ADDR_MULTICAST) &&
-            !((ltype|rtype) & IPV6_ADDR_LOOPBACK) &&
-            (!((ltype|rtype) & IPV6_ADDR_LINKLOCAL) || p->link)) {
-                if (ltype&IPV6_ADDR_UNICAST)
-                        p->flags |= IP6_TNL_F_CAP_XMIT;
-                if (rtype&IPV6_ADDR_UNICAST)
-                        p->flags |= IP6_TNL_F_CAP_RCV;
-        }
-}
-
 static void ip6_tnl_link_config(struct ip6_tnl *t)
 {
         struct net_device *dev = t->dev;
@@ -1153,7 +1160,8 @@ static void ip6_tnl_link_config(struct ip6_tnl *t)
         if (!(p->flags&IP6_TNL_F_USE_ORIG_FLOWLABEL))
                 fl6->flowlabel |= IPV6_FLOWLABEL_MASK & p->flowinfo;
 
-        ip6_tnl_set_cap(t);
+        p->flags &= ~(IP6_TNL_F_CAP_XMIT|IP6_TNL_F_CAP_RCV|IP6_TNL_F_CAP_PER_PACKET);
+        p->flags |= ip6_tnl_get_cap(t, &p->laddr, &p->raddr);
 
         if (p->flags&IP6_TNL_F_CAP_XMIT && p->flags&IP6_TNL_F_CAP_RCV)
                 dev->flags |= IFF_POINTOPOINT;
@@ -1438,6 +1446,9 @@ static int __net_init ip6_fb_tnl_dev_init(struct net_device *dev)
 
         t->parms.proto = IPPROTO_IPV6;
         dev_hold(dev);
+
+        ip6_tnl_link_config(t);
+
         rcu_assign_pointer(ip6n->tnls_wc[0], t);
         return 0;
 }
diff --git a/net/ipv6/ip6mr.c b/net/ipv6/ip6mr.c
index 461e47c8e95..4532973f0dd 100644
--- a/net/ipv6/ip6mr.c
+++ b/net/ipv6/ip6mr.c
@@ -2104,8 +2104,9 @@ static int __ip6mr_fill_mroute(struct mr6_table *mrt, struct sk_buff *skb,
         if (c->mf6c_parent >= MAXMIFS)
                 return -ENOENT;
 
-        if (MIF_EXISTS(mrt, c->mf6c_parent))
-                RTA_PUT(skb, RTA_IIF, 4, &mrt->vif6_table[c->mf6c_parent].dev->ifindex);
+        if (MIF_EXISTS(mrt, c->mf6c_parent) &&
+            nla_put_u32(skb, RTA_IIF, mrt->vif6_table[c->mf6c_parent].dev->ifindex) < 0)
+                return -EMSGSIZE;
 
         mp_head = (struct rtattr *)skb_put(skb, RTA_LENGTH(0));
 
diff --git a/net/ipv6/ipcomp6.c b/net/ipv6/ipcomp6.c
index 5cb75bfe45b..92832385a8e 100644
--- a/net/ipv6/ipcomp6.c
+++ b/net/ipv6/ipcomp6.c
@@ -46,6 +46,7 @@
 #include <linux/list.h>
 #include <linux/vmalloc.h>
 #include <linux/rtnetlink.h>
+#include <net/ip6_route.h>
 #include <net/icmp.h>
 #include <net/ipv6.h>
 #include <net/protocol.h>
@@ -74,6 +75,7 @@ static void ipcomp6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
 
         pr_debug("pmtu discovery on SA IPCOMP/%08x/%pI6\n",
                  spi, &iph->daddr);
+        ip6_update_pmtu(skb, net, info, 0, 0);
         xfrm_state_put(x);
 }
 
diff --git a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c
index 54f62d3b8dd..0fddd571400 100644
--- a/net/ipv6/ndisc.c
+++ b/net/ipv6/ndisc.c
@@ -1472,6 +1472,7 @@ void ndisc_send_redirect(struct sk_buff *skb, const struct in6_addr *target)
         struct net *net = dev_net(dev);
         struct sock *sk = net->ipv6.ndisc_sk;
         int len = sizeof(struct icmp6hdr) + 2 * sizeof(struct in6_addr);
+        struct inet_peer *peer;
         struct sk_buff *buff;
         struct icmp6hdr *icmph;
         struct in6_addr saddr_buf;
@@ -1485,6 +1486,7 @@ void ndisc_send_redirect(struct sk_buff *skb, const struct in6_addr *target)
         int rd_len;
         int err;
         u8 ha_buf[MAX_ADDR_LEN], *ha = NULL;
+        bool ret;
 
         if (ipv6_get_lladdr(dev, &saddr_buf, IFA_F_TENTATIVE)) {
                 ND_PRINTK(2, warn, "Redirect: no link-local address on %s\n",
@@ -1518,9 +1520,11 @@ void ndisc_send_redirect(struct sk_buff *skb, const struct in6_addr *target)
                           "Redirect: destination is not a neighbour\n");
                 goto release;
         }
-        if (!rt->rt6i_peer)
-                rt6_bind_peer(rt, 1);
-        if (!inet_peer_xrlim_allow(rt->rt6i_peer, 1*HZ))
+        peer = inet_getpeer_v6(net->ipv6.peers, &rt->rt6i_dst.addr, 1);
+        ret = inet_peer_xrlim_allow(peer, 1*HZ);
+        if (peer)
+                inet_putpeer(peer);
+        if (!ret)
                 goto release;
 
         if (dev->addr_len) {
diff --git a/net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c b/net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c
index 3224ef90a21..4794f96cf2e 100644
--- a/net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c
+++ b/net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c
@@ -143,11 +143,11 @@ static int ipv6_get_l4proto(const struct sk_buff *skb, unsigned int nhoff,
         return NF_ACCEPT;
 }
 
-static unsigned int ipv6_confirm(unsigned int hooknum,
-                                 struct sk_buff *skb,
-                                 const struct net_device *in,
-                                 const struct net_device *out,
-                                 int (*okfn)(struct sk_buff *))
+static unsigned int ipv6_helper(unsigned int hooknum,
+                                struct sk_buff *skb,
+                                const struct net_device *in,
+                                const struct net_device *out,
+                                int (*okfn)(struct sk_buff *))
 {
         struct nf_conn *ct;
         const struct nf_conn_help *help;
@@ -161,15 +161,15 @@ static unsigned int ipv6_confirm(unsigned int hooknum,
         /* This is where we call the helper: as the packet goes out. */
         ct = nf_ct_get(skb, &ctinfo);
         if (!ct || ctinfo == IP_CT_RELATED_REPLY)
-                goto out;
+                return NF_ACCEPT;
 
         help = nfct_help(ct);
         if (!help)
-                goto out;
+                return NF_ACCEPT;
         /* rcu_read_lock()ed by nf_hook_slow */
         helper = rcu_dereference(help->helper);
         if (!helper)
-                goto out;
+                return NF_ACCEPT;
 
         protoff = nf_ct_ipv6_skip_exthdr(skb, extoff, &pnum,
                                          skb->len - extoff);
@@ -179,12 +179,19 @@ static unsigned int ipv6_confirm(unsigned int hooknum,
         }
 
         ret = helper->help(skb, protoff, ct, ctinfo);
-        if (ret != NF_ACCEPT) {
+        if (ret != NF_ACCEPT && (ret & NF_VERDICT_MASK) != NF_QUEUE) {
                 nf_log_packet(NFPROTO_IPV6, hooknum, skb, in, out, NULL,
                               "nf_ct_%s: dropping packet", helper->name);
-                return ret;
         }
-out:
+        return ret;
+}
+
+static unsigned int ipv6_confirm(unsigned int hooknum,
+                                 struct sk_buff *skb,
+                                 const struct net_device *in,
+                                 const struct net_device *out,
+                                 int (*okfn)(struct sk_buff *))
+{
         /* We've seen it coming out the other side: confirm it */
         return nf_conntrack_confirm(skb);
 }
@@ -254,6 +261,13 @@ static struct nf_hook_ops ipv6_conntrack_ops[] __read_mostly = {
                 .priority       = NF_IP6_PRI_CONNTRACK,
         },
         {
+                .hook           = ipv6_helper,
+                .owner          = THIS_MODULE,
+                .pf             = NFPROTO_IPV6,
+                .hooknum        = NF_INET_POST_ROUTING,
+                .priority       = NF_IP6_PRI_CONNTRACK_HELPER,
+        },
+        {
                 .hook           = ipv6_confirm,
                 .owner          = THIS_MODULE,
                 .pf             = NFPROTO_IPV6,
@@ -261,6 +275,13 @@ static struct nf_hook_ops ipv6_conntrack_ops[] __read_mostly = {
                 .priority       = NF_IP6_PRI_LAST,
         },
         {
+                .hook           = ipv6_helper,
+                .owner          = THIS_MODULE,
+                .pf             = NFPROTO_IPV6,
+                .hooknum        = NF_INET_LOCAL_IN,
+                .priority       = NF_IP6_PRI_CONNTRACK_HELPER,
+        },
+        {
                 .hook           = ipv6_confirm,
                 .owner          = THIS_MODULE,
                 .pf             = NFPROTO_IPV6,
@@ -333,37 +354,75 @@ MODULE_ALIAS("nf_conntrack-" __stringify(AF_INET6));
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Yasuyuki KOZAKAI @USAGI <yasuyuki.kozakai@toshiba.co.jp>");
 
-static int __init nf_conntrack_l3proto_ipv6_init(void)
+static int ipv6_net_init(struct net *net)
 {
         int ret = 0;
 
-        need_conntrack();
-        nf_defrag_ipv6_enable();
-
-        ret = nf_conntrack_l4proto_register(&nf_conntrack_l4proto_tcp6);
+        ret = nf_conntrack_l4proto_register(net,
+                                            &nf_conntrack_l4proto_tcp6);
         if (ret < 0) {
-                pr_err("nf_conntrack_ipv6: can't register tcp.\n");
-                return ret;
+                printk(KERN_ERR "nf_conntrack_l4proto_tcp6: protocol register failed\n");
+                goto out;
         }
-
-        ret = nf_conntrack_l4proto_register(&nf_conntrack_l4proto_udp6);
+        ret = nf_conntrack_l4proto_register(net,
+                                            &nf_conntrack_l4proto_udp6);
         if (ret < 0) {
-                pr_err("nf_conntrack_ipv6: can't register udp.\n");
-                goto cleanup_tcp;
+                printk(KERN_ERR "nf_conntrack_l4proto_udp6: protocol register failed\n");
+                goto cleanup_tcp6;
         }
-
-        ret = nf_conntrack_l4proto_register(&nf_conntrack_l4proto_icmpv6);
+        ret = nf_conntrack_l4proto_register(net,
+                                            &nf_conntrack_l4proto_icmpv6);
         if (ret < 0) {
-                pr_err("nf_conntrack_ipv6: can't register icmpv6.\n");
-                goto cleanup_udp;
+                printk(KERN_ERR "nf_conntrack_l4proto_icmp6: protocol register failed\n");
+                goto cleanup_udp6;
         }
-
-        ret = nf_conntrack_l3proto_register(&nf_conntrack_l3proto_ipv6);
+        ret = nf_conntrack_l3proto_register(net,
+                                            &nf_conntrack_l3proto_ipv6);
         if (ret < 0) {
-                pr_err("nf_conntrack_ipv6: can't register ipv6\n");
+                printk(KERN_ERR "nf_conntrack_l3proto_ipv6: protocol register failed\n");
                 goto cleanup_icmpv6;
         }
+        return 0;
+ cleanup_icmpv6:
+        nf_conntrack_l4proto_unregister(net,
+                                        &nf_conntrack_l4proto_icmpv6);
+ cleanup_udp6:
+        nf_conntrack_l4proto_unregister(net,
+                                        &nf_conntrack_l4proto_udp6);
+ cleanup_tcp6:
+        nf_conntrack_l4proto_unregister(net,
+                                        &nf_conntrack_l4proto_tcp6);
+ out:
+        return ret;
+}
 
+static void ipv6_net_exit(struct net *net)
+{
+        nf_conntrack_l3proto_unregister(net,
+                                        &nf_conntrack_l3proto_ipv6);
+        nf_conntrack_l4proto_unregister(net,
+                                        &nf_conntrack_l4proto_icmpv6);
+        nf_conntrack_l4proto_unregister(net,
+                                        &nf_conntrack_l4proto_udp6);
+        nf_conntrack_l4proto_unregister(net,
+                                        &nf_conntrack_l4proto_tcp6);
+}
+
+static struct pernet_operations ipv6_net_ops = {
+        .init = ipv6_net_init,
+        .exit = ipv6_net_exit,
+};
+
+static int __init nf_conntrack_l3proto_ipv6_init(void)
+{
+        int ret = 0;
+
+        need_conntrack();
+        nf_defrag_ipv6_enable();
+
+        ret = register_pernet_subsys(&ipv6_net_ops);
+        if (ret < 0)
+                goto cleanup_pernet;
         ret = nf_register_hooks(ipv6_conntrack_ops,
                                 ARRAY_SIZE(ipv6_conntrack_ops));
         if (ret < 0) {
@@ -374,13 +433,8 @@ static int __init nf_conntrack_l3proto_ipv6_init(void)
         return ret;
 
  cleanup_ipv6:
-        nf_conntrack_l3proto_unregister(&nf_conntrack_l3proto_ipv6);
- cleanup_icmpv6:
-        nf_conntrack_l4proto_unregister(&nf_conntrack_l4proto_icmpv6);
- cleanup_udp:
-        nf_conntrack_l4proto_unregister(&nf_conntrack_l4proto_udp6);
- cleanup_tcp:
-        nf_conntrack_l4proto_unregister(&nf_conntrack_l4proto_tcp6);
+        unregister_pernet_subsys(&ipv6_net_ops);
+ cleanup_pernet:
         return ret;
 }
 
@@ -388,10 +442,7 @@ static void __exit nf_conntrack_l3proto_ipv6_fini(void)
 {
         synchronize_net();
         nf_unregister_hooks(ipv6_conntrack_ops, ARRAY_SIZE(ipv6_conntrack_ops));
-        nf_conntrack_l3proto_unregister(&nf_conntrack_l3proto_ipv6);
-        nf_conntrack_l4proto_unregister(&nf_conntrack_l4proto_icmpv6);
-        nf_conntrack_l4proto_unregister(&nf_conntrack_l4proto_udp6);
-        nf_conntrack_l4proto_unregister(&nf_conntrack_l4proto_tcp6);
+        unregister_pernet_subsys(&ipv6_net_ops);
 }
 
 module_init(nf_conntrack_l3proto_ipv6_init);
diff --git a/net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c b/net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c
index 3e81904fbbc..2d54b2061d6 100644
--- a/net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c
+++ b/net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c
@@ -29,6 +29,11 @@
 
 static unsigned int nf_ct_icmpv6_timeout __read_mostly = 30*HZ;
 
+static inline struct nf_icmp_net *icmpv6_pernet(struct net *net)
+{
+        return &net->ct.nf_ct_proto.icmpv6;
+}
+
 static bool icmpv6_pkt_to_tuple(const struct sk_buff *skb,
                                 unsigned int dataoff,
                                 struct nf_conntrack_tuple *tuple)
@@ -90,7 +95,7 @@ static int icmpv6_print_tuple(struct seq_file *s,
 
 static unsigned int *icmpv6_get_timeouts(struct net *net)
 {
-        return &nf_ct_icmpv6_timeout;
+        return &icmpv6_pernet(net)->timeout;
 }
 
 /* Returns verdict for packet, or -1 for invalid. */
@@ -281,16 +286,18 @@ static int icmpv6_nlattr_tuple_size(void)
 #include <linux/netfilter/nfnetlink.h>
 #include <linux/netfilter/nfnetlink_cttimeout.h>
 
-static int icmpv6_timeout_nlattr_to_obj(struct nlattr *tb[], void *data)
+static int icmpv6_timeout_nlattr_to_obj(struct nlattr *tb[],
+                                        struct net *net, void *data)
 {
         unsigned int *timeout = data;
+        struct nf_icmp_net *in = icmpv6_pernet(net);
 
         if (tb[CTA_TIMEOUT_ICMPV6_TIMEOUT]) {
                 *timeout =
                     ntohl(nla_get_be32(tb[CTA_TIMEOUT_ICMPV6_TIMEOUT])) * HZ;
         } else {
                 /* Set default ICMPv6 timeout. */
-                *timeout = nf_ct_icmpv6_timeout;
+                *timeout = in->timeout;
         }
         return 0;
 }
@@ -315,11 +322,9 @@ icmpv6_timeout_nla_policy[CTA_TIMEOUT_ICMPV6_MAX+1] = {
 #endif /* CONFIG_NF_CT_NETLINK_TIMEOUT */
 
 #ifdef CONFIG_SYSCTL
-static struct ctl_table_header *icmpv6_sysctl_header;
 static struct ctl_table icmpv6_sysctl_table[] = {
         {
                 .procname       = "nf_conntrack_icmpv6_timeout",
-                .data           = &nf_ct_icmpv6_timeout,
                 .maxlen         = sizeof(unsigned int),
                 .mode           = 0644,
                 .proc_handler   = proc_dointvec_jiffies,
@@ -328,6 +333,36 @@ static struct ctl_table icmpv6_sysctl_table[] = {
 };
 #endif /* CONFIG_SYSCTL */
 
+static int icmpv6_kmemdup_sysctl_table(struct nf_proto_net *pn,
+                                       struct nf_icmp_net *in)
+{
+#ifdef CONFIG_SYSCTL
+        pn->ctl_table = kmemdup(icmpv6_sysctl_table,
+                                sizeof(icmpv6_sysctl_table),
+                                GFP_KERNEL);
+        if (!pn->ctl_table)
+                return -ENOMEM;
+
+        pn->ctl_table[0].data = &in->timeout;
+#endif
+        return 0;
+}
+
+static int icmpv6_init_net(struct net *net, u_int16_t proto)
+{
+        struct nf_icmp_net *in = icmpv6_pernet(net);
+        struct nf_proto_net *pn = &in->pn;
+
+        in->timeout = nf_ct_icmpv6_timeout;
+
+        return icmpv6_kmemdup_sysctl_table(pn, in);
+}
+
+static struct nf_proto_net *icmpv6_get_net_proto(struct net *net)
+{
+        return &net->ct.nf_ct_proto.icmpv6.pn;
+}
+
 struct nf_conntrack_l4proto nf_conntrack_l4proto_icmpv6 __read_mostly =
 {
         .l3proto                = PF_INET6,
@@ -355,8 +390,6 @@ struct nf_conntrack_l4proto nf_conntrack_l4proto_icmpv6 __read_mostly =
                 .nla_policy     = icmpv6_timeout_nla_policy,
         },
 #endif /* CONFIG_NF_CT_NETLINK_TIMEOUT */
-#ifdef CONFIG_SYSCTL
-        .ctl_table_header       = &icmpv6_sysctl_header,
-        .ctl_table              = icmpv6_sysctl_table,
-#endif
+        .init_net               = icmpv6_init_net,
+        .get_net_proto          = icmpv6_get_net_proto,
 };
diff --git a/net/ipv6/protocol.c b/net/ipv6/protocol.c
index 9a7978fdc02..053082dfc93 100644
--- a/net/ipv6/protocol.c
+++ b/net/ipv6/protocol.c
@@ -29,9 +29,7 @@ const struct inet6_protocol __rcu *inet6_protos[MAX_INET_PROTOS] __read_mostly;
 
 int inet6_add_protocol(const struct inet6_protocol *prot, unsigned char protocol)
 {
-        int hash = protocol & (MAX_INET_PROTOS - 1);
-
-        return !cmpxchg((const struct inet6_protocol **)&inet6_protos[hash],
+        return !cmpxchg((const struct inet6_protocol **)&inet6_protos[protocol],
                         NULL, prot) ? 0 : -1;
 }
 EXPORT_SYMBOL(inet6_add_protocol);
@@ -42,9 +40,9 @@ EXPORT_SYMBOL(inet6_add_protocol);
 
 int inet6_del_protocol(const struct inet6_protocol *prot, unsigned char protocol)
 {
-        int ret, hash = protocol & (MAX_INET_PROTOS - 1);
+        int ret;
 
-        ret = (cmpxchg((const struct inet6_protocol **)&inet6_protos[hash],
+        ret = (cmpxchg((const struct inet6_protocol **)&inet6_protos[protocol],
                        prot, NULL) == prot) ? 0 : -1;
 
         synchronize_net();
diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c
index 93d69836fde..b5c1dcb2773 100644
--- a/net/ipv6/raw.c
+++ b/net/ipv6/raw.c
@@ -165,7 +165,7 @@ static bool ipv6_raw_deliver(struct sk_buff *skb, int nexthdr)
         saddr = &ipv6_hdr(skb)->saddr;
         daddr = saddr + 1;
 
-        hash = nexthdr & (MAX_INET_PROTOS - 1);
+        hash = nexthdr & (RAW_HTABLE_SIZE - 1);
 
         read_lock(&raw_v6_hashinfo.lock);
         sk = sk_head(&raw_v6_hashinfo.ht[hash]);
@@ -229,7 +229,7 @@ bool raw6_local_deliver(struct sk_buff *skb, int nexthdr)
 {
         struct sock *raw_sk;
 
-        raw_sk = sk_head(&raw_v6_hashinfo.ht[nexthdr & (MAX_INET_PROTOS - 1)]);
+        raw_sk = sk_head(&raw_v6_hashinfo.ht[nexthdr & (RAW_HTABLE_SIZE - 1)]);
         if (raw_sk && !ipv6_raw_deliver(skb, nexthdr))
                 raw_sk = NULL;
 
@@ -328,9 +328,10 @@ static void rawv6_err(struct sock *sk, struct sk_buff *skb,
                 return;
 
         harderr = icmpv6_err_convert(type, code, &err);
-        if (type == ICMPV6_PKT_TOOBIG)
+        if (type == ICMPV6_PKT_TOOBIG) {
+                ip6_sk_update_pmtu(skb, sk, info);
                 harderr = (np->pmtudisc == IPV6_PMTUDISC_DO);
-
+        }
         if (np->recverr) {
                 u8 *payload = skb->data;
                 if (!inet->hdrincl)
diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index becb048d18d..563f12c1c99 100644
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -99,10 +99,7 @@ static u32 *ipv6_cow_metrics(struct dst_entry *dst, unsigned long old)
         if (!(rt->dst.flags & DST_HOST))
                 return NULL;
 
-        if (!rt->rt6i_peer)
-                rt6_bind_peer(rt, 1);
-
-        peer = rt->rt6i_peer;
+        peer = rt6_get_peer_create(rt);
         if (peer) {
                 u32 *old_p = __DST_METRICS_PTR(old);
                 unsigned long prev, new;
@@ -123,21 +120,27 @@ static u32 *ipv6_cow_metrics(struct dst_entry *dst, unsigned long old)
         return p;
 }
 
-static inline const void *choose_neigh_daddr(struct rt6_info *rt, const void *daddr)
+static inline const void *choose_neigh_daddr(struct rt6_info *rt,
+                                             struct sk_buff *skb,
+                                             const void *daddr)
 {
         struct in6_addr *p = &rt->rt6i_gateway;
 
         if (!ipv6_addr_any(p))
                 return (const void *) p;
+        else if (skb)
+                return &ipv6_hdr(skb)->daddr;
         return daddr;
 }
 
-static struct neighbour *ip6_neigh_lookup(const struct dst_entry *dst, const void *daddr)
+static struct neighbour *ip6_neigh_lookup(const struct dst_entry *dst,
+                                          struct sk_buff *skb,
+                                          const void *daddr)
 {
         struct rt6_info *rt = (struct rt6_info *) dst;
         struct neighbour *n;
 
-        daddr = choose_neigh_daddr(rt, daddr);
+        daddr = choose_neigh_daddr(rt, skb, daddr);
         n = __ipv6_neigh_lookup(&nd_tbl, dst->dev, daddr);
         if (n)
                 return n;
@@ -152,7 +155,7 @@ static int rt6_bind_neighbour(struct rt6_info *rt, struct net_device *dev)
                 if (IS_ERR(n))
                         return PTR_ERR(n);
         }
-        dst_set_neighbour(&rt->dst, n);
+        rt->n = n;
 
         return 0;
 }
@@ -261,16 +264,19 @@ static struct rt6_info ip6_blk_hole_entry_template = {
 #endif
 
 /* allocate dst with ip6_dst_ops */
-static inline struct rt6_info *ip6_dst_alloc(struct dst_ops *ops,
+static inline struct rt6_info *ip6_dst_alloc(struct net *net,
                                              struct net_device *dev,
-                                             int flags)
+                                             int flags,
+                                             struct fib6_table *table)
 {
-        struct rt6_info *rt = dst_alloc(ops, dev, 0, 0, flags);
+        struct rt6_info *rt = dst_alloc(&net->ipv6.ip6_dst_ops, dev,
+                                        0, 0, flags);
 
-        if (rt)
-                memset(&rt->rt6i_table, 0,
+        if (rt) {
+                memset(&rt->n, 0,
                        sizeof(*rt) - sizeof(struct dst_entry));
-
+                rt6_init_peer(rt, table ? &table->tb6_peers : net->ipv6.peers);
+        }
         return rt;
 }
 
@@ -278,7 +284,9 @@ static void ip6_dst_destroy(struct dst_entry *dst)
 {
         struct rt6_info *rt = (struct rt6_info *)dst;
         struct inet6_dev *idev = rt->rt6i_idev;
-        struct inet_peer *peer = rt->rt6i_peer;
+
+        if (rt->n)
+                neigh_release(rt->n);
 
         if (!(rt->dst.flags & DST_HOST))
                 dst_destroy_metrics_generic(dst);
@@ -291,8 +299,8 @@ static void ip6_dst_destroy(struct dst_entry *dst)
         if (!(rt->rt6i_flags & RTF_EXPIRES) && dst->from)
                 dst_release(dst->from);
 
-        if (peer) {
-                rt->rt6i_peer = NULL;
+        if (rt6_has_peer(rt)) {
+                struct inet_peer *peer = rt6_peer_ptr(rt);
                 inet_putpeer(peer);
         }
 }
@@ -306,13 +314,20 @@ static u32 rt6_peer_genid(void)
 
 void rt6_bind_peer(struct rt6_info *rt, int create)
 {
+        struct inet_peer_base *base;
         struct inet_peer *peer;
 
-        peer = inet_getpeer_v6(&rt->rt6i_dst.addr, create);
-        if (peer && cmpxchg(&rt->rt6i_peer, NULL, peer) != NULL)
-                inet_putpeer(peer);
-        else
-                rt->rt6i_peer_genid = rt6_peer_genid();
+        base = inetpeer_base_ptr(rt->_rt6i_peer);
+        if (!base)
+                return;
+
+        peer = inet_getpeer_v6(base, &rt->rt6i_dst.addr, create);
+        if (peer) {
+                if (!rt6_set_peer(rt, peer))
+                        inet_putpeer(peer);
+                else
+                        rt->rt6i_peer_genid = rt6_peer_genid();
+        }
 }
 
 static void ip6_dst_ifdown(struct dst_entry *dst, struct net_device *dev,
@@ -323,12 +338,19 @@ static void ip6_dst_ifdown(struct dst_entry *dst, struct net_device *dev,
         struct net_device *loopback_dev =
                 dev_net(dev)->loopback_dev;
 
-        if (dev != loopback_dev && idev && idev->dev == dev) {
-                struct inet6_dev *loopback_idev =
-                        in6_dev_get(loopback_dev);
-                if (loopback_idev) {
-                        rt->rt6i_idev = loopback_idev;
-                        in6_dev_put(idev);
+        if (dev != loopback_dev) {
+                if (idev && idev->dev == dev) {
+                        struct inet6_dev *loopback_idev =
+                                in6_dev_get(loopback_dev);
+                        if (loopback_idev) {
+                                rt->rt6i_idev = loopback_idev;
+                                in6_dev_put(idev);
+                        }
+                }
+                if (rt->n && rt->n->dev == dev) {
+                        rt->n->dev = loopback_dev;
+                        dev_hold(loopback_dev);
+                        dev_put(dev);
                 }
         }
 }
@@ -418,7 +440,7 @@ static void rt6_probe(struct rt6_info *rt)
          * to no more than one per minute.
          */
         rcu_read_lock();
-        neigh = rt ? dst_get_neighbour_noref(&rt->dst) : NULL;
+        neigh = rt ? rt->n : NULL;
         if (!neigh || (neigh->nud_state & NUD_VALID))
                 goto out;
         read_lock_bh(&neigh->lock);
@@ -465,7 +487,7 @@ static inline int rt6_check_neigh(struct rt6_info *rt)
         int m;
 
         rcu_read_lock();
-        neigh = dst_get_neighbour_noref(&rt->dst);
+        neigh = rt->n;
         if (rt->rt6i_flags & RTF_NONEXTHOP ||
             !(rt->rt6i_flags & RTF_GATEWAY))
                 m = 1;
@@ -812,7 +834,7 @@ static struct rt6_info *rt6_alloc_clone(struct rt6_info *ort,
 
         if (rt) {
                 rt->rt6i_flags |= RTF_CACHE;
-                dst_set_neighbour(&rt->dst, neigh_clone(dst_get_neighbour_noref_raw(&ort->dst)));
+                rt->n = neigh_clone(ort->n);
         }
         return rt;
 }
@@ -846,7 +868,7 @@ restart:
         dst_hold(&rt->dst);
         read_unlock_bh(&table->tb6_lock);
 
-        if (!dst_get_neighbour_noref_raw(&rt->dst) && !(rt->rt6i_flags & RTF_NONEXTHOP))
+        if (!rt->n && !(rt->rt6i_flags & RTF_NONEXTHOP))
                 nrt = rt6_alloc_cow(rt, &fl6->daddr, &fl6->saddr);
         else if (!(rt->dst.flags & DST_HOST))
                 nrt = rt6_alloc_clone(rt, &fl6->daddr);
@@ -931,6 +953,8 @@ struct dst_entry * ip6_route_output(struct net *net, const struct sock *sk,
 {
         int flags = 0;
 
+        fl6->flowi6_iif = net->loopback_dev->ifindex;
+
         if ((sk && sk->sk_bound_dev_if) || rt6_need_strict(&fl6->daddr))
                 flags |= RT6_LOOKUP_F_IFACE;
 
@@ -952,6 +976,7 @@ struct dst_entry *ip6_blackhole_route(struct net *net, struct dst_entry *dst_ori
         rt = dst_alloc(&ip6_dst_blackhole_ops, ort->dst.dev, 1, 0, 0);
         if (rt) {
                 memset(&rt->rt6i_table, 0, sizeof(*rt) - sizeof(struct dst_entry));
+                rt6_init_peer(rt, net->ipv6.peers);
 
                 new = &rt->dst;
 
@@ -996,7 +1021,7 @@ static struct dst_entry *ip6_dst_check(struct dst_entry *dst, u32 cookie)
 
         if (rt->rt6i_node && (rt->rt6i_node->fn_sernum == cookie)) {
                 if (rt->rt6i_peer_genid != rt6_peer_genid()) {
-                        if (!rt->rt6i_peer)
+                        if (!rt6_has_peer(rt))
                                 rt6_bind_peer(rt, 0);
                         rt->rt6i_peer_genid = rt6_peer_genid();
                 }
@@ -1042,7 +1067,10 @@ static void ip6_rt_update_pmtu(struct dst_entry *dst, u32 mtu)
 {
         struct rt6_info *rt6 = (struct rt6_info*)dst;
 
+        dst_confirm(dst);
         if (mtu < dst_mtu(dst) && rt6->rt6i_dst.plen == 128) {
+                struct net *net = dev_net(dst->dev);
+
                 rt6->rt6i_flags |= RTF_MODIFIED;
                 if (mtu < IPV6_MIN_MTU) {
                         u32 features = dst_metric(dst, RTAX_FEATURES);
@@ -1051,9 +1079,39 @@ static void ip6_rt_update_pmtu(struct dst_entry *dst, u32 mtu)
                         dst_metric_set(dst, RTAX_FEATURES, features);
                 }
                 dst_metric_set(dst, RTAX_MTU, mtu);
+                rt6_update_expires(rt6, net->ipv6.sysctl.ip6_rt_mtu_expires);
         }
 }
 
+void ip6_update_pmtu(struct sk_buff *skb, struct net *net, __be32 mtu,
+                     int oif, u32 mark)
+{
+        const struct ipv6hdr *iph = (struct ipv6hdr *) skb->data;
+        struct dst_entry *dst;
+        struct flowi6 fl6;
+
+        memset(&fl6, 0, sizeof(fl6));
+        fl6.flowi6_oif = oif;
+        fl6.flowi6_mark = mark;
+        fl6.flowi6_flags = 0;
+        fl6.daddr = iph->daddr;
+        fl6.saddr = iph->saddr;
+        fl6.flowlabel = (*(__be32 *) iph) & IPV6_FLOWINFO_MASK;
+
+        dst = ip6_route_output(net, NULL, &fl6);
+        if (!dst->error)
+                ip6_rt_update_pmtu(dst, ntohl(mtu));
+        dst_release(dst);
+}
+EXPORT_SYMBOL_GPL(ip6_update_pmtu);
+
+void ip6_sk_update_pmtu(struct sk_buff *skb, struct sock *sk, __be32 mtu)
+{
+        ip6_update_pmtu(skb, sock_net(sk), mtu,
+                        sk->sk_bound_dev_if, sk->sk_mark);
+}
+EXPORT_SYMBOL_GPL(ip6_sk_update_pmtu);
+
 static unsigned int ip6_default_advmss(const struct dst_entry *dst)
 {
         struct net_device *dev = dst->dev;
@@ -1110,7 +1168,7 @@ struct dst_entry *icmp6_dst_alloc(struct net_device *dev,
         if (unlikely(!idev))
                 return ERR_PTR(-ENODEV);
 
-        rt = ip6_dst_alloc(&net->ipv6.ip6_dst_ops, dev, 0);
+        rt = ip6_dst_alloc(net, dev, 0, NULL);
         if (unlikely(!rt)) {
                 in6_dev_put(idev);
                 dst = ERR_PTR(-ENOMEM);
@@ -1120,7 +1178,7 @@ struct dst_entry *icmp6_dst_alloc(struct net_device *dev,
         if (neigh)
                 neigh_hold(neigh);
         else {
-                neigh = ip6_neigh_lookup(&rt->dst, &fl6->daddr);
+                neigh = ip6_neigh_lookup(&rt->dst, NULL, &fl6->daddr);
                 if (IS_ERR(neigh)) {
                         in6_dev_put(idev);
                         dst_free(&rt->dst);
@@ -1130,7 +1188,7 @@ struct dst_entry *icmp6_dst_alloc(struct net_device *dev,
 
         rt->dst.flags |= DST_HOST;
         rt->dst.output  = ip6_output;
-        dst_set_neighbour(&rt->dst, neigh);
+        rt->n = neigh;
         atomic_set(&rt->dst.__refcnt, 1);
         rt->rt6i_dst.addr = fl6->daddr;
         rt->rt6i_dst.plen = 128;
@@ -1292,7 +1350,7 @@ int ip6_route_add(struct fib6_config *cfg)
         if (!table)
                 goto out;
 
-        rt = ip6_dst_alloc(&net->ipv6.ip6_dst_ops, NULL, DST_NOCOUNT);
+        rt = ip6_dst_alloc(net, NULL, DST_NOCOUNT, table);
 
         if (!rt) {
                 err = -ENOMEM;
@@ -1639,6 +1697,7 @@ void rt6_redirect(const struct in6_addr *dest, const struct in6_addr *src,
         struct rt6_info *rt, *nrt = NULL;
         struct netevent_redirect netevent;
         struct net *net = dev_net(neigh->dev);
+        struct neighbour *old_neigh;
 
         rt = ip6_route_redirect(dest, src, saddr, neigh->dev);
 
@@ -1666,7 +1725,8 @@ void rt6_redirect(const struct in6_addr *dest, const struct in6_addr *src,
         dst_confirm(&rt->dst);
 
         /* Duplicate redirect: silently ignore. */
-        if (neigh == dst_get_neighbour_noref_raw(&rt->dst))
+        old_neigh = rt->n;
+        if (neigh == old_neigh)
                 goto out;
 
         nrt = ip6_rt_copy(rt, dest);
@@ -1678,13 +1738,16 @@ void rt6_redirect(const struct in6_addr *dest, const struct in6_addr *src,
                 nrt->rt6i_flags &= ~RTF_GATEWAY;
 
         nrt->rt6i_gateway = *(struct in6_addr *)neigh->primary_key;
-        dst_set_neighbour(&nrt->dst, neigh_clone(neigh));
+        nrt->n = neigh_clone(neigh);
 
         if (ip6_ins_rt(nrt))
                 goto out;
 
         netevent.old = &rt->dst;
+        netevent.old_neigh = old_neigh;
         netevent.new = &nrt->dst;
+        netevent.new_neigh = neigh;
+        netevent.daddr = dest;
         call_netevent_notifiers(NETEVENT_REDIRECT, &netevent);
 
         if (rt->rt6i_flags & RTF_CACHE) {
@@ -1697,116 +1760,6 @@ out:
 }
 
 /*
- *      Handle ICMP "packet too big" messages
- *      i.e. Path MTU discovery
- */
-
-static void rt6_do_pmtu_disc(const struct in6_addr *daddr, const struct in6_addr *saddr,
-                             struct net *net, u32 pmtu, int ifindex)
-{
-        struct rt6_info *rt, *nrt;
-        int allfrag = 0;
-again:
-        rt = rt6_lookup(net, daddr, saddr, ifindex, 0);
-        if (!rt)
-                return;
-
-        if (rt6_check_expired(rt)) {
-                ip6_del_rt(rt);
-                goto again;
-        }
-
-        if (pmtu >= dst_mtu(&rt->dst))
-                goto out;
-
-        if (pmtu < IPV6_MIN_MTU) {
-                /*
-                 * According to RFC2460, PMTU is set to the IPv6 Minimum Link
-                 * MTU (1280) and a fragment header should always be included
-                 * after a node receiving Too Big message reporting PMTU is
-                 * less than the IPv6 Minimum Link MTU.
-                 */
-                pmtu = IPV6_MIN_MTU;
-                allfrag = 1;
-        }
-
-        /* New mtu received -> path was valid.
-           They are sent only in response to data packets,
-           so that this nexthop apparently is reachable. --ANK
-         */
-        dst_confirm(&rt->dst);
-
-        /* Host route. If it is static, it would be better
-           not to override it, but add new one, so that
-           when cache entry will expire old pmtu
-           would return automatically.
-         */
-        if (rt->rt6i_flags & RTF_CACHE) {
-                dst_metric_set(&rt->dst, RTAX_MTU, pmtu);
-                if (allfrag) {
-                        u32 features = dst_metric(&rt->dst, RTAX_FEATURES);
-                        features |= RTAX_FEATURE_ALLFRAG;
-                        dst_metric_set(&rt->dst, RTAX_FEATURES, features);
-                }
-                rt6_update_expires(rt, net->ipv6.sysctl.ip6_rt_mtu_expires);
-                rt->rt6i_flags |= RTF_MODIFIED;
-                goto out;
-        }
-
-        /* Network route.
-           Two cases are possible:
-           1. It is connected route. Action: COW
-           2. It is gatewayed route or NONEXTHOP route. Action: clone it.
-         */
-        if (!dst_get_neighbour_noref_raw(&rt->dst) && !(rt->rt6i_flags & RTF_NONEXTHOP))
-                nrt = rt6_alloc_cow(rt, daddr, saddr);
-        else
-                nrt = rt6_alloc_clone(rt, daddr);
-
-        if (nrt) {
-                dst_metric_set(&nrt->dst, RTAX_MTU, pmtu);
-                if (allfrag) {
-                        u32 features = dst_metric(&nrt->dst, RTAX_FEATURES);
-                        features |= RTAX_FEATURE_ALLFRAG;
-                        dst_metric_set(&nrt->dst, RTAX_FEATURES, features);
-                }
-
-                /* According to RFC 1981, detecting PMTU increase shouldn't be
-                 * happened within 5 mins, the recommended timer is 10 mins.
-                 * Here this route expiration time is set to ip6_rt_mtu_expires
-                 * which is 10 mins. After 10 mins the decreased pmtu is expired
-                 * and detecting PMTU increase will be automatically happened.
-                 */
-                rt6_update_expires(nrt, net->ipv6.sysctl.ip6_rt_mtu_expires);
-                nrt->rt6i_flags |= RTF_DYNAMIC;
-                ip6_ins_rt(nrt);
-        }
-out:
-        dst_release(&rt->dst);
-}
-
-void rt6_pmtu_discovery(const struct in6_addr *daddr, const struct in6_addr *saddr,
-                        struct net_device *dev, u32 pmtu)
-{
-        struct net *net = dev_net(dev);
-
-        /*
-         * RFC 1981 states that a node "MUST reduce the size of the packets it
-         * is sending along the path" that caused the Packet Too Big message.
-         * Since it's not possible in the general case to determine which
-         * interface was used to send the original packet, we update the MTU
-         * on the interface that will be used to send future packets. We also
-         * update the MTU on the interface that received the Packet Too Big in
-         * case the original packet was forced out that interface with
-         * SO_BINDTODEVICE or similar. This is the next best thing to the
-         * correct behaviour, which would be to update the MTU on all
-         * interfaces.
-         */
-        rt6_do_pmtu_disc(daddr, saddr, net, pmtu, 0);
-        rt6_do_pmtu_disc(daddr, saddr, net, pmtu, dev->ifindex);
-}
-
-/*
  *      Misc support functions
  */
 
@@ -1814,8 +1767,8 @@ static struct rt6_info *ip6_rt_copy(struct rt6_info *ort,
                                     const struct in6_addr *dest)
 {
         struct net *net = dev_net(ort->dst.dev);
-        struct rt6_info *rt = ip6_dst_alloc(&net->ipv6.ip6_dst_ops,
-                                            ort->dst.dev, 0);
+        struct rt6_info *rt = ip6_dst_alloc(net, ort->dst.dev, 0,
+                                            ort->rt6i_table);
 
         if (rt) {
                 rt->dst.input = ort->dst.input;
@@ -2099,8 +2052,7 @@ struct rt6_info *addrconf_dst_alloc(struct inet6_dev *idev,
                                     bool anycast)
 {
         struct net *net = dev_net(idev->dev);
-        struct rt6_info *rt = ip6_dst_alloc(&net->ipv6.ip6_dst_ops,
-                                            net->loopback_dev, 0);
+        struct rt6_info *rt = ip6_dst_alloc(net, net->loopback_dev, 0, NULL);
         int err;
 
         if (!rt) {
@@ -2396,13 +2348,11 @@ static int rt6_fill_node(struct net *net,
                          int iif, int type, u32 pid, u32 seq,
                          int prefix, int nowait, unsigned int flags)
 {
-        const struct inet_peer *peer;
         struct rtmsg *rtm;
         struct nlmsghdr *nlh;
         long expires;
         u32 table;
         struct neighbour *n;
-        u32 ts, tsage;
 
         if (prefix) {   /* user wants prefix routes only */
                 if (!(rt->rt6i_flags & RTF_PREFIX_RT)) {
@@ -2500,7 +2450,7 @@ static int rt6_fill_node(struct net *net,
                 goto nla_put_failure;
 
         rcu_read_lock();
-        n = dst_get_neighbour_noref(&rt->dst);
+        n = rt->n;
         if (n) {
                 if (nla_put(skb, RTA_GATEWAY, 16, &n->primary_key) < 0) {
                         rcu_read_unlock();
@@ -2521,15 +2471,7 @@ static int rt6_fill_node(struct net *net,
         else
                 expires = INT_MAX;
 
-        peer = rt->rt6i_peer;
-        ts = tsage = 0;
-        if (peer && peer->tcp_ts_stamp) {
-                ts = peer->tcp_ts;
-                tsage = get_seconds() - peer->tcp_ts_stamp;
-        }
-
-        if (rtnl_put_cacheinfo(skb, &rt->dst, 0, ts, tsage,
-                               expires, rt->dst.error) < 0)
+        if (rtnl_put_cacheinfo(skb, &rt->dst, 0, expires, rt->dst.error) < 0)
                 goto nla_put_failure;
 
         return nlmsg_end(skb, nlh);
@@ -2722,7 +2664,7 @@ static int rt6_info_route(struct rt6_info *rt, void *p_arg)
         seq_puts(m, "00000000000000000000000000000000 00 ");
 #endif
         rcu_read_lock();
-        n = dst_get_neighbour_noref(&rt->dst);
+        n = rt->n;
         if (n) {
                 seq_printf(m, "%pi6", n->primary_key);
         } else {
@@ -3007,6 +2949,31 @@ static struct pernet_operations ip6_route_net_ops = {
         .exit = ip6_route_net_exit,
 };
 
+static int __net_init ipv6_inetpeer_init(struct net *net)
+{
+        struct inet_peer_base *bp = kmalloc(sizeof(*bp), GFP_KERNEL);
+
+        if (!bp)
+                return -ENOMEM;
+        inet_peer_base_init(bp);
+        net->ipv6.peers = bp;
+        return 0;
+}
+
+static void __net_exit ipv6_inetpeer_exit(struct net *net)
+{
+        struct inet_peer_base *bp = net->ipv6.peers;
+
+        net->ipv6.peers = NULL;
+        inetpeer_invalidate_tree(bp);
+        kfree(bp);
+}
+
+static struct pernet_operations ipv6_inetpeer_ops = {
+        .init   =       ipv6_inetpeer_init,
+        .exit   =       ipv6_inetpeer_exit,
+};
+
 static struct pernet_operations ip6_route_net_late_ops = {
         .init = ip6_route_net_init_late,
         .exit = ip6_route_net_exit_late,
@@ -3032,10 +2999,14 @@ int __init ip6_route_init(void)
         if (ret)
                 goto out_kmem_cache;
 
-        ret = register_pernet_subsys(&ip6_route_net_ops);
+        ret = register_pernet_subsys(&ipv6_inetpeer_ops);
         if (ret)
                 goto out_dst_entries;
 
+        ret = register_pernet_subsys(&ip6_route_net_ops);
+        if (ret)
+                goto out_register_inetpeer;
+
         ip6_dst_blackhole_ops.kmem_cachep = ip6_dst_ops_template.kmem_cachep;
 
         /* Registering of the loopback is done before this portion of code,
@@ -3088,6 +3059,8 @@ out_fib6_init:
         fib6_gc_cleanup();
 out_register_subsys:
         unregister_pernet_subsys(&ip6_route_net_ops);
+out_register_inetpeer:
+        unregister_pernet_subsys(&ipv6_inetpeer_ops);
 out_dst_entries:
         dst_entries_destroy(&ip6_dst_blackhole_ops);
 out_kmem_cache:
@@ -3102,6 +3075,7 @@ void ip6_route_cleanup(void)
         fib6_rules_cleanup();
         xfrm6_fini();
         fib6_gc_cleanup();
+        unregister_pernet_subsys(&ipv6_inetpeer_ops);
         unregister_pernet_subsys(&ip6_route_net_ops);
         dst_entries_destroy(&ip6_dst_blackhole_ops);
         kmem_cache_destroy(ip6_dst_ops_template.kmem_cachep);
diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c
index 60415711563..49aea94c9be 100644
--- a/net/ipv6/sit.c
+++ b/net/ipv6/sit.c
@@ -527,9 +527,6 @@ static int ipip6_err(struct sk_buff *skb, u32 info)
                 case ICMP_PORT_UNREACH:
                         /* Impossible event. */
                         return 0;
-                case ICMP_FRAG_NEEDED:
-                        /* Soft state for pmtu is maintained by IP core. */
-                        return 0;
                 default:
                         /* All others are translated to HOST_UNREACH.
                            rfc2003 contains "deep thoughts" about NET_UNREACH,
@@ -551,7 +548,17 @@ static int ipip6_err(struct sk_buff *skb, u32 info)
                                 skb->dev,
                                 iph->daddr,
                                 iph->saddr);
-        if (t == NULL || t->parms.iph.daddr == 0)
+        if (t == NULL)
+                goto out;
+
+        if (type == ICMP_DEST_UNREACH && code == ICMP_FRAG_NEEDED) {
+                ipv4_update_pmtu(skb, dev_net(skb->dev), info,
+                                 t->dev->ifindex, 0, IPPROTO_IPV6, 0);
+                err = 0;
+                goto out;
+        }
+
+        if (t->parms.iph.daddr == 0)
                 goto out;
 
         err = 0;
diff --git a/net/ipv6/syncookies.c b/net/ipv6/syncookies.c
index 8e951d8d3b8..7bf3cc427c2 100644
--- a/net/ipv6/syncookies.c
+++ b/net/ipv6/syncookies.c
@@ -21,9 +21,6 @@
 #include <net/ipv6.h>
 #include <net/tcp.h>
 
-extern int sysctl_tcp_syncookies;
-extern __u32 syncookie_secret[2][16-4+SHA_DIGEST_WORDS];
-
 #define COOKIEBITS 24   /* Upper bits store count */
 #define COOKIEMASK (((__u32)1 << COOKIEBITS) - 1)
 
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
index 9df64a50b07..61175cb2478 100644
--- a/net/ipv6/tcp_ipv6.c
+++ b/net/ipv6/tcp_ipv6.c
@@ -277,22 +277,8 @@ static int tcp_v6_connect(struct sock *sk, struct sockaddr *uaddr,
         rt = (struct rt6_info *) dst;
         if (tcp_death_row.sysctl_tw_recycle &&
             !tp->rx_opt.ts_recent_stamp &&
-            ipv6_addr_equal(&rt->rt6i_dst.addr, &np->daddr)) {
-                struct inet_peer *peer = rt6_get_peer(rt);
-                /*
-                 * VJ's idea. We save last timestamp seen from
-                 * the destination in peer table, when entering state
-                 * TIME-WAIT * and initialize rx_opt.ts_recent from it,
-                 * when trying new connection.
-                 */
-                if (peer) {
-                        inet_peer_refcheck(peer);
-                        if ((u32)get_seconds() - peer->tcp_ts_stamp <= TCP_PAWS_MSL) {
-                                tp->rx_opt.ts_recent_stamp = peer->tcp_ts_stamp;
-                                tp->rx_opt.ts_recent = peer->tcp_ts;
-                        }
-                }
-        }
+            ipv6_addr_equal(&rt->rt6i_dst.addr, &np->daddr))
+                tcp_fetch_timewait_stamp(sk, dst);
 
         icsk->icsk_ext_hdr_len = 0;
         if (np->opt)
@@ -415,6 +401,8 @@ static void tcp_v6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
                 } else
                         dst_hold(dst);
 
+                dst->ops->update_pmtu(dst, ntohl(info));
+
                 if (inet_csk(sk)->icsk_pmtu_cookie > dst_mtu(dst)) {
                         tcp_sync_mss(sk, dst_mtu(dst));
                         tcp_simple_retransmit(sk);
@@ -475,62 +463,43 @@ out:
 }
 
 
-static int tcp_v6_send_synack(struct sock *sk, struct request_sock *req,
+static int tcp_v6_send_synack(struct sock *sk, struct dst_entry *dst,
+                              struct flowi6 *fl6,
+                              struct request_sock *req,
                               struct request_values *rvp,
                               u16 queue_mapping)
 {
         struct inet6_request_sock *treq = inet6_rsk(req);
         struct ipv6_pinfo *np = inet6_sk(sk);
         struct sk_buff * skb;
-        struct ipv6_txoptions *opt = NULL;
-        struct in6_addr * final_p, final;
-        struct flowi6 fl6;
-        struct dst_entry *dst;
-        int err;
-
-        memset(&fl6, 0, sizeof(fl6));
-        fl6.flowi6_proto = IPPROTO_TCP;
-        fl6.daddr = treq->rmt_addr;
-        fl6.saddr = treq->loc_addr;
-        fl6.flowlabel = 0;
-        fl6.flowi6_oif = treq->iif;
-        fl6.flowi6_mark = sk->sk_mark;
-        fl6.fl6_dport = inet_rsk(req)->rmt_port;
-        fl6.fl6_sport = inet_rsk(req)->loc_port;
-        security_req_classify_flow(req, flowi6_to_flowi(&fl6));
+        int err = -ENOMEM;
 
-        opt = np->opt;
-        final_p = fl6_update_dst(&fl6, opt, &final);
-
-        dst = ip6_dst_lookup_flow(sk, &fl6, final_p, false);
-        if (IS_ERR(dst)) {
-                err = PTR_ERR(dst);
-                dst = NULL;
+        /* First, grab a route. */
+        if (!dst && (dst = inet6_csk_route_req(sk, fl6, req)) == NULL)
                 goto done;
-        }
+
         skb = tcp_make_synack(sk, dst, req, rvp);
-        err = -ENOMEM;
+
         if (skb) {
                 __tcp_v6_send_check(skb, &treq->loc_addr, &treq->rmt_addr);
 
-                fl6.daddr = treq->rmt_addr;
+                fl6->daddr = treq->rmt_addr;
                 skb_set_queue_mapping(skb, queue_mapping);
-                err = ip6_xmit(sk, skb, &fl6, opt, np->tclass);
+                err = ip6_xmit(sk, skb, fl6, np->opt, np->tclass);
                 err = net_xmit_eval(err);
         }
 
 done:
-        if (opt && opt != np->opt)
-                sock_kfree_s(sk, opt, opt->tot_len);
-        dst_release(dst);
         return err;
 }
 
 static int tcp_v6_rtx_synack(struct sock *sk, struct request_sock *req,
                              struct request_values *rvp)
 {
+        struct flowi6 fl6;
+
         TCP_INC_STATS_BH(sock_net(sk), TCP_MIB_RETRANSSEGS);
-        return tcp_v6_send_synack(sk, req, rvp, 0);
+        return tcp_v6_send_synack(sk, NULL, &fl6, req, rvp, 0);
 }
 
 static void tcp_v6_reqsk_destructor(struct request_sock *req)
@@ -1057,6 +1026,7 @@ static int tcp_v6_conn_request(struct sock *sk, struct sk_buff *skb)
         struct tcp_sock *tp = tcp_sk(sk);
         __u32 isn = TCP_SKB_CB(skb)->when;
         struct dst_entry *dst = NULL;
+        struct flowi6 fl6;
         bool want_cookie = false;
 
         if (skb->protocol == htons(ETH_P_IP))
@@ -1150,8 +1120,6 @@ static int tcp_v6_conn_request(struct sock *sk, struct sk_buff *skb)
                 treq->iif = inet6_iif(skb);
 
         if (!isn) {
-                struct inet_peer *peer = NULL;
-
                 if (ipv6_opt_accepted(sk, skb) ||
                     np->rxopt.bits.rxinfo || np->rxopt.bits.rxoinfo ||
                     np->rxopt.bits.rxhlim || np->rxopt.bits.rxohlim) {
@@ -1176,14 +1144,8 @@ static int tcp_v6_conn_request(struct sock *sk, struct sk_buff *skb)
                  */
                 if (tmp_opt.saw_tstamp &&
                     tcp_death_row.sysctl_tw_recycle &&
-                    (dst = inet6_csk_route_req(sk, req)) != NULL &&
-                    (peer = rt6_get_peer((struct rt6_info *)dst)) != NULL &&
-                    ipv6_addr_equal((struct in6_addr *)peer->daddr.addr.a6,
-                                    &treq->rmt_addr)) {
-                        inet_peer_refcheck(peer);
-                        if ((u32)get_seconds() - peer->tcp_ts_stamp < TCP_PAWS_MSL &&
-                            (s32)(peer->tcp_ts - req->ts_recent) >
-                                                        TCP_PAWS_WINDOW) {
+                    (dst = inet6_csk_route_req(sk, &fl6, req)) != NULL) {
+                        if (!tcp_peer_is_proven(req, dst, true)) {
                                 NET_INC_STATS_BH(sock_net(sk), LINUX_MIB_PAWSPASSIVEREJECTED);
                                 goto drop_and_release;
                         }
@@ -1192,8 +1154,7 @@ static int tcp_v6_conn_request(struct sock *sk, struct sk_buff *skb)
                 else if (!sysctl_tcp_syncookies &&
                          (sysctl_max_syn_backlog - inet_csk_reqsk_queue_len(sk) <
                           (sysctl_max_syn_backlog >> 2)) &&
-                         (!peer || !peer->tcp_ts_stamp) &&
-                         (!dst || !dst_metric(dst, RTAX_RTT))) {
+                         !tcp_peer_is_proven(req, dst, false)) {
                         /* Without syncookies last quarter of
                          * backlog is filled with destinations,
                          * proven to be alive.
@@ -1215,7 +1176,7 @@ have_isn:
         if (security_inet_conn_request(sk, skb, req))
                 goto drop_and_release;
 
-        if (tcp_v6_send_synack(sk, req,
+        if (tcp_v6_send_synack(sk, dst, &fl6, req,
                                (struct request_values *)&tmp_ext,
                                skb_get_queue_mapping(skb)) ||
             want_cookie)
@@ -1242,10 +1203,10 @@ static struct sock * tcp_v6_syn_recv_sock(struct sock *sk, struct sk_buff *skb,
         struct inet_sock *newinet;
         struct tcp_sock *newtp;
         struct sock *newsk;
-        struct ipv6_txoptions *opt;
 #ifdef CONFIG_TCP_MD5SIG
         struct tcp_md5sig_key *key;
 #endif
+        struct flowi6 fl6;
 
         if (skb->protocol == htons(ETH_P_IP)) {
                 /*
@@ -1302,13 +1263,12 @@ static struct sock * tcp_v6_syn_recv_sock(struct sock *sk, struct sk_buff *skb,
         }
 
         treq = inet6_rsk(req);
-        opt = np->opt;
 
         if (sk_acceptq_is_full(sk))
                 goto out_overflow;
 
         if (!dst) {
-                dst = inet6_csk_route_req(sk, req);
+                dst = inet6_csk_route_req(sk, &fl6, req);
                 if (!dst)
                         goto out;
         }
@@ -1371,11 +1331,8 @@ static struct sock * tcp_v6_syn_recv_sock(struct sock *sk, struct sk_buff *skb,
            but we make one more one thing there: reattach optmem
            to newsk.
          */
-        if (opt) {
-                newnp->opt = ipv6_dup_options(newsk, opt);
-                if (opt != np->opt)
-                        sock_kfree_s(sk, opt, opt->tot_len);
-        }
+        if (np->opt)
+                newnp->opt = ipv6_dup_options(newsk, np->opt);
 
         inet_csk(newsk)->icsk_ext_hdr_len = 0;
         if (newnp->opt)
@@ -1422,8 +1379,6 @@ static struct sock * tcp_v6_syn_recv_sock(struct sock *sk, struct sk_buff *skb,
 out_overflow:
         NET_INC_STATS_BH(sock_net(sk), LINUX_MIB_LISTENOVERFLOWS);
 out_nonewsk:
-        if (opt && opt != np->opt)
-                sock_kfree_s(sk, opt, opt->tot_len);
         dst_release(dst);
 out:
         NET_INC_STATS_BH(sock_net(sk), LINUX_MIB_LISTENDROPS);
@@ -1734,42 +1689,10 @@ do_time_wait:
         goto discard_it;
 }
 
-static struct inet_peer *tcp_v6_get_peer(struct sock *sk, bool *release_it)
-{
-        struct rt6_info *rt = (struct rt6_info *) __sk_dst_get(sk);
-        struct ipv6_pinfo *np = inet6_sk(sk);
-        struct inet_peer *peer;
-
-        if (!rt ||
-            !ipv6_addr_equal(&np->daddr, &rt->rt6i_dst.addr)) {
-                peer = inet_getpeer_v6(&np->daddr, 1);
-                *release_it = true;
-        } else {
-                if (!rt->rt6i_peer)
-                        rt6_bind_peer(rt, 1);
-                peer = rt->rt6i_peer;
-                *release_it = false;
-        }
-
-        return peer;
-}
-
-static void *tcp_v6_tw_get_peer(struct sock *sk)
-{
-        const struct inet6_timewait_sock *tw6 = inet6_twsk(sk);
-        const struct inet_timewait_sock *tw = inet_twsk(sk);
-
-        if (tw->tw_family == AF_INET)
-                return tcp_v4_tw_get_peer(sk);
-
-        return inet_getpeer_v6(&tw6->tw_v6_daddr, 1);
-}
-
 static struct timewait_sock_ops tcp6_timewait_sock_ops = {
         .twsk_obj_size  = sizeof(struct tcp6_timewait_sock),
         .twsk_unique    = tcp_twsk_unique,
         .twsk_destructor= tcp_twsk_destructor,
-        .twsk_getpeer   = tcp_v6_tw_get_peer,
 };
 
 static const struct inet_connection_sock_af_ops ipv6_specific = {
@@ -1778,7 +1701,6 @@ static const struct inet_connection_sock_af_ops ipv6_specific = {
         .rebuild_header    = inet6_sk_rebuild_header,
         .conn_request      = tcp_v6_conn_request,
         .syn_recv_sock     = tcp_v6_syn_recv_sock,
-        .get_peer          = tcp_v6_get_peer,
         .net_header_len    = sizeof(struct ipv6hdr),
         .net_frag_header_len = sizeof(struct frag_hdr),
         .setsockopt        = ipv6_setsockopt,
@@ -1810,7 +1732,6 @@ static const struct inet_connection_sock_af_ops ipv6_mapped = {
         .rebuild_header    = inet_sk_rebuild_header,
         .conn_request      = tcp_v6_conn_request,
         .syn_recv_sock     = tcp_v6_syn_recv_sock,
-        .get_peer          = tcp_v4_get_peer,
         .net_header_len    = sizeof(struct iphdr),
         .setsockopt        = ipv6_setsockopt,
         .getsockopt        = ipv6_getsockopt,
diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c
index f05099fc590..1ecd1024948 100644
--- a/net/ipv6/udp.c
+++ b/net/ipv6/udp.c
@@ -48,6 +48,7 @@
 
 #include <linux/proc_fs.h>
 #include <linux/seq_file.h>
+#include <trace/events/skb.h>
 #include "udp_impl.h"
 
 int ipv6_rcv_saddr_equal(const struct sock *sk, const struct sock *sk2)
@@ -385,15 +386,16 @@ try_again:
 
         if (skb_csum_unnecessary(skb))
                 err = skb_copy_datagram_iovec(skb, sizeof(struct udphdr),
-                                              msg->msg_iov, copied       );
+                                              msg->msg_iov, copied);
         else {
                 err = skb_copy_and_csum_datagram_iovec(skb, sizeof(struct udphdr), msg->msg_iov);
                 if (err == -EINVAL)
                         goto csum_copy_err;
         }
-        if (err)
+        if (unlikely(err)) {
+                trace_kfree_skb(skb, udpv6_recvmsg);
                 goto out_free;
-
+        }
         if (!peeked) {
                 if (is_udp4)
                         UDP_INC_STATS_USER(sock_net(sk),
@@ -479,6 +481,9 @@ void __udp6_lib_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
         if (sk == NULL)
                 return;
 
+        if (type == ICMPV6_PKT_TOOBIG)
+                ip6_sk_update_pmtu(skb, sk, info);
+
         np = inet6_sk(sk);
 
         if (!icmpv6_err_convert(type, code, &err) && !np->recverr)
diff --git a/net/ipv6/xfrm6_policy.c b/net/ipv6/xfrm6_policy.c
index 8625fba96db..bb02038b822 100644
--- a/net/ipv6/xfrm6_policy.c
+++ b/net/ipv6/xfrm6_policy.c
@@ -99,12 +99,11 @@ static int xfrm6_fill_dst(struct xfrm_dst *xdst, struct net_device *dev,
         if (!xdst->u.rt6.rt6i_idev)
                 return -ENODEV;
 
-        xdst->u.rt6.rt6i_peer = rt->rt6i_peer;
-        if (rt->rt6i_peer)
-                atomic_inc(&rt->rt6i_peer->refcnt);
+        rt6_transfer_peer(&xdst->u.rt6, rt);
 
         /* Sheit... I remember I did this right. Apparently,
          * it was magically lost, so this code needs audit */
+        xdst->u.rt6.n = neigh_clone(rt->n);
         xdst->u.rt6.rt6i_flags = rt->rt6i_flags & (RTF_ANYCAST |
                                                    RTF_LOCAL);
         xdst->u.rt6.rt6i_metric = rt->rt6i_metric;
@@ -223,8 +222,10 @@ static void xfrm6_dst_destroy(struct dst_entry *dst)
         if (likely(xdst->u.rt6.rt6i_idev))
                 in6_dev_put(xdst->u.rt6.rt6i_idev);
         dst_destroy_metrics_generic(dst);
-        if (likely(xdst->u.rt6.rt6i_peer))
-                inet_putpeer(xdst->u.rt6.rt6i_peer);
+        if (rt6_has_peer(&xdst->u.rt6)) {
+                struct inet_peer *peer = rt6_peer_ptr(&xdst->u.rt6);
+                inet_putpeer(peer);
+        }
         xfrm_dst_destroy(xdst);
 }
 
diff --git a/net/irda/irqueue.c b/net/irda/irqueue.c
index f06947c4fa8..7152624ed5f 100644
--- a/net/irda/irqueue.c
+++ b/net/irda/irqueue.c
@@ -523,7 +523,7 @@ void *hashbin_remove_first( hashbin_t *hashbin)
                  * Dequeue the entry...
                  */
                 dequeue_general( (irda_queue_t**) &hashbin->hb_queue[ bin ],
-                                 (irda_queue_t*) entry );
+                                 entry);
                 hashbin->hb_size--;
                 entry->q_next = NULL;
                 entry->q_prev = NULL;
@@ -615,7 +615,7 @@ void* hashbin_remove( hashbin_t* hashbin, long hashv, const char* name)
          */
         if ( found ) {
                 dequeue_general( (irda_queue_t**) &hashbin->hb_queue[ bin ],
-                                 (irda_queue_t*) entry );
+                                 entry);
                 hashbin->hb_size--;
 
                 /*
@@ -685,7 +685,7 @@ void* hashbin_remove_this( hashbin_t* hashbin, irda_queue_t* entry)
          * Dequeue the entry...
          */
         dequeue_general( (irda_queue_t**) &hashbin->hb_queue[ bin ],
-                         (irda_queue_t*) entry );
+                         entry);
         hashbin->hb_size--;
         entry->q_next = NULL;
         entry->q_prev = NULL;
diff --git a/net/l2tp/l2tp_core.c b/net/l2tp/l2tp_core.c
index 32b2155e7ab..393355d37b4 100644
--- a/net/l2tp/l2tp_core.c
+++ b/net/l2tp/l2tp_core.c
@@ -1128,6 +1128,7 @@ int l2tp_xmit_skb(struct l2tp_session *session, struct sk_buff *skb, int hdr_len
         int headroom;
         int uhlen = (tunnel->encap == L2TP_ENCAPTYPE_UDP) ? sizeof(struct udphdr) : 0;
         int udp_len;
+        int ret = NET_XMIT_SUCCESS;
 
         /* Check that there's enough headroom in the skb to insert IP,
          * UDP and L2TP headers. If not enough, expand it to
@@ -1137,8 +1138,8 @@ int l2tp_xmit_skb(struct l2tp_session *session, struct sk_buff *skb, int hdr_len
                 uhlen + hdr_len;
         old_headroom = skb_headroom(skb);
         if (skb_cow_head(skb, headroom)) {
-                dev_kfree_skb(skb);
-                goto abort;
+                kfree_skb(skb);
+                return NET_XMIT_DROP;
         }
 
         new_headroom = skb_headroom(skb);
@@ -1156,7 +1157,8 @@ int l2tp_xmit_skb(struct l2tp_session *session, struct sk_buff *skb, int hdr_len
 
         bh_lock_sock(sk);
         if (sock_owned_by_user(sk)) {
-                dev_kfree_skb(skb);
+                kfree_skb(skb);
+                ret = NET_XMIT_DROP;
                 goto out_unlock;
         }
 
@@ -1215,8 +1217,7 @@ int l2tp_xmit_skb(struct l2tp_session *session, struct sk_buff *skb, int hdr_len
 out_unlock:
         bh_unlock_sock(sk);
 
-abort:
-        return 0;
+        return ret;
 }
 EXPORT_SYMBOL_GPL(l2tp_xmit_skb);
 
diff --git a/net/l2tp/l2tp_eth.c b/net/l2tp/l2tp_eth.c
index 47b259fccd2..f9ee74deeac 100644
--- a/net/l2tp/l2tp_eth.c
+++ b/net/l2tp/l2tp_eth.c
@@ -44,6 +44,7 @@ struct l2tp_eth {
         struct list_head        list;
         atomic_long_t           tx_bytes;
         atomic_long_t           tx_packets;
+        atomic_long_t           tx_dropped;
         atomic_long_t           rx_bytes;
         atomic_long_t           rx_packets;
         atomic_long_t           rx_errors;
@@ -92,12 +93,15 @@ static int l2tp_eth_dev_xmit(struct sk_buff *skb, struct net_device *dev)
 {
         struct l2tp_eth *priv = netdev_priv(dev);
         struct l2tp_session *session = priv->session;
+        unsigned int len = skb->len;
+        int ret = l2tp_xmit_skb(session, skb, session->hdr_len);
 
-        atomic_long_add(skb->len, &priv->tx_bytes);
-        atomic_long_inc(&priv->tx_packets);
-
-        l2tp_xmit_skb(session, skb, session->hdr_len);
-
+        if (likely(ret == NET_XMIT_SUCCESS)) {
+                atomic_long_add(len, &priv->tx_bytes);
+                atomic_long_inc(&priv->tx_packets);
+        } else {
+                atomic_long_inc(&priv->tx_dropped);
+        }
         return NETDEV_TX_OK;
 }
 
@@ -108,6 +112,7 @@ static struct rtnl_link_stats64 *l2tp_eth_get_stats64(struct net_device *dev,
 
         stats->tx_bytes   = atomic_long_read(&priv->tx_bytes);
         stats->tx_packets = atomic_long_read(&priv->tx_packets);
+        stats->tx_dropped = atomic_long_read(&priv->tx_dropped);
         stats->rx_bytes   = atomic_long_read(&priv->rx_bytes);
         stats->rx_packets = atomic_long_read(&priv->rx_packets);
         stats->rx_errors  = atomic_long_read(&priv->rx_errors);
diff --git a/net/l2tp/l2tp_netlink.c b/net/l2tp/l2tp_netlink.c
index ddc553e7667..d71cd9229a4 100644
--- a/net/l2tp/l2tp_netlink.c
+++ b/net/l2tp/l2tp_netlink.c
@@ -72,7 +72,7 @@ static int l2tp_nl_cmd_noop(struct sk_buff *skb, struct genl_info *info)
         void *hdr;
         int ret = -ENOBUFS;
 
-        msg = nlmsg_new(NLMSG_GOODSIZE, GFP_KERNEL);
+        msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);
         if (!msg) {
                 ret = -ENOMEM;
                 goto out;
@@ -353,7 +353,7 @@ static int l2tp_nl_cmd_tunnel_get(struct sk_buff *skb, struct genl_info *info)
                 goto out;
         }
 
-        msg = nlmsg_new(NLMSG_GOODSIZE, GFP_KERNEL);
+        msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);
         if (!msg) {
                 ret = -ENOMEM;
                 goto out;
@@ -699,7 +699,7 @@ static int l2tp_nl_cmd_session_get(struct sk_buff *skb, struct genl_info *info)
                 goto out;
         }
 
-        msg = nlmsg_new(NLMSG_GOODSIZE, GFP_KERNEL);
+        msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);
         if (!msg) {
                 ret = -ENOMEM;
                 goto out;
diff --git a/net/l2tp/l2tp_ppp.c b/net/l2tp/l2tp_ppp.c
index 8ef6b9416cb..286366ef893 100644
--- a/net/l2tp/l2tp_ppp.c
+++ b/net/l2tp/l2tp_ppp.c
@@ -1522,8 +1522,8 @@ static int pppol2tp_session_getsockopt(struct sock *sk,
  * handler, according to whether the PPPoX socket is a for a regular session
  * or the special tunnel type.
  */
-static int pppol2tp_getsockopt(struct socket *sock, int level,
-                               int optname, char __user *optval, int __user *optlen)
+static int pppol2tp_getsockopt(struct socket *sock, int level, int optname,
+                               char __user *optval, int __user *optlen)
 {
         struct sock *sk = sock->sk;
         struct l2tp_session *session;
@@ -1535,7 +1535,7 @@ static int pppol2tp_getsockopt(struct socket *sock, int level,
         if (level != SOL_PPPOL2TP)
                 return udp_prot.getsockopt(sk, level, optname, optval, optlen);
 
-        if (get_user(len, (int __user *) optlen))
+        if (get_user(len, optlen))
                 return -EFAULT;
 
         len = min_t(unsigned int, len, sizeof(int));
@@ -1568,7 +1568,7 @@ static int pppol2tp_getsockopt(struct socket *sock, int level,
                 err = pppol2tp_session_getsockopt(sk, session, optname, &val);
 
         err = -EFAULT;
-        if (put_user(len, (int __user *) optlen))
+        if (put_user(len, optlen))
                 goto end_put_sess;
 
         if (copy_to_user((void __user *) optval, &val, len))
diff --git a/net/llc/af_llc.c b/net/llc/af_llc.c
index fe5453c3e71..f6fe4d40050 100644
--- a/net/llc/af_llc.c
+++ b/net/llc/af_llc.c
@@ -1024,7 +1024,7 @@ static int llc_ui_ioctl(struct socket *sock, unsigned int cmd,
  *      @sock: Socket to set options on.
  *      @level: Socket level user is requesting operations on.
  *      @optname: Operation name.
- *      @optval User provided operation data.
+ *      @optval: User provided operation data.
  *      @optlen: Length of optval.
  *
  *      Set various connection specific parameters.
diff --git a/net/llc/llc_station.c b/net/llc/llc_station.c
index cf4aea3ba30..39a8d8924b9 100644
--- a/net/llc/llc_station.c
+++ b/net/llc/llc_station.c
@@ -30,12 +30,12 @@
  *
  * SAP and connection resource manager, one per adapter.
  *
- * @state - state of station
- * @xid_r_count - XID response PDU counter
- * @mac_sa - MAC source address
- * @sap_list - list of related SAPs
- * @ev_q - events entering state mach.
- * @mac_pdu_q - PDUs ready to send to MAC
+ * @state: state of station
+ * @xid_r_count: XID response PDU counter
+ * @mac_sa: MAC source address
+ * @sap_list: list of related SAPs
+ * @ev_q: events entering state mach.
+ * @mac_pdu_q: PDUs ready to send to MAC
  */
 struct llc_station {
         u8                          state;
@@ -646,7 +646,7 @@ static void llc_station_service_events(void)
 }
 
 /**
- *      llc_station_state_process: queue event and try to process queue.
+ *      llc_station_state_process - queue event and try to process queue.
  *      @skb: Address of the event
  *
  *      Queues an event (on the station event queue) for handling by the
@@ -672,7 +672,7 @@ static void llc_station_ack_tmr_cb(unsigned long timeout_data)
         }
 }
 
-/*
+/**
  *      llc_station_rcv - send received pdu to the station state machine
  *      @skb: received frame.
  *
diff --git a/net/mac80211/Kconfig b/net/mac80211/Kconfig
index 8d249d70598..63af25458fd 100644
--- a/net/mac80211/Kconfig
+++ b/net/mac80211/Kconfig
@@ -107,6 +107,19 @@ config MAC80211_DEBUGFS
 
           Say N unless you know you need this.
 
+config MAC80211_MESSAGE_TRACING
+        bool "Trace all mac80211 debug messages"
+        depends on MAC80211
+        ---help---
+          Select this option to have mac80211 register the
+          mac80211_msg trace subsystem with tracepoints to
+          collect all debugging messages, independent of
+          printing them into the kernel log.
+
+          The overhead in this option is that all the messages
+          need to be present in the binary and formatted at
+          runtime for tracing.
+
 menuconfig MAC80211_DEBUG_MENU
         bool "Select mac80211 debugging features"
         depends on MAC80211
@@ -140,26 +153,35 @@ config MAC80211_VERBOSE_DEBUG
 
           Do not select this option.
 
-config MAC80211_HT_DEBUG
-        bool "Verbose HT debugging"
+config MAC80211_MLME_DEBUG
+        bool "Verbose managed MLME output"
         depends on MAC80211_DEBUG_MENU
         ---help---
-          This option enables 802.11n High Throughput features
-          debug tracing output.
-
-          It should not be selected on production systems as some
+          Selecting this option causes mac80211 to print out
+          debugging messages for the managed-mode MLME. It
+          should not be selected on production systems as some
           of the messages are remotely triggerable.
 
           Do not select this option.
 
-config MAC80211_TKIP_DEBUG
-        bool "Verbose TKIP debugging"
+config MAC80211_STA_DEBUG
+        bool "Verbose station debugging"
         depends on MAC80211_DEBUG_MENU
         ---help---
           Selecting this option causes mac80211 to print out
-          very verbose TKIP debugging messages. It should not
-          be selected on production systems as those messages
-          are remotely triggerable.
+          debugging messages for station addition/removal.
+
+          Do not select this option.
+
+config MAC80211_HT_DEBUG
+        bool "Verbose HT debugging"
+        depends on MAC80211_DEBUG_MENU
+        ---help---
+          This option enables 802.11n High Throughput features
+          debug tracing output.
+
+          It should not be selected on production systems as some
+          of the messages are remotely triggerable.
 
           Do not select this option.
 
@@ -174,7 +196,7 @@ config MAC80211_IBSS_DEBUG
 
           Do not select this option.
 
-config MAC80211_VERBOSE_PS_DEBUG
+config MAC80211_PS_DEBUG
         bool "Verbose powersave mode debugging"
         depends on MAC80211_DEBUG_MENU
         ---help---
@@ -186,7 +208,7 @@ config MAC80211_VERBOSE_PS_DEBUG
 
           Do not select this option.
 
-config MAC80211_VERBOSE_MPL_DEBUG
+config MAC80211_MPL_DEBUG
         bool "Verbose mesh peer link debugging"
         depends on MAC80211_DEBUG_MENU
         depends on MAC80211_MESH
@@ -199,7 +221,7 @@ config MAC80211_VERBOSE_MPL_DEBUG
 
           Do not select this option.
 
-config MAC80211_VERBOSE_MPATH_DEBUG
+config MAC80211_MPATH_DEBUG
         bool "Verbose mesh path debugging"
         depends on MAC80211_DEBUG_MENU
         depends on MAC80211_MESH
@@ -212,7 +234,7 @@ config MAC80211_VERBOSE_MPATH_DEBUG
 
           Do not select this option.
 
-config MAC80211_VERBOSE_MHWMP_DEBUG
+config MAC80211_MHWMP_DEBUG
         bool "Verbose mesh HWMP routing debugging"
         depends on MAC80211_DEBUG_MENU
         depends on MAC80211_MESH
@@ -225,7 +247,7 @@ config MAC80211_VERBOSE_MHWMP_DEBUG
 
           Do not select this option.
 
-config MAC80211_VERBOSE_MESH_SYNC_DEBUG
+config MAC80211_MESH_SYNC_DEBUG
         bool "Verbose mesh mesh synchronization debugging"
         depends on MAC80211_DEBUG_MENU
         depends on MAC80211_MESH
@@ -236,7 +258,7 @@ config MAC80211_VERBOSE_MESH_SYNC_DEBUG
 
           Do not select this option.
 
-config MAC80211_VERBOSE_TDLS_DEBUG
+config MAC80211_TDLS_DEBUG
         bool "Verbose TDLS debugging"
         depends on MAC80211_DEBUG_MENU
         ---help---
diff --git a/net/mac80211/Makefile b/net/mac80211/Makefile
index 3e9d931bba3..a7dd110faaf 100644
--- a/net/mac80211/Makefile
+++ b/net/mac80211/Makefile
@@ -9,7 +9,6 @@ mac80211-y := \
         scan.o offchannel.o \
         ht.o agg-tx.o agg-rx.o \
         ibss.o \
-        work.o \
         iface.o \
         rate.o \
         michael.o \
@@ -25,7 +24,7 @@ mac80211-y := \
         wme.o \
         event.o \
         chan.o \
-        driver-trace.o mlme.o
+        trace.o mlme.o
 
 mac80211-$(CONFIG_MAC80211_LEDS) += led.o
 mac80211-$(CONFIG_MAC80211_DEBUGFS) += \
@@ -43,7 +42,7 @@ mac80211-$(CONFIG_MAC80211_MESH) += \
 
 mac80211-$(CONFIG_PM) += pm.o
 
-CFLAGS_driver-trace.o := -I$(src)
+CFLAGS_trace.o := -I$(src)
 
 # objects for PID algorithm
 rc80211_pid-y := rc80211_pid_algo.o
@@ -59,4 +58,4 @@ mac80211-$(CONFIG_MAC80211_RC_PID) += $(rc80211_pid-y)
 mac80211-$(CONFIG_MAC80211_RC_MINSTREL) += $(rc80211_minstrel-y)
 mac80211-$(CONFIG_MAC80211_RC_MINSTREL_HT) += $(rc80211_minstrel_ht-y)
 
-ccflags-y += -D__CHECK_ENDIAN__
+ccflags-y += -D__CHECK_ENDIAN__ -DDEBUG
diff --git a/net/mac80211/agg-rx.c b/net/mac80211/agg-rx.c
index c649188314c..186d9919b04 100644
--- a/net/mac80211/agg-rx.c
+++ b/net/mac80211/agg-rx.c
@@ -74,18 +74,17 @@ void ___ieee80211_stop_rx_ba_session(struct sta_info *sta, u16 tid,
 
         RCU_INIT_POINTER(sta->ampdu_mlme.tid_rx[tid], NULL);
 
-#ifdef CONFIG_MAC80211_HT_DEBUG
-        printk(KERN_DEBUG
+        ht_dbg(sta->sdata,
                "Rx BA session stop requested for %pM tid %u %s reason: %d\n",
                sta->sta.addr, tid,
                initiator == WLAN_BACK_RECIPIENT ? "recipient" : "inititator",
                (int)reason);
-#endif /* CONFIG_MAC80211_HT_DEBUG */
 
         if (drv_ampdu_action(local, sta->sdata, IEEE80211_AMPDU_RX_STOP,
                              &sta->sta, tid, NULL, 0))
-                printk(KERN_DEBUG "HW problem - can not stop rx "
-                                "aggregation for tid %d\n", tid);
+                sdata_info(sta->sdata,
+                           "HW problem - can not stop rx aggregation for tid %d\n",
+                           tid);
 
         /* check if this is a self generated aggregation halt */
         if (initiator == WLAN_BACK_RECIPIENT && tx)
@@ -160,9 +159,8 @@ static void sta_rx_agg_session_timer_expired(unsigned long data)
         }
         rcu_read_unlock();
 
-#ifdef CONFIG_MAC80211_HT_DEBUG
-        printk(KERN_DEBUG "rx session timer expired on tid %d\n", (u16)*ptid);
-#endif
+        ht_dbg(sta->sdata, "rx session timer expired on tid %d\n", (u16)*ptid);
+
         set_bit(*ptid, sta->ampdu_mlme.tid_rx_timer_expired);
         ieee80211_queue_work(&sta->local->hw, &sta->ampdu_mlme.work);
 }
@@ -249,10 +247,7 @@ void ieee80211_process_addba_request(struct ieee80211_local *local,
         status = WLAN_STATUS_REQUEST_DECLINED;
 
         if (test_sta_flag(sta, WLAN_STA_BLOCK_BA)) {
-#ifdef CONFIG_MAC80211_HT_DEBUG
-                printk(KERN_DEBUG "Suspend in progress. "
-                       "Denying ADDBA request\n");
-#endif
+                ht_dbg(sta->sdata, "Suspend in progress - Denying ADDBA request\n");
                 goto end_no_lock;
         }
 
@@ -264,10 +259,9 @@ void ieee80211_process_addba_request(struct ieee80211_local *local,
              (!(sta->sta.ht_cap.cap & IEEE80211_HT_CAP_DELAY_BA))) ||
             (buf_size > IEEE80211_MAX_AMPDU_BUF)) {
                 status = WLAN_STATUS_INVALID_QOS_PARAM;
-#ifdef CONFIG_MAC80211_HT_DEBUG
-                net_dbg_ratelimited("AddBA Req with bad params from %pM on tid %u. policy %d, buffer size %d\n",
-                                    mgmt->sa, tid, ba_policy, buf_size);
-#endif /* CONFIG_MAC80211_HT_DEBUG */
+                ht_dbg_ratelimited(sta->sdata,
+                                   "AddBA Req with bad params from %pM on tid %u. policy %d, buffer size %d\n",
+                                   mgmt->sa, tid, ba_policy, buf_size);
                 goto end_no_lock;
         }
         /* determine default buffer size */
@@ -282,10 +276,9 @@ void ieee80211_process_addba_request(struct ieee80211_local *local,
         mutex_lock(&sta->ampdu_mlme.mtx);
 
         if (sta->ampdu_mlme.tid_rx[tid]) {
-#ifdef CONFIG_MAC80211_HT_DEBUG
-                net_dbg_ratelimited("unexpected AddBA Req from %pM on tid %u\n",
-                                    mgmt->sa, tid);
-#endif /* CONFIG_MAC80211_HT_DEBUG */
+                ht_dbg_ratelimited(sta->sdata,
+                                   "unexpected AddBA Req from %pM on tid %u\n",
+                                   mgmt->sa, tid);
 
                 /* delete existing Rx BA session on the same tid */
                 ___ieee80211_stop_rx_ba_session(sta, tid, WLAN_BACK_RECIPIENT,
@@ -324,10 +317,7 @@ void ieee80211_process_addba_request(struct ieee80211_local *local,
 
         ret = drv_ampdu_action(local, sta->sdata, IEEE80211_AMPDU_RX_START,
                                &sta->sta, tid, &start_seq_num, 0);
-#ifdef CONFIG_MAC80211_HT_DEBUG
-        printk(KERN_DEBUG "Rx A-MPDU request on tid %d result %d\n", tid, ret);
-#endif /* CONFIG_MAC80211_HT_DEBUG */
-
+        ht_dbg(sta->sdata, "Rx A-MPDU request on tid %d result %d\n", tid, ret);
         if (ret) {
                 kfree(tid_agg_rx->reorder_buf);
                 kfree(tid_agg_rx->reorder_time);
diff --git a/net/mac80211/agg-tx.c b/net/mac80211/agg-tx.c
index 7cf07158805..5cc1bf7d803 100644
--- a/net/mac80211/agg-tx.c
+++ b/net/mac80211/agg-tx.c
@@ -184,10 +184,8 @@ int ___ieee80211_stop_tx_ba_session(struct sta_info *sta, u16 tid,
 
         spin_unlock_bh(&sta->lock);
 
-#ifdef CONFIG_MAC80211_HT_DEBUG
-        printk(KERN_DEBUG "Tx BA session stop requested for %pM tid %u\n",
+        ht_dbg(sta->sdata, "Tx BA session stop requested for %pM tid %u\n",
                sta->sta.addr, tid);
-#endif /* CONFIG_MAC80211_HT_DEBUG */
 
         del_timer_sync(&tid_tx->addba_resp_timer);
         del_timer_sync(&tid_tx->session_timer);
@@ -253,17 +251,13 @@ static void sta_addba_resp_timer_expired(unsigned long data)
         if (!tid_tx ||
             test_bit(HT_AGG_STATE_RESPONSE_RECEIVED, &tid_tx->state)) {
                 rcu_read_unlock();
-#ifdef CONFIG_MAC80211_HT_DEBUG
-                printk(KERN_DEBUG "timer expired on tid %d but we are not "
-                                "(or no longer) expecting addBA response there\n",
-                        tid);
-#endif
+                ht_dbg(sta->sdata,
+                       "timer expired on tid %d but we are not (or no longer) expecting addBA response there\n",
+                       tid);
                 return;
         }
 
-#ifdef CONFIG_MAC80211_HT_DEBUG
-        printk(KERN_DEBUG "addBA response timer expired on tid %d\n", tid);
-#endif
+        ht_dbg(sta->sdata, "addBA response timer expired on tid %d\n", tid);
 
         ieee80211_stop_tx_ba_session(&sta->sta, tid);
         rcu_read_unlock();
@@ -323,8 +317,9 @@ ieee80211_agg_splice_packets(struct ieee80211_sub_if_data *sdata,
 
         ieee80211_stop_queue_agg(sdata, tid);
 
-        if (WARN(!tid_tx, "TID %d gone but expected when splicing aggregates"
-                          " from the pending queue\n", tid))
+        if (WARN(!tid_tx,
+                 "TID %d gone but expected when splicing aggregates from the pending queue\n",
+                 tid))
                 return;
 
         if (!skb_queue_empty(&tid_tx->pending)) {
@@ -372,10 +367,8 @@ void ieee80211_tx_ba_session_handle_start(struct sta_info *sta, int tid)
         ret = drv_ampdu_action(local, sdata, IEEE80211_AMPDU_TX_START,
                                &sta->sta, tid, &start_seq_num, 0);
         if (ret) {
-#ifdef CONFIG_MAC80211_HT_DEBUG
-                printk(KERN_DEBUG "BA request denied - HW unavailable for"
-                                        " tid %d\n", tid);
-#endif
+                ht_dbg(sdata,
+                       "BA request denied - HW unavailable for tid %d\n", tid);
                 spin_lock_bh(&sta->lock);
                 ieee80211_agg_splice_packets(sdata, tid_tx, tid);
                 ieee80211_assign_tid_tx(sta, tid, NULL);
@@ -388,9 +381,7 @@ void ieee80211_tx_ba_session_handle_start(struct sta_info *sta, int tid)
 
         /* activate the timer for the recipient's addBA response */
         mod_timer(&tid_tx->addba_resp_timer, jiffies + ADDBA_RESP_INTERVAL);
-#ifdef CONFIG_MAC80211_HT_DEBUG
-        printk(KERN_DEBUG "activated addBA response timer on tid %d\n", tid);
-#endif
+        ht_dbg(sdata, "activated addBA response timer on tid %d\n", tid);
 
         spin_lock_bh(&sta->lock);
         sta->ampdu_mlme.last_addba_req_time[tid] = jiffies;
@@ -437,9 +428,7 @@ static void sta_tx_agg_session_timer_expired(unsigned long data)
 
         rcu_read_unlock();
 
-#ifdef CONFIG_MAC80211_HT_DEBUG
-        printk(KERN_DEBUG "tx session timer expired on tid %d\n", (u16)*ptid);
-#endif
+        ht_dbg(sta->sdata, "tx session timer expired on tid %d\n", (u16)*ptid);
 
         ieee80211_stop_tx_ba_session(&sta->sta, *ptid);
 }
@@ -463,10 +452,8 @@ int ieee80211_start_tx_ba_session(struct ieee80211_sta *pubsta, u16 tid,
             (local->hw.flags & IEEE80211_HW_TX_AMPDU_SETUP_IN_HW))
                 return -EINVAL;
 
-#ifdef CONFIG_MAC80211_HT_DEBUG
-        printk(KERN_DEBUG "Open BA session requested for %pM tid %u\n",
+        ht_dbg(sdata, "Open BA session requested for %pM tid %u\n",
                pubsta->addr, tid);
-#endif /* CONFIG_MAC80211_HT_DEBUG */
 
         if (sdata->vif.type != NL80211_IFTYPE_STATION &&
             sdata->vif.type != NL80211_IFTYPE_MESH_POINT &&
@@ -476,10 +463,8 @@ int ieee80211_start_tx_ba_session(struct ieee80211_sta *pubsta, u16 tid,
                 return -EINVAL;
 
         if (test_sta_flag(sta, WLAN_STA_BLOCK_BA)) {
-#ifdef CONFIG_MAC80211_HT_DEBUG
-                printk(KERN_DEBUG "BA sessions blocked. "
-                       "Denying BA session request\n");
-#endif
+                ht_dbg(sdata,
+                       "BA sessions blocked - Denying BA session request\n");
                 return -EINVAL;
         }
 
@@ -497,10 +482,9 @@ int ieee80211_start_tx_ba_session(struct ieee80211_sta *pubsta, u16 tid,
          */
         if (sta->sdata->vif.type == NL80211_IFTYPE_ADHOC &&
             !sta->sta.ht_cap.ht_supported) {
-#ifdef CONFIG_MAC80211_HT_DEBUG
-                printk(KERN_DEBUG "BA request denied - IBSS STA %pM"
-                       "does not advertise HT support\n", pubsta->addr);
-#endif /* CONFIG_MAC80211_HT_DEBUG */
+                ht_dbg(sdata,
+                       "BA request denied - IBSS STA %pM does not advertise HT support\n",
+                       pubsta->addr);
                 return -EINVAL;
         }
 
@@ -520,12 +504,9 @@ int ieee80211_start_tx_ba_session(struct ieee80211_sta *pubsta, u16 tid,
         if (sta->ampdu_mlme.addba_req_num[tid] > HT_AGG_BURST_RETRIES &&
             time_before(jiffies, sta->ampdu_mlme.last_addba_req_time[tid] +
                         HT_AGG_RETRIES_PERIOD)) {
-#ifdef CONFIG_MAC80211_HT_DEBUG
-                printk(KERN_DEBUG "BA request denied - "
-                       "waiting a grace period after %d failed requests "
-                       "on tid %u\n",
+                ht_dbg(sdata,
+                       "BA request denied - waiting a grace period after %d failed requests on tid %u\n",
                        sta->ampdu_mlme.addba_req_num[tid], tid);
-#endif /* CONFIG_MAC80211_HT_DEBUG */
                 ret = -EBUSY;
                 goto err_unlock_sta;
         }
@@ -533,10 +514,9 @@ int ieee80211_start_tx_ba_session(struct ieee80211_sta *pubsta, u16 tid,
         tid_tx = rcu_dereference_protected_tid_tx(sta, tid);
         /* check if the TID is not in aggregation flow already */
         if (tid_tx || sta->ampdu_mlme.tid_start_tx[tid]) {
-#ifdef CONFIG_MAC80211_HT_DEBUG
-                printk(KERN_DEBUG "BA request denied - session is not "
-                                 "idle on tid %u\n", tid);
-#endif /* CONFIG_MAC80211_HT_DEBUG */
+                ht_dbg(sdata,
+                       "BA request denied - session is not idle on tid %u\n",
+                       tid);
                 ret = -EAGAIN;
                 goto err_unlock_sta;
         }
@@ -591,9 +571,7 @@ static void ieee80211_agg_tx_operational(struct ieee80211_local *local,
 
         tid_tx = rcu_dereference_protected_tid_tx(sta, tid);
 
-#ifdef CONFIG_MAC80211_HT_DEBUG
-        printk(KERN_DEBUG "Aggregation is on for tid %d\n", tid);
-#endif
+        ht_dbg(sta->sdata, "Aggregation is on for tid %d\n", tid);
 
         drv_ampdu_action(local, sta->sdata,
                          IEEE80211_AMPDU_TX_OPERATIONAL,
@@ -627,10 +605,8 @@ void ieee80211_start_tx_ba_cb(struct ieee80211_vif *vif, u8 *ra, u16 tid)
         trace_api_start_tx_ba_cb(sdata, ra, tid);
 
         if (tid >= STA_TID_NUM) {
-#ifdef CONFIG_MAC80211_HT_DEBUG
-                printk(KERN_DEBUG "Bad TID value: tid = %d (>= %d)\n",
-                                tid, STA_TID_NUM);
-#endif
+                ht_dbg(sdata, "Bad TID value: tid = %d (>= %d)\n",
+                       tid, STA_TID_NUM);
                 return;
         }
 
@@ -638,9 +614,7 @@ void ieee80211_start_tx_ba_cb(struct ieee80211_vif *vif, u8 *ra, u16 tid)
         sta = sta_info_get_bss(sdata, ra);
         if (!sta) {
                 mutex_unlock(&local->sta_mtx);
-#ifdef CONFIG_MAC80211_HT_DEBUG
-                printk(KERN_DEBUG "Could not find station: %pM\n", ra);
-#endif
+                ht_dbg(sdata, "Could not find station: %pM\n", ra);
                 return;
         }
 
@@ -648,9 +622,7 @@ void ieee80211_start_tx_ba_cb(struct ieee80211_vif *vif, u8 *ra, u16 tid)
         tid_tx = rcu_dereference_protected_tid_tx(sta, tid);
 
         if (WARN_ON(!tid_tx)) {
-#ifdef CONFIG_MAC80211_HT_DEBUG
-                printk(KERN_DEBUG "addBA was not requested!\n");
-#endif
+                ht_dbg(sdata, "addBA was not requested!\n");
                 goto unlock;
         }
 
@@ -750,25 +722,18 @@ void ieee80211_stop_tx_ba_cb(struct ieee80211_vif *vif, u8 *ra, u8 tid)
         trace_api_stop_tx_ba_cb(sdata, ra, tid);
 
         if (tid >= STA_TID_NUM) {
-#ifdef CONFIG_MAC80211_HT_DEBUG
-                printk(KERN_DEBUG "Bad TID value: tid = %d (>= %d)\n",
-                                tid, STA_TID_NUM);
-#endif
+                ht_dbg(sdata, "Bad TID value: tid = %d (>= %d)\n",
+                       tid, STA_TID_NUM);
                 return;
         }
 
-#ifdef CONFIG_MAC80211_HT_DEBUG
-        printk(KERN_DEBUG "Stopping Tx BA session for %pM tid %d\n",
-               ra, tid);
-#endif /* CONFIG_MAC80211_HT_DEBUG */
+        ht_dbg(sdata, "Stopping Tx BA session for %pM tid %d\n", ra, tid);
 
         mutex_lock(&local->sta_mtx);
 
         sta = sta_info_get_bss(sdata, ra);
         if (!sta) {
-#ifdef CONFIG_MAC80211_HT_DEBUG
-                printk(KERN_DEBUG "Could not find station: %pM\n", ra);
-#endif
+                ht_dbg(sdata, "Could not find station: %pM\n", ra);
                 goto unlock;
         }
 
@@ -777,9 +742,7 @@ void ieee80211_stop_tx_ba_cb(struct ieee80211_vif *vif, u8 *ra, u8 tid)
         tid_tx = rcu_dereference_protected_tid_tx(sta, tid);
 
         if (!tid_tx || !test_bit(HT_AGG_STATE_STOPPING, &tid_tx->state)) {
-#ifdef CONFIG_MAC80211_HT_DEBUG
-                printk(KERN_DEBUG "unexpected callback to A-MPDU stop\n");
-#endif
+                ht_dbg(sdata, "unexpected callback to A-MPDU stop\n");
                 goto unlock_sta;
         }
 
@@ -855,17 +818,13 @@ void ieee80211_process_addba_resp(struct ieee80211_local *local,
                 goto out;
 
         if (mgmt->u.action.u.addba_resp.dialog_token != tid_tx->dialog_token) {
-#ifdef CONFIG_MAC80211_HT_DEBUG
-                printk(KERN_DEBUG "wrong addBA response token, tid %d\n", tid);
-#endif
+                ht_dbg(sta->sdata, "wrong addBA response token, tid %d\n", tid);
                 goto out;
         }
 
         del_timer_sync(&tid_tx->addba_resp_timer);
 
-#ifdef CONFIG_MAC80211_HT_DEBUG
-        printk(KERN_DEBUG "switched off addBA timer for tid %d\n", tid);
-#endif
+        ht_dbg(sta->sdata, "switched off addBA timer for tid %d\n", tid);
 
         /*
          * addba_resp_timer may have fired before we got here, and
@@ -874,11 +833,9 @@ void ieee80211_process_addba_resp(struct ieee80211_local *local,
          */
         if (test_bit(HT_AGG_STATE_WANT_STOP, &tid_tx->state) ||
             test_bit(HT_AGG_STATE_STOPPING, &tid_tx->state)) {
-#ifdef CONFIG_MAC80211_HT_DEBUG
-                printk(KERN_DEBUG
+                ht_dbg(sta->sdata,
                        "got addBA resp for tid %d but we already gave up\n",
                        tid);
-#endif
                 goto out;
         }
 
diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index 7d5108a867a..c2a2dcbfdf0 100644
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -353,6 +353,7 @@ void sta_set_rate_info_tx(struct sta_info *sta,
 static void sta_set_sinfo(struct sta_info *sta, struct station_info *sinfo)
 {
         struct ieee80211_sub_if_data *sdata = sta->sdata;
+        struct ieee80211_local *local = sdata->local;
         struct timespec uptime;
 
         sinfo->generation = sdata->local->sta_generation;
@@ -388,7 +389,9 @@ static void sta_set_sinfo(struct sta_info *sta, struct station_info *sinfo)
         if ((sta->local->hw.flags & IEEE80211_HW_SIGNAL_DBM) ||
             (sta->local->hw.flags & IEEE80211_HW_SIGNAL_UNSPEC)) {
                 sinfo->filled |= STATION_INFO_SIGNAL | STATION_INFO_SIGNAL_AVG;
-                sinfo->signal = (s8)sta->last_signal;
+                if (!local->ops->get_rssi ||
+                    drv_get_rssi(local, sdata, &sta->sta, &sinfo->signal))
+                        sinfo->signal = (s8)sta->last_signal;
                 sinfo->signal_avg = (s8) -ewma_read(&sta->avg_signal);
         }
 
@@ -517,7 +520,7 @@ static void ieee80211_get_et_stats(struct wiphy *wiphy,
          * network device.
          */
 
-        rcu_read_lock();
+        mutex_lock(&local->sta_mtx);
 
         if (sdata->vif.type == NL80211_IFTYPE_STATION) {
                 sta = sta_info_get_bss(sdata, sdata->u.mgd.bssid);
@@ -546,7 +549,7 @@ static void ieee80211_get_et_stats(struct wiphy *wiphy,
                         data[i] = (u8)sinfo.signal_avg;
                 i++;
         } else {
-                list_for_each_entry_rcu(sta, &local->sta_list, list) {
+                list_for_each_entry(sta, &local->sta_list, list) {
                         /* Make sure this station belongs to the proper dev */
                         if (sta->sdata->dev != dev)
                                 continue;
@@ -603,7 +606,7 @@ do_survey:
         else
                 data[i++] = -1LL;
 
-        rcu_read_unlock();
+        mutex_unlock(&local->sta_mtx);
 
         if (WARN_ON(i != STA_STATS_LEN))
                 return;
@@ -629,10 +632,11 @@ static int ieee80211_dump_station(struct wiphy *wiphy, struct net_device *dev,
                                  int idx, u8 *mac, struct station_info *sinfo)
 {
         struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
+        struct ieee80211_local *local = sdata->local;
         struct sta_info *sta;
         int ret = -ENOENT;
 
-        rcu_read_lock();
+        mutex_lock(&local->sta_mtx);
 
         sta = sta_info_get_by_idx(sdata, idx);
         if (sta) {
@@ -641,7 +645,7 @@ static int ieee80211_dump_station(struct wiphy *wiphy, struct net_device *dev,
                 sta_set_sinfo(sta, sinfo);
         }
 
-        rcu_read_unlock();
+        mutex_unlock(&local->sta_mtx);
 
         return ret;
 }
@@ -658,10 +662,11 @@ static int ieee80211_get_station(struct wiphy *wiphy, struct net_device *dev,
                                  u8 *mac, struct station_info *sinfo)
 {
         struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
+        struct ieee80211_local *local = sdata->local;
         struct sta_info *sta;
         int ret = -ENOENT;
 
-        rcu_read_lock();
+        mutex_lock(&local->sta_mtx);
 
         sta = sta_info_get_bss(sdata, mac);
         if (sta) {
@@ -669,11 +674,54 @@ static int ieee80211_get_station(struct wiphy *wiphy, struct net_device *dev,
                 sta_set_sinfo(sta, sinfo);
         }
 
-        rcu_read_unlock();
+        mutex_unlock(&local->sta_mtx);
 
         return ret;
 }
 
+static int ieee80211_set_channel(struct wiphy *wiphy,
+                                 struct net_device *netdev,
+                                 struct ieee80211_channel *chan,
+                                 enum nl80211_channel_type channel_type)
+{
+        struct ieee80211_local *local = wiphy_priv(wiphy);
+        struct ieee80211_sub_if_data *sdata = NULL;
+
+        if (netdev)
+                sdata = IEEE80211_DEV_TO_SUB_IF(netdev);
+
+        switch (ieee80211_get_channel_mode(local, NULL)) {
+        case CHAN_MODE_HOPPING:
+                return -EBUSY;
+        case CHAN_MODE_FIXED:
+                if (local->oper_channel != chan ||
+                    (!sdata && local->_oper_channel_type != channel_type))
+                        return -EBUSY;
+                if (!sdata && local->_oper_channel_type == channel_type)
+                        return 0;
+                break;
+        case CHAN_MODE_UNDEFINED:
+                break;
+        }
+
+        if (!ieee80211_set_channel_type(local, sdata, channel_type))
+                return -EBUSY;
+
+        local->oper_channel = chan;
+
+        /* auto-detects changes */
+        ieee80211_hw_config(local, 0);
+
+        return 0;
+}
+
+static int ieee80211_set_monitor_channel(struct wiphy *wiphy,
+                                         struct ieee80211_channel *chan,
+                                         enum nl80211_channel_type channel_type)
+{
+        return ieee80211_set_channel(wiphy, NULL, chan, channel_type);
+}
+
 static int ieee80211_set_probe_resp(struct ieee80211_sub_if_data *sdata,
                                     const u8 *resp, size_t resp_len)
 {
@@ -788,6 +836,11 @@ static int ieee80211_start_ap(struct wiphy *wiphy, struct net_device *dev,
         if (old)
                 return -EALREADY;
 
+        err = ieee80211_set_channel(wiphy, dev, params->channel,
+                                    params->channel_type);
+        if (err)
+                return err;
+
         /*
          * Apply control port protocol, this allows us to
          * not encrypt dynamic WEP control frames.
@@ -1482,7 +1535,7 @@ static int ieee80211_update_mesh_config(struct wiphy *wiphy,
         if (_chg_mesh_attr(NL80211_MESHCONF_TTL, mask))
                 conf->dot11MeshTTL = nconf->dot11MeshTTL;
         if (_chg_mesh_attr(NL80211_MESHCONF_ELEMENT_TTL, mask))
-                conf->dot11MeshTTL = nconf->element_ttl;
+                conf->element_ttl = nconf->element_ttl;
         if (_chg_mesh_attr(NL80211_MESHCONF_AUTO_OPEN_PLINKS, mask))
                 conf->auto_open_plinks = nconf->auto_open_plinks;
         if (_chg_mesh_attr(NL80211_MESHCONF_SYNC_OFFSET_MAX_NEIGHBOR, mask))
@@ -1517,17 +1570,16 @@ static int ieee80211_update_mesh_config(struct wiphy *wiphy,
                  * announcements, so require this ifmsh to also be a root node
                  * */
                 if (nconf->dot11MeshGateAnnouncementProtocol &&
-                    !conf->dot11MeshHWMPRootMode) {
-                        conf->dot11MeshHWMPRootMode = 1;
+                    !(conf->dot11MeshHWMPRootMode > IEEE80211_ROOTMODE_ROOT)) {
+                        conf->dot11MeshHWMPRootMode = IEEE80211_PROACTIVE_RANN;
                         ieee80211_mesh_root_setup(ifmsh);
                 }
                 conf->dot11MeshGateAnnouncementProtocol =
                         nconf->dot11MeshGateAnnouncementProtocol;
         }
-        if (_chg_mesh_attr(NL80211_MESHCONF_HWMP_RANN_INTERVAL, mask)) {
+        if (_chg_mesh_attr(NL80211_MESHCONF_HWMP_RANN_INTERVAL, mask))
                 conf->dot11MeshHWMPRannInterval =
                         nconf->dot11MeshHWMPRannInterval;
-        }
         if (_chg_mesh_attr(NL80211_MESHCONF_FORWARDING, mask))
                 conf->dot11MeshForwarding = nconf->dot11MeshForwarding;
         if (_chg_mesh_attr(NL80211_MESHCONF_RSSI_THRESHOLD, mask)) {
@@ -1543,6 +1595,15 @@ static int ieee80211_update_mesh_config(struct wiphy *wiphy,
                 sdata->vif.bss_conf.ht_operation_mode = nconf->ht_opmode;
                 ieee80211_bss_info_change_notify(sdata, BSS_CHANGED_HT);
         }
+        if (_chg_mesh_attr(NL80211_MESHCONF_HWMP_PATH_TO_ROOT_TIMEOUT, mask))
+                conf->dot11MeshHWMPactivePathToRootTimeout =
+                        nconf->dot11MeshHWMPactivePathToRootTimeout;
+        if (_chg_mesh_attr(NL80211_MESHCONF_HWMP_ROOT_INTERVAL, mask))
+                conf->dot11MeshHWMProotInterval =
+                        nconf->dot11MeshHWMProotInterval;
+        if (_chg_mesh_attr(NL80211_MESHCONF_HWMP_CONFIRMATION_INTERVAL, mask))
+                conf->dot11MeshHWMPconfirmationInterval =
+                        nconf->dot11MeshHWMPconfirmationInterval;
         return 0;
 }
 
@@ -1558,6 +1619,12 @@ static int ieee80211_join_mesh(struct wiphy *wiphy, struct net_device *dev,
         err = copy_mesh_setup(ifmsh, setup);
         if (err)
                 return err;
+
+        err = ieee80211_set_channel(wiphy, dev, setup->channel,
+                                    setup->channel_type);
+        if (err)
+                return err;
+
         ieee80211_start_mesh(sdata);
 
         return 0;
@@ -1677,55 +1744,6 @@ static int ieee80211_set_txq_params(struct wiphy *wiphy,
         return 0;
 }
 
-static int ieee80211_set_channel(struct wiphy *wiphy,
-                                 struct net_device *netdev,
-                                 struct ieee80211_channel *chan,
-                                 enum nl80211_channel_type channel_type)
-{
-        struct ieee80211_local *local = wiphy_priv(wiphy);
-        struct ieee80211_sub_if_data *sdata = NULL;
-        struct ieee80211_channel *old_oper;
-        enum nl80211_channel_type old_oper_type;
-        enum nl80211_channel_type old_vif_oper_type= NL80211_CHAN_NO_HT;
-
-        if (netdev)
-                sdata = IEEE80211_DEV_TO_SUB_IF(netdev);
-
-        switch (ieee80211_get_channel_mode(local, NULL)) {
-        case CHAN_MODE_HOPPING:
-                return -EBUSY;
-        case CHAN_MODE_FIXED:
-                if (local->oper_channel != chan)
-                        return -EBUSY;
-                if (!sdata && local->_oper_channel_type == channel_type)
-                        return 0;
-                break;
-        case CHAN_MODE_UNDEFINED:
-                break;
-        }
-
-        if (sdata)
-                old_vif_oper_type = sdata->vif.bss_conf.channel_type;
-        old_oper_type = local->_oper_channel_type;
-
-        if (!ieee80211_set_channel_type(local, sdata, channel_type))
-                return -EBUSY;
-
-        old_oper = local->oper_channel;
-        local->oper_channel = chan;
-
-        /* Update driver if changes were actually made. */
-        if ((old_oper != local->oper_channel) ||
-            (old_oper_type != local->_oper_channel_type))
-                ieee80211_hw_config(local, IEEE80211_CONF_CHANGE_CHANNEL);
-
-        if (sdata && sdata->vif.type != NL80211_IFTYPE_MONITOR &&
-            old_vif_oper_type != sdata->vif.bss_conf.channel_type)
-                ieee80211_bss_info_change_notify(sdata, BSS_CHANGED_HT);
-
-        return 0;
-}
-
 #ifdef CONFIG_PM
 static int ieee80211_suspend(struct wiphy *wiphy,
                              struct cfg80211_wowlan *wowlan)
@@ -2111,35 +2129,171 @@ static int ieee80211_set_bitrate_mask(struct wiphy *wiphy,
         return 0;
 }
 
-static int ieee80211_remain_on_channel_hw(struct ieee80211_local *local,
-                                          struct net_device *dev,
-                                          struct ieee80211_channel *chan,
-                                          enum nl80211_channel_type chantype,
-                                          unsigned int duration, u64 *cookie)
+static int ieee80211_start_roc_work(struct ieee80211_local *local,
+                                    struct ieee80211_sub_if_data *sdata,
+                                    struct ieee80211_channel *channel,
+                                    enum nl80211_channel_type channel_type,
+                                    unsigned int duration, u64 *cookie,
+                                    struct sk_buff *txskb)
 {
+        struct ieee80211_roc_work *roc, *tmp;
+        bool queued = false;
         int ret;
-        u32 random_cookie;
 
         lockdep_assert_held(&local->mtx);
 
-        if (local->hw_roc_cookie)
-                return -EBUSY;
-        /* must be nonzero */
-        random_cookie = random32() | 1;
-
-        *cookie = random_cookie;
-        local->hw_roc_dev = dev;
-        local->hw_roc_cookie = random_cookie;
-        local->hw_roc_channel = chan;
-        local->hw_roc_channel_type = chantype;
-        local->hw_roc_duration = duration;
-        ret = drv_remain_on_channel(local, chan, chantype, duration);
+        roc = kzalloc(sizeof(*roc), GFP_KERNEL);
+        if (!roc)
+                return -ENOMEM;
+
+        roc->chan = channel;
+        roc->chan_type = channel_type;
+        roc->duration = duration;
+        roc->req_duration = duration;
+        roc->frame = txskb;
+        roc->mgmt_tx_cookie = (unsigned long)txskb;
+        roc->sdata = sdata;
+        INIT_DELAYED_WORK(&roc->work, ieee80211_sw_roc_work);
+        INIT_LIST_HEAD(&roc->dependents);
+
+        /* if there's one pending or we're scanning, queue this one */
+        if (!list_empty(&local->roc_list) || local->scanning)
+                goto out_check_combine;
+
+        /* if not HW assist, just queue & schedule work */
+        if (!local->ops->remain_on_channel) {
+                ieee80211_queue_delayed_work(&local->hw, &roc->work, 0);
+                goto out_queue;
+        }
+
+        /* otherwise actually kick it off here (for error handling) */
+
+        /*
+         * If the duration is zero, then the driver
+         * wouldn't actually do anything. Set it to
+         * 10 for now.
+         *
+         * TODO: cancel the off-channel operation
+         *       when we get the SKB's TX status and
+         *       the wait time was zero before.
+         */
+        if (!duration)
+                duration = 10;
+
+        ret = drv_remain_on_channel(local, channel, channel_type, duration);
         if (ret) {
-                local->hw_roc_channel = NULL;
-                local->hw_roc_cookie = 0;
+                kfree(roc);
+                return ret;
         }
 
-        return ret;
+        roc->started = true;
+        goto out_queue;
+
+ out_check_combine:
+        list_for_each_entry(tmp, &local->roc_list, list) {
+                if (tmp->chan != channel || tmp->chan_type != channel_type)
+                        continue;
+
+                /*
+                 * Extend this ROC if possible:
+                 *
+                 * If it hasn't started yet, just increase the duration
+                 * and add the new one to the list of dependents.
+                 */
+                if (!tmp->started) {
+                        list_add_tail(&roc->list, &tmp->dependents);
+                        tmp->duration = max(tmp->duration, roc->duration);
+                        queued = true;
+                        break;
+                }
+
+                /* If it has already started, it's more difficult ... */
+                if (local->ops->remain_on_channel) {
+                        unsigned long j = jiffies;
+
+                        /*
+                         * In the offloaded ROC case, if it hasn't begun, add
+                         * this new one to the dependent list to be handled
+                         * when the the master one begins. If it has begun,
+                         * check that there's still a minimum time left and
+                         * if so, start this one, transmitting the frame, but
+                         * add it to the list directly after this one with a
+                         * a reduced time so we'll ask the driver to execute
+                         * it right after finishing the previous one, in the
+                         * hope that it'll also be executed right afterwards,
+                         * effectively extending the old one.
+                         * If there's no minimum time left, just add it to the
+                         * normal list.
+                         */
+                        if (!tmp->hw_begun) {
+                                list_add_tail(&roc->list, &tmp->dependents);
+                                queued = true;
+                                break;
+                        }
+
+                        if (time_before(j + IEEE80211_ROC_MIN_LEFT,
+                                        tmp->hw_start_time +
+                                        msecs_to_jiffies(tmp->duration))) {
+                                int new_dur;
+
+                                ieee80211_handle_roc_started(roc);
+
+                                new_dur = roc->duration -
+                                          jiffies_to_msecs(tmp->hw_start_time +
+                                                           msecs_to_jiffies(
+                                                                tmp->duration) -
+                                                           j);
+
+                                if (new_dur > 0) {
+                                        /* add right after tmp */
+                                        list_add(&roc->list, &tmp->list);
+                                } else {
+                                        list_add_tail(&roc->list,
+                                                      &tmp->dependents);
+                                }
+                                queued = true;
+                        }
+                } else if (del_timer_sync(&tmp->work.timer)) {
+                        unsigned long new_end;
+
+                        /*
+                         * In the software ROC case, cancel the timer, if
+                         * that fails then the finish work is already
+                         * queued/pending and thus we queue the new ROC
+                         * normally, if that succeeds then we can extend
+                         * the timer duration and TX the frame (if any.)
+                         */
+
+                        list_add_tail(&roc->list, &tmp->dependents);
+                        queued = true;
+
+                        new_end = jiffies + msecs_to_jiffies(roc->duration);
+
+                        /* ok, it was started & we canceled timer */
+                        if (time_after(new_end, tmp->work.timer.expires))
+                                mod_timer(&tmp->work.timer, new_end);
+                        else
+                                add_timer(&tmp->work.timer);
+
+                        ieee80211_handle_roc_started(roc);
+                }
+                break;
+        }
+
+ out_queue:
+        if (!queued)
+                list_add_tail(&roc->list, &local->roc_list);
+
+        /*
+         * cookie is either the roc (for normal roc)
+         * or the SKB (for mgmt TX)
+         */
+        if (txskb)
+                *cookie = (unsigned long)txskb;
+        else
+                *cookie = (unsigned long)roc;
+
+        return 0;
 }
 
 static int ieee80211_remain_on_channel(struct wiphy *wiphy,
@@ -2151,86 +2305,98 @@ static int ieee80211_remain_on_channel(struct wiphy *wiphy,
 {
         struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
         struct ieee80211_local *local = sdata->local;
+        int ret;
 
-        if (local->ops->remain_on_channel) {
-                int ret;
-
-                mutex_lock(&local->mtx);
-                ret = ieee80211_remain_on_channel_hw(local, dev,
-                                                     chan, channel_type,
-                                                     duration, cookie);
-                local->hw_roc_for_tx = false;
-                mutex_unlock(&local->mtx);
-
-                return ret;
-        }
+        mutex_lock(&local->mtx);
+        ret = ieee80211_start_roc_work(local, sdata, chan, channel_type,
+                                       duration, cookie, NULL);
+        mutex_unlock(&local->mtx);
 
-        return ieee80211_wk_remain_on_channel(sdata, chan, channel_type,
-                                              duration, cookie);
+        return ret;
 }
 
-static int ieee80211_cancel_remain_on_channel_hw(struct ieee80211_local *local,
-                                                 u64 cookie)
+static int ieee80211_cancel_roc(struct ieee80211_local *local,
+                                u64 cookie, bool mgmt_tx)
 {
+        struct ieee80211_roc_work *roc, *tmp, *found = NULL;
         int ret;
 
-        lockdep_assert_held(&local->mtx);
+        mutex_lock(&local->mtx);
+        list_for_each_entry_safe(roc, tmp, &local->roc_list, list) {
+                struct ieee80211_roc_work *dep, *tmp2;
 
-        if (local->hw_roc_cookie != cookie)
-                return -ENOENT;
+                list_for_each_entry_safe(dep, tmp2, &roc->dependents, list) {
+                        if (!mgmt_tx && (unsigned long)dep != cookie)
+                                continue;
+                        else if (mgmt_tx && dep->mgmt_tx_cookie != cookie)
+                                continue;
+                        /* found dependent item -- just remove it */
+                        list_del(&dep->list);
+                        mutex_unlock(&local->mtx);
 
-        ret = drv_cancel_remain_on_channel(local);
-        if (ret)
-                return ret;
+                        ieee80211_roc_notify_destroy(dep);
+                        return 0;
+                }
 
-        local->hw_roc_cookie = 0;
-        local->hw_roc_channel = NULL;
+                if (!mgmt_tx && (unsigned long)roc != cookie)
+                        continue;
+                else if (mgmt_tx && roc->mgmt_tx_cookie != cookie)
+                        continue;
 
-        ieee80211_recalc_idle(local);
+                found = roc;
+                break;
+        }
 
-        return 0;
-}
+        if (!found) {
+                mutex_unlock(&local->mtx);
+                return -ENOENT;
+        }
 
-static int ieee80211_cancel_remain_on_channel(struct wiphy *wiphy,
-                                              struct net_device *dev,
-                                              u64 cookie)
-{
-        struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
-        struct ieee80211_local *local = sdata->local;
+        /*
+         * We found the item to cancel, so do that. Note that it
+         * may have dependents, which we also cancel (and send
+         * the expired signal for.) Not doing so would be quite
+         * tricky here, but we may need to fix it later.
+         */
 
-        if (local->ops->cancel_remain_on_channel) {
-                int ret;
+        if (local->ops->remain_on_channel) {
+                if (found->started) {
+                        ret = drv_cancel_remain_on_channel(local);
+                        if (WARN_ON_ONCE(ret)) {
+                                mutex_unlock(&local->mtx);
+                                return ret;
+                        }
+                }
 
-                mutex_lock(&local->mtx);
-                ret = ieee80211_cancel_remain_on_channel_hw(local, cookie);
+                list_del(&found->list);
+
+                if (found->started)
+                        ieee80211_start_next_roc(local);
                 mutex_unlock(&local->mtx);
 
-                return ret;
+                ieee80211_roc_notify_destroy(found);
+        } else {
+                /* work may be pending so use it all the time */
+                found->abort = true;
+                ieee80211_queue_delayed_work(&local->hw, &found->work, 0);
+
+                mutex_unlock(&local->mtx);
+
+                /* work will clean up etc */
+                flush_delayed_work(&found->work);
         }
 
-        return ieee80211_wk_cancel_remain_on_channel(sdata, cookie);
+        return 0;
 }
 
-static enum work_done_result
-ieee80211_offchan_tx_done(struct ieee80211_work *wk, struct sk_buff *skb)
+static int ieee80211_cancel_remain_on_channel(struct wiphy *wiphy,
+                                              struct net_device *dev,
+                                              u64 cookie)
 {
-        /*
-         * Use the data embedded in the work struct for reporting
-         * here so if the driver mangled the SKB before dropping
-         * it (which is the only way we really should get here)
-         * then we don't report mangled data.
-         *
-         * If there was no wait time, then by the time we get here
-         * the driver will likely not have reported the status yet,
-         * so in that case userspace will have to deal with it.
-         */
-
-        if (wk->offchan_tx.wait && !wk->offchan_tx.status)
-                cfg80211_mgmt_tx_status(wk->sdata->dev,
-                                        (unsigned long) wk->offchan_tx.frame,
-                                        wk->data, wk->data_len, false, GFP_KERNEL);
+        struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
+        struct ieee80211_local *local = sdata->local;
 
-        return WORK_DONE_DESTROY;
+        return ieee80211_cancel_roc(local, cookie, false);
 }
 
 static int ieee80211_mgmt_tx(struct wiphy *wiphy, struct net_device *dev,
@@ -2244,10 +2410,10 @@ static int ieee80211_mgmt_tx(struct wiphy *wiphy, struct net_device *dev,
         struct ieee80211_local *local = sdata->local;
         struct sk_buff *skb;
         struct sta_info *sta;
-        struct ieee80211_work *wk;
         const struct ieee80211_mgmt *mgmt = (void *)buf;
+        bool need_offchan = false;
         u32 flags;
-        bool is_offchan = false;
+        int ret;
 
         if (dont_wait_for_ack)
                 flags = IEEE80211_TX_CTL_NO_ACK;
@@ -2255,33 +2421,28 @@ static int ieee80211_mgmt_tx(struct wiphy *wiphy, struct net_device *dev,
                 flags = IEEE80211_TX_INTFL_NL80211_FRAME_TX |
                         IEEE80211_TX_CTL_REQ_TX_STATUS;
 
-        /* Check that we are on the requested channel for transmission */
-        if (chan != local->tmp_channel &&
-            chan != local->oper_channel)
-                is_offchan = true;
-        if (channel_type_valid &&
-            (channel_type != local->tmp_channel_type &&
-             channel_type != local->_oper_channel_type))
-                is_offchan = true;
-
-        if (chan == local->hw_roc_channel) {
-                /* TODO: check channel type? */
-                is_offchan = false;
-                flags |= IEEE80211_TX_CTL_TX_OFFCHAN;
-        }
-
         if (no_cck)
                 flags |= IEEE80211_TX_CTL_NO_CCK_RATE;
 
-        if (is_offchan && !offchan)
-                return -EBUSY;
-
         switch (sdata->vif.type) {
         case NL80211_IFTYPE_ADHOC:
+                if (!sdata->vif.bss_conf.ibss_joined)
+                        need_offchan = true;
+                /* fall through */
+#ifdef CONFIG_MAC80211_MESH
+        case NL80211_IFTYPE_MESH_POINT:
+                if (ieee80211_vif_is_mesh(&sdata->vif) &&
+                    !sdata->u.mesh.mesh_id_len)
+                        need_offchan = true;
+                /* fall through */
+#endif
         case NL80211_IFTYPE_AP:
         case NL80211_IFTYPE_AP_VLAN:
         case NL80211_IFTYPE_P2P_GO:
-        case NL80211_IFTYPE_MESH_POINT:
+                if (sdata->vif.type != NL80211_IFTYPE_ADHOC &&
+                    !ieee80211_vif_is_mesh(&sdata->vif) &&
+                    !rcu_access_pointer(sdata->bss->beacon))
+                        need_offchan = true;
                 if (!ieee80211_is_action(mgmt->frame_control) ||
                     mgmt->u.action.category == WLAN_CATEGORY_PUBLIC)
                         break;
@@ -2293,103 +2454,60 @@ static int ieee80211_mgmt_tx(struct wiphy *wiphy, struct net_device *dev,
                 break;
         case NL80211_IFTYPE_STATION:
         case NL80211_IFTYPE_P2P_CLIENT:
+                if (!sdata->u.mgd.associated)
+                        need_offchan = true;
                 break;
         default:
                 return -EOPNOTSUPP;
         }
 
+        mutex_lock(&local->mtx);
+
+        /* Check if the operating channel is the requested channel */
+        if (!need_offchan) {
+                need_offchan = chan != local->oper_channel;
+                if (channel_type_valid &&
+                    channel_type != local->_oper_channel_type)
+                        need_offchan = true;
+        }
+
+        if (need_offchan && !offchan) {
+                ret = -EBUSY;
+                goto out_unlock;
+        }
+
         skb = dev_alloc_skb(local->hw.extra_tx_headroom + len);
-        if (!skb)
-                return -ENOMEM;
+        if (!skb) {
+                ret = -ENOMEM;
+                goto out_unlock;
+        }
         skb_reserve(skb, local->hw.extra_tx_headroom);
 
         memcpy(skb_put(skb, len), buf, len);
 
         IEEE80211_SKB_CB(skb)->flags = flags;
 
-        if (flags & IEEE80211_TX_CTL_TX_OFFCHAN)
-                IEEE80211_SKB_CB(skb)->hw_queue =
-                        local->hw.offchannel_tx_hw_queue;
-
         skb->dev = sdata->dev;
 
-        *cookie = (unsigned long) skb;
-
-        if (is_offchan && local->ops->remain_on_channel) {
-                unsigned int duration;
-                int ret;
-
-                mutex_lock(&local->mtx);
-                /*
-                 * If the duration is zero, then the driver
-                 * wouldn't actually do anything. Set it to
-                 * 100 for now.
-                 *
-                 * TODO: cancel the off-channel operation
-                 *       when we get the SKB's TX status and
-                 *       the wait time was zero before.
-                 */
-                duration = 100;
-                if (wait)
-                        duration = wait;
-                ret = ieee80211_remain_on_channel_hw(local, dev, chan,
-                                                     channel_type,
-                                                     duration, cookie);
-                if (ret) {
-                        kfree_skb(skb);
-                        mutex_unlock(&local->mtx);
-                        return ret;
-                }
-
-                local->hw_roc_for_tx = true;
-                local->hw_roc_duration = wait;
-
-                /*
-                 * queue up frame for transmission after
-                 * ieee80211_ready_on_channel call
-                 */
+        if (!need_offchan) {
+                ieee80211_tx_skb(sdata, skb);
+                ret = 0;
+                goto out_unlock;
+        }
 
-                /* modify cookie to prevent API mismatches */
-                *cookie ^= 2;
-                IEEE80211_SKB_CB(skb)->flags |= IEEE80211_TX_CTL_TX_OFFCHAN;
+        IEEE80211_SKB_CB(skb)->flags |= IEEE80211_TX_CTL_TX_OFFCHAN;
+        if (local->hw.flags & IEEE80211_HW_QUEUE_CONTROL)
                 IEEE80211_SKB_CB(skb)->hw_queue =
                         local->hw.offchannel_tx_hw_queue;
-                local->hw_roc_skb = skb;
-                local->hw_roc_skb_for_status = skb;
-                mutex_unlock(&local->mtx);
 
-                return 0;
-        }
-
-        /*
-         * Can transmit right away if the channel was the
-         * right one and there's no wait involved... If a
-         * wait is involved, we might otherwise not be on
-         * the right channel for long enough!
-         */
-        if (!is_offchan && !wait && !sdata->vif.bss_conf.idle) {
-                ieee80211_tx_skb(sdata, skb);
-                return 0;
-        }
-
-        wk = kzalloc(sizeof(*wk) + len, GFP_KERNEL);
-        if (!wk) {
+        /* This will handle all kinds of coalescing and immediate TX */
+        ret = ieee80211_start_roc_work(local, sdata, chan, channel_type,
+                                       wait, cookie, skb);
+        if (ret)
                 kfree_skb(skb);
-                return -ENOMEM;
-        }
-
-        wk->type = IEEE80211_WORK_OFFCHANNEL_TX;
-        wk->chan = chan;
-        wk->chan_type = channel_type;
-        wk->sdata = sdata;
-        wk->done = ieee80211_offchan_tx_done;
-        wk->offchan_tx.frame = skb;
-        wk->offchan_tx.wait = wait;
-        wk->data_len = len;
-        memcpy(wk->data, buf, len);
-
-        ieee80211_add_work(wk);
-        return 0;
+ out_unlock:
+        mutex_unlock(&local->mtx);
+        return ret;
 }
 
 static int ieee80211_mgmt_tx_cancel_wait(struct wiphy *wiphy,
@@ -2398,45 +2516,8 @@ static int ieee80211_mgmt_tx_cancel_wait(struct wiphy *wiphy,
 {
         struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
         struct ieee80211_local *local = sdata->local;
-        struct ieee80211_work *wk;
-        int ret = -ENOENT;
-
-        mutex_lock(&local->mtx);
-
-        if (local->ops->cancel_remain_on_channel) {
-                cookie ^= 2;
-                ret = ieee80211_cancel_remain_on_channel_hw(local, cookie);
-
-                if (ret == 0) {
-                        kfree_skb(local->hw_roc_skb);
-                        local->hw_roc_skb = NULL;
-                        local->hw_roc_skb_for_status = NULL;
-                }
-
-                mutex_unlock(&local->mtx);
 
-                return ret;
-        }
-
-        list_for_each_entry(wk, &local->work_list, list) {
-                if (wk->sdata != sdata)
-                        continue;
-
-                if (wk->type != IEEE80211_WORK_OFFCHANNEL_TX)
-                        continue;
-
-                if (cookie != (unsigned long) wk->offchan_tx.frame)
-                        continue;
-
-                wk->timeout = jiffies;
-
-                ieee80211_queue_work(&local->hw, &local->work_work);
-                ret = 0;
-                break;
-        }
-        mutex_unlock(&local->mtx);
-
-        return ret;
+        return ieee80211_cancel_roc(local, cookie, true);
 }
 
 static void ieee80211_mgmt_frame_register(struct wiphy *wiphy,
@@ -2444,16 +2525,30 @@ static void ieee80211_mgmt_frame_register(struct wiphy *wiphy,
                                           u16 frame_type, bool reg)
 {
         struct ieee80211_local *local = wiphy_priv(wiphy);
+        struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
 
-        if (frame_type != (IEEE80211_FTYPE_MGMT | IEEE80211_STYPE_PROBE_REQ))
-                return;
+        switch (frame_type) {
+        case IEEE80211_FTYPE_MGMT | IEEE80211_STYPE_AUTH:
+                if (sdata->vif.type == NL80211_IFTYPE_ADHOC) {
+                        struct ieee80211_if_ibss *ifibss = &sdata->u.ibss;
 
-        if (reg)
-                local->probe_req_reg++;
-        else
-                local->probe_req_reg--;
+                        if (reg)
+                                ifibss->auth_frame_registrations++;
+                        else
+                                ifibss->auth_frame_registrations--;
+                }
+                break;
+        case IEEE80211_FTYPE_MGMT | IEEE80211_STYPE_PROBE_REQ:
+                if (reg)
+                        local->probe_req_reg++;
+                else
+                        local->probe_req_reg--;
 
-        ieee80211_queue_work(&local->hw, &local->reconfig_filter);
+                ieee80211_queue_work(&local->hw, &local->reconfig_filter);
+                break;
+        default:
+                break;
+        }
 }
 
 static int ieee80211_set_antenna(struct wiphy *wiphy, u32 tx_ant, u32 rx_ant)
@@ -2679,9 +2774,8 @@ static int ieee80211_tdls_mgmt(struct wiphy *wiphy, struct net_device *dev,
             !sdata->u.mgd.associated)
                 return -EINVAL;
 
-#ifdef CONFIG_MAC80211_VERBOSE_TDLS_DEBUG
-        printk(KERN_DEBUG "TDLS mgmt action %d peer %pM\n", action_code, peer);
-#endif
+        tdls_dbg(sdata, "TDLS mgmt action %d peer %pM\n",
+                 action_code, peer);
 
         skb = dev_alloc_skb(local->hw.extra_tx_headroom +
                             max(sizeof(struct ieee80211_mgmt),
@@ -2790,9 +2884,7 @@ static int ieee80211_tdls_oper(struct wiphy *wiphy, struct net_device *dev,
         if (sdata->vif.type != NL80211_IFTYPE_STATION)
                 return -EINVAL;
 
-#ifdef CONFIG_MAC80211_VERBOSE_TDLS_DEBUG
-        printk(KERN_DEBUG "TDLS oper %d peer %pM\n", oper, peer);
-#endif
+        tdls_dbg(sdata, "TDLS oper %d peer %pM\n", oper, peer);
 
         switch (oper) {
         case NL80211_TDLS_ENABLE_LINK:
@@ -2936,7 +3028,7 @@ struct cfg80211_ops mac80211_config_ops = {
 #endif
         .change_bss = ieee80211_change_bss,
         .set_txq_params = ieee80211_set_txq_params,
-        .set_channel = ieee80211_set_channel,
+        .set_monitor_channel = ieee80211_set_monitor_channel,
         .suspend = ieee80211_suspend,
         .resume = ieee80211_resume,
         .scan = ieee80211_scan,
diff --git a/net/mac80211/chan.c b/net/mac80211/chan.c
index c76cf7230c7..f0f87e5a1d3 100644
--- a/net/mac80211/chan.c
+++ b/net/mac80211/chan.c
@@ -41,6 +41,10 @@ __ieee80211_get_channel_mode(struct ieee80211_local *local,
                         if (!sdata->u.ap.beacon)
                                 continue;
                         break;
+                case NL80211_IFTYPE_MESH_POINT:
+                        if (!sdata->wdev.mesh_id_len)
+                                continue;
+                        break;
                 default:
                         break;
                 }
diff --git a/net/mac80211/debug.h b/net/mac80211/debug.h
new file mode 100644
index 00000000000..8f383a57601
--- /dev/null
+++ b/net/mac80211/debug.h
@@ -0,0 +1,170 @@
+#ifndef __MAC80211_DEBUG_H
+#define __MAC80211_DEBUG_H
+#include <net/cfg80211.h>
+
+#ifdef CONFIG_MAC80211_IBSS_DEBUG
+#define MAC80211_IBSS_DEBUG 1
+#else
+#define MAC80211_IBSS_DEBUG 0
+#endif
+
+#ifdef CONFIG_MAC80211_PS_DEBUG
+#define MAC80211_PS_DEBUG 1
+#else
+#define MAC80211_PS_DEBUG 0
+#endif
+
+#ifdef CONFIG_MAC80211_HT_DEBUG
+#define MAC80211_HT_DEBUG 1
+#else
+#define MAC80211_HT_DEBUG 0
+#endif
+
+#ifdef CONFIG_MAC80211_MPL_DEBUG
+#define MAC80211_MPL_DEBUG 1
+#else
+#define MAC80211_MPL_DEBUG 0
+#endif
+
+#ifdef CONFIG_MAC80211_MPATH_DEBUG
+#define MAC80211_MPATH_DEBUG 1
+#else
+#define MAC80211_MPATH_DEBUG 0
+#endif
+
+#ifdef CONFIG_MAC80211_MHWMP_DEBUG
+#define MAC80211_MHWMP_DEBUG 1
+#else
+#define MAC80211_MHWMP_DEBUG 0
+#endif
+
+#ifdef CONFIG_MAC80211_MESH_SYNC_DEBUG
+#define MAC80211_MESH_SYNC_DEBUG 1
+#else
+#define MAC80211_MESH_SYNC_DEBUG 0
+#endif
+
+#ifdef CONFIG_MAC80211_TDLS_DEBUG
+#define MAC80211_TDLS_DEBUG 1
+#else
+#define MAC80211_TDLS_DEBUG 0
+#endif
+
+#ifdef CONFIG_MAC80211_STA_DEBUG
+#define MAC80211_STA_DEBUG 1
+#else
+#define MAC80211_STA_DEBUG 0
+#endif
+
+#ifdef CONFIG_MAC80211_MLME_DEBUG
+#define MAC80211_MLME_DEBUG 1
+#else
+#define MAC80211_MLME_DEBUG 0
+#endif
+
+#ifdef CONFIG_MAC80211_MESSAGE_TRACING
+void __sdata_info(const char *fmt, ...) __printf(1, 2);
+void __sdata_dbg(bool print, const char *fmt, ...) __printf(2, 3);
+void __sdata_err(const char *fmt, ...) __printf(1, 2);
+void __wiphy_dbg(struct wiphy *wiphy, bool print, const char *fmt, ...)
+        __printf(3, 4);
+
+#define _sdata_info(sdata, fmt, ...)                                    \
+        __sdata_info("%s: " fmt, (sdata)->name, ##__VA_ARGS__)
+#define _sdata_dbg(print, sdata, fmt, ...)                              \
+        __sdata_dbg(print, "%s: " fmt, (sdata)->name, ##__VA_ARGS__)
+#define _sdata_err(sdata, fmt, ...)                                     \
+        __sdata_err("%s: " fmt, (sdata)->name, ##__VA_ARGS__)
+#define _wiphy_dbg(print, wiphy, fmt, ...)                              \
+        __wiphy_dbg(wiphy, print, fmt, ##__VA_ARGS__)
+#else
+#define _sdata_info(sdata, fmt, ...)                                    \
+do {                                                                    \
+        pr_info("%s: " fmt,                                             \
+                (sdata)->name, ##__VA_ARGS__);                          \
+} while (0)
+
+#define _sdata_dbg(print, sdata, fmt, ...)                              \
+do {                                                                    \
+        if (print)                                                      \
+                pr_debug("%s: " fmt,                                    \
+                         (sdata)->name, ##__VA_ARGS__);                 \
+} while (0)
+
+#define _sdata_err(sdata, fmt, ...)                                     \
+do {                                                                    \
+        pr_err("%s: " fmt,                                              \
+               (sdata)->name, ##__VA_ARGS__);                           \
+} while (0)
+
+#define _wiphy_dbg(print, wiphy, fmt, ...)                              \
+do {                                                                    \
+        if (print)                                                      \
+                wiphy_dbg((wiphy), fmt, ##__VA_ARGS__);                 \
+} while (0)
+#endif
+
+#define sdata_info(sdata, fmt, ...)                                     \
+        _sdata_info(sdata, fmt, ##__VA_ARGS__)
+#define sdata_err(sdata, fmt, ...)                                      \
+        _sdata_err(sdata, fmt, ##__VA_ARGS__)
+#define sdata_dbg(sdata, fmt, ...)                                      \
+        _sdata_dbg(1, sdata, fmt, ##__VA_ARGS__)
+
+#define ht_dbg(sdata, fmt, ...)                                         \
+        _sdata_dbg(MAC80211_HT_DEBUG,                                   \
+                   sdata, fmt, ##__VA_ARGS__)
+
+#define ht_dbg_ratelimited(sdata, fmt, ...)                             \
+        _sdata_dbg(MAC80211_HT_DEBUG && net_ratelimit(),                \
+                   sdata, fmt, ##__VA_ARGS__)
+
+#define ibss_dbg(sdata, fmt, ...)                                       \
+        _sdata_dbg(MAC80211_IBSS_DEBUG,                                 \
+                   sdata, fmt, ##__VA_ARGS__)
+
+#define ps_dbg(sdata, fmt, ...)                                         \
+        _sdata_dbg(MAC80211_PS_DEBUG,                                   \
+                   sdata, fmt, ##__VA_ARGS__)
+
+#define ps_dbg_hw(hw, fmt, ...)                                         \
+        _wiphy_dbg(MAC80211_PS_DEBUG,                                   \
+                   (hw)->wiphy, fmt, ##__VA_ARGS__)
+
+#define ps_dbg_ratelimited(sdata, fmt, ...)                             \
+        _sdata_dbg(MAC80211_PS_DEBUG && net_ratelimit(),                \
+                   sdata, fmt, ##__VA_ARGS__)
+
+#define mpl_dbg(sdata, fmt, ...)                                        \
+        _sdata_dbg(MAC80211_MPL_DEBUG,                                  \
+                   sdata, fmt, ##__VA_ARGS__)
+
+#define mpath_dbg(sdata, fmt, ...)                                      \
+        _sdata_dbg(MAC80211_MPATH_DEBUG,                                \
+                   sdata, fmt, ##__VA_ARGS__)
+
+#define mhwmp_dbg(sdata, fmt, ...)                                      \
+        _sdata_dbg(MAC80211_MHWMP_DEBUG,                                \
+                   sdata, fmt, ##__VA_ARGS__)
+
+#define msync_dbg(sdata, fmt, ...)                                      \
+        _sdata_dbg(MAC80211_MESH_SYNC_DEBUG,                            \
+                   sdata, fmt, ##__VA_ARGS__)
+
+#define tdls_dbg(sdata, fmt, ...)                                       \
+        _sdata_dbg(MAC80211_TDLS_DEBUG,                                 \
+                   sdata, fmt, ##__VA_ARGS__)
+
+#define sta_dbg(sdata, fmt, ...)                                        \
+        _sdata_dbg(MAC80211_STA_DEBUG,                                  \
+                   sdata, fmt, ##__VA_ARGS__)
+
+#define mlme_dbg(sdata, fmt, ...)                                       \
+        _sdata_dbg(MAC80211_MLME_DEBUG,                                 \
+                   sdata, fmt, ##__VA_ARGS__)
+
+#define mlme_dbg_ratelimited(sdata, fmt, ...)                           \
+        _sdata_dbg(MAC80211_MLME_DEBUG && net_ratelimit(),              \
+                   sdata, fmt, ##__VA_ARGS__)
+
+#endif /* __MAC80211_DEBUG_H */
diff --git a/net/mac80211/debugfs_netdev.c b/net/mac80211/debugfs_netdev.c
index 7ed433c66d6..6d5aec9418e 100644
--- a/net/mac80211/debugfs_netdev.c
+++ b/net/mac80211/debugfs_netdev.c
@@ -468,48 +468,54 @@ IEEE80211_IF_FILE(fwded_unicast, u.mesh.mshstats.fwded_unicast, DEC);
 IEEE80211_IF_FILE(fwded_frames, u.mesh.mshstats.fwded_frames, DEC);
 IEEE80211_IF_FILE(dropped_frames_ttl, u.mesh.mshstats.dropped_frames_ttl, DEC);
 IEEE80211_IF_FILE(dropped_frames_congestion,
-                u.mesh.mshstats.dropped_frames_congestion, DEC);
+                  u.mesh.mshstats.dropped_frames_congestion, DEC);
 IEEE80211_IF_FILE(dropped_frames_no_route,
-                u.mesh.mshstats.dropped_frames_no_route, DEC);
+                  u.mesh.mshstats.dropped_frames_no_route, DEC);
 IEEE80211_IF_FILE(estab_plinks, u.mesh.mshstats.estab_plinks, ATOMIC);
 
 /* Mesh parameters */
 IEEE80211_IF_FILE(dot11MeshMaxRetries,
-                u.mesh.mshcfg.dot11MeshMaxRetries, DEC);
+                  u.mesh.mshcfg.dot11MeshMaxRetries, DEC);
 IEEE80211_IF_FILE(dot11MeshRetryTimeout,
-                u.mesh.mshcfg.dot11MeshRetryTimeout, DEC);
+                  u.mesh.mshcfg.dot11MeshRetryTimeout, DEC);
 IEEE80211_IF_FILE(dot11MeshConfirmTimeout,
-                u.mesh.mshcfg.dot11MeshConfirmTimeout, DEC);
+                  u.mesh.mshcfg.dot11MeshConfirmTimeout, DEC);
 IEEE80211_IF_FILE(dot11MeshHoldingTimeout,
-                u.mesh.mshcfg.dot11MeshHoldingTimeout, DEC);
+                  u.mesh.mshcfg.dot11MeshHoldingTimeout, DEC);
 IEEE80211_IF_FILE(dot11MeshTTL, u.mesh.mshcfg.dot11MeshTTL, DEC);
 IEEE80211_IF_FILE(element_ttl, u.mesh.mshcfg.element_ttl, DEC);
 IEEE80211_IF_FILE(auto_open_plinks, u.mesh.mshcfg.auto_open_plinks, DEC);
 IEEE80211_IF_FILE(dot11MeshMaxPeerLinks,
-                u.mesh.mshcfg.dot11MeshMaxPeerLinks, DEC);
+                  u.mesh.mshcfg.dot11MeshMaxPeerLinks, DEC);
 IEEE80211_IF_FILE(dot11MeshHWMPactivePathTimeout,
-                u.mesh.mshcfg.dot11MeshHWMPactivePathTimeout, DEC);
+                  u.mesh.mshcfg.dot11MeshHWMPactivePathTimeout, DEC);
 IEEE80211_IF_FILE(dot11MeshHWMPpreqMinInterval,
-                u.mesh.mshcfg.dot11MeshHWMPpreqMinInterval, DEC);
+                  u.mesh.mshcfg.dot11MeshHWMPpreqMinInterval, DEC);
 IEEE80211_IF_FILE(dot11MeshHWMPperrMinInterval,
-                u.mesh.mshcfg.dot11MeshHWMPperrMinInterval, DEC);
+                  u.mesh.mshcfg.dot11MeshHWMPperrMinInterval, DEC);
 IEEE80211_IF_FILE(dot11MeshHWMPnetDiameterTraversalTime,
-                u.mesh.mshcfg.dot11MeshHWMPnetDiameterTraversalTime, DEC);
+                  u.mesh.mshcfg.dot11MeshHWMPnetDiameterTraversalTime, DEC);
 IEEE80211_IF_FILE(dot11MeshHWMPmaxPREQretries,
-                u.mesh.mshcfg.dot11MeshHWMPmaxPREQretries, DEC);
+                  u.mesh.mshcfg.dot11MeshHWMPmaxPREQretries, DEC);
 IEEE80211_IF_FILE(path_refresh_time,
-                u.mesh.mshcfg.path_refresh_time, DEC);
+                  u.mesh.mshcfg.path_refresh_time, DEC);
 IEEE80211_IF_FILE(min_discovery_timeout,
-                u.mesh.mshcfg.min_discovery_timeout, DEC);
+                  u.mesh.mshcfg.min_discovery_timeout, DEC);
 IEEE80211_IF_FILE(dot11MeshHWMPRootMode,
-                u.mesh.mshcfg.dot11MeshHWMPRootMode, DEC);
+                  u.mesh.mshcfg.dot11MeshHWMPRootMode, DEC);
 IEEE80211_IF_FILE(dot11MeshGateAnnouncementProtocol,
-                u.mesh.mshcfg.dot11MeshGateAnnouncementProtocol, DEC);
+                  u.mesh.mshcfg.dot11MeshGateAnnouncementProtocol, DEC);
 IEEE80211_IF_FILE(dot11MeshHWMPRannInterval,
-                u.mesh.mshcfg.dot11MeshHWMPRannInterval, DEC);
+                  u.mesh.mshcfg.dot11MeshHWMPRannInterval, DEC);
 IEEE80211_IF_FILE(dot11MeshForwarding, u.mesh.mshcfg.dot11MeshForwarding, DEC);
 IEEE80211_IF_FILE(rssi_threshold, u.mesh.mshcfg.rssi_threshold, DEC);
 IEEE80211_IF_FILE(ht_opmode, u.mesh.mshcfg.ht_opmode, DEC);
+IEEE80211_IF_FILE(dot11MeshHWMPactivePathToRootTimeout,
+                  u.mesh.mshcfg.dot11MeshHWMPactivePathToRootTimeout, DEC);
+IEEE80211_IF_FILE(dot11MeshHWMProotInterval,
+                  u.mesh.mshcfg.dot11MeshHWMProotInterval, DEC);
+IEEE80211_IF_FILE(dot11MeshHWMPconfirmationInterval,
+                  u.mesh.mshcfg.dot11MeshHWMPconfirmationInterval, DEC);
 #endif
 
 #define DEBUGFS_ADD_MODE(name, mode) \
@@ -607,9 +613,13 @@ static void add_mesh_config(struct ieee80211_sub_if_data *sdata)
         MESHPARAMS_ADD(min_discovery_timeout);
         MESHPARAMS_ADD(dot11MeshHWMPRootMode);
         MESHPARAMS_ADD(dot11MeshHWMPRannInterval);
+        MESHPARAMS_ADD(dot11MeshForwarding);
         MESHPARAMS_ADD(dot11MeshGateAnnouncementProtocol);
         MESHPARAMS_ADD(rssi_threshold);
         MESHPARAMS_ADD(ht_opmode);
+        MESHPARAMS_ADD(dot11MeshHWMPactivePathToRootTimeout);
+        MESHPARAMS_ADD(dot11MeshHWMProotInterval);
+        MESHPARAMS_ADD(dot11MeshHWMPconfirmationInterval);
 #undef MESHPARAMS_ADD
 }
 #endif
@@ -685,6 +695,7 @@ void ieee80211_debugfs_rename_netdev(struct ieee80211_sub_if_data *sdata)
 
         sprintf(buf, "netdev:%s", sdata->name);
         if (!debugfs_rename(dir->d_parent, dir, dir->d_parent, buf))
-                printk(KERN_ERR "mac80211: debugfs: failed to rename debugfs "
-                       "dir to %s\n", buf);
+                sdata_err(sdata,
+                          "debugfs: failed to rename debugfs dir to %s\n",
+                          buf);
 }
diff --git a/net/mac80211/driver-ops.h b/net/mac80211/driver-ops.h
index 6d33a0c743a..44e8c124278 100644
--- a/net/mac80211/driver-ops.h
+++ b/net/mac80211/driver-ops.h
@@ -3,7 +3,7 @@
 
 #include <net/mac80211.h>
 #include "ieee80211_i.h"
-#include "driver-trace.h"
+#include "trace.h"
 
 static inline void check_sdata_in_driver(struct ieee80211_sub_if_data *sdata)
 {
@@ -845,4 +845,19 @@ drv_allow_buffered_frames(struct ieee80211_local *local,
                                                   more_data);
         trace_drv_return_void(local);
 }
+
+static inline int drv_get_rssi(struct ieee80211_local *local,
+                                struct ieee80211_sub_if_data *sdata,
+                                struct ieee80211_sta *sta,
+                                s8 *rssi_dbm)
+{
+        int ret;
+
+        might_sleep();
+
+        ret = local->ops->get_rssi(&local->hw, &sdata->vif, sta, rssi_dbm);
+        trace_drv_get_rssi(local, sta, *rssi_dbm, ret);
+
+        return ret;
+}
 #endif /* __MAC80211_DRIVER_OPS */
diff --git a/net/mac80211/driver-trace.c b/net/mac80211/driver-trace.c
deleted file mode 100644
index 8ed8711b1a6..00000000000
--- a/net/mac80211/driver-trace.c
+++ /dev/null
@@ -1,9 +0,0 @@
-/* bug in tracepoint.h, it should include this */
-#include <linux/module.h>
-
-/* sparse isn't too happy with all macros... */
-#ifndef __CHECKER__
-#include "driver-ops.h"
-#define CREATE_TRACE_POINTS
-#include "driver-trace.h"
-#endif
diff --git a/net/mac80211/ht.c b/net/mac80211/ht.c
index 6f8615c54b2..4b4538d6392 100644
--- a/net/mac80211/ht.c
+++ b/net/mac80211/ht.c
@@ -305,12 +305,10 @@ void ieee80211_process_delba(struct ieee80211_sub_if_data *sdata,
         tid = (params & IEEE80211_DELBA_PARAM_TID_MASK) >> 12;
         initiator = (params & IEEE80211_DELBA_PARAM_INITIATOR_MASK) >> 11;
 
-#ifdef CONFIG_MAC80211_HT_DEBUG
-        net_dbg_ratelimited("delba from %pM (%s) tid %d reason code %d\n",
-                            mgmt->sa, initiator ? "initiator" : "recipient",
-                            tid,
-                            le16_to_cpu(mgmt->u.action.u.delba.reason_code));
-#endif /* CONFIG_MAC80211_HT_DEBUG */
+        ht_dbg_ratelimited(sdata, "delba from %pM (%s) tid %d reason code %d\n",
+                           mgmt->sa, initiator ? "initiator" : "recipient",
+                           tid,
+                           le16_to_cpu(mgmt->u.action.u.delba.reason_code));
 
         if (initiator == WLAN_BACK_INITIATOR)
                 __ieee80211_stop_rx_ba_session(sta, tid, WLAN_BACK_INITIATOR, 0,
diff --git a/net/mac80211/ibss.c b/net/mac80211/ibss.c
index 33d9d0c3e3d..5746d62faba 100644
--- a/net/mac80211/ibss.c
+++ b/net/mac80211/ibss.c
@@ -82,8 +82,7 @@ static void __ieee80211_sta_join_ibss(struct ieee80211_sub_if_data *sdata,
 
         local->oper_channel = chan;
         channel_type = ifibss->channel_type;
-        if (channel_type > NL80211_CHAN_HT20 &&
-            !cfg80211_can_beacon_sec_chan(local->hw.wiphy, chan, channel_type))
+        if (!cfg80211_can_beacon_sec_chan(local->hw.wiphy, chan, channel_type))
                 channel_type = NL80211_CHAN_HT20;
         if (!ieee80211_set_channel_type(local, sdata, channel_type)) {
                 /* can only fail due to HT40+/- mismatch */
@@ -262,11 +261,7 @@ static struct sta_info *ieee80211_ibss_finish_sta(struct sta_info *sta,
 
         memcpy(addr, sta->sta.addr, ETH_ALEN);
 
-#ifdef CONFIG_MAC80211_VERBOSE_DEBUG
-        wiphy_debug(sdata->local->hw.wiphy,
-                    "Adding new IBSS station %pM (dev=%s)\n",
-                    addr, sdata->name);
-#endif
+        ibss_dbg(sdata, "Adding new IBSS station %pM\n", addr);
 
         sta_info_pre_move_state(sta, IEEE80211_STA_AUTH);
         sta_info_pre_move_state(sta, IEEE80211_STA_ASSOC);
@@ -280,12 +275,10 @@ static struct sta_info *ieee80211_ibss_finish_sta(struct sta_info *sta,
         /* If it fails, maybe we raced another insertion? */
         if (sta_info_insert_rcu(sta))
                 return sta_info_get(sdata, addr);
-        if (auth) {
-#ifdef CONFIG_MAC80211_IBSS_DEBUG
-                printk(KERN_DEBUG "TX Auth SA=%pM DA=%pM BSSID=%pM"
-                       "(auth_transaction=1)\n", sdata->vif.addr,
-                       sdata->u.ibss.bssid, addr);
-#endif
+        if (auth && !sdata->u.ibss.auth_frame_registrations) {
+                ibss_dbg(sdata,
+                         "TX Auth SA=%pM DA=%pM BSSID=%pM (auth_transaction=1)\n",
+                         sdata->vif.addr, sdata->u.ibss.bssid, addr);
                 ieee80211_send_auth(sdata, 1, WLAN_AUTH_OPEN, NULL, 0,
                                     addr, sdata->u.ibss.bssid, NULL, 0, 0);
         }
@@ -308,7 +301,7 @@ ieee80211_ibss_add_sta(struct ieee80211_sub_if_data *sdata,
          *      allow new one to be added.
          */
         if (local->num_sta >= IEEE80211_IBSS_MAX_STA_ENTRIES) {
-                net_dbg_ratelimited("%s: No room for a new IBSS STA entry %pM\n",
+                net_info_ratelimited("%s: No room for a new IBSS STA entry %pM\n",
                                     sdata->name, addr);
                 rcu_read_lock();
                 return NULL;
@@ -355,11 +348,9 @@ static void ieee80211_rx_mgmt_auth_ibss(struct ieee80211_sub_if_data *sdata,
 
         if (auth_alg != WLAN_AUTH_OPEN || auth_transaction != 1)
                 return;
-#ifdef CONFIG_MAC80211_IBSS_DEBUG
-        printk(KERN_DEBUG "%s: RX Auth SA=%pM DA=%pM BSSID=%pM."
-               "(auth_transaction=%d)\n",
-               sdata->name, mgmt->sa, mgmt->da, mgmt->bssid, auth_transaction);
-#endif
+        ibss_dbg(sdata,
+                 "RX Auth SA=%pM DA=%pM BSSID=%pM (auth_transaction=%d)\n",
+                 mgmt->sa, mgmt->da, mgmt->bssid, auth_transaction);
         sta_info_destroy_addr(sdata, mgmt->sa);
         ieee80211_ibss_add_sta(sdata, mgmt->bssid, mgmt->sa, 0, false);
         rcu_read_unlock();
@@ -422,15 +413,10 @@ static void ieee80211_rx_bss_info(struct ieee80211_sub_if_data *sdata,
                                         ieee80211_mandatory_rates(local, band);
 
                                 if (sta->sta.supp_rates[band] != prev_rates) {
-#ifdef CONFIG_MAC80211_IBSS_DEBUG
-                                        printk(KERN_DEBUG
-                                                "%s: updated supp_rates set "
-                                                "for %pM based on beacon"
-                                                "/probe_resp (0x%x -> 0x%x)\n",
-                                                sdata->name, sta->sta.addr,
-                                                prev_rates,
-                                                sta->sta.supp_rates[band]);
-#endif
+                                        ibss_dbg(sdata,
+                                                 "updated supp_rates set for %pM based on beacon/probe_resp (0x%x -> 0x%x)\n",
+                                                 sta->sta.addr, prev_rates,
+                                                 sta->sta.supp_rates[band]);
                                         rates_updated = true;
                                 }
                         } else {
@@ -545,22 +531,18 @@ static void ieee80211_rx_bss_info(struct ieee80211_sub_if_data *sdata,
                 rx_timestamp = drv_get_tsf(local, sdata);
         }
 
-#ifdef CONFIG_MAC80211_IBSS_DEBUG
-        printk(KERN_DEBUG "RX beacon SA=%pM BSSID="
-               "%pM TSF=0x%llx BCN=0x%llx diff=%lld @%lu\n",
-               mgmt->sa, mgmt->bssid,
-               (unsigned long long)rx_timestamp,
-               (unsigned long long)beacon_timestamp,
-               (unsigned long long)(rx_timestamp - beacon_timestamp),
-               jiffies);
-#endif
+        ibss_dbg(sdata,
+                 "RX beacon SA=%pM BSSID=%pM TSF=0x%llx BCN=0x%llx diff=%lld @%lu\n",
+                 mgmt->sa, mgmt->bssid,
+                 (unsigned long long)rx_timestamp,
+                 (unsigned long long)beacon_timestamp,
+                 (unsigned long long)(rx_timestamp - beacon_timestamp),
+                 jiffies);
 
         if (beacon_timestamp > rx_timestamp) {
-#ifdef CONFIG_MAC80211_IBSS_DEBUG
-                printk(KERN_DEBUG "%s: beacon TSF higher than "
-                       "local TSF - IBSS merge with BSSID %pM\n",
-                       sdata->name, mgmt->bssid);
-#endif
+                ibss_dbg(sdata,
+                         "beacon TSF higher than local TSF - IBSS merge with BSSID %pM\n",
+                         mgmt->bssid);
                 ieee80211_sta_join_ibss(sdata, bss);
                 supp_rates = ieee80211_sta_get_rates(local, elems, band, NULL);
                 ieee80211_ibss_add_sta(sdata, mgmt->bssid, mgmt->sa,
@@ -586,7 +568,7 @@ void ieee80211_ibss_rx_no_sta(struct ieee80211_sub_if_data *sdata,
          *      allow new one to be added.
          */
         if (local->num_sta >= IEEE80211_IBSS_MAX_STA_ENTRIES) {
-                net_dbg_ratelimited("%s: No room for a new IBSS STA entry %pM\n",
+                net_info_ratelimited("%s: No room for a new IBSS STA entry %pM\n",
                                     sdata->name, addr);
                 return;
         }
@@ -662,8 +644,8 @@ static void ieee80211_sta_merge_ibss(struct ieee80211_sub_if_data *sdata)
         if (ifibss->fixed_channel)
                 return;
 
-        printk(KERN_DEBUG "%s: No active IBSS STAs - trying to scan for other "
-               "IBSS networks with same SSID (merge)\n", sdata->name);
+        sdata_info(sdata,
+                   "No active IBSS STAs - trying to scan for other IBSS networks with same SSID (merge)\n");
 
         ieee80211_request_internal_scan(sdata,
                         ifibss->ssid, ifibss->ssid_len, NULL);
@@ -691,8 +673,7 @@ static void ieee80211_sta_create_ibss(struct ieee80211_sub_if_data *sdata)
                 bssid[0] |= 0x02;
         }
 
-        printk(KERN_DEBUG "%s: Creating new IBSS network, BSSID %pM\n",
-               sdata->name, bssid);
+        sdata_info(sdata, "Creating new IBSS network, BSSID %pM\n", bssid);
 
         capability = WLAN_CAPABILITY_IBSS;
 
@@ -723,10 +704,7 @@ static void ieee80211_sta_find_ibss(struct ieee80211_sub_if_data *sdata)
         lockdep_assert_held(&ifibss->mtx);
 
         active_ibss = ieee80211_sta_active_ibss(sdata);
-#ifdef CONFIG_MAC80211_IBSS_DEBUG
-        printk(KERN_DEBUG "%s: sta_find_ibss (active_ibss=%d)\n",
-               sdata->name, active_ibss);
-#endif /* CONFIG_MAC80211_IBSS_DEBUG */
+        ibss_dbg(sdata, "sta_find_ibss (active_ibss=%d)\n", active_ibss);
 
         if (active_ibss)
                 return;
@@ -749,29 +727,24 @@ static void ieee80211_sta_find_ibss(struct ieee80211_sub_if_data *sdata)
                 struct ieee80211_bss *bss;
 
                 bss = (void *)cbss->priv;
-#ifdef CONFIG_MAC80211_IBSS_DEBUG
-                printk(KERN_DEBUG "   sta_find_ibss: selected %pM current "
-                       "%pM\n", cbss->bssid, ifibss->bssid);
-#endif /* CONFIG_MAC80211_IBSS_DEBUG */
-
-                printk(KERN_DEBUG "%s: Selected IBSS BSSID %pM"
-                       " based on configured SSID\n",
-                       sdata->name, cbss->bssid);
+                ibss_dbg(sdata,
+                         "sta_find_ibss: selected %pM current %pM\n",
+                         cbss->bssid, ifibss->bssid);
+                sdata_info(sdata,
+                           "Selected IBSS BSSID %pM based on configured SSID\n",
+                           cbss->bssid);
 
                 ieee80211_sta_join_ibss(sdata, bss);
                 ieee80211_rx_bss_put(local, bss);
                 return;
         }
 
-#ifdef CONFIG_MAC80211_IBSS_DEBUG
-        printk(KERN_DEBUG "   did not try to join ibss\n");
-#endif /* CONFIG_MAC80211_IBSS_DEBUG */
+        ibss_dbg(sdata, "sta_find_ibss: did not try to join ibss\n");
 
         /* Selected IBSS not found in current scan results - try to scan */
         if (time_after(jiffies, ifibss->last_scan_completed +
                                         IEEE80211_SCAN_INTERVAL)) {
-                printk(KERN_DEBUG "%s: Trigger new scan to find an IBSS to "
-                       "join\n", sdata->name);
+                sdata_info(sdata, "Trigger new scan to find an IBSS to join\n");
 
                 ieee80211_request_internal_scan(sdata,
                                 ifibss->ssid, ifibss->ssid_len,
@@ -785,9 +758,8 @@ static void ieee80211_sta_find_ibss(struct ieee80211_sub_if_data *sdata)
                                 ieee80211_sta_create_ibss(sdata);
                                 return;
                         }
-                        printk(KERN_DEBUG "%s: IBSS not allowed on"
-                               " %d MHz\n", sdata->name,
-                               local->hw.conf.channel->center_freq);
+                        sdata_info(sdata, "IBSS not allowed on %d MHz\n",
+                                   local->hw.conf.channel->center_freq);
 
                         /* No IBSS found - decrease scan interval and continue
                          * scanning. */
@@ -822,12 +794,9 @@ static void ieee80211_rx_mgmt_probe_req(struct ieee80211_sub_if_data *sdata,
 
         tx_last_beacon = drv_tx_last_beacon(local);
 
-#ifdef CONFIG_MAC80211_IBSS_DEBUG
-        printk(KERN_DEBUG "%s: RX ProbeReq SA=%pM DA=%pM BSSID=%pM"
-               " (tx_last_beacon=%d)\n",
-               sdata->name, mgmt->sa, mgmt->da,
-               mgmt->bssid, tx_last_beacon);
-#endif /* CONFIG_MAC80211_IBSS_DEBUG */
+        ibss_dbg(sdata,
+                 "RX ProbeReq SA=%pM DA=%pM BSSID=%pM (tx_last_beacon=%d)\n",
+                 mgmt->sa, mgmt->da, mgmt->bssid, tx_last_beacon);
 
         if (!tx_last_beacon && is_multicast_ether_addr(mgmt->da))
                 return;
@@ -840,11 +809,8 @@ static void ieee80211_rx_mgmt_probe_req(struct ieee80211_sub_if_data *sdata,
         pos = mgmt->u.probe_req.variable;
         if (pos[0] != WLAN_EID_SSID ||
             pos + 2 + pos[1] > end) {
-#ifdef CONFIG_MAC80211_IBSS_DEBUG
-                printk(KERN_DEBUG "%s: Invalid SSID IE in ProbeReq "
-                       "from %pM\n",
-                       sdata->name, mgmt->sa);
-#endif
+                ibss_dbg(sdata, "Invalid SSID IE in ProbeReq from %pM\n",
+                         mgmt->sa);
                 return;
         }
         if (pos[1] != 0 &&
@@ -861,10 +827,7 @@ static void ieee80211_rx_mgmt_probe_req(struct ieee80211_sub_if_data *sdata,
 
         resp = (struct ieee80211_mgmt *) skb->data;
         memcpy(resp->da, mgmt->sa, ETH_ALEN);
-#ifdef CONFIG_MAC80211_IBSS_DEBUG
-        printk(KERN_DEBUG "%s: Sending ProbeResp to %pM\n",
-               sdata->name, resp->da);
-#endif /* CONFIG_MAC80211_IBSS_DEBUG */
+        ibss_dbg(sdata, "Sending ProbeResp to %pM\n", resp->da);
         IEEE80211_SKB_CB(skb)->flags |= IEEE80211_TX_INTFL_DONT_ENCRYPT;
         ieee80211_tx_skb(sdata, skb);
 }
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
index 3f3cd50fff1..f834a005e1c 100644
--- a/net/mac80211/ieee80211_i.h
+++ b/net/mac80211/ieee80211_i.h
@@ -30,6 +30,7 @@
 #include <net/mac80211.h>
 #include "key.h"
 #include "sta_info.h"
+#include "debug.h"
 
 struct ieee80211_local;
 
@@ -55,11 +56,14 @@ struct ieee80211_local;
 #define TU_TO_JIFFIES(x)        (usecs_to_jiffies((x) * 1024))
 #define TU_TO_EXP_TIME(x)       (jiffies + TU_TO_JIFFIES(x))
 
+/*
+ * Some APs experience problems when working with U-APSD. Decrease the
+ * probability of that happening by using legacy mode for all ACs but VO.
+ * The AP that caused us trouble was a Cisco 4410N. It ignores our
+ * setting, and always treats non-VO ACs as legacy.
+ */
 #define IEEE80211_DEFAULT_UAPSD_QUEUES \
-        (IEEE80211_WMM_IE_STA_QOSINFO_AC_BK |   \
-         IEEE80211_WMM_IE_STA_QOSINFO_AC_BE |   \
-         IEEE80211_WMM_IE_STA_QOSINFO_AC_VI |   \
-         IEEE80211_WMM_IE_STA_QOSINFO_AC_VO)
+        IEEE80211_WMM_IE_STA_QOSINFO_AC_VO
 
 #define IEEE80211_DEFAULT_MAX_SP_LEN            \
         IEEE80211_WMM_IE_STA_QOSINFO_SP_ALL
@@ -317,55 +321,30 @@ struct mesh_preq_queue {
         u8 flags;
 };
 
-enum ieee80211_work_type {
-        IEEE80211_WORK_ABORT,
-        IEEE80211_WORK_REMAIN_ON_CHANNEL,
-        IEEE80211_WORK_OFFCHANNEL_TX,
-};
-
-/**
- * enum work_done_result - indicates what to do after work was done
- *
- * @WORK_DONE_DESTROY: This work item is no longer needed, destroy.
- * @WORK_DONE_REQUEUE: This work item was reset to be reused, and
- *      should be requeued.
- */
-enum work_done_result {
-        WORK_DONE_DESTROY,
-        WORK_DONE_REQUEUE,
-};
+#if HZ/100 == 0
+#define IEEE80211_ROC_MIN_LEFT  1
+#else
+#define IEEE80211_ROC_MIN_LEFT  (HZ/100)
+#endif
 
-struct ieee80211_work {
+struct ieee80211_roc_work {
         struct list_head list;
+        struct list_head dependents;
 
-        struct rcu_head rcu_head;
+        struct delayed_work work;
 
         struct ieee80211_sub_if_data *sdata;
 
-        enum work_done_result (*done)(struct ieee80211_work *wk,
-                                      struct sk_buff *skb);
-
         struct ieee80211_channel *chan;
         enum nl80211_channel_type chan_type;
 
-        unsigned long timeout;
-        enum ieee80211_work_type type;
+        bool started, abort, hw_begun, notified;
 
-        bool started;
+        unsigned long hw_start_time;
 
-        union {
-                struct {
-                        u32 duration;
-                } remain;
-                struct {
-                        struct sk_buff *frame;
-                        u32 wait;
-                        bool status;
-                } offchan_tx;
-        };
-
-        size_t data_len;
-        u8 data[];
+        u32 duration, req_duration;
+        struct sk_buff *frame;
+        u64 mgmt_tx_cookie;
 };
 
 /* flags used in struct ieee80211_if_managed.flags */
@@ -399,7 +378,6 @@ struct ieee80211_mgd_auth_data {
 struct ieee80211_mgd_assoc_data {
         struct cfg80211_bss *bss;
         const u8 *supp_rates;
-        const u8 *ht_operation_ie;
 
         unsigned long timeout;
         int tries;
@@ -414,6 +392,8 @@ struct ieee80211_mgd_assoc_data {
         bool sent_assoc;
         bool synced;
 
+        u8 ap_ht_param;
+
         size_t ie_len;
         u8 ie[];
 };
@@ -532,6 +512,7 @@ struct ieee80211_if_ibss {
         bool privacy;
 
         bool control_port;
+        unsigned int auth_frame_registrations;
 
         u8 bssid[ETH_ALEN] __aligned(2);
         u8 ssid[IEEE80211_MAX_SSID_LEN];
@@ -701,6 +682,9 @@ struct ieee80211_sub_if_data {
         /* TID bitmap for NoAck policy */
         u16 noack_map;
 
+        /* bit field of ACM bits (BIT(802.1D tag)) */
+        u8 wmm_acm;
+
         struct ieee80211_key __rcu *keys[NUM_DEFAULT_KEYS + NUM_DEFAULT_MGMT_KEYS];
         struct ieee80211_key __rcu *default_unicast_key;
         struct ieee80211_key __rcu *default_multicast_key;
@@ -847,13 +831,6 @@ struct ieee80211_local {
         const struct ieee80211_ops *ops;
 
         /*
-         * work stuff, potentially off-channel (in the future)
-         */
-        struct list_head work_list;
-        struct timer_list work_timer;
-        struct work_struct work_work;
-
-        /*
          * private workqueue to mac80211. mac80211 makes this accessible
          * via ieee80211_queue_work()
          */
@@ -912,6 +889,9 @@ struct ieee80211_local {
         /* device is started */
         bool started;
 
+        /* device is during a HW reconfig */
+        bool in_reconfig;
+
         /* wowlan is enabled -- don't reconfig on resume */
         bool wowlan;
 
@@ -1050,7 +1030,6 @@ struct ieee80211_local {
         int total_ps_buffered; /* total number of all buffered unicast and
                                 * multicast packets for power saving stations
                                 */
-        unsigned int wmm_acm; /* bit field of ACM bits (BIT(802.1D tag)) */
 
         bool pspolling;
         bool offchannel_ps_enabled;
@@ -1087,14 +1066,12 @@ struct ieee80211_local {
         } debugfs;
 #endif
 
-        struct ieee80211_channel *hw_roc_channel;
-        struct net_device *hw_roc_dev;
-        struct sk_buff *hw_roc_skb, *hw_roc_skb_for_status;
+        /*
+         * Remain-on-channel support
+         */
+        struct list_head roc_list;
         struct work_struct hw_roc_start, hw_roc_done;
-        enum nl80211_channel_type hw_roc_channel_type;
-        unsigned int hw_roc_duration;
-        u32 hw_roc_cookie;
-        bool hw_roc_for_tx;
+        unsigned long hw_roc_start_time;
 
         struct idr ack_status_frames;
         spinlock_t ack_status_lock;
@@ -1290,7 +1267,12 @@ void ieee80211_offchannel_stop_vifs(struct ieee80211_local *local,
                                     bool offchannel_ps_enable);
 void ieee80211_offchannel_return(struct ieee80211_local *local,
                                  bool offchannel_ps_disable);
-void ieee80211_hw_roc_setup(struct ieee80211_local *local);
+void ieee80211_roc_setup(struct ieee80211_local *local);
+void ieee80211_start_next_roc(struct ieee80211_local *local);
+void ieee80211_roc_purge(struct ieee80211_sub_if_data *sdata);
+void ieee80211_roc_notify_destroy(struct ieee80211_roc_work *roc);
+void ieee80211_sw_roc_work(struct work_struct *work);
+void ieee80211_handle_roc_started(struct ieee80211_roc_work *roc);
 
 /* interface handling */
 int ieee80211_iface_init(void);
@@ -1500,18 +1482,6 @@ u8 *ieee80211_ie_build_ht_oper(u8 *pos, struct ieee80211_sta_ht_cap *ht_cap,
                                enum nl80211_channel_type channel_type,
                                u16 prot_mode);
 
-/* internal work items */
-void ieee80211_work_init(struct ieee80211_local *local);
-void ieee80211_add_work(struct ieee80211_work *wk);
-void free_work(struct ieee80211_work *wk);
-void ieee80211_work_purge(struct ieee80211_sub_if_data *sdata);
-int ieee80211_wk_remain_on_channel(struct ieee80211_sub_if_data *sdata,
-                                   struct ieee80211_channel *chan,
-                                   enum nl80211_channel_type channel_type,
-                                   unsigned int duration, u64 *cookie);
-int ieee80211_wk_cancel_remain_on_channel(
-        struct ieee80211_sub_if_data *sdata, u64 cookie);
-
 /* channel management */
 enum ieee80211_chan_mode {
         CHAN_MODE_UNDEFINED,
diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
index 8664111d056..58c2ab3d483 100644
--- a/net/mac80211/iface.c
+++ b/net/mac80211/iface.c
@@ -57,9 +57,6 @@ static int ieee80211_change_mtu(struct net_device *dev, int new_mtu)
                 return -EINVAL;
         }
 
-#ifdef CONFIG_MAC80211_VERBOSE_DEBUG
-        printk(KERN_DEBUG "%s: setting MTU %d\n", dev->name, new_mtu);
-#endif /* CONFIG_MAC80211_VERBOSE_DEBUG */
         dev->mtu = new_mtu;
         return 0;
 }
@@ -100,15 +97,12 @@ static int ieee80211_check_concurrent_iface(struct ieee80211_sub_if_data *sdata,
 {
         struct ieee80211_local *local = sdata->local;
         struct ieee80211_sub_if_data *nsdata;
-        struct net_device *dev = sdata->dev;
 
         ASSERT_RTNL();
 
         /* we hold the RTNL here so can safely walk the list */
         list_for_each_entry(nsdata, &local->interfaces, list) {
-                struct net_device *ndev = nsdata->dev;
-
-                if (ndev != dev && ieee80211_sdata_running(nsdata)) {
+                if (nsdata != sdata && ieee80211_sdata_running(nsdata)) {
                         /*
                          * Allow only a single IBSS interface to be up at any
                          * time. This is restricted because beacon distribution
@@ -127,7 +121,8 @@ static int ieee80211_check_concurrent_iface(struct ieee80211_sub_if_data *sdata,
                          * The remaining checks are only performed for interfaces
                          * with the same MAC address.
                          */
-                        if (!ether_addr_equal(dev->dev_addr, ndev->dev_addr))
+                        if (!ether_addr_equal(sdata->vif.addr,
+                                              nsdata->vif.addr))
                                 continue;
 
                         /*
@@ -528,10 +523,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
          */
         netif_tx_stop_all_queues(sdata->dev);
 
-        /*
-         * Purge work for this interface.
-         */
-        ieee80211_work_purge(sdata);
+        ieee80211_roc_purge(sdata);
 
         /*
          * Remove all stations associated with this interface.
@@ -637,18 +629,6 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
                 ieee80211_configure_filter(local);
                 break;
         default:
-                mutex_lock(&local->mtx);
-                if (local->hw_roc_dev == sdata->dev &&
-                    local->hw_roc_channel) {
-                        /* ignore return value since this is racy */
-                        drv_cancel_remain_on_channel(local);
-                        ieee80211_queue_work(&local->hw, &local->hw_roc_done);
-                }
-                mutex_unlock(&local->mtx);
-
-                flush_work(&local->hw_roc_start);
-                flush_work(&local->hw_roc_done);
-
                 flush_work(&sdata->work);
                 /*
                  * When we get here, the interface is marked down.
@@ -823,7 +803,7 @@ static u16 ieee80211_monitor_select_queue(struct net_device *dev,
 
         hdr = (void *)((u8 *)skb->data + le16_to_cpu(rtap->it_len));
 
-        return ieee80211_select_queue_80211(local, skb, hdr);
+        return ieee80211_select_queue_80211(sdata, skb, hdr);
 }
 
 static const struct net_device_ops ieee80211_monitorif_ops = {
@@ -1238,7 +1218,7 @@ static void ieee80211_assign_perm_addr(struct ieee80211_local *local,
 
                 if (__ffs64(mask) + hweight64(mask) != fls64(mask)) {
                         /* not a contiguous mask ... not handled now! */
-                        printk(KERN_DEBUG "not contiguous\n");
+                        pr_info("not contiguous\n");
                         break;
                 }
 
@@ -1364,6 +1344,8 @@ int ieee80211_if_add(struct ieee80211_local *local, const char *name,
                         sdata->u.mgd.use_4addr = params->use_4addr;
         }
 
+        ndev->features |= local->hw.netdev_features;
+
         ret = register_netdevice(ndev);
         if (ret)
                 goto fail;
@@ -1427,10 +1409,6 @@ static u32 ieee80211_idle_off(struct ieee80211_local *local,
         if (!(local->hw.conf.flags & IEEE80211_CONF_IDLE))
                 return 0;
 
-#ifdef CONFIG_MAC80211_VERBOSE_DEBUG
-        wiphy_debug(local->hw.wiphy, "device no longer idle - %s\n", reason);
-#endif
-
         local->hw.conf.flags &= ~IEEE80211_CONF_IDLE;
         return IEEE80211_CONF_CHANGE_IDLE;
 }
@@ -1440,10 +1418,6 @@ static u32 ieee80211_idle_on(struct ieee80211_local *local)
         if (local->hw.conf.flags & IEEE80211_CONF_IDLE)
                 return 0;
 
-#ifdef CONFIG_MAC80211_VERBOSE_DEBUG
-        wiphy_debug(local->hw.wiphy, "device now idle\n");
-#endif
-
         drv_flush(local, false);
 
         local->hw.conf.flags |= IEEE80211_CONF_IDLE;
@@ -1454,9 +1428,9 @@ u32 __ieee80211_recalc_idle(struct ieee80211_local *local)
 {
         struct ieee80211_sub_if_data *sdata;
         int count = 0;
-        bool working = false, scanning = false, hw_roc = false;
-        struct ieee80211_work *wk;
+        bool working = false, scanning = false;
         unsigned int led_trig_start = 0, led_trig_stop = 0;
+        struct ieee80211_roc_work *roc;
 
 #ifdef CONFIG_PROVE_LOCKING
         WARN_ON(debug_locks && !lockdep_rtnl_is_held() &&
@@ -1491,9 +1465,11 @@ u32 __ieee80211_recalc_idle(struct ieee80211_local *local)
                 count++;
         }
 
-        list_for_each_entry(wk, &local->work_list, list) {
-                working = true;
-                wk->sdata->vif.bss_conf.idle = false;
+        if (!local->ops->remain_on_channel) {
+                list_for_each_entry(roc, &local->roc_list, list) {
+                        working = true;
+                        roc->sdata->vif.bss_conf.idle = false;
+                }
         }
 
         if (local->scan_sdata &&
@@ -1502,9 +1478,6 @@ u32 __ieee80211_recalc_idle(struct ieee80211_local *local)
                 local->scan_sdata->vif.bss_conf.idle = false;
         }
 
-        if (local->hw_roc_channel)
-                hw_roc = true;
-
         list_for_each_entry(sdata, &local->interfaces, list) {
                 if (sdata->vif.type == NL80211_IFTYPE_MONITOR ||
                     sdata->vif.type == NL80211_IFTYPE_AP_VLAN)
@@ -1516,7 +1489,7 @@ u32 __ieee80211_recalc_idle(struct ieee80211_local *local)
                 ieee80211_bss_info_change_notify(sdata, BSS_CHANGED_IDLE);
         }
 
-        if (working || scanning || hw_roc)
+        if (working || scanning)
                 led_trig_start |= IEEE80211_TPT_LEDTRIG_FL_WORK;
         else
                 led_trig_stop |= IEEE80211_TPT_LEDTRIG_FL_WORK;
@@ -1528,8 +1501,6 @@ u32 __ieee80211_recalc_idle(struct ieee80211_local *local)
 
         ieee80211_mod_tpt_led_trig(local, led_trig_start, led_trig_stop);
 
-        if (hw_roc)
-                return ieee80211_idle_off(local, "hw remain-on-channel");
         if (working)
                 return ieee80211_idle_off(local, "working");
         if (scanning)
diff --git a/net/mac80211/key.c b/net/mac80211/key.c
index 5bb600d93d7..b3b7e526e24 100644
--- a/net/mac80211/key.c
+++ b/net/mac80211/key.c
@@ -139,7 +139,7 @@ static int ieee80211_key_enable_hw_accel(struct ieee80211_key *key)
         }
 
         if (ret != -ENOSPC && ret != -EOPNOTSUPP)
-                wiphy_err(key->local->hw.wiphy,
+                sdata_err(sdata,
                           "failed to set key (%d, %pM) to hardware (%d)\n",
                           key->conf.keyidx,
                           sta ? sta->sta.addr : bcast_addr, ret);
@@ -186,7 +186,7 @@ static void ieee80211_key_disable_hw_accel(struct ieee80211_key *key)
                           sta ? &sta->sta : NULL, &key->conf);
 
         if (ret)
-                wiphy_err(key->local->hw.wiphy,
+                sdata_err(sdata,
                           "failed to remove key (%d, %pM) from hardware (%d)\n",
                           key->conf.keyidx,
                           sta ? sta->sta.addr : bcast_addr, ret);
diff --git a/net/mac80211/main.c b/net/mac80211/main.c
index f5548e95325..0b040fb7367 100644
--- a/net/mac80211/main.c
+++ b/net/mac80211/main.c
@@ -345,6 +345,13 @@ void ieee80211_restart_hw(struct ieee80211_hw *hw)
         ieee80211_stop_queues_by_reason(hw,
                 IEEE80211_QUEUE_STOP_REASON_SUSPEND);
 
+        /*
+         * Stop all Rx during the reconfig. We don't want state changes
+         * or driver callbacks while this is in progress.
+         */
+        local->in_reconfig = true;
+        barrier();
+
         schedule_work(&local->restart_work);
 }
 EXPORT_SYMBOL(ieee80211_restart_hw);
@@ -455,7 +462,9 @@ static const struct ieee80211_txrx_stypes
 ieee80211_default_mgmt_stypes[NUM_NL80211_IFTYPES] = {
         [NL80211_IFTYPE_ADHOC] = {
                 .tx = 0xffff,
-                .rx = BIT(IEEE80211_STYPE_ACTION >> 4),
+                .rx = BIT(IEEE80211_STYPE_ACTION >> 4) |
+                        BIT(IEEE80211_STYPE_AUTH >> 4) |
+                        BIT(IEEE80211_STYPE_DEAUTH >> 4),
         },
         [NL80211_IFTYPE_STATION] = {
                 .tx = 0xffff,
@@ -625,8 +634,6 @@ struct ieee80211_hw *ieee80211_alloc_hw(size_t priv_data_len,
 
         INIT_DELAYED_WORK(&local->scan_work, ieee80211_scan_work);
 
-        ieee80211_work_init(local);
-
         INIT_WORK(&local->restart_work, ieee80211_restart_work);
 
         INIT_WORK(&local->reconfig_filter, ieee80211_reconfig_filter);
@@ -669,7 +676,7 @@ struct ieee80211_hw *ieee80211_alloc_hw(size_t priv_data_len,
 
         ieee80211_led_names(local);
 
-        ieee80211_hw_roc_setup(local);
+        ieee80211_roc_setup(local);
 
         return &local->hw;
 }
@@ -682,6 +689,7 @@ int ieee80211_register_hw(struct ieee80211_hw *hw)
         enum ieee80211_band band;
         int channels, max_bitrates;
         bool supp_ht;
+        netdev_features_t feature_whitelist;
         static const u32 cipher_suites[] = {
                 /* keep WEP first, it may be removed below */
                 WLAN_CIPHER_SUITE_WEP40,
@@ -708,6 +716,12 @@ int ieee80211_register_hw(struct ieee80211_hw *hw)
         if ((hw->flags & IEEE80211_HW_SCAN_WHILE_IDLE) && !local->ops->hw_scan)
                 return -EINVAL;
 
+        /* Only HW csum features are currently compatible with mac80211 */
+        feature_whitelist = NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM |
+                            NETIF_F_HW_CSUM;
+        if (WARN_ON(hw->netdev_features & ~feature_whitelist))
+                return -EINVAL;
+
         if (hw->max_report_rates == 0)
                 hw->max_report_rates = hw->max_rates;
 
@@ -1009,12 +1023,6 @@ void ieee80211_unregister_hw(struct ieee80211_hw *hw)
 
         rtnl_unlock();
 
-        /*
-         * Now all work items will be gone, but the
-         * timer might still be armed, so delete it
-         */
-        del_timer_sync(&local->work_timer);
-
         cancel_work_sync(&local->restart_work);
         cancel_work_sync(&local->reconfig_filter);
 
diff --git a/net/mac80211/mesh.c b/net/mac80211/mesh.c
index 2913113c583..6fac18c0423 100644
--- a/net/mac80211/mesh.c
+++ b/net/mac80211/mesh.c
@@ -133,7 +133,7 @@ bool mesh_peer_accepts_plinks(struct ieee802_11_elems *ie)
 }
 
 /**
- * mesh_accept_plinks_update: update accepting_plink in local mesh beacons
+ * mesh_accept_plinks_update - update accepting_plink in local mesh beacons
  *
  * @sdata: mesh interface in which mesh beacons are going to be updated
  */
@@ -443,7 +443,7 @@ static void ieee80211_mesh_path_root_timer(unsigned long data)
 
 void ieee80211_mesh_root_setup(struct ieee80211_if_mesh *ifmsh)
 {
-        if (ifmsh->mshcfg.dot11MeshHWMPRootMode)
+        if (ifmsh->mshcfg.dot11MeshHWMPRootMode > IEEE80211_ROOTMODE_ROOT)
                 set_bit(MESH_WORK_ROOT, &ifmsh->wrkq_flags);
         else {
                 clear_bit(MESH_WORK_ROOT, &ifmsh->wrkq_flags);
@@ -523,11 +523,6 @@ static void ieee80211_mesh_housekeeping(struct ieee80211_sub_if_data *sdata,
 {
         bool free_plinks;
 
-#ifdef CONFIG_MAC80211_VERBOSE_DEBUG
-        printk(KERN_DEBUG "%s: running mesh housekeeping\n",
-               sdata->name);
-#endif
-
         ieee80211_sta_expire(sdata, IEEE80211_MESH_PEER_INACTIVITY_LIMIT);
         mesh_path_expire(sdata);
 
@@ -542,11 +537,17 @@ static void ieee80211_mesh_housekeeping(struct ieee80211_sub_if_data *sdata,
 static void ieee80211_mesh_rootpath(struct ieee80211_sub_if_data *sdata)
 {
         struct ieee80211_if_mesh *ifmsh = &sdata->u.mesh;
+        u32 interval;
 
         mesh_path_tx_root_frame(sdata);
+
+        if (ifmsh->mshcfg.dot11MeshHWMPRootMode == IEEE80211_PROACTIVE_RANN)
+                interval = ifmsh->mshcfg.dot11MeshHWMPRannInterval;
+        else
+                interval = ifmsh->mshcfg.dot11MeshHWMProotInterval;
+
         mod_timer(&ifmsh->mesh_path_root_timer,
-                  round_jiffies(TU_TO_EXP_TIME(
-                                  ifmsh->mshcfg.dot11MeshHWMPRannInterval)));
+                  round_jiffies(TU_TO_EXP_TIME(interval)));
 }
 
 #ifdef CONFIG_PM
diff --git a/net/mac80211/mesh.h b/net/mac80211/mesh.h
index e3642756f8f..faaa39bcfd1 100644
--- a/net/mac80211/mesh.h
+++ b/net/mac80211/mesh.h
@@ -104,6 +104,7 @@ enum mesh_deferred_task_flags {
  * an mpath to a hash bucket on a path table.
  * @rann_snd_addr: the RANN sender address
  * @rann_metric: the aggregated path metric towards the root node
+ * @last_preq_to_root: Timestamp of last PREQ sent to root
  * @is_root: the destination station of this path is a root node
  * @is_gate: the destination station of this path is a mesh gate
  *
@@ -131,6 +132,7 @@ struct mesh_path {
         spinlock_t state_lock;
         u8 rann_snd_addr[ETH_ALEN];
         u32 rann_metric;
+        unsigned long last_preq_to_root;
         bool is_root;
         bool is_gate;
 };
@@ -245,7 +247,7 @@ void mesh_rmc_free(struct ieee80211_sub_if_data *sdata);
 int mesh_rmc_init(struct ieee80211_sub_if_data *sdata);
 void ieee80211s_init(void);
 void ieee80211s_update_metric(struct ieee80211_local *local,
-                struct sta_info *stainfo, struct sk_buff *skb);
+                struct sta_info *sta, struct sk_buff *skb);
 void ieee80211s_stop(void);
 void ieee80211_mesh_init_sdata(struct ieee80211_sub_if_data *sdata);
 void ieee80211_start_mesh(struct ieee80211_sub_if_data *sdata);
diff --git a/net/mac80211/mesh_hwmp.c b/net/mac80211/mesh_hwmp.c
index 9b59658e865..494bc39f61a 100644
--- a/net/mac80211/mesh_hwmp.c
+++ b/net/mac80211/mesh_hwmp.c
@@ -13,13 +13,6 @@
 #include "wme.h"
 #include "mesh.h"
 
-#ifdef CONFIG_MAC80211_VERBOSE_MHWMP_DEBUG
-#define mhwmp_dbg(fmt, args...) \
-        printk(KERN_DEBUG "Mesh HWMP (%s): " fmt "\n", sdata->name, ##args)
-#else
-#define mhwmp_dbg(fmt, args...)   do { (void)(0); } while (0)
-#endif
-
 #define TEST_FRAME_LEN  8192
 #define MAX_METRIC      0xffffffff
 #define ARITH_SHIFT     8
@@ -98,6 +91,8 @@ static inline u32 u16_field_get(u8 *preq_elem, int offset, bool ae)
 #define max_preq_retries(s) (s->u.mesh.mshcfg.dot11MeshHWMPmaxPREQretries)
 #define disc_timeout_jiff(s) \
         msecs_to_jiffies(sdata->u.mesh.mshcfg.min_discovery_timeout)
+#define root_path_confirmation_jiffies(s) \
+        msecs_to_jiffies(sdata->u.mesh.mshcfg.dot11MeshHWMPconfirmationInterval)
 
 enum mpath_frame_type {
         MPATH_PREQ = 0,
@@ -142,19 +137,19 @@ static int mesh_path_sel_frame_tx(enum mpath_frame_type action, u8 flags,
 
         switch (action) {
         case MPATH_PREQ:
-                mhwmp_dbg("sending PREQ to %pM", target);
+                mhwmp_dbg(sdata, "sending PREQ to %pM\n", target);
                 ie_len = 37;
                 pos = skb_put(skb, 2 + ie_len);
                 *pos++ = WLAN_EID_PREQ;
                 break;
         case MPATH_PREP:
-                mhwmp_dbg("sending PREP to %pM", target);
+                mhwmp_dbg(sdata, "sending PREP to %pM\n", target);
                 ie_len = 31;
                 pos = skb_put(skb, 2 + ie_len);
                 *pos++ = WLAN_EID_PREP;
                 break;
         case MPATH_RANN:
-                mhwmp_dbg("sending RANN from %pM", orig_addr);
+                mhwmp_dbg(sdata, "sending RANN from %pM\n", orig_addr);
                 ie_len = sizeof(struct ieee80211_rann_ie);
                 pos = skb_put(skb, 2 + ie_len);
                 *pos++ = WLAN_EID_RANN;
@@ -303,7 +298,7 @@ int mesh_path_error_tx(u8 ttl, u8 *target, __le32 target_sn,
 }
 
 void ieee80211s_update_metric(struct ieee80211_local *local,
-                struct sta_info *stainfo, struct sk_buff *skb)
+                struct sta_info *sta, struct sk_buff *skb)
 {
         struct ieee80211_tx_info *txinfo = IEEE80211_SKB_CB(skb);
         struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;
@@ -315,15 +310,14 @@ void ieee80211s_update_metric(struct ieee80211_local *local,
         failed = !(txinfo->flags & IEEE80211_TX_STAT_ACK);
 
         /* moving average, scaled to 100 */
-        stainfo->fail_avg = ((80 * stainfo->fail_avg + 5) / 100 + 20 * failed);
-        if (stainfo->fail_avg > 95)
-                mesh_plink_broken(stainfo);
+        sta->fail_avg = ((80 * sta->fail_avg + 5) / 100 + 20 * failed);
+        if (sta->fail_avg > 95)
+                mesh_plink_broken(sta);
 }
 
 static u32 airtime_link_metric_get(struct ieee80211_local *local,
                                    struct sta_info *sta)
 {
-        struct ieee80211_supported_band *sband;
         struct rate_info rinfo;
         /* This should be adjusted for each device */
         int device_constant = 1 << ARITH_SHIFT;
@@ -333,8 +327,6 @@ static u32 airtime_link_metric_get(struct ieee80211_local *local,
         u32 tx_time, estimated_retx;
         u64 result;
 
-        sband = local->hw.wiphy->bands[local->hw.conf.channel->band];
-
         if (sta->fail_avg >= 100)
                 return MAX_METRIC;
 
@@ -519,10 +511,11 @@ static void hwmp_preq_frame_process(struct ieee80211_sub_if_data *sdata,
         struct mesh_path *mpath = NULL;
         u8 *target_addr, *orig_addr;
         const u8 *da;
-        u8 target_flags, ttl;
-        u32 orig_sn, target_sn, lifetime;
+        u8 target_flags, ttl, flags;
+        u32 orig_sn, target_sn, lifetime, orig_metric;
         bool reply = false;
         bool forward = true;
+        bool root_is_gate;
 
         /* Update target SN, if present */
         target_addr = PREQ_IE_TARGET_ADDR(preq_elem);
@@ -530,11 +523,15 @@ static void hwmp_preq_frame_process(struct ieee80211_sub_if_data *sdata,
         target_sn = PREQ_IE_TARGET_SN(preq_elem);
         orig_sn = PREQ_IE_ORIG_SN(preq_elem);
         target_flags = PREQ_IE_TARGET_F(preq_elem);
+        orig_metric = metric;
+        /* Proactive PREQ gate announcements */
+        flags = PREQ_IE_FLAGS(preq_elem);
+        root_is_gate = !!(flags & RANN_FLAG_IS_GATE);
 
-        mhwmp_dbg("received PREQ from %pM", orig_addr);
+        mhwmp_dbg(sdata, "received PREQ from %pM\n", orig_addr);
 
         if (ether_addr_equal(target_addr, sdata->vif.addr)) {
-                mhwmp_dbg("PREQ is for us");
+                mhwmp_dbg(sdata, "PREQ is for us\n");
                 forward = false;
                 reply = true;
                 metric = 0;
@@ -544,6 +541,22 @@ static void hwmp_preq_frame_process(struct ieee80211_sub_if_data *sdata,
                         target_sn = ++ifmsh->sn;
                         ifmsh->last_sn_update = jiffies;
                 }
+        } else if (is_broadcast_ether_addr(target_addr) &&
+                   (target_flags & IEEE80211_PREQ_TO_FLAG)) {
+                rcu_read_lock();
+                mpath = mesh_path_lookup(orig_addr, sdata);
+                if (mpath) {
+                        if (flags & IEEE80211_PREQ_PROACTIVE_PREP_FLAG) {
+                                reply = true;
+                                target_addr = sdata->vif.addr;
+                                target_sn = ++ifmsh->sn;
+                                metric = 0;
+                                ifmsh->last_sn_update = jiffies;
+                        }
+                        if (root_is_gate)
+                                mesh_path_add_gate(mpath);
+                }
+                rcu_read_unlock();
         } else {
                 rcu_read_lock();
                 mpath = mesh_path_lookup(target_addr, sdata);
@@ -570,19 +583,20 @@ static void hwmp_preq_frame_process(struct ieee80211_sub_if_data *sdata,
                 lifetime = PREQ_IE_LIFETIME(preq_elem);
                 ttl = ifmsh->mshcfg.element_ttl;
                 if (ttl != 0) {
-                        mhwmp_dbg("replying to the PREQ");
+                        mhwmp_dbg(sdata, "replying to the PREQ\n");
                         mesh_path_sel_frame_tx(MPATH_PREP, 0, orig_addr,
                                 cpu_to_le32(orig_sn), 0, target_addr,
                                 cpu_to_le32(target_sn), mgmt->sa, 0, ttl,
                                 cpu_to_le32(lifetime), cpu_to_le32(metric),
                                 0, sdata);
-                } else
+                } else {
                         ifmsh->mshstats.dropped_frames_ttl++;
+                }
         }
 
         if (forward && ifmsh->mshcfg.dot11MeshForwarding) {
                 u32 preq_id;
-                u8 hopcount, flags;
+                u8 hopcount;
 
                 ttl = PREQ_IE_TTL(preq_elem);
                 lifetime = PREQ_IE_LIFETIME(preq_elem);
@@ -590,13 +604,19 @@ static void hwmp_preq_frame_process(struct ieee80211_sub_if_data *sdata,
                         ifmsh->mshstats.dropped_frames_ttl++;
                         return;
                 }
-                mhwmp_dbg("forwarding the PREQ from %pM", orig_addr);
+                mhwmp_dbg(sdata, "forwarding the PREQ from %pM\n", orig_addr);
                 --ttl;
-                flags = PREQ_IE_FLAGS(preq_elem);
                 preq_id = PREQ_IE_PREQ_ID(preq_elem);
                 hopcount = PREQ_IE_HOPCOUNT(preq_elem) + 1;
                 da = (mpath && mpath->is_root) ?
                         mpath->rann_snd_addr : broadcast_addr;
+
+                if (flags & IEEE80211_PREQ_PROACTIVE_PREP_FLAG) {
+                        target_addr = PREQ_IE_TARGET_ADDR(preq_elem);
+                        target_sn = PREQ_IE_TARGET_SN(preq_elem);
+                        metric = orig_metric;
+                }
+
                 mesh_path_sel_frame_tx(MPATH_PREQ, flags, orig_addr,
                                 cpu_to_le32(orig_sn), target_flags, target_addr,
                                 cpu_to_le32(target_sn), da,
@@ -631,7 +651,8 @@ static void hwmp_prep_frame_process(struct ieee80211_sub_if_data *sdata,
         u8 next_hop[ETH_ALEN];
         u32 target_sn, orig_sn, lifetime;
 
-        mhwmp_dbg("received PREP from %pM", PREP_IE_ORIG_ADDR(prep_elem));
+        mhwmp_dbg(sdata, "received PREP from %pM\n",
+                  PREP_IE_ORIG_ADDR(prep_elem));
 
         orig_addr = PREP_IE_ORIG_ADDR(prep_elem);
         if (ether_addr_equal(orig_addr, sdata->vif.addr))
@@ -744,11 +765,6 @@ static void hwmp_rann_frame_process(struct ieee80211_sub_if_data *sdata,
         bool root_is_gate;
 
         ttl = rann->rann_ttl;
-        if (ttl <= 1) {
-                ifmsh->mshstats.dropped_frames_ttl++;
-                return;
-        }
-        ttl--;
         flags = rann->rann_flags;
         root_is_gate = !!(flags & RANN_FLAG_IS_GATE);
         orig_addr = rann->rann_addr;
@@ -762,8 +778,9 @@ static void hwmp_rann_frame_process(struct ieee80211_sub_if_data *sdata,
         if (ether_addr_equal(orig_addr, sdata->vif.addr))
                 return;
 
-        mhwmp_dbg("received RANN from %pM via neighbour %pM (is_gate=%d)",
-                        orig_addr, mgmt->sa, root_is_gate);
+        mhwmp_dbg(sdata,
+                  "received RANN from %pM via neighbour %pM (is_gate=%d)\n",
+                  orig_addr, mgmt->sa, root_is_gate);
 
         rcu_read_lock();
         sta = sta_info_get(sdata, mgmt->sa);
@@ -785,34 +802,50 @@ static void hwmp_rann_frame_process(struct ieee80211_sub_if_data *sdata,
                 }
         }
 
+        if (!(SN_LT(mpath->sn, orig_sn)) &&
+            !(mpath->sn == orig_sn && metric < mpath->rann_metric)) {
+                rcu_read_unlock();
+                return;
+        }
+
         if ((!(mpath->flags & (MESH_PATH_ACTIVE | MESH_PATH_RESOLVING)) ||
-             time_after(jiffies, mpath->exp_time - 1*HZ)) &&
-             !(mpath->flags & MESH_PATH_FIXED)) {
-                mhwmp_dbg("%s time to refresh root mpath %pM", sdata->name,
-                                                               orig_addr);
+             (time_after(jiffies, mpath->last_preq_to_root +
+                                  root_path_confirmation_jiffies(sdata)) ||
+             time_before(jiffies, mpath->last_preq_to_root))) &&
+             !(mpath->flags & MESH_PATH_FIXED) && (ttl != 0)) {
+                mhwmp_dbg(sdata,
+                          "time to refresh root mpath %pM\n",
+                          orig_addr);
                 mesh_queue_preq(mpath, PREQ_Q_F_START | PREQ_Q_F_REFRESH);
+                mpath->last_preq_to_root = jiffies;
         }
 
-        if ((SN_LT(mpath->sn, orig_sn) || (mpath->sn == orig_sn &&
-           metric < mpath->rann_metric)) && ifmsh->mshcfg.dot11MeshForwarding) {
+        mpath->sn = orig_sn;
+        mpath->rann_metric = metric + metric_txsta;
+        mpath->is_root = true;
+        /* Recording RANNs sender address to send individually
+         * addressed PREQs destined for root mesh STA */
+        memcpy(mpath->rann_snd_addr, mgmt->sa, ETH_ALEN);
+
+        if (root_is_gate)
+                mesh_path_add_gate(mpath);
+
+        if (ttl <= 1) {
+                ifmsh->mshstats.dropped_frames_ttl++;
+                rcu_read_unlock();
+                return;
+        }
+        ttl--;
+
+        if (ifmsh->mshcfg.dot11MeshForwarding) {
                 mesh_path_sel_frame_tx(MPATH_RANN, flags, orig_addr,
                                        cpu_to_le32(orig_sn),
                                        0, NULL, 0, broadcast_addr,
                                        hopcount, ttl, cpu_to_le32(interval),
                                        cpu_to_le32(metric + metric_txsta),
                                        0, sdata);
-                mpath->sn = orig_sn;
-                mpath->rann_metric = metric + metric_txsta;
-                /* Recording RANNs sender address to send individually
-                 * addressed PREQs destined for root mesh STA */
-                memcpy(mpath->rann_snd_addr, mgmt->sa, ETH_ALEN);
         }
 
-        mpath->is_root = true;
-
-        if (root_is_gate)
-                mesh_path_add_gate(mpath);
-
         rcu_read_unlock();
 }
 
@@ -889,7 +922,7 @@ static void mesh_queue_preq(struct mesh_path *mpath, u8 flags)
 
         preq_node = kmalloc(sizeof(struct mesh_preq_queue), GFP_ATOMIC);
         if (!preq_node) {
-                mhwmp_dbg("could not allocate PREQ node");
+                mhwmp_dbg(sdata, "could not allocate PREQ node\n");
                 return;
         }
 
@@ -898,7 +931,7 @@ static void mesh_queue_preq(struct mesh_path *mpath, u8 flags)
                 spin_unlock_bh(&ifmsh->mesh_preq_queue_lock);
                 kfree(preq_node);
                 if (printk_ratelimit())
-                        mhwmp_dbg("PREQ node queue full");
+                        mhwmp_dbg(sdata, "PREQ node queue full\n");
                 return;
         }
 
@@ -1021,12 +1054,15 @@ enddiscovery:
         kfree(preq_node);
 }
 
-/* mesh_nexthop_resolve - lookup next hop for given skb and start path
- * discovery if no forwarding information is found.
+/**
+ * mesh_nexthop_resolve - lookup next hop; conditionally start path discovery
  *
  * @skb: 802.11 frame to be sent
  * @sdata: network subif the frame will be sent through
  *
+ * Lookup next hop for given skb and start path discovery if no
+ * forwarding information is found.
+ *
  * Returns: 0 if the next hop was found and -ENOENT if the frame was queued.
  * skb is freeed here if no mpath could be allocated.
  */
@@ -1146,7 +1182,7 @@ void mesh_path_timer(unsigned long data)
                 if (!mpath->is_gate && mesh_gate_num(sdata) > 0) {
                         ret = mesh_path_send_to_gates(mpath);
                         if (ret)
-                                mhwmp_dbg("no gate was reachable");
+                                mhwmp_dbg(sdata, "no gate was reachable\n");
                 } else
                         mesh_path_flush_pending(mpath);
         }
@@ -1157,13 +1193,34 @@ mesh_path_tx_root_frame(struct ieee80211_sub_if_data *sdata)
 {
         struct ieee80211_if_mesh *ifmsh = &sdata->u.mesh;
         u32 interval = ifmsh->mshcfg.dot11MeshHWMPRannInterval;
-        u8 flags;
+        u8 flags, target_flags = 0;
 
         flags = (ifmsh->mshcfg.dot11MeshGateAnnouncementProtocol)
                         ? RANN_FLAG_IS_GATE : 0;
-        mesh_path_sel_frame_tx(MPATH_RANN, flags, sdata->vif.addr,
+
+        switch (ifmsh->mshcfg.dot11MeshHWMPRootMode) {
+        case IEEE80211_PROACTIVE_RANN:
+                mesh_path_sel_frame_tx(MPATH_RANN, flags, sdata->vif.addr,
                                cpu_to_le32(++ifmsh->sn),
                                0, NULL, 0, broadcast_addr,
-                               0, sdata->u.mesh.mshcfg.element_ttl,
+                               0, ifmsh->mshcfg.element_ttl,
                                cpu_to_le32(interval), 0, 0, sdata);
+                break;
+        case IEEE80211_PROACTIVE_PREQ_WITH_PREP:
+                flags |= IEEE80211_PREQ_PROACTIVE_PREP_FLAG;
+        case IEEE80211_PROACTIVE_PREQ_NO_PREP:
+                interval = ifmsh->mshcfg.dot11MeshHWMPactivePathToRootTimeout;
+                target_flags |= IEEE80211_PREQ_TO_FLAG |
+                                IEEE80211_PREQ_USN_FLAG;
+                mesh_path_sel_frame_tx(MPATH_PREQ, flags, sdata->vif.addr,
+                                cpu_to_le32(++ifmsh->sn), target_flags,
+                                (u8 *) broadcast_addr, 0, broadcast_addr,
+                                0, ifmsh->mshcfg.element_ttl,
+                                cpu_to_le32(interval),
+                                0, cpu_to_le32(ifmsh->preq_id++), sdata);
+                break;
+        default:
+                mhwmp_dbg(sdata, "Proactive mechanism not supported\n");
+                return;
+        }
 }
diff --git a/net/mac80211/mesh_pathtbl.c b/net/mac80211/mesh_pathtbl.c
index b39224d8255..075bc535c60 100644
--- a/net/mac80211/mesh_pathtbl.c
+++ b/net/mac80211/mesh_pathtbl.c
@@ -18,12 +18,6 @@
 #include "ieee80211_i.h"
 #include "mesh.h"
 
-#ifdef CONFIG_MAC80211_VERBOSE_MPATH_DEBUG
-#define mpath_dbg(fmt, args...) printk(KERN_DEBUG fmt, ##args)
-#else
-#define mpath_dbg(fmt, args...) do { (void)(0); } while (0)
-#endif
-
 /* There will be initially 2^INIT_PATHS_SIZE_ORDER buckets */
 #define INIT_PATHS_SIZE_ORDER   2
 
@@ -322,9 +316,8 @@ static void mesh_path_move_to_queue(struct mesh_path *gate_mpath,
 
         spin_lock_irqsave(&gate_mpath->frame_queue.lock, flags);
         skb_queue_splice(&gateq, &gate_mpath->frame_queue);
-        mpath_dbg("Mpath queue for gate %pM has %d frames\n",
-                        gate_mpath->dst,
-                        skb_queue_len(&gate_mpath->frame_queue));
+        mpath_dbg(gate_mpath->sdata, "Mpath queue for gate %pM has %d frames\n",
+                  gate_mpath->dst, skb_queue_len(&gate_mpath->frame_queue));
         spin_unlock_irqrestore(&gate_mpath->frame_queue.lock, flags);
 
         if (!copy)
@@ -446,9 +439,9 @@ int mesh_path_add_gate(struct mesh_path *mpath)
         hlist_add_head_rcu(&new_gate->list, tbl->known_gates);
         spin_unlock_bh(&tbl->gates_lock);
         rcu_read_unlock();
-        mpath_dbg("Mesh path (%s): Recorded new gate: %pM. %d known gates\n",
-                  mpath->sdata->name, mpath->dst,
-                  mpath->sdata->u.mesh.num_gates);
+        mpath_dbg(mpath->sdata,
+                  "Mesh path: Recorded new gate: %pM. %d known gates\n",
+                  mpath->dst, mpath->sdata->u.mesh.num_gates);
         return 0;
 err_rcu:
         rcu_read_unlock();
@@ -477,8 +470,8 @@ static int mesh_gate_del(struct mesh_table *tbl, struct mesh_path *mpath)
                         spin_unlock_bh(&tbl->gates_lock);
                         mpath->sdata->u.mesh.num_gates--;
                         mpath->is_gate = false;
-                        mpath_dbg("Mesh path (%s): Deleted gate: %pM. "
-                                  "%d known gates\n", mpath->sdata->name,
+                        mpath_dbg(mpath->sdata,
+                                  "Mesh path: Deleted gate: %pM. %d known gates\n",
                                   mpath->dst, mpath->sdata->u.mesh.num_gates);
                         break;
                 }
@@ -785,7 +778,7 @@ static void __mesh_path_del(struct mesh_table *tbl, struct mpath_node *node)
 /**
  * mesh_path_flush_by_nexthop - Deletes mesh paths if their next hop matches
  *
- * @sta - mesh peer to match
+ * @sta: mesh peer to match
  *
  * RCU notes: this function is called when a mesh plink transitions from
  * PLINK_ESTAB to any other state, since PLINK_ESTAB state is the only one that
@@ -840,7 +833,7 @@ static void table_flush_by_iface(struct mesh_table *tbl,
  *
  * This function deletes both mesh paths as well as mesh portal paths.
  *
- * @sdata - interface data to match
+ * @sdata: interface data to match
  *
  */
 void mesh_path_flush_by_iface(struct ieee80211_sub_if_data *sdata)
@@ -946,19 +939,20 @@ int mesh_path_send_to_gates(struct mesh_path *mpath)
                         continue;
 
                 if (gate->mpath->flags & MESH_PATH_ACTIVE) {
-                        mpath_dbg("Forwarding to %pM\n", gate->mpath->dst);
+                        mpath_dbg(sdata, "Forwarding to %pM\n", gate->mpath->dst);
                         mesh_path_move_to_queue(gate->mpath, from_mpath, copy);
                         from_mpath = gate->mpath;
                         copy = true;
                 } else {
-                        mpath_dbg("Not forwarding %p\n", gate->mpath);
-                        mpath_dbg("flags %x\n", gate->mpath->flags);
+                        mpath_dbg(sdata,
+                                  "Not forwarding %p (flags %#x)\n",
+                                  gate->mpath, gate->mpath->flags);
                 }
         }
 
         hlist_for_each_entry_rcu(gate, n, known_gates, list)
                 if (gate->mpath->sdata == sdata) {
-                        mpath_dbg("Sending to %pM\n", gate->mpath->dst);
+                        mpath_dbg(sdata, "Sending to %pM\n", gate->mpath->dst);
                         mesh_path_tx_pending(gate->mpath);
                 }
 
diff --git a/net/mac80211/mesh_plink.c b/net/mac80211/mesh_plink.c
index 60ef235c9d9..9ad74dd87a7 100644
--- a/net/mac80211/mesh_plink.c
+++ b/net/mac80211/mesh_plink.c
@@ -13,12 +13,6 @@
 #include "rate.h"
 #include "mesh.h"
 
-#ifdef CONFIG_MAC80211_VERBOSE_MPL_DEBUG
-#define mpl_dbg(fmt, args...)   printk(KERN_DEBUG fmt, ##args)
-#else
-#define mpl_dbg(fmt, args...)   do { (void)(0); } while (0)
-#endif
-
 #define PLINK_GET_LLID(p) (p + 2)
 #define PLINK_GET_PLID(p) (p + 4)
 
@@ -105,7 +99,7 @@ static struct sta_info *mesh_plink_alloc(struct ieee80211_sub_if_data *sdata,
         return sta;
 }
 
-/*
+/**
  * mesh_set_ht_prot_mode - set correct HT protection mode
  *
  * Section 9.23.3.5 of IEEE 80211-2012 describes the protection rules for HT
@@ -134,12 +128,14 @@ static u32 mesh_set_ht_prot_mode(struct ieee80211_sub_if_data *sdata)
 
                 switch (sta->ch_type) {
                 case NL80211_CHAN_NO_HT:
-                        mpl_dbg("mesh_plink %pM: nonHT sta (%pM) is present",
+                        mpl_dbg(sdata,
+                                "mesh_plink %pM: nonHT sta (%pM) is present\n",
                                 sdata->vif.addr, sta->sta.addr);
                         non_ht_sta = true;
                         goto out;
                 case NL80211_CHAN_HT20:
-                        mpl_dbg("mesh_plink %pM: HT20 sta (%pM) is present",
+                        mpl_dbg(sdata,
+                                "mesh_plink %pM: HT20 sta (%pM) is present\n",
                                 sdata->vif.addr, sta->sta.addr);
                         ht20_sta = true;
                 default:
@@ -160,7 +156,8 @@ out:
                 sdata->vif.bss_conf.ht_operation_mode = ht_opmode;
                 sdata->u.mesh.mshcfg.ht_opmode = ht_opmode;
                 changed = BSS_CHANGED_HT;
-                mpl_dbg("mesh_plink %pM: protection mode changed to %d",
+                mpl_dbg(sdata,
+                        "mesh_plink %pM: protection mode changed to %d\n",
                         sdata->vif.addr, ht_opmode);
         }
 
@@ -323,7 +320,8 @@ static int mesh_plink_frame_tx(struct ieee80211_sub_if_data *sdata,
         return 0;
 }
 
-/* mesh_peer_init - initialize new mesh peer and return resulting sta_info
+/**
+ * mesh_peer_init - initialize new mesh peer and return resulting sta_info
  *
  * @sdata: local meshif
  * @addr: peer's address
@@ -437,7 +435,8 @@ static void mesh_plink_timer(unsigned long data)
                 spin_unlock_bh(&sta->lock);
                 return;
         }
-        mpl_dbg("Mesh plink timer for %pM fired on state %d\n",
+        mpl_dbg(sta->sdata,
+                "Mesh plink timer for %pM fired on state %d\n",
                 sta->sta.addr, sta->plink_state);
         reason = 0;
         llid = sta->llid;
@@ -450,7 +449,8 @@ static void mesh_plink_timer(unsigned long data)
                 /* retry timer */
                 if (sta->plink_retries < dot11MeshMaxRetries(sdata)) {
                         u32 rand;
-                        mpl_dbg("Mesh plink for %pM (retry, timeout): %d %d\n",
+                        mpl_dbg(sta->sdata,
+                                "Mesh plink for %pM (retry, timeout): %d %d\n",
                                 sta->sta.addr, sta->plink_retries,
                                 sta->plink_timeout);
                         get_random_bytes(&rand, sizeof(u32));
@@ -530,7 +530,8 @@ int mesh_plink_open(struct sta_info *sta)
         sta->plink_state = NL80211_PLINK_OPN_SNT;
         mesh_plink_timer_set(sta, dot11MeshRetryTimeout(sdata));
         spin_unlock_bh(&sta->lock);
-        mpl_dbg("Mesh plink: starting establishment with %pM\n",
+        mpl_dbg(sdata,
+                "Mesh plink: starting establishment with %pM\n",
                 sta->sta.addr);
 
         return mesh_plink_frame_tx(sdata, WLAN_SP_MESH_PEERING_OPEN,
@@ -565,7 +566,6 @@ void mesh_rx_plink_frame(struct ieee80211_sub_if_data *sdata, struct ieee80211_m
         u8 *baseaddr;
         u32 changed = 0;
         __le16 plid, llid, reason;
-#ifdef CONFIG_MAC80211_VERBOSE_MPL_DEBUG
         static const char *mplstates[] = {
                 [NL80211_PLINK_LISTEN] = "LISTEN",
                 [NL80211_PLINK_OPN_SNT] = "OPN-SNT",
@@ -575,14 +575,14 @@ void mesh_rx_plink_frame(struct ieee80211_sub_if_data *sdata, struct ieee80211_m
                 [NL80211_PLINK_HOLDING] = "HOLDING",
                 [NL80211_PLINK_BLOCKED] = "BLOCKED"
         };
-#endif
 
         /* need action_code, aux */
         if (len < IEEE80211_MIN_ACTION_SIZE + 3)
                 return;
 
         if (is_multicast_ether_addr(mgmt->da)) {
-                mpl_dbg("Mesh plink: ignore frame from multicast address");
+                mpl_dbg(sdata,
+                        "Mesh plink: ignore frame from multicast address\n");
                 return;
         }
 
@@ -595,12 +595,14 @@ void mesh_rx_plink_frame(struct ieee80211_sub_if_data *sdata, struct ieee80211_m
         }
         ieee802_11_parse_elems(baseaddr, len - baselen, &elems);
         if (!elems.peering) {
-                mpl_dbg("Mesh plink: missing necessary peer link ie\n");
+                mpl_dbg(sdata,
+                        "Mesh plink: missing necessary peer link ie\n");
                 return;
         }
         if (elems.rsn_len &&
                         sdata->u.mesh.security == IEEE80211_MESH_SEC_NONE) {
-                mpl_dbg("Mesh plink: can't establish link with secure peer\n");
+                mpl_dbg(sdata,
+                        "Mesh plink: can't establish link with secure peer\n");
                 return;
         }
 
@@ -610,14 +612,15 @@ void mesh_rx_plink_frame(struct ieee80211_sub_if_data *sdata, struct ieee80211_m
             (ftype == WLAN_SP_MESH_PEERING_CONFIRM && ie_len != 6) ||
             (ftype == WLAN_SP_MESH_PEERING_CLOSE && ie_len != 6
                                                         && ie_len != 8)) {
-                mpl_dbg("Mesh plink: incorrect plink ie length %d %d\n",
-                    ftype, ie_len);
+                mpl_dbg(sdata,
+                        "Mesh plink: incorrect plink ie length %d %d\n",
+                        ftype, ie_len);
                 return;
         }
 
         if (ftype != WLAN_SP_MESH_PEERING_CLOSE &&
                                 (!elems.mesh_id || !elems.mesh_config)) {
-                mpl_dbg("Mesh plink: missing necessary ie\n");
+                mpl_dbg(sdata, "Mesh plink: missing necessary ie\n");
                 return;
         }
         /* Note the lines below are correct, the llid in the frame is the plid
@@ -632,21 +635,21 @@ void mesh_rx_plink_frame(struct ieee80211_sub_if_data *sdata, struct ieee80211_m
 
         sta = sta_info_get(sdata, mgmt->sa);
         if (!sta && ftype != WLAN_SP_MESH_PEERING_OPEN) {
-                mpl_dbg("Mesh plink: cls or cnf from unknown peer\n");
+                mpl_dbg(sdata, "Mesh plink: cls or cnf from unknown peer\n");
                 rcu_read_unlock();
                 return;
         }
 
         if (ftype == WLAN_SP_MESH_PEERING_OPEN &&
             !rssi_threshold_check(sta, sdata)) {
-                mpl_dbg("Mesh plink: %pM does not meet rssi threshold\n",
+                mpl_dbg(sdata, "Mesh plink: %pM does not meet rssi threshold\n",
                         mgmt->sa);
                 rcu_read_unlock();
                 return;
         }
 
         if (sta && !test_sta_flag(sta, WLAN_STA_AUTH)) {
-                mpl_dbg("Mesh plink: Action frame from non-authed peer\n");
+                mpl_dbg(sdata, "Mesh plink: Action frame from non-authed peer\n");
                 rcu_read_unlock();
                 return;
         }
@@ -683,7 +686,7 @@ void mesh_rx_plink_frame(struct ieee80211_sub_if_data *sdata, struct ieee80211_m
         } else if (!sta) {
                 /* ftype == WLAN_SP_MESH_PEERING_OPEN */
                 if (!mesh_plink_free_count(sdata)) {
-                        mpl_dbg("Mesh plink error: no more free plinks\n");
+                        mpl_dbg(sdata, "Mesh plink error: no more free plinks\n");
                         rcu_read_unlock();
                         return;
                 }
@@ -724,7 +727,7 @@ void mesh_rx_plink_frame(struct ieee80211_sub_if_data *sdata, struct ieee80211_m
                                 event = CLS_ACPT;
                         break;
                 default:
-                        mpl_dbg("Mesh plink: unknown frame subtype\n");
+                        mpl_dbg(sdata, "Mesh plink: unknown frame subtype\n");
                         rcu_read_unlock();
                         return;
                 }
@@ -734,13 +737,14 @@ void mesh_rx_plink_frame(struct ieee80211_sub_if_data *sdata, struct ieee80211_m
                 /* allocate sta entry if necessary and update info */
                 sta = mesh_peer_init(sdata, mgmt->sa, &elems);
                 if (!sta) {
-                        mpl_dbg("Mesh plink: failed to init peer!\n");
+                        mpl_dbg(sdata, "Mesh plink: failed to init peer!\n");
                         rcu_read_unlock();
                         return;
                 }
         }
 
-        mpl_dbg("Mesh plink (peer, state, llid, plid, event): %pM %s %d %d %d\n",
+        mpl_dbg(sdata,
+                "Mesh plink (peer, state, llid, plid, event): %pM %s %d %d %d\n",
                 mgmt->sa, mplstates[sta->plink_state],
                 le16_to_cpu(sta->llid), le16_to_cpu(sta->plid),
                 event);
@@ -851,7 +855,7 @@ void mesh_rx_plink_frame(struct ieee80211_sub_if_data *sdata, struct ieee80211_m
                         mesh_plink_inc_estab_count(sdata);
                         changed |= mesh_set_ht_prot_mode(sdata);
                         changed |= BSS_CHANGED_BEACON;
-                        mpl_dbg("Mesh plink with %pM ESTABLISHED\n",
+                        mpl_dbg(sdata, "Mesh plink with %pM ESTABLISHED\n",
                                 sta->sta.addr);
                         break;
                 default:
@@ -887,7 +891,7 @@ void mesh_rx_plink_frame(struct ieee80211_sub_if_data *sdata, struct ieee80211_m
                         mesh_plink_inc_estab_count(sdata);
                         changed |= mesh_set_ht_prot_mode(sdata);
                         changed |= BSS_CHANGED_BEACON;
-                        mpl_dbg("Mesh plink with %pM ESTABLISHED\n",
+                        mpl_dbg(sdata, "Mesh plink with %pM ESTABLISHED\n",
                                 sta->sta.addr);
                         mesh_plink_frame_tx(sdata,
                                             WLAN_SP_MESH_PEERING_CONFIRM,
diff --git a/net/mac80211/mesh_sync.c b/net/mac80211/mesh_sync.c
index 38d30e8ce6d..accfa00ffcd 100644
--- a/net/mac80211/mesh_sync.c
+++ b/net/mac80211/mesh_sync.c
@@ -12,13 +12,6 @@
 #include "mesh.h"
 #include "driver-ops.h"
 
-#ifdef CONFIG_MAC80211_VERBOSE_MESH_SYNC_DEBUG
-#define msync_dbg(fmt, args...) \
-        printk(KERN_DEBUG "Mesh sync (%s): " fmt "\n", sdata->name, ##args)
-#else
-#define msync_dbg(fmt, args...)   do { (void)(0); } while (0)
-#endif
-
 /* This is not in the standard.  It represents a tolerable tbtt drift below
  * which we do no TSF adjustment.
  */
@@ -65,14 +58,14 @@ void mesh_sync_adjust_tbtt(struct ieee80211_sub_if_data *sdata)
         spin_lock_bh(&ifmsh->sync_offset_lock);
 
         if (ifmsh->sync_offset_clockdrift_max < beacon_int_fraction) {
-                msync_dbg("TBTT : max clockdrift=%lld; adjusting",
-                        (long long) ifmsh->sync_offset_clockdrift_max);
+                msync_dbg(sdata, "TBTT : max clockdrift=%lld; adjusting\n",
+                          (long long) ifmsh->sync_offset_clockdrift_max);
                 tsfdelta = -ifmsh->sync_offset_clockdrift_max;
                 ifmsh->sync_offset_clockdrift_max = 0;
         } else {
-                msync_dbg("TBTT : max clockdrift=%lld; adjusting by %llu",
-                        (long long) ifmsh->sync_offset_clockdrift_max,
-                        (unsigned long long) beacon_int_fraction);
+                msync_dbg(sdata, "TBTT : max clockdrift=%lld; adjusting by %llu\n",
+                          (long long) ifmsh->sync_offset_clockdrift_max,
+                          (unsigned long long) beacon_int_fraction);
                 tsfdelta = -beacon_int_fraction;
                 ifmsh->sync_offset_clockdrift_max -= beacon_int_fraction;
         }
@@ -120,7 +113,7 @@ static void mesh_sync_offset_rx_bcn_presp(struct ieee80211_sub_if_data *sdata,
 
         if (elems->mesh_config && mesh_peer_tbtt_adjusting(elems)) {
                 clear_sta_flag(sta, WLAN_STA_TOFFSET_KNOWN);
-                msync_dbg("STA %pM : is adjusting TBTT", sta->sta.addr);
+                msync_dbg(sdata, "STA %pM : is adjusting TBTT\n", sta->sta.addr);
                 goto no_sync;
         }
 
@@ -169,7 +162,8 @@ static void mesh_sync_offset_rx_bcn_presp(struct ieee80211_sub_if_data *sdata,
         if (test_sta_flag(sta, WLAN_STA_TOFFSET_KNOWN)) {
                 s64 t_clockdrift = sta->t_offset_setpoint
                                    - sta->t_offset;
-                msync_dbg("STA %pM : sta->t_offset=%lld, sta->t_offset_setpoint=%lld, t_clockdrift=%lld",
+                msync_dbg(sdata,
+                          "STA %pM : sta->t_offset=%lld, sta->t_offset_setpoint=%lld, t_clockdrift=%lld\n",
                           sta->sta.addr,
                           (long long) sta->t_offset,
                           (long long)
@@ -178,7 +172,8 @@ static void mesh_sync_offset_rx_bcn_presp(struct ieee80211_sub_if_data *sdata,
 
                 if (t_clockdrift > TOFFSET_MAXIMUM_ADJUSTMENT ||
                         t_clockdrift < -TOFFSET_MAXIMUM_ADJUSTMENT) {
-                        msync_dbg("STA %pM : t_clockdrift=%lld too large, setpoint reset",
+                        msync_dbg(sdata,
+                                  "STA %pM : t_clockdrift=%lld too large, setpoint reset\n",
                                   sta->sta.addr,
                                   (long long) t_clockdrift);
                         clear_sta_flag(sta, WLAN_STA_TOFFSET_KNOWN);
@@ -197,8 +192,8 @@ static void mesh_sync_offset_rx_bcn_presp(struct ieee80211_sub_if_data *sdata,
         } else {
                 sta->t_offset_setpoint = sta->t_offset - TOFFSET_SET_MARGIN;
                 set_sta_flag(sta, WLAN_STA_TOFFSET_KNOWN);
-                msync_dbg("STA %pM : offset was invalid, "
-                          " sta->t_offset=%lld",
+                msync_dbg(sdata,
+                          "STA %pM : offset was invalid, sta->t_offset=%lld\n",
                           sta->sta.addr,
                           (long long) sta->t_offset);
                 rcu_read_unlock();
@@ -226,17 +221,15 @@ static void mesh_sync_offset_adjust_tbtt(struct ieee80211_sub_if_data *sdata)
                  * to the driver tsf setter, we punt
                  * the tsf adjustment to the mesh tasklet
                  */
-                msync_dbg("TBTT : kicking off TBTT "
-                          "adjustment with "
-                          "clockdrift_max=%lld",
-                  ifmsh->sync_offset_clockdrift_max);
+                msync_dbg(sdata,
+                          "TBTT : kicking off TBTT adjustment with clockdrift_max=%lld\n",
+                          ifmsh->sync_offset_clockdrift_max);
                 set_bit(MESH_WORK_DRIFT_ADJUST,
                         &ifmsh->wrkq_flags);
         } else {
-                msync_dbg("TBTT : max clockdrift=%lld; "
-                          "too small to adjust",
-                          (long long)
-                       ifmsh->sync_offset_clockdrift_max);
+                msync_dbg(sdata,
+                          "TBTT : max clockdrift=%lld; too small to adjust\n",
+                          (long long)ifmsh->sync_offset_clockdrift_max);
                 ifmsh->sync_offset_clockdrift_max = 0;
         }
         spin_unlock_bh(&ifmsh->sync_offset_lock);
@@ -268,7 +261,7 @@ static void mesh_sync_vendor_rx_bcn_presp(struct ieee80211_sub_if_data *sdata,
         const u8 *oui;
 
         WARN_ON(sdata->u.mesh.mesh_sp_id != IEEE80211_SYNC_METHOD_VENDOR);
-        msync_dbg("called mesh_sync_vendor_rx_bcn_presp");
+        msync_dbg(sdata, "called mesh_sync_vendor_rx_bcn_presp\n");
         oui = mesh_get_vendor_oui(sdata);
         /*  here you would implement the vendor offset tracking for this oui */
 }
@@ -278,7 +271,7 @@ static void mesh_sync_vendor_adjust_tbtt(struct ieee80211_sub_if_data *sdata)
         const u8 *oui;
 
         WARN_ON(sdata->u.mesh.mesh_sp_id != IEEE80211_SYNC_METHOD_VENDOR);
-        msync_dbg("called mesh_sync_vendor_adjust_tbtt");
+        msync_dbg(sdata, "called mesh_sync_vendor_adjust_tbtt\n");
         oui = mesh_get_vendor_oui(sdata);
         /*  here you would implement the vendor tsf adjustment for this oui */
 }
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index 0db5d34a06b..aa69a331f37 100644
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -258,12 +258,11 @@ static int ieee80211_compatible_rates(const u8 *supp_rates, int supp_rates_len,
 }
 
 static void ieee80211_add_ht_ie(struct ieee80211_sub_if_data *sdata,
-                                struct sk_buff *skb, const u8 *ht_oper_ie,
+                                struct sk_buff *skb, u8 ap_ht_param,
                                 struct ieee80211_supported_band *sband,
                                 struct ieee80211_channel *channel,
                                 enum ieee80211_smps_mode smps)
 {
-        struct ieee80211_ht_operation *ht_oper;
         u8 *pos;
         u32 flags = channel->flags;
         u16 cap;
@@ -271,21 +270,13 @@ static void ieee80211_add_ht_ie(struct ieee80211_sub_if_data *sdata,
 
         BUILD_BUG_ON(sizeof(ht_cap) != sizeof(sband->ht_cap));
 
-        if (!ht_oper_ie)
-                return;
-
-        if (ht_oper_ie[1] < sizeof(struct ieee80211_ht_operation))
-                return;
-
         memcpy(&ht_cap, &sband->ht_cap, sizeof(ht_cap));
         ieee80211_apply_htcap_overrides(sdata, &ht_cap);
 
-        ht_oper = (struct ieee80211_ht_operation *)(ht_oper_ie + 2);
-
         /* determine capability flags */
         cap = ht_cap.cap;
 
-        switch (ht_oper->ht_param & IEEE80211_HT_PARAM_CHA_SEC_OFFSET) {
+        switch (ap_ht_param & IEEE80211_HT_PARAM_CHA_SEC_OFFSET) {
         case IEEE80211_HT_PARAM_CHA_SEC_ABOVE:
                 if (flags & IEEE80211_CHAN_NO_HT40PLUS) {
                         cap &= ~IEEE80211_HT_CAP_SUP_WIDTH_20_40;
@@ -509,7 +500,7 @@ static void ieee80211_send_assoc(struct ieee80211_sub_if_data *sdata)
         }
 
         if (!(ifmgd->flags & IEEE80211_STA_DISABLE_11N))
-                ieee80211_add_ht_ie(sdata, skb, assoc_data->ht_operation_ie,
+                ieee80211_add_ht_ie(sdata, skb, assoc_data->ap_ht_param,
                                     sband, local->oper_channel, ifmgd->ap_smps);
 
         /* if present, add any custom non-vendor IEs that go after HT */
@@ -939,11 +930,6 @@ void ieee80211_recalc_ps(struct ieee80211_local *local, s32 latency)
                 return;
         }
 
-        if (!list_empty(&local->work_list)) {
-                local->ps_sdata = NULL;
-                goto change;
-        }
-
         list_for_each_entry(sdata, &local->interfaces, list) {
                 if (!ieee80211_sdata_running(sdata))
                         continue;
@@ -1016,7 +1002,6 @@ void ieee80211_recalc_ps(struct ieee80211_local *local, s32 latency)
                 local->ps_sdata = NULL;
         }
 
- change:
         ieee80211_change_ps(local);
 }
 
@@ -1156,7 +1141,7 @@ static void ieee80211_sta_wmm_params(struct ieee80211_local *local,
 
         memset(&params, 0, sizeof(params));
 
-        local->wmm_acm = 0;
+        sdata->wmm_acm = 0;
         for (; left >= 4; left -= 4, pos += 4) {
                 int aci = (pos[0] >> 5) & 0x03;
                 int acm = (pos[0] >> 4) & 0x01;
@@ -1167,21 +1152,21 @@ static void ieee80211_sta_wmm_params(struct ieee80211_local *local,
                 case 1: /* AC_BK */
                         queue = 3;
                         if (acm)
-                                local->wmm_acm |= BIT(1) | BIT(2); /* BK/- */
+                                sdata->wmm_acm |= BIT(1) | BIT(2); /* BK/- */
                         if (uapsd_queues & IEEE80211_WMM_IE_STA_QOSINFO_AC_BK)
                                 uapsd = true;
                         break;
                 case 2: /* AC_VI */
                         queue = 1;
                         if (acm)
-                                local->wmm_acm |= BIT(4) | BIT(5); /* CL/VI */
+                                sdata->wmm_acm |= BIT(4) | BIT(5); /* CL/VI */
                         if (uapsd_queues & IEEE80211_WMM_IE_STA_QOSINFO_AC_VI)
                                 uapsd = true;
                         break;
                 case 3: /* AC_VO */
                         queue = 0;
                         if (acm)
-                                local->wmm_acm |= BIT(6) | BIT(7); /* VO/NC */
+                                sdata->wmm_acm |= BIT(6) | BIT(7); /* VO/NC */
                         if (uapsd_queues & IEEE80211_WMM_IE_STA_QOSINFO_AC_VO)
                                 uapsd = true;
                         break;
@@ -1189,7 +1174,7 @@ static void ieee80211_sta_wmm_params(struct ieee80211_local *local,
                 default:
                         queue = 2;
                         if (acm)
-                                local->wmm_acm |= BIT(0) | BIT(3); /* BE/EE */
+                                sdata->wmm_acm |= BIT(0) | BIT(3); /* BE/EE */
                         if (uapsd_queues & IEEE80211_WMM_IE_STA_QOSINFO_AC_BE)
                                 uapsd = true;
                         break;
@@ -1201,19 +1186,16 @@ static void ieee80211_sta_wmm_params(struct ieee80211_local *local,
                 params.txop = get_unaligned_le16(pos + 2);
                 params.uapsd = uapsd;
 
-#ifdef CONFIG_MAC80211_VERBOSE_DEBUG
-                wiphy_debug(local->hw.wiphy,
-                            "WMM queue=%d aci=%d acm=%d aifs=%d "
-                            "cWmin=%d cWmax=%d txop=%d uapsd=%d\n",
-                            queue, aci, acm,
-                            params.aifs, params.cw_min, params.cw_max,
-                            params.txop, params.uapsd);
-#endif
+                mlme_dbg(sdata,
+                         "WMM queue=%d aci=%d acm=%d aifs=%d cWmin=%d cWmax=%d txop=%d uapsd=%d\n",
+                         queue, aci, acm,
+                         params.aifs, params.cw_min, params.cw_max,
+                         params.txop, params.uapsd);
                 sdata->tx_conf[queue] = params;
                 if (drv_conf_tx(local, sdata, queue, &params))
-                        wiphy_debug(local->hw.wiphy,
-                                    "failed to set TX queue parameters for queue %d\n",
-                                    queue);
+                        sdata_err(sdata,
+                                  "failed to set TX queue parameters for queue %d\n",
+                                  queue);
         }
 
         /* enable WMM or activate new settings */
@@ -1290,7 +1272,7 @@ static void ieee80211_set_associated(struct ieee80211_sub_if_data *sdata,
 
         bss_info_changed |= BSS_CHANGED_BEACON_INT;
         bss_info_changed |= ieee80211_handle_bss_capability(sdata,
-                cbss->capability, bss->has_erp_value, bss->erp_value);
+                bss_conf->assoc_capability, bss->has_erp_value, bss->erp_value);
 
         sdata->u.mgd.beacon_timeout = usecs_to_jiffies(ieee80211_tu_to_usec(
                 IEEE80211_BEACON_LOSS_COUNT * bss_conf->beacon_int));
@@ -1581,11 +1563,12 @@ static void ieee80211_mgd_probe_ap(struct ieee80211_sub_if_data *sdata,
                 goto out;
         }
 
-#ifdef CONFIG_MAC80211_VERBOSE_DEBUG
         if (beacon)
-                net_dbg_ratelimited("%s: detected beacon loss from AP - sending probe request\n",
-                                    sdata->name);
-#endif
+                mlme_dbg_ratelimited(sdata,
+                                     "detected beacon loss from AP - sending probe request\n");
+
+        ieee80211_cqm_rssi_notify(&sdata->vif,
+                NL80211_CQM_RSSI_BEACON_LOSS_EVENT, GFP_KERNEL);
 
         /*
          * The driver/our work has already reported this event or the
@@ -1668,8 +1651,7 @@ static void __ieee80211_connection_loss(struct ieee80211_sub_if_data *sdata)
 
         memcpy(bssid, ifmgd->associated->bssid, ETH_ALEN);
 
-        printk(KERN_DEBUG "%s: Connection to AP %pM lost.\n",
-               sdata->name, bssid);
+        sdata_info(sdata, "Connection to AP %pM lost\n", bssid);
 
         ieee80211_set_disassoc(sdata, IEEE80211_STYPE_DEAUTH,
                                WLAN_REASON_DISASSOC_DUE_TO_INACTIVITY,
@@ -1803,9 +1785,10 @@ ieee80211_rx_mgmt_auth(struct ieee80211_sub_if_data *sdata,
                 return RX_MGMT_NONE;
 
         if (status_code != WLAN_STATUS_SUCCESS) {
-                printk(KERN_DEBUG "%s: %pM denied authentication (status %d)\n",
-                       sdata->name, mgmt->sa, status_code);
-                goto out;
+                sdata_info(sdata, "%pM denied authentication (status %d)\n",
+                           mgmt->sa, status_code);
+                ieee80211_destroy_auth_data(sdata, false);
+                return RX_MGMT_CFG80211_RX_AUTH;
         }
 
         switch (ifmgd->auth_data->algorithm) {
@@ -1826,8 +1809,7 @@ ieee80211_rx_mgmt_auth(struct ieee80211_sub_if_data *sdata,
                 return RX_MGMT_NONE;
         }
 
-        printk(KERN_DEBUG "%s: authenticated\n", sdata->name);
- out:
+        sdata_info(sdata, "authenticated\n");
         ifmgd->auth_data->done = true;
         ifmgd->auth_data->timeout = jiffies + IEEE80211_AUTH_WAIT_ASSOC;
         run_again(ifmgd, ifmgd->auth_data->timeout);
@@ -1840,8 +1822,7 @@ ieee80211_rx_mgmt_auth(struct ieee80211_sub_if_data *sdata,
                 goto out_err;
         }
         if (sta_info_move_state(sta, IEEE80211_STA_AUTH)) {
-                printk(KERN_DEBUG "%s: failed moving %pM to auth\n",
-                       sdata->name, bssid);
+                sdata_info(sdata, "failed moving %pM to auth\n", bssid);
                 goto out_err;
         }
         mutex_unlock(&sdata->local->sta_mtx);
@@ -1875,8 +1856,8 @@ ieee80211_rx_mgmt_deauth(struct ieee80211_sub_if_data *sdata,
 
         reason_code = le16_to_cpu(mgmt->u.deauth.reason_code);
 
-        printk(KERN_DEBUG "%s: deauthenticated from %pM (Reason: %u)\n",
-                        sdata->name, bssid, reason_code);
+        sdata_info(sdata, "deauthenticated from %pM (Reason: %u)\n",
+                   bssid, reason_code);
 
         ieee80211_set_disassoc(sdata, 0, 0, false, NULL);
 
@@ -1906,8 +1887,8 @@ ieee80211_rx_mgmt_disassoc(struct ieee80211_sub_if_data *sdata,
 
         reason_code = le16_to_cpu(mgmt->u.disassoc.reason_code);
 
-        printk(KERN_DEBUG "%s: disassociated from %pM (Reason: %u)\n",
-                        sdata->name, mgmt->sa, reason_code);
+        sdata_info(sdata, "disassociated from %pM (Reason: %u)\n",
+                   mgmt->sa, reason_code);
 
         ieee80211_set_disassoc(sdata, 0, 0, false, NULL);
 
@@ -1999,17 +1980,15 @@ static bool ieee80211_assoc_success(struct ieee80211_sub_if_data *sdata,
         capab_info = le16_to_cpu(mgmt->u.assoc_resp.capab_info);
 
         if ((aid & (BIT(15) | BIT(14))) != (BIT(15) | BIT(14)))
-                printk(KERN_DEBUG
-                       "%s: invalid AID value 0x%x; bits 15:14 not set\n",
-                       sdata->name, aid);
+                sdata_info(sdata, "invalid AID value 0x%x; bits 15:14 not set\n",
+                           aid);
         aid &= ~(BIT(15) | BIT(14));
 
         ifmgd->broken_ap = false;
 
         if (aid == 0 || aid > IEEE80211_MAX_AID) {
-                printk(KERN_DEBUG
-                       "%s: invalid AID value %d (out of range), turn off PS\n",
-                       sdata->name, aid);
+                sdata_info(sdata, "invalid AID value %d (out of range), turn off PS\n",
+                           aid);
                 aid = 0;
                 ifmgd->broken_ap = true;
         }
@@ -2018,8 +1997,7 @@ static bool ieee80211_assoc_success(struct ieee80211_sub_if_data *sdata,
         ieee802_11_parse_elems(pos, len - (pos - (u8 *) mgmt), &elems);
 
         if (!elems.supp_rates) {
-                printk(KERN_DEBUG "%s: no SuppRates element in AssocResp\n",
-                       sdata->name);
+                sdata_info(sdata, "no SuppRates element in AssocResp\n");
                 return false;
         }
 
@@ -2059,9 +2037,9 @@ static bool ieee80211_assoc_success(struct ieee80211_sub_if_data *sdata,
         if (!err && !(ifmgd->flags & IEEE80211_STA_CONTROL_PORT))
                 err = sta_info_move_state(sta, IEEE80211_STA_AUTHORIZED);
         if (err) {
-                printk(KERN_DEBUG
-                       "%s: failed to move station %pM to desired state\n",
-                       sdata->name, sta->sta.addr);
+                sdata_info(sdata,
+                           "failed to move station %pM to desired state\n",
+                           sta->sta.addr);
                 WARN_ON(__sta_info_destroy(sta));
                 mutex_unlock(&sdata->local->sta_mtx);
                 return false;
@@ -2144,10 +2122,10 @@ ieee80211_rx_mgmt_assoc_resp(struct ieee80211_sub_if_data *sdata,
         status_code = le16_to_cpu(mgmt->u.assoc_resp.status_code);
         aid = le16_to_cpu(mgmt->u.assoc_resp.aid);
 
-        printk(KERN_DEBUG "%s: RX %sssocResp from %pM (capab=0x%x "
-               "status=%d aid=%d)\n",
-               sdata->name, reassoc ? "Rea" : "A", mgmt->sa,
-               capab_info, status_code, (u16)(aid & ~(BIT(15) | BIT(14))));
+        sdata_info(sdata,
+                   "RX %sssocResp from %pM (capab=0x%x status=%d aid=%d)\n",
+                   reassoc ? "Rea" : "A", mgmt->sa,
+                   capab_info, status_code, (u16)(aid & ~(BIT(15) | BIT(14))));
 
         pos = mgmt->u.assoc_resp.variable;
         ieee802_11_parse_elems(pos, len - (pos - (u8 *) mgmt), &elems);
@@ -2158,9 +2136,9 @@ ieee80211_rx_mgmt_assoc_resp(struct ieee80211_sub_if_data *sdata,
                 u32 tu, ms;
                 tu = get_unaligned_le32(elems.timeout_int + 1);
                 ms = tu * 1024 / 1000;
-                printk(KERN_DEBUG "%s: %pM rejected association temporarily; "
-                       "comeback duration %u TU (%u ms)\n",
-                       sdata->name, mgmt->sa, tu, ms);
+                sdata_info(sdata,
+                           "%pM rejected association temporarily; comeback duration %u TU (%u ms)\n",
+                           mgmt->sa, tu, ms);
                 assoc_data->timeout = jiffies + msecs_to_jiffies(ms);
                 if (ms > IEEE80211_ASSOC_TIMEOUT)
                         run_again(ifmgd, assoc_data->timeout);
@@ -2170,8 +2148,8 @@ ieee80211_rx_mgmt_assoc_resp(struct ieee80211_sub_if_data *sdata,
         *bss = assoc_data->bss;
 
         if (status_code != WLAN_STATUS_SUCCESS) {
-                printk(KERN_DEBUG "%s: %pM denied association (code=%d)\n",
-                       sdata->name, mgmt->sa, status_code);
+                sdata_info(sdata, "%pM denied association (code=%d)\n",
+                           mgmt->sa, status_code);
                 ieee80211_destroy_assoc_data(sdata, false);
         } else {
                 if (!ieee80211_assoc_success(sdata, *bss, mgmt, len)) {
@@ -2180,7 +2158,7 @@ ieee80211_rx_mgmt_assoc_resp(struct ieee80211_sub_if_data *sdata,
                         cfg80211_put_bss(*bss);
                         return RX_MGMT_CFG80211_ASSOC_TIMEOUT;
                 }
-                printk(KERN_DEBUG "%s: associated\n", sdata->name);
+                sdata_info(sdata, "associated\n");
 
                 /*
                  * destroy assoc_data afterwards, as otherwise an idle
@@ -2280,7 +2258,7 @@ static void ieee80211_rx_mgmt_probe_resp(struct ieee80211_sub_if_data *sdata,
         if (ifmgd->auth_data && !ifmgd->auth_data->bss->proberesp_ies &&
             ether_addr_equal(mgmt->bssid, ifmgd->auth_data->bss->bssid)) {
                 /* got probe response, continue with auth */
-                printk(KERN_DEBUG "%s: direct probe responded\n", sdata->name);
+                sdata_info(sdata, "direct probe responded\n");
                 ifmgd->auth_data->tries = 0;
                 ifmgd->auth_data->timeout = jiffies;
                 run_again(ifmgd, ifmgd->auth_data->timeout);
@@ -2416,10 +2394,8 @@ static void ieee80211_rx_mgmt_beacon(struct ieee80211_sub_if_data *sdata,
         }
 
         if (ifmgd->flags & IEEE80211_STA_BEACON_POLL) {
-#ifdef CONFIG_MAC80211_VERBOSE_DEBUG
-                net_dbg_ratelimited("%s: cancelling probereq poll due to a received beacon\n",
-                                    sdata->name);
-#endif
+                mlme_dbg_ratelimited(sdata,
+                                     "cancelling probereq poll due to a received beacon\n");
                 mutex_lock(&local->mtx);
                 ifmgd->flags &= ~IEEE80211_STA_BEACON_POLL;
                 ieee80211_run_deferred_scan(local);
@@ -2642,8 +2618,8 @@ static int ieee80211_probe_auth(struct ieee80211_sub_if_data *sdata)
         auth_data->tries++;
 
         if (auth_data->tries > IEEE80211_AUTH_MAX_TRIES) {
-                printk(KERN_DEBUG "%s: authentication with %pM timed out\n",
-                       sdata->name, auth_data->bss->bssid);
+                sdata_info(sdata, "authentication with %pM timed out\n",
+                           auth_data->bss->bssid);
 
                 /*
                  * Most likely AP is not in the range so remove the
@@ -2655,9 +2631,9 @@ static int ieee80211_probe_auth(struct ieee80211_sub_if_data *sdata)
         }
 
         if (auth_data->bss->proberesp_ies) {
-                printk(KERN_DEBUG "%s: send auth to %pM (try %d/%d)\n",
-                       sdata->name, auth_data->bss->bssid, auth_data->tries,
-                       IEEE80211_AUTH_MAX_TRIES);
+                sdata_info(sdata, "send auth to %pM (try %d/%d)\n",
+                           auth_data->bss->bssid, auth_data->tries,
+                           IEEE80211_AUTH_MAX_TRIES);
 
                 auth_data->expected_transaction = 2;
                 ieee80211_send_auth(sdata, 1, auth_data->algorithm,
@@ -2667,9 +2643,9 @@ static int ieee80211_probe_auth(struct ieee80211_sub_if_data *sdata)
         } else {
                 const u8 *ssidie;
 
-                printk(KERN_DEBUG "%s: direct probe to %pM (try %d/%i)\n",
-                       sdata->name, auth_data->bss->bssid, auth_data->tries,
-                       IEEE80211_AUTH_MAX_TRIES);
+                sdata_info(sdata, "direct probe to %pM (try %d/%i)\n",
+                           auth_data->bss->bssid, auth_data->tries,
+                           IEEE80211_AUTH_MAX_TRIES);
 
                 ssidie = ieee80211_bss_get_ie(auth_data->bss, WLAN_EID_SSID);
                 if (!ssidie)
@@ -2697,8 +2673,8 @@ static int ieee80211_do_assoc(struct ieee80211_sub_if_data *sdata)
 
         assoc_data->tries++;
         if (assoc_data->tries > IEEE80211_ASSOC_MAX_TRIES) {
-                printk(KERN_DEBUG "%s: association with %pM timed out\n",
-                       sdata->name, assoc_data->bss->bssid);
+                sdata_info(sdata, "association with %pM timed out\n",
+                           assoc_data->bss->bssid);
 
                 /*
                  * Most likely AP is not in the range so remove the
@@ -2709,9 +2685,9 @@ static int ieee80211_do_assoc(struct ieee80211_sub_if_data *sdata)
                 return -ETIMEDOUT;
         }
 
-        printk(KERN_DEBUG "%s: associate with %pM (try %d/%d)\n",
-               sdata->name, assoc_data->bss->bssid, assoc_data->tries,
-               IEEE80211_ASSOC_MAX_TRIES);
+        sdata_info(sdata, "associate with %pM (try %d/%d)\n",
+                   assoc_data->bss->bssid, assoc_data->tries,
+                   IEEE80211_ASSOC_MAX_TRIES);
         ieee80211_send_assoc(sdata);
 
         assoc_data->timeout = jiffies + IEEE80211_ASSOC_TIMEOUT;
@@ -2784,45 +2760,31 @@ void ieee80211_sta_work(struct ieee80211_sub_if_data *sdata)
                         ieee80211_reset_ap_probe(sdata);
                 else if (ifmgd->nullfunc_failed) {
                         if (ifmgd->probe_send_count < max_tries) {
-#ifdef CONFIG_MAC80211_VERBOSE_DEBUG
-                                wiphy_debug(local->hw.wiphy,
-                                            "%s: No ack for nullfunc frame to"
-                                            " AP %pM, try %d/%i\n",
-                                            sdata->name, bssid,
-                                            ifmgd->probe_send_count, max_tries);
-#endif
+                                mlme_dbg(sdata,
+                                         "No ack for nullfunc frame to AP %pM, try %d/%i\n",
+                                         bssid, ifmgd->probe_send_count,
+                                         max_tries);
                                 ieee80211_mgd_probe_ap_send(sdata);
                         } else {
-#ifdef CONFIG_MAC80211_VERBOSE_DEBUG
-                                wiphy_debug(local->hw.wiphy,
-                                            "%s: No ack for nullfunc frame to"
-                                            " AP %pM, disconnecting.\n",
-                                            sdata->name, bssid);
-#endif
+                                mlme_dbg(sdata,
+                                         "No ack for nullfunc frame to AP %pM, disconnecting.\n",
+                                         bssid);
                                 ieee80211_sta_connection_lost(sdata, bssid,
                                         WLAN_REASON_DISASSOC_DUE_TO_INACTIVITY);
                         }
                 } else if (time_is_after_jiffies(ifmgd->probe_timeout))
                         run_again(ifmgd, ifmgd->probe_timeout);
                 else if (local->hw.flags & IEEE80211_HW_REPORTS_TX_ACK_STATUS) {
-#ifdef CONFIG_MAC80211_VERBOSE_DEBUG
-                        wiphy_debug(local->hw.wiphy,
-                                    "%s: Failed to send nullfunc to AP %pM"
-                                    " after %dms, disconnecting.\n",
-                                    sdata->name,
-                                    bssid, probe_wait_ms);
-#endif
+                        mlme_dbg(sdata,
+                                 "Failed to send nullfunc to AP %pM after %dms, disconnecting\n",
+                                 bssid, probe_wait_ms);
                         ieee80211_sta_connection_lost(sdata, bssid,
                                 WLAN_REASON_DISASSOC_DUE_TO_INACTIVITY);
                 } else if (ifmgd->probe_send_count < max_tries) {
-#ifdef CONFIG_MAC80211_VERBOSE_DEBUG
-                        wiphy_debug(local->hw.wiphy,
-                                    "%s: No probe response from AP %pM"
-                                    " after %dms, try %d/%i\n",
-                                    sdata->name,
-                                    bssid, probe_wait_ms,
-                                    ifmgd->probe_send_count, max_tries);
-#endif
+                        mlme_dbg(sdata,
+                                 "No probe response from AP %pM after %dms, try %d/%i\n",
+                                 bssid, probe_wait_ms,
+                                 ifmgd->probe_send_count, max_tries);
                         ieee80211_mgd_probe_ap_send(sdata);
                 } else {
                         /*
@@ -2937,11 +2899,8 @@ void ieee80211_sta_restart(struct ieee80211_sub_if_data *sdata)
                 sdata->flags &= ~IEEE80211_SDATA_DISCONNECT_RESUME;
                 mutex_lock(&ifmgd->mtx);
                 if (ifmgd->associated) {
-#ifdef CONFIG_MAC80211_VERBOSE_DEBUG
-                        wiphy_debug(sdata->local->hw.wiphy,
-                                    "%s: driver requested disconnect after resume.\n",
-                                    sdata->name);
-#endif
+                        mlme_dbg(sdata,
+                                 "driver requested disconnect after resume\n");
                         ieee80211_sta_connection_lost(sdata,
                                 ifmgd->associated->bssid,
                                 WLAN_REASON_UNSPECIFIED);
@@ -3029,7 +2988,7 @@ static int ieee80211_prep_connection(struct ieee80211_sub_if_data *sdata,
         struct ieee80211_local *local = sdata->local;
         struct ieee80211_if_managed *ifmgd = &sdata->u.mgd;
         struct ieee80211_bss *bss = (void *)cbss->priv;
-        struct sta_info *sta;
+        struct sta_info *sta = NULL;
         bool have_sta = false;
         int err;
         int ht_cfreq;
@@ -3082,13 +3041,11 @@ static int ieee80211_prep_connection(struct ieee80211_sub_if_data *sdata,
                          * since we look at probe response/beacon data here
                          * it should be OK.
                          */
-                        printk(KERN_DEBUG
-                               "%s: Wrong control channel: center-freq: %d"
-                               " ht-cfreq: %d ht->primary_chan: %d"
-                               " band: %d. Disabling HT.\n",
-                               sdata->name, cbss->channel->center_freq,
-                               ht_cfreq, ht_oper->primary_chan,
-                               cbss->channel->band);
+                        sdata_info(sdata,
+                                   "Wrong control channel: center-freq: %d ht-cfreq: %d ht->primary_chan: %d band: %d - Disabling HT\n",
+                                   cbss->channel->center_freq,
+                                   ht_cfreq, ht_oper->primary_chan,
+                                   cbss->channel->band);
                         ht_oper = NULL;
                 }
         }
@@ -3112,9 +3069,8 @@ static int ieee80211_prep_connection(struct ieee80211_sub_if_data *sdata,
         if (!ieee80211_set_channel_type(local, sdata, channel_type)) {
                 /* can only fail due to HT40+/- mismatch */
                 channel_type = NL80211_CHAN_HT20;
-                printk(KERN_DEBUG
-                       "%s: disabling 40 MHz due to multi-vif mismatch\n",
-                       sdata->name);
+                sdata_info(sdata,
+                           "disabling 40 MHz due to multi-vif mismatch\n");
                 ifmgd->flags |= IEEE80211_STA_DISABLE_40MHZ;
                 WARN_ON(!ieee80211_set_channel_type(local, sdata,
                                                     channel_type));
@@ -3123,7 +3079,7 @@ static int ieee80211_prep_connection(struct ieee80211_sub_if_data *sdata,
         local->oper_channel = cbss->channel;
         ieee80211_hw_config(local, IEEE80211_CONF_CHANGE_CHANNEL);
 
-        if (!have_sta) {
+        if (sta) {
                 u32 rates = 0, basic_rates = 0;
                 bool have_higher_than_11mbit;
                 int min_rate = INT_MAX, min_rate_index = -1;
@@ -3143,9 +3099,8 @@ static int ieee80211_prep_connection(struct ieee80211_sub_if_data *sdata,
                  * we can connect -- with a warning.
                  */
                 if (!basic_rates && min_rate_index >= 0) {
-                        printk(KERN_DEBUG
-                               "%s: No basic rates, using min rate instead.\n",
-                               sdata->name);
+                        sdata_info(sdata,
+                                   "No basic rates, using min rate instead\n");
                         basic_rates = BIT(min_rate_index);
                 }
 
@@ -3171,9 +3126,9 @@ static int ieee80211_prep_connection(struct ieee80211_sub_if_data *sdata,
                 err = sta_info_insert(sta);
                 sta = NULL;
                 if (err) {
-                        printk(KERN_DEBUG
-                               "%s: failed to insert STA entry for the AP (error %d)\n",
-                               sdata->name, err);
+                        sdata_info(sdata,
+                                   "failed to insert STA entry for the AP (error %d)\n",
+                                   err);
                         return err;
                 }
         } else
@@ -3251,8 +3206,7 @@ int ieee80211_mgd_auth(struct ieee80211_sub_if_data *sdata,
         if (ifmgd->associated)
                 ieee80211_set_disassoc(sdata, 0, 0, false, NULL);
 
-        printk(KERN_DEBUG "%s: authenticate with %pM\n",
-               sdata->name, req->bss->bssid);
+        sdata_info(sdata, "authenticate with %pM\n", req->bss->bssid);
 
         err = ieee80211_prep_connection(sdata, req->bss, false);
         if (err)
@@ -3287,7 +3241,7 @@ int ieee80211_mgd_assoc(struct ieee80211_sub_if_data *sdata,
         struct ieee80211_bss *bss = (void *)req->bss->priv;
         struct ieee80211_mgd_assoc_data *assoc_data;
         struct ieee80211_supported_band *sband;
-        const u8 *ssidie;
+        const u8 *ssidie, *ht_ie;
         int i, err;
 
         ssidie = ieee80211_bss_get_ie(req->bss, WLAN_EID_SSID);
@@ -3335,11 +3289,15 @@ int ieee80211_mgd_assoc(struct ieee80211_sub_if_data *sdata,
          * We can set this to true for non-11n hardware, that'll be checked
          * separately along with the peer capabilities.
          */
-        for (i = 0; i < req->crypto.n_ciphers_pairwise; i++)
+        for (i = 0; i < req->crypto.n_ciphers_pairwise; i++) {
                 if (req->crypto.ciphers_pairwise[i] == WLAN_CIPHER_SUITE_WEP40 ||
                     req->crypto.ciphers_pairwise[i] == WLAN_CIPHER_SUITE_TKIP ||
-                    req->crypto.ciphers_pairwise[i] == WLAN_CIPHER_SUITE_WEP104)
+                    req->crypto.ciphers_pairwise[i] == WLAN_CIPHER_SUITE_WEP104) {
                         ifmgd->flags |= IEEE80211_STA_DISABLE_11N;
+                        netdev_info(sdata->dev,
+                                    "disabling HT due to WEP/TKIP use\n");
+                }
+        }
 
         if (req->flags & ASSOC_REQ_DISABLE_HT)
                 ifmgd->flags |= IEEE80211_STA_DISABLE_11N;
@@ -3347,8 +3305,11 @@ int ieee80211_mgd_assoc(struct ieee80211_sub_if_data *sdata,
         /* Also disable HT if we don't support it or the AP doesn't use WMM */
         sband = local->hw.wiphy->bands[req->bss->channel->band];
         if (!sband->ht_cap.ht_supported ||
-            local->hw.queues < IEEE80211_NUM_ACS || !bss->wmm_used)
+            local->hw.queues < IEEE80211_NUM_ACS || !bss->wmm_used) {
                 ifmgd->flags |= IEEE80211_STA_DISABLE_11N;
+                netdev_info(sdata->dev,
+                            "disabling HT as WMM/QoS is not supported\n");
+        }
 
         memcpy(&ifmgd->ht_capa, &req->ht_capa, sizeof(ifmgd->ht_capa));
         memcpy(&ifmgd->ht_capa_mask, &req->ht_capa_mask,
@@ -3374,8 +3335,13 @@ int ieee80211_mgd_assoc(struct ieee80211_sub_if_data *sdata,
                           (local->hw.queues >= IEEE80211_NUM_ACS);
         assoc_data->supp_rates = bss->supp_rates;
         assoc_data->supp_rates_len = bss->supp_rates_len;
-        assoc_data->ht_operation_ie =
-                ieee80211_bss_get_ie(req->bss, WLAN_EID_HT_OPERATION);
+
+        ht_ie = ieee80211_bss_get_ie(req->bss, WLAN_EID_HT_OPERATION);
+        if (ht_ie && ht_ie[1] >= sizeof(struct ieee80211_ht_operation))
+                assoc_data->ap_ht_param =
+                        ((struct ieee80211_ht_operation *)(ht_ie + 2))->ht_param;
+        else
+                ifmgd->flags |= IEEE80211_STA_DISABLE_11N;
 
         if (bss->wmm_used && bss->uapsd_supported &&
             (sdata->local->hw.flags & IEEE80211_HW_SUPPORTS_UAPSD)) {
@@ -3422,8 +3388,8 @@ int ieee80211_mgd_assoc(struct ieee80211_sub_if_data *sdata,
                  * Wait up to one beacon interval ...
                  * should this be more if we miss one?
                  */
-                printk(KERN_DEBUG "%s: waiting for beacon from %pM\n",
-                       sdata->name, ifmgd->bssid);
+                sdata_info(sdata, "waiting for beacon from %pM\n",
+                           ifmgd->bssid);
                 assoc_data->timeout = TU_TO_EXP_TIME(req->bss->beacon_interval);
         } else {
                 assoc_data->have_beacon = true;
@@ -3442,8 +3408,8 @@ int ieee80211_mgd_assoc(struct ieee80211_sub_if_data *sdata,
                                 corrupt_type = "beacon";
                 } else if (bss->corrupt_data & IEEE80211_BSS_CORRUPT_PROBE_RESP)
                         corrupt_type = "probe response";
-                printk(KERN_DEBUG "%s: associating with AP with corrupt %s\n",
-                       sdata->name, corrupt_type);
+                sdata_info(sdata, "associating with AP with corrupt %s\n",
+                           corrupt_type);
         }
 
         err = 0;
@@ -3472,9 +3438,9 @@ int ieee80211_mgd_deauth(struct ieee80211_sub_if_data *sdata,
                 return 0;
         }
 
-        printk(KERN_DEBUG
-               "%s: deauthenticating from %pM by local choice (reason=%d)\n",
-               sdata->name, req->bssid, req->reason_code);
+        sdata_info(sdata,
+                   "deauthenticating from %pM by local choice (reason=%d)\n",
+                   req->bssid, req->reason_code);
 
         if (ifmgd->associated &&
             ether_addr_equal(ifmgd->associated->bssid, req->bssid))
@@ -3516,8 +3482,9 @@ int ieee80211_mgd_disassoc(struct ieee80211_sub_if_data *sdata,
                 return -ENOLINK;
         }
 
-        printk(KERN_DEBUG "%s: disassociating from %pM by local choice (reason=%d)\n",
-               sdata->name, req->bss->bssid, req->reason_code);
+        sdata_info(sdata,
+                   "disassociating from %pM by local choice (reason=%d)\n",
+                   req->bss->bssid, req->reason_code);
 
         memcpy(bssid, req->bss->bssid, ETH_ALEN);
         ieee80211_set_disassoc(sdata, IEEE80211_STYPE_DISASSOC,
@@ -3558,10 +3525,3 @@ void ieee80211_cqm_rssi_notify(struct ieee80211_vif *vif,
         cfg80211_cqm_rssi_notify(sdata->dev, rssi_event, gfp);
 }
 EXPORT_SYMBOL(ieee80211_cqm_rssi_notify);
-
-unsigned char ieee80211_get_operstate(struct ieee80211_vif *vif)
-{
-        struct ieee80211_sub_if_data *sdata = vif_to_sdata(vif);
-        return sdata->dev->operstate;
-}
-EXPORT_SYMBOL(ieee80211_get_operstate);
diff --git a/net/mac80211/offchannel.c b/net/mac80211/offchannel.c
index 935aa4b6dee..b0fb6a2b89a 100644
--- a/net/mac80211/offchannel.c
+++ b/net/mac80211/offchannel.c
@@ -15,7 +15,7 @@
 #include <linux/export.h>
 #include <net/mac80211.h>
 #include "ieee80211_i.h"
-#include "driver-trace.h"
+#include "driver-ops.h"
 
 /*
  * Tell our hardware to disable PS.
@@ -24,8 +24,7 @@
  * because we *may* be doing work on-operating channel, and want our
  * hardware unconditionally awake, but still let the AP send us normal frames.
  */
-static void ieee80211_offchannel_ps_enable(struct ieee80211_sub_if_data *sdata,
-                                           bool tell_ap)
+static void ieee80211_offchannel_ps_enable(struct ieee80211_sub_if_data *sdata)
 {
         struct ieee80211_local *local = sdata->local;
         struct ieee80211_if_managed *ifmgd = &sdata->u.mgd;
@@ -46,8 +45,8 @@ static void ieee80211_offchannel_ps_enable(struct ieee80211_sub_if_data *sdata,
                 ieee80211_hw_config(local, IEEE80211_CONF_CHANGE_PS);
         }
 
-        if (tell_ap && (!local->offchannel_ps_enabled ||
-                        !(local->hw.flags & IEEE80211_HW_PS_NULLFUNC_STACK)))
+        if (!local->offchannel_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
@@ -132,7 +131,7 @@ void ieee80211_offchannel_stop_vifs(struct ieee80211_local *local,
                         if (offchannel_ps_enable &&
                             (sdata->vif.type == NL80211_IFTYPE_STATION) &&
                             sdata->u.mgd.associated)
-                                ieee80211_offchannel_ps_enable(sdata, true);
+                                ieee80211_offchannel_ps_enable(sdata);
                 }
         }
         mutex_unlock(&local->iflist_mtx);
@@ -181,34 +180,58 @@ void ieee80211_offchannel_return(struct ieee80211_local *local,
         mutex_unlock(&local->iflist_mtx);
 }
 
+void ieee80211_handle_roc_started(struct ieee80211_roc_work *roc)
+{
+        if (roc->notified)
+                return;
+
+        if (roc->mgmt_tx_cookie) {
+                if (!WARN_ON(!roc->frame)) {
+                        ieee80211_tx_skb(roc->sdata, roc->frame);
+                        roc->frame = NULL;
+                }
+        } else {
+                cfg80211_ready_on_channel(roc->sdata->dev, (unsigned long)roc,
+                                          roc->chan, roc->chan_type,
+                                          roc->req_duration, GFP_KERNEL);
+        }
+
+        roc->notified = true;
+}
+
 static void ieee80211_hw_roc_start(struct work_struct *work)
 {
         struct ieee80211_local *local =
                 container_of(work, struct ieee80211_local, hw_roc_start);
-        struct ieee80211_sub_if_data *sdata;
+        struct ieee80211_roc_work *roc, *dep, *tmp;
 
         mutex_lock(&local->mtx);
 
-        if (!local->hw_roc_channel) {
-                mutex_unlock(&local->mtx);
-                return;
-        }
+        if (list_empty(&local->roc_list))
+                goto out_unlock;
 
-        if (local->hw_roc_skb) {
-                sdata = IEEE80211_DEV_TO_SUB_IF(local->hw_roc_dev);
-                ieee80211_tx_skb(sdata, local->hw_roc_skb);
-                local->hw_roc_skb = NULL;
-        } else {
-                cfg80211_ready_on_channel(local->hw_roc_dev,
-                                          local->hw_roc_cookie,
-                                          local->hw_roc_channel,
-                                          local->hw_roc_channel_type,
-                                          local->hw_roc_duration,
-                                          GFP_KERNEL);
-        }
+        roc = list_first_entry(&local->roc_list, struct ieee80211_roc_work,
+                               list);
+
+        if (!roc->started)
+                goto out_unlock;
 
-        ieee80211_recalc_idle(local);
+        roc->hw_begun = true;
+        roc->hw_start_time = local->hw_roc_start_time;
 
+        ieee80211_handle_roc_started(roc);
+        list_for_each_entry_safe(dep, tmp, &roc->dependents, list) {
+                ieee80211_handle_roc_started(dep);
+
+                if (dep->duration > roc->duration) {
+                        u32 dur = dep->duration;
+                        dep->duration = dur - roc->duration;
+                        roc->duration = dur;
+                        list_del(&dep->list);
+                        list_add(&dep->list, &roc->list);
+                }
+        }
+ out_unlock:
         mutex_unlock(&local->mtx);
 }
 
@@ -216,52 +239,179 @@ void ieee80211_ready_on_channel(struct ieee80211_hw *hw)
 {
         struct ieee80211_local *local = hw_to_local(hw);
 
+        local->hw_roc_start_time = jiffies;
+
         trace_api_ready_on_channel(local);
 
         ieee80211_queue_work(hw, &local->hw_roc_start);
 }
 EXPORT_SYMBOL_GPL(ieee80211_ready_on_channel);
 
-static void ieee80211_hw_roc_done(struct work_struct *work)
+void ieee80211_start_next_roc(struct ieee80211_local *local)
 {
-        struct ieee80211_local *local =
-                container_of(work, struct ieee80211_local, hw_roc_done);
+        struct ieee80211_roc_work *roc;
 
-        mutex_lock(&local->mtx);
+        lockdep_assert_held(&local->mtx);
 
-        if (!local->hw_roc_channel) {
-                mutex_unlock(&local->mtx);
+        if (list_empty(&local->roc_list)) {
+                ieee80211_run_deferred_scan(local);
                 return;
         }
 
-        /* was never transmitted */
-        if (local->hw_roc_skb) {
-                u64 cookie;
+        roc = list_first_entry(&local->roc_list, struct ieee80211_roc_work,
+                               list);
 
-                cookie = local->hw_roc_cookie ^ 2;
+        if (WARN_ON_ONCE(roc->started))
+                return;
+
+        if (local->ops->remain_on_channel) {
+                int ret, duration = roc->duration;
+
+                /* XXX: duplicated, see ieee80211_start_roc_work() */
+                if (!duration)
+                        duration = 10;
+
+                ret = drv_remain_on_channel(local, roc->chan,
+                                            roc->chan_type,
+                                            duration);
+
+                roc->started = true;
+
+                if (ret) {
+                        wiphy_warn(local->hw.wiphy,
+                                   "failed to start next HW ROC (%d)\n", ret);
+                        /*
+                         * queue the work struct again to avoid recursion
+                         * when multiple failures occur
+                         */
+                        ieee80211_remain_on_channel_expired(&local->hw);
+                }
+        } else {
+                /* delay it a bit */
+                ieee80211_queue_delayed_work(&local->hw, &roc->work,
+                                             round_jiffies_relative(HZ/2));
+        }
+}
 
-                cfg80211_mgmt_tx_status(local->hw_roc_dev, cookie,
-                                        local->hw_roc_skb->data,
-                                        local->hw_roc_skb->len, false,
-                                        GFP_KERNEL);
+void ieee80211_roc_notify_destroy(struct ieee80211_roc_work *roc)
+{
+        struct ieee80211_roc_work *dep, *tmp;
 
-                kfree_skb(local->hw_roc_skb);
-                local->hw_roc_skb = NULL;
-                local->hw_roc_skb_for_status = NULL;
+        /* was never transmitted */
+        if (roc->frame) {
+                cfg80211_mgmt_tx_status(roc->sdata->dev,
+                                        (unsigned long)roc->frame,
+                                        roc->frame->data, roc->frame->len,
+                                        false, GFP_KERNEL);
+                kfree_skb(roc->frame);
         }
 
-        if (!local->hw_roc_for_tx)
-                cfg80211_remain_on_channel_expired(local->hw_roc_dev,
-                                                   local->hw_roc_cookie,
-                                                   local->hw_roc_channel,
-                                                   local->hw_roc_channel_type,
+        if (!roc->mgmt_tx_cookie)
+                cfg80211_remain_on_channel_expired(roc->sdata->dev,
+                                                   (unsigned long)roc,
+                                                   roc->chan, roc->chan_type,
                                                    GFP_KERNEL);
 
-        local->hw_roc_channel = NULL;
-        local->hw_roc_cookie = 0;
+        list_for_each_entry_safe(dep, tmp, &roc->dependents, list)
+                ieee80211_roc_notify_destroy(dep);
+
+        kfree(roc);
+}
+
+void ieee80211_sw_roc_work(struct work_struct *work)
+{
+        struct ieee80211_roc_work *roc =
+                container_of(work, struct ieee80211_roc_work, work.work);
+        struct ieee80211_sub_if_data *sdata = roc->sdata;
+        struct ieee80211_local *local = sdata->local;
+
+        mutex_lock(&local->mtx);
+
+        if (roc->abort)
+                goto finish;
+
+        if (WARN_ON(list_empty(&local->roc_list)))
+                goto out_unlock;
+
+        if (WARN_ON(roc != list_first_entry(&local->roc_list,
+                                            struct ieee80211_roc_work,
+                                            list)))
+                goto out_unlock;
 
-        ieee80211_recalc_idle(local);
+        if (!roc->started) {
+                struct ieee80211_roc_work *dep;
 
+                /* start this ROC */
+
+                /* switch channel etc */
+                ieee80211_recalc_idle(local);
+
+                local->tmp_channel = roc->chan;
+                local->tmp_channel_type = roc->chan_type;
+                ieee80211_hw_config(local, 0);
+
+                /* tell userspace or send frame */
+                ieee80211_handle_roc_started(roc);
+                list_for_each_entry(dep, &roc->dependents, list)
+                        ieee80211_handle_roc_started(dep);
+
+                /* if it was pure TX, just finish right away */
+                if (!roc->duration)
+                        goto finish;
+
+                roc->started = true;
+                ieee80211_queue_delayed_work(&local->hw, &roc->work,
+                                             msecs_to_jiffies(roc->duration));
+        } else {
+                /* finish this ROC */
+ finish:
+                list_del(&roc->list);
+                ieee80211_roc_notify_destroy(roc);
+
+                if (roc->started) {
+                        drv_flush(local, false);
+
+                        local->tmp_channel = NULL;
+                        ieee80211_hw_config(local, 0);
+
+                        ieee80211_offchannel_return(local, true);
+                }
+
+                ieee80211_recalc_idle(local);
+
+                if (roc->started)
+                        ieee80211_start_next_roc(local);
+        }
+
+ out_unlock:
+        mutex_unlock(&local->mtx);
+}
+
+static void ieee80211_hw_roc_done(struct work_struct *work)
+{
+        struct ieee80211_local *local =
+                container_of(work, struct ieee80211_local, hw_roc_done);
+        struct ieee80211_roc_work *roc;
+
+        mutex_lock(&local->mtx);
+
+        if (list_empty(&local->roc_list))
+                goto out_unlock;
+
+        roc = list_first_entry(&local->roc_list, struct ieee80211_roc_work,
+                               list);
+
+        if (!roc->started)
+                goto out_unlock;
+
+        list_del(&roc->list);
+
+        ieee80211_roc_notify_destroy(roc);
+
+        /* if there's another roc, start it now */
+        ieee80211_start_next_roc(local);
+
+ out_unlock:
         mutex_unlock(&local->mtx);
 }
 
@@ -275,8 +425,47 @@ void ieee80211_remain_on_channel_expired(struct ieee80211_hw *hw)
 }
 EXPORT_SYMBOL_GPL(ieee80211_remain_on_channel_expired);
 
-void ieee80211_hw_roc_setup(struct ieee80211_local *local)
+void ieee80211_roc_setup(struct ieee80211_local *local)
 {
         INIT_WORK(&local->hw_roc_start, ieee80211_hw_roc_start);
         INIT_WORK(&local->hw_roc_done, ieee80211_hw_roc_done);
+        INIT_LIST_HEAD(&local->roc_list);
+}
+
+void ieee80211_roc_purge(struct ieee80211_sub_if_data *sdata)
+{
+        struct ieee80211_local *local = sdata->local;
+        struct ieee80211_roc_work *roc, *tmp;
+        LIST_HEAD(tmp_list);
+
+        mutex_lock(&local->mtx);
+        list_for_each_entry_safe(roc, tmp, &local->roc_list, list) {
+                if (roc->sdata != sdata)
+                        continue;
+
+                if (roc->started && local->ops->remain_on_channel) {
+                        /* can race, so ignore return value */
+                        drv_cancel_remain_on_channel(local);
+                }
+
+                list_move_tail(&roc->list, &tmp_list);
+                roc->abort = true;
+        }
+
+        ieee80211_start_next_roc(local);
+        mutex_unlock(&local->mtx);
+
+        list_for_each_entry_safe(roc, tmp, &tmp_list, list) {
+                if (local->ops->remain_on_channel) {
+                        list_del(&roc->list);
+                        ieee80211_roc_notify_destroy(roc);
+                } else {
+                        ieee80211_queue_delayed_work(&local->hw, &roc->work, 0);
+
+                        /* work will clean up etc */
+                        flush_delayed_work(&roc->work);
+                }
+        }
+
+        WARN_ON_ONCE(!list_empty(&tmp_list));
 }
diff --git a/net/mac80211/pm.c b/net/mac80211/pm.c
index af1c4e26e96..5c572e7a1a7 100644
--- a/net/mac80211/pm.c
+++ b/net/mac80211/pm.c
@@ -77,6 +77,17 @@ int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)
                 int err = drv_suspend(local, wowlan);
                 if (err < 0) {
                         local->quiescing = false;
+                        local->wowlan = false;
+                        if (hw->flags & IEEE80211_HW_AMPDU_AGGREGATION) {
+                                mutex_lock(&local->sta_mtx);
+                                list_for_each_entry(sta,
+                                                    &local->sta_list, list) {
+                                        clear_sta_flag(sta, WLAN_STA_BLOCK_BA);
+                                }
+                                mutex_unlock(&local->sta_mtx);
+                        }
+                        ieee80211_wake_queues_by_reason(hw,
+                                        IEEE80211_QUEUE_STOP_REASON_SUSPEND);
                         return err;
                 } else if (err > 0) {
                         WARN_ON(err != 1);
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
index 965e6ec0adb..67edd69e842 100644
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@ -94,7 +94,7 @@ ieee80211_rx_radiotap_len(struct ieee80211_local *local,
         return len;
 }
 
-/*
+/**
  * ieee80211_add_rx_radiotap_header - add radiotap header
  *
  * add a radiotap header containing all the fields which the hardware provided.
@@ -554,11 +554,11 @@ static inline u16 seq_sub(u16 sq1, u16 sq2)
 }
 
 
-static void ieee80211_release_reorder_frame(struct ieee80211_hw *hw,
+static void ieee80211_release_reorder_frame(struct ieee80211_sub_if_data *sdata,
                                             struct tid_ampdu_rx *tid_agg_rx,
                                             int index)
 {
-        struct ieee80211_local *local = hw_to_local(hw);
+        struct ieee80211_local *local = sdata->local;
         struct sk_buff *skb = tid_agg_rx->reorder_buf[index];
         struct ieee80211_rx_status *status;
 
@@ -578,7 +578,7 @@ no_frame:
         tid_agg_rx->head_seq_num = seq_inc(tid_agg_rx->head_seq_num);
 }
 
-static void ieee80211_release_reorder_frames(struct ieee80211_hw *hw,
+static void ieee80211_release_reorder_frames(struct ieee80211_sub_if_data *sdata,
                                              struct tid_ampdu_rx *tid_agg_rx,
                                              u16 head_seq_num)
 {
@@ -589,7 +589,7 @@ static void ieee80211_release_reorder_frames(struct ieee80211_hw *hw,
         while (seq_less(tid_agg_rx->head_seq_num, head_seq_num)) {
                 index = seq_sub(tid_agg_rx->head_seq_num, tid_agg_rx->ssn) %
                                                         tid_agg_rx->buf_size;
-                ieee80211_release_reorder_frame(hw, tid_agg_rx, index);
+                ieee80211_release_reorder_frame(sdata, tid_agg_rx, index);
         }
 }
 
@@ -604,7 +604,7 @@ static void ieee80211_release_reorder_frames(struct ieee80211_hw *hw,
  */
 #define HT_RX_REORDER_BUF_TIMEOUT (HZ / 10)
 
-static void ieee80211_sta_reorder_release(struct ieee80211_hw *hw,
+static void ieee80211_sta_reorder_release(struct ieee80211_sub_if_data *sdata,
                                           struct tid_ampdu_rx *tid_agg_rx)
 {
         int index, j;
@@ -632,12 +632,9 @@ static void ieee80211_sta_reorder_release(struct ieee80211_hw *hw,
                                         HT_RX_REORDER_BUF_TIMEOUT))
                                 goto set_release_timer;
 
-#ifdef CONFIG_MAC80211_HT_DEBUG
-                        if (net_ratelimit())
-                                wiphy_debug(hw->wiphy,
-                                            "release an RX reorder frame due to timeout on earlier frames\n");
-#endif
-                        ieee80211_release_reorder_frame(hw, tid_agg_rx, j);
+                        ht_dbg_ratelimited(sdata,
+                                           "release an RX reorder frame due to timeout on earlier frames\n");
+                        ieee80211_release_reorder_frame(sdata, tid_agg_rx, j);
 
                         /*
                          * Increment the head seq# also for the skipped slots.
@@ -647,7 +644,7 @@ static void ieee80211_sta_reorder_release(struct ieee80211_hw *hw,
                         skipped = 0;
                 }
         } else while (tid_agg_rx->reorder_buf[index]) {
-                ieee80211_release_reorder_frame(hw, tid_agg_rx, index);
+                ieee80211_release_reorder_frame(sdata, tid_agg_rx, index);
                 index = seq_sub(tid_agg_rx->head_seq_num, tid_agg_rx->ssn) %
                                                         tid_agg_rx->buf_size;
         }
@@ -677,7 +674,7 @@ static void ieee80211_sta_reorder_release(struct ieee80211_hw *hw,
  * rcu_read_lock protection. It returns false if the frame
  * can be processed immediately, true if it was consumed.
  */
-static bool ieee80211_sta_manage_reorder_buf(struct ieee80211_hw *hw,
+static bool ieee80211_sta_manage_reorder_buf(struct ieee80211_sub_if_data *sdata,
                                              struct tid_ampdu_rx *tid_agg_rx,
                                              struct sk_buff *skb)
 {
@@ -706,7 +703,8 @@ static bool ieee80211_sta_manage_reorder_buf(struct ieee80211_hw *hw,
         if (!seq_less(mpdu_seq_num, head_seq_num + buf_size)) {
                 head_seq_num = seq_inc(seq_sub(mpdu_seq_num, buf_size));
                 /* release stored frames up to new head to stack */
-                ieee80211_release_reorder_frames(hw, tid_agg_rx, head_seq_num);
+                ieee80211_release_reorder_frames(sdata, tid_agg_rx,
+                                                 head_seq_num);
         }
 
         /* Now the new frame is always in the range of the reordering buffer */
@@ -736,7 +734,7 @@ static bool ieee80211_sta_manage_reorder_buf(struct ieee80211_hw *hw,
         tid_agg_rx->reorder_buf[index] = skb;
         tid_agg_rx->reorder_time[index] = jiffies;
         tid_agg_rx->stored_mpdu_num++;
-        ieee80211_sta_reorder_release(hw, tid_agg_rx);
+        ieee80211_sta_reorder_release(sdata, tid_agg_rx);
 
  out:
         spin_unlock(&tid_agg_rx->reorder_lock);
@@ -751,7 +749,6 @@ static void ieee80211_rx_reorder_ampdu(struct ieee80211_rx_data *rx)
 {
         struct sk_buff *skb = rx->skb;
         struct ieee80211_local *local = rx->local;
-        struct ieee80211_hw *hw = &local->hw;
         struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;
         struct ieee80211_rx_status *status = IEEE80211_SKB_RXCB(skb);
         struct sta_info *sta = rx->sta;
@@ -813,7 +810,7 @@ static void ieee80211_rx_reorder_ampdu(struct ieee80211_rx_data *rx)
          * sure that we cannot get to it any more before doing
          * anything with it.
          */
-        if (ieee80211_sta_manage_reorder_buf(hw, tid_agg_rx, skb))
+        if (ieee80211_sta_manage_reorder_buf(rx->sdata, tid_agg_rx, skb))
                 return;
 
  dont_reorder:
@@ -1136,24 +1133,18 @@ static void ap_sta_ps_start(struct sta_info *sta)
         set_sta_flag(sta, WLAN_STA_PS_STA);
         if (!(local->hw.flags & IEEE80211_HW_AP_LINK_PS))
                 drv_sta_notify(local, sdata, STA_NOTIFY_SLEEP, &sta->sta);
-#ifdef CONFIG_MAC80211_VERBOSE_PS_DEBUG
-        printk(KERN_DEBUG "%s: STA %pM aid %d enters power save mode\n",
-               sdata->name, sta->sta.addr, sta->sta.aid);
-#endif /* CONFIG_MAC80211_VERBOSE_PS_DEBUG */
+        ps_dbg(sdata, "STA %pM aid %d enters power save mode\n",
+               sta->sta.addr, sta->sta.aid);
 }
 
 static void ap_sta_ps_end(struct sta_info *sta)
 {
-#ifdef CONFIG_MAC80211_VERBOSE_PS_DEBUG
-        printk(KERN_DEBUG "%s: STA %pM aid %d exits power save mode\n",
-               sta->sdata->name, sta->sta.addr, sta->sta.aid);
-#endif /* CONFIG_MAC80211_VERBOSE_PS_DEBUG */
+        ps_dbg(sta->sdata, "STA %pM aid %d exits power save mode\n",
+               sta->sta.addr, sta->sta.aid);
 
         if (test_sta_flag(sta, WLAN_STA_PS_DRIVER)) {
-#ifdef CONFIG_MAC80211_VERBOSE_PS_DEBUG
-                printk(KERN_DEBUG "%s: STA %pM aid %d driver-ps-blocked\n",
-                       sta->sdata->name, sta->sta.addr, sta->sta.aid);
-#endif /* CONFIG_MAC80211_VERBOSE_PS_DEBUG */
+                ps_dbg(sta->sdata, "STA %pM aid %d driver-ps-blocked\n",
+                       sta->sta.addr, sta->sta.aid);
                 return;
         }
 
@@ -1383,19 +1374,8 @@ ieee80211_reassemble_add(struct ieee80211_sub_if_data *sdata,
         if (sdata->fragment_next >= IEEE80211_FRAGMENT_MAX)
                 sdata->fragment_next = 0;
 
-        if (!skb_queue_empty(&entry->skb_list)) {
-#ifdef CONFIG_MAC80211_VERBOSE_DEBUG
-                struct ieee80211_hdr *hdr =
-                        (struct ieee80211_hdr *) entry->skb_list.next->data;
-                printk(KERN_DEBUG "%s: RX reassembly removed oldest "
-                       "fragment entry (idx=%d age=%lu seq=%d last_frag=%d "
-                       "addr1=%pM addr2=%pM\n",
-                       sdata->name, idx,
-                       jiffies - entry->first_frag_time, entry->seq,
-                       entry->last_frag, hdr->addr1, hdr->addr2);
-#endif
+        if (!skb_queue_empty(&entry->skb_list))
                 __skb_queue_purge(&entry->skb_list);
-        }
 
         __skb_queue_tail(&entry->skb_list, *skb); /* no need for locking */
         *skb = NULL;
@@ -1753,7 +1733,7 @@ ieee80211_deliver_skb(struct ieee80211_rx_data *rx)
                          */
                         xmit_skb = skb_copy(skb, GFP_ATOMIC);
                         if (!xmit_skb)
-                                net_dbg_ratelimited("%s: failed to clone multicast frame\n",
+                                net_info_ratelimited("%s: failed to clone multicast frame\n",
                                                     dev->name);
                 } else {
                         dsta = sta_info_get(sdata, skb->data);
@@ -1937,7 +1917,7 @@ ieee80211_rx_h_mesh_fwding(struct ieee80211_rx_data *rx)
             ether_addr_equal(sdata->vif.addr, hdr->addr3))
                 return RX_CONTINUE;
 
-        q = ieee80211_select_queue_80211(local, skb, hdr);
+        q = ieee80211_select_queue_80211(sdata, skb, hdr);
         if (ieee80211_queue_stopped(&local->hw, q)) {
                 IEEE80211_IFSTA_MESH_CTR_INC(ifmsh, dropped_frames_congestion);
                 return RX_DROP_MONITOR;
@@ -1957,7 +1937,7 @@ ieee80211_rx_h_mesh_fwding(struct ieee80211_rx_data *rx)
 
         fwd_skb = skb_copy(skb, GFP_ATOMIC);
         if (!fwd_skb) {
-                net_dbg_ratelimited("%s: failed to clone mesh frame\n",
+                net_info_ratelimited("%s: failed to clone mesh frame\n",
                                     sdata->name);
                 goto out;
         }
@@ -2060,8 +2040,6 @@ ieee80211_rx_h_data(struct ieee80211_rx_data *rx)
 static ieee80211_rx_result debug_noinline
 ieee80211_rx_h_ctrl(struct ieee80211_rx_data *rx)
 {
-        struct ieee80211_local *local = rx->local;
-        struct ieee80211_hw *hw = &local->hw;
         struct sk_buff *skb = rx->skb;
         struct ieee80211_bar *bar = (struct ieee80211_bar *)skb->data;
         struct tid_ampdu_rx *tid_agg_rx;
@@ -2098,7 +2076,8 @@ ieee80211_rx_h_ctrl(struct ieee80211_rx_data *rx)
 
                 spin_lock(&tid_agg_rx->reorder_lock);
                 /* release stored frames up to start of BAR */
-                ieee80211_release_reorder_frames(hw, tid_agg_rx, start_seq_num);
+                ieee80211_release_reorder_frames(rx->sdata, tid_agg_rx,
+                                                 start_seq_num);
                 spin_unlock(&tid_agg_rx->reorder_lock);
 
                 kfree_skb(skb);
@@ -2752,7 +2731,7 @@ void ieee80211_release_reorder_timeout(struct sta_info *sta, int tid)
                 return;
 
         spin_lock(&tid_agg_rx->reorder_lock);
-        ieee80211_sta_reorder_release(&sta->local->hw, tid_agg_rx);
+        ieee80211_sta_reorder_release(sta->sdata, tid_agg_rx);
         spin_unlock(&tid_agg_rx->reorder_lock);
 
         ieee80211_rx_handlers(&rx);
@@ -3032,6 +3011,10 @@ void ieee80211_rx(struct ieee80211_hw *hw, struct sk_buff *skb)
         if (unlikely(local->quiescing || local->suspended))
                 goto drop;
 
+        /* We might be during a HW reconfig, prevent Rx for the same reason */
+        if (unlikely(local->in_reconfig))
+                goto drop;
+
         /*
          * The same happens when we're not even started,
          * but that's worth a warning.
diff --git a/net/mac80211/scan.c b/net/mac80211/scan.c
index 169da0742c8..267b2940fad 100644
--- a/net/mac80211/scan.c
+++ b/net/mac80211/scan.c
@@ -114,8 +114,7 @@ ieee80211_bss_info_update(struct ieee80211_local *local,
 
         if (elems->tim && (!elems->parse_error ||
                            !(bss->valid_data & IEEE80211_BSS_VALID_DTIM))) {
-                struct ieee80211_tim_ie *tim_ie =
-                        (struct ieee80211_tim_ie *)elems->tim;
+                struct ieee80211_tim_ie *tim_ie = elems->tim;
                 bss->dtim_period = tim_ie->dtim_period;
                 if (!elems->parse_error)
                                 bss->valid_data |= IEEE80211_BSS_VALID_DTIM;
@@ -323,7 +322,7 @@ static void __ieee80211_scan_completed(struct ieee80211_hw *hw, bool aborted,
         ieee80211_mlme_notify_scan_completed(local);
         ieee80211_ibss_notify_scan_completed(local);
         ieee80211_mesh_notify_scan_completed(local);
-        ieee80211_queue_work(&local->hw, &local->work_work);
+        ieee80211_start_next_roc(local);
 }
 
 void ieee80211_scan_completed(struct ieee80211_hw *hw, bool aborted)
@@ -376,7 +375,7 @@ static int ieee80211_start_sw_scan(struct ieee80211_local *local)
 static bool ieee80211_can_scan(struct ieee80211_local *local,
                                struct ieee80211_sub_if_data *sdata)
 {
-        if (!list_empty(&local->work_list))
+        if (!list_empty(&local->roc_list))
                 return false;
 
         if (sdata->vif.type == NL80211_IFTYPE_STATION &&
diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c
index de455f8bbb9..06fa75ceb02 100644
--- a/net/mac80211/sta_info.c
+++ b/net/mac80211/sta_info.c
@@ -169,9 +169,7 @@ void sta_info_free(struct ieee80211_local *local, struct sta_info *sta)
         if (sta->rate_ctrl)
                 rate_control_free_sta(sta);
 
-#ifdef CONFIG_MAC80211_VERBOSE_DEBUG
-        wiphy_debug(local->hw.wiphy, "Destroyed STA %pM\n", sta->sta.addr);
-#endif /* CONFIG_MAC80211_VERBOSE_DEBUG */
+        sta_dbg(sta->sdata, "Destroyed STA %pM\n", sta->sta.addr);
 
         kfree(sta);
 }
@@ -278,9 +276,7 @@ struct sta_info *sta_info_alloc(struct ieee80211_sub_if_data *sdata,
         for (i = 0; i < NUM_RX_DATA_QUEUES; i++)
                 sta->last_seq_ctrl[i] = cpu_to_le16(USHRT_MAX);
 
-#ifdef CONFIG_MAC80211_VERBOSE_DEBUG
-        wiphy_debug(local->hw.wiphy, "Allocated STA %pM\n", sta->sta.addr);
-#endif /* CONFIG_MAC80211_VERBOSE_DEBUG */
+        sta_dbg(sdata, "Allocated STA %pM\n", sta->sta.addr);
 
 #ifdef CONFIG_MAC80211_MESH
         sta->plink_state = NL80211_PLINK_LISTEN;
@@ -333,9 +329,9 @@ static int sta_info_insert_drv_state(struct ieee80211_local *local,
         }
 
         if (sdata->vif.type == NL80211_IFTYPE_ADHOC) {
-                printk(KERN_DEBUG
-                       "%s: failed to move IBSS STA %pM to state %d (%d) - keeping it anyway.\n",
-                       sdata->name, sta->sta.addr, state + 1, err);
+                sdata_info(sdata,
+                           "failed to move IBSS STA %pM to state %d (%d) - keeping it anyway\n",
+                           sta->sta.addr, state + 1, err);
                 err = 0;
         }
 
@@ -390,9 +386,7 @@ static int sta_info_insert_finish(struct sta_info *sta) __acquires(RCU)
         sinfo.generation = local->sta_generation;
         cfg80211_new_sta(sdata->dev, sta->sta.addr, &sinfo, GFP_KERNEL);
 
-#ifdef CONFIG_MAC80211_VERBOSE_DEBUG
-        wiphy_debug(local->hw.wiphy, "Inserted STA %pM\n", sta->sta.addr);
-#endif /* CONFIG_MAC80211_VERBOSE_DEBUG */
+        sta_dbg(sdata, "Inserted STA %pM\n", sta->sta.addr);
 
         /* move reference to rcu-protected */
         rcu_read_lock();
@@ -618,10 +612,8 @@ static bool sta_info_cleanup_expire_buffered_ac(struct ieee80211_local *local,
                         break;
 
                 local->total_ps_buffered--;
-#ifdef CONFIG_MAC80211_VERBOSE_PS_DEBUG
-                printk(KERN_DEBUG "Buffered frame expired (STA %pM)\n",
+                ps_dbg(sta->sdata, "Buffered frame expired (STA %pM)\n",
                        sta->sta.addr);
-#endif
                 dev_kfree_skb(skb);
         }
 
@@ -747,9 +739,8 @@ int __must_check __sta_info_destroy(struct sta_info *sta)
                 mesh_accept_plinks_update(sdata);
 #endif
 
-#ifdef CONFIG_MAC80211_VERBOSE_DEBUG
-        wiphy_debug(local->hw.wiphy, "Removed STA %pM\n", sta->sta.addr);
-#endif /* CONFIG_MAC80211_VERBOSE_DEBUG */
+        sta_dbg(sdata, "Removed STA %pM\n", sta->sta.addr);
+
         cancel_work_sync(&sta->drv_unblock_wk);
 
         cfg80211_del_sta(sdata->dev, sta->sta.addr, GFP_KERNEL);
@@ -889,10 +880,8 @@ void ieee80211_sta_expire(struct ieee80211_sub_if_data *sdata,
                         continue;
 
                 if (time_after(jiffies, sta->last_rx + exp_time)) {
-#ifdef CONFIG_MAC80211_IBSS_DEBUG
-                        printk(KERN_DEBUG "%s: expiring inactive STA %pM\n",
-                               sdata->name, sta->sta.addr);
-#endif
+                        ibss_dbg(sdata, "expiring inactive STA %pM\n",
+                                 sta->sta.addr);
                         WARN_ON(__sta_info_destroy(sta));
                 }
         }
@@ -990,11 +979,9 @@ void ieee80211_sta_ps_deliver_wakeup(struct sta_info *sta)
 
         sta_info_recalc_tim(sta);
 
-#ifdef CONFIG_MAC80211_VERBOSE_PS_DEBUG
-        printk(KERN_DEBUG "%s: STA %pM aid %d sending %d filtered/%d PS frames "
-               "since STA not sleeping anymore\n", sdata->name,
+        ps_dbg(sdata,
+               "STA %pM aid %d sending %d filtered/%d PS frames since STA not sleeping anymore\n",
                sta->sta.addr, sta->sta.aid, filtered, buffered);
-#endif /* CONFIG_MAC80211_VERBOSE_PS_DEBUG */
 }
 
 static void ieee80211_send_null_response(struct ieee80211_sub_if_data *sdata,
@@ -1384,10 +1371,8 @@ int sta_info_move_state(struct sta_info *sta,
                 return -EINVAL;
         }
 
-#ifdef CONFIG_MAC80211_VERBOSE_DEBUG
-        printk(KERN_DEBUG "%s: moving STA %pM to state %d\n",
-                sta->sdata->name, sta->sta.addr, new_state);
-#endif
+        sta_dbg(sta->sdata, "moving STA %pM to state %d\n",
+                sta->sta.addr, new_state);
 
         /*
          * notify the driver before the actual changes so it can
diff --git a/net/mac80211/status.c b/net/mac80211/status.c
index 28cfa981cfb..2ed2f27fe8a 100644
--- a/net/mac80211/status.c
+++ b/net/mac80211/status.c
@@ -155,13 +155,10 @@ static void ieee80211_handle_filtered_frame(struct ieee80211_local *local,
                 return;
         }
 
-#ifdef CONFIG_MAC80211_VERBOSE_DEBUG
-        if (net_ratelimit())
-                wiphy_debug(local->hw.wiphy,
-                            "dropped TX filtered frame, queue_len=%d PS=%d @%lu\n",
-                            skb_queue_len(&sta->tx_filtered[ac]),
-                            !!test_sta_flag(sta, WLAN_STA_PS_STA), jiffies);
-#endif
+        ps_dbg_ratelimited(sta->sdata,
+                           "dropped TX filtered frame, queue_len=%d PS=%d @%lu\n",
+                           skb_queue_len(&sta->tx_filtered[ac]),
+                           !!test_sta_flag(sta, WLAN_STA_PS_STA), jiffies);
         dev_kfree_skb(skb);
 }
 
@@ -520,36 +517,16 @@ void ieee80211_tx_status(struct ieee80211_hw *hw, struct sk_buff *skb)
 
         if (info->flags & IEEE80211_TX_INTFL_NL80211_FRAME_TX) {
                 u64 cookie = (unsigned long)skb;
+                acked = info->flags & IEEE80211_TX_STAT_ACK;
 
                 if (ieee80211_is_nullfunc(hdr->frame_control) ||
-                    ieee80211_is_qos_nullfunc(hdr->frame_control)) {
-                        acked = info->flags & IEEE80211_TX_STAT_ACK;
-
+                    ieee80211_is_qos_nullfunc(hdr->frame_control))
                         cfg80211_probe_status(skb->dev, hdr->addr1,
                                               cookie, acked, GFP_ATOMIC);
-                } else {
-                        struct ieee80211_work *wk;
-
-                        rcu_read_lock();
-                        list_for_each_entry_rcu(wk, &local->work_list, list) {
-                                if (wk->type != IEEE80211_WORK_OFFCHANNEL_TX)
-                                        continue;
-                                if (wk->offchan_tx.frame != skb)
-                                        continue;
-                                wk->offchan_tx.status = true;
-                                break;
-                        }
-                        rcu_read_unlock();
-                        if (local->hw_roc_skb_for_status == skb) {
-                                cookie = local->hw_roc_cookie ^ 2;
-                                local->hw_roc_skb_for_status = NULL;
-                        }
-
+                else
                         cfg80211_mgmt_tx_status(
                                 skb->dev, cookie, skb->data, skb->len,
-                                !!(info->flags & IEEE80211_TX_STAT_ACK),
-                                GFP_ATOMIC);
-                }
+                                acked, GFP_ATOMIC);
         }
 
         if (unlikely(info->ack_frame_id)) {
@@ -589,7 +566,7 @@ void ieee80211_tx_status(struct ieee80211_hw *hw, struct sk_buff *skb)
         /* send frame to monitor interfaces now */
         rtap_len = ieee80211_tx_radiotap_len(info);
         if (WARN_ON_ONCE(skb_headroom(skb) < rtap_len)) {
-                printk(KERN_ERR "ieee80211_tx_status: headroom too small\n");
+                pr_err("ieee80211_tx_status: headroom too small\n");
                 dev_kfree_skb(skb);
                 return;
         }
diff --git a/net/mac80211/tkip.c b/net/mac80211/tkip.c
index 51077a956a8..57e14d59e12 100644
--- a/net/mac80211/tkip.c
+++ b/net/mac80211/tkip.c
@@ -260,17 +260,6 @@ int ieee80211_tkip_decrypt_data(struct crypto_cipher *tfm,
         keyid = pos[3];
         iv32 = get_unaligned_le32(pos + 4);
         pos += 8;
-#ifdef CONFIG_MAC80211_TKIP_DEBUG
-        {
-                int i;
-                printk(KERN_DEBUG "TKIP decrypt: data(len=%zd)", payload_len);
-                for (i = 0; i < payload_len; i++)
-                        printk(" %02x", payload[i]);
-                printk("\n");
-                printk(KERN_DEBUG "TKIP decrypt: iv16=%04x iv32=%08x\n",
-                       iv16, iv32);
-        }
-#endif
 
         if (!(keyid & (1 << 5)))
                 return TKIP_DECRYPT_NO_EXT_IV;
@@ -281,16 +270,8 @@ int ieee80211_tkip_decrypt_data(struct crypto_cipher *tfm,
         if (key->u.tkip.rx[queue].state != TKIP_STATE_NOT_INIT &&
             (iv32 < key->u.tkip.rx[queue].iv32 ||
              (iv32 == key->u.tkip.rx[queue].iv32 &&
-              iv16 <= key->u.tkip.rx[queue].iv16))) {
-#ifdef CONFIG_MAC80211_TKIP_DEBUG
-                printk(KERN_DEBUG "TKIP replay detected for RX frame from "
-                       "%pM (RX IV (%04x,%02x) <= prev. IV (%04x,%02x)\n",
-                       ta,
-                       iv32, iv16, key->u.tkip.rx[queue].iv32,
-                       key->u.tkip.rx[queue].iv16);
-#endif
+              iv16 <= key->u.tkip.rx[queue].iv16)))
                 return TKIP_DECRYPT_REPLAY;
-        }
 
         if (only_iv) {
                 res = TKIP_DECRYPT_OK;
@@ -302,22 +283,6 @@ int ieee80211_tkip_decrypt_data(struct crypto_cipher *tfm,
             key->u.tkip.rx[queue].iv32 != iv32) {
                 /* IV16 wrapped around - perform TKIP phase 1 */
                 tkip_mixing_phase1(tk, &key->u.tkip.rx[queue], ta, iv32);
-#ifdef CONFIG_MAC80211_TKIP_DEBUG
-                {
-                        int i;
-                        u8 key_offset = NL80211_TKIP_DATA_OFFSET_ENCR_KEY;
-                        printk(KERN_DEBUG "TKIP decrypt: Phase1 TA=%pM"
-                               " TK=", ta);
-                        for (i = 0; i < 16; i++)
-                                printk("%02x ",
-                                       key->conf.key[key_offset + i]);
-                        printk("\n");
-                        printk(KERN_DEBUG "TKIP decrypt: P1K=");
-                        for (i = 0; i < 5; i++)
-                                printk("%04x ", key->u.tkip.rx[queue].p1k[i]);
-                        printk("\n");
-                }
-#endif
         }
         if (key->local->ops->update_tkip_key &&
             key->flags & KEY_FLAG_UPLOADED_TO_HARDWARE &&
@@ -333,15 +298,6 @@ int ieee80211_tkip_decrypt_data(struct crypto_cipher *tfm,
         }
 
         tkip_mixing_phase2(tk, &key->u.tkip.rx[queue], iv16, rc4key);
-#ifdef CONFIG_MAC80211_TKIP_DEBUG
-        {
-                int i;
-                printk(KERN_DEBUG "TKIP decrypt: Phase2 rc4key=");
-                for (i = 0; i < 16; i++)
-                        printk("%02x ", rc4key[i]);
-                printk("\n");
-        }
-#endif
 
         res = ieee80211_wep_decrypt_data(tfm, rc4key, 16, pos, payload_len - 12);
  done:
diff --git a/net/mac80211/trace.c b/net/mac80211/trace.c
new file mode 100644
index 00000000000..386e45d8a95
--- /dev/null
+++ b/net/mac80211/trace.c
@@ -0,0 +1,75 @@
+/* bug in tracepoint.h, it should include this */
+#include <linux/module.h>
+
+/* sparse isn't too happy with all macros... */
+#ifndef __CHECKER__
+#include <net/cfg80211.h>
+#include "driver-ops.h"
+#include "debug.h"
+#define CREATE_TRACE_POINTS
+#include "trace.h"
+
+#ifdef CONFIG_MAC80211_MESSAGE_TRACING
+void __sdata_info(const char *fmt, ...)
+{
+        struct va_format vaf = {
+                .fmt = fmt,
+        };
+        va_list args;
+
+        va_start(args, fmt);
+        vaf.va = &args;
+
+        pr_info("%pV", &vaf);
+        trace_mac80211_info(&vaf);
+        va_end(args);
+}
+
+void __sdata_dbg(bool print, const char *fmt, ...)
+{
+        struct va_format vaf = {
+                .fmt = fmt,
+        };
+        va_list args;
+
+        va_start(args, fmt);
+        vaf.va = &args;
+
+        if (print)
+                pr_debug("%pV", &vaf);
+        trace_mac80211_dbg(&vaf);
+        va_end(args);
+}
+
+void __sdata_err(const char *fmt, ...)
+{
+        struct va_format vaf = {
+                .fmt = fmt,
+        };
+        va_list args;
+
+        va_start(args, fmt);
+        vaf.va = &args;
+
+        pr_err("%pV", &vaf);
+        trace_mac80211_err(&vaf);
+        va_end(args);
+}
+
+void __wiphy_dbg(struct wiphy *wiphy, bool print, const char *fmt, ...)
+{
+        struct va_format vaf = {
+                .fmt = fmt,
+        };
+        va_list args;
+
+        va_start(args, fmt);
+        vaf.va = &args;
+
+        if (print)
+                wiphy_dbg(wiphy, "%pV", &vaf);
+        trace_mac80211_dbg(&vaf);
+        va_end(args);
+}
+#endif
+#endif
diff --git a/net/mac80211/driver-trace.h b/net/mac80211/trace.h
index 6de00b2c268..2e60f4acd02 100644
--- a/net/mac80211/driver-trace.h
+++ b/net/mac80211/trace.h
@@ -1218,6 +1218,32 @@ DEFINE_EVENT(release_evt, drv_allow_buffered_frames,
         TP_ARGS(local, sta, tids, num_frames, reason, more_data)
 );
 
+TRACE_EVENT(drv_get_rssi,
+        TP_PROTO(struct ieee80211_local *local, struct ieee80211_sta *sta,
+                 s8 rssi, int ret),
+
+        TP_ARGS(local, sta, rssi, ret),
+
+        TP_STRUCT__entry(
+                LOCAL_ENTRY
+                STA_ENTRY
+                __field(s8, rssi)
+                __field(int, ret)
+        ),
+
+        TP_fast_assign(
+                LOCAL_ASSIGN;
+                STA_ASSIGN;
+                __entry->rssi = rssi;
+                __entry->ret = ret;
+        ),
+
+        TP_printk(
+                LOCAL_PR_FMT STA_PR_FMT " rssi:%d ret:%d",
+                LOCAL_PR_ARG, STA_PR_ARG, __entry->rssi, __entry->ret
+        )
+);
+
 /*
  * Tracing for API calls that drivers call.
  */
@@ -1606,10 +1632,49 @@ TRACE_EVENT(stop_queue,
                 LOCAL_PR_ARG, __entry->queue, __entry->reason
         )
 );
+
+#ifdef CONFIG_MAC80211_MESSAGE_TRACING
+#undef TRACE_SYSTEM
+#define TRACE_SYSTEM mac80211_msg
+
+#define MAX_MSG_LEN     100
+
+DECLARE_EVENT_CLASS(mac80211_msg_event,
+        TP_PROTO(struct va_format *vaf),
+
+        TP_ARGS(vaf),
+
+        TP_STRUCT__entry(
+                __dynamic_array(char, msg, MAX_MSG_LEN)
+        ),
+
+        TP_fast_assign(
+                WARN_ON_ONCE(vsnprintf(__get_dynamic_array(msg),
+                                       MAX_MSG_LEN, vaf->fmt,
+                                       *vaf->va) >= MAX_MSG_LEN);
+        ),
+
+        TP_printk("%s", __get_str(msg))
+);
+
+DEFINE_EVENT(mac80211_msg_event, mac80211_info,
+        TP_PROTO(struct va_format *vaf),
+        TP_ARGS(vaf)
+);
+DEFINE_EVENT(mac80211_msg_event, mac80211_dbg,
+        TP_PROTO(struct va_format *vaf),
+        TP_ARGS(vaf)
+);
+DEFINE_EVENT(mac80211_msg_event, mac80211_err,
+        TP_PROTO(struct va_format *vaf),
+        TP_ARGS(vaf)
+);
+#endif
+
 #endif /* !__MAC80211_DRIVER_TRACE || TRACE_HEADER_MULTI_READ */
 
 #undef TRACE_INCLUDE_PATH
 #define TRACE_INCLUDE_PATH .
 #undef TRACE_INCLUDE_FILE
-#define TRACE_INCLUDE_FILE driver-trace
+#define TRACE_INCLUDE_FILE trace
 #include <trace/define_trace.h>
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index e453212fa17..ec8f5346737 100644
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@ -175,12 +175,6 @@ static __le16 ieee80211_duration(struct ieee80211_tx_data *tx,
         return cpu_to_le16(dur);
 }
 
-static inline int is_ieee80211_device(struct ieee80211_local *local,
-                                      struct net_device *dev)
-{
-        return local == wdev_priv(dev->ieee80211_ptr);
-}
-
 /* tx handlers */
 static ieee80211_tx_result debug_noinline
 ieee80211_tx_h_dynamic_ps(struct ieee80211_tx_data *tx)
@@ -297,10 +291,10 @@ ieee80211_tx_h_check_assoc(struct ieee80211_tx_data *tx)
                 if (unlikely(!assoc &&
                              ieee80211_is_data(hdr->frame_control))) {
 #ifdef CONFIG_MAC80211_VERBOSE_DEBUG
-                        printk(KERN_DEBUG "%s: dropped data frame to not "
-                               "associated station %pM\n",
-                               tx->sdata->name, hdr->addr1);
-#endif /* CONFIG_MAC80211_VERBOSE_DEBUG */
+                        sdata_info(tx->sdata,
+                                   "dropped data frame to not associated station %pM\n",
+                                   hdr->addr1);
+#endif
                         I802_DEBUG_INC(tx->local->tx_handlers_drop_not_assoc);
                         return TX_DROP;
                 }
@@ -367,10 +361,7 @@ static void purge_old_ps_buffers(struct ieee80211_local *local)
         rcu_read_unlock();
 
         local->total_ps_buffered = total;
-#ifdef CONFIG_MAC80211_VERBOSE_PS_DEBUG
-        wiphy_debug(local->hw.wiphy, "PS buffers full - purged %d frames\n",
-                    purged);
-#endif
+        ps_dbg_hw(&local->hw, "PS buffers full - purged %d frames\n", purged);
 }
 
 static ieee80211_tx_result
@@ -412,10 +403,8 @@ ieee80211_tx_h_multicast_ps_buf(struct ieee80211_tx_data *tx)
                 purge_old_ps_buffers(tx->local);
 
         if (skb_queue_len(&tx->sdata->bss->ps_bc_buf) >= AP_MAX_BC_BUFFER) {
-#ifdef CONFIG_MAC80211_VERBOSE_PS_DEBUG
-                net_dbg_ratelimited("%s: BC TX buffer full - dropping the oldest frame\n",
-                                    tx->sdata->name);
-#endif
+                ps_dbg(tx->sdata,
+                       "BC TX buffer full - dropping the oldest frame\n");
                 dev_kfree_skb(skb_dequeue(&tx->sdata->bss->ps_bc_buf));
         } else
                 tx->local->total_ps_buffered++;
@@ -466,18 +455,15 @@ ieee80211_tx_h_unicast_ps_buf(struct ieee80211_tx_data *tx)
                         return TX_CONTINUE;
                 }
 
-#ifdef CONFIG_MAC80211_VERBOSE_PS_DEBUG
-                printk(KERN_DEBUG "STA %pM aid %d: PS buffer for AC %d\n",
+                ps_dbg(sta->sdata, "STA %pM aid %d: PS buffer for AC %d\n",
                        sta->sta.addr, sta->sta.aid, ac);
-#endif /* CONFIG_MAC80211_VERBOSE_PS_DEBUG */
                 if (tx->local->total_ps_buffered >= TOTAL_MAX_TX_BUFFER)
                         purge_old_ps_buffers(tx->local);
                 if (skb_queue_len(&sta->ps_tx_buf[ac]) >= STA_MAX_TX_BUFFER) {
                         struct sk_buff *old = skb_dequeue(&sta->ps_tx_buf[ac]);
-#ifdef CONFIG_MAC80211_VERBOSE_PS_DEBUG
-                        net_dbg_ratelimited("%s: STA %pM TX buffer for AC %d full - dropping oldest frame\n",
-                                            tx->sdata->name, sta->sta.addr, ac);
-#endif
+                        ps_dbg(tx->sdata,
+                               "STA %pM TX buffer for AC %d full - dropping oldest frame\n",
+                               sta->sta.addr, ac);
                         dev_kfree_skb(old);
                 } else
                         tx->local->total_ps_buffered++;
@@ -499,14 +485,11 @@ ieee80211_tx_h_unicast_ps_buf(struct ieee80211_tx_data *tx)
                 sta_info_recalc_tim(sta);
 
                 return TX_QUEUED;
+        } else if (unlikely(test_sta_flag(sta, WLAN_STA_PS_STA))) {
+                ps_dbg(tx->sdata,
+                       "STA %pM in PS mode, but polling/in SP -> send frame\n",
+                       sta->sta.addr);
         }
-#ifdef CONFIG_MAC80211_VERBOSE_PS_DEBUG
-        else if (unlikely(test_sta_flag(sta, WLAN_STA_PS_STA))) {
-                printk(KERN_DEBUG
-                       "%s: STA %pM in PS mode, but polling/in SP -> send frame\n",
-                       tx->sdata->name, sta->sta.addr);
-        }
-#endif /* CONFIG_MAC80211_VERBOSE_PS_DEBUG */
 
         return TX_CONTINUE;
 }
@@ -1965,7 +1948,7 @@ netdev_tx_t ieee80211_subif_start_xmit(struct sk_buff *skb,
                      (cpu_to_be16(ethertype) != sdata->control_port_protocol ||
                       !ether_addr_equal(sdata->vif.addr, skb->data + ETH_ALEN)))) {
 #ifdef CONFIG_MAC80211_VERBOSE_DEBUG
-                net_dbg_ratelimited("%s: dropped frame to %pM (unauthorized port)\n",
+                net_info_ratelimited("%s: dropped frame to %pM (unauthorized port)\n",
                                     dev->name, hdr.addr1);
 #endif
 
diff --git a/net/mac80211/util.c b/net/mac80211/util.c
index 8dd4712620f..242ecde381f 100644
--- a/net/mac80211/util.c
+++ b/net/mac80211/util.c
@@ -804,7 +804,7 @@ void ieee80211_set_wmm_default(struct ieee80211_sub_if_data *sdata,
         struct ieee80211_local *local = sdata->local;
         struct ieee80211_tx_queue_params qparam;
         int ac;
-        bool use_11b;
+        bool use_11b, enable_qos;
         int aCWmin, aCWmax;
 
         if (!local->ops->conf_tx)
@@ -818,6 +818,13 @@ void ieee80211_set_wmm_default(struct ieee80211_sub_if_data *sdata,
         use_11b = (local->hw.conf.channel->band == IEEE80211_BAND_2GHZ) &&
                  !(sdata->flags & IEEE80211_SDATA_OPERATING_GMODE);
 
+        /*
+         * By default disable QoS in STA mode for old access points, which do
+         * not support 802.11e. New APs will provide proper queue parameters,
+         * that we will configure later.
+         */
+        enable_qos = (sdata->vif.type != NL80211_IFTYPE_STATION);
+
         for (ac = 0; ac < IEEE80211_NUM_ACS; ac++) {
                 /* Set defaults according to 802.11-2007 Table 7-37 */
                 aCWmax = 1023;
@@ -826,38 +833,47 @@ void ieee80211_set_wmm_default(struct ieee80211_sub_if_data *sdata,
                 else
                         aCWmin = 15;
 
-                switch (ac) {
-                case IEEE80211_AC_BK:
-                        qparam.cw_max = aCWmax;
-                        qparam.cw_min = aCWmin;
-                        qparam.txop = 0;
-                        qparam.aifs = 7;
-                        break;
-                default: /* never happens but let's not leave undefined */
-                case IEEE80211_AC_BE:
+                if (enable_qos) {
+                        switch (ac) {
+                        case IEEE80211_AC_BK:
+                                qparam.cw_max = aCWmax;
+                                qparam.cw_min = aCWmin;
+                                qparam.txop = 0;
+                                qparam.aifs = 7;
+                                break;
+                        /* never happens but let's not leave undefined */
+                        default:
+                        case IEEE80211_AC_BE:
+                                qparam.cw_max = aCWmax;
+                                qparam.cw_min = aCWmin;
+                                qparam.txop = 0;
+                                qparam.aifs = 3;
+                                break;
+                        case IEEE80211_AC_VI:
+                                qparam.cw_max = aCWmin;
+                                qparam.cw_min = (aCWmin + 1) / 2 - 1;
+                                if (use_11b)
+                                        qparam.txop = 6016/32;
+                                else
+                                        qparam.txop = 3008/32;
+                                qparam.aifs = 2;
+                                break;
+                        case IEEE80211_AC_VO:
+                                qparam.cw_max = (aCWmin + 1) / 2 - 1;
+                                qparam.cw_min = (aCWmin + 1) / 4 - 1;
+                                if (use_11b)
+                                        qparam.txop = 3264/32;
+                                else
+                                        qparam.txop = 1504/32;
+                                qparam.aifs = 2;
+                                break;
+                        }
+                } else {
+                        /* Confiure old 802.11b/g medium access rules. */
                         qparam.cw_max = aCWmax;
                         qparam.cw_min = aCWmin;
                         qparam.txop = 0;
-                        qparam.aifs = 3;
-                        break;
-                case IEEE80211_AC_VI:
-                        qparam.cw_max = aCWmin;
-                        qparam.cw_min = (aCWmin + 1) / 2 - 1;
-                        if (use_11b)
-                                qparam.txop = 6016/32;
-                        else
-                                qparam.txop = 3008/32;
-                        qparam.aifs = 2;
-                        break;
-                case IEEE80211_AC_VO:
-                        qparam.cw_max = (aCWmin + 1) / 2 - 1;
-                        qparam.cw_min = (aCWmin + 1) / 4 - 1;
-                        if (use_11b)
-                                qparam.txop = 3264/32;
-                        else
-                                qparam.txop = 1504/32;
                         qparam.aifs = 2;
-                        break;
                 }
 
                 qparam.uapsd = false;
@@ -866,12 +882,8 @@ void ieee80211_set_wmm_default(struct ieee80211_sub_if_data *sdata,
                 drv_conf_tx(local, sdata, ac, &qparam);
         }
 
-        /* after reinitialize QoS TX queues setting to default,
-         * disable QoS at all */
-
         if (sdata->vif.type != NL80211_IFTYPE_MONITOR) {
-                sdata->vif.bss_conf.qos =
-                        sdata->vif.type != NL80211_IFTYPE_STATION;
+                sdata->vif.bss_conf.qos = enable_qos;
                 if (bss_notify)
                         ieee80211_bss_info_change_notify(sdata,
                                                          BSS_CHANGED_QOS);
@@ -1267,14 +1279,19 @@ int ieee80211_reconfig(struct ieee80211_local *local)
         /* add STAs back */
         mutex_lock(&local->sta_mtx);
         list_for_each_entry(sta, &local->sta_list, list) {
-                if (sta->uploaded) {
-                        enum ieee80211_sta_state state;
+                enum ieee80211_sta_state state;
 
-                        for (state = IEEE80211_STA_NOTEXIST;
-                             state < sta->sta_state; state++)
-                                WARN_ON(drv_sta_state(local, sta->sdata, sta,
-                                                      state, state + 1));
-                }
+                if (!sta->uploaded)
+                        continue;
+
+                /* AP-mode stations will be added later */
+                if (sta->sdata->vif.type == NL80211_IFTYPE_AP)
+                        continue;
+
+                for (state = IEEE80211_STA_NOTEXIST;
+                     state < sta->sta_state; state++)
+                        WARN_ON(drv_sta_state(local, sta->sdata, sta, state,
+                                              state + 1));
         }
         mutex_unlock(&local->sta_mtx);
 
@@ -1371,11 +1388,32 @@ int ieee80211_reconfig(struct ieee80211_local *local)
                 }
         }
 
+        /* APs are now beaconing, add back stations */
+        mutex_lock(&local->sta_mtx);
+        list_for_each_entry(sta, &local->sta_list, list) {
+                enum ieee80211_sta_state state;
+
+                if (!sta->uploaded)
+                        continue;
+
+                if (sta->sdata->vif.type != NL80211_IFTYPE_AP)
+                        continue;
+
+                for (state = IEEE80211_STA_NOTEXIST;
+                     state < sta->sta_state; state++)
+                        WARN_ON(drv_sta_state(local, sta->sdata, sta, state,
+                                              state + 1));
+        }
+        mutex_unlock(&local->sta_mtx);
+
         /* add back keys */
         list_for_each_entry(sdata, &local->interfaces, list)
                 if (ieee80211_sdata_running(sdata))
                         ieee80211_enable_keys(sdata);
 
+        local->in_reconfig = false;
+        barrier();
+
  wake_up:
         /*
          * Clear the WLAN_STA_BLOCK_BA flag so new aggregation
diff --git a/net/mac80211/wme.c b/net/mac80211/wme.c
index c3d643a6536..cea06e9f26f 100644
--- a/net/mac80211/wme.c
+++ b/net/mac80211/wme.c
@@ -52,11 +52,11 @@ static int wme_downgrade_ac(struct sk_buff *skb)
         }
 }
 
-static u16 ieee80211_downgrade_queue(struct ieee80211_local *local,
+static u16 ieee80211_downgrade_queue(struct ieee80211_sub_if_data *sdata,
                                      struct sk_buff *skb)
 {
         /* in case we are a client verify acm is not set for this ac */
-        while (unlikely(local->wmm_acm & BIT(skb->priority))) {
+        while (unlikely(sdata->wmm_acm & BIT(skb->priority))) {
                 if (wme_downgrade_ac(skb)) {
                         /*
                          * This should not really happen. The AP has marked all
@@ -73,10 +73,11 @@ static u16 ieee80211_downgrade_queue(struct ieee80211_local *local,
 }
 
 /* Indicate which queue to use for this fully formed 802.11 frame */
-u16 ieee80211_select_queue_80211(struct ieee80211_local *local,
+u16 ieee80211_select_queue_80211(struct ieee80211_sub_if_data *sdata,
                                  struct sk_buff *skb,
                                  struct ieee80211_hdr *hdr)
 {
+        struct ieee80211_local *local = sdata->local;
         u8 *p;
 
         if (local->hw.queues < IEEE80211_NUM_ACS)
@@ -94,7 +95,7 @@ u16 ieee80211_select_queue_80211(struct ieee80211_local *local,
         p = ieee80211_get_qos_ctl(hdr);
         skb->priority = *p & IEEE80211_QOS_CTL_TAG1D_MASK;
 
-        return ieee80211_downgrade_queue(local, skb);
+        return ieee80211_downgrade_queue(sdata, skb);
 }
 
 /* Indicate which queue to use. */
@@ -156,7 +157,7 @@ u16 ieee80211_select_queue(struct ieee80211_sub_if_data *sdata,
          * data frame has */
         skb->priority = cfg80211_classify8021d(skb);
 
-        return ieee80211_downgrade_queue(local, skb);
+        return ieee80211_downgrade_queue(sdata, skb);
 }
 
 void ieee80211_set_qos_hdr(struct ieee80211_sub_if_data *sdata,
diff --git a/net/mac80211/wme.h b/net/mac80211/wme.h
index ca80818b7b6..7fea4bb8acb 100644
--- a/net/mac80211/wme.h
+++ b/net/mac80211/wme.h
@@ -15,7 +15,7 @@
 
 extern const int ieee802_1d_to_ac[8];
 
-u16 ieee80211_select_queue_80211(struct ieee80211_local *local,
+u16 ieee80211_select_queue_80211(struct ieee80211_sub_if_data *sdata,
                                  struct sk_buff *skb,
                                  struct ieee80211_hdr *hdr);
 u16 ieee80211_select_queue(struct ieee80211_sub_if_data *sdata,
diff --git a/net/mac80211/work.c b/net/mac80211/work.c
deleted file mode 100644
index b2650a9d45f..00000000000
--- a/net/mac80211/work.c
+++ /dev/null
@@ -1,370 +0,0 @@
-/*
- * mac80211 work implementation
- *
- * Copyright 2003-2008, Jouni Malinen <j@w1.fi>
- * Copyright 2004, Instant802 Networks, Inc.
- * Copyright 2005, Devicescape Software, Inc.
- * Copyright 2006-2007  Jiri Benc <jbenc@suse.cz>
- * Copyright 2007, Michael Wu <flamingice@sourmilk.net>
- * Copyright 2009, Johannes Berg <johannes@sipsolutions.net>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-
-#include <linux/delay.h>
-#include <linux/if_ether.h>
-#include <linux/skbuff.h>
-#include <linux/if_arp.h>
-#include <linux/etherdevice.h>
-#include <linux/crc32.h>
-#include <linux/slab.h>
-#include <net/mac80211.h>
-#include <asm/unaligned.h>
-
-#include "ieee80211_i.h"
-#include "rate.h"
-#include "driver-ops.h"
-
-enum work_action {
-        WORK_ACT_NONE,
-        WORK_ACT_TIMEOUT,
-};
-
-
-/* utils */
-static inline void ASSERT_WORK_MTX(struct ieee80211_local *local)
-{
-        lockdep_assert_held(&local->mtx);
-}
-
-/*
- * We can have multiple work items (and connection probing)
- * scheduling this timer, but we need to take care to only
- * reschedule it when it should fire _earlier_ than it was
- * asked for before, or if it's not pending right now. This
- * function ensures that. Note that it then is required to
- * run this function for all timeouts after the first one
- * has happened -- the work that runs from this timer will
- * do that.
- */
-static void run_again(struct ieee80211_local *local,
-                      unsigned long timeout)
-{
-        ASSERT_WORK_MTX(local);
-
-        if (!timer_pending(&local->work_timer) ||
-            time_before(timeout, local->work_timer.expires))
-                mod_timer(&local->work_timer, timeout);
-}
-
-void free_work(struct ieee80211_work *wk)
-{
-        kfree_rcu(wk, rcu_head);
-}
-
-static enum work_action __must_check
-ieee80211_remain_on_channel_timeout(struct ieee80211_work *wk)
-{
-        /*
-         * First time we run, do nothing -- the generic code will
-         * have switched to the right channel etc.
-         */
-        if (!wk->started) {
-                wk->timeout = jiffies + msecs_to_jiffies(wk->remain.duration);
-
-                cfg80211_ready_on_channel(wk->sdata->dev, (unsigned long) wk,
-                                          wk->chan, wk->chan_type,
-                                          wk->remain.duration, GFP_KERNEL);
-
-                return WORK_ACT_NONE;
-        }
-
-        return WORK_ACT_TIMEOUT;
-}
-
-static enum work_action __must_check
-ieee80211_offchannel_tx(struct ieee80211_work *wk)
-{
-        if (!wk->started) {
-                wk->timeout = jiffies + msecs_to_jiffies(wk->offchan_tx.wait);
-
-                /*
-                 * After this, offchan_tx.frame remains but now is no
-                 * longer a valid pointer -- we still need it as the
-                 * cookie for canceling this work/status matching.
-                 */
-                ieee80211_tx_skb(wk->sdata, wk->offchan_tx.frame);
-
-                return WORK_ACT_NONE;
-        }
-
-        return WORK_ACT_TIMEOUT;
-}
-
-static void ieee80211_work_timer(unsigned long data)
-{
-        struct ieee80211_local *local = (void *) data;
-
-        if (local->quiescing)
-                return;
-
-        ieee80211_queue_work(&local->hw, &local->work_work);
-}
-
-static void ieee80211_work_work(struct work_struct *work)
-{
-        struct ieee80211_local *local =
-                container_of(work, struct ieee80211_local, work_work);
-        struct ieee80211_work *wk, *tmp;
-        LIST_HEAD(free_work);
-        enum work_action rma;
-        bool remain_off_channel = false;
-
-        /*
-         * ieee80211_queue_work() should have picked up most cases,
-         * here we'll pick the rest.
-         */
-        if (WARN(local->suspended, "work scheduled while going to suspend\n"))
-                return;
-
-        mutex_lock(&local->mtx);
-
-        if (local->scanning) {
-                mutex_unlock(&local->mtx);
-                return;
-        }
-
-        ieee80211_recalc_idle(local);
-
-        list_for_each_entry_safe(wk, tmp, &local->work_list, list) {
-                bool started = wk->started;
-
-                /* mark work as started if it's on the current off-channel */
-                if (!started && local->tmp_channel &&
-                    wk->chan == local->tmp_channel &&
-                    wk->chan_type == local->tmp_channel_type) {
-                        started = true;
-                        wk->timeout = jiffies;
-                }
-
-                if (!started && !local->tmp_channel) {
-                        ieee80211_offchannel_stop_vifs(local, true);
-
-                        local->tmp_channel = wk->chan;
-                        local->tmp_channel_type = wk->chan_type;
-
-                        ieee80211_hw_config(local, 0);
-
-                        started = true;
-                        wk->timeout = jiffies;
-                }
-
-                /* don't try to work with items that aren't started */
-                if (!started)
-                        continue;
-
-                if (time_is_after_jiffies(wk->timeout)) {
-                        /*
-                         * This work item isn't supposed to be worked on
-                         * right now, but take care to adjust the timer
-                         * properly.
-                         */
-                        run_again(local, wk->timeout);
-                        continue;
-                }
-
-                switch (wk->type) {
-                default:
-                        WARN_ON(1);
-                        /* nothing */
-                        rma = WORK_ACT_NONE;
-                        break;
-                case IEEE80211_WORK_ABORT:
-                        rma = WORK_ACT_TIMEOUT;
-                        break;
-                case IEEE80211_WORK_REMAIN_ON_CHANNEL:
-                        rma = ieee80211_remain_on_channel_timeout(wk);
-                        break;
-                case IEEE80211_WORK_OFFCHANNEL_TX:
-                        rma = ieee80211_offchannel_tx(wk);
-                        break;
-                }
-
-                wk->started = started;
-
-                switch (rma) {
-                case WORK_ACT_NONE:
-                        /* might have changed the timeout */
-                        run_again(local, wk->timeout);
-                        break;
-                case WORK_ACT_TIMEOUT:
-                        list_del_rcu(&wk->list);
-                        synchronize_rcu();
-                        list_add(&wk->list, &free_work);
-                        break;
-                default:
-                        WARN(1, "unexpected: %d", rma);
-                }
-        }
-
-        list_for_each_entry(wk, &local->work_list, list) {
-                if (!wk->started)
-                        continue;
-                if (wk->chan != local->tmp_channel ||
-                    wk->chan_type != local->tmp_channel_type)
-                        continue;
-                remain_off_channel = true;
-        }
-
-        if (!remain_off_channel && local->tmp_channel) {
-                local->tmp_channel = NULL;
-                ieee80211_hw_config(local, 0);
-
-                ieee80211_offchannel_return(local, true);
-
-                /* give connection some time to breathe */
-                run_again(local, jiffies + HZ/2);
-        }
-
-        ieee80211_recalc_idle(local);
-        ieee80211_run_deferred_scan(local);
-
-        mutex_unlock(&local->mtx);
-
-        list_for_each_entry_safe(wk, tmp, &free_work, list) {
-                wk->done(wk, NULL);
-                list_del(&wk->list);
-                kfree(wk);
-        }
-}
-
-void ieee80211_add_work(struct ieee80211_work *wk)
-{
-        struct ieee80211_local *local;
-
-        if (WARN_ON(!wk->chan))
-                return;
-
-        if (WARN_ON(!wk->sdata))
-                return;
-
-        if (WARN_ON(!wk->done))
-                return;
-
-        if (WARN_ON(!ieee80211_sdata_running(wk->sdata)))
-                return;
-
-        wk->started = false;
-
-        local = wk->sdata->local;
-        mutex_lock(&local->mtx);
-        list_add_tail(&wk->list, &local->work_list);
-        mutex_unlock(&local->mtx);
-
-        ieee80211_queue_work(&local->hw, &local->work_work);
-}
-
-void ieee80211_work_init(struct ieee80211_local *local)
-{
-        INIT_LIST_HEAD(&local->work_list);
-        setup_timer(&local->work_timer, ieee80211_work_timer,
-                    (unsigned long)local);
-        INIT_WORK(&local->work_work, ieee80211_work_work);
-}
-
-void ieee80211_work_purge(struct ieee80211_sub_if_data *sdata)
-{
-        struct ieee80211_local *local = sdata->local;
-        struct ieee80211_work *wk;
-        bool cleanup = false;
-
-        mutex_lock(&local->mtx);
-        list_for_each_entry(wk, &local->work_list, list) {
-                if (wk->sdata != sdata)
-                        continue;
-                cleanup = true;
-                wk->type = IEEE80211_WORK_ABORT;
-                wk->started = true;
-                wk->timeout = jiffies;
-        }
-        mutex_unlock(&local->mtx);
-
-        /* run cleanups etc. */
-        if (cleanup)
-                ieee80211_work_work(&local->work_work);
-
-        mutex_lock(&local->mtx);
-        list_for_each_entry(wk, &local->work_list, list) {
-                if (wk->sdata != sdata)
-                        continue;
-                WARN_ON(1);
-                break;
-        }
-        mutex_unlock(&local->mtx);
-}
-
-static enum work_done_result ieee80211_remain_done(struct ieee80211_work *wk,
-                                                   struct sk_buff *skb)
-{
-        /*
-         * We are done serving the remain-on-channel command.
-         */
-        cfg80211_remain_on_channel_expired(wk->sdata->dev, (unsigned long) wk,
-                                           wk->chan, wk->chan_type,
-                                           GFP_KERNEL);
-
-        return WORK_DONE_DESTROY;
-}
-
-int ieee80211_wk_remain_on_channel(struct ieee80211_sub_if_data *sdata,
-                                   struct ieee80211_channel *chan,
-                                   enum nl80211_channel_type channel_type,
-                                   unsigned int duration, u64 *cookie)
-{
-        struct ieee80211_work *wk;
-
-        wk = kzalloc(sizeof(*wk), GFP_KERNEL);
-        if (!wk)
-                return -ENOMEM;
-
-        wk->type = IEEE80211_WORK_REMAIN_ON_CHANNEL;
-        wk->chan = chan;
-        wk->chan_type = channel_type;
-        wk->sdata = sdata;
-        wk->done = ieee80211_remain_done;
-
-        wk->remain.duration = duration;
-
-        *cookie = (unsigned long) wk;
-
-        ieee80211_add_work(wk);
-
-        return 0;
-}
-
-int ieee80211_wk_cancel_remain_on_channel(struct ieee80211_sub_if_data *sdata,
-                                          u64 cookie)
-{
-        struct ieee80211_local *local = sdata->local;
-        struct ieee80211_work *wk, *tmp;
-        bool found = false;
-
-        mutex_lock(&local->mtx);
-        list_for_each_entry_safe(wk, tmp, &local->work_list, list) {
-                if ((unsigned long) wk == cookie) {
-                        wk->timeout = jiffies;
-                        found = true;
-                        break;
-                }
-        }
-        mutex_unlock(&local->mtx);
-
-        if (!found)
-                return -ENOENT;
-
-        ieee80211_queue_work(&local->hw, &local->work_work);
-
-        return 0;
-}
diff --git a/net/mac802154/Makefile b/net/mac802154/Makefile
index ec1bd3fc127..57cf5d1a2e4 100644
--- a/net/mac802154/Makefile
+++ b/net/mac802154/Makefile
@@ -1,2 +1,2 @@
 obj-$(CONFIG_MAC802154) += mac802154.o
-mac802154-objs          := ieee802154_dev.o rx.o tx.o mac_cmd.o mib.o monitor.o
+mac802154-objs          := ieee802154_dev.o rx.o tx.o mac_cmd.o mib.o monitor.o wpan.o
diff --git a/net/mac802154/ieee802154_dev.c b/net/mac802154/ieee802154_dev.c
index e3edfb0661b..e748aed290a 100644
--- a/net/mac802154/ieee802154_dev.c
+++ b/net/mac802154/ieee802154_dev.c
@@ -140,6 +140,10 @@ mac802154_add_iface(struct wpan_phy *phy, const char *name, int type)
                 dev = alloc_netdev(sizeof(struct mac802154_sub_if_data),
                                    name, mac802154_monitor_setup);
                 break;
+        case IEEE802154_DEV_WPAN:
+                dev = alloc_netdev(sizeof(struct mac802154_sub_if_data),
+                                   name, mac802154_wpan_setup);
+                break;
         default:
                 dev = NULL;
                 err = -EINVAL;
diff --git a/net/mac802154/mac802154.h b/net/mac802154/mac802154.h
index 789d9c948ae..69678644a5c 100644
--- a/net/mac802154/mac802154.h
+++ b/net/mac802154/mac802154.h
@@ -93,6 +93,7 @@ struct mac802154_sub_if_data {
 #define MAC802154_CHAN_NONE             (~(u8)0) /* No channel is assigned */
 
 extern struct ieee802154_reduced_mlme_ops mac802154_mlme_reduced;
+extern struct ieee802154_mlme_ops mac802154_mlme_wpan;
 
 int mac802154_slave_open(struct net_device *dev);
 int mac802154_slave_close(struct net_device *dev);
@@ -100,10 +101,17 @@ int mac802154_slave_close(struct net_device *dev);
 void mac802154_monitors_rx(struct mac802154_priv *priv, struct sk_buff *skb);
 void mac802154_monitor_setup(struct net_device *dev);
 
+void mac802154_wpans_rx(struct mac802154_priv *priv, struct sk_buff *skb);
+void mac802154_wpan_setup(struct net_device *dev);
+
 netdev_tx_t mac802154_tx(struct mac802154_priv *priv, struct sk_buff *skb,
                          u8 page, u8 chan);
 
 /* MIB callbacks */
+void mac802154_dev_set_short_addr(struct net_device *dev, u16 val);
 void mac802154_dev_set_ieee_addr(struct net_device *dev);
+u16 mac802154_dev_get_pan_id(const struct net_device *dev);
+void mac802154_dev_set_pan_id(struct net_device *dev, u16 val);
+void mac802154_dev_set_page_channel(struct net_device *dev, u8 page, u8 chan);
 
 #endif /* MAC802154_H */
diff --git a/net/mac802154/mac_cmd.c b/net/mac802154/mac_cmd.c
index 7a5d0e052cd..7f5403e5ea9 100644
--- a/net/mac802154/mac_cmd.c
+++ b/net/mac802154/mac_cmd.c
@@ -25,12 +25,36 @@
 #include <linux/skbuff.h>
 #include <linux/if_arp.h>
 
+#include <net/ieee802154.h>
 #include <net/ieee802154_netdev.h>
 #include <net/wpan-phy.h>
 #include <net/mac802154.h>
+#include <net/nl802154.h>
 
 #include "mac802154.h"
 
+static int mac802154_mlme_start_req(struct net_device *dev,
+                                    struct ieee802154_addr *addr,
+                                    u8 channel, u8 page,
+                                    u8 bcn_ord, u8 sf_ord,
+                                    u8 pan_coord, u8 blx,
+                                    u8 coord_realign)
+{
+        BUG_ON(addr->addr_type != IEEE802154_ADDR_SHORT);
+
+        mac802154_dev_set_pan_id(dev, addr->pan_id);
+        mac802154_dev_set_short_addr(dev, addr->short_addr);
+        mac802154_dev_set_ieee_addr(dev);
+        mac802154_dev_set_page_channel(dev, page, channel);
+
+        /* FIXME: add validation for unused parameters to be sane
+         * for SoftMAC
+         */
+        ieee802154_nl_start_confirm(dev, IEEE802154_SUCCESS);
+
+        return 0;
+}
+
 struct wpan_phy *mac802154_get_phy(const struct net_device *dev)
 {
         struct mac802154_sub_if_data *priv = netdev_priv(dev);
@@ -43,3 +67,8 @@ struct wpan_phy *mac802154_get_phy(const struct net_device *dev)
 struct ieee802154_reduced_mlme_ops mac802154_mlme_reduced = {
         .get_phy = mac802154_get_phy,
 };
+
+struct ieee802154_mlme_ops mac802154_mlme_wpan = {
+        .get_phy = mac802154_get_phy,
+        .start_req = mac802154_mlme_start_req,
+};
diff --git a/net/mac802154/mib.c b/net/mac802154/mib.c
index ab59821ec72..380829d8460 100644
--- a/net/mac802154/mib.c
+++ b/net/mac802154/mib.c
@@ -28,6 +28,11 @@
 
 #include "mac802154.h"
 
+struct phy_chan_notify_work {
+        struct work_struct work;
+        struct net_device *dev;
+};
+
 struct hw_addr_filt_notify_work {
         struct work_struct work;
         struct net_device *dev;
@@ -78,6 +83,23 @@ static void set_hw_addr_filt(struct net_device *dev, unsigned long changed)
         return;
 }
 
+void mac802154_dev_set_short_addr(struct net_device *dev, u16 val)
+{
+        struct mac802154_sub_if_data *priv = netdev_priv(dev);
+
+        BUG_ON(dev->type != ARPHRD_IEEE802154);
+
+        spin_lock_bh(&priv->mib_lock);
+        priv->short_addr = val;
+        spin_unlock_bh(&priv->mib_lock);
+
+        if ((priv->hw->ops->set_hw_addr_filt) &&
+            (priv->hw->hw.hw_filt.short_addr != priv->short_addr)) {
+                priv->hw->hw.hw_filt.short_addr = priv->short_addr;
+                set_hw_addr_filt(dev, IEEE802515_AFILT_SADDR_CHANGED);
+        }
+}
+
 void mac802154_dev_set_ieee_addr(struct net_device *dev)
 {
         struct mac802154_sub_if_data *priv = netdev_priv(dev);
@@ -91,3 +113,73 @@ void mac802154_dev_set_ieee_addr(struct net_device *dev)
                 set_hw_addr_filt(dev, IEEE802515_AFILT_IEEEADDR_CHANGED);
         }
 }
+
+u16 mac802154_dev_get_pan_id(const struct net_device *dev)
+{
+        struct mac802154_sub_if_data *priv = netdev_priv(dev);
+        u16 ret;
+
+        BUG_ON(dev->type != ARPHRD_IEEE802154);
+
+        spin_lock_bh(&priv->mib_lock);
+        ret = priv->pan_id;
+        spin_unlock_bh(&priv->mib_lock);
+
+        return ret;
+}
+
+void mac802154_dev_set_pan_id(struct net_device *dev, u16 val)
+{
+        struct mac802154_sub_if_data *priv = netdev_priv(dev);
+
+        BUG_ON(dev->type != ARPHRD_IEEE802154);
+
+        spin_lock_bh(&priv->mib_lock);
+        priv->pan_id = val;
+        spin_unlock_bh(&priv->mib_lock);
+
+        if ((priv->hw->ops->set_hw_addr_filt) &&
+            (priv->hw->hw.hw_filt.pan_id != priv->pan_id)) {
+                priv->hw->hw.hw_filt.pan_id = priv->pan_id;
+                set_hw_addr_filt(dev, IEEE802515_AFILT_PANID_CHANGED);
+        }
+}
+
+static void phy_chan_notify(struct work_struct *work)
+{
+        struct phy_chan_notify_work *nw = container_of(work,
+                                          struct phy_chan_notify_work, work);
+        struct mac802154_priv *hw = mac802154_slave_get_priv(nw->dev);
+        struct mac802154_sub_if_data *priv = netdev_priv(nw->dev);
+        int res;
+
+        res = hw->ops->set_channel(&hw->hw, priv->page, priv->chan);
+        if (res)
+                pr_debug("set_channel failed\n");
+
+        kfree(nw);
+}
+
+void mac802154_dev_set_page_channel(struct net_device *dev, u8 page, u8 chan)
+{
+        struct mac802154_sub_if_data *priv = netdev_priv(dev);
+        struct phy_chan_notify_work *work;
+
+        BUG_ON(dev->type != ARPHRD_IEEE802154);
+
+        spin_lock_bh(&priv->mib_lock);
+        priv->page = page;
+        priv->chan = chan;
+        spin_unlock_bh(&priv->mib_lock);
+
+        if (priv->hw->phy->current_channel != priv->chan ||
+            priv->hw->phy->current_page != priv->page) {
+                work = kzalloc(sizeof(*work), GFP_ATOMIC);
+                if (!work)
+                        return;
+
+                INIT_WORK(&work->work, phy_chan_notify);
+                work->dev = dev;
+                queue_work(priv->hw->dev_workqueue, &work->work);
+        }
+}
diff --git a/net/mac802154/rx.c b/net/mac802154/rx.c
index 4a7d76d4f8b..38548ec2098 100644
--- a/net/mac802154/rx.c
+++ b/net/mac802154/rx.c
@@ -77,6 +77,7 @@ mac802154_subif_rx(struct ieee802154_dev *hw, struct sk_buff *skb, u8 lqi)
         }
 
         mac802154_monitors_rx(priv, skb);
+        mac802154_wpans_rx(priv, skb);
 out:
         dev_kfree_skb(skb);
         return;
diff --git a/net/mac802154/tx.c b/net/mac802154/tx.c
index 434b6873b35..1a4df39c722 100644
--- a/net/mac802154/tx.c
+++ b/net/mac802154/tx.c
@@ -88,6 +88,8 @@ netdev_tx_t mac802154_tx(struct mac802154_priv *priv, struct sk_buff *skb,
                 return NETDEV_TX_OK;
         }
 
+        mac802154_monitors_rx(mac802154_to_priv(&priv->hw), skb);
+
         if (!(priv->hw.flags & IEEE802154_HW_OMIT_CKSUM)) {
                 u16 crc = crc_ccitt(0, skb->data, skb->len);
                 u8 *data = skb_put(skb, 2);
diff --git a/net/mac802154/wpan.c b/net/mac802154/wpan.c
new file mode 100644
index 00000000000..f30f6d4beea
--- /dev/null
+++ b/net/mac802154/wpan.c
@@ -0,0 +1,559 @@
+/*
+ * Copyright 2007-2012 Siemens AG
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Written by:
+ * Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
+ * Sergey Lapin <slapin@ossfans.org>
+ * Maxim Gorbachyov <maxim.gorbachev@siemens.com>
+ * Alexander Smirnov <alex.bluesman.smirnov@gmail.com>
+ */
+
+#include <linux/netdevice.h>
+#include <linux/module.h>
+#include <linux/if_arp.h>
+
+#include <net/rtnetlink.h>
+#include <linux/nl802154.h>
+#include <net/af_ieee802154.h>
+#include <net/mac802154.h>
+#include <net/ieee802154_netdev.h>
+#include <net/ieee802154.h>
+#include <net/wpan-phy.h>
+
+#include "mac802154.h"
+
+static inline int mac802154_fetch_skb_u8(struct sk_buff *skb, u8 *val)
+{
+        if (unlikely(!pskb_may_pull(skb, 1)))
+                return -EINVAL;
+
+        *val = skb->data[0];
+         skb_pull(skb, 1);
+
+        return 0;
+}
+
+static inline int mac802154_fetch_skb_u16(struct sk_buff *skb, u16 *val)
+{
+        if (unlikely(!pskb_may_pull(skb, 2)))
+                return -EINVAL;
+
+        *val = skb->data[0] | (skb->data[1] << 8);
+        skb_pull(skb, 2);
+
+        return 0;
+}
+
+static inline void mac802154_haddr_copy_swap(u8 *dest, const u8 *src)
+{
+        int i;
+        for (i = 0; i < IEEE802154_ADDR_LEN; i++)
+                dest[IEEE802154_ADDR_LEN - i - 1] = src[i];
+}
+
+static int
+mac802154_wpan_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
+{
+        struct mac802154_sub_if_data *priv = netdev_priv(dev);
+        struct sockaddr_ieee802154 *sa =
+                (struct sockaddr_ieee802154 *)&ifr->ifr_addr;
+        int err = -ENOIOCTLCMD;
+
+        spin_lock_bh(&priv->mib_lock);
+
+        switch (cmd) {
+        case SIOCGIFADDR:
+                if (priv->pan_id == IEEE802154_PANID_BROADCAST ||
+                    priv->short_addr == IEEE802154_ADDR_BROADCAST) {
+                        err = -EADDRNOTAVAIL;
+                        break;
+                }
+
+                sa->family = AF_IEEE802154;
+                sa->addr.addr_type = IEEE802154_ADDR_SHORT;
+                sa->addr.pan_id = priv->pan_id;
+                sa->addr.short_addr = priv->short_addr;
+
+                err = 0;
+                break;
+        case SIOCSIFADDR:
+                dev_warn(&dev->dev,
+                         "Using DEBUGing ioctl SIOCSIFADDR isn't recommened!\n");
+                if (sa->family != AF_IEEE802154 ||
+                    sa->addr.addr_type != IEEE802154_ADDR_SHORT ||
+                    sa->addr.pan_id == IEEE802154_PANID_BROADCAST ||
+                    sa->addr.short_addr == IEEE802154_ADDR_BROADCAST ||
+                    sa->addr.short_addr == IEEE802154_ADDR_UNDEF) {
+                        err = -EINVAL;
+                        break;
+                }
+
+                priv->pan_id = sa->addr.pan_id;
+                priv->short_addr = sa->addr.short_addr;
+
+                err = 0;
+                break;
+        }
+
+        spin_unlock_bh(&priv->mib_lock);
+        return err;
+}
+
+static int mac802154_wpan_mac_addr(struct net_device *dev, void *p)
+{
+        struct sockaddr *addr = p;
+
+        if (netif_running(dev))
+                return -EBUSY;
+
+        /* FIXME: validate addr */
+        memcpy(dev->dev_addr, addr->sa_data, dev->addr_len);
+        mac802154_dev_set_ieee_addr(dev);
+        return 0;
+}
+
+static int mac802154_header_create(struct sk_buff *skb,
+                                   struct net_device *dev,
+                                   unsigned short type,
+                                   const void *_daddr,
+                                   const void *_saddr,
+                                   unsigned len)
+{
+        const struct ieee802154_addr *saddr = _saddr;
+        const struct ieee802154_addr *daddr = _daddr;
+        struct ieee802154_addr dev_addr;
+        struct mac802154_sub_if_data *priv = netdev_priv(dev);
+        int pos = 2;
+        u8 *head;
+        u16 fc;
+
+        if (!daddr)
+                return -EINVAL;
+
+        head = kzalloc(MAC802154_FRAME_HARD_HEADER_LEN, GFP_KERNEL);
+        if (head == NULL)
+                return -ENOMEM;
+
+        head[pos++] = mac_cb(skb)->seq; /* DSN/BSN */
+        fc = mac_cb_type(skb);
+
+        if (!saddr) {
+                spin_lock_bh(&priv->mib_lock);
+
+                if (priv->short_addr == IEEE802154_ADDR_BROADCAST ||
+                    priv->short_addr == IEEE802154_ADDR_UNDEF ||
+                    priv->pan_id == IEEE802154_PANID_BROADCAST) {
+                        dev_addr.addr_type = IEEE802154_ADDR_LONG;
+                        memcpy(dev_addr.hwaddr, dev->dev_addr,
+                               IEEE802154_ADDR_LEN);
+                } else {
+                        dev_addr.addr_type = IEEE802154_ADDR_SHORT;
+                        dev_addr.short_addr = priv->short_addr;
+                }
+
+                dev_addr.pan_id = priv->pan_id;
+                saddr = &dev_addr;
+
+                spin_unlock_bh(&priv->mib_lock);
+        }
+
+        if (daddr->addr_type != IEEE802154_ADDR_NONE) {
+                fc |= (daddr->addr_type << IEEE802154_FC_DAMODE_SHIFT);
+
+                head[pos++] = daddr->pan_id & 0xff;
+                head[pos++] = daddr->pan_id >> 8;
+
+                if (daddr->addr_type == IEEE802154_ADDR_SHORT) {
+                        head[pos++] = daddr->short_addr & 0xff;
+                        head[pos++] = daddr->short_addr >> 8;
+                } else {
+                        mac802154_haddr_copy_swap(head + pos, daddr->hwaddr);
+                        pos += IEEE802154_ADDR_LEN;
+                }
+        }
+
+        if (saddr->addr_type != IEEE802154_ADDR_NONE) {
+                fc |= (saddr->addr_type << IEEE802154_FC_SAMODE_SHIFT);
+
+                if ((saddr->pan_id == daddr->pan_id) &&
+                    (saddr->pan_id != IEEE802154_PANID_BROADCAST)) {
+                        /* PANID compression/intra PAN */
+                        fc |= IEEE802154_FC_INTRA_PAN;
+                } else {
+                        head[pos++] = saddr->pan_id & 0xff;
+                        head[pos++] = saddr->pan_id >> 8;
+                }
+
+                if (saddr->addr_type == IEEE802154_ADDR_SHORT) {
+                        head[pos++] = saddr->short_addr & 0xff;
+                        head[pos++] = saddr->short_addr >> 8;
+                } else {
+                        mac802154_haddr_copy_swap(head + pos, saddr->hwaddr);
+                        pos += IEEE802154_ADDR_LEN;
+                }
+        }
+
+        head[0] = fc;
+        head[1] = fc >> 8;
+
+        memcpy(skb_push(skb, pos), head, pos);
+        kfree(head);
+
+        return pos;
+}
+
+static int
+mac802154_header_parse(const struct sk_buff *skb, unsigned char *haddr)
+{
+        const u8 *hdr = skb_mac_header(skb);
+        const u8 *tail = skb_tail_pointer(skb);
+        struct ieee802154_addr *addr = (struct ieee802154_addr *)haddr;
+        u16 fc;
+        int da_type;
+
+        if (hdr + 3 > tail)
+                goto malformed;
+
+        fc = hdr[0] | (hdr[1] << 8);
+
+        hdr += 3;
+
+        da_type = IEEE802154_FC_DAMODE(fc);
+        addr->addr_type = IEEE802154_FC_SAMODE(fc);
+
+        switch (da_type) {
+        case IEEE802154_ADDR_NONE:
+                if (fc & IEEE802154_FC_INTRA_PAN)
+                        goto malformed;
+                break;
+        case IEEE802154_ADDR_LONG:
+                if (fc & IEEE802154_FC_INTRA_PAN) {
+                        if (hdr + 2 > tail)
+                                goto malformed;
+                        addr->pan_id = hdr[0] | (hdr[1] << 8);
+                        hdr += 2;
+                }
+
+                if (hdr + IEEE802154_ADDR_LEN > tail)
+                        goto malformed;
+
+                hdr += IEEE802154_ADDR_LEN;
+                break;
+        case IEEE802154_ADDR_SHORT:
+                if (fc & IEEE802154_FC_INTRA_PAN) {
+                        if (hdr + 2 > tail)
+                                goto malformed;
+                        addr->pan_id = hdr[0] | (hdr[1] << 8);
+                        hdr += 2;
+                }
+
+                if (hdr + 2 > tail)
+                        goto malformed;
+
+                hdr += 2;
+                break;
+        default:
+                goto malformed;
+
+        }
+
+        switch (addr->addr_type) {
+        case IEEE802154_ADDR_NONE:
+                break;
+        case IEEE802154_ADDR_LONG:
+                if (!(fc & IEEE802154_FC_INTRA_PAN)) {
+                        if (hdr + 2 > tail)
+                                goto malformed;
+                        addr->pan_id = hdr[0] | (hdr[1] << 8);
+                        hdr += 2;
+                }
+
+                if (hdr + IEEE802154_ADDR_LEN > tail)
+                        goto malformed;
+
+                mac802154_haddr_copy_swap(addr->hwaddr, hdr);
+                hdr += IEEE802154_ADDR_LEN;
+                break;
+        case IEEE802154_ADDR_SHORT:
+                if (!(fc & IEEE802154_FC_INTRA_PAN)) {
+                        if (hdr + 2 > tail)
+                                goto malformed;
+                        addr->pan_id = hdr[0] | (hdr[1] << 8);
+                        hdr += 2;
+                }
+
+                if (hdr + 2 > tail)
+                        goto malformed;
+
+                addr->short_addr = hdr[0] | (hdr[1] << 8);
+                hdr += 2;
+                break;
+        default:
+                goto malformed;
+        }
+
+        return sizeof(struct ieee802154_addr);
+
+malformed:
+        pr_debug("malformed packet\n");
+        return 0;
+}
+
+static netdev_tx_t
+mac802154_wpan_xmit(struct sk_buff *skb, struct net_device *dev)
+{
+        struct mac802154_sub_if_data *priv;
+        u8 chan, page;
+
+        priv = netdev_priv(dev);
+
+        spin_lock_bh(&priv->mib_lock);
+        chan = priv->chan;
+        page = priv->page;
+        spin_unlock_bh(&priv->mib_lock);
+
+        if (chan == MAC802154_CHAN_NONE ||
+            page >= WPAN_NUM_PAGES ||
+            chan >= WPAN_NUM_CHANNELS)
+                return NETDEV_TX_OK;
+
+        skb->skb_iif = dev->ifindex;
+        dev->stats.tx_packets++;
+        dev->stats.tx_bytes += skb->len;
+
+        return mac802154_tx(priv->hw, skb, page, chan);
+}
+
+static struct header_ops mac802154_header_ops = {
+        .create         = mac802154_header_create,
+        .parse          = mac802154_header_parse,
+};
+
+static const struct net_device_ops mac802154_wpan_ops = {
+        .ndo_open               = mac802154_slave_open,
+        .ndo_stop               = mac802154_slave_close,
+        .ndo_start_xmit         = mac802154_wpan_xmit,
+        .ndo_do_ioctl           = mac802154_wpan_ioctl,
+        .ndo_set_mac_address    = mac802154_wpan_mac_addr,
+};
+
+void mac802154_wpan_setup(struct net_device *dev)
+{
+        struct mac802154_sub_if_data *priv;
+
+        dev->addr_len           = IEEE802154_ADDR_LEN;
+        memset(dev->broadcast, 0xff, IEEE802154_ADDR_LEN);
+
+        dev->hard_header_len    = MAC802154_FRAME_HARD_HEADER_LEN;
+        dev->header_ops         = &mac802154_header_ops;
+        dev->needed_tailroom    = 2; /* FCS */
+        dev->mtu                = IEEE802154_MTU;
+        dev->tx_queue_len       = 10;
+        dev->type               = ARPHRD_IEEE802154;
+        dev->flags              = IFF_NOARP | IFF_BROADCAST;
+        dev->watchdog_timeo     = 0;
+
+        dev->destructor         = free_netdev;
+        dev->netdev_ops         = &mac802154_wpan_ops;
+        dev->ml_priv            = &mac802154_mlme_wpan;
+
+        priv = netdev_priv(dev);
+        priv->type = IEEE802154_DEV_WPAN;
+
+        priv->chan = MAC802154_CHAN_NONE;
+        priv->page = 0;
+
+        spin_lock_init(&priv->mib_lock);
+
+        get_random_bytes(&priv->bsn, 1);
+        get_random_bytes(&priv->dsn, 1);
+
+        priv->pan_id = IEEE802154_PANID_BROADCAST;
+        priv->short_addr = IEEE802154_ADDR_BROADCAST;
+}
+
+static int mac802154_process_data(struct net_device *dev, struct sk_buff *skb)
+{
+        return netif_rx(skb);
+}
+
+static int
+mac802154_subif_frame(struct mac802154_sub_if_data *sdata, struct sk_buff *skb)
+{
+        pr_debug("getting packet via slave interface %s\n", sdata->dev->name);
+
+        spin_lock_bh(&sdata->mib_lock);
+
+        switch (mac_cb(skb)->da.addr_type) {
+        case IEEE802154_ADDR_NONE:
+                if (mac_cb(skb)->sa.addr_type != IEEE802154_ADDR_NONE)
+                        /* FIXME: check if we are PAN coordinator */
+                        skb->pkt_type = PACKET_OTHERHOST;
+                else
+                        /* ACK comes with both addresses empty */
+                        skb->pkt_type = PACKET_HOST;
+                break;
+        case IEEE802154_ADDR_LONG:
+                if (mac_cb(skb)->da.pan_id != sdata->pan_id &&
+                    mac_cb(skb)->da.pan_id != IEEE802154_PANID_BROADCAST)
+                        skb->pkt_type = PACKET_OTHERHOST;
+                else if (!memcmp(mac_cb(skb)->da.hwaddr, sdata->dev->dev_addr,
+                                 IEEE802154_ADDR_LEN))
+                        skb->pkt_type = PACKET_HOST;
+                else
+                        skb->pkt_type = PACKET_OTHERHOST;
+                break;
+        case IEEE802154_ADDR_SHORT:
+                if (mac_cb(skb)->da.pan_id != sdata->pan_id &&
+                    mac_cb(skb)->da.pan_id != IEEE802154_PANID_BROADCAST)
+                        skb->pkt_type = PACKET_OTHERHOST;
+                else if (mac_cb(skb)->da.short_addr == sdata->short_addr)
+                        skb->pkt_type = PACKET_HOST;
+                else if (mac_cb(skb)->da.short_addr ==
+                                        IEEE802154_ADDR_BROADCAST)
+                        skb->pkt_type = PACKET_BROADCAST;
+                else
+                        skb->pkt_type = PACKET_OTHERHOST;
+                break;
+        default:
+                break;
+        }
+
+        spin_unlock_bh(&sdata->mib_lock);
+
+        skb->dev = sdata->dev;
+
+        sdata->dev->stats.rx_packets++;
+        sdata->dev->stats.rx_bytes += skb->len;
+
+        switch (mac_cb_type(skb)) {
+        case IEEE802154_FC_TYPE_DATA:
+                return mac802154_process_data(sdata->dev, skb);
+        default:
+                pr_warning("ieee802154: bad frame received (type = %d)\n",
+                           mac_cb_type(skb));
+                kfree_skb(skb);
+                return NET_RX_DROP;
+        }
+}
+
+static int mac802154_parse_frame_start(struct sk_buff *skb)
+{
+        u8 *head = skb->data;
+        u16 fc;
+
+        if (mac802154_fetch_skb_u16(skb, &fc) ||
+            mac802154_fetch_skb_u8(skb, &(mac_cb(skb)->seq)))
+                goto err;
+
+        pr_debug("fc: %04x dsn: %02x\n", fc, head[2]);
+
+        mac_cb(skb)->flags = IEEE802154_FC_TYPE(fc);
+        mac_cb(skb)->sa.addr_type = IEEE802154_FC_SAMODE(fc);
+        mac_cb(skb)->da.addr_type = IEEE802154_FC_DAMODE(fc);
+
+        if (fc & IEEE802154_FC_INTRA_PAN)
+                mac_cb(skb)->flags |= MAC_CB_FLAG_INTRAPAN;
+
+        if (mac_cb(skb)->da.addr_type != IEEE802154_ADDR_NONE) {
+                if (mac802154_fetch_skb_u16(skb, &(mac_cb(skb)->da.pan_id)))
+                        goto err;
+
+                /* source PAN id compression */
+                if (mac_cb_is_intrapan(skb))
+                        mac_cb(skb)->sa.pan_id = mac_cb(skb)->da.pan_id;
+
+                pr_debug("dest PAN addr: %04x\n", mac_cb(skb)->da.pan_id);
+
+                if (mac_cb(skb)->da.addr_type == IEEE802154_ADDR_SHORT) {
+                        u16 *da = &(mac_cb(skb)->da.short_addr);
+
+                        if (mac802154_fetch_skb_u16(skb, da))
+                                goto err;
+
+                        pr_debug("destination address is short: %04x\n",
+                                 mac_cb(skb)->da.short_addr);
+                } else {
+                        if (!pskb_may_pull(skb, IEEE802154_ADDR_LEN))
+                                goto err;
+
+                        mac802154_haddr_copy_swap(mac_cb(skb)->da.hwaddr,
+                                                  skb->data);
+                        skb_pull(skb, IEEE802154_ADDR_LEN);
+
+                        pr_debug("destination address is hardware\n");
+                }
+        }
+
+        if (mac_cb(skb)->sa.addr_type != IEEE802154_ADDR_NONE) {
+                /* non PAN-compression, fetch source address id */
+                if (!(mac_cb_is_intrapan(skb))) {
+                        u16 *sa_pan = &(mac_cb(skb)->sa.pan_id);
+
+                        if (mac802154_fetch_skb_u16(skb, sa_pan))
+                                goto err;
+                }
+
+                pr_debug("source PAN addr: %04x\n", mac_cb(skb)->da.pan_id);
+
+                if (mac_cb(skb)->sa.addr_type == IEEE802154_ADDR_SHORT) {
+                        u16 *sa = &(mac_cb(skb)->sa.short_addr);
+
+                        if (mac802154_fetch_skb_u16(skb, sa))
+                                goto err;
+
+                        pr_debug("source address is short: %04x\n",
+                                 mac_cb(skb)->sa.short_addr);
+                } else {
+                        if (!pskb_may_pull(skb, IEEE802154_ADDR_LEN))
+                                goto err;
+
+                        mac802154_haddr_copy_swap(mac_cb(skb)->sa.hwaddr,
+                                                  skb->data);
+                        skb_pull(skb, IEEE802154_ADDR_LEN);
+
+                        pr_debug("source address is hardware\n");
+                }
+        }
+
+        return 0;
+err:
+        return -EINVAL;
+}
+
+void mac802154_wpans_rx(struct mac802154_priv *priv, struct sk_buff *skb)
+{
+        int ret;
+        struct sk_buff *sskb;
+        struct mac802154_sub_if_data *sdata;
+
+        ret = mac802154_parse_frame_start(skb);
+        if (ret) {
+                pr_debug("got invalid frame\n");
+                return;
+        }
+
+        rcu_read_lock();
+        list_for_each_entry_rcu(sdata, &priv->slaves, list) {
+                if (sdata->type != IEEE802154_DEV_WPAN)
+                        continue;
+
+                sskb = skb_clone(skb, GFP_ATOMIC);
+                if (sskb)
+                        mac802154_subif_frame(sdata, sskb);
+        }
+        rcu_read_unlock();
+}
diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig
index 209c1ed4336..c19b214ffd5 100644
--- a/net/netfilter/Kconfig
+++ b/net/netfilter/Kconfig
@@ -335,6 +335,27 @@ config NF_CT_NETLINK_TIMEOUT
 
           If unsure, say `N'.
 
+config NF_CT_NETLINK_HELPER
+        tristate 'Connection tracking helpers in user-space via Netlink'
+        select NETFILTER_NETLINK
+        depends on NF_CT_NETLINK
+        depends on NETFILTER_NETLINK_QUEUE
+        depends on NETFILTER_NETLINK_QUEUE_CT
+        depends on NETFILTER_ADVANCED
+        help
+          This option enables the user-space connection tracking helpers
+          infrastructure.
+
+          If unsure, say `N'.
+
+config NETFILTER_NETLINK_QUEUE_CT
+        bool "NFQUEUE integration with Connection Tracking"
+        default n
+        depends on NETFILTER_NETLINK_QUEUE
+        help
+          If this option is enabled, NFQUEUE can include Connection Tracking
+          information together with the packet is the enqueued via NFNETLINK.
+
 endif # NF_CONNTRACK
 
 # transparent proxy support
diff --git a/net/netfilter/Makefile b/net/netfilter/Makefile
index 4e7960cc7b9..1c5160f2278 100644
--- a/net/netfilter/Makefile
+++ b/net/netfilter/Makefile
@@ -9,6 +9,8 @@ obj-$(CONFIG_NETFILTER) = netfilter.o
 
 obj-$(CONFIG_NETFILTER_NETLINK) += nfnetlink.o
 obj-$(CONFIG_NETFILTER_NETLINK_ACCT) += nfnetlink_acct.o
+nfnetlink_queue-y := nfnetlink_queue_core.o
+nfnetlink_queue-$(CONFIG_NETFILTER_NETLINK_QUEUE_CT) += nfnetlink_queue_ct.o
 obj-$(CONFIG_NETFILTER_NETLINK_QUEUE) += nfnetlink_queue.o
 obj-$(CONFIG_NETFILTER_NETLINK_LOG) += nfnetlink_log.o
 
@@ -24,6 +26,7 @@ obj-$(CONFIG_NF_CT_PROTO_UDPLITE) += nf_conntrack_proto_udplite.o
 # netlink interface for nf_conntrack
 obj-$(CONFIG_NF_CT_NETLINK) += nf_conntrack_netlink.o
 obj-$(CONFIG_NF_CT_NETLINK_TIMEOUT) += nfnetlink_cttimeout.o
+obj-$(CONFIG_NF_CT_NETLINK_HELPER) += nfnetlink_cthelper.o
 
 # connection tracking helpers
 nf_conntrack_h323-objs := nf_conntrack_h323_main.o nf_conntrack_h323_asn1.o
diff --git a/net/netfilter/core.c b/net/netfilter/core.c
index e19f3653db2..0bc6b60db4d 100644
--- a/net/netfilter/core.c
+++ b/net/netfilter/core.c
@@ -264,6 +264,13 @@ void nf_conntrack_destroy(struct nf_conntrack *nfct)
         rcu_read_unlock();
 }
 EXPORT_SYMBOL(nf_conntrack_destroy);
+
+struct nfq_ct_hook __rcu *nfq_ct_hook __read_mostly;
+EXPORT_SYMBOL_GPL(nfq_ct_hook);
+
+struct nfq_ct_nat_hook __rcu *nfq_ct_nat_hook __read_mostly;
+EXPORT_SYMBOL_GPL(nfq_ct_nat_hook);
+
 #endif /* CONFIG_NF_CONNTRACK */
 
 #ifdef CONFIG_PROC_FS
diff --git a/net/netfilter/ipvs/ip_vs_core.c b/net/netfilter/ipvs/ip_vs_core.c
index a54b018c6ee..b54eccef40b 100644
--- a/net/netfilter/ipvs/ip_vs_core.c
+++ b/net/netfilter/ipvs/ip_vs_core.c
@@ -1742,7 +1742,7 @@ static struct nf_hook_ops ip_vs_ops[] __read_mostly = {
         {
                 .hook           = ip_vs_reply4,
                 .owner          = THIS_MODULE,
-                .pf             = PF_INET,
+                .pf             = NFPROTO_IPV4,
                 .hooknum        = NF_INET_LOCAL_IN,
                 .priority       = NF_IP_PRI_NAT_SRC - 2,
         },
@@ -1752,7 +1752,7 @@ static struct nf_hook_ops ip_vs_ops[] __read_mostly = {
         {
                 .hook           = ip_vs_remote_request4,
                 .owner          = THIS_MODULE,
-                .pf             = PF_INET,
+                .pf             = NFPROTO_IPV4,
                 .hooknum        = NF_INET_LOCAL_IN,
                 .priority       = NF_IP_PRI_NAT_SRC - 1,
         },
@@ -1760,7 +1760,7 @@ static struct nf_hook_ops ip_vs_ops[] __read_mostly = {
         {
                 .hook           = ip_vs_local_reply4,
                 .owner          = THIS_MODULE,
-                .pf             = PF_INET,
+                .pf             = NFPROTO_IPV4,
                 .hooknum        = NF_INET_LOCAL_OUT,
                 .priority       = NF_IP_PRI_NAT_DST + 1,
         },
@@ -1768,7 +1768,7 @@ static struct nf_hook_ops ip_vs_ops[] __read_mostly = {
         {
                 .hook           = ip_vs_local_request4,
                 .owner          = THIS_MODULE,
-                .pf             = PF_INET,
+                .pf             = NFPROTO_IPV4,
                 .hooknum        = NF_INET_LOCAL_OUT,
                 .priority       = NF_IP_PRI_NAT_DST + 2,
         },
@@ -1777,7 +1777,7 @@ static struct nf_hook_ops ip_vs_ops[] __read_mostly = {
         {
                 .hook           = ip_vs_forward_icmp,
                 .owner          = THIS_MODULE,
-                .pf             = PF_INET,
+                .pf             = NFPROTO_IPV4,
                 .hooknum        = NF_INET_FORWARD,
                 .priority       = 99,
         },
@@ -1785,7 +1785,7 @@ static struct nf_hook_ops ip_vs_ops[] __read_mostly = {
         {
                 .hook           = ip_vs_reply4,
                 .owner          = THIS_MODULE,
-                .pf             = PF_INET,
+                .pf             = NFPROTO_IPV4,
                 .hooknum        = NF_INET_FORWARD,
                 .priority       = 100,
         },
@@ -1794,7 +1794,7 @@ static struct nf_hook_ops ip_vs_ops[] __read_mostly = {
         {
                 .hook           = ip_vs_reply6,
                 .owner          = THIS_MODULE,
-                .pf             = PF_INET6,
+                .pf             = NFPROTO_IPV6,
                 .hooknum        = NF_INET_LOCAL_IN,
                 .priority       = NF_IP6_PRI_NAT_SRC - 2,
         },
@@ -1804,7 +1804,7 @@ static struct nf_hook_ops ip_vs_ops[] __read_mostly = {
         {
                 .hook           = ip_vs_remote_request6,
                 .owner          = THIS_MODULE,
-                .pf             = PF_INET6,
+                .pf             = NFPROTO_IPV6,
                 .hooknum        = NF_INET_LOCAL_IN,
                 .priority       = NF_IP6_PRI_NAT_SRC - 1,
         },
@@ -1812,7 +1812,7 @@ static struct nf_hook_ops ip_vs_ops[] __read_mostly = {
         {
                 .hook           = ip_vs_local_reply6,
                 .owner          = THIS_MODULE,
-                .pf             = PF_INET,
+                .pf             = NFPROTO_IPV4,
                 .hooknum        = NF_INET_LOCAL_OUT,
                 .priority       = NF_IP6_PRI_NAT_DST + 1,
         },
@@ -1820,7 +1820,7 @@ static struct nf_hook_ops ip_vs_ops[] __read_mostly = {
         {
                 .hook           = ip_vs_local_request6,
                 .owner          = THIS_MODULE,
-                .pf             = PF_INET6,
+                .pf             = NFPROTO_IPV6,
                 .hooknum        = NF_INET_LOCAL_OUT,
                 .priority       = NF_IP6_PRI_NAT_DST + 2,
         },
@@ -1829,7 +1829,7 @@ static struct nf_hook_ops ip_vs_ops[] __read_mostly = {
         {
                 .hook           = ip_vs_forward_icmp_v6,
                 .owner          = THIS_MODULE,
-                .pf             = PF_INET6,
+                .pf             = NFPROTO_IPV6,
                 .hooknum        = NF_INET_FORWARD,
                 .priority       = 99,
         },
@@ -1837,7 +1837,7 @@ static struct nf_hook_ops ip_vs_ops[] __read_mostly = {
         {
                 .hook           = ip_vs_reply6,
                 .owner          = THIS_MODULE,
-                .pf             = PF_INET6,
+                .pf             = NFPROTO_IPV6,
                 .hooknum        = NF_INET_FORWARD,
                 .priority       = 100,
         },
diff --git a/net/netfilter/ipvs/ip_vs_xmit.c b/net/netfilter/ipvs/ip_vs_xmit.c
index 7fd66dec859..71d6ecb6592 100644
--- a/net/netfilter/ipvs/ip_vs_xmit.c
+++ b/net/netfilter/ipvs/ip_vs_xmit.c
@@ -823,7 +823,7 @@ ip_vs_tunnel_xmit(struct sk_buff *skb, struct ip_vs_conn *cp,
                         IP_VS_ERR_RL("%s(): no memory\n", __func__);
                         return NF_STOLEN;
                 }
-                kfree_skb(skb);
+                consume_skb(skb);
                 skb = new_skb;
                 old_iph = ip_hdr(skb);
         }
@@ -942,7 +942,7 @@ ip_vs_tunnel_xmit_v6(struct sk_buff *skb, struct ip_vs_conn *cp,
                         IP_VS_ERR_RL("%s(): no memory\n", __func__);
                         return NF_STOLEN;
                 }
-                kfree_skb(skb);
+                consume_skb(skb);
                 skb = new_skb;
                 old_iph = ipv6_hdr(skb);
         }
diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c
index ac3af97cc46..cf4875565d6 100644
--- a/net/netfilter/nf_conntrack_core.c
+++ b/net/netfilter/nf_conntrack_core.c
@@ -531,7 +531,7 @@ __nf_conntrack_confirm(struct sk_buff *skb)
         tstamp = nf_conn_tstamp_find(ct);
         if (tstamp) {
                 if (skb->tstamp.tv64 == 0)
-                        __net_timestamp((struct sk_buff *)skb);
+                        __net_timestamp(skb);
 
                 tstamp->start = ktime_to_ns(skb->tstamp);
         }
@@ -819,7 +819,8 @@ init_conntrack(struct net *net, struct nf_conn *tmpl,
                 __set_bit(IPS_EXPECTED_BIT, &ct->status);
                 ct->master = exp->master;
                 if (exp->helper) {
-                        help = nf_ct_helper_ext_add(ct, GFP_ATOMIC);
+                        help = nf_ct_helper_ext_add(ct, exp->helper,
+                                                    GFP_ATOMIC);
                         if (help)
                                 rcu_assign_pointer(help->helper, exp->helper);
                 }
@@ -1333,7 +1334,6 @@ static void nf_conntrack_cleanup_init_net(void)
         while (untrack_refs() > 0)
                 schedule();
 
-        nf_conntrack_proto_fini();
 #ifdef CONFIG_NF_CONNTRACK_ZONES
         nf_ct_extend_unregister(&nf_ct_zone_extend);
 #endif
@@ -1372,7 +1372,7 @@ void nf_conntrack_cleanup(struct net *net)
            netfilter framework.  Roll on, two-stage module
            delete... */
         synchronize_net();
-
+        nf_conntrack_proto_fini(net);
         nf_conntrack_cleanup_net(net);
 
         if (net_eq(net, &init_net)) {
@@ -1496,11 +1496,6 @@ static int nf_conntrack_init_init_net(void)
         printk(KERN_INFO "nf_conntrack version %s (%u buckets, %d max)\n",
                NF_CONNTRACK_VERSION, nf_conntrack_htable_size,
                nf_conntrack_max);
-
-        ret = nf_conntrack_proto_init();
-        if (ret < 0)
-                goto err_proto;
-
 #ifdef CONFIG_NF_CONNTRACK_ZONES
         ret = nf_ct_extend_register(&nf_ct_zone_extend);
         if (ret < 0)
@@ -1518,9 +1513,7 @@ static int nf_conntrack_init_init_net(void)
 
 #ifdef CONFIG_NF_CONNTRACK_ZONES
 err_extend:
-        nf_conntrack_proto_fini();
 #endif
-err_proto:
         return ret;
 }
 
@@ -1583,9 +1576,7 @@ static int nf_conntrack_init_net(struct net *net)
         ret = nf_conntrack_helper_init(net);
         if (ret < 0)
                 goto err_helper;
-
         return 0;
-
 err_helper:
         nf_conntrack_timeout_fini(net);
 err_timeout:
@@ -1622,6 +1613,9 @@ int nf_conntrack_init(struct net *net)
                 if (ret < 0)
                         goto out_init_net;
         }
+        ret = nf_conntrack_proto_init(net);
+        if (ret < 0)
+                goto out_proto;
         ret = nf_conntrack_init_net(net);
         if (ret < 0)
                 goto out_net;
@@ -1637,6 +1631,8 @@ int nf_conntrack_init(struct net *net)
         return 0;
 
 out_net:
+        nf_conntrack_proto_fini(net);
+out_proto:
         if (net_eq(net, &init_net))
                 nf_conntrack_cleanup_init_net();
 out_init_net:
diff --git a/net/netfilter/nf_conntrack_extend.c b/net/netfilter/nf_conntrack_extend.c
index 641ff5f9671..1a9545965c0 100644
--- a/net/netfilter/nf_conntrack_extend.c
+++ b/net/netfilter/nf_conntrack_extend.c
@@ -44,7 +44,8 @@ void __nf_ct_ext_destroy(struct nf_conn *ct)
 EXPORT_SYMBOL(__nf_ct_ext_destroy);
 
 static void *
-nf_ct_ext_create(struct nf_ct_ext **ext, enum nf_ct_ext_id id, gfp_t gfp)
+nf_ct_ext_create(struct nf_ct_ext **ext, enum nf_ct_ext_id id,
+                 size_t var_alloc_len, gfp_t gfp)
 {
         unsigned int off, len;
         struct nf_ct_ext_type *t;
@@ -54,8 +55,8 @@ nf_ct_ext_create(struct nf_ct_ext **ext, enum nf_ct_ext_id id, gfp_t gfp)
         t = rcu_dereference(nf_ct_ext_types[id]);
         BUG_ON(t == NULL);
         off = ALIGN(sizeof(struct nf_ct_ext), t->align);
-        len = off + t->len;
-        alloc_size = t->alloc_size;
+        len = off + t->len + var_alloc_len;
+        alloc_size = t->alloc_size + var_alloc_len;
         rcu_read_unlock();
 
         *ext = kzalloc(alloc_size, gfp);
@@ -68,7 +69,8 @@ nf_ct_ext_create(struct nf_ct_ext **ext, enum nf_ct_ext_id id, gfp_t gfp)
         return (void *)(*ext) + off;
 }
 
-void *__nf_ct_ext_add(struct nf_conn *ct, enum nf_ct_ext_id id, gfp_t gfp)
+void *__nf_ct_ext_add_length(struct nf_conn *ct, enum nf_ct_ext_id id,
+                             size_t var_alloc_len, gfp_t gfp)
 {
         struct nf_ct_ext *old, *new;
         int i, newlen, newoff;
@@ -79,7 +81,7 @@ void *__nf_ct_ext_add(struct nf_conn *ct, enum nf_ct_ext_id id, gfp_t gfp)
 
         old = ct->ext;
         if (!old)
-                return nf_ct_ext_create(&ct->ext, id, gfp);
+                return nf_ct_ext_create(&ct->ext, id, var_alloc_len, gfp);
 
         if (__nf_ct_ext_exist(old, id))
                 return NULL;
@@ -89,7 +91,7 @@ void *__nf_ct_ext_add(struct nf_conn *ct, enum nf_ct_ext_id id, gfp_t gfp)
         BUG_ON(t == NULL);
 
         newoff = ALIGN(old->len, t->align);
-        newlen = newoff + t->len;
+        newlen = newoff + t->len + var_alloc_len;
         rcu_read_unlock();
 
         new = __krealloc(old, newlen, gfp);
@@ -117,7 +119,7 @@ void *__nf_ct_ext_add(struct nf_conn *ct, enum nf_ct_ext_id id, gfp_t gfp)
         memset((void *)new + newoff, 0, newlen - newoff);
         return (void *)new + newoff;
 }
-EXPORT_SYMBOL(__nf_ct_ext_add);
+EXPORT_SYMBOL(__nf_ct_ext_add_length);
 
 static void update_alloc_size(struct nf_ct_ext_type *type)
 {
diff --git a/net/netfilter/nf_conntrack_ftp.c b/net/netfilter/nf_conntrack_ftp.c
index 8c5c95c6d34..4bb771d1f57 100644
--- a/net/netfilter/nf_conntrack_ftp.c
+++ b/net/netfilter/nf_conntrack_ftp.c
@@ -358,7 +358,7 @@ static int help(struct sk_buff *skb,
         u32 seq;
         int dir = CTINFO2DIR(ctinfo);
         unsigned int uninitialized_var(matchlen), uninitialized_var(matchoff);
-        struct nf_ct_ftp_master *ct_ftp_info = &nfct_help(ct)->help.ct_ftp_info;
+        struct nf_ct_ftp_master *ct_ftp_info = nfct_help_data(ct);
         struct nf_conntrack_expect *exp;
         union nf_inet_addr *daddr;
         struct nf_conntrack_man cmd = {};
@@ -512,7 +512,6 @@ out_update_nl:
 }
 
 static struct nf_conntrack_helper ftp[MAX_PORTS][2] __read_mostly;
-static char ftp_names[MAX_PORTS][2][sizeof("ftp-65535")] __read_mostly;
 
 static const struct nf_conntrack_expect_policy ftp_exp_policy = {
         .max_expected   = 1,
@@ -541,7 +540,6 @@ static void nf_conntrack_ftp_fini(void)
 static int __init nf_conntrack_ftp_init(void)
 {
         int i, j = -1, ret = 0;
-        char *tmpname;
 
         ftp_buffer = kmalloc(65536, GFP_KERNEL);
         if (!ftp_buffer)
@@ -556,17 +554,16 @@ static int __init nf_conntrack_ftp_init(void)
                 ftp[i][0].tuple.src.l3num = PF_INET;
                 ftp[i][1].tuple.src.l3num = PF_INET6;
                 for (j = 0; j < 2; j++) {
+                        ftp[i][j].data_len = sizeof(struct nf_ct_ftp_master);
                         ftp[i][j].tuple.src.u.tcp.port = htons(ports[i]);
                         ftp[i][j].tuple.dst.protonum = IPPROTO_TCP;
                         ftp[i][j].expect_policy = &ftp_exp_policy;
                         ftp[i][j].me = THIS_MODULE;
                         ftp[i][j].help = help;
-                        tmpname = &ftp_names[i][j][0];
                         if (ports[i] == FTP_PORT)
-                                sprintf(tmpname, "ftp");
+                                sprintf(ftp[i][j].name, "ftp");
                         else
-                                sprintf(tmpname, "ftp-%d", ports[i]);
-                        ftp[i][j].name = tmpname;
+                                sprintf(ftp[i][j].name, "ftp-%d", ports[i]);
 
                         pr_debug("nf_ct_ftp: registering helper for pf: %d "
                                  "port: %d\n",
diff --git a/net/netfilter/nf_conntrack_h323_main.c b/net/netfilter/nf_conntrack_h323_main.c
index 31f50bc3a31..4283b207e63 100644
--- a/net/netfilter/nf_conntrack_h323_main.c
+++ b/net/netfilter/nf_conntrack_h323_main.c
@@ -114,7 +114,7 @@ static int get_tpkt_data(struct sk_buff *skb, unsigned int protoff,
                          struct nf_conn *ct, enum ip_conntrack_info ctinfo,
                          unsigned char **data, int *datalen, int *dataoff)
 {
-        struct nf_ct_h323_master *info = &nfct_help(ct)->help.ct_h323_info;
+        struct nf_ct_h323_master *info = nfct_help_data(ct);
         int dir = CTINFO2DIR(ctinfo);
         const struct tcphdr *th;
         struct tcphdr _tcph;
@@ -617,6 +617,7 @@ static const struct nf_conntrack_expect_policy h245_exp_policy = {
 static struct nf_conntrack_helper nf_conntrack_helper_h245 __read_mostly = {
         .name                   = "H.245",
         .me                     = THIS_MODULE,
+        .data_len               = sizeof(struct nf_ct_h323_master),
         .tuple.src.l3num        = AF_UNSPEC,
         .tuple.dst.protonum     = IPPROTO_UDP,
         .help                   = h245_help,
@@ -1169,6 +1170,7 @@ static struct nf_conntrack_helper nf_conntrack_helper_q931[] __read_mostly = {
         {
                 .name                   = "Q.931",
                 .me                     = THIS_MODULE,
+                .data_len               = sizeof(struct nf_ct_h323_master),
                 .tuple.src.l3num        = AF_INET,
                 .tuple.src.u.tcp.port   = cpu_to_be16(Q931_PORT),
                 .tuple.dst.protonum     = IPPROTO_TCP,
@@ -1244,7 +1246,7 @@ static int expect_q931(struct sk_buff *skb, struct nf_conn *ct,
                        unsigned char **data,
                        TransportAddress *taddr, int count)
 {
-        struct nf_ct_h323_master *info = &nfct_help(ct)->help.ct_h323_info;
+        struct nf_ct_h323_master *info = nfct_help_data(ct);
         int dir = CTINFO2DIR(ctinfo);
         int ret = 0;
         int i;
@@ -1359,7 +1361,7 @@ static int process_rrq(struct sk_buff *skb, struct nf_conn *ct,
                        enum ip_conntrack_info ctinfo,
                        unsigned char **data, RegistrationRequest *rrq)
 {
-        struct nf_ct_h323_master *info = &nfct_help(ct)->help.ct_h323_info;
+        struct nf_ct_h323_master *info = nfct_help_data(ct);
         int ret;
         typeof(set_ras_addr_hook) set_ras_addr;
 
@@ -1394,7 +1396,7 @@ static int process_rcf(struct sk_buff *skb, struct nf_conn *ct,
                        enum ip_conntrack_info ctinfo,
                        unsigned char **data, RegistrationConfirm *rcf)
 {
-        struct nf_ct_h323_master *info = &nfct_help(ct)->help.ct_h323_info;
+        struct nf_ct_h323_master *info = nfct_help_data(ct);
         int dir = CTINFO2DIR(ctinfo);
         int ret;
         struct nf_conntrack_expect *exp;
@@ -1443,7 +1445,7 @@ static int process_urq(struct sk_buff *skb, struct nf_conn *ct,
                        enum ip_conntrack_info ctinfo,
                        unsigned char **data, UnregistrationRequest *urq)
 {
-        struct nf_ct_h323_master *info = &nfct_help(ct)->help.ct_h323_info;
+        struct nf_ct_h323_master *info = nfct_help_data(ct);
         int dir = CTINFO2DIR(ctinfo);
         int ret;
         typeof(set_sig_addr_hook) set_sig_addr;
@@ -1475,7 +1477,7 @@ static int process_arq(struct sk_buff *skb, struct nf_conn *ct,
                        enum ip_conntrack_info ctinfo,
                        unsigned char **data, AdmissionRequest *arq)
 {
-        const struct nf_ct_h323_master *info = &nfct_help(ct)->help.ct_h323_info;
+        const struct nf_ct_h323_master *info = nfct_help_data(ct);
         int dir = CTINFO2DIR(ctinfo);
         __be16 port;
         union nf_inet_addr addr;
@@ -1742,6 +1744,7 @@ static struct nf_conntrack_helper nf_conntrack_helper_ras[] __read_mostly = {
         {
                 .name                   = "RAS",
                 .me                     = THIS_MODULE,
+                .data_len               = sizeof(struct nf_ct_h323_master),
                 .tuple.src.l3num        = AF_INET,
                 .tuple.src.u.udp.port   = cpu_to_be16(RAS_PORT),
                 .tuple.dst.protonum     = IPPROTO_UDP,
@@ -1751,6 +1754,7 @@ static struct nf_conntrack_helper nf_conntrack_helper_ras[] __read_mostly = {
         {
                 .name                   = "RAS",
                 .me                     = THIS_MODULE,
+                .data_len               = sizeof(struct nf_ct_h323_master),
                 .tuple.src.l3num        = AF_INET6,
                 .tuple.src.u.udp.port   = cpu_to_be16(RAS_PORT),
                 .tuple.dst.protonum     = IPPROTO_UDP,
diff --git a/net/netfilter/nf_conntrack_helper.c b/net/netfilter/nf_conntrack_helper.c
index 4fa2ff961f5..c4bc637feb7 100644
--- a/net/netfilter/nf_conntrack_helper.c
+++ b/net/netfilter/nf_conntrack_helper.c
@@ -30,8 +30,10 @@
 #include <net/netfilter/nf_conntrack_extend.h>
 
 static DEFINE_MUTEX(nf_ct_helper_mutex);
-static struct hlist_head *nf_ct_helper_hash __read_mostly;
-static unsigned int nf_ct_helper_hsize __read_mostly;
+struct hlist_head *nf_ct_helper_hash __read_mostly;
+EXPORT_SYMBOL_GPL(nf_ct_helper_hash);
+unsigned int nf_ct_helper_hsize __read_mostly;
+EXPORT_SYMBOL_GPL(nf_ct_helper_hsize);
 static unsigned int nf_ct_helper_count __read_mostly;
 
 static bool nf_ct_auto_assign_helper __read_mostly = true;
@@ -161,11 +163,14 @@ nf_conntrack_helper_try_module_get(const char *name, u16 l3num, u8 protonum)
 }
 EXPORT_SYMBOL_GPL(nf_conntrack_helper_try_module_get);
 
-struct nf_conn_help *nf_ct_helper_ext_add(struct nf_conn *ct, gfp_t gfp)
+struct nf_conn_help *
+nf_ct_helper_ext_add(struct nf_conn *ct,
+                     struct nf_conntrack_helper *helper, gfp_t gfp)
 {
         struct nf_conn_help *help;
 
-        help = nf_ct_ext_add(ct, NF_CT_EXT_HELPER, gfp);
+        help = nf_ct_ext_add_length(ct, NF_CT_EXT_HELPER,
+                                    helper->data_len, gfp);
         if (help)
                 INIT_HLIST_HEAD(&help->expectations);
         else
@@ -218,13 +223,19 @@ int __nf_ct_try_assign_helper(struct nf_conn *ct, struct nf_conn *tmpl,
         }
 
         if (help == NULL) {
-                help = nf_ct_helper_ext_add(ct, flags);
+                help = nf_ct_helper_ext_add(ct, helper, flags);
                 if (help == NULL) {
                         ret = -ENOMEM;
                         goto out;
                 }
         } else {
-                memset(&help->help, 0, sizeof(help->help));
+                /* We only allow helper re-assignment of the same sort since
+                 * we cannot reallocate the helper extension area.
+                 */
+                if (help->helper != helper) {
+                        RCU_INIT_POINTER(help->helper, NULL);
+                        goto out;
+                }
         }
 
         rcu_assign_pointer(help->helper, helper);
@@ -319,6 +330,9 @@ EXPORT_SYMBOL_GPL(nf_ct_helper_expectfn_find_by_symbol);
 
 int nf_conntrack_helper_register(struct nf_conntrack_helper *me)
 {
+        int ret = 0;
+        struct nf_conntrack_helper *cur;
+        struct hlist_node *n;
         unsigned int h = helper_hash(&me->tuple);
 
         BUG_ON(me->expect_policy == NULL);
@@ -326,11 +340,19 @@ int nf_conntrack_helper_register(struct nf_conntrack_helper *me)
         BUG_ON(strlen(me->name) > NF_CT_HELPER_NAME_LEN - 1);
 
         mutex_lock(&nf_ct_helper_mutex);
+        hlist_for_each_entry(cur, n, &nf_ct_helper_hash[h], hnode) {
+                if (strncmp(cur->name, me->name, NF_CT_HELPER_NAME_LEN) == 0 &&
+                    cur->tuple.src.l3num == me->tuple.src.l3num &&
+                    cur->tuple.dst.protonum == me->tuple.dst.protonum) {
+                        ret = -EEXIST;
+                        goto out;
+                }
+        }
         hlist_add_head_rcu(&me->hnode, &nf_ct_helper_hash[h]);
         nf_ct_helper_count++;
+out:
         mutex_unlock(&nf_ct_helper_mutex);
-
-        return 0;
+        return ret;
 }
 EXPORT_SYMBOL_GPL(nf_conntrack_helper_register);
 
diff --git a/net/netfilter/nf_conntrack_irc.c b/net/netfilter/nf_conntrack_irc.c
index 81366c11827..009c52cfd1e 100644
--- a/net/netfilter/nf_conntrack_irc.c
+++ b/net/netfilter/nf_conntrack_irc.c
@@ -221,7 +221,6 @@ static int help(struct sk_buff *skb, unsigned int protoff,
 }
 
 static struct nf_conntrack_helper irc[MAX_PORTS] __read_mostly;
-static char irc_names[MAX_PORTS][sizeof("irc-65535")] __read_mostly;
 static struct nf_conntrack_expect_policy irc_exp_policy;
 
 static void nf_conntrack_irc_fini(void);
@@ -229,7 +228,6 @@ static void nf_conntrack_irc_fini(void);
 static int __init nf_conntrack_irc_init(void)
 {
         int i, ret;
-        char *tmpname;
 
         if (max_dcc_channels < 1) {
                 printk(KERN_ERR "nf_ct_irc: max_dcc_channels must not be zero\n");
@@ -255,12 +253,10 @@ static int __init nf_conntrack_irc_init(void)
                 irc[i].me = THIS_MODULE;
                 irc[i].help = help;
 
-                tmpname = &irc_names[i][0];
                 if (ports[i] == IRC_PORT)
-                        sprintf(tmpname, "irc");
+                        sprintf(irc[i].name, "irc");
                 else
-                        sprintf(tmpname, "irc-%u", i);
-                irc[i].name = tmpname;
+                        sprintf(irc[i].name, "irc-%u", i);
 
                 ret = nf_conntrack_helper_register(&irc[i]);
                 if (ret) {
diff --git a/net/netfilter/nf_conntrack_netlink.c b/net/netfilter/nf_conntrack_netlink.c
index 6f4b00a8fc7..14f67a2cbcb 100644
--- a/net/netfilter/nf_conntrack_netlink.c
+++ b/net/netfilter/nf_conntrack_netlink.c
@@ -4,7 +4,7 @@
  * (C) 2001 by Jay Schulist <jschlst@samba.org>
  * (C) 2002-2006 by Harald Welte <laforge@gnumonks.org>
  * (C) 2003 by Patrick Mchardy <kaber@trash.net>
- * (C) 2005-2011 by Pablo Neira Ayuso <pablo@netfilter.org>
+ * (C) 2005-2012 by Pablo Neira Ayuso <pablo@netfilter.org>
  *
  * Initial connection tracking via netlink development funded and
  * generally made possible by Network Robots, Inc. (www.networkrobots.com)
@@ -46,6 +46,7 @@
 #ifdef CONFIG_NF_NAT_NEEDED
 #include <net/netfilter/nf_nat_core.h>
 #include <net/netfilter/nf_nat_protocol.h>
+#include <net/netfilter/nf_nat_helper.h>
 #endif
 
 #include <linux/netfilter/nfnetlink.h>
@@ -477,7 +478,6 @@ nla_put_failure:
         return -1;
 }
 
-#ifdef CONFIG_NF_CONNTRACK_EVENTS
 static inline size_t
 ctnetlink_proto_size(const struct nf_conn *ct)
 {
@@ -564,6 +564,7 @@ ctnetlink_nlmsg_size(const struct nf_conn *ct)
                ;
 }
 
+#ifdef CONFIG_NF_CONNTRACK_EVENTS
 static int
 ctnetlink_conntrack_event(unsigned int events, struct nf_ct_event *item)
 {
@@ -901,7 +902,8 @@ static const struct nla_policy help_nla_policy[CTA_HELP_MAX+1] = {
 };
 
 static inline int
-ctnetlink_parse_help(const struct nlattr *attr, char **helper_name)
+ctnetlink_parse_help(const struct nlattr *attr, char **helper_name,
+                     struct nlattr **helpinfo)
 {
         struct nlattr *tb[CTA_HELP_MAX+1];
 
@@ -912,6 +914,9 @@ ctnetlink_parse_help(const struct nlattr *attr, char **helper_name)
 
         *helper_name = nla_data(tb[CTA_HELP_NAME]);
 
+        if (tb[CTA_HELP_INFO])
+                *helpinfo = tb[CTA_HELP_INFO];
+
         return 0;
 }
 
@@ -1172,13 +1177,14 @@ ctnetlink_change_helper(struct nf_conn *ct, const struct nlattr * const cda[])
         struct nf_conntrack_helper *helper;
         struct nf_conn_help *help = nfct_help(ct);
         char *helpname = NULL;
+        struct nlattr *helpinfo = NULL;
         int err;
 
         /* don't change helper of sibling connections */
         if (ct->master)
                 return -EBUSY;
 
-        err = ctnetlink_parse_help(cda[CTA_HELP], &helpname);
+        err = ctnetlink_parse_help(cda[CTA_HELP], &helpname, &helpinfo);
         if (err < 0)
                 return err;
 
@@ -1213,20 +1219,17 @@ ctnetlink_change_helper(struct nf_conn *ct, const struct nlattr * const cda[])
         }
 
         if (help) {
-                if (help->helper == helper)
+                if (help->helper == helper) {
+                        /* update private helper data if allowed. */
+                        if (helper->from_nlattr && helpinfo)
+                                helper->from_nlattr(helpinfo, ct);
                         return 0;
-                if (help->helper)
+                } else
                         return -EBUSY;
-                /* need to zero data of old helper */
-                memset(&help->help, 0, sizeof(help->help));
-        } else {
-                /* we cannot set a helper for an existing conntrack */
-                return -EOPNOTSUPP;
         }
 
-        rcu_assign_pointer(help->helper, helper);
-
-        return 0;
+        /* we cannot set a helper for an existing conntrack */
+        return -EOPNOTSUPP;
 }
 
 static inline int
@@ -1410,8 +1413,9 @@ ctnetlink_create_conntrack(struct net *net, u16 zone,
         rcu_read_lock();
         if (cda[CTA_HELP]) {
                 char *helpname = NULL;
- 
-                err = ctnetlink_parse_help(cda[CTA_HELP], &helpname);
+                struct nlattr *helpinfo = NULL;
+
+                err = ctnetlink_parse_help(cda[CTA_HELP], &helpname, &helpinfo);
                 if (err < 0)
                         goto err2;
 
@@ -1440,11 +1444,14 @@ ctnetlink_create_conntrack(struct net *net, u16 zone,
                 } else {
                         struct nf_conn_help *help;
 
-                        help = nf_ct_helper_ext_add(ct, GFP_ATOMIC);
+                        help = nf_ct_helper_ext_add(ct, helper, GFP_ATOMIC);
                         if (help == NULL) {
                                 err = -ENOMEM;
                                 goto err2;
                         }
+                        /* set private helper data if allowed. */
+                        if (helper->from_nlattr && helpinfo)
+                                helper->from_nlattr(helpinfo, ct);
 
                         /* not in hash table yet so not strictly necessary */
                         RCU_INIT_POINTER(help->helper, helper);
@@ -1620,6 +1627,288 @@ ctnetlink_new_conntrack(struct sock *ctnl, struct sk_buff *skb,
         return err;
 }
 
+static int
+ctnetlink_ct_stat_cpu_fill_info(struct sk_buff *skb, u32 pid, u32 seq,
+                                __u16 cpu, const struct ip_conntrack_stat *st)
+{
+        struct nlmsghdr *nlh;
+        struct nfgenmsg *nfmsg;
+        unsigned int flags = pid ? NLM_F_MULTI : 0, event;
+
+        event = (NFNL_SUBSYS_CTNETLINK << 8 | IPCTNL_MSG_CT_GET_STATS_CPU);
+        nlh = nlmsg_put(skb, pid, seq, event, sizeof(*nfmsg), flags);
+        if (nlh == NULL)
+                goto nlmsg_failure;
+
+        nfmsg = nlmsg_data(nlh);
+        nfmsg->nfgen_family = AF_UNSPEC;
+        nfmsg->version      = NFNETLINK_V0;
+        nfmsg->res_id       = htons(cpu);
+
+        if (nla_put_be32(skb, CTA_STATS_SEARCHED, htonl(st->searched)) ||
+            nla_put_be32(skb, CTA_STATS_FOUND, htonl(st->found)) ||
+            nla_put_be32(skb, CTA_STATS_NEW, htonl(st->new)) ||
+            nla_put_be32(skb, CTA_STATS_INVALID, htonl(st->invalid)) ||
+            nla_put_be32(skb, CTA_STATS_IGNORE, htonl(st->ignore)) ||
+            nla_put_be32(skb, CTA_STATS_DELETE, htonl(st->delete)) ||
+            nla_put_be32(skb, CTA_STATS_DELETE_LIST, htonl(st->delete_list)) ||
+            nla_put_be32(skb, CTA_STATS_INSERT, htonl(st->insert)) ||
+            nla_put_be32(skb, CTA_STATS_INSERT_FAILED,
+                                htonl(st->insert_failed)) ||
+            nla_put_be32(skb, CTA_STATS_DROP, htonl(st->drop)) ||
+            nla_put_be32(skb, CTA_STATS_EARLY_DROP, htonl(st->early_drop)) ||
+            nla_put_be32(skb, CTA_STATS_ERROR, htonl(st->error)) ||
+            nla_put_be32(skb, CTA_STATS_SEARCH_RESTART,
+                                htonl(st->search_restart)))
+                goto nla_put_failure;
+
+        nlmsg_end(skb, nlh);
+        return skb->len;
+
+nla_put_failure:
+nlmsg_failure:
+        nlmsg_cancel(skb, nlh);
+        return -1;
+}
+
+static int
+ctnetlink_ct_stat_cpu_dump(struct sk_buff *skb, struct netlink_callback *cb)
+{
+        int cpu;
+        struct net *net = sock_net(skb->sk);
+
+        if (cb->args[0] == nr_cpu_ids)
+                return 0;
+
+        for (cpu = cb->args[0]; cpu < nr_cpu_ids; cpu++) {
+                const struct ip_conntrack_stat *st;
+
+                if (!cpu_possible(cpu))
+                        continue;
+
+                st = per_cpu_ptr(net->ct.stat, cpu);
+                if (ctnetlink_ct_stat_cpu_fill_info(skb,
+                                                    NETLINK_CB(cb->skb).pid,
+                                                    cb->nlh->nlmsg_seq,
+                                                    cpu, st) < 0)
+                                break;
+        }
+        cb->args[0] = cpu;
+
+        return skb->len;
+}
+
+static int
+ctnetlink_stat_ct_cpu(struct sock *ctnl, struct sk_buff *skb,
+                      const struct nlmsghdr *nlh,
+                      const struct nlattr * const cda[])
+{
+        if (nlh->nlmsg_flags & NLM_F_DUMP) {
+                struct netlink_dump_control c = {
+                        .dump = ctnetlink_ct_stat_cpu_dump,
+                };
+                return netlink_dump_start(ctnl, skb, nlh, &c);
+        }
+
+        return 0;
+}
+
+static int
+ctnetlink_stat_ct_fill_info(struct sk_buff *skb, u32 pid, u32 seq, u32 type,
+                            struct net *net)
+{
+        struct nlmsghdr *nlh;
+        struct nfgenmsg *nfmsg;
+        unsigned int flags = pid ? NLM_F_MULTI : 0, event;
+        unsigned int nr_conntracks = atomic_read(&net->ct.count);
+
+        event = (NFNL_SUBSYS_CTNETLINK << 8 | IPCTNL_MSG_CT_GET_STATS);
+        nlh = nlmsg_put(skb, pid, seq, event, sizeof(*nfmsg), flags);
+        if (nlh == NULL)
+                goto nlmsg_failure;
+
+        nfmsg = nlmsg_data(nlh);
+        nfmsg->nfgen_family = AF_UNSPEC;
+        nfmsg->version      = NFNETLINK_V0;
+        nfmsg->res_id       = 0;
+
+        if (nla_put_be32(skb, CTA_STATS_GLOBAL_ENTRIES, htonl(nr_conntracks)))
+                goto nla_put_failure;
+
+        nlmsg_end(skb, nlh);
+        return skb->len;
+
+nla_put_failure:
+nlmsg_failure:
+        nlmsg_cancel(skb, nlh);
+        return -1;
+}
+
+static int
+ctnetlink_stat_ct(struct sock *ctnl, struct sk_buff *skb,
+                  const struct nlmsghdr *nlh,
+                  const struct nlattr * const cda[])
+{
+        struct sk_buff *skb2;
+        int err;
+
+        skb2 = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);
+        if (skb2 == NULL)
+                return -ENOMEM;
+
+        err = ctnetlink_stat_ct_fill_info(skb2, NETLINK_CB(skb).pid,
+                                          nlh->nlmsg_seq,
+                                          NFNL_MSG_TYPE(nlh->nlmsg_type),
+                                          sock_net(skb->sk));
+        if (err <= 0)
+                goto free;
+
+        err = netlink_unicast(ctnl, skb2, NETLINK_CB(skb).pid, MSG_DONTWAIT);
+        if (err < 0)
+                goto out;
+
+        return 0;
+
+free:
+        kfree_skb(skb2);
+out:
+        /* this avoids a loop in nfnetlink. */
+        return err == -EAGAIN ? -ENOBUFS : err;
+}
+
+#ifdef CONFIG_NETFILTER_NETLINK_QUEUE_CT
+static size_t
+ctnetlink_nfqueue_build_size(const struct nf_conn *ct)
+{
+        return 3 * nla_total_size(0) /* CTA_TUPLE_ORIG|REPL|MASTER */
+               + 3 * nla_total_size(0) /* CTA_TUPLE_IP */
+               + 3 * nla_total_size(0) /* CTA_TUPLE_PROTO */
+               + 3 * nla_total_size(sizeof(u_int8_t)) /* CTA_PROTO_NUM */
+               + nla_total_size(sizeof(u_int32_t)) /* CTA_ID */
+               + nla_total_size(sizeof(u_int32_t)) /* CTA_STATUS */
+               + nla_total_size(sizeof(u_int32_t)) /* CTA_TIMEOUT */
+               + nla_total_size(0) /* CTA_PROTOINFO */
+               + nla_total_size(0) /* CTA_HELP */
+               + nla_total_size(NF_CT_HELPER_NAME_LEN) /* CTA_HELP_NAME */
+               + ctnetlink_secctx_size(ct)
+#ifdef CONFIG_NF_NAT_NEEDED
+               + 2 * nla_total_size(0) /* CTA_NAT_SEQ_ADJ_ORIG|REPL */
+               + 6 * nla_total_size(sizeof(u_int32_t)) /* CTA_NAT_SEQ_OFFSET */
+#endif
+#ifdef CONFIG_NF_CONNTRACK_MARK
+               + nla_total_size(sizeof(u_int32_t)) /* CTA_MARK */
+#endif
+               + ctnetlink_proto_size(ct)
+               ;
+}
+
+static int
+ctnetlink_nfqueue_build(struct sk_buff *skb, struct nf_conn *ct)
+{
+        struct nlattr *nest_parms;
+
+        rcu_read_lock();
+        nest_parms = nla_nest_start(skb, CTA_TUPLE_ORIG | NLA_F_NESTED);
+        if (!nest_parms)
+                goto nla_put_failure;
+        if (ctnetlink_dump_tuples(skb, nf_ct_tuple(ct, IP_CT_DIR_ORIGINAL)) < 0)
+                goto nla_put_failure;
+        nla_nest_end(skb, nest_parms);
+
+        nest_parms = nla_nest_start(skb, CTA_TUPLE_REPLY | NLA_F_NESTED);
+        if (!nest_parms)
+                goto nla_put_failure;
+        if (ctnetlink_dump_tuples(skb, nf_ct_tuple(ct, IP_CT_DIR_REPLY)) < 0)
+                goto nla_put_failure;
+        nla_nest_end(skb, nest_parms);
+
+        if (nf_ct_zone(ct)) {
+                if (nla_put_be16(skb, CTA_ZONE, htons(nf_ct_zone(ct))))
+                        goto nla_put_failure;
+        }
+
+        if (ctnetlink_dump_id(skb, ct) < 0)
+                goto nla_put_failure;
+
+        if (ctnetlink_dump_status(skb, ct) < 0)
+                goto nla_put_failure;
+
+        if (ctnetlink_dump_timeout(skb, ct) < 0)
+                goto nla_put_failure;
+
+        if (ctnetlink_dump_protoinfo(skb, ct) < 0)
+                goto nla_put_failure;
+
+        if (ctnetlink_dump_helpinfo(skb, ct) < 0)
+                goto nla_put_failure;
+
+#ifdef CONFIG_NF_CONNTRACK_SECMARK
+        if (ct->secmark && ctnetlink_dump_secctx(skb, ct) < 0)
+                goto nla_put_failure;
+#endif
+        if (ct->master && ctnetlink_dump_master(skb, ct) < 0)
+                goto nla_put_failure;
+
+        if ((ct->status & IPS_SEQ_ADJUST) &&
+            ctnetlink_dump_nat_seq_adj(skb, ct) < 0)
+                goto nla_put_failure;
+
+#ifdef CONFIG_NF_CONNTRACK_MARK
+        if (ct->mark && ctnetlink_dump_mark(skb, ct) < 0)
+                goto nla_put_failure;
+#endif
+        rcu_read_unlock();
+        return 0;
+
+nla_put_failure:
+        rcu_read_unlock();
+        return -ENOSPC;
+}
+
+static int
+ctnetlink_nfqueue_parse_ct(const struct nlattr *cda[], struct nf_conn *ct)
+{
+        int err;
+
+        if (cda[CTA_TIMEOUT]) {
+                err = ctnetlink_change_timeout(ct, cda);
+                if (err < 0)
+                        return err;
+        }
+        if (cda[CTA_STATUS]) {
+                err = ctnetlink_change_status(ct, cda);
+                if (err < 0)
+                        return err;
+        }
+        if (cda[CTA_HELP]) {
+                err = ctnetlink_change_helper(ct, cda);
+                if (err < 0)
+                        return err;
+        }
+#if defined(CONFIG_NF_CONNTRACK_MARK)
+        if (cda[CTA_MARK])
+                ct->mark = ntohl(nla_get_be32(cda[CTA_MARK]));
+#endif
+        return 0;
+}
+
+static int
+ctnetlink_nfqueue_parse(const struct nlattr *attr, struct nf_conn *ct)
+{
+        struct nlattr *cda[CTA_MAX+1];
+
+        nla_parse_nested(cda, CTA_MAX, attr, ct_nla_policy);
+
+        return ctnetlink_nfqueue_parse_ct((const struct nlattr **)cda, ct);
+}
+
+static struct nfq_ct_hook ctnetlink_nfqueue_hook = {
+        .build_size     = ctnetlink_nfqueue_build_size,
+        .build          = ctnetlink_nfqueue_build,
+        .parse          = ctnetlink_nfqueue_parse,
+};
+#endif /* CONFIG_NETFILTER_NETLINK_QUEUE_CT */
+
 /***********************************************************************
  * EXPECT
  ***********************************************************************/
@@ -2300,6 +2589,79 @@ ctnetlink_new_expect(struct sock *ctnl, struct sk_buff *skb,
         return err;
 }
 
+static int
+ctnetlink_exp_stat_fill_info(struct sk_buff *skb, u32 pid, u32 seq, int cpu,
+                             const struct ip_conntrack_stat *st)
+{
+        struct nlmsghdr *nlh;
+        struct nfgenmsg *nfmsg;
+        unsigned int flags = pid ? NLM_F_MULTI : 0, event;
+
+        event = (NFNL_SUBSYS_CTNETLINK << 8 | IPCTNL_MSG_EXP_GET_STATS_CPU);
+        nlh = nlmsg_put(skb, pid, seq, event, sizeof(*nfmsg), flags);
+        if (nlh == NULL)
+                goto nlmsg_failure;
+
+        nfmsg = nlmsg_data(nlh);
+        nfmsg->nfgen_family = AF_UNSPEC;
+        nfmsg->version      = NFNETLINK_V0;
+        nfmsg->res_id       = htons(cpu);
+
+        if (nla_put_be32(skb, CTA_STATS_EXP_NEW, htonl(st->expect_new)) ||
+            nla_put_be32(skb, CTA_STATS_EXP_CREATE, htonl(st->expect_create)) ||
+            nla_put_be32(skb, CTA_STATS_EXP_DELETE, htonl(st->expect_delete)))
+                goto nla_put_failure;
+
+        nlmsg_end(skb, nlh);
+        return skb->len;
+
+nla_put_failure:
+nlmsg_failure:
+        nlmsg_cancel(skb, nlh);
+        return -1;
+}
+
+static int
+ctnetlink_exp_stat_cpu_dump(struct sk_buff *skb, struct netlink_callback *cb)
+{
+        int cpu;
+        struct net *net = sock_net(skb->sk);
+
+        if (cb->args[0] == nr_cpu_ids)
+                return 0;
+
+        for (cpu = cb->args[0]; cpu < nr_cpu_ids; cpu++) {
+                const struct ip_conntrack_stat *st;
+
+                if (!cpu_possible(cpu))
+                        continue;
+
+                st = per_cpu_ptr(net->ct.stat, cpu);
+                if (ctnetlink_exp_stat_fill_info(skb, NETLINK_CB(cb->skb).pid,
+                                                 cb->nlh->nlmsg_seq,
+                                                 cpu, st) < 0)
+                        break;
+        }
+        cb->args[0] = cpu;
+
+        return skb->len;
+}
+
+static int
+ctnetlink_stat_exp_cpu(struct sock *ctnl, struct sk_buff *skb,
+                       const struct nlmsghdr *nlh,
+                       const struct nlattr * const cda[])
+{
+        if (nlh->nlmsg_flags & NLM_F_DUMP) {
+                struct netlink_dump_control c = {
+                        .dump = ctnetlink_exp_stat_cpu_dump,
+                };
+                return netlink_dump_start(ctnl, skb, nlh, &c);
+        }
+
+        return 0;
+}
+
 #ifdef CONFIG_NF_CONNTRACK_EVENTS
 static struct nf_ct_event_notifier ctnl_notifier = {
         .fcn = ctnetlink_conntrack_event,
@@ -2323,6 +2685,8 @@ static const struct nfnl_callback ctnl_cb[IPCTNL_MSG_MAX] = {
         [IPCTNL_MSG_CT_GET_CTRZERO]     = { .call = ctnetlink_get_conntrack,
                                             .attr_count = CTA_MAX,
                                             .policy = ct_nla_policy },
+        [IPCTNL_MSG_CT_GET_STATS_CPU]   = { .call = ctnetlink_stat_ct_cpu },
+        [IPCTNL_MSG_CT_GET_STATS]       = { .call = ctnetlink_stat_ct },
 };
 
 static const struct nfnl_callback ctnl_exp_cb[IPCTNL_MSG_EXP_MAX] = {
@@ -2335,6 +2699,7 @@ static const struct nfnl_callback ctnl_exp_cb[IPCTNL_MSG_EXP_MAX] = {
         [IPCTNL_MSG_EXP_DELETE]         = { .call = ctnetlink_del_expect,
                                             .attr_count = CTA_EXPECT_MAX,
                                             .policy = exp_nla_policy },
+        [IPCTNL_MSG_EXP_GET_STATS_CPU]  = { .call = ctnetlink_stat_exp_cpu },
 };
 
 static const struct nfnetlink_subsystem ctnl_subsys = {
@@ -2424,7 +2789,10 @@ static int __init ctnetlink_init(void)
                 pr_err("ctnetlink_init: cannot register pernet operations\n");
                 goto err_unreg_exp_subsys;
         }
-
+#ifdef CONFIG_NETFILTER_NETLINK_QUEUE_CT
+        /* setup interaction between nf_queue and nf_conntrack_netlink. */
+        RCU_INIT_POINTER(nfq_ct_hook, &ctnetlink_nfqueue_hook);
+#endif
         return 0;
 
 err_unreg_exp_subsys:
@@ -2442,6 +2810,9 @@ static void __exit ctnetlink_exit(void)
         unregister_pernet_subsys(&ctnetlink_net_ops);
         nfnetlink_subsys_unregister(&ctnl_exp_subsys);
         nfnetlink_subsys_unregister(&ctnl_subsys);
+#ifdef CONFIG_NETFILTER_NETLINK_QUEUE_CT
+        RCU_INIT_POINTER(nfq_ct_hook, NULL);
+#endif
 }
 
 module_init(ctnetlink_init);
diff --git a/net/netfilter/nf_conntrack_pptp.c b/net/netfilter/nf_conntrack_pptp.c
index 31d56b23b9e..6fed9ec3524 100644
--- a/net/netfilter/nf_conntrack_pptp.c
+++ b/net/netfilter/nf_conntrack_pptp.c
@@ -174,7 +174,7 @@ static int destroy_sibling_or_exp(struct net *net, struct nf_conn *ct,
 static void pptp_destroy_siblings(struct nf_conn *ct)
 {
         struct net *net = nf_ct_net(ct);
-        const struct nf_conn_help *help = nfct_help(ct);
+        const struct nf_ct_pptp_master *ct_pptp_info = nfct_help_data(ct);
         struct nf_conntrack_tuple t;
 
         nf_ct_gre_keymap_destroy(ct);
@@ -182,16 +182,16 @@ static void pptp_destroy_siblings(struct nf_conn *ct)
         /* try original (pns->pac) tuple */
         memcpy(&t, &ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple, sizeof(t));
         t.dst.protonum = IPPROTO_GRE;
-        t.src.u.gre.key = help->help.ct_pptp_info.pns_call_id;
-        t.dst.u.gre.key = help->help.ct_pptp_info.pac_call_id;
+        t.src.u.gre.key = ct_pptp_info->pns_call_id;
+        t.dst.u.gre.key = ct_pptp_info->pac_call_id;
         if (!destroy_sibling_or_exp(net, ct, &t))
                 pr_debug("failed to timeout original pns->pac ct/exp\n");
 
         /* try reply (pac->pns) tuple */
         memcpy(&t, &ct->tuplehash[IP_CT_DIR_REPLY].tuple, sizeof(t));
         t.dst.protonum = IPPROTO_GRE;
-        t.src.u.gre.key = help->help.ct_pptp_info.pac_call_id;
-        t.dst.u.gre.key = help->help.ct_pptp_info.pns_call_id;
+        t.src.u.gre.key = ct_pptp_info->pac_call_id;
+        t.dst.u.gre.key = ct_pptp_info->pns_call_id;
         if (!destroy_sibling_or_exp(net, ct, &t))
                 pr_debug("failed to timeout reply pac->pns ct/exp\n");
 }
@@ -269,7 +269,7 @@ pptp_inbound_pkt(struct sk_buff *skb,
                  struct nf_conn *ct,
                  enum ip_conntrack_info ctinfo)
 {
-        struct nf_ct_pptp_master *info = &nfct_help(ct)->help.ct_pptp_info;
+        struct nf_ct_pptp_master *info = nfct_help_data(ct);
         u_int16_t msg;
         __be16 cid = 0, pcid = 0;
         typeof(nf_nat_pptp_hook_inbound) nf_nat_pptp_inbound;
@@ -396,7 +396,7 @@ pptp_outbound_pkt(struct sk_buff *skb,
                   struct nf_conn *ct,
                   enum ip_conntrack_info ctinfo)
 {
-        struct nf_ct_pptp_master *info = &nfct_help(ct)->help.ct_pptp_info;
+        struct nf_ct_pptp_master *info = nfct_help_data(ct);
         u_int16_t msg;
         __be16 cid = 0, pcid = 0;
         typeof(nf_nat_pptp_hook_outbound) nf_nat_pptp_outbound;
@@ -506,7 +506,7 @@ conntrack_pptp_help(struct sk_buff *skb, unsigned int protoff,
 
 {
         int dir = CTINFO2DIR(ctinfo);
-        const struct nf_ct_pptp_master *info = &nfct_help(ct)->help.ct_pptp_info;
+        const struct nf_ct_pptp_master *info = nfct_help_data(ct);
         const struct tcphdr *tcph;
         struct tcphdr _tcph;
         const struct pptp_pkt_hdr *pptph;
@@ -592,6 +592,7 @@ static const struct nf_conntrack_expect_policy pptp_exp_policy = {
 static struct nf_conntrack_helper pptp __read_mostly = {
         .name                   = "pptp",
         .me                     = THIS_MODULE,
+        .data_len               = sizeof(struct nf_ct_pptp_master),
         .tuple.src.l3num        = AF_INET,
         .tuple.src.u.tcp.port   = cpu_to_be16(PPTP_CONTROL_PORT),
         .tuple.dst.protonum     = IPPROTO_TCP,
diff --git a/net/netfilter/nf_conntrack_proto.c b/net/netfilter/nf_conntrack_proto.c
index 8b631b07a64..0dc63854390 100644
--- a/net/netfilter/nf_conntrack_proto.c
+++ b/net/netfilter/nf_conntrack_proto.c
@@ -36,28 +36,32 @@ static DEFINE_MUTEX(nf_ct_proto_mutex);
 
 #ifdef CONFIG_SYSCTL
 static int
-nf_ct_register_sysctl(struct ctl_table_header **header, const char *path,
-                      struct ctl_table *table, unsigned int *users)
+nf_ct_register_sysctl(struct net *net,
+                      struct ctl_table_header **header,
+                      const char *path,
+                      struct ctl_table *table)
 {
         if (*header == NULL) {
-                *header = register_net_sysctl(&init_net, path, table);
+                *header = register_net_sysctl(net, path, table);
                 if (*header == NULL)
                         return -ENOMEM;
         }
-        if (users != NULL)
-                (*users)++;
+
         return 0;
 }
 
 static void
 nf_ct_unregister_sysctl(struct ctl_table_header **header,
-                        struct ctl_table *table, unsigned int *users)
+                        struct ctl_table **table,
+                        unsigned int users)
 {
-        if (users != NULL && --*users > 0)
+        if (users > 0)
                 return;
 
         unregister_net_sysctl_table(*header);
+        kfree(*table);
         *header = NULL;
+        *table = NULL;
 }
 #endif
 
@@ -161,30 +165,56 @@ static int kill_l4proto(struct nf_conn *i, void *data)
                nf_ct_l3num(i) == l4proto->l3proto;
 }
 
-static int nf_ct_l3proto_register_sysctl(struct nf_conntrack_l3proto *l3proto)
+static struct nf_ip_net *nf_ct_l3proto_net(struct net *net,
+                                           struct nf_conntrack_l3proto *l3proto)
 {
-        int err = 0;
+        if (l3proto->l3proto == PF_INET)
+                return &net->ct.nf_ct_proto;
+        else
+                return NULL;
+}
 
-#ifdef CONFIG_SYSCTL
-        if (l3proto->ctl_table != NULL) {
-                err = nf_ct_register_sysctl(&l3proto->ctl_table_header,
+static int nf_ct_l3proto_register_sysctl(struct net *net,
+                                         struct nf_conntrack_l3proto *l3proto)
+{
+        int err = 0;
+        struct nf_ip_net *in = nf_ct_l3proto_net(net, l3proto);
+        /* nf_conntrack_l3proto_ipv6 doesn't support sysctl */
+        if (in == NULL)
+                return 0;
+
+#if defined(CONFIG_SYSCTL) && defined(CONFIG_NF_CONNTRACK_PROC_COMPAT)
+        if (in->ctl_table != NULL) {
+                err = nf_ct_register_sysctl(net,
+                                            &in->ctl_table_header,
                                             l3proto->ctl_table_path,
-                                            l3proto->ctl_table, NULL);
+                                            in->ctl_table);
+                if (err < 0) {
+                        kfree(in->ctl_table);
+                        in->ctl_table = NULL;
+                }
         }
 #endif
         return err;
 }
 
-static void nf_ct_l3proto_unregister_sysctl(struct nf_conntrack_l3proto *l3proto)
+static void nf_ct_l3proto_unregister_sysctl(struct net *net,
+                                            struct nf_conntrack_l3proto *l3proto)
 {
-#ifdef CONFIG_SYSCTL
-        if (l3proto->ctl_table_header != NULL)
-                nf_ct_unregister_sysctl(&l3proto->ctl_table_header,
-                                        l3proto->ctl_table, NULL);
+        struct nf_ip_net *in = nf_ct_l3proto_net(net, l3proto);
+
+        if (in == NULL)
+                return;
+#if defined(CONFIG_SYSCTL) && defined(CONFIG_NF_CONNTRACK_PROC_COMPAT)
+        if (in->ctl_table_header != NULL)
+                nf_ct_unregister_sysctl(&in->ctl_table_header,
+                                        &in->ctl_table,
+                                        0);
 #endif
 }
 
-int nf_conntrack_l3proto_register(struct nf_conntrack_l3proto *proto)
+static int
+nf_conntrack_l3proto_register_net(struct nf_conntrack_l3proto *proto)
 {
         int ret = 0;
         struct nf_conntrack_l3proto *old;
@@ -203,10 +233,6 @@ int nf_conntrack_l3proto_register(struct nf_conntrack_l3proto *proto)
                 goto out_unlock;
         }
 
-        ret = nf_ct_l3proto_register_sysctl(proto);
-        if (ret < 0)
-                goto out_unlock;
-
         if (proto->nlattr_tuple_size)
                 proto->nla_size = 3 * proto->nlattr_tuple_size();
 
@@ -215,13 +241,37 @@ int nf_conntrack_l3proto_register(struct nf_conntrack_l3proto *proto)
 out_unlock:
         mutex_unlock(&nf_ct_proto_mutex);
         return ret;
+
 }
-EXPORT_SYMBOL_GPL(nf_conntrack_l3proto_register);
 
-void nf_conntrack_l3proto_unregister(struct nf_conntrack_l3proto *proto)
+int nf_conntrack_l3proto_register(struct net *net,
+                                  struct nf_conntrack_l3proto *proto)
 {
-        struct net *net;
+        int ret = 0;
+
+        if (proto->init_net) {
+                ret = proto->init_net(net);
+                if (ret < 0)
+                        return ret;
+        }
+
+        ret = nf_ct_l3proto_register_sysctl(net, proto);
+        if (ret < 0)
+                return ret;
 
+        if (net == &init_net) {
+                ret = nf_conntrack_l3proto_register_net(proto);
+                if (ret < 0)
+                        nf_ct_l3proto_unregister_sysctl(net, proto);
+        }
+
+        return ret;
+}
+EXPORT_SYMBOL_GPL(nf_conntrack_l3proto_register);
+
+static void
+nf_conntrack_l3proto_unregister_net(struct nf_conntrack_l3proto *proto)
+{
         BUG_ON(proto->l3proto >= AF_MAX);
 
         mutex_lock(&nf_ct_proto_mutex);
@@ -230,68 +280,107 @@ void nf_conntrack_l3proto_unregister(struct nf_conntrack_l3proto *proto)
                                          ) != proto);
         rcu_assign_pointer(nf_ct_l3protos[proto->l3proto],
                            &nf_conntrack_l3proto_generic);
-        nf_ct_l3proto_unregister_sysctl(proto);
         mutex_unlock(&nf_ct_proto_mutex);
 
         synchronize_rcu();
+}
+
+void nf_conntrack_l3proto_unregister(struct net *net,
+                                     struct nf_conntrack_l3proto *proto)
+{
+        if (net == &init_net)
+                nf_conntrack_l3proto_unregister_net(proto);
+
+        nf_ct_l3proto_unregister_sysctl(net, proto);
 
         /* Remove all contrack entries for this protocol */
         rtnl_lock();
-        for_each_net(net)
-                nf_ct_iterate_cleanup(net, kill_l3proto, proto);
+        nf_ct_iterate_cleanup(net, kill_l3proto, proto);
         rtnl_unlock();
 }
 EXPORT_SYMBOL_GPL(nf_conntrack_l3proto_unregister);
 
-static int nf_ct_l4proto_register_sysctl(struct nf_conntrack_l4proto *l4proto)
+static struct nf_proto_net *nf_ct_l4proto_net(struct net *net,
+                                              struct nf_conntrack_l4proto *l4proto)
+{
+        if (l4proto->get_net_proto) {
+                /* statically built-in protocols use static per-net */
+                return l4proto->get_net_proto(net);
+        } else if (l4proto->net_id) {
+                /* ... and loadable protocols use dynamic per-net */
+                return net_generic(net, *l4proto->net_id);
+        }
+        return NULL;
+}
+
+static
+int nf_ct_l4proto_register_sysctl(struct net *net,
+                                  struct nf_proto_net *pn,
+                                  struct nf_conntrack_l4proto *l4proto)
 {
         int err = 0;
 
 #ifdef CONFIG_SYSCTL
-        if (l4proto->ctl_table != NULL) {
-                err = nf_ct_register_sysctl(l4proto->ctl_table_header,
+        if (pn->ctl_table != NULL) {
+                err = nf_ct_register_sysctl(net,
+                                            &pn->ctl_table_header,
                                             "net/netfilter",
-                                            l4proto->ctl_table,
-                                            l4proto->ctl_table_users);
-                if (err < 0)
-                        goto out;
+                                            pn->ctl_table);
+                if (err < 0) {
+                        if (!pn->users) {
+                                kfree(pn->ctl_table);
+                                pn->ctl_table = NULL;
+                        }
+                }
         }
 #ifdef CONFIG_NF_CONNTRACK_PROC_COMPAT
-        if (l4proto->ctl_compat_table != NULL) {
-                err = nf_ct_register_sysctl(&l4proto->ctl_compat_table_header,
+        if (l4proto->l3proto != AF_INET6 && pn->ctl_compat_table != NULL) {
+                if (err < 0) {
+                        nf_ct_kfree_compat_sysctl_table(pn);
+                        goto out;
+                }
+                err = nf_ct_register_sysctl(net,
+                                            &pn->ctl_compat_header,
                                             "net/ipv4/netfilter",
-                                            l4proto->ctl_compat_table, NULL);
+                                            pn->ctl_compat_table);
                 if (err == 0)
                         goto out;
-                nf_ct_unregister_sysctl(l4proto->ctl_table_header,
-                                        l4proto->ctl_table,
-                                        l4proto->ctl_table_users);
+
+                nf_ct_kfree_compat_sysctl_table(pn);
+                nf_ct_unregister_sysctl(&pn->ctl_table_header,
+                                        &pn->ctl_table,
+                                        pn->users);
         }
-#endif /* CONFIG_NF_CONNTRACK_PROC_COMPAT */
 out:
+#endif /* CONFIG_NF_CONNTRACK_PROC_COMPAT */
 #endif /* CONFIG_SYSCTL */
         return err;
 }
 
-static void nf_ct_l4proto_unregister_sysctl(struct nf_conntrack_l4proto *l4proto)
+static
+void nf_ct_l4proto_unregister_sysctl(struct net *net,
+                                     struct nf_proto_net *pn,
+                                     struct nf_conntrack_l4proto *l4proto)
 {
 #ifdef CONFIG_SYSCTL
-        if (l4proto->ctl_table_header != NULL &&
-            *l4proto->ctl_table_header != NULL)
-                nf_ct_unregister_sysctl(l4proto->ctl_table_header,
-                                        l4proto->ctl_table,
-                                        l4proto->ctl_table_users);
+        if (pn->ctl_table_header != NULL)
+                nf_ct_unregister_sysctl(&pn->ctl_table_header,
+                                        &pn->ctl_table,
+                                        pn->users);
+
 #ifdef CONFIG_NF_CONNTRACK_PROC_COMPAT
-        if (l4proto->ctl_compat_table_header != NULL)
-                nf_ct_unregister_sysctl(&l4proto->ctl_compat_table_header,
-                                        l4proto->ctl_compat_table, NULL);
+        if (l4proto->l3proto != AF_INET6 && pn->ctl_compat_header != NULL)
+                nf_ct_unregister_sysctl(&pn->ctl_compat_header,
+                                        &pn->ctl_compat_table,
+                                        0);
 #endif /* CONFIG_NF_CONNTRACK_PROC_COMPAT */
 #endif /* CONFIG_SYSCTL */
 }
 
 /* FIXME: Allow NULL functions and sub in pointers to generic for
    them. --RR */
-int nf_conntrack_l4proto_register(struct nf_conntrack_l4proto *l4proto)
+static int
+nf_conntrack_l4proto_register_net(struct nf_conntrack_l4proto *l4proto)
 {
         int ret = 0;
 
@@ -333,10 +422,6 @@ int nf_conntrack_l4proto_register(struct nf_conntrack_l4proto *l4proto)
                 goto out_unlock;
         }
 
-        ret = nf_ct_l4proto_register_sysctl(l4proto);
-        if (ret < 0)
-                goto out_unlock;
-
         l4proto->nla_size = 0;
         if (l4proto->nlattr_size)
                 l4proto->nla_size += l4proto->nlattr_size();
@@ -345,17 +430,48 @@ int nf_conntrack_l4proto_register(struct nf_conntrack_l4proto *l4proto)
 
         rcu_assign_pointer(nf_ct_protos[l4proto->l3proto][l4proto->l4proto],
                            l4proto);
-
 out_unlock:
         mutex_unlock(&nf_ct_proto_mutex);
         return ret;
 }
-EXPORT_SYMBOL_GPL(nf_conntrack_l4proto_register);
 
-void nf_conntrack_l4proto_unregister(struct nf_conntrack_l4proto *l4proto)
+int nf_conntrack_l4proto_register(struct net *net,
+                                  struct nf_conntrack_l4proto *l4proto)
 {
-        struct net *net;
+        int ret = 0;
+        struct nf_proto_net *pn = NULL;
 
+        if (l4proto->init_net) {
+                ret = l4proto->init_net(net, l4proto->l3proto);
+                if (ret < 0)
+                        goto out;
+        }
+
+        pn = nf_ct_l4proto_net(net, l4proto);
+        if (pn == NULL)
+                goto out;
+
+        ret = nf_ct_l4proto_register_sysctl(net, pn, l4proto);
+        if (ret < 0)
+                goto out;
+
+        if (net == &init_net) {
+                ret = nf_conntrack_l4proto_register_net(l4proto);
+                if (ret < 0) {
+                        nf_ct_l4proto_unregister_sysctl(net, pn, l4proto);
+                        goto out;
+                }
+        }
+
+        pn->users++;
+out:
+        return ret;
+}
+EXPORT_SYMBOL_GPL(nf_conntrack_l4proto_register);
+
+static void
+nf_conntrack_l4proto_unregister_net(struct nf_conntrack_l4proto *l4proto)
+{
         BUG_ON(l4proto->l3proto >= PF_MAX);
 
         mutex_lock(&nf_ct_proto_mutex);
@@ -365,41 +481,73 @@ void nf_conntrack_l4proto_unregister(struct nf_conntrack_l4proto *l4proto)
                         ) != l4proto);
         rcu_assign_pointer(nf_ct_protos[l4proto->l3proto][l4proto->l4proto],
                            &nf_conntrack_l4proto_generic);
-        nf_ct_l4proto_unregister_sysctl(l4proto);
         mutex_unlock(&nf_ct_proto_mutex);
 
         synchronize_rcu();
+}
+
+void nf_conntrack_l4proto_unregister(struct net *net,
+                                     struct nf_conntrack_l4proto *l4proto)
+{
+        struct nf_proto_net *pn = NULL;
+
+        if (net == &init_net)
+                nf_conntrack_l4proto_unregister_net(l4proto);
+
+        pn = nf_ct_l4proto_net(net, l4proto);
+        if (pn == NULL)
+                return;
+
+        pn->users--;
+        nf_ct_l4proto_unregister_sysctl(net, pn, l4proto);
 
         /* Remove all contrack entries for this protocol */
         rtnl_lock();
-        for_each_net(net)
-                nf_ct_iterate_cleanup(net, kill_l4proto, l4proto);
+        nf_ct_iterate_cleanup(net, kill_l4proto, l4proto);
         rtnl_unlock();
 }
 EXPORT_SYMBOL_GPL(nf_conntrack_l4proto_unregister);
 
-int nf_conntrack_proto_init(void)
+int nf_conntrack_proto_init(struct net *net)
 {
         unsigned int i;
         int err;
+        struct nf_proto_net *pn = nf_ct_l4proto_net(net,
+                                        &nf_conntrack_l4proto_generic);
 
-        err = nf_ct_l4proto_register_sysctl(&nf_conntrack_l4proto_generic);
+        err = nf_conntrack_l4proto_generic.init_net(net,
+                                        nf_conntrack_l4proto_generic.l3proto);
+        if (err < 0)
+                return err;
+        err = nf_ct_l4proto_register_sysctl(net,
+                                            pn,
+                                            &nf_conntrack_l4proto_generic);
         if (err < 0)
                 return err;
 
-        for (i = 0; i < AF_MAX; i++)
-                rcu_assign_pointer(nf_ct_l3protos[i],
-                                   &nf_conntrack_l3proto_generic);
+        if (net == &init_net) {
+                for (i = 0; i < AF_MAX; i++)
+                        rcu_assign_pointer(nf_ct_l3protos[i],
+                                           &nf_conntrack_l3proto_generic);
+        }
+
+        pn->users++;
         return 0;
 }
 
-void nf_conntrack_proto_fini(void)
+void nf_conntrack_proto_fini(struct net *net)
 {
         unsigned int i;
-
-        nf_ct_l4proto_unregister_sysctl(&nf_conntrack_l4proto_generic);
-
-        /* free l3proto protocol tables */
-        for (i = 0; i < PF_MAX; i++)
-                kfree(nf_ct_protos[i]);
+        struct nf_proto_net *pn = nf_ct_l4proto_net(net,
+                                        &nf_conntrack_l4proto_generic);
+
+        pn->users--;
+        nf_ct_l4proto_unregister_sysctl(net,
+                                        pn,
+                                        &nf_conntrack_l4proto_generic);
+        if (net == &init_net) {
+                /* free l3proto protocol tables */
+                for (i = 0; i < PF_MAX; i++)
+                        kfree(nf_ct_protos[i]);
+        }
 }
diff --git a/net/netfilter/nf_conntrack_proto_dccp.c b/net/netfilter/nf_conntrack_proto_dccp.c
index ef706a485be..6535326cf07 100644
--- a/net/netfilter/nf_conntrack_proto_dccp.c
+++ b/net/netfilter/nf_conntrack_proto_dccp.c
@@ -387,12 +387,9 @@ dccp_state_table[CT_DCCP_ROLE_MAX + 1][DCCP_PKT_SYNCACK + 1][CT_DCCP_MAX + 1] =
 /* this module per-net specifics */
 static int dccp_net_id __read_mostly;
 struct dccp_net {
+        struct nf_proto_net pn;
         int dccp_loose;
         unsigned int dccp_timeout[CT_DCCP_MAX + 1];
-#ifdef CONFIG_SYSCTL
-        struct ctl_table_header *sysctl_header;
-        struct ctl_table *sysctl_table;
-#endif
 };
 
 static inline struct dccp_net *dccp_pernet(struct net *net)
@@ -715,9 +712,10 @@ static int dccp_nlattr_size(void)
 #include <linux/netfilter/nfnetlink.h>
 #include <linux/netfilter/nfnetlink_cttimeout.h>
 
-static int dccp_timeout_nlattr_to_obj(struct nlattr *tb[], void *data)
+static int dccp_timeout_nlattr_to_obj(struct nlattr *tb[],
+                                      struct net *net, void *data)
 {
-        struct dccp_net *dn = dccp_pernet(&init_net);
+        struct dccp_net *dn = dccp_pernet(net);
         unsigned int *timeouts = data;
         int i;
 
@@ -817,6 +815,51 @@ static struct ctl_table dccp_sysctl_table[] = {
 };
 #endif /* CONFIG_SYSCTL */
 
+static int dccp_kmemdup_sysctl_table(struct nf_proto_net *pn,
+                                     struct dccp_net *dn)
+{
+#ifdef CONFIG_SYSCTL
+        if (pn->ctl_table)
+                return 0;
+
+        pn->ctl_table = kmemdup(dccp_sysctl_table,
+                                sizeof(dccp_sysctl_table),
+                                GFP_KERNEL);
+        if (!pn->ctl_table)
+                return -ENOMEM;
+
+        pn->ctl_table[0].data = &dn->dccp_timeout[CT_DCCP_REQUEST];
+        pn->ctl_table[1].data = &dn->dccp_timeout[CT_DCCP_RESPOND];
+        pn->ctl_table[2].data = &dn->dccp_timeout[CT_DCCP_PARTOPEN];
+        pn->ctl_table[3].data = &dn->dccp_timeout[CT_DCCP_OPEN];
+        pn->ctl_table[4].data = &dn->dccp_timeout[CT_DCCP_CLOSEREQ];
+        pn->ctl_table[5].data = &dn->dccp_timeout[CT_DCCP_CLOSING];
+        pn->ctl_table[6].data = &dn->dccp_timeout[CT_DCCP_TIMEWAIT];
+        pn->ctl_table[7].data = &dn->dccp_loose;
+#endif
+        return 0;
+}
+
+static int dccp_init_net(struct net *net, u_int16_t proto)
+{
+        struct dccp_net *dn = dccp_pernet(net);
+        struct nf_proto_net *pn = &dn->pn;
+
+        if (!pn->users) {
+                /* default values */
+                dn->dccp_loose = 1;
+                dn->dccp_timeout[CT_DCCP_REQUEST]       = 2 * DCCP_MSL;
+                dn->dccp_timeout[CT_DCCP_RESPOND]       = 4 * DCCP_MSL;
+                dn->dccp_timeout[CT_DCCP_PARTOPEN]      = 4 * DCCP_MSL;
+                dn->dccp_timeout[CT_DCCP_OPEN]          = 12 * 3600 * HZ;
+                dn->dccp_timeout[CT_DCCP_CLOSEREQ]      = 64 * HZ;
+                dn->dccp_timeout[CT_DCCP_CLOSING]       = 64 * HZ;
+                dn->dccp_timeout[CT_DCCP_TIMEWAIT]      = 2 * DCCP_MSL;
+        }
+
+        return dccp_kmemdup_sysctl_table(pn, dn);
+}
+
 static struct nf_conntrack_l4proto dccp_proto4 __read_mostly = {
         .l3proto                = AF_INET,
         .l4proto                = IPPROTO_DCCP,
@@ -847,6 +890,8 @@ static struct nf_conntrack_l4proto dccp_proto4 __read_mostly = {
                 .nla_policy     = dccp_timeout_nla_policy,
         },
 #endif /* CONFIG_NF_CT_NETLINK_TIMEOUT */
+        .net_id                 = &dccp_net_id,
+        .init_net               = dccp_init_net,
 };
 
 static struct nf_conntrack_l4proto dccp_proto6 __read_mostly = {
@@ -879,55 +924,39 @@ static struct nf_conntrack_l4proto dccp_proto6 __read_mostly = {
                 .nla_policy     = dccp_timeout_nla_policy,
         },
 #endif /* CONFIG_NF_CT_NETLINK_TIMEOUT */
+        .net_id                 = &dccp_net_id,
+        .init_net               = dccp_init_net,
 };
 
 static __net_init int dccp_net_init(struct net *net)
 {
-        struct dccp_net *dn = dccp_pernet(net);
-
-        /* default values */
-        dn->dccp_loose = 1;
-        dn->dccp_timeout[CT_DCCP_REQUEST]       = 2 * DCCP_MSL;
-        dn->dccp_timeout[CT_DCCP_RESPOND]       = 4 * DCCP_MSL;
-        dn->dccp_timeout[CT_DCCP_PARTOPEN]      = 4 * DCCP_MSL;
-        dn->dccp_timeout[CT_DCCP_OPEN]          = 12 * 3600 * HZ;
-        dn->dccp_timeout[CT_DCCP_CLOSEREQ]      = 64 * HZ;
-        dn->dccp_timeout[CT_DCCP_CLOSING]       = 64 * HZ;
-        dn->dccp_timeout[CT_DCCP_TIMEWAIT]      = 2 * DCCP_MSL;
-
-#ifdef CONFIG_SYSCTL
-        dn->sysctl_table = kmemdup(dccp_sysctl_table,
-                        sizeof(dccp_sysctl_table), GFP_KERNEL);
-        if (!dn->sysctl_table)
-                return -ENOMEM;
-
-        dn->sysctl_table[0].data = &dn->dccp_timeout[CT_DCCP_REQUEST];
-        dn->sysctl_table[1].data = &dn->dccp_timeout[CT_DCCP_RESPOND];
-        dn->sysctl_table[2].data = &dn->dccp_timeout[CT_DCCP_PARTOPEN];
-        dn->sysctl_table[3].data = &dn->dccp_timeout[CT_DCCP_OPEN];
-        dn->sysctl_table[4].data = &dn->dccp_timeout[CT_DCCP_CLOSEREQ];
-        dn->sysctl_table[5].data = &dn->dccp_timeout[CT_DCCP_CLOSING];
-        dn->sysctl_table[6].data = &dn->dccp_timeout[CT_DCCP_TIMEWAIT];
-        dn->sysctl_table[7].data = &dn->dccp_loose;
-
-        dn->sysctl_header = register_net_sysctl(net, "net/netfilter",
-                                                dn->sysctl_table);
-        if (!dn->sysctl_header) {
-                kfree(dn->sysctl_table);
-                return -ENOMEM;
+        int ret = 0;
+        ret = nf_conntrack_l4proto_register(net,
+                                            &dccp_proto4);
+        if (ret < 0) {
+                pr_err("nf_conntrack_l4proto_dccp4 :protocol register failed.\n");
+                goto out;
+        }
+        ret = nf_conntrack_l4proto_register(net,
+                                            &dccp_proto6);
+        if (ret < 0) {
+                pr_err("nf_conntrack_l4proto_dccp6 :protocol register failed.\n");
+                goto cleanup_dccp4;
         }
-#endif
-
         return 0;
+cleanup_dccp4:
+        nf_conntrack_l4proto_unregister(net,
+                                        &dccp_proto4);
+out:
+        return ret;
 }
 
 static __net_exit void dccp_net_exit(struct net *net)
 {
-        struct dccp_net *dn = dccp_pernet(net);
-#ifdef CONFIG_SYSCTL
-        unregister_net_sysctl_table(dn->sysctl_header);
-        kfree(dn->sysctl_table);
-#endif
+        nf_conntrack_l4proto_unregister(net,
+                                        &dccp_proto6);
+        nf_conntrack_l4proto_unregister(net,
+                                        &dccp_proto4);
 }
 
 static struct pernet_operations dccp_net_ops = {
@@ -939,34 +968,12 @@ static struct pernet_operations dccp_net_ops = {
 
 static int __init nf_conntrack_proto_dccp_init(void)
 {
-        int err;
-
-        err = register_pernet_subsys(&dccp_net_ops);
-        if (err < 0)
-                goto err1;
-
-        err = nf_conntrack_l4proto_register(&dccp_proto4);
-        if (err < 0)
-                goto err2;
-
-        err = nf_conntrack_l4proto_register(&dccp_proto6);
-        if (err < 0)
-                goto err3;
-        return 0;
-
-err3:
-        nf_conntrack_l4proto_unregister(&dccp_proto4);
-err2:
-        unregister_pernet_subsys(&dccp_net_ops);
-err1:
-        return err;
+        return register_pernet_subsys(&dccp_net_ops);
 }
 
 static void __exit nf_conntrack_proto_dccp_fini(void)
 {
         unregister_pernet_subsys(&dccp_net_ops);
-        nf_conntrack_l4proto_unregister(&dccp_proto6);
-        nf_conntrack_l4proto_unregister(&dccp_proto4);
 }
 
 module_init(nf_conntrack_proto_dccp_init);
diff --git a/net/netfilter/nf_conntrack_proto_generic.c b/net/netfilter/nf_conntrack_proto_generic.c
index d8923d54b35..d25f2937764 100644
--- a/net/netfilter/nf_conntrack_proto_generic.c
+++ b/net/netfilter/nf_conntrack_proto_generic.c
@@ -14,6 +14,11 @@
 
 static unsigned int nf_ct_generic_timeout __read_mostly = 600*HZ;
 
+static inline struct nf_generic_net *generic_pernet(struct net *net)
+{
+        return &net->ct.nf_ct_proto.generic;
+}
+
 static bool generic_pkt_to_tuple(const struct sk_buff *skb,
                                  unsigned int dataoff,
                                  struct nf_conntrack_tuple *tuple)
@@ -42,7 +47,7 @@ static int generic_print_tuple(struct seq_file *s,
 
 static unsigned int *generic_get_timeouts(struct net *net)
 {
-        return &nf_ct_generic_timeout;
+        return &(generic_pernet(net)->timeout);
 }
 
 /* Returns verdict for packet, or -1 for invalid. */
@@ -70,16 +75,18 @@ static bool generic_new(struct nf_conn *ct, const struct sk_buff *skb,
 #include <linux/netfilter/nfnetlink.h>
 #include <linux/netfilter/nfnetlink_cttimeout.h>
 
-static int generic_timeout_nlattr_to_obj(struct nlattr *tb[], void *data)
+static int generic_timeout_nlattr_to_obj(struct nlattr *tb[],
+                                         struct net *net, void *data)
 {
         unsigned int *timeout = data;
+        struct nf_generic_net *gn = generic_pernet(net);
 
         if (tb[CTA_TIMEOUT_GENERIC_TIMEOUT])
                 *timeout =
                     ntohl(nla_get_be32(tb[CTA_TIMEOUT_GENERIC_TIMEOUT])) * HZ;
         else {
                 /* Set default generic timeout. */
-                *timeout = nf_ct_generic_timeout;
+                *timeout = gn->timeout;
         }
 
         return 0;
@@ -106,11 +113,9 @@ generic_timeout_nla_policy[CTA_TIMEOUT_GENERIC_MAX+1] = {
 #endif /* CONFIG_NF_CT_NETLINK_TIMEOUT */
 
 #ifdef CONFIG_SYSCTL
-static struct ctl_table_header *generic_sysctl_header;
 static struct ctl_table generic_sysctl_table[] = {
         {
                 .procname       = "nf_conntrack_generic_timeout",
-                .data           = &nf_ct_generic_timeout,
                 .maxlen         = sizeof(unsigned int),
                 .mode           = 0644,
                 .proc_handler   = proc_dointvec_jiffies,
@@ -121,7 +126,6 @@ static struct ctl_table generic_sysctl_table[] = {
 static struct ctl_table generic_compat_sysctl_table[] = {
         {
                 .procname       = "ip_conntrack_generic_timeout",
-                .data           = &nf_ct_generic_timeout,
                 .maxlen         = sizeof(unsigned int),
                 .mode           = 0644,
                 .proc_handler   = proc_dointvec_jiffies,
@@ -131,6 +135,62 @@ static struct ctl_table generic_compat_sysctl_table[] = {
 #endif /* CONFIG_NF_CONNTRACK_PROC_COMPAT */
 #endif /* CONFIG_SYSCTL */
 
+static int generic_kmemdup_sysctl_table(struct nf_proto_net *pn,
+                                        struct nf_generic_net *gn)
+{
+#ifdef CONFIG_SYSCTL
+        pn->ctl_table = kmemdup(generic_sysctl_table,
+                                sizeof(generic_sysctl_table),
+                                GFP_KERNEL);
+        if (!pn->ctl_table)
+                return -ENOMEM;
+
+        pn->ctl_table[0].data = &gn->timeout;
+#endif
+        return 0;
+}
+
+static int generic_kmemdup_compat_sysctl_table(struct nf_proto_net *pn,
+                                               struct nf_generic_net *gn)
+{
+#ifdef CONFIG_SYSCTL
+#ifdef CONFIG_NF_CONNTRACK_PROC_COMPAT
+        pn->ctl_compat_table = kmemdup(generic_compat_sysctl_table,
+                                       sizeof(generic_compat_sysctl_table),
+                                       GFP_KERNEL);
+        if (!pn->ctl_compat_table)
+                return -ENOMEM;
+
+        pn->ctl_compat_table[0].data = &gn->timeout;
+#endif
+#endif
+        return 0;
+}
+
+static int generic_init_net(struct net *net, u_int16_t proto)
+{
+        int ret;
+        struct nf_generic_net *gn = generic_pernet(net);
+        struct nf_proto_net *pn = &gn->pn;
+
+        gn->timeout = nf_ct_generic_timeout;
+
+        ret = generic_kmemdup_compat_sysctl_table(pn, gn);
+        if (ret < 0)
+                return ret;
+
+        ret = generic_kmemdup_sysctl_table(pn, gn);
+        if (ret < 0)
+                nf_ct_kfree_compat_sysctl_table(pn);
+
+        return ret;
+}
+
+static struct nf_proto_net *generic_get_net_proto(struct net *net)
+{
+        return &net->ct.nf_ct_proto.generic.pn;
+}
+
 struct nf_conntrack_l4proto nf_conntrack_l4proto_generic __read_mostly =
 {
         .l3proto                = PF_UNSPEC,
@@ -151,11 +211,6 @@ struct nf_conntrack_l4proto nf_conntrack_l4proto_generic __read_mostly =
                 .nla_policy     = generic_timeout_nla_policy,
         },
 #endif /* CONFIG_NF_CT_NETLINK_TIMEOUT */
-#ifdef CONFIG_SYSCTL
-        .ctl_table_header       = &generic_sysctl_header,
-        .ctl_table              = generic_sysctl_table,
-#ifdef CONFIG_NF_CONNTRACK_PROC_COMPAT
-        .ctl_compat_table       = generic_compat_sysctl_table,
-#endif
-#endif
+        .init_net               = generic_init_net,
+        .get_net_proto          = generic_get_net_proto,
 };
diff --git a/net/netfilter/nf_conntrack_proto_gre.c b/net/netfilter/nf_conntrack_proto_gre.c
index 4bf6b4e4b77..b09b7af7f6f 100644
--- a/net/netfilter/nf_conntrack_proto_gre.c
+++ b/net/netfilter/nf_conntrack_proto_gre.c
@@ -54,13 +54,20 @@ static unsigned int gre_timeouts[GRE_CT_MAX] = {
 
 static int proto_gre_net_id __read_mostly;
 struct netns_proto_gre {
+        struct nf_proto_net     nf;
         rwlock_t                keymap_lock;
         struct list_head        keymap_list;
+        unsigned int            gre_timeouts[GRE_CT_MAX];
 };
 
+static inline struct netns_proto_gre *gre_pernet(struct net *net)
+{
+        return net_generic(net, proto_gre_net_id);
+}
+
 void nf_ct_gre_keymap_flush(struct net *net)
 {
-        struct netns_proto_gre *net_gre = net_generic(net, proto_gre_net_id);
+        struct netns_proto_gre *net_gre = gre_pernet(net);
         struct nf_ct_gre_keymap *km, *tmp;
 
         write_lock_bh(&net_gre->keymap_lock);
@@ -85,7 +92,7 @@ static inline int gre_key_cmpfn(const struct nf_ct_gre_keymap *km,
 /* look up the source key for a given tuple */
 static __be16 gre_keymap_lookup(struct net *net, struct nf_conntrack_tuple *t)
 {
-        struct netns_proto_gre *net_gre = net_generic(net, proto_gre_net_id);
+        struct netns_proto_gre *net_gre = gre_pernet(net);
         struct nf_ct_gre_keymap *km;
         __be16 key = 0;
 
@@ -109,11 +116,11 @@ int nf_ct_gre_keymap_add(struct nf_conn *ct, enum ip_conntrack_dir dir,
                          struct nf_conntrack_tuple *t)
 {
         struct net *net = nf_ct_net(ct);
-        struct netns_proto_gre *net_gre = net_generic(net, proto_gre_net_id);
-        struct nf_conn_help *help = nfct_help(ct);
+        struct netns_proto_gre *net_gre = gre_pernet(net);
+        struct nf_ct_pptp_master *ct_pptp_info = nfct_help_data(ct);
         struct nf_ct_gre_keymap **kmp, *km;
 
-        kmp = &help->help.ct_pptp_info.keymap[dir];
+        kmp = &ct_pptp_info->keymap[dir];
         if (*kmp) {
                 /* check whether it's a retransmission */
                 read_lock_bh(&net_gre->keymap_lock);
@@ -150,20 +157,20 @@ EXPORT_SYMBOL_GPL(nf_ct_gre_keymap_add);
 void nf_ct_gre_keymap_destroy(struct nf_conn *ct)
 {
         struct net *net = nf_ct_net(ct);
-        struct netns_proto_gre *net_gre = net_generic(net, proto_gre_net_id);
-        struct nf_conn_help *help = nfct_help(ct);
+        struct netns_proto_gre *net_gre = gre_pernet(net);
+        struct nf_ct_pptp_master *ct_pptp_info = nfct_help_data(ct);
         enum ip_conntrack_dir dir;
 
         pr_debug("entering for ct %p\n", ct);
 
         write_lock_bh(&net_gre->keymap_lock);
         for (dir = IP_CT_DIR_ORIGINAL; dir < IP_CT_DIR_MAX; dir++) {
-                if (help->help.ct_pptp_info.keymap[dir]) {
+                if (ct_pptp_info->keymap[dir]) {
                         pr_debug("removing %p from list\n",
-                                 help->help.ct_pptp_info.keymap[dir]);
-                        list_del(&help->help.ct_pptp_info.keymap[dir]->list);
-                        kfree(help->help.ct_pptp_info.keymap[dir]);
-                        help->help.ct_pptp_info.keymap[dir] = NULL;
+                                 ct_pptp_info->keymap[dir]);
+                        list_del(&ct_pptp_info->keymap[dir]->list);
+                        kfree(ct_pptp_info->keymap[dir]);
+                        ct_pptp_info->keymap[dir] = NULL;
                 }
         }
         write_unlock_bh(&net_gre->keymap_lock);
@@ -237,7 +244,7 @@ static int gre_print_conntrack(struct seq_file *s, struct nf_conn *ct)
 
 static unsigned int *gre_get_timeouts(struct net *net)
 {
-        return gre_timeouts;
+        return gre_pernet(net)->gre_timeouts;
 }
 
 /* Returns verdict for packet, and may modify conntrack */
@@ -297,13 +304,15 @@ static void gre_destroy(struct nf_conn *ct)
 #include <linux/netfilter/nfnetlink.h>
 #include <linux/netfilter/nfnetlink_cttimeout.h>
 
-static int gre_timeout_nlattr_to_obj(struct nlattr *tb[], void *data)
+static int gre_timeout_nlattr_to_obj(struct nlattr *tb[],
+                                     struct net *net, void *data)
 {
         unsigned int *timeouts = data;
+        struct netns_proto_gre *net_gre = gre_pernet(net);
 
         /* set default timeouts for GRE. */
-        timeouts[GRE_CT_UNREPLIED] = gre_timeouts[GRE_CT_UNREPLIED];
-        timeouts[GRE_CT_REPLIED] = gre_timeouts[GRE_CT_REPLIED];
+        timeouts[GRE_CT_UNREPLIED] = net_gre->gre_timeouts[GRE_CT_UNREPLIED];
+        timeouts[GRE_CT_REPLIED] = net_gre->gre_timeouts[GRE_CT_REPLIED];
 
         if (tb[CTA_TIMEOUT_GRE_UNREPLIED]) {
                 timeouts[GRE_CT_UNREPLIED] =
@@ -339,6 +348,19 @@ gre_timeout_nla_policy[CTA_TIMEOUT_GRE_MAX+1] = {
 };
 #endif /* CONFIG_NF_CT_NETLINK_TIMEOUT */
 
+static int gre_init_net(struct net *net, u_int16_t proto)
+{
+        struct netns_proto_gre *net_gre = gre_pernet(net);
+        int i;
+
+        rwlock_init(&net_gre->keymap_lock);
+        INIT_LIST_HEAD(&net_gre->keymap_list);
+        for (i = 0; i < GRE_CT_MAX; i++)
+                net_gre->gre_timeouts[i] = gre_timeouts[i];
+
+        return 0;
+}
+
 /* protocol helper struct */
 static struct nf_conntrack_l4proto nf_conntrack_l4proto_gre4 __read_mostly = {
         .l3proto         = AF_INET,
@@ -368,20 +390,22 @@ static struct nf_conntrack_l4proto nf_conntrack_l4proto_gre4 __read_mostly = {
                 .nla_policy     = gre_timeout_nla_policy,
         },
 #endif /* CONFIG_NF_CT_NETLINK_TIMEOUT */
+        .net_id         = &proto_gre_net_id,
+        .init_net       = gre_init_net,
 };
 
 static int proto_gre_net_init(struct net *net)
 {
-        struct netns_proto_gre *net_gre = net_generic(net, proto_gre_net_id);
-
-        rwlock_init(&net_gre->keymap_lock);
-        INIT_LIST_HEAD(&net_gre->keymap_list);
-
-        return 0;
+        int ret = 0;
+        ret = nf_conntrack_l4proto_register(net, &nf_conntrack_l4proto_gre4);
+        if (ret < 0)
+                pr_err("nf_conntrack_l4proto_gre4 :protocol register failed.\n");
+        return ret;
 }
 
 static void proto_gre_net_exit(struct net *net)
 {
+        nf_conntrack_l4proto_unregister(net, &nf_conntrack_l4proto_gre4);
         nf_ct_gre_keymap_flush(net);
 }
 
@@ -394,20 +418,11 @@ static struct pernet_operations proto_gre_net_ops = {
 
 static int __init nf_ct_proto_gre_init(void)
 {
-        int rv;
-
-        rv = nf_conntrack_l4proto_register(&nf_conntrack_l4proto_gre4);
-        if (rv < 0)
-                return rv;
-        rv = register_pernet_subsys(&proto_gre_net_ops);
-        if (rv < 0)
-                nf_conntrack_l4proto_unregister(&nf_conntrack_l4proto_gre4);
-        return rv;
+        return register_pernet_subsys(&proto_gre_net_ops);
 }
 
 static void __exit nf_ct_proto_gre_fini(void)
 {
-        nf_conntrack_l4proto_unregister(&nf_conntrack_l4proto_gre4);
         unregister_pernet_subsys(&proto_gre_net_ops);
 }
 
diff --git a/net/netfilter/nf_conntrack_proto_sctp.c b/net/netfilter/nf_conntrack_proto_sctp.c
index 996db2fa21f..c746d61f83e 100644
--- a/net/netfilter/nf_conntrack_proto_sctp.c
+++ b/net/netfilter/nf_conntrack_proto_sctp.c
@@ -127,6 +127,17 @@ static const u8 sctp_conntracks[2][9][SCTP_CONNTRACK_MAX] = {
         }
 };
 
+static int sctp_net_id  __read_mostly;
+struct sctp_net {
+        struct nf_proto_net pn;
+        unsigned int timeouts[SCTP_CONNTRACK_MAX];
+};
+
+static inline struct sctp_net *sctp_pernet(struct net *net)
+{
+        return net_generic(net, sctp_net_id);
+}
+
 static bool sctp_pkt_to_tuple(const struct sk_buff *skb, unsigned int dataoff,
                               struct nf_conntrack_tuple *tuple)
 {
@@ -281,7 +292,7 @@ static int sctp_new_state(enum ip_conntrack_dir dir,
 
 static unsigned int *sctp_get_timeouts(struct net *net)
 {
-        return sctp_timeouts;
+        return sctp_pernet(net)->timeouts;
 }
 
 /* Returns verdict for packet, or -NF_ACCEPT for invalid. */
@@ -551,14 +562,16 @@ static int sctp_nlattr_size(void)
 #include <linux/netfilter/nfnetlink.h>
 #include <linux/netfilter/nfnetlink_cttimeout.h>
 
-static int sctp_timeout_nlattr_to_obj(struct nlattr *tb[], void *data)
+static int sctp_timeout_nlattr_to_obj(struct nlattr *tb[],
+                                      struct net *net, void *data)
 {
         unsigned int *timeouts = data;
+        struct sctp_net *sn = sctp_pernet(net);
         int i;
 
         /* set default SCTP timeouts. */
         for (i=0; i<SCTP_CONNTRACK_MAX; i++)
-                timeouts[i] = sctp_timeouts[i];
+                timeouts[i] = sn->timeouts[i];
 
         /* there's a 1:1 mapping between attributes and protocol states. */
         for (i=CTA_TIMEOUT_SCTP_UNSPEC+1; i<CTA_TIMEOUT_SCTP_MAX+1; i++) {
@@ -599,54 +612,45 @@ sctp_timeout_nla_policy[CTA_TIMEOUT_SCTP_MAX+1] = {
 
 
 #ifdef CONFIG_SYSCTL
-static unsigned int sctp_sysctl_table_users;
-static struct ctl_table_header *sctp_sysctl_header;
 static struct ctl_table sctp_sysctl_table[] = {
         {
                 .procname       = "nf_conntrack_sctp_timeout_closed",
-                .data           = &sctp_timeouts[SCTP_CONNTRACK_CLOSED],
                 .maxlen         = sizeof(unsigned int),
                 .mode           = 0644,
                 .proc_handler   = proc_dointvec_jiffies,
         },
         {
                 .procname       = "nf_conntrack_sctp_timeout_cookie_wait",
-                .data           = &sctp_timeouts[SCTP_CONNTRACK_COOKIE_WAIT],
                 .maxlen         = sizeof(unsigned int),
                 .mode           = 0644,
                 .proc_handler   = proc_dointvec_jiffies,
         },
         {
                 .procname       = "nf_conntrack_sctp_timeout_cookie_echoed",
-                .data           = &sctp_timeouts[SCTP_CONNTRACK_COOKIE_ECHOED],
                 .maxlen         = sizeof(unsigned int),
                 .mode           = 0644,
                 .proc_handler   = proc_dointvec_jiffies,
         },
         {
                 .procname       = "nf_conntrack_sctp_timeout_established",
-                .data           = &sctp_timeouts[SCTP_CONNTRACK_ESTABLISHED],
                 .maxlen         = sizeof(unsigned int),
                 .mode           = 0644,
                 .proc_handler   = proc_dointvec_jiffies,
         },
         {
                 .procname       = "nf_conntrack_sctp_timeout_shutdown_sent",
-                .data           = &sctp_timeouts[SCTP_CONNTRACK_SHUTDOWN_SENT],
                 .maxlen         = sizeof(unsigned int),
                 .mode           = 0644,
                 .proc_handler   = proc_dointvec_jiffies,
         },
         {
                 .procname       = "nf_conntrack_sctp_timeout_shutdown_recd",
-                .data           = &sctp_timeouts[SCTP_CONNTRACK_SHUTDOWN_RECD],
                 .maxlen         = sizeof(unsigned int),
                 .mode           = 0644,
                 .proc_handler   = proc_dointvec_jiffies,
         },
         {
                 .procname       = "nf_conntrack_sctp_timeout_shutdown_ack_sent",
-                .data           = &sctp_timeouts[SCTP_CONNTRACK_SHUTDOWN_ACK_SENT],
                 .maxlen         = sizeof(unsigned int),
                 .mode           = 0644,
                 .proc_handler   = proc_dointvec_jiffies,
@@ -658,49 +662,42 @@ static struct ctl_table sctp_sysctl_table[] = {
 static struct ctl_table sctp_compat_sysctl_table[] = {
         {
                 .procname       = "ip_conntrack_sctp_timeout_closed",
-                .data           = &sctp_timeouts[SCTP_CONNTRACK_CLOSED],
                 .maxlen         = sizeof(unsigned int),
                 .mode           = 0644,
                 .proc_handler   = proc_dointvec_jiffies,
         },
         {
                 .procname       = "ip_conntrack_sctp_timeout_cookie_wait",
-                .data           = &sctp_timeouts[SCTP_CONNTRACK_COOKIE_WAIT],
                 .maxlen         = sizeof(unsigned int),
                 .mode           = 0644,
                 .proc_handler   = proc_dointvec_jiffies,
         },
         {
                 .procname       = "ip_conntrack_sctp_timeout_cookie_echoed",
-                .data           = &sctp_timeouts[SCTP_CONNTRACK_COOKIE_ECHOED],
                 .maxlen         = sizeof(unsigned int),
                 .mode           = 0644,
                 .proc_handler   = proc_dointvec_jiffies,
         },
         {
                 .procname       = "ip_conntrack_sctp_timeout_established",
-                .data           = &sctp_timeouts[SCTP_CONNTRACK_ESTABLISHED],
                 .maxlen         = sizeof(unsigned int),
                 .mode           = 0644,
                 .proc_handler   = proc_dointvec_jiffies,
         },
         {
                 .procname       = "ip_conntrack_sctp_timeout_shutdown_sent",
-                .data           = &sctp_timeouts[SCTP_CONNTRACK_SHUTDOWN_SENT],
                 .maxlen         = sizeof(unsigned int),
                 .mode           = 0644,
                 .proc_handler   = proc_dointvec_jiffies,
         },
         {
                 .procname       = "ip_conntrack_sctp_timeout_shutdown_recd",
-                .data           = &sctp_timeouts[SCTP_CONNTRACK_SHUTDOWN_RECD],
                 .maxlen         = sizeof(unsigned int),
                 .mode           = 0644,
                 .proc_handler   = proc_dointvec_jiffies,
         },
         {
                 .procname       = "ip_conntrack_sctp_timeout_shutdown_ack_sent",
-                .data           = &sctp_timeouts[SCTP_CONNTRACK_SHUTDOWN_ACK_SENT],
                 .maxlen         = sizeof(unsigned int),
                 .mode           = 0644,
                 .proc_handler   = proc_dointvec_jiffies,
@@ -710,6 +707,80 @@ static struct ctl_table sctp_compat_sysctl_table[] = {
 #endif /* CONFIG_NF_CONNTRACK_PROC_COMPAT */
 #endif
 
+static int sctp_kmemdup_sysctl_table(struct nf_proto_net *pn,
+                                     struct sctp_net *sn)
+{
+#ifdef CONFIG_SYSCTL
+        if (pn->ctl_table)
+                return 0;
+
+        pn->ctl_table = kmemdup(sctp_sysctl_table,
+                                sizeof(sctp_sysctl_table),
+                                GFP_KERNEL);
+        if (!pn->ctl_table)
+                return -ENOMEM;
+
+        pn->ctl_table[0].data = &sn->timeouts[SCTP_CONNTRACK_CLOSED];
+        pn->ctl_table[1].data = &sn->timeouts[SCTP_CONNTRACK_COOKIE_WAIT];
+        pn->ctl_table[2].data = &sn->timeouts[SCTP_CONNTRACK_COOKIE_ECHOED];
+        pn->ctl_table[3].data = &sn->timeouts[SCTP_CONNTRACK_ESTABLISHED];
+        pn->ctl_table[4].data = &sn->timeouts[SCTP_CONNTRACK_SHUTDOWN_SENT];
+        pn->ctl_table[5].data = &sn->timeouts[SCTP_CONNTRACK_SHUTDOWN_RECD];
+        pn->ctl_table[6].data = &sn->timeouts[SCTP_CONNTRACK_SHUTDOWN_ACK_SENT];
+#endif
+        return 0;
+}
+
+static int sctp_kmemdup_compat_sysctl_table(struct nf_proto_net *pn,
+                                            struct sctp_net *sn)
+{
+#ifdef CONFIG_SYSCTL
+#ifdef CONFIG_NF_CONNTRACK_PROC_COMPAT
+        pn->ctl_compat_table = kmemdup(sctp_compat_sysctl_table,
+                                       sizeof(sctp_compat_sysctl_table),
+                                       GFP_KERNEL);
+        if (!pn->ctl_compat_table)
+                return -ENOMEM;
+
+        pn->ctl_compat_table[0].data = &sn->timeouts[SCTP_CONNTRACK_CLOSED];
+        pn->ctl_compat_table[1].data = &sn->timeouts[SCTP_CONNTRACK_COOKIE_WAIT];
+        pn->ctl_compat_table[2].data = &sn->timeouts[SCTP_CONNTRACK_COOKIE_ECHOED];
+        pn->ctl_compat_table[3].data = &sn->timeouts[SCTP_CONNTRACK_ESTABLISHED];
+        pn->ctl_compat_table[4].data = &sn->timeouts[SCTP_CONNTRACK_SHUTDOWN_SENT];
+        pn->ctl_compat_table[5].data = &sn->timeouts[SCTP_CONNTRACK_SHUTDOWN_RECD];
+        pn->ctl_compat_table[6].data = &sn->timeouts[SCTP_CONNTRACK_SHUTDOWN_ACK_SENT];
+#endif
+#endif
+        return 0;
+}
+
+static int sctp_init_net(struct net *net, u_int16_t proto)
+{
+        int ret;
+        struct sctp_net *sn = sctp_pernet(net);
+        struct nf_proto_net *pn = &sn->pn;
+
+        if (!pn->users) {
+                int i;
+
+                for (i = 0; i < SCTP_CONNTRACK_MAX; i++)
+                        sn->timeouts[i] = sctp_timeouts[i];
+        }
+
+        if (proto == AF_INET) {
+                ret = sctp_kmemdup_compat_sysctl_table(pn, sn);
+                if (ret < 0)
+                        return ret;
+
+                ret = sctp_kmemdup_sysctl_table(pn, sn);
+                if (ret < 0)
+                        nf_ct_kfree_compat_sysctl_table(pn);
+        } else
+                ret = sctp_kmemdup_sysctl_table(pn, sn);
+
+        return ret;
+}
+
 static struct nf_conntrack_l4proto nf_conntrack_l4proto_sctp4 __read_mostly = {
         .l3proto                = PF_INET,
         .l4proto                = IPPROTO_SCTP,
@@ -740,14 +811,8 @@ static struct nf_conntrack_l4proto nf_conntrack_l4proto_sctp4 __read_mostly = {
                 .nla_policy     = sctp_timeout_nla_policy,
         },
 #endif /* CONFIG_NF_CT_NETLINK_TIMEOUT */
-#ifdef CONFIG_SYSCTL
-        .ctl_table_users        = &sctp_sysctl_table_users,
-        .ctl_table_header       = &sctp_sysctl_header,
-        .ctl_table              = sctp_sysctl_table,
-#ifdef CONFIG_NF_CONNTRACK_PROC_COMPAT
-        .ctl_compat_table       = sctp_compat_sysctl_table,
-#endif
-#endif
+        .net_id                 = &sctp_net_id,
+        .init_net               = sctp_init_net,
 };
 
 static struct nf_conntrack_l4proto nf_conntrack_l4proto_sctp6 __read_mostly = {
@@ -780,40 +845,58 @@ static struct nf_conntrack_l4proto nf_conntrack_l4proto_sctp6 __read_mostly = {
         },
 #endif /* CONFIG_NF_CT_NETLINK_TIMEOUT */
 #endif
-#ifdef CONFIG_SYSCTL
-        .ctl_table_users        = &sctp_sysctl_table_users,
-        .ctl_table_header       = &sctp_sysctl_header,
-        .ctl_table              = sctp_sysctl_table,
-#endif
+        .net_id                 = &sctp_net_id,
+        .init_net               = sctp_init_net,
 };
 
-static int __init nf_conntrack_proto_sctp_init(void)
+static int sctp_net_init(struct net *net)
 {
-        int ret;
+        int ret = 0;
 
-        ret = nf_conntrack_l4proto_register(&nf_conntrack_l4proto_sctp4);
-        if (ret) {
-                pr_err("nf_conntrack_l4proto_sctp4: protocol register failed\n");
+        ret = nf_conntrack_l4proto_register(net,
+                                            &nf_conntrack_l4proto_sctp4);
+        if (ret < 0) {
+                pr_err("nf_conntrack_l4proto_sctp4 :protocol register failed.\n");
                 goto out;
         }
-        ret = nf_conntrack_l4proto_register(&nf_conntrack_l4proto_sctp6);
-        if (ret) {
-                pr_err("nf_conntrack_l4proto_sctp6: protocol register failed\n");
+        ret = nf_conntrack_l4proto_register(net,
+                                            &nf_conntrack_l4proto_sctp6);
+        if (ret < 0) {
+                pr_err("nf_conntrack_l4proto_sctp6 :protocol register failed.\n");
                 goto cleanup_sctp4;
         }
+        return 0;
 
+cleanup_sctp4:
+        nf_conntrack_l4proto_unregister(net,
+                                        &nf_conntrack_l4proto_sctp4);
+out:
         return ret;
+}
 
- cleanup_sctp4:
-        nf_conntrack_l4proto_unregister(&nf_conntrack_l4proto_sctp4);
- out:
-        return ret;
+static void sctp_net_exit(struct net *net)
+{
+        nf_conntrack_l4proto_unregister(net,
+                                        &nf_conntrack_l4proto_sctp6);
+        nf_conntrack_l4proto_unregister(net,
+                                        &nf_conntrack_l4proto_sctp4);
+}
+
+static struct pernet_operations sctp_net_ops = {
+        .init = sctp_net_init,
+        .exit = sctp_net_exit,
+        .id   = &sctp_net_id,
+        .size = sizeof(struct sctp_net),
+};
+
+static int __init nf_conntrack_proto_sctp_init(void)
+{
+        return register_pernet_subsys(&sctp_net_ops);
 }
 
 static void __exit nf_conntrack_proto_sctp_fini(void)
 {
-        nf_conntrack_l4proto_unregister(&nf_conntrack_l4proto_sctp6);
-        nf_conntrack_l4proto_unregister(&nf_conntrack_l4proto_sctp4);
+        unregister_pernet_subsys(&sctp_net_ops);
 }
 
 module_init(nf_conntrack_proto_sctp_init);
diff --git a/net/netfilter/nf_conntrack_proto_tcp.c b/net/netfilter/nf_conntrack_proto_tcp.c
index 21ff1a99f53..a5ac11ebef3 100644
--- a/net/netfilter/nf_conntrack_proto_tcp.c
+++ b/net/netfilter/nf_conntrack_proto_tcp.c
@@ -270,6 +270,11 @@ static const u8 tcp_conntracks[2][6][TCP_CONNTRACK_MAX] = {
         }
 };
 
+static inline struct nf_tcp_net *tcp_pernet(struct net *net)
+{
+        return &net->ct.nf_ct_proto.tcp;
+}
+
 static bool tcp_pkt_to_tuple(const struct sk_buff *skb, unsigned int dataoff,
                              struct nf_conntrack_tuple *tuple)
 {
@@ -516,6 +521,7 @@ static bool tcp_in_window(const struct nf_conn *ct,
                           u_int8_t pf)
 {
         struct net *net = nf_ct_net(ct);
+        struct nf_tcp_net *tn = tcp_pernet(net);
         struct ip_ct_tcp_state *sender = &state->seen[dir];
         struct ip_ct_tcp_state *receiver = &state->seen[!dir];
         const struct nf_conntrack_tuple *tuple = &ct->tuplehash[dir].tuple;
@@ -720,7 +726,7 @@ static bool tcp_in_window(const struct nf_conn *ct,
         } else {
                 res = false;
                 if (sender->flags & IP_CT_TCP_FLAG_BE_LIBERAL ||
-                    nf_ct_tcp_be_liberal)
+                    tn->tcp_be_liberal)
                         res = true;
                 if (!res && LOG_INVALID(net, IPPROTO_TCP))
                         nf_log_packet(pf, 0, skb, NULL, NULL, NULL,
@@ -815,7 +821,7 @@ static int tcp_error(struct net *net, struct nf_conn *tmpl,
 
 static unsigned int *tcp_get_timeouts(struct net *net)
 {
-        return tcp_timeouts;
+        return tcp_pernet(net)->timeouts;
 }
 
 /* Returns verdict for packet, or -1 for invalid. */
@@ -828,6 +834,7 @@ static int tcp_packet(struct nf_conn *ct,
                       unsigned int *timeouts)
 {
         struct net *net = nf_ct_net(ct);
+        struct nf_tcp_net *tn = tcp_pernet(net);
         struct nf_conntrack_tuple *tuple;
         enum tcp_conntrack new_state, old_state;
         enum ip_conntrack_dir dir;
@@ -1020,7 +1027,7 @@ static int tcp_packet(struct nf_conn *ct,
             && new_state == TCP_CONNTRACK_FIN_WAIT)
                 ct->proto.tcp.seen[dir].flags |= IP_CT_TCP_FLAG_CLOSE_INIT;
 
-        if (ct->proto.tcp.retrans >= nf_ct_tcp_max_retrans &&
+        if (ct->proto.tcp.retrans >= tn->tcp_max_retrans &&
             timeouts[new_state] > timeouts[TCP_CONNTRACK_RETRANS])
                 timeout = timeouts[TCP_CONNTRACK_RETRANS];
         else if ((ct->proto.tcp.seen[0].flags | ct->proto.tcp.seen[1].flags) &
@@ -1065,6 +1072,8 @@ static bool tcp_new(struct nf_conn *ct, const struct sk_buff *skb,
         enum tcp_conntrack new_state;
         const struct tcphdr *th;
         struct tcphdr _tcph;
+        struct net *net = nf_ct_net(ct);
+        struct nf_tcp_net *tn = tcp_pernet(net);
         const struct ip_ct_tcp_state *sender = &ct->proto.tcp.seen[0];
         const struct ip_ct_tcp_state *receiver = &ct->proto.tcp.seen[1];
 
@@ -1093,7 +1102,7 @@ static bool tcp_new(struct nf_conn *ct, const struct sk_buff *skb,
                         ct->proto.tcp.seen[0].td_end;
 
                 tcp_options(skb, dataoff, th, &ct->proto.tcp.seen[0]);
-        } else if (nf_ct_tcp_loose == 0) {
+        } else if (tn->tcp_loose == 0) {
                 /* Don't try to pick up connections. */
                 return false;
         } else {
@@ -1251,14 +1260,16 @@ static int tcp_nlattr_tuple_size(void)
 #include <linux/netfilter/nfnetlink.h>
 #include <linux/netfilter/nfnetlink_cttimeout.h>
 
-static int tcp_timeout_nlattr_to_obj(struct nlattr *tb[], void *data)
+static int tcp_timeout_nlattr_to_obj(struct nlattr *tb[],
+                                     struct net *net, void *data)
 {
         unsigned int *timeouts = data;
+        struct nf_tcp_net *tn = tcp_pernet(net);
         int i;
 
         /* set default TCP timeouts. */
         for (i=0; i<TCP_CONNTRACK_TIMEOUT_MAX; i++)
-                timeouts[i] = tcp_timeouts[i];
+                timeouts[i] = tn->timeouts[i];
 
         if (tb[CTA_TIMEOUT_TCP_SYN_SENT]) {
                 timeouts[TCP_CONNTRACK_SYN_SENT] =
@@ -1355,96 +1366,81 @@ static const struct nla_policy tcp_timeout_nla_policy[CTA_TIMEOUT_TCP_MAX+1] = {
 #endif /* CONFIG_NF_CT_NETLINK_TIMEOUT */
 
 #ifdef CONFIG_SYSCTL
-static unsigned int tcp_sysctl_table_users;
-static struct ctl_table_header *tcp_sysctl_header;
 static struct ctl_table tcp_sysctl_table[] = {
         {
                 .procname       = "nf_conntrack_tcp_timeout_syn_sent",
-                .data           = &tcp_timeouts[TCP_CONNTRACK_SYN_SENT],
                 .maxlen         = sizeof(unsigned int),
                 .mode           = 0644,
                 .proc_handler   = proc_dointvec_jiffies,
         },
         {
                 .procname       = "nf_conntrack_tcp_timeout_syn_recv",
-                .data           = &tcp_timeouts[TCP_CONNTRACK_SYN_RECV],
                 .maxlen         = sizeof(unsigned int),
                 .mode           = 0644,
                 .proc_handler   = proc_dointvec_jiffies,
         },
         {
                 .procname       = "nf_conntrack_tcp_timeout_established",
-                .data           = &tcp_timeouts[TCP_CONNTRACK_ESTABLISHED],
                 .maxlen         = sizeof(unsigned int),
                 .mode           = 0644,
                 .proc_handler   = proc_dointvec_jiffies,
         },
         {
                 .procname       = "nf_conntrack_tcp_timeout_fin_wait",
-                .data           = &tcp_timeouts[TCP_CONNTRACK_FIN_WAIT],
                 .maxlen         = sizeof(unsigned int),
                 .mode           = 0644,
                 .proc_handler   = proc_dointvec_jiffies,
         },
         {
                 .procname       = "nf_conntrack_tcp_timeout_close_wait",
-                .data           = &tcp_timeouts[TCP_CONNTRACK_CLOSE_WAIT],
                 .maxlen         = sizeof(unsigned int),
                 .mode           = 0644,
                 .proc_handler   = proc_dointvec_jiffies,
         },
         {
                 .procname       = "nf_conntrack_tcp_timeout_last_ack",
-                .data           = &tcp_timeouts[TCP_CONNTRACK_LAST_ACK],
                 .maxlen         = sizeof(unsigned int),
                 .mode           = 0644,
                 .proc_handler   = proc_dointvec_jiffies,
         },
         {
                 .procname       = "nf_conntrack_tcp_timeout_time_wait",
-                .data           = &tcp_timeouts[TCP_CONNTRACK_TIME_WAIT],
                 .maxlen         = sizeof(unsigned int),
                 .mode           = 0644,
                 .proc_handler   = proc_dointvec_jiffies,
         },
         {
                 .procname       = "nf_conntrack_tcp_timeout_close",
-                .data           = &tcp_timeouts[TCP_CONNTRACK_CLOSE],
                 .maxlen         = sizeof(unsigned int),
                 .mode           = 0644,
                 .proc_handler   = proc_dointvec_jiffies,
         },
         {
                 .procname       = "nf_conntrack_tcp_timeout_max_retrans",
-                .data           = &tcp_timeouts[TCP_CONNTRACK_RETRANS],
                 .maxlen         = sizeof(unsigned int),
                 .mode           = 0644,
                 .proc_handler   = proc_dointvec_jiffies,
         },
         {
                 .procname       = "nf_conntrack_tcp_timeout_unacknowledged",
-                .data           = &tcp_timeouts[TCP_CONNTRACK_UNACK],
                 .maxlen         = sizeof(unsigned int),
                 .mode           = 0644,
                 .proc_handler   = proc_dointvec_jiffies,
         },
         {
                 .procname       = "nf_conntrack_tcp_loose",
-                .data           = &nf_ct_tcp_loose,
                 .maxlen         = sizeof(unsigned int),
                 .mode           = 0644,
                 .proc_handler   = proc_dointvec,
         },
         {
                 .procname       = "nf_conntrack_tcp_be_liberal",
-                .data           = &nf_ct_tcp_be_liberal,
                 .maxlen         = sizeof(unsigned int),
                 .mode           = 0644,
                 .proc_handler   = proc_dointvec,
         },
         {
                 .procname       = "nf_conntrack_tcp_max_retrans",
-                .data           = &nf_ct_tcp_max_retrans,
                 .maxlen         = sizeof(unsigned int),
                 .mode           = 0644,
                 .proc_handler   = proc_dointvec,
@@ -1456,91 +1452,78 @@ static struct ctl_table tcp_sysctl_table[] = {
 static struct ctl_table tcp_compat_sysctl_table[] = {
         {
                 .procname       = "ip_conntrack_tcp_timeout_syn_sent",
-                .data           = &tcp_timeouts[TCP_CONNTRACK_SYN_SENT],
                 .maxlen         = sizeof(unsigned int),
                 .mode           = 0644,
                 .proc_handler   = proc_dointvec_jiffies,
         },
         {
                 .procname       = "ip_conntrack_tcp_timeout_syn_sent2",
-                .data           = &tcp_timeouts[TCP_CONNTRACK_SYN_SENT2],
                 .maxlen         = sizeof(unsigned int),
                 .mode           = 0644,
                 .proc_handler   = proc_dointvec_jiffies,
         },
         {
                 .procname       = "ip_conntrack_tcp_timeout_syn_recv",
-                .data           = &tcp_timeouts[TCP_CONNTRACK_SYN_RECV],
                 .maxlen         = sizeof(unsigned int),
                 .mode           = 0644,
                 .proc_handler   = proc_dointvec_jiffies,
         },
         {
                 .procname       = "ip_conntrack_tcp_timeout_established",
-                .data           = &tcp_timeouts[TCP_CONNTRACK_ESTABLISHED],
                 .maxlen         = sizeof(unsigned int),
                 .mode           = 0644,
                 .proc_handler   = proc_dointvec_jiffies,
         },
         {
                 .procname       = "ip_conntrack_tcp_timeout_fin_wait",
-                .data           = &tcp_timeouts[TCP_CONNTRACK_FIN_WAIT],
                 .maxlen         = sizeof(unsigned int),
                 .mode           = 0644,
                 .proc_handler   = proc_dointvec_jiffies,
         },
         {
                 .procname       = "ip_conntrack_tcp_timeout_close_wait",
-                .data           = &tcp_timeouts[TCP_CONNTRACK_CLOSE_WAIT],
                 .maxlen         = sizeof(unsigned int),
                 .mode           = 0644,
                 .proc_handler   = proc_dointvec_jiffies,
         },
         {
                 .procname       = "ip_conntrack_tcp_timeout_last_ack",
-                .data           = &tcp_timeouts[TCP_CONNTRACK_LAST_ACK],
                 .maxlen         = sizeof(unsigned int),
                 .mode           = 0644,
                 .proc_handler   = proc_dointvec_jiffies,
         },
         {
                 .procname       = "ip_conntrack_tcp_timeout_time_wait",
-                .data           = &tcp_timeouts[TCP_CONNTRACK_TIME_WAIT],
                 .maxlen         = sizeof(unsigned int),
                 .mode           = 0644,
                 .proc_handler   = proc_dointvec_jiffies,
         },
         {
                 .procname       = "ip_conntrack_tcp_timeout_close",
-                .data           = &tcp_timeouts[TCP_CONNTRACK_CLOSE],
                 .maxlen         = sizeof(unsigned int),
                 .mode           = 0644,
                 .proc_handler   = proc_dointvec_jiffies,
         },
         {
                 .procname       = "ip_conntrack_tcp_timeout_max_retrans",
-                .data           = &tcp_timeouts[TCP_CONNTRACK_RETRANS],
                 .maxlen         = sizeof(unsigned int),
                 .mode           = 0644,
                 .proc_handler   = proc_dointvec_jiffies,
         },
         {
                 .procname       = "ip_conntrack_tcp_loose",
-                .data           = &nf_ct_tcp_loose,
                 .maxlen         = sizeof(unsigned int),
                 .mode           = 0644,
                 .proc_handler   = proc_dointvec,
         },
         {
                 .procname       = "ip_conntrack_tcp_be_liberal",
-                .data           = &nf_ct_tcp_be_liberal,
                 .maxlen         = sizeof(unsigned int),
                 .mode           = 0644,
                 .proc_handler   = proc_dointvec,
         },
         {
                 .procname       = "ip_conntrack_tcp_max_retrans",
-                .data           = &nf_ct_tcp_max_retrans,
                 .maxlen         = sizeof(unsigned int),
                 .mode           = 0644,
                 .proc_handler   = proc_dointvec,
@@ -1550,6 +1533,101 @@ static struct ctl_table tcp_compat_sysctl_table[] = {
 #endif /* CONFIG_NF_CONNTRACK_PROC_COMPAT */
 #endif /* CONFIG_SYSCTL */
 
+static int tcp_kmemdup_sysctl_table(struct nf_proto_net *pn,
+                                    struct nf_tcp_net *tn)
+{
+#ifdef CONFIG_SYSCTL
+        if (pn->ctl_table)
+                return 0;
+
+        pn->ctl_table = kmemdup(tcp_sysctl_table,
+                                sizeof(tcp_sysctl_table),
+                                GFP_KERNEL);
+        if (!pn->ctl_table)
+                return -ENOMEM;
+
+        pn->ctl_table[0].data = &tn->timeouts[TCP_CONNTRACK_SYN_SENT];
+        pn->ctl_table[1].data = &tn->timeouts[TCP_CONNTRACK_SYN_RECV];
+        pn->ctl_table[2].data = &tn->timeouts[TCP_CONNTRACK_ESTABLISHED];
+        pn->ctl_table[3].data = &tn->timeouts[TCP_CONNTRACK_FIN_WAIT];
+        pn->ctl_table[4].data = &tn->timeouts[TCP_CONNTRACK_CLOSE_WAIT];
+        pn->ctl_table[5].data = &tn->timeouts[TCP_CONNTRACK_LAST_ACK];
+        pn->ctl_table[6].data = &tn->timeouts[TCP_CONNTRACK_TIME_WAIT];
+        pn->ctl_table[7].data = &tn->timeouts[TCP_CONNTRACK_CLOSE];
+        pn->ctl_table[8].data = &tn->timeouts[TCP_CONNTRACK_RETRANS];
+        pn->ctl_table[9].data = &tn->timeouts[TCP_CONNTRACK_UNACK];
+        pn->ctl_table[10].data = &tn->tcp_loose;
+        pn->ctl_table[11].data = &tn->tcp_be_liberal;
+        pn->ctl_table[12].data = &tn->tcp_max_retrans;
+#endif
+        return 0;
+}
+
+static int tcp_kmemdup_compat_sysctl_table(struct nf_proto_net *pn,
+                                           struct nf_tcp_net *tn)
+{
+#ifdef CONFIG_SYSCTL
+#ifdef CONFIG_NF_CONNTRACK_PROC_COMPAT
+        pn->ctl_compat_table = kmemdup(tcp_compat_sysctl_table,
+                                       sizeof(tcp_compat_sysctl_table),
+                                       GFP_KERNEL);
+        if (!pn->ctl_compat_table)
+                return -ENOMEM;
+
+        pn->ctl_compat_table[0].data = &tn->timeouts[TCP_CONNTRACK_SYN_SENT];
+        pn->ctl_compat_table[1].data = &tn->timeouts[TCP_CONNTRACK_SYN_SENT2];
+        pn->ctl_compat_table[2].data = &tn->timeouts[TCP_CONNTRACK_SYN_RECV];
+        pn->ctl_compat_table[3].data = &tn->timeouts[TCP_CONNTRACK_ESTABLISHED];
+        pn->ctl_compat_table[4].data = &tn->timeouts[TCP_CONNTRACK_FIN_WAIT];
+        pn->ctl_compat_table[5].data = &tn->timeouts[TCP_CONNTRACK_CLOSE_WAIT];
+        pn->ctl_compat_table[6].data = &tn->timeouts[TCP_CONNTRACK_LAST_ACK];
+        pn->ctl_compat_table[7].data = &tn->timeouts[TCP_CONNTRACK_TIME_WAIT];
+        pn->ctl_compat_table[8].data = &tn->timeouts[TCP_CONNTRACK_CLOSE];
+        pn->ctl_compat_table[9].data = &tn->timeouts[TCP_CONNTRACK_RETRANS];
+        pn->ctl_compat_table[10].data = &tn->tcp_loose;
+        pn->ctl_compat_table[11].data = &tn->tcp_be_liberal;
+        pn->ctl_compat_table[12].data = &tn->tcp_max_retrans;
+#endif
+#endif
+        return 0;
+}
+
+static int tcp_init_net(struct net *net, u_int16_t proto)
+{
+        int ret;
+        struct nf_tcp_net *tn = tcp_pernet(net);
+        struct nf_proto_net *pn = &tn->pn;
+
+        if (!pn->users) {
+                int i;
+
+                for (i = 0; i < TCP_CONNTRACK_TIMEOUT_MAX; i++)
+                        tn->timeouts[i] = tcp_timeouts[i];
+
+                tn->tcp_loose = nf_ct_tcp_loose;
+                tn->tcp_be_liberal = nf_ct_tcp_be_liberal;
+                tn->tcp_max_retrans = nf_ct_tcp_max_retrans;
+        }
+
+        if (proto == AF_INET) {
+                ret = tcp_kmemdup_compat_sysctl_table(pn, tn);
+                if (ret < 0)
+                        return ret;
+
+                ret = tcp_kmemdup_sysctl_table(pn, tn);
+                if (ret < 0)
+                        nf_ct_kfree_compat_sysctl_table(pn);
+        } else
+                ret = tcp_kmemdup_sysctl_table(pn, tn);
+
+        return ret;
+}
+
+static struct nf_proto_net *tcp_get_net_proto(struct net *net)
+{
+        return &net->ct.nf_ct_proto.tcp.pn;
+}
+
 struct nf_conntrack_l4proto nf_conntrack_l4proto_tcp4 __read_mostly =
 {
         .l3proto                = PF_INET,
@@ -1582,14 +1660,8 @@ struct nf_conntrack_l4proto nf_conntrack_l4proto_tcp4 __read_mostly =
                 .nla_policy     = tcp_timeout_nla_policy,
         },
 #endif /* CONFIG_NF_CT_NETLINK_TIMEOUT */
-#ifdef CONFIG_SYSCTL
-        .ctl_table_users        = &tcp_sysctl_table_users,
-        .ctl_table_header       = &tcp_sysctl_header,
-        .ctl_table              = tcp_sysctl_table,
-#ifdef CONFIG_NF_CONNTRACK_PROC_COMPAT
-        .ctl_compat_table       = tcp_compat_sysctl_table,
-#endif
-#endif
+        .init_net               = tcp_init_net,
+        .get_net_proto          = tcp_get_net_proto,
 };
 EXPORT_SYMBOL_GPL(nf_conntrack_l4proto_tcp4);
 
@@ -1625,10 +1697,7 @@ struct nf_conntrack_l4proto nf_conntrack_l4proto_tcp6 __read_mostly =
                 .nla_policy     = tcp_timeout_nla_policy,
         },
 #endif /* CONFIG_NF_CT_NETLINK_TIMEOUT */
-#ifdef CONFIG_SYSCTL
-        .ctl_table_users        = &tcp_sysctl_table_users,
-        .ctl_table_header       = &tcp_sysctl_header,
-        .ctl_table              = tcp_sysctl_table,
-#endif
+        .init_net               = tcp_init_net,
+        .get_net_proto          = tcp_get_net_proto,
 };
 EXPORT_SYMBOL_GPL(nf_conntrack_l4proto_tcp6);
diff --git a/net/netfilter/nf_conntrack_proto_udp.c b/net/netfilter/nf_conntrack_proto_udp.c
index 7259a6bdeb4..59623cc56e8 100644
--- a/net/netfilter/nf_conntrack_proto_udp.c
+++ b/net/netfilter/nf_conntrack_proto_udp.c
@@ -25,17 +25,16 @@
 #include <net/netfilter/ipv4/nf_conntrack_ipv4.h>
 #include <net/netfilter/ipv6/nf_conntrack_ipv6.h>
 
-enum udp_conntrack {
-        UDP_CT_UNREPLIED,
-        UDP_CT_REPLIED,
-        UDP_CT_MAX
-};
-
 static unsigned int udp_timeouts[UDP_CT_MAX] = {
         [UDP_CT_UNREPLIED]      = 30*HZ,
         [UDP_CT_REPLIED]        = 180*HZ,
 };
 
+static inline struct nf_udp_net *udp_pernet(struct net *net)
+{
+        return &net->ct.nf_ct_proto.udp;
+}
+
 static bool udp_pkt_to_tuple(const struct sk_buff *skb,
                              unsigned int dataoff,
                              struct nf_conntrack_tuple *tuple)
@@ -73,7 +72,7 @@ static int udp_print_tuple(struct seq_file *s,
 
 static unsigned int *udp_get_timeouts(struct net *net)
 {
-        return udp_timeouts;
+        return udp_pernet(net)->timeouts;
 }
 
 /* Returns verdict for packet, and may modify conntracktype */
@@ -157,13 +156,15 @@ static int udp_error(struct net *net, struct nf_conn *tmpl, struct sk_buff *skb,
 #include <linux/netfilter/nfnetlink.h>
 #include <linux/netfilter/nfnetlink_cttimeout.h>
 
-static int udp_timeout_nlattr_to_obj(struct nlattr *tb[], void *data)
+static int udp_timeout_nlattr_to_obj(struct nlattr *tb[],
+                                     struct net *net, void *data)
 {
         unsigned int *timeouts = data;
+        struct nf_udp_net *un = udp_pernet(net);
 
         /* set default timeouts for UDP. */
-        timeouts[UDP_CT_UNREPLIED] = udp_timeouts[UDP_CT_UNREPLIED];
-        timeouts[UDP_CT_REPLIED] = udp_timeouts[UDP_CT_REPLIED];
+        timeouts[UDP_CT_UNREPLIED] = un->timeouts[UDP_CT_UNREPLIED];
+        timeouts[UDP_CT_REPLIED] = un->timeouts[UDP_CT_REPLIED];
 
         if (tb[CTA_TIMEOUT_UDP_UNREPLIED]) {
                 timeouts[UDP_CT_UNREPLIED] =
@@ -200,19 +201,15 @@ udp_timeout_nla_policy[CTA_TIMEOUT_UDP_MAX+1] = {
 #endif /* CONFIG_NF_CT_NETLINK_TIMEOUT */
 
 #ifdef CONFIG_SYSCTL
-static unsigned int udp_sysctl_table_users;
-static struct ctl_table_header *udp_sysctl_header;
 static struct ctl_table udp_sysctl_table[] = {
         {
                 .procname       = "nf_conntrack_udp_timeout",
-                .data           = &udp_timeouts[UDP_CT_UNREPLIED],
                 .maxlen         = sizeof(unsigned int),
                 .mode           = 0644,
                 .proc_handler   = proc_dointvec_jiffies,
         },
         {
                 .procname       = "nf_conntrack_udp_timeout_stream",
-                .data           = &udp_timeouts[UDP_CT_REPLIED],
                 .maxlen         = sizeof(unsigned int),
                 .mode           = 0644,
                 .proc_handler   = proc_dointvec_jiffies,
@@ -223,14 +220,12 @@ static struct ctl_table udp_sysctl_table[] = {
 static struct ctl_table udp_compat_sysctl_table[] = {
         {
                 .procname       = "ip_conntrack_udp_timeout",
-                .data           = &udp_timeouts[UDP_CT_UNREPLIED],
                 .maxlen         = sizeof(unsigned int),
                 .mode           = 0644,
                 .proc_handler   = proc_dointvec_jiffies,
         },
         {
                 .procname       = "ip_conntrack_udp_timeout_stream",
-                .data           = &udp_timeouts[UDP_CT_REPLIED],
                 .maxlen         = sizeof(unsigned int),
                 .mode           = 0644,
                 .proc_handler   = proc_dointvec_jiffies,
@@ -240,6 +235,73 @@ static struct ctl_table udp_compat_sysctl_table[] = {
 #endif /* CONFIG_NF_CONNTRACK_PROC_COMPAT */
 #endif /* CONFIG_SYSCTL */
 
+static int udp_kmemdup_sysctl_table(struct nf_proto_net *pn,
+                                    struct nf_udp_net *un)
+{
+#ifdef CONFIG_SYSCTL
+        if (pn->ctl_table)
+                return 0;
+        pn->ctl_table = kmemdup(udp_sysctl_table,
+                                sizeof(udp_sysctl_table),
+                                GFP_KERNEL);
+        if (!pn->ctl_table)
+                return -ENOMEM;
+        pn->ctl_table[0].data = &un->timeouts[UDP_CT_UNREPLIED];
+        pn->ctl_table[1].data = &un->timeouts[UDP_CT_REPLIED];
+#endif
+        return 0;
+}
+
+static int udp_kmemdup_compat_sysctl_table(struct nf_proto_net *pn,
+                                           struct nf_udp_net *un)
+{
+#ifdef CONFIG_SYSCTL
+#ifdef CONFIG_NF_CONNTRACK_PROC_COMPAT
+        pn->ctl_compat_table = kmemdup(udp_compat_sysctl_table,
+                                       sizeof(udp_compat_sysctl_table),
+                                       GFP_KERNEL);
+        if (!pn->ctl_compat_table)
+                return -ENOMEM;
+
+        pn->ctl_compat_table[0].data = &un->timeouts[UDP_CT_UNREPLIED];
+        pn->ctl_compat_table[1].data = &un->timeouts[UDP_CT_REPLIED];
+#endif
+#endif
+        return 0;
+}
+
+static int udp_init_net(struct net *net, u_int16_t proto)
+{
+        int ret;
+        struct nf_udp_net *un = udp_pernet(net);
+        struct nf_proto_net *pn = &un->pn;
+
+        if (!pn->users) {
+                int i;
+
+                for (i = 0; i < UDP_CT_MAX; i++)
+                        un->timeouts[i] = udp_timeouts[i];
+        }
+
+        if (proto == AF_INET) {
+                ret = udp_kmemdup_compat_sysctl_table(pn, un);
+                if (ret < 0)
+                        return ret;
+
+                ret = udp_kmemdup_sysctl_table(pn, un);
+                if (ret < 0)
+                        nf_ct_kfree_compat_sysctl_table(pn);
+        } else
+                ret = udp_kmemdup_sysctl_table(pn, un);
+
+        return ret;
+}
+
+static struct nf_proto_net *udp_get_net_proto(struct net *net)
+{
+        return &net->ct.nf_ct_proto.udp.pn;
+}
+
 struct nf_conntrack_l4proto nf_conntrack_l4proto_udp4 __read_mostly =
 {
         .l3proto                = PF_INET,
@@ -267,14 +329,8 @@ struct nf_conntrack_l4proto nf_conntrack_l4proto_udp4 __read_mostly =
                 .nla_policy     = udp_timeout_nla_policy,
         },
 #endif /* CONFIG_NF_CT_NETLINK_TIMEOUT */
-#ifdef CONFIG_SYSCTL
-        .ctl_table_users        = &udp_sysctl_table_users,
-        .ctl_table_header       = &udp_sysctl_header,
-        .ctl_table              = udp_sysctl_table,
-#ifdef CONFIG_NF_CONNTRACK_PROC_COMPAT
-        .ctl_compat_table       = udp_compat_sysctl_table,
-#endif
-#endif
+        .init_net               = udp_init_net,
+        .get_net_proto          = udp_get_net_proto,
 };
 EXPORT_SYMBOL_GPL(nf_conntrack_l4proto_udp4);
 
@@ -305,10 +361,7 @@ struct nf_conntrack_l4proto nf_conntrack_l4proto_udp6 __read_mostly =
                 .nla_policy     = udp_timeout_nla_policy,
         },
 #endif /* CONFIG_NF_CT_NETLINK_TIMEOUT */
-#ifdef CONFIG_SYSCTL
-        .ctl_table_users        = &udp_sysctl_table_users,
-        .ctl_table_header       = &udp_sysctl_header,
-        .ctl_table              = udp_sysctl_table,
-#endif
+        .init_net               = udp_init_net,
+        .get_net_proto          = udp_get_net_proto,
 };
 EXPORT_SYMBOL_GPL(nf_conntrack_l4proto_udp6);
diff --git a/net/netfilter/nf_conntrack_proto_udplite.c b/net/netfilter/nf_conntrack_proto_udplite.c
index 4d60a5376aa..4b66df20928 100644
--- a/net/netfilter/nf_conntrack_proto_udplite.c
+++ b/net/netfilter/nf_conntrack_proto_udplite.c
@@ -35,6 +35,17 @@ static unsigned int udplite_timeouts[UDPLITE_CT_MAX] = {
         [UDPLITE_CT_REPLIED]    = 180*HZ,
 };
 
+static int udplite_net_id __read_mostly;
+struct udplite_net {
+        struct nf_proto_net pn;
+        unsigned int timeouts[UDPLITE_CT_MAX];
+};
+
+static inline struct udplite_net *udplite_pernet(struct net *net)
+{
+        return net_generic(net, udplite_net_id);
+}
+
 static bool udplite_pkt_to_tuple(const struct sk_buff *skb,
                                  unsigned int dataoff,
                                  struct nf_conntrack_tuple *tuple)
@@ -70,7 +81,7 @@ static int udplite_print_tuple(struct seq_file *s,
 
 static unsigned int *udplite_get_timeouts(struct net *net)
 {
-        return udplite_timeouts;
+        return udplite_pernet(net)->timeouts;
 }
 
 /* Returns verdict for packet, and may modify conntracktype */
@@ -161,13 +172,15 @@ static int udplite_error(struct net *net, struct nf_conn *tmpl,
 #include <linux/netfilter/nfnetlink.h>
 #include <linux/netfilter/nfnetlink_cttimeout.h>
 
-static int udplite_timeout_nlattr_to_obj(struct nlattr *tb[], void *data)
+static int udplite_timeout_nlattr_to_obj(struct nlattr *tb[],
+                                         struct net *net, void *data)
 {
         unsigned int *timeouts = data;
+        struct udplite_net *un = udplite_pernet(net);
 
         /* set default timeouts for UDPlite. */
-        timeouts[UDPLITE_CT_UNREPLIED] = udplite_timeouts[UDPLITE_CT_UNREPLIED];
-        timeouts[UDPLITE_CT_REPLIED] = udplite_timeouts[UDPLITE_CT_REPLIED];
+        timeouts[UDPLITE_CT_UNREPLIED] = un->timeouts[UDPLITE_CT_UNREPLIED];
+        timeouts[UDPLITE_CT_REPLIED] = un->timeouts[UDPLITE_CT_REPLIED];
 
         if (tb[CTA_TIMEOUT_UDPLITE_UNREPLIED]) {
                 timeouts[UDPLITE_CT_UNREPLIED] =
@@ -204,19 +217,15 @@ udplite_timeout_nla_policy[CTA_TIMEOUT_UDPLITE_MAX+1] = {
 #endif /* CONFIG_NF_CT_NETLINK_TIMEOUT */
 
 #ifdef CONFIG_SYSCTL
-static unsigned int udplite_sysctl_table_users;
-static struct ctl_table_header *udplite_sysctl_header;
 static struct ctl_table udplite_sysctl_table[] = {
         {
                 .procname       = "nf_conntrack_udplite_timeout",
-                .data           = &udplite_timeouts[UDPLITE_CT_UNREPLIED],
                 .maxlen         = sizeof(unsigned int),
                 .mode           = 0644,
                 .proc_handler   = proc_dointvec_jiffies,
         },
         {
                 .procname       = "nf_conntrack_udplite_timeout_stream",
-                .data           = &udplite_timeouts[UDPLITE_CT_REPLIED],
                 .maxlen         = sizeof(unsigned int),
                 .mode           = 0644,
                 .proc_handler   = proc_dointvec_jiffies,
@@ -225,6 +234,40 @@ static struct ctl_table udplite_sysctl_table[] = {
 };
 #endif /* CONFIG_SYSCTL */
 
+static int udplite_kmemdup_sysctl_table(struct nf_proto_net *pn,
+                                        struct udplite_net *un)
+{
+#ifdef CONFIG_SYSCTL
+        if (pn->ctl_table)
+                return 0;
+
+        pn->ctl_table = kmemdup(udplite_sysctl_table,
+                                sizeof(udplite_sysctl_table),
+                                GFP_KERNEL);
+        if (!pn->ctl_table)
+                return -ENOMEM;
+
+        pn->ctl_table[0].data = &un->timeouts[UDPLITE_CT_UNREPLIED];
+        pn->ctl_table[1].data = &un->timeouts[UDPLITE_CT_REPLIED];
+#endif
+        return 0;
+}
+
+static int udplite_init_net(struct net *net, u_int16_t proto)
+{
+        struct udplite_net *un = udplite_pernet(net);
+        struct nf_proto_net *pn = &un->pn;
+
+        if (!pn->users) {
+                int i;
+
+                for (i = 0 ; i < UDPLITE_CT_MAX; i++)
+                        un->timeouts[i] = udplite_timeouts[i];
+        }
+
+        return udplite_kmemdup_sysctl_table(pn, un);
+}
+
 static struct nf_conntrack_l4proto nf_conntrack_l4proto_udplite4 __read_mostly =
 {
         .l3proto                = PF_INET,
@@ -253,11 +296,8 @@ static struct nf_conntrack_l4proto nf_conntrack_l4proto_udplite4 __read_mostly =
                 .nla_policy     = udplite_timeout_nla_policy,
         },
 #endif /* CONFIG_NF_CT_NETLINK_TIMEOUT */
-#ifdef CONFIG_SYSCTL
-        .ctl_table_users        = &udplite_sysctl_table_users,
-        .ctl_table_header       = &udplite_sysctl_header,
-        .ctl_table              = udplite_sysctl_table,
-#endif
+        .net_id                 = &udplite_net_id,
+        .init_net               = udplite_init_net,
 };
 
 static struct nf_conntrack_l4proto nf_conntrack_l4proto_udplite6 __read_mostly =
@@ -288,34 +328,55 @@ static struct nf_conntrack_l4proto nf_conntrack_l4proto_udplite6 __read_mostly =
                 .nla_policy     = udplite_timeout_nla_policy,
         },
 #endif /* CONFIG_NF_CT_NETLINK_TIMEOUT */
-#ifdef CONFIG_SYSCTL
-        .ctl_table_users        = &udplite_sysctl_table_users,
-        .ctl_table_header       = &udplite_sysctl_header,
-        .ctl_table              = udplite_sysctl_table,
-#endif
+        .net_id                 = &udplite_net_id,
+        .init_net               = udplite_init_net,
 };
 
-static int __init nf_conntrack_proto_udplite_init(void)
+static int udplite_net_init(struct net *net)
 {
-        int err;
-
-        err = nf_conntrack_l4proto_register(&nf_conntrack_l4proto_udplite4);
-        if (err < 0)
-                goto err1;
-        err = nf_conntrack_l4proto_register(&nf_conntrack_l4proto_udplite6);
-        if (err < 0)
-                goto err2;
+        int ret = 0;
+
+        ret = nf_conntrack_l4proto_register(net,
+                                            &nf_conntrack_l4proto_udplite4);
+        if (ret < 0) {
+                pr_err("nf_conntrack_l4proto_udplite4 :protocol register failed.\n");
+                goto out;
+        }
+        ret = nf_conntrack_l4proto_register(net,
+                                            &nf_conntrack_l4proto_udplite6);
+        if (ret < 0) {
+                pr_err("nf_conntrack_l4proto_udplite4 :protocol register failed.\n");
+                goto cleanup_udplite4;
+        }
         return 0;
-err2:
-        nf_conntrack_l4proto_unregister(&nf_conntrack_l4proto_udplite4);
-err1:
-        return err;
+
+cleanup_udplite4:
+        nf_conntrack_l4proto_unregister(net, &nf_conntrack_l4proto_udplite4);
+out:
+        return ret;
+}
+
+static void udplite_net_exit(struct net *net)
+{
+        nf_conntrack_l4proto_unregister(net, &nf_conntrack_l4proto_udplite6);
+        nf_conntrack_l4proto_unregister(net, &nf_conntrack_l4proto_udplite4);
+}
+
+static struct pernet_operations udplite_net_ops = {
+        .init = udplite_net_init,
+        .exit = udplite_net_exit,
+        .id   = &udplite_net_id,
+        .size = sizeof(struct udplite_net),
+};
+
+static int __init nf_conntrack_proto_udplite_init(void)
+{
+        return register_pernet_subsys(&udplite_net_ops);
 }
 
 static void __exit nf_conntrack_proto_udplite_exit(void)
 {
-        nf_conntrack_l4proto_unregister(&nf_conntrack_l4proto_udplite6);
-        nf_conntrack_l4proto_unregister(&nf_conntrack_l4proto_udplite4);
+        unregister_pernet_subsys(&udplite_net_ops);
 }
 
 module_init(nf_conntrack_proto_udplite_init);
diff --git a/net/netfilter/nf_conntrack_sane.c b/net/netfilter/nf_conntrack_sane.c
index 8501823b3f9..295429f3908 100644
--- a/net/netfilter/nf_conntrack_sane.c
+++ b/net/netfilter/nf_conntrack_sane.c
@@ -69,13 +69,12 @@ static int help(struct sk_buff *skb,
         void *sb_ptr;
         int ret = NF_ACCEPT;
         int dir = CTINFO2DIR(ctinfo);
-        struct nf_ct_sane_master *ct_sane_info;
+        struct nf_ct_sane_master *ct_sane_info = nfct_help_data(ct);
         struct nf_conntrack_expect *exp;
         struct nf_conntrack_tuple *tuple;
         struct sane_request *req;
         struct sane_reply_net_start *reply;
 
-        ct_sane_info = &nfct_help(ct)->help.ct_sane_info;
         /* Until there's been traffic both ways, don't look in packets. */
         if (ctinfo != IP_CT_ESTABLISHED &&
             ctinfo != IP_CT_ESTABLISHED_REPLY)
@@ -163,7 +162,6 @@ out:
 }
 
 static struct nf_conntrack_helper sane[MAX_PORTS][2] __read_mostly;
-static char sane_names[MAX_PORTS][2][sizeof("sane-65535")] __read_mostly;
 
 static const struct nf_conntrack_expect_policy sane_exp_policy = {
         .max_expected   = 1,
@@ -190,7 +188,6 @@ static void nf_conntrack_sane_fini(void)
 static int __init nf_conntrack_sane_init(void)
 {
         int i, j = -1, ret = 0;
-        char *tmpname;
 
         sane_buffer = kmalloc(65536, GFP_KERNEL);
         if (!sane_buffer)
@@ -205,17 +202,16 @@ static int __init nf_conntrack_sane_init(void)
                 sane[i][0].tuple.src.l3num = PF_INET;
                 sane[i][1].tuple.src.l3num = PF_INET6;
                 for (j = 0; j < 2; j++) {
+                        sane[i][j].data_len = sizeof(struct nf_ct_sane_master);
                         sane[i][j].tuple.src.u.tcp.port = htons(ports[i]);
                         sane[i][j].tuple.dst.protonum = IPPROTO_TCP;
                         sane[i][j].expect_policy = &sane_exp_policy;
                         sane[i][j].me = THIS_MODULE;
                         sane[i][j].help = help;
-                        tmpname = &sane_names[i][j][0];
                         if (ports[i] == SANE_PORT)
-                                sprintf(tmpname, "sane");
+                                sprintf(sane[i][j].name, "sane");
                         else
-                                sprintf(tmpname, "sane-%d", ports[i]);
-                        sane[i][j].name = tmpname;
+                                sprintf(sane[i][j].name, "sane-%d", ports[i]);
 
                         pr_debug("nf_ct_sane: registering helper for pf: %d "
                                  "port: %d\n",
diff --git a/net/netfilter/nf_conntrack_sip.c b/net/netfilter/nf_conntrack_sip.c
index 93faf6a3a63..758a1bacc12 100644
--- a/net/netfilter/nf_conntrack_sip.c
+++ b/net/netfilter/nf_conntrack_sip.c
@@ -1075,12 +1075,12 @@ static int process_invite_response(struct sk_buff *skb, unsigned int dataoff,
 {
         enum ip_conntrack_info ctinfo;
         struct nf_conn *ct = nf_ct_get(skb, &ctinfo);
-        struct nf_conn_help *help = nfct_help(ct);
+        struct nf_ct_sip_master *ct_sip_info = nfct_help_data(ct);
 
         if ((code >= 100 && code <= 199) ||
             (code >= 200 && code <= 299))
                 return process_sdp(skb, dataoff, dptr, datalen, cseq);
-        else if (help->help.ct_sip_info.invite_cseq == cseq)
+        else if (ct_sip_info->invite_cseq == cseq)
                 flush_expectations(ct, true);
         return NF_ACCEPT;
 }
@@ -1091,12 +1091,12 @@ static int process_update_response(struct sk_buff *skb, unsigned int dataoff,
 {
         enum ip_conntrack_info ctinfo;
         struct nf_conn *ct = nf_ct_get(skb, &ctinfo);
-        struct nf_conn_help *help = nfct_help(ct);
+        struct nf_ct_sip_master *ct_sip_info = nfct_help_data(ct);
 
         if ((code >= 100 && code <= 199) ||
             (code >= 200 && code <= 299))
                 return process_sdp(skb, dataoff, dptr, datalen, cseq);
-        else if (help->help.ct_sip_info.invite_cseq == cseq)
+        else if (ct_sip_info->invite_cseq == cseq)
                 flush_expectations(ct, true);
         return NF_ACCEPT;
 }
@@ -1107,12 +1107,12 @@ static int process_prack_response(struct sk_buff *skb, unsigned int dataoff,
 {
         enum ip_conntrack_info ctinfo;
         struct nf_conn *ct = nf_ct_get(skb, &ctinfo);
-        struct nf_conn_help *help = nfct_help(ct);
+        struct nf_ct_sip_master *ct_sip_info = nfct_help_data(ct);
 
         if ((code >= 100 && code <= 199) ||
             (code >= 200 && code <= 299))
                 return process_sdp(skb, dataoff, dptr, datalen, cseq);
-        else if (help->help.ct_sip_info.invite_cseq == cseq)
+        else if (ct_sip_info->invite_cseq == cseq)
                 flush_expectations(ct, true);
         return NF_ACCEPT;
 }
@@ -1123,13 +1123,13 @@ static int process_invite_request(struct sk_buff *skb, unsigned int dataoff,
 {
         enum ip_conntrack_info ctinfo;
         struct nf_conn *ct = nf_ct_get(skb, &ctinfo);
-        struct nf_conn_help *help = nfct_help(ct);
+        struct nf_ct_sip_master *ct_sip_info = nfct_help_data(ct);
         unsigned int ret;
 
         flush_expectations(ct, true);
         ret = process_sdp(skb, dataoff, dptr, datalen, cseq);
         if (ret == NF_ACCEPT)
-                help->help.ct_sip_info.invite_cseq = cseq;
+                ct_sip_info->invite_cseq = cseq;
         return ret;
 }
 
@@ -1154,7 +1154,7 @@ static int process_register_request(struct sk_buff *skb, unsigned int dataoff,
 {
         enum ip_conntrack_info ctinfo;
         struct nf_conn *ct = nf_ct_get(skb, &ctinfo);
-        struct nf_conn_help *help = nfct_help(ct);
+        struct nf_ct_sip_master *ct_sip_info = nfct_help_data(ct);
         enum ip_conntrack_dir dir = CTINFO2DIR(ctinfo);
         unsigned int matchoff, matchlen;
         struct nf_conntrack_expect *exp;
@@ -1235,7 +1235,7 @@ static int process_register_request(struct sk_buff *skb, unsigned int dataoff,
 
 store_cseq:
         if (ret == NF_ACCEPT)
-                help->help.ct_sip_info.register_cseq = cseq;
+                ct_sip_info->register_cseq = cseq;
         return ret;
 }
 
@@ -1245,7 +1245,7 @@ static int process_register_response(struct sk_buff *skb, unsigned int dataoff,
 {
         enum ip_conntrack_info ctinfo;
         struct nf_conn *ct = nf_ct_get(skb, &ctinfo);
-        struct nf_conn_help *help = nfct_help(ct);
+        struct nf_ct_sip_master *ct_sip_info = nfct_help_data(ct);
         enum ip_conntrack_dir dir = CTINFO2DIR(ctinfo);
         union nf_inet_addr addr;
         __be16 port;
@@ -1262,7 +1262,7 @@ static int process_register_response(struct sk_buff *skb, unsigned int dataoff,
          * responses, so we store the sequence number of the last valid
          * request and compare it here.
          */
-        if (help->help.ct_sip_info.register_cseq != cseq)
+        if (ct_sip_info->register_cseq != cseq)
                 return NF_ACCEPT;
 
         if (code >= 100 && code <= 199)
@@ -1556,7 +1556,6 @@ static void nf_conntrack_sip_fini(void)
 static int __init nf_conntrack_sip_init(void)
 {
         int i, j, ret;
-        char *tmpname;
 
         if (ports_c == 0)
                 ports[ports_c++] = SIP_PORT;
@@ -1579,17 +1578,16 @@ static int __init nf_conntrack_sip_init(void)
                 sip[i][3].help = sip_help_tcp;
 
                 for (j = 0; j < ARRAY_SIZE(sip[i]); j++) {
+                        sip[i][j].data_len = sizeof(struct nf_ct_sip_master);
                         sip[i][j].tuple.src.u.udp.port = htons(ports[i]);
                         sip[i][j].expect_policy = sip_exp_policy;
                         sip[i][j].expect_class_max = SIP_EXPECT_MAX;
                         sip[i][j].me = THIS_MODULE;
 
-                        tmpname = &sip_names[i][j][0];
                         if (ports[i] == SIP_PORT)
-                                sprintf(tmpname, "sip");
+                                sprintf(sip_names[i][j], "sip");
                         else
-                                sprintf(tmpname, "sip-%u", i);
-                        sip[i][j].name = tmpname;
+                                sprintf(sip_names[i][j], "sip-%u", i);
 
                         pr_debug("port #%u: %u\n", i, ports[i]);
 
diff --git a/net/netfilter/nf_conntrack_tftp.c b/net/netfilter/nf_conntrack_tftp.c
index 75466fd72f4..81fc61c0526 100644
--- a/net/netfilter/nf_conntrack_tftp.c
+++ b/net/netfilter/nf_conntrack_tftp.c
@@ -92,7 +92,6 @@ static int tftp_help(struct sk_buff *skb,
 }
 
 static struct nf_conntrack_helper tftp[MAX_PORTS][2] __read_mostly;
-static char tftp_names[MAX_PORTS][2][sizeof("tftp-65535")] __read_mostly;
 
 static const struct nf_conntrack_expect_policy tftp_exp_policy = {
         .max_expected   = 1,
@@ -112,7 +111,6 @@ static void nf_conntrack_tftp_fini(void)
 static int __init nf_conntrack_tftp_init(void)
 {
         int i, j, ret;
-        char *tmpname;
 
         if (ports_c == 0)
                 ports[ports_c++] = TFTP_PORT;
@@ -129,12 +127,10 @@ static int __init nf_conntrack_tftp_init(void)
                         tftp[i][j].me = THIS_MODULE;
                         tftp[i][j].help = tftp_help;
 
-                        tmpname = &tftp_names[i][j][0];
                         if (ports[i] == TFTP_PORT)
-                                sprintf(tmpname, "tftp");
+                                sprintf(tftp[i][j].name, "tftp");
                         else
-                                sprintf(tmpname, "tftp-%u", i);
-                        tftp[i][j].name = tmpname;
+                                sprintf(tftp[i][j].name, "tftp-%u", i);
 
                         ret = nf_conntrack_helper_register(&tftp[i][j]);
                         if (ret) {
diff --git a/net/netfilter/nfnetlink.c b/net/netfilter/nfnetlink.c
index 791d56bbd74..a26503342e7 100644
--- a/net/netfilter/nfnetlink.c
+++ b/net/netfilter/nfnetlink.c
@@ -39,6 +39,15 @@ static char __initdata nfversion[] = "0.30";
 static const struct nfnetlink_subsystem __rcu *subsys_table[NFNL_SUBSYS_COUNT];
 static DEFINE_MUTEX(nfnl_mutex);
 
+static const int nfnl_group2type[NFNLGRP_MAX+1] = {
+        [NFNLGRP_CONNTRACK_NEW]         = NFNL_SUBSYS_CTNETLINK,
+        [NFNLGRP_CONNTRACK_UPDATE]      = NFNL_SUBSYS_CTNETLINK,
+        [NFNLGRP_CONNTRACK_DESTROY]     = NFNL_SUBSYS_CTNETLINK,
+        [NFNLGRP_CONNTRACK_EXP_NEW]     = NFNL_SUBSYS_CTNETLINK_EXP,
+        [NFNLGRP_CONNTRACK_EXP_UPDATE]  = NFNL_SUBSYS_CTNETLINK_EXP,
+        [NFNLGRP_CONNTRACK_EXP_DESTROY] = NFNL_SUBSYS_CTNETLINK_EXP,
+};
+
 void nfnl_lock(void)
 {
         mutex_lock(&nfnl_mutex);
@@ -186,9 +195,11 @@ replay:
                                         lockdep_is_held(&nfnl_mutex)) != ss ||
                             nfnetlink_find_client(type, ss) != nc)
                                 err = -EAGAIN;
-                        else
+                        else if (nc->call)
                                 err = nc->call(net->nfnl, skb, nlh,
                                                    (const struct nlattr **)cda);
+                        else
+                                err = -EINVAL;
                         nfnl_unlock();
                 }
                 if (err == -EAGAIN)
@@ -202,12 +213,35 @@ static void nfnetlink_rcv(struct sk_buff *skb)
         netlink_rcv_skb(skb, &nfnetlink_rcv_msg);
 }
 
+#ifdef CONFIG_MODULES
+static void nfnetlink_bind(int group)
+{
+        const struct nfnetlink_subsystem *ss;
+        int type = nfnl_group2type[group];
+
+        rcu_read_lock();
+        ss = nfnetlink_get_subsys(type);
+        if (!ss) {
+                rcu_read_unlock();
+                request_module("nfnetlink-subsys-%d", type);
+                return;
+        }
+        rcu_read_unlock();
+}
+#endif
+
 static int __net_init nfnetlink_net_init(struct net *net)
 {
         struct sock *nfnl;
+        struct netlink_kernel_cfg cfg = {
+                .groups = NFNLGRP_MAX,
+                .input  = nfnetlink_rcv,
+#ifdef CONFIG_MODULES
+                .bind   = nfnetlink_bind,
+#endif
+        };
 
-        nfnl = netlink_kernel_create(net, NETLINK_NETFILTER, NFNLGRP_MAX,
-                                     nfnetlink_rcv, NULL, THIS_MODULE);
+        nfnl = netlink_kernel_create(net, NETLINK_NETFILTER, THIS_MODULE, &cfg);
         if (!nfnl)
                 return -ENOMEM;
         net->nfnl_stash = nfnl;
diff --git a/net/netfilter/nfnetlink_cthelper.c b/net/netfilter/nfnetlink_cthelper.c
new file mode 100644
index 00000000000..d6836193d47
--- /dev/null
+++ b/net/netfilter/nfnetlink_cthelper.c
@@ -0,0 +1,672 @@
+/*
+ * (C) 2012 Pablo Neira Ayuso <pablo@netfilter.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation (or any later at your option).
+ *
+ * This software has been sponsored by Vyatta Inc. <http://www.vyatta.com>
+ */
+#include <linux/init.h>
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/skbuff.h>
+#include <linux/netlink.h>
+#include <linux/rculist.h>
+#include <linux/slab.h>
+#include <linux/types.h>
+#include <linux/list.h>
+#include <linux/errno.h>
+#include <net/netlink.h>
+#include <net/sock.h>
+
+#include <net/netfilter/nf_conntrack_helper.h>
+#include <net/netfilter/nf_conntrack_expect.h>
+#include <net/netfilter/nf_conntrack_ecache.h>
+
+#include <linux/netfilter/nfnetlink.h>
+#include <linux/netfilter/nfnetlink_conntrack.h>
+#include <linux/netfilter/nfnetlink_cthelper.h>
+
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Pablo Neira Ayuso <pablo@netfilter.org>");
+MODULE_DESCRIPTION("nfnl_cthelper: User-space connection tracking helpers");
+
+static int
+nfnl_userspace_cthelper(struct sk_buff *skb, unsigned int protoff,
+                        struct nf_conn *ct, enum ip_conntrack_info ctinfo)
+{
+        const struct nf_conn_help *help;
+        struct nf_conntrack_helper *helper;
+
+        help = nfct_help(ct);
+        if (help == NULL)
+                return NF_DROP;
+
+        /* rcu_read_lock()ed by nf_hook_slow */
+        helper = rcu_dereference(help->helper);
+        if (helper == NULL)
+                return NF_DROP;
+
+        /* This is an user-space helper not yet configured, skip. */
+        if ((helper->flags &
+            (NF_CT_HELPER_F_USERSPACE | NF_CT_HELPER_F_CONFIGURED)) ==
+             NF_CT_HELPER_F_USERSPACE)
+                return NF_ACCEPT;
+
+        /* If the user-space helper is not available, don't block traffic. */
+        return NF_QUEUE_NR(helper->queue_num) | NF_VERDICT_FLAG_QUEUE_BYPASS;
+}
+
+static const struct nla_policy nfnl_cthelper_tuple_pol[NFCTH_TUPLE_MAX+1] = {
+        [NFCTH_TUPLE_L3PROTONUM] = { .type = NLA_U16, },
+        [NFCTH_TUPLE_L4PROTONUM] = { .type = NLA_U8, },
+};
+
+static int
+nfnl_cthelper_parse_tuple(struct nf_conntrack_tuple *tuple,
+                          const struct nlattr *attr)
+{
+        struct nlattr *tb[NFCTH_TUPLE_MAX+1];
+
+        nla_parse_nested(tb, NFCTH_TUPLE_MAX, attr, nfnl_cthelper_tuple_pol);
+
+        if (!tb[NFCTH_TUPLE_L3PROTONUM] || !tb[NFCTH_TUPLE_L4PROTONUM])
+                return -EINVAL;
+
+        tuple->src.l3num = ntohs(nla_get_u16(tb[NFCTH_TUPLE_L3PROTONUM]));
+        tuple->dst.protonum = nla_get_u8(tb[NFCTH_TUPLE_L4PROTONUM]);
+
+        return 0;
+}
+
+static int
+nfnl_cthelper_from_nlattr(struct nlattr *attr, struct nf_conn *ct)
+{
+        const struct nf_conn_help *help = nfct_help(ct);
+
+        if (help->helper->data_len == 0)
+                return -EINVAL;
+
+        memcpy(&help->data, nla_data(attr), help->helper->data_len);
+        return 0;
+}
+
+static int
+nfnl_cthelper_to_nlattr(struct sk_buff *skb, const struct nf_conn *ct)
+{
+        const struct nf_conn_help *help = nfct_help(ct);
+
+        if (help->helper->data_len &&
+            nla_put(skb, CTA_HELP_INFO, help->helper->data_len, &help->data))
+                goto nla_put_failure;
+
+        return 0;
+
+nla_put_failure:
+        return -ENOSPC;
+}
+
+static const struct nla_policy nfnl_cthelper_expect_pol[NFCTH_POLICY_MAX+1] = {
+        [NFCTH_POLICY_NAME] = { .type = NLA_NUL_STRING,
+                                .len = NF_CT_HELPER_NAME_LEN-1 },
+        [NFCTH_POLICY_EXPECT_MAX] = { .type = NLA_U32, },
+        [NFCTH_POLICY_EXPECT_TIMEOUT] = { .type = NLA_U32, },
+};
+
+static int
+nfnl_cthelper_expect_policy(struct nf_conntrack_expect_policy *expect_policy,
+                            const struct nlattr *attr)
+{
+        struct nlattr *tb[NFCTH_POLICY_MAX+1];
+
+        nla_parse_nested(tb, NFCTH_POLICY_MAX, attr, nfnl_cthelper_expect_pol);
+
+        if (!tb[NFCTH_POLICY_NAME] ||
+            !tb[NFCTH_POLICY_EXPECT_MAX] ||
+            !tb[NFCTH_POLICY_EXPECT_TIMEOUT])
+                return -EINVAL;
+
+        strncpy(expect_policy->name,
+                nla_data(tb[NFCTH_POLICY_NAME]), NF_CT_HELPER_NAME_LEN);
+        expect_policy->max_expected =
+                ntohl(nla_get_be32(tb[NFCTH_POLICY_EXPECT_MAX]));
+        expect_policy->timeout =
+                ntohl(nla_get_be32(tb[NFCTH_POLICY_EXPECT_TIMEOUT]));
+
+        return 0;
+}
+
+static const struct nla_policy
+nfnl_cthelper_expect_policy_set[NFCTH_POLICY_SET_MAX+1] = {
+        [NFCTH_POLICY_SET_NUM] = { .type = NLA_U32, },
+};
+
+static int
+nfnl_cthelper_parse_expect_policy(struct nf_conntrack_helper *helper,
+                                  const struct nlattr *attr)
+{
+        int i, ret;
+        struct nf_conntrack_expect_policy *expect_policy;
+        struct nlattr *tb[NFCTH_POLICY_SET_MAX+1];
+
+        nla_parse_nested(tb, NFCTH_POLICY_SET_MAX, attr,
+                                        nfnl_cthelper_expect_policy_set);
+
+        if (!tb[NFCTH_POLICY_SET_NUM])
+                return -EINVAL;
+
+        helper->expect_class_max =
+                ntohl(nla_get_be32(tb[NFCTH_POLICY_SET_NUM]));
+
+        if (helper->expect_class_max != 0 &&
+            helper->expect_class_max > NF_CT_MAX_EXPECT_CLASSES)
+                return -EOVERFLOW;
+
+        expect_policy = kzalloc(sizeof(struct nf_conntrack_expect_policy) *
+                                helper->expect_class_max, GFP_KERNEL);
+        if (expect_policy == NULL)
+                return -ENOMEM;
+
+        for (i=0; i<helper->expect_class_max; i++) {
+                if (!tb[NFCTH_POLICY_SET+i])
+                        goto err;
+
+                ret = nfnl_cthelper_expect_policy(&expect_policy[i],
+                                                  tb[NFCTH_POLICY_SET+i]);
+                if (ret < 0)
+                        goto err;
+        }
+        helper->expect_policy = expect_policy;
+        return 0;
+err:
+        kfree(expect_policy);
+        return -EINVAL;
+}
+
+static int
+nfnl_cthelper_create(const struct nlattr * const tb[],
+                     struct nf_conntrack_tuple *tuple)
+{
+        struct nf_conntrack_helper *helper;
+        int ret;
+
+        if (!tb[NFCTH_TUPLE] || !tb[NFCTH_POLICY] || !tb[NFCTH_PRIV_DATA_LEN])
+                return -EINVAL;
+
+        helper = kzalloc(sizeof(struct nf_conntrack_helper), GFP_KERNEL);
+        if (helper == NULL)
+                return -ENOMEM;
+
+        ret = nfnl_cthelper_parse_expect_policy(helper, tb[NFCTH_POLICY]);
+        if (ret < 0)
+                goto err;
+
+        strncpy(helper->name, nla_data(tb[NFCTH_NAME]), NF_CT_HELPER_NAME_LEN);
+        helper->data_len = ntohl(nla_get_be32(tb[NFCTH_PRIV_DATA_LEN]));
+        helper->flags |= NF_CT_HELPER_F_USERSPACE;
+        memcpy(&helper->tuple, tuple, sizeof(struct nf_conntrack_tuple));
+
+        helper->me = THIS_MODULE;
+        helper->help = nfnl_userspace_cthelper;
+        helper->from_nlattr = nfnl_cthelper_from_nlattr;
+        helper->to_nlattr = nfnl_cthelper_to_nlattr;
+
+        /* Default to queue number zero, this can be updated at any time. */
+        if (tb[NFCTH_QUEUE_NUM])
+                helper->queue_num = ntohl(nla_get_be32(tb[NFCTH_QUEUE_NUM]));
+
+        if (tb[NFCTH_STATUS]) {
+                int status = ntohl(nla_get_be32(tb[NFCTH_STATUS]));
+
+                switch(status) {
+                case NFCT_HELPER_STATUS_ENABLED:
+                        helper->flags |= NF_CT_HELPER_F_CONFIGURED;
+                        break;
+                case NFCT_HELPER_STATUS_DISABLED:
+                        helper->flags &= ~NF_CT_HELPER_F_CONFIGURED;
+                        break;
+                }
+        }
+
+        ret = nf_conntrack_helper_register(helper);
+        if (ret < 0)
+                goto err;
+
+        return 0;
+err:
+        kfree(helper);
+        return ret;
+}
+
+static int
+nfnl_cthelper_update(const struct nlattr * const tb[],
+                     struct nf_conntrack_helper *helper)
+{
+        int ret;
+
+        if (tb[NFCTH_PRIV_DATA_LEN])
+                return -EBUSY;
+
+        if (tb[NFCTH_POLICY]) {
+                ret = nfnl_cthelper_parse_expect_policy(helper,
+                                                        tb[NFCTH_POLICY]);
+                if (ret < 0)
+                        return ret;
+        }
+        if (tb[NFCTH_QUEUE_NUM])
+                helper->queue_num = ntohl(nla_get_be32(tb[NFCTH_QUEUE_NUM]));
+
+        if (tb[NFCTH_STATUS]) {
+                int status = ntohl(nla_get_be32(tb[NFCTH_STATUS]));
+
+                switch(status) {
+                case NFCT_HELPER_STATUS_ENABLED:
+                        helper->flags |= NF_CT_HELPER_F_CONFIGURED;
+                        break;
+                case NFCT_HELPER_STATUS_DISABLED:
+                        helper->flags &= ~NF_CT_HELPER_F_CONFIGURED;
+                        break;
+                }
+        }
+        return 0;
+}
+
+static int
+nfnl_cthelper_new(struct sock *nfnl, struct sk_buff *skb,
+                  const struct nlmsghdr *nlh, const struct nlattr * const tb[])
+{
+        const char *helper_name;
+        struct nf_conntrack_helper *cur, *helper = NULL;
+        struct nf_conntrack_tuple tuple;
+        struct hlist_node *n;
+        int ret = 0, i;
+
+        if (!tb[NFCTH_NAME] || !tb[NFCTH_TUPLE])
+                return -EINVAL;
+
+        helper_name = nla_data(tb[NFCTH_NAME]);
+
+        ret = nfnl_cthelper_parse_tuple(&tuple, tb[NFCTH_TUPLE]);
+        if (ret < 0)
+                return ret;
+
+        rcu_read_lock();
+        for (i = 0; i < nf_ct_helper_hsize && !helper; i++) {
+                hlist_for_each_entry_rcu(cur, n, &nf_ct_helper_hash[i], hnode) {
+
+                        /* skip non-userspace conntrack helpers. */
+                        if (!(cur->flags & NF_CT_HELPER_F_USERSPACE))
+                                continue;
+
+                        if (strncmp(cur->name, helper_name,
+                                        NF_CT_HELPER_NAME_LEN) != 0)
+                                continue;
+
+                        if ((tuple.src.l3num != cur->tuple.src.l3num ||
+                             tuple.dst.protonum != cur->tuple.dst.protonum))
+                                continue;
+
+                        if (nlh->nlmsg_flags & NLM_F_EXCL) {
+                                ret = -EEXIST;
+                                goto err;
+                        }
+                        helper = cur;
+                        break;
+                }
+        }
+        rcu_read_unlock();
+
+        if (helper == NULL)
+                ret = nfnl_cthelper_create(tb, &tuple);
+        else
+                ret = nfnl_cthelper_update(tb, helper);
+
+        return ret;
+err:
+        rcu_read_unlock();
+        return ret;
+}
+
+static int
+nfnl_cthelper_dump_tuple(struct sk_buff *skb,
+                         struct nf_conntrack_helper *helper)
+{
+        struct nlattr *nest_parms;
+
+        nest_parms = nla_nest_start(skb, NFCTH_TUPLE | NLA_F_NESTED);
+        if (nest_parms == NULL)
+                goto nla_put_failure;
+
+        if (nla_put_be16(skb, NFCTH_TUPLE_L3PROTONUM,
+                         htons(helper->tuple.src.l3num)))
+                goto nla_put_failure;
+
+        if (nla_put_u8(skb, NFCTH_TUPLE_L4PROTONUM, helper->tuple.dst.protonum))
+                goto nla_put_failure;
+
+        nla_nest_end(skb, nest_parms);
+        return 0;
+
+nla_put_failure:
+        return -1;
+}
+
+static int
+nfnl_cthelper_dump_policy(struct sk_buff *skb,
+                        struct nf_conntrack_helper *helper)
+{
+        int i;
+        struct nlattr *nest_parms1, *nest_parms2;
+
+        nest_parms1 = nla_nest_start(skb, NFCTH_POLICY | NLA_F_NESTED);
+        if (nest_parms1 == NULL)
+                goto nla_put_failure;
+
+        if (nla_put_be32(skb, NFCTH_POLICY_SET_NUM,
+                         htonl(helper->expect_class_max)))
+                goto nla_put_failure;
+
+        for (i=0; i<helper->expect_class_max; i++) {
+                nest_parms2 = nla_nest_start(skb,
+                                (NFCTH_POLICY_SET+i) | NLA_F_NESTED);
+                if (nest_parms2 == NULL)
+                        goto nla_put_failure;
+
+                if (nla_put_string(skb, NFCTH_POLICY_NAME,
+                                   helper->expect_policy[i].name))
+                        goto nla_put_failure;
+
+                if (nla_put_be32(skb, NFCTH_POLICY_EXPECT_MAX,
+                                 htonl(helper->expect_policy[i].max_expected)))
+                        goto nla_put_failure;
+
+                if (nla_put_be32(skb, NFCTH_POLICY_EXPECT_TIMEOUT,
+                                 htonl(helper->expect_policy[i].timeout)))
+                        goto nla_put_failure;
+
+                nla_nest_end(skb, nest_parms2);
+        }
+        nla_nest_end(skb, nest_parms1);
+        return 0;
+
+nla_put_failure:
+        return -1;
+}
+
+static int
+nfnl_cthelper_fill_info(struct sk_buff *skb, u32 pid, u32 seq, u32 type,
+                        int event, struct nf_conntrack_helper *helper)
+{
+        struct nlmsghdr *nlh;
+        struct nfgenmsg *nfmsg;
+        unsigned int flags = pid ? NLM_F_MULTI : 0;
+        int status;
+
+        event |= NFNL_SUBSYS_CTHELPER << 8;
+        nlh = nlmsg_put(skb, pid, seq, event, sizeof(*nfmsg), flags);
+        if (nlh == NULL)
+                goto nlmsg_failure;
+
+        nfmsg = nlmsg_data(nlh);
+        nfmsg->nfgen_family = AF_UNSPEC;
+        nfmsg->version = NFNETLINK_V0;
+        nfmsg->res_id = 0;
+
+        if (nla_put_string(skb, NFCTH_NAME, helper->name))
+                goto nla_put_failure;
+
+        if (nla_put_be32(skb, NFCTH_QUEUE_NUM, htonl(helper->queue_num)))
+                goto nla_put_failure;
+
+        if (nfnl_cthelper_dump_tuple(skb, helper) < 0)
+                goto nla_put_failure;
+
+        if (nfnl_cthelper_dump_policy(skb, helper) < 0)
+                goto nla_put_failure;
+
+        if (nla_put_be32(skb, NFCTH_PRIV_DATA_LEN, htonl(helper->data_len)))
+                goto nla_put_failure;
+
+        if (helper->flags & NF_CT_HELPER_F_CONFIGURED)
+                status = NFCT_HELPER_STATUS_ENABLED;
+        else
+                status = NFCT_HELPER_STATUS_DISABLED;
+
+        if (nla_put_be32(skb, NFCTH_STATUS, htonl(status)))
+                goto nla_put_failure;
+
+        nlmsg_end(skb, nlh);
+        return skb->len;
+
+nlmsg_failure:
+nla_put_failure:
+        nlmsg_cancel(skb, nlh);
+        return -1;
+}
+
+static int
+nfnl_cthelper_dump_table(struct sk_buff *skb, struct netlink_callback *cb)
+{
+        struct nf_conntrack_helper *cur, *last;
+        struct hlist_node *n;
+
+        rcu_read_lock();
+        last = (struct nf_conntrack_helper *)cb->args[1];
+        for (; cb->args[0] < nf_ct_helper_hsize; cb->args[0]++) {
+restart:
+                hlist_for_each_entry_rcu(cur, n,
+                                &nf_ct_helper_hash[cb->args[0]], hnode) {
+
+                        /* skip non-userspace conntrack helpers. */
+                        if (!(cur->flags & NF_CT_HELPER_F_USERSPACE))
+                                continue;
+
+                        if (cb->args[1]) {
+                                if (cur != last)
+                                        continue;
+                                cb->args[1] = 0;
+                        }
+                        if (nfnl_cthelper_fill_info(skb,
+                                            NETLINK_CB(cb->skb).pid,
+                                            cb->nlh->nlmsg_seq,
+                                            NFNL_MSG_TYPE(cb->nlh->nlmsg_type),
+                                            NFNL_MSG_CTHELPER_NEW, cur) < 0) {
+                                cb->args[1] = (unsigned long)cur;
+                                goto out;
+                        }
+                }
+        }
+        if (cb->args[1]) {
+                cb->args[1] = 0;
+                goto restart;
+        }
+out:
+        rcu_read_unlock();
+        return skb->len;
+}
+
+static int
+nfnl_cthelper_get(struct sock *nfnl, struct sk_buff *skb,
+                  const struct nlmsghdr *nlh, const struct nlattr * const tb[])
+{
+        int ret = -ENOENT, i;
+        struct nf_conntrack_helper *cur;
+        struct hlist_node *n;
+        struct sk_buff *skb2;
+        char *helper_name = NULL;
+        struct nf_conntrack_tuple tuple;
+        bool tuple_set = false;
+
+        if (nlh->nlmsg_flags & NLM_F_DUMP) {
+                struct netlink_dump_control c = {
+                        .dump = nfnl_cthelper_dump_table,
+                };
+                return netlink_dump_start(nfnl, skb, nlh, &c);
+        }
+
+        if (tb[NFCTH_NAME])
+                helper_name = nla_data(tb[NFCTH_NAME]);
+
+        if (tb[NFCTH_TUPLE]) {
+                ret = nfnl_cthelper_parse_tuple(&tuple, tb[NFCTH_TUPLE]);
+                if (ret < 0)
+                        return ret;
+
+                tuple_set = true;
+        }
+
+        for (i = 0; i < nf_ct_helper_hsize; i++) {
+                hlist_for_each_entry_rcu(cur, n, &nf_ct_helper_hash[i], hnode) {
+
+                        /* skip non-userspace conntrack helpers. */
+                        if (!(cur->flags & NF_CT_HELPER_F_USERSPACE))
+                                continue;
+
+                        if (helper_name && strncmp(cur->name, helper_name,
+                                                NF_CT_HELPER_NAME_LEN) != 0) {
+                                continue;
+                        }
+                        if (tuple_set &&
+                            (tuple.src.l3num != cur->tuple.src.l3num ||
+                             tuple.dst.protonum != cur->tuple.dst.protonum))
+                                continue;
+
+                        skb2 = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);
+                        if (skb2 == NULL) {
+                                ret = -ENOMEM;
+                                break;
+                        }
+
+                        ret = nfnl_cthelper_fill_info(skb2, NETLINK_CB(skb).pid,
+                                                nlh->nlmsg_seq,
+                                                NFNL_MSG_TYPE(nlh->nlmsg_type),
+                                                NFNL_MSG_CTHELPER_NEW, cur);
+                        if (ret <= 0) {
+                                kfree_skb(skb2);
+                                break;
+                        }
+
+                        ret = netlink_unicast(nfnl, skb2, NETLINK_CB(skb).pid,
+                                                MSG_DONTWAIT);
+                        if (ret > 0)
+                                ret = 0;
+
+                        /* this avoids a loop in nfnetlink. */
+                        return ret == -EAGAIN ? -ENOBUFS : ret;
+                }
+        }
+        return ret;
+}
+
+static int
+nfnl_cthelper_del(struct sock *nfnl, struct sk_buff *skb,
+             const struct nlmsghdr *nlh, const struct nlattr * const tb[])
+{
+        char *helper_name = NULL;
+        struct nf_conntrack_helper *cur;
+        struct hlist_node *n, *tmp;
+        struct nf_conntrack_tuple tuple;
+        bool tuple_set = false, found = false;
+        int i, j = 0, ret;
+
+        if (tb[NFCTH_NAME])
+                helper_name = nla_data(tb[NFCTH_NAME]);
+
+        if (tb[NFCTH_TUPLE]) {
+                ret = nfnl_cthelper_parse_tuple(&tuple, tb[NFCTH_TUPLE]);
+                if (ret < 0)
+                        return ret;
+
+                tuple_set = true;
+        }
+
+        for (i = 0; i < nf_ct_helper_hsize; i++) {
+                hlist_for_each_entry_safe(cur, n, tmp, &nf_ct_helper_hash[i],
+                                                                hnode) {
+                        /* skip non-userspace conntrack helpers. */
+                        if (!(cur->flags & NF_CT_HELPER_F_USERSPACE))
+                                continue;
+
+                        j++;
+
+                        if (helper_name && strncmp(cur->name, helper_name,
+                                                NF_CT_HELPER_NAME_LEN) != 0) {
+                                continue;
+                        }
+                        if (tuple_set &&
+                            (tuple.src.l3num != cur->tuple.src.l3num ||
+                             tuple.dst.protonum != cur->tuple.dst.protonum))
+                                continue;
+
+                        found = true;
+                        nf_conntrack_helper_unregister(cur);
+                }
+        }
+        /* Make sure we return success if we flush and there is no helpers */
+        return (found || j == 0) ? 0 : -ENOENT;
+}
+
+static const struct nla_policy nfnl_cthelper_policy[NFCTH_MAX+1] = {
+        [NFCTH_NAME] = { .type = NLA_NUL_STRING,
+                         .len = NF_CT_HELPER_NAME_LEN-1 },
+        [NFCTH_QUEUE_NUM] = { .type = NLA_U32, },
+};
+
+static const struct nfnl_callback nfnl_cthelper_cb[NFNL_MSG_CTHELPER_MAX] = {
+        [NFNL_MSG_CTHELPER_NEW]         = { .call = nfnl_cthelper_new,
+                                            .attr_count = NFCTH_MAX,
+                                            .policy = nfnl_cthelper_policy },
+        [NFNL_MSG_CTHELPER_GET]         = { .call = nfnl_cthelper_get,
+                                            .attr_count = NFCTH_MAX,
+                                            .policy = nfnl_cthelper_policy },
+        [NFNL_MSG_CTHELPER_DEL]         = { .call = nfnl_cthelper_del,
+                                            .attr_count = NFCTH_MAX,
+                                            .policy = nfnl_cthelper_policy },
+};
+
+static const struct nfnetlink_subsystem nfnl_cthelper_subsys = {
+        .name                           = "cthelper",
+        .subsys_id                      = NFNL_SUBSYS_CTHELPER,
+        .cb_count                       = NFNL_MSG_CTHELPER_MAX,
+        .cb                             = nfnl_cthelper_cb,
+};
+
+MODULE_ALIAS_NFNL_SUBSYS(NFNL_SUBSYS_CTHELPER);
+
+static int __init nfnl_cthelper_init(void)
+{
+        int ret;
+
+        ret = nfnetlink_subsys_register(&nfnl_cthelper_subsys);
+        if (ret < 0) {
+                pr_err("nfnl_cthelper: cannot register with nfnetlink.\n");
+                goto err_out;
+        }
+        return 0;
+err_out:
+        return ret;
+}
+
+static void __exit nfnl_cthelper_exit(void)
+{
+        struct nf_conntrack_helper *cur;
+        struct hlist_node *n, *tmp;
+        int i;
+
+        nfnetlink_subsys_unregister(&nfnl_cthelper_subsys);
+
+        for (i=0; i<nf_ct_helper_hsize; i++) {
+                hlist_for_each_entry_safe(cur, n, tmp, &nf_ct_helper_hash[i],
+                                                                        hnode) {
+                        /* skip non-userspace conntrack helpers. */
+                        if (!(cur->flags & NF_CT_HELPER_F_USERSPACE))
+                                continue;
+
+                        nf_conntrack_helper_unregister(cur);
+                }
+        }
+}
+
+module_init(nfnl_cthelper_init);
+module_exit(nfnl_cthelper_exit);
diff --git a/net/netfilter/nfnetlink_cttimeout.c b/net/netfilter/nfnetlink_cttimeout.c
index 3e655288d1d..cdecbc8fe96 100644
--- a/net/netfilter/nfnetlink_cttimeout.c
+++ b/net/netfilter/nfnetlink_cttimeout.c
@@ -49,8 +49,9 @@ static const struct nla_policy cttimeout_nla_policy[CTA_TIMEOUT_MAX+1] = {
 
 static int
 ctnl_timeout_parse_policy(struct ctnl_timeout *timeout,
-                               struct nf_conntrack_l4proto *l4proto,
-                               const struct nlattr *attr)
+                          struct nf_conntrack_l4proto *l4proto,
+                          struct net *net,
+                          const struct nlattr *attr)
 {
         int ret = 0;
 
@@ -60,7 +61,8 @@ ctnl_timeout_parse_policy(struct ctnl_timeout *timeout,
                 nla_parse_nested(tb, l4proto->ctnl_timeout.nlattr_max,
                                  attr, l4proto->ctnl_timeout.nla_policy);
 
-                ret = l4proto->ctnl_timeout.nlattr_to_obj(tb, &timeout->data);
+                ret = l4proto->ctnl_timeout.nlattr_to_obj(tb, net,
+                                                          &timeout->data);
         }
         return ret;
 }
@@ -74,6 +76,7 @@ cttimeout_new_timeout(struct sock *ctnl, struct sk_buff *skb,
         __u8 l4num;
         struct nf_conntrack_l4proto *l4proto;
         struct ctnl_timeout *timeout, *matching = NULL;
+        struct net *net = sock_net(skb->sk);
         char *name;
         int ret;
 
@@ -117,7 +120,7 @@ cttimeout_new_timeout(struct sock *ctnl, struct sk_buff *skb,
                                 goto err_proto_put;
                         }
 
-                        ret = ctnl_timeout_parse_policy(matching, l4proto,
+                        ret = ctnl_timeout_parse_policy(matching, l4proto, net,
                                                         cda[CTA_TIMEOUT_DATA]);
                         return ret;
                 }
@@ -132,7 +135,7 @@ cttimeout_new_timeout(struct sock *ctnl, struct sk_buff *skb,
                 goto err_proto_put;
         }
 
-        ret = ctnl_timeout_parse_policy(timeout, l4proto,
+        ret = ctnl_timeout_parse_policy(timeout, l4proto, net,
                                         cda[CTA_TIMEOUT_DATA]);
         if (ret < 0)
                 goto err;
diff --git a/net/netfilter/nfnetlink_log.c b/net/netfilter/nfnetlink_log.c
index 3c3cfc0cc9b..169ab59ed9d 100644
--- a/net/netfilter/nfnetlink_log.c
+++ b/net/netfilter/nfnetlink_log.c
@@ -326,18 +326,20 @@ __nfulnl_send(struct nfulnl_instance *inst)
 {
         int status = -1;
 
-        if (inst->qlen > 1)
-                NLMSG_PUT(inst->skb, 0, 0,
-                          NLMSG_DONE,
-                          sizeof(struct nfgenmsg));
-
+        if (inst->qlen > 1) {
+                struct nlmsghdr *nlh = nlmsg_put(inst->skb, 0, 0,
+                                                 NLMSG_DONE,
+                                                 sizeof(struct nfgenmsg),
+                                                 0);
+                if (!nlh)
+                        goto out;
+        }
         status = nfnetlink_unicast(inst->skb, &init_net, inst->peer_pid,
                                    MSG_DONTWAIT);
 
         inst->qlen = 0;
         inst->skb = NULL;
-
-nlmsg_failure:
+out:
         return status;
 }
 
@@ -380,10 +382,12 @@ __build_packet_message(struct nfulnl_instance *inst,
         struct nfgenmsg *nfmsg;
         sk_buff_data_t old_tail = inst->skb->tail;
 
-        nlh = NLMSG_PUT(inst->skb, 0, 0,
+        nlh = nlmsg_put(inst->skb, 0, 0,
                         NFNL_SUBSYS_ULOG << 8 | NFULNL_MSG_PACKET,
-                        sizeof(struct nfgenmsg));
-        nfmsg = NLMSG_DATA(nlh);
+                        sizeof(struct nfgenmsg), 0);
+        if (!nlh)
+                return -1;
+        nfmsg = nlmsg_data(nlh);
         nfmsg->nfgen_family = pf;
         nfmsg->version = NFNETLINK_V0;
         nfmsg->res_id = htons(inst->group_num);
@@ -526,7 +530,7 @@ __build_packet_message(struct nfulnl_instance *inst,
 
                 if (skb_tailroom(inst->skb) < nla_total_size(data_len)) {
                         printk(KERN_WARNING "nfnetlink_log: no tailroom!\n");
-                        goto nlmsg_failure;
+                        return -1;
                 }
 
                 nla = (struct nlattr *)skb_put(inst->skb, nla_total_size(data_len));
@@ -540,7 +544,6 @@ __build_packet_message(struct nfulnl_instance *inst,
         nlh->nlmsg_len = inst->skb->tail - old_tail;
         return 0;
 
-nlmsg_failure:
 nla_put_failure:
         PRINTR(KERN_ERR "nfnetlink_log: error creating log nlmsg\n");
         return -1;
@@ -745,7 +748,7 @@ nfulnl_recv_config(struct sock *ctnl, struct sk_buff *skb,
                    const struct nlmsghdr *nlh,
                    const struct nlattr * const nfula[])
 {
-        struct nfgenmsg *nfmsg = NLMSG_DATA(nlh);
+        struct nfgenmsg *nfmsg = nlmsg_data(nlh);
         u_int16_t group_num = ntohs(nfmsg->res_id);
         struct nfulnl_instance *inst;
         struct nfulnl_msg_config_cmd *cmd = NULL;
diff --git a/net/netfilter/nfnetlink_queue.c b/net/netfilter/nfnetlink_queue_core.c
index 4162437b836..c0496a55ad0 100644
--- a/net/netfilter/nfnetlink_queue.c
+++ b/net/netfilter/nfnetlink_queue_core.c
@@ -30,6 +30,7 @@
 #include <linux/list.h>
 #include <net/sock.h>
 #include <net/netfilter/nf_queue.h>
+#include <net/netfilter/nfnetlink_queue.h>
 
 #include <linux/atomic.h>
 
@@ -52,6 +53,7 @@ struct nfqnl_instance {
 
         u_int16_t queue_num;                    /* number of this queue */
         u_int8_t copy_mode;
+        u_int32_t flags;                        /* Set using NFQA_CFG_FLAGS */
 /*
  * Following fields are dirtied for each queued packet,
  * keep them in same cache line if possible.
@@ -232,6 +234,8 @@ nfqnl_build_packet_message(struct nfqnl_instance *queue,
         struct sk_buff *entskb = entry->skb;
         struct net_device *indev;
         struct net_device *outdev;
+        struct nf_conn *ct = NULL;
+        enum ip_conntrack_info uninitialized_var(ctinfo);
 
         size =    NLMSG_SPACE(sizeof(struct nfgenmsg))
                 + nla_total_size(sizeof(struct nfqnl_msg_packet_hdr))
@@ -265,16 +269,22 @@ nfqnl_build_packet_message(struct nfqnl_instance *queue,
                 break;
         }
 
+        if (queue->flags & NFQA_CFG_F_CONNTRACK)
+                ct = nfqnl_ct_get(entskb, &size, &ctinfo);
 
         skb = alloc_skb(size, GFP_ATOMIC);
         if (!skb)
-                goto nlmsg_failure;
+                return NULL;
 
         old_tail = skb->tail;
-        nlh = NLMSG_PUT(skb, 0, 0,
+        nlh = nlmsg_put(skb, 0, 0,
                         NFNL_SUBSYS_QUEUE << 8 | NFQNL_MSG_PACKET,
-                        sizeof(struct nfgenmsg));
-        nfmsg = NLMSG_DATA(nlh);
+                        sizeof(struct nfgenmsg), 0);
+        if (!nlh) {
+                kfree_skb(skb);
+                return NULL;
+        }
+        nfmsg = nlmsg_data(nlh);
         nfmsg->nfgen_family = entry->pf;
         nfmsg->version = NFNETLINK_V0;
         nfmsg->res_id = htons(queue->queue_num);
@@ -377,7 +387,8 @@ nfqnl_build_packet_message(struct nfqnl_instance *queue,
 
                 if (skb_tailroom(skb) < nla_total_size(data_len)) {
                         printk(KERN_WARNING "nf_queue: no tailroom!\n");
-                        goto nlmsg_failure;
+                        kfree_skb(skb);
+                        return NULL;
                 }
 
                 nla = (struct nlattr *)skb_put(skb, nla_total_size(data_len));
@@ -388,10 +399,12 @@ nfqnl_build_packet_message(struct nfqnl_instance *queue,
                         BUG();
         }
 
+        if (ct && nfqnl_ct_put(skb, ct, ctinfo) < 0)
+                goto nla_put_failure;
+
         nlh->nlmsg_len = skb->tail - old_tail;
         return skb;
 
-nlmsg_failure:
 nla_put_failure:
         if (skb)
                 kfree_skb(skb);
@@ -406,6 +419,7 @@ nfqnl_enqueue_packet(struct nf_queue_entry *entry, unsigned int queuenum)
         struct nfqnl_instance *queue;
         int err = -ENOBUFS;
         __be32 *packet_id_ptr;
+        int failopen = 0;
 
         /* rcu_read_lock()ed by nf_hook_slow() */
         queue = instance_lookup(queuenum);
@@ -431,9 +445,14 @@ nfqnl_enqueue_packet(struct nf_queue_entry *entry, unsigned int queuenum)
                 goto err_out_free_nskb;
         }
         if (queue->queue_total >= queue->queue_maxlen) {
-                queue->queue_dropped++;
-                net_warn_ratelimited("nf_queue: full at %d entries, dropping packets(s)\n",
-                                     queue->queue_total);
+                if (queue->flags & NFQA_CFG_F_FAIL_OPEN) {
+                        failopen = 1;
+                        err = 0;
+                } else {
+                        queue->queue_dropped++;
+                        net_warn_ratelimited("nf_queue: full at %d entries, dropping packets(s)\n",
+                                             queue->queue_total);
+                }
                 goto err_out_free_nskb;
         }
         entry->id = ++queue->id_sequence;
@@ -455,17 +474,17 @@ err_out_free_nskb:
         kfree_skb(nskb);
 err_out_unlock:
         spin_unlock_bh(&queue->lock);
+        if (failopen)
+                nf_reinject(entry, NF_ACCEPT);
 err_out:
         return err;
 }
 
 static int
-nfqnl_mangle(void *data, int data_len, struct nf_queue_entry *e)
+nfqnl_mangle(void *data, int data_len, struct nf_queue_entry *e, int diff)
 {
         struct sk_buff *nskb;
-        int diff;
 
-        diff = data_len - e->skb->len;
         if (diff < 0) {
                 if (pskb_trim(e->skb, data_len))
                         return -ENOMEM;
@@ -623,6 +642,7 @@ static const struct nla_policy nfqa_verdict_policy[NFQA_MAX+1] = {
         [NFQA_VERDICT_HDR]      = { .len = sizeof(struct nfqnl_msg_verdict_hdr) },
         [NFQA_MARK]             = { .type = NLA_U32 },
         [NFQA_PAYLOAD]          = { .type = NLA_UNSPEC },
+        [NFQA_CT]               = { .type = NLA_UNSPEC },
 };
 
 static const struct nla_policy nfqa_verdict_batch_policy[NFQA_MAX+1] = {
@@ -670,7 +690,7 @@ nfqnl_recv_verdict_batch(struct sock *ctnl, struct sk_buff *skb,
                    const struct nlmsghdr *nlh,
                    const struct nlattr * const nfqa[])
 {
-        struct nfgenmsg *nfmsg = NLMSG_DATA(nlh);
+        struct nfgenmsg *nfmsg = nlmsg_data(nlh);
         struct nf_queue_entry *entry, *tmp;
         unsigned int verdict, maxid;
         struct nfqnl_msg_verdict_hdr *vhdr;
@@ -716,13 +736,15 @@ nfqnl_recv_verdict(struct sock *ctnl, struct sk_buff *skb,
                    const struct nlmsghdr *nlh,
                    const struct nlattr * const nfqa[])
 {
-        struct nfgenmsg *nfmsg = NLMSG_DATA(nlh);
+        struct nfgenmsg *nfmsg = nlmsg_data(nlh);
         u_int16_t queue_num = ntohs(nfmsg->res_id);
 
         struct nfqnl_msg_verdict_hdr *vhdr;
         struct nfqnl_instance *queue;
         unsigned int verdict;
         struct nf_queue_entry *entry;
+        enum ip_conntrack_info uninitialized_var(ctinfo);
+        struct nf_conn *ct = NULL;
 
         queue = instance_lookup(queue_num);
         if (!queue)
@@ -741,11 +763,22 @@ nfqnl_recv_verdict(struct sock *ctnl, struct sk_buff *skb,
         if (entry == NULL)
                 return -ENOENT;
 
+        rcu_read_lock();
+        if (nfqa[NFQA_CT] && (queue->flags & NFQA_CFG_F_CONNTRACK))
+                ct = nfqnl_ct_parse(entry->skb, nfqa[NFQA_CT], &ctinfo);
+
         if (nfqa[NFQA_PAYLOAD]) {
+                u16 payload_len = nla_len(nfqa[NFQA_PAYLOAD]);
+                int diff = payload_len - entry->skb->len;
+
                 if (nfqnl_mangle(nla_data(nfqa[NFQA_PAYLOAD]),
-                                 nla_len(nfqa[NFQA_PAYLOAD]), entry) < 0)
+                                 payload_len, entry, diff) < 0)
                         verdict = NF_DROP;
+
+                if (ct)
+                        nfqnl_ct_seq_adjust(skb, ct, ctinfo, diff);
         }
+        rcu_read_unlock();
 
         if (nfqa[NFQA_MARK])
                 entry->skb->mark = ntohl(nla_get_be32(nfqa[NFQA_MARK]));
@@ -777,7 +810,7 @@ nfqnl_recv_config(struct sock *ctnl, struct sk_buff *skb,
                   const struct nlmsghdr *nlh,
                   const struct nlattr * const nfqa[])
 {
-        struct nfgenmsg *nfmsg = NLMSG_DATA(nlh);
+        struct nfgenmsg *nfmsg = nlmsg_data(nlh);
         u_int16_t queue_num = ntohs(nfmsg->res_id);
         struct nfqnl_instance *queue;
         struct nfqnl_msg_config_cmd *cmd = NULL;
@@ -858,6 +891,36 @@ nfqnl_recv_config(struct sock *ctnl, struct sk_buff *skb,
                 spin_unlock_bh(&queue->lock);
         }
 
+        if (nfqa[NFQA_CFG_FLAGS]) {
+                __u32 flags, mask;
+
+                if (!queue) {
+                        ret = -ENODEV;
+                        goto err_out_unlock;
+                }
+
+                if (!nfqa[NFQA_CFG_MASK]) {
+                        /* A mask is needed to specify which flags are being
+                         * changed.
+                         */
+                        ret = -EINVAL;
+                        goto err_out_unlock;
+                }
+
+                flags = ntohl(nla_get_be32(nfqa[NFQA_CFG_FLAGS]));
+                mask = ntohl(nla_get_be32(nfqa[NFQA_CFG_MASK]));
+
+                if (flags >= NFQA_CFG_F_MAX) {
+                        ret = -EOPNOTSUPP;
+                        goto err_out_unlock;
+                }
+
+                spin_lock_bh(&queue->lock);
+                queue->flags &= ~mask;
+                queue->flags |= flags & mask;
+                spin_unlock_bh(&queue->lock);
+        }
+
 err_out_unlock:
         rcu_read_unlock();
         return ret;
diff --git a/net/netfilter/nfnetlink_queue_ct.c b/net/netfilter/nfnetlink_queue_ct.c
new file mode 100644
index 00000000000..ab61d66bc0b
--- /dev/null
+++ b/net/netfilter/nfnetlink_queue_ct.c
@@ -0,0 +1,98 @@
+/*
+ * (C) 2012 by Pablo Neira Ayuso <pablo@netfilter.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ */
+
+#include <linux/skbuff.h>
+#include <linux/netfilter.h>
+#include <linux/netfilter/nfnetlink.h>
+#include <linux/netfilter/nfnetlink_queue.h>
+#include <net/netfilter/nf_conntrack.h>
+#include <net/netfilter/nfnetlink_queue.h>
+
+struct nf_conn *nfqnl_ct_get(struct sk_buff *entskb, size_t *size,
+                             enum ip_conntrack_info *ctinfo)
+{
+        struct nfq_ct_hook *nfq_ct;
+        struct nf_conn *ct;
+
+        /* rcu_read_lock()ed by __nf_queue already. */
+        nfq_ct = rcu_dereference(nfq_ct_hook);
+        if (nfq_ct == NULL)
+                return NULL;
+
+        ct = nf_ct_get(entskb, ctinfo);
+        if (ct) {
+                if (!nf_ct_is_untracked(ct))
+                        *size += nfq_ct->build_size(ct);
+                else
+                        ct = NULL;
+        }
+        return ct;
+}
+
+struct nf_conn *
+nfqnl_ct_parse(const struct sk_buff *skb, const struct nlattr *attr,
+               enum ip_conntrack_info *ctinfo)
+{
+        struct nfq_ct_hook *nfq_ct;
+        struct nf_conn *ct;
+
+        /* rcu_read_lock()ed by __nf_queue already. */
+        nfq_ct = rcu_dereference(nfq_ct_hook);
+        if (nfq_ct == NULL)
+                return NULL;
+
+        ct = nf_ct_get(skb, ctinfo);
+        if (ct && !nf_ct_is_untracked(ct))
+                nfq_ct->parse(attr, ct);
+
+        return ct;
+}
+
+int nfqnl_ct_put(struct sk_buff *skb, struct nf_conn *ct,
+                 enum ip_conntrack_info ctinfo)
+{
+        struct nfq_ct_hook *nfq_ct;
+        struct nlattr *nest_parms;
+        u_int32_t tmp;
+
+        nfq_ct = rcu_dereference(nfq_ct_hook);
+        if (nfq_ct == NULL)
+                return 0;
+
+        nest_parms = nla_nest_start(skb, NFQA_CT | NLA_F_NESTED);
+        if (!nest_parms)
+                goto nla_put_failure;
+
+        if (nfq_ct->build(skb, ct) < 0)
+                goto nla_put_failure;
+
+        nla_nest_end(skb, nest_parms);
+
+        tmp = ctinfo;
+        if (nla_put_be32(skb, NFQA_CT_INFO, htonl(tmp)))
+                goto nla_put_failure;
+
+        return 0;
+
+nla_put_failure:
+        return -1;
+}
+
+void nfqnl_ct_seq_adjust(struct sk_buff *skb, struct nf_conn *ct,
+                         enum ip_conntrack_info ctinfo, int diff)
+{
+        struct nfq_ct_nat_hook *nfq_nat_ct;
+
+        nfq_nat_ct = rcu_dereference(nfq_ct_nat_hook);
+        if (nfq_nat_ct == NULL)
+                return;
+
+        if ((ct->status & IPS_NAT_MASK) && diff)
+                nfq_nat_ct->seq_adjust(skb, ct, ctinfo, diff);
+}
diff --git a/net/netfilter/xt_CT.c b/net/netfilter/xt_CT.c
index a51de9b052b..116018560c6 100644
--- a/net/netfilter/xt_CT.c
+++ b/net/netfilter/xt_CT.c
@@ -112,6 +112,8 @@ static int xt_ct_tg_check_v0(const struct xt_tgchk_param *par)
                 goto err3;
 
         if (info->helper[0]) {
+                struct nf_conntrack_helper *helper;
+
                 ret = -ENOENT;
                 proto = xt_ct_find_proto(par);
                 if (!proto) {
@@ -120,19 +122,21 @@ static int xt_ct_tg_check_v0(const struct xt_tgchk_param *par)
                         goto err3;
                 }
 
-                ret = -ENOMEM;
-                help = nf_ct_helper_ext_add(ct, GFP_KERNEL);
-                if (help == NULL)
-                        goto err3;
-
                 ret = -ENOENT;
-                help->helper = nf_conntrack_helper_try_module_get(info->helper,
-                                                                  par->family,
-                                                                  proto);
-                if (help->helper == NULL) {
+                helper = nf_conntrack_helper_try_module_get(info->helper,
+                                                            par->family,
+                                                            proto);
+                if (helper == NULL) {
                         pr_info("No such helper \"%s\"\n", info->helper);
                         goto err3;
                 }
+
+                ret = -ENOMEM;
+                help = nf_ct_helper_ext_add(ct, helper, GFP_KERNEL);
+                if (help == NULL)
+                        goto err3;
+
+                help->helper = helper;
         }
 
         __set_bit(IPS_TEMPLATE_BIT, &ct->status);
@@ -202,6 +206,8 @@ static int xt_ct_tg_check_v1(const struct xt_tgchk_param *par)
                 goto err3;
 
         if (info->helper[0]) {
+                struct nf_conntrack_helper *helper;
+
                 ret = -ENOENT;
                 proto = xt_ct_find_proto(par);
                 if (!proto) {
@@ -210,19 +216,21 @@ static int xt_ct_tg_check_v1(const struct xt_tgchk_param *par)
                         goto err3;
                 }
 
-                ret = -ENOMEM;
-                help = nf_ct_helper_ext_add(ct, GFP_KERNEL);
-                if (help == NULL)
-                        goto err3;
-
                 ret = -ENOENT;
-                help->helper = nf_conntrack_helper_try_module_get(info->helper,
-                                                                  par->family,
-                                                                  proto);
-                if (help->helper == NULL) {
+                helper = nf_conntrack_helper_try_module_get(info->helper,
+                                                            par->family,
+                                                            proto);
+                if (helper == NULL) {
                         pr_info("No such helper \"%s\"\n", info->helper);
                         goto err3;
                 }
+
+                ret = -ENOMEM;
+                help = nf_ct_helper_ext_add(ct, helper, GFP_KERNEL);
+                if (help == NULL)
+                        goto err3;
+
+                help->helper = helper;
         }
 
 #ifdef CONFIG_NF_CONNTRACK_TIMEOUT
diff --git a/net/netfilter/xt_NFQUEUE.c b/net/netfilter/xt_NFQUEUE.c
index 95237c89607..7babe7d6871 100644
--- a/net/netfilter/xt_NFQUEUE.c
+++ b/net/netfilter/xt_NFQUEUE.c
@@ -41,26 +41,36 @@ nfqueue_tg(struct sk_buff *skb, const struct xt_action_param *par)
 static u32 hash_v4(const struct sk_buff *skb)
 {
         const struct iphdr *iph = ip_hdr(skb);
-        __be32 ipaddr;
 
         /* packets in either direction go into same queue */
-        ipaddr = iph->saddr ^ iph->daddr;
+        if (iph->saddr < iph->daddr)
+                return jhash_3words((__force u32)iph->saddr,
+                        (__force u32)iph->daddr, iph->protocol, jhash_initval);
 
-        return jhash_2words((__force u32)ipaddr, iph->protocol, jhash_initval);
+        return jhash_3words((__force u32)iph->daddr,
+                        (__force u32)iph->saddr, iph->protocol, jhash_initval);
 }
 
 #if IS_ENABLED(CONFIG_IP6_NF_IPTABLES)
 static u32 hash_v6(const struct sk_buff *skb)
 {
         const struct ipv6hdr *ip6h = ipv6_hdr(skb);
-        __be32 addr[4];
+        u32 a, b, c;
+
+        if (ip6h->saddr.s6_addr32[3] < ip6h->daddr.s6_addr32[3]) {
+                a = (__force u32) ip6h->saddr.s6_addr32[3];
+                b = (__force u32) ip6h->daddr.s6_addr32[3];
+        } else {
+                b = (__force u32) ip6h->saddr.s6_addr32[3];
+                a = (__force u32) ip6h->daddr.s6_addr32[3];
+        }
 
-        addr[0] = ip6h->saddr.s6_addr32[0] ^ ip6h->daddr.s6_addr32[0];
-        addr[1] = ip6h->saddr.s6_addr32[1] ^ ip6h->daddr.s6_addr32[1];
-        addr[2] = ip6h->saddr.s6_addr32[2] ^ ip6h->daddr.s6_addr32[2];
-        addr[3] = ip6h->saddr.s6_addr32[3] ^ ip6h->daddr.s6_addr32[3];
+        if (ip6h->saddr.s6_addr32[1] < ip6h->daddr.s6_addr32[1])
+                c = (__force u32) ip6h->saddr.s6_addr32[1];
+        else
+                c = (__force u32) ip6h->daddr.s6_addr32[1];
 
-        return jhash2((__force u32 *)addr, ARRAY_SIZE(addr), jhash_initval);
+        return jhash_3words(a, b, c, jhash_initval);
 }
 #endif
 
diff --git a/net/netfilter/xt_TPROXY.c b/net/netfilter/xt_TPROXY.c
index 146033a86de..d7f195388f6 100644
--- a/net/netfilter/xt_TPROXY.c
+++ b/net/netfilter/xt_TPROXY.c
@@ -69,7 +69,7 @@ tproxy_laddr4(struct sk_buff *skb, __be32 user_laddr, __be32 daddr)
 }
 
 /**
- * tproxy_handle_time_wait4() - handle IPv4 TCP TIME_WAIT reopen redirections
+ * tproxy_handle_time_wait4 - handle IPv4 TCP TIME_WAIT reopen redirections
  * @skb:        The skb being processed.
  * @laddr:      IPv4 address to redirect to or zero.
  * @lport:      TCP port to redirect to or zero.
@@ -220,7 +220,7 @@ tproxy_laddr6(struct sk_buff *skb, const struct in6_addr *user_laddr,
 }
 
 /**
- * tproxy_handle_time_wait6() - handle IPv6 TCP TIME_WAIT reopen redirections
+ * tproxy_handle_time_wait6 - handle IPv6 TCP TIME_WAIT reopen redirections
  * @skb:        The skb being processed.
  * @tproto:     Transport protocol.
  * @thoff:      Transport protocol header offset.
diff --git a/net/netfilter/xt_connlimit.c b/net/netfilter/xt_connlimit.c
index c6d5a83450c..70b5591a258 100644
--- a/net/netfilter/xt_connlimit.c
+++ b/net/netfilter/xt_connlimit.c
@@ -274,38 +274,25 @@ static void connlimit_mt_destroy(const struct xt_mtdtor_param *par)
         kfree(info->data);
 }
 
-static struct xt_match connlimit_mt_reg[] __read_mostly = {
-        {
-                .name       = "connlimit",
-                .revision   = 0,
-                .family     = NFPROTO_UNSPEC,
-                .checkentry = connlimit_mt_check,
-                .match      = connlimit_mt,
-                .matchsize  = sizeof(struct xt_connlimit_info),
-                .destroy    = connlimit_mt_destroy,
-                .me         = THIS_MODULE,
-        },
-        {
-                .name       = "connlimit",
-                .revision   = 1,
-                .family     = NFPROTO_UNSPEC,
-                .checkentry = connlimit_mt_check,
-                .match      = connlimit_mt,
-                .matchsize  = sizeof(struct xt_connlimit_info),
-                .destroy    = connlimit_mt_destroy,
-                .me         = THIS_MODULE,
-        },
+static struct xt_match connlimit_mt_reg __read_mostly = {
+        .name       = "connlimit",
+        .revision   = 1,
+        .family     = NFPROTO_UNSPEC,
+        .checkentry = connlimit_mt_check,
+        .match      = connlimit_mt,
+        .matchsize  = sizeof(struct xt_connlimit_info),
+        .destroy    = connlimit_mt_destroy,
+        .me         = THIS_MODULE,
 };
 
 static int __init connlimit_mt_init(void)
 {
-        return xt_register_matches(connlimit_mt_reg,
-               ARRAY_SIZE(connlimit_mt_reg));
+        return xt_register_match(&connlimit_mt_reg);
 }
 
 static void __exit connlimit_mt_exit(void)
 {
-        xt_unregister_matches(connlimit_mt_reg, ARRAY_SIZE(connlimit_mt_reg));
+        xt_unregister_match(&connlimit_mt_reg);
 }
 
 module_init(connlimit_mt_init);
diff --git a/net/netfilter/xt_recent.c b/net/netfilter/xt_recent.c
index fc0d6dbe5d1..ae2ad1eec8d 100644
--- a/net/netfilter/xt_recent.c
+++ b/net/netfilter/xt_recent.c
@@ -75,6 +75,7 @@ struct recent_entry {
 struct recent_table {
         struct list_head        list;
         char                    name[XT_RECENT_NAME_LEN];
+        union nf_inet_addr      mask;
         unsigned int            refcnt;
         unsigned int            entries;
         struct list_head        lru_list;
@@ -228,10 +229,10 @@ recent_mt(const struct sk_buff *skb, struct xt_action_param *par)
 {
         struct net *net = dev_net(par->in ? par->in : par->out);
         struct recent_net *recent_net = recent_pernet(net);
-        const struct xt_recent_mtinfo *info = par->matchinfo;
+        const struct xt_recent_mtinfo_v1 *info = par->matchinfo;
         struct recent_table *t;
         struct recent_entry *e;
-        union nf_inet_addr addr = {};
+        union nf_inet_addr addr = {}, addr_mask;
         u_int8_t ttl;
         bool ret = info->invert;
 
@@ -261,12 +262,15 @@ recent_mt(const struct sk_buff *skb, struct xt_action_param *par)
 
         spin_lock_bh(&recent_lock);
         t = recent_table_lookup(recent_net, info->name);
-        e = recent_entry_lookup(t, &addr, par->family,
+
+        nf_inet_addr_mask(&addr, &addr_mask, &t->mask);
+
+        e = recent_entry_lookup(t, &addr_mask, par->family,
                                 (info->check_set & XT_RECENT_TTL) ? ttl : 0);
         if (e == NULL) {
                 if (!(info->check_set & XT_RECENT_SET))
                         goto out;
-                e = recent_entry_init(t, &addr, par->family, ttl);
+                e = recent_entry_init(t, &addr_mask, par->family, ttl);
                 if (e == NULL)
                         par->hotdrop = true;
                 ret = !ret;
@@ -306,10 +310,10 @@ out:
         return ret;
 }
 
-static int recent_mt_check(const struct xt_mtchk_param *par)
+static int recent_mt_check(const struct xt_mtchk_param *par,
+                           const struct xt_recent_mtinfo_v1 *info)
 {
         struct recent_net *recent_net = recent_pernet(par->net);
-        const struct xt_recent_mtinfo *info = par->matchinfo;
         struct recent_table *t;
 #ifdef CONFIG_PROC_FS
         struct proc_dir_entry *pde;
@@ -361,6 +365,8 @@ static int recent_mt_check(const struct xt_mtchk_param *par)
                 goto out;
         }
         t->refcnt = 1;
+
+        memcpy(&t->mask, &info->mask, sizeof(t->mask));
         strcpy(t->name, info->name);
         INIT_LIST_HEAD(&t->lru_list);
         for (i = 0; i < ip_list_hash_size; i++)
@@ -385,10 +391,28 @@ out:
         return ret;
 }
 
+static int recent_mt_check_v0(const struct xt_mtchk_param *par)
+{
+        const struct xt_recent_mtinfo_v0 *info_v0 = par->matchinfo;
+        struct xt_recent_mtinfo_v1 info_v1;
+
+        /* Copy revision 0 structure to revision 1 */
+        memcpy(&info_v1, info_v0, sizeof(struct xt_recent_mtinfo));
+        /* Set default mask to ensure backward compatible behaviour */
+        memset(info_v1.mask.all, 0xFF, sizeof(info_v1.mask.all));
+
+        return recent_mt_check(par, &info_v1);
+}
+
+static int recent_mt_check_v1(const struct xt_mtchk_param *par)
+{
+        return recent_mt_check(par, par->matchinfo);
+}
+
 static void recent_mt_destroy(const struct xt_mtdtor_param *par)
 {
         struct recent_net *recent_net = recent_pernet(par->net);
-        const struct xt_recent_mtinfo *info = par->matchinfo;
+        const struct xt_recent_mtinfo_v1 *info = par->matchinfo;
         struct recent_table *t;
 
         mutex_lock(&recent_mutex);
@@ -625,7 +649,7 @@ static struct xt_match recent_mt_reg[] __read_mostly = {
                 .family     = NFPROTO_IPV4,
                 .match      = recent_mt,
                 .matchsize  = sizeof(struct xt_recent_mtinfo),
-                .checkentry = recent_mt_check,
+                .checkentry = recent_mt_check_v0,
                 .destroy    = recent_mt_destroy,
                 .me         = THIS_MODULE,
         },
@@ -635,10 +659,30 @@ static struct xt_match recent_mt_reg[] __read_mostly = {
                 .family     = NFPROTO_IPV6,
                 .match      = recent_mt,
                 .matchsize  = sizeof(struct xt_recent_mtinfo),
-                .checkentry = recent_mt_check,
+                .checkentry = recent_mt_check_v0,
+                .destroy    = recent_mt_destroy,
+                .me         = THIS_MODULE,
+        },
+        {
+                .name       = "recent",
+                .revision   = 1,
+                .family     = NFPROTO_IPV4,
+                .match      = recent_mt,
+                .matchsize  = sizeof(struct xt_recent_mtinfo_v1),
+                .checkentry = recent_mt_check_v1,
                 .destroy    = recent_mt_destroy,
                 .me         = THIS_MODULE,
         },
+        {
+                .name       = "recent",
+                .revision   = 1,
+                .family     = NFPROTO_IPV6,
+                .match      = recent_mt,
+                .matchsize  = sizeof(struct xt_recent_mtinfo_v1),
+                .checkentry = recent_mt_check_v1,
+                .destroy    = recent_mt_destroy,
+                .me         = THIS_MODULE,
+        }
 };
 
 static int __init recent_mt_init(void)
diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c
index b3025a603d5..5463969da45 100644
--- a/net/netlink/af_netlink.c
+++ b/net/netlink/af_netlink.c
@@ -80,6 +80,7 @@ struct netlink_sock {
         struct mutex            *cb_mutex;
         struct mutex            cb_def_mutex;
         void                    (*netlink_rcv)(struct sk_buff *skb);
+        void                    (*netlink_bind)(int group);
         struct module           *module;
 };
 
@@ -124,6 +125,7 @@ struct netlink_table {
         unsigned int            groups;
         struct mutex            *cb_mutex;
         struct module           *module;
+        void                    (*bind)(int group);
         int                     registered;
 };
 
@@ -444,6 +446,7 @@ static int netlink_create(struct net *net, struct socket *sock, int protocol,
         struct module *module = NULL;
         struct mutex *cb_mutex;
         struct netlink_sock *nlk;
+        void (*bind)(int group);
         int err = 0;
 
         sock->state = SS_UNCONNECTED;
@@ -468,6 +471,7 @@ static int netlink_create(struct net *net, struct socket *sock, int protocol,
         else
                 err = -EPROTONOSUPPORT;
         cb_mutex = nl_table[protocol].cb_mutex;
+        bind = nl_table[protocol].bind;
         netlink_unlock_table();
 
         if (err < 0)
@@ -483,6 +487,7 @@ static int netlink_create(struct net *net, struct socket *sock, int protocol,
 
         nlk = nlk_sk(sock->sk);
         nlk->module = module;
+        nlk->netlink_bind = bind;
 out:
         return err;
 
@@ -683,6 +688,15 @@ static int netlink_bind(struct socket *sock, struct sockaddr *addr,
         netlink_update_listeners(sk);
         netlink_table_ungrab();
 
+        if (nlk->netlink_bind && nlk->groups[0]) {
+                int i;
+
+                for (i=0; i<nlk->ngroups; i++) {
+                        if (test_bit(i, nlk->groups))
+                                nlk->netlink_bind(i);
+                }
+        }
+
         return 0;
 }
 
@@ -1239,6 +1253,10 @@ static int netlink_setsockopt(struct socket *sock, int level, int optname,
                 netlink_update_socket_mc(nlk, val,
                                          optname == NETLINK_ADD_MEMBERSHIP);
                 netlink_table_ungrab();
+
+                if (nlk->netlink_bind)
+                        nlk->netlink_bind(val);
+
                 err = 0;
                 break;
         }
@@ -1503,14 +1521,16 @@ static void netlink_data_ready(struct sock *sk, int len)
  */
 
 struct sock *
-netlink_kernel_create(struct net *net, int unit, unsigned int groups,
-                      void (*input)(struct sk_buff *skb),
-                      struct mutex *cb_mutex, struct module *module)
+netlink_kernel_create(struct net *net, int unit,
+                      struct module *module,
+                      struct netlink_kernel_cfg *cfg)
 {
         struct socket *sock;
         struct sock *sk;
         struct netlink_sock *nlk;
         struct listeners *listeners = NULL;
+        struct mutex *cb_mutex = cfg ? cfg->cb_mutex : NULL;
+        unsigned int groups;
 
         BUG_ON(!nl_table);
 
@@ -1532,16 +1552,18 @@ netlink_kernel_create(struct net *net, int unit, unsigned int groups,
         sk = sock->sk;
         sk_change_net(sk, net);
 
-        if (groups < 32)
+        if (!cfg || cfg->groups < 32)
                 groups = 32;
+        else
+                groups = cfg->groups;
 
         listeners = kzalloc(sizeof(*listeners) + NLGRPSZ(groups), GFP_KERNEL);
         if (!listeners)
                 goto out_sock_release;
 
         sk->sk_data_ready = netlink_data_ready;
-        if (input)
-                nlk_sk(sk)->netlink_rcv = input;
+        if (cfg && cfg->input)
+                nlk_sk(sk)->netlink_rcv = cfg->input;
 
         if (netlink_insert(sk, net, 0))
                 goto out_sock_release;
@@ -1555,6 +1577,7 @@ netlink_kernel_create(struct net *net, int unit, unsigned int groups,
                 rcu_assign_pointer(nl_table[unit].listeners, listeners);
                 nl_table[unit].cb_mutex = cb_mutex;
                 nl_table[unit].module = module;
+                nl_table[unit].bind = cfg ? cfg->bind : NULL;
                 nl_table[unit].registered = 1;
         } else {
                 kfree(listeners);
diff --git a/net/netlink/genetlink.c b/net/netlink/genetlink.c
index 2cc7c1ee769..62ebe3c6291 100644
--- a/net/netlink/genetlink.c
+++ b/net/netlink/genetlink.c
@@ -504,7 +504,7 @@ EXPORT_SYMBOL(genl_unregister_family);
  * @pid: netlink pid the message is addressed to
  * @seq: sequence number (usually the one of the sender)
  * @family: generic netlink family
- * @flags netlink message flags
+ * @flags: netlink message flags
  * @cmd: generic netlink command
  *
  * Returns pointer to user specific header
@@ -915,10 +915,14 @@ static struct genl_multicast_group notify_grp = {
 
 static int __net_init genl_pernet_init(struct net *net)
 {
+        struct netlink_kernel_cfg cfg = {
+                .input          = genl_rcv,
+                .cb_mutex       = &genl_mutex,
+        };
+
         /* we'll bump the group number right afterwards */
-        net->genl_sock = netlink_kernel_create(net, NETLINK_GENERIC, 0,
-                                               genl_rcv, &genl_mutex,
-                                               THIS_MODULE);
+        net->genl_sock = netlink_kernel_create(net, NETLINK_GENERIC,
+                                               THIS_MODULE, &cfg);
 
         if (!net->genl_sock && net_eq(net, &init_net))
                 panic("GENL: Cannot initialize generic netlink\n");
diff --git a/net/nfc/core.c b/net/nfc/core.c
index 9f6ce011d35..4177bb5104b 100644
--- a/net/nfc/core.c
+++ b/net/nfc/core.c
@@ -121,14 +121,14 @@ error:
  * The device remains polling for targets until a target is found or
  * the nfc_stop_poll function is called.
  */
-int nfc_start_poll(struct nfc_dev *dev, u32 protocols)
+int nfc_start_poll(struct nfc_dev *dev, u32 im_protocols, u32 tm_protocols)
 {
         int rc;
 
-        pr_debug("dev_name=%s protocols=0x%x\n",
-                 dev_name(&dev->dev), protocols);
+        pr_debug("dev_name %s initiator protocols 0x%x target protocols 0x%x\n",
+                 dev_name(&dev->dev), im_protocols, tm_protocols);
 
-        if (!protocols)
+        if (!im_protocols && !tm_protocols)
                 return -EINVAL;
 
         device_lock(&dev->dev);
@@ -143,9 +143,11 @@ int nfc_start_poll(struct nfc_dev *dev, u32 protocols)
                 goto error;
         }
 
-        rc = dev->ops->start_poll(dev, protocols);
-        if (!rc)
+        rc = dev->ops->start_poll(dev, im_protocols, tm_protocols);
+        if (!rc) {
                 dev->polling = true;
+                dev->rf_mode = NFC_RF_NONE;
+        }
 
 error:
         device_unlock(&dev->dev);
@@ -235,8 +237,10 @@ int nfc_dep_link_up(struct nfc_dev *dev, int target_index, u8 comm_mode)
         }
 
         rc = dev->ops->dep_link_up(dev, target, comm_mode, gb, gb_len);
-        if (!rc)
+        if (!rc) {
                 dev->active_target = target;
+                dev->rf_mode = NFC_RF_INITIATOR;
+        }
 
 error:
         device_unlock(&dev->dev);
@@ -264,11 +268,6 @@ int nfc_dep_link_down(struct nfc_dev *dev)
                 goto error;
         }
 
-        if (dev->dep_rf_mode == NFC_RF_TARGET) {
-                rc = -EOPNOTSUPP;
-                goto error;
-        }
-
         rc = dev->ops->dep_link_down(dev);
         if (!rc) {
                 dev->dep_link_up = false;
@@ -286,7 +285,6 @@ int nfc_dep_link_is_up(struct nfc_dev *dev, u32 target_idx,
                        u8 comm_mode, u8 rf_mode)
 {
         dev->dep_link_up = true;
-        dev->dep_rf_mode = rf_mode;
 
         nfc_llcp_mac_is_up(dev, target_idx, comm_mode, rf_mode);
 
@@ -330,6 +328,7 @@ int nfc_activate_target(struct nfc_dev *dev, u32 target_idx, u32 protocol)
         rc = dev->ops->activate_target(dev, target, protocol);
         if (!rc) {
                 dev->active_target = target;
+                dev->rf_mode = NFC_RF_INITIATOR;
 
                 if (dev->ops->check_presence)
                         mod_timer(&dev->check_pres_timer, jiffies +
@@ -409,27 +408,30 @@ int nfc_data_exchange(struct nfc_dev *dev, u32 target_idx, struct sk_buff *skb,
                 goto error;
         }
 
-        if (dev->active_target == NULL) {
-                rc = -ENOTCONN;
-                kfree_skb(skb);
-                goto error;
-        }
+        if (dev->rf_mode == NFC_RF_INITIATOR && dev->active_target != NULL) {
+                if (dev->active_target->idx != target_idx) {
+                        rc = -EADDRNOTAVAIL;
+                        kfree_skb(skb);
+                        goto error;
+                }
 
-        if (dev->active_target->idx != target_idx) {
-                rc = -EADDRNOTAVAIL;
+                if (dev->ops->check_presence)
+                        del_timer_sync(&dev->check_pres_timer);
+
+                rc = dev->ops->im_transceive(dev, dev->active_target, skb, cb,
+                                             cb_context);
+
+                if (!rc && dev->ops->check_presence)
+                        mod_timer(&dev->check_pres_timer, jiffies +
+                                  msecs_to_jiffies(NFC_CHECK_PRES_FREQ_MS));
+        } else if (dev->rf_mode == NFC_RF_TARGET && dev->ops->tm_send != NULL) {
+                rc = dev->ops->tm_send(dev, skb);
+        } else {
+                rc = -ENOTCONN;
                 kfree_skb(skb);
                 goto error;
         }
 
-        if (dev->ops->check_presence)
-                del_timer_sync(&dev->check_pres_timer);
-
-        rc = dev->ops->data_exchange(dev, dev->active_target, skb, cb,
-                                     cb_context);
-
-        if (!rc && dev->ops->check_presence)
-                mod_timer(&dev->check_pres_timer, jiffies +
-                          msecs_to_jiffies(NFC_CHECK_PRES_FREQ_MS));
 
 error:
         device_unlock(&dev->dev);
@@ -447,6 +449,63 @@ int nfc_set_remote_general_bytes(struct nfc_dev *dev, u8 *gb, u8 gb_len)
 }
 EXPORT_SYMBOL(nfc_set_remote_general_bytes);
 
+u8 *nfc_get_local_general_bytes(struct nfc_dev *dev, size_t *gb_len)
+{
+        pr_debug("dev_name=%s\n", dev_name(&dev->dev));
+
+        return nfc_llcp_general_bytes(dev, gb_len);
+}
+EXPORT_SYMBOL(nfc_get_local_general_bytes);
+
+int nfc_tm_data_received(struct nfc_dev *dev, struct sk_buff *skb)
+{
+        /* Only LLCP target mode for now */
+        if (dev->dep_link_up == false) {
+                kfree_skb(skb);
+                return -ENOLINK;
+        }
+
+        return nfc_llcp_data_received(dev, skb);
+}
+EXPORT_SYMBOL(nfc_tm_data_received);
+
+int nfc_tm_activated(struct nfc_dev *dev, u32 protocol, u8 comm_mode,
+                     u8 *gb, size_t gb_len)
+{
+        int rc;
+
+        device_lock(&dev->dev);
+
+        dev->polling = false;
+
+        if (gb != NULL) {
+                rc = nfc_set_remote_general_bytes(dev, gb, gb_len);
+                if (rc < 0)
+                        goto out;
+        }
+
+        dev->rf_mode = NFC_RF_TARGET;
+
+        if (protocol == NFC_PROTO_NFC_DEP_MASK)
+                nfc_dep_link_is_up(dev, 0, comm_mode, NFC_RF_TARGET);
+
+        rc = nfc_genl_tm_activated(dev, protocol);
+
+out:
+        device_unlock(&dev->dev);
+
+        return rc;
+}
+EXPORT_SYMBOL(nfc_tm_activated);
+
+int nfc_tm_deactivated(struct nfc_dev *dev)
+{
+        dev->dep_link_up = false;
+
+        return nfc_genl_tm_deactivated(dev);
+}
+EXPORT_SYMBOL(nfc_tm_deactivated);
+
 /**
  * nfc_alloc_send_skb - allocate a skb for data exchange responses
  *
@@ -678,7 +737,7 @@ struct nfc_dev *nfc_allocate_device(struct nfc_ops *ops,
         struct nfc_dev *dev;
 
         if (!ops->start_poll || !ops->stop_poll || !ops->activate_target ||
-            !ops->deactivate_target || !ops->data_exchange)
+            !ops->deactivate_target || !ops->im_transceive)
                 return NULL;
 
         if (!supported_protocols)
diff --git a/net/nfc/hci/core.c b/net/nfc/hci/core.c
index e1a640d2b58..a8b0b71e8f8 100644
--- a/net/nfc/hci/core.c
+++ b/net/nfc/hci/core.c
@@ -481,12 +481,13 @@ static int hci_dev_down(struct nfc_dev *nfc_dev)
         return 0;
 }
 
-static int hci_start_poll(struct nfc_dev *nfc_dev, u32 protocols)
+static int hci_start_poll(struct nfc_dev *nfc_dev,
+                          u32 im_protocols, u32 tm_protocols)
 {
         struct nfc_hci_dev *hdev = nfc_get_drvdata(nfc_dev);
 
         if (hdev->ops->start_poll)
-                return hdev->ops->start_poll(hdev, protocols);
+                return hdev->ops->start_poll(hdev, im_protocols, tm_protocols);
         else
                 return nfc_hci_send_event(hdev, NFC_HCI_RF_READER_A_GATE,
                                        NFC_HCI_EVT_READER_REQUESTED, NULL, 0);
@@ -511,9 +512,9 @@ static void hci_deactivate_target(struct nfc_dev *nfc_dev,
 {
 }
 
-static int hci_data_exchange(struct nfc_dev *nfc_dev, struct nfc_target *target,
-                             struct sk_buff *skb, data_exchange_cb_t cb,
-                             void *cb_context)
+static int hci_transceive(struct nfc_dev *nfc_dev, struct nfc_target *target,
+                          struct sk_buff *skb, data_exchange_cb_t cb,
+                          void *cb_context)
 {
         struct nfc_hci_dev *hdev = nfc_get_drvdata(nfc_dev);
         int r;
@@ -579,7 +580,7 @@ static struct nfc_ops hci_nfc_ops = {
         .stop_poll = hci_stop_poll,
         .activate_target = hci_activate_target,
         .deactivate_target = hci_deactivate_target,
-        .data_exchange = hci_data_exchange,
+        .im_transceive = hci_transceive,
         .check_presence = hci_check_presence,
 };
 
diff --git a/net/nfc/hci/shdlc.c b/net/nfc/hci/shdlc.c
index 5665dc6d893..6b836e6242b 100644
--- a/net/nfc/hci/shdlc.c
+++ b/net/nfc/hci/shdlc.c
@@ -765,14 +765,16 @@ static int nfc_shdlc_xmit(struct nfc_hci_dev *hdev, struct sk_buff *skb)
         return 0;
 }
 
-static int nfc_shdlc_start_poll(struct nfc_hci_dev *hdev, u32 protocols)
+static int nfc_shdlc_start_poll(struct nfc_hci_dev *hdev,
+                                u32 im_protocols, u32 tm_protocols)
 {
         struct nfc_shdlc *shdlc = nfc_hci_get_clientdata(hdev);
 
         pr_debug("\n");
 
         if (shdlc->ops->start_poll)
-                return shdlc->ops->start_poll(shdlc, protocols);
+                return shdlc->ops->start_poll(shdlc,
+                                              im_protocols, tm_protocols);
 
         return 0;
 }
diff --git a/net/nfc/llcp/commands.c b/net/nfc/llcp/commands.c
index bf8ae4f0b90..b982b5b890d 100644
--- a/net/nfc/llcp/commands.c
+++ b/net/nfc/llcp/commands.c
@@ -51,7 +51,7 @@ static u8 llcp_tlv8(u8 *tlv, u8 type)
         return tlv[2];
 }
 
-static u8 llcp_tlv16(u8 *tlv, u8 type)
+static u16 llcp_tlv16(u8 *tlv, u8 type)
 {
         if (tlv[0] != type || tlv[1] != llcp_tlv_length[tlv[0]])
                 return 0;
@@ -67,7 +67,7 @@ static u8 llcp_tlv_version(u8 *tlv)
 
 static u16 llcp_tlv_miux(u8 *tlv)
 {
-        return llcp_tlv16(tlv, LLCP_TLV_MIUX) & 0x7f;
+        return llcp_tlv16(tlv, LLCP_TLV_MIUX) & 0x7ff;
 }
 
 static u16 llcp_tlv_wks(u8 *tlv)
@@ -117,8 +117,8 @@ u8 *nfc_llcp_build_tlv(u8 type, u8 *value, u8 value_length, u8 *tlv_length)
         return tlv;
 }
 
-int nfc_llcp_parse_tlv(struct nfc_llcp_local *local,
-                       u8 *tlv_array, u16 tlv_array_len)
+int nfc_llcp_parse_gb_tlv(struct nfc_llcp_local *local,
+                          u8 *tlv_array, u16 tlv_array_len)
 {
         u8 *tlv = tlv_array, type, length, offset = 0;
 
@@ -149,8 +149,45 @@ int nfc_llcp_parse_tlv(struct nfc_llcp_local *local,
                 case LLCP_TLV_OPT:
                         local->remote_opt = llcp_tlv_opt(tlv);
                         break;
+                default:
+                        pr_err("Invalid gt tlv value 0x%x\n", type);
+                        break;
+                }
+
+                offset += length + 2;
+                tlv += length + 2;
+        }
+
+        pr_debug("version 0x%x miu %d lto %d opt 0x%x wks 0x%x\n",
+                 local->remote_version, local->remote_miu,
+                 local->remote_lto, local->remote_opt,
+                 local->remote_wks);
+
+        return 0;
+}
+
+int nfc_llcp_parse_connection_tlv(struct nfc_llcp_sock *sock,
+                                  u8 *tlv_array, u16 tlv_array_len)
+{
+        u8 *tlv = tlv_array, type, length, offset = 0;
+
+        pr_debug("TLV array length %d\n", tlv_array_len);
+
+        if (sock == NULL)
+                return -ENOTCONN;
+
+        while (offset < tlv_array_len) {
+                type = tlv[0];
+                length = tlv[1];
+
+                pr_debug("type 0x%x length %d\n", type, length);
+
+                switch (type) {
+                case LLCP_TLV_MIUX:
+                        sock->miu = llcp_tlv_miux(tlv) + 128;
+                        break;
                 case LLCP_TLV_RW:
-                        local->remote_rw = llcp_tlv_rw(tlv);
+                        sock->rw = llcp_tlv_rw(tlv);
                         break;
                 case LLCP_TLV_SN:
                         break;
@@ -163,10 +200,7 @@ int nfc_llcp_parse_tlv(struct nfc_llcp_local *local,
                 tlv += length + 2;
         }
 
-        pr_debug("version 0x%x miu %d lto %d opt 0x%x wks 0x%x rw %d\n",
-                 local->remote_version, local->remote_miu,
-                 local->remote_lto, local->remote_opt,
-                 local->remote_wks, local->remote_rw);
+        pr_debug("sock %p rw %d miu %d\n", sock, sock->rw, sock->miu);
 
         return 0;
 }
@@ -474,7 +508,7 @@ int nfc_llcp_send_i_frame(struct nfc_llcp_sock *sock,
 
         while (remaining_len > 0) {
 
-                frag_len = min_t(size_t, local->remote_miu, remaining_len);
+                frag_len = min_t(size_t, sock->miu, remaining_len);
 
                 pr_debug("Fragment %zd bytes remaining %zd",
                          frag_len, remaining_len);
diff --git a/net/nfc/llcp/llcp.c b/net/nfc/llcp/llcp.c
index 42994fac26d..5d503eeb15a 100644
--- a/net/nfc/llcp/llcp.c
+++ b/net/nfc/llcp/llcp.c
@@ -31,47 +31,41 @@ static u8 llcp_magic[3] = {0x46, 0x66, 0x6d};
 
 static struct list_head llcp_devices;
 
-static void nfc_llcp_socket_release(struct nfc_llcp_local *local)
+void nfc_llcp_sock_link(struct llcp_sock_list *l, struct sock *sk)
 {
-        struct nfc_llcp_sock *parent, *s, *n;
-        struct sock *sk, *parent_sk;
-        int i;
-
-        mutex_lock(&local->socket_lock);
-
-        for (i = 0; i < LLCP_MAX_SAP; i++) {
-                parent = local->sockets[i];
-                if (parent == NULL)
-                        continue;
-
-                /* Release all child sockets */
-                list_for_each_entry_safe(s, n, &parent->list, list) {
-                        list_del_init(&s->list);
-                        sk = &s->sk;
-
-                        lock_sock(sk);
-
-                        if (sk->sk_state == LLCP_CONNECTED)
-                                nfc_put_device(s->dev);
+        write_lock(&l->lock);
+        sk_add_node(sk, &l->head);
+        write_unlock(&l->lock);
+}
 
-                        sk->sk_state = LLCP_CLOSED;
+void nfc_llcp_sock_unlink(struct llcp_sock_list *l, struct sock *sk)
+{
+        write_lock(&l->lock);
+        sk_del_node_init(sk);
+        write_unlock(&l->lock);
+}
 
-                        release_sock(sk);
+static void nfc_llcp_socket_release(struct nfc_llcp_local *local)
+{
+        struct sock *sk;
+        struct hlist_node *node, *tmp;
+        struct nfc_llcp_sock *llcp_sock;
 
-                        sock_orphan(sk);
+        write_lock(&local->sockets.lock);
 
-                        s->local = NULL;
-                }
+        sk_for_each_safe(sk, node, tmp, &local->sockets.head) {
+                llcp_sock = nfc_llcp_sock(sk);
 
-                parent_sk = &parent->sk;
+                lock_sock(sk);
 
-                lock_sock(parent_sk);
+                if (sk->sk_state == LLCP_CONNECTED)
+                        nfc_put_device(llcp_sock->dev);
 
-                if (parent_sk->sk_state == LLCP_LISTEN) {
+                if (sk->sk_state == LLCP_LISTEN) {
                         struct nfc_llcp_sock *lsk, *n;
                         struct sock *accept_sk;
 
-                        list_for_each_entry_safe(lsk, n, &parent->accept_queue,
+                        list_for_each_entry_safe(lsk, n, &llcp_sock->accept_queue,
                                                  accept_queue) {
                                 accept_sk = &lsk->sk;
                                 lock_sock(accept_sk);
@@ -83,24 +77,53 @@ static void nfc_llcp_socket_release(struct nfc_llcp_local *local)
                                 release_sock(accept_sk);
 
                                 sock_orphan(accept_sk);
-
-                                lsk->local = NULL;
                         }
                 }
 
-                if (parent_sk->sk_state == LLCP_CONNECTED)
-                        nfc_put_device(parent->dev);
-
-                parent_sk->sk_state = LLCP_CLOSED;
+                sk->sk_state = LLCP_CLOSED;
 
-                release_sock(parent_sk);
+                release_sock(sk);
 
-                sock_orphan(parent_sk);
+                sock_orphan(sk);
 
-                parent->local = NULL;
+                sk_del_node_init(sk);
         }
 
-        mutex_unlock(&local->socket_lock);
+        write_unlock(&local->sockets.lock);
+}
+
+struct nfc_llcp_local *nfc_llcp_local_get(struct nfc_llcp_local *local)
+{
+        kref_get(&local->ref);
+
+        return local;
+}
+
+static void local_release(struct kref *ref)
+{
+        struct nfc_llcp_local *local;
+
+        local = container_of(ref, struct nfc_llcp_local, ref);
+
+        list_del(&local->list);
+        nfc_llcp_socket_release(local);
+        del_timer_sync(&local->link_timer);
+        skb_queue_purge(&local->tx_queue);
+        destroy_workqueue(local->tx_wq);
+        destroy_workqueue(local->rx_wq);
+        destroy_workqueue(local->timeout_wq);
+        kfree_skb(local->rx_pending);
+        kfree(local);
+}
+
+int nfc_llcp_local_put(struct nfc_llcp_local *local)
+{
+        WARN_ON(local == NULL);
+
+        if (local == NULL)
+                return 0;
+
+        return kref_put(&local->ref, local_release);
 }
 
 static void nfc_llcp_clear_sdp(struct nfc_llcp_local *local)
@@ -384,31 +407,9 @@ int nfc_llcp_set_remote_gb(struct nfc_dev *dev, u8 *gb, u8 gb_len)
                 return -EINVAL;
         }
 
-        return nfc_llcp_parse_tlv(local,
-                                  &local->remote_gb[3],
-                                  local->remote_gb_len - 3);
-}
-
-static void nfc_llcp_tx_work(struct work_struct *work)
-{
-        struct nfc_llcp_local *local = container_of(work, struct nfc_llcp_local,
-                                                    tx_work);
-        struct sk_buff *skb;
-
-        skb = skb_dequeue(&local->tx_queue);
-        if (skb != NULL) {
-                pr_debug("Sending pending skb\n");
-                print_hex_dump(KERN_DEBUG, "LLCP Tx: ", DUMP_PREFIX_OFFSET,
-                               16, 1, skb->data, skb->len, true);
-
-                nfc_data_exchange(local->dev, local->target_idx,
-                                  skb, nfc_llcp_recv, local);
-        } else {
-                nfc_llcp_send_symm(local->dev);
-        }
-
-        mod_timer(&local->link_timer,
-                  jiffies + msecs_to_jiffies(local->remote_lto));
+        return nfc_llcp_parse_gb_tlv(local,
+                                     &local->remote_gb[3],
+                                     local->remote_gb_len - 3);
 }
 
 static u8 nfc_llcp_dsap(struct sk_buff *pdu)
@@ -443,46 +444,146 @@ static void nfc_llcp_set_nrns(struct nfc_llcp_sock *sock, struct sk_buff *pdu)
         sock->recv_ack_n = (sock->recv_n - 1) % 16;
 }
 
+static void nfc_llcp_tx_work(struct work_struct *work)
+{
+        struct nfc_llcp_local *local = container_of(work, struct nfc_llcp_local,
+                                                    tx_work);
+        struct sk_buff *skb;
+        struct sock *sk;
+        struct nfc_llcp_sock *llcp_sock;
+
+        skb = skb_dequeue(&local->tx_queue);
+        if (skb != NULL) {
+                sk = skb->sk;
+                llcp_sock = nfc_llcp_sock(sk);
+                if (llcp_sock != NULL) {
+                        int ret;
+
+                        pr_debug("Sending pending skb\n");
+                        print_hex_dump(KERN_DEBUG, "LLCP Tx: ",
+                                       DUMP_PREFIX_OFFSET, 16, 1,
+                                       skb->data, skb->len, true);
+
+                        ret = nfc_data_exchange(local->dev, local->target_idx,
+                                                skb, nfc_llcp_recv, local);
+
+                        if (!ret && nfc_llcp_ptype(skb) == LLCP_PDU_I) {
+                                skb = skb_get(skb);
+                                skb_queue_tail(&llcp_sock->tx_pending_queue,
+                                               skb);
+                        }
+                } else {
+                        nfc_llcp_send_symm(local->dev);
+                }
+        } else {
+                nfc_llcp_send_symm(local->dev);
+        }
+
+        mod_timer(&local->link_timer,
+                  jiffies + msecs_to_jiffies(2 * local->remote_lto));
+}
+
+static struct nfc_llcp_sock *nfc_llcp_connecting_sock_get(struct nfc_llcp_local *local,
+                                                          u8 ssap)
+{
+        struct sock *sk;
+        struct nfc_llcp_sock *llcp_sock;
+        struct hlist_node *node;
+
+        read_lock(&local->connecting_sockets.lock);
+
+        sk_for_each(sk, node, &local->connecting_sockets.head) {
+                llcp_sock = nfc_llcp_sock(sk);
+
+                if (llcp_sock->ssap == ssap) {
+                        sock_hold(&llcp_sock->sk);
+                        goto out;
+                }
+        }
+
+        llcp_sock = NULL;
+
+out:
+        read_unlock(&local->connecting_sockets.lock);
+
+        return llcp_sock;
+}
+
 static struct nfc_llcp_sock *nfc_llcp_sock_get(struct nfc_llcp_local *local,
                                                u8 ssap, u8 dsap)
 {
-        struct nfc_llcp_sock *sock, *llcp_sock, *n;
+        struct sock *sk;
+        struct hlist_node *node;
+        struct nfc_llcp_sock *llcp_sock;
 
         pr_debug("ssap dsap %d %d\n", ssap, dsap);
 
         if (ssap == 0 && dsap == 0)
                 return NULL;
 
-        mutex_lock(&local->socket_lock);
-        sock = local->sockets[ssap];
-        if (sock == NULL) {
-                mutex_unlock(&local->socket_lock);
-                return NULL;
-        }
+        read_lock(&local->sockets.lock);
 
-        pr_debug("root dsap %d (%d)\n", sock->dsap, dsap);
+        llcp_sock = NULL;
 
-        if (sock->dsap == dsap) {
-                sock_hold(&sock->sk);
-                mutex_unlock(&local->socket_lock);
-                return sock;
+        sk_for_each(sk, node, &local->sockets.head) {
+                llcp_sock = nfc_llcp_sock(sk);
+
+                if (llcp_sock->ssap == ssap &&
+                    llcp_sock->dsap == dsap)
+                        break;
         }
 
-        list_for_each_entry_safe(llcp_sock, n, &sock->list, list) {
-                pr_debug("llcp_sock %p sk %p dsap %d\n", llcp_sock,
-                         &llcp_sock->sk, llcp_sock->dsap);
-                if (llcp_sock->dsap == dsap) {
-                        sock_hold(&llcp_sock->sk);
-                        mutex_unlock(&local->socket_lock);
-                        return llcp_sock;
-                }
+        read_unlock(&local->sockets.lock);
+
+        if (llcp_sock == NULL)
+                return NULL;
+
+        sock_hold(&llcp_sock->sk);
+
+        return llcp_sock;
+}
+
+static struct nfc_llcp_sock *nfc_llcp_sock_get_sn(struct nfc_llcp_local *local,
+                                                  u8 *sn, size_t sn_len)
+{
+        struct sock *sk;
+        struct hlist_node *node;
+        struct nfc_llcp_sock *llcp_sock;
+
+        pr_debug("sn %zd\n", sn_len);
+
+        if (sn == NULL || sn_len == 0)
+                return NULL;
+
+        read_lock(&local->sockets.lock);
+
+        llcp_sock = NULL;
+
+        sk_for_each(sk, node, &local->sockets.head) {
+                llcp_sock = nfc_llcp_sock(sk);
+
+                if (llcp_sock->sk.sk_state != LLCP_LISTEN)
+                        continue;
+
+                if (llcp_sock->service_name == NULL ||
+                    llcp_sock->service_name_len == 0)
+                        continue;
+
+                if (llcp_sock->service_name_len != sn_len)
+                        continue;
+
+                if (memcmp(sn, llcp_sock->service_name, sn_len) == 0)
+                        break;
         }
 
-        pr_err("Could not find socket for %d %d\n", ssap, dsap);
+        read_unlock(&local->sockets.lock);
 
-        mutex_unlock(&local->socket_lock);
+        if (llcp_sock == NULL)
+                return NULL;
 
-        return NULL;
+        sock_hold(&llcp_sock->sk);
+
+        return llcp_sock;
 }
 
 static void nfc_llcp_sock_put(struct nfc_llcp_sock *sock)
@@ -518,35 +619,19 @@ static void nfc_llcp_recv_connect(struct nfc_llcp_local *local,
 {
         struct sock *new_sk, *parent;
         struct nfc_llcp_sock *sock, *new_sock;
-        u8 dsap, ssap, bound_sap, reason;
+        u8 dsap, ssap, reason;
 
         dsap = nfc_llcp_dsap(skb);
         ssap = nfc_llcp_ssap(skb);
 
         pr_debug("%d %d\n", dsap, ssap);
 
-        nfc_llcp_parse_tlv(local, &skb->data[LLCP_HEADER_SIZE],
-                           skb->len - LLCP_HEADER_SIZE);
-
         if (dsap != LLCP_SAP_SDP) {
-                bound_sap = dsap;
-
-                mutex_lock(&local->socket_lock);
-                sock = local->sockets[dsap];
-                if (sock == NULL) {
-                        mutex_unlock(&local->socket_lock);
+                sock = nfc_llcp_sock_get(local, dsap, LLCP_SAP_SDP);
+                if (sock == NULL || sock->sk.sk_state != LLCP_LISTEN) {
                         reason = LLCP_DM_NOBOUND;
                         goto fail;
                 }
-
-                sock_hold(&sock->sk);
-                mutex_unlock(&local->socket_lock);
-
-                lock_sock(&sock->sk);
-
-                if (sock->dsap == LLCP_SAP_SDP &&
-                    sock->sk.sk_state == LLCP_LISTEN)
-                        goto enqueue;
         } else {
                 u8 *sn;
                 size_t sn_len;
@@ -559,40 +644,15 @@ static void nfc_llcp_recv_connect(struct nfc_llcp_local *local,
 
                 pr_debug("Service name length %zu\n", sn_len);
 
-                mutex_lock(&local->socket_lock);
-                for (bound_sap = 0; bound_sap < LLCP_LOCAL_SAP_OFFSET;
-                     bound_sap++) {
-                        sock = local->sockets[bound_sap];
-                        if (sock == NULL)
-                                continue;
-
-                        if (sock->service_name == NULL ||
-                            sock->service_name_len == 0)
-                                        continue;
-
-                        if (sock->service_name_len != sn_len)
-                                continue;
-
-                        if (sock->dsap == LLCP_SAP_SDP &&
-                            sock->sk.sk_state == LLCP_LISTEN &&
-                            !memcmp(sn, sock->service_name, sn_len)) {
-                                pr_debug("Found service name at SAP %d\n",
-                                         bound_sap);
-                                sock_hold(&sock->sk);
-                                mutex_unlock(&local->socket_lock);
-
-                                lock_sock(&sock->sk);
-
-                                goto enqueue;
-                        }
+                sock = nfc_llcp_sock_get_sn(local, sn, sn_len);
+                if (sock == NULL) {
+                        reason = LLCP_DM_NOBOUND;
+                        goto fail;
                 }
-                mutex_unlock(&local->socket_lock);
         }
 
-        reason = LLCP_DM_NOBOUND;
-        goto fail;
+        lock_sock(&sock->sk);
 
-enqueue:
         parent = &sock->sk;
 
         if (sk_acceptq_is_full(parent)) {
@@ -612,15 +672,19 @@ enqueue:
 
         new_sock = nfc_llcp_sock(new_sk);
         new_sock->dev = local->dev;
-        new_sock->local = local;
+        new_sock->local = nfc_llcp_local_get(local);
+        new_sock->miu = local->remote_miu;
         new_sock->nfc_protocol = sock->nfc_protocol;
-        new_sock->ssap = bound_sap;
+        new_sock->ssap = sock->ssap;
         new_sock->dsap = ssap;
         new_sock->parent = parent;
 
+        nfc_llcp_parse_connection_tlv(new_sock, &skb->data[LLCP_HEADER_SIZE],
+                                      skb->len - LLCP_HEADER_SIZE);
+
         pr_debug("new sock %p sk %p\n", new_sock, &new_sock->sk);
 
-        list_add_tail(&new_sock->list, &sock->list);
+        nfc_llcp_sock_link(&local->sockets, new_sk);
 
         nfc_llcp_accept_enqueue(&sock->sk, new_sk);
 
@@ -654,12 +718,12 @@ int nfc_llcp_queue_i_frames(struct nfc_llcp_sock *sock)
 
         pr_debug("Remote ready %d tx queue len %d remote rw %d",
                  sock->remote_ready, skb_queue_len(&sock->tx_pending_queue),
-                 local->remote_rw);
+                 sock->rw);
 
         /* Try to queue some I frames for transmission */
         while (sock->remote_ready &&
-               skb_queue_len(&sock->tx_pending_queue) < local->remote_rw) {
-                struct sk_buff *pdu, *pending_pdu;
+               skb_queue_len(&sock->tx_pending_queue) < sock->rw) {
+                struct sk_buff *pdu;
 
                 pdu = skb_dequeue(&sock->tx_queue);
                 if (pdu == NULL)
@@ -668,10 +732,7 @@ int nfc_llcp_queue_i_frames(struct nfc_llcp_sock *sock)
                 /* Update N(S)/N(R) */
                 nfc_llcp_set_nrns(sock, pdu);
 
-                pending_pdu = skb_clone(pdu, GFP_KERNEL);
-
                 skb_queue_tail(&local->tx_queue, pdu);
-                skb_queue_tail(&sock->tx_pending_queue, pending_pdu);
                 nr_frames++;
         }
 
@@ -728,11 +789,21 @@ static void nfc_llcp_recv_hdlc(struct nfc_llcp_local *local,
 
                 llcp_sock->send_ack_n = nr;
 
-                skb_queue_walk_safe(&llcp_sock->tx_pending_queue, s, tmp)
-                        if (nfc_llcp_ns(s) <= nr) {
-                                skb_unlink(s, &llcp_sock->tx_pending_queue);
-                                kfree_skb(s);
-                        }
+                /* Remove and free all skbs until ns == nr */
+                skb_queue_walk_safe(&llcp_sock->tx_pending_queue, s, tmp) {
+                        skb_unlink(s, &llcp_sock->tx_pending_queue);
+                        kfree_skb(s);
+
+                        if (nfc_llcp_ns(s) == nr)
+                                break;
+                }
+
+                /* Re-queue the remaining skbs for transmission */
+                skb_queue_reverse_walk_safe(&llcp_sock->tx_pending_queue,
+                                            s, tmp) {
+                        skb_unlink(s, &llcp_sock->tx_pending_queue);
+                        skb_queue_head(&local->tx_queue, s);
+                }
         }
 
         if (ptype == LLCP_PDU_RR)
@@ -740,7 +811,7 @@ static void nfc_llcp_recv_hdlc(struct nfc_llcp_local *local,
         else if (ptype == LLCP_PDU_RNR)
                 llcp_sock->remote_ready = false;
 
-        if (nfc_llcp_queue_i_frames(llcp_sock) == 0)
+        if (nfc_llcp_queue_i_frames(llcp_sock) == 0 && ptype == LLCP_PDU_I)
                 nfc_llcp_send_rr(llcp_sock);
 
         release_sock(sk);
@@ -791,11 +862,7 @@ static void nfc_llcp_recv_cc(struct nfc_llcp_local *local, struct sk_buff *skb)
         dsap = nfc_llcp_dsap(skb);
         ssap = nfc_llcp_ssap(skb);
 
-        llcp_sock = nfc_llcp_sock_get(local, dsap, ssap);
-
-        if (llcp_sock == NULL)
-                llcp_sock = nfc_llcp_sock_get(local, dsap, LLCP_SAP_SDP);
-
+        llcp_sock = nfc_llcp_connecting_sock_get(local, dsap);
         if (llcp_sock == NULL) {
                 pr_err("Invalid CC\n");
                 nfc_llcp_send_dm(local, dsap, ssap, LLCP_DM_NOCONN);
@@ -803,11 +870,15 @@ static void nfc_llcp_recv_cc(struct nfc_llcp_local *local, struct sk_buff *skb)
                 return;
         }
 
-        llcp_sock->dsap = ssap;
         sk = &llcp_sock->sk;
 
-        nfc_llcp_parse_tlv(local, &skb->data[LLCP_HEADER_SIZE],
-                           skb->len - LLCP_HEADER_SIZE);
+        /* Unlink from connecting and link to the client array */
+        nfc_llcp_sock_unlink(&local->connecting_sockets, sk);
+        nfc_llcp_sock_link(&local->sockets, sk);
+        llcp_sock->dsap = ssap;
+
+        nfc_llcp_parse_connection_tlv(llcp_sock, &skb->data[LLCP_HEADER_SIZE],
+                                      skb->len - LLCP_HEADER_SIZE);
 
         sk->sk_state = LLCP_CONNECTED;
         sk->sk_state_change(sk);
@@ -891,6 +962,21 @@ void nfc_llcp_recv(void *data, struct sk_buff *skb, int err)
         return;
 }
 
+int nfc_llcp_data_received(struct nfc_dev *dev, struct sk_buff *skb)
+{
+        struct nfc_llcp_local *local;
+
+        local = nfc_llcp_find_local(dev);
+        if (local == NULL)
+                return -ENODEV;
+
+        local->rx_pending = skb_get(skb);
+        del_timer(&local->link_timer);
+        queue_work(local->rx_wq, &local->rx_work);
+
+        return 0;
+}
+
 void nfc_llcp_mac_is_down(struct nfc_dev *dev)
 {
         struct nfc_llcp_local *local;
@@ -943,8 +1029,8 @@ int nfc_llcp_register_device(struct nfc_dev *ndev)
 
         local->dev = ndev;
         INIT_LIST_HEAD(&local->list);
+        kref_init(&local->ref);
         mutex_init(&local->sdp_lock);
-        mutex_init(&local->socket_lock);
         init_timer(&local->link_timer);
         local->link_timer.data = (unsigned long) local;
         local->link_timer.function = nfc_llcp_symm_timer;
@@ -984,11 +1070,13 @@ int nfc_llcp_register_device(struct nfc_dev *ndev)
                 goto err_rx_wq;
         }
 
+        local->sockets.lock = __RW_LOCK_UNLOCKED(local->sockets.lock);
+        local->connecting_sockets.lock = __RW_LOCK_UNLOCKED(local->connecting_sockets.lock);
+
         nfc_llcp_build_gb(local);
 
         local->remote_miu = LLCP_DEFAULT_MIU;
         local->remote_lto = LLCP_DEFAULT_LTO;
-        local->remote_rw = LLCP_DEFAULT_RW;
 
         list_add(&llcp_devices, &local->list);
 
@@ -1015,14 +1103,7 @@ void nfc_llcp_unregister_device(struct nfc_dev *dev)
                 return;
         }
 
-        list_del(&local->list);
-        nfc_llcp_socket_release(local);
-        del_timer_sync(&local->link_timer);
-        skb_queue_purge(&local->tx_queue);
-        destroy_workqueue(local->tx_wq);
-        destroy_workqueue(local->rx_wq);
-        kfree_skb(local->rx_pending);
-        kfree(local);
+        nfc_llcp_local_put(local);
 }
 
 int __init nfc_llcp_init(void)
diff --git a/net/nfc/llcp/llcp.h b/net/nfc/llcp/llcp.h
index 50680ce5ae4..7286c86982f 100644
--- a/net/nfc/llcp/llcp.h
+++ b/net/nfc/llcp/llcp.h
@@ -40,12 +40,18 @@ enum llcp_state {
 
 struct nfc_llcp_sock;
 
+struct llcp_sock_list {
+        struct hlist_head head;
+        rwlock_t          lock;
+};
+
 struct nfc_llcp_local {
         struct list_head list;
         struct nfc_dev *dev;
 
+        struct kref ref;
+
         struct mutex sdp_lock;
-        struct mutex socket_lock;
 
         struct timer_list link_timer;
         struct sk_buff_head tx_queue;
@@ -77,24 +83,26 @@ struct nfc_llcp_local {
         u16 remote_lto;
         u8  remote_opt;
         u16 remote_wks;
-        u8  remote_rw;
 
         /* sockets array */
-        struct nfc_llcp_sock *sockets[LLCP_MAX_SAP];
+        struct llcp_sock_list sockets;
+        struct llcp_sock_list connecting_sockets;
 };
 
 struct nfc_llcp_sock {
         struct sock sk;
-        struct list_head list;
         struct nfc_dev *dev;
         struct nfc_llcp_local *local;
         u32 target_idx;
         u32 nfc_protocol;
 
+        /* Link parameters */
         u8 ssap;
         u8 dsap;
         char *service_name;
         size_t service_name_len;
+        u8 rw;
+        u16 miu;
 
         /* Link variables */
         u8 send_n;
@@ -164,7 +172,11 @@ struct nfc_llcp_sock {
 #define LLCP_DM_REJ     0x03
 
 
+void nfc_llcp_sock_link(struct llcp_sock_list *l, struct sock *s);
+void nfc_llcp_sock_unlink(struct llcp_sock_list *l, struct sock *s);
 struct nfc_llcp_local *nfc_llcp_find_local(struct nfc_dev *dev);
+struct nfc_llcp_local *nfc_llcp_local_get(struct nfc_llcp_local *local);
+int nfc_llcp_local_put(struct nfc_llcp_local *local);
 u8 nfc_llcp_get_sdp_ssap(struct nfc_llcp_local *local,
                          struct nfc_llcp_sock *sock);
 u8 nfc_llcp_get_local_ssap(struct nfc_llcp_local *local);
@@ -179,8 +191,10 @@ void nfc_llcp_accept_enqueue(struct sock *parent, struct sock *sk);
 struct sock *nfc_llcp_accept_dequeue(struct sock *sk, struct socket *newsock);
 
 /* TLV API */
-int nfc_llcp_parse_tlv(struct nfc_llcp_local *local,
-                       u8 *tlv_array, u16 tlv_array_len);
+int nfc_llcp_parse_gb_tlv(struct nfc_llcp_local *local,
+                          u8 *tlv_array, u16 tlv_array_len);
+int nfc_llcp_parse_connection_tlv(struct nfc_llcp_sock *sock,
+                                  u8 *tlv_array, u16 tlv_array_len);
 
 /* Commands API */
 void nfc_llcp_recv(void *data, struct sk_buff *skb, int err);
diff --git a/net/nfc/llcp/sock.c b/net/nfc/llcp/sock.c
index e06d458fc71..05ca5a68007 100644
--- a/net/nfc/llcp/sock.c
+++ b/net/nfc/llcp/sock.c
@@ -111,7 +111,7 @@ static int llcp_sock_bind(struct socket *sock, struct sockaddr *addr, int alen)
         }
 
         llcp_sock->dev = dev;
-        llcp_sock->local = local;
+        llcp_sock->local = nfc_llcp_local_get(local);
         llcp_sock->nfc_protocol = llcp_addr.nfc_protocol;
         llcp_sock->service_name_len = min_t(unsigned int,
                                             llcp_addr.service_name_len,
@@ -124,7 +124,7 @@ static int llcp_sock_bind(struct socket *sock, struct sockaddr *addr, int alen)
         if (llcp_sock->ssap == LLCP_MAX_SAP)
                 goto put_dev;
 
-        local->sockets[llcp_sock->ssap] = llcp_sock;
+        nfc_llcp_sock_link(&local->sockets, sk);
 
         pr_debug("Socket bound to SAP %d\n", llcp_sock->ssap);
 
@@ -382,15 +382,6 @@ static int llcp_sock_release(struct socket *sock)
                 goto out;
         }
 
-        mutex_lock(&local->socket_lock);
-
-        if (llcp_sock == local->sockets[llcp_sock->ssap])
-                local->sockets[llcp_sock->ssap] = NULL;
-        else
-                list_del_init(&llcp_sock->list);
-
-        mutex_unlock(&local->socket_lock);
-
         lock_sock(sk);
 
         /* Send a DISC */
@@ -415,14 +406,12 @@ static int llcp_sock_release(struct socket *sock)
                 }
         }
 
-        /* Freeing the SAP */
-        if ((sk->sk_state == LLCP_CONNECTED
-             && llcp_sock->ssap > LLCP_LOCAL_SAP_OFFSET) ||
-            sk->sk_state == LLCP_BOUND || sk->sk_state == LLCP_LISTEN)
-                nfc_llcp_put_ssap(llcp_sock->local, llcp_sock->ssap);
+        nfc_llcp_put_ssap(llcp_sock->local, llcp_sock->ssap);
 
         release_sock(sk);
 
+        nfc_llcp_sock_unlink(&local->sockets, sk);
+
 out:
         sock_orphan(sk);
         sock_put(sk);
@@ -490,7 +479,8 @@ static int llcp_sock_connect(struct socket *sock, struct sockaddr *_addr,
         }
 
         llcp_sock->dev = dev;
-        llcp_sock->local = local;
+        llcp_sock->local = nfc_llcp_local_get(local);
+        llcp_sock->miu = llcp_sock->local->remote_miu;
         llcp_sock->ssap = nfc_llcp_get_local_ssap(local);
         if (llcp_sock->ssap == LLCP_SAP_MAX) {
                 ret = -ENOMEM;
@@ -508,21 +498,26 @@ static int llcp_sock_connect(struct socket *sock, struct sockaddr *_addr,
                                           llcp_sock->service_name_len,
                                           GFP_KERNEL);
 
-        local->sockets[llcp_sock->ssap] = llcp_sock;
+        nfc_llcp_sock_link(&local->connecting_sockets, sk);
 
         ret = nfc_llcp_send_connect(llcp_sock);
         if (ret)
-                goto put_dev;
+                goto sock_unlink;
 
         ret = sock_wait_state(sk, LLCP_CONNECTED,
                               sock_sndtimeo(sk, flags & O_NONBLOCK));
         if (ret)
-                goto put_dev;
+                goto sock_unlink;
 
         release_sock(sk);
 
         return 0;
 
+sock_unlink:
+        nfc_llcp_put_ssap(local, llcp_sock->ssap);
+
+        nfc_llcp_sock_unlink(&local->connecting_sockets, sk);
+
 put_dev:
         nfc_put_device(dev);
 
@@ -687,13 +682,14 @@ struct sock *nfc_llcp_sock_alloc(struct socket *sock, int type, gfp_t gfp)
 
         llcp_sock->ssap = 0;
         llcp_sock->dsap = LLCP_SAP_SDP;
+        llcp_sock->rw = LLCP_DEFAULT_RW;
+        llcp_sock->miu = LLCP_DEFAULT_MIU;
         llcp_sock->send_n = llcp_sock->send_ack_n = 0;
         llcp_sock->recv_n = llcp_sock->recv_ack_n = 0;
         llcp_sock->remote_ready = 1;
         skb_queue_head_init(&llcp_sock->tx_queue);
         skb_queue_head_init(&llcp_sock->tx_pending_queue);
         skb_queue_head_init(&llcp_sock->tx_backlog_queue);
-        INIT_LIST_HEAD(&llcp_sock->list);
         INIT_LIST_HEAD(&llcp_sock->accept_queue);
 
         if (sock != NULL)
@@ -704,8 +700,6 @@ struct sock *nfc_llcp_sock_alloc(struct socket *sock, int type, gfp_t gfp)
 
 void nfc_llcp_sock_free(struct nfc_llcp_sock *sock)
 {
-        struct nfc_llcp_local *local = sock->local;
-
         kfree(sock->service_name);
 
         skb_queue_purge(&sock->tx_queue);
@@ -714,12 +708,9 @@ void nfc_llcp_sock_free(struct nfc_llcp_sock *sock)
 
         list_del_init(&sock->accept_queue);
 
-        if (local != NULL && sock == local->sockets[sock->ssap])
-                local->sockets[sock->ssap] = NULL;
-        else
-                list_del_init(&sock->list);
-
         sock->parent = NULL;
+
+        nfc_llcp_local_put(sock->local);
 }
 
 static int llcp_sock_create(struct net *net, struct socket *sock,
diff --git a/net/nfc/nci/core.c b/net/nfc/nci/core.c
index d560e6f1307..766a02b1dfa 100644
--- a/net/nfc/nci/core.c
+++ b/net/nfc/nci/core.c
@@ -387,7 +387,8 @@ static int nci_dev_down(struct nfc_dev *nfc_dev)
         return nci_close_device(ndev);
 }
 
-static int nci_start_poll(struct nfc_dev *nfc_dev, __u32 protocols)
+static int nci_start_poll(struct nfc_dev *nfc_dev,
+                          __u32 im_protocols, __u32 tm_protocols)
 {
         struct nci_dev *ndev = nfc_get_drvdata(nfc_dev);
         int rc;
@@ -413,11 +414,11 @@ static int nci_start_poll(struct nfc_dev *nfc_dev, __u32 protocols)
                         return -EBUSY;
         }
 
-        rc = nci_request(ndev, nci_rf_discover_req, protocols,
+        rc = nci_request(ndev, nci_rf_discover_req, im_protocols,
                          msecs_to_jiffies(NCI_RF_DISC_TIMEOUT));
 
         if (!rc)
-                ndev->poll_prots = protocols;
+                ndev->poll_prots = im_protocols;
 
         return rc;
 }
@@ -521,9 +522,9 @@ static void nci_deactivate_target(struct nfc_dev *nfc_dev,
         }
 }
 
-static int nci_data_exchange(struct nfc_dev *nfc_dev, struct nfc_target *target,
-                             struct sk_buff *skb,
-                             data_exchange_cb_t cb, void *cb_context)
+static int nci_transceive(struct nfc_dev *nfc_dev, struct nfc_target *target,
+                          struct sk_buff *skb,
+                          data_exchange_cb_t cb, void *cb_context)
 {
         struct nci_dev *ndev = nfc_get_drvdata(nfc_dev);
         int rc;
@@ -556,7 +557,7 @@ static struct nfc_ops nci_nfc_ops = {
         .stop_poll = nci_stop_poll,
         .activate_target = nci_activate_target,
         .deactivate_target = nci_deactivate_target,
-        .data_exchange = nci_data_exchange,
+        .im_transceive = nci_transceive,
 };
 
 /* ---- Interface to NCI drivers ---- */
diff --git a/net/nfc/netlink.c b/net/nfc/netlink.c
index 581d419083a..f4f07f9b61c 100644
--- a/net/nfc/netlink.c
+++ b/net/nfc/netlink.c
@@ -49,6 +49,8 @@ static const struct nla_policy nfc_genl_policy[NFC_ATTR_MAX + 1] = {
         [NFC_ATTR_COMM_MODE] = { .type = NLA_U8 },
         [NFC_ATTR_RF_MODE] = { .type = NLA_U8 },
         [NFC_ATTR_DEVICE_POWERED] = { .type = NLA_U8 },
+        [NFC_ATTR_IM_PROTOCOLS] = { .type = NLA_U32 },
+        [NFC_ATTR_TM_PROTOCOLS] = { .type = NLA_U32 },
 };
 
 static int nfc_genl_send_target(struct sk_buff *msg, struct nfc_target *target,
@@ -165,7 +167,7 @@ int nfc_genl_targets_found(struct nfc_dev *dev)
 
         dev->genl_data.poll_req_pid = 0;
 
-        msg = nlmsg_new(NLMSG_GOODSIZE, GFP_ATOMIC);
+        msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_ATOMIC);
         if (!msg)
                 return -ENOMEM;
 
@@ -193,7 +195,7 @@ int nfc_genl_target_lost(struct nfc_dev *dev, u32 target_idx)
         struct sk_buff *msg;
         void *hdr;
 
-        msg = nlmsg_new(NLMSG_GOODSIZE, GFP_KERNEL);
+        msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);
         if (!msg)
                 return -ENOMEM;
 
@@ -219,12 +221,74 @@ free_msg:
         return -EMSGSIZE;
 }
 
+int nfc_genl_tm_activated(struct nfc_dev *dev, u32 protocol)
+{
+        struct sk_buff *msg;
+        void *hdr;
+
+        msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);
+        if (!msg)
+                return -ENOMEM;
+
+        hdr = genlmsg_put(msg, 0, 0, &nfc_genl_family, 0,
+                          NFC_EVENT_TM_ACTIVATED);
+        if (!hdr)
+                goto free_msg;
+
+        if (nla_put_u32(msg, NFC_ATTR_DEVICE_INDEX, dev->idx))
+                goto nla_put_failure;
+        if (nla_put_u32(msg, NFC_ATTR_TM_PROTOCOLS, protocol))
+                goto nla_put_failure;
+
+        genlmsg_end(msg, hdr);
+
+        genlmsg_multicast(msg, 0, nfc_genl_event_mcgrp.id, GFP_KERNEL);
+
+        return 0;
+
+nla_put_failure:
+        genlmsg_cancel(msg, hdr);
+free_msg:
+        nlmsg_free(msg);
+        return -EMSGSIZE;
+}
+
+int nfc_genl_tm_deactivated(struct nfc_dev *dev)
+{
+        struct sk_buff *msg;
+        void *hdr;
+
+        msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);
+        if (!msg)
+                return -ENOMEM;
+
+        hdr = genlmsg_put(msg, 0, 0, &nfc_genl_family, 0,
+                          NFC_EVENT_TM_DEACTIVATED);
+        if (!hdr)
+                goto free_msg;
+
+        if (nla_put_u32(msg, NFC_ATTR_DEVICE_INDEX, dev->idx))
+                goto nla_put_failure;
+
+        genlmsg_end(msg, hdr);
+
+        genlmsg_multicast(msg, 0, nfc_genl_event_mcgrp.id, GFP_KERNEL);
+
+        return 0;
+
+nla_put_failure:
+        genlmsg_cancel(msg, hdr);
+free_msg:
+        nlmsg_free(msg);
+        return -EMSGSIZE;
+}
+
 int nfc_genl_device_added(struct nfc_dev *dev)
 {
         struct sk_buff *msg;
         void *hdr;
 
-        msg = nlmsg_new(NLMSG_GOODSIZE, GFP_KERNEL);
+        msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);
         if (!msg)
                 return -ENOMEM;
 
@@ -257,7 +321,7 @@ int nfc_genl_device_removed(struct nfc_dev *dev)
         struct sk_buff *msg;
         void *hdr;
 
-        msg = nlmsg_new(NLMSG_GOODSIZE, GFP_KERNEL);
+        msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);
         if (!msg)
                 return -ENOMEM;
 
@@ -370,7 +434,7 @@ int nfc_genl_dep_link_up_event(struct nfc_dev *dev, u32 target_idx,
 
         pr_debug("DEP link is up\n");
 
-        msg = nlmsg_new(NLMSG_GOODSIZE, GFP_ATOMIC);
+        msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_ATOMIC);
         if (!msg)
                 return -ENOMEM;
 
@@ -409,7 +473,7 @@ int nfc_genl_dep_link_down_event(struct nfc_dev *dev)
 
         pr_debug("DEP link is down\n");
 
-        msg = nlmsg_new(NLMSG_GOODSIZE, GFP_ATOMIC);
+        msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_ATOMIC);
         if (!msg)
                 return -ENOMEM;
 
@@ -450,7 +514,7 @@ static int nfc_genl_get_device(struct sk_buff *skb, struct genl_info *info)
         if (!dev)
                 return -ENODEV;
 
-        msg = nlmsg_new(NLMSG_GOODSIZE, GFP_KERNEL);
+        msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);
         if (!msg) {
                 rc = -ENOMEM;
                 goto out_putdev;
@@ -519,16 +583,25 @@ static int nfc_genl_start_poll(struct sk_buff *skb, struct genl_info *info)
         struct nfc_dev *dev;
         int rc;
         u32 idx;
-        u32 protocols;
+        u32 im_protocols = 0, tm_protocols = 0;
 
         pr_debug("Poll start\n");
 
         if (!info->attrs[NFC_ATTR_DEVICE_INDEX] ||
-            !info->attrs[NFC_ATTR_PROTOCOLS])
+            ((!info->attrs[NFC_ATTR_IM_PROTOCOLS] &&
+              !info->attrs[NFC_ATTR_PROTOCOLS]) &&
+             !info->attrs[NFC_ATTR_TM_PROTOCOLS]))
                 return -EINVAL;
 
         idx = nla_get_u32(info->attrs[NFC_ATTR_DEVICE_INDEX]);
-        protocols = nla_get_u32(info->attrs[NFC_ATTR_PROTOCOLS]);
+
+        if (info->attrs[NFC_ATTR_TM_PROTOCOLS])
+                tm_protocols = nla_get_u32(info->attrs[NFC_ATTR_TM_PROTOCOLS]);
+
+        if (info->attrs[NFC_ATTR_IM_PROTOCOLS])
+                im_protocols = nla_get_u32(info->attrs[NFC_ATTR_IM_PROTOCOLS]);
+        else if (info->attrs[NFC_ATTR_PROTOCOLS])
+                im_protocols = nla_get_u32(info->attrs[NFC_ATTR_PROTOCOLS]);
 
         dev = nfc_get_device(idx);
         if (!dev)
@@ -536,7 +609,7 @@ static int nfc_genl_start_poll(struct sk_buff *skb, struct genl_info *info)
 
         mutex_lock(&dev->genl_data.genl_data_mutex);
 
-        rc = nfc_start_poll(dev, protocols);
+        rc = nfc_start_poll(dev, im_protocols, tm_protocols);
         if (!rc)
                 dev->genl_data.poll_req_pid = info->snd_pid;
 
diff --git a/net/nfc/nfc.h b/net/nfc/nfc.h
index 3dd4232ae66..c5e42b79a41 100644
--- a/net/nfc/nfc.h
+++ b/net/nfc/nfc.h
@@ -55,6 +55,7 @@ int nfc_llcp_register_device(struct nfc_dev *dev);
 void nfc_llcp_unregister_device(struct nfc_dev *dev);
 int nfc_llcp_set_remote_gb(struct nfc_dev *dev, u8 *gb, u8 gb_len);
 u8 *nfc_llcp_general_bytes(struct nfc_dev *dev, size_t *general_bytes_len);
+int nfc_llcp_data_received(struct nfc_dev *dev, struct sk_buff *skb);
 int __init nfc_llcp_init(void);
 void nfc_llcp_exit(void);
 
@@ -90,6 +91,12 @@ static inline u8 *nfc_llcp_general_bytes(struct nfc_dev *dev, size_t *gb_len)
         return NULL;
 }
 
+static inline int nfc_llcp_data_received(struct nfc_dev *dev,
+                                         struct sk_buff *skb)
+{
+        return 0;
+}
+
 static inline int nfc_llcp_init(void)
 {
         return 0;
@@ -128,6 +135,9 @@ int nfc_genl_dep_link_up_event(struct nfc_dev *dev, u32 target_idx,
                                u8 comm_mode, u8 rf_mode);
 int nfc_genl_dep_link_down_event(struct nfc_dev *dev);
 
+int nfc_genl_tm_activated(struct nfc_dev *dev, u32 protocol);
+int nfc_genl_tm_deactivated(struct nfc_dev *dev);
+
 struct nfc_dev *nfc_get_device(unsigned int idx);
 
 static inline void nfc_put_device(struct nfc_dev *dev)
@@ -158,7 +168,7 @@ int nfc_dev_up(struct nfc_dev *dev);
 
 int nfc_dev_down(struct nfc_dev *dev);
 
-int nfc_start_poll(struct nfc_dev *dev, u32 protocols);
+int nfc_start_poll(struct nfc_dev *dev, u32 im_protocols, u32 tm_protocols);
 
 int nfc_stop_poll(struct nfc_dev *dev);
 
diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
index 0f661745df0..ceaca7c134a 100644
--- a/net/packet/af_packet.c
+++ b/net/packet/af_packet.c
@@ -531,6 +531,7 @@ static int prb_calc_retire_blk_tmo(struct packet_sock *po,
         unsigned int mbits = 0, msec = 0, div = 0, tmo = 0;
         struct ethtool_cmd ecmd;
         int err;
+        u32 speed;
 
         rtnl_lock();
         dev = __dev_get_by_index(sock_net(&po->sk), po->ifindex);
@@ -539,25 +540,18 @@ static int prb_calc_retire_blk_tmo(struct packet_sock *po,
                 return DEFAULT_PRB_RETIRE_TOV;
         }
         err = __ethtool_get_settings(dev, &ecmd);
+        speed = ethtool_cmd_speed(&ecmd);
         rtnl_unlock();
         if (!err) {
-                switch (ecmd.speed) {
-                case SPEED_10000:
-                        msec = 1;
-                        div = 10000/1000;
-                        break;
-                case SPEED_1000:
-                        msec = 1;
-                        div = 1000/1000;
-                        break;
                 /*
                  * If the link speed is so slow you don't really
                  * need to worry about perf anyways
                  */
-                case SPEED_100:
-                case SPEED_10:
-                default:
+                if (speed < SPEED_1000 || speed == SPEED_UNKNOWN) {
                         return DEFAULT_PRB_RETIRE_TOV;
+                } else {
+                        msec = 1;
+                        div = speed / 1000;
                 }
         }
 
@@ -592,7 +586,7 @@ static void init_prb_bdqc(struct packet_sock *po,
         p1->knxt_seq_num = 1;
         p1->pkbdq = pg_vec;
         pbd = (struct tpacket_block_desc *)pg_vec[0].buffer;
-        p1->pkblk_start = (char *)pg_vec[0].buffer;
+        p1->pkblk_start = pg_vec[0].buffer;
         p1->kblk_size = req_u->req3.tp_block_size;
         p1->knum_blocks = req_u->req3.tp_block_nr;
         p1->hdrlen = po->tp_hdrlen;
@@ -824,8 +818,7 @@ static void prb_open_block(struct tpacket_kbdq_core *pkc1,
                 h1->ts_first_pkt.ts_sec = ts.tv_sec;
                 h1->ts_first_pkt.ts_nsec = ts.tv_nsec;
                 pkc1->pkblk_start = (char *)pbd1;
-                pkc1->nxt_offset = (char *)(pkc1->pkblk_start +
-                BLK_PLUS_PRIV(pkc1->blk_sizeof_priv));
+                pkc1->nxt_offset = pkc1->pkblk_start + BLK_PLUS_PRIV(pkc1->blk_sizeof_priv);
                 BLOCK_O2FP(pbd1) = (__u32)BLK_PLUS_PRIV(pkc1->blk_sizeof_priv);
                 BLOCK_O2PRIV(pbd1) = BLK_HDR_LEN;
                 pbd1->version = pkc1->version;
@@ -1018,7 +1011,7 @@ static void *__packet_lookup_frame_in_block(struct packet_sock *po,
         struct tpacket_block_desc *pbd;
         char *curr, *end;
 
-        pkc = GET_PBDQC_FROM_RB(((struct packet_ring_buffer *)&po->rx_ring));
+        pkc = GET_PBDQC_FROM_RB(&po->rx_ring);
         pbd = GET_CURR_PBLOCK_DESC_FROM_CORE(pkc);
 
         /* Queue is frozen when user space is lagging behind */
@@ -1044,7 +1037,7 @@ static void *__packet_lookup_frame_in_block(struct packet_sock *po,
         smp_mb();
         curr = pkc->nxt_offset;
         pkc->skb = skb;
-        end = (char *) ((char *)pbd + pkc->kblk_size);
+        end = (char *)pbd + pkc->kblk_size;
 
         /* first try the current block */
         if (curr+TOTAL_PKT_LEN_INCL_ALIGN(len) < end) {
@@ -1476,7 +1469,7 @@ static int packet_sendmsg_spkt(struct kiocb *iocb, struct socket *sock,
          *      Find the device first to size check it
          */
 
-        saddr->spkt_device[13] = 0;
+        saddr->spkt_device[sizeof(saddr->spkt_device) - 1] = 0;
 retry:
         rcu_read_lock();
         dev = dev_get_by_name_rcu(sock_net(sk), saddr->spkt_device);
diff --git a/net/rds/page.c b/net/rds/page.c
index 2499cd10842..9005a2c920e 100644
--- a/net/rds/page.c
+++ b/net/rds/page.c
@@ -74,11 +74,12 @@ int rds_page_copy_user(struct page *page, unsigned long offset,
 }
 EXPORT_SYMBOL_GPL(rds_page_copy_user);
 
-/*
- * Message allocation uses this to build up regions of a message.
+/**
+ * rds_page_remainder_alloc - build up regions of a message.
  *
- * @bytes - the number of bytes needed.
- * @gfp - the waiting behaviour of the allocation
+ * @scat: Scatter list for message
+ * @bytes: the number of bytes needed.
+ * @gfp: the waiting behaviour of the allocation
  *
  * @gfp is always ored with __GFP_HIGHMEM.  Callers must be prepared to
  * kmap the pages, etc.
diff --git a/net/rfkill/core.c b/net/rfkill/core.c
index f974961754c..752b72360eb 100644
--- a/net/rfkill/core.c
+++ b/net/rfkill/core.c
@@ -325,7 +325,7 @@ static void __rfkill_switch_all(const enum rfkill_type type, bool blocked)
 
         rfkill_global_states[type].cur = blocked;
         list_for_each_entry(rfkill, &rfkill_list, node) {
-                if (rfkill->type != type)
+                if (rfkill->type != type && type != RFKILL_TYPE_ALL)
                         continue;
 
                 rfkill_set_block(rfkill, blocked);
diff --git a/net/rxrpc/ar-error.c b/net/rxrpc/ar-error.c
index 5d6b572a670..a9206087b4d 100644
--- a/net/rxrpc/ar-error.c
+++ b/net/rxrpc/ar-error.c
@@ -81,10 +81,6 @@ void rxrpc_UDP_error_report(struct sock *sk)
                         _net("I/F MTU %u", mtu);
                 }
 
-                /* ip_rt_frag_needed() may have eaten the info */
-                if (mtu == 0)
-                        mtu = ntohs(icmp_hdr(skb)->un.frag.mtu);
-
                 if (mtu == 0) {
                         /* they didn't give us a size, estimate one */
                         if (mtu > 1500) {
diff --git a/net/rxrpc/ar-output.c b/net/rxrpc/ar-output.c
index 16ae88762d0..e1ac183d50b 100644
--- a/net/rxrpc/ar-output.c
+++ b/net/rxrpc/ar-output.c
@@ -242,7 +242,7 @@ int rxrpc_kernel_send_data(struct rxrpc_call *call, struct msghdr *msg,
 
 EXPORT_SYMBOL(rxrpc_kernel_send_data);
 
-/*
+/**
  * rxrpc_kernel_abort_call - Allow a kernel service to abort a call
  * @call: The call to be aborted
  * @abort_code: The abort code to stick into the ABORT packet
diff --git a/net/sched/Kconfig b/net/sched/Kconfig
index e7a8976bf25..4a5d2bd4f78 100644
--- a/net/sched/Kconfig
+++ b/net/sched/Kconfig
@@ -507,6 +507,16 @@ config NET_EMATCH_TEXT
           To compile this code as a module, choose M here: the
           module will be called em_text.
 
+config NET_EMATCH_CANID
+        tristate "CAN Identifier"
+        depends on NET_EMATCH && CAN
+        ---help---
+          Say Y here if you want to be able to classify CAN frames based
+          on CAN Identifier.
+
+          To compile this code as a module, choose M here: the
+          module will be called em_canid.
+
 config NET_CLS_ACT
         bool "Actions"
         ---help---
diff --git a/net/sched/Makefile b/net/sched/Makefile
index 5940a1992f0..bcada751b4e 100644
--- a/net/sched/Makefile
+++ b/net/sched/Makefile
@@ -55,3 +55,4 @@ obj-$(CONFIG_NET_EMATCH_NBYTE)	+= em_nbyte.o
 obj-$(CONFIG_NET_EMATCH_U32)    += em_u32.o
 obj-$(CONFIG_NET_EMATCH_META)   += em_meta.o
 obj-$(CONFIG_NET_EMATCH_TEXT)   += em_text.o
+obj-$(CONFIG_NET_EMATCH_CANID)  += em_canid.o
diff --git a/net/sched/act_api.c b/net/sched/act_api.c
index 5cfb160df06..e3d2c78cb52 100644
--- a/net/sched/act_api.c
+++ b/net/sched/act_api.c
@@ -652,27 +652,27 @@ tca_get_fill(struct sk_buff *skb, struct tc_action *a, u32 pid, u32 seq,
         unsigned char *b = skb_tail_pointer(skb);
         struct nlattr *nest;
 
-        nlh = NLMSG_NEW(skb, pid, seq, event, sizeof(*t), flags);
-
-        t = NLMSG_DATA(nlh);
+        nlh = nlmsg_put(skb, pid, seq, event, sizeof(*t), flags);
+        if (!nlh)
+                goto out_nlmsg_trim;
+        t = nlmsg_data(nlh);
         t->tca_family = AF_UNSPEC;
         t->tca__pad1 = 0;
         t->tca__pad2 = 0;
 
         nest = nla_nest_start(skb, TCA_ACT_TAB);
         if (nest == NULL)
-                goto nla_put_failure;
+                goto out_nlmsg_trim;
 
         if (tcf_action_dump(skb, a, bind, ref) < 0)
-                goto nla_put_failure;
+                goto out_nlmsg_trim;
 
         nla_nest_end(skb, nest);
 
         nlh->nlmsg_len = skb_tail_pointer(skb) - b;
         return skb->len;
 
-nla_put_failure:
-nlmsg_failure:
+out_nlmsg_trim:
         nlmsg_trim(skb, b);
         return -1;
 }
@@ -799,19 +799,21 @@ static int tca_action_flush(struct net *net, struct nlattr *nla,
         if (a->ops == NULL)
                 goto err_out;
 
-        nlh = NLMSG_PUT(skb, pid, n->nlmsg_seq, RTM_DELACTION, sizeof(*t));
-        t = NLMSG_DATA(nlh);
+        nlh = nlmsg_put(skb, pid, n->nlmsg_seq, RTM_DELACTION, sizeof(*t), 0);
+        if (!nlh)
+                goto out_module_put;
+        t = nlmsg_data(nlh);
         t->tca_family = AF_UNSPEC;
         t->tca__pad1 = 0;
         t->tca__pad2 = 0;
 
         nest = nla_nest_start(skb, TCA_ACT_TAB);
         if (nest == NULL)
-                goto nla_put_failure;
+                goto out_module_put;
 
         err = a->ops->walk(skb, &dcb, RTM_DELACTION, a);
         if (err < 0)
-                goto nla_put_failure;
+                goto out_module_put;
         if (err == 0)
                 goto noflush_out;
 
@@ -828,8 +830,7 @@ static int tca_action_flush(struct net *net, struct nlattr *nla,
 
         return err;
 
-nla_put_failure:
-nlmsg_failure:
+out_module_put:
         module_put(a->ops->owner);
 err_out:
 noflush_out:
@@ -919,18 +920,20 @@ static int tcf_add_notify(struct net *net, struct tc_action *a,
 
         b = skb_tail_pointer(skb);
 
-        nlh = NLMSG_NEW(skb, pid, seq, event, sizeof(*t), flags);
-        t = NLMSG_DATA(nlh);
+        nlh = nlmsg_put(skb, pid, seq, event, sizeof(*t), flags);
+        if (!nlh)
+                goto out_kfree_skb;
+        t = nlmsg_data(nlh);
         t->tca_family = AF_UNSPEC;
         t->tca__pad1 = 0;
         t->tca__pad2 = 0;
 
         nest = nla_nest_start(skb, TCA_ACT_TAB);
         if (nest == NULL)
-                goto nla_put_failure;
+                goto out_kfree_skb;
 
         if (tcf_action_dump(skb, a, 0, 0) < 0)
-                goto nla_put_failure;
+                goto out_kfree_skb;
 
         nla_nest_end(skb, nest);
 
@@ -942,8 +945,7 @@ static int tcf_add_notify(struct net *net, struct tc_action *a,
                 err = 0;
         return err;
 
-nla_put_failure:
-nlmsg_failure:
+out_kfree_skb:
         kfree_skb(skb);
         return -1;
 }
@@ -1062,7 +1064,7 @@ tc_dump_action(struct sk_buff *skb, struct netlink_callback *cb)
         struct tc_action_ops *a_o;
         struct tc_action a;
         int ret = 0;
-        struct tcamsg *t = (struct tcamsg *) NLMSG_DATA(cb->nlh);
+        struct tcamsg *t = (struct tcamsg *) nlmsg_data(cb->nlh);
         struct nlattr *kind = find_dump_kind(cb->nlh);
 
         if (kind == NULL) {
@@ -1080,23 +1082,25 @@ tc_dump_action(struct sk_buff *skb, struct netlink_callback *cb)
         if (a_o->walk == NULL) {
                 WARN(1, "tc_dump_action: %s !capable of dumping table\n",
                      a_o->kind);
-                goto nla_put_failure;
+                goto out_module_put;
         }
 
-        nlh = NLMSG_PUT(skb, NETLINK_CB(cb->skb).pid, cb->nlh->nlmsg_seq,
-                        cb->nlh->nlmsg_type, sizeof(*t));
-        t = NLMSG_DATA(nlh);
+        nlh = nlmsg_put(skb, NETLINK_CB(cb->skb).pid, cb->nlh->nlmsg_seq,
+                        cb->nlh->nlmsg_type, sizeof(*t), 0);
+        if (!nlh)
+                goto out_module_put;
+        t = nlmsg_data(nlh);
         t->tca_family = AF_UNSPEC;
         t->tca__pad1 = 0;
         t->tca__pad2 = 0;
 
         nest = nla_nest_start(skb, TCA_ACT_TAB);
         if (nest == NULL)
-                goto nla_put_failure;
+                goto out_module_put;
 
         ret = a_o->walk(skb, cb, RTM_GETACTION, &a);
         if (ret < 0)
-                goto nla_put_failure;
+                goto out_module_put;
 
         if (ret > 0) {
                 nla_nest_end(skb, nest);
@@ -1110,8 +1114,7 @@ tc_dump_action(struct sk_buff *skb, struct netlink_callback *cb)
         module_put(a_o->owner);
         return skb->len;
 
-nla_put_failure:
-nlmsg_failure:
+out_module_put:
         module_put(a_o->owner);
         nlmsg_trim(skb, b);
         return skb->len;
diff --git a/net/sched/cls_api.c b/net/sched/cls_api.c
index f452f696b4b..6dd1131f2ec 100644
--- a/net/sched/cls_api.c
+++ b/net/sched/cls_api.c
@@ -140,7 +140,7 @@ static int tc_ctl_tfilter(struct sk_buff *skb, struct nlmsghdr *n, void *arg)
         int tp_created = 0;
 
 replay:
-        t = NLMSG_DATA(n);
+        t = nlmsg_data(n);
         protocol = TC_H_MIN(t->tcm_info);
         prio = TC_H_MAJ(t->tcm_info);
         nprio = prio;
@@ -349,8 +349,10 @@ static int tcf_fill_node(struct sk_buff *skb, struct tcf_proto *tp,
         struct nlmsghdr  *nlh;
         unsigned char *b = skb_tail_pointer(skb);
 
-        nlh = NLMSG_NEW(skb, pid, seq, event, sizeof(*tcm), flags);
-        tcm = NLMSG_DATA(nlh);
+        nlh = nlmsg_put(skb, pid, seq, event, sizeof(*tcm), flags);
+        if (!nlh)
+                goto out_nlmsg_trim;
+        tcm = nlmsg_data(nlh);
         tcm->tcm_family = AF_UNSPEC;
         tcm->tcm__pad1 = 0;
         tcm->tcm__pad2 = 0;
@@ -368,7 +370,7 @@ static int tcf_fill_node(struct sk_buff *skb, struct tcf_proto *tp,
         nlh->nlmsg_len = skb_tail_pointer(skb) - b;
         return skb->len;
 
-nlmsg_failure:
+out_nlmsg_trim:
 nla_put_failure:
         nlmsg_trim(skb, b);
         return -1;
@@ -418,7 +420,7 @@ static int tc_dump_tfilter(struct sk_buff *skb, struct netlink_callback *cb)
         struct net_device *dev;
         struct Qdisc *q;
         struct tcf_proto *tp, **chain;
-        struct tcmsg *tcm = (struct tcmsg *)NLMSG_DATA(cb->nlh);
+        struct tcmsg *tcm = nlmsg_data(cb->nlh);
         unsigned long cl = 0;
         const struct Qdisc_class_ops *cops;
         struct tcf_dump_args arg;
diff --git a/net/sched/em_canid.c b/net/sched/em_canid.c
new file mode 100644
index 00000000000..bfd34e4c1af
--- /dev/null
+++ b/net/sched/em_canid.c
@@ -0,0 +1,240 @@
+/*
+ * em_canid.c  Ematch rule to match CAN frames according to their CAN IDs
+ *
+ *              This program is free software; you can distribute it and/or
+ *              modify it under the terms of the GNU General Public License
+ *              as published by the Free Software Foundation; either version
+ *              2 of the License, or (at your option) any later version.
+ *
+ * Idea:       Oliver Hartkopp <oliver.hartkopp@volkswagen.de>
+ * Copyright:  (c) 2011 Czech Technical University in Prague
+ *             (c) 2011 Volkswagen Group Research
+ * Authors:    Michal Sojka <sojkam1@fel.cvut.cz>
+ *             Pavel Pisa <pisa@cmp.felk.cvut.cz>
+ *             Rostislav Lisovy <lisovy@gmail.cz>
+ * Funded by:  Volkswagen Group Research
+ */
+
+#include <linux/slab.h>
+#include <linux/module.h>
+#include <linux/types.h>
+#include <linux/kernel.h>
+#include <linux/string.h>
+#include <linux/skbuff.h>
+#include <net/pkt_cls.h>
+#include <linux/can.h>
+
+#define EM_CAN_RULES_MAX 500
+
+struct canid_match {
+        /* For each SFF CAN ID (11 bit) there is one record in this bitfield */
+        DECLARE_BITMAP(match_sff, (1 << CAN_SFF_ID_BITS));
+
+        int rules_count;
+        int sff_rules_count;
+        int eff_rules_count;
+
+        /*
+         * Raw rules copied from netlink message; Used for sending
+         * information to userspace (when 'tc filter show' is invoked)
+         * AND when matching EFF frames
+         */
+        struct can_filter rules_raw[];
+};
+
+/**
+ * em_canid_get_id() - Extracts Can ID out of the sk_buff structure.
+ */
+static canid_t em_canid_get_id(struct sk_buff *skb)
+{
+        /* CAN ID is stored within the data field */
+        struct can_frame *cf = (struct can_frame *)skb->data;
+
+        return cf->can_id;
+}
+
+static void em_canid_sff_match_add(struct canid_match *cm, u32 can_id,
+                                        u32 can_mask)
+{
+        int i;
+
+        /*
+         * Limit can_mask and can_id to SFF range to
+         * protect against write after end of array
+         */
+        can_mask &= CAN_SFF_MASK;
+        can_id &= can_mask;
+
+        /* Single frame */
+        if (can_mask == CAN_SFF_MASK) {
+                set_bit(can_id, cm->match_sff);
+                return;
+        }
+
+        /* All frames */
+        if (can_mask == 0) {
+                bitmap_fill(cm->match_sff, (1 << CAN_SFF_ID_BITS));
+                return;
+        }
+
+        /*
+         * Individual frame filter.
+         * Add record (set bit to 1) for each ID that
+         * conforms particular rule
+         */
+        for (i = 0; i < (1 << CAN_SFF_ID_BITS); i++) {
+                if ((i & can_mask) == can_id)
+                        set_bit(i, cm->match_sff);
+        }
+}
+
+static inline struct canid_match *em_canid_priv(struct tcf_ematch *m)
+{
+        return (struct canid_match *)m->data;
+}
+
+static int em_canid_match(struct sk_buff *skb, struct tcf_ematch *m,
+                         struct tcf_pkt_info *info)
+{
+        struct canid_match *cm = em_canid_priv(m);
+        canid_t can_id;
+        int match = 0;
+        int i;
+        const struct can_filter *lp;
+
+        can_id = em_canid_get_id(skb);
+
+        if (can_id & CAN_EFF_FLAG) {
+                for (i = 0, lp = cm->rules_raw;
+                     i < cm->eff_rules_count; i++, lp++) {
+                        if (!(((lp->can_id ^ can_id) & lp->can_mask))) {
+                                match = 1;
+                                break;
+                        }
+                }
+        } else { /* SFF */
+                can_id &= CAN_SFF_MASK;
+                match = (test_bit(can_id, cm->match_sff) ? 1 : 0);
+        }
+
+        return match;
+}
+
+static int em_canid_change(struct tcf_proto *tp, void *data, int len,
+                          struct tcf_ematch *m)
+{
+        struct can_filter *conf = data; /* Array with rules */
+        struct canid_match *cm;
+        struct canid_match *cm_old = (struct canid_match *)m->data;
+        int i;
+
+        if (!len)
+                return -EINVAL;
+
+        if (len % sizeof(struct can_filter))
+                return -EINVAL;
+
+        if (len > sizeof(struct can_filter) * EM_CAN_RULES_MAX)
+                return -EINVAL;
+
+        cm = kzalloc(sizeof(struct canid_match) + len, GFP_KERNEL);
+        if (!cm)
+                return -ENOMEM;
+
+        cm->rules_count = len / sizeof(struct can_filter);
+
+        /*
+         * We need two for() loops for copying rules into two contiguous
+         * areas in rules_raw to process all eff rules with a simple loop.
+         * NB: The configuration interface supports sff and eff rules.
+         * We do not support filters here that match for the same can_id
+         * provided in a SFF and EFF frame (e.g. 0x123 / 0x80000123).
+         * For this (unusual case) two filters have to be specified. The
+         * SFF/EFF separation is done with the CAN_EFF_FLAG in the can_id.
+         */
+
+        /* Fill rules_raw with EFF rules first */
+        for (i = 0; i < cm->rules_count; i++) {
+                if (conf[i].can_id & CAN_EFF_FLAG) {
+                        memcpy(cm->rules_raw + cm->eff_rules_count,
+                                &conf[i],
+                                sizeof(struct can_filter));
+
+                        cm->eff_rules_count++;
+                }
+        }
+
+        /* append SFF frame rules */
+        for (i = 0; i < cm->rules_count; i++) {
+                if (!(conf[i].can_id & CAN_EFF_FLAG)) {
+                        memcpy(cm->rules_raw
+                                + cm->eff_rules_count
+                                + cm->sff_rules_count,
+                                &conf[i], sizeof(struct can_filter));
+
+                        cm->sff_rules_count++;
+
+                        em_canid_sff_match_add(cm,
+                                conf[i].can_id, conf[i].can_mask);
+                }
+        }
+
+        m->datalen = sizeof(struct canid_match) + len;
+        m->data = (unsigned long)cm;
+
+        if (cm_old != NULL) {
+                pr_err("canid: Configuring an existing ematch!\n");
+                kfree(cm_old);
+        }
+
+        return 0;
+}
+
+static void em_canid_destroy(struct tcf_proto *tp, struct tcf_ematch *m)
+{
+        struct canid_match *cm = em_canid_priv(m);
+
+        kfree(cm);
+}
+
+static int em_canid_dump(struct sk_buff *skb, struct tcf_ematch *m)
+{
+        struct canid_match *cm = em_canid_priv(m);
+
+        /*
+         * When configuring this ematch 'rules_count' is set not to exceed
+         * 'rules_raw' array size
+         */
+        if (nla_put_nohdr(skb, sizeof(struct can_filter) * cm->rules_count,
+            &cm->rules_raw) < 0)
+                return -EMSGSIZE;
+
+        return 0;
+}
+
+static struct tcf_ematch_ops em_canid_ops = {
+        .kind     = TCF_EM_CANID,
+        .change   = em_canid_change,
+        .match    = em_canid_match,
+        .destroy  = em_canid_destroy,
+        .dump     = em_canid_dump,
+        .owner    = THIS_MODULE,
+        .link     = LIST_HEAD_INIT(em_canid_ops.link)
+};
+
+static int __init init_em_canid(void)
+{
+        return tcf_em_register(&em_canid_ops);
+}
+
+static void __exit exit_em_canid(void)
+{
+        tcf_em_unregister(&em_canid_ops);
+}
+
+MODULE_LICENSE("GPL");
+
+module_init(init_em_canid);
+module_exit(exit_em_canid);
+
+MODULE_ALIAS_TCF_EMATCH(TCF_EM_CANID);
diff --git a/net/sched/sch_api.c b/net/sched/sch_api.c
index 085ce53d570..a08b4ab3e42 100644
--- a/net/sched/sch_api.c
+++ b/net/sched/sch_api.c
@@ -973,7 +973,7 @@ check_loop_fn(struct Qdisc *q, unsigned long cl, struct qdisc_walker *w)
 static int tc_get_qdisc(struct sk_buff *skb, struct nlmsghdr *n, void *arg)
 {
         struct net *net = sock_net(skb->sk);
-        struct tcmsg *tcm = NLMSG_DATA(n);
+        struct tcmsg *tcm = nlmsg_data(n);
         struct nlattr *tca[TCA_MAX + 1];
         struct net_device *dev;
         u32 clid = tcm->tcm_parent;
@@ -1046,7 +1046,7 @@ static int tc_modify_qdisc(struct sk_buff *skb, struct nlmsghdr *n, void *arg)
 
 replay:
         /* Reinit, just in case something touches this. */
-        tcm = NLMSG_DATA(n);
+        tcm = nlmsg_data(n);
         clid = tcm->tcm_parent;
         q = p = NULL;
 
@@ -1193,8 +1193,10 @@ static int tc_fill_qdisc(struct sk_buff *skb, struct Qdisc *q, u32 clid,
         struct gnet_dump d;
         struct qdisc_size_table *stab;
 
-        nlh = NLMSG_NEW(skb, pid, seq, event, sizeof(*tcm), flags);
-        tcm = NLMSG_DATA(nlh);
+        nlh = nlmsg_put(skb, pid, seq, event, sizeof(*tcm), flags);
+        if (!nlh)
+                goto out_nlmsg_trim;
+        tcm = nlmsg_data(nlh);
         tcm->tcm_family = AF_UNSPEC;
         tcm->tcm__pad1 = 0;
         tcm->tcm__pad2 = 0;
@@ -1230,7 +1232,7 @@ static int tc_fill_qdisc(struct sk_buff *skb, struct Qdisc *q, u32 clid,
         nlh->nlmsg_len = skb_tail_pointer(skb) - b;
         return skb->len;
 
-nlmsg_failure:
+out_nlmsg_trim:
 nla_put_failure:
         nlmsg_trim(skb, b);
         return -1;
@@ -1366,7 +1368,7 @@ done:
 static int tc_ctl_tclass(struct sk_buff *skb, struct nlmsghdr *n, void *arg)
 {
         struct net *net = sock_net(skb->sk);
-        struct tcmsg *tcm = NLMSG_DATA(n);
+        struct tcmsg *tcm = nlmsg_data(n);
         struct nlattr *tca[TCA_MAX + 1];
         struct net_device *dev;
         struct Qdisc *q = NULL;
@@ -1498,8 +1500,10 @@ static int tc_fill_tclass(struct sk_buff *skb, struct Qdisc *q,
         struct gnet_dump d;
         const struct Qdisc_class_ops *cl_ops = q->ops->cl_ops;
 
-        nlh = NLMSG_NEW(skb, pid, seq, event, sizeof(*tcm), flags);
-        tcm = NLMSG_DATA(nlh);
+        nlh = nlmsg_put(skb, pid, seq, event, sizeof(*tcm), flags);
+        if (!nlh)
+                goto out_nlmsg_trim;
+        tcm = nlmsg_data(nlh);
         tcm->tcm_family = AF_UNSPEC;
         tcm->tcm__pad1 = 0;
         tcm->tcm__pad2 = 0;
@@ -1525,7 +1529,7 @@ static int tc_fill_tclass(struct sk_buff *skb, struct Qdisc *q,
         nlh->nlmsg_len = skb_tail_pointer(skb) - b;
         return skb->len;
 
-nlmsg_failure:
+out_nlmsg_trim:
 nla_put_failure:
         nlmsg_trim(skb, b);
         return -1;
@@ -1616,7 +1620,7 @@ static int tc_dump_tclass_root(struct Qdisc *root, struct sk_buff *skb,
 
 static int tc_dump_tclass(struct sk_buff *skb, struct netlink_callback *cb)
 {
-        struct tcmsg *tcm = (struct tcmsg *)NLMSG_DATA(cb->nlh);
+        struct tcmsg *tcm = nlmsg_data(cb->nlh);
         struct net *net = sock_net(skb->sk);
         struct netdev_queue *dev_queue;
         struct net_device *dev;
diff --git a/net/sched/sch_teql.c b/net/sched/sch_teql.c
index ca0c29695d5..47416716294 100644
--- a/net/sched/sch_teql.c
+++ b/net/sched/sch_teql.c
@@ -67,7 +67,6 @@ struct teql_master {
 struct teql_sched_data {
         struct Qdisc *next;
         struct teql_master *m;
-        struct neighbour *ncache;
         struct sk_buff_head q;
 };
 
@@ -134,7 +133,6 @@ teql_reset(struct Qdisc *sch)
 
         skb_queue_purge(&dat->q);
         sch->q.qlen = 0;
-        teql_neigh_release(xchg(&dat->ncache, NULL));
 }
 
 static void
@@ -166,7 +164,6 @@ teql_destroy(struct Qdisc *sch)
                                         }
                                 }
                                 skb_queue_purge(&dat->q);
-                                teql_neigh_release(xchg(&dat->ncache, NULL));
                                 break;
                         }
 
@@ -225,21 +222,25 @@ static int teql_qdisc_init(struct Qdisc *sch, struct nlattr *opt)
 static int
 __teql_resolve(struct sk_buff *skb, struct sk_buff *skb_res,
                struct net_device *dev, struct netdev_queue *txq,
-               struct neighbour *mn)
+               struct dst_entry *dst)
 {
-        struct teql_sched_data *q = qdisc_priv(txq->qdisc);
-        struct neighbour *n = q->ncache;
+        struct neighbour *n;
+        int err = 0;
 
-        if (mn->tbl == NULL)
-                return -EINVAL;
-        if (n && n->tbl == mn->tbl &&
-            memcmp(n->primary_key, mn->primary_key, mn->tbl->key_len) == 0) {
-                atomic_inc(&n->refcnt);
-        } else {
-                n = __neigh_lookup_errno(mn->tbl, mn->primary_key, dev);
-                if (IS_ERR(n))
-                        return PTR_ERR(n);
+        n = dst_neigh_lookup_skb(dst, skb);
+        if (!n)
+                return -ENOENT;
+
+        if (dst->dev != dev) {
+                struct neighbour *mn;
+
+                mn = __neigh_lookup_errno(n->tbl, n->primary_key, dev);
+                neigh_release(n);
+                if (IS_ERR(mn))
+                        return PTR_ERR(mn);
+                n = mn;
         }
+
         if (neigh_event_send(n, skb_res) == 0) {
                 int err;
                 char haddr[MAX_ADDR_LEN];
@@ -248,15 +249,13 @@ __teql_resolve(struct sk_buff *skb, struct sk_buff *skb_res,
                 err = dev_hard_header(skb, dev, ntohs(skb->protocol), haddr,
                                       NULL, skb->len);
 
-                if (err < 0) {
-                        neigh_release(n);
-                        return -EINVAL;
-                }
-                teql_neigh_release(xchg(&q->ncache, n));
-                return 0;
+                if (err < 0)
+                        err = -EINVAL;
+        } else {
+                err = (skb_res == NULL) ? -EAGAIN : 1;
         }
         neigh_release(n);
-        return (skb_res == NULL) ? -EAGAIN : 1;
+        return err;
 }
 
 static inline int teql_resolve(struct sk_buff *skb,
@@ -265,7 +264,6 @@ static inline int teql_resolve(struct sk_buff *skb,
                                struct netdev_queue *txq)
 {
         struct dst_entry *dst = skb_dst(skb);
-        struct neighbour *mn;
         int res;
 
         if (txq->qdisc == &noop_qdisc)
@@ -275,8 +273,7 @@ static inline int teql_resolve(struct sk_buff *skb,
                 return 0;
 
         rcu_read_lock();
-        mn = dst_get_neighbour_noref(dst);
-        res = mn ? __teql_resolve(skb, skb_res, dev, txq, mn) : 0;
+        res = __teql_resolve(skb, skb_res, dev, txq, dst);
         rcu_read_unlock();
 
         return res;
diff --git a/net/sctp/output.c b/net/sctp/output.c
index 6ae47acaaec..539f35d07f4 100644
--- a/net/sctp/output.c
+++ b/net/sctp/output.c
@@ -64,6 +64,8 @@
 #include <net/sctp/checksum.h>
 
 /* Forward declarations for private helpers. */
+static sctp_xmit_t __sctp_packet_append_chunk(struct sctp_packet *packet,
+                                              struct sctp_chunk *chunk);
 static sctp_xmit_t sctp_packet_can_append_data(struct sctp_packet *packet,
                                            struct sctp_chunk *chunk);
 static void sctp_packet_append_data(struct sctp_packet *packet,
@@ -224,7 +226,10 @@ static sctp_xmit_t sctp_packet_bundle_auth(struct sctp_packet *pkt,
         if (!auth)
                 return retval;
 
-        retval = sctp_packet_append_chunk(pkt, auth);
+        retval = __sctp_packet_append_chunk(pkt, auth);
+
+        if (retval != SCTP_XMIT_OK)
+                sctp_chunk_free(auth);
 
         return retval;
 }
@@ -256,48 +261,31 @@ static sctp_xmit_t sctp_packet_bundle_sack(struct sctp_packet *pkt,
                         asoc->a_rwnd = asoc->rwnd;
                         sack = sctp_make_sack(asoc);
                         if (sack) {
-                                retval = sctp_packet_append_chunk(pkt, sack);
+                                retval = __sctp_packet_append_chunk(pkt, sack);
+                                if (retval != SCTP_XMIT_OK) {
+                                        sctp_chunk_free(sack);
+                                        goto out;
+                                }
                                 asoc->peer.sack_needed = 0;
                                 if (del_timer(timer))
                                         sctp_association_put(asoc);
                         }
                 }
         }
+out:
         return retval;
 }
 
+
 /* Append a chunk to the offered packet reporting back any inability to do
  * so.
  */
-sctp_xmit_t sctp_packet_append_chunk(struct sctp_packet *packet,
-                                     struct sctp_chunk *chunk)
+static sctp_xmit_t __sctp_packet_append_chunk(struct sctp_packet *packet,
+                                              struct sctp_chunk *chunk)
 {
         sctp_xmit_t retval = SCTP_XMIT_OK;
         __u16 chunk_len = WORD_ROUND(ntohs(chunk->chunk_hdr->length));
 
-        SCTP_DEBUG_PRINTK("%s: packet:%p chunk:%p\n", __func__, packet,
-                          chunk);
-
-        /* Data chunks are special.  Before seeing what else we can
-         * bundle into this packet, check to see if we are allowed to
-         * send this DATA.
-         */
-        if (sctp_chunk_is_data(chunk)) {
-                retval = sctp_packet_can_append_data(packet, chunk);
-                if (retval != SCTP_XMIT_OK)
-                        goto finish;
-        }
-
-        /* Try to bundle AUTH chunk */
-        retval = sctp_packet_bundle_auth(packet, chunk);
-        if (retval != SCTP_XMIT_OK)
-                goto finish;
-
-        /* Try to bundle SACK chunk */
-        retval = sctp_packet_bundle_sack(packet, chunk);
-        if (retval != SCTP_XMIT_OK)
-                goto finish;
-
         /* Check to see if this chunk will fit into the packet */
         retval = sctp_packet_will_fit(packet, chunk, chunk_len);
         if (retval != SCTP_XMIT_OK)
@@ -339,6 +327,43 @@ finish:
         return retval;
 }
 
+/* Append a chunk to the offered packet reporting back any inability to do
+ * so.
+ */
+sctp_xmit_t sctp_packet_append_chunk(struct sctp_packet *packet,
+                                     struct sctp_chunk *chunk)
+{
+        sctp_xmit_t retval = SCTP_XMIT_OK;
+
+        SCTP_DEBUG_PRINTK("%s: packet:%p chunk:%p\n", __func__, packet,
+                          chunk);
+
+        /* Data chunks are special.  Before seeing what else we can
+         * bundle into this packet, check to see if we are allowed to
+         * send this DATA.
+         */
+        if (sctp_chunk_is_data(chunk)) {
+                retval = sctp_packet_can_append_data(packet, chunk);
+                if (retval != SCTP_XMIT_OK)
+                        goto finish;
+        }
+
+        /* Try to bundle AUTH chunk */
+        retval = sctp_packet_bundle_auth(packet, chunk);
+        if (retval != SCTP_XMIT_OK)
+                goto finish;
+
+        /* Try to bundle SACK chunk */
+        retval = sctp_packet_bundle_sack(packet, chunk);
+        if (retval != SCTP_XMIT_OK)
+                goto finish;
+
+        retval = __sctp_packet_append_chunk(packet, chunk);
+
+finish:
+        return retval;
+}
+
 /* All packets are sent to the network through this function from
  * sctp_outq_tail().
  *
diff --git a/net/sunrpc/backchannel_rqst.c b/net/sunrpc/backchannel_rqst.c
index 31def68a0f6..5a3d675d2f2 100644
--- a/net/sunrpc/backchannel_rqst.c
+++ b/net/sunrpc/backchannel_rqst.c
@@ -176,13 +176,14 @@ out_free:
 }
 EXPORT_SYMBOL_GPL(xprt_setup_backchannel);
 
-/*
- * Destroys the backchannel preallocated structures.
+/**
+ * xprt_destroy_backchannel - Destroys the backchannel preallocated structures.
+ * @xprt:       the transport holding the preallocated strucures
+ * @max_reqs    the maximum number of preallocated structures to destroy
+ *
  * Since these structures may have been allocated by multiple calls
  * to xprt_setup_backchannel, we only destroy up to the maximum number
  * of reqs specified by the caller.
- * @xprt:       the transport holding the preallocated strucures
- * @max_reqs    the maximum number of preallocated structures to destroy
  */
 void xprt_destroy_backchannel(struct rpc_xprt *xprt, unsigned int max_reqs)
 {
diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c
index f56f045778a..00eb859b7de 100644
--- a/net/sunrpc/clnt.c
+++ b/net/sunrpc/clnt.c
@@ -385,7 +385,7 @@ out_no_rpciod:
         return ERR_PTR(err);
 }
 
-/*
+/**
  * rpc_create - create an RPC client and transport with one call
  * @args: rpc_clnt create argument structure
  *
diff --git a/net/sunrpc/svcsock.c b/net/sunrpc/svcsock.c
index a6de09de5d2..18bc130255a 100644
--- a/net/sunrpc/svcsock.c
+++ b/net/sunrpc/svcsock.c
@@ -43,6 +43,7 @@
 #include <net/tcp_states.h>
 #include <asm/uaccess.h>
 #include <asm/ioctls.h>
+#include <trace/events/skb.h>
 
 #include <linux/sunrpc/types.h>
 #include <linux/sunrpc/clnt.h>
@@ -619,6 +620,8 @@ static int svc_udp_recvfrom(struct svc_rqst *rqstp)
         if (!svc_udp_get_dest_address(rqstp, cmh)) {
                 net_warn_ratelimited("svc: received unknown control message %d/%d; dropping RPC reply datagram\n",
                                      cmh->cmsg_level, cmh->cmsg_type);
+out_free:
+                trace_kfree_skb(skb, svc_udp_recvfrom);
                 skb_free_datagram_locked(svsk->sk_sk, skb);
                 return 0;
         }
@@ -630,8 +633,7 @@ static int svc_udp_recvfrom(struct svc_rqst *rqstp)
                 if (csum_partial_copy_to_xdr(&rqstp->rq_arg, skb)) {
                         local_bh_enable();
                         /* checksum error */
-                        skb_free_datagram_locked(svsk->sk_sk, skb);
-                        return 0;
+                        goto out_free;
                 }
                 local_bh_enable();
                 skb_free_datagram_locked(svsk->sk_sk, skb);
@@ -640,10 +642,8 @@ static int svc_udp_recvfrom(struct svc_rqst *rqstp)
                 rqstp->rq_arg.head[0].iov_base = skb->data +
                         sizeof(struct udphdr);
                 rqstp->rq_arg.head[0].iov_len = len;
-                if (skb_checksum_complete(skb)) {
-                        skb_free_datagram_locked(svsk->sk_sk, skb);
-                        return 0;
-                }
+                if (skb_checksum_complete(skb))
+                        goto out_free;
                 rqstp->rq_xprt_ctxt = skb;
         }
 
diff --git a/net/sunrpc/xdr.c b/net/sunrpc/xdr.c
index fddcccfcdf7..0cf165580d8 100644
--- a/net/sunrpc/xdr.c
+++ b/net/sunrpc/xdr.c
@@ -180,7 +180,9 @@ EXPORT_SYMBOL_GPL(xdr_inline_pages);
 
 /*
  * Helper routines for doing 'memmove' like operations on a struct xdr_buf
- *
+ */
+
+/**
  * _shift_data_right_pages
  * @pages: vector of pages containing both the source and dest memory area.
  * @pgto_base: page vector address of destination
@@ -242,7 +244,7 @@ _shift_data_right_pages(struct page **pages, size_t pgto_base,
         } while ((len -= copy) != 0);
 }
 
-/*
+/**
  * _copy_to_pages
  * @pages: array of pages
  * @pgbase: page vector address of destination
@@ -286,7 +288,7 @@ _copy_to_pages(struct page **pages, size_t pgbase, const char *p, size_t len)
         flush_dcache_page(*pgto);
 }
 
-/*
+/**
  * _copy_from_pages
  * @p: pointer to destination
  * @pages: array of pages
@@ -326,7 +328,7 @@ _copy_from_pages(char *p, struct page **pages, size_t pgbase, size_t len)
 }
 EXPORT_SYMBOL_GPL(_copy_from_pages);
 
-/*
+/**
  * xdr_shrink_bufhead
  * @buf: xdr_buf
  * @len: bytes to remove from buf->head[0]
@@ -399,7 +401,7 @@ xdr_shrink_bufhead(struct xdr_buf *buf, size_t len)
                 buf->len = buf->buflen;
 }
 
-/*
+/**
  * xdr_shrink_pagelen
  * @buf: xdr_buf
  * @len: bytes to remove from buf->pages
diff --git a/net/sunrpc/xprt.c b/net/sunrpc/xprt.c
index 3c83035cdaa..a5a402a7d21 100644
--- a/net/sunrpc/xprt.c
+++ b/net/sunrpc/xprt.c
@@ -531,7 +531,7 @@ void xprt_set_retrans_timeout_def(struct rpc_task *task)
 }
 EXPORT_SYMBOL_GPL(xprt_set_retrans_timeout_def);
 
-/*
+/**
  * xprt_set_retrans_timeout_rtt - set a request's retransmit timeout
  * @task: task whose timeout is to be set
  *
diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c
index 890b03f8d87..62d0dac8f78 100644
--- a/net/sunrpc/xprtsock.c
+++ b/net/sunrpc/xprtsock.c
@@ -1014,9 +1014,6 @@ static void xs_udp_data_ready(struct sock *sk, int len)
 
         UDPX_INC_STATS_BH(sk, UDP_MIB_INDATAGRAMS);
 
-        /* Something worked... */
-        dst_confirm(skb_dst(skb));
-
         xprt_adjust_cwnd(task, copied);
         xprt_complete_rqst(task, copied);
 
diff --git a/net/tipc/bcast.c b/net/tipc/bcast.c
index 2625f5ebe3e..d9df34fbd7c 100644
--- a/net/tipc/bcast.c
+++ b/net/tipc/bcast.c
@@ -162,7 +162,7 @@ static void bclink_update_last_sent(struct tipc_node *node, u32 seqno)
 }
 
 
-/*
+/**
  * tipc_bclink_retransmit_to - get most recent node to request retransmission
  *
  * Called with bc_lock locked
@@ -270,7 +270,7 @@ exit:
         spin_unlock_bh(&bc_lock);
 }
 
-/*
+/**
  * tipc_bclink_update_link_state - update broadcast link state
  *
  * tipc_net_lock and node lock set
@@ -330,7 +330,7 @@ void tipc_bclink_update_link_state(struct tipc_node *n_ptr, u32 last_sent)
         }
 }
 
-/*
+/**
  * bclink_peek_nack - monitor retransmission requests sent by other nodes
  *
  * Delay any upcoming NACK by this node if another node has already
@@ -381,7 +381,7 @@ exit:
         return res;
 }
 
-/*
+/**
  * bclink_accept_pkt - accept an incoming, in-sequence broadcast packet
  *
  * Called with both sending node's lock and bc_lock taken.
@@ -406,7 +406,7 @@ static void bclink_accept_pkt(struct tipc_node *node, u32 seqno)
         }
 }
 
-/*
+/**
  * tipc_bclink_recv_pkt - receive a broadcast packet, and deliver upwards
  *
  * tipc_net_lock is read_locked, no other locks set
diff --git a/net/tipc/bearer.c b/net/tipc/bearer.c
index a297e3a2e3e..86b703f5509 100644
--- a/net/tipc/bearer.c
+++ b/net/tipc/bearer.c
@@ -172,8 +172,8 @@ struct sk_buff *tipc_media_get_names(void)
 
 /**
  * bearer_name_validate - validate & (optionally) deconstruct bearer name
- * @name - ptr to bearer name string
- * @name_parts - ptr to area for bearer name components (or NULL if not needed)
+ * @name: ptr to bearer name string
+ * @name_parts: ptr to area for bearer name components (or NULL if not needed)
  *
  * Returns 1 if bearer name is valid, otherwise 0.
  */
@@ -520,8 +520,7 @@ exit:
 }
 
 /**
- * tipc_block_bearer(): Block the bearer with the given name,
- *                      and reset all its links
+ * tipc_block_bearer - Block the bearer with the given name, and reset all its links
  */
 int tipc_block_bearer(const char *name)
 {
diff --git a/net/tipc/bearer.h b/net/tipc/bearer.h
index e3b2be37fb3..4680de118af 100644
--- a/net/tipc/bearer.h
+++ b/net/tipc/bearer.h
@@ -57,7 +57,7 @@
  */
 #define TIPC_MEDIA_TYPE_ETH     1
 
-/*
+/**
  * struct tipc_media_addr - destination address used by TIPC bearers
  * @value: address info (format defined by media)
  * @media_id: TIPC media type identifier
diff --git a/net/tipc/link.c b/net/tipc/link.c
index 7a614f43549..f6bf4830ddf 100644
--- a/net/tipc/link.c
+++ b/net/tipc/link.c
@@ -153,8 +153,8 @@ int tipc_link_is_active(struct tipc_link *l_ptr)
 
 /**
  * link_name_validate - validate & (optionally) deconstruct tipc_link name
- * @name - ptr to link name string
- * @name_parts - ptr to area for link name components (or NULL if not needed)
+ * @name: ptr to link name string
+ * @name_parts: ptr to area for link name components (or NULL if not needed)
  *
  * Returns 1 if link name is valid, otherwise 0.
  */
@@ -944,7 +944,7 @@ int tipc_link_send(struct sk_buff *buf, u32 dest, u32 selector)
         return res;
 }
 
-/*
+/**
  * tipc_link_send_names - send name table entries to new neighbor
  *
  * Send routine for bulk delivery of name table messages when contact
@@ -1787,7 +1787,7 @@ cont:
         read_unlock_bh(&tipc_net_lock);
 }
 
-/*
+/**
  * tipc_link_defer_pkt - Add out-of-sequence message to deferred reception queue
  *
  * Returns increase in queue length (i.e. 0 or 1)
@@ -2635,8 +2635,8 @@ void tipc_link_set_queue_limits(struct tipc_link *l_ptr, u32 window)
 
 /**
  * link_find_link - locate link by name
- * @name - ptr to link name string
- * @node - ptr to area to be filled with ptr to associated node
+ * @name: ptr to link name string
+ * @node: ptr to area to be filled with ptr to associated node
  *
  * Caller must hold 'tipc_net_lock' to ensure node and bearer are not deleted;
  * this also prevents link deletion.
@@ -2671,8 +2671,8 @@ static struct tipc_link *link_find_link(const char *name,
 /**
  * link_value_is_valid -- validate proposed link tolerance/priority/window
  *
- * @cmd - value type (TIPC_CMD_SET_LINK_*)
- * @new_value - the new value
+ * @cmd: value type (TIPC_CMD_SET_LINK_*)
+ * @new_value: the new value
  *
  * Returns 1 if value is within range, 0 if not.
  */
@@ -2693,9 +2693,9 @@ static int link_value_is_valid(u16 cmd, u32 new_value)
 
 /**
  * link_cmd_set_value - change priority/tolerance/window for link/bearer/media
- * @name - ptr to link, bearer, or media name
- * @new_value - new value of link, bearer, or media setting
- * @cmd - which link, bearer, or media attribute to set (TIPC_CMD_SET_LINK_*)
+ * @name: ptr to link, bearer, or media name
+ * @new_value: new value of link, bearer, or media setting
+ * @cmd: which link, bearer, or media attribute to set (TIPC_CMD_SET_LINK_*)
  *
  * Caller must hold 'tipc_net_lock' to ensure link/bearer/media is not deleted.
  *
diff --git a/net/tipc/name_table.c b/net/tipc/name_table.c
index 010f24a59da..13fb9d559ea 100644
--- a/net/tipc/name_table.c
+++ b/net/tipc/name_table.c
@@ -191,7 +191,7 @@ static void nameseq_delete_empty(struct name_seq *seq)
         }
 }
 
-/*
+/**
  * nameseq_find_subseq - find sub-sequence (if any) matching a name instance
  *
  * Very time-critical, so binary searches through sub-sequence array.
@@ -435,7 +435,7 @@ found:
 }
 
 /**
- * tipc_nameseq_subscribe: attach a subscription, and issue
+ * tipc_nameseq_subscribe - attach a subscription, and issue
  * the prescribed number of events if there is any sub-
  * sequence overlapping with the requested sequence
  */
@@ -520,7 +520,7 @@ struct publication *tipc_nametbl_remove_publ(u32 type, u32 lower,
         return publ;
 }
 
-/*
+/**
  * tipc_nametbl_translate - perform name translation
  *
  * On entry, 'destnode' is the search domain used during translation.
@@ -751,7 +751,7 @@ void tipc_nametbl_unsubscribe(struct tipc_subscription *s)
 
 
 /**
- * subseq_list: print specified sub-sequence contents into the given buffer
+ * subseq_list - print specified sub-sequence contents into the given buffer
  */
 static void subseq_list(struct sub_seq *sseq, struct print_buf *buf, u32 depth,
                         u32 index)
@@ -787,7 +787,7 @@ static void subseq_list(struct sub_seq *sseq, struct print_buf *buf, u32 depth,
 }
 
 /**
- * nameseq_list: print specified name sequence contents into the given buffer
+ * nameseq_list - print specified name sequence contents into the given buffer
  */
 static void nameseq_list(struct name_seq *seq, struct print_buf *buf, u32 depth,
                          u32 type, u32 lowbound, u32 upbound, u32 index)
diff --git a/net/tipc/port.c b/net/tipc/port.c
index 2ad37a4db37..70bf78bd5b7 100644
--- a/net/tipc/port.c
+++ b/net/tipc/port.c
@@ -69,7 +69,7 @@ static u32 port_peerport(struct tipc_port *p_ptr)
         return msg_destport(&p_ptr->phdr);
 }
 
-/*
+/**
  * tipc_port_peer_msg - verify message was sent by connected port's peer
  *
  * Handles cases where the node's network address has changed from
@@ -909,8 +909,8 @@ int tipc_createport(void *usr_handle,
                 warn("Port creation failed, no memory\n");
                 return -ENOMEM;
         }
-        p_ptr = (struct tipc_port *)tipc_createport_raw(NULL, port_dispatcher,
-                                                   port_wakeup, importance);
+        p_ptr = tipc_createport_raw(NULL, port_dispatcher, port_wakeup,
+                                    importance);
         if (!p_ptr) {
                 kfree(up_ptr);
                 return -ENOMEM;
@@ -1078,8 +1078,7 @@ int tipc_disconnect_port(struct tipc_port *tp_ptr)
         if (tp_ptr->connected) {
                 tp_ptr->connected = 0;
                 /* let timer expire on it's own to avoid deadlock! */
-                tipc_nodesub_unsubscribe(
-                        &((struct tipc_port *)tp_ptr)->subscription);
+                tipc_nodesub_unsubscribe(&tp_ptr->subscription);
                 res = 0;
         } else {
                 res = -ENOTCONN;
@@ -1099,7 +1098,7 @@ int tipc_disconnect(u32 ref)
         p_ptr = tipc_port_lock(ref);
         if (!p_ptr)
                 return -EINVAL;
-        res = tipc_disconnect_port((struct tipc_port *)p_ptr);
+        res = tipc_disconnect_port(p_ptr);
         tipc_port_unlock(p_ptr);
         return res;
 }
diff --git a/net/tipc/port.h b/net/tipc/port.h
index 98cbec9c453..4660e306579 100644
--- a/net/tipc/port.h
+++ b/net/tipc/port.h
@@ -79,6 +79,7 @@ typedef void (*tipc_continue_event) (void *usr_handle, u32 portref);
  * struct user_port - TIPC user port (used with native API)
  * @usr_handle: user-specified field
  * @ref: object reference to associated TIPC port
+ *
  * <various callback routines>
  */
 struct user_port {
diff --git a/net/tipc/socket.c b/net/tipc/socket.c
index 5577a447f53..1ebb49f3ddb 100644
--- a/net/tipc/socket.c
+++ b/net/tipc/socket.c
@@ -54,7 +54,7 @@ struct tipc_sock {
 };
 
 #define tipc_sk(sk) ((struct tipc_sock *)(sk))
-#define tipc_sk_port(sk) ((struct tipc_port *)(tipc_sk(sk)->p))
+#define tipc_sk_port(sk) (tipc_sk(sk)->p)
 
 #define tipc_rx_ready(sock) (!skb_queue_empty(&sock->sk->sk_receive_queue) || \
                         (sock->state == SS_DISCONNECTING))
@@ -1699,9 +1699,8 @@ static int getsockopt(struct socket *sock,
         return put_user(sizeof(value), ol);
 }
 
-/**
- * Protocol switches for the various types of TIPC sockets
- */
+/* Protocol switches for the various types of TIPC sockets */
+
 static const struct proto_ops msg_ops = {
         .owner          = THIS_MODULE,
         .family         = AF_TIPC,
diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c
index 641f2e47f16..79981d97bc9 100644
--- a/net/unix/af_unix.c
+++ b/net/unix/af_unix.c
@@ -115,15 +115,24 @@
 #include <net/checksum.h>
 #include <linux/security.h>
 
-struct hlist_head unix_socket_table[UNIX_HASH_SIZE + 1];
+struct hlist_head unix_socket_table[2 * UNIX_HASH_SIZE];
 EXPORT_SYMBOL_GPL(unix_socket_table);
 DEFINE_SPINLOCK(unix_table_lock);
 EXPORT_SYMBOL_GPL(unix_table_lock);
 static atomic_long_t unix_nr_socks;
 
-#define unix_sockets_unbound    (&unix_socket_table[UNIX_HASH_SIZE])
 
-#define UNIX_ABSTRACT(sk)       (unix_sk(sk)->addr->hash != UNIX_HASH_SIZE)
+static struct hlist_head *unix_sockets_unbound(void *addr)
+{
+        unsigned long hash = (unsigned long)addr;
+
+        hash ^= hash >> 16;
+        hash ^= hash >> 8;
+        hash %= UNIX_HASH_SIZE;
+        return &unix_socket_table[UNIX_HASH_SIZE + hash];
+}
+
+#define UNIX_ABSTRACT(sk)       (unix_sk(sk)->addr->hash < UNIX_HASH_SIZE)
 
 #ifdef CONFIG_SECURITY_NETWORK
 static void unix_get_secdata(struct scm_cookie *scm, struct sk_buff *skb)
@@ -645,7 +654,7 @@ static struct sock *unix_create1(struct net *net, struct socket *sock)
         INIT_LIST_HEAD(&u->link);
         mutex_init(&u->readlock); /* single task reading lock */
         init_waitqueue_head(&u->peer_wait);
-        unix_insert_socket(unix_sockets_unbound, sk);
+        unix_insert_socket(unix_sockets_unbound(sk), sk);
 out:
         if (sk == NULL)
                 atomic_long_dec(&unix_nr_socks);
@@ -2239,47 +2248,54 @@ static unsigned int unix_dgram_poll(struct file *file, struct socket *sock,
 }
 
 #ifdef CONFIG_PROC_FS
-static struct sock *first_unix_socket(int *i)
+
+#define BUCKET_SPACE (BITS_PER_LONG - (UNIX_HASH_BITS + 1) - 1)
+
+#define get_bucket(x) ((x) >> BUCKET_SPACE)
+#define get_offset(x) ((x) & ((1L << BUCKET_SPACE) - 1))
+#define set_bucket_offset(b, o) ((b) << BUCKET_SPACE | (o))
+
+static struct sock *unix_from_bucket(struct seq_file *seq, loff_t *pos)
 {
-        for (*i = 0; *i <= UNIX_HASH_SIZE; (*i)++) {
-                if (!hlist_empty(&unix_socket_table[*i]))
-                        return __sk_head(&unix_socket_table[*i]);
+        unsigned long offset = get_offset(*pos);
+        unsigned long bucket = get_bucket(*pos);
+        struct sock *sk;
+        unsigned long count = 0;
+
+        for (sk = sk_head(&unix_socket_table[bucket]); sk; sk = sk_next(sk)) {
+                if (sock_net(sk) != seq_file_net(seq))
+                        continue;
+                if (++count == offset)
+                        break;
         }
-        return NULL;
+
+        return sk;
 }
 
-static struct sock *next_unix_socket(int *i, struct sock *s)
+static struct sock *unix_next_socket(struct seq_file *seq,
+                                     struct sock *sk,
+                                     loff_t *pos)
 {
-        struct sock *next = sk_next(s);
-        /* More in this chain? */
-        if (next)
-                return next;
-        /* Look for next non-empty chain. */
-        for ((*i)++; *i <= UNIX_HASH_SIZE; (*i)++) {
-                if (!hlist_empty(&unix_socket_table[*i]))
-                        return __sk_head(&unix_socket_table[*i]);
+        unsigned long bucket;
+
+        while (sk > (struct sock *)SEQ_START_TOKEN) {
+                sk = sk_next(sk);
+                if (!sk)
+                        goto next_bucket;
+                if (sock_net(sk) == seq_file_net(seq))
+                        return sk;
         }
-        return NULL;
-}
 
-struct unix_iter_state {
-        struct seq_net_private p;
-        int i;
-};
+        do {
+                sk = unix_from_bucket(seq, pos);
+                if (sk)
+                        return sk;
 
-static struct sock *unix_seq_idx(struct seq_file *seq, loff_t pos)
-{
-        struct unix_iter_state *iter = seq->private;
-        loff_t off = 0;
-        struct sock *s;
+next_bucket:
+                bucket = get_bucket(*pos) + 1;
+                *pos = set_bucket_offset(bucket, 1);
+        } while (bucket < ARRAY_SIZE(unix_socket_table));
 
-        for (s = first_unix_socket(&iter->i); s; s = next_unix_socket(&iter->i, s)) {
-                if (sock_net(s) != seq_file_net(seq))
-                        continue;
-                if (off == pos)
-                        return s;
-                ++off;
-        }
         return NULL;
 }
 
@@ -2287,22 +2303,20 @@ static void *unix_seq_start(struct seq_file *seq, loff_t *pos)
         __acquires(unix_table_lock)
 {
         spin_lock(&unix_table_lock);
-        return *pos ? unix_seq_idx(seq, *pos - 1) : SEQ_START_TOKEN;
+
+        if (!*pos)
+                return SEQ_START_TOKEN;
+
+        if (get_bucket(*pos) >= ARRAY_SIZE(unix_socket_table))
+                return NULL;
+
+        return unix_next_socket(seq, NULL, pos);
 }
 
 static void *unix_seq_next(struct seq_file *seq, void *v, loff_t *pos)
 {
-        struct unix_iter_state *iter = seq->private;
-        struct sock *sk = v;
         ++*pos;
-
-        if (v == SEQ_START_TOKEN)
-                sk = first_unix_socket(&iter->i);
-        else
-                sk = next_unix_socket(&iter->i, sk);
-        while (sk && (sock_net(sk) != seq_file_net(seq)))
-                sk = next_unix_socket(&iter->i, sk);
-        return sk;
+        return unix_next_socket(seq, v, pos);
 }
 
 static void unix_seq_stop(struct seq_file *seq, void *v)
@@ -2365,7 +2379,7 @@ static const struct seq_operations unix_seq_ops = {
 static int unix_seq_open(struct inode *inode, struct file *file)
 {
         return seq_open_net(inode, file, &unix_seq_ops,
-                            sizeof(struct unix_iter_state));
+                            sizeof(struct seq_net_private));
 }
 
 static const struct file_operations unix_seq_fops = {
diff --git a/net/unix/diag.c b/net/unix/diag.c
index 47d3002737f..a74864eedfc 100644
--- a/net/unix/diag.c
+++ b/net/unix/diag.c
@@ -8,40 +8,31 @@
 #include <net/af_unix.h>
 #include <net/tcp_states.h>
 
-#define UNIX_DIAG_PUT(skb, attrtype, attrlen) \
-        RTA_DATA(__RTA_PUT(skb, attrtype, attrlen))
-
 static int sk_diag_dump_name(struct sock *sk, struct sk_buff *nlskb)
 {
         struct unix_address *addr = unix_sk(sk)->addr;
-        char *s;
-
-        if (addr) {
-                s = UNIX_DIAG_PUT(nlskb, UNIX_DIAG_NAME, addr->len - sizeof(short));
-                memcpy(s, addr->name->sun_path, addr->len - sizeof(short));
-        }
 
-        return 0;
+        if (!addr)
+                return 0;
 
-rtattr_failure:
-        return -EMSGSIZE;
+        return nla_put(nlskb, UNIX_DIAG_NAME, addr->len - sizeof(short),
+                       addr->name->sun_path);
 }
 
 static int sk_diag_dump_vfs(struct sock *sk, struct sk_buff *nlskb)
 {
         struct dentry *dentry = unix_sk(sk)->path.dentry;
-        struct unix_diag_vfs *uv;
 
         if (dentry) {
-                uv = UNIX_DIAG_PUT(nlskb, UNIX_DIAG_VFS, sizeof(*uv));
-                uv->udiag_vfs_ino = dentry->d_inode->i_ino;
-                uv->udiag_vfs_dev = dentry->d_sb->s_dev;
+                struct unix_diag_vfs uv = {
+                        .udiag_vfs_ino = dentry->d_inode->i_ino,
+                        .udiag_vfs_dev = dentry->d_sb->s_dev,
+                };
+
+                return nla_put(nlskb, UNIX_DIAG_VFS, sizeof(uv), &uv);
         }
 
         return 0;
-
-rtattr_failure:
-        return -EMSGSIZE;
 }
 
 static int sk_diag_dump_peer(struct sock *sk, struct sk_buff *nlskb)
@@ -56,24 +47,28 @@ static int sk_diag_dump_peer(struct sock *sk, struct sk_buff *nlskb)
                 unix_state_unlock(peer);
                 sock_put(peer);
 
-                RTA_PUT_U32(nlskb, UNIX_DIAG_PEER, ino);
+                return nla_put_u32(nlskb, UNIX_DIAG_PEER, ino);
         }
 
         return 0;
-rtattr_failure:
-        return -EMSGSIZE;
 }
 
 static int sk_diag_dump_icons(struct sock *sk, struct sk_buff *nlskb)
 {
         struct sk_buff *skb;
+        struct nlattr *attr;
         u32 *buf;
         int i;
 
         if (sk->sk_state == TCP_LISTEN) {
                 spin_lock(&sk->sk_receive_queue.lock);
-                buf = UNIX_DIAG_PUT(nlskb, UNIX_DIAG_ICONS,
-                                sk->sk_receive_queue.qlen * sizeof(u32));
+
+                attr = nla_reserve(nlskb, UNIX_DIAG_ICONS,
+                                   sk->sk_receive_queue.qlen * sizeof(u32));
+                if (!attr)
+                        goto errout;
+
+                buf = nla_data(attr);
                 i = 0;
                 skb_queue_walk(&sk->sk_receive_queue, skb) {
                         struct sock *req, *peer;
@@ -94,43 +89,38 @@ static int sk_diag_dump_icons(struct sock *sk, struct sk_buff *nlskb)
 
         return 0;
 
-rtattr_failure:
+errout:
         spin_unlock(&sk->sk_receive_queue.lock);
         return -EMSGSIZE;
 }
 
 static int sk_diag_show_rqlen(struct sock *sk, struct sk_buff *nlskb)
 {
-        struct unix_diag_rqlen *rql;
-
-        rql = UNIX_DIAG_PUT(nlskb, UNIX_DIAG_RQLEN, sizeof(*rql));
+        struct unix_diag_rqlen rql;
 
         if (sk->sk_state == TCP_LISTEN) {
-                rql->udiag_rqueue = sk->sk_receive_queue.qlen;
-                rql->udiag_wqueue = sk->sk_max_ack_backlog;
+                rql.udiag_rqueue = sk->sk_receive_queue.qlen;
+                rql.udiag_wqueue = sk->sk_max_ack_backlog;
         } else {
-                rql->udiag_rqueue = (__u32)unix_inq_len(sk);
-                rql->udiag_wqueue = (__u32)unix_outq_len(sk);
+                rql.udiag_rqueue = (u32) unix_inq_len(sk);
+                rql.udiag_wqueue = (u32) unix_outq_len(sk);
         }
 
-        return 0;
-
-rtattr_failure:
-        return -EMSGSIZE;
+        return nla_put(nlskb, UNIX_DIAG_RQLEN, sizeof(rql), &rql);
 }
 
 static int sk_diag_fill(struct sock *sk, struct sk_buff *skb, struct unix_diag_req *req,
                 u32 pid, u32 seq, u32 flags, int sk_ino)
 {
-        unsigned char *b = skb_tail_pointer(skb);
         struct nlmsghdr *nlh;
         struct unix_diag_msg *rep;
 
-        nlh = NLMSG_PUT(skb, pid, seq, SOCK_DIAG_BY_FAMILY, sizeof(*rep));
-        nlh->nlmsg_flags = flags;
-
-        rep = NLMSG_DATA(nlh);
+        nlh = nlmsg_put(skb, pid, seq, SOCK_DIAG_BY_FAMILY, sizeof(*rep),
+                        flags);
+        if (!nlh)
+                return -EMSGSIZE;
 
+        rep = nlmsg_data(nlh);
         rep->udiag_family = AF_UNIX;
         rep->udiag_type = sk->sk_type;
         rep->udiag_state = sk->sk_state;
@@ -139,33 +129,32 @@ static int sk_diag_fill(struct sock *sk, struct sk_buff *skb, struct unix_diag_r
 
         if ((req->udiag_show & UDIAG_SHOW_NAME) &&
             sk_diag_dump_name(sk, skb))
-                goto nlmsg_failure;
+                goto out_nlmsg_trim;
 
         if ((req->udiag_show & UDIAG_SHOW_VFS) &&
             sk_diag_dump_vfs(sk, skb))
-                goto nlmsg_failure;
+                goto out_nlmsg_trim;
 
         if ((req->udiag_show & UDIAG_SHOW_PEER) &&
             sk_diag_dump_peer(sk, skb))
-                goto nlmsg_failure;
+                goto out_nlmsg_trim;
 
         if ((req->udiag_show & UDIAG_SHOW_ICONS) &&
             sk_diag_dump_icons(sk, skb))
-                goto nlmsg_failure;
+                goto out_nlmsg_trim;
 
         if ((req->udiag_show & UDIAG_SHOW_RQLEN) &&
             sk_diag_show_rqlen(sk, skb))
-                goto nlmsg_failure;
+                goto out_nlmsg_trim;
 
         if ((req->udiag_show & UDIAG_SHOW_MEMINFO) &&
             sock_diag_put_meminfo(sk, skb, UNIX_DIAG_MEMINFO))
-                goto nlmsg_failure;
+                goto out_nlmsg_trim;
 
-        nlh->nlmsg_len = skb_tail_pointer(skb) - b;
-        return skb->len;
+        return nlmsg_end(skb, nlh);
 
-nlmsg_failure:
-        nlmsg_trim(skb, b);
+out_nlmsg_trim:
+        nlmsg_cancel(skb, nlh);
         return -EMSGSIZE;
 }
 
@@ -189,13 +178,15 @@ static int unix_diag_dump(struct sk_buff *skb, struct netlink_callback *cb)
         struct unix_diag_req *req;
         int num, s_num, slot, s_slot;
 
-        req = NLMSG_DATA(cb->nlh);
+        req = nlmsg_data(cb->nlh);
 
         s_slot = cb->args[0];
         num = s_num = cb->args[1];
 
         spin_lock(&unix_table_lock);
-        for (slot = s_slot; slot <= UNIX_HASH_SIZE; s_num = 0, slot++) {
+        for (slot = s_slot;
+             slot < ARRAY_SIZE(unix_socket_table);
+             s_num = 0, slot++) {
                 struct sock *sk;
                 struct hlist_node *node;
 
@@ -228,7 +219,7 @@ static struct sock *unix_lookup_by_ino(int ino)
         struct sock *sk;
 
         spin_lock(&unix_table_lock);
-        for (i = 0; i <= UNIX_HASH_SIZE; i++) {
+        for (i = 0; i < ARRAY_SIZE(unix_socket_table); i++) {
                 struct hlist_node *node;
 
                 sk_for_each(sk, node, &unix_socket_table[i])
@@ -268,15 +259,14 @@ static int unix_diag_get_exact(struct sk_buff *in_skb,
         extra_len = 256;
 again:
         err = -ENOMEM;
-        rep = alloc_skb(NLMSG_SPACE((sizeof(struct unix_diag_msg) + extra_len)),
-                        GFP_KERNEL);
+        rep = nlmsg_new(sizeof(struct unix_diag_msg) + extra_len, GFP_KERNEL);
         if (!rep)
                 goto out;
 
         err = sk_diag_fill(sk, rep, req, NETLINK_CB(in_skb).pid,
                            nlh->nlmsg_seq, 0, req->udiag_ino);
         if (err < 0) {
-                kfree_skb(rep);
+                nlmsg_free(rep);
                 extra_len += 256;
                 if (extra_len >= PAGE_SIZE)
                         goto out;
@@ -307,7 +297,7 @@ static int unix_diag_handler_dump(struct sk_buff *skb, struct nlmsghdr *h)
                 };
                 return netlink_dump_start(sock_diag_nlsk, skb, h, &c);
         } else
-                return unix_diag_get_exact(skb, h, (struct unix_diag_req *)NLMSG_DATA(h));
+                return unix_diag_get_exact(skb, h, nlmsg_data(h));
 }
 
 static const struct sock_diag_handler unix_diag_handler = {
diff --git a/net/wireless/Kconfig b/net/wireless/Kconfig
index 2e4444fedbe..4d2b1ec6516 100644
--- a/net/wireless/Kconfig
+++ b/net/wireless/Kconfig
@@ -114,24 +114,10 @@ config CFG80211_WEXT
         bool "cfg80211 wireless extensions compatibility"
         depends on CFG80211
         select WEXT_CORE
-        default y
         help
           Enable this option if you need old userspace for wireless
           extensions with cfg80211-based drivers.
 
-config WIRELESS_EXT_SYSFS
-        bool "Wireless extensions sysfs files"
-        depends on WEXT_CORE && SYSFS
-        help
-          This option enables the deprecated wireless statistics
-          files in /sys/class/net/*/wireless/. The same information
-          is available via the ioctls as well.
-
-          Say N. If you know you have ancient tools requiring it,
-          like very old versions of hal (prior to 0.5.12 release),
-          say Y and update the tools as soon as possible as this
-          option will be removed soon.
-
 config LIB80211
         tristate "Common routines for IEEE802.11 drivers"
         default n
diff --git a/net/wireless/chan.c b/net/wireless/chan.c
index 884801ac4dd..c1999e45a07 100644
--- a/net/wireless/chan.c
+++ b/net/wireless/chan.c
@@ -60,7 +60,7 @@ bool cfg80211_can_beacon_sec_chan(struct wiphy *wiphy,
                 diff = -20;
                 break;
         default:
-                return false;
+                return true;
         }
 
         sec_chan = ieee80211_get_channel(wiphy, chan->center_freq + diff);
@@ -78,60 +78,17 @@ bool cfg80211_can_beacon_sec_chan(struct wiphy *wiphy,
 }
 EXPORT_SYMBOL(cfg80211_can_beacon_sec_chan);
 
-int cfg80211_set_freq(struct cfg80211_registered_device *rdev,
-                      struct wireless_dev *wdev, int freq,
-                      enum nl80211_channel_type channel_type)
+int cfg80211_set_monitor_channel(struct cfg80211_registered_device *rdev,
+                                 int freq, enum nl80211_channel_type chantype)
 {
         struct ieee80211_channel *chan;
-        int result;
-
-        if (wdev && wdev->iftype == NL80211_IFTYPE_MONITOR)
-                wdev = NULL;
-
-        if (wdev) {
-                ASSERT_WDEV_LOCK(wdev);
-
-                if (!netif_running(wdev->netdev))
-                        return -ENETDOWN;
-        }
 
-        if (!rdev->ops->set_channel)
+        if (!rdev->ops->set_monitor_channel)
                 return -EOPNOTSUPP;
 
-        chan = rdev_freq_to_chan(rdev, freq, channel_type);
+        chan = rdev_freq_to_chan(rdev, freq, chantype);
         if (!chan)
                 return -EINVAL;
 
-        /* Both channels should be able to initiate communication */
-        if (wdev && (wdev->iftype == NL80211_IFTYPE_ADHOC ||
-                     wdev->iftype == NL80211_IFTYPE_AP ||
-                     wdev->iftype == NL80211_IFTYPE_AP_VLAN ||
-                     wdev->iftype == NL80211_IFTYPE_MESH_POINT ||
-                     wdev->iftype == NL80211_IFTYPE_P2P_GO)) {
-                switch (channel_type) {
-                case NL80211_CHAN_HT40PLUS:
-                case NL80211_CHAN_HT40MINUS:
-                        if (!cfg80211_can_beacon_sec_chan(&rdev->wiphy, chan,
-                                                          channel_type)) {
-                                printk(KERN_DEBUG
-                                       "cfg80211: Secondary channel not "
-                                       "allowed to initiate communication\n");
-                                return -EINVAL;
-                        }
-                        break;
-                default:
-                        break;
-                }
-        }
-
-        result = rdev->ops->set_channel(&rdev->wiphy,
-                                        wdev ? wdev->netdev : NULL,
-                                        chan, channel_type);
-        if (result)
-                return result;
-
-        if (wdev)
-                wdev->channel = chan;
-
-        return 0;
+        return rdev->ops->set_monitor_channel(&rdev->wiphy, chan, chantype);
 }
diff --git a/net/wireless/core.c b/net/wireless/core.c
index a87d4355297..907f62c80e2 100644
--- a/net/wireless/core.c
+++ b/net/wireless/core.c
@@ -96,69 +96,6 @@ struct wiphy *wiphy_idx_to_wiphy(int wiphy_idx)
         return &rdev->wiphy;
 }
 
-/* requires cfg80211_mutex to be held! */
-struct cfg80211_registered_device *
-__cfg80211_rdev_from_info(struct genl_info *info)
-{
-        int ifindex;
-        struct cfg80211_registered_device *bywiphyidx = NULL, *byifidx = NULL;
-        struct net_device *dev;
-        int err = -EINVAL;
-
-        assert_cfg80211_lock();
-
-        if (info->attrs[NL80211_ATTR_WIPHY]) {
-                bywiphyidx = cfg80211_rdev_by_wiphy_idx(
-                                nla_get_u32(info->attrs[NL80211_ATTR_WIPHY]));
-                err = -ENODEV;
-        }
-
-        if (info->attrs[NL80211_ATTR_IFINDEX]) {
-                ifindex = nla_get_u32(info->attrs[NL80211_ATTR_IFINDEX]);
-                dev = dev_get_by_index(genl_info_net(info), ifindex);
-                if (dev) {
-                        if (dev->ieee80211_ptr)
-                                byifidx =
-                                        wiphy_to_dev(dev->ieee80211_ptr->wiphy);
-                        dev_put(dev);
-                }
-                err = -ENODEV;
-        }
-
-        if (bywiphyidx && byifidx) {
-                if (bywiphyidx != byifidx)
-                        return ERR_PTR(-EINVAL);
-                else
-                        return bywiphyidx; /* == byifidx */
-        }
-        if (bywiphyidx)
-                return bywiphyidx;
-
-        if (byifidx)
-                return byifidx;
-
-        return ERR_PTR(err);
-}
-
-struct cfg80211_registered_device *
-cfg80211_get_dev_from_info(struct genl_info *info)
-{
-        struct cfg80211_registered_device *rdev;
-
-        mutex_lock(&cfg80211_mutex);
-        rdev = __cfg80211_rdev_from_info(info);
-
-        /* if it is not an error we grab the lock on
-         * it to assure it won't be going away while
-         * we operate on it */
-        if (!IS_ERR(rdev))
-                mutex_lock(&rdev->mtx);
-
-        mutex_unlock(&cfg80211_mutex);
-
-        return rdev;
-}
-
 struct cfg80211_registered_device *
 cfg80211_get_dev_from_ifindex(struct net *net, int ifindex)
 {
diff --git a/net/wireless/core.h b/net/wireless/core.h
index 8523f387867..609a579255a 100644
--- a/net/wireless/core.h
+++ b/net/wireless/core.h
@@ -159,32 +159,6 @@ static inline void cfg80211_unhold_bss(struct cfg80211_internal_bss *bss)
 struct cfg80211_registered_device *cfg80211_rdev_by_wiphy_idx(int wiphy_idx);
 int get_wiphy_idx(struct wiphy *wiphy);
 
-struct cfg80211_registered_device *
-__cfg80211_rdev_from_info(struct genl_info *info);
-
-/*
- * This function returns a pointer to the driver
- * that the genl_info item that is passed refers to.
- * If successful, it returns non-NULL and also locks
- * the driver's mutex!
- *
- * This means that you need to call cfg80211_unlock_rdev()
- * before being allowed to acquire &cfg80211_mutex!
- *
- * This is necessary because we need to lock the global
- * mutex to get an item off the list safely, and then
- * we lock the rdev mutex so it doesn't go away under us.
- *
- * We don't want to keep cfg80211_mutex locked
- * for all the time in order to allow requests on
- * other interfaces to go through at the same time.
- *
- * The result of this can be a PTR_ERR and hence must
- * be checked with IS_ERR() for errors.
- */
-extern struct cfg80211_registered_device *
-cfg80211_get_dev_from_info(struct genl_info *info);
-
 /* requires cfg80211_rdev_mutex to be held! */
 struct wiphy *wiphy_idx_to_wiphy(int wiphy_idx);
 
@@ -303,14 +277,17 @@ extern const struct mesh_config default_mesh_config;
 extern const struct mesh_setup default_mesh_setup;
 int __cfg80211_join_mesh(struct cfg80211_registered_device *rdev,
                          struct net_device *dev,
-                         const struct mesh_setup *setup,
+                         struct mesh_setup *setup,
                          const struct mesh_config *conf);
 int cfg80211_join_mesh(struct cfg80211_registered_device *rdev,
                        struct net_device *dev,
-                       const struct mesh_setup *setup,
+                       struct mesh_setup *setup,
                        const struct mesh_config *conf);
 int cfg80211_leave_mesh(struct cfg80211_registered_device *rdev,
                         struct net_device *dev);
+int cfg80211_set_mesh_freq(struct cfg80211_registered_device *rdev,
+                           struct wireless_dev *wdev, int freq,
+                           enum nl80211_channel_type channel_type);
 
 /* MLME */
 int __cfg80211_mlme_auth(struct cfg80211_registered_device *rdev,
@@ -441,9 +418,8 @@ cfg80211_can_add_interface(struct cfg80211_registered_device *rdev,
 struct ieee80211_channel *
 rdev_freq_to_chan(struct cfg80211_registered_device *rdev,
                   int freq, enum nl80211_channel_type channel_type);
-int cfg80211_set_freq(struct cfg80211_registered_device *rdev,
-                      struct wireless_dev *wdev, int freq,
-                      enum nl80211_channel_type channel_type);
+int cfg80211_set_monitor_channel(struct cfg80211_registered_device *rdev,
+                                 int freq, enum nl80211_channel_type chantype);
 
 int ieee80211_get_ratemask(struct ieee80211_supported_band *sband,
                            const u8 *rates, unsigned int n_rates,
diff --git a/net/wireless/mesh.c b/net/wireless/mesh.c
index 2749cb86b46..3b73b07486c 100644
--- a/net/wireless/mesh.c
+++ b/net/wireless/mesh.c
@@ -14,6 +14,9 @@
 
 #define MESH_PATH_TIMEOUT       5000
 #define MESH_RANN_INTERVAL      5000
+#define MESH_PATH_TO_ROOT_TIMEOUT      6000
+#define MESH_ROOT_INTERVAL     5000
+#define MESH_ROOT_CONFIRMATION_INTERVAL 2000
 
 /*
  * Minimum interval between two consecutive PREQs originated by the same
@@ -62,9 +65,15 @@ const struct mesh_config default_mesh_config = {
         .dot11MeshForwarding = true,
         .rssi_threshold = MESH_RSSI_THRESHOLD,
         .ht_opmode = IEEE80211_HT_OP_MODE_PROTECTION_NONHT_MIXED,
+        .dot11MeshHWMPactivePathToRootTimeout = MESH_PATH_TO_ROOT_TIMEOUT,
+        .dot11MeshHWMProotInterval = MESH_ROOT_INTERVAL,
+        .dot11MeshHWMPconfirmationInterval = MESH_ROOT_CONFIRMATION_INTERVAL,
 };
 
 const struct mesh_setup default_mesh_setup = {
+        /* cfg80211_join_mesh() will pick a channel if needed */
+        .channel = NULL,
+        .channel_type = NL80211_CHAN_NO_HT,
         .sync_method = IEEE80211_SYNC_METHOD_NEIGHBOR_OFFSET,
         .path_sel_proto = IEEE80211_PATH_PROTOCOL_HWMP,
         .path_metric = IEEE80211_PATH_METRIC_AIRTIME,
@@ -75,7 +84,7 @@ const struct mesh_setup default_mesh_setup = {
 
 int __cfg80211_join_mesh(struct cfg80211_registered_device *rdev,
                          struct net_device *dev,
-                         const struct mesh_setup *setup,
+                         struct mesh_setup *setup,
                          const struct mesh_config *conf)
 {
         struct wireless_dev *wdev = dev->ieee80211_ptr;
@@ -101,6 +110,51 @@ int __cfg80211_join_mesh(struct cfg80211_registered_device *rdev,
         if (!rdev->ops->join_mesh)
                 return -EOPNOTSUPP;
 
+        if (!setup->channel) {
+                /* if no channel explicitly given, use preset channel */
+                setup->channel = wdev->preset_chan;
+                setup->channel_type = wdev->preset_chantype;
+        }
+
+        if (!setup->channel) {
+                /* if we don't have that either, use the first usable channel */
+                enum ieee80211_band band;
+
+                for (band = 0; band < IEEE80211_NUM_BANDS; band++) {
+                        struct ieee80211_supported_band *sband;
+                        struct ieee80211_channel *chan;
+                        int i;
+
+                        sband = rdev->wiphy.bands[band];
+                        if (!sband)
+                                continue;
+
+                        for (i = 0; i < sband->n_channels; i++) {
+                                chan = &sband->channels[i];
+                                if (chan->flags & (IEEE80211_CHAN_NO_IBSS |
+                                                   IEEE80211_CHAN_PASSIVE_SCAN |
+                                                   IEEE80211_CHAN_DISABLED |
+                                                   IEEE80211_CHAN_RADAR))
+                                        continue;
+                                setup->channel = chan;
+                                break;
+                        }
+
+                        if (setup->channel)
+                                break;
+                }
+
+                /* no usable channel ... */
+                if (!setup->channel)
+                        return -EINVAL;
+
+                setup->channel_type = NL80211_CHAN_NO_HT;
+        }
+
+        if (!cfg80211_can_beacon_sec_chan(&rdev->wiphy, setup->channel,
+                                          setup->channel_type))
+                return -EINVAL;
+
         err = rdev->ops->join_mesh(&rdev->wiphy, dev, conf, setup);
         if (!err) {
                 memcpy(wdev->ssid, setup->mesh_id, setup->mesh_id_len);
@@ -112,7 +166,7 @@ int __cfg80211_join_mesh(struct cfg80211_registered_device *rdev,
 
 int cfg80211_join_mesh(struct cfg80211_registered_device *rdev,
                        struct net_device *dev,
-                       const struct mesh_setup *setup,
+                       struct mesh_setup *setup,
                        const struct mesh_config *conf)
 {
         struct wireless_dev *wdev = dev->ieee80211_ptr;
@@ -125,6 +179,45 @@ int cfg80211_join_mesh(struct cfg80211_registered_device *rdev,
         return err;
 }
 
+int cfg80211_set_mesh_freq(struct cfg80211_registered_device *rdev,
+                           struct wireless_dev *wdev, int freq,
+                           enum nl80211_channel_type channel_type)
+{
+        struct ieee80211_channel *channel;
+
+        channel = rdev_freq_to_chan(rdev, freq, channel_type);
+        if (!channel || !cfg80211_can_beacon_sec_chan(&rdev->wiphy,
+                                                      channel,
+                                                      channel_type)) {
+                return -EINVAL;
+        }
+
+        /*
+         * Workaround for libertas (only!), it puts the interface
+         * into mesh mode but doesn't implement join_mesh. Instead,
+         * it is configured via sysfs and then joins the mesh when
+         * you set the channel. Note that the libertas mesh isn't
+         * compatible with 802.11 mesh.
+         */
+        if (rdev->ops->libertas_set_mesh_channel) {
+                if (channel_type != NL80211_CHAN_NO_HT)
+                        return -EINVAL;
+
+                if (!netif_running(wdev->netdev))
+                        return -ENETDOWN;
+                return rdev->ops->libertas_set_mesh_channel(&rdev->wiphy,
+                                                            wdev->netdev,
+                                                            channel);
+        }
+
+        if (wdev->mesh_id_len)
+                return -EBUSY;
+
+        wdev->preset_chan = channel;
+        wdev->preset_chantype = channel_type;
+        return 0;
+}
+
 void cfg80211_notify_new_peer_candidate(struct net_device *dev,
                 const u8 *macaddr, const u8* ie, u8 ie_len, gfp_t gfp)
 {
diff --git a/net/wireless/mlme.c b/net/wireless/mlme.c
index eb90988bbd3..da4406f1192 100644
--- a/net/wireless/mlme.c
+++ b/net/wireless/mlme.c
@@ -947,8 +947,6 @@ void cfg80211_ch_switch_notify(struct net_device *dev, int freq,
         if (WARN_ON(!chan))
                 goto out;
 
-        wdev->channel = chan;
-
         nl80211_ch_switch_notify(rdev, dev, freq, type, GFP_KERNEL);
 out:
         wdev_unlock(wdev);
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index 206465dc0ca..3b508eaf2d0 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -70,6 +70,94 @@ static int get_rdev_dev_by_ifindex(struct net *netns, struct nlattr **attrs,
         return 0;
 }
 
+static struct cfg80211_registered_device *
+__cfg80211_rdev_from_attrs(struct net *netns, struct nlattr **attrs)
+{
+        struct cfg80211_registered_device *rdev = NULL, *tmp;
+        struct net_device *netdev;
+
+        assert_cfg80211_lock();
+
+        if (!attrs[NL80211_ATTR_WIPHY] &&
+            !attrs[NL80211_ATTR_IFINDEX])
+                return ERR_PTR(-EINVAL);
+
+        if (attrs[NL80211_ATTR_WIPHY])
+                rdev = cfg80211_rdev_by_wiphy_idx(
+                                nla_get_u32(attrs[NL80211_ATTR_WIPHY]));
+
+        if (attrs[NL80211_ATTR_IFINDEX]) {
+                int ifindex = nla_get_u32(attrs[NL80211_ATTR_IFINDEX]);
+                netdev = dev_get_by_index(netns, ifindex);
+                if (netdev) {
+                        if (netdev->ieee80211_ptr)
+                                tmp = wiphy_to_dev(
+                                                netdev->ieee80211_ptr->wiphy);
+                        else
+                                tmp = NULL;
+
+                        dev_put(netdev);
+
+                        /* not wireless device -- return error */
+                        if (!tmp)
+                                return ERR_PTR(-EINVAL);
+
+                        /* mismatch -- return error */
+                        if (rdev && tmp != rdev)
+                                return ERR_PTR(-EINVAL);
+
+                        rdev = tmp;
+                }
+        }
+
+        if (!rdev)
+                return ERR_PTR(-ENODEV);
+
+        if (netns != wiphy_net(&rdev->wiphy))
+                return ERR_PTR(-ENODEV);
+
+        return rdev;
+}
+
+/*
+ * This function returns a pointer to the driver
+ * that the genl_info item that is passed refers to.
+ * If successful, it returns non-NULL and also locks
+ * the driver's mutex!
+ *
+ * This means that you need to call cfg80211_unlock_rdev()
+ * before being allowed to acquire &cfg80211_mutex!
+ *
+ * This is necessary because we need to lock the global
+ * mutex to get an item off the list safely, and then
+ * we lock the rdev mutex so it doesn't go away under us.
+ *
+ * We don't want to keep cfg80211_mutex locked
+ * for all the time in order to allow requests on
+ * other interfaces to go through at the same time.
+ *
+ * The result of this can be a PTR_ERR and hence must
+ * be checked with IS_ERR() for errors.
+ */
+static struct cfg80211_registered_device *
+cfg80211_get_dev_from_info(struct net *netns, struct genl_info *info)
+{
+        struct cfg80211_registered_device *rdev;
+
+        mutex_lock(&cfg80211_mutex);
+        rdev = __cfg80211_rdev_from_attrs(netns, info->attrs);
+
+        /* if it is not an error we grab the lock on
+         * it to assure it won't be going away while
+         * we operate on it */
+        if (!IS_ERR(rdev))
+                mutex_lock(&rdev->mtx);
+
+        mutex_unlock(&cfg80211_mutex);
+
+        return rdev;
+}
+
 /* policy for the attributes */
 static const struct nla_policy nl80211_policy[NL80211_ATTR_MAX+1] = {
         [NL80211_ATTR_WIPHY] = { .type = NLA_U32 },
@@ -115,7 +203,7 @@ static const struct nla_policy nl80211_policy[NL80211_ATTR_MAX+1] = {
         [NL80211_ATTR_STA_VLAN] = { .type = NLA_U32 },
         [NL80211_ATTR_MNTR_FLAGS] = { /* NLA_NESTED can't be empty */ },
         [NL80211_ATTR_MESH_ID] = { .type = NLA_BINARY,
-                                .len = IEEE80211_MAX_MESH_ID_LEN },
+                                   .len = IEEE80211_MAX_MESH_ID_LEN },
         [NL80211_ATTR_MPATH_NEXT_HOP] = { .type = NLA_U32 },
 
         [NL80211_ATTR_REG_ALPHA2] = { .type = NLA_STRING, .len = 2 },
@@ -250,8 +338,9 @@ nl80211_rekey_policy[NUM_NL80211_REKEY_DATA] = {
 
 static const struct nla_policy
 nl80211_match_policy[NL80211_SCHED_SCAN_MATCH_ATTR_MAX + 1] = {
-        [NL80211_ATTR_SCHED_SCAN_MATCH_SSID] = { .type = NLA_BINARY,
+        [NL80211_SCHED_SCAN_MATCH_ATTR_SSID] = { .type = NLA_BINARY,
                                                  .len = IEEE80211_MAX_SSID_LEN },
+        [NL80211_SCHED_SCAN_MATCH_ATTR_RSSI] = { .type = NLA_U32 },
 };
 
 /* ifidx get helper */
@@ -921,7 +1010,12 @@ static int nl80211_send_wiphy(struct sk_buff *msg, u32 pid, u32 seq, int flags,
                 if (nla_put_u32(msg, i, NL80211_CMD_SET_WIPHY_NETNS))
                         goto nla_put_failure;
         }
-        CMD(set_channel, SET_CHANNEL);
+        if (dev->ops->set_monitor_channel || dev->ops->start_ap ||
+            dev->ops->join_mesh) {
+                i++;
+                if (nla_put_u32(msg, i, NL80211_CMD_SET_CHANNEL))
+                        goto nla_put_failure;
+        }
         CMD(set_wds_peer, SET_WDS_PEER);
         if (dev->wiphy.flags & WIPHY_FLAG_SUPPORTS_TDLS) {
                 CMD(tdls_mgmt, TDLS_MGMT);
@@ -1162,18 +1256,22 @@ static int parse_txq_params(struct nlattr *tb[],
 static bool nl80211_can_set_dev_channel(struct wireless_dev *wdev)
 {
         /*
-         * You can only set the channel explicitly for AP, mesh
-         * and WDS type interfaces; all others have their channel
-         * managed via their respective "establish a connection"
-         * command (connect, join, ...)
+         * You can only set the channel explicitly for WDS interfaces,
+         * all others have their channel managed via their respective
+         * "establish a connection" command (connect, join, ...)
+         *
+         * For AP/GO and mesh mode, the channel can be set with the
+         * channel userspace API, but is only stored and passed to the
+         * low-level driver when the AP starts or the mesh is joined.
+         * This is for backward compatibility, userspace can also give
+         * the channel in the start-ap or join-mesh commands instead.
          *
          * Monitors are special as they are normally slaved to
-         * whatever else is going on, so they behave as though
-         * you tried setting the wiphy channel itself.
+         * whatever else is going on, so they have their own special
+         * operation to set the monitor channel if possible.
          */
         return !wdev ||
                 wdev->iftype == NL80211_IFTYPE_AP ||
-                wdev->iftype == NL80211_IFTYPE_WDS ||
                 wdev->iftype == NL80211_IFTYPE_MESH_POINT ||
                 wdev->iftype == NL80211_IFTYPE_MONITOR ||
                 wdev->iftype == NL80211_IFTYPE_P2P_GO;
@@ -1204,9 +1302,14 @@ static int __nl80211_set_channel(struct cfg80211_registered_device *rdev,
                                  struct wireless_dev *wdev,
                                  struct genl_info *info)
 {
+        struct ieee80211_channel *channel;
         enum nl80211_channel_type channel_type = NL80211_CHAN_NO_HT;
         u32 freq;
         int result;
+        enum nl80211_iftype iftype = NL80211_IFTYPE_MONITOR;
+
+        if (wdev)
+                iftype = wdev->iftype;
 
         if (!info->attrs[NL80211_ATTR_WIPHY_FREQ])
                 return -EINVAL;
@@ -1221,12 +1324,32 @@ static int __nl80211_set_channel(struct cfg80211_registered_device *rdev,
         freq = nla_get_u32(info->attrs[NL80211_ATTR_WIPHY_FREQ]);
 
         mutex_lock(&rdev->devlist_mtx);
-        if (wdev) {
-                wdev_lock(wdev);
-                result = cfg80211_set_freq(rdev, wdev, freq, channel_type);
-                wdev_unlock(wdev);
-        } else {
-                result = cfg80211_set_freq(rdev, NULL, freq, channel_type);
+        switch (iftype) {
+        case NL80211_IFTYPE_AP:
+        case NL80211_IFTYPE_P2P_GO:
+                if (wdev->beacon_interval) {
+                        result = -EBUSY;
+                        break;
+                }
+                channel = rdev_freq_to_chan(rdev, freq, channel_type);
+                if (!channel || !cfg80211_can_beacon_sec_chan(&rdev->wiphy,
+                                                              channel,
+                                                              channel_type)) {
+                        result = -EINVAL;
+                        break;
+                }
+                wdev->preset_chan = channel;
+                wdev->preset_chantype = channel_type;
+                result = 0;
+                break;
+        case NL80211_IFTYPE_MESH_POINT:
+                result = cfg80211_set_mesh_freq(rdev, wdev, freq, channel_type);
+                break;
+        case NL80211_IFTYPE_MONITOR:
+                result = cfg80211_set_monitor_channel(rdev, freq, channel_type);
+                break;
+        default:
+                result = -EINVAL;
         }
         mutex_unlock(&rdev->devlist_mtx);
 
@@ -1300,7 +1423,8 @@ static int nl80211_set_wiphy(struct sk_buff *skb, struct genl_info *info)
         }
 
         if (!netdev) {
-                rdev = __cfg80211_rdev_from_info(info);
+                rdev = __cfg80211_rdev_from_attrs(genl_info_net(info),
+                                                  info->attrs);
                 if (IS_ERR(rdev)) {
                         mutex_unlock(&cfg80211_mutex);
                         return PTR_ERR(rdev);
@@ -1310,8 +1434,7 @@ static int nl80211_set_wiphy(struct sk_buff *skb, struct genl_info *info)
                 result = 0;
 
                 mutex_lock(&rdev->mtx);
-        } else if (netif_running(netdev) &&
-                   nl80211_can_set_dev_channel(netdev->ieee80211_ptr))
+        } else if (nl80211_can_set_dev_channel(netdev->ieee80211_ptr))
                 wdev = netdev->ieee80211_ptr;
         else
                 wdev = NULL;
@@ -2213,6 +2336,33 @@ static int nl80211_parse_beacon(struct genl_info *info,
         return 0;
 }
 
+static bool nl80211_get_ap_channel(struct cfg80211_registered_device *rdev,
+                                   struct cfg80211_ap_settings *params)
+{
+        struct wireless_dev *wdev;
+        bool ret = false;
+
+        mutex_lock(&rdev->devlist_mtx);
+
+        list_for_each_entry(wdev, &rdev->netdev_list, list) {
+                if (wdev->iftype != NL80211_IFTYPE_AP &&
+                    wdev->iftype != NL80211_IFTYPE_P2P_GO)
+                        continue;
+
+                if (!wdev->preset_chan)
+                        continue;
+
+                params->channel = wdev->preset_chan;
+                params->channel_type = wdev->preset_chantype;
+                ret = true;
+                break;
+        }
+
+        mutex_unlock(&rdev->devlist_mtx);
+
+        return ret;
+}
+
 static int nl80211_start_ap(struct sk_buff *skb, struct genl_info *info)
 {
         struct cfg80211_registered_device *rdev = info->user_ptr[0];
@@ -2299,9 +2449,35 @@ static int nl80211_start_ap(struct sk_buff *skb, struct genl_info *info)
                         info->attrs[NL80211_ATTR_INACTIVITY_TIMEOUT]);
         }
 
+        if (info->attrs[NL80211_ATTR_WIPHY_FREQ]) {
+                enum nl80211_channel_type channel_type = NL80211_CHAN_NO_HT;
+
+                if (info->attrs[NL80211_ATTR_WIPHY_CHANNEL_TYPE] &&
+                    !nl80211_valid_channel_type(info, &channel_type))
+                        return -EINVAL;
+
+                params.channel = rdev_freq_to_chan(rdev,
+                        nla_get_u32(info->attrs[NL80211_ATTR_WIPHY_FREQ]),
+                        channel_type);
+                if (!params.channel)
+                        return -EINVAL;
+                params.channel_type = channel_type;
+        } else if (wdev->preset_chan) {
+                params.channel = wdev->preset_chan;
+                params.channel_type = wdev->preset_chantype;
+        } else if (!nl80211_get_ap_channel(rdev, &params))
+                return -EINVAL;
+
+        if (!cfg80211_can_beacon_sec_chan(&rdev->wiphy, params.channel,
+                                          params.channel_type))
+                return -EINVAL;
+
         err = rdev->ops->start_ap(&rdev->wiphy, dev, &params);
-        if (!err)
+        if (!err) {
+                wdev->preset_chan = params.channel;
+                wdev->preset_chantype = params.channel_type;
                 wdev->beacon_interval = params.beacon_interval;
+        }
         return err;
 }
 
@@ -3413,7 +3589,13 @@ static int nl80211_get_mesh_config(struct sk_buff *skb,
             nla_put_u32(msg, NL80211_MESHCONF_RSSI_THRESHOLD,
                         cur_params.rssi_threshold) ||
             nla_put_u32(msg, NL80211_MESHCONF_HT_OPMODE,
-                        cur_params.ht_opmode))
+                        cur_params.ht_opmode) ||
+            nla_put_u32(msg, NL80211_MESHCONF_HWMP_PATH_TO_ROOT_TIMEOUT,
+                        cur_params.dot11MeshHWMPactivePathToRootTimeout) ||
+            nla_put_u16(msg, NL80211_MESHCONF_HWMP_ROOT_INTERVAL,
+                        cur_params.dot11MeshHWMProotInterval) ||
+            nla_put_u16(msg, NL80211_MESHCONF_HWMP_CONFIRMATION_INTERVAL,
+                        cur_params.dot11MeshHWMPconfirmationInterval))
                 goto nla_put_failure;
         nla_nest_end(msg, pinfoattr);
         genlmsg_end(msg, hdr);
@@ -3436,7 +3618,6 @@ static const struct nla_policy nl80211_meshconf_params_policy[NL80211_MESHCONF_A
         [NL80211_MESHCONF_ELEMENT_TTL] = { .type = NLA_U8 },
         [NL80211_MESHCONF_AUTO_OPEN_PLINKS] = { .type = NLA_U8 },
         [NL80211_MESHCONF_SYNC_OFFSET_MAX_NEIGHBOR] = { .type = NLA_U32 },
-
         [NL80211_MESHCONF_HWMP_MAX_PREQ_RETRIES] = { .type = NLA_U8 },
         [NL80211_MESHCONF_PATH_REFRESH_TIME] = { .type = NLA_U32 },
         [NL80211_MESHCONF_MIN_DISCOVERY_TIMEOUT] = { .type = NLA_U16 },
@@ -3448,8 +3629,11 @@ static const struct nla_policy nl80211_meshconf_params_policy[NL80211_MESHCONF_A
         [NL80211_MESHCONF_HWMP_RANN_INTERVAL] = { .type = NLA_U16 },
         [NL80211_MESHCONF_GATE_ANNOUNCEMENTS] = { .type = NLA_U8 },
         [NL80211_MESHCONF_FORWARDING] = { .type = NLA_U8 },
-        [NL80211_MESHCONF_RSSI_THRESHOLD] = { .type = NLA_U32},
-        [NL80211_MESHCONF_HT_OPMODE] = { .type = NLA_U16},
+        [NL80211_MESHCONF_RSSI_THRESHOLD] = { .type = NLA_U32 },
+        [NL80211_MESHCONF_HT_OPMODE] = { .type = NLA_U16 },
+        [NL80211_MESHCONF_HWMP_PATH_TO_ROOT_TIMEOUT] = { .type = NLA_U32 },
+        [NL80211_MESHCONF_HWMP_ROOT_INTERVAL] = { .type = NLA_U16 },
+        [NL80211_MESHCONF_HWMP_CONFIRMATION_INTERVAL] = { .type = NLA_U16 },
 };
 
 static const struct nla_policy
@@ -3459,7 +3643,7 @@ static const struct nla_policy
         [NL80211_MESH_SETUP_ENABLE_VENDOR_METRIC] = { .type = NLA_U8 },
         [NL80211_MESH_SETUP_USERSPACE_AUTH] = { .type = NLA_FLAG },
         [NL80211_MESH_SETUP_IE] = { .type = NLA_BINARY,
-                .len = IEEE80211_MAX_DATA_LEN },
+                                    .len = IEEE80211_MAX_DATA_LEN },
         [NL80211_MESH_SETUP_USERSPACE_AMPE] = { .type = NLA_FLAG },
 };
 
@@ -3492,63 +3676,82 @@ do {\
 
         /* Fill in the params struct */
         FILL_IN_MESH_PARAM_IF_SET(tb, cfg, dot11MeshRetryTimeout,
-                        mask, NL80211_MESHCONF_RETRY_TIMEOUT, nla_get_u16);
+                                  mask, NL80211_MESHCONF_RETRY_TIMEOUT,
+                                  nla_get_u16);
         FILL_IN_MESH_PARAM_IF_SET(tb, cfg, dot11MeshConfirmTimeout,
-                        mask, NL80211_MESHCONF_CONFIRM_TIMEOUT, nla_get_u16);
+                                  mask, NL80211_MESHCONF_CONFIRM_TIMEOUT,
+                                  nla_get_u16);
         FILL_IN_MESH_PARAM_IF_SET(tb, cfg, dot11MeshHoldingTimeout,
-                        mask, NL80211_MESHCONF_HOLDING_TIMEOUT, nla_get_u16);
+                                  mask, NL80211_MESHCONF_HOLDING_TIMEOUT,
+                                  nla_get_u16);
         FILL_IN_MESH_PARAM_IF_SET(tb, cfg, dot11MeshMaxPeerLinks,
-                        mask, NL80211_MESHCONF_MAX_PEER_LINKS, nla_get_u16);
+                                  mask, NL80211_MESHCONF_MAX_PEER_LINKS,
+                                  nla_get_u16);
         FILL_IN_MESH_PARAM_IF_SET(tb, cfg, dot11MeshMaxRetries,
-                        mask, NL80211_MESHCONF_MAX_RETRIES, nla_get_u8);
+                                  mask, NL80211_MESHCONF_MAX_RETRIES,
+                                  nla_get_u8);
         FILL_IN_MESH_PARAM_IF_SET(tb, cfg, dot11MeshTTL,
-                        mask, NL80211_MESHCONF_TTL, nla_get_u8);
+                                  mask, NL80211_MESHCONF_TTL, nla_get_u8);
         FILL_IN_MESH_PARAM_IF_SET(tb, cfg, element_ttl,
-                        mask, NL80211_MESHCONF_ELEMENT_TTL, nla_get_u8);
+                                  mask, NL80211_MESHCONF_ELEMENT_TTL,
+                                  nla_get_u8);
         FILL_IN_MESH_PARAM_IF_SET(tb, cfg, auto_open_plinks,
-                        mask, NL80211_MESHCONF_AUTO_OPEN_PLINKS, nla_get_u8);
-        FILL_IN_MESH_PARAM_IF_SET(tb, cfg, dot11MeshNbrOffsetMaxNeighbor,
-                        mask, NL80211_MESHCONF_SYNC_OFFSET_MAX_NEIGHBOR,
-                        nla_get_u32);
+                                  mask, NL80211_MESHCONF_AUTO_OPEN_PLINKS,
+                                  nla_get_u8);
+        FILL_IN_MESH_PARAM_IF_SET(tb, cfg, dot11MeshNbrOffsetMaxNeighbor, mask,
+                                  NL80211_MESHCONF_SYNC_OFFSET_MAX_NEIGHBOR,
+                                  nla_get_u32);
         FILL_IN_MESH_PARAM_IF_SET(tb, cfg, dot11MeshHWMPmaxPREQretries,
-                        mask, NL80211_MESHCONF_HWMP_MAX_PREQ_RETRIES,
-                        nla_get_u8);
+                                  mask, NL80211_MESHCONF_HWMP_MAX_PREQ_RETRIES,
+                                  nla_get_u8);
         FILL_IN_MESH_PARAM_IF_SET(tb, cfg, path_refresh_time,
-                        mask, NL80211_MESHCONF_PATH_REFRESH_TIME, nla_get_u32);
+                                  mask, NL80211_MESHCONF_PATH_REFRESH_TIME,
+                                  nla_get_u32);
         FILL_IN_MESH_PARAM_IF_SET(tb, cfg, min_discovery_timeout,
-                        mask, NL80211_MESHCONF_MIN_DISCOVERY_TIMEOUT,
-                        nla_get_u16);
-        FILL_IN_MESH_PARAM_IF_SET(tb, cfg, dot11MeshHWMPactivePathTimeout,
-                        mask, NL80211_MESHCONF_HWMP_ACTIVE_PATH_TIMEOUT,
-                        nla_get_u32);
+                                  mask, NL80211_MESHCONF_MIN_DISCOVERY_TIMEOUT,
+                                  nla_get_u16);
+        FILL_IN_MESH_PARAM_IF_SET(tb, cfg, dot11MeshHWMPactivePathTimeout, mask,
+                                  NL80211_MESHCONF_HWMP_ACTIVE_PATH_TIMEOUT,
+                                  nla_get_u32);
         FILL_IN_MESH_PARAM_IF_SET(tb, cfg, dot11MeshHWMPpreqMinInterval,
-                        mask, NL80211_MESHCONF_HWMP_PREQ_MIN_INTERVAL,
-                        nla_get_u16);
+                                  mask, NL80211_MESHCONF_HWMP_PREQ_MIN_INTERVAL,
+                                  nla_get_u16);
         FILL_IN_MESH_PARAM_IF_SET(tb, cfg, dot11MeshHWMPperrMinInterval,
-                        mask, NL80211_MESHCONF_HWMP_PERR_MIN_INTERVAL,
-                        nla_get_u16);
-        FILL_IN_MESH_PARAM_IF_SET(tb, cfg,
-                        dot11MeshHWMPnetDiameterTraversalTime,
-                        mask, NL80211_MESHCONF_HWMP_NET_DIAM_TRVS_TIME,
-                        nla_get_u16);
-        FILL_IN_MESH_PARAM_IF_SET(tb, cfg,
-                        dot11MeshHWMPRootMode, mask,
-                        NL80211_MESHCONF_HWMP_ROOTMODE,
-                        nla_get_u8);
+                                  mask, NL80211_MESHCONF_HWMP_PERR_MIN_INTERVAL,
+                                  nla_get_u16);
         FILL_IN_MESH_PARAM_IF_SET(tb, cfg,
-                        dot11MeshHWMPRannInterval, mask,
-                        NL80211_MESHCONF_HWMP_RANN_INTERVAL,
-                        nla_get_u16);
+                                  dot11MeshHWMPnetDiameterTraversalTime, mask,
+                                  NL80211_MESHCONF_HWMP_NET_DIAM_TRVS_TIME,
+                                  nla_get_u16);
+        FILL_IN_MESH_PARAM_IF_SET(tb, cfg, dot11MeshHWMPRootMode, mask,
+                                  NL80211_MESHCONF_HWMP_ROOTMODE, nla_get_u8);
+        FILL_IN_MESH_PARAM_IF_SET(tb, cfg, dot11MeshHWMPRannInterval, mask,
+                                  NL80211_MESHCONF_HWMP_RANN_INTERVAL,
+                                  nla_get_u16);
         FILL_IN_MESH_PARAM_IF_SET(tb, cfg,
-                        dot11MeshGateAnnouncementProtocol, mask,
-                        NL80211_MESHCONF_GATE_ANNOUNCEMENTS,
-                        nla_get_u8);
+                                  dot11MeshGateAnnouncementProtocol, mask,
+                                  NL80211_MESHCONF_GATE_ANNOUNCEMENTS,
+                                  nla_get_u8);
         FILL_IN_MESH_PARAM_IF_SET(tb, cfg, dot11MeshForwarding,
-                        mask, NL80211_MESHCONF_FORWARDING, nla_get_u8);
+                                  mask, NL80211_MESHCONF_FORWARDING,
+                                  nla_get_u8);
         FILL_IN_MESH_PARAM_IF_SET(tb, cfg, rssi_threshold,
-                        mask, NL80211_MESHCONF_RSSI_THRESHOLD, nla_get_u32);
+                                  mask, NL80211_MESHCONF_RSSI_THRESHOLD,
+                                  nla_get_u32);
         FILL_IN_MESH_PARAM_IF_SET(tb, cfg, ht_opmode,
-                        mask, NL80211_MESHCONF_HT_OPMODE, nla_get_u16);
+                                  mask, NL80211_MESHCONF_HT_OPMODE,
+                                  nla_get_u16);
+        FILL_IN_MESH_PARAM_IF_SET(tb, cfg, dot11MeshHWMPactivePathToRootTimeout,
+                                  mask,
+                                  NL80211_MESHCONF_HWMP_PATH_TO_ROOT_TIMEOUT,
+                                  nla_get_u32);
+        FILL_IN_MESH_PARAM_IF_SET(tb, cfg, dot11MeshHWMProotInterval,
+                                  mask, NL80211_MESHCONF_HWMP_ROOT_INTERVAL,
+                                  nla_get_u16);
+        FILL_IN_MESH_PARAM_IF_SET(tb, cfg,
+                                  dot11MeshHWMPconfirmationInterval, mask,
+                                  NL80211_MESHCONF_HWMP_CONFIRMATION_INTERVAL,
+                                  nla_get_u16);
         if (mask_out)
                 *mask_out = mask;
 
@@ -4185,12 +4388,12 @@ static int nl80211_start_sched_scan(struct sk_buff *skb,
                 nla_for_each_nested(attr,
                                     info->attrs[NL80211_ATTR_SCHED_SCAN_MATCH],
                                     tmp) {
-                        struct nlattr *ssid;
+                        struct nlattr *ssid, *rssi;
 
                         nla_parse(tb, NL80211_SCHED_SCAN_MATCH_ATTR_MAX,
                                   nla_data(attr), nla_len(attr),
                                   nl80211_match_policy);
-                        ssid = tb[NL80211_ATTR_SCHED_SCAN_MATCH_SSID];
+                        ssid = tb[NL80211_SCHED_SCAN_MATCH_ATTR_SSID];
                         if (ssid) {
                                 if (nla_len(ssid) > IEEE80211_MAX_SSID_LEN) {
                                         err = -EINVAL;
@@ -4201,6 +4404,12 @@ static int nl80211_start_sched_scan(struct sk_buff *skb,
                                 request->match_sets[i].ssid.ssid_len =
                                         nla_len(ssid);
                         }
+                        rssi = tb[NL80211_SCHED_SCAN_MATCH_ATTR_RSSI];
+                        if (rssi)
+                                request->rssi_thold = nla_get_u32(rssi);
+                        else
+                                request->rssi_thold =
+                                                   NL80211_SCAN_RSSI_THOLD_OFF;
                         i++;
                 }
         }
@@ -5058,21 +5267,18 @@ static int nl80211_testmode_dump(struct sk_buff *skb,
                                   nl80211_policy);
                 if (err)
                         return err;
-                if (nl80211_fam.attrbuf[NL80211_ATTR_WIPHY]) {
-                        phy_idx = nla_get_u32(
-                                nl80211_fam.attrbuf[NL80211_ATTR_WIPHY]);
-                } else {
-                        struct net_device *netdev;
 
-                        err = get_rdev_dev_by_ifindex(sock_net(skb->sk),
-                                                      nl80211_fam.attrbuf,
-                                                      &rdev, &netdev);
-                        if (err)
-                                return err;
-                        dev_put(netdev);
-                        phy_idx = rdev->wiphy_idx;
-                        cfg80211_unlock_rdev(rdev);
+                mutex_lock(&cfg80211_mutex);
+                rdev = __cfg80211_rdev_from_attrs(sock_net(skb->sk),
+                                                  nl80211_fam.attrbuf);
+                if (IS_ERR(rdev)) {
+                        mutex_unlock(&cfg80211_mutex);
+                        return PTR_ERR(rdev);
                 }
+                phy_idx = rdev->wiphy_idx;
+                rdev = NULL;
+                mutex_unlock(&cfg80211_mutex);
+
                 if (nl80211_fam.attrbuf[NL80211_ATTR_TESTDATA])
                         cb->args[1] =
                                 (long)nl80211_fam.attrbuf[NL80211_ATTR_TESTDATA];
@@ -5489,18 +5695,18 @@ static int nl80211_remain_on_channel(struct sk_buff *skb,
 
         duration = nla_get_u32(info->attrs[NL80211_ATTR_DURATION]);
 
+        if (!rdev->ops->remain_on_channel ||
+            !(rdev->wiphy.flags & WIPHY_FLAG_HAS_REMAIN_ON_CHANNEL))
+                return -EOPNOTSUPP;
+
         /*
-         * We should be on that channel for at least one jiffie,
-         * and more than 5 seconds seems excessive.
+         * We should be on that channel for at least a minimum amount of
+         * time (10ms) but no longer than the driver supports.
          */
-        if (!duration || !msecs_to_jiffies(duration) ||
+        if (duration < NL80211_MIN_REMAIN_ON_CHANNEL_TIME ||
             duration > rdev->wiphy.max_remain_on_channel_duration)
                 return -EINVAL;
 
-        if (!rdev->ops->remain_on_channel ||
-            !(rdev->wiphy.flags & WIPHY_FLAG_HAS_REMAIN_ON_CHANNEL))
-                return -EOPNOTSUPP;
-
         if (info->attrs[NL80211_ATTR_WIPHY_CHANNEL_TYPE] &&
             !nl80211_valid_channel_type(info, &channel_type))
                 return -EINVAL;
@@ -5771,6 +5977,15 @@ static int nl80211_tx_mgmt(struct sk_buff *skb, struct genl_info *info)
                 if (!(rdev->wiphy.flags & WIPHY_FLAG_OFFCHAN_TX))
                         return -EINVAL;
                 wait = nla_get_u32(info->attrs[NL80211_ATTR_DURATION]);
+
+                /*
+                 * We should wait on the channel for at least a minimum amount
+                 * of time (10ms) but no longer than the driver supports.
+                 */
+                if (wait < NL80211_MIN_REMAIN_ON_CHANNEL_TIME ||
+                    wait > rdev->wiphy.max_remain_on_channel_duration)
+                        return -EINVAL;
+
         }
 
         if (info->attrs[NL80211_ATTR_WIPHY_CHANNEL_TYPE]) {
@@ -6032,6 +6247,24 @@ static int nl80211_join_mesh(struct sk_buff *skb, struct genl_info *info)
                         return err;
         }
 
+        if (info->attrs[NL80211_ATTR_WIPHY_FREQ]) {
+                enum nl80211_channel_type channel_type = NL80211_CHAN_NO_HT;
+
+                if (info->attrs[NL80211_ATTR_WIPHY_CHANNEL_TYPE] &&
+                    !nl80211_valid_channel_type(info, &channel_type))
+                        return -EINVAL;
+
+                setup.channel = rdev_freq_to_chan(rdev,
+                        nla_get_u32(info->attrs[NL80211_ATTR_WIPHY_FREQ]),
+                        channel_type);
+                if (!setup.channel)
+                        return -EINVAL;
+                setup.channel_type = channel_type;
+        } else {
+                /* cfg80211_join_mesh() will sort it out */
+                setup.channel = NULL;
+        }
+
         return cfg80211_join_mesh(rdev, dev, &setup, &cfg);
 }
 
@@ -6428,7 +6661,7 @@ static int nl80211_pre_doit(struct genl_ops *ops, struct sk_buff *skb,
                 rtnl_lock();
 
         if (ops->internal_flags & NL80211_FLAG_NEED_WIPHY) {
-                rdev = cfg80211_get_dev_from_info(info);
+                rdev = cfg80211_get_dev_from_info(genl_info_net(info), info);
                 if (IS_ERR(rdev)) {
                         if (rtnl)
                                 rtnl_unlock();
@@ -7127,7 +7360,7 @@ void nl80211_send_scan_start(struct cfg80211_registered_device *rdev,
 {
         struct sk_buff *msg;
 
-        msg = nlmsg_new(NLMSG_GOODSIZE, GFP_KERNEL);
+        msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);
         if (!msg)
                 return;
 
@@ -7203,7 +7436,7 @@ void nl80211_send_sched_scan(struct cfg80211_registered_device *rdev,
 {
         struct sk_buff *msg;
 
-        msg = nlmsg_new(NLMSG_GOODSIZE, GFP_KERNEL);
+        msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);
         if (!msg)
                 return;
 
@@ -7419,7 +7652,7 @@ void nl80211_send_connect_result(struct cfg80211_registered_device *rdev,
         struct sk_buff *msg;
         void *hdr;
 
-        msg = nlmsg_new(NLMSG_GOODSIZE, gfp);
+        msg = nlmsg_new(NLMSG_DEFAULT_SIZE, gfp);
         if (!msg)
                 return;
 
@@ -7459,7 +7692,7 @@ void nl80211_send_roamed(struct cfg80211_registered_device *rdev,
         struct sk_buff *msg;
         void *hdr;
 
-        msg = nlmsg_new(NLMSG_GOODSIZE, gfp);
+        msg = nlmsg_new(NLMSG_DEFAULT_SIZE, gfp);
         if (!msg)
                 return;
 
@@ -7497,7 +7730,7 @@ void nl80211_send_disconnected(struct cfg80211_registered_device *rdev,
         struct sk_buff *msg;
         void *hdr;
 
-        msg = nlmsg_new(NLMSG_GOODSIZE, GFP_KERNEL);
+        msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);
         if (!msg)
                 return;
 
@@ -7759,7 +7992,7 @@ void nl80211_send_sta_event(struct cfg80211_registered_device *rdev,
 {
         struct sk_buff *msg;
 
-        msg = nlmsg_new(NLMSG_GOODSIZE, gfp);
+        msg = nlmsg_new(NLMSG_DEFAULT_SIZE, gfp);
         if (!msg)
                 return;
 
@@ -7780,7 +8013,7 @@ void nl80211_send_sta_del_event(struct cfg80211_registered_device *rdev,
         struct sk_buff *msg;
         void *hdr;
 
-        msg = nlmsg_new(NLMSG_GOODSIZE, gfp);
+        msg = nlmsg_new(NLMSG_DEFAULT_SIZE, gfp);
         if (!msg)
                 return;
 
@@ -7943,7 +8176,7 @@ nl80211_send_cqm_rssi_notify(struct cfg80211_registered_device *rdev,
         struct nlattr *pinfoattr;
         void *hdr;
 
-        msg = nlmsg_new(NLMSG_GOODSIZE, gfp);
+        msg = nlmsg_new(NLMSG_DEFAULT_SIZE, gfp);
         if (!msg)
                 return;
 
@@ -7986,7 +8219,7 @@ void nl80211_gtk_rekey_notify(struct cfg80211_registered_device *rdev,
         struct nlattr *rekey_attr;
         void *hdr;
 
-        msg = nlmsg_new(NLMSG_GOODSIZE, gfp);
+        msg = nlmsg_new(NLMSG_DEFAULT_SIZE, gfp);
         if (!msg)
                 return;
 
@@ -8030,7 +8263,7 @@ void nl80211_pmksa_candidate_notify(struct cfg80211_registered_device *rdev,
         struct nlattr *attr;
         void *hdr;
 
-        msg = nlmsg_new(NLMSG_GOODSIZE, gfp);
+        msg = nlmsg_new(NLMSG_DEFAULT_SIZE, gfp);
         if (!msg)
                 return;
 
@@ -8074,7 +8307,7 @@ void nl80211_ch_switch_notify(struct cfg80211_registered_device *rdev,
         struct sk_buff *msg;
         void *hdr;
 
-        msg = nlmsg_new(NLMSG_GOODSIZE, gfp);
+        msg = nlmsg_new(NLMSG_DEFAULT_SIZE, gfp);
         if (!msg)
                 return;
 
@@ -8109,7 +8342,7 @@ nl80211_send_cqm_pktloss_notify(struct cfg80211_registered_device *rdev,
         struct nlattr *pinfoattr;
         void *hdr;
 
-        msg = nlmsg_new(NLMSG_GOODSIZE, gfp);
+        msg = nlmsg_new(NLMSG_DEFAULT_SIZE, gfp);
         if (!msg)
                 return;
 
@@ -8153,7 +8386,7 @@ void cfg80211_probe_status(struct net_device *dev, const u8 *addr,
         void *hdr;
         int err;
 
-        msg = nlmsg_new(NLMSG_GOODSIZE, gfp);
+        msg = nlmsg_new(NLMSG_DEFAULT_SIZE, gfp);
         if (!msg)
                 return;
 
diff --git a/net/wireless/wext-compat.c b/net/wireless/wext-compat.c
index 6a6181a673c..bc879833b21 100644
--- a/net/wireless/wext-compat.c
+++ b/net/wireless/wext-compat.c
@@ -796,7 +796,15 @@ static int cfg80211_wext_siwfreq(struct net_device *dev,
         case NL80211_IFTYPE_ADHOC:
                 return cfg80211_ibss_wext_siwfreq(dev, info, wextfreq, extra);
         case NL80211_IFTYPE_MONITOR:
-        case NL80211_IFTYPE_WDS:
+                freq = cfg80211_wext_freq(wdev->wiphy, wextfreq);
+                if (freq < 0)
+                        return freq;
+                if (freq == 0)
+                        return -EINVAL;
+                mutex_lock(&rdev->devlist_mtx);
+                err = cfg80211_set_monitor_channel(rdev, freq, NL80211_CHAN_NO_HT);
+                mutex_unlock(&rdev->devlist_mtx);
+                return err;
         case NL80211_IFTYPE_MESH_POINT:
                 freq = cfg80211_wext_freq(wdev->wiphy, wextfreq);
                 if (freq < 0)
@@ -804,9 +812,8 @@ static int cfg80211_wext_siwfreq(struct net_device *dev,
                 if (freq == 0)
                         return -EINVAL;
                 mutex_lock(&rdev->devlist_mtx);
-                wdev_lock(wdev);
-                err = cfg80211_set_freq(rdev, wdev, freq, NL80211_CHAN_NO_HT);
-                wdev_unlock(wdev);
+                err = cfg80211_set_mesh_freq(rdev, wdev, freq,
+                                             NL80211_CHAN_NO_HT);
                 mutex_unlock(&rdev->devlist_mtx);
                 return err;
         default:
@@ -839,11 +846,7 @@ static int cfg80211_wext_giwfreq(struct net_device *dev,
                 freq->e = 6;
                 return 0;
         default:
-                if (!wdev->channel)
-                        return -EINVAL;
-                freq->m = wdev->channel->center_freq;
-                freq->e = 6;
-                return 0;
+                return -EINVAL;
         }
 }
 
diff --git a/net/wireless/wext-sme.c b/net/wireless/wext-sme.c
index 7decbd357d5..1f773f668d1 100644
--- a/net/wireless/wext-sme.c
+++ b/net/wireless/wext-sme.c
@@ -111,9 +111,15 @@ int cfg80211_mgd_wext_siwfreq(struct net_device *dev,
 
         wdev->wext.connect.channel = chan;
 
-        /* SSID is not set, we just want to switch channel */
+        /*
+         * SSID is not set, we just want to switch monitor channel,
+         * this is really just backward compatibility, if the SSID
+         * is set then we use the channel to select the BSS to use
+         * to connect to instead. If we were connected on another
+         * channel we disconnected above and reconnect below.
+         */
         if (chan && !wdev->wext.connect.ssid_len) {
-                err = cfg80211_set_freq(rdev, wdev, freq, NL80211_CHAN_NO_HT);
+                err = cfg80211_set_monitor_channel(rdev, freq, NL80211_CHAN_NO_HT);
                 goto out;
         }
 
diff --git a/net/x25/x25_route.c b/net/x25/x25_route.c
index cf636627005..277c8d2448d 100644
--- a/net/x25/x25_route.c
+++ b/net/x25/x25_route.c
@@ -66,7 +66,7 @@ out:
 
 /**
  * __x25_remove_route - remove route from x25_route_list
- * @rt - route to remove
+ * @rt: route to remove
  *
  * Remove route from x25_route_list. If it was there.
  * Caller must hold x25_route_list_lock.
diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c
index ccfbd328a69..6e97855b584 100644
--- a/net/xfrm/xfrm_policy.c
+++ b/net/xfrm/xfrm_policy.c
@@ -1500,9 +1500,6 @@ static struct dst_entry *xfrm_bundle_create(struct xfrm_policy *policy,
         if (!dev)
                 goto free_dst;
 
-        /* Copy neighbour for reachability confirmation */
-        dst_set_neighbour(dst0, neigh_clone(dst_get_neighbour_noref(dst)));
-
         xfrm_init_path((struct xfrm_dst *)dst0, dst, nfheader_len);
         xfrm_init_pmtu(dst_prev);
 
@@ -2404,9 +2401,11 @@ static unsigned int xfrm_mtu(const struct dst_entry *dst)
         return mtu ? : dst_mtu(dst->path);
 }
 
-static struct neighbour *xfrm_neigh_lookup(const struct dst_entry *dst, const void *daddr)
+static struct neighbour *xfrm_neigh_lookup(const struct dst_entry *dst,
+                                           struct sk_buff *skb,
+                                           const void *daddr)
 {
-        return dst_neigh_lookup(dst->path, daddr);
+        return dst->path->ops->neigh_lookup(dst, skb, daddr);
 }
 
 int xfrm_policy_register_afinfo(struct xfrm_policy_afinfo *afinfo)
diff --git a/net/xfrm/xfrm_user.c b/net/xfrm/xfrm_user.c
index 44293b3fd6a..e75d8e47f35 100644
--- a/net/xfrm/xfrm_user.c
+++ b/net/xfrm/xfrm_user.c
@@ -754,58 +754,67 @@ static int copy_to_user_state_extra(struct xfrm_state *x,
                                     struct xfrm_usersa_info *p,
                                     struct sk_buff *skb)
 {
-        copy_to_user_state(x, p);
-
-        if (x->coaddr &&
-            nla_put(skb, XFRMA_COADDR, sizeof(*x->coaddr), x->coaddr))
-                goto nla_put_failure;
-
-        if (x->lastused &&
-            nla_put_u64(skb, XFRMA_LASTUSED, x->lastused))
-                goto nla_put_failure;
-
-        if (x->aead &&
-            nla_put(skb, XFRMA_ALG_AEAD, aead_len(x->aead), x->aead))
-                goto nla_put_failure;
-
-        if (x->aalg &&
-            (copy_to_user_auth(x->aalg, skb) ||
-             nla_put(skb, XFRMA_ALG_AUTH_TRUNC,
-                     xfrm_alg_auth_len(x->aalg), x->aalg)))
-                goto nla_put_failure;
-
-        if (x->ealg &&
-            nla_put(skb, XFRMA_ALG_CRYPT, xfrm_alg_len(x->ealg), x->ealg))
-                goto nla_put_failure;
-
-        if (x->calg &&
-            nla_put(skb, XFRMA_ALG_COMP, sizeof(*(x->calg)), x->calg))
-                goto nla_put_failure;
-
-        if (x->encap &&
-            nla_put(skb, XFRMA_ENCAP, sizeof(*x->encap), x->encap))
-                goto nla_put_failure;
+        int ret = 0;
 
-        if (x->tfcpad &&
-            nla_put_u32(skb, XFRMA_TFCPAD, x->tfcpad))
-                goto nla_put_failure;
-
-        if (xfrm_mark_put(skb, &x->mark))
-                goto nla_put_failure;
-
-        if (x->replay_esn &&
-            nla_put(skb, XFRMA_REPLAY_ESN_VAL,
-                    xfrm_replay_state_esn_len(x->replay_esn),
-                    x->replay_esn))
-                goto nla_put_failure;
-
-        if (x->security && copy_sec_ctx(x->security, skb))
-                goto nla_put_failure;
-
-        return 0;
+        copy_to_user_state(x, p);
 
-nla_put_failure:
-        return -EMSGSIZE;
+        if (x->coaddr) {
+                ret = nla_put(skb, XFRMA_COADDR, sizeof(*x->coaddr), x->coaddr);
+                if (ret)
+                        goto out;
+        }
+        if (x->lastused) {
+                ret = nla_put_u64(skb, XFRMA_LASTUSED, x->lastused);
+                if (ret)
+                        goto out;
+        }
+        if (x->aead) {
+                ret = nla_put(skb, XFRMA_ALG_AEAD, aead_len(x->aead), x->aead);
+                if (ret)
+                        goto out;
+        }
+        if (x->aalg) {
+                ret = copy_to_user_auth(x->aalg, skb);
+                if (!ret)
+                        ret = nla_put(skb, XFRMA_ALG_AUTH_TRUNC,
+                                      xfrm_alg_auth_len(x->aalg), x->aalg);
+                if (ret)
+                        goto out;
+        }
+        if (x->ealg) {
+                ret = nla_put(skb, XFRMA_ALG_CRYPT, xfrm_alg_len(x->ealg), x->ealg);
+                if (ret)
+                        goto out;
+        }
+        if (x->calg) {
+                ret = nla_put(skb, XFRMA_ALG_COMP, sizeof(*(x->calg)), x->calg);
+                if (ret)
+                        goto out;
+        }
+        if (x->encap) {
+                ret = nla_put(skb, XFRMA_ENCAP, sizeof(*x->encap), x->encap);
+                if (ret)
+                        goto out;
+        }
+        if (x->tfcpad) {
+                ret = nla_put_u32(skb, XFRMA_TFCPAD, x->tfcpad);
+                if (ret)
+                        goto out;
+        }
+        ret = xfrm_mark_put(skb, &x->mark);
+        if (ret)
+                goto out;
+        if (x->replay_esn) {
+                ret = nla_put(skb, XFRMA_REPLAY_ESN_VAL,
+                              xfrm_replay_state_esn_len(x->replay_esn),
+                              x->replay_esn);
+                if (ret)
+                        goto out;
+        }
+        if (x->security)
+                ret = copy_sec_ctx(x->security, skb);
+out:
+        return ret;
 }
 
 static int dump_one_state(struct xfrm_state *x, int count, void *ptr)
@@ -825,15 +834,12 @@ static int dump_one_state(struct xfrm_state *x, int count, void *ptr)
         p = nlmsg_data(nlh);
 
         err = copy_to_user_state_extra(x, p, skb);
-        if (err)
-                goto nla_put_failure;
-
+        if (err) {
+                nlmsg_cancel(skb, nlh);
+                return err;
+        }
         nlmsg_end(skb, nlh);
         return 0;
-
-nla_put_failure:
-        nlmsg_cancel(skb, nlh);
-        return err;
 }
 
 static int xfrm_dump_sa_done(struct netlink_callback *cb)
@@ -904,6 +910,7 @@ static int build_spdinfo(struct sk_buff *skb, struct net *net,
         struct xfrmu_spdinfo spc;
         struct xfrmu_spdhinfo sph;
         struct nlmsghdr *nlh;
+        int err;
         u32 *f;
 
         nlh = nlmsg_put(skb, pid, seq, XFRM_MSG_NEWSPDINFO, sizeof(u32), 0);
@@ -922,15 +929,15 @@ static int build_spdinfo(struct sk_buff *skb, struct net *net,
         sph.spdhcnt = si.spdhcnt;
         sph.spdhmcnt = si.spdhmcnt;
 
-        if (nla_put(skb, XFRMA_SPD_INFO, sizeof(spc), &spc) ||
-            nla_put(skb, XFRMA_SPD_HINFO, sizeof(sph), &sph))
-                goto nla_put_failure;
+        err = nla_put(skb, XFRMA_SPD_INFO, sizeof(spc), &spc);
+        if (!err)
+                err = nla_put(skb, XFRMA_SPD_HINFO, sizeof(sph), &sph);
+        if (err) {
+                nlmsg_cancel(skb, nlh);
+                return err;
+        }
 
         return nlmsg_end(skb, nlh);
-
-nla_put_failure:
-        nlmsg_cancel(skb, nlh);
-        return -EMSGSIZE;
 }
 
 static int xfrm_get_spdinfo(struct sk_buff *skb, struct nlmsghdr *nlh,
@@ -965,6 +972,7 @@ static int build_sadinfo(struct sk_buff *skb, struct net *net,
         struct xfrmk_sadinfo si;
         struct xfrmu_sadhinfo sh;
         struct nlmsghdr *nlh;
+        int err;
         u32 *f;
 
         nlh = nlmsg_put(skb, pid, seq, XFRM_MSG_NEWSADINFO, sizeof(u32), 0);
@@ -978,15 +986,15 @@ static int build_sadinfo(struct sk_buff *skb, struct net *net,
         sh.sadhmcnt = si.sadhmcnt;
         sh.sadhcnt = si.sadhcnt;
 
-        if (nla_put_u32(skb, XFRMA_SAD_CNT, si.sadcnt) ||
-            nla_put(skb, XFRMA_SAD_HINFO, sizeof(sh), &sh))
-                goto nla_put_failure;
+        err = nla_put_u32(skb, XFRMA_SAD_CNT, si.sadcnt);
+        if (!err)
+                err = nla_put(skb, XFRMA_SAD_HINFO, sizeof(sh), &sh);
+        if (err) {
+                nlmsg_cancel(skb, nlh);
+                return err;
+        }
 
         return nlmsg_end(skb, nlh);
-
-nla_put_failure:
-        nlmsg_cancel(skb, nlh);
-        return -EMSGSIZE;
 }
 
 static int xfrm_get_sadinfo(struct sk_buff *skb, struct nlmsghdr *nlh,
@@ -1439,9 +1447,8 @@ static inline int copy_to_user_state_sec_ctx(struct xfrm_state *x, struct sk_buf
 
 static inline int copy_to_user_sec_ctx(struct xfrm_policy *xp, struct sk_buff *skb)
 {
-        if (xp->security) {
+        if (xp->security)
                 return copy_sec_ctx(xp->security, skb);
-        }
         return 0;
 }
 static inline size_t userpolicy_type_attrsize(void)
@@ -1477,6 +1484,7 @@ static int dump_one_policy(struct xfrm_policy *xp, int dir, int count, void *ptr
         struct sk_buff *in_skb = sp->in_skb;
         struct sk_buff *skb = sp->out_skb;
         struct nlmsghdr *nlh;
+        int err;
 
         nlh = nlmsg_put(skb, NETLINK_CB(in_skb).pid, sp->nlmsg_seq,
                         XFRM_MSG_NEWPOLICY, sizeof(*p), sp->nlmsg_flags);
@@ -1485,22 +1493,19 @@ static int dump_one_policy(struct xfrm_policy *xp, int dir, int count, void *ptr
 
         p = nlmsg_data(nlh);
         copy_to_user_policy(xp, p, dir);
-        if (copy_to_user_tmpl(xp, skb) < 0)
-                goto nlmsg_failure;
-        if (copy_to_user_sec_ctx(xp, skb))
-                goto nlmsg_failure;
-        if (copy_to_user_policy_type(xp->type, skb) < 0)
-                goto nlmsg_failure;
-        if (xfrm_mark_put(skb, &xp->mark))
-                goto nla_put_failure;
-
+        err = copy_to_user_tmpl(xp, skb);
+        if (!err)
+                err = copy_to_user_sec_ctx(xp, skb);
+        if (!err)
+                err = copy_to_user_policy_type(xp->type, skb);
+        if (!err)
+                err = xfrm_mark_put(skb, &xp->mark);
+        if (err) {
+                nlmsg_cancel(skb, nlh);
+                return err;
+        }
         nlmsg_end(skb, nlh);
         return 0;
-
-nla_put_failure:
-nlmsg_failure:
-        nlmsg_cancel(skb, nlh);
-        return -EMSGSIZE;
 }
 
 static int xfrm_dump_policy_done(struct netlink_callback *cb)
@@ -1688,6 +1693,7 @@ static int build_aevent(struct sk_buff *skb, struct xfrm_state *x, const struct
 {
         struct xfrm_aevent_id *id;
         struct nlmsghdr *nlh;
+        int err;
 
         nlh = nlmsg_put(skb, c->pid, c->seq, XFRM_MSG_NEWAE, sizeof(*id), 0);
         if (nlh == NULL)
@@ -1703,35 +1709,39 @@ static int build_aevent(struct sk_buff *skb, struct xfrm_state *x, const struct
         id->flags = c->data.aevent;
 
         if (x->replay_esn) {
-                if (nla_put(skb, XFRMA_REPLAY_ESN_VAL,
-                            xfrm_replay_state_esn_len(x->replay_esn),
-                            x->replay_esn))
-                        goto nla_put_failure;
+                err = nla_put(skb, XFRMA_REPLAY_ESN_VAL,
+                              xfrm_replay_state_esn_len(x->replay_esn),
+                              x->replay_esn);
         } else {
-                if (nla_put(skb, XFRMA_REPLAY_VAL, sizeof(x->replay),
-                            &x->replay))
-                        goto nla_put_failure;
+                err = nla_put(skb, XFRMA_REPLAY_VAL, sizeof(x->replay),
+                              &x->replay);
         }
-        if (nla_put(skb, XFRMA_LTIME_VAL, sizeof(x->curlft), &x->curlft))
-                goto nla_put_failure;
-
-        if ((id->flags & XFRM_AE_RTHR) &&
-            nla_put_u32(skb, XFRMA_REPLAY_THRESH, x->replay_maxdiff))
-                goto nla_put_failure;
-
-        if ((id->flags & XFRM_AE_ETHR) &&
-            nla_put_u32(skb, XFRMA_ETIMER_THRESH,
-                        x->replay_maxage * 10 / HZ))
-                goto nla_put_failure;
+        if (err)
+                goto out_cancel;
+        err = nla_put(skb, XFRMA_LTIME_VAL, sizeof(x->curlft), &x->curlft);
+        if (err)
+                goto out_cancel;
 
-        if (xfrm_mark_put(skb, &x->mark))
-                goto nla_put_failure;
+        if (id->flags & XFRM_AE_RTHR) {
+                err = nla_put_u32(skb, XFRMA_REPLAY_THRESH, x->replay_maxdiff);
+                if (err)
+                        goto out_cancel;
+        }
+        if (id->flags & XFRM_AE_ETHR) {
+                err = nla_put_u32(skb, XFRMA_ETIMER_THRESH,
+                                  x->replay_maxage * 10 / HZ);
+                if (err)
+                        goto out_cancel;
+        }
+        err = xfrm_mark_put(skb, &x->mark);
+        if (err)
+                goto out_cancel;
 
         return nlmsg_end(skb, nlh);
 
-nla_put_failure:
+out_cancel:
         nlmsg_cancel(skb, nlh);
-        return -EMSGSIZE;
+        return err;
 }
 
 static int xfrm_get_ae(struct sk_buff *skb, struct nlmsghdr *nlh,
@@ -2155,7 +2165,7 @@ static int build_migrate(struct sk_buff *skb, const struct xfrm_migrate *m,
         const struct xfrm_migrate *mp;
         struct xfrm_userpolicy_id *pol_id;
         struct nlmsghdr *nlh;
-        int i;
+        int i, err;
 
         nlh = nlmsg_put(skb, 0, 0, XFRM_MSG_MIGRATE, sizeof(*pol_id), 0);
         if (nlh == NULL)
@@ -2167,21 +2177,25 @@ static int build_migrate(struct sk_buff *skb, const struct xfrm_migrate *m,
         memcpy(&pol_id->sel, sel, sizeof(pol_id->sel));
         pol_id->dir = dir;
 
-        if (k != NULL && (copy_to_user_kmaddress(k, skb) < 0))
-                        goto nlmsg_failure;
-
-        if (copy_to_user_policy_type(type, skb) < 0)
-                goto nlmsg_failure;
-
+        if (k != NULL) {
+                err = copy_to_user_kmaddress(k, skb);
+                if (err)
+                        goto out_cancel;
+        }
+        err = copy_to_user_policy_type(type, skb);
+        if (err)
+                goto out_cancel;
         for (i = 0, mp = m ; i < num_migrate; i++, mp++) {
-                if (copy_to_user_migrate(mp, skb) < 0)
-                        goto nlmsg_failure;
+                err = copy_to_user_migrate(mp, skb);
+                if (err)
+                        goto out_cancel;
         }
 
         return nlmsg_end(skb, nlh);
-nlmsg_failure:
+
+out_cancel:
         nlmsg_cancel(skb, nlh);
-        return -EMSGSIZE;
+        return err;
 }
 
 static int xfrm_send_migrate(const struct xfrm_selector *sel, u8 dir, u8 type,
@@ -2354,6 +2368,7 @@ static int build_expire(struct sk_buff *skb, struct xfrm_state *x, const struct
 {
         struct xfrm_user_expire *ue;
         struct nlmsghdr *nlh;
+        int err;
 
         nlh = nlmsg_put(skb, c->pid, 0, XFRM_MSG_EXPIRE, sizeof(*ue), 0);
         if (nlh == NULL)
@@ -2363,13 +2378,11 @@ static int build_expire(struct sk_buff *skb, struct xfrm_state *x, const struct
         copy_to_user_state(x, &ue->state);
         ue->hard = (c->data.hard != 0) ? 1 : 0;
 
-        if (xfrm_mark_put(skb, &x->mark))
-                goto nla_put_failure;
+        err = xfrm_mark_put(skb, &x->mark);
+        if (err)
+                return err;
 
         return nlmsg_end(skb, nlh);
-
-nla_put_failure:
-        return -EMSGSIZE;
 }
 
 static int xfrm_exp_state_notify(struct xfrm_state *x, const struct km_event *c)
@@ -2470,7 +2483,7 @@ static int xfrm_notify_sa(struct xfrm_state *x, const struct km_event *c)
         struct nlmsghdr *nlh;
         struct sk_buff *skb;
         int len = xfrm_sa_len(x);
-        int headlen;
+        int headlen, err;
 
         headlen = sizeof(*p);
         if (c->event == XFRM_MSG_DELSA) {
@@ -2485,8 +2498,9 @@ static int xfrm_notify_sa(struct xfrm_state *x, const struct km_event *c)
                 return -ENOMEM;
 
         nlh = nlmsg_put(skb, c->pid, c->seq, c->event, headlen, 0);
+        err = -EMSGSIZE;
         if (nlh == NULL)
-                goto nla_put_failure;
+                goto out_free_skb;
 
         p = nlmsg_data(nlh);
         if (c->event == XFRM_MSG_DELSA) {
@@ -2499,24 +2513,23 @@ static int xfrm_notify_sa(struct xfrm_state *x, const struct km_event *c)
                 id->proto = x->id.proto;
 
                 attr = nla_reserve(skb, XFRMA_SA, sizeof(*p));
+                err = -EMSGSIZE;
                 if (attr == NULL)
-                        goto nla_put_failure;
+                        goto out_free_skb;
 
                 p = nla_data(attr);
         }
-
-        if (copy_to_user_state_extra(x, p, skb))
-                goto nla_put_failure;
+        err = copy_to_user_state_extra(x, p, skb);
+        if (err)
+                goto out_free_skb;
 
         nlmsg_end(skb, nlh);
 
         return nlmsg_multicast(net->xfrm.nlsk, skb, 0, XFRMNLGRP_SA, GFP_ATOMIC);
 
-nla_put_failure:
-        /* Somebody screwed up with xfrm_sa_len! */
-        WARN_ON(1);
+out_free_skb:
         kfree_skb(skb);
-        return -1;
+        return err;
 }
 
 static int xfrm_send_state_notify(struct xfrm_state *x, const struct km_event *c)
@@ -2557,9 +2570,10 @@ static int build_acquire(struct sk_buff *skb, struct xfrm_state *x,
                          struct xfrm_tmpl *xt, struct xfrm_policy *xp,
                          int dir)
 {
+        __u32 seq = xfrm_get_acqseq();
         struct xfrm_user_acquire *ua;
         struct nlmsghdr *nlh;
-        __u32 seq = xfrm_get_acqseq();
+        int err;
 
         nlh = nlmsg_put(skb, 0, 0, XFRM_MSG_ACQUIRE, sizeof(*ua), 0);
         if (nlh == NULL)
@@ -2575,21 +2589,19 @@ static int build_acquire(struct sk_buff *skb, struct xfrm_state *x,
         ua->calgos = xt->calgos;
         ua->seq = x->km.seq = seq;
 
-        if (copy_to_user_tmpl(xp, skb) < 0)
-                goto nlmsg_failure;
-        if (copy_to_user_state_sec_ctx(x, skb))
-                goto nlmsg_failure;
-        if (copy_to_user_policy_type(xp->type, skb) < 0)
-                goto nlmsg_failure;
-        if (xfrm_mark_put(skb, &xp->mark))
-                goto nla_put_failure;
+        err = copy_to_user_tmpl(xp, skb);
+        if (!err)
+                err = copy_to_user_state_sec_ctx(x, skb);
+        if (!err)
+                err = copy_to_user_policy_type(xp->type, skb);
+        if (!err)
+                err = xfrm_mark_put(skb, &xp->mark);
+        if (err) {
+                nlmsg_cancel(skb, nlh);
+                return err;
+        }
 
         return nlmsg_end(skb, nlh);
-
-nla_put_failure:
-nlmsg_failure:
-        nlmsg_cancel(skb, nlh);
-        return -EMSGSIZE;
 }
 
 static int xfrm_send_acquire(struct xfrm_state *x, struct xfrm_tmpl *xt,
@@ -2681,8 +2693,9 @@ static int build_polexpire(struct sk_buff *skb, struct xfrm_policy *xp,
                            int dir, const struct km_event *c)
 {
         struct xfrm_user_polexpire *upe;
-        struct nlmsghdr *nlh;
         int hard = c->data.hard;
+        struct nlmsghdr *nlh;
+        int err;
 
         nlh = nlmsg_put(skb, c->pid, 0, XFRM_MSG_POLEXPIRE, sizeof(*upe), 0);
         if (nlh == NULL)
@@ -2690,22 +2703,20 @@ static int build_polexpire(struct sk_buff *skb, struct xfrm_policy *xp,
 
         upe = nlmsg_data(nlh);
         copy_to_user_policy(xp, &upe->pol, dir);
-        if (copy_to_user_tmpl(xp, skb) < 0)
-                goto nlmsg_failure;
-        if (copy_to_user_sec_ctx(xp, skb))
-                goto nlmsg_failure;
-        if (copy_to_user_policy_type(xp->type, skb) < 0)
-                goto nlmsg_failure;
-        if (xfrm_mark_put(skb, &xp->mark))
-                goto nla_put_failure;
+        err = copy_to_user_tmpl(xp, skb);
+        if (!err)
+                err = copy_to_user_sec_ctx(xp, skb);
+        if (!err)
+                err = copy_to_user_policy_type(xp->type, skb);
+        if (!err)
+                err = xfrm_mark_put(skb, &xp->mark);
+        if (err) {
+                nlmsg_cancel(skb, nlh);
+                return err;
+        }
         upe->hard = !!hard;
 
         return nlmsg_end(skb, nlh);
-
-nla_put_failure:
-nlmsg_failure:
-        nlmsg_cancel(skb, nlh);
-        return -EMSGSIZE;
 }
 
 static int xfrm_exp_policy_notify(struct xfrm_policy *xp, int dir, const struct km_event *c)
@@ -2725,13 +2736,13 @@ static int xfrm_exp_policy_notify(struct xfrm_policy *xp, int dir, const struct
 
 static int xfrm_notify_policy(struct xfrm_policy *xp, int dir, const struct km_event *c)
 {
+        int len = nla_total_size(sizeof(struct xfrm_user_tmpl) * xp->xfrm_nr);
         struct net *net = xp_net(xp);
         struct xfrm_userpolicy_info *p;
         struct xfrm_userpolicy_id *id;
         struct nlmsghdr *nlh;
         struct sk_buff *skb;
-        int len = nla_total_size(sizeof(struct xfrm_user_tmpl) * xp->xfrm_nr);
-        int headlen;
+        int headlen, err;
 
         headlen = sizeof(*p);
         if (c->event == XFRM_MSG_DELPOLICY) {
@@ -2747,8 +2758,9 @@ static int xfrm_notify_policy(struct xfrm_policy *xp, int dir, const struct km_e
                 return -ENOMEM;
 
         nlh = nlmsg_put(skb, c->pid, c->seq, c->event, headlen, 0);
+        err = -EMSGSIZE;
         if (nlh == NULL)
-                goto nlmsg_failure;
+                goto out_free_skb;
 
         p = nlmsg_data(nlh);
         if (c->event == XFRM_MSG_DELPOLICY) {
@@ -2763,29 +2775,29 @@ static int xfrm_notify_policy(struct xfrm_policy *xp, int dir, const struct km_e
                         memcpy(&id->sel, &xp->selector, sizeof(id->sel));
 
                 attr = nla_reserve(skb, XFRMA_POLICY, sizeof(*p));
+                err = -EMSGSIZE;
                 if (attr == NULL)
-                        goto nlmsg_failure;
+                        goto out_free_skb;
 
                 p = nla_data(attr);
         }
 
         copy_to_user_policy(xp, p, dir);
-        if (copy_to_user_tmpl(xp, skb) < 0)
-                goto nlmsg_failure;
-        if (copy_to_user_policy_type(xp->type, skb) < 0)
-                goto nlmsg_failure;
-
-        if (xfrm_mark_put(skb, &xp->mark))
-                goto nla_put_failure;
+        err = copy_to_user_tmpl(xp, skb);
+        if (!err)
+                err = copy_to_user_policy_type(xp->type, skb);
+        if (!err)
+                err = xfrm_mark_put(skb, &xp->mark);
+        if (err)
+                goto out_free_skb;
 
         nlmsg_end(skb, nlh);
 
         return nlmsg_multicast(net->xfrm.nlsk, skb, 0, XFRMNLGRP_POLICY, GFP_ATOMIC);
 
-nla_put_failure:
-nlmsg_failure:
+out_free_skb:
         kfree_skb(skb);
-        return -1;
+        return err;
 }
 
 static int xfrm_notify_policy_flush(const struct km_event *c)
@@ -2793,24 +2805,27 @@ static int xfrm_notify_policy_flush(const struct km_event *c)
         struct net *net = c->net;
         struct nlmsghdr *nlh;
         struct sk_buff *skb;
+        int err;
 
         skb = nlmsg_new(userpolicy_type_attrsize(), GFP_ATOMIC);
         if (skb == NULL)
                 return -ENOMEM;
 
         nlh = nlmsg_put(skb, c->pid, c->seq, XFRM_MSG_FLUSHPOLICY, 0, 0);
+        err = -EMSGSIZE;
         if (nlh == NULL)
-                goto nlmsg_failure;
-        if (copy_to_user_policy_type(c->data.type, skb) < 0)
-                goto nlmsg_failure;
+                goto out_free_skb;
+        err = copy_to_user_policy_type(c->data.type, skb);
+        if (err)
+                goto out_free_skb;
 
         nlmsg_end(skb, nlh);
 
         return nlmsg_multicast(net->xfrm.nlsk, skb, 0, XFRMNLGRP_POLICY, GFP_ATOMIC);
 
-nlmsg_failure:
+out_free_skb:
         kfree_skb(skb);
-        return -1;
+        return err;
 }
 
 static int xfrm_send_policy_notify(struct xfrm_policy *xp, int dir, const struct km_event *c)
@@ -2853,15 +2868,14 @@ static int build_report(struct sk_buff *skb, u8 proto,
         ur->proto = proto;
         memcpy(&ur->sel, sel, sizeof(ur->sel));
 
-        if (addr &&
-            nla_put(skb, XFRMA_COADDR, sizeof(*addr), addr))
-                goto nla_put_failure;
-
+        if (addr) {
+                int err = nla_put(skb, XFRMA_COADDR, sizeof(*addr), addr);
+                if (err) {
+                        nlmsg_cancel(skb, nlh);
+                        return err;
+                }
+        }
         return nlmsg_end(skb, nlh);
-
-nla_put_failure:
-        nlmsg_cancel(skb, nlh);
-        return -EMSGSIZE;
 }
 
 static int xfrm_send_report(struct net *net, u8 proto,
@@ -2945,9 +2959,12 @@ static struct xfrm_mgr netlink_mgr = {
 static int __net_init xfrm_user_net_init(struct net *net)
 {
         struct sock *nlsk;
+        struct netlink_kernel_cfg cfg = {
+                .groups = XFRMNLGRP_MAX,
+                .input  = xfrm_netlink_rcv,
+        };
 
-        nlsk = netlink_kernel_create(net, NETLINK_XFRM, XFRMNLGRP_MAX,
-                                     xfrm_netlink_rcv, NULL, THIS_MODULE);
+        nlsk = netlink_kernel_create(net, NETLINK_XFRM, THIS_MODULE, &cfg);
         if (nlsk == NULL)
                 return -ENOMEM;
         net->xfrm.nlsk_stash = nlsk; /* Don't set to NULL */
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
index 372ec6502aa..4ee6f237001 100644
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
@@ -5763,21 +5763,21 @@ static struct nf_hook_ops selinux_ipv4_ops[] = {
         {
                 .hook =         selinux_ipv4_postroute,
                 .owner =        THIS_MODULE,
-                .pf =           PF_INET,
+                .pf =           NFPROTO_IPV4,
                 .hooknum =      NF_INET_POST_ROUTING,
                 .priority =     NF_IP_PRI_SELINUX_LAST,
         },
         {
                 .hook =         selinux_ipv4_forward,
                 .owner =        THIS_MODULE,
-                .pf =           PF_INET,
+                .pf =           NFPROTO_IPV4,
                 .hooknum =      NF_INET_FORWARD,
                 .priority =     NF_IP_PRI_SELINUX_FIRST,
         },
         {
                 .hook =         selinux_ipv4_output,
                 .owner =        THIS_MODULE,
-                .pf =           PF_INET,
+                .pf =           NFPROTO_IPV4,
                 .hooknum =      NF_INET_LOCAL_OUT,
                 .priority =     NF_IP_PRI_SELINUX_FIRST,
         }
@@ -5789,14 +5789,14 @@ static struct nf_hook_ops selinux_ipv6_ops[] = {
         {
                 .hook =         selinux_ipv6_postroute,
                 .owner =        THIS_MODULE,
-                .pf =           PF_INET6,
+                .pf =           NFPROTO_IPV6,
                 .hooknum =      NF_INET_POST_ROUTING,
                 .priority =     NF_IP6_PRI_SELINUX_LAST,
         },
         {
                 .hook =         selinux_ipv6_forward,
                 .owner =        THIS_MODULE,
-                .pf =           PF_INET6,
+                .pf =           NFPROTO_IPV6,
                 .hooknum =      NF_INET_FORWARD,
                 .priority =     NF_IP6_PRI_SELINUX_FIRST,
         }
diff --git a/security/selinux/netlink.c b/security/selinux/netlink.c
index 161e01a6c7e..8a77725423e 100644
--- a/security/selinux/netlink.c
+++ b/security/selinux/netlink.c
@@ -19,6 +19,7 @@
 #include <linux/netlink.h>
 #include <linux/selinux_netlink.h>
 #include <net/net_namespace.h>
+#include <net/netlink.h>
 
 #include "security.h"
 
@@ -47,7 +48,7 @@ static void selnl_add_payload(struct nlmsghdr *nlh, int len, int msgtype, void *
 {
         switch (msgtype) {
         case SELNL_MSG_SETENFORCE: {
-                struct selnl_msg_setenforce *msg = NLMSG_DATA(nlh);
+                struct selnl_msg_setenforce *msg = nlmsg_data(nlh);
 
                 memset(msg, 0, len);
                 msg->val = *((int *)data);
@@ -55,7 +56,7 @@ static void selnl_add_payload(struct nlmsghdr *nlh, int len, int msgtype, void *
         }
 
         case SELNL_MSG_POLICYLOAD: {
-                struct selnl_msg_policyload *msg = NLMSG_DATA(nlh);
+                struct selnl_msg_policyload *msg = nlmsg_data(nlh);
 
                 memset(msg, 0, len);
                 msg->seqno = *((u32 *)data);
@@ -81,7 +82,9 @@ static void selnl_notify(int msgtype, void *data)
                 goto oom;
 
         tmp = skb->tail;
-        nlh = NLMSG_PUT(skb, 0, 0, msgtype, len);
+        nlh = nlmsg_put(skb, 0, 0, msgtype, len, 0);
+        if (!nlh)
+                goto out_kfree_skb;
         selnl_add_payload(nlh, len, msgtype, data);
         nlh->nlmsg_len = skb->tail - tmp;
         NETLINK_CB(skb).dst_group = SELNLGRP_AVC;
@@ -89,7 +92,7 @@ static void selnl_notify(int msgtype, void *data)
 out:
         return;
 
-nlmsg_failure:
+out_kfree_skb:
         kfree_skb(skb);
 oom:
         printk(KERN_ERR "SELinux:  OOM in %s\n", __func__);
@@ -108,8 +111,12 @@ void selnl_notify_policyload(u32 seqno)
 
 static int __init selnl_init(void)
 {
+        struct netlink_kernel_cfg cfg = {
+                .groups = SELNLGRP_MAX,
+        };
+
         selnl = netlink_kernel_create(&init_net, NETLINK_SELINUX,
-                                      SELNLGRP_MAX, NULL, NULL, THIS_MODULE);
+                                      THIS_MODULE, &cfg);
         if (selnl == NULL)
                 panic("SELinux:  Cannot create netlink socket.");
         netlink_set_nonroot(NETLINK_SELINUX, NL_NONROOT_RECV);