713 files changed, 18506 insertions, 10991 deletions

diff --git a/Documentation/magic-number.txt b/Documentation/magic-number.txt
index abf481f780ec..82761a31d64d 100644
--- a/Documentation/magic-number.txt
+++ b/Documentation/magic-number.txt
@@ -89,7 +89,7 @@ TTY_DRIVER_MAGIC      0x5402      tty_driver        include/linux/tty_driver.h
 MGSLPC_MAGIC          0x5402      mgslpc_info       drivers/char/pcmcia/synclink_cs.c
 TTY_LDISC_MAGIC       0x5403      tty_ldisc         include/linux/tty_ldisc.h
 USB_SERIAL_MAGIC      0x6702      usb_serial        drivers/usb/serial/usb-serial.h
-FULL_DUPLEX_MAGIC     0x6969                        drivers/net/tulip/de2104x.c
+FULL_DUPLEX_MAGIC     0x6969                        drivers/net/ethernet/dec/tulip/de2104x.c
 USB_BLUETOOTH_MAGIC   0x6d02      usb_bluetooth     drivers/usb/class/bluetty.c
 RFCOMM_TTY_MAGIC      0x6d02                        net/bluetooth/rfcomm/tty.c
 USB_SERIAL_PORT_MAGIC 0x7301      usb_serial_port   drivers/usb/serial/usb-serial.h
diff --git a/Documentation/networking/LICENSE.qlge b/Documentation/networking/LICENSE.qlge
index 123b6edd7f18..ce64e4d15b21 100644
--- a/Documentation/networking/LICENSE.qlge
+++ b/Documentation/networking/LICENSE.qlge
@@ -1,46 +1,288 @@
-Copyright (c)  2003-2008 QLogic Corporation
-QLogic Linux Networking HBA Driver
+Copyright (c) 2003-2011 QLogic Corporation
+QLogic Linux qlge NIC Driver
 
-This program includes a device driver for Linux 2.6 that may be
-distributed with QLogic hardware specific firmware binary file.
 You may modify and redistribute the device driver code under the
-GNU General Public License as published by the Free Software
-Foundation (version 2 or a later version).
-
-You may redistribute the hardware specific firmware binary file
-under the following terms:
-
-        1. Redistribution of source code (only if applicable),
-           must retain the above copyright notice, this list of
-           conditions and the following disclaimer.
-
-        2. Redistribution 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.
-
-        3. The name of QLogic Corporation may not be used to
-           endorse or promote products derived from this software
-           without specific prior written permission
-
-REGARDLESS OF WHAT LICENSING MECHANISM IS USED OR APPLICABLE,
-THIS PROGRAM IS PROVIDED BY QLOGIC CORPORATION "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 AUTHOR
-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.
-
-USER ACKNOWLEDGES AND AGREES THAT USE OF THIS PROGRAM WILL NOT
-CREATE OR GIVE GROUNDS FOR A LICENSE BY IMPLICATION, ESTOPPEL, OR
-OTHERWISE IN ANY INTELLECTUAL PROPERTY RIGHTS (PATENT, COPYRIGHT,
-TRADE SECRET, MASK WORK, OR OTHER PROPRIETARY RIGHT) EMBODIED IN
-ANY OTHER QLOGIC HARDWARE OR SOFTWARE EITHER SOLELY OR IN
-COMBINATION WITH THIS PROGRAM.
+GNU General Public License (a copy of which is attached hereto as
+Exhibit A) published by the Free Software Foundation (version 2).
 
+
+EXHIBIT A
+
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+ 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+                            NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
diff --git a/Documentation/networking/phy.txt b/Documentation/networking/phy.txt
index 9eb1ba52013d..95e5f5985a2a 100644
--- a/Documentation/networking/phy.txt
+++ b/Documentation/networking/phy.txt
@@ -62,7 +62,8 @@ The MDIO bus
  5) The bus must also be declared somewhere as a device, and registered.
 
  As an example for how one driver implemented an mdio bus driver, see
- drivers/net/gianfar_mii.c and arch/ppc/syslib/mpc85xx_devices.c
+ drivers/net/ethernet/freescale/fsl_pq_mdio.c and an associated DTS file
+ for one of the users. (e.g. "git grep fsl,.*-mdio arch/powerpc/boot/dts/")
 
 Connecting to a PHY
 
diff --git a/Documentation/zh_CN/magic-number.txt b/Documentation/zh_CN/magic-number.txt
index c278f412dc65..f606ba8598cf 100644
--- a/Documentation/zh_CN/magic-number.txt
+++ b/Documentation/zh_CN/magic-number.txt
@@ -89,7 +89,7 @@ TTY_DRIVER_MAGIC      0x5402      tty_driver        include/linux/tty_driver.h
 MGSLPC_MAGIC          0x5402      mgslpc_info       drivers/char/pcmcia/synclink_cs.c
 TTY_LDISC_MAGIC       0x5403      tty_ldisc         include/linux/tty_ldisc.h
 USB_SERIAL_MAGIC      0x6702      usb_serial        drivers/usb/serial/usb-serial.h
-FULL_DUPLEX_MAGIC     0x6969                        drivers/net/tulip/de2104x.c
+FULL_DUPLEX_MAGIC     0x6969                        drivers/net/ethernet/dec/tulip/de2104x.c
 USB_BLUETOOTH_MAGIC   0x6d02      usb_bluetooth     drivers/usb/class/bluetty.c
 RFCOMM_TTY_MAGIC      0x6d02                        net/bluetooth/rfcomm/tty.c
 USB_SERIAL_PORT_MAGIC 0x7301      usb_serial_port   drivers/usb/serial/usb-serial.h
diff --git a/MAINTAINERS b/MAINTAINERS
index 9a648eb8e213..5f540bb733ce 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1406,7 +1406,7 @@ F:	net/ax25/
 B43 WIRELESS DRIVER
 M:      Stefano Brivio <stefano.brivio@polimi.it>
 L:      linux-wireless@vger.kernel.org
-L:      b43-dev@lists.infradead.org (moderated for non-subscribers)
+L:      b43-dev@lists.infradead.org
 W:      http://linuxwireless.org/en/users/Drivers/b43
 S:      Maintained
 F:      drivers/net/wireless/b43/
@@ -1415,6 +1415,7 @@ B43LEGACY WIRELESS DRIVER
 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
 S:      Maintained
 F:      drivers/net/wireless/b43legacy/
@@ -1798,7 +1799,8 @@ F:	Documentation/zh_CN/
 CISCO VIC ETHERNET NIC DRIVER
 M:      Christian Benvenuti <benve@cisco.com>
 M:      Roopa Prabhu <roprabhu@cisco.com>
-M:      David Wang <dwang2@cisco.com>
+M:      Neel Patel <neepatel@cisco.com>
+M:      Nishank Trivedi <nistrive@cisco.com>
 S:      Supported
 F:      drivers/net/ethernet/cisco/enic/
 
@@ -7461,6 +7463,12 @@ S:	Supported
 F:      Documentation/filesystems/xfs.txt
 F:      fs/xfs/
 
+XILINX AXI ETHERNET DRIVER
+M:      Ariane Keller <ariane.keller@tik.ee.ethz.ch>
+M:      Daniel Borkmann <daniel.borkmann@tik.ee.ethz.ch>
+S:      Maintained
+F:      drivers/net/ethernet/xilinx/xilinx_axienet*
+
 XILINX SYSTEMACE DRIVER
 M:      Grant Likely <grant.likely@secretlab.ca>
 W:      http://www.secretlab.ca/
diff --git a/arch/s390/include/asm/qeth.h b/arch/s390/include/asm/qeth.h
index 90efda0b137d..2c7c898c03e4 100644
--- a/arch/s390/include/asm/qeth.h
+++ b/arch/s390/include/asm/qeth.h
@@ -20,6 +20,7 @@
 #define SIOC_QETH_ARP_FLUSH_CACHE       (SIOCDEVPRIVATE + 4)
 #define SIOC_QETH_ADP_SET_SNMP_CONTROL  (SIOCDEVPRIVATE + 5)
 #define SIOC_QETH_GET_CARD_TYPE         (SIOCDEVPRIVATE + 6)
+#define SIOC_QETH_QUERY_OAT             (SIOCDEVPRIVATE + 7)
 
 struct qeth_arp_cache_entry {
         __u8  macaddr[6];
@@ -107,4 +108,10 @@ struct qeth_arp_query_user_data {
         char *entries;
 } __attribute__((packed));
 
+struct qeth_query_oat_data {
+        __u32 command;
+        __u32 buffer_len;
+        __u32 response_len;
+        __u64 ptr;
+};
 #endif /* __ASM_S390_QETH_IOCTL_H__ */
diff --git a/drivers/atm/lanai.c b/drivers/atm/lanai.c
index f5569699f31c..68c758871812 100644
--- a/drivers/atm/lanai.c
+++ b/drivers/atm/lanai.c
@@ -1572,7 +1572,7 @@ static inline void host_vcc_unbind(struct lanai_dev *lanai,
 
 static void lanai_reset(struct lanai_dev *lanai)
 {
-        printk(KERN_CRIT DEV_LABEL "(itf %d): *NOT* reseting - not "
+        printk(KERN_CRIT DEV_LABEL "(itf %d): *NOT* resetting - not "
             "implemented\n", lanai->number);
         /* TODO */
         /* The following is just a hack until we write the real
diff --git a/drivers/bcma/sprom.c b/drivers/bcma/sprom.c
index 6f230fb087c5..e35134f724f6 100644
--- a/drivers/bcma/sprom.c
+++ b/drivers/bcma/sprom.c
@@ -14,8 +14,6 @@
 #include <linux/dma-mapping.h>
 #include <linux/slab.h>
 
-#define SPOFF(offset)   ((offset) / sizeof(u16))
-
 /**************************************************
  * R/W ops.
  **************************************************/
@@ -124,10 +122,21 @@ static int bcma_sprom_valid(const u16 *sprom)
  * SPROM extraction.
  **************************************************/
 
+#define SPOFF(offset)   ((offset) / sizeof(u16))
+
+#define SPEX(_field, _offset, _mask, _shift)    \
+        bus->sprom._field = ((sprom[SPOFF(_offset)] & (_mask)) >> (_shift))
+
 static void bcma_sprom_extract_r8(struct bcma_bus *bus, const u16 *sprom)
 {
-        u16 v;
+        u16 v, o;
         int i;
+        u16 pwr_info_offset[] = {
+                SSB_SROM8_PWR_INFO_CORE0, SSB_SROM8_PWR_INFO_CORE1,
+                SSB_SROM8_PWR_INFO_CORE2, SSB_SROM8_PWR_INFO_CORE3
+        };
+        BUILD_BUG_ON(ARRAY_SIZE(pwr_info_offset) !=
+                        ARRAY_SIZE(bus->sprom.core_pwr_info));
 
         bus->sprom.revision = sprom[SSB_SPROMSIZE_WORDS_R4 - 1] &
                 SSB_SPROM_REVISION_REV;
@@ -137,72 +146,104 @@ static void bcma_sprom_extract_r8(struct bcma_bus *bus, const u16 *sprom)
                 *(((__be16 *)bus->sprom.il0mac) + i) = cpu_to_be16(v);
         }
 
-        bus->sprom.board_rev = sprom[SPOFF(SSB_SPROM8_BOARDREV)];
-
-        bus->sprom.txpid2g[0] = (sprom[SPOFF(SSB_SPROM4_TXPID2G01)] &
-             SSB_SPROM4_TXPID2G0) >> SSB_SPROM4_TXPID2G0_SHIFT;
-        bus->sprom.txpid2g[1] = (sprom[SPOFF(SSB_SPROM4_TXPID2G01)] &
-             SSB_SPROM4_TXPID2G1) >> SSB_SPROM4_TXPID2G1_SHIFT;
-        bus->sprom.txpid2g[2] = (sprom[SPOFF(SSB_SPROM4_TXPID2G23)] &
-             SSB_SPROM4_TXPID2G2) >> SSB_SPROM4_TXPID2G2_SHIFT;
-        bus->sprom.txpid2g[3] = (sprom[SPOFF(SSB_SPROM4_TXPID2G23)] &
-             SSB_SPROM4_TXPID2G3) >> SSB_SPROM4_TXPID2G3_SHIFT;
-
-        bus->sprom.txpid5gl[0] = (sprom[SPOFF(SSB_SPROM4_TXPID5GL01)] &
-             SSB_SPROM4_TXPID5GL0) >> SSB_SPROM4_TXPID5GL0_SHIFT;
-        bus->sprom.txpid5gl[1] = (sprom[SPOFF(SSB_SPROM4_TXPID5GL01)] &
-             SSB_SPROM4_TXPID5GL1) >> SSB_SPROM4_TXPID5GL1_SHIFT;
-        bus->sprom.txpid5gl[2] = (sprom[SPOFF(SSB_SPROM4_TXPID5GL23)] &
-             SSB_SPROM4_TXPID5GL2) >> SSB_SPROM4_TXPID5GL2_SHIFT;
-        bus->sprom.txpid5gl[3] = (sprom[SPOFF(SSB_SPROM4_TXPID5GL23)] &
-             SSB_SPROM4_TXPID5GL3) >> SSB_SPROM4_TXPID5GL3_SHIFT;
-
-        bus->sprom.txpid5g[0] = (sprom[SPOFF(SSB_SPROM4_TXPID5G01)] &
-             SSB_SPROM4_TXPID5G0) >> SSB_SPROM4_TXPID5G0_SHIFT;
-        bus->sprom.txpid5g[1] = (sprom[SPOFF(SSB_SPROM4_TXPID5G01)] &
-             SSB_SPROM4_TXPID5G1) >> SSB_SPROM4_TXPID5G1_SHIFT;
-        bus->sprom.txpid5g[2] = (sprom[SPOFF(SSB_SPROM4_TXPID5G23)] &
-             SSB_SPROM4_TXPID5G2) >> SSB_SPROM4_TXPID5G2_SHIFT;
-        bus->sprom.txpid5g[3] = (sprom[SPOFF(SSB_SPROM4_TXPID5G23)] &
-             SSB_SPROM4_TXPID5G3) >> SSB_SPROM4_TXPID5G3_SHIFT;
-
-        bus->sprom.txpid5gh[0] = (sprom[SPOFF(SSB_SPROM4_TXPID5GH01)] &
-             SSB_SPROM4_TXPID5GH0) >> SSB_SPROM4_TXPID5GH0_SHIFT;
-        bus->sprom.txpid5gh[1] = (sprom[SPOFF(SSB_SPROM4_TXPID5GH01)] &
-             SSB_SPROM4_TXPID5GH1) >> SSB_SPROM4_TXPID5GH1_SHIFT;
-        bus->sprom.txpid5gh[2] = (sprom[SPOFF(SSB_SPROM4_TXPID5GH23)] &
-             SSB_SPROM4_TXPID5GH2) >> SSB_SPROM4_TXPID5GH2_SHIFT;
-        bus->sprom.txpid5gh[3] = (sprom[SPOFF(SSB_SPROM4_TXPID5GH23)] &
-             SSB_SPROM4_TXPID5GH3) >> SSB_SPROM4_TXPID5GH3_SHIFT;
-
-        bus->sprom.boardflags_lo = sprom[SPOFF(SSB_SPROM8_BFLLO)];
-        bus->sprom.boardflags_hi = sprom[SPOFF(SSB_SPROM8_BFLHI)];
-        bus->sprom.boardflags2_lo = sprom[SPOFF(SSB_SPROM8_BFL2LO)];
-        bus->sprom.boardflags2_hi = sprom[SPOFF(SSB_SPROM8_BFL2HI)];
-
-        bus->sprom.country_code = sprom[SPOFF(SSB_SPROM8_CCODE)];
-
-        bus->sprom.fem.ghz2.tssipos = (sprom[SPOFF(SSB_SPROM8_FEM2G)] &
-                SSB_SROM8_FEM_TSSIPOS) >> SSB_SROM8_FEM_TSSIPOS_SHIFT;
-        bus->sprom.fem.ghz2.extpa_gain = (sprom[SPOFF(SSB_SPROM8_FEM2G)] &
-                SSB_SROM8_FEM_EXTPA_GAIN) >> SSB_SROM8_FEM_EXTPA_GAIN_SHIFT;
-        bus->sprom.fem.ghz2.pdet_range = (sprom[SPOFF(SSB_SPROM8_FEM2G)] &
-                SSB_SROM8_FEM_PDET_RANGE) >> SSB_SROM8_FEM_PDET_RANGE_SHIFT;
-        bus->sprom.fem.ghz2.tr_iso = (sprom[SPOFF(SSB_SPROM8_FEM2G)] &
-                SSB_SROM8_FEM_TR_ISO) >> SSB_SROM8_FEM_TR_ISO_SHIFT;
-        bus->sprom.fem.ghz2.antswlut = (sprom[SPOFF(SSB_SPROM8_FEM2G)] &
-                SSB_SROM8_FEM_ANTSWLUT) >> SSB_SROM8_FEM_ANTSWLUT_SHIFT;
-
-        bus->sprom.fem.ghz5.tssipos = (sprom[SPOFF(SSB_SPROM8_FEM5G)] &
-                SSB_SROM8_FEM_TSSIPOS) >> SSB_SROM8_FEM_TSSIPOS_SHIFT;
-        bus->sprom.fem.ghz5.extpa_gain = (sprom[SPOFF(SSB_SPROM8_FEM5G)] &
-                SSB_SROM8_FEM_EXTPA_GAIN) >> SSB_SROM8_FEM_EXTPA_GAIN_SHIFT;
-        bus->sprom.fem.ghz5.pdet_range = (sprom[SPOFF(SSB_SPROM8_FEM5G)] &
-                SSB_SROM8_FEM_PDET_RANGE) >> SSB_SROM8_FEM_PDET_RANGE_SHIFT;
-        bus->sprom.fem.ghz5.tr_iso = (sprom[SPOFF(SSB_SPROM8_FEM5G)] &
-                SSB_SROM8_FEM_TR_ISO) >> SSB_SROM8_FEM_TR_ISO_SHIFT;
-        bus->sprom.fem.ghz5.antswlut = (sprom[SPOFF(SSB_SPROM8_FEM5G)] &
-                SSB_SROM8_FEM_ANTSWLUT) >> SSB_SROM8_FEM_ANTSWLUT_SHIFT;
+        SPEX(board_rev, SSB_SPROM8_BOARDREV, ~0, 0);
+
+        SPEX(txpid2g[0], SSB_SPROM4_TXPID2G01, SSB_SPROM4_TXPID2G0,
+             SSB_SPROM4_TXPID2G0_SHIFT);
+        SPEX(txpid2g[1], SSB_SPROM4_TXPID2G01, SSB_SPROM4_TXPID2G1,
+             SSB_SPROM4_TXPID2G1_SHIFT);
+        SPEX(txpid2g[2], SSB_SPROM4_TXPID2G23, SSB_SPROM4_TXPID2G2,
+             SSB_SPROM4_TXPID2G2_SHIFT);
+        SPEX(txpid2g[3], SSB_SPROM4_TXPID2G23, SSB_SPROM4_TXPID2G3,
+             SSB_SPROM4_TXPID2G3_SHIFT);
+
+        SPEX(txpid5gl[0], SSB_SPROM4_TXPID5GL01, SSB_SPROM4_TXPID5GL0,
+             SSB_SPROM4_TXPID5GL0_SHIFT);
+        SPEX(txpid5gl[1], SSB_SPROM4_TXPID5GL01, SSB_SPROM4_TXPID5GL1,
+             SSB_SPROM4_TXPID5GL1_SHIFT);
+        SPEX(txpid5gl[2], SSB_SPROM4_TXPID5GL23, SSB_SPROM4_TXPID5GL2,
+             SSB_SPROM4_TXPID5GL2_SHIFT);
+        SPEX(txpid5gl[3], SSB_SPROM4_TXPID5GL23, SSB_SPROM4_TXPID5GL3,
+             SSB_SPROM4_TXPID5GL3_SHIFT);
+
+        SPEX(txpid5g[0], SSB_SPROM4_TXPID5G01, SSB_SPROM4_TXPID5G0,
+             SSB_SPROM4_TXPID5G0_SHIFT);
+        SPEX(txpid5g[1], SSB_SPROM4_TXPID5G01, SSB_SPROM4_TXPID5G1,
+             SSB_SPROM4_TXPID5G1_SHIFT);
+        SPEX(txpid5g[2], SSB_SPROM4_TXPID5G23, SSB_SPROM4_TXPID5G2,
+             SSB_SPROM4_TXPID5G2_SHIFT);
+        SPEX(txpid5g[3], SSB_SPROM4_TXPID5G23, SSB_SPROM4_TXPID5G3,
+             SSB_SPROM4_TXPID5G3_SHIFT);
+
+        SPEX(txpid5gh[0], SSB_SPROM4_TXPID5GH01, SSB_SPROM4_TXPID5GH0,
+             SSB_SPROM4_TXPID5GH0_SHIFT);
+        SPEX(txpid5gh[1], SSB_SPROM4_TXPID5GH01, SSB_SPROM4_TXPID5GH1,
+             SSB_SPROM4_TXPID5GH1_SHIFT);
+        SPEX(txpid5gh[2], SSB_SPROM4_TXPID5GH23, SSB_SPROM4_TXPID5GH2,
+             SSB_SPROM4_TXPID5GH2_SHIFT);
+        SPEX(txpid5gh[3], SSB_SPROM4_TXPID5GH23, SSB_SPROM4_TXPID5GH3,
+             SSB_SPROM4_TXPID5GH3_SHIFT);
+
+        SPEX(boardflags_lo, SSB_SPROM8_BFLLO, ~0, 0);
+        SPEX(boardflags_hi, SSB_SPROM8_BFLHI, ~0, 0);
+        SPEX(boardflags2_lo, SSB_SPROM8_BFL2LO, ~0, 0);
+        SPEX(boardflags2_hi, SSB_SPROM8_BFL2HI, ~0, 0);
+
+        SPEX(country_code, SSB_SPROM8_CCODE, ~0, 0);
+
+        /* Extract cores power info info */
+        for (i = 0; i < ARRAY_SIZE(pwr_info_offset); i++) {
+                o = pwr_info_offset[i];
+                SPEX(core_pwr_info[i].itssi_2g, o + SSB_SROM8_2G_MAXP_ITSSI,
+                        SSB_SPROM8_2G_ITSSI, SSB_SPROM8_2G_ITSSI_SHIFT);
+                SPEX(core_pwr_info[i].maxpwr_2g, o + SSB_SROM8_2G_MAXP_ITSSI,
+                        SSB_SPROM8_2G_MAXP, 0);
+
+                SPEX(core_pwr_info[i].pa_2g[0], o + SSB_SROM8_2G_PA_0, ~0, 0);
+                SPEX(core_pwr_info[i].pa_2g[1], o + SSB_SROM8_2G_PA_1, ~0, 0);
+                SPEX(core_pwr_info[i].pa_2g[2], o + SSB_SROM8_2G_PA_2, ~0, 0);
+
+                SPEX(core_pwr_info[i].itssi_5g, o + SSB_SROM8_5G_MAXP_ITSSI,
+                        SSB_SPROM8_5G_ITSSI, SSB_SPROM8_5G_ITSSI_SHIFT);
+                SPEX(core_pwr_info[i].maxpwr_5g, o + SSB_SROM8_5G_MAXP_ITSSI,
+                        SSB_SPROM8_5G_MAXP, 0);
+                SPEX(core_pwr_info[i].maxpwr_5gh, o + SSB_SPROM8_5GHL_MAXP,
+                        SSB_SPROM8_5GH_MAXP, 0);
+                SPEX(core_pwr_info[i].maxpwr_5gl, o + SSB_SPROM8_5GHL_MAXP,
+                        SSB_SPROM8_5GL_MAXP, SSB_SPROM8_5GL_MAXP_SHIFT);
+
+                SPEX(core_pwr_info[i].pa_5gl[0], o + SSB_SROM8_5GL_PA_0, ~0, 0);
+                SPEX(core_pwr_info[i].pa_5gl[1], o + SSB_SROM8_5GL_PA_1, ~0, 0);
+                SPEX(core_pwr_info[i].pa_5gl[2], o + SSB_SROM8_5GL_PA_2, ~0, 0);
+                SPEX(core_pwr_info[i].pa_5g[0], o + SSB_SROM8_5G_PA_0, ~0, 0);
+                SPEX(core_pwr_info[i].pa_5g[1], o + SSB_SROM8_5G_PA_1, ~0, 0);
+                SPEX(core_pwr_info[i].pa_5g[2], o + SSB_SROM8_5G_PA_2, ~0, 0);
+                SPEX(core_pwr_info[i].pa_5gh[0], o + SSB_SROM8_5GH_PA_0, ~0, 0);
+                SPEX(core_pwr_info[i].pa_5gh[1], o + SSB_SROM8_5GH_PA_1, ~0, 0);
+                SPEX(core_pwr_info[i].pa_5gh[2], o + SSB_SROM8_5GH_PA_2, ~0, 0);
+        }
+
+        SPEX(fem.ghz2.tssipos, SSB_SPROM8_FEM2G, SSB_SROM8_FEM_TSSIPOS,
+             SSB_SROM8_FEM_TSSIPOS_SHIFT);
+        SPEX(fem.ghz2.extpa_gain, SSB_SPROM8_FEM2G, SSB_SROM8_FEM_EXTPA_GAIN,
+             SSB_SROM8_FEM_EXTPA_GAIN_SHIFT);
+        SPEX(fem.ghz2.pdet_range, SSB_SPROM8_FEM2G, SSB_SROM8_FEM_PDET_RANGE,
+             SSB_SROM8_FEM_PDET_RANGE_SHIFT);
+        SPEX(fem.ghz2.tr_iso, SSB_SPROM8_FEM2G, SSB_SROM8_FEM_TR_ISO,
+             SSB_SROM8_FEM_TR_ISO_SHIFT);
+        SPEX(fem.ghz2.antswlut, SSB_SPROM8_FEM2G, SSB_SROM8_FEM_ANTSWLUT,
+             SSB_SROM8_FEM_ANTSWLUT_SHIFT);
+
+        SPEX(fem.ghz5.tssipos, SSB_SPROM8_FEM5G, SSB_SROM8_FEM_TSSIPOS,
+             SSB_SROM8_FEM_TSSIPOS_SHIFT);
+        SPEX(fem.ghz5.extpa_gain, SSB_SPROM8_FEM5G, SSB_SROM8_FEM_EXTPA_GAIN,
+             SSB_SROM8_FEM_EXTPA_GAIN_SHIFT);
+        SPEX(fem.ghz5.pdet_range, SSB_SPROM8_FEM5G, SSB_SROM8_FEM_PDET_RANGE,
+             SSB_SROM8_FEM_PDET_RANGE_SHIFT);
+        SPEX(fem.ghz5.tr_iso, SSB_SPROM8_FEM5G, SSB_SROM8_FEM_TR_ISO,
+             SSB_SROM8_FEM_TR_ISO_SHIFT);
+        SPEX(fem.ghz5.antswlut, SSB_SPROM8_FEM5G, SSB_SROM8_FEM_ANTSWLUT,
+             SSB_SROM8_FEM_ANTSWLUT_SHIFT);
 }
 
 int bcma_sprom_get(struct bcma_bus *bus)
@@ -230,6 +271,7 @@ int bcma_sprom_get(struct bcma_bus *bus)
          * TODO: understand this condition and use it */
         offset = (bus->chipinfo.id == 0x4331) ? BCMA_CC_SPROM :
                 BCMA_CC_SPROM_PCIE6;
+        pr_debug("SPROM offset 0x%x\n", offset);
         bcma_sprom_read(bus, offset, sprom);
 
         if (bus->chipinfo.id == 0x4331)
diff --git a/drivers/infiniband/core/addr.c b/drivers/infiniband/core/addr.c
index 1612cfd50f39..6ef660c1332f 100644
--- a/drivers/infiniband/core/addr.c
+++ b/drivers/infiniband/core/addr.c
@@ -178,22 +178,26 @@ static void queue_req(struct addr_req *req)
         mutex_unlock(&lock);
 }
 
-static int dst_fetch_ha(struct dst_entry *dst, struct rdma_dev_addr *addr)
+static int dst_fetch_ha(struct dst_entry *dst, struct rdma_dev_addr *dev_addr, void *daddr)
 {
         struct neighbour *n;
         int ret;
 
+        n = dst_neigh_lookup(dst, daddr);
+
         rcu_read_lock();
-        n = dst_get_neighbour_noref(dst);
         if (!n || !(n->nud_state & NUD_VALID)) {
                 if (n)
                         neigh_event_send(n, NULL);
                 ret = -ENODATA;
         } else {
-                ret = rdma_copy_addr(addr, dst->dev, n->ha);
+                ret = rdma_copy_addr(dev_addr, dst->dev, n->ha);
         }
         rcu_read_unlock();
 
+        if (n)
+                neigh_release(n);
+
         return ret;
 }
 
@@ -232,7 +236,7 @@ static int addr4_resolve(struct sockaddr_in *src_in,
                 goto put;
         }
 
-        ret = dst_fetch_ha(&rt->dst, addr);
+        ret = dst_fetch_ha(&rt->dst, addr, &fl4.daddr);
 put:
         ip_rt_put(rt);
 out:
@@ -280,7 +284,7 @@ static int addr6_resolve(struct sockaddr_in6 *src_in,
                 goto put;
         }
 
-        ret = dst_fetch_ha(dst, addr);
+        ret = dst_fetch_ha(dst, addr, &fl6.daddr);
 put:
         dst_release(dst);
         return ret;
diff --git a/drivers/infiniband/hw/cxgb4/cm.c b/drivers/infiniband/hw/cxgb4/cm.c
index 0668bb3472d0..0cf61554f176 100644
--- a/drivers/infiniband/hw/cxgb4/cm.c
+++ b/drivers/infiniband/hw/cxgb4/cm.c
@@ -1562,11 +1562,11 @@ static int import_ep(struct c4iw_ep *ep, __be32 peer_ip, struct dst_entry *dst,
         struct neighbour *n;
         int err, step;
 
-        rcu_read_lock();
-        n = dst_get_neighbour_noref(dst);
-        err = -ENODEV;
+        n = dst_neigh_lookup(dst, &peer_ip);
         if (!n)
-                goto out;
+                return -ENODEV;
+
+        rcu_read_lock();
         err = -ENOMEM;
         if (n->dev->flags & IFF_LOOPBACK) {
                 struct net_device *pdev;
@@ -1614,6 +1614,8 @@ static int import_ep(struct c4iw_ep *ep, __be32 peer_ip, struct dst_entry *dst,
 out:
         rcu_read_unlock();
 
+        neigh_release(n);
+
         return err;
 }
 
diff --git a/drivers/infiniband/hw/nes/nes_cm.c b/drivers/infiniband/hw/nes/nes_cm.c
index a4972abedef1..c5e4cb2d3223 100644
--- a/drivers/infiniband/hw/nes/nes_cm.c
+++ b/drivers/infiniband/hw/nes/nes_cm.c
@@ -1351,8 +1351,9 @@ static int nes_addr_resolve_neigh(struct nes_vnic *nesvnic, u32 dst_ip, int arpi
         else
                 netdev = nesvnic->netdev;
 
+        neigh = dst_neigh_lookup(&rt->dst, &dst_ip);
+
         rcu_read_lock();
-        neigh = dst_get_neighbour_noref(&rt->dst);
         if (neigh) {
                 if (neigh->nud_state & NUD_VALID) {
                         nes_debug(NES_DBG_CM, "Neighbor MAC address for 0x%08X"
@@ -1379,9 +1380,12 @@ static int nes_addr_resolve_neigh(struct nes_vnic *nesvnic, u32 dst_ip, int arpi
                         neigh_event_send(neigh, NULL);
                 }
         }
-
 out:
         rcu_read_unlock();
+
+        if (neigh)
+                neigh_release(neigh);
+
         ip_rt_put(rt);
         return rc;
 }
diff --git a/drivers/isdn/hardware/eicon/capi20.h b/drivers/isdn/hardware/eicon/capi20.h
index 7ebcccda74d8..27ecd61888de 100644
--- a/drivers/isdn/hardware/eicon/capi20.h
+++ b/drivers/isdn/hardware/eicon/capi20.h
@@ -117,7 +117,7 @@ typedef struct api_profile_s {
 /*------------------------------------------------------------------*/
         /* ALERT-REQUEST                                            */
 typedef struct {
-  byte structs[1];      /* Additional Info */
+  byte structs[0];      /* Additional Info */
 } _ALT_REQP;
         /* ALERT-CONFIRM                                            */
 typedef struct {
@@ -126,7 +126,7 @@ typedef struct {
         /* CONNECT-REQUEST                                          */
 typedef struct {
   word CIP_Value;
-  byte structs[1];      /* Called party number,
+  byte structs[0];      /* Called party number,
                            Called party subaddress,
                            Calling party number,
                            Calling party subaddress,
@@ -143,7 +143,7 @@ typedef struct {
         /* CONNECT-INDICATION                                       */
 typedef struct {
   word CIP_Value;
-  byte structs[1];      /* Called party number,
+  byte structs[0];      /* Called party number,
                            Called party subaddress,
                            Calling party number,
                            Calling party subaddress,
@@ -155,24 +155,24 @@ typedef struct {
         /* CONNECT-RESPONSE                                         */
 typedef struct {
   word Accept;
-  byte structs[1];      /* B_protocol,
+  byte structs[0];      /* B_protocol,
                            Connected party number,
                            Connected party subaddress,
                            LLC */
 } _CON_RESP;
         /* CONNECT-ACTIVE-INDICATION                                */
 typedef struct {
-  byte structs[1];      /* Connected party number,
+  byte structs[0];      /* Connected party number,
                            Connected party subaddress,
                            LLC */
 } _CON_A_INDP;
         /* CONNECT-ACTIVE-RESPONSE                                  */
 typedef struct {
-  byte structs[1];      /* empty */
+  byte structs[0];      /* empty */
 } _CON_A_RESP;
         /* DISCONNECT-REQUEST                                       */
 typedef struct {
-  byte structs[1];      /* Additional Info */
+  byte structs[0];      /* Additional Info */
 } _DIS_REQP;
         /* DISCONNECT-CONFIRM                                       */
 typedef struct {
@@ -184,13 +184,13 @@ typedef struct {
 } _DIS_INDP;
         /* DISCONNECT-RESPONSE                                      */
 typedef struct {
-  byte structs[1];      /* empty */
+  byte structs[0];      /* empty */
 } _DIS_RESP;
         /* LISTEN-REQUEST                                           */
 typedef struct {
   dword Info_Mask;
   dword CIP_Mask;
-  byte structs[1];      /* Calling party number,
+  byte structs[0];      /* Calling party number,
                            Calling party subaddress */
 } _LIS_REQP;
         /* LISTEN-CONFIRM                                           */
@@ -199,7 +199,7 @@ typedef struct {
 } _LIS_CONP;
         /* INFO-REQUEST                                             */
 typedef struct {
-  byte structs[1];      /* Called party number,
+  byte structs[0];      /* Called party number,
                            Additional Info */
 } _INF_REQP;
         /* INFO-CONFIRM                                             */
@@ -209,15 +209,15 @@ typedef struct {
         /* INFO-INDICATION                                          */
 typedef struct {
   word Number;
-  byte structs[1];      /* Info element */
+  byte structs[0];      /* Info element */
 } _INF_INDP;
         /* INFO-RESPONSE                                            */
 typedef struct {
-  byte structs[1];      /* empty */
+  byte structs[0];      /* empty */
 } _INF_RESP;
         /* SELECT-B-REQUEST                                         */
 typedef struct {
-  byte structs[1];      /* B-protocol */
+  byte structs[0];      /* B-protocol */
 } _SEL_B_REQP;
         /* SELECT-B-CONFIRM                                         */
 typedef struct {
@@ -226,7 +226,7 @@ typedef struct {
         /* FACILITY-REQUEST */
 typedef struct {
   word Selector;
-  byte structs[1];      /* Facility parameters */
+  byte structs[0];      /* Facility parameters */
 } _FAC_REQP;
         /* FACILITY-CONFIRM STRUCT FOR SUPPLEMENT. SERVICES */
 typedef struct {
@@ -240,21 +240,21 @@ typedef struct {
 typedef struct {
   word Info;
   word Selector;
-  byte structs[1];      /* Facility parameters */
+  byte structs[0];      /* Facility parameters */
 } _FAC_CONP;
         /* FACILITY-INDICATION */
 typedef struct {
   word Selector;
-  byte structs[1];      /* Facility parameters */
+  byte structs[0];      /* Facility parameters */
 } _FAC_INDP;
         /* FACILITY-RESPONSE */
 typedef struct {
   word Selector;
-  byte structs[1];      /* Facility parameters */
+  byte structs[0];      /* Facility parameters */
 } _FAC_RESP;
         /* CONNECT-B3-REQUEST                                       */
 typedef struct {
-  byte structs[1];      /* NCPI */
+  byte structs[0];      /* NCPI */
 } _CON_B3_REQP;
         /* CONNECT-B3-CONFIRM                                       */
 typedef struct {
@@ -262,24 +262,24 @@ typedef struct {
 } _CON_B3_CONP;
         /* CONNECT-B3-INDICATION                                    */
 typedef struct {
-  byte structs[1];      /* NCPI */
+  byte structs[0];      /* NCPI */
 } _CON_B3_INDP;
         /* CONNECT-B3-RESPONSE                                      */
 typedef struct {
   word Accept;
-  byte structs[1];      /* NCPI */
+  byte structs[0];      /* NCPI */
 } _CON_B3_RESP;
         /* CONNECT-B3-ACTIVE-INDICATION                             */
 typedef struct {
-  byte structs[1];      /* NCPI */
+  byte structs[0];      /* NCPI */
 } _CON_B3_A_INDP;
         /* CONNECT-B3-ACTIVE-RESPONSE                               */
 typedef struct {
-  byte structs[1];      /* empty */
+  byte structs[0];      /* empty */
 } _CON_B3_A_RESP;
         /* DISCONNECT-B3-REQUEST                                    */
 typedef struct {
-  byte structs[1];      /* NCPI */
+  byte structs[0];      /* NCPI */
 } _DIS_B3_REQP;
         /* DISCONNECT-B3-CONFIRM                                    */
 typedef struct {
@@ -288,11 +288,11 @@ typedef struct {
         /* DISCONNECT-B3-INDICATION                                 */
 typedef struct {
   word Info;
-  byte structs[1];      /* NCPI */
+  byte structs[0];      /* NCPI */
 } _DIS_B3_INDP;
         /* DISCONNECT-B3-RESPONSE                                   */
 typedef struct {
-  byte structs[1];      /* empty */
+  byte structs[0];      /* empty */
 } _DIS_B3_RESP;
         /* DATA-B3-REQUEST                                          */
 typedef struct {
@@ -335,7 +335,7 @@ typedef struct {
 } _DAT_B3_RESP;
         /* RESET-B3-REQUEST                                         */
 typedef struct {
-  byte structs[1];      /* NCPI */
+  byte structs[0];      /* NCPI */
 } _RES_B3_REQP;
         /* RESET-B3-CONFIRM                                         */
 typedef struct {
@@ -343,20 +343,20 @@ typedef struct {
 } _RES_B3_CONP;
         /* RESET-B3-INDICATION                                      */
 typedef struct {
-  byte structs[1];      /* NCPI */
+  byte structs[0];      /* NCPI */
 } _RES_B3_INDP;
         /* RESET-B3-RESPONSE                                        */
 typedef struct {
-  byte structs[1];      /* empty */
+  byte structs[0];      /* empty */
 } _RES_B3_RESP;
         /* CONNECT-B3-T90-ACTIVE-INDICATION                         */
 typedef struct {
-  byte structs[1];      /* NCPI */
+  byte structs[0];      /* NCPI */
 } _CON_B3_T90_A_INDP;
         /* CONNECT-B3-T90-ACTIVE-RESPONSE                           */
 typedef struct {
   word Reject;
-  byte structs[1];      /* NCPI */
+  byte structs[0];      /* NCPI */
 } _CON_B3_T90_A_RESP;
 /*------------------------------------------------------------------*/
 /* message structure                                                */
diff --git a/drivers/isdn/mISDN/l1oip_core.c b/drivers/isdn/mISDN/l1oip_core.c
index 22f8ec8b9247..04f115a9c43e 100644
--- a/drivers/isdn/mISDN/l1oip_core.c
+++ b/drivers/isdn/mISDN/l1oip_core.c
@@ -1112,7 +1112,7 @@ handle_bmsg(struct mISDNchannel *ch, struct sk_buff *skb)
         struct l1oip                    *hc = bch->hw;
         int                     ret = -EINVAL;
         struct mISDNhead        *hh = mISDN_HEAD_P(skb);
-        int                     l, ll, i;
+        int                     l, ll;
         unsigned char           *p;
 
         switch (hh->prim) {
@@ -1128,13 +1128,8 @@ handle_bmsg(struct mISDNchannel *ch, struct sk_buff *skb)
                         break;
                 }
                 /* check for AIS / ulaw-silence */
-                p = skb->data;
                 l = skb->len;
-                for (i = 0; i < l; i++) {
-                        if (*p++ != 0xff)
-                                break;
-                }
-                if (i == l) {
+                if (!memchr_inv(skb->data, 0xff, l)) {
                         if (debug & DEBUG_L1OIP_MSG)
                                 printk(KERN_DEBUG "%s: got AIS, not sending, "
                                         "but counting\n", __func__);
@@ -1144,13 +1139,8 @@ handle_bmsg(struct mISDNchannel *ch, struct sk_buff *skb)
                         return 0;
                 }
                 /* check for silence */
-                p = skb->data;
                 l = skb->len;
-                for (i = 0; i < l; i++) {
-                        if (*p++ != 0x2a)
-                                break;
-                }
-                if (i == l) {
+                if (!memchr_inv(skb->data, 0x2a, l)) {
                         if (debug & DEBUG_L1OIP_MSG)
                                 printk(KERN_DEBUG "%s: got silence, not sending"
                                         ", but counting\n", __func__);
diff --git a/drivers/net/bonding/bond_3ad.c b/drivers/net/bonding/bond_3ad.c
index 0ae0d7c54ccf..793b00138275 100644
--- a/drivers/net/bonding/bond_3ad.c
+++ b/drivers/net/bonding/bond_3ad.c
@@ -660,7 +660,7 @@ static void __attach_bond_to_agg(struct port *port)
 static void __detach_bond_from_agg(struct port *port)
 {
         port = NULL; /* just to satisfy the compiler */
-        // This function does nothing sience the parser/multiplexer of the receive
+        // This function does nothing since the parser/multiplexer of the receive
         // and the parser/multiplexer of the aggregator are already combined
 }
 
diff --git a/drivers/net/bonding/bond_alb.c b/drivers/net/bonding/bond_alb.c
index f820b26b9db3..9abfde479316 100644
--- a/drivers/net/bonding/bond_alb.c
+++ b/drivers/net/bonding/bond_alb.c
@@ -180,11 +180,9 @@ static int tlb_initialize(struct bonding *bond)
         int i;
 
         new_hashtbl = kzalloc(size, GFP_KERNEL);
-        if (!new_hashtbl) {
-                pr_err("%s: Error: Failed to allocate TLB hash table\n",
-                       bond->dev->name);
+        if (!new_hashtbl)
                 return -1;
-        }
+
         _lock_tx_hashtbl_bh(bond);
 
         bond_info->tx_hashtbl = new_hashtbl;
@@ -784,11 +782,9 @@ static int rlb_initialize(struct bonding *bond)
         int i;
 
         new_hashtbl = kmalloc(size, GFP_KERNEL);
-        if (!new_hashtbl) {
-                pr_err("%s: Error: Failed to allocate RLB hash table\n",
-                       bond->dev->name);
+        if (!new_hashtbl)
                 return -1;
-        }
+
         _lock_rx_hashtbl_bh(bond);
 
         bond_info->rx_hashtbl = new_hashtbl;
diff --git a/drivers/net/caif/caif_hsi.c b/drivers/net/caif/caif_hsi.c
index 0a4fc62a381d..c8afd62239e9 100644
--- a/drivers/net/caif/caif_hsi.c
+++ b/drivers/net/caif/caif_hsi.c
@@ -426,6 +426,35 @@ static int cfhsi_rx_desc(struct cfhsi_desc *desc, struct cfhsi *cfhsi)
         return xfer_sz;
 }
 
+static int cfhsi_rx_desc_len(struct cfhsi_desc *desc)
+{
+        int xfer_sz = 0;
+        int nfrms = 0;
+        u16 *plen;
+
+        if ((desc->header & ~CFHSI_PIGGY_DESC) ||
+                        (desc->offset > CFHSI_MAX_EMB_FRM_SZ)) {
+
+                pr_err("Invalid descriptor. %x %x\n", desc->header,
+                                desc->offset);
+                return -EPROTO;
+        }
+
+        /* Calculate transfer length. */
+        plen = desc->cffrm_len;
+        while (nfrms < CFHSI_MAX_PKTS && *plen) {
+                xfer_sz += *plen;
+                plen++;
+                nfrms++;
+        }
+
+        if (xfer_sz % 4) {
+                pr_err("Invalid payload len: %d, ignored.\n", xfer_sz);
+                return -EPROTO;
+        }
+        return xfer_sz;
+}
+
 static int cfhsi_rx_pld(struct cfhsi_desc *desc, struct cfhsi *cfhsi)
 {
         int rx_sz = 0;
@@ -517,8 +546,10 @@ static int cfhsi_rx_pld(struct cfhsi_desc *desc, struct cfhsi *cfhsi)
 static void cfhsi_rx_done(struct cfhsi *cfhsi)
 {
         int res;
-        int desc_pld_len = 0;
+        int desc_pld_len = 0, rx_len, rx_state;
         struct cfhsi_desc *desc = NULL;
+        u8 *rx_ptr, *rx_buf;
+        struct cfhsi_desc *piggy_desc = NULL;
 
         desc = (struct cfhsi_desc *)cfhsi->rx_buf;
 
@@ -534,65 +565,71 @@ static void cfhsi_rx_done(struct cfhsi *cfhsi)
         spin_unlock_bh(&cfhsi->lock);
 
         if (cfhsi->rx_state.state == CFHSI_RX_STATE_DESC) {
-                desc_pld_len = cfhsi_rx_desc(desc, cfhsi);
-                if (desc_pld_len == -ENOMEM)
-                        goto restart;
-                if (desc_pld_len == -EPROTO)
+                desc_pld_len = cfhsi_rx_desc_len(desc);
+
+                if (desc_pld_len < 0)
                         goto out_of_sync;
+
+                rx_buf = cfhsi->rx_buf;
+                rx_len = desc_pld_len;
+                if (desc_pld_len > 0 && (desc->header & CFHSI_PIGGY_DESC))
+                        rx_len += CFHSI_DESC_SZ;
+                if (desc_pld_len == 0)
+                        rx_buf = cfhsi->rx_flip_buf;
         } else {
-                int pld_len;
+                rx_buf = cfhsi->rx_flip_buf;
 
-                if (!cfhsi->rx_state.piggy_desc) {
-                        pld_len = cfhsi_rx_pld(desc, cfhsi);
-                        if (pld_len == -ENOMEM)
-                                goto restart;
-                        if (pld_len == -EPROTO)
-                                goto out_of_sync;
-                        cfhsi->rx_state.pld_len = pld_len;
-                } else {
-                        pld_len = cfhsi->rx_state.pld_len;
-                }
+                rx_len = CFHSI_DESC_SZ;
+                if (cfhsi->rx_state.pld_len > 0 &&
+                                (desc->header & CFHSI_PIGGY_DESC)) {
 
-                if ((pld_len > 0) && (desc->header & CFHSI_PIGGY_DESC)) {
-                        struct cfhsi_desc *piggy_desc;
                         piggy_desc = (struct cfhsi_desc *)
                                 (desc->emb_frm + CFHSI_MAX_EMB_FRM_SZ +
-                                                pld_len);
+                                                cfhsi->rx_state.pld_len);
+
                         cfhsi->rx_state.piggy_desc = true;
 
-                        /* Extract piggy-backed descriptor. */
-                        desc_pld_len = cfhsi_rx_desc(piggy_desc, cfhsi);
-                        if (desc_pld_len == -ENOMEM)
-                                goto restart;
+                        /* Extract payload len from piggy-backed descriptor. */
+                        desc_pld_len = cfhsi_rx_desc_len(piggy_desc);
+                        if (desc_pld_len < 0)
+                                goto out_of_sync;
+
+                        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;
 
                         /*
                          * Copy needed information from the piggy-backed
                          * descriptor to the descriptor in the start.
                          */
-                        memcpy((u8 *)desc, (u8 *)piggy_desc,
+                        memcpy(rx_buf, (u8 *)piggy_desc,
                                         CFHSI_DESC_SHORT_SZ);
-
+                        /* Mark no embedded frame here */
+                        piggy_desc->offset = 0;
                         if (desc_pld_len == -EPROTO)
                                 goto out_of_sync;
                 }
         }
 
-        memset(&cfhsi->rx_state, 0, sizeof(cfhsi->rx_state));
         if (desc_pld_len) {
-                cfhsi->rx_state.state = CFHSI_RX_STATE_PAYLOAD;
-                cfhsi->rx_ptr = cfhsi->rx_buf + CFHSI_DESC_SZ;
-                cfhsi->rx_len = desc_pld_len;
+                rx_state = CFHSI_RX_STATE_PAYLOAD;
+                rx_ptr = rx_buf + CFHSI_DESC_SZ;
         } else {
-                cfhsi->rx_state.state = CFHSI_RX_STATE_DESC;
-                cfhsi->rx_ptr = cfhsi->rx_buf;
-                cfhsi->rx_len = CFHSI_DESC_SZ;
+                rx_state = CFHSI_RX_STATE_DESC;
+                rx_ptr = rx_buf;
+                rx_len = CFHSI_DESC_SZ;
         }
 
+        /* Initiate next read */
         if (test_bit(CFHSI_AWAKE, &cfhsi->bits)) {
                 /* Set up new transfer. */
                 dev_dbg(&cfhsi->ndev->dev, "%s: Start RX.\n",
-                        __func__);
-                res = cfhsi->dev->cfhsi_rx(cfhsi->rx_ptr, cfhsi->rx_len,
+                                __func__);
+
+                res = cfhsi->dev->cfhsi_rx(rx_ptr, rx_len,
                                 cfhsi->dev);
                 if (WARN_ON(res < 0)) {
                         dev_err(&cfhsi->ndev->dev, "%s: RX error %d.\n",
@@ -601,16 +638,32 @@ static void cfhsi_rx_done(struct cfhsi *cfhsi)
                         cfhsi->ndev->stats.rx_dropped++;
                 }
         }
-        return;
 
-restart:
-        if (++cfhsi->rx_state.retries > CFHSI_MAX_RX_RETRIES) {
-                dev_err(&cfhsi->ndev->dev, "%s: No memory available "
-                        "in %d iterations.\n",
-                        __func__, CFHSI_MAX_RX_RETRIES);
-                BUG();
+        if (cfhsi->rx_state.state == CFHSI_RX_STATE_DESC) {
+                /* Extract payload from descriptor */
+                if (cfhsi_rx_desc(desc, cfhsi) < 0)
+                        goto out_of_sync;
+        } else {
+                /* Extract payload */
+                if (cfhsi_rx_pld(desc, cfhsi) < 0)
+                        goto out_of_sync;
+                if (piggy_desc) {
+                        /* Extract any payload in piggyback descriptor. */
+                        if (cfhsi_rx_desc(piggy_desc, cfhsi) < 0)
+                                goto out_of_sync;
+                }
         }
-        mod_timer(&cfhsi->rx_slowpath_timer, jiffies + 1);
+
+        /* Update state info */
+        memset(&cfhsi->rx_state, 0, sizeof(cfhsi->rx_state));
+        cfhsi->rx_state.state = rx_state;
+        cfhsi->rx_ptr = rx_ptr;
+        cfhsi->rx_len = rx_len;
+        cfhsi->rx_state.pld_len = desc_pld_len;
+        cfhsi->rx_state.piggy_desc = desc->header & CFHSI_PIGGY_DESC;
+
+        if (rx_buf != cfhsi->rx_buf)
+                swap(cfhsi->rx_buf, cfhsi->rx_flip_buf);
         return;
 
 out_of_sync:
@@ -1040,6 +1093,12 @@ int cfhsi_probe(struct platform_device *pdev)
                 goto err_alloc_rx;
         }
 
+        cfhsi->rx_flip_buf = kzalloc(CFHSI_BUF_SZ_RX, GFP_KERNEL);
+        if (!cfhsi->rx_flip_buf) {
+                res = -ENODEV;
+                goto err_alloc_rx_flip;
+        }
+
         /* Pre-calculate inactivity timeout. */
         if (inactivity_timeout != -1) {
                 cfhsi->inactivity_timeout =
@@ -1138,6 +1197,8 @@ int cfhsi_probe(struct platform_device *pdev)
  err_activate:
         destroy_workqueue(cfhsi->wq);
  err_create_wq:
+        kfree(cfhsi->rx_flip_buf);
+ err_alloc_rx_flip:
         kfree(cfhsi->rx_buf);
  err_alloc_rx:
         kfree(cfhsi->tx_buf);
diff --git a/drivers/net/can/Kconfig b/drivers/net/can/Kconfig
index ab45758c49a4..bb709fd66993 100644
--- a/drivers/net/can/Kconfig
+++ b/drivers/net/can/Kconfig
@@ -103,11 +103,11 @@ config CAN_FLEXCAN
           Say Y here if you want to support for Freescale FlexCAN.
 
 config PCH_CAN
-        tristate "PCH CAN"
+        tristate "Intel EG20T PCH CAN controller"
         depends on CAN_DEV && PCI
         ---help---
-          This driver is for PCH CAN of Topcliff which is an IOH for x86
-          embedded processor.
+          This driver is for PCH CAN of Topcliff (Intel EG20T PCH) which
+          is an IOH for x86 embedded processor (Intel Atom E6xx series).
           This driver can access CAN bus.
 
 source "drivers/net/can/mscan/Kconfig"
diff --git a/drivers/net/can/bfin_can.c b/drivers/net/can/bfin_can.c
index 349e0fabb63a..3f88473423e9 100644
--- a/drivers/net/can/bfin_can.c
+++ b/drivers/net/can/bfin_can.c
@@ -82,8 +82,7 @@ static int bfin_can_set_bittiming(struct net_device *dev)
         bfin_write(&reg->clock, clk);
         bfin_write(&reg->timing, timing);
 
-        dev_info(dev->dev.parent, "setting CLOCK=0x%04x TIMING=0x%04x\n",
-                        clk, timing);
+        netdev_info(dev, "setting CLOCK=0x%04x TIMING=0x%04x\n", clk, timing);
 
         return 0;
 }
@@ -108,8 +107,7 @@ static void bfin_can_set_reset_mode(struct net_device *dev)
         while (!(bfin_read(&reg->control) & CCA)) {
                 udelay(10);
                 if (--timeout == 0) {
-                        dev_err(dev->dev.parent,
-                                        "fail to enter configuration mode\n");
+                        netdev_err(dev, "fail to enter configuration mode\n");
                         BUG();
                 }
         }
@@ -165,8 +163,7 @@ static void bfin_can_set_normal_mode(struct net_device *dev)
         while (bfin_read(&reg->status) & CCA) {
                 udelay(10);
                 if (--timeout == 0) {
-                        dev_err(dev->dev.parent,
-                                        "fail to leave configuration mode\n");
+                        netdev_err(dev, "fail to leave configuration mode\n");
                         BUG();
                 }
         }
@@ -224,6 +221,20 @@ static int bfin_can_set_mode(struct net_device *dev, enum can_mode mode)
         return 0;
 }
 
+static int bfin_can_get_berr_counter(const struct net_device *dev,
+                                     struct can_berr_counter *bec)
+{
+        struct bfin_can_priv *priv = netdev_priv(dev);
+        struct bfin_can_regs __iomem *reg = priv->membase;
+
+        u16 cec = bfin_read(&reg->cec);
+
+        bec->txerr = cec >> 8;
+        bec->rxerr = cec;
+
+        return 0;
+}
+
 static int bfin_can_start_xmit(struct sk_buff *skb, struct net_device *dev)
 {
         struct bfin_can_priv *priv = netdev_priv(dev);
@@ -331,7 +342,7 @@ static int bfin_can_err(struct net_device *dev, u16 isrc, u16 status)
 
         if (isrc & RMLIS) {
                 /* data overrun interrupt */
-                dev_dbg(dev->dev.parent, "data overrun interrupt\n");
+                netdev_dbg(dev, "data overrun interrupt\n");
                 cf->can_id |= CAN_ERR_CRTL;
                 cf->data[1] = CAN_ERR_CRTL_RX_OVERFLOW;
                 stats->rx_over_errors++;
@@ -339,7 +350,7 @@ static int bfin_can_err(struct net_device *dev, u16 isrc, u16 status)
         }
 
         if (isrc & BOIS) {
-                dev_dbg(dev->dev.parent, "bus-off mode interrupt\n");
+                netdev_dbg(dev, "bus-off mode interrupt\n");
                 state = CAN_STATE_BUS_OFF;
                 cf->can_id |= CAN_ERR_BUSOFF;
                 can_bus_off(dev);
@@ -347,13 +358,12 @@ static int bfin_can_err(struct net_device *dev, u16 isrc, u16 status)
 
         if (isrc & EPIS) {
                 /* error passive interrupt */
-                dev_dbg(dev->dev.parent, "error passive interrupt\n");
+                netdev_dbg(dev, "error passive interrupt\n");
                 state = CAN_STATE_ERROR_PASSIVE;
         }
 
         if ((isrc & EWTIS) || (isrc & EWRIS)) {
-                dev_dbg(dev->dev.parent,
-                                "Error Warning Transmit/Receive Interrupt\n");
+                netdev_dbg(dev, "Error Warning Transmit/Receive Interrupt\n");
                 state = CAN_STATE_ERROR_WARNING;
         }
 
@@ -509,6 +519,7 @@ struct net_device *alloc_bfin_candev(void)
         priv->can.bittiming_const = &bfin_can_bittiming_const;
         priv->can.do_set_bittiming = bfin_can_set_bittiming;
         priv->can.do_set_mode = bfin_can_set_mode;
+        priv->can.do_get_berr_counter = bfin_can_get_berr_counter;
         priv->can.ctrlmode_supported = CAN_CTRLMODE_3_SAMPLES;
 
         return dev;
@@ -636,8 +647,7 @@ static int bfin_can_suspend(struct platform_device *pdev, pm_message_t mesg)
                 while (!(bfin_read(&reg->intr) & SMACK)) {
                         udelay(10);
                         if (--timeout == 0) {
-                                dev_err(dev->dev.parent,
-                                                "fail to enter sleep mode\n");
+                                netdev_err(dev, "fail to enter sleep mode\n");
                                 BUG();
                         }
                 }
diff --git a/drivers/net/can/dev.c b/drivers/net/can/dev.c
index 120f1ab5a2ce..c5fe3a3db8c9 100644
--- a/drivers/net/can/dev.c
+++ b/drivers/net/can/dev.c
@@ -130,13 +130,13 @@ static int can_calc_bittiming(struct net_device *dev, struct can_bittiming *bt)
                 /* Error in one-tenth of a percent */
                 error = (best_error * 1000) / bt->bitrate;
                 if (error > CAN_CALC_MAX_ERROR) {
-                        dev_err(dev->dev.parent,
-                                "bitrate error %ld.%ld%% too high\n",
-                                error / 10, error % 10);
+                        netdev_err(dev,
+                                   "bitrate error %ld.%ld%% too high\n",
+                                   error / 10, error % 10);
                         return -EDOM;
                 } else {
-                        dev_warn(dev->dev.parent, "bitrate error %ld.%ld%%\n",
-                                 error / 10, error % 10);
+                        netdev_warn(dev, "bitrate error %ld.%ld%%\n",
+                                    error / 10, error % 10);
                 }
         }
 
@@ -172,7 +172,7 @@ static int can_calc_bittiming(struct net_device *dev, struct can_bittiming *bt)
 #else /* !CONFIG_CAN_CALC_BITTIMING */
 static int can_calc_bittiming(struct net_device *dev, struct can_bittiming *bt)
 {
-        dev_err(dev->dev.parent, "bit-timing calculation not available\n");
+        netdev_err(dev, "bit-timing calculation not available\n");
         return -EINVAL;
 }
 #endif /* CONFIG_CAN_CALC_BITTIMING */
@@ -313,8 +313,7 @@ void can_put_echo_skb(struct sk_buff *skb, struct net_device *dev,
                 priv->echo_skb[idx] = skb;
         } else {
                 /* locking problem with netif_stop_queue() ?? */
-                dev_err(dev->dev.parent, "%s: BUG! echo_skb is occupied!\n",
-                        __func__);
+                netdev_err(dev, "%s: BUG! echo_skb is occupied!\n", __func__);
                 kfree_skb(skb);
         }
 }
@@ -327,16 +326,24 @@ EXPORT_SYMBOL_GPL(can_put_echo_skb);
  * is handled in the device driver. The driver must protect
  * access to priv->echo_skb, if necessary.
  */
-void can_get_echo_skb(struct net_device *dev, unsigned int idx)
+unsigned int can_get_echo_skb(struct net_device *dev, unsigned int idx)
 {
         struct can_priv *priv = netdev_priv(dev);
 
         BUG_ON(idx >= priv->echo_skb_max);
 
         if (priv->echo_skb[idx]) {
+                struct sk_buff *skb = priv->echo_skb[idx];
+                struct can_frame *cf = (struct can_frame *)skb->data;
+                u8 dlc = cf->can_dlc;
+
                 netif_rx(priv->echo_skb[idx]);
                 priv->echo_skb[idx] = NULL;
+
+                return dlc;
         }
+
+        return 0;
 }
 EXPORT_SYMBOL_GPL(can_get_echo_skb);
 
@@ -392,7 +399,7 @@ void can_restart(unsigned long data)
         stats->rx_bytes += cf->can_dlc;
 
 restart:
-        dev_dbg(dev->dev.parent, "restarted\n");
+        netdev_dbg(dev, "restarted\n");
         priv->can_stats.restarts++;
 
         /* Now restart the device */
@@ -400,7 +407,7 @@ restart:
 
         netif_carrier_on(dev);
         if (err)
-                dev_err(dev->dev.parent, "Error %d during restart", err);
+                netdev_err(dev, "Error %d during restart", err);
 }
 
 int can_restart_now(struct net_device *dev)
@@ -433,7 +440,7 @@ void can_bus_off(struct net_device *dev)
 {
         struct can_priv *priv = netdev_priv(dev);
 
-        dev_dbg(dev->dev.parent, "bus-off\n");
+        netdev_dbg(dev, "bus-off\n");
 
         netif_carrier_off(dev);
         priv->can_stats.bus_off++;
@@ -545,7 +552,7 @@ int open_candev(struct net_device *dev)
         struct can_priv *priv = netdev_priv(dev);
 
         if (!priv->bittiming.tq && !priv->bittiming.bitrate) {
-                dev_err(dev->dev.parent, "bit-timing not yet defined\n");
+                netdev_err(dev, "bit-timing not yet defined\n");
                 return -EINVAL;
         }
 
diff --git a/drivers/net/can/flexcan.c b/drivers/net/can/flexcan.c
index 96d235799ec1..1efb08386c61 100644
--- a/drivers/net/can/flexcan.c
+++ b/drivers/net/can/flexcan.c
@@ -272,7 +272,6 @@ static int flexcan_get_berr_counter(const struct net_device *dev,
 static int flexcan_start_xmit(struct sk_buff *skb, struct net_device *dev)
 {
         const struct flexcan_priv *priv = netdev_priv(dev);
-        struct net_device_stats *stats = &dev->stats;
         struct flexcan_regs __iomem *regs = priv->base;
         struct can_frame *cf = (struct can_frame *)skb->data;
         u32 can_id;
@@ -302,14 +301,11 @@ static int flexcan_start_xmit(struct sk_buff *skb, struct net_device *dev)
                 flexcan_write(data, &regs->cantxfg[FLEXCAN_TX_BUF_ID].data[1]);
         }
 
+        can_put_echo_skb(skb, dev, 0);
+
         flexcan_write(can_id, &regs->cantxfg[FLEXCAN_TX_BUF_ID].can_id);
         flexcan_write(ctrl, &regs->cantxfg[FLEXCAN_TX_BUF_ID].can_ctrl);
 
-        kfree_skb(skb);
-
-        /* tx_packets is incremented in flexcan_irq */
-        stats->tx_bytes += cf->can_dlc;
-
         return NETDEV_TX_OK;
 }
 
@@ -322,34 +318,34 @@ static void do_bus_err(struct net_device *dev,
         cf->can_id |= CAN_ERR_PROT | CAN_ERR_BUSERROR;
 
         if (reg_esr & FLEXCAN_ESR_BIT1_ERR) {
-                dev_dbg(dev->dev.parent, "BIT1_ERR irq\n");
+                netdev_dbg(dev, "BIT1_ERR irq\n");
                 cf->data[2] |= CAN_ERR_PROT_BIT1;
                 tx_errors = 1;
         }
         if (reg_esr & FLEXCAN_ESR_BIT0_ERR) {
-                dev_dbg(dev->dev.parent, "BIT0_ERR irq\n");
+                netdev_dbg(dev, "BIT0_ERR irq\n");
                 cf->data[2] |= CAN_ERR_PROT_BIT0;
                 tx_errors = 1;
         }
         if (reg_esr & FLEXCAN_ESR_ACK_ERR) {
-                dev_dbg(dev->dev.parent, "ACK_ERR irq\n");
+                netdev_dbg(dev, "ACK_ERR irq\n");
                 cf->can_id |= CAN_ERR_ACK;
                 cf->data[3] |= CAN_ERR_PROT_LOC_ACK;
                 tx_errors = 1;
         }
         if (reg_esr & FLEXCAN_ESR_CRC_ERR) {
-                dev_dbg(dev->dev.parent, "CRC_ERR irq\n");
+                netdev_dbg(dev, "CRC_ERR irq\n");
                 cf->data[2] |= CAN_ERR_PROT_BIT;
                 cf->data[3] |= CAN_ERR_PROT_LOC_CRC_SEQ;
                 rx_errors = 1;
         }
         if (reg_esr & FLEXCAN_ESR_FRM_ERR) {
-                dev_dbg(dev->dev.parent, "FRM_ERR irq\n");
+                netdev_dbg(dev, "FRM_ERR irq\n");
                 cf->data[2] |= CAN_ERR_PROT_FORM;
                 rx_errors = 1;
         }
         if (reg_esr & FLEXCAN_ESR_STF_ERR) {
-                dev_dbg(dev->dev.parent, "STF_ERR irq\n");
+                netdev_dbg(dev, "STF_ERR irq\n");
                 cf->data[2] |= CAN_ERR_PROT_STUFF;
                 rx_errors = 1;
         }
@@ -396,7 +392,7 @@ static void do_state(struct net_device *dev,
                  */
                 if (new_state >= CAN_STATE_ERROR_WARNING &&
                     new_state <= CAN_STATE_BUS_OFF) {
-                        dev_dbg(dev->dev.parent, "Error Warning IRQ\n");
+                        netdev_dbg(dev, "Error Warning IRQ\n");
                         priv->can.can_stats.error_warning++;
 
                         cf->can_id |= CAN_ERR_CRTL;
@@ -412,7 +408,7 @@ static void do_state(struct net_device *dev,
                  */
                 if (new_state >= CAN_STATE_ERROR_PASSIVE &&
                     new_state <= CAN_STATE_BUS_OFF) {
-                        dev_dbg(dev->dev.parent, "Error Passive IRQ\n");
+                        netdev_dbg(dev, "Error Passive IRQ\n");
                         priv->can.can_stats.error_passive++;
 
                         cf->can_id |= CAN_ERR_CRTL;
@@ -422,8 +418,8 @@ static void do_state(struct net_device *dev,
                 }
                 break;
         case CAN_STATE_BUS_OFF:
-                dev_err(dev->dev.parent,
-                        "BUG! hardware recovered automatically from BUS_OFF\n");
+                netdev_err(dev, "BUG! "
+                           "hardware recovered automatically from BUS_OFF\n");
                 break;
         default:
                 break;
@@ -432,7 +428,7 @@ static void do_state(struct net_device *dev,
         /* process state changes depending on the new state */
         switch (new_state) {
         case CAN_STATE_ERROR_ACTIVE:
-                dev_dbg(dev->dev.parent, "Error Active\n");
+                netdev_dbg(dev, "Error Active\n");
                 cf->can_id |= CAN_ERR_PROT;
                 cf->data[2] = CAN_ERR_PROT_ACTIVE;
                 break;
@@ -614,7 +610,7 @@ static irqreturn_t flexcan_irq(int irq, void *dev_id)
 
         /* transmission complete interrupt */
         if (reg_iflag1 & (1 << FLEXCAN_TX_BUF_ID)) {
-                /* tx_bytes is incremented in flexcan_start_xmit */
+                stats->tx_bytes += can_get_echo_skb(dev, 0);
                 stats->tx_packets++;
                 flexcan_write((1 << FLEXCAN_TX_BUF_ID), &regs->iflag1);
                 netif_wake_queue(dev);
@@ -653,12 +649,12 @@ static void flexcan_set_bittiming(struct net_device *dev)
         if (priv->can.ctrlmode & CAN_CTRLMODE_3_SAMPLES)
                 reg |= FLEXCAN_CTRL_SMP;
 
-        dev_info(dev->dev.parent, "writing ctrl=0x%08x\n", reg);
+        netdev_info(dev, "writing ctrl=0x%08x\n", reg);
         flexcan_write(reg, &regs->ctrl);
 
         /* print chip status */
-        dev_dbg(dev->dev.parent, "%s: mcr=0x%08x ctrl=0x%08x\n", __func__,
-                flexcan_read(&regs->mcr), flexcan_read(&regs->ctrl));
+        netdev_dbg(dev, "%s: mcr=0x%08x ctrl=0x%08x\n", __func__,
+                   flexcan_read(&regs->mcr), flexcan_read(&regs->ctrl));
 }
 
 /*
@@ -684,9 +680,8 @@ static int flexcan_chip_start(struct net_device *dev)
 
         reg_mcr = flexcan_read(&regs->mcr);
         if (reg_mcr & FLEXCAN_MCR_SOFTRST) {
-                dev_err(dev->dev.parent,
-                        "Failed to softreset can module (mcr=0x%08x)\n",
-                        reg_mcr);
+                netdev_err(dev, "Failed to softreset can module (mcr=0x%08x)\n",
+                           reg_mcr);
                 err = -ENODEV;
                 goto out;
         }
@@ -702,13 +697,14 @@ static int flexcan_chip_start(struct net_device *dev)
          * only supervisor access
          * enable warning int
          * choose format C
+         * disable local echo
          *
          */
         reg_mcr = flexcan_read(&regs->mcr);
         reg_mcr |= FLEXCAN_MCR_FRZ | FLEXCAN_MCR_FEN | FLEXCAN_MCR_HALT |
                 FLEXCAN_MCR_SUPV | FLEXCAN_MCR_WRN_EN |
-                FLEXCAN_MCR_IDAM_C;
-        dev_dbg(dev->dev.parent, "%s: writing mcr=0x%08x", __func__, reg_mcr);
+                FLEXCAN_MCR_IDAM_C | FLEXCAN_MCR_SRX_DIS;
+        netdev_dbg(dev, "%s: writing mcr=0x%08x", __func__, reg_mcr);
         flexcan_write(reg_mcr, &regs->mcr);
 
         /*
@@ -734,7 +730,7 @@ static int flexcan_chip_start(struct net_device *dev)
 
         /* save for later use */
         priv->reg_ctrl_default = reg_ctrl;
-        dev_dbg(dev->dev.parent, "%s: writing ctrl=0x%08x", __func__, reg_ctrl);
+        netdev_dbg(dev, "%s: writing ctrl=0x%08x", __func__, reg_ctrl);
         flexcan_write(reg_ctrl, &regs->ctrl);
 
         for (i = 0; i < ARRAY_SIZE(regs->cantxfg); i++) {
@@ -766,8 +762,8 @@ static int flexcan_chip_start(struct net_device *dev)
         flexcan_write(FLEXCAN_IFLAG_DEFAULT, &regs->imask1);
 
         /* print chip status */
-        dev_dbg(dev->dev.parent, "%s: reading mcr=0x%08x ctrl=0x%08x\n",
-                __func__, flexcan_read(&regs->mcr), flexcan_read(&regs->ctrl));
+        netdev_dbg(dev, "%s: reading mcr=0x%08x ctrl=0x%08x\n", __func__,
+                   flexcan_read(&regs->mcr), flexcan_read(&regs->ctrl));
 
         return 0;
 
@@ -905,8 +901,7 @@ static int __devinit register_flexcandev(struct net_device *dev)
          */
         reg = flexcan_read(&regs->mcr);
         if (!(reg & FLEXCAN_MCR_FEN)) {
-                dev_err(dev->dev.parent,
-                        "Could not enable RX FIFO, unsupported core\n");
+                netdev_err(dev, "Could not enable RX FIFO, unsupported core\n");
                 err = -ENODEV;
                 goto out;
         }
@@ -975,7 +970,7 @@ static int __devinit flexcan_probe(struct platform_device *pdev)
                 goto failed_map;
         }
 
-        dev = alloc_candev(sizeof(struct flexcan_priv), 0);
+        dev = alloc_candev(sizeof(struct flexcan_priv), 1);
         if (!dev) {
                 err = -ENOMEM;
                 goto failed_alloc;
@@ -983,7 +978,7 @@ static int __devinit flexcan_probe(struct platform_device *pdev)
 
         dev->netdev_ops = &flexcan_netdev_ops;
         dev->irq = irq;
-        dev->flags |= IFF_ECHO; /* we support local echo in hardware */
+        dev->flags |= IFF_ECHO;
 
         priv = netdev_priv(dev);
         priv->can.clock.freq = clock_freq;
diff --git a/drivers/net/can/mcp251x.c b/drivers/net/can/mcp251x.c
index 330140ee266d..346785c56a25 100644
--- a/drivers/net/can/mcp251x.c
+++ b/drivers/net/can/mcp251x.c
@@ -712,8 +712,7 @@ static void mcp251x_error_skb(struct net_device *net, int can_id, int data1)
                 frame->data[1] = data1;
                 netif_rx_ni(skb);
         } else {
-                dev_err(&net->dev,
-                        "cannot allocate error skb\n");
+                netdev_err(net, "cannot allocate error skb\n");
         }
 }
 
diff --git a/drivers/net/can/mscan/mscan.c b/drivers/net/can/mscan/mscan.c
index 1c82dd8b896e..41a2a2dda7ea 100644
--- a/drivers/net/can/mscan/mscan.c
+++ b/drivers/net/can/mscan/mscan.c
@@ -95,9 +95,9 @@ static int mscan_set_mode(struct net_device *dev, u8 mode)
                          * any, at once.
                          */
                         if (i >= MSCAN_SET_MODE_RETRIES)
-                                dev_dbg(dev->dev.parent,
-                                        "device failed to enter sleep mode. "
-                                        "We proceed anyhow.\n");
+                                netdev_dbg(dev,
+                                           "device failed to enter sleep mode. "
+                                           "We proceed anyhow.\n");
                         else
                                 priv->can.state = CAN_STATE_SLEEPING;
                 }
@@ -213,7 +213,7 @@ static netdev_tx_t mscan_start_xmit(struct sk_buff *skb, struct net_device *dev)
         switch (hweight8(i)) {
         case 0:
                 netif_stop_queue(dev);
-                dev_err(dev->dev.parent, "Tx Ring full when queue awake!\n");
+                netdev_err(dev, "Tx Ring full when queue awake!\n");
                 return NETDEV_TX_BUSY;
         case 1:
                 /*
@@ -352,7 +352,7 @@ static void mscan_get_err_frame(struct net_device *dev, struct can_frame *frame,
         struct net_device_stats *stats = &dev->stats;
         enum can_state old_state;
 
-        dev_dbg(dev->dev.parent, "error interrupt (canrflg=%#x)\n", canrflg);
+        netdev_dbg(dev, "error interrupt (canrflg=%#x)\n", canrflg);
         frame->can_id = CAN_ERR_FLAG;
 
         if (canrflg & MSCAN_OVRIF) {
@@ -427,7 +427,7 @@ static int mscan_rx_poll(struct napi_struct *napi, int quota)
                 skb = alloc_can_skb(dev, &frame);
                 if (!skb) {
                         if (printk_ratelimit())
-                                dev_notice(dev->dev.parent, "packet dropped\n");
+                                netdev_notice(dev, "packet dropped\n");
                         stats->rx_dropped++;
                         out_8(&regs->canrflg, canrflg);
                         continue;
@@ -551,8 +551,7 @@ static int mscan_do_set_bittiming(struct net_device *dev)
                 BTR1_SET_TSEG2(bt->phase_seg2) |
                 BTR1_SET_SAM(priv->can.ctrlmode & CAN_CTRLMODE_3_SAMPLES));
 
-        dev_info(dev->dev.parent, "setting BTR0=0x%02x BTR1=0x%02x\n",
-                btr0, btr1);
+        netdev_info(dev, "setting BTR0=0x%02x BTR1=0x%02x\n", btr0, btr1);
 
         out_8(&regs->canbtr0, btr0);
         out_8(&regs->canbtr1, btr1);
@@ -560,6 +559,18 @@ static int mscan_do_set_bittiming(struct net_device *dev)
         return 0;
 }
 
+static int mscan_get_berr_counter(const struct net_device *dev,
+                                  struct can_berr_counter *bec)
+{
+        struct mscan_priv *priv = netdev_priv(dev);
+        struct mscan_regs __iomem *regs = priv->reg_base;
+
+        bec->txerr = in_8(&regs->cantxerr);
+        bec->rxerr = in_8(&regs->canrxerr);
+
+        return 0;
+}
+
 static int mscan_open(struct net_device *dev)
 {
         int ret;
@@ -575,7 +586,7 @@ static int mscan_open(struct net_device *dev)
 
         ret = request_irq(dev->irq, mscan_isr, 0, dev->name, dev);
         if (ret < 0) {
-                dev_err(dev->dev.parent, "failed to attach interrupt\n");
+                netdev_err(dev, "failed to attach interrupt\n");
                 goto exit_napi_disable;
         }
 
@@ -639,8 +650,10 @@ int register_mscandev(struct net_device *dev, int mscan_clksrc)
         else
                 ctl1 &= ~MSCAN_CLKSRC;
 
-        if (priv->type == MSCAN_TYPE_MPC5121)
+        if (priv->type == MSCAN_TYPE_MPC5121) {
+                priv->can.do_get_berr_counter = mscan_get_berr_counter;
                 ctl1 |= MSCAN_BORM; /* bus-off recovery upon request */
+        }
 
         ctl1 |= MSCAN_CANE;
         out_8(&regs->canctl1, ctl1);
diff --git a/drivers/net/can/pch_can.c b/drivers/net/can/pch_can.c
index 6edc25e0dd15..2bb215e00eb1 100644
--- a/drivers/net/can/pch_can.c
+++ b/drivers/net/can/pch_can.c
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 1999 - 2010 Intel Corporation.
- * Copyright (C) 2010 OKI SEMICONDUCTOR CO., LTD.
+ * Copyright (C) 2010 LAPIS SEMICONDUCTOR CO., LTD.
  *
  * 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
diff --git a/drivers/net/can/sja1000/Kconfig b/drivers/net/can/sja1000/Kconfig
index 36e9d594069d..b21523ddff3c 100644
--- a/drivers/net/can/sja1000/Kconfig
+++ b/drivers/net/can/sja1000/Kconfig
@@ -71,6 +71,7 @@ config CAN_PLX_PCI
            - esd CAN-PCIe/2000
            - Marathon CAN-bus-PCI card (http://www.marathon.ru/)
            - TEWS TECHNOLOGIES TPMC810 card (http://www.tews.com/)
+           - IXXAT Automation PC-I 04/PCI card (http://www.ixxat.com/)
 
 config CAN_TSCAN1
         tristate "TS-CAN1 PC104 boards"
diff --git a/drivers/net/can/sja1000/plx_pci.c b/drivers/net/can/sja1000/plx_pci.c
index c7f3d4ea1167..a227586ddd52 100644
--- a/drivers/net/can/sja1000/plx_pci.c
+++ b/drivers/net/can/sja1000/plx_pci.c
@@ -43,7 +43,8 @@ MODULE_SUPPORTED_DEVICE("Adlink PCI-7841/cPCI-7841, "
                         "TEWS TECHNOLOGIES TPMC810, "
                         "esd CAN-PCI/CPCI/PCI104/200, "
                         "esd CAN-PCI/PMC/266, "
-                        "esd CAN-PCIe/2000")
+                        "esd CAN-PCIe/2000, "
+                        "IXXAT PC-I 04/PCI")
 MODULE_LICENSE("GPL v2");
 
 #define PLX_PCI_MAX_CHAN 2
@@ -121,6 +122,10 @@ struct plx_pci_card {
 #define ESD_PCI_SUB_SYS_ID_PCIE2000     0x0200
 #define ESD_PCI_SUB_SYS_ID_PCI104200    0x0501
 
+#define IXXAT_PCI_VENDOR_ID             0x10b5
+#define IXXAT_PCI_DEVICE_ID             0x9050
+#define IXXAT_PCI_SUB_SYS_ID            0x2540
+
 #define MARATHON_PCI_DEVICE_ID          0x2715
 
 #define TEWS_PCI_VENDOR_ID              0x1498
@@ -193,6 +198,14 @@ static struct plx_pci_card_info plx_pci_card_info_esd2000 __devinitdata = {
         /* based on PEX8311 */
 };
 
+static struct plx_pci_card_info plx_pci_card_info_ixxat __devinitdata = {
+        "IXXAT PC-I 04/PCI", 2,
+        PLX_PCI_CAN_CLOCK, PLX_PCI_OCR, PLX_PCI_CDR,
+        {0, 0x00, 0x00}, { {2, 0x00, 0x80}, {2, 0x200, 0x80} },
+        &plx_pci_reset_common
+        /* based on PLX9050 */
+};
+
 static struct plx_pci_card_info plx_pci_card_info_marathon __devinitdata = {
         "Marathon CAN-bus-PCI", 2,
         PLX_PCI_CAN_CLOCK, PLX_PCI_OCR, PLX_PCI_CDR,
@@ -267,6 +280,13 @@ static DEFINE_PCI_DEVICE_TABLE(plx_pci_tbl) = {
                 (kernel_ulong_t)&plx_pci_card_info_esd2000
         },
         {
+                /* IXXAT PC-I 04/PCI card */
+                IXXAT_PCI_VENDOR_ID, IXXAT_PCI_DEVICE_ID,
+                PCI_ANY_ID, IXXAT_PCI_SUB_SYS_ID,
+                0, 0,
+                (kernel_ulong_t)&plx_pci_card_info_ixxat
+        },
+        {
                 /* Marathon CAN-bus-PCI card */
                 PCI_VENDOR_ID_PLX, MARATHON_PCI_DEVICE_ID,
                 PCI_ANY_ID, PCI_ANY_ID,
diff --git a/drivers/net/can/sja1000/sja1000.c b/drivers/net/can/sja1000/sja1000.c
index 04a3f1b756a8..ebbcfcafe29b 100644
--- a/drivers/net/can/sja1000/sja1000.c
+++ b/drivers/net/can/sja1000/sja1000.c
@@ -128,7 +128,7 @@ static void set_reset_mode(struct net_device *dev)
                 status = priv->read_reg(priv, REG_MOD);
         }
 
-        dev_err(dev->dev.parent, "setting SJA1000 into reset mode failed!\n");
+        netdev_err(dev, "setting SJA1000 into reset mode failed!\n");
 }
 
 static void set_normal_mode(struct net_device *dev)
@@ -156,7 +156,7 @@ static void set_normal_mode(struct net_device *dev)
                 status = priv->read_reg(priv, REG_MOD);
         }
 
-        dev_err(dev->dev.parent, "setting SJA1000 into normal mode failed!\n");
+        netdev_err(dev, "setting SJA1000 into normal mode failed!\n");
 }
 
 static void sja1000_start(struct net_device *dev)
@@ -209,8 +209,7 @@ static int sja1000_set_bittiming(struct net_device *dev)
         if (priv->can.ctrlmode & CAN_CTRLMODE_3_SAMPLES)
                 btr1 |= 0x80;
 
-        dev_info(dev->dev.parent,
-                 "setting BTR0=0x%02x BTR1=0x%02x\n", btr0, btr1);
+        netdev_info(dev, "setting BTR0=0x%02x BTR1=0x%02x\n", btr0, btr1);
 
         priv->write_reg(priv, REG_BTR0, btr0);
         priv->write_reg(priv, REG_BTR1, btr1);
@@ -378,7 +377,7 @@ static int sja1000_err(struct net_device *dev, uint8_t isrc, uint8_t status)
 
         if (isrc & IRQ_DOI) {
                 /* data overrun interrupt */
-                dev_dbg(dev->dev.parent, "data overrun interrupt\n");
+                netdev_dbg(dev, "data overrun interrupt\n");
                 cf->can_id |= CAN_ERR_CRTL;
                 cf->data[1] = CAN_ERR_CRTL_RX_OVERFLOW;
                 stats->rx_over_errors++;
@@ -388,7 +387,7 @@ static int sja1000_err(struct net_device *dev, uint8_t isrc, uint8_t status)
 
         if (isrc & IRQ_EI) {
                 /* error warning interrupt */
-                dev_dbg(dev->dev.parent, "error warning interrupt\n");
+                netdev_dbg(dev, "error warning interrupt\n");
 
                 if (status & SR_BS) {
                         state = CAN_STATE_BUS_OFF;
@@ -429,7 +428,7 @@ static int sja1000_err(struct net_device *dev, uint8_t isrc, uint8_t status)
         }
         if (isrc & IRQ_EPI) {
                 /* error passive interrupt */
-                dev_dbg(dev->dev.parent, "error passive interrupt\n");
+                netdev_dbg(dev, "error passive interrupt\n");
                 if (status & SR_ES)
                         state = CAN_STATE_ERROR_PASSIVE;
                 else
@@ -437,7 +436,7 @@ static int sja1000_err(struct net_device *dev, uint8_t isrc, uint8_t status)
         }
         if (isrc & IRQ_ALI) {
                 /* arbitration lost interrupt */
-                dev_dbg(dev->dev.parent, "arbitration lost interrupt\n");
+                netdev_dbg(dev, "arbitration lost interrupt\n");
                 alc = priv->read_reg(priv, REG_ALC);
                 priv->can.can_stats.arbitration_lost++;
                 stats->tx_errors++;
@@ -495,7 +494,7 @@ irqreturn_t sja1000_interrupt(int irq, void *dev_id)
                 status = priv->read_reg(priv, REG_SR);
 
                 if (isrc & IRQ_WUI)
-                        dev_warn(dev->dev.parent, "wakeup interrupt\n");
+                        netdev_warn(dev, "wakeup interrupt\n");
 
                 if (isrc & IRQ_TI) {
                         /* transmission complete interrupt */
@@ -522,7 +521,7 @@ irqreturn_t sja1000_interrupt(int irq, void *dev_id)
                 priv->post_irq(priv);
 
         if (n >= SJA1000_MAX_IRQ)
-                dev_dbg(dev->dev.parent, "%d messages handled in ISR", n);
+                netdev_dbg(dev, "%d messages handled in ISR", n);
 
         return (n) ? IRQ_HANDLED : IRQ_NONE;
 }
diff --git a/drivers/net/can/slcan.c b/drivers/net/can/slcan.c
index 3f1ebcc2cb83..98a5a7d867f5 100644
--- a/drivers/net/can/slcan.c
+++ b/drivers/net/can/slcan.c
@@ -1,7 +1,7 @@
 /*
  * slcan.c - serial line CAN interface driver (using tty line discipline)
  *
- * This file is derived from linux/drivers/net/slip.c
+ * This file is derived from linux/drivers/net/slip/slip.c
  *
  * slip.c Authors  : Laurence Culhane <loz@holmes.demon.co.uk>
  *                   Fred N. van Kempen <waltje@uwalt.nl.mugnet.org>
@@ -639,10 +639,8 @@ static int __init slcan_init(void)
         printk(KERN_INFO "slcan: %d dynamic interface channels.\n", maxdev);
 
         slcan_devs = kzalloc(sizeof(struct net_device *)*maxdev, GFP_KERNEL);
-        if (!slcan_devs) {
-                printk(KERN_ERR "slcan: can't allocate slcan device array!\n");
+        if (!slcan_devs)
                 return -ENOMEM;
-        }
 
         /* Fill in our line protocol discipline, and register it */
         status = tty_register_ldisc(N_SLCAN, &slc_ldisc);
diff --git a/drivers/net/can/ti_hecc.c b/drivers/net/can/ti_hecc.c
index 5a2e1e3588a1..4accd7ec6954 100644
--- a/drivers/net/can/ti_hecc.c
+++ b/drivers/net/can/ti_hecc.c
@@ -306,7 +306,7 @@ static int ti_hecc_set_btc(struct ti_hecc_priv *priv)
                 if (bit_timing->brp > 4)
                         can_btc |= HECC_CANBTC_SAM;
                 else
-                        dev_warn(priv->ndev->dev.parent, "WARN: Triple" \
+                        netdev_warn(priv->ndev, "WARN: Triple"
                                 "sampling not set due to h/w limitations");
         }
         can_btc |= ((bit_timing->sjw - 1) & 0x3) << 8;
@@ -315,7 +315,7 @@ static int ti_hecc_set_btc(struct ti_hecc_priv *priv)
         /* ERM being set to 0 by default meaning resync at falling edge */
 
         hecc_write(priv, HECC_CANBTC, can_btc);
-        dev_info(priv->ndev->dev.parent, "setting CANBTC=%#x\n", can_btc);
+        netdev_info(priv->ndev, "setting CANBTC=%#x\n", can_btc);
 
         return 0;
 }
@@ -332,7 +332,7 @@ static void ti_hecc_reset(struct net_device *ndev)
         u32 cnt;
         struct ti_hecc_priv *priv = netdev_priv(ndev);
 
-        dev_dbg(ndev->dev.parent, "resetting hecc ...\n");
+        netdev_dbg(ndev, "resetting hecc ...\n");
         hecc_set_bit(priv, HECC_CANMC, HECC_CANMC_SRES);
 
         /* Set change control request and wait till enabled */
@@ -458,6 +458,17 @@ static int ti_hecc_do_set_mode(struct net_device *ndev, enum can_mode mode)
         return ret;
 }
 
+static int ti_hecc_get_berr_counter(const struct net_device *ndev,
+                                        struct can_berr_counter *bec)
+{
+        struct ti_hecc_priv *priv = netdev_priv(ndev);
+
+        bec->txerr = hecc_read(priv, HECC_CANTEC);
+        bec->rxerr = hecc_read(priv, HECC_CANREC);
+
+        return 0;
+}
+
 /*
  * ti_hecc_xmit: HECC Transmit
  *
@@ -496,7 +507,7 @@ static netdev_tx_t ti_hecc_xmit(struct sk_buff *skb, struct net_device *ndev)
         if (unlikely(hecc_read(priv, HECC_CANME) & mbx_mask)) {
                 spin_unlock_irqrestore(&priv->mbx_lock, flags);
                 netif_stop_queue(ndev);
-                dev_err(priv->ndev->dev.parent,
+                netdev_err(priv->ndev,
                         "BUG: TX mbx not ready tx_head=%08X, tx_tail=%08X\n",
                         priv->tx_head, priv->tx_tail);
                 return NETDEV_TX_BUSY;
@@ -550,7 +561,7 @@ static int ti_hecc_rx_pkt(struct ti_hecc_priv *priv, int mbxno)
         skb = alloc_can_skb(priv->ndev, &cf);
         if (!skb) {
                 if (printk_ratelimit())
-                        dev_err(priv->ndev->dev.parent,
+                        netdev_err(priv->ndev,
                                 "ti_hecc_rx_pkt: alloc_can_skb() failed\n");
                 return -ENOMEM;
         }
@@ -668,7 +679,7 @@ static int ti_hecc_error(struct net_device *ndev, int int_status,
         skb = alloc_can_err_skb(ndev, &cf);
         if (!skb) {
                 if (printk_ratelimit())
-                        dev_err(priv->ndev->dev.parent,
+                        netdev_err(priv->ndev,
                                 "ti_hecc_error: alloc_can_err_skb() failed\n");
                 return -ENOMEM;
         }
@@ -684,7 +695,7 @@ static int ti_hecc_error(struct net_device *ndev, int int_status,
                                 cf->data[1] |= CAN_ERR_CRTL_RX_WARNING;
                 }
                 hecc_set_bit(priv, HECC_CANES, HECC_CANES_EW);
-                dev_dbg(priv->ndev->dev.parent, "Error Warning interrupt\n");
+                netdev_dbg(priv->ndev, "Error Warning interrupt\n");
                 hecc_clear_bit(priv, HECC_CANMC, HECC_CANMC_CCR);
         }
 
@@ -699,7 +710,7 @@ static int ti_hecc_error(struct net_device *ndev, int int_status,
                                 cf->data[1] |= CAN_ERR_CRTL_RX_PASSIVE;
                 }
                 hecc_set_bit(priv, HECC_CANES, HECC_CANES_EP);
-                dev_dbg(priv->ndev->dev.parent, "Error passive interrupt\n");
+                netdev_dbg(priv->ndev, "Error passive interrupt\n");
                 hecc_clear_bit(priv, HECC_CANMC, HECC_CANMC_CCR);
         }
 
@@ -825,7 +836,7 @@ static int ti_hecc_open(struct net_device *ndev)
         err = request_irq(ndev->irq, ti_hecc_interrupt, IRQF_SHARED,
                         ndev->name, ndev);
         if (err) {
-                dev_err(ndev->dev.parent, "error requesting interrupt\n");
+                netdev_err(ndev, "error requesting interrupt\n");
                 return err;
         }
 
@@ -834,7 +845,7 @@ static int ti_hecc_open(struct net_device *ndev)
         /* Open common can device */
         err = open_candev(ndev);
         if (err) {
-                dev_err(ndev->dev.parent, "open_candev() failed %d\n", err);
+                netdev_err(ndev, "open_candev() failed %d\n", err);
                 ti_hecc_transceiver_switch(priv, 0);
                 free_irq(ndev->irq, ndev);
                 return err;
@@ -923,6 +934,7 @@ static int ti_hecc_probe(struct platform_device *pdev)
         priv->can.bittiming_const = &ti_hecc_bittiming_const;
         priv->can.do_set_mode = ti_hecc_do_set_mode;
         priv->can.do_get_state = ti_hecc_get_state;
+        priv->can.do_get_berr_counter = ti_hecc_get_berr_counter;
         priv->can.ctrlmode_supported = CAN_CTRLMODE_3_SAMPLES;
 
         spin_lock_init(&priv->mbx_lock);
diff --git a/drivers/net/can/usb/ems_usb.c b/drivers/net/can/usb/ems_usb.c
index 7dae64d44e83..7ae65fc80032 100644
--- a/drivers/net/can/usb/ems_usb.c
+++ b/drivers/net/can/usb/ems_usb.c
@@ -288,8 +288,7 @@ static void ems_usb_read_interrupt_callback(struct urb *urb)
                 return;
 
         default:
-                dev_info(netdev->dev.parent, "Rx interrupt aborted %d\n",
-                         urb->status);
+                netdev_info(netdev, "Rx interrupt aborted %d\n", urb->status);
                 break;
         }
 
@@ -298,8 +297,7 @@ static void ems_usb_read_interrupt_callback(struct urb *urb)
         if (err == -ENODEV)
                 netif_device_detach(netdev);
         else if (err)
-                dev_err(netdev->dev.parent,
-                        "failed resubmitting intr urb: %d\n", err);
+                netdev_err(netdev, "failed resubmitting intr urb: %d\n", err);
 }
 
 static void ems_usb_rx_can_msg(struct ems_usb *dev, struct ems_cpc_msg *msg)
@@ -431,8 +429,7 @@ static void ems_usb_read_bulk_callback(struct urb *urb)
                 return;
 
         default:
-                dev_info(netdev->dev.parent, "Rx URB aborted (%d)\n",
-                         urb->status);
+                netdev_info(netdev, "Rx URB aborted (%d)\n", urb->status);
                 goto resubmit_urb;
         }
 
@@ -477,7 +474,7 @@ static void ems_usb_read_bulk_callback(struct urb *urb)
                         msg_count--;
 
                         if (start > urb->transfer_buffer_length) {
-                                dev_err(netdev->dev.parent, "format error\n");
+                                netdev_err(netdev, "format error\n");
                                 break;
                         }
                 }
@@ -493,8 +490,8 @@ resubmit_urb:
         if (retval == -ENODEV)
                 netif_device_detach(netdev);
         else if (retval)
-                dev_err(netdev->dev.parent,
-                        "failed resubmitting read bulk urb: %d\n", retval);
+                netdev_err(netdev,
+                           "failed resubmitting read bulk urb: %d\n", retval);
 }
 
 /*
@@ -521,8 +518,7 @@ static void ems_usb_write_bulk_callback(struct urb *urb)
                 return;
 
         if (urb->status)
-                dev_info(netdev->dev.parent, "Tx URB aborted (%d)\n",
-                         urb->status);
+                netdev_info(netdev, "Tx URB aborted (%d)\n", urb->status);
 
         netdev->trans_start = jiffies;
 
@@ -605,18 +601,18 @@ static int ems_usb_start(struct ems_usb *dev)
                 /* create a URB, and a buffer for it */
                 urb = usb_alloc_urb(0, GFP_KERNEL);
                 if (!urb) {
-                        dev_err(netdev->dev.parent,
-                                "No memory left for URBs\n");
-                        return -ENOMEM;
+                        netdev_err(netdev, "No memory left for URBs\n");
+                        err = -ENOMEM;
+                        break;
                 }
 
                 buf = usb_alloc_coherent(dev->udev, RX_BUFFER_SIZE, GFP_KERNEL,
                                          &urb->transfer_dma);
                 if (!buf) {
-                        dev_err(netdev->dev.parent,
-                                "No memory left for USB buffer\n");
+                        netdev_err(netdev, "No memory left for USB buffer\n");
                         usb_free_urb(urb);
-                        return -ENOMEM;
+                        err = -ENOMEM;
+                        break;
                 }
 
                 usb_fill_bulk_urb(urb, dev->udev, usb_rcvbulkpipe(dev->udev, 2),
@@ -639,13 +635,13 @@ static int ems_usb_start(struct ems_usb *dev)
 
         /* Did we submit any URBs */
         if (i == 0) {
-                dev_warn(netdev->dev.parent, "couldn't setup read URBs\n");
+                netdev_warn(netdev, "couldn't setup read URBs\n");
                 return err;
         }
 
         /* Warn if we've couldn't transmit all the URBs */
         if (i < MAX_RX_URBS)
-                dev_warn(netdev->dev.parent, "rx performance may be slow\n");
+                netdev_warn(netdev, "rx performance may be slow\n");
 
         /* Setup and start interrupt URB */
         usb_fill_int_urb(dev->intr_urb, dev->udev,
@@ -656,8 +652,7 @@ static int ems_usb_start(struct ems_usb *dev)
 
         err = usb_submit_urb(dev->intr_urb, GFP_KERNEL);
         if (err) {
-                dev_warn(netdev->dev.parent, "intr URB submit failed: %d\n",
-                         err);
+                netdev_warn(netdev, "intr URB submit failed: %d\n", err);
 
                 return err;
         }
@@ -686,7 +681,7 @@ static int ems_usb_start(struct ems_usb *dev)
         return 0;
 
 failed:
-        dev_warn(netdev->dev.parent, "couldn't submit control: %d\n", err);
+        netdev_warn(netdev, "couldn't submit control: %d\n", err);
 
         return err;
 }
@@ -726,8 +721,7 @@ static int ems_usb_open(struct net_device *netdev)
                 if (err == -ENODEV)
                         netif_device_detach(dev->netdev);
 
-                dev_warn(netdev->dev.parent, "couldn't start device: %d\n",
-                         err);
+                netdev_warn(netdev, "couldn't start device: %d\n", err);
 
                 close_candev(netdev);
 
@@ -760,13 +754,13 @@ static netdev_tx_t ems_usb_start_xmit(struct sk_buff *skb, struct net_device *ne
         /* create a URB, and a buffer for it, and copy the data to the URB */
         urb = usb_alloc_urb(0, GFP_ATOMIC);
         if (!urb) {
-                dev_err(netdev->dev.parent, "No memory left for URBs\n");
+                netdev_err(netdev, "No memory left for URBs\n");
                 goto nomem;
         }
 
         buf = usb_alloc_coherent(dev->udev, size, GFP_ATOMIC, &urb->transfer_dma);
         if (!buf) {
-                dev_err(netdev->dev.parent, "No memory left for USB buffer\n");
+                netdev_err(netdev, "No memory left for USB buffer\n");
                 usb_free_urb(urb);
                 goto nomem;
         }
@@ -809,7 +803,7 @@ static netdev_tx_t ems_usb_start_xmit(struct sk_buff *skb, struct net_device *ne
                 usb_unanchor_urb(urb);
                 usb_free_coherent(dev->udev, size, buf, urb->transfer_dma);
 
-                dev_warn(netdev->dev.parent, "couldn't find free context\n");
+                netdev_warn(netdev, "couldn't find free context\n");
 
                 return NETDEV_TX_BUSY;
         }
@@ -840,7 +834,7 @@ static netdev_tx_t ems_usb_start_xmit(struct sk_buff *skb, struct net_device *ne
                 if (err == -ENODEV) {
                         netif_device_detach(netdev);
                 } else {
-                        dev_warn(netdev->dev.parent, "failed tx_urb %d\n", err);
+                        netdev_warn(netdev, "failed tx_urb %d\n", err);
 
                         stats->tx_dropped++;
                 }
@@ -880,7 +874,7 @@ static int ems_usb_close(struct net_device *netdev)
 
         /* Set CAN controller to reset mode */
         if (ems_usb_write_mode(dev, SJA1000_MOD_RM))
-                dev_warn(netdev->dev.parent, "couldn't stop device");
+                netdev_warn(netdev, "couldn't stop device");
 
         close_candev(netdev);
 
@@ -917,7 +911,7 @@ static int ems_usb_set_mode(struct net_device *netdev, enum can_mode mode)
         switch (mode) {
         case CAN_MODE_START:
                 if (ems_usb_write_mode(dev, SJA1000_MOD_NORMAL))
-                        dev_warn(netdev->dev.parent, "couldn't start device");
+                        netdev_warn(netdev, "couldn't start device");
 
                 if (netif_queue_stopped(netdev))
                         netif_wake_queue(netdev);
@@ -942,8 +936,7 @@ static int ems_usb_set_bittiming(struct net_device *netdev)
         if (dev->can.ctrlmode & CAN_CTRLMODE_3_SAMPLES)
                 btr1 |= 0x80;
 
-        dev_info(netdev->dev.parent, "setting BTR0=0x%02x BTR1=0x%02x\n",
-                 btr0, btr1);
+        netdev_info(netdev, "setting BTR0=0x%02x BTR1=0x%02x\n", btr0, btr1);
 
         dev->active_params.msg.can_params.cc_params.sja1000.btr0 = btr0;
         dev->active_params.msg.can_params.cc_params.sja1000.btr1 = btr1;
@@ -1048,15 +1041,13 @@ static int ems_usb_probe(struct usb_interface *intf,
 
         err = ems_usb_command_msg(dev, &dev->active_params);
         if (err) {
-                dev_err(netdev->dev.parent,
-                        "couldn't initialize controller: %d\n", err);
+                netdev_err(netdev, "couldn't initialize controller: %d\n", err);
                 goto cleanup_tx_msg_buffer;
         }
 
         err = register_candev(netdev);
         if (err) {
-                dev_err(netdev->dev.parent,
-                        "couldn't register CAN device: %d\n", err);
+                netdev_err(netdev, "couldn't register CAN device: %d\n", err);
                 goto cleanup_tx_msg_buffer;
         }
 
diff --git a/drivers/net/can/usb/esd_usb2.c b/drivers/net/can/usb/esd_usb2.c
index 92774637aad8..09b1da5bc512 100644
--- a/drivers/net/can/usb/esd_usb2.c
+++ b/drivers/net/can/usb/esd_usb2.c
@@ -470,8 +470,7 @@ static void esd_usb2_write_bulk_callback(struct urb *urb)
                 return;
 
         if (urb->status)
-                dev_info(netdev->dev.parent, "Tx URB aborted (%d)\n",
-                         urb->status);
+                netdev_info(netdev, "Tx URB aborted (%d)\n", urb->status);
 
         netdev->trans_start = jiffies;
 }
@@ -651,7 +650,7 @@ failed:
         if (err == -ENODEV)
                 netif_device_detach(netdev);
 
-        dev_err(netdev->dev.parent, "couldn't start device: %d\n", err);
+        netdev_err(netdev, "couldn't start device: %d\n", err);
 
         return err;
 }
@@ -687,8 +686,7 @@ static int esd_usb2_open(struct net_device *netdev)
         /* finally start device */
         err = esd_usb2_start(priv);
         if (err) {
-                dev_warn(netdev->dev.parent,
-                         "couldn't start device: %d\n", err);
+                netdev_warn(netdev, "couldn't start device: %d\n", err);
                 close_candev(netdev);
                 return err;
         }
@@ -721,7 +719,7 @@ static netdev_tx_t esd_usb2_start_xmit(struct sk_buff *skb,
         /* create a URB, and a buffer for it, and copy the data to the URB */
         urb = usb_alloc_urb(0, GFP_ATOMIC);
         if (!urb) {
-                dev_err(netdev->dev.parent, "No memory left for URBs\n");
+                netdev_err(netdev, "No memory left for URBs\n");
                 stats->tx_dropped++;
                 dev_kfree_skb(skb);
                 goto nourbmem;
@@ -730,7 +728,7 @@ static netdev_tx_t esd_usb2_start_xmit(struct sk_buff *skb,
         buf = usb_alloc_coherent(dev->udev, size, GFP_ATOMIC,
                                  &urb->transfer_dma);
         if (!buf) {
-                dev_err(netdev->dev.parent, "No memory left for USB buffer\n");
+                netdev_err(netdev, "No memory left for USB buffer\n");
                 stats->tx_dropped++;
                 dev_kfree_skb(skb);
                 goto nobufmem;
@@ -766,7 +764,7 @@ static netdev_tx_t esd_usb2_start_xmit(struct sk_buff *skb,
          * This may never happen.
          */
         if (!context) {
-                dev_warn(netdev->dev.parent, "couldn't find free context\n");
+                netdev_warn(netdev, "couldn't find free context\n");
                 ret = NETDEV_TX_BUSY;
                 goto releasebuf;
         }
@@ -806,7 +804,7 @@ static netdev_tx_t esd_usb2_start_xmit(struct sk_buff *skb,
                 if (err == -ENODEV)
                         netif_device_detach(netdev);
                 else
-                        dev_warn(netdev->dev.parent, "failed tx_urb %d\n", err);
+                        netdev_warn(netdev, "failed tx_urb %d\n", err);
 
                 goto releasebuf;
         }
@@ -845,7 +843,7 @@ static int esd_usb2_close(struct net_device *netdev)
         for (i = 0; i <= ESD_MAX_ID_SEGMENT; i++)
                 msg.msg.filter.mask[i] = 0;
         if (esd_usb2_send_msg(priv->usb2, &msg) < 0)
-                dev_err(netdev->dev.parent, "sending idadd message failed\n");
+                netdev_err(netdev, "sending idadd message failed\n");
 
         /* set CAN controller to reset mode */
         msg.msg.hdr.len = 2;
@@ -854,7 +852,7 @@ static int esd_usb2_close(struct net_device *netdev)
         msg.msg.setbaud.rsvd = 0;
         msg.msg.setbaud.baud = cpu_to_le32(ESD_USB2_NO_BAUDRATE);
         if (esd_usb2_send_msg(priv->usb2, &msg) < 0)
-                dev_err(netdev->dev.parent, "sending setbaud message failed\n");
+                netdev_err(netdev, "sending setbaud message failed\n");
 
         priv->can.state = CAN_STATE_STOPPED;
 
@@ -910,7 +908,7 @@ static int esd_usb2_set_bittiming(struct net_device *netdev)
         msg.msg.setbaud.rsvd = 0;
         msg.msg.setbaud.baud = cpu_to_le32(canbtr);
 
-        dev_info(netdev->dev.parent, "setting BTR=%#x\n", canbtr);
+        netdev_info(netdev, "setting BTR=%#x\n", canbtr);
 
         return esd_usb2_send_msg(priv->usb2, &msg);
 }
@@ -988,15 +986,14 @@ static int esd_usb2_probe_one_net(struct usb_interface *intf, int index)
 
         err = register_candev(netdev);
         if (err) {
-                dev_err(&intf->dev,
-                        "couldn't register CAN device: %d\n", err);
+                dev_err(&intf->dev, "couldn't register CAN device: %d\n", err);
                 free_candev(netdev);
                 err = -ENOMEM;
                 goto done;
         }
 
         dev->nets[index] = priv;
-        dev_info(netdev->dev.parent, "device %s registered\n", netdev->name);
+        netdev_info(netdev, "device %s registered\n", netdev->name);
 
 done:
         return err;
diff --git a/drivers/net/ethernet/3com/3c501.c b/drivers/net/ethernet/3com/3c501.c
index 68da81d476f3..bf73e1a02293 100644
--- a/drivers/net/ethernet/3com/3c501.c
+++ b/drivers/net/ethernet/3com/3c501.c
@@ -702,7 +702,7 @@ static void el_receive(struct net_device *dev)
          */
 
         outb(AX_SYS, AX_CMD);
-        skb = dev_alloc_skb(pkt_len+2);
+        skb = netdev_alloc_skb(dev, pkt_len + 2);
 
         /*
          *      Start of frame
diff --git a/drivers/net/ethernet/3com/3c509.c b/drivers/net/ethernet/3com/3c509.c
index 92053e6fc980..41719da2e178 100644
--- a/drivers/net/ethernet/3com/3c509.c
+++ b/drivers/net/ethernet/3com/3c509.c
@@ -1066,7 +1066,7 @@ el3_rx(struct net_device *dev)
                         short pkt_len = rx_status & 0x7ff;
                         struct sk_buff *skb;
 
-                        skb = dev_alloc_skb(pkt_len+5);
+                        skb = netdev_alloc_skb(dev, pkt_len + 5);
                         if (el3_debug > 4)
                                 pr_debug("Receiving packet size %d status %4.4x.\n",
                                            pkt_len, rx_status);
diff --git a/drivers/net/ethernet/3com/3c515.c b/drivers/net/ethernet/3com/3c515.c
index f67a5d3a200c..59e1e001bc3f 100644
--- a/drivers/net/ethernet/3com/3c515.c
+++ b/drivers/net/ethernet/3com/3c515.c
@@ -826,11 +826,10 @@ static int corkscrew_open(struct net_device *dev)
                                 vp->rx_ring[i].next = 0;
                         vp->rx_ring[i].status = 0;      /* Clear complete bit. */
                         vp->rx_ring[i].length = PKT_BUF_SZ | 0x80000000;
-                        skb = dev_alloc_skb(PKT_BUF_SZ);
+                        skb = netdev_alloc_skb(dev, PKT_BUF_SZ);
                         vp->rx_skbuff[i] = skb;
                         if (skb == NULL)
                                 break;  /* Bad news!  */
-                        skb->dev = dev; /* Mark as being used by this device. */
                         skb_reserve(skb, 2);    /* Align IP on 16 byte boundaries */
                         vp->rx_ring[i].addr = isa_virt_to_bus(skb->data);
                 }
@@ -1295,7 +1294,7 @@ static int corkscrew_rx(struct net_device *dev)
                         short pkt_len = rx_status & 0x1fff;
                         struct sk_buff *skb;
 
-                        skb = dev_alloc_skb(pkt_len + 5 + 2);
+                        skb = netdev_alloc_skb(dev, pkt_len + 5 + 2);
                         if (corkscrew_debug > 4)
                                 pr_debug("Receiving packet size %d status %4.4x.\n",
                                      pkt_len, rx_status);
@@ -1368,7 +1367,7 @@ static int boomerang_rx(struct net_device *dev)
                         /* Check if the packet is long enough to just accept without
                            copying to a properly sized skbuff. */
                         if (pkt_len < rx_copybreak &&
-                            (skb = dev_alloc_skb(pkt_len + 4)) != NULL) {
+                            (skb = netdev_alloc_skb(dev, pkt_len + 4)) != NULL) {
                                 skb_reserve(skb, 2);    /* Align IP on 16 byte boundaries */
                                 /* 'skb_put()' points to the start of sk_buff data area. */
                                 memcpy(skb_put(skb, pkt_len),
@@ -1403,10 +1402,9 @@ static int boomerang_rx(struct net_device *dev)
                 struct sk_buff *skb;
                 entry = vp->dirty_rx % RX_RING_SIZE;
                 if (vp->rx_skbuff[entry] == NULL) {
-                        skb = dev_alloc_skb(PKT_BUF_SZ);
+                        skb = netdev_alloc_skb(dev, PKT_BUF_SZ);
                         if (skb == NULL)
                                 break;  /* Bad news!  */
-                        skb->dev = dev; /* Mark as being used by this device. */
                         skb_reserve(skb, 2);    /* Align IP on 16 byte boundaries */
                         vp->rx_ring[entry].addr = isa_virt_to_bus(skb->data);
                         vp->rx_skbuff[entry] = skb;
diff --git a/drivers/net/ethernet/3com/3c574_cs.c b/drivers/net/ethernet/3com/3c574_cs.c
index 9c01bc9235b3..e61b2f82ba3a 100644
--- a/drivers/net/ethernet/3com/3c574_cs.c
+++ b/drivers/net/ethernet/3com/3c574_cs.c
@@ -1012,7 +1012,7 @@ static int el3_rx(struct net_device *dev, int worklimit)
                         short pkt_len = rx_status & 0x7ff;
                         struct sk_buff *skb;
 
-                        skb = dev_alloc_skb(pkt_len+5);
+                        skb = netdev_alloc_skb(dev, pkt_len + 5);
 
                         pr_debug("  Receiving packet size %d status %4.4x.\n",
                                   pkt_len, rx_status);
diff --git a/drivers/net/ethernet/3com/3c589_cs.c b/drivers/net/ethernet/3com/3c589_cs.c
index da410f036869..b23253b9f742 100644
--- a/drivers/net/ethernet/3com/3c589_cs.c
+++ b/drivers/net/ethernet/3com/3c589_cs.c
@@ -819,7 +819,7 @@ static int el3_rx(struct net_device *dev)
             short pkt_len = rx_status & 0x7ff;
             struct sk_buff *skb;
 
-            skb = dev_alloc_skb(pkt_len+5);
+            skb = netdev_alloc_skb(dev, pkt_len + 5);
 
             netdev_dbg(dev, "    Receiving packet size %d status %4.4x.\n",
                        pkt_len, rx_status);
diff --git a/drivers/net/ethernet/3com/3c59x.c b/drivers/net/ethernet/3com/3c59x.c
index 8153a3e0a1a4..1282f048dfad 100644
--- a/drivers/net/ethernet/3com/3c59x.c
+++ b/drivers/net/ethernet/3com/3c59x.c
@@ -1121,10 +1121,9 @@ static int __devinit vortex_probe1(struct device *gendev,
 
         dev = alloc_etherdev(sizeof(*vp));
         retval = -ENOMEM;
-        if (!dev) {
-                pr_err(PFX "unable to allocate etherdev, aborting\n");
+        if (!dev)
                 goto out;
-        }
+
         SET_NETDEV_DEV(dev, gendev);
         vp = netdev_priv(dev);
 
@@ -2500,7 +2499,7 @@ static int vortex_rx(struct net_device *dev)
                         int pkt_len = rx_status & 0x1fff;
                         struct sk_buff *skb;
 
-                        skb = dev_alloc_skb(pkt_len + 5);
+                        skb = netdev_alloc_skb(dev, pkt_len + 5);
                         if (vortex_debug > 4)
                                 pr_debug("Receiving packet size %d status %4.4x.\n",
                                            pkt_len, rx_status);
@@ -2579,7 +2578,8 @@ boomerang_rx(struct net_device *dev)
 
                         /* Check if the packet is long enough to just accept without
                            copying to a properly sized skbuff. */
-                        if (pkt_len < rx_copybreak && (skb = dev_alloc_skb(pkt_len + 2)) != NULL) {
+                        if (pkt_len < rx_copybreak &&
+                            (skb = netdev_alloc_skb(dev, pkt_len + 2)) != NULL) {
                                 skb_reserve(skb, 2);    /* Align IP on 16 byte boundaries */
                                 pci_dma_sync_single_for_cpu(VORTEX_PCI(vp), dma, PKT_BUF_SZ, PCI_DMA_FROMDEVICE);
                                 /* 'skb_put()' points to the start of sk_buff data area. */
diff --git a/drivers/net/ethernet/3com/Kconfig b/drivers/net/ethernet/3com/Kconfig
index a8bb30cf512d..bad4fa6815c5 100644
--- a/drivers/net/ethernet/3com/Kconfig
+++ b/drivers/net/ethernet/3com/Kconfig
@@ -97,7 +97,7 @@ config VORTEX
           available from <http://www.tldp.org/docs.html#howto>. More
           specific information is in
           <file:Documentation/networking/vortex.txt> and in the comments at
-          the beginning of <file:drivers/net/3c59x.c>.
+          the beginning of <file:drivers/net/ethernet/3com/3c59x.c>.
 
           To compile this support as a module, choose M here.
 
diff --git a/drivers/net/ethernet/3com/typhoon.c b/drivers/net/ethernet/3com/typhoon.c
index 6d6bc754b1a8..f7d622eed203 100644
--- a/drivers/net/ethernet/3com/typhoon.c
+++ b/drivers/net/ethernet/3com/typhoon.c
@@ -1607,7 +1607,7 @@ typhoon_alloc_rx_skb(struct typhoon *tp, u32 idx)
                                 le32_to_cpu(indexes->rxBuffCleared))
                 return -ENOMEM;
 
-        skb = dev_alloc_skb(PKT_BUF_SZ);
+        skb = netdev_alloc_skb(tp->dev, PKT_BUF_SZ);
         if(!skb)
                 return -ENOMEM;
 
@@ -1618,7 +1618,6 @@ typhoon_alloc_rx_skb(struct typhoon *tp, u32 idx)
         skb_reserve(skb, 2);
 #endif
 
-        skb->dev = tp->dev;
         dma_addr = pci_map_single(tp->pdev, skb->data,
                                   PKT_BUF_SZ, PCI_DMA_FROMDEVICE);
 
@@ -1673,7 +1672,7 @@ typhoon_rx(struct typhoon *tp, struct basic_ring *rxRing, volatile __le32 * read
                 pkt_len = le16_to_cpu(rx->frameLen);
 
                 if(pkt_len < rx_copybreak &&
-                   (new_skb = dev_alloc_skb(pkt_len + 2)) != NULL) {
+                   (new_skb = netdev_alloc_skb(tp->dev, pkt_len + 2)) != NULL) {
                         skb_reserve(new_skb, 2);
                         pci_dma_sync_single_for_cpu(tp->pdev, dma_addr,
                                                     PKT_BUF_SZ,
diff --git a/drivers/net/ethernet/8390/ax88796.c b/drivers/net/ethernet/8390/ax88796.c
index 0f92e3567f68..c30adcc9828a 100644
--- a/drivers/net/ethernet/8390/ax88796.c
+++ b/drivers/net/ethernet/8390/ax88796.c
@@ -1,4 +1,4 @@
-/* drivers/net/ax88796.c
+/* drivers/net/ethernet/8390/ax88796.c
  *
  * Copyright 2005,2007 Simtec Electronics
  *      Ben Dooks <ben@simtec.co.uk>
diff --git a/drivers/net/ethernet/8390/axnet_cs.c b/drivers/net/ethernet/8390/axnet_cs.c
index bba51cdc74a1..c5bd8eb7a9f5 100644
--- a/drivers/net/ethernet/8390/axnet_cs.c
+++ b/drivers/net/ethernet/8390/axnet_cs.c
@@ -192,7 +192,7 @@ static int get_prom(struct pcmcia_device *link)
     unsigned int ioaddr = dev->base_addr;
     int i, j;
 
-    /* This is based on drivers/net/ne.c */
+    /* This is based on drivers/net/ethernet/8390/ne.c */
     struct {
         u_char value, offset;
     } program_seq[] = {
@@ -1408,7 +1408,7 @@ static void ei_receive(struct net_device *dev)
                 {
                         struct sk_buff *skb;
                         
-                        skb = dev_alloc_skb(pkt_len+2);
+                        skb = netdev_alloc_skb(dev, pkt_len + 2);
                         if (skb == NULL) 
                         {
                                 if (ei_debug > 1)
diff --git a/drivers/net/ethernet/8390/lib8390.c b/drivers/net/ethernet/8390/lib8390.c
index 05ae21435bfd..e77f624e8194 100644
--- a/drivers/net/ethernet/8390/lib8390.c
+++ b/drivers/net/ethernet/8390/lib8390.c
@@ -717,7 +717,7 @@ static void ei_receive(struct net_device *dev)
                 } else if ((pkt_stat & 0x0F) == ENRSR_RXOK) {
                         struct sk_buff *skb;
 
-                        skb = dev_alloc_skb(pkt_len+2);
+                        skb = netdev_alloc_skb(dev, pkt_len + 2);
                         if (skb == NULL) {
                                 if (ei_debug > 1)
                                         netdev_dbg(dev, "Couldn't allocate a sk_buff of size %d\n",
diff --git a/drivers/net/ethernet/8390/pcnet_cs.c b/drivers/net/ethernet/8390/pcnet_cs.c
index 053b2551a72d..f2a4e5de18c4 100644
--- a/drivers/net/ethernet/8390/pcnet_cs.c
+++ b/drivers/net/ethernet/8390/pcnet_cs.c
@@ -326,7 +326,7 @@ static hw_info_t *get_prom(struct pcmcia_device *link)
     u_char prom[32];
     int i, j;
 
-    /* This is lifted straight from drivers/net/ne.c */
+    /* This is lifted straight from drivers/net/ethernet/8390/ne.c */
     struct {
         u_char value, offset;
     } program_seq[] = {
diff --git a/drivers/net/ethernet/adaptec/starfire.c b/drivers/net/ethernet/adaptec/starfire.c
index cb4f38a17f20..d896816512ca 100644
--- a/drivers/net/ethernet/adaptec/starfire.c
+++ b/drivers/net/ethernet/adaptec/starfire.c
@@ -686,10 +686,9 @@ static int __devinit starfire_init_one(struct pci_dev *pdev,
         }
 
         dev = alloc_etherdev(sizeof(*np));
-        if (!dev) {
-                printk(KERN_ERR DRV_NAME " %d: cannot alloc etherdev, aborting\n", card_idx);
+        if (!dev)
                 return -ENOMEM;
-        }
+
         SET_NETDEV_DEV(dev, &pdev->dev);
 
         irq = pdev->irq;
@@ -1180,12 +1179,11 @@ static void init_ring(struct net_device *dev)
 
         /* Fill in the Rx buffers.  Handle allocation failure gracefully. */
         for (i = 0; i < RX_RING_SIZE; i++) {
-                struct sk_buff *skb = dev_alloc_skb(np->rx_buf_sz);
+                struct sk_buff *skb = netdev_alloc_skb(dev, np->rx_buf_sz);
                 np->rx_info[i].skb = skb;
                 if (skb == NULL)
                         break;
                 np->rx_info[i].mapping = pci_map_single(np->pci_dev, skb->data, np->rx_buf_sz, PCI_DMA_FROMDEVICE);
-                skb->dev = dev;                 /* Mark as being used by this device. */
                 /* Grrr, we cannot offset to correctly align the IP header. */
                 np->rx_ring[i].rxaddr = cpu_to_dma(np->rx_info[i].mapping | RxDescValid);
         }
@@ -1473,7 +1471,7 @@ static int __netdev_rx(struct net_device *dev, int *quota)
                 /* Check if the packet is long enough to accept without copying
                    to a minimally-sized skbuff. */
                 if (pkt_len < rx_copybreak &&
-                    (skb = dev_alloc_skb(pkt_len + 2)) != NULL) {
+                    (skb = netdev_alloc_skb(dev, pkt_len + 2)) != NULL) {
                         skb_reserve(skb, 2);    /* 16 byte align the IP header */
                         pci_dma_sync_single_for_cpu(np->pci_dev,
                                                     np->rx_info[entry].mapping,
@@ -1597,13 +1595,12 @@ static void refill_rx_ring(struct net_device *dev)
         for (; np->cur_rx - np->dirty_rx > 0; np->dirty_rx++) {
                 entry = np->dirty_rx % RX_RING_SIZE;
                 if (np->rx_info[entry].skb == NULL) {
-                        skb = dev_alloc_skb(np->rx_buf_sz);
+                        skb = netdev_alloc_skb(dev, np->rx_buf_sz);
                         np->rx_info[entry].skb = skb;
                         if (skb == NULL)
                                 break;  /* Better luck next round. */
                         np->rx_info[entry].mapping =
                                 pci_map_single(np->pci_dev, skb->data, np->rx_buf_sz, PCI_DMA_FROMDEVICE);
-                        skb->dev = dev; /* Mark as being used by this device. */
                         np->rx_ring[entry].rxaddr =
                                 cpu_to_dma(np->rx_info[entry].mapping | RxDescValid);
                 }
diff --git a/drivers/net/ethernet/adi/bfin_mac.c b/drivers/net/ethernet/adi/bfin_mac.c
index d812a103e032..49733696703a 100644
--- a/drivers/net/ethernet/adi/bfin_mac.c
+++ b/drivers/net/ethernet/adi/bfin_mac.c
@@ -113,7 +113,7 @@ static void desc_list_free(void)
         }
 }
 
-static int desc_list_init(void)
+static int desc_list_init(struct net_device *dev)
 {
         int i;
         struct sk_buff *new_skb;
@@ -187,7 +187,7 @@ static int desc_list_init(void)
                 struct dma_descriptor *b = &(r->desc_b);
 
                 /* allocate a new skb for next time receive */
-                new_skb = dev_alloc_skb(PKT_BUF_SZ + NET_IP_ALIGN);
+                new_skb = netdev_alloc_skb(dev, PKT_BUF_SZ + NET_IP_ALIGN);
                 if (!new_skb) {
                         pr_notice("init: low on mem - packet dropped\n");
                         goto init_error;
@@ -1090,7 +1090,7 @@ static void bfin_mac_rx(struct net_device *dev)
         /* allocate a new skb for next time receive */
         skb = current_rx_ptr->skb;
 
-        new_skb = dev_alloc_skb(PKT_BUF_SZ + NET_IP_ALIGN);
+        new_skb = netdev_alloc_skb(dev, PKT_BUF_SZ + NET_IP_ALIGN);
         if (!new_skb) {
                 netdev_notice(dev, "rx: low on mem - packet dropped\n");
                 dev->stats.rx_dropped++;
@@ -1397,7 +1397,7 @@ static int bfin_mac_open(struct net_device *dev)
         }
 
         /* initial rx and tx list */
-        ret = desc_list_init();
+        ret = desc_list_init(dev);
         if (ret)
                 return ret;
 
@@ -1467,10 +1467,8 @@ static int __devinit bfin_mac_probe(struct platform_device *pdev)
         int rc;
 
         ndev = alloc_etherdev(sizeof(struct bfin_mac_local));
-        if (!ndev) {
-                dev_err(&pdev->dev, "Cannot allocate net device!\n");
+        if (!ndev)
                 return -ENOMEM;
-        }
 
         SET_NETDEV_DEV(ndev, &pdev->dev);
         platform_set_drvdata(pdev, ndev);
diff --git a/drivers/net/ethernet/aeroflex/greth.c b/drivers/net/ethernet/aeroflex/greth.c
index c885aa905dec..b23751e683c8 100644
--- a/drivers/net/ethernet/aeroflex/greth.c
+++ b/drivers/net/ethernet/aeroflex/greth.c
@@ -785,7 +785,6 @@ static int greth_rx(struct net_device *dev, int limit)
 
                         } else {
                                 skb_reserve(skb, NET_IP_ALIGN);
-                                skb->dev = dev;
 
                                 dma_sync_single_for_cpu(greth->dev,
                                                         dma_addr,
diff --git a/drivers/net/ethernet/alteon/acenic.c b/drivers/net/ethernet/alteon/acenic.c
index f872748ab4e6..6c3b1c0adaa0 100644
--- a/drivers/net/ethernet/alteon/acenic.c
+++ b/drivers/net/ethernet/alteon/acenic.c
@@ -463,11 +463,8 @@ static int __devinit acenic_probe_one(struct pci_dev *pdev,
         static int boards_found;
 
         dev = alloc_etherdev(sizeof(struct ace_private));
-        if (dev == NULL) {
-                printk(KERN_ERR "acenic: Unable to allocate "
-                       "net_device structure!\n");
+        if (dev == NULL)
                 return -ENOMEM;
-        }
 
         SET_NETDEV_DEV(dev, &pdev->dev);
 
diff --git a/drivers/net/ethernet/amd/7990.c b/drivers/net/ethernet/amd/7990.c
index 60b35fb5f524..1b046f58d58f 100644
--- a/drivers/net/ethernet/amd/7990.c
+++ b/drivers/net/ethernet/amd/7990.c
@@ -316,7 +316,7 @@ static int lance_rx (struct net_device *dev)
                         if (bits & LE_R1_EOP) dev->stats.rx_errors++;
                 } else {
                         int len = (rd->mblength & 0xfff) - 4;
-                        struct sk_buff *skb = dev_alloc_skb (len+2);
+                        struct sk_buff *skb = netdev_alloc_skb(dev, len + 2);
 
                         if (!skb) {
                                 printk ("%s: Memory squeeze, deferring packet.\n",
diff --git a/drivers/net/ethernet/amd/Kconfig b/drivers/net/ethernet/amd/Kconfig
index 238b537b68fe..8350f4b37a8a 100644
--- a/drivers/net/ethernet/amd/Kconfig
+++ b/drivers/net/ethernet/amd/Kconfig
@@ -113,7 +113,7 @@ config DEPCA
           If you have a network (Ethernet) card of this type, say Y and read
           the Ethernet-HOWTO, available from
           <http://www.tldp.org/docs.html#howto> as well as
-          <file:drivers/net/depca.c>.
+          <file:drivers/net/ethernet/amd/depca.c>.
 
           To compile this driver as a module, choose M here. The module
           will be called depca.
diff --git a/drivers/net/ethernet/amd/a2065.c b/drivers/net/ethernet/amd/a2065.c
index 825e5d4ef4c3..689dfcafc6d4 100644
--- a/drivers/net/ethernet/amd/a2065.c
+++ b/drivers/net/ethernet/amd/a2065.c
@@ -290,7 +290,7 @@ static int lance_rx(struct net_device *dev)
                                 dev->stats.rx_errors++;
                 } else {
                         int len = (rd->mblength & 0xfff) - 4;
-                        struct sk_buff *skb = dev_alloc_skb(len + 2);
+                        struct sk_buff *skb = netdev_alloc_skb(dev, len + 2);
 
                         if (!skb) {
                                 netdev_warn(dev, "Memory squeeze, deferring packet\n");
diff --git a/drivers/net/ethernet/amd/am79c961a.c b/drivers/net/ethernet/amd/am79c961a.c
index 7d5ded80d2d7..cc7b9e46780c 100644
--- a/drivers/net/ethernet/amd/am79c961a.c
+++ b/drivers/net/ethernet/amd/am79c961a.c
@@ -1,5 +1,5 @@
 /*
- *  linux/drivers/net/am79c961.c
+ *  linux/drivers/net/ethernet/amd/am79c961a.c
  *
  *  by Russell King <rmk@arm.linux.org.uk> 1995-2001.
  *
@@ -516,7 +516,7 @@ am79c961_rx(struct net_device *dev, struct dev_priv *priv)
                 }
 
                 len = am_readword(dev, hdraddr + 6);
-                skb = dev_alloc_skb(len + 2);
+                skb = netdev_alloc_skb(dev, len + 2);
 
                 if (skb) {
                         skb_reserve(skb, 2);
diff --git a/drivers/net/ethernet/amd/am79c961a.h b/drivers/net/ethernet/amd/am79c961a.h
index fd634d32756b..9f384b79507b 100644
--- a/drivers/net/ethernet/amd/am79c961a.h
+++ b/drivers/net/ethernet/amd/am79c961a.h
@@ -1,5 +1,5 @@
 /*
- * linux/drivers/net/arm/am79c961a.h
+ * linux/drivers/net/ethernet/amd/am79c961a.h
  *
  * 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
diff --git a/drivers/net/ethernet/amd/amd8111e.c b/drivers/net/ethernet/amd/amd8111e.c
index 33e0a8c20f6b..9f62504d0086 100644
--- a/drivers/net/ethernet/amd/amd8111e.c
+++ b/drivers/net/ethernet/amd/amd8111e.c
@@ -336,7 +336,8 @@ static int amd8111e_init_ring(struct net_device *dev)
         /* Allocating receive  skbs */
         for (i = 0; i < NUM_RX_BUFFERS; i++) {
 
-                if (!(lp->rx_skbuff[i] = dev_alloc_skb(lp->rx_buff_len))) {
+                lp->rx_skbuff[i] = netdev_alloc_skb(dev, lp->rx_buff_len);
+                if (!lp->rx_skbuff[i]) {
                                 /* Release previos allocated skbs */
                                 for(--i; i >= 0 ;i--)
                                         dev_kfree_skb(lp->rx_skbuff[i]);
@@ -768,7 +769,8 @@ static int amd8111e_rx_poll(struct napi_struct *napi, int budget)
                         }
                         if(--rx_pkt_limit < 0)
                                 goto rx_not_empty;
-                        if(!(new_skb = dev_alloc_skb(lp->rx_buff_len))){
+                        new_skb = netdev_alloc_skb(dev, lp->rx_buff_len);
+                        if (!new_skb) {
                                 /* if allocation fail,
                                    ignore that pkt and go to next one */
                                 lp->rx_ring[rx_index].rx_flags &= RESET_RX_FLAGS;
@@ -1859,7 +1861,6 @@ static int __devinit amd8111e_probe_one(struct pci_dev *pdev,
 
         dev = alloc_etherdev(sizeof(struct amd8111e_priv));
         if (!dev) {
-                printk(KERN_ERR "amd8111e: Etherdev alloc failed, exiting.\n");
                 err = -ENOMEM;
                 goto err_free_reg;
         }
diff --git a/drivers/net/ethernet/amd/ariadne.c b/drivers/net/ethernet/amd/ariadne.c
index eb18e1fe65c8..f4c228e4d76c 100644
--- a/drivers/net/ethernet/amd/ariadne.c
+++ b/drivers/net/ethernet/amd/ariadne.c
@@ -191,7 +191,7 @@ static int ariadne_rx(struct net_device *dev)
                         short pkt_len = swapw(priv->rx_ring[entry]->RMD3);
                         struct sk_buff *skb;
 
-                        skb = dev_alloc_skb(pkt_len + 2);
+                        skb = netdev_alloc_skb(dev, pkt_len + 2);
                         if (skb == NULL) {
                                 netdev_warn(dev, "Memory squeeze, deferring packet\n");
                                 for (i = 0; i < RX_RING_SIZE; i++)
diff --git a/drivers/net/ethernet/amd/atarilance.c b/drivers/net/ethernet/amd/atarilance.c
index 15bfa28d6c53..70ed79c46245 100644
--- a/drivers/net/ethernet/amd/atarilance.c
+++ b/drivers/net/ethernet/amd/atarilance.c
@@ -997,7 +997,7 @@ static int lance_rx( struct net_device *dev )
                                 dev->stats.rx_errors++;
                         }
                         else {
-                                skb = dev_alloc_skb( pkt_len+2 );
+                                skb = netdev_alloc_skb(dev, pkt_len + 2);
                                 if (skb == NULL) {
                                         DPRINTK( 1, ( "%s: Memory squeeze, deferring packet.\n",
                                                                   dev->name ));
diff --git a/drivers/net/ethernet/amd/au1000_eth.c b/drivers/net/ethernet/amd/au1000_eth.c
index 8b95dd314253..c1dfdc8b7079 100644
--- a/drivers/net/ethernet/amd/au1000_eth.c
+++ b/drivers/net/ethernet/amd/au1000_eth.c
@@ -725,7 +725,7 @@ static int au1000_rx(struct net_device *dev)
                         /* good frame */
                         frmlen = (status & RX_FRAME_LEN_MASK);
                         frmlen -= 4; /* Remove FCS */
-                        skb = dev_alloc_skb(frmlen + 2);
+                        skb = netdev_alloc_skb(dev, frmlen + 2);
                         if (skb == NULL) {
                                 netdev_err(dev, "Memory squeeze, dropping packet.\n");
                                 dev->stats.rx_dropped++;
@@ -1077,7 +1077,6 @@ static int __devinit au1000_probe(struct platform_device *pdev)
 
         dev = alloc_etherdev(sizeof(struct au1000_private));
         if (!dev) {
-                dev_err(&pdev->dev, "alloc_etherdev failed\n");
                 err = -ENOMEM;
                 goto err_alloc;
         }
diff --git a/drivers/net/ethernet/amd/declance.c b/drivers/net/ethernet/amd/declance.c
index 73f8d4fa682d..7dc508e5c72e 100644
--- a/drivers/net/ethernet/amd/declance.c
+++ b/drivers/net/ethernet/amd/declance.c
@@ -605,7 +605,7 @@ static int lance_rx(struct net_device *dev)
                                 dev->stats.rx_errors++;
                 } else {
                         len = (*rds_ptr(rd, mblength, lp->type) & 0xfff) - 4;
-                        skb = dev_alloc_skb(len + 2);
+                        skb = netdev_alloc_skb(dev, len + 2);
 
                         if (skb == 0) {
                                 printk("%s: Memory squeeze, deferring packet.\n",
@@ -1052,8 +1052,6 @@ static int __devinit dec_lance_probe(struct device *bdev, const int type)
 
         dev = alloc_etherdev(sizeof(struct lance_private));
         if (!dev) {
-                printk(KERN_ERR "%s: Unable to allocate etherdev, aborting.\n",
-                        name);
                 ret = -ENOMEM;
                 goto err_out;
         }
diff --git a/drivers/net/ethernet/amd/depca.c b/drivers/net/ethernet/amd/depca.c
index 681970c07f22..86dd95766a64 100644
--- a/drivers/net/ethernet/amd/depca.c
+++ b/drivers/net/ethernet/amd/depca.c
@@ -1042,7 +1042,7 @@ static int depca_rx(struct net_device *dev)
                                 short len, pkt_len = readw(&lp->rx_ring[entry].msg_length) - 4;
                                 struct sk_buff *skb;
 
-                                skb = dev_alloc_skb(pkt_len + 2);
+                                skb = netdev_alloc_skb(dev, pkt_len + 2);
                                 if (skb != NULL) {
                                         unsigned char *buf;
                                         skb_reserve(skb, 2);    /* 16 byte align the IP header */
diff --git a/drivers/net/ethernet/amd/ni65.c b/drivers/net/ethernet/amd/ni65.c
index 6e6aa7213aab..013b65108536 100644
--- a/drivers/net/ethernet/amd/ni65.c
+++ b/drivers/net/ethernet/amd/ni65.c
@@ -621,10 +621,8 @@ static void *ni65_alloc_mem(struct net_device *dev,char *what,int size,int type)
         }
         else {
                 ret = ptr = kmalloc(T_BUF_SIZE,GFP_KERNEL | GFP_DMA);
-                if(!ret) {
-                        printk(KERN_WARNING "%s: unable to allocate %s memory.\n",dev->name,what);
+                if(!ret)
                         return NULL;
-                }
         }
         if( (u32) virt_to_phys(ptr+size) > 0x1000000) {
                 printk(KERN_WARNING "%s: unable to allocate %s memory in lower 16MB!\n",dev->name,what);
@@ -1091,7 +1089,7 @@ static void ni65_recv_intr(struct net_device *dev,int csr0)
                         if (skb)
                                 skb_reserve(skb,16);
 #else
-                        struct sk_buff *skb = dev_alloc_skb(len+2);
+                        struct sk_buff *skb = netdev_alloc_skb(dev, len + 2);
 #endif
                         if(skb)
                         {
diff --git a/drivers/net/ethernet/amd/nmclan_cs.c b/drivers/net/ethernet/amd/nmclan_cs.c
index 6be0dd67631a..ebdb9e238a8d 100644
--- a/drivers/net/ethernet/amd/nmclan_cs.c
+++ b/drivers/net/ethernet/amd/nmclan_cs.c
@@ -1104,7 +1104,7 @@ static int mace_rx(struct net_device *dev, unsigned char RxCnt)
       pr_debug("    receiving packet size 0x%X rx_status"
             " 0x%X.\n", pkt_len, rx_status);
 
-      skb = dev_alloc_skb(pkt_len+2);
+      skb = netdev_alloc_skb(dev, pkt_len + 2);
 
       if (skb != NULL) {
         skb_reserve(skb, 2);
diff --git a/drivers/net/ethernet/amd/pcnet32.c b/drivers/net/ethernet/amd/pcnet32.c
index 20e6dab0186c..86b6d8e4e6cd 100644
--- a/drivers/net/ethernet/amd/pcnet32.c
+++ b/drivers/net/ethernet/amd/pcnet32.c
@@ -588,11 +588,11 @@ static void pcnet32_realloc_rx_ring(struct net_device *dev,
         /* now allocate any new buffers needed */
         for (; new < size; new++) {
                 struct sk_buff *rx_skbuff;
-                new_skb_list[new] = dev_alloc_skb(PKT_BUF_SKB);
+                new_skb_list[new] = netdev_alloc_skb(dev, PKT_BUF_SKB);
                 rx_skbuff = new_skb_list[new];
                 if (!rx_skbuff) {
                         /* keep the original lists and buffers */
-                        netif_err(lp, drv, dev, "%s dev_alloc_skb failed\n",
+                        netif_err(lp, drv, dev, "%s netdev_alloc_skb failed\n",
                                   __func__);
                         goto free_all_new;
                 }
@@ -909,7 +909,7 @@ static int pcnet32_loopback_test(struct net_device *dev, uint64_t * data1)
         /* Initialize Transmit buffers. */
         size = data_len + 15;
         for (x = 0; x < numbuffs; x++) {
-                skb = dev_alloc_skb(size);
+                skb = netdev_alloc_skb(dev, size);
                 if (!skb) {
                         netif_printk(lp, hw, KERN_DEBUG, dev,
                                      "Cannot allocate skb at line: %d!\n",
@@ -1152,7 +1152,7 @@ static void pcnet32_rx_entry(struct net_device *dev,
         if (pkt_len > rx_copybreak) {
                 struct sk_buff *newskb;
 
-                newskb = dev_alloc_skb(PKT_BUF_SKB);
+                newskb = netdev_alloc_skb(dev, PKT_BUF_SKB);
                 if (newskb) {
                         skb_reserve(newskb, NET_IP_ALIGN);
                         skb = lp->rx_skbuff[entry];
@@ -1172,7 +1172,7 @@ static void pcnet32_rx_entry(struct net_device *dev,
                 } else
                         skb = NULL;
         } else
-                skb = dev_alloc_skb(pkt_len + NET_IP_ALIGN);
+                skb = netdev_alloc_skb(dev, pkt_len + NET_IP_ALIGN);
 
         if (skb == NULL) {
                 netif_err(lp, drv, dev, "Memory squeeze, dropping packet\n");
@@ -1649,8 +1649,6 @@ pcnet32_probe1(unsigned long ioaddr, int shared, struct pci_dev *pdev)
 
         dev = alloc_etherdev(sizeof(*lp));
         if (!dev) {
-                if (pcnet32_debug & NETIF_MSG_PROBE)
-                        pr_err("Memory allocation failed\n");
                 ret = -ENOMEM;
                 goto err_release_region;
         }
@@ -2273,11 +2271,11 @@ static int pcnet32_init_ring(struct net_device *dev)
         for (i = 0; i < lp->rx_ring_size; i++) {
                 struct sk_buff *rx_skbuff = lp->rx_skbuff[i];
                 if (rx_skbuff == NULL) {
-                        lp->rx_skbuff[i] = dev_alloc_skb(PKT_BUF_SKB);
+                        lp->rx_skbuff[i] = netdev_alloc_skb(dev, PKT_BUF_SKB);
                         rx_skbuff = lp->rx_skbuff[i];
                         if (!rx_skbuff) {
                                 /* there is not much we can do at this point */
-                                netif_err(lp, drv, dev, "%s dev_alloc_skb failed\n",
+                                netif_err(lp, drv, dev, "%s netdev_alloc_skb failed\n",
                                           __func__);
                                 return -1;
                         }
diff --git a/drivers/net/ethernet/amd/sun3lance.c b/drivers/net/ethernet/amd/sun3lance.c
index 080b71fcc683..74b3891b6483 100644
--- a/drivers/net/ethernet/amd/sun3lance.c
+++ b/drivers/net/ethernet/amd/sun3lance.c
@@ -810,7 +810,7 @@ static int lance_rx( struct net_device *dev )
                                 dev->stats.rx_errors++;
                         }
                         else {
-                                skb = dev_alloc_skb( pkt_len+2 );
+                                skb = netdev_alloc_skb(dev, pkt_len + 2);
                                 if (skb == NULL) {
                                         DPRINTK( 1, ( "%s: Memory squeeze, deferring packet.\n",
                                                       dev->name ));
diff --git a/drivers/net/ethernet/amd/sunlance.c b/drivers/net/ethernet/amd/sunlance.c
index 7ea16d32a5f5..e3fe3504e198 100644
--- a/drivers/net/ethernet/amd/sunlance.c
+++ b/drivers/net/ethernet/amd/sunlance.c
@@ -534,7 +534,7 @@ static void lance_rx_dvma(struct net_device *dev)
                         if (bits & LE_R1_EOP) dev->stats.rx_errors++;
                 } else {
                         len = (rd->mblength & 0xfff) - 4;
-                        skb = dev_alloc_skb(len + 2);
+                        skb = netdev_alloc_skb(dev, len + 2);
 
                         if (skb == NULL) {
                                 printk(KERN_INFO "%s: Memory squeeze, deferring packet.\n",
@@ -706,7 +706,7 @@ static void lance_rx_pio(struct net_device *dev)
                         if (bits & LE_R1_EOP) dev->stats.rx_errors++;
                 } else {
                         len = (sbus_readw(&rd->mblength) & 0xfff) - 4;
-                        skb = dev_alloc_skb(len + 2);
+                        skb = netdev_alloc_skb(dev, len + 2);
 
                         if (skb == NULL) {
                                 printk(KERN_INFO "%s: Memory squeeze, deferring packet.\n",
diff --git a/drivers/net/ethernet/apple/bmac.c b/drivers/net/ethernet/apple/bmac.c
index d070b229dbf7..855bdafb1a87 100644
--- a/drivers/net/ethernet/apple/bmac.c
+++ b/drivers/net/ethernet/apple/bmac.c
@@ -607,8 +607,9 @@ bmac_init_tx_ring(struct bmac_data *bp)
 }
 
 static int
-bmac_init_rx_ring(struct bmac_data *bp)
+bmac_init_rx_ring(struct net_device *dev)
 {
+        struct bmac_data *bp = netdev_priv(dev);
         volatile struct dbdma_regs __iomem *rd = bp->rx_dma;
         int i;
         struct sk_buff *skb;
@@ -618,7 +619,7 @@ bmac_init_rx_ring(struct bmac_data *bp)
                (N_RX_RING + 1) * sizeof(struct dbdma_cmd));
         for (i = 0; i < N_RX_RING; i++) {
                 if ((skb = bp->rx_bufs[i]) == NULL) {
-                        bp->rx_bufs[i] = skb = dev_alloc_skb(RX_BUFLEN+2);
+                        bp->rx_bufs[i] = skb = netdev_alloc_skb(dev, RX_BUFLEN + 2);
                         if (skb != NULL)
                                 skb_reserve(skb, 2);
                 }
@@ -722,7 +723,7 @@ static irqreturn_t bmac_rxdma_intr(int irq, void *dev_id)
                         ++dev->stats.rx_dropped;
                 }
                 if ((skb = bp->rx_bufs[i]) == NULL) {
-                        bp->rx_bufs[i] = skb = dev_alloc_skb(RX_BUFLEN+2);
+                        bp->rx_bufs[i] = skb = netdev_alloc_skb(dev, RX_BUFLEN + 2);
                         if (skb != NULL)
                                 skb_reserve(bp->rx_bufs[i], 2);
                 }
@@ -1208,7 +1209,7 @@ static void bmac_reset_and_enable(struct net_device *dev)
         spin_lock_irqsave(&bp->lock, flags);
         bmac_enable_and_reset_chip(dev);
         bmac_init_tx_ring(bp);
-        bmac_init_rx_ring(bp);
+        bmac_init_rx_ring(dev);
         bmac_init_chip(dev);
         bmac_start_chip(dev);
         bmwrite(dev, INTDISABLE, EnableNormal);
@@ -1218,7 +1219,7 @@ static void bmac_reset_and_enable(struct net_device *dev)
          * It seems that the bmac can't receive until it's transmitted
          * a packet.  So we give it a dummy packet to transmit.
          */
-        skb = dev_alloc_skb(ETHERMINPACKET);
+        skb = netdev_alloc_skb(dev, ETHERMINPACKET);
         if (skb != NULL) {
                 data = skb_put(skb, ETHERMINPACKET);
                 memset(data, 0, ETHERMINPACKET);
@@ -1269,10 +1270,8 @@ static int __devinit bmac_probe(struct macio_dev *mdev, const struct of_device_i
         memcpy(addr, prop_addr, sizeof(addr));
 
         dev = alloc_etherdev(PRIV_BYTES);
-        if (!dev) {
-                printk(KERN_ERR "BMAC: alloc_etherdev failed, out of memory\n");
+        if (!dev)
                 return -ENOMEM;
-        }
 
         bp = netdev_priv(dev);
         SET_NETDEV_DEV(dev, &mdev->ofdev.dev);
@@ -1660,10 +1659,8 @@ static int __init bmac_init(void)
 {
         if (bmac_emergency_rxbuf == NULL) {
                 bmac_emergency_rxbuf = kmalloc(RX_BUFLEN, GFP_KERNEL);
-                if (bmac_emergency_rxbuf == NULL) {
-                        printk(KERN_ERR "BMAC: can't allocate emergency RX buffer\n");
+                if (bmac_emergency_rxbuf == NULL)
                         return -ENOMEM;
-                }
         }
 
         return macio_register_driver(&bmac_driver);
diff --git a/drivers/net/ethernet/apple/mace.c b/drivers/net/ethernet/apple/mace.c
index bec87bd9195c..e1df4b76c885 100644
--- a/drivers/net/ethernet/apple/mace.c
+++ b/drivers/net/ethernet/apple/mace.c
@@ -136,10 +136,8 @@ static int __devinit mace_probe(struct macio_dev *mdev, const struct of_device_i
          */
         if (dummy_buf == NULL) {
                 dummy_buf = kmalloc(RX_BUFLEN+2, GFP_KERNEL);
-                if (dummy_buf == NULL) {
-                        printk(KERN_ERR "MACE: couldn't allocate dummy buffer\n");
+                if (dummy_buf == NULL)
                         return -ENOMEM;
-                }
         }
 
         if (macio_request_resources(mdev, "mace")) {
@@ -149,7 +147,6 @@ static int __devinit mace_probe(struct macio_dev *mdev, const struct of_device_i
 
         dev = alloc_etherdev(PRIV_BYTES);
         if (!dev) {
-                printk(KERN_ERR "MACE: can't allocate ethernet device !\n");
                 rc = -ENOMEM;
                 goto err_release;
         }
@@ -447,7 +444,7 @@ static int mace_open(struct net_device *dev)
     memset((char *)mp->rx_cmds, 0, N_RX_RING * sizeof(struct dbdma_cmd));
     cp = mp->rx_cmds;
     for (i = 0; i < N_RX_RING - 1; ++i) {
-        skb = dev_alloc_skb(RX_BUFLEN + 2);
+        skb = netdev_alloc_skb(dev, RX_BUFLEN + 2);
         if (!skb) {
             data = dummy_buf;
         } else {
@@ -959,7 +956,7 @@ static irqreturn_t mace_rxdma_intr(int irq, void *dev_id)
         cp = mp->rx_cmds + i;
         skb = mp->rx_bufs[i];
         if (!skb) {
-            skb = dev_alloc_skb(RX_BUFLEN + 2);
+            skb = netdev_alloc_skb(dev, RX_BUFLEN + 2);
             if (skb) {
                 skb_reserve(skb, 2);
                 mp->rx_bufs[i] = skb;
diff --git a/drivers/net/ethernet/apple/macmace.c b/drivers/net/ethernet/apple/macmace.c
index 7cf81bbffe0e..ab7ff8645ab1 100644
--- a/drivers/net/ethernet/apple/macmace.c
+++ b/drivers/net/ethernet/apple/macmace.c
@@ -661,7 +661,7 @@ static void mace_dma_rx_frame(struct net_device *dev, struct mace_frame *mf)
         } else {
                 unsigned int frame_length = mf->rcvcnt + ((frame_status & 0x0F) << 8 );
 
-                skb = dev_alloc_skb(frame_length + 2);
+                skb = netdev_alloc_skb(dev, frame_length + 2);
                 if (!skb) {
                         dev->stats.rx_dropped++;
                         return;
diff --git a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
index b8591246eb4c..2c8ed70704aa 100644
--- a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
+++ b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
@@ -1765,7 +1765,7 @@ static int atl1c_alloc_rx_buffer(struct atl1c_adapter *adapter, const int ringid
         while (next_info->flags & ATL1C_BUFFER_FREE) {
                 rfd_desc = ATL1C_RFD_DESC(rfd_ring, rfd_next_to_use);
 
-                skb = dev_alloc_skb(adapter->rx_buffer_len);
+                skb = netdev_alloc_skb(adapter->netdev, adapter->rx_buffer_len);
                 if (unlikely(!skb)) {
                         if (netif_msg_rx_err(adapter))
                                 dev_warn(&pdev->dev, "alloc rx buffer failed\n");
@@ -2689,7 +2689,6 @@ static int __devinit atl1c_probe(struct pci_dev *pdev,
         netdev = alloc_etherdev(sizeof(struct atl1c_adapter));
         if (netdev == NULL) {
                 err = -ENOMEM;
-                dev_err(&pdev->dev, "etherdev alloc failed\n");
                 goto err_alloc_etherdev;
         }
 
diff --git a/drivers/net/ethernet/atheros/atl1e/atl1e_main.c b/drivers/net/ethernet/atheros/atl1e/atl1e_main.c
index c915c0873810..93ff2b231284 100644
--- a/drivers/net/ethernet/atheros/atl1e/atl1e_main.c
+++ b/drivers/net/ethernet/atheros/atl1e/atl1e_main.c
@@ -2300,7 +2300,6 @@ static int __devinit atl1e_probe(struct pci_dev *pdev,
         netdev = alloc_etherdev(sizeof(struct atl1e_adapter));
         if (netdev == NULL) {
                 err = -ENOMEM;
-                dev_err(&pdev->dev, "etherdev alloc failed\n");
                 goto err_alloc_etherdev;
         }
 
diff --git a/drivers/net/ethernet/broadcom/b44.c b/drivers/net/ethernet/broadcom/b44.c
index 3fb66d09ece5..66f53c797e3a 100644
--- a/drivers/net/ethernet/broadcom/b44.c
+++ b/drivers/net/ethernet/broadcom/b44.c
@@ -2138,7 +2138,6 @@ static int __devinit b44_init_one(struct ssb_device *sdev,
 
         dev = alloc_etherdev(sizeof(*bp));
         if (!dev) {
-                dev_err(sdev->dev, "Etherdev alloc failed, aborting\n");
                 err = -ENOMEM;
                 goto out;
         }
diff --git a/drivers/net/ethernet/broadcom/bnx2.c b/drivers/net/ethernet/broadcom/bnx2.c
index 021fb818007a..7105989ba658 100644
--- a/drivers/net/ethernet/broadcom/bnx2.c
+++ b/drivers/net/ethernet/broadcom/bnx2.c
@@ -2625,10 +2625,8 @@ bnx2_alloc_bad_rbuf(struct bnx2 *bp)
         u32 val;
 
         good_mbuf = kmalloc(512 * sizeof(u16), GFP_KERNEL);
-        if (good_mbuf == NULL) {
-                pr_err("Failed to allocate memory in %s\n", __func__);
+        if (good_mbuf == NULL)
                 return -ENOMEM;
-        }
 
         REG_WR(bp, BNX2_MISC_ENABLE_SET_BITS,
                 BNX2_MISC_ENABLE_SET_BITS_RX_MBUF_ENABLE);
@@ -6248,7 +6246,16 @@ static int
 bnx2_setup_int_mode(struct bnx2 *bp, int dis_msi)
 {
         int cpus = num_online_cpus();
-        int msix_vecs = min(cpus + 1, RX_MAX_RINGS);
+        int msix_vecs;
+
+        if (!bp->num_req_rx_rings)
+                msix_vecs = max(cpus + 1, bp->num_req_tx_rings);
+        else if (!bp->num_req_tx_rings)
+                msix_vecs = max(cpus, bp->num_req_rx_rings);
+        else
+                msix_vecs = max(bp->num_req_rx_rings, bp->num_req_tx_rings);
+
+        msix_vecs = min(msix_vecs, RX_MAX_RINGS);
 
         bp->irq_tbl[0].handler = bnx2_interrupt;
         strcpy(bp->irq_tbl[0].name, bp->dev->name);
@@ -6272,10 +6279,18 @@ bnx2_setup_int_mode(struct bnx2 *bp, int dis_msi)
                 }
         }
 
-        bp->num_tx_rings = rounddown_pow_of_two(bp->irq_nvecs);
+        if (!bp->num_req_tx_rings)
+                bp->num_tx_rings = rounddown_pow_of_two(bp->irq_nvecs);
+        else
+                bp->num_tx_rings = min(bp->irq_nvecs, bp->num_req_tx_rings);
+
+        if (!bp->num_req_rx_rings)
+                bp->num_rx_rings = bp->irq_nvecs;
+        else
+                bp->num_rx_rings = min(bp->irq_nvecs, bp->num_req_rx_rings);
+
         netif_set_real_num_tx_queues(bp->dev, bp->num_tx_rings);
 
-        bp->num_rx_rings = bp->irq_nvecs;
         return netif_set_real_num_rx_queues(bp->dev, bp->num_rx_rings);
 }
 
@@ -6550,6 +6565,9 @@ bnx2_start_xmit(struct sk_buff *skb, struct net_device *dev)
         }
         txbd->tx_bd_vlan_tag_flags |= TX_BD_FLAGS_END;
 
+        /* Sync BD data before updating TX mailbox */
+        wmb();
+
         netdev_tx_sent_queue(txq, skb->len);
 
         prod = NEXT_TX_BD(prod);
@@ -7164,7 +7182,7 @@ bnx2_get_ringparam(struct net_device *dev, struct ethtool_ringparam *ering)
 }
 
 static int
-bnx2_change_ring_size(struct bnx2 *bp, u32 rx, u32 tx)
+bnx2_change_ring_size(struct bnx2 *bp, u32 rx, u32 tx, bool reset_irq)
 {
         if (netif_running(bp->dev)) {
                 /* Reset will erase chipset stats; save them */
@@ -7172,7 +7190,12 @@ bnx2_change_ring_size(struct bnx2 *bp, u32 rx, u32 tx)
 
                 bnx2_netif_stop(bp, true);
                 bnx2_reset_chip(bp, BNX2_DRV_MSG_CODE_RESET);
-                __bnx2_free_irq(bp);
+                if (reset_irq) {
+                        bnx2_free_irq(bp);
+                        bnx2_del_napi(bp);
+                } else {
+                        __bnx2_free_irq(bp);
+                }
                 bnx2_free_skbs(bp);
                 bnx2_free_mem(bp);
         }
@@ -7181,9 +7204,16 @@ bnx2_change_ring_size(struct bnx2 *bp, u32 rx, u32 tx)
         bp->tx_ring_size = tx;
 
         if (netif_running(bp->dev)) {
-                int rc;
+                int rc = 0;
+
+                if (reset_irq) {
+                        rc = bnx2_setup_int_mode(bp, disable_msi);
+                        bnx2_init_napi(bp);
+                }
+
+                if (!rc)
+                        rc = bnx2_alloc_mem(bp);
 
-                rc = bnx2_alloc_mem(bp);
                 if (!rc)
                         rc = bnx2_request_irq(bp);
 
@@ -7219,7 +7249,8 @@ bnx2_set_ringparam(struct net_device *dev, struct ethtool_ringparam *ering)
 
                 return -EINVAL;
         }
-        rc = bnx2_change_ring_size(bp, ering->rx_pending, ering->tx_pending);
+        rc = bnx2_change_ring_size(bp, ering->rx_pending, ering->tx_pending,
+                                   false);
         return rc;
 }
 
@@ -7607,6 +7638,54 @@ bnx2_set_features(struct net_device *dev, netdev_features_t features)
         return 0;
 }
 
+static void bnx2_get_channels(struct net_device *dev,
+                              struct ethtool_channels *channels)
+{
+        struct bnx2 *bp = netdev_priv(dev);
+        u32 max_rx_rings = 1;
+        u32 max_tx_rings = 1;
+
+        if ((bp->flags & BNX2_FLAG_MSIX_CAP) && !disable_msi) {
+                max_rx_rings = RX_MAX_RINGS;
+                max_tx_rings = TX_MAX_RINGS;
+        }
+
+        channels->max_rx = max_rx_rings;
+        channels->max_tx = max_tx_rings;
+        channels->max_other = 0;
+        channels->max_combined = 0;
+        channels->rx_count = bp->num_rx_rings;
+        channels->tx_count = bp->num_tx_rings;
+        channels->other_count = 0;
+        channels->combined_count = 0;
+}
+
+static int bnx2_set_channels(struct net_device *dev,
+                              struct ethtool_channels *channels)
+{
+        struct bnx2 *bp = netdev_priv(dev);
+        u32 max_rx_rings = 1;
+        u32 max_tx_rings = 1;
+        int rc = 0;
+
+        if ((bp->flags & BNX2_FLAG_MSIX_CAP) && !disable_msi) {
+                max_rx_rings = RX_MAX_RINGS;
+                max_tx_rings = TX_MAX_RINGS;
+        }
+        if (channels->rx_count > max_rx_rings ||
+            channels->tx_count > max_tx_rings)
+                return -EINVAL;
+
+        bp->num_req_rx_rings = channels->rx_count;
+        bp->num_req_tx_rings = channels->tx_count;
+
+        if (netif_running(dev))
+                rc = bnx2_change_ring_size(bp, bp->rx_ring_size,
+                                           bp->tx_ring_size, true);
+
+        return rc;
+}
+
 static const struct ethtool_ops bnx2_ethtool_ops = {
         .get_settings           = bnx2_get_settings,
         .set_settings           = bnx2_set_settings,
@@ -7631,6 +7710,8 @@ static const struct ethtool_ops bnx2_ethtool_ops = {
         .set_phys_id            = bnx2_set_phys_id,
         .get_ethtool_stats      = bnx2_get_ethtool_stats,
         .get_sset_count         = bnx2_get_sset_count,
+        .get_channels           = bnx2_get_channels,
+        .set_channels           = bnx2_set_channels,
 };
 
 /* Called with rtnl_lock */
@@ -7712,7 +7793,8 @@ bnx2_change_mtu(struct net_device *dev, int new_mtu)
                 return -EINVAL;
 
         dev->mtu = new_mtu;
-        return bnx2_change_ring_size(bp, bp->rx_ring_size, bp->tx_ring_size);
+        return bnx2_change_ring_size(bp, bp->rx_ring_size, bp->tx_ring_size,
+                                     false);
 }
 
 #ifdef CONFIG_NET_POLL_CONTROLLER
diff --git a/drivers/net/ethernet/broadcom/bnx2.h b/drivers/net/ethernet/broadcom/bnx2.h
index 1db2d51ba3f1..dc06bda73be7 100644
--- a/drivers/net/ethernet/broadcom/bnx2.h
+++ b/drivers/net/ethernet/broadcom/bnx2.h
@@ -6933,6 +6933,9 @@ struct bnx2 {
         u8                      num_tx_rings;
         u8                      num_rx_rings;
 
+        int                     num_req_tx_rings;
+        int                     num_req_rx_rings;
+
         u32                     leds_save;
         u32                     idle_chk_status_idx;
 
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
index 8c73d34b2ff1..7d184fbffaf6 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
@@ -1,6 +1,6 @@
 /* bnx2x.h: Broadcom Everest network driver.
  *
- * Copyright (c) 2007-2011 Broadcom Corporation
+ * Copyright (c) 2007-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
@@ -23,8 +23,8 @@
  * (you will need to reboot afterwards) */
 /* #define BNX2X_STOP_ON_ERROR */
 
-#define DRV_MODULE_VERSION      "1.70.35-0"
-#define DRV_MODULE_RELDATE      "2011/11/10"
+#define DRV_MODULE_VERSION      "1.72.00-0"
+#define DRV_MODULE_RELDATE      "2012/01/26"
 #define BNX2X_BC_VER            0x040200
 
 #if defined(CONFIG_DCB)
@@ -1088,7 +1088,8 @@ enum bnx2x_recovery_state {
         BNX2X_RECOVERY_DONE,
         BNX2X_RECOVERY_INIT,
         BNX2X_RECOVERY_WAIT,
-        BNX2X_RECOVERY_FAILED
+        BNX2X_RECOVERY_FAILED,
+        BNX2X_RECOVERY_NIC_LOADING
 };
 
 /*
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
index 7aee46983be4..518ec5c6872d 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
@@ -1,6 +1,6 @@
 /* bnx2x_cmn.c: Broadcom Everest network driver.
  *
- * Copyright (c) 2007-2011 Broadcom Corporation
+ * Copyright (c) 2007-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
@@ -1766,12 +1766,27 @@ int bnx2x_nic_load(struct bnx2x *bp, int load_mode)
 
         bnx2x_napi_enable(bp);
 
+        /* set pf load just before approaching the MCP */
+        bnx2x_set_pf_load(bp);
+
         /* Send LOAD_REQUEST command to MCP
          * Returns the type of LOAD command:
          * if it is the first port to be initialized
          * common blocks should be initialized, otherwise - not
          */
         if (!BP_NOMCP(bp)) {
+                /* init fw_seq */
+                bp->fw_seq =
+                        (SHMEM_RD(bp, func_mb[BP_FW_MB_IDX(bp)].drv_mb_header) &
+                         DRV_MSG_SEQ_NUMBER_MASK);
+                BNX2X_DEV_INFO("fw_seq 0x%08x\n", bp->fw_seq);
+
+                /* Get current FW pulse sequence */
+                bp->fw_drv_pulse_wr_seq =
+                        (SHMEM_RD(bp, func_mb[BP_FW_MB_IDX(bp)].drv_pulse_mb) &
+                         DRV_PULSE_SEQ_MASK);
+                BNX2X_DEV_INFO("drv_pulse 0x%x\n", bp->fw_drv_pulse_wr_seq);
+
                 load_code = bnx2x_fw_command(bp, DRV_MSG_CODE_LOAD_REQ, 0);
                 if (!load_code) {
                         BNX2X_ERR("MCP response failure, aborting\n");
@@ -1782,6 +1797,29 @@ int bnx2x_nic_load(struct bnx2x *bp, int load_mode)
                         rc = -EBUSY; /* other port in diagnostic mode */
                         LOAD_ERROR_EXIT(bp, load_error1);
                 }
+                if (load_code != FW_MSG_CODE_DRV_LOAD_COMMON_CHIP &&
+                    load_code != FW_MSG_CODE_DRV_LOAD_COMMON) {
+                        /* build FW version dword */
+                        u32 my_fw = (BCM_5710_FW_MAJOR_VERSION) +
+                                        (BCM_5710_FW_MINOR_VERSION << 8) +
+                                        (BCM_5710_FW_REVISION_VERSION << 16) +
+                                        (BCM_5710_FW_ENGINEERING_VERSION << 24);
+
+                        /* read loaded FW from chip */
+                        u32 loaded_fw = REG_RD(bp, XSEM_REG_PRAM);
+
+                        DP(BNX2X_MSG_SP, "loaded fw %x, my fw %x",
+                           loaded_fw, my_fw);
+
+                        /* abort nic load if version mismatch */
+                        if (my_fw != loaded_fw) {
+                                BNX2X_ERR("bnx2x with FW %x already loaded, "
+                                          "which mismatches my %x FW. aborting",
+                                          loaded_fw, my_fw);
+                                rc = -EBUSY;
+                                LOAD_ERROR_EXIT(bp, load_error2);
+                        }
+                }
 
         } else {
                 int path = BP_PATH(bp);
@@ -1948,7 +1986,6 @@ int bnx2x_nic_load(struct bnx2x *bp, int load_mode)
         if (bp->state == BNX2X_STATE_OPEN)
                 bnx2x_cnic_notify(bp, CNIC_CTL_START_CMD);
 #endif
-        bnx2x_inc_load_cnt(bp);
 
         /* Wait for all pending SP commands to complete */
         if (!bnx2x_wait_sp_comp(bp, ~0x0UL)) {
@@ -1988,6 +2025,8 @@ load_error2:
         bp->port.pmf = 0;
 load_error1:
         bnx2x_napi_disable(bp);
+        /* clear pf_load status, as it was already set */
+        bnx2x_clear_pf_load(bp);
 load_error0:
         bnx2x_free_mem(bp);
 
@@ -2108,7 +2147,7 @@ int bnx2x_nic_unload(struct bnx2x *bp, int unload_mode)
         /* The last driver must disable a "close the gate" if there is no
          * parity attention or "process kill" pending.
          */
-        if (!bnx2x_dec_load_cnt(bp) && bnx2x_reset_is_done(bp, BP_PATH(bp)))
+        if (!bnx2x_clear_pf_load(bp) && bnx2x_reset_is_done(bp, BP_PATH(bp)))
                 bnx2x_disable_close_the_gate(bp);
 
         return 0;
@@ -3414,7 +3453,7 @@ int bnx2x_change_mtu(struct net_device *dev, int new_mtu)
         struct bnx2x *bp = netdev_priv(dev);
 
         if (bp->recovery_state != BNX2X_RECOVERY_DONE) {
-                pr_err("Handling parity error recovery. Try again later\n");
+                netdev_err(dev, "Handling parity error recovery. Try again later\n");
                 return -EAGAIN;
         }
 
@@ -3541,7 +3580,7 @@ int bnx2x_resume(struct pci_dev *pdev)
         bp = netdev_priv(dev);
 
         if (bp->recovery_state != BNX2X_RECOVERY_DONE) {
-                pr_err("Handling parity error recovery. Try again later\n");
+                netdev_err(dev, "Handling parity error recovery. Try again later\n");
                 return -EAGAIN;
         }
 
@@ -3557,8 +3596,6 @@ int bnx2x_resume(struct pci_dev *pdev)
         bnx2x_set_power_state(bp, PCI_D0);
         netif_device_attach(dev);
 
-        /* Since the chip was reset, clear the FW sequence number */
-        bp->fw_seq = 0;
         rc = bnx2x_nic_load(bp, LOAD_OPEN);
 
         rtnl_unlock();
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
index bf27c54ff2e0..c7c7bf1e573a 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
@@ -1,6 +1,6 @@
 /* bnx2x_cmn.h: Broadcom Everest network driver.
  *
- * Copyright (c) 2007-2011 Broadcom Corporation
+ * Copyright (c) 2007-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
@@ -379,8 +379,8 @@ void bnx2x_set_q_rx_mode(struct bnx2x *bp, u8 cl_id,
                          unsigned long ramrod_flags);
 
 /* Parity errors related */
-void bnx2x_inc_load_cnt(struct bnx2x *bp);
-u32 bnx2x_dec_load_cnt(struct bnx2x *bp);
+void bnx2x_set_pf_load(struct bnx2x *bp);
+bool bnx2x_clear_pf_load(struct bnx2x *bp);
 bool bnx2x_chk_parity_attn(struct bnx2x *bp, bool *global, bool print);
 bool bnx2x_reset_is_done(struct bnx2x *bp, int engine);
 void bnx2x_set_reset_in_progress(struct bnx2x *bp);
@@ -984,10 +984,11 @@ static inline int bnx2x_func_start(struct bnx2x *bp)
         /* Function parameters */
         start_params->mf_mode = bp->mf_mode;
         start_params->sd_vlan_tag = bp->mf_ov;
-        if (CHIP_IS_E1x(bp))
-                start_params->network_cos_mode = OVERRIDE_COS;
-        else
+
+        if (CHIP_IS_E2(bp) || CHIP_IS_E3(bp))
                 start_params->network_cos_mode = STATIC_COS;
+        else /* CHIP_IS_E1X */
+                start_params->network_cos_mode = FW_WRR;
 
         return bnx2x_func_state_change(bp, &func_params);
 }
@@ -1539,7 +1540,7 @@ static inline void bnx2x_update_drv_flags(struct bnx2x *bp, u32 flags, u32 set)
 {
         if (SHMEM2_HAS(bp, drv_flags)) {
                 u32 drv_flags;
-                bnx2x_acquire_hw_lock(bp, HW_LOCK_DRV_FLAGS);
+                bnx2x_acquire_hw_lock(bp, HW_LOCK_RESOURCE_DRV_FLAGS);
                 drv_flags = SHMEM2_RD(bp, drv_flags);
 
                 if (set)
@@ -1549,7 +1550,7 @@ static inline void bnx2x_update_drv_flags(struct bnx2x *bp, u32 flags, u32 set)
 
                 SHMEM2_WR(bp, drv_flags, drv_flags);
                 DP(NETIF_MSG_HW, "drv_flags 0x%08x\n", drv_flags);
-                bnx2x_release_hw_lock(bp, HW_LOCK_DRV_FLAGS);
+                bnx2x_release_hw_lock(bp, HW_LOCK_RESOURCE_DRV_FLAGS);
         }
 }
 
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c
index 5051cf3deb20..9a9bd3ab4793 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c
@@ -1,6 +1,6 @@
 /* bnx2x_dcb.c: Broadcom Everest network driver.
  *
- * Copyright 2009-2011 Broadcom Corporation
+ * Copyright 2009-2012 Broadcom Corporation
  *
  * Unless you and Broadcom execute a separate written software license
  * agreement governing use of this software, this software is licensed to you
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.h
index 2ab9254e2d5e..06c7a0435948 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.h
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.h
@@ -1,6 +1,6 @@
 /* bnx2x_dcb.h: Broadcom Everest network driver.
  *
- * Copyright 2009-2011 Broadcom Corporation
+ * Copyright 2009-2012 Broadcom Corporation
  *
  * Unless you and Broadcom execute a separate written software license
  * agreement governing use of this software, this software is licensed to you
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_dump.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_dump.h
index b983825d0ee9..3e4cff9b1ebe 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_dump.h
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_dump.h
@@ -1,6 +1,6 @@
 /* bnx2x_dump.h: Broadcom Everest network driver.
  *
- * Copyright (c) 2011 Broadcom Corporation
+ * Copyright (c) 2012 Broadcom Corporation
  *
  * Unless you and Broadcom execute a separate written software license
  * agreement governing use of this software, this software is licensed to you
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c
index 31a8b38ab15e..137968d33d1e 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c
@@ -1,6 +1,6 @@
 /* bnx2x_ethtool.c: Broadcom Everest network driver.
  *
- * Copyright (c) 2007-2011 Broadcom Corporation
+ * Copyright (c) 2007-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
@@ -175,7 +175,11 @@ static const struct {
         { STATS_OFFSET32(total_tpa_aggregated_frames_hi),
                         8, STATS_FLAGS_FUNC, "tpa_aggregated_frames"},
         { STATS_OFFSET32(total_tpa_bytes_hi),
-                        8, STATS_FLAGS_FUNC, "tpa_bytes"}
+                        8, STATS_FLAGS_FUNC, "tpa_bytes"},
+        { STATS_OFFSET32(recoverable_error),
+                        4, STATS_FLAGS_FUNC, "recoverable_errors" },
+        { STATS_OFFSET32(unrecoverable_error),
+                        4, STATS_FLAGS_FUNC, "unrecoverable_errors" },
 };
 
 #define BNX2X_NUM_STATS         ARRAY_SIZE(bnx2x_stats_arr)
@@ -882,11 +886,27 @@ static int bnx2x_get_eeprom_len(struct net_device *dev)
         return bp->common.flash_size;
 }
 
+/* Per pf misc lock must be aquired before the per port mcp lock. Otherwise, had
+ * we done things the other way around, if two pfs from the same port would
+ * attempt to access nvram at the same time, we could run into a scenario such
+ * as:
+ * pf A takes the port lock.
+ * pf B succeeds in taking the same lock since they are from the same port.
+ * pf A takes the per pf misc lock. Performs eeprom access.
+ * pf A finishes. Unlocks the per pf misc lock.
+ * Pf B takes the lock and proceeds to perform it's own access.
+ * pf A unlocks the per port lock, while pf B is still working (!).
+ * mcp takes the per port lock and corrupts pf B's access (and/or has it's own
+ * acess corrupted by pf B).*
+ */
 static int bnx2x_acquire_nvram_lock(struct bnx2x *bp)
 {
         int port = BP_PORT(bp);
         int count, i;
-        u32 val = 0;
+        u32 val;
+
+        /* acquire HW lock: protect against other PFs in PF Direct Assignment */
+        bnx2x_acquire_hw_lock(bp, HW_LOCK_RESOURCE_NVRAM);
 
         /* adjust timeout for emulation/FPGA */
         count = BNX2X_NVRAM_TIMEOUT_COUNT;
@@ -917,7 +937,7 @@ static int bnx2x_release_nvram_lock(struct bnx2x *bp)
 {
         int port = BP_PORT(bp);
         int count, i;
-        u32 val = 0;
+        u32 val;
 
         /* adjust timeout for emulation/FPGA */
         count = BNX2X_NVRAM_TIMEOUT_COUNT;
@@ -941,6 +961,8 @@ static int bnx2x_release_nvram_lock(struct bnx2x *bp)
                 return -EBUSY;
         }
 
+        /* release HW lock: protect against other PFs in PF Direct Assignment */
+        bnx2x_release_hw_lock(bp, HW_LOCK_RESOURCE_NVRAM);
         return 0;
 }
 
@@ -1370,7 +1392,8 @@ static int bnx2x_set_ringparam(struct net_device *dev,
         struct bnx2x *bp = netdev_priv(dev);
 
         if (bp->recovery_state != BNX2X_RECOVERY_DONE) {
-                pr_err("Handling parity error recovery. Try again later\n");
+                netdev_err(dev, "Handling parity error recovery. "
+                                "Try again later\n");
                 return -EAGAIN;
         }
 
@@ -2024,7 +2047,8 @@ static void bnx2x_self_test(struct net_device *dev,
         struct bnx2x *bp = netdev_priv(dev);
         u8 is_serdes;
         if (bp->recovery_state != BNX2X_RECOVERY_DONE) {
-                pr_err("Handling parity error recovery. Try again later\n");
+                netdev_err(bp->dev, "Handling parity error recovery. "
+                                    "Try again later\n");
                 etest->flags |= ETH_TEST_FL_FAILED;
                 return;
         }
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_fw_defs.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_fw_defs.h
index 998652a1b858..e5c5982ae06d 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_fw_defs.h
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_fw_defs.h
@@ -1,6 +1,6 @@
 /* bnx2x_fw_defs.h: Broadcom Everest network driver.
  *
- * Copyright (c) 2007-2011 Broadcom Corporation
+ * Copyright (c) 2007-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
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_fw_file_hdr.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_fw_file_hdr.h
index f4a07fbaed05..4bed52ba300d 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_fw_file_hdr.h
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_fw_file_hdr.h
@@ -1,6 +1,6 @@
 /* bnx2x_fw_file_hdr.h: FW binary file header structure.
  *
- * Copyright (c) 2007-2011 Broadcom Corporation
+ * Copyright (c) 2007-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
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h
index 3e30c8642c26..78b77de728b0 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h
@@ -1,6 +1,6 @@
 /* bnx2x_hsi.h: Broadcom Everest network driver.
  *
- * Copyright (c) 2007-2011 Broadcom Corporation
+ * Copyright (c) 2007-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
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_init.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_init.h
index 4d748e77d1ac..29f5c3cca31a 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_init.h
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_init.h
@@ -1,7 +1,7 @@
 /* bnx2x_init.h: Broadcom Everest network driver.
  *               Structures and macroes needed during the initialization.
  *
- * Copyright (c) 2007-2011 Broadcom Corporation
+ * Copyright (c) 2007-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
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_init_ops.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_init_ops.h
index 7ec1724753ad..fe66d902dc62 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_init_ops.h
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_init_ops.h
@@ -2,7 +2,7 @@
  *               Static functions needed during the initialization.
  *               This file is "included" in bnx2x_main.c.
  *
- * Copyright (c) 2007-2011 Broadcom Corporation
+ * Copyright (c) 2007-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
@@ -69,12 +69,12 @@ static void bnx2x_write_big_buf(struct bnx2x *bp, u32 addr, u32 len,
 {
         if (bp->dmae_ready)
                 bnx2x_write_dmae_phys_len(bp, GUNZIP_PHYS(bp), addr, len);
-        else if (wb)
-                /*
-                 * Wide bus registers with no dmae need to be written
-                 * using indirect write.
-                 */
+
+        /* in E1 chips BIOS initiated ZLR may interrupt widebus writes */
+        else if (wb && CHIP_IS_E1(bp))
                 bnx2x_init_ind_wr(bp, addr, GUNZIP_BUF(bp), len);
+
+        /* in later chips PXP root complex handles BIOS ZLR w/o interrupting */
         else
                 bnx2x_init_str_wr(bp, addr, GUNZIP_BUF(bp), len);
 }
@@ -99,8 +99,14 @@ static void bnx2x_write_big_buf_wb(struct bnx2x *bp, u32 addr, u32 len)
 {
         if (bp->dmae_ready)
                 bnx2x_write_dmae_phys_len(bp, GUNZIP_PHYS(bp), addr, len);
-        else
+
+        /* in E1 chips BIOS initiated ZLR may interrupt widebus writes */
+        else if (CHIP_IS_E1(bp))
                 bnx2x_init_ind_wr(bp, addr, GUNZIP_BUF(bp), len);
+
+        /* in later chips PXP root complex handles BIOS ZLR w/o interrupting */
+        else
+                bnx2x_init_str_wr(bp, addr, GUNZIP_BUF(bp), len);
 }
 
 static void bnx2x_init_wr_64(struct bnx2x *bp, u32 addr,
@@ -177,8 +183,14 @@ static void bnx2x_init_wr_wb(struct bnx2x *bp, u32 addr,
 {
         if (bp->dmae_ready)
                 VIRT_WR_DMAE_LEN(bp, data, addr, len, 0);
-        else
+
+        /* in E1 chips BIOS initiated ZLR may interrupt widebus writes */
+        else if (CHIP_IS_E1(bp))
                 bnx2x_init_ind_wr(bp, addr, data, len);
+
+        /* in later chips PXP root complex handles BIOS ZLR w/o interrupting */
+        else
+                bnx2x_init_str_wr(bp, addr, data, len);
 }
 
 static void bnx2x_wr_64(struct bnx2x *bp, u32 reg, u32 val_lo,
@@ -840,25 +852,15 @@ static void bnx2x_qm_init_cid_count(struct bnx2x *bp, int qm_cid_count,
         }
 }
 
-static void bnx2x_qm_set_ptr_table(struct bnx2x *bp, int qm_cid_count)
+static void bnx2x_qm_set_ptr_table(struct bnx2x *bp, int qm_cid_count,
+                                   u32 base_reg, u32 reg)
 {
         int i;
-        u32 wb_data[2];
-
-        wb_data[0] = wb_data[1] = 0;
-
+        u32 wb_data[2] = {0, 0};
         for (i = 0; i < 4 * QM_QUEUES_PER_FUNC; i++) {
-                REG_WR(bp, QM_REG_BASEADDR + i*4,
+                REG_WR(bp, base_reg + i*4,
                        qm_cid_count * 4 * (i % QM_QUEUES_PER_FUNC));
-                bnx2x_init_ind_wr(bp, QM_REG_PTRTBL + i*8,
-                                  wb_data, 2);
-
-                if (CHIP_IS_E1H(bp)) {
-                        REG_WR(bp, QM_REG_BASEADDR_EXT_A + i*4,
-                               qm_cid_count * 4 * (i % QM_QUEUES_PER_FUNC));
-                        bnx2x_init_ind_wr(bp, QM_REG_PTRTBL_EXT_A + i*8,
-                                          wb_data, 2);
-                }
+                bnx2x_init_wr_wb(bp, reg + i*8,  wb_data, 2);
         }
 }
 
@@ -873,7 +875,12 @@ static void bnx2x_qm_init_ptr_table(struct bnx2x *bp, int qm_cid_count,
         case INITOP_INIT:
                 /* set in the init-value array */
         case INITOP_SET:
-                bnx2x_qm_set_ptr_table(bp, qm_cid_count);
+                bnx2x_qm_set_ptr_table(bp, qm_cid_count,
+                                       QM_REG_BASEADDR, QM_REG_PTRTBL);
+                if (CHIP_IS_E1H(bp))
+                        bnx2x_qm_set_ptr_table(bp, qm_cid_count,
+                                               QM_REG_BASEADDR_EXT_A,
+                                               QM_REG_PTRTBL_EXT_A);
                 break;
         case INITOP_CLEAR:
                 break;
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
index 2091e5dbbcdd..2102ad593c14 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
@@ -1,4 +1,4 @@
-/* Copyright 2008-2011 Broadcom Corporation
+/* Copyright 2008-2012 Broadcom Corporation
  *
  * Unless you and Broadcom execute a separate written software license
  * agreement governing use of this software, this software is licensed to you
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.h
index e02a68a7fb85..9cc7bafb3dfe 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.h
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.h
@@ -1,4 +1,4 @@
-/* Copyright 2008-2011 Broadcom Corporation
+/* Copyright 2008-2012 Broadcom Corporation
  *
  * Unless you and Broadcom execute a separate written software license
  * agreement governing use of this software, this software is licensed to you
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
index 1e3f978ee6da..ff19c3cf4409 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
@@ -1,6 +1,6 @@
 /* bnx2x_main.c: Broadcom Everest network driver.
  *
- * Copyright (c) 2007-2011 Broadcom Corporation
+ * Copyright (c) 2007-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
@@ -468,7 +468,9 @@ static int bnx2x_issue_dmae_with_comp(struct bnx2x *bp,
         while ((*wb_comp & ~DMAE_PCI_ERR_FLAG) != DMAE_COMP_VAL) {
                 DP(BNX2X_MSG_OFF, "wb_comp 0x%08x\n", *wb_comp);
 
-                if (!cnt) {
+                if (!cnt ||
+                    (bp->recovery_state != BNX2X_RECOVERY_DONE &&
+                     bp->recovery_state != BNX2X_RECOVERY_NIC_LOADING)) {
                         BNX2X_ERR("DMAE timeout!\n");
                         rc = DMAE_TIMEOUT;
                         goto unlock;
@@ -498,9 +500,13 @@ void bnx2x_write_dmae(struct bnx2x *bp, dma_addr_t dma_addr, u32 dst_addr,
         if (!bp->dmae_ready) {
                 u32 *data = bnx2x_sp(bp, wb_data[0]);
 
-                DP(BNX2X_MSG_OFF, "DMAE is not ready (dst_addr %08x  len32 %d)"
-                   "  using indirect\n", dst_addr, len32);
-                bnx2x_init_ind_wr(bp, dst_addr, data, len32);
+                DP(BNX2X_MSG_OFF,
+                   "DMAE is not ready (dst_addr %08x len32 %d) using indirect\n",
+                   dst_addr, len32);
+                if (CHIP_IS_E1(bp))
+                        bnx2x_init_ind_wr(bp, dst_addr, data, len32);
+                else
+                        bnx2x_init_str_wr(bp, dst_addr, data, len32);
                 return;
         }
 
@@ -528,10 +534,16 @@ void bnx2x_read_dmae(struct bnx2x *bp, u32 src_addr, u32 len32)
                 u32 *data = bnx2x_sp(bp, wb_data[0]);
                 int i;
 
-                DP(BNX2X_MSG_OFF, "DMAE is not ready (src_addr %08x  len32 %d)"
-                   "  using indirect\n", src_addr, len32);
-                for (i = 0; i < len32; i++)
-                        data[i] = bnx2x_reg_rd_ind(bp, src_addr + i*4);
+                if (CHIP_IS_E1(bp)) {
+                        DP(BNX2X_MSG_OFF,
+                           "DMAE is not ready (src_addr %08x len32 %d) using indirect\n",
+                           src_addr, len32);
+                        for (i = 0; i < len32; i++)
+                                data[i] = bnx2x_reg_rd_ind(bp, src_addr + i*4);
+                } else
+                        for (i = 0; i < len32; i++)
+                                data[i] = REG_RD(bp, src_addr + i*4);
+
                 return;
         }
 
@@ -772,6 +784,7 @@ void bnx2x_panic_dump(struct bnx2x *bp)
 #endif
 
         bp->stats_state = STATS_STATE_DISABLED;
+        bp->eth_stats.unrecoverable_error++;
         DP(BNX2X_MSG_STATS, "stats_state - DISABLED\n");
 
         BNX2X_ERR("begin crash dump -----------------\n");
@@ -1007,8 +1020,8 @@ void bnx2x_panic_dump(struct bnx2x *bp)
  * initialization.
  */
 #define FLR_WAIT_USEC           10000   /* 10 miliseconds */
-#define FLR_WAIT_INTERAVAL      50      /* usec */
-#define FLR_POLL_CNT            (FLR_WAIT_USEC/FLR_WAIT_INTERAVAL) /* 200 */
+#define FLR_WAIT_INTERVAL       50      /* usec */
+#define FLR_POLL_CNT            (FLR_WAIT_USEC/FLR_WAIT_INTERVAL) /* 200 */
 
 struct pbf_pN_buf_regs {
         int pN;
@@ -1041,7 +1054,7 @@ static void bnx2x_pbf_pN_buf_flushed(struct bnx2x *bp,
         while ((crd != init_crd) && ((u32)SUB_S32(crd_freed, crd_freed_start) <
                (init_crd - crd_start))) {
                 if (cur_cnt--) {
-                        udelay(FLR_WAIT_INTERAVAL);
+                        udelay(FLR_WAIT_INTERVAL);
                         crd = REG_RD(bp, regs->crd);
                         crd_freed = REG_RD(bp, regs->crd_freed);
                 } else {
@@ -1055,7 +1068,7 @@ static void bnx2x_pbf_pN_buf_flushed(struct bnx2x *bp,
                 }
         }
         DP(BNX2X_MSG_SP, "Waited %d*%d usec for PBF tx buffer[%d]\n",
-           poll_count-cur_cnt, FLR_WAIT_INTERAVAL, regs->pN);
+           poll_count-cur_cnt, FLR_WAIT_INTERVAL, regs->pN);
 }
 
 static void bnx2x_pbf_pN_cmd_flushed(struct bnx2x *bp,
@@ -1073,7 +1086,7 @@ static void bnx2x_pbf_pN_cmd_flushed(struct bnx2x *bp,
 
         while (occup && ((u32)SUB_S32(freed, freed_start) < to_free)) {
                 if (cur_cnt--) {
-                        udelay(FLR_WAIT_INTERAVAL);
+                        udelay(FLR_WAIT_INTERVAL);
                         occup = REG_RD(bp, regs->lines_occup);
                         freed = REG_RD(bp, regs->lines_freed);
                 } else {
@@ -1087,7 +1100,7 @@ static void bnx2x_pbf_pN_cmd_flushed(struct bnx2x *bp,
                 }
         }
         DP(BNX2X_MSG_SP, "Waited %d*%d usec for PBF cmd queue[%d]\n",
-           poll_count-cur_cnt, FLR_WAIT_INTERAVAL, regs->pN);
+           poll_count-cur_cnt, FLR_WAIT_INTERVAL, regs->pN);
 }
 
 static inline u32 bnx2x_flr_clnup_reg_poll(struct bnx2x *bp, u32 reg,
@@ -1097,7 +1110,7 @@ static inline u32 bnx2x_flr_clnup_reg_poll(struct bnx2x *bp, u32 reg,
         u32 val;
 
         while ((val = REG_RD(bp, reg)) != expected && cur_cnt--)
-                udelay(FLR_WAIT_INTERAVAL);
+                udelay(FLR_WAIT_INTERVAL);
 
         return val;
 }
@@ -1210,7 +1223,7 @@ static inline int bnx2x_send_final_clnup(struct bnx2x *bp, u8 clnup_func,
         int ret = 0;
 
         if (REG_RD(bp, comp_addr)) {
-                BNX2X_ERR("Cleanup complete is not 0\n");
+                BNX2X_ERR("Cleanup complete was not 0 before sending\n");
                 return 1;
         }
 
@@ -1219,7 +1232,7 @@ static inline int bnx2x_send_final_clnup(struct bnx2x *bp, u8 clnup_func,
         op_gen.command |= OP_GEN_AGG_VECT(clnup_func);
         op_gen.command |= 1 << SDM_OP_GEN_AGG_VECT_IDX_VALID_SHIFT;
 
-        DP(BNX2X_MSG_SP, "FW Final cleanup\n");
+        DP(BNX2X_MSG_SP, "sending FW Final cleanup\n");
         REG_WR(bp, XSDM_REG_OPERATION_GEN, op_gen.command);
 
         if (bnx2x_flr_clnup_reg_poll(bp, comp_addr, 1, poll_cnt) != 1) {
@@ -1334,6 +1347,7 @@ static int bnx2x_pf_flr_clnup(struct bnx2x *bp)
         REG_WR(bp, PGLUE_B_REG_INTERNAL_PFID_ENABLE_TARGET_READ, 1);
 
         /* Poll HW usage counters */
+        DP(BNX2X_MSG_SP, "Polling usage counters\n");
         if (bnx2x_poll_hw_usage_counters(bp, poll_cnt))
                 return -EBUSY;
 
@@ -3713,11 +3727,11 @@ static inline void bnx2x_attn_int_deasserted3(struct bnx2x *bp, u32 attn)
  */
 void bnx2x_set_reset_global(struct bnx2x *bp)
 {
-        u32 val = REG_RD(bp, BNX2X_RECOVERY_GLOB_REG);
-
+        u32 val;
+        bnx2x_acquire_hw_lock(bp, HW_LOCK_RESOURCE_RECOVERY_REG);
+        val = REG_RD(bp, BNX2X_RECOVERY_GLOB_REG);
         REG_WR(bp, BNX2X_RECOVERY_GLOB_REG, val | BNX2X_GLOBAL_RESET_BIT);
-        barrier();
-        mmiowb();
+        bnx2x_release_hw_lock(bp, HW_LOCK_RESOURCE_RECOVERY_REG);
 }
 
 /*
@@ -3727,11 +3741,11 @@ void bnx2x_set_reset_global(struct bnx2x *bp)
  */
 static inline void bnx2x_clear_reset_global(struct bnx2x *bp)
 {
-        u32 val = REG_RD(bp, BNX2X_RECOVERY_GLOB_REG);
-
+        u32 val;
+        bnx2x_acquire_hw_lock(bp, HW_LOCK_RESOURCE_RECOVERY_REG);
+        val = REG_RD(bp, BNX2X_RECOVERY_GLOB_REG);
         REG_WR(bp, BNX2X_RECOVERY_GLOB_REG, val & (~BNX2X_GLOBAL_RESET_BIT));
-        barrier();
-        mmiowb();
+        bnx2x_release_hw_lock(bp, HW_LOCK_RESOURCE_RECOVERY_REG);
 }
 
 /*
@@ -3754,15 +3768,17 @@ static inline bool bnx2x_reset_is_global(struct bnx2x *bp)
  */
 static inline void bnx2x_set_reset_done(struct bnx2x *bp)
 {
-        u32 val = REG_RD(bp, BNX2X_RECOVERY_GLOB_REG);
+        u32 val;
         u32 bit = BP_PATH(bp) ?
                 BNX2X_PATH1_RST_IN_PROG_BIT : BNX2X_PATH0_RST_IN_PROG_BIT;
+        bnx2x_acquire_hw_lock(bp, HW_LOCK_RESOURCE_RECOVERY_REG);
+        val = REG_RD(bp, BNX2X_RECOVERY_GLOB_REG);
 
         /* Clear the bit */
         val &= ~bit;
         REG_WR(bp, BNX2X_RECOVERY_GLOB_REG, val);
-        barrier();
-        mmiowb();
+
+        bnx2x_release_hw_lock(bp, HW_LOCK_RESOURCE_RECOVERY_REG);
 }
 
 /*
@@ -3772,15 +3788,16 @@ static inline void bnx2x_set_reset_done(struct bnx2x *bp)
  */
 void bnx2x_set_reset_in_progress(struct bnx2x *bp)
 {
-        u32 val = REG_RD(bp, BNX2X_RECOVERY_GLOB_REG);
+        u32 val;
         u32 bit = BP_PATH(bp) ?
                 BNX2X_PATH1_RST_IN_PROG_BIT : BNX2X_PATH0_RST_IN_PROG_BIT;
+        bnx2x_acquire_hw_lock(bp, HW_LOCK_RESOURCE_RECOVERY_REG);
+        val = REG_RD(bp, BNX2X_RECOVERY_GLOB_REG);
 
         /* Set the bit */
         val |= bit;
         REG_WR(bp, BNX2X_RECOVERY_GLOB_REG, val);
-        barrier();
-        mmiowb();
+        bnx2x_release_hw_lock(bp, HW_LOCK_RESOURCE_RECOVERY_REG);
 }
 
 /*
@@ -3798,25 +3815,28 @@ bool bnx2x_reset_is_done(struct bnx2x *bp, int engine)
 }
 
 /*
- * Increment the load counter for the current engine.
+ * set pf load for the current pf.
  *
  * should be run under rtnl lock
  */
-void bnx2x_inc_load_cnt(struct bnx2x *bp)
+void bnx2x_set_pf_load(struct bnx2x *bp)
 {
-        u32 val1, val = REG_RD(bp, BNX2X_RECOVERY_GLOB_REG);
+        u32 val1, val;
         u32 mask = BP_PATH(bp) ? BNX2X_PATH1_LOAD_CNT_MASK :
                              BNX2X_PATH0_LOAD_CNT_MASK;
         u32 shift = BP_PATH(bp) ? BNX2X_PATH1_LOAD_CNT_SHIFT :
                              BNX2X_PATH0_LOAD_CNT_SHIFT;
 
+        bnx2x_acquire_hw_lock(bp, HW_LOCK_RESOURCE_RECOVERY_REG);
+        val = REG_RD(bp, BNX2X_RECOVERY_GLOB_REG);
+
         DP(NETIF_MSG_HW, "Old GEN_REG_VAL=0x%08x\n", val);
 
         /* get the current counter value */
         val1 = (val & mask) >> shift;
 
-        /* increment... */
-        val1++;
+        /* set bit of that PF */
+        val1 |= (1 << bp->pf_num);
 
         /* clear the old value */
         val &= ~mask;
@@ -3825,34 +3845,35 @@ void bnx2x_inc_load_cnt(struct bnx2x *bp)
         val |= ((val1 << shift) & mask);
 
         REG_WR(bp, BNX2X_RECOVERY_GLOB_REG, val);
-        barrier();
-        mmiowb();
+        bnx2x_release_hw_lock(bp, HW_LOCK_RESOURCE_RECOVERY_REG);
 }
 
 /**
- * bnx2x_dec_load_cnt - decrement the load counter
+ * bnx2x_clear_pf_load - clear pf load mark
  *
  * @bp:         driver handle
  *
  * Should be run under rtnl lock.
  * Decrements the load counter for the current engine. Returns
- * the new counter value.
+ * whether other functions are still loaded
  */
-u32 bnx2x_dec_load_cnt(struct bnx2x *bp)
+bool bnx2x_clear_pf_load(struct bnx2x *bp)
 {
-        u32 val1, val = REG_RD(bp, BNX2X_RECOVERY_GLOB_REG);
+        u32 val1, val;
         u32 mask = BP_PATH(bp) ? BNX2X_PATH1_LOAD_CNT_MASK :
                              BNX2X_PATH0_LOAD_CNT_MASK;
         u32 shift = BP_PATH(bp) ? BNX2X_PATH1_LOAD_CNT_SHIFT :
                              BNX2X_PATH0_LOAD_CNT_SHIFT;
 
+        bnx2x_acquire_hw_lock(bp, HW_LOCK_RESOURCE_RECOVERY_REG);
+        val = REG_RD(bp, BNX2X_RECOVERY_GLOB_REG);
         DP(NETIF_MSG_HW, "Old GEN_REG_VAL=0x%08x\n", val);
 
         /* get the current counter value */
         val1 = (val & mask) >> shift;
 
-        /* decrement... */
-        val1--;
+        /* clear bit of that PF */
+        val1 &= ~(1 << bp->pf_num);
 
         /* clear the old value */
         val &= ~mask;
@@ -3861,18 +3882,16 @@ u32 bnx2x_dec_load_cnt(struct bnx2x *bp)
         val |= ((val1 << shift) & mask);
 
         REG_WR(bp, BNX2X_RECOVERY_GLOB_REG, val);
-        barrier();
-        mmiowb();
-
-        return val1;
+        bnx2x_release_hw_lock(bp, HW_LOCK_RESOURCE_RECOVERY_REG);
+        return val1 != 0;
 }
 
 /*
- * Read the load counter for the current engine.
+ * Read the load status for the current engine.
  *
  * should be run under rtnl lock
  */
-static inline u32 bnx2x_get_load_cnt(struct bnx2x *bp, int engine)
+static inline bool bnx2x_get_load_status(struct bnx2x *bp, int engine)
 {
         u32 mask = (engine ? BNX2X_PATH1_LOAD_CNT_MASK :
                              BNX2X_PATH0_LOAD_CNT_MASK);
@@ -3884,23 +3903,23 @@ static inline u32 bnx2x_get_load_cnt(struct bnx2x *bp, int engine)
 
         val = (val & mask) >> shift;
 
-        DP(NETIF_MSG_HW, "load_cnt for engine %d = %d\n", engine, val);
+        DP(NETIF_MSG_HW, "load mask for engine %d = 0x%x\n", engine, val);
 
-        return val;
+        return val != 0;
 }
 
 /*
- * Reset the load counter for the current engine.
- *
- * should be run under rtnl lock
+ * Reset the load status for the current engine.
  */
-static inline void bnx2x_clear_load_cnt(struct bnx2x *bp)
+static inline void bnx2x_clear_load_status(struct bnx2x *bp)
 {
-        u32 val = REG_RD(bp, BNX2X_RECOVERY_GLOB_REG);
+        u32 val;
         u32 mask = (BP_PATH(bp) ? BNX2X_PATH1_LOAD_CNT_MASK :
-                             BNX2X_PATH0_LOAD_CNT_MASK);
-
+                    BNX2X_PATH0_LOAD_CNT_MASK);
+        bnx2x_acquire_hw_lock(bp, HW_LOCK_RESOURCE_RECOVERY_REG);
+        val = REG_RD(bp, BNX2X_RECOVERY_GLOB_REG);
         REG_WR(bp, BNX2X_RECOVERY_GLOB_REG, val & (~mask));
+        bnx2x_release_hw_lock(bp, HW_LOCK_RESOURCE_RECOVERY_REG);
 }
 
 static inline void _print_next_block(int idx, const char *blk)
@@ -5423,6 +5442,7 @@ static void bnx2x_init_eth_fp(struct bnx2x *bp, int fp_idx)
 
         /* init shortcut */
         fp->ustorm_rx_prods_offset = bnx2x_rx_ustorm_prods_offset(fp);
+
         /* Setup SB indicies */
         fp->rx_cons_sb = BNX2X_RX_SB_INDEX;
 
@@ -6687,13 +6707,16 @@ static int bnx2x_init_hw_func(struct bnx2x *bp)
         u16 cdu_ilt_start;
         u32 addr, val;
         u32 main_mem_base, main_mem_size, main_mem_prty_clr;
-        int i, main_mem_width;
+        int i, main_mem_width, rc;
 
         DP(BNX2X_MSG_MCP, "starting func init  func %d\n", func);
 
         /* FLR cleanup - hmmm */
-        if (!CHIP_IS_E1x(bp))
-                bnx2x_pf_flr_clnup(bp);
+        if (!CHIP_IS_E1x(bp)) {
+                rc = bnx2x_pf_flr_clnup(bp);
+                if (rc)
+                        return rc;
+        }
 
         /* set MSI reconfigure capability */
         if (bp->common.int_block == INT_BLOCK_HC) {
@@ -8458,13 +8481,38 @@ int bnx2x_leader_reset(struct bnx2x *bp)
 {
         int rc = 0;
         bool global = bnx2x_reset_is_global(bp);
+        u32 load_code;
+
+        /* if not going to reset MCP - load "fake" driver to reset HW while
+         * driver is owner of the HW
+         */
+        if (!global && !BP_NOMCP(bp)) {
+                load_code = bnx2x_fw_command(bp, DRV_MSG_CODE_LOAD_REQ, 0);
+                if (!load_code) {
+                        BNX2X_ERR("MCP response failure, aborting\n");
+                        rc = -EAGAIN;
+                        goto exit_leader_reset;
+                }
+                if ((load_code != FW_MSG_CODE_DRV_LOAD_COMMON_CHIP) &&
+                    (load_code != FW_MSG_CODE_DRV_LOAD_COMMON)) {
+                        BNX2X_ERR("MCP unexpected resp, aborting\n");
+                        rc = -EAGAIN;
+                        goto exit_leader_reset2;
+                }
+                load_code = bnx2x_fw_command(bp, DRV_MSG_CODE_LOAD_DONE, 0);
+                if (!load_code) {
+                        BNX2X_ERR("MCP response failure, aborting\n");
+                        rc = -EAGAIN;
+                        goto exit_leader_reset2;
+                }
+        }
 
         /* Try to recover after the failure */
         if (bnx2x_process_kill(bp, global)) {
                 netdev_err(bp->dev, "Something bad had happen on engine %d! "
                                     "Aii!\n", BP_PATH(bp));
                 rc = -EAGAIN;
-                goto exit_leader_reset;
+                goto exit_leader_reset2;
         }
 
         /*
@@ -8475,6 +8523,12 @@ int bnx2x_leader_reset(struct bnx2x *bp)
         if (global)
                 bnx2x_clear_reset_global(bp);
 
+exit_leader_reset2:
+        /* unload "fake driver" if it was loaded */
+        if (!global && !BP_NOMCP(bp)) {
+                bnx2x_fw_command(bp, DRV_MSG_CODE_UNLOAD_REQ_WOL_MCP, 0);
+                bnx2x_fw_command(bp, DRV_MSG_CODE_UNLOAD_DONE, 0);
+        }
 exit_leader_reset:
         bp->is_leader = 0;
         bnx2x_release_leader_lock(bp);
@@ -8511,13 +8565,16 @@ static inline void bnx2x_recovery_failed(struct bnx2x *bp)
 static void bnx2x_parity_recover(struct bnx2x *bp)
 {
         bool global = false;
+        u32 error_recovered, error_unrecovered;
+        bool is_parity;
 
         DP(NETIF_MSG_HW, "Handling parity\n");
         while (1) {
                 switch (bp->recovery_state) {
                 case BNX2X_RECOVERY_INIT:
                         DP(NETIF_MSG_HW, "State is BNX2X_RECOVERY_INIT\n");
-                        bnx2x_chk_parity_attn(bp, &global, false);
+                        is_parity = bnx2x_chk_parity_attn(bp, &global, false);
+                        WARN_ON(!is_parity);
 
                         /* Try to get a LEADER_LOCK HW lock */
                         if (bnx2x_trylock_leader_lock(bp)) {
@@ -8541,15 +8598,6 @@ static void bnx2x_parity_recover(struct bnx2x *bp)
 
                         bp->recovery_state = BNX2X_RECOVERY_WAIT;
 
-                        /*
-                         * Reset MCP command sequence number and MCP mail box
-                         * sequence as we are going to reset the MCP.
-                         */
-                        if (global) {
-                                bp->fw_seq = 0;
-                                bp->fw_drv_pulse_wr_seq = 0;
-                        }
-
                         /* Ensure "is_leader", MCP command sequence and
                          * "recovery_state" update values are seen on other
                          * CPUs.
@@ -8561,10 +8609,10 @@ static void bnx2x_parity_recover(struct bnx2x *bp)
                         DP(NETIF_MSG_HW, "State is BNX2X_RECOVERY_WAIT\n");
                         if (bp->is_leader) {
                                 int other_engine = BP_PATH(bp) ? 0 : 1;
-                                u32 other_load_counter =
-                                        bnx2x_get_load_cnt(bp, other_engine);
-                                u32 load_counter =
-                                        bnx2x_get_load_cnt(bp, BP_PATH(bp));
+                                bool other_load_status =
+                                        bnx2x_get_load_status(bp, other_engine);
+                                bool load_status =
+                                        bnx2x_get_load_status(bp, BP_PATH(bp));
                                 global = bnx2x_reset_is_global(bp);
 
                                 /*
@@ -8575,8 +8623,8 @@ static void bnx2x_parity_recover(struct bnx2x *bp)
                                  * the the gates will remain closed for that
                                  * engine.
                                  */
-                                if (load_counter ||
-                                    (global && other_load_counter)) {
+                                if (load_status ||
+                                    (global && other_load_status)) {
                                         /* Wait until all other functions get
                                          * down.
                                          */
@@ -8633,13 +8681,34 @@ static void bnx2x_parity_recover(struct bnx2x *bp)
                                                 return;
                                         }
 
-                                        if (bnx2x_nic_load(bp, LOAD_NORMAL))
-                                                bnx2x_recovery_failed(bp);
-                                        else {
+                                        error_recovered =
+                                          bp->eth_stats.recoverable_error;
+                                        error_unrecovered =
+                                          bp->eth_stats.unrecoverable_error;
+                                        bp->recovery_state =
+                                                BNX2X_RECOVERY_NIC_LOADING;
+                                        if (bnx2x_nic_load(bp, LOAD_NORMAL)) {
+                                                error_unrecovered++;
+                                                netdev_err(bp->dev,
+                                                           "Recovery failed. "
+                                                           "Power cycle "
+                                                           "needed\n");
+                                                /* Disconnect this device */
+                                                netif_device_detach(bp->dev);
+                                                /* Shut down the power */
+                                                bnx2x_set_power_state(
+                                                        bp, PCI_D3hot);
+                                                smp_mb();
+                                        } else {
                                                 bp->recovery_state =
                                                         BNX2X_RECOVERY_DONE;
+                                                error_recovered++;
                                                 smp_mb();
                                         }
+                                        bp->eth_stats.recoverable_error =
+                                                error_recovered;
+                                        bp->eth_stats.unrecoverable_error =
+                                                error_unrecovered;
 
                                         return;
                                 }
@@ -8795,11 +8864,13 @@ static void __devinit bnx2x_undi_unload(struct bnx2x *bp)
 {
         u32 val;
 
-        /* Check if there is any driver already loaded */
-        val = REG_RD(bp, MISC_REG_UNPREPARED);
-        if (val == 0x1) {
+        /* possibly another driver is trying to reset the chip */
+        bnx2x_acquire_hw_lock(bp, HW_LOCK_RESOURCE_RESET);
+
+        /* check if doorbell queue is reset */
+        if (REG_RD(bp, GRCBASE_MISC + MISC_REGISTERS_RESET_REG_1_SET)
+            & MISC_REGISTERS_RESET_REG_1_RST_DORQ) {
 
-                bnx2x_acquire_hw_lock(bp, HW_LOCK_RESOURCE_RESET);
                 /*
                  * Check if it is the UNDI driver
                  * UNDI driver initializes CID offset for normal bell to 0x7
@@ -8887,14 +8958,11 @@ static void __devinit bnx2x_undi_unload(struct bnx2x *bp)
 
                         /* restore our func and fw_seq */
                         bp->pf_num = orig_pf_num;
-                        bp->fw_seq =
-                              (SHMEM_RD(bp, func_mb[bp->pf_num].drv_mb_header) &
-                                DRV_MSG_SEQ_NUMBER_MASK);
                 }
-
-                /* now it's safe to release the lock */
-                bnx2x_release_hw_lock(bp, HW_LOCK_RESOURCE_RESET);
         }
+
+        /* now it's safe to release the lock */
+        bnx2x_release_hw_lock(bp, HW_LOCK_RESOURCE_RESET);
 }
 
 static void __devinit bnx2x_get_common_hwinfo(struct bnx2x *bp)
@@ -9915,16 +9983,6 @@ static int __devinit bnx2x_get_hwinfo(struct bnx2x *bp)
 
         bnx2x_get_cnic_info(bp);
 
-        /* Get current FW pulse sequence */
-        if (!BP_NOMCP(bp)) {
-                int mb_idx = BP_FW_MB_IDX(bp);
-
-                bp->fw_drv_pulse_wr_seq =
-                                (SHMEM_RD(bp, func_mb[mb_idx].drv_pulse_mb) &
-                                 DRV_PULSE_SEQ_MASK);
-                BNX2X_DEV_INFO("drv_pulse 0x%x\n", bp->fw_drv_pulse_wr_seq);
-        }
-
         return rc;
 }
 
@@ -10094,14 +10152,6 @@ static int __devinit bnx2x_init_bp(struct bnx2x *bp)
         if (!BP_NOMCP(bp))
                 bnx2x_undi_unload(bp);
 
-        /* init fw_seq after undi_unload! */
-        if (!BP_NOMCP(bp)) {
-                bp->fw_seq =
-                        (SHMEM_RD(bp, func_mb[BP_FW_MB_IDX(bp)].drv_mb_header) &
-                         DRV_MSG_SEQ_NUMBER_MASK);
-                BNX2X_DEV_INFO("fw_seq 0x%08x\n", bp->fw_seq);
-        }
-
         if (CHIP_REV_IS_FPGA(bp))
                 dev_err(&bp->pdev->dev, "FPGA detected\n");
 
@@ -10183,14 +10233,14 @@ static int bnx2x_open(struct net_device *dev)
         struct bnx2x *bp = netdev_priv(dev);
         bool global = false;
         int other_engine = BP_PATH(bp) ? 0 : 1;
-        u32 other_load_counter, load_counter;
+        bool other_load_status, load_status;
 
         netif_carrier_off(dev);
 
         bnx2x_set_power_state(bp, PCI_D0);
 
-        other_load_counter = bnx2x_get_load_cnt(bp, other_engine);
-        load_counter = bnx2x_get_load_cnt(bp, BP_PATH(bp));
+        other_load_status = bnx2x_get_load_status(bp, other_engine);
+        load_status = bnx2x_get_load_status(bp, BP_PATH(bp));
 
         /*
          * If parity had happen during the unload, then attentions
@@ -10216,8 +10266,8 @@ static int bnx2x_open(struct net_device *dev)
                          * global blocks only the first in the chip should try
                          * to recover.
                          */
-                        if ((!load_counter &&
-                             (!global || !other_load_counter)) &&
+                        if ((!load_status &&
+                             (!global || !other_load_status)) &&
                             bnx2x_trylock_leader_lock(bp) &&
                             !bnx2x_leader_reset(bp)) {
                                 netdev_info(bp->dev, "Recovered in open\n");
@@ -10536,6 +10586,7 @@ static int __devinit bnx2x_init_dev(struct pci_dev *pdev,
 {
         struct bnx2x *bp;
         int rc;
+        u32 pci_cfg_dword;
         bool chip_is_e1x = (board_type == BCM57710 ||
                             board_type == BCM57711 ||
                             board_type == BCM57711E);
@@ -10546,7 +10597,6 @@ static int __devinit bnx2x_init_dev(struct pci_dev *pdev,
         bp->dev = dev;
         bp->pdev = pdev;
         bp->flags = 0;
-        bp->pf_num = PCI_FUNC(pdev->devfn);
 
         rc = pci_enable_device(pdev);
         if (rc) {
@@ -10613,6 +10663,21 @@ static int __devinit bnx2x_init_dev(struct pci_dev *pdev,
                 goto err_out_release;
         }
 
+        /* In E1/E1H use pci device function given by kernel.
+         * In E2/E3 read physical function from ME register since these chips
+         * support Physical Device Assignment where kernel BDF maybe arbitrary
+         * (depending on hypervisor).
+         */
+        if (chip_is_e1x)
+                bp->pf_num = PCI_FUNC(pdev->devfn);
+        else {/* chip is E2/3*/
+                pci_read_config_dword(bp->pdev,
+                                      PCICFG_ME_REGISTER, &pci_cfg_dword);
+                bp->pf_num = (u8)((pci_cfg_dword & ME_REG_ABS_PF_NUM) >>
+                    ME_REG_ABS_PF_NUM_SHIFT);
+        }
+        DP(BNX2X_MSG_SP, "me reg PF num: %d\n", bp->pf_num);
+
         bnx2x_set_power_state(bp, PCI_D0);
 
         /* clean indirect addresses */
@@ -10642,7 +10707,7 @@ static int __devinit bnx2x_init_dev(struct pci_dev *pdev,
                 REG_WR(bp, PGLUE_B_REG_INTERNAL_PFID_ENABLE_TARGET_READ, 1);
 
         /* Reset the load counter */
-        bnx2x_clear_load_cnt(bp);
+        bnx2x_clear_load_status(bp);
 
         dev->watchdog_timeo = TX_TIMEOUT;
 
@@ -10829,10 +10894,8 @@ static inline void be16_to_cpu_n(const u8 *_source, u8 *_target, u32 n)
 do {                                                                    \
         u32 len = be32_to_cpu(fw_hdr->arr.len);                         \
         bp->arr = kmalloc(len, GFP_KERNEL);                             \
-        if (!bp->arr) {                                                 \
-                pr_err("Failed to allocate %d bytes for "#arr"\n", len); \
+        if (!bp->arr)                                                   \
                 goto lbl;                                               \
-        }                                                               \
         func(bp->firmware->data + be32_to_cpu(fw_hdr->arr.offset),      \
              (u8 *)bp->arr, len);                                       \
 } while (0)
@@ -11070,10 +11133,8 @@ static int __devinit bnx2x_init_one(struct pci_dev *pdev,
 
         /* dev zeroed in init_etherdev */
         dev = alloc_etherdev_mqs(sizeof(*bp), tx_count, rx_count);
-        if (!dev) {
-                dev_err(&pdev->dev, "Cannot allocate net device\n");
+        if (!dev)
                 return -ENOMEM;
-        }
 
         bp = netdev_priv(dev);
 
@@ -11295,13 +11356,6 @@ static void bnx2x_eeh_recover(struct bnx2x *bp)
         if ((val & (SHR_MEM_VALIDITY_DEV_INFO | SHR_MEM_VALIDITY_MB))
                 != (SHR_MEM_VALIDITY_DEV_INFO | SHR_MEM_VALIDITY_MB))
                 BNX2X_ERR("BAD MCP validity signature\n");
-
-        if (!BP_NOMCP(bp)) {
-                bp->fw_seq =
-                    (SHMEM_RD(bp, func_mb[BP_FW_MB_IDX(bp)].drv_mb_header) &
-                    DRV_MSG_SEQ_NUMBER_MASK);
-                BNX2X_DEV_INFO("fw_seq 0x%08x\n", bp->fw_seq);
-        }
 }
 
 /**
@@ -11557,6 +11611,13 @@ static int bnx2x_cnic_sp_queue(struct net_device *dev,
                 return -EIO;
 #endif
 
+        if ((bp->recovery_state != BNX2X_RECOVERY_DONE) &&
+            (bp->recovery_state != BNX2X_RECOVERY_NIC_LOADING)) {
+                netdev_err(dev, "Handling parity error recovery. Try again "
+                                "later\n");
+                return -EAGAIN;
+        }
+
         spin_lock_bh(&bp->spq_lock);
 
         for (i = 0; i < count; i++) {
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_reg.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_reg.h
index dddbcf6e154e..c95d9dcac6df 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_reg.h
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_reg.h
@@ -1,6 +1,6 @@
 /* bnx2x_reg.h: Broadcom Everest network driver.
  *
- * Copyright (c) 2007-2011 Broadcom Corporation
+ * Copyright (c) 2007-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
@@ -5731,6 +5731,7 @@
 #define MISC_REGISTERS_GPIO_PORT_SHIFT                           4
 #define MISC_REGISTERS_GPIO_SET_POS                              8
 #define MISC_REGISTERS_RESET_REG_1_CLEAR                         0x588
+#define MISC_REGISTERS_RESET_REG_1_RST_DORQ                      (0x1<<19)
 #define MISC_REGISTERS_RESET_REG_1_RST_HC                        (0x1<<29)
 #define MISC_REGISTERS_RESET_REG_1_RST_NIG                       (0x1<<7)
 #define MISC_REGISTERS_RESET_REG_1_RST_PXP                       (0x1<<26)
@@ -5783,15 +5784,17 @@
 #define MISC_REGISTERS_SPIO_OUTPUT_HIGH                          1
 #define MISC_REGISTERS_SPIO_OUTPUT_LOW                           0
 #define MISC_REGISTERS_SPIO_SET_POS                              8
-#define HW_LOCK_DRV_FLAGS                                        10
 #define HW_LOCK_MAX_RESOURCE_VALUE                               31
+#define HW_LOCK_RESOURCE_DRV_FLAGS                               10
 #define HW_LOCK_RESOURCE_GPIO                                    1
 #define HW_LOCK_RESOURCE_MDIO                                    0
+#define HW_LOCK_RESOURCE_NVRAM                                   12
 #define HW_LOCK_RESOURCE_PORT0_ATT_MASK                          3
 #define HW_LOCK_RESOURCE_RECOVERY_LEADER_0                       8
 #define HW_LOCK_RESOURCE_RECOVERY_LEADER_1                       9
-#define HW_LOCK_RESOURCE_SPIO                                    2
+#define HW_LOCK_RESOURCE_RECOVERY_REG                            11
 #define HW_LOCK_RESOURCE_RESET                                   5
+#define HW_LOCK_RESOURCE_SPIO                                    2
 #define AEU_INPUTS_ATTN_BITS_ATC_HW_INTERRUPT                    (0x1<<4)
 #define AEU_INPUTS_ATTN_BITS_ATC_PARITY_ERROR                    (0x1<<5)
 #define AEU_INPUTS_ATTN_BITS_BRB_PARITY_ERROR                    (0x1<<18)
@@ -6023,7 +6026,8 @@
 #define PCICFG_MSI_CONTROL_64_BIT_ADDR_CAP      (0x1<<23)
 #define PCICFG_MSI_CONTROL_MSI_PVMASK_CAPABLE   (0x1<<24)
 #define PCICFG_GRC_ADDRESS                              0x78
-#define PCICFG_GRC_DATA                                 0x80
+#define PCICFG_GRC_DATA                         0x80
+#define PCICFG_ME_REGISTER                              0x98
 #define PCICFG_MSIX_CAP_ID_OFFSET                       0xa0
 #define PCICFG_MSIX_CONTROL_TABLE_SIZE          (0x7ff<<16)
 #define PCICFG_MSIX_CONTROL_RESERVED            (0x7<<27)
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
index cb6339c35571..ac15f747f8da 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
@@ -1,6 +1,6 @@
 /* bnx2x_sp.c: Broadcom Everest network driver.
  *
- * Copyright 2011 Broadcom Corporation
+ * Copyright (c) 2011-2012 Broadcom Corporation
  *
  * Unless you and Broadcom execute a separate written software license
  * agreement governing use of this software, this software is licensed to you
@@ -1836,6 +1836,7 @@ static int bnx2x_vlan_mac_del_all(struct bnx2x *bp,
                         rc = exeq->remove(bp, exeq->owner, exeq_pos);
                         if (rc) {
                                 BNX2X_ERR("Failed to remove command\n");
+                                spin_unlock_bh(&exeq->lock);
                                 return rc;
                         }
                         list_del(&exeq_pos->link);
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h
index 66da39f0c84a..71e039b618a7 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h
@@ -1,6 +1,6 @@
 /* bnx2x_sp.h: Broadcom Everest network driver.
  *
- * Copyright 2011 Broadcom Corporation
+ * Copyright (c) 2011-2012 Broadcom Corporation
  *
  * Unless you and Broadcom execute a separate written software license
  * agreement governing use of this software, this software is licensed to you
@@ -803,10 +803,10 @@ enum bnx2x_q_type {
 };
 
 #define BNX2X_PRIMARY_CID_INDEX                 0
-#define BNX2X_MULTI_TX_COS_E1X                  1
+#define BNX2X_MULTI_TX_COS_E1X                  3 /* QM only */
 #define BNX2X_MULTI_TX_COS_E2_E3A0              2
 #define BNX2X_MULTI_TX_COS_E3B0                 3
-#define BNX2X_MULTI_TX_COS                      BNX2X_MULTI_TX_COS_E3B0
+#define BNX2X_MULTI_TX_COS                      3 /* Maximum possible */
 
 
 struct bnx2x_queue_init_params {
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c
index bc0121ac291e..7b9b304b9107 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c
@@ -1,6 +1,6 @@
 /* bnx2x_stats.c: Broadcom Everest network driver.
  *
- * Copyright (c) 2007-2011 Broadcom Corporation
+ * Copyright (c) 2007-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
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.h
index 683deb053109..7e979686cd68 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.h
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.h
@@ -1,6 +1,6 @@
 /* bnx2x_stats.h: Broadcom Everest network driver.
  *
- * Copyright (c) 2007-2011 Broadcom Corporation
+ * Copyright (c) 2007-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
@@ -199,6 +199,10 @@ struct bnx2x_eth_stats {
         u32 pfc_frames_received_lo;
         u32 pfc_frames_sent_hi;
         u32 pfc_frames_sent_lo;
+
+        /* Recovery */
+        u32 recoverable_error;
+        u32 unrecoverable_error;
 };
 
 
diff --git a/drivers/net/ethernet/broadcom/cnic.c b/drivers/net/ethernet/broadcom/cnic.c
index dd3a0a232ea0..df429959abdd 100644
--- a/drivers/net/ethernet/broadcom/cnic.c
+++ b/drivers/net/ethernet/broadcom/cnic.c
@@ -1,6 +1,6 @@
 /* cnic.c: Broadcom CNIC core network driver.
  *
- * Copyright (c) 2006-2011 Broadcom Corporation
+ * Copyright (c) 2006-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
@@ -380,6 +380,8 @@ static int cnic_iscsi_nl_msg_recv(struct cnic_dev *dev, u32 msg_type,
                 if (cnic_in_use(csk) &&
                     test_bit(SK_F_CONNECT_START, &csk->flags)) {
 
+                        csk->vlan_id = path_resp->vlan_id;
+
                         memcpy(csk->ha, path_resp->mac_addr, 6);
                         if (test_bit(SK_F_IPV6, &csk->flags))
                                 memcpy(&csk->src_ip[0], &path_resp->src.v6_addr,
@@ -2521,12 +2523,35 @@ static void cnic_bnx2x_kwqe_err(struct cnic_dev *dev, struct kwqe *kwqe)
         u32 cid;
         u32 opcode = KWQE_OPCODE(kwqe->kwqe_op_flag);
         u32 layer_code = kwqe->kwqe_op_flag & KWQE_LAYER_MASK;
+        u32 kcqe_op;
         int ulp_type;
 
         cid = kwqe->kwqe_info0;
         memset(&kcqe, 0, sizeof(kcqe));
 
-        if (layer_code == KWQE_FLAGS_LAYER_MASK_L5_ISCSI) {
+        if (layer_code == KWQE_FLAGS_LAYER_MASK_L5_FCOE) {
+                u32 l5_cid = 0;
+
+                ulp_type = CNIC_ULP_FCOE;
+                if (opcode == FCOE_KWQE_OPCODE_DISABLE_CONN) {
+                        struct fcoe_kwqe_conn_enable_disable *req;
+
+                        req = (struct fcoe_kwqe_conn_enable_disable *) kwqe;
+                        kcqe_op = FCOE_KCQE_OPCODE_DISABLE_CONN;
+                        cid = req->context_id;
+                        l5_cid = req->conn_id;
+                } else if (opcode == FCOE_KWQE_OPCODE_DESTROY) {
+                        kcqe_op = FCOE_KCQE_OPCODE_DESTROY_FUNC;
+                } else {
+                        return;
+                }
+                kcqe.kcqe_op_flag = kcqe_op << KCQE_FLAGS_OPCODE_SHIFT;
+                kcqe.kcqe_op_flag |= KCQE_FLAGS_LAYER_MASK_L5_FCOE;
+                kcqe.kcqe_info1 = FCOE_KCQE_COMPLETION_STATUS_NIC_ERROR;
+                kcqe.kcqe_info2 = cid;
+                kcqe.kcqe_info0 = l5_cid;
+
+        } else if (layer_code == KWQE_FLAGS_LAYER_MASK_L5_ISCSI) {
                 ulp_type = CNIC_ULP_ISCSI;
                 if (opcode == ISCSI_KWQE_OPCODE_UPDATE_CONN)
                         cid = kwqe->kwqe_info1;
@@ -2539,7 +2564,6 @@ static void cnic_bnx2x_kwqe_err(struct cnic_dev *dev, struct kwqe *kwqe)
 
         } else if (layer_code == KWQE_FLAGS_LAYER_MASK_L4) {
                 struct l4_kcq *l4kcqe = (struct l4_kcq *) &kcqe;
-                u32 kcqe_op;
 
                 ulp_type = CNIC_ULP_L4;
                 if (opcode == L4_KWQE_OPCODE_VALUE_CONNECT1)
@@ -2686,9 +2710,17 @@ static int cnic_submit_bnx2x_fcoe_kwqes(struct cnic_dev *dev,
                                    opcode);
                         break;
                 }
-                if (ret < 0)
+                if (ret < 0) {
                         netdev_err(dev->netdev, "KWQE(0x%x) failed\n",
                                    opcode);
+
+                        /* Possibly bnx2x parity error, send completion
+                         * to ulp drivers with error code to speed up
+                         * cleanup and reset recovery.
+                         */
+                        if (ret == -EIO || ret == -EAGAIN)
+                                cnic_bnx2x_kwqe_err(dev, kwqe);
+                }
                 i += work;
         }
         return 0;
@@ -3897,6 +3929,8 @@ static void cnic_cm_process_kcqe(struct cnic_dev *dev, struct kcqe *kcqe)
         case L4_KCQE_OPCODE_VALUE_CONNECT_COMPLETE:
                 if (l4kcqe->status == 0)
                         set_bit(SK_F_OFFLD_COMPLETE, &csk->flags);
+                else if (l4kcqe->status == L4_KCQE_COMPLETION_STATUS_NIC_ERROR)
+                        set_bit(SK_F_HW_ERR, &csk->flags);
 
                 smp_mb__before_clear_bit();
                 clear_bit(SK_F_OFFLD_SCHED, &csk->flags);
diff --git a/drivers/net/ethernet/broadcom/cnic_defs.h b/drivers/net/ethernet/broadcom/cnic_defs.h
index 86936f6b6dbc..7271f14bda3b 100644
--- a/drivers/net/ethernet/broadcom/cnic_defs.h
+++ b/drivers/net/ethernet/broadcom/cnic_defs.h
@@ -1,7 +1,7 @@
 
 /* cnic.c: Broadcom CNIC core network driver.
  *
- * Copyright (c) 2006-2009 Broadcom Corporation
+ * Copyright (c) 2006-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
@@ -69,6 +69,7 @@
 
 #define FCOE_KCQE_COMPLETION_STATUS_ERROR       (0x1)
 #define FCOE_KCQE_COMPLETION_STATUS_CTX_ALLOC_FAILURE   (0x3)
+#define FCOE_KCQE_COMPLETION_STATUS_NIC_ERROR   (0x5)
 
 /* KCQ (kernel completion queue) response op codes */
 #define L4_KCQE_OPCODE_VALUE_CLOSE_COMP             (53)
diff --git a/drivers/net/ethernet/broadcom/cnic_if.h b/drivers/net/ethernet/broadcom/cnic_if.h
index 1517763d4e55..60deb84d36bd 100644
--- a/drivers/net/ethernet/broadcom/cnic_if.h
+++ b/drivers/net/ethernet/broadcom/cnic_if.h
@@ -12,8 +12,8 @@
 #ifndef CNIC_IF_H
 #define CNIC_IF_H
 
-#define CNIC_MODULE_VERSION     "2.5.8"
-#define CNIC_MODULE_RELDATE     "Jan 3, 2012"
+#define CNIC_MODULE_VERSION     "2.5.9"
+#define CNIC_MODULE_RELDATE     "Feb 8, 2012"
 
 #define CNIC_ULP_RDMA           0
 #define CNIC_ULP_ISCSI          1
diff --git a/drivers/net/ethernet/broadcom/sb1250-mac.c b/drivers/net/ethernet/broadcom/sb1250-mac.c
index 084904ceaa30..49e7a258da8a 100644
--- a/drivers/net/ethernet/broadcom/sb1250-mac.c
+++ b/drivers/net/ethernet/broadcom/sb1250-mac.c
@@ -2623,8 +2623,6 @@ static int __devinit sbmac_probe(struct platform_device *pldev)
          */
         dev = alloc_etherdev(sizeof(struct sbmac_softc));
         if (!dev) {
-                printk(KERN_ERR "%s: unable to allocate etherdev\n",
-                       dev_name(&pldev->dev));
                 err = -ENOMEM;
                 goto out_unmap;
         }
diff --git a/drivers/net/ethernet/broadcom/tg3.c b/drivers/net/ethernet/broadcom/tg3.c
index a1f2e0fed78b..3bf3adca3695 100644
--- a/drivers/net/ethernet/broadcom/tg3.c
+++ b/drivers/net/ethernet/broadcom/tg3.c
@@ -15471,7 +15471,6 @@ static int __devinit tg3_init_one(struct pci_dev *pdev,
 
         dev = alloc_etherdev_mq(sizeof(*tp), TG3_IRQ_MAX_VECS);
         if (!dev) {
-                dev_err(&pdev->dev, "Etherdev alloc failed, aborting\n");
                 err = -ENOMEM;
                 goto err_out_power_down;
         }
diff --git a/drivers/net/ethernet/brocade/bna/bfa_defs.h b/drivers/net/ethernet/brocade/bna/bfa_defs.h
index 871c6309334c..48f877337390 100644
--- a/drivers/net/ethernet/brocade/bna/bfa_defs.h
+++ b/drivers/net/ethernet/brocade/bna/bfa_defs.h
@@ -297,6 +297,7 @@ enum bfa_mode {
 #define BFA_FLASH_PART_ENTRY_SIZE       32      /* partition entry size */
 #define BFA_FLASH_PART_MAX              32      /* maximal # of partitions */
 #define BFA_TOTAL_FLASH_SIZE            0x400000
+#define BFA_FLASH_PART_FWIMG            2
 #define BFA_FLASH_PART_MFG              7
 
 /*
diff --git a/drivers/net/ethernet/brocade/bna/bnad.c b/drivers/net/ethernet/brocade/bna/bnad.c
index be7d91e4b785..ff78f770dec9 100644
--- a/drivers/net/ethernet/brocade/bna/bnad.c
+++ b/drivers/net/ethernet/brocade/bna/bnad.c
@@ -3284,7 +3284,6 @@ bnad_pci_probe(struct pci_dev *pdev,
          */
         netdev = alloc_etherdev(sizeof(struct bnad));
         if (!netdev) {
-                dev_err(&pdev->dev, "netdev allocation failed\n");
                 err = -ENOMEM;
                 return err;
         }
diff --git a/drivers/net/ethernet/brocade/bna/bnad_debugfs.c b/drivers/net/ethernet/brocade/bna/bnad_debugfs.c
index 592ad3929f53..c9fdceb135f3 100644
--- a/drivers/net/ethernet/brocade/bna/bnad_debugfs.c
+++ b/drivers/net/ethernet/brocade/bna/bnad_debugfs.c
@@ -62,8 +62,6 @@ bnad_debugfs_open_fwtrc(struct inode *inode, struct file *file)
         if (!fw_debug->debug_buffer) {
                 kfree(fw_debug);
                 fw_debug = NULL;
-                pr_warn("bna %s: Failed to allocate fwtrc buffer\n",
-                        pci_name(bnad->pcidev));
                 return -ENOMEM;
         }
 
@@ -105,8 +103,6 @@ bnad_debugfs_open_fwsave(struct inode *inode, struct file *file)
         if (!fw_debug->debug_buffer) {
                 kfree(fw_debug);
                 fw_debug = NULL;
-                pr_warn("bna %s: Failed to allocate fwsave buffer\n",
-                        pci_name(bnad->pcidev));
                 return -ENOMEM;
         }
 
@@ -208,8 +204,6 @@ bnad_debugfs_open_drvinfo(struct inode *inode, struct file *file)
         if (!drv_info->debug_buffer) {
                 kfree(drv_info);
                 drv_info = NULL;
-                pr_warn("bna %s: Failed to allocate drv info buffer\n",
-                        pci_name(bnad->pcidev));
                 return -ENOMEM;
         }
 
@@ -348,11 +342,8 @@ bnad_debugfs_write_regrd(struct file *file, const char __user *buf,
 
         /* Allocate memory to store the user space buf */
         kern_buf = kzalloc(nbytes, GFP_KERNEL);
-        if (!kern_buf) {
-                pr_warn("bna %s: Failed to allocate user buffer\n",
-                        pci_name(bnad->pcidev));
+        if (!kern_buf)
                 return -ENOMEM;
-        }
 
         if (copy_from_user(kern_buf, (void  __user *)buf, nbytes)) {
                 kfree(kern_buf);
@@ -373,11 +364,8 @@ bnad_debugfs_write_regrd(struct file *file, const char __user *buf,
         bnad->reglen = 0;
 
         bnad->regdata = kzalloc(len << 2, GFP_KERNEL);
-        if (!bnad->regdata) {
-                pr_warn("bna %s: Failed to allocate regrd buffer\n",
-                        pci_name(bnad->pcidev));
+        if (!bnad->regdata)
                 return -ENOMEM;
-        }
 
         bnad->reglen = len << 2;
         rb = bfa_ioc_bar0(ioc);
@@ -421,11 +409,8 @@ bnad_debugfs_write_regwr(struct file *file, const char __user *buf,
 
         /* Allocate memory to store the user space buf */
         kern_buf = kzalloc(nbytes, GFP_KERNEL);
-        if (!kern_buf) {
-                pr_warn("bna %s: Failed to allocate user buffer\n",
-                        pci_name(bnad->pcidev));
+        if (!kern_buf)
                 return -ENOMEM;
-        }
 
         if (copy_from_user(kern_buf, (void  __user *)buf, nbytes)) {
                 kfree(kern_buf);
diff --git a/drivers/net/ethernet/brocade/bna/bnad_ethtool.c b/drivers/net/ethernet/brocade/bna/bnad_ethtool.c
index 803ea32aa99d..ab753d7334a6 100644
--- a/drivers/net/ethernet/brocade/bna/bnad_ethtool.c
+++ b/drivers/net/ethernet/brocade/bna/bnad_ethtool.c
@@ -1070,6 +1070,47 @@ done:
         return ret;
 }
 
+static int
+bnad_flash_device(struct net_device *netdev, struct ethtool_flash *eflash)
+{
+        struct bnad *bnad = netdev_priv(netdev);
+        struct bnad_iocmd_comp fcomp;
+        const struct firmware *fw;
+        int ret = 0;
+
+        ret = request_firmware(&fw, eflash->data, &bnad->pcidev->dev);
+        if (ret) {
+                pr_err("BNA: Can't locate firmware %s\n", eflash->data);
+                goto out;
+        }
+
+        fcomp.bnad = bnad;
+        fcomp.comp_status = 0;
+
+        init_completion(&fcomp.comp);
+        spin_lock_irq(&bnad->bna_lock);
+        ret = bfa_nw_flash_update_part(&bnad->bna.flash, BFA_FLASH_PART_FWIMG,
+                                bnad->id, (u8 *)fw->data, fw->size, 0,
+                                bnad_cb_completion, &fcomp);
+        if (ret != BFA_STATUS_OK) {
+                pr_warn("BNA: Flash update failed with err: %d\n", ret);
+                ret = -EIO;
+                spin_unlock_irq(&bnad->bna_lock);
+                goto out;
+        }
+
+        spin_unlock_irq(&bnad->bna_lock);
+        wait_for_completion(&fcomp.comp);
+        if (fcomp.comp_status != BFA_STATUS_OK) {
+                ret = -EIO;
+                pr_warn("BNA: Firmware image update to flash failed with: %d\n",
+                        fcomp.comp_status);
+        }
+out:
+        release_firmware(fw);
+        return ret;
+}
+
 static const struct ethtool_ops bnad_ethtool_ops = {
         .get_settings = bnad_get_settings,
         .set_settings = bnad_set_settings,
@@ -1088,6 +1129,7 @@ static const struct ethtool_ops bnad_ethtool_ops = {
         .get_eeprom_len = bnad_get_eeprom_len,
         .get_eeprom = bnad_get_eeprom,
         .set_eeprom = bnad_set_eeprom,
+        .flash_device = bnad_flash_device,
 };
 
 void
diff --git a/drivers/net/ethernet/cadence/at91_ether.c b/drivers/net/ethernet/cadence/at91_ether.c
index 1a5b6efa0120..906117016fc4 100644
--- a/drivers/net/ethernet/cadence/at91_ether.c
+++ b/drivers/net/ethernet/cadence/at91_ether.c
@@ -886,7 +886,7 @@ static void at91ether_rx(struct net_device *dev)
         while (dlist->descriptors[lp->rxBuffIndex].addr & EMAC_DESC_DONE) {
                 p_recv = dlist->recv_buf[lp->rxBuffIndex];
                 pktlen = dlist->descriptors[lp->rxBuffIndex].size & 0x7ff;      /* Length of frame including FCS */
-                skb = dev_alloc_skb(pktlen + 2);
+                skb = netdev_alloc_skb(dev, pktlen + 2);
                 if (skb != NULL) {
                         skb_reserve(skb, 2);
                         memcpy(skb_put(skb, pktlen), p_recv, pktlen);
diff --git a/drivers/net/ethernet/cadence/macb.c b/drivers/net/ethernet/cadence/macb.c
index 23200680d4c1..85e044567f68 100644
--- a/drivers/net/ethernet/cadence/macb.c
+++ b/drivers/net/ethernet/cadence/macb.c
@@ -397,7 +397,7 @@ static int macb_rx_frame(struct macb *bp, unsigned int first_frag,
         netdev_dbg(bp->dev, "macb_rx_frame frags %u - %u (len %u)\n",
                    first_frag, last_frag, len);
 
-        skb = dev_alloc_skb(len + RX_OFFSET);
+        skb = netdev_alloc_skb(bp->dev, len + RX_OFFSET);
         if (!skb) {
                 bp->stats.rx_dropped++;
                 for (frag = first_frag; ; frag = NEXT_RX(frag)) {
@@ -1308,10 +1308,8 @@ static int __init macb_probe(struct platform_device *pdev)
 
         err = -ENOMEM;
         dev = alloc_etherdev(sizeof(*bp));
-        if (!dev) {
-                dev_err(&pdev->dev, "etherdev alloc failed, aborting.\n");
+        if (!dev)
                 goto err_out;
-        }
 
         SET_NETDEV_DEV(dev, &pdev->dev);
 
diff --git a/drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c b/drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c
index e53365a71484..9045a451d4a9 100644
--- a/drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c
+++ b/drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c
@@ -2596,8 +2596,6 @@ static int __devinit cxgb4vf_pci_probe(struct pci_dev *pdev,
                 netdev = alloc_etherdev_mq(sizeof(struct port_info),
                                            MAX_PORT_QSETS);
                 if (netdev == NULL) {
-                        dev_err(&pdev->dev, "cannot allocate netdev for"
-                                " port %d\n", port_id);
                         t4vf_free_vi(adapter, viid);
                         err = -ENOMEM;
                         goto err_free_dev;
diff --git a/drivers/net/ethernet/cirrus/cs89x0.c b/drivers/net/ethernet/cirrus/cs89x0.c
index f328da24c8fa..d5ff93653e4c 100644
--- a/drivers/net/ethernet/cirrus/cs89x0.c
+++ b/drivers/net/ethernet/cirrus/cs89x0.c
@@ -911,7 +911,7 @@ dma_rx(struct net_device *dev)
         }
 
         /* Malloc up new buffer. */
-        skb = dev_alloc_skb(length + 2);
+        skb = netdev_alloc_skb(dev, length + 2);
         if (skb == NULL) {
                 if (net_debug)  /* I don't think we want to do this to a stressed system */
                         printk("%s: Memory squeeze, dropping packet.\n", dev->name);
@@ -1616,7 +1616,7 @@ net_rx(struct net_device *dev)
         }
 
         /* Malloc up new buffer. */
-        skb = dev_alloc_skb(length + 2);
+        skb = netdev_alloc_skb(dev, length + 2);
         if (skb == NULL) {
 #if 0           /* Again, this seems a cruel thing to do */
                 printk(KERN_WARNING "%s: Memory squeeze, dropping packet.\n", dev->name);
diff --git a/drivers/net/ethernet/cirrus/ep93xx_eth.c b/drivers/net/ethernet/cirrus/ep93xx_eth.c
index 4317af8d2f0a..c21e5ab8d1ef 100644
--- a/drivers/net/ethernet/cirrus/ep93xx_eth.c
+++ b/drivers/net/ethernet/cirrus/ep93xx_eth.c
@@ -282,7 +282,7 @@ static int ep93xx_rx(struct net_device *dev, int processed, int budget)
                 if (rstat0 & RSTAT0_CRCI)
                         length -= 4;
 
-                skb = dev_alloc_skb(length + 2);
+                skb = netdev_alloc_skb(dev, length + 2);
                 if (likely(skb != NULL)) {
                         struct ep93xx_rdesc *rxd = &ep->descs->rdesc[entry];
                         skb_reserve(skb, 2);
diff --git a/drivers/net/ethernet/cisco/enic/enic.h b/drivers/net/ethernet/cisco/enic/enic.h
index ee93a2087fe6..54fd9c314b38 100644
--- a/drivers/net/ethernet/cisco/enic/enic.h
+++ b/drivers/net/ethernet/cisco/enic/enic.h
@@ -32,13 +32,13 @@
 
 #define DRV_NAME                "enic"
 #define DRV_DESCRIPTION         "Cisco VIC Ethernet NIC Driver"
-#define DRV_VERSION             "2.1.1.31"
+#define DRV_VERSION             "2.1.1.33"
 #define DRV_COPYRIGHT           "Copyright 2008-2011 Cisco Systems, Inc"
 
 #define ENIC_BARS_MAX           6
 
 #define ENIC_WQ_MAX             1
-#define ENIC_RQ_MAX             1
+#define ENIC_RQ_MAX             8
 #define ENIC_CQ_MAX             (ENIC_WQ_MAX + ENIC_RQ_MAX)
 #define ENIC_INTR_MAX           (ENIC_CQ_MAX + 2)
 
diff --git a/drivers/net/ethernet/cisco/enic/enic_main.c b/drivers/net/ethernet/cisco/enic/enic_main.c
index ab3f67f980d8..2838891a94ee 100644
--- a/drivers/net/ethernet/cisco/enic/enic_main.c
+++ b/drivers/net/ethernet/cisco/enic/enic_main.c
@@ -2280,10 +2280,8 @@ static int __devinit enic_probe(struct pci_dev *pdev,
          */
 
         netdev = alloc_etherdev(sizeof(struct enic));
-        if (!netdev) {
-                pr_err("Etherdev alloc failed, aborting\n");
+        if (!netdev)
                 return -ENOMEM;
-        }
 
         pci_set_drvdata(pdev, netdev);
 
@@ -2388,7 +2386,6 @@ static int __devinit enic_probe(struct pci_dev *pdev,
         /* Allocate structure for port profiles */
         enic->pp = kcalloc(num_pps, sizeof(*enic->pp), GFP_KERNEL);
         if (!enic->pp) {
-                pr_err("port profile alloc failed, aborting\n");
                 err = -ENOMEM;
                 goto err_out_disable_sriov_pp;
         }
diff --git a/drivers/net/ethernet/cisco/enic/vnic_dev.c b/drivers/net/ethernet/cisco/enic/vnic_dev.c
index 31e7f9bc2067..298ad6f865be 100644
--- a/drivers/net/ethernet/cisco/enic/vnic_dev.c
+++ b/drivers/net/ethernet/cisco/enic/vnic_dev.c
@@ -439,11 +439,12 @@ int vnic_dev_fw_info(struct vnic_dev *vdev,
                 a1 = sizeof(struct vnic_devcmd_fw_info);
 
                 /* only get fw_info once and cache it */
-                err = vnic_dev_cmd(vdev, CMD_MCPU_FW_INFO, &a0, &a1, wait);
-                if (err == ERR_ECMDUNKNOWN) {
+                if (vnic_dev_capable(vdev, CMD_MCPU_FW_INFO))
+                        err = vnic_dev_cmd(vdev, CMD_MCPU_FW_INFO,
+                                &a0, &a1, wait);
+                else
                         err = vnic_dev_cmd(vdev, CMD_MCPU_FW_INFO_OLD,
                                 &a0, &a1, wait);
-                }
         }
 
         *fw_info = vdev->fw_info;
@@ -504,13 +505,11 @@ int vnic_dev_enable_wait(struct vnic_dev *vdev)
 {
         u64 a0 = 0, a1 = 0;
         int wait = 1000;
-        int err;
 
-        err = vnic_dev_cmd(vdev, CMD_ENABLE_WAIT, &a0, &a1, wait);
-        if (err == ERR_ECMDUNKNOWN)
+        if (vnic_dev_capable(vdev, CMD_ENABLE_WAIT))
+                return vnic_dev_cmd(vdev, CMD_ENABLE_WAIT, &a0, &a1, wait);
+        else
                 return vnic_dev_cmd(vdev, CMD_ENABLE, &a0, &a1, wait);
-
-        return err;
 }
 
 int vnic_dev_disable(struct vnic_dev *vdev)
@@ -574,16 +573,15 @@ int vnic_dev_hang_reset(struct vnic_dev *vdev, int arg)
         int wait = 1000;
         int err;
 
-        err = vnic_dev_cmd(vdev, CMD_HANG_RESET, &a0, &a1, wait);
-        if (err == ERR_ECMDUNKNOWN) {
+        if (vnic_dev_capable(vdev, CMD_HANG_RESET)) {
+                return vnic_dev_cmd(vdev, CMD_HANG_RESET,
+                                &a0, &a1, wait);
+        } else {
                 err = vnic_dev_soft_reset(vdev, arg);
                 if (err)
                         return err;
-
                 return vnic_dev_init(vdev, 0);
         }
-
-        return err;
 }
 
 int vnic_dev_hang_reset_done(struct vnic_dev *vdev, int *done)
@@ -594,11 +592,13 @@ int vnic_dev_hang_reset_done(struct vnic_dev *vdev, int *done)
 
         *done = 0;
 
-        err = vnic_dev_cmd(vdev, CMD_HANG_RESET_STATUS, &a0, &a1, wait);
-        if (err) {
-                if (err == ERR_ECMDUNKNOWN)
-                        return vnic_dev_soft_reset_done(vdev, done);
-                return err;
+        if (vnic_dev_capable(vdev, CMD_HANG_RESET_STATUS)) {
+                err = vnic_dev_cmd(vdev, CMD_HANG_RESET_STATUS,
+                                &a0, &a1, wait);
+                if (err)
+                        return err;
+        } else {
+                return vnic_dev_soft_reset_done(vdev, done);
         }
 
         *done = (a0 == 0);
@@ -691,13 +691,12 @@ int vnic_dev_set_ig_vlan_rewrite_mode(struct vnic_dev *vdev,
 {
         u64 a0 = ig_vlan_rewrite_mode, a1 = 0;
         int wait = 1000;
-        int err;
 
-        err = vnic_dev_cmd(vdev, CMD_IG_VLAN_REWRITE_MODE, &a0, &a1, wait);
-        if (err == ERR_ECMDUNKNOWN)
+        if (vnic_dev_capable(vdev, CMD_IG_VLAN_REWRITE_MODE))
+                return vnic_dev_cmd(vdev, CMD_IG_VLAN_REWRITE_MODE,
+                                &a0, &a1, wait);
+        else
                 return 0;
-
-        return err;
 }
 
 static int vnic_dev_notify_setcmd(struct vnic_dev *vdev,
@@ -835,7 +834,10 @@ int vnic_dev_intr_coal_timer_info(struct vnic_dev *vdev)
 
         memset(vdev->args, 0, sizeof(vdev->args));
 
-        err = _vnic_dev_cmd(vdev, CMD_INTR_COAL_CONVERT, wait);
+        if (vnic_dev_capable(vdev, CMD_INTR_COAL_CONVERT))
+                err = _vnic_dev_cmd(vdev, CMD_INTR_COAL_CONVERT, wait);
+        else
+                err = ERR_ECMDUNKNOWN;
 
         /* Use defaults when firmware doesn't support the devcmd at all or
          * supports it for only specific hardware
@@ -848,9 +850,11 @@ int vnic_dev_intr_coal_timer_info(struct vnic_dev *vdev)
                 return 0;
         }
 
-        vdev->intr_coal_timer_info.mul = (u32) vdev->args[0];
-        vdev->intr_coal_timer_info.div = (u32) vdev->args[1];
-        vdev->intr_coal_timer_info.max_usec = (u32) vdev->args[2];
+        if (!err) {
+                vdev->intr_coal_timer_info.mul = (u32) vdev->args[0];
+                vdev->intr_coal_timer_info.div = (u32) vdev->args[1];
+                vdev->intr_coal_timer_info.max_usec = (u32) vdev->args[2];
+        }
 
         return err;
 }
diff --git a/drivers/net/ethernet/cisco/enic/vnic_rq.c b/drivers/net/ethernet/cisco/enic/vnic_rq.c
index 34105e0951a5..7e1488fc8ab2 100644
--- a/drivers/net/ethernet/cisco/enic/vnic_rq.c
+++ b/drivers/net/ethernet/cisco/enic/vnic_rq.c
@@ -38,10 +38,8 @@ static int vnic_rq_alloc_bufs(struct vnic_rq *rq)
 
         for (i = 0; i < blks; i++) {
                 rq->bufs[i] = kzalloc(VNIC_RQ_BUF_BLK_SZ(count), GFP_ATOMIC);
-                if (!rq->bufs[i]) {
-                        pr_err("Failed to alloc rq_bufs\n");
+                if (!rq->bufs[i])
                         return -ENOMEM;
-                }
         }
 
         for (i = 0; i < blks; i++) {
diff --git a/drivers/net/ethernet/cisco/enic/vnic_wq.c b/drivers/net/ethernet/cisco/enic/vnic_wq.c
index df61bd932ea6..5e0d7a2be9bc 100644
--- a/drivers/net/ethernet/cisco/enic/vnic_wq.c
+++ b/drivers/net/ethernet/cisco/enic/vnic_wq.c
@@ -38,10 +38,8 @@ static int vnic_wq_alloc_bufs(struct vnic_wq *wq)
 
         for (i = 0; i < blks; i++) {
                 wq->bufs[i] = kzalloc(VNIC_WQ_BUF_BLK_SZ(count), GFP_ATOMIC);
-                if (!wq->bufs[i]) {
-                        pr_err("Failed to alloc wq_bufs\n");
+                if (!wq->bufs[i])
                         return -ENOMEM;
-                }
         }
 
         for (i = 0; i < blks; i++) {
diff --git a/drivers/net/ethernet/davicom/dm9000.c b/drivers/net/ethernet/davicom/dm9000.c
index f801754c71a7..42383ab5227e 100644
--- a/drivers/net/ethernet/davicom/dm9000.c
+++ b/drivers/net/ethernet/davicom/dm9000.c
@@ -1028,7 +1028,7 @@ dm9000_rx(struct net_device *dev)
 
                 /* Move data from DM9000 */
                 if (GoodPacket &&
-                    ((skb = dev_alloc_skb(RxLen + 4)) != NULL)) {
+                    ((skb = netdev_alloc_skb(dev, RxLen + 4)) != NULL)) {
                         skb_reserve(skb, 2);
                         rdptr = (u8 *) skb_put(skb, RxLen - 4);
 
@@ -1373,10 +1373,8 @@ dm9000_probe(struct platform_device *pdev)
 
         /* Init network device */
         ndev = alloc_etherdev(sizeof(struct board_info));
-        if (!ndev) {
-                dev_err(&pdev->dev, "could not allocate device.\n");
+        if (!ndev)
                 return -ENOMEM;
-        }
 
         SET_NETDEV_DEV(ndev, &pdev->dev);
 
diff --git a/drivers/net/ethernet/dec/ewrk3.c b/drivers/net/ethernet/dec/ewrk3.c
index f9df5e4d0341..1879f84a25a3 100644
--- a/drivers/net/ethernet/dec/ewrk3.c
+++ b/drivers/net/ethernet/dec/ewrk3.c
@@ -986,8 +986,10 @@ static int ewrk3_rx(struct net_device *dev)
                                                 dev->stats.rx_fifo_errors++;
                                 } else {
                                         struct sk_buff *skb;
+                                        skb = netdev_alloc_skb(dev,
+                                                        pkt_len + 2);
 
-                                        if ((skb = dev_alloc_skb(pkt_len + 2)) != NULL) {
+                                        if (skb != NULL) {
                                                 unsigned char *p;
                                                 skb_reserve(skb, 2);    /* Align to 16 bytes */
                                                 p = skb_put(skb, pkt_len);
diff --git a/drivers/net/ethernet/dec/tulip/21142.c b/drivers/net/ethernet/dec/tulip/21142.c
index 25b8deedbef8..369858272650 100644
--- a/drivers/net/ethernet/dec/tulip/21142.c
+++ b/drivers/net/ethernet/dec/tulip/21142.c
@@ -1,5 +1,5 @@
 /*
-        drivers/net/tulip/21142.c
+        drivers/net/ethernet/dec/tulip/21142.c
 
         Copyright 2000,2001  The Linux Kernel Team
         Written/copyright 1994-2001 by Donald Becker.
diff --git a/drivers/net/ethernet/dec/tulip/de2104x.c b/drivers/net/ethernet/dec/tulip/de2104x.c
index 1eb46a0bb488..68f1c39184df 100644
--- a/drivers/net/ethernet/dec/tulip/de2104x.c
+++ b/drivers/net/ethernet/dec/tulip/de2104x.c
@@ -439,7 +439,7 @@ static void de_rx (struct de_private *de)
                           rx_tail, status, len, copying_skb);
 
                 buflen = copying_skb ? (len + RX_OFFSET) : de->rx_buf_sz;
-                copy_skb = dev_alloc_skb (buflen);
+                copy_skb = netdev_alloc_skb(de->dev, buflen);
                 if (unlikely(!copy_skb)) {
                         de->net_stats.rx_dropped++;
                         drop = 1;
@@ -1283,12 +1283,10 @@ static int de_refill_rx (struct de_private *de)
         for (i = 0; i < DE_RX_RING_SIZE; i++) {
                 struct sk_buff *skb;
 
-                skb = dev_alloc_skb(de->rx_buf_sz);
+                skb = netdev_alloc_skb(de->dev, de->rx_buf_sz);
                 if (!skb)
                         goto err_out;
 
-                skb->dev = de->dev;
-
                 de->rx_skb[i].mapping = pci_map_single(de->pdev,
                         skb->data, de->rx_buf_sz, PCI_DMA_FROMDEVICE);
                 de->rx_skb[i].skb = skb;
diff --git a/drivers/net/ethernet/dec/tulip/de4x5.c b/drivers/net/ethernet/dec/tulip/de4x5.c
index 4d71f5ae20c8..93583408a325 100644
--- a/drivers/net/ethernet/dec/tulip/de4x5.c
+++ b/drivers/net/ethernet/dec/tulip/de4x5.c
@@ -3598,7 +3598,7 @@ de4x5_alloc_rx_buff(struct net_device *dev, int index, int len)
     struct sk_buff *ret;
     u_long i=0, tmp;
 
-    p = dev_alloc_skb(IEEE802_3_SZ + DE4X5_ALIGN + 2);
+    p = netdev_alloc_skb(dev, IEEE802_3_SZ + DE4X5_ALIGN + 2);
     if (!p) return NULL;
 
     tmp = virt_to_bus(p->data);
@@ -3618,7 +3618,7 @@ de4x5_alloc_rx_buff(struct net_device *dev, int index, int len)
 #else
     if (lp->state != OPEN) return (struct sk_buff *)1; /* Fake out the open */
 
-    p = dev_alloc_skb(len + 2);
+    p = netdev_alloc_skb(dev, len + 2);
     if (!p) return NULL;
 
     skb_reserve(p, 2);                                 /* Align */
diff --git a/drivers/net/ethernet/dec/tulip/dmfe.c b/drivers/net/ethernet/dec/tulip/dmfe.c
index 51f7542eb451..1eccf4945485 100644
--- a/drivers/net/ethernet/dec/tulip/dmfe.c
+++ b/drivers/net/ethernet/dec/tulip/dmfe.c
@@ -325,8 +325,8 @@ static irqreturn_t dmfe_interrupt(int , void *);
 #ifdef CONFIG_NET_POLL_CONTROLLER
 static void poll_dmfe (struct net_device *dev);
 #endif
-static void dmfe_descriptor_init(struct dmfe_board_info *, unsigned long);
-static void allocate_rx_buffer(struct dmfe_board_info *);
+static void dmfe_descriptor_init(struct net_device *, unsigned long);
+static void allocate_rx_buffer(struct net_device *);
 static void update_cr6(u32, unsigned long);
 static void send_filter_frame(struct DEVICE *);
 static void dm9132_id_table(struct DEVICE *);
@@ -649,7 +649,7 @@ static void dmfe_init_dm910x(struct DEVICE *dev)
                 db->op_mode = db->media_mode;   /* Force Mode */
 
         /* Initialize Transmit/Receive decriptor and CR3/4 */
-        dmfe_descriptor_init(db, ioaddr);
+        dmfe_descriptor_init(dev, ioaddr);
 
         /* Init CR6 to program DM910x operation */
         update_cr6(db->cr6_data, ioaddr);
@@ -828,7 +828,7 @@ static irqreturn_t dmfe_interrupt(int irq, void *dev_id)
 
         /* reallocate rx descriptor buffer */
         if (db->rx_avail_cnt<RX_DESC_CNT)
-                allocate_rx_buffer(db);
+                allocate_rx_buffer(dev);
 
         /* Free the transmitted descriptor */
         if ( db->cr5_data & 0x01)
@@ -1008,7 +1008,7 @@ static void dmfe_rx_packet(struct DEVICE *dev, struct dmfe_board_info * db)
                                         /* Good packet, send to upper layer */
                                         /* Shorst packet used new SKB */
                                         if ((rxlen < RX_COPY_SIZE) &&
-                                                ((newskb = dev_alloc_skb(rxlen + 2))
+                                                ((newskb = netdev_alloc_skb(dev, rxlen + 2))
                                                 != NULL)) {
 
                                                 skb = newskb;
@@ -1364,8 +1364,9 @@ static void dmfe_reuse_skb(struct dmfe_board_info *db, struct sk_buff * skb)
  *      Using Chain structure, and allocate Tx/Rx buffer
  */
 
-static void dmfe_descriptor_init(struct dmfe_board_info *db, unsigned long ioaddr)
+static void dmfe_descriptor_init(struct net_device *dev, unsigned long ioaddr)
 {
+        struct dmfe_board_info *db = netdev_priv(dev);
         struct tx_desc *tmp_tx;
         struct rx_desc *tmp_rx;
         unsigned char *tmp_buf;
@@ -1421,7 +1422,7 @@ static void dmfe_descriptor_init(struct dmfe_board_info *db, unsigned long ioadd
         tmp_rx->next_rx_desc = db->first_rx_desc;
 
         /* pre-allocate Rx buffer */
-        allocate_rx_buffer(db);
+        allocate_rx_buffer(dev);
 }
 
 
@@ -1551,15 +1552,16 @@ static void send_filter_frame(struct DEVICE *dev)
  *      As possible as allocate maxiumn Rx buffer
  */
 
-static void allocate_rx_buffer(struct dmfe_board_info *db)
+static void allocate_rx_buffer(struct net_device *dev)
 {
+        struct dmfe_board_info *db = netdev_priv(dev);
         struct rx_desc *rxptr;
         struct sk_buff *skb;
 
         rxptr = db->rx_insert_ptr;
 
         while(db->rx_avail_cnt < RX_DESC_CNT) {
-                if ( ( skb = dev_alloc_skb(RX_ALLOC_SIZE) ) == NULL )
+                if ( ( skb = netdev_alloc_skb(dev, RX_ALLOC_SIZE) ) == NULL )
                         break;
                 rxptr->rx_skb_ptr = skb; /* FIXME (?) */
                 rxptr->rdes2 = cpu_to_le32( pci_map_single(db->pdev, skb->data,
diff --git a/drivers/net/ethernet/dec/tulip/eeprom.c b/drivers/net/ethernet/dec/tulip/eeprom.c
index 14d5b611783d..ed7d1dcd9566 100644
--- a/drivers/net/ethernet/dec/tulip/eeprom.c
+++ b/drivers/net/ethernet/dec/tulip/eeprom.c
@@ -1,5 +1,5 @@
 /*
-        drivers/net/tulip/eeprom.c
+        drivers/net/ethernet/dec/tulip/eeprom.c
 
         Copyright 2000,2001  The Linux Kernel Team
         Written/copyright 1994-2001 by Donald Becker.
diff --git a/drivers/net/ethernet/dec/tulip/interrupt.c b/drivers/net/ethernet/dec/tulip/interrupt.c
index 4fb8c8c0a420..28a5e425fecf 100644
--- a/drivers/net/ethernet/dec/tulip/interrupt.c
+++ b/drivers/net/ethernet/dec/tulip/interrupt.c
@@ -1,5 +1,5 @@
 /*
-        drivers/net/tulip/interrupt.c
+        drivers/net/ethernet/dec/tulip/interrupt.c
 
         Copyright 2000,2001  The Linux Kernel Team
         Written/copyright 1994-2001 by Donald Becker.
@@ -69,7 +69,8 @@ int tulip_refill_rx(struct net_device *dev)
                         struct sk_buff *skb;
                         dma_addr_t mapping;
 
-                        skb = tp->rx_buffers[entry].skb = dev_alloc_skb(PKT_BUF_SZ);
+                        skb = tp->rx_buffers[entry].skb =
+                                netdev_alloc_skb(dev, PKT_BUF_SZ);
                         if (skb == NULL)
                                 break;
 
@@ -77,7 +78,6 @@ int tulip_refill_rx(struct net_device *dev)
                                                  PCI_DMA_FROMDEVICE);
                         tp->rx_buffers[entry].mapping = mapping;
 
-                        skb->dev = dev;                 /* Mark as being used by this device. */
                         tp->rx_ring[entry].buffer1 = cpu_to_le32(mapping);
                         refilled++;
                 }
@@ -202,7 +202,7 @@ int tulip_poll(struct napi_struct *napi, int budget)
                                /* Check if the packet is long enough to accept without copying
                                   to a minimally-sized skbuff. */
                                if (pkt_len < tulip_rx_copybreak &&
-                                   (skb = dev_alloc_skb(pkt_len + 2)) != NULL) {
+                                   (skb = netdev_alloc_skb(dev, pkt_len + 2)) != NULL) {
                                        skb_reserve(skb, 2);    /* 16 byte align the IP header */
                                        pci_dma_sync_single_for_cpu(tp->pdev,
                                                                    tp->rx_buffers[entry].mapping,
@@ -428,7 +428,7 @@ static int tulip_rx(struct net_device *dev)
                         /* Check if the packet is long enough to accept without copying
                            to a minimally-sized skbuff. */
                         if (pkt_len < tulip_rx_copybreak &&
-                            (skb = dev_alloc_skb(pkt_len + 2)) != NULL) {
+                            (skb = netdev_alloc_skb(dev, pkt_len + 2)) != NULL) {
                                 skb_reserve(skb, 2);    /* 16 byte align the IP header */
                                 pci_dma_sync_single_for_cpu(tp->pdev,
                                                             tp->rx_buffers[entry].mapping,
diff --git a/drivers/net/ethernet/dec/tulip/media.c b/drivers/net/ethernet/dec/tulip/media.c
index beeb17b52ad4..ae937c6749e7 100644
--- a/drivers/net/ethernet/dec/tulip/media.c
+++ b/drivers/net/ethernet/dec/tulip/media.c
@@ -1,5 +1,5 @@
 /*
-        drivers/net/tulip/media.c
+        drivers/net/ethernet/dec/tulip/media.c
 
         Copyright 2000,2001  The Linux Kernel Team
         Written/copyright 1994-2001 by Donald Becker.
diff --git a/drivers/net/ethernet/dec/tulip/pnic.c b/drivers/net/ethernet/dec/tulip/pnic.c
index 9c16e4ad02a6..5364563c4378 100644
--- a/drivers/net/ethernet/dec/tulip/pnic.c
+++ b/drivers/net/ethernet/dec/tulip/pnic.c
@@ -1,5 +1,5 @@
 /*
-        drivers/net/tulip/pnic.c
+        drivers/net/ethernet/dec/tulip/pnic.c
 
         Copyright 2000,2001  The Linux Kernel Team
         Written/copyright 1994-2001 by Donald Becker.
diff --git a/drivers/net/ethernet/dec/tulip/pnic2.c b/drivers/net/ethernet/dec/tulip/pnic2.c
index 04a7e477eaff..5895fc43f6e0 100644
--- a/drivers/net/ethernet/dec/tulip/pnic2.c
+++ b/drivers/net/ethernet/dec/tulip/pnic2.c
@@ -1,5 +1,5 @@
 /*
-        drivers/net/tulip/pnic2.c
+        drivers/net/ethernet/dec/tulip/pnic2.c
 
         Copyright 2000,2001  The Linux Kernel Team
         Written/copyright 1994-2001 by Donald Becker.
diff --git a/drivers/net/ethernet/dec/tulip/timer.c b/drivers/net/ethernet/dec/tulip/timer.c
index 19078d28ffb9..768379b8aee9 100644
--- a/drivers/net/ethernet/dec/tulip/timer.c
+++ b/drivers/net/ethernet/dec/tulip/timer.c
@@ -1,5 +1,5 @@
 /*
-        drivers/net/tulip/timer.c
+        drivers/net/ethernet/dec/tulip/timer.c
 
         Copyright 2000,2001  The Linux Kernel Team
         Written/copyright 1994-2001 by Donald Becker.
diff --git a/drivers/net/ethernet/dec/tulip/tulip.h b/drivers/net/ethernet/dec/tulip/tulip.h
index fb3887c18dc6..38431a155f09 100644
--- a/drivers/net/ethernet/dec/tulip/tulip.h
+++ b/drivers/net/ethernet/dec/tulip/tulip.h
@@ -1,5 +1,5 @@
 /*
-        drivers/net/tulip/tulip.h
+        drivers/net/ethernet/dec/tulip/tulip.h
 
         Copyright 2000,2001  The Linux Kernel Team
         Written/copyright 1994-2001 by Donald Becker.
diff --git a/drivers/net/ethernet/dec/tulip/tulip_core.c b/drivers/net/ethernet/dec/tulip/tulip_core.c
index 4eb0d76145c2..fea3641d9398 100644
--- a/drivers/net/ethernet/dec/tulip/tulip_core.c
+++ b/drivers/net/ethernet/dec/tulip/tulip_core.c
@@ -636,16 +636,15 @@ static void tulip_init_ring(struct net_device *dev)
                 dma_addr_t mapping;
 
                 /* Note the receive buffer must be longword aligned.
-                   dev_alloc_skb() provides 16 byte alignment.  But do *not*
+                   netdev_alloc_skb() provides 16 byte alignment.  But do *not*
                    use skb_reserve() to align the IP header! */
-                struct sk_buff *skb = dev_alloc_skb(PKT_BUF_SZ);
+                struct sk_buff *skb = netdev_alloc_skb(dev, PKT_BUF_SZ);
                 tp->rx_buffers[i].skb = skb;
                 if (skb == NULL)
                         break;
                 mapping = pci_map_single(tp->pdev, skb->data,
                                          PKT_BUF_SZ, PCI_DMA_FROMDEVICE);
                 tp->rx_buffers[i].mapping = mapping;
-                skb->dev = dev;                 /* Mark as being used by this device. */
                 tp->rx_ring[i].status = cpu_to_le32(DescOwned); /* Owned by Tulip chip */
                 tp->rx_ring[i].buffer1 = cpu_to_le32(mapping);
         }
@@ -1424,10 +1423,8 @@ static int __devinit tulip_init_one (struct pci_dev *pdev,
 
         /* alloc_etherdev ensures aligned and zeroed private structures */
         dev = alloc_etherdev (sizeof (*tp));
-        if (!dev) {
-                pr_err("ether device alloc failed, aborting\n");
+        if (!dev)
                 return -ENOMEM;
-        }
 
         SET_NETDEV_DEV(dev, &pdev->dev);
         if (pci_resource_len (pdev, 0) < tulip_tbl[chip_idx].io_size) {
diff --git a/drivers/net/ethernet/dec/tulip/uli526x.c b/drivers/net/ethernet/dec/tulip/uli526x.c
index 48b0b6566eef..fc4001f6a5e4 100644
--- a/drivers/net/ethernet/dec/tulip/uli526x.c
+++ b/drivers/net/ethernet/dec/tulip/uli526x.c
@@ -232,8 +232,8 @@ static irqreturn_t uli526x_interrupt(int, void *);
 #ifdef CONFIG_NET_POLL_CONTROLLER
 static void uli526x_poll(struct net_device *dev);
 #endif
-static void uli526x_descriptor_init(struct uli526x_board_info *, unsigned long);
-static void allocate_rx_buffer(struct uli526x_board_info *);
+static void uli526x_descriptor_init(struct net_device *, unsigned long);
+static void allocate_rx_buffer(struct net_device *);
 static void update_cr6(u32, unsigned long);
 static void send_filter_frame(struct net_device *, int);
 static u16 phy_read(unsigned long, u8, u8, u32);
@@ -549,7 +549,7 @@ static void uli526x_init(struct net_device *dev)
                 db->op_mode = db->media_mode;   /* Force Mode */
 
         /* Initialize Transmit/Receive decriptor and CR3/4 */
-        uli526x_descriptor_init(db, ioaddr);
+        uli526x_descriptor_init(dev, ioaddr);
 
         /* Init CR6 to program M526X operation */
         update_cr6(db->cr6_data, ioaddr);
@@ -711,7 +711,7 @@ static irqreturn_t uli526x_interrupt(int irq, void *dev_id)
 
         /* reallocate rx descriptor buffer */
         if (db->rx_avail_cnt<RX_DESC_CNT)
-                allocate_rx_buffer(db);
+                allocate_rx_buffer(dev);
 
         /* Free the transmitted descriptor */
         if ( db->cr5_data & 0x01)
@@ -844,7 +844,7 @@ static void uli526x_rx_packet(struct net_device *dev, struct uli526x_board_info
                                 /* Good packet, send to upper layer */
                                 /* Shorst packet used new SKB */
                                 if ((rxlen < RX_COPY_SIZE) &&
-                                    (((new_skb = dev_alloc_skb(rxlen + 2)) != NULL))) {
+                                    (((new_skb = netdev_alloc_skb(dev, rxlen + 2)) != NULL))) {
                                         skb = new_skb;
                                         /* size less than COPY_SIZE, allocate a rxlen SKB */
                                         skb_reserve(skb, 2); /* 16byte align */
@@ -1289,8 +1289,9 @@ static void uli526x_reuse_skb(struct uli526x_board_info *db, struct sk_buff * sk
  *      Using Chain structure, and allocate Tx/Rx buffer
  */
 
-static void uli526x_descriptor_init(struct uli526x_board_info *db, unsigned long ioaddr)
+static void uli526x_descriptor_init(struct net_device *dev, unsigned long ioaddr)
 {
+        struct uli526x_board_info *db = netdev_priv(dev);
         struct tx_desc *tmp_tx;
         struct rx_desc *tmp_rx;
         unsigned char *tmp_buf;
@@ -1343,7 +1344,7 @@ static void uli526x_descriptor_init(struct uli526x_board_info *db, unsigned long
         tmp_rx->next_rx_desc = db->first_rx_desc;
 
         /* pre-allocate Rx buffer */
-        allocate_rx_buffer(db);
+        allocate_rx_buffer(dev);
 }
 
 
@@ -1433,15 +1434,17 @@ static void send_filter_frame(struct net_device *dev, int mc_cnt)
  *      As possible as allocate maxiumn Rx buffer
  */
 
-static void allocate_rx_buffer(struct uli526x_board_info *db)
+static void allocate_rx_buffer(struct net_device *dev)
 {
+        struct uli526x_board_info *db = netdev_priv(dev);
         struct rx_desc *rxptr;
         struct sk_buff *skb;
 
         rxptr = db->rx_insert_ptr;
 
         while(db->rx_avail_cnt < RX_DESC_CNT) {
-                if ( ( skb = dev_alloc_skb(RX_ALLOC_SIZE) ) == NULL )
+                skb = netdev_alloc_skb(dev, RX_ALLOC_SIZE);
+                if (skb == NULL)
                         break;
                 rxptr->rx_skb_ptr = skb; /* FIXME (?) */
                 rxptr->rdes2 = cpu_to_le32(pci_map_single(db->pdev,
diff --git a/drivers/net/ethernet/dec/tulip/winbond-840.c b/drivers/net/ethernet/dec/tulip/winbond-840.c
index 52da7b2fe3b6..2ac6fff0363a 100644
--- a/drivers/net/ethernet/dec/tulip/winbond-840.c
+++ b/drivers/net/ethernet/dec/tulip/winbond-840.c
@@ -815,7 +815,7 @@ static void init_rxtx_rings(struct net_device *dev)
 
         /* Fill in the Rx buffers.  Handle allocation failure gracefully. */
         for (i = 0; i < RX_RING_SIZE; i++) {
-                struct sk_buff *skb = dev_alloc_skb(np->rx_buf_sz);
+                struct sk_buff *skb = netdev_alloc_skb(dev, np->rx_buf_sz);
                 np->rx_skbuff[i] = skb;
                 if (skb == NULL)
                         break;
@@ -1231,7 +1231,7 @@ static int netdev_rx(struct net_device *dev)
                         /* Check if the packet is long enough to accept without copying
                            to a minimally-sized skbuff. */
                         if (pkt_len < rx_copybreak &&
-                            (skb = dev_alloc_skb(pkt_len + 2)) != NULL) {
+                            (skb = netdev_alloc_skb(dev, pkt_len + 2)) != NULL) {
                                 skb_reserve(skb, 2);    /* 16 byte align the IP header */
                                 pci_dma_sync_single_for_cpu(np->pci_dev,np->rx_addr[entry],
                                                             np->rx_skbuff[entry]->len,
@@ -1270,7 +1270,7 @@ static int netdev_rx(struct net_device *dev)
                 struct sk_buff *skb;
                 entry = np->dirty_rx % RX_RING_SIZE;
                 if (np->rx_skbuff[entry] == NULL) {
-                        skb = dev_alloc_skb(np->rx_buf_sz);
+                        skb = netdev_alloc_skb(dev, np->rx_buf_sz);
                         np->rx_skbuff[entry] = skb;
                         if (skb == NULL)
                                 break;                  /* Better luck next round. */
diff --git a/drivers/net/ethernet/dec/tulip/xircom_cb.c b/drivers/net/ethernet/dec/tulip/xircom_cb.c
index 988b8eb24d37..fdb329fe6e8e 100644
--- a/drivers/net/ethernet/dec/tulip/xircom_cb.c
+++ b/drivers/net/ethernet/dec/tulip/xircom_cb.c
@@ -222,10 +222,9 @@ static int __devinit xircom_probe(struct pci_dev *pdev, const struct pci_device_
            is available.
          */
         dev = alloc_etherdev(sizeof(struct xircom_private));
-        if (!dev) {
-                pr_err("%s: failed to allocate etherdev\n", __func__);
+        if (!dev)
                 goto device_fail;
-        }
+
         private = netdev_priv(dev);
 
         /* Allocate the send/receive buffers */
@@ -1085,7 +1084,7 @@ investigate_read_descriptor(struct net_device *dev, struct xircom_private *card,
                         pkt_len = 1518;
                 }
 
-                skb = dev_alloc_skb(pkt_len + 2);
+                skb = netdev_alloc_skb(dev, pkt_len + 2);
                 if (skb == NULL) {
                         dev->stats.rx_dropped++;
                         goto out;
diff --git a/drivers/net/ethernet/dlink/de600.c b/drivers/net/ethernet/dlink/de600.c
index c24fab1e9cbe..682750c052c8 100644
--- a/drivers/net/ethernet/dlink/de600.c
+++ b/drivers/net/ethernet/dlink/de600.c
@@ -335,7 +335,7 @@ static void de600_rx_intr(struct net_device *dev)
                 return;
         }
 
-        skb = dev_alloc_skb(size+2);
+        skb = netdev_alloc_skb(dev, size + 2);
         if (skb == NULL) {
                 printk("%s: Couldn't allocate a sk_buff of size %d.\n", dev->name, size);
                 return;
diff --git a/drivers/net/ethernet/dlink/de620.c b/drivers/net/ethernet/dlink/de620.c
index 3b934ab784d3..afc5aaac6b60 100644
--- a/drivers/net/ethernet/dlink/de620.c
+++ b/drivers/net/ethernet/dlink/de620.c
@@ -650,7 +650,7 @@ static int de620_rx_intr(struct net_device *dev)
                 printk(KERN_WARNING "%s: Illegal packet size: %d!\n", dev->name, size);
         }
         else { /* Good packet? */
-                skb = dev_alloc_skb(size+2);
+                skb = netdev_alloc_skb(dev, size + 2);
                 if (skb == NULL) { /* Yeah, but no place to put it... */
                         printk(KERN_WARNING "%s: Couldn't allocate a sk_buff of size %d.\n", dev->name, size);
                         dev->stats.rx_dropped++;
diff --git a/drivers/net/ethernet/dlink/sundance.c b/drivers/net/ethernet/dlink/sundance.c
index 28a3a9b50b8b..7227f29ee2ee 100644
--- a/drivers/net/ethernet/dlink/sundance.c
+++ b/drivers/net/ethernet/dlink/sundance.c
@@ -1020,11 +1020,11 @@ static void init_ring(struct net_device *dev)
 
         /* Fill in the Rx buffers.  Handle allocation failure gracefully. */
         for (i = 0; i < RX_RING_SIZE; i++) {
-                struct sk_buff *skb = dev_alloc_skb(np->rx_buf_sz + 2);
+                struct sk_buff *skb =
+                        netdev_alloc_skb(dev, np->rx_buf_sz + 2);
                 np->rx_skbuff[i] = skb;
                 if (skb == NULL)
                         break;
-                skb->dev = dev;         /* Mark as being used by this device. */
                 skb_reserve(skb, 2);    /* 16 byte align the IP header. */
                 np->rx_ring[i].frag[0].addr = cpu_to_le32(
                         dma_map_single(&np->pci_dev->dev, skb->data,
@@ -1358,7 +1358,7 @@ static void rx_poll(unsigned long data)
                         /* Check if the packet is long enough to accept without copying
                            to a minimally-sized skbuff. */
                         if (pkt_len < rx_copybreak &&
-                            (skb = dev_alloc_skb(pkt_len + 2)) != NULL) {
+                            (skb = netdev_alloc_skb(dev, pkt_len + 2)) != NULL) {
                                 skb_reserve(skb, 2);    /* 16 byte align the IP header */
                                 dma_sync_single_for_cpu(&np->pci_dev->dev,
                                                 le32_to_cpu(desc->frag[0].addr),
@@ -1411,11 +1411,10 @@ static void refill_rx (struct net_device *dev)
                 struct sk_buff *skb;
                 entry = np->dirty_rx % RX_RING_SIZE;
                 if (np->rx_skbuff[entry] == NULL) {
-                        skb = dev_alloc_skb(np->rx_buf_sz + 2);
+                        skb = netdev_alloc_skb(dev, np->rx_buf_sz + 2);
                         np->rx_skbuff[entry] = skb;
                         if (skb == NULL)
                                 break;          /* Better luck next round. */
-                        skb->dev = dev;         /* Mark as being used by this device. */
                         skb_reserve(skb, 2);    /* Align IP on 16 byte boundaries */
                         np->rx_ring[entry].frag[0].addr = cpu_to_le32(
                                 dma_map_single(&np->pci_dev->dev, skb->data,
diff --git a/drivers/net/ethernet/dnet.c b/drivers/net/ethernet/dnet.c
index 925c9bafc9b9..8536e376555a 100644
--- a/drivers/net/ethernet/dnet.c
+++ b/drivers/net/ethernet/dnet.c
@@ -421,7 +421,7 @@ static int dnet_poll(struct napi_struct *napi, int budget)
                         printk(KERN_ERR "%s packet receive error %x\n",
                                __func__, cmd_word);
 
-                skb = dev_alloc_skb(pkt_len + 5);
+                skb = netdev_alloc_skb(dev, pkt_len + 5);
                 if (skb != NULL) {
                         /* Align IP on 16 byte boundaries */
                         skb_reserve(skb, 2);
@@ -854,10 +854,8 @@ static int __devinit dnet_probe(struct platform_device *pdev)
 
         err = -ENOMEM;
         dev = alloc_etherdev(sizeof(*bp));
-        if (!dev) {
-                dev_err(&pdev->dev, "etherdev alloc failed, aborting.\n");
+        if (!dev)
                 goto err_out_release_mem;
-        }
 
         /* TODO: Actually, we have some interesting features... */
         dev->features |= 0;
diff --git a/drivers/net/ethernet/emulex/benet/be.h b/drivers/net/ethernet/emulex/benet/be.h
index cbdec2536da6..74aa14811977 100644
--- a/drivers/net/ethernet/emulex/benet/be.h
+++ b/drivers/net/ethernet/emulex/benet/be.h
@@ -74,6 +74,9 @@ static inline char *nic_name(struct pci_dev *pdev)
 
 /* Number of bytes of an RX frame that are copied to skb->data */
 #define BE_HDR_LEN              ((u16) 64)
+/* allocate extra space to allow tunneling decapsulation without head reallocation */
+#define BE_RX_SKB_ALLOC_SIZE (BE_HDR_LEN + 64)
+
 #define BE_MAX_JUMBO_FRAME_SIZE 9018
 #define BE_MIN_MTU              256
 
@@ -262,7 +265,6 @@ struct be_drv_stats {
         u32 rx_drops_no_erx_descr;
         u32 rx_drops_no_tpre_descr;
         u32 rx_drops_too_many_frags;
-        u32 rx_drops_invalid_ring;
         u32 forwarded_packets;
         u32 rx_drops_mtu;
         u32 rx_crc_errors;
@@ -273,7 +275,7 @@ struct be_drv_stats {
         u32 rx_in_range_errors;
         u32 rx_out_range_errors;
         u32 rx_frame_too_long;
-        u32 rx_address_match_errors;
+        u32 rx_address_mismatch_drops;
         u32 rx_dropped_too_small;
         u32 rx_dropped_too_short;
         u32 rx_dropped_header_too_small;
diff --git a/drivers/net/ethernet/emulex/benet/be_cmds.c b/drivers/net/ethernet/emulex/benet/be_cmds.c
index 0fcb45624796..29dff7de66b6 100644
--- a/drivers/net/ethernet/emulex/benet/be_cmds.c
+++ b/drivers/net/ethernet/emulex/benet/be_cmds.c
@@ -1257,11 +1257,13 @@ int be_cmd_link_status_query(struct be_adapter *adapter, u8 *mac_speed,
         }
         req = embedded_payload(wrb);
 
+        be_wrb_cmd_hdr_prepare(&req->hdr, CMD_SUBSYSTEM_COMMON,
+                OPCODE_COMMON_NTWK_LINK_STATUS_QUERY, sizeof(*req), wrb, NULL);
+
         if (adapter->generation == BE_GEN3 || lancer_chip(adapter))
                 req->hdr.version = 1;
 
-        be_wrb_cmd_hdr_prepare(&req->hdr, CMD_SUBSYSTEM_COMMON,
-                OPCODE_COMMON_NTWK_LINK_STATUS_QUERY, sizeof(*req), wrb, NULL);
+        req->hdr.domain = dom;
 
         status = be_mcc_notify_wait(adapter);
         if (!status) {
@@ -2298,52 +2300,81 @@ err:
 
 /* Uses synchronous MCCQ */
 int be_cmd_get_mac_from_list(struct be_adapter *adapter, u32 domain,
-                                                        u32 *pmac_id)
+                        bool *pmac_id_active, u32 *pmac_id, u8 *mac)
 {
         struct be_mcc_wrb *wrb;
         struct be_cmd_req_get_mac_list *req;
         int status;
         int mac_count;
+        struct be_dma_mem get_mac_list_cmd;
+        int i;
+
+        memset(&get_mac_list_cmd, 0, sizeof(struct be_dma_mem));
+        get_mac_list_cmd.size = sizeof(struct be_cmd_resp_get_mac_list);
+        get_mac_list_cmd.va = pci_alloc_consistent(adapter->pdev,
+                        get_mac_list_cmd.size,
+                        &get_mac_list_cmd.dma);
+
+        if (!get_mac_list_cmd.va) {
+                dev_err(&adapter->pdev->dev,
+                                "Memory allocation failure during GET_MAC_LIST\n");
+                return -ENOMEM;
+        }
 
         spin_lock_bh(&adapter->mcc_lock);
 
         wrb = wrb_from_mccq(adapter);
         if (!wrb) {
                 status = -EBUSY;
-                goto err;
+                goto out;
         }
-        req = embedded_payload(wrb);
+
+        req = get_mac_list_cmd.va;
 
         be_wrb_cmd_hdr_prepare(&req->hdr, CMD_SUBSYSTEM_COMMON,
                                 OPCODE_COMMON_GET_MAC_LIST, sizeof(*req),
-                                wrb, NULL);
+                                wrb, &get_mac_list_cmd);
 
         req->hdr.domain = domain;
+        req->mac_type = MAC_ADDRESS_TYPE_NETWORK;
+        req->perm_override = 1;
 
         status = be_mcc_notify_wait(adapter);
         if (!status) {
                 struct be_cmd_resp_get_mac_list *resp =
-                                                embedded_payload(wrb);
-                int i;
-                u8 *ctxt = &resp->context[0][0];
-                status = -EIO;
-                mac_count = resp->mac_count;
-                be_dws_le_to_cpu(&resp->context, sizeof(resp->context));
+                                                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
+                 */
                 for (i = 0; i < mac_count; i++) {
-                        if (!AMAP_GET_BITS(struct amap_get_mac_list_context,
-                                           act, ctxt)) {
-                                *pmac_id = AMAP_GET_BITS
-                                        (struct amap_get_mac_list_context,
-                                         macid, ctxt);
-                                status = 0;
-                                break;
+                        struct get_list_macaddr *mac_entry;
+                        u16 mac_addr_size;
+                        u32 mac_id;
+
+                        mac_entry = &resp->macaddr_list[i];
+                        mac_addr_size = le16_to_cpu(mac_entry->mac_addr_size);
+                        /* mac_id is a 32 bit value and mac_addr size
+                         * is 6 bytes
+                         */
+                        if (mac_addr_size == sizeof(u32)) {
+                                *pmac_id_active = true;
+                                mac_id = mac_entry->mac_addr_id.s_mac_id.mac_id;
+                                *pmac_id = le32_to_cpu(mac_id);
+                                goto out;
                         }
-                        ctxt += sizeof(struct amap_get_mac_list_context) / 8;
                 }
+                /* If no active mac_id found, return first pseudo mac addr */
+                *pmac_id_active = false;
+                memcpy(mac, resp->macaddr_list[0].mac_addr_id.macaddr,
+                                                                ETH_ALEN);
         }
 
-err:
+out:
         spin_unlock_bh(&adapter->mcc_lock);
+        pci_free_consistent(adapter->pdev, get_mac_list_cmd.size,
+                        get_mac_list_cmd.va, get_mac_list_cmd.dma);
         return status;
 }
 
diff --git a/drivers/net/ethernet/emulex/benet/be_cmds.h b/drivers/net/ethernet/emulex/benet/be_cmds.h
index dca89249088f..5bb66c80f05e 100644
--- a/drivers/net/ethernet/emulex/benet/be_cmds.h
+++ b/drivers/net/ethernet/emulex/benet/be_cmds.h
@@ -592,8 +592,8 @@ struct be_port_rxf_stats_v0 {
         u32 rx_in_range_errors; /* dword 10*/
         u32 rx_out_range_errors;        /* dword 11*/
         u32 rx_frame_too_long;  /* dword 12*/
-        u32 rx_address_match_errors;    /* dword 13*/
-        u32 rx_vlan_mismatch;   /* dword 14*/
+        u32 rx_address_mismatch_drops;  /* dword 13*/
+        u32 rx_vlan_mismatch_drops;     /* dword 14*/
         u32 rx_dropped_too_small;       /* dword 15*/
         u32 rx_dropped_too_short;       /* dword 16*/
         u32 rx_dropped_header_too_small;        /* dword 17*/
@@ -799,8 +799,8 @@ struct lancer_pport_stats {
         u32 rx_control_frames_unknown_opcode_hi;
         u32 rx_in_range_errors;
         u32 rx_out_of_range_errors;
-        u32 rx_address_match_errors;
-        u32 rx_vlan_mismatch_errors;
+        u32 rx_address_mismatch_drops;
+        u32 rx_vlan_mismatch_drops;
         u32 rx_dropped_too_small;
         u32 rx_dropped_too_short;
         u32 rx_dropped_header_too_small;
@@ -1346,22 +1346,36 @@ struct be_cmd_resp_set_func_cap {
 
 /******************** GET/SET_MACLIST  **************************/
 #define BE_MAX_MAC                      64
-struct amap_get_mac_list_context {
-        u8 macid[31];
-        u8 act;
-} __packed;
-
 struct be_cmd_req_get_mac_list {
         struct be_cmd_req_hdr hdr;
-        u32 rsvd;
+        u8 mac_type;
+        u8 perm_override;
+        u16 iface_id;
+        u32 mac_id;
+        u32 rsvd[3];
+} __packed;
+
+struct get_list_macaddr {
+        u16 mac_addr_size;
+        union {
+                u8 macaddr[6];
+                struct {
+                        u8 rsvd[2];
+                        u32 mac_id;
+                } __packed s_mac_id;
+        } __packed mac_addr_id;
 } __packed;
 
 struct be_cmd_resp_get_mac_list {
         struct be_cmd_resp_hdr hdr;
-        u8 mac_count;
-        u8 rsvd1;
-        u16 rsvd2;
-        u8 context[sizeof(struct amap_get_mac_list_context) / 8][BE_MAX_MAC];
+        struct get_list_macaddr fd_macaddr; /* Factory default mac */
+        struct get_list_macaddr macid_macaddr; /* soft mac */
+        u8 true_mac_count;
+        u8 pseudo_mac_count;
+        u8 mac_list_size;
+        u8 rsvd;
+        /* perm override mac */
+        struct get_list_macaddr macaddr_list[BE_MAX_MAC];
 } __packed;
 
 struct be_cmd_req_set_mac_list {
@@ -1384,7 +1398,7 @@ struct be_port_rxf_stats_v1 {
         u32 rx_in_range_errors;
         u32 rx_out_range_errors;
         u32 rx_frame_too_long;
-        u32 rx_address_match_errors;
+        u32 rx_address_mismatch_drops;
         u32 rx_dropped_too_small;
         u32 rx_dropped_too_short;
         u32 rx_dropped_header_too_small;
@@ -1575,7 +1589,7 @@ 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,
-                                                        u32 *pmac_id);
+                                bool *pmac_id_active, u32 *pmac_id, u8 *mac);
 extern int be_cmd_set_mac_list(struct be_adapter *adapter, u8 *mac_array,
                                                 u8 mac_count, u32 domain);
 
diff --git a/drivers/net/ethernet/emulex/benet/be_ethtool.c b/drivers/net/ethernet/emulex/benet/be_ethtool.c
index 802e5ddef8a8..dc1383c396c0 100644
--- a/drivers/net/ethernet/emulex/benet/be_ethtool.c
+++ b/drivers/net/ethernet/emulex/benet/be_ethtool.c
@@ -42,15 +42,42 @@ static const struct be_ethtool_stat et_stats[] = {
         {DRVSTAT_INFO(rx_alignment_symbol_errors)},
         {DRVSTAT_INFO(rx_pause_frames)},
         {DRVSTAT_INFO(rx_control_frames)},
+        /* Received packets dropped when the Ethernet length field
+         * is not equal to the actual Ethernet data length.
+         */
         {DRVSTAT_INFO(rx_in_range_errors)},
+        /* Received packets dropped when their length field is >= 1501 bytes
+         * and <= 1535 bytes.
+         */
         {DRVSTAT_INFO(rx_out_range_errors)},
+        /* Received packets dropped when they are longer than 9216 bytes */
         {DRVSTAT_INFO(rx_frame_too_long)},
-        {DRVSTAT_INFO(rx_address_match_errors)},
+        /* Received packets dropped when they don't pass the unicast or
+         * multicast address filtering.
+         */
+        {DRVSTAT_INFO(rx_address_mismatch_drops)},
+        /* Received packets dropped when IP packet length field is less than
+         * the IP header length field.
+         */
         {DRVSTAT_INFO(rx_dropped_too_small)},
+        /* Received packets dropped when IP length field is greater than
+         * the actual packet length.
+         */
         {DRVSTAT_INFO(rx_dropped_too_short)},
+        /* Received packets dropped when the IP header length field is less
+         * than 5.
+         */
         {DRVSTAT_INFO(rx_dropped_header_too_small)},
+        /* Received packets dropped when the TCP header length field is less
+         * than 5 or the TCP header length + IP header length is more
+         * than IP packet length.
+         */
         {DRVSTAT_INFO(rx_dropped_tcp_length)},
         {DRVSTAT_INFO(rx_dropped_runt)},
+        /* Number of received packets dropped when a fifo for descriptors going
+         * into the packet demux block overflows. In normal operation, this
+         * fifo must never overflow.
+         */
         {DRVSTAT_INFO(rxpp_fifo_overflow_drop)},
         {DRVSTAT_INFO(rx_input_fifo_overflow_drop)},
         {DRVSTAT_INFO(rx_ip_checksum_errs)},
@@ -59,16 +86,35 @@ static const struct be_ethtool_stat et_stats[] = {
         {DRVSTAT_INFO(tx_pauseframes)},
         {DRVSTAT_INFO(tx_controlframes)},
         {DRVSTAT_INFO(rx_priority_pause_frames)},
+        /* Received packets dropped when an internal fifo going into
+         * main packet buffer tank (PMEM) overflows.
+         */
         {DRVSTAT_INFO(pmem_fifo_overflow_drop)},
         {DRVSTAT_INFO(jabber_events)},
+        /* Received packets dropped due to lack of available HW packet buffers
+         * used to temporarily hold the received packets.
+         */
         {DRVSTAT_INFO(rx_drops_no_pbuf)},
-        {DRVSTAT_INFO(rx_drops_no_txpb)},
+        /* Received packets dropped due to input receive buffer
+         * descriptor fifo overflowing.
+         */
         {DRVSTAT_INFO(rx_drops_no_erx_descr)},
+        /* Packets dropped because the internal FIFO to the offloaded TCP
+         * receive processing block is full. This could happen only for
+         * offloaded iSCSI or FCoE trarffic.
+         */
         {DRVSTAT_INFO(rx_drops_no_tpre_descr)},
+        /* Received packets dropped when they need more than 8
+         * receive buffers. This cannot happen as the driver configures
+         * 2048 byte receive buffers.
+         */
         {DRVSTAT_INFO(rx_drops_too_many_frags)},
-        {DRVSTAT_INFO(rx_drops_invalid_ring)},
         {DRVSTAT_INFO(forwarded_packets)},
+        /* Received packets dropped when the frame length
+         * is more than 9018 bytes
+         */
         {DRVSTAT_INFO(rx_drops_mtu)},
+        /* Number of packets dropped due to random early drop function */
         {DRVSTAT_INFO(eth_red_drops)},
         {DRVSTAT_INFO(be_on_die_temperature)}
 };
@@ -84,8 +130,15 @@ static const struct be_ethtool_stat et_rx_stats[] = {
         {DRVSTAT_RX_INFO(rx_events)},
         {DRVSTAT_RX_INFO(rx_compl)},
         {DRVSTAT_RX_INFO(rx_mcast_pkts)},
+        /* Number of page allocation failures while posting receive buffers
+         * to HW.
+         */
         {DRVSTAT_RX_INFO(rx_post_fail)},
+        /* Recevied packets dropped due to skb allocation failure */
         {DRVSTAT_RX_INFO(rx_drops_no_skbs)},
+        /* Received packets dropped due to lack of available fetched buffers
+         * posted by the driver.
+         */
         {DRVSTAT_RX_INFO(rx_drops_no_frags)}
 };
 #define ETHTOOL_RXSTATS_NUM (ARRAY_SIZE(et_rx_stats))
@@ -97,9 +150,14 @@ static const struct be_ethtool_stat et_tx_stats[] = {
         {DRVSTAT_TX_INFO(tx_compl)}, /* If moving this member see above note */
         {DRVSTAT_TX_INFO(tx_bytes)},
         {DRVSTAT_TX_INFO(tx_pkts)},
+        /* Number of skbs queued for trasmission by the driver */
         {DRVSTAT_TX_INFO(tx_reqs)},
+        /* Number of TX work request blocks DMAed to HW */
         {DRVSTAT_TX_INFO(tx_wrbs)},
         {DRVSTAT_TX_INFO(tx_compl)},
+        /* Number of times the TX queue was stopped due to lack
+         * of spaces in the TXQ.
+         */
         {DRVSTAT_TX_INFO(tx_stops)}
 };
 #define ETHTOOL_TXSTATS_NUM (ARRAY_SIZE(et_tx_stats))
diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c
index e703d64434f8..780498784d8e 100644
--- a/drivers/net/ethernet/emulex/benet/be_main.c
+++ b/drivers/net/ethernet/emulex/benet/be_main.c
@@ -286,7 +286,9 @@ static void populate_be2_stats(struct be_adapter *adapter)
         drvs->rx_input_fifo_overflow_drop = port_stats->rx_input_fifo_overflow;
         drvs->rx_dropped_header_too_small =
                 port_stats->rx_dropped_header_too_small;
-        drvs->rx_address_match_errors = port_stats->rx_address_match_errors;
+        drvs->rx_address_mismatch_drops =
+                                        port_stats->rx_address_mismatch_drops +
+                                        port_stats->rx_vlan_mismatch_drops;
         drvs->rx_alignment_symbol_errors =
                 port_stats->rx_alignment_symbol_errors;
 
@@ -298,9 +300,7 @@ static void populate_be2_stats(struct be_adapter *adapter)
         else
                 drvs->jabber_events = rxf_stats->port0_jabber_events;
         drvs->rx_drops_no_pbuf = rxf_stats->rx_drops_no_pbuf;
-        drvs->rx_drops_no_txpb = rxf_stats->rx_drops_no_txpb;
         drvs->rx_drops_no_erx_descr = rxf_stats->rx_drops_no_erx_descr;
-        drvs->rx_drops_invalid_ring = rxf_stats->rx_drops_invalid_ring;
         drvs->forwarded_packets = rxf_stats->forwarded_packets;
         drvs->rx_drops_mtu = rxf_stats->rx_drops_mtu;
         drvs->rx_drops_no_tpre_descr = rxf_stats->rx_drops_no_tpre_descr;
@@ -337,7 +337,7 @@ static void populate_be3_stats(struct be_adapter *adapter)
                 port_stats->rx_dropped_header_too_small;
         drvs->rx_input_fifo_overflow_drop =
                 port_stats->rx_input_fifo_overflow_drop;
-        drvs->rx_address_match_errors = port_stats->rx_address_match_errors;
+        drvs->rx_address_mismatch_drops = port_stats->rx_address_mismatch_drops;
         drvs->rx_alignment_symbol_errors =
                 port_stats->rx_alignment_symbol_errors;
         drvs->rxpp_fifo_overflow_drop = port_stats->rxpp_fifo_overflow_drop;
@@ -345,9 +345,7 @@ static void populate_be3_stats(struct be_adapter *adapter)
         drvs->tx_controlframes = port_stats->tx_controlframes;
         drvs->jabber_events = port_stats->jabber_events;
         drvs->rx_drops_no_pbuf = rxf_stats->rx_drops_no_pbuf;
-        drvs->rx_drops_no_txpb = rxf_stats->rx_drops_no_txpb;
         drvs->rx_drops_no_erx_descr = rxf_stats->rx_drops_no_erx_descr;
-        drvs->rx_drops_invalid_ring = rxf_stats->rx_drops_invalid_ring;
         drvs->forwarded_packets = rxf_stats->forwarded_packets;
         drvs->rx_drops_mtu = rxf_stats->rx_drops_mtu;
         drvs->rx_drops_no_tpre_descr = rxf_stats->rx_drops_no_tpre_descr;
@@ -380,13 +378,14 @@ static void populate_lancer_stats(struct be_adapter *adapter)
         drvs->rx_dropped_header_too_small =
                                 pport_stats->rx_dropped_header_too_small;
         drvs->rx_input_fifo_overflow_drop = pport_stats->rx_fifo_overflow;
-        drvs->rx_address_match_errors = pport_stats->rx_address_match_errors;
+        drvs->rx_address_mismatch_drops =
+                                        pport_stats->rx_address_mismatch_drops +
+                                        pport_stats->rx_vlan_mismatch_drops;
         drvs->rx_alignment_symbol_errors = pport_stats->rx_symbol_errors_lo;
         drvs->rxpp_fifo_overflow_drop = pport_stats->rx_fifo_overflow;
         drvs->tx_pauseframes = pport_stats->tx_pause_frames_lo;
         drvs->tx_controlframes = pport_stats->tx_control_frames_lo;
         drvs->jabber_events = pport_stats->rx_jabbers;
-        drvs->rx_drops_invalid_ring = pport_stats->rx_drops_invalid_queue;
         drvs->forwarded_packets = pport_stats->num_forwards_lo;
         drvs->rx_drops_mtu = pport_stats->rx_drops_mtu_lo;
         drvs->rx_drops_too_many_frags =
@@ -1189,7 +1188,7 @@ static void be_rx_compl_process(struct be_adapter *adapter,
         struct net_device *netdev = adapter->netdev;
         struct sk_buff *skb;
 
-        skb = netdev_alloc_skb_ip_align(netdev, BE_HDR_LEN);
+        skb = netdev_alloc_skb_ip_align(netdev, BE_RX_SKB_ALLOC_SIZE);
         if (unlikely(!skb)) {
                 rx_stats(rxo)->rx_drops_no_skbs++;
                 be_rx_compl_discard(adapter, rxo, rxcp);
@@ -2609,19 +2608,28 @@ static void be_setup_init(struct be_adapter *adapter)
         adapter->eq_next_idx = 0;
 }
 
-static int be_configure_mac_from_list(struct be_adapter *adapter, u8 *mac)
+static int be_add_mac_from_list(struct be_adapter *adapter, u8 *mac)
 {
         u32 pmac_id;
-        int status = be_cmd_get_mac_from_list(adapter, 0, &pmac_id);
-        if (status != 0)
-                goto do_none;
-        status = be_cmd_mac_addr_query(adapter, mac,
-                        MAC_ADDRESS_TYPE_NETWORK,
-                        false, adapter->if_handle, pmac_id);
+        int status;
+        bool pmac_id_active;
+
+        status = be_cmd_get_mac_from_list(adapter, 0, &pmac_id_active,
+                                                        &pmac_id, mac);
         if (status != 0)
                 goto do_none;
-        status = be_cmd_pmac_add(adapter, mac, adapter->if_handle,
-                        &adapter->pmac_id, 0);
+
+        if (pmac_id_active) {
+                status = be_cmd_mac_addr_query(adapter, mac,
+                                MAC_ADDRESS_TYPE_NETWORK,
+                                false, adapter->if_handle, pmac_id);
+
+                if (!status)
+                        adapter->pmac_id = pmac_id;
+        } else {
+                status = be_cmd_pmac_add(adapter, mac,
+                                adapter->if_handle, &adapter->pmac_id, 0);
+        }
 do_none:
         return status;
 }
@@ -2686,7 +2694,7 @@ static int be_setup(struct be_adapter *adapter)
           */
         if (!be_physfn(adapter)) {
                 if (lancer_chip(adapter))
-                        status = be_configure_mac_from_list(adapter, mac);
+                        status = be_add_mac_from_list(adapter, mac);
                 else
                         status = be_cmd_mac_addr_query(adapter, mac,
                                         MAC_ADDRESS_TYPE_NETWORK, false,
diff --git a/drivers/net/ethernet/ethoc.c b/drivers/net/ethernet/ethoc.c
index 60f0e788cc25..0b723ff2294b 100644
--- a/drivers/net/ethernet/ethoc.c
+++ b/drivers/net/ethernet/ethoc.c
@@ -1,5 +1,5 @@
 /*
- * linux/drivers/net/ethoc.c
+ * linux/drivers/net/ethernet/ethoc.c
  *
  * Copyright (C) 2007-2008 Avionic Design Development GmbH
  * Copyright (C) 2008-2009 Avionic Design GmbH
@@ -913,7 +913,6 @@ static int __devinit ethoc_probe(struct platform_device *pdev)
         /* allocate networking device */
         netdev = alloc_etherdev(sizeof(struct ethoc));
         if (!netdev) {
-                dev_err(&pdev->dev, "cannot allocate network device\n");
                 ret = -ENOMEM;
                 goto out;
         }
diff --git a/drivers/net/ethernet/fealnx.c b/drivers/net/ethernet/fealnx.c
index c82d444b582d..1637b9862292 100644
--- a/drivers/net/ethernet/fealnx.c
+++ b/drivers/net/ethernet/fealnx.c
@@ -1070,14 +1070,13 @@ static void allocate_rx_buffers(struct net_device *dev)
         while (np->really_rx_count != RX_RING_SIZE) {
                 struct sk_buff *skb;
 
-                skb = dev_alloc_skb(np->rx_buf_sz);
+                skb = netdev_alloc_skb(dev, np->rx_buf_sz);
                 if (skb == NULL)
                         break;  /* Better luck next round. */
 
                 while (np->lack_rxbuf->skbuff)
                         np->lack_rxbuf = np->lack_rxbuf->next_desc_logical;
 
-                skb->dev = dev; /* Mark as being used by this device. */
                 np->lack_rxbuf->skbuff = skb;
                 np->lack_rxbuf->buffer = pci_map_single(np->pci_dev, skb->data,
                         np->rx_buf_sz, PCI_DMA_FROMDEVICE);
@@ -1265,7 +1264,7 @@ static void init_ring(struct net_device *dev)
 
         /* allocate skb for rx buffers */
         for (i = 0; i < RX_RING_SIZE; i++) {
-                struct sk_buff *skb = dev_alloc_skb(np->rx_buf_sz);
+                struct sk_buff *skb = netdev_alloc_skb(dev, np->rx_buf_sz);
 
                 if (skb == NULL) {
                         np->lack_rxbuf = &np->rx_ring[i];
@@ -1274,7 +1273,6 @@ static void init_ring(struct net_device *dev)
 
                 ++np->really_rx_count;
                 np->rx_ring[i].skbuff = skb;
-                skb->dev = dev; /* Mark as being used by this device. */
                 np->rx_ring[i].buffer = pci_map_single(np->pci_dev, skb->data,
                         np->rx_buf_sz, PCI_DMA_FROMDEVICE);
                 np->rx_ring[i].status = RXOWN;
@@ -1704,7 +1702,7 @@ static int netdev_rx(struct net_device *dev)
                         /* Check if the packet is long enough to accept without copying
                            to a minimally-sized skbuff. */
                         if (pkt_len < rx_copybreak &&
-                            (skb = dev_alloc_skb(pkt_len + 2)) != NULL) {
+                            (skb = netdev_alloc_skb(dev, pkt_len + 2)) != NULL) {
                                 skb_reserve(skb, 2);    /* 16 byte align the IP header */
                                 pci_dma_sync_single_for_cpu(np->pci_dev,
                                                             np->cur_rx->buffer,
diff --git a/drivers/net/ethernet/freescale/fec.c b/drivers/net/ethernet/freescale/fec.c
index 1c7aad8fa19c..0ee2ca7baaf3 100644
--- a/drivers/net/ethernet/freescale/fec.c
+++ b/drivers/net/ethernet/freescale/fec.c
@@ -711,7 +711,7 @@ fec_enet_rx(struct net_device *ndev)
                  * include that when passing upstream as it messes up
                  * bridging applications.
                  */
-                skb = dev_alloc_skb(pkt_len - 4 + NET_IP_ALIGN);
+                skb = netdev_alloc_skb(ndev, pkt_len - 4 + NET_IP_ALIGN);
 
                 if (unlikely(!skb)) {
                         printk("%s: Memory squeeze, dropping packet.\n",
@@ -1210,7 +1210,7 @@ static int fec_enet_alloc_buffers(struct net_device *ndev)
 
         bdp = fep->rx_bd_base;
         for (i = 0; i < RX_RING_SIZE; i++) {
-                skb = dev_alloc_skb(FEC_ENET_RX_FRSIZE);
+                skb = netdev_alloc_skb(ndev, FEC_ENET_RX_FRSIZE);
                 if (!skb) {
                         fec_enet_free_buffers(ndev);
                         return -ENOMEM;
@@ -1739,21 +1739,6 @@ static struct platform_driver fec_driver = {
         .remove = __devexit_p(fec_drv_remove),
 };
 
-static int __init
-fec_enet_module_init(void)
-{
-        printk(KERN_INFO "FEC Ethernet Driver\n");
-
-        return platform_driver_register(&fec_driver);
-}
-
-static void __exit
-fec_enet_cleanup(void)
-{
-        platform_driver_unregister(&fec_driver);
-}
-
-module_exit(fec_enet_cleanup);
-module_init(fec_enet_module_init);
+module_platform_driver(fec_driver);
 
 MODULE_LICENSE("GPL");
diff --git a/drivers/net/ethernet/freescale/fec_mpc52xx.c b/drivers/net/ethernet/freescale/fec_mpc52xx.c
index 30745b56fe5d..7b34d8c698da 100644
--- a/drivers/net/ethernet/freescale/fec_mpc52xx.c
+++ b/drivers/net/ethernet/freescale/fec_mpc52xx.c
@@ -160,7 +160,7 @@ static int mpc52xx_fec_alloc_rx_buffers(struct net_device *dev, struct bcom_task
         struct sk_buff *skb;
 
         while (!bcom_queue_full(rxtsk)) {
-                skb = dev_alloc_skb(FEC_RX_BUFFER_SIZE);
+                skb = netdev_alloc_skb(dev, FEC_RX_BUFFER_SIZE);
                 if (!skb)
                         return -EAGAIN;
 
@@ -416,7 +416,7 @@ static irqreturn_t mpc52xx_fec_rx_interrupt(int irq, void *dev_id)
 
                 /* skbs are allocated on open, so now we allocate a new one,
                  * and remove the old (with the packet) */
-                skb = dev_alloc_skb(FEC_RX_BUFFER_SIZE);
+                skb = netdev_alloc_skb(dev, FEC_RX_BUFFER_SIZE);
                 if (!skb) {
                         /* Can't get a new one : reuse the same & drop pkt */
                         dev_notice(&dev->dev, "Low memory - dropped packet.\n");
diff --git a/drivers/net/ethernet/freescale/fec_mpc52xx.h b/drivers/net/ethernet/freescale/fec_mpc52xx.h
index 41d2dffde55b..10afa54dd062 100644
--- a/drivers/net/ethernet/freescale/fec_mpc52xx.h
+++ b/drivers/net/ethernet/freescale/fec_mpc52xx.h
@@ -1,5 +1,5 @@
 /*
- * drivers/drivers/net/fec_mpc52xx/fec.h
+ * drivers/net/ethernet/freescale/fec_mpc52xx.h
  *
  * Driver for the MPC5200 Fast Ethernet Controller
  *
diff --git a/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c b/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c
index 910a8e18a9ae..999638a7c851 100644
--- a/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c
+++ b/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c
@@ -154,7 +154,7 @@ static int fs_enet_rx_napi(struct napi_struct *napi, int budget)
 
                         if (pkt_len <= fpi->rx_copybreak) {
                                 /* +2 to make IP header L1 cache aligned */
-                                skbn = dev_alloc_skb(pkt_len + 2);
+                                skbn = netdev_alloc_skb(dev, pkt_len + 2);
                                 if (skbn != NULL) {
                                         skb_reserve(skbn, 2);   /* align IP header */
                                         skb_copy_from_linear_data(skb,
@@ -165,7 +165,7 @@ static int fs_enet_rx_napi(struct napi_struct *napi, int budget)
                                         skbn = skbt;
                                 }
                         } else {
-                                skbn = dev_alloc_skb(ENET_RX_FRSIZE);
+                                skbn = netdev_alloc_skb(dev, ENET_RX_FRSIZE);
 
                                 if (skbn)
                                         skb_align(skbn, ENET_RX_ALIGN);
@@ -286,7 +286,7 @@ static int fs_enet_rx_non_napi(struct net_device *dev)
 
                         if (pkt_len <= fpi->rx_copybreak) {
                                 /* +2 to make IP header L1 cache aligned */
-                                skbn = dev_alloc_skb(pkt_len + 2);
+                                skbn = netdev_alloc_skb(dev, pkt_len + 2);
                                 if (skbn != NULL) {
                                         skb_reserve(skbn, 2);   /* align IP header */
                                         skb_copy_from_linear_data(skb,
@@ -297,7 +297,7 @@ static int fs_enet_rx_non_napi(struct net_device *dev)
                                         skbn = skbt;
                                 }
                         } else {
-                                skbn = dev_alloc_skb(ENET_RX_FRSIZE);
+                                skbn = netdev_alloc_skb(dev, ENET_RX_FRSIZE);
 
                                 if (skbn)
                                         skb_align(skbn, ENET_RX_ALIGN);
@@ -504,7 +504,7 @@ void fs_init_bds(struct net_device *dev)
          * Initialize the receive buffer descriptors.
          */
         for (i = 0, bdp = fep->rx_bd_base; i < fep->rx_ring; i++, bdp++) {
-                skb = dev_alloc_skb(ENET_RX_FRSIZE);
+                skb = netdev_alloc_skb(dev, ENET_RX_FRSIZE);
                 if (skb == NULL) {
                         dev_warn(fep->dev,
                                  "Memory squeeze, unable to allocate skb\n");
@@ -592,7 +592,7 @@ static struct sk_buff *tx_skb_align_workaround(struct net_device *dev,
         struct fs_enet_private *fep = netdev_priv(dev);
 
         /* Alloc new skb */
-        new_skb = dev_alloc_skb(skb->len + 4);
+        new_skb = netdev_alloc_skb(dev, skb->len + 4);
         if (!new_skb) {
                 if (net_ratelimit()) {
                         dev_warn(fep->dev,
diff --git a/drivers/net/ethernet/freescale/gianfar.c b/drivers/net/ethernet/freescale/gianfar.c
index 39d160d353a4..adb0ae4e4195 100644
--- a/drivers/net/ethernet/freescale/gianfar.c
+++ b/drivers/net/ethernet/freescale/gianfar.c
@@ -1,5 +1,5 @@
 /*
- * drivers/net/gianfar.c
+ * drivers/net/ethernet/freescale/gianfar.c
  *
  * Gianfar Ethernet Driver
  * This driver is designed for the non-CPM ethernet controllers
diff --git a/drivers/net/ethernet/freescale/gianfar.h b/drivers/net/ethernet/freescale/gianfar.h
index 40c33a7554c0..4fe0f342acec 100644
--- a/drivers/net/ethernet/freescale/gianfar.h
+++ b/drivers/net/ethernet/freescale/gianfar.h
@@ -1,5 +1,5 @@
 /*
- * drivers/net/gianfar.h
+ * drivers/net/ethernet/freescale/gianfar.h
  *
  * Gianfar Ethernet Driver
  * Driver for FEC on MPC8540 and TSEC on MPC8540/MPC8560
diff --git a/drivers/net/ethernet/freescale/gianfar_ethtool.c b/drivers/net/ethernet/freescale/gianfar_ethtool.c
index 5a3b2e5b2880..5a78d55f46e7 100644
--- a/drivers/net/ethernet/freescale/gianfar_ethtool.c
+++ b/drivers/net/ethernet/freescale/gianfar_ethtool.c
@@ -1,5 +1,5 @@
 /*
- *  drivers/net/gianfar_ethtool.c
+ *  drivers/net/ethernet/freescale/gianfar_ethtool.c
  *
  *  Gianfar Ethernet Driver
  *  Ethtool support for Gianfar Enet
diff --git a/drivers/net/ethernet/freescale/gianfar_sysfs.c b/drivers/net/ethernet/freescale/gianfar_sysfs.c
index 64f4094ac7f1..cd14a4d449c2 100644
--- a/drivers/net/ethernet/freescale/gianfar_sysfs.c
+++ b/drivers/net/ethernet/freescale/gianfar_sysfs.c
@@ -1,5 +1,5 @@
 /*
- * drivers/net/gianfar_sysfs.c
+ * drivers/net/ethernet/freescale/gianfar_sysfs.c
  *
  * Gianfar Ethernet Driver
  * This driver is designed for the non-CPM ethernet controllers
diff --git a/drivers/net/ethernet/freescale/ucc_geth.c b/drivers/net/ethernet/freescale/ucc_geth.c
index ba2dc083bfc0..ec0905461312 100644
--- a/drivers/net/ethernet/freescale/ucc_geth.c
+++ b/drivers/net/ethernet/freescale/ucc_geth.c
@@ -214,8 +214,9 @@ static struct sk_buff *get_new_skb(struct ucc_geth_private *ugeth,
 
         skb = __skb_dequeue(&ugeth->rx_recycle);
         if (!skb)
-                skb = dev_alloc_skb(ugeth->ug_info->uf_info.max_rx_buf_length +
-                                    UCC_GETH_RX_DATA_BUF_ALIGNMENT);
+                skb = netdev_alloc_skb(ugeth->ndev,
+                                      ugeth->ug_info->uf_info.max_rx_buf_length +
+                                      UCC_GETH_RX_DATA_BUF_ALIGNMENT);
         if (skb == NULL)
                 return NULL;
 
@@ -227,8 +228,6 @@ static struct sk_buff *get_new_skb(struct ucc_geth_private *ugeth,
                     (((unsigned)skb->data) & (UCC_GETH_RX_DATA_BUF_ALIGNMENT -
                                               1)));
 
-        skb->dev = ugeth->ndev;
-
         out_be32(&((struct qe_bd __iomem *)bd)->buf,
                       dma_map_single(ugeth->dev,
                                      skb->data,
diff --git a/drivers/net/ethernet/fujitsu/at1700.c b/drivers/net/ethernet/fujitsu/at1700.c
index 7c6c908bdf02..586b46fd4eed 100644
--- a/drivers/net/ethernet/fujitsu/at1700.c
+++ b/drivers/net/ethernet/fujitsu/at1700.c
@@ -757,7 +757,7 @@ net_rx(struct net_device *dev)
                                 dev->stats.rx_errors++;
                                 break;
                         }
-                        skb = dev_alloc_skb(pkt_len+3);
+                        skb = netdev_alloc_skb(dev, pkt_len + 3);
                         if (skb == NULL) {
                                 printk("%s: Memory squeeze, dropping packet (len %d).\n",
                                            dev->name, pkt_len);
diff --git a/drivers/net/ethernet/fujitsu/eth16i.c b/drivers/net/ethernet/fujitsu/eth16i.c
index b0e2313af3d1..c3f0178fb5cb 100644
--- a/drivers/net/ethernet/fujitsu/eth16i.c
+++ b/drivers/net/ethernet/fujitsu/eth16i.c
@@ -1164,7 +1164,7 @@ static void eth16i_rx(struct net_device *dev)
                 else {   /* Ok so now we should have a good packet */
                         struct sk_buff *skb;
 
-                        skb = dev_alloc_skb(pkt_len + 3);
+                        skb = netdev_alloc_skb(dev, pkt_len + 3);
                         if( skb == NULL ) {
                                 printk(KERN_WARNING "%s: Could'n allocate memory for packet (len %d)\n",
                                        dev->name, pkt_len);
diff --git a/drivers/net/ethernet/fujitsu/fmvj18x_cs.c b/drivers/net/ethernet/fujitsu/fmvj18x_cs.c
index ee84b472cee6..0230319ddb59 100644
--- a/drivers/net/ethernet/fujitsu/fmvj18x_cs.c
+++ b/drivers/net/ethernet/fujitsu/fmvj18x_cs.c
@@ -1002,7 +1002,7 @@ static void fjn_rx(struct net_device *dev)
                 dev->stats.rx_errors++;
                 break;
             }
-            skb = dev_alloc_skb(pkt_len+2);
+            skb = netdev_alloc_skb(dev, pkt_len + 2);
             if (skb == NULL) {
                 netdev_notice(dev, "Memory squeeze, dropping packet (len %d)\n",
                               pkt_len);
diff --git a/drivers/net/ethernet/hp/hp100.c b/drivers/net/ethernet/hp/hp100.c
index 6a5ee0776b28..d496673f0908 100644
--- a/drivers/net/ethernet/hp/hp100.c
+++ b/drivers/net/ethernet/hp/hp100.c
@@ -1274,7 +1274,7 @@ static int hp100_build_rx_pdl(hp100_ring_t * ringptr,
         /* Note: This depends on the alloc_skb functions allocating more
          * space than requested, i.e. aligning to 16bytes */
 
-        ringptr->skb = dev_alloc_skb(roundup(MAX_ETHER_SIZE + 2, 4));
+        ringptr->skb = netdev_alloc_skb(dev, roundup(MAX_ETHER_SIZE + 2, 4));
 
         if (NULL != ringptr->skb) {
                 /*
@@ -1284,7 +1284,6 @@ static int hp100_build_rx_pdl(hp100_ring_t * ringptr,
                  */
                 skb_reserve(ringptr->skb, 2);
 
-                ringptr->skb->dev = dev;
                 ringptr->skb->data = (u_char *) skb_put(ringptr->skb, MAX_ETHER_SIZE);
 
                 /* ringptr->pdl points to the beginning of the PDL, i.e. the PDH */
@@ -1817,7 +1816,7 @@ static void hp100_rx(struct net_device *dev)
 #endif
 
                 /* Now we allocate the skb and transfer the data into it. */
-                skb = dev_alloc_skb(pkt_len+2);
+                skb = netdev_alloc_skb(dev, pkt_len + 2);
                 if (skb == NULL) {      /* Not enough memory->drop packet */
 #ifdef HP100_DEBUG
                         printk("hp100: %s: rx: couldn't allocate a sk_buff of size %d\n",
@@ -2992,7 +2991,6 @@ static int __init hp100_isa_init(void)
         for (i = 0; i < HP100_DEVICES && hp100_port[i] != -1; ++i) {
                 dev = alloc_etherdev(sizeof(struct hp100_private));
                 if (!dev) {
-                        printk(KERN_WARNING "hp100: no memory for network device\n");
                         while (cards > 0)
                                 cleanup_dev(hp100_devlist[--cards]);
 
diff --git a/drivers/net/ethernet/i825xx/3c505.c b/drivers/net/ethernet/i825xx/3c505.c
index ba82a266051d..6a5c21b82c51 100644
--- a/drivers/net/ethernet/i825xx/3c505.c
+++ b/drivers/net/ethernet/i825xx/3c505.c
@@ -583,7 +583,7 @@ static void receive_packet(struct net_device *dev, int len)
         unsigned long flags;
 
         rlen = (len + 1) & ~1;
-        skb = dev_alloc_skb(rlen + 2);
+        skb = netdev_alloc_skb(dev, rlen + 2);
 
         if (!skb) {
                 pr_warning("%s: memory squeeze, dropping packet\n", dev->name);
diff --git a/drivers/net/ethernet/i825xx/3c507.c b/drivers/net/ethernet/i825xx/3c507.c
index 1e945551c144..ed6925f11479 100644
--- a/drivers/net/ethernet/i825xx/3c507.c
+++ b/drivers/net/ethernet/i825xx/3c507.c
@@ -851,7 +851,7 @@ static void el16_rx(struct net_device *dev)
                         struct sk_buff *skb;
 
                         pkt_len &= 0x3fff;
-                        skb = dev_alloc_skb(pkt_len+2);
+                        skb = netdev_alloc_skb(dev, pkt_len + 2);
                         if (skb == NULL) {
                                 pr_err("%s: Memory squeeze, dropping packet.\n",
                                        dev->name);
diff --git a/drivers/net/ethernet/i825xx/3c523.c b/drivers/net/ethernet/i825xx/3c523.c
index d70d3df4c985..8451ecd4c1ec 100644
--- a/drivers/net/ethernet/i825xx/3c523.c
+++ b/drivers/net/ethernet/i825xx/3c523.c
@@ -983,7 +983,7 @@ static void elmc_rcv_int(struct net_device *dev)
                         if ((totlen = rbd->status) & RBD_LAST) {        /* the first and the last buffer? */
                                 totlen &= RBD_MASK;     /* length of this frame */
                                 rbd->status = 0;
-                                skb = (struct sk_buff *) dev_alloc_skb(totlen + 2);
+                                skb = netdev_alloc_skb(dev, totlen + 2);
                                 if (skb != NULL) {
                                         skb_reserve(skb, 2);    /* 16 byte alignment */
                                         skb_put(skb,totlen);
diff --git a/drivers/net/ethernet/i825xx/3c527.c b/drivers/net/ethernet/i825xx/3c527.c
index 474b5e71a53a..ef43f3e951c5 100644
--- a/drivers/net/ethernet/i825xx/3c527.c
+++ b/drivers/net/ethernet/i825xx/3c527.c
@@ -1169,7 +1169,7 @@ static void mc32_rx_ring(struct net_device *dev)
                         /* Try to save time by avoiding a copy on big frames */
 
                         if ((length > RX_COPYBREAK) &&
-                            ((newskb=dev_alloc_skb(1532)) != NULL))
+                            ((newskb = netdev_alloc_skb(dev, 1532)) != NULL))
                         {
                                 skb=lp->rx_ring[rx_ring_tail].skb;
                                 skb_put(skb, length);
@@ -1180,7 +1180,7 @@ static void mc32_rx_ring(struct net_device *dev)
                         }
                         else
                         {
-                                skb=dev_alloc_skb(length+2);
+                                skb = netdev_alloc_skb(dev, length + 2);
 
                                 if(skb==NULL) {
                                         dev->stats.rx_dropped++;
diff --git a/drivers/net/ethernet/i825xx/82596.c b/drivers/net/ethernet/i825xx/82596.c
index f2408a4d5d9c..6aa927af382c 100644
--- a/drivers/net/ethernet/i825xx/82596.c
+++ b/drivers/net/ethernet/i825xx/82596.c
@@ -549,14 +549,13 @@ static inline int init_rx_bufs(struct net_device *dev)
         /* First build the Receive Buffer Descriptor List */
 
         for (i = 0, rbd = lp->rbds; i < rx_ring_size; i++, rbd++) {
-                struct sk_buff *skb = dev_alloc_skb(PKT_BUF_SZ);
+                struct sk_buff *skb = netdev_alloc_skb(dev, PKT_BUF_SZ);
 
                 if (skb == NULL) {
                         remove_rx_bufs(dev);
                         return -ENOMEM;
                 }
 
-                skb->dev = dev;
                 rbd->v_next = rbd+1;
                 rbd->b_next = WSWAPrbd(virt_to_bus(rbd+1));
                 rbd->b_addr = WSWAPrbd(virt_to_bus(rbd));
@@ -810,7 +809,7 @@ static inline int i596_rx(struct net_device *dev)
                                 struct sk_buff *newskb;
 
                                 /* Get fresh skbuff to replace filled one. */
-                                newskb = dev_alloc_skb(PKT_BUF_SZ);
+                                newskb = netdev_alloc_skb(dev, PKT_BUF_SZ);
                                 if (newskb == NULL) {
                                         skb = NULL;     /* drop pkt */
                                         goto memory_squeeze;
@@ -819,7 +818,6 @@ static inline int i596_rx(struct net_device *dev)
                                 skb_put(skb, pkt_len);
                                 rx_in_place = 1;
                                 rbd->skb = newskb;
-                                newskb->dev = dev;
                                 rbd->v_data = newskb->data;
                                 rbd->b_data = WSWAPchar(virt_to_bus(newskb->data));
 #ifdef __mc68000__
@@ -827,7 +825,7 @@ static inline int i596_rx(struct net_device *dev)
 #endif
                         }
                         else
-                                skb = dev_alloc_skb(pkt_len + 2);
+                                skb = netdev_alloc_skb(dev, pkt_len + 2);
 memory_squeeze:
                         if (skb == NULL) {
                                 /* XXX tulip.c can defer packets here!! */
diff --git a/drivers/net/ethernet/i825xx/eepro.c b/drivers/net/ethernet/i825xx/eepro.c
index 114cda7721fe..7a4ad4a07917 100644
--- a/drivers/net/ethernet/i825xx/eepro.c
+++ b/drivers/net/ethernet/i825xx/eepro.c
@@ -1563,7 +1563,7 @@ eepro_rx(struct net_device *dev)
 
                         dev->stats.rx_bytes+=rcv_size;
                         rcv_size &= 0x3fff;
-                        skb = dev_alloc_skb(rcv_size+5);
+                        skb = netdev_alloc_skb(dev, rcv_size + 5);
                         if (skb == NULL) {
                                 printk(KERN_NOTICE "%s: Memory squeeze, dropping packet.\n", dev->name);
                                 dev->stats.rx_dropped++;
diff --git a/drivers/net/ethernet/i825xx/eexpress.c b/drivers/net/ethernet/i825xx/eexpress.c
index 3a9580f3d4dd..3fc649e54a32 100644
--- a/drivers/net/ethernet/i825xx/eexpress.c
+++ b/drivers/net/ethernet/i825xx/eexpress.c
@@ -955,7 +955,7 @@ static void eexp_hw_rx_pio(struct net_device *dev)
                         {
                                 struct sk_buff *skb;
                                 pkt_len &= 0x3fff;
-                                skb = dev_alloc_skb(pkt_len+16);
+                                skb = netdev_alloc_skb(dev, pkt_len + 16);
                                 if (skb == NULL)
                                 {
                                         printk(KERN_WARNING "%s: Memory squeeze, dropping packet\n",dev->name);
diff --git a/drivers/net/ethernet/i825xx/ether1.c b/drivers/net/ethernet/i825xx/ether1.c
index 42e90a97c7a5..406a12b46404 100644
--- a/drivers/net/ethernet/i825xx/ether1.c
+++ b/drivers/net/ethernet/i825xx/ether1.c
@@ -867,7 +867,7 @@ ether1_recv_done (struct net_device *dev)
                         struct sk_buff *skb;
 
                         length = (length + 1) & ~1;
-                        skb = dev_alloc_skb (length + 2);
+                        skb = netdev_alloc_skb(dev, length + 2);
 
                         if (skb) {
                                 skb_reserve (skb, 2);
diff --git a/drivers/net/ethernet/i825xx/lp486e.c b/drivers/net/ethernet/i825xx/lp486e.c
index 414044b3cb11..6c2952c8ea15 100644
--- a/drivers/net/ethernet/i825xx/lp486e.c
+++ b/drivers/net/ethernet/i825xx/lp486e.c
@@ -454,8 +454,6 @@ init_rx_bufs(struct net_device *dev, int num) {
                         }
 
                         rfd->rbd = rbd;
-                } else {
-                        printk("Could not kmalloc rbd\n");
                 }
         }
         lp->rbd_tail->next = rfd->rbd;
@@ -658,7 +656,7 @@ i596_rx_one(struct net_device *dev, struct i596_private *lp,
         if (rfd->stat & RFD_STAT_OK) {
                 /* a good frame */
                 int pkt_len = (rfd->count & 0x3fff);
-                struct sk_buff *skb = dev_alloc_skb(pkt_len);
+                struct sk_buff *skb = netdev_alloc_skb(dev, pkt_len);
 
                 (*frames)++;
 
diff --git a/drivers/net/ethernet/i825xx/ni52.c b/drivers/net/ethernet/i825xx/ni52.c
index c0893715ef47..272976e1bb0f 100644
--- a/drivers/net/ethernet/i825xx/ni52.c
+++ b/drivers/net/ethernet/i825xx/ni52.c
@@ -964,7 +964,7 @@ static void ni52_rcv_int(struct net_device *dev)
                                 /* the first and the last buffer? */
                                 totlen &= RBD_MASK; /* length of this frame */
                                 writew(0x00, &rbd->status);
-                                skb = (struct sk_buff *)dev_alloc_skb(totlen+2);
+                                skb = netdev_alloc_skb(dev, totlen + 2);
                                 if (skb != NULL) {
                                         skb_reserve(skb, 2);
                                         skb_put(skb, totlen);
diff --git a/drivers/net/ethernet/i825xx/sun3_82586.c b/drivers/net/ethernet/i825xx/sun3_82586.c
index 6ef5e11d1c84..cae17f4bc93e 100644
--- a/drivers/net/ethernet/i825xx/sun3_82586.c
+++ b/drivers/net/ethernet/i825xx/sun3_82586.c
@@ -28,7 +28,6 @@ static int automatic_resume = 0; /* experimental .. better should be zero */
 static int rfdadd = 0; /* rfdadd=1 may be better for 8K MEM cards */
 static int fifo=0x8;    /* don't change */
 
-#include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
 #include <linux/errno.h>
@@ -779,7 +778,7 @@ static void sun3_82586_rcv_int(struct net_device *dev)
                                 {
                                         totlen &= RBD_MASK; /* length of this frame */
                                         rbd->status = 0;
-                                        skb = (struct sk_buff *) dev_alloc_skb(totlen+2);
+                                        skb = netdev_alloc_skb(dev, totlen + 2);
                                         if(skb != NULL)
                                         {
                                                 skb_reserve(skb,2);
@@ -1151,28 +1150,6 @@ static void set_multicast_list(struct net_device *dev)
         netif_wake_queue(dev);
 }
 
-#ifdef MODULE
-#error This code is not currently supported as a module
-static struct net_device *dev_sun3_82586;
-
-int init_module(void)
-{
-        dev_sun3_82586 = sun3_82586_probe(-1);
-        if (IS_ERR(dev_sun3_82586))
-                return PTR_ERR(dev_sun3_82586);
-        return 0;
-}
-
-void cleanup_module(void)
-{
-        unsigned long ioaddr = dev_sun3_82586->base_addr;
-        unregister_netdev(dev_sun3_82586);
-        release_region(ioaddr, SUN3_82586_TOTAL_SIZE);
-        iounmap((void *)ioaddr);
-        free_netdev(dev_sun3_82586);
-}
-#endif /* MODULE */
-
 #if 0
 /*
  * DUMP .. we expect a not running CMD unit and enough space
@@ -1209,5 +1186,3 @@ void sun3_82586_dump(struct net_device *dev,void *ptr)
         printk("\n");
 }
 #endif
-
-MODULE_LICENSE("GPL");
diff --git a/drivers/net/ethernet/i825xx/znet.c b/drivers/net/ethernet/i825xx/znet.c
index 962b4c421f3f..a43649735a04 100644
--- a/drivers/net/ethernet/i825xx/znet.c
+++ b/drivers/net/ethernet/i825xx/znet.c
@@ -762,7 +762,7 @@ static void znet_rx(struct net_device *dev)
                         /* Malloc up new buffer. */
                         struct sk_buff *skb;
 
-                        skb = dev_alloc_skb(pkt_len);
+                        skb = netdev_alloc_skb(dev, pkt_len);
                         if (skb == NULL) {
                                 if (znet_debug)
                                   printk(KERN_WARNING "%s: Memory squeeze, dropping packet.\n", dev->name);
diff --git a/drivers/net/ethernet/ibm/ehea/ehea.h b/drivers/net/ethernet/ibm/ehea/ehea.h
index 6650068c996c..b8e46cc31e53 100644
--- a/drivers/net/ethernet/ibm/ehea/ehea.h
+++ b/drivers/net/ethernet/ibm/ehea/ehea.h
@@ -1,5 +1,5 @@
 /*
- *  linux/drivers/net/ehea/ehea.h
+ *  linux/drivers/net/ethernet/ibm/ehea/ehea.h
  *
  *  eHEA ethernet device driver for IBM eServer System p
  *
diff --git a/drivers/net/ethernet/ibm/ehea/ehea_ethtool.c b/drivers/net/ethernet/ibm/ehea/ehea_ethtool.c
index 6bdd8e36e564..95837b99a464 100644
--- a/drivers/net/ethernet/ibm/ehea/ehea_ethtool.c
+++ b/drivers/net/ethernet/ibm/ehea/ehea_ethtool.c
@@ -1,5 +1,5 @@
 /*
- *  linux/drivers/net/ehea/ehea_ethtool.c
+ *  linux/drivers/net/ethernet/ibm/ehea/ehea_ethtool.c
  *
  *  eHEA ethernet device driver for IBM eServer System p
  *
diff --git a/drivers/net/ethernet/ibm/ehea/ehea_hw.h b/drivers/net/ethernet/ibm/ehea/ehea_hw.h
index 1a2fe4dc3eb3..180d4128a711 100644
--- a/drivers/net/ethernet/ibm/ehea/ehea_hw.h
+++ b/drivers/net/ethernet/ibm/ehea/ehea_hw.h
@@ -1,5 +1,5 @@
 /*
- *  linux/drivers/net/ehea/ehea_hw.h
+ *  linux/drivers/net/ethernet/ibm/ehea/ehea_hw.h
  *
  *  eHEA ethernet device driver for IBM eServer System p
  *
diff --git a/drivers/net/ethernet/ibm/ehea/ehea_main.c b/drivers/net/ethernet/ibm/ehea/ehea_main.c
index 5d5fb2627184..8b73dd472475 100644
--- a/drivers/net/ethernet/ibm/ehea/ehea_main.c
+++ b/drivers/net/ethernet/ibm/ehea/ehea_main.c
@@ -1,5 +1,5 @@
 /*
- *  linux/drivers/net/ehea/ehea_main.c
+ *  linux/drivers/net/ethernet/ibm/ehea/ehea_main.c
  *
  *  eHEA ethernet device driver for IBM eServer System p
  *
@@ -2980,7 +2980,6 @@ static struct ehea_port *ehea_setup_single_port(struct ehea_adapter *adapter,
         dev = alloc_etherdev_mq(sizeof(struct ehea_port), EHEA_MAX_PORT_RES);
 
         if (!dev) {
-                pr_err("no mem for net_device\n");
                 ret = -ENOMEM;
                 goto out_err;
         }
diff --git a/drivers/net/ethernet/ibm/ehea/ehea_phyp.c b/drivers/net/ethernet/ibm/ehea/ehea_phyp.c
index 0506967b9044..30f903332e92 100644
--- a/drivers/net/ethernet/ibm/ehea/ehea_phyp.c
+++ b/drivers/net/ethernet/ibm/ehea/ehea_phyp.c
@@ -1,5 +1,5 @@
 /*
- *  linux/drivers/net/ehea/ehea_phyp.c
+ *  linux/drivers/net/ethernet/ibm/ehea/ehea_phyp.c
  *
  *  eHEA ethernet device driver for IBM eServer System p
  *
diff --git a/drivers/net/ethernet/ibm/ehea/ehea_phyp.h b/drivers/net/ethernet/ibm/ehea/ehea_phyp.h
index 2f8174c248bc..52c456ec4d6c 100644
--- a/drivers/net/ethernet/ibm/ehea/ehea_phyp.h
+++ b/drivers/net/ethernet/ibm/ehea/ehea_phyp.h
@@ -1,5 +1,5 @@
 /*
- *  linux/drivers/net/ehea/ehea_phyp.h
+ *  linux/drivers/net/ethernet/ibm/ehea/ehea_phyp.h
  *
  *  eHEA ethernet device driver for IBM eServer System p
  *
diff --git a/drivers/net/ethernet/ibm/ehea/ehea_qmr.c b/drivers/net/ethernet/ibm/ehea/ehea_qmr.c
index c25b05b94daa..4fb47f14dbfe 100644
--- a/drivers/net/ethernet/ibm/ehea/ehea_qmr.c
+++ b/drivers/net/ethernet/ibm/ehea/ehea_qmr.c
@@ -1,5 +1,5 @@
 /*
- *  linux/drivers/net/ehea/ehea_qmr.c
+ *  linux/drivers/net/ethernet/ibm/ehea/ehea_qmr.c
  *
  *  eHEA ethernet device driver for IBM eServer System p
  *
diff --git a/drivers/net/ethernet/ibm/ehea/ehea_qmr.h b/drivers/net/ethernet/ibm/ehea/ehea_qmr.h
index 337a47ecf4aa..8e4a70c20ab7 100644
--- a/drivers/net/ethernet/ibm/ehea/ehea_qmr.h
+++ b/drivers/net/ethernet/ibm/ehea/ehea_qmr.h
@@ -1,5 +1,5 @@
 /*
- *  linux/drivers/net/ehea/ehea_qmr.h
+ *  linux/drivers/net/ethernet/ibm/ehea/ehea_qmr.h
  *
  *  eHEA ethernet device driver for IBM eServer System p
  *
diff --git a/drivers/net/ethernet/ibm/emac/core.c b/drivers/net/ethernet/ibm/emac/core.c
index 2abce965c7bd..dac7ffb4eaf1 100644
--- a/drivers/net/ethernet/ibm/emac/core.c
+++ b/drivers/net/ethernet/ibm/emac/core.c
@@ -1,5 +1,5 @@
 /*
- * drivers/net/ibm_newemac/core.c
+ * drivers/net/ethernet/ibm/emac/core.c
  *
  * Driver for PowerPC 4xx on-chip ethernet controller.
  *
@@ -2706,11 +2706,9 @@ static int __devinit emac_probe(struct platform_device *ofdev)
         /* Allocate our net_device structure */
         err = -ENOMEM;
         ndev = alloc_etherdev(sizeof(struct emac_instance));
-        if (!ndev) {
-                printk(KERN_ERR "%s: could not allocate ethernet device!\n",
-                       np->full_name);
+        if (!ndev)
                 goto err_gone;
-        }
+
         dev = netdev_priv(ndev);
         dev->ndev = ndev;
         dev->ofdev = ofdev;
diff --git a/drivers/net/ethernet/ibm/emac/core.h b/drivers/net/ethernet/ibm/emac/core.h
index fa3ec57935fa..bade29690c71 100644
--- a/drivers/net/ethernet/ibm/emac/core.h
+++ b/drivers/net/ethernet/ibm/emac/core.h
@@ -1,5 +1,5 @@
 /*
- * drivers/net/ibm_newemac/core.h
+ * drivers/net/ethernet/ibm/emac/core.h
  *
  * Driver for PowerPC 4xx on-chip ethernet controller.
  *
diff --git a/drivers/net/ethernet/ibm/emac/debug.c b/drivers/net/ethernet/ibm/emac/debug.c
index 8c6c1e2a8750..b16b4828b64d 100644
--- a/drivers/net/ethernet/ibm/emac/debug.c
+++ b/drivers/net/ethernet/ibm/emac/debug.c
@@ -1,5 +1,5 @@
 /*
- * drivers/net/ibm_newemac/debug.c
+ * drivers/net/ethernet/ibm/emac/debug.c
  *
  * Driver for PowerPC 4xx on-chip ethernet controller, debug print routines.
  *
diff --git a/drivers/net/ethernet/ibm/emac/debug.h b/drivers/net/ethernet/ibm/emac/debug.h
index 90477fe69d0c..59a92d5870b5 100644
--- a/drivers/net/ethernet/ibm/emac/debug.h
+++ b/drivers/net/ethernet/ibm/emac/debug.h
@@ -1,5 +1,5 @@
 /*
- * drivers/net/ibm_newemac/debug.h
+ * drivers/net/ethernet/ibm/emac/debug.h
  *
  * Driver for PowerPC 4xx on-chip ethernet controller, debug print routines.
  *
diff --git a/drivers/net/ethernet/ibm/emac/emac.h b/drivers/net/ethernet/ibm/emac/emac.h
index 1568278d759a..b44bd243fb58 100644
--- a/drivers/net/ethernet/ibm/emac/emac.h
+++ b/drivers/net/ethernet/ibm/emac/emac.h
@@ -1,5 +1,5 @@
 /*
- * drivers/net/ibm_newemac/emac.h
+ * drivers/net/ethernet/ibm/emac/emac.h
  *
  * Register definitions for PowerPC 4xx on-chip ethernet contoller
  *
diff --git a/drivers/net/ethernet/ibm/emac/mal.c b/drivers/net/ethernet/ibm/emac/mal.c
index f3c50b97ec61..479e43e2f1ef 100644
--- a/drivers/net/ethernet/ibm/emac/mal.c
+++ b/drivers/net/ethernet/ibm/emac/mal.c
@@ -1,5 +1,5 @@
 /*
- * drivers/net/ibm_newemac/mal.c
+ * drivers/net/ethernet/ibm/emac/mal.c
  *
  * Memory Access Layer (MAL) support
  *
diff --git a/drivers/net/ethernet/ibm/emac/mal.h b/drivers/net/ethernet/ibm/emac/mal.h
index d06f985bda32..e431a32e3d69 100644
--- a/drivers/net/ethernet/ibm/emac/mal.h
+++ b/drivers/net/ethernet/ibm/emac/mal.h
@@ -1,5 +1,5 @@
 /*
- * drivers/net/ibm_newemac/mal.h
+ * drivers/net/ethernet/ibm/emac/mal.h
  *
  * Memory Access Layer (MAL) support
  *
diff --git a/drivers/net/ethernet/ibm/emac/phy.c b/drivers/net/ethernet/ibm/emac/phy.c
index ab4e5969fe65..d3b9d103353e 100644
--- a/drivers/net/ethernet/ibm/emac/phy.c
+++ b/drivers/net/ethernet/ibm/emac/phy.c
@@ -1,5 +1,5 @@
 /*
- * drivers/net/ibm_newemac/phy.c
+ * drivers/net/ethernet/ibm/emac/phy.c
  *
  * Driver for PowerPC 4xx on-chip ethernet controller, PHY support.
  * Borrowed from sungem_phy.c, though I only kept the generic MII
diff --git a/drivers/net/ethernet/ibm/emac/phy.h b/drivers/net/ethernet/ibm/emac/phy.h
index 5d2bf4cbe50b..d7e41ec37467 100644
--- a/drivers/net/ethernet/ibm/emac/phy.h
+++ b/drivers/net/ethernet/ibm/emac/phy.h
@@ -1,5 +1,5 @@
 /*
- * drivers/net/ibm_newemac/phy.h
+ * drivers/net/ethernet/ibm/emac/phy.h
  *
  * Driver for PowerPC 4xx on-chip ethernet controller, PHY support
  *
diff --git a/drivers/net/ethernet/ibm/emac/rgmii.c b/drivers/net/ethernet/ibm/emac/rgmii.c
index 4fa53f3def64..d3123282e18e 100644
--- a/drivers/net/ethernet/ibm/emac/rgmii.c
+++ b/drivers/net/ethernet/ibm/emac/rgmii.c
@@ -1,5 +1,5 @@
 /*
- * drivers/net/ibm_newemac/rgmii.c
+ * drivers/net/ethernet/ibm/emac/rgmii.c
  *
  * Driver for PowerPC 4xx on-chip ethernet controller, RGMII bridge support.
  *
@@ -237,11 +237,8 @@ static int __devinit rgmii_probe(struct platform_device *ofdev)
 
         rc = -ENOMEM;
         dev = kzalloc(sizeof(struct rgmii_instance), GFP_KERNEL);
-        if (dev == NULL) {
-                printk(KERN_ERR "%s: could not allocate RGMII device!\n",
-                       np->full_name);
+        if (dev == NULL)
                 goto err_gone;
-        }
 
         mutex_init(&dev->lock);
         dev->ofdev = ofdev;
diff --git a/drivers/net/ethernet/ibm/emac/rgmii.h b/drivers/net/ethernet/ibm/emac/rgmii.h
index 9296b6c5f920..668bceeff4a2 100644
--- a/drivers/net/ethernet/ibm/emac/rgmii.h
+++ b/drivers/net/ethernet/ibm/emac/rgmii.h
@@ -1,5 +1,5 @@
 /*
- * drivers/net/ibm_newemac/rgmii.h
+ * drivers/net/ethernet/ibm/emac/rgmii.h
  *
  * Driver for PowerPC 4xx on-chip ethernet controller, RGMII bridge support.
  *
diff --git a/drivers/net/ethernet/ibm/emac/tah.c b/drivers/net/ethernet/ibm/emac/tah.c
index 5f51bf7c9dc5..872912ef518d 100644
--- a/drivers/net/ethernet/ibm/emac/tah.c
+++ b/drivers/net/ethernet/ibm/emac/tah.c
@@ -1,5 +1,5 @@
 /*
- * drivers/net/ibm_newemac/tah.c
+ * drivers/net/ethernet/ibm/emac/tah.c
  *
  * Driver for PowerPC 4xx on-chip ethernet controller, TAH support.
  *
@@ -96,11 +96,8 @@ static int __devinit tah_probe(struct platform_device *ofdev)
 
         rc = -ENOMEM;
         dev = kzalloc(sizeof(struct tah_instance), GFP_KERNEL);
-        if (dev == NULL) {
-                printk(KERN_ERR "%s: could not allocate TAH device!\n",
-                       np->full_name);
+        if (dev == NULL)
                 goto err_gone;
-        }
 
         mutex_init(&dev->lock);
         dev->ofdev = ofdev;
diff --git a/drivers/net/ethernet/ibm/emac/tah.h b/drivers/net/ethernet/ibm/emac/tah.h
index 3437ab4964c7..350b7096a041 100644
--- a/drivers/net/ethernet/ibm/emac/tah.h
+++ b/drivers/net/ethernet/ibm/emac/tah.h
@@ -1,5 +1,5 @@
 /*
- * drivers/net/ibm_newemac/tah.h
+ * drivers/net/ethernet/ibm/emac/tah.h
  *
  * Driver for PowerPC 4xx on-chip ethernet controller, TAH support.
  *
diff --git a/drivers/net/ethernet/ibm/emac/zmii.c b/drivers/net/ethernet/ibm/emac/zmii.c
index 97449e786d61..415e9b4d5408 100644
--- a/drivers/net/ethernet/ibm/emac/zmii.c
+++ b/drivers/net/ethernet/ibm/emac/zmii.c
@@ -1,5 +1,5 @@
 /*
- * drivers/net/ibm_newemac/zmii.c
+ * drivers/net/ethernet/ibm/emac/zmii.c
  *
  * Driver for PowerPC 4xx on-chip ethernet controller, ZMII bridge support.
  *
@@ -240,11 +240,8 @@ static int __devinit zmii_probe(struct platform_device *ofdev)
 
         rc = -ENOMEM;
         dev = kzalloc(sizeof(struct zmii_instance), GFP_KERNEL);
-        if (dev == NULL) {
-                printk(KERN_ERR "%s: could not allocate ZMII device!\n",
-                       np->full_name);
+        if (dev == NULL)
                 goto err_gone;
-        }
 
         mutex_init(&dev->lock);
         dev->ofdev = ofdev;
diff --git a/drivers/net/ethernet/ibm/emac/zmii.h b/drivers/net/ethernet/ibm/emac/zmii.h
index ceaed823a83c..455bfb085493 100644
--- a/drivers/net/ethernet/ibm/emac/zmii.h
+++ b/drivers/net/ethernet/ibm/emac/zmii.h
@@ -1,5 +1,5 @@
 /*
- * drivers/net/ibm_newemac/zmii.h
+ * drivers/net/ethernet/ibm/emac/zmii.h
  *
  * Driver for PowerPC 4xx on-chip ethernet controller, ZMII bridge support.
  *
diff --git a/drivers/net/ethernet/ibm/iseries_veth.c b/drivers/net/ethernet/ibm/iseries_veth.c
index acc31af6594a..1cafa6562a06 100644
--- a/drivers/net/ethernet/ibm/iseries_veth.c
+++ b/drivers/net/ethernet/ibm/iseries_veth.c
@@ -1032,10 +1032,8 @@ static struct net_device *veth_probe_one(int vlan,
         }
 
         dev = alloc_etherdev(sizeof (struct veth_port));
-        if (! dev) {
-                veth_error("Unable to allocate net_device structure!\n");
+        if (!dev)
                 return NULL;
-        }
 
         port = netdev_priv(dev);
 
diff --git a/drivers/net/ethernet/icplus/ipg.c b/drivers/net/ethernet/icplus/ipg.c
index 075451d0207d..1b563bb959c2 100644
--- a/drivers/net/ethernet/icplus/ipg.c
+++ b/drivers/net/ethernet/icplus/ipg.c
@@ -744,9 +744,6 @@ static int ipg_get_rxbuff(struct net_device *dev, int entry)
                 return -ENOMEM;
         }
 
-        /* Associate the receive buffer with the IPG NIC. */
-        skb->dev = dev;
-
         /* Save the address of the sk_buff structure. */
         sp->rx_buff[entry] = skb;
 
@@ -2233,7 +2230,6 @@ static int __devinit ipg_probe(struct pci_dev *pdev,
          */
         dev = alloc_etherdev(sizeof(struct ipg_nic_private));
         if (!dev) {
-                pr_err("%s: alloc_etherdev failed\n", pci_name(pdev));
                 rc = -ENOMEM;
                 goto err_disable_0;
         }
diff --git a/drivers/net/ethernet/intel/e100.c b/drivers/net/ethernet/intel/e100.c
index 9436397e5725..485ab8cdac48 100644
--- a/drivers/net/ethernet/intel/e100.c
+++ b/drivers/net/ethernet/intel/e100.c
@@ -2751,11 +2751,8 @@ static int __devinit e100_probe(struct pci_dev *pdev,
         struct nic *nic;
         int err;
 
-        if (!(netdev = alloc_etherdev(sizeof(struct nic)))) {
-                if (((1 << debug) - 1) & NETIF_MSG_PROBE)
-                        pr_err("Etherdev alloc failed, aborting\n");
+        if (!(netdev = alloc_etherdev(sizeof(struct nic))))
                 return -ENOMEM;
-        }
 
         netdev->netdev_ops = &e100_netdev_ops;
         SET_ETHTOOL_OPS(netdev, &e100_ethtool_ops);
diff --git a/drivers/net/ethernet/intel/e1000/e1000.h b/drivers/net/ethernet/intel/e1000/e1000.h
index 1e1596990b5c..2b6cd02bfba0 100644
--- a/drivers/net/ethernet/intel/e1000/e1000.h
+++ b/drivers/net/ethernet/intel/e1000/e1000.h
@@ -254,6 +254,7 @@ struct e1000_adapter {
         atomic_t tx_fifo_stall;
         bool pcix_82544;
         bool detect_tx_hung;
+        bool dump_buffers;
 
         /* RX */
         bool (*clean_rx)(struct e1000_adapter *adapter,
diff --git a/drivers/net/ethernet/intel/e1000/e1000_hw.h b/drivers/net/ethernet/intel/e1000/e1000_hw.h
index f6c4d7e2560c..11578c8978db 100644
--- a/drivers/net/ethernet/intel/e1000/e1000_hw.h
+++ b/drivers/net/ethernet/intel/e1000/e1000_hw.h
@@ -895,6 +895,11 @@ struct e1000_ffvt_entry {
 #define E1000_FCRTL    0x02160  /* Flow Control Receive Threshold Low - RW */
 #define E1000_FCRTH    0x02168  /* Flow Control Receive Threshold High - RW */
 #define E1000_PSRCTL   0x02170  /* Packet Split Receive Control - RW */
+#define E1000_RDFH     0x02410  /* RX Data FIFO Head - RW */
+#define E1000_RDFT     0x02418  /* RX Data FIFO Tail - RW */
+#define E1000_RDFHS    0x02420  /* RX Data FIFO Head Saved - RW */
+#define E1000_RDFTS    0x02428  /* RX Data FIFO Tail Saved - RW */
+#define E1000_RDFPC    0x02430  /* RX Data FIFO Packet Count - RW */
 #define E1000_RDBAL    0x02800  /* RX Descriptor Base Address Low - RW */
 #define E1000_RDBAH    0x02804  /* RX Descriptor Base Address High - RW */
 #define E1000_RDLEN    0x02808  /* RX Descriptor Length - RW */
@@ -1074,6 +1079,11 @@ struct e1000_ffvt_entry {
 #define E1000_82542_IMC      E1000_IMC
 #define E1000_82542_RCTL     E1000_RCTL
 #define E1000_82542_RDTR     0x00108
+#define E1000_82542_RDFH     E1000_RDFH
+#define E1000_82542_RDFT     E1000_RDFT
+#define E1000_82542_RDFHS    E1000_RDFHS
+#define E1000_82542_RDFTS    E1000_RDFTS
+#define E1000_82542_RDFPC    E1000_RDFPC
 #define E1000_82542_RDBAL    0x00110
 #define E1000_82542_RDBAH    0x00114
 #define E1000_82542_RDLEN    0x00118
diff --git a/drivers/net/ethernet/intel/e1000/e1000_main.c b/drivers/net/ethernet/intel/e1000/e1000_main.c
index d94d64b5d695..e72dc8175955 100644
--- a/drivers/net/ethernet/intel/e1000/e1000_main.c
+++ b/drivers/net/ethernet/intel/e1000/e1000_main.c
@@ -730,10 +730,8 @@ static void e1000_dump_eeprom(struct e1000_adapter *adapter)
         eeprom.offset = 0;
 
         data = kmalloc(eeprom.len, GFP_KERNEL);
-        if (!data) {
-                pr_err("Unable to allocate memory to dump EEPROM data\n");
+        if (!data)
                 return;
-        }
 
         ops->get_eeprom(netdev, &eeprom, data);
 
@@ -3241,6 +3239,228 @@ static netdev_tx_t e1000_xmit_frame(struct sk_buff *skb,
         return NETDEV_TX_OK;
 }
 
+#define NUM_REGS 38 /* 1 based count */
+static void e1000_regdump(struct e1000_adapter *adapter)
+{
+        struct e1000_hw *hw = &adapter->hw;
+        u32 regs[NUM_REGS];
+        u32 *regs_buff = regs;
+        int i = 0;
+
+        char *reg_name[] = {
+        "CTRL",  "STATUS",
+        "RCTL", "RDLEN", "RDH", "RDT", "RDTR",
+        "TCTL", "TDBAL", "TDBAH", "TDLEN", "TDH", "TDT",
+        "TIDV", "TXDCTL", "TADV", "TARC0",
+        "TDBAL1", "TDBAH1", "TDLEN1", "TDH1", "TDT1",
+        "TXDCTL1", "TARC1",
+        "CTRL_EXT", "ERT", "RDBAL", "RDBAH",
+        "TDFH", "TDFT", "TDFHS", "TDFTS", "TDFPC",
+        "RDFH", "RDFT", "RDFHS", "RDFTS", "RDFPC"
+        };
+
+        regs_buff[0]  = er32(CTRL);
+        regs_buff[1]  = er32(STATUS);
+
+        regs_buff[2]  = er32(RCTL);
+        regs_buff[3]  = er32(RDLEN);
+        regs_buff[4]  = er32(RDH);
+        regs_buff[5]  = er32(RDT);
+        regs_buff[6]  = er32(RDTR);
+
+        regs_buff[7]  = er32(TCTL);
+        regs_buff[8]  = er32(TDBAL);
+        regs_buff[9]  = er32(TDBAH);
+        regs_buff[10] = er32(TDLEN);
+        regs_buff[11] = er32(TDH);
+        regs_buff[12] = er32(TDT);
+        regs_buff[13] = er32(TIDV);
+        regs_buff[14] = er32(TXDCTL);
+        regs_buff[15] = er32(TADV);
+        regs_buff[16] = er32(TARC0);
+
+        regs_buff[17] = er32(TDBAL1);
+        regs_buff[18] = er32(TDBAH1);
+        regs_buff[19] = er32(TDLEN1);
+        regs_buff[20] = er32(TDH1);
+        regs_buff[21] = er32(TDT1);
+        regs_buff[22] = er32(TXDCTL1);
+        regs_buff[23] = er32(TARC1);
+        regs_buff[24] = er32(CTRL_EXT);
+        regs_buff[25] = er32(ERT);
+        regs_buff[26] = er32(RDBAL0);
+        regs_buff[27] = er32(RDBAH0);
+        regs_buff[28] = er32(TDFH);
+        regs_buff[29] = er32(TDFT);
+        regs_buff[30] = er32(TDFHS);
+        regs_buff[31] = er32(TDFTS);
+        regs_buff[32] = er32(TDFPC);
+        regs_buff[33] = er32(RDFH);
+        regs_buff[34] = er32(RDFT);
+        regs_buff[35] = er32(RDFHS);
+        regs_buff[36] = er32(RDFTS);
+        regs_buff[37] = er32(RDFPC);
+
+        pr_info("Register dump\n");
+        for (i = 0; i < NUM_REGS; i++) {
+                printk(KERN_INFO "%-15s  %08x\n",
+                reg_name[i], regs_buff[i]);
+        }
+}
+
+/*
+ * e1000_dump: Print registers, tx ring and rx ring
+ */
+static void e1000_dump(struct e1000_adapter *adapter)
+{
+        /* this code doesn't handle multiple rings */
+        struct e1000_tx_ring *tx_ring = adapter->tx_ring;
+        struct e1000_rx_ring *rx_ring = adapter->rx_ring;
+        int i;
+
+        if (!netif_msg_hw(adapter))
+                return;
+
+        /* Print Registers */
+        e1000_regdump(adapter);
+
+        /*
+         * transmit dump
+         */
+        pr_info("TX Desc ring0 dump\n");
+
+        /* Transmit Descriptor Formats - DEXT[29] is 0 (Legacy) or 1 (Extended)
+         *
+         * Legacy Transmit Descriptor
+         *   +--------------------------------------------------------------+
+         * 0 |         Buffer Address [63:0] (Reserved on Write Back)       |
+         *   +--------------------------------------------------------------+
+         * 8 | Special  |    CSS     | Status |  CMD    |  CSO   |  Length  |
+         *   +--------------------------------------------------------------+
+         *   63       48 47        36 35    32 31     24 23    16 15        0
+         *
+         * Extended Context Descriptor (DTYP=0x0) for TSO or checksum offload
+         *   63      48 47    40 39       32 31             16 15    8 7      0
+         *   +----------------------------------------------------------------+
+         * 0 |  TUCSE  | TUCS0  |   TUCSS   |     IPCSE       | IPCS0 | IPCSS |
+         *   +----------------------------------------------------------------+
+         * 8 |   MSS   | HDRLEN | RSV | STA | TUCMD | DTYP |      PAYLEN      |
+         *   +----------------------------------------------------------------+
+         *   63      48 47    40 39 36 35 32 31   24 23  20 19                0
+         *
+         * Extended Data Descriptor (DTYP=0x1)
+         *   +----------------------------------------------------------------+
+         * 0 |                     Buffer Address [63:0]                      |
+         *   +----------------------------------------------------------------+
+         * 8 | VLAN tag |  POPTS  | Rsvd | Status | Command | DTYP |  DTALEN  |
+         *   +----------------------------------------------------------------+
+         *   63       48 47     40 39  36 35    32 31     24 23  20 19        0
+         */
+        printk(KERN_INFO "Tc[desc]     [Ce CoCsIpceCoS] [MssHlRSCm0Plen] [bi->dma       ]"
+               " leng  ntw timestmp         bi->skb\n");
+        printk(KERN_INFO "Td[desc]     [address 63:0  ] [VlaPoRSCm1Dlen] [bi->dma       ]"
+               " leng  ntw timestmp         bi->skb\n");
+
+        if (!netif_msg_tx_done(adapter))
+                goto rx_ring_summary;
+
+        for (i = 0; tx_ring->desc && (i < tx_ring->count); i++) {
+                struct e1000_tx_desc *tx_desc = E1000_TX_DESC(*tx_ring, i);
+                struct e1000_buffer *buffer_info = &tx_ring->buffer_info[i];
+                struct my_u { u64 a; u64 b; };
+                struct my_u *u = (struct my_u *)tx_desc;
+                printk(KERN_INFO "T%c[0x%03X]    %016llX %016llX %016llX %04X  %3X "
+                       "%016llX %p",
+                       ((le64_to_cpu(u->b) & (1<<20)) ? 'd' : 'c'), i,
+                       le64_to_cpu(u->a), le64_to_cpu(u->b),
+                       (u64)buffer_info->dma, buffer_info->length,
+                       buffer_info->next_to_watch, (u64)buffer_info->time_stamp,
+                       buffer_info->skb);
+                if (i == tx_ring->next_to_use && i == tx_ring->next_to_clean)
+                        printk(KERN_CONT" NTC/U\n");
+                else if (i == tx_ring->next_to_use)
+                        printk(KERN_CONT " NTU\n");
+                else if (i == tx_ring->next_to_clean)
+                        printk(KERN_CONT " NTC\n");
+                else
+                        printk(KERN_CONT "\n");
+
+
+                if (netif_msg_pktdata(adapter) && buffer_info->dma != 0)
+                        print_hex_dump(KERN_INFO, "", DUMP_PREFIX_ADDRESS,
+                                        16, 1, phys_to_virt(buffer_info->dma),
+                                        buffer_info->length, true);
+        }
+
+rx_ring_summary:
+        /*
+         * receive dump
+         */
+        pr_info("\nRX Desc ring dump\n");
+
+        /* Legacy Receive Descriptor Format
+         *
+         * +-----------------------------------------------------+
+         * |                Buffer Address [63:0]                |
+         * +-----------------------------------------------------+
+         * | VLAN Tag | Errors | Status 0 | Packet csum | Length |
+         * +-----------------------------------------------------+
+         * 63       48 47    40 39      32 31         16 15      0
+         */
+        printk(KERN_INFO "R[desc]      [address 63:0  ] [vl er S cks ln] "
+                "[bi->dma       ] [bi->skb]\n");
+
+        if (!netif_msg_rx_status(adapter))
+                goto exit;
+
+        for (i = 0; rx_ring->desc && (i < rx_ring->count); i++) {
+                struct e1000_rx_desc *rx_desc = E1000_RX_DESC(*rx_ring, i);
+                struct e1000_buffer *buffer_info = &rx_ring->buffer_info[i];
+                struct my_u { u64 a; u64 b; };
+                struct my_u *u = (struct my_u *)rx_desc;
+                printk(KERN_INFO "R[0x%03X]     %016llX %016llX %016llX %p",
+                        i, le64_to_cpu(u->a), le64_to_cpu(u->b),
+                        (u64)buffer_info->dma, buffer_info->skb);
+                if (i == rx_ring->next_to_use)
+                        printk(KERN_CONT " NTU\n");
+                else if (i == rx_ring->next_to_clean)
+                        printk(KERN_CONT " NTC\n");
+                else
+                        printk(KERN_CONT "\n");
+
+                if (netif_msg_pktdata(adapter))
+                        print_hex_dump(KERN_INFO, "",
+                                DUMP_PREFIX_ADDRESS, 16, 1,
+                                phys_to_virt(buffer_info->dma),
+                                buffer_info->length, true);
+
+        } /* for */
+
+        /* dump the descriptor caches */
+        /* rx */
+        printk(KERN_INFO "e1000: Rx descriptor cache in 64bit format\n");
+        for (i = 0x6000; i <= 0x63FF ; i += 0x10) {
+                printk(KERN_INFO "R%04X: %08X|%08X %08X|%08X\n",
+                                i,
+                                readl(adapter->hw.hw_addr + i+4),
+                                readl(adapter->hw.hw_addr + i),
+                                readl(adapter->hw.hw_addr + i+12),
+                                readl(adapter->hw.hw_addr + i+8));
+        }
+        /* tx */
+        printk(KERN_INFO "e1000: Tx descriptor cache in 64bit format\n");
+        for (i = 0x7000; i <= 0x73FF ; i += 0x10) {
+                printk(KERN_INFO "T%04X: %08X|%08X %08X|%08X\n",
+                                i,
+                                readl(adapter->hw.hw_addr + i+4),
+                                readl(adapter->hw.hw_addr + i),
+                                readl(adapter->hw.hw_addr + i+12),
+                                readl(adapter->hw.hw_addr + i+8));
+        }
+exit:
+        return;
+}
+
 /**
  * e1000_tx_timeout - Respond to a Tx Hang
  * @netdev: network interface device structure
@@ -3262,6 +3482,7 @@ static void e1000_reset_task(struct work_struct *work)
 
         if (test_bit(__E1000_DOWN, &adapter->flags))
                 return;
+        e_err(drv, "Reset adapter\n");
         e1000_reinit_safe(adapter);
 }
 
@@ -3679,6 +3900,7 @@ static bool e1000_clean_tx_irq(struct e1000_adapter *adapter,
                                 eop,
                                 jiffies,
                                 eop_desc->upper.fields.status);
+                        e1000_dump(adapter);
                         netif_stop_queue(netdev);
                 }
         }
diff --git a/drivers/net/ethernet/intel/e1000e/80003es2lan.c b/drivers/net/ethernet/intel/e1000e/80003es2lan.c
index e1159e54334a..cfb361e5f498 100644
--- a/drivers/net/ethernet/intel/e1000e/80003es2lan.c
+++ b/drivers/net/ethernet/intel/e1000e/80003es2lan.c
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel PRO/1000 Linux driver
-  Copyright(c) 1999 - 2011 Intel Corporation.
+  Copyright(c) 1999 - 2012 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
@@ -201,19 +201,23 @@ static s32 e1000_init_nvm_params_80003es2lan(struct e1000_hw *hw)
  *  e1000_init_mac_params_80003es2lan - Init ESB2 MAC func ptrs.
  *  @hw: pointer to the HW structure
  **/
-static s32 e1000_init_mac_params_80003es2lan(struct e1000_adapter *adapter)
+static s32 e1000_init_mac_params_80003es2lan(struct e1000_hw *hw)
 {
-        struct e1000_hw *hw = &adapter->hw;
         struct e1000_mac_info *mac = &hw->mac;
-        struct e1000_mac_operations *func = &mac->ops;
 
-        /* Set media type */
-        switch (adapter->pdev->device) {
+        /* Set media type and media-dependent function pointers */
+        switch (hw->adapter->pdev->device) {
         case E1000_DEV_ID_80003ES2LAN_SERDES_DPT:
                 hw->phy.media_type = e1000_media_type_internal_serdes;
+                mac->ops.check_for_link = e1000e_check_for_serdes_link;
+                mac->ops.setup_physical_interface =
+                    e1000e_setup_fiber_serdes_link;
                 break;
         default:
                 hw->phy.media_type = e1000_media_type_copper;
+                mac->ops.check_for_link = e1000e_check_for_copper_link;
+                mac->ops.setup_physical_interface =
+                    e1000_setup_copper_link_80003es2lan;
                 break;
         }
 
@@ -230,25 +234,6 @@ static s32 e1000_init_mac_params_80003es2lan(struct e1000_adapter *adapter)
         /* Adaptive IFS not supported */
         mac->adaptive_ifs = false;
 
-        /* check for link */
-        switch (hw->phy.media_type) {
-        case e1000_media_type_copper:
-                func->setup_physical_interface = e1000_setup_copper_link_80003es2lan;
-                func->check_for_link = e1000e_check_for_copper_link;
-                break;
-        case e1000_media_type_fiber:
-                func->setup_physical_interface = e1000e_setup_fiber_serdes_link;
-                func->check_for_link = e1000e_check_for_fiber_link;
-                break;
-        case e1000_media_type_internal_serdes:
-                func->setup_physical_interface = e1000e_setup_fiber_serdes_link;
-                func->check_for_link = e1000e_check_for_serdes_link;
-                break;
-        default:
-                return -E1000_ERR_CONFIG;
-                break;
-        }
-
         /* set lan id for port to determine which phy lock to use */
         hw->mac.ops.set_lan_id(hw);
 
@@ -260,7 +245,7 @@ static s32 e1000_get_variants_80003es2lan(struct e1000_adapter *adapter)
         struct e1000_hw *hw = &adapter->hw;
         s32 rc;
 
-        rc = e1000_init_mac_params_80003es2lan(adapter);
+        rc = e1000_init_mac_params_80003es2lan(hw);
         if (rc)
                 return rc;
 
@@ -667,8 +652,7 @@ static s32 e1000_phy_force_speed_duplex_80003es2lan(struct e1000_hw *hw)
         udelay(1);
 
         if (hw->phy.autoneg_wait_to_complete) {
-                e_dbg("Waiting for forced speed/duplex link "
-                         "on GG82563 phy.\n");
+                e_dbg("Waiting for forced speed/duplex link on GG82563 phy.\n");
 
                 ret_val = e1000e_phy_has_link_generic(hw, PHY_FORCE_LIMIT,
                                                      100000, &link);
@@ -1502,8 +1486,7 @@ const struct e1000_info e1000_es2_info = {
                                   | FLAG_RX_NEEDS_RESTART /* errata */
                                   | FLAG_TARC_SET_BIT_ZERO /* errata */
                                   | FLAG_APME_CHECK_PORT_B
-                                  | FLAG_DISABLE_FC_PAUSE_TIME /* errata */
-                                  | FLAG_TIPG_MEDIUM_FOR_80003ESLAN,
+                                  | FLAG_DISABLE_FC_PAUSE_TIME, /* errata */
         .flags2                 = FLAG2_DMA_BURST,
         .pba                    = 38,
         .max_hw_frame_size      = DEFAULT_JUMBO,
diff --git a/drivers/net/ethernet/intel/e1000e/82571.c b/drivers/net/ethernet/intel/e1000e/82571.c
index a3e65fd26e09..795c3d640615 100644
--- a/drivers/net/ethernet/intel/e1000e/82571.c
+++ b/drivers/net/ethernet/intel/e1000e/82571.c
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel PRO/1000 Linux driver
-  Copyright(c) 1999 - 2011 Intel Corporation.
+  Copyright(c) 1999 - 2012 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
@@ -235,30 +235,42 @@ static s32 e1000_init_nvm_params_82571(struct e1000_hw *hw)
  *  e1000_init_mac_params_82571 - Init MAC func ptrs.
  *  @hw: pointer to the HW structure
  **/
-static s32 e1000_init_mac_params_82571(struct e1000_adapter *adapter)
+static s32 e1000_init_mac_params_82571(struct e1000_hw *hw)
 {
-        struct e1000_hw *hw = &adapter->hw;
         struct e1000_mac_info *mac = &hw->mac;
-        struct e1000_mac_operations *func = &mac->ops;
         u32 swsm = 0;
         u32 swsm2 = 0;
         bool force_clear_smbi = false;
 
-        /* Set media type */
-        switch (adapter->pdev->device) {
+        /* Set media type and media-dependent function pointers */
+        switch (hw->adapter->pdev->device) {
         case E1000_DEV_ID_82571EB_FIBER:
         case E1000_DEV_ID_82572EI_FIBER:
         case E1000_DEV_ID_82571EB_QUAD_FIBER:
                 hw->phy.media_type = e1000_media_type_fiber;
+                mac->ops.setup_physical_interface =
+                    e1000_setup_fiber_serdes_link_82571;
+                mac->ops.check_for_link = e1000e_check_for_fiber_link;
+                mac->ops.get_link_up_info =
+                    e1000e_get_speed_and_duplex_fiber_serdes;
                 break;
         case E1000_DEV_ID_82571EB_SERDES:
-        case E1000_DEV_ID_82572EI_SERDES:
         case E1000_DEV_ID_82571EB_SERDES_DUAL:
         case E1000_DEV_ID_82571EB_SERDES_QUAD:
+        case E1000_DEV_ID_82572EI_SERDES:
                 hw->phy.media_type = e1000_media_type_internal_serdes;
+                mac->ops.setup_physical_interface =
+                    e1000_setup_fiber_serdes_link_82571;
+                mac->ops.check_for_link = e1000_check_for_serdes_link_82571;
+                mac->ops.get_link_up_info =
+                    e1000e_get_speed_and_duplex_fiber_serdes;
                 break;
         default:
                 hw->phy.media_type = e1000_media_type_copper;
+                mac->ops.setup_physical_interface =
+                    e1000_setup_copper_link_82571;
+                mac->ops.check_for_link = e1000e_check_for_copper_link;
+                mac->ops.get_link_up_info = e1000e_get_speed_and_duplex_copper;
                 break;
         }
 
@@ -269,38 +281,13 @@ static s32 e1000_init_mac_params_82571(struct e1000_adapter *adapter)
         /* Adaptive IFS supported */
         mac->adaptive_ifs = true;
 
-        /* check for link */
-        switch (hw->phy.media_type) {
-        case e1000_media_type_copper:
-                func->setup_physical_interface = e1000_setup_copper_link_82571;
-                func->check_for_link = e1000e_check_for_copper_link;
-                func->get_link_up_info = e1000e_get_speed_and_duplex_copper;
-                break;
-        case e1000_media_type_fiber:
-                func->setup_physical_interface =
-                        e1000_setup_fiber_serdes_link_82571;
-                func->check_for_link = e1000e_check_for_fiber_link;
-                func->get_link_up_info =
-                        e1000e_get_speed_and_duplex_fiber_serdes;
-                break;
-        case e1000_media_type_internal_serdes:
-                func->setup_physical_interface =
-                        e1000_setup_fiber_serdes_link_82571;
-                func->check_for_link = e1000_check_for_serdes_link_82571;
-                func->get_link_up_info =
-                        e1000e_get_speed_and_duplex_fiber_serdes;
-                break;
-        default:
-                return -E1000_ERR_CONFIG;
-                break;
-        }
-
+        /* MAC-specific function pointers */
         switch (hw->mac.type) {
         case e1000_82573:
-                func->set_lan_id = e1000_set_lan_id_single_port;
-                func->check_mng_mode = e1000e_check_mng_mode_generic;
-                func->led_on = e1000e_led_on_generic;
-                func->blink_led = e1000e_blink_led_generic;
+                mac->ops.set_lan_id = e1000_set_lan_id_single_port;
+                mac->ops.check_mng_mode = e1000e_check_mng_mode_generic;
+                mac->ops.led_on = e1000e_led_on_generic;
+                mac->ops.blink_led = e1000e_blink_led_generic;
 
                 /* FWSM register */
                 mac->has_fwsm = true;
@@ -314,14 +301,14 @@ static s32 e1000_init_mac_params_82571(struct e1000_adapter *adapter)
                 break;
         case e1000_82574:
         case e1000_82583:
-                func->set_lan_id = e1000_set_lan_id_single_port;
-                func->check_mng_mode = e1000_check_mng_mode_82574;
-                func->led_on = e1000_led_on_82574;
+                mac->ops.set_lan_id = e1000_set_lan_id_single_port;
+                mac->ops.check_mng_mode = e1000_check_mng_mode_82574;
+                mac->ops.led_on = e1000_led_on_82574;
                 break;
         default:
-                func->check_mng_mode = e1000e_check_mng_mode_generic;
-                func->led_on = e1000e_led_on_generic;
-                func->blink_led = e1000e_blink_led_generic;
+                mac->ops.check_mng_mode = e1000e_check_mng_mode_generic;
+                mac->ops.led_on = e1000e_led_on_generic;
+                mac->ops.blink_led = e1000e_blink_led_generic;
 
                 /* FWSM register */
                 mac->has_fwsm = true;
@@ -342,11 +329,11 @@ static s32 e1000_init_mac_params_82571(struct e1000_adapter *adapter)
 
                 if (!(swsm2 & E1000_SWSM2_LOCK)) {
                         /* Only do this for the first interface on this card */
-                        ew32(SWSM2,
-                            swsm2 | E1000_SWSM2_LOCK);
+                        ew32(SWSM2, swsm2 | E1000_SWSM2_LOCK);
                         force_clear_smbi = true;
-                } else
+                } else {
                         force_clear_smbi = false;
+                }
                 break;
         default:
                 force_clear_smbi = true;
@@ -383,7 +370,7 @@ static s32 e1000_get_variants_82571(struct e1000_adapter *adapter)
         int is_port_b = er32(STATUS) & E1000_STATUS_FUNC_1;
         s32 rc;
 
-        rc = e1000_init_mac_params_82571(adapter);
+        rc = e1000_init_mac_params_82571(hw);
         if (rc)
                 return rc;
 
@@ -1227,6 +1214,10 @@ static void e1000_initialize_hw_bits_82571(struct e1000_hw *hw)
         case e1000_82572:
                 reg |= (1 << 23) | (1 << 24) | (1 << 25) | (1 << 26);
                 break;
+        case e1000_82574:
+        case e1000_82583:
+                reg |= (1 << 26);
+                break;
         default:
                 break;
         }
@@ -1873,7 +1864,7 @@ static void e1000_power_down_phy_copper_82571(struct e1000_hw *hw)
         struct e1000_phy_info *phy = &hw->phy;
         struct e1000_mac_info *mac = &hw->mac;
 
-        if (!(phy->ops.check_reset_block))
+        if (!phy->ops.check_reset_block)
                 return;
 
         /* If the management interface is not enabled, then power down */
diff --git a/drivers/net/ethernet/intel/e1000e/Makefile b/drivers/net/ethernet/intel/e1000e/Makefile
index 948c05db5d68..591b71324505 100644
--- a/drivers/net/ethernet/intel/e1000e/Makefile
+++ b/drivers/net/ethernet/intel/e1000e/Makefile
@@ -1,7 +1,7 @@
 ################################################################################
 #
 # Intel PRO/1000 Linux driver
-# Copyright(c) 1999 - 2011 Intel Corporation.
+# Copyright(c) 1999 - 2012 Intel Corporation.
 #
 # This program is free software; you can redistribute it and/or modify it
 # under the terms and conditions of the GNU General Public License,
@@ -33,5 +33,6 @@
 obj-$(CONFIG_E1000E) += e1000e.o
 
 e1000e-objs := 82571.o ich8lan.o 80003es2lan.o \
-               lib.o phy.o param.o ethtool.o netdev.o
+               mac.o manage.o nvm.o phy.o \
+               param.o ethtool.o netdev.o
 
diff --git a/drivers/net/ethernet/intel/e1000e/defines.h b/drivers/net/ethernet/intel/e1000e/defines.h
index c516a7440bec..1af30b967a4f 100644
--- a/drivers/net/ethernet/intel/e1000e/defines.h
+++ b/drivers/net/ethernet/intel/e1000e/defines.h
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel PRO/1000 Linux driver
-  Copyright(c) 1999 - 2011 Intel Corporation.
+  Copyright(c) 1999 - 2012 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
@@ -126,6 +126,13 @@
     E1000_RXDEXT_STATERR_CXE |            \
     E1000_RXDEXT_STATERR_RXE)
 
+#define E1000_MRQC_RSS_FIELD_MASK              0xFFFF0000
+#define E1000_MRQC_RSS_FIELD_IPV4_TCP          0x00010000
+#define E1000_MRQC_RSS_FIELD_IPV4              0x00020000
+#define E1000_MRQC_RSS_FIELD_IPV6_TCP_EX       0x00040000
+#define E1000_MRQC_RSS_FIELD_IPV6              0x00100000
+#define E1000_MRQC_RSS_FIELD_IPV6_TCP          0x00200000
+
 #define E1000_RXDPS_HDRSTAT_HDRSP              0x00008000
 
 /* Management Control */
@@ -326,6 +333,7 @@
 /* Receive Checksum Control */
 #define E1000_RXCSUM_TUOFL     0x00000200   /* TCP / UDP checksum offload */
 #define E1000_RXCSUM_IPPCSE    0x00001000   /* IP payload checksum enable */
+#define E1000_RXCSUM_PCSD      0x00002000   /* packet checksum disabled */
 
 /* Header split receive */
 #define E1000_RFCTL_NFSW_DIS            0x00000040
diff --git a/drivers/net/ethernet/intel/e1000e/e1000.h b/drivers/net/ethernet/intel/e1000e/e1000.h
index f478a22ed577..45e5ae8a9fb7 100644
--- a/drivers/net/ethernet/intel/e1000e/e1000.h
+++ b/drivers/net/ethernet/intel/e1000e/e1000.h
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel PRO/1000 Linux driver
-  Copyright(c) 1999 - 2011 Intel Corporation.
+  Copyright(c) 1999 - 2012 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
@@ -234,6 +234,7 @@ struct e1000_buffer {
 };
 
 struct e1000_ring {
+        struct e1000_adapter *adapter;  /* back pointer to adapter */
         void *desc;                     /* pointer to ring memory  */
         dma_addr_t dma;                 /* phys address of ring    */
         unsigned int size;              /* length of ring in bytes */
@@ -242,8 +243,8 @@ struct e1000_ring {
         u16 next_to_use;
         u16 next_to_clean;
 
-        u16 head;
-        u16 tail;
+        void __iomem *head;
+        void __iomem *tail;
 
         /* array of buffer information structs */
         struct e1000_buffer *buffer_info;
@@ -251,7 +252,7 @@ struct e1000_ring {
         char name[IFNAMSIZ + 5];
         u32 ims_val;
         u32 itr_val;
-        u16 itr_register;
+        void __iomem *itr_register;
         int set_itr;
 
         struct sk_buff *rx_skb_top;
@@ -334,11 +335,10 @@ struct e1000_adapter {
         /*
          * Rx
          */
-        bool (*clean_rx) (struct e1000_adapter *adapter,
-                          int *work_done, int work_to_do)
-                                                ____cacheline_aligned_in_smp;
-        void (*alloc_rx_buf) (struct e1000_adapter *adapter,
-                              int cleaned_count, gfp_t gfp);
+        bool (*clean_rx) (struct e1000_ring *ring, int *work_done,
+                          int work_to_do) ____cacheline_aligned_in_smp;
+        void (*alloc_rx_buf) (struct e1000_ring *ring, int cleaned_count,
+                              gfp_t gfp);
         struct e1000_ring *rx_ring;
 
         u32 rx_int_delay;
@@ -398,6 +398,9 @@ struct e1000_adapter {
 
         bool idle_check;
         int phy_hang_count;
+
+        u16 tx_ring_count;
+        u16 rx_ring_count;
 };
 
 struct e1000_info {
@@ -417,7 +420,7 @@ struct e1000_info {
 #define FLAG_HAS_FLASH                    (1 << 1)
 #define FLAG_HAS_HW_VLAN_FILTER           (1 << 2)
 #define FLAG_HAS_WOL                      (1 << 3)
-#define FLAG_HAS_ERT                      (1 << 4)
+/* reserved bit4 */
 #define FLAG_HAS_CTRLEXT_ON_LOAD          (1 << 5)
 #define FLAG_HAS_SWSM_ON_LOAD             (1 << 6)
 #define FLAG_HAS_JUMBO_FRAMES             (1 << 7)
@@ -427,7 +430,7 @@ struct e1000_info {
 #define FLAG_HAS_SMART_POWER_DOWN         (1 << 11)
 #define FLAG_IS_QUAD_PORT_A               (1 << 12)
 #define FLAG_IS_QUAD_PORT                 (1 << 13)
-#define FLAG_TIPG_MEDIUM_FOR_80003ESLAN   (1 << 14)
+/* reserved bit14 */
 #define FLAG_APME_IN_WUC                  (1 << 15)
 #define FLAG_APME_IN_CTRL3                (1 << 16)
 #define FLAG_APME_CHECK_PORT_B            (1 << 17)
@@ -492,10 +495,10 @@ extern void e1000e_down(struct e1000_adapter *adapter);
 extern void e1000e_reinit_locked(struct e1000_adapter *adapter);
 extern void e1000e_reset(struct e1000_adapter *adapter);
 extern void e1000e_power_up_phy(struct e1000_adapter *adapter);
-extern int e1000e_setup_rx_resources(struct e1000_adapter *adapter);
-extern int e1000e_setup_tx_resources(struct e1000_adapter *adapter);
-extern void e1000e_free_rx_resources(struct e1000_adapter *adapter);
-extern void e1000e_free_tx_resources(struct e1000_adapter *adapter);
+extern int e1000e_setup_rx_resources(struct e1000_ring *ring);
+extern int e1000e_setup_tx_resources(struct e1000_ring *ring);
+extern void e1000e_free_rx_resources(struct e1000_ring *ring);
+extern void e1000e_free_tx_resources(struct e1000_ring *ring);
 extern struct rtnl_link_stats64 *e1000e_get_stats64(struct net_device *netdev,
                                                     struct rtnl_link_stats64
                                                     *stats);
diff --git a/drivers/net/ethernet/intel/e1000e/ethtool.c b/drivers/net/ethernet/intel/e1000e/ethtool.c
index fb2c28e799a2..b1f5d7491b57 100644
--- a/drivers/net/ethernet/intel/e1000e/ethtool.c
+++ b/drivers/net/ethernet/intel/e1000e/ethtool.c
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel PRO/1000 Linux driver
-  Copyright(c) 1999 - 2011 Intel Corporation.
+  Copyright(c) 1999 - 2012 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
@@ -34,6 +34,7 @@
 #include <linux/pci.h>
 #include <linux/slab.h>
 #include <linux/delay.h>
+#include <linux/vmalloc.h>
 
 #include "e1000.h"
 
@@ -536,7 +537,7 @@ static int e1000_set_eeprom(struct net_device *netdev,
                 ret_val = e1000_read_nvm(hw, first_word, 1, &eeprom_buff[0]);
                 ptr++;
         }
-        if (((eeprom->offset + eeprom->len) & 1) && (ret_val == 0))
+        if (((eeprom->offset + eeprom->len) & 1) && (!ret_val))
                 /* need read/modify/write of last changed EEPROM word */
                 /* only the first byte of the word is being modified */
                 ret_val = e1000_read_nvm(hw, last_word, 1,
@@ -552,7 +553,7 @@ static int e1000_set_eeprom(struct net_device *netdev,
         memcpy(ptr, bytes, eeprom->len);
 
         for (i = 0; i < last_word - first_word + 1; i++)
-                eeprom_buff[i] = cpu_to_le16(eeprom_buff[i]);
+                cpu_to_le16s(&eeprom_buff[i]);
 
         ret_val = e1000_write_nvm(hw, first_word,
                                   last_word - first_word + 1, eeprom_buff);
@@ -605,94 +606,112 @@ static void e1000_get_ringparam(struct net_device *netdev,
                                 struct ethtool_ringparam *ring)
 {
         struct e1000_adapter *adapter = netdev_priv(netdev);
-        struct e1000_ring *tx_ring = adapter->tx_ring;
-        struct e1000_ring *rx_ring = adapter->rx_ring;
 
         ring->rx_max_pending = E1000_MAX_RXD;
         ring->tx_max_pending = E1000_MAX_TXD;
-        ring->rx_pending = rx_ring->count;
-        ring->tx_pending = tx_ring->count;
+        ring->rx_pending = adapter->rx_ring_count;
+        ring->tx_pending = adapter->tx_ring_count;
 }
 
 static int e1000_set_ringparam(struct net_device *netdev,
                                struct ethtool_ringparam *ring)
 {
         struct e1000_adapter *adapter = netdev_priv(netdev);
-        struct e1000_ring *tx_ring, *tx_old;
-        struct e1000_ring *rx_ring, *rx_old;
-        int err;
+        struct e1000_ring *temp_tx = NULL, *temp_rx = NULL;
+        int err = 0, size = sizeof(struct e1000_ring);
+        bool set_tx = false, set_rx = false;
+        u16 new_rx_count, new_tx_count;
 
         if ((ring->rx_mini_pending) || (ring->rx_jumbo_pending))
                 return -EINVAL;
 
-        while (test_and_set_bit(__E1000_RESETTING, &adapter->state))
-                usleep_range(1000, 2000);
+        new_rx_count = clamp_t(u32, ring->rx_pending, E1000_MIN_RXD,
+                               E1000_MAX_RXD);
+        new_rx_count = ALIGN(new_rx_count, REQ_RX_DESCRIPTOR_MULTIPLE);
 
-        if (netif_running(adapter->netdev))
-                e1000e_down(adapter);
+        new_tx_count = clamp_t(u32, ring->tx_pending, E1000_MIN_TXD,
+                               E1000_MAX_TXD);
+        new_tx_count = ALIGN(new_tx_count, REQ_TX_DESCRIPTOR_MULTIPLE);
 
-        tx_old = adapter->tx_ring;
-        rx_old = adapter->rx_ring;
+        if ((new_tx_count == adapter->tx_ring_count) &&
+            (new_rx_count == adapter->rx_ring_count))
+                /* nothing to do */
+                return 0;
 
-        err = -ENOMEM;
-        tx_ring = kmemdup(tx_old, sizeof(struct e1000_ring), GFP_KERNEL);
-        if (!tx_ring)
-                goto err_alloc_tx;
+        while (test_and_set_bit(__E1000_RESETTING, &adapter->state))
+                usleep_range(1000, 2000);
 
-        rx_ring = kmemdup(rx_old, sizeof(struct e1000_ring), GFP_KERNEL);
-        if (!rx_ring)
-                goto err_alloc_rx;
+        if (!netif_running(adapter->netdev)) {
+                /* Set counts now and allocate resources during open() */
+                adapter->tx_ring->count = new_tx_count;
+                adapter->rx_ring->count = new_rx_count;
+                adapter->tx_ring_count = new_tx_count;
+                adapter->rx_ring_count = new_rx_count;
+                goto clear_reset;
+        }
 
-        adapter->tx_ring = tx_ring;
-        adapter->rx_ring = rx_ring;
+        set_tx = (new_tx_count != adapter->tx_ring_count);
+        set_rx = (new_rx_count != adapter->rx_ring_count);
 
-        rx_ring->count = max(ring->rx_pending, (u32)E1000_MIN_RXD);
-        rx_ring->count = min(rx_ring->count, (u32)(E1000_MAX_RXD));
-        rx_ring->count = ALIGN(rx_ring->count, REQ_RX_DESCRIPTOR_MULTIPLE);
+        /* Allocate temporary storage for ring updates */
+        if (set_tx) {
+                temp_tx = vmalloc(size);
+                if (!temp_tx) {
+                        err = -ENOMEM;
+                        goto free_temp;
+                }
+        }
+        if (set_rx) {
+                temp_rx = vmalloc(size);
+                if (!temp_rx) {
+                        err = -ENOMEM;
+                        goto free_temp;
+                }
+        }
 
-        tx_ring->count = max(ring->tx_pending, (u32)E1000_MIN_TXD);
-        tx_ring->count = min(tx_ring->count, (u32)(E1000_MAX_TXD));
-        tx_ring->count = ALIGN(tx_ring->count, REQ_TX_DESCRIPTOR_MULTIPLE);
+        e1000e_down(adapter);
 
-        if (netif_running(adapter->netdev)) {
-                /* Try to get new resources before deleting old */
-                err = e1000e_setup_rx_resources(adapter);
+        /*
+         * We can't just free everything and then setup again, because the
+         * ISRs in MSI-X mode get passed pointers to the Tx and Rx ring
+         * structs.  First, attempt to allocate new resources...
+         */
+        if (set_tx) {
+                memcpy(temp_tx, adapter->tx_ring, size);
+                temp_tx->count = new_tx_count;
+                err = e1000e_setup_tx_resources(temp_tx);
                 if (err)
-                        goto err_setup_rx;
-                err = e1000e_setup_tx_resources(adapter);
+                        goto err_setup;
+        }
+        if (set_rx) {
+                memcpy(temp_rx, adapter->rx_ring, size);
+                temp_rx->count = new_rx_count;
+                err = e1000e_setup_rx_resources(temp_rx);
                 if (err)
-                        goto err_setup_tx;
+                        goto err_setup_rx;
+        }
 
-                /*
-                 * restore the old in order to free it,
-                 * then add in the new
-                 */
-                adapter->rx_ring = rx_old;
-                adapter->tx_ring = tx_old;
-                e1000e_free_rx_resources(adapter);
-                e1000e_free_tx_resources(adapter);
-                kfree(tx_old);
-                kfree(rx_old);
-                adapter->rx_ring = rx_ring;
-                adapter->tx_ring = tx_ring;
-                err = e1000e_up(adapter);
-                if (err)
-                        goto err_setup;
+        /* ...then free the old resources and copy back any new ring data */
+        if (set_tx) {
+                e1000e_free_tx_resources(adapter->tx_ring);
+                memcpy(adapter->tx_ring, temp_tx, size);
+                adapter->tx_ring_count = new_tx_count;
+        }
+        if (set_rx) {
+                e1000e_free_rx_resources(adapter->rx_ring);
+                memcpy(adapter->rx_ring, temp_rx, size);
+                adapter->rx_ring_count = new_rx_count;
         }
 
-        clear_bit(__E1000_RESETTING, &adapter->state);
-        return 0;
-err_setup_tx:
-        e1000e_free_rx_resources(adapter);
 err_setup_rx:
-        adapter->rx_ring = rx_old;
-        adapter->tx_ring = tx_old;
-        kfree(rx_ring);
-err_alloc_rx:
-        kfree(tx_ring);
-err_alloc_tx:
-        e1000e_up(adapter);
+        if (err && set_tx)
+                e1000e_free_tx_resources(temp_tx);
 err_setup:
+        e1000e_up(adapter);
+free_temp:
+        vfree(temp_tx);
+        vfree(temp_rx);
+clear_reset:
         clear_bit(__E1000_RESETTING, &adapter->state);
         return err;
 }
@@ -1069,7 +1088,7 @@ static int e1000_setup_desc_rings(struct e1000_adapter *adapter)
         tx_ring->buffer_info = kcalloc(tx_ring->count,
                                        sizeof(struct e1000_buffer),
                                        GFP_KERNEL);
-        if (!(tx_ring->buffer_info)) {
+        if (!tx_ring->buffer_info) {
                 ret_val = 1;
                 goto err_nomem;
         }
@@ -1131,7 +1150,7 @@ static int e1000_setup_desc_rings(struct e1000_adapter *adapter)
         rx_ring->buffer_info = kcalloc(rx_ring->count,
                                        sizeof(struct e1000_buffer),
                                        GFP_KERNEL);
-        if (!(rx_ring->buffer_info)) {
+        if (!rx_ring->buffer_info) {
                 ret_val = 5;
                 goto err_nomem;
         }
@@ -1837,11 +1856,11 @@ static int e1000_set_phys_id(struct net_device *netdev,
                 break;
 
         case ETHTOOL_ID_ON:
-                adapter->hw.mac.ops.led_on(&adapter->hw);
+                hw->mac.ops.led_on(hw);
                 break;
 
         case ETHTOOL_ID_OFF:
-                adapter->hw.mac.ops.led_off(&adapter->hw);
+                hw->mac.ops.led_off(hw);
                 break;
         }
         return 0;
@@ -1955,6 +1974,53 @@ static void e1000_get_strings(struct net_device *netdev, u32 stringset,
         }
 }
 
+static int e1000_get_rxnfc(struct net_device *netdev,
+                           struct ethtool_rxnfc *info, u32 *rule_locs)
+{
+        info->data = 0;
+
+        switch (info->cmd) {
+        case ETHTOOL_GRXFH: {
+                struct e1000_adapter *adapter = netdev_priv(netdev);
+                struct e1000_hw *hw = &adapter->hw;
+                u32 mrqc = er32(MRQC);
+
+                if (!(mrqc & E1000_MRQC_RSS_FIELD_MASK))
+                        return 0;
+
+                switch (info->flow_type) {
+                case TCP_V4_FLOW:
+                        if (mrqc & E1000_MRQC_RSS_FIELD_IPV4_TCP)
+                                info->data |= RXH_L4_B_0_1 | RXH_L4_B_2_3;
+                        /* fall through */
+                case UDP_V4_FLOW:
+                case SCTP_V4_FLOW:
+                case AH_ESP_V4_FLOW:
+                case IPV4_FLOW:
+                        if (mrqc & E1000_MRQC_RSS_FIELD_IPV4)
+                                info->data |= RXH_IP_SRC | RXH_IP_DST;
+                        break;
+                case TCP_V6_FLOW:
+                        if (mrqc & E1000_MRQC_RSS_FIELD_IPV6_TCP)
+                                info->data |= RXH_L4_B_0_1 | RXH_L4_B_2_3;
+                        /* fall through */
+                case UDP_V6_FLOW:
+                case SCTP_V6_FLOW:
+                case AH_ESP_V6_FLOW:
+                case IPV6_FLOW:
+                        if (mrqc & E1000_MRQC_RSS_FIELD_IPV6)
+                                info->data |= RXH_IP_SRC | RXH_IP_DST;
+                        break;
+                default:
+                        break;
+                }
+                return 0;
+        }
+        default:
+                return -EOPNOTSUPP;
+        }
+}
+
 static const struct ethtool_ops e1000_ethtool_ops = {
         .get_settings           = e1000_get_settings,
         .set_settings           = e1000_set_settings,
@@ -1981,6 +2047,7 @@ static const struct ethtool_ops e1000_ethtool_ops = {
         .get_sset_count         = e1000e_get_sset_count,
         .get_coalesce           = e1000_get_coalesce,
         .set_coalesce           = e1000_set_coalesce,
+        .get_rxnfc              = e1000_get_rxnfc,
 };
 
 void e1000e_set_ethtool_ops(struct net_device *netdev)
diff --git a/drivers/net/ethernet/intel/e1000e/hw.h b/drivers/net/ethernet/intel/e1000e/hw.h
index 29670397079b..197059bb9abf 100644
--- a/drivers/net/ethernet/intel/e1000e/hw.h
+++ b/drivers/net/ethernet/intel/e1000e/hw.h
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel PRO/1000 Linux driver
-  Copyright(c) 1999 - 2011 Intel Corporation.
+  Copyright(c) 1999 - 2012 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
@@ -204,6 +204,7 @@ enum e1e_registers {
         E1000_WUC      = 0x05800, /* Wakeup Control - RW */
         E1000_WUFC     = 0x05808, /* Wakeup Filter Control - RW */
         E1000_WUS      = 0x05810, /* Wakeup Status - RO */
+        E1000_MRQC     = 0x05818, /* Multiple Receive Control - RW */
         E1000_MANC     = 0x05820, /* Management Control - RW */
         E1000_FFLT     = 0x05F00, /* Flexible Filter Length Table - RW Array */
         E1000_HOST_IF  = 0x08800, /* Host Interface */
@@ -219,6 +220,10 @@ enum e1e_registers {
         E1000_SWSM      = 0x05B50, /* SW Semaphore */
         E1000_FWSM      = 0x05B54, /* FW Semaphore */
         E1000_SWSM2     = 0x05B58, /* Driver-only SW semaphore */
+        E1000_RETA_BASE = 0x05C00, /* Redirection Table - RW */
+#define E1000_RETA(_n)  (E1000_RETA_BASE + ((_n) * 4))
+        E1000_RSSRK_BASE = 0x05C80, /* RSS Random Key - RW */
+#define E1000_RSSRK(_n) (E1000_RSSRK_BASE + ((_n) * 4))
         E1000_FFLT_DBG  = 0x05F04, /* Debug Register */
         E1000_PCH_RAICC_BASE = 0x05F50, /* Receive Address Initial CRC */
 #define E1000_PCH_RAICC(_n)     (E1000_PCH_RAICC_BASE + ((_n) * 4))
@@ -964,8 +969,8 @@ struct e1000_dev_spec_ich8lan {
 struct e1000_hw {
         struct e1000_adapter *adapter;
 
-        u8 __iomem *hw_addr;
-        u8 __iomem *flash_address;
+        void __iomem *hw_addr;
+        void __iomem *flash_address;
 
         struct e1000_mac_info  mac;
         struct e1000_fc_info   fc;
diff --git a/drivers/net/ethernet/intel/e1000e/ich8lan.c b/drivers/net/ethernet/intel/e1000e/ich8lan.c
index e2a80a283fd3..112d55f76b79 100644
--- a/drivers/net/ethernet/intel/e1000e/ich8lan.c
+++ b/drivers/net/ethernet/intel/e1000e/ich8lan.c
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel PRO/1000 Linux driver
-  Copyright(c) 1999 - 2011 Intel Corporation.
+  Copyright(c) 1999 - 2012 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
@@ -145,6 +145,8 @@
 #define I82579_EMI_ADDR         0x10
 #define I82579_EMI_DATA         0x11
 #define I82579_LPI_UPDATE_TIMER 0x4805  /* in 40ns units + 40 ns base value */
+#define I82579_MSE_THRESHOLD    0x084F  /* Mean Square Error Threshold */
+#define I82579_MSE_LINK_DOWN    0x2411  /* MSE count before dropping link */
 
 /* Strapping Option Register - RO */
 #define E1000_STRAP                     0x0000C
@@ -278,8 +280,8 @@ static inline void __ew32flash(struct e1000_hw *hw, unsigned long reg, u32 val)
 
 #define er16flash(reg)          __er16flash(hw, (reg))
 #define er32flash(reg)          __er32flash(hw, (reg))
-#define ew16flash(reg,val)      __ew16flash(hw, (reg), (val))
-#define ew32flash(reg,val)      __ew32flash(hw, (reg), (val))
+#define ew16flash(reg, val)     __ew16flash(hw, (reg), (val))
+#define ew32flash(reg, val)     __ew32flash(hw, (reg), (val))
 
 static void e1000_toggle_lanphypc_value_ich8lan(struct e1000_hw *hw)
 {
@@ -304,7 +306,6 @@ static void e1000_toggle_lanphypc_value_ich8lan(struct e1000_hw *hw)
 static s32 e1000_init_phy_params_pchlan(struct e1000_hw *hw)
 {
         struct e1000_phy_info *phy = &hw->phy;
-        u32 fwsm;
         s32 ret_val = 0;
 
         phy->addr                     = 1;
@@ -323,14 +324,14 @@ static s32 e1000_init_phy_params_pchlan(struct e1000_hw *hw)
         phy->ops.power_down           = e1000_power_down_phy_copper_ich8lan;
         phy->autoneg_mask             = AUTONEG_ADVERTISE_SPEED_DEFAULT;
 
-        /*
-         * The MAC-PHY interconnect may still be in SMBus mode
-         * after Sx->S0.  If the manageability engine (ME) is
-         * disabled, then toggle the LANPHYPC Value bit to force
-         * the interconnect to PCIe mode.
-         */
-        fwsm = er32(FWSM);
-        if (!(fwsm & E1000_ICH_FWSM_FW_VALID) && !e1000_check_reset_block(hw)) {
+        if (!e1000_check_reset_block(hw)) {
+                u32 fwsm = er32(FWSM);
+
+                /*
+                 * The MAC-PHY interconnect may still be in SMBus mode after
+                 * Sx->S0.  If resetting the PHY is not blocked, toggle the
+                 * LANPHYPC Value bit to force the interconnect to PCIe mode.
+                 */
                 e1000_toggle_lanphypc_value_ich8lan(hw);
                 msleep(50);
 
@@ -338,25 +339,26 @@ static s32 e1000_init_phy_params_pchlan(struct e1000_hw *hw)
                  * Gate automatic PHY configuration by hardware on
                  * non-managed 82579
                  */
-                if (hw->mac.type == e1000_pch2lan)
+                if ((hw->mac.type == e1000_pch2lan) &&
+                    !(fwsm & E1000_ICH_FWSM_FW_VALID))
                         e1000_gate_hw_phy_config_ich8lan(hw, true);
-        }
 
-        /*
-         * Reset the PHY before any access to it.  Doing so, ensures that
-         * the PHY is in a known good state before we read/write PHY registers.
-         * The generic reset is sufficient here, because we haven't determined
-         * the PHY type yet.
-         */
-        ret_val = e1000e_phy_hw_reset_generic(hw);
-        if (ret_val)
-                goto out;
+                /*
+                 * Reset the PHY before any access to it.  Doing so, ensures
+                 * that the PHY is in a known good state before we read/write
+                 * PHY registers.  The generic reset is sufficient here,
+                 * because we haven't determined the PHY type yet.
+                 */
+                ret_val = e1000e_phy_hw_reset_generic(hw);
+                if (ret_val)
+                        goto out;
 
-        /* Ungate automatic PHY configuration on non-managed 82579 */
-        if ((hw->mac.type == e1000_pch2lan) &&
-            !(fwsm & E1000_ICH_FWSM_FW_VALID)) {
-                usleep_range(10000, 20000);
-                e1000_gate_hw_phy_config_ich8lan(hw, false);
+                /* Ungate automatic PHY configuration on non-managed 82579 */
+                if ((hw->mac.type == e1000_pch2lan) &&
+                    !(fwsm & E1000_ICH_FWSM_FW_VALID)) {
+                        usleep_range(10000, 20000);
+                        e1000_gate_hw_phy_config_ich8lan(hw, false);
+                }
         }
 
         phy->id = e1000_phy_unknown;
@@ -551,9 +553,8 @@ static s32 e1000_init_nvm_params_ich8lan(struct e1000_hw *hw)
  *  Initialize family-specific MAC parameters and function
  *  pointers.
  **/
-static s32 e1000_init_mac_params_ich8lan(struct e1000_adapter *adapter)
+static s32 e1000_init_mac_params_ich8lan(struct e1000_hw *hw)
 {
-        struct e1000_hw *hw = &adapter->hw;
         struct e1000_mac_info *mac = &hw->mac;
 
         /* Set media type function pointer */
@@ -773,7 +774,7 @@ static s32 e1000_get_variants_ich8lan(struct e1000_adapter *adapter)
         struct e1000_hw *hw = &adapter->hw;
         s32 rc;
 
-        rc = e1000_init_mac_params_ich8lan(adapter);
+        rc = e1000_init_mac_params_ich8lan(hw);
         if (rc)
                 return rc;
 
@@ -900,8 +901,7 @@ static s32 e1000_acquire_swflag_ich8lan(struct e1000_hw *hw)
         }
 
         if (!timeout) {
-                e_dbg("Failed to acquire the semaphore, FW or HW has it: "
-                      "FWSM=0x%8.8x EXTCNF_CTRL=0x%8.8x)\n",
+                e_dbg("Failed to acquire the semaphore, FW or HW has it: FWSM=0x%8.8x EXTCNF_CTRL=0x%8.8x)\n",
                       er32(FWSM), extcnf_ctrl);
                 extcnf_ctrl &= ~E1000_EXTCNF_CTRL_SWFLAG;
                 ew32(EXTCNF_CTRL, extcnf_ctrl);
@@ -1669,6 +1669,26 @@ static s32 e1000_lv_phy_workarounds_ich8lan(struct e1000_hw *hw)
         /* Set MDIO slow mode before any other MDIO access */
         ret_val = e1000_set_mdio_slow_mode_hv(hw);
 
+        ret_val = hw->phy.ops.acquire(hw);
+        if (ret_val)
+                goto out;
+        ret_val = hw->phy.ops.write_reg_locked(hw, I82579_EMI_ADDR,
+                                               I82579_MSE_THRESHOLD);
+        if (ret_val)
+                goto release;
+        /* set MSE higher to enable link to stay up when noise is high */
+        ret_val = hw->phy.ops.write_reg_locked(hw, I82579_EMI_DATA, 0x0034);
+        if (ret_val)
+                goto release;
+        ret_val = hw->phy.ops.write_reg_locked(hw, I82579_EMI_ADDR,
+                                               I82579_MSE_LINK_DOWN);
+        if (ret_val)
+                goto release;
+        /* drop link after 5 times MSE threshold was reached */
+        ret_val = hw->phy.ops.write_reg_locked(hw, I82579_EMI_DATA, 0x0005);
+release:
+        hw->phy.ops.release(hw);
+
 out:
         return ret_val;
 }
@@ -1741,7 +1761,6 @@ static void e1000_gate_hw_phy_config_ich8lan(struct e1000_hw *hw, bool gate)
                 extcnf_ctrl &= ~E1000_EXTCNF_CTRL_GATE_PHY_CFG;
 
         ew32(EXTCNF_CTRL, extcnf_ctrl);
-        return;
 }
 
 /**
@@ -1899,7 +1918,9 @@ static s32 e1000_set_lplu_state_pchlan(struct e1000_hw *hw, bool active)
         else
                 oem_reg &= ~HV_OEM_BITS_LPLU;
 
-        oem_reg |= HV_OEM_BITS_RESTART_AN;
+        if (!e1000_check_reset_block(hw))
+                oem_reg |= HV_OEM_BITS_RESTART_AN;
+
         ret_val = e1e_wphy(hw, HV_OEM_BITS, oem_reg);
 
 out:
@@ -2108,8 +2129,7 @@ static s32 e1000_valid_nvm_bank_detect_ich8lan(struct e1000_hw *hw, u32 *bank)
 
                         return 0;
                 }
-                e_dbg("Unable to determine valid NVM bank via EEC - "
-                       "reading flash signature\n");
+                e_dbg("Unable to determine valid NVM bank via EEC - reading flash signature\n");
                 /* fall-thru */
         default:
                 /* set bank to 0 in case flash read fails */
@@ -2221,8 +2241,7 @@ static s32 e1000_flash_cycle_init_ich8lan(struct e1000_hw *hw)
 
         /* Check if the flash descriptor is valid */
         if (hsfsts.hsf_status.fldesvalid == 0) {
-                e_dbg("Flash descriptor invalid.  "
-                         "SW Sequencing must be used.\n");
+                e_dbg("Flash descriptor invalid.  SW Sequencing must be used.\n");
                 return -E1000_ERR_NVM;
         }
 
@@ -2258,14 +2277,14 @@ static s32 e1000_flash_cycle_init_ich8lan(struct e1000_hw *hw)
                  * cycle has a chance to end before giving up.
                  */
                 for (i = 0; i < ICH_FLASH_READ_COMMAND_TIMEOUT; i++) {
-                        hsfsts.regval = __er16flash(hw, ICH_FLASH_HSFSTS);
+                        hsfsts.regval = er16flash(ICH_FLASH_HSFSTS);
                         if (hsfsts.hsf_status.flcinprog == 0) {
                                 ret_val = 0;
                                 break;
                         }
                         udelay(1);
                 }
-                if (ret_val == 0) {
+                if (!ret_val) {
                         /*
                          * Successful in waiting for previous cycle to timeout,
                          * now set the Flash Cycle Done.
@@ -2383,7 +2402,7 @@ static s32 e1000_read_flash_data_ich8lan(struct e1000_hw *hw, u32 offset,
                 udelay(1);
                 /* Steps */
                 ret_val = e1000_flash_cycle_init_ich8lan(hw);
-                if (ret_val != 0)
+                if (ret_val)
                         break;
 
                 hsflctl.regval = er16flash(ICH_FLASH_HSFCTL);
@@ -2403,7 +2422,7 @@ static s32 e1000_read_flash_data_ich8lan(struct e1000_hw *hw, u32 offset,
                  * read in (shift in) the Flash Data0, the order is
                  * least significant byte first msb to lsb
                  */
-                if (ret_val == 0) {
+                if (!ret_val) {
                         flash_data = er32flash(ICH_FLASH_FDATA0);
                         if (size == 1)
                                 *data = (u8)(flash_data & 0x000000FF);
@@ -2422,8 +2441,7 @@ static s32 e1000_read_flash_data_ich8lan(struct e1000_hw *hw, u32 offset,
                                 /* Repeat for some time before giving up. */
                                 continue;
                         } else if (hsfsts.hsf_status.flcdone == 0) {
-                                e_dbg("Timeout error - flash cycle "
-                                         "did not complete.\n");
+                                e_dbg("Timeout error - flash cycle did not complete.\n");
                                 break;
                         }
                 }
@@ -2774,8 +2792,7 @@ static s32 e1000_write_flash_data_ich8lan(struct e1000_hw *hw, u32 offset,
                         /* Repeat for some time before giving up. */
                         continue;
                 if (hsfsts.hsf_status.flcdone == 0) {
-                        e_dbg("Timeout error - flash cycle "
-                                 "did not complete.");
+                        e_dbg("Timeout error - flash cycle did not complete.\n");
                         break;
                 }
         } while (count++ < ICH_FLASH_CYCLE_REPEAT_COUNT);
@@ -2917,7 +2934,7 @@ static s32 e1000_erase_flash_bank_ich8lan(struct e1000_hw *hw, u32 bank)
 
                         ret_val = e1000_flash_cycle_ich8lan(hw,
                                                ICH_FLASH_ERASE_COMMAND_TIMEOUT);
-                        if (ret_val == 0)
+                        if (!ret_val)
                                 break;
 
                         /*
@@ -3676,9 +3693,10 @@ void e1000e_gig_downshift_workaround_ich8lan(struct e1000_hw *hw)
  *
  *  During S0 to Sx transition, it is possible the link remains at gig
  *  instead of negotiating to a lower speed.  Before going to Sx, set
- *  'LPLU Enabled' and 'Gig Disable' to force link speed negotiation
- *  to a lower speed.  For PCH and newer parts, the OEM bits PHY register
- *  (LED, GbE disable and LPLU configurations) also needs to be written.
+ *  'Gig Disable' to force link speed negotiation to a lower speed based on
+ *  the LPLU setting in the NVM or custom setting.  For PCH and newer parts,
+ *  the OEM bits PHY register (LED, GbE disable and LPLU configurations) also
+ *  needs to be written.
  **/
 void e1000_suspend_workarounds_ich8lan(struct e1000_hw *hw)
 {
@@ -3686,7 +3704,7 @@ void e1000_suspend_workarounds_ich8lan(struct e1000_hw *hw)
         s32 ret_val;
 
         phy_ctrl = er32(PHY_CTRL);
-        phy_ctrl |= E1000_PHY_CTRL_D0A_LPLU | E1000_PHY_CTRL_GBE_DISABLE;
+        phy_ctrl |= E1000_PHY_CTRL_GBE_DISABLE;
         ew32(PHY_CTRL, phy_ctrl);
 
         if (hw->mac.type == e1000_ich8lan)
@@ -3714,47 +3732,40 @@ void e1000_suspend_workarounds_ich8lan(struct e1000_hw *hw)
  **/
 void e1000_resume_workarounds_pchlan(struct e1000_hw *hw)
 {
-        u32 fwsm;
+        u16 phy_id1, phy_id2;
+        s32 ret_val;
 
-        if (hw->mac.type != e1000_pch2lan)
+        if ((hw->mac.type != e1000_pch2lan) || e1000_check_reset_block(hw))
                 return;
 
-        fwsm = er32(FWSM);
-        if (!(fwsm & E1000_ICH_FWSM_FW_VALID) || !e1000_check_reset_block(hw)) {
-                u16 phy_id1, phy_id2;
-                s32 ret_val;
-
-                ret_val = hw->phy.ops.acquire(hw);
-                if (ret_val) {
-                        e_dbg("Failed to acquire PHY semaphore in resume\n");
-                        return;
-                }
+        ret_val = hw->phy.ops.acquire(hw);
+        if (ret_val) {
+                e_dbg("Failed to acquire PHY semaphore in resume\n");
+                return;
+        }
 
-                /* Test access to the PHY registers by reading the ID regs */
-                ret_val = hw->phy.ops.read_reg_locked(hw, PHY_ID1, &phy_id1);
-                if (ret_val)
-                        goto release;
-                ret_val = hw->phy.ops.read_reg_locked(hw, PHY_ID2, &phy_id2);
-                if (ret_val)
-                        goto release;
+        /* Test access to the PHY registers by reading the ID regs */
+        ret_val = hw->phy.ops.read_reg_locked(hw, PHY_ID1, &phy_id1);
+        if (ret_val)
+                goto release;
+        ret_val = hw->phy.ops.read_reg_locked(hw, PHY_ID2, &phy_id2);
+        if (ret_val)
+                goto release;
 
-                if (hw->phy.id == ((u32)(phy_id1 << 16) |
-                                   (u32)(phy_id2 & PHY_REVISION_MASK)))
-                        goto release;
+        if (hw->phy.id == ((u32)(phy_id1 << 16) |
+                           (u32)(phy_id2 & PHY_REVISION_MASK)))
+                goto release;
 
-                e1000_toggle_lanphypc_value_ich8lan(hw);
+        e1000_toggle_lanphypc_value_ich8lan(hw);
 
-                hw->phy.ops.release(hw);
-                msleep(50);
-                e1000_phy_hw_reset(hw);
-                msleep(50);
-                return;
-        }
+        hw->phy.ops.release(hw);
+        msleep(50);
+        e1000_phy_hw_reset(hw);
+        msleep(50);
+        return;
 
 release:
         hw->phy.ops.release(hw);
-
-        return;
 }
 
 /**
@@ -4088,10 +4099,9 @@ const struct e1000_info e1000_ich9_info = {
                                   | FLAG_HAS_WOL
                                   | FLAG_HAS_CTRLEXT_ON_LOAD
                                   | FLAG_HAS_AMT
-                                  | FLAG_HAS_ERT
                                   | FLAG_HAS_FLASH
                                   | FLAG_APME_IN_WUC,
-        .pba                    = 10,
+        .pba                    = 18,
         .max_hw_frame_size      = DEFAULT_JUMBO,
         .get_variants           = e1000_get_variants_ich8lan,
         .mac_ops                = &ich8_mac_ops,
@@ -4106,10 +4116,9 @@ const struct e1000_info e1000_ich10_info = {
                                   | FLAG_HAS_WOL
                                   | FLAG_HAS_CTRLEXT_ON_LOAD
                                   | FLAG_HAS_AMT
-                                  | FLAG_HAS_ERT
                                   | FLAG_HAS_FLASH
                                   | FLAG_APME_IN_WUC,
-        .pba                    = 10,
+        .pba                    = 18,
         .max_hw_frame_size      = DEFAULT_JUMBO,
         .get_variants           = e1000_get_variants_ich8lan,
         .mac_ops                = &ich8_mac_ops,
diff --git a/drivers/net/ethernet/intel/e1000e/lib.c b/drivers/net/ethernet/intel/e1000e/mac.c
index 0893ab107adf..83f93684dc2f 100644
--- a/drivers/net/ethernet/intel/e1000e/lib.c
+++ b/drivers/net/ethernet/intel/e1000e/mac.c
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel PRO/1000 Linux driver
-  Copyright(c) 1999 - 2011 Intel Corporation.
+  Copyright(c) 1999 - 2012 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
@@ -28,19 +28,6 @@
 
 #include "e1000.h"
 
-enum e1000_mng_mode {
-        e1000_mng_mode_none = 0,
-        e1000_mng_mode_asf,
-        e1000_mng_mode_pt,
-        e1000_mng_mode_ipmi,
-        e1000_mng_mode_host_if_only
-};
-
-#define E1000_FACTPS_MNGCG              0x20000000
-
-/* Intel(R) Active Management Technology signature */
-#define E1000_IAMT_SIGNATURE            0x544D4149
-
 /**
  *  e1000e_get_bus_info_pcie - Get PCIe bus information
  *  @hw: pointer to the HW structure
@@ -151,7 +138,7 @@ void e1000_write_vfta_generic(struct e1000_hw *hw, u32 offset, u32 value)
 void e1000e_init_rx_addrs(struct e1000_hw *hw, u16 rar_count)
 {
         u32 i;
-        u8 mac_addr[ETH_ALEN] = {0};
+        u8 mac_addr[ETH_ALEN] = { 0 };
 
         /* Setup the receive address */
         e_dbg("Programming MAC Address into RAR[0]\n");
@@ -159,7 +146,7 @@ void e1000e_init_rx_addrs(struct e1000_hw *hw, u16 rar_count)
         e1000e_rar_set(hw, hw->mac.addr, 0);
 
         /* Zero out the other (rar_entry_count - 1) receive addresses */
-        e_dbg("Clearing RAR[1-%u]\n", rar_count-1);
+        e_dbg("Clearing RAR[1-%u]\n", rar_count - 1);
         for (i = 1; i < rar_count; i++)
                 e1000e_rar_set(hw, mac_addr, i);
 }
@@ -187,15 +174,12 @@ s32 e1000_check_alt_mac_addr_generic(struct e1000_hw *hw)
         if (ret_val)
                 goto out;
 
-        /* Check for LOM (vs. NIC) or one of two valid mezzanine cards */
-        if (!((nvm_data & NVM_COMPAT_LOM) ||
-              (hw->adapter->pdev->device == E1000_DEV_ID_82571EB_SERDES_DUAL) ||
-              (hw->adapter->pdev->device == E1000_DEV_ID_82571EB_SERDES_QUAD) ||
-              (hw->adapter->pdev->device == E1000_DEV_ID_82571EB_SERDES)))
+        /* not supported on 82573 */
+        if (hw->mac.type == e1000_82573)
                 goto out;
 
         ret_val = e1000_read_nvm(hw, NVM_ALT_MAC_ADDR_PTR, 1,
-                                 &nvm_alt_mac_addr_offset);
+                                 &nvm_alt_mac_addr_offset);
         if (ret_val) {
                 e_dbg("NVM Read Error\n");
                 goto out;
@@ -254,11 +238,10 @@ void e1000e_rar_set(struct e1000_hw *hw, u8 *addr, u32 index)
          * HW expects these in little endian so we reverse the byte order
          * from network order (big endian) to little endian
          */
-        rar_low = ((u32) addr[0] |
-                   ((u32) addr[1] << 8) |
-                    ((u32) addr[2] << 16) | ((u32) addr[3] << 24));
+        rar_low = ((u32)addr[0] | ((u32)addr[1] << 8) |
+                   ((u32)addr[2] << 16) | ((u32)addr[3] << 24));
 
-        rar_high = ((u32) addr[4] | ((u32) addr[5] << 8));
+        rar_high = ((u32)addr[4] | ((u32)addr[5] << 8));
 
         /* If MAC address zero, no need to set the AV bit */
         if (rar_low || rar_high)
@@ -318,7 +301,7 @@ static u32 e1000_hash_mc_addr(struct e1000_hw *hw, u8 *mc_addr)
          * values resulting from each mc_filter_type...
          * [0] [1] [2] [3] [4] [5]
          * 01  AA  00  12  34  56
-         * LSB           MSB
+         * LSB           MSB
          *
          * case 0: hash_value = ((0x34 >> 4) | (0x56 << 4)) & 0xFFF = 0x563
          * case 1: hash_value = ((0x34 >> 3) | (0x56 << 5)) & 0xFFF = 0xAC6
@@ -341,7 +324,7 @@ static u32 e1000_hash_mc_addr(struct e1000_hw *hw, u8 *mc_addr)
         }
 
         hash_value = hash_mask & (((mc_addr[4] >> (8 - bit_shift)) |
-                                  (((u16) mc_addr[5]) << bit_shift)));
+                                   (((u16)mc_addr[5]) << bit_shift)));
 
         return hash_value;
 }
@@ -365,7 +348,7 @@ void e1000e_update_mc_addr_list_generic(struct e1000_hw *hw,
         memset(&hw->mac.mta_shadow, 0, sizeof(hw->mac.mta_shadow));
 
         /* update mta_shadow from mc_addr_list */
-        for (i = 0; (u32) i < mc_addr_count; i++) {
+        for (i = 0; (u32)i < mc_addr_count; i++) {
                 hash_value = e1000_hash_mc_addr(hw, mc_addr_list);
 
                 hash_reg = (hash_value >> 5) & (hw->mac.mta_reg_count - 1);
@@ -461,7 +444,7 @@ s32 e1000e_check_for_copper_link(struct e1000_hw *hw)
                 return ret_val;
 
         if (!link)
-                return ret_val; /* No link detected */
+                return ret_val; /* No link detected */
 
         mac->get_link_status = false;
 
@@ -528,10 +511,10 @@ s32 e1000e_check_for_fiber_link(struct e1000_hw *hw)
          * was just plugged in. The autoneg_failed flag does this.
          */
         /* (ctrl & E1000_CTRL_SWDPIN1) == 1 == have signal */
-        if ((ctrl & E1000_CTRL_SWDPIN1) && (!(status & E1000_STATUS_LU)) &&
-            (!(rxcw & E1000_RXCW_C))) {
-                if (mac->autoneg_failed == 0) {
-                        mac->autoneg_failed = 1;
+        if ((ctrl & E1000_CTRL_SWDPIN1) && !(status & E1000_STATUS_LU) &&
+            !(rxcw & E1000_RXCW_C)) {
+                if (!mac->autoneg_failed) {
+                        mac->autoneg_failed = true;
                         return 0;
                 }
                 e_dbg("NOT Rx'ing /C/, disable AutoNeg and force link.\n");
@@ -594,9 +577,9 @@ s32 e1000e_check_for_serdes_link(struct e1000_hw *hw)
          * time to complete.
          */
         /* (ctrl & E1000_CTRL_SWDPIN1) == 1 == have signal */
-        if ((!(status & E1000_STATUS_LU)) && (!(rxcw & E1000_RXCW_C))) {
-                if (mac->autoneg_failed == 0) {
-                        mac->autoneg_failed = 1;
+        if (!(status & E1000_STATUS_LU) && !(rxcw & E1000_RXCW_C)) {
+                if (!mac->autoneg_failed) {
+                        mac->autoneg_failed = true;
                         return 0;
                 }
                 e_dbg("NOT Rx'ing /C/, disable AutoNeg and force link.\n");
@@ -656,12 +639,10 @@ s32 e1000e_check_for_serdes_link(struct e1000_hw *hw)
                         if (rxcw & E1000_RXCW_SYNCH) {
                                 if (!(rxcw & E1000_RXCW_IV)) {
                                         mac->serdes_has_link = true;
-                                        e_dbg("SERDES: Link up - autoneg "
-                                           "completed successfully.\n");
+                                        e_dbg("SERDES: Link up - autoneg completed successfully.\n");
                                 } else {
                                         mac->serdes_has_link = false;
-                                        e_dbg("SERDES: Link down - invalid"
-                                           "codewords detected in autoneg.\n");
+                                        e_dbg("SERDES: Link down - invalid codewords detected in autoneg.\n");
                                 }
                         } else {
                                 mac->serdes_has_link = false;
@@ -706,8 +687,7 @@ static s32 e1000_set_default_fc_generic(struct e1000_hw *hw)
 
         if ((nvm_data & NVM_WORD0F_PAUSE_MASK) == 0)
                 hw->fc.requested_mode = e1000_fc_none;
-        else if ((nvm_data & NVM_WORD0F_PAUSE_MASK) ==
-                 NVM_WORD0F_ASM_DIR)
+        else if ((nvm_data & NVM_WORD0F_PAUSE_MASK) == NVM_WORD0F_ASM_DIR)
                 hw->fc.requested_mode = e1000_fc_tx_pause;
         else
                 hw->fc.requested_mode = e1000_fc_full;
@@ -753,8 +733,7 @@ s32 e1000e_setup_link(struct e1000_hw *hw)
          */
         hw->fc.current_mode = hw->fc.requested_mode;
 
-        e_dbg("After fix-ups FlowControl is now = %x\n",
-                hw->fc.current_mode);
+        e_dbg("After fix-ups FlowControl is now = %x\n", hw->fc.current_mode);
 
         /* Call the necessary media_type subroutine to configure the link. */
         ret_val = mac->ops.setup_physical_interface(hw);
@@ -876,7 +855,7 @@ static s32 e1000_poll_fiber_serdes_link_generic(struct e1000_hw *hw)
         }
         if (i == FIBER_LINK_UP_LIMIT) {
                 e_dbg("Never got a valid link from auto-neg!!!\n");
-                mac->autoneg_failed = 1;
+                mac->autoneg_failed = true;
                 /*
                  * AutoNeg failed to achieve a link, so we'll call
                  * mac->check_for_link. This routine will force the
@@ -888,9 +867,9 @@ static s32 e1000_poll_fiber_serdes_link_generic(struct e1000_hw *hw)
                         e_dbg("Error while checking for link\n");
                         return ret_val;
                 }
-                mac->autoneg_failed = 0;
+                mac->autoneg_failed = false;
         } else {
-                mac->autoneg_failed = 0;
+                mac->autoneg_failed = false;
                 e_dbg("Valid Link Found\n");
         }
 
@@ -1121,8 +1100,7 @@ s32 e1000e_config_fc_after_link_up(struct e1000_hw *hw)
                         return ret_val;
 
                 if (!(mii_status_reg & MII_SR_AUTONEG_COMPLETE)) {
-                        e_dbg("Copper PHY and Auto Neg "
-                                 "has not completed.\n");
+                        e_dbg("Copper PHY and Auto Neg has not completed.\n");
                         return ret_val;
                 }
 
@@ -1186,11 +1164,10 @@ s32 e1000e_config_fc_after_link_up(struct e1000_hw *hw)
                          */
                         if (hw->fc.requested_mode == e1000_fc_full) {
                                 hw->fc.current_mode = e1000_fc_full;
-                                e_dbg("Flow Control = FULL.\r\n");
+                                e_dbg("Flow Control = FULL.\n");
                         } else {
                                 hw->fc.current_mode = e1000_fc_rx_pause;
-                                e_dbg("Flow Control = "
-                                      "Rx PAUSE frames only.\r\n");
+                                e_dbg("Flow Control = Rx PAUSE frames only.\n");
                         }
                 }
                 /*
@@ -1202,11 +1179,11 @@ s32 e1000e_config_fc_after_link_up(struct e1000_hw *hw)
                  *   0   |    1    |   1   |    1    | e1000_fc_tx_pause
                  */
                 else if (!(mii_nway_adv_reg & NWAY_AR_PAUSE) &&
-                          (mii_nway_adv_reg & NWAY_AR_ASM_DIR) &&
-                          (mii_nway_lp_ability_reg & NWAY_LPAR_PAUSE) &&
-                          (mii_nway_lp_ability_reg & NWAY_LPAR_ASM_DIR)) {
+                         (mii_nway_adv_reg & NWAY_AR_ASM_DIR) &&
+                         (mii_nway_lp_ability_reg & NWAY_LPAR_PAUSE) &&
+                         (mii_nway_lp_ability_reg & NWAY_LPAR_ASM_DIR)) {
                         hw->fc.current_mode = e1000_fc_tx_pause;
-                        e_dbg("Flow Control = Tx PAUSE frames only.\r\n");
+                        e_dbg("Flow Control = Tx PAUSE frames only.\n");
                 }
                 /*
                  * For transmitting PAUSE frames ONLY.
@@ -1221,14 +1198,14 @@ s32 e1000e_config_fc_after_link_up(struct e1000_hw *hw)
                          !(mii_nway_lp_ability_reg & NWAY_LPAR_PAUSE) &&
                          (mii_nway_lp_ability_reg & NWAY_LPAR_ASM_DIR)) {
                         hw->fc.current_mode = e1000_fc_rx_pause;
-                        e_dbg("Flow Control = Rx PAUSE frames only.\r\n");
+                        e_dbg("Flow Control = Rx PAUSE frames only.\n");
                 } else {
                         /*
                          * Per the IEEE spec, at this point flow control
                          * should be disabled.
                          */
                         hw->fc.current_mode = e1000_fc_none;
-                        e_dbg("Flow Control = NONE.\r\n");
+                        e_dbg("Flow Control = NONE.\n");
                 }
 
                 /*
@@ -1268,7 +1245,8 @@ s32 e1000e_config_fc_after_link_up(struct e1000_hw *hw)
  *  Read the status register for the current speed/duplex and store the current
  *  speed and duplex for copper connections.
  **/
-s32 e1000e_get_speed_and_duplex_copper(struct e1000_hw *hw, u16 *speed, u16 *duplex)
+s32 e1000e_get_speed_and_duplex_copper(struct e1000_hw *hw, u16 *speed,
+                                       u16 *duplex)
 {
         u32 status;
 
@@ -1301,7 +1279,8 @@ s32 e1000e_get_speed_and_duplex_copper(struct e1000_hw *hw, u16 *speed, u16 *dup
  *  Sets the speed and duplex to gigabit full duplex (the only possible option)
  *  for fiber/serdes links.
  **/
-s32 e1000e_get_speed_and_duplex_fiber_serdes(struct e1000_hw *hw, u16 *speed, u16 *duplex)
+s32 e1000e_get_speed_and_duplex_fiber_serdes(struct e1000_hw *hw, u16 *speed,
+                                             u16 *duplex)
 {
         *speed = SPEED_1000;
         *duplex = FULL_DUPLEX;
@@ -1504,11 +1483,10 @@ s32 e1000e_setup_led_generic(struct e1000_hw *hw)
                 ledctl = er32(LEDCTL);
                 hw->mac.ledctl_default = ledctl;
                 /* Turn off LED0 */
-                ledctl &= ~(E1000_LEDCTL_LED0_IVRT |
-                            E1000_LEDCTL_LED0_BLINK |
-                            E1000_LEDCTL_LED0_MODE_MASK);
+                ledctl &= ~(E1000_LEDCTL_LED0_IVRT | E1000_LEDCTL_LED0_BLINK |
+                            E1000_LEDCTL_LED0_MODE_MASK);
                 ledctl |= (E1000_LEDCTL_MODE_LED_OFF <<
-                           E1000_LEDCTL_LED0_MODE_SHIFT);
+                           E1000_LEDCTL_LED0_MODE_SHIFT);
                 ew32(LEDCTL, ledctl);
         } else if (hw->phy.media_type == e1000_media_type_copper) {
                 ew32(LEDCTL, hw->mac.ledctl_mode1);
@@ -1544,7 +1522,7 @@ s32 e1000e_blink_led_generic(struct e1000_hw *hw)
         if (hw->phy.media_type == e1000_media_type_fiber) {
                 /* always blink LED0 for PCI-E fiber */
                 ledctl_blink = E1000_LEDCTL_LED0_BLINK |
-                     (E1000_LEDCTL_MODE_LED_ON << E1000_LEDCTL_LED0_MODE_SHIFT);
+                    (E1000_LEDCTL_MODE_LED_ON << E1000_LEDCTL_LED0_MODE_SHIFT);
         } else {
                 /*
                  * set the blink bit for each LED that's "on" (0x0E)
@@ -1657,8 +1635,7 @@ s32 e1000e_disable_pcie_master(struct e1000_hw *hw)
         ew32(CTRL, ctrl);
 
         while (timeout) {
-                if (!(er32(STATUS) &
-                      E1000_STATUS_GIO_MASTER_ENABLE))
+                if (!(er32(STATUS) & E1000_STATUS_GIO_MASTER_ENABLE))
                         break;
                 udelay(100);
                 timeout--;
@@ -1684,7 +1661,7 @@ void e1000e_reset_adaptive(struct e1000_hw *hw)
 
         if (!mac->adaptive_ifs) {
                 e_dbg("Not in Adaptive IFS mode!\n");
-                goto out;
+                return;
         }
 
         mac->current_ifs_val = 0;
@@ -1695,8 +1672,6 @@ void e1000e_reset_adaptive(struct e1000_hw *hw)
 
         mac->in_ifs_mode = false;
         ew32(AIT, 0);
-out:
-        return;
 }
 
 /**
@@ -1712,7 +1687,7 @@ void e1000e_update_adaptive(struct e1000_hw *hw)
 
         if (!mac->adaptive_ifs) {
                 e_dbg("Not in Adaptive IFS mode!\n");
-                goto out;
+                return;
         }
 
         if ((mac->collision_delta * mac->ifs_ratio) > mac->tx_packet_delta) {
@@ -1723,7 +1698,7 @@ void e1000e_update_adaptive(struct e1000_hw *hw)
                                         mac->current_ifs_val = mac->ifs_min_val;
                                 else
                                         mac->current_ifs_val +=
-                                                mac->ifs_step_size;
+                                            mac->ifs_step_size;
                                 ew32(AIT, mac->current_ifs_val);
                         }
                 }
@@ -1735,959 +1710,4 @@ void e1000e_update_adaptive(struct e1000_hw *hw)
                         ew32(AIT, 0);
                 }
         }
-out:
-        return;
-}
-
-/**
- *  e1000_raise_eec_clk - Raise EEPROM clock
- *  @hw: pointer to the HW structure
- *  @eecd: pointer to the EEPROM
- *
- *  Enable/Raise the EEPROM clock bit.
- **/
-static void e1000_raise_eec_clk(struct e1000_hw *hw, u32 *eecd)
-{
-        *eecd = *eecd | E1000_EECD_SK;
-        ew32(EECD, *eecd);
-        e1e_flush();
-        udelay(hw->nvm.delay_usec);
-}
-
-/**
- *  e1000_lower_eec_clk - Lower EEPROM clock
- *  @hw: pointer to the HW structure
- *  @eecd: pointer to the EEPROM
- *
- *  Clear/Lower the EEPROM clock bit.
- **/
-static void e1000_lower_eec_clk(struct e1000_hw *hw, u32 *eecd)
-{
-        *eecd = *eecd & ~E1000_EECD_SK;
-        ew32(EECD, *eecd);
-        e1e_flush();
-        udelay(hw->nvm.delay_usec);
-}
-
-/**
- *  e1000_shift_out_eec_bits - Shift data bits our to the EEPROM
- *  @hw: pointer to the HW structure
- *  @data: data to send to the EEPROM
- *  @count: number of bits to shift out
- *
- *  We need to shift 'count' bits out to the EEPROM.  So, the value in the
- *  "data" parameter will be shifted out to the EEPROM one bit at a time.
- *  In order to do this, "data" must be broken down into bits.
- **/
-static void e1000_shift_out_eec_bits(struct e1000_hw *hw, u16 data, u16 count)
-{
-        struct e1000_nvm_info *nvm = &hw->nvm;
-        u32 eecd = er32(EECD);
-        u32 mask;
-
-        mask = 0x01 << (count - 1);
-        if (nvm->type == e1000_nvm_eeprom_spi)
-                eecd |= E1000_EECD_DO;
-
-        do {
-                eecd &= ~E1000_EECD_DI;
-
-                if (data & mask)
-                        eecd |= E1000_EECD_DI;
-
-                ew32(EECD, eecd);
-                e1e_flush();
-
-                udelay(nvm->delay_usec);
-
-                e1000_raise_eec_clk(hw, &eecd);
-                e1000_lower_eec_clk(hw, &eecd);
-
-                mask >>= 1;
-        } while (mask);
-
-        eecd &= ~E1000_EECD_DI;
-        ew32(EECD, eecd);
-}
-
-/**
- *  e1000_shift_in_eec_bits - Shift data bits in from the EEPROM
- *  @hw: pointer to the HW structure
- *  @count: number of bits to shift in
- *
- *  In order to read a register from the EEPROM, we need to shift 'count' bits
- *  in from the EEPROM.  Bits are "shifted in" by raising the clock input to
- *  the EEPROM (setting the SK bit), and then reading the value of the data out
- *  "DO" bit.  During this "shifting in" process the data in "DI" bit should
- *  always be clear.
- **/
-static u16 e1000_shift_in_eec_bits(struct e1000_hw *hw, u16 count)
-{
-        u32 eecd;
-        u32 i;
-        u16 data;
-
-        eecd = er32(EECD);
-
-        eecd &= ~(E1000_EECD_DO | E1000_EECD_DI);
-        data = 0;
-
-        for (i = 0; i < count; i++) {
-                data <<= 1;
-                e1000_raise_eec_clk(hw, &eecd);
-
-                eecd = er32(EECD);
-
-                eecd &= ~E1000_EECD_DI;
-                if (eecd & E1000_EECD_DO)
-                        data |= 1;
-
-                e1000_lower_eec_clk(hw, &eecd);
-        }
-
-        return data;
-}
-
-/**
- *  e1000e_poll_eerd_eewr_done - Poll for EEPROM read/write completion
- *  @hw: pointer to the HW structure
- *  @ee_reg: EEPROM flag for polling
- *
- *  Polls the EEPROM status bit for either read or write completion based
- *  upon the value of 'ee_reg'.
- **/
-s32 e1000e_poll_eerd_eewr_done(struct e1000_hw *hw, int ee_reg)
-{
-        u32 attempts = 100000;
-        u32 i, reg = 0;
-
-        for (i = 0; i < attempts; i++) {
-                if (ee_reg == E1000_NVM_POLL_READ)
-                        reg = er32(EERD);
-                else
-                        reg = er32(EEWR);
-
-                if (reg & E1000_NVM_RW_REG_DONE)
-                        return 0;
-
-                udelay(5);
-        }
-
-        return -E1000_ERR_NVM;
-}
-
-/**
- *  e1000e_acquire_nvm - Generic request for access to EEPROM
- *  @hw: pointer to the HW structure
- *
- *  Set the EEPROM access request bit and wait for EEPROM access grant bit.
- *  Return successful if access grant bit set, else clear the request for
- *  EEPROM access and return -E1000_ERR_NVM (-1).
- **/
-s32 e1000e_acquire_nvm(struct e1000_hw *hw)
-{
-        u32 eecd = er32(EECD);
-        s32 timeout = E1000_NVM_GRANT_ATTEMPTS;
-
-        ew32(EECD, eecd | E1000_EECD_REQ);
-        eecd = er32(EECD);
-
-        while (timeout) {
-                if (eecd & E1000_EECD_GNT)
-                        break;
-                udelay(5);
-                eecd = er32(EECD);
-                timeout--;
-        }
-
-        if (!timeout) {
-                eecd &= ~E1000_EECD_REQ;
-                ew32(EECD, eecd);
-                e_dbg("Could not acquire NVM grant\n");
-                return -E1000_ERR_NVM;
-        }
-
-        return 0;
-}
-
-/**
- *  e1000_standby_nvm - Return EEPROM to standby state
- *  @hw: pointer to the HW structure
- *
- *  Return the EEPROM to a standby state.
- **/
-static void e1000_standby_nvm(struct e1000_hw *hw)
-{
-        struct e1000_nvm_info *nvm = &hw->nvm;
-        u32 eecd = er32(EECD);
-
-        if (nvm->type == e1000_nvm_eeprom_spi) {
-                /* Toggle CS to flush commands */
-                eecd |= E1000_EECD_CS;
-                ew32(EECD, eecd);
-                e1e_flush();
-                udelay(nvm->delay_usec);
-                eecd &= ~E1000_EECD_CS;
-                ew32(EECD, eecd);
-                e1e_flush();
-                udelay(nvm->delay_usec);
-        }
-}
-
-/**
- *  e1000_stop_nvm - Terminate EEPROM command
- *  @hw: pointer to the HW structure
- *
- *  Terminates the current command by inverting the EEPROM's chip select pin.
- **/
-static void e1000_stop_nvm(struct e1000_hw *hw)
-{
-        u32 eecd;
-
-        eecd = er32(EECD);
-        if (hw->nvm.type == e1000_nvm_eeprom_spi) {
-                /* Pull CS high */
-                eecd |= E1000_EECD_CS;
-                e1000_lower_eec_clk(hw, &eecd);
-        }
-}
-
-/**
- *  e1000e_release_nvm - Release exclusive access to EEPROM
- *  @hw: pointer to the HW structure
- *
- *  Stop any current commands to the EEPROM and clear the EEPROM request bit.
- **/
-void e1000e_release_nvm(struct e1000_hw *hw)
-{
-        u32 eecd;
-
-        e1000_stop_nvm(hw);
-
-        eecd = er32(EECD);
-        eecd &= ~E1000_EECD_REQ;
-        ew32(EECD, eecd);
-}
-
-/**
- *  e1000_ready_nvm_eeprom - Prepares EEPROM for read/write
- *  @hw: pointer to the HW structure
- *
- *  Setups the EEPROM for reading and writing.
- **/
-static s32 e1000_ready_nvm_eeprom(struct e1000_hw *hw)
-{
-        struct e1000_nvm_info *nvm = &hw->nvm;
-        u32 eecd = er32(EECD);
-        u8 spi_stat_reg;
-
-        if (nvm->type == e1000_nvm_eeprom_spi) {
-                u16 timeout = NVM_MAX_RETRY_SPI;
-
-                /* Clear SK and CS */
-                eecd &= ~(E1000_EECD_CS | E1000_EECD_SK);
-                ew32(EECD, eecd);
-                e1e_flush();
-                udelay(1);
-
-                /*
-                 * Read "Status Register" repeatedly until the LSB is cleared.
-                 * The EEPROM will signal that the command has been completed
-                 * by clearing bit 0 of the internal status register.  If it's
-                 * not cleared within 'timeout', then error out.
-                 */
-                while (timeout) {
-                        e1000_shift_out_eec_bits(hw, NVM_RDSR_OPCODE_SPI,
-                                                 hw->nvm.opcode_bits);
-                        spi_stat_reg = (u8)e1000_shift_in_eec_bits(hw, 8);
-                        if (!(spi_stat_reg & NVM_STATUS_RDY_SPI))
-                                break;
-
-                        udelay(5);
-                        e1000_standby_nvm(hw);
-                        timeout--;
-                }
-
-                if (!timeout) {
-                        e_dbg("SPI NVM Status error\n");
-                        return -E1000_ERR_NVM;
-                }
-        }
-
-        return 0;
-}
-
-/**
- *  e1000e_read_nvm_eerd - Reads EEPROM using EERD register
- *  @hw: pointer to the HW structure
- *  @offset: offset of word in the EEPROM to read
- *  @words: number of words to read
- *  @data: word read from the EEPROM
- *
- *  Reads a 16 bit word from the EEPROM using the EERD register.
- **/
-s32 e1000e_read_nvm_eerd(struct e1000_hw *hw, u16 offset, u16 words, u16 *data)
-{
-        struct e1000_nvm_info *nvm = &hw->nvm;
-        u32 i, eerd = 0;
-        s32 ret_val = 0;
-
-        /*
-         * A check for invalid values:  offset too large, too many words,
-         * too many words for the offset, and not enough words.
-         */
-        if ((offset >= nvm->word_size) || (words > (nvm->word_size - offset)) ||
-            (words == 0)) {
-                e_dbg("nvm parameter(s) out of bounds\n");
-                return -E1000_ERR_NVM;
-        }
-
-        for (i = 0; i < words; i++) {
-                eerd = ((offset+i) << E1000_NVM_RW_ADDR_SHIFT) +
-                       E1000_NVM_RW_REG_START;
-
-                ew32(EERD, eerd);
-                ret_val = e1000e_poll_eerd_eewr_done(hw, E1000_NVM_POLL_READ);
-                if (ret_val)
-                        break;
-
-                data[i] = (er32(EERD) >> E1000_NVM_RW_REG_DATA);
-        }
-
-        return ret_val;
-}
-
-/**
- *  e1000e_write_nvm_spi - Write to EEPROM using SPI
- *  @hw: pointer to the HW structure
- *  @offset: offset within the EEPROM to be written to
- *  @words: number of words to write
- *  @data: 16 bit word(s) to be written to the EEPROM
- *
- *  Writes data to EEPROM at offset using SPI interface.
- *
- *  If e1000e_update_nvm_checksum is not called after this function , the
- *  EEPROM will most likely contain an invalid checksum.
- **/
-s32 e1000e_write_nvm_spi(struct e1000_hw *hw, u16 offset, u16 words, u16 *data)
-{
-        struct e1000_nvm_info *nvm = &hw->nvm;
-        s32 ret_val;
-        u16 widx = 0;
-
-        /*
-         * A check for invalid values:  offset too large, too many words,
-         * and not enough words.
-         */
-        if ((offset >= nvm->word_size) || (words > (nvm->word_size - offset)) ||
-            (words == 0)) {
-                e_dbg("nvm parameter(s) out of bounds\n");
-                return -E1000_ERR_NVM;
-        }
-
-        ret_val = nvm->ops.acquire(hw);
-        if (ret_val)
-                return ret_val;
-
-        while (widx < words) {
-                u8 write_opcode = NVM_WRITE_OPCODE_SPI;
-
-                ret_val = e1000_ready_nvm_eeprom(hw);
-                if (ret_val) {
-                        nvm->ops.release(hw);
-                        return ret_val;
-                }
-
-                e1000_standby_nvm(hw);
-
-                /* Send the WRITE ENABLE command (8 bit opcode) */
-                e1000_shift_out_eec_bits(hw, NVM_WREN_OPCODE_SPI,
-                                         nvm->opcode_bits);
-
-                e1000_standby_nvm(hw);
-
-                /*
-                 * Some SPI eeproms use the 8th address bit embedded in the
-                 * opcode
-                 */
-                if ((nvm->address_bits == 8) && (offset >= 128))
-                        write_opcode |= NVM_A8_OPCODE_SPI;
-
-                /* Send the Write command (8-bit opcode + addr) */
-                e1000_shift_out_eec_bits(hw, write_opcode, nvm->opcode_bits);
-                e1000_shift_out_eec_bits(hw, (u16)((offset + widx) * 2),
-                                         nvm->address_bits);
-
-                /* Loop to allow for up to whole page write of eeprom */
-                while (widx < words) {
-                        u16 word_out = data[widx];
-                        word_out = (word_out >> 8) | (word_out << 8);
-                        e1000_shift_out_eec_bits(hw, word_out, 16);
-                        widx++;
-
-                        if ((((offset + widx) * 2) % nvm->page_size) == 0) {
-                                e1000_standby_nvm(hw);
-                                break;
-                        }
-                }
-        }
-
-        usleep_range(10000, 20000);
-        nvm->ops.release(hw);
-        return 0;
-}
-
-/**
- *  e1000_read_pba_string_generic - Read device part number
- *  @hw: pointer to the HW structure
- *  @pba_num: pointer to device part number
- *  @pba_num_size: size of part number buffer
- *
- *  Reads the product board assembly (PBA) number from the EEPROM and stores
- *  the value in pba_num.
- **/
-s32 e1000_read_pba_string_generic(struct e1000_hw *hw, u8 *pba_num,
-                                  u32 pba_num_size)
-{
-        s32 ret_val;
-        u16 nvm_data;
-        u16 pba_ptr;
-        u16 offset;
-        u16 length;
-
-        if (pba_num == NULL) {
-                e_dbg("PBA string buffer was null\n");
-                ret_val = E1000_ERR_INVALID_ARGUMENT;
-                goto out;
-        }
-
-        ret_val = e1000_read_nvm(hw, NVM_PBA_OFFSET_0, 1, &nvm_data);
-        if (ret_val) {
-                e_dbg("NVM Read Error\n");
-                goto out;
-        }
-
-        ret_val = e1000_read_nvm(hw, NVM_PBA_OFFSET_1, 1, &pba_ptr);
-        if (ret_val) {
-                e_dbg("NVM Read Error\n");
-                goto out;
-        }
-
-        /*
-         * if nvm_data is not ptr guard the PBA must be in legacy format which
-         * means pba_ptr is actually our second data word for the PBA number
-         * and we can decode it into an ascii string
-         */
-        if (nvm_data != NVM_PBA_PTR_GUARD) {
-                e_dbg("NVM PBA number is not stored as string\n");
-
-                /* we will need 11 characters to store the PBA */
-                if (pba_num_size < 11) {
-                        e_dbg("PBA string buffer too small\n");
-                        return E1000_ERR_NO_SPACE;
-                }
-
-                /* extract hex string from data and pba_ptr */
-                pba_num[0] = (nvm_data >> 12) & 0xF;
-                pba_num[1] = (nvm_data >> 8) & 0xF;
-                pba_num[2] = (nvm_data >> 4) & 0xF;
-                pba_num[3] = nvm_data & 0xF;
-                pba_num[4] = (pba_ptr >> 12) & 0xF;
-                pba_num[5] = (pba_ptr >> 8) & 0xF;
-                pba_num[6] = '-';
-                pba_num[7] = 0;
-                pba_num[8] = (pba_ptr >> 4) & 0xF;
-                pba_num[9] = pba_ptr & 0xF;
-
-                /* put a null character on the end of our string */
-                pba_num[10] = '\0';
-
-                /* switch all the data but the '-' to hex char */
-                for (offset = 0; offset < 10; offset++) {
-                        if (pba_num[offset] < 0xA)
-                                pba_num[offset] += '0';
-                        else if (pba_num[offset] < 0x10)
-                                pba_num[offset] += 'A' - 0xA;
-                }
-
-                goto out;
-        }
-
-        ret_val = e1000_read_nvm(hw, pba_ptr, 1, &length);
-        if (ret_val) {
-                e_dbg("NVM Read Error\n");
-                goto out;
-        }
-
-        if (length == 0xFFFF || length == 0) {
-                e_dbg("NVM PBA number section invalid length\n");
-                ret_val = E1000_ERR_NVM_PBA_SECTION;
-                goto out;
-        }
-        /* check if pba_num buffer is big enough */
-        if (pba_num_size < (((u32)length * 2) - 1)) {
-                e_dbg("PBA string buffer too small\n");
-                ret_val = E1000_ERR_NO_SPACE;
-                goto out;
-        }
-
-        /* trim pba length from start of string */
-        pba_ptr++;
-        length--;
-
-        for (offset = 0; offset < length; offset++) {
-                ret_val = e1000_read_nvm(hw, pba_ptr + offset, 1, &nvm_data);
-                if (ret_val) {
-                        e_dbg("NVM Read Error\n");
-                        goto out;
-                }
-                pba_num[offset * 2] = (u8)(nvm_data >> 8);
-                pba_num[(offset * 2) + 1] = (u8)(nvm_data & 0xFF);
-        }
-        pba_num[offset * 2] = '\0';
-
-out:
-        return ret_val;
-}
-
-/**
- *  e1000_read_mac_addr_generic - Read device MAC address
- *  @hw: pointer to the HW structure
- *
- *  Reads the device MAC address from the EEPROM and stores the value.
- *  Since devices with two ports use the same EEPROM, we increment the
- *  last bit in the MAC address for the second port.
- **/
-s32 e1000_read_mac_addr_generic(struct e1000_hw *hw)
-{
-        u32 rar_high;
-        u32 rar_low;
-        u16 i;
-
-        rar_high = er32(RAH(0));
-        rar_low = er32(RAL(0));
-
-        for (i = 0; i < E1000_RAL_MAC_ADDR_LEN; i++)
-                hw->mac.perm_addr[i] = (u8)(rar_low >> (i*8));
-
-        for (i = 0; i < E1000_RAH_MAC_ADDR_LEN; i++)
-                hw->mac.perm_addr[i+4] = (u8)(rar_high >> (i*8));
-
-        for (i = 0; i < ETH_ALEN; i++)
-                hw->mac.addr[i] = hw->mac.perm_addr[i];
-
-        return 0;
-}
-
-/**
- *  e1000e_validate_nvm_checksum_generic - Validate EEPROM checksum
- *  @hw: pointer to the HW structure
- *
- *  Calculates the EEPROM checksum by reading/adding each word of the EEPROM
- *  and then verifies that the sum of the EEPROM is equal to 0xBABA.
- **/
-s32 e1000e_validate_nvm_checksum_generic(struct e1000_hw *hw)
-{
-        s32 ret_val;
-        u16 checksum = 0;
-        u16 i, nvm_data;
-
-        for (i = 0; i < (NVM_CHECKSUM_REG + 1); i++) {
-                ret_val = e1000_read_nvm(hw, i, 1, &nvm_data);
-                if (ret_val) {
-                        e_dbg("NVM Read Error\n");
-                        return ret_val;
-                }
-                checksum += nvm_data;
-        }
-
-        if (checksum != (u16) NVM_SUM) {
-                e_dbg("NVM Checksum Invalid\n");
-                return -E1000_ERR_NVM;
-        }
-
-        return 0;
-}
-
-/**
- *  e1000e_update_nvm_checksum_generic - Update EEPROM checksum
- *  @hw: pointer to the HW structure
- *
- *  Updates the EEPROM checksum by reading/adding each word of the EEPROM
- *  up to the checksum.  Then calculates the EEPROM checksum and writes the
- *  value to the EEPROM.
- **/
-s32 e1000e_update_nvm_checksum_generic(struct e1000_hw *hw)
-{
-        s32 ret_val;
-        u16 checksum = 0;
-        u16 i, nvm_data;
-
-        for (i = 0; i < NVM_CHECKSUM_REG; i++) {
-                ret_val = e1000_read_nvm(hw, i, 1, &nvm_data);
-                if (ret_val) {
-                        e_dbg("NVM Read Error while updating checksum.\n");
-                        return ret_val;
-                }
-                checksum += nvm_data;
-        }
-        checksum = (u16) NVM_SUM - checksum;
-        ret_val = e1000_write_nvm(hw, NVM_CHECKSUM_REG, 1, &checksum);
-        if (ret_val)
-                e_dbg("NVM Write Error while updating checksum.\n");
-
-        return ret_val;
-}
-
-/**
- *  e1000e_reload_nvm - Reloads EEPROM
- *  @hw: pointer to the HW structure
- *
- *  Reloads the EEPROM by setting the "Reinitialize from EEPROM" bit in the
- *  extended control register.
- **/
-void e1000e_reload_nvm(struct e1000_hw *hw)
-{
-        u32 ctrl_ext;
-
-        udelay(10);
-        ctrl_ext = er32(CTRL_EXT);
-        ctrl_ext |= E1000_CTRL_EXT_EE_RST;
-        ew32(CTRL_EXT, ctrl_ext);
-        e1e_flush();
-}
-
-/**
- *  e1000_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.
- **/
-static u8 e1000_calculate_checksum(u8 *buffer, u32 length)
-{
-        u32 i;
-        u8  sum = 0;
-
-        if (!buffer)
-                return 0;
-
-        for (i = 0; i < length; i++)
-                sum += buffer[i];
-
-        return (u8) (0 - sum);
-}
-
-/**
- *  e1000_mng_enable_host_if - Checks host interface is enabled
- *  @hw: pointer to the HW structure
- *
- *  Returns E1000_success upon success, else E1000_ERR_HOST_INTERFACE_COMMAND
- *
- *  This function checks whether the HOST IF is enabled for command operation
- *  and also checks whether the previous command is completed.  It busy waits
- *  in case of previous command is not completed.
- **/
-static s32 e1000_mng_enable_host_if(struct e1000_hw *hw)
-{
-        u32 hicr;
-        u8 i;
-
-        if (!(hw->mac.arc_subsystem_valid)) {
-                e_dbg("ARC subsystem not valid.\n");
-                return -E1000_ERR_HOST_INTERFACE_COMMAND;
-        }
-
-        /* Check that the host interface is enabled. */
-        hicr = er32(HICR);
-        if ((hicr & E1000_HICR_EN) == 0) {
-                e_dbg("E1000_HOST_EN bit disabled.\n");
-                return -E1000_ERR_HOST_INTERFACE_COMMAND;
-        }
-        /* check the previous command is completed */
-        for (i = 0; i < E1000_MNG_DHCP_COMMAND_TIMEOUT; i++) {
-                hicr = er32(HICR);
-                if (!(hicr & E1000_HICR_C))
-                        break;
-                mdelay(1);
-        }
-
-        if (i == E1000_MNG_DHCP_COMMAND_TIMEOUT) {
-                e_dbg("Previous command timeout failed .\n");
-                return -E1000_ERR_HOST_INTERFACE_COMMAND;
-        }
-
-        return 0;
-}
-
-/**
- *  e1000e_check_mng_mode_generic - check management mode
- *  @hw: pointer to the HW structure
- *
- *  Reads the firmware semaphore register and returns true (>0) if
- *  manageability is enabled, else false (0).
- **/
-bool e1000e_check_mng_mode_generic(struct e1000_hw *hw)
-{
-        u32 fwsm = er32(FWSM);
-
-        return (fwsm & E1000_FWSM_MODE_MASK) ==
-                (E1000_MNG_IAMT_MODE << E1000_FWSM_MODE_SHIFT);
-}
-
-/**
- *  e1000e_enable_tx_pkt_filtering - Enable packet filtering on Tx
- *  @hw: pointer to the HW structure
- *
- *  Enables packet filtering on transmit packets if manageability is enabled
- *  and host interface is enabled.
- **/
-bool e1000e_enable_tx_pkt_filtering(struct e1000_hw *hw)
-{
-        struct e1000_host_mng_dhcp_cookie *hdr = &hw->mng_cookie;
-        u32 *buffer = (u32 *)&hw->mng_cookie;
-        u32 offset;
-        s32 ret_val, hdr_csum, csum;
-        u8 i, len;
-
-        hw->mac.tx_pkt_filtering = true;
-
-        /* No manageability, no filtering */
-        if (!e1000e_check_mng_mode(hw)) {
-                hw->mac.tx_pkt_filtering = false;
-                goto out;
-        }
-
-        /*
-         * If we can't read from the host interface for whatever
-         * reason, disable filtering.
-         */
-        ret_val = e1000_mng_enable_host_if(hw);
-        if (ret_val) {
-                hw->mac.tx_pkt_filtering = false;
-                goto out;
-        }
-
-        /* Read in the header.  Length and offset are in dwords. */
-        len    = E1000_MNG_DHCP_COOKIE_LENGTH >> 2;
-        offset = E1000_MNG_DHCP_COOKIE_OFFSET >> 2;
-        for (i = 0; i < len; i++)
-                *(buffer + i) = E1000_READ_REG_ARRAY(hw, E1000_HOST_IF, offset + i);
-        hdr_csum = hdr->checksum;
-        hdr->checksum = 0;
-        csum = e1000_calculate_checksum((u8 *)hdr,
-                                        E1000_MNG_DHCP_COOKIE_LENGTH);
-        /*
-         * If either the checksums or signature don't match, then
-         * the cookie area isn't considered valid, in which case we
-         * take the safe route of assuming Tx filtering is enabled.
-         */
-        if ((hdr_csum != csum) || (hdr->signature != E1000_IAMT_SIGNATURE)) {
-                hw->mac.tx_pkt_filtering = true;
-                goto out;
-        }
-
-        /* Cookie area is valid, make the final check for filtering. */
-        if (!(hdr->status & E1000_MNG_DHCP_COOKIE_STATUS_PARSING)) {
-                hw->mac.tx_pkt_filtering = false;
-                goto out;
-        }
-
-out:
-        return hw->mac.tx_pkt_filtering;
-}
-
-/**
- *  e1000_mng_write_cmd_header - Writes manageability command header
- *  @hw: pointer to the HW structure
- *  @hdr: pointer to the host interface command header
- *
- *  Writes the command header after does the checksum calculation.
- **/
-static s32 e1000_mng_write_cmd_header(struct e1000_hw *hw,
-                                  struct e1000_host_mng_command_header *hdr)
-{
-        u16 i, length = sizeof(struct e1000_host_mng_command_header);
-
-        /* Write the whole command header structure with new checksum. */
-
-        hdr->checksum = e1000_calculate_checksum((u8 *)hdr, length);
-
-        length >>= 2;
-        /* Write the relevant command block into the ram area. */
-        for (i = 0; i < length; i++) {
-                E1000_WRITE_REG_ARRAY(hw, E1000_HOST_IF, i,
-                                            *((u32 *) hdr + i));
-                e1e_flush();
-        }
-
-        return 0;
-}
-
-/**
- *  e1000_mng_host_if_write - Write to the manageability host interface
- *  @hw: pointer to the HW structure
- *  @buffer: pointer to the host interface buffer
- *  @length: size of the buffer
- *  @offset: location in the buffer to write to
- *  @sum: sum of the data (not checksum)
- *
- *  This function writes the buffer content at the offset given on the host if.
- *  It also does alignment considerations to do the writes in most efficient
- *  way.  Also fills up the sum of the buffer in *buffer parameter.
- **/
-static s32 e1000_mng_host_if_write(struct e1000_hw *hw, u8 *buffer,
-                                   u16 length, u16 offset, u8 *sum)
-{
-        u8 *tmp;
-        u8 *bufptr = buffer;
-        u32 data = 0;
-        u16 remaining, i, j, prev_bytes;
-
-        /* sum = only sum of the data and it is not checksum */
-
-        if (length == 0 || offset + length > E1000_HI_MAX_MNG_DATA_LENGTH)
-                return -E1000_ERR_PARAM;
-
-        tmp = (u8 *)&data;
-        prev_bytes = offset & 0x3;
-        offset >>= 2;
-
-        if (prev_bytes) {
-                data = E1000_READ_REG_ARRAY(hw, E1000_HOST_IF, offset);
-                for (j = prev_bytes; j < sizeof(u32); j++) {
-                        *(tmp + j) = *bufptr++;
-                        *sum += *(tmp + j);
-                }
-                E1000_WRITE_REG_ARRAY(hw, E1000_HOST_IF, offset, data);
-                length -= j - prev_bytes;
-                offset++;
-        }
-
-        remaining = length & 0x3;
-        length -= remaining;
-
-        /* Calculate length in DWORDs */
-        length >>= 2;
-
-        /*
-         * The device driver writes the relevant command block into the
-         * ram area.
-         */
-        for (i = 0; i < length; i++) {
-                for (j = 0; j < sizeof(u32); j++) {
-                        *(tmp + j) = *bufptr++;
-                        *sum += *(tmp + j);
-                }
-
-                E1000_WRITE_REG_ARRAY(hw, E1000_HOST_IF, offset + i, data);
-        }
-        if (remaining) {
-                for (j = 0; j < sizeof(u32); j++) {
-                        if (j < remaining)
-                                *(tmp + j) = *bufptr++;
-                        else
-                                *(tmp + j) = 0;
-
-                        *sum += *(tmp + j);
-                }
-                E1000_WRITE_REG_ARRAY(hw, E1000_HOST_IF, offset + i, data);
-        }
-
-        return 0;
-}
-
-/**
- *  e1000e_mng_write_dhcp_info - Writes DHCP info to host interface
- *  @hw: pointer to the HW structure
- *  @buffer: pointer to the host interface
- *  @length: size of the buffer
- *
- *  Writes the DHCP information to the host interface.
- **/
-s32 e1000e_mng_write_dhcp_info(struct e1000_hw *hw, u8 *buffer, u16 length)
-{
-        struct e1000_host_mng_command_header hdr;
-        s32 ret_val;
-        u32 hicr;
-
-        hdr.command_id = E1000_MNG_DHCP_TX_PAYLOAD_CMD;
-        hdr.command_length = length;
-        hdr.reserved1 = 0;
-        hdr.reserved2 = 0;
-        hdr.checksum = 0;
-
-        /* Enable the host interface */
-        ret_val = e1000_mng_enable_host_if(hw);
-        if (ret_val)
-                return ret_val;
-
-        /* Populate the host interface with the contents of "buffer". */
-        ret_val = e1000_mng_host_if_write(hw, buffer, length,
-                                          sizeof(hdr), &(hdr.checksum));
-        if (ret_val)
-                return ret_val;
-
-        /* Write the manageability command header */
-        ret_val = e1000_mng_write_cmd_header(hw, &hdr);
-        if (ret_val)
-                return ret_val;
-
-        /* Tell the ARC a new command is pending. */
-        hicr = er32(HICR);
-        ew32(HICR, hicr | E1000_HICR_C);
-
-        return 0;
-}
-
-/**
- *  e1000e_enable_mng_pass_thru - Check if management passthrough is needed
- *  @hw: pointer to the HW structure
- *
- *  Verifies the hardware needs to leave interface enabled so that frames can
- *  be directed to and from the management interface.
- **/
-bool e1000e_enable_mng_pass_thru(struct e1000_hw *hw)
-{
-        u32 manc;
-        u32 fwsm, factps;
-        bool ret_val = false;
-
-        manc = er32(MANC);
-
-        if (!(manc & E1000_MANC_RCV_TCO_EN))
-                goto out;
-
-        if (hw->mac.has_fwsm) {
-                fwsm = er32(FWSM);
-                factps = er32(FACTPS);
-
-                if (!(factps & E1000_FACTPS_MNGCG) &&
-                    ((fwsm & E1000_FWSM_MODE_MASK) ==
-                     (e1000_mng_mode_pt << E1000_FWSM_MODE_SHIFT))) {
-                        ret_val = true;
-                        goto out;
-                }
-        } else if ((hw->mac.type == e1000_82574) ||
-                   (hw->mac.type == e1000_82583)) {
-                u16 data;
-
-                factps = er32(FACTPS);
-                e1000_read_nvm(hw, NVM_INIT_CONTROL2_REG, 1, &data);
-
-                if (!(factps & E1000_FACTPS_MNGCG) &&
-                    ((data & E1000_NVM_INIT_CTRL2_MNGM) ==
-                     (e1000_mng_mode_pt << 13))) {
-                        ret_val = true;
-                        goto out;
-                }
-        } else if ((manc & E1000_MANC_SMBUS_EN) &&
-                    !(manc & E1000_MANC_ASF_EN)) {
-                        ret_val = true;
-                        goto out;
-        }
-
-out:
-        return ret_val;
 }
diff --git a/drivers/net/ethernet/intel/e1000e/manage.c b/drivers/net/ethernet/intel/e1000e/manage.c
new file mode 100644
index 000000000000..c54caf6e5801
--- /dev/null
+++ b/drivers/net/ethernet/intel/e1000e/manage.c
@@ -0,0 +1,377 @@
+/*******************************************************************************
+
+  Intel PRO/1000 Linux driver
+  Copyright(c) 1999 - 2012 Intel Corporation.
+
+  This program is free software; you can redistribute it and/or modify it
+  under the terms and conditions of the GNU General Public License,
+  version 2, as published by the Free Software Foundation.
+
+  This program is distributed in the hope 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.
+
+  The full GNU General Public License is included in this distribution in
+  the file called "COPYING".
+
+  Contact Information:
+  Linux NICS <linux.nics@intel.com>
+  e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
+  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
+
+*******************************************************************************/
+
+#include "e1000.h"
+
+enum e1000_mng_mode {
+        e1000_mng_mode_none = 0,
+        e1000_mng_mode_asf,
+        e1000_mng_mode_pt,
+        e1000_mng_mode_ipmi,
+        e1000_mng_mode_host_if_only
+};
+
+#define E1000_FACTPS_MNGCG              0x20000000
+
+/* Intel(R) Active Management Technology signature */
+#define E1000_IAMT_SIGNATURE            0x544D4149
+
+/**
+ *  e1000_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.
+ **/
+static u8 e1000_calculate_checksum(u8 *buffer, u32 length)
+{
+        u32 i;
+        u8 sum = 0;
+
+        if (!buffer)
+                return 0;
+
+        for (i = 0; i < length; i++)
+                sum += buffer[i];
+
+        return (u8)(0 - sum);
+}
+
+/**
+ *  e1000_mng_enable_host_if - Checks host interface is enabled
+ *  @hw: pointer to the HW structure
+ *
+ *  Returns E1000_success upon success, else E1000_ERR_HOST_INTERFACE_COMMAND
+ *
+ *  This function checks whether the HOST IF is enabled for command operation
+ *  and also checks whether the previous command is completed.  It busy waits
+ *  in case of previous command is not completed.
+ **/
+static s32 e1000_mng_enable_host_if(struct e1000_hw *hw)
+{
+        u32 hicr;
+        u8 i;
+
+        if (!hw->mac.arc_subsystem_valid) {
+                e_dbg("ARC subsystem not valid.\n");
+                return -E1000_ERR_HOST_INTERFACE_COMMAND;
+        }
+
+        /* Check that the host interface is enabled. */
+        hicr = er32(HICR);
+        if ((hicr & E1000_HICR_EN) == 0) {
+                e_dbg("E1000_HOST_EN bit disabled.\n");
+                return -E1000_ERR_HOST_INTERFACE_COMMAND;
+        }
+        /* check the previous command is completed */
+        for (i = 0; i < E1000_MNG_DHCP_COMMAND_TIMEOUT; i++) {
+                hicr = er32(HICR);
+                if (!(hicr & E1000_HICR_C))
+                        break;
+                mdelay(1);
+        }
+
+        if (i == E1000_MNG_DHCP_COMMAND_TIMEOUT) {
+                e_dbg("Previous command timeout failed .\n");
+                return -E1000_ERR_HOST_INTERFACE_COMMAND;
+        }
+
+        return 0;
+}
+
+/**
+ *  e1000e_check_mng_mode_generic - check management mode
+ *  @hw: pointer to the HW structure
+ *
+ *  Reads the firmware semaphore register and returns true (>0) if
+ *  manageability is enabled, else false (0).
+ **/
+bool e1000e_check_mng_mode_generic(struct e1000_hw *hw)
+{
+        u32 fwsm = er32(FWSM);
+
+        return (fwsm & E1000_FWSM_MODE_MASK) ==
+            (E1000_MNG_IAMT_MODE << E1000_FWSM_MODE_SHIFT);
+}
+
+/**
+ *  e1000e_enable_tx_pkt_filtering - Enable packet filtering on Tx
+ *  @hw: pointer to the HW structure
+ *
+ *  Enables packet filtering on transmit packets if manageability is enabled
+ *  and host interface is enabled.
+ **/
+bool e1000e_enable_tx_pkt_filtering(struct e1000_hw *hw)
+{
+        struct e1000_host_mng_dhcp_cookie *hdr = &hw->mng_cookie;
+        u32 *buffer = (u32 *)&hw->mng_cookie;
+        u32 offset;
+        s32 ret_val, hdr_csum, csum;
+        u8 i, len;
+
+        hw->mac.tx_pkt_filtering = true;
+
+        /* No manageability, no filtering */
+        if (!e1000e_check_mng_mode(hw)) {
+                hw->mac.tx_pkt_filtering = false;
+                goto out;
+        }
+
+        /*
+         * If we can't read from the host interface for whatever
+         * reason, disable filtering.
+         */
+        ret_val = e1000_mng_enable_host_if(hw);
+        if (ret_val) {
+                hw->mac.tx_pkt_filtering = false;
+                goto out;
+        }
+
+        /* Read in the header.  Length and offset are in dwords. */
+        len = E1000_MNG_DHCP_COOKIE_LENGTH >> 2;
+        offset = E1000_MNG_DHCP_COOKIE_OFFSET >> 2;
+        for (i = 0; i < len; i++)
+                *(buffer + i) = E1000_READ_REG_ARRAY(hw, E1000_HOST_IF,
+                                                     offset + i);
+        hdr_csum = hdr->checksum;
+        hdr->checksum = 0;
+        csum = e1000_calculate_checksum((u8 *)hdr,
+                                        E1000_MNG_DHCP_COOKIE_LENGTH);
+        /*
+         * If either the checksums or signature don't match, then
+         * the cookie area isn't considered valid, in which case we
+         * take the safe route of assuming Tx filtering is enabled.
+         */
+        if ((hdr_csum != csum) || (hdr->signature != E1000_IAMT_SIGNATURE)) {
+                hw->mac.tx_pkt_filtering = true;
+                goto out;
+        }
+
+        /* Cookie area is valid, make the final check for filtering. */
+        if (!(hdr->status & E1000_MNG_DHCP_COOKIE_STATUS_PARSING)) {
+                hw->mac.tx_pkt_filtering = false;
+                goto out;
+        }
+
+out:
+        return hw->mac.tx_pkt_filtering;
+}
+
+/**
+ *  e1000_mng_write_cmd_header - Writes manageability command header
+ *  @hw: pointer to the HW structure
+ *  @hdr: pointer to the host interface command header
+ *
+ *  Writes the command header after does the checksum calculation.
+ **/
+static s32 e1000_mng_write_cmd_header(struct e1000_hw *hw,
+                                      struct e1000_host_mng_command_header *hdr)
+{
+        u16 i, length = sizeof(struct e1000_host_mng_command_header);
+
+        /* Write the whole command header structure with new checksum. */
+
+        hdr->checksum = e1000_calculate_checksum((u8 *)hdr, length);
+
+        length >>= 2;
+        /* Write the relevant command block into the ram area. */
+        for (i = 0; i < length; i++) {
+                E1000_WRITE_REG_ARRAY(hw, E1000_HOST_IF, i, *((u32 *)hdr + i));
+                e1e_flush();
+        }
+
+        return 0;
+}
+
+/**
+ *  e1000_mng_host_if_write - Write to the manageability host interface
+ *  @hw: pointer to the HW structure
+ *  @buffer: pointer to the host interface buffer
+ *  @length: size of the buffer
+ *  @offset: location in the buffer to write to
+ *  @sum: sum of the data (not checksum)
+ *
+ *  This function writes the buffer content at the offset given on the host if.
+ *  It also does alignment considerations to do the writes in most efficient
+ *  way.  Also fills up the sum of the buffer in *buffer parameter.
+ **/
+static s32 e1000_mng_host_if_write(struct e1000_hw *hw, u8 *buffer,
+                                   u16 length, u16 offset, u8 *sum)
+{
+        u8 *tmp;
+        u8 *bufptr = buffer;
+        u32 data = 0;
+        u16 remaining, i, j, prev_bytes;
+
+        /* sum = only sum of the data and it is not checksum */
+
+        if (length == 0 || offset + length > E1000_HI_MAX_MNG_DATA_LENGTH)
+                return -E1000_ERR_PARAM;
+
+        tmp = (u8 *)&data;
+        prev_bytes = offset & 0x3;
+        offset >>= 2;
+
+        if (prev_bytes) {
+                data = E1000_READ_REG_ARRAY(hw, E1000_HOST_IF, offset);
+                for (j = prev_bytes; j < sizeof(u32); j++) {
+                        *(tmp + j) = *bufptr++;
+                        *sum += *(tmp + j);
+                }
+                E1000_WRITE_REG_ARRAY(hw, E1000_HOST_IF, offset, data);
+                length -= j - prev_bytes;
+                offset++;
+        }
+
+        remaining = length & 0x3;
+        length -= remaining;
+
+        /* Calculate length in DWORDs */
+        length >>= 2;
+
+        /*
+         * The device driver writes the relevant command block into the
+         * ram area.
+         */
+        for (i = 0; i < length; i++) {
+                for (j = 0; j < sizeof(u32); j++) {
+                        *(tmp + j) = *bufptr++;
+                        *sum += *(tmp + j);
+                }
+
+                E1000_WRITE_REG_ARRAY(hw, E1000_HOST_IF, offset + i, data);
+        }
+        if (remaining) {
+                for (j = 0; j < sizeof(u32); j++) {
+                        if (j < remaining)
+                                *(tmp + j) = *bufptr++;
+                        else
+                                *(tmp + j) = 0;
+
+                        *sum += *(tmp + j);
+                }
+                E1000_WRITE_REG_ARRAY(hw, E1000_HOST_IF, offset + i, data);
+        }
+
+        return 0;
+}
+
+/**
+ *  e1000e_mng_write_dhcp_info - Writes DHCP info to host interface
+ *  @hw: pointer to the HW structure
+ *  @buffer: pointer to the host interface
+ *  @length: size of the buffer
+ *
+ *  Writes the DHCP information to the host interface.
+ **/
+s32 e1000e_mng_write_dhcp_info(struct e1000_hw *hw, u8 *buffer, u16 length)
+{
+        struct e1000_host_mng_command_header hdr;
+        s32 ret_val;
+        u32 hicr;
+
+        hdr.command_id = E1000_MNG_DHCP_TX_PAYLOAD_CMD;
+        hdr.command_length = length;
+        hdr.reserved1 = 0;
+        hdr.reserved2 = 0;
+        hdr.checksum = 0;
+
+        /* Enable the host interface */
+        ret_val = e1000_mng_enable_host_if(hw);
+        if (ret_val)
+                return ret_val;
+
+        /* Populate the host interface with the contents of "buffer". */
+        ret_val = e1000_mng_host_if_write(hw, buffer, length,
+                                          sizeof(hdr), &(hdr.checksum));
+        if (ret_val)
+                return ret_val;
+
+        /* Write the manageability command header */
+        ret_val = e1000_mng_write_cmd_header(hw, &hdr);
+        if (ret_val)
+                return ret_val;
+
+        /* Tell the ARC a new command is pending. */
+        hicr = er32(HICR);
+        ew32(HICR, hicr | E1000_HICR_C);
+
+        return 0;
+}
+
+/**
+ *  e1000e_enable_mng_pass_thru - Check if management passthrough is needed
+ *  @hw: pointer to the HW structure
+ *
+ *  Verifies the hardware needs to leave interface enabled so that frames can
+ *  be directed to and from the management interface.
+ **/
+bool e1000e_enable_mng_pass_thru(struct e1000_hw *hw)
+{
+        u32 manc;
+        u32 fwsm, factps;
+        bool ret_val = false;
+
+        manc = er32(MANC);
+
+        if (!(manc & E1000_MANC_RCV_TCO_EN))
+                goto out;
+
+        if (hw->mac.has_fwsm) {
+                fwsm = er32(FWSM);
+                factps = er32(FACTPS);
+
+                if (!(factps & E1000_FACTPS_MNGCG) &&
+                    ((fwsm & E1000_FWSM_MODE_MASK) ==
+                     (e1000_mng_mode_pt << E1000_FWSM_MODE_SHIFT))) {
+                        ret_val = true;
+                        goto out;
+                }
+        } else if ((hw->mac.type == e1000_82574) ||
+                   (hw->mac.type == e1000_82583)) {
+                u16 data;
+
+                factps = er32(FACTPS);
+                e1000_read_nvm(hw, NVM_INIT_CONTROL2_REG, 1, &data);
+
+                if (!(factps & E1000_FACTPS_MNGCG) &&
+                    ((data & E1000_NVM_INIT_CTRL2_MNGM) ==
+                     (e1000_mng_mode_pt << 13))) {
+                        ret_val = true;
+                        goto out;
+                }
+        } else if ((manc & E1000_MANC_SMBUS_EN) &&
+                   !(manc & E1000_MANC_ASF_EN)) {
+                ret_val = true;
+                goto out;
+        }
+
+out:
+        return ret_val;
+}
diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c
index 3911401ed65d..f868fb822a30 100644
--- a/drivers/net/ethernet/intel/e1000e/netdev.c
+++ b/drivers/net/ethernet/intel/e1000e/netdev.c
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel PRO/1000 Linux driver
-  Copyright(c) 1999 - 2011 Intel Corporation.
+  Copyright(c) 1999 - 2012 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
@@ -56,7 +56,7 @@
 
 #define DRV_EXTRAVERSION "-k"
 
-#define DRV_VERSION "1.5.1" DRV_EXTRAVERSION
+#define DRV_VERSION "1.9.5" DRV_EXTRAVERSION
 char e1000e_driver_name[] = "e1000e";
 const char e1000e_driver_version[] = DRV_VERSION;
 
@@ -137,7 +137,7 @@ static const struct e1000_reg_info e1000_reg_info_tbl[] = {
         {E1000_TDFPC, "TDFPC"},
 
         /* List Terminator */
-        {}
+        {0, NULL}
 };
 
 /*
@@ -183,18 +183,18 @@ static void e1000e_dump(struct e1000_adapter *adapter)
         struct e1000_ring *tx_ring = adapter->tx_ring;
         struct e1000_tx_desc *tx_desc;
         struct my_u0 {
-                u64 a;
-                u64 b;
+                __le64 a;
+                __le64 b;
         } *u0;
         struct e1000_buffer *buffer_info;
         struct e1000_ring *rx_ring = adapter->rx_ring;
         union e1000_rx_desc_packet_split *rx_desc_ps;
         union e1000_rx_desc_extended *rx_desc;
         struct my_u1 {
-                u64 a;
-                u64 b;
-                u64 c;
-                u64 d;
+                __le64 a;
+                __le64 b;
+                __le64 c;
+                __le64 d;
         } *u1;
         u32 staterr;
         int i = 0;
@@ -221,7 +221,7 @@ static void e1000e_dump(struct e1000_adapter *adapter)
 
         /* Print Tx Ring Summary */
         if (!netdev || !netif_running(netdev))
-                goto exit;
+                return;
 
         dev_info(&adapter->pdev->dev, "Tx Ring Summary\n");
         pr_info("Queue [NTU] [NTC] [bi(ntc)->dma  ] leng ntw timestamp\n");
@@ -308,7 +308,7 @@ rx_ring_summary:
 
         /* Print Rx Ring */
         if (!netif_msg_rx_status(adapter))
-                goto exit;
+                return;
 
         dev_info(&adapter->pdev->dev, "Rx Ring Dump\n");
         switch (adapter->rx_ps_pages) {
@@ -449,9 +449,6 @@ rx_ring_summary:
                         }
                 }
         }
-
-exit:
-        return;
 }
 
 /**
@@ -487,22 +484,27 @@ static void e1000_receive_skb(struct e1000_adapter *adapter,
 
 /**
  * e1000_rx_checksum - Receive Checksum Offload
- * @adapter:     board private structure
- * @status_err:  receive descriptor status and error fields
- * @csum:       receive descriptor csum field
- * @sk_buff:     socket buffer with received data
+ * @adapter: board private structure
+ * @status_err: receive descriptor status and error fields
+ * @csum: receive descriptor csum field
+ * @sk_buff: socket buffer with received data
  **/
 static void e1000_rx_checksum(struct e1000_adapter *adapter, u32 status_err,
-                              u32 csum, struct sk_buff *skb)
+                              __le16 csum, struct sk_buff *skb)
 {
         u16 status = (u16)status_err;
         u8 errors = (u8)(status_err >> 24);
 
         skb_checksum_none_assert(skb);
 
+        /* Rx checksum disabled */
+        if (!(adapter->netdev->features & NETIF_F_RXCSUM))
+                return;
+
         /* Ignore Checksum bit is set */
         if (status & E1000_RXD_STAT_IXSM)
                 return;
+
         /* TCP/UDP checksum error bit is set */
         if (errors & E1000_RXD_ERR_TCPE) {
                 /* let the stack verify checksum errors */
@@ -524,7 +526,7 @@ static void e1000_rx_checksum(struct e1000_adapter *adapter, u32 status_err,
                  * Hardware complements the payload checksum, so we undo it
                  * and then put the value in host order for further stack use.
                  */
-                __sum16 sum = (__force __sum16)htons(csum);
+                __sum16 sum = (__force __sum16)swab16((__force u16)csum);
                 skb->csum = csum_unfold(~sum);
                 skb->ip_summed = CHECKSUM_COMPLETE;
         }
@@ -545,7 +547,7 @@ static void e1000_rx_checksum(struct e1000_adapter *adapter, u32 status_err,
  * which has bit 24 set while ME is accessing Host CSR registers, wait
  * if it is set and try again a number of times.
  **/
-static inline s32 e1000e_update_tail_wa(struct e1000_hw *hw, u8 __iomem * tail,
+static inline s32 e1000e_update_tail_wa(struct e1000_hw *hw, void __iomem *tail,
                                         unsigned int i)
 {
         unsigned int j = 0;
@@ -562,12 +564,12 @@ static inline s32 e1000e_update_tail_wa(struct e1000_hw *hw, u8 __iomem * tail,
         return 0;
 }
 
-static void e1000e_update_rdt_wa(struct e1000_adapter *adapter, unsigned int i)
+static void e1000e_update_rdt_wa(struct e1000_ring *rx_ring, unsigned int i)
 {
-        u8 __iomem *tail = (adapter->hw.hw_addr + adapter->rx_ring->tail);
+        struct e1000_adapter *adapter = rx_ring->adapter;
         struct e1000_hw *hw = &adapter->hw;
 
-        if (e1000e_update_tail_wa(hw, tail, i)) {
+        if (e1000e_update_tail_wa(hw, rx_ring->tail, i)) {
                 u32 rctl = er32(RCTL);
                 ew32(RCTL, rctl & ~E1000_RCTL_EN);
                 e_err("ME firmware caused invalid RDT - resetting\n");
@@ -575,12 +577,12 @@ static void e1000e_update_rdt_wa(struct e1000_adapter *adapter, unsigned int i)
         }
 }
 
-static void e1000e_update_tdt_wa(struct e1000_adapter *adapter, unsigned int i)
+static void e1000e_update_tdt_wa(struct e1000_ring *tx_ring, unsigned int i)
 {
-        u8 __iomem *tail = (adapter->hw.hw_addr + adapter->tx_ring->tail);
+        struct e1000_adapter *adapter = tx_ring->adapter;
         struct e1000_hw *hw = &adapter->hw;
 
-        if (e1000e_update_tail_wa(hw, tail, i)) {
+        if (e1000e_update_tail_wa(hw, tx_ring->tail, i)) {
                 u32 tctl = er32(TCTL);
                 ew32(TCTL, tctl & ~E1000_TCTL_EN);
                 e_err("ME firmware caused invalid TDT - resetting\n");
@@ -590,14 +592,14 @@ static void e1000e_update_tdt_wa(struct e1000_adapter *adapter, unsigned int i)
 
 /**
  * e1000_alloc_rx_buffers - Replace used receive buffers
- * @adapter: address of board private structure
+ * @rx_ring: Rx descriptor ring
  **/
-static void e1000_alloc_rx_buffers(struct e1000_adapter *adapter,
+static void e1000_alloc_rx_buffers(struct e1000_ring *rx_ring,
                                    int cleaned_count, gfp_t gfp)
 {
+        struct e1000_adapter *adapter = rx_ring->adapter;
         struct net_device *netdev = adapter->netdev;
         struct pci_dev *pdev = adapter->pdev;
-        struct e1000_ring *rx_ring = adapter->rx_ring;
         union e1000_rx_desc_extended *rx_desc;
         struct e1000_buffer *buffer_info;
         struct sk_buff *skb;
@@ -644,9 +646,9 @@ map_skb:
                          */
                         wmb();
                         if (adapter->flags2 & FLAG2_PCIM2PCI_ARBITER_WA)
-                                e1000e_update_rdt_wa(adapter, i);
+                                e1000e_update_rdt_wa(rx_ring, i);
                         else
-                                writel(i, adapter->hw.hw_addr + rx_ring->tail);
+                                writel(i, rx_ring->tail);
                 }
                 i++;
                 if (i == rx_ring->count)
@@ -659,15 +661,15 @@ map_skb:
 
 /**
  * e1000_alloc_rx_buffers_ps - Replace used receive buffers; packet split
- * @adapter: address of board private structure
+ * @rx_ring: Rx descriptor ring
  **/
-static void e1000_alloc_rx_buffers_ps(struct e1000_adapter *adapter,
+static void e1000_alloc_rx_buffers_ps(struct e1000_ring *rx_ring,
                                       int cleaned_count, gfp_t gfp)
 {
+        struct e1000_adapter *adapter = rx_ring->adapter;
         struct net_device *netdev = adapter->netdev;
         struct pci_dev *pdev = adapter->pdev;
         union e1000_rx_desc_packet_split *rx_desc;
-        struct e1000_ring *rx_ring = adapter->rx_ring;
         struct e1000_buffer *buffer_info;
         struct e1000_ps_page *ps_page;
         struct sk_buff *skb;
@@ -747,10 +749,9 @@ static void e1000_alloc_rx_buffers_ps(struct e1000_adapter *adapter,
                          */
                         wmb();
                         if (adapter->flags2 & FLAG2_PCIM2PCI_ARBITER_WA)
-                                e1000e_update_rdt_wa(adapter, i << 1);
+                                e1000e_update_rdt_wa(rx_ring, i << 1);
                         else
-                                writel(i << 1,
-                                       adapter->hw.hw_addr + rx_ring->tail);
+                                writel(i << 1, rx_ring->tail);
                 }
 
                 i++;
@@ -765,17 +766,17 @@ no_buffers:
 
 /**
  * e1000_alloc_jumbo_rx_buffers - Replace used jumbo receive buffers
- * @adapter: address of board private structure
+ * @rx_ring: Rx descriptor ring
  * @cleaned_count: number of buffers to allocate this pass
  **/
 
-static void e1000_alloc_jumbo_rx_buffers(struct e1000_adapter *adapter,
+static void e1000_alloc_jumbo_rx_buffers(struct e1000_ring *rx_ring,
                                          int cleaned_count, gfp_t gfp)
 {
+        struct e1000_adapter *adapter = rx_ring->adapter;
         struct net_device *netdev = adapter->netdev;
         struct pci_dev *pdev = adapter->pdev;
         union e1000_rx_desc_extended *rx_desc;
-        struct e1000_ring *rx_ring = adapter->rx_ring;
         struct e1000_buffer *buffer_info;
         struct sk_buff *skb;
         unsigned int i;
@@ -834,26 +835,33 @@ check_page:
                  * such as IA-64). */
                 wmb();
                 if (adapter->flags2 & FLAG2_PCIM2PCI_ARBITER_WA)
-                        e1000e_update_rdt_wa(adapter, i);
+                        e1000e_update_rdt_wa(rx_ring, i);
                 else
-                        writel(i, adapter->hw.hw_addr + rx_ring->tail);
+                        writel(i, rx_ring->tail);
         }
 }
 
+static inline void e1000_rx_hash(struct net_device *netdev, __le32 rss,
+                                 struct sk_buff *skb)
+{
+        if (netdev->features & NETIF_F_RXHASH)
+                skb->rxhash = le32_to_cpu(rss);
+}
+
 /**
- * e1000_clean_rx_irq - Send received data up the network stack; legacy
- * @adapter: board private structure
+ * e1000_clean_rx_irq - Send received data up the network stack
+ * @rx_ring: Rx descriptor ring
  *
  * the return value indicates whether actual cleaning was done, there
  * is no guarantee that everything was cleaned
  **/
-static bool e1000_clean_rx_irq(struct e1000_adapter *adapter,
-                               int *work_done, int work_to_do)
+static bool e1000_clean_rx_irq(struct e1000_ring *rx_ring, int *work_done,
+                               int work_to_do)
 {
+        struct e1000_adapter *adapter = rx_ring->adapter;
         struct net_device *netdev = adapter->netdev;
         struct pci_dev *pdev = adapter->pdev;
         struct e1000_hw *hw = &adapter->hw;
-        struct e1000_ring *rx_ring = adapter->rx_ring;
         union e1000_rx_desc_extended *rx_desc, *next_rxd;
         struct e1000_buffer *buffer_info, *next_buffer;
         u32 length, staterr;
@@ -957,8 +965,9 @@ static bool e1000_clean_rx_irq(struct e1000_adapter *adapter,
 
                 /* Receive Checksum Offload */
                 e1000_rx_checksum(adapter, staterr,
-                                  le16_to_cpu(rx_desc->wb.lower.hi_dword.
-                                              csum_ip.csum), skb);
+                                  rx_desc->wb.lower.hi_dword.csum_ip.csum, skb);
+
+                e1000_rx_hash(netdev, rx_desc->wb.lower.hi_dword.rss, skb);
 
                 e1000_receive_skb(adapter, netdev, skb, staterr,
                                   rx_desc->wb.upper.vlan);
@@ -968,7 +977,7 @@ next_desc:
 
                 /* return some buffers to hardware, one at a time is too slow */
                 if (cleaned_count >= E1000_RX_BUFFER_WRITE) {
-                        adapter->alloc_rx_buf(adapter, cleaned_count,
+                        adapter->alloc_rx_buf(rx_ring, cleaned_count,
                                               GFP_ATOMIC);
                         cleaned_count = 0;
                 }
@@ -983,16 +992,18 @@ next_desc:
 
         cleaned_count = e1000_desc_unused(rx_ring);
         if (cleaned_count)
-                adapter->alloc_rx_buf(adapter, cleaned_count, GFP_ATOMIC);
+                adapter->alloc_rx_buf(rx_ring, cleaned_count, GFP_ATOMIC);
 
         adapter->total_rx_bytes += total_rx_bytes;
         adapter->total_rx_packets += total_rx_packets;
         return cleaned;
 }
 
-static void e1000_put_txbuf(struct e1000_adapter *adapter,
-                             struct e1000_buffer *buffer_info)
+static void e1000_put_txbuf(struct e1000_ring *tx_ring,
+                            struct e1000_buffer *buffer_info)
 {
+        struct e1000_adapter *adapter = tx_ring->adapter;
+
         if (buffer_info->dma) {
                 if (buffer_info->mapped_as_page)
                         dma_unmap_page(&adapter->pdev->dev, buffer_info->dma,
@@ -1063,8 +1074,8 @@ static void e1000_print_hw_hang(struct work_struct *work)
               "PHY 1000BASE-T Status  <%x>\n"
               "PHY Extended Status    <%x>\n"
               "PCI Status             <%x>\n",
-              readl(adapter->hw.hw_addr + tx_ring->head),
-              readl(adapter->hw.hw_addr + tx_ring->tail),
+              readl(tx_ring->head),
+              readl(tx_ring->tail),
               tx_ring->next_to_use,
               tx_ring->next_to_clean,
               tx_ring->buffer_info[eop].time_stamp,
@@ -1080,16 +1091,16 @@ static void e1000_print_hw_hang(struct work_struct *work)
 
 /**
  * e1000_clean_tx_irq - Reclaim resources after transmit completes
- * @adapter: board private structure
+ * @tx_ring: Tx descriptor ring
  *
  * the return value indicates whether actual cleaning was done, there
  * is no guarantee that everything was cleaned
  **/
-static bool e1000_clean_tx_irq(struct e1000_adapter *adapter)
+static bool e1000_clean_tx_irq(struct e1000_ring *tx_ring)
 {
+        struct e1000_adapter *adapter = tx_ring->adapter;
         struct net_device *netdev = adapter->netdev;
         struct e1000_hw *hw = &adapter->hw;
-        struct e1000_ring *tx_ring = adapter->tx_ring;
         struct e1000_tx_desc *tx_desc, *eop_desc;
         struct e1000_buffer *buffer_info;
         unsigned int i, eop;
@@ -1119,7 +1130,7 @@ static bool e1000_clean_tx_irq(struct e1000_adapter *adapter)
                                 }
                         }
 
-                        e1000_put_txbuf(adapter, buffer_info);
+                        e1000_put_txbuf(tx_ring, buffer_info);
                         tx_desc->upper.data = 0;
 
                         i++;
@@ -1173,19 +1184,19 @@ static bool e1000_clean_tx_irq(struct e1000_adapter *adapter)
 
 /**
  * e1000_clean_rx_irq_ps - Send received data up the network stack; packet split
- * @adapter: board private structure
+ * @rx_ring: Rx descriptor ring
  *
  * the return value indicates whether actual cleaning was done, there
  * is no guarantee that everything was cleaned
  **/
-static bool e1000_clean_rx_irq_ps(struct e1000_adapter *adapter,
-                                  int *work_done, int work_to_do)
+static bool e1000_clean_rx_irq_ps(struct e1000_ring *rx_ring, int *work_done,
+                                  int work_to_do)
 {
+        struct e1000_adapter *adapter = rx_ring->adapter;
         struct e1000_hw *hw = &adapter->hw;
         union e1000_rx_desc_packet_split *rx_desc, *next_rxd;
         struct net_device *netdev = adapter->netdev;
         struct pci_dev *pdev = adapter->pdev;
-        struct e1000_ring *rx_ring = adapter->rx_ring;
         struct e1000_buffer *buffer_info, *next_buffer;
         struct e1000_ps_page *ps_page;
         struct sk_buff *skb;
@@ -1253,43 +1264,49 @@ static bool e1000_clean_rx_irq_ps(struct e1000_adapter *adapter,
                 skb_put(skb, length);
 
                 {
-                /*
-                 * this looks ugly, but it seems compiler issues make it
-                 * more efficient than reusing j
-                 */
-                int l1 = le16_to_cpu(rx_desc->wb.upper.length[0]);
-
-                /*
-                 * page alloc/put takes too long and effects small packet
-                 * throughput, so unsplit small packets and save the alloc/put
-                 * only valid in softirq (napi) context to call kmap_*
-                 */
-                if (l1 && (l1 <= copybreak) &&
-                    ((length + l1) <= adapter->rx_ps_bsize0)) {
-                        u8 *vaddr;
-
-                        ps_page = &buffer_info->ps_pages[0];
+                        /*
+                         * this looks ugly, but it seems compiler issues make
+                         * it more efficient than reusing j
+                         */
+                        int l1 = le16_to_cpu(rx_desc->wb.upper.length[0]);
 
                         /*
-                         * there is no documentation about how to call
-                         * kmap_atomic, so we can't hold the mapping
-                         * very long
+                         * page alloc/put takes too long and effects small
+                         * packet throughput, so unsplit small packets and
+                         * save the alloc/put only valid in softirq (napi)
+                         * context to call kmap_*
                          */
-                        dma_sync_single_for_cpu(&pdev->dev, ps_page->dma,
-                                                PAGE_SIZE, DMA_FROM_DEVICE);
-                        vaddr = kmap_atomic(ps_page->page, KM_SKB_DATA_SOFTIRQ);
-                        memcpy(skb_tail_pointer(skb), vaddr, l1);
-                        kunmap_atomic(vaddr, KM_SKB_DATA_SOFTIRQ);
-                        dma_sync_single_for_device(&pdev->dev, ps_page->dma,
-                                                   PAGE_SIZE, DMA_FROM_DEVICE);
-
-                        /* remove the CRC */
-                        if (!(adapter->flags2 & FLAG2_CRC_STRIPPING))
-                                l1 -= 4;
-
-                        skb_put(skb, l1);
-                        goto copydone;
-                } /* if */
+                        if (l1 && (l1 <= copybreak) &&
+                            ((length + l1) <= adapter->rx_ps_bsize0)) {
+                                u8 *vaddr;
+
+                                ps_page = &buffer_info->ps_pages[0];
+
+                                /*
+                                 * there is no documentation about how to call
+                                 * kmap_atomic, so we can't hold the mapping
+                                 * very long
+                                 */
+                                dma_sync_single_for_cpu(&pdev->dev,
+                                                        ps_page->dma,
+                                                        PAGE_SIZE,
+                                                        DMA_FROM_DEVICE);
+                                vaddr = kmap_atomic(ps_page->page,
+                                                    KM_SKB_DATA_SOFTIRQ);
+                                memcpy(skb_tail_pointer(skb), vaddr, l1);
+                                kunmap_atomic(vaddr, KM_SKB_DATA_SOFTIRQ);
+                                dma_sync_single_for_device(&pdev->dev,
+                                                           ps_page->dma,
+                                                           PAGE_SIZE,
+                                                           DMA_FROM_DEVICE);
+
+                                /* remove the CRC */
+                                if (!(adapter->flags2 & FLAG2_CRC_STRIPPING))
+                                        l1 -= 4;
+
+                                skb_put(skb, l1);
+                                goto copydone;
+                        } /* if */
                 }
 
                 for (j = 0; j < PS_PAGE_BUFFERS; j++) {
@@ -1318,8 +1335,10 @@ copydone:
                 total_rx_bytes += skb->len;
                 total_rx_packets++;
 
-                e1000_rx_checksum(adapter, staterr, le16_to_cpu(
-                        rx_desc->wb.lower.hi_dword.csum_ip.csum), skb);
+                e1000_rx_checksum(adapter, staterr,
+                                  rx_desc->wb.lower.hi_dword.csum_ip.csum, skb);
+
+                e1000_rx_hash(netdev, rx_desc->wb.lower.hi_dword.rss, skb);
 
                 if (rx_desc->wb.upper.header_status &
                            cpu_to_le16(E1000_RXDPS_HDRSTAT_HDRSP))
@@ -1334,7 +1353,7 @@ next_desc:
 
                 /* return some buffers to hardware, one at a time is too slow */
                 if (cleaned_count >= E1000_RX_BUFFER_WRITE) {
-                        adapter->alloc_rx_buf(adapter, cleaned_count,
+                        adapter->alloc_rx_buf(rx_ring, cleaned_count,
                                               GFP_ATOMIC);
                         cleaned_count = 0;
                 }
@@ -1349,7 +1368,7 @@ next_desc:
 
         cleaned_count = e1000_desc_unused(rx_ring);
         if (cleaned_count)
-                adapter->alloc_rx_buf(adapter, cleaned_count, GFP_ATOMIC);
+                adapter->alloc_rx_buf(rx_ring, cleaned_count, GFP_ATOMIC);
 
         adapter->total_rx_bytes += total_rx_bytes;
         adapter->total_rx_packets += total_rx_packets;
@@ -1375,13 +1394,12 @@ static void e1000_consume_page(struct e1000_buffer *bi, struct sk_buff *skb,
  * the return value indicates whether actual cleaning was done, there
  * is no guarantee that everything was cleaned
  **/
-
-static bool e1000_clean_jumbo_rx_irq(struct e1000_adapter *adapter,
-                                     int *work_done, int work_to_do)
+static bool e1000_clean_jumbo_rx_irq(struct e1000_ring *rx_ring, int *work_done,
+                                     int work_to_do)
 {
+        struct e1000_adapter *adapter = rx_ring->adapter;
         struct net_device *netdev = adapter->netdev;
         struct pci_dev *pdev = adapter->pdev;
-        struct e1000_ring *rx_ring = adapter->rx_ring;
         union e1000_rx_desc_extended *rx_desc, *next_rxd;
         struct e1000_buffer *buffer_info, *next_buffer;
         u32 length, staterr;
@@ -1491,8 +1509,9 @@ static bool e1000_clean_jumbo_rx_irq(struct e1000_adapter *adapter,
 
                 /* Receive Checksum Offload XXX recompute due to CRC strip? */
                 e1000_rx_checksum(adapter, staterr,
-                                  le16_to_cpu(rx_desc->wb.lower.hi_dword.
-                                              csum_ip.csum), skb);
+                                  rx_desc->wb.lower.hi_dword.csum_ip.csum, skb);
+
+                e1000_rx_hash(netdev, rx_desc->wb.lower.hi_dword.rss, skb);
 
                 /* probably a little skewed due to removing CRC */
                 total_rx_bytes += skb->len;
@@ -1513,7 +1532,7 @@ next_desc:
 
                 /* return some buffers to hardware, one at a time is too slow */
                 if (unlikely(cleaned_count >= E1000_RX_BUFFER_WRITE)) {
-                        adapter->alloc_rx_buf(adapter, cleaned_count,
+                        adapter->alloc_rx_buf(rx_ring, cleaned_count,
                                               GFP_ATOMIC);
                         cleaned_count = 0;
                 }
@@ -1528,7 +1547,7 @@ next_desc:
 
         cleaned_count = e1000_desc_unused(rx_ring);
         if (cleaned_count)
-                adapter->alloc_rx_buf(adapter, cleaned_count, GFP_ATOMIC);
+                adapter->alloc_rx_buf(rx_ring, cleaned_count, GFP_ATOMIC);
 
         adapter->total_rx_bytes += total_rx_bytes;
         adapter->total_rx_packets += total_rx_packets;
@@ -1537,11 +1556,11 @@ next_desc:
 
 /**
  * e1000_clean_rx_ring - Free Rx Buffers per Queue
- * @adapter: board private structure
+ * @rx_ring: Rx descriptor ring
  **/
-static void e1000_clean_rx_ring(struct e1000_adapter *adapter)
+static void e1000_clean_rx_ring(struct e1000_ring *rx_ring)
 {
-        struct e1000_ring *rx_ring = adapter->rx_ring;
+        struct e1000_adapter *adapter = rx_ring->adapter;
         struct e1000_buffer *buffer_info;
         struct e1000_ps_page *ps_page;
         struct pci_dev *pdev = adapter->pdev;
@@ -1601,8 +1620,8 @@ static void e1000_clean_rx_ring(struct e1000_adapter *adapter)
         rx_ring->next_to_use = 0;
         adapter->flags2 &= ~FLAG2_IS_DISCARDING;
 
-        writel(0, adapter->hw.hw_addr + rx_ring->head);
-        writel(0, adapter->hw.hw_addr + rx_ring->tail);
+        writel(0, rx_ring->head);
+        writel(0, rx_ring->tail);
 }
 
 static void e1000e_downshift_workaround(struct work_struct *work)
@@ -1633,7 +1652,7 @@ static irqreturn_t e1000_intr_msi(int irq, void *data)
          */
 
         if (icr & E1000_ICR_LSC) {
-                hw->mac.get_link_status = 1;
+                hw->mac.get_link_status = true;
                 /*
                  * ICH8 workaround-- Call gig speed drop workaround on cable
                  * disconnect (LSC) before accessing any PHY registers
@@ -1699,7 +1718,7 @@ static irqreturn_t e1000_intr(int irq, void *data)
          */
 
         if (icr & E1000_ICR_LSC) {
-                hw->mac.get_link_status = 1;
+                hw->mac.get_link_status = true;
                 /*
                  * ICH8 workaround-- Call gig speed drop workaround on cable
                  * disconnect (LSC) before accessing any PHY registers
@@ -1756,7 +1775,7 @@ static irqreturn_t e1000_msix_other(int irq, void *data)
         if (icr & E1000_ICR_OTHER) {
                 if (!(icr & E1000_ICR_LSC))
                         goto no_link_interrupt;
-                hw->mac.get_link_status = 1;
+                hw->mac.get_link_status = true;
                 /* guard against interrupt when we're going down */
                 if (!test_bit(__E1000_DOWN, &adapter->state))
                         mod_timer(&adapter->watchdog_timer, jiffies + 1);
@@ -1781,7 +1800,7 @@ static irqreturn_t e1000_intr_msix_tx(int irq, void *data)
         adapter->total_tx_bytes = 0;
         adapter->total_tx_packets = 0;
 
-        if (!e1000_clean_tx_irq(adapter))
+        if (!e1000_clean_tx_irq(tx_ring))
                 /* Ring was not completely cleaned, so fire another interrupt */
                 ew32(ICS, tx_ring->ims_val);
 
@@ -1792,14 +1811,15 @@ static irqreturn_t e1000_intr_msix_rx(int irq, void *data)
 {
         struct net_device *netdev = data;
         struct e1000_adapter *adapter = netdev_priv(netdev);
+        struct e1000_ring *rx_ring = adapter->rx_ring;
 
         /* Write the ITR value calculated at the end of the
          * previous interrupt.
          */
-        if (adapter->rx_ring->set_itr) {
-                writel(1000000000 / (adapter->rx_ring->itr_val * 256),
-                       adapter->hw.hw_addr + adapter->rx_ring->itr_register);
-                adapter->rx_ring->set_itr = 0;
+        if (rx_ring->set_itr) {
+                writel(1000000000 / (rx_ring->itr_val * 256),
+                       rx_ring->itr_register);
+                rx_ring->set_itr = 0;
         }
 
         if (napi_schedule_prep(&adapter->napi)) {
@@ -1839,9 +1859,9 @@ static void e1000_configure_msix(struct e1000_adapter *adapter)
         adapter->eiac_mask |= rx_ring->ims_val;
         if (rx_ring->itr_val)
                 writel(1000000000 / (rx_ring->itr_val * 256),
-                       hw->hw_addr + rx_ring->itr_register);
+                       rx_ring->itr_register);
         else
-                writel(1, hw->hw_addr + rx_ring->itr_register);
+                writel(1, rx_ring->itr_register);
         ivar = E1000_IVAR_INT_ALLOC_VALID | vector;
 
         /* Configure Tx vector */
@@ -1849,9 +1869,9 @@ static void e1000_configure_msix(struct e1000_adapter *adapter)
         vector++;
         if (tx_ring->itr_val)
                 writel(1000000000 / (tx_ring->itr_val * 256),
-                       hw->hw_addr + tx_ring->itr_register);
+                       tx_ring->itr_register);
         else
-                writel(1, hw->hw_addr + tx_ring->itr_register);
+                writel(1, tx_ring->itr_register);
         adapter->eiac_mask |= tx_ring->ims_val;
         ivar |= ((E1000_IVAR_INT_ALLOC_VALID | vector) << 8);
 
@@ -1966,7 +1986,8 @@ static int e1000_request_msix(struct e1000_adapter *adapter)
                           netdev);
         if (err)
                 goto out;
-        adapter->rx_ring->itr_register = E1000_EITR_82574(vector);
+        adapter->rx_ring->itr_register = adapter->hw.hw_addr +
+            E1000_EITR_82574(vector);
         adapter->rx_ring->itr_val = adapter->itr;
         vector++;
 
@@ -1981,7 +2002,8 @@ static int e1000_request_msix(struct e1000_adapter *adapter)
                           netdev);
         if (err)
                 goto out;
-        adapter->tx_ring->itr_register = E1000_EITR_82574(vector);
+        adapter->tx_ring->itr_register = adapter->hw.hw_addr +
+            E1000_EITR_82574(vector);
         adapter->tx_ring->itr_val = adapter->itr;
         vector++;
 
@@ -2162,13 +2184,13 @@ static int e1000_alloc_ring_dma(struct e1000_adapter *adapter,
 
 /**
  * e1000e_setup_tx_resources - allocate Tx resources (Descriptors)
- * @adapter: board private structure
+ * @tx_ring: Tx descriptor ring
  *
  * Return 0 on success, negative on failure
  **/
-int e1000e_setup_tx_resources(struct e1000_adapter *adapter)
+int e1000e_setup_tx_resources(struct e1000_ring *tx_ring)
 {
-        struct e1000_ring *tx_ring = adapter->tx_ring;
+        struct e1000_adapter *adapter = tx_ring->adapter;
         int err = -ENOMEM, size;
 
         size = sizeof(struct e1000_buffer) * tx_ring->count;
@@ -2196,13 +2218,13 @@ err:
 
 /**
  * e1000e_setup_rx_resources - allocate Rx resources (Descriptors)
- * @adapter: board private structure
+ * @rx_ring: Rx descriptor ring
  *
  * Returns 0 on success, negative on failure
  **/
-int e1000e_setup_rx_resources(struct e1000_adapter *adapter)
+int e1000e_setup_rx_resources(struct e1000_ring *rx_ring)
 {
-        struct e1000_ring *rx_ring = adapter->rx_ring;
+        struct e1000_adapter *adapter = rx_ring->adapter;
         struct e1000_buffer *buffer_info;
         int i, size, desc_len, err = -ENOMEM;
 
@@ -2249,18 +2271,18 @@ err:
 
 /**
  * e1000_clean_tx_ring - Free Tx Buffers
- * @adapter: board private structure
+ * @tx_ring: Tx descriptor ring
  **/
-static void e1000_clean_tx_ring(struct e1000_adapter *adapter)
+static void e1000_clean_tx_ring(struct e1000_ring *tx_ring)
 {
-        struct e1000_ring *tx_ring = adapter->tx_ring;
+        struct e1000_adapter *adapter = tx_ring->adapter;
         struct e1000_buffer *buffer_info;
         unsigned long size;
         unsigned int i;
 
         for (i = 0; i < tx_ring->count; i++) {
                 buffer_info = &tx_ring->buffer_info[i];
-                e1000_put_txbuf(adapter, buffer_info);
+                e1000_put_txbuf(tx_ring, buffer_info);
         }
 
         netdev_reset_queue(adapter->netdev);
@@ -2272,22 +2294,22 @@ static void e1000_clean_tx_ring(struct e1000_adapter *adapter)
         tx_ring->next_to_use = 0;
         tx_ring->next_to_clean = 0;
 
-        writel(0, adapter->hw.hw_addr + tx_ring->head);
-        writel(0, adapter->hw.hw_addr + tx_ring->tail);
+        writel(0, tx_ring->head);
+        writel(0, tx_ring->tail);
 }
 
 /**
  * e1000e_free_tx_resources - Free Tx Resources per Queue
- * @adapter: board private structure
+ * @tx_ring: Tx descriptor ring
  *
  * Free all transmit software resources
  **/
-void e1000e_free_tx_resources(struct e1000_adapter *adapter)
+void e1000e_free_tx_resources(struct e1000_ring *tx_ring)
 {
+        struct e1000_adapter *adapter = tx_ring->adapter;
         struct pci_dev *pdev = adapter->pdev;
-        struct e1000_ring *tx_ring = adapter->tx_ring;
 
-        e1000_clean_tx_ring(adapter);
+        e1000_clean_tx_ring(tx_ring);
 
         vfree(tx_ring->buffer_info);
         tx_ring->buffer_info = NULL;
@@ -2299,18 +2321,17 @@ void e1000e_free_tx_resources(struct e1000_adapter *adapter)
 
 /**
  * e1000e_free_rx_resources - Free Rx Resources
- * @adapter: board private structure
+ * @rx_ring: Rx descriptor ring
  *
  * Free all receive software resources
  **/
-
-void e1000e_free_rx_resources(struct e1000_adapter *adapter)
+void e1000e_free_rx_resources(struct e1000_ring *rx_ring)
 {
+        struct e1000_adapter *adapter = rx_ring->adapter;
         struct pci_dev *pdev = adapter->pdev;
-        struct e1000_ring *rx_ring = adapter->rx_ring;
         int i;
 
-        e1000_clean_rx_ring(adapter);
+        e1000_clean_rx_ring(rx_ring);
 
         for (i = 0; i < rx_ring->count; i++)
                 kfree(rx_ring->buffer_info[i].ps_pages);
@@ -2464,13 +2485,19 @@ set_itr_now:
  **/
 static int __devinit e1000_alloc_queues(struct e1000_adapter *adapter)
 {
-        adapter->tx_ring = kzalloc(sizeof(struct e1000_ring), GFP_KERNEL);
+        int size = sizeof(struct e1000_ring);
+
+        adapter->tx_ring = kzalloc(size, GFP_KERNEL);
         if (!adapter->tx_ring)
                 goto err;
+        adapter->tx_ring->count = adapter->tx_ring_count;
+        adapter->tx_ring->adapter = adapter;
 
-        adapter->rx_ring = kzalloc(sizeof(struct e1000_ring), GFP_KERNEL);
+        adapter->rx_ring = kzalloc(size, GFP_KERNEL);
         if (!adapter->rx_ring)
                 goto err;
+        adapter->rx_ring->count = adapter->rx_ring_count;
+        adapter->rx_ring->adapter = adapter;
 
         return 0;
 err:
@@ -2498,10 +2525,10 @@ static int e1000_clean(struct napi_struct *napi, int budget)
             !(adapter->rx_ring->ims_val & adapter->tx_ring->ims_val))
                 goto clean_rx;
 
-        tx_cleaned = e1000_clean_tx_irq(adapter);
+        tx_cleaned = e1000_clean_tx_irq(adapter->tx_ring);
 
 clean_rx:
-        adapter->clean_rx(adapter, &work_done, budget);
+        adapter->clean_rx(adapter->rx_ring, &work_done, budget);
 
         if (!tx_cleaned)
                 work_done = budget;
@@ -2746,8 +2773,7 @@ static void e1000_configure_tx(struct e1000_adapter *adapter)
         struct e1000_hw *hw = &adapter->hw;
         struct e1000_ring *tx_ring = adapter->tx_ring;
         u64 tdba;
-        u32 tdlen, tctl, tipg, tarc;
-        u32 ipgr1, ipgr2;
+        u32 tdlen, tarc;
 
         /* Setup the HW Tx Head and Tail descriptor pointers */
         tdba = tx_ring->dma;
@@ -2757,20 +2783,8 @@ static void e1000_configure_tx(struct e1000_adapter *adapter)
         ew32(TDLEN, tdlen);
         ew32(TDH, 0);
         ew32(TDT, 0);
-        tx_ring->head = E1000_TDH;
-        tx_ring->tail = E1000_TDT;
-
-        /* Set the default values for the Tx Inter Packet Gap timer */
-        tipg = DEFAULT_82543_TIPG_IPGT_COPPER;          /*  8  */
-        ipgr1 = DEFAULT_82543_TIPG_IPGR1;               /*  8  */
-        ipgr2 = DEFAULT_82543_TIPG_IPGR2;               /*  6  */
-
-        if (adapter->flags & FLAG_TIPG_MEDIUM_FOR_80003ESLAN)
-                ipgr2 = DEFAULT_80003ES2LAN_TIPG_IPGR2; /*  7  */
-
-        tipg |= ipgr1 << E1000_TIPG_IPGR1_SHIFT;
-        tipg |= ipgr2 << E1000_TIPG_IPGR2_SHIFT;
-        ew32(TIPG, tipg);
+        tx_ring->head = adapter->hw.hw_addr + E1000_TDH;
+        tx_ring->tail = adapter->hw.hw_addr + E1000_TDT;
 
         /* Set the Tx Interrupt Delay register */
         ew32(TIDV, adapter->tx_int_delay);
@@ -2793,15 +2807,9 @@ static void e1000_configure_tx(struct e1000_adapter *adapter)
                  */
                 txdctl |= E1000_TXDCTL_DMA_BURST_ENABLE;
                 ew32(TXDCTL(0), txdctl);
-                /* erratum work around: set txdctl the same for both queues */
-                ew32(TXDCTL(1), txdctl);
         }
-
-        /* Program the Transmit Control Register */
-        tctl = er32(TCTL);
-        tctl &= ~E1000_TCTL_CT;
-        tctl |= E1000_TCTL_PSP | E1000_TCTL_RTLC |
-                (E1000_COLLISION_THRESHOLD << E1000_CT_SHIFT);
+        /* erratum work around: set txdctl the same for both queues */
+        ew32(TXDCTL(1), er32(TXDCTL(0)));
 
         if (adapter->flags & FLAG_TARC_SPEED_MODE_BIT) {
                 tarc = er32(TARC(0));
@@ -2834,8 +2842,6 @@ static void e1000_configure_tx(struct e1000_adapter *adapter)
         /* enable Report Status bit */
         adapter->txd_cmd |= E1000_TXD_CMD_RS;
 
-        ew32(TCTL, tctl);
-
         e1000e_config_collision_dist(hw);
 }
 
@@ -2944,8 +2950,7 @@ static void e1000_setup_rctl(struct e1000_adapter *adapter)
          * per packet.
          */
         pages = PAGE_USE_COUNT(adapter->netdev->mtu);
-        if (!(adapter->flags & FLAG_HAS_ERT) && (pages <= 3) &&
-            (PAGE_SIZE <= 16384) && (rctl & E1000_RCTL_LPE))
+        if ((pages <= 3) && (PAGE_SIZE <= 16384) && (rctl & E1000_RCTL_LPE))
                 adapter->rx_ps_pages = pages;
         else
                 adapter->rx_ps_pages = 0;
@@ -3072,8 +3077,8 @@ static void e1000_configure_rx(struct e1000_adapter *adapter)
         ew32(RDLEN, rdlen);
         ew32(RDH, 0);
         ew32(RDT, 0);
-        rx_ring->head = E1000_RDH;
-        rx_ring->tail = E1000_RDT;
+        rx_ring->head = adapter->hw.hw_addr + E1000_RDH;
+        rx_ring->tail = adapter->hw.hw_addr + E1000_RDT;
 
         /* Enable Receive Checksum Offload for TCP and UDP */
         rxcsum = er32(RXCSUM);
@@ -3092,23 +3097,14 @@ static void e1000_configure_rx(struct e1000_adapter *adapter)
         }
         ew32(RXCSUM, rxcsum);
 
-        /*
-         * Enable early receives on supported devices, only takes effect when
-         * packet size is equal or larger than the specified value (in 8 byte
-         * units), e.g. using jumbo frames when setting to E1000_ERT_2048
-         */
-        if ((adapter->flags & FLAG_HAS_ERT) ||
-            (adapter->hw.mac.type == e1000_pch2lan)) {
+        if (adapter->hw.mac.type == e1000_pch2lan) {
+                /*
+                 * With jumbo frames, excessive C-state transition
+                 * latencies result in dropped transactions.
+                 */
                 if (adapter->netdev->mtu > ETH_DATA_LEN) {
                         u32 rxdctl = er32(RXDCTL(0));
                         ew32(RXDCTL(0), rxdctl | 0x3);
-                        if (adapter->flags & FLAG_HAS_ERT)
-                                ew32(ERT, E1000_ERT_2048 | (1 << 13));
-                        /*
-                         * With jumbo frames and early-receive enabled,
-                         * excessive C-state transition latencies result in
-                         * dropped transactions.
-                         */
                         pm_qos_update_request(&adapter->netdev->pm_qos_req, 55);
                 } else {
                         pm_qos_update_request(&adapter->netdev->pm_qos_req,
@@ -3268,22 +3264,62 @@ static void e1000e_set_rx_mode(struct net_device *netdev)
                 e1000e_vlan_strip_disable(adapter);
 }
 
+static void e1000e_setup_rss_hash(struct e1000_adapter *adapter)
+{
+        struct e1000_hw *hw = &adapter->hw;
+        u32 mrqc, rxcsum;
+        int i;
+        static const u32 rsskey[10] = {
+                0xda565a6d, 0xc20e5b25, 0x3d256741, 0xb08fa343, 0xcb2bcad0,
+                0xb4307bae, 0xa32dcb77, 0x0cf23080, 0x3bb7426a, 0xfa01acbe
+        };
+
+        /* Fill out hash function seed */
+        for (i = 0; i < 10; i++)
+                ew32(RSSRK(i), rsskey[i]);
+
+        /* Direct all traffic to queue 0 */
+        for (i = 0; i < 32; i++)
+                ew32(RETA(i), 0);
+
+        /*
+         * Disable raw packet checksumming so that RSS hash is placed in
+         * descriptor on writeback.
+         */
+        rxcsum = er32(RXCSUM);
+        rxcsum |= E1000_RXCSUM_PCSD;
+
+        ew32(RXCSUM, rxcsum);
+
+        mrqc = (E1000_MRQC_RSS_FIELD_IPV4 |
+                E1000_MRQC_RSS_FIELD_IPV4_TCP |
+                E1000_MRQC_RSS_FIELD_IPV6 |
+                E1000_MRQC_RSS_FIELD_IPV6_TCP |
+                E1000_MRQC_RSS_FIELD_IPV6_TCP_EX);
+
+        ew32(MRQC, mrqc);
+}
+
 /**
  * e1000_configure - configure the hardware for Rx and Tx
  * @adapter: private board structure
  **/
 static void e1000_configure(struct e1000_adapter *adapter)
 {
+        struct e1000_ring *rx_ring = adapter->rx_ring;
+
         e1000e_set_rx_mode(adapter->netdev);
 
         e1000_restore_vlan(adapter);
         e1000_init_manageability_pt(adapter);
 
         e1000_configure_tx(adapter);
+
+        if (adapter->netdev->features & NETIF_F_RXHASH)
+                e1000e_setup_rss_hash(adapter);
         e1000_setup_rctl(adapter);
         e1000_configure_rx(adapter);
-        adapter->alloc_rx_buf(adapter, e1000_desc_unused(adapter->rx_ring),
-                              GFP_KERNEL);
+        adapter->alloc_rx_buf(rx_ring, e1000_desc_unused(rx_ring), GFP_KERNEL);
 }
 
 /**
@@ -3379,9 +3415,7 @@ void e1000e_reset(struct e1000_adapter *adapter)
                          * if short on Rx space, Rx wins and must trump Tx
                          * adjustment or use Early Receive if available
                          */
-                        if ((pba < min_rx_space) &&
-                            (!(adapter->flags & FLAG_HAS_ERT)))
-                                /* ERT enabled in e1000_configure_rx */
+                        if (pba < min_rx_space)
                                 pba = min_rx_space;
                 }
 
@@ -3395,8 +3429,6 @@ void e1000e_reset(struct e1000_adapter *adapter)
          * (or the size used for early receive) above it in the Rx FIFO.
          * Set it to the lower of:
          * - 90% of the Rx FIFO size, and
-         * - the full Rx FIFO size minus the early receive size (for parts
-         *   with ERT support assuming ERT set to E1000_ERT_2048), or
          * - the full Rx FIFO size minus one full frame
          */
         if (adapter->flags & FLAG_DISABLE_FC_PAUSE_TIME)
@@ -3407,14 +3439,19 @@ void e1000e_reset(struct e1000_adapter *adapter)
         fc->current_mode = fc->requested_mode;
 
         switch (hw->mac.type) {
+        case e1000_ich9lan:
+        case e1000_ich10lan:
+                if (adapter->netdev->mtu > ETH_DATA_LEN) {
+                        pba = 14;
+                        ew32(PBA, pba);
+                        fc->high_water = 0x2800;
+                        fc->low_water = fc->high_water - 8;
+                        break;
+                }
+                /* fall-through */
         default:
-                if ((adapter->flags & FLAG_HAS_ERT) &&
-                    (adapter->netdev->mtu > ETH_DATA_LEN))
-                        hwm = min(((pba << 10) * 9 / 10),
-                                  ((pba << 10) - (E1000_ERT_2048 << 3)));
-                else
-                        hwm = min(((pba << 10) * 9 / 10),
-                                  ((pba << 10) - adapter->max_frame_size));
+                hwm = min(((pba << 10) * 9 / 10),
+                          ((pba << 10) - adapter->max_frame_size));
 
                 fc->high_water = hwm & E1000_FCRTH_RTH; /* 8-byte granularity */
                 fc->low_water = fc->high_water - 8;
@@ -3447,11 +3484,10 @@ void e1000e_reset(struct e1000_adapter *adapter)
 
         /*
          * Disable Adaptive Interrupt Moderation if 2 full packets cannot
-         * fit in receive buffer and early-receive not supported.
+         * fit in receive buffer.
          */
         if (adapter->itr_setting & 0x3) {
-                if (((adapter->max_frame_size * 2) > (pba << 10)) &&
-                    !(adapter->flags & FLAG_HAS_ERT)) {
+                if ((adapter->max_frame_size * 2) > (pba << 10)) {
                         if (!(adapter->flags2 & FLAG2_DISABLE_AIM)) {
                                 dev_info(&adapter->pdev->dev,
                                         "Interrupt Throttle Rate turned off\n");
@@ -3593,8 +3629,8 @@ void e1000e_down(struct e1000_adapter *adapter)
         spin_unlock(&adapter->stats64_lock);
 
         e1000e_flush_descriptors(adapter);
-        e1000_clean_tx_ring(adapter);
-        e1000_clean_rx_ring(adapter);
+        e1000_clean_tx_ring(adapter->tx_ring);
+        e1000_clean_rx_ring(adapter->rx_ring);
 
         adapter->link_speed = 0;
         adapter->link_duplex = 0;
@@ -3634,6 +3670,8 @@ static int __devinit e1000_sw_init(struct e1000_adapter *adapter)
         adapter->rx_ps_bsize0 = 128;
         adapter->max_frame_size = netdev->mtu + ETH_HLEN + ETH_FCS_LEN;
         adapter->min_frame_size = ETH_ZLEN + ETH_FCS_LEN;
+        adapter->tx_ring_count = E1000_DEFAULT_TXD;
+        adapter->rx_ring_count = E1000_DEFAULT_RXD;
 
         spin_lock_init(&adapter->stats64_lock);
 
@@ -3721,8 +3759,9 @@ static int e1000_test_msi_interrupt(struct e1000_adapter *adapter)
         if (adapter->flags & FLAG_MSI_TEST_FAILED) {
                 adapter->int_mode = E1000E_INT_MODE_LEGACY;
                 e_info("MSI interrupt test failed, using legacy interrupt.\n");
-        } else
+        } else {
                 e_dbg("MSI interrupt test succeeded!\n");
+        }
 
         free_irq(adapter->pdev->irq, netdev);
         pci_disable_msi(adapter->pdev);
@@ -3792,12 +3831,12 @@ static int e1000_open(struct net_device *netdev)
         netif_carrier_off(netdev);
 
         /* allocate transmit descriptors */
-        err = e1000e_setup_tx_resources(adapter);
+        err = e1000e_setup_tx_resources(adapter->tx_ring);
         if (err)
                 goto err_setup_tx;
 
         /* allocate receive descriptors */
-        err = e1000e_setup_rx_resources(adapter);
+        err = e1000e_setup_rx_resources(adapter->rx_ring);
         if (err)
                 goto err_setup_rx;
 
@@ -3817,9 +3856,8 @@ static int e1000_open(struct net_device *netdev)
              E1000_MNG_DHCP_COOKIE_STATUS_VLAN))
                 e1000_update_mng_vlan(adapter);
 
-        /* DMA latency requirement to workaround early-receive/jumbo issue */
-        if ((adapter->flags & FLAG_HAS_ERT) ||
-            (adapter->hw.mac.type == e1000_pch2lan))
+        /* DMA latency requirement to workaround jumbo issue */
+        if (adapter->hw.mac.type == e1000_pch2lan)
                 pm_qos_add_request(&adapter->netdev->pm_qos_req,
                                    PM_QOS_CPU_DMA_LATENCY,
                                    PM_QOS_DEFAULT_VALUE);
@@ -3873,9 +3911,9 @@ static int e1000_open(struct net_device *netdev)
 err_req_irq:
         e1000e_release_hw_control(adapter);
         e1000_power_down_phy(adapter);
-        e1000e_free_rx_resources(adapter);
+        e1000e_free_rx_resources(adapter->rx_ring);
 err_setup_rx:
-        e1000e_free_tx_resources(adapter);
+        e1000e_free_tx_resources(adapter->tx_ring);
 err_setup_tx:
         e1000e_reset(adapter);
         pm_runtime_put_sync(&pdev->dev);
@@ -3911,8 +3949,8 @@ static int e1000_close(struct net_device *netdev)
         }
         e1000_power_down_phy(adapter);
 
-        e1000e_free_tx_resources(adapter);
-        e1000e_free_rx_resources(adapter);
+        e1000e_free_tx_resources(adapter->tx_ring);
+        e1000e_free_rx_resources(adapter->rx_ring);
 
         /*
          * kill manageability vlan ID if supported, but not if a vlan with
@@ -3930,8 +3968,7 @@ static int e1000_close(struct net_device *netdev)
             !test_bit(__E1000_TESTING, &adapter->state))
                 e1000e_release_hw_control(adapter);
 
-        if ((adapter->flags & FLAG_HAS_ERT) ||
-            (adapter->hw.mac.type == e1000_pch2lan))
+        if (adapter->hw.mac.type == e1000_pch2lan)
                 pm_qos_remove_request(&adapter->netdev->pm_qos_req);
 
         pm_runtime_put_sync(&pdev->dev);
@@ -4569,10 +4606,8 @@ link_up:
 #define E1000_TX_FLAGS_VLAN_MASK        0xffff0000
 #define E1000_TX_FLAGS_VLAN_SHIFT       16
 
-static int e1000_tso(struct e1000_adapter *adapter,
-                     struct sk_buff *skb)
+static int e1000_tso(struct e1000_ring *tx_ring, struct sk_buff *skb)
 {
-        struct e1000_ring *tx_ring = adapter->tx_ring;
         struct e1000_context_desc *context_desc;
         struct e1000_buffer *buffer_info;
         unsigned int i;
@@ -4641,9 +4676,9 @@ static int e1000_tso(struct e1000_adapter *adapter,
         return 1;
 }
 
-static bool e1000_tx_csum(struct e1000_adapter *adapter, struct sk_buff *skb)
+static bool e1000_tx_csum(struct e1000_ring *tx_ring, struct sk_buff *skb)
 {
-        struct e1000_ring *tx_ring = adapter->tx_ring;
+        struct e1000_adapter *adapter = tx_ring->adapter;
         struct e1000_context_desc *context_desc;
         struct e1000_buffer *buffer_info;
         unsigned int i;
@@ -4704,12 +4739,11 @@ static bool e1000_tx_csum(struct e1000_adapter *adapter, struct sk_buff *skb)
 #define E1000_MAX_PER_TXD       8192
 #define E1000_MAX_TXD_PWR       12
 
-static int e1000_tx_map(struct e1000_adapter *adapter,
-                        struct sk_buff *skb, unsigned int first,
-                        unsigned int max_per_txd, unsigned int nr_frags,
-                        unsigned int mss)
+static int e1000_tx_map(struct e1000_ring *tx_ring, struct sk_buff *skb,
+                        unsigned int first, unsigned int max_per_txd,
+                        unsigned int nr_frags, unsigned int mss)
 {
-        struct e1000_ring *tx_ring = adapter->tx_ring;
+        struct e1000_adapter *adapter = tx_ring->adapter;
         struct pci_dev *pdev = adapter->pdev;
         struct e1000_buffer *buffer_info;
         unsigned int len = skb_headlen(skb);
@@ -4795,16 +4829,15 @@ dma_error:
                         i += tx_ring->count;
                 i--;
                 buffer_info = &tx_ring->buffer_info[i];
-                e1000_put_txbuf(adapter, buffer_info);
+                e1000_put_txbuf(tx_ring, buffer_info);
         }
 
         return 0;
 }
 
-static void e1000_tx_queue(struct e1000_adapter *adapter,
-                           int tx_flags, int count)
+static void e1000_tx_queue(struct e1000_ring *tx_ring, int tx_flags, int count)
 {
-        struct e1000_ring *tx_ring = adapter->tx_ring;
+        struct e1000_adapter *adapter = tx_ring->adapter;
         struct e1000_tx_desc *tx_desc = NULL;
         struct e1000_buffer *buffer_info;
         u32 txd_upper = 0, txd_lower = E1000_TXD_CMD_IFCS;
@@ -4857,9 +4890,9 @@ static void e1000_tx_queue(struct e1000_adapter *adapter,
         tx_ring->next_to_use = i;
 
         if (adapter->flags2 & FLAG2_PCIM2PCI_ARBITER_WA)
-                e1000e_update_tdt_wa(adapter, i);
+                e1000e_update_tdt_wa(tx_ring, i);
         else
-                writel(i, adapter->hw.hw_addr + tx_ring->tail);
+                writel(i, tx_ring->tail);
 
         /*
          * we need this if more than one processor can write to our tail
@@ -4907,11 +4940,11 @@ static int e1000_transfer_dhcp_info(struct e1000_adapter *adapter,
         return 0;
 }
 
-static int __e1000_maybe_stop_tx(struct net_device *netdev, int size)
+static int __e1000_maybe_stop_tx(struct e1000_ring *tx_ring, int size)
 {
-        struct e1000_adapter *adapter = netdev_priv(netdev);
+        struct e1000_adapter *adapter = tx_ring->adapter;
 
-        netif_stop_queue(netdev);
+        netif_stop_queue(adapter->netdev);
         /*
          * Herbert's original patch had:
          *  smp_mb__after_netif_stop_queue();
@@ -4923,25 +4956,23 @@ static int __e1000_maybe_stop_tx(struct net_device *netdev, int size)
          * We need to check again in a case another CPU has just
          * made room available.
          */
-        if (e1000_desc_unused(adapter->tx_ring) < size)
+        if (e1000_desc_unused(tx_ring) < size)
                 return -EBUSY;
 
         /* A reprieve! */
-        netif_start_queue(netdev);
+        netif_start_queue(adapter->netdev);
         ++adapter->restart_queue;
         return 0;
 }
 
-static int e1000_maybe_stop_tx(struct net_device *netdev, int size)
+static int e1000_maybe_stop_tx(struct e1000_ring *tx_ring, int size)
 {
-        struct e1000_adapter *adapter = netdev_priv(netdev);
-
-        if (e1000_desc_unused(adapter->tx_ring) >= size)
+        if (e1000_desc_unused(tx_ring) >= size)
                 return 0;
-        return __e1000_maybe_stop_tx(netdev, size);
+        return __e1000_maybe_stop_tx(tx_ring, size);
 }
 
-#define TXD_USE_COUNT(S, X) (((S) >> (X)) + 1 )
+#define TXD_USE_COUNT(S, X) (((S) >> (X)) + 1)
 static netdev_tx_t e1000_xmit_frame(struct sk_buff *skb,
                                     struct net_device *netdev)
 {
@@ -4995,7 +5026,7 @@ static netdev_tx_t e1000_xmit_frame(struct sk_buff *skb,
                 if (skb->data_len && (hdr_len == len)) {
                         unsigned int pull_size;
 
-                        pull_size = min((unsigned int)4, skb->data_len);
+                        pull_size = min_t(unsigned int, 4, skb->data_len);
                         if (!__pskb_pull_tail(skb, pull_size)) {
                                 e_err("__pskb_pull_tail failed.\n");
                                 dev_kfree_skb_any(skb);
@@ -5024,7 +5055,7 @@ static netdev_tx_t e1000_xmit_frame(struct sk_buff *skb,
          * need: count + 2 desc gap to keep tail from touching
          * head, otherwise try next time
          */
-        if (e1000_maybe_stop_tx(netdev, count + 2))
+        if (e1000_maybe_stop_tx(tx_ring, count + 2))
                 return NETDEV_TX_BUSY;
 
         if (vlan_tx_tag_present(skb)) {
@@ -5034,7 +5065,7 @@ static netdev_tx_t e1000_xmit_frame(struct sk_buff *skb,
 
         first = tx_ring->next_to_use;
 
-        tso = e1000_tso(adapter, skb);
+        tso = e1000_tso(tx_ring, skb);
         if (tso < 0) {
                 dev_kfree_skb_any(skb);
                 return NETDEV_TX_OK;
@@ -5042,7 +5073,7 @@ static netdev_tx_t e1000_xmit_frame(struct sk_buff *skb,
 
         if (tso)
                 tx_flags |= E1000_TX_FLAGS_TSO;
-        else if (e1000_tx_csum(adapter, skb))
+        else if (e1000_tx_csum(tx_ring, skb))
                 tx_flags |= E1000_TX_FLAGS_CSUM;
 
         /*
@@ -5054,12 +5085,12 @@ static netdev_tx_t e1000_xmit_frame(struct sk_buff *skb,
                 tx_flags |= E1000_TX_FLAGS_IPV4;
 
         /* if count is 0 then mapping error has occurred */
-        count = e1000_tx_map(adapter, skb, first, max_per_txd, nr_frags, mss);
+        count = e1000_tx_map(tx_ring, skb, first, max_per_txd, nr_frags, mss);
         if (count) {
                 netdev_sent_queue(netdev, skb->len);
-                e1000_tx_queue(adapter, tx_flags, count);
+                e1000_tx_queue(tx_ring, tx_flags, count);
                 /* Make sure there is space in the ring for the next send. */
-                e1000_maybe_stop_tx(netdev, MAX_SKB_FRAGS + 2);
+                e1000_maybe_stop_tx(tx_ring, MAX_SKB_FRAGS + 2);
 
         } else {
                 dev_kfree_skb_any(skb);
@@ -5165,10 +5196,22 @@ static int e1000_change_mtu(struct net_device *netdev, int new_mtu)
         int max_frame = new_mtu + ETH_HLEN + ETH_FCS_LEN;
 
         /* Jumbo frame support */
-        if ((max_frame > ETH_FRAME_LEN + ETH_FCS_LEN) &&
-            !(adapter->flags & FLAG_HAS_JUMBO_FRAMES)) {
-                e_err("Jumbo Frames not supported.\n");
-                return -EINVAL;
+        if (max_frame > ETH_FRAME_LEN + ETH_FCS_LEN) {
+                if (!(adapter->flags & FLAG_HAS_JUMBO_FRAMES)) {
+                        e_err("Jumbo Frames not supported.\n");
+                        return -EINVAL;
+                }
+
+                /*
+                 * IP payload checksum (enabled with jumbos/packet-split when
+                 * Rx checksum is enabled) and generation of RSS hash is
+                 * mutually exclusive in the hardware.
+                 */
+                if ((netdev->features & NETIF_F_RXCSUM) &&
+                    (netdev->features & NETIF_F_RXHASH)) {
+                        e_err("Jumbo frames cannot be enabled when both receive checksum offload and receive hashing are enabled.  Disable one of the receive offload features before enabling jumbos.\n");
+                        return -EINVAL;
+                }
         }
 
         /* Supported frame sizes */
@@ -5908,7 +5951,7 @@ static void e1000_print_device_info(struct e1000_adapter *adapter)
         ret_val = e1000_read_pba_string_generic(hw, pba_str,
                                                 E1000_PBANUM_LENGTH);
         if (ret_val)
-                strncpy((char *)pba_str, "Unknown", sizeof(pba_str) - 1);
+                strlcpy((char *)pba_str, "Unknown", sizeof(pba_str));
         e_info("MAC: %d, PHY: %d, PBA No: %s\n",
                hw->mac.type, hw->phy.type, pba_str);
 }
@@ -5923,7 +5966,8 @@ static void e1000_eeprom_checks(struct e1000_adapter *adapter)
                 return;
 
         ret_val = e1000_read_nvm(hw, NVM_INIT_CONTROL2_REG, 1, &buf);
-        if (!ret_val && (!(le16_to_cpu(buf) & (1 << 0)))) {
+        le16_to_cpus(&buf);
+        if (!ret_val && (!(buf & (1 << 0)))) {
                 /* Deep Smart Power Down (DSPD) */
                 dev_warn(&adapter->pdev->dev,
                          "Warning: detected DSPD enabled in EEPROM\n");
@@ -5931,7 +5975,7 @@ static void e1000_eeprom_checks(struct e1000_adapter *adapter)
 }
 
 static int e1000_set_features(struct net_device *netdev,
-        netdev_features_t features)
+                              netdev_features_t features)
 {
         struct e1000_adapter *adapter = netdev_priv(netdev);
         netdev_features_t changed = features ^ netdev->features;
@@ -5940,9 +5984,22 @@ static int e1000_set_features(struct net_device *netdev,
                 adapter->flags |= FLAG_TSO_FORCE;
 
         if (!(changed & (NETIF_F_HW_VLAN_RX | NETIF_F_HW_VLAN_TX |
-                         NETIF_F_RXCSUM)))
+                         NETIF_F_RXCSUM | NETIF_F_RXHASH)))
                 return 0;
 
+        /*
+         * IP payload checksum (enabled with jumbos/packet-split when Rx
+         * checksum is enabled) and generation of RSS hash is mutually
+         * exclusive in the hardware.
+         */
+        if (adapter->rx_ps_pages &&
+            (features & NETIF_F_RXCSUM) && (features & NETIF_F_RXHASH)) {
+                e_err("Enabling both receive checksum offload and receive hashing is not possible with jumbo frames.  Disable jumbos or enable only one of the receive offload features.\n");
+                return -EINVAL;
+        }
+
+        netdev->features = features;
+
         if (netif_running(netdev))
                 e1000e_reinit_locked(adapter);
         else
@@ -6087,7 +6144,7 @@ static int __devinit e1000_probe(struct pci_dev *pdev,
         e1000e_set_ethtool_ops(netdev);
         netdev->watchdog_timeo          = 5 * HZ;
         netif_napi_add(netdev, &adapter->napi, e1000_clean, 64);
-        strncpy(netdev->name, pci_name(pdev), sizeof(netdev->name) - 1);
+        strlcpy(netdev->name, pci_name(pdev), sizeof(netdev->name));
 
         netdev->mem_start = mmio_start;
         netdev->mem_end = mmio_start + mmio_len;
@@ -6133,6 +6190,7 @@ static int __devinit e1000_probe(struct pci_dev *pdev,
                             NETIF_F_HW_VLAN_TX |
                             NETIF_F_TSO |
                             NETIF_F_TSO6 |
+                            NETIF_F_RXHASH |
                             NETIF_F_RXCSUM |
                             NETIF_F_HW_CSUM);
 
@@ -6268,7 +6326,7 @@ static int __devinit e1000_probe(struct pci_dev *pdev,
         if (!(adapter->flags & FLAG_HAS_AMT))
                 e1000e_get_hw_control(adapter);
 
-        strncpy(netdev->name, "eth%d", sizeof(netdev->name) - 1);
+        strlcpy(netdev->name, "eth%d", sizeof(netdev->name));
         err = register_netdev(netdev);
         if (err)
                 goto err_register;
@@ -6449,7 +6507,7 @@ static DEFINE_PCI_DEVICE_TABLE(e1000_pci_tbl) = {
         { PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH2_LV_LM), board_pch2lan },
         { PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH2_LV_V), board_pch2lan },
 
-        { }     /* terminate list */
+        { 0, 0, 0, 0, 0, 0, 0 } /* terminate list */
 };
 MODULE_DEVICE_TABLE(pci, e1000_pci_tbl);
 
@@ -6468,7 +6526,9 @@ static struct pci_driver e1000_driver = {
         .probe    = e1000_probe,
         .remove   = __devexit_p(e1000_remove),
 #ifdef CONFIG_PM
-        .driver.pm = &e1000_pm_ops,
+        .driver   = {
+                .pm = &e1000_pm_ops,
+        },
 #endif
         .shutdown = e1000_shutdown,
         .err_handler = &e1000_err_handler
@@ -6485,7 +6545,7 @@ static int __init e1000_init_module(void)
         int ret;
         pr_info("Intel(R) PRO/1000 Network Driver - %s\n",
                 e1000e_driver_version);
-        pr_info("Copyright(c) 1999 - 2011 Intel Corporation.\n");
+        pr_info("Copyright(c) 1999 - 2012 Intel Corporation.\n");
         ret = pci_register_driver(&e1000_driver);
 
         return ret;
diff --git a/drivers/net/ethernet/intel/e1000e/nvm.c b/drivers/net/ethernet/intel/e1000e/nvm.c
new file mode 100644
index 000000000000..f6fb7a768ba5
--- /dev/null
+++ b/drivers/net/ethernet/intel/e1000e/nvm.c
@@ -0,0 +1,647 @@
+/*******************************************************************************
+
+  Intel PRO/1000 Linux driver
+  Copyright(c) 1999 - 2012 Intel Corporation.
+
+  This program is free software; you can redistribute it and/or modify it
+  under the terms and conditions of the GNU General Public License,
+  version 2, as published by the Free Software Foundation.
+
+  This program is distributed in the hope 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.
+
+  The full GNU General Public License is included in this distribution in
+  the file called "COPYING".
+
+  Contact Information:
+  Linux NICS <linux.nics@intel.com>
+  e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
+  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
+
+*******************************************************************************/
+
+#include "e1000.h"
+
+/**
+ *  e1000_raise_eec_clk - Raise EEPROM clock
+ *  @hw: pointer to the HW structure
+ *  @eecd: pointer to the EEPROM
+ *
+ *  Enable/Raise the EEPROM clock bit.
+ **/
+static void e1000_raise_eec_clk(struct e1000_hw *hw, u32 *eecd)
+{
+        *eecd = *eecd | E1000_EECD_SK;
+        ew32(EECD, *eecd);
+        e1e_flush();
+        udelay(hw->nvm.delay_usec);
+}
+
+/**
+ *  e1000_lower_eec_clk - Lower EEPROM clock
+ *  @hw: pointer to the HW structure
+ *  @eecd: pointer to the EEPROM
+ *
+ *  Clear/Lower the EEPROM clock bit.
+ **/
+static void e1000_lower_eec_clk(struct e1000_hw *hw, u32 *eecd)
+{
+        *eecd = *eecd & ~E1000_EECD_SK;
+        ew32(EECD, *eecd);
+        e1e_flush();
+        udelay(hw->nvm.delay_usec);
+}
+
+/**
+ *  e1000_shift_out_eec_bits - Shift data bits our to the EEPROM
+ *  @hw: pointer to the HW structure
+ *  @data: data to send to the EEPROM
+ *  @count: number of bits to shift out
+ *
+ *  We need to shift 'count' bits out to the EEPROM.  So, the value in the
+ *  "data" parameter will be shifted out to the EEPROM one bit at a time.
+ *  In order to do this, "data" must be broken down into bits.
+ **/
+static void e1000_shift_out_eec_bits(struct e1000_hw *hw, u16 data, u16 count)
+{
+        struct e1000_nvm_info *nvm = &hw->nvm;
+        u32 eecd = er32(EECD);
+        u32 mask;
+
+        mask = 0x01 << (count - 1);
+        if (nvm->type == e1000_nvm_eeprom_spi)
+                eecd |= E1000_EECD_DO;
+
+        do {
+                eecd &= ~E1000_EECD_DI;
+
+                if (data & mask)
+                        eecd |= E1000_EECD_DI;
+
+                ew32(EECD, eecd);
+                e1e_flush();
+
+                udelay(nvm->delay_usec);
+
+                e1000_raise_eec_clk(hw, &eecd);
+                e1000_lower_eec_clk(hw, &eecd);
+
+                mask >>= 1;
+        } while (mask);
+
+        eecd &= ~E1000_EECD_DI;
+        ew32(EECD, eecd);
+}
+
+/**
+ *  e1000_shift_in_eec_bits - Shift data bits in from the EEPROM
+ *  @hw: pointer to the HW structure
+ *  @count: number of bits to shift in
+ *
+ *  In order to read a register from the EEPROM, we need to shift 'count' bits
+ *  in from the EEPROM.  Bits are "shifted in" by raising the clock input to
+ *  the EEPROM (setting the SK bit), and then reading the value of the data out
+ *  "DO" bit.  During this "shifting in" process the data in "DI" bit should
+ *  always be clear.
+ **/
+static u16 e1000_shift_in_eec_bits(struct e1000_hw *hw, u16 count)
+{
+        u32 eecd;
+        u32 i;
+        u16 data;
+
+        eecd = er32(EECD);
+
+        eecd &= ~(E1000_EECD_DO | E1000_EECD_DI);
+        data = 0;
+
+        for (i = 0; i < count; i++) {
+                data <<= 1;
+                e1000_raise_eec_clk(hw, &eecd);
+
+                eecd = er32(EECD);
+
+                eecd &= ~E1000_EECD_DI;
+                if (eecd & E1000_EECD_DO)
+                        data |= 1;
+
+                e1000_lower_eec_clk(hw, &eecd);
+        }
+
+        return data;
+}
+
+/**
+ *  e1000e_poll_eerd_eewr_done - Poll for EEPROM read/write completion
+ *  @hw: pointer to the HW structure
+ *  @ee_reg: EEPROM flag for polling
+ *
+ *  Polls the EEPROM status bit for either read or write completion based
+ *  upon the value of 'ee_reg'.
+ **/
+s32 e1000e_poll_eerd_eewr_done(struct e1000_hw *hw, int ee_reg)
+{
+        u32 attempts = 100000;
+        u32 i, reg = 0;
+
+        for (i = 0; i < attempts; i++) {
+                if (ee_reg == E1000_NVM_POLL_READ)
+                        reg = er32(EERD);
+                else
+                        reg = er32(EEWR);
+
+                if (reg & E1000_NVM_RW_REG_DONE)
+                        return 0;
+
+                udelay(5);
+        }
+
+        return -E1000_ERR_NVM;
+}
+
+/**
+ *  e1000e_acquire_nvm - Generic request for access to EEPROM
+ *  @hw: pointer to the HW structure
+ *
+ *  Set the EEPROM access request bit and wait for EEPROM access grant bit.
+ *  Return successful if access grant bit set, else clear the request for
+ *  EEPROM access and return -E1000_ERR_NVM (-1).
+ **/
+s32 e1000e_acquire_nvm(struct e1000_hw *hw)
+{
+        u32 eecd = er32(EECD);
+        s32 timeout = E1000_NVM_GRANT_ATTEMPTS;
+
+        ew32(EECD, eecd | E1000_EECD_REQ);
+        eecd = er32(EECD);
+
+        while (timeout) {
+                if (eecd & E1000_EECD_GNT)
+                        break;
+                udelay(5);
+                eecd = er32(EECD);
+                timeout--;
+        }
+
+        if (!timeout) {
+                eecd &= ~E1000_EECD_REQ;
+                ew32(EECD, eecd);
+                e_dbg("Could not acquire NVM grant\n");
+                return -E1000_ERR_NVM;
+        }
+
+        return 0;
+}
+
+/**
+ *  e1000_standby_nvm - Return EEPROM to standby state
+ *  @hw: pointer to the HW structure
+ *
+ *  Return the EEPROM to a standby state.
+ **/
+static void e1000_standby_nvm(struct e1000_hw *hw)
+{
+        struct e1000_nvm_info *nvm = &hw->nvm;
+        u32 eecd = er32(EECD);
+
+        if (nvm->type == e1000_nvm_eeprom_spi) {
+                /* Toggle CS to flush commands */
+                eecd |= E1000_EECD_CS;
+                ew32(EECD, eecd);
+                e1e_flush();
+                udelay(nvm->delay_usec);
+                eecd &= ~E1000_EECD_CS;
+                ew32(EECD, eecd);
+                e1e_flush();
+                udelay(nvm->delay_usec);
+        }
+}
+
+/**
+ *  e1000_stop_nvm - Terminate EEPROM command
+ *  @hw: pointer to the HW structure
+ *
+ *  Terminates the current command by inverting the EEPROM's chip select pin.
+ **/
+static void e1000_stop_nvm(struct e1000_hw *hw)
+{
+        u32 eecd;
+
+        eecd = er32(EECD);
+        if (hw->nvm.type == e1000_nvm_eeprom_spi) {
+                /* Pull CS high */
+                eecd |= E1000_EECD_CS;
+                e1000_lower_eec_clk(hw, &eecd);
+        }
+}
+
+/**
+ *  e1000e_release_nvm - Release exclusive access to EEPROM
+ *  @hw: pointer to the HW structure
+ *
+ *  Stop any current commands to the EEPROM and clear the EEPROM request bit.
+ **/
+void e1000e_release_nvm(struct e1000_hw *hw)
+{
+        u32 eecd;
+
+        e1000_stop_nvm(hw);
+
+        eecd = er32(EECD);
+        eecd &= ~E1000_EECD_REQ;
+        ew32(EECD, eecd);
+}
+
+/**
+ *  e1000_ready_nvm_eeprom - Prepares EEPROM for read/write
+ *  @hw: pointer to the HW structure
+ *
+ *  Setups the EEPROM for reading and writing.
+ **/
+static s32 e1000_ready_nvm_eeprom(struct e1000_hw *hw)
+{
+        struct e1000_nvm_info *nvm = &hw->nvm;
+        u32 eecd = er32(EECD);
+        u8 spi_stat_reg;
+
+        if (nvm->type == e1000_nvm_eeprom_spi) {
+                u16 timeout = NVM_MAX_RETRY_SPI;
+
+                /* Clear SK and CS */
+                eecd &= ~(E1000_EECD_CS | E1000_EECD_SK);
+                ew32(EECD, eecd);
+                e1e_flush();
+                udelay(1);
+
+                /*
+                 * Read "Status Register" repeatedly until the LSB is cleared.
+                 * The EEPROM will signal that the command has been completed
+                 * by clearing bit 0 of the internal status register.  If it's
+                 * not cleared within 'timeout', then error out.
+                 */
+                while (timeout) {
+                        e1000_shift_out_eec_bits(hw, NVM_RDSR_OPCODE_SPI,
+                                                 hw->nvm.opcode_bits);
+                        spi_stat_reg = (u8)e1000_shift_in_eec_bits(hw, 8);
+                        if (!(spi_stat_reg & NVM_STATUS_RDY_SPI))
+                                break;
+
+                        udelay(5);
+                        e1000_standby_nvm(hw);
+                        timeout--;
+                }
+
+                if (!timeout) {
+                        e_dbg("SPI NVM Status error\n");
+                        return -E1000_ERR_NVM;
+                }
+        }
+
+        return 0;
+}
+
+/**
+ *  e1000e_read_nvm_eerd - Reads EEPROM using EERD register
+ *  @hw: pointer to the HW structure
+ *  @offset: offset of word in the EEPROM to read
+ *  @words: number of words to read
+ *  @data: word read from the EEPROM
+ *
+ *  Reads a 16 bit word from the EEPROM using the EERD register.
+ **/
+s32 e1000e_read_nvm_eerd(struct e1000_hw *hw, u16 offset, u16 words, u16 *data)
+{
+        struct e1000_nvm_info *nvm = &hw->nvm;
+        u32 i, eerd = 0;
+        s32 ret_val = 0;
+
+        /*
+         * A check for invalid values:  offset too large, too many words,
+         * too many words for the offset, and not enough words.
+         */
+        if ((offset >= nvm->word_size) || (words > (nvm->word_size - offset)) ||
+            (words == 0)) {
+                e_dbg("nvm parameter(s) out of bounds\n");
+                return -E1000_ERR_NVM;
+        }
+
+        for (i = 0; i < words; i++) {
+                eerd = ((offset + i) << E1000_NVM_RW_ADDR_SHIFT) +
+                    E1000_NVM_RW_REG_START;
+
+                ew32(EERD, eerd);
+                ret_val = e1000e_poll_eerd_eewr_done(hw, E1000_NVM_POLL_READ);
+                if (ret_val)
+                        break;
+
+                data[i] = (er32(EERD) >> E1000_NVM_RW_REG_DATA);
+        }
+
+        return ret_val;
+}
+
+/**
+ *  e1000e_write_nvm_spi - Write to EEPROM using SPI
+ *  @hw: pointer to the HW structure
+ *  @offset: offset within the EEPROM to be written to
+ *  @words: number of words to write
+ *  @data: 16 bit word(s) to be written to the EEPROM
+ *
+ *  Writes data to EEPROM at offset using SPI interface.
+ *
+ *  If e1000e_update_nvm_checksum is not called after this function , the
+ *  EEPROM will most likely contain an invalid checksum.
+ **/
+s32 e1000e_write_nvm_spi(struct e1000_hw *hw, u16 offset, u16 words, u16 *data)
+{
+        struct e1000_nvm_info *nvm = &hw->nvm;
+        s32 ret_val;
+        u16 widx = 0;
+
+        /*
+         * A check for invalid values:  offset too large, too many words,
+         * and not enough words.
+         */
+        if ((offset >= nvm->word_size) || (words > (nvm->word_size - offset)) ||
+            (words == 0)) {
+                e_dbg("nvm parameter(s) out of bounds\n");
+                return -E1000_ERR_NVM;
+        }
+
+        ret_val = nvm->ops.acquire(hw);
+        if (ret_val)
+                return ret_val;
+
+        while (widx < words) {
+                u8 write_opcode = NVM_WRITE_OPCODE_SPI;
+
+                ret_val = e1000_ready_nvm_eeprom(hw);
+                if (ret_val) {
+                        nvm->ops.release(hw);
+                        return ret_val;
+                }
+
+                e1000_standby_nvm(hw);
+
+                /* Send the WRITE ENABLE command (8 bit opcode) */
+                e1000_shift_out_eec_bits(hw, NVM_WREN_OPCODE_SPI,
+                                         nvm->opcode_bits);
+
+                e1000_standby_nvm(hw);
+
+                /*
+                 * Some SPI eeproms use the 8th address bit embedded in the
+                 * opcode
+                 */
+                if ((nvm->address_bits == 8) && (offset >= 128))
+                        write_opcode |= NVM_A8_OPCODE_SPI;
+
+                /* Send the Write command (8-bit opcode + addr) */
+                e1000_shift_out_eec_bits(hw, write_opcode, nvm->opcode_bits);
+                e1000_shift_out_eec_bits(hw, (u16)((offset + widx) * 2),
+                                         nvm->address_bits);
+
+                /* Loop to allow for up to whole page write of eeprom */
+                while (widx < words) {
+                        u16 word_out = data[widx];
+                        word_out = (word_out >> 8) | (word_out << 8);
+                        e1000_shift_out_eec_bits(hw, word_out, 16);
+                        widx++;
+
+                        if ((((offset + widx) * 2) % nvm->page_size) == 0) {
+                                e1000_standby_nvm(hw);
+                                break;
+                        }
+                }
+        }
+
+        usleep_range(10000, 20000);
+        nvm->ops.release(hw);
+        return 0;
+}
+
+/**
+ *  e1000_read_pba_string_generic - Read device part number
+ *  @hw: pointer to the HW structure
+ *  @pba_num: pointer to device part number
+ *  @pba_num_size: size of part number buffer
+ *
+ *  Reads the product board assembly (PBA) number from the EEPROM and stores
+ *  the value in pba_num.
+ **/
+s32 e1000_read_pba_string_generic(struct e1000_hw *hw, u8 *pba_num,
+                                  u32 pba_num_size)
+{
+        s32 ret_val;
+        u16 nvm_data;
+        u16 pba_ptr;
+        u16 offset;
+        u16 length;
+
+        if (pba_num == NULL) {
+                e_dbg("PBA string buffer was null\n");
+                ret_val = E1000_ERR_INVALID_ARGUMENT;
+                goto out;
+        }
+
+        ret_val = e1000_read_nvm(hw, NVM_PBA_OFFSET_0, 1, &nvm_data);
+        if (ret_val) {
+                e_dbg("NVM Read Error\n");
+                goto out;
+        }
+
+        ret_val = e1000_read_nvm(hw, NVM_PBA_OFFSET_1, 1, &pba_ptr);
+        if (ret_val) {
+                e_dbg("NVM Read Error\n");
+                goto out;
+        }
+
+        /*
+         * if nvm_data is not ptr guard the PBA must be in legacy format which
+         * means pba_ptr is actually our second data word for the PBA number
+         * and we can decode it into an ascii string
+         */
+        if (nvm_data != NVM_PBA_PTR_GUARD) {
+                e_dbg("NVM PBA number is not stored as string\n");
+
+                /* we will need 11 characters to store the PBA */
+                if (pba_num_size < 11) {
+                        e_dbg("PBA string buffer too small\n");
+                        return E1000_ERR_NO_SPACE;
+                }
+
+                /* extract hex string from data and pba_ptr */
+                pba_num[0] = (nvm_data >> 12) & 0xF;
+                pba_num[1] = (nvm_data >> 8) & 0xF;
+                pba_num[2] = (nvm_data >> 4) & 0xF;
+                pba_num[3] = nvm_data & 0xF;
+                pba_num[4] = (pba_ptr >> 12) & 0xF;
+                pba_num[5] = (pba_ptr >> 8) & 0xF;
+                pba_num[6] = '-';
+                pba_num[7] = 0;
+                pba_num[8] = (pba_ptr >> 4) & 0xF;
+                pba_num[9] = pba_ptr & 0xF;
+
+                /* put a null character on the end of our string */
+                pba_num[10] = '\0';
+
+                /* switch all the data but the '-' to hex char */
+                for (offset = 0; offset < 10; offset++) {
+                        if (pba_num[offset] < 0xA)
+                                pba_num[offset] += '0';
+                        else if (pba_num[offset] < 0x10)
+                                pba_num[offset] += 'A' - 0xA;
+                }
+
+                goto out;
+        }
+
+        ret_val = e1000_read_nvm(hw, pba_ptr, 1, &length);
+        if (ret_val) {
+                e_dbg("NVM Read Error\n");
+                goto out;
+        }
+
+        if (length == 0xFFFF || length == 0) {
+                e_dbg("NVM PBA number section invalid length\n");
+                ret_val = E1000_ERR_NVM_PBA_SECTION;
+                goto out;
+        }
+        /* check if pba_num buffer is big enough */
+        if (pba_num_size < (((u32)length * 2) - 1)) {
+                e_dbg("PBA string buffer too small\n");
+                ret_val = E1000_ERR_NO_SPACE;
+                goto out;
+        }
+
+        /* trim pba length from start of string */
+        pba_ptr++;
+        length--;
+
+        for (offset = 0; offset < length; offset++) {
+                ret_val = e1000_read_nvm(hw, pba_ptr + offset, 1, &nvm_data);
+                if (ret_val) {
+                        e_dbg("NVM Read Error\n");
+                        goto out;
+                }
+                pba_num[offset * 2] = (u8)(nvm_data >> 8);
+                pba_num[(offset * 2) + 1] = (u8)(nvm_data & 0xFF);
+        }
+        pba_num[offset * 2] = '\0';
+
+out:
+        return ret_val;
+}
+
+/**
+ *  e1000_read_mac_addr_generic - Read device MAC address
+ *  @hw: pointer to the HW structure
+ *
+ *  Reads the device MAC address from the EEPROM and stores the value.
+ *  Since devices with two ports use the same EEPROM, we increment the
+ *  last bit in the MAC address for the second port.
+ **/
+s32 e1000_read_mac_addr_generic(struct e1000_hw *hw)
+{
+        u32 rar_high;
+        u32 rar_low;
+        u16 i;
+
+        rar_high = er32(RAH(0));
+        rar_low = er32(RAL(0));
+
+        for (i = 0; i < E1000_RAL_MAC_ADDR_LEN; i++)
+                hw->mac.perm_addr[i] = (u8)(rar_low >> (i * 8));
+
+        for (i = 0; i < E1000_RAH_MAC_ADDR_LEN; i++)
+                hw->mac.perm_addr[i + 4] = (u8)(rar_high >> (i * 8));
+
+        for (i = 0; i < ETH_ALEN; i++)
+                hw->mac.addr[i] = hw->mac.perm_addr[i];
+
+        return 0;
+}
+
+/**
+ *  e1000e_validate_nvm_checksum_generic - Validate EEPROM checksum
+ *  @hw: pointer to the HW structure
+ *
+ *  Calculates the EEPROM checksum by reading/adding each word of the EEPROM
+ *  and then verifies that the sum of the EEPROM is equal to 0xBABA.
+ **/
+s32 e1000e_validate_nvm_checksum_generic(struct e1000_hw *hw)
+{
+        s32 ret_val;
+        u16 checksum = 0;
+        u16 i, nvm_data;
+
+        for (i = 0; i < (NVM_CHECKSUM_REG + 1); i++) {
+                ret_val = e1000_read_nvm(hw, i, 1, &nvm_data);
+                if (ret_val) {
+                        e_dbg("NVM Read Error\n");
+                        return ret_val;
+                }
+                checksum += nvm_data;
+        }
+
+        if (checksum != (u16)NVM_SUM) {
+                e_dbg("NVM Checksum Invalid\n");
+                return -E1000_ERR_NVM;
+        }
+
+        return 0;
+}
+
+/**
+ *  e1000e_update_nvm_checksum_generic - Update EEPROM checksum
+ *  @hw: pointer to the HW structure
+ *
+ *  Updates the EEPROM checksum by reading/adding each word of the EEPROM
+ *  up to the checksum.  Then calculates the EEPROM checksum and writes the
+ *  value to the EEPROM.
+ **/
+s32 e1000e_update_nvm_checksum_generic(struct e1000_hw *hw)
+{
+        s32 ret_val;
+        u16 checksum = 0;
+        u16 i, nvm_data;
+
+        for (i = 0; i < NVM_CHECKSUM_REG; i++) {
+                ret_val = e1000_read_nvm(hw, i, 1, &nvm_data);
+                if (ret_val) {
+                        e_dbg("NVM Read Error while updating checksum.\n");
+                        return ret_val;
+                }
+                checksum += nvm_data;
+        }
+        checksum = (u16)NVM_SUM - checksum;
+        ret_val = e1000_write_nvm(hw, NVM_CHECKSUM_REG, 1, &checksum);
+        if (ret_val)
+                e_dbg("NVM Write Error while updating checksum.\n");
+
+        return ret_val;
+}
+
+/**
+ *  e1000e_reload_nvm - Reloads EEPROM
+ *  @hw: pointer to the HW structure
+ *
+ *  Reloads the EEPROM by setting the "Reinitialize from EEPROM" bit in the
+ *  extended control register.
+ **/
+void e1000e_reload_nvm(struct e1000_hw *hw)
+{
+        u32 ctrl_ext;
+
+        udelay(10);
+        ctrl_ext = er32(CTRL_EXT);
+        ctrl_ext |= E1000_CTRL_EXT_EE_RST;
+        ew32(CTRL_EXT, ctrl_ext);
+        e1e_flush();
+}
diff --git a/drivers/net/ethernet/intel/e1000e/param.c b/drivers/net/ethernet/intel/e1000e/param.c
index 20e93b08e7f3..9c6a56d804a4 100644
--- a/drivers/net/ethernet/intel/e1000e/param.c
+++ b/drivers/net/ethernet/intel/e1000e/param.c
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel PRO/1000 Linux driver
-  Copyright(c) 1999 - 2011 Intel Corporation.
+  Copyright(c) 1999 - 2012 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
@@ -113,11 +113,20 @@ E1000_PARAM(InterruptThrottleRate, "Interrupt Throttling Rate");
 #define MAX_ITR 100000
 #define MIN_ITR 100
 
-/* IntMode (Interrupt Mode)
+/*
+ * IntMode (Interrupt Mode)
+ *
+ * Valid Range: varies depending on kernel configuration & hardware support
+ *
+ * legacy=0, MSI=1, MSI-X=2
  *
- * Valid Range: 0 - 2
+ * When MSI/MSI-X support is enabled in kernel-
+ *   Default Value: 2 (MSI-X) when supported by hardware, 1 (MSI) otherwise
+ * When MSI/MSI-X support is not enabled in kernel-
+ *   Default Value: 0 (legacy)
  *
- * Default Value: 2 (MSI-X)
+ * When a mode is specified that is not allowed/supported, it will be
+ * demoted to the most advanced interrupt mode available.
  */
 E1000_PARAM(IntMode, "Interrupt Mode");
 #define MAX_INTMODE     2
@@ -388,12 +397,33 @@ void __devinit e1000e_check_options(struct e1000_adapter *adapter)
                 static struct e1000_option opt = {
                         .type = range_option,
                         .name = "Interrupt Mode",
-                        .err  = "defaulting to 2 (MSI-X)",
-                        .def  = E1000E_INT_MODE_MSIX,
-                        .arg  = { .r = { .min = MIN_INTMODE,
-                                         .max = MAX_INTMODE } }
+#ifndef CONFIG_PCI_MSI
+                        .err  = "defaulting to 0 (legacy)",
+                        .def  = E1000E_INT_MODE_LEGACY,
+                        .arg  = { .r = { .min = 0,
+                                         .max = 0 } }
+#endif
                 };
 
+#ifdef CONFIG_PCI_MSI
+                if (adapter->flags & FLAG_HAS_MSIX) {
+                        opt.err = kstrdup("defaulting to 2 (MSI-X)",
+                                          GFP_KERNEL);
+                        opt.def = E1000E_INT_MODE_MSIX;
+                        opt.arg.r.max = E1000E_INT_MODE_MSIX;
+                } else {
+                        opt.err = kstrdup("defaulting to 1 (MSI)", GFP_KERNEL);
+                        opt.def = E1000E_INT_MODE_MSI;
+                        opt.arg.r.max = E1000E_INT_MODE_MSI;
+                }
+
+                if (!opt.err) {
+                        dev_err(&adapter->pdev->dev,
+                                "Failed to allocate memory\n");
+                        return;
+                }
+#endif
+
                 if (num_IntMode > bd) {
                         unsigned int int_mode = IntMode[bd];
                         e1000_validate_option(&int_mode, &opt, adapter);
@@ -401,6 +431,10 @@ void __devinit e1000e_check_options(struct e1000_adapter *adapter)
                 } else {
                         adapter->int_mode = opt.def;
                 }
+
+#ifdef CONFIG_PCI_MSI
+                kfree(opt.err);
+#endif
         }
         { /* Smart Power Down */
                 static const struct e1000_option opt = {
diff --git a/drivers/net/ethernet/intel/e1000e/phy.c b/drivers/net/ethernet/intel/e1000e/phy.c
index 8666476cb9be..6f44c3fb80b6 100644
--- a/drivers/net/ethernet/intel/e1000e/phy.c
+++ b/drivers/net/ethernet/intel/e1000e/phy.c
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel PRO/1000 Linux driver
-  Copyright(c) 1999 - 2011 Intel Corporation.
+  Copyright(c) 1999 - 2012 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
@@ -132,7 +132,7 @@ s32 e1000e_get_phy_id(struct e1000_hw *hw)
         u16 phy_id;
         u16 retry_count = 0;
 
-        if (!(phy->ops.read_reg))
+        if (!phy->ops.read_reg)
                 goto out;
 
         while (retry_count < 2) {
@@ -382,7 +382,7 @@ static s32 __e1000e_read_phy_reg_igp(struct e1000_hw *hw, u32 offset, u16 *data,
         s32 ret_val = 0;
 
         if (!locked) {
-                if (!(hw->phy.ops.acquire))
+                if (!hw->phy.ops.acquire)
                         goto out;
 
                 ret_val = hw->phy.ops.acquire(hw);
@@ -453,7 +453,7 @@ static s32 __e1000e_write_phy_reg_igp(struct e1000_hw *hw, u32 offset, u16 data,
         s32 ret_val = 0;
 
         if (!locked) {
-                if (!(hw->phy.ops.acquire))
+                if (!hw->phy.ops.acquire)
                         goto out;
 
                 ret_val = hw->phy.ops.acquire(hw);
@@ -526,7 +526,7 @@ static s32 __e1000_read_kmrn_reg(struct e1000_hw *hw, u32 offset, u16 *data,
         s32 ret_val = 0;
 
         if (!locked) {
-                if (!(hw->phy.ops.acquire))
+                if (!hw->phy.ops.acquire)
                         goto out;
 
                 ret_val = hw->phy.ops.acquire(hw);
@@ -599,7 +599,7 @@ static s32 __e1000_write_kmrn_reg(struct e1000_hw *hw, u32 offset, u16 data,
         s32 ret_val = 0;
 
         if (!locked) {
-                if (!(hw->phy.ops.acquire))
+                if (!hw->phy.ops.acquire)
                         goto out;
 
                 ret_val = hw->phy.ops.acquire(hw);
@@ -1136,13 +1136,12 @@ static s32 e1000_copper_link_autoneg(struct e1000_hw *hw)
         if (phy->autoneg_wait_to_complete) {
                 ret_val = e1000_wait_autoneg(hw);
                 if (ret_val) {
-                        e_dbg("Error while waiting for "
-                                 "autoneg to complete\n");
+                        e_dbg("Error while waiting for autoneg to complete\n");
                         return ret_val;
                 }
         }
 
-        hw->mac.get_link_status = 1;
+        hw->mac.get_link_status = true;
 
         return ret_val;
 }
diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c
index 94be6c32fa7d..fda824735e18 100644
--- a/drivers/net/ethernet/intel/igb/igb_main.c
+++ b/drivers/net/ethernet/intel/igb/igb_main.c
@@ -173,7 +173,9 @@ static int igb_check_vf_assignment(struct igb_adapter *adapter);
 #endif
 
 #ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
 static int igb_suspend(struct device *);
+#endif
 static int igb_resume(struct device *);
 #ifdef CONFIG_PM_RUNTIME
 static int igb_runtime_suspend(struct device *dev);
@@ -6710,6 +6712,7 @@ static int __igb_shutdown(struct pci_dev *pdev, bool *enable_wake,
 }
 
 #ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
 static int igb_suspend(struct device *dev)
 {
         int retval;
@@ -6729,6 +6732,7 @@ static int igb_suspend(struct device *dev)
 
         return 0;
 }
+#endif /* CONFIG_PM_SLEEP */
 
 static int igb_resume(struct device *dev)
 {
diff --git a/drivers/net/ethernet/intel/igbvf/ethtool.c b/drivers/net/ethernet/intel/igbvf/ethtool.c
index db7dce2351c2..8ce67064b9c5 100644
--- a/drivers/net/ethernet/intel/igbvf/ethtool.c
+++ b/drivers/net/ethernet/intel/igbvf/ethtool.c
@@ -343,10 +343,10 @@ static int igbvf_get_coalesce(struct net_device *netdev,
 {
         struct igbvf_adapter *adapter = netdev_priv(netdev);
 
-        if (adapter->itr_setting <= 3)
-                ec->rx_coalesce_usecs = adapter->itr_setting;
+        if (adapter->requested_itr <= 3)
+                ec->rx_coalesce_usecs = adapter->requested_itr;
         else
-                ec->rx_coalesce_usecs = adapter->itr_setting >> 2;
+                ec->rx_coalesce_usecs = adapter->current_itr >> 2;
 
         return 0;
 }
@@ -365,15 +365,16 @@ static int igbvf_set_coalesce(struct net_device *netdev,
 
         /* convert to rate of irq's per second */
         if (ec->rx_coalesce_usecs && ec->rx_coalesce_usecs <= 3) {
-                adapter->itr = IGBVF_START_ITR;
-                adapter->itr_setting = ec->rx_coalesce_usecs;
+                adapter->current_itr = IGBVF_START_ITR;
+                adapter->requested_itr = ec->rx_coalesce_usecs;
         } else {
-                adapter->itr = ec->rx_coalesce_usecs << 2;
-                adapter->itr_setting = adapter->itr;
+                adapter->current_itr = ec->rx_coalesce_usecs << 2;
+                adapter->requested_itr = 1000000000 /
+                                        (adapter->current_itr * 256);
         }
 
-        writel(adapter->itr,
-               hw->hw_addr + adapter->rx_ring[0].itr_register);
+        writel(adapter->current_itr,
+               hw->hw_addr + adapter->rx_ring->itr_register);
 
         return 0;
 }
diff --git a/drivers/net/ethernet/intel/igbvf/igbvf.h b/drivers/net/ethernet/intel/igbvf/igbvf.h
index 2c6d87e4d3d9..a895e2f7b34d 100644
--- a/drivers/net/ethernet/intel/igbvf/igbvf.h
+++ b/drivers/net/ethernet/intel/igbvf/igbvf.h
@@ -43,7 +43,18 @@ struct igbvf_info;
 struct igbvf_adapter;
 
 /* Interrupt defines */
-#define IGBVF_START_ITR                 648 /* ~6000 ints/sec */
+#define IGBVF_START_ITR                    488 /* ~8000 ints/sec */
+#define IGBVF_4K_ITR                       980
+#define IGBVF_20K_ITR                      196
+#define IGBVF_70K_ITR                       56
+
+enum latency_range {
+        lowest_latency = 0,
+        low_latency = 1,
+        bulk_latency = 2,
+        latency_invalid = 255
+};
+
 
 /* Interrupt modes, as used by the IntMode parameter */
 #define IGBVF_INT_MODE_LEGACY           0
@@ -155,6 +166,7 @@ struct igbvf_ring {
         char name[IFNAMSIZ + 5];
         u32 eims_value;
         u32 itr_val;
+        enum latency_range itr_range;
         u16 itr_register;
         int set_itr;
 
@@ -187,10 +199,8 @@ struct igbvf_adapter {
         unsigned long state;
 
         /* Interrupt Throttle Rate */
-        u32 itr;
-        u32 itr_setting;
-        u16 tx_itr;
-        u16 rx_itr;
+        u32 requested_itr; /* ints/sec or adaptive */
+        u32 current_itr; /* Actual ITR register value, not ints/sec */
 
         /*
          * Tx
@@ -299,13 +309,6 @@ enum igbvf_state_t {
         __IGBVF_DOWN
 };
 
-enum latency_range {
-        lowest_latency = 0,
-        low_latency = 1,
-        bulk_latency = 2,
-        latency_invalid = 255
-};
-
 extern char igbvf_driver_name[];
 extern const char igbvf_driver_version[];
 
diff --git a/drivers/net/ethernet/intel/igbvf/netdev.c b/drivers/net/ethernet/intel/igbvf/netdev.c
index 4e9141cfe81d..446297ff0104 100644
--- a/drivers/net/ethernet/intel/igbvf/netdev.c
+++ b/drivers/net/ethernet/intel/igbvf/netdev.c
@@ -632,14 +632,13 @@ void igbvf_free_rx_resources(struct igbvf_ring *rx_ring)
  *      traffic pattern.  Constants in this function were computed
  *      based on theoretical maximum wire speed and thresholds were set based
  *      on testing data as well as attempting to minimize response time
- *      while increasing bulk throughput.  This functionality is controlled
- *      by the InterruptThrottleRate module parameter.
+ *      while increasing bulk throughput.
  **/
-static unsigned int igbvf_update_itr(struct igbvf_adapter *adapter,
-                                     u16 itr_setting, int packets,
-                                     int bytes)
+static enum latency_range igbvf_update_itr(struct igbvf_adapter *adapter,
+                                           enum latency_range itr_setting,
+                                           int packets, int bytes)
 {
-        unsigned int retval = itr_setting;
+        enum latency_range retval = itr_setting;
 
         if (packets == 0)
                 goto update_itr_done;
@@ -675,65 +674,87 @@ static unsigned int igbvf_update_itr(struct igbvf_adapter *adapter,
                         retval = low_latency;
                 }
                 break;
+        default:
+                break;
         }
 
 update_itr_done:
         return retval;
 }
 
-static void igbvf_set_itr(struct igbvf_adapter *adapter)
+static int igbvf_range_to_itr(enum latency_range current_range)
 {
-        struct e1000_hw *hw = &adapter->hw;
-        u16 current_itr;
-        u32 new_itr = adapter->itr;
-
-        adapter->tx_itr = igbvf_update_itr(adapter, adapter->tx_itr,
-                                           adapter->total_tx_packets,
-                                           adapter->total_tx_bytes);
-        /* conservative mode (itr 3) eliminates the lowest_latency setting */
-        if (adapter->itr_setting == 3 && adapter->tx_itr == lowest_latency)
-                adapter->tx_itr = low_latency;
-
-        adapter->rx_itr = igbvf_update_itr(adapter, adapter->rx_itr,
-                                           adapter->total_rx_packets,
-                                           adapter->total_rx_bytes);
-        /* conservative mode (itr 3) eliminates the lowest_latency setting */
-        if (adapter->itr_setting == 3 && adapter->rx_itr == lowest_latency)
-                adapter->rx_itr = low_latency;
+        int new_itr;
 
-        current_itr = max(adapter->rx_itr, adapter->tx_itr);
-
-        switch (current_itr) {
+        switch (current_range) {
         /* counts and packets in update_itr are dependent on these numbers */
         case lowest_latency:
-                new_itr = 70000;
+                new_itr = IGBVF_70K_ITR;
                 break;
         case low_latency:
-                new_itr = 20000; /* aka hwitr = ~200 */
+                new_itr = IGBVF_20K_ITR;
                 break;
         case bulk_latency:
-                new_itr = 4000;
+                new_itr = IGBVF_4K_ITR;
                 break;
         default:
+                new_itr = IGBVF_START_ITR;
                 break;
         }
+        return new_itr;
+}
+
+static void igbvf_set_itr(struct igbvf_adapter *adapter)
+{
+        u32 new_itr;
+
+        adapter->tx_ring->itr_range =
+                        igbvf_update_itr(adapter,
+                                         adapter->tx_ring->itr_val,
+                                         adapter->total_tx_packets,
+                                         adapter->total_tx_bytes);
+
+        /* conservative mode (itr 3) eliminates the lowest_latency setting */
+        if (adapter->requested_itr == 3 &&
+            adapter->tx_ring->itr_range == lowest_latency)
+                adapter->tx_ring->itr_range = low_latency;
 
-        if (new_itr != adapter->itr) {
+        new_itr = igbvf_range_to_itr(adapter->tx_ring->itr_range);
+
+
+        if (new_itr != adapter->tx_ring->itr_val) {
+                u32 current_itr = adapter->tx_ring->itr_val;
                 /*
                  * this attempts to bias the interrupt rate towards Bulk
                  * by adding intermediate steps when interrupt rate is
                  * increasing
                  */
-                new_itr = new_itr > adapter->itr ?
-                             min(adapter->itr + (new_itr >> 2), new_itr) :
-                             new_itr;
-                adapter->itr = new_itr;
-                adapter->rx_ring->itr_val = 1952;
-
-                if (adapter->msix_entries)
-                        adapter->rx_ring->set_itr = 1;
-                else
-                        ew32(ITR, 1952);
+                new_itr = new_itr > current_itr ?
+                             min(current_itr + (new_itr >> 2), new_itr) :
+                             new_itr;
+                adapter->tx_ring->itr_val = new_itr;
+
+                adapter->tx_ring->set_itr = 1;
+        }
+
+        adapter->rx_ring->itr_range =
+                        igbvf_update_itr(adapter, adapter->rx_ring->itr_val,
+                                         adapter->total_rx_packets,
+                                         adapter->total_rx_bytes);
+        if (adapter->requested_itr == 3 &&
+            adapter->rx_ring->itr_range == lowest_latency)
+                adapter->rx_ring->itr_range = low_latency;
+
+        new_itr = igbvf_range_to_itr(adapter->rx_ring->itr_range);
+
+        if (new_itr != adapter->rx_ring->itr_val) {
+                u32 current_itr = adapter->rx_ring->itr_val;
+                new_itr = new_itr > current_itr ?
+                             min(current_itr + (new_itr >> 2), new_itr) :
+                             new_itr;
+                adapter->rx_ring->itr_val = new_itr;
+
+                adapter->rx_ring->set_itr = 1;
         }
 }
 
@@ -835,6 +856,11 @@ static irqreturn_t igbvf_intr_msix_tx(int irq, void *data)
         struct e1000_hw *hw = &adapter->hw;
         struct igbvf_ring *tx_ring = adapter->tx_ring;
 
+        if (tx_ring->set_itr) {
+                writel(tx_ring->itr_val,
+                       adapter->hw.hw_addr + tx_ring->itr_register);
+                adapter->tx_ring->set_itr = 0;
+        }
 
         adapter->total_tx_bytes = 0;
         adapter->total_tx_packets = 0;
@@ -937,19 +963,10 @@ static void igbvf_configure_msix(struct igbvf_adapter *adapter)
 
         igbvf_assign_vector(adapter, IGBVF_NO_QUEUE, 0, vector++);
         adapter->eims_enable_mask |= tx_ring->eims_value;
-        if (tx_ring->itr_val)
-                writel(tx_ring->itr_val,
-                       hw->hw_addr + tx_ring->itr_register);
-        else
-                writel(1952, hw->hw_addr + tx_ring->itr_register);
-
+        writel(tx_ring->itr_val, hw->hw_addr + tx_ring->itr_register);
         igbvf_assign_vector(adapter, 0, IGBVF_NO_QUEUE, vector++);
         adapter->eims_enable_mask |= rx_ring->eims_value;
-        if (rx_ring->itr_val)
-                writel(rx_ring->itr_val,
-                       hw->hw_addr + rx_ring->itr_register);
-        else
-                writel(1952, hw->hw_addr + rx_ring->itr_register);
+        writel(rx_ring->itr_val, hw->hw_addr + rx_ring->itr_register);
 
         /* set vector for other causes, i.e. link changes */
 
@@ -1027,7 +1044,7 @@ static int igbvf_request_msix(struct igbvf_adapter *adapter)
                 goto out;
 
         adapter->tx_ring->itr_register = E1000_EITR(vector);
-        adapter->tx_ring->itr_val = 1952;
+        adapter->tx_ring->itr_val = adapter->current_itr;
         vector++;
 
         err = request_irq(adapter->msix_entries[vector].vector,
@@ -1037,7 +1054,7 @@ static int igbvf_request_msix(struct igbvf_adapter *adapter)
                 goto out;
 
         adapter->rx_ring->itr_register = E1000_EITR(vector);
-        adapter->rx_ring->itr_val = 1952;
+        adapter->rx_ring->itr_val = adapter->current_itr;
         vector++;
 
         err = request_irq(adapter->msix_entries[vector].vector,
@@ -1151,7 +1168,7 @@ static int igbvf_poll(struct napi_struct *napi, int budget)
         if (work_done < budget) {
                 napi_complete(napi);
 
-                if (adapter->itr_setting & 3)
+                if (adapter->requested_itr & 3)
                         igbvf_set_itr(adapter);
 
                 if (!test_bit(__IGBVF_DOWN, &adapter->state))
@@ -1521,8 +1538,8 @@ static int __devinit igbvf_sw_init(struct igbvf_adapter *adapter)
         adapter->tx_abs_int_delay = 32;
         adapter->rx_int_delay = 0;
         adapter->rx_abs_int_delay = 8;
-        adapter->itr_setting = 3;
-        adapter->itr = 20000;
+        adapter->requested_itr = 3;
+        adapter->current_itr = IGBVF_START_ITR;
 
         /* Set various function pointers */
         adapter->ei->init_ops(&adapter->hw);
diff --git a/drivers/net/ethernet/intel/ixgb/ixgb_main.c b/drivers/net/ethernet/intel/ixgb/ixgb_main.c
index 9bd5faf64a85..002478801a1b 100644
--- a/drivers/net/ethernet/intel/ixgb/ixgb_main.c
+++ b/drivers/net/ethernet/intel/ixgb/ixgb_main.c
@@ -1136,10 +1136,8 @@ ixgb_set_multi(struct net_device *netdev)
                 u8 *mta = kmalloc(IXGB_MAX_NUM_MULTICAST_ADDRESSES *
                               ETH_ALEN, GFP_ATOMIC);
                 u8 *addr;
-                if (!mta) {
-                        pr_err("allocation of multicast memory failed\n");
+                if (!mta)
                         goto alloc_failed;
-                }
 
                 IXGB_WRITE_REG(hw, RCTL, rctl);
 
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
index 3dc6cef58107..6441acc34c23 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
@@ -131,6 +131,11 @@ MODULE_PARM_DESC(max_vfs,
                  "Maximum number of virtual functions to allocate per physical function");
 #endif /* CONFIG_PCI_IOV */
 
+static unsigned int allow_unsupported_sfp;
+module_param(allow_unsupported_sfp, uint, 0);
+MODULE_PARM_DESC(allow_unsupported_sfp,
+                 "Allow unsupported and untested SFP+ modules on 82599-based adapters");
+
 MODULE_AUTHOR("Intel Corporation, <linux.nics@intel.com>");
 MODULE_DESCRIPTION("Intel(R) 10 Gigabit PCI Express Network Driver");
 MODULE_LICENSE("GPL");
@@ -7493,6 +7498,9 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev,
                         e_crit(probe, "Fan has stopped, replace the adapter\n");
         }
 
+        if (allow_unsupported_sfp)
+                hw->allow_unsupported_sfp = allow_unsupported_sfp;
+
         /* reset_hw fills in the perm_addr as well */
         hw->phy.reset_if_overtemp = true;
         err = hw->mac.ops.reset_hw(hw);
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c
index b91773551a38..bf9f82f4b1ae 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c
@@ -834,6 +834,7 @@ out:
  **/
 s32 ixgbe_identify_sfp_module_generic(struct ixgbe_hw *hw)
 {
+        struct ixgbe_adapter *adapter = hw->back;
         s32 status = IXGBE_ERR_PHY_ADDR_INVALID;
         u32 vendor_oui = 0;
         enum ixgbe_sfp_type stored_sfp_type = hw->phy.sfp_type;
@@ -1068,9 +1069,16 @@ s32 ixgbe_identify_sfp_module_generic(struct ixgbe_hw *hw)
                         if (hw->phy.type == ixgbe_phy_sfp_intel) {
                                 status = 0;
                         } else {
-                                hw_dbg(hw, "SFP+ module not supported\n");
-                                hw->phy.type = ixgbe_phy_sfp_unsupported;
-                                status = IXGBE_ERR_SFP_NOT_SUPPORTED;
+                                if (hw->allow_unsupported_sfp) {
+                                        e_warn(drv, "WARNING: Intel (R) Network Connections are quality tested using Intel (R) Ethernet Optics.  Using untested modules is not supported and may cause unstable operation or damage to the module or the adapter.  Intel Corporation is not responsible for any harm caused by using untested modules.");
+                                        status = 0;
+                                } else {
+                                        hw_dbg(hw,
+                                               "SFP+ module not supported\n");
+                                        hw->phy.type =
+                                                ixgbe_phy_sfp_unsupported;
+                                        status = IXGBE_ERR_SFP_NOT_SUPPORTED;
+                                }
                         }
                 } else {
                         status = 0;
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h b/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h
index 9b95bef60970..4c060292395f 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h
@@ -2892,6 +2892,7 @@ struct ixgbe_hw {
         u8                              revision_id;
         bool                            adapter_stopped;
         bool                            force_full_reset;
+        bool                            allow_unsupported_sfp;
 };
 
 struct ixgbe_info {
diff --git a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
index e51d552410ae..58c04b69ce70 100644
--- a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
+++ b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
@@ -2521,12 +2521,8 @@ int ixgbevf_setup_rx_resources(struct ixgbevf_adapter *adapter,
 
         size = sizeof(struct ixgbevf_rx_buffer) * rx_ring->count;
         rx_ring->rx_buffer_info = vzalloc(size);
-        if (!rx_ring->rx_buffer_info) {
-                hw_dbg(&adapter->hw,
-                       "Unable to vmalloc buffer memory for "
-                       "the receive descriptor ring\n");
+        if (!rx_ring->rx_buffer_info)
                 goto alloc_failed;
-        }
 
         /* Round up to nearest 4K */
         rx_ring->size = rx_ring->count * sizeof(union ixgbe_adv_rx_desc);
diff --git a/drivers/net/ethernet/jme.c b/drivers/net/ethernet/jme.c
index 27d651a80f3f..1b86d0b45f3c 100644
--- a/drivers/net/ethernet/jme.c
+++ b/drivers/net/ethernet/jme.c
@@ -2999,7 +2999,6 @@ jme_init_one(struct pci_dev *pdev,
          */
         netdev = alloc_etherdev(sizeof(*jme));
         if (!netdev) {
-                pr_err("Cannot allocate netdev structure\n");
                 rc = -ENOMEM;
                 goto err_out_release_regions;
         }
diff --git a/drivers/net/ethernet/korina.c b/drivers/net/ethernet/korina.c
index 6ad094f176f8..f30db1c46600 100644
--- a/drivers/net/ethernet/korina.c
+++ b/drivers/net/ethernet/korina.c
@@ -1108,10 +1108,9 @@ static int korina_probe(struct platform_device *pdev)
         int rc;
 
         dev = alloc_etherdev(sizeof(struct korina_private));
-        if (!dev) {
-                printk(KERN_ERR DRV_NAME ": alloc_etherdev failed\n");
+        if (!dev)
                 return -ENOMEM;
-        }
+
         SET_NETDEV_DEV(dev, &pdev->dev);
         lp = netdev_priv(dev);
 
@@ -1150,7 +1149,6 @@ static int korina_probe(struct platform_device *pdev)
 
         lp->td_ring = kmalloc(TD_RING_SIZE + RD_RING_SIZE, GFP_KERNEL);
         if (!lp->td_ring) {
-                printk(KERN_ERR DRV_NAME ": cannot allocate descriptors\n");
                 rc = -ENXIO;
                 goto probe_err_td_ring;
         }
diff --git a/drivers/net/ethernet/lantiq_etop.c b/drivers/net/ethernet/lantiq_etop.c
index 85e2c6cd9708..3369b7db777d 100644
--- a/drivers/net/ethernet/lantiq_etop.c
+++ b/drivers/net/ethernet/lantiq_etop.c
@@ -114,7 +114,7 @@ struct ltq_etop_priv {
 static int
 ltq_etop_alloc_skb(struct ltq_etop_chan *ch)
 {
-        ch->skb[ch->dma.desc] = dev_alloc_skb(MAX_DMA_DATA_LEN);
+        ch->skb[ch->dma.desc] = netdev_alloc_skb(ch->netdev, MAX_DMA_DATA_LEN);
         if (!ch->skb[ch->dma.desc])
                 return -ENOMEM;
         ch->dma.desc_base[ch->dma.desc].addr = dma_map_single(NULL,
@@ -731,6 +731,10 @@ ltq_etop_probe(struct platform_device *pdev)
         }
 
         dev = alloc_etherdev_mq(sizeof(struct ltq_etop_priv), 4);
+        if (!dev) {
+                err = -ENOMEM;
+                goto err_out;
+        }
         strcpy(dev->name, "eth%d");
         dev->netdev_ops = &ltq_eth_netdev_ops;
         dev->ethtool_ops = &ltq_etop_ethtool_ops;
diff --git a/drivers/net/ethernet/marvell/mv643xx_eth.c b/drivers/net/ethernet/marvell/mv643xx_eth.c
index 9edecfa1f0f4..f702d0dc18c7 100644
--- a/drivers/net/ethernet/marvell/mv643xx_eth.c
+++ b/drivers/net/ethernet/marvell/mv643xx_eth.c
@@ -667,7 +667,7 @@ static int rxq_refill(struct rx_queue *rxq, int budget)
 
                 skb = __skb_dequeue(&mp->rx_recycle);
                 if (skb == NULL)
-                        skb = dev_alloc_skb(mp->skb_size);
+                        skb = netdev_alloc_skb(mp->dev, mp->skb_size);
 
                 if (skb == NULL) {
                         mp->oom = 1;
diff --git a/drivers/net/ethernet/marvell/pxa168_eth.c b/drivers/net/ethernet/marvell/pxa168_eth.c
index 953ba5851f7b..75df2091bd2e 100644
--- a/drivers/net/ethernet/marvell/pxa168_eth.c
+++ b/drivers/net/ethernet/marvell/pxa168_eth.c
@@ -350,7 +350,7 @@ static void rxq_refill(struct net_device *dev)
         while (pep->rx_desc_count < pep->rx_ring_size) {
                 int size;
 
-                skb = dev_alloc_skb(pep->skb_size);
+                skb = netdev_alloc_skb(dev, pep->skb_size);
                 if (!skb)
                         break;
                 if (SKB_DMA_REALIGN)
@@ -1017,10 +1017,9 @@ static int rxq_init(struct net_device *dev)
         /* Allocate RX skb rings */
         pep->rx_skb = kmalloc(sizeof(*pep->rx_skb) * pep->rx_ring_size,
                              GFP_KERNEL);
-        if (!pep->rx_skb) {
-                printk(KERN_ERR "%s: Cannot alloc RX skb ring\n", dev->name);
+        if (!pep->rx_skb)
                 return -ENOMEM;
-        }
+
         /* Allocate RX ring */
         pep->rx_desc_count = 0;
         size = pep->rx_ring_size * sizeof(struct rx_desc);
@@ -1081,10 +1080,9 @@ static int txq_init(struct net_device *dev)
 
         pep->tx_skb = kmalloc(sizeof(*pep->tx_skb) * pep->tx_ring_size,
                              GFP_KERNEL);
-        if (!pep->tx_skb) {
-                printk(KERN_ERR "%s: Cannot alloc TX skb ring\n", dev->name);
+        if (!pep->tx_skb)
                 return -ENOMEM;
-        }
+
         /* Allocate TX ring */
         pep->tx_desc_count = 0;
         size = pep->tx_ring_size * sizeof(struct tx_desc);
diff --git a/drivers/net/ethernet/marvell/skge.c b/drivers/net/ethernet/marvell/skge.c
index 33947ac595c0..5a30bf823099 100644
--- a/drivers/net/ethernet/marvell/skge.c
+++ b/drivers/net/ethernet/marvell/skge.c
@@ -3807,10 +3807,8 @@ static struct net_device *skge_devinit(struct skge_hw *hw, int port,
         struct skge_port *skge;
         struct net_device *dev = alloc_etherdev(sizeof(*skge));
 
-        if (!dev) {
-                dev_err(&hw->pdev->dev, "etherdev alloc failed\n");
+        if (!dev)
                 return NULL;
-        }
 
         SET_NETDEV_DEV(dev, &hw->pdev->dev);
         dev->netdev_ops = &skge_netdev_ops;
diff --git a/drivers/net/ethernet/marvell/sky2.c b/drivers/net/ethernet/marvell/sky2.c
index 760c2b17dfd3..82c2c86a1951 100644
--- a/drivers/net/ethernet/marvell/sky2.c
+++ b/drivers/net/ethernet/marvell/sky2.c
@@ -4700,10 +4700,8 @@ static __devinit struct net_device *sky2_init_netdev(struct sky2_hw *hw,
         struct sky2_port *sky2;
         struct net_device *dev = alloc_etherdev(sizeof(*sky2));
 
-        if (!dev) {
-                dev_err(&hw->pdev->dev, "etherdev alloc failed\n");
+        if (!dev)
                 return NULL;
-        }
 
         SET_NETDEV_DEV(dev, &hw->pdev->dev);
         dev->irq = hw->pdev->irq;
diff --git a/drivers/net/ethernet/mellanox/mlx4/cmd.c b/drivers/net/ethernet/mellanox/mlx4/cmd.c
index eaf09d4f02d0..48d5c48d7ce8 100644
--- a/drivers/net/ethernet/mellanox/mlx4/cmd.c
+++ b/drivers/net/ethernet/mellanox/mlx4/cmd.c
@@ -1314,7 +1314,7 @@ static void mlx4_master_do_cmd(struct mlx4_dev *dev, int slave, u8 cmd,
                 down(&priv->cmd.slave_sem);
                 if (mlx4_master_process_vhcr(dev, slave, NULL)) {
                         mlx4_err(dev, "Failed processing vhcr for slave:%d,"
-                                 " reseting slave.\n", slave);
+                                 " resetting slave.\n", slave);
                         up(&priv->cmd.slave_sem);
                         goto reset_slave;
                 }
diff --git a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
index 149e60da0a32..9fe4f94c6da7 100644
--- a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
@@ -1048,10 +1048,8 @@ int mlx4_en_init_netdev(struct mlx4_en_dev *mdev, int port,
 
         dev = alloc_etherdev_mqs(sizeof(struct mlx4_en_priv),
             prof->tx_ring_num, prof->rx_ring_num);
-        if (dev == NULL) {
-                mlx4_err(mdev, "Net device allocation failed\n");
+        if (dev == NULL)
                 return -ENOMEM;
-        }
 
         SET_NETDEV_DEV(dev, &mdev->dev->pdev->dev);
         dev->dev_id =  port - 1;
diff --git a/drivers/net/ethernet/mellanox/mlx4/en_rx.c b/drivers/net/ethernet/mellanox/mlx4/en_rx.c
index d4ad8c226b51..d703ef2c9c91 100644
--- a/drivers/net/ethernet/mellanox/mlx4/en_rx.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_rx.c
@@ -285,10 +285,9 @@ int mlx4_en_create_rx_ring(struct mlx4_en_priv *priv,
         tmp = size * roundup_pow_of_two(MLX4_EN_MAX_RX_FRAGS *
                                         sizeof(struct skb_frag_struct));
         ring->rx_info = vmalloc(tmp);
-        if (!ring->rx_info) {
-                en_err(priv, "Failed allocating rx_info ring\n");
+        if (!ring->rx_info)
                 return -ENOMEM;
-        }
+
         en_dbg(DRV, priv, "Allocated rx_info ring at addr:%p size:%d\n",
                  ring->rx_info, tmp);
 
@@ -468,12 +467,11 @@ static struct sk_buff *mlx4_en_rx_skb(struct mlx4_en_priv *priv,
         int used_frags;
         dma_addr_t dma;
 
-        skb = dev_alloc_skb(SMALL_PACKET_SIZE + NET_IP_ALIGN);
+        skb = netdev_alloc_skb(priv->dev, SMALL_PACKET_SIZE + NET_IP_ALIGN);
         if (!skb) {
                 en_dbg(RX_ERR, priv, "Failed allocating skb\n");
                 return NULL;
         }
-        skb->dev = priv->dev;
         skb_reserve(skb, NET_IP_ALIGN);
         skb->len = length;
 
diff --git a/drivers/net/ethernet/mellanox/mlx4/en_tx.c b/drivers/net/ethernet/mellanox/mlx4/en_tx.c
index 9ef9038d0629..ff3250586584 100644
--- a/drivers/net/ethernet/mellanox/mlx4/en_tx.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_tx.c
@@ -71,16 +71,14 @@ int mlx4_en_create_tx_ring(struct mlx4_en_priv *priv,
 
         tmp = size * sizeof(struct mlx4_en_tx_info);
         ring->tx_info = vmalloc(tmp);
-        if (!ring->tx_info) {
-                en_err(priv, "Failed allocating tx_info ring\n");
+        if (!ring->tx_info)
                 return -ENOMEM;
-        }
+
         en_dbg(DRV, priv, "Allocated tx_info ring at addr:%p size:%d\n",
                  ring->tx_info, tmp);
 
         ring->bounce_buf = kmalloc(MAX_DESC_SIZE, GFP_KERNEL);
         if (!ring->bounce_buf) {
-                en_err(priv, "Failed allocating bounce buffer\n");
                 err = -ENOMEM;
                 goto err_tx;
         }
diff --git a/drivers/net/ethernet/micrel/ks8695net.c b/drivers/net/ethernet/micrel/ks8695net.c
index ab81c0dc96e2..dccae1d1743a 100644
--- a/drivers/net/ethernet/micrel/ks8695net.c
+++ b/drivers/net/ethernet/micrel/ks8695net.c
@@ -278,7 +278,8 @@ ks8695_refill_rxbuffers(struct ks8695_priv *ksp)
 
         for (buff_n = 0; buff_n < MAX_RX_DESC; ++buff_n) {
                 if (!ksp->rx_buffers[buff_n].skb) {
-                        struct sk_buff *skb = dev_alloc_skb(MAX_RXBUF_SIZE);
+                        struct sk_buff *skb =
+                                netdev_alloc_skb(ksp->ndev, MAX_RXBUF_SIZE);
                         dma_addr_t mapping;
 
                         ksp->rx_buffers[buff_n].skb = skb;
@@ -299,7 +300,6 @@ ks8695_refill_rxbuffers(struct ks8695_priv *ksp)
                                 break;
                         }
                         ksp->rx_buffers[buff_n].dma_ptr = mapping;
-                        skb->dev = ksp->ndev;
                         ksp->rx_buffers[buff_n].length = MAX_RXBUF_SIZE;
 
                         /* Record this into the DMA ring */
@@ -1362,10 +1362,8 @@ ks8695_probe(struct platform_device *pdev)
 
         /* Initialise a net_device */
         ndev = alloc_etherdev(sizeof(struct ks8695_priv));
-        if (!ndev) {
-                dev_err(&pdev->dev, "could not allocate device.\n");
+        if (!ndev)
                 return -ENOMEM;
-        }
 
         SET_NETDEV_DEV(ndev, &pdev->dev);
 
diff --git a/drivers/net/ethernet/micrel/ks8851.c b/drivers/net/ethernet/micrel/ks8851.c
index 6b35e7da9a9c..4b551feae4c5 100644
--- a/drivers/net/ethernet/micrel/ks8851.c
+++ b/drivers/net/ethernet/micrel/ks8851.c
@@ -1,4 +1,4 @@
-/* drivers/net/ks8851.c
+/* drivers/net/ethernet/micrel/ks8851.c
  *
  * Copyright 2009 Simtec Electronics
  *      http://www.simtec.co.uk/
@@ -1419,10 +1419,8 @@ static int __devinit ks8851_probe(struct spi_device *spi)
         int ret;
 
         ndev = alloc_etherdev(sizeof(struct ks8851_net));
-        if (!ndev) {
-                dev_err(&spi->dev, "failed to alloc ethernet device\n");
+        if (!ndev)
                 return -ENOMEM;
-        }
 
         spi->bits_per_word = 8;
 
diff --git a/drivers/net/ethernet/micrel/ks8851.h b/drivers/net/ethernet/micrel/ks8851.h
index b0fae86aacad..852256ef1f22 100644
--- a/drivers/net/ethernet/micrel/ks8851.h
+++ b/drivers/net/ethernet/micrel/ks8851.h
@@ -1,4 +1,4 @@
-/* drivers/net/ks8851.h
+/* drivers/net/ethernet/micrel/ks8851.h
  *
  * Copyright 2009 Simtec Electronics
  *      Ben Dooks <ben@simtec.co.uk>
diff --git a/drivers/net/ethernet/micrel/ks8851_mll.c b/drivers/net/ethernet/micrel/ks8851_mll.c
index e58e78e5c930..61a2f61a31f6 100644
--- a/drivers/net/ethernet/micrel/ks8851_mll.c
+++ b/drivers/net/ethernet/micrel/ks8851_mll.c
@@ -1,5 +1,5 @@
 /**
- * drivers/net/ks8851_mll.c
+ * drivers/net/ethernet/micrel/ks8851_mll.c
  * Copyright (c) 2009 Micrel Inc.
  *
  * This program is free software; you can redistribute it and/or modify
@@ -796,7 +796,7 @@ static void ks_rcv(struct ks_net *ks, struct net_device *netdev)
 
         frame_hdr = ks->frame_head_info;
         while (ks->frame_cnt--) {
-                skb = dev_alloc_skb(frame_hdr->len + 16);
+                skb = netdev_alloc_skb(netdev, frame_hdr->len + 16);
                 if (likely(skb && (frame_hdr->sts & RXFSHR_RXFV) &&
                         (frame_hdr->len < RX_BUF_SIZE) && frame_hdr->len)) {
                         skb_reserve(skb, 2);
@@ -1501,10 +1501,8 @@ static int ks_hw_init(struct ks_net *ks)
         ks->mcast_lst_size = 0;
 
         ks->frame_head_info = kmalloc(MHEADER_SIZE, GFP_KERNEL);
-        if (!ks->frame_head_info) {
-                pr_err("Error: Fail to allocate frame memory\n");
+        if (!ks->frame_head_info)
                 return false;
-        }
 
         ks_set_mac(ks, KS_DEFAULT_MAC_ADDRESS);
         return true;
diff --git a/drivers/net/ethernet/micrel/ksz884x.c b/drivers/net/ethernet/micrel/ksz884x.c
index e52cd310ae76..ef723b185d85 100644
--- a/drivers/net/ethernet/micrel/ksz884x.c
+++ b/drivers/net/ethernet/micrel/ksz884x.c
@@ -1,5 +1,5 @@
 /**
- * drivers/net/ksx884x.c - Micrel KSZ8841/2 PCI Ethernet driver
+ * drivers/net/ethernet/micrel/ksx884x.c - Micrel KSZ8841/2 PCI Ethernet driver
  *
  * Copyright (c) 2009-2010 Micrel, Inc.
  *      Tristram Ha <Tristram.Ha@micrel.com>
@@ -4863,7 +4863,7 @@ static netdev_tx_t netdev_tx(struct sk_buff *skb, struct net_device *dev)
                                 memset(&skb->data[skb->len], 0, 50 - skb->len);
                                 skb->len = 50;
                         } else {
-                                skb = dev_alloc_skb(50);
+                                skb = netdev_alloc_skb(dev, 50);
                                 if (!skb)
                                         return NETDEV_TX_BUSY;
                                 memcpy(skb->data, org_skb->data, org_skb->len);
@@ -4885,7 +4885,7 @@ static netdev_tx_t netdev_tx(struct sk_buff *skb, struct net_device *dev)
                                 (ETH_P_IPV6 == htons(skb->protocol)))) {
                         struct sk_buff *org_skb = skb;
 
-                        skb = dev_alloc_skb(org_skb->len);
+                        skb = netdev_alloc_skb(dev, org_skb->len);
                         if (!skb) {
                                 rc = NETDEV_TX_BUSY;
                                 goto unlock;
@@ -5019,7 +5019,7 @@ static inline int rx_proc(struct net_device *dev, struct ksz_hw* hw,
 
         do {
                 /* skb->data != skb->head */
-                skb = dev_alloc_skb(packet_len + 2);
+                skb = netdev_alloc_skb(dev, packet_len + 2);
                 if (!skb) {
                         dev->stats.rx_dropped++;
                         return -ENOMEM;
diff --git a/drivers/net/ethernet/microchip/enc28j60.c b/drivers/net/ethernet/microchip/enc28j60.c
index 50055e0282ed..1d6b7ce3e1ee 100644
--- a/drivers/net/ethernet/microchip/enc28j60.c
+++ b/drivers/net/ethernet/microchip/enc28j60.c
@@ -954,14 +954,13 @@ static void enc28j60_hw_rx(struct net_device *ndev)
                 if (len > MAX_FRAMELEN)
                         ndev->stats.rx_over_errors++;
         } else {
-                skb = dev_alloc_skb(len + NET_IP_ALIGN);
+                skb = netdev_alloc_skb(ndev, len + NET_IP_ALIGN);
                 if (!skb) {
                         if (netif_msg_rx_err(priv))
                                 dev_err(&ndev->dev,
                                         "out of memory for Rx'd frame\n");
                         ndev->stats.rx_dropped++;
                 } else {
-                        skb->dev = ndev;
                         skb_reserve(skb, NET_IP_ALIGN);
                         /* copy the packet from the receive buffer */
                         enc28j60_mem_read(priv,
@@ -1553,9 +1552,6 @@ static int __devinit enc28j60_probe(struct spi_device *spi)
 
         dev = alloc_etherdev(sizeof(struct enc28j60_net));
         if (!dev) {
-                if (netif_msg_drv(&debug))
-                        dev_err(&spi->dev, DRV_NAME
-                                ": unable to alloc new ethernet\n");
                 ret = -ENOMEM;
                 goto error_alloc;
         }
diff --git a/drivers/net/ethernet/mipsnet.c b/drivers/net/ethernet/mipsnet.c
index d05b0c9e1e9c..dbc666a3d523 100644
--- a/drivers/net/ethernet/mipsnet.c
+++ b/drivers/net/ethernet/mipsnet.c
@@ -152,7 +152,7 @@ static inline ssize_t mipsnet_get_fromdev(struct net_device *dev, size_t len)
         if (!len)
                 return len;
 
-        skb = dev_alloc_skb(len + NET_IP_ALIGN);
+        skb = netdev_alloc_skb(dev, len + NET_IP_ALIGN);
         if (!skb) {
                 dev->stats.rx_dropped++;
                 return -ENOMEM;
diff --git a/drivers/net/ethernet/myricom/myri10ge/myri10ge.c b/drivers/net/ethernet/myricom/myri10ge/myri10ge.c
index 20b72ecb020a..27273ae1a6e6 100644
--- a/drivers/net/ethernet/myricom/myri10ge/myri10ge.c
+++ b/drivers/net/ethernet/myricom/myri10ge/myri10ge.c
@@ -3910,10 +3910,8 @@ static int myri10ge_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
         static int board_number;
 
         netdev = alloc_etherdev_mq(sizeof(*mgp), MYRI10GE_MAX_SLICES);
-        if (netdev == NULL) {
-                dev_err(dev, "Could not allocate ethernet device\n");
+        if (netdev == NULL)
                 return -ENOMEM;
-        }
 
         SET_NETDEV_DEV(netdev, &pdev->dev);
 
diff --git a/drivers/net/ethernet/natsemi/ibmlana.c b/drivers/net/ethernet/natsemi/ibmlana.c
index 999407f7ebdf..3f94ddbf4dc0 100644
--- a/drivers/net/ethernet/natsemi/ibmlana.c
+++ b/drivers/net/ethernet/natsemi/ibmlana.c
@@ -589,7 +589,7 @@ static void irqrx_handler(struct net_device *dev)
 
                         /* fetch buffer */
 
-                        skb = dev_alloc_skb(rda.length + 2);
+                        skb = netdev_alloc_skb(dev, rda.length + 2);
                         if (skb == NULL)
                                 dev->stats.rx_dropped++;
                         else {
diff --git a/drivers/net/ethernet/natsemi/natsemi.c b/drivers/net/ethernet/natsemi/natsemi.c
index ac7b16b6e7af..d38e48d4f430 100644
--- a/drivers/net/ethernet/natsemi/natsemi.c
+++ b/drivers/net/ethernet/natsemi/natsemi.c
@@ -1934,11 +1934,10 @@ static void refill_rx(struct net_device *dev)
                 int entry = np->dirty_rx % RX_RING_SIZE;
                 if (np->rx_skbuff[entry] == NULL) {
                         unsigned int buflen = np->rx_buf_sz+NATSEMI_PADDING;
-                        skb = dev_alloc_skb(buflen);
+                        skb = netdev_alloc_skb(dev, buflen);
                         np->rx_skbuff[entry] = skb;
                         if (skb == NULL)
                                 break; /* Better luck next round. */
-                        skb->dev = dev; /* Mark as being used by this device. */
                         np->rx_dma[entry] = pci_map_single(np->pci_dev,
                                 skb->data, buflen, PCI_DMA_FROMDEVICE);
                         np->rx_ring[entry].addr = cpu_to_le32(np->rx_dma[entry]);
@@ -2344,7 +2343,7 @@ static void netdev_rx(struct net_device *dev, int *work_done, int work_to_do)
                         /* Check if the packet is long enough to accept
                          * without copying to a minimally-sized skbuff. */
                         if (pkt_len < rx_copybreak &&
-                            (skb = dev_alloc_skb(pkt_len + RX_OFFSET)) != NULL) {
+                            (skb = netdev_alloc_skb(dev, pkt_len + RX_OFFSET)) != NULL) {
                                 /* 16 byte align the IP header */
                                 skb_reserve(skb, RX_OFFSET);
                                 pci_dma_sync_single_for_cpu(np->pci_dev,
diff --git a/drivers/net/ethernet/natsemi/sonic.c b/drivers/net/ethernet/natsemi/sonic.c
index 26e25d7f5829..46795e403467 100644
--- a/drivers/net/ethernet/natsemi/sonic.c
+++ b/drivers/net/ethernet/natsemi/sonic.c
@@ -51,7 +51,7 @@ static int sonic_open(struct net_device *dev)
                 printk("sonic_open: initializing sonic driver.\n");
 
         for (i = 0; i < SONIC_NUM_RRS; i++) {
-                struct sk_buff *skb = dev_alloc_skb(SONIC_RBSIZE + 2);
+                struct sk_buff *skb = netdev_alloc_skb(dev, SONIC_RBSIZE + 2);
                 if (skb == NULL) {
                         while(i > 0) { /* free any that were allocated successfully */
                                 i--;
@@ -422,7 +422,7 @@ static void sonic_rx(struct net_device *dev)
                 status = sonic_rda_get(dev, entry, SONIC_RD_STATUS);
                 if (status & SONIC_RCR_PRX) {
                         /* Malloc up new buffer. */
-                        new_skb = dev_alloc_skb(SONIC_RBSIZE + 2);
+                        new_skb = netdev_alloc_skb(dev, SONIC_RBSIZE + 2);
                         if (new_skb == NULL) {
                                 printk(KERN_ERR "%s: Memory squeeze, dropping packet.\n", dev->name);
                                 lp->stats.rx_dropped++;
diff --git a/drivers/net/ethernet/neterion/s2io.c b/drivers/net/ethernet/neterion/s2io.c
index 97f63e12d86e..44a6065794c3 100644
--- a/drivers/net/ethernet/neterion/s2io.c
+++ b/drivers/net/ethernet/neterion/s2io.c
@@ -2524,7 +2524,7 @@ static int fill_rx_buffers(struct s2io_nic *nic, struct ring_info *ring,
                         size = ring->mtu + ALIGN_SIZE + BUF0_LEN + 4;
 
                 /* allocate skb */
-                skb = dev_alloc_skb(size);
+                skb = netdev_alloc_skb(nic->dev, size);
                 if (!skb) {
                         DBG_PRINT(INFO_DBG, "%s: Could not allocate skb\n",
                                   ring->dev->name);
@@ -6820,7 +6820,7 @@ static int set_rxd_buffer_pointer(struct s2io_nic *sp, struct RxD_t *rxdp,
                          */
                         rxdp1->Buffer0_ptr = *temp0;
                 } else {
-                        *skb = dev_alloc_skb(size);
+                        *skb = netdev_alloc_skb(dev, size);
                         if (!(*skb)) {
                                 DBG_PRINT(INFO_DBG,
                                           "%s: Out of memory to allocate %s\n",
@@ -6849,7 +6849,7 @@ static int set_rxd_buffer_pointer(struct s2io_nic *sp, struct RxD_t *rxdp,
                         rxdp3->Buffer0_ptr = *temp0;
                         rxdp3->Buffer1_ptr = *temp1;
                 } else {
-                        *skb = dev_alloc_skb(size);
+                        *skb = netdev_alloc_skb(dev, size);
                         if (!(*skb)) {
                                 DBG_PRINT(INFO_DBG,
                                           "%s: Out of memory to allocate %s\n",
@@ -7760,7 +7760,6 @@ s2io_init_nic(struct pci_dev *pdev, const struct pci_device_id *pre)
         else
                 dev = alloc_etherdev(sizeof(struct s2io_nic));
         if (dev == NULL) {
-                DBG_PRINT(ERR_DBG, "Device allocation failed\n");
                 pci_disable_device(pdev);
                 pci_release_regions(pdev);
                 return -ENODEV;
diff --git a/drivers/net/ethernet/netx-eth.c b/drivers/net/ethernet/netx-eth.c
index 8d288af16fc9..9d11ab7521bc 100644
--- a/drivers/net/ethernet/netx-eth.c
+++ b/drivers/net/ethernet/netx-eth.c
@@ -1,5 +1,5 @@
 /*
- * drivers/net/netx-eth.c
+ * drivers/net/ethernet/netx-eth.c
  *
  * Copyright (c) 2005 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix
  *
@@ -150,7 +150,7 @@ static void netx_eth_receive(struct net_device *ndev)
         seg = (val & FIFO_PTR_SEGMENT_MASK) >> FIFO_PTR_SEGMENT_SHIFT;
         len = (val & FIFO_PTR_FRAMELEN_MASK) >> FIFO_PTR_FRAMELEN_SHIFT;
 
-        skb = dev_alloc_skb(len);
+        skb = netdev_alloc_skb(ndev, len);
         if (unlikely(skb == NULL)) {
                 printk(KERN_NOTICE "%s: Low memory, packet dropped.\n",
                         ndev->name);
@@ -383,7 +383,6 @@ static int netx_eth_drv_probe(struct platform_device *pdev)
 
         ndev = alloc_etherdev(sizeof (struct netx_eth_priv));
         if (!ndev) {
-                printk("%s: could not allocate device.\n", CARDNAME);
                 ret = -ENOMEM;
                 goto exit;
         }
diff --git a/drivers/net/ethernet/nuvoton/w90p910_ether.c b/drivers/net/ethernet/nuvoton/w90p910_ether.c
index b75a0497d58d..6893a65ae55f 100644
--- a/drivers/net/ethernet/nuvoton/w90p910_ether.c
+++ b/drivers/net/ethernet/nuvoton/w90p910_ether.c
@@ -735,7 +735,7 @@ static void netdev_rx(struct net_device *dev)
 
                 if (status & RXDS_RXGD) {
                         data = ether->rdesc->recv_buf[ether->cur_rx];
-                        skb = dev_alloc_skb(length+2);
+                        skb = netdev_alloc_skb(dev, length + 2);
                         if (!skb) {
                                 dev_err(&pdev->dev, "get skb buffer error\n");
                                 ether->stats.rx_dropped++;
diff --git a/drivers/net/ethernet/nvidia/forcedeth.c b/drivers/net/ethernet/nvidia/forcedeth.c
index 4c4e7f458383..5eeb92f87380 100644
--- a/drivers/net/ethernet/nvidia/forcedeth.c
+++ b/drivers/net/ethernet/nvidia/forcedeth.c
@@ -1815,7 +1815,7 @@ static int nv_alloc_rx(struct net_device *dev)
                 less_rx = np->last_rx.orig;
 
         while (np->put_rx.orig != less_rx) {
-                struct sk_buff *skb = dev_alloc_skb(np->rx_buf_sz + NV_RX_ALLOC_PAD);
+                struct sk_buff *skb = netdev_alloc_skb(dev, np->rx_buf_sz + NV_RX_ALLOC_PAD);
                 if (skb) {
                         np->put_rx_ctx->skb = skb;
                         np->put_rx_ctx->dma = pci_map_single(np->pci_dev,
@@ -1850,7 +1850,7 @@ static int nv_alloc_rx_optimized(struct net_device *dev)
                 less_rx = np->last_rx.ex;
 
         while (np->put_rx.ex != less_rx) {
-                struct sk_buff *skb = dev_alloc_skb(np->rx_buf_sz + NV_RX_ALLOC_PAD);
+                struct sk_buff *skb = netdev_alloc_skb(dev, np->rx_buf_sz + NV_RX_ALLOC_PAD);
                 if (skb) {
                         np->put_rx_ctx->skb = skb;
                         np->put_rx_ctx->dma = pci_map_single(np->pci_dev,
@@ -4993,9 +4993,9 @@ static int nv_loopback_test(struct net_device *dev)
 
         /* setup packet for tx */
         pkt_len = ETH_DATA_LEN;
-        tx_skb = dev_alloc_skb(pkt_len);
+        tx_skb = netdev_alloc_skb(dev, pkt_len);
         if (!tx_skb) {
-                netdev_err(dev, "dev_alloc_skb() failed during loopback test\n");
+                netdev_err(dev, "netdev_alloc_skb() failed during loopback test\n");
                 ret = 0;
                 goto out;
         }
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 3ead111111e1..bdbec7e04a4c 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
@@ -1587,10 +1587,8 @@ int pch_gbe_setup_tx_resources(struct pch_gbe_adapter *adapter,
 
         size = (int)sizeof(struct pch_gbe_buffer) * tx_ring->count;
         tx_ring->buffer_info = vzalloc(size);
-        if (!tx_ring->buffer_info) {
-                pr_err("Unable to allocate memory for the buffer information\n");
+        if (!tx_ring->buffer_info)
                 return -ENOMEM;
-        }
 
         tx_ring->size = tx_ring->count * (int)sizeof(struct pch_gbe_tx_desc);
 
@@ -1636,10 +1634,9 @@ int pch_gbe_setup_rx_resources(struct pch_gbe_adapter *adapter,
 
         size = (int)sizeof(struct pch_gbe_buffer) * rx_ring->count;
         rx_ring->buffer_info = vzalloc(size);
-        if (!rx_ring->buffer_info) {
-                pr_err("Unable to allocate memory for the receive descriptor ring\n");
+        if (!rx_ring->buffer_info)
                 return -ENOMEM;
-        }
+
         rx_ring->size = rx_ring->count * (int)sizeof(struct pch_gbe_rx_desc);
         rx_ring->desc = dma_alloc_coherent(&pdev->dev, rx_ring->size,
                                            &rx_ring->dma, GFP_KERNEL);
@@ -2422,8 +2419,6 @@ static int pch_gbe_probe(struct pci_dev *pdev,
         netdev = alloc_etherdev((int)sizeof(struct pch_gbe_adapter));
         if (!netdev) {
                 ret = -ENOMEM;
-                dev_err(&pdev->dev,
-                        "ERR: Can't allocate and set up an Ethernet device\n");
                 goto err_release_pci;
         }
         SET_NETDEV_DEV(netdev, &pdev->dev);
diff --git a/drivers/net/ethernet/packetengines/hamachi.c b/drivers/net/ethernet/packetengines/hamachi.c
index 3458df3780b8..0d29f5f4b8e4 100644
--- a/drivers/net/ethernet/packetengines/hamachi.c
+++ b/drivers/net/ethernet/packetengines/hamachi.c
@@ -1188,11 +1188,10 @@ static void hamachi_init_ring(struct net_device *dev)
         }
         /* Fill in the Rx buffers.  Handle allocation failure gracefully. */
         for (i = 0; i < RX_RING_SIZE; i++) {
-                struct sk_buff *skb = dev_alloc_skb(hmp->rx_buf_sz + 2);
+                struct sk_buff *skb = netdev_alloc_skb(dev, hmp->rx_buf_sz + 2);
                 hmp->rx_skbuff[i] = skb;
                 if (skb == NULL)
                         break;
-                skb->dev = dev;         /* Mark as being used by this device. */
                 skb_reserve(skb, 2); /* 16 byte align the IP header. */
                 hmp->rx_ring[i].addr = cpu_to_leXX(pci_map_single(hmp->pci_dev,
                         skb->data, hmp->rx_buf_sz, PCI_DMA_FROMDEVICE));
@@ -1488,7 +1487,7 @@ static int hamachi_rx(struct net_device *dev)
                         /* Check if the packet is long enough to accept without copying
                            to a minimally-sized skbuff. */
                         if (pkt_len < rx_copybreak &&
-                            (skb = dev_alloc_skb(pkt_len + 2)) != NULL) {
+                            (skb = netdev_alloc_skb(dev, pkt_len + 2)) != NULL) {
 #ifdef RX_CHECKSUM
                                 printk(KERN_ERR "%s: rx_copybreak non-zero "
                                   "not good with RX_CHECKSUM\n", dev->name);
@@ -1591,12 +1590,11 @@ static int hamachi_rx(struct net_device *dev)
                 entry = hmp->dirty_rx % RX_RING_SIZE;
                 desc = &(hmp->rx_ring[entry]);
                 if (hmp->rx_skbuff[entry] == NULL) {
-                        struct sk_buff *skb = dev_alloc_skb(hmp->rx_buf_sz + 2);
+                        struct sk_buff *skb = netdev_alloc_skb(dev, hmp->rx_buf_sz + 2);
 
                         hmp->rx_skbuff[entry] = skb;
                         if (skb == NULL)
                                 break;          /* Better luck next round. */
-                        skb->dev = dev;         /* Mark as being used by this device. */
                         skb_reserve(skb, 2);    /* Align IP on 16 byte boundaries */
                         desc->addr = cpu_to_leXX(pci_map_single(hmp->pci_dev,
                                 skb->data, hmp->rx_buf_sz, PCI_DMA_FROMDEVICE));
diff --git a/drivers/net/ethernet/packetengines/yellowfin.c b/drivers/net/ethernet/packetengines/yellowfin.c
index db44e9af03c3..7757b80ef924 100644
--- a/drivers/net/ethernet/packetengines/yellowfin.c
+++ b/drivers/net/ethernet/packetengines/yellowfin.c
@@ -397,10 +397,9 @@ static int __devinit yellowfin_init_one(struct pci_dev *pdev,
         if (i) return i;
 
         dev = alloc_etherdev(sizeof(*np));
-        if (!dev) {
-                pr_err("cannot allocate ethernet device\n");
+        if (!dev)
                 return -ENOMEM;
-        }
+
         SET_NETDEV_DEV(dev, &pdev->dev);
 
         np = netdev_priv(dev);
@@ -744,11 +743,10 @@ static int yellowfin_init_ring(struct net_device *dev)
         }
 
         for (i = 0; i < RX_RING_SIZE; i++) {
-                struct sk_buff *skb = dev_alloc_skb(yp->rx_buf_sz + 2);
+                struct sk_buff *skb = netdev_alloc_skb(dev, yp->rx_buf_sz + 2);
                 yp->rx_skbuff[i] = skb;
                 if (skb == NULL)
                         break;
-                skb->dev = dev;         /* Mark as being used by this device. */
                 skb_reserve(skb, 2);    /* 16 byte align the IP header. */
                 yp->rx_ring[i].addr = cpu_to_le32(pci_map_single(yp->pci_dev,
                         skb->data, yp->rx_buf_sz, PCI_DMA_FROMDEVICE));
@@ -1134,7 +1132,7 @@ static int yellowfin_rx(struct net_device *dev)
                                         PCI_DMA_FROMDEVICE);
                                 yp->rx_skbuff[entry] = NULL;
                         } else {
-                                skb = dev_alloc_skb(pkt_len + 2);
+                                skb = netdev_alloc_skb(dev, pkt_len + 2);
                                 if (skb == NULL)
                                         break;
                                 skb_reserve(skb, 2);    /* 16 byte align the IP header */
@@ -1157,11 +1155,10 @@ static int yellowfin_rx(struct net_device *dev)
         for (; yp->cur_rx - yp->dirty_rx > 0; yp->dirty_rx++) {
                 entry = yp->dirty_rx % RX_RING_SIZE;
                 if (yp->rx_skbuff[entry] == NULL) {
-                        struct sk_buff *skb = dev_alloc_skb(yp->rx_buf_sz + 2);
+                        struct sk_buff *skb = netdev_alloc_skb(dev, yp->rx_buf_sz + 2);
                         if (skb == NULL)
                                 break;                          /* Better luck next round. */
                         yp->rx_skbuff[entry] = skb;
-                        skb->dev = dev; /* Mark as being used by this device. */
                         skb_reserve(skb, 2);    /* Align IP on 16 byte boundaries */
                         yp->rx_ring[entry].addr = cpu_to_le32(pci_map_single(yp->pci_dev,
                                 skb->data, yp->rx_buf_sz, PCI_DMA_FROMDEVICE));
diff --git a/drivers/net/ethernet/pasemi/pasemi_mac.c b/drivers/net/ethernet/pasemi/pasemi_mac.c
index 49b549ff2c78..667498ea4603 100644
--- a/drivers/net/ethernet/pasemi/pasemi_mac.c
+++ b/drivers/net/ethernet/pasemi/pasemi_mac.c
@@ -643,7 +643,7 @@ static void pasemi_mac_replenish_rx_ring(const struct net_device *dev,
                 /* Entry in use? */
                 WARN_ON(*buff);
 
-                skb = dev_alloc_skb(mac->bufsz);
+                skb = netdev_alloc_skb(dev, mac->bufsz);
                 skb_reserve(skb, LOCAL_SKB_ALIGN);
 
                 if (unlikely(!skb))
@@ -1740,8 +1740,6 @@ pasemi_mac_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 
         dev = alloc_etherdev(sizeof(struct pasemi_mac));
         if (dev == NULL) {
-                dev_err(&pdev->dev,
-                        "pasemi_mac: Could not allocate ethernet device.\n");
                 err = -ENOMEM;
                 goto out_disable_device;
         }
diff --git a/drivers/net/ethernet/qlogic/netxen/netxen_nic.h b/drivers/net/ethernet/qlogic/netxen/netxen_nic.h
index a876dffd7101..2eeac32f7fdd 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 77
-#define NETXEN_NIC_LINUX_VERSIONID  "4.0.77"
+#define _NETXEN_NIC_LINUX_SUBVERSION 78
+#define NETXEN_NIC_LINUX_VERSIONID  "4.0.78"
 
 #define NETXEN_VERSION_CODE(a, b, c)    (((a) << 24) + ((b) << 16) + (c))
 #define _major(v)       (((v) >> 24) & 0xff)
@@ -686,6 +686,18 @@ struct netxen_recv_context {
         dma_addr_t phys_addr;
 };
 
+struct _cdrp_cmd {
+        u32 cmd;
+        u32 arg1;
+        u32 arg2;
+        u32 arg3;
+};
+
+struct netxen_cmd_args {
+        struct _cdrp_cmd req;
+        struct _cdrp_cmd rsp;
+};
+
 /* New HW context creation */
 
 #define NX_OS_CRB_RETRY_COUNT   4000
@@ -1142,6 +1154,7 @@ typedef struct {
 #define NETXEN_NIC_LRO_DISABLED         0x00
 #define NETXEN_NIC_BRIDGE_ENABLED       0X10
 #define NETXEN_NIC_DIAG_ENABLED         0x20
+#define NETXEN_FW_RESET_OWNER           0x40
 #define NETXEN_IS_MSI_FAMILY(adapter) \
         ((adapter)->flags & (NETXEN_NIC_MSI_ENABLED | NETXEN_NIC_MSIX_ENABLED))
 
@@ -1159,6 +1172,419 @@ typedef struct {
 #define __NX_DEV_UP                     1
 #define __NX_RESETTING                  2
 
+/* Mini Coredump FW supported version */
+#define NX_MD_SUPPORT_MAJOR             4
+#define NX_MD_SUPPORT_MINOR             0
+#define NX_MD_SUPPORT_SUBVERSION        579
+
+#define LSW(x)  ((uint16_t)(x))
+#define LSD(x)  ((uint32_t)((uint64_t)(x)))
+#define MSD(x)  ((uint32_t)((((uint64_t)(x)) >> 16) >> 16))
+
+/* Mini Coredump mask level */
+#define NX_DUMP_MASK_MIN        0x03
+#define NX_DUMP_MASK_DEF        0x1f
+#define NX_DUMP_MASK_MAX        0xff
+
+/* Mini Coredump CDRP commands */
+#define NX_CDRP_CMD_TEMP_SIZE           0x0000002f
+#define NX_CDRP_CMD_GET_TEMP_HDR        0x00000030
+
+
+#define NX_DUMP_STATE_ARRAY_LEN         16
+#define NX_DUMP_CAP_SIZE_ARRAY_LEN      8
+
+/* Mini Coredump sysfs entries flags*/
+#define NX_FORCE_FW_DUMP_KEY            0xdeadfeed
+#define NX_ENABLE_FW_DUMP               0xaddfeed
+#define NX_DISABLE_FW_DUMP              0xbadfeed
+#define NX_FORCE_FW_RESET               0xdeaddead
+
+
+/* Flash read/write address */
+#define NX_FW_DUMP_REG1         0x00130060
+#define NX_FW_DUMP_REG2         0x001e0000
+#define NX_FLASH_SEM2_LK        0x0013C010
+#define NX_FLASH_SEM2_ULK       0x0013C014
+#define NX_FLASH_LOCK_ID        0x001B2100
+#define FLASH_ROM_WINDOW        0x42110030
+#define FLASH_ROM_DATA          0x42150000
+
+/* Mini Coredump register read/write routine */
+#define NX_RD_DUMP_REG(addr, bar0, data) do {                   \
+        writel((addr & 0xFFFF0000), (void __iomem *) (bar0 +            \
+                NX_FW_DUMP_REG1));                                      \
+        readl((void __iomem *) (bar0 + NX_FW_DUMP_REG1));               \
+        *data = readl((void __iomem *) (bar0 + NX_FW_DUMP_REG2 +        \
+                LSW(addr)));                                            \
+} while (0)
+
+#define NX_WR_DUMP_REG(addr, bar0, data) do {                   \
+        writel((addr & 0xFFFF0000), (void __iomem *) (bar0 +            \
+                NX_FW_DUMP_REG1));                                      \
+        readl((void __iomem *) (bar0 + NX_FW_DUMP_REG1));                \
+        writel(data, (void __iomem *) (bar0 + NX_FW_DUMP_REG2 + LSW(addr)));\
+        readl((void __iomem *) (bar0 + NX_FW_DUMP_REG2 + LSW(addr)));  \
+} while (0)
+
+
+/*
+Entry Type Defines
+*/
+
+#define RDNOP   0
+#define RDCRB   1
+#define RDMUX   2
+#define QUEUE   3
+#define BOARD   4
+#define RDSRE   5
+#define RDOCM   6
+#define PREGS   7
+#define L1DTG   8
+#define L1ITG   9
+#define CACHE   10
+
+#define L1DAT   11
+#define L1INS   12
+#define RDSTK   13
+#define RDCON   14
+
+#define L2DTG   21
+#define L2ITG   22
+#define L2DAT   23
+#define L2INS   24
+#define RDOC3   25
+
+#define MEMBK   32
+
+#define RDROM   71
+#define RDMEM   72
+#define RDMN    73
+
+#define INFOR   81
+#define CNTRL   98
+
+#define TLHDR   99
+#define RDEND   255
+
+#define PRIMQ   103
+#define SQG2Q   104
+#define SQG3Q   105
+
+/*
+* Opcodes for Control Entries.
+* These Flags are bit fields.
+*/
+#define NX_DUMP_WCRB            0x01
+#define NX_DUMP_RWCRB           0x02
+#define NX_DUMP_ANDCRB          0x04
+#define NX_DUMP_ORCRB           0x08
+#define NX_DUMP_POLLCRB         0x10
+#define NX_DUMP_RD_SAVE         0x20
+#define NX_DUMP_WRT_SAVED       0x40
+#define NX_DUMP_MOD_SAVE_ST     0x80
+
+/* Driver Flags */
+#define NX_DUMP_SKIP            0x80    /*  driver skipped this entry  */
+#define NX_DUMP_SIZE_ERR 0x40   /*entry size vs capture size mismatch*/
+
+#define NX_PCI_READ_32(ADDR)                    readl((ADDR))
+#define NX_PCI_WRITE_32(DATA, ADDR)     writel(DATA, (ADDR))
+
+
+
+struct netxen_minidump {
+        u32 pos;                        /* position in the dump buffer */
+        u8  fw_supports_md;             /* FW supports Mini cordump */
+        u8  has_valid_dump;             /* indicates valid dump */
+        u8  md_capture_mask;            /* driver capture mask */
+        u8  md_enabled;                 /* Turn Mini Coredump on/off */
+        u32 md_dump_size;               /* Total FW Mini Coredump size */
+        u32 md_capture_size;            /* FW dump capture size */
+        u32 md_template_size;           /* FW template size */
+        u32 md_template_ver;            /* FW template version */
+        u64 md_timestamp;               /* FW Mini dump timestamp */
+        void *md_template;              /* FW template will be stored */
+        void *md_capture_buff;          /* FW dump will be stored */
+};
+
+
+
+struct netxen_minidump_template_hdr {
+        u32 entry_type;
+        u32 first_entry_offset;
+        u32 size_of_template;
+        u32 capture_mask;
+        u32 num_of_entries;
+        u32 version;
+        u32 driver_timestamp;
+        u32 checksum;
+        u32 driver_capture_mask;
+        u32 driver_info_word2;
+        u32 driver_info_word3;
+        u32 driver_info_word4;
+        u32 saved_state_array[NX_DUMP_STATE_ARRAY_LEN];
+        u32 capture_size_array[NX_DUMP_CAP_SIZE_ARRAY_LEN];
+        u32 rsvd[0];
+};
+
+/* Common Entry Header:  Common to All Entry Types */
+/*
+ * Driver Code is for driver to write some info about the entry.
+ * Currently not used.
+ */
+
+struct netxen_common_entry_hdr {
+        u32 entry_type;
+        u32 entry_size;
+        u32 entry_capture_size;
+        union {
+                struct {
+                        u8 entry_capture_mask;
+                        u8 entry_code;
+                        u8 driver_code;
+                        u8 driver_flags;
+                };
+                u32 entry_ctrl_word;
+        };
+};
+
+
+/* Generic Entry Including Header */
+struct netxen_minidump_entry {
+        struct netxen_common_entry_hdr hdr;
+        u32 entry_data00;
+        u32 entry_data01;
+        u32 entry_data02;
+        u32 entry_data03;
+        u32 entry_data04;
+        u32 entry_data05;
+        u32 entry_data06;
+        u32 entry_data07;
+};
+
+/* Read ROM Header */
+struct netxen_minidump_entry_rdrom {
+        struct netxen_common_entry_hdr h;
+        union {
+                struct {
+                        u32 select_addr_reg;
+                };
+                u32 rsvd_0;
+        };
+        union {
+                struct {
+                        u8 addr_stride;
+                        u8 addr_cnt;
+                        u16 data_size;
+                };
+                u32 rsvd_1;
+        };
+        union {
+                struct {
+                        u32 op_count;
+                };
+                u32 rsvd_2;
+        };
+        union {
+                struct {
+                        u32 read_addr_reg;
+                };
+                u32 rsvd_3;
+        };
+        union {
+                struct {
+                        u32 write_mask;
+                };
+                u32 rsvd_4;
+        };
+        union {
+                struct {
+                        u32 read_mask;
+                };
+                u32 rsvd_5;
+        };
+        u32 read_addr;
+        u32 read_data_size;
+};
+
+
+/* Read CRB and Control Entry Header */
+struct netxen_minidump_entry_crb {
+        struct netxen_common_entry_hdr h;
+        u32 addr;
+        union {
+                struct {
+                        u8 addr_stride;
+                        u8 state_index_a;
+                        u16 poll_timeout;
+                        };
+                u32 addr_cntrl;
+        };
+        u32 data_size;
+        u32 op_count;
+        union {
+                struct {
+                        u8 opcode;
+                        u8 state_index_v;
+                        u8 shl;
+                        u8 shr;
+                        };
+                u32 control_value;
+        };
+        u32 value_1;
+        u32 value_2;
+        u32 value_3;
+};
+
+/* Read Memory and MN Header */
+struct netxen_minidump_entry_rdmem {
+        struct netxen_common_entry_hdr h;
+        union {
+                struct {
+                        u32 select_addr_reg;
+                };
+                u32 rsvd_0;
+        };
+        union {
+                struct {
+                        u8 addr_stride;
+                        u8 addr_cnt;
+                        u16 data_size;
+                };
+                u32 rsvd_1;
+        };
+        union {
+                struct {
+                        u32 op_count;
+                };
+                u32 rsvd_2;
+        };
+        union {
+                struct {
+                        u32 read_addr_reg;
+                };
+                u32 rsvd_3;
+        };
+        union {
+                struct {
+                        u32 cntrl_addr_reg;
+                };
+                u32 rsvd_4;
+        };
+        union {
+                struct {
+                        u8 wr_byte0;
+                        u8 wr_byte1;
+                        u8 poll_mask;
+                        u8 poll_cnt;
+                };
+                u32 rsvd_5;
+        };
+        u32 read_addr;
+        u32 read_data_size;
+};
+
+/* Read Cache L1 and L2 Header */
+struct netxen_minidump_entry_cache {
+        struct netxen_common_entry_hdr h;
+        u32 tag_reg_addr;
+        union {
+                struct {
+                        u16 tag_value_stride;
+                        u16 init_tag_value;
+                };
+                u32 select_addr_cntrl;
+        };
+        u32 data_size;
+        u32 op_count;
+        u32 control_addr;
+        union {
+                struct {
+                        u16 write_value;
+                        u8 poll_mask;
+                        u8 poll_wait;
+                };
+                u32 control_value;
+        };
+        u32 read_addr;
+        union {
+                struct {
+                        u8 read_addr_stride;
+                        u8 read_addr_cnt;
+                        u16 rsvd_1;
+                };
+                u32 read_addr_cntrl;
+        };
+};
+
+/* Read OCM Header */
+struct netxen_minidump_entry_rdocm {
+        struct netxen_common_entry_hdr h;
+        u32 rsvd_0;
+        union {
+                struct {
+                        u32 rsvd_1;
+                };
+                u32 select_addr_cntrl;
+        };
+        u32 data_size;
+        u32 op_count;
+        u32 rsvd_2;
+        u32 rsvd_3;
+        u32 read_addr;
+        union {
+                struct {
+                        u32 read_addr_stride;
+                };
+                u32 read_addr_cntrl;
+        };
+};
+
+/* Read MUX Header */
+struct netxen_minidump_entry_mux {
+        struct netxen_common_entry_hdr h;
+        u32 select_addr;
+        union {
+                struct {
+                        u32 rsvd_0;
+                };
+                u32 select_addr_cntrl;
+        };
+        u32 data_size;
+        u32 op_count;
+        u32 select_value;
+        u32 select_value_stride;
+        u32 read_addr;
+        u32 rsvd_1;
+};
+
+/* Read Queue Header */
+struct netxen_minidump_entry_queue {
+        struct netxen_common_entry_hdr h;
+        u32 select_addr;
+        union {
+                struct {
+                        u16 queue_id_stride;
+                        u16 rsvd_0;
+                };
+                u32 select_addr_cntrl;
+        };
+        u32 data_size;
+        u32 op_count;
+        u32 rsvd_1;
+        u32 rsvd_2;
+        u32 read_addr;
+        union {
+                struct {
+                        u8 read_addr_stride;
+                        u8 read_addr_cnt;
+                        u16 rsvd_3;
+                };
+                u32 read_addr_cntrl;
+        };
+};
+
 struct netxen_dummy_dma {
         void *addr;
         dma_addr_t phys_addr;
@@ -1263,6 +1689,8 @@ struct netxen_adapter {
         __le32 file_prd_off;    /*File fw product offset*/
         u32 fw_version;
         const struct firmware *fw;
+        struct netxen_minidump mdump;   /* mdump ptr */
+        int fw_mdump_rdy;       /* for mdump ready */
 };
 
 int nx_fw_cmd_query_phy(struct netxen_adapter *adapter, u32 reg, u32 *val);
@@ -1365,13 +1793,16 @@ int netxen_nic_change_mtu(struct net_device *netdev, int new_mtu);
 int netxen_config_hw_lro(struct netxen_adapter *adapter, int enable);
 int netxen_config_bridged_mode(struct netxen_adapter *adapter, int enable);
 int netxen_send_lro_cleanup(struct netxen_adapter *adapter);
-
+int netxen_setup_minidump(struct netxen_adapter *adapter);
+void netxen_dump_fw(struct netxen_adapter *adapter);
 void netxen_nic_update_cmd_producer(struct netxen_adapter *adapter,
                 struct nx_host_tx_ring *tx_ring);
 
 /* Functions from netxen_nic_main.c */
 int netxen_nic_reset_context(struct netxen_adapter *);
 
+int nx_dev_request_reset(struct netxen_adapter *adapter);
+
 /*
  * NetXen Board information
  */
diff --git a/drivers/net/ethernet/qlogic/netxen/netxen_nic_ctx.c b/drivers/net/ethernet/qlogic/netxen/netxen_nic_ctx.c
index a925392abd6f..f3c0057a802b 100644
--- a/drivers/net/ethernet/qlogic/netxen/netxen_nic_ctx.c
+++ b/drivers/net/ethernet/qlogic/netxen/netxen_nic_ctx.c
@@ -48,28 +48,27 @@ netxen_poll_rsp(struct netxen_adapter *adapter)
 }
 
 static u32
-netxen_issue_cmd(struct netxen_adapter *adapter,
-        u32 pci_fn, u32 version, u32 arg1, u32 arg2, u32 arg3, u32 cmd)
+netxen_issue_cmd(struct netxen_adapter *adapter, struct netxen_cmd_args *cmd)
 {
         u32 rsp;
         u32 signature = 0;
         u32 rcode = NX_RCODE_SUCCESS;
 
-        signature = NX_CDRP_SIGNATURE_MAKE(pci_fn, version);
-
+        signature = NX_CDRP_SIGNATURE_MAKE(adapter->ahw.pci_func,
+                                                NXHAL_VERSION);
         /* Acquire semaphore before accessing CRB */
         if (netxen_api_lock(adapter))
                 return NX_RCODE_TIMEOUT;
 
         NXWR32(adapter, NX_SIGN_CRB_OFFSET, signature);
 
-        NXWR32(adapter, NX_ARG1_CRB_OFFSET, arg1);
+        NXWR32(adapter, NX_ARG1_CRB_OFFSET, cmd->req.arg1);
 
-        NXWR32(adapter, NX_ARG2_CRB_OFFSET, arg2);
+        NXWR32(adapter, NX_ARG2_CRB_OFFSET, cmd->req.arg2);
 
-        NXWR32(adapter, NX_ARG3_CRB_OFFSET, arg3);
+        NXWR32(adapter, NX_ARG3_CRB_OFFSET, cmd->req.arg3);
 
-        NXWR32(adapter, NX_CDRP_CRB_OFFSET, NX_CDRP_FORM_CMD(cmd));
+        NXWR32(adapter, NX_CDRP_CRB_OFFSET, NX_CDRP_FORM_CMD(cmd->req.cmd));
 
         rsp = netxen_poll_rsp(adapter);
 
@@ -83,28 +82,179 @@ netxen_issue_cmd(struct netxen_adapter *adapter,
 
                 printk(KERN_ERR "%s: failed card response code:0x%x\n",
                                 netxen_nic_driver_name, rcode);
+        } else if (rsp == NX_CDRP_RSP_OK) {
+                cmd->rsp.cmd = NX_RCODE_SUCCESS;
+                if (cmd->rsp.arg2)
+                        cmd->rsp.arg2 = NXRD32(adapter, NX_ARG2_CRB_OFFSET);
+                if (cmd->rsp.arg3)
+                        cmd->rsp.arg3 = NXRD32(adapter, NX_ARG3_CRB_OFFSET);
         }
 
+        if (cmd->rsp.arg1)
+                cmd->rsp.arg1 = NXRD32(adapter, NX_ARG1_CRB_OFFSET);
         /* Release semaphore */
         netxen_api_unlock(adapter);
 
         return rcode;
 }
 
+static int
+netxen_get_minidump_template_size(struct netxen_adapter *adapter)
+{
+        struct netxen_cmd_args cmd;
+        memset(&cmd, 0, sizeof(cmd));
+        cmd.req.cmd = NX_CDRP_CMD_TEMP_SIZE;
+        memset(&cmd.rsp, 1, sizeof(struct _cdrp_cmd));
+        netxen_issue_cmd(adapter, &cmd);
+        if (cmd.rsp.cmd != NX_RCODE_SUCCESS) {
+                dev_info(&adapter->pdev->dev,
+                        "Can't get template size %d\n", cmd.rsp.cmd);
+                return -EIO;
+        }
+        adapter->mdump.md_template_size = cmd.rsp.arg2;
+        adapter->mdump.md_template_ver = cmd.rsp.arg3;
+        return 0;
+}
+
+static int
+netxen_get_minidump_template(struct netxen_adapter *adapter)
+{
+        dma_addr_t md_template_addr;
+        void *addr;
+        u32 size;
+        struct netxen_cmd_args cmd;
+        size = adapter->mdump.md_template_size;
+
+        if (size == 0) {
+                dev_err(&adapter->pdev->dev, "Can not capture Minidump "
+                        "template. Invalid template size.\n");
+                return NX_RCODE_INVALID_ARGS;
+        }
+
+        addr = pci_alloc_consistent(adapter->pdev, size, &md_template_addr);
+
+        if (!addr) {
+                dev_err(&adapter->pdev->dev, "Unable to allocate dmable memory for template.\n");
+                return -ENOMEM;
+        }
+
+        memset(addr, 0, size);
+        memset(&cmd, 0, sizeof(cmd));
+        memset(&cmd.rsp, 1, sizeof(struct _cdrp_cmd));
+        cmd.req.cmd = NX_CDRP_CMD_GET_TEMP_HDR;
+        cmd.req.arg1 = LSD(md_template_addr);
+        cmd.req.arg2 = MSD(md_template_addr);
+        cmd.req.arg3 |= size;
+        netxen_issue_cmd(adapter, &cmd);
+
+        if ((cmd.rsp.cmd == NX_RCODE_SUCCESS) && (size == cmd.rsp.arg2)) {
+                memcpy(adapter->mdump.md_template, addr, size);
+        } else {
+                dev_err(&adapter->pdev->dev, "Failed to get minidump template, "
+                        "err_code : %d, requested_size : %d, actual_size : %d\n ",
+                        cmd.rsp.cmd, size, cmd.rsp.arg2);
+        }
+        pci_free_consistent(adapter->pdev, size, addr, md_template_addr);
+        return 0;
+}
+
+static u32
+netxen_check_template_checksum(struct netxen_adapter *adapter)
+{
+        u64 sum =  0 ;
+        u32 *buff = adapter->mdump.md_template;
+        int count =  adapter->mdump.md_template_size/sizeof(uint32_t) ;
+
+        while (count-- > 0)
+                sum += *buff++ ;
+        while (sum >> 32)
+                sum = (sum & 0xFFFFFFFF) +  (sum >> 32) ;
+
+        return ~sum;
+}
+
+int
+netxen_setup_minidump(struct netxen_adapter *adapter)
+{
+        int err = 0, i;
+        u32 *template, *tmp_buf;
+        struct netxen_minidump_template_hdr *hdr;
+        err = netxen_get_minidump_template_size(adapter);
+        if (err) {
+                adapter->mdump.fw_supports_md = 0;
+                if ((err == NX_RCODE_CMD_INVALID) ||
+                        (err == NX_RCODE_CMD_NOT_IMPL)) {
+                        dev_info(&adapter->pdev->dev,
+                                "Flashed firmware version does not support minidump, "
+                                "minimum version required is [ %u.%u.%u ].\n ",
+                                NX_MD_SUPPORT_MAJOR, NX_MD_SUPPORT_MINOR,
+                                NX_MD_SUPPORT_SUBVERSION);
+                }
+                return err;
+        }
+
+        if (!adapter->mdump.md_template_size) {
+                dev_err(&adapter->pdev->dev, "Error : Invalid template size "
+                ",should be non-zero.\n");
+                return -EIO;
+        }
+        adapter->mdump.md_template =
+                kmalloc(adapter->mdump.md_template_size, GFP_KERNEL);
+
+        if (!adapter->mdump.md_template) {
+                dev_err(&adapter->pdev->dev, "Unable to allocate memory "
+                        "for minidump template.\n");
+                return -ENOMEM;
+        }
+
+        err = netxen_get_minidump_template(adapter);
+        if (err) {
+                if (err == NX_RCODE_CMD_NOT_IMPL)
+                        adapter->mdump.fw_supports_md = 0;
+                goto free_template;
+        }
+
+        if (netxen_check_template_checksum(adapter)) {
+                dev_err(&adapter->pdev->dev, "Minidump template checksum Error\n");
+                err = -EIO;
+                goto free_template;
+        }
+
+        adapter->mdump.md_capture_mask = NX_DUMP_MASK_DEF;
+        tmp_buf = (u32 *) adapter->mdump.md_template;
+        template = (u32 *) adapter->mdump.md_template;
+        for (i = 0; i < adapter->mdump.md_template_size/sizeof(u32); i++)
+                *template++ = __le32_to_cpu(*tmp_buf++);
+        hdr = (struct netxen_minidump_template_hdr *)
+                                adapter->mdump.md_template;
+        adapter->mdump.md_capture_buff = NULL;
+        adapter->mdump.fw_supports_md = 1;
+        adapter->mdump.md_enabled = 1;
+
+        return err;
+
+free_template:
+        kfree(adapter->mdump.md_template);
+        adapter->mdump.md_template = NULL;
+        return err;
+}
+
+
 int
 nx_fw_cmd_set_mtu(struct netxen_adapter *adapter, int mtu)
 {
         u32 rcode = NX_RCODE_SUCCESS;
         struct netxen_recv_context *recv_ctx = &adapter->recv_ctx;
+        struct netxen_cmd_args cmd;
+
+        memset(&cmd, 0, sizeof(cmd));
+        cmd.req.cmd = NX_CDRP_CMD_SET_MTU;
+        cmd.req.arg1 = recv_ctx->context_id;
+        cmd.req.arg2 = mtu;
+        cmd.req.arg3 = 0;
 
         if (recv_ctx->state == NX_HOST_CTX_STATE_ACTIVE)
-                rcode = netxen_issue_cmd(adapter,
-                                adapter->ahw.pci_func,
-                                NXHAL_VERSION,
-                                recv_ctx->context_id,
-                                mtu,
-                                0,
-                                NX_CDRP_CMD_SET_MTU);
+                netxen_issue_cmd(adapter, &cmd);
 
         if (rcode != NX_RCODE_SUCCESS)
                 return -EIO;
@@ -116,15 +266,14 @@ int
 nx_fw_cmd_set_gbe_port(struct netxen_adapter *adapter,
                         u32 speed, u32 duplex, u32 autoneg)
 {
-
-        return netxen_issue_cmd(adapter,
-                                adapter->ahw.pci_func,
-                                NXHAL_VERSION,
-                                speed,
-                                duplex,
-                                autoneg,
-                                NX_CDRP_CMD_CONFIG_GBE_PORT);
-
+        struct netxen_cmd_args cmd;
+
+        memset(&cmd, 0, sizeof(cmd));
+        cmd.req.cmd = NX_CDRP_CMD_CONFIG_GBE_PORT;
+        cmd.req.arg1 = speed;
+        cmd.req.arg2 = duplex;
+        cmd.req.arg3 = autoneg;
+        return netxen_issue_cmd(adapter, &cmd);
 }
 
 static int
@@ -139,6 +288,7 @@ nx_fw_cmd_create_rx_ctx(struct netxen_adapter *adapter)
         nx_cardrsp_sds_ring_t *prsp_sds;
         struct nx_host_rds_ring *rds_ring;
         struct nx_host_sds_ring *sds_ring;
+        struct netxen_cmd_args cmd;
 
         dma_addr_t hostrq_phys_addr, cardrsp_phys_addr;
         u64 phys_addr;
@@ -218,13 +368,12 @@ nx_fw_cmd_create_rx_ctx(struct netxen_adapter *adapter)
         }
 
         phys_addr = hostrq_phys_addr;
-        err = netxen_issue_cmd(adapter,
-                        adapter->ahw.pci_func,
-                        NXHAL_VERSION,
-                        (u32)(phys_addr >> 32),
-                        (u32)(phys_addr & 0xffffffff),
-                        rq_size,
-                        NX_CDRP_CMD_CREATE_RX_CTX);
+        memset(&cmd, 0, sizeof(cmd));
+        cmd.req.arg1 = (u32)(phys_addr >> 32);
+        cmd.req.arg2 = (u32)(phys_addr & 0xffffffff);
+        cmd.req.arg3 = rq_size;
+        cmd.req.cmd = NX_CDRP_CMD_CREATE_RX_CTX;
+        err = netxen_issue_cmd(adapter, &cmd);
         if (err) {
                 printk(KERN_WARNING
                         "Failed to create rx ctx in firmware%d\n", err);
@@ -273,15 +422,15 @@ static void
 nx_fw_cmd_destroy_rx_ctx(struct netxen_adapter *adapter)
 {
         struct netxen_recv_context *recv_ctx = &adapter->recv_ctx;
+        struct netxen_cmd_args cmd;
 
-        if (netxen_issue_cmd(adapter,
-                        adapter->ahw.pci_func,
-                        NXHAL_VERSION,
-                        recv_ctx->context_id,
-                        NX_DESTROY_CTX_RESET,
-                        0,
-                        NX_CDRP_CMD_DESTROY_RX_CTX)) {
+        memset(&cmd, 0, sizeof(cmd));
+        cmd.req.arg1 = recv_ctx->context_id;
+        cmd.req.arg2 = NX_DESTROY_CTX_RESET;
+        cmd.req.arg3 = 0;
+        cmd.req.cmd = NX_CDRP_CMD_DESTROY_RX_CTX;
 
+        if (netxen_issue_cmd(adapter, &cmd)) {
                 printk(KERN_WARNING
                         "%s: Failed to destroy rx ctx in firmware\n",
                         netxen_nic_driver_name);
@@ -302,6 +451,7 @@ nx_fw_cmd_create_tx_ctx(struct netxen_adapter *adapter)
         dma_addr_t      rq_phys_addr, rsp_phys_addr;
         struct nx_host_tx_ring *tx_ring = adapter->tx_ring;
         struct netxen_recv_context *recv_ctx = &adapter->recv_ctx;
+        struct netxen_cmd_args cmd;
 
         rq_size = SIZEOF_HOSTRQ_TX(nx_hostrq_tx_ctx_t);
         rq_addr = pci_alloc_consistent(adapter->pdev,
@@ -345,13 +495,12 @@ nx_fw_cmd_create_tx_ctx(struct netxen_adapter *adapter)
         prq_cds->ring_size = cpu_to_le32(tx_ring->num_desc);
 
         phys_addr = rq_phys_addr;
-        err = netxen_issue_cmd(adapter,
-                        adapter->ahw.pci_func,
-                        NXHAL_VERSION,
-                        (u32)(phys_addr >> 32),
-                        ((u32)phys_addr & 0xffffffff),
-                        rq_size,
-                        NX_CDRP_CMD_CREATE_TX_CTX);
+        memset(&cmd, 0, sizeof(cmd));
+        cmd.req.arg1 = (u32)(phys_addr >> 32);
+        cmd.req.arg2 = ((u32)phys_addr & 0xffffffff);
+        cmd.req.arg3 = rq_size;
+        cmd.req.cmd = NX_CDRP_CMD_CREATE_TX_CTX;
+        err = netxen_issue_cmd(adapter, &cmd);
 
         if (err == NX_RCODE_SUCCESS) {
                 temp = le32_to_cpu(prsp->cds_ring.host_producer_crb);
@@ -380,14 +529,14 @@ out_free_rq:
 static void
 nx_fw_cmd_destroy_tx_ctx(struct netxen_adapter *adapter)
 {
-        if (netxen_issue_cmd(adapter,
-                        adapter->ahw.pci_func,
-                        NXHAL_VERSION,
-                        adapter->tx_context_id,
-                        NX_DESTROY_CTX_RESET,
-                        0,
-                        NX_CDRP_CMD_DESTROY_TX_CTX)) {
-
+        struct netxen_cmd_args cmd;
+
+        memset(&cmd, 0, sizeof(cmd));
+        cmd.req.arg1 = adapter->tx_context_id;
+        cmd.req.arg2 = NX_DESTROY_CTX_RESET;
+        cmd.req.arg3 = 0;
+        cmd.req.cmd = NX_CDRP_CMD_DESTROY_TX_CTX;
+        if (netxen_issue_cmd(adapter, &cmd)) {
                 printk(KERN_WARNING
                         "%s: Failed to destroy tx ctx in firmware\n",
                         netxen_nic_driver_name);
@@ -398,34 +547,37 @@ int
 nx_fw_cmd_query_phy(struct netxen_adapter *adapter, u32 reg, u32 *val)
 {
         u32 rcode;
-
-        rcode = netxen_issue_cmd(adapter,
-                        adapter->ahw.pci_func,
-                        NXHAL_VERSION,
-                        reg,
-                        0,
-                        0,
-                        NX_CDRP_CMD_READ_PHY);
-
+        struct netxen_cmd_args cmd;
+
+        memset(&cmd, 0, sizeof(cmd));
+        cmd.req.arg1 = reg;
+        cmd.req.arg2 = 0;
+        cmd.req.arg3 = 0;
+        cmd.req.cmd = NX_CDRP_CMD_READ_PHY;
+        cmd.rsp.arg1 = 1;
+        rcode = netxen_issue_cmd(adapter, &cmd);
         if (rcode != NX_RCODE_SUCCESS)
                 return -EIO;
 
-        return NXRD32(adapter, NX_ARG1_CRB_OFFSET);
+        if (val == NULL)
+                return -EIO;
+
+        *val = cmd.rsp.arg1;
+        return 0;
 }
 
 int
 nx_fw_cmd_set_phy(struct netxen_adapter *adapter, u32 reg, u32 val)
 {
         u32 rcode;
-
-        rcode = netxen_issue_cmd(adapter,
-                        adapter->ahw.pci_func,
-                        NXHAL_VERSION,
-                        reg,
-                        val,
-                        0,
-                        NX_CDRP_CMD_WRITE_PHY);
-
+        struct netxen_cmd_args cmd;
+
+        memset(&cmd, 0, sizeof(cmd));
+        cmd.req.arg1 = reg;
+        cmd.req.arg2 = val;
+        cmd.req.arg3 = 0;
+        cmd.req.cmd = NX_CDRP_CMD_WRITE_PHY;
+        rcode = netxen_issue_cmd(adapter, &cmd);
         if (rcode != NX_RCODE_SUCCESS)
                 return -EIO;
 
diff --git a/drivers/net/ethernet/qlogic/netxen/netxen_nic_ethtool.c b/drivers/net/ethernet/qlogic/netxen/netxen_nic_ethtool.c
index 8a371985319f..8c39299331a2 100644
--- a/drivers/net/ethernet/qlogic/netxen/netxen_nic_ethtool.c
+++ b/drivers/net/ethernet/qlogic/netxen/netxen_nic_ethtool.c
@@ -248,6 +248,11 @@ skip:
                 }
         }
 
+        if (!netif_running(dev) || !adapter->ahw.linkup) {
+                ecmd->duplex = DUPLEX_UNKNOWN;
+                ethtool_cmd_speed_set(ecmd, SPEED_UNKNOWN);
+        }
+
         return 0;
 }
 
@@ -812,6 +817,107 @@ static int netxen_get_intr_coalesce(struct net_device *netdev,
         return 0;
 }
 
+static int
+netxen_get_dump_flag(struct net_device *netdev, struct ethtool_dump *dump)
+{
+        struct netxen_adapter *adapter = netdev_priv(netdev);
+        struct netxen_minidump *mdump = &adapter->mdump;
+        if (adapter->fw_mdump_rdy)
+                dump->len = mdump->md_dump_size;
+        else
+                dump->len = 0;
+        dump->flag = mdump->md_capture_mask;
+        dump->version = adapter->fw_version;
+        return 0;
+}
+
+static int
+netxen_set_dump(struct net_device *netdev, struct ethtool_dump *val)
+{
+        int ret = 0;
+        struct netxen_adapter *adapter = netdev_priv(netdev);
+        struct netxen_minidump *mdump = &adapter->mdump;
+
+        switch (val->flag) {
+        case NX_FORCE_FW_DUMP_KEY:
+                if (!mdump->md_enabled)
+                        mdump->md_enabled = 1;
+                if (adapter->fw_mdump_rdy) {
+                        netdev_info(netdev, "Previous dump not cleared, not forcing dump\n");
+                        return ret;
+                }
+                netdev_info(netdev, "Forcing a fw dump\n");
+                nx_dev_request_reset(adapter);
+                break;
+        case NX_DISABLE_FW_DUMP:
+                if (mdump->md_enabled) {
+                        netdev_info(netdev, "Disabling FW Dump\n");
+                        mdump->md_enabled = 0;
+                }
+                break;
+        case NX_ENABLE_FW_DUMP:
+                if (!mdump->md_enabled) {
+                        netdev_info(netdev, "Enabling FW dump\n");
+                        mdump->md_enabled = 1;
+                }
+                break;
+        case NX_FORCE_FW_RESET:
+                netdev_info(netdev, "Forcing FW reset\n");
+                nx_dev_request_reset(adapter);
+                adapter->flags &= ~NETXEN_FW_RESET_OWNER;
+                break;
+        default:
+                if (val->flag <= NX_DUMP_MASK_MAX &&
+                        val->flag >= NX_DUMP_MASK_MIN) {
+                        mdump->md_capture_mask = val->flag & 0xff;
+                        netdev_info(netdev, "Driver mask changed to: 0x%x\n",
+                                        mdump->md_capture_mask);
+                        break;
+                }
+                netdev_info(netdev,
+                        "Invalid dump level: 0x%x\n", val->flag);
+                return -EINVAL;
+        }
+
+        return ret;
+}
+
+static int
+netxen_get_dump_data(struct net_device *netdev, struct ethtool_dump *dump,
+                        void *buffer)
+{
+        int i, copy_sz;
+        u32 *hdr_ptr, *data;
+        struct netxen_adapter *adapter = netdev_priv(netdev);
+        struct netxen_minidump *mdump = &adapter->mdump;
+
+
+        if (!adapter->fw_mdump_rdy) {
+                netdev_info(netdev, "Dump not available\n");
+                return -EINVAL;
+        }
+        /* Copy template header first */
+        copy_sz = mdump->md_template_size;
+        hdr_ptr = (u32 *) mdump->md_template;
+        data = buffer;
+        for (i = 0; i < copy_sz/sizeof(u32); i++)
+                *data++ = cpu_to_le32(*hdr_ptr++);
+
+        /* Copy captured dump data */
+        memcpy(buffer + copy_sz,
+                mdump->md_capture_buff + mdump->md_template_size,
+                        mdump->md_capture_size);
+        dump->len = copy_sz + mdump->md_capture_size;
+        dump->flag = mdump->md_capture_mask;
+
+        /* Free dump area once data has been captured */
+        vfree(mdump->md_capture_buff);
+        mdump->md_capture_buff = NULL;
+        adapter->fw_mdump_rdy = 0;
+        netdev_info(netdev, "extracted the fw dump Successfully\n");
+        return 0;
+}
+
 const struct ethtool_ops netxen_nic_ethtool_ops = {
         .get_settings = netxen_nic_get_settings,
         .set_settings = netxen_nic_set_settings,
@@ -833,4 +939,7 @@ const struct ethtool_ops netxen_nic_ethtool_ops = {
         .get_sset_count = netxen_get_sset_count,
         .get_coalesce = netxen_get_intr_coalesce,
         .set_coalesce = netxen_set_intr_coalesce,
+        .get_dump_flag = netxen_get_dump_flag,
+        .get_dump_data = netxen_get_dump_data,
+        .set_dump = netxen_set_dump,
 };
diff --git a/drivers/net/ethernet/qlogic/netxen/netxen_nic_hdr.h b/drivers/net/ethernet/qlogic/netxen/netxen_nic_hdr.h
index dc1967c1f312..b1a897cd9a8d 100644
--- a/drivers/net/ethernet/qlogic/netxen/netxen_nic_hdr.h
+++ b/drivers/net/ethernet/qlogic/netxen/netxen_nic_hdr.h
@@ -969,6 +969,7 @@ enum {
 #define NX_RCODE_FATAL_ERROR            0x80000000
 #define NX_FWERROR_PEGNUM(code)         ((code) & 0xff)
 #define NX_FWERROR_CODE(code)           ((code >> 8) & 0xfffff)
+#define NX_FWERROR_PEGSTAT1(code)       ((code >> 8) & 0x1fffff)
 
 #define FW_POLL_DELAY                   (2 * HZ)
 #define FW_FAIL_THRESH                  3
diff --git a/drivers/net/ethernet/qlogic/netxen/netxen_nic_hw.c b/drivers/net/ethernet/qlogic/netxen/netxen_nic_hw.c
index 3f89e57cae50..6f37470750f3 100644
--- a/drivers/net/ethernet/qlogic/netxen/netxen_nic_hw.c
+++ b/drivers/net/ethernet/qlogic/netxen/netxen_nic_hw.c
@@ -46,7 +46,6 @@ static void netxen_nic_io_write_128M(struct netxen_adapter *adapter,
                 void __iomem *addr, u32 data);
 static u32 netxen_nic_io_read_128M(struct netxen_adapter *adapter,
                 void __iomem *addr);
-
 #ifndef readq
 static inline u64 readq(void __iomem *addr)
 {
@@ -1974,3 +1973,631 @@ netxen_nic_wol_supported(struct netxen_adapter *adapter)
 
         return 0;
 }
+
+static u32 netxen_md_cntrl(struct netxen_adapter *adapter,
+                        struct netxen_minidump_template_hdr *template_hdr,
+                        struct netxen_minidump_entry_crb *crtEntry)
+{
+        int loop_cnt, i, rv = 0, timeout_flag;
+        u32 op_count, stride;
+        u32 opcode, read_value, addr;
+        unsigned long timeout, timeout_jiffies;
+        addr = crtEntry->addr;
+        op_count = crtEntry->op_count;
+        stride = crtEntry->addr_stride;
+
+        for (loop_cnt = 0; loop_cnt < op_count; loop_cnt++) {
+                for (i = 0; i < sizeof(crtEntry->opcode) * 8; i++) {
+                        opcode = (crtEntry->opcode & (0x1 << i));
+                        if (opcode) {
+                                switch (opcode) {
+                                case NX_DUMP_WCRB:
+                                        NX_WR_DUMP_REG(addr,
+                                                adapter->ahw.pci_base0,
+                                                        crtEntry->value_1);
+                                        break;
+                                case NX_DUMP_RWCRB:
+                                        NX_RD_DUMP_REG(addr,
+                                                adapter->ahw.pci_base0,
+                                                                &read_value);
+                                        NX_WR_DUMP_REG(addr,
+                                                adapter->ahw.pci_base0,
+                                                                read_value);
+                                        break;
+                                case NX_DUMP_ANDCRB:
+                                        NX_RD_DUMP_REG(addr,
+                                                adapter->ahw.pci_base0,
+                                                                &read_value);
+                                        read_value &= crtEntry->value_2;
+                                        NX_WR_DUMP_REG(addr,
+                                                adapter->ahw.pci_base0,
+                                                                read_value);
+                                        break;
+                                case NX_DUMP_ORCRB:
+                                        NX_RD_DUMP_REG(addr,
+                                                adapter->ahw.pci_base0,
+                                                                &read_value);
+                                        read_value |= crtEntry->value_3;
+                                        NX_WR_DUMP_REG(addr,
+                                                adapter->ahw.pci_base0,
+                                                                read_value);
+                                        break;
+                                case NX_DUMP_POLLCRB:
+                                        timeout = crtEntry->poll_timeout;
+                                        NX_RD_DUMP_REG(addr,
+                                                adapter->ahw.pci_base0,
+                                                                &read_value);
+                                        timeout_jiffies =
+                                        msecs_to_jiffies(timeout) + jiffies;
+                                        for (timeout_flag = 0;
+                                                !timeout_flag
+                                        && ((read_value & crtEntry->value_2)
+                                        != crtEntry->value_1);) {
+                                                if (time_after(jiffies,
+                                                        timeout_jiffies))
+                                                        timeout_flag = 1;
+                                        NX_RD_DUMP_REG(addr,
+                                                        adapter->ahw.pci_base0,
+                                                                &read_value);
+                                        }
+
+                                        if (timeout_flag) {
+                                                dev_err(&adapter->pdev->dev, "%s : "
+                                                        "Timeout in poll_crb control operation.\n"
+                                                                , __func__);
+                                                return -1;
+                                        }
+                                        break;
+                                case NX_DUMP_RD_SAVE:
+                                        /* Decide which address to use */
+                                        if (crtEntry->state_index_a)
+                                                addr =
+                                                template_hdr->saved_state_array
+                                                [crtEntry->state_index_a];
+                                        NX_RD_DUMP_REG(addr,
+                                                adapter->ahw.pci_base0,
+                                                                &read_value);
+                                        template_hdr->saved_state_array
+                                        [crtEntry->state_index_v]
+                                                = read_value;
+                                        break;
+                                case NX_DUMP_WRT_SAVED:
+                                        /* Decide which value to use */
+                                        if (crtEntry->state_index_v)
+                                                read_value =
+                                                template_hdr->saved_state_array
+                                                [crtEntry->state_index_v];
+                                        else
+                                                read_value = crtEntry->value_1;
+
+                                        /* Decide which address to use */
+                                        if (crtEntry->state_index_a)
+                                                addr =
+                                                template_hdr->saved_state_array
+                                                [crtEntry->state_index_a];
+
+                                        NX_WR_DUMP_REG(addr,
+                                                adapter->ahw.pci_base0,
+                                                                read_value);
+                                        break;
+                                case NX_DUMP_MOD_SAVE_ST:
+                                        read_value =
+                                        template_hdr->saved_state_array
+                                                [crtEntry->state_index_v];
+                                        read_value <<= crtEntry->shl;
+                                        read_value >>= crtEntry->shr;
+                                        if (crtEntry->value_2)
+                                                read_value &=
+                                                crtEntry->value_2;
+                                        read_value |= crtEntry->value_3;
+                                        read_value += crtEntry->value_1;
+                                        /* Write value back to state area.*/
+                                        template_hdr->saved_state_array
+                                                [crtEntry->state_index_v]
+                                                        = read_value;
+                                        break;
+                                default:
+                                        rv = 1;
+                                        break;
+                                }
+                        }
+                }
+                addr = addr + stride;
+        }
+        return rv;
+}
+
+/* Read memory or MN */
+static u32
+netxen_md_rdmem(struct netxen_adapter *adapter,
+                struct netxen_minidump_entry_rdmem
+                        *memEntry, u64 *data_buff)
+{
+        u64 addr, value = 0;
+        int i = 0, loop_cnt;
+
+        addr = (u64)memEntry->read_addr;
+        loop_cnt = memEntry->read_data_size;    /* This is size in bytes */
+        loop_cnt /= sizeof(value);
+
+        for (i = 0; i < loop_cnt; i++) {
+                if (netxen_nic_pci_mem_read_2M(adapter, addr, &value))
+                        goto out;
+                *data_buff++ = value;
+                addr += sizeof(value);
+        }
+out:
+        return i * sizeof(value);
+}
+
+/* Read CRB operation */
+static u32 netxen_md_rd_crb(struct netxen_adapter *adapter,
+                        struct netxen_minidump_entry_crb
+                                *crbEntry, u32 *data_buff)
+{
+        int loop_cnt;
+        u32 op_count, addr, stride, value;
+
+        addr = crbEntry->addr;
+        op_count = crbEntry->op_count;
+        stride = crbEntry->addr_stride;
+
+        for (loop_cnt = 0; loop_cnt < op_count; loop_cnt++) {
+                NX_RD_DUMP_REG(addr, adapter->ahw.pci_base0, &value);
+                *data_buff++ = addr;
+                *data_buff++ = value;
+                addr = addr + stride;
+        }
+        return loop_cnt * (2 * sizeof(u32));
+}
+
+/* Read ROM */
+static u32
+netxen_md_rdrom(struct netxen_adapter *adapter,
+                        struct netxen_minidump_entry_rdrom
+                                *romEntry, u32 *data_buff)
+{
+        int i, count = 0;
+        u32 size, lck_val;
+        u32 val;
+        u32 fl_addr, waddr, raddr;
+        fl_addr = romEntry->read_addr;
+        size = romEntry->read_data_size/4;
+lock_try:
+        lck_val = readl((void __iomem *)(adapter->ahw.pci_base0 +
+                                                        NX_FLASH_SEM2_LK));
+        if (!lck_val && count < MAX_CTL_CHECK) {
+                msleep(20);
+                count++;
+                goto lock_try;
+        }
+        writel(adapter->ahw.pci_func, (void __iomem *)(adapter->ahw.pci_base0 +
+                                                        NX_FLASH_LOCK_ID));
+        for (i = 0; i < size; i++) {
+                waddr = fl_addr & 0xFFFF0000;
+                NX_WR_DUMP_REG(FLASH_ROM_WINDOW, adapter->ahw.pci_base0, waddr);
+                raddr = FLASH_ROM_DATA + (fl_addr & 0x0000FFFF);
+                NX_RD_DUMP_REG(raddr, adapter->ahw.pci_base0, &val);
+                *data_buff++ = cpu_to_le32(val);
+                fl_addr += sizeof(val);
+        }
+        readl((void __iomem *)(adapter->ahw.pci_base0 + NX_FLASH_SEM2_ULK));
+        return romEntry->read_data_size;
+}
+
+/* Handle L2 Cache */
+static u32
+netxen_md_L2Cache(struct netxen_adapter *adapter,
+                                struct netxen_minidump_entry_cache
+                                        *cacheEntry, u32 *data_buff)
+{
+        int loop_cnt, i, k, timeout_flag = 0;
+        u32 addr, read_addr, read_value, cntrl_addr, tag_reg_addr;
+        u32 tag_value, read_cnt;
+        u8 cntl_value_w, cntl_value_r;
+        unsigned long timeout, timeout_jiffies;
+
+        loop_cnt = cacheEntry->op_count;
+        read_addr = cacheEntry->read_addr;
+        cntrl_addr = cacheEntry->control_addr;
+        cntl_value_w = (u32) cacheEntry->write_value;
+        tag_reg_addr = cacheEntry->tag_reg_addr;
+        tag_value = cacheEntry->init_tag_value;
+        read_cnt = cacheEntry->read_addr_cnt;
+
+        for (i = 0; i < loop_cnt; i++) {
+                NX_WR_DUMP_REG(tag_reg_addr, adapter->ahw.pci_base0, tag_value);
+                if (cntl_value_w)
+                        NX_WR_DUMP_REG(cntrl_addr, adapter->ahw.pci_base0,
+                                        (u32)cntl_value_w);
+                if (cacheEntry->poll_mask) {
+                        timeout = cacheEntry->poll_wait;
+                        NX_RD_DUMP_REG(cntrl_addr, adapter->ahw.pci_base0,
+                                                        &cntl_value_r);
+                        timeout_jiffies = msecs_to_jiffies(timeout) + jiffies;
+                        for (timeout_flag = 0; !timeout_flag &&
+                        ((cntl_value_r & cacheEntry->poll_mask) != 0);) {
+                                if (time_after(jiffies, timeout_jiffies))
+                                        timeout_flag = 1;
+                                NX_RD_DUMP_REG(cntrl_addr,
+                                        adapter->ahw.pci_base0,
+                                                        &cntl_value_r);
+                        }
+                        if (timeout_flag) {
+                                dev_err(&adapter->pdev->dev,
+                                                "Timeout in processing L2 Tag poll.\n");
+                                return -1;
+                        }
+                }
+                addr = read_addr;
+                for (k = 0; k < read_cnt; k++) {
+                        NX_RD_DUMP_REG(addr, adapter->ahw.pci_base0,
+                                        &read_value);
+                        *data_buff++ = read_value;
+                        addr += cacheEntry->read_addr_stride;
+                }
+                tag_value += cacheEntry->tag_value_stride;
+        }
+        return read_cnt * loop_cnt * sizeof(read_value);
+}
+
+
+/* Handle L1 Cache */
+static u32 netxen_md_L1Cache(struct netxen_adapter *adapter,
+                                struct netxen_minidump_entry_cache
+                                        *cacheEntry, u32 *data_buff)
+{
+        int i, k, loop_cnt;
+        u32 addr, read_addr, read_value, cntrl_addr, tag_reg_addr;
+        u32 tag_value, read_cnt;
+        u8 cntl_value_w;
+
+        loop_cnt = cacheEntry->op_count;
+        read_addr = cacheEntry->read_addr;
+        cntrl_addr = cacheEntry->control_addr;
+        cntl_value_w = (u32) cacheEntry->write_value;
+        tag_reg_addr = cacheEntry->tag_reg_addr;
+        tag_value = cacheEntry->init_tag_value;
+        read_cnt = cacheEntry->read_addr_cnt;
+
+        for (i = 0; i < loop_cnt; i++) {
+                NX_WR_DUMP_REG(tag_reg_addr, adapter->ahw.pci_base0, tag_value);
+                NX_WR_DUMP_REG(cntrl_addr, adapter->ahw.pci_base0,
+                                                (u32) cntl_value_w);
+                addr = read_addr;
+                for (k = 0; k < read_cnt; k++) {
+                        NX_RD_DUMP_REG(addr,
+                                adapter->ahw.pci_base0,
+                                                &read_value);
+                        *data_buff++ = read_value;
+                        addr += cacheEntry->read_addr_stride;
+                }
+                tag_value += cacheEntry->tag_value_stride;
+        }
+        return read_cnt * loop_cnt * sizeof(read_value);
+}
+
+/* Reading OCM memory */
+static u32
+netxen_md_rdocm(struct netxen_adapter *adapter,
+                                struct netxen_minidump_entry_rdocm
+                                        *ocmEntry, u32 *data_buff)
+{
+        int i, loop_cnt;
+        u32 value;
+        void __iomem *addr;
+        addr = (ocmEntry->read_addr + adapter->ahw.pci_base0);
+        loop_cnt = ocmEntry->op_count;
+
+        for (i = 0; i < loop_cnt; i++) {
+                value = readl(addr);
+                *data_buff++ = value;
+                addr += ocmEntry->read_addr_stride;
+        }
+        return i * sizeof(u32);
+}
+
+/* Read MUX data */
+static u32
+netxen_md_rdmux(struct netxen_adapter *adapter, struct netxen_minidump_entry_mux
+                                        *muxEntry, u32 *data_buff)
+{
+        int loop_cnt = 0;
+        u32 read_addr, read_value, select_addr, sel_value;
+
+        read_addr = muxEntry->read_addr;
+        sel_value = muxEntry->select_value;
+        select_addr = muxEntry->select_addr;
+
+        for (loop_cnt = 0; loop_cnt < muxEntry->op_count; loop_cnt++) {
+                NX_WR_DUMP_REG(select_addr, adapter->ahw.pci_base0, sel_value);
+                NX_RD_DUMP_REG(read_addr, adapter->ahw.pci_base0, &read_value);
+                *data_buff++ = sel_value;
+                *data_buff++ = read_value;
+                sel_value += muxEntry->select_value_stride;
+        }
+        return loop_cnt * (2 * sizeof(u32));
+}
+
+/* Handling Queue State Reads */
+static u32
+netxen_md_rdqueue(struct netxen_adapter *adapter,
+                                struct netxen_minidump_entry_queue
+                                        *queueEntry, u32 *data_buff)
+{
+        int loop_cnt, k;
+        u32 queue_id, read_addr, read_value, read_stride, select_addr, read_cnt;
+
+        read_cnt = queueEntry->read_addr_cnt;
+        read_stride = queueEntry->read_addr_stride;
+        select_addr = queueEntry->select_addr;
+
+        for (loop_cnt = 0, queue_id = 0; loop_cnt < queueEntry->op_count;
+                                 loop_cnt++) {
+                NX_WR_DUMP_REG(select_addr, adapter->ahw.pci_base0, queue_id);
+                read_addr = queueEntry->read_addr;
+                for (k = 0; k < read_cnt; k--) {
+                        NX_RD_DUMP_REG(read_addr, adapter->ahw.pci_base0,
+                                                        &read_value);
+                        *data_buff++ = read_value;
+                        read_addr += read_stride;
+                }
+                queue_id += queueEntry->queue_id_stride;
+        }
+        return loop_cnt * (read_cnt * sizeof(read_value));
+}
+
+
+/*
+* We catch an error where driver does not read
+* as much data as we expect from the entry.
+*/
+
+static int netxen_md_entry_err_chk(struct netxen_adapter *adapter,
+                                struct netxen_minidump_entry *entry, int esize)
+{
+        if (esize < 0) {
+                entry->hdr.driver_flags |= NX_DUMP_SKIP;
+                return esize;
+        }
+        if (esize != entry->hdr.entry_capture_size) {
+                entry->hdr.entry_capture_size = esize;
+                entry->hdr.driver_flags |= NX_DUMP_SIZE_ERR;
+                dev_info(&adapter->pdev->dev,
+                        "Invalidate dump, Type:%d\tMask:%d\tSize:%dCap_size:%d\n",
+                        entry->hdr.entry_type, entry->hdr.entry_capture_mask,
+                        esize, entry->hdr.entry_capture_size);
+                dev_info(&adapter->pdev->dev, "Aborting further dump capture\n");
+        }
+        return 0;
+}
+
+static int netxen_parse_md_template(struct netxen_adapter *adapter)
+{
+        int num_of_entries, buff_level, e_cnt, esize;
+        int end_cnt = 0, rv = 0, sane_start = 0, sane_end = 0;
+        char *dbuff;
+        void *template_buff = adapter->mdump.md_template;
+        char *dump_buff = adapter->mdump.md_capture_buff;
+        int capture_mask = adapter->mdump.md_capture_mask;
+        struct netxen_minidump_template_hdr *template_hdr;
+        struct netxen_minidump_entry *entry;
+
+        if ((capture_mask & 0x3) != 0x3) {
+                dev_err(&adapter->pdev->dev, "Capture mask %02x below minimum needed "
+                        "for valid firmware dump\n", capture_mask);
+                return -EINVAL;
+        }
+        template_hdr = (struct netxen_minidump_template_hdr *) template_buff;
+        num_of_entries = template_hdr->num_of_entries;
+        entry = (struct netxen_minidump_entry *) ((char *) template_buff +
+                                template_hdr->first_entry_offset);
+        memcpy(dump_buff, template_buff, adapter->mdump.md_template_size);
+        dump_buff = dump_buff + adapter->mdump.md_template_size;
+
+        if (template_hdr->entry_type == TLHDR)
+                sane_start = 1;
+
+        for (e_cnt = 0, buff_level = 0; e_cnt < num_of_entries; e_cnt++) {
+                if (!(entry->hdr.entry_capture_mask & capture_mask)) {
+                        entry->hdr.driver_flags |= NX_DUMP_SKIP;
+                        entry = (struct netxen_minidump_entry *)
+                                ((char *) entry + entry->hdr.entry_size);
+                        continue;
+                }
+                switch (entry->hdr.entry_type) {
+                case RDNOP:
+                        entry->hdr.driver_flags |= NX_DUMP_SKIP;
+                        break;
+                case RDEND:
+                        entry->hdr.driver_flags |= NX_DUMP_SKIP;
+                        if (!sane_end)
+                                end_cnt = e_cnt;
+                        sane_end += 1;
+                        break;
+                case CNTRL:
+                        rv = netxen_md_cntrl(adapter,
+                                template_hdr, (void *)entry);
+                        if (rv)
+                                entry->hdr.driver_flags |= NX_DUMP_SKIP;
+                        break;
+                case RDCRB:
+                        dbuff = dump_buff + buff_level;
+                        esize = netxen_md_rd_crb(adapter,
+                                        (void *) entry, (void *) dbuff);
+                        rv = netxen_md_entry_err_chk
+                                (adapter, entry, esize);
+                        if (rv < 0)
+                                break;
+                        buff_level += esize;
+                        break;
+                case RDMN:
+                case RDMEM:
+                        dbuff = dump_buff + buff_level;
+                        esize = netxen_md_rdmem(adapter,
+                                (void *) entry, (void *) dbuff);
+                        rv = netxen_md_entry_err_chk
+                                (adapter, entry, esize);
+                        if (rv < 0)
+                                break;
+                        buff_level += esize;
+                        break;
+                case BOARD:
+                case RDROM:
+                        dbuff = dump_buff + buff_level;
+                        esize = netxen_md_rdrom(adapter,
+                                (void *) entry, (void *) dbuff);
+                        rv = netxen_md_entry_err_chk
+                                (adapter, entry, esize);
+                        if (rv < 0)
+                                break;
+                        buff_level += esize;
+                        break;
+                case L2ITG:
+                case L2DTG:
+                case L2DAT:
+                case L2INS:
+                        dbuff = dump_buff + buff_level;
+                        esize = netxen_md_L2Cache(adapter,
+                                (void *) entry, (void *) dbuff);
+                        rv = netxen_md_entry_err_chk
+                                (adapter, entry, esize);
+                        if (rv < 0)
+                                break;
+                        buff_level += esize;
+                        break;
+                case L1DAT:
+                case L1INS:
+                        dbuff = dump_buff + buff_level;
+                        esize = netxen_md_L1Cache(adapter,
+                                (void *) entry, (void *) dbuff);
+                        rv = netxen_md_entry_err_chk
+                                (adapter, entry, esize);
+                        if (rv < 0)
+                                break;
+                        buff_level += esize;
+                        break;
+                case RDOCM:
+                        dbuff = dump_buff + buff_level;
+                        esize = netxen_md_rdocm(adapter,
+                                (void *) entry, (void *) dbuff);
+                        rv = netxen_md_entry_err_chk
+                                (adapter, entry, esize);
+                        if (rv < 0)
+                                break;
+                        buff_level += esize;
+                        break;
+                case RDMUX:
+                        dbuff = dump_buff + buff_level;
+                        esize = netxen_md_rdmux(adapter,
+                                (void *) entry, (void *) dbuff);
+                        rv = netxen_md_entry_err_chk
+                                (adapter, entry, esize);
+                        if (rv < 0)
+                                break;
+                        buff_level += esize;
+                        break;
+                case QUEUE:
+                        dbuff = dump_buff + buff_level;
+                        esize = netxen_md_rdqueue(adapter,
+                                (void *) entry, (void *) dbuff);
+                        rv = netxen_md_entry_err_chk
+                                (adapter, entry, esize);
+                        if (rv  < 0)
+                                break;
+                        buff_level += esize;
+                        break;
+                default:
+                        entry->hdr.driver_flags |= NX_DUMP_SKIP;
+                        break;
+                }
+                /* Next entry in the template */
+                entry = (struct netxen_minidump_entry *)
+                        ((char *) entry + entry->hdr.entry_size);
+        }
+        if (!sane_start || sane_end > 1) {
+                dev_err(&adapter->pdev->dev,
+                                "Firmware minidump template configuration error.\n");
+        }
+        return 0;
+}
+
+static int
+netxen_collect_minidump(struct netxen_adapter *adapter)
+{
+        int ret = 0;
+        struct netxen_minidump_template_hdr *hdr;
+        struct timespec val;
+        hdr = (struct netxen_minidump_template_hdr *)
+                                adapter->mdump.md_template;
+        hdr->driver_capture_mask = adapter->mdump.md_capture_mask;
+        jiffies_to_timespec(jiffies, &val);
+        hdr->driver_timestamp = (u32) val.tv_sec;
+        hdr->driver_info_word2 = adapter->fw_version;
+        hdr->driver_info_word3 = NXRD32(adapter, CRB_DRIVER_VERSION);
+        ret = netxen_parse_md_template(adapter);
+        if (ret)
+                return ret;
+
+        return ret;
+}
+
+
+void
+netxen_dump_fw(struct netxen_adapter *adapter)
+{
+        struct netxen_minidump_template_hdr *hdr;
+        int i, k, data_size = 0;
+        u32 capture_mask;
+        hdr = (struct netxen_minidump_template_hdr *)
+                                adapter->mdump.md_template;
+        capture_mask = adapter->mdump.md_capture_mask;
+
+        for (i = 0x2, k = 1; (i & NX_DUMP_MASK_MAX); i <<= 1, k++) {
+                if (i & capture_mask)
+                        data_size += hdr->capture_size_array[k];
+        }
+        if (!data_size) {
+                dev_err(&adapter->pdev->dev,
+                                "Invalid cap sizes for capture_mask=0x%x\n",
+                        adapter->mdump.md_capture_mask);
+                return;
+        }
+        adapter->mdump.md_capture_size = data_size;
+        adapter->mdump.md_dump_size = adapter->mdump.md_template_size +
+                                        adapter->mdump.md_capture_size;
+        if (!adapter->mdump.md_capture_buff) {
+                adapter->mdump.md_capture_buff =
+                                vmalloc(adapter->mdump.md_dump_size);
+                if (!adapter->mdump.md_capture_buff) {
+                        dev_info(&adapter->pdev->dev,
+                                "Unable to allocate memory for minidump "
+                                "capture_buffer(%d bytes).\n",
+                                        adapter->mdump.md_dump_size);
+                        return;
+                }
+                memset(adapter->mdump.md_capture_buff, 0,
+                                adapter->mdump.md_dump_size);
+                if (netxen_collect_minidump(adapter)) {
+                        adapter->mdump.has_valid_dump = 0;
+                        adapter->mdump.md_dump_size = 0;
+                        vfree(adapter->mdump.md_capture_buff);
+                        adapter->mdump.md_capture_buff = NULL;
+                        dev_err(&adapter->pdev->dev,
+                                "Error in collecting firmware minidump.\n");
+                } else {
+                        adapter->mdump.md_timestamp = jiffies;
+                        adapter->mdump.has_valid_dump = 1;
+                        adapter->fw_mdump_rdy = 1;
+                        dev_info(&adapter->pdev->dev, "%s Successfully "
+                                "collected fw dump.\n", adapter->netdev->name);
+                }
+
+        } else {
+                dev_info(&adapter->pdev->dev,
+                                        "Cannot overwrite previously collected "
+                                                        "firmware minidump.\n");
+                adapter->fw_mdump_rdy = 1;
+                return;
+        }
+}
diff --git a/drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c b/drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c
index a8259cc19a63..718b27440351 100644
--- a/drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c
+++ b/drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c
@@ -280,13 +280,10 @@ int netxen_alloc_sw_resources(struct netxen_adapter *adapter)
 
                 }
                 rds_ring->rx_buf_arr = vzalloc(RCV_BUFF_RINGSIZE(rds_ring));
-                if (rds_ring->rx_buf_arr == NULL) {
-                        printk(KERN_ERR "%s: Failed to allocate "
-                                "rx buffer ring %d\n",
-                                netdev->name, ring);
+                if (rds_ring->rx_buf_arr == NULL)
                         /* free whatever was already allocated */
                         goto err_out;
-                }
+
                 INIT_LIST_HEAD(&rds_ring->free_list);
                 /*
                  * Now go through all of them, set reference handles
@@ -449,7 +446,7 @@ int netxen_pinit_from_rom(struct netxen_adapter *adapter)
 
         /* resetall */
         netxen_rom_lock(adapter);
-        NXWR32(adapter, NETXEN_ROMUSB_GLB_SW_RESET, 0xffffffff);
+        NXWR32(adapter, NETXEN_ROMUSB_GLB_SW_RESET, 0xfeffffff);
         netxen_rom_unlock(adapter);
 
         if (NX_IS_REVISION_P3(adapter->ahw.revision_id)) {
@@ -480,11 +477,8 @@ int netxen_pinit_from_rom(struct netxen_adapter *adapter)
         }
 
         buf = kcalloc(n, sizeof(struct crb_addr_pair), GFP_KERNEL);
-        if (buf == NULL) {
-                printk("%s: netxen_pinit_from_rom: Unable to calloc memory.\n",
-                                netxen_nic_driver_name);
+        if (buf == NULL)
                 return -ENOMEM;
-        }
 
         for (i = 0; i < n; i++) {
                 if (netxen_rom_fast_read(adapter, 8*i + 4*offset, &val) != 0 ||
@@ -1353,7 +1347,6 @@ int netxen_phantom_init(struct netxen_adapter *adapter, int pegtune_val)
 
         do {
                 val = NXRD32(adapter, CRB_CMDPEG_STATE);
-
                 switch (val) {
                 case PHAN_INITIALIZE_COMPLETE:
                 case PHAN_INITIALIZE_ACK:
@@ -1494,7 +1487,7 @@ netxen_alloc_rx_skb(struct netxen_adapter *adapter,
         dma_addr_t dma;
         struct pci_dev *pdev = adapter->pdev;
 
-        buffer->skb = dev_alloc_skb(rds_ring->skb_size);
+        buffer->skb = netdev_alloc_skb(adapter->netdev, rds_ring->skb_size);
         if (!buffer->skb)
                 return 1;
 
diff --git a/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c b/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c
index 7dd9a4b107e6..8dc4a134dece 100644
--- a/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c
+++ b/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c
@@ -82,7 +82,6 @@ static void netxen_create_sysfs_entries(struct netxen_adapter *adapter);
 static void netxen_remove_sysfs_entries(struct netxen_adapter *adapter);
 static void netxen_create_diag_entries(struct netxen_adapter *adapter);
 static void netxen_remove_diag_entries(struct netxen_adapter *adapter);
-
 static int nx_dev_request_aer(struct netxen_adapter *adapter);
 static int nx_decr_dev_ref_cnt(struct netxen_adapter *adapter);
 static int netxen_can_start_firmware(struct netxen_adapter *adapter);
@@ -802,10 +801,10 @@ err_out:
 static void
 netxen_check_options(struct netxen_adapter *adapter)
 {
-        u32 fw_major, fw_minor, fw_build;
+        u32 fw_major, fw_minor, fw_build, prev_fw_version;
         char brd_name[NETXEN_MAX_SHORT_NAME];
         char serial_num[32];
-        int i, offset, val;
+        int i, offset, val, err;
         int *ptr32;
         struct pci_dev *pdev = adapter->pdev;
 
@@ -826,9 +825,22 @@ netxen_check_options(struct netxen_adapter *adapter)
         fw_major = NXRD32(adapter, NETXEN_FW_VERSION_MAJOR);
         fw_minor = NXRD32(adapter, NETXEN_FW_VERSION_MINOR);
         fw_build = NXRD32(adapter, NETXEN_FW_VERSION_SUB);
-
+        prev_fw_version = adapter->fw_version;
         adapter->fw_version = NETXEN_VERSION_CODE(fw_major, fw_minor, fw_build);
 
+        /* Get FW Mini Coredump template and store it */
+         if (NX_IS_REVISION_P3(adapter->ahw.revision_id)) {
+                if (adapter->mdump.md_template == NULL ||
+                                adapter->fw_version > prev_fw_version) {
+                        kfree(adapter->mdump.md_template);
+                        adapter->mdump.md_template = NULL;
+                        err = netxen_setup_minidump(adapter);
+                        if (err)
+                                dev_err(&adapter->pdev->dev,
+                                "Failed to setup minidump rcode = %d\n", err);
+                }
+        }
+
         if (adapter->portnum == 0) {
                 get_brd_name_by_type(adapter->ahw.board_type, brd_name);
 
@@ -909,7 +921,12 @@ netxen_start_firmware(struct netxen_adapter *adapter)
         if (err)
                 return err;
 
-        if (!netxen_can_start_firmware(adapter))
+        err = netxen_can_start_firmware(adapter);
+
+        if (err < 0)
+                return err;
+
+        if (!err)
                 goto wait_init;
 
         first_boot = NXRD32(adapter, NETXEN_CAM_RAM(0x1fc));
@@ -1403,7 +1420,6 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 
         netdev = alloc_etherdev(sizeof(struct netxen_adapter));
         if(!netdev) {
-                dev_err(&pdev->dev, "failed to allocate net_device\n");
                 err = -ENOMEM;
                 goto err_out_free_res;
         }
@@ -1529,6 +1545,18 @@ err_out_disable_pdev:
         return err;
 }
 
+static
+void netxen_cleanup_minidump(struct netxen_adapter *adapter)
+{
+        kfree(adapter->mdump.md_template);
+        adapter->mdump.md_template = NULL;
+
+        if (adapter->mdump.md_capture_buff) {
+                vfree(adapter->mdump.md_capture_buff);
+                adapter->mdump.md_capture_buff = NULL;
+        }
+}
+
 static void __devexit netxen_nic_remove(struct pci_dev *pdev)
 {
         struct netxen_adapter *adapter;
@@ -1564,8 +1592,10 @@ static void __devexit netxen_nic_remove(struct pci_dev *pdev)
 
         netxen_release_firmware(adapter);
 
-        if (NX_IS_REVISION_P3(pdev->revision))
+        if (NX_IS_REVISION_P3(pdev->revision)) {
+                netxen_cleanup_minidump(adapter);
                 pci_disable_pcie_error_reporting(pdev);
+        }
 
         pci_release_regions(pdev);
         pci_disable_device(pdev);
@@ -2317,7 +2347,7 @@ nx_incr_dev_ref_cnt(struct netxen_adapter *adapter)
 static int
 nx_decr_dev_ref_cnt(struct netxen_adapter *adapter)
 {
-        int count;
+        int count, state;
         if (netxen_api_lock(adapter))
                 return -EIO;
 
@@ -2325,8 +2355,9 @@ nx_decr_dev_ref_cnt(struct netxen_adapter *adapter)
         WARN_ON(count == 0);
 
         NXWR32(adapter, NX_CRB_DEV_REF_COUNT, --count);
+        state = NXRD32(adapter, NX_CRB_DEV_STATE);
 
-        if (count == 0)
+        if (count == 0 && state != NX_DEV_FAILED)
                 NXWR32(adapter, NX_CRB_DEV_STATE, NX_DEV_COLD);
 
         netxen_api_unlock(adapter);
@@ -2355,7 +2386,7 @@ nx_dev_request_aer(struct netxen_adapter *adapter)
         return ret;
 }
 
-static int
+int
 nx_dev_request_reset(struct netxen_adapter *adapter)
 {
         u32 state;
@@ -2366,10 +2397,11 @@ nx_dev_request_reset(struct netxen_adapter *adapter)
 
         state = NXRD32(adapter, NX_CRB_DEV_STATE);
 
-        if (state == NX_DEV_NEED_RESET)
+        if (state == NX_DEV_NEED_RESET || state == NX_DEV_FAILED)
                 ret = 0;
         else if (state != NX_DEV_INITALIZING && state != NX_DEV_NEED_AER) {
                 NXWR32(adapter, NX_CRB_DEV_STATE, NX_DEV_NEED_RESET);
+                adapter->flags |= NETXEN_FW_RESET_OWNER;
                 ret = 0;
         }
 
@@ -2384,8 +2416,10 @@ netxen_can_start_firmware(struct netxen_adapter *adapter)
         int count;
         int can_start = 0;
 
-        if (netxen_api_lock(adapter))
-                return 0;
+        if (netxen_api_lock(adapter)) {
+                nx_incr_dev_ref_cnt(adapter);
+                return -1;
+        }
 
         count = NXRD32(adapter, NX_CRB_DEV_REF_COUNT);
 
@@ -2457,8 +2491,31 @@ netxen_fwinit_work(struct work_struct *work)
         struct netxen_adapter *adapter = container_of(work,
                                 struct netxen_adapter, fw_work.work);
         int dev_state;
-
+        int count;
         dev_state = NXRD32(adapter, NX_CRB_DEV_STATE);
+        if (adapter->flags & NETXEN_FW_RESET_OWNER) {
+                count = NXRD32(adapter, NX_CRB_DEV_REF_COUNT);
+                WARN_ON(count == 0);
+                if (count == 1) {
+                        if (adapter->mdump.md_enabled) {
+                                rtnl_lock();
+                                netxen_dump_fw(adapter);
+                                rtnl_unlock();
+                        }
+                        adapter->flags &= ~NETXEN_FW_RESET_OWNER;
+                        if (netxen_api_lock(adapter)) {
+                                clear_bit(__NX_RESETTING, &adapter->state);
+                                NXWR32(adapter, NX_CRB_DEV_STATE,
+                                                NX_DEV_FAILED);
+                                return;
+                        }
+                        count = NXRD32(adapter, NX_CRB_DEV_REF_COUNT);
+                        NXWR32(adapter, NX_CRB_DEV_REF_COUNT, --count);
+                        NXWR32(adapter, NX_CRB_DEV_STATE, NX_DEV_COLD);
+                        dev_state = NX_DEV_COLD;
+                        netxen_api_unlock(adapter);
+                }
+        }
 
         switch (dev_state) {
         case NX_DEV_COLD:
@@ -2471,11 +2528,9 @@ netxen_fwinit_work(struct work_struct *work)
 
         case NX_DEV_NEED_RESET:
         case NX_DEV_INITALIZING:
-                if (++adapter->fw_wait_cnt < FW_POLL_THRESH) {
                         netxen_schedule_work(adapter,
                                         netxen_fwinit_work, 2 * FW_POLL_DELAY);
                         return;
-                }
 
         case NX_DEV_FAILED:
         default:
@@ -2483,6 +2538,15 @@ netxen_fwinit_work(struct work_struct *work)
                 break;
         }
 
+        if (netxen_api_lock(adapter)) {
+                clear_bit(__NX_RESETTING, &adapter->state);
+                return;
+        }
+        NXWR32(adapter, NX_CRB_DEV_STATE, NX_DEV_FAILED);
+        netxen_api_unlock(adapter);
+        dev_err(&adapter->pdev->dev, "%s: Device initialization Failed\n",
+                                adapter->netdev->name);
+
         clear_bit(__NX_RESETTING, &adapter->state);
 }
 
@@ -2492,7 +2556,7 @@ netxen_detach_work(struct work_struct *work)
         struct netxen_adapter *adapter = container_of(work,
                                 struct netxen_adapter, fw_work.work);
         struct net_device *netdev = adapter->netdev;
-        int ref_cnt, delay;
+        int ref_cnt = 0, delay;
         u32 status;
 
         netif_device_detach(netdev);
@@ -2511,7 +2575,8 @@ netxen_detach_work(struct work_struct *work)
         if (adapter->temp == NX_TEMP_PANIC)
                 goto err_ret;
 
-        ref_cnt = nx_decr_dev_ref_cnt(adapter);
+        if (!(adapter->flags & NETXEN_FW_RESET_OWNER))
+                ref_cnt = nx_decr_dev_ref_cnt(adapter);
 
         if (ref_cnt == -EIO)
                 goto err_ret;
@@ -2531,6 +2596,7 @@ static int
 netxen_check_health(struct netxen_adapter *adapter)
 {
         u32 state, heartbit;
+        u32 peg_status;
         struct net_device *netdev = adapter->netdev;
 
         state = NXRD32(adapter, NX_CRB_DEV_STATE);
@@ -2551,7 +2617,7 @@ netxen_check_health(struct netxen_adapter *adapter)
          * Send request to destroy context in case of tx timeout only
          * and doesn't required in case of Fw hang
          */
-        if (state == NX_DEV_NEED_RESET) {
+        if (state == NX_DEV_NEED_RESET || state == NX_DEV_FAILED) {
                 adapter->need_fw_reset = 1;
                 if (NX_IS_REVISION_P2(adapter->ahw.revision_id))
                         goto detach;
@@ -2577,8 +2643,24 @@ netxen_check_health(struct netxen_adapter *adapter)
 
         clear_bit(__NX_FW_ATTACHED, &adapter->state);
 
-        dev_info(&netdev->dev, "firmware hang detected\n");
-
+        dev_err(&netdev->dev, "firmware hang detected\n");
+        peg_status = NXRD32(adapter, NETXEN_PEG_HALT_STATUS1);
+        dev_err(&adapter->pdev->dev, "Dumping hw/fw registers\n"
+                        "PEG_HALT_STATUS1: 0x%x, PEG_HALT_STATUS2: 0x%x,\n"
+                        "PEG_NET_0_PC: 0x%x, PEG_NET_1_PC: 0x%x,\n"
+                        "PEG_NET_2_PC: 0x%x, PEG_NET_3_PC: 0x%x,\n"
+                        "PEG_NET_4_PC: 0x%x\n",
+                        peg_status,
+                        NXRD32(adapter, NETXEN_PEG_HALT_STATUS2),
+                        NXRD32(adapter, NETXEN_CRB_PEG_NET_0 + 0x3c),
+                        NXRD32(adapter, NETXEN_CRB_PEG_NET_1 + 0x3c),
+                        NXRD32(adapter, NETXEN_CRB_PEG_NET_2 + 0x3c),
+                        NXRD32(adapter, NETXEN_CRB_PEG_NET_3 + 0x3c),
+                        NXRD32(adapter, NETXEN_CRB_PEG_NET_4 + 0x3c));
+        if (NX_FWERROR_PEGSTAT1(peg_status) == 0x67)
+                dev_err(&adapter->pdev->dev,
+                        "Firmware aborted with error code 0x00006700. "
+                                "Device is being reset.\n");
 detach:
         if ((auto_fw_reset == AUTO_FW_RESET_ENABLED) &&
                         !test_and_set_bit(__NX_RESETTING, &adapter->state))
@@ -2848,13 +2930,12 @@ static struct bin_attribute bin_attr_mem = {
 static void
 netxen_create_sysfs_entries(struct netxen_adapter *adapter)
 {
-        struct net_device *netdev = adapter->netdev;
-        struct device *dev = &netdev->dev;
+        struct device *dev = &adapter->pdev->dev;
 
         if (adapter->capabilities & NX_FW_CAPABILITY_BDG) {
                 /* bridged_mode control */
                 if (device_create_file(dev, &dev_attr_bridged_mode)) {
-                        dev_warn(&netdev->dev,
+                        dev_warn(dev,
                                 "failed to create bridged_mode sysfs entry\n");
                 }
         }
@@ -2863,8 +2944,7 @@ netxen_create_sysfs_entries(struct netxen_adapter *adapter)
 static void
 netxen_remove_sysfs_entries(struct netxen_adapter *adapter)
 {
-        struct net_device *netdev = adapter->netdev;
-        struct device *dev = &netdev->dev;
+        struct device *dev = &adapter->pdev->dev;
 
         if (adapter->capabilities & NX_FW_CAPABILITY_BDG)
                 device_remove_file(dev, &dev_attr_bridged_mode);
diff --git a/drivers/net/ethernet/qlogic/qla3xxx.c b/drivers/net/ethernet/qlogic/qla3xxx.c
index 7931531c3a40..d49f6dac51fd 100644
--- a/drivers/net/ethernet/qlogic/qla3xxx.c
+++ b/drivers/net/ethernet/qlogic/qla3xxx.c
@@ -3805,7 +3805,6 @@ static int __devinit ql3xxx_probe(struct pci_dev *pdev,
 
         ndev = alloc_etherdev(sizeof(struct ql3_adapter));
         if (!ndev) {
-                pr_err("%s could not alloc etherdev\n", pci_name(pdev));
                 err = -ENOMEM;
                 goto err_out_free_regions;
         }
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic.h b/drivers/net/ethernet/qlogic/qlcnic/qlcnic.h
index 60976fc4ccc6..2b5af22419a5 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic.h
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic.h
@@ -37,7 +37,7 @@
 #define _QLCNIC_LINUX_MAJOR 5
 #define _QLCNIC_LINUX_MINOR 0
 #define _QLCNIC_LINUX_SUBVERSION 25
-#define QLCNIC_LINUX_VERSIONID  "5.0.25"
+#define QLCNIC_LINUX_VERSIONID  "5.0.26"
 #define QLCNIC_DRV_IDC_VER  0x01
 #define QLCNIC_DRIVER_VERSION  ((_QLCNIC_LINUX_MAJOR << 16) |\
                  (_QLCNIC_LINUX_MINOR << 8) | (_QLCNIC_LINUX_SUBVERSION))
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c
index cc228cf3d84b..89ddf7f7d7df 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c
@@ -155,7 +155,6 @@ qlcnic_get_settings(struct net_device *dev, struct ethtool_cmd *ecmd)
 {
         struct qlcnic_adapter *adapter = netdev_priv(dev);
         int check_sfp_module = 0;
-        u16 pcifn = adapter->ahw->pci_func;
 
         /* read which mode */
         if (adapter->ahw->port_type == QLCNIC_GBE) {
@@ -194,10 +193,8 @@ qlcnic_get_settings(struct net_device *dev, struct ethtool_cmd *ecmd)
                         goto skip;
                 }
 
-                val = QLCRD32(adapter, P3P_LINK_SPEED_REG(pcifn));
-                ethtool_cmd_speed_set(ecmd, P3P_LINK_SPEED_MHZ *
-                                      P3P_LINK_SPEED_VAL(pcifn, val));
-                ecmd->duplex = DUPLEX_FULL;
+                ethtool_cmd_speed_set(ecmd, SPEED_UNKNOWN);
+                ecmd->duplex = DUPLEX_UNKNOWN;
                 ecmd->autoneg = AUTONEG_DISABLE;
         } else
                 return -EIO;
@@ -722,7 +719,7 @@ static int qlcnic_do_lb_test(struct qlcnic_adapter *adapter, u8 mode)
         int i, loop, cnt = 0;
 
         for (i = 0; i < QLCNIC_NUM_ILB_PKT; i++) {
-                skb = dev_alloc_skb(QLCNIC_ILB_PKT_SIZE);
+                skb = netdev_alloc_skb(adapter->netdev, QLCNIC_ILB_PKT_SIZE);
                 qlcnic_create_loopback_buff(skb->data, adapter->mac_addr);
                 skb_put(skb, QLCNIC_ILB_PKT_SIZE);
 
@@ -1155,7 +1152,6 @@ qlcnic_get_dump_data(struct net_device *netdev, struct ethtool_dump *dump,
 
         if (!fw_dump->clr) {
                 netdev_info(netdev, "Dump not available\n");
-                qlcnic_api_unlock(adapter);
                 return -EINVAL;
         }
         /* Copy template header first */
@@ -1174,7 +1170,7 @@ qlcnic_get_dump_data(struct net_device *netdev, struct ethtool_dump *dump,
         vfree(fw_dump->data);
         fw_dump->data = NULL;
         fw_dump->clr = 0;
-
+        netdev_info(netdev, "extracted the FW dump Successfully\n");
         return 0;
 }
 
@@ -1192,7 +1188,7 @@ qlcnic_set_dump(struct net_device *netdev, struct ethtool_dump *val)
                         return ret;
                 }
                 if (fw_dump->clr) {
-                        dev_info(&adapter->pdev->dev,
+                        netdev_info(netdev,
                         "Previous dump not cleared, not forcing dump\n");
                         return ret;
                 }
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c
index 38669583840c..d32cf0ddf1b9 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c
@@ -1369,7 +1369,13 @@ qlcnic_handle_linkevent(struct qlcnic_adapter *adapter,
 
         adapter->module_type = module;
         adapter->link_autoneg = autoneg;
-        adapter->link_speed = link_speed;
+
+        if (link_status) {
+                adapter->link_speed = link_speed;
+        } else {
+                adapter->link_speed = SPEED_UNKNOWN;
+                adapter->link_duplex = DUPLEX_UNKNOWN;
+        }
 }
 
 static void
@@ -1434,7 +1440,7 @@ qlcnic_alloc_rx_skb(struct qlcnic_adapter *adapter,
         dma_addr_t dma;
         struct pci_dev *pdev = adapter->pdev;
 
-        skb = dev_alloc_skb(rds_ring->skb_size);
+        skb = netdev_alloc_skb(adapter->netdev, rds_ring->skb_size);
         if (!skb) {
                 adapter->stats.skb_alloc_failure++;
                 return -ENOMEM;
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
index 69b8e4ef14d9..dba95311a462 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
@@ -1576,7 +1576,6 @@ qlcnic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 
         netdev = alloc_etherdev(sizeof(struct qlcnic_adapter));
         if (!netdev) {
-                dev_err(&pdev->dev, "failed to allocate net_device\n");
                 err = -ENOMEM;
                 goto err_out_free_res;
         }
@@ -3000,8 +2999,18 @@ qlcnic_set_npar_non_operational(struct qlcnic_adapter *adapter)
 void
 qlcnic_dev_request_reset(struct qlcnic_adapter *adapter)
 {
-        u32 state;
-
+        u32 state, xg_val = 0, gb_val = 0;
+
+        qlcnic_xg_set_xg0_mask(xg_val);
+        qlcnic_xg_set_xg1_mask(xg_val);
+        QLCWR32(adapter, QLCNIC_NIU_XG_PAUSE_CTL, xg_val);
+        qlcnic_gb_set_gb0_mask(gb_val);
+        qlcnic_gb_set_gb1_mask(gb_val);
+        qlcnic_gb_set_gb2_mask(gb_val);
+        qlcnic_gb_set_gb3_mask(gb_val);
+        QLCWR32(adapter, QLCNIC_NIU_GB_PAUSE_CTL, gb_val);
+        dev_info(&adapter->pdev->dev, "Pause control frames disabled"
+                                " on all ports\n");
         adapter->need_fw_reset = 1;
         if (qlcnic_api_lock(adapter))
                 return;
@@ -3150,7 +3159,7 @@ qlcnic_check_health(struct qlcnic_adapter *adapter)
                         QLCRD32(adapter, QLCNIC_CRB_PEG_NET_3 + 0x3c),
                         QLCRD32(adapter, QLCNIC_CRB_PEG_NET_4 + 0x3c));
         peg_status = QLCRD32(adapter, QLCNIC_PEG_HALT_STATUS1);
-        if (LSW(MSB(peg_status)) == 0x67)
+        if (QLCNIC_FWERROR_CODE(peg_status) == 0x67)
                 dev_err(&adapter->pdev->dev,
                         "Firmware aborted with error code 0x00006700. "
                                 "Device is being reset.\n");
diff --git a/drivers/net/ethernet/qlogic/qlge/qlge.h b/drivers/net/ethernet/qlogic/qlge/qlge.h
index b8478aab050e..5a639df33f18 100644
--- a/drivers/net/ethernet/qlogic/qlge/qlge.h
+++ b/drivers/net/ethernet/qlogic/qlge/qlge.h
@@ -18,7 +18,7 @@
  */
 #define DRV_NAME        "qlge"
 #define DRV_STRING      "QLogic 10 Gigabit PCI-E Ethernet Driver "
-#define DRV_VERSION     "v1.00.00.29.00.00-01"
+#define DRV_VERSION     "v1.00.00.30.00.00-01"
 
 #define WQ_ADDR_ALIGN   0x3     /* 4 byte alignment */
 
diff --git a/drivers/net/ethernet/qlogic/qlge/qlge_dbg.c b/drivers/net/ethernet/qlogic/qlge/qlge_dbg.c
index fca804f36d61..58185b604b72 100644
--- a/drivers/net/ethernet/qlogic/qlge/qlge_dbg.c
+++ b/drivers/net/ethernet/qlogic/qlge/qlge_dbg.c
@@ -1824,10 +1824,8 @@ void ql_dump_hw_cb(struct ql_adapter *qdev, int size, u32 bit, u16 q_id)
         pr_err("%s: Enter\n", __func__);
 
         ptr = kmalloc(size, GFP_ATOMIC);
-        if (ptr == NULL) {
-                pr_err("%s: Couldn't allocate a buffer\n", __func__);
+        if (ptr == NULL)
                 return;
-        }
 
         if (ql_write_cfg(qdev, ptr, size, bit, q_id)) {
                 pr_err("%s: Failed to upload control block!\n", __func__);
diff --git a/drivers/net/ethernet/qlogic/qlge/qlge_main.c b/drivers/net/ethernet/qlogic/qlge/qlge_main.c
index b54898737284..49343ec21c82 100644
--- a/drivers/net/ethernet/qlogic/qlge/qlge_main.c
+++ b/drivers/net/ethernet/qlogic/qlge/qlge_main.c
@@ -375,13 +375,6 @@ static int ql_set_mac_addr_reg(struct ql_adapter *qdev, u8 *addr, u32 type,
                         u32 lower =
                             (addr[2] << 24) | (addr[3] << 16) | (addr[4] << 8) |
                             (addr[5]);
-
-                        netif_printk(qdev, ifup, KERN_DEBUG, qdev->ndev,
-                                     "Adding %s address %pM at index %d in the CAM.\n",
-                                     type == MAC_ADDR_TYPE_MULTI_MAC ?
-                                     "MULTICAST" : "UNICAST",
-                                     addr, index);
-
                         status =
                             ql_wait_reg_rdy(qdev,
                                 MAC_ADDR_IDX, MAC_ADDR_MW, 0);
@@ -430,12 +423,6 @@ static int ql_set_mac_addr_reg(struct ql_adapter *qdev, u8 *addr, u32 type,
                          * addressing. It's either MAC_ADDR_E on or off.
                          * That's bit-27 we're talking about.
                          */
-                        netif_info(qdev, ifup, qdev->ndev,
-                                   "%s VLAN ID %d %s the CAM.\n",
-                                   enable_bit ? "Adding" : "Removing",
-                                   index,
-                                   enable_bit ? "to" : "from");
-
                         status =
                             ql_wait_reg_rdy(qdev,
                                 MAC_ADDR_IDX, MAC_ADDR_MW, 0);
@@ -535,28 +522,6 @@ static int ql_set_routing_reg(struct ql_adapter *qdev, u32 index, u32 mask,
         int status = -EINVAL; /* Return error if no mask match. */
         u32 value = 0;
 
-        netif_printk(qdev, ifup, KERN_DEBUG, qdev->ndev,
-                     "%s %s mask %s the routing reg.\n",
-                     enable ? "Adding" : "Removing",
-                     index == RT_IDX_ALL_ERR_SLOT ? "MAC ERROR/ALL ERROR" :
-                     index == RT_IDX_IP_CSUM_ERR_SLOT ? "IP CSUM ERROR" :
-                     index == RT_IDX_TCP_UDP_CSUM_ERR_SLOT ? "TCP/UDP CSUM ERROR" :
-                     index == RT_IDX_BCAST_SLOT ? "BROADCAST" :
-                     index == RT_IDX_MCAST_MATCH_SLOT ? "MULTICAST MATCH" :
-                     index == RT_IDX_ALLMULTI_SLOT ? "ALL MULTICAST MATCH" :
-                     index == RT_IDX_UNUSED6_SLOT ? "UNUSED6" :
-                     index == RT_IDX_UNUSED7_SLOT ? "UNUSED7" :
-                     index == RT_IDX_RSS_MATCH_SLOT ? "RSS ALL/IPV4 MATCH" :
-                     index == RT_IDX_RSS_IPV6_SLOT ? "RSS IPV6" :
-                     index == RT_IDX_RSS_TCP4_SLOT ? "RSS TCP4" :
-                     index == RT_IDX_RSS_TCP6_SLOT ? "RSS TCP6" :
-                     index == RT_IDX_CAM_HIT_SLOT ? "CAM HIT" :
-                     index == RT_IDX_UNUSED013 ? "UNUSED13" :
-                     index == RT_IDX_UNUSED014 ? "UNUSED14" :
-                     index == RT_IDX_PROMISCUOUS_SLOT ? "PROMISCUOUS" :
-                     "(Bad index != RT_IDX)",
-                     enable ? "to" : "from");
-
         switch (mask) {
         case RT_IDX_CAM_HIT:
                 {
@@ -1178,14 +1143,16 @@ static void ql_update_lbq(struct ql_adapter *qdev, struct rx_ring *rx_ring)
         int i;
 
         while (rx_ring->lbq_free_cnt > 32) {
-                for (i = 0; i < 16; i++) {
+                for (i = (rx_ring->lbq_clean_idx % 16); i < 16; i++) {
                         netif_printk(qdev, rx_status, KERN_DEBUG, qdev->ndev,
                                      "lbq: try cleaning clean_idx = %d.\n",
                                      clean_idx);
                         lbq_desc = &rx_ring->lbq[clean_idx];
                         if (ql_get_next_chunk(qdev, rx_ring, lbq_desc)) {
+                                rx_ring->lbq_clean_idx = clean_idx;
                                 netif_err(qdev, ifup, qdev->ndev,
-                                          "Could not get a page chunk.\n");
+                                                "Could not get a page chunk, i=%d, clean_idx =%d .\n",
+                                                i, clean_idx);
                                 return;
                         }
 
@@ -1230,7 +1197,7 @@ static void ql_update_sbq(struct ql_adapter *qdev, struct rx_ring *rx_ring)
         int i;
 
         while (rx_ring->sbq_free_cnt > 16) {
-                for (i = 0; i < 16; i++) {
+                for (i = (rx_ring->sbq_clean_idx % 16); i < 16; i++) {
                         sbq_desc = &rx_ring->sbq[clean_idx];
                         netif_printk(qdev, rx_status, KERN_DEBUG, qdev->ndev,
                                      "sbq: try cleaning clean_idx = %d.\n",
@@ -1576,13 +1543,14 @@ static void ql_process_mac_rx_page(struct ql_adapter *qdev,
                 } else if ((ib_mac_rsp->flags2 & IB_MAC_IOCB_RSP_U) &&
                                 (ib_mac_rsp->flags3 & IB_MAC_IOCB_RSP_V4)) {
                         /* Unfragmented ipv4 UDP frame. */
-                        struct iphdr *iph = (struct iphdr *) skb->data;
+                        struct iphdr *iph =
+                                (struct iphdr *) ((u8 *)addr + ETH_HLEN);
                         if (!(iph->frag_off &
                                 cpu_to_be16(IP_MF|IP_OFFSET))) {
                                 skb->ip_summed = CHECKSUM_UNNECESSARY;
                                 netif_printk(qdev, rx_status, KERN_DEBUG,
                                              qdev->ndev,
-                                             "TCP checksum done!\n");
+                                             "UDP checksum done!\n");
                         }
                 }
         }
@@ -1690,7 +1658,7 @@ static void ql_process_mac_rx_skb(struct ql_adapter *qdev,
                                 skb->ip_summed = CHECKSUM_UNNECESSARY;
                                 netif_printk(qdev, rx_status, KERN_DEBUG,
                                              qdev->ndev,
-                                             "TCP checksum done!\n");
+                                             "UDP checksum done!\n");
                         }
                 }
         }
@@ -2312,13 +2280,9 @@ static void qlge_vlan_mode(struct net_device *ndev, netdev_features_t features)
         struct ql_adapter *qdev = netdev_priv(ndev);
 
         if (features & NETIF_F_HW_VLAN_RX) {
-                netif_printk(qdev, ifup, KERN_DEBUG, ndev,
-                             "Turning on VLAN in NIC_RCV_CFG.\n");
                 ql_write32(qdev, NIC_RCV_CFG, NIC_RCV_CFG_VLAN_MASK |
                                  NIC_RCV_CFG_VLAN_MATCH_AND_NON);
         } else {
-                netif_printk(qdev, ifup, KERN_DEBUG, ndev,
-                             "Turning off VLAN in NIC_RCV_CFG.\n");
                 ql_write32(qdev, NIC_RCV_CFG, NIC_RCV_CFG_VLAN_MASK);
         }
 }
@@ -3183,8 +3147,6 @@ static int ql_start_rx_ring(struct ql_adapter *qdev, struct rx_ring *rx_ring)
                 netif_printk(qdev, ifup, KERN_DEBUG, qdev->ndev,
                              "Invalid rx_ring->type = %d.\n", rx_ring->type);
         }
-        netif_printk(qdev, ifup, KERN_DEBUG, qdev->ndev,
-                     "Initializing rx work queue.\n");
         err = ql_write_cfg(qdev, cqicb, sizeof(struct cqicb),
                            CFG_LCQ, rx_ring->cq_id);
         if (err) {
@@ -3237,8 +3199,6 @@ static int ql_start_tx_ring(struct ql_adapter *qdev, struct tx_ring *tx_ring)
                 netif_err(qdev, ifup, qdev->ndev, "Failed to load tx_ring.\n");
                 return err;
         }
-        netif_printk(qdev, ifup, KERN_DEBUG, qdev->ndev,
-                     "Successfully loaded WQICB.\n");
         return err;
 }
 
@@ -3488,12 +3448,8 @@ static void ql_free_irq(struct ql_adapter *qdev)
                         if (test_bit(QL_MSIX_ENABLED, &qdev->flags)) {
                                 free_irq(qdev->msi_x_entry[i].vector,
                                          &qdev->rx_ring[i]);
-                                netif_printk(qdev, ifdown, KERN_DEBUG, qdev->ndev,
-                                             "freeing msix interrupt %d.\n", i);
                         } else {
                                 free_irq(qdev->pdev->irq, &qdev->rx_ring[0]);
-                                netif_printk(qdev, ifdown, KERN_DEBUG, qdev->ndev,
-                                             "freeing msi interrupt %d.\n", i);
                         }
                 }
         }
@@ -3522,17 +3478,6 @@ static int ql_request_irq(struct ql_adapter *qdev)
                                           "Failed request for MSIX interrupt %d.\n",
                                           i);
                                 goto err_irq;
-                        } else {
-                                netif_printk(qdev, ifup, KERN_DEBUG, qdev->ndev,
-                                             "Hooked intr %d, queue type %s, with name %s.\n",
-                                             i,
-                                             qdev->rx_ring[i].type == DEFAULT_Q ?
-                                             "DEFAULT_Q" :
-                                             qdev->rx_ring[i].type == TX_Q ?
-                                             "TX_Q" :
-                                             qdev->rx_ring[i].type == RX_Q ?
-                                             "RX_Q" : "",
-                                             intr_context->name);
                         }
                 } else {
                         netif_printk(qdev, ifup, KERN_DEBUG, qdev->ndev,
@@ -3602,15 +3547,11 @@ static int ql_start_rss(struct ql_adapter *qdev)
         memcpy((void *)&ricb->ipv6_hash_key[0], init_hash_seed, 40);
         memcpy((void *)&ricb->ipv4_hash_key[0], init_hash_seed, 16);
 
-        netif_printk(qdev, ifup, KERN_DEBUG, qdev->ndev, "Initializing RSS.\n");
-
         status = ql_write_cfg(qdev, ricb, sizeof(*ricb), CFG_LR, 0);
         if (status) {
                 netif_err(qdev, ifup, qdev->ndev, "Failed to load RICB.\n");
                 return status;
         }
-        netif_printk(qdev, ifup, KERN_DEBUG, qdev->ndev,
-                     "Successfully loaded RICB.\n");
         return status;
 }
 
@@ -3817,11 +3758,8 @@ static int ql_adapter_initialize(struct ql_adapter *qdev)
         }
 
         /* Start NAPI for the RSS queues. */
-        for (i = 0; i < qdev->rss_ring_count; i++) {
-                netif_printk(qdev, ifup, KERN_DEBUG, qdev->ndev,
-                             "Enabling NAPI for rx_ring[%d].\n", i);
+        for (i = 0; i < qdev->rss_ring_count; i++)
                 napi_enable(&qdev->rx_ring[i].napi);
-        }
 
         return status;
 }
@@ -4121,10 +4059,6 @@ static int ql_configure_rings(struct ql_adapter *qdev)
                         rx_ring->lbq_size =
                             rx_ring->lbq_len * sizeof(__le64);
                         rx_ring->lbq_buf_size = (u16)lbq_buf_len;
-                        netif_printk(qdev, ifup, KERN_DEBUG, qdev->ndev,
-                                     "lbq_buf_size %d, order = %d\n",
-                                     rx_ring->lbq_buf_size,
-                                     qdev->lbq_buf_order);
                         rx_ring->sbq_len = NUM_SMALL_BUFFERS;
                         rx_ring->sbq_size =
                             rx_ring->sbq_len * sizeof(__le64);
diff --git a/drivers/net/ethernet/racal/ni5010.c b/drivers/net/ethernet/racal/ni5010.c
index 072810da9a37..807982220050 100644
--- a/drivers/net/ethernet/racal/ni5010.c
+++ b/drivers/net/ethernet/racal/ni5010.c
@@ -552,7 +552,7 @@ static void ni5010_rx(struct net_device *dev)
         }
 
         /* Malloc up new buffer. */
-        skb = dev_alloc_skb(i_pkt_size + 3);
+        skb = netdev_alloc_skb(dev, i_pkt_size + 3);
         if (skb == NULL) {
                 printk(KERN_WARNING "%s: Memory squeeze, dropping packet.\n", dev->name);
                 dev->stats.rx_dropped++;
diff --git a/drivers/net/ethernet/rdc/r6040.c b/drivers/net/ethernet/rdc/r6040.c
index cb0eca807852..76cab284876b 100644
--- a/drivers/net/ethernet/rdc/r6040.c
+++ b/drivers/net/ethernet/rdc/r6040.c
@@ -1107,7 +1107,6 @@ static int __devinit r6040_init_one(struct pci_dev *pdev,
 
         dev = alloc_etherdev(sizeof(struct r6040_private));
         if (!dev) {
-                dev_err(&pdev->dev, "Failed to allocate etherdev\n");
                 err = -ENOMEM;
                 goto err_out;
         }
diff --git a/drivers/net/ethernet/realtek/8139too.c b/drivers/net/ethernet/realtek/8139too.c
index a8779bedb3d9..1c3feb0116b5 100644
--- a/drivers/net/ethernet/realtek/8139too.c
+++ b/drivers/net/ethernet/realtek/8139too.c
@@ -754,10 +754,9 @@ static __devinit struct net_device * rtl8139_init_board (struct pci_dev *pdev)
 
         /* dev and priv zeroed in alloc_etherdev */
         dev = alloc_etherdev (sizeof (*tp));
-        if (dev == NULL) {
-                dev_err(&pdev->dev, "Unable to alloc new net device\n");
+        if (dev == NULL)
                 return ERR_PTR(-ENOMEM);
-        }
+
         SET_NETDEV_DEV(dev, &pdev->dev);
 
         tp = netdev_priv(dev);
diff --git a/drivers/net/ethernet/realtek/Kconfig b/drivers/net/ethernet/realtek/Kconfig
index 0578859a3c73..5821966f9f28 100644
--- a/drivers/net/ethernet/realtek/Kconfig
+++ b/drivers/net/ethernet/realtek/Kconfig
@@ -24,11 +24,11 @@ config ATP
         select CRC32
         ---help---
           This is a network (Ethernet) device which attaches to your parallel
-          port. Read <file:drivers/net/atp.c> as well as the Ethernet-HOWTO,
-          available from <http://www.tldp.org/docs.html#howto>, if you
-          want to use this.  If you intend to use this driver, you should have
-          said N to the "Parallel printer support", because the two drivers
-          don't like each other.
+          port. Read <file:drivers/net/ethernet/realtek/atp.c> as well as the
+          Ethernet-HOWTO, available from <http://www.tldp.org/docs.html#howto>,
+          if you want to use this.  If you intend to use this driver, you
+          should have said N to the "Parallel printer support", because the two
+          drivers don't like each other.
 
           To compile this driver as a module, choose M here: the module
           will be called atp.
diff --git a/drivers/net/ethernet/realtek/atp.c b/drivers/net/ethernet/realtek/atp.c
index e3f57fdbf0ea..46c1932048cb 100644
--- a/drivers/net/ethernet/realtek/atp.c
+++ b/drivers/net/ethernet/realtek/atp.c
@@ -783,7 +783,7 @@ static void net_rx(struct net_device *dev)
                 int pkt_len = (rx_head.rx_count & 0x7ff) - 4;
                 struct sk_buff *skb;
 
-                skb = dev_alloc_skb(pkt_len + 2);
+                skb = netdev_alloc_skb(dev, pkt_len + 2);
                 if (skb == NULL) {
                         printk(KERN_ERR "%s: Memory squeeze, dropping packet.\n",
                                    dev->name);
diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
index 7a0c800b50ad..5eb6858ed0a7 100644
--- a/drivers/net/ethernet/realtek/r8169.c
+++ b/drivers/net/ethernet/realtek/r8169.c
@@ -667,12 +667,19 @@ struct rtl8169_counters {
         __le16  tx_underun;
 };
 
+enum rtl_flag {
+        RTL_FLAG_TASK_ENABLED,
+        RTL_FLAG_TASK_SLOW_PENDING,
+        RTL_FLAG_TASK_RESET_PENDING,
+        RTL_FLAG_TASK_PHY_PENDING,
+        RTL_FLAG_MAX
+};
+
 struct rtl8169_private {
         void __iomem *mmio_addr;        /* memory map physical address */
         struct pci_dev *pci_dev;
         struct net_device *dev;
         struct napi_struct napi;
-        spinlock_t lock;
         u32 msg_enable;
         u16 txd_version;
         u16 mac_version;
@@ -688,9 +695,8 @@ struct rtl8169_private {
         struct ring_info tx_skb[NUM_TX_DESC];   /* Tx data buffers */
         struct timer_list timer;
         u16 cp_cmd;
-        u16 intr_event;
-        u16 napi_event;
-        u16 intr_mask;
+
+        u16 event_slow;
 
         struct mdio_ops {
                 void (*write)(void __iomem *, int, int);
@@ -714,7 +720,13 @@ struct rtl8169_private {
         unsigned int (*phy_reset_pending)(struct rtl8169_private *tp);
         unsigned int (*link_ok)(void __iomem *);
         int (*do_ioctl)(struct rtl8169_private *tp, struct mii_ioctl_data *data, int cmd);
-        struct delayed_work task;
+
+        struct {
+                DECLARE_BITMAP(flags, RTL_FLAG_MAX);
+                struct mutex mutex;
+                struct work_struct work;
+        } wk;
+
         unsigned features;
 
         struct mii_if_info mii;
@@ -764,13 +776,20 @@ static int rtl8169_close(struct net_device *dev);
 static void rtl_set_rx_mode(struct net_device *dev);
 static void rtl8169_tx_timeout(struct net_device *dev);
 static struct net_device_stats *rtl8169_get_stats(struct net_device *dev);
-static int rtl8169_rx_interrupt(struct net_device *, struct rtl8169_private *,
-                                void __iomem *, u32 budget);
 static int rtl8169_change_mtu(struct net_device *dev, int new_mtu);
-static void rtl8169_down(struct net_device *dev);
 static void rtl8169_rx_clear(struct rtl8169_private *tp);
 static int rtl8169_poll(struct napi_struct *napi, int budget);
 
+static void rtl_lock_work(struct rtl8169_private *tp)
+{
+        mutex_lock(&tp->wk.mutex);
+}
+
+static void rtl_unlock_work(struct rtl8169_private *tp)
+{
+        mutex_unlock(&tp->wk.mutex);
+}
+
 static void rtl_tx_performance_tweak(struct pci_dev *pdev, u16 force)
 {
         int cap = pci_pcie_cap(pdev);
@@ -1180,12 +1199,51 @@ static u8 rtl8168d_efuse_read(void __iomem *ioaddr, int reg_addr)
         return value;
 }
 
+static u16 rtl_get_events(struct rtl8169_private *tp)
+{
+        void __iomem *ioaddr = tp->mmio_addr;
+
+        return RTL_R16(IntrStatus);
+}
+
+static void rtl_ack_events(struct rtl8169_private *tp, u16 bits)
+{
+        void __iomem *ioaddr = tp->mmio_addr;
+
+        RTL_W16(IntrStatus, bits);
+        mmiowb();
+}
+
+static void rtl_irq_disable(struct rtl8169_private *tp)
+{
+        void __iomem *ioaddr = tp->mmio_addr;
+
+        RTL_W16(IntrMask, 0);
+        mmiowb();
+}
+
+static void rtl_irq_enable(struct rtl8169_private *tp, u16 bits)
+{
+        void __iomem *ioaddr = tp->mmio_addr;
+
+        RTL_W16(IntrMask, bits);
+}
+
+#define RTL_EVENT_NAPI_RX       (RxOK | RxErr)
+#define RTL_EVENT_NAPI_TX       (TxOK | TxErr)
+#define RTL_EVENT_NAPI          (RTL_EVENT_NAPI_RX | RTL_EVENT_NAPI_TX)
+
+static void rtl_irq_enable_all(struct rtl8169_private *tp)
+{
+        rtl_irq_enable(tp, RTL_EVENT_NAPI | tp->event_slow);
+}
+
 static void rtl8169_irq_mask_and_ack(struct rtl8169_private *tp)
 {
         void __iomem *ioaddr = tp->mmio_addr;
 
-        RTL_W16(IntrMask, 0x0000);
-        RTL_W16(IntrStatus, tp->intr_event);
+        rtl_irq_disable(tp);
+        rtl_ack_events(tp, RTL_EVENT_NAPI | tp->event_slow);
         RTL_R8(ChipCmd);
 }
 
@@ -1276,9 +1334,6 @@ static void __rtl8169_check_link_status(struct net_device *dev,
                                         struct rtl8169_private *tp,
                                         void __iomem *ioaddr, bool pm)
 {
-        unsigned long flags;
-
-        spin_lock_irqsave(&tp->lock, flags);
         if (tp->link_ok(ioaddr)) {
                 rtl_link_chg_patch(tp);
                 /* This is to cancel a scheduled suspend if there's one. */
@@ -1293,7 +1348,6 @@ static void __rtl8169_check_link_status(struct net_device *dev,
                 if (pm)
                         pm_schedule_suspend(&tp->pci_dev->dev, 5000);
         }
-        spin_unlock_irqrestore(&tp->lock, flags);
 }
 
 static void rtl8169_check_link_status(struct net_device *dev,
@@ -1336,12 +1390,12 @@ static void rtl8169_get_wol(struct net_device *dev, struct ethtool_wolinfo *wol)
 {
         struct rtl8169_private *tp = netdev_priv(dev);
 
-        spin_lock_irq(&tp->lock);
+        rtl_lock_work(tp);
 
         wol->supported = WAKE_ANY;
         wol->wolopts = __rtl8169_get_wol(tp);
 
-        spin_unlock_irq(&tp->lock);
+        rtl_unlock_work(tp);
 }
 
 static void __rtl8169_set_wol(struct rtl8169_private *tp, u32 wolopts)
@@ -1378,14 +1432,15 @@ static int rtl8169_set_wol(struct net_device *dev, struct ethtool_wolinfo *wol)
 {
         struct rtl8169_private *tp = netdev_priv(dev);
 
-        spin_lock_irq(&tp->lock);
+        rtl_lock_work(tp);
 
         if (wol->wolopts)
                 tp->features |= RTL_FEATURE_WOL;
         else
                 tp->features &= ~RTL_FEATURE_WOL;
         __rtl8169_set_wol(tp, wol->wolopts);
-        spin_unlock_irq(&tp->lock);
+
+        rtl_unlock_work(tp);
 
         device_set_wakeup_enable(&tp->pci_dev->dev, wol->wolopts);
 
@@ -1540,15 +1595,14 @@ out:
 static int rtl8169_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
 {
         struct rtl8169_private *tp = netdev_priv(dev);
-        unsigned long flags;
         int ret;
 
         del_timer_sync(&tp->timer);
 
-        spin_lock_irqsave(&tp->lock, flags);
+        rtl_lock_work(tp);
         ret = rtl8169_set_speed(dev, cmd->autoneg, ethtool_cmd_speed(cmd),
                                 cmd->duplex, cmd->advertising);
-        spin_unlock_irqrestore(&tp->lock, flags);
+        rtl_unlock_work(tp);
 
         return ret;
 }
@@ -1568,14 +1622,12 @@ static netdev_features_t rtl8169_fix_features(struct net_device *dev,
         return features;
 }
 
-static int rtl8169_set_features(struct net_device *dev,
-        netdev_features_t features)
+static void __rtl8169_set_features(struct net_device *dev,
+                                   netdev_features_t features)
 {
         struct rtl8169_private *tp = netdev_priv(dev);
-        void __iomem *ioaddr = tp->mmio_addr;
-        unsigned long flags;
 
-        spin_lock_irqsave(&tp->lock, flags);
+        void __iomem *ioaddr = tp->mmio_addr;
 
         if (features & NETIF_F_RXCSUM)
                 tp->cp_cmd |= RxChkSum;
@@ -1589,12 +1641,21 @@ static int rtl8169_set_features(struct net_device *dev,
 
         RTL_W16(CPlusCmd, tp->cp_cmd);
         RTL_R16(CPlusCmd);
+}
+
+static int rtl8169_set_features(struct net_device *dev,
+                                netdev_features_t features)
+{
+        struct rtl8169_private *tp = netdev_priv(dev);
 
-        spin_unlock_irqrestore(&tp->lock, flags);
+        rtl_lock_work(tp);
+        __rtl8169_set_features(dev, features);
+        rtl_unlock_work(tp);
 
         return 0;
 }
 
+
 static inline u32 rtl8169_tx_vlan_tag(struct rtl8169_private *tp,
                                       struct sk_buff *skb)
 {
@@ -1643,14 +1704,12 @@ static int rtl8169_gset_xmii(struct net_device *dev, struct ethtool_cmd *cmd)
 static int rtl8169_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
 {
         struct rtl8169_private *tp = netdev_priv(dev);
-        unsigned long flags;
         int rc;
 
-        spin_lock_irqsave(&tp->lock, flags);
-
+        rtl_lock_work(tp);
         rc = tp->get_settings(dev, cmd);
+        rtl_unlock_work(tp);
 
-        spin_unlock_irqrestore(&tp->lock, flags);
         return rc;
 }
 
@@ -1658,14 +1717,13 @@ static void rtl8169_get_regs(struct net_device *dev, struct ethtool_regs *regs,
                              void *p)
 {
         struct rtl8169_private *tp = netdev_priv(dev);
-        unsigned long flags;
 
         if (regs->len > R8169_REGS_SIZE)
                 regs->len = R8169_REGS_SIZE;
 
-        spin_lock_irqsave(&tp->lock, flags);
+        rtl_lock_work(tp);
         memcpy_fromio(p, tp->mmio_addr, regs->len);
-        spin_unlock_irqrestore(&tp->lock, flags);
+        rtl_unlock_work(tp);
 }
 
 static u32 rtl8169_get_msglevel(struct net_device *dev)
@@ -3182,18 +3240,14 @@ static void rtl_hw_phy_config(struct net_device *dev)
         }
 }
 
-static void rtl8169_phy_timer(unsigned long __opaque)
+static void rtl_phy_work(struct rtl8169_private *tp)
 {
-        struct net_device *dev = (struct net_device *)__opaque;
-        struct rtl8169_private *tp = netdev_priv(dev);
         struct timer_list *timer = &tp->timer;
         void __iomem *ioaddr = tp->mmio_addr;
         unsigned long timeout = RTL8169_PHY_TIMEOUT;
 
         assert(tp->mac_version > RTL_GIGA_MAC_VER_01);
 
-        spin_lock_irq(&tp->lock);
-
         if (tp->phy_reset_pending(tp)) {
                 /*
                  * A busy loop could burn quite a few cycles on nowadays CPU.
@@ -3204,32 +3258,36 @@ static void rtl8169_phy_timer(unsigned long __opaque)
         }
 
         if (tp->link_ok(ioaddr))
-                goto out_unlock;
+                return;
 
-        netif_warn(tp, link, dev, "PHY reset until link up\n");
+        netif_warn(tp, link, tp->dev, "PHY reset until link up\n");
 
         tp->phy_reset_enable(tp);
 
 out_mod_timer:
         mod_timer(timer, jiffies + timeout);
-out_unlock:
-        spin_unlock_irq(&tp->lock);
+}
+
+static void rtl_schedule_task(struct rtl8169_private *tp, enum rtl_flag flag)
+{
+        if (!test_and_set_bit(flag, tp->wk.flags))
+                schedule_work(&tp->wk.work);
+}
+
+static void rtl8169_phy_timer(unsigned long __opaque)
+{
+        struct net_device *dev = (struct net_device *)__opaque;
+        struct rtl8169_private *tp = netdev_priv(dev);
+
+        rtl_schedule_task(tp, RTL_FLAG_TASK_PHY_PENDING);
 }
 
 #ifdef CONFIG_NET_POLL_CONTROLLER
-/*
- * 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 rtl8169_netpoll(struct net_device *dev)
 {
         struct rtl8169_private *tp = netdev_priv(dev);
-        struct pci_dev *pdev = tp->pci_dev;
 
-        disable_irq(pdev->irq);
-        rtl8169_interrupt(pdev->irq, dev);
-        enable_irq(pdev->irq);
+        rtl8169_interrupt(tp->pci_dev->irq, dev);
 }
 #endif
 
@@ -3310,7 +3368,7 @@ static void rtl_rar_set(struct rtl8169_private *tp, u8 *addr)
         low  = addr[0] | (addr[1] << 8) | (addr[2] << 16) | (addr[3] << 24);
         high = addr[4] | (addr[5] << 8);
 
-        spin_lock_irq(&tp->lock);
+        rtl_lock_work(tp);
 
         RTL_W8(Cfg9346, Cfg9346_Unlock);
 
@@ -3334,7 +3392,7 @@ static void rtl_rar_set(struct rtl8169_private *tp, u8 *addr)
 
         RTL_W8(Cfg9346, Cfg9346_Lock);
 
-        spin_unlock_irq(&tp->lock);
+        rtl_unlock_work(tp);
 }
 
 static int rtl_set_mac_address(struct net_device *dev, void *p)
@@ -3388,8 +3446,7 @@ static const struct rtl_cfg_info {
         void (*hw_start)(struct net_device *);
         unsigned int region;
         unsigned int align;
-        u16 intr_event;
-        u16 napi_event;
+        u16 event_slow;
         unsigned features;
         u8 default_ver;
 } rtl_cfg_infos [] = {
@@ -3397,9 +3454,7 @@ static const struct rtl_cfg_info {
                 .hw_start       = rtl_hw_start_8169,
                 .region         = 1,
                 .align          = 0,
-                .intr_event     = SYSErr | LinkChg | RxOverflow |
-                                  RxFIFOOver | TxErr | TxOK | RxOK | RxErr,
-                .napi_event     = RxFIFOOver | TxErr | TxOK | RxOK | RxOverflow,
+                .event_slow     = SYSErr | LinkChg | RxOverflow | RxFIFOOver,
                 .features       = RTL_FEATURE_GMII,
                 .default_ver    = RTL_GIGA_MAC_VER_01,
         },
@@ -3407,9 +3462,7 @@ static const struct rtl_cfg_info {
                 .hw_start       = rtl_hw_start_8168,
                 .region         = 2,
                 .align          = 8,
-                .intr_event     = SYSErr | LinkChg | RxOverflow |
-                                  TxErr | TxOK | RxOK | RxErr,
-                .napi_event     = TxErr | TxOK | RxOK | RxOverflow,
+                .event_slow     = SYSErr | LinkChg | RxOverflow,
                 .features       = RTL_FEATURE_GMII | RTL_FEATURE_MSI,
                 .default_ver    = RTL_GIGA_MAC_VER_11,
         },
@@ -3417,9 +3470,8 @@ static const struct rtl_cfg_info {
                 .hw_start       = rtl_hw_start_8101,
                 .region         = 2,
                 .align          = 8,
-                .intr_event     = SYSErr | LinkChg | RxOverflow | PCSTimeout |
-                                  RxFIFOOver | TxErr | TxOK | RxOK | RxErr,
-                .napi_event     = RxFIFOOver | TxErr | TxOK | RxOK | RxOverflow,
+                .event_slow     = SYSErr | LinkChg | RxOverflow | RxFIFOOver |
+                                  PCSTimeout,
                 .features       = RTL_FEATURE_MSI,
                 .default_ver    = RTL_GIGA_MAC_VER_13,
         }
@@ -3824,23 +3876,21 @@ static void r8168dp_hw_jumbo_disable(struct rtl8169_private *tp)
 static void r8168e_hw_jumbo_enable(struct rtl8169_private *tp)
 {
         void __iomem *ioaddr = tp->mmio_addr;
-        struct pci_dev *pdev = tp->pci_dev;
 
         RTL_W8(MaxTxPacketSize, 0x3f);
         RTL_W8(Config3, RTL_R8(Config3) | Jumbo_En0);
         RTL_W8(Config4, RTL_R8(Config4) | 0x01);
-        pci_write_config_byte(pdev, 0x79, 0x20);
+        rtl_tx_performance_tweak(tp->pci_dev, 0x2 << MAX_READ_REQUEST_SHIFT);
 }
 
 static void r8168e_hw_jumbo_disable(struct rtl8169_private *tp)
 {
         void __iomem *ioaddr = tp->mmio_addr;
-        struct pci_dev *pdev = tp->pci_dev;
 
         RTL_W8(MaxTxPacketSize, 0x0c);
         RTL_W8(Config3, RTL_R8(Config3) & ~Jumbo_En0);
         RTL_W8(Config4, RTL_R8(Config4) & ~0x01);
-        pci_write_config_byte(pdev, 0x79, 0x50);
+        rtl_tx_performance_tweak(tp->pci_dev, 0x5 << MAX_READ_REQUEST_SHIFT);
 }
 
 static void r8168b_0_hw_jumbo_enable(struct rtl8169_private *tp)
@@ -3958,8 +4008,6 @@ rtl8169_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
 
         dev = alloc_etherdev(sizeof (*tp));
         if (!dev) {
-                if (netif_msg_drv(&debug))
-                        dev_err(&pdev->dev, "unable to alloc new ethernet\n");
                 rc = -ENOMEM;
                 goto out;
         }
@@ -4048,11 +4096,11 @@ rtl8169_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
 
         rtl_init_rxcfg(tp);
 
-        RTL_W16(IntrMask, 0x0000);
+        rtl_irq_disable(tp);
 
         rtl_hw_reset(tp);
 
-        RTL_W16(IntrStatus, 0xffff);
+        rtl_ack_events(tp, 0xffff);
 
         pci_set_master(pdev);
 
@@ -4098,7 +4146,7 @@ rtl8169_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
                 tp->do_ioctl = rtl_xmii_ioctl;
         }
 
-        spin_lock_init(&tp->lock);
+        mutex_init(&tp->wk.mutex);
 
         /* Get MAC address */
         for (i = 0; i < ETH_ALEN; i++)
@@ -4126,10 +4174,8 @@ rtl8169_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
                 /* 8110SCd requires hardware Rx VLAN - disallow toggling */
                 dev->hw_features &= ~NETIF_F_HW_VLAN_RX;
 
-        tp->intr_mask = 0xffff;
         tp->hw_start = cfg->hw_start;
-        tp->intr_event = cfg->intr_event;
-        tp->napi_event = cfg->napi_event;
+        tp->event_slow = cfg->event_slow;
 
         tp->opts1_mask = (tp->mac_version != RTL_GIGA_MAC_VER_01) ?
                 ~(RxBOVF | RxFOVF) : ~0;
@@ -4196,7 +4242,7 @@ static void __devexit rtl8169_remove_one(struct pci_dev *pdev)
                 rtl8168_driver_stop(tp);
         }
 
-        cancel_delayed_work_sync(&tp->task);
+        cancel_work_sync(&tp->wk.work);
 
         unregister_netdev(dev);
 
@@ -4257,6 +4303,8 @@ static void rtl_request_firmware(struct rtl8169_private *tp)
                 rtl_request_uncached_firmware(tp);
 }
 
+static void rtl_task(struct work_struct *);
+
 static int rtl8169_open(struct net_device *dev)
 {
         struct rtl8169_private *tp = netdev_priv(dev);
@@ -4284,7 +4332,7 @@ static int rtl8169_open(struct net_device *dev)
         if (retval < 0)
                 goto err_free_rx_1;
 
-        INIT_DELAYED_WORK(&tp->task, NULL);
+        INIT_WORK(&tp->wk.work, rtl_task);
 
         smp_mb();
 
@@ -4296,16 +4344,24 @@ static int rtl8169_open(struct net_device *dev)
         if (retval < 0)
                 goto err_release_fw_2;
 
+        rtl_lock_work(tp);
+
+        set_bit(RTL_FLAG_TASK_ENABLED, tp->wk.flags);
+
         napi_enable(&tp->napi);
 
         rtl8169_init_phy(dev, tp);
 
-        rtl8169_set_features(dev, dev->features);
+        __rtl8169_set_features(dev, dev->features);
 
         rtl_pll_power_up(tp);
 
         rtl_hw_start(dev);
 
+        netif_start_queue(dev);
+
+        rtl_unlock_work(tp);
+
         tp->saved_wolopts = 0;
         pm_runtime_put_noidle(&pdev->dev);
 
@@ -4379,7 +4435,7 @@ static void rtl_hw_start(struct net_device *dev)
 
         tp->hw_start(dev);
 
-        netif_start_queue(dev);
+        rtl_irq_enable_all(tp);
 }
 
 static void rtl_set_rx_tx_desc_registers(struct rtl8169_private *tp,
@@ -4506,9 +4562,6 @@ static void rtl_hw_start_8169(struct net_device *dev)
 
         /* no early-rx interrupts */
         RTL_W16(MultiIntr, RTL_R16(MultiIntr) & 0xF000);
-
-        /* Enable all known interrupts by setting the interrupt mask. */
-        RTL_W16(IntrMask, tp->intr_event);
 }
 
 static void rtl_csi_access_enable(void __iomem *ioaddr, u32 bits)
@@ -4888,8 +4941,8 @@ static void rtl_hw_start_8168(struct net_device *dev)
 
         /* Work around for RxFIFO overflow. */
         if (tp->mac_version == RTL_GIGA_MAC_VER_11) {
-                tp->intr_event |= RxFIFOOver | PCSTimeout;
-                tp->intr_event &= ~RxOverflow;
+                tp->event_slow |= RxFIFOOver | PCSTimeout;
+                tp->event_slow &= ~RxOverflow;
         }
 
         rtl_set_rx_tx_desc_registers(tp, ioaddr);
@@ -4977,8 +5030,6 @@ static void rtl_hw_start_8168(struct net_device *dev)
         RTL_W8(Cfg9346, Cfg9346_Lock);
 
         RTL_W16(MultiIntr, RTL_R16(MultiIntr) & 0xF000);
-
-        RTL_W16(IntrMask, tp->intr_event);
 }
 
 #define R810X_CPCMD_QUIRK_MASK (\
@@ -5077,10 +5128,8 @@ static void rtl_hw_start_8101(struct net_device *dev)
         void __iomem *ioaddr = tp->mmio_addr;
         struct pci_dev *pdev = tp->pci_dev;
 
-        if (tp->mac_version >= RTL_GIGA_MAC_VER_30) {
-                tp->intr_event &= ~RxFIFOOver;
-                tp->napi_event &= ~RxFIFOOver;
-        }
+        if (tp->mac_version >= RTL_GIGA_MAC_VER_30)
+                tp->event_slow &= ~RxFIFOOver;
 
         if (tp->mac_version == RTL_GIGA_MAC_VER_13 ||
             tp->mac_version == RTL_GIGA_MAC_VER_16) {
@@ -5136,8 +5185,6 @@ static void rtl_hw_start_8101(struct net_device *dev)
         rtl_set_rx_mode(dev);
 
         RTL_W16(MultiIntr, RTL_R16(MultiIntr) & 0xf000);
-
-        RTL_W16(IntrMask, tp->intr_event);
 }
 
 static int rtl8169_change_mtu(struct net_device *dev, int new_mtu)
@@ -5330,92 +5377,34 @@ static void rtl8169_tx_clear(struct rtl8169_private *tp)
         tp->cur_tx = tp->dirty_tx = 0;
 }
 
-static void rtl8169_schedule_work(struct net_device *dev, work_func_t task)
-{
-        struct rtl8169_private *tp = netdev_priv(dev);
-
-        PREPARE_DELAYED_WORK(&tp->task, task);
-        schedule_delayed_work(&tp->task, 4);
-}
-
-static void rtl8169_wait_for_quiescence(struct net_device *dev)
-{
-        struct rtl8169_private *tp = netdev_priv(dev);
-        void __iomem *ioaddr = tp->mmio_addr;
-
-        synchronize_irq(dev->irq);
-
-        /* Wait for any pending NAPI task to complete */
-        napi_disable(&tp->napi);
-
-        rtl8169_irq_mask_and_ack(tp);
-
-        tp->intr_mask = 0xffff;
-        RTL_W16(IntrMask, tp->intr_event);
-        napi_enable(&tp->napi);
-}
-
-static void rtl8169_reinit_task(struct work_struct *work)
+static void rtl_reset_work(struct rtl8169_private *tp)
 {
-        struct rtl8169_private *tp =
-                container_of(work, struct rtl8169_private, task.work);
-        struct net_device *dev = tp->dev;
-        int ret;
-
-        rtnl_lock();
-
-        if (!netif_running(dev))
-                goto out_unlock;
-
-        rtl8169_wait_for_quiescence(dev);
-        rtl8169_close(dev);
-
-        ret = rtl8169_open(dev);
-        if (unlikely(ret < 0)) {
-                if (net_ratelimit())
-                        netif_err(tp, drv, dev,
-                                  "reinit failure (status = %d). Rescheduling\n",
-                                  ret);
-                rtl8169_schedule_work(dev, rtl8169_reinit_task);
-        }
-
-out_unlock:
-        rtnl_unlock();
-}
-
-static void rtl8169_reset_task(struct work_struct *work)
-{
-        struct rtl8169_private *tp =
-                container_of(work, struct rtl8169_private, task.work);
         struct net_device *dev = tp->dev;
         int i;
 
-        rtnl_lock();
-
-        if (!netif_running(dev))
-                goto out_unlock;
+        napi_disable(&tp->napi);
+        netif_stop_queue(dev);
+        synchronize_sched();
 
         rtl8169_hw_reset(tp);
 
-        rtl8169_wait_for_quiescence(dev);
-
         for (i = 0; i < NUM_RX_DESC; i++)
                 rtl8169_mark_to_asic(tp->RxDescArray + i, rx_buf_sz);
 
         rtl8169_tx_clear(tp);
         rtl8169_init_ring_indexes(tp);
 
+        napi_enable(&tp->napi);
         rtl_hw_start(dev);
         netif_wake_queue(dev);
         rtl8169_check_link_status(dev, tp, tp->mmio_addr);
-
-out_unlock:
-        rtnl_unlock();
 }
 
 static void rtl8169_tx_timeout(struct net_device *dev)
 {
-        rtl8169_schedule_work(dev, rtl8169_reset_task);
+        struct rtl8169_private *tp = netdev_priv(dev);
+
+        rtl_schedule_task(tp, RTL_FLAG_TASK_RESET_PENDING);
 }
 
 static int rtl8169_xmit_frags(struct rtl8169_private *tp, struct sk_buff *skb,
@@ -5552,9 +5541,22 @@ static netdev_tx_t rtl8169_start_xmit(struct sk_buff *skb,
 
         RTL_W8(TxPoll, NPQ);
 
+        mmiowb();
+
         if (TX_BUFFS_AVAIL(tp) < MAX_SKB_FRAGS) {
+                /* Avoid wrongly optimistic queue wake-up: rtl_tx thread must
+                 * not miss a ring update when it notices a stopped queue.
+                 */
+                smp_wmb();
                 netif_stop_queue(dev);
-                smp_rmb();
+                /* Sync with rtl_tx:
+                 * - publish queue status and cur_tx ring index (write barrier)
+                 * - refresh dirty_tx ring index (read barrier).
+                 * May the current thread have a pessimistic view of the ring
+                 * status and forget to wake up queue, a racing rtl_tx thread
+                 * can't.
+                 */
+                smp_mb();
                 if (TX_BUFFS_AVAIL(tp) >= MAX_SKB_FRAGS)
                         netif_wake_queue(dev);
         }
@@ -5618,12 +5620,10 @@ static void rtl8169_pcierr_interrupt(struct net_device *dev)
 
         rtl8169_hw_reset(tp);
 
-        rtl8169_schedule_work(dev, rtl8169_reinit_task);
+        rtl_schedule_task(tp, RTL_FLAG_TASK_RESET_PENDING);
 }
 
-static void rtl8169_tx_interrupt(struct net_device *dev,
-                                 struct rtl8169_private *tp,
-                                 void __iomem *ioaddr)
+static void rtl_tx(struct net_device *dev, struct rtl8169_private *tp)
 {
         unsigned int dirty_tx, tx_left;
 
@@ -5655,7 +5655,14 @@ static void rtl8169_tx_interrupt(struct net_device *dev,
 
         if (tp->dirty_tx != dirty_tx) {
                 tp->dirty_tx = dirty_tx;
-                smp_wmb();
+                /* Sync with rtl8169_start_xmit:
+                 * - publish dirty_tx ring index (write barrier)
+                 * - refresh cur_tx ring index and queue status (read barrier)
+                 * May the current thread miss the stopped queue condition,
+                 * a racing xmit thread can only have a right view of the
+                 * ring status.
+                 */
+                smp_mb();
                 if (netif_queue_stopped(dev) &&
                     (TX_BUFFS_AVAIL(tp) >= MAX_SKB_FRAGS)) {
                         netif_wake_queue(dev);
@@ -5666,9 +5673,11 @@ static void rtl8169_tx_interrupt(struct net_device *dev,
                  * of start_xmit activity is detected (if it is not detected,
                  * it is slow enough). -- FR
                  */
-                smp_rmb();
-                if (tp->cur_tx != dirty_tx)
+                if (tp->cur_tx != dirty_tx) {
+                        void __iomem *ioaddr = tp->mmio_addr;
+
                         RTL_W8(TxPoll, NPQ);
+                }
         }
 }
 
@@ -5707,9 +5716,7 @@ static struct sk_buff *rtl8169_try_rx_copy(void *data,
         return skb;
 }
 
-static int rtl8169_rx_interrupt(struct net_device *dev,
-                                struct rtl8169_private *tp,
-                                void __iomem *ioaddr, u32 budget)
+static int rtl_rx(struct net_device *dev, struct rtl8169_private *tp, u32 budget)
 {
         unsigned int cur_rx, rx_left;
         unsigned int count;
@@ -5737,7 +5744,7 @@ static int rtl8169_rx_interrupt(struct net_device *dev,
                         if (status & RxCRC)
                                 dev->stats.rx_crc_errors++;
                         if (status & RxFOVF) {
-                                rtl8169_schedule_work(dev, rtl8169_reset_task);
+                                rtl_schedule_task(tp, RTL_FLAG_TASK_RESET_PENDING);
                                 dev->stats.rx_fifo_errors++;
                         }
                         rtl8169_mark_to_asic(desc, rx_buf_sz);
@@ -5798,101 +5805,120 @@ static irqreturn_t rtl8169_interrupt(int irq, void *dev_instance)
 {
         struct net_device *dev = dev_instance;
         struct rtl8169_private *tp = netdev_priv(dev);
-        void __iomem *ioaddr = tp->mmio_addr;
         int handled = 0;
-        int status;
+        u16 status;
 
-        /* loop handling interrupts until we have no new ones or
-         * we hit a invalid/hotplug case.
-         */
-        status = RTL_R16(IntrStatus);
-        while (status && status != 0xffff) {
-                status &= tp->intr_event;
-                if (!status)
-                        break;
+        status = rtl_get_events(tp);
+        if (status && status != 0xffff) {
+                status &= RTL_EVENT_NAPI | tp->event_slow;
+                if (status) {
+                        handled = 1;
 
-                handled = 1;
+                        rtl_irq_disable(tp);
+                        napi_schedule(&tp->napi);
+                }
+        }
+        return IRQ_RETVAL(handled);
+}
 
-                /* Handle all of the error cases first. These will reset
-                 * the chip, so just exit the loop.
-                 */
-                if (unlikely(!netif_running(dev))) {
-                        rtl8169_hw_reset(tp);
+/*
+ * Workqueue context.
+ */
+static void rtl_slow_event_work(struct rtl8169_private *tp)
+{
+        struct net_device *dev = tp->dev;
+        u16 status;
+
+        status = rtl_get_events(tp) & tp->event_slow;
+        rtl_ack_events(tp, status);
+
+        if (unlikely(status & RxFIFOOver)) {
+                switch (tp->mac_version) {
+                /* Work around for rx fifo overflow */
+                case RTL_GIGA_MAC_VER_11:
+                        netif_stop_queue(dev);
+                        /* XXX - Hack alert. See rtl_task(). */
+                        set_bit(RTL_FLAG_TASK_RESET_PENDING, tp->wk.flags);
+                default:
                         break;
                 }
+        }
 
-                if (unlikely(status & RxFIFOOver)) {
-                        switch (tp->mac_version) {
-                        /* Work around for rx fifo overflow */
-                        case RTL_GIGA_MAC_VER_11:
-                                netif_stop_queue(dev);
-                                rtl8169_tx_timeout(dev);
-                                goto done;
-                        default:
-                                break;
-                        }
-                }
+        if (unlikely(status & SYSErr))
+                rtl8169_pcierr_interrupt(dev);
 
-                if (unlikely(status & SYSErr)) {
-                        rtl8169_pcierr_interrupt(dev);
-                        break;
-                }
+        if (status & LinkChg)
+                __rtl8169_check_link_status(dev, tp, tp->mmio_addr, true);
 
-                if (status & LinkChg)
-                        __rtl8169_check_link_status(dev, tp, ioaddr, true);
+        napi_disable(&tp->napi);
+        rtl_irq_disable(tp);
 
-                /* We need to see the lastest version of tp->intr_mask to
-                 * avoid ignoring an MSI interrupt and having to wait for
-                 * another event which may never come.
-                 */
-                smp_rmb();
-                if (status & tp->intr_mask & tp->napi_event) {
-                        RTL_W16(IntrMask, tp->intr_event & ~tp->napi_event);
-                        tp->intr_mask = ~tp->napi_event;
-
-                        if (likely(napi_schedule_prep(&tp->napi)))
-                                __napi_schedule(&tp->napi);
-                        else
-                                netif_info(tp, intr, dev,
-                                           "interrupt %04x in poll\n", status);
-                }
+        napi_enable(&tp->napi);
+        napi_schedule(&tp->napi);
+}
 
-                /* We only get a new MSI interrupt when all active irq
-                 * sources on the chip have been acknowledged. So, ack
-                 * everything we've seen and check if new sources have become
-                 * active to avoid blocking all interrupts from the chip.
-                 */
-                RTL_W16(IntrStatus,
-                        (status & RxFIFOOver) ? (status | RxOverflow) : status);
-                status = RTL_R16(IntrStatus);
+static void rtl_task(struct work_struct *work)
+{
+        static const struct {
+                int bitnr;
+                void (*action)(struct rtl8169_private *);
+        } rtl_work[] = {
+                /* XXX - keep rtl_slow_event_work() as first element. */
+                { RTL_FLAG_TASK_SLOW_PENDING,   rtl_slow_event_work },
+                { RTL_FLAG_TASK_RESET_PENDING,  rtl_reset_work },
+                { RTL_FLAG_TASK_PHY_PENDING,    rtl_phy_work }
+        };
+        struct rtl8169_private *tp =
+                container_of(work, struct rtl8169_private, wk.work);
+        struct net_device *dev = tp->dev;
+        int i;
+
+        rtl_lock_work(tp);
+
+        if (!netif_running(dev) ||
+            !test_bit(RTL_FLAG_TASK_ENABLED, tp->wk.flags))
+                goto out_unlock;
+
+        for (i = 0; i < ARRAY_SIZE(rtl_work); i++) {
+                bool pending;
+
+                pending = test_and_clear_bit(rtl_work[i].bitnr, tp->wk.flags);
+                if (pending)
+                        rtl_work[i].action(tp);
         }
-done:
-        return IRQ_RETVAL(handled);
+
+out_unlock:
+        rtl_unlock_work(tp);
 }
 
 static int rtl8169_poll(struct napi_struct *napi, int budget)
 {
         struct rtl8169_private *tp = container_of(napi, struct rtl8169_private, napi);
         struct net_device *dev = tp->dev;
-        void __iomem *ioaddr = tp->mmio_addr;
-        int work_done;
+        u16 enable_mask = RTL_EVENT_NAPI | tp->event_slow;
+        int work_done= 0;
+        u16 status;
+
+        status = rtl_get_events(tp);
+        rtl_ack_events(tp, status & ~tp->event_slow);
 
-        work_done = rtl8169_rx_interrupt(dev, tp, ioaddr, (u32) budget);
-        rtl8169_tx_interrupt(dev, tp, ioaddr);
+        if (status & RTL_EVENT_NAPI_RX)
+                work_done = rtl_rx(dev, tp, (u32) budget);
+
+        if (status & RTL_EVENT_NAPI_TX)
+                rtl_tx(dev, tp);
+
+        if (status & tp->event_slow) {
+                enable_mask &= ~tp->event_slow;
+
+                rtl_schedule_task(tp, RTL_FLAG_TASK_SLOW_PENDING);
+        }
 
         if (work_done < budget) {
                 napi_complete(napi);
 
-                /* We need for force the visibility of tp->intr_mask
-                 * for other CPUs, as we can loose an MSI interrupt
-                 * and potentially wait for a retransmit timeout if we don't.
-                 * The posted write to IntrMask is safe, as it will
-                 * eventually make it to the chip and we won't loose anything
-                 * until it does.
-                 */
-                tp->intr_mask = 0xffff;
-                wmb();
-                RTL_W16(IntrMask, tp->intr_event);
+                rtl_irq_enable(tp, enable_mask);
+                mmiowb();
         }
 
         return work_done;
@@ -5916,26 +5942,19 @@ static void rtl8169_down(struct net_device *dev)
 
         del_timer_sync(&tp->timer);
 
-        netif_stop_queue(dev);
-
         napi_disable(&tp->napi);
-
-        spin_lock_irq(&tp->lock);
+        netif_stop_queue(dev);
 
         rtl8169_hw_reset(tp);
         /*
          * At this point device interrupts can not be enabled in any function,
-         * as netif_running is not true (rtl8169_interrupt, rtl8169_reset_task,
-         * rtl8169_reinit_task) and napi is disabled (rtl8169_poll).
+         * as netif_running is not true (rtl8169_interrupt, rtl8169_reset_task)
+         * and napi is disabled (rtl8169_poll).
          */
         rtl8169_rx_missed(dev, ioaddr);
 
-        spin_unlock_irq(&tp->lock);
-
-        synchronize_irq(dev->irq);
-
         /* Give a racing hard_start_xmit a few cycles to complete. */
-        synchronize_sched();  /* FIXME: should this be synchronize_irq()? */
+        synchronize_sched();
 
         rtl8169_tx_clear(tp);
 
@@ -5954,7 +5973,11 @@ static int rtl8169_close(struct net_device *dev)
         /* Update counters before going down */
         rtl8169_update_counters(dev);
 
+        rtl_lock_work(tp);
+        clear_bit(RTL_FLAG_TASK_ENABLED, tp->wk.flags);
+
         rtl8169_down(dev);
+        rtl_unlock_work(tp);
 
         free_irq(dev->irq, dev);
 
@@ -5974,7 +5997,6 @@ static void rtl_set_rx_mode(struct net_device *dev)
 {
         struct rtl8169_private *tp = netdev_priv(dev);
         void __iomem *ioaddr = tp->mmio_addr;
-        unsigned long flags;
         u32 mc_filter[2];       /* Multicast hash filter */
         int rx_mode;
         u32 tmp = 0;
@@ -6003,8 +6025,6 @@ static void rtl_set_rx_mode(struct net_device *dev)
                 }
         }
 
-        spin_lock_irqsave(&tp->lock, flags);
-
         tmp = (RTL_R32(RxConfig) & ~RX_CONFIG_ACCEPT_MASK) | rx_mode;
 
         if (tp->mac_version > RTL_GIGA_MAC_VER_06) {
@@ -6018,8 +6038,6 @@ static void rtl_set_rx_mode(struct net_device *dev)
         RTL_W32(MAR0 + 0, mc_filter[0]);
 
         RTL_W32(RxConfig, tmp);
-
-        spin_unlock_irqrestore(&tp->lock, flags);
 }
 
 /**
@@ -6032,13 +6050,9 @@ static struct net_device_stats *rtl8169_get_stats(struct net_device *dev)
 {
         struct rtl8169_private *tp = netdev_priv(dev);
         void __iomem *ioaddr = tp->mmio_addr;
-        unsigned long flags;
 
-        if (netif_running(dev)) {
-                spin_lock_irqsave(&tp->lock, flags);
+        if (netif_running(dev))
                 rtl8169_rx_missed(dev, ioaddr);
-                spin_unlock_irqrestore(&tp->lock, flags);
-        }
 
         return &dev->stats;
 }
@@ -6050,10 +6064,15 @@ static void rtl8169_net_suspend(struct net_device *dev)
         if (!netif_running(dev))
                 return;
 
-        rtl_pll_power_down(tp);
-
         netif_device_detach(dev);
         netif_stop_queue(dev);
+
+        rtl_lock_work(tp);
+        napi_disable(&tp->napi);
+        clear_bit(RTL_FLAG_TASK_ENABLED, tp->wk.flags);
+        rtl_unlock_work(tp);
+
+        rtl_pll_power_down(tp);
 }
 
 #ifdef CONFIG_PM
@@ -6076,7 +6095,9 @@ static void __rtl8169_resume(struct net_device *dev)
 
         rtl_pll_power_up(tp);
 
-        rtl8169_schedule_work(dev, rtl8169_reset_task);
+        set_bit(RTL_FLAG_TASK_ENABLED, tp->wk.flags);
+
+        rtl_schedule_task(tp, RTL_FLAG_TASK_RESET_PENDING);
 }
 
 static int rtl8169_resume(struct device *device)
@@ -6102,10 +6123,10 @@ static int rtl8169_runtime_suspend(struct device *device)
         if (!tp->TxDescArray)
                 return 0;
 
-        spin_lock_irq(&tp->lock);
+        rtl_lock_work(tp);
         tp->saved_wolopts = __rtl8169_get_wol(tp);
         __rtl8169_set_wol(tp, WAKE_ANY);
-        spin_unlock_irq(&tp->lock);
+        rtl_unlock_work(tp);
 
         rtl8169_net_suspend(dev);
 
@@ -6121,10 +6142,10 @@ static int rtl8169_runtime_resume(struct device *device)
         if (!tp->TxDescArray)
                 return 0;
 
-        spin_lock_irq(&tp->lock);
+        rtl_lock_work(tp);
         __rtl8169_set_wol(tp, tp->saved_wolopts);
         tp->saved_wolopts = 0;
-        spin_unlock_irq(&tp->lock);
+        rtl_unlock_work(tp);
 
         rtl8169_init_phy(dev, tp);
 
@@ -6192,12 +6213,8 @@ static void rtl_shutdown(struct pci_dev *pdev)
         /* Restore original MAC address */
         rtl_rar_set(tp, dev->perm_addr);
 
-        spin_lock_irq(&tp->lock);
-
         rtl8169_hw_reset(tp);
 
-        spin_unlock_irq(&tp->lock);
-
         if (system_state == SYSTEM_POWER_OFF) {
                 if (__rtl8169_get_wol(tp) & WAKE_ANY) {
                         rtl_wol_suspend_quirk(tp);
diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c
index 87b650131774..cfad09107054 100644
--- a/drivers/net/ethernet/renesas/sh_eth.c
+++ b/drivers/net/ethernet/renesas/sh_eth.c
@@ -654,13 +654,12 @@ static void sh_eth_ring_format(struct net_device *ndev)
         for (i = 0; i < RX_RING_SIZE; i++) {
                 /* skb */
                 mdp->rx_skbuff[i] = NULL;
-                skb = dev_alloc_skb(mdp->rx_buf_sz);
+                skb = netdev_alloc_skb(ndev, mdp->rx_buf_sz);
                 mdp->rx_skbuff[i] = skb;
                 if (skb == NULL)
                         break;
-                dma_map_single(&ndev->dev, skb->tail, mdp->rx_buf_sz,
+                dma_map_single(&ndev->dev, skb->data, mdp->rx_buf_sz,
                                 DMA_FROM_DEVICE);
-                skb->dev = ndev; /* Mark as being used by this device. */
                 sh_eth_set_receive_align(skb);
 
                 /* RX descriptor */
@@ -883,8 +882,8 @@ static int sh_eth_txfree(struct net_device *ndev)
                 if (entry >= TX_RING_SIZE - 1)
                         txdesc->status |= cpu_to_edmac(mdp, TD_TDLE);
 
-                mdp->stats.tx_packets++;
-                mdp->stats.tx_bytes += txdesc->buffer_length;
+                ndev->stats.tx_packets++;
+                ndev->stats.tx_bytes += txdesc->buffer_length;
         }
         return freeNum;
 }
@@ -910,23 +909,23 @@ static int sh_eth_rx(struct net_device *ndev)
                         break;
 
                 if (!(desc_status & RDFEND))
-                        mdp->stats.rx_length_errors++;
+                        ndev->stats.rx_length_errors++;
 
                 if (desc_status & (RD_RFS1 | RD_RFS2 | RD_RFS3 | RD_RFS4 |
                                    RD_RFS5 | RD_RFS6 | RD_RFS10)) {
-                        mdp->stats.rx_errors++;
+                        ndev->stats.rx_errors++;
                         if (desc_status & RD_RFS1)
-                                mdp->stats.rx_crc_errors++;
+                                ndev->stats.rx_crc_errors++;
                         if (desc_status & RD_RFS2)
-                                mdp->stats.rx_frame_errors++;
+                                ndev->stats.rx_frame_errors++;
                         if (desc_status & RD_RFS3)
-                                mdp->stats.rx_length_errors++;
+                                ndev->stats.rx_length_errors++;
                         if (desc_status & RD_RFS4)
-                                mdp->stats.rx_length_errors++;
+                                ndev->stats.rx_length_errors++;
                         if (desc_status & RD_RFS6)
-                                mdp->stats.rx_missed_errors++;
+                                ndev->stats.rx_missed_errors++;
                         if (desc_status & RD_RFS10)
-                                mdp->stats.rx_over_errors++;
+                                ndev->stats.rx_over_errors++;
                 } else {
                         if (!mdp->cd->hw_swap)
                                 sh_eth_soft_swap(
@@ -939,8 +938,8 @@ static int sh_eth_rx(struct net_device *ndev)
                         skb_put(skb, pkt_len);
                         skb->protocol = eth_type_trans(skb, ndev);
                         netif_rx(skb);
-                        mdp->stats.rx_packets++;
-                        mdp->stats.rx_bytes += pkt_len;
+                        ndev->stats.rx_packets++;
+                        ndev->stats.rx_bytes += pkt_len;
                 }
                 rxdesc->status |= cpu_to_edmac(mdp, RD_RACT);
                 entry = (++mdp->cur_rx) % RX_RING_SIZE;
@@ -955,13 +954,12 @@ static int sh_eth_rx(struct net_device *ndev)
                 rxdesc->buffer_length = ALIGN(mdp->rx_buf_sz, 16);
 
                 if (mdp->rx_skbuff[entry] == NULL) {
-                        skb = dev_alloc_skb(mdp->rx_buf_sz);
+                        skb = netdev_alloc_skb(ndev, mdp->rx_buf_sz);
                         mdp->rx_skbuff[entry] = skb;
                         if (skb == NULL)
                                 break;  /* Better luck next round. */
-                        dma_map_single(&ndev->dev, skb->tail, mdp->rx_buf_sz,
+                        dma_map_single(&ndev->dev, skb->data, mdp->rx_buf_sz,
                                         DMA_FROM_DEVICE);
-                        skb->dev = ndev;
                         sh_eth_set_receive_align(skb);
 
                         skb_checksum_none_assert(skb);
@@ -1009,7 +1007,7 @@ static void sh_eth_error(struct net_device *ndev, int intr_status)
                 felic_stat = sh_eth_read(ndev, ECSR);
                 sh_eth_write(ndev, felic_stat, ECSR);   /* clear int */
                 if (felic_stat & ECSR_ICD)
-                        mdp->stats.tx_carrier_errors++;
+                        ndev->stats.tx_carrier_errors++;
                 if (felic_stat & ECSR_LCHNG) {
                         /* Link Changed */
                         if (mdp->cd->no_psr || mdp->no_ether_link) {
@@ -1042,7 +1040,7 @@ static void sh_eth_error(struct net_device *ndev, int intr_status)
         if (intr_status & EESR_TWB) {
                 /* Write buck end. unused write back interrupt */
                 if (intr_status & EESR_TABT)    /* Transmit Abort int */
-                        mdp->stats.tx_aborted_errors++;
+                        ndev->stats.tx_aborted_errors++;
                         if (netif_msg_tx_err(mdp))
                                 dev_err(&ndev->dev, "Transmit Abort\n");
         }
@@ -1051,7 +1049,7 @@ static void sh_eth_error(struct net_device *ndev, int intr_status)
                 /* Receive Abort int */
                 if (intr_status & EESR_RFRMER) {
                         /* Receive Frame Overflow int */
-                        mdp->stats.rx_frame_errors++;
+                        ndev->stats.rx_frame_errors++;
                         if (netif_msg_rx_err(mdp))
                                 dev_err(&ndev->dev, "Receive Abort\n");
                 }
@@ -1059,21 +1057,21 @@ static void sh_eth_error(struct net_device *ndev, int intr_status)
 
         if (intr_status & EESR_TDE) {
                 /* Transmit Descriptor Empty int */
-                mdp->stats.tx_fifo_errors++;
+                ndev->stats.tx_fifo_errors++;
                 if (netif_msg_tx_err(mdp))
                         dev_err(&ndev->dev, "Transmit Descriptor Empty\n");
         }
 
         if (intr_status & EESR_TFE) {
                 /* FIFO under flow */
-                mdp->stats.tx_fifo_errors++;
+                ndev->stats.tx_fifo_errors++;
                 if (netif_msg_tx_err(mdp))
                         dev_err(&ndev->dev, "Transmit FIFO Under flow\n");
         }
 
         if (intr_status & EESR_RDE) {
                 /* Receive Descriptor Empty int */
-                mdp->stats.rx_over_errors++;
+                ndev->stats.rx_over_errors++;
 
                 if (sh_eth_read(ndev, EDRRR) ^ EDRRR_R)
                         sh_eth_write(ndev, EDRRR_R, EDRRR);
@@ -1083,14 +1081,14 @@ static void sh_eth_error(struct net_device *ndev, int intr_status)
 
         if (intr_status & EESR_RFE) {
                 /* Receive FIFO Overflow int */
-                mdp->stats.rx_fifo_errors++;
+                ndev->stats.rx_fifo_errors++;
                 if (netif_msg_rx_err(mdp))
                         dev_err(&ndev->dev, "Receive FIFO Overflow\n");
         }
 
         if (!mdp->cd->no_ade && (intr_status & EESR_ADE)) {
                 /* Address Error */
-                mdp->stats.tx_fifo_errors++;
+                ndev->stats.tx_fifo_errors++;
                 if (netif_msg_tx_err(mdp))
                         dev_err(&ndev->dev, "Address Error\n");
         }
@@ -1447,7 +1445,7 @@ static void sh_eth_tx_timeout(struct net_device *ndev)
                " resetting...\n", ndev->name, (int)sh_eth_read(ndev, EESR));
 
         /* tx_errors count up */
-        mdp->stats.tx_errors++;
+        ndev->stats.tx_errors++;
 
         /* timer off */
         del_timer_sync(&mdp->timer);
@@ -1569,27 +1567,27 @@ static struct net_device_stats *sh_eth_get_stats(struct net_device *ndev)
 
         pm_runtime_get_sync(&mdp->pdev->dev);
 
-        mdp->stats.tx_dropped += sh_eth_read(ndev, TROCR);
+        ndev->stats.tx_dropped += sh_eth_read(ndev, TROCR);
         sh_eth_write(ndev, 0, TROCR);   /* (write clear) */
-        mdp->stats.collisions += sh_eth_read(ndev, CDCR);
+        ndev->stats.collisions += sh_eth_read(ndev, CDCR);
         sh_eth_write(ndev, 0, CDCR);    /* (write clear) */
-        mdp->stats.tx_carrier_errors += sh_eth_read(ndev, LCCR);
+        ndev->stats.tx_carrier_errors += sh_eth_read(ndev, LCCR);
         sh_eth_write(ndev, 0, LCCR);    /* (write clear) */
         if (sh_eth_is_gether(mdp)) {
-                mdp->stats.tx_carrier_errors += sh_eth_read(ndev, CERCR);
+                ndev->stats.tx_carrier_errors += sh_eth_read(ndev, CERCR);
                 sh_eth_write(ndev, 0, CERCR);   /* (write clear) */
-                mdp->stats.tx_carrier_errors += sh_eth_read(ndev, CEECR);
+                ndev->stats.tx_carrier_errors += sh_eth_read(ndev, CEECR);
                 sh_eth_write(ndev, 0, CEECR);   /* (write clear) */
         } else {
-                mdp->stats.tx_carrier_errors += sh_eth_read(ndev, CNDCR);
+                ndev->stats.tx_carrier_errors += sh_eth_read(ndev, CNDCR);
                 sh_eth_write(ndev, 0, CNDCR);   /* (write clear) */
         }
         pm_runtime_put_sync(&mdp->pdev->dev);
 
-        return &mdp->stats;
+        return &ndev->stats;
 }
 
-/* ioctl to device funciotn*/
+/* ioctl to device function */
 static int sh_eth_do_ioctl(struct net_device *ndev, struct ifreq *rq,
                                 int cmd)
 {
@@ -1794,7 +1792,6 @@ static int sh_eth_drv_probe(struct platform_device *pdev)
 
         ndev = alloc_etherdev(sizeof(struct sh_eth_private));
         if (!ndev) {
-                dev_err(&pdev->dev, "Could not allocate device.\n");
                 ret = -ENOMEM;
                 goto out;
         }
diff --git a/drivers/net/ethernet/renesas/sh_eth.h b/drivers/net/ethernet/renesas/sh_eth.h
index cdbd844662a7..cb07add8638f 100644
--- a/drivers/net/ethernet/renesas/sh_eth.h
+++ b/drivers/net/ethernet/renesas/sh_eth.h
@@ -759,7 +759,6 @@ struct sh_eth_private {
         struct sh_eth_txdesc *tx_ring;
         struct sk_buff **rx_skbuff;
         struct sk_buff **tx_skbuff;
-        struct net_device_stats stats;
         struct timer_list timer;
         spinlock_t lock;
         u32 cur_rx, dirty_rx;   /* Producer/consumer ring indices */
diff --git a/drivers/net/ethernet/s6gmac.c b/drivers/net/ethernet/s6gmac.c
index 22e9c0181ce8..1895605abb35 100644
--- a/drivers/net/ethernet/s6gmac.c
+++ b/drivers/net/ethernet/s6gmac.c
@@ -370,12 +370,13 @@ struct s6gmac {
         } link;
 };
 
-static void s6gmac_rx_fillfifo(struct s6gmac *pd)
+static void s6gmac_rx_fillfifo(struct net_device *dev)
 {
+        struct s6gmac *pd = netdev_priv(dev);
         struct sk_buff *skb;
         while ((((u8)(pd->rx_skb_i - pd->rx_skb_o)) < S6_NUM_RX_SKB) &&
                (!s6dmac_fifo_full(pd->rx_dma, pd->rx_chan)) &&
-               (skb = dev_alloc_skb(S6_MAX_FRLEN + 2))) {
+               (skb = netdev_alloc_skb(dev, S6_MAX_FRLEN + 2))) {
                 pd->rx_skb[(pd->rx_skb_i++) % S6_NUM_RX_SKB] = skb;
                 s6dmac_put_fifo_cache(pd->rx_dma, pd->rx_chan,
                         pd->io, (u32)skb->data, S6_MAX_FRLEN);
@@ -514,7 +515,7 @@ static irqreturn_t s6gmac_interrupt(int irq, void *dev_id)
         spin_lock(&pd->lock);
         if (s6dmac_termcnt_irq(pd->rx_dma, pd->rx_chan))
                 s6gmac_rx_interrupt(dev);
-        s6gmac_rx_fillfifo(pd);
+        s6gmac_rx_fillfifo(dev);
         if (s6dmac_termcnt_irq(pd->tx_dma, pd->tx_chan))
                 s6gmac_tx_interrupt(dev);
         s6gmac_stats_interrupt(pd, 0);
@@ -894,7 +895,7 @@ static int s6gmac_open(struct net_device *dev)
         s6gmac_init_device(dev);
         s6gmac_init_stats(dev);
         s6gmac_init_dmac(dev);
-        s6gmac_rx_fillfifo(pd);
+        s6gmac_rx_fillfifo(dev);
         s6dmac_enable_chan(pd->rx_dma, pd->rx_chan,
                 2, 1, 0, 1, 0, 0, 0, 7, -1, 2, 0, 1);
         s6dmac_enable_chan(pd->tx_dma, pd->tx_chan,
@@ -960,11 +961,11 @@ static int __devinit s6gmac_probe(struct platform_device *pdev)
         int res;
         unsigned long i;
         struct mii_bus *mb;
+
         dev = alloc_etherdev(sizeof(*pd));
-        if (!dev) {
-                printk(KERN_ERR DRV_PRMT "etherdev alloc failed, aborting.\n");
+        if (!dev)
                 return -ENOMEM;
-        }
+
         dev->open = s6gmac_open;
         dev->stop = s6gmac_stop;
         dev->hard_start_xmit = s6gmac_tx;
diff --git a/drivers/net/ethernet/seeq/ether3.c b/drivers/net/ethernet/seeq/ether3.c
index 893c880dadf0..7b819bd8c416 100644
--- a/drivers/net/ethernet/seeq/ether3.c
+++ b/drivers/net/ethernet/seeq/ether3.c
@@ -643,7 +643,7 @@ if (next_ptr < RX_START || next_ptr >= RX_END) {
                         if (next_ptr <= this_ptr)
                                 length += RX_END - RX_START;
 
-                        skb = dev_alloc_skb(length + 2);
+                        skb = netdev_alloc_skb(dev, length + 2);
                         if (skb) {
                                 unsigned char *buf;
 
diff --git a/drivers/net/ethernet/seeq/seeq8005.c b/drivers/net/ethernet/seeq/seeq8005.c
index 60561451789b..798990774446 100644
--- a/drivers/net/ethernet/seeq/seeq8005.c
+++ b/drivers/net/ethernet/seeq/seeq8005.c
@@ -548,7 +548,7 @@ static void seeq8005_rx(struct net_device *dev)
                         struct sk_buff *skb;
                         unsigned char *buf;
 
-                        skb = dev_alloc_skb(pkt_len);
+                        skb = netdev_alloc_skb(dev, pkt_len);
                         if (skb == NULL) {
                                 printk("%s: Memory squeeze, dropping packet.\n", dev->name);
                                 dev->stats.rx_dropped++;
diff --git a/drivers/net/ethernet/seeq/sgiseeq.c b/drivers/net/ethernet/seeq/sgiseeq.c
index f955a19eb22f..bb8c8222122b 100644
--- a/drivers/net/ethernet/seeq/sgiseeq.c
+++ b/drivers/net/ethernet/seeq/sgiseeq.c
@@ -733,7 +733,6 @@ static int __devinit sgiseeq_probe(struct platform_device *pdev)
 
         dev = alloc_etherdev(sizeof (struct sgiseeq_private));
         if (!dev) {
-                printk(KERN_ERR "Sgiseeq: Etherdev alloc failed, aborting.\n");
                 err = -ENOMEM;
                 goto err_out;
         }
diff --git a/drivers/net/ethernet/sfc/Kconfig b/drivers/net/ethernet/sfc/Kconfig
index 5d18841f0f3d..8d423544a7e6 100644
--- a/drivers/net/ethernet/sfc/Kconfig
+++ b/drivers/net/ethernet/sfc/Kconfig
@@ -16,6 +16,13 @@ config SFC_MTD
         depends on SFC && MTD && !(SFC=y && MTD=m)
         default y
         ---help---
-          This exposes the on-board flash memory as MTD devices (e.g.
-          /dev/mtd1).  This makes it possible to upload new firmware
-          to the NIC.
+          This exposes the on-board flash and/or EEPROM as MTD devices
+          (e.g. /dev/mtd1).  This is required to update the firmware or
+          the boot configuration under Linux.
+config SFC_MCDI_MON
+        bool "Solarflare SFC9000-family hwmon support"
+        depends on SFC && HWMON && !(SFC=y && HWMON=m)
+        default y
+        ----help---
+          This exposes the on-board firmware-managed sensors as a
+          hardware monitor device.
diff --git a/drivers/net/ethernet/sfc/Makefile b/drivers/net/ethernet/sfc/Makefile
index ab31c7124db1..3fa2e25ccc45 100644
--- a/drivers/net/ethernet/sfc/Makefile
+++ b/drivers/net/ethernet/sfc/Makefile
@@ -2,7 +2,7 @@ sfc-y			+= efx.o nic.o falcon.o siena.o tx.o rx.o filter.o \
                            falcon_xmac.o mcdi_mac.o \
                            selftest.o ethtool.o qt202x_phy.o mdio_10g.o \
                            tenxpress.o txc43128_phy.o falcon_boards.o \
-                           mcdi.o mcdi_phy.o
+                           mcdi.o mcdi_phy.o mcdi_mon.o
 sfc-$(CONFIG_SFC_MTD)   += mtd.o
 
 obj-$(CONFIG_SFC)       += sfc.o
diff --git a/drivers/net/ethernet/sfc/bitfield.h b/drivers/net/ethernet/sfc/bitfield.h
index 098ac2ad757d..a2a9f40b90cf 100644
--- a/drivers/net/ethernet/sfc/bitfield.h
+++ b/drivers/net/ethernet/sfc/bitfield.h
@@ -448,40 +448,40 @@ typedef union efx_oword {
         EFX_INSERT32(min, max, low, high, EFX_MASK32(high + 1 - low))
 
 #define EFX_SET_OWORD64(oword, low, high, value) do {                   \
-        (oword).u64[0] = (((oword).u64[0]                               \
+        (oword).u64[0] = (((oword).u64[0]                               \
                            & ~EFX_INPLACE_MASK64(0,  63, low, high))    \
                           | EFX_INSERT64(0,  63, low, high, value));    \
-        (oword).u64[1] = (((oword).u64[1]                               \
+        (oword).u64[1] = (((oword).u64[1]                               \
                            & ~EFX_INPLACE_MASK64(64, 127, low, high))   \
                           | EFX_INSERT64(64, 127, low, high, value));   \
         } while (0)
 
 #define EFX_SET_QWORD64(qword, low, high, value) do {                   \
-        (qword).u64[0] = (((qword).u64[0]                               \
+        (qword).u64[0] = (((qword).u64[0]                               \
                            & ~EFX_INPLACE_MASK64(0, 63, low, high))     \
                           | EFX_INSERT64(0, 63, low, high, value));     \
         } while (0)
 
 #define EFX_SET_OWORD32(oword, low, high, value) do {                   \
-        (oword).u32[0] = (((oword).u32[0]                               \
+        (oword).u32[0] = (((oword).u32[0]                               \
                            & ~EFX_INPLACE_MASK32(0, 31, low, high))     \
                           | EFX_INSERT32(0, 31, low, high, value));     \
-        (oword).u32[1] = (((oword).u32[1]                               \
+        (oword).u32[1] = (((oword).u32[1]                               \
                            & ~EFX_INPLACE_MASK32(32, 63, low, high))    \
                           | EFX_INSERT32(32, 63, low, high, value));    \
-        (oword).u32[2] = (((oword).u32[2]                               \
+        (oword).u32[2] = (((oword).u32[2]                               \
                            & ~EFX_INPLACE_MASK32(64, 95, low, high))    \
                           | EFX_INSERT32(64, 95, low, high, value));    \
-        (oword).u32[3] = (((oword).u32[3]                               \
+        (oword).u32[3] = (((oword).u32[3]                               \
                            & ~EFX_INPLACE_MASK32(96, 127, low, high))   \
                           | EFX_INSERT32(96, 127, low, high, value));   \
         } while (0)
 
 #define EFX_SET_QWORD32(qword, low, high, value) do {                   \
-        (qword).u32[0] = (((qword).u32[0]                               \
+        (qword).u32[0] = (((qword).u32[0]                               \
                            & ~EFX_INPLACE_MASK32(0, 31, low, high))     \
                           | EFX_INSERT32(0, 31, low, high, value));     \
-        (qword).u32[1] = (((qword).u32[1]                               \
+        (qword).u32[1] = (((qword).u32[1]                               \
                            & ~EFX_INPLACE_MASK32(32, 63, low, high))    \
                           | EFX_INSERT32(32, 63, low, high, value));    \
         } while (0)
diff --git a/drivers/net/ethernet/sfc/efx.c b/drivers/net/ethernet/sfc/efx.c
index e43702f33b62..952d0bf7695a 100644
--- a/drivers/net/ethernet/sfc/efx.c
+++ b/drivers/net/ethernet/sfc/efx.c
@@ -38,15 +38,15 @@
 
 /* Loopback mode names (see LOOPBACK_MODE()) */
 const unsigned int efx_loopback_mode_max = LOOPBACK_MAX;
-const char *efx_loopback_mode_names[] = {
+const char *const efx_loopback_mode_names[] = {
         [LOOPBACK_NONE]         = "NONE",
         [LOOPBACK_DATA]         = "DATAPATH",
         [LOOPBACK_GMAC]         = "GMAC",
         [LOOPBACK_XGMII]        = "XGMII",
         [LOOPBACK_XGXS]         = "XGXS",
-        [LOOPBACK_XAUI]         = "XAUI",
-        [LOOPBACK_GMII]         = "GMII",
-        [LOOPBACK_SGMII]        = "SGMII",
+        [LOOPBACK_XAUI]         = "XAUI",
+        [LOOPBACK_GMII]         = "GMII",
+        [LOOPBACK_SGMII]        = "SGMII",
         [LOOPBACK_XGBR]         = "XGBR",
         [LOOPBACK_XFI]          = "XFI",
         [LOOPBACK_XAUI_FAR]     = "XAUI_FAR",
@@ -55,21 +55,21 @@ const char *efx_loopback_mode_names[] = {
         [LOOPBACK_XFI_FAR]      = "XFI_FAR",
         [LOOPBACK_GPHY]         = "GPHY",
         [LOOPBACK_PHYXS]        = "PHYXS",
-        [LOOPBACK_PCS]          = "PCS",
-        [LOOPBACK_PMAPMD]       = "PMA/PMD",
+        [LOOPBACK_PCS]          = "PCS",
+        [LOOPBACK_PMAPMD]       = "PMA/PMD",
         [LOOPBACK_XPORT]        = "XPORT",
         [LOOPBACK_XGMII_WS]     = "XGMII_WS",
-        [LOOPBACK_XAUI_WS]      = "XAUI_WS",
+        [LOOPBACK_XAUI_WS]      = "XAUI_WS",
         [LOOPBACK_XAUI_WS_FAR]  = "XAUI_WS_FAR",
         [LOOPBACK_XAUI_WS_NEAR] = "XAUI_WS_NEAR",
-        [LOOPBACK_GMII_WS]      = "GMII_WS",
+        [LOOPBACK_GMII_WS]      = "GMII_WS",
         [LOOPBACK_XFI_WS]       = "XFI_WS",
         [LOOPBACK_XFI_WS_FAR]   = "XFI_WS_FAR",
-        [LOOPBACK_PHYXS_WS]     = "PHYXS_WS",
+        [LOOPBACK_PHYXS_WS]     = "PHYXS_WS",
 };
 
 const unsigned int efx_reset_type_max = RESET_TYPE_MAX;
-const char *efx_reset_type_names[] = {
+const char *const efx_reset_type_names[] = {
         [RESET_TYPE_INVISIBLE]     = "INVISIBLE",
         [RESET_TYPE_ALL]           = "ALL",
         [RESET_TYPE_WORLD]         = "WORLD",
@@ -122,15 +122,6 @@ static int napi_weight = 64;
  */
 static unsigned int efx_monitor_interval = 1 * HZ;
 
-/* This controls whether or not the driver will initialise devices
- * with invalid MAC addresses stored in the EEPROM or flash.  If true,
- * such devices will be initialised with a random locally-generated
- * MAC address.  This allows for loading the sfc_mtd driver to
- * reprogram the flash, even if the flash contents (including the MAC
- * address) have previously been erased.
- */
-static unsigned int allow_bad_hwaddr;
-
 /* Initial interrupt moderation settings.  They can be modified after
  * module load with ethtool.
  *
@@ -162,7 +153,7 @@ static unsigned int interrupt_mode;
  * interrupt handling.
  *
  * Cards without MSI-X will only target one CPU via legacy or MSI interrupt.
- * The default (0) means to assign an interrupt to each package (level II cache)
+ * The default (0) means to assign an interrupt to each core.
  */
 static unsigned int rss_cpus;
 module_param(rss_cpus, uint, 0444);
@@ -238,8 +229,7 @@ static int efx_process_channel(struct efx_channel *channel, int budget)
 
         /* Deliver last RX packet. */
         if (channel->rx_pkt) {
-                __efx_rx_packet(channel, channel->rx_pkt,
-                                channel->rx_pkt_csummed);
+                __efx_rx_packet(channel, channel->rx_pkt);
                 channel->rx_pkt = NULL;
         }
 
@@ -373,7 +363,7 @@ static int efx_probe_eventq(struct efx_channel *channel)
         struct efx_nic *efx = channel->efx;
         unsigned long entries;
 
-        netif_dbg(channel->efx, probe, channel->efx->net_dev,
+        netif_dbg(efx, probe, efx->net_dev,
                   "chan %d create event queue\n", channel->channel);
 
         /* Build an event queue with room for one event per tx and rx buffer,
@@ -807,16 +797,14 @@ void efx_link_status_changed(struct efx_nic *efx)
         }
 
         /* Status message for kernel log */
-        if (link_state->up) {
+        if (link_state->up)
                 netif_info(efx, link, efx->net_dev,
                            "link up at %uMbps %s-duplex (MTU %d)%s\n",
                            link_state->speed, link_state->fd ? "full" : "half",
                            efx->net_dev->mtu,
                            (efx->promiscuous ? " [PROMISC]" : ""));
-        } else {
+        else
                 netif_info(efx, link, efx->net_dev, "link down\n");
-        }
-
 }
 
 void efx_link_set_advertising(struct efx_nic *efx, u32 advertising)
@@ -863,11 +851,9 @@ int __efx_reconfigure_port(struct efx_nic *efx)
 
         WARN_ON(!mutex_is_locked(&efx->mac_lock));
 
-        /* Serialise the promiscuous flag with efx_set_multicast_list. */
-        if (efx_dev_registered(efx)) {
-                netif_addr_lock_bh(efx->net_dev);
-                netif_addr_unlock_bh(efx->net_dev);
-        }
+        /* Serialise the promiscuous flag with efx_set_rx_mode. */
+        netif_addr_lock_bh(efx->net_dev);
+        netif_addr_unlock_bh(efx->net_dev);
 
         /* Disable PHY transmit in mac level loopbacks */
         phy_mode = efx->phy_mode;
@@ -907,16 +893,13 @@ static void efx_mac_work(struct work_struct *data)
         struct efx_nic *efx = container_of(data, struct efx_nic, mac_work);
 
         mutex_lock(&efx->mac_lock);
-        if (efx->port_enabled) {
-                efx->type->push_multicast_hash(efx);
-                efx->mac_op->reconfigure(efx);
-        }
+        if (efx->port_enabled)
+                efx->type->reconfigure_mac(efx);
         mutex_unlock(&efx->mac_lock);
 }
 
 static int efx_probe_port(struct efx_nic *efx)
 {
-        unsigned char *perm_addr;
         int rc;
 
         netif_dbg(efx, probe, efx->net_dev, "create port\n");
@@ -929,28 +912,10 @@ static int efx_probe_port(struct efx_nic *efx)
         if (rc)
                 return rc;
 
-        /* Sanity check MAC address */
-        perm_addr = efx->net_dev->perm_addr;
-        if (is_valid_ether_addr(perm_addr)) {
-                memcpy(efx->net_dev->dev_addr, perm_addr, ETH_ALEN);
-        } else {
-                netif_err(efx, probe, efx->net_dev, "invalid MAC address %pM\n",
-                          perm_addr);
-                if (!allow_bad_hwaddr) {
-                        rc = -EINVAL;
-                        goto err;
-                }
-                random_ether_addr(efx->net_dev->dev_addr);
-                netif_info(efx, probe, efx->net_dev,
-                           "using locally-generated MAC %pM\n",
-                           efx->net_dev->dev_addr);
-        }
+        /* Initialise MAC address to permanent address */
+        memcpy(efx->net_dev->dev_addr, efx->net_dev->perm_addr, ETH_ALEN);
 
         return 0;
-
- err:
-        efx->type->remove_port(efx);
-        return rc;
 }
 
 static int efx_init_port(struct efx_nic *efx)
@@ -969,7 +934,7 @@ static int efx_init_port(struct efx_nic *efx)
 
         /* Reconfigure the MAC before creating dma queues (required for
          * Falcon/A1 where RX_INGR_EN/TX_DRAIN_EN isn't supported) */
-        efx->mac_op->reconfigure(efx);
+        efx->type->reconfigure_mac(efx);
 
         /* Ensure the PHY advertises the correct flow control settings */
         rc = efx->phy_op->reconfigure(efx);
@@ -996,8 +961,7 @@ static void efx_start_port(struct efx_nic *efx)
 
         /* efx_mac_work() might have been scheduled after efx_stop_port(),
          * and then cancelled by efx_flush_all() */
-        efx->type->push_multicast_hash(efx);
-        efx->mac_op->reconfigure(efx);
+        efx->type->reconfigure_mac(efx);
 
         mutex_unlock(&efx->mac_lock);
 }
@@ -1012,10 +976,8 @@ static void efx_stop_port(struct efx_nic *efx)
         mutex_unlock(&efx->mac_lock);
 
         /* Serialise against efx_set_multicast_list() */
-        if (efx_dev_registered(efx)) {
-                netif_addr_lock_bh(efx->net_dev);
-                netif_addr_unlock_bh(efx->net_dev);
-        }
+        netif_addr_lock_bh(efx->net_dev);
+        netif_addr_unlock_bh(efx->net_dev);
 }
 
 static void efx_fini_port(struct efx_nic *efx)
@@ -1069,9 +1031,11 @@ static int efx_init_io(struct efx_nic *efx)
          * masks event though they reject 46 bit masks.
          */
         while (dma_mask > 0x7fffffffUL) {
-                if (pci_dma_supported(pci_dev, dma_mask) &&
-                    ((rc = pci_set_dma_mask(pci_dev, dma_mask)) == 0))
-                        break;
+                if (pci_dma_supported(pci_dev, dma_mask)) {
+                        rc = pci_set_dma_mask(pci_dev, dma_mask);
+                        if (rc == 0)
+                                break;
+                }
                 dma_mask >>= 1;
         }
         if (rc) {
@@ -1144,18 +1108,16 @@ static void efx_fini_io(struct efx_nic *efx)
         pci_disable_device(efx->pci_dev);
 }
 
-/* Get number of channels wanted.  Each channel will have its own IRQ,
- * 1 RX queue and/or 2 TX queues. */
-static int efx_wanted_channels(void)
+static int efx_wanted_parallelism(void)
 {
-        cpumask_var_t core_mask;
+        cpumask_var_t thread_mask;
         int count;
         int cpu;
 
         if (rss_cpus)
                 return rss_cpus;
 
-        if (unlikely(!zalloc_cpumask_var(&core_mask, GFP_KERNEL))) {
+        if (unlikely(!zalloc_cpumask_var(&thread_mask, GFP_KERNEL))) {
                 printk(KERN_WARNING
                        "sfc: RSS disabled due to allocation failure\n");
                 return 1;
@@ -1163,14 +1125,14 @@ static int efx_wanted_channels(void)
 
         count = 0;
         for_each_online_cpu(cpu) {
-                if (!cpumask_test_cpu(cpu, core_mask)) {
+                if (!cpumask_test_cpu(cpu, thread_mask)) {
                         ++count;
-                        cpumask_or(core_mask, core_mask,
-                                   topology_core_cpumask(cpu));
+                        cpumask_or(thread_mask, thread_mask,
+                                   topology_thread_cpumask(cpu));
                 }
         }
 
-        free_cpumask_var(core_mask);
+        free_cpumask_var(thread_mask);
         return count;
 }
 
@@ -1209,7 +1171,7 @@ static int efx_probe_interrupts(struct efx_nic *efx)
                 struct msix_entry xentries[EFX_MAX_CHANNELS];
                 int n_channels;
 
-                n_channels = efx_wanted_channels();
+                n_channels = efx_wanted_parallelism();
                 if (separate_tx_channels)
                         n_channels *= 2;
                 n_channels = min(n_channels, max_channels);
@@ -1425,14 +1387,14 @@ static void efx_start_all(struct efx_nic *efx)
                 return;
         if ((efx->state != STATE_RUNNING) && (efx->state != STATE_INIT))
                 return;
-        if (efx_dev_registered(efx) && !netif_running(efx->net_dev))
+        if (!netif_running(efx->net_dev))
                 return;
 
         /* Mark the port as enabled so port reconfigurations can start, then
          * restart the transmit interface early so the watchdog timer stops */
         efx_start_port(efx);
 
-        if (efx_dev_registered(efx) && netif_device_present(efx->net_dev))
+        if (netif_device_present(efx->net_dev))
                 netif_tx_wake_all_queues(efx->net_dev);
 
         efx_for_each_channel(channel, efx)
@@ -1523,11 +1485,9 @@ static void efx_stop_all(struct efx_nic *efx)
 
         /* Stop the kernel transmit interface late, so the watchdog
          * timer isn't ticking over the flush */
-        if (efx_dev_registered(efx)) {
-                netif_tx_stop_all_queues(efx->net_dev);
-                netif_tx_lock_bh(efx->net_dev);
-                netif_tx_unlock_bh(efx->net_dev);
-        }
+        netif_tx_stop_all_queues(efx->net_dev);
+        netif_tx_lock_bh(efx->net_dev);
+        netif_tx_unlock_bh(efx->net_dev);
 }
 
 static void efx_remove_all(struct efx_nic *efx)
@@ -1544,13 +1504,13 @@ static void efx_remove_all(struct efx_nic *efx)
  *
  **************************************************************************/
 
-static unsigned int irq_mod_ticks(unsigned int usecs, unsigned int resolution)
+static unsigned int irq_mod_ticks(unsigned int usecs, unsigned int quantum_ns)
 {
         if (usecs == 0)
                 return 0;
-        if (usecs < resolution)
+        if (usecs * 1000 < quantum_ns)
                 return 1; /* never round down to 0 */
-        return usecs / resolution;
+        return usecs * 1000 / quantum_ns;
 }
 
 /* Set interrupt moderation parameters */
@@ -1559,14 +1519,20 @@ int efx_init_irq_moderation(struct efx_nic *efx, unsigned int tx_usecs,
                             bool rx_may_override_tx)
 {
         struct efx_channel *channel;
-        unsigned tx_ticks = irq_mod_ticks(tx_usecs, EFX_IRQ_MOD_RESOLUTION);
-        unsigned rx_ticks = irq_mod_ticks(rx_usecs, EFX_IRQ_MOD_RESOLUTION);
+        unsigned int irq_mod_max = DIV_ROUND_UP(efx->type->timer_period_max *
+                                                efx->timer_quantum_ns,
+                                                1000);
+        unsigned int tx_ticks;
+        unsigned int rx_ticks;
 
         EFX_ASSERT_RESET_SERIALISED(efx);
 
-        if (tx_ticks > EFX_IRQ_MOD_MAX || rx_ticks > EFX_IRQ_MOD_MAX)
+        if (tx_usecs > irq_mod_max || rx_usecs > irq_mod_max)
                 return -EINVAL;
 
+        tx_ticks = irq_mod_ticks(tx_usecs, efx->timer_quantum_ns);
+        rx_ticks = irq_mod_ticks(rx_usecs, efx->timer_quantum_ns);
+
         if (tx_ticks != rx_ticks && efx->tx_channel_offset == 0 &&
             !rx_may_override_tx) {
                 netif_err(efx, drv, efx->net_dev, "Channels are shared. "
@@ -1589,8 +1555,14 @@ int efx_init_irq_moderation(struct efx_nic *efx, unsigned int tx_usecs,
 void efx_get_irq_moderation(struct efx_nic *efx, unsigned int *tx_usecs,
                             unsigned int *rx_usecs, bool *rx_adaptive)
 {
+        /* We must round up when converting ticks to microseconds
+         * because we round down when converting the other way.
+         */
+
         *rx_adaptive = efx->irq_rx_adaptive;
-        *rx_usecs = efx->irq_rx_moderation * EFX_IRQ_MOD_RESOLUTION;
+        *rx_usecs = DIV_ROUND_UP(efx->irq_rx_moderation *
+                                 efx->timer_quantum_ns,
+                                 1000);
 
         /* If channels are shared between RX and TX, so is IRQ
          * moderation.  Otherwise, IRQ moderation is the same for all
@@ -1599,9 +1571,10 @@ void efx_get_irq_moderation(struct efx_nic *efx, unsigned int *tx_usecs,
         if (efx->tx_channel_offset == 0)
                 *tx_usecs = *rx_usecs;
         else
-                *tx_usecs =
+                *tx_usecs = DIV_ROUND_UP(
                         efx->channel[efx->tx_channel_offset]->irq_moderation *
-                        EFX_IRQ_MOD_RESOLUTION;
+                        efx->timer_quantum_ns,
+                        1000);
 }
 
 /**************************************************************************
@@ -1765,14 +1738,15 @@ static int efx_net_stop(struct net_device *net_dev)
 }
 
 /* Context: process, dev_base_lock or RTNL held, non-blocking. */
-static struct rtnl_link_stats64 *efx_net_stats(struct net_device *net_dev, struct rtnl_link_stats64 *stats)
+static struct rtnl_link_stats64 *efx_net_stats(struct net_device *net_dev,
+                                               struct rtnl_link_stats64 *stats)
 {
         struct efx_nic *efx = netdev_priv(net_dev);
         struct efx_mac_stats *mac_stats = &efx->mac_stats;
 
         spin_lock_bh(&efx->stats_lock);
+
         efx->type->update_stats(efx);
-        spin_unlock_bh(&efx->stats_lock);
 
         stats->rx_packets = mac_stats->rx_packets;
         stats->tx_packets = mac_stats->tx_packets;
@@ -1796,6 +1770,8 @@ static struct rtnl_link_stats64 *efx_net_stats(struct net_device *net_dev, struc
         stats->tx_errors = (stats->tx_window_errors +
                             mac_stats->tx_bad);
 
+        spin_unlock_bh(&efx->stats_lock);
+
         return stats;
 }
 
@@ -1816,7 +1792,6 @@ static void efx_watchdog(struct net_device *net_dev)
 static int efx_change_mtu(struct net_device *net_dev, int new_mtu)
 {
         struct efx_nic *efx = netdev_priv(net_dev);
-        int rc = 0;
 
         EFX_ASSERT_RESET_SERIALISED(efx);
 
@@ -1833,13 +1808,13 @@ static int efx_change_mtu(struct net_device *net_dev, int new_mtu)
         /* Reconfigure the MAC before enabling the dma queues so that
          * the RX buffers don't overflow */
         net_dev->mtu = new_mtu;
-        efx->mac_op->reconfigure(efx);
+        efx->type->reconfigure_mac(efx);
         mutex_unlock(&efx->mac_lock);
 
         efx_init_channels(efx);
 
         efx_start_all(efx);
-        return rc;
+        return 0;
 }
 
 static int efx_set_mac_address(struct net_device *net_dev, void *data)
@@ -1861,14 +1836,14 @@ static int efx_set_mac_address(struct net_device *net_dev, void *data)
 
         /* Reconfigure the MAC */
         mutex_lock(&efx->mac_lock);
-        efx->mac_op->reconfigure(efx);
+        efx->type->reconfigure_mac(efx);
         mutex_unlock(&efx->mac_lock);
 
         return 0;
 }
 
 /* Context: netif_addr_lock held, BHs disabled. */
-static void efx_set_multicast_list(struct net_device *net_dev)
+static void efx_set_rx_mode(struct net_device *net_dev)
 {
         struct efx_nic *efx = netdev_priv(net_dev);
         struct netdev_hw_addr *ha;
@@ -1922,7 +1897,7 @@ static const struct net_device_ops efx_netdev_ops = {
         .ndo_do_ioctl           = efx_ioctl,
         .ndo_change_mtu         = efx_change_mtu,
         .ndo_set_mac_address    = efx_set_mac_address,
-        .ndo_set_rx_mode        = efx_set_multicast_list,
+        .ndo_set_rx_mode        = efx_set_rx_mode,
         .ndo_set_features       = efx_set_features,
 #ifdef CONFIG_NET_POLL_CONTROLLER
         .ndo_poll_controller = efx_netpoll,
@@ -1975,10 +1950,6 @@ static int efx_register_netdev(struct efx_nic *efx)
         net_dev->netdev_ops = &efx_netdev_ops;
         SET_ETHTOOL_OPS(net_dev, &efx_ethtool_ops);
 
-        /* Clear MAC statistics */
-        efx->mac_op->update_stats(efx);
-        memset(&efx->mac_stats, 0, sizeof(efx->mac_stats));
-
         rtnl_lock();
 
         rc = dev_alloc_name(net_dev, net_dev->name);
@@ -1997,7 +1968,7 @@ static int efx_register_netdev(struct efx_nic *efx)
         }
 
         /* Always start with carrier off; PHY events will detect the link */
-        netif_carrier_off(efx->net_dev);
+        netif_carrier_off(net_dev);
 
         rtnl_unlock();
 
@@ -2038,11 +2009,9 @@ static void efx_unregister_netdev(struct efx_nic *efx)
                         efx_release_tx_buffers(tx_queue);
         }
 
-        if (efx_dev_registered(efx)) {
-                strlcpy(efx->name, pci_name(efx->pci_dev), sizeof(efx->name));
-                device_remove_file(&efx->pci_dev->dev, &dev_attr_phy_type);
-                unregister_netdev(efx->net_dev);
-        }
+        strlcpy(efx->name, pci_name(efx->pci_dev), sizeof(efx->name));
+        device_remove_file(&efx->pci_dev->dev, &dev_attr_phy_type);
+        unregister_netdev(efx->net_dev);
 }
 
 /**************************************************************************
@@ -2095,7 +2064,7 @@ int efx_reset_up(struct efx_nic *efx, enum reset_type method, bool ok)
                                   "could not restore PHY settings\n");
         }
 
-        efx->mac_op->reconfigure(efx);
+        efx->type->reconfigure_mac(efx);
 
         efx_init_channels(efx);
         efx_restore_filters(efx);
@@ -2300,7 +2269,6 @@ static int efx_init_struct(struct efx_nic *efx, const struct efx_nic_type *type,
         efx->net_dev = net_dev;
         spin_lock_init(&efx->stats_lock);
         mutex_init(&efx->mac_lock);
-        efx->mac_op = type->default_mac_ops;
         efx->phy_op = &efx_dummy_phy_operations;
         efx->mdio.dev = net_dev;
         INIT_WORK(&efx->mac_work, efx_mac_work);
@@ -2459,7 +2427,7 @@ static int efx_pci_probe_main(struct efx_nic *efx)
 /* NIC initialisation
  *
  * This is called at module load (or hotplug insertion,
- * theoretically).  It sets up PCI mappings, tests and resets the NIC,
+ * theoretically).  It sets up PCI mappings, resets the NIC,
  * sets up and registers the network devices with the kernel and hooks
  * the interrupt service routine.  It does not prepare the device for
  * transmission; this is left to the first time one of the network
@@ -2658,7 +2626,7 @@ static int efx_pm_suspend(struct device *dev)
         return rc;
 }
 
-static struct dev_pm_ops efx_pm_ops = {
+static const struct dev_pm_ops efx_pm_ops = {
         .suspend        = efx_pm_suspend,
         .resume         = efx_pm_resume,
         .freeze         = efx_pm_freeze,
diff --git a/drivers/net/ethernet/sfc/efx.h b/drivers/net/ethernet/sfc/efx.h
index a3541ac6ea01..7f546e2c39e2 100644
--- a/drivers/net/ethernet/sfc/efx.h
+++ b/drivers/net/ethernet/sfc/efx.h
@@ -40,9 +40,9 @@ extern void efx_rx_strategy(struct efx_channel *channel);
 extern void efx_fast_push_rx_descriptors(struct efx_rx_queue *rx_queue);
 extern void efx_rx_slow_fill(unsigned long context);
 extern void __efx_rx_packet(struct efx_channel *channel,
-                            struct efx_rx_buffer *rx_buf, bool checksummed);
+                            struct efx_rx_buffer *rx_buf);
 extern void efx_rx_packet(struct efx_rx_queue *rx_queue, unsigned int index,
-                          unsigned int len, bool checksummed, bool discard);
+                          unsigned int len, u16 flags);
 extern void efx_schedule_slow_fill(struct efx_rx_queue *rx_queue);
 
 #define EFX_MAX_DMAQ_SIZE 4096UL
@@ -145,6 +145,12 @@ static inline void efx_schedule_channel(struct efx_channel *channel)
         napi_schedule(&channel->napi_str);
 }
 
+static inline void efx_schedule_channel_irq(struct efx_channel *channel)
+{
+        channel->last_irq_cpu = raw_smp_processor_id();
+        efx_schedule_channel(channel);
+}
+
 extern void efx_link_status_changed(struct efx_nic *efx);
 extern void efx_link_set_advertising(struct efx_nic *efx, u32);
 extern void efx_link_set_wanted_fc(struct efx_nic *efx, u8);
diff --git a/drivers/net/ethernet/sfc/ethtool.c b/drivers/net/ethernet/sfc/ethtool.c
index 29b2ebfef19f..f887f65e4189 100644
--- a/drivers/net/ethernet/sfc/ethtool.c
+++ b/drivers/net/ethernet/sfc/ethtool.c
@@ -52,11 +52,6 @@ static u64 efx_get_uint_stat(void *field)
         return *(unsigned int *)field;
 }
 
-static u64 efx_get_ulong_stat(void *field)
-{
-        return *(unsigned long *)field;
-}
-
 static u64 efx_get_u64_stat(void *field)
 {
         return *(u64 *) field;
@@ -67,12 +62,8 @@ static u64 efx_get_atomic_stat(void *field)
         return atomic_read((atomic_t *) field);
 }
 
-#define EFX_ETHTOOL_ULONG_MAC_STAT(field)                       \
-        EFX_ETHTOOL_STAT(field, mac_stats, field,               \
-                          unsigned long, efx_get_ulong_stat)
-
 #define EFX_ETHTOOL_U64_MAC_STAT(field)                         \
-        EFX_ETHTOOL_STAT(field, mac_stats, field,               \
+        EFX_ETHTOOL_STAT(field, mac_stats, field,               \
                           u64, efx_get_u64_stat)
 
 #define EFX_ETHTOOL_UINT_NIC_STAT(name)                         \
@@ -91,36 +82,36 @@ static u64 efx_get_atomic_stat(void *field)
         EFX_ETHTOOL_STAT(tx_##field, tx_queue, field,           \
                          unsigned int, efx_get_uint_stat)
 
-static struct efx_ethtool_stat efx_ethtool_stats[] = {
+static const struct efx_ethtool_stat efx_ethtool_stats[] = {
         EFX_ETHTOOL_U64_MAC_STAT(tx_bytes),
         EFX_ETHTOOL_U64_MAC_STAT(tx_good_bytes),
         EFX_ETHTOOL_U64_MAC_STAT(tx_bad_bytes),
-        EFX_ETHTOOL_ULONG_MAC_STAT(tx_packets),
-        EFX_ETHTOOL_ULONG_MAC_STAT(tx_bad),
-        EFX_ETHTOOL_ULONG_MAC_STAT(tx_pause),
-        EFX_ETHTOOL_ULONG_MAC_STAT(tx_control),
-        EFX_ETHTOOL_ULONG_MAC_STAT(tx_unicast),
-        EFX_ETHTOOL_ULONG_MAC_STAT(tx_multicast),
-        EFX_ETHTOOL_ULONG_MAC_STAT(tx_broadcast),
-        EFX_ETHTOOL_ULONG_MAC_STAT(tx_lt64),
-        EFX_ETHTOOL_ULONG_MAC_STAT(tx_64),
-        EFX_ETHTOOL_ULONG_MAC_STAT(tx_65_to_127),
-        EFX_ETHTOOL_ULONG_MAC_STAT(tx_128_to_255),
-        EFX_ETHTOOL_ULONG_MAC_STAT(tx_256_to_511),
-        EFX_ETHTOOL_ULONG_MAC_STAT(tx_512_to_1023),
-        EFX_ETHTOOL_ULONG_MAC_STAT(tx_1024_to_15xx),
-        EFX_ETHTOOL_ULONG_MAC_STAT(tx_15xx_to_jumbo),
-        EFX_ETHTOOL_ULONG_MAC_STAT(tx_gtjumbo),
-        EFX_ETHTOOL_ULONG_MAC_STAT(tx_collision),
-        EFX_ETHTOOL_ULONG_MAC_STAT(tx_single_collision),
-        EFX_ETHTOOL_ULONG_MAC_STAT(tx_multiple_collision),
-        EFX_ETHTOOL_ULONG_MAC_STAT(tx_excessive_collision),
-        EFX_ETHTOOL_ULONG_MAC_STAT(tx_deferred),
-        EFX_ETHTOOL_ULONG_MAC_STAT(tx_late_collision),
-        EFX_ETHTOOL_ULONG_MAC_STAT(tx_excessive_deferred),
-        EFX_ETHTOOL_ULONG_MAC_STAT(tx_non_tcpudp),
-        EFX_ETHTOOL_ULONG_MAC_STAT(tx_mac_src_error),
-        EFX_ETHTOOL_ULONG_MAC_STAT(tx_ip_src_error),
+        EFX_ETHTOOL_U64_MAC_STAT(tx_packets),
+        EFX_ETHTOOL_U64_MAC_STAT(tx_bad),
+        EFX_ETHTOOL_U64_MAC_STAT(tx_pause),
+        EFX_ETHTOOL_U64_MAC_STAT(tx_control),
+        EFX_ETHTOOL_U64_MAC_STAT(tx_unicast),
+        EFX_ETHTOOL_U64_MAC_STAT(tx_multicast),
+        EFX_ETHTOOL_U64_MAC_STAT(tx_broadcast),
+        EFX_ETHTOOL_U64_MAC_STAT(tx_lt64),
+        EFX_ETHTOOL_U64_MAC_STAT(tx_64),
+        EFX_ETHTOOL_U64_MAC_STAT(tx_65_to_127),
+        EFX_ETHTOOL_U64_MAC_STAT(tx_128_to_255),
+        EFX_ETHTOOL_U64_MAC_STAT(tx_256_to_511),
+        EFX_ETHTOOL_U64_MAC_STAT(tx_512_to_1023),
+        EFX_ETHTOOL_U64_MAC_STAT(tx_1024_to_15xx),
+        EFX_ETHTOOL_U64_MAC_STAT(tx_15xx_to_jumbo),
+        EFX_ETHTOOL_U64_MAC_STAT(tx_gtjumbo),
+        EFX_ETHTOOL_U64_MAC_STAT(tx_collision),
+        EFX_ETHTOOL_U64_MAC_STAT(tx_single_collision),
+        EFX_ETHTOOL_U64_MAC_STAT(tx_multiple_collision),
+        EFX_ETHTOOL_U64_MAC_STAT(tx_excessive_collision),
+        EFX_ETHTOOL_U64_MAC_STAT(tx_deferred),
+        EFX_ETHTOOL_U64_MAC_STAT(tx_late_collision),
+        EFX_ETHTOOL_U64_MAC_STAT(tx_excessive_deferred),
+        EFX_ETHTOOL_U64_MAC_STAT(tx_non_tcpudp),
+        EFX_ETHTOOL_U64_MAC_STAT(tx_mac_src_error),
+        EFX_ETHTOOL_U64_MAC_STAT(tx_ip_src_error),
         EFX_ETHTOOL_UINT_TXQ_STAT(tso_bursts),
         EFX_ETHTOOL_UINT_TXQ_STAT(tso_long_headers),
         EFX_ETHTOOL_UINT_TXQ_STAT(tso_packets),
@@ -128,34 +119,34 @@ static struct efx_ethtool_stat efx_ethtool_stats[] = {
         EFX_ETHTOOL_U64_MAC_STAT(rx_bytes),
         EFX_ETHTOOL_U64_MAC_STAT(rx_good_bytes),
         EFX_ETHTOOL_U64_MAC_STAT(rx_bad_bytes),
-        EFX_ETHTOOL_ULONG_MAC_STAT(rx_packets),
-        EFX_ETHTOOL_ULONG_MAC_STAT(rx_good),
-        EFX_ETHTOOL_ULONG_MAC_STAT(rx_bad),
-        EFX_ETHTOOL_ULONG_MAC_STAT(rx_pause),
-        EFX_ETHTOOL_ULONG_MAC_STAT(rx_control),
-        EFX_ETHTOOL_ULONG_MAC_STAT(rx_unicast),
-        EFX_ETHTOOL_ULONG_MAC_STAT(rx_multicast),
-        EFX_ETHTOOL_ULONG_MAC_STAT(rx_broadcast),
-        EFX_ETHTOOL_ULONG_MAC_STAT(rx_lt64),
-        EFX_ETHTOOL_ULONG_MAC_STAT(rx_64),
-        EFX_ETHTOOL_ULONG_MAC_STAT(rx_65_to_127),
-        EFX_ETHTOOL_ULONG_MAC_STAT(rx_128_to_255),
-        EFX_ETHTOOL_ULONG_MAC_STAT(rx_256_to_511),
-        EFX_ETHTOOL_ULONG_MAC_STAT(rx_512_to_1023),
-        EFX_ETHTOOL_ULONG_MAC_STAT(rx_1024_to_15xx),
-        EFX_ETHTOOL_ULONG_MAC_STAT(rx_15xx_to_jumbo),
-        EFX_ETHTOOL_ULONG_MAC_STAT(rx_gtjumbo),
-        EFX_ETHTOOL_ULONG_MAC_STAT(rx_bad_lt64),
-        EFX_ETHTOOL_ULONG_MAC_STAT(rx_bad_64_to_15xx),
-        EFX_ETHTOOL_ULONG_MAC_STAT(rx_bad_15xx_to_jumbo),
-        EFX_ETHTOOL_ULONG_MAC_STAT(rx_bad_gtjumbo),
-        EFX_ETHTOOL_ULONG_MAC_STAT(rx_overflow),
-        EFX_ETHTOOL_ULONG_MAC_STAT(rx_missed),
-        EFX_ETHTOOL_ULONG_MAC_STAT(rx_false_carrier),
-        EFX_ETHTOOL_ULONG_MAC_STAT(rx_symbol_error),
-        EFX_ETHTOOL_ULONG_MAC_STAT(rx_align_error),
-        EFX_ETHTOOL_ULONG_MAC_STAT(rx_length_error),
-        EFX_ETHTOOL_ULONG_MAC_STAT(rx_internal_error),
+        EFX_ETHTOOL_U64_MAC_STAT(rx_packets),
+        EFX_ETHTOOL_U64_MAC_STAT(rx_good),
+        EFX_ETHTOOL_U64_MAC_STAT(rx_bad),
+        EFX_ETHTOOL_U64_MAC_STAT(rx_pause),
+        EFX_ETHTOOL_U64_MAC_STAT(rx_control),
+        EFX_ETHTOOL_U64_MAC_STAT(rx_unicast),
+        EFX_ETHTOOL_U64_MAC_STAT(rx_multicast),
+        EFX_ETHTOOL_U64_MAC_STAT(rx_broadcast),
+        EFX_ETHTOOL_U64_MAC_STAT(rx_lt64),
+        EFX_ETHTOOL_U64_MAC_STAT(rx_64),
+        EFX_ETHTOOL_U64_MAC_STAT(rx_65_to_127),
+        EFX_ETHTOOL_U64_MAC_STAT(rx_128_to_255),
+        EFX_ETHTOOL_U64_MAC_STAT(rx_256_to_511),
+        EFX_ETHTOOL_U64_MAC_STAT(rx_512_to_1023),
+        EFX_ETHTOOL_U64_MAC_STAT(rx_1024_to_15xx),
+        EFX_ETHTOOL_U64_MAC_STAT(rx_15xx_to_jumbo),
+        EFX_ETHTOOL_U64_MAC_STAT(rx_gtjumbo),
+        EFX_ETHTOOL_U64_MAC_STAT(rx_bad_lt64),
+        EFX_ETHTOOL_U64_MAC_STAT(rx_bad_64_to_15xx),
+        EFX_ETHTOOL_U64_MAC_STAT(rx_bad_15xx_to_jumbo),
+        EFX_ETHTOOL_U64_MAC_STAT(rx_bad_gtjumbo),
+        EFX_ETHTOOL_U64_MAC_STAT(rx_overflow),
+        EFX_ETHTOOL_U64_MAC_STAT(rx_missed),
+        EFX_ETHTOOL_U64_MAC_STAT(rx_false_carrier),
+        EFX_ETHTOOL_U64_MAC_STAT(rx_symbol_error),
+        EFX_ETHTOOL_U64_MAC_STAT(rx_align_error),
+        EFX_ETHTOOL_U64_MAC_STAT(rx_length_error),
+        EFX_ETHTOOL_U64_MAC_STAT(rx_internal_error),
         EFX_ETHTOOL_UINT_NIC_STAT(rx_nodesc_drop_cnt),
         EFX_ETHTOOL_ATOMIC_NIC_ERROR_STAT(rx_reset),
         EFX_ETHTOOL_UINT_CHANNEL_STAT(rx_tobe_disc),
@@ -404,10 +395,6 @@ static int efx_ethtool_fill_self_tests(struct efx_nic *efx,
                               &tests->eventq_int[channel->channel],
                               EFX_CHANNEL_NAME(channel),
                               "eventq.int", NULL);
-                efx_fill_test(n++, strings, data,
-                              &tests->eventq_poll[channel->channel],
-                              EFX_CHANNEL_NAME(channel),
-                              "eventq.poll", NULL);
         }
 
         efx_fill_test(n++, strings, data, &tests->registers,
@@ -486,16 +473,17 @@ static void efx_ethtool_get_stats(struct net_device *net_dev,
 {
         struct efx_nic *efx = netdev_priv(net_dev);
         struct efx_mac_stats *mac_stats = &efx->mac_stats;
-        struct efx_ethtool_stat *stat;
+        const struct efx_ethtool_stat *stat;
         struct efx_channel *channel;
         struct efx_tx_queue *tx_queue;
-        struct rtnl_link_stats64 temp;
         int i;
 
         EFX_BUG_ON_PARANOID(stats->n_stats != EFX_ETHTOOL_NUM_STATS);
 
+        spin_lock_bh(&efx->stats_lock);
+
         /* Update MAC and NIC statistics */
-        dev_get_stats(net_dev, &temp);
+        efx->type->update_stats(efx);
 
         /* Fill detailed statistics buffer */
         for (i = 0; i < EFX_ETHTOOL_NUM_STATS; i++) {
@@ -525,6 +513,8 @@ static void efx_ethtool_get_stats(struct net_device *net_dev,
                         break;
                 }
         }
+
+        spin_unlock_bh(&efx->stats_lock);
 }
 
 static void efx_ethtool_self_test(struct net_device *net_dev,
@@ -747,7 +737,7 @@ static int efx_ethtool_set_pauseparam(struct net_device *net_dev,
                         /* Recover by resetting the EM block */
                         falcon_stop_nic_stats(efx);
                         falcon_drain_tx_fifo(efx);
-                        efx->mac_op->reconfigure(efx);
+                        falcon_reconfigure_xmac(efx);
                         falcon_start_nic_stats(efx);
                 } else {
                         /* Schedule a reset to recover */
@@ -772,7 +762,7 @@ static int efx_ethtool_set_pauseparam(struct net_device *net_dev,
         /* Reconfigure the MAC. The PHY *may* generate a link state change event
          * if the user just changed the advertised capabilities, but there's no
          * harm doing this twice */
-        efx->mac_op->reconfigure(efx);
+        efx->type->reconfigure_mac(efx);
 
 out:
         mutex_unlock(&efx->mac_lock);
diff --git a/drivers/net/ethernet/sfc/falcon.c b/drivers/net/ethernet/sfc/falcon.c
index 8ae1ebd35397..98285115df10 100644
--- a/drivers/net/ethernet/sfc/falcon.c
+++ b/drivers/net/ethernet/sfc/falcon.c
@@ -19,7 +19,6 @@
 #include "net_driver.h"
 #include "bitfield.h"
 #include "efx.h"
-#include "mac.h"
 #include "spi.h"
 #include "nic.h"
 #include "regs.h"
@@ -89,7 +88,7 @@ static int falcon_getscl(void *data)
         return EFX_OWORD_FIELD(reg, FRF_AB_GPIO0_IN);
 }
 
-static struct i2c_algo_bit_data falcon_i2c_bit_operations = {
+static const struct i2c_algo_bit_data falcon_i2c_bit_operations = {
         .setsda         = falcon_setsda,
         .setscl         = falcon_setscl,
         .getsda         = falcon_getsda,
@@ -104,8 +103,6 @@ static void falcon_push_irq_moderation(struct efx_channel *channel)
         efx_dword_t timer_cmd;
         struct efx_nic *efx = channel->efx;
 
-        BUILD_BUG_ON(EFX_IRQ_MOD_MAX > (1 << FRF_AB_TC_TIMER_VAL_WIDTH));
-
         /* Set timer register */
         if (channel->irq_moderation) {
                 EFX_POPULATE_DWORD_2(timer_cmd,
@@ -177,27 +174,24 @@ irqreturn_t falcon_legacy_interrupt_a1(int irq, void *dev_id)
                    "IRQ %d on CPU %d status " EFX_OWORD_FMT "\n",
                    irq, raw_smp_processor_id(), EFX_OWORD_VAL(*int_ker));
 
+        /* Check to see if we have a serious error condition */
+        syserr = EFX_OWORD_FIELD(*int_ker, FSF_AZ_NET_IVEC_FATAL_INT);
+        if (unlikely(syserr))
+                return efx_nic_fatal_interrupt(efx);
+
         /* Determine interrupting queues, clear interrupt status
          * register and acknowledge the device interrupt.
          */
         BUILD_BUG_ON(FSF_AZ_NET_IVEC_INT_Q_WIDTH > EFX_MAX_CHANNELS);
         queues = EFX_OWORD_FIELD(*int_ker, FSF_AZ_NET_IVEC_INT_Q);
-
-        /* Check to see if we have a serious error condition */
-        if (queues & (1U << efx->fatal_irq_level)) {
-                syserr = EFX_OWORD_FIELD(*int_ker, FSF_AZ_NET_IVEC_FATAL_INT);
-                if (unlikely(syserr))
-                        return efx_nic_fatal_interrupt(efx);
-        }
-
         EFX_ZERO_OWORD(*int_ker);
         wmb(); /* Ensure the vector is cleared before interrupt ack */
         falcon_irq_ack_a1(efx);
 
         if (queues & 1)
-                efx_schedule_channel(efx_get_channel(efx, 0));
+                efx_schedule_channel_irq(efx_get_channel(efx, 0));
         if (queues & 2)
-                efx_schedule_channel(efx_get_channel(efx, 1));
+                efx_schedule_channel_irq(efx_get_channel(efx, 1));
         return IRQ_HANDLED;
 }
 /**************************************************************************
@@ -613,7 +607,7 @@ static void falcon_stats_complete(struct efx_nic *efx)
         nic_data->stats_pending = false;
         if (*nic_data->stats_dma_done == FALCON_STATS_DONE) {
                 rmb(); /* read the done flag before the stats */
-                efx->mac_op->update_stats(efx);
+                falcon_update_stats_xmac(efx);
         } else {
                 netif_err(efx, hw, efx->net_dev,
                           "timed out waiting for statistics\n");
@@ -670,7 +664,7 @@ static int falcon_reconfigure_port(struct efx_nic *efx)
         falcon_reset_macs(efx);
 
         efx->phy_op->reconfigure(efx);
-        rc = efx->mac_op->reconfigure(efx);
+        rc = falcon_reconfigure_xmac(efx);
         BUG_ON(rc);
 
         falcon_start_nic_stats(efx);
@@ -1218,7 +1212,7 @@ static void falcon_monitor(struct efx_nic *efx)
                 falcon_deconfigure_mac_wrapper(efx);
 
                 falcon_reset_macs(efx);
-                rc = efx->mac_op->reconfigure(efx);
+                rc = falcon_reconfigure_xmac(efx);
                 BUG_ON(rc);
 
                 falcon_start_nic_stats(efx);
@@ -1472,6 +1466,8 @@ static int falcon_probe_nic(struct efx_nic *efx)
                 goto fail5;
         }
 
+        efx->timer_quantum_ns = 4968; /* 621 cycles */
+
         /* Initialise I2C adapter */
         board = falcon_board(efx);
         board->i2c_adap.owner = THIS_MODULE;
@@ -1676,7 +1672,7 @@ static void falcon_update_nic_stats(struct efx_nic *efx)
             *nic_data->stats_dma_done == FALCON_STATS_DONE) {
                 nic_data->stats_pending = false;
                 rmb(); /* read the done flag before the stats */
-                efx->mac_op->update_stats(efx);
+                falcon_update_stats_xmac(efx);
         }
 }
 
@@ -1767,13 +1763,13 @@ const struct efx_nic_type falcon_a1_nic_type = {
         .stop_stats = falcon_stop_nic_stats,
         .set_id_led = falcon_set_id_led,
         .push_irq_moderation = falcon_push_irq_moderation,
-        .push_multicast_hash = falcon_push_multicast_hash,
         .reconfigure_port = falcon_reconfigure_port,
+        .reconfigure_mac = falcon_reconfigure_xmac,
+        .check_mac_fault = falcon_xmac_check_fault,
         .get_wol = falcon_get_wol,
         .set_wol = falcon_set_wol,
         .resume_wol = efx_port_dummy_op_void,
         .test_nvram = falcon_test_nvram,
-        .default_mac_ops = &falcon_xmac_operations,
 
         .revision = EFX_REV_FALCON_A1,
         .mem_map_size = 0x20000,
@@ -1786,6 +1782,7 @@ const struct efx_nic_type falcon_a1_nic_type = {
         .rx_buffer_padding = 0x24,
         .max_interrupt_mode = EFX_INT_MODE_MSI,
         .phys_addr_channels = 4,
+        .timer_period_max =  1 << FRF_AB_TC_TIMER_VAL_WIDTH,
         .tx_dc_base = 0x130000,
         .rx_dc_base = 0x100000,
         .offload_features = NETIF_F_IP_CSUM,
@@ -1809,14 +1806,14 @@ const struct efx_nic_type falcon_b0_nic_type = {
         .stop_stats = falcon_stop_nic_stats,
         .set_id_led = falcon_set_id_led,
         .push_irq_moderation = falcon_push_irq_moderation,
-        .push_multicast_hash = falcon_push_multicast_hash,
         .reconfigure_port = falcon_reconfigure_port,
+        .reconfigure_mac = falcon_reconfigure_xmac,
+        .check_mac_fault = falcon_xmac_check_fault,
         .get_wol = falcon_get_wol,
         .set_wol = falcon_set_wol,
         .resume_wol = efx_port_dummy_op_void,
         .test_registers = falcon_b0_test_registers,
         .test_nvram = falcon_test_nvram,
-        .default_mac_ops = &falcon_xmac_operations,
 
         .revision = EFX_REV_FALCON_B0,
         /* Map everything up to and including the RSS indirection
@@ -1837,6 +1834,7 @@ const struct efx_nic_type falcon_b0_nic_type = {
         .phys_addr_channels = 32, /* Hardware limit is 64, but the legacy
                                    * interrupt handler only supports 32
                                    * channels */
+        .timer_period_max =  1 << FRF_AB_TC_TIMER_VAL_WIDTH,
         .tx_dc_base = 0x130000,
         .rx_dc_base = 0x100000,
         .offload_features = NETIF_F_IP_CSUM | NETIF_F_RXHASH | NETIF_F_NTUPLE,
diff --git a/drivers/net/ethernet/sfc/falcon_boards.c b/drivers/net/ethernet/sfc/falcon_boards.c
index 6cc16b8cc6f4..2084cc6ede52 100644
--- a/drivers/net/ethernet/sfc/falcon_boards.c
+++ b/drivers/net/ethernet/sfc/falcon_boards.c
@@ -87,7 +87,7 @@ static const u8 falcon_lm87_common_regs[] = {
         0
 };
 
-static int efx_init_lm87(struct efx_nic *efx, struct i2c_board_info *info,
+static int efx_init_lm87(struct efx_nic *efx, const struct i2c_board_info *info,
                          const u8 *reg_values)
 {
         struct falcon_board *board = falcon_board(efx);
@@ -179,7 +179,7 @@ static int efx_check_lm87(struct efx_nic *efx, unsigned mask)
 #else /* !CONFIG_SENSORS_LM87 */
 
 static inline int
-efx_init_lm87(struct efx_nic *efx, struct i2c_board_info *info,
+efx_init_lm87(struct efx_nic *efx, const struct i2c_board_info *info,
               const u8 *reg_values)
 {
         return 0;
@@ -442,7 +442,7 @@ static int sfe4001_check_hw(struct efx_nic *efx)
         return (status < 0) ? -EIO : -ERANGE;
 }
 
-static struct i2c_board_info sfe4001_hwmon_info = {
+static const struct i2c_board_info sfe4001_hwmon_info = {
         I2C_BOARD_INFO("max6647", 0x4e),
 };
 
@@ -522,7 +522,7 @@ static const u8 sfe4002_lm87_regs[] = {
         0
 };
 
-static struct i2c_board_info sfe4002_hwmon_info = {
+static const struct i2c_board_info sfe4002_hwmon_info = {
         I2C_BOARD_INFO("lm87", 0x2e),
         .platform_data  = &sfe4002_lm87_channel,
 };
@@ -591,7 +591,7 @@ static const u8 sfn4112f_lm87_regs[] = {
         0
 };
 
-static struct i2c_board_info sfn4112f_hwmon_info = {
+static const struct i2c_board_info sfn4112f_hwmon_info = {
         I2C_BOARD_INFO("lm87", 0x2e),
         .platform_data  = &sfn4112f_lm87_channel,
 };
@@ -653,7 +653,7 @@ static const u8 sfe4003_lm87_regs[] = {
         0
 };
 
-static struct i2c_board_info sfe4003_hwmon_info = {
+static const struct i2c_board_info sfe4003_hwmon_info = {
         I2C_BOARD_INFO("lm87", 0x2e),
         .platform_data  = &sfe4003_lm87_channel,
 };
diff --git a/drivers/net/ethernet/sfc/falcon_xmac.c b/drivers/net/ethernet/sfc/falcon_xmac.c
index 9516452c079c..6106ef15dee3 100644
--- a/drivers/net/ethernet/sfc/falcon_xmac.c
+++ b/drivers/net/ethernet/sfc/falcon_xmac.c
@@ -14,7 +14,6 @@
 #include "nic.h"
 #include "regs.h"
 #include "io.h"
-#include "mac.h"
 #include "mdio_10g.h"
 #include "workarounds.h"
 
@@ -139,7 +138,7 @@ static bool falcon_xmac_link_ok(struct efx_nic *efx)
         return (efx->loopback_mode == LOOPBACK_XGMII ||
                 falcon_xgxs_link_ok(efx)) &&
                 (!(efx->mdio.mmds & (1 << MDIO_MMD_PHYXS)) ||
-                 LOOPBACK_INTERNAL(efx) || 
+                 LOOPBACK_INTERNAL(efx) ||
                  efx_mdio_phyxgxs_lane_sync(efx));
 }
 
@@ -270,12 +269,12 @@ static bool falcon_xmac_link_ok_retry(struct efx_nic *efx, int tries)
         return mac_up;
 }
 
-static bool falcon_xmac_check_fault(struct efx_nic *efx)
+bool falcon_xmac_check_fault(struct efx_nic *efx)
 {
         return !falcon_xmac_link_ok_retry(efx, 5);
 }
 
-static int falcon_reconfigure_xmac(struct efx_nic *efx)
+int falcon_reconfigure_xmac(struct efx_nic *efx)
 {
         struct falcon_nic_data *nic_data = efx->nic_data;
 
@@ -290,7 +289,7 @@ static int falcon_reconfigure_xmac(struct efx_nic *efx)
         return 0;
 }
 
-static void falcon_update_stats_xmac(struct efx_nic *efx)
+void falcon_update_stats_xmac(struct efx_nic *efx)
 {
         struct efx_mac_stats *mac_stats = &efx->mac_stats;
 
@@ -361,9 +360,3 @@ void falcon_poll_xmac(struct efx_nic *efx)
         nic_data->xmac_poll_required = !falcon_xmac_link_ok_retry(efx, 1);
         falcon_ack_status_intr(efx);
 }
-
-const struct efx_mac_operations falcon_xmac_operations = {
-        .reconfigure    = falcon_reconfigure_xmac,
-        .update_stats   = falcon_update_stats_xmac,
-        .check_fault    = falcon_xmac_check_fault,
-};
diff --git a/drivers/net/ethernet/sfc/mac.h b/drivers/net/ethernet/sfc/mac.h
deleted file mode 100644
index d6a255d0856b..000000000000
--- a/drivers/net/ethernet/sfc/mac.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/****************************************************************************
- * Driver for Solarflare Solarstorm network controllers and boards
- * Copyright 2005-2006 Fen Systems Ltd.
- * Copyright 2006-2009 Solarflare Communications 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, incorporated herein by reference.
- */
-
-#ifndef EFX_MAC_H
-#define EFX_MAC_H
-
-#include "net_driver.h"
-
-extern const struct efx_mac_operations falcon_xmac_operations;
-extern const struct efx_mac_operations efx_mcdi_mac_operations;
-extern int efx_mcdi_mac_stats(struct efx_nic *efx, dma_addr_t dma_addr,
-                              u32 dma_len, int enable, int clear);
-
-#endif
diff --git a/drivers/net/ethernet/sfc/mcdi.c b/drivers/net/ethernet/sfc/mcdi.c
index 81a425397468..619f63a66ce7 100644
--- a/drivers/net/ethernet/sfc/mcdi.c
+++ b/drivers/net/ethernet/sfc/mcdi.c
@@ -22,22 +22,22 @@
  **************************************************************************
  */
 
-/* Software-defined structure to the shared-memory */
-#define CMD_NOTIFY_PORT0 0
-#define CMD_NOTIFY_PORT1 4
-#define CMD_PDU_PORT0    0x008
-#define CMD_PDU_PORT1    0x108
-#define REBOOT_FLAG_PORT0 0x3f8
-#define REBOOT_FLAG_PORT1 0x3fc
-
 #define MCDI_RPC_TIMEOUT       10 /*seconds */
 
 #define MCDI_PDU(efx)                                                   \
-        (efx_port_num(efx) ? CMD_PDU_PORT1 : CMD_PDU_PORT0)
+        (efx_port_num(efx) ? MC_SMEM_P1_PDU_OFST : MC_SMEM_P0_PDU_OFST)
 #define MCDI_DOORBELL(efx)                                              \
-        (efx_port_num(efx) ? CMD_NOTIFY_PORT1 : CMD_NOTIFY_PORT0)
-#define MCDI_REBOOT_FLAG(efx)                                           \
-        (efx_port_num(efx) ? REBOOT_FLAG_PORT1 : REBOOT_FLAG_PORT0)
+        (efx_port_num(efx) ? MC_SMEM_P1_DOORBELL_OFST : MC_SMEM_P0_DOORBELL_OFST)
+#define MCDI_STATUS(efx)                                                \
+        (efx_port_num(efx) ? MC_SMEM_P1_STATUS_OFST : MC_SMEM_P0_STATUS_OFST)
+
+/* A reboot/assertion causes the MCDI status word to be set after the
+ * command word is set or a REBOOT event is sent. If we notice a reboot
+ * via these mechanisms then wait 10ms for the status word to be set. */
+#define MCDI_STATUS_DELAY_US            100
+#define MCDI_STATUS_DELAY_COUNT         100
+#define MCDI_STATUS_SLEEP_MS                                            \
+        (MCDI_STATUS_DELAY_US * MCDI_STATUS_DELAY_COUNT / 1000)
 
 #define SEQ_MASK                                                        \
         EFX_MASK32(EFX_WIDTH(MCDI_HEADER_SEQ))
@@ -77,7 +77,7 @@ static void efx_mcdi_copyin(struct efx_nic *efx, unsigned cmd,
         u32 xflags, seqno;
 
         BUG_ON(atomic_read(&mcdi->state) == MCDI_STATE_QUIESCENT);
-        BUG_ON(inlen & 3 || inlen >= 0x100);
+        BUG_ON(inlen & 3 || inlen >= MC_SMEM_PDU_LEN);
 
         seqno = mcdi->seqno & SEQ_MASK;
         xflags = 0;
@@ -111,7 +111,7 @@ static void efx_mcdi_copyout(struct efx_nic *efx, u8 *outbuf, size_t outlen)
         int i;
 
         BUG_ON(atomic_read(&mcdi->state) == MCDI_STATE_QUIESCENT);
-        BUG_ON(outlen & 3 || outlen >= 0x100);
+        BUG_ON(outlen & 3 || outlen >= MC_SMEM_PDU_LEN);
 
         for (i = 0; i < outlen; i += 4)
                 *((__le32 *)(outbuf + i)) = _efx_readd(efx, pdu + 4 + i);
@@ -210,7 +210,7 @@ out:
 /* Test and clear MC-rebooted flag for this port/function */
 int efx_mcdi_poll_reboot(struct efx_nic *efx)
 {
-        unsigned int addr = FR_CZ_MC_TREG_SMEM + MCDI_REBOOT_FLAG(efx);
+        unsigned int addr = FR_CZ_MC_TREG_SMEM + MCDI_STATUS(efx);
         efx_dword_t reg;
         uint32_t value;
 
@@ -384,6 +384,11 @@ int efx_mcdi_rpc(struct efx_nic *efx, unsigned cmd,
                         netif_dbg(efx, hw, efx->net_dev,
                                   "MC command 0x%x inlen %d failed rc=%d\n",
                                   cmd, (int)inlen, -rc);
+
+                if (rc == -EIO || rc == -EINTR) {
+                        msleep(MCDI_STATUS_SLEEP_MS);
+                        efx_mcdi_poll_reboot(efx);
+                }
         }
 
         efx_mcdi_release(mcdi);
@@ -465,10 +470,20 @@ static void efx_mcdi_ev_death(struct efx_nic *efx, int rc)
                         mcdi->resplen = 0;
                         ++mcdi->credits;
                 }
-        } else
+        } else {
+                int count;
+
                 /* Nobody was waiting for an MCDI request, so trigger a reset */
                 efx_schedule_reset(efx, RESET_TYPE_MC_FAILURE);
 
+                /* Consume the status word since efx_mcdi_rpc_finish() won't */
+                for (count = 0; count < MCDI_STATUS_DELAY_COUNT; ++count) {
+                        if (efx_mcdi_poll_reboot(efx))
+                                break;
+                        udelay(MCDI_STATUS_DELAY_US);
+                }
+        }
+
         spin_unlock(&mcdi->iface_lock);
 }
 
@@ -502,49 +517,6 @@ static void efx_mcdi_process_link_change(struct efx_nic *efx, efx_qword_t *ev)
         efx_link_status_changed(efx);
 }
 
-static const char *sensor_names[] = {
-        [MC_CMD_SENSOR_CONTROLLER_TEMP] = "Controller temp. sensor",
-        [MC_CMD_SENSOR_PHY_COMMON_TEMP] = "PHY shared temp. sensor",
-        [MC_CMD_SENSOR_CONTROLLER_COOLING] = "Controller cooling",
-        [MC_CMD_SENSOR_PHY0_TEMP] = "PHY 0 temp. sensor",
-        [MC_CMD_SENSOR_PHY0_COOLING] = "PHY 0 cooling",
-        [MC_CMD_SENSOR_PHY1_TEMP] = "PHY 1 temp. sensor",
-        [MC_CMD_SENSOR_PHY1_COOLING] = "PHY 1 cooling",
-        [MC_CMD_SENSOR_IN_1V0] = "1.0V supply sensor",
-        [MC_CMD_SENSOR_IN_1V2] = "1.2V supply sensor",
-        [MC_CMD_SENSOR_IN_1V8] = "1.8V supply sensor",
-        [MC_CMD_SENSOR_IN_2V5] = "2.5V supply sensor",
-        [MC_CMD_SENSOR_IN_3V3] = "3.3V supply sensor",
-        [MC_CMD_SENSOR_IN_12V0] = "12V supply sensor"
-};
-
-static const char *sensor_status_names[] = {
-        [MC_CMD_SENSOR_STATE_OK] = "OK",
-        [MC_CMD_SENSOR_STATE_WARNING] = "Warning",
-        [MC_CMD_SENSOR_STATE_FATAL] = "Fatal",
-        [MC_CMD_SENSOR_STATE_BROKEN] = "Device failure",
-};
-
-static void efx_mcdi_sensor_event(struct efx_nic *efx, efx_qword_t *ev)
-{
-        unsigned int monitor, state, value;
-        const char *name, *state_txt;
-        monitor = EFX_QWORD_FIELD(*ev, MCDI_EVENT_SENSOREVT_MONITOR);
-        state = EFX_QWORD_FIELD(*ev, MCDI_EVENT_SENSOREVT_STATE);
-        value = EFX_QWORD_FIELD(*ev, MCDI_EVENT_SENSOREVT_VALUE);
-        /* Deal gracefully with the board having more drivers than we
-         * know about, but do not expect new sensor states. */
-        name = (monitor >= ARRAY_SIZE(sensor_names))
-                                    ? "No sensor name available" :
-                                    sensor_names[monitor];
-        EFX_BUG_ON_PARANOID(state >= ARRAY_SIZE(sensor_status_names));
-        state_txt = sensor_status_names[state];
-
-        netif_err(efx, hw, efx->net_dev,
-                  "Sensor %d (%s) reports condition '%s' for raw value %d\n",
-                  monitor, name, state_txt, value);
-}
-
 /* Called from  falcon_process_eventq for MCDI events */
 void efx_mcdi_process_event(struct efx_channel *channel,
                             efx_qword_t *event)
@@ -604,7 +576,7 @@ void efx_mcdi_process_event(struct efx_channel *channel,
 
 void efx_mcdi_print_fwver(struct efx_nic *efx, char *buf, size_t len)
 {
-        u8 outbuf[ALIGN(MC_CMD_GET_VERSION_V1_OUT_LEN, 4)];
+        u8 outbuf[ALIGN(MC_CMD_GET_VERSION_OUT_LEN, 4)];
         size_t outlength;
         const __le16 *ver_words;
         int rc;
@@ -616,7 +588,7 @@ void efx_mcdi_print_fwver(struct efx_nic *efx, char *buf, size_t len)
         if (rc)
                 goto fail;
 
-        if (outlength < MC_CMD_GET_VERSION_V1_OUT_LEN) {
+        if (outlength < MC_CMD_GET_VERSION_OUT_LEN) {
                 rc = -EIO;
                 goto fail;
         }
@@ -663,9 +635,9 @@ fail:
 }
 
 int efx_mcdi_get_board_cfg(struct efx_nic *efx, u8 *mac_address,
-                           u16 *fw_subtype_list)
+                           u16 *fw_subtype_list, u32 *capabilities)
 {
-        uint8_t outbuf[MC_CMD_GET_BOARD_CFG_OUT_LEN];
+        uint8_t outbuf[MC_CMD_GET_BOARD_CFG_OUT_LENMIN];
         size_t outlen;
         int port_num = efx_port_num(efx);
         int offset;
@@ -678,7 +650,7 @@ int efx_mcdi_get_board_cfg(struct efx_nic *efx, u8 *mac_address,
         if (rc)
                 goto fail;
 
-        if (outlen < MC_CMD_GET_BOARD_CFG_OUT_LEN) {
+        if (outlen < MC_CMD_GET_BOARD_CFG_OUT_LENMIN) {
                 rc = -EIO;
                 goto fail;
         }
@@ -691,7 +663,16 @@ int efx_mcdi_get_board_cfg(struct efx_nic *efx, u8 *mac_address,
         if (fw_subtype_list)
                 memcpy(fw_subtype_list,
                        outbuf + MC_CMD_GET_BOARD_CFG_OUT_FW_SUBTYPE_LIST_OFST,
-                       MC_CMD_GET_BOARD_CFG_OUT_FW_SUBTYPE_LIST_LEN);
+                       MC_CMD_GET_BOARD_CFG_OUT_FW_SUBTYPE_LIST_MINNUM *
+                       sizeof(fw_subtype_list[0]));
+        if (capabilities) {
+                if (port_num)
+                        *capabilities = MCDI_DWORD(outbuf,
+                                        GET_BOARD_CFG_OUT_CAPABILITIES_PORT1);
+                else
+                        *capabilities = MCDI_DWORD(outbuf,
+                                        GET_BOARD_CFG_OUT_CAPABILITIES_PORT0);
+        }
 
         return 0;
 
@@ -779,7 +760,7 @@ int efx_mcdi_nvram_info(struct efx_nic *efx, unsigned int type,
         *size_out = MCDI_DWORD(outbuf, NVRAM_INFO_OUT_SIZE);
         *erase_size_out = MCDI_DWORD(outbuf, NVRAM_INFO_OUT_ERASESIZE);
         *protected_out = !!(MCDI_DWORD(outbuf, NVRAM_INFO_OUT_FLAGS) &
-                                (1 << MC_CMD_NVRAM_PROTECTED_LBN));
+                                (1 << MC_CMD_NVRAM_INFO_OUT_PROTECTED_LBN));
         return 0;
 
 fail:
@@ -1060,7 +1041,7 @@ void efx_mcdi_set_id_led(struct efx_nic *efx, enum efx_led_mode mode)
 
 int efx_mcdi_reset_port(struct efx_nic *efx)
 {
-        int rc = efx_mcdi_rpc(efx, MC_CMD_PORT_RESET, NULL, 0, NULL, 0, NULL);
+        int rc = efx_mcdi_rpc(efx, MC_CMD_ENTITY_RESET, NULL, 0, NULL, 0, NULL);
         if (rc)
                 netif_err(efx, hw, efx->net_dev, "%s: failed rc=%d\n",
                           __func__, rc);
diff --git a/drivers/net/ethernet/sfc/mcdi.h b/drivers/net/ethernet/sfc/mcdi.h
index aced2a7856fc..fbaa6efcd744 100644
--- a/drivers/net/ethernet/sfc/mcdi.h
+++ b/drivers/net/ethernet/sfc/mcdi.h
@@ -56,6 +56,15 @@ struct efx_mcdi_iface {
         size_t resplen;
 };
 
+struct efx_mcdi_mon {
+        struct efx_buffer dma_buf;
+        struct mutex update_lock;
+        unsigned long last_update;
+        struct device *device;
+        struct efx_mcdi_mon_attribute *attrs;
+        unsigned int n_attrs;
+};
+
 extern void efx_mcdi_init(struct efx_nic *efx);
 
 extern int efx_mcdi_rpc(struct efx_nic *efx, unsigned cmd, const u8 *inbuf,
@@ -68,6 +77,7 @@ extern void efx_mcdi_mode_event(struct efx_nic *efx);
 
 extern void efx_mcdi_process_event(struct efx_channel *channel,
                                    efx_qword_t *event);
+extern void efx_mcdi_sensor_event(struct efx_nic *efx, efx_qword_t *ev);
 
 #define MCDI_PTR2(_buf, _ofst)                                          \
         (((u8 *)_buf) + _ofst)
@@ -83,6 +93,10 @@ extern void efx_mcdi_process_event(struct efx_channel *channel,
 
 #define MCDI_PTR(_buf, _ofst)                                           \
         MCDI_PTR2(_buf, MC_CMD_ ## _ofst ## _OFST)
+#define MCDI_ARRAY_PTR(_buf, _field, _type, _index)                     \
+        MCDI_PTR2(_buf,                                                 \
+                  MC_CMD_ ## _field ## _OFST +                          \
+                  (_index) * MC_CMD_ ## _type ## _TYPEDEF_LEN)
 #define MCDI_SET_DWORD(_buf, _ofst, _value)                             \
         MCDI_SET_DWORD2(_buf, MC_CMD_ ## _ofst ## _OFST, _value)
 #define MCDI_DWORD(_buf, _ofst)                                         \
@@ -92,12 +106,18 @@ extern void efx_mcdi_process_event(struct efx_channel *channel,
 
 #define MCDI_EVENT_FIELD(_ev, _field)                   \
         EFX_QWORD_FIELD(_ev, MCDI_EVENT_ ## _field)
+#define MCDI_ARRAY_FIELD(_buf, _field1, _type, _index, _field2)         \
+        EFX_DWORD_FIELD(                                                \
+                *((efx_dword_t *)                                       \
+                  (MCDI_ARRAY_PTR(_buf, _field1, _type, _index) +       \
+                   (MC_CMD_ ## _type ## _TYPEDEF_ ## _field2 ## _OFST & ~3))), \
+                MC_CMD_ ## _type ## _TYPEDEF_ ## _field2)
 
 extern void efx_mcdi_print_fwver(struct efx_nic *efx, char *buf, size_t len);
 extern int efx_mcdi_drv_attach(struct efx_nic *efx, bool driver_operating,
                                bool *was_attached_out);
 extern int efx_mcdi_get_board_cfg(struct efx_nic *efx, u8 *mac_address,
-                                  u16 *fw_subtype_list);
+                                  u16 *fw_subtype_list, u32 *capabilities);
 extern int efx_mcdi_log_ctrl(struct efx_nic *efx, bool evq, bool uart,
                              u32 dest_evq);
 extern int efx_mcdi_nvram_types(struct efx_nic *efx, u32 *nvram_types_out);
@@ -126,5 +146,17 @@ extern int efx_mcdi_wol_filter_set_magic(struct efx_nic *efx,
 extern int efx_mcdi_wol_filter_get_magic(struct efx_nic *efx, int *id_out);
 extern int efx_mcdi_wol_filter_remove(struct efx_nic *efx, int id);
 extern int efx_mcdi_wol_filter_reset(struct efx_nic *efx);
+extern int efx_mcdi_mac_stats(struct efx_nic *efx, dma_addr_t dma_addr,
+                              u32 dma_len, int enable, int clear);
+extern int efx_mcdi_mac_reconfigure(struct efx_nic *efx);
+extern bool efx_mcdi_mac_check_fault(struct efx_nic *efx);
+
+#ifdef CONFIG_SFC_MCDI_MON
+extern int efx_mcdi_mon_probe(struct efx_nic *efx);
+extern void efx_mcdi_mon_remove(struct efx_nic *efx);
+#else
+static inline int efx_mcdi_mon_probe(struct efx_nic *efx) { return 0; }
+static inline void efx_mcdi_mon_remove(struct efx_nic *efx) {}
+#endif
 
 #endif /* EFX_MCDI_H */
diff --git a/drivers/net/ethernet/sfc/mcdi_mac.c b/drivers/net/ethernet/sfc/mcdi_mac.c
index 50c20777a564..f67cf921bd1b 100644
--- a/drivers/net/ethernet/sfc/mcdi_mac.c
+++ b/drivers/net/ethernet/sfc/mcdi_mac.c
@@ -9,7 +9,6 @@
 
 #include "net_driver.h"
 #include "efx.h"
-#include "mac.h"
 #include "mcdi.h"
 #include "mcdi_pcol.h"
 
@@ -52,7 +51,7 @@ static int efx_mcdi_set_mac(struct efx_nic *efx)
                             NULL, 0, NULL);
 }
 
-static int efx_mcdi_get_mac_faults(struct efx_nic *efx, u32 *faults)
+bool efx_mcdi_mac_check_fault(struct efx_nic *efx)
 {
         u8 outbuf[MC_CMD_GET_LINK_OUT_LEN];
         size_t outlength;
@@ -62,16 +61,13 @@ static int efx_mcdi_get_mac_faults(struct efx_nic *efx, u32 *faults)
 
         rc = efx_mcdi_rpc(efx, MC_CMD_GET_LINK, NULL, 0,
                           outbuf, sizeof(outbuf), &outlength);
-        if (rc)
-                goto fail;
-
-        *faults = MCDI_DWORD(outbuf, GET_LINK_OUT_MAC_FAULT);
-        return 0;
+        if (rc) {
+                netif_err(efx, hw, efx->net_dev, "%s: failed rc=%d\n",
+                          __func__, rc);
+                return true;
+        }
 
-fail:
-        netif_err(efx, hw, efx->net_dev, "%s: failed rc=%d\n",
-                  __func__, rc);
-        return rc;
+        return MCDI_DWORD(outbuf, GET_LINK_OUT_MAC_FAULT) != 0;
 }
 
 int efx_mcdi_mac_stats(struct efx_nic *efx, dma_addr_t dma_addr,
@@ -84,7 +80,7 @@ int efx_mcdi_mac_stats(struct efx_nic *efx, dma_addr_t dma_addr,
         u32 addr_hi;
         u32 addr_lo;
 
-        BUILD_BUG_ON(MC_CMD_MAC_STATS_OUT_LEN != 0);
+        BUILD_BUG_ON(MC_CMD_MAC_STATS_OUT_DMA_LEN != 0);
 
         addr_lo = ((u64)dma_addr) >> 0;
         addr_hi = ((u64)dma_addr) >> 32;
@@ -93,13 +89,13 @@ int efx_mcdi_mac_stats(struct efx_nic *efx, dma_addr_t dma_addr,
         MCDI_SET_DWORD(inbuf, MAC_STATS_IN_DMA_ADDR_HI, addr_hi);
         cmd_ptr = (efx_dword_t *)MCDI_PTR(inbuf, MAC_STATS_IN_CMD);
         EFX_POPULATE_DWORD_7(*cmd_ptr,
-                             MC_CMD_MAC_STATS_CMD_DMA, !!enable,
-                             MC_CMD_MAC_STATS_CMD_CLEAR, clear,
-                             MC_CMD_MAC_STATS_CMD_PERIODIC_CHANGE, 1,
-                             MC_CMD_MAC_STATS_CMD_PERIODIC_ENABLE, !!enable,
-                             MC_CMD_MAC_STATS_CMD_PERIODIC_CLEAR, 0,
-                             MC_CMD_MAC_STATS_CMD_PERIODIC_NOEVENT, 1,
-                             MC_CMD_MAC_STATS_CMD_PERIOD_MS, period);
+                             MC_CMD_MAC_STATS_IN_DMA, !!enable,
+                             MC_CMD_MAC_STATS_IN_CLEAR, clear,
+                             MC_CMD_MAC_STATS_IN_PERIODIC_CHANGE, 1,
+                             MC_CMD_MAC_STATS_IN_PERIODIC_ENABLE, !!enable,
+                             MC_CMD_MAC_STATS_IN_PERIODIC_CLEAR, 0,
+                             MC_CMD_MAC_STATS_IN_PERIODIC_NOEVENT, 1,
+                             MC_CMD_MAC_STATS_IN_PERIOD_MS, period);
         MCDI_SET_DWORD(inbuf, MAC_STATS_IN_DMA_LEN, dma_len);
 
         rc = efx_mcdi_rpc(efx, MC_CMD_MAC_STATS, inbuf, sizeof(inbuf),
@@ -115,31 +111,18 @@ fail:
         return rc;
 }
 
-static int efx_mcdi_mac_reconfigure(struct efx_nic *efx)
+int efx_mcdi_mac_reconfigure(struct efx_nic *efx)
 {
         int rc;
 
+        WARN_ON(!mutex_is_locked(&efx->mac_lock));
+
         rc = efx_mcdi_set_mac(efx);
         if (rc != 0)
                 return rc;
 
-        /* Restore the multicast hash registers. */
-        efx->type->push_multicast_hash(efx);
-
-        return 0;
-}
-
-
-static bool efx_mcdi_mac_check_fault(struct efx_nic *efx)
-{
-        u32 faults;
-        int rc = efx_mcdi_get_mac_faults(efx, &faults);
-        return (rc != 0) || (faults != 0);
+        return efx_mcdi_rpc(efx, MC_CMD_SET_MCAST_HASH,
+                            efx->multicast_hash.byte,
+                            sizeof(efx->multicast_hash),
+                            NULL, 0, NULL);
 }
-
-
-const struct efx_mac_operations efx_mcdi_mac_operations = {
-        .reconfigure    = efx_mcdi_mac_reconfigure,
-        .update_stats   = efx_port_dummy_op_void,
-        .check_fault    = efx_mcdi_mac_check_fault,
-};
diff --git a/drivers/net/ethernet/sfc/mcdi_mon.c b/drivers/net/ethernet/sfc/mcdi_mon.c
new file mode 100644
index 000000000000..8a72c10b9a6c
--- /dev/null
+++ b/drivers/net/ethernet/sfc/mcdi_mon.c
@@ -0,0 +1,415 @@
+/****************************************************************************
+ * Driver for Solarflare Solarstorm network controllers and boards
+ * Copyright 2011 Solarflare Communications 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, incorporated herein by reference.
+ */
+
+#include <linux/bitops.h>
+#include <linux/slab.h>
+#include <linux/hwmon.h>
+#include <linux/stat.h>
+
+#include "net_driver.h"
+#include "mcdi.h"
+#include "mcdi_pcol.h"
+#include "nic.h"
+
+enum efx_hwmon_type {
+        EFX_HWMON_UNKNOWN,
+        EFX_HWMON_TEMP,         /* temperature */
+        EFX_HWMON_COOL,         /* cooling device, probably a heatsink */
+        EFX_HWMON_IN            /* input voltage */
+};
+
+static const struct {
+        const char *label;
+        enum efx_hwmon_type hwmon_type;
+        int port;
+} efx_mcdi_sensor_type[MC_CMD_SENSOR_ENTRY_MAXNUM] = {
+#define SENSOR(name, label, hwmon_type, port)                   \
+        [MC_CMD_SENSOR_##name] = { label, hwmon_type, port }
+        SENSOR(CONTROLLER_TEMP,    "Controller temp.",     EFX_HWMON_TEMP, -1),
+        SENSOR(PHY_COMMON_TEMP,    "PHY temp.",            EFX_HWMON_TEMP, -1),
+        SENSOR(CONTROLLER_COOLING, "Controller cooling",   EFX_HWMON_COOL, -1),
+        SENSOR(PHY0_TEMP,          "PHY temp.",            EFX_HWMON_TEMP, 0),
+        SENSOR(PHY0_COOLING,       "PHY cooling",          EFX_HWMON_COOL, 0),
+        SENSOR(PHY1_TEMP,          "PHY temp.",            EFX_HWMON_TEMP, 1),
+        SENSOR(PHY1_COOLING,       "PHY cooling",          EFX_HWMON_COOL, 1),
+        SENSOR(IN_1V0,             "1.0V supply",          EFX_HWMON_IN,   -1),
+        SENSOR(IN_1V2,             "1.2V supply",          EFX_HWMON_IN,   -1),
+        SENSOR(IN_1V8,             "1.8V supply",          EFX_HWMON_IN,   -1),
+        SENSOR(IN_2V5,             "2.5V supply",          EFX_HWMON_IN,   -1),
+        SENSOR(IN_3V3,             "3.3V supply",          EFX_HWMON_IN,   -1),
+        SENSOR(IN_12V0,            "12.0V supply",         EFX_HWMON_IN,   -1),
+        SENSOR(IN_1V2A,            "1.2V analogue supply", EFX_HWMON_IN,   -1),
+        SENSOR(IN_VREF,            "ref. voltage",         EFX_HWMON_IN,   -1),
+#undef SENSOR
+};
+
+static const char *const sensor_status_names[] = {
+        [MC_CMD_SENSOR_STATE_OK] = "OK",
+        [MC_CMD_SENSOR_STATE_WARNING] = "Warning",
+        [MC_CMD_SENSOR_STATE_FATAL] = "Fatal",
+        [MC_CMD_SENSOR_STATE_BROKEN] = "Device failure",
+};
+
+void efx_mcdi_sensor_event(struct efx_nic *efx, efx_qword_t *ev)
+{
+        unsigned int type, state, value;
+        const char *name = NULL, *state_txt;
+
+        type = EFX_QWORD_FIELD(*ev, MCDI_EVENT_SENSOREVT_MONITOR);
+        state = EFX_QWORD_FIELD(*ev, MCDI_EVENT_SENSOREVT_STATE);
+        value = EFX_QWORD_FIELD(*ev, MCDI_EVENT_SENSOREVT_VALUE);
+
+        /* Deal gracefully with the board having more drivers than we
+         * know about, but do not expect new sensor states. */
+        if (type < ARRAY_SIZE(efx_mcdi_sensor_type))
+                name = efx_mcdi_sensor_type[type].label;
+        if (!name)
+                name = "No sensor name available";
+        EFX_BUG_ON_PARANOID(state >= ARRAY_SIZE(sensor_status_names));
+        state_txt = sensor_status_names[state];
+
+        netif_err(efx, hw, efx->net_dev,
+                  "Sensor %d (%s) reports condition '%s' for raw value %d\n",
+                  type, name, state_txt, value);
+}
+
+#ifdef CONFIG_SFC_MCDI_MON
+
+struct efx_mcdi_mon_attribute {
+        struct device_attribute dev_attr;
+        unsigned int index;
+        unsigned int type;
+        unsigned int limit_value;
+        char name[12];
+};
+
+static int efx_mcdi_mon_update(struct efx_nic *efx)
+{
+        struct efx_mcdi_mon *hwmon = efx_mcdi_mon(efx);
+        u8 inbuf[MC_CMD_READ_SENSORS_IN_LEN];
+        int rc;
+
+        MCDI_SET_DWORD(inbuf, READ_SENSORS_IN_DMA_ADDR_LO,
+                       hwmon->dma_buf.dma_addr & 0xffffffff);
+        MCDI_SET_DWORD(inbuf, READ_SENSORS_IN_DMA_ADDR_HI,
+                       (u64)hwmon->dma_buf.dma_addr >> 32);
+
+        rc = efx_mcdi_rpc(efx, MC_CMD_READ_SENSORS,
+                          inbuf, sizeof(inbuf), NULL, 0, NULL);
+        if (rc == 0)
+                hwmon->last_update = jiffies;
+        return rc;
+}
+
+static ssize_t efx_mcdi_mon_show_name(struct device *dev,
+                                      struct device_attribute *attr,
+                                      char *buf)
+{
+        return sprintf(buf, "%s\n", KBUILD_MODNAME);
+}
+
+static int efx_mcdi_mon_get_entry(struct device *dev, unsigned int index,
+                                  efx_dword_t *entry)
+{
+        struct efx_nic *efx = dev_get_drvdata(dev);
+        struct efx_mcdi_mon *hwmon = efx_mcdi_mon(efx);
+        int rc;
+
+        BUILD_BUG_ON(MC_CMD_READ_SENSORS_OUT_LEN != 0);
+
+        mutex_lock(&hwmon->update_lock);
+
+        /* Use cached value if last update was < 1 s ago */
+        if (time_before(jiffies, hwmon->last_update + HZ))
+                rc = 0;
+        else
+                rc = efx_mcdi_mon_update(efx);
+
+        /* Copy out the requested entry */
+        *entry = ((efx_dword_t *)hwmon->dma_buf.addr)[index];
+
+        mutex_unlock(&hwmon->update_lock);
+
+        return rc;
+}
+
+static ssize_t efx_mcdi_mon_show_value(struct device *dev,
+                                       struct device_attribute *attr,
+                                       char *buf)
+{
+        struct efx_mcdi_mon_attribute *mon_attr =
+                container_of(attr, struct efx_mcdi_mon_attribute, dev_attr);
+        efx_dword_t entry;
+        unsigned int value;
+        int rc;
+
+        rc = efx_mcdi_mon_get_entry(dev, mon_attr->index, &entry);
+        if (rc)
+                return rc;
+
+        value = EFX_DWORD_FIELD(entry, MC_CMD_SENSOR_VALUE_ENTRY_TYPEDEF_VALUE);
+
+        /* Convert temperature from degrees to milli-degrees Celsius */
+        if (efx_mcdi_sensor_type[mon_attr->type].hwmon_type == EFX_HWMON_TEMP)
+                value *= 1000;
+
+        return sprintf(buf, "%u\n", value);
+}
+
+static ssize_t efx_mcdi_mon_show_limit(struct device *dev,
+                                       struct device_attribute *attr,
+                                       char *buf)
+{
+        struct efx_mcdi_mon_attribute *mon_attr =
+                container_of(attr, struct efx_mcdi_mon_attribute, dev_attr);
+        unsigned int value;
+
+        value = mon_attr->limit_value;
+
+        /* Convert temperature from degrees to milli-degrees Celsius */
+        if (efx_mcdi_sensor_type[mon_attr->type].hwmon_type == EFX_HWMON_TEMP)
+                value *= 1000;
+
+        return sprintf(buf, "%u\n", value);
+}
+
+static ssize_t efx_mcdi_mon_show_alarm(struct device *dev,
+                                       struct device_attribute *attr,
+                                       char *buf)
+{
+        struct efx_mcdi_mon_attribute *mon_attr =
+                container_of(attr, struct efx_mcdi_mon_attribute, dev_attr);
+        efx_dword_t entry;
+        int state;
+        int rc;
+
+        rc = efx_mcdi_mon_get_entry(dev, mon_attr->index, &entry);
+        if (rc)
+                return rc;
+
+        state = EFX_DWORD_FIELD(entry, MC_CMD_SENSOR_VALUE_ENTRY_TYPEDEF_STATE);
+        return sprintf(buf, "%d\n", state != MC_CMD_SENSOR_STATE_OK);
+}
+
+static ssize_t efx_mcdi_mon_show_label(struct device *dev,
+                                       struct device_attribute *attr,
+                                       char *buf)
+{
+        struct efx_mcdi_mon_attribute *mon_attr =
+                container_of(attr, struct efx_mcdi_mon_attribute, dev_attr);
+        return sprintf(buf, "%s\n",
+                       efx_mcdi_sensor_type[mon_attr->type].label);
+}
+
+static int
+efx_mcdi_mon_add_attr(struct efx_nic *efx, const char *name,
+                      ssize_t (*reader)(struct device *,
+                                        struct device_attribute *, char *),
+                      unsigned int index, unsigned int type,
+                      unsigned int limit_value)
+{
+        struct efx_mcdi_mon *hwmon = efx_mcdi_mon(efx);
+        struct efx_mcdi_mon_attribute *attr = &hwmon->attrs[hwmon->n_attrs];
+        int rc;
+
+        strlcpy(attr->name, name, sizeof(attr->name));
+        attr->index = index;
+        attr->type = type;
+        attr->limit_value = limit_value;
+        attr->dev_attr.attr.name = attr->name;
+        attr->dev_attr.attr.mode = S_IRUGO;
+        attr->dev_attr.show = reader;
+        rc = device_create_file(&efx->pci_dev->dev, &attr->dev_attr);
+        if (rc == 0)
+                ++hwmon->n_attrs;
+        return rc;
+}
+
+int efx_mcdi_mon_probe(struct efx_nic *efx)
+{
+        struct efx_mcdi_mon *hwmon = efx_mcdi_mon(efx);
+        unsigned int n_attrs, n_temp = 0, n_cool = 0, n_in = 0;
+        u8 outbuf[MC_CMD_SENSOR_INFO_OUT_LENMAX];
+        size_t outlen;
+        char name[12];
+        u32 mask;
+        int rc, i, type;
+
+        BUILD_BUG_ON(MC_CMD_SENSOR_INFO_IN_LEN != 0);
+
+        rc = efx_mcdi_rpc(efx, MC_CMD_SENSOR_INFO, NULL, 0,
+                          outbuf, sizeof(outbuf), &outlen);
+        if (rc)
+                return rc;
+        if (outlen < MC_CMD_SENSOR_INFO_OUT_LENMIN)
+                return -EIO;
+
+        /* Find out which sensors are present.  Don't create a device
+         * if there are none.
+         */
+        mask = MCDI_DWORD(outbuf, SENSOR_INFO_OUT_MASK);
+        if (mask == 0)
+                return 0;
+
+        /* Check again for short response */
+        if (outlen < MC_CMD_SENSOR_INFO_OUT_LEN(hweight32(mask)))
+                return -EIO;
+
+        rc = efx_nic_alloc_buffer(efx, &hwmon->dma_buf,
+                                  4 * MC_CMD_SENSOR_ENTRY_MAXNUM);
+        if (rc)
+                return rc;
+
+        mutex_init(&hwmon->update_lock);
+        efx_mcdi_mon_update(efx);
+
+        /* Allocate space for the maximum possible number of
+         * attributes for this set of sensors: name of the driver plus
+         * value, min, max, crit, alarm and label for each sensor.
+         */
+        n_attrs = 1 + 6 * hweight32(mask);
+        hwmon->attrs = kcalloc(n_attrs, sizeof(*hwmon->attrs), GFP_KERNEL);
+        if (!hwmon->attrs) {
+                rc = -ENOMEM;
+                goto fail;
+        }
+
+        hwmon->device = hwmon_device_register(&efx->pci_dev->dev);
+        if (IS_ERR(hwmon->device)) {
+                rc = PTR_ERR(hwmon->device);
+                goto fail;
+        }
+
+        rc = efx_mcdi_mon_add_attr(efx, "name", efx_mcdi_mon_show_name, 0, 0, 0);
+        if (rc)
+                goto fail;
+
+        for (i = 0, type = -1; ; i++) {
+                const char *hwmon_prefix;
+                unsigned hwmon_index;
+                u16 min1, max1, min2, max2;
+
+                /* Find next sensor type or exit if there is none */
+                type++;
+                while (!(mask & (1 << type))) {
+                        type++;
+                        if (type == 32)
+                                return 0;
+                }
+
+                /* Skip sensors specific to a different port */
+                if (efx_mcdi_sensor_type[type].hwmon_type != EFX_HWMON_UNKNOWN &&
+                    efx_mcdi_sensor_type[type].port >= 0 &&
+                    efx_mcdi_sensor_type[type].port != efx_port_num(efx))
+                        continue;
+
+                switch (efx_mcdi_sensor_type[type].hwmon_type) {
+                case EFX_HWMON_TEMP:
+                        hwmon_prefix = "temp";
+                        hwmon_index = ++n_temp; /* 1-based */
+                        break;
+                case EFX_HWMON_COOL:
+                        /* This is likely to be a heatsink, but there
+                         * is no convention for representing cooling
+                         * devices other than fans.
+                         */
+                        hwmon_prefix = "fan";
+                        hwmon_index = ++n_cool; /* 1-based */
+                        break;
+                default:
+                        hwmon_prefix = "in";
+                        hwmon_index = n_in++; /* 0-based */
+                        break;
+                }
+
+                min1 = MCDI_ARRAY_FIELD(outbuf, SENSOR_ENTRY,
+                                        SENSOR_INFO_ENTRY, i, MIN1);
+                max1 = MCDI_ARRAY_FIELD(outbuf, SENSOR_ENTRY,
+                                        SENSOR_INFO_ENTRY, i, MAX1);
+                min2 = MCDI_ARRAY_FIELD(outbuf, SENSOR_ENTRY,
+                                        SENSOR_INFO_ENTRY, i, MIN2);
+                max2 = MCDI_ARRAY_FIELD(outbuf, SENSOR_ENTRY,
+                                        SENSOR_INFO_ENTRY, i, MAX2);
+
+                if (min1 != max1) {
+                        snprintf(name, sizeof(name), "%s%u_input",
+                                 hwmon_prefix, hwmon_index);
+                        rc = efx_mcdi_mon_add_attr(
+                                efx, name, efx_mcdi_mon_show_value, i, type, 0);
+                        if (rc)
+                                goto fail;
+
+                        snprintf(name, sizeof(name), "%s%u_min",
+                                 hwmon_prefix, hwmon_index);
+                        rc = efx_mcdi_mon_add_attr(
+                                efx, name, efx_mcdi_mon_show_limit,
+                                i, type, min1);
+                        if (rc)
+                                goto fail;
+
+                        snprintf(name, sizeof(name), "%s%u_max",
+                                 hwmon_prefix, hwmon_index);
+                        rc = efx_mcdi_mon_add_attr(
+                                efx, name, efx_mcdi_mon_show_limit,
+                                i, type, max1);
+                        if (rc)
+                                goto fail;
+
+                        if (min2 != max2) {
+                                /* Assume max2 is critical value.
+                                 * But we have no good way to expose min2.
+                                 */
+                                snprintf(name, sizeof(name), "%s%u_crit",
+                                         hwmon_prefix, hwmon_index);
+                                rc = efx_mcdi_mon_add_attr(
+                                        efx, name, efx_mcdi_mon_show_limit,
+                                        i, type, max2);
+                                if (rc)
+                                        goto fail;
+                        }
+                }
+
+                snprintf(name, sizeof(name), "%s%u_alarm",
+                         hwmon_prefix, hwmon_index);
+                rc = efx_mcdi_mon_add_attr(
+                        efx, name, efx_mcdi_mon_show_alarm, i, type, 0);
+                if (rc)
+                        goto fail;
+
+                if (efx_mcdi_sensor_type[type].label) {
+                        snprintf(name, sizeof(name), "%s%u_label",
+                                 hwmon_prefix, hwmon_index);
+                        rc = efx_mcdi_mon_add_attr(
+                                efx, name, efx_mcdi_mon_show_label, i, type, 0);
+                        if (rc)
+                                goto fail;
+                }
+        }
+
+fail:
+        efx_mcdi_mon_remove(efx);
+        return rc;
+}
+
+void efx_mcdi_mon_remove(struct efx_nic *efx)
+{
+        struct siena_nic_data *nic_data = efx->nic_data;
+        struct efx_mcdi_mon *hwmon = &nic_data->hwmon;
+        unsigned int i;
+
+        for (i = 0; i < hwmon->n_attrs; i++)
+                device_remove_file(&efx->pci_dev->dev,
+                                   &hwmon->attrs[i].dev_attr);
+        kfree(hwmon->attrs);
+        if (hwmon->device)
+                hwmon_device_unregister(hwmon->device);
+        efx_nic_free_buffer(efx, &hwmon->dma_buf);
+}
+
+#endif /* CONFIG_SFC_MCDI_MON */
diff --git a/drivers/net/ethernet/sfc/mcdi_pcol.h b/drivers/net/ethernet/sfc/mcdi_pcol.h
index 41fe06fa0600..0310b9f08c9b 100644
--- a/drivers/net/ethernet/sfc/mcdi_pcol.h
+++ b/drivers/net/ethernet/sfc/mcdi_pcol.h
@@ -22,6 +22,18 @@
 /* The Scheduler has started. */
 #define MC_FW_STATE_SCHED (8)
 
+/* Siena MC shared memmory offsets */
+/* The 'doorbell' addresses are hard-wired to alert the MC when written */
+#define MC_SMEM_P0_DOORBELL_OFST        0x000
+#define MC_SMEM_P1_DOORBELL_OFST        0x004
+/* The rest of these are firmware-defined */
+#define MC_SMEM_P0_PDU_OFST             0x008
+#define MC_SMEM_P1_PDU_OFST             0x108
+#define MC_SMEM_PDU_LEN                 0x100
+#define MC_SMEM_P0_PTP_TIME_OFST        0x7f0
+#define MC_SMEM_P0_STATUS_OFST          0x7f8
+#define MC_SMEM_P1_STATUS_OFST          0x7fc
+
 /* Values to be written to the per-port status dword in shared
  * memory on reboot and assert */
 #define MC_STATUS_DWORD_REBOOT (0xb007b007)
@@ -34,6 +46,8 @@
  */
 #define MCDI_PCOL_VERSION 1
 
+/* Unused commands: 0x23, 0x27, 0x30, 0x31 */
+
 /**
  * MCDI version 1
  *
@@ -131,53 +145,6 @@
  */
 #define FSE_AZ_EV_CODE_MCDI_EVRESPONSE 0xc
 
-#define MCDI_EVENT_DATA_LBN 0
-#define MCDI_EVENT_DATA_WIDTH 32
-#define MCDI_EVENT_CONT_LBN 32
-#define MCDI_EVENT_CONT_WIDTH 1
-#define MCDI_EVENT_LEVEL_LBN 33
-#define MCDI_EVENT_LEVEL_WIDTH 3
-#define MCDI_EVENT_LEVEL_INFO (0)
-#define MCDI_EVENT_LEVEL_WARN (1)
-#define MCDI_EVENT_LEVEL_ERR (2)
-#define MCDI_EVENT_LEVEL_FATAL (3)
-#define MCDI_EVENT_SRC_LBN 36
-#define MCDI_EVENT_SRC_WIDTH 8
-#define MCDI_EVENT_CODE_LBN 44
-#define MCDI_EVENT_CODE_WIDTH 8
-#define MCDI_EVENT_CODE_BADSSERT (1)
-#define MCDI_EVENT_CODE_PMNOTICE (2)
-#define MCDI_EVENT_CODE_CMDDONE (3)
-#define  MCDI_EVENT_CMDDONE_SEQ_LBN 0
-#define  MCDI_EVENT_CMDDONE_SEQ_WIDTH 8
-#define  MCDI_EVENT_CMDDONE_DATALEN_LBN 8
-#define  MCDI_EVENT_CMDDONE_DATALEN_WIDTH 8
-#define  MCDI_EVENT_CMDDONE_ERRNO_LBN 16
-#define  MCDI_EVENT_CMDDONE_ERRNO_WIDTH 8
-#define MCDI_EVENT_CODE_LINKCHANGE (4)
-#define  MCDI_EVENT_LINKCHANGE_LP_CAP_LBN 0
-#define  MCDI_EVENT_LINKCHANGE_LP_CAP_WIDTH 16
-#define  MCDI_EVENT_LINKCHANGE_SPEED_LBN 16
-#define  MCDI_EVENT_LINKCHANGE_SPEED_WIDTH 4
-#define  MCDI_EVENT_LINKCHANGE_SPEED_100M 1
-#define  MCDI_EVENT_LINKCHANGE_SPEED_1G 2
-#define  MCDI_EVENT_LINKCHANGE_SPEED_10G 3
-#define  MCDI_EVENT_LINKCHANGE_FCNTL_LBN 20
-#define  MCDI_EVENT_LINKCHANGE_FCNTL_WIDTH 4
-#define  MCDI_EVENT_LINKCHANGE_LINK_FLAGS_LBN 24
-#define  MCDI_EVENT_LINKCHANGE_LINK_FLAGS_WIDTH 8
-#define MCDI_EVENT_CODE_SENSOREVT (5)
-#define  MCDI_EVENT_SENSOREVT_MONITOR_LBN 0
-#define  MCDI_EVENT_SENSOREVT_MONITOR_WIDTH 8
-#define  MCDI_EVENT_SENSOREVT_STATE_LBN 8
-#define  MCDI_EVENT_SENSOREVT_STATE_WIDTH 8
-#define  MCDI_EVENT_SENSOREVT_VALUE_LBN 16
-#define  MCDI_EVENT_SENSOREVT_VALUE_WIDTH 16
-#define MCDI_EVENT_CODE_SCHEDERR (6)
-#define MCDI_EVENT_CODE_REBOOT (7)
-#define MCDI_EVENT_CODE_MAC_STATS_DMA (8)
-#define  MCDI_EVENT_MAC_STATS_DMA_GENERATION_LBN 0
-#define  MCDI_EVENT_MAC_STATS_DMA_GENERATION_WIDTH 32
 
 /* Non-existent command target */
 #define MC_CMD_ERR_ENOENT 2
@@ -198,121 +165,24 @@
 
 #define MC_CMD_ERR_CODE_OFST 0
 
+/* We define 8 "escape" commands to allow
+   for command number space extension */
+
+#define MC_CMD_CMD_SPACE_ESCAPE_0             0x78
+#define MC_CMD_CMD_SPACE_ESCAPE_1             0x79
+#define MC_CMD_CMD_SPACE_ESCAPE_2             0x7A
+#define MC_CMD_CMD_SPACE_ESCAPE_3             0x7B
+#define MC_CMD_CMD_SPACE_ESCAPE_4             0x7C
+#define MC_CMD_CMD_SPACE_ESCAPE_5             0x7D
+#define MC_CMD_CMD_SPACE_ESCAPE_6             0x7E
+#define MC_CMD_CMD_SPACE_ESCAPE_7             0x7F
+
+/* Vectors in the boot ROM */
+/* Point to the copycode entry point. */
+#define MC_BOOTROM_COPYCODE_VEC (0x7f4)
+/* Points to the recovery mode entry point. */
+#define MC_BOOTROM_NOFLASH_VEC (0x7f8)
 
-/* MC_CMD_READ32: (debug, variadic out)
- * Read multiple 32byte words from MC memory
- */
-#define MC_CMD_READ32 0x01
-#define MC_CMD_READ32_IN_LEN 8
-#define MC_CMD_READ32_IN_ADDR_OFST 0
-#define MC_CMD_READ32_IN_NUMWORDS_OFST 4
-#define MC_CMD_READ32_OUT_LEN(_numwords) \
-        (4 * (_numwords))
-#define MC_CMD_READ32_OUT_BUFFER_OFST 0
-
-/* MC_CMD_WRITE32: (debug, variadic in)
- * Write multiple 32byte words to MC memory
- */
-#define MC_CMD_WRITE32 0x02
-#define MC_CMD_WRITE32_IN_LEN(_numwords) (((_numwords) * 4) + 4)
-#define MC_CMD_WRITE32_IN_ADDR_OFST 0
-#define MC_CMD_WRITE32_IN_BUFFER_OFST 4
-#define MC_CMD_WRITE32_OUT_LEN 0
-
-/* MC_CMD_COPYCODE: (debug)
- * Copy MC code between two locations and jump
- */
-#define MC_CMD_COPYCODE 0x03
-#define MC_CMD_COPYCODE_IN_LEN 16
-#define MC_CMD_COPYCODE_IN_SRC_ADDR_OFST 0
-#define MC_CMD_COPYCODE_IN_DEST_ADDR_OFST 4
-#define MC_CMD_COPYCODE_IN_NUMWORDS_OFST 8
-#define MC_CMD_COPYCODE_IN_JUMP_OFST 12
-/* Control should return to the caller rather than jumping */
-#define MC_CMD_COPYCODE_JUMP_NONE 1
-#define MC_CMD_COPYCODE_OUT_LEN 0
-
-/* MC_CMD_SET_FUNC: (debug)
- * Select function for function-specific commands.
- */
-#define MC_CMD_SET_FUNC 0x04
-#define MC_CMD_SET_FUNC_IN_LEN 4
-#define MC_CMD_SET_FUNC_IN_FUNC_OFST 0
-#define MC_CMD_SET_FUNC_OUT_LEN 0
-
-/* MC_CMD_GET_BOOT_STATUS:
- * Get the instruction address from which the MC booted.
- */
-#define MC_CMD_GET_BOOT_STATUS 0x05
-#define MC_CMD_GET_BOOT_STATUS_IN_LEN 0
-#define MC_CMD_GET_BOOT_STATUS_OUT_LEN 8
-#define MC_CMD_GET_BOOT_STATUS_OUT_BOOT_OFFSET_OFST 0
-#define MC_CMD_GET_BOOT_STATUS_OUT_FLAGS_OFST 4
-/* Reboot caused by watchdog */
-#define MC_CMD_GET_BOOT_STATUS_FLAGS_WATCHDOG_LBN   (0)
-#define MC_CMD_GET_BOOT_STATUS_FLAGS_WATCHDOG_WIDTH (1)
-/* MC booted from primary flash partition */
-#define MC_CMD_GET_BOOT_STATUS_FLAGS_PRIMARY_LBN    (1)
-#define MC_CMD_GET_BOOT_STATUS_FLAGS_PRIMARY_WIDTH  (1)
-/* MC booted from backup flash partition */
-#define MC_CMD_GET_BOOT_STATUS_FLAGS_BACKUP_LBN     (2)
-#define MC_CMD_GET_BOOT_STATUS_FLAGS_BACKUP_WIDTH   (1)
-
-/* MC_CMD_GET_ASSERTS: (debug, variadic out)
- * Get (and optionally clear) the current assertion status.
- *
- * Only OUT.GLOBAL_FLAGS is guaranteed to exist in the completion
- * payload. The other fields will only be present if
- * OUT.GLOBAL_FLAGS != NO_FAILS
- */
-#define MC_CMD_GET_ASSERTS 0x06
-#define MC_CMD_GET_ASSERTS_IN_LEN 4
-#define MC_CMD_GET_ASSERTS_IN_CLEAR_OFST 0
-#define MC_CMD_GET_ASSERTS_OUT_LEN 140
-/* Assertion status flag */
-#define MC_CMD_GET_ASSERTS_OUT_GLOBAL_FLAGS_OFST 0
-/*! No assertions have failed. */
-#define MC_CMD_GET_ASSERTS_FLAGS_NO_FAILS 1
-/*! A system-level assertion has failed. */
-#define MC_CMD_GET_ASSERTS_FLAGS_SYS_FAIL 2
-/*! A thread-level assertion has failed. */
-#define MC_CMD_GET_ASSERTS_FLAGS_THR_FAIL 3
-/*! The system was reset by the watchdog. */
-#define MC_CMD_GET_ASSERTS_FLAGS_WDOG_FIRED 4
-/* Failing PC value */
-#define MC_CMD_GET_ASSERTS_OUT_SAVED_PC_OFFS_OFST 4
-/* Saved GP regs */
-#define MC_CMD_GET_ASSERTS_OUT_GP_REGS_OFFS_OFST 8
-#define MC_CMD_GET_ASSERTS_OUT_GP_REGS_LEN 124
-/* Failing thread address */
-#define MC_CMD_GET_ASSERTS_OUT_THREAD_OFFS_OFST 132
-
-/* MC_CMD_LOG_CTRL:
- * Determine the output stream for various events and messages
- */
-#define MC_CMD_LOG_CTRL 0x07
-#define MC_CMD_LOG_CTRL_IN_LEN 8
-#define MC_CMD_LOG_CTRL_IN_LOG_DEST_OFST 0
-#define MC_CMD_LOG_CTRL_IN_LOG_DEST_UART (1)
-#define MC_CMD_LOG_CTRL_IN_LOG_DEST_EVQ (2)
-#define MC_CMD_LOG_CTRL_IN_LOG_DEST_EVQ_OFST 4
-#define MC_CMD_LOG_CTRL_OUT_LEN 0
-
-/* MC_CMD_GET_VERSION:
- * Get version information about the MC firmware
- */
-#define MC_CMD_GET_VERSION 0x08
-#define MC_CMD_GET_VERSION_IN_LEN 0
-#define MC_CMD_GET_VERSION_V0_OUT_LEN 4
-#define MC_CMD_GET_VERSION_V1_OUT_LEN 32
-#define MC_CMD_GET_VERSION_OUT_FIRMWARE_OFST 0
-/* Reserved version number to indicate "any" version. */
-#define MC_CMD_GET_VERSION_OUT_FIRMWARE_ANY 0xffffffff
-/* The version response of a boot ROM awaiting rescue */
-#define MC_CMD_GET_VERSION_OUT_FIRMWARE_BOOTROM 0xb0070000
-#define MC_CMD_GET_VERSION_V1_OUT_PCOL_OFST 4
-/* 128bit mask of functions supported by the current firmware */
-#define MC_CMD_GET_VERSION_V1_OUT_SUPPORTED_FUNCS_OFST 8
 /* The command set exported by the boot ROM (MCDI v0) */
 #define MC_CMD_GET_VERSION_V0_SUPPORTED_FUNCS {         \
         (1 << MC_CMD_READ32)    |                       \
@@ -320,1456 +190,2214 @@
         (1 << MC_CMD_COPYCODE)  |                       \
         (1 << MC_CMD_GET_VERSION),                      \
         0, 0, 0 }
-#define MC_CMD_GET_VERSION_OUT_VERSION_OFST 24
 
-/* Vectors in the boot ROM */
-/* Point to the copycode entry point. */
-#define MC_BOOTROM_COPYCODE_VEC (0x7f4)
-/* Points to the recovery mode entry point. */
-#define MC_BOOTROM_NOFLASH_VEC (0x7f8)
+#define MC_CMD_SENSOR_INFO_OUT_OFFSET_OFST(_x)          \
+        (MC_CMD_SENSOR_ENTRY_OFST + (_x))
+
+#define MC_CMD_DBI_WRITE_IN_ADDRESS_OFST(n)             \
+        (MC_CMD_DBI_WRITE_IN_DBIWROP_OFST +             \
+         MC_CMD_DBIWROP_TYPEDEF_ADDRESS_OFST +          \
+         (n) * MC_CMD_DBIWROP_TYPEDEF_LEN)
+
+#define MC_CMD_DBI_WRITE_IN_BYTE_MASK_OFST(n)           \
+        (MC_CMD_DBI_WRITE_IN_DBIWROP_OFST +             \
+         MC_CMD_DBIWROP_TYPEDEF_BYTE_MASK_OFST +        \
+         (n) * MC_CMD_DBIWROP_TYPEDEF_LEN)
+
+#define MC_CMD_DBI_WRITE_IN_VALUE_OFST(n)               \
+        (MC_CMD_DBI_WRITE_IN_DBIWROP_OFST +             \
+         MC_CMD_DBIWROP_TYPEDEF_VALUE_OFST +            \
+         (n) * MC_CMD_DBIWROP_TYPEDEF_LEN)
+
+
+/* MCDI_EVENT structuredef */
+#define    MCDI_EVENT_LEN 8
+#define       MCDI_EVENT_CONT_LBN 32
+#define       MCDI_EVENT_CONT_WIDTH 1
+#define       MCDI_EVENT_LEVEL_LBN 33
+#define       MCDI_EVENT_LEVEL_WIDTH 3
+#define          MCDI_EVENT_LEVEL_INFO  0x0 /* enum */
+#define          MCDI_EVENT_LEVEL_WARN 0x1 /* enum */
+#define          MCDI_EVENT_LEVEL_ERR 0x2 /* enum */
+#define          MCDI_EVENT_LEVEL_FATAL 0x3 /* enum */
+#define       MCDI_EVENT_DATA_OFST 0
+#define        MCDI_EVENT_CMDDONE_SEQ_LBN 0
+#define        MCDI_EVENT_CMDDONE_SEQ_WIDTH 8
+#define        MCDI_EVENT_CMDDONE_DATALEN_LBN 8
+#define        MCDI_EVENT_CMDDONE_DATALEN_WIDTH 8
+#define        MCDI_EVENT_CMDDONE_ERRNO_LBN 16
+#define        MCDI_EVENT_CMDDONE_ERRNO_WIDTH 8
+#define        MCDI_EVENT_LINKCHANGE_LP_CAP_LBN 0
+#define        MCDI_EVENT_LINKCHANGE_LP_CAP_WIDTH 16
+#define        MCDI_EVENT_LINKCHANGE_SPEED_LBN 16
+#define        MCDI_EVENT_LINKCHANGE_SPEED_WIDTH 4
+#define          MCDI_EVENT_LINKCHANGE_SPEED_100M  0x1 /* enum */
+#define          MCDI_EVENT_LINKCHANGE_SPEED_1G  0x2 /* enum */
+#define          MCDI_EVENT_LINKCHANGE_SPEED_10G  0x3 /* enum */
+#define        MCDI_EVENT_LINKCHANGE_FCNTL_LBN 20
+#define        MCDI_EVENT_LINKCHANGE_FCNTL_WIDTH 4
+#define        MCDI_EVENT_LINKCHANGE_LINK_FLAGS_LBN 24
+#define        MCDI_EVENT_LINKCHANGE_LINK_FLAGS_WIDTH 8
+#define        MCDI_EVENT_SENSOREVT_MONITOR_LBN 0
+#define        MCDI_EVENT_SENSOREVT_MONITOR_WIDTH 8
+#define        MCDI_EVENT_SENSOREVT_STATE_LBN 8
+#define        MCDI_EVENT_SENSOREVT_STATE_WIDTH 8
+#define        MCDI_EVENT_SENSOREVT_VALUE_LBN 16
+#define        MCDI_EVENT_SENSOREVT_VALUE_WIDTH 16
+#define        MCDI_EVENT_FWALERT_DATA_LBN 8
+#define        MCDI_EVENT_FWALERT_DATA_WIDTH 24
+#define        MCDI_EVENT_FWALERT_REASON_LBN 0
+#define        MCDI_EVENT_FWALERT_REASON_WIDTH 8
+#define          MCDI_EVENT_FWALERT_REASON_SRAM_ACCESS 0x1 /* enum */
+#define        MCDI_EVENT_FLR_VF_LBN 0
+#define        MCDI_EVENT_FLR_VF_WIDTH 8
+#define        MCDI_EVENT_TX_ERR_TXQ_LBN 0
+#define        MCDI_EVENT_TX_ERR_TXQ_WIDTH 12
+#define        MCDI_EVENT_TX_ERR_TYPE_LBN 12
+#define        MCDI_EVENT_TX_ERR_TYPE_WIDTH 4
+#define          MCDI_EVENT_TX_ERR_DL_FAIL 0x1 /* enum */
+#define          MCDI_EVENT_TX_ERR_NO_EOP 0x2 /* enum */
+#define          MCDI_EVENT_TX_ERR_2BIG 0x3 /* enum */
+#define        MCDI_EVENT_TX_ERR_INFO_LBN 16
+#define        MCDI_EVENT_TX_ERR_INFO_WIDTH 16
+#define        MCDI_EVENT_TX_FLUSH_TXQ_LBN 0
+#define        MCDI_EVENT_TX_FLUSH_TXQ_WIDTH 12
+#define        MCDI_EVENT_PTP_ERR_TYPE_LBN 0
+#define        MCDI_EVENT_PTP_ERR_TYPE_WIDTH 8
+#define          MCDI_EVENT_PTP_ERR_PLL_LOST 0x1 /* enum */
+#define          MCDI_EVENT_PTP_ERR_FILTER 0x2 /* enum */
+#define          MCDI_EVENT_PTP_ERR_FIFO 0x3 /* enum */
+#define          MCDI_EVENT_PTP_ERR_QUEUE 0x4 /* enum */
+#define       MCDI_EVENT_DATA_LBN 0
+#define       MCDI_EVENT_DATA_WIDTH 32
+#define       MCDI_EVENT_SRC_LBN 36
+#define       MCDI_EVENT_SRC_WIDTH 8
+#define       MCDI_EVENT_EV_CODE_LBN 60
+#define       MCDI_EVENT_EV_CODE_WIDTH 4
+#define       MCDI_EVENT_CODE_LBN 44
+#define       MCDI_EVENT_CODE_WIDTH 8
+#define          MCDI_EVENT_CODE_BADSSERT 0x1 /* enum */
+#define          MCDI_EVENT_CODE_PMNOTICE 0x2 /* enum */
+#define          MCDI_EVENT_CODE_CMDDONE 0x3 /* enum */
+#define          MCDI_EVENT_CODE_LINKCHANGE 0x4 /* enum */
+#define          MCDI_EVENT_CODE_SENSOREVT 0x5 /* enum */
+#define          MCDI_EVENT_CODE_SCHEDERR 0x6 /* enum */
+#define          MCDI_EVENT_CODE_REBOOT 0x7 /* enum */
+#define          MCDI_EVENT_CODE_MAC_STATS_DMA 0x8 /* enum */
+#define          MCDI_EVENT_CODE_FWALERT 0x9 /* enum */
+#define          MCDI_EVENT_CODE_FLR 0xa /* enum */
+#define          MCDI_EVENT_CODE_TX_ERR 0xb /* enum */
+#define          MCDI_EVENT_CODE_TX_FLUSH  0xc /* enum */
+#define          MCDI_EVENT_CODE_PTP_RX  0xd /* enum */
+#define          MCDI_EVENT_CODE_PTP_FAULT  0xe /* enum */
+#define       MCDI_EVENT_CMDDONE_DATA_OFST 0
+#define       MCDI_EVENT_CMDDONE_DATA_LBN 0
+#define       MCDI_EVENT_CMDDONE_DATA_WIDTH 32
+#define       MCDI_EVENT_LINKCHANGE_DATA_OFST 0
+#define       MCDI_EVENT_LINKCHANGE_DATA_LBN 0
+#define       MCDI_EVENT_LINKCHANGE_DATA_WIDTH 32
+#define       MCDI_EVENT_SENSOREVT_DATA_OFST 0
+#define       MCDI_EVENT_SENSOREVT_DATA_LBN 0
+#define       MCDI_EVENT_SENSOREVT_DATA_WIDTH 32
+#define       MCDI_EVENT_MAC_STATS_DMA_GENERATION_OFST 0
+#define       MCDI_EVENT_MAC_STATS_DMA_GENERATION_LBN 0
+#define       MCDI_EVENT_MAC_STATS_DMA_GENERATION_WIDTH 32
+#define       MCDI_EVENT_TX_ERR_DATA_OFST 0
+#define       MCDI_EVENT_TX_ERR_DATA_LBN 0
+#define       MCDI_EVENT_TX_ERR_DATA_WIDTH 32
+#define       MCDI_EVENT_PTP_SECONDS_OFST 0
+#define       MCDI_EVENT_PTP_SECONDS_LBN 0
+#define       MCDI_EVENT_PTP_SECONDS_WIDTH 32
+#define       MCDI_EVENT_PTP_NANOSECONDS_OFST 0
+#define       MCDI_EVENT_PTP_NANOSECONDS_LBN 0
+#define       MCDI_EVENT_PTP_NANOSECONDS_WIDTH 32
+#define       MCDI_EVENT_PTP_UUID_OFST 0
+#define       MCDI_EVENT_PTP_UUID_LBN 0
+#define       MCDI_EVENT_PTP_UUID_WIDTH 32
+
+
+/***********************************/
+/* MC_CMD_READ32
+ * Read multiple 32byte words from MC memory.
+ */
+#define MC_CMD_READ32 0x1
+
+/* MC_CMD_READ32_IN msgrequest */
+#define    MC_CMD_READ32_IN_LEN 8
+#define       MC_CMD_READ32_IN_ADDR_OFST 0
+#define       MC_CMD_READ32_IN_NUMWORDS_OFST 4
+
+/* MC_CMD_READ32_OUT msgresponse */
+#define    MC_CMD_READ32_OUT_LENMIN 4
+#define    MC_CMD_READ32_OUT_LENMAX 252
+#define    MC_CMD_READ32_OUT_LEN(num) (0+4*(num))
+#define       MC_CMD_READ32_OUT_BUFFER_OFST 0
+#define       MC_CMD_READ32_OUT_BUFFER_LEN 4
+#define       MC_CMD_READ32_OUT_BUFFER_MINNUM 1
+#define       MC_CMD_READ32_OUT_BUFFER_MAXNUM 63
+
+
+/***********************************/
+/* MC_CMD_WRITE32
+ * Write multiple 32byte words to MC memory.
+ */
+#define MC_CMD_WRITE32 0x2
+
+/* MC_CMD_WRITE32_IN msgrequest */
+#define    MC_CMD_WRITE32_IN_LENMIN 8
+#define    MC_CMD_WRITE32_IN_LENMAX 252
+#define    MC_CMD_WRITE32_IN_LEN(num) (4+4*(num))
+#define       MC_CMD_WRITE32_IN_ADDR_OFST 0
+#define       MC_CMD_WRITE32_IN_BUFFER_OFST 4
+#define       MC_CMD_WRITE32_IN_BUFFER_LEN 4
+#define       MC_CMD_WRITE32_IN_BUFFER_MINNUM 1
+#define       MC_CMD_WRITE32_IN_BUFFER_MAXNUM 62
+
+/* MC_CMD_WRITE32_OUT msgresponse */
+#define    MC_CMD_WRITE32_OUT_LEN 0
+
+
+/***********************************/
+/* MC_CMD_COPYCODE
+ * Copy MC code between two locations and jump.
+ */
+#define MC_CMD_COPYCODE 0x3
+
+/* MC_CMD_COPYCODE_IN msgrequest */
+#define    MC_CMD_COPYCODE_IN_LEN 16
+#define       MC_CMD_COPYCODE_IN_SRC_ADDR_OFST 0
+#define       MC_CMD_COPYCODE_IN_DEST_ADDR_OFST 4
+#define       MC_CMD_COPYCODE_IN_NUMWORDS_OFST 8
+#define       MC_CMD_COPYCODE_IN_JUMP_OFST 12
+#define          MC_CMD_COPYCODE_JUMP_NONE 0x1 /* enum */
+
+/* MC_CMD_COPYCODE_OUT msgresponse */
+#define    MC_CMD_COPYCODE_OUT_LEN 0
+
+
+/***********************************/
+/* MC_CMD_SET_FUNC
+ */
+#define MC_CMD_SET_FUNC 0x4
+
+/* MC_CMD_SET_FUNC_IN msgrequest */
+#define    MC_CMD_SET_FUNC_IN_LEN 4
+#define       MC_CMD_SET_FUNC_IN_FUNC_OFST 0
+
+/* MC_CMD_SET_FUNC_OUT msgresponse */
+#define    MC_CMD_SET_FUNC_OUT_LEN 0
+
+
+/***********************************/
+/* MC_CMD_GET_BOOT_STATUS
+ */
+#define MC_CMD_GET_BOOT_STATUS 0x5
+
+/* MC_CMD_GET_BOOT_STATUS_IN msgrequest */
+#define    MC_CMD_GET_BOOT_STATUS_IN_LEN 0
+
+/* MC_CMD_GET_BOOT_STATUS_OUT msgresponse */
+#define    MC_CMD_GET_BOOT_STATUS_OUT_LEN 8
+#define       MC_CMD_GET_BOOT_STATUS_OUT_BOOT_OFFSET_OFST 0
+#define       MC_CMD_GET_BOOT_STATUS_OUT_FLAGS_OFST 4
+#define        MC_CMD_GET_BOOT_STATUS_OUT_FLAGS_WATCHDOG_LBN 0
+#define        MC_CMD_GET_BOOT_STATUS_OUT_FLAGS_WATCHDOG_WIDTH 1
+#define        MC_CMD_GET_BOOT_STATUS_OUT_FLAGS_PRIMARY_LBN 1
+#define        MC_CMD_GET_BOOT_STATUS_OUT_FLAGS_PRIMARY_WIDTH 1
+#define        MC_CMD_GET_BOOT_STATUS_OUT_FLAGS_BACKUP_LBN 2
+#define        MC_CMD_GET_BOOT_STATUS_OUT_FLAGS_BACKUP_WIDTH 1
 
-/* Test execution limits */
-#define MC_TESTEXEC_VARIANT_COUNT 16
-#define MC_TESTEXEC_RESULT_COUNT 7
 
-/* MC_CMD_SET_TESTVARS: (debug, variadic in)
- * Write variant words for test.
- *
- * The user supplies a bitmap of the variants they wish to set.
- * They must ensure that IN.LEN >= 4 + 4 * ffs(BITMAP)
- */
-#define MC_CMD_SET_TESTVARS 0x09
-#define MC_CMD_SET_TESTVARS_IN_LEN(_numwords)   \
-  (4 + 4*(_numwords))
-#define MC_CMD_SET_TESTVARS_IN_ARGS_BITMAP_OFST 0
-/* Up to MC_TESTEXEC_VARIANT_COUNT of 32byte words start here */
-#define MC_CMD_SET_TESTVARS_IN_ARGS_BUFFER_OFST 4
-#define MC_CMD_SET_TESTVARS_OUT_LEN 0
-
-/* MC_CMD_GET_TESTRCS: (debug, variadic out)
- * Return result words from test.
- */
-#define MC_CMD_GET_TESTRCS 0x0a
-#define MC_CMD_GET_TESTRCS_IN_LEN 4
-#define MC_CMD_GET_TESTRCS_IN_NUMWORDS_OFST 0
-#define MC_CMD_GET_TESTRCS_OUT_LEN(_numwords) \
-        (4 * (_numwords))
-#define MC_CMD_GET_TESTRCS_OUT_BUFFER_OFST 0
-
-/* MC_CMD_RUN_TEST: (debug)
- * Run the test exported by this firmware image
- */
-#define MC_CMD_RUN_TEST 0x0b
-#define MC_CMD_RUN_TEST_IN_LEN 0
-#define MC_CMD_RUN_TEST_OUT_LEN 0
-
-/* MC_CMD_CSR_READ32: (debug, variadic out)
- * Read 32bit words from the indirect memory map
- */
-#define MC_CMD_CSR_READ32 0x0c
-#define MC_CMD_CSR_READ32_IN_LEN 12
-#define MC_CMD_CSR_READ32_IN_ADDR_OFST 0
-#define MC_CMD_CSR_READ32_IN_STEP_OFST 4
-#define MC_CMD_CSR_READ32_IN_NUMWORDS_OFST 8
-#define MC_CMD_CSR_READ32_OUT_LEN(_numwords)    \
-        (((_numwords) * 4) + 4)
-/* IN.NUMWORDS of 32bit words start here */
-#define MC_CMD_CSR_READ32_OUT_BUFFER_OFST 0
-#define MC_CMD_CSR_READ32_OUT_IREG_STATUS_OFST(_numwords)       \
-        ((_numwords) * 4)
-
-/* MC_CMD_CSR_WRITE32: (debug, variadic in)
- * Write 32bit dwords to the indirect memory map
- */
-#define MC_CMD_CSR_WRITE32 0x0d
-#define MC_CMD_CSR_WRITE32_IN_LEN(_numwords)    \
-        (((_numwords) * 4) + 8)
-#define MC_CMD_CSR_WRITE32_IN_ADDR_OFST 0
-#define MC_CMD_CSR_WRITE32_IN_STEP_OFST 4
-/* Multiple 32bit words of data to write start here */
-#define MC_CMD_CSR_WRITE32_IN_BUFFER_OFST 8
-#define MC_CMD_CSR_WRITE32_OUT_LEN 4
-#define MC_CMD_CSR_WRITE32_OUT_STATUS_OFST 0
-
-/* MC_CMD_JTAG_WORK: (debug, fpga only)
- * Process JTAG work buffer for RBF acceleration.
- *
- *  Host: bit count, (up to) 32 words of data to clock out to JTAG
- *   (bits 1,0=TMS,TDO for first bit; bits 3,2=TMS,TDO for second bit, etc.)
- *  MC: bit count, (up to) 32 words of data clocked in from JTAG
- *   (bit 0=TDI for first bit, bit 1=TDI for second bit, etc.; [31:16] unused)
+/***********************************/
+/* MC_CMD_GET_ASSERTS
+ * Get and clear any assertion status.
  */
-#define MC_CMD_JTAG_WORK 0x0e
+#define MC_CMD_GET_ASSERTS 0x6
 
-/* MC_CMD_STACKINFO: (debug, variadic out)
- * Get stack information
- *
- * Host: nothing
- * MC: (thread ptr, stack size, free space) for each thread in system
- */
-#define MC_CMD_STACKINFO 0x0f
+/* MC_CMD_GET_ASSERTS_IN msgrequest */
+#define    MC_CMD_GET_ASSERTS_IN_LEN 4
+#define       MC_CMD_GET_ASSERTS_IN_CLEAR_OFST 0
+
+/* MC_CMD_GET_ASSERTS_OUT msgresponse */
+#define    MC_CMD_GET_ASSERTS_OUT_LEN 140
+#define       MC_CMD_GET_ASSERTS_OUT_GLOBAL_FLAGS_OFST 0
+#define          MC_CMD_GET_ASSERTS_FLAGS_NO_FAILS 0x1 /* enum */
+#define          MC_CMD_GET_ASSERTS_FLAGS_SYS_FAIL 0x2 /* enum */
+#define          MC_CMD_GET_ASSERTS_FLAGS_THR_FAIL 0x3 /* enum */
+#define          MC_CMD_GET_ASSERTS_FLAGS_WDOG_FIRED 0x4 /* enum */
+#define       MC_CMD_GET_ASSERTS_OUT_SAVED_PC_OFFS_OFST 4
+#define       MC_CMD_GET_ASSERTS_OUT_GP_REGS_OFFS_OFST 8
+#define       MC_CMD_GET_ASSERTS_OUT_GP_REGS_OFFS_LEN 4
+#define       MC_CMD_GET_ASSERTS_OUT_GP_REGS_OFFS_NUM 31
+#define       MC_CMD_GET_ASSERTS_OUT_THREAD_OFFS_OFST 132
+#define       MC_CMD_GET_ASSERTS_OUT_RESERVED_OFST 136
 
-/* MC_CMD_MDIO_READ:
- * MDIO register read
+
+/***********************************/
+/* MC_CMD_LOG_CTRL
+ * Configure the output stream for various events and messages.
+ */
+#define MC_CMD_LOG_CTRL 0x7
+
+/* MC_CMD_LOG_CTRL_IN msgrequest */
+#define    MC_CMD_LOG_CTRL_IN_LEN 8
+#define       MC_CMD_LOG_CTRL_IN_LOG_DEST_OFST 0
+#define          MC_CMD_LOG_CTRL_IN_LOG_DEST_UART 0x1 /* enum */
+#define          MC_CMD_LOG_CTRL_IN_LOG_DEST_EVQ 0x2 /* enum */
+#define       MC_CMD_LOG_CTRL_IN_LOG_DEST_EVQ_OFST 4
+
+/* MC_CMD_LOG_CTRL_OUT msgresponse */
+#define    MC_CMD_LOG_CTRL_OUT_LEN 0
+
+
+/***********************************/
+/* MC_CMD_GET_VERSION
+ * Get version information about the MC firmware.
+ */
+#define MC_CMD_GET_VERSION 0x8
+
+/* MC_CMD_GET_VERSION_IN msgrequest */
+#define    MC_CMD_GET_VERSION_IN_LEN 0
+
+/* MC_CMD_GET_VERSION_V0_OUT msgresponse */
+#define    MC_CMD_GET_VERSION_V0_OUT_LEN 4
+#define       MC_CMD_GET_VERSION_OUT_FIRMWARE_OFST 0
+#define          MC_CMD_GET_VERSION_OUT_FIRMWARE_ANY 0xffffffff /* enum */
+#define          MC_CMD_GET_VERSION_OUT_FIRMWARE_BOOTROM 0xb0070000 /* enum */
+
+/* MC_CMD_GET_VERSION_OUT msgresponse */
+#define    MC_CMD_GET_VERSION_OUT_LEN 32
+/*            MC_CMD_GET_VERSION_OUT_FIRMWARE_OFST 0 */
+/*            Enum values, see field(s): */
+/*               MC_CMD_GET_VERSION_V0_OUT/MC_CMD_GET_VERSION_OUT_FIRMWARE */
+#define       MC_CMD_GET_VERSION_OUT_PCOL_OFST 4
+#define       MC_CMD_GET_VERSION_OUT_SUPPORTED_FUNCS_OFST 8
+#define       MC_CMD_GET_VERSION_OUT_SUPPORTED_FUNCS_LEN 16
+#define       MC_CMD_GET_VERSION_OUT_VERSION_OFST 24
+#define       MC_CMD_GET_VERSION_OUT_VERSION_LEN 8
+#define       MC_CMD_GET_VERSION_OUT_VERSION_LO_OFST 24
+#define       MC_CMD_GET_VERSION_OUT_VERSION_HI_OFST 28
+
+
+/***********************************/
+/* MC_CMD_GET_FPGAREG
+ * Read multiple bytes from PTP FPGA.
+ */
+#define MC_CMD_GET_FPGAREG 0x9
+
+/* MC_CMD_GET_FPGAREG_IN msgrequest */
+#define    MC_CMD_GET_FPGAREG_IN_LEN 8
+#define       MC_CMD_GET_FPGAREG_IN_ADDR_OFST 0
+#define       MC_CMD_GET_FPGAREG_IN_NUMBYTES_OFST 4
+
+/* MC_CMD_GET_FPGAREG_OUT msgresponse */
+#define    MC_CMD_GET_FPGAREG_OUT_LENMIN 1
+#define    MC_CMD_GET_FPGAREG_OUT_LENMAX 255
+#define    MC_CMD_GET_FPGAREG_OUT_LEN(num) (0+1*(num))
+#define       MC_CMD_GET_FPGAREG_OUT_BUFFER_OFST 0
+#define       MC_CMD_GET_FPGAREG_OUT_BUFFER_LEN 1
+#define       MC_CMD_GET_FPGAREG_OUT_BUFFER_MINNUM 1
+#define       MC_CMD_GET_FPGAREG_OUT_BUFFER_MAXNUM 255
+
+
+/***********************************/
+/* MC_CMD_PUT_FPGAREG
+ * Write multiple bytes to PTP FPGA.
+ */
+#define MC_CMD_PUT_FPGAREG 0xa
+
+/* MC_CMD_PUT_FPGAREG_IN msgrequest */
+#define    MC_CMD_PUT_FPGAREG_IN_LENMIN 5
+#define    MC_CMD_PUT_FPGAREG_IN_LENMAX 255
+#define    MC_CMD_PUT_FPGAREG_IN_LEN(num) (4+1*(num))
+#define       MC_CMD_PUT_FPGAREG_IN_ADDR_OFST 0
+#define       MC_CMD_PUT_FPGAREG_IN_BUFFER_OFST 4
+#define       MC_CMD_PUT_FPGAREG_IN_BUFFER_LEN 1
+#define       MC_CMD_PUT_FPGAREG_IN_BUFFER_MINNUM 1
+#define       MC_CMD_PUT_FPGAREG_IN_BUFFER_MAXNUM 251
+
+/* MC_CMD_PUT_FPGAREG_OUT msgresponse */
+#define    MC_CMD_PUT_FPGAREG_OUT_LEN 0
+
+
+/***********************************/
+/* MC_CMD_PTP
+ * Perform PTP operation
+ */
+#define MC_CMD_PTP 0xb
+
+/* MC_CMD_PTP_IN msgrequest */
+#define    MC_CMD_PTP_IN_LEN 1
+#define       MC_CMD_PTP_IN_OP_OFST 0
+#define       MC_CMD_PTP_IN_OP_LEN 1
+#define          MC_CMD_PTP_OP_ENABLE 0x1 /* enum */
+#define          MC_CMD_PTP_OP_DISABLE 0x2 /* enum */
+#define          MC_CMD_PTP_OP_TRANSMIT 0x3 /* enum */
+#define          MC_CMD_PTP_OP_READ_NIC_TIME 0x4 /* enum */
+#define          MC_CMD_PTP_OP_STATUS 0x5 /* enum */
+#define          MC_CMD_PTP_OP_ADJUST 0x6 /* enum */
+#define          MC_CMD_PTP_OP_SYNCHRONIZE 0x7 /* enum */
+#define          MC_CMD_PTP_OP_MANFTEST_BASIC 0x8 /* enum */
+#define          MC_CMD_PTP_OP_MANFTEST_PACKET 0x9 /* enum */
+#define          MC_CMD_PTP_OP_RESET_STATS 0xa /* enum */
+#define          MC_CMD_PTP_OP_DEBUG 0xb /* enum */
+#define          MC_CMD_PTP_OP_MAX 0xc /* enum */
+
+/* MC_CMD_PTP_IN_ENABLE msgrequest */
+#define    MC_CMD_PTP_IN_ENABLE_LEN 16
+#define       MC_CMD_PTP_IN_CMD_OFST 0
+#define       MC_CMD_PTP_IN_PERIPH_ID_OFST 4
+#define       MC_CMD_PTP_IN_ENABLE_QUEUE_OFST 8
+#define       MC_CMD_PTP_IN_ENABLE_MODE_OFST 12
+#define          MC_CMD_PTP_MODE_V1 0x0 /* enum */
+#define          MC_CMD_PTP_MODE_V1_VLAN 0x1 /* enum */
+#define          MC_CMD_PTP_MODE_V2 0x2 /* enum */
+#define          MC_CMD_PTP_MODE_V2_VLAN 0x3 /* enum */
+
+/* MC_CMD_PTP_IN_DISABLE msgrequest */
+#define    MC_CMD_PTP_IN_DISABLE_LEN 8
+/*            MC_CMD_PTP_IN_CMD_OFST 0 */
+/*            MC_CMD_PTP_IN_PERIPH_ID_OFST 4 */
+
+/* MC_CMD_PTP_IN_TRANSMIT msgrequest */
+#define    MC_CMD_PTP_IN_TRANSMIT_LENMIN 13
+#define    MC_CMD_PTP_IN_TRANSMIT_LENMAX 255
+#define    MC_CMD_PTP_IN_TRANSMIT_LEN(num) (12+1*(num))
+/*            MC_CMD_PTP_IN_CMD_OFST 0 */
+/*            MC_CMD_PTP_IN_PERIPH_ID_OFST 4 */
+#define       MC_CMD_PTP_IN_TRANSMIT_LENGTH_OFST 8
+#define       MC_CMD_PTP_IN_TRANSMIT_PACKET_OFST 12
+#define       MC_CMD_PTP_IN_TRANSMIT_PACKET_LEN 1
+#define       MC_CMD_PTP_IN_TRANSMIT_PACKET_MINNUM 1
+#define       MC_CMD_PTP_IN_TRANSMIT_PACKET_MAXNUM 243
+
+/* MC_CMD_PTP_IN_READ_NIC_TIME msgrequest */
+#define    MC_CMD_PTP_IN_READ_NIC_TIME_LEN 8
+/*            MC_CMD_PTP_IN_CMD_OFST 0 */
+/*            MC_CMD_PTP_IN_PERIPH_ID_OFST 4 */
+
+/* MC_CMD_PTP_IN_STATUS msgrequest */
+#define    MC_CMD_PTP_IN_STATUS_LEN 8
+/*            MC_CMD_PTP_IN_CMD_OFST 0 */
+/*            MC_CMD_PTP_IN_PERIPH_ID_OFST 4 */
+
+/* MC_CMD_PTP_IN_ADJUST msgrequest */
+#define    MC_CMD_PTP_IN_ADJUST_LEN 24
+/*            MC_CMD_PTP_IN_CMD_OFST 0 */
+/*            MC_CMD_PTP_IN_PERIPH_ID_OFST 4 */
+#define       MC_CMD_PTP_IN_ADJUST_FREQ_OFST 8
+#define       MC_CMD_PTP_IN_ADJUST_FREQ_LEN 8
+#define       MC_CMD_PTP_IN_ADJUST_FREQ_LO_OFST 8
+#define       MC_CMD_PTP_IN_ADJUST_FREQ_HI_OFST 12
+#define          MC_CMD_PTP_IN_ADJUST_BITS 0x28 /* enum */
+#define       MC_CMD_PTP_IN_ADJUST_SECONDS_OFST 16
+#define       MC_CMD_PTP_IN_ADJUST_NANOSECONDS_OFST 20
+
+/* MC_CMD_PTP_IN_SYNCHRONIZE msgrequest */
+#define    MC_CMD_PTP_IN_SYNCHRONIZE_LEN 20
+/*            MC_CMD_PTP_IN_CMD_OFST 0 */
+/*            MC_CMD_PTP_IN_PERIPH_ID_OFST 4 */
+#define       MC_CMD_PTP_IN_SYNCHRONIZE_NUMTIMESETS_OFST 8
+#define       MC_CMD_PTP_IN_SYNCHRONIZE_START_ADDR_OFST 12
+#define       MC_CMD_PTP_IN_SYNCHRONIZE_START_ADDR_LEN 8
+#define       MC_CMD_PTP_IN_SYNCHRONIZE_START_ADDR_LO_OFST 12
+#define       MC_CMD_PTP_IN_SYNCHRONIZE_START_ADDR_HI_OFST 16
+
+/* MC_CMD_PTP_IN_MANFTEST_BASIC msgrequest */
+#define    MC_CMD_PTP_IN_MANFTEST_BASIC_LEN 8
+/*            MC_CMD_PTP_IN_CMD_OFST 0 */
+/*            MC_CMD_PTP_IN_PERIPH_ID_OFST 4 */
+
+/* MC_CMD_PTP_IN_MANFTEST_PACKET msgrequest */
+#define    MC_CMD_PTP_IN_MANFTEST_PACKET_LEN 12
+/*            MC_CMD_PTP_IN_CMD_OFST 0 */
+/*            MC_CMD_PTP_IN_PERIPH_ID_OFST 4 */
+#define       MC_CMD_PTP_IN_MANFTEST_PACKET_TEST_ENABLE_OFST 8
+
+/* MC_CMD_PTP_IN_RESET_STATS msgrequest */
+#define    MC_CMD_PTP_IN_RESET_STATS_LEN 8
+/*            MC_CMD_PTP_IN_CMD_OFST 0 */
+/*            MC_CMD_PTP_IN_PERIPH_ID_OFST 4 */
+
+/* MC_CMD_PTP_IN_DEBUG msgrequest */
+#define    MC_CMD_PTP_IN_DEBUG_LEN 12
+/*            MC_CMD_PTP_IN_CMD_OFST 0 */
+/*            MC_CMD_PTP_IN_PERIPH_ID_OFST 4 */
+#define       MC_CMD_PTP_IN_DEBUG_DEBUG_PARAM_OFST 8
+
+/* MC_CMD_PTP_OUT msgresponse */
+#define    MC_CMD_PTP_OUT_LEN 0
+
+/* MC_CMD_PTP_OUT_TRANSMIT msgresponse */
+#define    MC_CMD_PTP_OUT_TRANSMIT_LEN 8
+#define       MC_CMD_PTP_OUT_TRANSMIT_SECONDS_OFST 0
+#define       MC_CMD_PTP_OUT_TRANSMIT_NANOSECONDS_OFST 4
+
+/* MC_CMD_PTP_OUT_READ_NIC_TIME msgresponse */
+#define    MC_CMD_PTP_OUT_READ_NIC_TIME_LEN 8
+#define       MC_CMD_PTP_OUT_READ_NIC_TIME_SECONDS_OFST 0
+#define       MC_CMD_PTP_OUT_READ_NIC_TIME_NANOSECONDS_OFST 4
+
+/* MC_CMD_PTP_OUT_STATUS msgresponse */
+#define    MC_CMD_PTP_OUT_STATUS_LEN 64
+#define       MC_CMD_PTP_OUT_STATUS_CLOCK_FREQ_OFST 0
+#define       MC_CMD_PTP_OUT_STATUS_STATS_TX_OFST 4
+#define       MC_CMD_PTP_OUT_STATUS_STATS_RX_OFST 8
+#define       MC_CMD_PTP_OUT_STATUS_STATS_TS_OFST 12
+#define       MC_CMD_PTP_OUT_STATUS_STATS_FM_OFST 16
+#define       MC_CMD_PTP_OUT_STATUS_STATS_NFM_OFST 20
+#define       MC_CMD_PTP_OUT_STATUS_STATS_PPS_OFLOW_OFST 24
+#define       MC_CMD_PTP_OUT_STATUS_STATS_PPS_BAD_OFST 28
+#define       MC_CMD_PTP_OUT_STATUS_STATS_PPS_PER_MIN_OFST 32
+#define       MC_CMD_PTP_OUT_STATUS_STATS_PPS_PER_MAX_OFST 36
+#define       MC_CMD_PTP_OUT_STATUS_STATS_PPS_PER_LAST_OFST 40
+#define       MC_CMD_PTP_OUT_STATUS_STATS_PPS_PER_MEAN_OFST 44
+#define       MC_CMD_PTP_OUT_STATUS_STATS_PPS_OFF_MIN_OFST 48
+#define       MC_CMD_PTP_OUT_STATUS_STATS_PPS_OFF_MAX_OFST 52
+#define       MC_CMD_PTP_OUT_STATUS_STATS_PPS_OFF_LAST_OFST 56
+#define       MC_CMD_PTP_OUT_STATUS_STATS_PPS_OFF_MEAN_OFST 60
+
+/* MC_CMD_PTP_OUT_SYNCHRONIZE msgresponse */
+#define    MC_CMD_PTP_OUT_SYNCHRONIZE_LENMIN 20
+#define    MC_CMD_PTP_OUT_SYNCHRONIZE_LENMAX 240
+#define    MC_CMD_PTP_OUT_SYNCHRONIZE_LEN(num) (0+20*(num))
+#define       MC_CMD_PTP_OUT_SYNCHRONIZE_TIMESET_OFST 0
+#define       MC_CMD_PTP_OUT_SYNCHRONIZE_TIMESET_LEN 20
+#define       MC_CMD_PTP_OUT_SYNCHRONIZE_TIMESET_MINNUM 1
+#define       MC_CMD_PTP_OUT_SYNCHRONIZE_TIMESET_MAXNUM 12
+#define       MC_CMD_PTP_OUT_SYNCHRONIZE_HOSTSTART_OFST 0
+#define       MC_CMD_PTP_OUT_SYNCHRONIZE_SECONDS_OFST 4
+#define       MC_CMD_PTP_OUT_SYNCHRONIZE_NANOSECONDS_OFST 8
+#define       MC_CMD_PTP_OUT_SYNCHRONIZE_HOSTEND_OFST 12
+#define       MC_CMD_PTP_OUT_SYNCHRONIZE_WAITNS_OFST 16
+
+/* MC_CMD_PTP_OUT_MANFTEST_BASIC msgresponse */
+#define    MC_CMD_PTP_OUT_MANFTEST_BASIC_LEN 8
+#define       MC_CMD_PTP_OUT_MANFTEST_BASIC_TEST_RESULT_OFST 0
+#define          MC_CMD_PTP_MANF_SUCCESS 0x0 /* enum */
+#define          MC_CMD_PTP_MANF_FPGA_LOAD 0x1 /* enum */
+#define          MC_CMD_PTP_MANF_FPGA_VERSION 0x2 /* enum */
+#define          MC_CMD_PTP_MANF_FPGA_REGISTERS 0x3 /* enum */
+#define          MC_CMD_PTP_MANF_OSCILLATOR 0x4 /* enum */
+#define          MC_CMD_PTP_MANF_TIMESTAMPS 0x5 /* enum */
+#define          MC_CMD_PTP_MANF_PACKET_COUNT 0x6 /* enum */
+#define          MC_CMD_PTP_MANF_FILTER_COUNT 0x7 /* enum */
+#define          MC_CMD_PTP_MANF_PACKET_ENOUGH 0x8 /* enum */
+#define          MC_CMD_PTP_MANF_GPIO_TRIGGER 0x9 /* enum */
+#define       MC_CMD_PTP_OUT_MANFTEST_BASIC_TEST_EXTOSC_OFST 4
+
+/* MC_CMD_PTP_OUT_MANFTEST_PACKET msgresponse */
+#define    MC_CMD_PTP_OUT_MANFTEST_PACKET_LEN 12
+#define       MC_CMD_PTP_OUT_MANFTEST_PACKET_TEST_RESULT_OFST 0
+#define       MC_CMD_PTP_OUT_MANFTEST_PACKET_TEST_FPGACOUNT_OFST 4
+#define       MC_CMD_PTP_OUT_MANFTEST_PACKET_TEST_FILTERCOUNT_OFST 8
+
+
+/***********************************/
+/* MC_CMD_CSR_READ32
+ * Read 32bit words from the indirect memory map.
+ */
+#define MC_CMD_CSR_READ32 0xc
+
+/* MC_CMD_CSR_READ32_IN msgrequest */
+#define    MC_CMD_CSR_READ32_IN_LEN 12
+#define       MC_CMD_CSR_READ32_IN_ADDR_OFST 0
+#define       MC_CMD_CSR_READ32_IN_STEP_OFST 4
+#define       MC_CMD_CSR_READ32_IN_NUMWORDS_OFST 8
+
+/* MC_CMD_CSR_READ32_OUT msgresponse */
+#define    MC_CMD_CSR_READ32_OUT_LENMIN 4
+#define    MC_CMD_CSR_READ32_OUT_LENMAX 252
+#define    MC_CMD_CSR_READ32_OUT_LEN(num) (0+4*(num))
+#define       MC_CMD_CSR_READ32_OUT_BUFFER_OFST 0
+#define       MC_CMD_CSR_READ32_OUT_BUFFER_LEN 4
+#define       MC_CMD_CSR_READ32_OUT_BUFFER_MINNUM 1
+#define       MC_CMD_CSR_READ32_OUT_BUFFER_MAXNUM 63
+
+
+/***********************************/
+/* MC_CMD_CSR_WRITE32
+ * Write 32bit dwords to the indirect memory map.
+ */
+#define MC_CMD_CSR_WRITE32 0xd
+
+/* MC_CMD_CSR_WRITE32_IN msgrequest */
+#define    MC_CMD_CSR_WRITE32_IN_LENMIN 12
+#define    MC_CMD_CSR_WRITE32_IN_LENMAX 252
+#define    MC_CMD_CSR_WRITE32_IN_LEN(num) (8+4*(num))
+#define       MC_CMD_CSR_WRITE32_IN_ADDR_OFST 0
+#define       MC_CMD_CSR_WRITE32_IN_STEP_OFST 4
+#define       MC_CMD_CSR_WRITE32_IN_BUFFER_OFST 8
+#define       MC_CMD_CSR_WRITE32_IN_BUFFER_LEN 4
+#define       MC_CMD_CSR_WRITE32_IN_BUFFER_MINNUM 1
+#define       MC_CMD_CSR_WRITE32_IN_BUFFER_MAXNUM 61
+
+/* MC_CMD_CSR_WRITE32_OUT msgresponse */
+#define    MC_CMD_CSR_WRITE32_OUT_LEN 4
+#define       MC_CMD_CSR_WRITE32_OUT_STATUS_OFST 0
+
+
+/***********************************/
+/* MC_CMD_STACKINFO
+ * Get stack information.
+ */
+#define MC_CMD_STACKINFO 0xf
+
+/* MC_CMD_STACKINFO_IN msgrequest */
+#define    MC_CMD_STACKINFO_IN_LEN 0
+
+/* MC_CMD_STACKINFO_OUT msgresponse */
+#define    MC_CMD_STACKINFO_OUT_LENMIN 12
+#define    MC_CMD_STACKINFO_OUT_LENMAX 252
+#define    MC_CMD_STACKINFO_OUT_LEN(num) (0+12*(num))
+#define       MC_CMD_STACKINFO_OUT_THREAD_INFO_OFST 0
+#define       MC_CMD_STACKINFO_OUT_THREAD_INFO_LEN 12
+#define       MC_CMD_STACKINFO_OUT_THREAD_INFO_MINNUM 1
+#define       MC_CMD_STACKINFO_OUT_THREAD_INFO_MAXNUM 21
+
+
+/***********************************/
+/* MC_CMD_MDIO_READ
+ * MDIO register read.
  */
 #define MC_CMD_MDIO_READ 0x10
-#define MC_CMD_MDIO_READ_IN_LEN 16
-#define MC_CMD_MDIO_READ_IN_BUS_OFST 0
-#define MC_CMD_MDIO_READ_IN_PRTAD_OFST 4
-#define MC_CMD_MDIO_READ_IN_DEVAD_OFST 8
-#define MC_CMD_MDIO_READ_IN_ADDR_OFST 12
-#define MC_CMD_MDIO_READ_OUT_LEN 8
-#define MC_CMD_MDIO_READ_OUT_VALUE_OFST 0
-#define MC_CMD_MDIO_READ_OUT_STATUS_OFST 4
-
-/* MC_CMD_MDIO_WRITE:
- * MDIO register write
- */
-#define MC_CMD_MDIO_WRITE 0x11
-#define MC_CMD_MDIO_WRITE_IN_LEN 20
-#define MC_CMD_MDIO_WRITE_IN_BUS_OFST 0
-#define MC_CMD_MDIO_WRITE_IN_PRTAD_OFST 4
-#define MC_CMD_MDIO_WRITE_IN_DEVAD_OFST 8
-#define MC_CMD_MDIO_WRITE_IN_ADDR_OFST 12
-#define MC_CMD_MDIO_WRITE_IN_VALUE_OFST 16
-#define MC_CMD_MDIO_WRITE_OUT_LEN 4
-#define MC_CMD_MDIO_WRITE_OUT_STATUS_OFST 0
 
-/* By default all the MCDI MDIO operations perform clause45 mode.
- * If you want to use clause22 then set DEVAD = MC_CMD_MDIO_CLAUSE22.
- */
-#define MC_CMD_MDIO_CLAUSE22 32
+/* MC_CMD_MDIO_READ_IN msgrequest */
+#define    MC_CMD_MDIO_READ_IN_LEN 16
+#define       MC_CMD_MDIO_READ_IN_BUS_OFST 0
+#define          MC_CMD_MDIO_BUS_INTERNAL 0x0 /* enum */
+#define          MC_CMD_MDIO_BUS_EXTERNAL 0x1 /* enum */
+#define       MC_CMD_MDIO_READ_IN_PRTAD_OFST 4
+#define       MC_CMD_MDIO_READ_IN_DEVAD_OFST 8
+#define          MC_CMD_MDIO_CLAUSE22 0x20 /* enum */
+#define       MC_CMD_MDIO_READ_IN_ADDR_OFST 12
 
-/* There are two MDIO buses: one for the internal PHY, and one for external
- * devices.
- */
-#define MC_CMD_MDIO_BUS_INTERNAL 0
-#define MC_CMD_MDIO_BUS_EXTERNAL 1
+/* MC_CMD_MDIO_READ_OUT msgresponse */
+#define    MC_CMD_MDIO_READ_OUT_LEN 8
+#define       MC_CMD_MDIO_READ_OUT_VALUE_OFST 0
+#define       MC_CMD_MDIO_READ_OUT_STATUS_OFST 4
+#define          MC_CMD_MDIO_STATUS_GOOD 0x8 /* enum */
 
-/* The MDIO commands return the raw status bits from the MDIO block.  A "good"
- * transaction should have the DONE bit set and all other bits clear.
+
+/***********************************/
+/* MC_CMD_MDIO_WRITE
+ * MDIO register write.
  */
-#define MC_CMD_MDIO_STATUS_GOOD 0x08
+#define MC_CMD_MDIO_WRITE 0x11
 
+/* MC_CMD_MDIO_WRITE_IN msgrequest */
+#define    MC_CMD_MDIO_WRITE_IN_LEN 20
+#define       MC_CMD_MDIO_WRITE_IN_BUS_OFST 0
+/*               MC_CMD_MDIO_BUS_INTERNAL 0x0 */
+/*               MC_CMD_MDIO_BUS_EXTERNAL 0x1 */
+#define       MC_CMD_MDIO_WRITE_IN_PRTAD_OFST 4
+#define       MC_CMD_MDIO_WRITE_IN_DEVAD_OFST 8
+/*               MC_CMD_MDIO_CLAUSE22 0x20 */
+#define       MC_CMD_MDIO_WRITE_IN_ADDR_OFST 12
+#define       MC_CMD_MDIO_WRITE_IN_VALUE_OFST 16
 
-/* MC_CMD_DBI_WRITE: (debug)
- * Write DBI register(s)
- *
- * Host: address, byte-enables (and VF selection, and cs2 flag),
- *       value [,address ...]
- * MC: nothing
+/* MC_CMD_MDIO_WRITE_OUT msgresponse */
+#define    MC_CMD_MDIO_WRITE_OUT_LEN 4
+#define       MC_CMD_MDIO_WRITE_OUT_STATUS_OFST 0
+/*               MC_CMD_MDIO_STATUS_GOOD 0x8 */
+
+
+/***********************************/
+/* MC_CMD_DBI_WRITE
+ * Write DBI register(s).
  */
 #define MC_CMD_DBI_WRITE 0x12
-#define MC_CMD_DBI_WRITE_IN_LEN(_numwords)              \
-        (12 * (_numwords))
-#define MC_CMD_DBI_WRITE_IN_ADDRESS_OFST(_word)         \
-        (((_word) * 12) + 0)
-#define MC_CMD_DBI_WRITE_IN_BYTE_MASK_OFST(_word)       \
-        (((_word) * 12) + 4)
-#define MC_CMD_DBI_WRITE_IN_VALUE_OFST(_word)           \
-        (((_word) * 12) + 8)
-#define MC_CMD_DBI_WRITE_OUT_LEN 0
-
-/* MC_CMD_DBI_READ: (debug)
- * Read DBI register(s)
- *
- * Host: address, [,address ...]
- * MC: value [,value ...]
- * (note: this does not support reading from VFs, but is retained for backwards
- * compatibility; see MC_CMD_DBI_READX below)
- */
-#define MC_CMD_DBI_READ 0x13
-#define MC_CMD_DBI_READ_IN_LEN(_numwords)               \
-        (4 * (_numwords))
-#define MC_CMD_DBI_READ_OUT_LEN(_numwords)              \
-        (4 * (_numwords))
-
-/* MC_CMD_PORT_READ32: (debug)
+
+/* MC_CMD_DBI_WRITE_IN msgrequest */
+#define    MC_CMD_DBI_WRITE_IN_LENMIN 12
+#define    MC_CMD_DBI_WRITE_IN_LENMAX 252
+#define    MC_CMD_DBI_WRITE_IN_LEN(num) (0+12*(num))
+#define       MC_CMD_DBI_WRITE_IN_DBIWROP_OFST 0
+#define       MC_CMD_DBI_WRITE_IN_DBIWROP_LEN 12
+#define       MC_CMD_DBI_WRITE_IN_DBIWROP_MINNUM 1
+#define       MC_CMD_DBI_WRITE_IN_DBIWROP_MAXNUM 21
+
+/* MC_CMD_DBI_WRITE_OUT msgresponse */
+#define    MC_CMD_DBI_WRITE_OUT_LEN 0
+
+/* MC_CMD_DBIWROP_TYPEDEF structuredef */
+#define    MC_CMD_DBIWROP_TYPEDEF_LEN 12
+#define       MC_CMD_DBIWROP_TYPEDEF_ADDRESS_OFST 0
+#define       MC_CMD_DBIWROP_TYPEDEF_ADDRESS_LBN 0
+#define       MC_CMD_DBIWROP_TYPEDEF_ADDRESS_WIDTH 32
+#define       MC_CMD_DBIWROP_TYPEDEF_BYTE_MASK_OFST 4
+#define       MC_CMD_DBIWROP_TYPEDEF_BYTE_MASK_LBN 32
+#define       MC_CMD_DBIWROP_TYPEDEF_BYTE_MASK_WIDTH 32
+#define       MC_CMD_DBIWROP_TYPEDEF_VALUE_OFST 8
+#define       MC_CMD_DBIWROP_TYPEDEF_VALUE_LBN 64
+#define       MC_CMD_DBIWROP_TYPEDEF_VALUE_WIDTH 32
+
+
+/***********************************/
+/* MC_CMD_PORT_READ32
  * Read a 32-bit register from the indirect port register map.
- *
- * The port to access is implied by the Shared memory channel used.
  */
 #define MC_CMD_PORT_READ32 0x14
-#define MC_CMD_PORT_READ32_IN_LEN 4
-#define MC_CMD_PORT_READ32_IN_ADDR_OFST 0
-#define MC_CMD_PORT_READ32_OUT_LEN 8
-#define MC_CMD_PORT_READ32_OUT_VALUE_OFST 0
-#define MC_CMD_PORT_READ32_OUT_STATUS_OFST 4
 
-/* MC_CMD_PORT_WRITE32: (debug)
+/* MC_CMD_PORT_READ32_IN msgrequest */
+#define    MC_CMD_PORT_READ32_IN_LEN 4
+#define       MC_CMD_PORT_READ32_IN_ADDR_OFST 0
+
+/* MC_CMD_PORT_READ32_OUT msgresponse */
+#define    MC_CMD_PORT_READ32_OUT_LEN 8
+#define       MC_CMD_PORT_READ32_OUT_VALUE_OFST 0
+#define       MC_CMD_PORT_READ32_OUT_STATUS_OFST 4
+
+
+/***********************************/
+/* MC_CMD_PORT_WRITE32
  * Write a 32-bit register to the indirect port register map.
- *
- * The port to access is implied by the Shared memory channel used.
  */
 #define MC_CMD_PORT_WRITE32 0x15
-#define MC_CMD_PORT_WRITE32_IN_LEN 8
-#define MC_CMD_PORT_WRITE32_IN_ADDR_OFST 0
-#define MC_CMD_PORT_WRITE32_IN_VALUE_OFST 4
-#define MC_CMD_PORT_WRITE32_OUT_LEN 4
-#define MC_CMD_PORT_WRITE32_OUT_STATUS_OFST 0
-
-/* MC_CMD_PORT_READ128: (debug)
- * Read a 128-bit register from indirect port register map
- *
- * The port to access is implied by the Shared memory channel used.
+
+/* MC_CMD_PORT_WRITE32_IN msgrequest */
+#define    MC_CMD_PORT_WRITE32_IN_LEN 8
+#define       MC_CMD_PORT_WRITE32_IN_ADDR_OFST 0
+#define       MC_CMD_PORT_WRITE32_IN_VALUE_OFST 4
+
+/* MC_CMD_PORT_WRITE32_OUT msgresponse */
+#define    MC_CMD_PORT_WRITE32_OUT_LEN 4
+#define       MC_CMD_PORT_WRITE32_OUT_STATUS_OFST 0
+
+
+/***********************************/
+/* MC_CMD_PORT_READ128
+ * Read a 128-bit register from the indirect port register map.
  */
 #define MC_CMD_PORT_READ128 0x16
-#define MC_CMD_PORT_READ128_IN_LEN 4
-#define MC_CMD_PORT_READ128_IN_ADDR_OFST 0
-#define MC_CMD_PORT_READ128_OUT_LEN 20
-#define MC_CMD_PORT_READ128_OUT_VALUE_OFST 0
-#define MC_CMD_PORT_READ128_OUT_STATUS_OFST 16
-
-/* MC_CMD_PORT_WRITE128: (debug)
- * Write a 128-bit register to indirect port register map.
- *
- * The port to access is implied by the Shared memory channel used.
+
+/* MC_CMD_PORT_READ128_IN msgrequest */
+#define    MC_CMD_PORT_READ128_IN_LEN 4
+#define       MC_CMD_PORT_READ128_IN_ADDR_OFST 0
+
+/* MC_CMD_PORT_READ128_OUT msgresponse */
+#define    MC_CMD_PORT_READ128_OUT_LEN 20
+#define       MC_CMD_PORT_READ128_OUT_VALUE_OFST 0
+#define       MC_CMD_PORT_READ128_OUT_VALUE_LEN 16
+#define       MC_CMD_PORT_READ128_OUT_STATUS_OFST 16
+
+
+/***********************************/
+/* MC_CMD_PORT_WRITE128
+ * Write a 128-bit register to the indirect port register map.
  */
 #define MC_CMD_PORT_WRITE128 0x17
-#define MC_CMD_PORT_WRITE128_IN_LEN 20
-#define MC_CMD_PORT_WRITE128_IN_ADDR_OFST 0
-#define MC_CMD_PORT_WRITE128_IN_VALUE_OFST 4
-#define MC_CMD_PORT_WRITE128_OUT_LEN 4
-#define MC_CMD_PORT_WRITE128_OUT_STATUS_OFST 0
-
-/* MC_CMD_GET_BOARD_CFG:
- * Returns the MC firmware configuration structure
- *
- * The FW_SUBTYPE_LIST contains a 16-bit value for each of the 12 types of
- * NVRAM area.  The values are defined in the firmware/mc/platform/<xxx>.c file
- * for a specific board type, but otherwise have no meaning to the MC; they
- * are used by the driver to manage selection of appropriate firmware updates.
+
+/* MC_CMD_PORT_WRITE128_IN msgrequest */
+#define    MC_CMD_PORT_WRITE128_IN_LEN 20
+#define       MC_CMD_PORT_WRITE128_IN_ADDR_OFST 0
+#define       MC_CMD_PORT_WRITE128_IN_VALUE_OFST 4
+#define       MC_CMD_PORT_WRITE128_IN_VALUE_LEN 16
+
+/* MC_CMD_PORT_WRITE128_OUT msgresponse */
+#define    MC_CMD_PORT_WRITE128_OUT_LEN 4
+#define       MC_CMD_PORT_WRITE128_OUT_STATUS_OFST 0
+
+
+/***********************************/
+/* MC_CMD_GET_BOARD_CFG
+ * Returns the MC firmware configuration structure.
  */
 #define MC_CMD_GET_BOARD_CFG 0x18
-#define MC_CMD_GET_BOARD_CFG_IN_LEN 0
-#define MC_CMD_GET_BOARD_CFG_OUT_LEN 96
-#define MC_CMD_GET_BOARD_CFG_OUT_BOARD_TYPE_OFST 0
-#define MC_CMD_GET_BOARD_CFG_OUT_BOARD_NAME_OFST 4
-#define MC_CMD_GET_BOARD_CFG_OUT_BOARD_NAME_LEN 32
-#define MC_CMD_GET_BOARD_CFG_OUT_CAPABILITIES_PORT0_OFST 36
-#define MC_CMD_GET_BOARD_CFG_OUT_CAPABILITIES_PORT1_OFST 40
-#define MC_CMD_GET_BOARD_CFG_OUT_MAC_ADDR_BASE_PORT0_OFST 44
-#define MC_CMD_GET_BOARD_CFG_OUT_MAC_ADDR_BASE_PORT0_LEN 6
-#define MC_CMD_GET_BOARD_CFG_OUT_MAC_ADDR_BASE_PORT1_OFST 50
-#define MC_CMD_GET_BOARD_CFG_OUT_MAC_ADDR_BASE_PORT1_LEN 6
-#define MC_CMD_GET_BOARD_CFG_OUT_MAC_COUNT_PORT0_OFST 56
-#define MC_CMD_GET_BOARD_CFG_OUT_MAC_COUNT_PORT1_OFST 60
-#define MC_CMD_GET_BOARD_CFG_OUT_MAC_STRIDE_PORT0_OFST 64
-#define MC_CMD_GET_BOARD_CFG_OUT_MAC_STRIDE_PORT1_OFST 68
-#define MC_CMD_GET_BOARD_CFG_OUT_FW_SUBTYPE_LIST_OFST 72
-#define MC_CMD_GET_BOARD_CFG_OUT_FW_SUBTYPE_LIST_LEN 24
-
-/* MC_CMD_DBI_READX: (debug)
- * Read DBI register(s) -- extended functionality
- *
- * Host: vf selection, address, [,vf selection ...]
- * MC: value [,value ...]
+
+/* MC_CMD_GET_BOARD_CFG_IN msgrequest */
+#define    MC_CMD_GET_BOARD_CFG_IN_LEN 0
+
+/* MC_CMD_GET_BOARD_CFG_OUT msgresponse */
+#define    MC_CMD_GET_BOARD_CFG_OUT_LENMIN 96
+#define    MC_CMD_GET_BOARD_CFG_OUT_LENMAX 136
+#define    MC_CMD_GET_BOARD_CFG_OUT_LEN(num) (72+2*(num))
+#define       MC_CMD_GET_BOARD_CFG_OUT_BOARD_TYPE_OFST 0
+#define       MC_CMD_GET_BOARD_CFG_OUT_BOARD_NAME_OFST 4
+#define       MC_CMD_GET_BOARD_CFG_OUT_BOARD_NAME_LEN 32
+#define       MC_CMD_GET_BOARD_CFG_OUT_CAPABILITIES_PORT0_OFST 36
+#define          MC_CMD_CAPABILITIES_SMALL_BUF_TBL_LBN 0x0 /* enum */
+#define          MC_CMD_CAPABILITIES_SMALL_BUF_TBL_WIDTH 0x1 /* enum */
+#define          MC_CMD_CAPABILITIES_TURBO_LBN 0x1 /* enum */
+#define          MC_CMD_CAPABILITIES_TURBO_WIDTH 0x1 /* enum */
+#define          MC_CMD_CAPABILITIES_TURBO_ACTIVE_LBN 0x2 /* enum */
+#define          MC_CMD_CAPABILITIES_TURBO_ACTIVE_WIDTH 0x1 /* enum */
+#define          MC_CMD_CAPABILITIES_PTP_LBN 0x3 /* enum */
+#define          MC_CMD_CAPABILITIES_PTP_WIDTH 0x1 /* enum */
+#define       MC_CMD_GET_BOARD_CFG_OUT_CAPABILITIES_PORT1_OFST 40
+/*            Enum values, see field(s): */
+/*               CAPABILITIES_PORT0 */
+#define       MC_CMD_GET_BOARD_CFG_OUT_MAC_ADDR_BASE_PORT0_OFST 44
+#define       MC_CMD_GET_BOARD_CFG_OUT_MAC_ADDR_BASE_PORT0_LEN 6
+#define       MC_CMD_GET_BOARD_CFG_OUT_MAC_ADDR_BASE_PORT1_OFST 50
+#define       MC_CMD_GET_BOARD_CFG_OUT_MAC_ADDR_BASE_PORT1_LEN 6
+#define       MC_CMD_GET_BOARD_CFG_OUT_MAC_COUNT_PORT0_OFST 56
+#define       MC_CMD_GET_BOARD_CFG_OUT_MAC_COUNT_PORT1_OFST 60
+#define       MC_CMD_GET_BOARD_CFG_OUT_MAC_STRIDE_PORT0_OFST 64
+#define       MC_CMD_GET_BOARD_CFG_OUT_MAC_STRIDE_PORT1_OFST 68
+#define       MC_CMD_GET_BOARD_CFG_OUT_FW_SUBTYPE_LIST_OFST 72
+#define       MC_CMD_GET_BOARD_CFG_OUT_FW_SUBTYPE_LIST_LEN 2
+#define       MC_CMD_GET_BOARD_CFG_OUT_FW_SUBTYPE_LIST_MINNUM 12
+#define       MC_CMD_GET_BOARD_CFG_OUT_FW_SUBTYPE_LIST_MAXNUM 32
+
+
+/***********************************/
+/* MC_CMD_DBI_READX
+ * Read DBI register(s).
  */
 #define MC_CMD_DBI_READX 0x19
-#define MC_CMD_DBI_READX_IN_LEN(_numwords)      \
-  (8*(_numwords))
-#define MC_CMD_DBI_READX_OUT_LEN(_numwords)     \
-  (4*(_numwords))
 
-/* MC_CMD_SET_RAND_SEED:
- * Set the 16byte seed for the MC pseudo-random generator
+/* MC_CMD_DBI_READX_IN msgrequest */
+#define    MC_CMD_DBI_READX_IN_LENMIN 8
+#define    MC_CMD_DBI_READX_IN_LENMAX 248
+#define    MC_CMD_DBI_READX_IN_LEN(num) (0+8*(num))
+#define       MC_CMD_DBI_READX_IN_DBIRDOP_OFST 0
+#define       MC_CMD_DBI_READX_IN_DBIRDOP_LEN 8
+#define       MC_CMD_DBI_READX_IN_DBIRDOP_LO_OFST 0
+#define       MC_CMD_DBI_READX_IN_DBIRDOP_HI_OFST 4
+#define       MC_CMD_DBI_READX_IN_DBIRDOP_MINNUM 1
+#define       MC_CMD_DBI_READX_IN_DBIRDOP_MAXNUM 31
+
+/* MC_CMD_DBI_READX_OUT msgresponse */
+#define    MC_CMD_DBI_READX_OUT_LENMIN 4
+#define    MC_CMD_DBI_READX_OUT_LENMAX 252
+#define    MC_CMD_DBI_READX_OUT_LEN(num) (0+4*(num))
+#define       MC_CMD_DBI_READX_OUT_VALUE_OFST 0
+#define       MC_CMD_DBI_READX_OUT_VALUE_LEN 4
+#define       MC_CMD_DBI_READX_OUT_VALUE_MINNUM 1
+#define       MC_CMD_DBI_READX_OUT_VALUE_MAXNUM 63
+
+
+/***********************************/
+/* MC_CMD_SET_RAND_SEED
+ * Set the 16byte seed for the MC pseudo-random generator.
  */
 #define MC_CMD_SET_RAND_SEED 0x1a
-#define MC_CMD_SET_RAND_SEED_IN_LEN 16
-#define MC_CMD_SET_RAND_SEED_IN_SEED_OFST 0
-#define MC_CMD_SET_RAND_SEED_OUT_LEN 0
 
-/* MC_CMD_LTSSM_HIST: (debug)
- * Retrieve the history of the LTSSM, if the build supports it.
- *
- * Host: nothing
- * MC: variable number of LTSSM values, as bytes
- * The history is read-to-clear.
+/* MC_CMD_SET_RAND_SEED_IN msgrequest */
+#define    MC_CMD_SET_RAND_SEED_IN_LEN 16
+#define       MC_CMD_SET_RAND_SEED_IN_SEED_OFST 0
+#define       MC_CMD_SET_RAND_SEED_IN_SEED_LEN 16
+
+/* MC_CMD_SET_RAND_SEED_OUT msgresponse */
+#define    MC_CMD_SET_RAND_SEED_OUT_LEN 0
+
+
+/***********************************/
+/* MC_CMD_LTSSM_HIST
+ * Retrieve the history of the PCIE LTSSM.
  */
 #define MC_CMD_LTSSM_HIST 0x1b
 
-/* MC_CMD_DRV_ATTACH:
- * Inform MCPU that this port is managed on the host (i.e. driver active)
+/* MC_CMD_LTSSM_HIST_IN msgrequest */
+#define    MC_CMD_LTSSM_HIST_IN_LEN 0
+
+/* MC_CMD_LTSSM_HIST_OUT msgresponse */
+#define    MC_CMD_LTSSM_HIST_OUT_LENMIN 0
+#define    MC_CMD_LTSSM_HIST_OUT_LENMAX 252
+#define    MC_CMD_LTSSM_HIST_OUT_LEN(num) (0+4*(num))
+#define       MC_CMD_LTSSM_HIST_OUT_DATA_OFST 0
+#define       MC_CMD_LTSSM_HIST_OUT_DATA_LEN 4
+#define       MC_CMD_LTSSM_HIST_OUT_DATA_MINNUM 0
+#define       MC_CMD_LTSSM_HIST_OUT_DATA_MAXNUM 63
+
+
+/***********************************/
+/* MC_CMD_DRV_ATTACH
+ * Inform MCPU that this port is managed on the host.
  */
 #define MC_CMD_DRV_ATTACH 0x1c
-#define MC_CMD_DRV_ATTACH_IN_LEN 8
-#define MC_CMD_DRV_ATTACH_IN_NEW_STATE_OFST 0
-#define MC_CMD_DRV_ATTACH_IN_UPDATE_OFST 4
-#define MC_CMD_DRV_ATTACH_OUT_LEN 4
-#define MC_CMD_DRV_ATTACH_OUT_OLD_STATE_OFST 0
 
-/* MC_CMD_NCSI_PROD: (debug)
- * Trigger an NC-SI event (and possibly an AEN in response)
+/* MC_CMD_DRV_ATTACH_IN msgrequest */
+#define    MC_CMD_DRV_ATTACH_IN_LEN 8
+#define       MC_CMD_DRV_ATTACH_IN_NEW_STATE_OFST 0
+#define       MC_CMD_DRV_ATTACH_IN_UPDATE_OFST 4
+
+/* MC_CMD_DRV_ATTACH_OUT msgresponse */
+#define    MC_CMD_DRV_ATTACH_OUT_LEN 4
+#define       MC_CMD_DRV_ATTACH_OUT_OLD_STATE_OFST 0
+
+
+/***********************************/
+/* MC_CMD_NCSI_PROD
+ * Trigger an NC-SI event.
  */
 #define MC_CMD_NCSI_PROD 0x1d
-#define MC_CMD_NCSI_PROD_IN_LEN 4
-#define MC_CMD_NCSI_PROD_IN_EVENTS_OFST 0
-#define MC_CMD_NCSI_PROD_LINKCHANGE_LBN 0
-#define MC_CMD_NCSI_PROD_LINKCHANGE_WIDTH 1
-#define MC_CMD_NCSI_PROD_RESET_LBN 1
-#define MC_CMD_NCSI_PROD_RESET_WIDTH 1
-#define MC_CMD_NCSI_PROD_DRVATTACH_LBN 2
-#define MC_CMD_NCSI_PROD_DRVATTACH_WIDTH 1
-#define MC_CMD_NCSI_PROD_OUT_LEN 0
-
-/* Enumeration */
-#define MC_CMD_NCSI_PROD_LINKCHANGE 0
-#define MC_CMD_NCSI_PROD_RESET 1
-#define MC_CMD_NCSI_PROD_DRVATTACH 2
-
-/* MC_CMD_DEVEL: (debug)
- * Reserved for development
- */
-#define MC_CMD_DEVEL 0x1e
-
-/* MC_CMD_SHMUART: (debug)
+
+/* MC_CMD_NCSI_PROD_IN msgrequest */
+#define    MC_CMD_NCSI_PROD_IN_LEN 4
+#define       MC_CMD_NCSI_PROD_IN_EVENTS_OFST 0
+#define          MC_CMD_NCSI_PROD_LINKCHANGE 0x0 /* enum */
+#define          MC_CMD_NCSI_PROD_RESET 0x1 /* enum */
+#define          MC_CMD_NCSI_PROD_DRVATTACH 0x2 /* enum */
+#define        MC_CMD_NCSI_PROD_IN_LINKCHANGE_LBN 0
+#define        MC_CMD_NCSI_PROD_IN_LINKCHANGE_WIDTH 1
+#define        MC_CMD_NCSI_PROD_IN_RESET_LBN 1
+#define        MC_CMD_NCSI_PROD_IN_RESET_WIDTH 1
+#define        MC_CMD_NCSI_PROD_IN_DRVATTACH_LBN 2
+#define        MC_CMD_NCSI_PROD_IN_DRVATTACH_WIDTH 1
+
+/* MC_CMD_NCSI_PROD_OUT msgresponse */
+#define    MC_CMD_NCSI_PROD_OUT_LEN 0
+
+
+/***********************************/
+/* MC_CMD_SHMUART
  * Route UART output to circular buffer in shared memory instead.
  */
 #define MC_CMD_SHMUART 0x1f
-#define MC_CMD_SHMUART_IN_FLAG_OFST 0
-#define MC_CMD_SHMUART_IN_LEN 4
-#define MC_CMD_SHMUART_OUT_LEN 0
 
-/* MC_CMD_PORT_RESET:
- * Generic per-port reset. There is no equivalent for per-board reset.
- *
- * Locks required: None
- * Return code: 0, ETIME
- */
-#define MC_CMD_PORT_RESET 0x20
-#define MC_CMD_PORT_RESET_IN_LEN 0
-#define MC_CMD_PORT_RESET_OUT_LEN 0
-
-/* MC_CMD_RESOURCE_LOCK:
- * Generic resource lock/unlock interface.
- *
- * Locks required: None
- * Return code: 0,
- *              EBUSY (if trylock is contended by other port),
- *              EDEADLK (if trylock is already acquired by this port)
- *              EINVAL (if unlock doesn't own the lock)
- */
-#define MC_CMD_RESOURCE_LOCK 0x21
-#define MC_CMD_RESOURCE_LOCK_IN_LEN 8
-#define MC_CMD_RESOURCE_LOCK_IN_ACTION_OFST 0
-#define MC_CMD_RESOURCE_LOCK_ACTION_TRYLOCK 1
-#define MC_CMD_RESOURCE_LOCK_ACTION_UNLOCK 0
-#define MC_CMD_RESOURCE_LOCK_IN_RESOURCE_OFST 4
-#define MC_CMD_RESOURCE_LOCK_I2C 2
-#define MC_CMD_RESOURCE_LOCK_PHY 3
-#define MC_CMD_RESOURCE_LOCK_OUT_LEN 0
-
-/* MC_CMD_SPI_COMMAND: (variadic in, variadic out)
- * Read/Write to/from the SPI device.
- *
- * Locks required: SPI_LOCK
- * Return code: 0, ETIME, EINVAL, EACCES (if SPI_LOCK is not held)
- */
-#define MC_CMD_SPI_COMMAND 0x22
-#define MC_CMD_SPI_COMMAND_IN_LEN(_write_bytes) (12 + (_write_bytes))
-#define MC_CMD_SPI_COMMAND_IN_ARGS_OFST 0
-#define MC_CMD_SPI_COMMAND_IN_ARGS_ADDRESS_OFST 0
-#define MC_CMD_SPI_COMMAND_IN_ARGS_READ_BYTES_OFST 4
-#define MC_CMD_SPI_COMMAND_IN_ARGS_CHIP_SELECT_OFST 8
-/* Data to write here */
-#define MC_CMD_SPI_COMMAND_IN_WRITE_BUFFER_OFST 12
-#define MC_CMD_SPI_COMMAND_OUT_LEN(_read_bytes) (_read_bytes)
-/* Data read here */
-#define MC_CMD_SPI_COMMAND_OUT_READ_BUFFER_OFST 0
-
-/* MC_CMD_I2C_READ_WRITE: (variadic in, variadic out)
- * Read/Write to/from the I2C bus.
- *
- * Locks required: I2C_LOCK
- * Return code: 0, ETIME, EINVAL, EACCES (if I2C_LOCK is not held)
- */
-#define MC_CMD_I2C_RW 0x23
-#define MC_CMD_I2C_RW_IN_LEN(_write_bytes) (8 + (_write_bytes))
-#define MC_CMD_I2C_RW_IN_ARGS_OFST 0
-#define MC_CMD_I2C_RW_IN_ARGS_ADDR_OFST 0
-#define MC_CMD_I2C_RW_IN_ARGS_READ_BYTES_OFST 4
-/* Data to write here */
-#define MC_CMD_I2C_RW_IN_WRITE_BUFFER_OFSET 8
-#define MC_CMD_I2C_RW_OUT_LEN(_read_bytes) (_read_bytes)
-/* Data read here */
-#define MC_CMD_I2C_RW_OUT_READ_BUFFER_OFST 0
-
-/* Generic phy capability bitmask */
-#define MC_CMD_PHY_CAP_10HDX_LBN 1
-#define MC_CMD_PHY_CAP_10HDX_WIDTH 1
-#define MC_CMD_PHY_CAP_10FDX_LBN 2
-#define MC_CMD_PHY_CAP_10FDX_WIDTH 1
-#define MC_CMD_PHY_CAP_100HDX_LBN 3
-#define MC_CMD_PHY_CAP_100HDX_WIDTH 1
-#define MC_CMD_PHY_CAP_100FDX_LBN 4
-#define MC_CMD_PHY_CAP_100FDX_WIDTH 1
-#define MC_CMD_PHY_CAP_1000HDX_LBN 5
-#define MC_CMD_PHY_CAP_1000HDX_WIDTH 1
-#define MC_CMD_PHY_CAP_1000FDX_LBN 6
-#define MC_CMD_PHY_CAP_1000FDX_WIDTH 1
-#define MC_CMD_PHY_CAP_10000FDX_LBN 7
-#define MC_CMD_PHY_CAP_10000FDX_WIDTH 1
-#define MC_CMD_PHY_CAP_PAUSE_LBN 8
-#define MC_CMD_PHY_CAP_PAUSE_WIDTH 1
-#define MC_CMD_PHY_CAP_ASYM_LBN 9
-#define MC_CMD_PHY_CAP_ASYM_WIDTH 1
-#define MC_CMD_PHY_CAP_AN_LBN 10
-#define MC_CMD_PHY_CAP_AN_WIDTH 1
-
-/* Generic loopback enumeration */
-#define MC_CMD_LOOPBACK_NONE 0
-#define MC_CMD_LOOPBACK_DATA 1
-#define MC_CMD_LOOPBACK_GMAC 2
-#define MC_CMD_LOOPBACK_XGMII 3
-#define MC_CMD_LOOPBACK_XGXS 4
-#define MC_CMD_LOOPBACK_XAUI 5
-#define MC_CMD_LOOPBACK_GMII 6
-#define MC_CMD_LOOPBACK_SGMII 7
-#define MC_CMD_LOOPBACK_XGBR 8
-#define MC_CMD_LOOPBACK_XFI 9
-#define MC_CMD_LOOPBACK_XAUI_FAR 10
-#define MC_CMD_LOOPBACK_GMII_FAR 11
-#define MC_CMD_LOOPBACK_SGMII_FAR 12
-#define MC_CMD_LOOPBACK_XFI_FAR 13
-#define MC_CMD_LOOPBACK_GPHY 14
-#define MC_CMD_LOOPBACK_PHYXS 15
-#define MC_CMD_LOOPBACK_PCS 16
-#define MC_CMD_LOOPBACK_PMAPMD 17
-#define MC_CMD_LOOPBACK_XPORT 18
-#define MC_CMD_LOOPBACK_XGMII_WS 19
-#define MC_CMD_LOOPBACK_XAUI_WS 20
-#define MC_CMD_LOOPBACK_XAUI_WS_FAR 21
-#define MC_CMD_LOOPBACK_XAUI_WS_NEAR 22
-#define MC_CMD_LOOPBACK_GMII_WS 23
-#define MC_CMD_LOOPBACK_XFI_WS 24
-#define MC_CMD_LOOPBACK_XFI_WS_FAR 25
-#define MC_CMD_LOOPBACK_PHYXS_WS 26
-
-/* Generic PHY statistics enumeration */
-#define MC_CMD_OUI 0
-#define MC_CMD_PMA_PMD_LINK_UP 1
-#define MC_CMD_PMA_PMD_RX_FAULT 2
-#define MC_CMD_PMA_PMD_TX_FAULT 3
-#define MC_CMD_PMA_PMD_SIGNAL 4
-#define MC_CMD_PMA_PMD_SNR_A 5
-#define MC_CMD_PMA_PMD_SNR_B 6
-#define MC_CMD_PMA_PMD_SNR_C 7
-#define MC_CMD_PMA_PMD_SNR_D 8
-#define MC_CMD_PCS_LINK_UP 9
-#define MC_CMD_PCS_RX_FAULT 10
-#define MC_CMD_PCS_TX_FAULT 11
-#define MC_CMD_PCS_BER 12
-#define MC_CMD_PCS_BLOCK_ERRORS 13
-#define MC_CMD_PHYXS_LINK_UP 14
-#define MC_CMD_PHYXS_RX_FAULT 15
-#define MC_CMD_PHYXS_TX_FAULT 16
-#define MC_CMD_PHYXS_ALIGN 17
-#define MC_CMD_PHYXS_SYNC 18
-#define MC_CMD_AN_LINK_UP 19
-#define MC_CMD_AN_COMPLETE 20
-#define MC_CMD_AN_10GBT_STATUS 21
-#define MC_CMD_CL22_LINK_UP 22
-#define MC_CMD_PHY_NSTATS 23
-
-/* MC_CMD_GET_PHY_CFG:
- * Report PHY configuration.  This guarantees to succeed even if the PHY is in
- * a "zombie" state.
- *
- * Locks required: None
- * Return code: 0
+/* MC_CMD_SHMUART_IN msgrequest */
+#define    MC_CMD_SHMUART_IN_LEN 4
+#define       MC_CMD_SHMUART_IN_FLAG_OFST 0
+
+/* MC_CMD_SHMUART_OUT msgresponse */
+#define    MC_CMD_SHMUART_OUT_LEN 0
+
+
+/***********************************/
+/* MC_CMD_ENTITY_RESET
+ * Generic per-port reset.
+ */
+#define MC_CMD_ENTITY_RESET 0x20
+
+/* MC_CMD_ENTITY_RESET_IN msgrequest */
+#define    MC_CMD_ENTITY_RESET_IN_LEN 4
+#define       MC_CMD_ENTITY_RESET_IN_FLAG_OFST 0
+#define        MC_CMD_ENTITY_RESET_IN_FUNCTION_RESOURCE_RESET_LBN 0
+#define        MC_CMD_ENTITY_RESET_IN_FUNCTION_RESOURCE_RESET_WIDTH 1
+
+/* MC_CMD_ENTITY_RESET_OUT msgresponse */
+#define    MC_CMD_ENTITY_RESET_OUT_LEN 0
+
+
+/***********************************/
+/* MC_CMD_PCIE_CREDITS
+ * Read instantaneous and minimum flow control thresholds.
+ */
+#define MC_CMD_PCIE_CREDITS 0x21
+
+/* MC_CMD_PCIE_CREDITS_IN msgrequest */
+#define    MC_CMD_PCIE_CREDITS_IN_LEN 8
+#define       MC_CMD_PCIE_CREDITS_IN_POLL_PERIOD_OFST 0
+#define       MC_CMD_PCIE_CREDITS_IN_WIPE_OFST 4
+
+/* MC_CMD_PCIE_CREDITS_OUT msgresponse */
+#define    MC_CMD_PCIE_CREDITS_OUT_LEN 16
+#define       MC_CMD_PCIE_CREDITS_OUT_CURRENT_P_HDR_OFST 0
+#define       MC_CMD_PCIE_CREDITS_OUT_CURRENT_P_HDR_LEN 2
+#define       MC_CMD_PCIE_CREDITS_OUT_CURRENT_P_DATA_OFST 2
+#define       MC_CMD_PCIE_CREDITS_OUT_CURRENT_P_DATA_LEN 2
+#define       MC_CMD_PCIE_CREDITS_OUT_CURRENT_NP_HDR_OFST 4
+#define       MC_CMD_PCIE_CREDITS_OUT_CURRENT_NP_HDR_LEN 2
+#define       MC_CMD_PCIE_CREDITS_OUT_CURRENT_NP_DATA_OFST 6
+#define       MC_CMD_PCIE_CREDITS_OUT_CURRENT_NP_DATA_LEN 2
+#define       MC_CMD_PCIE_CREDITS_OUT_MINIMUM_P_HDR_OFST 8
+#define       MC_CMD_PCIE_CREDITS_OUT_MINIMUM_P_HDR_LEN 2
+#define       MC_CMD_PCIE_CREDITS_OUT_MINIMUM_P_DATA_OFST 10
+#define       MC_CMD_PCIE_CREDITS_OUT_MINIMUM_P_DATA_LEN 2
+#define       MC_CMD_PCIE_CREDITS_OUT_MINIMUM_NP_HDR_OFST 12
+#define       MC_CMD_PCIE_CREDITS_OUT_MINIMUM_NP_HDR_LEN 2
+#define       MC_CMD_PCIE_CREDITS_OUT_MINIMUM_NP_DATA_OFST 14
+#define       MC_CMD_PCIE_CREDITS_OUT_MINIMUM_NP_DATA_LEN 2
+
+
+/***********************************/
+/* MC_CMD_RXD_MONITOR
+ * Get histogram of RX queue fill level.
+ */
+#define MC_CMD_RXD_MONITOR 0x22
+
+/* MC_CMD_RXD_MONITOR_IN msgrequest */
+#define    MC_CMD_RXD_MONITOR_IN_LEN 12
+#define       MC_CMD_RXD_MONITOR_IN_QID_OFST 0
+#define       MC_CMD_RXD_MONITOR_IN_POLL_PERIOD_OFST 4
+#define       MC_CMD_RXD_MONITOR_IN_WIPE_OFST 8
+
+/* MC_CMD_RXD_MONITOR_OUT msgresponse */
+#define    MC_CMD_RXD_MONITOR_OUT_LEN 80
+#define       MC_CMD_RXD_MONITOR_OUT_QID_OFST 0
+#define       MC_CMD_RXD_MONITOR_OUT_RING_FILL_OFST 4
+#define       MC_CMD_RXD_MONITOR_OUT_CACHE_FILL_OFST 8
+#define       MC_CMD_RXD_MONITOR_OUT_RING_LT_1_OFST 12
+#define       MC_CMD_RXD_MONITOR_OUT_RING_LT_2_OFST 16
+#define       MC_CMD_RXD_MONITOR_OUT_RING_LT_4_OFST 20
+#define       MC_CMD_RXD_MONITOR_OUT_RING_LT_8_OFST 24
+#define       MC_CMD_RXD_MONITOR_OUT_RING_LT_16_OFST 28
+#define       MC_CMD_RXD_MONITOR_OUT_RING_LT_32_OFST 32
+#define       MC_CMD_RXD_MONITOR_OUT_RING_LT_64_OFST 36
+#define       MC_CMD_RXD_MONITOR_OUT_RING_LT_128_OFST 40
+#define       MC_CMD_RXD_MONITOR_OUT_RING_LT_256_OFST 44
+#define       MC_CMD_RXD_MONITOR_OUT_RING_GE_256_OFST 48
+#define       MC_CMD_RXD_MONITOR_OUT_CACHE_LT_1_OFST 52
+#define       MC_CMD_RXD_MONITOR_OUT_CACHE_LT_2_OFST 56
+#define       MC_CMD_RXD_MONITOR_OUT_CACHE_LT_4_OFST 60
+#define       MC_CMD_RXD_MONITOR_OUT_CACHE_LT_8_OFST 64
+#define       MC_CMD_RXD_MONITOR_OUT_CACHE_LT_16_OFST 68
+#define       MC_CMD_RXD_MONITOR_OUT_CACHE_LT_32_OFST 72
+#define       MC_CMD_RXD_MONITOR_OUT_CACHE_GE_32_OFST 76
+
+
+/***********************************/
+/* MC_CMD_PUTS
+ * puts(3) implementation over MCDI
+ */
+#define MC_CMD_PUTS 0x23
+
+/* MC_CMD_PUTS_IN msgrequest */
+#define    MC_CMD_PUTS_IN_LENMIN 13
+#define    MC_CMD_PUTS_IN_LENMAX 255
+#define    MC_CMD_PUTS_IN_LEN(num) (12+1*(num))
+#define       MC_CMD_PUTS_IN_DEST_OFST 0
+#define        MC_CMD_PUTS_IN_UART_LBN 0
+#define        MC_CMD_PUTS_IN_UART_WIDTH 1
+#define        MC_CMD_PUTS_IN_PORT_LBN 1
+#define        MC_CMD_PUTS_IN_PORT_WIDTH 1
+#define       MC_CMD_PUTS_IN_DHOST_OFST 4
+#define       MC_CMD_PUTS_IN_DHOST_LEN 6
+#define       MC_CMD_PUTS_IN_STRING_OFST 12
+#define       MC_CMD_PUTS_IN_STRING_LEN 1
+#define       MC_CMD_PUTS_IN_STRING_MINNUM 1
+#define       MC_CMD_PUTS_IN_STRING_MAXNUM 243
+
+/* MC_CMD_PUTS_OUT msgresponse */
+#define    MC_CMD_PUTS_OUT_LEN 0
+
+
+/***********************************/
+/* MC_CMD_GET_PHY_CFG
+ * Report PHY configuration.
  */
 #define MC_CMD_GET_PHY_CFG 0x24
 
-#define MC_CMD_GET_PHY_CFG_IN_LEN 0
-#define MC_CMD_GET_PHY_CFG_OUT_LEN 72
-
-#define MC_CMD_GET_PHY_CFG_OUT_FLAGS_OFST 0
-#define MC_CMD_GET_PHY_CFG_PRESENT_LBN 0
-#define MC_CMD_GET_PHY_CFG_PRESENT_WIDTH 1
-#define MC_CMD_GET_PHY_CFG_BIST_CABLE_SHORT_LBN 1
-#define MC_CMD_GET_PHY_CFG_BIST_CABLE_SHORT_WIDTH 1
-#define MC_CMD_GET_PHY_CFG_BIST_CABLE_LONG_LBN 2
-#define MC_CMD_GET_PHY_CFG_BIST_CABLE_LONG_WIDTH 1
-#define MC_CMD_GET_PHY_CFG_LOWPOWER_LBN 3
-#define MC_CMD_GET_PHY_CFG_LOWPOWER_WIDTH 1
-#define MC_CMD_GET_PHY_CFG_POWEROFF_LBN 4
-#define MC_CMD_GET_PHY_CFG_POWEROFF_WIDTH 1
-#define MC_CMD_GET_PHY_CFG_TXDIS_LBN 5
-#define MC_CMD_GET_PHY_CFG_TXDIS_WIDTH 1
-#define MC_CMD_GET_PHY_CFG_BIST_LBN 6
-#define MC_CMD_GET_PHY_CFG_BIST_WIDTH 1
-#define MC_CMD_GET_PHY_CFG_OUT_TYPE_OFST 4
-/* Bitmask of supported capabilities */
-#define MC_CMD_GET_PHY_CFG_OUT_SUPPORTED_CAP_OFST 8
-#define MC_CMD_GET_PHY_CFG_OUT_CHANNEL_OFST 12
-#define MC_CMD_GET_PHY_CFG_OUT_PRT_OFST 16
-/* PHY statistics bitmap */
-#define MC_CMD_GET_PHY_CFG_OUT_STATS_MASK_OFST 20
-/* PHY type/name string */
-#define MC_CMD_GET_PHY_CFG_OUT_NAME_OFST 24
-#define MC_CMD_GET_PHY_CFG_OUT_NAME_LEN 20
-#define MC_CMD_GET_PHY_CFG_OUT_MEDIA_TYPE_OFST 44
-#define MC_CMD_MEDIA_XAUI 1
-#define MC_CMD_MEDIA_CX4 2
-#define MC_CMD_MEDIA_KX4 3
-#define MC_CMD_MEDIA_XFP 4
-#define MC_CMD_MEDIA_SFP_PLUS 5
-#define MC_CMD_MEDIA_BASE_T 6
-/* MDIO "MMDS" supported */
-#define MC_CMD_GET_PHY_CFG_OUT_MMD_MASK_OFST 48
-/* Native clause 22 */
-#define MC_CMD_MMD_CLAUSE22  0
-#define MC_CMD_MMD_CLAUSE45_PMAPMD 1
-#define MC_CMD_MMD_CLAUSE45_WIS 2
-#define MC_CMD_MMD_CLAUSE45_PCS 3
-#define MC_CMD_MMD_CLAUSE45_PHYXS 4
-#define MC_CMD_MMD_CLAUSE45_DTEXS 5
-#define MC_CMD_MMD_CLAUSE45_TC 6
-#define MC_CMD_MMD_CLAUSE45_AN 7
-/* Clause22 proxied over clause45 by PHY */
-#define MC_CMD_MMD_CLAUSE45_C22EXT 29
-#define MC_CMD_MMD_CLAUSE45_VEND1 30
-#define MC_CMD_MMD_CLAUSE45_VEND2 31
-/* PHY stepping version */
-#define MC_CMD_GET_PHY_CFG_OUT_REVISION_OFST 52
-#define MC_CMD_GET_PHY_CFG_OUT_REVISION_LEN 20
-
-/* MC_CMD_START_BIST:
+/* MC_CMD_GET_PHY_CFG_IN msgrequest */
+#define    MC_CMD_GET_PHY_CFG_IN_LEN 0
+
+/* MC_CMD_GET_PHY_CFG_OUT msgresponse */
+#define    MC_CMD_GET_PHY_CFG_OUT_LEN 72
+#define       MC_CMD_GET_PHY_CFG_OUT_FLAGS_OFST 0
+#define        MC_CMD_GET_PHY_CFG_OUT_PRESENT_LBN 0
+#define        MC_CMD_GET_PHY_CFG_OUT_PRESENT_WIDTH 1
+#define        MC_CMD_GET_PHY_CFG_OUT_BIST_CABLE_SHORT_LBN 1
+#define        MC_CMD_GET_PHY_CFG_OUT_BIST_CABLE_SHORT_WIDTH 1
+#define        MC_CMD_GET_PHY_CFG_OUT_BIST_CABLE_LONG_LBN 2
+#define        MC_CMD_GET_PHY_CFG_OUT_BIST_CABLE_LONG_WIDTH 1
+#define        MC_CMD_GET_PHY_CFG_OUT_LOWPOWER_LBN 3
+#define        MC_CMD_GET_PHY_CFG_OUT_LOWPOWER_WIDTH 1
+#define        MC_CMD_GET_PHY_CFG_OUT_POWEROFF_LBN 4
+#define        MC_CMD_GET_PHY_CFG_OUT_POWEROFF_WIDTH 1
+#define        MC_CMD_GET_PHY_CFG_OUT_TXDIS_LBN 5
+#define        MC_CMD_GET_PHY_CFG_OUT_TXDIS_WIDTH 1
+#define        MC_CMD_GET_PHY_CFG_OUT_BIST_LBN 6
+#define        MC_CMD_GET_PHY_CFG_OUT_BIST_WIDTH 1
+#define       MC_CMD_GET_PHY_CFG_OUT_TYPE_OFST 4
+#define       MC_CMD_GET_PHY_CFG_OUT_SUPPORTED_CAP_OFST 8
+#define        MC_CMD_PHY_CAP_10HDX_LBN 1
+#define        MC_CMD_PHY_CAP_10HDX_WIDTH 1
+#define        MC_CMD_PHY_CAP_10FDX_LBN 2
+#define        MC_CMD_PHY_CAP_10FDX_WIDTH 1
+#define        MC_CMD_PHY_CAP_100HDX_LBN 3
+#define        MC_CMD_PHY_CAP_100HDX_WIDTH 1
+#define        MC_CMD_PHY_CAP_100FDX_LBN 4
+#define        MC_CMD_PHY_CAP_100FDX_WIDTH 1
+#define        MC_CMD_PHY_CAP_1000HDX_LBN 5
+#define        MC_CMD_PHY_CAP_1000HDX_WIDTH 1
+#define        MC_CMD_PHY_CAP_1000FDX_LBN 6
+#define        MC_CMD_PHY_CAP_1000FDX_WIDTH 1
+#define        MC_CMD_PHY_CAP_10000FDX_LBN 7
+#define        MC_CMD_PHY_CAP_10000FDX_WIDTH 1
+#define        MC_CMD_PHY_CAP_PAUSE_LBN 8
+#define        MC_CMD_PHY_CAP_PAUSE_WIDTH 1
+#define        MC_CMD_PHY_CAP_ASYM_LBN 9
+#define        MC_CMD_PHY_CAP_ASYM_WIDTH 1
+#define        MC_CMD_PHY_CAP_AN_LBN 10
+#define        MC_CMD_PHY_CAP_AN_WIDTH 1
+#define       MC_CMD_GET_PHY_CFG_OUT_CHANNEL_OFST 12
+#define       MC_CMD_GET_PHY_CFG_OUT_PRT_OFST 16
+#define       MC_CMD_GET_PHY_CFG_OUT_STATS_MASK_OFST 20
+#define       MC_CMD_GET_PHY_CFG_OUT_NAME_OFST 24
+#define       MC_CMD_GET_PHY_CFG_OUT_NAME_LEN 20
+#define       MC_CMD_GET_PHY_CFG_OUT_MEDIA_TYPE_OFST 44
+#define          MC_CMD_MEDIA_XAUI 0x1 /* enum */
+#define          MC_CMD_MEDIA_CX4 0x2 /* enum */
+#define          MC_CMD_MEDIA_KX4 0x3 /* enum */
+#define          MC_CMD_MEDIA_XFP 0x4 /* enum */
+#define          MC_CMD_MEDIA_SFP_PLUS 0x5 /* enum */
+#define          MC_CMD_MEDIA_BASE_T 0x6 /* enum */
+#define       MC_CMD_GET_PHY_CFG_OUT_MMD_MASK_OFST 48
+#define          MC_CMD_MMD_CLAUSE22 0x0 /* enum */
+#define          MC_CMD_MMD_CLAUSE45_PMAPMD 0x1 /* enum */
+#define          MC_CMD_MMD_CLAUSE45_WIS 0x2 /* enum */
+#define          MC_CMD_MMD_CLAUSE45_PCS 0x3 /* enum */
+#define          MC_CMD_MMD_CLAUSE45_PHYXS 0x4 /* enum */
+#define          MC_CMD_MMD_CLAUSE45_DTEXS 0x5 /* enum */
+#define          MC_CMD_MMD_CLAUSE45_TC 0x6 /* enum */
+#define          MC_CMD_MMD_CLAUSE45_AN 0x7 /* enum */
+#define          MC_CMD_MMD_CLAUSE45_C22EXT 0x1d /* enum */
+#define          MC_CMD_MMD_CLAUSE45_VEND1 0x1e /* enum */
+#define          MC_CMD_MMD_CLAUSE45_VEND2 0x1f /* enum */
+#define       MC_CMD_GET_PHY_CFG_OUT_REVISION_OFST 52
+#define       MC_CMD_GET_PHY_CFG_OUT_REVISION_LEN 20
+
+
+/***********************************/
+/* MC_CMD_START_BIST
  * Start a BIST test on the PHY.
- *
- * Locks required: PHY_LOCK if doing a  PHY BIST
- * Return code: 0, EINVAL, EACCES (if PHY_LOCK is not held)
  */
 #define MC_CMD_START_BIST 0x25
-#define MC_CMD_START_BIST_IN_LEN 4
-#define MC_CMD_START_BIST_IN_TYPE_OFST 0
-#define MC_CMD_START_BIST_OUT_LEN 0
-
-/* Run the PHY's short cable BIST */
-#define MC_CMD_PHY_BIST_CABLE_SHORT  1
-/* Run the PHY's long cable BIST */
-#define MC_CMD_PHY_BIST_CABLE_LONG   2
-/* Run BIST on the currently selected BPX Serdes (XAUI or XFI) */
-#define MC_CMD_BPX_SERDES_BIST 3
-/* Run the MC loopback tests */
-#define MC_CMD_MC_LOOPBACK_BIST 4
-/* Run the PHY's standard BIST */
-#define MC_CMD_PHY_BIST 5
-
-/* MC_CMD_POLL_PHY_BIST: (variadic output)
- * Poll for BIST completion
- *
- * Returns a single status code, and optionally some PHY specific
- * bist output. The driver should only consume the BIST output
- * after validating OUTLEN and PHY_CFG.PHY_TYPE.
- *
- * If a driver can't successfully parse the BIST output, it should
- * still respect the pass/Fail in OUT.RESULT
- *
- * Locks required: PHY_LOCK if doing a  PHY BIST
- * Return code: 0, EACCES (if PHY_LOCK is not held)
+
+/* MC_CMD_START_BIST_IN msgrequest */
+#define    MC_CMD_START_BIST_IN_LEN 4
+#define       MC_CMD_START_BIST_IN_TYPE_OFST 0
+#define          MC_CMD_PHY_BIST_CABLE_SHORT 0x1 /* enum */
+#define          MC_CMD_PHY_BIST_CABLE_LONG 0x2 /* enum */
+#define          MC_CMD_BPX_SERDES_BIST 0x3 /* enum */
+#define          MC_CMD_MC_LOOPBACK_BIST 0x4 /* enum */
+#define          MC_CMD_PHY_BIST 0x5 /* enum */
+
+/* MC_CMD_START_BIST_OUT msgresponse */
+#define    MC_CMD_START_BIST_OUT_LEN 0
+
+
+/***********************************/
+/* MC_CMD_POLL_BIST
+ * Poll for BIST completion.
  */
 #define MC_CMD_POLL_BIST 0x26
-#define MC_CMD_POLL_BIST_IN_LEN 0
-#define MC_CMD_POLL_BIST_OUT_LEN UNKNOWN
-#define MC_CMD_POLL_BIST_OUT_SFT9001_LEN 36
-#define MC_CMD_POLL_BIST_OUT_MRSFP_LEN 8
-#define MC_CMD_POLL_BIST_OUT_RESULT_OFST 0
-#define MC_CMD_POLL_BIST_RUNNING 1
-#define MC_CMD_POLL_BIST_PASSED 2
-#define MC_CMD_POLL_BIST_FAILED 3
-#define MC_CMD_POLL_BIST_TIMEOUT 4
-/* Generic: */
-#define MC_CMD_POLL_BIST_OUT_PRIVATE_OFST 4
-/* SFT9001-specific: */
-#define MC_CMD_POLL_BIST_OUT_SFT9001_CABLE_LENGTH_A_OFST 4
-#define MC_CMD_POLL_BIST_OUT_SFT9001_CABLE_LENGTH_B_OFST 8
-#define MC_CMD_POLL_BIST_OUT_SFT9001_CABLE_LENGTH_C_OFST 12
-#define MC_CMD_POLL_BIST_OUT_SFT9001_CABLE_LENGTH_D_OFST 16
-#define MC_CMD_POLL_BIST_OUT_SFT9001_CABLE_STATUS_A_OFST 20
-#define MC_CMD_POLL_BIST_OUT_SFT9001_CABLE_STATUS_B_OFST 24
-#define MC_CMD_POLL_BIST_OUT_SFT9001_CABLE_STATUS_C_OFST 28
-#define MC_CMD_POLL_BIST_OUT_SFT9001_CABLE_STATUS_D_OFST 32
-#define MC_CMD_POLL_BIST_SFT9001_PAIR_OK 1
-#define MC_CMD_POLL_BIST_SFT9001_PAIR_OPEN 2
-#define MC_CMD_POLL_BIST_SFT9001_INTRA_PAIR_SHORT 3
-#define MC_CMD_POLL_BIST_SFT9001_INTER_PAIR_SHORT 4
-#define MC_CMD_POLL_BIST_SFT9001_PAIR_BUSY 9
-/* mrsfp "PHY" driver: */
-#define MC_CMD_POLL_BIST_OUT_MRSFP_TEST_OFST 4
-#define MC_CMD_POLL_BIST_MRSFP_TEST_COMPLETE 0
-#define MC_CMD_POLL_BIST_MRSFP_TEST_BUS_SWITCH_OFF_I2C_WRITE 1
-#define MC_CMD_POLL_BIST_MRSFP_TEST_BUS_SWITCH_OFF_I2C_NO_ACCESS_IO_EXP 2
-#define MC_CMD_POLL_BIST_MRSFP_TEST_BUS_SWITCH_OFF_I2C_NO_ACCESS_MODULE 3
-#define MC_CMD_POLL_BIST_MRSFP_TEST_IO_EXP_I2C_CONFIGURE 4
-#define MC_CMD_POLL_BIST_MRSFP_TEST_BUS_SWITCH_I2C_NO_CROSSTALK 5
-#define MC_CMD_POLL_BIST_MRSFP_TEST_MODULE_PRESENCE 6
-#define MC_CMD_POLL_BIST_MRSFP_TEST_MODULE_ID_I2C_ACCESS 7
-#define MC_CMD_POLL_BIST_MRSFP_TEST_MODULE_ID_SANE_VALUE 8
-
-/* MC_CMD_PHY_SPI: (variadic in, variadic out)
- * Read/Write/Erase the PHY SPI device
- *
- * Locks required: PHY_LOCK
- * Return code: 0, ETIME, EINVAL, EACCES (if PHY_LOCK is not held)
- */
-#define MC_CMD_PHY_SPI 0x27
-#define MC_CMD_PHY_SPI_IN_LEN(_write_bytes) (12 + (_write_bytes))
-#define MC_CMD_PHY_SPI_IN_ARGS_OFST 0
-#define MC_CMD_PHY_SPI_IN_ARGS_ADDR_OFST 0
-#define MC_CMD_PHY_SPI_IN_ARGS_READ_BYTES_OFST 4
-#define MC_CMD_PHY_SPI_IN_ARGS_ERASE_ALL_OFST 8
-/* Data to write here */
-#define MC_CMD_PHY_SPI_IN_WRITE_BUFFER_OFSET 12
-#define MC_CMD_PHY_SPI_OUT_LEN(_read_bytes) (_read_bytes)
-/* Data read here */
-#define MC_CMD_PHY_SPI_OUT_READ_BUFFER_OFST 0
-
-
-/* MC_CMD_GET_LOOPBACK_MODES:
- * Returns a bitmask of loopback modes evailable at each speed.
- *
- * Locks required: None
- * Return code: 0
+
+/* MC_CMD_POLL_BIST_IN msgrequest */
+#define    MC_CMD_POLL_BIST_IN_LEN 0
+
+/* MC_CMD_POLL_BIST_OUT msgresponse */
+#define    MC_CMD_POLL_BIST_OUT_LEN 8
+#define       MC_CMD_POLL_BIST_OUT_RESULT_OFST 0
+#define          MC_CMD_POLL_BIST_RUNNING 0x1 /* enum */
+#define          MC_CMD_POLL_BIST_PASSED 0x2 /* enum */
+#define          MC_CMD_POLL_BIST_FAILED 0x3 /* enum */
+#define          MC_CMD_POLL_BIST_TIMEOUT 0x4 /* enum */
+#define       MC_CMD_POLL_BIST_OUT_PRIVATE_OFST 4
+
+/* MC_CMD_POLL_BIST_OUT_SFT9001 msgresponse */
+#define    MC_CMD_POLL_BIST_OUT_SFT9001_LEN 36
+/*            MC_CMD_POLL_BIST_OUT_RESULT_OFST 0 */
+/*            Enum values, see field(s): */
+/*               MC_CMD_POLL_BIST_OUT/MC_CMD_POLL_BIST_OUT_RESULT */
+#define       MC_CMD_POLL_BIST_OUT_SFT9001_CABLE_LENGTH_A_OFST 4
+#define       MC_CMD_POLL_BIST_OUT_SFT9001_CABLE_LENGTH_B_OFST 8
+#define       MC_CMD_POLL_BIST_OUT_SFT9001_CABLE_LENGTH_C_OFST 12
+#define       MC_CMD_POLL_BIST_OUT_SFT9001_CABLE_LENGTH_D_OFST 16
+#define       MC_CMD_POLL_BIST_OUT_SFT9001_CABLE_STATUS_A_OFST 20
+#define          MC_CMD_POLL_BIST_SFT9001_PAIR_OK 0x1 /* enum */
+#define          MC_CMD_POLL_BIST_SFT9001_PAIR_OPEN 0x2 /* enum */
+#define          MC_CMD_POLL_BIST_SFT9001_INTRA_PAIR_SHORT 0x3 /* enum */
+#define          MC_CMD_POLL_BIST_SFT9001_INTER_PAIR_SHORT 0x4 /* enum */
+#define          MC_CMD_POLL_BIST_SFT9001_PAIR_BUSY 0x9 /* enum */
+#define       MC_CMD_POLL_BIST_OUT_SFT9001_CABLE_STATUS_B_OFST 24
+/*            Enum values, see field(s): */
+/*               CABLE_STATUS_A */
+#define       MC_CMD_POLL_BIST_OUT_SFT9001_CABLE_STATUS_C_OFST 28
+/*            Enum values, see field(s): */
+/*               CABLE_STATUS_A */
+#define       MC_CMD_POLL_BIST_OUT_SFT9001_CABLE_STATUS_D_OFST 32
+/*            Enum values, see field(s): */
+/*               CABLE_STATUS_A */
+
+/* MC_CMD_POLL_BIST_OUT_MRSFP msgresponse */
+#define    MC_CMD_POLL_BIST_OUT_MRSFP_LEN 8
+/*            MC_CMD_POLL_BIST_OUT_RESULT_OFST 0 */
+/*            Enum values, see field(s): */
+/*               MC_CMD_POLL_BIST_OUT/MC_CMD_POLL_BIST_OUT_RESULT */
+#define       MC_CMD_POLL_BIST_OUT_MRSFP_TEST_OFST 4
+#define          MC_CMD_POLL_BIST_MRSFP_TEST_COMPLETE 0x0 /* enum */
+#define          MC_CMD_POLL_BIST_MRSFP_TEST_BUS_SWITCH_OFF_I2C_WRITE 0x1 /* enum */
+#define          MC_CMD_POLL_BIST_MRSFP_TEST_BUS_SWITCH_OFF_I2C_NO_ACCESS_IO_EXP 0x2 /* enum */
+#define          MC_CMD_POLL_BIST_MRSFP_TEST_BUS_SWITCH_OFF_I2C_NO_ACCESS_MODULE 0x3 /* enum */
+#define          MC_CMD_POLL_BIST_MRSFP_TEST_IO_EXP_I2C_CONFIGURE 0x4 /* enum */
+#define          MC_CMD_POLL_BIST_MRSFP_TEST_BUS_SWITCH_I2C_NO_CROSSTALK 0x5 /* enum */
+#define          MC_CMD_POLL_BIST_MRSFP_TEST_MODULE_PRESENCE 0x6 /* enum */
+#define          MC_CMD_POLL_BIST_MRSFP_TEST_MODULE_ID_I2C_ACCESS 0x7 /* enum */
+#define          MC_CMD_POLL_BIST_MRSFP_TEST_MODULE_ID_SANE_VALUE 0x8 /* enum */
+
+
+/***********************************/
+/* MC_CMD_FLUSH_RX_QUEUES
+ * Flush receive queue(s).
+ */
+#define MC_CMD_FLUSH_RX_QUEUES 0x27
+
+/* MC_CMD_FLUSH_RX_QUEUES_IN msgrequest */
+#define    MC_CMD_FLUSH_RX_QUEUES_IN_LENMIN 4
+#define    MC_CMD_FLUSH_RX_QUEUES_IN_LENMAX 252
+#define    MC_CMD_FLUSH_RX_QUEUES_IN_LEN(num) (0+4*(num))
+#define       MC_CMD_FLUSH_RX_QUEUES_IN_QID_OFST_OFST 0
+#define       MC_CMD_FLUSH_RX_QUEUES_IN_QID_OFST_LEN 4
+#define       MC_CMD_FLUSH_RX_QUEUES_IN_QID_OFST_MINNUM 1
+#define       MC_CMD_FLUSH_RX_QUEUES_IN_QID_OFST_MAXNUM 63
+
+/* MC_CMD_FLUSH_RX_QUEUES_OUT msgresponse */
+#define    MC_CMD_FLUSH_RX_QUEUES_OUT_LEN 0
+
+
+/***********************************/
+/* MC_CMD_GET_LOOPBACK_MODES
+ * Get port's loopback modes.
  */
 #define MC_CMD_GET_LOOPBACK_MODES 0x28
-#define MC_CMD_GET_LOOPBACK_MODES_IN_LEN 0
-#define MC_CMD_GET_LOOPBACK_MODES_OUT_LEN 32
-#define MC_CMD_GET_LOOPBACK_MODES_100M_OFST 0
-#define MC_CMD_GET_LOOPBACK_MODES_1G_OFST 8
-#define MC_CMD_GET_LOOPBACK_MODES_10G_OFST 16
-#define MC_CMD_GET_LOOPBACK_MODES_SUGGESTED_OFST 24
-
-/* Flow control enumeration */
-#define MC_CMD_FCNTL_OFF 0
-#define MC_CMD_FCNTL_RESPOND 1
-#define MC_CMD_FCNTL_BIDIR 2
-/* Auto - Use what the link has autonegotiated
- *      - The driver should modify the advertised capabilities via SET_LINK.CAP
- *        to control the negotiated flow control mode.
- *      - Can only be set if the PHY supports PAUSE+ASYM capabilities
- *      - Never returned by GET_LINK as the value programmed into the MAC
- */
-#define MC_CMD_FCNTL_AUTO 3
-
-/* Generic mac fault bitmask */
-#define MC_CMD_MAC_FAULT_XGMII_LOCAL_LBN 0
-#define MC_CMD_MAC_FAULT_XGMII_LOCAL_WIDTH 1
-#define MC_CMD_MAC_FAULT_XGMII_REMOTE_LBN 1
-#define MC_CMD_MAC_FAULT_XGMII_REMOTE_WIDTH 1
-#define MC_CMD_MAC_FAULT_SGMII_REMOTE_LBN 2
-#define MC_CMD_MAC_FAULT_SGMII_REMOTE_WIDTH 1
-
-/* MC_CMD_GET_LINK:
- * Read the unified MAC/PHY link state
- *
- * Locks required: None
- * Return code: 0, ETIME
+
+/* MC_CMD_GET_LOOPBACK_MODES_IN msgrequest */
+#define    MC_CMD_GET_LOOPBACK_MODES_IN_LEN 0
+
+/* MC_CMD_GET_LOOPBACK_MODES_OUT msgresponse */
+#define    MC_CMD_GET_LOOPBACK_MODES_OUT_LEN 32
+#define       MC_CMD_GET_LOOPBACK_MODES_OUT_100M_OFST 0
+#define       MC_CMD_GET_LOOPBACK_MODES_OUT_100M_LEN 8
+#define       MC_CMD_GET_LOOPBACK_MODES_OUT_100M_LO_OFST 0
+#define       MC_CMD_GET_LOOPBACK_MODES_OUT_100M_HI_OFST 4
+#define          MC_CMD_LOOPBACK_NONE  0x0 /* enum */
+#define          MC_CMD_LOOPBACK_DATA  0x1 /* enum */
+#define          MC_CMD_LOOPBACK_GMAC  0x2 /* enum */
+#define          MC_CMD_LOOPBACK_XGMII 0x3 /* enum */
+#define          MC_CMD_LOOPBACK_XGXS  0x4 /* enum */
+#define          MC_CMD_LOOPBACK_XAUI  0x5 /* enum */
+#define          MC_CMD_LOOPBACK_GMII  0x6 /* enum */
+#define          MC_CMD_LOOPBACK_SGMII  0x7 /* enum */
+#define          MC_CMD_LOOPBACK_XGBR  0x8 /* enum */
+#define          MC_CMD_LOOPBACK_XFI  0x9 /* enum */
+#define          MC_CMD_LOOPBACK_XAUI_FAR  0xa /* enum */
+#define          MC_CMD_LOOPBACK_GMII_FAR  0xb /* enum */
+#define          MC_CMD_LOOPBACK_SGMII_FAR  0xc /* enum */
+#define          MC_CMD_LOOPBACK_XFI_FAR  0xd /* enum */
+#define          MC_CMD_LOOPBACK_GPHY  0xe /* enum */
+#define          MC_CMD_LOOPBACK_PHYXS  0xf /* enum */
+#define          MC_CMD_LOOPBACK_PCS  0x10 /* enum */
+#define          MC_CMD_LOOPBACK_PMAPMD  0x11 /* enum */
+#define          MC_CMD_LOOPBACK_XPORT  0x12 /* enum */
+#define          MC_CMD_LOOPBACK_XGMII_WS  0x13 /* enum */
+#define          MC_CMD_LOOPBACK_XAUI_WS  0x14 /* enum */
+#define          MC_CMD_LOOPBACK_XAUI_WS_FAR  0x15 /* enum */
+#define          MC_CMD_LOOPBACK_XAUI_WS_NEAR  0x16 /* enum */
+#define          MC_CMD_LOOPBACK_GMII_WS  0x17 /* enum */
+#define          MC_CMD_LOOPBACK_XFI_WS  0x18 /* enum */
+#define          MC_CMD_LOOPBACK_XFI_WS_FAR  0x19 /* enum */
+#define          MC_CMD_LOOPBACK_PHYXS_WS  0x1a /* enum */
+#define       MC_CMD_GET_LOOPBACK_MODES_OUT_1G_OFST 8
+#define       MC_CMD_GET_LOOPBACK_MODES_OUT_1G_LEN 8
+#define       MC_CMD_GET_LOOPBACK_MODES_OUT_1G_LO_OFST 8
+#define       MC_CMD_GET_LOOPBACK_MODES_OUT_1G_HI_OFST 12
+/*            Enum values, see field(s): */
+/*               100M */
+#define       MC_CMD_GET_LOOPBACK_MODES_OUT_10G_OFST 16
+#define       MC_CMD_GET_LOOPBACK_MODES_OUT_10G_LEN 8
+#define       MC_CMD_GET_LOOPBACK_MODES_OUT_10G_LO_OFST 16
+#define       MC_CMD_GET_LOOPBACK_MODES_OUT_10G_HI_OFST 20
+/*            Enum values, see field(s): */
+/*               100M */
+#define       MC_CMD_GET_LOOPBACK_MODES_OUT_SUGGESTED_OFST 24
+#define       MC_CMD_GET_LOOPBACK_MODES_OUT_SUGGESTED_LEN 8
+#define       MC_CMD_GET_LOOPBACK_MODES_OUT_SUGGESTED_LO_OFST 24
+#define       MC_CMD_GET_LOOPBACK_MODES_OUT_SUGGESTED_HI_OFST 28
+/*            Enum values, see field(s): */
+/*               100M */
+
+
+/***********************************/
+/* MC_CMD_GET_LINK
+ * Read the unified MAC/PHY link state.
  */
 #define MC_CMD_GET_LINK 0x29
-#define MC_CMD_GET_LINK_IN_LEN 0
-#define MC_CMD_GET_LINK_OUT_LEN 28
-/* near-side and link-partner advertised capabilities */
-#define MC_CMD_GET_LINK_OUT_CAP_OFST 0
-#define MC_CMD_GET_LINK_OUT_LP_CAP_OFST 4
-/* Autonegotiated speed in mbit/s. The link may still be down
- * even if this reads non-zero */
-#define MC_CMD_GET_LINK_OUT_LINK_SPEED_OFST 8
-#define MC_CMD_GET_LINK_OUT_LOOPBACK_MODE_OFST 12
-#define MC_CMD_GET_LINK_OUT_FLAGS_OFST 16
-/* Whether we have overall link up */
-#define MC_CMD_GET_LINK_LINK_UP_LBN 0
-#define MC_CMD_GET_LINK_LINK_UP_WIDTH 1
-#define MC_CMD_GET_LINK_FULL_DUPLEX_LBN 1
-#define MC_CMD_GET_LINK_FULL_DUPLEX_WIDTH 1
-/* Whether we have link at the layers provided by the BPX */
-#define MC_CMD_GET_LINK_BPX_LINK_LBN 2
-#define MC_CMD_GET_LINK_BPX_LINK_WIDTH 1
-/* Whether the PHY has external link */
-#define MC_CMD_GET_LINK_PHY_LINK_LBN 3
-#define MC_CMD_GET_LINK_PHY_LINK_WIDTH 1
-#define MC_CMD_GET_LINK_OUT_FCNTL_OFST 20
-#define MC_CMD_GET_LINK_OUT_MAC_FAULT_OFST 24
-
-/* MC_CMD_SET_LINK:
- * Write the unified MAC/PHY link configuration
- *
- * A loopback speed of "0" is supported, and means
- * (choose any available speed)
- *
- * Locks required: None
- * Return code: 0, EINVAL, ETIME
+
+/* MC_CMD_GET_LINK_IN msgrequest */
+#define    MC_CMD_GET_LINK_IN_LEN 0
+
+/* MC_CMD_GET_LINK_OUT msgresponse */
+#define    MC_CMD_GET_LINK_OUT_LEN 28
+#define       MC_CMD_GET_LINK_OUT_CAP_OFST 0
+#define       MC_CMD_GET_LINK_OUT_LP_CAP_OFST 4
+#define       MC_CMD_GET_LINK_OUT_LINK_SPEED_OFST 8
+#define       MC_CMD_GET_LINK_OUT_LOOPBACK_MODE_OFST 12
+/*            Enum values, see field(s): */
+/*               MC_CMD_GET_LOOPBACK_MODES/MC_CMD_GET_LOOPBACK_MODES_OUT/100M */
+#define       MC_CMD_GET_LINK_OUT_FLAGS_OFST 16
+#define        MC_CMD_GET_LINK_OUT_LINK_UP_LBN 0
+#define        MC_CMD_GET_LINK_OUT_LINK_UP_WIDTH 1
+#define        MC_CMD_GET_LINK_OUT_FULL_DUPLEX_LBN 1
+#define        MC_CMD_GET_LINK_OUT_FULL_DUPLEX_WIDTH 1
+#define        MC_CMD_GET_LINK_OUT_BPX_LINK_LBN 2
+#define        MC_CMD_GET_LINK_OUT_BPX_LINK_WIDTH 1
+#define        MC_CMD_GET_LINK_OUT_PHY_LINK_LBN 3
+#define        MC_CMD_GET_LINK_OUT_PHY_LINK_WIDTH 1
+#define       MC_CMD_GET_LINK_OUT_FCNTL_OFST 20
+#define          MC_CMD_FCNTL_OFF 0x0 /* enum */
+#define          MC_CMD_FCNTL_RESPOND 0x1 /* enum */
+#define          MC_CMD_FCNTL_BIDIR 0x2 /* enum */
+#define       MC_CMD_GET_LINK_OUT_MAC_FAULT_OFST 24
+#define        MC_CMD_MAC_FAULT_XGMII_LOCAL_LBN 0
+#define        MC_CMD_MAC_FAULT_XGMII_LOCAL_WIDTH 1
+#define        MC_CMD_MAC_FAULT_XGMII_REMOTE_LBN 1
+#define        MC_CMD_MAC_FAULT_XGMII_REMOTE_WIDTH 1
+#define        MC_CMD_MAC_FAULT_SGMII_REMOTE_LBN 2
+#define        MC_CMD_MAC_FAULT_SGMII_REMOTE_WIDTH 1
+#define        MC_CMD_MAC_FAULT_PENDING_RECONFIG_LBN 3
+#define        MC_CMD_MAC_FAULT_PENDING_RECONFIG_WIDTH 1
+
+
+/***********************************/
+/* MC_CMD_SET_LINK
+ * Write the unified MAC/PHY link configuration.
  */
 #define MC_CMD_SET_LINK 0x2a
-#define MC_CMD_SET_LINK_IN_LEN 16
-#define MC_CMD_SET_LINK_IN_CAP_OFST 0
-#define MC_CMD_SET_LINK_IN_FLAGS_OFST 4
-#define MC_CMD_SET_LINK_LOWPOWER_LBN 0
-#define MC_CMD_SET_LINK_LOWPOWER_WIDTH 1
-#define MC_CMD_SET_LINK_POWEROFF_LBN 1
-#define MC_CMD_SET_LINK_POWEROFF_WIDTH 1
-#define MC_CMD_SET_LINK_TXDIS_LBN 2
-#define MC_CMD_SET_LINK_TXDIS_WIDTH 1
-#define MC_CMD_SET_LINK_IN_LOOPBACK_MODE_OFST 8
-#define MC_CMD_SET_LINK_IN_LOOPBACK_SPEED_OFST 12
-#define MC_CMD_SET_LINK_OUT_LEN 0
-
-/* MC_CMD_SET_ID_LED:
- * Set indentification LED state
- *
- * Locks required: None
- * Return code: 0, EINVAL
+
+/* MC_CMD_SET_LINK_IN msgrequest */
+#define    MC_CMD_SET_LINK_IN_LEN 16
+#define       MC_CMD_SET_LINK_IN_CAP_OFST 0
+#define       MC_CMD_SET_LINK_IN_FLAGS_OFST 4
+#define        MC_CMD_SET_LINK_IN_LOWPOWER_LBN 0
+#define        MC_CMD_SET_LINK_IN_LOWPOWER_WIDTH 1
+#define        MC_CMD_SET_LINK_IN_POWEROFF_LBN 1
+#define        MC_CMD_SET_LINK_IN_POWEROFF_WIDTH 1
+#define        MC_CMD_SET_LINK_IN_TXDIS_LBN 2
+#define        MC_CMD_SET_LINK_IN_TXDIS_WIDTH 1
+#define       MC_CMD_SET_LINK_IN_LOOPBACK_MODE_OFST 8
+/*            Enum values, see field(s): */
+/*               MC_CMD_GET_LOOPBACK_MODES/MC_CMD_GET_LOOPBACK_MODES_OUT/100M */
+#define       MC_CMD_SET_LINK_IN_LOOPBACK_SPEED_OFST 12
+
+/* MC_CMD_SET_LINK_OUT msgresponse */
+#define    MC_CMD_SET_LINK_OUT_LEN 0
+
+
+/***********************************/
+/* MC_CMD_SET_ID_LED
+ * Set indentification LED state.
  */
 #define MC_CMD_SET_ID_LED 0x2b
-#define MC_CMD_SET_ID_LED_IN_LEN 4
-#define MC_CMD_SET_ID_LED_IN_STATE_OFST 0
-#define  MC_CMD_LED_OFF 0
-#define  MC_CMD_LED_ON 1
-#define  MC_CMD_LED_DEFAULT 2
-#define MC_CMD_SET_ID_LED_OUT_LEN 0
-
-/* MC_CMD_SET_MAC:
- * Set MAC configuration
- *
- * The MTU is the MTU programmed directly into the XMAC/GMAC
- * (inclusive of EtherII, VLAN, bug16011 padding)
- *
- * Locks required: None
- * Return code: 0, EINVAL
+
+/* MC_CMD_SET_ID_LED_IN msgrequest */
+#define    MC_CMD_SET_ID_LED_IN_LEN 4
+#define       MC_CMD_SET_ID_LED_IN_STATE_OFST 0
+#define          MC_CMD_LED_OFF  0x0 /* enum */
+#define          MC_CMD_LED_ON  0x1 /* enum */
+#define          MC_CMD_LED_DEFAULT  0x2 /* enum */
+
+/* MC_CMD_SET_ID_LED_OUT msgresponse */
+#define    MC_CMD_SET_ID_LED_OUT_LEN 0
+
+
+/***********************************/
+/* MC_CMD_SET_MAC
+ * Set MAC configuration.
  */
 #define MC_CMD_SET_MAC 0x2c
-#define MC_CMD_SET_MAC_IN_LEN 24
-#define MC_CMD_SET_MAC_IN_MTU_OFST 0
-#define MC_CMD_SET_MAC_IN_DRAIN_OFST 4
-#define MC_CMD_SET_MAC_IN_ADDR_OFST 8
-#define MC_CMD_SET_MAC_IN_REJECT_OFST 16
-#define MC_CMD_SET_MAC_IN_REJECT_UNCST_LBN 0
-#define MC_CMD_SET_MAC_IN_REJECT_UNCST_WIDTH 1
-#define MC_CMD_SET_MAC_IN_REJECT_BRDCST_LBN 1
-#define MC_CMD_SET_MAC_IN_REJECT_BRDCST_WIDTH 1
-#define MC_CMD_SET_MAC_IN_FCNTL_OFST 20
-#define MC_CMD_SET_MAC_OUT_LEN 0
-
-/* MC_CMD_PHY_STATS:
- * Get generic PHY statistics
- *
- * This call returns the statistics for a generic PHY in a sparse
- * array (indexed by the enumerate). Each value is represented by
- * a 32bit number.
- *
- * If the DMA_ADDR is 0, then no DMA is performed, and the statistics
- * may be read directly out of shared memory. If DMA_ADDR != 0, then
- * the statistics are dmad to that (page-aligned location)
- *
- * Locks required: None
- * Returns: 0, ETIME
- * Response methods: shared memory, event
+
+/* MC_CMD_SET_MAC_IN msgrequest */
+#define    MC_CMD_SET_MAC_IN_LEN 24
+#define       MC_CMD_SET_MAC_IN_MTU_OFST 0
+#define       MC_CMD_SET_MAC_IN_DRAIN_OFST 4
+#define       MC_CMD_SET_MAC_IN_ADDR_OFST 8
+#define       MC_CMD_SET_MAC_IN_ADDR_LEN 8
+#define       MC_CMD_SET_MAC_IN_ADDR_LO_OFST 8
+#define       MC_CMD_SET_MAC_IN_ADDR_HI_OFST 12
+#define       MC_CMD_SET_MAC_IN_REJECT_OFST 16
+#define        MC_CMD_SET_MAC_IN_REJECT_UNCST_LBN 0
+#define        MC_CMD_SET_MAC_IN_REJECT_UNCST_WIDTH 1
+#define        MC_CMD_SET_MAC_IN_REJECT_BRDCST_LBN 1
+#define        MC_CMD_SET_MAC_IN_REJECT_BRDCST_WIDTH 1
+#define       MC_CMD_SET_MAC_IN_FCNTL_OFST 20
+/*               MC_CMD_FCNTL_OFF 0x0 */
+/*               MC_CMD_FCNTL_RESPOND 0x1 */
+/*               MC_CMD_FCNTL_BIDIR 0x2 */
+#define          MC_CMD_FCNTL_AUTO 0x3 /* enum */
+
+/* MC_CMD_SET_MAC_OUT msgresponse */
+#define    MC_CMD_SET_MAC_OUT_LEN 0
+
+
+/***********************************/
+/* MC_CMD_PHY_STATS
+ * Get generic PHY statistics.
  */
 #define MC_CMD_PHY_STATS 0x2d
-#define MC_CMD_PHY_STATS_IN_LEN 8
-#define MC_CMD_PHY_STATS_IN_DMA_ADDR_LO_OFST 0
-#define MC_CMD_PHY_STATS_IN_DMA_ADDR_HI_OFST 4
-#define MC_CMD_PHY_STATS_OUT_DMA_LEN 0
-#define MC_CMD_PHY_STATS_OUT_NO_DMA_LEN (MC_CMD_PHY_NSTATS * 4)
-
-/* Unified MAC statistics enumeration */
-#define MC_CMD_MAC_GENERATION_START 0
-#define MC_CMD_MAC_TX_PKTS 1
-#define MC_CMD_MAC_TX_PAUSE_PKTS 2
-#define MC_CMD_MAC_TX_CONTROL_PKTS 3
-#define MC_CMD_MAC_TX_UNICAST_PKTS 4
-#define MC_CMD_MAC_TX_MULTICAST_PKTS 5
-#define MC_CMD_MAC_TX_BROADCAST_PKTS 6
-#define MC_CMD_MAC_TX_BYTES 7
-#define MC_CMD_MAC_TX_BAD_BYTES 8
-#define MC_CMD_MAC_TX_LT64_PKTS 9
-#define MC_CMD_MAC_TX_64_PKTS 10
-#define MC_CMD_MAC_TX_65_TO_127_PKTS 11
-#define MC_CMD_MAC_TX_128_TO_255_PKTS 12
-#define MC_CMD_MAC_TX_256_TO_511_PKTS 13
-#define MC_CMD_MAC_TX_512_TO_1023_PKTS 14
-#define MC_CMD_MAC_TX_1024_TO_15XX_PKTS 15
-#define MC_CMD_MAC_TX_15XX_TO_JUMBO_PKTS 16
-#define MC_CMD_MAC_TX_GTJUMBO_PKTS 17
-#define MC_CMD_MAC_TX_BAD_FCS_PKTS 18
-#define MC_CMD_MAC_TX_SINGLE_COLLISION_PKTS 19
-#define MC_CMD_MAC_TX_MULTIPLE_COLLISION_PKTS 20
-#define MC_CMD_MAC_TX_EXCESSIVE_COLLISION_PKTS 21
-#define MC_CMD_MAC_TX_LATE_COLLISION_PKTS 22
-#define MC_CMD_MAC_TX_DEFERRED_PKTS 23
-#define MC_CMD_MAC_TX_EXCESSIVE_DEFERRED_PKTS 24
-#define MC_CMD_MAC_TX_NON_TCPUDP_PKTS 25
-#define MC_CMD_MAC_TX_MAC_SRC_ERR_PKTS 26
-#define MC_CMD_MAC_TX_IP_SRC_ERR_PKTS 27
-#define MC_CMD_MAC_RX_PKTS 28
-#define MC_CMD_MAC_RX_PAUSE_PKTS 29
-#define MC_CMD_MAC_RX_GOOD_PKTS 30
-#define MC_CMD_MAC_RX_CONTROL_PKTS 31
-#define MC_CMD_MAC_RX_UNICAST_PKTS 32
-#define MC_CMD_MAC_RX_MULTICAST_PKTS 33
-#define MC_CMD_MAC_RX_BROADCAST_PKTS 34
-#define MC_CMD_MAC_RX_BYTES 35
-#define MC_CMD_MAC_RX_BAD_BYTES 36
-#define MC_CMD_MAC_RX_64_PKTS 37
-#define MC_CMD_MAC_RX_65_TO_127_PKTS 38
-#define MC_CMD_MAC_RX_128_TO_255_PKTS 39
-#define MC_CMD_MAC_RX_256_TO_511_PKTS 40
-#define MC_CMD_MAC_RX_512_TO_1023_PKTS 41
-#define MC_CMD_MAC_RX_1024_TO_15XX_PKTS 42
-#define MC_CMD_MAC_RX_15XX_TO_JUMBO_PKTS 43
-#define MC_CMD_MAC_RX_GTJUMBO_PKTS 44
-#define MC_CMD_MAC_RX_UNDERSIZE_PKTS 45
-#define MC_CMD_MAC_RX_BAD_FCS_PKTS 46
-#define MC_CMD_MAC_RX_OVERFLOW_PKTS 47
-#define MC_CMD_MAC_RX_FALSE_CARRIER_PKTS 48
-#define MC_CMD_MAC_RX_SYMBOL_ERROR_PKTS 49
-#define MC_CMD_MAC_RX_ALIGN_ERROR_PKTS 50
-#define MC_CMD_MAC_RX_LENGTH_ERROR_PKTS 51
-#define MC_CMD_MAC_RX_INTERNAL_ERROR_PKTS 52
-#define MC_CMD_MAC_RX_JABBER_PKTS 53
-#define MC_CMD_MAC_RX_NODESC_DROPS 54
-#define MC_CMD_MAC_RX_LANES01_CHAR_ERR 55
-#define MC_CMD_MAC_RX_LANES23_CHAR_ERR 56
-#define MC_CMD_MAC_RX_LANES01_DISP_ERR 57
-#define MC_CMD_MAC_RX_LANES23_DISP_ERR 58
-#define MC_CMD_MAC_RX_MATCH_FAULT 59
-#define MC_CMD_GMAC_DMABUF_START 64
-#define MC_CMD_GMAC_DMABUF_END   95
-/* Insert new members here. */
-#define MC_CMD_MAC_GENERATION_END 96
-#define MC_CMD_MAC_NSTATS (MC_CMD_MAC_GENERATION_END+1)
-
-/* MC_CMD_MAC_STATS:
- * Get unified GMAC/XMAC statistics
- *
- * This call returns unified statistics maintained by the MC as it
- * switches between the GMAC and XMAC. The MC will write out all
- * supported stats.  The driver should zero initialise the buffer to
- * guarantee consistent results.
- *
- * Locks required: None
- * Returns: 0
- * Response methods: shared memory, event
- */
-#define MC_CMD_MAC_STATS 0x2e
-#define MC_CMD_MAC_STATS_IN_LEN 16
-#define MC_CMD_MAC_STATS_IN_DMA_ADDR_LO_OFST 0
-#define MC_CMD_MAC_STATS_IN_DMA_ADDR_HI_OFST 4
-#define MC_CMD_MAC_STATS_IN_CMD_OFST 8
-#define MC_CMD_MAC_STATS_CMD_DMA_LBN 0
-#define MC_CMD_MAC_STATS_CMD_DMA_WIDTH 1
-#define MC_CMD_MAC_STATS_CMD_CLEAR_LBN 1
-#define MC_CMD_MAC_STATS_CMD_CLEAR_WIDTH 1
-#define MC_CMD_MAC_STATS_CMD_PERIODIC_CHANGE_LBN 2
-#define MC_CMD_MAC_STATS_CMD_PERIODIC_CHANGE_WIDTH 1
-/* Remaining PERIOD* fields only relevant when PERIODIC_CHANGE is set */
-#define MC_CMD_MAC_STATS_CMD_PERIODIC_ENABLE_LBN 3
-#define MC_CMD_MAC_STATS_CMD_PERIODIC_ENABLE_WIDTH 1
-#define MC_CMD_MAC_STATS_CMD_PERIODIC_CLEAR_LBN 4
-#define MC_CMD_MAC_STATS_CMD_PERIODIC_CLEAR_WIDTH 1
-#define MC_CMD_MAC_STATS_CMD_PERIODIC_NOEVENT_LBN 5
-#define MC_CMD_MAC_STATS_CMD_PERIODIC_NOEVENT_WIDTH 1
-#define MC_CMD_MAC_STATS_CMD_PERIOD_MS_LBN 16
-#define MC_CMD_MAC_STATS_CMD_PERIOD_MS_WIDTH 16
-#define MC_CMD_MAC_STATS_IN_DMA_LEN_OFST 12
-
-#define MC_CMD_MAC_STATS_OUT_LEN 0
-
-/* Callisto flags */
-#define MC_CMD_SFT9001_ROBUST_LBN 0
-#define MC_CMD_SFT9001_ROBUST_WIDTH 1
-#define MC_CMD_SFT9001_SHORT_REACH_LBN 1
-#define MC_CMD_SFT9001_SHORT_REACH_WIDTH 1
-
-/* MC_CMD_SFT9001_GET:
- * Read current callisto specific setting
- *
- * Locks required: None
- * Returns: 0, ETIME
- */
-#define MC_CMD_SFT9001_GET 0x30
-#define MC_CMD_SFT9001_GET_IN_LEN 0
-#define MC_CMD_SFT9001_GET_OUT_LEN 4
-#define MC_CMD_SFT9001_GET_OUT_FLAGS_OFST 0
 
-/* MC_CMD_SFT9001_SET:
- * Write current callisto specific setting
- *
- * Locks required: None
- * Returns: 0, ETIME, EINVAL
+/* MC_CMD_PHY_STATS_IN msgrequest */
+#define    MC_CMD_PHY_STATS_IN_LEN 8
+#define       MC_CMD_PHY_STATS_IN_DMA_ADDR_OFST 0
+#define       MC_CMD_PHY_STATS_IN_DMA_ADDR_LEN 8
+#define       MC_CMD_PHY_STATS_IN_DMA_ADDR_LO_OFST 0
+#define       MC_CMD_PHY_STATS_IN_DMA_ADDR_HI_OFST 4
+
+/* MC_CMD_PHY_STATS_OUT_DMA msgresponse */
+#define    MC_CMD_PHY_STATS_OUT_DMA_LEN 0
+
+/* MC_CMD_PHY_STATS_OUT_NO_DMA msgresponse */
+#define    MC_CMD_PHY_STATS_OUT_NO_DMA_LEN (((MC_CMD_PHY_NSTATS*32))>>3)
+#define       MC_CMD_PHY_STATS_OUT_NO_DMA_STATISTICS_OFST 0
+#define       MC_CMD_PHY_STATS_OUT_NO_DMA_STATISTICS_LEN 4
+#define       MC_CMD_PHY_STATS_OUT_NO_DMA_STATISTICS_NUM MC_CMD_PHY_NSTATS
+#define          MC_CMD_OUI  0x0 /* enum */
+#define          MC_CMD_PMA_PMD_LINK_UP  0x1 /* enum */
+#define          MC_CMD_PMA_PMD_RX_FAULT  0x2 /* enum */
+#define          MC_CMD_PMA_PMD_TX_FAULT  0x3 /* enum */
+#define          MC_CMD_PMA_PMD_SIGNAL  0x4 /* enum */
+#define          MC_CMD_PMA_PMD_SNR_A  0x5 /* enum */
+#define          MC_CMD_PMA_PMD_SNR_B  0x6 /* enum */
+#define          MC_CMD_PMA_PMD_SNR_C  0x7 /* enum */
+#define          MC_CMD_PMA_PMD_SNR_D  0x8 /* enum */
+#define          MC_CMD_PCS_LINK_UP  0x9 /* enum */
+#define          MC_CMD_PCS_RX_FAULT  0xa /* enum */
+#define          MC_CMD_PCS_TX_FAULT  0xb /* enum */
+#define          MC_CMD_PCS_BER  0xc /* enum */
+#define          MC_CMD_PCS_BLOCK_ERRORS  0xd /* enum */
+#define          MC_CMD_PHYXS_LINK_UP  0xe /* enum */
+#define          MC_CMD_PHYXS_RX_FAULT  0xf /* enum */
+#define          MC_CMD_PHYXS_TX_FAULT  0x10 /* enum */
+#define          MC_CMD_PHYXS_ALIGN  0x11 /* enum */
+#define          MC_CMD_PHYXS_SYNC  0x12 /* enum */
+#define          MC_CMD_AN_LINK_UP  0x13 /* enum */
+#define          MC_CMD_AN_COMPLETE  0x14 /* enum */
+#define          MC_CMD_AN_10GBT_STATUS  0x15 /* enum */
+#define          MC_CMD_CL22_LINK_UP  0x16 /* enum */
+#define          MC_CMD_PHY_NSTATS  0x17 /* enum */
+
+
+/***********************************/
+/* MC_CMD_MAC_STATS
+ * Get generic MAC statistics.
  */
-#define MC_CMD_SFT9001_SET 0x31
-#define MC_CMD_SFT9001_SET_IN_LEN 4
-#define MC_CMD_SFT9001_SET_IN_FLAGS_OFST 0
-#define MC_CMD_SFT9001_SET_OUT_LEN 0
-
+#define MC_CMD_MAC_STATS 0x2e
 
-/* MC_CMD_WOL_FILTER_SET:
- * Set a WoL filter
- *
- * Locks required: None
- * Returns: 0, EBUSY, EINVAL, ENOSYS
+/* MC_CMD_MAC_STATS_IN msgrequest */
+#define    MC_CMD_MAC_STATS_IN_LEN 16
+#define       MC_CMD_MAC_STATS_IN_DMA_ADDR_OFST 0
+#define       MC_CMD_MAC_STATS_IN_DMA_ADDR_LEN 8
+#define       MC_CMD_MAC_STATS_IN_DMA_ADDR_LO_OFST 0
+#define       MC_CMD_MAC_STATS_IN_DMA_ADDR_HI_OFST 4
+#define       MC_CMD_MAC_STATS_IN_CMD_OFST 8
+#define        MC_CMD_MAC_STATS_IN_DMA_LBN 0
+#define        MC_CMD_MAC_STATS_IN_DMA_WIDTH 1
+#define        MC_CMD_MAC_STATS_IN_CLEAR_LBN 1
+#define        MC_CMD_MAC_STATS_IN_CLEAR_WIDTH 1
+#define        MC_CMD_MAC_STATS_IN_PERIODIC_CHANGE_LBN 2
+#define        MC_CMD_MAC_STATS_IN_PERIODIC_CHANGE_WIDTH 1
+#define        MC_CMD_MAC_STATS_IN_PERIODIC_ENABLE_LBN 3
+#define        MC_CMD_MAC_STATS_IN_PERIODIC_ENABLE_WIDTH 1
+#define        MC_CMD_MAC_STATS_IN_PERIODIC_CLEAR_LBN 4
+#define        MC_CMD_MAC_STATS_IN_PERIODIC_CLEAR_WIDTH 1
+#define        MC_CMD_MAC_STATS_IN_PERIODIC_NOEVENT_LBN 5
+#define        MC_CMD_MAC_STATS_IN_PERIODIC_NOEVENT_WIDTH 1
+#define        MC_CMD_MAC_STATS_IN_PERIOD_MS_LBN 16
+#define        MC_CMD_MAC_STATS_IN_PERIOD_MS_WIDTH 16
+#define       MC_CMD_MAC_STATS_IN_DMA_LEN_OFST 12
+
+/* MC_CMD_MAC_STATS_OUT_DMA msgresponse */
+#define    MC_CMD_MAC_STATS_OUT_DMA_LEN 0
+
+/* MC_CMD_MAC_STATS_OUT_NO_DMA msgresponse */
+#define    MC_CMD_MAC_STATS_OUT_NO_DMA_LEN (((MC_CMD_MAC_NSTATS*64))>>3)
+#define       MC_CMD_MAC_STATS_OUT_NO_DMA_STATISTICS_OFST 0
+#define       MC_CMD_MAC_STATS_OUT_NO_DMA_STATISTICS_LEN 8
+#define       MC_CMD_MAC_STATS_OUT_NO_DMA_STATISTICS_LO_OFST 0
+#define       MC_CMD_MAC_STATS_OUT_NO_DMA_STATISTICS_HI_OFST 4
+#define       MC_CMD_MAC_STATS_OUT_NO_DMA_STATISTICS_NUM MC_CMD_MAC_NSTATS
+#define          MC_CMD_MAC_GENERATION_START  0x0 /* enum */
+#define          MC_CMD_MAC_TX_PKTS  0x1 /* enum */
+#define          MC_CMD_MAC_TX_PAUSE_PKTS  0x2 /* enum */
+#define          MC_CMD_MAC_TX_CONTROL_PKTS  0x3 /* enum */
+#define          MC_CMD_MAC_TX_UNICAST_PKTS  0x4 /* enum */
+#define          MC_CMD_MAC_TX_MULTICAST_PKTS  0x5 /* enum */
+#define          MC_CMD_MAC_TX_BROADCAST_PKTS  0x6 /* enum */
+#define          MC_CMD_MAC_TX_BYTES  0x7 /* enum */
+#define          MC_CMD_MAC_TX_BAD_BYTES  0x8 /* enum */
+#define          MC_CMD_MAC_TX_LT64_PKTS  0x9 /* enum */
+#define          MC_CMD_MAC_TX_64_PKTS  0xa /* enum */
+#define          MC_CMD_MAC_TX_65_TO_127_PKTS  0xb /* enum */
+#define          MC_CMD_MAC_TX_128_TO_255_PKTS  0xc /* enum */
+#define          MC_CMD_MAC_TX_256_TO_511_PKTS  0xd /* enum */
+#define          MC_CMD_MAC_TX_512_TO_1023_PKTS  0xe /* enum */
+#define          MC_CMD_MAC_TX_1024_TO_15XX_PKTS  0xf /* enum */
+#define          MC_CMD_MAC_TX_15XX_TO_JUMBO_PKTS  0x10 /* enum */
+#define          MC_CMD_MAC_TX_GTJUMBO_PKTS  0x11 /* enum */
+#define          MC_CMD_MAC_TX_BAD_FCS_PKTS  0x12 /* enum */
+#define          MC_CMD_MAC_TX_SINGLE_COLLISION_PKTS  0x13 /* enum */
+#define          MC_CMD_MAC_TX_MULTIPLE_COLLISION_PKTS  0x14 /* enum */
+#define          MC_CMD_MAC_TX_EXCESSIVE_COLLISION_PKTS  0x15 /* enum */
+#define          MC_CMD_MAC_TX_LATE_COLLISION_PKTS  0x16 /* enum */
+#define          MC_CMD_MAC_TX_DEFERRED_PKTS  0x17 /* enum */
+#define          MC_CMD_MAC_TX_EXCESSIVE_DEFERRED_PKTS  0x18 /* enum */
+#define          MC_CMD_MAC_TX_NON_TCPUDP_PKTS  0x19 /* enum */
+#define          MC_CMD_MAC_TX_MAC_SRC_ERR_PKTS  0x1a /* enum */
+#define          MC_CMD_MAC_TX_IP_SRC_ERR_PKTS  0x1b /* enum */
+#define          MC_CMD_MAC_RX_PKTS  0x1c /* enum */
+#define          MC_CMD_MAC_RX_PAUSE_PKTS  0x1d /* enum */
+#define          MC_CMD_MAC_RX_GOOD_PKTS  0x1e /* enum */
+#define          MC_CMD_MAC_RX_CONTROL_PKTS  0x1f /* enum */
+#define          MC_CMD_MAC_RX_UNICAST_PKTS  0x20 /* enum */
+#define          MC_CMD_MAC_RX_MULTICAST_PKTS  0x21 /* enum */
+#define          MC_CMD_MAC_RX_BROADCAST_PKTS  0x22 /* enum */
+#define          MC_CMD_MAC_RX_BYTES  0x23 /* enum */
+#define          MC_CMD_MAC_RX_BAD_BYTES  0x24 /* enum */
+#define          MC_CMD_MAC_RX_64_PKTS  0x25 /* enum */
+#define          MC_CMD_MAC_RX_65_TO_127_PKTS  0x26 /* enum */
+#define          MC_CMD_MAC_RX_128_TO_255_PKTS  0x27 /* enum */
+#define          MC_CMD_MAC_RX_256_TO_511_PKTS  0x28 /* enum */
+#define          MC_CMD_MAC_RX_512_TO_1023_PKTS  0x29 /* enum */
+#define          MC_CMD_MAC_RX_1024_TO_15XX_PKTS  0x2a /* enum */
+#define          MC_CMD_MAC_RX_15XX_TO_JUMBO_PKTS  0x2b /* enum */
+#define          MC_CMD_MAC_RX_GTJUMBO_PKTS  0x2c /* enum */
+#define          MC_CMD_MAC_RX_UNDERSIZE_PKTS  0x2d /* enum */
+#define          MC_CMD_MAC_RX_BAD_FCS_PKTS  0x2e /* enum */
+#define          MC_CMD_MAC_RX_OVERFLOW_PKTS  0x2f /* enum */
+#define          MC_CMD_MAC_RX_FALSE_CARRIER_PKTS  0x30 /* enum */
+#define          MC_CMD_MAC_RX_SYMBOL_ERROR_PKTS  0x31 /* enum */
+#define          MC_CMD_MAC_RX_ALIGN_ERROR_PKTS  0x32 /* enum */
+#define          MC_CMD_MAC_RX_LENGTH_ERROR_PKTS  0x33 /* enum */
+#define          MC_CMD_MAC_RX_INTERNAL_ERROR_PKTS  0x34 /* enum */
+#define          MC_CMD_MAC_RX_JABBER_PKTS  0x35 /* enum */
+#define          MC_CMD_MAC_RX_NODESC_DROPS  0x36 /* enum */
+#define          MC_CMD_MAC_RX_LANES01_CHAR_ERR  0x37 /* enum */
+#define          MC_CMD_MAC_RX_LANES23_CHAR_ERR  0x38 /* enum */
+#define          MC_CMD_MAC_RX_LANES01_DISP_ERR  0x39 /* enum */
+#define          MC_CMD_MAC_RX_LANES23_DISP_ERR  0x3a /* enum */
+#define          MC_CMD_MAC_RX_MATCH_FAULT  0x3b /* enum */
+#define          MC_CMD_GMAC_DMABUF_START  0x40 /* enum */
+#define          MC_CMD_GMAC_DMABUF_END    0x5f /* enum */
+#define          MC_CMD_MAC_GENERATION_END 0x60 /* enum */
+#define          MC_CMD_MAC_NSTATS  0x61 /* enum */
+
+
+/***********************************/
+/* MC_CMD_SRIOV
+ * to be documented
+ */
+#define MC_CMD_SRIOV 0x30
+
+/* MC_CMD_SRIOV_IN msgrequest */
+#define    MC_CMD_SRIOV_IN_LEN 12
+#define       MC_CMD_SRIOV_IN_ENABLE_OFST 0
+#define       MC_CMD_SRIOV_IN_VI_BASE_OFST 4
+#define       MC_CMD_SRIOV_IN_VF_COUNT_OFST 8
+
+/* MC_CMD_SRIOV_OUT msgresponse */
+#define    MC_CMD_SRIOV_OUT_LEN 8
+#define       MC_CMD_SRIOV_OUT_VI_SCALE_OFST 0
+#define       MC_CMD_SRIOV_OUT_VF_TOTAL_OFST 4
+
+/* MC_CMD_MEMCPY_RECORD_TYPEDEF structuredef */
+#define    MC_CMD_MEMCPY_RECORD_TYPEDEF_LEN 32
+#define       MC_CMD_MEMCPY_RECORD_TYPEDEF_NUM_RECORDS_OFST 0
+#define       MC_CMD_MEMCPY_RECORD_TYPEDEF_NUM_RECORDS_LBN 0
+#define       MC_CMD_MEMCPY_RECORD_TYPEDEF_NUM_RECORDS_WIDTH 32
+#define       MC_CMD_MEMCPY_RECORD_TYPEDEF_TO_RID_OFST 4
+#define       MC_CMD_MEMCPY_RECORD_TYPEDEF_TO_RID_LBN 32
+#define       MC_CMD_MEMCPY_RECORD_TYPEDEF_TO_RID_WIDTH 32
+#define       MC_CMD_MEMCPY_RECORD_TYPEDEF_TO_ADDR_OFST 8
+#define       MC_CMD_MEMCPY_RECORD_TYPEDEF_TO_ADDR_LEN 8
+#define       MC_CMD_MEMCPY_RECORD_TYPEDEF_TO_ADDR_LO_OFST 8
+#define       MC_CMD_MEMCPY_RECORD_TYPEDEF_TO_ADDR_HI_OFST 12
+#define       MC_CMD_MEMCPY_RECORD_TYPEDEF_TO_ADDR_LBN 64
+#define       MC_CMD_MEMCPY_RECORD_TYPEDEF_TO_ADDR_WIDTH 64
+#define       MC_CMD_MEMCPY_RECORD_TYPEDEF_FROM_RID_OFST 16
+#define          MC_CMD_MEMCPY_RECORD_TYPEDEF_RID_INLINE 0x100 /* enum */
+#define       MC_CMD_MEMCPY_RECORD_TYPEDEF_FROM_RID_LBN 128
+#define       MC_CMD_MEMCPY_RECORD_TYPEDEF_FROM_RID_WIDTH 32
+#define       MC_CMD_MEMCPY_RECORD_TYPEDEF_FROM_ADDR_OFST 20
+#define       MC_CMD_MEMCPY_RECORD_TYPEDEF_FROM_ADDR_LEN 8
+#define       MC_CMD_MEMCPY_RECORD_TYPEDEF_FROM_ADDR_LO_OFST 20
+#define       MC_CMD_MEMCPY_RECORD_TYPEDEF_FROM_ADDR_HI_OFST 24
+#define       MC_CMD_MEMCPY_RECORD_TYPEDEF_FROM_ADDR_LBN 160
+#define       MC_CMD_MEMCPY_RECORD_TYPEDEF_FROM_ADDR_WIDTH 64
+#define       MC_CMD_MEMCPY_RECORD_TYPEDEF_LENGTH_OFST 28
+#define       MC_CMD_MEMCPY_RECORD_TYPEDEF_LENGTH_LBN 224
+#define       MC_CMD_MEMCPY_RECORD_TYPEDEF_LENGTH_WIDTH 32
+
+
+/***********************************/
+/* MC_CMD_MEMCPY
+ * Perform memory copy operation.
+ */
+#define MC_CMD_MEMCPY 0x31
+
+/* MC_CMD_MEMCPY_IN msgrequest */
+#define    MC_CMD_MEMCPY_IN_LENMIN 32
+#define    MC_CMD_MEMCPY_IN_LENMAX 224
+#define    MC_CMD_MEMCPY_IN_LEN(num) (0+32*(num))
+#define       MC_CMD_MEMCPY_IN_RECORD_OFST 0
+#define       MC_CMD_MEMCPY_IN_RECORD_LEN 32
+#define       MC_CMD_MEMCPY_IN_RECORD_MINNUM 1
+#define       MC_CMD_MEMCPY_IN_RECORD_MAXNUM 7
+
+/* MC_CMD_MEMCPY_OUT msgresponse */
+#define    MC_CMD_MEMCPY_OUT_LEN 0
+
+
+/***********************************/
+/* MC_CMD_WOL_FILTER_SET
+ * Set a WoL filter.
  */
 #define MC_CMD_WOL_FILTER_SET 0x32
-#define MC_CMD_WOL_FILTER_SET_IN_LEN 192 /* 190 rounded up to a word */
-#define MC_CMD_WOL_FILTER_SET_IN_FILTER_MODE_OFST 0
-#define MC_CMD_WOL_FILTER_SET_IN_WOL_TYPE_OFST 4
-
-/* There is a union at offset 8, following defines overlap due to
- * this */
-#define MC_CMD_WOL_FILTER_SET_IN_DATA_OFST 8
-
-#define MC_CMD_WOL_FILTER_SET_IN_MAGIC_MAC_OFST         \
-        MC_CMD_WOL_FILTER_SET_IN_DATA_OFST
-
-#define MC_CMD_WOL_FILTER_SET_IN_IPV4_SYN_SRC_IP_OFST   \
-        MC_CMD_WOL_FILTER_SET_IN_DATA_OFST
-#define MC_CMD_WOL_FILTER_SET_IN_IPV4_SYN_DST_IP_OFST   \
-        (MC_CMD_WOL_FILTER_SET_IN_DATA_OFST + 4)
-#define MC_CMD_WOL_FILTER_SET_IN_IPV4_SYN_SRC_PORT_OFST \
-        (MC_CMD_WOL_FILTER_SET_IN_DATA_OFST + 8)
-#define MC_CMD_WOL_FILTER_SET_IN_IPV4_SYN_DST_PORT_OFST \
-        (MC_CMD_WOL_FILTER_SET_IN_DATA_OFST + 10)
-
-#define MC_CMD_WOL_FILTER_SET_IN_IPV6_SYN_SRC_IP_OFST   \
-        MC_CMD_WOL_FILTER_SET_IN_DATA_OFST
-#define MC_CMD_WOL_FILTER_SET_IN_IPV6_SYN_DST_IP_OFST   \
-        (MC_CMD_WOL_FILTER_SET_IN_DATA_OFST + 16)
-#define MC_CMD_WOL_FILTER_SET_IN_IPV6_SYN_SRC_PORT_OFST \
-        (MC_CMD_WOL_FILTER_SET_IN_DATA_OFST + 32)
-#define MC_CMD_WOL_FILTER_SET_IN_IPV6_SYN_DST_PORT_OFST \
-        (MC_CMD_WOL_FILTER_SET_IN_DATA_OFST + 34)
-
-#define MC_CMD_WOL_FILTER_SET_IN_BITMAP_MASK_OFST       \
-        MC_CMD_WOL_FILTER_SET_IN_DATA_OFST
-#define MC_CMD_WOL_FILTER_SET_IN_BITMAP_OFST            \
-        (MC_CMD_WOL_FILTER_SET_IN_DATA_OFST + 48)
-#define MC_CMD_WOL_FILTER_SET_IN_BITMAP_LEN_OFST        \
-        (MC_CMD_WOL_FILTER_SET_IN_DATA_OFST + 176)
-#define MC_CMD_WOL_FILTER_SET_IN_BITMAP_LAYER3_OFST     \
-        (MC_CMD_WOL_FILTER_SET_IN_DATA_OFST + 177)
-#define MC_CMD_WOL_FILTER_SET_IN_BITMAP_LAYER4_OFST     \
-        (MC_CMD_WOL_FILTER_SET_IN_DATA_OFST + 178)
-
-#define MC_CMD_WOL_FILTER_SET_IN_LINK_MASK_OFST \
-        MC_CMD_WOL_FILTER_SET_IN_DATA_OFST
-#define MC_CMD_WOL_FILTER_SET_IN_LINK_UP_LBN    0
-#define MC_CMD_WOL_FILTER_SET_IN_LINK_UP_WIDTH  1
-#define MC_CMD_WOL_FILTER_SET_IN_LINK_DOWN_LBN  1
-#define MC_CMD_WOL_FILTER_SET_IN_LINK_DOWN_WIDTH 1
-
-#define MC_CMD_WOL_FILTER_SET_OUT_LEN 4
-#define MC_CMD_WOL_FILTER_SET_OUT_FILTER_ID_OFST 0
-
-/* WOL Filter types enumeration */
-#define MC_CMD_WOL_TYPE_MAGIC      0x0
-                         /* unused 0x1 */
-#define MC_CMD_WOL_TYPE_WIN_MAGIC  0x2
-#define MC_CMD_WOL_TYPE_IPV4_SYN   0x3
-#define MC_CMD_WOL_TYPE_IPV6_SYN   0x4
-#define MC_CMD_WOL_TYPE_BITMAP     0x5
-#define MC_CMD_WOL_TYPE_LINK       0x6
-#define MC_CMD_WOL_TYPE_MAX        0x7
-
-#define MC_CMD_FILTER_MODE_SIMPLE     0x0
-#define MC_CMD_FILTER_MODE_STRUCTURED 0xffffffff
-
-/* MC_CMD_WOL_FILTER_REMOVE:
- * Remove a WoL filter
- *
- * Locks required: None
- * Returns: 0, EINVAL, ENOSYS
+
+/* MC_CMD_WOL_FILTER_SET_IN msgrequest */
+#define    MC_CMD_WOL_FILTER_SET_IN_LEN 192
+#define       MC_CMD_WOL_FILTER_SET_IN_FILTER_MODE_OFST 0
+#define          MC_CMD_FILTER_MODE_SIMPLE    0x0 /* enum */
+#define          MC_CMD_FILTER_MODE_STRUCTURED 0xffffffff /* enum */
+#define       MC_CMD_WOL_FILTER_SET_IN_WOL_TYPE_OFST 4
+#define          MC_CMD_WOL_TYPE_MAGIC      0x0 /* enum */
+#define          MC_CMD_WOL_TYPE_WIN_MAGIC 0x2 /* enum */
+#define          MC_CMD_WOL_TYPE_IPV4_SYN   0x3 /* enum */
+#define          MC_CMD_WOL_TYPE_IPV6_SYN   0x4 /* enum */
+#define          MC_CMD_WOL_TYPE_BITMAP     0x5 /* enum */
+#define          MC_CMD_WOL_TYPE_LINK       0x6 /* enum */
+#define          MC_CMD_WOL_TYPE_MAX        0x7 /* enum */
+#define       MC_CMD_WOL_FILTER_SET_IN_DATA_OFST 8
+#define       MC_CMD_WOL_FILTER_SET_IN_DATA_LEN 4
+#define       MC_CMD_WOL_FILTER_SET_IN_DATA_NUM 46
+
+/* MC_CMD_WOL_FILTER_SET_IN_MAGIC msgrequest */
+#define    MC_CMD_WOL_FILTER_SET_IN_MAGIC_LEN 16
+/*            MC_CMD_WOL_FILTER_SET_IN_FILTER_MODE_OFST 0 */
+/*            MC_CMD_WOL_FILTER_SET_IN_WOL_TYPE_OFST 4 */
+#define       MC_CMD_WOL_FILTER_SET_IN_MAGIC_MAC_OFST 8
+#define       MC_CMD_WOL_FILTER_SET_IN_MAGIC_MAC_LEN 8
+#define       MC_CMD_WOL_FILTER_SET_IN_MAGIC_MAC_LO_OFST 8
+#define       MC_CMD_WOL_FILTER_SET_IN_MAGIC_MAC_HI_OFST 12
+
+/* MC_CMD_WOL_FILTER_SET_IN_IPV4_SYN msgrequest */
+#define    MC_CMD_WOL_FILTER_SET_IN_IPV4_SYN_LEN 20
+/*            MC_CMD_WOL_FILTER_SET_IN_FILTER_MODE_OFST 0 */
+/*            MC_CMD_WOL_FILTER_SET_IN_WOL_TYPE_OFST 4 */
+#define       MC_CMD_WOL_FILTER_SET_IN_IPV4_SYN_SRC_IP_OFST 8
+#define       MC_CMD_WOL_FILTER_SET_IN_IPV4_SYN_DST_IP_OFST 12
+#define       MC_CMD_WOL_FILTER_SET_IN_IPV4_SYN_SRC_PORT_OFST 16
+#define       MC_CMD_WOL_FILTER_SET_IN_IPV4_SYN_SRC_PORT_LEN 2
+#define       MC_CMD_WOL_FILTER_SET_IN_IPV4_SYN_DST_PORT_OFST 18
+#define       MC_CMD_WOL_FILTER_SET_IN_IPV4_SYN_DST_PORT_LEN 2
+
+/* MC_CMD_WOL_FILTER_SET_IN_IPV6_SYN msgrequest */
+#define    MC_CMD_WOL_FILTER_SET_IN_IPV6_SYN_LEN 44
+/*            MC_CMD_WOL_FILTER_SET_IN_FILTER_MODE_OFST 0 */
+/*            MC_CMD_WOL_FILTER_SET_IN_WOL_TYPE_OFST 4 */
+#define       MC_CMD_WOL_FILTER_SET_IN_IPV6_SYN_SRC_IP_OFST 8
+#define       MC_CMD_WOL_FILTER_SET_IN_IPV6_SYN_SRC_IP_LEN 16
+#define       MC_CMD_WOL_FILTER_SET_IN_IPV6_SYN_DST_IP_OFST 24
+#define       MC_CMD_WOL_FILTER_SET_IN_IPV6_SYN_DST_IP_LEN 16
+#define       MC_CMD_WOL_FILTER_SET_IN_IPV6_SYN_SRC_PORT_OFST 40
+#define       MC_CMD_WOL_FILTER_SET_IN_IPV6_SYN_SRC_PORT_LEN 2
+#define       MC_CMD_WOL_FILTER_SET_IN_IPV6_SYN_DST_PORT_OFST 42
+#define       MC_CMD_WOL_FILTER_SET_IN_IPV6_SYN_DST_PORT_LEN 2
+
+/* MC_CMD_WOL_FILTER_SET_IN_BITMAP msgrequest */
+#define    MC_CMD_WOL_FILTER_SET_IN_BITMAP_LEN 187
+/*            MC_CMD_WOL_FILTER_SET_IN_FILTER_MODE_OFST 0 */
+/*            MC_CMD_WOL_FILTER_SET_IN_WOL_TYPE_OFST 4 */
+#define       MC_CMD_WOL_FILTER_SET_IN_BITMAP_MASK_OFST 8
+#define       MC_CMD_WOL_FILTER_SET_IN_BITMAP_MASK_LEN 48
+#define       MC_CMD_WOL_FILTER_SET_IN_BITMAP_BITMAP_OFST 56
+#define       MC_CMD_WOL_FILTER_SET_IN_BITMAP_BITMAP_LEN 128
+#define       MC_CMD_WOL_FILTER_SET_IN_BITMAP_LEN_OFST 184
+#define       MC_CMD_WOL_FILTER_SET_IN_BITMAP_LEN_LEN 1
+#define       MC_CMD_WOL_FILTER_SET_IN_BITMAP_LAYER3_OFST 185
+#define       MC_CMD_WOL_FILTER_SET_IN_BITMAP_LAYER3_LEN 1
+#define       MC_CMD_WOL_FILTER_SET_IN_BITMAP_LAYER4_OFST 186
+#define       MC_CMD_WOL_FILTER_SET_IN_BITMAP_LAYER4_LEN 1
+
+/* MC_CMD_WOL_FILTER_SET_IN_LINK msgrequest */
+#define    MC_CMD_WOL_FILTER_SET_IN_LINK_LEN 12
+/*            MC_CMD_WOL_FILTER_SET_IN_FILTER_MODE_OFST 0 */
+/*            MC_CMD_WOL_FILTER_SET_IN_WOL_TYPE_OFST 4 */
+#define       MC_CMD_WOL_FILTER_SET_IN_LINK_MASK_OFST 8
+#define        MC_CMD_WOL_FILTER_SET_IN_LINK_UP_LBN 0
+#define        MC_CMD_WOL_FILTER_SET_IN_LINK_UP_WIDTH 1
+#define        MC_CMD_WOL_FILTER_SET_IN_LINK_DOWN_LBN 1
+#define        MC_CMD_WOL_FILTER_SET_IN_LINK_DOWN_WIDTH 1
+
+/* MC_CMD_WOL_FILTER_SET_OUT msgresponse */
+#define    MC_CMD_WOL_FILTER_SET_OUT_LEN 4
+#define       MC_CMD_WOL_FILTER_SET_OUT_FILTER_ID_OFST 0
+
+
+/***********************************/
+/* MC_CMD_WOL_FILTER_REMOVE
+ * Remove a WoL filter.
  */
 #define MC_CMD_WOL_FILTER_REMOVE 0x33
-#define MC_CMD_WOL_FILTER_REMOVE_IN_LEN 4
-#define MC_CMD_WOL_FILTER_REMOVE_IN_FILTER_ID_OFST 0
-#define MC_CMD_WOL_FILTER_REMOVE_OUT_LEN 0
 
+/* MC_CMD_WOL_FILTER_REMOVE_IN msgrequest */
+#define    MC_CMD_WOL_FILTER_REMOVE_IN_LEN 4
+#define       MC_CMD_WOL_FILTER_REMOVE_IN_FILTER_ID_OFST 0
 
-/* MC_CMD_WOL_FILTER_RESET:
- * Reset (i.e. remove all) WoL filters
- *
- * Locks required: None
- * Returns: 0, ENOSYS
+/* MC_CMD_WOL_FILTER_REMOVE_OUT msgresponse */
+#define    MC_CMD_WOL_FILTER_REMOVE_OUT_LEN 0
+
+
+/***********************************/
+/* MC_CMD_WOL_FILTER_RESET
+ * Reset (i.e. remove all) WoL filters.
  */
 #define MC_CMD_WOL_FILTER_RESET 0x34
-#define MC_CMD_WOL_FILTER_RESET_IN_LEN 0
-#define MC_CMD_WOL_FILTER_RESET_OUT_LEN 0
 
-/* MC_CMD_SET_MCAST_HASH:
- * Set the MCASH hash value without otherwise
- * reconfiguring the MAC
+/* MC_CMD_WOL_FILTER_RESET_IN msgrequest */
+#define    MC_CMD_WOL_FILTER_RESET_IN_LEN 4
+#define       MC_CMD_WOL_FILTER_RESET_IN_MASK_OFST 0
+#define          MC_CMD_WOL_FILTER_RESET_IN_WAKE_FILTERS 0x1 /* enum */
+#define          MC_CMD_WOL_FILTER_RESET_IN_LIGHTSOUT_OFFLOADS 0x2 /* enum */
+
+/* MC_CMD_WOL_FILTER_RESET_OUT msgresponse */
+#define    MC_CMD_WOL_FILTER_RESET_OUT_LEN 0
+
+
+/***********************************/
+/* MC_CMD_SET_MCAST_HASH
+ * Set the MCASH hash value.
  */
 #define MC_CMD_SET_MCAST_HASH 0x35
-#define MC_CMD_SET_MCAST_HASH_IN_LEN 32
-#define MC_CMD_SET_MCAST_HASH_IN_HASH0_OFST 0
-#define MC_CMD_SET_MCAST_HASH_IN_HASH1_OFST 16
-#define MC_CMD_SET_MCAST_HASH_OUT_LEN 0
 
-/* MC_CMD_NVRAM_TYPES:
- * Return bitfield indicating available types of virtual NVRAM partitions
- *
- * Locks required: none
- * Returns: 0
+/* MC_CMD_SET_MCAST_HASH_IN msgrequest */
+#define    MC_CMD_SET_MCAST_HASH_IN_LEN 32
+#define       MC_CMD_SET_MCAST_HASH_IN_HASH0_OFST 0
+#define       MC_CMD_SET_MCAST_HASH_IN_HASH0_LEN 16
+#define       MC_CMD_SET_MCAST_HASH_IN_HASH1_OFST 16
+#define       MC_CMD_SET_MCAST_HASH_IN_HASH1_LEN 16
+
+/* MC_CMD_SET_MCAST_HASH_OUT msgresponse */
+#define    MC_CMD_SET_MCAST_HASH_OUT_LEN 0
+
+
+/***********************************/
+/* MC_CMD_NVRAM_TYPES
+ * Get virtual NVRAM partitions information.
  */
 #define MC_CMD_NVRAM_TYPES 0x36
-#define MC_CMD_NVRAM_TYPES_IN_LEN 0
-#define MC_CMD_NVRAM_TYPES_OUT_LEN 4
-#define MC_CMD_NVRAM_TYPES_OUT_TYPES_OFST 0
-
-/* Supported NVRAM types */
-#define MC_CMD_NVRAM_TYPE_DISABLED_CALLISTO 0
-#define MC_CMD_NVRAM_TYPE_MC_FW 1
-#define MC_CMD_NVRAM_TYPE_MC_FW_BACKUP 2
-#define MC_CMD_NVRAM_TYPE_STATIC_CFG_PORT0 3
-#define MC_CMD_NVRAM_TYPE_STATIC_CFG_PORT1 4
-#define MC_CMD_NVRAM_TYPE_DYNAMIC_CFG_PORT0 5
-#define MC_CMD_NVRAM_TYPE_DYNAMIC_CFG_PORT1 6
-#define MC_CMD_NVRAM_TYPE_EXP_ROM 7
-#define MC_CMD_NVRAM_TYPE_EXP_ROM_CFG_PORT0 8
-#define MC_CMD_NVRAM_TYPE_EXP_ROM_CFG_PORT1 9
-#define MC_CMD_NVRAM_TYPE_PHY_PORT0 10
-#define MC_CMD_NVRAM_TYPE_PHY_PORT1 11
-#define MC_CMD_NVRAM_TYPE_LOG 12
-
-/* MC_CMD_NVRAM_INFO:
- * Read info about a virtual NVRAM partition
- *
- * Locks required: none
- * Returns: 0, EINVAL (bad type)
+
+/* MC_CMD_NVRAM_TYPES_IN msgrequest */
+#define    MC_CMD_NVRAM_TYPES_IN_LEN 0
+
+/* MC_CMD_NVRAM_TYPES_OUT msgresponse */
+#define    MC_CMD_NVRAM_TYPES_OUT_LEN 4
+#define       MC_CMD_NVRAM_TYPES_OUT_TYPES_OFST 0
+#define          MC_CMD_NVRAM_TYPE_DISABLED_CALLISTO 0x0 /* enum */
+#define          MC_CMD_NVRAM_TYPE_MC_FW 0x1 /* enum */
+#define          MC_CMD_NVRAM_TYPE_MC_FW_BACKUP 0x2 /* enum */
+#define          MC_CMD_NVRAM_TYPE_STATIC_CFG_PORT0 0x3 /* enum */
+#define          MC_CMD_NVRAM_TYPE_STATIC_CFG_PORT1 0x4 /* enum */
+#define          MC_CMD_NVRAM_TYPE_DYNAMIC_CFG_PORT0 0x5 /* enum */
+#define          MC_CMD_NVRAM_TYPE_DYNAMIC_CFG_PORT1 0x6 /* enum */
+#define          MC_CMD_NVRAM_TYPE_EXP_ROM 0x7 /* enum */
+#define          MC_CMD_NVRAM_TYPE_EXP_ROM_CFG_PORT0 0x8 /* enum */
+#define          MC_CMD_NVRAM_TYPE_EXP_ROM_CFG_PORT1 0x9 /* enum */
+#define          MC_CMD_NVRAM_TYPE_PHY_PORT0 0xa /* enum */
+#define          MC_CMD_NVRAM_TYPE_PHY_PORT1 0xb /* enum */
+#define          MC_CMD_NVRAM_TYPE_LOG 0xc /* enum */
+#define          MC_CMD_NVRAM_TYPE_FPGA 0xd /* enum */
+
+
+/***********************************/
+/* MC_CMD_NVRAM_INFO
+ * Read info about a virtual NVRAM partition.
  */
 #define MC_CMD_NVRAM_INFO 0x37
-#define MC_CMD_NVRAM_INFO_IN_LEN 4
-#define MC_CMD_NVRAM_INFO_IN_TYPE_OFST 0
-#define MC_CMD_NVRAM_INFO_OUT_LEN 24
-#define MC_CMD_NVRAM_INFO_OUT_TYPE_OFST 0
-#define MC_CMD_NVRAM_INFO_OUT_SIZE_OFST 4
-#define MC_CMD_NVRAM_INFO_OUT_ERASESIZE_OFST 8
-#define MC_CMD_NVRAM_INFO_OUT_FLAGS_OFST 12
-#define   MC_CMD_NVRAM_PROTECTED_LBN 0
-#define   MC_CMD_NVRAM_PROTECTED_WIDTH 1
-#define MC_CMD_NVRAM_INFO_OUT_PHYSDEV_OFST 16
-#define MC_CMD_NVRAM_INFO_OUT_PHYSADDR_OFST 20
-
-/* MC_CMD_NVRAM_UPDATE_START:
- * Start a group of update operations on a virtual NVRAM partition
- *
- * Locks required: PHY_LOCK if type==*PHY*
- * Returns: 0, EINVAL (bad type), EACCES (if PHY_LOCK required and not held)
+
+/* MC_CMD_NVRAM_INFO_IN msgrequest */
+#define    MC_CMD_NVRAM_INFO_IN_LEN 4
+#define       MC_CMD_NVRAM_INFO_IN_TYPE_OFST 0
+/*            Enum values, see field(s): */
+/*               MC_CMD_NVRAM_TYPES/MC_CMD_NVRAM_TYPES_OUT/TYPES */
+
+/* MC_CMD_NVRAM_INFO_OUT msgresponse */
+#define    MC_CMD_NVRAM_INFO_OUT_LEN 24
+#define       MC_CMD_NVRAM_INFO_OUT_TYPE_OFST 0
+/*            Enum values, see field(s): */
+/*               MC_CMD_NVRAM_TYPES/MC_CMD_NVRAM_TYPES_OUT/TYPES */
+#define       MC_CMD_NVRAM_INFO_OUT_SIZE_OFST 4
+#define       MC_CMD_NVRAM_INFO_OUT_ERASESIZE_OFST 8
+#define       MC_CMD_NVRAM_INFO_OUT_FLAGS_OFST 12
+#define        MC_CMD_NVRAM_INFO_OUT_PROTECTED_LBN 0
+#define        MC_CMD_NVRAM_INFO_OUT_PROTECTED_WIDTH 1
+#define       MC_CMD_NVRAM_INFO_OUT_PHYSDEV_OFST 16
+#define       MC_CMD_NVRAM_INFO_OUT_PHYSADDR_OFST 20
+
+
+/***********************************/
+/* MC_CMD_NVRAM_UPDATE_START
+ * Start a group of update operations on a virtual NVRAM partition.
  */
 #define MC_CMD_NVRAM_UPDATE_START 0x38
-#define MC_CMD_NVRAM_UPDATE_START_IN_LEN 4
-#define MC_CMD_NVRAM_UPDATE_START_IN_TYPE_OFST 0
-#define MC_CMD_NVRAM_UPDATE_START_OUT_LEN 0
 
-/* MC_CMD_NVRAM_READ:
- * Read data from a virtual NVRAM partition
- *
- * Locks required: PHY_LOCK if type==*PHY*
- * Returns: 0, EINVAL (bad type/offset/length), EACCES (if PHY_LOCK required and not held)
+/* MC_CMD_NVRAM_UPDATE_START_IN msgrequest */
+#define    MC_CMD_NVRAM_UPDATE_START_IN_LEN 4
+#define       MC_CMD_NVRAM_UPDATE_START_IN_TYPE_OFST 0
+/*            Enum values, see field(s): */
+/*               MC_CMD_NVRAM_TYPES/MC_CMD_NVRAM_TYPES_OUT/TYPES */
+
+/* MC_CMD_NVRAM_UPDATE_START_OUT msgresponse */
+#define    MC_CMD_NVRAM_UPDATE_START_OUT_LEN 0
+
+
+/***********************************/
+/* MC_CMD_NVRAM_READ
+ * Read data from a virtual NVRAM partition.
  */
 #define MC_CMD_NVRAM_READ 0x39
-#define MC_CMD_NVRAM_READ_IN_LEN 12
-#define MC_CMD_NVRAM_READ_IN_TYPE_OFST 0
-#define MC_CMD_NVRAM_READ_IN_OFFSET_OFST 4
-#define MC_CMD_NVRAM_READ_IN_LENGTH_OFST 8
-#define MC_CMD_NVRAM_READ_OUT_LEN(_read_bytes) (_read_bytes)
-#define MC_CMD_NVRAM_READ_OUT_READ_BUFFER_OFST 0
-
-/* MC_CMD_NVRAM_WRITE:
- * Write data to a virtual NVRAM partition
- *
- * Locks required: PHY_LOCK if type==*PHY*
- * Returns: 0, EINVAL (bad type/offset/length), EACCES (if PHY_LOCK required and not held)
+
+/* MC_CMD_NVRAM_READ_IN msgrequest */
+#define    MC_CMD_NVRAM_READ_IN_LEN 12
+#define       MC_CMD_NVRAM_READ_IN_TYPE_OFST 0
+/*            Enum values, see field(s): */
+/*               MC_CMD_NVRAM_TYPES/MC_CMD_NVRAM_TYPES_OUT/TYPES */
+#define       MC_CMD_NVRAM_READ_IN_OFFSET_OFST 4
+#define       MC_CMD_NVRAM_READ_IN_LENGTH_OFST 8
+
+/* MC_CMD_NVRAM_READ_OUT msgresponse */
+#define    MC_CMD_NVRAM_READ_OUT_LENMIN 1
+#define    MC_CMD_NVRAM_READ_OUT_LENMAX 255
+#define    MC_CMD_NVRAM_READ_OUT_LEN(num) (0+1*(num))
+#define       MC_CMD_NVRAM_READ_OUT_READ_BUFFER_OFST 0
+#define       MC_CMD_NVRAM_READ_OUT_READ_BUFFER_LEN 1
+#define       MC_CMD_NVRAM_READ_OUT_READ_BUFFER_MINNUM 1
+#define       MC_CMD_NVRAM_READ_OUT_READ_BUFFER_MAXNUM 255
+
+
+/***********************************/
+/* MC_CMD_NVRAM_WRITE
+ * Write data to a virtual NVRAM partition.
  */
 #define MC_CMD_NVRAM_WRITE 0x3a
-#define MC_CMD_NVRAM_WRITE_IN_TYPE_OFST 0
-#define MC_CMD_NVRAM_WRITE_IN_OFFSET_OFST 4
-#define MC_CMD_NVRAM_WRITE_IN_LENGTH_OFST 8
-#define MC_CMD_NVRAM_WRITE_IN_WRITE_BUFFER_OFST 12
-#define MC_CMD_NVRAM_WRITE_IN_LEN(_write_bytes) (12 + _write_bytes)
-#define MC_CMD_NVRAM_WRITE_OUT_LEN 0
-
-/* MC_CMD_NVRAM_ERASE:
- * Erase sector(s) from a virtual NVRAM partition
- *
- * Locks required: PHY_LOCK if type==*PHY*
- * Returns: 0, EINVAL (bad type/offset/length), EACCES (if PHY_LOCK required and not held)
+
+/* MC_CMD_NVRAM_WRITE_IN msgrequest */
+#define    MC_CMD_NVRAM_WRITE_IN_LENMIN 13
+#define    MC_CMD_NVRAM_WRITE_IN_LENMAX 255
+#define    MC_CMD_NVRAM_WRITE_IN_LEN(num) (12+1*(num))
+#define       MC_CMD_NVRAM_WRITE_IN_TYPE_OFST 0
+/*            Enum values, see field(s): */
+/*               MC_CMD_NVRAM_TYPES/MC_CMD_NVRAM_TYPES_OUT/TYPES */
+#define       MC_CMD_NVRAM_WRITE_IN_OFFSET_OFST 4
+#define       MC_CMD_NVRAM_WRITE_IN_LENGTH_OFST 8
+#define       MC_CMD_NVRAM_WRITE_IN_WRITE_BUFFER_OFST 12
+#define       MC_CMD_NVRAM_WRITE_IN_WRITE_BUFFER_LEN 1
+#define       MC_CMD_NVRAM_WRITE_IN_WRITE_BUFFER_MINNUM 1
+#define       MC_CMD_NVRAM_WRITE_IN_WRITE_BUFFER_MAXNUM 243
+
+/* MC_CMD_NVRAM_WRITE_OUT msgresponse */
+#define    MC_CMD_NVRAM_WRITE_OUT_LEN 0
+
+
+/***********************************/
+/* MC_CMD_NVRAM_ERASE
+ * Erase sector(s) from a virtual NVRAM partition.
  */
 #define MC_CMD_NVRAM_ERASE 0x3b
-#define MC_CMD_NVRAM_ERASE_IN_LEN 12
-#define MC_CMD_NVRAM_ERASE_IN_TYPE_OFST 0
-#define MC_CMD_NVRAM_ERASE_IN_OFFSET_OFST 4
-#define MC_CMD_NVRAM_ERASE_IN_LENGTH_OFST 8
-#define MC_CMD_NVRAM_ERASE_OUT_LEN 0
-
-/* MC_CMD_NVRAM_UPDATE_FINISH:
- * Finish a group of update operations on a virtual NVRAM partition
- *
- * Locks required: PHY_LOCK if type==*PHY*
- * Returns: 0, EINVAL (bad type/offset/length), EACCES (if PHY_LOCK required and not held)
+
+/* MC_CMD_NVRAM_ERASE_IN msgrequest */
+#define    MC_CMD_NVRAM_ERASE_IN_LEN 12
+#define       MC_CMD_NVRAM_ERASE_IN_TYPE_OFST 0
+/*            Enum values, see field(s): */
+/*               MC_CMD_NVRAM_TYPES/MC_CMD_NVRAM_TYPES_OUT/TYPES */
+#define       MC_CMD_NVRAM_ERASE_IN_OFFSET_OFST 4
+#define       MC_CMD_NVRAM_ERASE_IN_LENGTH_OFST 8
+
+/* MC_CMD_NVRAM_ERASE_OUT msgresponse */
+#define    MC_CMD_NVRAM_ERASE_OUT_LEN 0
+
+
+/***********************************/
+/* MC_CMD_NVRAM_UPDATE_FINISH
+ * Finish a group of update operations on a virtual NVRAM partition.
  */
 #define MC_CMD_NVRAM_UPDATE_FINISH 0x3c
-#define MC_CMD_NVRAM_UPDATE_FINISH_IN_LEN 8
-#define MC_CMD_NVRAM_UPDATE_FINISH_IN_TYPE_OFST 0
-#define MC_CMD_NVRAM_UPDATE_FINISH_IN_REBOOT_OFST 4
-#define MC_CMD_NVRAM_UPDATE_FINISH_OUT_LEN 0
 
-/* MC_CMD_REBOOT:
+/* MC_CMD_NVRAM_UPDATE_FINISH_IN msgrequest */
+#define    MC_CMD_NVRAM_UPDATE_FINISH_IN_LEN 8
+#define       MC_CMD_NVRAM_UPDATE_FINISH_IN_TYPE_OFST 0
+/*            Enum values, see field(s): */
+/*               MC_CMD_NVRAM_TYPES/MC_CMD_NVRAM_TYPES_OUT/TYPES */
+#define       MC_CMD_NVRAM_UPDATE_FINISH_IN_REBOOT_OFST 4
+
+/* MC_CMD_NVRAM_UPDATE_FINISH_OUT msgresponse */
+#define    MC_CMD_NVRAM_UPDATE_FINISH_OUT_LEN 0
+
+
+/***********************************/
+/* MC_CMD_REBOOT
  * Reboot the MC.
- *
- * The AFTER_ASSERTION flag is intended to be used when the driver notices
- * an assertion failure (at which point it is expected to perform a complete
- * tear down and reinitialise), to allow both ports to reset the MC once
- * in an atomic fashion.
- *
- * Production mc firmwares are generally compiled with REBOOT_ON_ASSERT=1,
- * which means that they will automatically reboot out of the assertion
- * handler, so this is in practise an optional operation. It is still
- * recommended that drivers execute this to support custom firmwares
- * with REBOOT_ON_ASSERT=0.
- *
- * Locks required: NONE
- * Returns: Nothing. You get back a response with ERR=1, DATALEN=0
  */
 #define MC_CMD_REBOOT 0x3d
-#define MC_CMD_REBOOT_IN_LEN 4
-#define MC_CMD_REBOOT_IN_FLAGS_OFST 0
-#define MC_CMD_REBOOT_FLAGS_AFTER_ASSERTION 1
-#define MC_CMD_REBOOT_OUT_LEN 0
 
-/* MC_CMD_SCHEDINFO:
- * Request scheduler info. from the MC.
- *
- * Locks required: NONE
- * Returns: An array of (timeslice,maximum overrun), one for each thread,
- * in ascending order of thread address.s
+/* MC_CMD_REBOOT_IN msgrequest */
+#define    MC_CMD_REBOOT_IN_LEN 4
+#define       MC_CMD_REBOOT_IN_FLAGS_OFST 0
+#define          MC_CMD_REBOOT_FLAGS_AFTER_ASSERTION 0x1 /* enum */
+
+/* MC_CMD_REBOOT_OUT msgresponse */
+#define    MC_CMD_REBOOT_OUT_LEN 0
+
+
+/***********************************/
+/* MC_CMD_SCHEDINFO
+ * Request scheduler info.
  */
 #define MC_CMD_SCHEDINFO 0x3e
-#define MC_CMD_SCHEDINFO_IN_LEN 0
 
+/* MC_CMD_SCHEDINFO_IN msgrequest */
+#define    MC_CMD_SCHEDINFO_IN_LEN 0
 
-/* MC_CMD_SET_REBOOT_MODE: (debug)
- * Set the mode for the next MC reboot.
- *
- * Locks required: NONE
- *
- * Sets the reboot mode to the specified value.  Returns the old mode.
+/* MC_CMD_SCHEDINFO_OUT msgresponse */
+#define    MC_CMD_SCHEDINFO_OUT_LENMIN 4
+#define    MC_CMD_SCHEDINFO_OUT_LENMAX 252
+#define    MC_CMD_SCHEDINFO_OUT_LEN(num) (0+4*(num))
+#define       MC_CMD_SCHEDINFO_OUT_DATA_OFST 0
+#define       MC_CMD_SCHEDINFO_OUT_DATA_LEN 4
+#define       MC_CMD_SCHEDINFO_OUT_DATA_MINNUM 1
+#define       MC_CMD_SCHEDINFO_OUT_DATA_MAXNUM 63
+
+
+/***********************************/
+/* MC_CMD_REBOOT_MODE
  */
 #define MC_CMD_REBOOT_MODE 0x3f
-#define MC_CMD_REBOOT_MODE_IN_LEN 4
-#define MC_CMD_REBOOT_MODE_IN_VALUE_OFST 0
-#define MC_CMD_REBOOT_MODE_OUT_LEN 4
-#define MC_CMD_REBOOT_MODE_OUT_VALUE_OFST 0
-#define   MC_CMD_REBOOT_MODE_NORMAL 0
-#define   MC_CMD_REBOOT_MODE_SNAPPER 3
-
-/* MC_CMD_DEBUG_LOG:
- * Null request/response command (debug)
- * - sequence number is always zero
- * - only supported on the UART interface
- * (the same set of bytes is delivered as an
- * event over PCI)
- */
-#define MC_CMD_DEBUG_LOG 0x40
-#define MC_CMD_DEBUG_LOG_IN_LEN 0
-#define MC_CMD_DEBUG_LOG_OUT_LEN 0
-
-/* Generic sensor enumeration. Note that a dual port NIC
- * will EITHER expose PHY_COMMON_TEMP OR PHY0_TEMP and
- * PHY1_TEMP depending on whether there is a single sensor
- * in the vicinity of the two port, or one per port.
- */
-#define MC_CMD_SENSOR_CONTROLLER_TEMP 0         /* degC */
-#define MC_CMD_SENSOR_PHY_COMMON_TEMP 1         /* degC */
-#define MC_CMD_SENSOR_CONTROLLER_COOLING 2      /* bool */
-#define MC_CMD_SENSOR_PHY0_TEMP 3               /* degC */
-#define MC_CMD_SENSOR_PHY0_COOLING 4            /* bool */
-#define MC_CMD_SENSOR_PHY1_TEMP 5               /* degC */
-#define MC_CMD_SENSOR_PHY1_COOLING 6            /* bool */
-#define MC_CMD_SENSOR_IN_1V0 7                  /* mV */
-#define MC_CMD_SENSOR_IN_1V2 8                  /* mV */
-#define MC_CMD_SENSOR_IN_1V8 9                  /* mV */
-#define MC_CMD_SENSOR_IN_2V5 10                 /* mV */
-#define MC_CMD_SENSOR_IN_3V3 11                 /* mV */
-#define MC_CMD_SENSOR_IN_12V0 12                /* mV */
-
-
-/* Sensor state */
-#define MC_CMD_SENSOR_STATE_OK 0
-#define MC_CMD_SENSOR_STATE_WARNING 1
-#define MC_CMD_SENSOR_STATE_FATAL 2
-#define MC_CMD_SENSOR_STATE_BROKEN 3
-
-/* MC_CMD_SENSOR_INFO:
+
+/* MC_CMD_REBOOT_MODE_IN msgrequest */
+#define    MC_CMD_REBOOT_MODE_IN_LEN 4
+#define       MC_CMD_REBOOT_MODE_IN_VALUE_OFST 0
+#define          MC_CMD_REBOOT_MODE_NORMAL 0x0 /* enum */
+#define          MC_CMD_REBOOT_MODE_SNAPPER 0x3 /* enum */
+
+/* MC_CMD_REBOOT_MODE_OUT msgresponse */
+#define    MC_CMD_REBOOT_MODE_OUT_LEN 4
+#define       MC_CMD_REBOOT_MODE_OUT_VALUE_OFST 0
+
+
+/***********************************/
+/* MC_CMD_SENSOR_INFO
  * Returns information about every available sensor.
- *
- * Each sensor has a single (16bit) value, and a corresponding state.
- * The mapping between value and sensor is nominally determined by the
- * MC, but in practise is implemented as zero (BROKEN), one (TEMPERATURE),
- * or two (VOLTAGE) ranges per sensor per state.
- *
- * This call returns a mask (32bit) of the sensors that are supported
- * by this platform, then an array (indexed by MC_CMD_SENSOR) of byte
- * offsets to the per-sensor arrays. Each sensor array has four 16bit
- * numbers, min1, max1, min2, max2.
- *
- * Locks required: None
- * Returns: 0
  */
 #define MC_CMD_SENSOR_INFO 0x41
-#define MC_CMD_SENSOR_INFO_IN_LEN 0
-#define MC_CMD_SENSOR_INFO_OUT_MASK_OFST 0
-#define MC_CMD_SENSOR_INFO_OUT_OFFSET_OFST(_x) \
-        (4 + (_x))
-#define MC_CMD_SENSOR_INFO_OUT_MIN1_OFST(_ofst) \
-        ((_ofst) + 0)
-#define MC_CMD_SENSOR_INFO_OUT_MAX1_OFST(_ofst) \
-        ((_ofst) + 2)
-#define MC_CMD_SENSOR_INFO_OUT_MIN2_OFST(_ofst) \
-        ((_ofst) + 4)
-#define MC_CMD_SENSOR_INFO_OUT_MAX2_OFST(_ofst) \
-        ((_ofst) + 6)
 
+/* MC_CMD_SENSOR_INFO_IN msgrequest */
+#define    MC_CMD_SENSOR_INFO_IN_LEN 0
+
+/* MC_CMD_SENSOR_INFO_OUT msgresponse */
+#define    MC_CMD_SENSOR_INFO_OUT_LENMIN 12
+#define    MC_CMD_SENSOR_INFO_OUT_LENMAX 252
+#define    MC_CMD_SENSOR_INFO_OUT_LEN(num) (4+8*(num))
+#define       MC_CMD_SENSOR_INFO_OUT_MASK_OFST 0
+#define          MC_CMD_SENSOR_CONTROLLER_TEMP  0x0 /* enum */
+#define          MC_CMD_SENSOR_PHY_COMMON_TEMP  0x1 /* enum */
+#define          MC_CMD_SENSOR_CONTROLLER_COOLING  0x2 /* enum */
+#define          MC_CMD_SENSOR_PHY0_TEMP  0x3 /* enum */
+#define          MC_CMD_SENSOR_PHY0_COOLING  0x4 /* enum */
+#define          MC_CMD_SENSOR_PHY1_TEMP  0x5 /* enum */
+#define          MC_CMD_SENSOR_PHY1_COOLING  0x6 /* enum */
+#define          MC_CMD_SENSOR_IN_1V0  0x7 /* enum */
+#define          MC_CMD_SENSOR_IN_1V2  0x8 /* enum */
+#define          MC_CMD_SENSOR_IN_1V8  0x9 /* enum */
+#define          MC_CMD_SENSOR_IN_2V5  0xa /* enum */
+#define          MC_CMD_SENSOR_IN_3V3  0xb /* enum */
+#define          MC_CMD_SENSOR_IN_12V0  0xc /* enum */
+#define          MC_CMD_SENSOR_IN_1V2A  0xd /* enum */
+#define          MC_CMD_SENSOR_IN_VREF  0xe /* enum */
+#define       MC_CMD_SENSOR_ENTRY_OFST 4
+#define       MC_CMD_SENSOR_ENTRY_LEN 8
+#define       MC_CMD_SENSOR_ENTRY_LO_OFST 4
+#define       MC_CMD_SENSOR_ENTRY_HI_OFST 8
+#define       MC_CMD_SENSOR_ENTRY_MINNUM 1
+#define       MC_CMD_SENSOR_ENTRY_MAXNUM 31
+
+/* MC_CMD_SENSOR_INFO_ENTRY_TYPEDEF structuredef */
+#define    MC_CMD_SENSOR_INFO_ENTRY_TYPEDEF_LEN 8
+#define       MC_CMD_SENSOR_INFO_ENTRY_TYPEDEF_MIN1_OFST 0
+#define       MC_CMD_SENSOR_INFO_ENTRY_TYPEDEF_MIN1_LEN 2
+#define       MC_CMD_SENSOR_INFO_ENTRY_TYPEDEF_MIN1_LBN 0
+#define       MC_CMD_SENSOR_INFO_ENTRY_TYPEDEF_MIN1_WIDTH 16
+#define       MC_CMD_SENSOR_INFO_ENTRY_TYPEDEF_MAX1_OFST 2
+#define       MC_CMD_SENSOR_INFO_ENTRY_TYPEDEF_MAX1_LEN 2
+#define       MC_CMD_SENSOR_INFO_ENTRY_TYPEDEF_MAX1_LBN 16
+#define       MC_CMD_SENSOR_INFO_ENTRY_TYPEDEF_MAX1_WIDTH 16
+#define       MC_CMD_SENSOR_INFO_ENTRY_TYPEDEF_MIN2_OFST 4
+#define       MC_CMD_SENSOR_INFO_ENTRY_TYPEDEF_MIN2_LEN 2
+#define       MC_CMD_SENSOR_INFO_ENTRY_TYPEDEF_MIN2_LBN 32
+#define       MC_CMD_SENSOR_INFO_ENTRY_TYPEDEF_MIN2_WIDTH 16
+#define       MC_CMD_SENSOR_INFO_ENTRY_TYPEDEF_MAX2_OFST 6
+#define       MC_CMD_SENSOR_INFO_ENTRY_TYPEDEF_MAX2_LEN 2
+#define       MC_CMD_SENSOR_INFO_ENTRY_TYPEDEF_MAX2_LBN 48
+#define       MC_CMD_SENSOR_INFO_ENTRY_TYPEDEF_MAX2_WIDTH 16
+
+
+/***********************************/
 /* MC_CMD_READ_SENSORS
- * Returns the current reading from each sensor
- *
- * Returns a sparse array of sensor readings (indexed by the sensor
- * type) into host memory.  Each array element is a dword.
- *
- * The MC will send a SENSOREVT event every time any sensor changes state. The
- * driver is responsible for ensuring that it doesn't miss any events. The board
- * will function normally if all sensors are in STATE_OK or state_WARNING.
- * Otherwise the board should not be expected to function.
+ * Returns the current reading from each sensor.
  */
 #define MC_CMD_READ_SENSORS 0x42
-#define MC_CMD_READ_SENSORS_IN_LEN 8
-#define MC_CMD_READ_SENSORS_IN_DMA_ADDR_LO_OFST 0
-#define MC_CMD_READ_SENSORS_IN_DMA_ADDR_HI_OFST 4
-#define MC_CMD_READ_SENSORS_OUT_LEN 0
 
-/* Sensor reading fields */
-#define MC_CMD_READ_SENSOR_VALUE_LBN 0
-#define MC_CMD_READ_SENSOR_VALUE_WIDTH 16
-#define MC_CMD_READ_SENSOR_STATE_LBN 16
-#define MC_CMD_READ_SENSOR_STATE_WIDTH 8
-
-
-/* MC_CMD_GET_PHY_STATE:
- * Report current state of PHY.  A "zombie" PHY is a PHY that has failed to
- * boot (e.g. due to missing or corrupted firmware).
- *
- * Locks required: None
- * Return code: 0
+/* MC_CMD_READ_SENSORS_IN msgrequest */
+#define    MC_CMD_READ_SENSORS_IN_LEN 8
+#define       MC_CMD_READ_SENSORS_IN_DMA_ADDR_OFST 0
+#define       MC_CMD_READ_SENSORS_IN_DMA_ADDR_LEN 8
+#define       MC_CMD_READ_SENSORS_IN_DMA_ADDR_LO_OFST 0
+#define       MC_CMD_READ_SENSORS_IN_DMA_ADDR_HI_OFST 4
+
+/* MC_CMD_READ_SENSORS_OUT msgresponse */
+#define    MC_CMD_READ_SENSORS_OUT_LEN 0
+
+/* MC_CMD_SENSOR_VALUE_ENTRY_TYPEDEF structuredef */
+#define    MC_CMD_SENSOR_VALUE_ENTRY_TYPEDEF_LEN 3
+#define       MC_CMD_SENSOR_VALUE_ENTRY_TYPEDEF_VALUE_OFST 0
+#define       MC_CMD_SENSOR_VALUE_ENTRY_TYPEDEF_VALUE_LEN 2
+#define       MC_CMD_SENSOR_VALUE_ENTRY_TYPEDEF_VALUE_LBN 0
+#define       MC_CMD_SENSOR_VALUE_ENTRY_TYPEDEF_VALUE_WIDTH 16
+#define       MC_CMD_SENSOR_VALUE_ENTRY_TYPEDEF_STATE_OFST 2
+#define       MC_CMD_SENSOR_VALUE_ENTRY_TYPEDEF_STATE_LEN 1
+#define          MC_CMD_SENSOR_STATE_OK  0x0 /* enum */
+#define          MC_CMD_SENSOR_STATE_WARNING  0x1 /* enum */
+#define          MC_CMD_SENSOR_STATE_FATAL  0x2 /* enum */
+#define          MC_CMD_SENSOR_STATE_BROKEN  0x3 /* enum */
+#define       MC_CMD_SENSOR_VALUE_ENTRY_TYPEDEF_STATE_LBN 16
+#define       MC_CMD_SENSOR_VALUE_ENTRY_TYPEDEF_STATE_WIDTH 8
+
+
+/***********************************/
+/* MC_CMD_GET_PHY_STATE
+ * Report current state of PHY.
  */
 #define MC_CMD_GET_PHY_STATE 0x43
 
-#define MC_CMD_GET_PHY_STATE_IN_LEN 0
-#define MC_CMD_GET_PHY_STATE_OUT_LEN 4
-#define MC_CMD_GET_PHY_STATE_STATE_OFST 0
-/* PHY state enumeration: */
-#define MC_CMD_PHY_STATE_OK 1
-#define MC_CMD_PHY_STATE_ZOMBIE 2
+/* MC_CMD_GET_PHY_STATE_IN msgrequest */
+#define    MC_CMD_GET_PHY_STATE_IN_LEN 0
 
+/* MC_CMD_GET_PHY_STATE_OUT msgresponse */
+#define    MC_CMD_GET_PHY_STATE_OUT_LEN 4
+#define       MC_CMD_GET_PHY_STATE_OUT_STATE_OFST 0
+#define          MC_CMD_PHY_STATE_OK 0x1 /* enum */
+#define          MC_CMD_PHY_STATE_ZOMBIE 0x2 /* enum */
 
-/* 802.1Qbb control. 8 Tx queues that map to priorities 0 - 7. Use all 1s to
- * disable 802.Qbb for a given priority. */
+
+/***********************************/
+/* MC_CMD_SETUP_8021QBB
+ * 802.1Qbb control.
+ */
 #define MC_CMD_SETUP_8021QBB 0x44
-#define MC_CMD_SETUP_8021QBB_IN_LEN 32
-#define MC_CMD_SETUP_8021QBB_OUT_LEN 0
-#define MC_CMD_SETUP_8021QBB_IN_TXQS_OFFST 0
 
+/* MC_CMD_SETUP_8021QBB_IN msgrequest */
+#define    MC_CMD_SETUP_8021QBB_IN_LEN 32
+#define       MC_CMD_SETUP_8021QBB_IN_TXQS_OFST 0
+#define       MC_CMD_SETUP_8021QBB_IN_TXQS_LEN 32
 
-/* MC_CMD_WOL_FILTER_GET:
- * Retrieve ID of any WoL filters
- *
- * Locks required: None
- * Returns: 0, ENOSYS
- */
-#define MC_CMD_WOL_FILTER_GET 0x45
-#define MC_CMD_WOL_FILTER_GET_IN_LEN 0
-#define MC_CMD_WOL_FILTER_GET_OUT_LEN 4
-#define MC_CMD_WOL_FILTER_GET_OUT_FILTER_ID_OFST 0
+/* MC_CMD_SETUP_8021QBB_OUT msgresponse */
+#define    MC_CMD_SETUP_8021QBB_OUT_LEN 0
 
 
-/* MC_CMD_ADD_LIGHTSOUT_OFFLOAD:
- * Offload a protocol to NIC for lights-out state
- *
- * Locks required: None
- * Returns: 0, ENOSYS
+/***********************************/
+/* MC_CMD_WOL_FILTER_GET
+ * Retrieve ID of any WoL filters.
  */
-#define MC_CMD_ADD_LIGHTSOUT_OFFLOAD 0x46
+#define MC_CMD_WOL_FILTER_GET 0x45
 
-#define MC_CMD_ADD_LIGHTSOUT_OFFLOAD_IN_LEN 16
-#define MC_CMD_ADD_LIGHTSOUT_OFFLOAD_IN_PROTOCOL_OFST 0
+/* MC_CMD_WOL_FILTER_GET_IN msgrequest */
+#define    MC_CMD_WOL_FILTER_GET_IN_LEN 0
 
-/* There is a union at offset 4, following defines overlap due to
- * this */
-#define MC_CMD_ADD_LIGHTSOUT_OFFLOAD_IN_DATA_OFST 4
-#define MC_CMD_ADD_LIGHTSOUT_OFFLOAD_IN_ARPMAC_OFST 4
-#define MC_CMD_ADD_LIGHTSOUT_OFFLOAD_IN_ARPIP_OFST 10
-#define MC_CMD_ADD_LIGHTSOUT_OFFLOAD_IN_NSMAC_OFST 4
-#define MC_CMD_ADD_LIGHTSOUT_OFFLOAD_IN_NSSNIPV6_OFST 10
-#define MC_CMD_ADD_LIGHTSOUT_OFFLOAD_IN_NSIPV6_OFST 26
+/* MC_CMD_WOL_FILTER_GET_OUT msgresponse */
+#define    MC_CMD_WOL_FILTER_GET_OUT_LEN 4
+#define       MC_CMD_WOL_FILTER_GET_OUT_FILTER_ID_OFST 0
 
-#define MC_CMD_ADD_LIGHTSOUT_OFFLOAD_OUT_LEN 4
-#define MC_CMD_ADD_LIGHTSOUT_OFFLOAD_OUT_FILTER_ID_OFST 0
 
+/***********************************/
+/* MC_CMD_ADD_LIGHTSOUT_OFFLOAD
+ * Add a protocol offload to NIC for lights-out state.
+ */
+#define MC_CMD_ADD_LIGHTSOUT_OFFLOAD 0x46
 
-/* MC_CMD_REMOVE_LIGHTSOUT_PROTOCOL_OFFLOAD:
- * Offload a protocol to NIC for lights-out state
- *
- * Locks required: None
- * Returns: 0, ENOSYS
+/* MC_CMD_ADD_LIGHTSOUT_OFFLOAD_IN msgrequest */
+#define    MC_CMD_ADD_LIGHTSOUT_OFFLOAD_IN_LENMIN 8
+#define    MC_CMD_ADD_LIGHTSOUT_OFFLOAD_IN_LENMAX 252
+#define    MC_CMD_ADD_LIGHTSOUT_OFFLOAD_IN_LEN(num) (4+4*(num))
+#define       MC_CMD_ADD_LIGHTSOUT_OFFLOAD_IN_PROTOCOL_OFST 0
+#define          MC_CMD_LIGHTSOUT_OFFLOAD_PROTOCOL_ARP 0x1 /* enum */
+#define          MC_CMD_LIGHTSOUT_OFFLOAD_PROTOCOL_NS  0x2 /* enum */
+#define       MC_CMD_ADD_LIGHTSOUT_OFFLOAD_IN_DATA_OFST 4
+#define       MC_CMD_ADD_LIGHTSOUT_OFFLOAD_IN_DATA_LEN 4
+#define       MC_CMD_ADD_LIGHTSOUT_OFFLOAD_IN_DATA_MINNUM 1
+#define       MC_CMD_ADD_LIGHTSOUT_OFFLOAD_IN_DATA_MAXNUM 62
+
+/* MC_CMD_ADD_LIGHTSOUT_OFFLOAD_IN_ARP msgrequest */
+#define    MC_CMD_ADD_LIGHTSOUT_OFFLOAD_IN_ARP_LEN 14
+/*            MC_CMD_ADD_LIGHTSOUT_OFFLOAD_IN_PROTOCOL_OFST 0 */
+#define       MC_CMD_ADD_LIGHTSOUT_OFFLOAD_IN_ARP_MAC_OFST 4
+#define       MC_CMD_ADD_LIGHTSOUT_OFFLOAD_IN_ARP_MAC_LEN 6
+#define       MC_CMD_ADD_LIGHTSOUT_OFFLOAD_IN_ARP_IP_OFST 10
+
+/* MC_CMD_ADD_LIGHTSOUT_OFFLOAD_IN_NS msgrequest */
+#define    MC_CMD_ADD_LIGHTSOUT_OFFLOAD_IN_NS_LEN 42
+/*            MC_CMD_ADD_LIGHTSOUT_OFFLOAD_IN_PROTOCOL_OFST 0 */
+#define       MC_CMD_ADD_LIGHTSOUT_OFFLOAD_IN_NS_MAC_OFST 4
+#define       MC_CMD_ADD_LIGHTSOUT_OFFLOAD_IN_NS_MAC_LEN 6
+#define       MC_CMD_ADD_LIGHTSOUT_OFFLOAD_IN_NS_SNIPV6_OFST 10
+#define       MC_CMD_ADD_LIGHTSOUT_OFFLOAD_IN_NS_SNIPV6_LEN 16
+#define       MC_CMD_ADD_LIGHTSOUT_OFFLOAD_IN_NS_IPV6_OFST 26
+#define       MC_CMD_ADD_LIGHTSOUT_OFFLOAD_IN_NS_IPV6_LEN 16
+
+/* MC_CMD_ADD_LIGHTSOUT_OFFLOAD_OUT msgresponse */
+#define    MC_CMD_ADD_LIGHTSOUT_OFFLOAD_OUT_LEN 4
+#define       MC_CMD_ADD_LIGHTSOUT_OFFLOAD_OUT_FILTER_ID_OFST 0
+
+
+/***********************************/
+/* MC_CMD_REMOVE_LIGHTSOUT_OFFLOAD
+ * Remove a protocol offload from NIC for lights-out state.
  */
 #define MC_CMD_REMOVE_LIGHTSOUT_OFFLOAD 0x47
-#define MC_CMD_REMOVE_LIGHTSOUT_OFFLOAD_IN_LEN 8
-#define MC_CMD_REMOVE_LIGHTSOUT_OFFLOAD_OUT_LEN 0
 
-#define MC_CMD_REMOVE_LIGHTSOUT_OFFLOAD_IN_PROTOCOL_OFST 0
-#define MC_CMD_REMOVE_LIGHTSOUT_OFFLOAD_IN_FILTER_ID_OFST 4
+/* MC_CMD_REMOVE_LIGHTSOUT_OFFLOAD_IN msgrequest */
+#define    MC_CMD_REMOVE_LIGHTSOUT_OFFLOAD_IN_LEN 8
+#define       MC_CMD_REMOVE_LIGHTSOUT_OFFLOAD_IN_PROTOCOL_OFST 0
+#define       MC_CMD_REMOVE_LIGHTSOUT_OFFLOAD_IN_FILTER_ID_OFST 4
 
-/* Lights-out offload protocols enumeration */
-#define MC_CMD_LIGHTSOUT_OFFLOAD_PROTOCOL_ARP 0x1
-#define MC_CMD_LIGHTSOUT_OFFLOAD_PROTOCOL_NS  0x2
+/* MC_CMD_REMOVE_LIGHTSOUT_OFFLOAD_OUT msgresponse */
+#define    MC_CMD_REMOVE_LIGHTSOUT_OFFLOAD_OUT_LEN 0
 
 
-/* MC_CMD_MAC_RESET_RESTORE:
- * Restore MAC after block reset
- *
- * Locks required: None
- * Returns: 0
+/***********************************/
+/* MC_CMD_MAC_RESET_RESTORE
+ * Restore MAC after block reset.
  */
-
 #define MC_CMD_MAC_RESET_RESTORE 0x48
-#define MC_CMD_MAC_RESET_RESTORE_IN_LEN 0
-#define MC_CMD_MAC_RESET_RESTORE_OUT_LEN 0
 
+/* MC_CMD_MAC_RESET_RESTORE_IN msgrequest */
+#define    MC_CMD_MAC_RESET_RESTORE_IN_LEN 0
+
+/* MC_CMD_MAC_RESET_RESTORE_OUT msgresponse */
+#define    MC_CMD_MAC_RESET_RESTORE_OUT_LEN 0
 
-/* MC_CMD_TEST_ASSERT:
- * Deliberately trigger an assert-detonation in the firmware for testing
- * purposes (i.e. to allow tests that the driver copes gracefully).
- *
- * Locks required: None
- * Returns: 0
- */
 
+/***********************************/
+/* MC_CMD_TESTASSERT
+ */
 #define MC_CMD_TESTASSERT 0x49
-#define MC_CMD_TESTASSERT_IN_LEN 0
-#define MC_CMD_TESTASSERT_OUT_LEN 0
 
-/* MC_CMD_WORKAROUND 0x4a
- *
- * Enable/Disable a given workaround. The mcfw will return EINVAL if it
- * doesn't understand the given workaround number - which should not
- * be treated as a hard error by client code.
- *
- * This op does not imply any semantics about each workaround, that's between
- * the driver and the mcfw on a per-workaround basis.
- *
- * Locks required: None
- * Returns: 0, EINVAL
+/* MC_CMD_TESTASSERT_IN msgrequest */
+#define    MC_CMD_TESTASSERT_IN_LEN 0
+
+/* MC_CMD_TESTASSERT_OUT msgresponse */
+#define    MC_CMD_TESTASSERT_OUT_LEN 0
+
+
+/***********************************/
+/* MC_CMD_WORKAROUND
+ * Enable/Disable a given workaround.
  */
 #define MC_CMD_WORKAROUND 0x4a
-#define MC_CMD_WORKAROUND_IN_LEN 8
-#define MC_CMD_WORKAROUND_IN_TYPE_OFST 0
-#define MC_CMD_WORKAROUND_BUG17230 1
-#define MC_CMD_WORKAROUND_IN_ENABLED_OFST 4
-#define MC_CMD_WORKAROUND_OUT_LEN 0
-
-/* MC_CMD_GET_PHY_MEDIA_INFO:
- * Read media-specific data from PHY (e.g. SFP/SFP+ module ID information for
- * SFP+ PHYs).
- *
- * The "media type" can be found via GET_PHY_CFG (GET_PHY_CFG_OUT_MEDIA_TYPE);
- * the valid "page number" input values, and the output data, are interpreted
- * on a per-type basis.
- *
- * For SFP+: PAGE=0 or 1 returns a 128-byte block read from module I2C address
- *           0xA0 offset 0 or 0x80.
- * Anything else: currently undefined.
- *
- * Locks required: None
- * Return code: 0
+
+/* MC_CMD_WORKAROUND_IN msgrequest */
+#define    MC_CMD_WORKAROUND_IN_LEN 8
+#define       MC_CMD_WORKAROUND_IN_TYPE_OFST 0
+#define          MC_CMD_WORKAROUND_BUG17230 0x1 /* enum */
+#define       MC_CMD_WORKAROUND_IN_ENABLED_OFST 4
+
+/* MC_CMD_WORKAROUND_OUT msgresponse */
+#define    MC_CMD_WORKAROUND_OUT_LEN 0
+
+
+/***********************************/
+/* MC_CMD_GET_PHY_MEDIA_INFO
+ * Read media-specific data from PHY.
  */
 #define MC_CMD_GET_PHY_MEDIA_INFO 0x4b
-#define MC_CMD_GET_PHY_MEDIA_INFO_IN_LEN 4
-#define MC_CMD_GET_PHY_MEDIA_INFO_IN_PAGE_OFST 0
-#define MC_CMD_GET_PHY_MEDIA_INFO_OUT_LEN(_num_bytes) (4 + (_num_bytes))
-#define MC_CMD_GET_PHY_MEDIA_INFO_OUT_DATALEN_OFST 0
-#define MC_CMD_GET_PHY_MEDIA_INFO_OUT_DATA_OFST 4
-
-/* MC_CMD_NVRAM_TEST:
- * Test a particular NVRAM partition for valid contents (where "valid"
- * depends on the type of partition).
- *
- * Locks required: None
- * Return code: 0
+
+/* MC_CMD_GET_PHY_MEDIA_INFO_IN msgrequest */
+#define    MC_CMD_GET_PHY_MEDIA_INFO_IN_LEN 4
+#define       MC_CMD_GET_PHY_MEDIA_INFO_IN_PAGE_OFST 0
+
+/* MC_CMD_GET_PHY_MEDIA_INFO_OUT msgresponse */
+#define    MC_CMD_GET_PHY_MEDIA_INFO_OUT_LENMIN 5
+#define    MC_CMD_GET_PHY_MEDIA_INFO_OUT_LENMAX 255
+#define    MC_CMD_GET_PHY_MEDIA_INFO_OUT_LEN(num) (4+1*(num))
+#define       MC_CMD_GET_PHY_MEDIA_INFO_OUT_DATALEN_OFST 0
+#define       MC_CMD_GET_PHY_MEDIA_INFO_OUT_DATA_OFST 4
+#define       MC_CMD_GET_PHY_MEDIA_INFO_OUT_DATA_LEN 1
+#define       MC_CMD_GET_PHY_MEDIA_INFO_OUT_DATA_MINNUM 1
+#define       MC_CMD_GET_PHY_MEDIA_INFO_OUT_DATA_MAXNUM 251
+
+
+/***********************************/
+/* MC_CMD_NVRAM_TEST
+ * Test a particular NVRAM partition.
  */
 #define MC_CMD_NVRAM_TEST 0x4c
-#define MC_CMD_NVRAM_TEST_IN_LEN 4
-#define MC_CMD_NVRAM_TEST_IN_TYPE_OFST 0
-#define MC_CMD_NVRAM_TEST_OUT_LEN 4
-#define MC_CMD_NVRAM_TEST_OUT_RESULT_OFST 0
-#define MC_CMD_NVRAM_TEST_PASS 0
-#define MC_CMD_NVRAM_TEST_FAIL 1
-#define MC_CMD_NVRAM_TEST_NOTSUPP 2
-
-/* MC_CMD_MRSFP_TWEAK: (debug)
- * Read status and/or set parameters for the "mrsfp" driver in mr_rusty builds.
- * I2C I/O expander bits are always read; if equaliser parameters are supplied,
- * they are configured first.
- *
- * Locks required: None
- * Return code: 0, EINVAL
+
+/* MC_CMD_NVRAM_TEST_IN msgrequest */
+#define    MC_CMD_NVRAM_TEST_IN_LEN 4
+#define       MC_CMD_NVRAM_TEST_IN_TYPE_OFST 0
+/*            Enum values, see field(s): */
+/*               MC_CMD_NVRAM_TYPES/MC_CMD_NVRAM_TYPES_OUT/TYPES */
+
+/* MC_CMD_NVRAM_TEST_OUT msgresponse */
+#define    MC_CMD_NVRAM_TEST_OUT_LEN 4
+#define       MC_CMD_NVRAM_TEST_OUT_RESULT_OFST 0
+#define          MC_CMD_NVRAM_TEST_PASS 0x0 /* enum */
+#define          MC_CMD_NVRAM_TEST_FAIL 0x1 /* enum */
+#define          MC_CMD_NVRAM_TEST_NOTSUPP 0x2 /* enum */
+
+
+/***********************************/
+/* MC_CMD_MRSFP_TWEAK
+ * Read status and/or set parameters for the 'mrsfp' driver.
  */
 #define MC_CMD_MRSFP_TWEAK 0x4d
-#define MC_CMD_MRSFP_TWEAK_IN_LEN_READ_ONLY 0
-#define MC_CMD_MRSFP_TWEAK_IN_LEN_EQ_CONFIG 16
-#define MC_CMD_MRSFP_TWEAK_IN_TXEQ_LEVEL_OFST 0    /* 0-6 low->high de-emph. */
-#define MC_CMD_MRSFP_TWEAK_IN_TXEQ_DT_CFG_OFST 4   /* 0-8 low->high ref.V */
-#define MC_CMD_MRSFP_TWEAK_IN_RXEQ_BOOST_OFST 8    /* 0-8 low->high boost */
-#define MC_CMD_MRSFP_TWEAK_IN_RXEQ_DT_CFG_OFST 12  /* 0-8 low->high ref.V */
-#define MC_CMD_MRSFP_TWEAK_OUT_LEN 12
-#define MC_CMD_MRSFP_TWEAK_OUT_IOEXP_INPUTS_OFST 0     /* input bits */
-#define MC_CMD_MRSFP_TWEAK_OUT_IOEXP_OUTPUTS_OFST 4    /* output bits */
-#define MC_CMD_MRSFP_TWEAK_OUT_IOEXP_DIRECTION_OFST 8  /* dirs: 0=out, 1=in */
-
-/* MC_CMD_TEST_HACK: (debug (unsurprisingly))
-  * Change bits of network port state for test purposes in ways that would never be
-  * useful in normal operation and so need a special command to change. */
-#define MC_CMD_TEST_HACK 0x2f
-#define MC_CMD_TEST_HACK_IN_LEN 8
-#define MC_CMD_TEST_HACK_IN_TXPAD_OFST 0
-#define   MC_CMD_TEST_HACK_IN_TXPAD_AUTO  0 /* Let the MC manage things */
-#define   MC_CMD_TEST_HACK_IN_TXPAD_ON    1 /* Force on */
-#define   MC_CMD_TEST_HACK_IN_TXPAD_OFF   2 /* Force on */
-#define MC_CMD_TEST_HACK_IN_IPG_OFST   4 /* Takes a value in bits */
-#define   MC_CMD_TEST_HACK_IN_IPG_AUTO    0 /* The MC picks the value */
-#define MC_CMD_TEST_HACK_OUT_LEN 0
-
-/* MC_CMD_SENSOR_SET_LIMS: (debug) (mostly) adjust the sensor limits. This
- * is a warranty-voiding operation.
-  *
- * IN: sensor identifier (one of the enumeration starting with MC_CMD_SENSOR_CONTROLLER_TEMP
- * followed by 4 32-bit values: min(warning) max(warning), min(fatal), max(fatal). Which
- * of these limits are meaningful and what their interpretation is is sensor-specific.
- *
- * OUT: nothing
- *
- * Returns: ENOENT if the sensor specified does not exist, EINVAL if the limits are
-  * out of range.
+
+/* MC_CMD_MRSFP_TWEAK_IN_EQ_CONFIG msgrequest */
+#define    MC_CMD_MRSFP_TWEAK_IN_EQ_CONFIG_LEN 16
+#define       MC_CMD_MRSFP_TWEAK_IN_EQ_CONFIG_TXEQ_LEVEL_OFST 0
+#define       MC_CMD_MRSFP_TWEAK_IN_EQ_CONFIG_TXEQ_DT_CFG_OFST 4
+#define       MC_CMD_MRSFP_TWEAK_IN_EQ_CONFIG_RXEQ_BOOST_OFST 8
+#define       MC_CMD_MRSFP_TWEAK_IN_EQ_CONFIG_RXEQ_DT_CFG_OFST 12
+
+/* MC_CMD_MRSFP_TWEAK_IN_READ_ONLY msgrequest */
+#define    MC_CMD_MRSFP_TWEAK_IN_READ_ONLY_LEN 0
+
+/* MC_CMD_MRSFP_TWEAK_OUT msgresponse */
+#define    MC_CMD_MRSFP_TWEAK_OUT_LEN 12
+#define       MC_CMD_MRSFP_TWEAK_OUT_IOEXP_INPUTS_OFST 0
+#define       MC_CMD_MRSFP_TWEAK_OUT_IOEXP_OUTPUTS_OFST 4
+#define       MC_CMD_MRSFP_TWEAK_OUT_IOEXP_DIRECTION_OFST 8
+#define          MC_CMD_MRSFP_TWEAK_OUT_IOEXP_DIRECTION_OUT 0x0 /* enum */
+#define          MC_CMD_MRSFP_TWEAK_OUT_IOEXP_DIRECTION_IN 0x1 /* enum */
+
+
+/***********************************/
+/* MC_CMD_SENSOR_SET_LIMS
+ * Adjusts the sensor limits.
  */
 #define MC_CMD_SENSOR_SET_LIMS 0x4e
-#define MC_CMD_SENSOR_SET_LIMS_IN_LEN 20
-#define MC_CMD_SENSOR_SET_LIMS_IN_SENSOR_OFST 0
-#define MC_CMD_SENSOR_SET_LIMS_IN_LOW0_OFST 4
-#define MC_CMD_SENSOR_SET_LIMS_IN_HI0_OFST  8
-#define MC_CMD_SENSOR_SET_LIMS_IN_LOW1_OFST 12
-#define MC_CMD_SENSOR_SET_LIMS_IN_HI1_OFST  16
-
-/* Do NOT add new commands beyond 0x4f as part of 3.0 : 0x50 - 0x7f will be
- * used for post-3.0 extensions. If you run out of space, look for gaps or
- * commands that are unused in the existing range. */
+
+/* MC_CMD_SENSOR_SET_LIMS_IN msgrequest */
+#define    MC_CMD_SENSOR_SET_LIMS_IN_LEN 20
+#define       MC_CMD_SENSOR_SET_LIMS_IN_SENSOR_OFST 0
+/*            Enum values, see field(s): */
+/*               MC_CMD_SENSOR_INFO/MC_CMD_SENSOR_INFO_OUT/MASK */
+#define       MC_CMD_SENSOR_SET_LIMS_IN_LOW0_OFST 4
+#define       MC_CMD_SENSOR_SET_LIMS_IN_HI0_OFST 8
+#define       MC_CMD_SENSOR_SET_LIMS_IN_LOW1_OFST 12
+#define       MC_CMD_SENSOR_SET_LIMS_IN_HI1_OFST 16
+
+/* MC_CMD_SENSOR_SET_LIMS_OUT msgresponse */
+#define    MC_CMD_SENSOR_SET_LIMS_OUT_LEN 0
+
+
+/***********************************/
+/* MC_CMD_GET_RESOURCE_LIMITS
+ */
+#define MC_CMD_GET_RESOURCE_LIMITS 0x4f
+
+/* MC_CMD_GET_RESOURCE_LIMITS_IN msgrequest */
+#define    MC_CMD_GET_RESOURCE_LIMITS_IN_LEN 0
+
+/* MC_CMD_GET_RESOURCE_LIMITS_OUT msgresponse */
+#define    MC_CMD_GET_RESOURCE_LIMITS_OUT_LEN 16
+#define       MC_CMD_GET_RESOURCE_LIMITS_OUT_BUFTBL_OFST 0
+#define       MC_CMD_GET_RESOURCE_LIMITS_OUT_EVQ_OFST 4
+#define       MC_CMD_GET_RESOURCE_LIMITS_OUT_RXQ_OFST 8
+#define       MC_CMD_GET_RESOURCE_LIMITS_OUT_TXQ_OFST 12
+
+/* MC_CMD_RESOURCE_SPECIFIER enum */
+#define          MC_CMD_RESOURCE_INSTANCE_ANY 0xffffffff /* enum */
+#define          MC_CMD_RESOURCE_INSTANCE_NONE 0xfffffffe /* enum */
+
 
 #endif /* MCDI_PCOL_H */
diff --git a/drivers/net/ethernet/sfc/mcdi_phy.c b/drivers/net/ethernet/sfc/mcdi_phy.c
index 6c63ab0710af..7bcad899a936 100644
--- a/drivers/net/ethernet/sfc/mcdi_phy.c
+++ b/drivers/net/ethernet/sfc/mcdi_phy.c
@@ -116,7 +116,7 @@ static int efx_mcdi_loopback_modes(struct efx_nic *efx, u64 *loopback_modes)
                 goto fail;
         }
 
-        *loopback_modes = MCDI_QWORD(outbuf, GET_LOOPBACK_MODES_SUGGESTED);
+        *loopback_modes = MCDI_QWORD(outbuf, GET_LOOPBACK_MODES_OUT_SUGGESTED);
 
         return 0;
 
@@ -264,22 +264,22 @@ static u32 efx_get_mcdi_phy_flags(struct efx_nic *efx)
 
         /* TODO: Advertise the capabilities supported by this PHY */
         supported = 0;
-        if (phy_cfg->flags & (1 << MC_CMD_GET_PHY_CFG_TXDIS_LBN))
+        if (phy_cfg->flags & (1 << MC_CMD_GET_PHY_CFG_OUT_TXDIS_LBN))
                 supported |= PHY_MODE_TX_DISABLED;
-        if (phy_cfg->flags & (1 << MC_CMD_GET_PHY_CFG_LOWPOWER_LBN))
+        if (phy_cfg->flags & (1 << MC_CMD_GET_PHY_CFG_OUT_LOWPOWER_LBN))
                 supported |= PHY_MODE_LOW_POWER;
-        if (phy_cfg->flags & (1 << MC_CMD_GET_PHY_CFG_POWEROFF_LBN))
+        if (phy_cfg->flags & (1 << MC_CMD_GET_PHY_CFG_OUT_POWEROFF_LBN))
                 supported |= PHY_MODE_OFF;
 
         mode = efx->phy_mode & supported;
 
         flags = 0;
         if (mode & PHY_MODE_TX_DISABLED)
-                flags |= (1 << MC_CMD_SET_LINK_TXDIS_LBN);
+                flags |= (1 << MC_CMD_SET_LINK_IN_TXDIS_LBN);
         if (mode & PHY_MODE_LOW_POWER)
-                flags |= (1 << MC_CMD_SET_LINK_LOWPOWER_LBN);
+                flags |= (1 << MC_CMD_SET_LINK_IN_LOWPOWER_LBN);
         if (mode & PHY_MODE_OFF)
-                flags |= (1 << MC_CMD_SET_LINK_POWEROFF_LBN);
+                flags |= (1 << MC_CMD_SET_LINK_IN_POWEROFF_LBN);
 
         return flags;
 }
@@ -436,8 +436,8 @@ void efx_mcdi_phy_decode_link(struct efx_nic *efx,
                 break;
         }
 
-        link_state->up = !!(flags & (1 << MC_CMD_GET_LINK_LINK_UP_LBN));
-        link_state->fd = !!(flags & (1 << MC_CMD_GET_LINK_FULL_DUPLEX_LBN));
+        link_state->up = !!(flags & (1 << MC_CMD_GET_LINK_OUT_LINK_UP_LBN));
+        link_state->fd = !!(flags & (1 << MC_CMD_GET_LINK_OUT_FULL_DUPLEX_LBN));
         link_state->speed = speed;
 }
 
@@ -592,7 +592,7 @@ static int efx_mcdi_phy_test_alive(struct efx_nic *efx)
 
         if (outlen < MC_CMD_GET_PHY_STATE_OUT_LEN)
                 return -EIO;
-        if (MCDI_DWORD(outbuf, GET_PHY_STATE_STATE) != MC_CMD_PHY_STATE_OK)
+        if (MCDI_DWORD(outbuf, GET_PHY_STATE_OUT_STATE) != MC_CMD_PHY_STATE_OK)
                 return -EINVAL;
 
         return 0;
@@ -680,7 +680,7 @@ static int efx_mcdi_phy_run_tests(struct efx_nic *efx, int *results,
         u32 mode;
         int rc;
 
-        if (phy_cfg->flags & (1 << MC_CMD_GET_PHY_CFG_BIST_LBN)) {
+        if (phy_cfg->flags & (1 << MC_CMD_GET_PHY_CFG_OUT_BIST_LBN)) {
                 rc = efx_mcdi_bist(efx, MC_CMD_PHY_BIST, results);
                 if (rc < 0)
                         return rc;
@@ -691,15 +691,15 @@ static int efx_mcdi_phy_run_tests(struct efx_nic *efx, int *results,
         /* If we support both LONG and SHORT, then run each in response to
          * break or not. Otherwise, run the one we support */
         mode = 0;
-        if (phy_cfg->flags & (1 << MC_CMD_GET_PHY_CFG_BIST_CABLE_SHORT_LBN)) {
+        if (phy_cfg->flags & (1 << MC_CMD_GET_PHY_CFG_OUT_BIST_CABLE_SHORT_LBN)) {
                 if ((flags & ETH_TEST_FL_OFFLINE) &&
                     (phy_cfg->flags &
-                     (1 << MC_CMD_GET_PHY_CFG_BIST_CABLE_LONG_LBN)))
+                     (1 << MC_CMD_GET_PHY_CFG_OUT_BIST_CABLE_LONG_LBN)))
                         mode = MC_CMD_PHY_BIST_CABLE_LONG;
                 else
                         mode = MC_CMD_PHY_BIST_CABLE_SHORT;
         } else if (phy_cfg->flags &
-                   (1 << MC_CMD_GET_PHY_CFG_BIST_CABLE_LONG_LBN))
+                   (1 << MC_CMD_GET_PHY_CFG_OUT_BIST_CABLE_LONG_LBN))
                 mode = MC_CMD_PHY_BIST_CABLE_LONG;
 
         if (mode != 0) {
@@ -717,14 +717,14 @@ static const char *efx_mcdi_phy_test_name(struct efx_nic *efx,
 {
         struct efx_mcdi_phy_data *phy_cfg = efx->phy_data;
 
-        if (phy_cfg->flags & (1 << MC_CMD_GET_PHY_CFG_BIST_LBN)) {
+        if (phy_cfg->flags & (1 << MC_CMD_GET_PHY_CFG_OUT_BIST_LBN)) {
                 if (index == 0)
                         return "bist";
                 --index;
         }
 
-        if (phy_cfg->flags & ((1 << MC_CMD_GET_PHY_CFG_BIST_CABLE_SHORT_LBN) |
-                              (1 << MC_CMD_GET_PHY_CFG_BIST_CABLE_LONG_LBN))) {
+        if (phy_cfg->flags & ((1 << MC_CMD_GET_PHY_CFG_OUT_BIST_CABLE_SHORT_LBN) |
+                              (1 << MC_CMD_GET_PHY_CFG_OUT_BIST_CABLE_LONG_LBN))) {
                 if (index == 0)
                         return "cable";
                 --index;
@@ -741,7 +741,7 @@ static const char *efx_mcdi_phy_test_name(struct efx_nic *efx,
 
 const struct efx_phy_operations efx_mcdi_phy_ops = {
         .probe          = efx_mcdi_phy_probe,
-        .init           = efx_port_dummy_op_int,
+        .init           = efx_port_dummy_op_int,
         .reconfigure    = efx_mcdi_phy_reconfigure,
         .poll           = efx_mcdi_phy_poll,
         .fini           = efx_port_dummy_op_void,
diff --git a/drivers/net/ethernet/sfc/mdio_10g.c b/drivers/net/ethernet/sfc/mdio_10g.c
index 7ab385c8136d..9acfd6696ffb 100644
--- a/drivers/net/ethernet/sfc/mdio_10g.c
+++ b/drivers/net/ethernet/sfc/mdio_10g.c
@@ -228,7 +228,7 @@ void efx_mdio_set_mmds_lpower(struct efx_nic *efx,
 /**
  * efx_mdio_set_settings - Set (some of) the PHY settings over MDIO.
  * @efx:                Efx NIC
- * @ecmd:               New settings
+ * @ecmd:               New settings
  */
 int efx_mdio_set_settings(struct efx_nic *efx, struct ethtool_cmd *ecmd)
 {
diff --git a/drivers/net/ethernet/sfc/mtd.c b/drivers/net/ethernet/sfc/mtd.c
index bc9dcd6b30d7..79c192272047 100644
--- a/drivers/net/ethernet/sfc/mtd.c
+++ b/drivers/net/ethernet/sfc/mtd.c
@@ -382,7 +382,7 @@ static int falcon_mtd_sync(struct mtd_info *mtd)
         return rc;
 }
 
-static struct efx_mtd_ops falcon_mtd_ops = {
+static const struct efx_mtd_ops falcon_mtd_ops = {
         .read   = falcon_mtd_read,
         .erase  = falcon_mtd_erase,
         .write  = falcon_mtd_write,
@@ -560,7 +560,7 @@ static int siena_mtd_sync(struct mtd_info *mtd)
         return rc;
 }
 
-static struct efx_mtd_ops siena_mtd_ops = {
+static const struct efx_mtd_ops siena_mtd_ops = {
         .read   = siena_mtd_read,
         .erase  = siena_mtd_erase,
         .write  = siena_mtd_write,
@@ -572,7 +572,7 @@ struct siena_nvram_type_info {
         const char *name;
 };
 
-static struct siena_nvram_type_info siena_nvram_types[] = {
+static const struct siena_nvram_type_info siena_nvram_types[] = {
         [MC_CMD_NVRAM_TYPE_DISABLED_CALLISTO]   = { 0, "sfc_dummy_phy" },
         [MC_CMD_NVRAM_TYPE_MC_FW]               = { 0, "sfc_mcfw" },
         [MC_CMD_NVRAM_TYPE_MC_FW_BACKUP]        = { 0, "sfc_mcfw_backup" },
@@ -593,7 +593,7 @@ static int siena_mtd_probe_partition(struct efx_nic *efx,
                                      unsigned int type)
 {
         struct efx_mtd_partition *part = &efx_mtd->part[part_id];
-        struct siena_nvram_type_info *info;
+        const struct siena_nvram_type_info *info;
         size_t size, erase_size;
         bool protected;
         int rc;
@@ -627,11 +627,10 @@ static int siena_mtd_get_fw_subtypes(struct efx_nic *efx,
                                      struct efx_mtd *efx_mtd)
 {
         struct efx_mtd_partition *part;
-        uint16_t fw_subtype_list[MC_CMD_GET_BOARD_CFG_OUT_FW_SUBTYPE_LIST_LEN /
-                                 sizeof(uint16_t)];
+        uint16_t fw_subtype_list[MC_CMD_GET_BOARD_CFG_OUT_FW_SUBTYPE_LIST_MINNUM];
         int rc;
 
-        rc = efx_mcdi_get_board_cfg(efx, NULL, fw_subtype_list);
+        rc = efx_mcdi_get_board_cfg(efx, NULL, fw_subtype_list, NULL);
         if (rc)
                 return rc;
 
diff --git a/drivers/net/ethernet/sfc/net_driver.h b/drivers/net/ethernet/sfc/net_driver.h
index c49502bab6a3..53864014c2b4 100644
--- a/drivers/net/ethernet/sfc/net_driver.h
+++ b/drivers/net/ethernet/sfc/net_driver.h
@@ -13,10 +13,6 @@
 #ifndef EFX_NET_DRIVER_H
 #define EFX_NET_DRIVER_H
 
-#if defined(EFX_ENABLE_DEBUG) && !defined(DEBUG)
-#define DEBUG
-#endif
-
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
 #include <linux/ethtool.h>
@@ -42,7 +38,7 @@
 
 #define EFX_DRIVER_VERSION      "3.1"
 
-#ifdef EFX_ENABLE_DEBUG
+#ifdef DEBUG
 #define EFX_BUG_ON_PARANOID(x) BUG_ON(x)
 #define EFX_WARN_ON_PARANOID(x) WARN_ON(x)
 #else
@@ -209,12 +205,12 @@ struct efx_tx_queue {
 /**
  * struct efx_rx_buffer - An Efx RX data buffer
  * @dma_addr: DMA base address of the buffer
- * @skb: The associated socket buffer, if any.
- *      If both this and page are %NULL, the buffer slot is currently free.
- * @page: The associated page buffer, if any.
- *      If both this and skb are %NULL, the buffer slot is currently free.
+ * @skb: The associated socket buffer. Valid iff !(@flags & %EFX_RX_BUF_PAGE).
+ *      Will be %NULL if the buffer slot is currently free.
+ * @page: The associated page buffer. Valif iff @flags & %EFX_RX_BUF_PAGE.
+ *      Will be %NULL if the buffer slot is currently free.
  * @len: Buffer length, in bytes.
- * @is_page: Indicates if @page is valid. If false, @skb is valid.
+ * @flags: Flags for buffer and packet state.
  */
 struct efx_rx_buffer {
         dma_addr_t dma_addr;
@@ -223,8 +219,11 @@ struct efx_rx_buffer {
                 struct page *page;
         } u;
         unsigned int len;
-        bool is_page;
+        u16 flags;
 };
+#define EFX_RX_BUF_PAGE         0x0001
+#define EFX_RX_PKT_CSUMMED      0x0002
+#define EFX_RX_PKT_DISCARD      0x0004
 
 /**
  * struct efx_rx_page_state - Page-based rx buffer state
@@ -329,6 +328,7 @@ enum efx_rx_alloc_method {
  * @eventq_mask: Event queue pointer mask
  * @eventq_read_ptr: Event queue read pointer
  * @last_eventq_read_ptr: Last event queue read pointer value.
+ * @last_irq_cpu: Last CPU to handle interrupt for this channel
  * @irq_count: Number of IRQs since last adaptive moderation decision
  * @irq_mod_score: IRQ moderation score
  * @rx_alloc_level: Watermark based heuristic counter for pushing descriptors
@@ -359,6 +359,7 @@ struct efx_channel {
         unsigned int eventq_read_ptr;
         unsigned int last_eventq_read_ptr;
 
+        int last_irq_cpu;
         unsigned int irq_count;
         unsigned int irq_mod_score;
 #ifdef CONFIG_RFS_ACCEL
@@ -380,7 +381,6 @@ struct efx_channel {
          * access with prefetches.
          */
         struct efx_rx_buffer *rx_pkt;
-        bool rx_pkt_csummed;
 
         struct efx_rx_queue rx_queue;
         struct efx_tx_queue tx_queue[EFX_TXQ_TYPES];
@@ -395,12 +395,12 @@ enum efx_led_mode {
 #define STRING_TABLE_LOOKUP(val, member) \
         ((val) < member ## _max) ? member ## _names[val] : "(invalid)"
 
-extern const char *efx_loopback_mode_names[];
+extern const char *const efx_loopback_mode_names[];
 extern const unsigned int efx_loopback_mode_max;
 #define LOOPBACK_MODE(efx) \
         STRING_TABLE_LOOKUP((efx)->loopback_mode, efx_loopback_mode)
 
-extern const char *efx_reset_type_names[];
+extern const char *const efx_reset_type_names[];
 extern const unsigned int efx_reset_type_max;
 #define RESET_TYPE(type) \
         STRING_TABLE_LOOKUP(type, efx_reset_type)
@@ -474,18 +474,6 @@ static inline bool efx_link_state_equal(const struct efx_link_state *left,
 }
 
 /**
- * struct efx_mac_operations - Efx MAC operations table
- * @reconfigure: Reconfigure MAC. Serialised by the mac_lock
- * @update_stats: Update statistics
- * @check_fault: Check fault state. True if fault present.
- */
-struct efx_mac_operations {
-        int (*reconfigure) (struct efx_nic *efx);
-        void (*update_stats) (struct efx_nic *efx);
-        bool (*check_fault)(struct efx_nic *efx);
-};
-
-/**
  * struct efx_phy_operations - Efx PHY operations table
  * @probe: Probe PHY and initialise efx->mdio.mode_support, efx->mdio.mmds,
  *      efx->loopback_modes.
@@ -552,64 +540,64 @@ struct efx_mac_stats {
         u64 tx_bytes;
         u64 tx_good_bytes;
         u64 tx_bad_bytes;
-        unsigned long tx_packets;
-        unsigned long tx_bad;
-        unsigned long tx_pause;
-        unsigned long tx_control;
-        unsigned long tx_unicast;
-        unsigned long tx_multicast;
-        unsigned long tx_broadcast;
-        unsigned long tx_lt64;
-        unsigned long tx_64;
-        unsigned long tx_65_to_127;
-        unsigned long tx_128_to_255;
-        unsigned long tx_256_to_511;
-        unsigned long tx_512_to_1023;
-        unsigned long tx_1024_to_15xx;
-        unsigned long tx_15xx_to_jumbo;
-        unsigned long tx_gtjumbo;
-        unsigned long tx_collision;
-        unsigned long tx_single_collision;
-        unsigned long tx_multiple_collision;
-        unsigned long tx_excessive_collision;
-        unsigned long tx_deferred;
-        unsigned long tx_late_collision;
-        unsigned long tx_excessive_deferred;
-        unsigned long tx_non_tcpudp;
-        unsigned long tx_mac_src_error;
-        unsigned long tx_ip_src_error;
+        u64 tx_packets;
+        u64 tx_bad;
+        u64 tx_pause;
+        u64 tx_control;
+        u64 tx_unicast;
+        u64 tx_multicast;
+        u64 tx_broadcast;
+        u64 tx_lt64;
+        u64 tx_64;
+        u64 tx_65_to_127;
+        u64 tx_128_to_255;
+        u64 tx_256_to_511;
+        u64 tx_512_to_1023;
+        u64 tx_1024_to_15xx;
+        u64 tx_15xx_to_jumbo;
+        u64 tx_gtjumbo;
+        u64 tx_collision;
+        u64 tx_single_collision;
+        u64 tx_multiple_collision;
+        u64 tx_excessive_collision;
+        u64 tx_deferred;
+        u64 tx_late_collision;
+        u64 tx_excessive_deferred;
+        u64 tx_non_tcpudp;
+        u64 tx_mac_src_error;
+        u64 tx_ip_src_error;
         u64 rx_bytes;
         u64 rx_good_bytes;
         u64 rx_bad_bytes;
-        unsigned long rx_packets;
-        unsigned long rx_good;
-        unsigned long rx_bad;
-        unsigned long rx_pause;
-        unsigned long rx_control;
-        unsigned long rx_unicast;
-        unsigned long rx_multicast;
-        unsigned long rx_broadcast;
-        unsigned long rx_lt64;
-        unsigned long rx_64;
-        unsigned long rx_65_to_127;
-        unsigned long rx_128_to_255;
-        unsigned long rx_256_to_511;
-        unsigned long rx_512_to_1023;
-        unsigned long rx_1024_to_15xx;
-        unsigned long rx_15xx_to_jumbo;
-        unsigned long rx_gtjumbo;
-        unsigned long rx_bad_lt64;
-        unsigned long rx_bad_64_to_15xx;
-        unsigned long rx_bad_15xx_to_jumbo;
-        unsigned long rx_bad_gtjumbo;
-        unsigned long rx_overflow;
-        unsigned long rx_missed;
-        unsigned long rx_false_carrier;
-        unsigned long rx_symbol_error;
-        unsigned long rx_align_error;
-        unsigned long rx_length_error;
-        unsigned long rx_internal_error;
-        unsigned long rx_good_lt64;
+        u64 rx_packets;
+        u64 rx_good;
+        u64 rx_bad;
+        u64 rx_pause;
+        u64 rx_control;
+        u64 rx_unicast;
+        u64 rx_multicast;
+        u64 rx_broadcast;
+        u64 rx_lt64;
+        u64 rx_64;
+        u64 rx_65_to_127;
+        u64 rx_128_to_255;
+        u64 rx_256_to_511;
+        u64 rx_512_to_1023;
+        u64 rx_1024_to_15xx;
+        u64 rx_15xx_to_jumbo;
+        u64 rx_gtjumbo;
+        u64 rx_bad_lt64;
+        u64 rx_bad_64_to_15xx;
+        u64 rx_bad_15xx_to_jumbo;
+        u64 rx_bad_gtjumbo;
+        u64 rx_overflow;
+        u64 rx_missed;
+        u64 rx_false_carrier;
+        u64 rx_symbol_error;
+        u64 rx_align_error;
+        u64 rx_length_error;
+        u64 rx_internal_error;
+        u64 rx_good_lt64;
 };
 
 /* Number of bits used in a multicast filter hash address */
@@ -640,6 +628,7 @@ struct efx_filter_state;
  * @membase_phys: Memory BAR value as physical address
  * @membase: Memory BAR value
  * @interrupt_mode: Interrupt mode
+ * @timer_quantum_ns: Interrupt timer quantum, in nanoseconds
  * @irq_rx_adaptive: Adaptive IRQ moderation enabled for RX event queues
  * @irq_rx_moderation: IRQ moderation time for RX event queues
  * @msg_enable: Log message enable flags
@@ -663,7 +652,7 @@ struct efx_filter_state;
  * @int_error_expire: Time at which error count will be expired
  * @irq_status: Interrupt status buffer
  * @irq_zero_count: Number of legacy IRQs seen with queue flags == 0
- * @fatal_irq_level: IRQ level (bit number) used for serious errors
+ * @irq_level: IRQ level/index for IRQs not triggered by an event queue
  * @mtd_list: List of MTDs attached to the NIC
  * @nic_data: Hardware dependent state
  * @mac_lock: MAC access lock. Protects @port_enabled, @phy_mode,
@@ -676,7 +665,6 @@ struct efx_filter_state;
  * @port_initialized: Port initialized?
  * @net_dev: Operating system network device. Consider holding the rtnl lock
  * @stats_buffer: DMA buffer for statistics
- * @mac_op: MAC interface
  * @phy_type: PHY type
  * @phy_op: PHY interface
  * @phy_data: PHY private data (including PHY-specific stats)
@@ -695,15 +683,15 @@ struct efx_filter_state;
  * @loopback_selftest: Offline self-test private state
  * @monitor_work: Hardware monitor workitem
  * @biu_lock: BIU (bus interface unit) lock
- * @last_irq_cpu: Last CPU to handle interrupt.
- *      This register is written with the SMP processor ID whenever an
- *      interrupt is handled.  It is used by efx_nic_test_interrupt()
- *      to verify that an interrupt has occurred.
+ * @last_irq_cpu: Last CPU to handle a possible test interrupt.  This
+ *      field is used by efx_test_interrupts() to verify that an
+ *      interrupt has occurred.
  * @n_rx_nodesc_drop_cnt: RX no descriptor drop count
  * @mac_stats: MAC statistics. These include all statistics the MACs
  *      can provide.  Generic code converts these into a standard
  *      &struct net_device_stats.
  * @stats_lock: Statistics update lock. Serialises statistics fetches
+ *      and access to @mac_stats.
  *
  * This is stored in the private area of the &struct net_device.
  */
@@ -722,6 +710,7 @@ struct efx_nic {
         void __iomem *membase;
 
         enum efx_int_mode interrupt_mode;
+        unsigned int timer_quantum_ns;
         bool irq_rx_adaptive;
         unsigned int irq_rx_moderation;
         u32 msg_enable;
@@ -749,7 +738,7 @@ struct efx_nic {
 
         struct efx_buffer irq_status;
         unsigned irq_zero_count;
-        unsigned fatal_irq_level;
+        unsigned irq_level;
 
 #ifdef CONFIG_SFC_MTD
         struct list_head mtd_list;
@@ -766,8 +755,6 @@ struct efx_nic {
 
         struct efx_buffer stats_buffer;
 
-        const struct efx_mac_operations *mac_op;
-
         unsigned int phy_type;
         const struct efx_phy_operations *phy_op;
         void *phy_data;
@@ -795,7 +782,7 @@ struct efx_nic {
 
         struct delayed_work monitor_work ____cacheline_aligned_in_smp;
         spinlock_t biu_lock;
-        volatile signed int last_irq_cpu;
+        int last_irq_cpu;
         unsigned n_rx_nodesc_drop_cnt;
         struct efx_mac_stats mac_stats;
         spinlock_t stats_lock;
@@ -806,15 +793,6 @@ static inline int efx_dev_registered(struct efx_nic *efx)
         return efx->net_dev->reg_state == NETREG_REGISTERED;
 }
 
-/* Net device name, for inclusion in log messages if it has been registered.
- * Use efx->name not efx->net_dev->name so that races with (un)registration
- * are harmless.
- */
-static inline const char *efx_dev_name(struct efx_nic *efx)
-{
-        return efx_dev_registered(efx) ? efx->name : "";
-}
-
 static inline unsigned int efx_port_num(struct efx_nic *efx)
 {
         return efx->net_dev->dev_id;
@@ -840,14 +818,15 @@ static inline unsigned int efx_port_num(struct efx_nic *efx)
  * @stop_stats: Stop the regular fetching of statistics
  * @set_id_led: Set state of identifying LED or revert to automatic function
  * @push_irq_moderation: Apply interrupt moderation value
- * @push_multicast_hash: Apply multicast hash table
  * @reconfigure_port: Push loopback/power/txdis changes to the MAC and PHY
+ * @reconfigure_mac: Push MAC address, MTU, flow control and filter settings
+ *      to the hardware.  Serialised by the mac_lock.
+ * @check_mac_fault: Check MAC fault state. True if fault present.
  * @get_wol: Get WoL configuration from driver state
  * @set_wol: Push WoL configuration to the NIC
  * @resume_wol: Synchronise WoL state between driver and MC (e.g. after resume)
  * @test_registers: Test read/write functionality of control registers
  * @test_nvram: Test validity of NVRAM contents
- * @default_mac_ops: efx_mac_operations to set at startup
  * @revision: Hardware architecture revision
  * @mem_map_size: Memory BAR mapped size
  * @txd_ptr_tbl_base: TX descriptor ring base address
@@ -862,6 +841,7 @@ static inline unsigned int efx_port_num(struct efx_nic *efx)
  *      from &enum efx_init_mode.
  * @phys_addr_channels: Number of channels with physically addressed
  *      descriptors
+ * @timer_period_max: Maximum period of interrupt timer (in ticks)
  * @tx_dc_base: Base address in SRAM of TX queue descriptor caches
  * @rx_dc_base: Base address in SRAM of RX queue descriptor caches
  * @offload_features: net_device feature flags for protocol offload
@@ -885,14 +865,14 @@ struct efx_nic_type {
         void (*stop_stats)(struct efx_nic *efx);
         void (*set_id_led)(struct efx_nic *efx, enum efx_led_mode mode);
         void (*push_irq_moderation)(struct efx_channel *channel);
-        void (*push_multicast_hash)(struct efx_nic *efx);
         int (*reconfigure_port)(struct efx_nic *efx);
+        int (*reconfigure_mac)(struct efx_nic *efx);
+        bool (*check_mac_fault)(struct efx_nic *efx);
         void (*get_wol)(struct efx_nic *efx, struct ethtool_wolinfo *wol);
         int (*set_wol)(struct efx_nic *efx, u32 type);
         void (*resume_wol)(struct efx_nic *efx);
         int (*test_registers)(struct efx_nic *efx);
         int (*test_nvram)(struct efx_nic *efx);
-        const struct efx_mac_operations *default_mac_ops;
 
         int revision;
         unsigned int mem_map_size;
@@ -906,6 +886,7 @@ struct efx_nic_type {
         unsigned int rx_buffer_padding;
         unsigned int max_interrupt_mode;
         unsigned int phys_addr_channels;
+        unsigned int timer_period_max;
         unsigned int tx_dc_base;
         unsigned int rx_dc_base;
         netdev_features_t offload_features;
diff --git a/drivers/net/ethernet/sfc/nic.c b/drivers/net/ethernet/sfc/nic.c
index 3edfbaf5f022..a43d1ca270c0 100644
--- a/drivers/net/ethernet/sfc/nic.c
+++ b/drivers/net/ethernet/sfc/nic.c
@@ -726,11 +726,9 @@ efx_handle_tx_event(struct efx_channel *channel, efx_qword_t *event)
                 tx_queue = efx_channel_get_tx_queue(
                         channel, tx_ev_q_label % EFX_TXQ_TYPES);
 
-                if (efx_dev_registered(efx))
-                        netif_tx_lock(efx->net_dev);
+                netif_tx_lock(efx->net_dev);
                 efx_notify_tx_desc(tx_queue);
-                if (efx_dev_registered(efx))
-                        netif_tx_unlock(efx->net_dev);
+                netif_tx_unlock(efx->net_dev);
         } else if (EFX_QWORD_FIELD(*event, FSF_AZ_TX_EV_PKT_ERR) &&
                    EFX_WORKAROUND_10727(efx)) {
                 efx_schedule_reset(efx, RESET_TYPE_TX_DESC_FETCH);
@@ -745,10 +743,8 @@ efx_handle_tx_event(struct efx_channel *channel, efx_qword_t *event)
 }
 
 /* Detect errors included in the rx_evt_pkt_ok bit. */
-static void efx_handle_rx_not_ok(struct efx_rx_queue *rx_queue,
-                                 const efx_qword_t *event,
-                                 bool *rx_ev_pkt_ok,
-                                 bool *discard)
+static u16 efx_handle_rx_not_ok(struct efx_rx_queue *rx_queue,
+                                const efx_qword_t *event)
 {
         struct efx_channel *channel = efx_rx_queue_channel(rx_queue);
         struct efx_nic *efx = rx_queue->efx;
@@ -793,15 +789,11 @@ static void efx_handle_rx_not_ok(struct efx_rx_queue *rx_queue,
                         ++channel->n_rx_tcp_udp_chksum_err;
         }
 
-        /* The frame must be discarded if any of these are true. */
-        *discard = (rx_ev_eth_crc_err | rx_ev_frm_trunc | rx_ev_drib_nib |
-                    rx_ev_tobe_disc | rx_ev_pause_frm);
-
         /* TOBE_DISC is expected on unicast mismatches; don't print out an
          * error message.  FRM_TRUNC indicates RXDP dropped the packet due
          * to a FIFO overflow.
          */
-#ifdef EFX_ENABLE_DEBUG
+#ifdef DEBUG
         if (rx_ev_other_err && net_ratelimit()) {
                 netif_dbg(efx, rx_err, efx->net_dev,
                           " RX queue %d unexpected RX event "
@@ -819,6 +811,11 @@ static void efx_handle_rx_not_ok(struct efx_rx_queue *rx_queue,
                           rx_ev_pause_frm ? " [PAUSE]" : "");
         }
 #endif
+
+        /* The frame must be discarded if any of these are true. */
+        return (rx_ev_eth_crc_err | rx_ev_frm_trunc | rx_ev_drib_nib |
+                rx_ev_tobe_disc | rx_ev_pause_frm) ?
+                EFX_RX_PKT_DISCARD : 0;
 }
 
 /* Handle receive events that are not in-order. */
@@ -851,7 +848,8 @@ efx_handle_rx_event(struct efx_channel *channel, const efx_qword_t *event)
         unsigned int rx_ev_desc_ptr, rx_ev_byte_cnt;
         unsigned int rx_ev_hdr_type, rx_ev_mcast_pkt;
         unsigned expected_ptr;
-        bool rx_ev_pkt_ok, discard = false, checksummed;
+        bool rx_ev_pkt_ok;
+        u16 flags;
         struct efx_rx_queue *rx_queue;
 
         /* Basic packet information */
@@ -874,12 +872,11 @@ efx_handle_rx_event(struct efx_channel *channel, const efx_qword_t *event)
                 /* If packet is marked as OK and packet type is TCP/IP or
                  * UDP/IP, then we can rely on the hardware checksum.
                  */
-                checksummed =
-                        rx_ev_hdr_type == FSE_CZ_RX_EV_HDR_TYPE_IPV4V6_TCP ||
-                        rx_ev_hdr_type == FSE_CZ_RX_EV_HDR_TYPE_IPV4V6_UDP;
+                flags = (rx_ev_hdr_type == FSE_CZ_RX_EV_HDR_TYPE_IPV4V6_TCP ||
+                         rx_ev_hdr_type == FSE_CZ_RX_EV_HDR_TYPE_IPV4V6_UDP) ?
+                        EFX_RX_PKT_CSUMMED : 0;
         } else {
-                efx_handle_rx_not_ok(rx_queue, event, &rx_ev_pkt_ok, &discard);
-                checksummed = false;
+                flags = efx_handle_rx_not_ok(rx_queue, event);
         }
 
         /* Detect multicast packets that didn't match the filter */
@@ -890,15 +887,14 @@ efx_handle_rx_event(struct efx_channel *channel, const efx_qword_t *event)
 
                 if (unlikely(!rx_ev_mcast_hash_match)) {
                         ++channel->n_rx_mcast_mismatch;
-                        discard = true;
+                        flags |= EFX_RX_PKT_DISCARD;
                 }
         }
 
         channel->irq_mod_score += 2;
 
         /* Handle received packet */
-        efx_rx_packet(rx_queue, rx_ev_desc_ptr, rx_ev_byte_cnt,
-                      checksummed, discard);
+        efx_rx_packet(rx_queue, rx_ev_desc_ptr, rx_ev_byte_cnt, flags);
 }
 
 static void
@@ -1311,7 +1307,7 @@ static inline void efx_nic_interrupts(struct efx_nic *efx,
         efx_oword_t int_en_reg_ker;
 
         EFX_POPULATE_OWORD_3(int_en_reg_ker,
-                             FRF_AZ_KER_INT_LEVE_SEL, efx->fatal_irq_level,
+                             FRF_AZ_KER_INT_LEVE_SEL, efx->irq_level,
                              FRF_AZ_KER_INT_KER, force,
                              FRF_AZ_DRV_INT_EN_KER, enabled);
         efx_writeo(efx, &int_en_reg_ker, FR_AZ_INT_EN_KER);
@@ -1427,11 +1423,12 @@ static irqreturn_t efx_legacy_interrupt(int irq, void *dev_id)
         efx_readd(efx, &reg, FR_BZ_INT_ISR0);
         queues = EFX_EXTRACT_DWORD(reg, 0, 31);
 
-        /* Check to see if we have a serious error condition */
-        if (queues & (1U << efx->fatal_irq_level)) {
+        /* Handle non-event-queue sources */
+        if (queues & (1U << efx->irq_level)) {
                 syserr = EFX_OWORD_FIELD(*int_ker, FSF_AZ_NET_IVEC_FATAL_INT);
                 if (unlikely(syserr))
                         return efx_nic_fatal_interrupt(efx);
+                efx->last_irq_cpu = raw_smp_processor_id();
         }
 
         if (queues != 0) {
@@ -1441,7 +1438,7 @@ static irqreturn_t efx_legacy_interrupt(int irq, void *dev_id)
                 /* Schedule processing of any interrupting queues */
                 efx_for_each_channel(channel, efx) {
                         if (queues & 1)
-                                efx_schedule_channel(channel);
+                                efx_schedule_channel_irq(channel);
                         queues >>= 1;
                 }
                 result = IRQ_HANDLED;
@@ -1458,18 +1455,16 @@ static irqreturn_t efx_legacy_interrupt(int irq, void *dev_id)
                 efx_for_each_channel(channel, efx) {
                         event = efx_event(channel, channel->eventq_read_ptr);
                         if (efx_event_present(event))
-                                efx_schedule_channel(channel);
+                                efx_schedule_channel_irq(channel);
                         else
                                 efx_nic_eventq_read_ack(channel);
                 }
         }
 
-        if (result == IRQ_HANDLED) {
-                efx->last_irq_cpu = raw_smp_processor_id();
+        if (result == IRQ_HANDLED)
                 netif_vdbg(efx, intr, efx->net_dev,
                            "IRQ %d on CPU %d status " EFX_DWORD_FMT "\n",
                            irq, raw_smp_processor_id(), EFX_DWORD_VAL(reg));
-        }
 
         return result;
 }
@@ -1488,20 +1483,20 @@ static irqreturn_t efx_msi_interrupt(int irq, void *dev_id)
         efx_oword_t *int_ker = efx->irq_status.addr;
         int syserr;
 
-        efx->last_irq_cpu = raw_smp_processor_id();
         netif_vdbg(efx, intr, efx->net_dev,
                    "IRQ %d on CPU %d status " EFX_OWORD_FMT "\n",
                    irq, raw_smp_processor_id(), EFX_OWORD_VAL(*int_ker));
 
-        /* Check to see if we have a serious error condition */
-        if (channel->channel == efx->fatal_irq_level) {
+        /* Handle non-event-queue sources */
+        if (channel->channel == efx->irq_level) {
                 syserr = EFX_OWORD_FIELD(*int_ker, FSF_AZ_NET_IVEC_FATAL_INT);
                 if (unlikely(syserr))
                         return efx_nic_fatal_interrupt(efx);
+                efx->last_irq_cpu = raw_smp_processor_id();
         }
 
         /* Schedule processing of the channel */
-        efx_schedule_channel(channel);
+        efx_schedule_channel_irq(channel);
 
         return IRQ_HANDLED;
 }
@@ -1640,10 +1635,10 @@ void efx_nic_init_common(struct efx_nic *efx)
 
         if (EFX_WORKAROUND_17213(efx) && !EFX_INT_MODE_USE_MSI(efx))
                 /* Use an interrupt level unused by event queues */
-                efx->fatal_irq_level = 0x1f;
+                efx->irq_level = 0x1f;
         else
                 /* Use a valid MSI-X vector */
-                efx->fatal_irq_level = 0;
+                efx->irq_level = 0;
 
         /* Enable all the genuinely fatal interrupts.  (They are still
          * masked by the overall interrupt mask, controlled by
@@ -1837,7 +1832,7 @@ struct efx_nic_reg_table {
         REGISTER_REVISION_ ## min_rev, REGISTER_REVISION_ ## max_rev,   \
         step, rows                                                      \
 }
-#define REGISTER_TABLE(name, min_rev, max_rev)                          \
+#define REGISTER_TABLE(name, min_rev, max_rev)                          \
         REGISTER_TABLE_DIMENSIONS(                                      \
                 name, FR_ ## min_rev ## max_rev ## _ ## name,           \
                 min_rev, max_rev,                                       \
diff --git a/drivers/net/ethernet/sfc/nic.h b/drivers/net/ethernet/sfc/nic.h
index 5fb24d3aa3ca..905a1877d603 100644
--- a/drivers/net/ethernet/sfc/nic.h
+++ b/drivers/net/ethernet/sfc/nic.h
@@ -144,12 +144,26 @@ static inline struct falcon_board *falcon_board(struct efx_nic *efx)
  * struct siena_nic_data - Siena NIC state
  * @mcdi: Management-Controller-to-Driver Interface
  * @wol_filter_id: Wake-on-LAN packet filter id
+ * @hwmon: Hardware monitor state
  */
 struct siena_nic_data {
         struct efx_mcdi_iface mcdi;
         int wol_filter_id;
+#ifdef CONFIG_SFC_MCDI_MON
+        struct efx_mcdi_mon hwmon;
+#endif
 };
 
+#ifdef CONFIG_SFC_MCDI_MON
+static inline struct efx_mcdi_mon *efx_mcdi_mon(struct efx_nic *efx)
+{
+        struct siena_nic_data *nic_data;
+        EFX_BUG_ON_PARANOID(efx_nic_rev(efx) < EFX_REV_SIENA_A0);
+        nic_data = efx->nic_data;
+        return &nic_data->hwmon;
+}
+#endif
+
 extern const struct efx_nic_type falcon_a1_nic_type;
 extern const struct efx_nic_type falcon_b0_nic_type;
 extern const struct efx_nic_type siena_a0_nic_type;
@@ -189,6 +203,9 @@ extern bool efx_nic_event_present(struct efx_channel *channel);
 /* MAC/PHY */
 extern void falcon_drain_tx_fifo(struct efx_nic *efx);
 extern void falcon_reconfigure_mac_wrapper(struct efx_nic *efx);
+extern bool falcon_xmac_check_fault(struct efx_nic *efx);
+extern int falcon_reconfigure_xmac(struct efx_nic *efx);
+extern void falcon_update_stats_xmac(struct efx_nic *efx);
 
 /* Interrupts and test events */
 extern int efx_nic_init_interrupt(struct efx_nic *efx);
@@ -202,9 +219,6 @@ extern irqreturn_t efx_nic_fatal_interrupt(struct efx_nic *efx);
 extern irqreturn_t falcon_legacy_interrupt_a1(int irq, void *dev_id);
 extern void falcon_irq_ack_a1(struct efx_nic *efx);
 
-#define EFX_IRQ_MOD_RESOLUTION  5
-#define EFX_IRQ_MOD_MAX         0x1000
-
 /* Global Resources */
 extern int efx_nic_flush_queues(struct efx_nic *efx);
 extern void falcon_start_nic_stats(struct efx_nic *efx);
diff --git a/drivers/net/ethernet/sfc/qt202x_phy.c b/drivers/net/ethernet/sfc/qt202x_phy.c
index 7ad97e397406..8a7caf88ffb6 100644
--- a/drivers/net/ethernet/sfc/qt202x_phy.c
+++ b/drivers/net/ethernet/sfc/qt202x_phy.c
@@ -47,7 +47,7 @@
 #define PMA_PMD_FTX_STATIC_LBN  13
 #define PMA_PMD_VEND1_REG       0xc001
 #define PMA_PMD_VEND1_LBTXD_LBN 15
-#define PCS_VEND1_REG           0xc000
+#define PCS_VEND1_REG           0xc000
 #define PCS_VEND1_LBTXD_LBN     5
 
 void falcon_qt202x_set_led(struct efx_nic *p, int led, int mode)
@@ -453,9 +453,9 @@ const struct efx_phy_operations falcon_qt202x_phy_ops = {
         .probe           = qt202x_phy_probe,
         .init            = qt202x_phy_init,
         .reconfigure     = qt202x_phy_reconfigure,
-        .poll            = qt202x_phy_poll,
+        .poll            = qt202x_phy_poll,
         .fini            = efx_port_dummy_op_void,
-        .remove          = qt202x_phy_remove,
+        .remove          = qt202x_phy_remove,
         .get_settings    = qt202x_phy_get_settings,
         .set_settings    = efx_mdio_set_settings,
         .test_alive      = efx_mdio_test_alive,
diff --git a/drivers/net/ethernet/sfc/rx.c b/drivers/net/ethernet/sfc/rx.c
index aca349861767..1dfda5e27919 100644
--- a/drivers/net/ethernet/sfc/rx.c
+++ b/drivers/net/ethernet/sfc/rx.c
@@ -98,8 +98,8 @@ static inline unsigned int efx_rx_buf_offset(struct efx_nic *efx,
         /* Offset is always within one page, so we don't need to consider
          * the page order.
          */
-        return (((__force unsigned long) buf->dma_addr & (PAGE_SIZE - 1)) +
-                efx->type->rx_buffer_hash_size);
+        return ((unsigned int) buf->dma_addr & (PAGE_SIZE - 1)) +
+                efx->type->rx_buffer_hash_size;
 }
 static inline unsigned int efx_rx_buf_size(struct efx_nic *efx)
 {
@@ -108,11 +108,10 @@ static inline unsigned int efx_rx_buf_size(struct efx_nic *efx)
 
 static u8 *efx_rx_buf_eh(struct efx_nic *efx, struct efx_rx_buffer *buf)
 {
-        if (buf->is_page)
+        if (buf->flags & EFX_RX_BUF_PAGE)
                 return page_address(buf->u.page) + efx_rx_buf_offset(efx, buf);
         else
-                return ((u8 *)buf->u.skb->data +
-                        efx->type->rx_buffer_hash_size);
+                return (u8 *)buf->u.skb->data + efx->type->rx_buffer_hash_size;
 }
 
 static inline u32 efx_rx_buf_hash(const u8 *eh)
@@ -122,10 +121,10 @@ static inline u32 efx_rx_buf_hash(const u8 *eh)
         return __le32_to_cpup((const __le32 *)(eh - 4));
 #else
         const u8 *data = eh - 4;
-        return ((u32)data[0]       |
-                (u32)data[1] << 8  |
-                (u32)data[2] << 16 |
-                (u32)data[3] << 24);
+        return (u32)data[0]       |
+               (u32)data[1] << 8  |
+               (u32)data[2] << 16 |
+               (u32)data[3] << 24;
 #endif
 }
 
@@ -159,7 +158,7 @@ static int efx_init_rx_buffers_skb(struct efx_rx_queue *rx_queue)
                 /* Adjust the SKB for padding and checksum */
                 skb_reserve(skb, NET_IP_ALIGN);
                 rx_buf->len = skb_len - NET_IP_ALIGN;
-                rx_buf->is_page = false;
+                rx_buf->flags = 0;
                 skb->ip_summed = CHECKSUM_UNNECESSARY;
 
                 rx_buf->dma_addr = pci_map_single(efx->pci_dev,
@@ -228,7 +227,7 @@ static int efx_init_rx_buffers_page(struct efx_rx_queue *rx_queue)
                 rx_buf->dma_addr = dma_addr + EFX_PAGE_IP_ALIGN;
                 rx_buf->u.page = page;
                 rx_buf->len = efx->rx_buffer_len - EFX_PAGE_IP_ALIGN;
-                rx_buf->is_page = true;
+                rx_buf->flags = EFX_RX_BUF_PAGE;
                 ++rx_queue->added_count;
                 ++rx_queue->alloc_page_count;
                 ++state->refcnt;
@@ -249,7 +248,7 @@ static int efx_init_rx_buffers_page(struct efx_rx_queue *rx_queue)
 static void efx_unmap_rx_buffer(struct efx_nic *efx,
                                 struct efx_rx_buffer *rx_buf)
 {
-        if (rx_buf->is_page && rx_buf->u.page) {
+        if ((rx_buf->flags & EFX_RX_BUF_PAGE) && rx_buf->u.page) {
                 struct efx_rx_page_state *state;
 
                 state = page_address(rx_buf->u.page);
@@ -259,7 +258,7 @@ static void efx_unmap_rx_buffer(struct efx_nic *efx,
                                        efx_rx_buf_size(efx),
                                        PCI_DMA_FROMDEVICE);
                 }
-        } else if (!rx_buf->is_page && rx_buf->u.skb) {
+        } else if (!(rx_buf->flags & EFX_RX_BUF_PAGE) && rx_buf->u.skb) {
                 pci_unmap_single(efx->pci_dev, rx_buf->dma_addr,
                                  rx_buf->len, PCI_DMA_FROMDEVICE);
         }
@@ -268,10 +267,10 @@ static void efx_unmap_rx_buffer(struct efx_nic *efx,
 static void efx_free_rx_buffer(struct efx_nic *efx,
                                struct efx_rx_buffer *rx_buf)
 {
-        if (rx_buf->is_page && rx_buf->u.page) {
+        if ((rx_buf->flags & EFX_RX_BUF_PAGE) && rx_buf->u.page) {
                 __free_pages(rx_buf->u.page, efx->rx_buffer_order);
                 rx_buf->u.page = NULL;
-        } else if (!rx_buf->is_page && rx_buf->u.skb) {
+        } else if (!(rx_buf->flags & EFX_RX_BUF_PAGE) && rx_buf->u.skb) {
                 dev_kfree_skb_any(rx_buf->u.skb);
                 rx_buf->u.skb = NULL;
         }
@@ -311,7 +310,7 @@ static void efx_resurrect_rx_buffer(struct efx_rx_queue *rx_queue,
         new_buf->dma_addr = rx_buf->dma_addr ^ (PAGE_SIZE >> 1);
         new_buf->u.page = rx_buf->u.page;
         new_buf->len = rx_buf->len;
-        new_buf->is_page = true;
+        new_buf->flags = EFX_RX_BUF_PAGE;
         ++rx_queue->added_count;
 }
 
@@ -325,7 +324,10 @@ static void efx_recycle_rx_buffer(struct efx_channel *channel,
         struct efx_rx_buffer *new_buf;
         unsigned index;
 
-        if (rx_buf->is_page && efx->rx_buffer_len <= EFX_RX_HALF_PAGE &&
+        rx_buf->flags &= EFX_RX_BUF_PAGE;
+
+        if ((rx_buf->flags & EFX_RX_BUF_PAGE) &&
+            efx->rx_buffer_len <= EFX_RX_HALF_PAGE &&
             page_count(rx_buf->u.page) == 1)
                 efx_resurrect_rx_buffer(rx_queue, rx_buf);
 
@@ -412,8 +414,7 @@ void efx_rx_slow_fill(unsigned long context)
 
 static void efx_rx_packet__check_len(struct efx_rx_queue *rx_queue,
                                      struct efx_rx_buffer *rx_buf,
-                                     int len, bool *discard,
-                                     bool *leak_packet)
+                                     int len, bool *leak_packet)
 {
         struct efx_nic *efx = rx_queue->efx;
         unsigned max_len = rx_buf->len - efx->type->rx_buffer_padding;
@@ -424,7 +425,7 @@ static void efx_rx_packet__check_len(struct efx_rx_queue *rx_queue,
         /* The packet must be discarded, but this is only a fatal error
          * if the caller indicated it was
          */
-        *discard = true;
+        rx_buf->flags |= EFX_RX_PKT_DISCARD;
 
         if ((len > rx_buf->len) && EFX_WORKAROUND_8071(efx)) {
                 if (net_ratelimit())
@@ -437,7 +438,7 @@ static void efx_rx_packet__check_len(struct efx_rx_queue *rx_queue,
                  * data at the end of the skb will be trashed. So
                  * we have no choice but to leak the fragment.
                  */
-                *leak_packet = !rx_buf->is_page;
+                *leak_packet = !(rx_buf->flags & EFX_RX_BUF_PAGE);
                 efx_schedule_reset(efx, RESET_TYPE_RX_RECOVERY);
         } else {
                 if (net_ratelimit())
@@ -457,13 +458,13 @@ static void efx_rx_packet__check_len(struct efx_rx_queue *rx_queue,
  */
 static void efx_rx_packet_gro(struct efx_channel *channel,
                               struct efx_rx_buffer *rx_buf,
-                              const u8 *eh, bool checksummed)
+                              const u8 *eh)
 {
         struct napi_struct *napi = &channel->napi_str;
         gro_result_t gro_result;
 
         /* Pass the skb/page into the GRO engine */
-        if (rx_buf->is_page) {
+        if (rx_buf->flags & EFX_RX_BUF_PAGE) {
                 struct efx_nic *efx = channel->efx;
                 struct page *page = rx_buf->u.page;
                 struct sk_buff *skb;
@@ -485,8 +486,8 @@ static void efx_rx_packet_gro(struct efx_channel *channel,
                 skb->len = rx_buf->len;
                 skb->data_len = rx_buf->len;
                 skb->truesize += rx_buf->len;
-                skb->ip_summed =
-                        checksummed ? CHECKSUM_UNNECESSARY : CHECKSUM_NONE;
+                skb->ip_summed = ((rx_buf->flags & EFX_RX_PKT_CSUMMED) ?
+                                  CHECKSUM_UNNECESSARY : CHECKSUM_NONE);
 
                 skb_record_rx_queue(skb, channel->channel);
 
@@ -494,7 +495,7 @@ static void efx_rx_packet_gro(struct efx_channel *channel,
         } else {
                 struct sk_buff *skb = rx_buf->u.skb;
 
-                EFX_BUG_ON_PARANOID(!checksummed);
+                EFX_BUG_ON_PARANOID(!(rx_buf->flags & EFX_RX_PKT_CSUMMED));
                 rx_buf->u.skb = NULL;
 
                 gro_result = napi_gro_receive(napi, skb);
@@ -509,7 +510,7 @@ static void efx_rx_packet_gro(struct efx_channel *channel,
 }
 
 void efx_rx_packet(struct efx_rx_queue *rx_queue, unsigned int index,
-                   unsigned int len, bool checksummed, bool discard)
+                   unsigned int len, u16 flags)
 {
         struct efx_nic *efx = rx_queue->efx;
         struct efx_channel *channel = efx_rx_queue_channel(rx_queue);
@@ -517,6 +518,7 @@ void efx_rx_packet(struct efx_rx_queue *rx_queue, unsigned int index,
         bool leak_packet = false;
 
         rx_buf = efx_rx_buffer(rx_queue, index);
+        rx_buf->flags |= flags;
 
         /* This allows the refill path to post another buffer.
          * EFX_RXD_HEAD_ROOM ensures that the slot we are using
@@ -525,18 +527,17 @@ void efx_rx_packet(struct efx_rx_queue *rx_queue, unsigned int index,
         rx_queue->removed_count++;
 
         /* Validate the length encoded in the event vs the descriptor pushed */
-        efx_rx_packet__check_len(rx_queue, rx_buf, len,
-                                 &discard, &leak_packet);
+        efx_rx_packet__check_len(rx_queue, rx_buf, len, &leak_packet);
 
         netif_vdbg(efx, rx_status, efx->net_dev,
                    "RX queue %d received id %x at %llx+%x %s%s\n",
                    efx_rx_queue_index(rx_queue), index,
                    (unsigned long long)rx_buf->dma_addr, len,
-                   (checksummed ? " [SUMMED]" : ""),
-                   (discard ? " [DISCARD]" : ""));
+                   (rx_buf->flags & EFX_RX_PKT_CSUMMED) ? " [SUMMED]" : "",
+                   (rx_buf->flags & EFX_RX_PKT_DISCARD) ? " [DISCARD]" : "");
 
         /* Discard packet, if instructed to do so */
-        if (unlikely(discard)) {
+        if (unlikely(rx_buf->flags & EFX_RX_PKT_DISCARD)) {
                 if (unlikely(leak_packet))
                         channel->n_skbuff_leaks++;
                 else
@@ -563,18 +564,33 @@ void efx_rx_packet(struct efx_rx_queue *rx_queue, unsigned int index,
         rx_buf->len = len - efx->type->rx_buffer_hash_size;
 out:
         if (channel->rx_pkt)
-                __efx_rx_packet(channel,
-                                channel->rx_pkt, channel->rx_pkt_csummed);
+                __efx_rx_packet(channel, channel->rx_pkt);
         channel->rx_pkt = rx_buf;
-        channel->rx_pkt_csummed = checksummed;
+}
+
+static void efx_rx_deliver(struct efx_channel *channel,
+                           struct efx_rx_buffer *rx_buf)
+{
+        struct sk_buff *skb;
+
+        /* We now own the SKB */
+        skb = rx_buf->u.skb;
+        rx_buf->u.skb = NULL;
+
+        /* Set the SKB flags */
+        skb_checksum_none_assert(skb);
+
+        /* Pass the packet up */
+        netif_receive_skb(skb);
+
+        /* Update allocation strategy method */
+        channel->rx_alloc_level += RX_ALLOC_FACTOR_SKB;
 }
 
 /* Handle a received packet.  Second half: Touches packet payload. */
-void __efx_rx_packet(struct efx_channel *channel,
-                     struct efx_rx_buffer *rx_buf, bool checksummed)
+void __efx_rx_packet(struct efx_channel *channel, struct efx_rx_buffer *rx_buf)
 {
         struct efx_nic *efx = channel->efx;
-        struct sk_buff *skb;
         u8 *eh = efx_rx_buf_eh(efx, rx_buf);
 
         /* If we're in loopback test, then pass the packet directly to the
@@ -586,8 +602,8 @@ void __efx_rx_packet(struct efx_channel *channel,
                 return;
         }
 
-        if (!rx_buf->is_page) {
-                skb = rx_buf->u.skb;
+        if (!(rx_buf->flags & EFX_RX_BUF_PAGE)) {
+                struct sk_buff *skb = rx_buf->u.skb;
 
                 prefetch(skb_shinfo(skb));
 
@@ -605,25 +621,12 @@ void __efx_rx_packet(struct efx_channel *channel,
         }
 
         if (unlikely(!(efx->net_dev->features & NETIF_F_RXCSUM)))
-                checksummed = false;
-
-        if (likely(checksummed || rx_buf->is_page)) {
-                efx_rx_packet_gro(channel, rx_buf, eh, checksummed);
-                return;
-        }
-
-        /* We now own the SKB */
-        skb = rx_buf->u.skb;
-        rx_buf->u.skb = NULL;
+                rx_buf->flags &= ~EFX_RX_PKT_CSUMMED;
 
-        /* Set the SKB flags */
-        skb_checksum_none_assert(skb);
-
-        /* Pass the packet up */
-        netif_receive_skb(skb);
-
-        /* Update allocation strategy method */
-        channel->rx_alloc_level += RX_ALLOC_FACTOR_SKB;
+        if (likely(rx_buf->flags & (EFX_RX_BUF_PAGE | EFX_RX_PKT_CSUMMED)))
+                efx_rx_packet_gro(channel, rx_buf, eh);
+        else
+                efx_rx_deliver(channel, rx_buf);
 }
 
 void efx_rx_strategy(struct efx_channel *channel)
diff --git a/drivers/net/ethernet/sfc/selftest.c b/drivers/net/ethernet/sfc/selftest.c
index 52edd24fcde3..febe2a9e6211 100644
--- a/drivers/net/ethernet/sfc/selftest.c
+++ b/drivers/net/ethernet/sfc/selftest.c
@@ -19,7 +19,6 @@
 #include <linux/udp.h>
 #include <linux/rtnetlink.h>
 #include <linux/slab.h>
-#include <asm/io.h>
 #include "net_driver.h"
 #include "efx.h"
 #include "nic.h"
@@ -50,7 +49,7 @@ static const char payload_msg[] =
 
 /* Interrupt mode names */
 static const unsigned int efx_interrupt_mode_max = EFX_INT_MODE_MAX;
-static const char *efx_interrupt_mode_names[] = {
+static const char *const efx_interrupt_mode_names[] = {
         [EFX_INT_MODE_MSIX]   = "MSI-X",
         [EFX_INT_MODE_MSI]    = "MSI",
         [EFX_INT_MODE_LEGACY] = "legacy",
@@ -131,6 +130,8 @@ static int efx_test_chip(struct efx_nic *efx, struct efx_self_tests *tests)
 static int efx_test_interrupts(struct efx_nic *efx,
                                struct efx_self_tests *tests)
 {
+        int cpu;
+
         netif_dbg(efx, drv, efx->net_dev, "testing interrupts\n");
         tests->interrupt = -1;
 
@@ -143,7 +144,8 @@ static int efx_test_interrupts(struct efx_nic *efx,
         /* Wait for arrival of test interrupt. */
         netif_dbg(efx, drv, efx->net_dev, "waiting for test interrupt\n");
         schedule_timeout_uninterruptible(HZ / 10);
-        if (efx->last_irq_cpu >= 0)
+        cpu = ACCESS_ONCE(efx->last_irq_cpu);
+        if (cpu >= 0)
                 goto success;
 
         netif_err(efx, drv, efx->net_dev, "timed out waiting for interrupt\n");
@@ -151,8 +153,7 @@ static int efx_test_interrupts(struct efx_nic *efx,
 
  success:
         netif_dbg(efx, drv, efx->net_dev, "%s test interrupt seen on CPU%d\n",
-                  INT_MODE(efx),
-                efx->last_irq_cpu);
+                  INT_MODE(efx), cpu);
         tests->interrupt = 1;
         return 0;
 }
@@ -162,56 +163,57 @@ static int efx_test_eventq_irq(struct efx_channel *channel,
                                struct efx_self_tests *tests)
 {
         struct efx_nic *efx = channel->efx;
-        unsigned int read_ptr, count;
-
-        tests->eventq_dma[channel->channel] = -1;
-        tests->eventq_int[channel->channel] = -1;
-        tests->eventq_poll[channel->channel] = -1;
+        unsigned int read_ptr;
+        bool napi_ran, dma_seen, int_seen;
 
         read_ptr = channel->eventq_read_ptr;
-        channel->efx->last_irq_cpu = -1;
+        channel->last_irq_cpu = -1;
         smp_wmb();
 
         efx_nic_generate_test_event(channel);
 
-        /* Wait for arrival of interrupt */
-        count = 0;
-        do {
-                schedule_timeout_uninterruptible(HZ / 100);
-
-                if (ACCESS_ONCE(channel->eventq_read_ptr) != read_ptr)
-                        goto eventq_ok;
-        } while (++count < 2);
-
-        netif_err(efx, drv, efx->net_dev,
-                  "channel %d timed out waiting for event queue\n",
-                  channel->channel);
-
-        /* See if interrupt arrived */
-        if (channel->efx->last_irq_cpu >= 0) {
-                netif_err(efx, drv, efx->net_dev,
-                          "channel %d saw interrupt on CPU%d "
-                          "during event queue test\n", channel->channel,
-                          raw_smp_processor_id());
-                tests->eventq_int[channel->channel] = 1;
+        /* Wait for arrival of interrupt.  NAPI processing may or may
+         * not complete in time, but we can cope in any case.
+         */
+        msleep(10);
+        napi_disable(&channel->napi_str);
+        if (channel->eventq_read_ptr != read_ptr) {
+                napi_ran = true;
+                dma_seen = true;
+                int_seen = true;
+        } else {
+                napi_ran = false;
+                dma_seen = efx_nic_event_present(channel);
+                int_seen = ACCESS_ONCE(channel->last_irq_cpu) >= 0;
         }
+        napi_enable(&channel->napi_str);
+        efx_nic_eventq_read_ack(channel);
+
+        tests->eventq_dma[channel->channel] = dma_seen ? 1 : -1;
+        tests->eventq_int[channel->channel] = int_seen ? 1 : -1;
 
-        /* Check to see if event was received even if interrupt wasn't */
-        if (efx_nic_event_present(channel)) {
+        if (dma_seen && int_seen) {
+                netif_dbg(efx, drv, efx->net_dev,
+                          "channel %d event queue passed (with%s NAPI)\n",
+                          channel->channel, napi_ran ? "" : "out");
+                return 0;
+        } else {
+                /* Report failure and whether either interrupt or DMA worked */
                 netif_err(efx, drv, efx->net_dev,
-                          "channel %d event was generated, but "
-                          "failed to trigger an interrupt\n", channel->channel);
-                tests->eventq_dma[channel->channel] = 1;
+                          "channel %d timed out waiting for event queue\n",
+                          channel->channel);
+                if (int_seen)
+                        netif_err(efx, drv, efx->net_dev,
+                                  "channel %d saw interrupt "
+                                  "during event queue test\n",
+                                  channel->channel);
+                if (dma_seen)
+                        netif_err(efx, drv, efx->net_dev,
+                                  "channel %d event was generated, but "
+                                  "failed to trigger an interrupt\n",
+                                  channel->channel);
+                return -ETIMEDOUT;
         }
-
-        return -ETIMEDOUT;
- eventq_ok:
-        netif_dbg(efx, drv, efx->net_dev, "channel %d event queue passed\n",
-                  channel->channel);
-        tests->eventq_dma[channel->channel] = 1;
-        tests->eventq_int[channel->channel] = 1;
-        tests->eventq_poll[channel->channel] = 1;
-        return 0;
 }
 
 static int efx_test_phy(struct efx_nic *efx, struct efx_self_tests *tests,
@@ -316,7 +318,7 @@ void efx_loopback_rx_packet(struct efx_nic *efx,
         return;
 
  err:
-#ifdef EFX_ENABLE_DEBUG
+#ifdef DEBUG
         if (atomic_read(&state->rx_bad) == 0) {
                 netif_err(efx, drv, efx->net_dev, "received packet:\n");
                 print_hex_dump(KERN_ERR, "", DUMP_PREFIX_OFFSET, 0x10, 1,
@@ -395,11 +397,9 @@ static int efx_begin_loopback(struct efx_tx_queue *tx_queue)
                  * interrupt handler. */
                 smp_wmb();
 
-                if (efx_dev_registered(efx))
-                        netif_tx_lock_bh(efx->net_dev);
+                netif_tx_lock_bh(efx->net_dev);
                 rc = efx_enqueue_skb(tx_queue, skb);
-                if (efx_dev_registered(efx))
-                        netif_tx_unlock_bh(efx->net_dev);
+                netif_tx_unlock_bh(efx->net_dev);
 
                 if (rc != NETDEV_TX_OK) {
                         netif_err(efx, drv, efx->net_dev,
@@ -440,20 +440,18 @@ static int efx_end_loopback(struct efx_tx_queue *tx_queue,
         int tx_done = 0, rx_good, rx_bad;
         int i, rc = 0;
 
-        if (efx_dev_registered(efx))
-                netif_tx_lock_bh(efx->net_dev);
+        netif_tx_lock_bh(efx->net_dev);
 
         /* Count the number of tx completions, and decrement the refcnt. Any
          * skbs not already completed will be free'd when the queue is flushed */
-        for (i=0; i < state->packet_count; i++) {
+        for (i = 0; i < state->packet_count; i++) {
                 skb = state->skbs[i];
                 if (skb && !skb_shared(skb))
                         ++tx_done;
                 dev_kfree_skb_any(skb);
         }
 
-        if (efx_dev_registered(efx))
-                netif_tx_unlock_bh(efx->net_dev);
+        netif_tx_unlock_bh(efx->net_dev);
 
         /* Check TX completion and received packet counts */
         rx_good = atomic_read(&state->rx_good);
@@ -570,7 +568,7 @@ static int efx_wait_for_link(struct efx_nic *efx)
                 mutex_lock(&efx->mac_lock);
                 link_up = link_state->up;
                 if (link_up)
-                        link_up = !efx->mac_op->check_fault(efx);
+                        link_up = !efx->type->check_mac_fault(efx);
                 mutex_unlock(&efx->mac_lock);
 
                 if (link_up) {
diff --git a/drivers/net/ethernet/sfc/selftest.h b/drivers/net/ethernet/sfc/selftest.h
index dba5456e70f3..87abe2a53846 100644
--- a/drivers/net/ethernet/sfc/selftest.h
+++ b/drivers/net/ethernet/sfc/selftest.h
@@ -37,7 +37,6 @@ struct efx_self_tests {
         int interrupt;
         int eventq_dma[EFX_MAX_CHANNELS];
         int eventq_int[EFX_MAX_CHANNELS];
-        int eventq_poll[EFX_MAX_CHANNELS];
         /* offline tests */
         int registers;
         int phy_ext[EFX_MAX_PHY_TESTS];
diff --git a/drivers/net/ethernet/sfc/siena.c b/drivers/net/ethernet/sfc/siena.c
index 4d5d619feaa6..d3c4169e2a0b 100644
--- a/drivers/net/ethernet/sfc/siena.c
+++ b/drivers/net/ethernet/sfc/siena.c
@@ -18,7 +18,6 @@
 #include "bitfield.h"
 #include "efx.h"
 #include "nic.h"
-#include "mac.h"
 #include "spi.h"
 #include "regs.h"
 #include "io.h"
@@ -36,8 +35,6 @@ static void siena_push_irq_moderation(struct efx_channel *channel)
 {
         efx_dword_t timer_cmd;
 
-        BUILD_BUG_ON(EFX_IRQ_MOD_MAX > (1 << FRF_CZ_TC_TIMER_VAL_WIDTH));
-
         if (channel->irq_moderation)
                 EFX_POPULATE_DWORD_2(timer_cmd,
                                      FRF_CZ_TC_TIMER_MODE,
@@ -53,15 +50,6 @@ static void siena_push_irq_moderation(struct efx_channel *channel)
                                channel->channel);
 }
 
-static void siena_push_multicast_hash(struct efx_nic *efx)
-{
-        WARN_ON(!mutex_is_locked(&efx->mac_lock));
-
-        efx_mcdi_rpc(efx, MC_CMD_SET_MCAST_HASH,
-                     efx->multicast_hash.byte, sizeof(efx->multicast_hash),
-                     NULL, 0, NULL);
-}
-
 static int siena_mdio_write(struct net_device *net_dev,
                             int prtad, int devad, u16 addr, u16 value)
 {
@@ -226,7 +214,15 @@ static int siena_reset_hw(struct efx_nic *efx, enum reset_type method)
 
 static int siena_probe_nvconfig(struct efx_nic *efx)
 {
-        return efx_mcdi_get_board_cfg(efx, efx->net_dev->perm_addr, NULL);
+        u32 caps = 0;
+        int rc;
+
+        rc = efx_mcdi_get_board_cfg(efx, efx->net_dev->perm_addr, NULL, &caps);
+
+        efx->timer_quantum_ns =
+                (caps & (1 << MC_CMD_CAPABILITIES_TURBO_ACTIVE_LBN)) ?
+                3072 : 6144; /* 768 cycles */
+        return rc;
 }
 
 static int siena_probe_nic(struct efx_nic *efx)
@@ -304,6 +300,10 @@ static int siena_probe_nic(struct efx_nic *efx)
                 goto fail5;
         }
 
+        rc = efx_mcdi_mon_probe(efx);
+        if (rc)
+                goto fail5;
+
         return 0;
 
 fail5:
@@ -391,6 +391,8 @@ static int siena_init_nic(struct efx_nic *efx)
 
 static void siena_remove_nic(struct efx_nic *efx)
 {
+        efx_mcdi_mon_remove(efx);
+
         efx_nic_free_buffer(efx, &efx->irq_status);
 
         siena_reset_hw(efx, RESET_TYPE_ALL);
@@ -630,14 +632,14 @@ const struct efx_nic_type siena_a0_nic_type = {
         .stop_stats = siena_stop_nic_stats,
         .set_id_led = efx_mcdi_set_id_led,
         .push_irq_moderation = siena_push_irq_moderation,
-        .push_multicast_hash = siena_push_multicast_hash,
+        .reconfigure_mac = efx_mcdi_mac_reconfigure,
+        .check_mac_fault = efx_mcdi_mac_check_fault,
         .reconfigure_port = efx_mcdi_phy_reconfigure,
         .get_wol = siena_get_wol,
         .set_wol = siena_set_wol,
         .resume_wol = siena_init_wol,
         .test_registers = siena_test_registers,
         .test_nvram = efx_mcdi_nvram_test_all,
-        .default_mac_ops = &efx_mcdi_mac_operations,
 
         .revision = EFX_REV_SIENA_A0,
         .mem_map_size = (FR_CZ_MC_TREG_SMEM +
@@ -654,6 +656,7 @@ const struct efx_nic_type siena_a0_nic_type = {
         .phys_addr_channels = 32, /* Hardware limit is 64, but the legacy
                                    * interrupt handler only supports 32
                                    * channels */
+        .timer_period_max = 1 << FRF_CZ_TC_TIMER_VAL_WIDTH,
         .tx_dc_base = 0x88000,
         .rx_dc_base = 0x68000,
         .offload_features = (NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM |
diff --git a/drivers/net/ethernet/sfc/spi.h b/drivers/net/ethernet/sfc/spi.h
index 71f2e3ebe1c7..5431a1bbff5c 100644
--- a/drivers/net/ethernet/sfc/spi.h
+++ b/drivers/net/ethernet/sfc/spi.h
@@ -68,7 +68,7 @@ static inline bool efx_spi_present(const struct efx_spi_device *spi)
 
 int falcon_spi_cmd(struct efx_nic *efx,
                    const struct efx_spi_device *spi, unsigned int command,
-                   int address, const void* in, void *out, size_t len);
+                   int address, const void *in, void *out, size_t len);
 int falcon_spi_wait_write(struct efx_nic *efx,
                           const struct efx_spi_device *spi);
 int falcon_spi_read(struct efx_nic *efx,
diff --git a/drivers/net/ethernet/sfc/tenxpress.c b/drivers/net/ethernet/sfc/tenxpress.c
index 7b0fd89e7b85..d37cb5017129 100644
--- a/drivers/net/ethernet/sfc/tenxpress.c
+++ b/drivers/net/ethernet/sfc/tenxpress.c
@@ -121,7 +121,7 @@
 #define GPHY_XCONTROL_REG       49152
 #define GPHY_ISOLATE_LBN        10
 #define GPHY_ISOLATE_WIDTH      1
-#define GPHY_DUPLEX_LBN         8
+#define GPHY_DUPLEX_LBN         8
 #define GPHY_DUPLEX_WIDTH       1
 #define GPHY_LOOPBACK_NEAR_LBN  14
 #define GPHY_LOOPBACK_NEAR_WIDTH 1
diff --git a/drivers/net/ethernet/sfc/tx.c b/drivers/net/ethernet/sfc/tx.c
index 72f0fbc73b1a..5cb81fa3fcbd 100644
--- a/drivers/net/ethernet/sfc/tx.c
+++ b/drivers/net/ethernet/sfc/tx.c
@@ -446,10 +446,8 @@ void efx_xmit_done(struct efx_tx_queue *tx_queue, unsigned int index)
             likely(efx->port_enabled) &&
             likely(netif_device_present(efx->net_dev))) {
                 fill_level = tx_queue->insert_count - tx_queue->read_count;
-                if (fill_level < EFX_TXQ_THRESHOLD(efx)) {
-                        EFX_BUG_ON_PARANOID(!efx_dev_registered(efx));
+                if (fill_level < EFX_TXQ_THRESHOLD(efx))
                         netif_tx_wake_queue(tx_queue->core_txq);
-                }
         }
 
         /* Check whether the hardware queue is now empty */
diff --git a/drivers/net/ethernet/sfc/txc43128_phy.c b/drivers/net/ethernet/sfc/txc43128_phy.c
index 7c21b334a75b..29bb3f9941c0 100644
--- a/drivers/net/ethernet/sfc/txc43128_phy.c
+++ b/drivers/net/ethernet/sfc/txc43128_phy.c
@@ -512,7 +512,7 @@ static bool txc43128_phy_poll(struct efx_nic *efx)
         return efx->link_state.up != was_up;
 }
 
-static const char *txc43128_test_names[] = {
+static const char *const txc43128_test_names[] = {
         "bist"
 };
 
diff --git a/drivers/net/ethernet/sis/sis190.c b/drivers/net/ethernet/sis/sis190.c
index 5b118cd5bf94..a9deda8eaf63 100644
--- a/drivers/net/ethernet/sis/sis190.c
+++ b/drivers/net/ethernet/sis/sis190.c
@@ -1462,8 +1462,6 @@ static struct net_device * __devinit sis190_init_board(struct pci_dev *pdev)
 
         dev = alloc_etherdev(sizeof(*tp));
         if (!dev) {
-                if (netif_msg_drv(&debug))
-                        pr_err("unable to alloc new ethernet\n");
                 rc = -ENOMEM;
                 goto err_out_0;
         }
diff --git a/drivers/net/ethernet/sis/sis900.c b/drivers/net/ethernet/sis/sis900.c
index c8efc708c792..f968898c86db 100644
--- a/drivers/net/ethernet/sis/sis900.c
+++ b/drivers/net/ethernet/sis/sis900.c
@@ -619,7 +619,6 @@ static int __devinit sis900_mii_probe(struct net_device * net_dev)
                 }
 
                 if ((mii_phy = kmalloc(sizeof(struct mii_phy), GFP_KERNEL)) == NULL) {
-                        printk(KERN_WARNING "Cannot allocate mem for struct mii_phy\n");
                         mii_phy = sis_priv->first_mii;
                         while (mii_phy) {
                                 struct mii_phy *phy;
@@ -1167,7 +1166,7 @@ sis900_init_rx_ring(struct net_device *net_dev)
         for (i = 0; i < NUM_RX_DESC; i++) {
                 struct sk_buff *skb;
 
-                if ((skb = dev_alloc_skb(RX_BUF_SIZE)) == NULL) {
+                if ((skb = netdev_alloc_skb(net_dev, RX_BUF_SIZE)) == NULL) {
                         /* not enough memory for skbuff, this makes a "hole"
                            on the buffer ring, it is not clear how the
                            hardware will react to this kind of degenerated
@@ -1770,7 +1769,7 @@ static int sis900_rx(struct net_device *net_dev)
 
                         /* refill the Rx buffer, what if there is not enough
                          * memory for new socket buffer ?? */
-                        if ((skb = dev_alloc_skb(RX_BUF_SIZE)) == NULL) {
+                        if ((skb = netdev_alloc_skb(net_dev, RX_BUF_SIZE)) == NULL) {
                                 /*
                                  * Not enough memory to refill the buffer
                                  * so we need to recycle the old one so
@@ -1828,7 +1827,7 @@ refill_rx_ring:
                 entry = sis_priv->dirty_rx % NUM_RX_DESC;
 
                 if (sis_priv->rx_skbuff[entry] == NULL) {
-                        if ((skb = dev_alloc_skb(RX_BUF_SIZE)) == NULL) {
+                        if ((skb = netdev_alloc_skb(net_dev, RX_BUF_SIZE)) == NULL) {
                                 /* not enough memory for skbuff, this makes a
                                  * "hole" on the buffer ring, it is not clear
                                  * how the hardware will react to this kind
diff --git a/drivers/net/ethernet/smsc/epic100.c b/drivers/net/ethernet/smsc/epic100.c
index 2c077ce0b6d6..2a662e6112e9 100644
--- a/drivers/net/ethernet/smsc/epic100.c
+++ b/drivers/net/ethernet/smsc/epic100.c
@@ -363,10 +363,9 @@ static int __devinit epic_init_one (struct pci_dev *pdev,
         ret = -ENOMEM;
 
         dev = alloc_etherdev(sizeof (*ep));
-        if (!dev) {
-                dev_err(&pdev->dev, "no memory for eth device\n");
+        if (!dev)
                 goto err_out_free_res;
-        }
+
         SET_NETDEV_DEV(dev, &pdev->dev);
 
 #ifdef USE_IO_OPS
@@ -935,7 +934,7 @@ static void epic_init_ring(struct net_device *dev)
 
         /* Fill in the Rx buffers.  Handle allocation failure gracefully. */
         for (i = 0; i < RX_RING_SIZE; i++) {
-                struct sk_buff *skb = dev_alloc_skb(ep->rx_buf_sz + 2);
+                struct sk_buff *skb = netdev_alloc_skb(dev, ep->rx_buf_sz + 2);
                 ep->rx_skbuff[i] = skb;
                 if (skb == NULL)
                         break;
@@ -1200,7 +1199,7 @@ static int epic_rx(struct net_device *dev, int budget)
                         /* Check if the packet is long enough to accept without copying
                            to a minimally-sized skbuff. */
                         if (pkt_len < rx_copybreak &&
-                            (skb = dev_alloc_skb(pkt_len + 2)) != NULL) {
+                            (skb = netdev_alloc_skb(dev, pkt_len + 2)) != NULL) {
                                 skb_reserve(skb, 2);    /* 16 byte align the IP header */
                                 pci_dma_sync_single_for_cpu(ep->pci_dev,
                                                             ep->rx_ring[entry].bufaddr,
@@ -1233,7 +1232,7 @@ static int epic_rx(struct net_device *dev, int budget)
                 entry = ep->dirty_rx % RX_RING_SIZE;
                 if (ep->rx_skbuff[entry] == NULL) {
                         struct sk_buff *skb;
-                        skb = ep->rx_skbuff[entry] = dev_alloc_skb(ep->rx_buf_sz + 2);
+                        skb = ep->rx_skbuff[entry] = netdev_alloc_skb(dev, ep->rx_buf_sz + 2);
                         if (skb == NULL)
                                 break;
                         skb_reserve(skb, 2);    /* Align IP on 16 byte boundaries */
diff --git a/drivers/net/ethernet/smsc/smc911x.c b/drivers/net/ethernet/smsc/smc911x.c
index 313ba3b32ab4..8814b2f5d46f 100644
--- a/drivers/net/ethernet/smsc/smc911x.c
+++ b/drivers/net/ethernet/smsc/smc911x.c
@@ -401,7 +401,7 @@ static inline void	 smc911x_rcv(struct net_device *dev)
         } else {
                 /* Receive a valid packet */
                 /* Alloc a buffer with extra room for DMA alignment */
-                skb=dev_alloc_skb(pkt_len+32);
+                skb = netdev_alloc_skb(dev, pkt_len+32);
                 if (unlikely(skb == NULL)) {
                         PRINTK( "%s: Low memory, rcvd packet dropped.\n",
                                 dev->name);
@@ -2065,7 +2065,6 @@ static int __devinit smc911x_drv_probe(struct platform_device *pdev)
 
         ndev = alloc_etherdev(sizeof(struct smc911x_local));
         if (!ndev) {
-                printk("%s: could not allocate device.\n", CARDNAME);
                 ret = -ENOMEM;
                 goto release_1;
         }
diff --git a/drivers/net/ethernet/smsc/smc9194.c b/drivers/net/ethernet/smsc/smc9194.c
index 4e45094efb18..50823da9dc1e 100644
--- a/drivers/net/ethernet/smsc/smc9194.c
+++ b/drivers/net/ethernet/smsc/smc9194.c
@@ -1222,7 +1222,7 @@ static void smc_rcv(struct net_device *dev)
                 if ( status & RS_MULTICAST )
                         dev->stats.multicast++;
 
-                skb = dev_alloc_skb( packet_length + 5);
+                skb = netdev_alloc_skb(dev, packet_length + 5);
 
                 if ( skb == NULL ) {
                         printk(KERN_NOTICE CARDNAME ": Low memory, packet dropped.\n");
diff --git a/drivers/net/ethernet/smsc/smc91c92_cs.c b/drivers/net/ethernet/smsc/smc91c92_cs.c
index ada927aba7a5..d12e48a7861d 100644
--- a/drivers/net/ethernet/smsc/smc91c92_cs.c
+++ b/drivers/net/ethernet/smsc/smc91c92_cs.c
@@ -1500,7 +1500,7 @@ static void smc_rx(struct net_device *dev)
         struct sk_buff *skb;
         
         /* Note: packet_length adds 5 or 6 extra bytes here! */
-        skb = dev_alloc_skb(packet_length+2);
+        skb = netdev_alloc_skb(dev, packet_length+2);
         
         if (skb == NULL) {
             pr_debug("%s: Low memory, packet dropped.\n", dev->name);
diff --git a/drivers/net/ethernet/smsc/smc91x.c b/drivers/net/ethernet/smsc/smc91x.c
index 64ad3ed74495..1dc4fad593e7 100644
--- a/drivers/net/ethernet/smsc/smc91x.c
+++ b/drivers/net/ethernet/smsc/smc91x.c
@@ -463,7 +463,7 @@ static inline void  smc_rcv(struct net_device *dev)
                  * multiple of 4 bytes on 32 bit buses.
                  * Hence packet_len - 6 + 2 + 2 + 2.
                  */
-                skb = dev_alloc_skb(packet_len);
+                skb = netdev_alloc_skb(dev, packet_len);
                 if (unlikely(skb == NULL)) {
                         printk(KERN_NOTICE "%s: Low memory, packet dropped.\n",
                                 dev->name);
@@ -2223,7 +2223,6 @@ static int __devinit smc_drv_probe(struct platform_device *pdev)
 
         ndev = alloc_etherdev(sizeof(struct smc_local));
         if (!ndev) {
-                printk("%s: could not allocate device.\n", CARDNAME);
                 ret = -ENOMEM;
                 goto out;
         }
diff --git a/drivers/net/ethernet/smsc/smsc911x.c b/drivers/net/ethernet/smsc/smsc911x.c
index 24d2df068d71..6a1cd2360818 100644
--- a/drivers/net/ethernet/smsc/smsc911x.c
+++ b/drivers/net/ethernet/smsc/smsc911x.c
@@ -2374,7 +2374,6 @@ static int __devinit smsc911x_drv_probe(struct platform_device *pdev)
 
         dev = alloc_etherdev(sizeof(struct smsc911x_data));
         if (!dev) {
-                pr_warn("Could not allocate device\n");
                 retval = -ENOMEM;
                 goto out_release_io_1;
         }
diff --git a/drivers/net/ethernet/smsc/smsc9420.c b/drivers/net/ethernet/smsc/smsc9420.c
index a9efbdfe5302..ee1a1680b7a8 100644
--- a/drivers/net/ethernet/smsc/smsc9420.c
+++ b/drivers/net/ethernet/smsc/smsc9420.c
@@ -850,8 +850,6 @@ static int smsc9420_alloc_rx_buffer(struct smsc9420_pdata *pd, int index)
                 return -ENOMEM;
         }
 
-        skb->dev = pd->dev;
-
         mapping = pci_map_single(pd->pdev, skb_tail_pointer(skb),
                                  PKT_BUF_SZ, PCI_DMA_FROMDEVICE);
         if (pci_dma_mapping_error(pd->pdev, mapping)) {
@@ -1598,10 +1596,8 @@ smsc9420_probe(struct pci_dev *pdev, const struct pci_device_id *id)
         pci_set_master(pdev);
 
         dev = alloc_etherdev(sizeof(*pd));
-        if (!dev) {
-                printk(KERN_ERR "ether device alloc failed\n");
+        if (!dev)
                 goto out_disable_pci_device_1;
-        }
 
         SET_NETDEV_DEV(dev, &pdev->dev);
 
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index 96fa2da30763..166fc95e5baf 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -954,10 +954,9 @@ static int stmmac_open(struct net_device *dev)
 
 #ifdef CONFIG_STMMAC_TIMER
         priv->tm = kzalloc(sizeof(struct stmmac_timer *), GFP_KERNEL);
-        if (unlikely(priv->tm == NULL)) {
-                pr_err("%s: ERROR: timer memory alloc failed\n", __func__);
+        if (unlikely(priv->tm == NULL))
                 return -ENOMEM;
-        }
+
         priv->tm->freq = tmrate;
 
         /* Test if the external timer can be actually used.
@@ -1802,10 +1801,8 @@ struct stmmac_priv *stmmac_dvr_probe(struct device *device,
         struct stmmac_priv *priv;
 
         ndev = alloc_etherdev(sizeof(struct stmmac_priv));
-        if (!ndev) {
-                pr_err("%s: ERROR: allocating the device\n", __func__);
+        if (!ndev)
                 return NULL;
-        }
 
         SET_NETDEV_DEV(ndev, device);
 
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c
index c796de9eed72..6ce0706b2d1b 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c
@@ -85,7 +85,7 @@ static int __devinit stmmac_pci_probe(struct pci_dev *pdev,
                         continue;
                 addr = pci_iomap(pdev, i, 0);
                 if (addr == NULL) {
-                        pr_err("%s: ERROR: cannot map regiser memory, aborting",
+                        pr_err("%s: ERROR: cannot map register memory, aborting",
                                __func__);
                         ret = -EIO;
                         goto err_out_map_failed;
diff --git a/drivers/net/ethernet/sun/cassini.c b/drivers/net/ethernet/sun/cassini.c
index f10665f594c4..b36edbd625dd 100644
--- a/drivers/net/ethernet/sun/cassini.c
+++ b/drivers/net/ethernet/sun/cassini.c
@@ -835,7 +835,6 @@ static int cas_saturn_firmware_init(struct cas *cp)
         cp->fw_data = vmalloc(cp->fw_size);
         if (!cp->fw_data) {
                 err = -ENOMEM;
-                pr_err("\"%s\" Failed %d\n", fw_name, err);
                 goto out;
         }
         memcpy(cp->fw_data, &fw->data[2], cp->fw_size);
@@ -1975,7 +1974,7 @@ static int cas_rx_process_pkt(struct cas *cp, struct cas_rx_comp *rxc,
         else
                 alloclen = max(hlen, RX_COPY_MIN);
 
-        skb = dev_alloc_skb(alloclen + swivel + cp->crc_size);
+        skb = netdev_alloc_skb(cp->dev, alloclen + swivel + cp->crc_size);
         if (skb == NULL)
                 return -1;
 
@@ -4947,7 +4946,6 @@ static int __devinit cas_init_one(struct pci_dev *pdev,
 
         dev = alloc_etherdev(sizeof(*cp));
         if (!dev) {
-                dev_err(&pdev->dev, "Etherdev alloc failed, aborting\n");
                 err = -ENOMEM;
                 goto err_out_disable_pdev;
         }
diff --git a/drivers/net/ethernet/sun/niu.c b/drivers/net/ethernet/sun/niu.c
index cf433931304f..d83c50816714 100644
--- a/drivers/net/ethernet/sun/niu.c
+++ b/drivers/net/ethernet/sun/niu.c
@@ -9685,10 +9685,8 @@ static struct net_device * __devinit niu_alloc_and_init(
         struct niu *np;
 
         dev = alloc_etherdev_mq(sizeof(struct niu), NIU_NUM_TXCHAN);
-        if (!dev) {
-                dev_err(gen_dev, "Etherdev alloc failed, aborting\n");
+        if (!dev)
                 return NULL;
-        }
 
         SET_NETDEV_DEV(dev, gen_dev);
 
diff --git a/drivers/net/ethernet/sun/sunbmac.c b/drivers/net/ethernet/sun/sunbmac.c
index 220f724c3377..f359863b5340 100644
--- a/drivers/net/ethernet/sun/sunbmac.c
+++ b/drivers/net/ethernet/sun/sunbmac.c
@@ -853,7 +853,7 @@ static void bigmac_rx(struct bigmac *bp)
                         /* Trim the original skb for the netif. */
                         skb_trim(skb, len);
                 } else {
-                        struct sk_buff *copy_skb = dev_alloc_skb(len + 2);
+                        struct sk_buff *copy_skb = netdev_alloc_skb(bp->dev, len + 2);
 
                         if (copy_skb == NULL) {
                                 drops++;
diff --git a/drivers/net/ethernet/sun/sungem.c b/drivers/net/ethernet/sun/sungem.c
index 31441a870b0b..ba041596e046 100644
--- a/drivers/net/ethernet/sun/sungem.c
+++ b/drivers/net/ethernet/sun/sungem.c
@@ -2885,7 +2885,6 @@ static int __devinit gem_init_one(struct pci_dev *pdev,
 
         dev = alloc_etherdev(sizeof(*gp));
         if (!dev) {
-                pr_err("Etherdev alloc failed, aborting\n");
                 err = -ENOMEM;
                 goto err_disable_device;
         }
diff --git a/drivers/net/ethernet/sun/sunhme.c b/drivers/net/ethernet/sun/sunhme.c
index 09c518655db2..8b627e2f798d 100644
--- a/drivers/net/ethernet/sun/sunhme.c
+++ b/drivers/net/ethernet/sun/sunhme.c
@@ -2043,7 +2043,7 @@ static void happy_meal_rx(struct happy_meal *hp, struct net_device *dev)
                         /* Trim the original skb for the netif. */
                         skb_trim(skb, len);
                 } else {
-                        struct sk_buff *copy_skb = dev_alloc_skb(len + 2);
+                        struct sk_buff *copy_skb = netdev_alloc_skb(dev, len + 2);
 
                         if (copy_skb == NULL) {
                                 drops++;
diff --git a/drivers/net/ethernet/sun/sunqe.c b/drivers/net/ethernet/sun/sunqe.c
index b28f74367ebe..b42d1c5a6ca1 100644
--- a/drivers/net/ethernet/sun/sunqe.c
+++ b/drivers/net/ethernet/sun/sunqe.c
@@ -435,7 +435,7 @@ static void qe_rx(struct sunqe *qep)
                         dev->stats.rx_length_errors++;
                         dev->stats.rx_dropped++;
                 } else {
-                        skb = dev_alloc_skb(len + 2);
+                        skb = netdev_alloc_skb(dev, len + 2);
                         if (skb == NULL) {
                                 drops++;
                                 dev->stats.rx_dropped++;
diff --git a/drivers/net/ethernet/sun/sunvnet.c b/drivers/net/ethernet/sun/sunvnet.c
index 8c6c059f3489..92a037a8228a 100644
--- a/drivers/net/ethernet/sun/sunvnet.c
+++ b/drivers/net/ethernet/sun/sunvnet.c
@@ -949,10 +949,9 @@ static int __devinit vnet_port_alloc_tx_bufs(struct vnet_port *port)
                 int map_len = (ETH_FRAME_LEN + 7) & ~7;
 
                 err = -ENOMEM;
-                if (!buf) {
-                        pr_err("TX buffer allocation failure\n");
+                if (!buf)
                         goto err_out;
-                }
+
                 err = -EFAULT;
                 if ((unsigned long)buf & (8UL - 1)) {
                         pr_err("TX buffer misaligned\n");
@@ -1027,10 +1026,8 @@ static struct vnet * __devinit vnet_new(const u64 *local_mac)
         int err, i;
 
         dev = alloc_etherdev(sizeof(*vp));
-        if (!dev) {
-                pr_err("Etherdev alloc failed, aborting\n");
+        if (!dev)
                 return ERR_PTR(-ENOMEM);
-        }
 
         for (i = 0; i < ETH_ALEN; i++)
                 dev->dev_addr[i] = (*local_mac >> (5 - i) * 8) & 0xff;
@@ -1165,10 +1162,8 @@ static int __devinit vnet_port_probe(struct vio_dev *vdev,
 
         port = kzalloc(sizeof(*port), GFP_KERNEL);
         err = -ENOMEM;
-        if (!port) {
-                pr_err("Cannot allocate vnet_port\n");
+        if (!port)
                 goto err_out_put_mdesc;
-        }
 
         for (i = 0; i < ETH_ALEN; i++)
                 port->raddr[i] = (*rmac >> (5 - i) * 8) & 0xff;
diff --git a/drivers/net/ethernet/tehuti/tehuti.c b/drivers/net/ethernet/tehuti/tehuti.c
index 4b19e9b0606b..ad973ffc9ff3 100644
--- a/drivers/net/ethernet/tehuti/tehuti.c
+++ b/drivers/net/ethernet/tehuti/tehuti.c
@@ -1089,12 +1089,11 @@ static void bdx_rx_alloc_skbs(struct bdx_priv *priv, struct rxf_fifo *f)
         ENTER;
         dno = bdx_rxdb_available(db) - 1;
         while (dno > 0) {
-                skb = dev_alloc_skb(f->m.pktsz + NET_IP_ALIGN);
+                skb = netdev_alloc_skb(priv->ndev, f->m.pktsz + NET_IP_ALIGN);
                 if (!skb) {
-                        pr_err("NO MEM: dev_alloc_skb failed\n");
+                        pr_err("NO MEM: netdev_alloc_skb failed\n");
                         break;
                 }
-                skb->dev = priv->ndev;
                 skb_reserve(skb, NET_IP_ALIGN);
 
                 idx = bdx_rxdb_alloc_elem(db);
@@ -1258,7 +1257,7 @@ static int bdx_rx_receive(struct bdx_priv *priv, struct rxd_fifo *f, int budget)
                 skb = dm->skb;
 
                 if (len < BDX_COPYBREAK &&
-                    (skb2 = dev_alloc_skb(len + NET_IP_ALIGN))) {
+                    (skb2 = netdev_alloc_skb(priv->ndev, len + NET_IP_ALIGN))) {
                         skb_reserve(skb2, NET_IP_ALIGN);
                         /*skb_put(skb2, len); */
                         pci_dma_sync_single_for_cpu(priv->pdev,
@@ -1978,7 +1977,6 @@ bdx_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
                 ndev = alloc_etherdev(sizeof(struct bdx_priv));
                 if (!ndev) {
                         err = -ENOMEM;
-                        pr_err("alloc_etherdev failed\n");
                         goto err_out_iomap;
                 }
 
diff --git a/drivers/net/ethernet/ti/cpmac.c b/drivers/net/ethernet/ti/cpmac.c
index 4d9a28ffd3c3..97e1df330a17 100644
--- a/drivers/net/ethernet/ti/cpmac.c
+++ b/drivers/net/ethernet/ti/cpmac.c
@@ -1143,11 +1143,8 @@ static int __devinit cpmac_probe(struct platform_device *pdev)
         }
 
         dev = alloc_etherdev_mq(sizeof(*priv), CPMAC_QUEUES);
-
-        if (!dev) {
-                printk(KERN_ERR "cpmac: Unable to allocate net_device\n");
+        if (!dev)
                 return -ENOMEM;
-        }
 
         platform_set_drvdata(pdev, dev);
         priv = netdev_priv(dev);
diff --git a/drivers/net/ethernet/ti/davinci_emac.c b/drivers/net/ethernet/ti/davinci_emac.c
index 4fa0bcb25dfc..6b0659c59ddd 100644
--- a/drivers/net/ethernet/ti/davinci_emac.c
+++ b/drivers/net/ethernet/ti/davinci_emac.c
@@ -992,10 +992,9 @@ static irqreturn_t emac_irq(int irq, void *dev_id)
 
 static struct sk_buff *emac_rx_alloc(struct emac_priv *priv)
 {
-        struct sk_buff *skb = dev_alloc_skb(priv->rx_buf_size);
+        struct sk_buff *skb = netdev_alloc_skb(priv->ndev, priv->rx_buf_size);
         if (WARN_ON(!skb))
                 return NULL;
-        skb->dev = priv->ndev;
         skb_reserve(skb, NET_IP_ALIGN);
         return skb;
 }
@@ -1790,7 +1789,6 @@ static int __devinit davinci_emac_probe(struct platform_device *pdev)
 
         ndev = alloc_etherdev(sizeof(struct emac_priv));
         if (!ndev) {
-                dev_err(&pdev->dev, "error allocating net_device\n");
                 rc = -ENOMEM;
                 goto free_clk;
         }
diff --git a/drivers/net/ethernet/ti/tlan.c b/drivers/net/ethernet/ti/tlan.c
index 9c0dd6b8d6c9..817ad3bc4957 100644
--- a/drivers/net/ethernet/ti/tlan.c
+++ b/drivers/net/ethernet/ti/tlan.c
@@ -486,7 +486,6 @@ static int __devinit tlan_probe1(struct pci_dev *pdev,
 
         dev = alloc_etherdev(sizeof(struct tlan_priv));
         if (dev == NULL) {
-                pr_err("Could not allocate memory for device\n");
                 rc = -ENOMEM;
                 goto err_out_regions;
         }
diff --git a/drivers/net/ethernet/tile/tilepro.c b/drivers/net/ethernet/tile/tilepro.c
index d9951afb9269..a8e5daaef6fa 100644
--- a/drivers/net/ethernet/tile/tilepro.c
+++ b/drivers/net/ethernet/tile/tilepro.c
@@ -419,7 +419,7 @@ static bool tile_net_provide_needed_buffer(struct tile_net_cpu *info,
 #endif
 
         /* Avoid "false sharing" with last cache line. */
-        /* ISSUE: This is already done by "dev_alloc_skb()". */
+        /* ISSUE: This is already done by "netdev_alloc_skb()". */
         unsigned int len =
                  (((small ? LIPP_SMALL_PACKET_SIZE : large_size) +
                    CHIP_L2_LINE_SIZE() - 1) & -CHIP_L2_LINE_SIZE());
@@ -433,7 +433,7 @@ static bool tile_net_provide_needed_buffer(struct tile_net_cpu *info,
         struct sk_buff **skb_ptr;
 
         /* Request 96 extra bytes for alignment purposes. */
-        skb = dev_alloc_skb(len + padding);
+        skb = netdev_alloc_skb(info->napi->dev, len + padding);
         if (skb == NULL)
                 return false;
 
diff --git a/drivers/net/ethernet/toshiba/ps3_gelic_wireless.c b/drivers/net/ethernet/toshiba/ps3_gelic_wireless.c
index fd4ed7f8cfa1..5c14f82c4954 100644
--- a/drivers/net/ethernet/toshiba/ps3_gelic_wireless.c
+++ b/drivers/net/ethernet/toshiba/ps3_gelic_wireless.c
@@ -1621,10 +1621,9 @@ static void gelic_wl_scan_complete_event(struct gelic_wl_info *wl)
                 kfree(target->hwinfo);
                 target->hwinfo = kzalloc(be16_to_cpu(scan_info->size),
                                          GFP_KERNEL);
-                if (!target->hwinfo) {
-                        pr_info("%s: kzalloc failed\n", __func__);
+                if (!target->hwinfo)
                         continue;
-                }
+
                 /* copy hw scan info */
                 memcpy(target->hwinfo, scan_info, scan_info->size);
                 target->essid_len = strnlen(scan_info->essid,
diff --git a/drivers/net/ethernet/toshiba/tc35815.c b/drivers/net/ethernet/toshiba/tc35815.c
index 71b785cd7563..d117ad475c3e 100644
--- a/drivers/net/ethernet/toshiba/tc35815.c
+++ b/drivers/net/ethernet/toshiba/tc35815.c
@@ -453,7 +453,7 @@ static struct sk_buff *alloc_rxbuf_skb(struct net_device *dev,
                                        dma_addr_t *dma_handle)
 {
         struct sk_buff *skb;
-        skb = dev_alloc_skb(RX_BUF_SIZE);
+        skb = netdev_alloc_skb(dev, RX_BUF_SIZE);
         if (!skb)
                 return NULL;
         *dma_handle = pci_map_single(hwdev, skb->data, RX_BUF_SIZE,
@@ -808,10 +808,9 @@ static int __devinit tc35815_init_one(struct pci_dev *pdev,
 
         /* dev zeroed in alloc_etherdev */
         dev = alloc_etherdev(sizeof(*lp));
-        if (dev == NULL) {
-                dev_err(&pdev->dev, "unable to alloc new ethernet\n");
+        if (dev == NULL)
                 return -ENOMEM;
-        }
+
         SET_NETDEV_DEV(dev, &pdev->dev);
         lp = netdev_priv(dev);
         lp->dev = dev;
diff --git a/drivers/net/ethernet/tundra/tsi108_eth.c b/drivers/net/ethernet/tundra/tsi108_eth.c
index 164fb775d7b3..fc5521c9c089 100644
--- a/drivers/net/ethernet/tundra/tsi108_eth.c
+++ b/drivers/net/ethernet/tundra/tsi108_eth.c
@@ -1582,10 +1582,8 @@ tsi108_init_one(struct platform_device *pdev)
         /* Create an ethernet device instance */
 
         dev = alloc_etherdev(sizeof(struct tsi108_prv_data));
-        if (!dev) {
-                printk("tsi108_eth: Could not allocate a device structure\n");
+        if (!dev)
                 return -ENOMEM;
-        }
 
         printk("tsi108_eth%d: probe...\n", pdev->id);
         data = netdev_priv(dev);
diff --git a/drivers/net/ethernet/via/via-rhine.c b/drivers/net/ethernet/via/via-rhine.c
index 10b18eb63d25..cb2ff28a0602 100644
--- a/drivers/net/ethernet/via/via-rhine.c
+++ b/drivers/net/ethernet/via/via-rhine.c
@@ -927,7 +927,6 @@ static int __devinit rhine_init_one(struct pci_dev *pdev,
         dev = alloc_etherdev(sizeof(struct rhine_private));
         if (!dev) {
                 rc = -ENOMEM;
-                dev_err(&pdev->dev, "alloc_etherdev failed\n");
                 goto err_out;
         }
         SET_NETDEV_DEV(dev, &pdev->dev);
@@ -1156,7 +1155,6 @@ static void alloc_rbufs(struct net_device *dev)
                 rp->rx_skbuff[i] = skb;
                 if (skb == NULL)
                         break;
-                skb->dev = dev;                 /* Mark as being used by this device. */
 
                 rp->rx_skbuff_dma[i] =
                         pci_map_single(rp->pdev, skb->data, rp->rx_buf_sz,
@@ -1941,7 +1939,6 @@ static int rhine_rx(struct net_device *dev, int limit)
                         rp->rx_skbuff[entry] = skb;
                         if (skb == NULL)
                                 break;  /* Better luck next round. */
-                        skb->dev = dev; /* Mark as being used by this device. */
                         rp->rx_skbuff_dma[entry] =
                                 pci_map_single(rp->pdev, skb->data,
                                                rp->rx_buf_sz,
diff --git a/drivers/net/ethernet/via/via-velocity.c b/drivers/net/ethernet/via/via-velocity.c
index cb35b14b73bb..8a5d7c100a5e 100644
--- a/drivers/net/ethernet/via/via-velocity.c
+++ b/drivers/net/ethernet/via/via-velocity.c
@@ -1509,7 +1509,7 @@ static int velocity_alloc_rx_buf(struct velocity_info *vptr, int idx)
         struct rx_desc *rd = &(vptr->rx.ring[idx]);
         struct velocity_rd_info *rd_info = &(vptr->rx.info[idx]);
 
-        rd_info->skb = dev_alloc_skb(vptr->rx.buf_sz + 64);
+        rd_info->skb = netdev_alloc_skb(vptr->dev, vptr->rx.buf_sz + 64);
         if (rd_info->skb == NULL)
                 return -ENOMEM;
 
@@ -2730,10 +2730,8 @@ static int __devinit velocity_found1(struct pci_dev *pdev, const struct pci_devi
         }
 
         dev = alloc_etherdev(sizeof(struct velocity_info));
-        if (!dev) {
-                dev_err(&pdev->dev, "allocate net device failed.\n");
+        if (!dev)
                 goto out;
-        }
 
         /* Chain it all together */
 
diff --git a/drivers/net/ethernet/xilinx/Kconfig b/drivers/net/ethernet/xilinx/Kconfig
index d5a826063a82..5778a4ae1164 100644
--- a/drivers/net/ethernet/xilinx/Kconfig
+++ b/drivers/net/ethernet/xilinx/Kconfig
@@ -25,6 +25,14 @@ config XILINX_EMACLITE
         ---help---
           This driver supports the 10/100 Ethernet Lite from Xilinx.
 
+config XILINX_AXI_EMAC
+        tristate "Xilinx 10/100/1000 AXI Ethernet support"
+        depends on (PPC32 || MICROBLAZE)
+        select PHYLIB
+        ---help---
+          This driver supports the 10/100/1000 Ethernet from Xilinx for the
+          AXI bus interface used in Xilinx Virtex FPGAs.
+
 config XILINX_LL_TEMAC
         tristate "Xilinx LL TEMAC (LocalLink Tri-mode Ethernet MAC) driver"
         depends on (PPC || MICROBLAZE)
diff --git a/drivers/net/ethernet/xilinx/Makefile b/drivers/net/ethernet/xilinx/Makefile
index 5feac734ea45..214205e975e3 100644
--- a/drivers/net/ethernet/xilinx/Makefile
+++ b/drivers/net/ethernet/xilinx/Makefile
@@ -5,3 +5,5 @@
 ll_temac-objs := ll_temac_main.o ll_temac_mdio.o
 obj-$(CONFIG_XILINX_LL_TEMAC) += ll_temac.o
 obj-$(CONFIG_XILINX_EMACLITE) += xilinx_emaclite.o
+xilinx_emac-objs := xilinx_axienet_main.o xilinx_axienet_mdio.o
+obj-$(CONFIG_XILINX_AXI_EMAC) += xilinx_emac.o
diff --git a/drivers/net/ethernet/xilinx/ll_temac_main.c b/drivers/net/ethernet/xilinx/ll_temac_main.c
index f21addb1db95..d8eb9c9e3ee2 100644
--- a/drivers/net/ethernet/xilinx/ll_temac_main.c
+++ b/drivers/net/ethernet/xilinx/ll_temac_main.c
@@ -1011,10 +1011,9 @@ static int __devinit temac_of_probe(struct platform_device *op)
 
         /* Init network device structure */
         ndev = alloc_etherdev(sizeof(*lp));
-        if (!ndev) {
-                dev_err(&op->dev, "could not allocate device.\n");
+        if (!ndev)
                 return -ENOMEM;
-        }
+
         ether_setup(ndev);
         dev_set_drvdata(&op->dev, ndev);
         SET_NETDEV_DEV(ndev, &op->dev);
diff --git a/drivers/net/ethernet/xilinx/xilinx_axienet.h b/drivers/net/ethernet/xilinx/xilinx_axienet.h
new file mode 100644
index 000000000000..cc83af083fd7
--- /dev/null
+++ b/drivers/net/ethernet/xilinx/xilinx_axienet.h
@@ -0,0 +1,508 @@
+/*
+ * Definitions for Xilinx Axi Ethernet device driver.
+ *
+ * Copyright (c) 2009 Secret Lab Technologies, Ltd.
+ * Copyright (c) 2010 Xilinx, Inc. All rights reserved.
+ * Copyright (c) 2012 Daniel Borkmann, <daniel.borkmann@tik.ee.ethz.ch>
+ * Copyright (c) 2012 Ariane Keller, <ariane.keller@tik.ee.ethz.ch>
+ */
+
+#ifndef XILINX_AXIENET_H
+#define XILINX_AXIENET_H
+
+#include <linux/netdevice.h>
+#include <linux/spinlock.h>
+#include <linux/interrupt.h>
+
+/* Packet size info */
+#define XAE_HDR_SIZE                    14 /* Size of Ethernet header */
+#define XAE_HDR_VLAN_SIZE               18 /* Size of an Ethernet hdr + VLAN */
+#define XAE_TRL_SIZE                     4 /* Size of Ethernet trailer (FCS) */
+#define XAE_MTU                       1500 /* Max MTU of an Ethernet frame */
+#define XAE_JUMBO_MTU                 9000 /* Max MTU of a jumbo Eth. frame */
+
+#define XAE_MAX_FRAME_SIZE       (XAE_MTU + XAE_HDR_SIZE + XAE_TRL_SIZE)
+#define XAE_MAX_VLAN_FRAME_SIZE  (XAE_MTU + XAE_HDR_VLAN_SIZE + XAE_TRL_SIZE)
+#define XAE_MAX_JUMBO_FRAME_SIZE (XAE_JUMBO_MTU + XAE_HDR_SIZE + XAE_TRL_SIZE)
+
+/* Configuration options */
+
+/* Accept all incoming packets. Default: disabled (cleared) */
+#define XAE_OPTION_PROMISC                      (1 << 0)
+
+/* Jumbo frame support for Tx & Rx. Default: disabled (cleared) */
+#define XAE_OPTION_JUMBO                        (1 << 1)
+
+/* VLAN Rx & Tx frame support. Default: disabled (cleared) */
+#define XAE_OPTION_VLAN                         (1 << 2)
+
+/* Enable recognition of flow control frames on Rx. Default: enabled (set) */
+#define XAE_OPTION_FLOW_CONTROL                 (1 << 4)
+
+/* Strip FCS and PAD from incoming frames. Note: PAD from VLAN frames is not
+ * stripped. Default: disabled (set) */
+#define XAE_OPTION_FCS_STRIP                    (1 << 5)
+
+/* Generate FCS field and add PAD automatically for outgoing frames.
+ * Default: enabled (set) */
+#define XAE_OPTION_FCS_INSERT                   (1 << 6)
+
+/* Enable Length/Type error checking for incoming frames. When this option is
+ * set, the MAC will filter frames that have a mismatched type/length field
+ * and if XAE_OPTION_REPORT_RXERR is set, the user is notified when these
+ * types of frames are encountered. When this option is cleared, the MAC will
+ * allow these types of frames to be received. Default: enabled (set) */
+#define XAE_OPTION_LENTYPE_ERR                  (1 << 7)
+
+/* Enable the transmitter. Default: enabled (set) */
+#define XAE_OPTION_TXEN                         (1 << 11)
+
+/*  Enable the receiver. Default: enabled (set) */
+#define XAE_OPTION_RXEN                         (1 << 12)
+
+/*  Default options set when device is initialized or reset */
+#define XAE_OPTION_DEFAULTS                                \
+                                (XAE_OPTION_TXEN |         \
+                                 XAE_OPTION_FLOW_CONTROL | \
+                                 XAE_OPTION_RXEN)
+
+/* Axi DMA Register definitions */
+
+#define XAXIDMA_TX_CR_OFFSET    0x00000000 /* Channel control */
+#define XAXIDMA_TX_SR_OFFSET    0x00000004 /* Status */
+#define XAXIDMA_TX_CDESC_OFFSET 0x00000008 /* Current descriptor pointer */
+#define XAXIDMA_TX_TDESC_OFFSET 0x00000010 /* Tail descriptor pointer */
+
+#define XAXIDMA_RX_CR_OFFSET    0x00000030 /* Channel control */
+#define XAXIDMA_RX_SR_OFFSET    0x00000034 /* Status */
+#define XAXIDMA_RX_CDESC_OFFSET 0x00000038 /* Current descriptor pointer */
+#define XAXIDMA_RX_TDESC_OFFSET 0x00000040 /* Tail descriptor pointer */
+
+#define XAXIDMA_CR_RUNSTOP_MASK 0x00000001 /* Start/stop DMA channel */
+#define XAXIDMA_CR_RESET_MASK   0x00000004 /* Reset DMA engine */
+
+#define XAXIDMA_BD_NDESC_OFFSET         0x00 /* Next descriptor pointer */
+#define XAXIDMA_BD_BUFA_OFFSET          0x08 /* Buffer address */
+#define XAXIDMA_BD_CTRL_LEN_OFFSET      0x18 /* Control/buffer length */
+#define XAXIDMA_BD_STS_OFFSET           0x1C /* Status */
+#define XAXIDMA_BD_USR0_OFFSET          0x20 /* User IP specific word0 */
+#define XAXIDMA_BD_USR1_OFFSET          0x24 /* User IP specific word1 */
+#define XAXIDMA_BD_USR2_OFFSET          0x28 /* User IP specific word2 */
+#define XAXIDMA_BD_USR3_OFFSET          0x2C /* User IP specific word3 */
+#define XAXIDMA_BD_USR4_OFFSET          0x30 /* User IP specific word4 */
+#define XAXIDMA_BD_ID_OFFSET            0x34 /* Sw ID */
+#define XAXIDMA_BD_HAS_STSCNTRL_OFFSET  0x38 /* Whether has stscntrl strm */
+#define XAXIDMA_BD_HAS_DRE_OFFSET       0x3C /* Whether has DRE */
+
+#define XAXIDMA_BD_HAS_DRE_SHIFT        8 /* Whether has DRE shift */
+#define XAXIDMA_BD_HAS_DRE_MASK         0xF00 /* Whether has DRE mask */
+#define XAXIDMA_BD_WORDLEN_MASK         0xFF /* Whether has DRE mask */
+
+#define XAXIDMA_BD_CTRL_LENGTH_MASK     0x007FFFFF /* Requested len */
+#define XAXIDMA_BD_CTRL_TXSOF_MASK      0x08000000 /* First tx packet */
+#define XAXIDMA_BD_CTRL_TXEOF_MASK      0x04000000 /* Last tx packet */
+#define XAXIDMA_BD_CTRL_ALL_MASK        0x0C000000 /* All control bits */
+
+#define XAXIDMA_DELAY_MASK              0xFF000000 /* Delay timeout counter */
+#define XAXIDMA_COALESCE_MASK           0x00FF0000 /* Coalesce counter */
+
+#define XAXIDMA_DELAY_SHIFT             24
+#define XAXIDMA_COALESCE_SHIFT          16
+
+#define XAXIDMA_IRQ_IOC_MASK            0x00001000 /* Completion intr */
+#define XAXIDMA_IRQ_DELAY_MASK          0x00002000 /* Delay interrupt */
+#define XAXIDMA_IRQ_ERROR_MASK          0x00004000 /* Error interrupt */
+#define XAXIDMA_IRQ_ALL_MASK            0x00007000 /* All interrupts */
+
+/* Default TX/RX Threshold and waitbound values for SGDMA mode */
+#define XAXIDMA_DFT_TX_THRESHOLD        24
+#define XAXIDMA_DFT_TX_WAITBOUND        254
+#define XAXIDMA_DFT_RX_THRESHOLD        24
+#define XAXIDMA_DFT_RX_WAITBOUND        254
+
+#define XAXIDMA_BD_CTRL_TXSOF_MASK      0x08000000 /* First tx packet */
+#define XAXIDMA_BD_CTRL_TXEOF_MASK      0x04000000 /* Last tx packet */
+#define XAXIDMA_BD_CTRL_ALL_MASK        0x0C000000 /* All control bits */
+
+#define XAXIDMA_BD_STS_ACTUAL_LEN_MASK  0x007FFFFF /* Actual len */
+#define XAXIDMA_BD_STS_COMPLETE_MASK    0x80000000 /* Completed */
+#define XAXIDMA_BD_STS_DEC_ERR_MASK     0x40000000 /* Decode error */
+#define XAXIDMA_BD_STS_SLV_ERR_MASK     0x20000000 /* Slave error */
+#define XAXIDMA_BD_STS_INT_ERR_MASK     0x10000000 /* Internal err */
+#define XAXIDMA_BD_STS_ALL_ERR_MASK     0x70000000 /* All errors */
+#define XAXIDMA_BD_STS_RXSOF_MASK       0x08000000 /* First rx pkt */
+#define XAXIDMA_BD_STS_RXEOF_MASK       0x04000000 /* Last rx pkt */
+#define XAXIDMA_BD_STS_ALL_MASK         0xFC000000 /* All status bits */
+
+#define XAXIDMA_BD_MINIMUM_ALIGNMENT    0x40
+
+/* Axi Ethernet registers definition */
+#define XAE_RAF_OFFSET          0x00000000 /* Reset and Address filter */
+#define XAE_TPF_OFFSET          0x00000004 /* Tx Pause Frame */
+#define XAE_IFGP_OFFSET         0x00000008 /* Tx Inter-frame gap adjustment*/
+#define XAE_IS_OFFSET           0x0000000C /* Interrupt status */
+#define XAE_IP_OFFSET           0x00000010 /* Interrupt pending */
+#define XAE_IE_OFFSET           0x00000014 /* Interrupt enable */
+#define XAE_TTAG_OFFSET         0x00000018 /* Tx VLAN TAG */
+#define XAE_RTAG_OFFSET         0x0000001C /* Rx VLAN TAG */
+#define XAE_UAWL_OFFSET         0x00000020 /* Unicast address word lower */
+#define XAE_UAWU_OFFSET         0x00000024 /* Unicast address word upper */
+#define XAE_TPID0_OFFSET        0x00000028 /* VLAN TPID0 register */
+#define XAE_TPID1_OFFSET        0x0000002C /* VLAN TPID1 register */
+#define XAE_PPST_OFFSET         0x00000030 /* PCS PMA Soft Temac Status Reg */
+#define XAE_RCW0_OFFSET         0x00000400 /* Rx Configuration Word 0 */
+#define XAE_RCW1_OFFSET         0x00000404 /* Rx Configuration Word 1 */
+#define XAE_TC_OFFSET           0x00000408 /* Tx Configuration */
+#define XAE_FCC_OFFSET          0x0000040C /* Flow Control Configuration */
+#define XAE_EMMC_OFFSET         0x00000410 /* EMAC mode configuration */
+#define XAE_PHYC_OFFSET         0x00000414 /* RGMII/SGMII configuration */
+#define XAE_MDIO_MC_OFFSET      0x00000500 /* MII Management Config */
+#define XAE_MDIO_MCR_OFFSET     0x00000504 /* MII Management Control */
+#define XAE_MDIO_MWD_OFFSET     0x00000508 /* MII Management Write Data */
+#define XAE_MDIO_MRD_OFFSET     0x0000050C /* MII Management Read Data */
+#define XAE_MDIO_MIS_OFFSET     0x00000600 /* MII Management Interrupt Status */
+#define XAE_MDIO_MIP_OFFSET     0x00000620 /* MII Mgmt Interrupt Pending
+                                            * register offset */
+#define XAE_MDIO_MIE_OFFSET     0x00000640 /* MII Management Interrupt Enable
+                                            * register offset */
+#define XAE_MDIO_MIC_OFFSET     0x00000660 /* MII Management Interrupt Clear
+                                            * register offset. */
+#define XAE_UAW0_OFFSET         0x00000700 /* Unicast address word 0 */
+#define XAE_UAW1_OFFSET         0x00000704 /* Unicast address word 1 */
+#define XAE_FMI_OFFSET          0x00000708 /* Filter Mask Index */
+#define XAE_AF0_OFFSET          0x00000710 /* Address Filter 0 */
+#define XAE_AF1_OFFSET          0x00000714 /* Address Filter 1 */
+
+#define XAE_TX_VLAN_DATA_OFFSET 0x00004000 /* TX VLAN data table address */
+#define XAE_RX_VLAN_DATA_OFFSET 0x00008000 /* RX VLAN data table address */
+#define XAE_MCAST_TABLE_OFFSET  0x00020000 /* Multicast table address */
+
+/* Bit Masks for Axi Ethernet RAF register */
+#define XAE_RAF_MCSTREJ_MASK            0x00000002 /* Reject receive multicast
+                                                    * destination address */
+#define XAE_RAF_BCSTREJ_MASK            0x00000004 /* Reject receive broadcast
+                                                    * destination address */
+#define XAE_RAF_TXVTAGMODE_MASK         0x00000018 /* Tx VLAN TAG mode */
+#define XAE_RAF_RXVTAGMODE_MASK         0x00000060 /* Rx VLAN TAG mode */
+#define XAE_RAF_TXVSTRPMODE_MASK        0x00000180 /* Tx VLAN STRIP mode */
+#define XAE_RAF_RXVSTRPMODE_MASK        0x00000600 /* Rx VLAN STRIP mode */
+#define XAE_RAF_NEWFNCENBL_MASK         0x00000800 /* New function mode */
+#define XAE_RAF_EMULTIFLTRENBL_MASK     0x00001000 /* Exteneded Multicast
+                                                    * Filtering mode
+                                                    */
+#define XAE_RAF_STATSRST_MASK           0x00002000 /* Stats. Counter Reset */
+#define XAE_RAF_RXBADFRMEN_MASK         0x00004000 /* Recv Bad Frame Enable */
+#define XAE_RAF_TXVTAGMODE_SHIFT        3 /* Tx Tag mode shift bits */
+#define XAE_RAF_RXVTAGMODE_SHIFT        5 /* Rx Tag mode shift bits */
+#define XAE_RAF_TXVSTRPMODE_SHIFT       7 /* Tx strip mode shift bits*/
+#define XAE_RAF_RXVSTRPMODE_SHIFT       9 /* Rx Strip mode shift bits*/
+
+/* Bit Masks for Axi Ethernet TPF and IFGP registers */
+#define XAE_TPF_TPFV_MASK               0x0000FFFF /* Tx pause frame value */
+#define XAE_IFGP0_IFGP_MASK             0x0000007F /* Transmit inter-frame
+                                                    * gap adjustment value */
+
+/* Bit Masks for Axi Ethernet IS, IE and IP registers, Same masks apply
+ * for all 3 registers. */
+#define XAE_INT_HARDACSCMPLT_MASK       0x00000001 /* Hard register access
+                                                    * complete */
+#define XAE_INT_AUTONEG_MASK            0x00000002 /* Auto negotiation
+                                                    * complete */
+#define XAE_INT_RXCMPIT_MASK            0x00000004 /* Rx complete */
+#define XAE_INT_RXRJECT_MASK            0x00000008 /* Rx frame rejected */
+#define XAE_INT_RXFIFOOVR_MASK          0x00000010 /* Rx fifo overrun */
+#define XAE_INT_TXCMPIT_MASK            0x00000020 /* Tx complete */
+#define XAE_INT_RXDCMLOCK_MASK          0x00000040 /* Rx Dcm Lock */
+#define XAE_INT_MGTRDY_MASK             0x00000080 /* MGT clock Lock */
+#define XAE_INT_PHYRSTCMPLT_MASK        0x00000100 /* Phy Reset complete */
+#define XAE_INT_ALL_MASK                0x0000003F /* All the ints */
+
+#define XAE_INT_RECV_ERROR_MASK                         \
+        (XAE_INT_RXRJECT_MASK | XAE_INT_RXFIFOOVR_MASK) /* INT bits that
+                                                         * indicate receive
+                                                         * errors */
+
+/* Bit masks for Axi Ethernet VLAN TPID Word 0 register */
+#define XAE_TPID_0_MASK         0x0000FFFF /* TPID 0 */
+#define XAE_TPID_1_MASK         0xFFFF0000 /* TPID 1 */
+
+/* Bit masks for Axi Ethernet VLAN TPID Word 1 register */
+#define XAE_TPID_2_MASK         0x0000FFFF /* TPID 0 */
+#define XAE_TPID_3_MASK         0xFFFF0000 /* TPID 1 */
+
+/* Bit masks for Axi Ethernet RCW1 register */
+#define XAE_RCW1_RST_MASK       0x80000000 /* Reset */
+#define XAE_RCW1_JUM_MASK       0x40000000 /* Jumbo frame enable */
+#define XAE_RCW1_FCS_MASK       0x20000000 /* In-Band FCS enable
+                                            * (FCS not stripped) */
+#define XAE_RCW1_RX_MASK        0x10000000 /* Receiver enable */
+#define XAE_RCW1_VLAN_MASK      0x08000000 /* VLAN frame enable */
+#define XAE_RCW1_LT_DIS_MASK    0x02000000 /* Length/type field valid check
+                                            * disable */
+#define XAE_RCW1_CL_DIS_MASK    0x01000000 /* Control frame Length check
+                                            * disable */
+#define XAE_RCW1_PAUSEADDR_MASK 0x0000FFFF /* Pause frame source address
+                                            * bits [47:32]. Bits [31:0] are
+                                            * stored in register RCW0 */
+
+/* Bit masks for Axi Ethernet TC register */
+#define XAE_TC_RST_MASK         0x80000000 /* Reset */
+#define XAE_TC_JUM_MASK         0x40000000 /* Jumbo frame enable */
+#define XAE_TC_FCS_MASK         0x20000000 /* In-Band FCS enable
+                                            * (FCS not generated) */
+#define XAE_TC_TX_MASK          0x10000000 /* Transmitter enable */
+#define XAE_TC_VLAN_MASK        0x08000000 /* VLAN frame enable */
+#define XAE_TC_IFG_MASK         0x02000000 /* Inter-frame gap adjustment
+                                            * enable */
+
+/* Bit masks for Axi Ethernet FCC register */
+#define XAE_FCC_FCRX_MASK       0x20000000 /* Rx flow control enable */
+#define XAE_FCC_FCTX_MASK       0x40000000 /* Tx flow control enable */
+
+/* Bit masks for Axi Ethernet EMMC register */
+#define XAE_EMMC_LINKSPEED_MASK 0xC0000000 /* Link speed */
+#define XAE_EMMC_RGMII_MASK     0x20000000 /* RGMII mode enable */
+#define XAE_EMMC_SGMII_MASK     0x10000000 /* SGMII mode enable */
+#define XAE_EMMC_GPCS_MASK      0x08000000 /* 1000BaseX mode enable */
+#define XAE_EMMC_HOST_MASK      0x04000000 /* Host interface enable */
+#define XAE_EMMC_TX16BIT        0x02000000 /* 16 bit Tx client enable */
+#define XAE_EMMC_RX16BIT        0x01000000 /* 16 bit Rx client enable */
+#define XAE_EMMC_LINKSPD_10     0x00000000 /* Link Speed mask for 10 Mbit */
+#define XAE_EMMC_LINKSPD_100    0x40000000 /* Link Speed mask for 100 Mbit */
+#define XAE_EMMC_LINKSPD_1000   0x80000000 /* Link Speed mask for 1000 Mbit */
+
+/* Bit masks for Axi Ethernet PHYC register */
+#define XAE_PHYC_SGMIILINKSPEED_MASK    0xC0000000 /* SGMII link speed mask*/
+#define XAE_PHYC_RGMIILINKSPEED_MASK    0x0000000C /* RGMII link speed */
+#define XAE_PHYC_RGMIIHD_MASK           0x00000002 /* RGMII Half-duplex */
+#define XAE_PHYC_RGMIILINK_MASK         0x00000001 /* RGMII link status */
+#define XAE_PHYC_RGLINKSPD_10           0x00000000 /* RGMII link 10 Mbit */
+#define XAE_PHYC_RGLINKSPD_100          0x00000004 /* RGMII link 100 Mbit */
+#define XAE_PHYC_RGLINKSPD_1000         0x00000008 /* RGMII link 1000 Mbit */
+#define XAE_PHYC_SGLINKSPD_10           0x00000000 /* SGMII link 10 Mbit */
+#define XAE_PHYC_SGLINKSPD_100          0x40000000 /* SGMII link 100 Mbit */
+#define XAE_PHYC_SGLINKSPD_1000         0x80000000 /* SGMII link 1000 Mbit */
+
+/* Bit masks for Axi Ethernet MDIO interface MC register */
+#define XAE_MDIO_MC_MDIOEN_MASK         0x00000040 /* MII management enable */
+#define XAE_MDIO_MC_CLOCK_DIVIDE_MAX    0x3F       /* Maximum MDIO divisor */
+
+/* Bit masks for Axi Ethernet MDIO interface MCR register */
+#define XAE_MDIO_MCR_PHYAD_MASK         0x1F000000 /* Phy Address Mask */
+#define XAE_MDIO_MCR_PHYAD_SHIFT        24         /* Phy Address Shift */
+#define XAE_MDIO_MCR_REGAD_MASK         0x001F0000 /* Reg Address Mask */
+#define XAE_MDIO_MCR_REGAD_SHIFT        16         /* Reg Address Shift */
+#define XAE_MDIO_MCR_OP_MASK            0x0000C000 /* Operation Code Mask */
+#define XAE_MDIO_MCR_OP_SHIFT           13         /* Operation Code Shift */
+#define XAE_MDIO_MCR_OP_READ_MASK       0x00008000 /* Op Code Read Mask */
+#define XAE_MDIO_MCR_OP_WRITE_MASK      0x00004000 /* Op Code Write Mask */
+#define XAE_MDIO_MCR_INITIATE_MASK      0x00000800 /* Ready Mask */
+#define XAE_MDIO_MCR_READY_MASK         0x00000080 /* Ready Mask */
+
+/* Bit masks for Axi Ethernet MDIO interface MIS, MIP, MIE, MIC registers */
+#define XAE_MDIO_INT_MIIM_RDY_MASK      0x00000001 /* MIIM Interrupt */
+
+/* Bit masks for Axi Ethernet UAW1 register */
+#define XAE_UAW1_UNICASTADDR_MASK       0x0000FFFF /* Station address bits
+                                                    * [47:32]; Station address
+                                                    * bits [31:0] are stored in
+                                                    * register UAW0 */
+
+/* Bit masks for Axi Ethernet FMI register */
+#define XAE_FMI_PM_MASK                 0x80000000 /* Promis. mode enable */
+#define XAE_FMI_IND_MASK                0x00000003 /* Index Mask */
+
+#define XAE_MDIO_DIV_DFT                29 /* Default MDIO clock divisor */
+
+/* Defines for different options for C_PHY_TYPE parameter in Axi Ethernet IP */
+#define XAE_PHY_TYPE_MII                0
+#define XAE_PHY_TYPE_GMII               1
+#define XAE_PHY_TYPE_RGMII_1_3          2
+#define XAE_PHY_TYPE_RGMII_2_0          3
+#define XAE_PHY_TYPE_SGMII              4
+#define XAE_PHY_TYPE_1000BASE_X         5
+
+#define XAE_MULTICAST_CAM_TABLE_NUM     4 /* Total number of entries in the
+                                           * hardware multicast table. */
+
+/* Axi Ethernet Synthesis features */
+#define XAE_FEATURE_PARTIAL_RX_CSUM     (1 << 0)
+#define XAE_FEATURE_PARTIAL_TX_CSUM     (1 << 1)
+#define XAE_FEATURE_FULL_RX_CSUM        (1 << 2)
+#define XAE_FEATURE_FULL_TX_CSUM        (1 << 3)
+
+#define XAE_NO_CSUM_OFFLOAD             0
+
+#define XAE_FULL_CSUM_STATUS_MASK       0x00000038
+#define XAE_IP_UDP_CSUM_VALIDATED       0x00000003
+#define XAE_IP_TCP_CSUM_VALIDATED       0x00000002
+
+#define DELAY_OF_ONE_MILLISEC           1000
+
+/**
+ * struct axidma_bd - Axi Dma buffer descriptor layout
+ * @next:         MM2S/S2MM Next Descriptor Pointer
+ * @reserved1:    Reserved and not used
+ * @phys:         MM2S/S2MM Buffer Address
+ * @reserved2:    Reserved and not used
+ * @reserved3:    Reserved and not used
+ * @reserved4:    Reserved and not used
+ * @cntrl:        MM2S/S2MM Control value
+ * @status:       MM2S/S2MM Status value
+ * @app0:         MM2S/S2MM User Application Field 0.
+ * @app1:         MM2S/S2MM User Application Field 1.
+ * @app2:         MM2S/S2MM User Application Field 2.
+ * @app3:         MM2S/S2MM User Application Field 3.
+ * @app4:         MM2S/S2MM User Application Field 4.
+ * @sw_id_offset: MM2S/S2MM Sw ID
+ * @reserved5:    Reserved and not used
+ * @reserved6:    Reserved and not used
+ */
+struct axidma_bd {
+        u32 next;       /* Physical address of next buffer descriptor */
+        u32 reserved1;
+        u32 phys;
+        u32 reserved2;
+        u32 reserved3;
+        u32 reserved4;
+        u32 cntrl;
+        u32 status;
+        u32 app0;
+        u32 app1;       /* TX start << 16 | insert */
+        u32 app2;       /* TX csum seed */
+        u32 app3;
+        u32 app4;
+        u32 sw_id_offset;
+        u32 reserved5;
+        u32 reserved6;
+};
+
+/**
+ * struct axienet_local - axienet private per device data
+ * @ndev:       Pointer for net_device to which it will be attached.
+ * @dev:        Pointer to device structure
+ * @phy_dev:    Pointer to PHY device structure attached to the axienet_local
+ * @phy_node:   Pointer to device node structure
+ * @mii_bus:    Pointer to MII bus structure
+ * @mdio_irqs:  IRQs table for MDIO bus required in mii_bus structure
+ * @regs:       Base address for the axienet_local device address space
+ * @dma_regs:   Base address for the axidma device address space
+ * @dma_err_tasklet: Tasklet structure to process Axi DMA errors
+ * @tx_irq:     Axidma TX IRQ number
+ * @rx_irq:     Axidma RX IRQ number
+ * @temac_type: axienet type to identify between soft and hard temac
+ * @phy_type:   Phy type to identify between MII/GMII/RGMII/SGMII/1000 Base-X
+ * @options:    AxiEthernet option word
+ * @last_link:  Phy link state in which the PHY was negotiated earlier
+ * @features:   Stores the extended features supported by the axienet hw
+ * @tx_bd_v:    Virtual address of the TX buffer descriptor ring
+ * @tx_bd_p:    Physical address(start address) of the TX buffer descr. ring
+ * @rx_bd_v:    Virtual address of the RX buffer descriptor ring
+ * @rx_bd_p:    Physical address(start address) of the RX buffer descr. ring
+ * @tx_bd_ci:   Stores the index of the Tx buffer descriptor in the ring being
+ *              accessed currently. Used while alloc. BDs before a TX starts
+ * @tx_bd_tail: Stores the index of the Tx buffer descriptor in the ring being
+ *              accessed currently. Used while processing BDs after the TX
+ *              completed.
+ * @rx_bd_ci:   Stores the index of the Rx buffer descriptor in the ring being
+ *              accessed currently.
+ * @max_frm_size: Stores the maximum size of the frame that can be that
+ *                Txed/Rxed in the existing hardware. If jumbo option is
+ *                supported, the maximum frame size would be 9k. Else it is
+ *                1522 bytes (assuming support for basic VLAN)
+ * @jumbo_support: Stores hardware configuration for jumbo support. If hardware
+ *                 can handle jumbo packets, this entry will be 1, else 0.
+ */
+struct axienet_local {
+        struct net_device *ndev;
+        struct device *dev;
+
+        /* Connection to PHY device */
+        struct phy_device *phy_dev;     /* Pointer to PHY device */
+        struct device_node *phy_node;
+
+        /* MDIO bus data */
+        struct mii_bus *mii_bus;        /* MII bus reference */
+        int mdio_irqs[PHY_MAX_ADDR];    /* IRQs table for MDIO bus */
+
+        /* IO registers, dma functions and IRQs */
+        void __iomem *regs;
+        void __iomem *dma_regs;
+
+        struct tasklet_struct dma_err_tasklet;
+
+        int tx_irq;
+        int rx_irq;
+        u32 temac_type;
+        u32 phy_type;
+
+        u32 options;                    /* Current options word */
+        u32 last_link;
+        u32 features;
+
+        /* Buffer descriptors */
+        struct axidma_bd *tx_bd_v;
+        dma_addr_t tx_bd_p;
+        struct axidma_bd *rx_bd_v;
+        dma_addr_t rx_bd_p;
+        u32 tx_bd_ci;
+        u32 tx_bd_tail;
+        u32 rx_bd_ci;
+
+        u32 max_frm_size;
+        u32 jumbo_support;
+
+        int csum_offload_on_tx_path;
+        int csum_offload_on_rx_path;
+
+        u32 coalesce_count_rx;
+        u32 coalesce_count_tx;
+};
+
+/**
+ * struct axiethernet_option - Used to set axi ethernet hardware options
+ * @opt:        Option to be set.
+ * @reg:        Register offset to be written for setting the option
+ * @m_or:       Mask to be ORed for setting the option in the register
+ */
+struct axienet_option {
+        u32 opt;
+        u32 reg;
+        u32 m_or;
+};
+
+/**
+ * axienet_ior - Memory mapped Axi Ethernet register read
+ * @lp:         Pointer to axienet local structure
+ * @offset:     Address offset from the base address of Axi Ethernet core
+ *
+ * returns: The contents of the Axi Ethernet register
+ *
+ * This function returns the contents of the corresponding register.
+ */
+static inline u32 axienet_ior(struct axienet_local *lp, off_t offset)
+{
+        return in_be32(lp->regs + offset);
+}
+
+/**
+ * axienet_iow - Memory mapped Axi Ethernet register write
+ * @lp:         Pointer to axienet local structure
+ * @offset:     Address offset from the base address of Axi Ethernet core
+ * @value:      Value to be written into the Axi Ethernet register
+ *
+ * This function writes the desired value into the corresponding Axi Ethernet
+ * register.
+ */
+static inline void axienet_iow(struct axienet_local *lp, off_t offset,
+                               u32 value)
+{
+        out_be32((lp->regs + offset), value);
+}
+
+/* Function prototypes visible in xilinx_axienet_mdio.c for other files */
+int axienet_mdio_setup(struct axienet_local *lp, struct device_node *np);
+int axienet_mdio_wait_until_ready(struct axienet_local *lp);
+void axienet_mdio_teardown(struct axienet_local *lp);
+
+#endif /* XILINX_AXI_ENET_H */
diff --git a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
new file mode 100644
index 000000000000..a7cf00438a36
--- /dev/null
+++ b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
@@ -0,0 +1,1680 @@
+/*
+ * Xilinx Axi Ethernet device driver
+ *
+ * Copyright (c) 2008 Nissin Systems Co., Ltd.,  Yoshio Kashiwagi
+ * Copyright (c) 2005-2008 DLA Systems,  David H. Lynch Jr. <dhlii@dlasys.net>
+ * Copyright (c) 2008-2009 Secret Lab Technologies Ltd.
+ * Copyright (c) 2010 Xilinx, Inc. All rights reserved.
+ * Copyright (c) 2012 Daniel Borkmann, <daniel.borkmann@tik.ee.ethz.ch>
+ * Copyright (c) 2012 Ariane Keller, <ariane.keller@tik.ee.ethz.ch>
+ *
+ * This is a driver for the Xilinx Axi Ethernet which is used in the Virtex6
+ * and Spartan6.
+ *
+ * TODO:
+ *  - Add Axi Fifo support.
+ *  - Factor out Axi DMA code into separate driver.
+ *  - Test and fix basic multicast filtering.
+ *  - Add support for extended multicast filtering.
+ *  - Test basic VLAN support.
+ *  - Add support for extended VLAN support.
+ */
+
+#include <linux/delay.h>
+#include <linux/etherdevice.h>
+#include <linux/init.h>
+#include <linux/module.h>
+#include <linux/netdevice.h>
+#include <linux/of_mdio.h>
+#include <linux/of_platform.h>
+#include <linux/of_address.h>
+#include <linux/skbuff.h>
+#include <linux/spinlock.h>
+#include <linux/phy.h>
+#include <linux/mii.h>
+#include <linux/ethtool.h>
+
+#include "xilinx_axienet.h"
+
+/* Descriptors defines for Tx and Rx DMA - 2^n for the best performance */
+#define TX_BD_NUM               64
+#define RX_BD_NUM               128
+
+/* Must be shorter than length of ethtool_drvinfo.driver field to fit */
+#define DRIVER_NAME             "xaxienet"
+#define DRIVER_DESCRIPTION      "Xilinx Axi Ethernet driver"
+#define DRIVER_VERSION          "1.00a"
+
+#define AXIENET_REGS_N          32
+
+/* Match table for of_platform binding */
+static struct of_device_id axienet_of_match[] __devinitdata = {
+        { .compatible = "xlnx,axi-ethernet-1.00.a", },
+        { .compatible = "xlnx,axi-ethernet-1.01.a", },
+        { .compatible = "xlnx,axi-ethernet-2.01.a", },
+        {},
+};
+
+MODULE_DEVICE_TABLE(of, axienet_of_match);
+
+/* Option table for setting up Axi Ethernet hardware options */
+static struct axienet_option axienet_options[] = {
+        /* Turn on jumbo packet support for both Rx and Tx */
+        {
+                .opt = XAE_OPTION_JUMBO,
+                .reg = XAE_TC_OFFSET,
+                .m_or = XAE_TC_JUM_MASK,
+        }, {
+                .opt = XAE_OPTION_JUMBO,
+                .reg = XAE_RCW1_OFFSET,
+                .m_or = XAE_RCW1_JUM_MASK,
+        }, { /* Turn on VLAN packet support for both Rx and Tx */
+                .opt = XAE_OPTION_VLAN,
+                .reg = XAE_TC_OFFSET,
+                .m_or = XAE_TC_VLAN_MASK,
+        }, {
+                .opt = XAE_OPTION_VLAN,
+                .reg = XAE_RCW1_OFFSET,
+                .m_or = XAE_RCW1_VLAN_MASK,
+        }, { /* Turn on FCS stripping on receive packets */
+                .opt = XAE_OPTION_FCS_STRIP,
+                .reg = XAE_RCW1_OFFSET,
+                .m_or = XAE_RCW1_FCS_MASK,
+        }, { /* Turn on FCS insertion on transmit packets */
+                .opt = XAE_OPTION_FCS_INSERT,
+                .reg = XAE_TC_OFFSET,
+                .m_or = XAE_TC_FCS_MASK,
+        }, { /* Turn off length/type field checking on receive packets */
+                .opt = XAE_OPTION_LENTYPE_ERR,
+                .reg = XAE_RCW1_OFFSET,
+                .m_or = XAE_RCW1_LT_DIS_MASK,
+        }, { /* Turn on Rx flow control */
+                .opt = XAE_OPTION_FLOW_CONTROL,
+                .reg = XAE_FCC_OFFSET,
+                .m_or = XAE_FCC_FCRX_MASK,
+        }, { /* Turn on Tx flow control */
+                .opt = XAE_OPTION_FLOW_CONTROL,
+                .reg = XAE_FCC_OFFSET,
+                .m_or = XAE_FCC_FCTX_MASK,
+        }, { /* Turn on promiscuous frame filtering */
+                .opt = XAE_OPTION_PROMISC,
+                .reg = XAE_FMI_OFFSET,
+                .m_or = XAE_FMI_PM_MASK,
+        }, { /* Enable transmitter */
+                .opt = XAE_OPTION_TXEN,
+                .reg = XAE_TC_OFFSET,
+                .m_or = XAE_TC_TX_MASK,
+        }, { /* Enable receiver */
+                .opt = XAE_OPTION_RXEN,
+                .reg = XAE_RCW1_OFFSET,
+                .m_or = XAE_RCW1_RX_MASK,
+        },
+        {}
+};
+
+/**
+ * axienet_dma_in32 - Memory mapped Axi DMA register read
+ * @lp:         Pointer to axienet local structure
+ * @reg:        Address offset from the base address of the Axi DMA core
+ *
+ * returns: The contents of the Axi DMA register
+ *
+ * This function returns the contents of the corresponding Axi DMA register.
+ */
+static inline u32 axienet_dma_in32(struct axienet_local *lp, off_t reg)
+{
+        return in_be32(lp->dma_regs + reg);
+}
+
+/**
+ * axienet_dma_out32 - Memory mapped Axi DMA register write.
+ * @lp:         Pointer to axienet local structure
+ * @reg:        Address offset from the base address of the Axi DMA core
+ * @value:      Value to be written into the Axi DMA register
+ *
+ * This function writes the desired value into the corresponding Axi DMA
+ * register.
+ */
+static inline void axienet_dma_out32(struct axienet_local *lp,
+                                     off_t reg, u32 value)
+{
+        out_be32((lp->dma_regs + reg), value);
+}
+
+/**
+ * axienet_dma_bd_release - Release buffer descriptor rings
+ * @ndev:       Pointer to the net_device structure
+ *
+ * This function is used to release the descriptors allocated in
+ * axienet_dma_bd_init. axienet_dma_bd_release is called when Axi Ethernet
+ * driver stop api is called.
+ */
+static void axienet_dma_bd_release(struct net_device *ndev)
+{
+        int i;
+        struct axienet_local *lp = netdev_priv(ndev);
+
+        for (i = 0; i < RX_BD_NUM; i++) {
+                dma_unmap_single(ndev->dev.parent, lp->rx_bd_v[i].phys,
+                                 lp->max_frm_size, DMA_FROM_DEVICE);
+                dev_kfree_skb((struct sk_buff *)
+                              (lp->rx_bd_v[i].sw_id_offset));
+        }
+
+        if (lp->rx_bd_v) {
+                dma_free_coherent(ndev->dev.parent,
+                                  sizeof(*lp->rx_bd_v) * RX_BD_NUM,
+                                  lp->rx_bd_v,
+                                  lp->rx_bd_p);
+        }
+        if (lp->tx_bd_v) {
+                dma_free_coherent(ndev->dev.parent,
+                                  sizeof(*lp->tx_bd_v) * TX_BD_NUM,
+                                  lp->tx_bd_v,
+                                  lp->tx_bd_p);
+        }
+}
+
+/**
+ * axienet_dma_bd_init - Setup buffer descriptor rings for Axi DMA
+ * @ndev:       Pointer to the net_device structure
+ *
+ * returns: 0, on success
+ *          -ENOMEM, on failure
+ *
+ * This function is called to initialize the Rx and Tx DMA descriptor
+ * rings. This initializes the descriptors with required default values
+ * and is called when Axi Ethernet driver reset is called.
+ */
+static int axienet_dma_bd_init(struct net_device *ndev)
+{
+        u32 cr;
+        int i;
+        struct sk_buff *skb;
+        struct axienet_local *lp = netdev_priv(ndev);
+
+        /* Reset the indexes which are used for accessing the BDs */
+        lp->tx_bd_ci = 0;
+        lp->tx_bd_tail = 0;
+        lp->rx_bd_ci = 0;
+
+        /*
+         * Allocate the Tx and Rx buffer descriptors.
+         */
+        lp->tx_bd_v = dma_alloc_coherent(ndev->dev.parent,
+                                         sizeof(*lp->tx_bd_v) * TX_BD_NUM,
+                                         &lp->tx_bd_p,
+                                         GFP_KERNEL);
+        if (!lp->tx_bd_v) {
+                dev_err(&ndev->dev, "unable to allocate DMA Tx buffer "
+                        "descriptors");
+                goto out;
+        }
+
+        lp->rx_bd_v = dma_alloc_coherent(ndev->dev.parent,
+                                         sizeof(*lp->rx_bd_v) * RX_BD_NUM,
+                                         &lp->rx_bd_p,
+                                         GFP_KERNEL);
+        if (!lp->rx_bd_v) {
+                dev_err(&ndev->dev, "unable to allocate DMA Rx buffer "
+                        "descriptors");
+                goto out;
+        }
+
+        memset(lp->tx_bd_v, 0, sizeof(*lp->tx_bd_v) * TX_BD_NUM);
+        for (i = 0; i < TX_BD_NUM; i++) {
+                lp->tx_bd_v[i].next = lp->tx_bd_p +
+                                      sizeof(*lp->tx_bd_v) *
+                                      ((i + 1) % TX_BD_NUM);
+        }
+
+        memset(lp->rx_bd_v, 0, sizeof(*lp->rx_bd_v) * RX_BD_NUM);
+        for (i = 0; i < RX_BD_NUM; i++) {
+                lp->rx_bd_v[i].next = lp->rx_bd_p +
+                                      sizeof(*lp->rx_bd_v) *
+                                      ((i + 1) % RX_BD_NUM);
+
+                skb = netdev_alloc_skb_ip_align(ndev, lp->max_frm_size);
+                if (!skb) {
+                        dev_err(&ndev->dev, "alloc_skb error %d\n", i);
+                        goto out;
+                }
+
+                lp->rx_bd_v[i].sw_id_offset = (u32) skb;
+                lp->rx_bd_v[i].phys = dma_map_single(ndev->dev.parent,
+                                                     skb->data,
+                                                     lp->max_frm_size,
+                                                     DMA_FROM_DEVICE);
+                lp->rx_bd_v[i].cntrl = lp->max_frm_size;
+        }
+
+        /* Start updating the Rx channel control register */
+        cr = axienet_dma_in32(lp, XAXIDMA_RX_CR_OFFSET);
+        /* Update the interrupt coalesce count */
+        cr = ((cr & ~XAXIDMA_COALESCE_MASK) |
+              ((lp->coalesce_count_rx) << XAXIDMA_COALESCE_SHIFT));
+        /* Update the delay timer count */
+        cr = ((cr & ~XAXIDMA_DELAY_MASK) |
+              (XAXIDMA_DFT_RX_WAITBOUND << XAXIDMA_DELAY_SHIFT));
+        /* Enable coalesce, delay timer and error interrupts */
+        cr |= XAXIDMA_IRQ_ALL_MASK;
+        /* Write to the Rx channel control register */
+        axienet_dma_out32(lp, XAXIDMA_RX_CR_OFFSET, cr);
+
+        /* Start updating the Tx channel control register */
+        cr = axienet_dma_in32(lp, XAXIDMA_TX_CR_OFFSET);
+        /* Update the interrupt coalesce count */
+        cr = (((cr & ~XAXIDMA_COALESCE_MASK)) |
+              ((lp->coalesce_count_tx) << XAXIDMA_COALESCE_SHIFT));
+        /* Update the delay timer count */
+        cr = (((cr & ~XAXIDMA_DELAY_MASK)) |
+              (XAXIDMA_DFT_TX_WAITBOUND << XAXIDMA_DELAY_SHIFT));
+        /* Enable coalesce, delay timer and error interrupts */
+        cr |= XAXIDMA_IRQ_ALL_MASK;
+        /* Write to the Tx channel control register */
+        axienet_dma_out32(lp, XAXIDMA_TX_CR_OFFSET, cr);
+
+        /* Populate the tail pointer and bring the Rx Axi DMA engine out of
+         * halted state. This will make the Rx side ready for reception.*/
+        axienet_dma_out32(lp, XAXIDMA_RX_CDESC_OFFSET, lp->rx_bd_p);
+        cr = axienet_dma_in32(lp, XAXIDMA_RX_CR_OFFSET);
+        axienet_dma_out32(lp, XAXIDMA_RX_CR_OFFSET,
+                          cr | XAXIDMA_CR_RUNSTOP_MASK);
+        axienet_dma_out32(lp, XAXIDMA_RX_TDESC_OFFSET, lp->rx_bd_p +
+                          (sizeof(*lp->rx_bd_v) * (RX_BD_NUM - 1)));
+
+        /* Write to the RS (Run-stop) bit in the Tx channel control register.
+         * Tx channel is now ready to run. But only after we write to the
+         * tail pointer register that the Tx channel will start transmitting */
+        axienet_dma_out32(lp, XAXIDMA_TX_CDESC_OFFSET, lp->tx_bd_p);
+        cr = axienet_dma_in32(lp, XAXIDMA_TX_CR_OFFSET);
+        axienet_dma_out32(lp, XAXIDMA_TX_CR_OFFSET,
+                          cr | XAXIDMA_CR_RUNSTOP_MASK);
+
+        return 0;
+out:
+        axienet_dma_bd_release(ndev);
+        return -ENOMEM;
+}
+
+/**
+ * axienet_set_mac_address - Write the MAC address
+ * @ndev:       Pointer to the net_device structure
+ * @address:    6 byte Address to be written as MAC address
+ *
+ * This function is called to initialize the MAC address of the Axi Ethernet
+ * core. It writes to the UAW0 and UAW1 registers of the core.
+ */
+static void axienet_set_mac_address(struct net_device *ndev, void *address)
+{
+        struct axienet_local *lp = netdev_priv(ndev);
+
+        if (address)
+                memcpy(ndev->dev_addr, address, ETH_ALEN);
+        if (!is_valid_ether_addr(ndev->dev_addr))
+                random_ether_addr(ndev->dev_addr);
+
+        /* Set up unicast MAC address filter set its mac address */
+        axienet_iow(lp, XAE_UAW0_OFFSET,
+                    (ndev->dev_addr[0]) |
+                    (ndev->dev_addr[1] << 8) |
+                    (ndev->dev_addr[2] << 16) |
+                    (ndev->dev_addr[3] << 24));
+        axienet_iow(lp, XAE_UAW1_OFFSET,
+                    (((axienet_ior(lp, XAE_UAW1_OFFSET)) &
+                      ~XAE_UAW1_UNICASTADDR_MASK) |
+                     (ndev->dev_addr[4] |
+                     (ndev->dev_addr[5] << 8))));
+}
+
+/**
+ * netdev_set_mac_address - Write the MAC address (from outside the driver)
+ * @ndev:       Pointer to the net_device structure
+ * @p:          6 byte Address to be written as MAC address
+ *
+ * returns: 0 for all conditions. Presently, there is no failure case.
+ *
+ * This function is called to initialize the MAC address of the Axi Ethernet
+ * core. It calls the core specific axienet_set_mac_address. This is the
+ * function that goes into net_device_ops structure entry ndo_set_mac_address.
+ */
+static int netdev_set_mac_address(struct net_device *ndev, void *p)
+{
+        struct sockaddr *addr = p;
+        axienet_set_mac_address(ndev, addr->sa_data);
+        return 0;
+}
+
+/**
+ * axienet_set_multicast_list - Prepare the multicast table
+ * @ndev:       Pointer to the net_device structure
+ *
+ * This function is called to initialize the multicast table during
+ * initialization. The Axi Ethernet basic multicast support has a four-entry
+ * multicast table which is initialized here. Additionally this function
+ * goes into the net_device_ops structure entry ndo_set_multicast_list. This
+ * means whenever the multicast table entries need to be updated this
+ * function gets called.
+ */
+static void axienet_set_multicast_list(struct net_device *ndev)
+{
+        int i;
+        u32 reg, af0reg, af1reg;
+        struct axienet_local *lp = netdev_priv(ndev);
+
+        if (ndev->flags & (IFF_ALLMULTI | IFF_PROMISC) ||
+            netdev_mc_count(ndev) > XAE_MULTICAST_CAM_TABLE_NUM) {
+                /* We must make the kernel realize we had to move into
+                 * promiscuous mode. If it was a promiscuous mode request
+                 * the flag is already set. If not we set it. */
+                ndev->flags |= IFF_PROMISC;
+                reg = axienet_ior(lp, XAE_FMI_OFFSET);
+                reg |= XAE_FMI_PM_MASK;
+                axienet_iow(lp, XAE_FMI_OFFSET, reg);
+                dev_info(&ndev->dev, "Promiscuous mode enabled.\n");
+        } else if (!netdev_mc_empty(ndev)) {
+                struct netdev_hw_addr *ha;
+
+                i = 0;
+                netdev_for_each_mc_addr(ha, ndev) {
+                        if (i >= XAE_MULTICAST_CAM_TABLE_NUM)
+                                break;
+
+                        af0reg = (ha->addr[0]);
+                        af0reg |= (ha->addr[1] << 8);
+                        af0reg |= (ha->addr[2] << 16);
+                        af0reg |= (ha->addr[3] << 24);
+
+                        af1reg = (ha->addr[4]);
+                        af1reg |= (ha->addr[5] << 8);
+
+                        reg = axienet_ior(lp, XAE_FMI_OFFSET) & 0xFFFFFF00;
+                        reg |= i;
+
+                        axienet_iow(lp, XAE_FMI_OFFSET, reg);
+                        axienet_iow(lp, XAE_AF0_OFFSET, af0reg);
+                        axienet_iow(lp, XAE_AF1_OFFSET, af1reg);
+                        i++;
+                }
+        } else {
+                reg = axienet_ior(lp, XAE_FMI_OFFSET);
+                reg &= ~XAE_FMI_PM_MASK;
+
+                axienet_iow(lp, XAE_FMI_OFFSET, reg);
+
+                for (i = 0; i < XAE_MULTICAST_CAM_TABLE_NUM; i++) {
+                        reg = axienet_ior(lp, XAE_FMI_OFFSET) & 0xFFFFFF00;
+                        reg |= i;
+
+                        axienet_iow(lp, XAE_FMI_OFFSET, reg);
+                        axienet_iow(lp, XAE_AF0_OFFSET, 0);
+                        axienet_iow(lp, XAE_AF1_OFFSET, 0);
+                }
+
+                dev_info(&ndev->dev, "Promiscuous mode disabled.\n");
+        }
+}
+
+/**
+ * axienet_setoptions - Set an Axi Ethernet option
+ * @ndev:       Pointer to the net_device structure
+ * @options:    Option to be enabled/disabled
+ *
+ * The Axi Ethernet core has multiple features which can be selectively turned
+ * on or off. The typical options could be jumbo frame option, basic VLAN
+ * option, promiscuous mode option etc. This function is used to set or clear
+ * these options in the Axi Ethernet hardware. This is done through
+ * axienet_option structure .
+ */
+static void axienet_setoptions(struct net_device *ndev, u32 options)
+{
+        int reg;
+        struct axienet_local *lp = netdev_priv(ndev);
+        struct axienet_option *tp = &axienet_options[0];
+
+        while (tp->opt) {
+                reg = ((axienet_ior(lp, tp->reg)) & ~(tp->m_or));
+                if (options & tp->opt)
+                        reg |= tp->m_or;
+                axienet_iow(lp, tp->reg, reg);
+                tp++;
+        }
+
+        lp->options |= options;
+}
+
+static void __axienet_device_reset(struct axienet_local *lp,
+                                   struct device *dev, off_t offset)
+{
+        u32 timeout;
+        /* Reset Axi DMA. This would reset Axi Ethernet core as well. The reset
+         * process of Axi DMA takes a while to complete as all pending
+         * commands/transfers will be flushed or completed during this
+         * reset process. */
+        axienet_dma_out32(lp, offset, XAXIDMA_CR_RESET_MASK);
+        timeout = DELAY_OF_ONE_MILLISEC;
+        while (axienet_dma_in32(lp, offset) & XAXIDMA_CR_RESET_MASK) {
+                udelay(1);
+                if (--timeout == 0) {
+                        dev_err(dev, "axienet_device_reset DMA "
+                                "reset timeout!\n");
+                        break;
+                }
+        }
+}
+
+/**
+ * axienet_device_reset - Reset and initialize the Axi Ethernet hardware.
+ * @ndev:       Pointer to the net_device structure
+ *
+ * This function is called to reset and initialize the Axi Ethernet core. This
+ * is typically called during initialization. It does a reset of the Axi DMA
+ * Rx/Tx channels and initializes the Axi DMA BDs. Since Axi DMA reset lines
+ * areconnected to Axi Ethernet reset lines, this in turn resets the Axi
+ * Ethernet core. No separate hardware reset is done for the Axi Ethernet
+ * core.
+ */
+static void axienet_device_reset(struct net_device *ndev)
+{
+        u32 axienet_status;
+        struct axienet_local *lp = netdev_priv(ndev);
+
+        __axienet_device_reset(lp, &ndev->dev, XAXIDMA_TX_CR_OFFSET);
+        __axienet_device_reset(lp, &ndev->dev, XAXIDMA_RX_CR_OFFSET);
+
+        lp->max_frm_size = XAE_MAX_VLAN_FRAME_SIZE;
+        lp->options &= (~XAE_OPTION_JUMBO);
+
+        if ((ndev->mtu > XAE_MTU) &&
+            (ndev->mtu <= XAE_JUMBO_MTU) &&
+            (lp->jumbo_support)) {
+                lp->max_frm_size = ndev->mtu + XAE_HDR_VLAN_SIZE +
+                                   XAE_TRL_SIZE;
+                lp->options |= XAE_OPTION_JUMBO;
+        }
+
+        if (axienet_dma_bd_init(ndev)) {
+                dev_err(&ndev->dev, "axienet_device_reset descriptor "
+                        "allocation failed\n");
+        }
+
+        axienet_status = axienet_ior(lp, XAE_RCW1_OFFSET);
+        axienet_status &= ~XAE_RCW1_RX_MASK;
+        axienet_iow(lp, XAE_RCW1_OFFSET, axienet_status);
+
+        axienet_status = axienet_ior(lp, XAE_IP_OFFSET);
+        if (axienet_status & XAE_INT_RXRJECT_MASK)
+                axienet_iow(lp, XAE_IS_OFFSET, XAE_INT_RXRJECT_MASK);
+
+        axienet_iow(lp, XAE_FCC_OFFSET, XAE_FCC_FCRX_MASK);
+
+        /* Sync default options with HW but leave receiver and
+         * transmitter disabled.*/
+        axienet_setoptions(ndev, lp->options &
+                           ~(XAE_OPTION_TXEN | XAE_OPTION_RXEN));
+        axienet_set_mac_address(ndev, NULL);
+        axienet_set_multicast_list(ndev);
+        axienet_setoptions(ndev, lp->options);
+
+        ndev->trans_start = jiffies;
+}
+
+/**
+ * axienet_adjust_link - Adjust the PHY link speed/duplex.
+ * @ndev:       Pointer to the net_device structure
+ *
+ * This function is called to change the speed and duplex setting after
+ * auto negotiation is done by the PHY. This is the function that gets
+ * registered with the PHY interface through the "of_phy_connect" call.
+ */
+static void axienet_adjust_link(struct net_device *ndev)
+{
+        u32 emmc_reg;
+        u32 link_state;
+        u32 setspeed = 1;
+        struct axienet_local *lp = netdev_priv(ndev);
+        struct phy_device *phy = lp->phy_dev;
+
+        link_state = phy->speed | (phy->duplex << 1) | phy->link;
+        if (lp->last_link != link_state) {
+                if ((phy->speed == SPEED_10) || (phy->speed == SPEED_100)) {
+                        if (lp->phy_type == XAE_PHY_TYPE_1000BASE_X)
+                                setspeed = 0;
+                } else {
+                        if ((phy->speed == SPEED_1000) &&
+                            (lp->phy_type == XAE_PHY_TYPE_MII))
+                                setspeed = 0;
+                }
+
+                if (setspeed == 1) {
+                        emmc_reg = axienet_ior(lp, XAE_EMMC_OFFSET);
+                        emmc_reg &= ~XAE_EMMC_LINKSPEED_MASK;
+
+                        switch (phy->speed) {
+                        case SPEED_1000:
+                                emmc_reg |= XAE_EMMC_LINKSPD_1000;
+                                break;
+                        case SPEED_100:
+                                emmc_reg |= XAE_EMMC_LINKSPD_100;
+                                break;
+                        case SPEED_10:
+                                emmc_reg |= XAE_EMMC_LINKSPD_10;
+                                break;
+                        default:
+                                dev_err(&ndev->dev, "Speed other than 10, 100 "
+                                        "or 1Gbps is not supported\n");
+                                break;
+                        }
+
+                        axienet_iow(lp, XAE_EMMC_OFFSET, emmc_reg);
+                        lp->last_link = link_state;
+                        phy_print_status(phy);
+                } else {
+                        dev_err(&ndev->dev, "Error setting Axi Ethernet "
+                                "mac speed\n");
+                }
+        }
+}
+
+/**
+ * axienet_start_xmit_done - Invoked once a transmit is completed by the
+ * Axi DMA Tx channel.
+ * @ndev:       Pointer to the net_device structure
+ *
+ * This function is invoked from the Axi DMA Tx isr to notify the completion
+ * of transmit operation. It clears fields in the corresponding Tx BDs and
+ * unmaps the corresponding buffer so that CPU can regain ownership of the
+ * buffer. It finally invokes "netif_wake_queue" to restart transmission if
+ * required.
+ */
+static void axienet_start_xmit_done(struct net_device *ndev)
+{
+        u32 size = 0;
+        u32 packets = 0;
+        struct axienet_local *lp = netdev_priv(ndev);
+        struct axidma_bd *cur_p;
+        unsigned int status = 0;
+
+        cur_p = &lp->tx_bd_v[lp->tx_bd_ci];
+        status = cur_p->status;
+        while (status & XAXIDMA_BD_STS_COMPLETE_MASK) {
+                dma_unmap_single(ndev->dev.parent, cur_p->phys,
+                                (cur_p->cntrl & XAXIDMA_BD_CTRL_LENGTH_MASK),
+                                DMA_TO_DEVICE);
+                if (cur_p->app4)
+                        dev_kfree_skb_irq((struct sk_buff *)cur_p->app4);
+                /*cur_p->phys = 0;*/
+                cur_p->app0 = 0;
+                cur_p->app1 = 0;
+                cur_p->app2 = 0;
+                cur_p->app4 = 0;
+                cur_p->status = 0;
+
+                size += status & XAXIDMA_BD_STS_ACTUAL_LEN_MASK;
+                packets++;
+
+                lp->tx_bd_ci = ++lp->tx_bd_ci % TX_BD_NUM;
+                cur_p = &lp->tx_bd_v[lp->tx_bd_ci];
+                status = cur_p->status;
+        }
+
+        ndev->stats.tx_packets += packets;
+        ndev->stats.tx_bytes += size;
+        netif_wake_queue(ndev);
+}
+
+/**
+ * axienet_check_tx_bd_space - Checks if a BD/group of BDs are currently busy
+ * @lp:         Pointer to the axienet_local structure
+ * @num_frag:   The number of BDs to check for
+ *
+ * returns: 0, on success
+ *          NETDEV_TX_BUSY, if any of the descriptors are not free
+ *
+ * This function is invoked before BDs are allocated and transmission starts.
+ * This function returns 0 if a BD or group of BDs can be allocated for
+ * transmission. If the BD or any of the BDs are not free the function
+ * returns a busy status. This is invoked from axienet_start_xmit.
+ */
+static inline int axienet_check_tx_bd_space(struct axienet_local *lp,
+                                            int num_frag)
+{
+        struct axidma_bd *cur_p;
+        cur_p = &lp->tx_bd_v[(lp->tx_bd_tail + num_frag) % TX_BD_NUM];
+        if (cur_p->status & XAXIDMA_BD_STS_ALL_MASK)
+                return NETDEV_TX_BUSY;
+        return 0;
+}
+
+/**
+ * axienet_start_xmit - Starts the transmission.
+ * @skb:        sk_buff pointer that contains data to be Txed.
+ * @ndev:       Pointer to net_device structure.
+ *
+ * returns: NETDEV_TX_OK, on success
+ *          NETDEV_TX_BUSY, if any of the descriptors are not free
+ *
+ * This function is invoked from upper layers to initiate transmission. The
+ * function uses the next available free BDs and populates their fields to
+ * start the transmission. Additionally if checksum offloading is supported,
+ * it populates AXI Stream Control fields with appropriate values.
+ */
+static int axienet_start_xmit(struct sk_buff *skb, struct net_device *ndev)
+{
+        u32 ii;
+        u32 num_frag;
+        u32 csum_start_off;
+        u32 csum_index_off;
+        skb_frag_t *frag;
+        dma_addr_t tail_p;
+        struct axienet_local *lp = netdev_priv(ndev);
+        struct axidma_bd *cur_p;
+
+        num_frag = skb_shinfo(skb)->nr_frags;
+        cur_p = &lp->tx_bd_v[lp->tx_bd_tail];
+
+        if (axienet_check_tx_bd_space(lp, num_frag)) {
+                if (!netif_queue_stopped(ndev))
+                        netif_stop_queue(ndev);
+                return NETDEV_TX_BUSY;
+        }
+
+        if (skb->ip_summed == CHECKSUM_PARTIAL) {
+                if (lp->features & XAE_FEATURE_FULL_TX_CSUM) {
+                        /* Tx Full Checksum Offload Enabled */
+                        cur_p->app0 |= 2;
+                } else if (lp->features & XAE_FEATURE_PARTIAL_RX_CSUM) {
+                        csum_start_off = skb_transport_offset(skb);
+                        csum_index_off = csum_start_off + skb->csum_offset;
+                        /* Tx Partial Checksum Offload Enabled */
+                        cur_p->app0 |= 1;
+                        cur_p->app1 = (csum_start_off << 16) | csum_index_off;
+                }
+        } else if (skb->ip_summed == CHECKSUM_UNNECESSARY) {
+                cur_p->app0 |= 2; /* Tx Full Checksum Offload Enabled */
+        }
+
+        cur_p->cntrl = skb_headlen(skb) | XAXIDMA_BD_CTRL_TXSOF_MASK;
+        cur_p->phys = dma_map_single(ndev->dev.parent, skb->data,
+                                     skb_headlen(skb), DMA_TO_DEVICE);
+
+        for (ii = 0; ii < num_frag; ii++) {
+                lp->tx_bd_tail = ++lp->tx_bd_tail % TX_BD_NUM;
+                cur_p = &lp->tx_bd_v[lp->tx_bd_tail];
+                frag = &skb_shinfo(skb)->frags[ii];
+                cur_p->phys = dma_map_single(ndev->dev.parent,
+                                             skb_frag_address(frag),
+                                             skb_frag_size(frag),
+                                             DMA_TO_DEVICE);
+                cur_p->cntrl = skb_frag_size(frag);
+        }
+
+        cur_p->cntrl |= XAXIDMA_BD_CTRL_TXEOF_MASK;
+        cur_p->app4 = (unsigned long)skb;
+
+        tail_p = lp->tx_bd_p + sizeof(*lp->tx_bd_v) * lp->tx_bd_tail;
+        /* Start the transfer */
+        axienet_dma_out32(lp, XAXIDMA_TX_TDESC_OFFSET, tail_p);
+        lp->tx_bd_tail = ++lp->tx_bd_tail % TX_BD_NUM;
+
+        return NETDEV_TX_OK;
+}
+
+/**
+ * axienet_recv - Is called from Axi DMA Rx Isr to complete the received
+ *                BD processing.
+ * @ndev:       Pointer to net_device structure.
+ *
+ * This function is invoked from the Axi DMA Rx isr to process the Rx BDs. It
+ * does minimal processing and invokes "netif_rx" to complete further
+ * processing.
+ */
+static void axienet_recv(struct net_device *ndev)
+{
+        u32 length;
+        u32 csumstatus;
+        u32 size = 0;
+        u32 packets = 0;
+        dma_addr_t tail_p;
+        struct axienet_local *lp = netdev_priv(ndev);
+        struct sk_buff *skb, *new_skb;
+        struct axidma_bd *cur_p;
+
+        tail_p = lp->rx_bd_p + sizeof(*lp->rx_bd_v) * lp->rx_bd_ci;
+        cur_p = &lp->rx_bd_v[lp->rx_bd_ci];
+
+        while ((cur_p->status & XAXIDMA_BD_STS_COMPLETE_MASK)) {
+                skb = (struct sk_buff *) (cur_p->sw_id_offset);
+                length = cur_p->app4 & 0x0000FFFF;
+
+                dma_unmap_single(ndev->dev.parent, cur_p->phys,
+                                 lp->max_frm_size,
+                                 DMA_FROM_DEVICE);
+
+                skb_put(skb, length);
+                skb->protocol = eth_type_trans(skb, ndev);
+                /*skb_checksum_none_assert(skb);*/
+                skb->ip_summed = CHECKSUM_NONE;
+
+                /* if we're doing Rx csum offload, set it up */
+                if (lp->features & XAE_FEATURE_FULL_RX_CSUM) {
+                        csumstatus = (cur_p->app2 &
+                                      XAE_FULL_CSUM_STATUS_MASK) >> 3;
+                        if ((csumstatus == XAE_IP_TCP_CSUM_VALIDATED) ||
+                            (csumstatus == XAE_IP_UDP_CSUM_VALIDATED)) {
+                                skb->ip_summed = CHECKSUM_UNNECESSARY;
+                        }
+                } else if ((lp->features & XAE_FEATURE_PARTIAL_RX_CSUM) != 0 &&
+                           skb->protocol == __constant_htons(ETH_P_IP) &&
+                           skb->len > 64) {
+                        skb->csum = be32_to_cpu(cur_p->app3 & 0xFFFF);
+                        skb->ip_summed = CHECKSUM_COMPLETE;
+                }
+
+                netif_rx(skb);
+
+                size += length;
+                packets++;
+
+                new_skb = netdev_alloc_skb_ip_align(ndev, lp->max_frm_size);
+                if (!new_skb) {
+                        dev_err(&ndev->dev, "no memory for new sk_buff\n");
+                        return;
+                }
+                cur_p->phys = dma_map_single(ndev->dev.parent, new_skb->data,
+                                             lp->max_frm_size,
+                                             DMA_FROM_DEVICE);
+                cur_p->cntrl = lp->max_frm_size;
+                cur_p->status = 0;
+                cur_p->sw_id_offset = (u32) new_skb;
+
+                lp->rx_bd_ci = ++lp->rx_bd_ci % RX_BD_NUM;
+                cur_p = &lp->rx_bd_v[lp->rx_bd_ci];
+        }
+
+        ndev->stats.rx_packets += packets;
+        ndev->stats.rx_bytes += size;
+
+        axienet_dma_out32(lp, XAXIDMA_RX_TDESC_OFFSET, tail_p);
+}
+
+/**
+ * axienet_tx_irq - Tx Done Isr.
+ * @irq:        irq number
+ * @_ndev:      net_device pointer
+ *
+ * returns: IRQ_HANDLED for all cases.
+ *
+ * This is the Axi DMA Tx done Isr. It invokes "axienet_start_xmit_done"
+ * to complete the BD processing.
+ */
+static irqreturn_t axienet_tx_irq(int irq, void *_ndev)
+{
+        u32 cr;
+        unsigned int status;
+        struct net_device *ndev = _ndev;
+        struct axienet_local *lp = netdev_priv(ndev);
+
+        status = axienet_dma_in32(lp, XAXIDMA_TX_SR_OFFSET);
+        if (status & (XAXIDMA_IRQ_IOC_MASK | XAXIDMA_IRQ_DELAY_MASK)) {
+                axienet_start_xmit_done(lp->ndev);
+                goto out;
+        }
+        if (!(status & XAXIDMA_IRQ_ALL_MASK))
+                dev_err(&ndev->dev, "No interrupts asserted in Tx path");
+        if (status & XAXIDMA_IRQ_ERROR_MASK) {
+                dev_err(&ndev->dev, "DMA Tx error 0x%x\n", status);
+                dev_err(&ndev->dev, "Current BD is at: 0x%x\n",
+                        (lp->tx_bd_v[lp->tx_bd_ci]).phys);
+
+                cr = axienet_dma_in32(lp, XAXIDMA_TX_CR_OFFSET);
+                /* Disable coalesce, delay timer and error interrupts */
+                cr &= (~XAXIDMA_IRQ_ALL_MASK);
+                /* Write to the Tx channel control register */
+                axienet_dma_out32(lp, XAXIDMA_TX_CR_OFFSET, cr);
+
+                cr = axienet_dma_in32(lp, XAXIDMA_RX_CR_OFFSET);
+                /* Disable coalesce, delay timer and error interrupts */
+                cr &= (~XAXIDMA_IRQ_ALL_MASK);
+                /* Write to the Rx channel control register */
+                axienet_dma_out32(lp, XAXIDMA_RX_CR_OFFSET, cr);
+
+                tasklet_schedule(&lp->dma_err_tasklet);
+        }
+out:
+        axienet_dma_out32(lp, XAXIDMA_TX_SR_OFFSET, status);
+        return IRQ_HANDLED;
+}
+
+/**
+ * axienet_rx_irq - Rx Isr.
+ * @irq:        irq number
+ * @_ndev:      net_device pointer
+ *
+ * returns: IRQ_HANDLED for all cases.
+ *
+ * This is the Axi DMA Rx Isr. It invokes "axienet_recv" to complete the BD
+ * processing.
+ */
+static irqreturn_t axienet_rx_irq(int irq, void *_ndev)
+{
+        u32 cr;
+        unsigned int status;
+        struct net_device *ndev = _ndev;
+        struct axienet_local *lp = netdev_priv(ndev);
+
+        status = axienet_dma_in32(lp, XAXIDMA_RX_SR_OFFSET);
+        if (status & (XAXIDMA_IRQ_IOC_MASK | XAXIDMA_IRQ_DELAY_MASK)) {
+                axienet_recv(lp->ndev);
+                goto out;
+        }
+        if (!(status & XAXIDMA_IRQ_ALL_MASK))
+                dev_err(&ndev->dev, "No interrupts asserted in Rx path");
+        if (status & XAXIDMA_IRQ_ERROR_MASK) {
+                dev_err(&ndev->dev, "DMA Rx error 0x%x\n", status);
+                dev_err(&ndev->dev, "Current BD is at: 0x%x\n",
+                        (lp->rx_bd_v[lp->rx_bd_ci]).phys);
+
+                cr = axienet_dma_in32(lp, XAXIDMA_TX_CR_OFFSET);
+                /* Disable coalesce, delay timer and error interrupts */
+                cr &= (~XAXIDMA_IRQ_ALL_MASK);
+                /* Finally write to the Tx channel control register */
+                axienet_dma_out32(lp, XAXIDMA_TX_CR_OFFSET, cr);
+
+                cr = axienet_dma_in32(lp, XAXIDMA_RX_CR_OFFSET);
+                /* Disable coalesce, delay timer and error interrupts */
+                cr &= (~XAXIDMA_IRQ_ALL_MASK);
+                /* write to the Rx channel control register */
+                axienet_dma_out32(lp, XAXIDMA_RX_CR_OFFSET, cr);
+
+                tasklet_schedule(&lp->dma_err_tasklet);
+        }
+out:
+        axienet_dma_out32(lp, XAXIDMA_RX_SR_OFFSET, status);
+        return IRQ_HANDLED;
+}
+
+/**
+ * axienet_open - Driver open routine.
+ * @ndev:       Pointer to net_device structure
+ *
+ * returns: 0, on success.
+ *          -ENODEV, if PHY cannot be connected to
+ *          non-zero error value on failure
+ *
+ * This is the driver open routine. It calls phy_start to start the PHY device.
+ * It also allocates interrupt service routines, enables the interrupt lines
+ * and ISR handling. Axi Ethernet core is reset through Axi DMA core. Buffer
+ * descriptors are initialized.
+ */
+static int axienet_open(struct net_device *ndev)
+{
+        int ret, mdio_mcreg;
+        struct axienet_local *lp = netdev_priv(ndev);
+
+        dev_dbg(&ndev->dev, "axienet_open()\n");
+
+        mdio_mcreg = axienet_ior(lp, XAE_MDIO_MC_OFFSET);
+        ret = axienet_mdio_wait_until_ready(lp);
+        if (ret < 0)
+                return ret;
+        /* Disable the MDIO interface till Axi Ethernet Reset is completed.
+         * When we do an Axi Ethernet reset, it resets the complete core
+         * including the MDIO. If MDIO is not disabled when the reset
+         * process is started, MDIO will be broken afterwards. */
+        axienet_iow(lp, XAE_MDIO_MC_OFFSET,
+                    (mdio_mcreg & (~XAE_MDIO_MC_MDIOEN_MASK)));
+        axienet_device_reset(ndev);
+        /* Enable the MDIO */
+        axienet_iow(lp, XAE_MDIO_MC_OFFSET, mdio_mcreg);
+        ret = axienet_mdio_wait_until_ready(lp);
+        if (ret < 0)
+                return ret;
+
+        if (lp->phy_node) {
+                lp->phy_dev = of_phy_connect(lp->ndev, lp->phy_node,
+                                             axienet_adjust_link, 0,
+                                             PHY_INTERFACE_MODE_GMII);
+                if (!lp->phy_dev) {
+                        dev_err(lp->dev, "of_phy_connect() failed\n");
+                        return -ENODEV;
+                }
+                phy_start(lp->phy_dev);
+        }
+
+        /* Enable interrupts for Axi DMA Tx */
+        ret = request_irq(lp->tx_irq, axienet_tx_irq, 0, ndev->name, ndev);
+        if (ret)
+                goto err_tx_irq;
+        /* Enable interrupts for Axi DMA Rx */
+        ret = request_irq(lp->rx_irq, axienet_rx_irq, 0, ndev->name, ndev);
+        if (ret)
+                goto err_rx_irq;
+        /* Enable tasklets for Axi DMA error handling */
+        tasklet_enable(&lp->dma_err_tasklet);
+        return 0;
+
+err_rx_irq:
+        free_irq(lp->tx_irq, ndev);
+err_tx_irq:
+        if (lp->phy_dev)
+                phy_disconnect(lp->phy_dev);
+        lp->phy_dev = NULL;
+        dev_err(lp->dev, "request_irq() failed\n");
+        return ret;
+}
+
+/**
+ * axienet_stop - Driver stop routine.
+ * @ndev:       Pointer to net_device structure
+ *
+ * returns: 0, on success.
+ *
+ * This is the driver stop routine. It calls phy_disconnect to stop the PHY
+ * device. It also removes the interrupt handlers and disables the interrupts.
+ * The Axi DMA Tx/Rx BDs are released.
+ */
+static int axienet_stop(struct net_device *ndev)
+{
+        u32 cr;
+        struct axienet_local *lp = netdev_priv(ndev);
+
+        dev_dbg(&ndev->dev, "axienet_close()\n");
+
+        cr = axienet_dma_in32(lp, XAXIDMA_RX_CR_OFFSET);
+        axienet_dma_out32(lp, XAXIDMA_RX_CR_OFFSET,
+                          cr & (~XAXIDMA_CR_RUNSTOP_MASK));
+        cr = axienet_dma_in32(lp, XAXIDMA_TX_CR_OFFSET);
+        axienet_dma_out32(lp, XAXIDMA_TX_CR_OFFSET,
+                          cr & (~XAXIDMA_CR_RUNSTOP_MASK));
+        axienet_setoptions(ndev, lp->options &
+                           ~(XAE_OPTION_TXEN | XAE_OPTION_RXEN));
+
+        tasklet_disable(&lp->dma_err_tasklet);
+
+        free_irq(lp->tx_irq, ndev);
+        free_irq(lp->rx_irq, ndev);
+
+        if (lp->phy_dev)
+                phy_disconnect(lp->phy_dev);
+        lp->phy_dev = NULL;
+
+        axienet_dma_bd_release(ndev);
+        return 0;
+}
+
+/**
+ * axienet_change_mtu - Driver change mtu routine.
+ * @ndev:       Pointer to net_device structure
+ * @new_mtu:    New mtu value to be applied
+ *
+ * returns: Always returns 0 (success).
+ *
+ * This is the change mtu driver routine. It checks if the Axi Ethernet
+ * hardware supports jumbo frames before changing the mtu. This can be
+ * called only when the device is not up.
+ */
+static int axienet_change_mtu(struct net_device *ndev, int new_mtu)
+{
+        struct axienet_local *lp = netdev_priv(ndev);
+
+        if (netif_running(ndev))
+                return -EBUSY;
+        if (lp->jumbo_support) {
+                if ((new_mtu > XAE_JUMBO_MTU) || (new_mtu < 64))
+                        return -EINVAL;
+                ndev->mtu = new_mtu;
+        } else {
+                if ((new_mtu > XAE_MTU) || (new_mtu < 64))
+                        return -EINVAL;
+                ndev->mtu = new_mtu;
+        }
+
+        return 0;
+}
+
+#ifdef CONFIG_NET_POLL_CONTROLLER
+/**
+ * axienet_poll_controller - Axi Ethernet poll mechanism.
+ * @ndev:       Pointer to net_device structure
+ *
+ * This implements Rx/Tx ISR poll mechanisms. The interrupts are disabled prior
+ * to polling the ISRs and are enabled back after the polling is done.
+ */
+static void axienet_poll_controller(struct net_device *ndev)
+{
+        struct axienet_local *lp = netdev_priv(ndev);
+        disable_irq(lp->tx_irq);
+        disable_irq(lp->rx_irq);
+        axienet_rx_irq(lp->tx_irq, ndev);
+        axienet_tx_irq(lp->rx_irq, ndev);
+        enable_irq(lp->tx_irq);
+        enable_irq(lp->rx_irq);
+}
+#endif
+
+static const struct net_device_ops axienet_netdev_ops = {
+        .ndo_open = axienet_open,
+        .ndo_stop = axienet_stop,
+        .ndo_start_xmit = axienet_start_xmit,
+        .ndo_change_mtu = axienet_change_mtu,
+        .ndo_set_mac_address = netdev_set_mac_address,
+        .ndo_validate_addr = eth_validate_addr,
+        .ndo_set_rx_mode = axienet_set_multicast_list,
+#ifdef CONFIG_NET_POLL_CONTROLLER
+        .ndo_poll_controller = axienet_poll_controller,
+#endif
+};
+
+/**
+ * axienet_ethtools_get_settings - Get Axi Ethernet settings related to PHY.
+ * @ndev:       Pointer to net_device structure
+ * @ecmd:       Pointer to ethtool_cmd structure
+ *
+ * This implements ethtool command for getting PHY settings. If PHY could
+ * not be found, the function returns -ENODEV. This function calls the
+ * relevant PHY ethtool API to get the PHY settings.
+ * Issue "ethtool ethX" under linux prompt to execute this function.
+ */
+static int axienet_ethtools_get_settings(struct net_device *ndev,
+                                         struct ethtool_cmd *ecmd)
+{
+        struct axienet_local *lp = netdev_priv(ndev);
+        struct phy_device *phydev = lp->phy_dev;
+        if (!phydev)
+                return -ENODEV;
+        return phy_ethtool_gset(phydev, ecmd);
+}
+
+/**
+ * axienet_ethtools_set_settings - Set PHY settings as passed in the argument.
+ * @ndev:       Pointer to net_device structure
+ * @ecmd:       Pointer to ethtool_cmd structure
+ *
+ * This implements ethtool command for setting various PHY settings. If PHY
+ * could not be found, the function returns -ENODEV. This function calls the
+ * relevant PHY ethtool API to set the PHY.
+ * Issue e.g. "ethtool -s ethX speed 1000" under linux prompt to execute this
+ * function.
+ */
+static int axienet_ethtools_set_settings(struct net_device *ndev,
+                                         struct ethtool_cmd *ecmd)
+{
+        struct axienet_local *lp = netdev_priv(ndev);
+        struct phy_device *phydev = lp->phy_dev;
+        if (!phydev)
+                return -ENODEV;
+        return phy_ethtool_sset(phydev, ecmd);
+}
+
+/**
+ * axienet_ethtools_get_drvinfo - Get various Axi Ethernet driver information.
+ * @ndev:       Pointer to net_device structure
+ * @ed:         Pointer to ethtool_drvinfo structure
+ *
+ * This implements ethtool command for getting the driver information.
+ * Issue "ethtool -i ethX" under linux prompt to execute this function.
+ */
+static void axienet_ethtools_get_drvinfo(struct net_device *ndev,
+                                         struct ethtool_drvinfo *ed)
+{
+        memset(ed, 0, sizeof(struct ethtool_drvinfo));
+        strcpy(ed->driver, DRIVER_NAME);
+        strcpy(ed->version, DRIVER_VERSION);
+        ed->regdump_len = sizeof(u32) * AXIENET_REGS_N;
+}
+
+/**
+ * axienet_ethtools_get_regs_len - Get the total regs length present in the
+ *                                 AxiEthernet core.
+ * @ndev:       Pointer to net_device structure
+ *
+ * This implements ethtool command for getting the total register length
+ * information.
+ */
+static int axienet_ethtools_get_regs_len(struct net_device *ndev)
+{
+        return sizeof(u32) * AXIENET_REGS_N;
+}
+
+/**
+ * axienet_ethtools_get_regs - Dump the contents of all registers present
+ *                             in AxiEthernet core.
+ * @ndev:       Pointer to net_device structure
+ * @regs:       Pointer to ethtool_regs structure
+ * @ret:        Void pointer used to return the contents of the registers.
+ *
+ * This implements ethtool command for getting the Axi Ethernet register dump.
+ * Issue "ethtool -d ethX" to execute this function.
+ */
+static void axienet_ethtools_get_regs(struct net_device *ndev,
+                                      struct ethtool_regs *regs, void *ret)
+{
+        u32 *data = (u32 *) ret;
+        size_t len = sizeof(u32) * AXIENET_REGS_N;
+        struct axienet_local *lp = netdev_priv(ndev);
+
+        regs->version = 0;
+        regs->len = len;
+
+        memset(data, 0, len);
+        data[0] = axienet_ior(lp, XAE_RAF_OFFSET);
+        data[1] = axienet_ior(lp, XAE_TPF_OFFSET);
+        data[2] = axienet_ior(lp, XAE_IFGP_OFFSET);
+        data[3] = axienet_ior(lp, XAE_IS_OFFSET);
+        data[4] = axienet_ior(lp, XAE_IP_OFFSET);
+        data[5] = axienet_ior(lp, XAE_IE_OFFSET);
+        data[6] = axienet_ior(lp, XAE_TTAG_OFFSET);
+        data[7] = axienet_ior(lp, XAE_RTAG_OFFSET);
+        data[8] = axienet_ior(lp, XAE_UAWL_OFFSET);
+        data[9] = axienet_ior(lp, XAE_UAWU_OFFSET);
+        data[10] = axienet_ior(lp, XAE_TPID0_OFFSET);
+        data[11] = axienet_ior(lp, XAE_TPID1_OFFSET);
+        data[12] = axienet_ior(lp, XAE_PPST_OFFSET);
+        data[13] = axienet_ior(lp, XAE_RCW0_OFFSET);
+        data[14] = axienet_ior(lp, XAE_RCW1_OFFSET);
+        data[15] = axienet_ior(lp, XAE_TC_OFFSET);
+        data[16] = axienet_ior(lp, XAE_FCC_OFFSET);
+        data[17] = axienet_ior(lp, XAE_EMMC_OFFSET);
+        data[18] = axienet_ior(lp, XAE_PHYC_OFFSET);
+        data[19] = axienet_ior(lp, XAE_MDIO_MC_OFFSET);
+        data[20] = axienet_ior(lp, XAE_MDIO_MCR_OFFSET);
+        data[21] = axienet_ior(lp, XAE_MDIO_MWD_OFFSET);
+        data[22] = axienet_ior(lp, XAE_MDIO_MRD_OFFSET);
+        data[23] = axienet_ior(lp, XAE_MDIO_MIS_OFFSET);
+        data[24] = axienet_ior(lp, XAE_MDIO_MIP_OFFSET);
+        data[25] = axienet_ior(lp, XAE_MDIO_MIE_OFFSET);
+        data[26] = axienet_ior(lp, XAE_MDIO_MIC_OFFSET);
+        data[27] = axienet_ior(lp, XAE_UAW0_OFFSET);
+        data[28] = axienet_ior(lp, XAE_UAW1_OFFSET);
+        data[29] = axienet_ior(lp, XAE_FMI_OFFSET);
+        data[30] = axienet_ior(lp, XAE_AF0_OFFSET);
+        data[31] = axienet_ior(lp, XAE_AF1_OFFSET);
+}
+
+/**
+ * axienet_ethtools_get_pauseparam - Get the pause parameter setting for
+ *                                   Tx and Rx paths.
+ * @ndev:       Pointer to net_device structure
+ * @epauseparm: Pointer to ethtool_pauseparam structure.
+ *
+ * This implements ethtool command for getting axi ethernet pause frame
+ * setting. Issue "ethtool -a ethX" to execute this function.
+ */
+static void
+axienet_ethtools_get_pauseparam(struct net_device *ndev,
+                                struct ethtool_pauseparam *epauseparm)
+{
+        u32 regval;
+        struct axienet_local *lp = netdev_priv(ndev);
+        epauseparm->autoneg  = 0;
+        regval = axienet_ior(lp, XAE_FCC_OFFSET);
+        epauseparm->tx_pause = regval & XAE_FCC_FCTX_MASK;
+        epauseparm->rx_pause = regval & XAE_FCC_FCRX_MASK;
+}
+
+/**
+ * axienet_ethtools_set_pauseparam - Set device pause parameter(flow control)
+ *                                   settings.
+ * @ndev:       Pointer to net_device structure
+ * @epauseparam:Pointer to ethtool_pauseparam structure
+ *
+ * This implements ethtool command for enabling flow control on Rx and Tx
+ * paths. Issue "ethtool -A ethX tx on|off" under linux prompt to execute this
+ * function.
+ */
+static int
+axienet_ethtools_set_pauseparam(struct net_device *ndev,
+                                struct ethtool_pauseparam *epauseparm)
+{
+        u32 regval = 0;
+        struct axienet_local *lp = netdev_priv(ndev);
+
+        if (netif_running(ndev)) {
+                printk(KERN_ERR "%s: Please stop netif before applying "
+                       "configruation\n", ndev->name);
+                return -EFAULT;
+        }
+
+        regval = axienet_ior(lp, XAE_FCC_OFFSET);
+        if (epauseparm->tx_pause)
+                regval |= XAE_FCC_FCTX_MASK;
+        else
+                regval &= ~XAE_FCC_FCTX_MASK;
+        if (epauseparm->rx_pause)
+                regval |= XAE_FCC_FCRX_MASK;
+        else
+                regval &= ~XAE_FCC_FCRX_MASK;
+        axienet_iow(lp, XAE_FCC_OFFSET, regval);
+
+        return 0;
+}
+
+/**
+ * axienet_ethtools_get_coalesce - Get DMA interrupt coalescing count.
+ * @ndev:       Pointer to net_device structure
+ * @ecoalesce:  Pointer to ethtool_coalesce structure
+ *
+ * This implements ethtool command for getting the DMA interrupt coalescing
+ * count on Tx and Rx paths. Issue "ethtool -c ethX" under linux prompt to
+ * execute this function.
+ */
+static int axienet_ethtools_get_coalesce(struct net_device *ndev,
+                                         struct ethtool_coalesce *ecoalesce)
+{
+        u32 regval = 0;
+        struct axienet_local *lp = netdev_priv(ndev);
+        regval = axienet_dma_in32(lp, XAXIDMA_RX_CR_OFFSET);
+        ecoalesce->rx_max_coalesced_frames = (regval & XAXIDMA_COALESCE_MASK)
+                                             >> XAXIDMA_COALESCE_SHIFT;
+        regval = axienet_dma_in32(lp, XAXIDMA_TX_CR_OFFSET);
+        ecoalesce->tx_max_coalesced_frames = (regval & XAXIDMA_COALESCE_MASK)
+                                             >> XAXIDMA_COALESCE_SHIFT;
+        return 0;
+}
+
+/**
+ * axienet_ethtools_set_coalesce - Set DMA interrupt coalescing count.
+ * @ndev:       Pointer to net_device structure
+ * @ecoalesce:  Pointer to ethtool_coalesce structure
+ *
+ * This implements ethtool command for setting the DMA interrupt coalescing
+ * count on Tx and Rx paths. Issue "ethtool -C ethX rx-frames 5" under linux
+ * prompt to execute this function.
+ */
+static int axienet_ethtools_set_coalesce(struct net_device *ndev,
+                                         struct ethtool_coalesce *ecoalesce)
+{
+        struct axienet_local *lp = netdev_priv(ndev);
+
+        if (netif_running(ndev)) {
+                printk(KERN_ERR "%s: Please stop netif before applying "
+                       "configruation\n", ndev->name);
+                return -EFAULT;
+        }
+
+        if ((ecoalesce->rx_coalesce_usecs) ||
+            (ecoalesce->rx_coalesce_usecs_irq) ||
+            (ecoalesce->rx_max_coalesced_frames_irq) ||
+            (ecoalesce->tx_coalesce_usecs) ||
+            (ecoalesce->tx_coalesce_usecs_irq) ||
+            (ecoalesce->tx_max_coalesced_frames_irq) ||
+            (ecoalesce->stats_block_coalesce_usecs) ||
+            (ecoalesce->use_adaptive_rx_coalesce) ||
+            (ecoalesce->use_adaptive_tx_coalesce) ||
+            (ecoalesce->pkt_rate_low) ||
+            (ecoalesce->rx_coalesce_usecs_low) ||
+            (ecoalesce->rx_max_coalesced_frames_low) ||
+            (ecoalesce->tx_coalesce_usecs_low) ||
+            (ecoalesce->tx_max_coalesced_frames_low) ||
+            (ecoalesce->pkt_rate_high) ||
+            (ecoalesce->rx_coalesce_usecs_high) ||
+            (ecoalesce->rx_max_coalesced_frames_high) ||
+            (ecoalesce->tx_coalesce_usecs_high) ||
+            (ecoalesce->tx_max_coalesced_frames_high) ||
+            (ecoalesce->rate_sample_interval))
+                return -EOPNOTSUPP;
+        if (ecoalesce->rx_max_coalesced_frames)
+                lp->coalesce_count_rx = ecoalesce->rx_max_coalesced_frames;
+        if (ecoalesce->tx_max_coalesced_frames)
+                lp->coalesce_count_tx = ecoalesce->tx_max_coalesced_frames;
+
+        return 0;
+}
+
+static struct ethtool_ops axienet_ethtool_ops = {
+        .get_settings   = axienet_ethtools_get_settings,
+        .set_settings   = axienet_ethtools_set_settings,
+        .get_drvinfo    = axienet_ethtools_get_drvinfo,
+        .get_regs_len   = axienet_ethtools_get_regs_len,
+        .get_regs       = axienet_ethtools_get_regs,
+        .get_link       = ethtool_op_get_link,
+        .get_pauseparam = axienet_ethtools_get_pauseparam,
+        .set_pauseparam = axienet_ethtools_set_pauseparam,
+        .get_coalesce   = axienet_ethtools_get_coalesce,
+        .set_coalesce   = axienet_ethtools_set_coalesce,
+};
+
+/**
+ * axienet_dma_err_handler - Tasklet handler for Axi DMA Error
+ * @data:       Data passed
+ *
+ * Resets the Axi DMA and Axi Ethernet devices, and reconfigures the
+ * Tx/Rx BDs.
+ */
+static void axienet_dma_err_handler(unsigned long data)
+{
+        u32 axienet_status;
+        u32 cr, i;
+        int mdio_mcreg;
+        struct axienet_local *lp = (struct axienet_local *) data;
+        struct net_device *ndev = lp->ndev;
+        struct axidma_bd *cur_p;
+
+        axienet_setoptions(ndev, lp->options &
+                           ~(XAE_OPTION_TXEN | XAE_OPTION_RXEN));
+        mdio_mcreg = axienet_ior(lp, XAE_MDIO_MC_OFFSET);
+        axienet_mdio_wait_until_ready(lp);
+        /* Disable the MDIO interface till Axi Ethernet Reset is completed.
+         * When we do an Axi Ethernet reset, it resets the complete core
+         * including the MDIO. So if MDIO is not disabled when the reset
+         * process is started, MDIO will be broken afterwards. */
+        axienet_iow(lp, XAE_MDIO_MC_OFFSET, (mdio_mcreg &
+                    ~XAE_MDIO_MC_MDIOEN_MASK));
+
+        __axienet_device_reset(lp, &ndev->dev, XAXIDMA_TX_CR_OFFSET);
+        __axienet_device_reset(lp, &ndev->dev, XAXIDMA_RX_CR_OFFSET);
+
+        axienet_iow(lp, XAE_MDIO_MC_OFFSET, mdio_mcreg);
+        axienet_mdio_wait_until_ready(lp);
+
+        for (i = 0; i < TX_BD_NUM; i++) {
+                cur_p = &lp->tx_bd_v[i];
+                if (cur_p->phys)
+                        dma_unmap_single(ndev->dev.parent, cur_p->phys,
+                                         (cur_p->cntrl &
+                                          XAXIDMA_BD_CTRL_LENGTH_MASK),
+                                         DMA_TO_DEVICE);
+                if (cur_p->app4)
+                        dev_kfree_skb_irq((struct sk_buff *) cur_p->app4);
+                cur_p->phys = 0;
+                cur_p->cntrl = 0;
+                cur_p->status = 0;
+                cur_p->app0 = 0;
+                cur_p->app1 = 0;
+                cur_p->app2 = 0;
+                cur_p->app3 = 0;
+                cur_p->app4 = 0;
+                cur_p->sw_id_offset = 0;
+        }
+
+        for (i = 0; i < RX_BD_NUM; i++) {
+                cur_p = &lp->rx_bd_v[i];
+                cur_p->status = 0;
+                cur_p->app0 = 0;
+                cur_p->app1 = 0;
+                cur_p->app2 = 0;
+                cur_p->app3 = 0;
+                cur_p->app4 = 0;
+        }
+
+        lp->tx_bd_ci = 0;
+        lp->tx_bd_tail = 0;
+        lp->rx_bd_ci = 0;
+
+        /* Start updating the Rx channel control register */
+        cr = axienet_dma_in32(lp, XAXIDMA_RX_CR_OFFSET);
+        /* Update the interrupt coalesce count */
+        cr = ((cr & ~XAXIDMA_COALESCE_MASK) |
+              (XAXIDMA_DFT_RX_THRESHOLD << XAXIDMA_COALESCE_SHIFT));
+        /* Update the delay timer count */
+        cr = ((cr & ~XAXIDMA_DELAY_MASK) |
+              (XAXIDMA_DFT_RX_WAITBOUND << XAXIDMA_DELAY_SHIFT));
+        /* Enable coalesce, delay timer and error interrupts */
+        cr |= XAXIDMA_IRQ_ALL_MASK;
+        /* Finally write to the Rx channel control register */
+        axienet_dma_out32(lp, XAXIDMA_RX_CR_OFFSET, cr);
+
+        /* Start updating the Tx channel control register */
+        cr = axienet_dma_in32(lp, XAXIDMA_TX_CR_OFFSET);
+        /* Update the interrupt coalesce count */
+        cr = (((cr & ~XAXIDMA_COALESCE_MASK)) |
+              (XAXIDMA_DFT_TX_THRESHOLD << XAXIDMA_COALESCE_SHIFT));
+        /* Update the delay timer count */
+        cr = (((cr & ~XAXIDMA_DELAY_MASK)) |
+              (XAXIDMA_DFT_TX_WAITBOUND << XAXIDMA_DELAY_SHIFT));
+        /* Enable coalesce, delay timer and error interrupts */
+        cr |= XAXIDMA_IRQ_ALL_MASK;
+        /* Finally write to the Tx channel control register */
+        axienet_dma_out32(lp, XAXIDMA_TX_CR_OFFSET, cr);
+
+        /* Populate the tail pointer and bring the Rx Axi DMA engine out of
+         * halted state. This will make the Rx side ready for reception.*/
+        axienet_dma_out32(lp, XAXIDMA_RX_CDESC_OFFSET, lp->rx_bd_p);
+        cr = axienet_dma_in32(lp, XAXIDMA_RX_CR_OFFSET);
+        axienet_dma_out32(lp, XAXIDMA_RX_CR_OFFSET,
+                          cr | XAXIDMA_CR_RUNSTOP_MASK);
+        axienet_dma_out32(lp, XAXIDMA_RX_TDESC_OFFSET, lp->rx_bd_p +
+                          (sizeof(*lp->rx_bd_v) * (RX_BD_NUM - 1)));
+
+        /* Write to the RS (Run-stop) bit in the Tx channel control register.
+         * Tx channel is now ready to run. But only after we write to the
+         * tail pointer register that the Tx channel will start transmitting */
+        axienet_dma_out32(lp, XAXIDMA_TX_CDESC_OFFSET, lp->tx_bd_p);
+        cr = axienet_dma_in32(lp, XAXIDMA_TX_CR_OFFSET);
+        axienet_dma_out32(lp, XAXIDMA_TX_CR_OFFSET,
+                          cr | XAXIDMA_CR_RUNSTOP_MASK);
+
+        axienet_status = axienet_ior(lp, XAE_RCW1_OFFSET);
+        axienet_status &= ~XAE_RCW1_RX_MASK;
+        axienet_iow(lp, XAE_RCW1_OFFSET, axienet_status);
+
+        axienet_status = axienet_ior(lp, XAE_IP_OFFSET);
+        if (axienet_status & XAE_INT_RXRJECT_MASK)
+                axienet_iow(lp, XAE_IS_OFFSET, XAE_INT_RXRJECT_MASK);
+        axienet_iow(lp, XAE_FCC_OFFSET, XAE_FCC_FCRX_MASK);
+
+        /* Sync default options with HW but leave receiver and
+         * transmitter disabled.*/
+        axienet_setoptions(ndev, lp->options &
+                           ~(XAE_OPTION_TXEN | XAE_OPTION_RXEN));
+        axienet_set_mac_address(ndev, NULL);
+        axienet_set_multicast_list(ndev);
+        axienet_setoptions(ndev, lp->options);
+}
+
+/**
+ * axienet_of_probe - Axi Ethernet probe function.
+ * @op:         Pointer to platform device structure.
+ * @match:      Pointer to device id structure
+ *
+ * returns: 0, on success
+ *          Non-zero error value on failure.
+ *
+ * This is the probe routine for Axi Ethernet driver. This is called before
+ * any other driver routines are invoked. It allocates and sets up the Ethernet
+ * device. Parses through device tree and populates fields of
+ * axienet_local. It registers the Ethernet device.
+ */
+static int __devinit axienet_of_probe(struct platform_device *op)
+{
+        __be32 *p;
+        int size, ret = 0;
+        struct device_node *np;
+        struct axienet_local *lp;
+        struct net_device *ndev;
+        const void *addr;
+
+        ndev = alloc_etherdev(sizeof(*lp));
+        if (!ndev)
+                return -ENOMEM;
+
+        ether_setup(ndev);
+        dev_set_drvdata(&op->dev, ndev);
+
+        SET_NETDEV_DEV(ndev, &op->dev);
+        ndev->flags &= ~IFF_MULTICAST;  /* clear multicast */
+        ndev->features = NETIF_F_SG | NETIF_F_FRAGLIST;
+        ndev->netdev_ops = &axienet_netdev_ops;
+        ndev->ethtool_ops = &axienet_ethtool_ops;
+
+        lp = netdev_priv(ndev);
+        lp->ndev = ndev;
+        lp->dev = &op->dev;
+        lp->options = XAE_OPTION_DEFAULTS;
+        /* Map device registers */
+        lp->regs = of_iomap(op->dev.of_node, 0);
+        if (!lp->regs) {
+                dev_err(&op->dev, "could not map Axi Ethernet regs.\n");
+                goto nodev;
+        }
+        /* Setup checksum offload, but default to off if not specified */
+        lp->features = 0;
+
+        p = (__be32 *) of_get_property(op->dev.of_node, "xlnx,txcsum", NULL);
+        if (p) {
+                switch (be32_to_cpup(p)) {
+                case 1:
+                        lp->csum_offload_on_tx_path =
+                                XAE_FEATURE_PARTIAL_TX_CSUM;
+                        lp->features |= XAE_FEATURE_PARTIAL_TX_CSUM;
+                        /* Can checksum TCP/UDP over IPv4. */
+                        ndev->features |= NETIF_F_IP_CSUM;
+                        break;
+                case 2:
+                        lp->csum_offload_on_tx_path =
+                                XAE_FEATURE_FULL_TX_CSUM;
+                        lp->features |= XAE_FEATURE_FULL_TX_CSUM;
+                        /* Can checksum TCP/UDP over IPv4. */
+                        ndev->features |= NETIF_F_IP_CSUM;
+                        break;
+                default:
+                        lp->csum_offload_on_tx_path = XAE_NO_CSUM_OFFLOAD;
+                }
+        }
+        p = (__be32 *) of_get_property(op->dev.of_node, "xlnx,rxcsum", NULL);
+        if (p) {
+                switch (be32_to_cpup(p)) {
+                case 1:
+                        lp->csum_offload_on_rx_path =
+                                XAE_FEATURE_PARTIAL_RX_CSUM;
+                        lp->features |= XAE_FEATURE_PARTIAL_RX_CSUM;
+                        break;
+                case 2:
+                        lp->csum_offload_on_rx_path =
+                                XAE_FEATURE_FULL_RX_CSUM;
+                        lp->features |= XAE_FEATURE_FULL_RX_CSUM;
+                        break;
+                default:
+                        lp->csum_offload_on_rx_path = XAE_NO_CSUM_OFFLOAD;
+                }
+        }
+        /* For supporting jumbo frames, the Axi Ethernet hardware must have
+         * a larger Rx/Tx Memory. Typically, the size must be more than or
+         * equal to 16384 bytes, so that we can enable jumbo option and start
+         * supporting jumbo frames. Here we check for memory allocated for
+         * Rx/Tx in the hardware from the device-tree and accordingly set
+         * flags. */
+        p = (__be32 *) of_get_property(op->dev.of_node, "xlnx,rxmem", NULL);
+        if (p) {
+                if ((be32_to_cpup(p)) >= 0x4000)
+                        lp->jumbo_support = 1;
+        }
+        p = (__be32 *) of_get_property(op->dev.of_node, "xlnx,temac-type",
+                                       NULL);
+        if (p)
+                lp->temac_type = be32_to_cpup(p);
+        p = (__be32 *) of_get_property(op->dev.of_node, "xlnx,phy-type", NULL);
+        if (p)
+                lp->phy_type = be32_to_cpup(p);
+
+        /* Find the DMA node, map the DMA registers, and decode the DMA IRQs */
+        np = of_parse_phandle(op->dev.of_node, "axistream-connected", 0);
+        if (!np) {
+                dev_err(&op->dev, "could not find DMA node\n");
+                goto err_iounmap;
+        }
+        lp->dma_regs = of_iomap(np, 0);
+        if (lp->dma_regs) {
+                dev_dbg(&op->dev, "MEM base: %p\n", lp->dma_regs);
+        } else {
+                dev_err(&op->dev, "unable to map DMA registers\n");
+                of_node_put(np);
+        }
+        lp->rx_irq = irq_of_parse_and_map(np, 1);
+        lp->tx_irq = irq_of_parse_and_map(np, 0);
+        of_node_put(np);
+        if ((lp->rx_irq == NO_IRQ) || (lp->tx_irq == NO_IRQ)) {
+                dev_err(&op->dev, "could not determine irqs\n");
+                ret = -ENOMEM;
+                goto err_iounmap_2;
+        }
+
+        /* Retrieve the MAC address */
+        addr = of_get_property(op->dev.of_node, "local-mac-address", &size);
+        if ((!addr) || (size != 6)) {
+                dev_err(&op->dev, "could not find MAC address\n");
+                ret = -ENODEV;
+                goto err_iounmap_2;
+        }
+        axienet_set_mac_address(ndev, (void *) addr);
+
+        lp->coalesce_count_rx = XAXIDMA_DFT_RX_THRESHOLD;
+        lp->coalesce_count_tx = XAXIDMA_DFT_TX_THRESHOLD;
+
+        lp->phy_node = of_parse_phandle(op->dev.of_node, "phy-handle", 0);
+        ret = axienet_mdio_setup(lp, op->dev.of_node);
+        if (ret)
+                dev_warn(&op->dev, "error registering MDIO bus\n");
+
+        ret = register_netdev(lp->ndev);
+        if (ret) {
+                dev_err(lp->dev, "register_netdev() error (%i)\n", ret);
+                goto err_iounmap_2;
+        }
+
+        tasklet_init(&lp->dma_err_tasklet, axienet_dma_err_handler,
+                     (unsigned long) lp);
+        tasklet_disable(&lp->dma_err_tasklet);
+
+        return 0;
+
+err_iounmap_2:
+        if (lp->dma_regs)
+                iounmap(lp->dma_regs);
+err_iounmap:
+        iounmap(lp->regs);
+nodev:
+        free_netdev(ndev);
+        ndev = NULL;
+        return ret;
+}
+
+static int __devexit axienet_of_remove(struct platform_device *op)
+{
+        struct net_device *ndev = dev_get_drvdata(&op->dev);
+        struct axienet_local *lp = netdev_priv(ndev);
+
+        axienet_mdio_teardown(lp);
+        unregister_netdev(ndev);
+
+        if (lp->phy_node)
+                of_node_put(lp->phy_node);
+        lp->phy_node = NULL;
+
+        dev_set_drvdata(&op->dev, NULL);
+
+        iounmap(lp->regs);
+        if (lp->dma_regs)
+                iounmap(lp->dma_regs);
+        free_netdev(ndev);
+
+        return 0;
+}
+
+static struct platform_driver axienet_of_driver = {
+        .probe = axienet_of_probe,
+        .remove = __devexit_p(axienet_of_remove),
+        .driver = {
+                 .owner = THIS_MODULE,
+                 .name = "xilinx_axienet",
+                 .of_match_table = axienet_of_match,
+        },
+};
+
+static int __init axienet_init(void)
+{
+        return platform_driver_register(&axienet_of_driver);
+}
+
+static void __exit axienet_exit(void)
+{
+        platform_driver_unregister(&axienet_of_driver);
+}
+
+module_init(axienet_init);
+module_exit(axienet_exit);
+
+MODULE_DESCRIPTION("Xilinx Axi Ethernet driver");
+MODULE_AUTHOR("Xilinx");
+MODULE_LICENSE("GPL");
diff --git a/drivers/net/ethernet/xilinx/xilinx_axienet_mdio.c b/drivers/net/ethernet/xilinx/xilinx_axienet_mdio.c
new file mode 100644
index 000000000000..d70b6e79f6c0
--- /dev/null
+++ b/drivers/net/ethernet/xilinx/xilinx_axienet_mdio.c
@@ -0,0 +1,238 @@
+/*
+ * MDIO bus driver for the Xilinx Axi Ethernet device
+ *
+ * Copyright (c) 2009 Secret Lab Technologies, Ltd.
+ * Copyright (c) 2010 Xilinx, Inc. All rights reserved.
+ * Copyright (c) 2012 Daniel Borkmann, <daniel.borkmann@tik.ee.ethz.ch>
+ * Copyright (c) 2012 Ariane Keller, <ariane.keller@tik.ee.ethz.ch>
+ */
+
+#include <linux/of_address.h>
+#include <linux/of_mdio.h>
+#include <linux/jiffies.h>
+
+#include "xilinx_axienet.h"
+
+#define MAX_MDIO_FREQ           2500000 /* 2.5 MHz */
+#define DEFAULT_CLOCK_DIVISOR   XAE_MDIO_DIV_DFT
+
+/* Wait till MDIO interface is ready to accept a new transaction.*/
+int axienet_mdio_wait_until_ready(struct axienet_local *lp)
+{
+        long end = jiffies + 2;
+        while (!(axienet_ior(lp, XAE_MDIO_MCR_OFFSET) &
+                 XAE_MDIO_MCR_READY_MASK)) {
+                if (end - jiffies <= 0) {
+                        WARN_ON(1);
+                        return -ETIMEDOUT;
+                }
+                udelay(1);
+        }
+        return 0;
+}
+
+/**
+ * axienet_mdio_read - MDIO interface read function
+ * @bus:        Pointer to mii bus structure
+ * @phy_id:     Address of the PHY device
+ * @reg:        PHY register to read
+ *
+ * returns:     The register contents on success, -ETIMEDOUT on a timeout
+ *
+ * Reads the contents of the requested register from the requested PHY
+ * address by first writing the details into MCR register. After a while
+ * the register MRD is read to obtain the PHY register content.
+ */
+static int axienet_mdio_read(struct mii_bus *bus, int phy_id, int reg)
+{
+        u32 rc;
+        int ret;
+        struct axienet_local *lp = bus->priv;
+
+        ret = axienet_mdio_wait_until_ready(lp);
+        if (ret < 0)
+                return ret;
+
+        axienet_iow(lp, XAE_MDIO_MCR_OFFSET,
+                    (((phy_id << XAE_MDIO_MCR_PHYAD_SHIFT) &
+                      XAE_MDIO_MCR_PHYAD_MASK) |
+                     ((reg << XAE_MDIO_MCR_REGAD_SHIFT) &
+                      XAE_MDIO_MCR_REGAD_MASK) |
+                     XAE_MDIO_MCR_INITIATE_MASK |
+                     XAE_MDIO_MCR_OP_READ_MASK));
+
+        ret = axienet_mdio_wait_until_ready(lp);
+        if (ret < 0)
+                return ret;
+
+        rc = axienet_ior(lp, XAE_MDIO_MRD_OFFSET) & 0x0000FFFF;
+
+        dev_dbg(lp->dev, "axienet_mdio_read(phy_id=%i, reg=%x) == %x\n",
+                phy_id, reg, rc);
+
+        return rc;
+}
+
+/**
+ * axienet_mdio_write - MDIO interface write function
+ * @bus:        Pointer to mii bus structure
+ * @phy_id:     Address of the PHY device
+ * @reg:        PHY register to write to
+ * @val:        Value to be written into the register
+ *
+ * returns:     0 on success, -ETIMEDOUT on a timeout
+ *
+ * Writes the value to the requested register by first writing the value
+ * into MWD register. The the MCR register is then appropriately setup
+ * to finish the write operation.
+ */
+static int axienet_mdio_write(struct mii_bus *bus, int phy_id, int reg,
+                              u16 val)
+{
+        int ret;
+        struct axienet_local *lp = bus->priv;
+
+        dev_dbg(lp->dev, "axienet_mdio_write(phy_id=%i, reg=%x, val=%x)\n",
+                phy_id, reg, val);
+
+        ret = axienet_mdio_wait_until_ready(lp);
+        if (ret < 0)
+                return ret;
+
+        axienet_iow(lp, XAE_MDIO_MWD_OFFSET, (u32) val);
+        axienet_iow(lp, XAE_MDIO_MCR_OFFSET,
+                    (((phy_id << XAE_MDIO_MCR_PHYAD_SHIFT) &
+                      XAE_MDIO_MCR_PHYAD_MASK) |
+                     ((reg << XAE_MDIO_MCR_REGAD_SHIFT) &
+                      XAE_MDIO_MCR_REGAD_MASK) |
+                     XAE_MDIO_MCR_INITIATE_MASK |
+                     XAE_MDIO_MCR_OP_WRITE_MASK));
+
+        ret = axienet_mdio_wait_until_ready(lp);
+        if (ret < 0)
+                return ret;
+        return 0;
+}
+
+/**
+ * axienet_mdio_setup - MDIO setup function
+ * @lp:         Pointer to axienet local data structure.
+ * @np:         Pointer to device node
+ *
+ * returns:     0 on success, -ETIMEDOUT on a timeout, -ENOMEM when
+ *              mdiobus_alloc (to allocate memory for mii bus structure) fails.
+ *
+ * Sets up the MDIO interface by initializing the MDIO clock and enabling the
+ * MDIO interface in hardware. Register the MDIO interface.
+ **/
+int axienet_mdio_setup(struct axienet_local *lp, struct device_node *np)
+{
+        int ret;
+        u32 clk_div, host_clock;
+        u32 *property_p;
+        struct mii_bus *bus;
+        struct resource res;
+        struct device_node *np1;
+
+        /* clk_div can be calculated by deriving it from the equation:
+         * fMDIO = fHOST / ((1 + clk_div) * 2)
+         *
+         * Where fMDIO <= 2500000, so we get:
+         * fHOST / ((1 + clk_div) * 2) <= 2500000
+         *
+         * Then we get:
+         * 1 / ((1 + clk_div) * 2) <= (2500000 / fHOST)
+         *
+         * Then we get:
+         * 1 / (1 + clk_div) <= ((2500000 * 2) / fHOST)
+         *
+         * Then we get:
+         * 1 / (1 + clk_div) <= (5000000 / fHOST)
+         *
+         * So:
+         * (1 + clk_div) >= (fHOST / 5000000)
+         *
+         * And finally:
+         * clk_div >= (fHOST / 5000000) - 1
+         *
+         * fHOST can be read from the flattened device tree as property
+         * "clock-frequency" from the CPU
+         */
+
+        np1 = of_find_node_by_name(NULL, "cpu");
+        if (!np1) {
+                printk(KERN_WARNING "%s(): Could not find CPU device node.",
+                       __func__);
+                printk(KERN_WARNING "Setting MDIO clock divisor to "
+                       "default %d\n", DEFAULT_CLOCK_DIVISOR);
+                clk_div = DEFAULT_CLOCK_DIVISOR;
+                goto issue;
+        }
+        property_p = (u32 *) of_get_property(np1, "clock-frequency", NULL);
+        if (!property_p) {
+                printk(KERN_WARNING "%s(): Could not find CPU property: "
+                       "clock-frequency.", __func__);
+                printk(KERN_WARNING "Setting MDIO clock divisor to "
+                       "default %d\n", DEFAULT_CLOCK_DIVISOR);
+                clk_div = DEFAULT_CLOCK_DIVISOR;
+                goto issue;
+        }
+
+        host_clock = be32_to_cpup(property_p);
+        clk_div = (host_clock / (MAX_MDIO_FREQ * 2)) - 1;
+        /* If there is any remainder from the division of
+         * fHOST / (MAX_MDIO_FREQ * 2), then we need to add
+         * 1 to the clock divisor or we will surely be above 2.5 MHz */
+        if (host_clock % (MAX_MDIO_FREQ * 2))
+                clk_div++;
+
+        printk(KERN_DEBUG "%s(): Setting MDIO clock divisor to %u based "
+               "on %u Hz host clock.\n", __func__, clk_div, host_clock);
+
+        of_node_put(np1);
+issue:
+        axienet_iow(lp, XAE_MDIO_MC_OFFSET,
+                    (((u32) clk_div) | XAE_MDIO_MC_MDIOEN_MASK));
+
+        ret = axienet_mdio_wait_until_ready(lp);
+        if (ret < 0)
+                return ret;
+
+        bus = mdiobus_alloc();
+        if (!bus)
+                return -ENOMEM;
+
+        np1 = of_get_parent(lp->phy_node);
+        of_address_to_resource(np1, 0, &res);
+        snprintf(bus->id, MII_BUS_ID_SIZE, "%.8llx",
+                 (unsigned long long) res.start);
+
+        bus->priv = lp;
+        bus->name = "Xilinx Axi Ethernet MDIO";
+        bus->read = axienet_mdio_read;
+        bus->write = axienet_mdio_write;
+        bus->parent = lp->dev;
+        bus->irq = lp->mdio_irqs; /* preallocated IRQ table */
+        lp->mii_bus = bus;
+
+        ret = of_mdiobus_register(bus, np1);
+        if (ret) {
+                mdiobus_free(bus);
+                return ret;
+        }
+        return 0;
+}
+
+/**
+ * axienet_mdio_teardown - MDIO remove function
+ * @lp:         Pointer to axienet local data structure.
+ *
+ * Unregisters the MDIO and frees any associate memory for mii bus.
+ */
+void axienet_mdio_teardown(struct axienet_local *lp)
+{
+        mdiobus_unregister(lp->mii_bus);
+        kfree(lp->mii_bus->irq);
+        mdiobus_free(lp->mii_bus);
+        lp->mii_bus = NULL;
+}
diff --git a/drivers/net/ethernet/xilinx/xilinx_emaclite.c b/drivers/net/ethernet/xilinx/xilinx_emaclite.c
index 79013e5731a5..77cfe5110318 100644
--- a/drivers/net/ethernet/xilinx/xilinx_emaclite.c
+++ b/drivers/net/ethernet/xilinx/xilinx_emaclite.c
@@ -613,7 +613,7 @@ static void xemaclite_rx_handler(struct net_device *dev)
         u32 len;
 
         len = ETH_FRAME_LEN + ETH_FCS_LEN;
-        skb = dev_alloc_skb(len + ALIGNMENT);
+        skb = netdev_alloc_skb(dev, len + ALIGNMENT);
         if (!skb) {
                 /* Couldn't get memory. */
                 dev->stats.rx_dropped++;
@@ -1136,10 +1136,8 @@ static int __devinit xemaclite_of_probe(struct platform_device *ofdev)
 
         /* Create an ethernet device instance */
         ndev = alloc_etherdev(sizeof(struct net_local));
-        if (!ndev) {
-                dev_err(dev, "Could not allocate network device\n");
+        if (!ndev)
                 return -ENOMEM;
-        }
 
         dev_set_drvdata(dev, ndev);
         SET_NETDEV_DEV(ndev, &ofdev->dev);
diff --git a/drivers/net/ethernet/xircom/xirc2ps_cs.c b/drivers/net/ethernet/xircom/xirc2ps_cs.c
index 33979c3ac943..5c69c6f93fb8 100644
--- a/drivers/net/ethernet/xircom/xirc2ps_cs.c
+++ b/drivers/net/ethernet/xircom/xirc2ps_cs.c
@@ -1039,7 +1039,8 @@ xirc2ps_interrupt(int irq, void *dev_id)
 
             pr_debug("rsr=%#02x packet_length=%u\n", rsr, pktlen);
 
-            skb = dev_alloc_skb(pktlen+3); /* 1 extra so we can use insw */
+            /* 1 extra so we can use insw */
+            skb = netdev_alloc_skb(dev, pktlen + 3);
             if (!skb) {
                 pr_notice("low memory, packet dropped (size=%u)\n", pktlen);
                 dev->stats.rx_dropped++;
diff --git a/drivers/net/hamradio/baycom_epp.c b/drivers/net/hamradio/baycom_epp.c
index 9537aaa50c2f..49b8b58fc5c6 100644
--- a/drivers/net/hamradio/baycom_epp.c
+++ b/drivers/net/hamradio/baycom_epp.c
@@ -1162,7 +1162,7 @@ static void baycom_probe(struct net_device *dev)
 /*
  * command line settable parameters
  */
-static const char *mode[NR_PORTS] = { "", };
+static char *mode[NR_PORTS] = { "", };
 static int iobase[NR_PORTS] = { 0x378, };
 
 module_param_array(mode, charp, NULL, 0);
diff --git a/drivers/net/hamradio/baycom_par.c b/drivers/net/hamradio/baycom_par.c
index 279d2296290a..f1aea0c98333 100644
--- a/drivers/net/hamradio/baycom_par.c
+++ b/drivers/net/hamradio/baycom_par.c
@@ -477,7 +477,7 @@ static int baycom_ioctl(struct net_device *dev, struct ifreq *ifr,
 /*
  * command line settable parameters
  */
-static const char *mode[NR_PORTS] = { "picpar", };
+static char *mode[NR_PORTS] = { "picpar", };
 static int iobase[NR_PORTS] = { 0x378, };
 
 module_param_array(mode, charp, NULL, 0);
diff --git a/drivers/net/hamradio/yam.c b/drivers/net/hamradio/yam.c
index 96a98d2ff151..696327773fbe 100644
--- a/drivers/net/hamradio/yam.c
+++ b/drivers/net/hamradio/yam.c
@@ -403,7 +403,6 @@ static unsigned char *add_mcs(unsigned char *bits, int bitrate,
 
         /* Allocate a new mcs */
         if ((p = kmalloc(sizeof(struct yam_mcs), GFP_KERNEL)) == NULL) {
-                printk(KERN_WARNING "YAM: no memory to allocate mcs\n");
                 release_firmware(fw);
                 return NULL;
         }
diff --git a/drivers/net/hippi/rrunner.c b/drivers/net/hippi/rrunner.c
index e68c941926f1..2a51363d9fed 100644
--- a/drivers/net/hippi/rrunner.c
+++ b/drivers/net/hippi/rrunner.c
@@ -1600,12 +1600,8 @@ static int rr_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
                 }
 
                 image = kmalloc(EEPROM_WORDS * sizeof(u32), GFP_KERNEL);
-                if (!image){
-                        printk(KERN_ERR "%s: Unable to allocate memory "
-                               "for EEPROM image\n", dev->name);
+                if (!image)
                         return -ENOMEM;
-                }
-
 
                 if (rrpriv->fw_running){
                         printk("%s: Firmware already running\n", dev->name);
@@ -1637,8 +1633,6 @@ static int rr_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
                 image = kmalloc(EEPROM_WORDS * sizeof(u32), GFP_KERNEL);
                 oldimage = kmalloc(EEPROM_WORDS * sizeof(u32), GFP_KERNEL);
                 if (!image || !oldimage) {
-                        printk(KERN_ERR "%s: Unable to allocate memory "
-                               "for EEPROM image\n", dev->name);
                         error = -ENOMEM;
                         goto wf_out;
                 }
diff --git a/drivers/net/hyperv/netvsc_drv.c b/drivers/net/hyperv/netvsc_drv.c
index 466c58a7353d..0ae7a1a6aeb0 100644
--- a/drivers/net/hyperv/netvsc_drv.c
+++ b/drivers/net/hyperv/netvsc_drv.c
@@ -267,13 +267,10 @@ void netvsc_linkstatus_callback(struct hv_device *device_obj,
 int netvsc_recv_callback(struct hv_device *device_obj,
                                 struct hv_netvsc_packet *packet)
 {
-        struct net_device *net = dev_get_drvdata(&device_obj->device);
+        struct net_device *net;
         struct sk_buff *skb;
-        struct netvsc_device *net_device;
-
-        net_device = hv_get_drvdata(device_obj);
-        net = net_device->ndev;
 
+        net = ((struct netvsc_device *)hv_get_drvdata(device_obj))->ndev;
         if (!net) {
                 netdev_err(net, "got receive callback but net device"
                         " not initialized yet\n");
diff --git a/drivers/net/hyperv/rndis_filter.c b/drivers/net/hyperv/rndis_filter.c
index 133b7fbf8595..136efd84373f 100644
--- a/drivers/net/hyperv/rndis_filter.c
+++ b/drivers/net/hyperv/rndis_filter.c
@@ -758,66 +758,64 @@ int rndis_filter_open(struct hv_device *dev)
 
 int rndis_filter_close(struct hv_device *dev)
 {
-        struct netvsc_device *netDevice = hv_get_drvdata(dev);
+        struct netvsc_device *nvdev = hv_get_drvdata(dev);
 
-        if (!netDevice)
+        if (!nvdev)
                 return -EINVAL;
 
-        return rndis_filter_close_device(netDevice->extension);
+        return rndis_filter_close_device(nvdev->extension);
 }
 
 int rndis_filter_send(struct hv_device *dev,
                              struct hv_netvsc_packet *pkt)
 {
         int ret;
-        struct rndis_filter_packet *filterPacket;
-        struct rndis_message *rndisMessage;
-        struct rndis_packet *rndisPacket;
-        u32 rndisMessageSize;
+        struct rndis_filter_packet *filter_pkt;
+        struct rndis_message *rndis_msg;
+        struct rndis_packet *rndis_pkt;
+        u32 rndis_msg_size;
 
         /* Add the rndis header */
-        filterPacket = (struct rndis_filter_packet *)pkt->extension;
-
-        memset(filterPacket, 0, sizeof(struct rndis_filter_packet));
+        filter_pkt = (struct rndis_filter_packet *)pkt->extension;
 
-        rndisMessage = &filterPacket->msg;
-        rndisMessageSize = RNDIS_MESSAGE_SIZE(struct rndis_packet);
+        rndis_msg = &filter_pkt->msg;
+        rndis_msg_size = RNDIS_MESSAGE_SIZE(struct rndis_packet);
 
-        rndisMessage->ndis_msg_type = REMOTE_NDIS_PACKET_MSG;
-        rndisMessage->msg_len = pkt->total_data_buflen +
-                                      rndisMessageSize;
+        rndis_msg->ndis_msg_type = REMOTE_NDIS_PACKET_MSG;
+        rndis_msg->msg_len = pkt->total_data_buflen +
+                                      rndis_msg_size;
 
-        rndisPacket = &rndisMessage->msg.pkt;
-        rndisPacket->data_offset = sizeof(struct rndis_packet);
-        rndisPacket->data_len = pkt->total_data_buflen;
+        rndis_pkt = &rndis_msg->msg.pkt;
+        rndis_pkt->data_offset = sizeof(struct rndis_packet);
+        rndis_pkt->data_len = pkt->total_data_buflen;
 
         pkt->is_data_pkt = true;
-        pkt->page_buf[0].pfn = virt_to_phys(rndisMessage) >> PAGE_SHIFT;
+        pkt->page_buf[0].pfn = virt_to_phys(rndis_msg) >> PAGE_SHIFT;
         pkt->page_buf[0].offset =
-                        (unsigned long)rndisMessage & (PAGE_SIZE-1);
-        pkt->page_buf[0].len = rndisMessageSize;
+                        (unsigned long)rndis_msg & (PAGE_SIZE-1);
+        pkt->page_buf[0].len = rndis_msg_size;
 
         /* Add one page_buf if the rndis msg goes beyond page boundary */
-        if (pkt->page_buf[0].offset + rndisMessageSize > PAGE_SIZE) {
+        if (pkt->page_buf[0].offset + rndis_msg_size > PAGE_SIZE) {
                 int i;
                 for (i = pkt->page_buf_cnt; i > 1; i--)
                         pkt->page_buf[i] = pkt->page_buf[i-1];
                 pkt->page_buf_cnt++;
                 pkt->page_buf[0].len = PAGE_SIZE - pkt->page_buf[0].offset;
                 pkt->page_buf[1].pfn = virt_to_phys((void *)((ulong)
-                        rndisMessage + pkt->page_buf[0].len)) >> PAGE_SHIFT;
+                        rndis_msg + pkt->page_buf[0].len)) >> PAGE_SHIFT;
                 pkt->page_buf[1].offset = 0;
-                pkt->page_buf[1].len = rndisMessageSize - pkt->page_buf[0].len;
+                pkt->page_buf[1].len = rndis_msg_size - pkt->page_buf[0].len;
         }
 
         /* Save the packet send completion and context */
-        filterPacket->completion = pkt->completion.send.send_completion;
-        filterPacket->completion_ctx =
+        filter_pkt->completion = pkt->completion.send.send_completion;
+        filter_pkt->completion_ctx =
                                 pkt->completion.send.send_completion_ctx;
 
         /* Use ours */
         pkt->completion.send.send_completion = rndis_filter_send_completion;
-        pkt->completion.send.send_completion_ctx = filterPacket;
+        pkt->completion.send.send_completion_ctx = filter_pkt;
 
         ret = netvsc_send(dev, pkt);
         if (ret != 0) {
@@ -826,9 +824,9 @@ int rndis_filter_send(struct hv_device *dev,
                  * above
                  */
                 pkt->completion.send.send_completion =
-                                filterPacket->completion;
+                                filter_pkt->completion;
                 pkt->completion.send.send_completion_ctx =
-                                filterPacket->completion_ctx;
+                                filter_pkt->completion_ctx;
         }
 
         return ret;
@@ -836,10 +834,10 @@ int rndis_filter_send(struct hv_device *dev,
 
 static void rndis_filter_send_completion(void *ctx)
 {
-        struct rndis_filter_packet *filterPacket = ctx;
+        struct rndis_filter_packet *filter_pkt = ctx;
 
         /* Pass it back to the original handler */
-        filterPacket->completion(filterPacket->completion_ctx);
+        filter_pkt->completion(filter_pkt->completion_ctx);
 }
 
 
diff --git a/drivers/net/irda/donauboe.c b/drivers/net/irda/donauboe.c
index 64f403da101c..617a446d126c 100644
--- a/drivers/net/irda/donauboe.c
+++ b/drivers/net/irda/donauboe.c
@@ -1608,7 +1608,6 @@ toshoboe_open (struct pci_dev *pci_dev, const struct pci_device_id *pdid)
   self->ringbuf = kmalloc(OBOE_RING_LEN << 1, GFP_KERNEL);
   if (!self->ringbuf)
     {
-      printk (KERN_ERR DRIVER_NAME ": can't allocate DMA buffers\n");
       err = -ENOMEM;
       goto freeregion;
     }
@@ -1647,7 +1646,6 @@ toshoboe_open (struct pci_dev *pci_dev, const struct pci_device_id *pdid)
 
   if (!ok)
     {
-      printk (KERN_ERR DRIVER_NAME ": can't allocate rx/tx buffers\n");
       err = -ENOMEM;
       goto freebufs;
     }
diff --git a/drivers/net/netconsole.c b/drivers/net/netconsole.c
index e8882023576b..f9347ea3d381 100644
--- a/drivers/net/netconsole.c
+++ b/drivers/net/netconsole.c
@@ -169,10 +169,8 @@ static struct netconsole_target *alloc_param_target(char *target_config)
          * Note that these targets get their config_item fields zeroed-out.
          */
         nt = kzalloc(sizeof(*nt), GFP_KERNEL);
-        if (!nt) {
-                printk(KERN_ERR "netconsole: failed to allocate memory\n");
+        if (!nt)
                 goto fail;
-        }
 
         nt->np.name = "netconsole";
         strlcpy(nt->np.dev_name, "eth0", IFNAMSIZ);
@@ -551,10 +549,8 @@ static struct config_item *make_netconsole_target(struct config_group *group,
          * Target is disabled at creation (enabled == 0).
          */
         nt = kzalloc(sizeof(*nt), GFP_KERNEL);
-        if (!nt) {
-                printk(KERN_ERR "netconsole: failed to allocate memory\n");
+        if (!nt)
                 return ERR_PTR(-ENOMEM);
-        }
 
         nt->np.name = "netconsole";
         strlcpy(nt->np.dev_name, "eth0", IFNAMSIZ);
diff --git a/drivers/net/plip/plip.c b/drivers/net/plip/plip.c
index a9e9ca8a86ed..1a5a316cc968 100644
--- a/drivers/net/plip/plip.c
+++ b/drivers/net/plip/plip.c
@@ -1260,10 +1260,8 @@ static void plip_attach (struct parport *port)
 
                 sprintf(name, "plip%d", unit);
                 dev = alloc_etherdev(sizeof(struct net_local));
-                if (!dev) {
-                        printk(KERN_ERR "plip: memory squeeze\n");
+                if (!dev)
                         return;
-                }
 
                 strcpy(dev->name, name);
 
diff --git a/drivers/net/ppp/pptp.c b/drivers/net/ppp/pptp.c
index df884dde2a51..234cd9d87ed9 100644
--- a/drivers/net/ppp/pptp.c
+++ b/drivers/net/ppp/pptp.c
@@ -670,10 +670,8 @@ static int __init pptp_init_module(void)
         pr_info("PPTP driver version " PPTP_DRIVER_VERSION "\n");
 
         callid_sock = vzalloc((MAX_CALLID + 1) * sizeof(void *));
-        if (!callid_sock) {
-                pr_err("PPTP: cann't allocate memory\n");
+        if (!callid_sock)
                 return -ENOMEM;
-        }
 
         err = gre_add_protocol(&gre_pptp_protocol, GREPROTO_PPTP);
         if (err) {
diff --git a/drivers/net/rionet.c b/drivers/net/rionet.c
index 7145714a5ec9..a57f05726b57 100644
--- a/drivers/net/rionet.c
+++ b/drivers/net/rionet.c
@@ -497,8 +497,6 @@ static int rionet_probe(struct rio_dev *rdev, const struct rio_device_id *id)
         /* Allocate our net_device structure */
         ndev = alloc_etherdev(sizeof(struct rionet_private));
         if (ndev == NULL) {
-                printk(KERN_INFO "%s: could not allocate ethernet device.\n",
-                       DRV_NAME);
                 rc = -ENOMEM;
                 goto out;
         }
diff --git a/drivers/net/slip/slip.c b/drivers/net/slip/slip.c
index ba08341fb92c..69345dfae0fd 100644
--- a/drivers/net/slip/slip.c
+++ b/drivers/net/slip/slip.c
@@ -1296,10 +1296,8 @@ static int __init slip_init(void)
 
         slip_devs = kzalloc(sizeof(struct net_device *)*slip_maxdev,
                                                                 GFP_KERNEL);
-        if (!slip_devs) {
-                printk(KERN_ERR "SLIP: Can't allocate slip devices array.\n");
+        if (!slip_devs)
                 return -ENOMEM;
-        }
 
         /* Fill in our line protocol discipline, and register it */
         status = tty_register_ldisc(N_SLIP, &sl_ldisc);
diff --git a/drivers/net/tokenring/3c359.c b/drivers/net/tokenring/3c359.c
index ef9fdf3652f6..d7c292aa76b1 100644
--- a/drivers/net/tokenring/3c359.c
+++ b/drivers/net/tokenring/3c359.c
@@ -674,15 +674,11 @@ static int xl_open(struct net_device *dev)
         /* These MUST be on 8 byte boundaries */
         xl_priv->xl_tx_ring = kzalloc((sizeof(struct xl_tx_desc) * XL_TX_RING_SIZE) + 7, GFP_DMA | GFP_KERNEL);
         if (xl_priv->xl_tx_ring == NULL) {
-                printk(KERN_WARNING "%s: Not enough memory to allocate tx buffers.\n",
-                                     dev->name);
                 free_irq(dev->irq,dev);
                 return -ENOMEM;
         }
         xl_priv->xl_rx_ring = kzalloc((sizeof(struct xl_rx_desc) * XL_RX_RING_SIZE) +7, GFP_DMA | GFP_KERNEL);
         if (xl_priv->xl_rx_ring == NULL) {
-                printk(KERN_WARNING "%s: Not enough memory to allocate rx buffers.\n",
-                                     dev->name);
                 free_irq(dev->irq,dev);
                 kfree(xl_priv->xl_tx_ring);
                 return -ENOMEM;
diff --git a/drivers/net/tokenring/madgemc.c b/drivers/net/tokenring/madgemc.c
index 6153cfd696b6..1cdc034f6aec 100644
--- a/drivers/net/tokenring/madgemc.c
+++ b/drivers/net/tokenring/madgemc.c
@@ -171,7 +171,6 @@ static int __devinit madgemc_probe(struct device *device)
 
         card = kmalloc(sizeof(struct card_info), GFP_KERNEL);
         if (card==NULL) {
-                printk("madgemc: unable to allocate card struct\n");
                 ret = -ENOMEM;
                 goto getout1;
         }
diff --git a/drivers/net/tokenring/tms380tr.c b/drivers/net/tokenring/tms380tr.c
index 65e9cf3a71fe..102f896bbc58 100644
--- a/drivers/net/tokenring/tms380tr.c
+++ b/drivers/net/tokenring/tms380tr.c
@@ -1525,10 +1525,8 @@ static void tms380tr_chk_outstanding_cmds(struct net_device *dev)
         /* Check if adapter is opened, avoiding COMMAND_REJECT
          * interrupt by the adapter!
          */
-        if(tp->AdapterOpenFlag == 0)
-        {
-                if(tp->CMDqueue & OC_OPEN)
-                {
+        if (tp->AdapterOpenFlag == 0) {
+                if (tp->CMDqueue & OC_OPEN) {
                         /* Execute OPEN command */
                         tp->CMDqueue ^= OC_OPEN;
 
@@ -1536,21 +1534,17 @@ static void tms380tr_chk_outstanding_cmds(struct net_device *dev)
                         tp->scb.Parm[0] = LOWORD(Addr);
                         tp->scb.Parm[1] = HIWORD(Addr);
                         tp->scb.CMD = OPEN;
-                }
-                else
+                } else
                         /* No OPEN command queued, but adapter closed. Note:
                          * We'll try to re-open the adapter in DriverPoll()
                          */
                         return;         /* No adapter command issued */
-        }
-        else
-        {
+        } else {
                 /* Adapter is open; evaluate command queue: try to execute
                  * outstanding commands (depending on priority!) CLOSE
                  * command queued
                  */
-                if(tp->CMDqueue & OC_CLOSE)
-                {
+                if (tp->CMDqueue & OC_CLOSE) {
                         tp->CMDqueue ^= OC_CLOSE;
                         tp->AdapterOpenFlag = 0;
                         tp->scb.Parm[0] = 0; /* Parm[0], Parm[1] are ignored */
@@ -1560,109 +1554,70 @@ static void tms380tr_chk_outstanding_cmds(struct net_device *dev)
                                 tp->CMDqueue |= OC_OPEN; /* re-open adapter */
                         else
                                 tp->CMDqueue = 0;       /* no more commands */
-                }
-                else
-                {
-                        if(tp->CMDqueue & OC_RECEIVE)
-                        {
-                                tp->CMDqueue ^= OC_RECEIVE;
-                                Addr = htonl(((char *)tp->RplHead - (char *)tp) + tp->dmabuffer);
-                                tp->scb.Parm[0] = LOWORD(Addr);
-                                tp->scb.Parm[1] = HIWORD(Addr);
-                                tp->scb.CMD = RECEIVE;
-                        }
-                        else
-                        {
-                                if(tp->CMDqueue & OC_TRANSMIT_HALT)
-                                {
-                                        /* NOTE: TRANSMIT.HALT must be checked 
-                                         * before TRANSMIT.
-                                         */
-                                        tp->CMDqueue ^= OC_TRANSMIT_HALT;
-                                        tp->scb.CMD = TRANSMIT_HALT;
-
-                                        /* Parm[0] and Parm[1] are ignored
-                                         * but should be set to zero!
-                                         */
-                                        tp->scb.Parm[0] = 0;
-                                        tp->scb.Parm[1] = 0;
-                                }
-                                else
-                                {
-                                        if(tp->CMDqueue & OC_TRANSMIT)
-                                        {
-                                                /* NOTE: TRANSMIT must be 
-                                                 * checked after TRANSMIT.HALT
-                                                 */
-                                                if(tp->TransmitCommandActive)
-                                                {
-                                                        if(!tp->TransmitHaltScheduled)
-                                                        {
-                                                                tp->TransmitHaltScheduled = 1;
-                                                                tms380tr_exec_cmd(dev, OC_TRANSMIT_HALT) ;
-                                                        }
-                                                        tp->TransmitCommandActive = 0;
-                                                        return;
-                                                }
-
-                                                tp->CMDqueue ^= OC_TRANSMIT;
-                                                tms380tr_cancel_tx_queue(tp);
-                                                Addr = htonl(((char *)tp->TplBusy - (char *)tp) + tp->dmabuffer);
-                                                tp->scb.Parm[0] = LOWORD(Addr);
-                                                tp->scb.Parm[1] = HIWORD(Addr);
-                                                tp->scb.CMD = TRANSMIT;
-                                                tp->TransmitCommandActive = 1;
-                                        }
-                                        else
-                                        {
-                                                if(tp->CMDqueue & OC_MODIFY_OPEN_PARMS)
-                                                {
-                                                        tp->CMDqueue ^= OC_MODIFY_OPEN_PARMS;
-                                                        tp->scb.Parm[0] = tp->ocpl.OPENOptions; /* new OPEN options*/
-                                                        tp->scb.Parm[0] |= ENABLE_FULL_DUPLEX_SELECTION;
-                                                        tp->scb.Parm[1] = 0; /* is ignored but should be zero */
-                                                        tp->scb.CMD = MODIFY_OPEN_PARMS;
-                                                }
-                                                else
-                                                {
-                                                        if(tp->CMDqueue & OC_SET_FUNCT_ADDR)
-                                                        {
-                                                                tp->CMDqueue ^= OC_SET_FUNCT_ADDR;
-                                                                tp->scb.Parm[0] = LOWORD(tp->ocpl.FunctAddr);
-                                                                tp->scb.Parm[1] = HIWORD(tp->ocpl.FunctAddr);
-                                                                tp->scb.CMD = SET_FUNCT_ADDR;
-                                                        }
-                                                        else
-                                                        {
-                                                                if(tp->CMDqueue & OC_SET_GROUP_ADDR)
-                                                                {
-                                                                        tp->CMDqueue ^= OC_SET_GROUP_ADDR;
-                                                                        tp->scb.Parm[0] = LOWORD(tp->ocpl.GroupAddr);
-                                                                        tp->scb.Parm[1] = HIWORD(tp->ocpl.GroupAddr);
-                                                                        tp->scb.CMD = SET_GROUP_ADDR;
-                                                                }
-                                                                else
-                                                                {
-                                                                        if(tp->CMDqueue & OC_READ_ERROR_LOG)
-                                                                        {
-                                                                                tp->CMDqueue ^= OC_READ_ERROR_LOG;
-                                                                                Addr = htonl(((char *)&tp->errorlogtable - (char *)tp) + tp->dmabuffer);
-                                                                                tp->scb.Parm[0] = LOWORD(Addr);
-                                                                                tp->scb.Parm[1] = HIWORD(Addr);
-                                                                                tp->scb.CMD = READ_ERROR_LOG;
-                                                                        }
-                                                                        else
-                                                                        {
-                                                                                printk(KERN_WARNING "CheckForOutstandingCommand: unknown Command\n");
-                                                                                tp->CMDqueue = 0;
-                                                                                return;
-                                                                        }
-                                                                }
-                                                        }
-                                                }
-                                        }
+                } else if (tp->CMDqueue & OC_RECEIVE) {
+                        tp->CMDqueue ^= OC_RECEIVE;
+                        Addr = htonl(((char *)tp->RplHead - (char *)tp) + tp->dmabuffer);
+                        tp->scb.Parm[0] = LOWORD(Addr);
+                        tp->scb.Parm[1] = HIWORD(Addr);
+                        tp->scb.CMD = RECEIVE;
+                } else if (tp->CMDqueue & OC_TRANSMIT_HALT) {
+                        /* NOTE: TRANSMIT.HALT must be checked
+                         * before TRANSMIT.
+                         */
+                        tp->CMDqueue ^= OC_TRANSMIT_HALT;
+                        tp->scb.CMD = TRANSMIT_HALT;
+
+                        /* Parm[0] and Parm[1] are ignored
+                         * but should be set to zero!
+                         */
+                        tp->scb.Parm[0] = 0;
+                        tp->scb.Parm[1] = 0;
+                } else if (tp->CMDqueue & OC_TRANSMIT) {
+                        /* NOTE: TRANSMIT must be
+                         * checked after TRANSMIT.HALT
+                         */
+                        if (tp->TransmitCommandActive) {
+                                if (!tp->TransmitHaltScheduled) {
+                                        tp->TransmitHaltScheduled = 1;
+                                        tms380tr_exec_cmd(dev, OC_TRANSMIT_HALT);
                                 }
+                                tp->TransmitCommandActive = 0;
+                                return;
                         }
+
+                        tp->CMDqueue ^= OC_TRANSMIT;
+                        tms380tr_cancel_tx_queue(tp);
+                        Addr = htonl(((char *)tp->TplBusy - (char *)tp) + tp->dmabuffer);
+                        tp->scb.Parm[0] = LOWORD(Addr);
+                        tp->scb.Parm[1] = HIWORD(Addr);
+                        tp->scb.CMD = TRANSMIT;
+                        tp->TransmitCommandActive = 1;
+                } else if (tp->CMDqueue & OC_MODIFY_OPEN_PARMS) {
+                        tp->CMDqueue ^= OC_MODIFY_OPEN_PARMS;
+                        tp->scb.Parm[0] = tp->ocpl.OPENOptions; /* new OPEN options*/
+                        tp->scb.Parm[0] |= ENABLE_FULL_DUPLEX_SELECTION;
+                        tp->scb.Parm[1] = 0; /* is ignored but should be zero */
+                        tp->scb.CMD = MODIFY_OPEN_PARMS;
+                } else if (tp->CMDqueue & OC_SET_FUNCT_ADDR) {
+                        tp->CMDqueue ^= OC_SET_FUNCT_ADDR;
+                        tp->scb.Parm[0] = LOWORD(tp->ocpl.FunctAddr);
+                        tp->scb.Parm[1] = HIWORD(tp->ocpl.FunctAddr);
+                        tp->scb.CMD = SET_FUNCT_ADDR;
+                } else if (tp->CMDqueue & OC_SET_GROUP_ADDR) {
+                        tp->CMDqueue ^= OC_SET_GROUP_ADDR;
+                        tp->scb.Parm[0] = LOWORD(tp->ocpl.GroupAddr);
+                        tp->scb.Parm[1] = HIWORD(tp->ocpl.GroupAddr);
+                        tp->scb.CMD = SET_GROUP_ADDR;
+                } else if (tp->CMDqueue & OC_READ_ERROR_LOG) {
+                        tp->CMDqueue ^= OC_READ_ERROR_LOG;
+                        Addr = htonl(((char *)&tp->errorlogtable - (char *)tp) + tp->dmabuffer);
+                        tp->scb.Parm[0] = LOWORD(Addr);
+                        tp->scb.Parm[1] = HIWORD(Addr);
+                        tp->scb.CMD = READ_ERROR_LOG;
+                } else {
+                        printk(KERN_WARNING "CheckForOutstandingCommand: unknown Command\n");
+                        tp->CMDqueue = 0;
+                        return;
                 }
         }
 
diff --git a/drivers/net/usb/Kconfig b/drivers/net/usb/Kconfig
index 233576127934..4bad899fb38f 100644
--- a/drivers/net/usb/Kconfig
+++ b/drivers/net/usb/Kconfig
@@ -398,6 +398,27 @@ config USB_NET_KALMIA
           To compile this driver as a module, choose M here: the
           module will be called kalmia.
 
+config USB_NET_QMI_WWAN
+        tristate "QMI WWAN driver for Qualcomm MSM based 3G and LTE modems"
+        depends on USB_USBNET
+        help
+          Support WWAN LTE/3G devices based on Qualcomm Mobile Data Modem
+          (MDM) chipsets.  Examples of such devices are
+            * Huawei E392/E398
+
+          This driver will only drive the ethernet part of the chips.
+          The devices require additional configuration to be usable.
+          Multiple management interfaces with linux drivers are
+          available:
+
+            * option: AT commands on /dev/ttyUSBx
+            * cdc-wdm: Qualcomm MSM Interface (QMI) protocol on /dev/cdc-wdmx
+
+          A modem manager with support for QMI is recommended.
+
+          To compile this driver as a module, choose M here: the
+          module will be called qmi_wwan.
+
 config USB_HSO
         tristate "Option USB High Speed Mobile Devices"
         depends on USB && RFKILL
@@ -461,4 +482,5 @@ config USB_VL600
 
           http://ubuntuforums.org/showpost.php?p=10589647&postcount=17
 
+
 endmenu
diff --git a/drivers/net/usb/Makefile b/drivers/net/usb/Makefile
index c203fa21f6b1..a2e2d72c52a0 100644
--- a/drivers/net/usb/Makefile
+++ b/drivers/net/usb/Makefile
@@ -29,4 +29,5 @@ obj-$(CONFIG_USB_SIERRA_NET)	+= sierra_net.o
 obj-$(CONFIG_USB_NET_CX82310_ETH)       += cx82310_eth.o
 obj-$(CONFIG_USB_NET_CDC_NCM)   += cdc_ncm.o
 obj-$(CONFIG_USB_VL600)         += lg-vl600.o
+obj-$(CONFIG_USB_NET_QMI_WWAN)  += qmi_wwan.o
 
diff --git a/drivers/net/usb/pegasus.c b/drivers/net/usb/pegasus.c
index 5d99b8cacd7d..752393092325 100644
--- a/drivers/net/usb/pegasus.c
+++ b/drivers/net/usb/pegasus.c
@@ -1332,10 +1332,8 @@ static int pegasus_probe(struct usb_interface *intf,
         usb_get_dev(dev);
 
         net = alloc_etherdev(sizeof(struct pegasus));
-        if (!net) {
-                dev_err(&intf->dev, "can't allocate %s\n", "device");
+        if (!net)
                 goto out;
-        }
 
         pegasus = netdev_priv(net);
         pegasus->dev_index = dev_index;
diff --git a/drivers/net/usb/qmi_wwan.c b/drivers/net/usb/qmi_wwan.c
new file mode 100644
index 000000000000..739e6de7abcb
--- /dev/null
+++ b/drivers/net/usb/qmi_wwan.c
@@ -0,0 +1,228 @@
+/*
+ * Copyright (c) 2012  Bjørn Mork <bjorn@mork.no>
+ *
+ * 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/module.h>
+#include <linux/netdevice.h>
+#include <linux/ethtool.h>
+#include <linux/mii.h>
+#include <linux/usb.h>
+#include <linux/usb/cdc.h>
+#include <linux/usb/usbnet.h>
+
+/* The name of the CDC Device Management driver */
+#define DM_DRIVER "cdc_wdm"
+
+/*
+ * 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
+ *
+ * QMI is wrapped in CDC, using CDC encapsulated commands on the
+ * control ("master") interface of a two-interface CDC Union
+ * resembling standard CDC ECM.  The devices do not use the control
+ * interface for any other CDC messages.  Most likely because the
+ * management protocol is used in place of the standard CDC
+ * notifications NOTIFY_NETWORK_CONNECTION and NOTIFY_SPEED_CHANGE
+ *
+ * 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.
+ *
+ * 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
+ */
+
+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;
+
+        /*
+         * 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;
+
+                buf = control->cur_altsetting->extra;
+                len = control->cur_altsetting->extralen;
+                dev_dbg(&intf->dev, "guessing \"control\" => %s, \"data\" => this\n",
+                        dev_name(&control->dev));
+        }
+
+        while (len > 3) {
+                struct usb_descriptor_header *h = (void *)buf;
+
+                /* ignore any misplaced descriptors */
+                if (h->bDescriptorType != USB_DT_CS_INTERFACE)
+                        goto next_desc;
+
+                /* buf[2] is CDC descriptor subtype */
+                switch (buf[2]) {
+                case USB_CDC_HEADER_TYPE:
+                        if (found & 1 << USB_CDC_HEADER_TYPE) {
+                                dev_dbg(&intf->dev, "extra CDC header\n");
+                                goto err;
+                        }
+                        if (h->bLength != sizeof(struct usb_cdc_header_desc)) {
+                                dev_dbg(&intf->dev, "CDC header len %u\n", h->bLength);
+                                goto err;
+                        }
+                        break;
+                case USB_CDC_UNION_TYPE:
+                        if (found & 1 << USB_CDC_UNION_TYPE) {
+                                dev_dbg(&intf->dev, "extra CDC union\n");
+                                goto err;
+                        }
+                        if (h->bLength != sizeof(struct usb_cdc_union_desc)) {
+                                dev_dbg(&intf->dev, "CDC union len %u\n", h->bLength);
+                                goto err;
+                        }
+                        cdc_union = (struct usb_cdc_union_desc *)buf;
+                        break;
+                case USB_CDC_ETHERNET_TYPE:
+                        if (found & 1 << USB_CDC_ETHERNET_TYPE) {
+                                dev_dbg(&intf->dev, "extra CDC ether\n");
+                                goto err;
+                        }
+                        if (h->bLength != sizeof(struct usb_cdc_ether_desc)) {
+                                dev_dbg(&intf->dev, "CDC ether len %u\n",  h->bLength);
+                                goto err;
+                        }
+                        cdc_ether = (struct usb_cdc_ether_desc *)buf;
+                        break;
+                }
+
+                /*
+                 * Remember which CDC functional descriptors we've seen.  Works
+                 * for all types we care about, of which USB_CDC_ETHERNET_TYPE
+                 * (0x0f) is the highest numbered
+                 */
+                if (buf[2] < 32)
+                        found |= 1 << buf[2];
+
+next_desc:
+                len -= h->bLength;
+                buf += h->bLength;
+        }
+
+        /* did we find all the required ones? */
+        if ((found & required) != required) {
+                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));
+                goto err;
+        }
+
+        /* errors aren't fatal - we can live with the dynamic address */
+        if (cdc_ether) {
+                dev->hard_mtu = le16_to_cpu(cdc_ether->wMaxSegmentSize);
+                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? */
+
+        /* collect bulk endpoints now that we know intf == "data" interface */
+        status = usbnet_get_endpoints(dev, intf);
+
+err:
+        return status;
+}
+
+/* stolen from cdc_ether.c */
+static int qmi_wwan_manage_power(struct usbnet *dev, int on)
+{
+        dev->intf->needs_remote_wakeup = on;
+        return 0;
+}
+
+static const struct driver_info qmi_wwan_info = {
+        .description    = "QMI speaking wwan device",
+        .flags          = FLAG_WWAN,
+        .bind           = qmi_wwan_bind,
+        .manage_power   = qmi_wwan_manage_power,
+};
+
+#define HUAWEI_VENDOR_ID        0x12D1
+
+static const struct usb_device_id products[] = {
+{
+        /* Huawei E392, E398 and possibly others sharing both device id and more... */
+        .match_flags        = USB_DEVICE_ID_MATCH_VENDOR | USB_DEVICE_ID_MATCH_INT_INFO,
+        .idVendor           = HUAWEI_VENDOR_ID,
+        .bInterfaceClass    = USB_CLASS_VENDOR_SPEC,
+        .bInterfaceSubClass = 1,
+        .bInterfaceProtocol = 8, /* NOTE: This is the *slave* interface of the CDC Union! */
+        .driver_info        = (unsigned long)&qmi_wwan_info,
+}, {
+},      /* END */
+};
+MODULE_DEVICE_TABLE(usb, products);
+
+static struct usb_driver qmi_wwan_driver = {
+        .name                 = "qmi_wwan",
+        .id_table             = products,
+        .probe                = usbnet_probe,
+        .disconnect           = usbnet_disconnect,
+        .suspend              = usbnet_suspend,
+        .resume               = usbnet_resume,
+        .reset_resume         = usbnet_resume,
+        .supports_autosuspend = 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_AUTHOR("Bjørn Mork <bjorn@mork.no>");
+MODULE_DESCRIPTION("Qualcomm MSM Interface (QMI) WWAN driver");
+MODULE_LICENSE("GPL");
diff --git a/drivers/net/usb/rtl8150.c b/drivers/net/usb/rtl8150.c
index 0710b4ca9252..6dda2fe5b15b 100644
--- a/drivers/net/usb/rtl8150.c
+++ b/drivers/net/usb/rtl8150.c
@@ -894,10 +894,8 @@ static int rtl8150_probe(struct usb_interface *intf,
         struct net_device *netdev;
 
         netdev = alloc_etherdev(sizeof(rtl8150_t));
-        if (!netdev) {
-                err("Out of memory");
+        if (!netdev)
                 return -ENOMEM;
-        }
 
         dev = netdev_priv(netdev);
 
diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c
index fae0fbd8bc88..b924f46c963c 100644
--- a/drivers/net/usb/usbnet.c
+++ b/drivers/net/usb/usbnet.c
@@ -1334,10 +1334,8 @@ usbnet_probe (struct usb_interface *udev, const struct usb_device_id *prod)
 
         // set up our own records
         net = alloc_etherdev(sizeof(*dev));
-        if (!net) {
-                dbg ("can't kmalloc dev");
+        if (!net)
                 goto out;
-        }
 
         /* netdev_printk() needs this so do it as early as possible */
         SET_NETDEV_DEV(net, &udev->dev);
diff --git a/drivers/net/vmxnet3/vmxnet3_drv.c b/drivers/net/vmxnet3/vmxnet3_drv.c
index de7fc345148a..e1562e8acba5 100644
--- a/drivers/net/vmxnet3/vmxnet3_drv.c
+++ b/drivers/net/vmxnet3/vmxnet3_drv.c
@@ -537,11 +537,8 @@ vmxnet3_tq_create(struct vmxnet3_tx_queue *tq,
 
         tq->buf_info = kcalloc(tq->tx_ring.size, sizeof(tq->buf_info[0]),
                                GFP_KERNEL);
-        if (!tq->buf_info) {
-                printk(KERN_ERR "%s: failed to allocate tx bufinfo\n",
-                       adapter->netdev->name);
+        if (!tq->buf_info)
                 goto err;
-        }
 
         return 0;
 
@@ -636,7 +633,7 @@ vmxnet3_rq_alloc_rx_buf(struct vmxnet3_rx_queue *rq, u32 ring_idx,
 
         dev_dbg(&adapter->netdev->dev,
                 "alloc_rx_buf: %d allocated, next2fill %u, next2comp "
-                "%u, uncommited %u\n", num_allocated, ring->next2fill,
+                "%u, uncommitted %u\n", num_allocated, ring->next2fill,
                 ring->next2comp, rq->uncommitted[ring_idx]);
 
         /* so that the device can distinguish a full ring and an empty ring */
@@ -816,27 +813,24 @@ vmxnet3_parse_and_copy_hdr(struct sk_buff *skb, struct vmxnet3_tx_queue *tq,
 
         if (ctx->mss) { /* TSO */
                 ctx->eth_ip_hdr_size = skb_transport_offset(skb);
-                ctx->l4_hdr_size = ((struct tcphdr *)
-                                   skb_transport_header(skb))->doff * 4;
+                ctx->l4_hdr_size = tcp_hdrlen(skb);
                 ctx->copy_size = ctx->eth_ip_hdr_size + ctx->l4_hdr_size;
         } else {
                 if (skb->ip_summed == CHECKSUM_PARTIAL) {
                         ctx->eth_ip_hdr_size = skb_checksum_start_offset(skb);
 
                         if (ctx->ipv4) {
-                                struct iphdr *iph = (struct iphdr *)
-                                                    skb_network_header(skb);
+                                const struct iphdr *iph = ip_hdr(skb);
+
                                 if (iph->protocol == IPPROTO_TCP)
-                                        ctx->l4_hdr_size = ((struct tcphdr *)
-                                           skb_transport_header(skb))->doff * 4;
+                                        ctx->l4_hdr_size = tcp_hdrlen(skb);
                                 else if (iph->protocol == IPPROTO_UDP)
                                         /*
                                          * Use tcp header size so that bytes to
                                          * be copied are more than required by
                                          * the device.
                                          */
-                                        ctx->l4_hdr_size =
-                                                        sizeof(struct tcphdr);
+                                        ctx->l4_hdr_size = sizeof(struct tcphdr);
                                 else
                                         ctx->l4_hdr_size = 0;
                         } else {
@@ -881,14 +875,17 @@ static void
 vmxnet3_prepare_tso(struct sk_buff *skb,
                     struct vmxnet3_tx_ctx *ctx)
 {
-        struct tcphdr *tcph = (struct tcphdr *)skb_transport_header(skb);
+        struct tcphdr *tcph = tcp_hdr(skb);
+
         if (ctx->ipv4) {
-                struct iphdr *iph = (struct iphdr *)skb_network_header(skb);
+                struct iphdr *iph = ip_hdr(skb);
+
                 iph->check = 0;
                 tcph->check = ~csum_tcpudp_magic(iph->saddr, iph->daddr, 0,
                                                  IPPROTO_TCP, 0);
         } else {
-                struct ipv6hdr *iph = (struct ipv6hdr *)skb_network_header(skb);
+                struct ipv6hdr *iph = ipv6_hdr(skb);
+
                 tcph->check = ~csum_ipv6_magic(&iph->saddr, &iph->daddr, 0,
                                                IPPROTO_TCP, 0);
         }
@@ -1519,11 +1516,9 @@ vmxnet3_rq_create(struct vmxnet3_rx_queue *rq, struct vmxnet3_adapter *adapter)
         sz = sizeof(struct vmxnet3_rx_buf_info) * (rq->rx_ring[0].size +
                                                    rq->rx_ring[1].size);
         bi = kzalloc(sz, GFP_KERNEL);
-        if (!bi) {
-                printk(KERN_ERR "%s: failed to allocate rx bufinfo\n",
-                       adapter->netdev->name);
+        if (!bi)
                 goto err;
-        }
+
         rq->buf_info[0] = bi;
         rq->buf_info[1] = bi + rq->rx_ring[0].size;
 
@@ -2923,11 +2918,8 @@ vmxnet3_probe_device(struct pci_dev *pdev,
         printk(KERN_INFO "# of Tx queues : %d, # of Rx queues : %d\n",
                num_tx_queues, num_rx_queues);
 
-        if (!netdev) {
-                printk(KERN_ERR "Failed to alloc ethernet device for adapter "
-                        "%s\n", pci_name(pdev));
+        if (!netdev)
                 return -ENOMEM;
-        }
 
         pci_set_drvdata(pdev, netdev);
         adapter = netdev_priv(netdev);
@@ -2964,8 +2956,6 @@ vmxnet3_probe_device(struct pci_dev *pdev,
 
         adapter->pm_conf = kmalloc(sizeof(struct Vmxnet3_PMConf), GFP_KERNEL);
         if (adapter->pm_conf == NULL) {
-                printk(KERN_ERR "Failed to allocate memory for %s\n",
-                        pci_name(pdev));
                 err = -ENOMEM;
                 goto err_alloc_pm;
         }
@@ -2974,8 +2964,6 @@ vmxnet3_probe_device(struct pci_dev *pdev,
 
         adapter->rss_conf = kmalloc(sizeof(struct UPT1_RSSConf), GFP_KERNEL);
         if (adapter->rss_conf == NULL) {
-                printk(KERN_ERR "Failed to allocate memory for %s\n",
-                       pci_name(pdev));
                 err = -ENOMEM;
                 goto err_alloc_rss;
         }
diff --git a/drivers/net/wan/c101.c b/drivers/net/wan/c101.c
index 54f995f4a5a3..09a50751763b 100644
--- a/drivers/net/wan/c101.c
+++ b/drivers/net/wan/c101.c
@@ -325,10 +325,8 @@ static int __init c101_run(unsigned long irq, unsigned long winbase)
         }
 
         card = kzalloc(sizeof(card_t), GFP_KERNEL);
-        if (card == NULL) {
-                pr_err("unable to allocate memory\n");
+        if (card == NULL)
                 return -ENOBUFS;
-        }
 
         card->dev = alloc_hdlcdev(card);
         if (!card->dev) {
diff --git a/drivers/net/wan/dscc4.c b/drivers/net/wan/dscc4.c
index 058e1697c174..fe8d060d8fff 100644
--- a/drivers/net/wan/dscc4.c
+++ b/drivers/net/wan/dscc4.c
@@ -903,10 +903,8 @@ static int dscc4_found1(struct pci_dev *pdev, void __iomem *ioaddr)
         int i, ret = -ENOMEM;
 
         root = kcalloc(dev_per_card, sizeof(*root), GFP_KERNEL);
-        if (!root) {
-                pr_err("can't allocate data\n");
+        if (!root)
                 goto err_out;
-        }
 
         for (i = 0; i < dev_per_card; i++) {
                 root[i].dev = alloc_hdlcdev(root + i);
@@ -915,10 +913,8 @@ static int dscc4_found1(struct pci_dev *pdev, void __iomem *ioaddr)
         }
 
         ppriv = kzalloc(sizeof(*ppriv), GFP_KERNEL);
-        if (!ppriv) {
-                pr_err("can't allocate private data\n");
+        if (!ppriv)
                 goto err_free_dev;
-        }
 
         ppriv->root = root;
         spin_lock_init(&ppriv->lock);
diff --git a/drivers/net/wan/lmc/lmc_main.c b/drivers/net/wan/lmc/lmc_main.c
index b7f2358d23be..76a8a4a522e9 100644
--- a/drivers/net/wan/lmc/lmc_main.c
+++ b/drivers/net/wan/lmc/lmc_main.c
@@ -497,7 +497,6 @@ int lmc_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) /*fold00*/
 
                     data = kmalloc(xc.len, GFP_KERNEL);
                     if (!data) {
-                            printk(KERN_WARNING "%s: Failed to allocate memory for copy\n", dev->name);
                             ret = -ENOMEM;
                             break;
                     }
diff --git a/drivers/net/wan/n2.c b/drivers/net/wan/n2.c
index 5129ad514d26..315bf09d6a20 100644
--- a/drivers/net/wan/n2.c
+++ b/drivers/net/wan/n2.c
@@ -358,10 +358,8 @@ static int __init n2_run(unsigned long io, unsigned long irq,
         }
 
         card = kzalloc(sizeof(card_t), GFP_KERNEL);
-        if (card == NULL) {
-                pr_err("unable to allocate memory\n");
+        if (card == NULL)
                 return -ENOBUFS;
-        }
 
         card->ports[0].dev = alloc_hdlcdev(&card->ports[0]);
         card->ports[1].dev = alloc_hdlcdev(&card->ports[1]);
diff --git a/drivers/net/wan/pc300too.c b/drivers/net/wan/pc300too.c
index c49c1b3c7aad..5fe246e060d7 100644
--- a/drivers/net/wan/pc300too.c
+++ b/drivers/net/wan/pc300too.c
@@ -320,7 +320,6 @@ static int __devinit pc300_pci_init_one(struct pci_dev *pdev,
 
         card = kzalloc(sizeof(card_t), GFP_KERNEL);
         if (card == NULL) {
-                pr_err("unable to allocate memory\n");
                 pci_release_regions(pdev);
                 pci_disable_device(pdev);
                 return -ENOBUFS;
diff --git a/drivers/net/wan/pci200syn.c b/drivers/net/wan/pci200syn.c
index 1ce21163c776..9659fcaa34ed 100644
--- a/drivers/net/wan/pci200syn.c
+++ b/drivers/net/wan/pci200syn.c
@@ -299,7 +299,6 @@ static int __devinit pci200_pci_init_one(struct pci_dev *pdev,
 
         card = kzalloc(sizeof(card_t), GFP_KERNEL);
         if (card == NULL) {
-                pr_err("unable to allocate memory\n");
                 pci_release_regions(pdev);
                 pci_disable_device(pdev);
                 return -ENOBUFS;
diff --git a/drivers/net/wan/wanxl.c b/drivers/net/wan/wanxl.c
index 44b707197258..feb7541b33fb 100644
--- a/drivers/net/wan/wanxl.c
+++ b/drivers/net/wan/wanxl.c
@@ -604,7 +604,6 @@ static int __devinit wanxl_pci_init_one(struct pci_dev *pdev,
         alloc_size = sizeof(card_t) + ports * sizeof(port_t);
         card = kzalloc(alloc_size, GFP_KERNEL);
         if (card == NULL) {
-                pr_err("%s: unable to allocate memory\n", pci_name(pdev));
                 pci_release_regions(pdev);
                 pci_disable_device(pdev);
                 return -ENOBUFS;
diff --git a/drivers/net/wan/x25_asy.c b/drivers/net/wan/x25_asy.c
index 8a10bb730d5a..e862369b4a6d 100644
--- a/drivers/net/wan/x25_asy.c
+++ b/drivers/net/wan/x25_asy.c
@@ -786,10 +786,8 @@ static int __init init_x25_asy(void)
 
         x25_asy_devs = kcalloc(x25_asy_maxdev, sizeof(struct net_device *),
                                 GFP_KERNEL);
-        if (!x25_asy_devs) {
-                pr_warn("Can't allocate x25_asy_ctrls[] array! Uaargh! (-> No X.25 available)\n");
+        if (!x25_asy_devs)
                 return -ENOMEM;
-        }
 
         return tty_register_ldisc(N_X25, &x25_ldisc);
 }
diff --git a/drivers/net/wireless/ath/ath5k/base.c b/drivers/net/wireless/ath/ath5k/base.c
index d366dadcf86e..a339693fbe26 100644
--- a/drivers/net/wireless/ath/ath5k/base.c
+++ b/drivers/net/wireless/ath/ath5k/base.c
@@ -80,7 +80,7 @@ static bool modparam_fastchanswitch;
 module_param_named(fastchanswitch, modparam_fastchanswitch, bool, S_IRUGO);
 MODULE_PARM_DESC(fastchanswitch, "Enable fast channel switching for AR2413/AR5413 radios.");
 
-static int ath5k_modparam_no_hw_rfkill_switch;
+static bool ath5k_modparam_no_hw_rfkill_switch;
 module_param_named(no_hw_rfkill_switch, ath5k_modparam_no_hw_rfkill_switch,
                                                                 bool, S_IRUGO);
 MODULE_PARM_DESC(no_hw_rfkill_switch, "Ignore the GPIO RFKill switch state");
@@ -2442,6 +2442,9 @@ ath5k_init_ah(struct ath5k_hw *ah, const struct ath_bus_ops *bus_ops)
                 BIT(NL80211_IFTYPE_ADHOC) |
                 BIT(NL80211_IFTYPE_MESH_POINT);
 
+        /* SW support for IBSS_RSN is provided by mac80211 */
+        hw->wiphy->flags |= WIPHY_FLAG_IBSS_RSN;
+
         /* both antennas can be configured as RX or TX */
         hw->wiphy->available_antennas_tx = 0x3;
         hw->wiphy->available_antennas_rx = 0x3;
diff --git a/drivers/net/wireless/ath/ath5k/mac80211-ops.c b/drivers/net/wireless/ath/ath5k/mac80211-ops.c
index 6ed4c0717e3e..af4c7ecb4b30 100644
--- a/drivers/net/wireless/ath/ath5k/mac80211-ops.c
+++ b/drivers/net/wireless/ath/ath5k/mac80211-ops.c
@@ -483,6 +483,14 @@ ath5k_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
         if (ath5k_modparam_nohwcrypt)
                 return -EOPNOTSUPP;
 
+        if (vif->type == NL80211_IFTYPE_ADHOC &&
+            (key->cipher == WLAN_CIPHER_SUITE_TKIP ||
+             key->cipher == WLAN_CIPHER_SUITE_CCMP) &&
+            !(key->flags & IEEE80211_KEY_FLAG_PAIRWISE)) {
+                /* don't program group keys when using IBSS_RSN */
+                return -EOPNOTSUPP;
+        }
+
         switch (key->cipher) {
         case WLAN_CIPHER_SUITE_WEP40:
         case WLAN_CIPHER_SUITE_WEP104:
diff --git a/drivers/net/wireless/ath/ath9k/hif_usb.c b/drivers/net/wireless/ath/ath9k/hif_usb.c
index 77c8ded8de57..f317515d8bf3 100644
--- a/drivers/net/wireless/ath/ath9k/hif_usb.c
+++ b/drivers/net/wireless/ath/ath9k/hif_usb.c
@@ -968,8 +968,7 @@ static void ath9k_hif_usb_dealloc_urbs(struct hif_device_usb *hif_dev)
         ath9k_hif_usb_dealloc_rx_urbs(hif_dev);
 }
 
-static int ath9k_hif_usb_download_fw(struct hif_device_usb *hif_dev,
-                                     u32 drv_info)
+static int ath9k_hif_usb_download_fw(struct hif_device_usb *hif_dev)
 {
         int transfer, err;
         const void *data = hif_dev->firmware->data;
@@ -1000,7 +999,7 @@ static int ath9k_hif_usb_download_fw(struct hif_device_usb *hif_dev,
         }
         kfree(buf);
 
-        if (IS_AR7010_DEVICE(drv_info))
+        if (IS_AR7010_DEVICE(hif_dev->usb_device_id->driver_info))
                 firm_offset = AR7010_FIRMWARE_TEXT;
         else
                 firm_offset = AR9271_FIRMWARE_TEXT;
@@ -1021,28 +1020,18 @@ static int ath9k_hif_usb_download_fw(struct hif_device_usb *hif_dev,
         return 0;
 }
 
-static int ath9k_hif_usb_dev_init(struct hif_device_usb *hif_dev, u32 drv_info)
+static int ath9k_hif_usb_dev_init(struct hif_device_usb *hif_dev)
 {
-        int ret, idx;
         struct usb_host_interface *alt = &hif_dev->interface->altsetting[0];
         struct usb_endpoint_descriptor *endp;
+        int ret, idx;
 
-        /* Request firmware */
-        ret = request_firmware(&hif_dev->firmware, hif_dev->fw_name,
-                               &hif_dev->udev->dev);
-        if (ret) {
-                dev_err(&hif_dev->udev->dev,
-                        "ath9k_htc: Firmware - %s not found\n", hif_dev->fw_name);
-                goto err_fw_req;
-        }
-
-        /* Download firmware */
-        ret = ath9k_hif_usb_download_fw(hif_dev, drv_info);
+        ret = ath9k_hif_usb_download_fw(hif_dev);
         if (ret) {
                 dev_err(&hif_dev->udev->dev,
                         "ath9k_htc: Firmware - %s download failed\n",
                         hif_dev->fw_name);
-                goto err_fw_download;
+                return ret;
         }
 
         /* On downloading the firmware to the target, the USB descriptor of EP4
@@ -1064,23 +1053,84 @@ static int ath9k_hif_usb_dev_init(struct hif_device_usb *hif_dev, u32 drv_info)
         if (ret) {
                 dev_err(&hif_dev->udev->dev,
                         "ath9k_htc: Unable to allocate URBs\n");
-                goto err_fw_download;
+                return ret;
         }
 
         return 0;
-
-err_fw_download:
-        release_firmware(hif_dev->firmware);
-err_fw_req:
-        hif_dev->firmware = NULL;
-        return ret;
 }
 
 static void ath9k_hif_usb_dev_deinit(struct hif_device_usb *hif_dev)
 {
         ath9k_hif_usb_dealloc_urbs(hif_dev);
-        if (hif_dev->firmware)
-                release_firmware(hif_dev->firmware);
+}
+
+/*
+ * If initialization fails or the FW cannot be retrieved,
+ * detach the device.
+ */
+static void ath9k_hif_usb_firmware_fail(struct hif_device_usb *hif_dev)
+{
+        struct device *parent = hif_dev->udev->dev.parent;
+
+        complete(&hif_dev->fw_done);
+
+        if (parent)
+                device_lock(parent);
+
+        device_release_driver(&hif_dev->udev->dev);
+
+        if (parent)
+                device_unlock(parent);
+}
+
+static void ath9k_hif_usb_firmware_cb(const struct firmware *fw, void *context)
+{
+        struct hif_device_usb *hif_dev = context;
+        int ret;
+
+        if (!fw) {
+                dev_err(&hif_dev->udev->dev,
+                        "ath9k_htc: Failed to get firmware %s\n",
+                        hif_dev->fw_name);
+                goto err_fw;
+        }
+
+        hif_dev->htc_handle = ath9k_htc_hw_alloc(hif_dev, &hif_usb,
+                                                 &hif_dev->udev->dev);
+        if (hif_dev->htc_handle == NULL) {
+                goto err_fw;
+        }
+
+        hif_dev->firmware = fw;
+
+        /* Proceed with initialization */
+
+        ret = ath9k_hif_usb_dev_init(hif_dev);
+        if (ret)
+                goto err_dev_init;
+
+        ret = ath9k_htc_hw_init(hif_dev->htc_handle,
+                                &hif_dev->interface->dev,
+                                hif_dev->usb_device_id->idProduct,
+                                hif_dev->udev->product,
+                                hif_dev->usb_device_id->driver_info);
+        if (ret) {
+                ret = -EINVAL;
+                goto err_htc_hw_init;
+        }
+
+        complete(&hif_dev->fw_done);
+
+        return;
+
+err_htc_hw_init:
+        ath9k_hif_usb_dev_deinit(hif_dev);
+err_dev_init:
+        ath9k_htc_hw_free(hif_dev->htc_handle);
+        release_firmware(fw);
+        hif_dev->firmware = NULL;
+err_fw:
+        ath9k_hif_usb_firmware_fail(hif_dev);
 }
 
 /*
@@ -1155,20 +1205,16 @@ static int ath9k_hif_usb_probe(struct usb_interface *interface,
         }
 
         usb_get_dev(udev);
+
         hif_dev->udev = udev;
         hif_dev->interface = interface;
-        hif_dev->device_id = id->idProduct;
+        hif_dev->usb_device_id = id;
 #ifdef CONFIG_PM
         udev->reset_resume = 1;
 #endif
         usb_set_intfdata(interface, hif_dev);
 
-        hif_dev->htc_handle = ath9k_htc_hw_alloc(hif_dev, &hif_usb,
-                                                 &hif_dev->udev->dev);
-        if (hif_dev->htc_handle == NULL) {
-                ret = -ENOMEM;
-                goto err_htc_hw_alloc;
-        }
+        init_completion(&hif_dev->fw_done);
 
         /* Find out which firmware to load */
 
@@ -1177,29 +1223,22 @@ static int ath9k_hif_usb_probe(struct usb_interface *interface,
         else
                 hif_dev->fw_name = FIRMWARE_AR9271;
 
-        ret = ath9k_hif_usb_dev_init(hif_dev, id->driver_info);
-        if (ret) {
-                ret = -EINVAL;
-                goto err_hif_init_usb;
-        }
-
-        ret = ath9k_htc_hw_init(hif_dev->htc_handle,
-                                &interface->dev, hif_dev->device_id,
-                                hif_dev->udev->product, id->driver_info);
+        ret = request_firmware_nowait(THIS_MODULE, true, hif_dev->fw_name,
+                                      &hif_dev->udev->dev, GFP_KERNEL,
+                                      hif_dev, ath9k_hif_usb_firmware_cb);
         if (ret) {
-                ret = -EINVAL;
-                goto err_htc_hw_init;
+                dev_err(&hif_dev->udev->dev,
+                        "ath9k_htc: Async request for firmware %s failed\n",
+                        hif_dev->fw_name);
+                goto err_fw_req;
         }
 
-        dev_info(&hif_dev->udev->dev, "ath9k_htc: USB layer initialized\n");
+        dev_info(&hif_dev->udev->dev, "ath9k_htc: Firmware %s requested\n",
+                 hif_dev->fw_name);
 
         return 0;
 
-err_htc_hw_init:
-        ath9k_hif_usb_dev_deinit(hif_dev);
-err_hif_init_usb:
-        ath9k_htc_hw_free(hif_dev->htc_handle);
-err_htc_hw_alloc:
+err_fw_req:
         usb_set_intfdata(interface, NULL);
         kfree(hif_dev);
         usb_put_dev(udev);
@@ -1234,9 +1273,15 @@ static void ath9k_hif_usb_disconnect(struct usb_interface *interface)
         if (!hif_dev)
                 return;
 
-        ath9k_htc_hw_deinit(hif_dev->htc_handle, unplugged);
-        ath9k_htc_hw_free(hif_dev->htc_handle);
-        ath9k_hif_usb_dev_deinit(hif_dev);
+        wait_for_completion(&hif_dev->fw_done);
+
+        if (hif_dev->firmware) {
+                ath9k_htc_hw_deinit(hif_dev->htc_handle, unplugged);
+                ath9k_htc_hw_free(hif_dev->htc_handle);
+                ath9k_hif_usb_dev_deinit(hif_dev);
+                release_firmware(hif_dev->firmware);
+        }
+
         usb_set_intfdata(interface, NULL);
 
         if (!unplugged && (hif_dev->flags & HIF_USB_START))
@@ -1276,8 +1321,7 @@ static int ath9k_hif_usb_resume(struct usb_interface *interface)
                 return ret;
 
         if (hif_dev->firmware) {
-                ret = ath9k_hif_usb_download_fw(hif_dev,
-                                htc_handle->drv_priv->ah->hw_version.usbdev);
+                ret = ath9k_hif_usb_download_fw(hif_dev);
                 if (ret)
                         goto fail_resume;
         } else {
diff --git a/drivers/net/wireless/ath/ath9k/hif_usb.h b/drivers/net/wireless/ath/ath9k/hif_usb.h
index 794f63094e5d..487ff658b4c1 100644
--- a/drivers/net/wireless/ath/ath9k/hif_usb.h
+++ b/drivers/net/wireless/ath/ath9k/hif_usb.h
@@ -87,10 +87,11 @@ struct cmd_buf {
 #define HIF_USB_START BIT(0)
 
 struct hif_device_usb {
-        u16 device_id;
         struct usb_device *udev;
         struct usb_interface *interface;
+        const struct usb_device_id *usb_device_id;
         const struct firmware *firmware;
+        struct completion fw_done;
         struct htc_target *htc_handle;
         struct hif_usb_tx tx;
         struct usb_anchor regout_submitted;
diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_init.c b/drivers/net/wireless/ath/ath9k/htc_drv_init.c
index 9be10a2da1c2..fc7519c93390 100644
--- a/drivers/net/wireless/ath/ath9k/htc_drv_init.c
+++ b/drivers/net/wireless/ath/ath9k/htc_drv_init.c
@@ -741,6 +741,8 @@ static void ath9k_set_hw_capab(struct ath9k_htc_priv *priv,
 
         hw->wiphy->flags &= ~WIPHY_FLAG_PS_ON_BY_DEFAULT;
 
+        hw->wiphy->flags |= WIPHY_FLAG_IBSS_RSN;
+
         hw->queues = 4;
         hw->channel_change_time = 5000;
         hw->max_listen_interval = 10;
diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_main.c b/drivers/net/wireless/ath/ath9k/htc_drv_main.c
index ef4c60661290..06101b6bdeac 100644
--- a/drivers/net/wireless/ath/ath9k/htc_drv_main.c
+++ b/drivers/net/wireless/ath/ath9k/htc_drv_main.c
@@ -1409,6 +1409,21 @@ static int ath9k_htc_set_key(struct ieee80211_hw *hw,
         if (htc_modparam_nohwcrypt)
                 return -ENOSPC;
 
+        if ((vif->type == NL80211_IFTYPE_ADHOC ||
+             vif->type == NL80211_IFTYPE_MESH_POINT) &&
+            (key->cipher == WLAN_CIPHER_SUITE_TKIP ||
+             key->cipher == WLAN_CIPHER_SUITE_CCMP) &&
+            !(key->flags & IEEE80211_KEY_FLAG_PAIRWISE)) {
+                /*
+                 * For now, disable hw crypto for the RSN IBSS group keys. This
+                 * could be optimized in the future to use a modified key cache
+                 * design to support per-STA RX GTK, but until that gets
+                 * implemented, use of software crypto for group addressed
+                 * frames is a acceptable to allow RSN IBSS to be used.
+                 */
+                return -EOPNOTSUPP;
+        }
+
         mutex_lock(&priv->mutex);
         ath_dbg(common, CONFIG, "Set HW Key\n");
         ath9k_htc_ps_wakeup(priv);
diff --git a/drivers/net/wireless/ath/ath9k/htc_hst.c b/drivers/net/wireless/ath/ath9k/htc_hst.c
index 1b90ed8795c3..c25226a32ddc 100644
--- a/drivers/net/wireless/ath/ath9k/htc_hst.c
+++ b/drivers/net/wireless/ath/ath9k/htc_hst.c
@@ -431,11 +431,8 @@ struct htc_target *ath9k_htc_hw_alloc(void *hif_handle,
         struct htc_target *target;
 
         target = kzalloc(sizeof(struct htc_target), GFP_KERNEL);
-        if (!target) {
-                printk(KERN_ERR "Unable to allocate memory for"
-                        "target device\n");
+        if (!target)
                 return NULL;
-        }
 
         init_completion(&target->target_wait);
         init_completion(&target->cmd_wait);
diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c
index 4a00806e2852..ec82e926badc 100644
--- a/drivers/net/wireless/ath/ath9k/main.c
+++ b/drivers/net/wireless/ath/ath9k/main.c
@@ -340,9 +340,7 @@ static int ath_reset_internal(struct ath_softc *sc, struct ath9k_channel *hchan,
                 fastcc = false;
 
         ath_dbg(common, CONFIG, "Reset to %u MHz, HT40: %d fastcc: %d\n",
-                hchan->channel, !!(hchan->channelFlags & (CHANNEL_HT40MINUS |
-                                                          CHANNEL_HT40PLUS)),
-                fastcc);
+                hchan->channel, IS_CHAN_HT40(hchan), fastcc);
 
         r = ath9k_hw_reset(ah, hchan, caldata, fastcc);
         if (r) {
diff --git a/drivers/net/wireless/ath/carl9170/carl9170.h b/drivers/net/wireless/ath/carl9170/carl9170.h
index 6cfbb419e2f6..0cea20e3e250 100644
--- a/drivers/net/wireless/ath/carl9170/carl9170.h
+++ b/drivers/net/wireless/ath/carl9170/carl9170.h
@@ -559,6 +559,7 @@ int carl9170_set_hwretry_limit(struct ar9170 *ar, const u32 max_retry);
 int carl9170_upload_key(struct ar9170 *ar, const u8 id, const u8 *mac,
         const u8 ktype, const u8 keyidx, const u8 *keydata, const int keylen);
 int carl9170_disable_key(struct ar9170 *ar, const u8 id);
+int carl9170_set_mac_tpc(struct ar9170 *ar, struct ieee80211_channel *channel);
 
 /* RX */
 void carl9170_rx(struct ar9170 *ar, void *buf, unsigned int len);
@@ -593,7 +594,6 @@ int carl9170_get_noisefloor(struct ar9170 *ar);
 
 /* FW */
 int carl9170_parse_firmware(struct ar9170 *ar);
-int carl9170_fw_fix_eeprom(struct ar9170 *ar);
 
 extern struct ieee80211_rate __carl9170_ratetable[];
 extern int modparam_noht;
diff --git a/drivers/net/wireless/ath/carl9170/fw.c b/drivers/net/wireless/ath/carl9170/fw.c
index 3de61adacd34..cffde8d9a521 100644
--- a/drivers/net/wireless/ath/carl9170/fw.c
+++ b/drivers/net/wireless/ath/carl9170/fw.c
@@ -389,39 +389,6 @@ carl9170_find_fw_desc(struct ar9170 *ar, const __u8 *fw_data, const size_t len)
         return (void *)&fw_data[scan - found];
 }
 
-int carl9170_fw_fix_eeprom(struct ar9170 *ar)
-{
-        const struct carl9170fw_fix_desc *fix_desc = NULL;
-        unsigned int i, n, off;
-        u32 *data = (void *)&ar->eeprom;
-
-        fix_desc = carl9170_fw_find_desc(ar, FIX_MAGIC,
-                sizeof(*fix_desc), CARL9170FW_FIX_DESC_CUR_VER);
-
-        if (!fix_desc)
-                return 0;
-
-        n = (le16_to_cpu(fix_desc->head.length) - sizeof(*fix_desc)) /
-            sizeof(struct carl9170fw_fix_entry);
-
-        for (i = 0; i < n; i++) {
-                off = le32_to_cpu(fix_desc->data[i].address) -
-                      AR9170_EEPROM_START;
-
-                if (off >= sizeof(struct ar9170_eeprom) || (off & 3)) {
-                        dev_err(&ar->udev->dev, "Skip invalid entry %d\n", i);
-                        continue;
-                }
-
-                data[off / sizeof(*data)] &=
-                        le32_to_cpu(fix_desc->data[i].mask);
-                data[off / sizeof(*data)] |=
-                        le32_to_cpu(fix_desc->data[i].value);
-        }
-
-        return 0;
-}
-
 int carl9170_parse_firmware(struct ar9170 *ar)
 {
         const struct carl9170fw_desc_head *fw_desc = NULL;
diff --git a/drivers/net/wireless/ath/carl9170/mac.c b/drivers/net/wireless/ath/carl9170/mac.c
index dfda91970995..53415bfd8bef 100644
--- a/drivers/net/wireless/ath/carl9170/mac.c
+++ b/drivers/net/wireless/ath/carl9170/mac.c
@@ -485,3 +485,38 @@ int carl9170_disable_key(struct ar9170 *ar, const u8 id)
         return carl9170_exec_cmd(ar, CARL9170_CMD_DKEY,
                 sizeof(key), (u8 *)&key, 0, NULL);
 }
+
+int carl9170_set_mac_tpc(struct ar9170 *ar, struct ieee80211_channel *channel)
+{
+        unsigned int power, chains;
+
+        if (ar->eeprom.tx_mask != 1)
+                chains = AR9170_TX_PHY_TXCHAIN_2;
+        else
+                chains = AR9170_TX_PHY_TXCHAIN_1;
+
+        switch (channel->band) {
+        case IEEE80211_BAND_2GHZ:
+                power = ar->power_2G_ofdm[0] & 0x3f;
+                break;
+        case IEEE80211_BAND_5GHZ:
+                power = ar->power_5G_leg[0] & 0x3f;
+                break;
+        default:
+                BUG_ON(1);
+        }
+
+        power = min_t(unsigned int, power, ar->hw->conf.power_level * 2);
+
+        carl9170_regwrite_begin(ar);
+        carl9170_regwrite(AR9170_MAC_REG_ACK_TPC,
+                          0x3c1e | power << 20 | chains << 26);
+        carl9170_regwrite(AR9170_MAC_REG_RTS_CTS_TPC,
+                          power << 5 | chains << 11 |
+                          power << 21 | chains << 27);
+        carl9170_regwrite(AR9170_MAC_REG_CFEND_QOSNULL_TPC,
+                          power << 5 | chains << 11 |
+                          power << 21 | chains << 27);
+        carl9170_regwrite_finish();
+        return carl9170_regwrite_result();
+}
diff --git a/drivers/net/wireless/ath/carl9170/main.c b/drivers/net/wireless/ath/carl9170/main.c
index db774212161b..8d2523b3f722 100644
--- a/drivers/net/wireless/ath/carl9170/main.c
+++ b/drivers/net/wireless/ath/carl9170/main.c
@@ -853,11 +853,6 @@ static int carl9170_op_config(struct ieee80211_hw *hw, u32 changed)
                         goto out;
         }
 
-        if (changed & IEEE80211_CONF_CHANGE_POWER) {
-                /* TODO */
-                err = 0;
-        }
-
         if (changed & IEEE80211_CONF_CHANGE_SMPS) {
                 /* TODO */
                 err = 0;
@@ -891,6 +886,12 @@ static int carl9170_op_config(struct ieee80211_hw *hw, u32 changed)
                         goto out;
         }
 
+        if (changed & IEEE80211_CONF_CHANGE_POWER) {
+                err = carl9170_set_mac_tpc(ar, ar->hw->conf.channel);
+                if (err)
+                        goto out;
+        }
+
 out:
         mutex_unlock(&ar->mutex);
         return err;
@@ -1796,6 +1797,9 @@ void *carl9170_alloc(size_t priv_size)
                 ar->noise[i] = -95; /* ATH_DEFAULT_NOISE_FLOOR */
 
         hw->wiphy->flags &= ~WIPHY_FLAG_PS_ON_BY_DEFAULT;
+
+        /* As IBSS Encryption is software-based, IBSS RSN is supported. */
+        hw->wiphy->flags |= WIPHY_FLAG_IBSS_RSN;
         return ar;
 
 err_nomem:
@@ -1931,10 +1935,6 @@ int carl9170_register(struct ar9170 *ar)
         if (err)
                 return err;
 
-        err = carl9170_fw_fix_eeprom(ar);
-        if (err)
-                return err;
-
         err = carl9170_parse_eeprom(ar);
         if (err)
                 return err;
diff --git a/drivers/net/wireless/ath/carl9170/phy.c b/drivers/net/wireless/ath/carl9170/phy.c
index 472efc7e3402..b72c09cf43a4 100644
--- a/drivers/net/wireless/ath/carl9170/phy.c
+++ b/drivers/net/wireless/ath/carl9170/phy.c
@@ -1426,15 +1426,15 @@ static void carl9170_calc_ctl(struct ar9170 *ar, u32 freq, enum carl9170_bw bw)
 #undef EDGES
 }
 
-static int carl9170_set_power_cal(struct ar9170 *ar, u32 freq,
-                                  enum carl9170_bw bw)
+static void carl9170_set_power_cal(struct ar9170 *ar, u32 freq,
+                                   enum carl9170_bw bw)
 {
         struct ar9170_calibration_target_power_legacy *ctpl;
         struct ar9170_calibration_target_power_ht *ctph;
         u8 *ctpres;
         int ntargets;
         int idx, i, n;
-        u8 ackpower, ackchains, f;
+        u8 f;
         u8 pwr_freqs[AR5416_MAX_NUM_TGT_PWRS];
 
         if (freq < 3000)
@@ -1523,32 +1523,6 @@ static int carl9170_set_power_cal(struct ar9170 *ar, u32 freq,
 
         /* calc. conformance test limits and apply to ar->power*[] */
         carl9170_calc_ctl(ar, freq, bw);
-
-        /* set ACK/CTS TX power */
-        carl9170_regwrite_begin(ar);
-
-        if (ar->eeprom.tx_mask != 1)
-                ackchains = AR9170_TX_PHY_TXCHAIN_2;
-        else
-                ackchains = AR9170_TX_PHY_TXCHAIN_1;
-
-        if (freq < 3000)
-                ackpower = ar->power_2G_ofdm[0] & 0x3f;
-        else
-                ackpower = ar->power_5G_leg[0] & 0x3f;
-
-        carl9170_regwrite(AR9170_MAC_REG_ACK_TPC,
-                          0x3c1e | ackpower << 20 | ackchains << 26);
-        carl9170_regwrite(AR9170_MAC_REG_RTS_CTS_TPC,
-                          ackpower << 5 | ackchains << 11 |
-                          ackpower << 21 | ackchains << 27);
-
-        carl9170_regwrite(AR9170_MAC_REG_CFEND_QOSNULL_TPC,
-                          ackpower << 5 | ackchains << 11 |
-                          ackpower << 21 | ackchains << 27);
-
-        carl9170_regwrite_finish();
-        return carl9170_regwrite_result();
 }
 
 int carl9170_get_noisefloor(struct ar9170 *ar)
@@ -1712,7 +1686,9 @@ int carl9170_set_channel(struct ar9170 *ar, struct ieee80211_channel *channel,
         if (err)
                 return err;
 
-        err = carl9170_set_power_cal(ar, channel->center_freq, bw);
+        carl9170_set_power_cal(ar, channel->center_freq, bw);
+
+        err = carl9170_set_mac_tpc(ar, channel);
         if (err)
                 return err;
 
diff --git a/drivers/net/wireless/ath/carl9170/tx.c b/drivers/net/wireless/ath/carl9170/tx.c
index d19a9ee9d057..771e1a9294c5 100644
--- a/drivers/net/wireless/ath/carl9170/tx.c
+++ b/drivers/net/wireless/ath/carl9170/tx.c
@@ -719,6 +719,8 @@ static void carl9170_tx_rate_tpc_chains(struct ar9170 *ar,
                 else
                         *chains = AR9170_TX_PHY_TXCHAIN_2;
         }
+
+        *tpc = min_t(unsigned int, *tpc, ar->hw->conf.power_level * 2);
 }
 
 static __le32 carl9170_tx_physet(struct ar9170 *ar,
diff --git a/drivers/net/wireless/atmel.c b/drivers/net/wireless/atmel.c
index 7e45ca2e78ef..3010cee7b95a 100644
--- a/drivers/net/wireless/atmel.c
+++ b/drivers/net/wireless/atmel.c
@@ -1533,10 +1533,9 @@ struct net_device *init_atmel_card(unsigned short irq, unsigned long port,
 
         /* Create the network device object. */
         dev = alloc_etherdev(sizeof(*priv));
-        if (!dev) {
-                printk(KERN_ERR "atmel: Couldn't alloc_etherdev\n");
+        if (!dev)
                 return NULL;
-        }
+
         if (dev_alloc_name(dev, dev->name) < 0) {
                 printk(KERN_ERR "atmel: Couldn't get name!\n");
                 goto err_out_free;
diff --git a/drivers/net/wireless/b43/b43.h b/drivers/net/wireless/b43/b43.h
index 16e8f8058155..835462dc1206 100644
--- a/drivers/net/wireless/b43/b43.h
+++ b/drivers/net/wireless/b43/b43.h
@@ -999,6 +999,12 @@ static inline void b43_write16(struct b43_wldev *dev, u16 offset, u16 value)
         dev->dev->write16(dev->dev, offset, value);
 }
 
+static inline void b43_maskset16(struct b43_wldev *dev, u16 offset, u16 mask,
+                                 u16 set)
+{
+        b43_write16(dev, offset, (b43_read16(dev, offset) & mask) | set);
+}
+
 static inline u32 b43_read32(struct b43_wldev *dev, u16 offset)
 {
         return dev->dev->read32(dev->dev, offset);
@@ -1009,6 +1015,12 @@ static inline void b43_write32(struct b43_wldev *dev, u16 offset, u32 value)
         dev->dev->write32(dev->dev, offset, value);
 }
 
+static inline void b43_maskset32(struct b43_wldev *dev, u16 offset, u32 mask,
+                                 u32 set)
+{
+        b43_write32(dev, offset, (b43_read32(dev, offset) & mask) | set);
+}
+
 static inline void b43_block_read(struct b43_wldev *dev, void *buffer,
                                  size_t count, u16 offset, u8 reg_width)
 {
diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c
index 23ffb1b9a86f..5189cf38123a 100644
--- a/drivers/net/wireless/b43/main.c
+++ b/drivers/net/wireless/b43/main.c
@@ -580,22 +580,14 @@ void b43_tsf_read(struct b43_wldev *dev, u64 *tsf)
 
 static void b43_time_lock(struct b43_wldev *dev)
 {
-        u32 macctl;
-
-        macctl = b43_read32(dev, B43_MMIO_MACCTL);
-        macctl |= B43_MACCTL_TBTTHOLD;
-        b43_write32(dev, B43_MMIO_MACCTL, macctl);
+        b43_maskset32(dev, B43_MMIO_MACCTL, ~0, B43_MACCTL_TBTTHOLD);
         /* Commit the write */
         b43_read32(dev, B43_MMIO_MACCTL);
 }
 
 static void b43_time_unlock(struct b43_wldev *dev)
 {
-        u32 macctl;
-
-        macctl = b43_read32(dev, B43_MMIO_MACCTL);
-        macctl &= ~B43_MACCTL_TBTTHOLD;
-        b43_write32(dev, B43_MMIO_MACCTL, macctl);
+        b43_maskset32(dev, B43_MMIO_MACCTL, ~B43_MACCTL_TBTTHOLD, 0);
         /* Commit the write */
         b43_read32(dev, B43_MMIO_MACCTL);
 }
@@ -2487,10 +2479,8 @@ static int b43_upload_microcode(struct b43_wldev *dev)
         b43_write32(dev, B43_MMIO_GEN_IRQ_REASON, B43_IRQ_ALL);
 
         /* Start the microcode PSM */
-        macctl = b43_read32(dev, B43_MMIO_MACCTL);
-        macctl &= ~B43_MACCTL_PSM_JMP0;
-        macctl |= B43_MACCTL_PSM_RUN;
-        b43_write32(dev, B43_MMIO_MACCTL, macctl);
+        b43_maskset32(dev, B43_MMIO_MACCTL, ~B43_MACCTL_PSM_JMP0,
+                      B43_MACCTL_PSM_RUN);
 
         /* Wait for the microcode to load and respond */
         i = 0;
@@ -2590,10 +2580,9 @@ static int b43_upload_microcode(struct b43_wldev *dev)
         return 0;
 
 error:
-        macctl = b43_read32(dev, B43_MMIO_MACCTL);
-        macctl &= ~B43_MACCTL_PSM_RUN;
-        macctl |= B43_MACCTL_PSM_JMP0;
-        b43_write32(dev, B43_MMIO_MACCTL, macctl);
+        /* Stop the microcode PSM. */
+        b43_maskset32(dev, B43_MMIO_MACCTL, ~B43_MACCTL_PSM_RUN,
+                      B43_MACCTL_PSM_JMP0);
 
         return err;
 }
@@ -2708,11 +2697,8 @@ static int b43_gpio_init(struct b43_wldev *dev)
         struct ssb_device *gpiodev;
         u32 mask, set;
 
-        b43_write32(dev, B43_MMIO_MACCTL, b43_read32(dev, B43_MMIO_MACCTL)
-                    & ~B43_MACCTL_GPOUTSMSK);
-
-        b43_write16(dev, B43_MMIO_GPIO_MASK, b43_read16(dev, B43_MMIO_GPIO_MASK)
-                    | 0x000F);
+        b43_maskset32(dev, B43_MMIO_MACCTL, ~B43_MACCTL_GPOUTSMSK, 0);
+        b43_maskset16(dev, B43_MMIO_GPIO_MASK, ~0, 0xF);
 
         mask = 0x0000001F;
         set = 0x0000000F;
@@ -2800,9 +2786,7 @@ void b43_mac_enable(struct b43_wldev *dev)
         dev->mac_suspended--;
         B43_WARN_ON(dev->mac_suspended < 0);
         if (dev->mac_suspended == 0) {
-                b43_write32(dev, B43_MMIO_MACCTL,
-                            b43_read32(dev, B43_MMIO_MACCTL)
-                            | B43_MACCTL_ENABLED);
+                b43_maskset32(dev, B43_MMIO_MACCTL, ~0, B43_MACCTL_ENABLED);
                 b43_write32(dev, B43_MMIO_GEN_IRQ_REASON,
                             B43_IRQ_MAC_SUSPENDED);
                 /* Commit writes */
@@ -2823,9 +2807,7 @@ void b43_mac_suspend(struct b43_wldev *dev)
 
         if (dev->mac_suspended == 0) {
                 b43_power_saving_ctl_bits(dev, B43_PS_AWAKE);
-                b43_write32(dev, B43_MMIO_MACCTL,
-                            b43_read32(dev, B43_MMIO_MACCTL)
-                            & ~B43_MACCTL_ENABLED);
+                b43_maskset32(dev, B43_MMIO_MACCTL, ~B43_MACCTL_ENABLED, 0);
                 /* force pci to flush the write */
                 b43_read32(dev, B43_MMIO_MACCTL);
                 for (i = 35; i; i--) {
@@ -2931,15 +2913,10 @@ static void b43_adjust_opmode(struct b43_wldev *dev)
          *        so always disable it. If we want to implement PMQ,
          *        we need to enable it here (clear DISCPMQ) in AP mode.
          */
-        if (0  /* ctl & B43_MACCTL_AP */) {
-                b43_write32(dev, B43_MMIO_MACCTL,
-                            b43_read32(dev, B43_MMIO_MACCTL)
-                            & ~B43_MACCTL_DISCPMQ);
-        } else {
-                b43_write32(dev, B43_MMIO_MACCTL,
-                            b43_read32(dev, B43_MMIO_MACCTL)
-                            | B43_MACCTL_DISCPMQ);
-        }
+        if (0  /* ctl & B43_MACCTL_AP */)
+                b43_maskset32(dev, B43_MMIO_MACCTL, ~B43_MACCTL_DISCPMQ, 0);
+        else
+                b43_maskset32(dev, B43_MMIO_MACCTL, ~0, B43_MACCTL_DISCPMQ);
 }
 
 static void b43_rate_memory_write(struct b43_wldev *dev, u16 rate, int is_ofdm)
@@ -3083,10 +3060,8 @@ static int b43_chip_init(struct b43_wldev *dev)
         if (dev->dev->core_rev < 5)
                 b43_write32(dev, 0x010C, 0x01000000);
 
-        b43_write32(dev, B43_MMIO_MACCTL, b43_read32(dev, B43_MMIO_MACCTL)
-                    & ~B43_MACCTL_INFRA);
-        b43_write32(dev, B43_MMIO_MACCTL, b43_read32(dev, B43_MMIO_MACCTL)
-                    | B43_MACCTL_INFRA);
+        b43_maskset32(dev, B43_MMIO_MACCTL, ~B43_MACCTL_INFRA, 0);
+        b43_maskset32(dev, B43_MMIO_MACCTL, ~0, B43_MACCTL_INFRA);
 
         /* Probe Response Timeout value */
         /* FIXME: Default to 0, has to be set by ioctl probably... :-/ */
@@ -4564,8 +4539,6 @@ static void b43_set_pretbtt(struct b43_wldev *dev)
 /* Locking: wl->mutex */
 static void b43_wireless_core_exit(struct b43_wldev *dev)
 {
-        u32 macctl;
-
         B43_WARN_ON(dev && b43_status(dev) > B43_STAT_INITIALIZED);
         if (!dev || b43_status(dev) != B43_STAT_INITIALIZED)
                 return;
@@ -4576,10 +4549,8 @@ static void b43_wireless_core_exit(struct b43_wldev *dev)
         b43_set_status(dev, B43_STAT_UNINIT);
 
         /* Stop the microcode PSM. */
-        macctl = b43_read32(dev, B43_MMIO_MACCTL);
-        macctl &= ~B43_MACCTL_PSM_RUN;
-        macctl |= B43_MACCTL_PSM_JMP0;
-        b43_write32(dev, B43_MMIO_MACCTL, macctl);
+        b43_maskset32(dev, B43_MMIO_MACCTL, ~B43_MACCTL_PSM_RUN,
+                      B43_MACCTL_PSM_JMP0);
 
         b43_dma_free(dev);
         b43_pio_free(dev);
diff --git a/drivers/net/wireless/b43/phy_n.c b/drivers/net/wireless/b43/phy_n.c
index bf5a43855358..108118820b36 100644
--- a/drivers/net/wireless/b43/phy_n.c
+++ b/drivers/net/wireless/b43/phy_n.c
@@ -85,22 +85,11 @@ static inline bool b43_nphy_ipa(struct b43_wldev *dev)
                 (dev->phy.n->ipa5g_on && band == IEEE80211_BAND_5GHZ));
 }
 
-/* http://bcm-v4.sipsolutions.net/802.11/PHY/N/GetIpaGainTbl */
-static const u32 *b43_nphy_get_ipa_gain_table(struct b43_wldev *dev)
+/* http://bcm-v4.sipsolutions.net/802.11/PHY/N/RxCoreGetState */
+static u8 b43_nphy_get_rx_core_state(struct b43_wldev *dev)
 {
-        if (b43_current_band(dev->wl) == IEEE80211_BAND_2GHZ) {
-                if (dev->phy.rev >= 6) {
-                        if (dev->dev->chip_id == 47162)
-                                return txpwrctrl_tx_gain_ipa_rev5;
-                        return txpwrctrl_tx_gain_ipa_rev6;
-                } else if (dev->phy.rev >= 5) {
-                        return txpwrctrl_tx_gain_ipa_rev5;
-                } else {
-                        return txpwrctrl_tx_gain_ipa;
-                }
-        } else {
-                return txpwrctrl_tx_gain_ipa_5g;
-        }
+        return (b43_phy_read(dev, B43_NPHY_RFSEQCA) & B43_NPHY_RFSEQCA_RXEN) >>
+                B43_NPHY_RFSEQCA_RXEN_SHIFT;
 }
 
 /**************************************************
@@ -229,7 +218,7 @@ static void b43_nphy_rf_control_intc_override(struct b43_wldev *dev, u8 field,
 
                 reg = (i == 0) ?
                         B43_NPHY_RFCTL_INTC1 : B43_NPHY_RFCTL_INTC2;
-                b43_phy_mask(dev, reg, 0xFBFF);
+                b43_phy_set(dev, reg, 0x400);
 
                 switch (field) {
                 case 0:
@@ -245,7 +234,7 @@ static void b43_nphy_rf_control_intc_override(struct b43_wldev *dev, u8 field,
                                 b43_phy_set(dev, B43_NPHY_RFCTL_CMD,
                                                 B43_NPHY_RFCTL_CMD_START);
                                 for (j = 0; j < 100; j++) {
-                                        if (b43_phy_read(dev, B43_NPHY_RFCTL_CMD) & B43_NPHY_RFCTL_CMD_START) {
+                                        if (!(b43_phy_read(dev, B43_NPHY_RFCTL_CMD) & B43_NPHY_RFCTL_CMD_START)) {
                                                 j = 0;
                                                 break;
                                         }
@@ -264,7 +253,7 @@ static void b43_nphy_rf_control_intc_override(struct b43_wldev *dev, u8 field,
                                 b43_phy_set(dev, B43_NPHY_RFCTL_CMD,
                                                 B43_NPHY_RFCTL_CMD_RXTX);
                                 for (j = 0; j < 100; j++) {
-                                        if (b43_phy_read(dev, B43_NPHY_RFCTL_CMD) & B43_NPHY_RFCTL_CMD_RXTX) {
+                                        if (!(b43_phy_read(dev, B43_NPHY_RFCTL_CMD) & B43_NPHY_RFCTL_CMD_RXTX)) {
                                                 j = 0;
                                                 break;
                                         }
@@ -1231,12 +1220,12 @@ static int b43_nphy_poll_rssi(struct b43_wldev *dev, u8 type, s32 *buf,
         u16 s[2];
 
         if (dev->phy.rev >= 3) {
-                save_regs_phy[0] = b43_phy_read(dev,
+                save_regs_phy[0] = b43_phy_read(dev, B43_NPHY_AFECTL_C1);
+                save_regs_phy[1] = b43_phy_read(dev, B43_NPHY_AFECTL_C2);
+                save_regs_phy[2] = b43_phy_read(dev,
                                                 B43_NPHY_RFCTL_LUT_TRSW_UP1);
-                save_regs_phy[1] = b43_phy_read(dev,
+                save_regs_phy[3] = b43_phy_read(dev,
                                                 B43_NPHY_RFCTL_LUT_TRSW_UP2);
-                save_regs_phy[2] = b43_phy_read(dev, B43_NPHY_AFECTL_C1);
-                save_regs_phy[3] = b43_phy_read(dev, B43_NPHY_AFECTL_C2);
                 save_regs_phy[4] = b43_phy_read(dev, B43_NPHY_AFECTL_OVER1);
                 save_regs_phy[5] = b43_phy_read(dev, B43_NPHY_AFECTL_OVER);
                 save_regs_phy[6] = b43_phy_read(dev, B43_NPHY_TXF_40CO_B1S0);
@@ -1285,12 +1274,12 @@ static int b43_nphy_poll_rssi(struct b43_wldev *dev, u8 type, s32 *buf,
                 b43_phy_write(dev, B43_NPHY_GPIO_SEL, save_regs_phy[8]);
 
         if (dev->phy.rev >= 3) {
+                b43_phy_write(dev, B43_NPHY_AFECTL_C1, save_regs_phy[0]);
+                b43_phy_write(dev, B43_NPHY_AFECTL_C2, save_regs_phy[1]);
                 b43_phy_write(dev, B43_NPHY_RFCTL_LUT_TRSW_UP1,
-                                save_regs_phy[0]);
+                                save_regs_phy[2]);
                 b43_phy_write(dev, B43_NPHY_RFCTL_LUT_TRSW_UP2,
-                                save_regs_phy[1]);
-                b43_phy_write(dev, B43_NPHY_AFECTL_C1, save_regs_phy[2]);
-                b43_phy_write(dev, B43_NPHY_AFECTL_C2, save_regs_phy[3]);
+                                save_regs_phy[3]);
                 b43_phy_write(dev, B43_NPHY_AFECTL_OVER1, save_regs_phy[4]);
                 b43_phy_write(dev, B43_NPHY_AFECTL_OVER, save_regs_phy[5]);
                 b43_phy_write(dev, B43_NPHY_TXF_40CO_B1S0, save_regs_phy[6]);
@@ -1308,6 +1297,186 @@ static int b43_nphy_poll_rssi(struct b43_wldev *dev, u8 type, s32 *buf,
         return out;
 }
 
+/* http://bcm-v4.sipsolutions.net/802.11/PHY/N/RSSICalRev3 */
+static void b43_nphy_rev3_rssi_cal(struct b43_wldev *dev)
+{
+        struct b43_phy_n *nphy = dev->phy.n;
+
+        u16 saved_regs_phy_rfctl[2];
+        u16 saved_regs_phy[13];
+        u16 regs_to_store[] = {
+                B43_NPHY_AFECTL_OVER1, B43_NPHY_AFECTL_OVER,
+                B43_NPHY_AFECTL_C1, B43_NPHY_AFECTL_C2,
+                B43_NPHY_TXF_40CO_B1S1, B43_NPHY_RFCTL_OVER,
+                B43_NPHY_TXF_40CO_B1S0, B43_NPHY_TXF_40CO_B32S1,
+                B43_NPHY_RFCTL_CMD,
+                B43_NPHY_RFCTL_LUT_TRSW_UP1, B43_NPHY_RFCTL_LUT_TRSW_UP2,
+                B43_NPHY_RFCTL_RSSIO1, B43_NPHY_RFCTL_RSSIO2
+        };
+
+        u16 class;
+
+        u16 clip_state[2];
+        u16 clip_off[2] = { 0xFFFF, 0xFFFF };
+
+        u8 vcm_final = 0;
+        s8 offset[4];
+        s32 results[8][4] = { };
+        s32 results_min[4] = { };
+        s32 poll_results[4] = { };
+
+        u16 *rssical_radio_regs = NULL;
+        u16 *rssical_phy_regs = NULL;
+
+        u16 r; /* routing */
+        u8 rx_core_state;
+        u8 core, i, j;
+
+        class = b43_nphy_classifier(dev, 0, 0);
+        b43_nphy_classifier(dev, 7, 4);
+        b43_nphy_read_clip_detection(dev, clip_state);
+        b43_nphy_write_clip_detection(dev, clip_off);
+
+        saved_regs_phy_rfctl[0] = b43_phy_read(dev, B43_NPHY_RFCTL_INTC1);
+        saved_regs_phy_rfctl[1] = b43_phy_read(dev, B43_NPHY_RFCTL_INTC2);
+        for (i = 0; i < ARRAY_SIZE(regs_to_store); i++)
+                saved_regs_phy[i] = b43_phy_read(dev, regs_to_store[i]);
+
+        b43_nphy_rf_control_intc_override(dev, 0, 0, 7);
+        b43_nphy_rf_control_intc_override(dev, 1, 1, 7);
+        b43_nphy_rf_control_override(dev, 0x1, 0, 0, false);
+        b43_nphy_rf_control_override(dev, 0x2, 1, 0, false);
+        b43_nphy_rf_control_override(dev, 0x80, 1, 0, false);
+        b43_nphy_rf_control_override(dev, 0x40, 1, 0, false);
+
+        if (b43_current_band(dev->wl) == IEEE80211_BAND_5GHZ) {
+                b43_nphy_rf_control_override(dev, 0x20, 0, 0, false);
+                b43_nphy_rf_control_override(dev, 0x10, 1, 0, false);
+        } else {
+                b43_nphy_rf_control_override(dev, 0x10, 0, 0, false);
+                b43_nphy_rf_control_override(dev, 0x20, 1, 0, false);
+        }
+
+        rx_core_state = b43_nphy_get_rx_core_state(dev);
+        for (core = 0; core < 2; core++) {
+                if (!(rx_core_state & (1 << core)))
+                        continue;
+                r = core ? B2056_RX1 : B2056_RX0;
+                b43_nphy_scale_offset_rssi(dev, 0, 0, core + 1, 0, 2);
+                b43_nphy_scale_offset_rssi(dev, 0, 0, core + 1, 1, 2);
+                for (i = 0; i < 8; i++) {
+                        b43_radio_maskset(dev, r | B2056_RX_RSSI_MISC, 0xE3,
+                                        i << 2);
+                        b43_nphy_poll_rssi(dev, 2, results[i], 8);
+                }
+                for (i = 0; i < 4; i++) {
+                        s32 curr;
+                        s32 mind = 40;
+                        s32 minpoll = 249;
+                        u8 minvcm = 0;
+                        if (2 * core != i)
+                                continue;
+                        for (j = 0; j < 8; j++) {
+                                curr = results[j][i] * results[j][i] +
+                                        results[j][i + 1] * results[j][i];
+                                if (curr < mind) {
+                                        mind = curr;
+                                        minvcm = j;
+                                }
+                                if (results[j][i] < minpoll)
+                                        minpoll = results[j][i];
+                        }
+                        vcm_final = minvcm;
+                        results_min[i] = minpoll;
+                }
+                b43_radio_maskset(dev, r | B2056_RX_RSSI_MISC, 0xE3,
+                                  vcm_final << 2);
+                for (i = 0; i < 4; i++) {
+                        if (core != i / 2)
+                                continue;
+                        offset[i] = -results[vcm_final][i];
+                        if (offset[i] < 0)
+                                offset[i] = -((abs(offset[i]) + 4) / 8);
+                        else
+                                offset[i] = (offset[i] + 4) / 8;
+                        if (results_min[i] == 248)
+                                offset[i] = -32;
+                        b43_nphy_scale_offset_rssi(dev, 0, offset[i],
+                                                   (i / 2 == 0) ? 1 : 2,
+                                                   (i % 2 == 0) ? 0 : 1,
+                                                   2);
+                }
+        }
+        for (core = 0; core < 2; core++) {
+                if (!(rx_core_state & (1 << core)))
+                        continue;
+                for (i = 0; i < 2; i++) {
+                        b43_nphy_scale_offset_rssi(dev, 0, 0, core + 1, 0, i);
+                        b43_nphy_scale_offset_rssi(dev, 0, 0, core + 1, 1, i);
+                        b43_nphy_poll_rssi(dev, i, poll_results, 8);
+                        for (j = 0; j < 4; j++) {
+                                if (j / 2 == core)
+                                        offset[j] = 232 - poll_results[j];
+                                if (offset[j] < 0)
+                                        offset[j] = -(abs(offset[j] + 4) / 8);
+                                else
+                                        offset[j] = (offset[j] + 4) / 8;
+                                b43_nphy_scale_offset_rssi(dev, 0,
+                                        offset[2 * core], core + 1, j % 2, i);
+                        }
+                }
+        }
+
+        b43_phy_write(dev, B43_NPHY_RFCTL_INTC1, saved_regs_phy_rfctl[0]);
+        b43_phy_write(dev, B43_NPHY_RFCTL_INTC2, saved_regs_phy_rfctl[1]);
+
+        b43_nphy_force_rf_sequence(dev, B43_RFSEQ_RESET2RX);
+
+        b43_phy_set(dev, B43_NPHY_TXF_40CO_B1S1, 0x1);
+        b43_phy_set(dev, B43_NPHY_RFCTL_CMD, B43_NPHY_RFCTL_CMD_START);
+        b43_phy_mask(dev, B43_NPHY_TXF_40CO_B1S1, ~0x1);
+
+        b43_phy_set(dev, B43_NPHY_RFCTL_OVER, 0x1);
+        b43_phy_set(dev, B43_NPHY_RFCTL_CMD, B43_NPHY_RFCTL_CMD_RXTX);
+        b43_phy_mask(dev, B43_NPHY_TXF_40CO_B1S1, ~0x1);
+
+        for (i = 0; i < ARRAY_SIZE(regs_to_store); i++)
+                b43_phy_write(dev, regs_to_store[i], saved_regs_phy[i]);
+
+        /* Store for future configuration */
+        if (b43_current_band(dev->wl) == IEEE80211_BAND_2GHZ) {
+                rssical_radio_regs = nphy->rssical_cache.rssical_radio_regs_2G;
+                rssical_phy_regs = nphy->rssical_cache.rssical_phy_regs_2G;
+        } else {
+                rssical_radio_regs = nphy->rssical_cache.rssical_radio_regs_5G;
+                rssical_phy_regs = nphy->rssical_cache.rssical_phy_regs_5G;
+        }
+        rssical_radio_regs[0] = b43_radio_read(dev, 0x602B);
+        rssical_radio_regs[0] = b43_radio_read(dev, 0x702B);
+        rssical_phy_regs[0] = b43_phy_read(dev, B43_NPHY_RSSIMC_0I_RSSI_Z);
+        rssical_phy_regs[1] = b43_phy_read(dev, B43_NPHY_RSSIMC_0Q_RSSI_Z);
+        rssical_phy_regs[2] = b43_phy_read(dev, B43_NPHY_RSSIMC_1I_RSSI_Z);
+        rssical_phy_regs[3] = b43_phy_read(dev, B43_NPHY_RSSIMC_1Q_RSSI_Z);
+        rssical_phy_regs[4] = b43_phy_read(dev, B43_NPHY_RSSIMC_0I_RSSI_X);
+        rssical_phy_regs[5] = b43_phy_read(dev, B43_NPHY_RSSIMC_0Q_RSSI_X);
+        rssical_phy_regs[6] = b43_phy_read(dev, B43_NPHY_RSSIMC_1I_RSSI_X);
+        rssical_phy_regs[7] = b43_phy_read(dev, B43_NPHY_RSSIMC_1Q_RSSI_X);
+        rssical_phy_regs[8] = b43_phy_read(dev, B43_NPHY_RSSIMC_0I_RSSI_Y);
+        rssical_phy_regs[9] = b43_phy_read(dev, B43_NPHY_RSSIMC_0Q_RSSI_Y);
+        rssical_phy_regs[10] = b43_phy_read(dev, B43_NPHY_RSSIMC_1I_RSSI_Y);
+        rssical_phy_regs[11] = b43_phy_read(dev, B43_NPHY_RSSIMC_1Q_RSSI_Y);
+
+        /* Remember for which channel we store configuration */
+        if (b43_current_band(dev->wl) == IEEE80211_BAND_2GHZ)
+                nphy->rssical_chanspec_2G.center_freq = dev->phy.channel_freq;
+        else
+                nphy->rssical_chanspec_5G.center_freq = dev->phy.channel_freq;
+
+        /* End of calibration, restore configuration */
+        b43_nphy_classifier(dev, 7, class);
+        b43_nphy_write_clip_detection(dev, clip_state);
+}
+
 /* http://bcm-v4.sipsolutions.net/802.11/PHY/N/RSSICal */
 static void b43_nphy_rev2_rssi_cal(struct b43_wldev *dev, u8 type)
 {
@@ -1472,12 +1641,6 @@ static void b43_nphy_rev2_rssi_cal(struct b43_wldev *dev, u8 type)
         b43_nphy_reset_cca(dev);
 }
 
-/* http://bcm-v4.sipsolutions.net/802.11/PHY/N/RSSICalRev3 */
-static void b43_nphy_rev3_rssi_cal(struct b43_wldev *dev)
-{
-        /* TODO */
-}
-
 /*
  * RSSI Calibration
  * http://bcm-v4.sipsolutions.net/802.11/PHY/N/RSSICal
@@ -2229,27 +2392,12 @@ static void b43_nphy_tx_power_fix(struct b43_wldev *dev)
         */
 
         for (i = 0; i < 2; i++) {
-                if (dev->phy.rev >= 3) {
-                        if (b43_nphy_ipa(dev)) {
-                                txgain = *(b43_nphy_get_ipa_gain_table(dev) +
-                                                txpi[i]);
-                        } else if (b43_current_band(dev->wl) ==
-                                   IEEE80211_BAND_5GHZ) {
-                                /* FIXME: use 5GHz tables */
-                                txgain =
-                                        b43_ntab_tx_gain_rev3plus_2ghz[txpi[i]];
-                        } else {
-                                if (dev->phy.rev >= 5 &&
-                                    sprom->fem.ghz5.extpa_gain == 3)
-                                        ; /* FIXME: 5GHz_txgain_HiPwrEPA */
-                                txgain =
-                                        b43_ntab_tx_gain_rev3plus_2ghz[txpi[i]];
-                        }
+                txgain = *(b43_nphy_get_tx_gain_table(dev) + txpi[i]);
+
+                if (dev->phy.rev >= 3)
                         radio_gain = (txgain >> 16) & 0x1FFFF;
-                } else {
-                        txgain = b43_ntab_tx_gain_rev0_1_2[txpi[i]];
+                else
                         radio_gain = (txgain >> 16) & 0x1FFF;
-                }
 
                 if (dev->phy.rev >= 7)
                         dac_gain = (txgain >> 8) & 0x7;
@@ -2420,55 +2568,252 @@ static void b43_nphy_tx_power_ctl_idle_tssi(struct b43_wldev *dev)
         nphy->pwr_ctl_info[1].idle_tssi_2g = (tmp >> 8) & 0xFF;
 }
 
-static void b43_nphy_tx_gain_table_upload(struct b43_wldev *dev)
+/* http://bcm-v4.sipsolutions.net/PHY/N/TxPwrLimitToTbl */
+static void b43_nphy_tx_prepare_adjusted_power_table(struct b43_wldev *dev)
 {
-        struct b43_phy *phy = &dev->phy;
+        struct b43_phy_n *nphy = dev->phy.n;
 
-        const u32 *table = NULL;
-#if 0
-        TODO: b43_ntab_papd_pga_gain_delta_ipa_2*
-        u32 rfpwr_offset;
-        u8 pga_gain;
-        int i;
-#endif
+        u8 idx, delta;
+        u8 i, stf_mode;
 
-        if (phy->rev >= 3) {
-                if (b43_nphy_ipa(dev)) {
-                        table = b43_nphy_get_ipa_gain_table(dev);
+        for (i = 0; i < 4; i++)
+                nphy->adj_pwr_tbl[i] = nphy->tx_power_offset[i];
+
+        for (stf_mode = 0; stf_mode < 4; stf_mode++) {
+                delta = 0;
+                switch (stf_mode) {
+                case 0:
+                        if (dev->phy.is_40mhz && dev->phy.rev >= 5) {
+                                idx = 68;
+                        } else {
+                                delta = 1;
+                                idx = dev->phy.is_40mhz ? 52 : 4;
+                        }
+                        break;
+                case 1:
+                        idx = dev->phy.is_40mhz ? 76 : 28;
+                        break;
+                case 2:
+                        idx = dev->phy.is_40mhz ? 84 : 36;
+                        break;
+                case 3:
+                        idx = dev->phy.is_40mhz ? 92 : 44;
+                        break;
+                }
+
+                for (i = 0; i < 20; i++) {
+                        nphy->adj_pwr_tbl[4 + 4 * i + stf_mode] =
+                                nphy->tx_power_offset[idx];
+                        if (i == 0)
+                                idx += delta;
+                        if (i == 14)
+                                idx += 1 - delta;
+                        if (i == 3 || i == 4 || i == 7 || i == 8 || i == 11 ||
+                            i == 13)
+                                idx += 1;
+                }
+        }
+}
+
+/* http://bcm-v4.sipsolutions.net/802.11/PHY/N/TxPwrCtrlSetup */
+static void b43_nphy_tx_power_ctl_setup(struct b43_wldev *dev)
+{
+        struct b43_phy_n *nphy = dev->phy.n;
+        struct ssb_sprom *sprom = dev->dev->bus_sprom;
+
+        s16 a1[2], b0[2], b1[2];
+        u8 idle[2];
+        s8 target[2];
+        s32 num, den, pwr;
+        u32 regval[64];
+
+        u16 freq = dev->phy.channel_freq;
+        u16 tmp;
+        u16 r; /* routing */
+        u8 i, c;
+
+        if (dev->dev->core_rev == 11 || dev->dev->core_rev == 12) {
+                b43_maskset32(dev, B43_MMIO_MACCTL, ~0, 0x200000);
+                b43_read32(dev, B43_MMIO_MACCTL);
+                udelay(1);
+        }
+
+        if (nphy->hang_avoid)
+                b43_nphy_stay_in_carrier_search(dev, true);
+
+        b43_phy_set(dev, B43_NPHY_TSSIMODE, B43_NPHY_TSSIMODE_EN);
+        if (dev->phy.rev >= 3)
+                b43_phy_mask(dev, B43_NPHY_TXPCTL_CMD,
+                             ~B43_NPHY_TXPCTL_CMD_PCTLEN & 0xFFFF);
+        else
+                b43_phy_set(dev, B43_NPHY_TXPCTL_CMD,
+                            B43_NPHY_TXPCTL_CMD_PCTLEN);
+
+        if (dev->dev->core_rev == 11 || dev->dev->core_rev == 12)
+                b43_maskset32(dev, B43_MMIO_MACCTL, ~0x200000, 0);
+
+        if (sprom->revision < 4) {
+                idle[0] = nphy->pwr_ctl_info[0].idle_tssi_2g;
+                idle[1] = nphy->pwr_ctl_info[1].idle_tssi_2g;
+                target[0] = target[1] = 52;
+                a1[0] = a1[1] = -424;
+                b0[0] = b0[1] = 5612;
+                b1[0] = b1[1] = -1393;
+        } else {
+                if (b43_current_band(dev->wl) == IEEE80211_BAND_2GHZ) {
+                        for (c = 0; c < 2; c++) {
+                                idle[c] = nphy->pwr_ctl_info[c].idle_tssi_2g;
+                                target[c] = sprom->core_pwr_info[c].maxpwr_2g;
+                                a1[c] = sprom->core_pwr_info[c].pa_2g[0];
+                                b0[c] = sprom->core_pwr_info[c].pa_2g[1];
+                                b1[c] = sprom->core_pwr_info[c].pa_2g[2];
+                        }
+                } else if (freq >= 4900 && freq < 5100) {
+                        for (c = 0; c < 2; c++) {
+                                idle[c] = nphy->pwr_ctl_info[c].idle_tssi_5g;
+                                target[c] = sprom->core_pwr_info[c].maxpwr_5gl;
+                                a1[c] = sprom->core_pwr_info[c].pa_5gl[0];
+                                b0[c] = sprom->core_pwr_info[c].pa_5gl[1];
+                                b1[c] = sprom->core_pwr_info[c].pa_5gl[2];
+                        }
+                } else if (freq >= 5100 && freq < 5500) {
+                        for (c = 0; c < 2; c++) {
+                                idle[c] = nphy->pwr_ctl_info[c].idle_tssi_5g;
+                                target[c] = sprom->core_pwr_info[c].maxpwr_5g;
+                                a1[c] = sprom->core_pwr_info[c].pa_5g[0];
+                                b0[c] = sprom->core_pwr_info[c].pa_5g[1];
+                                b1[c] = sprom->core_pwr_info[c].pa_5g[2];
+                        }
+                } else if (freq >= 5500) {
+                        for (c = 0; c < 2; c++) {
+                                idle[c] = nphy->pwr_ctl_info[c].idle_tssi_5g;
+                                target[c] = sprom->core_pwr_info[c].maxpwr_5gh;
+                                a1[c] = sprom->core_pwr_info[c].pa_5gh[0];
+                                b0[c] = sprom->core_pwr_info[c].pa_5gh[1];
+                                b1[c] = sprom->core_pwr_info[c].pa_5gh[2];
+                        }
                 } else {
-                        if (b43_current_band(dev->wl) == IEEE80211_BAND_5GHZ) {
-                                if (phy->rev == 3)
-                                        table = b43_ntab_tx_gain_rev3_5ghz;
-                                if (phy->rev == 4)
-                                        table = b43_ntab_tx_gain_rev4_5ghz;
-                                else
-                                        table = b43_ntab_tx_gain_rev5plus_5ghz;
+                        idle[0] = nphy->pwr_ctl_info[0].idle_tssi_5g;
+                        idle[1] = nphy->pwr_ctl_info[1].idle_tssi_5g;
+                        target[0] = target[1] = 52;
+                        a1[0] = a1[1] = -424;
+                        b0[0] = b0[1] = 5612;
+                        b1[0] = b1[1] = -1393;
+                }
+        }
+        /* target[0] = target[1] = nphy->tx_power_max; */
+
+        if (dev->phy.rev >= 3) {
+                if (sprom->fem.ghz2.tssipos)
+                        b43_phy_set(dev, B43_NPHY_TXPCTL_ITSSI, 0x4000);
+                if (dev->phy.rev >= 7) {
+                        for (c = 0; c < 2; c++) {
+                                r = c ? 0x190 : 0x170;
+                                if (b43_nphy_ipa(dev))
+                                        b43_radio_write(dev, r + 0x9, (b43_current_band(dev->wl) == IEEE80211_BAND_2GHZ) ? 0xE : 0xC);
+                        }
+                } else {
+                        if (b43_nphy_ipa(dev)) {
+                                tmp = (b43_current_band(dev->wl) == IEEE80211_BAND_5GHZ) ? 0xC : 0xE;
+                                b43_radio_write(dev,
+                                        B2056_TX0 | B2056_TX_TX_SSI_MUX, tmp);
+                                b43_radio_write(dev,
+                                        B2056_TX1 | B2056_TX_TX_SSI_MUX, tmp);
                         } else {
-                                table = b43_ntab_tx_gain_rev3plus_2ghz;
+                                b43_radio_write(dev,
+                                        B2056_TX0 | B2056_TX_TX_SSI_MUX, 0x11);
+                                b43_radio_write(dev,
+                                        B2056_TX1 | B2056_TX_TX_SSI_MUX, 0x11);
                         }
                 }
+        }
+
+        if (dev->dev->core_rev == 11 || dev->dev->core_rev == 12) {
+                b43_maskset32(dev, B43_MMIO_MACCTL, ~0, 0x200000);
+                b43_read32(dev, B43_MMIO_MACCTL);
+                udelay(1);
+        }
+
+        if (dev->phy.rev >= 7) {
+                b43_phy_maskset(dev, B43_NPHY_TXPCTL_CMD,
+                                ~B43_NPHY_TXPCTL_CMD_INIT, 0x19);
+                b43_phy_maskset(dev, B43_NPHY_TXPCTL_INIT,
+                                ~B43_NPHY_TXPCTL_INIT_PIDXI1, 0x19);
         } else {
-                table = b43_ntab_tx_gain_rev0_1_2;
+                b43_phy_maskset(dev, B43_NPHY_TXPCTL_CMD,
+                                ~B43_NPHY_TXPCTL_CMD_INIT, 0x40);
+                if (dev->phy.rev > 1)
+                        b43_phy_maskset(dev, B43_NPHY_TXPCTL_INIT,
+                                ~B43_NPHY_TXPCTL_INIT_PIDXI1, 0x40);
+        }
+
+        if (dev->dev->core_rev == 11 || dev->dev->core_rev == 12)
+                b43_maskset32(dev, B43_MMIO_MACCTL, ~0x200000, 0);
+
+        b43_phy_write(dev, B43_NPHY_TXPCTL_N,
+                      0xF0 << B43_NPHY_TXPCTL_N_TSSID_SHIFT |
+                      3 << B43_NPHY_TXPCTL_N_NPTIL2_SHIFT);
+        b43_phy_write(dev, B43_NPHY_TXPCTL_ITSSI,
+                      idle[0] << B43_NPHY_TXPCTL_ITSSI_0_SHIFT |
+                      idle[1] << B43_NPHY_TXPCTL_ITSSI_1_SHIFT |
+                      B43_NPHY_TXPCTL_ITSSI_BINF);
+        b43_phy_write(dev, B43_NPHY_TXPCTL_TPWR,
+                      target[0] << B43_NPHY_TXPCTL_TPWR_0_SHIFT |
+                      target[1] << B43_NPHY_TXPCTL_TPWR_1_SHIFT);
+
+        for (c = 0; c < 2; c++) {
+                for (i = 0; i < 64; i++) {
+                        num = 8 * (16 * b0[c] + b1[c] * i);
+                        den = 32768 + a1[c] * i;
+                        pwr = max((4 * num + den / 2) / den, -8);
+                        if (dev->phy.rev < 3 && (i <= (31 - idle[c] + 1)))
+                                pwr = max(pwr, target[c] + 1);
+                        regval[i] = pwr;
+                }
+                b43_ntab_write_bulk(dev, B43_NTAB32(26 + c, 0), 64, regval);
         }
+
+        b43_nphy_tx_prepare_adjusted_power_table(dev);
+        /*
+        b43_ntab_write_bulk(dev, B43_NTAB16(26, 64), 84, nphy->adj_pwr_tbl);
+        b43_ntab_write_bulk(dev, B43_NTAB16(27, 64), 84, nphy->adj_pwr_tbl);
+        */
+
+        if (nphy->hang_avoid)
+                b43_nphy_stay_in_carrier_search(dev, false);
+}
+
+static void b43_nphy_tx_gain_table_upload(struct b43_wldev *dev)
+{
+        struct b43_phy *phy = &dev->phy;
+
+        const u32 *table = NULL;
+        u32 rfpwr_offset;
+        u8 pga_gain;
+        int i;
+
+        table = b43_nphy_get_tx_gain_table(dev);
         b43_ntab_write_bulk(dev, B43_NTAB32(26, 192), 128, table);
         b43_ntab_write_bulk(dev, B43_NTAB32(27, 192), 128, table);
 
         if (phy->rev >= 3) {
 #if 0
                 nphy->gmval = (table[0] >> 16) & 0x7000;
+#endif
 
                 for (i = 0; i < 128; i++) {
                         pga_gain = (table[i] >> 24) & 0xF;
                         if (b43_current_band(dev->wl) == IEEE80211_BAND_2GHZ)
-                                rfpwr_offset = b43_ntab_papd_pga_gain_delta_ipa_2g[pga_gain];
+                                rfpwr_offset =
+                                 b43_ntab_papd_pga_gain_delta_ipa_2g[pga_gain];
                         else
-                                rfpwr_offset = b43_ntab_papd_pga_gain_delta_ipa_5g[pga_gain];
+                                rfpwr_offset =
+                                 0; /* FIXME */
                         b43_ntab_write(dev, B43_NTAB32(26, 576 + i),
                                        rfpwr_offset);
                         b43_ntab_write(dev, B43_NTAB32(27, 576 + i),
                                        rfpwr_offset);
                 }
-#endif
         }
 }
 
@@ -3139,32 +3484,13 @@ static struct nphy_txgains b43_nphy_get_tx_gains(struct b43_wldev *dev)
                         B43_NPHY_TXPCTL_STAT_BIDX_SHIFT;
 
                 for (i = 0; i < 2; ++i) {
+                        table = b43_nphy_get_tx_gain_table(dev);
                         if (dev->phy.rev >= 3) {
-                                enum ieee80211_band band =
-                                        b43_current_band(dev->wl);
-
-                                if (b43_nphy_ipa(dev)) {
-                                        table = b43_nphy_get_ipa_gain_table(dev);
-                                } else {
-                                        if (band == IEEE80211_BAND_5GHZ) {
-                                                if (dev->phy.rev == 3)
-                                                        table = b43_ntab_tx_gain_rev3_5ghz;
-                                                else if (dev->phy.rev == 4)
-                                                        table = b43_ntab_tx_gain_rev4_5ghz;
-                                                else
-                                                        table = b43_ntab_tx_gain_rev5plus_5ghz;
-                                        } else {
-                                                table = b43_ntab_tx_gain_rev3plus_2ghz;
-                                        }
-                                }
-
                                 target.ipa[i] = (table[index[i]] >> 16) & 0xF;
                                 target.pad[i] = (table[index[i]] >> 20) & 0xF;
                                 target.pga[i] = (table[index[i]] >> 24) & 0xF;
                                 target.txgm[i] = (table[index[i]] >> 28) & 0xF;
                         } else {
-                                table = b43_ntab_tx_gain_rev0_1_2;
-
                                 target.ipa[i] = (table[index[i]] >> 16) & 0x3;
                                 target.pad[i] = (table[index[i]] >> 18) & 0x3;
                                 target.pga[i] = (table[index[i]] >> 20) & 0x7;
@@ -3968,13 +4294,10 @@ static void b43_nphy_superswitch_init(struct b43_wldev *dev, bool init)
 #endif
                 }
 
-                b43_write32(dev, B43_MMIO_MACCTL,
-                        b43_read32(dev, B43_MMIO_MACCTL) &
-                        ~B43_MACCTL_GPOUTSMSK);
-                b43_write16(dev, B43_MMIO_GPIO_MASK,
-                        b43_read16(dev, B43_MMIO_GPIO_MASK) | 0xFC00);
-                b43_write16(dev, B43_MMIO_GPIO_CONTROL,
-                        b43_read16(dev, B43_MMIO_GPIO_CONTROL) & ~0xFC00);
+                b43_maskset32(dev, B43_MMIO_MACCTL, ~B43_MACCTL_GPOUTSMSK, 0);
+                b43_maskset16(dev, B43_MMIO_GPIO_MASK, ~0, 0xFC00);
+                b43_maskset16(dev, B43_MMIO_GPIO_CONTROL, (~0xFC00 & 0xFFFF),
+                              0);
 
                 if (init) {
                         b43_phy_write(dev, B43_NPHY_RFCTL_LUT_TRSW_LO1, 0x2D8);
@@ -4110,7 +4433,7 @@ int b43_phy_initn(struct b43_wldev *dev)
         b43_nphy_tx_power_ctrl(dev, false);
         b43_nphy_tx_power_fix(dev);
         b43_nphy_tx_power_ctl_idle_tssi(dev);
-        /* TODO N PHY TX Power Control Setup */
+        b43_nphy_tx_power_ctl_setup(dev);
         b43_nphy_tx_gain_table_upload(dev);
 
         if (nphy->phyrxchain != 3)
@@ -4530,8 +4853,7 @@ static void b43_nphy_op_maskset(struct b43_wldev *dev, u16 reg, u16 mask,
 {
         check_phyreg(dev, reg);
         b43_write16(dev, B43_MMIO_PHY_CONTROL, reg);
-        b43_write16(dev, B43_MMIO_PHY_DATA,
-                    (b43_read16(dev, B43_MMIO_PHY_DATA) & mask) | set);
+        b43_maskset16(dev, B43_MMIO_PHY_DATA, mask, set);
 }
 
 static u16 b43_nphy_op_radio_read(struct b43_wldev *dev, u16 reg)
diff --git a/drivers/net/wireless/b43/phy_n.h b/drivers/net/wireless/b43/phy_n.h
index 5de8f74cc02f..fd12b386fea1 100644
--- a/drivers/net/wireless/b43/phy_n.h
+++ b/drivers/net/wireless/b43/phy_n.h
@@ -798,6 +798,7 @@ struct b43_phy_n {
         bool txpwrctrl;
         bool pwg_gain_5ghz;
         u8 tx_pwr_idx[2];
+        s8 tx_power_offset[101];
         u16 adj_pwr_tbl[84];
         u16 txcal_bbmult;
         u16 txiqlocal_bestc[11];
diff --git a/drivers/net/wireless/b43/tables_nphy.c b/drivers/net/wireless/b43/tables_nphy.c
index f7def13524dd..f0d8377429c6 100644
--- a/drivers/net/wireless/b43/tables_nphy.c
+++ b/drivers/net/wireless/b43/tables_nphy.c
@@ -2214,7 +2214,7 @@ static const u16 b43_ntab_antswctl2g_r3[4][32] = {
 };
 
 /* TX gain tables */
-const u32 b43_ntab_tx_gain_rev0_1_2[] = {
+static const u32 b43_ntab_tx_gain_rev0_1_2[] = {
         0x03cc2b44, 0x03cc2b42, 0x03cc2a44, 0x03cc2a42,
         0x03cc2944, 0x03c82b44, 0x03c82b42, 0x03c82a44,
         0x03c82a42, 0x03c82944, 0x03c82942, 0x03c82844,
@@ -2249,7 +2249,7 @@ const u32 b43_ntab_tx_gain_rev0_1_2[] = {
         0x03801442, 0x03801344, 0x03801342, 0x00002b00,
 };
 
-const u32 b43_ntab_tx_gain_rev3plus_2ghz[] = {
+static const u32 b43_ntab_tx_gain_rev3plus_2ghz[] = {
         0x1f410044, 0x1f410042, 0x1f410040, 0x1f41003e,
         0x1f41003c, 0x1f41003b, 0x1f410039, 0x1f410037,
         0x1e410044, 0x1e410042, 0x1e410040, 0x1e41003e,
@@ -2284,7 +2284,7 @@ const u32 b43_ntab_tx_gain_rev3plus_2ghz[] = {
         0x1041003c, 0x1041003b, 0x10410039, 0x10410037,
 };
 
-const u32 b43_ntab_tx_gain_rev3_5ghz[] = {
+static const u32 b43_ntab_tx_gain_rev3_5ghz[] = {
         0xcff70044, 0xcff70042, 0xcff70040, 0xcff7003e,
         0xcff7003c, 0xcff7003b, 0xcff70039, 0xcff70037,
         0xcef70044, 0xcef70042, 0xcef70040, 0xcef7003e,
@@ -2319,7 +2319,7 @@ const u32 b43_ntab_tx_gain_rev3_5ghz[] = {
         0xc0f7003c, 0xc0f7003b, 0xc0f70039, 0xc0f70037,
 };
 
-const u32 b43_ntab_tx_gain_rev4_5ghz[] = {
+static const u32 b43_ntab_tx_gain_rev4_5ghz[] = {
         0x2ff20044, 0x2ff20042, 0x2ff20040, 0x2ff2003e,
         0x2ff2003c, 0x2ff2003b, 0x2ff20039, 0x2ff20037,
         0x2ef20044, 0x2ef20042, 0x2ef20040, 0x2ef2003e,
@@ -2354,7 +2354,7 @@ const u32 b43_ntab_tx_gain_rev4_5ghz[] = {
         0x20d2003a, 0x20d20038, 0x20d20036, 0x20d20034,
 };
 
-const u32 b43_ntab_tx_gain_rev5plus_5ghz[] = {
+static const u32 b43_ntab_tx_gain_rev5plus_5ghz[] = {
         0x0f62004a, 0x0f620048, 0x0f620046, 0x0f620044,
         0x0f620042, 0x0f620040, 0x0f62003e, 0x0f62003c,
         0x0e620044, 0x0e620042, 0x0e620040, 0x0e62003e,
@@ -2389,7 +2389,7 @@ const u32 b43_ntab_tx_gain_rev5plus_5ghz[] = {
         0x0062003b, 0x00620039, 0x00620037, 0x00620035,
 };
 
-const u32 txpwrctrl_tx_gain_ipa[] = {
+static const u32 txpwrctrl_tx_gain_ipa[] = {
         0x5ff7002d, 0x5ff7002b, 0x5ff7002a, 0x5ff70029,
         0x5ff70028, 0x5ff70027, 0x5ff70026, 0x5ff70025,
         0x5ef7002d, 0x5ef7002b, 0x5ef7002a, 0x5ef70029,
@@ -2424,7 +2424,7 @@ const u32 txpwrctrl_tx_gain_ipa[] = {
         0x50f70028, 0x50f70027, 0x50f70026, 0x50f70025,
 };
 
-const u32 txpwrctrl_tx_gain_ipa_rev5[] = {
+static const u32 txpwrctrl_tx_gain_ipa_rev5[] = {
         0x1ff7002d, 0x1ff7002b, 0x1ff7002a, 0x1ff70029,
         0x1ff70028, 0x1ff70027, 0x1ff70026, 0x1ff70025,
         0x1ef7002d, 0x1ef7002b, 0x1ef7002a, 0x1ef70029,
@@ -2459,7 +2459,7 @@ const u32 txpwrctrl_tx_gain_ipa_rev5[] = {
         0x10f70028, 0x10f70027, 0x10f70026, 0x10f70025,
 };
 
-const u32 txpwrctrl_tx_gain_ipa_rev6[] = {
+static const u32 txpwrctrl_tx_gain_ipa_rev6[] = {
         0x0ff7002d, 0x0ff7002b, 0x0ff7002a, 0x0ff70029,
         0x0ff70028, 0x0ff70027, 0x0ff70026, 0x0ff70025,
         0x0ef7002d, 0x0ef7002b, 0x0ef7002a, 0x0ef70029,
@@ -2494,7 +2494,7 @@ const u32 txpwrctrl_tx_gain_ipa_rev6[] = {
         0x00f70028, 0x00f70027, 0x00f70026, 0x00f70025,
 };
 
-const u32 txpwrctrl_tx_gain_ipa_5g[] = {
+static const u32 txpwrctrl_tx_gain_ipa_5g[] = {
         0x7ff70035, 0x7ff70033, 0x7ff70032, 0x7ff70031,
         0x7ff7002f, 0x7ff7002e, 0x7ff7002d, 0x7ff7002b,
         0x7ff7002a, 0x7ff70029, 0x7ff70028, 0x7ff70027,
@@ -2529,6 +2529,11 @@ const u32 txpwrctrl_tx_gain_ipa_5g[] = {
         0x70f70021, 0x70f70020, 0x70f70020, 0x70f7001f,
 };
 
+const s8 b43_ntab_papd_pga_gain_delta_ipa_2g[] = {
+        -114, -108, -98, -91, -84, -78, -70, -62,
+        -54, -46, -39, -31, -23, -15, -8, 0
+};
+
 const u16 tbl_iqcal_gainparams[2][9][8] = {
         {
                 { 0x000, 0, 0, 2, 0x69, 0x69, 0x69, 0x69 },
@@ -2739,11 +2744,11 @@ const struct nphy_rf_control_override_rev3 tbl_rf_control_override_rev3[] = {
         { 0x0001,  0, 0xE7, 0x7A, 0xEC, 0x7D }, /* field == 0x0002 (fls 2) */
         { 0x0002,  1, 0xE7, 0x7A, 0xEC, 0x7D }, /* field == 0x0004 (fls 3) */
         { 0x0004,  2, 0xE7, 0x7A, 0xEC, 0x7D }, /* field == 0x0008 (fls 4) */
-        { 0x0016,  4, 0xE7, 0x7A, 0xEC, 0x7D }, /* field == 0x0010 (fls 5) */
+        { 0x0010,  4, 0xE7, 0x7A, 0xEC, 0x7D }, /* field == 0x0010 (fls 5) */
         { 0x0020,  5, 0xE7, 0x7A, 0xEC, 0x7D }, /* field == 0x0020 (fls 6) */
         { 0x0040,  6, 0xE7, 0x7A, 0xEC, 0x7D }, /* field == 0x0040 (fls 7) */
-        { 0x0080,  6, 0xE7, 0x7A, 0xEC, 0x7D }, /* field == 0x0080 (fls 8) */
-        { 0x0100,  7, 0xE7, 0x7A, 0xEC, 0x7D }, /* field == 0x0100 (fls 9) */
+        { 0x0080,  7, 0xE7, 0x7A, 0xEC, 0x7D }, /* field == 0x0080 (fls 8) */
+        { 0x0100,  8, 0xE7, 0x7A, 0xEC, 0x7D }, /* field == 0x0100 (fls 9) */
         { 0x0007,  0, 0xE7, 0xF8, 0xEC, 0xFA }, /* field == 0x0200 (fls 10) */
         { 0x0070,  4, 0xE7, 0xF8, 0xEC, 0xFA }, /* field == 0x0400 (fls 11) */
         { 0xE000, 13, 0xE7, 0x7A, 0xEC, 0x7D }, /* field == 0x0800 (fls 12) */
@@ -3126,6 +3131,53 @@ void b43_nphy_rev3plus_tables_init(struct b43_wldev *dev)
                 B43_WARN_ON(1);
 }
 
+/* http://bcm-v4.sipsolutions.net/802.11/PHY/N/GetIpaGainTbl */
+static const u32 *b43_nphy_get_ipa_gain_table(struct b43_wldev *dev)
+{
+        if (b43_current_band(dev->wl) == IEEE80211_BAND_2GHZ) {
+                if (dev->phy.rev >= 6) {
+                        if (dev->dev->chip_id == 47162)
+                                return txpwrctrl_tx_gain_ipa_rev5;
+                        return txpwrctrl_tx_gain_ipa_rev6;
+                } else if (dev->phy.rev >= 5) {
+                        return txpwrctrl_tx_gain_ipa_rev5;
+                } else {
+                        return txpwrctrl_tx_gain_ipa;
+                }
+        } else {
+                return txpwrctrl_tx_gain_ipa_5g;
+        }
+}
+
+const u32 *b43_nphy_get_tx_gain_table(struct b43_wldev *dev)
+{
+        enum ieee80211_band band = b43_current_band(dev->wl);
+        struct ssb_sprom *sprom = dev->dev->bus_sprom;
+
+        if (dev->phy.rev < 3)
+                return b43_ntab_tx_gain_rev0_1_2;
+
+        /* rev 3+ */
+        if ((dev->phy.n->ipa2g_on && band == IEEE80211_BAND_2GHZ) ||
+            (dev->phy.n->ipa5g_on && band == IEEE80211_BAND_5GHZ)) {
+                return b43_nphy_get_ipa_gain_table(dev);
+        } else if (b43_current_band(dev->wl) == IEEE80211_BAND_5GHZ) {
+                if (dev->phy.rev == 3)
+                        return b43_ntab_tx_gain_rev3_5ghz;
+                if (dev->phy.rev == 4)
+                        return sprom->fem.ghz5.extpa_gain == 3 ?
+                                b43_ntab_tx_gain_rev4_5ghz :
+                                b43_ntab_tx_gain_rev4_5ghz; /* FIXME */
+                else
+                        return b43_ntab_tx_gain_rev5plus_5ghz;
+        } else {
+                if (dev->phy.rev >= 5 && sprom->fem.ghz5.extpa_gain == 3)
+                        return b43_ntab_tx_gain_rev3plus_2ghz; /* FIXME */
+                else
+                        return b43_ntab_tx_gain_rev3plus_2ghz;
+        }
+}
+
 struct nphy_gain_ctl_workaround_entry *b43_nphy_get_gain_ctl_workaround_ent(
         struct b43_wldev *dev, bool ghz5, bool ext_lna)
 {
diff --git a/drivers/net/wireless/b43/tables_nphy.h b/drivers/net/wireless/b43/tables_nphy.h
index 97038c481930..f348953c0230 100644
--- a/drivers/net/wireless/b43/tables_nphy.h
+++ b/drivers/net/wireless/b43/tables_nphy.h
@@ -177,16 +177,10 @@ void b43_ntab_write_bulk(struct b43_wldev *dev, u32 offset,
 void b43_nphy_rev0_1_2_tables_init(struct b43_wldev *dev);
 void b43_nphy_rev3plus_tables_init(struct b43_wldev *dev);
 
-extern const u32 b43_ntab_tx_gain_rev0_1_2[];
-extern const u32 b43_ntab_tx_gain_rev3plus_2ghz[];
-extern const u32 b43_ntab_tx_gain_rev3_5ghz[];
-extern const u32 b43_ntab_tx_gain_rev4_5ghz[];
-extern const u32 b43_ntab_tx_gain_rev5plus_5ghz[];
-
-extern const u32 txpwrctrl_tx_gain_ipa[];
-extern const u32 txpwrctrl_tx_gain_ipa_rev5[];
-extern const u32 txpwrctrl_tx_gain_ipa_rev6[];
-extern const u32 txpwrctrl_tx_gain_ipa_5g[];
+const u32 *b43_nphy_get_tx_gain_table(struct b43_wldev *dev);
+
+extern const s8 b43_ntab_papd_pga_gain_delta_ipa_2g[];
+
 extern const u16 tbl_iqcal_gainparams[2][9][8];
 extern const struct nphy_txiqcal_ladder ladder_lo[];
 extern const struct nphy_txiqcal_ladder ladder_iq[];
diff --git a/drivers/net/wireless/brcm80211/Makefile b/drivers/net/wireless/brcm80211/Makefile
index f41c047eca82..b987920e982e 100644
--- a/drivers/net/wireless/brcm80211/Makefile
+++ b/drivers/net/wireless/brcm80211/Makefile
@@ -16,7 +16,7 @@
 # CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 # common flags
-subdir-ccflags-$(CONFIG_BRCMDBG)        += -DBCMDBG
+subdir-ccflags-$(CONFIG_BRCMDBG)        += -DDEBUG
 
 obj-$(CONFIG_BRCMUTIL)  += brcmutil/
 obj-$(CONFIG_BRCMFMAC)  += brcmfmac/
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c b/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c
index 4bc8d251acf8..e925290b432b 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c
@@ -15,6 +15,8 @@
  */
 /* ****************** SDIO CARD Interface Functions **************************/
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/types.h>
 #include <linux/netdevice.h>
 #include <linux/export.h>
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c b/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c
index 9b8c0ed833d4..ac71adeece51 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c
@@ -13,6 +13,9 @@
  * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
+
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/types.h>
 #include <linux/netdevice.h>
 #include <linux/mmc/sdio.h>
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd.h b/drivers/net/wireless/brcm80211/brcmfmac/dhd.h
index e58ea40a75b0..07686a748d3c 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/dhd.h
+++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd.h
@@ -644,9 +644,9 @@ extern char *brcmf_ifname(struct brcmf_pub *drvr, int idx);
 extern int brcmf_proto_cdc_query_dcmd(struct brcmf_pub *drvr, int ifidx,
                                        uint cmd, void *buf, uint len);
 
-#ifdef BCMDBG
+#ifdef DEBUG
 extern int brcmf_write_to_file(struct brcmf_pub *drvr, const u8 *buf, int size);
-#endif                          /* BCMDBG */
+#endif                          /* DEBUG */
 
 extern int brcmf_ifname2idx(struct brcmf_pub *drvr, char *name);
 extern int brcmf_c_host_event(struct brcmf_pub *drvr, int *idx,
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_cdc.c b/drivers/net/wireless/brcm80211/brcmfmac/dhd_cdc.c
index ac8d1f437888..b3e3b7f25d82 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_cdc.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_cdc.c
@@ -19,6 +19,8 @@
  * For certain dcmd codes, the dongle interprets string data from the host.
  ******************************************************************************/
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/types.h>
 #include <linux/netdevice.h>
 #include <linux/sched.h>
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c b/drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c
index a51d8f5d36fc..4187435220f3 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c
@@ -13,6 +13,9 @@
  * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
+
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/kernel.h>
 #include <linux/string.h>
 #include <linux/sched.h>
@@ -38,7 +41,7 @@
 #define BRCMF_PKT_FILTER_PATTERN_FIXED_LEN      \
         offsetof(struct brcmf_pkt_filter_pattern_le, mask_and_pattern)
 
-#ifdef BCMDBG
+#ifdef DEBUG
 static const char brcmf_version[] =
         "Dongle Host Driver, version " BRCMF_VERSION_STR "\nCompiled on "
         __DATE__ " at " __TIME__;
@@ -133,7 +136,7 @@ bool brcmf_c_prec_enq(struct device *dev, struct pktq *q,
         return p != NULL;
 }
 
-#ifdef BCMDBG
+#ifdef DEBUG
 static void
 brcmf_c_show_host_event(struct brcmf_event_msg *event, void *event_data)
 {
@@ -399,10 +402,10 @@ brcmf_c_show_host_event(struct brcmf_event_msg *event, void *event_data)
                 p = (char *)&buf[sizeof(struct msgtrace_hdr)];
                 while ((s = strstr(p, "\n")) != NULL) {
                         *s = '\0';
-                        printk(KERN_DEBUG"%s\n", p);
+                        pr_debug("%s\n", p);
                         p = s + 1;
                 }
-                printk(KERN_DEBUG "%s\n", p);
+                pr_debug("%s\n", p);
 
                 /* Reset datalen to avoid display below */
                 datalen = 0;
@@ -430,7 +433,7 @@ brcmf_c_show_host_event(struct brcmf_event_msg *event, void *event_data)
                 brcmf_dbg(EVENT, "\n");
         }
 }
-#endif                          /* BCMDBG */
+#endif                          /* DEBUG */
 
 int
 brcmf_c_host_event(struct brcmf_pub *drvr, int *ifidx, void *pktdata,
@@ -518,9 +521,9 @@ brcmf_c_host_event(struct brcmf_pub *drvr, int *ifidx, void *pktdata,
                 break;
         }
 
-#ifdef BCMDBG
+#ifdef DEBUG
         brcmf_c_show_host_event(event, event_data);
-#endif                          /* BCMDBG */
+#endif                          /* DEBUG */
 
         return 0;
 }
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_dbg.h b/drivers/net/wireless/brcm80211/brcmfmac/dhd_dbg.h
index bb26ee36bc68..a2c4576cf9ff 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_dbg.h
+++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_dbg.h
@@ -32,20 +32,20 @@
 #define BRCMF_BTA_VAL   0x1000
 #define BRCMF_ISCAN_VAL 0x2000
 
-#if defined(BCMDBG)
+#if defined(DEBUG)
 
 #define brcmf_dbg(level, fmt, ...)                                      \
 do {                                                                    \
         if (BRCMF_ERROR_VAL == BRCMF_##level##_VAL) {                   \
                 if (brcmf_msg_level & BRCMF_##level##_VAL) {            \
                         if (net_ratelimit())                            \
-                                printk(KERN_DEBUG "%s: " fmt,           \
-                                       __func__, ##__VA_ARGS__);        \
+                                pr_debug("%s: " fmt,                    \
+                                         __func__, ##__VA_ARGS__);      \
                 }                                                       \
         } else {                                                        \
                 if (brcmf_msg_level & BRCMF_##level##_VAL) {            \
-                        printk(KERN_DEBUG "%s: " fmt,                   \
-                               __func__, ##__VA_ARGS__);                \
+                        pr_debug("%s: " fmt,                            \
+                                 __func__, ##__VA_ARGS__);              \
                 }                                                       \
         }                                                               \
 } while (0)
@@ -56,7 +56,7 @@ do {									\
 #define BRCMF_BYTES_ON()        (brcmf_msg_level & BRCMF_BYTES_VAL)
 #define BRCMF_GLOM_ON()         (brcmf_msg_level & BRCMF_GLOM_VAL)
 
-#else   /* (defined BCMDBG) || (defined BCMDBG) */
+#else   /* (defined DEBUG) || (defined DEBUG) */
 
 #define brcmf_dbg(level, fmt, ...) no_printk(fmt, ##__VA_ARGS__)
 
@@ -66,7 +66,13 @@ do {									\
 #define BRCMF_BYTES_ON()        0
 #define BRCMF_GLOM_ON()         0
 
-#endif                          /* defined(BCMDBG) */
+#endif                          /* defined(DEBUG) */
+
+#define brcmf_dbg_hex_dump(test, data, len, fmt, ...)                   \
+do {                                                                    \
+        if (test)                                                       \
+                brcmu_dbg_hex_dump(data, len, fmt, ##__VA_ARGS__);      \
+} while (0)
 
 extern int brcmf_msg_level;
 
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c b/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c
index eb9eb766ac27..db2df1f1e6b2 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c
@@ -14,6 +14,8 @@
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/kthread.h>
@@ -590,8 +592,8 @@ static void brcmf_ethtool_get_drvinfo(struct net_device *ndev,
         sprintf(info->bus_info, "%s", dev_name(drvr->dev));
 }
 
-static struct ethtool_ops brcmf_ethtool_ops = {
-        .get_drvinfo = brcmf_ethtool_get_drvinfo
+static const struct ethtool_ops brcmf_ethtool_ops = {
+        .get_drvinfo = brcmf_ethtool_get_drvinfo,
 };
 
 static int brcmf_ethtool(struct brcmf_pub *drvr, void __user *uaddr)
@@ -1146,7 +1148,7 @@ int brcmf_netdev_wait_pend8021x(struct net_device *ndev)
         return pend;
 }
 
-#ifdef BCMDBG
+#ifdef DEBUG
 int brcmf_write_to_file(struct brcmf_pub *drvr, const u8 *buf, int size)
 {
         int ret = 0;
@@ -1180,4 +1182,4 @@ exit:
 
         return ret;
 }
-#endif                          /* BCMDBG */
+#endif                          /* DEBUG */
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c b/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
index f7eeee1dcdb6..6e4b5e85a099 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
@@ -14,6 +14,8 @@
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/types.h>
 #include <linux/kernel.h>
 #include <linux/kthread.h>
@@ -40,7 +42,7 @@
 
 #define DCMD_RESP_TIMEOUT  2000 /* In milli second */
 
-#ifdef BCMDBG
+#ifdef DEBUG
 
 #define BRCMF_TRAP_INFO_SIZE    80
 
@@ -84,7 +86,7 @@ struct rte_console {
         char cbuf[CBUF_LEN];
 };
 
-#endif                          /* BCMDBG */
+#endif                          /* DEBUG */
 #include <chipcommon.h>
 
 #include "dhd_bus.h"
@@ -416,7 +418,7 @@ struct sdpcmd_regs {
         u16 PAD[0x80];
 };
 
-#ifdef BCMDBG
+#ifdef DEBUG
 /* Device console log buffer state */
 struct brcmf_console {
         uint count;             /* Poll interval msec counter */
@@ -426,7 +428,7 @@ struct brcmf_console {
         u8 *buf;                /* Log buffer (host copy) */
         uint last;              /* Last buffer read index */
 };
-#endif                          /* BCMDBG */
+#endif                          /* DEBUG */
 
 struct sdpcm_shared {
         u32 flags;
@@ -507,11 +509,11 @@ struct brcmf_sdio {
         uint polltick;          /* Tick counter */
         uint pollcnt;           /* Count of active polls */
 
-#ifdef BCMDBG
+#ifdef DEBUG
         uint console_interval;
         struct brcmf_console console;   /* Console output polling support */
         uint console_addr;      /* Console address from shared struct */
-#endif                          /* BCMDBG */
+#endif                          /* DEBUG */
 
         uint regfails;          /* Count of R_REG failures */
 
@@ -587,10 +589,10 @@ struct brcmf_sdio {
 #define CLK_PENDING     2       /* Not used yet */
 #define CLK_AVAIL       3
 
-#ifdef BCMDBG
+#ifdef DEBUG
 static int qcount[NUMPRIO];
 static int tx_packets[NUMPRIO];
-#endif                          /* BCMDBG */
+#endif                          /* DEBUG */
 
 #define SDIO_DRIVE_STRENGTH     6       /* in milliamps */
 
@@ -764,12 +766,12 @@ static int brcmf_sdbrcm_htclk(struct brcmf_sdio *bus, bool on, bool pendok)
                 bus->clkstate = CLK_AVAIL;
                 brcmf_dbg(INFO, "CLKCTL: turned ON\n");
 
-#if defined(BCMDBG)
+#if defined(DEBUG)
                 if (bus->alp_only != true) {
                         if (SBSDIO_ALPONLY(clkctl))
                                 brcmf_dbg(ERROR, "HT Clock should be on\n");
                 }
-#endif                          /* defined (BCMDBG) */
+#endif                          /* defined (DEBUG) */
 
                 bus->activity = true;
         } else {
@@ -814,9 +816,9 @@ static int brcmf_sdbrcm_sdclk(struct brcmf_sdio *bus, bool on)
 /* Transition SD and backplane clock readiness */
 static int brcmf_sdbrcm_clkctl(struct brcmf_sdio *bus, uint target, bool pendok)
 {
-#ifdef BCMDBG
+#ifdef DEBUG
         uint oldstate = bus->clkstate;
-#endif                          /* BCMDBG */
+#endif                          /* DEBUG */
 
         brcmf_dbg(TRACE, "Enter\n");
 
@@ -861,9 +863,9 @@ static int brcmf_sdbrcm_clkctl(struct brcmf_sdio *bus, uint target, bool pendok)
                 brcmf_sdbrcm_wd_timer(bus, 0);
                 break;
         }
-#ifdef BCMDBG
+#ifdef DEBUG
         brcmf_dbg(INFO, "%d -> %d\n", oldstate, bus->clkstate);
-#endif                          /* BCMDBG */
+#endif                          /* DEBUG */
 
         return 0;
 }
@@ -1279,13 +1281,10 @@ static u8 brcmf_sdbrcm_rxglom(struct brcmf_sdio *bus, u8 rxseq)
                         }
                         return 0;
                 }
-#ifdef BCMDBG
-                if (BRCMF_GLOM_ON()) {
-                        printk(KERN_DEBUG "SUPERFRAME:\n");
-                        print_hex_dump_bytes("", DUMP_PREFIX_OFFSET,
-                                pfirst->data, min_t(int, pfirst->len, 48));
-                }
-#endif
+
+                brcmf_dbg_hex_dump(BRCMF_GLOM_ON(),
+                                   pfirst->data, min_t(int, pfirst->len, 48),
+                                   "SUPERFRAME:\n");
 
                 /* Validate the superframe header */
                 dptr = (u8 *) (pfirst->data);
@@ -1362,13 +1361,8 @@ static u8 brcmf_sdbrcm_rxglom(struct brcmf_sdio *bus, u8 rxseq)
                         check = get_unaligned_le16(dptr + sizeof(u16));
                         chan = SDPCM_PACKET_CHANNEL(&dptr[SDPCM_FRAMETAG_LEN]);
                         doff = SDPCM_DOFFSET_VALUE(&dptr[SDPCM_FRAMETAG_LEN]);
-#ifdef BCMDBG
-                        if (BRCMF_GLOM_ON()) {
-                                printk(KERN_DEBUG "subframe:\n");
-                                print_hex_dump_bytes("", DUMP_PREFIX_OFFSET,
-                                                     dptr, 32);
-                        }
-#endif
+                        brcmf_dbg_hex_dump(BRCMF_GLOM_ON(),
+                                           dptr, 32, "subframe:\n");
 
                         if ((u16)~(sublen ^ check)) {
                                 brcmf_dbg(ERROR, "(subframe %d): HW hdr error: len/check 0x%04x/0x%04x\n",
@@ -1433,13 +1427,8 @@ static u8 brcmf_sdbrcm_rxglom(struct brcmf_sdio *bus, u8 rxseq)
                         }
                         rxseq++;
 
-#ifdef BCMDBG
-                        if (BRCMF_BYTES_ON() && BRCMF_DATA_ON()) {
-                                printk(KERN_DEBUG "Rx Subframe Data:\n");
-                                print_hex_dump_bytes("", DUMP_PREFIX_OFFSET,
-                                                     dptr, dlen);
-                        }
-#endif
+                        brcmf_dbg_hex_dump(BRCMF_BYTES_ON() && BRCMF_DATA_ON(),
+                                           dptr, dlen, "Rx Subframe Data:\n");
 
                         __skb_trim(pfirst, sublen);
                         skb_pull(pfirst, doff);
@@ -1457,17 +1446,13 @@ static u8 brcmf_sdbrcm_rxglom(struct brcmf_sdio *bus, u8 rxseq)
                                 continue;
                         }
 
-#ifdef BCMDBG
-                        if (BRCMF_GLOM_ON()) {
-                                brcmf_dbg(GLOM, "subframe %d to stack, %p (%p/%d) nxt/lnk %p/%p\n",
-                                          bus->glom.qlen, pfirst, pfirst->data,
-                                          pfirst->len, pfirst->next,
-                                          pfirst->prev);
-                                print_hex_dump_bytes("", DUMP_PREFIX_OFFSET,
-                                                pfirst->data,
-                                                min_t(int, pfirst->len, 32));
-                        }
-#endif                          /* BCMDBG */
+                        brcmf_dbg_hex_dump(BRCMF_GLOM_ON(),
+                                           pfirst->data,
+                                           min_t(int, pfirst->len, 32),
+                                           "subframe %d to stack, %p (%p/%d) nxt/lnk %p/%p\n",
+                                           bus->glom.qlen, pfirst, pfirst->data,
+                                           pfirst->len, pfirst->next,
+                                           pfirst->prev);
                 }
                 /* sent any remaining packets up */
                 if (bus->glom.qlen) {
@@ -1584,12 +1569,8 @@ brcmf_sdbrcm_read_control(struct brcmf_sdio *bus, u8 *hdr, uint len, uint doff)
 
 gotpkt:
 
-#ifdef BCMDBG
-        if (BRCMF_BYTES_ON() && BRCMF_CTL_ON()) {
-                printk(KERN_DEBUG "RxCtrl:\n");
-                print_hex_dump_bytes("", DUMP_PREFIX_OFFSET, bus->rxctl, len);
-        }
-#endif
+        brcmf_dbg_hex_dump(BRCMF_BYTES_ON() && BRCMF_CTL_ON(),
+                           bus->rxctl, len, "RxCtrl:\n");
 
         /* Point to valid data and indicate its length */
         bus->rxctl += doff;
@@ -1818,17 +1799,13 @@ brcmf_sdbrcm_readframes(struct brcmf_sdio *bus, uint maxframes, bool *finished)
                         }
                         bus->tx_max = txmax;
 
-#ifdef BCMDBG
-                        if (BRCMF_BYTES_ON() && BRCMF_DATA_ON()) {
-                                printk(KERN_DEBUG "Rx Data:\n");
-                                print_hex_dump_bytes("", DUMP_PREFIX_OFFSET,
-                                                     rxbuf, len);
-                        } else if (BRCMF_HDRS_ON()) {
-                                printk(KERN_DEBUG "RxHdr:\n");
-                                print_hex_dump_bytes("", DUMP_PREFIX_OFFSET,
-                                                     bus->rxhdr, SDPCM_HDRLEN);
-                        }
-#endif
+                        brcmf_dbg_hex_dump(BRCMF_BYTES_ON() && BRCMF_DATA_ON(),
+                                           rxbuf, len, "Rx Data:\n");
+                        brcmf_dbg_hex_dump(!(BRCMF_BYTES_ON() &&
+                                             BRCMF_DATA_ON()) &&
+                                           BRCMF_HDRS_ON(),
+                                           bus->rxhdr, SDPCM_HDRLEN,
+                                           "RxHdr:\n");
 
                         if (chan == SDPCM_CONTROL_CHANNEL) {
                                 brcmf_dbg(ERROR, "(nextlen): readahead on control packet %d?\n",
@@ -1865,13 +1842,9 @@ brcmf_sdbrcm_readframes(struct brcmf_sdio *bus, uint maxframes, bool *finished)
                         brcmf_sdbrcm_rxfail(bus, true, true);
                         continue;
                 }
-#ifdef BCMDBG
-                if (BRCMF_BYTES_ON() || BRCMF_HDRS_ON()) {
-                        printk(KERN_DEBUG "RxHdr:\n");
-                        print_hex_dump_bytes("", DUMP_PREFIX_OFFSET,
-                                             bus->rxhdr, SDPCM_HDRLEN);
-                }
-#endif
+                brcmf_dbg_hex_dump(BRCMF_BYTES_ON() || BRCMF_HDRS_ON(),
+                                   bus->rxhdr, SDPCM_HDRLEN, "RxHdr:\n");
+
 
                 /* Extract hardware header fields */
                 len = get_unaligned_le16(bus->rxhdr);
@@ -2024,13 +1997,8 @@ brcmf_sdbrcm_readframes(struct brcmf_sdio *bus, uint maxframes, bool *finished)
                 skb_push(pkt, BRCMF_FIRSTREAD);
                 memcpy(pkt->data, bus->rxhdr, BRCMF_FIRSTREAD);
 
-#ifdef BCMDBG
-                if (BRCMF_BYTES_ON() && BRCMF_DATA_ON()) {
-                        printk(KERN_DEBUG "Rx Data:\n");
-                        print_hex_dump_bytes("", DUMP_PREFIX_OFFSET,
-                                             pkt->data, len);
-                }
-#endif
+                brcmf_dbg_hex_dump(BRCMF_BYTES_ON() && BRCMF_DATA_ON(),
+                                   pkt->data, len, "Rx Data:\n");
 
 deliver:
                 /* Save superframe descriptor and allocate packet frame */
@@ -2038,14 +2006,9 @@ deliver:
                         if (SDPCM_GLOMDESC(&bus->rxhdr[SDPCM_FRAMETAG_LEN])) {
                                 brcmf_dbg(GLOM, "glom descriptor, %d bytes:\n",
                                           len);
-#ifdef BCMDBG
-                                if (BRCMF_GLOM_ON()) {
-                                        printk(KERN_DEBUG "Glom Data:\n");
-                                        print_hex_dump_bytes("",
-                                                             DUMP_PREFIX_OFFSET,
-                                                             pkt->data, len);
-                                }
-#endif
+                                brcmf_dbg_hex_dump(BRCMF_GLOM_ON(),
+                                                   pkt->data, len,
+                                                   "Glom Data:\n");
                                 __skb_trim(pkt, len);
                                 skb_pull(pkt, SDPCM_HDRLEN);
                                 bus->glomd = pkt;
@@ -2078,13 +2041,11 @@ deliver:
                 down(&bus->sdsem);
         }
         rxcount = maxframes - rxleft;
-#ifdef BCMDBG
         /* Message if we hit the limit */
         if (!rxleft)
                 brcmf_dbg(DATA, "hit rx limit of %d frames\n",
                           maxframes);
         else
-#endif                          /* BCMDBG */
                 brcmf_dbg(DATA, "processed %d frames\n", rxcount);
         /* Back off rxseq if awaiting rtx, update rx_seq */
         if (bus->rxskip)
@@ -2176,20 +2137,22 @@ static int brcmf_sdbrcm_txpkt(struct brcmf_sdio *bus, struct sk_buff *pkt,
         put_unaligned_le32(swheader, frame + SDPCM_FRAMETAG_LEN);
         put_unaligned_le32(0, frame + SDPCM_FRAMETAG_LEN + sizeof(swheader));
 
-#ifdef BCMDBG
+#ifdef DEBUG
         tx_packets[pkt->priority]++;
-        if (BRCMF_BYTES_ON() &&
-            (((BRCMF_CTL_ON() && (chan == SDPCM_CONTROL_CHANNEL)) ||
-              (BRCMF_DATA_ON() && (chan != SDPCM_CONTROL_CHANNEL))))) {
-                printk(KERN_DEBUG "Tx Frame:\n");
-                print_hex_dump_bytes("", DUMP_PREFIX_OFFSET, frame, len);
-        } else if (BRCMF_HDRS_ON()) {
-                printk(KERN_DEBUG "TxHdr:\n");
-                print_hex_dump_bytes("", DUMP_PREFIX_OFFSET,
-                                     frame, min_t(u16, len, 16));
-        }
 #endif
 
+        brcmf_dbg_hex_dump(BRCMF_BYTES_ON() &&
+                           ((BRCMF_CTL_ON() && chan == SDPCM_CONTROL_CHANNEL) ||
+                            (BRCMF_DATA_ON() && chan != SDPCM_CONTROL_CHANNEL)),
+                           frame, len, "Tx Frame:\n");
+        brcmf_dbg_hex_dump(!(BRCMF_BYTES_ON() &&
+                             ((BRCMF_CTL_ON() &&
+                               chan == SDPCM_CONTROL_CHANNEL) ||
+                              (BRCMF_DATA_ON() &&
+                               chan != SDPCM_CONTROL_CHANNEL))) &&
+                           BRCMF_HDRS_ON(),
+                           frame, min_t(u16, len, 16), "TxHdr:\n");
+
         /* Raise len to next SDIO block to eliminate tail command */
         if (bus->roundup && bus->blocksize && (len > bus->blocksize)) {
                 u16 pad = bus->blocksize - (len % bus->blocksize);
@@ -2410,7 +2373,7 @@ static bool brcmf_sdbrcm_dpc(struct brcmf_sdio *bus)
                 int err;
                 u8 clkctl, devctl = 0;
 
-#ifdef BCMDBG
+#ifdef DEBUG
                 /* Check for inconsistent device control */
                 devctl = brcmf_sdcard_cfg_read(bus->sdiodev, SDIO_FUNC_1,
                                                SBSDIO_DEVICE_CTL, &err);
@@ -2418,7 +2381,7 @@ static bool brcmf_sdbrcm_dpc(struct brcmf_sdio *bus)
                         brcmf_dbg(ERROR, "error reading DEVCTL: %d\n", err);
                         bus->sdiodev->bus_if->state = BRCMF_BUS_DOWN;
                 }
-#endif                          /* BCMDBG */
+#endif                          /* DEBUG */
 
                 /* Read CSR, if clock on switch to AVAIL, else ignore */
                 clkctl = brcmf_sdcard_cfg_read(bus->sdiodev, SDIO_FUNC_1,
@@ -2701,7 +2664,7 @@ static int brcmf_sdbrcm_bus_txdata(struct device *dev, struct sk_buff *pkt)
                 brcmf_txflowcontrol(bus->sdiodev->dev, 0, ON);
         }
 
-#ifdef BCMDBG
+#ifdef DEBUG
         if (pktq_plen(&bus->txq, prec) > qcount[prec])
                 qcount[prec] = pktq_plen(&bus->txq, prec);
 #endif
@@ -2774,7 +2737,7 @@ xfer_done:
         return bcmerror;
 }
 
-#ifdef BCMDBG
+#ifdef DEBUG
 #define CONSOLE_LINE_MAX        192
 
 static int brcmf_sdbrcm_readconsole(struct brcmf_sdio *bus)
@@ -2845,14 +2808,14 @@ static int brcmf_sdbrcm_readconsole(struct brcmf_sdio *bus)
                         if (line[n - 1] == '\r')
                                 n--;
                         line[n] = 0;
-                        printk(KERN_DEBUG "CONSOLE: %s\n", line);
+                        pr_debug("CONSOLE: %s\n", line);
                 }
         }
 break2:
 
         return 0;
 }
-#endif                          /* BCMDBG */
+#endif                          /* DEBUG */
 
 static int brcmf_tx_frame(struct brcmf_sdio *bus, u8 *frame, u16 len)
 {
@@ -2982,17 +2945,11 @@ brcmf_sdbrcm_bus_txctl(struct device *dev, unsigned char *msg, uint msglen)
         }
 
         if (ret == -1) {
-#ifdef BCMDBG
-                if (BRCMF_BYTES_ON() && BRCMF_CTL_ON()) {
-                        printk(KERN_DEBUG "Tx Frame:\n");
-                        print_hex_dump_bytes("", DUMP_PREFIX_OFFSET,
-                                             frame, len);
-                } else if (BRCMF_HDRS_ON()) {
-                        printk(KERN_DEBUG "TxHdr:\n");
-                        print_hex_dump_bytes("", DUMP_PREFIX_OFFSET,
-                                             frame, min_t(u16, len, 16));
-                }
-#endif
+                brcmf_dbg_hex_dump(BRCMF_BYTES_ON() && BRCMF_CTL_ON(),
+                                   frame, len, "Tx Frame:\n");
+                brcmf_dbg_hex_dump(!(BRCMF_BYTES_ON() && BRCMF_CTL_ON()) &&
+                                   BRCMF_HDRS_ON(),
+                                   frame, min_t(u16, len, 16), "TxHdr:\n");
 
                 do {
                         ret = brcmf_tx_frame(bus, frame, len);
@@ -3096,9 +3053,9 @@ static int brcmf_sdbrcm_write_vars(struct brcmf_sdio *bus)
         u8 *vbuffer;
         u32 varsizew;
         __le32 varsizew_le;
-#ifdef BCMDBG
+#ifdef DEBUG
         char *nvram_ularray;
-#endif                          /* BCMDBG */
+#endif                          /* DEBUG */
 
         /* Even if there are no vars are to be written, we still
                  need to set the ramsize. */
@@ -3115,7 +3072,7 @@ static int brcmf_sdbrcm_write_vars(struct brcmf_sdio *bus)
                 /* Write the vars list */
                 bcmerror =
                     brcmf_sdbrcm_membytes(bus, true, varaddr, vbuffer, varsize);
-#ifdef BCMDBG
+#ifdef DEBUG
                 /* Verify NVRAM bytes */
                 brcmf_dbg(INFO, "Compare NVRAM dl & ul; varsize=%d\n", varsize);
                 nvram_ularray = kmalloc(varsize, GFP_ATOMIC);
@@ -3142,7 +3099,7 @@ static int brcmf_sdbrcm_write_vars(struct brcmf_sdio *bus)
                         brcmf_dbg(ERROR, "Download/Upload/Compare of NVRAM ok\n");
 
                 kfree(nvram_ularray);
-#endif                          /* BCMDBG */
+#endif                          /* DEBUG */
 
                 kfree(vbuffer);
         }
@@ -3569,9 +3526,9 @@ void brcmf_sdbrcm_isr(void *arg)
 
 static bool brcmf_sdbrcm_bus_watchdog(struct brcmf_sdio *bus)
 {
-#ifdef BCMDBG
+#ifdef DEBUG
         struct brcmf_bus *bus_if = dev_get_drvdata(bus->sdiodev->dev);
-#endif  /* BCMDBG */
+#endif  /* DEBUG */
 
         brcmf_dbg(TIMER, "Enter\n");
 
@@ -3616,7 +3573,7 @@ static bool brcmf_sdbrcm_bus_watchdog(struct brcmf_sdio *bus)
                 /* Update interrupt tracking */
                 bus->lastintrs = bus->intrcount;
         }
-#ifdef BCMDBG
+#ifdef DEBUG
         /* Poll for console output periodically */
         if (bus_if->state == BRCMF_BUS_DATA &&
             bus->console_interval != 0) {
@@ -3630,7 +3587,7 @@ static bool brcmf_sdbrcm_bus_watchdog(struct brcmf_sdio *bus)
                                 bus->console_interval = 0;
                 }
         }
-#endif                          /* BCMDBG */
+#endif                          /* DEBUG */
 
         /* On idle timeout clear activity flag and/or turn off clock */
         if ((bus->idletime > 0) && (bus->clkstate == CLK_AVAIL)) {
@@ -3721,11 +3678,8 @@ brcmf_sdbrcm_probe_attach(struct brcmf_sdio *bus, u32 regsva)
         if (brcmf_sdcard_set_sbaddr_window(bus->sdiodev, SI_ENUM_BASE))
                 brcmf_dbg(ERROR, "FAILED to return to SI_ENUM_BASE\n");
 
-#ifdef BCMDBG
-        printk(KERN_DEBUG "F1 signature read @0x18000000=0x%4x\n",
-               brcmf_sdcard_reg_read(bus->sdiodev, SI_ENUM_BASE, 4));
-
-#endif                          /* BCMDBG */
+        pr_debug("F1 signature read @0x18000000=0x%4x\n",
+                 brcmf_sdcard_reg_read(bus->sdiodev, SI_ENUM_BASE, 4));
 
         /*
          * Force PLL off until brcmf_sdio_chip_attach()
@@ -3944,8 +3898,7 @@ void *brcmf_sdbrcm_probe(u32 regsva, struct brcmf_sdio_dev *sdiodev)
         bus->watchdog_tsk = kthread_run(brcmf_sdbrcm_watchdog_thread,
                                         bus, "brcmf_watchdog");
         if (IS_ERR(bus->watchdog_tsk)) {
-                printk(KERN_WARNING
-                       "brcmf_watchdog thread failed to start\n");
+                pr_warn("brcmf_watchdog thread failed to start\n");
                 bus->watchdog_tsk = NULL;
         }
         /* Initialize DPC thread */
@@ -3953,8 +3906,7 @@ void *brcmf_sdbrcm_probe(u32 regsva, struct brcmf_sdio_dev *sdiodev)
         bus->dpc_tsk = kthread_run(brcmf_sdbrcm_dpc_thread,
                                    bus, "brcmf_dpc");
         if (IS_ERR(bus->dpc_tsk)) {
-                printk(KERN_WARNING
-                       "brcmf_dpc thread failed to start\n");
+                pr_warn("brcmf_dpc thread failed to start\n");
                 bus->dpc_tsk = NULL;
         }
 
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c b/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c
index 11b2d7c97ba2..1534efc21631 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c
@@ -15,6 +15,8 @@
  */
 /* ***** SDIO interface chip backplane handle functions ***** */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/types.h>
 #include <linux/netdevice.h>
 #include <linux/mmc/card.h>
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c b/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
index bf11850a20f1..74c95a597950 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
@@ -16,6 +16,8 @@
 
 /* Toplevel file. Relies on dhd_linux.c to send commands to the dongle. */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/kernel.h>
 #include <linux/if_arp.h>
 #include <linux/sched.h>
@@ -2783,7 +2785,7 @@ static struct wireless_dev *brcmf_alloc_wdev(s32 sizeof_iface,
             wiphy_new(&wl_cfg80211_ops,
                       sizeof(struct brcmf_cfg80211_priv) + sizeof_iface);
         if (!wdev->wiphy) {
-                WL_ERR("Couldn not allocate wiphy device\n");
+                WL_ERR("Could not allocate wiphy device\n");
                 err = -ENOMEM;
                 goto wiphy_new_out;
         }
@@ -2809,7 +2811,7 @@ static struct wireless_dev *brcmf_alloc_wdev(s32 sizeof_iface,
                                                                  */
         err = wiphy_register(wdev->wiphy);
         if (err < 0) {
-                WL_ERR("Couldn not register wiphy device (%d)\n", err);
+                WL_ERR("Could not register wiphy device (%d)\n", err);
                 goto wiphy_register_out;
         }
         return wdev;
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.h b/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.h
index a613b49cb13f..b5d9b36df3d0 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.h
+++ b/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.h
@@ -32,63 +32,63 @@ struct brcmf_cfg80211_ibss;
 #define WL_DBG_MASK             ((WL_DBG_INFO | WL_DBG_ERR | WL_DBG_TRACE) | \
                                 (WL_DBG_SCAN) | (WL_DBG_CONN))
 
-#define WL_ERR(fmt, args...)                                    \
+#define WL_ERR(fmt, ...)                                        \
 do {                                                            \
         if (brcmf_dbg_level & WL_DBG_ERR) {                     \
                 if (net_ratelimit()) {                          \
-                        printk(KERN_ERR "ERROR @%s : " fmt,     \
-                                __func__, ##args);              \
+                        pr_err("ERROR @%s : " fmt,              \
+                               __func__, ##__VA_ARGS__);        \
                 }                                               \
         }                                                       \
 } while (0)
 
-#if (defined BCMDBG)
-#define WL_INFO(fmt, args...)                                   \
+#if (defined DEBUG)
+#define WL_INFO(fmt, ...)                                       \
 do {                                                            \
         if (brcmf_dbg_level & WL_DBG_INFO) {                    \
                 if (net_ratelimit()) {                          \
-                        printk(KERN_ERR "INFO @%s : " fmt,      \
-                                __func__, ##args);              \
+                        pr_err("INFO @%s : " fmt,               \
+                               __func__, ##__VA_ARGS__);        \
                 }                                               \
         }                                                       \
 } while (0)
 
-#define WL_TRACE(fmt, args...)                                  \
+#define WL_TRACE(fmt, ...)                                      \
 do {                                                            \
         if (brcmf_dbg_level & WL_DBG_TRACE) {                   \
                 if (net_ratelimit()) {                          \
-                        printk(KERN_ERR "TRACE @%s : " fmt,     \
-                                __func__, ##args);              \
+                        pr_err("TRACE @%s : " fmt,              \
+                               __func__, ##__VA_ARGS__);        \
                 }                                               \
         }                                                       \
 } while (0)
 
-#define WL_SCAN(fmt, args...)                                   \
+#define WL_SCAN(fmt, ...)                                       \
 do {                                                            \
         if (brcmf_dbg_level & WL_DBG_SCAN) {                    \
                 if (net_ratelimit()) {                          \
-                        printk(KERN_ERR "SCAN @%s : " fmt,      \
-                                __func__, ##args);              \
+                        pr_err("SCAN @%s : " fmt,               \
+                               __func__, ##__VA_ARGS__);        \
                 }                                               \
         }                                                       \
 } while (0)
 
-#define WL_CONN(fmt, args...)                                   \
+#define WL_CONN(fmt, ...)                                       \
 do {                                                            \
         if (brcmf_dbg_level & WL_DBG_CONN) {                    \
                 if (net_ratelimit()) {                          \
-                        printk(KERN_ERR "CONN @%s : " fmt,      \
-                                __func__, ##args);              \
+                        pr_err("CONN @%s : " fmt,               \
+                               __func__, ##__VA_ARGS__);        \
                 }                                               \
         }                                                       \
 } while (0)
 
-#else /* (defined BCMDBG) */
+#else /* (defined DEBUG) */
 #define WL_INFO(fmt, args...)
 #define WL_TRACE(fmt, args...)
 #define WL_SCAN(fmt, args...)
 #define WL_CONN(fmt, args...)
-#endif /* (defined BCMDBG) */
+#endif /* (defined DEBUG) */
 
 #define WL_NUM_SCAN_MAX         1
 #define WL_NUM_PMKIDS_MAX       MAXPMKID        /* will be used
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/aiutils.c b/drivers/net/wireless/brcm80211/brcmsmac/aiutils.c
index ab9bb11abfbb..c93ea35bceec 100644
--- a/drivers/net/wireless/brcm80211/brcmsmac/aiutils.c
+++ b/drivers/net/wireless/brcm80211/brcmsmac/aiutils.c
@@ -326,11 +326,11 @@
 
 #define PCI_FORCEHT(sih) (PCIE(sih) && (ai_get_chip_id(sih) == BCM4716_CHIP_ID))
 
-#ifdef BCMDBG
+#ifdef DEBUG
 #define SI_MSG(fmt, ...)        pr_debug(fmt, ##__VA_ARGS__)
 #else
 #define SI_MSG(fmt, ...)        no_printk(fmt, ##__VA_ARGS__)
-#endif                          /* BCMDBG */
+#endif                          /* DEBUG */
 
 #define GOODCOREADDR(x, b) \
         (((x) >= (b)) && ((x) < ((b) + SI_MAXCORES * SI_CORE_SIZE)) && \
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/ampdu.c b/drivers/net/wireless/brcm80211/brcmsmac/ampdu.c
index 90911eec0cf5..d89dcb14cb6d 100644
--- a/drivers/net/wireless/brcm80211/brcmsmac/ampdu.c
+++ b/drivers/net/wireless/brcm80211/brcmsmac/ampdu.c
@@ -915,7 +915,7 @@ brcms_c_ampdu_dotxstatus_complete(struct ampdu_info *ampdu, struct scb *scb,
         struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(p);
         struct wiphy *wiphy = wlc->wiphy;
 
-#ifdef BCMDBG
+#ifdef DEBUG
         u8 hole[AMPDU_MAX_MPDU];
         memset(hole, 0, sizeof(hole));
 #endif
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/dma.c b/drivers/net/wireless/brcm80211/brcmsmac/dma.c
index 2e90a9a16ed6..11054ae9d4f6 100644
--- a/drivers/net/wireless/brcm80211/brcmsmac/dma.c
+++ b/drivers/net/wireless/brcm80211/brcmsmac/dma.c
@@ -177,7 +177,7 @@
 #define BCMEXTRAHDROOM 172
 
 /* debug/trace */
-#ifdef BCMDBG
+#ifdef DEBUG
 #define DMA_ERROR(fmt, ...)                                     \
 do {                                                            \
         if (*di->msg_level & 1)                                 \
@@ -193,7 +193,7 @@ do {								\
         no_printk(fmt, ##__VA_ARGS__)
 #define DMA_TRACE(fmt, ...)                     \
         no_printk(fmt, ##__VA_ARGS__)
-#endif                          /* BCMDBG */
+#endif                          /* DEBUG */
 
 #define DMA_NONE(fmt, ...)                      \
         no_printk(fmt, ##__VA_ARGS__)
@@ -968,7 +968,7 @@ int dma_rx(struct dma_pub *pub, struct sk_buff_head *skb_list)
                         pktcnt++;
                 }
 
-#ifdef BCMDBG
+#ifdef DEBUG
                 if (resid > 0) {
                         uint cur;
                         cur =
@@ -979,7 +979,7 @@ int dma_rx(struct dma_pub *pub, struct sk_buff_head *skb_list)
                         DMA_ERROR("rxin %d rxout %d, hw_curr %d\n",
                                    di->rxin, di->rxout, cur);
                 }
-#endif                          /* BCMDBG */
+#endif                          /* DEBUG */
 
                 if ((di->dma.dmactrlflags & DMA_CTRL_RXMULTI) == 0) {
                         DMA_ERROR("%s: bad frame length (%d)\n",
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c b/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
index 448ab9c4eb47..c8427978d09e 100644
--- a/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
+++ b/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
@@ -15,6 +15,7 @@
  */
 
 #define __UNDEF_NO_VERSION__
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
 #include <linux/etherdevice.h>
 #include <linux/sched.h>
@@ -96,10 +97,10 @@ static struct bcma_device_id brcms_coreid_table[] = {
 };
 MODULE_DEVICE_TABLE(bcma, brcms_coreid_table);
 
-#ifdef BCMDBG
+#ifdef DEBUG
 static int msglevel = 0xdeadbeef;
 module_param(msglevel, int, 0);
-#endif                          /* BCMDBG */
+#endif                          /* DEBUG */
 
 static struct ieee80211_channel brcms_2ghz_chantable[] = {
         CHAN2GHZ(1, 2412, IEEE80211_CHAN_NO_HT40MINUS),
@@ -857,7 +858,7 @@ static void brcms_free(struct brcms_info *wl)
         /* free timers */
         for (t = wl->timers; t; t = next) {
                 next = t->next;
-#ifdef BCMDBG
+#ifdef DEBUG
                 kfree(t->name);
 #endif
                 kfree(t);
@@ -1121,8 +1122,7 @@ static int __devinit brcms_bcma_probe(struct bcma_device *pdev)
 
         wl = brcms_attach(pdev);
         if (!wl) {
-                pr_err("%s: %s: brcms_attach failed!\n", KBUILD_MODNAME,
-                       __func__);
+                pr_err("%s: brcms_attach failed!\n", __func__);
                 return -ENODEV;
         }
         return 0;
@@ -1177,13 +1177,13 @@ static int __init brcms_module_init(void)
 {
         int error = -ENODEV;
 
-#ifdef BCMDBG
+#ifdef DEBUG
         if (msglevel != 0xdeadbeef)
                 brcm_msg_level = msglevel;
-#endif                          /* BCMDBG */
+#endif                          /* DEBUG */
 
         error = bcma_driver_register(&brcms_bcma_driver);
-        printk(KERN_ERR "%s: register returned %d\n", __func__, error);
+        pr_err("%s: register returned %d\n", __func__, error);
         if (!error)
                 return 0;
 
@@ -1367,7 +1367,7 @@ struct brcms_timer *brcms_init_timer(struct brcms_info *wl,
         t->next = wl->timers;
         wl->timers = t;
 
-#ifdef BCMDBG
+#ifdef DEBUG
         t->name = kmalloc(strlen(name) + 1, GFP_ATOMIC);
         if (t->name)
                 strcpy(t->name, name);
@@ -1386,7 +1386,7 @@ void brcms_add_timer(struct brcms_timer *t, uint ms, int periodic)
 {
         struct ieee80211_hw *hw = t->wl->pub->ieee_hw;
 
-#ifdef BCMDBG
+#ifdef DEBUG
         if (t->set)
                 wiphy_err(hw->wiphy, "%s: Already set. Name: %s, per %d\n",
                           __func__, t->name, periodic);
@@ -1431,7 +1431,7 @@ void brcms_free_timer(struct brcms_timer *t)
 
         if (wl->timers == t) {
                 wl->timers = wl->timers->next;
-#ifdef BCMDBG
+#ifdef DEBUG
                 kfree(t->name);
 #endif
                 kfree(t);
@@ -1443,7 +1443,7 @@ void brcms_free_timer(struct brcms_timer *t)
         while (tmp) {
                 if (tmp->next == t) {
                         tmp->next = t->next;
-#ifdef BCMDBG
+#ifdef DEBUG
                         kfree(t->name);
 #endif
                         kfree(t);
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.h b/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.h
index 8f60419c37bf..9358bd5ebd35 100644
--- a/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.h
+++ b/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.h
@@ -40,7 +40,7 @@ struct brcms_timer {
         bool periodic;
         bool set;               /* indicates if timer is active */
         struct brcms_timer *next;       /* for freeing on unload */
-#ifdef BCMDBG
+#ifdef DEBUG
         char *name;             /* Description of the timer */
 #endif
 };
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/main.c b/drivers/net/wireless/brcm80211/brcmsmac/main.c
index f6affc6fd12a..fb712cac9157 100644
--- a/drivers/net/wireless/brcm80211/brcmsmac/main.c
+++ b/drivers/net/wireless/brcm80211/brcmsmac/main.c
@@ -14,6 +14,8 @@
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/pci_ids.h>
 #include <linux/if_ether.h>
 #include <net/mac80211.h>
@@ -293,11 +295,11 @@ const u8 prio2fifo[NUMPRIO] = {
 
 /* debug/trace */
 uint brcm_msg_level =
-#if defined(BCMDBG)
+#if defined(DEBUG)
         LOG_ERROR_VAL;
 #else
         0;
-#endif                          /* BCMDBG */
+#endif                          /* DEBUG */
 
 /* TX FIFO number to WME/802.1E Access Category */
 static const u8 wme_fifo2ac[] = {
@@ -342,14 +344,14 @@ static const u16 xmtfifo_sz[][NFIFO] = {
         {9, 58, 22, 14, 14, 5},
 };
 
-#ifdef BCMDBG
+#ifdef DEBUG
 static const char * const fifo_names[] = {
         "AC_BK", "AC_BE", "AC_VI", "AC_VO", "BCMC", "ATIM" };
 #else
 static const char fifo_names[6][0];
 #endif
 
-#ifdef BCMDBG
+#ifdef DEBUG
 /* pointer to most recently allocated wl/wlc */
 static struct brcms_c_info *wlc_info_dbg = (struct brcms_c_info *) (NULL);
 #endif
@@ -3075,30 +3077,30 @@ static void brcms_c_statsupd(struct brcms_c_info *wlc)
 {
         int i;
         struct macstat macstats;
-#ifdef BCMDBG
+#ifdef DEBUG
         u16 delta;
         u16 rxf0ovfl;
         u16 txfunfl[NFIFO];
-#endif                          /* BCMDBG */
+#endif                          /* DEBUG */
 
         /* if driver down, make no sense to update stats */
         if (!wlc->pub->up)
                 return;
 
-#ifdef BCMDBG
+#ifdef DEBUG
         /* save last rx fifo 0 overflow count */
         rxf0ovfl = wlc->core->macstat_snapshot->rxf0ovfl;
 
         /* save last tx fifo  underflow count */
         for (i = 0; i < NFIFO; i++)
                 txfunfl[i] = wlc->core->macstat_snapshot->txfunfl[i];
-#endif                          /* BCMDBG */
+#endif                          /* DEBUG */
 
         /* Read mac stats from contiguous shared memory */
         brcms_b_copyfrom_objmem(wlc->hw, M_UCODE_MACSTAT, &macstats,
                                 sizeof(struct macstat), OBJADDR_SHM_SEL);
 
-#ifdef BCMDBG
+#ifdef DEBUG
         /* check for rx fifo 0 overflow */
         delta = (u16) (wlc->core->macstat_snapshot->rxf0ovfl - rxf0ovfl);
         if (delta)
@@ -3114,7 +3116,7 @@ static void brcms_c_statsupd(struct brcms_c_info *wlc)
                         wiphy_err(wlc->wiphy, "wl%d: %u tx fifo %d underflows!"
                                   "\n", wlc->pub->unit, delta, i);
         }
-#endif                          /* BCMDBG */
+#endif                          /* DEBUG */
 
         /* merge counters from dma module */
         for (i = 0; i < NFIFO; i++) {
@@ -5765,62 +5767,49 @@ int brcms_c_module_unregister(struct brcms_pub *pub, const char *name,
         return -ENODATA;
 }
 
-#ifdef BCMDBG
-static const char * const supr_reason[] = {
-        "None", "PMQ Entry", "Flush request",
-        "Previous frag failure", "Channel mismatch",
-        "Lifetime Expiry", "Underflow"
-};
-
-static void brcms_c_print_txs_status(u16 s)
-{
-        printk(KERN_DEBUG "[15:12]  %d  frame attempts\n",
-               (s & TX_STATUS_FRM_RTX_MASK) >> TX_STATUS_FRM_RTX_SHIFT);
-        printk(KERN_DEBUG " [11:8]  %d  rts attempts\n",
-               (s & TX_STATUS_RTS_RTX_MASK) >> TX_STATUS_RTS_RTX_SHIFT);
-        printk(KERN_DEBUG "    [7]  %d  PM mode indicated\n",
-               ((s & TX_STATUS_PMINDCTD) ? 1 : 0));
-        printk(KERN_DEBUG "    [6]  %d  intermediate status\n",
-               ((s & TX_STATUS_INTERMEDIATE) ? 1 : 0));
-        printk(KERN_DEBUG "    [5]  %d  AMPDU\n",
-               (s & TX_STATUS_AMPDU) ? 1 : 0);
-        printk(KERN_DEBUG "  [4:2]  %d  Frame Suppressed Reason (%s)\n",
-               ((s & TX_STATUS_SUPR_MASK) >> TX_STATUS_SUPR_SHIFT),
-               supr_reason[(s & TX_STATUS_SUPR_MASK) >> TX_STATUS_SUPR_SHIFT]);
-        printk(KERN_DEBUG "    [1]  %d  acked\n",
-               ((s & TX_STATUS_ACK_RCV) ? 1 : 0));
-}
-#endif                          /* BCMDBG */
-
 void brcms_c_print_txstatus(struct tx_status *txs)
 {
-#if defined(BCMDBG)
-        u16 s = txs->status;
-        u16 ackphyrxsh = txs->ackphyrxsh;
-
-        printk(KERN_DEBUG "\ntxpkt (MPDU) Complete\n");
-
-        printk(KERN_DEBUG "FrameID: %04x   ", txs->frameid);
-        printk(KERN_DEBUG "TxStatus: %04x", s);
-        printk(KERN_DEBUG "\n");
-
-        brcms_c_print_txs_status(s);
-
-        printk(KERN_DEBUG "LastTxTime: %04x ", txs->lasttxtime);
-        printk(KERN_DEBUG "Seq: %04x ", txs->sequence);
-        printk(KERN_DEBUG "PHYTxStatus: %04x ", txs->phyerr);
-        printk(KERN_DEBUG "RxAckRSSI: %04x ",
-               (ackphyrxsh & PRXS1_JSSI_MASK) >> PRXS1_JSSI_SHIFT);
-        printk(KERN_DEBUG "RxAckSQ: %04x",
-               (ackphyrxsh & PRXS1_SQ_MASK) >> PRXS1_SQ_SHIFT);
-        printk(KERN_DEBUG "\n");
-#endif                          /* defined(BCMDBG) */
+        pr_debug("\ntxpkt (MPDU) Complete\n");
+
+        pr_debug("FrameID: %04x   TxStatus: %04x\n", txs->frameid, txs->status);
+
+        pr_debug("[15:12]  %d  frame attempts\n",
+                  (txs->status & TX_STATUS_FRM_RTX_MASK) >>
+                 TX_STATUS_FRM_RTX_SHIFT);
+        pr_debug(" [11:8]  %d  rts attempts\n",
+                 (txs->status & TX_STATUS_RTS_RTX_MASK) >>
+                 TX_STATUS_RTS_RTX_SHIFT);
+        pr_debug("    [7]  %d  PM mode indicated\n",
+                 txs->status & TX_STATUS_PMINDCTD ? 1 : 0);
+        pr_debug("    [6]  %d  intermediate status\n",
+                 txs->status & TX_STATUS_INTERMEDIATE ? 1 : 0);
+        pr_debug("    [5]  %d  AMPDU\n",
+                 txs->status & TX_STATUS_AMPDU ? 1 : 0);
+        pr_debug("  [4:2]  %d  Frame Suppressed Reason (%s)\n",
+                 (txs->status & TX_STATUS_SUPR_MASK) >> TX_STATUS_SUPR_SHIFT,
+                 (const char *[]) {
+                        "None",
+                        "PMQ Entry",
+                        "Flush request",
+                        "Previous frag failure",
+                        "Channel mismatch",
+                        "Lifetime Expiry",
+                        "Underflow"
+                 } [(txs->status & TX_STATUS_SUPR_MASK) >>
+                    TX_STATUS_SUPR_SHIFT]);
+        pr_debug("    [1]  %d  acked\n",
+                 txs->status & TX_STATUS_ACK_RCV ? 1 : 0);
+
+        pr_debug("LastTxTime: %04x Seq: %04x PHYTxStatus: %04x RxAckRSSI: %04x RxAckSQ: %04x\n",
+                 txs->lasttxtime, txs->sequence, txs->phyerr,
+                 (txs->ackphyrxsh & PRXS1_JSSI_MASK) >> PRXS1_JSSI_SHIFT,
+                 (txs->ackphyrxsh & PRXS1_SQ_MASK) >> PRXS1_SQ_SHIFT);
 }
 
 bool brcms_c_chipmatch(u16 vendor, u16 device)
 {
         if (vendor != PCI_VENDOR_ID_BROADCOM) {
-                pr_err("chipmatch: unknown vendor id %04x\n", vendor);
+                pr_err("unknown vendor id %04x\n", vendor);
                 return false;
         }
 
@@ -5833,11 +5822,11 @@ bool brcms_c_chipmatch(u16 vendor, u16 device)
         if ((device == BCM43236_D11N_ID) || (device == BCM43236_D11N2G_ID))
                 return true;
 
-        pr_err("chipmatch: unknown device id %04x\n", device);
+        pr_err("unknown device id %04x\n", device);
         return false;
 }
 
-#if defined(BCMDBG)
+#if defined(DEBUG)
 void brcms_c_print_txdesc(struct d11txh *txh)
 {
         u16 mtcl = le16_to_cpu(txh->MacTxControlLow);
@@ -5871,57 +5860,56 @@ void brcms_c_print_txdesc(struct d11txh *txh)
         struct ieee80211_rts rts = txh->rts_frame;
 
         /* add plcp header along with txh descriptor */
-        printk(KERN_DEBUG "Raw TxDesc + plcp header:\n");
-        print_hex_dump_bytes("", DUMP_PREFIX_OFFSET,
-                             txh, sizeof(struct d11txh) + 48);
-
-        printk(KERN_DEBUG "TxCtlLow: %04x ", mtcl);
-        printk(KERN_DEBUG "TxCtlHigh: %04x ", mtch);
-        printk(KERN_DEBUG "FC: %04x ", mfc);
-        printk(KERN_DEBUG "FES Time: %04x\n", tfest);
-        printk(KERN_DEBUG "PhyCtl: %04x%s ", ptcw,
+        brcmu_dbg_hex_dump(txh, sizeof(struct d11txh) + 48,
+                           "Raw TxDesc + plcp header:\n");
+
+        pr_debug("TxCtlLow: %04x ", mtcl);
+        pr_debug("TxCtlHigh: %04x ", mtch);
+        pr_debug("FC: %04x ", mfc);
+        pr_debug("FES Time: %04x\n", tfest);
+        pr_debug("PhyCtl: %04x%s ", ptcw,
                (ptcw & PHY_TXC_SHORT_HDR) ? " short" : "");
-        printk(KERN_DEBUG "PhyCtl_1: %04x ", ptcw_1);
-        printk(KERN_DEBUG "PhyCtl_1_Fbr: %04x\n", ptcw_1_Fbr);
-        printk(KERN_DEBUG "PhyCtl_1_Rts: %04x ", ptcw_1_Rts);
-        printk(KERN_DEBUG "PhyCtl_1_Fbr_Rts: %04x\n", ptcw_1_FbrRts);
-        printk(KERN_DEBUG "MainRates: %04x ", mainrates);
-        printk(KERN_DEBUG "XtraFrameTypes: %04x ", xtraft);
-        printk(KERN_DEBUG "\n");
+        pr_debug("PhyCtl_1: %04x ", ptcw_1);
+        pr_debug("PhyCtl_1_Fbr: %04x\n", ptcw_1_Fbr);
+        pr_debug("PhyCtl_1_Rts: %04x ", ptcw_1_Rts);
+        pr_debug("PhyCtl_1_Fbr_Rts: %04x\n", ptcw_1_FbrRts);
+        pr_debug("MainRates: %04x ", mainrates);
+        pr_debug("XtraFrameTypes: %04x ", xtraft);
+        pr_debug("\n");
 
         print_hex_dump_bytes("SecIV:", DUMP_PREFIX_OFFSET, iv, sizeof(txh->IV));
         print_hex_dump_bytes("RA:", DUMP_PREFIX_OFFSET,
                              ra, sizeof(txh->TxFrameRA));
 
-        printk(KERN_DEBUG "Fb FES Time: %04x ", tfestfb);
+        pr_debug("Fb FES Time: %04x ", tfestfb);
         print_hex_dump_bytes("Fb RTS PLCP:", DUMP_PREFIX_OFFSET,
                              rtspfb, sizeof(txh->RTSPLCPFallback));
-        printk(KERN_DEBUG "RTS DUR: %04x ", rtsdfb);
+        pr_debug("RTS DUR: %04x ", rtsdfb);
         print_hex_dump_bytes("PLCP:", DUMP_PREFIX_OFFSET,
                              fragpfb, sizeof(txh->FragPLCPFallback));
-        printk(KERN_DEBUG "DUR: %04x", fragdfb);
-        printk(KERN_DEBUG "\n");
+        pr_debug("DUR: %04x", fragdfb);
+        pr_debug("\n");
 
-        printk(KERN_DEBUG "MModeLen: %04x ", mmodelen);
-        printk(KERN_DEBUG "MModeFbrLen: %04x\n", mmodefbrlen);
+        pr_debug("MModeLen: %04x ", mmodelen);
+        pr_debug("MModeFbrLen: %04x\n", mmodefbrlen);
 
-        printk(KERN_DEBUG "FrameID:     %04x\n", tfid);
-        printk(KERN_DEBUG "TxStatus:    %04x\n", txs);
+        pr_debug("FrameID:     %04x\n", tfid);
+        pr_debug("TxStatus:    %04x\n", txs);
 
-        printk(KERN_DEBUG "MaxNumMpdu:  %04x\n", mnmpdu);
-        printk(KERN_DEBUG "MaxAggbyte:  %04x\n", mabyte);
-        printk(KERN_DEBUG "MaxAggbyte_fb:  %04x\n", mabyte_f);
-        printk(KERN_DEBUG "MinByte:     %04x\n", mmbyte);
+        pr_debug("MaxNumMpdu:  %04x\n", mnmpdu);
+        pr_debug("MaxAggbyte:  %04x\n", mabyte);
+        pr_debug("MaxAggbyte_fb:  %04x\n", mabyte_f);
+        pr_debug("MinByte:     %04x\n", mmbyte);
 
         print_hex_dump_bytes("RTS PLCP:", DUMP_PREFIX_OFFSET,
                              rtsph, sizeof(txh->RTSPhyHeader));
         print_hex_dump_bytes("RTS Frame:", DUMP_PREFIX_OFFSET,
                              (u8 *)&rts, sizeof(txh->rts_frame));
-        printk(KERN_DEBUG "\n");
+        pr_debug("\n");
 }
-#endif                          /* defined(BCMDBG) */
+#endif                          /* defined(DEBUG) */
 
-#if defined(BCMDBG)
+#if defined(DEBUG)
 static int
 brcms_c_format_flags(const struct brcms_c_bit_desc *bd, u32 flags, char *buf,
                      int len)
@@ -5975,9 +5963,9 @@ brcms_c_format_flags(const struct brcms_c_bit_desc *bd, u32 flags, char *buf,
 
         return (int)(p - buf);
 }
-#endif                          /* defined(BCMDBG) */
+#endif                          /* defined(DEBUG) */
 
-#if defined(BCMDBG)
+#if defined(DEBUG)
 void brcms_c_print_rxh(struct d11rxhdr *rxh)
 {
         u16 len = rxh->RxFrameSize;
@@ -5999,24 +5987,22 @@ void brcms_c_print_rxh(struct d11rxhdr *rxh)
                 {0, NULL}
         };
 
-        printk(KERN_DEBUG "Raw RxDesc:\n");
-        print_hex_dump_bytes("", DUMP_PREFIX_OFFSET, rxh,
-                             sizeof(struct d11rxhdr));
+        brcmu_dbg_hex_dump(rxh, sizeof(struct d11rxhdr), "Raw RxDesc:\n");
 
         brcms_c_format_flags(macstat_flags, macstatus1, flagstr, 64);
 
         snprintf(lenbuf, sizeof(lenbuf), "0x%x", len);
 
-        printk(KERN_DEBUG "RxFrameSize:     %6s (%d)%s\n", lenbuf, len,
+        pr_debug("RxFrameSize:     %6s (%d)%s\n", lenbuf, len,
                (rxh->PhyRxStatus_0 & PRXS0_SHORTH) ? " short preamble" : "");
-        printk(KERN_DEBUG "RxPHYStatus:     %04x %04x %04x %04x\n",
+        pr_debug("RxPHYStatus:     %04x %04x %04x %04x\n",
                phystatus_0, phystatus_1, phystatus_2, phystatus_3);
-        printk(KERN_DEBUG "RxMACStatus:     %x %s\n", macstatus1, flagstr);
-        printk(KERN_DEBUG "RXMACaggtype:    %x\n",
+        pr_debug("RxMACStatus:     %x %s\n", macstatus1, flagstr);
+        pr_debug("RXMACaggtype:    %x\n",
                (macstatus2 & RXS_AGGTYPE_MASK));
-        printk(KERN_DEBUG "RxTSFTime:       %04x\n", rxh->RxTSFTime);
+        pr_debug("RxTSFTime:       %04x\n", rxh->RxTSFTime);
 }
-#endif                          /* defined(BCMDBG) */
+#endif                          /* defined(DEBUG) */
 
 u16 brcms_b_rate_shm_offset(struct brcms_hardware *wlc_hw, u8 rate)
 {
@@ -8354,7 +8340,7 @@ brcms_c_attach(struct brcms_info *wl, struct bcma_device *core, uint unit,
         wlc->wiphy = wl->wiphy;
         pub = wlc->pub;
 
-#if defined(BCMDBG)
+#if defined(DEBUG)
         wlc_info_dbg = wlc;
 #endif
 
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/main.h b/drivers/net/wireless/brcm80211/brcmsmac/main.h
index adb136ec1f04..8debc74c54e1 100644
--- a/drivers/net/wireless/brcm80211/brcmsmac/main.h
+++ b/drivers/net/wireless/brcm80211/brcmsmac/main.h
@@ -648,10 +648,12 @@ extern void brcms_c_print_txstatus(struct tx_status *txs);
 extern int brcms_b_xmtfifo_sz_get(struct brcms_hardware *wlc_hw, uint fifo,
                    uint *blocks);
 
-#if defined(BCMDBG)
+#if defined(DEBUG)
 extern void brcms_c_print_txdesc(struct d11txh *txh);
 #else
-#define brcms_c_print_txdesc(a)
+static inline void brcms_c_print_txdesc(struct d11txh *txh)
+{
+}
 #endif
 
 extern int brcms_c_set_gmode(struct brcms_c_info *wlc, u8 gmode, bool config);
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_n.c b/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_n.c
index a16f1ab292fd..ec7450d2fbd6 100644
--- a/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_n.c
+++ b/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_n.c
@@ -14,6 +14,8 @@
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/kernel.h>
 #include <linux/delay.h>
 #include <linux/cordic.h>
@@ -26434,8 +26436,7 @@ cal_try:
         }
 
         if (bcmerror != 0) {
-                printk(KERN_DEBUG "%s: Failed, cnt = %d\n", __func__,
-                       cal_retry);
+                pr_debug("%s: Failed, cnt = %d\n", __func__, cal_retry);
 
                 if (cal_retry < CAL_RETRY_CNT) {
                         cal_retry++;
diff --git a/drivers/net/wireless/brcm80211/brcmutil/utils.c b/drivers/net/wireless/brcm80211/brcmutil/utils.c
index b7537f70a795..b45ab34cdfdc 100644
--- a/drivers/net/wireless/brcm80211/brcmutil/utils.c
+++ b/drivers/net/wireless/brcm80211/brcmutil/utils.c
@@ -14,6 +14,8 @@
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/netdevice.h>
 #include <linux/module.h>
 
@@ -240,17 +242,35 @@ struct sk_buff *brcmu_pktq_mdeq(struct pktq *pq, uint prec_bmp,
 }
 EXPORT_SYMBOL(brcmu_pktq_mdeq);
 
-#if defined(BCMDBG)
+#if defined(DEBUG)
 /* pretty hex print a pkt buffer chain */
 void brcmu_prpkt(const char *msg, struct sk_buff *p0)
 {
         struct sk_buff *p;
 
         if (msg && (msg[0] != '\0'))
-                printk(KERN_DEBUG "%s:\n", msg);
+                pr_debug("%s:\n", msg);
 
         for (p = p0; p; p = p->next)
                 print_hex_dump_bytes("", DUMP_PREFIX_OFFSET, p->data, p->len);
 }
 EXPORT_SYMBOL(brcmu_prpkt);
-#endif                          /* defined(BCMDBG) */
+
+void brcmu_dbg_hex_dump(const void *data, size_t size, const char *fmt, ...)
+{
+        struct va_format vaf;
+        va_list args;
+
+        va_start(args, fmt);
+
+        vaf.fmt = fmt;
+        vaf.va = &args;
+
+        pr_debug("%pV", &vaf);
+
+        va_end(args);
+
+        print_hex_dump_bytes("", DUMP_PREFIX_OFFSET, data, size);
+}
+EXPORT_SYMBOL(brcmu_dbg_hex_dump);
+#endif                          /* defined(DEBUG) */
diff --git a/drivers/net/wireless/brcm80211/include/brcmu_utils.h b/drivers/net/wireless/brcm80211/include/brcmu_utils.h
index ad249a0b4730..477b92ad3d62 100644
--- a/drivers/net/wireless/brcm80211/include/brcmu_utils.h
+++ b/drivers/net/wireless/brcm80211/include/brcmu_utils.h
@@ -176,10 +176,21 @@ struct ipv4_addr;
 
 /* externs */
 /* format/print */
-#ifdef BCMDBG
+#ifdef DEBUG
 extern void brcmu_prpkt(const char *msg, struct sk_buff *p0);
 #else
 #define brcmu_prpkt(a, b)
-#endif                          /* BCMDBG */
+#endif                          /* DEBUG */
+
+#ifdef DEBUG
+extern __printf(3, 4)
+void brcmu_dbg_hex_dump(const void *data, size_t size, const char *fmt, ...);
+#else
+__printf(3, 4)
+static inline
+void brcmu_dbg_hex_dump(const void *data, size_t size, const char *fmt, ...)
+{
+}
+#endif
 
 #endif                          /* _BRCMU_UTILS_H_ */
diff --git a/drivers/net/wireless/hostap/hostap_hw.c b/drivers/net/wireless/hostap/hostap_hw.c
index a8bddd81b4d1..aa15cc4269a1 100644
--- a/drivers/net/wireless/hostap/hostap_hw.c
+++ b/drivers/net/wireless/hostap/hostap_hw.c
@@ -347,11 +347,9 @@ static int hfa384x_cmd(struct net_device *dev, u16 cmd, u16 param0,
                 return -EINTR;
 
         entry = kzalloc(sizeof(*entry), GFP_ATOMIC);
-        if (entry == NULL) {
-                printk(KERN_DEBUG "%s: hfa384x_cmd - kmalloc failed\n",
-                       dev->name);
+        if (entry == NULL)
                 return -ENOMEM;
-        }
+
         atomic_set(&entry->usecnt, 1);
         entry->type = CMD_SLEEP;
         entry->cmd = cmd;
@@ -515,11 +513,9 @@ static int hfa384x_cmd_callback(struct net_device *dev, u16 cmd, u16 param0,
         }
 
         entry = kzalloc(sizeof(*entry), GFP_ATOMIC);
-        if (entry == NULL) {
-                printk(KERN_DEBUG "%s: hfa384x_cmd_callback - kmalloc "
-                       "failed\n", dev->name);
+        if (entry == NULL)
                 return -ENOMEM;
-        }
+
         atomic_set(&entry->usecnt, 1);
         entry->type = CMD_CALLBACK;
         entry->cmd = cmd;
@@ -2978,11 +2974,9 @@ static int prism2_set_tim(struct net_device *dev, int aid, int set)
         local = iface->local;
 
         new_entry = kzalloc(sizeof(*new_entry), GFP_ATOMIC);
-        if (new_entry == NULL) {
-                printk(KERN_DEBUG "%s: prism2_set_tim: kmalloc failed\n",
-                       local->dev->name);
+        if (new_entry == NULL)
                 return -ENOMEM;
-        }
+
         new_entry->aid = aid;
         new_entry->set = set;
 
diff --git a/drivers/net/wireless/ipw2x00/ipw2100.c b/drivers/net/wireless/ipw2x00/ipw2100.c
index a0e5c21d3657..e847737ccc9d 100644
--- a/drivers/net/wireless/ipw2x00/ipw2100.c
+++ b/drivers/net/wireless/ipw2x00/ipw2100.c
@@ -3464,11 +3464,8 @@ static int ipw2100_msg_allocate(struct ipw2100_priv *priv)
         priv->msg_buffers =
             kmalloc(IPW_COMMAND_POOL_SIZE * sizeof(struct ipw2100_tx_packet),
                     GFP_KERNEL);
-        if (!priv->msg_buffers) {
-                printk(KERN_ERR DRV_NAME ": %s: PCI alloc failed for msg "
-                       "buffers.\n", priv->net_dev->name);
+        if (!priv->msg_buffers)
                 return -ENOMEM;
-        }
 
         for (i = 0; i < IPW_COMMAND_POOL_SIZE; i++) {
                 v = pci_alloc_consistent(priv->pci_dev,
diff --git a/drivers/net/wireless/ipw2x00/libipw_module.c b/drivers/net/wireless/ipw2x00/libipw_module.c
index d5ef696298ee..3adb24021a28 100644
--- a/drivers/net/wireless/ipw2x00/libipw_module.c
+++ b/drivers/net/wireless/ipw2x00/libipw_module.c
@@ -150,10 +150,9 @@ struct net_device *alloc_libipw(int sizeof_priv, int monitor)
         LIBIPW_DEBUG_INFO("Initializing...\n");
 
         dev = alloc_etherdev(sizeof(struct libipw_device) + sizeof_priv);
-        if (!dev) {
-                LIBIPW_ERROR("Unable to allocate network device.\n");
+        if (!dev)
                 goto failed;
-        }
+
         ieee = netdev_priv(dev);
 
         ieee->dev = dev;
diff --git a/drivers/net/wireless/iwlwifi/iwl-1000.c b/drivers/net/wireless/iwlwifi/iwl-1000.c
index 1ef7bfc2ab25..cc04cce11567 100644
--- a/drivers/net/wireless/iwlwifi/iwl-1000.c
+++ b/drivers/net/wireless/iwlwifi/iwl-1000.c
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2008 - 2011 Intel Corporation. All rights reserved.
+ * 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
diff --git a/drivers/net/wireless/iwlwifi/iwl-2000.c b/drivers/net/wireless/iwlwifi/iwl-2000.c
index 094693328dbb..00db092d8cd0 100644
--- a/drivers/net/wireless/iwlwifi/iwl-2000.c
+++ b/drivers/net/wireless/iwlwifi/iwl-2000.c
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2008 - 2011 Intel Corporation. All rights reserved.
+ * 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
diff --git a/drivers/net/wireless/iwlwifi/iwl-5000.c b/drivers/net/wireless/iwlwifi/iwl-5000.c
index b3a365fea7bb..47fd98b3652c 100644
--- a/drivers/net/wireless/iwlwifi/iwl-5000.c
+++ b/drivers/net/wireless/iwlwifi/iwl-5000.c
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2007 - 2011 Intel Corporation. All rights reserved.
+ * Copyright(c) 2007 - 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
diff --git a/drivers/net/wireless/iwlwifi/iwl-6000.c b/drivers/net/wireless/iwlwifi/iwl-6000.c
index 54b753399e6e..ab62c018fcdb 100644
--- a/drivers/net/wireless/iwlwifi/iwl-6000.c
+++ b/drivers/net/wireless/iwlwifi/iwl-6000.c
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2008 - 2011 Intel Corporation. All rights reserved.
+ * 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
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-calib.c b/drivers/net/wireless/iwlwifi/iwl-agn-calib.c
index 50ff849c9f67..6aa009827865 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-calib.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-calib.c
@@ -5,7 +5,7 @@
  *
  * GPL LICENSE SUMMARY
  *
- * Copyright(c) 2008 - 2011 Intel Corporation. All rights reserved.
+ * 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
@@ -30,7 +30,7 @@
  *
  * BSD LICENSE
  *
- * Copyright(c) 2005 - 2011 Intel Corporation. All rights reserved.
+ * Copyright(c) 2005 - 2012 Intel Corporation. All rights reserved.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-calib.h b/drivers/net/wireless/iwlwifi/iwl-agn-calib.h
index 10275ce92bde..9ed6683314a7 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-calib.h
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-calib.h
@@ -5,7 +5,7 @@
  *
  * GPL LICENSE SUMMARY
  *
- * Copyright(c) 2008 - 2011 Intel Corporation. All rights reserved.
+ * 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
@@ -30,7 +30,7 @@
  *
  * BSD LICENSE
  *
- * Copyright(c) 2005 - 2011 Intel Corporation. All rights reserved.
+ * Copyright(c) 2005 - 2012 Intel Corporation. All rights reserved.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-hw.h b/drivers/net/wireless/iwlwifi/iwl-agn-hw.h
index 123ef5e129d5..d0ec0abd3c89 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-hw.h
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-hw.h
@@ -5,7 +5,7 @@
  *
  * GPL LICENSE SUMMARY
  *
- * Copyright(c) 2007 - 2011 Intel Corporation. All rights reserved.
+ * Copyright(c) 2007 - 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
@@ -30,7 +30,7 @@
  *
  * BSD LICENSE
  *
- * Copyright(c) 2005 - 2011 Intel Corporation. All rights reserved.
+ * Copyright(c) 2005 - 2012 Intel Corporation. All rights reserved.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-lib.c b/drivers/net/wireless/iwlwifi/iwl-agn-lib.c
index 64cf439035c3..a8f7689aaacf 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-lib.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-lib.c
@@ -2,7 +2,7 @@
  *
  * GPL LICENSE SUMMARY
  *
- * Copyright(c) 2008 - 2011 Intel Corporation. All rights reserved.
+ * 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
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-rs.c b/drivers/net/wireless/iwlwifi/iwl-agn-rs.c
index 334b5ae8fdd4..b9ba404d15c1 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-rs.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-rs.c
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2005 - 2011 Intel Corporation. All rights reserved.
+ * Copyright(c) 2005 - 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
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-rs.h b/drivers/net/wireless/iwlwifi/iwl-agn-rs.h
index 6675b3c816d9..203b1c13c491 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-rs.h
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-rs.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2003 - 2011 Intel Corporation. All rights reserved.
+ * Copyright(c) 2003 - 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
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-rx.c b/drivers/net/wireless/iwlwifi/iwl-agn-rx.c
index b22b2976f899..f127f913e5a6 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-rx.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-rx.c
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2003 - 2011 Intel Corporation. All rights reserved.
+ * Copyright(c) 2003 - 2012 Intel Corporation. All rights reserved.
  *
  * Portions of this file are derived from the ipw3945 project, as well
  * as portionhelp of the ieee80211 subsystem header files.
@@ -1172,20 +1172,22 @@ int iwl_rx_dispatch(struct iwl_priv *priv, struct iwl_rx_mem_buffer *rxb,
                 wake_up_all(&priv->shrd->notif_waitq);
         }
 
-        if (priv->pre_rx_handler)
+        if (priv->pre_rx_handler &&
+            priv->shrd->ucode_owner == IWL_OWNERSHIP_TM)
                 priv->pre_rx_handler(priv, rxb);
-
-        /* Based on type of command response or notification,
-         *   handle those that need handling via function in
-         *   rx_handlers table.  See iwl_setup_rx_handlers() */
-        if (priv->rx_handlers[pkt->hdr.cmd]) {
-                priv->rx_handlers_stats[pkt->hdr.cmd]++;
-                err = priv->rx_handlers[pkt->hdr.cmd] (priv, rxb, cmd);
-        } else {
-                /* No handling needed */
-                IWL_DEBUG_RX(priv,
-                        "No handler needed for %s, 0x%02x\n",
-                        get_cmd_string(pkt->hdr.cmd), pkt->hdr.cmd);
+        else {
+                /* Based on type of command response or notification,
+                 *   handle those that need handling via function in
+                 *   rx_handlers table.  See iwl_setup_rx_handlers() */
+                if (priv->rx_handlers[pkt->hdr.cmd]) {
+                        priv->rx_handlers_stats[pkt->hdr.cmd]++;
+                        err = priv->rx_handlers[pkt->hdr.cmd] (priv, rxb, cmd);
+                } else {
+                        /* No handling needed */
+                        IWL_DEBUG_RX(priv,
+                                "No handler needed for %s, 0x%02x\n",
+                                get_cmd_string(pkt->hdr.cmd), pkt->hdr.cmd);
+                }
         }
         return err;
 }
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c b/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
index 1c6659416621..8ca9570ec365 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2003 - 2011 Intel Corporation. All rights reserved.
+ * Copyright(c) 2003 - 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
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-sta.c b/drivers/net/wireless/iwlwifi/iwl-agn-sta.c
index 7353826095f1..d6aab00272b9 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-sta.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-sta.c
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2003 - 2011 Intel Corporation. All rights reserved.
+ * Copyright(c) 2003 - 2012 Intel Corporation. All rights reserved.
  *
  * Portions of this file are derived from the ipw3945 project, as well
  * as portions of the ieee80211 subsystem header files.
@@ -35,9 +35,12 @@
 #include "iwl-trans.h"
 
 /* priv->shrd->sta_lock must be held */
-static void iwl_sta_ucode_activate(struct iwl_priv *priv, u8 sta_id)
+static int iwl_sta_ucode_activate(struct iwl_priv *priv, u8 sta_id)
 {
-
+        if (sta_id >= IWLAGN_STATION_COUNT) {
+                IWL_ERR(priv, "invalid sta_id %u", sta_id);
+                return -EINVAL;
+        }
         if (!(priv->stations[sta_id].used & IWL_STA_DRIVER_ACTIVE))
                 IWL_ERR(priv, "ACTIVATE a non DRIVER active station id %u "
                         "addr %pM\n",
@@ -53,6 +56,7 @@ static void iwl_sta_ucode_activate(struct iwl_priv *priv, u8 sta_id)
                 IWL_DEBUG_ASSOC(priv, "Added STA id %u addr %pM to uCode\n",
                                 sta_id, priv->stations[sta_id].sta.sta.addr);
         }
+        return 0;
 }
 
 static int iwl_process_add_sta_resp(struct iwl_priv *priv,
@@ -77,8 +81,7 @@ static int iwl_process_add_sta_resp(struct iwl_priv *priv,
         switch (pkt->u.add_sta.status) {
         case ADD_STA_SUCCESS_MSK:
                 IWL_DEBUG_INFO(priv, "REPLY_ADD_STA PASSED\n");
-                iwl_sta_ucode_activate(priv, sta_id);
-                ret = 0;
+                ret = iwl_sta_ucode_activate(priv, sta_id);
                 break;
         case ADD_STA_NO_ROOM_IN_TABLE:
                 IWL_ERR(priv, "Adding station %d failed, no room in table.\n",
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-tt.c b/drivers/net/wireless/iwlwifi/iwl-agn-tt.c
index b0dff7a753a5..56c6def015a4 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-tt.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-tt.c
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2007 - 2011 Intel Corporation. All rights reserved.
+ * Copyright(c) 2007 - 2012 Intel Corporation. All rights reserved.
  *
  * Portions of this file are derived from the ipw3945 project, as well
  * as portions of the ieee80211 subsystem header files.
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-tt.h b/drivers/net/wireless/iwlwifi/iwl-agn-tt.h
index 7282a23e8f1c..86bbf47501c1 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-tt.h
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-tt.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2007 - 2011 Intel Corporation. All rights reserved.
+ * Copyright(c) 2007 - 2012 Intel Corporation. All rights reserved.
  *
  * Portions of this file are derived from the ipw3945 project, as well
  * as portions of the ieee80211 subsystem header files.
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-tx.c b/drivers/net/wireless/iwlwifi/iwl-agn-tx.c
index 63bbc60be28e..64f8db685dc5 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-tx.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-tx.c
@@ -2,7 +2,7 @@
  *
  * GPL LICENSE SUMMARY
  *
- * Copyright(c) 2008 - 2011 Intel Corporation. All rights reserved.
+ * 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
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c
index b5c7c5f0a753..90315c69cdf6 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn.c
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2003 - 2011 Intel Corporation. All rights reserved.
+ * Copyright(c) 2003 - 2012 Intel Corporation. All rights reserved.
  *
  * Portions of this file are derived from the ipw3945 project, as well
  * as portions of the ieee80211 subsystem header files.
@@ -315,7 +315,7 @@ static void iwl_bg_statistics_periodic(unsigned long data)
 
 static void iwl_print_cont_event_trace(struct iwl_priv *priv, u32 base,
                                         u32 start_idx, u32 num_events,
-                                        u32 mode)
+                                        u32 capacity, u32 mode)
 {
         u32 i;
         u32 ptr;        /* SRAM byte address of log data */
@@ -339,6 +339,15 @@ static void iwl_print_cont_event_trace(struct iwl_priv *priv, u32 base,
         rmb();
 
         /*
+         * Refuse to read more than would have fit into the log from
+         * the current start_idx. This used to happen due to the race
+         * described below, but now WARN because the code below should
+         * prevent it from happening here.
+         */
+        if (WARN_ON(num_events > capacity - start_idx))
+                num_events = capacity - start_idx;
+
+        /*
          * "time" is actually "data" for mode 0 (no timestamp).
          * place event id # at far right for easier visual parsing.
          */
@@ -346,12 +355,11 @@ static void iwl_print_cont_event_trace(struct iwl_priv *priv, u32 base,
                 ev = iwl_read32(bus(priv), HBUS_TARG_MEM_RDAT);
                 time = iwl_read32(bus(priv), HBUS_TARG_MEM_RDAT);
                 if (mode == 0) {
-                        trace_iwlwifi_dev_ucode_cont_event(priv,
-                                                        0, time, ev);
+                        trace_iwlwifi_dev_ucode_cont_event(priv, 0, time, ev);
                 } else {
                         data = iwl_read32(bus(priv), HBUS_TARG_MEM_RDAT);
-                        trace_iwlwifi_dev_ucode_cont_event(priv,
-                                                time, data, ev);
+                        trace_iwlwifi_dev_ucode_cont_event(priv, time,
+                                                           data, ev);
                 }
         }
         /* Allow device to power down */
@@ -362,53 +370,83 @@ static void iwl_print_cont_event_trace(struct iwl_priv *priv, u32 base,
 static void iwl_continuous_event_trace(struct iwl_priv *priv)
 {
         u32 capacity;   /* event log capacity in # entries */
+        struct {
+                u32 capacity;
+                u32 mode;
+                u32 wrap_counter;
+                u32 write_counter;
+        } __packed read;
         u32 base;       /* SRAM byte address of event log header */
         u32 mode;       /* 0 - no timestamp, 1 - timestamp recorded */
         u32 num_wraps;  /* # times uCode wrapped to top of log */
         u32 next_entry; /* index of next entry to be written by uCode */
 
-        base = priv->shrd->device_pointers.error_event_table;
+        base = priv->shrd->device_pointers.log_event_table;
         if (iwlagn_hw_valid_rtc_data_addr(base)) {
-                capacity = iwl_read_targ_mem(bus(priv), base);
-                num_wraps = iwl_read_targ_mem(bus(priv),
-                                                base + (2 * sizeof(u32)));
-                mode = iwl_read_targ_mem(bus(priv), base + (1 * sizeof(u32)));
-                next_entry = iwl_read_targ_mem(bus(priv),
-                                                base + (3 * sizeof(u32)));
+                iwl_read_targ_mem_words(bus(priv), base, &read, sizeof(read));
+
+                capacity = read.capacity;
+                mode = read.mode;
+                num_wraps = read.wrap_counter;
+                next_entry = read.write_counter;
         } else
                 return;
 
+        /*
+         * Unfortunately, the uCode doesn't use temporary variables.
+         * Therefore, it can happen that we read next_entry == capacity,
+         * which really means next_entry == 0.
+         */
+        if (unlikely(next_entry == capacity))
+                next_entry = 0;
+        /*
+         * Additionally, the uCode increases the write pointer before
+         * the wraps counter, so if the write pointer is smaller than
+         * the old write pointer (wrap occurred) but we read that no
+         * wrap occurred, we actually read between the next_entry and
+         * num_wraps update (this does happen in practice!!) -- take
+         * that into account by increasing num_wraps.
+         */
+        if (unlikely(next_entry < priv->event_log.next_entry &&
+                     num_wraps == priv->event_log.num_wraps))
+                num_wraps++;
+
         if (num_wraps == priv->event_log.num_wraps) {
-                iwl_print_cont_event_trace(priv,
-                                       base, priv->event_log.next_entry,
-                                       next_entry - priv->event_log.next_entry,
-                                       mode);
+                iwl_print_cont_event_trace(
+                        priv, base, priv->event_log.next_entry,
+                        next_entry - priv->event_log.next_entry,
+                        capacity, mode);
+
                 priv->event_log.non_wraps_count++;
         } else {
-                if ((num_wraps - priv->event_log.num_wraps) > 1)
+                if (num_wraps - priv->event_log.num_wraps > 1)
                         priv->event_log.wraps_more_count++;
                 else
                         priv->event_log.wraps_once_count++;
+
                 trace_iwlwifi_dev_ucode_wrap_event(priv,
                                 num_wraps - priv->event_log.num_wraps,
                                 next_entry, priv->event_log.next_entry);
+
                 if (next_entry < priv->event_log.next_entry) {
-                        iwl_print_cont_event_trace(priv, base,
-                               priv->event_log.next_entry,
-                               capacity - priv->event_log.next_entry,
-                               mode);
+                        iwl_print_cont_event_trace(
+                                priv, base, priv->event_log.next_entry,
+                                capacity - priv->event_log.next_entry,
+                                capacity, mode);
 
-                        iwl_print_cont_event_trace(priv, base, 0,
-                                next_entry, mode);
+                        iwl_print_cont_event_trace(
+                                priv, base, 0, next_entry, capacity, mode);
                 } else {
-                        iwl_print_cont_event_trace(priv, base,
-                               next_entry, capacity - next_entry,
-                               mode);
+                        iwl_print_cont_event_trace(
+                                priv, base, next_entry,
+                                capacity - next_entry,
+                                capacity, mode);
 
-                        iwl_print_cont_event_trace(priv, base, 0,
-                                next_entry, mode);
+                        iwl_print_cont_event_trace(
+                                priv, base, 0, next_entry, capacity, mode);
                 }
         }
+
         priv->event_log.num_wraps = num_wraps;
         priv->event_log.next_entry = next_entry;
 }
@@ -1219,6 +1257,11 @@ int iwl_alive_start(struct iwl_priv *priv)
         if (iwl_is_rfkill(priv->shrd))
                 return -ERFKILL;
 
+        if (priv->event_log.ucode_trace) {
+                /* start collecting data now */
+                mod_timer(&priv->ucode_trace, jiffies);
+        }
+
         /* download priority table before any calibration request */
         if (cfg(priv)->bt_params &&
             cfg(priv)->bt_params->advanced_bt_coexist) {
@@ -2054,7 +2097,7 @@ MODULE_PARM_DESC(bt_coex_active, "enable wifi/bt co-exist (default: enable)");
 
 module_param_named(led_mode, iwlagn_mod_params.led_mode, int, S_IRUGO);
 MODULE_PARM_DESC(led_mode, "0=system default, "
-                "1=On(RF On)/Off(RF Off), 2=blinking (default: 0)");
+                "1=On(RF On)/Off(RF Off), 2=blinking, 3=Off (default: 0)");
 
 module_param_named(power_save, iwlagn_mod_params.power_save,
                 bool, S_IRUGO);
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.h b/drivers/net/wireless/iwlwifi/iwl-agn.h
index f84fb3c53563..39cbe1a1577c 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn.h
+++ b/drivers/net/wireless/iwlwifi/iwl-agn.h
@@ -5,7 +5,7 @@
  *
  * GPL LICENSE SUMMARY
  *
- * Copyright(c) 2008 - 2011 Intel Corporation. All rights reserved.
+ * 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
@@ -30,7 +30,7 @@
  *
  * BSD LICENSE
  *
- * Copyright(c) 2005 - 2011 Intel Corporation. All rights reserved.
+ * Copyright(c) 2005 - 2012 Intel Corporation. All rights reserved.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/net/wireless/iwlwifi/iwl-bus.h b/drivers/net/wireless/iwlwifi/iwl-bus.h
index 940d5038b39c..941b9cb23442 100644
--- a/drivers/net/wireless/iwlwifi/iwl-bus.h
+++ b/drivers/net/wireless/iwlwifi/iwl-bus.h
@@ -5,7 +5,7 @@
  *
  * GPL LICENSE SUMMARY
  *
- * Copyright(c) 2007 - 2011 Intel Corporation. All rights reserved.
+ * Copyright(c) 2007 - 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
@@ -30,7 +30,7 @@
  *
  * BSD LICENSE
  *
- * Copyright(c) 2005 - 2011 Intel Corporation. All rights reserved.
+ * Copyright(c) 2005 - 2012 Intel Corporation. All rights reserved.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/net/wireless/iwlwifi/iwl-cfg.h b/drivers/net/wireless/iwlwifi/iwl-cfg.h
index e1d78257e4a9..957bc00cdaf0 100644
--- a/drivers/net/wireless/iwlwifi/iwl-cfg.h
+++ b/drivers/net/wireless/iwlwifi/iwl-cfg.h
@@ -5,7 +5,7 @@
  *
  * GPL LICENSE SUMMARY
  *
- * Copyright(c) 2007 - 2011 Intel Corporation. All rights reserved.
+ * Copyright(c) 2007 - 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
@@ -30,7 +30,7 @@
  *
  * BSD LICENSE
  *
- * Copyright(c) 2005 - 2011 Intel Corporation. All rights reserved.
+ * Copyright(c) 2005 - 2012 Intel Corporation. All rights reserved.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/net/wireless/iwlwifi/iwl-commands.h b/drivers/net/wireless/iwlwifi/iwl-commands.h
index f822ac447c3b..c20618d92268 100644
--- a/drivers/net/wireless/iwlwifi/iwl-commands.h
+++ b/drivers/net/wireless/iwlwifi/iwl-commands.h
@@ -5,7 +5,7 @@
  *
  * GPL LICENSE SUMMARY
  *
- * Copyright(c) 2005 - 2011 Intel Corporation. All rights reserved.
+ * Copyright(c) 2005 - 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
@@ -30,7 +30,7 @@
  *
  * BSD LICENSE
  *
- * Copyright(c) 2005 - 2011 Intel Corporation. All rights reserved.
+ * Copyright(c) 2005 - 2012 Intel Corporation. All rights reserved.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/net/wireless/iwlwifi/iwl-core.c b/drivers/net/wireless/iwlwifi/iwl-core.c
index 7bcfa781e0b9..7d6eef96454a 100644
--- a/drivers/net/wireless/iwlwifi/iwl-core.c
+++ b/drivers/net/wireless/iwlwifi/iwl-core.c
@@ -2,7 +2,7 @@
  *
  * GPL LICENSE SUMMARY
  *
- * Copyright(c) 2008 - 2011 Intel Corporation. All rights reserved.
+ * 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
diff --git a/drivers/net/wireless/iwlwifi/iwl-core.h b/drivers/net/wireless/iwlwifi/iwl-core.h
index 7bf76ab94dd2..63f29111da13 100644
--- a/drivers/net/wireless/iwlwifi/iwl-core.h
+++ b/drivers/net/wireless/iwlwifi/iwl-core.h
@@ -5,7 +5,7 @@
  *
  * GPL LICENSE SUMMARY
  *
- * Copyright(c) 2008 - 2011 Intel Corporation. All rights reserved.
+ * 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
@@ -30,7 +30,7 @@
  *
  * BSD LICENSE
  *
- * Copyright(c) 2005 - 2011 Intel Corporation. All rights reserved.
+ * Copyright(c) 2005 - 2012 Intel Corporation. All rights reserved.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/net/wireless/iwlwifi/iwl-csr.h b/drivers/net/wireless/iwlwifi/iwl-csr.h
index fbc3095c7b44..5f96ce105f08 100644
--- a/drivers/net/wireless/iwlwifi/iwl-csr.h
+++ b/drivers/net/wireless/iwlwifi/iwl-csr.h
@@ -5,7 +5,7 @@
  *
  * GPL LICENSE SUMMARY
  *
- * Copyright(c) 2005 - 2011 Intel Corporation. All rights reserved.
+ * Copyright(c) 2005 - 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
@@ -30,7 +30,7 @@
  *
  * BSD LICENSE
  *
- * Copyright(c) 2005 - 2011 Intel Corporation. All rights reserved.
+ * Copyright(c) 2005 - 2012 Intel Corporation. All rights reserved.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/net/wireless/iwlwifi/iwl-debug.h b/drivers/net/wireless/iwlwifi/iwl-debug.h
index f8fc2393dd4c..6f7612781e03 100644
--- a/drivers/net/wireless/iwlwifi/iwl-debug.h
+++ b/drivers/net/wireless/iwlwifi/iwl-debug.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2003 - 2011 Intel Corporation. All rights reserved.
+ * Copyright(c) 2003 - 2012 Intel Corporation. All rights reserved.
  *
  * Portions of this file are derived from the ipw3945 project.
  *
diff --git a/drivers/net/wireless/iwlwifi/iwl-debugfs.c b/drivers/net/wireless/iwlwifi/iwl-debugfs.c
index 04a3343f4610..978a1d4c6a0a 100644
--- a/drivers/net/wireless/iwlwifi/iwl-debugfs.c
+++ b/drivers/net/wireless/iwlwifi/iwl-debugfs.c
@@ -2,7 +2,7 @@
  *
  * GPL LICENSE SUMMARY
  *
- * Copyright(c) 2008 - 2011 Intel Corporation. All rights reserved.
+ * 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
@@ -2131,9 +2131,10 @@ static ssize_t iwl_dbgfs_ucode_tracing_write(struct file *file,
 
         if (trace) {
                 priv->event_log.ucode_trace = true;
-                /* schedule the ucode timer to occur in UCODE_TRACE_PERIOD */
-                mod_timer(&priv->ucode_trace,
-                        jiffies + msecs_to_jiffies(UCODE_TRACE_PERIOD));
+                if (iwl_is_alive(priv->shrd)) {
+                        /* start collecting data now */
+                        mod_timer(&priv->ucode_trace, jiffies);
+                }
         } else {
                 priv->event_log.ucode_trace = false;
                 del_timer_sync(&priv->ucode_trace);
diff --git a/drivers/net/wireless/iwlwifi/iwl-dev.h b/drivers/net/wireless/iwlwifi/iwl-dev.h
index e54a4d11e584..af846002150a 100644
--- a/drivers/net/wireless/iwlwifi/iwl-dev.h
+++ b/drivers/net/wireless/iwlwifi/iwl-dev.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2003 - 2011 Intel Corporation. All rights reserved.
+ * Copyright(c) 2003 - 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
@@ -661,7 +661,7 @@ struct traffic_stats {
  * schedule the timer to wake up every UCODE_TRACE_PERIOD milliseconds
  * to perform continuous uCode event logging operation if enabled
  */
-#define UCODE_TRACE_PERIOD (100)
+#define UCODE_TRACE_PERIOD (10)
 
 /*
  * iwl_event_log: current uCode event log position
diff --git a/drivers/net/wireless/iwlwifi/iwl-devtrace.c b/drivers/net/wireless/iwlwifi/iwl-devtrace.c
index 2a2c8de64a04..91f45e71e0a2 100644
--- a/drivers/net/wireless/iwlwifi/iwl-devtrace.c
+++ b/drivers/net/wireless/iwlwifi/iwl-devtrace.c
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2009 - 2011 Intel Corporation. All rights reserved.
+ * Copyright(c) 2009 - 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
diff --git a/drivers/net/wireless/iwlwifi/iwl-devtrace.h b/drivers/net/wireless/iwlwifi/iwl-devtrace.h
index 9b212a8f30bb..4d892211ce4c 100644
--- a/drivers/net/wireless/iwlwifi/iwl-devtrace.h
+++ b/drivers/net/wireless/iwlwifi/iwl-devtrace.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2009 - 2011 Intel Corporation. All rights reserved.
+ * Copyright(c) 2009 - 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
diff --git a/drivers/net/wireless/iwlwifi/iwl-eeprom.c b/drivers/net/wireless/iwlwifi/iwl-eeprom.c
index c1eda9724f42..e27d9f55267b 100644
--- a/drivers/net/wireless/iwlwifi/iwl-eeprom.c
+++ b/drivers/net/wireless/iwlwifi/iwl-eeprom.c
@@ -5,7 +5,7 @@
  *
  * GPL LICENSE SUMMARY
  *
- * Copyright(c) 2008 - 2011 Intel Corporation. All rights reserved.
+ * 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
@@ -30,7 +30,7 @@
  *
  * BSD LICENSE
  *
- * Copyright(c) 2005 - 2011 Intel Corporation. All rights reserved.
+ * Copyright(c) 2005 - 2012 Intel Corporation. All rights reserved.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/net/wireless/iwlwifi/iwl-eeprom.h b/drivers/net/wireless/iwlwifi/iwl-eeprom.h
index 9fa937ec35e3..13f2d3928ef8 100644
--- a/drivers/net/wireless/iwlwifi/iwl-eeprom.h
+++ b/drivers/net/wireless/iwlwifi/iwl-eeprom.h
@@ -5,7 +5,7 @@
  *
  * GPL LICENSE SUMMARY
  *
- * Copyright(c) 2008 - 2011 Intel Corporation. All rights reserved.
+ * 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
@@ -30,7 +30,7 @@
  *
  * BSD LICENSE
  *
- * Copyright(c) 2005 - 2011 Intel Corporation. All rights reserved.
+ * Copyright(c) 2005 - 2012 Intel Corporation. All rights reserved.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/net/wireless/iwlwifi/iwl-fh.h b/drivers/net/wireless/iwlwifi/iwl-fh.h
index 5bede9d7f955..90208094b8eb 100644
--- a/drivers/net/wireless/iwlwifi/iwl-fh.h
+++ b/drivers/net/wireless/iwlwifi/iwl-fh.h
@@ -5,7 +5,7 @@
  *
  * GPL LICENSE SUMMARY
  *
- * Copyright(c) 2005 - 2011 Intel Corporation. All rights reserved.
+ * Copyright(c) 2005 - 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
@@ -30,7 +30,7 @@
  *
  * BSD LICENSE
  *
- * Copyright(c) 2005 - 2011 Intel Corporation. All rights reserved.
+ * Copyright(c) 2005 - 2012 Intel Corporation. All rights reserved.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/net/wireless/iwlwifi/iwl-io.c b/drivers/net/wireless/iwlwifi/iwl-io.c
index d57ea6484bbe..83fdff381150 100644
--- a/drivers/net/wireless/iwlwifi/iwl-io.c
+++ b/drivers/net/wireless/iwlwifi/iwl-io.c
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2003 - 2011 Intel Corporation. All rights reserved.
+ * Copyright(c) 2003 - 2012 Intel Corporation. All rights reserved.
  *
  * Portions of this file are derived from the ipw3945 project.
  *
diff --git a/drivers/net/wireless/iwlwifi/iwl-io.h b/drivers/net/wireless/iwlwifi/iwl-io.h
index aae2eeb331a8..427d065435c8 100644
--- a/drivers/net/wireless/iwlwifi/iwl-io.h
+++ b/drivers/net/wireless/iwlwifi/iwl-io.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2003 - 2011 Intel Corporation. All rights reserved.
+ * Copyright(c) 2003 - 2012 Intel Corporation. All rights reserved.
  *
  * Portions of this file are derived from the ipw3945 project.
  *
diff --git a/drivers/net/wireless/iwlwifi/iwl-led.c b/drivers/net/wireless/iwlwifi/iwl-led.c
index 14dcbfcdc0fd..8761438f1532 100644
--- a/drivers/net/wireless/iwlwifi/iwl-led.c
+++ b/drivers/net/wireless/iwlwifi/iwl-led.c
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2003 - 2011 Intel Corporation. All rights reserved.
+ * Copyright(c) 2003 - 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
@@ -177,6 +177,10 @@ void iwl_leds_init(struct iwl_priv *priv)
         int mode = iwlagn_mod_params.led_mode;
         int ret;
 
+        if (mode == IWL_LED_DISABLE) {
+                IWL_INFO(priv, "Led disabled\n");
+                return;
+        }
         if (mode == IWL_LED_DEFAULT)
                 mode = cfg(priv)->led_mode;
 
diff --git a/drivers/net/wireless/iwlwifi/iwl-led.h b/drivers/net/wireless/iwlwifi/iwl-led.h
index 2550b3c7dcbf..b02a853103d3 100644
--- a/drivers/net/wireless/iwlwifi/iwl-led.h
+++ b/drivers/net/wireless/iwlwifi/iwl-led.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2003 - 2011 Intel Corporation. All rights reserved.
+ * Copyright(c) 2003 - 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
diff --git a/drivers/net/wireless/iwlwifi/iwl-mac80211.c b/drivers/net/wireless/iwlwifi/iwl-mac80211.c
index f980e574e1f9..965d0475affd 100644
--- a/drivers/net/wireless/iwlwifi/iwl-mac80211.c
+++ b/drivers/net/wireless/iwlwifi/iwl-mac80211.c
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2003 - 2011 Intel Corporation. All rights reserved.
+ * Copyright(c) 2003 - 2012 Intel Corporation. All rights reserved.
  *
  * Portions of this file are derived from the ipw3945 project, as well
  * as portions of the ieee80211 subsystem header files.
diff --git a/drivers/net/wireless/iwlwifi/iwl-pci.c b/drivers/net/wireless/iwlwifi/iwl-pci.c
index fb30ea7ca96b..03702a2e913a 100644
--- a/drivers/net/wireless/iwlwifi/iwl-pci.c
+++ b/drivers/net/wireless/iwlwifi/iwl-pci.c
@@ -5,7 +5,7 @@
  *
  * GPL LICENSE SUMMARY
  *
- * Copyright(c) 2007 - 2011 Intel Corporation. All rights reserved.
+ * Copyright(c) 2007 - 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
@@ -30,7 +30,7 @@
  *
  * BSD LICENSE
  *
- * Copyright(c) 2005 - 2011 Intel Corporation. All rights reserved.
+ * Copyright(c) 2005 - 2012 Intel Corporation. All rights reserved.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/net/wireless/iwlwifi/iwl-power.c b/drivers/net/wireless/iwlwifi/iwl-power.c
index 2b188a6025b3..c7394ef2e490 100644
--- a/drivers/net/wireless/iwlwifi/iwl-power.c
+++ b/drivers/net/wireless/iwlwifi/iwl-power.c
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2007 - 2011 Intel Corporation. All rights reserved.
+ * Copyright(c) 2007 - 2012 Intel Corporation. All rights reserved.
  *
  * Portions of this file are derived from the ipw3945 project, as well
  * as portions of the ieee80211 subsystem header files.
diff --git a/drivers/net/wireless/iwlwifi/iwl-power.h b/drivers/net/wireless/iwlwifi/iwl-power.h
index 5f7b720cf1a4..07a19fce5fdc 100644
--- a/drivers/net/wireless/iwlwifi/iwl-power.h
+++ b/drivers/net/wireless/iwlwifi/iwl-power.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2007 - 2011 Intel Corporation. All rights reserved.
+ * Copyright(c) 2007 - 2012 Intel Corporation. All rights reserved.
  *
  * Portions of this file are derived from the ipw3945 project, as well
  * as portions of the ieee80211 subsystem header files.
diff --git a/drivers/net/wireless/iwlwifi/iwl-prph.h b/drivers/net/wireless/iwlwifi/iwl-prph.h
index bebdd828f324..a4d11016c3b4 100644
--- a/drivers/net/wireless/iwlwifi/iwl-prph.h
+++ b/drivers/net/wireless/iwlwifi/iwl-prph.h
@@ -5,7 +5,7 @@
  *
  * GPL LICENSE SUMMARY
  *
- * Copyright(c) 2005 - 2011 Intel Corporation. All rights reserved.
+ * Copyright(c) 2005 - 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
@@ -30,7 +30,7 @@
  *
  * BSD LICENSE
  *
- * Copyright(c) 2005 - 2011 Intel Corporation. All rights reserved.
+ * Copyright(c) 2005 - 2012 Intel Corporation. All rights reserved.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/net/wireless/iwlwifi/iwl-scan.c b/drivers/net/wireless/iwlwifi/iwl-scan.c
index a6454726737e..7f2e3a1c80ef 100644
--- a/drivers/net/wireless/iwlwifi/iwl-scan.c
+++ b/drivers/net/wireless/iwlwifi/iwl-scan.c
@@ -2,7 +2,7 @@
  *
  * GPL LICENSE SUMMARY
  *
- * Copyright(c) 2008 - 2011 Intel Corporation. All rights reserved.
+ * 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
@@ -414,10 +414,25 @@ static u16 iwl_limit_dwell(struct iwl_priv *priv, u16 dwell_time)
         for_each_context(priv, ctx) {
                 u16 value;
 
-                if (!iwl_is_associated_ctx(ctx))
-                        continue;
-                if (ctx->staging.dev_type == RXON_DEV_TYPE_P2P)
+                switch (ctx->staging.dev_type) {
+                case RXON_DEV_TYPE_P2P:
+                        /* no timing constraints */
                         continue;
+                case RXON_DEV_TYPE_ESS:
+                default:
+                        /* timing constraints if associated */
+                        if (!iwl_is_associated_ctx(ctx))
+                                continue;
+                        break;
+                case RXON_DEV_TYPE_CP:
+                case RXON_DEV_TYPE_2STA:
+                        /*
+                         * These seem to always have timers for TBTT
+                         * active in uCode even when not associated yet.
+                         */
+                        break;
+                }
+
                 value = ctx->beacon_int;
                 if (!value)
                         value = IWL_PASSIVE_DWELL_BASE;
diff --git a/drivers/net/wireless/iwlwifi/iwl-shared.h b/drivers/net/wireless/iwlwifi/iwl-shared.h
index dc55cc4a8108..04975b7b65b3 100644
--- a/drivers/net/wireless/iwlwifi/iwl-shared.h
+++ b/drivers/net/wireless/iwlwifi/iwl-shared.h
@@ -5,7 +5,7 @@
  *
  * GPL LICENSE SUMMARY
  *
- * Copyright(c) 2007 - 2011 Intel Corporation. All rights reserved.
+ * Copyright(c) 2007 - 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
@@ -30,7 +30,7 @@
  *
  * BSD LICENSE
  *
- * Copyright(c) 2005 - 2011 Intel Corporation. All rights reserved.
+ * Copyright(c) 2005 - 2012 Intel Corporation. All rights reserved.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -102,7 +102,7 @@ struct iwl_trans_ops;
 
 #define DRV_NAME        "iwlwifi"
 #define IWLWIFI_VERSION "in-tree:"
-#define DRV_COPYRIGHT   "Copyright(c) 2003-2011 Intel Corporation"
+#define DRV_COPYRIGHT   "Copyright(c) 2003-2012 Intel Corporation"
 #define DRV_AUTHOR     "<ilw@linux.intel.com>"
 
 extern struct iwl_mod_params iwlagn_mod_params;
@@ -264,11 +264,13 @@ enum iwl_pa_type {
  *                      LED ON  = RF ON
  *                      LED OFF = RF OFF
  *    IWL_LED_BLINK:    adjust led blink rate based on blink table
+ *    IWL_LED_DISABLE:  led disabled
  */
 enum iwl_led_mode {
         IWL_LED_DEFAULT,
         IWL_LED_RF_STATE,
         IWL_LED_BLINK,
+        IWL_LED_DISABLE,
 };
 
 /**
diff --git a/drivers/net/wireless/iwlwifi/iwl-testmode.c b/drivers/net/wireless/iwlwifi/iwl-testmode.c
index 4a5cddd2d56b..a56a77b8f926 100644
--- a/drivers/net/wireless/iwlwifi/iwl-testmode.c
+++ b/drivers/net/wireless/iwlwifi/iwl-testmode.c
@@ -5,7 +5,7 @@
  *
  * GPL LICENSE SUMMARY
  *
- * Copyright(c) 2010 - 2011 Intel Corporation. All rights reserved.
+ * 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
@@ -30,7 +30,7 @@
  *
  * BSD LICENSE
  *
- * Copyright(c) 2010 - 2011 Intel Corporation. All rights reserved.
+ * Copyright(c) 2010 - 2012 Intel Corporation. All rights reserved.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -115,6 +115,9 @@ struct nla_policy iwl_testmode_gnl_msg_policy[IWL_TM_ATTR_MAX] = {
 
         [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, },
 };
 
 /*
@@ -299,7 +302,7 @@ static int iwl_testmode_reg(struct ieee80211_hw *hw, struct nlattr **tb)
 
         switch (nla_get_u32(tb[IWL_TM_ATTR_COMMAND])) {
         case IWL_TM_CMD_APP2DEV_DIRECT_REG_READ32:
-                val32 = iwl_read32(bus(priv), ofs);
+                val32 = iwl_read_direct32(bus(priv), ofs);
                 IWL_INFO(priv, "32bit value to read 0x%x\n", val32);
 
                 skb = cfg80211_testmode_alloc_reply_skb(hw->wiphy, 20);
@@ -321,7 +324,7 @@ static int iwl_testmode_reg(struct ieee80211_hw *hw, struct nlattr **tb)
                 } else {
                         val32 = nla_get_u32(tb[IWL_TM_ATTR_REG_VALUE32]);
                         IWL_INFO(priv, "32bit value to write 0x%x\n", val32);
-                        iwl_write32(bus(priv), ofs, val32);
+                        iwl_write_direct32(bus(priv), ofs, val32);
                 }
                 break;
         case IWL_TM_CMD_APP2DEV_DIRECT_REG_WRITE8:
@@ -422,7 +425,7 @@ static int iwl_testmode_driver(struct ieee80211_hw *hw, struct nlattr **tb)
         struct sk_buff *skb;
         unsigned char *rsp_data_ptr = NULL;
         int status = 0, rsp_data_len = 0;
-        u32 devid;
+        u32 devid, inst_size = 0, data_size = 0;
 
         switch (nla_get_u32(tb[IWL_TM_ATTR_COMMAND])) {
         case IWL_TM_CMD_APP2DEV_GET_DEVICENAME:
@@ -548,6 +551,41 @@ static int iwl_testmode_driver(struct ieee80211_hw *hw, struct nlattr **tb)
                                         "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_DEBUG_INFO(priv, "Error allocating memory\n");
+                        return -ENOMEM;
+                }
+                switch (priv->shrd->ucode_type) {
+                case IWL_UCODE_REGULAR:
+                        inst_size = trans(priv)->ucode_rt.code.len;
+                        data_size = trans(priv)->ucode_rt.data.len;
+                        break;
+                case IWL_UCODE_INIT:
+                        inst_size = trans(priv)->ucode_init.code.len;
+                        data_size = trans(priv)->ucode_init.data.len;
+                        break;
+                case IWL_UCODE_WOWLAN:
+                        inst_size = trans(priv)->ucode_wowlan.code.len;
+                        data_size = trans(priv)->ucode_wowlan.data.len;
+                        break;
+                case IWL_UCODE_NONE:
+                        IWL_DEBUG_INFO(priv, "The uCode has not been loaded\n");
+                        break;
+                default:
+                        IWL_DEBUG_INFO(priv, "Unsupported uCode type\n");
+                        break;
+                }
+                NLA_PUT_U32(skb, IWL_TM_ATTR_FW_TYPE, priv->shrd->ucode_type);
+                NLA_PUT_U32(skb, IWL_TM_ATTR_FW_INST_SIZE, inst_size);
+                NLA_PUT_U32(skb, IWL_TM_ATTR_FW_DATA_SIZE, data_size);
+                status = cfg80211_testmode_reply(skb);
+                if (status < 0)
+                        IWL_DEBUG_INFO(priv,
+                                        "Error sending msg : %d\n", status);
+                break;
+
         default:
                 IWL_DEBUG_INFO(priv, "Unknown testmode driver command ID\n");
                 return -ENOSYS;
@@ -733,7 +771,7 @@ static int iwl_testmode_ownership(struct ieee80211_hw *hw, struct nlattr **tb)
 static int iwl_testmode_sram(struct ieee80211_hw *hw, struct nlattr **tb)
 {
         struct iwl_priv *priv = hw->priv;
-        u32 base, ofs, size, maxsize;
+        u32 ofs, size, maxsize;
 
         if (priv->testmode_sram.sram_readed)
                 return -EBUSY;
@@ -759,25 +797,24 @@ static int iwl_testmode_sram(struct ieee80211_hw *hw, struct nlattr **tb)
                 maxsize = trans(priv)->ucode_wowlan.data.len;
                 break;
         case IWL_UCODE_NONE:
-                IWL_DEBUG_INFO(priv, "Error, uCode does not been loaded\n");
+                IWL_ERR(priv, "Error, uCode does not been loaded\n");
                 return -ENOSYS;
         default:
-                IWL_DEBUG_INFO(priv, "Error, unsupported uCode type\n");
+                IWL_ERR(priv, "Error, unsupported uCode type\n");
                 return -ENOSYS;
         }
-        if ((ofs + size) > maxsize) {
-                IWL_DEBUG_INFO(priv, "Invalid offset/size: out of range\n");
+        if ((ofs + size) > (maxsize + SRAM_DATA_SEG_OFFSET)) {
+                IWL_ERR(priv, "Invalid offset/size: out of range\n");
                 return -EINVAL;
         }
         priv->testmode_sram.buff_size = (size / 4) * 4;
         priv->testmode_sram.buff_addr =
                 kmalloc(priv->testmode_sram.buff_size, GFP_KERNEL);
         if (priv->testmode_sram.buff_addr == NULL) {
-                IWL_DEBUG_INFO(priv, "Error allocating memory\n");
+                IWL_ERR(priv, "Error allocating memory\n");
                 return -ENOMEM;
         }
-        base = 0x800000;
-        _iwl_read_targ_mem_words(bus(priv), base + ofs,
+        _iwl_read_targ_mem_words(bus(priv), ofs,
                                         priv->testmode_sram.buff_addr,
                                         priv->testmode_sram.buff_size / 4);
         priv->testmode_sram.num_chunks =
@@ -882,6 +919,7 @@ int iwlagn_mac_testmode_cmd(struct ieee80211_hw *hw, void *data, int len)
         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;
diff --git a/drivers/net/wireless/iwlwifi/iwl-testmode.h b/drivers/net/wireless/iwlwifi/iwl-testmode.h
index 26138f110340..f97d06169b45 100644
--- a/drivers/net/wireless/iwlwifi/iwl-testmode.h
+++ b/drivers/net/wireless/iwlwifi/iwl-testmode.h
@@ -5,7 +5,7 @@
  *
  * GPL LICENSE SUMMARY
  *
- * Copyright(c) 2010 - 2011 Intel Corporation. All rights reserved.
+ * 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
@@ -30,7 +30,7 @@
  *
  * BSD LICENSE
  *
- * Copyright(c) 2010 - 2011 Intel Corporation. All rights reserved.
+ * Copyright(c) 2010 - 2012 Intel Corporation. All rights reserved.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -111,15 +111,17 @@
  *
  * @IWL_TM_CMD_APP2DEV_INDIRECT_REG_READ32:
  * @IWL_TM_CMD_APP2DEV_INDIRECT_REG_WRITE32:
- *      commands from user applicaiton to indirectly access peripheral register
+ *      commands from user application to indirectly access peripheral register
  *
  * @IWL_TM_CMD_APP2DEV_READ_SRAM:
  * @IWL_TM_CMD_APP2DEV_DUMP_SRAM:
- *      commands from user applicaiton to read data in sram
+ *      commands from user application to read data in sram
  *
- * @IWL_TM_CMD_APP2DEV_LOAD_WOWLAN_FW: load Weak On Wireless LAN uCode image
+ * @IWL_TM_CMD_APP2DEV_LOAD_WOWLAN_FW: load Wake On Wireless LAN uCode image
  * @IWL_TM_CMD_APP2DEV_GET_FW_VERSION: retrieve uCode version
  * @IWL_TM_CMD_APP2DEV_GET_DEVICE_ID: retrieve ID information in device
+ * @IWL_TM_CMD_APP2DEV_GET_FW_INFO:
+ *      retrieve information of existing loaded uCode image
  *
  */
 enum iwl_tm_cmd_t {
@@ -147,7 +149,8 @@ enum iwl_tm_cmd_t {
         IWL_TM_CMD_APP2DEV_LOAD_WOWLAN_FW       = 22,
         IWL_TM_CMD_APP2DEV_GET_FW_VERSION       = 23,
         IWL_TM_CMD_APP2DEV_GET_DEVICE_ID        = 24,
-        IWL_TM_CMD_MAX                          = 25,
+        IWL_TM_CMD_APP2DEV_GET_FW_INFO          = 25,
+        IWL_TM_CMD_MAX                          = 26,
 };
 
 /*
@@ -237,6 +240,15 @@ enum iwl_tm_cmd_t {
  *      When IWL_TM_ATTR_COMMAND is IWL_TM_CMD_APP2DEV_GET_DEVICE_ID,
  *      IWL_TM_ATTR_DEVICE_ID for the device ID information
  *
+ * @IWL_TM_ATTR_FW_TYPE:
+ * @IWL_TM_ATTR_FW_INST_SIZE:
+ * @IWL_TM_ATTR_FW_DATA_SIZE:
+ *      When IWL_TM_ATTR_COMMAND is IWL_TM_CMD_APP2DEV_GET_FW_INFO,
+ *      The mandatory fields are:
+ *      IWL_TM_ATTR_FW_TYPE for the uCode type (INIT/RUNTIME/...)
+ *      IWL_TM_ATTR_FW_INST_SIZE for the size of instruction section
+ *      IWL_TM_ATTR_FW_DATA_SIZE for the size of data section
+ *
  */
 enum iwl_tm_attr_t {
         IWL_TM_ATTR_NOT_APPLICABLE              = 0,
@@ -259,7 +271,10 @@ enum iwl_tm_attr_t {
         IWL_TM_ATTR_SRAM_DUMP                   = 17,
         IWL_TM_ATTR_FW_VERSION                  = 18,
         IWL_TM_ATTR_DEVICE_ID                   = 19,
-        IWL_TM_ATTR_MAX                         = 20,
+        IWL_TM_ATTR_FW_TYPE                     = 20,
+        IWL_TM_ATTR_FW_INST_SIZE                = 21,
+        IWL_TM_ATTR_FW_DATA_SIZE                = 22,
+        IWL_TM_ATTR_MAX                         = 23,
 };
 
 /* uCode trace buffer */
@@ -271,4 +286,7 @@ enum iwl_tm_attr_t {
 /* Maximum data size of each dump it packet */
 #define DUMP_CHUNK_SIZE         (PAGE_SIZE - 1024)
 
+/* Address offset of data segment in SRAM */
+#define SRAM_DATA_SEG_OFFSET   0x800000
+
 #endif
diff --git a/drivers/net/wireless/iwlwifi/iwl-trans-pcie-int.h b/drivers/net/wireless/iwlwifi/iwl-trans-pcie-int.h
index f6debf91d7b5..0ac9b4d30271 100644
--- a/drivers/net/wireless/iwlwifi/iwl-trans-pcie-int.h
+++ b/drivers/net/wireless/iwlwifi/iwl-trans-pcie-int.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2003 - 2011 Intel Corporation. All rights reserved.
+ * Copyright(c) 2003 - 2012 Intel Corporation. All rights reserved.
  *
  * Portions of this file are derived from the ipw3945 project, as well
  * as portions of the ieee80211 subsystem header files.
diff --git a/drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c b/drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c
index 65d1f05007be..2900db973aaa 100644
--- a/drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c
+++ b/drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2003 - 2011 Intel Corporation. All rights reserved.
+ * Copyright(c) 2003 - 2012 Intel Corporation. All rights reserved.
  *
  * Portions of this file are derived from the ipw3945 project, as well
  * as portions of the ieee80211 subsystem header files.
diff --git a/drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c b/drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c
index bd29568177e6..30814b55705e 100644
--- a/drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c
+++ b/drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2003 - 2011 Intel Corporation. All rights reserved.
+ * Copyright(c) 2003 - 2012 Intel Corporation. All rights reserved.
  *
  * Portions of this file are derived from the ipw3945 project, as well
  * as portions of the ieee80211 subsystem header files.
diff --git a/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c b/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c
index 324d06dfb690..3c64c4e5885b 100644
--- a/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c
+++ b/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c
@@ -5,7 +5,7 @@
  *
  * GPL LICENSE SUMMARY
  *
- * Copyright(c) 2007 - 2011 Intel Corporation. All rights reserved.
+ * Copyright(c) 2007 - 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
@@ -30,7 +30,7 @@
  *
  * BSD LICENSE
  *
- * Copyright(c) 2005 - 2011 Intel Corporation. All rights reserved.
+ * Copyright(c) 2005 - 2012 Intel Corporation. All rights reserved.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/net/wireless/iwlwifi/iwl-trans.c b/drivers/net/wireless/iwlwifi/iwl-trans.c
index 1b20c4fb791b..506c062343b2 100644
--- a/drivers/net/wireless/iwlwifi/iwl-trans.c
+++ b/drivers/net/wireless/iwlwifi/iwl-trans.c
@@ -5,7 +5,7 @@
  *
  * GPL LICENSE SUMMARY
  *
- * Copyright(c) 2007 - 2011 Intel Corporation. All rights reserved.
+ * Copyright(c) 2007 - 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
@@ -30,7 +30,7 @@
  *
  * BSD LICENSE
  *
- * Copyright(c) 2005 - 2011 Intel Corporation. All rights reserved.
+ * Copyright(c) 2005 - 2012 Intel Corporation. All rights reserved.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/net/wireless/iwlwifi/iwl-trans.h b/drivers/net/wireless/iwlwifi/iwl-trans.h
index e6bf3f554772..42a9f303f543 100644
--- a/drivers/net/wireless/iwlwifi/iwl-trans.h
+++ b/drivers/net/wireless/iwlwifi/iwl-trans.h
@@ -5,7 +5,7 @@
  *
  * GPL LICENSE SUMMARY
  *
- * Copyright(c) 2007 - 2011 Intel Corporation. All rights reserved.
+ * Copyright(c) 2007 - 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
@@ -30,7 +30,7 @@
  *
  * BSD LICENSE
  *
- * Copyright(c) 2005 - 2011 Intel Corporation. All rights reserved.
+ * Copyright(c) 2005 - 2012 Intel Corporation. All rights reserved.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/net/wireless/iwlwifi/iwl-ucode.c b/drivers/net/wireless/iwlwifi/iwl-ucode.c
index 36a1b5b25858..2edf0ef65a5b 100644
--- a/drivers/net/wireless/iwlwifi/iwl-ucode.c
+++ b/drivers/net/wireless/iwlwifi/iwl-ucode.c
@@ -2,7 +2,7 @@
  *
  * GPL LICENSE SUMMARY
  *
- * Copyright(c) 2008 - 2011 Intel Corporation. All rights reserved.
+ * 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
diff --git a/drivers/net/wireless/iwlwifi/iwl-wifi.h b/drivers/net/wireless/iwlwifi/iwl-wifi.h
index 18501101a530..7e6eb20823cf 100644
--- a/drivers/net/wireless/iwlwifi/iwl-wifi.h
+++ b/drivers/net/wireless/iwlwifi/iwl-wifi.h
@@ -5,7 +5,7 @@
  *
  * GPL LICENSE SUMMARY
  *
- * Copyright(c) 2008 - 2011 Intel Corporation. All rights reserved.
+ * 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
@@ -30,7 +30,7 @@
  *
  * BSD LICENSE
  *
- * Copyright(c) 2005 - 2011 Intel Corporation. All rights reserved.
+ * Copyright(c) 2005 - 2012 Intel Corporation. All rights reserved.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/net/wireless/libertas/if_cs.c b/drivers/net/wireless/libertas/if_cs.c
index 3f7bf4d912b6..234ee88dec95 100644
--- a/drivers/net/wireless/libertas/if_cs.c
+++ b/drivers/net/wireless/libertas/if_cs.c
@@ -815,10 +815,9 @@ static int if_cs_probe(struct pcmcia_device *p_dev)
         lbs_deb_enter(LBS_DEB_CS);
 
         card = kzalloc(sizeof(struct if_cs_card), GFP_KERNEL);
-        if (!card) {
-                pr_err("error in kzalloc\n");
+        if (!card)
                 goto out;
-        }
+
         card->p_dev = p_dev;
         p_dev->priv = card;
 
diff --git a/drivers/net/wireless/libertas/if_usb.c b/drivers/net/wireless/libertas/if_usb.c
index b5fbbc7947df..74da5f1ea243 100644
--- a/drivers/net/wireless/libertas/if_usb.c
+++ b/drivers/net/wireless/libertas/if_usb.c
@@ -261,10 +261,8 @@ static int if_usb_probe(struct usb_interface *intf,
         udev = interface_to_usbdev(intf);
 
         cardp = kzalloc(sizeof(struct if_usb_card), GFP_KERNEL);
-        if (!cardp) {
-                pr_err("Out of memory allocating private data\n");
+        if (!cardp)
                 goto error;
-        }
 
         setup_timer(&cardp->fw_timeout, if_usb_fw_timeo, (unsigned long)cardp);
         init_waitqueue_head(&cardp->fw_wq);
diff --git a/drivers/net/wireless/libertas_tf/if_usb.c b/drivers/net/wireless/libertas_tf/if_usb.c
index aff8b5743af0..7ced130f4f9e 100644
--- a/drivers/net/wireless/libertas_tf/if_usb.c
+++ b/drivers/net/wireless/libertas_tf/if_usb.c
@@ -153,10 +153,8 @@ static int if_usb_probe(struct usb_interface *intf,
         udev = interface_to_usbdev(intf);
 
         cardp = kzalloc(sizeof(struct if_usb_card), GFP_KERNEL);
-        if (!cardp) {
-                pr_err("Out of memory allocating private data.\n");
+        if (!cardp)
                 goto error;
-        }
 
         setup_timer(&cardp->fw_timeout, if_usb_fw_timeo, (unsigned long)cardp);
         init_waitqueue_head(&cardp->fw_wq);
diff --git a/drivers/net/wireless/mwifiex/11n_aggr.c b/drivers/net/wireless/mwifiex/11n_aggr.c
index 079e5532e686..ea6832dc6677 100644
--- a/drivers/net/wireless/mwifiex/11n_aggr.c
+++ b/drivers/net/wireless/mwifiex/11n_aggr.c
@@ -182,7 +182,8 @@ mwifiex_11n_aggregate_pkt(struct mwifiex_private *priv,
         skb_reserve(skb_aggr, headroom + sizeof(struct txpd));
         tx_info_aggr =  MWIFIEX_SKB_TXCB(skb_aggr);
 
-        tx_info_aggr->bss_index = tx_info_src->bss_index;
+        tx_info_aggr->bss_type = tx_info_src->bss_type;
+        tx_info_aggr->bss_num = tx_info_src->bss_num;
         skb_aggr->priority = skb_src->priority;
 
         do {
diff --git a/drivers/net/wireless/mwifiex/cfg80211.c b/drivers/net/wireless/mwifiex/cfg80211.c
index c3b6c4652cd6..6fef4925d13a 100644
--- a/drivers/net/wireless/mwifiex/cfg80211.c
+++ b/drivers/net/wireless/mwifiex/cfg80211.c
@@ -79,7 +79,7 @@ static int
 mwifiex_cfg80211_del_key(struct wiphy *wiphy, struct net_device *netdev,
                          u8 key_index, bool pairwise, const u8 *mac_addr)
 {
-        struct mwifiex_private *priv = mwifiex_cfg80211_get_priv(wiphy);
+        struct mwifiex_private *priv = mwifiex_netdev_get_priv(netdev);
 
         if (mwifiex_set_encode(priv, NULL, 0, key_index, 1)) {
                 wiphy_err(wiphy, "deleting the crypto keys\n");
@@ -122,7 +122,7 @@ mwifiex_cfg80211_set_power_mgmt(struct wiphy *wiphy,
                                 struct net_device *dev,
                                 bool enabled, int timeout)
 {
-        struct mwifiex_private *priv = mwifiex_cfg80211_get_priv(wiphy);
+        struct mwifiex_private *priv = mwifiex_netdev_get_priv(dev);
         u32 ps_mode;
 
         if (timeout)
@@ -143,7 +143,7 @@ mwifiex_cfg80211_set_default_key(struct wiphy *wiphy, struct net_device *netdev,
                                  u8 key_index, bool unicast,
                                  bool multicast)
 {
-        struct mwifiex_private *priv = mwifiex_cfg80211_get_priv(wiphy);
+        struct mwifiex_private *priv = mwifiex_netdev_get_priv(netdev);
 
         /* Return if WEP key not configured */
         if (priv->sec_info.wep_status == MWIFIEX_802_11_WEP_DISABLED)
@@ -165,7 +165,7 @@ mwifiex_cfg80211_add_key(struct wiphy *wiphy, struct net_device *netdev,
                          u8 key_index, bool pairwise, const u8 *mac_addr,
                          struct key_params *params)
 {
-        struct mwifiex_private *priv = mwifiex_cfg80211_get_priv(wiphy);
+        struct mwifiex_private *priv = mwifiex_netdev_get_priv(netdev);
 
         if (mwifiex_set_encode(priv, params->key, params->key_len,
                                                         key_index, 0)) {
@@ -376,7 +376,7 @@ mwifiex_cfg80211_set_channel(struct wiphy *wiphy, struct net_device *dev,
                              struct ieee80211_channel *chan,
                              enum nl80211_channel_type channel_type)
 {
-        struct mwifiex_private *priv = mwifiex_cfg80211_get_priv(wiphy);
+        struct mwifiex_private *priv = mwifiex_netdev_get_priv(dev);
 
         if (priv->media_connected) {
                 wiphy_err(wiphy, "This setting is valid only when station "
@@ -557,6 +557,23 @@ mwifiex_dump_station_info(struct mwifiex_private *priv,
         /* bit rate is in 500 kb/s units. Convert it to 100kb/s units */
         sinfo->txrate.legacy = rate.rate * 5;
 
+        if (priv->bss_mode == NL80211_IFTYPE_STATION) {
+                sinfo->filled |= STATION_INFO_BSS_PARAM;
+                sinfo->bss_param.flags = 0;
+                if (priv->curr_bss_params.bss_descriptor.cap_info_bitmap &
+                                                WLAN_CAPABILITY_SHORT_PREAMBLE)
+                        sinfo->bss_param.flags |=
+                                        BSS_PARAM_FLAGS_SHORT_PREAMBLE;
+                if (priv->curr_bss_params.bss_descriptor.cap_info_bitmap &
+                                                WLAN_CAPABILITY_SHORT_SLOT_TIME)
+                        sinfo->bss_param.flags |=
+                                        BSS_PARAM_FLAGS_SHORT_SLOT_TIME;
+                sinfo->bss_param.dtim_period =
+                        priv->curr_bss_params.bss_descriptor.dtim_period;
+                sinfo->bss_param.beacon_interval =
+                        priv->curr_bss_params.bss_descriptor.beacon_period;
+        }
+
         return ret;
 }
 
@@ -1004,7 +1021,7 @@ static int
 mwifiex_cfg80211_join_ibss(struct wiphy *wiphy, struct net_device *dev,
                            struct cfg80211_ibss_params *params)
 {
-        struct mwifiex_private *priv = mwifiex_cfg80211_get_priv(wiphy);
+        struct mwifiex_private *priv = mwifiex_netdev_get_priv(dev);
         int ret = 0;
 
         if (priv->bss_mode != NL80211_IFTYPE_ADHOC) {
@@ -1042,7 +1059,7 @@ done:
 static int
 mwifiex_cfg80211_leave_ibss(struct wiphy *wiphy, struct net_device *dev)
 {
-        struct mwifiex_private *priv = mwifiex_cfg80211_get_priv(wiphy);
+        struct mwifiex_private *priv = mwifiex_netdev_get_priv(dev);
 
         wiphy_dbg(wiphy, "info: disconnecting from essid %pM\n",
                         priv->cfg_bssid);
@@ -1217,7 +1234,6 @@ struct net_device *mwifiex_add_virtual_intf(struct wiphy *wiphy,
                 priv->frame_type = MWIFIEX_DATA_FRAME_TYPE_ETH_II;
                 priv->bss_priority = 0;
                 priv->bss_role = MWIFIEX_BSS_ROLE_STA;
-                priv->bss_index = 0;
                 priv->bss_num = 0;
 
                 break;
@@ -1281,10 +1297,7 @@ EXPORT_SYMBOL_GPL(mwifiex_add_virtual_intf);
  */
 int mwifiex_del_virtual_intf(struct wiphy *wiphy, struct net_device *dev)
 {
-        struct mwifiex_private *priv = mwifiex_cfg80211_get_priv(wiphy);
-
-        if (!priv || !dev)
-                return 0;
+        struct mwifiex_private *priv = mwifiex_netdev_get_priv(dev);
 
 #ifdef CONFIG_DEBUG_FS
         mwifiex_dev_debugfs_remove(priv);
diff --git a/drivers/net/wireless/mwifiex/cmdevt.c b/drivers/net/wireless/mwifiex/cmdevt.c
index 6e0a3eaecf70..6623db69e157 100644
--- a/drivers/net/wireless/mwifiex/cmdevt.c
+++ b/drivers/net/wireless/mwifiex/cmdevt.c
@@ -391,7 +391,8 @@ int mwifiex_process_event(struct mwifiex_adapter *adapter)
 
         if (skb) {
                 rx_info = MWIFIEX_SKB_RXCB(skb);
-                rx_info->bss_index = priv->bss_index;
+                rx_info->bss_num = priv->bss_num;
+                rx_info->bss_type = priv->bss_type;
         }
 
         if (eventcause != EVENT_PS_SLEEP && eventcause != EVENT_PS_AWAKE) {
diff --git a/drivers/net/wireless/mwifiex/decl.h b/drivers/net/wireless/mwifiex/decl.h
index ae17ce02a3d0..3735c775495c 100644
--- a/drivers/net/wireless/mwifiex/decl.h
+++ b/drivers/net/wireless/mwifiex/decl.h
@@ -102,7 +102,8 @@ struct mwifiex_wait_queue {
 };
 
 struct mwifiex_rxinfo {
-        u8 bss_index;
+        u8 bss_num;
+        u8 bss_type;
         struct sk_buff *parent;
         u8 use_count;
 };
@@ -110,7 +111,8 @@ struct mwifiex_rxinfo {
 struct mwifiex_txinfo {
         u32 status_code;
         u8 flags;
-        u8 bss_index;
+        u8 bss_num;
+        u8 bss_type;
 };
 
 enum mwifiex_wmm_ac_e {
diff --git a/drivers/net/wireless/mwifiex/init.c b/drivers/net/wireless/mwifiex/init.c
index 1d0ec57a0143..84fcb741a296 100644
--- a/drivers/net/wireless/mwifiex/init.c
+++ b/drivers/net/wireless/mwifiex/init.c
@@ -527,8 +527,9 @@ static void mwifiex_delete_bss_prio_tbl(struct mwifiex_private *priv)
                 cur = &adapter->bss_prio_tbl[i].bss_prio_cur;
                 lock = &adapter->bss_prio_tbl[i].bss_prio_lock;
                 dev_dbg(adapter->dev, "info: delete BSS priority table,"
-                                " index = %d, i = %d, head = %p, cur = %p\n",
-                              priv->bss_index, i, head, *cur);
+                                " bss_type = %d, bss_num = %d, i = %d,"
+                                " head = %p, cur = %p\n",
+                              priv->bss_type, priv->bss_num, i, head, *cur);
                 if (*cur) {
                         spin_lock_irqsave(lock, flags);
                         if (list_empty(head)) {
diff --git a/drivers/net/wireless/mwifiex/main.c b/drivers/net/wireless/mwifiex/main.c
index b728f54451e4..790a3796483c 100644
--- a/drivers/net/wireless/mwifiex/main.c
+++ b/drivers/net/wireless/mwifiex/main.c
@@ -424,8 +424,8 @@ mwifiex_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
         struct sk_buff *new_skb;
         struct mwifiex_txinfo *tx_info;
 
-        dev_dbg(priv->adapter->dev, "data: %lu BSS(%d): Data <= kernel\n",
-                                jiffies, priv->bss_index);
+        dev_dbg(priv->adapter->dev, "data: %lu BSS(%d-%d): Data <= kernel\n",
+                                jiffies, priv->bss_type, priv->bss_num);
 
         if (priv->adapter->surprise_removed) {
                 kfree_skb(skb);
@@ -458,10 +458,11 @@ mwifiex_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
         }
 
         tx_info = MWIFIEX_SKB_TXCB(skb);
-        tx_info->bss_index = priv->bss_index;
+        tx_info->bss_num = priv->bss_num;
+        tx_info->bss_type = priv->bss_type;
         mwifiex_fill_buffer(skb);
 
-        mwifiex_wmm_add_buf_txqueue(priv->adapter, skb);
+        mwifiex_wmm_add_buf_txqueue(priv, skb);
         atomic_inc(&priv->adapter->tx_pending);
 
         if (atomic_read(&priv->adapter->tx_pending) >= MAX_TX_PENDING) {
@@ -531,8 +532,8 @@ mwifiex_tx_timeout(struct net_device *dev)
 {
         struct mwifiex_private *priv = mwifiex_netdev_get_priv(dev);
 
-        dev_err(priv->adapter->dev, "%lu : Tx timeout, bss_index=%d\n",
-                                jiffies, priv->bss_index);
+        dev_err(priv->adapter->dev, "%lu : Tx timeout, bss_type-num = %d-%d\n",
+                                jiffies, priv->bss_type, priv->bss_num);
         mwifiex_set_trans_start(dev);
         priv->num_tx_timeout++;
 }
@@ -605,18 +606,6 @@ int is_command_pending(struct mwifiex_adapter *adapter)
 }
 
 /*
- * This function returns the correct private structure pointer based
- * upon the BSS number.
- */
-struct mwifiex_private *
-mwifiex_bss_index_to_priv(struct mwifiex_adapter *adapter, u8 bss_index)
-{
-        if (!adapter || (bss_index >= adapter->priv_num))
-                return NULL;
-        return adapter->priv[bss_index];
-}
-
-/*
  * This is the main work queue function.
  *
  * It handles the main process, which in turn handles the complete
diff --git a/drivers/net/wireless/mwifiex/main.h b/drivers/net/wireless/mwifiex/main.h
index 3186aa437f42..3dc0f721c1db 100644
--- a/drivers/net/wireless/mwifiex/main.h
+++ b/drivers/net/wireless/mwifiex/main.h
@@ -249,6 +249,7 @@ struct mwifiex_bssdescriptor {
         u32 channel;
         u32 freq;
         u16 beacon_period;
+        u8 dtim_period;
         u8 erp_flags;
         u32 bss_mode;
         u8 supported_rates[MWIFIEX_SUPPORTED_RATES];
@@ -352,7 +353,6 @@ struct mwifiex_private;
 
 struct mwifiex_private {
         struct mwifiex_adapter *adapter;
-        u8 bss_index;
         u8 bss_type;
         u8 bss_role;
         u8 bss_priority;
@@ -884,8 +884,6 @@ mwifiex_netdev_get_priv(struct net_device *dev)
         return (struct mwifiex_private *) (*(unsigned long *) netdev_priv(dev));
 }
 
-struct mwifiex_private *mwifiex_bss_index_to_priv(struct mwifiex_adapter
-                                                *adapter, u8 bss_index);
 int mwifiex_init_shutdown_fw(struct mwifiex_private *priv,
                              u32 func_init_shutdown);
 int mwifiex_add_card(void *, struct semaphore *, struct mwifiex_if_ops *, u8);
diff --git a/drivers/net/wireless/mwifiex/pcie.c b/drivers/net/wireless/mwifiex/pcie.c
index 405350940a45..f4fbad95d3e3 100644
--- a/drivers/net/wireless/mwifiex/pcie.c
+++ b/drivers/net/wireless/mwifiex/pcie.c
@@ -86,10 +86,8 @@ static int mwifiex_pcie_probe(struct pci_dev *pdev,
                                 pdev->vendor, pdev->device, pdev->revision);
 
         card = kzalloc(sizeof(struct pcie_service_card), GFP_KERNEL);
-        if (!card) {
-                pr_err("%s: failed to alloc memory\n", __func__);
+        if (!card)
                 return -ENOMEM;
-        }
 
         card->dev = pdev;
 
diff --git a/drivers/net/wireless/mwifiex/scan.c b/drivers/net/wireless/mwifiex/scan.c
index 6396d3318ead..135208596aff 100644
--- a/drivers/net/wireless/mwifiex/scan.c
+++ b/drivers/net/wireless/mwifiex/scan.c
@@ -1086,6 +1086,7 @@ mwifiex_update_bss_desc_with_ie(struct mwifiex_adapter *adapter,
         struct ieee_types_vendor_specific *vendor_ie;
         const u8 wpa_oui[4] = { 0x00, 0x50, 0xf2, 0x01 };
         const u8 wmm_oui[4] = { 0x00, 0x50, 0xf2, 0x02 };
+        struct ieee80211_tim_ie *tim_ie;
 
         found_data_rate_ie = false;
         rate_size = 0;
@@ -1258,6 +1259,11 @@ mwifiex_update_bss_desc_with_ie(struct mwifiex_adapter *adapter,
                                         sizeof(struct ieee_types_header) -
                                         bss_entry->beacon_buf);
                         break;
+                case WLAN_EID_TIM:
+                        tim_ie = (void *) (current_ptr +
+                                         sizeof(struct ieee_types_header));
+                        bss_entry->dtim_period = tim_ie->dtim_period;
+                        break;
                 default:
                         break;
                 }
@@ -2001,7 +2007,7 @@ mwifiex_save_curr_bcn(struct mwifiex_private *priv)
 
                 kfree(priv->curr_bcn_buf);
                 priv->curr_bcn_buf = kmalloc(curr_bss->beacon_buf_size,
-                                                GFP_KERNEL);
+                                                GFP_ATOMIC);
                 if (!priv->curr_bcn_buf) {
                         dev_err(priv->adapter->dev,
                                         "failed to alloc curr_bcn_buf\n");
diff --git a/drivers/net/wireless/mwifiex/sdio.c b/drivers/net/wireless/mwifiex/sdio.c
index d39d8457f252..835902750231 100644
--- a/drivers/net/wireless/mwifiex/sdio.c
+++ b/drivers/net/wireless/mwifiex/sdio.c
@@ -70,10 +70,8 @@ mwifiex_sdio_probe(struct sdio_func *func, const struct sdio_device_id *id)
                func->vendor, func->device, func->class, func->num);
 
         card = kzalloc(sizeof(struct sdio_mmc_card), GFP_KERNEL);
-        if (!card) {
-                pr_err("%s: failed to alloc memory\n", __func__);
+        if (!card)
                 return -ENOMEM;
-        }
 
         card->func = func;
 
diff --git a/drivers/net/wireless/mwifiex/sta_rx.c b/drivers/net/wireless/mwifiex/sta_rx.c
index 5e1ef7e5da4f..d7a5d7616f22 100644
--- a/drivers/net/wireless/mwifiex/sta_rx.c
+++ b/drivers/net/wireless/mwifiex/sta_rx.c
@@ -43,7 +43,8 @@ int mwifiex_process_rx_packet(struct mwifiex_adapter *adapter,
 {
         int ret;
         struct mwifiex_rxinfo *rx_info = MWIFIEX_SKB_RXCB(skb);
-        struct mwifiex_private *priv = adapter->priv[rx_info->bss_index];
+        struct mwifiex_private *priv = mwifiex_get_priv_by_id(adapter,
+                        rx_info->bss_num, rx_info->bss_type);
         struct rx_packet_hdr *rx_pkt_hdr;
         struct rxpd *local_rx_pd;
         int hdr_chop;
@@ -124,7 +125,8 @@ int mwifiex_process_sta_rx_packet(struct mwifiex_adapter *adapter,
         struct rx_packet_hdr *rx_pkt_hdr;
         u8 ta[ETH_ALEN];
         u16 rx_pkt_type;
-        struct mwifiex_private *priv = adapter->priv[rx_info->bss_index];
+        struct mwifiex_private *priv = mwifiex_get_priv_by_id(adapter,
+                        rx_info->bss_num, rx_info->bss_type);
 
         if (!priv)
                 return -1;
diff --git a/drivers/net/wireless/mwifiex/sta_tx.c b/drivers/net/wireless/mwifiex/sta_tx.c
index d97facd70e88..94d31a94620a 100644
--- a/drivers/net/wireless/mwifiex/sta_tx.c
+++ b/drivers/net/wireless/mwifiex/sta_tx.c
@@ -136,7 +136,8 @@ int mwifiex_send_null_packet(struct mwifiex_private *priv, u8 flags)
                 return -1;
 
         tx_info = MWIFIEX_SKB_TXCB(skb);
-        tx_info->bss_index = priv->bss_index;
+        tx_info->bss_num = priv->bss_num;
+        tx_info->bss_type = priv->bss_type;
         skb_reserve(skb, sizeof(struct txpd) + INTF_HEADER_LEN);
         skb_push(skb, sizeof(struct txpd));
 
diff --git a/drivers/net/wireless/mwifiex/txrx.c b/drivers/net/wireless/mwifiex/txrx.c
index d9274a1b77ac..9a6eacc9d6f9 100644
--- a/drivers/net/wireless/mwifiex/txrx.c
+++ b/drivers/net/wireless/mwifiex/txrx.c
@@ -48,7 +48,8 @@ int mwifiex_handle_rx_packet(struct mwifiex_adapter *adapter,
         if (!priv)
                 priv = mwifiex_get_priv(adapter, MWIFIEX_BSS_ROLE_ANY);
 
-        rx_info->bss_index = priv->bss_index;
+        rx_info->bss_num = priv->bss_num;
+        rx_info->bss_type = priv->bss_type;
 
         return mwifiex_process_sta_rx_packet(adapter, skb);
 }
@@ -130,7 +131,8 @@ int mwifiex_write_data_complete(struct mwifiex_adapter *adapter,
                 return 0;
 
         tx_info = MWIFIEX_SKB_TXCB(skb);
-        priv = mwifiex_bss_index_to_priv(adapter, tx_info->bss_index);
+        priv = mwifiex_get_priv_by_id(adapter, tx_info->bss_num,
+                        tx_info->bss_type);
         if (!priv)
                 goto done;
 
diff --git a/drivers/net/wireless/mwifiex/util.c b/drivers/net/wireless/mwifiex/util.c
index 06976f517f66..9c48f37069f7 100644
--- a/drivers/net/wireless/mwifiex/util.c
+++ b/drivers/net/wireless/mwifiex/util.c
@@ -159,7 +159,8 @@ int mwifiex_recv_packet(struct mwifiex_adapter *adapter, struct sk_buff *skb)
                 return -1;
 
         rx_info = MWIFIEX_SKB_RXCB(skb);
-        priv = mwifiex_bss_index_to_priv(adapter, rx_info->bss_index);
+        priv = mwifiex_get_priv_by_id(adapter, rx_info->bss_num,
+                        rx_info->bss_type);
         if (!priv)
                 return -1;
 
diff --git a/drivers/net/wireless/mwifiex/wmm.c b/drivers/net/wireless/mwifiex/wmm.c
index 6c239c3c8249..75f79ef9f6cf 100644
--- a/drivers/net/wireless/mwifiex/wmm.c
+++ b/drivers/net/wireless/mwifiex/wmm.c
@@ -599,11 +599,10 @@ mwifiex_is_ralist_valid(struct mwifiex_private *priv,
  * is queued at the list tail.
  */
 void
-mwifiex_wmm_add_buf_txqueue(struct mwifiex_adapter *adapter,
+mwifiex_wmm_add_buf_txqueue(struct mwifiex_private *priv,
                             struct sk_buff *skb)
 {
-        struct mwifiex_txinfo *tx_info = MWIFIEX_SKB_TXCB(skb);
-        struct mwifiex_private *priv = adapter->priv[tx_info->bss_index];
+        struct mwifiex_adapter *adapter = priv->adapter;
         u32 tid;
         struct mwifiex_ra_list_tbl *ra_list;
         u8 ra[ETH_ALEN], tid_down;
diff --git a/drivers/net/wireless/mwifiex/wmm.h b/drivers/net/wireless/mwifiex/wmm.h
index fcea1f68792f..ec839952d2e7 100644
--- a/drivers/net/wireless/mwifiex/wmm.h
+++ b/drivers/net/wireless/mwifiex/wmm.h
@@ -80,8 +80,8 @@ mwifiex_wmm_is_ra_list_empty(struct list_head *ra_list_hhead)
         return true;
 }
 
-void mwifiex_wmm_add_buf_txqueue(struct mwifiex_adapter *adapter,
-                                 struct sk_buff *skb);
+void mwifiex_wmm_add_buf_txqueue(struct mwifiex_private *priv,
+                                        struct sk_buff *skb);
 void mwifiex_ralist_add(struct mwifiex_private *priv, u8 *ra);
 
 int mwifiex_wmm_lists_empty(struct mwifiex_adapter *adapter);
diff --git a/drivers/net/wireless/mwl8k.c b/drivers/net/wireless/mwl8k.c
index dd5aeaff44ba..fd125473be7a 100644
--- a/drivers/net/wireless/mwl8k.c
+++ b/drivers/net/wireless/mwl8k.c
@@ -4093,7 +4093,7 @@ static int mwl8k_set_key(struct ieee80211_hw *hw,
                 return -EOPNOTSUPP;
 
         if (sta == NULL)
-                addr = hw->wiphy->perm_addr;
+                addr = vif->addr;
         else
                 addr = sta->addr;
 
diff --git a/drivers/net/wireless/orinoco/main.c b/drivers/net/wireless/orinoco/main.c
index 9fb77d0319f5..dd6c64ac406e 100644
--- a/drivers/net/wireless/orinoco/main.c
+++ b/drivers/net/wireless/orinoco/main.c
@@ -941,11 +941,9 @@ void __orinoco_ev_rx(struct net_device *dev, struct hermes *hw)
 
         /* Add desc and skb to rx queue */
         rx_data = kzalloc(sizeof(*rx_data), GFP_ATOMIC);
-        if (!rx_data) {
-                printk(KERN_WARNING "%s: Can't allocate RX packet\n",
-                        dev->name);
+        if (!rx_data)
                 goto drop;
-        }
+
         rx_data->desc = desc;
         rx_data->skb = skb;
         list_add_tail(&rx_data->list, &priv->rx_list);
diff --git a/drivers/net/wireless/orinoco/orinoco_usb.c b/drivers/net/wireless/orinoco/orinoco_usb.c
index ae8ce56670b6..f634d4582bfe 100644
--- a/drivers/net/wireless/orinoco/orinoco_usb.c
+++ b/drivers/net/wireless/orinoco/orinoco_usb.c
@@ -1754,11 +1754,6 @@ static struct usb_driver orinoco_driver = {
         .id_table = ezusb_table,
 };
 
-/* Can't be declared "const" or the whole __initdata section will
- * become const */
-static char version[] __initdata = DRIVER_NAME " " DRIVER_VERSION
-        " (Manuel Estrada Sainz)";
-
 module_usb_driver(orinoco_driver);
 
 MODULE_AUTHOR("Manuel Estrada Sainz");
diff --git a/drivers/net/wireless/p54/main.c b/drivers/net/wireless/p54/main.c
index af2ca1a9c7d3..40f4eb7da7b2 100644
--- a/drivers/net/wireless/p54/main.c
+++ b/drivers/net/wireless/p54/main.c
@@ -228,6 +228,8 @@ static int p54_add_interface(struct ieee80211_hw *dev,
 {
         struct p54_common *priv = dev->priv;
 
+        vif->driver_flags |= IEEE80211_VIF_BEACON_FILTER;
+
         mutex_lock(&priv->conf_mutex);
         if (priv->mode != NL80211_IFTYPE_MONITOR) {
                 mutex_unlock(&priv->conf_mutex);
@@ -734,7 +736,6 @@ struct ieee80211_hw *p54_init_common(size_t priv_data_len)
                      IEEE80211_HW_SIGNAL_DBM |
                      IEEE80211_HW_SUPPORTS_PS |
                      IEEE80211_HW_PS_NULLFUNC_STACK |
-                     IEEE80211_HW_BEACON_FILTER |
                      IEEE80211_HW_REPORTS_TX_ACK_STATUS;
 
         dev->wiphy->interface_modes = BIT(NL80211_IFTYPE_STATION) |
diff --git a/drivers/net/wireless/prism54/islpci_mgt.c b/drivers/net/wireless/prism54/islpci_mgt.c
index a5224f6160e4..851fa10241e1 100644
--- a/drivers/net/wireless/prism54/islpci_mgt.c
+++ b/drivers/net/wireless/prism54/islpci_mgt.c
@@ -192,11 +192,9 @@ islpci_mgt_transmit(struct net_device *ndev, int operation, unsigned long oid,
 
         err = -ENOMEM;
         p = buf.mem = kmalloc(frag_len, GFP_KERNEL);
-        if (!buf.mem) {
-                printk(KERN_DEBUG "%s: cannot allocate mgmt frame\n",
-                       ndev->name);
+        if (!buf.mem)
                 goto error;
-        }
+
         buf.size = frag_len;
 
         /* create the header directly in the fragment data area */
diff --git a/drivers/net/wireless/rt2x00/rt2800lib.c b/drivers/net/wireless/rt2x00/rt2800lib.c
index 7bef66def10c..dbe7ece862f2 100644
--- a/drivers/net/wireless/rt2x00/rt2800lib.c
+++ b/drivers/net/wireless/rt2x00/rt2800lib.c
@@ -412,18 +412,6 @@ int rt2800_load_firmware(struct rt2x00_dev *rt2x00dev,
         }
 
         /*
-         * Disable DMA, will be reenabled later when enabling
-         * the radio.
-         */
-        rt2800_register_read(rt2x00dev, WPDMA_GLO_CFG, &reg);
-        rt2x00_set_field32(&reg, WPDMA_GLO_CFG_ENABLE_TX_DMA, 0);
-        rt2x00_set_field32(&reg, WPDMA_GLO_CFG_TX_DMA_BUSY, 0);
-        rt2x00_set_field32(&reg, WPDMA_GLO_CFG_ENABLE_RX_DMA, 0);
-        rt2x00_set_field32(&reg, WPDMA_GLO_CFG_RX_DMA_BUSY, 0);
-        rt2x00_set_field32(&reg, WPDMA_GLO_CFG_TX_WRITEBACK_DONE, 1);
-        rt2800_register_write(rt2x00dev, WPDMA_GLO_CFG, reg);
-
-        /*
          * Write firmware to the device.
          */
         rt2800_drv_write_firmware(rt2x00dev, data, len);
@@ -444,10 +432,21 @@ int rt2800_load_firmware(struct rt2x00_dev *rt2x00dev,
         }
 
         /*
+         * Disable DMA, will be reenabled later when enabling
+         * the radio.
+         */
+        rt2800_register_read(rt2x00dev, WPDMA_GLO_CFG, &reg);
+        rt2x00_set_field32(&reg, WPDMA_GLO_CFG_ENABLE_TX_DMA, 0);
+        rt2x00_set_field32(&reg, WPDMA_GLO_CFG_ENABLE_RX_DMA, 0);
+        rt2800_register_write(rt2x00dev, WPDMA_GLO_CFG, reg);
+
+        /*
          * Initialize firmware.
          */
         rt2800_register_write(rt2x00dev, H2M_BBP_AGENT, 0);
         rt2800_register_write(rt2x00dev, H2M_MAILBOX_CSR, 0);
+        if (rt2x00_is_usb(rt2x00dev))
+                rt2800_register_write(rt2x00dev, H2M_INT_SRC, 0);
         msleep(1);
 
         return 0;
diff --git a/drivers/net/wireless/rt2x00/rt2800pci.c b/drivers/net/wireless/rt2x00/rt2800pci.c
index dc88baefa72e..4e985026985c 100644
--- a/drivers/net/wireless/rt2x00/rt2800pci.c
+++ b/drivers/net/wireless/rt2x00/rt2800pci.c
@@ -489,7 +489,7 @@ static int rt2800pci_init_registers(struct rt2x00_dev *rt2x00dev)
 
         rt2x00pci_register_write(rt2x00dev, PWR_PIN_CFG, 0x00000003);
 
-        rt2x00pci_register_read(rt2x00dev, MAC_SYS_CTRL, &reg);
+        reg = 0;
         rt2x00_set_field32(&reg, MAC_SYS_CTRL_RESET_CSR, 1);
         rt2x00_set_field32(&reg, MAC_SYS_CTRL_RESET_BBP, 1);
         rt2x00pci_register_write(rt2x00dev, MAC_SYS_CTRL, reg);
diff --git a/drivers/net/wireless/rt2x00/rt2800usb.c b/drivers/net/wireless/rt2x00/rt2800usb.c
index 262ee9eefb6f..f0074bcee7c9 100644
--- a/drivers/net/wireless/rt2x00/rt2800usb.c
+++ b/drivers/net/wireless/rt2x00/rt2800usb.c
@@ -226,9 +226,7 @@ static int rt2800usb_init_registers(struct rt2x00_dev *rt2x00dev)
         rt2x00usb_register_read(rt2x00dev, PBF_SYS_CTRL, &reg);
         rt2x00usb_register_write(rt2x00dev, PBF_SYS_CTRL, reg & ~0x00002000);
 
-        rt2x00usb_register_write(rt2x00dev, PWR_PIN_CFG, 0x00000003);
-
-        rt2x00usb_register_read(rt2x00dev, MAC_SYS_CTRL, &reg);
+        reg = 0;
         rt2x00_set_field32(&reg, MAC_SYS_CTRL_RESET_CSR, 1);
         rt2x00_set_field32(&reg, MAC_SYS_CTRL_RESET_BBP, 1);
         rt2x00usb_register_write(rt2x00dev, MAC_SYS_CTRL, reg);
diff --git a/drivers/net/wireless/rtlwifi/Kconfig b/drivers/net/wireless/rtlwifi/Kconfig
index d6c42e69bdbd..44b9c0a57702 100644
--- a/drivers/net/wireless/rtlwifi/Kconfig
+++ b/drivers/net/wireless/rtlwifi/Kconfig
@@ -49,6 +49,11 @@ config RTLWIFI
         depends on RTL8192CE || RTL8192CU || RTL8192SE || RTL8192DE
         default m
 
+config RTLWIFI_DEBUG
+        tristate "Additional debugging output"
+        depends on RTL8192CE || RTL8192CU || RTL8192SE || RTL8192DE
+        default y
+
 config RTL8192C_COMMON
         tristate
         depends on RTL8192CE || RTL8192CU
diff --git a/drivers/net/wireless/rtlwifi/base.c b/drivers/net/wireless/rtlwifi/base.c
index 8d6eb0f56c03..df5655cc55c0 100644
--- a/drivers/net/wireless/rtlwifi/base.c
+++ b/drivers/net/wireless/rtlwifi/base.c
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2009-2010  Realtek Corporation.
+ * Copyright(c) 2009-2012  Realtek Corporation.
  *
  * 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
@@ -27,10 +27,6 @@
  *
  *****************************************************************************/
 
-#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-
-#include <linux/ip.h>
-#include <linux/module.h>
 #include "wifi.h"
 #include "rc.h"
 #include "base.h"
@@ -39,6 +35,9 @@
 #include "ps.h"
 #include "regd.h"
 
+#include <linux/ip.h>
+#include <linux/module.h>
+
 /*
  *NOTICE!!!: This file will be very big, we hsould
  *keep it clear under follwing roles:
@@ -211,7 +210,7 @@ static void _rtl_init_hw_ht_capab(struct ieee80211_hw *hw,
          */
         if (get_rf_type(rtlphy) == RF_1T2R || get_rf_type(rtlphy) == RF_2T2R) {
 
-                RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, ("1T2R or 2T2R\n"));
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "1T2R or 2T2R\n");
 
                 ht_cap->mcs.rx_mask[0] = 0xFF;
                 ht_cap->mcs.rx_mask[1] = 0xFF;
@@ -220,7 +219,7 @@ static void _rtl_init_hw_ht_capab(struct ieee80211_hw *hw,
                 ht_cap->mcs.rx_highest = cpu_to_le16(MAX_BIT_RATE_40MHZ_MCS15);
         } else if (get_rf_type(rtlphy) == RF_1T1R) {
 
-                RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, ("1T1R\n"));
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "1T1R\n");
 
                 ht_cap->mcs.rx_mask[0] = 0xFF;
                 ht_cap->mcs.rx_mask[1] = 0x00;
@@ -302,15 +301,13 @@ static void _rtl_init_mac80211(struct ieee80211_hw *hw)
                         /* <4> set mac->sband to wiphy->sband */
                         hw->wiphy->bands[IEEE80211_BAND_5GHZ] = sband;
                 } else {
-                        RT_TRACE(rtlpriv, COMP_INIT, DBG_EMERG,
-                                 ("Err BAND %d\n",
-                                 rtlhal->current_bandtype));
+                        RT_TRACE(rtlpriv, COMP_INIT, DBG_EMERG, "Err BAND %d\n",
+                                 rtlhal->current_bandtype);
                 }
         }
         /* <5> set hw caps */
         hw->flags = IEEE80211_HW_SIGNAL_DBM |
             IEEE80211_HW_RX_INCLUDES_FCS |
-            IEEE80211_HW_BEACON_FILTER |
             IEEE80211_HW_AMPDU_AGGREGATION |
             IEEE80211_HW_CONNECTION_MONITOR |
             /* IEEE80211_HW_SUPPORTS_CQM_RSSI | */
@@ -413,6 +410,7 @@ void rtl_init_rfkill(struct ieee80211_hw *hw)
 
         wiphy_rfkill_start_polling(hw->wiphy);
 }
+EXPORT_SYMBOL(rtl_init_rfkill);
 
 void rtl_deinit_rfkill(struct ieee80211_hw *hw)
 {
@@ -436,13 +434,13 @@ int rtl_init_core(struct ieee80211_hw *hw)
          * mac80211 hw  in _rtl_init_mac80211.
          */
         if (rtl_regd_init(hw, rtl_reg_notifier)) {
-                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, ("REGD init failed\n"));
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "REGD init failed\n");
                 return 1;
         } else {
                 /* CRDA regd hint must after init CRDA */
                 if (regulatory_hint(hw->wiphy, rtlpriv->regd.alpha2)) {
                         RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
-                                 ("regulatory_hint fail\n"));
+                                 "regulatory_hint fail\n");
                 }
         }
 
@@ -922,17 +920,17 @@ bool rtl_action_proc(struct ieee80211_hw *hw, struct sk_buff *skb, u8 is_tx)
                                 return false;
 
                         RT_TRACE(rtlpriv, (COMP_SEND | COMP_RECV), DBG_DMESG,
-                                 ("%s ACT_ADDBAREQ From :%pM\n",
-                                  is_tx ? "Tx" : "Rx", hdr->addr2));
+                                 "%s ACT_ADDBAREQ From :%pM\n",
+                                 is_tx ? "Tx" : "Rx", hdr->addr2);
                         break;
                 case ACT_ADDBARSP:
                         RT_TRACE(rtlpriv, (COMP_SEND | COMP_RECV), DBG_DMESG,
-                                 ("%s ACT_ADDBARSP From :%pM\n",
-                                  is_tx ? "Tx" : "Rx", hdr->addr2));
+                                 "%s ACT_ADDBARSP From :%pM\n",
+                                 is_tx ? "Tx" : "Rx", hdr->addr2);
                         break;
                 case ACT_DELBA:
                         RT_TRACE(rtlpriv, (COMP_SEND | COMP_RECV), DBG_DMESG,
-                                 ("ACT_ADDBADEL From :%pM\n", hdr->addr2));
+                                 "ACT_ADDBADEL From :%pM\n", hdr->addr2);
                         break;
                 }
                 break;
@@ -975,8 +973,8 @@ u8 rtl_is_special_data(struct ieee80211_hw *hw, struct sk_buff *skb, u8 is_tx)
                                  * 67 : UDP BOOTP server
                                  */
                                 RT_TRACE(rtlpriv, (COMP_SEND | COMP_RECV),
-                                         DBG_DMESG, ("dhcp %s !!\n",
-                                                     (is_tx) ? "Tx" : "Rx"));
+                                         DBG_DMESG, "dhcp %s !!\n",
+                                         is_tx ? "Tx" : "Rx");
 
                                 if (is_tx) {
                                         rtl_lps_leave(hw);
@@ -996,7 +994,7 @@ u8 rtl_is_special_data(struct ieee80211_hw *hw, struct sk_buff *skb, u8 is_tx)
                 return true;
         } else if (ETH_P_PAE == ether_type) {
                 RT_TRACE(rtlpriv, (COMP_SEND | COMP_RECV), DBG_DMESG,
-                         ("802.1X %s EAPOL pkt!!\n", (is_tx) ? "Tx" : "Rx"));
+                         "802.1X %s EAPOL pkt!!\n", is_tx ? "Tx" : "Rx");
 
                 if (is_tx) {
                         rtl_lps_leave(hw);
@@ -1036,9 +1034,8 @@ int rtl_tx_agg_start(struct ieee80211_hw *hw,
                 return -ENXIO;
         tid_data = &sta_entry->tids[tid];
 
-        RT_TRACE(rtlpriv, COMP_SEND, DBG_DMESG,
-                 ("on ra = %pM tid = %d seq:%d\n", sta->addr, tid,
-                 tid_data->seq_number));
+        RT_TRACE(rtlpriv, COMP_SEND, DBG_DMESG, "on ra = %pM tid = %d seq:%d\n",
+                 sta->addr, tid, tid_data->seq_number);
 
         *ssn = tid_data->seq_number;
         tid_data->agg.agg_state = RTL_AGG_START;
@@ -1059,12 +1056,12 @@ int rtl_tx_agg_stop(struct ieee80211_hw *hw,
                 return -EINVAL;
 
         if (!sta->addr) {
-                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, ("ra = NULL\n"));
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "ra = NULL\n");
                 return -EINVAL;
         }
 
-        RT_TRACE(rtlpriv, COMP_SEND, DBG_DMESG,
-                 ("on ra = %pM tid = %d\n", sta->addr, tid));
+        RT_TRACE(rtlpriv, COMP_SEND, DBG_DMESG, "on ra = %pM tid = %d\n",
+                 sta->addr, tid);
 
         if (unlikely(tid >= MAX_TID_COUNT))
                 return -EINVAL;
@@ -1087,12 +1084,12 @@ int rtl_tx_agg_oper(struct ieee80211_hw *hw,
                 return -EINVAL;
 
         if (!sta->addr) {
-                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, ("ra = NULL\n"));
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "ra = NULL\n");
                 return -EINVAL;
         }
 
-        RT_TRACE(rtlpriv, COMP_SEND, DBG_DMESG,
-                 ("on ra = %pM tid = %d\n", sta->addr, tid));
+        RT_TRACE(rtlpriv, COMP_SEND, DBG_DMESG, "on ra = %pM tid = %d\n",
+                 sta->addr, tid);
 
         if (unlikely(tid >= MAX_TID_COUNT))
                 return -EINVAL;
@@ -1474,29 +1471,29 @@ void rtl_recognize_peer(struct ieee80211_hw *hw, u8 *data, unsigned int len)
                 (memcmp(mac->bssid, ap5_6, 3) == 0) ||
                 vendor == PEER_ATH) {
                 vendor = PEER_ATH;
-                RT_TRACE(rtlpriv, COMP_MAC80211, DBG_LOUD, ("=>ath find\n"));
+                RT_TRACE(rtlpriv, COMP_MAC80211, DBG_LOUD, "=>ath find\n");
         } else if ((memcmp(mac->bssid, ap4_4, 3) == 0) ||
                 (memcmp(mac->bssid, ap4_5, 3) == 0) ||
                 (memcmp(mac->bssid, ap4_1, 3) == 0) ||
                 (memcmp(mac->bssid, ap4_2, 3) == 0) ||
                 (memcmp(mac->bssid, ap4_3, 3) == 0) ||
                 vendor == PEER_RAL) {
-                RT_TRACE(rtlpriv, COMP_MAC80211, DBG_LOUD, ("=>ral findn\n"));
+                RT_TRACE(rtlpriv, COMP_MAC80211, DBG_LOUD, "=>ral find\n");
                 vendor = PEER_RAL;
         } else if (memcmp(mac->bssid, ap6_1, 3) == 0 ||
                 vendor == PEER_CISCO) {
                 vendor = PEER_CISCO;
-                RT_TRACE(rtlpriv, COMP_MAC80211, DBG_LOUD, ("=>cisco find\n"));
+                RT_TRACE(rtlpriv, COMP_MAC80211, DBG_LOUD, "=>cisco find\n");
         } else if ((memcmp(mac->bssid, ap3_1, 3) == 0) ||
                 (memcmp(mac->bssid, ap3_2, 3) == 0) ||
                 (memcmp(mac->bssid, ap3_3, 3) == 0) ||
                 vendor == PEER_BROAD) {
-                RT_TRACE(rtlpriv, COMP_MAC80211, DBG_LOUD, ("=>broad find\n"));
+                RT_TRACE(rtlpriv, COMP_MAC80211, DBG_LOUD, "=>broad find\n");
                 vendor = PEER_BROAD;
         } else if (memcmp(mac->bssid, ap7_1, 3) == 0 ||
                 vendor == PEER_MARV) {
                 vendor = PEER_MARV;
-                RT_TRACE(rtlpriv, COMP_MAC80211, DBG_LOUD, ("=>marv find\n"));
+                RT_TRACE(rtlpriv, COMP_MAC80211, DBG_LOUD, "=>marv find\n");
         }
 
         mac->vendor = vendor;
diff --git a/drivers/net/wireless/rtlwifi/base.h b/drivers/net/wireless/rtlwifi/base.h
index f66b5757f6b9..5a23a6d0f49d 100644
--- a/drivers/net/wireless/rtlwifi/base.h
+++ b/drivers/net/wireless/rtlwifi/base.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2009-2010  Realtek Corporation.
+ * Copyright(c) 2009-2012  Realtek Corporation.
  *
  * 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
diff --git a/drivers/net/wireless/rtlwifi/cam.c b/drivers/net/wireless/rtlwifi/cam.c
index dc36d7461caa..5c7d57947d23 100644
--- a/drivers/net/wireless/rtlwifi/cam.c
+++ b/drivers/net/wireless/rtlwifi/cam.c
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2009-2010  Realtek Corporation.
+ * Copyright(c) 2009-2012  Realtek Corporation.
  *
  * 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
@@ -27,8 +27,6 @@
  *
  *****************************************************************************/
 
-#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-
 #include <linux/export.h>
 #include "wifi.h"
 #include "cam.h"
@@ -55,10 +53,10 @@ static void rtl_cam_program_entry(struct ieee80211_hw *hw, u32 entry_no,
         u8 entry_i;
 
         RT_TRACE(rtlpriv, COMP_SEC, DBG_LOUD,
-                 ("key_cont_128:\n %x:%x:%x:%x:%x:%x\n",
-                  key_cont_128[0], key_cont_128[1],
-                  key_cont_128[2], key_cont_128[3],
-                  key_cont_128[4], key_cont_128[5]));
+                 "key_cont_128:\n %x:%x:%x:%x:%x:%x\n",
+                 key_cont_128[0], key_cont_128[1],
+                 key_cont_128[2], key_cont_128[3],
+                 key_cont_128[4], key_cont_128[5]);
 
         for (entry_i = 0; entry_i < CAM_CONTENT_COUNT; entry_i++) {
                 target_command = entry_i + CAM_CONTENT_COUNT * entry_no;
@@ -73,14 +71,12 @@ static void rtl_cam_program_entry(struct ieee80211_hw *hw, u32 entry_no,
                         rtl_write_dword(rtlpriv, rtlpriv->cfg->maps[RWCAM],
                                         target_command);
 
+                        RT_TRACE(rtlpriv, COMP_SEC, DBG_LOUD, "WRITE %x: %x\n",
+                                 rtlpriv->cfg->maps[WCAMI], target_content);
                         RT_TRACE(rtlpriv, COMP_SEC, DBG_LOUD,
-                                 ("WRITE %x: %x\n",
-                                  rtlpriv->cfg->maps[WCAMI], target_content));
-                        RT_TRACE(rtlpriv, COMP_SEC, DBG_LOUD,
-                                 ("The Key ID is %d\n", entry_no));
-                        RT_TRACE(rtlpriv, COMP_SEC, DBG_LOUD,
-                                 ("WRITE %x: %x\n",
-                                  rtlpriv->cfg->maps[RWCAM], target_command));
+                                 "The Key ID is %d\n", entry_no);
+                        RT_TRACE(rtlpriv, COMP_SEC, DBG_LOUD, "WRITE %x: %x\n",
+                                 rtlpriv->cfg->maps[RWCAM], target_command);
 
                 } else if (entry_i == 1) {
 
@@ -94,10 +90,10 @@ static void rtl_cam_program_entry(struct ieee80211_hw *hw, u32 entry_no,
                         rtl_write_dword(rtlpriv, rtlpriv->cfg->maps[RWCAM],
                                         target_command);
 
-                        RT_TRACE(rtlpriv, COMP_SEC, DBG_LOUD,
-                                 ("WRITE A4: %x\n", target_content));
-                        RT_TRACE(rtlpriv, COMP_SEC, DBG_LOUD,
-                                 ("WRITE A0: %x\n", target_command));
+                        RT_TRACE(rtlpriv, COMP_SEC, DBG_LOUD, "WRITE A4: %x\n",
+                                 target_content);
+                        RT_TRACE(rtlpriv, COMP_SEC, DBG_LOUD, "WRITE A0: %x\n",
+                                 target_command);
 
                 } else {
 
@@ -114,15 +110,15 @@ static void rtl_cam_program_entry(struct ieee80211_hw *hw, u32 entry_no,
                                         target_command);
                         udelay(100);
 
-                        RT_TRACE(rtlpriv, COMP_SEC, DBG_LOUD,
-                                 ("WRITE A4: %x\n", target_content));
-                        RT_TRACE(rtlpriv, COMP_SEC, DBG_LOUD,
-                                 ("WRITE A0: %x\n", target_command));
+                        RT_TRACE(rtlpriv, COMP_SEC, DBG_LOUD, "WRITE A4: %x\n",
+                                 target_content);
+                        RT_TRACE(rtlpriv, COMP_SEC, DBG_LOUD, "WRITE A0: %x\n",
+                                 target_command);
                 }
         }
 
-        RT_TRACE(rtlpriv, COMP_SEC, DBG_LOUD,
-                 ("after set key, usconfig:%x\n", us_config));
+        RT_TRACE(rtlpriv, COMP_SEC, DBG_LOUD, "after set key, usconfig:%x\n",
+                 us_config);
 }
 
 u8 rtl_cam_add_one_entry(struct ieee80211_hw *hw, u8 *mac_addr,
@@ -133,14 +129,13 @@ u8 rtl_cam_add_one_entry(struct ieee80211_hw *hw, u8 *mac_addr,
         struct rtl_priv *rtlpriv = rtl_priv(hw);
 
         RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,
-                 ("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));
+                 "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);
 
         if (ul_key_id == TOTAL_CAM_ENTRY) {
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
-                         ("<=== ulKeyId exceed!\n"));
+                         "<=== ulKeyId exceed!\n");
                 return 0;
         }
 
@@ -153,7 +148,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);
 
-        RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG, ("<===\n"));
+        RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG, "<===\n");
 
         return 1;
 
@@ -166,7 +161,7 @@ int rtl_cam_delete_one_entry(struct ieee80211_hw *hw,
         u32 ul_command;
         struct rtl_priv *rtlpriv = rtl_priv(hw);
 
-        RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG, ("key_idx:%d\n", ul_key_id));
+        RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG, "key_idx:%d\n", ul_key_id);
 
         ul_command = ul_key_id * CAM_CONTENT_COUNT;
         ul_command = ul_command | BIT(31) | BIT(16);
@@ -175,9 +170,9 @@ int rtl_cam_delete_one_entry(struct ieee80211_hw *hw,
         rtl_write_dword(rtlpriv, rtlpriv->cfg->maps[RWCAM], ul_command);
 
         RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,
-                 ("rtl_cam_delete_one_entry(): WRITE A4: %x\n", 0));
+                 "rtl_cam_delete_one_entry(): WRITE A4: %x\n", 0);
         RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,
-                 ("rtl_cam_delete_one_entry(): WRITE A0: %x\n", ul_command));
+                 "rtl_cam_delete_one_entry(): WRITE A0: %x\n", ul_command);
 
         return 0;
 
@@ -229,9 +224,9 @@ void rtl_cam_mark_invalid(struct ieee80211_hw *hw, u8 uc_index)
         rtl_write_dword(rtlpriv, rtlpriv->cfg->maps[RWCAM], ul_command);
 
         RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,
-                 ("rtl_cam_mark_invalid(): WRITE A4: %x\n", ul_content));
+                 "rtl_cam_mark_invalid(): WRITE A4: %x\n", ul_content);
         RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,
-                 ("rtl_cam_mark_invalid(): WRITE A0: %x\n", ul_command));
+                 "rtl_cam_mark_invalid(): WRITE A0: %x\n", ul_command);
 }
 EXPORT_SYMBOL(rtl_cam_mark_invalid);
 
@@ -279,11 +274,11 @@ void rtl_cam_empty_entry(struct ieee80211_hw *hw, u8 uc_index)
                 rtl_write_dword(rtlpriv, rtlpriv->cfg->maps[RWCAM], ul_command);
 
                 RT_TRACE(rtlpriv, COMP_SEC, DBG_LOUD,
-                         ("rtl_cam_empty_entry(): WRITE A4: %x\n",
-                          ul_content));
+                         "rtl_cam_empty_entry(): WRITE A4: %x\n",
+                         ul_content);
                 RT_TRACE(rtlpriv, COMP_SEC, DBG_LOUD,
-                         ("rtl_cam_empty_entry(): WRITE A0: %x\n",
-                          ul_command));
+                         "rtl_cam_empty_entry(): WRITE A0: %x\n",
+                         ul_command);
         }
 
 }
@@ -297,8 +292,7 @@ u8 rtl_cam_get_free_entry(struct ieee80211_hw *hw, u8 *sta_addr)
         u8 i, *addr;
 
         if (NULL == sta_addr) {
-                RT_TRACE(rtlpriv, COMP_SEC, DBG_EMERG,
-                        ("sta_addr is NULL.\n"));
+                RT_TRACE(rtlpriv, COMP_SEC, DBG_EMERG, "sta_addr is NULL\n");
                 return TOTAL_CAM_ENTRY;
         }
         /* Does STA already exist? */
@@ -311,8 +305,8 @@ u8 rtl_cam_get_free_entry(struct ieee80211_hw *hw, u8 *sta_addr)
         for (entry_idx = 4; entry_idx < TOTAL_CAM_ENTRY; entry_idx++) {
                 if ((bitmap & BIT(0)) == 0) {
                         RT_TRACE(rtlpriv, COMP_SEC, DBG_EMERG,
-                                ("-----hwsec_cam_bitmap: 0x%x entry_idx=%d\n",
-                                 rtlpriv->sec.hwsec_cam_bitmap, entry_idx));
+                                 "-----hwsec_cam_bitmap: 0x%x entry_idx=%d\n",
+                                 rtlpriv->sec.hwsec_cam_bitmap, entry_idx);
                         rtlpriv->sec.hwsec_cam_bitmap |= BIT(0) << entry_idx;
                         memcpy(rtlpriv->sec.hwsec_cam_sta_addr[entry_idx],
                                sta_addr, ETH_ALEN);
@@ -331,14 +325,13 @@ void rtl_cam_del_entry(struct ieee80211_hw *hw, u8 *sta_addr)
         u8 i, *addr;
 
         if (NULL == sta_addr) {
-                RT_TRACE(rtlpriv, COMP_SEC, DBG_EMERG,
-                        ("sta_addr is NULL.\n"));
+                RT_TRACE(rtlpriv, COMP_SEC, DBG_EMERG, "sta_addr is NULL\n");
         }
 
         if ((sta_addr[0]|sta_addr[1]|sta_addr[2]|sta_addr[3]|\
                                 sta_addr[4]|sta_addr[5]) == 0) {
                 RT_TRACE(rtlpriv, COMP_SEC, DBG_EMERG,
-                        ("sta_addr is 00:00:00:00:00:00.\n"));
+                         "sta_addr is 00:00:00:00:00:00\n");
                 return;
         }
         /* Does STA already exist? */
diff --git a/drivers/net/wireless/rtlwifi/cam.h b/drivers/net/wireless/rtlwifi/cam.h
index c62da4eefc75..35e00086a520 100644
--- a/drivers/net/wireless/rtlwifi/cam.h
+++ b/drivers/net/wireless/rtlwifi/cam.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2009-2010  Realtek Corporation.
+ * Copyright(c) 2009-2012  Realtek Corporation.
  *
  * 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
diff --git a/drivers/net/wireless/rtlwifi/core.c b/drivers/net/wireless/rtlwifi/core.c
index 3f0f056fae9c..f231b9180436 100644
--- a/drivers/net/wireless/rtlwifi/core.c
+++ b/drivers/net/wireless/rtlwifi/core.c
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2009-2010  Realtek Corporation.
+ * Copyright(c) 2009-2012  Realtek Corporation.
  *
  * 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
@@ -31,8 +31,50 @@
 #include "core.h"
 #include "cam.h"
 #include "base.h"
+#include "pci.h"
 #include "ps.h"
 
+#include <linux/export.h>
+
+void rtl_fw_cb(const struct firmware *firmware, void *context)
+{
+        struct ieee80211_hw *hw = context;
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        int err;
+
+        RT_TRACE(rtlpriv, COMP_ERR, DBG_LOUD,
+                         "Firmware callback routine entered!\n");
+        complete(&rtlpriv->firmware_loading_complete);
+        if (!firmware) {
+                pr_err("Firmware %s not available\n", rtlpriv->cfg->fw_name);
+                rtlpriv->max_fw_size = 0;
+                return;
+        }
+        if (firmware->size > rtlpriv->max_fw_size) {
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
+                         "Firmware is too big!\n");
+                release_firmware(firmware);
+                return;
+        }
+        memcpy(rtlpriv->rtlhal.pfirmware, firmware->data, firmware->size);
+        rtlpriv->rtlhal.fwsize = firmware->size;
+        release_firmware(firmware);
+
+        err = ieee80211_register_hw(hw);
+        if (err) {
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
+                         "Can't register mac80211 hw\n");
+                return;
+        } else {
+                rtlpriv->mac80211.mac80211_registered = 1;
+        }
+        set_bit(RTL_STATUS_INTERFACE_START, &rtlpriv->status);
+
+        /*init rfkill */
+        rtl_init_rfkill(hw);
+}
+EXPORT_SYMBOL(rtl_fw_cb);
+
 /*mutex for start & stop is must here. */
 static int rtl_op_start(struct ieee80211_hw *hw)
 {
@@ -112,9 +154,11 @@ static int rtl_op_add_interface(struct ieee80211_hw *hw,
         struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
         int err = 0;
 
+        vif->driver_flags |= IEEE80211_VIF_BEACON_FILTER;
+
         if (mac->vif) {
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
-                         ("vif has been set!! mac->vif = 0x%p\n", mac->vif));
+                         "vif has been set!! mac->vif = 0x%p\n", mac->vif);
                 return -EOPNOTSUPP;
         }
 
@@ -125,7 +169,7 @@ static int rtl_op_add_interface(struct ieee80211_hw *hw,
         case NL80211_IFTYPE_STATION:
                 if (mac->beacon_enabled == 1) {
                         RT_TRACE(rtlpriv, COMP_MAC80211, DBG_LOUD,
-                                 ("NL80211_IFTYPE_STATION\n"));
+                                 "NL80211_IFTYPE_STATION\n");
                         mac->beacon_enabled = 0;
                         rtlpriv->cfg->ops->update_interrupt_mask(hw, 0,
                                         rtlpriv->cfg->maps
@@ -134,7 +178,7 @@ static int rtl_op_add_interface(struct ieee80211_hw *hw,
                 break;
         case NL80211_IFTYPE_ADHOC:
                 RT_TRACE(rtlpriv, COMP_MAC80211, DBG_LOUD,
-                         ("NL80211_IFTYPE_ADHOC\n"));
+                         "NL80211_IFTYPE_ADHOC\n");
 
                 mac->link_state = MAC80211_LINKED;
                 rtlpriv->cfg->ops->set_bcn_reg(hw);
@@ -148,7 +192,7 @@ static int rtl_op_add_interface(struct ieee80211_hw *hw,
                 break;
         case NL80211_IFTYPE_AP:
                 RT_TRACE(rtlpriv, COMP_MAC80211, DBG_LOUD,
-                         ("NL80211_IFTYPE_AP\n"));
+                         "NL80211_IFTYPE_AP\n");
 
                 mac->link_state = MAC80211_LINKED;
                 rtlpriv->cfg->ops->set_bcn_reg(hw);
@@ -161,7 +205,7 @@ static int rtl_op_add_interface(struct ieee80211_hw *hw,
                 break;
         default:
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("operation mode %d is not support!\n", vif->type));
+                         "operation mode %d is not supported!\n", vif->type);
                 err = -EOPNOTSUPP;
                 goto out;
         }
@@ -221,7 +265,7 @@ static int rtl_op_config(struct ieee80211_hw *hw, u32 changed)
         mutex_lock(&rtlpriv->locks.conf_mutex);
         if (changed & IEEE80211_CONF_CHANGE_LISTEN_INTERVAL) {  /*BIT(2)*/
                 RT_TRACE(rtlpriv, COMP_MAC80211, DBG_LOUD,
-                         ("IEEE80211_CONF_CHANGE_LISTEN_INTERVAL\n"));
+                         "IEEE80211_CONF_CHANGE_LISTEN_INTERVAL\n");
         }
 
         /*For IPS */
@@ -252,10 +296,12 @@ static int rtl_op_config(struct ieee80211_hw *hw, u32 changed)
                          * because that will cause nullfunc send by mac80211
                          * fail, and cause pkt loss, we have tested that 5mA
                          * is worked very well */
-                        if (!rtlpriv->psc.multi_buffered)
+                        if (!rtlpriv->psc.multi_buffered) {
                                 queue_delayed_work(rtlpriv->works.rtl_wq,
                                                 &rtlpriv->works.ps_work,
                                                 MSECS(5));
+                                pr_info("In section\n");
+                        }
                 } else {
                         rtl_swlps_rf_awake(hw);
                         rtlpriv->psc.sw_ps_enabled = false;
@@ -264,8 +310,8 @@ static int rtl_op_config(struct ieee80211_hw *hw, u32 changed)
 
         if (changed & IEEE80211_CONF_CHANGE_RETRY_LIMITS) {
                 RT_TRACE(rtlpriv, COMP_MAC80211, DBG_LOUD,
-                         ("IEEE80211_CONF_CHANGE_RETRY_LIMITS %x\n",
-                          hw->conf.long_frame_max_tx_count));
+                         "IEEE80211_CONF_CHANGE_RETRY_LIMITS %x\n",
+                         hw->conf.long_frame_max_tx_count);
                 mac->retry_long = hw->conf.long_frame_max_tx_count;
                 mac->retry_short = hw->conf.long_frame_max_tx_count;
                 rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_RETRY_LIMIT,
@@ -320,7 +366,7 @@ static int rtl_op_config(struct ieee80211_hw *hw, u32 changed)
                 default:
                         mac->bw_40 = false;
                         RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                                        ("switch case not processed\n"));
+                                 "switch case not processed\n");
                         break;
                 }
 
@@ -369,12 +415,12 @@ static void rtl_op_configure_filter(struct ieee80211_hw *hw,
                         mac->rx_conf |= rtlpriv->cfg->maps[MAC_RCR_AM] |
                             rtlpriv->cfg->maps[MAC_RCR_AB];
                         RT_TRACE(rtlpriv, COMP_MAC80211, DBG_LOUD,
-                                 ("Enable receive multicast frame.\n"));
+                                 "Enable receive multicast frame\n");
                 } else {
                         mac->rx_conf &= ~(rtlpriv->cfg->maps[MAC_RCR_AM] |
                                           rtlpriv->cfg->maps[MAC_RCR_AB]);
                         RT_TRACE(rtlpriv, COMP_MAC80211, DBG_LOUD,
-                                 ("Disable receive multicast frame.\n"));
+                                 "Disable receive multicast frame\n");
                 }
         }
 
@@ -382,11 +428,11 @@ static void rtl_op_configure_filter(struct ieee80211_hw *hw,
                 if (*new_flags & FIF_FCSFAIL) {
                         mac->rx_conf |= rtlpriv->cfg->maps[MAC_RCR_ACRC32];
                         RT_TRACE(rtlpriv, COMP_MAC80211, DBG_LOUD,
-                                 ("Enable receive FCS error frame.\n"));
+                                 "Enable receive FCS error frame\n");
                 } else {
                         mac->rx_conf &= ~rtlpriv->cfg->maps[MAC_RCR_ACRC32];
                         RT_TRACE(rtlpriv, COMP_MAC80211, DBG_LOUD,
-                                 ("Disable receive FCS error frame.\n"));
+                                 "Disable receive FCS error frame\n");
                 }
         }
 
@@ -409,11 +455,11 @@ static void rtl_op_configure_filter(struct ieee80211_hw *hw,
                         mac->rx_conf |= rtlpriv->cfg->maps[MAC_RCR_ACF];
 
                         RT_TRACE(rtlpriv, COMP_MAC80211, DBG_LOUD,
-                                 ("Enable receive control frame.\n"));
+                                 "Enable receive control frame\n");
                 } else {
                         mac->rx_conf &= ~rtlpriv->cfg->maps[MAC_RCR_ACF];
                         RT_TRACE(rtlpriv, COMP_MAC80211, DBG_LOUD,
-                                 ("Disable receive control frame.\n"));
+                                 "Disable receive control frame\n");
                 }
         }
 
@@ -421,11 +467,11 @@ static void rtl_op_configure_filter(struct ieee80211_hw *hw,
                 if (*new_flags & FIF_OTHER_BSS) {
                         mac->rx_conf |= rtlpriv->cfg->maps[MAC_RCR_AAP];
                         RT_TRACE(rtlpriv, COMP_MAC80211, DBG_LOUD,
-                                 ("Enable receive other BSS's frame.\n"));
+                                 "Enable receive other BSS's frame\n");
                 } else {
                         mac->rx_conf &= ~rtlpriv->cfg->maps[MAC_RCR_AAP];
                         RT_TRACE(rtlpriv, COMP_MAC80211, DBG_LOUD,
-                                 ("Disable receive other BSS's frame.\n"));
+                                 "Disable receive other BSS's frame\n");
                 }
         }
 }
@@ -456,7 +502,7 @@ static int rtl_op_sta_add(struct ieee80211_hw *hw,
                         sta_entry->wireless_mode = WIRELESS_MODE_G;
 
                 RT_TRACE(rtlpriv, COMP_MAC80211, DBG_DMESG,
-                        ("Add sta addr is %pM\n", sta->addr));
+                         "Add sta addr is %pM\n", sta->addr);
                 rtlpriv->cfg->ops->update_rate_tbl(hw, sta, 0);
         }
         return 0;
@@ -469,7 +515,7 @@ static int rtl_op_sta_remove(struct ieee80211_hw *hw,
         struct rtl_sta_info *sta_entry;
         if (sta) {
                 RT_TRACE(rtlpriv, COMP_MAC80211, DBG_DMESG,
-                        ("Remove sta addr is %pM\n", sta->addr));
+                         "Remove sta addr is %pM\n", sta->addr);
                 sta_entry = (struct rtl_sta_info *) sta->drv_priv;
                 sta_entry->wireless_mode = 0;
                 sta_entry->ratr_index = 0;
@@ -514,7 +560,7 @@ static int rtl_op_conf_tx(struct ieee80211_hw *hw,
 
         if (queue >= AC_MAX) {
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
-                         ("queue number %d is incorrect!\n", queue));
+                         "queue number %d is incorrect!\n", queue);
                 return -EINVAL;
         }
 
@@ -547,7 +593,7 @@ static void rtl_op_bss_info_changed(struct ieee80211_hw *hw,
                      bss_conf->enable_beacon)) {
                         if (mac->beacon_enabled == 0) {
                                 RT_TRACE(rtlpriv, COMP_MAC80211, DBG_DMESG,
-                                         ("BSS_CHANGED_BEACON_ENABLED\n"));
+                                         "BSS_CHANGED_BEACON_ENABLED\n");
 
                                 /*start hw beacon interrupt. */
                                 /*rtlpriv->cfg->ops->set_bcn_reg(hw); */
@@ -565,7 +611,7 @@ static void rtl_op_bss_info_changed(struct ieee80211_hw *hw,
                         !bss_conf->enable_beacon)) {
                         if (mac->beacon_enabled == 1) {
                                 RT_TRACE(rtlpriv, COMP_MAC80211, DBG_DMESG,
-                                         ("ADHOC DISABLE BEACON\n"));
+                                         "ADHOC DISABLE BEACON\n");
 
                                 mac->beacon_enabled = 0;
                                 rtlpriv->cfg->ops->update_interrupt_mask(hw, 0,
@@ -575,7 +621,7 @@ static void rtl_op_bss_info_changed(struct ieee80211_hw *hw,
                 }
                 if (changed & BSS_CHANGED_BEACON_INT) {
                         RT_TRACE(rtlpriv, COMP_BEACON, DBG_TRACE,
-                                 ("BSS_CHANGED_BEACON_INT\n"));
+                                 "BSS_CHANGED_BEACON_INT\n");
                         mac->beacon_interval = bss_conf->beacon_int;
                         rtlpriv->cfg->ops->set_bcn_intv(hw);
                 }
@@ -604,7 +650,7 @@ static void rtl_op_bss_info_changed(struct ieee80211_hw *hw,
                         if (mac->opmode == NL80211_IFTYPE_STATION && sta)
                                 rtlpriv->cfg->ops->update_rate_tbl(hw, sta, 0);
                         RT_TRACE(rtlpriv, COMP_MAC80211, DBG_DMESG,
-                                 ("BSS_CHANGED_ASSOC\n"));
+                                 "BSS_CHANGED_ASSOC\n");
                 } else {
                         if (mac->link_state == MAC80211_LINKED)
                                 rtl_lps_leave(hw);
@@ -619,20 +665,20 @@ static void rtl_op_bss_info_changed(struct ieee80211_hw *hw,
                         mac->vendor = PEER_UNKNOWN;
 
                         RT_TRACE(rtlpriv, COMP_MAC80211, DBG_DMESG,
-                                 ("BSS_CHANGED_UN_ASSOC\n"));
+                                 "BSS_CHANGED_UN_ASSOC\n");
                 }
         }
 
         if (changed & BSS_CHANGED_ERP_CTS_PROT) {
                 RT_TRACE(rtlpriv, COMP_MAC80211, DBG_TRACE,
-                         ("BSS_CHANGED_ERP_CTS_PROT\n"));
+                         "BSS_CHANGED_ERP_CTS_PROT\n");
                 mac->use_cts_protect = bss_conf->use_cts_prot;
         }
 
         if (changed & BSS_CHANGED_ERP_PREAMBLE) {
                 RT_TRACE(rtlpriv, COMP_MAC80211, DBG_LOUD,
-                         ("BSS_CHANGED_ERP_PREAMBLE use short preamble:%x\n",
-                          bss_conf->use_short_preamble));
+                         "BSS_CHANGED_ERP_PREAMBLE use short preamble:%x\n",
+                         bss_conf->use_short_preamble);
 
                 mac->short_preamble = bss_conf->use_short_preamble;
                 rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_ACK_PREAMBLE,
@@ -641,7 +687,7 @@ static void rtl_op_bss_info_changed(struct ieee80211_hw *hw,
 
         if (changed & BSS_CHANGED_ERP_SLOT) {
                 RT_TRACE(rtlpriv, COMP_MAC80211, DBG_TRACE,
-                         ("BSS_CHANGED_ERP_SLOT\n"));
+                         "BSS_CHANGED_ERP_SLOT\n");
 
                 if (bss_conf->use_short_slot)
                         mac->slot_time = RTL_SLOT_TIME_9;
@@ -653,8 +699,7 @@ static void rtl_op_bss_info_changed(struct ieee80211_hw *hw,
         }
 
         if (changed & BSS_CHANGED_HT) {
-                RT_TRACE(rtlpriv, COMP_MAC80211, DBG_TRACE,
-                         ("BSS_CHANGED_HT\n"));
+                RT_TRACE(rtlpriv, COMP_MAC80211, DBG_TRACE, "BSS_CHANGED_HT\n");
                 rcu_read_lock();
                 sta = get_sta(hw, vif, bss_conf->bssid);
                 if (sta) {
@@ -683,8 +728,8 @@ static void rtl_op_bss_info_changed(struct ieee80211_hw *hw,
                 rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_BSSID,
                                               (u8 *) bss_conf->bssid);
 
-                RT_TRACE(rtlpriv, COMP_MAC80211, DBG_DMESG,
-                         ("%pM\n", bss_conf->bssid));
+                RT_TRACE(rtlpriv, COMP_MAC80211, DBG_DMESG, "%pM\n",
+                         bss_conf->bssid);
 
                 mac->vendor = PEER_UNKNOWN;
                 memcpy(mac->bssid, bss_conf->bssid, 6);
@@ -831,30 +876,30 @@ static int rtl_op_ampdu_action(struct ieee80211_hw *hw,
         switch (action) {
         case IEEE80211_AMPDU_TX_START:
                 RT_TRACE(rtlpriv, COMP_MAC80211, DBG_TRACE,
-                         ("IEEE80211_AMPDU_TX_START: TID:%d\n", tid));
+                         "IEEE80211_AMPDU_TX_START: TID:%d\n", tid);
                 return rtl_tx_agg_start(hw, sta, tid, ssn);
                 break;
         case IEEE80211_AMPDU_TX_STOP:
                 RT_TRACE(rtlpriv, COMP_MAC80211, DBG_TRACE,
-                         ("IEEE80211_AMPDU_TX_STOP: TID:%d\n", tid));
+                         "IEEE80211_AMPDU_TX_STOP: TID:%d\n", tid);
                 return rtl_tx_agg_stop(hw, sta, tid);
                 break;
         case IEEE80211_AMPDU_TX_OPERATIONAL:
                 RT_TRACE(rtlpriv, COMP_MAC80211, DBG_TRACE,
-                         ("IEEE80211_AMPDU_TX_OPERATIONAL:TID:%d\n", tid));
+                         "IEEE80211_AMPDU_TX_OPERATIONAL:TID:%d\n", tid);
                 rtl_tx_agg_oper(hw, sta, tid);
                 break;
         case IEEE80211_AMPDU_RX_START:
                 RT_TRACE(rtlpriv, COMP_MAC80211, DBG_TRACE,
-                         ("IEEE80211_AMPDU_RX_START:TID:%d\n", tid));
+                         "IEEE80211_AMPDU_RX_START:TID:%d\n", tid);
                 break;
         case IEEE80211_AMPDU_RX_STOP:
                 RT_TRACE(rtlpriv, COMP_MAC80211, DBG_TRACE,
-                         ("IEEE80211_AMPDU_RX_STOP:TID:%d\n", tid));
+                         "IEEE80211_AMPDU_RX_STOP:TID:%d\n", tid);
                 break;
         default:
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("IEEE80211_AMPDU_ERR!!!!:\n"));
+                         "IEEE80211_AMPDU_ERR!!!!:\n");
                 return -EOPNOTSUPP;
         }
         return 0;
@@ -867,7 +912,7 @@ static void rtl_op_sw_scan_start(struct ieee80211_hw *hw)
 
         mac->act_scanning = true;
 
-        RT_TRACE(rtlpriv, COMP_MAC80211, DBG_LOUD, ("\n"));
+        RT_TRACE(rtlpriv, COMP_MAC80211, DBG_LOUD, "\n");
 
         if (mac->link_state == MAC80211_LINKED) {
                 rtl_lps_leave(hw);
@@ -888,7 +933,7 @@ static void rtl_op_sw_scan_complete(struct ieee80211_hw *hw)
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
 
-        RT_TRACE(rtlpriv, COMP_MAC80211, DBG_LOUD, ("\n"));
+        RT_TRACE(rtlpriv, COMP_MAC80211, DBG_LOUD, "\n");
         mac->act_scanning = false;
         /* Dual mac */
         rtlpriv->rtlhal.load_imrandiqk_setting_for2g = false;
@@ -921,13 +966,13 @@ static int rtl_op_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
 
         if (rtlpriv->cfg->mod_params->sw_crypto || rtlpriv->sec.use_sw_sec) {
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
-                         ("not open hw encryption\n"));
+                         "not open hw encryption\n");
                 return -ENOSPC; /*User disabled HW-crypto */
         }
         RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,
-                 ("%s hardware based encryption for keyidx: %d, mac: %pM\n",
-                  cmd == SET_KEY ? "Using" : "Disabling", key->keyidx,
-                  sta ? sta->addr : bcast_addr));
+                 "%s hardware based encryption for keyidx: %d, mac: %pM\n",
+                 cmd == SET_KEY ? "Using" : "Disabling", key->keyidx,
+                 sta ? sta->addr : bcast_addr);
         rtlpriv->sec.being_setkey = true;
         rtl_ips_nic_on(hw);
         mutex_lock(&rtlpriv->locks.conf_mutex);
@@ -936,24 +981,23 @@ static int rtl_op_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
         switch (key->cipher) {
         case WLAN_CIPHER_SUITE_WEP40:
                 key_type = WEP40_ENCRYPTION;
-                RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG, ("alg:WEP40\n"));
+                RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG, "alg:WEP40\n");
                 break;
         case WLAN_CIPHER_SUITE_WEP104:
-                RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,
-                         ("alg:WEP104\n"));
+                RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG, "alg:WEP104\n");
                 key_type = WEP104_ENCRYPTION;
                 break;
         case WLAN_CIPHER_SUITE_TKIP:
                 key_type = TKIP_ENCRYPTION;
-                RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG, ("alg:TKIP\n"));
+                RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG, "alg:TKIP\n");
                 break;
         case WLAN_CIPHER_SUITE_CCMP:
                 key_type = AESCCMP_ENCRYPTION;
-                RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG, ("alg:CCMP\n"));
+                RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG, "alg:CCMP\n");
                 break;
         default:
-                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("alg_err:%x!!!!:\n", key->cipher));
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "alg_err:%x!!!!\n",
+                         key->cipher);
                 goto out_unlock;
         }
         if (key_type == WEP40_ENCRYPTION ||
@@ -995,8 +1039,8 @@ static int rtl_op_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
                                 wep_only = true;
                         rtlpriv->sec.pairwise_enc_algorithm = key_type;
                         RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,
-                                ("set enable_hw_sec, key_type:%x(OPEN:0 WEP40:1"
-                                " TKIP:2 AES:4 WEP104:5)\n", key_type));
+                                 "set enable_hw_sec, key_type:%x(OPEN:0 WEP40:1 TKIP:2 AES:4 WEP104:5)\n",
+                                 key_type);
                         rtlpriv->cfg->ops->enable_hw_sec(hw);
                 }
         }
@@ -1005,7 +1049,7 @@ static int rtl_op_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
         case SET_KEY:
                 if (wep_only) {
                         RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,
-                                 ("set WEP(group/pairwise) key\n"));
+                                 "set WEP(group/pairwise) key\n");
                         /* Pairwise key with an assigned MAC address. */
                         rtlpriv->sec.pairwise_enc_algorithm = key_type;
                         rtlpriv->sec.group_enc_algorithm = key_type;
@@ -1016,7 +1060,7 @@ static int rtl_op_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
                         memcpy(mac_addr, zero_addr, ETH_ALEN);
                 } else if (group_key) { /* group key */
                         RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,
-                                 ("set group key\n"));
+                                 "set group key\n");
                         /* group key */
                         rtlpriv->sec.group_enc_algorithm = key_type;
                         /*set local buf about group key. */
@@ -1026,10 +1070,10 @@ static int rtl_op_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
                         memcpy(mac_addr, bcast_addr, ETH_ALEN);
                 } else {        /* pairwise key */
                         RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,
-                                 ("set pairwise key\n"));
+                                 "set pairwise key\n");
                         if (!sta) {
-                                RT_ASSERT(false, ("pairwise key withnot"
-                                                  "mac_addr\n"));
+                                RT_ASSERT(false,
+                                          "pairwise key without mac_addr\n");
 
                                 err = -EOPNOTSUPP;
                                 goto out_unlock;
@@ -1056,7 +1100,7 @@ static int rtl_op_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
                 break;
         case DISABLE_KEY:
                 RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,
-                         ("disable key delete one entry\n"));
+                         "disable key delete one entry\n");
                 /*set local buf about wep key. */
                 if (mac->opmode == NL80211_IFTYPE_AP) {
                         if (sta)
@@ -1077,7 +1121,7 @@ static int rtl_op_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
                 break;
         default:
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("cmd_err:%x!!!!:\n", cmd));
+                         "cmd_err:%x!!!!\n", cmd);
         }
 out_unlock:
         mutex_unlock(&rtlpriv->locks.conf_mutex);
@@ -1106,8 +1150,8 @@ static void rtl_op_rfkill_poll(struct ieee80211_hw *hw)
                         rtlpriv->rfkill.rfkill_state = radio_state;
 
                         RT_TRACE(rtlpriv, COMP_RF, DBG_DMESG,
-                                 (KERN_INFO "wireless radio switch turned %s\n",
-                                  radio_state ? "on" : "off"));
+                                 "wireless radio switch turned %s\n",
+                                 radio_state ? "on" : "off");
 
                         blocked = (rtlpriv->rfkill.rfkill_state == 1) ? 0 : 1;
                         wiphy_rfkill_set_hw_state(hw->wiphy, blocked);
diff --git a/drivers/net/wireless/rtlwifi/core.h b/drivers/net/wireless/rtlwifi/core.h
index f02824a3b747..2fe46a1b4f1f 100644
--- a/drivers/net/wireless/rtlwifi/core.h
+++ b/drivers/net/wireless/rtlwifi/core.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2009-2010  Realtek Corporation.
+ * Copyright(c) 2009-2012  Realtek Corporation.
  *
  * Tmis 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
@@ -30,8 +30,6 @@
 #ifndef __RTL_CORE_H__
 #define __RTL_CORE_H__
 
-#include <net/mac80211.h>
-
 #define RTL_SUPPORTED_FILTERS           \
         (FIF_PROMISC_IN_BSS | \
         FIF_ALLMULTI | FIF_CONTROL | \
@@ -42,4 +40,6 @@
 #define RTL_SUPPORTED_CTRL_FILTER       0xFF
 
 extern const struct ieee80211_ops rtl_ops;
+void rtl_fw_cb(const struct firmware *firmware, void *context);
+
 #endif
diff --git a/drivers/net/wireless/rtlwifi/debug.c b/drivers/net/wireless/rtlwifi/debug.c
index 1b5cb7153a52..bdda9b2fffe1 100644
--- a/drivers/net/wireless/rtlwifi/debug.c
+++ b/drivers/net/wireless/rtlwifi/debug.c
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2009-2010  Realtek Corporation.
+ * Copyright(c) 2009-2012  Realtek Corporation.
  *
  * Tmis 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
@@ -28,6 +28,8 @@
 
 #include "wifi.h"
 
+#include <linux/moduleparam.h>
+
 void rtl_dbgp_flag_init(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
diff --git a/drivers/net/wireless/rtlwifi/debug.h b/drivers/net/wireless/rtlwifi/debug.h
index 160dd0685213..07493d2957f2 100644
--- a/drivers/net/wireless/rtlwifi/debug.h
+++ b/drivers/net/wireless/rtlwifi/debug.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2009-2010  Realtek Corporation.
+ * Copyright(c) 2009-2012  Realtek Corporation.
  *
  * Tmis 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
@@ -156,53 +156,78 @@ enum dbgp_flag_e {
         DBGP_TYPE_MAX
 };
 
-#define RT_ASSERT(_exp, fmt)                            \
-        do {                                            \
-                if (!(_exp)) {                  \
-                        printk(KERN_DEBUG "%s:%s(): ", KBUILD_MODNAME, \
-                        __func__);                      \
-                        printk fmt;                     \
-                } \
-        } while (0);
-
-#define RT_TRACE(rtlpriv, comp, level, fmt)\
-        do { \
-                if (unlikely(((comp) & rtlpriv->dbg.global_debugcomponents) && \
-                        ((level) <= rtlpriv->dbg.global_debuglevel))) {\
-                        printk(KERN_DEBUG "%s:%s():<%lx-%x> ", KBUILD_MODNAME, \
-                        __func__, in_interrupt(), in_atomic()); \
-                        printk fmt;                             \
-                } \
-        } while (0);
-
-#define RTPRINT(rtlpriv, dbgtype, dbgflag, printstr)    \
-        do {                                            \
-                if (unlikely(rtlpriv->dbg.dbgp_type[dbgtype] & dbgflag)) { \
-                        printk(KERN_DEBUG "%s: ", KBUILD_MODNAME);      \
-                        printk printstr;                \
-                }                                       \
-        } while (0);
-
-#define RT_PRINT_DATA(rtlpriv, _comp, _level, _titlestring, _hexdata, \
-                _hexdatalen) \
-        do {\
-                if (unlikely(((_comp) & rtlpriv->dbg.global_debugcomponents) &&\
-                        (_level <= rtlpriv->dbg.global_debuglevel)))    { \
-                        int __i;                                        \
-                        u8*     ptr = (u8 *)_hexdata;                   \
-                        printk(KERN_DEBUG "%s: ", KBUILD_MODNAME);      \
-                        printk("In process \"%s\" (pid %i):", current->comm,\
-                                        current->pid); \
-                        printk(_titlestring);           \
-                        for (__i = 0; __i < (int)_hexdatalen; __i++) {  \
-                                printk("%02X%s", ptr[__i], (((__i + 1) % 4)\
-                                                        == 0) ? "  " : " ");\
-                                if (((__i + 1) % 16) == 0)              \
-                                        printk("\n");                   \
-                        }                               \
-                        printk(KERN_DEBUG "\n");                        \
-                } \
-        } while (0);
+#ifdef CONFIG_RTLWIFI_DEBUG
+
+#define RT_ASSERT(_exp, fmt, ...)                                       \
+do {                                                                    \
+        if (!(_exp)) {                                                  \
+                printk(KERN_DEBUG KBUILD_MODNAME ":%s(): " fmt,         \
+                       __func__, ##__VA_ARGS__);                        \
+        }                                                               \
+} while (0)
+
+#define RT_TRACE(rtlpriv, comp, level, fmt, ...)                        \
+do {                                                                    \
+        if (unlikely(((comp) & rtlpriv->dbg.global_debugcomponents) &&  \
+                     ((level) <= rtlpriv->dbg.global_debuglevel))) {    \
+                printk(KERN_DEBUG KBUILD_MODNAME ":%s():<%lx-%x> " fmt, \
+                       __func__, in_interrupt(), in_atomic(),           \
+                       ##__VA_ARGS__);                                  \
+        }                                                               \
+} while (0)
+
+#define RTPRINT(rtlpriv, dbgtype, dbgflag, fmt, ...)                    \
+do {                                                                    \
+        if (unlikely(rtlpriv->dbg.dbgp_type[dbgtype] & dbgflag)) {      \
+                printk(KERN_DEBUG KBUILD_MODNAME ": " fmt,              \
+                       ##__VA_ARGS__);                                  \
+        }                                                               \
+} while (0)
+
+#define RT_PRINT_DATA(rtlpriv, _comp, _level, _titlestring, _hexdata,   \
+                      _hexdatalen)                                      \
+do {                                                                    \
+        if (unlikely(((_comp) & rtlpriv->dbg.global_debugcomponents) && \
+                     (_level <= rtlpriv->dbg.global_debuglevel))) {     \
+                printk(KERN_DEBUG "%s: In process \"%s\" (pid %i): %s\n", \
+                       KBUILD_MODNAME, current->comm, current->pid,     \
+                       _titlestring);                                   \
+                print_hex_dump_bytes("", DUMP_PREFIX_NONE,              \
+                                     _hexdata, _hexdatalen);            \
+        }                                                               \
+} while (0)
+
+#else
+
+struct rtl_priv;
+
+__printf(2, 3)
+static inline void RT_ASSERT(int exp, const char *fmt, ...)
+{
+}
+
+__printf(4, 5)
+static inline void RT_TRACE(struct rtl_priv *rtlpriv,
+                            int comp, int level,
+                            const char *fmt, ...)
+{
+}
+
+__printf(4, 5)
+static inline void RTPRINT(struct rtl_priv *rtlpriv,
+                           int dbgtype, int dbgflag,
+                           const char *fmt, ...)
+{
+}
+
+static inline void RT_PRINT_DATA(struct rtl_priv *rtlpriv,
+                                 int comp, int level,
+                                 const char *titlestring,
+                                 const void *hexdata, size_t hexdatalen)
+{
+}
+
+#endif
 
 void rtl_dbgp_flag_init(struct ieee80211_hw *hw);
 #endif
diff --git a/drivers/net/wireless/rtlwifi/efuse.c b/drivers/net/wireless/rtlwifi/efuse.c
index ed1058b71587..b24cbe6e16d8 100644
--- a/drivers/net/wireless/rtlwifi/efuse.c
+++ b/drivers/net/wireless/rtlwifi/efuse.c
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2009-2010  Realtek Corporation.
+ * Copyright(c) 2009-2012  Realtek Corporation.
  *
  * Tmis 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
@@ -162,8 +162,8 @@ void efuse_write_1byte(struct ieee80211_hw *hw, u16 address, u8 value)
         const u32 efuse_len =
                 rtlpriv->cfg->maps[EFUSE_REAL_CONTENT_SIZE];
 
-        RT_TRACE(rtlpriv, COMP_EFUSE, DBG_LOUD,
-                 ("Addr=%x Data =%x\n", address, value));
+        RT_TRACE(rtlpriv, COMP_EFUSE, DBG_LOUD, "Addr=%x Data =%x\n",
+                 address, value);
 
         if (address < efuse_len) {
                 rtl_write_byte(rtlpriv, rtlpriv->cfg->maps[EFUSE_CTRL], value);
@@ -252,8 +252,8 @@ void read_efuse(struct ieee80211_hw *hw, u16 _offset, u16 _size_byte, u8 *pbuf)
 
         if ((_offset + _size_byte) > rtlpriv->cfg->maps[EFUSE_HWSET_MAX_SIZE]) {
                 RT_TRACE(rtlpriv, COMP_EFUSE, DBG_LOUD,
-                         ("read_efuse(): Invalid offset(%#x) with read "
-                          "bytes(%#x)!!\n", _offset, _size_byte));
+                         "read_efuse(): Invalid offset(%#x) with read bytes(%#x)!!\n",
+                         _offset, _size_byte);
                 return;
         }
 
@@ -280,7 +280,7 @@ void read_efuse(struct ieee80211_hw *hw, u16 _offset, u16 _size_byte, u8 *pbuf)
         if (*rtemp8 != 0xFF) {
                 efuse_utilized++;
                 RTPRINT(rtlpriv, FEEPROM, EFUSE_READ_ALL,
-                        ("Addr=%d\n", efuse_addr));
+                        "Addr=%d\n", efuse_addr);
                 efuse_addr++;
         }
 
@@ -290,13 +290,13 @@ void read_efuse(struct ieee80211_hw *hw, u16 _offset, u16 _size_byte, u8 *pbuf)
                 if (offset < efuse_max_section) {
                         wren = (*rtemp8 & 0x0f);
                         RTPRINT(rtlpriv, FEEPROM, EFUSE_READ_ALL,
-                                ("offset-%d Worden=%x\n", offset, wren));
+                                "offset-%d Worden=%x\n", offset, wren);
 
                         for (i = 0; i < EFUSE_MAX_WORD_UNIT; i++) {
                                 if (!(wren & 0x01)) {
                                         RTPRINT(rtlpriv, FEEPROM,
-                                                EFUSE_READ_ALL, ("Addr=%d\n",
-                                                                 efuse_addr));
+                                                EFUSE_READ_ALL,
+                                                "Addr=%d\n", efuse_addr);
 
                                         read_efuse_byte(hw, efuse_addr, rtemp8);
                                         efuse_addr++;
@@ -308,8 +308,8 @@ void read_efuse(struct ieee80211_hw *hw, u16 _offset, u16 _size_byte, u8 *pbuf)
                                                 break;
 
                                         RTPRINT(rtlpriv, FEEPROM,
-                                                EFUSE_READ_ALL, ("Addr=%d\n",
-                                                                 efuse_addr));
+                                                EFUSE_READ_ALL,
+                                                "Addr=%d\n", efuse_addr);
 
                                         read_efuse_byte(hw, efuse_addr, rtemp8);
                                         efuse_addr++;
@@ -326,7 +326,7 @@ void read_efuse(struct ieee80211_hw *hw, u16 _offset, u16 _size_byte, u8 *pbuf)
                 }
 
                 RTPRINT(rtlpriv, FEEPROM, EFUSE_READ_ALL,
-                        ("Addr=%d\n", efuse_addr));
+                        "Addr=%d\n", efuse_addr);
                 read_efuse_byte(hw, efuse_addr, rtemp8);
                 if (*rtemp8 != 0xFF && (efuse_addr < efuse_len)) {
                         efuse_utilized++;
@@ -395,9 +395,8 @@ bool efuse_shadow_update_chk(struct ieee80211_hw *hw)
                 result = false;
 
         RT_TRACE(rtlpriv, COMP_EFUSE, DBG_LOUD,
-                 ("efuse_shadow_update_chk(): totalbytes(%#x), "
-                  "hdr_num(%#x), words_need(%#x), efuse_used(%d)\n",
-                  totalbytes, hdr_num, words_need, efuse_used));
+                 "efuse_shadow_update_chk(): totalbytes(%#x), hdr_num(%#x), words_need(%#x), efuse_used(%d)\n",
+                 totalbytes, hdr_num, words_need, efuse_used);
 
         return result;
 }
@@ -434,7 +433,7 @@ bool efuse_shadow_update(struct ieee80211_hw *hw)
         u8 word_en = 0x0F;
         u8 first_pg = false;
 
-        RT_TRACE(rtlpriv, COMP_EFUSE, DBG_LOUD, ("--->\n"));
+        RT_TRACE(rtlpriv, COMP_EFUSE, DBG_LOUD, "--->\n");
 
         if (!efuse_shadow_update_chk(hw)) {
                 efuse_read_all_map(hw, &rtlefuse->efuse_map[EFUSE_INIT_MAP][0]);
@@ -443,7 +442,7 @@ bool efuse_shadow_update(struct ieee80211_hw *hw)
                        rtlpriv->cfg->maps[EFUSE_HWSET_MAX_SIZE]);
 
                 RT_TRACE(rtlpriv, COMP_EFUSE, DBG_LOUD,
-                         ("<---efuse out of capacity!!\n"));
+                         "<---efuse out of capacity!!\n");
                 return false;
         }
         efuse_power_switch(hw, true, true);
@@ -478,12 +477,12 @@ bool efuse_shadow_update(struct ieee80211_hw *hw)
                                &rtlefuse->efuse_map[EFUSE_MODIFY_MAP][base],
                                8);
                         RT_PRINT_DATA(rtlpriv, COMP_INIT, DBG_LOUD,
-                                      ("U-efuse\n"), tmpdata, 8);
+                                      "U-efuse", tmpdata, 8);
 
                         if (!efuse_pg_packet_write(hw, (u8) offset, word_en,
                                                    tmpdata)) {
                                 RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
-                                         ("PG section(%#x) fail!!\n", offset));
+                                         "PG section(%#x) fail!!\n", offset);
                                 break;
                         }
                 }
@@ -497,7 +496,7 @@ bool efuse_shadow_update(struct ieee80211_hw *hw)
                &rtlefuse->efuse_map[EFUSE_INIT_MAP][0],
                rtlpriv->cfg->maps[EFUSE_HWSET_MAX_SIZE]);
 
-        RT_TRACE(rtlpriv, COMP_EFUSE, DBG_LOUD, ("<---\n"));
+        RT_TRACE(rtlpriv, COMP_EFUSE, DBG_LOUD, "<---\n");
         return true;
 }
 
@@ -634,8 +633,8 @@ static int efuse_one_byte_write(struct ieee80211_hw *hw, u16 addr, u8 data)
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         u8 tmpidx = 0;
 
-        RT_TRACE(rtlpriv, COMP_EFUSE, DBG_LOUD,
-                 ("Addr = %x Data=%x\n", addr, data));
+        RT_TRACE(rtlpriv, COMP_EFUSE, DBG_LOUD, "Addr = %x Data=%x\n",
+                 addr, data);
 
         rtl_write_byte(rtlpriv,
                        rtlpriv->cfg->maps[EFUSE_CTRL] + 1, (u8) (addr & 0xff));
@@ -851,7 +850,7 @@ static void efuse_write_data_case1(struct ieee80211_hw *hw, u16 *efuse_addr,
                         }
                 }
         }
-        RTPRINT(rtlpriv, FEEPROM, EFUSE_PG, ("efuse PG_STATE_HEADER-1\n"));
+        RTPRINT(rtlpriv, FEEPROM, EFUSE_PG,  "efuse PG_STATE_HEADER-1\n");
 }
 
 static void efuse_write_data_case2(struct ieee80211_hw *hw, u16 *efuse_addr,
@@ -916,7 +915,7 @@ static void efuse_write_data_case2(struct ieee80211_hw *hw, u16 *efuse_addr,
                 }
 
                 RTPRINT(rtlpriv, FEEPROM, EFUSE_PG,
-                        ("efuse PG_STATE_HEADER-2\n"));
+                        "efuse PG_STATE_HEADER-2\n");
         }
 }
 
@@ -936,7 +935,7 @@ static int efuse_pg_packet_write(struct ieee80211_hw *hw,
         if (efuse_get_current_size(hw) >=
             (EFUSE_MAX_SIZE - EFUSE_OOB_PROTECT_BYTES)) {
                 RTPRINT(rtlpriv, FEEPROM, EFUSE_PG,
-                        ("efuse_pg_packet_write error\n"));
+                        "efuse_pg_packet_write error\n");
                 return false;
         }
 
@@ -948,7 +947,7 @@ static int efuse_pg_packet_write(struct ieee80211_hw *hw,
         efuse_word_enable_data_read(word_en, data, target_pkt.data);
         target_word_cnts = efuse_calculate_word_cnts(target_pkt.word_en);
 
-        RTPRINT(rtlpriv, FEEPROM, EFUSE_PG, ("efuse Power ON\n"));
+        RTPRINT(rtlpriv, FEEPROM, EFUSE_PG,  "efuse Power ON\n");
 
         while (continual && (efuse_addr <
                (EFUSE_MAX_SIZE - EFUSE_OOB_PROTECT_BYTES))) {
@@ -956,7 +955,7 @@ static int efuse_pg_packet_write(struct ieee80211_hw *hw,
                 if (write_state == PG_STATE_HEADER) {
                         badworden = 0x0F;
                         RTPRINT(rtlpriv, FEEPROM, EFUSE_PG,
-                                ("efuse PG_STATE_HEADER\n"));
+                                "efuse PG_STATE_HEADER\n");
 
                         if (efuse_one_byte_read(hw, efuse_addr, &efuse_data) &&
                             (efuse_data != 0xFF))
@@ -976,7 +975,7 @@ static int efuse_pg_packet_write(struct ieee80211_hw *hw,
 
                 } else if (write_state == PG_STATE_DATA) {
                         RTPRINT(rtlpriv, FEEPROM, EFUSE_PG,
-                                ("efuse PG_STATE_DATA\n"));
+                                "efuse PG_STATE_DATA\n");
                         badworden =
                             efuse_word_enable_data_write(hw, efuse_addr + 1,
                                                          target_pkt.word_en,
@@ -999,14 +998,14 @@ static int efuse_pg_packet_write(struct ieee80211_hw *hw,
                                         result = false;
                                 }
                                 RTPRINT(rtlpriv, FEEPROM, EFUSE_PG,
-                                        ("efuse PG_STATE_HEADER-3\n"));
+                                        "efuse PG_STATE_HEADER-3\n");
                         }
                 }
         }
 
         if (efuse_addr >= (EFUSE_MAX_SIZE - EFUSE_OOB_PROTECT_BYTES)) {
                 RT_TRACE(rtlpriv, COMP_EFUSE, DBG_LOUD,
-                         ("efuse_addr(%#x) Out of size!!\n", efuse_addr));
+                         "efuse_addr(%#x) Out of size!!\n", efuse_addr);
         }
 
         return true;
@@ -1046,8 +1045,8 @@ static u8 efuse_word_enable_data_write(struct ieee80211_hw *hw,
         u8 tmpdata[8];
 
         memset(tmpdata, 0xff, PGPKT_DATA_SIZE);
-        RT_TRACE(rtlpriv, COMP_EFUSE, DBG_LOUD,
-                 ("word_en = %x efuse_addr=%x\n", word_en, efuse_addr));
+        RT_TRACE(rtlpriv, COMP_EFUSE, DBG_LOUD, "word_en = %x efuse_addr=%x\n",
+                 word_en, efuse_addr);
 
         if (!(word_en & BIT(0))) {
                 tmpaddr = start_addr;
diff --git a/drivers/net/wireless/rtlwifi/efuse.h b/drivers/net/wireless/rtlwifi/efuse.h
index 164dabaa7615..2bdea9a8699e 100644
--- a/drivers/net/wireless/rtlwifi/efuse.h
+++ b/drivers/net/wireless/rtlwifi/efuse.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2009-2010  Realtek Corporation.
+ * Copyright(c) 2009-2012  Realtek Corporation.
  *
  * 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
diff --git a/drivers/net/wireless/rtlwifi/pci.c b/drivers/net/wireless/rtlwifi/pci.c
index 39e0907a3c4e..5cb2199435d2 100644
--- a/drivers/net/wireless/rtlwifi/pci.c
+++ b/drivers/net/wireless/rtlwifi/pci.c
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2009-2010  Realtek Corporation.
+ * Copyright(c) 2009-2012  Realtek Corporation.
  *
  * 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
@@ -27,13 +27,13 @@
  *
  *****************************************************************************/
 
-#include <linux/export.h>
-#include "core.h"
 #include "wifi.h"
+#include "core.h"
 #include "pci.h"
 #include "base.h"
 #include "ps.h"
 #include "efuse.h"
+#include <linux/export.h>
 
 static const u16 pcibridge_vendors[PCI_BRIDGE_VENDOR_MAX] = {
         PCI_VENDOR_ID_INTEL,
@@ -170,7 +170,7 @@ static void _rtl_pci_update_default_setting(struct ieee80211_hw *hw)
                 break;
         default:
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("switch case not process\n"));
+                         "switch case not processed\n");
                 break;
         }
 
@@ -232,7 +232,7 @@ static void rtl_pci_disable_aspm(struct ieee80211_hw *hw)
 
         if (pcibridge_vendor == PCI_BRIDGE_VENDOR_UNKNOWN) {
                 RT_TRACE(rtlpriv, COMP_POWER, DBG_TRACE,
-                         ("PCI(Bridge) UNKNOWN.\n"));
+                         "PCI(Bridge) UNKNOWN\n");
 
                 return;
         }
@@ -286,7 +286,7 @@ static void rtl_pci_enable_aspm(struct ieee80211_hw *hw)
 
         if (pcibridge_vendor == PCI_BRIDGE_VENDOR_UNKNOWN) {
                 RT_TRACE(rtlpriv, COMP_POWER, DBG_TRACE,
-                         ("PCI(Bridge) UNKNOWN.\n"));
+                         "PCI(Bridge) UNKNOWN\n");
                 return;
         }
 
@@ -303,11 +303,10 @@ static void rtl_pci_enable_aspm(struct ieee80211_hw *hw)
                               u_pcibridge_aspmsetting);
 
         RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
-                 ("PlatformEnableASPM():PciBridge busnumber[%x], "
-                  "DevNumbe[%x], funcnumber[%x], Write reg[%x] = %x\n",
-                  pcibridge_busnum, pcibridge_devnum, pcibridge_funcnum,
-                  (pcipriv->ndis_adapter.pcibridge_pciehdr_offset + 0x10),
-                  u_pcibridge_aspmsetting));
+                 "PlatformEnableASPM():PciBridge busnumber[%x], DevNumbe[%x], funcnumber[%x], Write reg[%x] = %x\n",
+                 pcibridge_busnum, pcibridge_devnum, pcibridge_funcnum,
+                 (pcipriv->ndis_adapter.pcibridge_pciehdr_offset + 0x10),
+                 u_pcibridge_aspmsetting);
 
         udelay(50);
 
@@ -382,9 +381,8 @@ static void rtl_pci_parse_configuration(struct pci_dev *pdev,
         pci_read_config_byte(pdev, pos + PCI_EXP_LNKCTL, &linkctrl_reg);
         pcipriv->ndis_adapter.linkctrl_reg = linkctrl_reg;
 
-        RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                 ("Link Control Register =%x\n",
-                  pcipriv->ndis_adapter.linkctrl_reg));
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, "Link Control Register =%x\n",
+                 pcipriv->ndis_adapter.linkctrl_reg);
 
         pci_read_config_byte(pdev, 0x98, &tmp);
         tmp |= BIT(4);
@@ -551,11 +549,10 @@ static void _rtl_pci_tx_isr(struct ieee80211_hw *hw, int prio)
                         skb_pull(skb, EM_HDR_LEN);
 
                 RT_TRACE(rtlpriv, (COMP_INTR | COMP_SEND), DBG_TRACE,
-                         ("new ring->idx:%d, "
-                          "free: skb_queue_len:%d, free: seq:%x\n",
-                          ring->idx,
-                          skb_queue_len(&ring->queue),
-                          *(u16 *) (skb->data + 22)));
+                         "new ring->idx:%d, free: skb_queue_len:%d, free: seq:%x\n",
+                         ring->idx,
+                         skb_queue_len(&ring->queue),
+                         *(u16 *) (skb->data + 22));
 
                 if (prio == TXCMD_QUEUE) {
                         dev_kfree_skb(skb);
@@ -593,11 +590,9 @@ static void _rtl_pci_tx_isr(struct ieee80211_hw *hw, int prio)
                                 == 2) {
 
                         RT_TRACE(rtlpriv, COMP_ERR, DBG_LOUD,
-                                        ("more desc left, wake"
-                                         "skb_queue@%d,ring->idx = %d,"
-                                         "skb_queue_len = 0x%d\n",
-                                         prio, ring->idx,
-                                         skb_queue_len(&ring->queue)));
+                                 "more desc left, wake skb_queue@%d, ring->idx = %d, skb_queue_len = 0x%d\n",
+                                 prio, ring->idx,
+                                 skb_queue_len(&ring->queue));
 
                         ieee80211_wake_queue(hw,
                                         skb_get_queue_mapping
@@ -657,6 +652,8 @@ static void _rtl_receive_one(struct ieee80211_hw *hw, struct sk_buff *skb,
                 return;
 
         uskb = dev_alloc_skb(skb->len + 128);
+        if (!uskb)
+                return;         /* exit if allocation failed */
         memcpy(IEEE80211_SKB_RXCB(uskb), &rx_status, sizeof(rx_status));
         pdata = (u8 *)skb_put(uskb, skb->len);
         memcpy(pdata, skb->data, skb->len);
@@ -709,9 +706,8 @@ static void _rtl_pci_rx_interrupt(struct ieee80211_hw *hw)
 
                 new_skb = dev_alloc_skb(rtlpci->rxbuffersize);
                 if (unlikely(!new_skb)) {
-                        RT_TRACE(rtlpriv, (COMP_INTR | COMP_RECV),
-                                 DBG_DMESG,
-                                 ("can't alloc skb for rx\n"));
+                        RT_TRACE(rtlpriv, (COMP_INTR | COMP_RECV), DBG_DMESG,
+                                 "can't alloc skb for rx\n");
                         goto done;
                 }
 
@@ -796,38 +792,37 @@ static irqreturn_t _rtl_pci_interrupt(int irq, void *dev_id)
         /*<1> beacon related */
         if (inta & rtlpriv->cfg->maps[RTL_IMR_TBDOK]) {
                 RT_TRACE(rtlpriv, COMP_INTR, DBG_TRACE,
-                         ("beacon ok interrupt!\n"));
+                         "beacon ok interrupt!\n");
         }
 
         if (unlikely(inta & rtlpriv->cfg->maps[RTL_IMR_TBDER])) {
                 RT_TRACE(rtlpriv, COMP_INTR, DBG_TRACE,
-                         ("beacon err interrupt!\n"));
+                         "beacon err interrupt!\n");
         }
 
         if (inta & rtlpriv->cfg->maps[RTL_IMR_BDOK]) {
-                RT_TRACE(rtlpriv, COMP_INTR, DBG_TRACE,
-                         ("beacon interrupt!\n"));
+                RT_TRACE(rtlpriv, COMP_INTR, DBG_TRACE, "beacon interrupt!\n");
         }
 
         if (inta & rtlpriv->cfg->maps[RTL_IMR_BcnInt]) {
                 RT_TRACE(rtlpriv, COMP_INTR, DBG_TRACE,
-                         ("prepare beacon for interrupt!\n"));
+                         "prepare beacon for interrupt!\n");
                 tasklet_schedule(&rtlpriv->works.irq_prepare_bcn_tasklet);
         }
 
         /*<3> Tx related */
         if (unlikely(inta & rtlpriv->cfg->maps[RTL_IMR_TXFOVW]))
-                RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING, ("IMR_TXFOVW!\n"));
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING, "IMR_TXFOVW!\n");
 
         if (inta & rtlpriv->cfg->maps[RTL_IMR_MGNTDOK]) {
                 RT_TRACE(rtlpriv, COMP_INTR, DBG_TRACE,
-                         ("Manage ok interrupt!\n"));
+                         "Manage ok interrupt!\n");
                 _rtl_pci_tx_isr(hw, MGNT_QUEUE);
         }
 
         if (inta & rtlpriv->cfg->maps[RTL_IMR_HIGHDOK]) {
                 RT_TRACE(rtlpriv, COMP_INTR, DBG_TRACE,
-                         ("HIGH_QUEUE ok interrupt!\n"));
+                         "HIGH_QUEUE ok interrupt!\n");
                 _rtl_pci_tx_isr(hw, HIGH_QUEUE);
         }
 
@@ -835,7 +830,7 @@ static irqreturn_t _rtl_pci_interrupt(int irq, void *dev_id)
                 rtlpriv->link_info.num_tx_inperiod++;
 
                 RT_TRACE(rtlpriv, COMP_INTR, DBG_TRACE,
-                         ("BK Tx OK interrupt!\n"));
+                         "BK Tx OK interrupt!\n");
                 _rtl_pci_tx_isr(hw, BK_QUEUE);
         }
 
@@ -843,7 +838,7 @@ static irqreturn_t _rtl_pci_interrupt(int irq, void *dev_id)
                 rtlpriv->link_info.num_tx_inperiod++;
 
                 RT_TRACE(rtlpriv, COMP_INTR, DBG_TRACE,
-                         ("BE TX OK interrupt!\n"));
+                         "BE TX OK interrupt!\n");
                 _rtl_pci_tx_isr(hw, BE_QUEUE);
         }
 
@@ -851,7 +846,7 @@ static irqreturn_t _rtl_pci_interrupt(int irq, void *dev_id)
                 rtlpriv->link_info.num_tx_inperiod++;
 
                 RT_TRACE(rtlpriv, COMP_INTR, DBG_TRACE,
-                         ("VI TX OK interrupt!\n"));
+                         "VI TX OK interrupt!\n");
                 _rtl_pci_tx_isr(hw, VI_QUEUE);
         }
 
@@ -859,7 +854,7 @@ static irqreturn_t _rtl_pci_interrupt(int irq, void *dev_id)
                 rtlpriv->link_info.num_tx_inperiod++;
 
                 RT_TRACE(rtlpriv, COMP_INTR, DBG_TRACE,
-                         ("Vo TX OK interrupt!\n"));
+                         "Vo TX OK interrupt!\n");
                 _rtl_pci_tx_isr(hw, VO_QUEUE);
         }
 
@@ -868,25 +863,25 @@ static irqreturn_t _rtl_pci_interrupt(int irq, void *dev_id)
                         rtlpriv->link_info.num_tx_inperiod++;
 
                         RT_TRACE(rtlpriv, COMP_INTR, DBG_TRACE,
-                                        ("CMD TX OK interrupt!\n"));
+                                 "CMD TX OK interrupt!\n");
                         _rtl_pci_tx_isr(hw, TXCMD_QUEUE);
                 }
         }
 
         /*<2> Rx related */
         if (inta & rtlpriv->cfg->maps[RTL_IMR_ROK]) {
-                RT_TRACE(rtlpriv, COMP_INTR, DBG_TRACE, ("Rx ok interrupt!\n"));
+                RT_TRACE(rtlpriv, COMP_INTR, DBG_TRACE, "Rx ok interrupt!\n");
                 _rtl_pci_rx_interrupt(hw);
         }
 
         if (unlikely(inta & rtlpriv->cfg->maps[RTL_IMR_RDU])) {
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
-                         ("rx descriptor unavailable!\n"));
+                         "rx descriptor unavailable!\n");
                 _rtl_pci_rx_interrupt(hw);
         }
 
         if (unlikely(inta & rtlpriv->cfg->maps[RTL_IMR_RXFOVW])) {
-                RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING, ("rx overflow !\n"));
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING, "rx overflow !\n");
                 _rtl_pci_rx_interrupt(hw);
         }
 
@@ -1028,7 +1023,7 @@ static int _rtl_pci_init_tx_ring(struct ieee80211_hw *hw,
 
         if (!ring || (unsigned long)ring & 0xFF) {
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("Cannot allocate TX ring (prio = %d)\n", prio));
+                         "Cannot allocate TX ring (prio = %d)\n", prio);
                 return -ENOMEM;
         }
 
@@ -1039,8 +1034,8 @@ static int _rtl_pci_init_tx_ring(struct ieee80211_hw *hw,
         rtlpci->tx_ring[prio].entries = entries;
         skb_queue_head_init(&rtlpci->tx_ring[prio].queue);
 
-        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
-                 ("queue:%d, ring_addr:%p\n", prio, ring));
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "queue:%d, ring_addr:%p\n",
+                 prio, ring);
 
         for (i = 0; i < entries; i++) {
                 nextdescaddress = (u32) dma +
@@ -1078,7 +1073,7 @@ static int _rtl_pci_init_rx_ring(struct ieee80211_hw *hw)
                 if (!rtlpci->rx_ring[rx_queue_idx].desc ||
                     (unsigned long)rtlpci->rx_ring[rx_queue_idx].desc & 0xFF) {
                         RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                                 ("Cannot allocate RX ring\n"));
+                                 "Cannot allocate RX ring\n");
                         return -ENOMEM;
                 }
 
@@ -1355,7 +1350,7 @@ static int rtl_pci_tx(struct ieee80211_hw *hw, struct sk_buff *skb,
         u8 temp_one = 1;
 
         if (ieee80211_is_auth(fc)) {
-                RT_TRACE(rtlpriv, COMP_SEND, DBG_DMESG, ("MAC80211_LINKING\n"));
+                RT_TRACE(rtlpriv, COMP_SEND, DBG_DMESG, "MAC80211_LINKING\n");
                 rtl_ips_nic_on(hw);
         }
 
@@ -1388,10 +1383,9 @@ static int rtl_pci_tx(struct ieee80211_hw *hw, struct sk_buff *skb,
 
         if ((own == 1) && (hw_queue != BEACON_QUEUE)) {
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
-                         ("No more TX desc@%d, ring->idx = %d,"
-                          "idx = %d, skb_queue_len = 0x%d\n",
-                          hw_queue, ring->idx, idx,
-                          skb_queue_len(&ring->queue)));
+                         "No more TX desc@%d, ring->idx = %d, idx = %d, skb_queue_len = 0x%d\n",
+                         hw_queue, ring->idx, idx,
+                         skb_queue_len(&ring->queue));
 
                 spin_unlock_irqrestore(&rtlpriv->locks.irq_th_lock, flags);
                 return skb->len;
@@ -1426,11 +1420,9 @@ static int rtl_pci_tx(struct ieee80211_hw *hw, struct sk_buff *skb,
             hw_queue != BEACON_QUEUE) {
 
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_LOUD,
-                         ("less desc left, stop skb_queue@%d, "
-                          "ring->idx = %d,"
-                          "idx = %d, skb_queue_len = 0x%d\n",
-                          hw_queue, ring->idx, idx,
-                          skb_queue_len(&ring->queue)));
+                         "less desc left, stop skb_queue@%d, ring->idx = %d, idx = %d, skb_queue_len = 0x%d\n",
+                         hw_queue, ring->idx, idx,
+                         skb_queue_len(&ring->queue));
 
                 ieee80211_stop_queue(hw, skb_get_queue_mapping(skb));
         }
@@ -1497,7 +1489,7 @@ static int rtl_pci_init(struct ieee80211_hw *hw, struct pci_dev *pdev)
         err = _rtl_pci_init_trx_ring(hw);
         if (err) {
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("tx ring initialization failed"));
+                         "tx ring initialization failed\n");
                 return err;
         }
 
@@ -1519,12 +1511,12 @@ static int rtl_pci_start(struct ieee80211_hw *hw)
         err = rtlpriv->cfg->ops->hw_init(hw);
         if (err) {
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
-                         ("Failed to config hardware!\n"));
+                         "Failed to config hardware!\n");
                 return err;
         }
 
         rtlpriv->cfg->ops->enable_interrupt(hw);
-        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, ("enable_interrupt OK\n"));
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "enable_interrupt OK\n");
 
         rtl_init_rx_config(hw);
 
@@ -1535,7 +1527,7 @@ static int rtl_pci_start(struct ieee80211_hw *hw)
 
         rtlpci->up_first_time = false;
 
-        RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, ("OK\n"));
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "OK\n");
         return 0;
 }
 
@@ -1573,6 +1565,9 @@ static void rtl_pci_stop(struct ieee80211_hw *hw)
 
         rtlpci->driver_is_goingto_unload = true;
         rtlpriv->cfg->ops->hw_disable(hw);
+        /* some things are not needed if firmware not available */
+        if (!rtlpriv->max_fw_size)
+                return;
         rtlpriv->cfg->ops->led_control(hw, LED_CTL_POWER_OFF);
 
         spin_lock_irqsave(&rtlpriv->locks.rf_ps_lock, flags);
@@ -1622,20 +1617,20 @@ static bool _rtl_pci_find_adapter(struct pci_dev *pdev,
                 switch (revisionid) {
                 case RTL_PCI_REVISION_ID_8192PCIE:
                         RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
-                                 ("8192 PCI-E is found - "
-                                  "vid/did=%x/%x\n", venderid, deviceid));
+                                 "8192 PCI-E is found - vid/did=%x/%x\n",
+                                 venderid, deviceid);
                         rtlhal->hw_type = HARDWARE_TYPE_RTL8192E;
                         break;
                 case RTL_PCI_REVISION_ID_8192SE:
                         RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
-                                 ("8192SE is found - "
-                                  "vid/did=%x/%x\n", venderid, deviceid));
+                                 "8192SE is found - vid/did=%x/%x\n",
+                                 venderid, deviceid);
                         rtlhal->hw_type = HARDWARE_TYPE_RTL8192SE;
                         break;
                 default:
                         RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
-                                 ("Err: Unknown device - "
-                                  "vid/did=%x/%x\n", venderid, deviceid));
+                                 "Err: Unknown device - vid/did=%x/%x\n",
+                                 venderid, deviceid);
                         rtlhal->hw_type = HARDWARE_TYPE_RTL8192SE;
                         break;
 
@@ -1646,18 +1641,18 @@ static bool _rtl_pci_find_adapter(struct pci_dev *pdev,
                    deviceid == RTL_PCI_8188CE_DID) {
                 rtlhal->hw_type = HARDWARE_TYPE_RTL8192CE;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
-                         ("8192C PCI-E is found - "
-                          "vid/did=%x/%x\n", venderid, deviceid));
+                         "8192C PCI-E is found - vid/did=%x/%x\n",
+                         venderid, deviceid);
         } else if (deviceid == RTL_PCI_8192DE_DID ||
                    deviceid == RTL_PCI_8192DE_DID2) {
                 rtlhal->hw_type = HARDWARE_TYPE_RTL8192DE;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
-                         ("8192D PCI-E is found - "
-                          "vid/did=%x/%x\n", venderid, deviceid));
+                         "8192D PCI-E is found - vid/did=%x/%x\n",
+                         venderid, deviceid);
         } else {
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
-                         ("Err: Unknown device -"
-                          " vid/did=%x/%x\n", venderid, deviceid));
+                         "Err: Unknown device - vid/did=%x/%x\n",
+                         venderid, deviceid);
 
                 rtlhal->hw_type = RTL_DEFAULT_HARDWARE_TYPE;
         }
@@ -1665,19 +1660,18 @@ static bool _rtl_pci_find_adapter(struct pci_dev *pdev,
         if (rtlhal->hw_type == HARDWARE_TYPE_RTL8192DE) {
                 if (revisionid == 0 || revisionid == 1) {
                         if (revisionid == 0) {
-                                RT_TRACE(rtlpriv, COMP_INIT,
-                                         DBG_LOUD, ("Find 92DE MAC0.\n"));
+                                RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
+                                         "Find 92DE MAC0\n");
                                 rtlhal->interfaceindex = 0;
                         } else if (revisionid == 1) {
                                 RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
-                                        ("Find 92DE MAC1.\n"));
+                                         "Find 92DE MAC1\n");
                                 rtlhal->interfaceindex = 1;
                         }
                 } else {
                         RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
-                                ("Unknown device - "
-                                "VendorID/DeviceID=%x/%x, Revision=%x\n",
-                                venderid, deviceid, revisionid));
+                                 "Unknown device - VendorID/DeviceID=%x/%x, Revision=%x\n",
+                                 venderid, deviceid, revisionid);
                         rtlhal->interfaceindex = 0;
                 }
         }
@@ -1693,8 +1687,8 @@ static bool _rtl_pci_find_adapter(struct pci_dev *pdev,
                         if (bridge_pdev->vendor == pcibridge_vendors[tmp]) {
                                 pcipriv->ndis_adapter.pcibridge_vendor = tmp;
                                 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
-                                         ("Pci Bridge Vendor is found index:"
-                                         " %d\n", tmp));
+                                         "Pci Bridge Vendor is found index: %d\n",
+                                         tmp);
                                 break;
                         }
                 }
@@ -1723,23 +1717,21 @@ static bool _rtl_pci_find_adapter(struct pci_dev *pdev,
         }
 
         RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
-                 ("pcidev busnumber:devnumber:funcnumber:"
-                  "vendor:link_ctl %d:%d:%d:%x:%x\n",
-                  pcipriv->ndis_adapter.busnumber,
-                  pcipriv->ndis_adapter.devnumber,
-                  pcipriv->ndis_adapter.funcnumber,
-                  pdev->vendor, pcipriv->ndis_adapter.linkctrl_reg));
+                 "pcidev busnumber:devnumber:funcnumber:vendor:link_ctl %d:%d:%d:%x:%x\n",
+                 pcipriv->ndis_adapter.busnumber,
+                 pcipriv->ndis_adapter.devnumber,
+                 pcipriv->ndis_adapter.funcnumber,
+                 pdev->vendor, pcipriv->ndis_adapter.linkctrl_reg);
 
         RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
-                 ("pci_bridge busnumber:devnumber:funcnumber:vendor:"
-                  "pcie_cap:link_ctl_reg:amd %d:%d:%d:%x:%x:%x:%x\n",
-                  pcipriv->ndis_adapter.pcibridge_busnum,
-                  pcipriv->ndis_adapter.pcibridge_devnum,
-                  pcipriv->ndis_adapter.pcibridge_funcnum,
-                  pcibridge_vendors[pcipriv->ndis_adapter.pcibridge_vendor],
-                  pcipriv->ndis_adapter.pcibridge_pciehdr_offset,
-                  pcipriv->ndis_adapter.pcibridge_linkctrlreg,
-                  pcipriv->ndis_adapter.amd_l1_patch));
+                 "pci_bridge busnumber:devnumber:funcnumber:vendor:pcie_cap:link_ctl_reg:amd %d:%d:%d:%x:%x:%x:%x\n",
+                 pcipriv->ndis_adapter.pcibridge_busnum,
+                 pcipriv->ndis_adapter.pcibridge_devnum,
+                 pcipriv->ndis_adapter.pcibridge_funcnum,
+                 pcibridge_vendors[pcipriv->ndis_adapter.pcibridge_vendor],
+                 pcipriv->ndis_adapter.pcibridge_pciehdr_offset,
+                 pcipriv->ndis_adapter.pcibridge_linkctrlreg,
+                 pcipriv->ndis_adapter.amd_l1_patch);
 
         rtl_pci_parse_configuration(pdev, hw);
 
@@ -1759,16 +1751,15 @@ int __devinit rtl_pci_probe(struct pci_dev *pdev,
 
         err = pci_enable_device(pdev);
         if (err) {
-                RT_ASSERT(false,
-                          ("%s : Cannot enable new PCI device\n",
-                           pci_name(pdev)));
+                RT_ASSERT(false, "%s : Cannot enable new PCI device\n",
+                          pci_name(pdev));
                 return err;
         }
 
         if (!pci_set_dma_mask(pdev, DMA_BIT_MASK(32))) {
                 if (pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32))) {
-                        RT_ASSERT(false, ("Unable to obtain 32bit DMA "
-                                          "for consistent allocations\n"));
+                        RT_ASSERT(false,
+                                  "Unable to obtain 32bit DMA for consistent allocations\n");
                         pci_disable_device(pdev);
                         return -ENOMEM;
                 }
@@ -1780,7 +1771,7 @@ int __devinit rtl_pci_probe(struct pci_dev *pdev,
                                 sizeof(struct rtl_priv), &rtl_ops);
         if (!hw) {
                 RT_ASSERT(false,
-                          ("%s : ieee80211 alloc failed\n", pci_name(pdev)));
+                          "%s : ieee80211 alloc failed\n", pci_name(pdev));
                 err = -ENOMEM;
                 goto fail1;
         }
@@ -1791,6 +1782,7 @@ int __devinit rtl_pci_probe(struct pci_dev *pdev,
         rtlpriv = hw->priv;
         pcipriv = (void *)rtlpriv->priv;
         pcipriv->dev.pdev = pdev;
+        init_completion(&rtlpriv->firmware_loading_complete);
 
         /* init cfg & intf_ops */
         rtlpriv->rtlhal.interface = INTF_PCI;
@@ -1810,8 +1802,8 @@ int __devinit rtl_pci_probe(struct pci_dev *pdev,
         /* MEM map */
         err = pci_request_regions(pdev, KBUILD_MODNAME);
         if (err) {
-                RT_ASSERT(false, ("Can't obtain PCI resources\n"));
-                return err;
+                RT_ASSERT(false, "Can't obtain PCI resources\n");
+                goto fail2;
         }
 
         pmem_start = pci_resource_start(pdev, rtlpriv->cfg->bar_id);
@@ -1823,15 +1815,14 @@ int __devinit rtl_pci_probe(struct pci_dev *pdev,
                         (unsigned long)pci_iomap(pdev,
                         rtlpriv->cfg->bar_id, pmem_len);
         if (rtlpriv->io.pci_mem_start == 0) {
-                RT_ASSERT(false, ("Can't map PCI mem\n"));
+                RT_ASSERT(false, "Can't map PCI mem\n");
                 goto fail2;
         }
 
         RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
-                 ("mem mapped space: start: 0x%08lx len:%08lx "
-                  "flags:%08lx, after map:0x%08lx\n",
-                  pmem_start, pmem_len, pmem_flags,
-                  rtlpriv->io.pci_mem_start));
+                 "mem mapped space: start: 0x%08lx len:%08lx flags:%08lx, after map:0x%08lx\n",
+                 pmem_start, pmem_len, pmem_flags,
+                 rtlpriv->io.pci_mem_start);
 
         /* Disable Clk Request */
         pci_write_config_byte(pdev, 0x81, 0);
@@ -1851,8 +1842,7 @@ int __devinit rtl_pci_probe(struct pci_dev *pdev,
         rtlpriv->cfg->ops->read_eeprom_info(hw);
 
         if (rtlpriv->cfg->ops->init_sw_vars(hw)) {
-                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("Can't init_sw_vars.\n"));
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "Can't init_sw_vars\n");
                 goto fail3;
         }
 
@@ -1865,63 +1855,48 @@ int __devinit rtl_pci_probe(struct pci_dev *pdev,
         err = rtl_init_core(hw);
         if (err) {
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("Can't allocate sw for mac80211.\n"));
+                         "Can't allocate sw for mac80211\n");
                 goto fail3;
         }
 
         /* Init PCI sw */
         err = !rtl_pci_init(hw, pdev);
         if (err) {
-                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("Failed to init PCI.\n"));
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "Failed to init PCI\n");
                 goto fail3;
         }
 
-        err = ieee80211_register_hw(hw);
-        if (err) {
-                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("Can't register mac80211 hw.\n"));
-                goto fail3;
-        } else {
-                rtlpriv->mac80211.mac80211_registered = 1;
-        }
-
         err = sysfs_create_group(&pdev->dev.kobj, &rtl_attribute_group);
         if (err) {
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("failed to create sysfs device attributes\n"));
+                         "failed to create sysfs device attributes\n");
                 goto fail3;
         }
 
-        /*init rfkill */
-        rtl_init_rfkill(hw);
-
         rtlpci = rtl_pcidev(pcipriv);
         err = request_irq(rtlpci->pdev->irq, &_rtl_pci_interrupt,
                           IRQF_SHARED, KBUILD_MODNAME, hw);
         if (err) {
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
-                         ("%s: failed to register IRQ handler\n",
-                          wiphy_name(hw->wiphy)));
+                         "%s: failed to register IRQ handler\n",
+                         wiphy_name(hw->wiphy));
                 goto fail3;
-        } else {
-                rtlpci->irq_alloc = 1;
         }
+        rtlpci->irq_alloc = 1;
 
-        set_bit(RTL_STATUS_INTERFACE_START, &rtlpriv->status);
         return 0;
 
 fail3:
         pci_set_drvdata(pdev, NULL);
         rtl_deinit_core(hw);
         _rtl_pci_io_handler_release(hw);
-        ieee80211_free_hw(hw);
 
         if (rtlpriv->io.pci_mem_start != 0)
                 pci_iounmap(pdev, (void __iomem *)rtlpriv->io.pci_mem_start);
 
 fail2:
         pci_release_regions(pdev);
+        complete(&rtlpriv->firmware_loading_complete);
 
 fail1:
 
@@ -1940,6 +1915,8 @@ void rtl_pci_disconnect(struct pci_dev *pdev)
         struct rtl_pci *rtlpci = rtl_pcidev(pcipriv);
         struct rtl_mac *rtlmac = rtl_mac(rtlpriv);
 
+        /* just in case driver is removed before firmware callback */
+        wait_for_completion(&rtlpriv->firmware_loading_complete);
         clear_bit(RTL_STATUS_INTERFACE_START, &rtlpriv->status);
 
         sysfs_remove_group(&pdev->dev.kobj, &rtl_attribute_group);
diff --git a/drivers/net/wireless/rtlwifi/pci.h b/drivers/net/wireless/rtlwifi/pci.h
index ebe0b42c0518..241448fc9ed5 100644
--- a/drivers/net/wireless/rtlwifi/pci.h
+++ b/drivers/net/wireless/rtlwifi/pci.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2009-2010  Realtek Corporation.
+ * Copyright(c) 2009-2012  Realtek Corporation.
  *
  * 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
@@ -239,7 +239,6 @@ int __devinit rtl_pci_probe(struct pci_dev *pdev,
 void rtl_pci_disconnect(struct pci_dev *pdev);
 int rtl_pci_suspend(struct device *dev);
 int rtl_pci_resume(struct device *dev);
-
 static inline u8 pci_read8_sync(struct rtl_priv *rtlpriv, u32 addr)
 {
         return readb((u8 __iomem *) rtlpriv->io.pci_mem_start + addr);
diff --git a/drivers/net/wireless/rtlwifi/ps.c b/drivers/net/wireless/rtlwifi/ps.c
index 130fdd99d573..15f86eaa1cd6 100644
--- a/drivers/net/wireless/rtlwifi/ps.c
+++ b/drivers/net/wireless/rtlwifi/ps.c
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2009-2010  Realtek Corporation.
+ * Copyright(c) 2009-2012  Realtek Corporation.
  *
  * 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
@@ -44,10 +44,11 @@ bool rtl_ps_enable_nic(struct ieee80211_hw *hw)
 
         if (is_hal_stop(rtlhal))
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
-                         ("Driver is already down!\n"));
+                         "Driver is already down!\n");
 
         /*<2> Enable Adapter */
-        rtlpriv->cfg->ops->hw_init(hw);
+        if (rtlpriv->cfg->ops->hw_init(hw))
+                return 1;
         RT_CLEAR_PS_LEVEL(ppsc, RT_RF_OFF_LEVL_HALT_NIC);
 
         /*<3> Enable Interrupt */
@@ -120,7 +121,7 @@ bool rtl_ps_set_rf_state(struct ieee80211_hw *hw,
 
         default:
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("switch case not process\n"));
+                         "switch case not processed\n");
                 break;
         }
 
@@ -176,7 +177,7 @@ void rtl_ips_nic_off_wq_callback(void *data)
 
         if (mac->opmode != NL80211_IFTYPE_STATION) {
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
-                         ("not station return\n"));
+                         "not station return\n");
                 return;
         }
 
@@ -207,7 +208,7 @@ void rtl_ips_nic_off_wq_callback(void *data)
                     (mac->link_state == MAC80211_NOLINK) &&
                     !mac->act_scanning) {
                         RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
-                                 ("IPSEnter(): Turn off RF.\n"));
+                                 "IPSEnter(): Turn off RF\n");
 
                         ppsc->inactive_pwrstate = ERFOFF;
                         ppsc->in_powersavemode = true;
@@ -280,8 +281,7 @@ static bool rtl_get_fwlps_doze(struct ieee80211_hw *hw)
 
         if (ps_timediff < 2000) {
                 RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
-                         ("Delay enter Fw LPS for DHCP, ARP,"
-                          " or EAPOL exchanging state.\n"));
+                         "Delay enter Fw LPS for DHCP, ARP, or EAPOL exchanging state\n");
                 return false;
         }
 
@@ -328,8 +328,8 @@ static void rtl_lps_set_psmode(struct ieee80211_hw *hw, u8 rt_psmode)
                 bool fw_current_inps;
                 if (ppsc->dot11_psmode == EACTIVE) {
                         RT_TRACE(rtlpriv, COMP_RF, DBG_DMESG,
-                                 ("FW LPS leave ps_mode:%x\n",
-                                  FW_PS_ACTIVE_MODE));
+                                 "FW LPS leave ps_mode:%x\n",
+                                 FW_PS_ACTIVE_MODE);
 
                         rpwm_val = 0x0C;        /* RF on */
                         fw_pwrmode = FW_PS_ACTIVE_MODE;
@@ -347,8 +347,8 @@ static void rtl_lps_set_psmode(struct ieee80211_hw *hw, u8 rt_psmode)
                 } else {
                         if (rtl_get_fwlps_doze(hw)) {
                                 RT_TRACE(rtlpriv, COMP_RF, DBG_DMESG,
-                                                ("FW LPS enter ps_mode:%x\n",
-                                                 ppsc->fwctrl_psmode));
+                                         "FW LPS enter ps_mode:%x\n",
+                                         ppsc->fwctrl_psmode);
 
                                 rpwm_val = 0x02;        /* RF off */
                                 fw_current_inps = true;
@@ -402,7 +402,7 @@ void rtl_lps_enter(struct ieee80211_hw *hw)
         if (mac->cnt_after_linked >= 2) {
                 if (ppsc->dot11_psmode == EACTIVE) {
                         RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
-                                        ("Enter 802.11 power save mode...\n"));
+                                 "Enter 802.11 power save mode...\n");
 
                         rtl_lps_set_psmode(hw, EAUTOPS);
                 }
@@ -434,7 +434,7 @@ void rtl_lps_leave(struct ieee80211_hw *hw)
                         }
 
                         RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
-                                 ("Busy Traffic,Leave 802.11 power save..\n"));
+                                 "Busy Traffic,Leave 802.11 power save..\n");
 
                         rtl_lps_set_psmode(hw, EACTIVE);
                 }
@@ -518,8 +518,8 @@ void rtl_swlps_beacon(struct ieee80211_hw *hw, void *data, unsigned int len)
                 queue_delayed_work(rtlpriv->works.rtl_wq,
                                 &rtlpriv->works.ps_work, MSECS(5));
         } else {
-                RT_TRACE(rtlpriv, COMP_POWER, DBG_DMESG, ("u_bufferd: %x, "
-                                "m_buffered: %x\n", u_buffed, m_buffed));
+                RT_TRACE(rtlpriv, COMP_POWER, DBG_DMESG,
+                         "u_bufferd: %x, m_buffered: %x\n", u_buffed, m_buffed);
         }
 }
 
@@ -607,8 +607,8 @@ void rtl_swlps_rf_sleep(struct ieee80211_hw *hw)
          * sleep  = dtim_period, that meaons, we should
          * awake before every dtim */
         RT_TRACE(rtlpriv, COMP_POWER, DBG_DMESG,
-                 ("dtim_counter:%x will sleep :%d"
-                 " beacon_intv\n", rtlpriv->psc.dtim_counter, sleep_intv));
+                 "dtim_counter:%x will sleep :%d beacon_intv\n",
+                 rtlpriv->psc.dtim_counter, sleep_intv);
 
         /* we tested that 40ms is enough for sw & hw sw delay */
         queue_delayed_work(rtlpriv->works.rtl_wq, &rtlpriv->works.ps_rfon_wq,
diff --git a/drivers/net/wireless/rtlwifi/ps.h b/drivers/net/wireless/rtlwifi/ps.h
index 84628e6041c7..1357856998c2 100644
--- a/drivers/net/wireless/rtlwifi/ps.h
+++ b/drivers/net/wireless/rtlwifi/ps.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2009-2010  Realtek Corporation.
+ * Copyright(c) 2009-2012  Realtek Corporation.
  *
  * 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
diff --git a/drivers/net/wireless/rtlwifi/rc.c b/drivers/net/wireless/rtlwifi/rc.c
index 539df66dce0a..c66f08a0524a 100644
--- a/drivers/net/wireless/rtlwifi/rc.c
+++ b/drivers/net/wireless/rtlwifi/rc.c
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2009-2010  Realtek Corporation.
+ * Copyright(c) 2009-2012  Realtek Corporation.
  *
  * 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
@@ -251,7 +251,7 @@ static void *rtl_rate_alloc_sta(void *ppriv,
         rate_priv = kzalloc(sizeof(struct rtl_rate_priv), gfp);
         if (!rate_priv) {
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("Unable to allocate private rc structure\n"));
+                         "Unable to allocate private rc structure\n");
                 return NULL;
         }
 
diff --git a/drivers/net/wireless/rtlwifi/rc.h b/drivers/net/wireless/rtlwifi/rc.h
index 4afa2c20adcf..4d6176160610 100644
--- a/drivers/net/wireless/rtlwifi/rc.h
+++ b/drivers/net/wireless/rtlwifi/rc.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2009-2010  Realtek Corporation.
+ * Copyright(c) 2009-2012  Realtek Corporation.
  *
  * 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
diff --git a/drivers/net/wireless/rtlwifi/regd.c b/drivers/net/wireless/rtlwifi/regd.c
index 9fedb1f70919..c1608cddc529 100644
--- a/drivers/net/wireless/rtlwifi/regd.c
+++ b/drivers/net/wireless/rtlwifi/regd.c
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2009-2010  Realtek Corporation.
+ * Copyright(c) 2009-2012  Realtek Corporation.
  *
  * 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
@@ -398,13 +398,11 @@ int rtl_regd_init(struct ieee80211_hw *hw,
         rtlpriv->regd.country_code = rtlpriv->efuse.channel_plan;
 
         RT_TRACE(rtlpriv, COMP_REGD, DBG_TRACE,
-                 (KERN_DEBUG "rtl: EEPROM regdomain: 0x%0x\n",
-                  rtlpriv->regd.country_code));
+                 "rtl: EEPROM regdomain: 0x%0x\n", rtlpriv->regd.country_code);
 
         if (rtlpriv->regd.country_code >= COUNTRY_CODE_MAX) {
                 RT_TRACE(rtlpriv, COMP_REGD, DBG_DMESG,
-                         (KERN_DEBUG "rtl: EEPROM indicates invalid contry code"
-                          "world wide 13 should be used\n"));
+                         "rtl: EEPROM indicates invalid contry code, world wide 13 should be used\n");
 
                 rtlpriv->regd.country_code = COUNTRY_CODE_WORLD_WIDE_13;
         }
@@ -420,8 +418,8 @@ int rtl_regd_init(struct ieee80211_hw *hw,
         }
 
         RT_TRACE(rtlpriv, COMP_REGD, DBG_TRACE,
-                 (KERN_DEBUG "rtl: Country alpha2 being used: %c%c\n",
-                  rtlpriv->regd.alpha2[0], rtlpriv->regd.alpha2[1]));
+                 "rtl: Country alpha2 being used: %c%c\n",
+                 rtlpriv->regd.alpha2[0], rtlpriv->regd.alpha2[1]);
 
         _rtl_regd_init_wiphy(&rtlpriv->regd, wiphy, reg_notifier);
 
@@ -433,7 +431,7 @@ int rtl_reg_notifier(struct wiphy *wiphy, struct regulatory_request *request)
         struct ieee80211_hw *hw = wiphy_to_ieee80211_hw(wiphy);
         struct rtl_priv *rtlpriv = rtl_priv(hw);
 
-        RT_TRACE(rtlpriv, COMP_REGD, DBG_LOUD, ("\n"));
+        RT_TRACE(rtlpriv, COMP_REGD, DBG_LOUD, "\n");
 
         return _rtl_reg_notifier_apply(wiphy, request, &rtlpriv->regd);
 }
diff --git a/drivers/net/wireless/rtlwifi/regd.h b/drivers/net/wireless/rtlwifi/regd.h
index d23118938fac..70ef2f418a44 100644
--- a/drivers/net/wireless/rtlwifi/regd.h
+++ b/drivers/net/wireless/rtlwifi/regd.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2009-2010  Realtek Corporation.
+ * Copyright(c) 2009-2012  Realtek Corporation.
  *
  * 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
diff --git a/drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c b/drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c
index 72a98cab6f69..cb5535cf3ae2 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2009-2010  Realtek Corporation.
+ * Copyright(c) 2009-2012  Realtek Corporation.
  *
  * 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
@@ -246,16 +246,15 @@ static void rtl92c_dm_false_alarm_counter_statistics(struct ieee80211_hw *hw)
         rtl_set_bbreg(hw, RCCK0_FALSEALARMREPORT, 0x0000c000, 2);
 
         RT_TRACE(rtlpriv, COMP_DIG, DBG_TRACE,
-                 ("cnt_parity_fail = %d, cnt_rate_illegal = %d, "
-                  "cnt_crc8_fail = %d, cnt_mcs_fail = %d\n",
-                  falsealm_cnt->cnt_parity_fail,
-                  falsealm_cnt->cnt_rate_illegal,
-                  falsealm_cnt->cnt_crc8_fail, falsealm_cnt->cnt_mcs_fail));
+                 "cnt_parity_fail = %d, cnt_rate_illegal = %d, cnt_crc8_fail = %d, cnt_mcs_fail = %d\n",
+                 falsealm_cnt->cnt_parity_fail,
+                 falsealm_cnt->cnt_rate_illegal,
+                 falsealm_cnt->cnt_crc8_fail, falsealm_cnt->cnt_mcs_fail);
 
         RT_TRACE(rtlpriv, COMP_DIG, DBG_TRACE,
-                 ("cnt_ofdm_fail = %x, cnt_cck_fail = %x, cnt_all = %x\n",
-                  falsealm_cnt->cnt_ofdm_fail,
-                  falsealm_cnt->cnt_cck_fail, falsealm_cnt->cnt_all));
+                 "cnt_ofdm_fail = %x, cnt_cck_fail = %x, cnt_all = %x\n",
+                 falsealm_cnt->cnt_ofdm_fail,
+                 falsealm_cnt->cnt_cck_fail, falsealm_cnt->cnt_all);
 }
 
 static void rtl92c_dm_ctrl_initgain_by_fa(struct ieee80211_hw *hw)
@@ -313,8 +312,8 @@ static void rtl92c_dm_ctrl_initgain_by_rssi(struct ieee80211_hw *hw)
                     dm_digtable.backoff_val;
 
         RT_TRACE(rtlpriv, COMP_DIG, DBG_TRACE,
-                 ("rssi_val_min = %x backoff_val %x\n",
-                  dm_digtable.rssi_val_min, dm_digtable.backoff_val));
+                 "rssi_val_min = %x backoff_val %x\n",
+                 dm_digtable.rssi_val_min, dm_digtable.backoff_val);
 
         rtl92c_dm_write_dig(hw);
 }
@@ -364,10 +363,9 @@ static void rtl92c_dm_initial_gain_multi_sta(struct ieee80211_hw *hw)
         }
 
         RT_TRACE(rtlpriv, COMP_DIG, DBG_TRACE,
-                 ("curmultista_connectstate = "
-                  "%x dig_ext_port_stage %x\n",
-                  dm_digtable.curmultista_connectstate,
-                  dm_digtable.dig_ext_port_stage));
+                 "curmultista_connectstate = %x dig_ext_port_stage %x\n",
+                 dm_digtable.curmultista_connectstate,
+                 dm_digtable.dig_ext_port_stage);
 }
 
 static void rtl92c_dm_initial_gain_sta(struct ieee80211_hw *hw)
@@ -375,10 +373,9 @@ static void rtl92c_dm_initial_gain_sta(struct ieee80211_hw *hw)
         struct rtl_priv *rtlpriv = rtl_priv(hw);
 
         RT_TRACE(rtlpriv, COMP_DIG, DBG_TRACE,
-                 ("presta_connectstate = %x,"
-                  " cursta_connectctate = %x\n",
-                  dm_digtable.presta_connectstate,
-                  dm_digtable.cursta_connectctate));
+                 "presta_connectstate = %x, cursta_connectctate = %x\n",
+                 dm_digtable.presta_connectstate,
+                 dm_digtable.cursta_connectctate);
 
         if (dm_digtable.presta_connectstate == dm_digtable.cursta_connectctate
             || dm_digtable.cursta_connectctate == DIG_STA_BEFORE_CONNECT
@@ -464,11 +461,11 @@ static void rtl92c_dm_cck_packet_detection_thresh(struct ieee80211_hw *hw)
                 dm_digtable.pre_cck_pd_state = dm_digtable.cur_cck_pd_state;
         }
 
-        RT_TRACE(rtlpriv, COMP_DIG, DBG_TRACE,
-                 ("CCKPDStage=%x\n", dm_digtable.cur_cck_pd_state));
+        RT_TRACE(rtlpriv, COMP_DIG, DBG_TRACE, "CCKPDStage=%x\n",
+                 dm_digtable.cur_cck_pd_state);
 
-        RT_TRACE(rtlpriv, COMP_DIG, DBG_TRACE,
-                 ("is92C=%x\n", IS_92C_SERIAL(rtlhal->version)));
+        RT_TRACE(rtlpriv, COMP_DIG, DBG_TRACE, "is92C=%x\n",
+                 IS_92C_SERIAL(rtlhal->version));
 }
 
 static void rtl92c_dm_ctrl_initgain_by_twoport(struct ieee80211_hw *hw)
@@ -519,10 +516,9 @@ void rtl92c_dm_write_dig(struct ieee80211_hw *hw)
         struct rtl_priv *rtlpriv = rtl_priv(hw);
 
         RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD,
-                 ("cur_igvalue = 0x%x, "
-                  "pre_igvalue = 0x%x, backoff_val = %d\n",
-                  dm_digtable.cur_igvalue, dm_digtable.pre_igvalue,
-                  dm_digtable.backoff_val));
+                 "cur_igvalue = 0x%x, pre_igvalue = 0x%x, backoff_val = %d\n",
+                 dm_digtable.cur_igvalue, dm_digtable.pre_igvalue,
+                 dm_digtable.backoff_val);
 
         if (dm_digtable.pre_igvalue != dm_digtable.cur_igvalue) {
                 rtl_set_bbreg(hw, ROFDM0_XAAGCCORE1, 0x7f,
@@ -676,15 +672,14 @@ static void rtl92c_dm_txpower_tracking_callback_thermalmeter(struct ieee80211_hw
 
         rtlpriv->dm.txpower_trackinginit = true;
         RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
-                 ("rtl92c_dm_txpower_tracking_callback_thermalmeter\n"));
+                 "rtl92c_dm_txpower_tracking_callback_thermalmeter\n");
 
         thermalvalue = (u8) rtl_get_rfreg(hw, RF90_PATH_A, RF_T_METER, 0x1f);
 
         RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
-                 ("Readback Thermal Meter = 0x%x pre thermal meter 0x%x "
-                  "eeprom_thermalmeter 0x%x\n",
-                  thermalvalue, rtlpriv->dm.thermalvalue,
-                  rtlefuse->eeprom_thermalmeter));
+                 "Readback Thermal Meter = 0x%x pre thermal meter 0x%x eeprom_thermalmeter 0x%x\n",
+                 thermalvalue, rtlpriv->dm.thermalvalue,
+                 rtlefuse->eeprom_thermalmeter);
 
         rtl92c_phy_ap_calibrate(hw, (thermalvalue -
                                      rtlefuse->eeprom_thermalmeter));
@@ -702,10 +697,9 @@ static void rtl92c_dm_txpower_tracking_callback_thermalmeter(struct ieee80211_hw
                                 ofdm_index_old[0] = (u8) i;
 
                                 RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
-                                        ("Initial pathA ele_d reg0x%x = 0x%lx, "
-                                         "ofdm_index=0x%x\n",
+                                         "Initial pathA ele_d reg0x%x = 0x%lx, ofdm_index=0x%x\n",
                                          ROFDM0_XATXIQIMBALANCE,
-                                         ele_d, ofdm_index_old[0]));
+                                         ele_d, ofdm_index_old[0]);
                                 break;
                         }
                 }
@@ -719,11 +713,10 @@ static void rtl92c_dm_txpower_tracking_callback_thermalmeter(struct ieee80211_hw
                                     MASKOFDM_D)) {
 
                                         RT_TRACE(rtlpriv, COMP_POWER_TRACKING,
-                                           DBG_LOUD,
-                                           ("Initial pathB ele_d reg0x%x = "
-                                           "0x%lx, ofdm_index=0x%x\n",
-                                           ROFDM0_XBTXIQIMBALANCE, ele_d,
-                                           ofdm_index_old[1]));
+                                                 DBG_LOUD,
+                                                 "Initial pathB ele_d reg0x%x = 0x%lx, ofdm_index=0x%x\n",
+                                                 ROFDM0_XBTXIQIMBALANCE, ele_d,
+                                                 ofdm_index_old[1]);
                                         break;
                                 }
                         }
@@ -741,11 +734,10 @@ static void rtl92c_dm_txpower_tracking_callback_thermalmeter(struct ieee80211_hw
 
                                         RT_TRACE(rtlpriv, COMP_POWER_TRACKING,
                                                  DBG_LOUD,
-                                                 ("Initial reg0x%x = 0x%lx, "
-                                                  "cck_index=0x%x, ch 14 %d\n",
-                                                  RCCK0_TXFILTER2, temp_cck,
-                                                  cck_index_old,
-                                                  rtlpriv->dm.cck_inch14));
+                                                 "Initial reg0x%x = 0x%lx, cck_index=0x%x, ch 14 %d\n",
+                                                 RCCK0_TXFILTER2, temp_cck,
+                                                 cck_index_old,
+                                                 rtlpriv->dm.cck_inch14);
                                         break;
                                 }
                         } else {
@@ -757,11 +749,10 @@ static void rtl92c_dm_txpower_tracking_callback_thermalmeter(struct ieee80211_hw
 
                                         RT_TRACE(rtlpriv, COMP_POWER_TRACKING,
                                                  DBG_LOUD,
-                                                 ("Initial reg0x%x = 0x%lx, "
-                                                  "cck_index=0x%x, ch14 %d\n",
-                                                  RCCK0_TXFILTER2, temp_cck,
-                                                  cck_index_old,
-                                                  rtlpriv->dm.cck_inch14));
+                                                 "Initial reg0x%x = 0x%lx, cck_index=0x%x, ch14 %d\n",
+                                                 RCCK0_TXFILTER2, temp_cck,
+                                                 cck_index_old,
+                                                 rtlpriv->dm.cck_inch14);
                                         break;
                                 }
                         }
@@ -790,12 +781,10 @@ static void rtl92c_dm_txpower_tracking_callback_thermalmeter(struct ieee80211_hw
                     (rtlpriv->dm.thermalvalue_iqk - thermalvalue);
 
                 RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
-                        ("Readback Thermal Meter = 0x%x pre thermal meter 0x%x "
-                         "eeprom_thermalmeter 0x%x delta 0x%x "
-                         "delta_lck 0x%x delta_iqk 0x%x\n",
+                         "Readback Thermal Meter = 0x%x pre thermal meter 0x%x eeprom_thermalmeter 0x%x delta 0x%x delta_lck 0x%x delta_iqk 0x%x\n",
                          thermalvalue, rtlpriv->dm.thermalvalue,
                          rtlefuse->eeprom_thermalmeter, delta, delta_lck,
-                         delta_iqk));
+                         delta_iqk);
 
                 if (delta_lck > 1) {
                         rtlpriv->dm.thermalvalue_lck = thermalvalue;
@@ -815,18 +804,15 @@ static void rtl92c_dm_txpower_tracking_callback_thermalmeter(struct ieee80211_hw
 
                         if (is2t) {
                                 RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
-                                         ("temp OFDM_A_index=0x%x, "
-                                          "OFDM_B_index=0x%x,"
-                                          "cck_index=0x%x\n",
-                                          rtlpriv->dm.ofdm_index[0],
-                                          rtlpriv->dm.ofdm_index[1],
-                                          rtlpriv->dm.cck_index));
+                                         "temp OFDM_A_index=0x%x, OFDM_B_index=0x%x, cck_index=0x%x\n",
+                                         rtlpriv->dm.ofdm_index[0],
+                                         rtlpriv->dm.ofdm_index[1],
+                                         rtlpriv->dm.cck_index);
                         } else {
                                 RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
-                                         ("temp OFDM_A_index=0x%x,"
-                                          "cck_index=0x%x\n",
-                                          rtlpriv->dm.ofdm_index[0],
-                                          rtlpriv->dm.cck_index));
+                                         "temp OFDM_A_index=0x%x, cck_index=0x%x\n",
+                                         rtlpriv->dm.ofdm_index[0],
+                                         rtlpriv->dm.cck_index);
                         }
 
                         if (thermalvalue > rtlefuse->eeprom_thermalmeter) {
@@ -918,16 +904,13 @@ static void rtl92c_dm_txpower_tracking_callback_thermalmeter(struct ieee80211_hw
 
                         if (is2t) {
                                 RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
-                                         ("new OFDM_A_index=0x%x, "
-                                          "OFDM_B_index=0x%x,"
-                                          "cck_index=0x%x\n",
-                                          ofdm_index[0], ofdm_index[1],
-                                          cck_index));
+                                         "new OFDM_A_index=0x%x, OFDM_B_index=0x%x, cck_index=0x%x\n",
+                                         ofdm_index[0], ofdm_index[1],
+                                         cck_index);
                         } else {
                                 RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
-                                         ("new OFDM_A_index=0x%x,"
-                                          "cck_index=0x%x\n",
-                                          ofdm_index[0], cck_index));
+                                         "new OFDM_A_index=0x%x, cck_index=0x%x\n",
+                                         ofdm_index[0], cck_index);
                         }
                 }
 
@@ -1085,7 +1068,7 @@ static void rtl92c_dm_txpower_tracking_callback_thermalmeter(struct ieee80211_hw
                         rtlpriv->dm.thermalvalue = thermalvalue;
         }
 
-        RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD, ("<===\n"));
+        RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD, "<===\n");
 
 }
 
@@ -1098,8 +1081,8 @@ static void rtl92c_dm_initialize_txpower_tracking_thermalmeter(
         rtlpriv->dm.txpower_trackinginit = false;
 
         RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
-                 ("pMgntInfo->txpower_tracking = %d\n",
-                  rtlpriv->dm.txpower_tracking));
+                 "pMgntInfo->txpower_tracking = %d\n",
+                 rtlpriv->dm.txpower_tracking);
 }
 
 static void rtl92c_dm_initialize_txpower_tracking(struct ieee80211_hw *hw)
@@ -1125,12 +1108,12 @@ static void rtl92c_dm_check_txpower_tracking_thermal_meter(
                 rtl_set_rfreg(hw, RF90_PATH_A, RF_T_METER, RFREG_OFFSET_MASK,
                               0x60);
                 RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
-                         ("Trigger 92S Thermal Meter!!\n"));
+                         "Trigger 92S Thermal Meter!!\n");
                 tm_trigger = 1;
                 return;
         } else {
                 RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
-                         ("Schedule TxPowerTracking direct call!!\n"));
+                         "Schedule TxPowerTracking direct call!!\n");
                 rtl92c_dm_txpower_tracking_directcall(hw);
                 tm_trigger = 0;
         }
@@ -1169,13 +1152,13 @@ static void rtl92c_dm_refresh_rate_adaptive_mask(struct ieee80211_hw *hw)
 
         if (is_hal_stop(rtlhal)) {
                 RT_TRACE(rtlpriv, COMP_RATE, DBG_LOUD,
-                         ("<---- driver is going to unload\n"));
+                         "<---- driver is going to unload\n");
                 return;
         }
 
         if (!rtlpriv->dm.useramask) {
                 RT_TRACE(rtlpriv, COMP_RATE, DBG_LOUD,
-                        ("<---- driver does not control rate adaptive mask\n"));
+                         "<---- driver does not control rate adaptive mask\n");
                 return;
         }
 
@@ -1210,14 +1193,13 @@ static void rtl92c_dm_refresh_rate_adaptive_mask(struct ieee80211_hw *hw)
                         p_ra->ratr_state = DM_RATR_STA_LOW;
 
                 if (p_ra->pre_ratr_state != p_ra->ratr_state) {
+                        RT_TRACE(rtlpriv, COMP_RATE, DBG_LOUD, "RSSI = %ld\n",
+                                 rtlpriv->dm.undecorated_smoothed_pwdb);
                         RT_TRACE(rtlpriv, COMP_RATE, DBG_LOUD,
-                                 ("RSSI = %ld\n",
-                                  rtlpriv->dm.undecorated_smoothed_pwdb));
+                                 "RSSI_LEVEL = %d\n", p_ra->ratr_state);
                         RT_TRACE(rtlpriv, COMP_RATE, DBG_LOUD,
-                                 ("RSSI_LEVEL = %d\n", p_ra->ratr_state));
-                        RT_TRACE(rtlpriv, COMP_RATE, DBG_LOUD,
-                                 ("PreState = %d, CurState = %d\n",
-                                  p_ra->pre_ratr_state, p_ra->ratr_state));
+                                 "PreState = %d, CurState = %d\n",
+                                 p_ra->pre_ratr_state, p_ra->ratr_state);
 
                         rcu_read_lock();
                         sta = ieee80211_find_sta(mac->vif, mac->bssid);
@@ -1316,8 +1298,7 @@ static void rtl92c_dm_dynamic_bb_powersaving(struct ieee80211_hw *hw)
         if (((mac->link_state == MAC80211_NOLINK)) &&
             (rtlpriv->dm.entry_min_undecoratedsmoothed_pwdb == 0)) {
                 dm_pstable.rssi_val_min = 0;
-                RT_TRACE(rtlpriv, DBG_LOUD, DBG_LOUD,
-                         ("Not connected to any\n"));
+                RT_TRACE(rtlpriv, DBG_LOUD, DBG_LOUD, "Not connected to any\n");
         }
 
         if (mac->link_state == MAC80211_LINKED) {
@@ -1325,22 +1306,22 @@ static void rtl92c_dm_dynamic_bb_powersaving(struct ieee80211_hw *hw)
                         dm_pstable.rssi_val_min =
                             rtlpriv->dm.entry_min_undecoratedsmoothed_pwdb;
                         RT_TRACE(rtlpriv, DBG_LOUD, DBG_LOUD,
-                                 ("AP Client PWDB = 0x%lx\n",
-                                  dm_pstable.rssi_val_min));
+                                 "AP Client PWDB = 0x%lx\n",
+                                 dm_pstable.rssi_val_min);
                 } else {
                         dm_pstable.rssi_val_min =
                             rtlpriv->dm.undecorated_smoothed_pwdb;
                         RT_TRACE(rtlpriv, DBG_LOUD, DBG_LOUD,
-                                 ("STA Default Port PWDB = 0x%lx\n",
-                                  dm_pstable.rssi_val_min));
+                                 "STA Default Port PWDB = 0x%lx\n",
+                                 dm_pstable.rssi_val_min);
                 }
         } else {
                 dm_pstable.rssi_val_min =
                     rtlpriv->dm.entry_min_undecoratedsmoothed_pwdb;
 
                 RT_TRACE(rtlpriv, DBG_LOUD, DBG_LOUD,
-                         ("AP Ext Port PWDB = 0x%lx\n",
-                          dm_pstable.rssi_val_min));
+                         "AP Ext Port PWDB = 0x%lx\n",
+                         dm_pstable.rssi_val_min);
         }
 
         if (IS_92C_SERIAL(rtlhal->version))
@@ -1381,7 +1362,7 @@ void rtl92c_dm_dynamic_txpower(struct ieee80211_hw *hw)
         if ((mac->link_state < MAC80211_LINKED) &&
             (rtlpriv->dm.entry_min_undecoratedsmoothed_pwdb == 0)) {
                 RT_TRACE(rtlpriv, COMP_POWER, DBG_TRACE,
-                         ("Not connected to any\n"));
+                         "Not connected to any\n");
 
                 rtlpriv->dm.dynamic_txhighpower_lvl = TXHIGHPWRLEVEL_NORMAL;
 
@@ -1394,28 +1375,28 @@ void rtl92c_dm_dynamic_txpower(struct ieee80211_hw *hw)
                         undecorated_smoothed_pwdb =
                             rtlpriv->dm.entry_min_undecoratedsmoothed_pwdb;
                         RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
-                                 ("AP Client PWDB = 0x%lx\n",
-                                  undecorated_smoothed_pwdb));
+                                 "AP Client PWDB = 0x%lx\n",
+                                 undecorated_smoothed_pwdb);
                 } else {
                         undecorated_smoothed_pwdb =
                             rtlpriv->dm.undecorated_smoothed_pwdb;
                         RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
-                                 ("STA Default Port PWDB = 0x%lx\n",
-                                  undecorated_smoothed_pwdb));
+                                 "STA Default Port PWDB = 0x%lx\n",
+                                 undecorated_smoothed_pwdb);
                 }
         } else {
                 undecorated_smoothed_pwdb =
                     rtlpriv->dm.entry_min_undecoratedsmoothed_pwdb;
 
                 RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
-                         ("AP Ext Port PWDB = 0x%lx\n",
-                          undecorated_smoothed_pwdb));
+                         "AP Ext Port PWDB = 0x%lx\n",
+                         undecorated_smoothed_pwdb);
         }
 
         if (undecorated_smoothed_pwdb >= TX_POWER_NEAR_FIELD_THRESH_LVL2) {
                 rtlpriv->dm.dynamic_txhighpower_lvl = TXHIGHPWRLEVEL_LEVEL1;
                 RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
-                         ("TXHIGHPWRLEVEL_LEVEL1 (TxPwr=0x0)\n"));
+                         "TXHIGHPWRLEVEL_LEVEL1 (TxPwr=0x0)\n");
         } else if ((undecorated_smoothed_pwdb <
                     (TX_POWER_NEAR_FIELD_THRESH_LVL2 - 3)) &&
                    (undecorated_smoothed_pwdb >=
@@ -1423,18 +1404,18 @@ void rtl92c_dm_dynamic_txpower(struct ieee80211_hw *hw)
 
                 rtlpriv->dm.dynamic_txhighpower_lvl = TXHIGHPWRLEVEL_LEVEL1;
                 RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
-                         ("TXHIGHPWRLEVEL_LEVEL1 (TxPwr=0x10)\n"));
+                         "TXHIGHPWRLEVEL_LEVEL1 (TxPwr=0x10)\n");
         } else if (undecorated_smoothed_pwdb <
                    (TX_POWER_NEAR_FIELD_THRESH_LVL1 - 5)) {
                 rtlpriv->dm.dynamic_txhighpower_lvl = TXHIGHPWRLEVEL_NORMAL;
                 RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
-                         ("TXHIGHPWRLEVEL_NORMAL\n"));
+                         "TXHIGHPWRLEVEL_NORMAL\n");
         }
 
         if ((rtlpriv->dm.dynamic_txhighpower_lvl != rtlpriv->dm.last_dtp_lvl)) {
                 RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
-                         ("PHY_SetTxPowerLevel8192S() Channel = %d\n",
-                          rtlphy->current_channel));
+                         "PHY_SetTxPowerLevel8192S() Channel = %d\n",
+                         rtlphy->current_channel);
                 rtl92c_phy_set_txpower_level(hw, rtlphy->current_channel);
         }
 
diff --git a/drivers/net/wireless/rtlwifi/rtl8192c/dm_common.h b/drivers/net/wireless/rtlwifi/rtl8192c/dm_common.h
index b9736d3e9a39..2178e3761883 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192c/dm_common.h
+++ b/drivers/net/wireless/rtlwifi/rtl8192c/dm_common.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2009-2010  Realtek Corporation.
+ * Copyright(c) 2009-2012  Realtek Corporation.
  *
  * 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
diff --git a/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c b/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c
index 931d97979b04..c20b3c30f62e 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2009-2010  Realtek Corporation.
+ * Copyright(c) 2009-2012  Realtek Corporation.
  *
  * 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
@@ -27,16 +27,13 @@
  *
  *****************************************************************************/
 
-#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-
-#include <linux/firmware.h>
-#include <linux/export.h>
 #include "../wifi.h"
 #include "../pci.h"
 #include "../base.h"
 #include "../rtl8192ce/reg.h"
 #include "../rtl8192ce/def.h"
 #include "fw_common.h"
+#include <linux/export.h>
 
 static void _rtl92c_enable_fw_download(struct ieee80211_hw *hw, bool enable)
 {
@@ -172,7 +169,7 @@ static void _rtl92c_write_fw(struct ieee80211_hw *hw,
         struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
         u8 *bufferPtr = (u8 *) buffer;
 
-        RT_TRACE(rtlpriv, COMP_FW, DBG_TRACE, ("FW size is %d bytes,\n", size));
+        RT_TRACE(rtlpriv, COMP_FW, DBG_TRACE, "FW size is %d bytes\n", size);
 
         if (IS_CHIP_VER_B(version)) {
                 u32 pageNums, remainSize;
@@ -186,7 +183,7 @@ static void _rtl92c_write_fw(struct ieee80211_hw *hw,
 
                 if (pageNums > 4) {
                         RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                                 ("Page numbers should not greater then 4\n"));
+                                 "Page numbers should not greater then 4\n");
                 }
 
                 for (page = 0; page < pageNums; page++) {
@@ -219,13 +216,12 @@ static int _rtl92c_fw_free_to_go(struct ieee80211_hw *hw)
 
         if (counter >= FW_8192C_POLLING_TIMEOUT_COUNT) {
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("chksum report faill ! REG_MCUFWDL:0x%08x .\n",
-                          value32));
+                         "chksum report faill ! REG_MCUFWDL:0x%08x\n", value32);
                 return -EIO;
         }
 
         RT_TRACE(rtlpriv, COMP_FW, DBG_TRACE,
-                 ("Checksum report OK ! REG_MCUFWDL:0x%08x .\n", value32));
+                 "Checksum report OK ! REG_MCUFWDL:0x%08x\n", value32);
 
         value32 = rtl_read_dword(rtlpriv, REG_MCUFWDL);
         value32 |= MCUFWDL_RDY;
@@ -238,9 +234,8 @@ static int _rtl92c_fw_free_to_go(struct ieee80211_hw *hw)
                 value32 = rtl_read_dword(rtlpriv, REG_MCUFWDL);
                 if (value32 & WINTINI_RDY) {
                         RT_TRACE(rtlpriv, COMP_FW, DBG_TRACE,
-                                 ("Polling FW ready success!!"
-                                 " REG_MCUFWDL:0x%08x .\n",
-                                 value32));
+                                 "Polling FW ready success!! REG_MCUFWDL:0x%08x\n",
+                                 value32);
                         return 0;
                 }
 
@@ -249,7 +244,7 @@ static int _rtl92c_fw_free_to_go(struct ieee80211_hw *hw)
         } while (counter++ < FW_8192C_POLLING_TIMEOUT_COUNT);
 
         RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                 ("Polling FW ready fail!! REG_MCUFWDL:0x%08x .\n", value32));
+                 "Polling FW ready fail!! REG_MCUFWDL:0x%08x\n", value32);
         return -EIO;
 }
 
@@ -262,20 +257,19 @@ int rtl92c_download_fw(struct ieee80211_hw *hw)
         u32 fwsize;
         enum version_8192c version = rtlhal->version;
 
-        if (!rtlhal->pfirmware)
+        if (rtlpriv->max_fw_size == 0 || !rtlhal->pfirmware)
                 return 1;
 
-        pr_info("Loading firmware file %s\n", rtlpriv->cfg->fw_name);
         pfwheader = (struct rtl92c_firmware_header *)rtlhal->pfirmware;
         pfwdata = (u8 *) rtlhal->pfirmware;
         fwsize = rtlhal->fwsize;
 
         if (IS_FW_HEADER_EXIST(pfwheader)) {
                 RT_TRACE(rtlpriv, COMP_FW, DBG_DMESG,
-                         ("Firmware Version(%d), Signature(%#x),Size(%d)\n",
+                         "Firmware Version(%d), Signature(%#x),Size(%d)\n",
                          le16_to_cpu(pfwheader->version),
                          le16_to_cpu(pfwheader->signature),
-                         (uint)sizeof(struct rtl92c_firmware_header)));
+                         (uint)sizeof(struct rtl92c_firmware_header));
 
                 pfwdata = pfwdata + sizeof(struct rtl92c_firmware_header);
                 fwsize = fwsize - sizeof(struct rtl92c_firmware_header);
@@ -287,10 +281,10 @@ int rtl92c_download_fw(struct ieee80211_hw *hw)
 
         if (_rtl92c_fw_free_to_go(hw)) {
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("Firmware is not ready to run!\n"));
+                         "Firmware is not ready to run!\n");
         } else {
                 RT_TRACE(rtlpriv, COMP_FW, DBG_TRACE,
-                         ("Firmware is ready to run!\n"));
+                         "Firmware is ready to run!\n");
         }
 
         return 0;
@@ -328,22 +322,22 @@ static void _rtl92c_fill_h2c_command(struct ieee80211_hw *hw,
         unsigned long flag;
         u8 idx;
 
-        RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD, ("come in\n"));
+        RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD, "come in\n");
 
         while (true) {
                 spin_lock_irqsave(&rtlpriv->locks.h2c_lock, flag);
                 if (rtlhal->h2c_setinprogress) {
                         RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD,
-                                 ("H2C set in progress! Wait to set.."
-                                  "element_id(%d).\n", element_id));
+                                 "H2C set in progress! Wait to set..element_id(%d)\n",
+                                 element_id);
 
                         while (rtlhal->h2c_setinprogress) {
                                 spin_unlock_irqrestore(&rtlpriv->locks.h2c_lock,
                                                        flag);
                                 h2c_waitcounter++;
                                 RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD,
-                                         ("Wait 100 us (%d times)...\n",
-                                          h2c_waitcounter));
+                                         "Wait 100 us (%d times)...\n",
+                                         h2c_waitcounter);
                                 udelay(100);
 
                                 if (h2c_waitcounter > 1000)
@@ -363,8 +357,7 @@ static void _rtl92c_fill_h2c_command(struct ieee80211_hw *hw,
                 wait_writeh2c_limmit--;
                 if (wait_writeh2c_limmit == 0) {
                         RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                                 ("Write H2C fail because no trigger "
-                                  "for FW INT!\n"));
+                                 "Write H2C fail because no trigger for FW INT!\n");
                         break;
                 }
 
@@ -388,7 +381,7 @@ static void _rtl92c_fill_h2c_command(struct ieee80211_hw *hw,
                         break;
                 default:
                         RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                                 ("switch case not process\n"));
+                                 "switch case not processed\n");
                         break;
                 }
 
@@ -398,8 +391,8 @@ static void _rtl92c_fill_h2c_command(struct ieee80211_hw *hw,
                         wait_h2c_limmit--;
                         if (wait_h2c_limmit == 0) {
                                 RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD,
-                                         ("Wating too long for FW read "
-                                          "clear HMEBox(%d)!\n", boxnum));
+                                         "Waiting too long for FW read clear HMEBox(%d)!\n",
+                                         boxnum);
                                 break;
                         }
 
@@ -408,14 +401,14 @@ static void _rtl92c_fill_h2c_command(struct ieee80211_hw *hw,
                         isfw_read = _rtl92c_check_fw_read_last_h2c(hw, boxnum);
                         u1b_tmp = rtl_read_byte(rtlpriv, 0x1BF);
                         RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD,
-                                 ("Wating for FW read clear HMEBox(%d)!!! "
-                                  "0x1BF = %2x\n", boxnum, u1b_tmp));
+                                 "Waiting for FW read clear HMEBox(%d)!!! 0x1BF = %2x\n",
+                                 boxnum, u1b_tmp);
                 }
 
                 if (!isfw_read) {
                         RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD,
-                                 ("Write H2C register BOX[%d] fail!!!!! "
-                                  "Fw do not read.\n", boxnum));
+                                 "Write H2C register BOX[%d] fail!!!!! Fw do not read\n",
+                                 boxnum);
                         break;
                 }
 
@@ -423,8 +416,8 @@ static void _rtl92c_fill_h2c_command(struct ieee80211_hw *hw,
                 memset(boxextcontent, 0, sizeof(boxextcontent));
                 boxcontent[0] = element_id;
                 RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD,
-                         ("Write element_id box_reg(%4x) = %2x\n",
-                          box_reg, element_id));
+                         "Write element_id box_reg(%4x) = %2x\n",
+                         box_reg, element_id);
 
                 switch (cmd_len) {
                 case 1:
@@ -493,7 +486,7 @@ static void _rtl92c_fill_h2c_command(struct ieee80211_hw *hw,
                         break;
                 default:
                         RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                                 ("switch case not process\n"));
+                                 "switch case not processed\n");
                         break;
                 }
 
@@ -504,29 +497,22 @@ static void _rtl92c_fill_h2c_command(struct ieee80211_hw *hw,
                         rtlhal->last_hmeboxnum = 0;
 
                 RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD,
-                         ("pHalData->last_hmeboxnum  = %d\n",
-                          rtlhal->last_hmeboxnum));
+                         "pHalData->last_hmeboxnum  = %d\n",
+                         rtlhal->last_hmeboxnum);
         }
 
         spin_lock_irqsave(&rtlpriv->locks.h2c_lock, flag);
         rtlhal->h2c_setinprogress = false;
         spin_unlock_irqrestore(&rtlpriv->locks.h2c_lock, flag);
 
-        RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD, ("go out\n"));
+        RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD, "go out\n");
 }
 
 void rtl92c_fill_h2c_cmd(struct ieee80211_hw *hw,
                          u8 element_id, u32 cmd_len, u8 *p_cmdbuffer)
 {
-        struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
         u32 tmp_cmdbuf[2];
 
-        if (rtlhal->fw_ready == false) {
-                RT_ASSERT(false, ("return H2C cmd because of Fw "
-                                  "download fail!!!\n"));
-                return;
-        }
-
         memset(tmp_cmdbuf, 0, 8);
         memcpy(tmp_cmdbuf, p_cmdbuffer, cmd_len);
         _rtl92c_fill_h2c_command(hw, element_id, cmd_len, (u8 *)&tmp_cmdbuf);
@@ -547,7 +533,7 @@ void rtl92c_firmware_selfreset(struct ieee80211_hw *hw)
         while (u1b_tmp & BIT(2)) {
                 delay--;
                 if (delay == 0) {
-                        RT_ASSERT(false, ("8051 reset fail.\n"));
+                        RT_ASSERT(false, "8051 reset fail\n");
                         break;
                 }
                 udelay(50);
@@ -562,7 +548,7 @@ void rtl92c_set_fw_pwrmode_cmd(struct ieee80211_hw *hw, u8 mode)
         u8 u1_h2c_set_pwrmode[3] = {0};
         struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw));
 
-        RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD, ("FW LPS mode = %d\n", mode));
+        RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD, "FW LPS mode = %d\n", mode);
 
         SET_H2CCMD_PWRMODE_PARM_MODE(u1_h2c_set_pwrmode, mode);
         SET_H2CCMD_PWRMODE_PARM_SMART_PS(u1_h2c_set_pwrmode, 1);
@@ -570,7 +556,7 @@ void rtl92c_set_fw_pwrmode_cmd(struct ieee80211_hw *hw, u8 mode)
                                               ppsc->reg_max_lps_awakeintvl);
 
         RT_PRINT_DATA(rtlpriv, COMP_CMD, DBG_DMESG,
-                      "rtl92c_set_fw_rsvdpagepkt(): u1_h2c_set_pwrmode\n",
+                      "rtl92c_set_fw_rsvdpagepkt(): u1_h2c_set_pwrmode",
                       u1_h2c_set_pwrmode, 3);
         rtl92c_fill_h2c_cmd(hw, H2C_SETPWRMODE, 3, u1_h2c_set_pwrmode);
 
@@ -780,14 +766,16 @@ void rtl92c_set_fw_rsvdpagepkt(struct ieee80211_hw *hw, bool dl_finished)
         totalpacketlen = TOTAL_RESERVED_PKT_LEN;
 
         RT_PRINT_DATA(rtlpriv, COMP_CMD, DBG_LOUD,
-                      "rtl92c_set_fw_rsvdpagepkt(): HW_VAR_SET_TX_CMD: ALL\n",
+                      "rtl92c_set_fw_rsvdpagepkt(): HW_VAR_SET_TX_CMD: ALL",
                       &reserved_page_packet[0], totalpacketlen);
         RT_PRINT_DATA(rtlpriv, COMP_CMD, DBG_DMESG,
-                      "rtl92c_set_fw_rsvdpagepkt(): HW_VAR_SET_TX_CMD: ALL\n",
+                      "rtl92c_set_fw_rsvdpagepkt(): HW_VAR_SET_TX_CMD: ALL",
                       u1RsvdPageLoc, 3);
 
 
         skb = dev_alloc_skb(totalpacketlen);
+        if (!skb)
+                return;
         memcpy((u8 *) skb_put(skb, totalpacketlen),
                &reserved_page_packet, totalpacketlen);
 
@@ -798,15 +786,14 @@ void rtl92c_set_fw_rsvdpagepkt(struct ieee80211_hw *hw, bool dl_finished)
 
         if (dlok) {
                 RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
-                         ("Set RSVD page location to Fw.\n"));
+                         "Set RSVD page location to Fw\n");
                 RT_PRINT_DATA(rtlpriv, COMP_CMD, DBG_DMESG,
-                                "H2C_RSVDPAGE:\n",
-                                u1RsvdPageLoc, 3);
+                              "H2C_RSVDPAGE", u1RsvdPageLoc, 3);
                 rtl92c_fill_h2c_cmd(hw, H2C_RSVDPAGE,
                                     sizeof(u1RsvdPageLoc), u1RsvdPageLoc);
         } else
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
-                         ("Set RSVD page location to Fw FAIL!!!!!!.\n"));
+                         "Set RSVD page location to Fw FAIL!!!!!!\n");
 }
 EXPORT_SYMBOL(rtl92c_set_fw_rsvdpagepkt);
 
diff --git a/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.h b/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.h
index cec5a3a1cc53..780ea5b1e24c 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.h
+++ b/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2009-2010  Realtek Corporation.
+ * Copyright(c) 2009-2012  Realtek Corporation.
  *
  * 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
diff --git a/drivers/net/wireless/rtlwifi/rtl8192c/main.c b/drivers/net/wireless/rtlwifi/rtl8192c/main.c
index 605ff191aeb7..918b1d129e77 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192c/main.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192c/main.c
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2009-2010  Realtek Corporation.
+ * Copyright(c) 2009-2012  Realtek Corporation.
  *
  * 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
@@ -27,8 +27,8 @@
  *
  *****************************************************************************/
 
-#include <linux/module.h>
 #include "../wifi.h"
+#include <linux/module.h>
 
 
 MODULE_AUTHOR("lizhaoming       <chaoming_li@realsil.com.cn>");
diff --git a/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c b/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c
index 1f07558debf2..22e998dd2f32 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2009-2010  Realtek Corporation.
+ * Copyright(c) 2009-2012  Realtek Corporation.
  *
  * 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
@@ -42,16 +42,15 @@ u32 rtl92c_phy_query_bb_reg(struct ieee80211_hw *hw, u32 regaddr, u32 bitmask)
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         u32 returnvalue, originalvalue, bitshift;
 
-        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE, ("regaddr(%#x), "
-                                               "bitmask(%#x)\n", regaddr,
-                                               bitmask));
+        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE, "regaddr(%#x), bitmask(%#x)\n",
+                 regaddr, bitmask);
         originalvalue = rtl_read_dword(rtlpriv, regaddr);
         bitshift = _rtl92c_phy_calculate_bit_shift(bitmask);
         returnvalue = (originalvalue & bitmask) >> bitshift;
 
-        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE, ("BBR MASK=0x%x "
-                                               "Addr[0x%x]=0x%x\n", bitmask,
-                                               regaddr, originalvalue));
+        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
+                 "BBR MASK=0x%x Addr[0x%x]=0x%x\n",
+                 bitmask, regaddr, originalvalue);
 
         return returnvalue;
 
@@ -64,9 +63,9 @@ void rtl92c_phy_set_bb_reg(struct ieee80211_hw *hw,
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         u32 originalvalue, bitshift;
 
-        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE, ("regaddr(%#x), bitmask(%#x),"
-                                               " data(%#x)\n", regaddr, bitmask,
-                                               data));
+        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
+                 "regaddr(%#x), bitmask(%#x), data(%#x)\n",
+                 regaddr, bitmask, data);
 
         if (bitmask != MASKDWORD) {
                 originalvalue = rtl_read_dword(rtlpriv, regaddr);
@@ -76,9 +75,9 @@ void rtl92c_phy_set_bb_reg(struct ieee80211_hw *hw,
 
         rtl_write_dword(rtlpriv, regaddr, data);
 
-        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE, ("regaddr(%#x), bitmask(%#x),"
-                                               " data(%#x)\n", regaddr, bitmask,
-                                               data));
+        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
+                 "regaddr(%#x), bitmask(%#x), data(%#x)\n",
+                 regaddr, bitmask, data);
 
 }
 EXPORT_SYMBOL(rtl92c_phy_set_bb_reg);
@@ -86,7 +85,7 @@ EXPORT_SYMBOL(rtl92c_phy_set_bb_reg);
 u32 _rtl92c_phy_fw_rf_serial_read(struct ieee80211_hw *hw,
                                   enum radio_path rfpath, u32 offset)
 {
-        RT_ASSERT(false, ("deprecated!\n"));
+        RT_ASSERT(false, "deprecated!\n");
         return 0;
 
 }
@@ -96,7 +95,7 @@ void _rtl92c_phy_fw_rf_serial_write(struct ieee80211_hw *hw,
                                     enum radio_path rfpath, u32 offset,
                                     u32 data)
 {
-        RT_ASSERT(false, ("deprecated!\n"));
+        RT_ASSERT(false, "deprecated!\n");
 }
 EXPORT_SYMBOL(_rtl92c_phy_fw_rf_serial_write);
 
@@ -114,7 +113,7 @@ u32 _rtl92c_phy_rf_serial_read(struct ieee80211_hw *hw,
         offset &= 0x3f;
         newoffset = offset;
         if (RT_CANNOT_IO(hw)) {
-                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, ("return all one\n"));
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "return all one\n");
                 return 0xFFFFFFFF;
         }
         tmplong = rtl_get_bbreg(hw, RFPGA0_XA_HSSIPARAMETER2, MASKDWORD);
@@ -144,9 +143,8 @@ u32 _rtl92c_phy_rf_serial_read(struct ieee80211_hw *hw,
         else
                 retvalue = rtl_get_bbreg(hw, pphyreg->rflssi_readback,
                                          BLSSIREADBACKDATA);
-        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE, ("RFR-%d Addr[0x%x]=0x%x\n",
-                                               rfpath, pphyreg->rflssi_readback,
-                                               retvalue));
+        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE, "RFR-%d Addr[0x%x]=0x%x\n",
+                 rfpath, pphyreg->rflssi_readback, retvalue);
         return retvalue;
 }
 EXPORT_SYMBOL(_rtl92c_phy_rf_serial_read);
@@ -162,16 +160,15 @@ void _rtl92c_phy_rf_serial_write(struct ieee80211_hw *hw,
         struct bb_reg_def *pphyreg = &rtlphy->phyreg_def[rfpath];
 
         if (RT_CANNOT_IO(hw)) {
-                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, ("stop\n"));
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "stop\n");
                 return;
         }
         offset &= 0x3f;
         newoffset = offset;
         data_and_addr = ((newoffset << 20) | (data & 0x000fffff)) & 0x0fffffff;
         rtl_set_bbreg(hw, pphyreg->rf3wire_offset, MASKDWORD, data_and_addr);
-        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE, ("RFW-%d Addr[0x%x]=0x%x\n",
-                                               rfpath, pphyreg->rf3wire_offset,
-                                               data_and_addr));
+        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE, "RFW-%d Addr[0x%x]=0x%x\n",
+                 rfpath, pphyreg->rf3wire_offset, data_and_addr);
 }
 EXPORT_SYMBOL(_rtl92c_phy_rf_serial_write);
 
@@ -216,16 +213,16 @@ bool _rtl92c_phy_bb8192c_config_parafile(struct ieee80211_hw *hw)
         struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw));
         bool rtstatus;
 
-        RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, ("==>\n"));
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, "==>\n");
         rtstatus = rtlpriv->cfg->ops->config_bb_with_headerfile(hw,
                                                  BASEBAND_CONFIG_PHY_REG);
         if (rtstatus != true) {
-                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, ("Write BB Reg Fail!!"));
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "Write BB Reg Fail!!\n");
                 return false;
         }
         if (rtlphy->rf_type == RF_1T2R) {
                 _rtl92c_phy_bb_config_1t(hw);
-                RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, ("Config to 1T!!\n"));
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, "Config to 1T!!\n");
         }
         if (rtlefuse->autoload_failflag == false) {
                 rtlphy->pwrgroup_cnt = 0;
@@ -233,13 +230,13 @@ bool _rtl92c_phy_bb8192c_config_parafile(struct ieee80211_hw *hw)
                                                    BASEBAND_CONFIG_PHY_REG);
         }
         if (rtstatus != true) {
-                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, ("BB_PG Reg Fail!!"));
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "BB_PG Reg Fail!!\n");
                 return false;
         }
         rtstatus = rtlpriv->cfg->ops->config_bb_with_headerfile(hw,
                                                  BASEBAND_CONFIG_AGC_TAB);
         if (rtstatus != true) {
-                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, ("AGC Table Fail\n"));
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "AGC Table Fail\n");
                 return false;
         }
         rtlphy->cck_high_power = (bool) (rtl_get_bbreg(hw,
@@ -260,114 +257,114 @@ void _rtl92c_store_pwrIndex_diffrate_offset(struct ieee80211_hw *hw,
         if (regaddr == RTXAGC_A_RATE18_06) {
                 rtlphy->MCS_TXPWR[rtlphy->pwrgroup_cnt][0] = data;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                         ("MCSTxPowerLevelOriginalOffset[%d][0] = 0x%x\n",
-                          rtlphy->pwrgroup_cnt,
-                          rtlphy->MCS_TXPWR[rtlphy->pwrgroup_cnt][0]));
+                         "MCSTxPowerLevelOriginalOffset[%d][0] = 0x%x\n",
+                         rtlphy->pwrgroup_cnt,
+                         rtlphy->MCS_TXPWR[rtlphy->pwrgroup_cnt][0]);
         }
         if (regaddr == RTXAGC_A_RATE54_24) {
                 rtlphy->MCS_TXPWR[rtlphy->pwrgroup_cnt][1] = data;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                         ("MCSTxPowerLevelOriginalOffset[%d][1] = 0x%x\n",
-                          rtlphy->pwrgroup_cnt,
-                          rtlphy->MCS_TXPWR[rtlphy->pwrgroup_cnt][1]));
+                         "MCSTxPowerLevelOriginalOffset[%d][1] = 0x%x\n",
+                         rtlphy->pwrgroup_cnt,
+                         rtlphy->MCS_TXPWR[rtlphy->pwrgroup_cnt][1]);
         }
         if (regaddr == RTXAGC_A_CCK1_MCS32) {
                 rtlphy->MCS_TXPWR[rtlphy->pwrgroup_cnt][6] = data;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                         ("MCSTxPowerLevelOriginalOffset[%d][6] = 0x%x\n",
-                          rtlphy->pwrgroup_cnt,
-                          rtlphy->MCS_TXPWR[rtlphy->pwrgroup_cnt][6]));
+                         "MCSTxPowerLevelOriginalOffset[%d][6] = 0x%x\n",
+                         rtlphy->pwrgroup_cnt,
+                         rtlphy->MCS_TXPWR[rtlphy->pwrgroup_cnt][6]);
         }
         if (regaddr == RTXAGC_B_CCK11_A_CCK2_11 && bitmask == 0xffffff00) {
                 rtlphy->MCS_TXPWR[rtlphy->pwrgroup_cnt][7] = data;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                         ("MCSTxPowerLevelOriginalOffset[%d][7] = 0x%x\n",
-                          rtlphy->pwrgroup_cnt,
-                          rtlphy->MCS_TXPWR[rtlphy->pwrgroup_cnt][7]));
+                         "MCSTxPowerLevelOriginalOffset[%d][7] = 0x%x\n",
+                         rtlphy->pwrgroup_cnt,
+                         rtlphy->MCS_TXPWR[rtlphy->pwrgroup_cnt][7]);
         }
         if (regaddr == RTXAGC_A_MCS03_MCS00) {
                 rtlphy->MCS_TXPWR[rtlphy->pwrgroup_cnt][2] = data;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                         ("MCSTxPowerLevelOriginalOffset[%d][2] = 0x%x\n",
-                          rtlphy->pwrgroup_cnt,
-                          rtlphy->MCS_TXPWR[rtlphy->pwrgroup_cnt][2]));
+                         "MCSTxPowerLevelOriginalOffset[%d][2] = 0x%x\n",
+                         rtlphy->pwrgroup_cnt,
+                         rtlphy->MCS_TXPWR[rtlphy->pwrgroup_cnt][2]);
         }
         if (regaddr == RTXAGC_A_MCS07_MCS04) {
                 rtlphy->MCS_TXPWR[rtlphy->pwrgroup_cnt][3] = data;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                         ("MCSTxPowerLevelOriginalOffset[%d][3] = 0x%x\n",
-                          rtlphy->pwrgroup_cnt,
-                          rtlphy->MCS_TXPWR[rtlphy->pwrgroup_cnt][3]));
+                         "MCSTxPowerLevelOriginalOffset[%d][3] = 0x%x\n",
+                         rtlphy->pwrgroup_cnt,
+                         rtlphy->MCS_TXPWR[rtlphy->pwrgroup_cnt][3]);
         }
         if (regaddr == RTXAGC_A_MCS11_MCS08) {
                 rtlphy->MCS_TXPWR[rtlphy->pwrgroup_cnt][4] = data;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                         ("MCSTxPowerLevelOriginalOffset[%d][4] = 0x%x\n",
-                          rtlphy->pwrgroup_cnt,
-                          rtlphy->MCS_TXPWR[rtlphy->pwrgroup_cnt][4]));
+                         "MCSTxPowerLevelOriginalOffset[%d][4] = 0x%x\n",
+                         rtlphy->pwrgroup_cnt,
+                         rtlphy->MCS_TXPWR[rtlphy->pwrgroup_cnt][4]);
         }
         if (regaddr == RTXAGC_A_MCS15_MCS12) {
                 rtlphy->MCS_TXPWR[rtlphy->pwrgroup_cnt][5] = data;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                         ("MCSTxPowerLevelOriginalOffset[%d][5] = 0x%x\n",
-                          rtlphy->pwrgroup_cnt,
-                          rtlphy->MCS_TXPWR[rtlphy->pwrgroup_cnt][5]));
+                         "MCSTxPowerLevelOriginalOffset[%d][5] = 0x%x\n",
+                         rtlphy->pwrgroup_cnt,
+                         rtlphy->MCS_TXPWR[rtlphy->pwrgroup_cnt][5]);
         }
         if (regaddr == RTXAGC_B_RATE18_06) {
                 rtlphy->MCS_TXPWR[rtlphy->pwrgroup_cnt][8] = data;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                         ("MCSTxPowerLevelOriginalOffset[%d][8] = 0x%x\n",
-                          rtlphy->pwrgroup_cnt,
-                          rtlphy->MCS_TXPWR[rtlphy->pwrgroup_cnt][8]));
+                         "MCSTxPowerLevelOriginalOffset[%d][8] = 0x%x\n",
+                         rtlphy->pwrgroup_cnt,
+                         rtlphy->MCS_TXPWR[rtlphy->pwrgroup_cnt][8]);
         }
         if (regaddr == RTXAGC_B_RATE54_24) {
                 rtlphy->MCS_TXPWR[rtlphy->pwrgroup_cnt][9] = data;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                         ("MCSTxPowerLevelOriginalOffset[%d][9] = 0x%x\n",
-                          rtlphy->pwrgroup_cnt,
-                          rtlphy->MCS_TXPWR[rtlphy->pwrgroup_cnt][9]));
+                         "MCSTxPowerLevelOriginalOffset[%d][9] = 0x%x\n",
+                         rtlphy->pwrgroup_cnt,
+                         rtlphy->MCS_TXPWR[rtlphy->pwrgroup_cnt][9]);
         }
         if (regaddr == RTXAGC_B_CCK1_55_MCS32) {
                 rtlphy->MCS_TXPWR[rtlphy->pwrgroup_cnt][14] = data;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                         ("MCSTxPowerLevelOriginalOffset[%d][14] = 0x%x\n",
-                          rtlphy->pwrgroup_cnt,
-                          rtlphy->MCS_TXPWR[rtlphy->pwrgroup_cnt][14]));
+                         "MCSTxPowerLevelOriginalOffset[%d][14] = 0x%x\n",
+                         rtlphy->pwrgroup_cnt,
+                         rtlphy->MCS_TXPWR[rtlphy->pwrgroup_cnt][14]);
         }
         if (regaddr == RTXAGC_B_CCK11_A_CCK2_11 && bitmask == 0x000000ff) {
                 rtlphy->MCS_TXPWR[rtlphy->pwrgroup_cnt][15] = data;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                         ("MCSTxPowerLevelOriginalOffset[%d][15] = 0x%x\n",
-                          rtlphy->pwrgroup_cnt,
-                          rtlphy->MCS_TXPWR[rtlphy->pwrgroup_cnt][15]));
+                         "MCSTxPowerLevelOriginalOffset[%d][15] = 0x%x\n",
+                         rtlphy->pwrgroup_cnt,
+                         rtlphy->MCS_TXPWR[rtlphy->pwrgroup_cnt][15]);
         }
         if (regaddr == RTXAGC_B_MCS03_MCS00) {
                 rtlphy->MCS_TXPWR[rtlphy->pwrgroup_cnt][10] = data;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                         ("MCSTxPowerLevelOriginalOffset[%d][10] = 0x%x\n",
-                          rtlphy->pwrgroup_cnt,
-                          rtlphy->MCS_TXPWR[rtlphy->pwrgroup_cnt][10]));
+                         "MCSTxPowerLevelOriginalOffset[%d][10] = 0x%x\n",
+                         rtlphy->pwrgroup_cnt,
+                         rtlphy->MCS_TXPWR[rtlphy->pwrgroup_cnt][10]);
         }
         if (regaddr == RTXAGC_B_MCS07_MCS04) {
                 rtlphy->MCS_TXPWR[rtlphy->pwrgroup_cnt][11] = data;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                         ("MCSTxPowerLevelOriginalOffset[%d][11] = 0x%x\n",
-                          rtlphy->pwrgroup_cnt,
-                          rtlphy->MCS_TXPWR[rtlphy->pwrgroup_cnt][11]));
+                         "MCSTxPowerLevelOriginalOffset[%d][11] = 0x%x\n",
+                         rtlphy->pwrgroup_cnt,
+                         rtlphy->MCS_TXPWR[rtlphy->pwrgroup_cnt][11]);
         }
         if (regaddr == RTXAGC_B_MCS11_MCS08) {
                 rtlphy->MCS_TXPWR[rtlphy->pwrgroup_cnt][12] = data;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                         ("MCSTxPowerLevelOriginalOffset[%d][12] = 0x%x\n",
-                          rtlphy->pwrgroup_cnt,
-                          rtlphy->MCS_TXPWR[rtlphy->pwrgroup_cnt][12]));
+                         "MCSTxPowerLevelOriginalOffset[%d][12] = 0x%x\n",
+                         rtlphy->pwrgroup_cnt,
+                         rtlphy->MCS_TXPWR[rtlphy->pwrgroup_cnt][12]);
         }
         if (regaddr == RTXAGC_B_MCS15_MCS12) {
                 rtlphy->MCS_TXPWR[rtlphy->pwrgroup_cnt][13] = data;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                         ("MCSTxPowerLevelOriginalOffset[%d][13] = 0x%x\n",
-                          rtlphy->pwrgroup_cnt,
-                          rtlphy->MCS_TXPWR[rtlphy->pwrgroup_cnt][13]));
+                         "MCSTxPowerLevelOriginalOffset[%d][13] = 0x%x\n",
+                         rtlphy->pwrgroup_cnt,
+                         rtlphy->MCS_TXPWR[rtlphy->pwrgroup_cnt][13]);
 
                 rtlphy->pwrgroup_cnt++;
         }
@@ -389,12 +386,11 @@ void rtl92c_phy_get_hw_reg_originalvalue(struct ieee80211_hw *hw)
             (u8) rtl_get_bbreg(hw, ROFDM0_XDAGCCORE1, MASKBYTE0);
 
         RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                 ("Default initial gain (c50=0x%x, "
-                  "c58=0x%x, c60=0x%x, c68=0x%x\n",
-                  rtlphy->default_initialgain[0],
-                  rtlphy->default_initialgain[1],
-                  rtlphy->default_initialgain[2],
-                  rtlphy->default_initialgain[3]));
+                 "Default initial gain (c50=0x%x, c58=0x%x, c60=0x%x, c68=0x%x\n",
+                 rtlphy->default_initialgain[0],
+                 rtlphy->default_initialgain[1],
+                 rtlphy->default_initialgain[2],
+                 rtlphy->default_initialgain[3]);
 
         rtlphy->framesync = (u8) rtl_get_bbreg(hw,
                                                ROFDM0_RXDETECTOR3, MASKBYTE0);
@@ -402,8 +398,8 @@ void rtl92c_phy_get_hw_reg_originalvalue(struct ieee80211_hw *hw)
                                               ROFDM0_RXDETECTOR2, MASKDWORD);
 
         RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                 ("Default framesync (0x%x) = 0x%x\n",
-                  ROFDM0_RXDETECTOR3, rtlphy->framesync));
+                 "Default framesync (0x%x) = 0x%x\n",
+                 ROFDM0_RXDETECTOR3, rtlphy->framesync);
 }
 
 void _rtl92c_phy_init_bb_rf_register_definition(struct ieee80211_hw *hw)
@@ -615,8 +611,8 @@ bool rtl92c_phy_update_txpower_dbm(struct ieee80211_hw *hw, long power_indbm)
         else
                 ofdmtxpwridx = 0;
         RT_TRACE(rtlpriv, COMP_TXAGC, DBG_TRACE,
-                 ("%lx dBm, ccktxpwridx = %d, ofdmtxpwridx = %d\n",
-                  power_indbm, ccktxpwridx, ofdmtxpwridx));
+                 "%lx dBm, ccktxpwridx = %d, ofdmtxpwridx = %d\n",
+                 power_indbm, ccktxpwridx, ofdmtxpwridx);
         for (idx = 0; idx < 14; idx++) {
                 for (rf_path = 0; rf_path < 2; rf_path++) {
                         rtlefuse->txpwrlevel_cck[rf_path][idx] = ccktxpwridx;
@@ -710,7 +706,7 @@ void rtl92c_phy_scan_operation_backup(struct ieee80211_hw *hw, u8 operation)
                         break;
                 default:
                         RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                                 ("Unknown Scan Backup operation.\n"));
+                                 "Unknown Scan Backup operation\n");
                         break;
                 }
         }
@@ -732,7 +728,7 @@ void rtl92c_phy_set_bw_mode(struct ieee80211_hw *hw,
                 rtlpriv->cfg->ops->phy_set_bw_mode_callback(hw);
         } else {
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
-                         ("FALSE driver sleep or unload\n"));
+                         "FALSE driver sleep or unload\n");
                 rtlphy->set_bwmode_inprogress = false;
                 rtlphy->current_chan_bw = tmp_bw;
         }
@@ -747,7 +743,7 @@ void rtl92c_phy_sw_chnl_callback(struct ieee80211_hw *hw)
         u32 delay;
 
         RT_TRACE(rtlpriv, COMP_SCAN, DBG_TRACE,
-                 ("switch to channel%d\n", rtlphy->current_channel));
+                 "switch to channel%d\n", rtlphy->current_channel);
         if (is_hal_stop(rtlhal))
                 return;
         do {
@@ -765,7 +761,7 @@ void rtl92c_phy_sw_chnl_callback(struct ieee80211_hw *hw)
                 }
                 break;
         } while (true);
-        RT_TRACE(rtlpriv, COMP_SCAN, DBG_TRACE, ("<==\n"));
+        RT_TRACE(rtlpriv, COMP_SCAN, DBG_TRACE, "<==\n");
 }
 EXPORT_SYMBOL(rtl92c_phy_sw_chnl_callback);
 
@@ -780,19 +776,18 @@ u8 rtl92c_phy_sw_chnl(struct ieee80211_hw *hw)
         if (rtlphy->set_bwmode_inprogress)
                 return 0;
         RT_ASSERT((rtlphy->current_channel <= 14),
-                  ("WIRELESS_MODE_G but channel>14"));
+                  "WIRELESS_MODE_G but channel>14\n");
         rtlphy->sw_chnl_inprogress = true;
         rtlphy->sw_chnl_stage = 0;
         rtlphy->sw_chnl_step = 0;
         if (!(is_hal_stop(rtlhal)) && !(RT_CANNOT_IO(hw))) {
                 rtl92c_phy_sw_chnl_callback(hw);
                 RT_TRACE(rtlpriv, COMP_CHAN, DBG_LOUD,
-                         ("sw_chnl_inprogress false schdule workitem\n"));
+                         "sw_chnl_inprogress false schdule workitem\n");
                 rtlphy->sw_chnl_inprogress = false;
         } else {
                 RT_TRACE(rtlpriv, COMP_CHAN, DBG_LOUD,
-                         ("sw_chnl_inprogress false driver sleep or"
-                          " unload\n"));
+                         "sw_chnl_inprogress false driver sleep or unload\n");
                 rtlphy->sw_chnl_inprogress = false;
         }
         return 1;
@@ -807,7 +802,7 @@ static bool _rtl92c_phy_set_sw_chnl_cmdarray(struct swchnlcmd *cmdtable,
         struct swchnlcmd *pcmd;
 
         if (cmdtable == NULL) {
-                RT_ASSERT(false, ("cmdtable cannot be NULL.\n"));
+                RT_ASSERT(false, "cmdtable cannot be NULL\n");
                 return false;
         }
 
@@ -853,7 +848,7 @@ bool _rtl92c_phy_sw_chnl_step_by_step(struct ieee80211_hw *hw,
         rfdependcmdcnt = 0;
 
         RT_ASSERT((channel >= 1 && channel <= 14),
-                  ("illegal channel for Zebra: %d\n", channel));
+                  "invalid channel for Zebra: %d\n", channel);
 
         _rtl92c_phy_set_sw_chnl_cmdarray(rfdependcmd, rfdependcmdcnt++,
                                          MAX_RFDEPENDCMD_CNT, CMDID_RF_WRITEREG,
@@ -916,7 +911,7 @@ bool _rtl92c_phy_sw_chnl_step_by_step(struct ieee80211_hw *hw,
                         break;
                 default:
                         RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                                 ("switch case not process\n"));
+                                 "switch case not processed\n");
                         break;
                 }
 
@@ -1920,23 +1915,23 @@ bool rtl92c_phy_set_io_cmd(struct ieee80211_hw *hw, enum io_type iotype)
         bool postprocessing = false;
 
         RT_TRACE(rtlpriv, COMP_CMD, DBG_TRACE,
-                 ("-->IO Cmd(%#x), set_io_inprogress(%d)\n",
-                  iotype, rtlphy->set_io_inprogress));
+                 "-->IO Cmd(%#x), set_io_inprogress(%d)\n",
+                 iotype, rtlphy->set_io_inprogress);
         do {
                 switch (iotype) {
                 case IO_CMD_RESUME_DM_BY_SCAN:
                         RT_TRACE(rtlpriv, COMP_CMD, DBG_TRACE,
-                                 ("[IO CMD] Resume DM after scan.\n"));
+                                 "[IO CMD] Resume DM after scan\n");
                         postprocessing = true;
                         break;
                 case IO_CMD_PAUSE_DM_BY_SCAN:
                         RT_TRACE(rtlpriv, COMP_CMD, DBG_TRACE,
-                                 ("[IO CMD] Pause DM before scan.\n"));
+                                 "[IO CMD] Pause DM before scan\n");
                         postprocessing = true;
                         break;
                 default:
                         RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                                 ("switch case not process\n"));
+                                 "switch case not processed\n");
                         break;
                 }
         } while (false);
@@ -1947,7 +1942,7 @@ bool rtl92c_phy_set_io_cmd(struct ieee80211_hw *hw, enum io_type iotype)
                 return false;
         }
         rtl92c_phy_set_io(hw);
-        RT_TRACE(rtlpriv, COMP_CMD, DBG_TRACE, ("<--IO Type(%#x)\n", iotype));
+        RT_TRACE(rtlpriv, COMP_CMD, DBG_TRACE, "<--IO Type(%#x)\n", iotype);
         return true;
 }
 EXPORT_SYMBOL(rtl92c_phy_set_io_cmd);
@@ -1958,8 +1953,8 @@ void rtl92c_phy_set_io(struct ieee80211_hw *hw)
         struct rtl_phy *rtlphy = &(rtlpriv->phy);
 
         RT_TRACE(rtlpriv, COMP_CMD, DBG_TRACE,
-                 ("--->Cmd(%#x), set_io_inprogress(%d)\n",
-                  rtlphy->current_io_type, rtlphy->set_io_inprogress));
+                 "--->Cmd(%#x), set_io_inprogress(%d)\n",
+                 rtlphy->current_io_type, rtlphy->set_io_inprogress);
         switch (rtlphy->current_io_type) {
         case IO_CMD_RESUME_DM_BY_SCAN:
                 dm_digtable.cur_igvalue = rtlphy->initgain_backup.xaagccore1;
@@ -1973,12 +1968,12 @@ void rtl92c_phy_set_io(struct ieee80211_hw *hw)
                 break;
         default:
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("switch case not process\n"));
+                         "switch case not processed\n");
                 break;
         }
         rtlphy->set_io_inprogress = false;
-        RT_TRACE(rtlpriv, COMP_CMD, DBG_TRACE,
-                 ("<---(%#x)\n", rtlphy->current_io_type));
+        RT_TRACE(rtlpriv, COMP_CMD, DBG_TRACE, "<---(%#x)\n",
+                 rtlphy->current_io_type);
 }
 EXPORT_SYMBOL(rtl92c_phy_set_io);
 
@@ -2018,7 +2013,7 @@ void _rtl92c_phy_set_rf_sleep(struct ieee80211_hw *hw)
                 rtl_write_byte(rtlpriv, REG_SYS_FUNC_EN, 0xE3);
                 rtl_write_byte(rtlpriv, REG_TXPAUSE, 0x00);
                 RT_TRACE(rtlpriv, COMP_POWER, DBG_TRACE,
-                         ("Switch RF timeout !!!.\n"));
+                         "Switch RF timeout !!!\n");
                 return;
         }
         rtl_write_byte(rtlpriv, REG_SYS_FUNC_EN, 0xE2);
diff --git a/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.h b/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.h
index 9a264c0d6127..cec10d696492 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.h
+++ b/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2009-2010  Realtek Corporation.
+ * Copyright(c) 2009-2012  Realtek Corporation.
  *
  * 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
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/def.h b/drivers/net/wireless/rtlwifi/rtl8192ce/def.h
index 9fc804d89d65..04c3aef8a4f6 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192ce/def.h
+++ b/drivers/net/wireless/rtlwifi/rtl8192ce/def.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2009-2010  Realtek Corporation.
+ * Copyright(c) 2009-2012  Realtek Corporation.
  *
  * 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
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/dm.c b/drivers/net/wireless/rtlwifi/rtl8192ce/dm.c
index 2df33e53e15a..27b3af880d96 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192ce/dm.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192ce/dm.c
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2009-2010  Realtek Corporation.
+ * Copyright(c) 2009-2012  Realtek Corporation.
  *
  * 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
@@ -54,7 +54,7 @@ void rtl92ce_dm_dynamic_txpower(struct ieee80211_hw *hw)
         if ((mac->link_state < MAC80211_LINKED) &&
             (rtlpriv->dm.entry_min_undecoratedsmoothed_pwdb == 0)) {
                 RT_TRACE(rtlpriv, COMP_POWER, DBG_TRACE,
-                         ("Not connected to any\n"));
+                         "Not connected to any\n");
 
                 rtlpriv->dm.dynamic_txhighpower_lvl = TXHIGHPWRLEVEL_NORMAL;
 
@@ -67,28 +67,28 @@ void rtl92ce_dm_dynamic_txpower(struct ieee80211_hw *hw)
                         undecorated_smoothed_pwdb =
                             rtlpriv->dm.entry_min_undecoratedsmoothed_pwdb;
                         RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
-                                 ("AP Client PWDB = 0x%lx\n",
-                                  undecorated_smoothed_pwdb));
+                                 "AP Client PWDB = 0x%lx\n",
+                                 undecorated_smoothed_pwdb);
                 } else {
                         undecorated_smoothed_pwdb =
                             rtlpriv->dm.undecorated_smoothed_pwdb;
                         RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
-                                 ("STA Default Port PWDB = 0x%lx\n",
-                                  undecorated_smoothed_pwdb));
+                                 "STA Default Port PWDB = 0x%lx\n",
+                                 undecorated_smoothed_pwdb);
                 }
         } else {
                 undecorated_smoothed_pwdb =
                     rtlpriv->dm.entry_min_undecoratedsmoothed_pwdb;
 
                 RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
-                         ("AP Ext Port PWDB = 0x%lx\n",
-                          undecorated_smoothed_pwdb));
+                         "AP Ext Port PWDB = 0x%lx\n",
+                         undecorated_smoothed_pwdb);
         }
 
         if (undecorated_smoothed_pwdb >= TX_POWER_NEAR_FIELD_THRESH_LVL2) {
                 rtlpriv->dm.dynamic_txhighpower_lvl = TXHIGHPWRLEVEL_LEVEL1;
                 RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
-                         ("TXHIGHPWRLEVEL_LEVEL1 (TxPwr=0x0)\n"));
+                         "TXHIGHPWRLEVEL_LEVEL1 (TxPwr=0x0)\n");
         } else if ((undecorated_smoothed_pwdb <
                     (TX_POWER_NEAR_FIELD_THRESH_LVL2 - 3)) &&
                    (undecorated_smoothed_pwdb >=
@@ -96,18 +96,18 @@ void rtl92ce_dm_dynamic_txpower(struct ieee80211_hw *hw)
 
                 rtlpriv->dm.dynamic_txhighpower_lvl = TXHIGHPWRLEVEL_LEVEL1;
                 RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
-                         ("TXHIGHPWRLEVEL_LEVEL1 (TxPwr=0x10)\n"));
+                         "TXHIGHPWRLEVEL_LEVEL1 (TxPwr=0x10)\n");
         } else if (undecorated_smoothed_pwdb <
                    (TX_POWER_NEAR_FIELD_THRESH_LVL1 - 5)) {
                 rtlpriv->dm.dynamic_txhighpower_lvl = TXHIGHPWRLEVEL_NORMAL;
                 RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
-                         ("TXHIGHPWRLEVEL_NORMAL\n"));
+                         "TXHIGHPWRLEVEL_NORMAL\n");
         }
 
         if ((rtlpriv->dm.dynamic_txhighpower_lvl != rtlpriv->dm.last_dtp_lvl)) {
                 RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
-                         ("PHY_SetTxPowerLevel8192S() Channel = %d\n",
-                          rtlphy->current_channel));
+                         "PHY_SetTxPowerLevel8192S() Channel = %d\n",
+                         rtlphy->current_channel);
                 rtl92c_phy_set_txpower_level(hw, rtlphy->current_channel);
         }
 
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/dm.h b/drivers/net/wireless/rtlwifi/rtl8192ce/dm.h
index 07dd9552e82f..26747fa86005 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192ce/dm.h
+++ b/drivers/net/wireless/rtlwifi/rtl8192ce/dm.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2009-2010  Realtek Corporation.
+ * Copyright(c) 2009-2012  Realtek Corporation.
  *
  * 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
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/hw.c b/drivers/net/wireless/rtlwifi/rtl8192ce/hw.c
index a3deaefa788c..48c7b5d3fc5b 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192ce/hw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192ce/hw.c
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2009-2010  Realtek Corporation.
+ * Copyright(c) 2009-2012  Realtek Corporation.
  *
  * 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
@@ -141,7 +141,7 @@ void rtl92ce_get_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                 }
         default:
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("switch case not process\n"));
+                         "switch case not processed\n");
                 break;
         }
 }
@@ -207,7 +207,7 @@ void rtl92ce_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                         u8 e_aci;
 
                         RT_TRACE(rtlpriv, COMP_MLME, DBG_LOUD,
-                                 ("HW_VAR_SLOT_TIME %x\n", val[0]));
+                                 "HW_VAR_SLOT_TIME %x\n", val[0]);
 
                         rtl_write_byte(rtlpriv, REG_SLOT, val[0]);
 
@@ -246,8 +246,8 @@ void rtl92ce_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                                 *val = min_spacing_to_set;
 
                                 RT_TRACE(rtlpriv, COMP_MLME, DBG_LOUD,
-                                         ("Set HW_VAR_AMPDU_MIN_SPACE: %#x\n",
-                                          mac->min_space_cfg));
+                                         "Set HW_VAR_AMPDU_MIN_SPACE: %#x\n",
+                                         mac->min_space_cfg);
 
                                 rtl_write_byte(rtlpriv, REG_AMPDU_MIN_SPACE,
                                                mac->min_space_cfg);
@@ -261,8 +261,8 @@ void rtl92ce_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                         mac->min_space_cfg |= (density_to_set << 3);
 
                         RT_TRACE(rtlpriv, COMP_MLME, DBG_LOUD,
-                                 ("Set HW_VAR_SHORTGI_DENSITY: %#x\n",
-                                  mac->min_space_cfg));
+                                 "Set HW_VAR_SHORTGI_DENSITY: %#x\n",
+                                 mac->min_space_cfg);
 
                         rtl_write_byte(rtlpriv, REG_AMPDU_MIN_SPACE,
                                        mac->min_space_cfg);
@@ -310,8 +310,8 @@ void rtl92ce_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                                 }
 
                                 RT_TRACE(rtlpriv, COMP_MLME, DBG_LOUD,
-                                         ("Set HW_VAR_AMPDU_FACTOR: %#x\n",
-                                          factor_toset));
+                                         "Set HW_VAR_AMPDU_FACTOR: %#x\n",
+                                         factor_toset);
                         }
                         break;
                 }
@@ -348,8 +348,8 @@ void rtl92ce_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                                         break;
                                 default:
                                         RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
-                                                 ("HW_VAR_ACM_CTRL acm set "
-                                                  "failed: eACI is %d\n", acm));
+                                                 "HW_VAR_ACM_CTRL acm set failed: eACI is %d\n",
+                                                 acm);
                                         break;
                                 }
                         } else {
@@ -365,14 +365,14 @@ void rtl92ce_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                                         break;
                                 default:
                                         RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                                                 ("switch case not process\n"));
+                                                 "switch case not processed\n");
                                         break;
                                 }
                         }
 
                         RT_TRACE(rtlpriv, COMP_QOS, DBG_TRACE,
-                                 ("SetHwReg8190pci(): [HW_VAR_ACM_CTRL] "
-                                  "Write 0x%X\n", acm_ctrl));
+                                 "SetHwReg8190pci(): [HW_VAR_ACM_CTRL] Write 0x%X\n",
+                                 acm_ctrl);
                         rtl_write_byte(rtlpriv, REG_ACMHWCTRL, acm_ctrl);
                         break;
                 }
@@ -507,8 +507,8 @@ void rtl92ce_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
 
                 }
         default:
-                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, ("switch case "
-                                                        "not process\n"));
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
+                         "switch case not processed\n");
                 break;
         }
 }
@@ -530,8 +530,8 @@ static bool _rtl92ce_llt_write(struct ieee80211_hw *hw, u32 address, u32 data)
 
                 if (count > POLLING_LLT_THRESHOLD) {
                         RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                                 ("Failed to polling write LLT done at "
-                                  "address %d!\n", address));
+                                 "Failed to polling write LLT done at address %d!\n",
+                                 address);
                         status = false;
                         break;
                 }
@@ -669,18 +669,15 @@ static bool _rtl92ce_init_mac(struct ieee80211_hw *hw)
         udelay(2);
 
         retry = 0;
-        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, ("reg0xec:%x:%x\n",
-                                                rtl_read_dword(rtlpriv, 0xEC),
-                                                bytetmp));
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "reg0xec:%x:%x\n",
+                 rtl_read_dword(rtlpriv, 0xEC), bytetmp);
 
         while ((bytetmp & BIT(0)) && retry < 1000) {
                 retry++;
                 udelay(50);
                 bytetmp = rtl_read_byte(rtlpriv, REG_APS_FSMCO + 1);
-                RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, ("reg0xec:%x:%x\n",
-                                                        rtl_read_dword(rtlpriv,
-                                                                       0xEC),
-                                                        bytetmp));
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "reg0xec:%x:%x\n",
+                         rtl_read_dword(rtlpriv, 0xEC), bytetmp);
                 udelay(50);
         }
 
@@ -864,13 +861,13 @@ void rtl92ce_enable_hw_security_config(struct ieee80211_hw *hw)
         u8 sec_reg_value;
 
         RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
-                 ("PairwiseEncAlgorithm = %d GroupEncAlgorithm = %d\n",
-                  rtlpriv->sec.pairwise_enc_algorithm,
-                  rtlpriv->sec.group_enc_algorithm));
+                 "PairwiseEncAlgorithm = %d GroupEncAlgorithm = %d\n",
+                 rtlpriv->sec.pairwise_enc_algorithm,
+                 rtlpriv->sec.group_enc_algorithm);
 
         if (rtlpriv->cfg->mod_params->sw_crypto || rtlpriv->sec.use_sw_sec) {
-                RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG, ("not open "
-                                                        "hw encryption\n"));
+                RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,
+                         "not open hw encryption\n");
                 return;
         }
 
@@ -886,7 +883,7 @@ void rtl92ce_enable_hw_security_config(struct ieee80211_hw *hw)
         rtl_write_byte(rtlpriv, REG_CR + 1, 0x02);
 
         RT_TRACE(rtlpriv, COMP_SEC, DBG_LOUD,
-                 ("The SECR-value %x\n", sec_reg_value));
+                 "The SECR-value %x\n", sec_reg_value);
 
         rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_WPA_CONFIG, &sec_reg_value);
 
@@ -910,7 +907,7 @@ int rtl92ce_hw_init(struct ieee80211_hw *hw)
         rtlpriv->intf_ops->disable_aspm(hw);
         rtstatus = _rtl92ce_init_mac(hw);
         if (rtstatus != true) {
-                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, ("Init MAC failed\n"));
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "Init MAC failed\n");
                 err = 1;
                 return err;
         }
@@ -918,13 +915,9 @@ int rtl92ce_hw_init(struct ieee80211_hw *hw)
         err = rtl92c_download_fw(hw);
         if (err) {
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
-                         ("Failed to download FW. Init HW "
-                          "without FW now..\n"));
+                         "Failed to download FW. Init HW without FW now..\n");
                 err = 1;
-                rtlhal->fw_ready = false;
                 return err;
-        } else {
-                rtlhal->fw_ready = true;
         }
 
         rtlhal->last_hmeboxnum = 0;
@@ -968,12 +961,12 @@ int rtl92ce_hw_init(struct ieee80211_hw *hw)
         tmp_u1b = efuse_read_1byte(hw, 0x1FA);
         if (!(tmp_u1b & BIT(0))) {
                 rtl_set_rfreg(hw, RF90_PATH_A, 0x15, 0x0F, 0x05);
-                RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, ("PA BIAS path A\n"));
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, "PA BIAS path A\n");
         }
 
         if (!(tmp_u1b & BIT(1)) && is92c) {
                 rtl_set_rfreg(hw, RF90_PATH_B, 0x15, 0x0F, 0x05);
-                RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, ("PA BIAS path B\n"));
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, "PA BIAS path B\n");
         }
 
         if (!(tmp_u1b & BIT(4))) {
@@ -982,7 +975,7 @@ int rtl92ce_hw_init(struct ieee80211_hw *hw)
                 rtl_write_byte(rtlpriv, 0x16, tmp_u1b | 0x80);
                 udelay(10);
                 rtl_write_byte(rtlpriv, 0x16, tmp_u1b | 0x90);
-                RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, ("under 1.5V\n"));
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, "under 1.5V\n");
         }
         rtl92c_dm_init(hw);
         rtlpci->being_init_adapter = false;
@@ -995,6 +988,7 @@ static enum version_8192c _rtl92ce_read_chip_version(struct ieee80211_hw *hw)
         struct rtl_phy *rtlphy = &(rtlpriv->phy);
         enum version_8192c version = VERSION_UNKNOWN;
         u32 value32;
+        const char *versionid;
 
         value32 = rtl_read_dword(rtlpriv, REG_SYS_CFG);
         if (value32 & TRP_VAUX_EN) {
@@ -1007,27 +1001,25 @@ static enum version_8192c _rtl92ce_read_chip_version(struct ieee80211_hw *hw)
 
         switch (version) {
         case VERSION_B_CHIP_92C:
-                RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                         ("Chip Version ID: VERSION_B_CHIP_92C.\n"));
+                versionid = "B_CHIP_92C";
                 break;
         case VERSION_B_CHIP_88C:
-                RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                         ("Chip Version ID: VERSION_B_CHIP_88C.\n"));
+                versionid = "B_CHIP_88C";
                 break;
         case VERSION_A_CHIP_92C:
-                RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                         ("Chip Version ID: VERSION_A_CHIP_92C.\n"));
+                versionid = "A_CHIP_92C";
                 break;
         case VERSION_A_CHIP_88C:
-                RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                         ("Chip Version ID: VERSION_A_CHIP_88C.\n"));
+                versionid = "A_CHIP_88C";
                 break;
         default:
-                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("Chip Version ID: Unknown. Bug?\n"));
+                versionid = "Unknown. Bug?";
                 break;
         }
 
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
+                 "Chip Version ID: %s\n", versionid);
+
         switch (version & 0x3) {
         case CHIP_88C:
                 rtlphy->rf_type = RF_1T1R;
@@ -1041,13 +1033,12 @@ static enum version_8192c _rtl92ce_read_chip_version(struct ieee80211_hw *hw)
         default:
                 rtlphy->rf_type = RF_1T1R;
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("ERROR RF_Type is set!!"));
+                         "ERROR RF_Type is set!!\n");
                 break;
         }
 
-        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
-                 ("Chip RF Type: %s\n", (rtlphy->rf_type == RF_2T2R) ?
-                  "RF_2T2R" : "RF_1T1R"));
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "Chip RF Type: %s\n",
+                 rtlphy->rf_type == RF_2T2R ? "RF_2T2R" : "RF_1T1R");
 
         return version;
 }
@@ -1069,8 +1060,8 @@ static int _rtl92ce_set_media_status(struct ieee80211_hw *hw,
                 _rtl92ce_disable_bcn_sub_func(hw);
         } else {
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
-                         ("Set HW_VAR_MEDIA_STATUS: "
-                          "No such media status(%x).\n", type));
+                         "Set HW_VAR_MEDIA_STATUS: No such media status(%x)\n",
+                         type);
         }
 
         switch (type) {
@@ -1078,27 +1069,27 @@ static int _rtl92ce_set_media_status(struct ieee80211_hw *hw,
                 bt_msr |= MSR_NOLINK;
                 ledaction = LED_CTL_LINK;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                         ("Set Network type to NO LINK!\n"));
+                         "Set Network type to NO LINK!\n");
                 break;
         case NL80211_IFTYPE_ADHOC:
                 bt_msr |= MSR_ADHOC;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                         ("Set Network type to Ad Hoc!\n"));
+                         "Set Network type to Ad Hoc!\n");
                 break;
         case NL80211_IFTYPE_STATION:
                 bt_msr |= MSR_INFRA;
                 ledaction = LED_CTL_LINK;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                         ("Set Network type to STA!\n"));
+                         "Set Network type to STA!\n");
                 break;
         case NL80211_IFTYPE_AP:
                 bt_msr |= MSR_AP;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                         ("Set Network type to AP!\n"));
+                         "Set Network type to AP!\n");
                 break;
         default:
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("Network type %d not support!\n", type));
+                         "Network type %d not supported!\n", type);
                 return 1;
                 break;
 
@@ -1171,7 +1162,7 @@ void rtl92ce_set_qos(struct ieee80211_hw *hw, int aci)
                 rtl_write_dword(rtlpriv, REG_EDCA_VO_PARAM, 0x2f3222);
                 break;
         default:
-                RT_ASSERT(false, ("invalid aci: %d !\n", aci));
+                RT_ASSERT(false, "invalid aci: %d !\n", aci);
                 break;
         }
 }
@@ -1199,7 +1190,6 @@ static void _rtl92ce_poweroff_adapter(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_pci_priv *rtlpcipriv = rtl_pcipriv(hw);
-        struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
         u8 u1b_tmp;
         u32 u4b_tmp;
 
@@ -1210,7 +1200,7 @@ static void _rtl92ce_poweroff_adapter(struct ieee80211_hw *hw)
         rtl_write_byte(rtlpriv, REG_APSD_CTRL, 0x40);
         rtl_write_byte(rtlpriv, REG_SYS_FUNC_EN, 0xE2);
         rtl_write_byte(rtlpriv, REG_SYS_FUNC_EN, 0xE0);
-        if ((rtl_read_byte(rtlpriv, REG_MCUFWDL) & BIT(7)) && rtlhal->fw_ready)
+        if (rtl_read_byte(rtlpriv, REG_MCUFWDL) & BIT(7))
                 rtl92c_firmware_selfreset(hw);
         rtl_write_byte(rtlpriv, REG_SYS_FUNC_EN + 1, 0x51);
         rtl_write_byte(rtlpriv, REG_MCUFWDL, 0x00);
@@ -1300,7 +1290,7 @@ void rtl92ce_set_beacon_interval(struct ieee80211_hw *hw)
         u16 bcn_interval = mac->beacon_interval;
 
         RT_TRACE(rtlpriv, COMP_BEACON, DBG_DMESG,
-                 ("beacon_interval:%d\n", bcn_interval));
+                 "beacon_interval:%d\n", bcn_interval);
         rtl92ce_disable_interrupt(hw);
         rtl_write_word(rtlpriv, REG_BCN_INTERVAL, bcn_interval);
         rtl92ce_enable_interrupt(hw);
@@ -1312,8 +1302,8 @@ void rtl92ce_update_interrupt_mask(struct ieee80211_hw *hw,
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
 
-        RT_TRACE(rtlpriv, COMP_INTR, DBG_LOUD,
-                 ("add_msr:%x, rm_msr:%x\n", add_msr, rm_msr));
+        RT_TRACE(rtlpriv, COMP_INTR, DBG_LOUD, "add_msr:%x, rm_msr:%x\n",
+                 add_msr, rm_msr);
 
         if (add_msr)
                 rtlpci->irq_mask[0] |= add_msr;
@@ -1367,25 +1357,24 @@ static void _rtl92ce_read_txpower_info_from_hwpg(struct ieee80211_hw *hw,
         for (rf_path = 0; rf_path < 2; rf_path++)
                 for (i = 0; i < 3; i++)
                         RTPRINT(rtlpriv, FINIT, INIT_EEPROM,
-                                ("RF(%d) EEPROM CCK Area(%d) = 0x%x\n", rf_path,
-                                 i,
-                                 rtlefuse->
-                                 eeprom_chnlarea_txpwr_cck[rf_path][i]));
+                                "RF(%d) EEPROM CCK Area(%d) = 0x%x\n",
+                                rf_path, i,
+                                rtlefuse->
+                                eeprom_chnlarea_txpwr_cck[rf_path][i]);
         for (rf_path = 0; rf_path < 2; rf_path++)
                 for (i = 0; i < 3; i++)
                         RTPRINT(rtlpriv, FINIT, INIT_EEPROM,
-                                ("RF(%d) EEPROM HT40 1S Area(%d) = 0x%x\n",
-                                 rf_path, i,
-                                 rtlefuse->
-                                 eeprom_chnlarea_txpwr_ht40_1s[rf_path][i]));
+                                "RF(%d) EEPROM HT40 1S Area(%d) = 0x%x\n",
+                                rf_path, i,
+                                rtlefuse->
+                                eeprom_chnlarea_txpwr_ht40_1s[rf_path][i]);
         for (rf_path = 0; rf_path < 2; rf_path++)
                 for (i = 0; i < 3; i++)
                         RTPRINT(rtlpriv, FINIT, INIT_EEPROM,
-                                ("RF(%d) EEPROM HT40 2S Diff Area(%d) = 0x%x\n",
-                                 rf_path, i,
-                                 rtlefuse->
-                                 eeprom_chnlarea_txpwr_ht40_2sdiif[rf_path]
-                                 [i]));
+                                "RF(%d) EEPROM HT40 2S Diff Area(%d) = 0x%x\n",
+                                rf_path, i,
+                                rtlefuse->
+                                eeprom_chnlarea_txpwr_ht40_2sdiif[rf_path][i]);
 
         for (rf_path = 0; rf_path < 2; rf_path++) {
                 for (i = 0; i < 14; i++) {
@@ -1416,11 +1405,11 @@ static void _rtl92ce_read_txpower_info_from_hwpg(struct ieee80211_hw *hw,
 
                 for (i = 0; i < 14; i++) {
                         RTPRINT(rtlpriv, FINIT, INIT_TxPower,
-                                ("RF(%d)-Ch(%d) [CCK / HT40_1S / HT40_2S] = "
-                                 "[0x%x / 0x%x / 0x%x]\n", rf_path, i,
-                                 rtlefuse->txpwrlevel_cck[rf_path][i],
-                                 rtlefuse->txpwrlevel_ht40_1s[rf_path][i],
-                                 rtlefuse->txpwrlevel_ht40_2s[rf_path][i]));
+                                "RF(%d)-Ch(%d) [CCK / HT40_1S / HT40_2S] = [0x%x / 0x%x / 0x%x]\n",
+                                rf_path, i,
+                                rtlefuse->txpwrlevel_cck[rf_path][i],
+                                rtlefuse->txpwrlevel_ht40_1s[rf_path][i],
+                                rtlefuse->txpwrlevel_ht40_2s[rf_path][i]);
                 }
         }
 
@@ -1457,13 +1446,13 @@ static void _rtl92ce_read_txpower_info_from_hwpg(struct ieee80211_hw *hw,
                         }
 
                         RTPRINT(rtlpriv, FINIT, INIT_TxPower,
-                                ("RF-%d pwrgroup_ht20[%d] = 0x%x\n",
-                                 rf_path, i,
-                                 rtlefuse->pwrgroup_ht20[rf_path][i]));
+                                "RF-%d pwrgroup_ht20[%d] = 0x%x\n",
+                                rf_path, i,
+                                rtlefuse->pwrgroup_ht20[rf_path][i]);
                         RTPRINT(rtlpriv, FINIT, INIT_TxPower,
-                                ("RF-%d pwrgroup_ht40[%d] = 0x%x\n",
-                                 rf_path, i,
-                                 rtlefuse->pwrgroup_ht40[rf_path][i]));
+                                "RF-%d pwrgroup_ht40[%d] = 0x%x\n",
+                                rf_path, i,
+                                rtlefuse->pwrgroup_ht40[rf_path][i]);
                 }
         }
 
@@ -1502,27 +1491,27 @@ static void _rtl92ce_read_txpower_info_from_hwpg(struct ieee80211_hw *hw,
 
         for (i = 0; i < 14; i++)
                 RTPRINT(rtlpriv, FINIT, INIT_TxPower,
-                        ("RF-A Ht20 to HT40 Diff[%d] = 0x%x\n", i,
-                         rtlefuse->txpwr_ht20diff[RF90_PATH_A][i]));
+                        "RF-A Ht20 to HT40 Diff[%d] = 0x%x\n",
+                        i, rtlefuse->txpwr_ht20diff[RF90_PATH_A][i]);
         for (i = 0; i < 14; i++)
                 RTPRINT(rtlpriv, FINIT, INIT_TxPower,
-                        ("RF-A Legacy to Ht40 Diff[%d] = 0x%x\n", i,
-                         rtlefuse->txpwr_legacyhtdiff[RF90_PATH_A][i]));
+                        "RF-A Legacy to Ht40 Diff[%d] = 0x%x\n",
+                        i, rtlefuse->txpwr_legacyhtdiff[RF90_PATH_A][i]);
         for (i = 0; i < 14; i++)
                 RTPRINT(rtlpriv, FINIT, INIT_TxPower,
-                        ("RF-B Ht20 to HT40 Diff[%d] = 0x%x\n", i,
-                         rtlefuse->txpwr_ht20diff[RF90_PATH_B][i]));
+                        "RF-B Ht20 to HT40 Diff[%d] = 0x%x\n",
+                        i, rtlefuse->txpwr_ht20diff[RF90_PATH_B][i]);
         for (i = 0; i < 14; i++)
                 RTPRINT(rtlpriv, FINIT, INIT_TxPower,
-                        ("RF-B Legacy to HT40 Diff[%d] = 0x%x\n", i,
-                         rtlefuse->txpwr_legacyhtdiff[RF90_PATH_B][i]));
+                        "RF-B Legacy to HT40 Diff[%d] = 0x%x\n",
+                        i, rtlefuse->txpwr_legacyhtdiff[RF90_PATH_B][i]);
 
         if (!autoload_fail)
                 rtlefuse->eeprom_regulatory = (hwinfo[RF_OPTION1] & 0x7);
         else
                 rtlefuse->eeprom_regulatory = 0;
         RTPRINT(rtlpriv, FINIT, INIT_TxPower,
-                ("eeprom_regulatory = 0x%x\n", rtlefuse->eeprom_regulatory));
+                "eeprom_regulatory = 0x%x\n", rtlefuse->eeprom_regulatory);
 
         if (!autoload_fail) {
                 rtlefuse->eeprom_tssi[RF90_PATH_A] = hwinfo[EEPROM_TSSI_A];
@@ -1531,10 +1520,9 @@ static void _rtl92ce_read_txpower_info_from_hwpg(struct ieee80211_hw *hw,
                 rtlefuse->eeprom_tssi[RF90_PATH_A] = EEPROM_DEFAULT_TSSI;
                 rtlefuse->eeprom_tssi[RF90_PATH_B] = EEPROM_DEFAULT_TSSI;
         }
-        RTPRINT(rtlpriv, FINIT, INIT_TxPower,
-                ("TSSI_A = 0x%x, TSSI_B = 0x%x\n",
-                 rtlefuse->eeprom_tssi[RF90_PATH_A],
-                 rtlefuse->eeprom_tssi[RF90_PATH_B]));
+        RTPRINT(rtlpriv, FINIT, INIT_TxPower, "TSSI_A = 0x%x, TSSI_B = 0x%x\n",
+                rtlefuse->eeprom_tssi[RF90_PATH_A],
+                rtlefuse->eeprom_tssi[RF90_PATH_B]);
 
         if (!autoload_fail)
                 tempval = hwinfo[EEPROM_THERMAL_METER];
@@ -1547,7 +1535,7 @@ static void _rtl92ce_read_txpower_info_from_hwpg(struct ieee80211_hw *hw,
 
         rtlefuse->thermalmeter[0] = rtlefuse->eeprom_thermalmeter;
         RTPRINT(rtlpriv, FINIT, INIT_TxPower,
-                ("thermalmeter = 0x%x\n", rtlefuse->eeprom_thermalmeter));
+                "thermalmeter = 0x%x\n", rtlefuse->eeprom_thermalmeter);
 }
 
 static void _rtl92ce_read_adapter_info(struct ieee80211_hw *hw)
@@ -1567,19 +1555,19 @@ static void _rtl92ce_read_adapter_info(struct ieee80211_hw *hw)
                        HWSET_MAX_SIZE);
         } else if (rtlefuse->epromtype == EEPROM_93C46) {
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("RTL819X Not boot from eeprom, check it !!"));
+                         "RTL819X Not boot from eeprom, check it !!");
         }
 
-        RT_PRINT_DATA(rtlpriv, COMP_INIT, DBG_DMESG, ("MAP\n"),
+        RT_PRINT_DATA(rtlpriv, COMP_INIT, DBG_DMESG, "MAP",
                       hwinfo, HWSET_MAX_SIZE);
 
         eeprom_id = *((u16 *)&hwinfo[0]);
         if (eeprom_id != RTL8190_EEPROM_ID) {
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
-                         ("EEPROM ID(%#x) is invalid!!\n", eeprom_id));
+                         "EEPROM ID(%#x) is invalid!!\n", eeprom_id);
                 rtlefuse->autoload_failflag = true;
         } else {
-                RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, ("Autoload OK\n"));
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "Autoload OK\n");
                 rtlefuse->autoload_failflag = false;
         }
 
@@ -1591,8 +1579,7 @@ static void _rtl92ce_read_adapter_info(struct ieee80211_hw *hw)
                 *((u16 *) (&rtlefuse->dev_addr[i])) = usvalue;
         }
 
-        RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
-                 ("%pM\n", rtlefuse->dev_addr));
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "%pM\n", rtlefuse->dev_addr);
 
         _rtl92ce_read_txpower_info_from_hwpg(hw,
                                              rtlefuse->autoload_failflag,
@@ -1608,7 +1595,7 @@ static void _rtl92ce_read_adapter_info(struct ieee80211_hw *hw)
         rtlefuse->eeprom_oemid = *(u8 *)&hwinfo[EEPROM_CUSTOMER_ID];
 
         RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
-                 ("EEPROM Customer ID: 0x%2x\n", rtlefuse->eeprom_oemid));
+                 "EEPROM Customer ID: 0x%2x\n", rtlefuse->eeprom_oemid);
 
         /* set channel paln to world wide 13 */
         rtlefuse->channel_plan = COUNTRY_CODE_WORLD_WIDE_13;
@@ -1662,7 +1649,7 @@ static void _rtl92ce_hal_customized_behavior(struct ieee80211_hw *hw)
                 break;
         }
         RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
-                 ("RT Customized ID: 0x%02X\n", rtlhal->oem_id));
+                 "RT Customized ID: 0x%02X\n", rtlhal->oem_id);
 }
 
 void rtl92ce_read_eeprom_info(struct ieee80211_hw *hw)
@@ -1679,22 +1666,22 @@ void rtl92ce_read_eeprom_info(struct ieee80211_hw *hw)
         else
                 rtlpriv->dm.rfpath_rxenable[0] =
                     rtlpriv->dm.rfpath_rxenable[1] = true;
-        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, ("VersionID = 0x%4x\n",
-                                                rtlhal->version));
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "VersionID = 0x%4x\n",
+                 rtlhal->version);
         tmp_u1b = rtl_read_byte(rtlpriv, REG_9346CR);
         if (tmp_u1b & BIT(4)) {
-                RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, ("Boot from EEPROM\n"));
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "Boot from EEPROM\n");
                 rtlefuse->epromtype = EEPROM_93C46;
         } else {
-                RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, ("Boot from EFUSE\n"));
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "Boot from EFUSE\n");
                 rtlefuse->epromtype = EEPROM_BOOT_EFUSE;
         }
         if (tmp_u1b & BIT(5)) {
-                RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, ("Autoload OK\n"));
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "Autoload OK\n");
                 rtlefuse->autoload_failflag = false;
                 _rtl92ce_read_adapter_info(hw);
         } else {
-                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, ("Autoload ERR!!\n"));
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "Autoload ERR!!\n");
         }
         _rtl92ce_hal_customized_behavior(hw);
 }
@@ -1790,8 +1777,8 @@ static void rtl92ce_update_hal_rate_table(struct ieee80211_hw *hw,
 
         rtl_write_dword(rtlpriv, REG_ARFR0 + ratr_index * 4, ratr_value);
 
-        RT_TRACE(rtlpriv, COMP_RATR, DBG_DMESG,
-                 ("%x\n", rtl_read_dword(rtlpriv, REG_ARFR0)));
+        RT_TRACE(rtlpriv, COMP_RATR, DBG_DMESG, "%x\n",
+                 rtl_read_dword(rtlpriv, REG_ARFR0));
 }
 
 static void rtl92ce_update_hal_rate_mask(struct ieee80211_hw *hw,
@@ -1919,16 +1906,15 @@ static void rtl92ce_update_hal_rate_mask(struct ieee80211_hw *hw,
                 break;
         }
         RT_TRACE(rtlpriv, COMP_RATR, DBG_DMESG,
-                 ("ratr_bitmap :%x\n", ratr_bitmap));
+                 "ratr_bitmap :%x\n", ratr_bitmap);
         *(u32 *)&rate_mask = EF4BYTE((ratr_bitmap & 0x0fffffff) |
                                      (ratr_index << 28));
         rate_mask[4] = macid | (shortgi ? 0x20 : 0x00) | 0x80;
-        RT_TRACE(rtlpriv, COMP_RATR, DBG_DMESG, ("Rate_index:%x, "
-                                                 "ratr_val:%x, %x:%x:%x:%x:%x\n",
-                                                 ratr_index, ratr_bitmap,
-                                                 rate_mask[0], rate_mask[1],
-                                                 rate_mask[2], rate_mask[3],
-                                                 rate_mask[4]));
+        RT_TRACE(rtlpriv, COMP_RATR, DBG_DMESG,
+                 "Rate_index:%x, ratr_val:%x, %x:%x:%x:%x:%x\n",
+                 ratr_index, ratr_bitmap,
+                 rate_mask[0], rate_mask[1], rate_mask[2], rate_mask[3],
+                 rate_mask[4]);
         rtl92c_fill_h2c_cmd(hw, H2C_RA_MASK, 5, rate_mask);
 
         if (macid != 0)
@@ -1994,7 +1980,7 @@ bool rtl92ce_gpio_radio_on_off_checking(struct ieee80211_hw *hw, u8 *valid)
 
         if ((ppsc->hwradiooff) && (e_rfpowerstate_toset == ERFON)) {
                 RT_TRACE(rtlpriv, COMP_RF, DBG_DMESG,
-                         ("GPIOChangeRF  - HW Radio ON, RF ON\n"));
+                         "GPIOChangeRF  - HW Radio ON, RF ON\n");
 
                 e_rfpowerstate_toset = ERFON;
                 ppsc->hwradiooff = false;
@@ -2002,7 +1988,7 @@ bool rtl92ce_gpio_radio_on_off_checking(struct ieee80211_hw *hw, u8 *valid)
         } else if ((ppsc->hwradiooff == false)
                    && (e_rfpowerstate_toset == ERFOFF)) {
                 RT_TRACE(rtlpriv, COMP_RF, DBG_DMESG,
-                         ("GPIOChangeRF  - HW Radio OFF, RF OFF\n"));
+                         "GPIOChangeRF  - HW Radio OFF, RF OFF\n");
 
                 e_rfpowerstate_toset = ERFOFF;
                 ppsc->hwradiooff = true;
@@ -2053,7 +2039,7 @@ void rtl92ce_set_key(struct ieee80211_hw *hw, u32 key_index,
                 u8 cam_offset = 0;
                 u8 clear_number = 5;
 
-                RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG, ("clear_all\n"));
+                RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG, "clear_all\n");
 
                 for (idx = 0; idx < clear_number; idx++) {
                         rtl_cam_mark_invalid(hw, cam_offset + idx);
@@ -2081,8 +2067,8 @@ void rtl92ce_set_key(struct ieee80211_hw *hw, u32 key_index,
                         enc_algo = CAM_AES;
                         break;
                 default:
-                        RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, ("switch case "
-                                        "not process\n"));
+                        RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
+                                 "switch case not processed\n");
                         enc_algo = CAM_TKIP;
                         break;
                 }
@@ -2100,9 +2086,8 @@ void rtl92ce_set_key(struct ieee80211_hw *hw, u32 key_index,
                                                                  p_macaddr);
                                         if (entry_id >=  TOTAL_CAM_ENTRY) {
                                                 RT_TRACE(rtlpriv, COMP_SEC,
-                                                     DBG_EMERG,
-                                                     ("Can not find free hw"
-                                                     " security cam entry\n"));
+                                                         DBG_EMERG,
+                                                         "Can not find free hw security cam entry\n");
                                                 return;
                                         }
                                 } else {
@@ -2116,31 +2101,31 @@ void rtl92ce_set_key(struct ieee80211_hw *hw, u32 key_index,
 
                 if (rtlpriv->sec.key_len[key_index] == 0) {
                         RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,
-                                 ("delete one entry, entry_id is %d\n",
-                                 entry_id));
+                                 "delete one entry, entry_id is %d\n",
+                                 entry_id);
                         if (mac->opmode == NL80211_IFTYPE_AP)
                                 rtl_cam_del_entry(hw, p_macaddr);
                         rtl_cam_delete_one_entry(hw, p_macaddr, entry_id);
                 } else {
                         RT_TRACE(rtlpriv, COMP_SEC, DBG_LOUD,
-                                 ("The insert KEY length is %d\n",
-                                  rtlpriv->sec.key_len[PAIRWISE_KEYIDX]));
+                                 "The insert KEY length is %d\n",
+                                 rtlpriv->sec.key_len[PAIRWISE_KEYIDX]);
                         RT_TRACE(rtlpriv, COMP_SEC, DBG_LOUD,
-                                 ("The insert KEY  is %x %x\n",
-                                  rtlpriv->sec.key_buf[0][0],
-                                  rtlpriv->sec.key_buf[0][1]));
+                                 "The insert KEY is %x %x\n",
+                                 rtlpriv->sec.key_buf[0][0],
+                                 rtlpriv->sec.key_buf[0][1]);
 
                         RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,
-                                 ("add one entry\n"));
+                                 "add one entry\n");
                         if (is_pairwise) {
                                 RT_PRINT_DATA(rtlpriv, COMP_SEC, DBG_LOUD,
-                                              "Pairwiase Key content :",
+                                              "Pairwise Key content",
                                               rtlpriv->sec.pairwise_key,
                                               rtlpriv->sec.
                                               key_len[PAIRWISE_KEYIDX]);
 
                                 RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,
-                                         ("set Pairwiase key\n"));
+                                         "set Pairwise key\n");
 
                                 rtl_cam_add_one_entry(hw, macaddr, key_index,
                                                       entry_id, enc_algo,
@@ -2149,7 +2134,7 @@ void rtl92ce_set_key(struct ieee80211_hw *hw, u32 key_index,
                                                       key_buf[key_index]);
                         } else {
                                 RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,
-                                         ("set group key\n"));
+                                         "set group key\n");
 
                                 if (mac->opmode == NL80211_IFTYPE_ADHOC) {
                                         rtl_cam_add_one_entry(hw,
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/hw.h b/drivers/net/wireless/rtlwifi/rtl8192ce/hw.h
index 07dbe3e340a5..52a3aea9b3de 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192ce/hw.h
+++ b/drivers/net/wireless/rtlwifi/rtl8192ce/hw.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2009-2010  Realtek Corporation.
+ * Copyright(c) 2009-2012  Realtek Corporation.
  *
  * 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
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/led.c b/drivers/net/wireless/rtlwifi/rtl8192ce/led.c
index 28a1a707d09c..8283e9b27639 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192ce/led.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192ce/led.c
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2009-2010  Realtek Corporation.
+ * Copyright(c) 2009-2012  Realtek Corporation.
  *
  * 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
@@ -45,8 +45,8 @@ void rtl92ce_sw_led_on(struct ieee80211_hw *hw, struct rtl_led *pled)
         u8 ledcfg;
         struct rtl_priv *rtlpriv = rtl_priv(hw);
 
-        RT_TRACE(rtlpriv, COMP_LED, DBG_LOUD,
-                 ("LedAddr:%X ledpin=%d\n", REG_LEDCFG2, pled->ledpin));
+        RT_TRACE(rtlpriv, COMP_LED, DBG_LOUD, "LedAddr:%X ledpin=%d\n",
+                 REG_LEDCFG2, pled->ledpin);
 
         ledcfg = rtl_read_byte(rtlpriv, REG_LEDCFG2);
 
@@ -62,7 +62,7 @@ void rtl92ce_sw_led_on(struct ieee80211_hw *hw, struct rtl_led *pled)
                 break;
         default:
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("switch case not process\n"));
+                         "switch case not processed\n");
                 break;
         }
         pled->ledon = true;
@@ -74,8 +74,8 @@ void rtl92ce_sw_led_off(struct ieee80211_hw *hw, struct rtl_led *pled)
         struct rtl_pci_priv *pcipriv = rtl_pcipriv(hw);
         u8 ledcfg;
 
-        RT_TRACE(rtlpriv, COMP_LED, DBG_LOUD,
-                 ("LedAddr:%X ledpin=%d\n", REG_LEDCFG2, pled->ledpin));
+        RT_TRACE(rtlpriv, COMP_LED, DBG_LOUD, "LedAddr:%X ledpin=%d\n",
+                 REG_LEDCFG2, pled->ledpin);
 
         ledcfg = rtl_read_byte(rtlpriv, REG_LEDCFG2);
 
@@ -97,7 +97,7 @@ void rtl92ce_sw_led_off(struct ieee80211_hw *hw, struct rtl_led *pled)
                 break;
         default:
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("switch case not process\n"));
+                         "switch case not processed\n");
                 break;
         }
         pled->ledon = false;
@@ -145,7 +145,7 @@ void rtl92ce_led_control(struct ieee80211_hw *hw,
              ledaction == LED_CTL_POWER_ON)) {
                 return;
         }
-        RT_TRACE(rtlpriv, COMP_LED, DBG_LOUD, ("ledaction %d.\n",
-                                ledaction));
+        RT_TRACE(rtlpriv, COMP_LED, DBG_LOUD, "ledaction %d\n",
+                 ledaction);
         _rtl92ce_sw_led_control(hw, ledaction);
 }
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/led.h b/drivers/net/wireless/rtlwifi/rtl8192ce/led.h
index 7dfccea2095b..c5761066d383 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192ce/led.h
+++ b/drivers/net/wireless/rtlwifi/rtl8192ce/led.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2009-2010  Realtek Corporation.
+ * Copyright(c) 2009-2012  Realtek Corporation.
  *
  * 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
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/phy.c b/drivers/net/wireless/rtlwifi/rtl8192ce/phy.c
index 3b585aadabfc..c64daf25566a 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192ce/phy.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192ce/phy.c
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2009-2010  Realtek Corporation.
+ * Copyright(c) 2009-2012  Realtek Corporation.
  *
  * 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
@@ -47,9 +47,9 @@ u32 rtl92c_phy_query_rf_reg(struct ieee80211_hw *hw,
         u32 original_value, readback_value, bitshift;
         struct rtl_phy *rtlphy = &(rtlpriv->phy);
 
-        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE, ("regaddr(%#x), "
-                                               "rfpath(%#x), bitmask(%#x)\n",
-                                               regaddr, rfpath, bitmask));
+        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
+                 "regaddr(%#x), rfpath(%#x), bitmask(%#x)\n",
+                 regaddr, rfpath, bitmask);
 
         spin_lock(&rtlpriv->locks.rf_lock);
 
@@ -67,9 +67,8 @@ u32 rtl92c_phy_query_rf_reg(struct ieee80211_hw *hw,
         spin_unlock(&rtlpriv->locks.rf_lock);
 
         RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
-                 ("regaddr(%#x), rfpath(%#x), "
-                  "bitmask(%#x), original_value(%#x)\n",
-                  regaddr, rfpath, bitmask, original_value));
+                 "regaddr(%#x), rfpath(%#x), bitmask(%#x), original_value(%#x)\n",
+                 regaddr, rfpath, bitmask, original_value);
 
         return readback_value;
 }
@@ -121,8 +120,8 @@ void rtl92ce_phy_set_rf_reg(struct ieee80211_hw *hw,
         u32 original_value, bitshift;
 
         RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
-                 ("regaddr(%#x), bitmask(%#x), data(%#x), rfpath(%#x)\n",
-                  regaddr, bitmask, data, rfpath));
+                 "regaddr(%#x), bitmask(%#x), data(%#x), rfpath(%#x)\n",
+                 regaddr, bitmask, data, rfpath);
 
         spin_lock(&rtlpriv->locks.rf_lock);
 
@@ -153,10 +152,9 @@ void rtl92ce_phy_set_rf_reg(struct ieee80211_hw *hw,
 
         spin_unlock(&rtlpriv->locks.rf_lock);
 
-        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE, ("regaddr(%#x), "
-                                               "bitmask(%#x), data(%#x), "
-                                               "rfpath(%#x)\n", regaddr,
-                                               bitmask, data, rfpath));
+        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
+                 "regaddr(%#x), bitmask(%#x), data(%#x), rfpath(%#x)\n",
+                 regaddr, bitmask, data, rfpath);
 }
 
 static bool _rtl92c_phy_config_mac_with_headerfile(struct ieee80211_hw *hw)
@@ -166,11 +164,10 @@ static bool _rtl92c_phy_config_mac_with_headerfile(struct ieee80211_hw *hw)
         u32 arraylength;
         u32 *ptrarray;
 
-        RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, ("Read Rtl819XMACPHY_Array\n"));
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, "Read Rtl819XMACPHY_Array\n");
         arraylength = MAC_2T_ARRAYLENGTH;
         ptrarray = RTL8192CEMAC_2T_ARRAY;
-        RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                 ("Img:RTL8192CEMAC_2T_ARRAY\n"));
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, "Img:RTL8192CEMAC_2T_ARRAY\n");
         for (i = 0; i < arraylength; i = i + 2)
                 rtl_write_byte(rtlpriv, ptrarray[i], (u8) ptrarray[i + 1]);
         return true;
@@ -215,10 +212,9 @@ bool _rtl92ce_phy_config_bb_with_headerfile(struct ieee80211_hw *hw,
                                       phy_regarray_table[i + 1]);
                         udelay(1);
                         RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                                 ("The phy_regarray_table[0] is %x"
-                                  " Rtl819XPHY_REGArray[1] is %x\n",
-                                  phy_regarray_table[i],
-                                  phy_regarray_table[i + 1]));
+                                 "The phy_regarray_table[0] is %x Rtl819XPHY_REGArray[1] is %x\n",
+                                 phy_regarray_table[i],
+                                 phy_regarray_table[i + 1]);
                 }
         } else if (configtype == BASEBAND_CONFIG_AGC_TAB) {
                 for (i = 0; i < agctab_arraylen; i = i + 2) {
@@ -226,10 +222,9 @@ bool _rtl92ce_phy_config_bb_with_headerfile(struct ieee80211_hw *hw,
                                       agctab_array_table[i + 1]);
                         udelay(1);
                         RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                                 ("The agctab_array_table[0] is "
-                                  "%x Rtl819XPHY_REGArray[1] is %x\n",
-                                  agctab_array_table[i],
-                                  agctab_array_table[i + 1]));
+                                 "The agctab_array_table[0] is %x Rtl819XPHY_REGArray[1] is %x\n",
+                                 agctab_array_table[i],
+                                 agctab_array_table[i + 1]);
                 }
         }
         return true;
@@ -269,7 +264,7 @@ bool _rtl92ce_phy_config_bb_with_pgheaderfile(struct ieee80211_hw *hw,
         } else {
 
                 RT_TRACE(rtlpriv, COMP_SEND, DBG_TRACE,
-                         ("configtype != BaseBand_Config_PHY_REG\n"));
+                         "configtype != BaseBand_Config_PHY_REG\n");
         }
         return true;
 }
@@ -291,20 +286,20 @@ bool rtl92c_phy_config_rf_with_headerfile(struct ieee80211_hw *hw,
                 radiob_arraylen = RADIOB_2TARRAYLENGTH;
                 radiob_array_table = RTL8192CE_RADIOB_2TARRAY;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                         ("Radio_A:RTL8192CERADIOA_2TARRAY\n"));
+                         "Radio_A:RTL8192CERADIOA_2TARRAY\n");
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                         ("Radio_B:RTL8192CE_RADIOB_2TARRAY\n"));
+                         "Radio_B:RTL8192CE_RADIOB_2TARRAY\n");
         } else {
                 radioa_arraylen = RADIOA_1TARRAYLENGTH;
                 radioa_array_table = RTL8192CE_RADIOA_1TARRAY;
                 radiob_arraylen = RADIOB_1TARRAYLENGTH;
                 radiob_array_table = RTL8192CE_RADIOB_1TARRAY;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                         ("Radio_A:RTL8192CE_RADIOA_1TARRAY\n"));
+                         "Radio_A:RTL8192CE_RADIOA_1TARRAY\n");
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                         ("Radio_B:RTL8192CE_RADIOB_1TARRAY\n"));
+                         "Radio_B:RTL8192CE_RADIOB_1TARRAY\n");
         }
-        RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, ("Radio No %x\n", rfpath));
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, "Radio No %x\n", rfpath);
         switch (rfpath) {
         case RF90_PATH_A:
                 for (i = 0; i < radioa_arraylen; i = i + 2) {
@@ -352,11 +347,11 @@ bool rtl92c_phy_config_rf_with_headerfile(struct ieee80211_hw *hw,
                 break;
         case RF90_PATH_C:
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("switch case not process\n"));
+                         "switch case not processed\n");
                 break;
         case RF90_PATH_D:
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("switch case not process\n"));
+                         "switch case not processed\n");
                 break;
         }
         return true;
@@ -371,10 +366,9 @@ void rtl92ce_phy_set_bw_mode_callback(struct ieee80211_hw *hw)
         u8 reg_bw_opmode;
         u8 reg_prsr_rsc;
 
-        RT_TRACE(rtlpriv, COMP_SCAN, DBG_TRACE,
-                 ("Switch to %s bandwidth\n",
-                  rtlphy->current_chan_bw == HT_CHANNEL_WIDTH_20 ?
-                  "20MHz" : "40MHz"))
+        RT_TRACE(rtlpriv, COMP_SCAN, DBG_TRACE, "Switch to %s bandwidth\n",
+                 rtlphy->current_chan_bw == HT_CHANNEL_WIDTH_20 ?
+                 "20MHz" : "40MHz");
 
         if (is_hal_stop(rtlhal)) {
                 rtlphy->set_bwmode_inprogress = false;
@@ -398,7 +392,7 @@ void rtl92ce_phy_set_bw_mode_callback(struct ieee80211_hw *hw)
                 break;
         default:
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("unknown bandwidth: %#X\n", rtlphy->current_chan_bw));
+                         "unknown bandwidth: %#X\n", rtlphy->current_chan_bw);
                 break;
         }
 
@@ -423,12 +417,12 @@ void rtl92ce_phy_set_bw_mode_callback(struct ieee80211_hw *hw)
                 break;
         default:
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("unknown bandwidth: %#X\n", rtlphy->current_chan_bw));
+                         "unknown bandwidth: %#X\n", rtlphy->current_chan_bw);
                 break;
         }
         rtl92ce_phy_rf6052_set_bandwidth(hw, rtlphy->current_chan_bw);
         rtlphy->set_bwmode_inprogress = false;
-        RT_TRACE(rtlpriv, COMP_SCAN, DBG_TRACE, ("<==\n"));
+        RT_TRACE(rtlpriv, COMP_SCAN, DBG_TRACE, "<==\n");
 }
 
 void _rtl92ce_phy_lc_calibrate(struct ieee80211_hw *hw, bool is2t)
@@ -499,7 +493,7 @@ static void _rtl92ce_phy_set_rf_sleep(struct ieee80211_hw *hw)
                 rtl_write_byte(rtlpriv, REG_SYS_FUNC_EN, 0xE3);
                 rtl_write_byte(rtlpriv, REG_TXPAUSE, 0x00);
                 RT_TRACE(rtlpriv, COMP_POWER, DBG_TRACE,
-                         ("Switch RF timeout !!!.\n"));
+                         "Switch RF timeout !!!\n");
                 return;
         }
         rtl_write_byte(rtlpriv, REG_SYS_FUNC_EN, 0xE2);
@@ -526,7 +520,7 @@ static bool _rtl92ce_phy_set_rf_power_state(struct ieee80211_hw *hw,
                                 do {
                                         InitializeCount++;
                                         RT_TRACE(rtlpriv, COMP_RF, DBG_DMESG,
-                                                 ("IPS Set eRf nic enable\n"));
+                                                 "IPS Set eRf nic enable\n");
                                         rtstatus = rtl_ps_enable_nic(hw);
                                 } while ((rtstatus != true)
                                          && (InitializeCount < 10));
@@ -534,10 +528,10 @@ static bool _rtl92ce_phy_set_rf_power_state(struct ieee80211_hw *hw,
                                                   RT_RF_OFF_LEVL_HALT_NIC);
                         } else {
                                 RT_TRACE(rtlpriv, COMP_RF, DBG_DMESG,
-                                         ("Set ERFON sleeped:%d ms\n",
-                                          jiffies_to_msecs(jiffies -
-                                                   ppsc->
-                                                   last_sleep_jiffies)));
+                                         "Set ERFON sleeped:%d ms\n",
+                                         jiffies_to_msecs(jiffies -
+                                                          ppsc->
+                                                          last_sleep_jiffies));
                                 ppsc->last_awake_jiffies = jiffies;
                                 rtl92ce_phy_set_rf_on(hw);
                         }
@@ -553,7 +547,7 @@ static bool _rtl92ce_phy_set_rf_power_state(struct ieee80211_hw *hw,
         case ERFOFF:{
                         if (ppsc->reg_rfps_level & RT_RF_OFF_LEVL_HALT_NIC) {
                                 RT_TRACE(rtlpriv, COMP_RF, DBG_DMESG,
-                                         ("IPS Set eRf nic disable\n"));
+                                         "IPS Set eRf nic disable\n");
                                 rtl_ps_disable_nic(hw);
                                 RT_SET_PS_LEVEL(ppsc, RT_RF_OFF_LEVL_HALT_NIC);
                         } else {
@@ -578,35 +572,33 @@ static bool _rtl92ce_phy_set_rf_power_state(struct ieee80211_hw *hw,
                                         continue;
                                 } else {
                                         RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
-                                                 ("eRf Off/Sleep: %d times "
-                                                  "TcbBusyQueue[%d] =%d before "
-                                                  "doze!\n", (i + 1), queue_id,
-                                                  skb_queue_len(&ring->queue)));
+                                                 "eRf Off/Sleep: %d times TcbBusyQueue[%d] =%d before doze!\n",
+                                                 i + 1, queue_id,
+                                                 skb_queue_len(&ring->queue));
 
                                         udelay(10);
                                         i++;
                                 }
                                 if (i >= MAX_DOZE_WAITING_TIMES_9x) {
                                         RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
-                                                 ("\n ERFSLEEP: %d times "
-                                                  "TcbBusyQueue[%d] = %d !\n",
-                                                  MAX_DOZE_WAITING_TIMES_9x,
-                                                  queue_id,
-                                                  skb_queue_len(&ring->queue)));
+                                                 "ERFSLEEP: %d times TcbBusyQueue[%d] = %d !\n",
+                                                 MAX_DOZE_WAITING_TIMES_9x,
+                                                 queue_id,
+                                                 skb_queue_len(&ring->queue));
                                         break;
                                 }
                         }
                         RT_TRACE(rtlpriv, COMP_RF, DBG_DMESG,
-                                 ("Set ERFSLEEP awaked:%d ms\n",
-                                  jiffies_to_msecs(jiffies -
-                                                   ppsc->last_awake_jiffies)));
+                                 "Set ERFSLEEP awaked:%d ms\n",
+                                 jiffies_to_msecs(jiffies -
+                                                  ppsc->last_awake_jiffies));
                         ppsc->last_sleep_jiffies = jiffies;
                         _rtl92ce_phy_set_rf_sleep(hw);
                         break;
                 }
         default:
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("switch case not process\n"));
+                         "switch case not processed\n");
                 bresult = false;
                 break;
         }
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/phy.h b/drivers/net/wireless/rtlwifi/rtl8192ce/phy.h
index be2c92adef33..d5e3b704f930 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192ce/phy.h
+++ b/drivers/net/wireless/rtlwifi/rtl8192ce/phy.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2009-2010  Realtek Corporation.
+ * Copyright(c) 2009-2012  Realtek Corporation.
  *
  * 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
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/reg.h b/drivers/net/wireless/rtlwifi/rtl8192ce/reg.h
index ba5ff0411f0a..43806d9d1e13 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192ce/reg.h
+++ b/drivers/net/wireless/rtlwifi/rtl8192ce/reg.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2009-2010  Realtek Corporation.
+ * Copyright(c) 2009-2012  Realtek Corporation.
  *
  * 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
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/rf.c b/drivers/net/wireless/rtlwifi/rtl8192ce/rf.c
index d3b01e6023ba..69d720dd9c38 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192ce/rf.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192ce/rf.c
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2009-2010  Realtek Corporation.
+ * Copyright(c) 2009-2012  Realtek Corporation.
  *
  * 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
@@ -56,7 +56,7 @@ void rtl92ce_phy_rf6052_set_bandwidth(struct ieee80211_hw *hw, u8 bandwidth)
                 break;
         default:
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("unknown bandwidth: %#X\n", bandwidth));
+                         "unknown bandwidth: %#X\n", bandwidth);
                 break;
         }
 }
@@ -123,8 +123,8 @@ void rtl92ce_phy_rf6052_set_cck_txpower(struct ieee80211_hw *hw,
         rtl_set_bbreg(hw, RTXAGC_A_CCK1_MCS32, MASKBYTE1, tmpval);
 
         RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
-                ("CCK PWR 1M (rf-A) = 0x%x (reg 0x%x)\n", tmpval,
-                 RTXAGC_A_CCK1_MCS32));
+                "CCK PWR 1M (rf-A) = 0x%x (reg 0x%x)\n",
+                tmpval, RTXAGC_A_CCK1_MCS32);
 
         tmpval = tx_agc[RF90_PATH_A] >> 8;
 
@@ -133,22 +133,22 @@ void rtl92ce_phy_rf6052_set_cck_txpower(struct ieee80211_hw *hw,
         rtl_set_bbreg(hw, RTXAGC_B_CCK11_A_CCK2_11, 0xffffff00, tmpval);
 
         RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
-                ("CCK PWR 2~11M (rf-A) = 0x%x (reg 0x%x)\n", tmpval,
-                 RTXAGC_B_CCK11_A_CCK2_11));
+                "CCK PWR 2~11M (rf-A) = 0x%x (reg 0x%x)\n",
+                tmpval, RTXAGC_B_CCK11_A_CCK2_11);
 
         tmpval = tx_agc[RF90_PATH_B] >> 24;
         rtl_set_bbreg(hw, RTXAGC_B_CCK11_A_CCK2_11, MASKBYTE0, tmpval);
 
         RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
-                ("CCK PWR 11M (rf-B) = 0x%x (reg 0x%x)\n", tmpval,
-                 RTXAGC_B_CCK11_A_CCK2_11));
+                "CCK PWR 11M (rf-B) = 0x%x (reg 0x%x)\n",
+                tmpval, RTXAGC_B_CCK11_A_CCK2_11);
 
         tmpval = tx_agc[RF90_PATH_B] & 0x00ffffff;
         rtl_set_bbreg(hw, RTXAGC_B_CCK1_55_MCS32, 0xffffff00, tmpval);
 
         RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
-                ("CCK PWR 1~5.5M (rf-B) = 0x%x (reg 0x%x)\n", tmpval,
-                 RTXAGC_B_CCK1_55_MCS32));
+                "CCK PWR 1~5.5M (rf-B) = 0x%x (reg 0x%x)\n",
+                tmpval, RTXAGC_B_CCK1_55_MCS32);
 }
 
 static void rtl92c_phy_get_power_base(struct ieee80211_hw *hw,
@@ -171,8 +171,8 @@ static void rtl92c_phy_get_power_base(struct ieee80211_hw *hw,
                     (powerBase0 << 8) | powerBase0;
                 *(ofdmbase + i) = powerBase0;
                 RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
-                        (" [OFDM power base index rf(%c) = 0x%x]\n",
-                         ((i == 0) ? 'A' : 'B'), *(ofdmbase + i)));
+                        " [OFDM power base index rf(%c) = 0x%x]\n",
+                        i == 0 ? 'A' : 'B', *(ofdmbase + i));
         }
 
         for (i = 0; i < 2; i++) {
@@ -187,8 +187,8 @@ static void rtl92c_phy_get_power_base(struct ieee80211_hw *hw,
                 *(mcsbase + i) = powerBase1;
 
                 RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
-                        (" [MCS power base index rf(%c) = 0x%x]\n",
-                         ((i == 0) ? 'A' : 'B'), *(mcsbase + i)));
+                        " [MCS power base index rf(%c) = 0x%x]\n",
+                        i == 0 ? 'A' : 'B', *(mcsbase + i));
         }
 }
 
@@ -215,9 +215,8 @@ static void _rtl92c_get_txpower_writeval_by_regulatory(struct ieee80211_hw *hw,
                             + ((index < 2) ? powerBase0[rf] : powerBase1[rf]);
 
                         RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
-                                ("RTK better performance, "
-                                 "writeVal(%c) = 0x%x\n",
-                                 ((rf == 0) ? 'A' : 'B'), writeVal));
+                                "RTK better performance, writeVal(%c) = 0x%x\n",
+                                rf == 0 ? 'A' : 'B', writeVal);
                         break;
                 case 1:
                         if (rtlphy->current_chan_bw == HT_CHANNEL_WIDTH_20_40) {
@@ -225,9 +224,8 @@ static void _rtl92c_get_txpower_writeval_by_regulatory(struct ieee80211_hw *hw,
                                             powerBase1[rf]);
 
                                 RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
-                                        ("Realtek regulatory, 40MHz, "
-                                         "writeVal(%c) = 0x%x\n",
-                                         ((rf == 0) ? 'A' : 'B'), writeVal));
+                                        "Realtek regulatory, 40MHz, writeVal(%c) = 0x%x\n",
+                                        rf == 0 ? 'A' : 'B', writeVal);
                         } else {
                                 if (rtlphy->pwrgroup_cnt == 1)
                                         chnlgroup = 0;
@@ -249,9 +247,8 @@ static void _rtl92c_get_txpower_writeval_by_regulatory(struct ieee80211_hw *hw,
                                                               powerBase1[rf]);
 
                                 RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
-                                        ("Realtek regulatory, 20MHz, "
-                                         "writeVal(%c) = 0x%x\n",
-                                         ((rf == 0) ? 'A' : 'B'), writeVal));
+                                        "Realtek regulatory, 20MHz, writeVal(%c) = 0x%x\n",
+                                        rf == 0 ? 'A' : 'B', writeVal);
                         }
                         break;
                 case 2:
@@ -259,27 +256,24 @@ static void _rtl92c_get_txpower_writeval_by_regulatory(struct ieee80211_hw *hw,
                             ((index < 2) ? powerBase0[rf] : powerBase1[rf]);
 
                         RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
-                                ("Better regulatory, "
-                                 "writeVal(%c) = 0x%x\n",
-                                 ((rf == 0) ? 'A' : 'B'), writeVal));
+                                "Better regulatory, writeVal(%c) = 0x%x\n",
+                                rf == 0 ? 'A' : 'B', writeVal);
                         break;
                 case 3:
                         chnlgroup = 0;
 
                         if (rtlphy->current_chan_bw == HT_CHANNEL_WIDTH_20_40) {
                                 RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
-                                        ("customer's limit, 40MHz "
-                                         "rf(%c) = 0x%x\n",
-                                         ((rf == 0) ? 'A' : 'B'),
-                                         rtlefuse->pwrgroup_ht40[rf][channel -
-                                                                     1]));
+                                        "customer's limit, 40MHz rf(%c) = 0x%x\n",
+                                        rf == 0 ? 'A' : 'B',
+                                        rtlefuse->pwrgroup_ht40[rf][channel -
+                                                                    1]);
                         } else {
                                 RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
-                                        ("customer's limit, 20MHz "
-                                         "rf(%c) = 0x%x\n",
-                                         ((rf == 0) ? 'A' : 'B'),
-                                         rtlefuse->pwrgroup_ht20[rf][channel -
-                                                                     1]));
+                                        "customer's limit, 20MHz rf(%c) = 0x%x\n",
+                                        rf == 0 ? 'A' : 'B',
+                                        rtlefuse->pwrgroup_ht20[rf][channel -
+                                                                    1]);
                         }
                         for (i = 0; i < 4; i++) {
                                 pwr_diff_limit[i] =
@@ -311,15 +305,15 @@ static void _rtl92c_get_txpower_writeval_by_regulatory(struct ieee80211_hw *hw,
                             (pwr_diff_limit[1] << 8) | (pwr_diff_limit[0]);
 
                         RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
-                                ("Customer's limit rf(%c) = 0x%x\n",
-                                 ((rf == 0) ? 'A' : 'B'), customer_limit));
+                                "Customer's limit rf(%c) = 0x%x\n",
+                                rf == 0 ? 'A' : 'B', customer_limit);
 
                         writeVal = customer_limit +
                             ((index < 2) ? powerBase0[rf] : powerBase1[rf]);
 
                         RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
-                                ("Customer, writeVal rf(%c)= 0x%x\n",
-                                 ((rf == 0) ? 'A' : 'B'), writeVal));
+                                "Customer, writeVal rf(%c)= 0x%x\n",
+                                rf == 0 ? 'A' : 'B', writeVal);
                         break;
                 default:
                         chnlgroup = 0;
@@ -329,9 +323,8 @@ static void _rtl92c_get_txpower_writeval_by_regulatory(struct ieee80211_hw *hw,
                             + ((index < 2) ? powerBase0[rf] : powerBase1[rf]);
 
                         RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
-                                ("RTK better performance, writeVal "
-                                 "rf(%c) = 0x%x\n",
-                                 ((rf == 0) ? 'A' : 'B'), writeVal));
+                                "RTK better performance, writeVal rf(%c) = 0x%x\n",
+                                rf == 0 ? 'A' : 'B', writeVal);
                         break;
                 }
 
@@ -383,7 +376,7 @@ static void _rtl92c_write_ofdm_power_reg(struct ieee80211_hw *hw,
                 rtl_set_bbreg(hw, regoffset, MASKDWORD, writeVal);
 
                 RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
-                        ("Set 0x%x = %08x\n", regoffset, writeVal));
+                        "Set 0x%x = %08x\n", regoffset, writeVal);
 
                 if (((get_rf_type(rtlphy) == RF_2T2R) &&
                      (regoffset == RTXAGC_A_MCS15_MCS12 ||
@@ -512,12 +505,12 @@ static bool _rtl92ce_phy_rf6052_config_parafile(struct ieee80211_hw *hw)
 
                 if (rtstatus != true) {
                         RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                                 ("Radio[%d] Fail!!", rfpath));
+                                 "Radio[%d] Fail!!\n", rfpath);
                         return false;
                 }
 
         }
 
-        RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, ("<---\n"));
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, "<---\n");
         return rtstatus;
 }
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/rf.h b/drivers/net/wireless/rtlwifi/rtl8192ce/rf.h
index 39ff03685986..6c8d56efceae 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192ce/rf.h
+++ b/drivers/net/wireless/rtlwifi/rtl8192ce/rf.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2009-2010  Realtek Corporation.
+ * Copyright(c) 2009-2012  Realtek Corporation.
  *
  * 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
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/sw.c b/drivers/net/wireless/rtlwifi/rtl8192ce/sw.c
index 89ef6982ce50..2c3b73366cd2 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192ce/sw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192ce/sw.c
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2009-2010  Realtek Corporation.
+ * Copyright(c) 2009-2012  Realtek Corporation.
  *
  * 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
@@ -27,9 +27,6 @@
  *
  *****************************************************************************/
 
-#include <linux/vmalloc.h>
-#include <linux/module.h>
-
 #include "../wifi.h"
 #include "../core.h"
 #include "../pci.h"
@@ -43,6 +40,8 @@
 #include "trx.h"
 #include "led.h"
 
+#include <linux/module.h>
+
 static void rtl92c_init_aspm_vars(struct ieee80211_hw *hw)
 {
         struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
@@ -92,9 +91,7 @@ int rtl92c_init_sw_vars(struct ieee80211_hw *hw)
         int err;
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
-        const struct firmware *firmware;
         struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
-        char *fw_name = NULL;
 
         rtl8192ce_bt_reg_init(hw);
 
@@ -159,33 +156,27 @@ int rtl92c_init_sw_vars(struct ieee80211_hw *hw)
         rtlpriv->rtlhal.pfirmware = vzalloc(0x4000);
         if (!rtlpriv->rtlhal.pfirmware) {
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("Can't alloc buffer for fw.\n"));
+                         "Can't alloc buffer for fw\n");
                 return 1;
         }
 
         /* request fw */
         if (IS_VENDOR_UMC_A_CUT(rtlhal->version) &&
             !IS_92C_SERIAL(rtlhal->version))
-                fw_name = "rtlwifi/rtl8192cfwU.bin";
+                rtlpriv->cfg->fw_name = "rtlwifi/rtl8192cfwU.bin";
         else if (IS_81xxC_VENDOR_UMC_B_CUT(rtlhal->version))
-                fw_name = "rtlwifi/rtl8192cfwU_B.bin";
-        else
-                fw_name = rtlpriv->cfg->fw_name;
-        err = request_firmware(&firmware, fw_name, rtlpriv->io.dev);
+                rtlpriv->cfg->fw_name = "rtlwifi/rtl8192cfwU_B.bin";
+
+        rtlpriv->max_fw_size = 0x4000;
+        pr_info("Using firmware %s\n", rtlpriv->cfg->fw_name);
+        err = request_firmware_nowait(THIS_MODULE, 1, rtlpriv->cfg->fw_name,
+                                      rtlpriv->io.dev, GFP_KERNEL, hw,
+                                      rtl_fw_cb);
         if (err) {
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("Failed to request firmware!\n"));
-                return 1;
-        }
-        if (firmware->size > 0x4000) {
-                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("Firmware is too big!\n"));
-                release_firmware(firmware);
+                         "Failed to request firmware!\n");
                 return 1;
         }
-        memcpy(rtlpriv->rtlhal.pfirmware, firmware->data, firmware->size);
-        rtlpriv->rtlhal.fwsize = firmware->size;
-        release_firmware(firmware);
 
         return 0;
 }
@@ -404,7 +395,7 @@ static int __init rtl92ce_module_init(void)
 
         ret = pci_register_driver(&rtl92ce_driver);
         if (ret)
-                RT_ASSERT(false, (": No device found\n"));
+                RT_ASSERT(false, "No device found\n");
 
         return ret;
 }
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/sw.h b/drivers/net/wireless/rtlwifi/rtl8192ce/sw.h
index b7dc3263e433..d2367a5d0cf5 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192ce/sw.h
+++ b/drivers/net/wireless/rtlwifi/rtl8192ce/sw.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2009-2010  Realtek Corporation.
+ * Copyright(c) 2009-2012  Realtek Corporation.
  *
  * 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
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/table.c b/drivers/net/wireless/rtlwifi/rtl8192ce/table.c
index ba938b91aa6f..752f943a84ae 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192ce/table.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192ce/table.c
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2009-2010  Realtek Corporation.
+ * Copyright(c) 2009-2012  Realtek Corporation.
  *
  * 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
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/table.h b/drivers/net/wireless/rtlwifi/rtl8192ce/table.h
index 3a6e8b6aeee0..8b79161f71be 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192ce/table.h
+++ b/drivers/net/wireless/rtlwifi/rtl8192ce/table.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2009-2010  Realtek Corporation.
+ * Copyright(c) 2009-2012  Realtek Corporation.
  *
  * 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
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/trx.c b/drivers/net/wireless/rtlwifi/rtl8192ce/trx.c
index 4fb5ae24dee0..37b13636a778 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192ce/trx.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192ce/trx.c
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2009-2010  Realtek Corporation.
+ * Copyright(c) 2009-2012  Realtek Corporation.
  *
  * 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
@@ -725,7 +725,7 @@ void rtl92ce_tx_fill_desc(struct ieee80211_hw *hw,
                 if (ieee80211_is_data_qos(fc)) {
                         if (mac->rdg_en) {
                                 RT_TRACE(rtlpriv, COMP_SEND, DBG_TRACE,
-                                         ("Enable RDG function.\n"));
+                                         "Enable RDG function\n");
                                 SET_TX_DESC_RDG_ENABLE(pdesc, 1);
                                 SET_TX_DESC_HTC(pdesc, 1);
                         }
@@ -763,7 +763,7 @@ void rtl92ce_tx_fill_desc(struct ieee80211_hw *hw,
                 SET_TX_DESC_BMC(pdesc, 1);
         }
 
-        RT_TRACE(rtlpriv, COMP_SEND, DBG_TRACE, ("\n"));
+        RT_TRACE(rtlpriv, COMP_SEND, DBG_TRACE, "\n");
 }
 
 void rtl92ce_tx_fill_cmddesc(struct ieee80211_hw *hw,
@@ -821,8 +821,7 @@ void rtl92ce_tx_fill_cmddesc(struct ieee80211_hw *hw,
         }
 
         RT_PRINT_DATA(rtlpriv, COMP_CMD, DBG_LOUD,
-                      "H2C Tx Cmd Content\n",
-                      pdesc, TX_DESC_SIZE);
+                      "H2C Tx Cmd Content", pdesc, TX_DESC_SIZE);
 }
 
 void rtl92ce_set_desc(u8 *pdesc, bool istx, u8 desc_name, u8 *val)
@@ -837,8 +836,8 @@ void rtl92ce_set_desc(u8 *pdesc, bool istx, u8 desc_name, u8 *val)
                         SET_TX_DESC_NEXT_DESC_ADDRESS(pdesc, *(u32 *) val);
                         break;
                 default:
-                        RT_ASSERT(false, ("ERR txdesc :%d"
-                                          " not process\n", desc_name));
+                        RT_ASSERT(false, "ERR txdesc :%d not process\n",
+                                  desc_name);
                         break;
                 }
         } else {
@@ -857,8 +856,8 @@ void rtl92ce_set_desc(u8 *pdesc, bool istx, u8 desc_name, u8 *val)
                         SET_RX_DESC_EOR(pdesc, 1);
                         break;
                 default:
-                        RT_ASSERT(false, ("ERR rxdesc :%d "
-                                          "not process\n", desc_name));
+                        RT_ASSERT(false, "ERR rxdesc :%d not process\n",
+                                  desc_name);
                         break;
                 }
         }
@@ -877,8 +876,8 @@ u32 rtl92ce_get_desc(u8 *p_desc, bool istx, u8 desc_name)
                         ret = GET_TX_DESC_TX_BUFFER_ADDRESS(p_desc);
                         break;
                 default:
-                        RT_ASSERT(false, ("ERR txdesc :%d "
-                                          "not process\n", desc_name));
+                        RT_ASSERT(false, "ERR txdesc :%d not process\n",
+                                  desc_name);
                         break;
                 }
         } else {
@@ -891,8 +890,8 @@ u32 rtl92ce_get_desc(u8 *p_desc, bool istx, u8 desc_name)
                         ret = GET_RX_DESC_PKT_LEN(pdesc);
                         break;
                 default:
-                        RT_ASSERT(false, ("ERR rxdesc :%d "
-                                          "not process\n", desc_name));
+                        RT_ASSERT(false, "ERR rxdesc :%d not process\n",
+                                  desc_name);
                         break;
                 }
         }
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/trx.h b/drivers/net/wireless/rtlwifi/rtl8192ce/trx.h
index c8977a50ca36..efb9ab270403 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192ce/trx.h
+++ b/drivers/net/wireless/rtlwifi/rtl8192ce/trx.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2009-2010  Realtek Corporation.
+ * Copyright(c) 2009-2012  Realtek Corporation.
  *
  * 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
diff --git a/drivers/net/wireless/rtlwifi/rtl8192cu/def.h b/drivers/net/wireless/rtlwifi/rtl8192cu/def.h
index d097efb1e717..f916555e6311 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192cu/def.h
+++ b/drivers/net/wireless/rtlwifi/rtl8192cu/def.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2009-2010  Realtek Corporation.
+ * Copyright(c) 2009-2012  Realtek Corporation.
  *
  * 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
diff --git a/drivers/net/wireless/rtlwifi/rtl8192cu/dm.c b/drivers/net/wireless/rtlwifi/rtl8192cu/dm.c
index f311baee668d..6fd39eaf361e 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192cu/dm.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192cu/dm.c
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2009-2010  Realtek Corporation.
+ * Copyright(c) 2009-2012  Realtek Corporation.
  *
  * 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
@@ -52,7 +52,7 @@ void rtl92cu_dm_dynamic_txpower(struct ieee80211_hw *hw)
         if ((mac->link_state < MAC80211_LINKED) &&
             (rtlpriv->dm.entry_min_undecoratedsmoothed_pwdb == 0)) {
                 RT_TRACE(rtlpriv, COMP_POWER, DBG_TRACE,
-                         ("Not connected to any\n"));
+                         "Not connected to any\n");
 
                 rtlpriv->dm.dynamic_txhighpower_lvl = TXHIGHPWRLEVEL_NORMAL;
 
@@ -65,28 +65,28 @@ void rtl92cu_dm_dynamic_txpower(struct ieee80211_hw *hw)
                         undecorated_smoothed_pwdb =
                             rtlpriv->dm.entry_min_undecoratedsmoothed_pwdb;
                         RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
-                                 ("AP Client PWDB = 0x%lx\n",
-                                  undecorated_smoothed_pwdb));
+                                 "AP Client PWDB = 0x%lx\n",
+                                 undecorated_smoothed_pwdb);
                 } else {
                         undecorated_smoothed_pwdb =
                             rtlpriv->dm.undecorated_smoothed_pwdb;
                         RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
-                                 ("STA Default Port PWDB = 0x%lx\n",
-                                  undecorated_smoothed_pwdb));
+                                 "STA Default Port PWDB = 0x%lx\n",
+                                 undecorated_smoothed_pwdb);
                 }
         } else {
                 undecorated_smoothed_pwdb =
                     rtlpriv->dm.entry_min_undecoratedsmoothed_pwdb;
 
                 RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
-                         ("AP Ext Port PWDB = 0x%lx\n",
-                          undecorated_smoothed_pwdb));
+                         "AP Ext Port PWDB = 0x%lx\n",
+                         undecorated_smoothed_pwdb);
         }
 
         if (undecorated_smoothed_pwdb >= TX_POWER_NEAR_FIELD_THRESH_LVL2) {
                 rtlpriv->dm.dynamic_txhighpower_lvl = TXHIGHPWRLEVEL_LEVEL1;
                 RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
-                         ("TXHIGHPWRLEVEL_LEVEL1 (TxPwr=0x0)\n"));
+                         "TXHIGHPWRLEVEL_LEVEL1 (TxPwr=0x0)\n");
         } else if ((undecorated_smoothed_pwdb <
                     (TX_POWER_NEAR_FIELD_THRESH_LVL2 - 3)) &&
                    (undecorated_smoothed_pwdb >=
@@ -94,18 +94,18 @@ void rtl92cu_dm_dynamic_txpower(struct ieee80211_hw *hw)
 
                 rtlpriv->dm.dynamic_txhighpower_lvl = TXHIGHPWRLEVEL_LEVEL1;
                 RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
-                         ("TXHIGHPWRLEVEL_LEVEL1 (TxPwr=0x10)\n"));
+                         "TXHIGHPWRLEVEL_LEVEL1 (TxPwr=0x10)\n");
         } else if (undecorated_smoothed_pwdb <
                    (TX_POWER_NEAR_FIELD_THRESH_LVL1 - 5)) {
                 rtlpriv->dm.dynamic_txhighpower_lvl = TXHIGHPWRLEVEL_NORMAL;
                 RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
-                         ("TXHIGHPWRLEVEL_NORMAL\n"));
+                         "TXHIGHPWRLEVEL_NORMAL\n");
         }
 
         if ((rtlpriv->dm.dynamic_txhighpower_lvl != rtlpriv->dm.last_dtp_lvl)) {
                 RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
-                         ("PHY_SetTxPowerLevel8192S() Channel = %d\n",
-                          rtlphy->current_channel));
+                         "PHY_SetTxPowerLevel8192S() Channel = %d\n",
+                         rtlphy->current_channel);
                 rtl92c_phy_set_txpower_level(hw, rtlphy->current_channel);
         }
 
diff --git a/drivers/net/wireless/rtlwifi/rtl8192cu/dm.h b/drivers/net/wireless/rtlwifi/rtl8192cu/dm.h
index 7f966c666b5a..d947e7d350bb 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192cu/dm.h
+++ b/drivers/net/wireless/rtlwifi/rtl8192cu/dm.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2009-2010  Realtek Corporation.
+ * Copyright(c) 2009-2012  Realtek Corporation.
  *
  * 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
diff --git a/drivers/net/wireless/rtlwifi/rtl8192cu/hw.c b/drivers/net/wireless/rtlwifi/rtl8192cu/hw.c
index 124cf633861c..0c74d4f2eeb4 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192cu/hw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192cu/hw.c
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2009-2010  Realtek Corporation. All rights reserved.
+ * Copyright(c) 2009-2012  Realtek 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
@@ -27,8 +27,6 @@
  *
  *****************************************************************************/
 
-#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-
 #include "../wifi.h"
 #include "../efuse.h"
 #include "../base.h"
@@ -162,24 +160,24 @@ static void _rtl92cu_read_txpower_info_from_hwpg(struct ieee80211_hw *hw,
         for (rf_path = 0; rf_path < 2; rf_path++)
                 for (i = 0; i < 3; i++)
                         RTPRINT(rtlpriv, FINIT, INIT_EEPROM,
-                                ("RF(%d) EEPROM CCK Area(%d) = 0x%x\n", rf_path,
-                                 i, rtlefuse->
-                                 eeprom_chnlarea_txpwr_cck[rf_path][i]));
+                                "RF(%d) EEPROM CCK Area(%d) = 0x%x\n",
+                                rf_path, i,
+                                rtlefuse->
+                                eeprom_chnlarea_txpwr_cck[rf_path][i]);
         for (rf_path = 0; rf_path < 2; rf_path++)
                 for (i = 0; i < 3; i++)
                         RTPRINT(rtlpriv, FINIT, INIT_EEPROM,
-                                ("RF(%d) EEPROM HT40 1S Area(%d) = 0x%x\n",
-                                 rf_path, i,
-                                 rtlefuse->
-                                 eeprom_chnlarea_txpwr_ht40_1s[rf_path][i]));
+                                "RF(%d) EEPROM HT40 1S Area(%d) = 0x%x\n",
+                                rf_path, i,
+                                rtlefuse->
+                                eeprom_chnlarea_txpwr_ht40_1s[rf_path][i]);
         for (rf_path = 0; rf_path < 2; rf_path++)
                 for (i = 0; i < 3; i++)
                         RTPRINT(rtlpriv, FINIT, INIT_EEPROM,
-                                ("RF(%d) EEPROM HT40 2S Diff Area(%d) = 0x%x\n",
-                                 rf_path, i,
-                                 rtlefuse->
-                                 eeprom_chnlarea_txpwr_ht40_2sdiif[rf_path]
-                                 [i]));
+                                "RF(%d) EEPROM HT40 2S Diff Area(%d) = 0x%x\n",
+                                rf_path, i,
+                                rtlefuse->
+                                eeprom_chnlarea_txpwr_ht40_2sdiif[rf_path][i]);
         for (rf_path = 0; rf_path < 2; rf_path++) {
                 for (i = 0; i < 14; i++) {
                         index = _rtl92c_get_chnl_group((u8) i);
@@ -205,11 +203,10 @@ static void _rtl92cu_read_txpower_info_from_hwpg(struct ieee80211_hw *hw,
                 }
                 for (i = 0; i < 14; i++) {
                         RTPRINT(rtlpriv, FINIT, INIT_TxPower,
-                                ("RF(%d)-Ch(%d) [CCK / HT40_1S / HT40_2S] = "
-                                 "[0x%x / 0x%x / 0x%x]\n", rf_path, i,
-                                 rtlefuse->txpwrlevel_cck[rf_path][i],
-                                 rtlefuse->txpwrlevel_ht40_1s[rf_path][i],
-                                 rtlefuse->txpwrlevel_ht40_2s[rf_path][i]));
+                                "RF(%d)-Ch(%d) [CCK / HT40_1S / HT40_2S] = [0x%x / 0x%x / 0x%x]\n", rf_path, i,
+                                rtlefuse->txpwrlevel_cck[rf_path][i],
+                                rtlefuse->txpwrlevel_ht40_1s[rf_path][i],
+                                rtlefuse->txpwrlevel_ht40_2s[rf_path][i]);
                 }
         }
         for (i = 0; i < 3; i++) {
@@ -242,13 +239,13 @@ static void _rtl92cu_read_txpower_info_from_hwpg(struct ieee80211_hw *hw,
                                       & 0xf0) >> 4);
                         }
                         RTPRINT(rtlpriv, FINIT, INIT_TxPower,
-                                ("RF-%d pwrgroup_ht20[%d] = 0x%x\n",
-                                 rf_path, i,
-                                 rtlefuse->pwrgroup_ht20[rf_path][i]));
+                                "RF-%d pwrgroup_ht20[%d] = 0x%x\n",
+                                rf_path, i,
+                                rtlefuse->pwrgroup_ht20[rf_path][i]);
                         RTPRINT(rtlpriv, FINIT, INIT_TxPower,
-                                ("RF-%d pwrgroup_ht40[%d] = 0x%x\n",
-                                 rf_path, i,
-                                 rtlefuse->pwrgroup_ht40[rf_path][i]));
+                                "RF-%d pwrgroup_ht40[%d] = 0x%x\n",
+                                rf_path, i,
+                                rtlefuse->pwrgroup_ht40[rf_path][i]);
                 }
         }
         for (i = 0; i < 14; i++) {
@@ -277,26 +274,26 @@ static void _rtl92cu_read_txpower_info_from_hwpg(struct ieee80211_hw *hw,
             rtlefuse->txpwr_legacyhtdiff[RF90_PATH_A][7];
         for (i = 0; i < 14; i++)
                 RTPRINT(rtlpriv, FINIT, INIT_TxPower,
-                        ("RF-A Ht20 to HT40 Diff[%d] = 0x%x\n", i,
-                         rtlefuse->txpwr_ht20diff[RF90_PATH_A][i]));
+                        "RF-A Ht20 to HT40 Diff[%d] = 0x%x\n",
+                        i, rtlefuse->txpwr_ht20diff[RF90_PATH_A][i]);
         for (i = 0; i < 14; i++)
                 RTPRINT(rtlpriv, FINIT, INIT_TxPower,
-                        ("RF-A Legacy to Ht40 Diff[%d] = 0x%x\n", i,
-                         rtlefuse->txpwr_legacyhtdiff[RF90_PATH_A][i]));
+                        "RF-A Legacy to Ht40 Diff[%d] = 0x%x\n",
+                        i, rtlefuse->txpwr_legacyhtdiff[RF90_PATH_A][i]);
         for (i = 0; i < 14; i++)
                 RTPRINT(rtlpriv, FINIT, INIT_TxPower,
-                        ("RF-B Ht20 to HT40 Diff[%d] = 0x%x\n", i,
-                         rtlefuse->txpwr_ht20diff[RF90_PATH_B][i]));
+                        "RF-B Ht20 to HT40 Diff[%d] = 0x%x\n",
+                        i, rtlefuse->txpwr_ht20diff[RF90_PATH_B][i]);
         for (i = 0; i < 14; i++)
                 RTPRINT(rtlpriv, FINIT, INIT_TxPower,
-                        ("RF-B Legacy to HT40 Diff[%d] = 0x%x\n", i,
-                         rtlefuse->txpwr_legacyhtdiff[RF90_PATH_B][i]));
+                        "RF-B Legacy to HT40 Diff[%d] = 0x%x\n",
+                        i, rtlefuse->txpwr_legacyhtdiff[RF90_PATH_B][i]);
         if (!autoload_fail)
                 rtlefuse->eeprom_regulatory = (hwinfo[RF_OPTION1] & 0x7);
         else
                 rtlefuse->eeprom_regulatory = 0;
         RTPRINT(rtlpriv, FINIT, INIT_TxPower,
-                ("eeprom_regulatory = 0x%x\n", rtlefuse->eeprom_regulatory));
+                "eeprom_regulatory = 0x%x\n", rtlefuse->eeprom_regulatory);
         if (!autoload_fail) {
                 rtlefuse->eeprom_tssi[RF90_PATH_A] = hwinfo[EEPROM_TSSI_A];
                 rtlefuse->eeprom_tssi[RF90_PATH_B] = hwinfo[EEPROM_TSSI_B];
@@ -305,9 +302,9 @@ static void _rtl92cu_read_txpower_info_from_hwpg(struct ieee80211_hw *hw,
                 rtlefuse->eeprom_tssi[RF90_PATH_B] = EEPROM_DEFAULT_TSSI;
         }
         RTPRINT(rtlpriv, FINIT, INIT_TxPower,
-                ("TSSI_A = 0x%x, TSSI_B = 0x%x\n",
-                 rtlefuse->eeprom_tssi[RF90_PATH_A],
-                 rtlefuse->eeprom_tssi[RF90_PATH_B]));
+                "TSSI_A = 0x%x, TSSI_B = 0x%x\n",
+                rtlefuse->eeprom_tssi[RF90_PATH_A],
+                rtlefuse->eeprom_tssi[RF90_PATH_B]);
         if (!autoload_fail)
                 tempval = hwinfo[EEPROM_THERMAL_METER];
         else
@@ -320,7 +317,7 @@ static void _rtl92cu_read_txpower_info_from_hwpg(struct ieee80211_hw *hw,
                 rtlefuse->apk_thermalmeterignore = true;
         rtlefuse->thermalmeter[0] = rtlefuse->eeprom_thermalmeter;
         RTPRINT(rtlpriv, FINIT, INIT_TxPower,
-                ("thermalmeter = 0x%x\n", rtlefuse->eeprom_thermalmeter));
+                "thermalmeter = 0x%x\n", rtlefuse->eeprom_thermalmeter);
 }
 
 static void _rtl92cu_read_board_type(struct ieee80211_hw *hw, u8 *contents)
@@ -340,144 +337,8 @@ static void _rtl92cu_read_board_type(struct ieee80211_hw *hw, u8 *contents)
         if (IS_HIGHT_PA(rtlefuse->board_type))
                 rtlefuse->external_pa = 1;
         pr_info("Board Type %x\n", rtlefuse->board_type);
-
-#ifdef CONFIG_ANTENNA_DIVERSITY
-        /* Antenna Diversity setting. */
-        if (registry_par->antdiv_cfg == 2) /* 2: From Efuse */
-                rtl_efuse->antenna_cfg = (contents[EEPROM_RF_OPT1]&0x18)>>3;
-        else
-                rtl_efuse->antenna_cfg = registry_par->antdiv_cfg; /* 0:OFF, */
-
-        pr_info("Antenna Config %x\n", rtl_efuse->antenna_cfg);
-#endif
-}
-
-#ifdef CONFIG_BT_COEXIST
-static void _update_bt_param(_adapter *padapter)
-{
-        struct btcoexist_priv    *pbtpriv = &(padapter->halpriv.bt_coexist);
-        struct registry_priv    *registry_par = &padapter->registrypriv;
-        if (2 != registry_par->bt_iso) {
-                /* 0:Low, 1:High, 2:From Efuse */
-                pbtpriv->BT_Ant_isolation = registry_par->bt_iso;
-        }
-        if (registry_par->bt_sco == 1) {
-                /* 0:Idle, 1:None-SCO, 2:SCO, 3:From Counter, 4.Busy,
-                 * 5.OtherBusy */
-                pbtpriv->BT_Service = BT_OtherAction;
-        } else if (registry_par->bt_sco == 2) {
-                pbtpriv->BT_Service = BT_SCO;
-        } else if (registry_par->bt_sco == 4) {
-                pbtpriv->BT_Service = BT_Busy;
-        } else if (registry_par->bt_sco == 5) {
-                pbtpriv->BT_Service = BT_OtherBusy;
-        } else {
-                pbtpriv->BT_Service = BT_Idle;
-        }
-        pbtpriv->BT_Ampdu = registry_par->bt_ampdu;
-        pbtpriv->bCOBT = _TRUE;
-        pbtpriv->BtEdcaUL = 0;
-        pbtpriv->BtEdcaDL = 0;
-        pbtpriv->BtRssiState = 0xff;
-        pbtpriv->bInitSet = _FALSE;
-        pbtpriv->bBTBusyTraffic = _FALSE;
-        pbtpriv->bBTTrafficModeSet = _FALSE;
-        pbtpriv->bBTNonTrafficModeSet = _FALSE;
-        pbtpriv->CurrentState = 0;
-        pbtpriv->PreviousState = 0;
-        pr_info("BT Coexistance = %s\n",
-                (pbtpriv->BT_Coexist == _TRUE) ? "enable" : "disable");
-        if (pbtpriv->BT_Coexist) {
-                if (pbtpriv->BT_Ant_Num == Ant_x2)
-                        pr_info("BlueTooth BT_Ant_Num = Antx2\n");
-                else if (pbtpriv->BT_Ant_Num == Ant_x1)
-                        pr_info("BlueTooth BT_Ant_Num = Antx1\n");
-                switch (pbtpriv->BT_CoexistType) {
-                case BT_2Wire:
-                        pr_info("BlueTooth BT_CoexistType = BT_2Wire\n");
-                        break;
-                case BT_ISSC_3Wire:
-                        pr_info("BlueTooth BT_CoexistType = BT_ISSC_3Wire\n");
-                        break;
-                case BT_Accel:
-                        pr_info("BlueTooth BT_CoexistType = BT_Accel\n");
-                        break;
-                case BT_CSR_BC4:
-                        pr_info("BlueTooth BT_CoexistType = BT_CSR_BC4\n");
-                        break;
-                case BT_CSR_BC8:
-                        pr_info("BlueTooth BT_CoexistType = BT_CSR_BC8\n");
-                        break;
-                case BT_RTL8756:
-                        pr_info("BlueTooth BT_CoexistType = BT_RTL8756\n");
-                        break;
-                default:
-                        pr_info("BlueTooth BT_CoexistType = Unknown\n");
-                        break;
-                }
-                pr_info("BlueTooth BT_Ant_isolation = %d\n",
-                        pbtpriv->BT_Ant_isolation);
-                switch (pbtpriv->BT_Service) {
-                case BT_OtherAction:
-                        pr_info("BlueTooth BT_Service = BT_OtherAction\n");
-                        break;
-                case BT_SCO:
-                        pr_info("BlueTooth BT_Service = BT_SCO\n");
-                        break;
-                case BT_Busy:
-                        pr_info("BlueTooth BT_Service = BT_Busy\n");
-                        break;
-                case BT_OtherBusy:
-                        pr_info("BlueTooth BT_Service = BT_OtherBusy\n");
-                        break;
-                default:
-                        pr_info("BlueTooth BT_Service = BT_Idle\n");
-                        break;
-                }
-                pr_info("BT_RadioSharedType = 0x%x\n",
-                        pbtpriv->BT_RadioSharedType);
-        }
 }
 
-#define GET_BT_COEXIST(priv) (&priv->bt_coexist)
-
-static void _rtl92cu_read_bluetooth_coexistInfo(struct ieee80211_hw *hw,
-                                                u8 *contents,
-                                                bool bautoloadfailed);
-{
-        HAL_DATA_TYPE   *pHalData = GET_HAL_DATA(Adapter);
-        bool isNormal = IS_NORMAL_CHIP(pHalData->VersionID);
-        struct btcoexist_priv    *pbtpriv = &pHalData->bt_coexist;
-        u8      rf_opt4;
-
-        _rtw_memset(pbtpriv, 0, sizeof(struct btcoexist_priv));
-        if (AutoloadFail) {
-                pbtpriv->BT_Coexist = _FALSE;
-                pbtpriv->BT_CoexistType = BT_2Wire;
-                pbtpriv->BT_Ant_Num = Ant_x2;
-                pbtpriv->BT_Ant_isolation = 0;
-                pbtpriv->BT_RadioSharedType = BT_Radio_Shared;
-                return;
-        }
-        if (isNormal) {
-                if (pHalData->BoardType == BOARD_USB_COMBO)
-                        pbtpriv->BT_Coexist = _TRUE;
-                else
-                        pbtpriv->BT_Coexist = ((PROMContent[EEPROM_RF_OPT3] &
-                                              0x20) >> 5); /* bit[5] */
-                rf_opt4 = PROMContent[EEPROM_RF_OPT4];
-                pbtpriv->BT_CoexistType = ((rf_opt4&0xe)>>1); /* bit [3:1] */
-                pbtpriv->BT_Ant_Num = (rf_opt4&0x1); /* bit [0] */
-                pbtpriv->BT_Ant_isolation = ((rf_opt4&0x10)>>4); /* bit [4] */
-                pbtpriv->BT_RadioSharedType = ((rf_opt4&0x20)>>5); /* bit [5] */
-        } else {
-                pbtpriv->BT_Coexist = (PROMContent[EEPROM_RF_OPT4] >> 4) ?
-                                       _TRUE : _FALSE;
-        }
-        _update_bt_param(Adapter);
-}
-#endif
-
 static void _rtl92cu_read_adapter_info(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
@@ -494,17 +355,17 @@ static void _rtl92cu_read_adapter_info(struct ieee80211_hw *hw)
                        HWSET_MAX_SIZE);
         } else if (rtlefuse->epromtype == EEPROM_93C46) {
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("RTL819X Not boot from eeprom, check it !!"));
+                         "RTL819X Not boot from eeprom, check it !!\n");
         }
-        RT_PRINT_DATA(rtlpriv, COMP_INIT, DBG_LOUD, ("MAP\n"),
+        RT_PRINT_DATA(rtlpriv, COMP_INIT, DBG_LOUD, "MAP",
                       hwinfo, HWSET_MAX_SIZE);
         eeprom_id = le16_to_cpu(*((__le16 *)&hwinfo[0]));
         if (eeprom_id != RTL8190_EEPROM_ID) {
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("EEPROM ID(%#x) is invalid!!\n", eeprom_id));
+                         "EEPROM ID(%#x) is invalid!!\n", eeprom_id);
                 rtlefuse->autoload_failflag = true;
         } else {
-                RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, ("Autoload OK\n"));
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "Autoload OK\n");
                 rtlefuse->autoload_failflag = false;
         }
         if (rtlefuse->autoload_failflag)
@@ -518,16 +379,15 @@ static void _rtl92cu_read_adapter_info(struct ieee80211_hw *hw)
                                            rtlefuse->autoload_failflag, hwinfo);
         rtlefuse->eeprom_vid = le16_to_cpu(*(__le16 *)&hwinfo[EEPROM_VID]);
         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));
+        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_version =
                          le16_to_cpu(*(__le16 *)&hwinfo[EEPROM_VERSION]);
         rtlefuse->txpwr_fromeprom = true;
         rtlefuse->eeprom_oemid = *(u8 *)&hwinfo[EEPROM_CUSTOMER_ID];
-        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
-                 ("EEPROM Customer ID: 0x%2x\n", rtlefuse->eeprom_oemid));
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "EEPROM Customer ID: 0x%2x\n",
+                 rtlefuse->eeprom_oemid);
         if (rtlhal->oem_id == RT_CID_DEFAULT) {
                 switch (rtlefuse->eeprom_oemid) {
                 case EEPROM_CID_DEFAULT:
@@ -554,10 +414,6 @@ static void _rtl92cu_read_adapter_info(struct ieee80211_hw *hw)
                 }
         }
         _rtl92cu_read_board_type(hw, hwinfo);
-#ifdef CONFIG_BT_COEXIST
-        _rtl92cu_read_bluetooth_coexistInfo(hw, hwinfo,
-                                            rtlefuse->autoload_failflag);
-#endif
 }
 
 static void _rtl92cu_hal_customized_behavior(struct ieee80211_hw *hw)
@@ -579,8 +435,8 @@ static void _rtl92cu_hal_customized_behavior(struct ieee80211_hw *hw)
         default:
                 break;
         }
-        RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
-                 ("RT Customized ID: 0x%02X\n", rtlhal->oem_id));
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "RT Customized ID: 0x%02X\n",
+                 rtlhal->oem_id);
 }
 
 void rtl92cu_read_eeprom_info(struct ieee80211_hw *hw)
@@ -596,11 +452,11 @@ void rtl92cu_read_eeprom_info(struct ieee80211_hw *hw)
         tmp_u1b = rtl_read_byte(rtlpriv, REG_9346CR);
         rtlefuse->epromtype = (tmp_u1b & BOOT_FROM_EEPROM) ?
                                EEPROM_93C46 : EEPROM_BOOT_EFUSE;
-        RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, ("Boot from %s\n",
-                 (tmp_u1b & BOOT_FROM_EEPROM) ? "EERROM" : "EFUSE"));
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "Boot from %s\n",
+                 tmp_u1b & BOOT_FROM_EEPROM ? "EERROM" : "EFUSE");
         rtlefuse->autoload_failflag = (tmp_u1b & EEPROM_EN) ? false : true;
-        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, ("Autoload %s\n",
-                 (tmp_u1b & EEPROM_EN) ? "OK!!" : "ERR!!"));
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "Autoload %s\n",
+                 tmp_u1b & EEPROM_EN ? "OK!!" : "ERR!!");
         _rtl92cu_read_adapter_info(hw);
         _rtl92cu_hal_customized_behavior(hw);
         return;
@@ -618,13 +474,12 @@ static int _rtl92cu_init_power_on(struct ieee80211_hw *hw)
         do {
                 if (rtl_read_byte(rtlpriv, REG_APS_FSMCO) & PFM_ALDN) {
                         RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
-                                 ("Autoload Done!\n"));
+                                 "Autoload Done!\n");
                         break;
                 }
                 if (pollingCount++ > 100) {
                         RT_TRACE(rtlpriv, COMP_INIT, DBG_EMERG,
-                                 ("Failed to polling REG_APS_FSMCO[PFM_ALDN]"
-                                 " done!\n"));
+                                 "Failed to polling REG_APS_FSMCO[PFM_ALDN] done!\n");
                         return -ENODEV;
                 }
         } while (true);
@@ -639,8 +494,8 @@ static int _rtl92cu_init_power_on(struct ieee80211_hw *hw)
                 value8 |= LDV12_EN;
                 rtl_write_byte(rtlpriv, REG_LDOV12D_CTRL, value8);
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
-                         (" power-on :REG_LDOV12D_CTRL Reg0x21:0x%02x.\n",
-                         value8));
+                         " power-on :REG_LDOV12D_CTRL Reg0x21:0x%02x\n",
+                         value8);
                 udelay(100);
                 value8 = rtl_read_byte(rtlpriv, REG_SYS_ISO_CTRL);
                 value8 &= ~ISO_MD2PP;
@@ -658,8 +513,7 @@ static int _rtl92cu_init_power_on(struct ieee80211_hw *hw)
                 }
                 if (pollingCount++ > 100) {
                         RT_TRACE(rtlpriv, COMP_INIT, DBG_EMERG,
-                                 ("Failed to polling REG_APS_FSMCO[APFM_ONMAC]"
-                                 " done!\n"));
+                                 "Failed to polling REG_APS_FSMCO[APFM_ONMAC] done!\n");
                         return -ENODEV;
                 }
         } while (true);
@@ -877,8 +731,8 @@ static void _rtl92cu_init_chipN_three_out_ep_priority(struct ieee80211_hw *hw,
                 hiQ     = QUEUE_HIGH;
         }
         _rtl92c_init_chipN_reg_priority(hw, beQ, bkQ, viQ, voQ, mgtQ, hiQ);
-        RT_TRACE(rtlpriv, COMP_INIT, DBG_EMERG,
-                 ("Tx queue select :0x%02x..\n", queue_sel));
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_EMERG, "Tx queue select :0x%02x..\n",
+                 queue_sel);
 }
 
 static void _rtl92cu_init_chipN_queue_priority(struct ieee80211_hw *hw,
@@ -937,8 +791,8 @@ static void _rtl92cu_init_chipT_queue_priority(struct ieee80211_hw *hw,
                 break;
         }
         rtl_write_byte(rtlpriv, (REG_TRXDMA_CTRL+1), hq_sele);
-        RT_TRACE(rtlpriv, COMP_INIT, DBG_EMERG,
-                 ("Tx queue select :0x%02x..\n", hq_sele));
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_EMERG, "Tx queue select :0x%02x..\n",
+                 hq_sele);
 }
 
 static void _rtl92cu_init_queue_priority(struct ieee80211_hw *hw,
@@ -998,7 +852,7 @@ static int _rtl92cu_init_mac(struct ieee80211_hw *hw)
 
         if (err) {
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                        ("Failed to init power on!\n"));
+                         "Failed to init power on!\n");
                 return err;
         }
         if (!wmm_enable) {
@@ -1010,7 +864,7 @@ static int _rtl92cu_init_mac(struct ieee80211_hw *hw)
         }
         if (false == rtl92c_init_llt_table(hw, boundary)) {
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                        ("Failed to init LLT Table!\n"));
+                         "Failed to init LLT Table!\n");
                 return -EINVAL;
         }
         _rtl92cu_init_queue_reserved_page(hw, wmm_enable, out_ep_nums,
@@ -1043,12 +897,12 @@ void rtl92cu_enable_hw_security_config(struct ieee80211_hw *hw)
         struct rtl_hal *rtlhal = rtl_hal(rtlpriv);
 
         RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
-                 ("PairwiseEncAlgorithm = %d GroupEncAlgorithm = %d\n",
-                  rtlpriv->sec.pairwise_enc_algorithm,
-                  rtlpriv->sec.group_enc_algorithm));
+                 "PairwiseEncAlgorithm = %d GroupEncAlgorithm = %d\n",
+                 rtlpriv->sec.pairwise_enc_algorithm,
+                 rtlpriv->sec.group_enc_algorithm);
         if (rtlpriv->cfg->mod_params->sw_crypto || rtlpriv->sec.use_sw_sec) {
                 RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,
-                         ("not open sw encryption\n"));
+                         "not open sw encryption\n");
                 return;
         }
         sec_reg_value = SCR_TxEncEnable | SCR_RxDecEnable;
@@ -1059,8 +913,8 @@ void rtl92cu_enable_hw_security_config(struct ieee80211_hw *hw)
         if (IS_NORMAL_CHIP(rtlhal->version))
                 sec_reg_value |= (SCR_RXBCUSEDK | SCR_TXBCUSEDK);
         rtl_write_byte(rtlpriv, REG_CR + 1, 0x02);
-        RT_TRACE(rtlpriv, COMP_SEC, DBG_LOUD,
-                 ("The SECR-value %x\n", sec_reg_value));
+        RT_TRACE(rtlpriv, COMP_SEC, DBG_LOUD, "The SECR-value %x\n",
+                 sec_reg_value);
         rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_WPA_CONFIG, &sec_reg_value);
 }
 
@@ -1111,34 +965,6 @@ static void _InitPABias(struct ieee80211_hw *hw)
         }
 }
 
-static void _InitAntenna_Selection(struct ieee80211_hw *hw)
-{
-#ifdef CONFIG_ANTENNA_DIVERSITY
-        struct rtl_priv *rtlpriv = rtl_priv(hw);
-        struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
-        struct rtl_phy *rtlphy = &(rtlpriv->phy);
-
-        if (pHalData->AntDivCfg == 0)
-                return;
-
-        if (rtlphy->rf_type == RF_1T1R) {
-                rtl_write_dword(rtlpriv, REG_LEDCFG0,
-                                rtl_read_dword(rtlpriv,
-                                REG_LEDCFG0)|BIT(23));
-                rtl_set_bbreg(hw, rFPGA0_XAB_RFPARAMETER, BIT(13), 0x01);
-                if (rtl_get_bbreg(hw, RFPGA0_XA_RFINTERFACEOE, 0x300) ==
-                    Antenna_A)
-                        pHalData->CurAntenna = Antenna_A;
-                else
-                        pHalData->CurAntenna = Antenna_B;
-        }
-#endif
-}
-
-static void _dump_registers(struct ieee80211_hw *hw)
-{
-}
-
 static void _update_mac_setting(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
@@ -1163,18 +989,15 @@ int rtl92cu_hw_init(struct ieee80211_hw *hw)
         rtlhal->hw_type = HARDWARE_TYPE_RTL8192CU;
         err = _rtl92cu_init_mac(hw);
         if (err) {
-                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, ("init mac failed!\n"));
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "init mac failed!\n");
                 return err;
         }
         err = rtl92c_download_fw(hw);
         if (err) {
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
-                         ("Failed to download FW. Init HW without FW now..\n"));
+                         "Failed to download FW. Init HW without FW now..\n");
                 err = 1;
-                rtlhal->fw_ready = false;
                 return err;
-        } else {
-                rtlhal->fw_ready = true;
         }
         rtlhal->last_hmeboxnum = 0; /* h2c */
         _rtl92cu_phy_param_tab_init(hw);
@@ -1209,10 +1032,8 @@ int rtl92cu_hw_init(struct ieee80211_hw *hw)
         }
         _rtl92cu_hw_configure(hw);
         _InitPABias(hw);
-        _InitAntenna_Selection(hw);
         _update_mac_setting(hw);
         rtl92c_dm_init(hw);
-        _dump_registers(hw);
         return err;
 }
 
@@ -1270,24 +1091,21 @@ static void  _ResetDigitalProcedure1(struct ieee80211_hw *hw, bool bWithoutHWSM)
                 if (rtl_read_byte(rtlpriv, REG_MCUFWDL) & BIT(1)) {
                         /* reset MCU ready status */
                         rtl_write_byte(rtlpriv, REG_MCUFWDL, 0);
-                        if (rtlhal->fw_ready) {
-                                /* 8051 reset by self */
-                                rtl_write_byte(rtlpriv, REG_HMETFR+3, 0x20);
-                                while ((retry_cnts++ < 100) &&
-                                       (FEN_CPUEN & rtl_read_word(rtlpriv,
-                                       REG_SYS_FUNC_EN))) {
-                                        udelay(50);
-                                }
-                                if (retry_cnts >= 100) {
-                                        RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                                                ("#####=> 8051 reset failed!.."
-                                                ".......................\n"););
-                                        /* if 8051 reset fail, reset MAC. */
-                                        rtl_write_byte(rtlpriv,
-                                                       REG_SYS_FUNC_EN + 1,
-                                                       0x50);
-                                        udelay(100);
-                                }
+                        /* 8051 reset by self */
+                        rtl_write_byte(rtlpriv, REG_HMETFR+3, 0x20);
+                        while ((retry_cnts++ < 100) &&
+                               (FEN_CPUEN & rtl_read_word(rtlpriv,
+                               REG_SYS_FUNC_EN))) {
+                                udelay(50);
+                        }
+                        if (retry_cnts >= 100) {
+                                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
+                                         "#####=> 8051 reset failed!.........................\n");
+                                /* if 8051 reset fail, reset MAC. */
+                                rtl_write_byte(rtlpriv,
+                                               REG_SYS_FUNC_EN + 1,
+                                               0x50);
+                                udelay(100);
                         }
                 }
                 /* Reset MAC and Enable 8051 */
@@ -1495,35 +1313,36 @@ static int _rtl92cu_set_media_status(struct ieee80211_hw *hw,
                 _rtl92cu_resume_tx_beacon(hw);
                 _rtl92cu_disable_bcn_sub_func(hw);
         } else {
-                RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING, ("Set HW_VAR_MEDIA_"
-                         "STATUS:No such media status(%x).\n", type));
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
+                         "Set HW_VAR_MEDIA_STATUS:No such media status(%x)\n",
+                         type);
         }
         switch (type) {
         case NL80211_IFTYPE_UNSPECIFIED:
                 bt_msr |= MSR_NOLINK;
                 ledaction = LED_CTL_LINK;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                         ("Set Network type to NO LINK!\n"));
+                         "Set Network type to NO LINK!\n");
                 break;
         case NL80211_IFTYPE_ADHOC:
                 bt_msr |= MSR_ADHOC;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                         ("Set Network type to Ad Hoc!\n"));
+                         "Set Network type to Ad Hoc!\n");
                 break;
         case NL80211_IFTYPE_STATION:
                 bt_msr |= MSR_INFRA;
                 ledaction = LED_CTL_LINK;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                         ("Set Network type to STA!\n"));
+                         "Set Network type to STA!\n");
                 break;
         case NL80211_IFTYPE_AP:
                 bt_msr |= MSR_AP;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                         ("Set Network type to AP!\n"));
+                         "Set Network type to AP!\n");
                 break;
         default:
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("Network type %d not support!\n", type));
+                         "Network type %d not supported!\n", type);
                 goto error_out;
         }
         rtl_write_byte(rtlpriv, (MSR), bt_msr);
@@ -1684,8 +1503,8 @@ void rtl92cu_set_beacon_related_registers(struct ieee80211_hw *hw)
         value32 |= TSFRST;
         rtl_write_dword(rtlpriv, REG_TCR, value32);
         RT_TRACE(rtlpriv, COMP_INIT|COMP_BEACON, DBG_LOUD,
-                 ("SetBeaconRelatedRegisters8192CUsb(): Set TCR(%x)\n",
-                 value32));
+                 "SetBeaconRelatedRegisters8192CUsb(): Set TCR(%x)\n",
+                 value32);
         /* TODO: Modify later (Find the right parameters)
          * NOTE: Fix test chip's bug (about contention windows's randomness) */
         if ((mac->opmode == NL80211_IFTYPE_ADHOC) ||
@@ -1702,8 +1521,8 @@ void rtl92cu_set_beacon_interval(struct ieee80211_hw *hw)
         struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
         u16 bcn_interval = mac->beacon_interval;
 
-        RT_TRACE(rtlpriv, COMP_BEACON, DBG_DMESG,
-                 ("beacon_interval:%d\n", bcn_interval));
+        RT_TRACE(rtlpriv, COMP_BEACON, DBG_DMESG, "beacon_interval:%d\n",
+                 bcn_interval);
         rtl_write_word(rtlpriv, REG_BCN_INTERVAL, bcn_interval);
 }
 
@@ -1767,7 +1586,7 @@ void rtl92cu_get_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                 break;
         default:
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("switch case not process\n"));
+                         "switch case not processed\n");
                 break;
         }
 }
@@ -1827,8 +1646,7 @@ void rtl92cu_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                         rtl_write_byte(rtlpriv, REG_MAC_SPEC_SIFS + 1, val[0]);
                         rtl_write_byte(rtlpriv, REG_R2T_SIFS+1, val[0]);
                         rtl_write_byte(rtlpriv, REG_T2T_SIFS+1, val[0]);
-                        RT_TRACE(rtlpriv, COMP_MLME, DBG_LOUD,
-                                 ("HW_VAR_SIFS\n"));
+                        RT_TRACE(rtlpriv, COMP_MLME, DBG_LOUD, "HW_VAR_SIFS\n");
                         break;
                 }
         case HW_VAR_SLOT_TIME:{
@@ -1837,7 +1655,7 @@ void rtl92cu_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
 
                         rtl_write_byte(rtlpriv, REG_SLOT, val[0]);
                         RT_TRACE(rtlpriv, COMP_MLME, DBG_LOUD,
-                                 ("HW_VAR_SLOT_TIME %x\n", val[0]));
+                                 "HW_VAR_SLOT_TIME %x\n", val[0]);
                         if (QOS_MODE) {
                                 for (e_aci = 0; e_aci < AC_MAX; e_aci++)
                                         rtlpriv->cfg->ops->set_hw_reg(hw,
@@ -1901,8 +1719,8 @@ void rtl92cu_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                                                      min_spacing_to_set);
                                 *val = min_spacing_to_set;
                                 RT_TRACE(rtlpriv, COMP_MLME, DBG_LOUD,
-                                        ("Set HW_VAR_AMPDU_MIN_SPACE: %#x\n",
-                                        mac->min_space_cfg));
+                                         "Set HW_VAR_AMPDU_MIN_SPACE: %#x\n",
+                                         mac->min_space_cfg);
                                 rtl_write_byte(rtlpriv, REG_AMPDU_MIN_SPACE,
                                                mac->min_space_cfg);
                         }
@@ -1916,8 +1734,8 @@ void rtl92cu_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                         mac->min_space_cfg &= 0x07;
                         mac->min_space_cfg |= (density_to_set << 3);
                         RT_TRACE(rtlpriv, COMP_MLME, DBG_LOUD,
-                                 ("Set HW_VAR_SHORTGI_DENSITY: %#x\n",
-                                  mac->min_space_cfg));
+                                 "Set HW_VAR_SHORTGI_DENSITY: %#x\n",
+                                 mac->min_space_cfg);
                         rtl_write_byte(rtlpriv, REG_AMPDU_MIN_SPACE,
                                        mac->min_space_cfg);
                         break;
@@ -1950,8 +1768,8 @@ void rtl92cu_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                                                        p_regtoset[index]);
                                 }
                                 RT_TRACE(rtlpriv, COMP_MLME, DBG_LOUD,
-                                         ("Set HW_VAR_AMPDU_FACTOR: %#x\n",
-                                          factor_toset));
+                                         "Set HW_VAR_AMPDU_FACTOR: %#x\n",
+                                         factor_toset);
                         }
                         break;
                 }
@@ -1969,8 +1787,8 @@ void rtl92cu_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                                          AC_PARAM_ECW_MAX_OFFSET);
                         u4b_ac_param |= (u32) tx_op << AC_PARAM_TXOP_OFFSET;
                         RT_TRACE(rtlpriv, COMP_MLME, DBG_LOUD,
-                                 ("queue:%x, ac_param:%x\n", e_aci,
-                                  u4b_ac_param));
+                                 "queue:%x, ac_param:%x\n",
+                                 e_aci, u4b_ac_param);
                         switch (e_aci) {
                         case AC1_BK:
                                 rtl_write_dword(rtlpriv, REG_EDCA_BK_PARAM,
@@ -1989,8 +1807,9 @@ void rtl92cu_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                                                 u4b_ac_param);
                                 break;
                         default:
-                                RT_ASSERT(false, ("SetHwReg8185(): invalid"
-                                          " aci: %d !\n", e_aci));
+                                RT_ASSERT(false,
+                                          "SetHwReg8185(): invalid aci: %d !\n",
+                                          e_aci);
                                 break;
                         }
                         if (rtlusb->acm_method != eAcmWay2_SW)
@@ -2020,8 +1839,8 @@ void rtl92cu_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                                         break;
                                 default:
                                         RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
-                                                 ("HW_VAR_ACM_CTRL acm set "
-                                                  "failed: eACI is %d\n", acm));
+                                                 "HW_VAR_ACM_CTRL acm set failed: eACI is %d\n",
+                                                 acm);
                                         break;
                                 }
                         } else {
@@ -2037,13 +1856,13 @@ void rtl92cu_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                                         break;
                                 default:
                                         RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                                                 ("switch case not process\n"));
+                                                 "switch case not processed\n");
                                         break;
                                 }
                         }
                         RT_TRACE(rtlpriv, COMP_QOS, DBG_TRACE,
-                                 ("SetHwReg8190pci(): [HW_VAR_ACM_CTRL] "
-                                  "Write 0x%X\n", acm_ctrl));
+                                 "SetHwReg8190pci(): [HW_VAR_ACM_CTRL] Write 0x%X\n",
+                                 acm_ctrl);
                         rtl_write_byte(rtlpriv, REG_ACMHWCTRL, acm_ctrl);
                         break;
                 }
@@ -2051,7 +1870,7 @@ void rtl92cu_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                         rtl_write_dword(rtlpriv, REG_RCR, ((u32 *) (val))[0]);
                         mac->rx_conf = ((u32 *) (val))[0];
                         RT_TRACE(rtlpriv, COMP_RECV, DBG_DMESG,
-                                 ("### Set RCR(0x%08x) ###\n", mac->rx_conf));
+                                 "### Set RCR(0x%08x) ###\n", mac->rx_conf);
                         break;
                 }
         case HW_VAR_RETRY_LIMIT:{
@@ -2060,8 +1879,9 @@ void rtl92cu_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                         rtl_write_word(rtlpriv, REG_RL,
                                        retry_limit << RETRY_LIMIT_SHORT_SHIFT |
                                        retry_limit << RETRY_LIMIT_LONG_SHIFT);
-                        RT_TRACE(rtlpriv, COMP_MLME, DBG_DMESG, ("Set HW_VAR_R"
-                                 "ETRY_LIMIT(0x%08x)\n", retry_limit));
+                        RT_TRACE(rtlpriv, COMP_MLME, DBG_DMESG,
+                                 "Set HW_VAR_RETRY_LIMIT(0x%08x)\n",
+                                 retry_limit);
                         break;
                 }
         case HW_VAR_DUAL_TSF_RST:
@@ -2165,8 +1985,8 @@ void rtl92cu_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                 rtl_write_word(rtlpriv, REG_RXFLTMAP2, *(u16 *)val);
                 break;
         default:
-                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, ("switch case "
-                                                        "not process\n"));
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
+                         "switch case not processed\n");
                 break;
         }
 }
@@ -2239,8 +2059,8 @@ void rtl92cu_update_hal_rate_table(struct ieee80211_hw *hw,
                                (shortgi_rate << 4) | (shortgi_rate);
         }
         rtl_write_dword(rtlpriv, REG_ARFR0 + ratr_index * 4, ratr_value);
-        RT_TRACE(rtlpriv, COMP_RATR, DBG_DMESG, ("%x\n", rtl_read_dword(rtlpriv,
-                 REG_ARFR0)));
+        RT_TRACE(rtlpriv, COMP_RATR, DBG_DMESG, "%x\n",
+                 rtl_read_dword(rtlpriv, REG_ARFR0));
 }
 
 void rtl92cu_update_hal_rate_mask(struct ieee80211_hw *hw, u8 rssi_level)
@@ -2344,17 +2164,16 @@ void rtl92cu_update_hal_rate_mask(struct ieee80211_hw *hw, u8 rssi_level)
                         ratr_bitmap &= 0x0f0ff0ff;
                 break;
         }
-        RT_TRACE(rtlpriv, COMP_RATR, DBG_DMESG, ("ratr_bitmap :%x\n",
-                 ratr_bitmap));
+        RT_TRACE(rtlpriv, COMP_RATR, DBG_DMESG, "ratr_bitmap :%x\n",
+                 ratr_bitmap);
         *(u32 *)&rate_mask = ((ratr_bitmap & 0x0fffffff) |
                                       ratr_index << 28);
         rate_mask[4] = macid | (shortgi ? 0x20 : 0x00) | 0x80;
-        RT_TRACE(rtlpriv, COMP_RATR, DBG_DMESG, ("Rate_index:%x, "
-                                                "ratr_val:%x, %x:%x:%x:%x:%x\n",
-                                                ratr_index, ratr_bitmap,
-                                                rate_mask[0], rate_mask[1],
-                                                rate_mask[2], rate_mask[3],
-                                                rate_mask[4]));
+        RT_TRACE(rtlpriv, COMP_RATR, DBG_DMESG,
+                 "Rate_index:%x, ratr_val:%x, %x:%x:%x:%x:%x\n",
+                 ratr_index, ratr_bitmap,
+                 rate_mask[0], rate_mask[1], rate_mask[2], rate_mask[3],
+                 rate_mask[4]);
         rtl92c_fill_h2c_cmd(hw, H2C_RA_MASK, 5, rate_mask);
 }
 
@@ -2404,7 +2223,7 @@ bool rtl92cu_gpio_radio_on_off_checking(struct ieee80211_hw *hw, u8 * valid)
                         e_rfpowerstate_toset = (u1tmp & BIT(7)) ?
                                                ERFOFF : ERFON;
                         RT_TRACE(rtlpriv, COMP_POWER, DBG_DMESG,
-                                 ("pwrdown, 0x5c(BIT7)=%02x\n", u1tmp));
+                                 "pwrdown, 0x5c(BIT7)=%02x\n", u1tmp);
                 } else {
                         rtl_write_byte(rtlpriv, REG_MAC_PINMUX_CFG,
                                        rtl_read_byte(rtlpriv,
@@ -2413,27 +2232,26 @@ bool rtl92cu_gpio_radio_on_off_checking(struct ieee80211_hw *hw, u8 * valid)
                         e_rfpowerstate_toset  = (u1tmp & BIT(3)) ?
                                                  ERFON : ERFOFF;
                         RT_TRACE(rtlpriv, COMP_POWER, DBG_DMESG,
-                                ("GPIO_IN=%02x\n", u1tmp));
+                                 "GPIO_IN=%02x\n", u1tmp);
                 }
-                RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD, ("N-SS RF =%x\n",
-                         e_rfpowerstate_toset));
+                RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD, "N-SS RF =%x\n",
+                         e_rfpowerstate_toset);
         }
         if ((ppsc->hwradiooff) && (e_rfpowerstate_toset == ERFON)) {
-                RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD, ("GPIOChangeRF  - HW "
-                         "Radio ON, RF ON\n"));
+                RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
+                         "GPIOChangeRF  - HW Radio ON, RF ON\n");
                 ppsc->hwradiooff = false;
                 actuallyset = true;
         } else if ((!ppsc->hwradiooff) && (e_rfpowerstate_toset  ==
                     ERFOFF)) {
-                RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD, ("GPIOChangeRF  - HW"
-                         " Radio OFF\n"));
+                RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
+                         "GPIOChangeRF  - HW Radio OFF\n");
                 ppsc->hwradiooff = true;
                 actuallyset = true;
         } else {
-                RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD ,
-                         ("pHalData->bHwRadioOff and eRfPowerStateToSet do not"
-                         " match: pHalData->bHwRadioOff %x, eRfPowerStateToSet "
-                         "%x\n", ppsc->hwradiooff, e_rfpowerstate_toset));
+                RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
+                         "pHalData->bHwRadioOff and eRfPowerStateToSet do not match: pHalData->bHwRadioOff %x, eRfPowerStateToSet %x\n",
+                         ppsc->hwradiooff, e_rfpowerstate_toset);
         }
         if (actuallyset) {
                 ppsc->hwradiooff = true;
diff --git a/drivers/net/wireless/rtlwifi/rtl8192cu/hw.h b/drivers/net/wireless/rtlwifi/rtl8192cu/hw.h
index 32f85cba106a..f41a3aa4a26f 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192cu/hw.h
+++ b/drivers/net/wireless/rtlwifi/rtl8192cu/hw.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2009-2010  Realtek Corporation.
+ * Copyright(c) 2009-2012  Realtek Corporation.
  *
  * 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
diff --git a/drivers/net/wireless/rtlwifi/rtl8192cu/led.c b/drivers/net/wireless/rtlwifi/rtl8192cu/led.c
index 2ff9d8314e7b..75a2deb23af1 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192cu/led.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192cu/led.c
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2009-2010  Realtek Corporation. All rights reserved.
+ * Copyright(c) 2009-2012  Realtek 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
@@ -47,8 +47,8 @@ void rtl92cu_sw_led_on(struct ieee80211_hw *hw, struct rtl_led *pled)
         u8 ledcfg;
         struct rtl_priv *rtlpriv = rtl_priv(hw);
 
-        RT_TRACE(rtlpriv, COMP_LED, DBG_LOUD,
-                 ("LedAddr:%X ledpin=%d\n", REG_LEDCFG2, pled->ledpin));
+        RT_TRACE(rtlpriv, COMP_LED, DBG_LOUD, "LedAddr:%X ledpin=%d\n",
+                 REG_LEDCFG2, pled->ledpin);
         ledcfg = rtl_read_byte(rtlpriv, REG_LEDCFG2);
         switch (pled->ledpin) {
         case LED_PIN_GPIO0:
@@ -62,7 +62,7 @@ void rtl92cu_sw_led_on(struct ieee80211_hw *hw, struct rtl_led *pled)
                 break;
         default:
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("switch case not process\n"));
+                         "switch case not processed\n");
                 break;
         }
         pled->ledon = true;
@@ -74,8 +74,8 @@ void rtl92cu_sw_led_off(struct ieee80211_hw *hw, struct rtl_led *pled)
         struct rtl_usb_priv *usbpriv = rtl_usbpriv(hw);
         u8 ledcfg;
 
-        RT_TRACE(rtlpriv, COMP_LED, DBG_LOUD,
-                 ("LedAddr:%X ledpin=%d\n", REG_LEDCFG2, pled->ledpin));
+        RT_TRACE(rtlpriv, COMP_LED, DBG_LOUD, "LedAddr:%X ledpin=%d\n",
+                 REG_LEDCFG2, pled->ledpin);
         ledcfg = rtl_read_byte(rtlpriv, REG_LEDCFG2);
         switch (pled->ledpin) {
         case LED_PIN_GPIO0:
@@ -95,7 +95,7 @@ void rtl92cu_sw_led_off(struct ieee80211_hw *hw, struct rtl_led *pled)
                 break;
         default:
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("switch case not process\n"));
+                         "switch case not processed\n");
                 break;
         }
         pled->ledon = false;
@@ -136,7 +136,6 @@ void rtl92cu_led_control(struct ieee80211_hw *hw,
              ledaction == LED_CTL_POWER_ON)) {
                 return;
         }
-        RT_TRACE(rtlpriv, COMP_LED, DBG_LOUD, ("ledaction %d,\n",
-                                ledaction));
+        RT_TRACE(rtlpriv, COMP_LED, DBG_LOUD, "ledaction %d\n", ledaction);
         _rtl92cu_sw_led_control(hw, ledaction);
 }
diff --git a/drivers/net/wireless/rtlwifi/rtl8192cu/led.h b/drivers/net/wireless/rtlwifi/rtl8192cu/led.h
index decaee4d1eb1..0f372278b7af 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192cu/led.h
+++ b/drivers/net/wireless/rtlwifi/rtl8192cu/led.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2009-2010  Realtek Corporation. All rights reserved.
+ * Copyright(c) 2009-2012  Realtek 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
diff --git a/drivers/net/wireless/rtlwifi/rtl8192cu/mac.c b/drivers/net/wireless/rtlwifi/rtl8192cu/mac.c
index 9e0c8fcdf90f..025bdc2eba44 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192cu/mac.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192cu/mac.c
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2009-2010  Realtek Corporation. All rights reserved.
+ * Copyright(c) 2009-2012  Realtek 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
@@ -27,10 +27,6 @@
  *
 ****************************************************************************/
 
-#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-
-#include <linux/module.h>
-
 #include "../wifi.h"
 #include "../pci.h"
 #include "../usb.h"
@@ -44,6 +40,8 @@
 #include "mac.h"
 #include "trx.h"
 
+#include <linux/module.h>
+
 /* macro to shorten lines */
 
 #define LINK_Q  ui_link_quality
@@ -57,6 +55,7 @@ void rtl92c_read_chip_version(struct ieee80211_hw *hw)
         struct rtl_phy *rtlphy = &(rtlpriv->phy);
         struct rtl_hal *rtlhal = rtl_hal(rtlpriv);
         enum version_8192c chip_version = VERSION_UNKNOWN;
+        const char *versionid;
         u32 value32;
 
         value32 = rtl_read_dword(rtlpriv, REG_SYS_CFG);
@@ -84,88 +83,69 @@ void rtl92c_read_chip_version(struct ieee80211_hw *hw)
                 }
         }
         rtlhal->version  = (enum version_8192c)chip_version;
-        pr_info("rtl8192cu: Chip version 0x%x\n", chip_version);
+        pr_info("Chip version 0x%x\n", chip_version);
         switch (rtlhal->version) {
         case VERSION_NORMAL_TSMC_CHIP_92C_1T2R:
-                RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                 ("Chip Version ID: VERSION_B_CHIP_92C.\n"));
+                versionid = "NORMAL_B_CHIP_92C";
                 break;
         case VERSION_NORMAL_TSMC_CHIP_92C:
-                RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                        ("Chip Version ID: VERSION_NORMAL_TSMC_CHIP_92C.\n"));
+                versionid = "NORMAL_TSMC_CHIP_92C";
                 break;
         case VERSION_NORMAL_TSMC_CHIP_88C:
-                RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                        ("Chip Version ID: VERSION_NORMAL_TSMC_CHIP_88C.\n"));
+                versionid = "NORMAL_TSMC_CHIP_88C";
                 break;
         case VERSION_NORMAL_UMC_CHIP_92C_1T2R_A_CUT:
-                RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                        ("Chip Version ID: VERSION_NORMAL_UMC_CHIP_i"
-                        "92C_1T2R_A_CUT.\n"));
+                versionid = "NORMAL_UMC_CHIP_i92C_1T2R_A_CUT";
                 break;
         case VERSION_NORMAL_UMC_CHIP_92C_A_CUT:
-                RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                        ("Chip Version ID: VERSION_NORMAL_UMC_CHIP_"
-                        "92C_A_CUT.\n"));
+                versionid = "NORMAL_UMC_CHIP_92C_A_CUT";
                 break;
         case VERSION_NORMAL_UMC_CHIP_88C_A_CUT:
-                RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                        ("Chip Version ID: VERSION_NORMAL_UMC_CHIP"
-                        "_88C_A_CUT.\n"));
+                versionid = "NORMAL_UMC_CHIP_88C_A_CUT";
                 break;
         case VERSION_NORMAL_UMC_CHIP_92C_1T2R_B_CUT:
-                RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                        ("Chip Version ID: VERSION_NORMAL_UMC_CHIP"
-                        "_92C_1T2R_B_CUT.\n"));
+                versionid = "NORMAL_UMC_CHIP_92C_1T2R_B_CUT";
                 break;
         case VERSION_NORMAL_UMC_CHIP_92C_B_CUT:
-                RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                        ("Chip Version ID: VERSION_NORMAL_UMC_CHIP"
-                        "_92C_B_CUT.\n"));
+                versionid = "NORMAL_UMC_CHIP_92C_B_CUT";
                 break;
         case VERSION_NORMAL_UMC_CHIP_88C_B_CUT:
-                RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                        ("Chip Version ID: VERSION_NORMAL_UMC_CHIP"
-                        "_88C_B_CUT.\n"));
+                versionid = "NORMAL_UMC_CHIP_88C_B_CUT";
                 break;
         case VERSION_NORMA_UMC_CHIP_8723_1T1R_A_CUT:
-                RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                        ("Chip Version ID: VERSION_NORMA_UMC_CHIP"
-                        "_8723_1T1R_A_CUT.\n"));
+                versionid = "NORMAL_UMC_CHIP_8723_1T1R_A_CUT";
                 break;
         case VERSION_NORMA_UMC_CHIP_8723_1T1R_B_CUT:
-                RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                        ("Chip Version ID: VERSION_NORMA_UMC_CHIP"
-                        "_8723_1T1R_B_CUT.\n"));
+                versionid = "NORMAL_UMC_CHIP_8723_1T1R_B_CUT";
                 break;
         case VERSION_TEST_CHIP_92C:
-                RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                        ("Chip Version ID: VERSION_TEST_CHIP_92C.\n"));
+                versionid = "TEST_CHIP_92C";
                 break;
         case VERSION_TEST_CHIP_88C:
-                RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                        ("Chip Version ID: VERSION_TEST_CHIP_88C.\n"));
+                versionid = "TEST_CHIP_88C";
                 break;
         default:
-                RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                        ("Chip Version ID: ???????????????.\n"));
+                versionid = "UNKNOWN";
                 break;
         }
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
+                 "Chip Version ID: %s\n", versionid);
+
         if (IS_92C_SERIAL(rtlhal->version))
                 rtlphy->rf_type =
                          (IS_92C_1T2R(rtlhal->version)) ? RF_1T2R : RF_2T2R;
         else
                 rtlphy->rf_type = RF_1T1R;
         RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
-                 ("Chip RF Type: %s\n", (rtlphy->rf_type == RF_2T2R) ?
-                  "RF_2T2R" : "RF_1T1R"));
+                 "Chip RF Type: %s\n",
+                 rtlphy->rf_type == RF_2T2R ? "RF_2T2R" : "RF_1T1R");
         if (get_rf_type(rtlphy) == RF_1T1R)
                 rtlpriv->dm.rfpath_rxenable[0] = true;
         else
                 rtlpriv->dm.rfpath_rxenable[0] =
                     rtlpriv->dm.rfpath_rxenable[1] = true;
-        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, ("VersionID = 0x%4x\n",
-                                                rtlhal->version));
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "VersionID = 0x%4x\n",
+                 rtlhal->version);
 }
 
 /**
@@ -192,9 +172,8 @@ bool rtl92c_llt_write(struct ieee80211_hw *hw, u32 address, u32 data)
                         break;
                 if (count > POLLING_LLT_THRESHOLD) {
                         RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                                 ("Failed to polling write LLT done at"
-                                 " address %d! _LLT_OP_VALUE(%x)\n",
-                                 address, _LLT_OP_VALUE(value)));
+                                 "Failed to polling write LLT done at address %d! _LLT_OP_VALUE(%x)\n",
+                                 address, _LLT_OP_VALUE(value));
                         status = false;
                         break;
                 }
@@ -272,7 +251,7 @@ void rtl92c_set_key(struct ieee80211_hw *hw, u32 key_index,
                 u8 cam_offset = 0;
                 u8 clear_number = 5;
 
-                RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG, ("clear_all\n"));
+                RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG, "clear_all\n");
                 for (idx = 0; idx < clear_number; idx++) {
                         rtl_cam_mark_invalid(hw, cam_offset + idx);
                         rtl_cam_empty_entry(hw, cam_offset + idx);
@@ -298,7 +277,7 @@ void rtl92c_set_key(struct ieee80211_hw *hw, u32 key_index,
                         break;
                 default:
                         RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                                ("iillegal switch case\n"));
+                                 "illegal switch case\n");
                         enc_algo = CAM_TKIP;
                         break;
                 }
@@ -317,26 +296,26 @@ void rtl92c_set_key(struct ieee80211_hw *hw, u32 key_index,
                 }
                 if (rtlpriv->sec.key_len[key_index] == 0) {
                         RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,
-                                 ("delete one entry\n"));
+                                 "delete one entry\n");
                         rtl_cam_delete_one_entry(hw, p_macaddr, entry_id);
                 } else {
                         RT_TRACE(rtlpriv, COMP_SEC, DBG_LOUD,
-                                 ("The insert KEY length is %d\n",
-                                  rtlpriv->sec.key_len[PAIRWISE_KEYIDX]));
+                                 "The insert KEY length is %d\n",
+                                 rtlpriv->sec.key_len[PAIRWISE_KEYIDX]);
                         RT_TRACE(rtlpriv, COMP_SEC, DBG_LOUD,
-                                 ("The insert KEY  is %x %x\n",
-                                  rtlpriv->sec.key_buf[0][0],
-                                  rtlpriv->sec.key_buf[0][1]));
+                                 "The insert KEY is %x %x\n",
+                                 rtlpriv->sec.key_buf[0][0],
+                                 rtlpriv->sec.key_buf[0][1]);
                         RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,
-                                 ("add one entry\n"));
+                                 "add one entry\n");
                         if (is_pairwise) {
                                 RT_PRINT_DATA(rtlpriv, COMP_SEC, DBG_LOUD,
-                                              "Pairwiase Key content :",
+                                              "Pairwise Key content",
                                               rtlpriv->sec.pairwise_key,
                                               rtlpriv->sec.
                                               key_len[PAIRWISE_KEYIDX]);
                                 RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,
-                                         ("set Pairwiase key\n"));
+                                         "set Pairwise key\n");
 
                                 rtl_cam_add_one_entry(hw, macaddr, key_index,
                                                 entry_id, enc_algo,
@@ -345,7 +324,7 @@ void rtl92c_set_key(struct ieee80211_hw *hw, u32 key_index,
                                                 key_buf[key_index]);
                         } else {
                                 RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,
-                                         ("set group key\n"));
+                                         "set group key\n");
                                 if (mac->opmode == NL80211_IFTYPE_ADHOC) {
                                         rtl_cam_add_one_entry(hw,
                                                 rtlefuse->dev_addr,
@@ -421,8 +400,8 @@ void rtl92c_set_qos(struct ieee80211_hw *hw, int aci)
             AC_PARAM_ECW_MAX_OFFSET;
         u4b_ac_param |= (u32) le16_to_cpu(mac->ac[aci].tx_op) <<
                          AC_PARAM_TXOP_OFFSET;
-        RT_TRACE(rtlpriv, COMP_QOS, DBG_LOUD,
-                 ("queue:%x, ac_param:%x\n", aci, u4b_ac_param));
+        RT_TRACE(rtlpriv, COMP_QOS, DBG_LOUD, "queue:%x, ac_param:%x\n",
+                 aci, u4b_ac_param);
         switch (aci) {
         case AC1_BK:
                 rtl_write_dword(rtlpriv, REG_EDCA_BK_PARAM, u4b_ac_param);
@@ -437,7 +416,7 @@ void rtl92c_set_qos(struct ieee80211_hw *hw, int aci)
                 rtl_write_dword(rtlpriv, REG_EDCA_VO_PARAM, u4b_ac_param);
                 break;
         default:
-                RT_ASSERT(false, ("invalid aci: %d !\n", aci));
+                RT_ASSERT(false, "invalid aci: %d !\n", aci);
                 break;
         }
 }
@@ -453,14 +432,14 @@ void rtl92c_set_mac_addr(struct ieee80211_hw *hw, const u8 *addr)
         for (i = 0 ; i < ETH_ALEN ; i++)
                 rtl_write_byte(rtlpriv, (REG_MACID + i), *(addr+i));
 
-        RT_TRACE(rtlpriv, COMP_CMD, DBG_DMESG, ("MAC Address: %02X-%02X-%02X-"
-                "%02X-%02X-%02X\n",
-                rtl_read_byte(rtlpriv, REG_MACID),
-                rtl_read_byte(rtlpriv, REG_MACID+1),
-                rtl_read_byte(rtlpriv, REG_MACID+2),
-                rtl_read_byte(rtlpriv, REG_MACID+3),
-                rtl_read_byte(rtlpriv, REG_MACID+4),
-                rtl_read_byte(rtlpriv, REG_MACID+5)));
+        RT_TRACE(rtlpriv, COMP_CMD, DBG_DMESG,
+                 "MAC Address: %02X-%02X-%02X-%02X-%02X-%02X\n",
+                 rtl_read_byte(rtlpriv, REG_MACID),
+                 rtl_read_byte(rtlpriv, REG_MACID+1),
+                 rtl_read_byte(rtlpriv, REG_MACID+2),
+                 rtl_read_byte(rtlpriv, REG_MACID+3),
+                 rtl_read_byte(rtlpriv, REG_MACID+4),
+                 rtl_read_byte(rtlpriv, REG_MACID+5));
 }
 
 void rtl92c_init_driver_info_size(struct ieee80211_hw *hw, u8 size)
@@ -478,26 +457,26 @@ int rtl92c_set_network_type(struct ieee80211_hw *hw, enum nl80211_iftype type)
         case NL80211_IFTYPE_UNSPECIFIED:
                 value = NT_NO_LINK;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
-                        ("Set Network type to NO LINK!\n"));
+                         "Set Network type to NO LINK!\n");
                 break;
         case NL80211_IFTYPE_ADHOC:
                 value = NT_LINK_AD_HOC;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
-                        ("Set Network type to Ad Hoc!\n"));
+                         "Set Network type to Ad Hoc!\n");
                 break;
         case NL80211_IFTYPE_STATION:
                 value = NT_LINK_AP;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
-                        ("Set Network type to STA!\n"));
+                         "Set Network type to STA!\n");
                 break;
         case NL80211_IFTYPE_AP:
                 value = NT_AS_AP;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
-                        ("Set Network type to AP!\n"));
+                         "Set Network type to AP!\n");
                 break;
         default:
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
-                        ("Network type %d not support!\n", type));
+                         "Network type %d not supported!\n", type);
                 return -EOPNOTSUPP;
         }
         rtl_write_byte(rtlpriv, (REG_CR + 2), value);
diff --git a/drivers/net/wireless/rtlwifi/rtl8192cu/mac.h b/drivers/net/wireless/rtlwifi/rtl8192cu/mac.h
index 626d88e88e26..bf53652e4edd 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192cu/mac.h
+++ b/drivers/net/wireless/rtlwifi/rtl8192cu/mac.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2009-2010  Realtek Corporation. All rights reserved.
+ * Copyright(c) 2009-2012  Realtek 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
diff --git a/drivers/net/wireless/rtlwifi/rtl8192cu/phy.c b/drivers/net/wireless/rtlwifi/rtl8192cu/phy.c
index e49cf2244c75..8ac3bcca4d41 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192cu/phy.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192cu/phy.c
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2009-2010  Realtek Corporation.
+ * Copyright(c) 2009-2012  Realtek Corporation.
  *
  * 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
@@ -44,9 +44,9 @@ u32 rtl92cu_phy_query_rf_reg(struct ieee80211_hw *hw,
         u32 original_value, readback_value, bitshift;
         struct rtl_phy *rtlphy = &(rtlpriv->phy);
 
-        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE, ("regaddr(%#x), "
-                                               "rfpath(%#x), bitmask(%#x)\n",
-                                               regaddr, rfpath, bitmask));
+        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
+                 "regaddr(%#x), rfpath(%#x), bitmask(%#x)\n",
+                 regaddr, rfpath, bitmask);
         if (rtlphy->rf_mode != RF_OP_BY_FW) {
                 original_value = _rtl92c_phy_rf_serial_read(hw,
                                                             rfpath, regaddr);
@@ -57,9 +57,8 @@ u32 rtl92cu_phy_query_rf_reg(struct ieee80211_hw *hw,
         bitshift = _rtl92c_phy_calculate_bit_shift(bitmask);
         readback_value = (original_value & bitmask) >> bitshift;
         RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
-                 ("regaddr(%#x), rfpath(%#x), "
-                  "bitmask(%#x), original_value(%#x)\n",
-                  regaddr, rfpath, bitmask, original_value));
+                 "regaddr(%#x), rfpath(%#x), bitmask(%#x), original_value(%#x)\n",
+                 regaddr, rfpath, bitmask, original_value);
         return readback_value;
 }
 
@@ -72,8 +71,8 @@ void rtl92cu_phy_set_rf_reg(struct ieee80211_hw *hw,
         u32 original_value, bitshift;
 
         RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
-                 ("regaddr(%#x), bitmask(%#x), data(%#x), rfpath(%#x)\n",
-                  regaddr, bitmask, data, rfpath));
+                 "regaddr(%#x), bitmask(%#x), data(%#x), rfpath(%#x)\n",
+                 regaddr, bitmask, data, rfpath);
         if (rtlphy->rf_mode != RF_OP_BY_FW) {
                 if (bitmask != RFREG_OFFSET_MASK) {
                         original_value = _rtl92c_phy_rf_serial_read(hw,
@@ -97,9 +96,9 @@ void rtl92cu_phy_set_rf_reg(struct ieee80211_hw *hw,
                 }
                 _rtl92c_phy_fw_rf_serial_write(hw, rfpath, regaddr, data);
         }
-        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE, ("regaddr(%#x), "
-                                               "bitmask(%#x), data(%#x), rfpath(%#x)\n",
-                                               regaddr, bitmask, data, rfpath));
+        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
+                 "regaddr(%#x), bitmask(%#x), data(%#x), rfpath(%#x)\n",
+                 regaddr, bitmask, data, rfpath);
 }
 
 bool rtl92cu_phy_mac_config(struct ieee80211_hw *hw)
@@ -152,11 +151,10 @@ bool _rtl92cu_phy_config_mac_with_headerfile(struct ieee80211_hw *hw)
         u32 arraylength;
         u32 *ptrarray;
 
-        RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, ("Read Rtl819XMACPHY_Array\n"));
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, "Read Rtl819XMACPHY_Array\n");
         arraylength =  rtlphy->hwparam_tables[MAC_REG].length ;
         ptrarray = rtlphy->hwparam_tables[MAC_REG].pdata;
-        RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                 ("Img:RTL8192CEMAC_2T_ARRAY\n"));
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, "Img:RTL8192CEMAC_2T_ARRAY\n");
         for (i = 0; i < arraylength; i = i + 2)
                 rtl_write_byte(rtlpriv, ptrarray[i], (u8) ptrarray[i + 1]);
         return true;
@@ -202,10 +200,9 @@ bool _rtl92cu_phy_config_bb_with_headerfile(struct ieee80211_hw *hw,
                                       phy_regarray_table[i + 1]);
                         udelay(1);
                         RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                                 ("The phy_regarray_table[0] is %x"
-                                  " Rtl819XPHY_REGArray[1] is %x\n",
-                                  phy_regarray_table[i],
-                                  phy_regarray_table[i + 1]));
+                                 "The phy_regarray_table[0] is %x Rtl819XPHY_REGArray[1] is %x\n",
+                                 phy_regarray_table[i],
+                                 phy_regarray_table[i + 1]);
                 }
         } else if (configtype == BASEBAND_CONFIG_AGC_TAB) {
                 for (i = 0; i < agctab_arraylen; i = i + 2) {
@@ -213,10 +210,9 @@ bool _rtl92cu_phy_config_bb_with_headerfile(struct ieee80211_hw *hw,
                                       agctab_array_table[i + 1]);
                         udelay(1);
                         RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                                 ("The agctab_array_table[0] is "
-                                  "%x Rtl819XPHY_REGArray[1] is %x\n",
-                                  agctab_array_table[i],
-                                  agctab_array_table[i + 1]));
+                                 "The agctab_array_table[0] is %x Rtl819XPHY_REGArray[1] is %x\n",
+                                 agctab_array_table[i],
+                                 agctab_array_table[i + 1]);
                 }
         }
         return true;
@@ -255,7 +251,7 @@ bool _rtl92cu_phy_config_bb_with_pgheaderfile(struct ieee80211_hw *hw,
                 }
         } else {
                 RT_TRACE(rtlpriv, COMP_SEND, DBG_TRACE,
-                         ("configtype != BaseBand_Config_PHY_REG\n"));
+                         "configtype != BaseBand_Config_PHY_REG\n");
         }
         return true;
 }
@@ -277,20 +273,20 @@ bool rtl92cu_phy_config_rf_with_headerfile(struct ieee80211_hw *hw,
                 radiob_arraylen = rtlphy->hwparam_tables[RADIOB_2T].length;
                 radiob_array_table = rtlphy->hwparam_tables[RADIOB_2T].pdata;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                         ("Radio_A:RTL8192CERADIOA_2TARRAY\n"));
+                         "Radio_A:RTL8192CERADIOA_2TARRAY\n");
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                         ("Radio_B:RTL8192CE_RADIOB_2TARRAY\n"));
+                         "Radio_B:RTL8192CE_RADIOB_2TARRAY\n");
         } else {
                 radioa_arraylen = rtlphy->hwparam_tables[RADIOA_1T].length;
                 radioa_array_table = rtlphy->hwparam_tables[RADIOA_1T].pdata;
                 radiob_arraylen = rtlphy->hwparam_tables[RADIOB_1T].length;
                 radiob_array_table = rtlphy->hwparam_tables[RADIOB_1T].pdata;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                         ("Radio_A:RTL8192CE_RADIOA_1TARRAY\n"));
+                         "Radio_A:RTL8192CE_RADIOA_1TARRAY\n");
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                         ("Radio_B:RTL8192CE_RADIOB_1TARRAY\n"));
+                         "Radio_B:RTL8192CE_RADIOB_1TARRAY\n");
         }
-        RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, ("Radio No %x\n", rfpath));
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, "Radio No %x\n", rfpath);
         switch (rfpath) {
         case RF90_PATH_A:
                 for (i = 0; i < radioa_arraylen; i = i + 2) {
@@ -338,11 +334,11 @@ bool rtl92cu_phy_config_rf_with_headerfile(struct ieee80211_hw *hw,
                 break;
         case RF90_PATH_C:
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("switch case not process\n"));
+                         "switch case not processed\n");
                 break;
         case RF90_PATH_D:
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("switch case not process\n"));
+                         "switch case not processed\n");
                 break;
         }
         return true;
@@ -357,10 +353,9 @@ void rtl92cu_phy_set_bw_mode_callback(struct ieee80211_hw *hw)
         u8 reg_bw_opmode;
         u8 reg_prsr_rsc;
 
-        RT_TRACE(rtlpriv, COMP_SCAN, DBG_TRACE,
-                 ("Switch to %s bandwidth\n",
-                  rtlphy->current_chan_bw == HT_CHANNEL_WIDTH_20 ?
-                  "20MHz" : "40MHz"))
+        RT_TRACE(rtlpriv, COMP_SCAN, DBG_TRACE, "Switch to %s bandwidth\n",
+                 rtlphy->current_chan_bw == HT_CHANNEL_WIDTH_20 ?
+                 "20MHz" : "40MHz");
         if (is_hal_stop(rtlhal)) {
                 rtlphy->set_bwmode_inprogress = false;
                 return;
@@ -381,7 +376,7 @@ void rtl92cu_phy_set_bw_mode_callback(struct ieee80211_hw *hw)
                 break;
         default:
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("unknown bandwidth: %#X\n", rtlphy->current_chan_bw));
+                         "unknown bandwidth: %#X\n", rtlphy->current_chan_bw);
                 break;
         }
         switch (rtlphy->current_chan_bw) {
@@ -403,12 +398,12 @@ void rtl92cu_phy_set_bw_mode_callback(struct ieee80211_hw *hw)
                 break;
         default:
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("unknown bandwidth: %#X\n", rtlphy->current_chan_bw));
+                         "unknown bandwidth: %#X\n", rtlphy->current_chan_bw);
                 break;
         }
         rtl92cu_phy_rf6052_set_bandwidth(hw, rtlphy->current_chan_bw);
         rtlphy->set_bwmode_inprogress = false;
-        RT_TRACE(rtlpriv, COMP_SCAN, DBG_TRACE, ("<==\n"));
+        RT_TRACE(rtlpriv, COMP_SCAN, DBG_TRACE, "<==\n");
 }
 
 void rtl92cu_bb_block_on(struct ieee80211_hw *hw)
@@ -480,7 +475,7 @@ static bool _rtl92cu_phy_set_rf_power_state(struct ieee80211_hw *hw,
                         do {
                                 InitializeCount++;
                                 RT_TRACE(rtlpriv, COMP_RF, DBG_DMESG,
-                                         ("IPS Set eRf nic enable\n"));
+                                         "IPS Set eRf nic enable\n");
                                 rtstatus = rtl_ps_enable_nic(hw);
                         } while ((rtstatus != true)
                                  && (InitializeCount < 10));
@@ -488,10 +483,9 @@ static bool _rtl92cu_phy_set_rf_power_state(struct ieee80211_hw *hw,
                                           RT_RF_OFF_LEVL_HALT_NIC);
                 } else {
                         RT_TRACE(rtlpriv, COMP_RF, DBG_DMESG,
-                                 ("Set ERFON sleeped:%d ms\n",
-                                  jiffies_to_msecs(jiffies -
-                                                   ppsc->
-                                                   last_sleep_jiffies)));
+                                 "Set ERFON sleeped:%d ms\n",
+                                 jiffies_to_msecs(jiffies -
+                                                  ppsc->last_sleep_jiffies));
                         ppsc->last_awake_jiffies = jiffies;
                         rtl92ce_phy_set_rf_on(hw);
                 }
@@ -513,27 +507,25 @@ static bool _rtl92cu_phy_set_rf_power_state(struct ieee80211_hw *hw,
                                 continue;
                         } else {
                                 RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
-                                         ("eRf Off/Sleep: %d times "
-                                          "TcbBusyQueue[%d] "
-                                          "=%d before doze!\n", (i + 1),
-                                          queue_id,
-                                          skb_queue_len(&ring->queue)));
+                                         "eRf Off/Sleep: %d times TcbBusyQueue[%d] =%d before doze!\n",
+                                         i + 1,
+                                         queue_id,
+                                         skb_queue_len(&ring->queue));
                                 udelay(10);
                                 i++;
                         }
                         if (i >= MAX_DOZE_WAITING_TIMES_9x) {
                                 RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
-                                         ("\nERFOFF: %d times "
-                                          "TcbBusyQueue[%d] = %d !\n",
-                                          MAX_DOZE_WAITING_TIMES_9x,
-                                          queue_id,
-                                          skb_queue_len(&ring->queue)));
+                                         "ERFOFF: %d times TcbBusyQueue[%d] = %d !\n",
+                                         MAX_DOZE_WAITING_TIMES_9x,
+                                         queue_id,
+                                         skb_queue_len(&ring->queue));
                                 break;
                         }
                 }
                 if (ppsc->reg_rfps_level & RT_RF_OFF_LEVL_HALT_NIC) {
                         RT_TRACE(rtlpriv, COMP_RF, DBG_DMESG,
-                                 ("IPS Set eRf nic disable\n"));
+                                 "IPS Set eRf nic disable\n");
                         rtl_ps_disable_nic(hw);
                         RT_SET_PS_LEVEL(ppsc, RT_RF_OFF_LEVL_HALT_NIC);
                 } else {
@@ -557,33 +549,30 @@ static bool _rtl92cu_phy_set_rf_power_state(struct ieee80211_hw *hw,
                                 continue;
                         } else {
                                 RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
-                                         ("eRf Off/Sleep: %d times "
-                                          "TcbBusyQueue[%d] =%d before "
-                                          "doze!\n", (i + 1), queue_id,
-                                          skb_queue_len(&ring->queue)));
+                                         "eRf Off/Sleep: %d times TcbBusyQueue[%d] =%d before doze!\n",
+                                         i + 1, queue_id,
+                                         skb_queue_len(&ring->queue));
                                 udelay(10);
                                 i++;
                         }
                         if (i >= MAX_DOZE_WAITING_TIMES_9x) {
                                 RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
-                                         ("\n ERFSLEEP: %d times "
-                                          "TcbBusyQueue[%d] = %d !\n",
-                                          MAX_DOZE_WAITING_TIMES_9x,
-                                          queue_id,
-                                          skb_queue_len(&ring->queue)));
+                                         "ERFSLEEP: %d times TcbBusyQueue[%d] = %d !\n",
+                                         MAX_DOZE_WAITING_TIMES_9x,
+                                         queue_id,
+                                         skb_queue_len(&ring->queue));
                                 break;
                         }
                 }
                 RT_TRACE(rtlpriv, COMP_RF, DBG_DMESG,
-                         ("Set ERFSLEEP awaked:%d ms\n",
-                          jiffies_to_msecs(jiffies -
-                                           ppsc->last_awake_jiffies)));
+                         "Set ERFSLEEP awaked:%d ms\n",
+                         jiffies_to_msecs(jiffies - ppsc->last_awake_jiffies));
                 ppsc->last_sleep_jiffies = jiffies;
                 _rtl92c_phy_set_rf_sleep(hw);
                 break;
         default:
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("switch case not process\n"));
+                         "switch case not processed\n");
                 bresult = false;
                 break;
         }
diff --git a/drivers/net/wireless/rtlwifi/rtl8192cu/phy.h b/drivers/net/wireless/rtlwifi/rtl8192cu/phy.h
index ff81a61729d7..42b068660483 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192cu/phy.h
+++ b/drivers/net/wireless/rtlwifi/rtl8192cu/phy.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2009-2010  Realtek Corporation.
+ * Copyright(c) 2009-2012  Realtek Corporation.
  *
  * 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
diff --git a/drivers/net/wireless/rtlwifi/rtl8192cu/reg.h b/drivers/net/wireless/rtlwifi/rtl8192cu/reg.h
index 7f1be614c998..8b81465c629b 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192cu/reg.h
+++ b/drivers/net/wireless/rtlwifi/rtl8192cu/reg.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2009-2010  Realtek Corporation.
+ * Copyright(c) 2009-2012  Realtek Corporation.
  *
  * 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
diff --git a/drivers/net/wireless/rtlwifi/rtl8192cu/rf.c b/drivers/net/wireless/rtlwifi/rtl8192cu/rf.c
index 1e851aae58db..780c0d98a836 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192cu/rf.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192cu/rf.c
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2009-2010  Realtek Corporation.
+ * Copyright(c) 2009-2012  Realtek Corporation.
  *
  * 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
@@ -56,7 +56,7 @@ void rtl92cu_phy_rf6052_set_bandwidth(struct ieee80211_hw *hw, u8 bandwidth)
                 break;
         default:
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("unknown bandwidth: %#X\n", bandwidth));
+                         "unknown bandwidth: %#X\n", bandwidth);
                 break;
         }
 }
@@ -140,26 +140,26 @@ void rtl92cu_phy_rf6052_set_cck_txpower(struct ieee80211_hw *hw,
         rtl_set_bbreg(hw, RTXAGC_A_CCK1_MCS32, MASKBYTE1, tmpval);
 
         RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
-                ("CCK PWR 1M (rf-A) = 0x%x (reg 0x%x)\n", tmpval,
-                 RTXAGC_A_CCK1_MCS32));
+                "CCK PWR 1M (rf-A) = 0x%x (reg 0x%x)\n",
+                tmpval, RTXAGC_A_CCK1_MCS32);
 
         tmpval = tx_agc[RF90_PATH_A] >> 8;
         if (mac->mode == WIRELESS_MODE_B)
                 tmpval = tmpval & 0xff00ffff;
         rtl_set_bbreg(hw, RTXAGC_B_CCK11_A_CCK2_11, 0xffffff00, tmpval);
         RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
-                ("CCK PWR 2~11M (rf-A) = 0x%x (reg 0x%x)\n", tmpval,
-                 RTXAGC_B_CCK11_A_CCK2_11));
+                "CCK PWR 2~11M (rf-A) = 0x%x (reg 0x%x)\n",
+                tmpval, RTXAGC_B_CCK11_A_CCK2_11);
         tmpval = tx_agc[RF90_PATH_B] >> 24;
         rtl_set_bbreg(hw, RTXAGC_B_CCK11_A_CCK2_11, MASKBYTE0, tmpval);
         RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
-                ("CCK PWR 11M (rf-B) = 0x%x (reg 0x%x)\n", tmpval,
-                 RTXAGC_B_CCK11_A_CCK2_11));
+                "CCK PWR 11M (rf-B) = 0x%x (reg 0x%x)\n",
+                tmpval, RTXAGC_B_CCK11_A_CCK2_11);
         tmpval = tx_agc[RF90_PATH_B] & 0x00ffffff;
         rtl_set_bbreg(hw, RTXAGC_B_CCK1_55_MCS32, 0xffffff00, tmpval);
         RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
-                ("CCK PWR 1~5.5M (rf-B) = 0x%x (reg 0x%x)\n", tmpval,
-                 RTXAGC_B_CCK1_55_MCS32));
+                "CCK PWR 1~5.5M (rf-B) = 0x%x (reg 0x%x)\n",
+                tmpval, RTXAGC_B_CCK1_55_MCS32);
 }
 
 static void rtl92c_phy_get_power_base(struct ieee80211_hw *hw,
@@ -181,8 +181,8 @@ static void rtl92c_phy_get_power_base(struct ieee80211_hw *hw,
                     (powerBase0 << 8) | powerBase0;
                 *(ofdmbase + i) = powerBase0;
                 RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
-                        (" [OFDM power base index rf(%c) = 0x%x]\n",
-                         ((i == 0) ? 'A' : 'B'), *(ofdmbase + i)));
+                        " [OFDM power base index rf(%c) = 0x%x]\n",
+                        i == 0 ? 'A' : 'B', *(ofdmbase + i));
         }
         for (i = 0; i < 2; i++) {
                 if (rtlphy->current_chan_bw == HT_CHANNEL_WIDTH_20) {
@@ -194,8 +194,8 @@ static void rtl92c_phy_get_power_base(struct ieee80211_hw *hw,
                     (powerBase1 << 16) | (powerBase1 << 8) | powerBase1;
                 *(mcsbase + i) = powerBase1;
                 RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
-                        (" [MCS power base index rf(%c) = 0x%x]\n",
-                         ((i == 0) ? 'A' : 'B'), *(mcsbase + i)));
+                        " [MCS power base index rf(%c) = 0x%x]\n",
+                        i == 0 ? 'A' : 'B', *(mcsbase + i));
         }
 }
 
@@ -219,8 +219,8 @@ static void _rtl92c_get_txpower_writeval_by_regulatory(struct ieee80211_hw *hw,
                             [chnlgroup][index + (rf ? 8 : 0)]
                             + ((index < 2) ? powerBase0[rf] : powerBase1[rf]);
                         RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
-                                ("RTK better performance,writeVal(%c) = 0x%x\n",
-                                ((rf == 0) ? 'A' : 'B'), writeVal));
+                                "RTK better performance,writeVal(%c) = 0x%x\n",
+                                rf == 0 ? 'A' : 'B', writeVal);
                         break;
                 case 1:
                         if (rtlphy->pwrgroup_cnt == 1)
@@ -244,32 +244,31 @@ static void _rtl92c_get_txpower_writeval_by_regulatory(struct ieee80211_hw *hw,
                                         ((index < 2) ? powerBase0[rf] :
                                         powerBase1[rf]);
                         RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
-                                ("Realtek regulatory, 20MHz, "
-                                "writeVal(%c) = 0x%x\n",
-                                ((rf == 0) ? 'A' : 'B'), writeVal));
+                                "Realtek regulatory, 20MHz, writeVal(%c) = 0x%x\n",
+                                rf == 0 ? 'A' : 'B', writeVal);
                         break;
                 case 2:
                         writeVal = ((index < 2) ? powerBase0[rf] :
                                    powerBase1[rf]);
                         RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
-                                ("Better regulatory,writeVal(%c) = 0x%x\n",
-                                 ((rf == 0) ? 'A' : 'B'), writeVal));
+                                "Better regulatory,writeVal(%c) = 0x%x\n",
+                                rf == 0 ? 'A' : 'B', writeVal);
                         break;
                 case 3:
                         chnlgroup = 0;
                         if (rtlphy->current_chan_bw ==
                             HT_CHANNEL_WIDTH_20_40) {
                                 RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
-                                        ("customer's limit, 40MHzrf(%c) = "
-                                        "0x%x\n", ((rf == 0) ? 'A' : 'B'),
+                                        "customer's limit, 40MHzrf(%c) = 0x%x\n",
+                                        rf == 0 ? 'A' : 'B',
                                         rtlefuse->pwrgroup_ht40[rf]
-                                        [channel - 1]));
+                                        [channel - 1]);
                         } else {
                                 RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
-                                        ("customer's limit, 20MHz rf(%c) = "
-                                        "0x%x\n", ((rf == 0) ? 'A' : 'B'),
+                                        "customer's limit, 20MHz rf(%c) = 0x%x\n",
+                                        rf == 0 ? 'A' : 'B',
                                         rtlefuse->pwrgroup_ht20[rf]
-                                        [channel - 1]));
+                                        [channel - 1]);
                         }
                         for (i = 0; i < 4; i++) {
                                 pwr_diff_limit[i] =
@@ -297,22 +296,22 @@ static void _rtl92c_get_txpower_writeval_by_regulatory(struct ieee80211_hw *hw,
                             (pwr_diff_limit[2] << 16) |
                             (pwr_diff_limit[1] << 8) | (pwr_diff_limit[0]);
                         RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
-                                ("Customer's limit rf(%c) = 0x%x\n",
-                                 ((rf == 0) ? 'A' : 'B'), customer_limit));
+                                "Customer's limit rf(%c) = 0x%x\n",
+                                rf == 0 ? 'A' : 'B', customer_limit);
                         writeVal = customer_limit + ((index < 2) ?
                                    powerBase0[rf] : powerBase1[rf]);
                         RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
-                                ("Customer, writeVal rf(%c)= 0x%x\n",
-                                 ((rf == 0) ? 'A' : 'B'), writeVal));
+                                "Customer, writeVal rf(%c)= 0x%x\n",
+                                rf == 0 ? 'A' : 'B', writeVal);
                         break;
                 default:
                         chnlgroup = 0;
                         writeVal = rtlphy->mcs_txpwrlevel_origoffset[chnlgroup]
                                    [index + (rf ? 8 : 0)] + ((index < 2) ?
                                    powerBase0[rf] : powerBase1[rf]);
-                        RTPRINT(rtlpriv, FPHY, PHY_TXPWR, ("RTK better "
-                                "performance, writeValrf(%c) = 0x%x\n",
-                                ((rf == 0) ? 'A' : 'B'), writeVal));
+                        RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
+                                "RTK better performance, writeValrf(%c) = 0x%x\n",
+                                rf == 0 ? 'A' : 'B', writeVal);
                         break;
                 }
                 if (rtlpriv->dm.dynamic_txhighpower_lvl ==
@@ -365,7 +364,7 @@ static void _rtl92c_write_ofdm_power_reg(struct ieee80211_hw *hw,
                         regoffset = regoffset_b[index];
                 rtl_set_bbreg(hw, regoffset, MASKDWORD, writeVal);
                 RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
-                        ("Set 0x%x = %08x\n", regoffset, writeVal));
+                        "Set 0x%x = %08x\n", regoffset, writeVal);
                 if (((get_rf_type(rtlphy) == RF_2T2R) &&
                      (regoffset == RTXAGC_A_MCS15_MCS12 ||
                       regoffset == RTXAGC_B_MCS15_MCS12)) ||
@@ -482,11 +481,11 @@ static bool _rtl92c_phy_rf6052_config_parafile(struct ieee80211_hw *hw)
                 }
                 if (rtstatus != true) {
                         RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                                 ("Radio[%d] Fail!!", rfpath));
+                                 "Radio[%d] Fail!!", rfpath);
                         goto phy_rf_cfg_fail;
                 }
         }
-        RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, ("<---\n"));
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, "<---\n");
         return rtstatus;
 phy_rf_cfg_fail:
         return rtstatus;
diff --git a/drivers/net/wireless/rtlwifi/rtl8192cu/rf.h b/drivers/net/wireless/rtlwifi/rtl8192cu/rf.h
index 500a2094b6bb..090fd33a158d 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192cu/rf.h
+++ b/drivers/net/wireless/rtlwifi/rtl8192cu/rf.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2009-2010  Realtek Corporation.
+ * Copyright(c) 2009-2012  Realtek Corporation.
  *
  * 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
diff --git a/drivers/net/wireless/rtlwifi/rtl8192cu/sw.c b/drivers/net/wireless/rtlwifi/rtl8192cu/sw.c
index 6d2ca773bbc7..82c85286ab2e 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192cu/sw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192cu/sw.c
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2009-2010  Realtek Corporation. All rights reserved.
+ * Copyright(c) 2009-2012  Realtek 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
@@ -41,7 +41,6 @@
 #include "trx.h"
 #include "led.h"
 #include "hw.h"
-#include <linux/vmalloc.h>
 #include <linux/module.h>
 
 MODULE_AUTHOR("Georgia          <georgia@realtek.com>");
@@ -54,7 +53,6 @@ MODULE_FIRMWARE("rtlwifi/rtl8192cufw.bin");
 static int rtl92cu_init_sw_vars(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
-        const struct firmware *firmware;
         int err;
 
         rtlpriv->dm.dm_initialgain_enable = true;
@@ -62,29 +60,21 @@ static int rtl92cu_init_sw_vars(struct ieee80211_hw *hw)
         rtlpriv->dm.disable_framebursting = false;
         rtlpriv->dm.thermalvalue = 0;
         rtlpriv->dbg.global_debuglevel = rtlpriv->cfg->mod_params->debug;
-        rtlpriv->rtlhal.pfirmware = vmalloc(0x4000);
+
+        /* for firmware buf */
+        rtlpriv->rtlhal.pfirmware = vzalloc(0x4000);
         if (!rtlpriv->rtlhal.pfirmware) {
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("Can't alloc buffer for fw.\n"));
+                         "Can't alloc buffer for fw\n");
                 return 1;
         }
-        /* request fw */
-        err = request_firmware(&firmware, rtlpriv->cfg->fw_name,
-                        rtlpriv->io.dev);
-        if (err) {
-                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("Failed to request firmware!\n"));
-                return 1;
-        }
-        if (firmware->size > 0x4000) {
-                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("Firmware is too big!\n"));
-                release_firmware(firmware);
-                return 1;
-        }
-        memcpy(rtlpriv->rtlhal.pfirmware, firmware->data, firmware->size);
-        rtlpriv->rtlhal.fwsize = firmware->size;
-        release_firmware(firmware);
+
+        pr_info("Loading firmware %s\n", rtlpriv->cfg->fw_name);
+        rtlpriv->max_fw_size = 0x4000;
+        err = request_firmware_nowait(THIS_MODULE, 1,
+                                      rtlpriv->cfg->fw_name, rtlpriv->io.dev,
+                                      GFP_KERNEL, hw, rtl_fw_cb);
+
 
         return 0;
 }
diff --git a/drivers/net/wireless/rtlwifi/rtl8192cu/sw.h b/drivers/net/wireless/rtlwifi/rtl8192cu/sw.h
index 43b1177924ab..a1310abd0d54 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192cu/sw.h
+++ b/drivers/net/wireless/rtlwifi/rtl8192cu/sw.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2009-2010  Realtek Corporation. All rights reserved.
+ * Copyright(c) 2009-2012  Realtek 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
diff --git a/drivers/net/wireless/rtlwifi/rtl8192cu/table.c b/drivers/net/wireless/rtlwifi/rtl8192cu/table.c
index d57ef5e88a9e..966be519edb8 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192cu/table.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192cu/table.c
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2009-2010  Realtek Corporation.
+ * Copyright(c) 2009-2012  Realtek Corporation.
  *
  * 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
diff --git a/drivers/net/wireless/rtlwifi/rtl8192cu/table.h b/drivers/net/wireless/rtlwifi/rtl8192cu/table.h
index c3d5cd826cfa..4b020e9e30b1 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192cu/table.h
+++ b/drivers/net/wireless/rtlwifi/rtl8192cu/table.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2009-2010  Realtek Corporation. All rights reserved.
+ * Copyright(c) 2009-2012  Realtek 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
diff --git a/drivers/net/wireless/rtlwifi/rtl8192cu/trx.c b/drivers/net/wireless/rtlwifi/rtl8192cu/trx.c
index b3cc7b949992..21bc827c5fa6 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192cu/trx.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192cu/trx.c
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2009-2010  Realtek Corporation. All rights reserved.
+ * Copyright(c) 2009-2012  Realtek 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
@@ -108,7 +108,7 @@ static void _TwoOutEpMapping(struct ieee80211_hw *hw, bool bIsChipB,
 
         if (bwificfg) { /* for WMM */
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
-                         ("USB Chip-B & WMM Setting.....\n"));
+                         "USB Chip-B & WMM Setting.....\n");
                 ep_map->ep_mapping[RTL_TXQ_BE]  = 2;
                 ep_map->ep_mapping[RTL_TXQ_BK]  = 3;
                 ep_map->ep_mapping[RTL_TXQ_VI]  = 3;
@@ -118,7 +118,7 @@ static void _TwoOutEpMapping(struct ieee80211_hw *hw, bool bIsChipB,
                 ep_map->ep_mapping[RTL_TXQ_HI]  = 2;
         } else { /* typical setting */
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
-                         ("USB typical Setting.....\n"));
+                         "USB typical Setting.....\n");
                 ep_map->ep_mapping[RTL_TXQ_BE]  = 3;
                 ep_map->ep_mapping[RTL_TXQ_BK]  = 3;
                 ep_map->ep_mapping[RTL_TXQ_VI]  = 2;
@@ -135,7 +135,7 @@ static void _ThreeOutEpMapping(struct ieee80211_hw *hw, bool  bwificfg,
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         if (bwificfg) { /* for WMM */
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
-                         ("USB 3EP Setting for WMM.....\n"));
+                         "USB 3EP Setting for WMM.....\n");
                 ep_map->ep_mapping[RTL_TXQ_BE]  = 5;
                 ep_map->ep_mapping[RTL_TXQ_BK]  = 3;
                 ep_map->ep_mapping[RTL_TXQ_VI]  = 3;
@@ -145,7 +145,7 @@ static void _ThreeOutEpMapping(struct ieee80211_hw *hw, bool  bwificfg,
                 ep_map->ep_mapping[RTL_TXQ_HI]  = 2;
         } else { /* typical setting */
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
-                         ("USB 3EP Setting for typical.....\n"));
+                         "USB 3EP Setting for typical.....\n");
                 ep_map->ep_mapping[RTL_TXQ_BE]  = 5;
                 ep_map->ep_mapping[RTL_TXQ_BK]  = 5;
                 ep_map->ep_mapping[RTL_TXQ_VI]  = 3;
@@ -244,8 +244,8 @@ u16 rtl8192cu_mq_to_hwq(__le16 fc, u16 mac80211_queue_index)
                 break;
         default:
                 hw_queue_index = RTL_TXQ_BE;
-                RT_ASSERT(false, ("QSLT_BE queue, skb_queue:%d\n",
-                          mac80211_queue_index));
+                RT_ASSERT(false, "QSLT_BE queue, skb_queue:%d\n",
+                          mac80211_queue_index);
                 break;
         }
 out:
@@ -270,23 +270,23 @@ static enum rtl_desc_qsel _rtl8192cu_mq_to_descq(struct ieee80211_hw *hw,
         case 0: /* VO */
                 qsel = QSLT_VO;
                 RT_TRACE(rtlpriv, COMP_USB, DBG_DMESG,
-                         ("VO queue, set qsel = 0x%x\n", QSLT_VO));
+                         "VO queue, set qsel = 0x%x\n", QSLT_VO);
                 break;
         case 1: /* VI */
                 qsel = QSLT_VI;
                 RT_TRACE(rtlpriv, COMP_USB, DBG_DMESG,
-                         ("VI queue, set qsel = 0x%x\n", QSLT_VI));
+                         "VI queue, set qsel = 0x%x\n", QSLT_VI);
                 break;
         case 3: /* BK */
                 qsel = QSLT_BK;
                 RT_TRACE(rtlpriv, COMP_USB, DBG_DMESG,
-                         ("BK queue, set qsel = 0x%x\n", QSLT_BK));
+                         "BK queue, set qsel = 0x%x\n", QSLT_BK);
                 break;
         case 2: /* BE */
         default:
                 qsel = QSLT_BE;
                 RT_TRACE(rtlpriv, COMP_USB, DBG_DMESG,
-                         ("BE queue, set qsel = 0x%x\n", QSLT_BE));
+                         "BE queue, set qsel = 0x%x\n", QSLT_BE);
                 break;
         }
 out:
@@ -422,17 +422,17 @@ static void _rtl_rx_process(struct ieee80211_hw *hw, struct sk_buff *skb)
         bv = ieee80211_is_probe_resp(fc);
         if (bv)
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
-                         ("Got probe response frame.\n"));
+                         "Got probe response frame\n");
         if (ieee80211_is_beacon(fc))
-                RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
-                         ("Got beacon frame.\n"));
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "Got beacon frame\n");
         if (ieee80211_is_data(fc))
-                RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, ("Got data frame.\n"));
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "Got data frame\n");
         RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
-                 ("Fram: fc = 0x%X addr1 = 0x%02X:0x%02X:0x%02X:0x%02X:0x%02X:"
-                 "0x%02X\n", fc, (u32)hdr->addr1[0], (u32)hdr->addr1[1],
-                 (u32)hdr->addr1[2], (u32)hdr->addr1[3], (u32)hdr->addr1[4],
-                 (u32)hdr->addr1[5]));
+                 "Fram: fc = 0x%X addr1 = 0x%02X:0x%02X:0x%02X:0x%02X:0x%02X:0x%02X\n",
+                 fc,
+                 (u32)hdr->addr1[0], (u32)hdr->addr1[1],
+                 (u32)hdr->addr1[2], (u32)hdr->addr1[3],
+                 (u32)hdr->addr1[4], (u32)hdr->addr1[5]);
         memcpy(IEEE80211_SKB_RXCB(skb), rx_status, sizeof(*rx_status));
         ieee80211_rx_irqsafe(hw, skb);
 }
@@ -594,7 +594,7 @@ void rtl92cu_tx_fill_desc(struct ieee80211_hw *hw,
         if (ieee80211_is_data_qos(fc)) {
                 if (mac->rdg_en) {
                         RT_TRACE(rtlpriv, COMP_SEND, DBG_TRACE,
-                                 ("Enable RDG function.\n"));
+                                 "Enable RDG function\n");
                         SET_TX_DESC_RDG_ENABLE(txdesc, 1);
                         SET_TX_DESC_HTC(txdesc, 1);
                 }
@@ -620,7 +620,7 @@ void rtl92cu_tx_fill_desc(struct ieee80211_hw *hw,
                 SET_TX_DESC_BMC(txdesc, 1);
         _rtl_fill_usb_tx_desc(txdesc);
         _rtl_tx_desc_checksum(txdesc);
-        RT_TRACE(rtlpriv, COMP_SEND, DBG_TRACE, (" %s ==>\n", __func__));
+        RT_TRACE(rtlpriv, COMP_SEND, DBG_TRACE, "==>\n");
 }
 
 void rtl92cu_fill_fake_txdesc(struct ieee80211_hw *hw, u8 * pDesc,
@@ -677,7 +677,7 @@ void rtl92cu_tx_fill_cmddesc(struct ieee80211_hw *hw,
                 SET_TX_DESC_HWSEQ_EN(pdesc, 1);
                 SET_TX_DESC_PKT_ID(pdesc, 8);
         }
-        RT_PRINT_DATA(rtlpriv, COMP_CMD, DBG_LOUD, "H2C Tx Cmd Content\n",
+        RT_PRINT_DATA(rtlpriv, COMP_CMD, DBG_LOUD, "H2C Tx Cmd Content",
                       pdesc, RTL_TX_DESC_SIZE);
 }
 
diff --git a/drivers/net/wireless/rtlwifi/rtl8192cu/trx.h b/drivers/net/wireless/rtlwifi/rtl8192cu/trx.h
index 53de5f66e242..332b06e78b00 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192cu/trx.h
+++ b/drivers/net/wireless/rtlwifi/rtl8192cu/trx.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2009-2010  Realtek Corporation. All rights reserved.
+ * Copyright(c) 2009-2012  Realtek 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
diff --git a/drivers/net/wireless/rtlwifi/rtl8192de/def.h b/drivers/net/wireless/rtlwifi/rtl8192de/def.h
index 946304771748..eafdf76ed64d 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192de/def.h
+++ b/drivers/net/wireless/rtlwifi/rtl8192de/def.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2009-2010  Realtek Corporation.
+ * Copyright(c) 2009-2012  Realtek Corporation.
  *
  * 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
diff --git a/drivers/net/wireless/rtlwifi/rtl8192de/dm.c b/drivers/net/wireless/rtlwifi/rtl8192de/dm.c
index 3cd0736fe8e1..181ed6fc90e6 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192de/dm.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192de/dm.c
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2009-2010  Realtek Corporation.
+ * Copyright(c) 2009-2012  Realtek Corporation.
  *
  * 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
@@ -246,23 +246,21 @@ static void rtl92d_dm_false_alarm_counter_statistics(struct ieee80211_hw *hw)
                 rtl_set_bbreg(hw, RCCK0_FALSEALARMREPORT, 0x0000c000, 2);
                 rtl92d_release_cckandrw_pagea_ctl(hw, &flag);
         }
-        RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD, ("Cnt_Fast_Fsync_fail = %x, "
-                 "Cnt_SB_Search_fail = %x\n",
+        RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD,
+                 "Cnt_Fast_Fsync_fail = %x, Cnt_SB_Search_fail = %x\n",
                  falsealm_cnt->cnt_fast_fsync_fail,
-                 falsealm_cnt->cnt_sb_search_fail));
-        RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD, ("Cnt_Parity_Fail = %x, "
-                 "Cnt_Rate_Illegal = %x, Cnt_Crc8_fail = %x, "
-                 "Cnt_Mcs_fail = %x\n",
+                 falsealm_cnt->cnt_sb_search_fail);
+        RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD,
+                 "Cnt_Parity_Fail = %x, Cnt_Rate_Illegal = %x, Cnt_Crc8_fail = %x, Cnt_Mcs_fail = %x\n",
                  falsealm_cnt->cnt_parity_fail,
                  falsealm_cnt->cnt_rate_illegal,
                  falsealm_cnt->cnt_crc8_fail,
-                 falsealm_cnt->cnt_mcs_fail));
+                 falsealm_cnt->cnt_mcs_fail);
         RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD,
-                 ("Cnt_Ofdm_fail = %x, " "Cnt_Cck_fail = %x, "
-                 "Cnt_all = %x\n",
+                 "Cnt_Ofdm_fail = %x, Cnt_Cck_fail = %x, Cnt_all = %x\n",
                  falsealm_cnt->cnt_ofdm_fail,
                  falsealm_cnt->cnt_cck_fail,
-                 falsealm_cnt->cnt_all));
+                 falsealm_cnt->cnt_all);
 }
 
 static void rtl92d_dm_find_minimum_rssi(struct ieee80211_hw *hw)
@@ -275,7 +273,7 @@ static void rtl92d_dm_find_minimum_rssi(struct ieee80211_hw *hw)
             (rtlpriv->dm.UNDEC_SM_PWDB == 0)) {
                 de_digtable.min_undecorated_pwdb_for_dm = 0;
                 RT_TRACE(rtlpriv, COMP_BB_POWERSAVING, DBG_LOUD,
-                         ("Not connected to any\n"));
+                         "Not connected to any\n");
         }
         if (mac->link_state >= MAC80211_LINKED) {
                 if (mac->opmode == NL80211_IFTYPE_AP ||
@@ -283,25 +281,25 @@ static void rtl92d_dm_find_minimum_rssi(struct ieee80211_hw *hw)
                         de_digtable.min_undecorated_pwdb_for_dm =
                             rtlpriv->dm.UNDEC_SM_PWDB;
                         RT_TRACE(rtlpriv, COMP_BB_POWERSAVING, DBG_LOUD,
-                                 ("AP Client PWDB = 0x%lx\n",
-                                  rtlpriv->dm.UNDEC_SM_PWDB));
+                                 "AP Client PWDB = 0x%lx\n",
+                                 rtlpriv->dm.UNDEC_SM_PWDB);
                 } else {
                         de_digtable.min_undecorated_pwdb_for_dm =
                             rtlpriv->dm.undecorated_smoothed_pwdb;
                         RT_TRACE(rtlpriv, COMP_BB_POWERSAVING, DBG_LOUD,
-                                 ("STA Default Port PWDB = 0x%x\n",
-                                  de_digtable.min_undecorated_pwdb_for_dm));
+                                 "STA Default Port PWDB = 0x%x\n",
+                                 de_digtable.min_undecorated_pwdb_for_dm);
                 }
         } else {
                 de_digtable.min_undecorated_pwdb_for_dm =
                     rtlpriv->dm.UNDEC_SM_PWDB;
                 RT_TRACE(rtlpriv, COMP_BB_POWERSAVING, DBG_LOUD,
-                         ("AP Ext Port or disconnet PWDB = 0x%x\n",
-                          de_digtable.min_undecorated_pwdb_for_dm));
+                         "AP Ext Port or disconnet PWDB = 0x%x\n",
+                         de_digtable.min_undecorated_pwdb_for_dm);
         }
 
-        RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD, ("MinUndecoratedPWDBForDM =%d\n",
-                        de_digtable.min_undecorated_pwdb_for_dm));
+        RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD, "MinUndecoratedPWDBForDM =%d\n",
+                 de_digtable.min_undecorated_pwdb_for_dm);
 }
 
 static void rtl92d_dm_cck_packet_detection_thresh(struct ieee80211_hw *hw)
@@ -340,14 +338,14 @@ static void rtl92d_dm_cck_packet_detection_thresh(struct ieee80211_hw *hw)
                 }
                 de_digtable.pre_cck_pd_state = de_digtable.cur_cck_pd_state;
         }
-        RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD, ("CurSTAConnectState=%s\n",
-                 (de_digtable.cursta_connectctate == DIG_STA_CONNECT ?
-                 "DIG_STA_CONNECT " : "DIG_STA_DISCONNECT")));
-        RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD, ("CCKPDStage=%s\n",
-                 (de_digtable.cur_cck_pd_state == CCK_PD_STAGE_LOWRSSI ?
-                 "Low RSSI " : "High RSSI ")));
-        RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD, ("is92d single phy =%x\n",
-                 IS_92D_SINGLEPHY(rtlpriv->rtlhal.version)));
+        RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD, "CurSTAConnectState=%s\n",
+                 de_digtable.cursta_connectctate == DIG_STA_CONNECT ?
+                 "DIG_STA_CONNECT " : "DIG_STA_DISCONNECT");
+        RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD, "CCKPDStage=%s\n",
+                 de_digtable.cur_cck_pd_state == CCK_PD_STAGE_LOWRSSI ?
+                 "Low RSSI " : "High RSSI ");
+        RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD, "is92d single phy =%x\n",
+                 IS_92D_SINGLEPHY(rtlpriv->rtlhal.version));
 
 }
 
@@ -355,12 +353,12 @@ void rtl92d_dm_write_dig(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
 
-        RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD, ("cur_igvalue = 0x%x, "
-                 "pre_igvalue = 0x%x, backoff_val = %d\n",
+        RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD,
+                 "cur_igvalue = 0x%x, pre_igvalue = 0x%x, backoff_val = %d\n",
                  de_digtable.cur_igvalue, de_digtable.pre_igvalue,
-                 de_digtable.backoff_val));
+                 de_digtable.backoff_val);
         if (de_digtable.dig_enable_flag == false) {
-                RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD, ("DIG is disabled\n"));
+                RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD, "DIG is disabled\n");
                 de_digtable.pre_igvalue = 0x17;
                 return;
         }
@@ -377,22 +375,21 @@ static void rtl92d_early_mode_enabled(struct rtl_priv *rtlpriv)
 {
         if ((rtlpriv->mac80211.link_state >= MAC80211_LINKED) &&
             (rtlpriv->mac80211.vendor == PEER_CISCO)) {
-                RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD,
-                         ("IOT_PEER = CISCO\n"));
+                RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD, "IOT_PEER = CISCO\n");
                 if (de_digtable.last_min_undecorated_pwdb_for_dm >= 50
                     && de_digtable.min_undecorated_pwdb_for_dm < 50) {
                         rtl_write_byte(rtlpriv, REG_EARLY_MODE_CONTROL, 0x00);
                         RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD,
-                                 ("Early Mode Off\n"));
+                                 "Early Mode Off\n");
                 } else if (de_digtable.last_min_undecorated_pwdb_for_dm <= 55 &&
                            de_digtable.min_undecorated_pwdb_for_dm > 55) {
                         rtl_write_byte(rtlpriv, REG_EARLY_MODE_CONTROL, 0x0f);
                         RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD,
-                                 ("Early Mode On\n"));
+                                 "Early Mode On\n");
                 }
         } else if (!(rtl_read_byte(rtlpriv, REG_EARLY_MODE_CONTROL) & 0xf)) {
                 rtl_write_byte(rtlpriv, REG_EARLY_MODE_CONTROL, 0x0f);
-                RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD, ("Early Mode On\n"));
+                RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD, "Early Mode On\n");
         }
 }
 
@@ -402,7 +399,7 @@ static void rtl92d_dm_dig(struct ieee80211_hw *hw)
         u8 value_igi = de_digtable.cur_igvalue;
         struct false_alarm_statistics *falsealm_cnt = &(rtlpriv->falsealm_cnt);
 
-        RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD, ("==>\n"));
+        RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD, "==>\n");
         if (rtlpriv->rtlhal.earlymode_enable) {
                 rtl92d_early_mode_enabled(rtlpriv);
                 de_digtable.last_min_undecorated_pwdb_for_dm =
@@ -421,7 +418,7 @@ static void rtl92d_dm_dig(struct ieee80211_hw *hw)
         /* Not STA mode return tmp */
         if (rtlpriv->mac80211.opmode != NL80211_IFTYPE_STATION)
                 return;
-        RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD, ("progress\n"));
+        RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD, "progress\n");
         /* Decide the current status and if modify initial gain or not */
         if (rtlpriv->mac80211.link_state >= MAC80211_LINKED)
                 de_digtable.cursta_connectctate = DIG_STA_CONNECT;
@@ -438,16 +435,16 @@ static void rtl92d_dm_dig(struct ieee80211_hw *hw)
         else if (falsealm_cnt->cnt_all >= DM_DIG_FA_TH2)
                 value_igi += 2;
         RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD,
-                 ("dm_DIG() Before: large_fa_hit=%d, forbidden_igi=%x\n",
-                 de_digtable.large_fa_hit, de_digtable.forbidden_igi));
+                 "dm_DIG() Before: large_fa_hit=%d, forbidden_igi=%x\n",
+                 de_digtable.large_fa_hit, de_digtable.forbidden_igi);
         RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD,
-                 ("dm_DIG() Before: Recover_cnt=%d, rx_gain_range_min=%x\n",
-                 de_digtable.recover_cnt, de_digtable.rx_gain_range_min));
+                 "dm_DIG() Before: Recover_cnt=%d, rx_gain_range_min=%x\n",
+                 de_digtable.recover_cnt, de_digtable.rx_gain_range_min);
 
         /* deal with abnorally large false alarm */
         if (falsealm_cnt->cnt_all > 10000) {
                 RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD,
-                         ("dm_DIG(): Abnornally false alarm case.\n"));
+                         "dm_DIG(): Abnormally false alarm case\n");
 
                 de_digtable.large_fa_hit++;
                 if (de_digtable.forbidden_igi < de_digtable.cur_igvalue) {
@@ -486,11 +483,11 @@ static void rtl92d_dm_dig(struct ieee80211_hw *hw)
                 }
         }
         RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD,
-                 ("dm_DIG() After: large_fa_hit=%d, forbidden_igi=%x\n",
-                  de_digtable.large_fa_hit, de_digtable.forbidden_igi));
+                 "dm_DIG() After: large_fa_hit=%d, forbidden_igi=%x\n",
+                 de_digtable.large_fa_hit, de_digtable.forbidden_igi);
         RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD,
-                 ("dm_DIG() After: recover_cnt=%d, rx_gain_range_min=%x\n",
-                  de_digtable.recover_cnt, de_digtable.rx_gain_range_min));
+                 "dm_DIG() After: recover_cnt=%d, rx_gain_range_min=%x\n",
+                 de_digtable.recover_cnt, de_digtable.rx_gain_range_min);
 
         if (value_igi > DM_DIG_MAX)
                 value_igi = DM_DIG_MAX;
@@ -500,7 +497,7 @@ static void rtl92d_dm_dig(struct ieee80211_hw *hw)
         rtl92d_dm_write_dig(hw);
         if (rtlpriv->rtlhal.current_bandtype != BAND_ON_5G)
                 rtl92d_dm_cck_packet_detection_thresh(hw);
-        RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD, ("<<==\n"));
+        RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD, "<<==\n");
 }
 
 static void rtl92d_dm_init_dynamic_txpower(struct ieee80211_hw *hw)
@@ -528,7 +525,7 @@ static void rtl92d_dm_dynamic_txpower(struct ieee80211_hw *hw)
         if ((mac->link_state < MAC80211_LINKED) &&
             (rtlpriv->dm.UNDEC_SM_PWDB == 0)) {
                 RT_TRACE(rtlpriv, COMP_POWER, DBG_TRACE,
-                         ("Not connected to any\n"));
+                         "Not connected to any\n");
                 rtlpriv->dm.dynamic_txhighpower_lvl = TXHIGHPWRLEVEL_NORMAL;
                 rtlpriv->dm.last_dtp_lvl = TXHIGHPWRLEVEL_NORMAL;
                 return;
@@ -538,40 +535,40 @@ static void rtl92d_dm_dynamic_txpower(struct ieee80211_hw *hw)
                         undecorated_smoothed_pwdb =
                             rtlpriv->dm.UNDEC_SM_PWDB;
                         RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
-                                 ("IBSS Client PWDB = 0x%lx\n",
-                                  undecorated_smoothed_pwdb));
+                                 "IBSS Client PWDB = 0x%lx\n",
+                                 undecorated_smoothed_pwdb);
                 } else {
                         undecorated_smoothed_pwdb =
                             rtlpriv->dm.undecorated_smoothed_pwdb;
                         RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
-                                 ("STA Default Port PWDB = 0x%lx\n",
-                                  undecorated_smoothed_pwdb));
+                                 "STA Default Port PWDB = 0x%lx\n",
+                                 undecorated_smoothed_pwdb);
                 }
         } else {
                 undecorated_smoothed_pwdb =
                     rtlpriv->dm.UNDEC_SM_PWDB;
 
                 RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
-                         ("AP Ext Port PWDB = 0x%lx\n",
-                          undecorated_smoothed_pwdb));
+                         "AP Ext Port PWDB = 0x%lx\n",
+                         undecorated_smoothed_pwdb);
         }
         if (rtlhal->current_bandtype == BAND_ON_5G) {
                 if (undecorated_smoothed_pwdb >= 0x33) {
                         rtlpriv->dm.dynamic_txhighpower_lvl =
                                                  TXHIGHPWRLEVEL_LEVEL2;
                         RT_TRACE(rtlpriv, COMP_HIPWR, DBG_LOUD,
-                                 ("5G:TxHighPwrLevel_Level2 (TxPwr=0x0)\n"));
+                                 "5G:TxHighPwrLevel_Level2 (TxPwr=0x0)\n");
                 } else if ((undecorated_smoothed_pwdb < 0x33)
                            && (undecorated_smoothed_pwdb >= 0x2b)) {
                         rtlpriv->dm.dynamic_txhighpower_lvl =
                                                  TXHIGHPWRLEVEL_LEVEL1;
                         RT_TRACE(rtlpriv, COMP_HIPWR, DBG_LOUD,
-                                 ("5G:TxHighPwrLevel_Level1 (TxPwr=0x10)\n"));
+                                 "5G:TxHighPwrLevel_Level1 (TxPwr=0x10)\n");
                 } else if (undecorated_smoothed_pwdb < 0x2b) {
                         rtlpriv->dm.dynamic_txhighpower_lvl =
                                                  TXHIGHPWRLEVEL_NORMAL;
                         RT_TRACE(rtlpriv, COMP_HIPWR, DBG_LOUD,
-                                 ("5G:TxHighPwrLevel_Normal\n"));
+                                 "5G:TxHighPwrLevel_Normal\n");
                 }
         } else {
                 if (undecorated_smoothed_pwdb >=
@@ -579,7 +576,7 @@ static void rtl92d_dm_dynamic_txpower(struct ieee80211_hw *hw)
                         rtlpriv->dm.dynamic_txhighpower_lvl =
                                                  TXHIGHPWRLEVEL_LEVEL2;
                         RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
-                                 ("TXHIGHPWRLEVEL_LEVEL1 (TxPwr=0x0)\n"));
+                                 "TXHIGHPWRLEVEL_LEVEL1 (TxPwr=0x0)\n");
                 } else
                     if ((undecorated_smoothed_pwdb <
                          (TX_POWER_NEAR_FIELD_THRESH_LVL2 - 3))
@@ -589,19 +586,19 @@ static void rtl92d_dm_dynamic_txpower(struct ieee80211_hw *hw)
                         rtlpriv->dm.dynamic_txhighpower_lvl =
                                                  TXHIGHPWRLEVEL_LEVEL1;
                         RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
-                                 ("TXHIGHPWRLEVEL_LEVEL1 (TxPwr=0x10)\n"));
+                                 "TXHIGHPWRLEVEL_LEVEL1 (TxPwr=0x10)\n");
                 } else if (undecorated_smoothed_pwdb <
                            (TX_POWER_NEAR_FIELD_THRESH_LVL1 - 5)) {
                         rtlpriv->dm.dynamic_txhighpower_lvl =
                                                  TXHIGHPWRLEVEL_NORMAL;
                         RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
-                                 ("TXHIGHPWRLEVEL_NORMAL\n"));
+                                 "TXHIGHPWRLEVEL_NORMAL\n");
                 }
         }
         if ((rtlpriv->dm.dynamic_txhighpower_lvl != rtlpriv->dm.last_dtp_lvl)) {
                 RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
-                         ("PHY_SetTxPowerLevel8192S() Channel = %d\n",
-                          rtlphy->current_channel));
+                         "PHY_SetTxPowerLevel8192S() Channel = %d\n",
+                         rtlphy->current_channel);
                 rtl92d_phy_set_txpower_level(hw, rtlphy->current_channel);
         }
         rtlpriv->dm.last_dtp_lvl = rtlpriv->dm.dynamic_txhighpower_lvl;
@@ -717,7 +714,7 @@ static void rtl92d_dm_rxgain_tracking_thermalmeter(struct ieee80211_hw *hw)
         u4tmp = (index_mapping[(rtlpriv->efuse.eeprom_thermalmeter -
                                 rtlpriv->dm.thermalvalue_rxgain)]) << 12;
         RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
-                 ("===> Rx Gain %x\n", u4tmp));
+                 "===> Rx Gain %x\n", u4tmp);
         for (i = RF90_PATH_A; i < rtlpriv->phy.num_total_rfpath; i++)
                 rtl_set_rfreg(hw, i, 0x3C, BRFREGOFFSETMASK,
                               (rtlpriv->phy.reg_rf3c[i] & (~(0xF000))) | u4tmp);
@@ -741,27 +738,22 @@ static void rtl92d_bandtype_2_4G(struct ieee80211_hw *hw, long *temp_cckg,
                         if (!memcmp((void *)&temp_cck,
                             (void *)&cckswing_table_ch14[i][2], 4)) {
                                 *cck_index_old = (u8) i;
-                                RT_TRACE(rtlpriv,
-                                         COMP_POWER_TRACKING,
-                                         DBG_LOUD,
-                                         ("Initial reg0x%x = 0x%lx, "
-                                          "cck_index=0x%x, ch 14 %d\n",
-                                          RCCK0_TXFILTER2,
-                                          temp_cck, *cck_index_old,
-                                          rtlpriv->dm.cck_inch14));
+                                RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
+                                         "Initial reg0x%x = 0x%lx, cck_index=0x%x, ch 14 %d\n",
+                                         RCCK0_TXFILTER2, temp_cck,
+                                         *cck_index_old,
+                                         rtlpriv->dm.cck_inch14);
                                 break;
                         }
                 } else {
                         if (!memcmp((void *) &temp_cck,
                             &cckswing_table_ch1ch13[i][2], 4)) {
                                 *cck_index_old = (u8) i;
-                                RT_TRACE(rtlpriv, COMP_POWER_TRACKING,
-                                         DBG_LOUD,
-                                         ("Initial reg0x%x = 0x%lx, "
-                                         "cck_index = 0x%x, ch14 %d\n",
-                                         RCCK0_TXFILTER2,
-                                         temp_cck, *cck_index_old,
-                                         rtlpriv->dm.cck_inch14));
+                                RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
+                                         "Initial reg0x%x = 0x%lx, cck_index = 0x%x, ch14 %d\n",
+                                         RCCK0_TXFILTER2, temp_cck,
+                                         *cck_index_old,
+                                         rtlpriv->dm.cck_inch14);
                                 break;
                         }
                 }
@@ -884,12 +876,12 @@ static void rtl92d_dm_txpower_tracking_callback_thermalmeter(
         };
 
         rtlpriv->dm.txpower_trackinginit = true;
-        RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD, ("\n"));
+        RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD, "\n");
         thermalvalue = (u8) rtl_get_rfreg(hw, RF90_PATH_A, RF_T_METER, 0xf800);
         RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
-                 ("Readback Thermal Meter = 0x%x pre thermal meter 0x%x "
-                 "eeprom_thermalmeter 0x%x\n", thermalvalue,
-                 rtlpriv->dm.thermalvalue, rtlefuse->eeprom_thermalmeter));
+                 "Readback Thermal Meter = 0x%x pre thermal meter 0x%x eeprom_thermalmeter 0x%x\n",
+                 thermalvalue,
+                 rtlpriv->dm.thermalvalue, rtlefuse->eeprom_thermalmeter);
         rtl92d_phy_ap_calibrate(hw, (thermalvalue -
                                      rtlefuse->eeprom_thermalmeter));
         if (is2t)
@@ -904,10 +896,9 @@ static void rtl92d_dm_txpower_tracking_callback_thermalmeter(
                                 ofdm_index_old[0] = (u8) i;
 
                                 RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
-                                         ("Initial pathA ele_d reg0x%x = 0x%lx,"
-                                         " ofdm_index=0x%x\n",
+                                         "Initial pathA ele_d reg0x%x = 0x%lx, ofdm_index=0x%x\n",
                                          ROFDM0_XATxIQIMBALANCE,
-                                         ele_d, ofdm_index_old[0]));
+                                         ele_d, ofdm_index_old[0]);
                                 break;
                         }
                 }
@@ -920,11 +911,9 @@ static void rtl92d_dm_txpower_tracking_callback_thermalmeter(
                                         ofdm_index_old[1] = (u8) i;
                                         RT_TRACE(rtlpriv, COMP_POWER_TRACKING,
                                                  DBG_LOUD,
-                                                 ("Initial pathB ele_d reg "
-                                                 "0x%x = 0x%lx, ofdm_index "
-                                                 "= 0x%x\n",
+                                                 "Initial pathB ele_d reg 0x%x = 0x%lx, ofdm_index = 0x%x\n",
                                                  ROFDM0_XBTxIQIMBALANCE, ele_d,
-                                                 ofdm_index_old[1]));
+                                                 ofdm_index_old[1]);
                                         break;
                                 }
                         }
@@ -952,7 +941,7 @@ static void rtl92d_dm_txpower_tracking_callback_thermalmeter(
                                 rtlpriv->dm.ofdm_index[i] = ofdm_index_old[i];
                         rtlpriv->dm.cck_index = cck_index_old;
                         RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
-                                 ("reload ofdm index for band switch\n"));
+                                 "reload ofdm index for band switch\n");
                 }
                 rtlpriv->dm.thermalvalue_avg
                             [rtlpriv->dm.thermalvalue_avg_index] = thermalvalue;
@@ -995,12 +984,10 @@ static void rtl92d_dm_txpower_tracking_callback_thermalmeter(
                         (thermalvalue - rtlpriv->dm.thermalvalue_rxgain) :
                         (rtlpriv->dm.thermalvalue_rxgain - thermalvalue);
                 RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
-                         ("Readback Thermal Meter = 0x%x pre thermal meter 0x%x"
-                          " eeprom_thermalmeter 0x%x delta 0x%x "
-                          "delta_lck 0x%x delta_iqk 0x%x\n",
-                          thermalvalue, rtlpriv->dm.thermalvalue,
-                          rtlefuse->eeprom_thermalmeter, delta, delta_lck,
-                          delta_iqk));
+                         "Readback Thermal Meter = 0x%x pre thermal meter 0x%x eeprom_thermalmeter 0x%x delta 0x%x delta_lck 0x%x delta_iqk 0x%x\n",
+                         thermalvalue, rtlpriv->dm.thermalvalue,
+                         rtlefuse->eeprom_thermalmeter, delta, delta_lck,
+                         delta_iqk);
                 if ((delta_lck > rtlefuse->delta_lck) &&
                     (rtlefuse->delta_lck != 0)) {
                         rtlpriv->dm.thermalvalue_lck = thermalvalue;
@@ -1036,17 +1023,15 @@ static void rtl92d_dm_txpower_tracking_callback_thermalmeter(
                         }
                         if (is2t) {
                                 RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
-                                         ("temp OFDM_A_index=0x%x, OFDM_B_index"
-                                         " = 0x%x,cck_index=0x%x\n",
-                                          rtlpriv->dm.ofdm_index[0],
-                                          rtlpriv->dm.ofdm_index[1],
-                                          rtlpriv->dm.cck_index));
+                                         "temp OFDM_A_index=0x%x, OFDM_B_index = 0x%x,cck_index=0x%x\n",
+                                         rtlpriv->dm.ofdm_index[0],
+                                         rtlpriv->dm.ofdm_index[1],
+                                         rtlpriv->dm.cck_index);
                         } else {
                                 RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
-                                         ("temp OFDM_A_index=0x%x,cck_index = "
-                                         "0x%x\n",
-                                          rtlpriv->dm.ofdm_index[0],
-                                                        rtlpriv->dm.cck_index));
+                                         "temp OFDM_A_index=0x%x,cck_index = 0x%x\n",
+                                         rtlpriv->dm.ofdm_index[0],
+                                         rtlpriv->dm.cck_index);
                         }
                         for (i = 0; i < rf; i++) {
                                 if (ofdm_index[i] > OFDM_TABLE_SIZE_92D - 1)
@@ -1070,15 +1055,13 @@ static void rtl92d_dm_txpower_tracking_callback_thermalmeter(
                         }
                         if (is2t) {
                                 RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
-                                         ("new OFDM_A_index=0x%x, OFDM_B_index "
-                                         "= 0x%x, cck_index=0x%x\n",
+                                         "new OFDM_A_index=0x%x, OFDM_B_index = 0x%x, cck_index=0x%x\n",
                                          ofdm_index[0], ofdm_index[1],
-                                         cck_index));
+                                         cck_index);
                         } else {
                                 RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
-                                         ("new OFDM_A_index=0x%x,cck_index = "
-                                         "0x%x\n",
-                                          ofdm_index[0], cck_index));
+                                         "new OFDM_A_index=0x%x,cck_index = 0x%x\n",
+                                         ofdm_index[0], cck_index);
                         }
                         ele_d = (ofdmswing_table[(u8) ofdm_index[0]] &
                                                  0xFFC00000) >> 22;
@@ -1124,12 +1107,10 @@ static void rtl92d_dm_txpower_tracking_callback_thermalmeter(
                         }
 
                         RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
-                                 ("TxPwrTracking for interface %d path A: X ="
-                                 " 0x%lx, Y = 0x%lx ele_A = 0x%lx ele_C = "
-                                 "0x%lx ele_D = 0x%lx 0xe94 = 0x%lx 0xe9c = "
-                                 "0x%lx\n", rtlhal->interfaceindex,
+                                 "TxPwrTracking for interface %d path A: X = 0x%lx, Y = 0x%lx ele_A = 0x%lx ele_C = 0x%lx ele_D = 0x%lx 0xe94 = 0x%lx 0xe9c = 0x%lx\n",
+                                 rtlhal->interfaceindex,
                                  val_x, val_y, ele_a, ele_c, ele_d,
-                                 val_x, val_y));
+                                 val_x, val_y);
 
                         if (rtlhal->current_bandtype == BAND_ON_2_4G) {
                                 /* Adjust CCK according to IQK result */
@@ -1232,20 +1213,16 @@ static void rtl92d_dm_txpower_tracking_callback_thermalmeter(
                                                       BIT(28), 0x00);
                                 }
                                 RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
-                                         ("TxPwrTracking path B: X = 0x%lx, "
-                                         "Y = 0x%lx ele_A = 0x%lx ele_C = 0x"
-                                         "%lx ele_D = 0x%lx 0xeb4 = 0x%lx "
-                                         "0xebc = 0x%lx\n",
-                                          val_x, val_y, ele_a, ele_c,
-                                          ele_d, val_x, val_y));
+                                         "TxPwrTracking path B: X = 0x%lx, Y = 0x%lx ele_A = 0x%lx ele_C = 0x%lx ele_D = 0x%lx 0xeb4 = 0x%lx 0xebc = 0x%lx\n",
+                                         val_x, val_y, ele_a, ele_c,
+                                         ele_d, val_x, val_y);
                         }
                         RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
-                                 ("TxPwrTracking 0xc80 = 0x%x, 0xc94 = "
-                                 "0x%x RF 0x24 = 0x%x\n",
+                                 "TxPwrTracking 0xc80 = 0x%x, 0xc94 = 0x%x RF 0x24 = 0x%x\n",
                                  rtl_get_bbreg(hw, 0xc80, BMASKDWORD),
                                  rtl_get_bbreg(hw, 0xc94, BMASKDWORD),
                                  rtl_get_rfreg(hw, RF90_PATH_A, 0x24,
-                                 BRFREGOFFSETMASK)));
+                                               BRFREGOFFSETMASK));
                 }
                 if ((delta_iqk > rtlefuse->delta_iqk) &&
                     (rtlefuse->delta_iqk != 0)) {
@@ -1262,7 +1239,7 @@ static void rtl92d_dm_txpower_tracking_callback_thermalmeter(
                         rtlpriv->dm.thermalvalue = thermalvalue;
         }
 
-        RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD, ("<===\n"));
+        RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD, "<===\n");
 }
 
 static void rtl92d_dm_initialize_txpower_tracking(struct ieee80211_hw *hw)
@@ -1273,8 +1250,8 @@ static void rtl92d_dm_initialize_txpower_tracking(struct ieee80211_hw *hw)
         rtlpriv->dm.txpower_trackinginit = false;
         rtlpriv->dm.txpower_track_control = true;
         RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
-                 ("pMgntInfo->txpower_tracking = %d\n",
-                 rtlpriv->dm.txpower_tracking));
+                 "pMgntInfo->txpower_tracking = %d\n",
+                 rtlpriv->dm.txpower_tracking);
 }
 
 void rtl92d_dm_check_txpower_tracking_thermal_meter(struct ieee80211_hw *hw)
@@ -1289,12 +1266,12 @@ void rtl92d_dm_check_txpower_tracking_thermal_meter(struct ieee80211_hw *hw)
                 rtl_set_rfreg(hw, RF90_PATH_A, RF_T_METER, BIT(17) |
                               BIT(16), 0x03);
                 RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
-                         ("Trigger 92S Thermal Meter!!\n"));
+                         "Trigger 92S Thermal Meter!!\n");
                 tm_trigger = 1;
                 return;
         } else {
                 RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
-                         ("Schedule TxPowerTracking direct call!!\n"));
+                         "Schedule TxPowerTracking direct call!!\n");
                 rtl92d_dm_txpower_tracking_callback_thermalmeter(hw);
                 tm_trigger = 0;
         }
diff --git a/drivers/net/wireless/rtlwifi/rtl8192de/dm.h b/drivers/net/wireless/rtlwifi/rtl8192de/dm.h
index 69354657f0f5..91030ec8ac3e 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192de/dm.h
+++ b/drivers/net/wireless/rtlwifi/rtl8192de/dm.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2009-2010  Realtek Corporation.
+ * Copyright(c) 2009-2012  Realtek Corporation.
  *
  * 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
diff --git a/drivers/net/wireless/rtlwifi/rtl8192de/fw.c b/drivers/net/wireless/rtlwifi/rtl8192de/fw.c
index 82f060bdbc0b..f548a8d0068d 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192de/fw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192de/fw.c
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2009-2010  Realtek Corporation.
+ * Copyright(c) 2009-2012  Realtek Corporation.
  *
  * 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
@@ -124,14 +124,14 @@ static void _rtl92d_write_fw(struct ieee80211_hw *hw,
         u32 pagenums, remainSize;
         u32 page, offset;
 
-        RT_TRACE(rtlpriv, COMP_FW, DBG_TRACE, ("FW size is %d bytes,\n", size));
+        RT_TRACE(rtlpriv, COMP_FW, DBG_TRACE, "FW size is %d bytes,\n", size);
         if (rtlhal->hw_type == HARDWARE_TYPE_RTL8192DE)
                 _rtl92d_fill_dummy(bufferPtr, &size);
         pagenums = size / FW_8192D_PAGE_SIZE;
         remainSize = size % FW_8192D_PAGE_SIZE;
         if (pagenums > 8) {
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("Page numbers should not greater then 8\n"));
+                         "Page numbers should not greater then 8\n");
         }
         for (page = 0; page < pagenums; page++) {
                 offset = page * FW_8192D_PAGE_SIZE;
@@ -158,12 +158,12 @@ static int _rtl92d_fw_free_to_go(struct ieee80211_hw *hw)
                  (!(value32 & FWDL_ChkSum_rpt)));
         if (counter >= FW_8192D_POLLING_TIMEOUT_COUNT) {
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("chksum report faill ! REG_MCUFWDL:0x%08x .\n",
-                         value32));
+                         "chksum report faill ! REG_MCUFWDL:0x%08x\n",
+                         value32);
                 return -EIO;
         }
         RT_TRACE(rtlpriv, COMP_FW, DBG_TRACE,
-                 ("Checksum report OK ! REG_MCUFWDL:0x%08x .\n", value32));
+                 "Checksum report OK ! REG_MCUFWDL:0x%08x\n", value32);
         value32 = rtl_read_dword(rtlpriv, REG_MCUFWDL);
         value32 |= MCUFWDL_RDY;
         rtl_write_dword(rtlpriv, REG_MCUFWDL, value32);
@@ -186,9 +186,9 @@ void rtl92d_firmware_selfreset(struct ieee80211_hw *hw)
                 udelay(50);
                 u1b_tmp = rtl_read_byte(rtlpriv, REG_SYS_FUNC_EN + 1);
         }
-        RT_ASSERT((delay > 0), ("8051 reset failed!\n"));
+        RT_ASSERT((delay > 0), "8051 reset failed!\n");
         RT_TRACE(rtlpriv, COMP_FW, DBG_DMESG,
-                 ("=====> 8051 reset success (%d) .\n", delay));
+                 "=====> 8051 reset success (%d)\n", delay);
 }
 
 static int _rtl92d_fw_init(struct ieee80211_hw *hw)
@@ -197,7 +197,7 @@ static int _rtl92d_fw_init(struct ieee80211_hw *hw)
         struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
         u32 counter;
 
-        RT_TRACE(rtlpriv, COMP_FW, DBG_DMESG, ("FW already have download\n"));
+        RT_TRACE(rtlpriv, COMP_FW, DBG_DMESG, "FW already have download\n");
         /* polling for FW ready */
         counter = 0;
         do {
@@ -205,10 +205,9 @@ static int _rtl92d_fw_init(struct ieee80211_hw *hw)
                         if (rtl_read_byte(rtlpriv, FW_MAC0_READY) &
                             MAC0_READY) {
                                 RT_TRACE(rtlpriv, COMP_FW, DBG_DMESG,
-                                         ("Polling FW ready success!! "
-                                         "REG_MCUFWDL: 0x%x .\n",
+                                         "Polling FW ready success!! REG_MCUFWDL: 0x%x\n",
                                          rtl_read_byte(rtlpriv,
-                                         FW_MAC0_READY)));
+                                                       FW_MAC0_READY));
                                 return 0;
                         }
                         udelay(5);
@@ -216,10 +215,9 @@ static int _rtl92d_fw_init(struct ieee80211_hw *hw)
                         if (rtl_read_byte(rtlpriv, FW_MAC1_READY) &
                             MAC1_READY) {
                                 RT_TRACE(rtlpriv, COMP_FW, DBG_DMESG,
-                                         ("Polling FW ready success!! "
-                                         "REG_MCUFWDL: 0x%x .\n",
+                                         "Polling FW ready success!! REG_MCUFWDL: 0x%x\n",
                                          rtl_read_byte(rtlpriv,
-                                                       FW_MAC1_READY)));
+                                                       FW_MAC1_READY));
                                 return 0;
                         }
                         udelay(5);
@@ -228,18 +226,16 @@ static int _rtl92d_fw_init(struct ieee80211_hw *hw)
 
         if (rtlhal->interfaceindex == 0) {
                 RT_TRACE(rtlpriv, COMP_FW, DBG_DMESG,
-                         ("Polling FW ready fail!! MAC0 FW init not ready: "
-                         "0x%x .\n",
-                         rtl_read_byte(rtlpriv, FW_MAC0_READY)));
+                         "Polling FW ready fail!! MAC0 FW init not ready: 0x%x\n",
+                         rtl_read_byte(rtlpriv, FW_MAC0_READY));
         } else {
                 RT_TRACE(rtlpriv, COMP_FW, DBG_DMESG,
-                         ("Polling FW ready fail!! MAC1 FW init not ready: "
-                         "0x%x .\n",
-                         rtl_read_byte(rtlpriv, FW_MAC1_READY)));
+                         "Polling FW ready fail!! MAC1 FW init not ready: 0x%x\n",
+                         rtl_read_byte(rtlpriv, FW_MAC1_READY));
         }
         RT_TRACE(rtlpriv, COMP_FW, DBG_DMESG,
-                 ("Polling FW ready fail!! REG_MCUFWDL:0x%08ul .\n",
-                 rtl_read_dword(rtlpriv, REG_MCUFWDL)));
+                 "Polling FW ready fail!! REG_MCUFWDL:0x%08ul\n",
+                 rtl_read_dword(rtlpriv, REG_MCUFWDL));
         return -1;
 }
 
@@ -257,20 +253,20 @@ int rtl92d_download_fw(struct ieee80211_hw *hw)
         bool fw_downloaded = false, fwdl_in_process = false;
         unsigned long flags;
 
-        if (!rtlhal->pfirmware)
+        if (rtlpriv->max_fw_size == 0 || !rtlhal->pfirmware)
                 return 1;
         fwsize = rtlhal->fwsize;
         pfwheader = (u8 *) rtlhal->pfirmware;
         pfwdata = (u8 *) 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, (" FirmwareVersion(%d),"
-                 "FirmwareSubVersion(%d), Signature(%#x)\n",
-                 rtlhal->fw_version,    rtlhal->fw_subversion,
-                 GET_FIRMWARE_HDR_SIGNATURE(pfwheader)));
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
+                 "FirmwareVersion(%d), FirmwareSubVersion(%d), Signature(%#x)\n",
+                 rtlhal->fw_version, rtlhal->fw_subversion,
+                 GET_FIRMWARE_HDR_SIGNATURE(pfwheader));
         if (IS_FW_HEADER_EXIST(pfwheader)) {
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
-                         ("Shift 32 bytes for FW header!!\n"));
+                         "Shift 32 bytes for FW header!!\n");
                 pfwdata = pfwdata + 32;
                 fwsize = fwsize - 32;
         }
@@ -302,8 +298,7 @@ int rtl92d_download_fw(struct ieee80211_hw *hw)
                                 break;
                         else
                                 RT_TRACE(rtlpriv, COMP_FW, DBG_DMESG,
-                                         ("Wait for another mac "
-                                         "download fw\n"));
+                                         "Wait for another mac download fw\n");
                 }
                 spin_lock_irqsave(&globalmutex_for_fwdownload, flags);
                 value = rtl_read_byte(rtlpriv, 0x1f);
@@ -337,11 +332,10 @@ int rtl92d_download_fw(struct ieee80211_hw *hw)
         spin_unlock_irqrestore(&globalmutex_for_fwdownload, flags);
         if (err) {
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("fw is not ready to run!\n"));
+                         "fw is not ready to run!\n");
                 goto exit;
         } else {
-                RT_TRACE(rtlpriv, COMP_FW, DBG_TRACE,
-                         ("fw is ready to run!\n"));
+                RT_TRACE(rtlpriv, COMP_FW, DBG_TRACE, "fw is ready to run!\n");
         }
 exit:
         err = _rtl92d_fw_init(hw);
@@ -381,24 +375,24 @@ static void _rtl92d_fill_h2c_command(struct ieee80211_hw *hw,
 
         if (ppsc->rfpwr_state == ERFOFF || ppsc->inactive_pwrstate == ERFOFF) {
                 RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD,
-                         ("Return as RF is off!!!\n"));
+                         "Return as RF is off!!!\n");
                 return;
         }
-        RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD, ("come in\n"));
+        RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD, "come in\n");
         while (true) {
                 spin_lock_irqsave(&rtlpriv->locks.h2c_lock, flag);
                 if (rtlhal->h2c_setinprogress) {
                         RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD,
-                                 ("H2C set in progress! Wait to set.."
-                                 "element_id(%d).\n", element_id));
+                                 "H2C set in progress! Wait to set..element_id(%d)\n",
+                                 element_id);
 
                         while (rtlhal->h2c_setinprogress) {
                                 spin_unlock_irqrestore(&rtlpriv->locks.h2c_lock,
                                                        flag);
                                 h2c_waitcounter++;
                                 RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD,
-                                         ("Wait 100 us (%d times)...\n",
-                                         h2c_waitcounter));
+                                         "Wait 100 us (%d times)...\n",
+                                         h2c_waitcounter);
                                 udelay(100);
 
                                 if (h2c_waitcounter > 1000)
@@ -418,8 +412,7 @@ static void _rtl92d_fill_h2c_command(struct ieee80211_hw *hw,
                 wait_writeh2c_limmit--;
                 if (wait_writeh2c_limmit == 0) {
                         RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                                 ("Write H2C fail because no trigger "
-                                 "for FW INT!\n"));
+                                 "Write H2C fail because no trigger for FW INT!\n");
                         break;
                 }
                 boxnum = rtlhal->last_hmeboxnum;
@@ -442,7 +435,7 @@ static void _rtl92d_fill_h2c_command(struct ieee80211_hw *hw,
                         break;
                 default:
                         RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                                 ("switch case not process\n"));
+                                 "switch case not processed\n");
                         break;
                 }
                 isfw_read = _rtl92d_check_fw_read_last_h2c(hw, boxnum);
@@ -450,29 +443,29 @@ static void _rtl92d_fill_h2c_command(struct ieee80211_hw *hw,
                         wait_h2c_limmit--;
                         if (wait_h2c_limmit == 0) {
                                 RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD,
-                                         ("Wating too long for FW read "
-                                         "clear HMEBox(%d)!\n", boxnum));
+                                         "Waiting too long for FW read clear HMEBox(%d)!\n",
+                                         boxnum);
                                 break;
                         }
                         udelay(10);
                         isfw_read = _rtl92d_check_fw_read_last_h2c(hw, boxnum);
                         u1b_tmp = rtl_read_byte(rtlpriv, 0x1BF);
                         RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD,
-                                 ("Wating for FW read clear HMEBox(%d)!!! "
-                                 "0x1BF = %2x\n", boxnum, u1b_tmp));
+                                 "Waiting for FW read clear HMEBox(%d)!!! 0x1BF = %2x\n",
+                                 boxnum, u1b_tmp);
                 }
                 if (!isfw_read) {
                         RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD,
-                                 ("Write H2C register BOX[%d] fail!!!!! "
-                                 "Fw do not read.\n", boxnum));
+                                 "Write H2C register BOX[%d] fail!!!!! Fw do not read.\n",
+                                 boxnum);
                         break;
                 }
                 memset(boxcontent, 0, sizeof(boxcontent));
                 memset(boxextcontent, 0, sizeof(boxextcontent));
                 boxcontent[0] = element_id;
                 RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD,
-                         ("Write element_id box_reg(%4x) = %2x\n",
-                         box_reg, element_id));
+                         "Write element_id box_reg(%4x) = %2x\n",
+                         box_reg, element_id);
                 switch (cmd_len) {
                 case 1:
                         boxcontent[0] &= ~(BIT(7));
@@ -519,7 +512,7 @@ static void _rtl92d_fill_h2c_command(struct ieee80211_hw *hw,
                         break;
                 default:
                         RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                                ("switch case not process\n"));
+                                 "switch case not processed\n");
                         break;
                 }
                 bwrite_sucess = true;
@@ -527,26 +520,20 @@ static void _rtl92d_fill_h2c_command(struct ieee80211_hw *hw,
                 if (rtlhal->last_hmeboxnum == 4)
                         rtlhal->last_hmeboxnum = 0;
                 RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD,
-                         ("pHalData->last_hmeboxnum  = %d\n",
-                          rtlhal->last_hmeboxnum));
+                         "pHalData->last_hmeboxnum  = %d\n",
+                         rtlhal->last_hmeboxnum);
         }
         spin_lock_irqsave(&rtlpriv->locks.h2c_lock, flag);
         rtlhal->h2c_setinprogress = false;
         spin_unlock_irqrestore(&rtlpriv->locks.h2c_lock, flag);
-        RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD, ("go out\n"));
+        RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD, "go out\n");
 }
 
 void rtl92d_fill_h2c_cmd(struct ieee80211_hw *hw,
                          u8 element_id, u32 cmd_len, u8 *cmdbuffer)
 {
-        struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
         u32 tmp_cmdbuf[2];
 
-        if (rtlhal->fw_ready == false) {
-                RT_ASSERT(false, ("return H2C cmd because of Fw "
-                                  "download fail!!!\n"));
-                return;
-        }
         memset(tmp_cmdbuf, 0, 8);
         memcpy(tmp_cmdbuf, cmdbuffer, cmd_len);
         _rtl92d_fill_h2c_command(hw, element_id, cmd_len, (u8 *)&tmp_cmdbuf);
@@ -559,13 +546,13 @@ void rtl92d_set_fw_pwrmode_cmd(struct ieee80211_hw *hw, u8 mode)
         u8 u1_h2c_set_pwrmode[3] = { 0 };
         struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw));
 
-        RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD, ("FW LPS mode = %d\n", mode));
+        RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD, "FW LPS mode = %d\n", mode);
         SET_H2CCMD_PWRMODE_PARM_MODE(u1_h2c_set_pwrmode, mode);
         SET_H2CCMD_PWRMODE_PARM_SMART_PS(u1_h2c_set_pwrmode, 1);
         SET_H2CCMD_PWRMODE_PARM_BCN_PASS_TIME(u1_h2c_set_pwrmode,
                                               ppsc->reg_max_lps_awakeintvl);
         RT_PRINT_DATA(rtlpriv, COMP_CMD, DBG_DMESG,
-                      "rtl92d_set_fw_rsvdpagepkt(): u1_h2c_set_pwrmode\n",
+                      "rtl92d_set_fw_rsvdpagepkt(): u1_h2c_set_pwrmode",
                       u1_h2c_set_pwrmode, 3);
         rtl92d_fill_h2c_cmd(hw, H2C_SETPWRMODE, 3, u1_h2c_set_pwrmode);
 }
@@ -757,28 +744,32 @@ void rtl92d_set_fw_rsvdpagepkt(struct ieee80211_hw *hw, bool dl_finished)
         SET_H2CCMD_RSVDPAGE_LOC_PROBE_RSP(u1RsvdPageLoc, PROBERSP_PG);
         totalpacketlen = TOTAL_RESERVED_PKT_LEN;
         RT_PRINT_DATA(rtlpriv, COMP_CMD, DBG_LOUD,
-                      "rtl92d_set_fw_rsvdpagepkt(): HW_VAR_SET_TX_CMD: ALL\n",
+                      "rtl92d_set_fw_rsvdpagepkt(): HW_VAR_SET_TX_CMD: ALL",
                       &reserved_page_packet[0], totalpacketlen);
         RT_PRINT_DATA(rtlpriv, COMP_CMD, DBG_DMESG,
-                      "rtl92d_set_fw_rsvdpagepkt(): HW_VAR_SET_TX_CMD: ALL\n",
+                      "rtl92d_set_fw_rsvdpagepkt(): HW_VAR_SET_TX_CMD: ALL",
                       u1RsvdPageLoc, 3);
         skb = dev_alloc_skb(totalpacketlen);
-        memcpy((u8 *) skb_put(skb, totalpacketlen), &reserved_page_packet,
-                totalpacketlen);
-        rtstatus = _rtl92d_cmd_send_packet(hw, skb);
+        if (!skb) {
+                dlok = false;
+        } else {
+                memcpy((u8 *) skb_put(skb, totalpacketlen),
+                        &reserved_page_packet, totalpacketlen);
+                rtstatus = _rtl92d_cmd_send_packet(hw, skb);
 
-        if (rtstatus)
-                dlok = true;
+                if (rtstatus)
+                        dlok = true;
+        }
         if (dlok) {
                 RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
-                        ("Set RSVD page location to Fw.\n"));
+                         "Set RSVD page location to Fw\n");
                 RT_PRINT_DATA(rtlpriv, COMP_CMD, DBG_DMESG,
-                              "H2C_RSVDPAGE:\n", u1RsvdPageLoc, 3);
+                              "H2C_RSVDPAGE", u1RsvdPageLoc, 3);
                 rtl92d_fill_h2c_cmd(hw, H2C_RSVDPAGE,
                         sizeof(u1RsvdPageLoc), u1RsvdPageLoc);
         } else
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
-                        ("Set RSVD page location to Fw FAIL!!!!!!.\n"));
+                         "Set RSVD page location to Fw FAIL!!!!!!\n");
 }
 
 void rtl92d_set_fw_joinbss_report_cmd(struct ieee80211_hw *hw, u8 mstatus)
diff --git a/drivers/net/wireless/rtlwifi/rtl8192de/fw.h b/drivers/net/wireless/rtlwifi/rtl8192de/fw.h
index 0c4d489eaa48..1ffacdda734c 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192de/fw.h
+++ b/drivers/net/wireless/rtlwifi/rtl8192de/fw.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2009-2010  Realtek Corporation.
+ * Copyright(c) 2009-2012  Realtek Corporation.
  *
  * 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
diff --git a/drivers/net/wireless/rtlwifi/rtl8192de/hw.c b/drivers/net/wireless/rtlwifi/rtl8192de/hw.c
index 9d89d7ccdafb..7d877125db29 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192de/hw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192de/hw.c
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2009-2010  Realtek Corporation.
+ * Copyright(c) 2009-2012  Realtek Corporation.
  *
  * 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
@@ -166,7 +166,7 @@ void rtl92de_get_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                 break;
         default:
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("switch case not process\n"));
+                         "switch case not processed\n");
                 break;
         }
 }
@@ -230,7 +230,7 @@ void rtl92de_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                 u8 e_aci;
 
                 RT_TRACE(rtlpriv, COMP_MLME, DBG_LOUD,
-                         ("HW_VAR_SLOT_TIME %x\n", val[0]));
+                         "HW_VAR_SLOT_TIME %x\n", val[0]);
                 rtl_write_byte(rtlpriv, REG_SLOT, val[0]);
                 for (e_aci = 0; e_aci < AC_MAX; e_aci++)
                         rtlpriv->cfg->ops->set_hw_reg(hw,
@@ -261,8 +261,8 @@ void rtl92de_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                                               min_spacing_to_set);
                         *val = min_spacing_to_set;
                         RT_TRACE(rtlpriv, COMP_MLME, DBG_LOUD,
-                                 ("Set HW_VAR_AMPDU_MIN_SPACE: %#x\n",
-                                 mac->min_space_cfg));
+                                 "Set HW_VAR_AMPDU_MIN_SPACE: %#x\n",
+                                 mac->min_space_cfg);
                         rtl_write_byte(rtlpriv, REG_AMPDU_MIN_SPACE,
                                        mac->min_space_cfg);
                 }
@@ -275,8 +275,8 @@ void rtl92de_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                 mac->min_space_cfg = rtlpriv->rtlhal.minspace_cfg;
                 mac->min_space_cfg |= (density_to_set << 3);
                 RT_TRACE(rtlpriv, COMP_MLME, DBG_LOUD,
-                         ("Set HW_VAR_SHORTGI_DENSITY: %#x\n",
-                         mac->min_space_cfg));
+                         "Set HW_VAR_SHORTGI_DENSITY: %#x\n",
+                         mac->min_space_cfg);
                 rtl_write_byte(rtlpriv, REG_AMPDU_MIN_SPACE,
                                mac->min_space_cfg);
                 break;
@@ -310,8 +310,8 @@ void rtl92de_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                         }
                         rtl_write_dword(rtlpriv, REG_AGGLEN_LMT, regtoSet);
                         RT_TRACE(rtlpriv, COMP_MLME, DBG_LOUD,
-                                 ("Set HW_VAR_AMPDU_FACTOR: %#x\n",
-                                 factor_toset));
+                                 "Set HW_VAR_AMPDU_FACTOR: %#x\n",
+                                 factor_toset);
                 }
                 break;
         }
@@ -344,8 +344,8 @@ void rtl92de_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                                 break;
                         default:
                                 RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
-                                         ("HW_VAR_ACM_CTRL acm set "
-                                         "failed: eACI is %d\n", acm));
+                                         "HW_VAR_ACM_CTRL acm set failed: eACI is %d\n",
+                                         acm);
                                 break;
                         }
                 } else {
@@ -361,13 +361,13 @@ void rtl92de_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                                 break;
                         default:
                                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                                         ("switch case not process\n"));
+                                         "switch case not processed\n");
                                 break;
                         }
                 }
                 RT_TRACE(rtlpriv, COMP_QOS, DBG_TRACE,
-                         ("SetHwReg8190pci(): [HW_VAR_ACM_CTRL] "
-                         "Write 0x%X\n", acm_ctrl));
+                         "SetHwReg8190pci(): [HW_VAR_ACM_CTRL] Write 0x%X\n",
+                         acm_ctrl);
                 rtl_write_byte(rtlpriv, REG_ACMHWCTRL, acm_ctrl);
                 break;
         }
@@ -502,7 +502,7 @@ void rtl92de_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
         }
         default:
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("switch case not process\n"));
+                         "switch case not processed\n");
                 break;
         }
 }
@@ -522,8 +522,8 @@ static bool _rtl92de_llt_write(struct ieee80211_hw *hw, u32 address, u32 data)
                         break;
                 if (count > POLLING_LLT_THRESHOLD) {
                         RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                                 ("Failed to polling write LLT done at "
-                                  "address %d!\n", address));
+                                 "Failed to polling write LLT done at address %d!\n",
+                                 address);
                         status = false;
                         break;
                 }
@@ -879,12 +879,12 @@ void rtl92de_enable_hw_security_config(struct ieee80211_hw *hw)
         u8 sec_reg_value;
 
         RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
-                 ("PairwiseEncAlgorithm = %d GroupEncAlgorithm = %d\n",
-                  rtlpriv->sec.pairwise_enc_algorithm,
-                  rtlpriv->sec.group_enc_algorithm));
+                 "PairwiseEncAlgorithm = %d GroupEncAlgorithm = %d\n",
+                 rtlpriv->sec.pairwise_enc_algorithm,
+                 rtlpriv->sec.group_enc_algorithm);
         if (rtlpriv->cfg->mod_params->sw_crypto || rtlpriv->sec.use_sw_sec) {
                 RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,
-                         ("not open hw encryption\n"));
+                         "not open hw encryption\n");
                 return;
         }
         sec_reg_value = SCR_TXENCENABLE | SCR_RXENCENABLE;
@@ -895,7 +895,7 @@ void rtl92de_enable_hw_security_config(struct ieee80211_hw *hw)
         sec_reg_value |= (SCR_RXBCUSEDK | SCR_TXBCUSEDK);
         rtl_write_byte(rtlpriv, REG_CR + 1, 0x02);
         RT_TRACE(rtlpriv, COMP_SEC, DBG_LOUD,
-                 ("The SECR-value %x\n", sec_reg_value));
+                 "The SECR-value %x\n", sec_reg_value);
         rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_WPA_CONFIG, &sec_reg_value);
 }
 
@@ -921,7 +921,7 @@ int rtl92de_hw_init(struct ieee80211_hw *hw)
         /* rtlpriv->intf_ops->disable_aspm(hw); */
         rtstatus = _rtl92de_init_mac(hw);
         if (rtstatus != true) {
-                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, ("Init MAC failed\n"));
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "Init MAC failed\n");
                 err = 1;
                 spin_unlock_irqrestore(&globalmutex_for_power_and_efuse, flags);
                 return err;
@@ -930,12 +930,8 @@ int rtl92de_hw_init(struct ieee80211_hw *hw)
         spin_unlock_irqrestore(&globalmutex_for_power_and_efuse, flags);
         if (err) {
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
-                         ("Failed to download FW. Init HW "
-                         "without FW..\n"));
-                rtlhal->fw_ready = false;
+                         "Failed to download FW. Init HW without FW..\n");
                 return 1;
-        } else {
-                rtlhal->fw_ready = true;
         }
         rtlhal->last_hmeboxnum = 0;
         rtlpriv->psc.fw_current_inpsmode = false;
@@ -946,7 +942,7 @@ int rtl92de_hw_init(struct ieee80211_hw *hw)
 
         if (rtlhal->earlymode_enable) {
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
-                         ("EarlyMode Enabled!!!\n"));
+                         "EarlyMode Enabled!!!\n");
 
                 tmp_u1b = rtl_read_byte(rtlpriv, 0x4d0);
                 tmp_u1b = tmp_u1b | 0x1f;
@@ -1064,10 +1060,10 @@ static enum version_8192d _rtl92de_read_chip_version(struct ieee80211_hw *hw)
         value32 = rtl_read_dword(rtlpriv, REG_SYS_CFG);
         if (!(value32 & 0x000f0000)) {
                 version = VERSION_TEST_CHIP_92D_SINGLEPHY;
-                RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, ("TEST CHIP!!!\n"));
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "TEST CHIP!!!\n");
         } else {
                 version = VERSION_NORMAL_CHIP_92D_SINGLEPHY;
-                RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, ("Normal CHIP!!!\n"));
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "Normal CHIP!!!\n");
         }
         return version;
 }
@@ -1092,8 +1088,8 @@ static int _rtl92de_set_media_status(struct ieee80211_hw *hw,
                 _rtl92de_disable_bcn_sub_func(hw);
         } else {
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
-                         ("Set HW_VAR_MEDIA_STATUS: No such media "
-                         "status(%x).\n", type));
+                         "Set HW_VAR_MEDIA_STATUS: No such media status(%x)\n",
+                         type);
         }
         bcnfunc_enable = rtl_read_byte(rtlpriv, REG_BCN_CTRL);
         switch (type) {
@@ -1102,30 +1098,30 @@ static int _rtl92de_set_media_status(struct ieee80211_hw *hw,
                 ledaction = LED_CTL_LINK;
                 bcnfunc_enable &= 0xF7;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                         ("Set Network type to NO LINK!\n"));
+                         "Set Network type to NO LINK!\n");
                 break;
         case NL80211_IFTYPE_ADHOC:
                 bt_msr |= MSR_ADHOC;
                 bcnfunc_enable |= 0x08;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                         ("Set Network type to Ad Hoc!\n"));
+                         "Set Network type to Ad Hoc!\n");
                 break;
         case NL80211_IFTYPE_STATION:
                 bt_msr |= MSR_INFRA;
                 ledaction = LED_CTL_LINK;
                 bcnfunc_enable &= 0xF7;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                         ("Set Network type to STA!\n"));
+                         "Set Network type to STA!\n");
                 break;
         case NL80211_IFTYPE_AP:
                 bt_msr |= MSR_AP;
                 bcnfunc_enable |= 0x08;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                         ("Set Network type to AP!\n"));
+                         "Set Network type to AP!\n");
                 break;
         default:
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("Network type %d not support!\n", type));
+                         "Network type %d not supported!\n", type);
                 return 1;
                 break;
 
@@ -1189,7 +1185,7 @@ void rtl92d_linked_set_reg(struct ieee80211_hw *hw)
         indexforchannel = rtl92d_get_rightchnlplace_for_iqk(channel);
         if (!rtlphy->iqk_matrix_regsetting[indexforchannel].iqk_done) {
                 RT_TRACE(rtlpriv, COMP_SCAN | COMP_INIT, DBG_DMESG,
-                                ("Do IQK for channel:%d.\n", channel));
+                         "Do IQK for channel:%d\n", channel);
                 rtl92d_phy_iq_calibrate(hw);
         }
 }
@@ -1214,7 +1210,7 @@ void rtl92de_set_qos(struct ieee80211_hw *hw, int aci)
                 rtl_write_dword(rtlpriv, REG_EDCA_VO_PARAM, 0x2f3222);
                 break;
         default:
-                RT_ASSERT(false, ("invalid aci: %d !\n", aci));
+                RT_ASSERT(false, "invalid aci: %d !\n", aci);
                 break;
         }
 }
@@ -1305,8 +1301,8 @@ static void _rtl92de_poweroff_adapter(struct ieee80211_hw *hw)
         rtl_write_byte(rtlpriv, REG_APS_FSMCO + 1, 0x10);
 
         RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
-                 ("In PowerOff,reg0x%x=%X\n", REG_SPS0_CTRL,
-                  rtl_read_byte(rtlpriv, REG_SPS0_CTRL)));
+                 "In PowerOff,reg0x%x=%X\n",
+                 REG_SPS0_CTRL, rtl_read_byte(rtlpriv, REG_SPS0_CTRL));
         /* r.   Note: for PCIe interface, PON will not turn */
         /* off m-bias and BandGap in PCIe suspend mode.  */
 
@@ -1319,7 +1315,7 @@ static void _rtl92de_poweroff_adapter(struct ieee80211_hw *hw)
                 spin_unlock_irqrestore(&globalmutex_power, flags);
         }
 
-        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, ("<=======\n"));
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "<=======\n");
 }
 
 void rtl92de_card_disable(struct ieee80211_hw *hw)
@@ -1377,7 +1373,7 @@ void rtl92de_card_disable(struct ieee80211_hw *hw)
         rtl_write_byte(rtlpriv, REG_PCIE_CTRL_REG + 1, 0xff);
         udelay(50);
         rtl_write_byte(rtlpriv, REG_CR, 0x0);
-        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, ("==> Do power off.......\n"));
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "==> Do power off.......\n");
         if (rtl92d_phy_check_poweroff(hw))
                 _rtl92de_poweroff_adapter(hw);
         return;
@@ -1425,7 +1421,7 @@ void rtl92de_set_beacon_interval(struct ieee80211_hw *hw)
         u16 bcn_interval = mac->beacon_interval;
 
         RT_TRACE(rtlpriv, COMP_BEACON, DBG_DMESG,
-                 ("beacon_interval:%d\n", bcn_interval));
+                 "beacon_interval:%d\n", bcn_interval);
         /* rtl92de_disable_interrupt(hw); */
         rtl_write_word(rtlpriv, REG_BCN_INTERVAL, bcn_interval);
         /* rtl92de_enable_interrupt(hw); */
@@ -1437,8 +1433,8 @@ void rtl92de_update_interrupt_mask(struct ieee80211_hw *hw,
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
 
-        RT_TRACE(rtlpriv, COMP_INTR, DBG_LOUD,
-                 ("add_msr:%x, rm_msr:%x\n", add_msr, rm_msr));
+        RT_TRACE(rtlpriv, COMP_INTR, DBG_LOUD, "add_msr:%x, rm_msr:%x\n",
+                 add_msr, rm_msr);
         if (add_msr)
                 rtlpci->irq_mask[0] |= add_msr;
         if (rm_msr)
@@ -1615,9 +1611,9 @@ static void _rtl92de_read_txpower_info(struct ieee80211_hw *hw,
                         rtlefuse->internal_pa_5g[1] =
                                 !((hwinfo[EEPROM_TSSI_B_5G] & BIT(6)) >> 6);
                         RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
-                                 ("Is D cut,Internal PA0 %d Internal PA1 %d\n",
+                                 "Is D cut,Internal PA0 %d Internal PA1 %d\n",
                                  rtlefuse->internal_pa_5g[0],
-                                 rtlefuse->internal_pa_5g[1]))
+                                 rtlefuse->internal_pa_5g[1]);
                 }
                 rtlefuse->eeprom_c9 = hwinfo[EEPROM_RF_OPT6];
                 rtlefuse->eeprom_cc = hwinfo[EEPROM_RF_OPT7];
@@ -1667,14 +1663,14 @@ static void _rtl92de_read_txpower_info(struct ieee80211_hw *hw,
         if (rtlefuse->eeprom_c9 == 0xFF)
                 rtlefuse->eeprom_c9 = 0x00;
         RT_TRACE(rtlpriv, COMP_INTR, DBG_LOUD,
-                 ("EEPROMRegulatory = 0x%x\n", rtlefuse->eeprom_regulatory));
+                 "EEPROMRegulatory = 0x%x\n", rtlefuse->eeprom_regulatory);
         RT_TRACE(rtlpriv, COMP_INTR, DBG_LOUD,
-                 ("ThermalMeter = 0x%x\n", rtlefuse->eeprom_thermalmeter));
+                 "ThermalMeter = 0x%x\n", rtlefuse->eeprom_thermalmeter);
         RT_TRACE(rtlpriv, COMP_INTR, DBG_LOUD,
-                 ("CrystalCap = 0x%x\n", rtlefuse->crystalcap));
+                 "CrystalCap = 0x%x\n", rtlefuse->crystalcap);
         RT_TRACE(rtlpriv, COMP_INTR, DBG_LOUD,
-                 ("Delta_IQK = 0x%x Delta_LCK = 0x%x\n", rtlefuse->delta_iqk,
-                 rtlefuse->delta_lck));
+                 "Delta_IQK = 0x%x Delta_LCK = 0x%x\n",
+                 rtlefuse->delta_iqk, rtlefuse->delta_lck);
 
         for (rfPath = 0; rfPath < RF6052_MAX_PATH; rfPath++) {
                 for (ch = 0; ch < CHANNEL_MAX_NUMBER; ch++) {
@@ -1710,11 +1706,11 @@ static void _rtl92de_read_macphymode_from_prom(struct ieee80211_hw *hw,
         if (macphy_crvalue & BIT(3)) {
                 rtlhal->macphymode = SINGLEMAC_SINGLEPHY;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
-                         ("MacPhyMode SINGLEMAC_SINGLEPHY\n"));
+                         "MacPhyMode SINGLEMAC_SINGLEPHY\n");
         } else {
                 rtlhal->macphymode = DUALMAC_DUALPHY;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
-                         ("MacPhyMode DUALMAC_DUALPHY\n"));
+                         "MacPhyMode DUALMAC_DUALPHY\n");
         }
 }
 
@@ -1741,15 +1737,15 @@ static void _rtl92de_efuse_update_chip_version(struct ieee80211_hw *hw)
         switch (chipvalue) {
         case 0xAA55:
                 chipver |= CHIP_92D_C_CUT;
-                RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, ("C-CUT!!!\n"));
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "C-CUT!!!\n");
                 break;
         case 0x9966:
                 chipver |= CHIP_92D_D_CUT;
-                RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, ("D-CUT!!!\n"));
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "D-CUT!!!\n");
                 break;
         default:
                 chipver |= CHIP_92D_D_CUT;
-                RT_TRACE(rtlpriv, COMP_INIT, DBG_EMERG, ("Unkown CUT!\n"));
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_EMERG, "Unkown CUT!\n");
                 break;
         }
         rtlpriv->rtlhal.version = chipver;
@@ -1775,23 +1771,23 @@ static void _rtl92de_read_adapter_info(struct ieee80211_hw *hw)
                        HWSET_MAX_SIZE);
         } else if (rtlefuse->epromtype == EEPROM_93C46) {
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("RTL819X Not boot from eeprom, check it !!"));
+                         "RTL819X Not boot from eeprom, check it !!\n");
         }
-        RT_PRINT_DATA(rtlpriv, COMP_INIT, DBG_DMESG, ("MAP\n"),
+        RT_PRINT_DATA(rtlpriv, COMP_INIT, DBG_DMESG, "MAP",
                       hwinfo, HWSET_MAX_SIZE);
 
         eeprom_id = *((u16 *)&hwinfo[0]);
         if (eeprom_id != RTL8190_EEPROM_ID) {
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
-                         ("EEPROM ID(%#x) is invalid!!\n", eeprom_id));
+                         "EEPROM ID(%#x) is invalid!!\n", eeprom_id);
                 rtlefuse->autoload_failflag = true;
         } else {
-                RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, ("Autoload OK\n"));
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "Autoload OK\n");
                 rtlefuse->autoload_failflag = false;
         }
         if (rtlefuse->autoload_failflag) {
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("RTL819X Not boot from eeprom, check it !!"));
+                         "RTL819X Not boot from eeprom, check it !!\n");
                 return;
         }
         rtlefuse->eeprom_oemid = *(u8 *)&hwinfo[EEPROM_CUSTOMER_ID];
@@ -1802,16 +1798,15 @@ static void _rtl92de_read_adapter_info(struct ieee80211_hw *hw)
         rtlefuse->eeprom_did = *(u16 *)&hwinfo[EEPROM_DID];
         rtlefuse->eeprom_svid = *(u16 *)&hwinfo[EEPROM_SVID];
         rtlefuse->eeprom_smid = *(u16 *)&hwinfo[EEPROM_SMID];
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "EEPROMId = 0x%4x\n", eeprom_id);
         RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
-                 ("EEPROMId = 0x%4x\n", eeprom_id));
-        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
-                 ("EEPROM VID = 0x%4x\n", rtlefuse->eeprom_vid));
+                 "EEPROM VID = 0x%4x\n", rtlefuse->eeprom_vid);
         RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
-                 ("EEPROM DID = 0x%4x\n", rtlefuse->eeprom_did));
+                 "EEPROM DID = 0x%4x\n", rtlefuse->eeprom_did);
         RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
-                 ("EEPROM SVID = 0x%4x\n", rtlefuse->eeprom_svid));
+                 "EEPROM SVID = 0x%4x\n", rtlefuse->eeprom_svid);
         RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
-                 ("EEPROM SMID = 0x%4x\n", rtlefuse->eeprom_smid));
+                 "EEPROM SMID = 0x%4x\n", rtlefuse->eeprom_smid);
 
         /* Read Permanent MAC address */
         if (rtlhal->interfaceindex == 0) {
@@ -1827,8 +1822,7 @@ static void _rtl92de_read_adapter_info(struct ieee80211_hw *hw)
         }
         rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_ETHER_ADDR,
                                       rtlefuse->dev_addr);
-        RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
-                 ("%pM\n", rtlefuse->dev_addr));
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "%pM\n", rtlefuse->dev_addr);
         _rtl92de_read_txpower_info(hw, rtlefuse->autoload_failflag, hwinfo);
 
         /* Read Channel Plan */
@@ -1849,7 +1843,7 @@ static void _rtl92de_read_adapter_info(struct ieee80211_hw *hw)
         rtlefuse->eeprom_version = *(u16 *)&hwinfo[EEPROM_VERSION];
         rtlefuse->txpwr_fromeprom = true;
         RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
-                 ("EEPROM Customer ID: 0x%2x\n", rtlefuse->eeprom_oemid));
+                 "EEPROM Customer ID: 0x%2x\n", rtlefuse->eeprom_oemid);
 }
 
 void rtl92de_read_eeprom_info(struct ieee80211_hw *hw)
@@ -1863,19 +1857,19 @@ void rtl92de_read_eeprom_info(struct ieee80211_hw *hw)
         tmp_u1b = rtl_read_byte(rtlpriv, REG_9346CR);
         rtlefuse->autoload_status = tmp_u1b;
         if (tmp_u1b & BIT(4)) {
-                RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, ("Boot from EEPROM\n"));
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "Boot from EEPROM\n");
                 rtlefuse->epromtype = EEPROM_93C46;
         } else {
-                RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, ("Boot from EFUSE\n"));
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "Boot from EFUSE\n");
                 rtlefuse->epromtype = EEPROM_BOOT_EFUSE;
         }
         if (tmp_u1b & BIT(5)) {
-                RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, ("Autoload OK\n"));
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "Autoload OK\n");
 
                 rtlefuse->autoload_failflag = false;
                 _rtl92de_read_adapter_info(hw);
         } else {
-                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, ("Autoload ERR!!\n"));
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "Autoload ERR!!\n");
         }
         return;
 }
@@ -1958,8 +1952,8 @@ static void rtl92de_update_hal_rate_table(struct ieee80211_hw *hw,
                     (shortgi_rate << 4) | (shortgi_rate);
         }
         rtl_write_dword(rtlpriv, REG_ARFR0 + ratr_index * 4, ratr_value);
-        RT_TRACE(rtlpriv, COMP_RATR, DBG_DMESG,
-                 ("%x\n", rtl_read_dword(rtlpriv, REG_ARFR0)));
+        RT_TRACE(rtlpriv, COMP_RATR, DBG_DMESG, "%x\n",
+                 rtl_read_dword(rtlpriv, REG_ARFR0));
 }
 
 static void rtl92de_update_hal_rate_mask(struct ieee80211_hw *hw,
@@ -2092,8 +2086,8 @@ static void rtl92de_update_hal_rate_mask(struct ieee80211_hw *hw,
         value[0] = (ratr_bitmap & 0x0fffffff) | (ratr_index << 28);
         value[1] = macid | (shortgi ? 0x20 : 0x00) | 0x80;
         RT_TRACE(rtlpriv, COMP_RATR, DBG_DMESG,
-                 ("ratr_bitmap :%x value0:%x value1:%x\n",
-                  ratr_bitmap, value[0], value[1]));
+                 "ratr_bitmap :%x value0:%x value1:%x\n",
+                 ratr_bitmap, value[0], value[1]);
         rtl92d_fill_h2c_cmd(hw, H2C_RA_MASK, 5, (u8 *) value);
         if (macid != 0)
                 sta_entry->ratr_index = ratr_index;
@@ -2153,14 +2147,14 @@ bool rtl92de_gpio_radio_on_off_checking(struct ieee80211_hw *hw, u8 *valid)
         e_rfpowerstate_toset = (u1tmp & BIT(3)) ? ERFON : ERFOFF;
         if (ppsc->hwradiooff && (e_rfpowerstate_toset == ERFON)) {
                 RT_TRACE(rtlpriv, COMP_RF, DBG_DMESG,
-                         ("GPIOChangeRF  - HW Radio ON, RF ON\n"));
+                         "GPIOChangeRF  - HW Radio ON, RF ON\n");
                 e_rfpowerstate_toset = ERFON;
                 ppsc->hwradiooff = false;
                 actuallyset = true;
         } else if ((ppsc->hwradiooff == false)
                 && (e_rfpowerstate_toset == ERFOFF)) {
                 RT_TRACE(rtlpriv, COMP_RF, DBG_DMESG,
-                         ("GPIOChangeRF  - HW Radio OFF, RF OFF\n"));
+                         "GPIOChangeRF  - HW Radio OFF, RF OFF\n");
                 e_rfpowerstate_toset = ERFOFF;
                 ppsc->hwradiooff = true;
                 actuallyset = true;
@@ -2204,7 +2198,7 @@ void rtl92de_set_key(struct ieee80211_hw *hw, u32 key_index,
                 u8 idx;
                 u8 cam_offset = 0;
                 u8 clear_number = 5;
-                RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG, ("clear_all\n"));
+                RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG, "clear_all\n");
                 for (idx = 0; idx < clear_number; idx++) {
                         rtl_cam_mark_invalid(hw, cam_offset + idx);
                         rtl_cam_empty_entry(hw, cam_offset + idx);
@@ -2230,8 +2224,8 @@ void rtl92de_set_key(struct ieee80211_hw *hw, u32 key_index,
                         enc_algo = CAM_AES;
                         break;
                 default:
-                        RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, ("switch case "
-                                                "not process\n"));
+                        RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
+                                 "switch case not processed\n");
                         enc_algo = CAM_TKIP;
                         break;
                 }
@@ -2248,9 +2242,8 @@ void rtl92de_set_key(struct ieee80211_hw *hw, u32 key_index,
                                                                  p_macaddr);
                                         if (entry_id >=  TOTAL_CAM_ENTRY) {
                                                 RT_TRACE(rtlpriv, COMP_SEC,
-                                                         DBG_EMERG, ("Can not "
-                                                         "find free hw security"
-                                                         " cam entry\n"));
+                                                         DBG_EMERG,
+                                                         "Can not find free hw security cam entry\n");
                                                 return;
                                         }
                                 } else {
@@ -2262,29 +2255,29 @@ void rtl92de_set_key(struct ieee80211_hw *hw, u32 key_index,
                 }
                 if (rtlpriv->sec.key_len[key_index] == 0) {
                         RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,
-                                 ("delete one entry, entry_id is %d\n",
-                                 entry_id));
+                                 "delete one entry, entry_id is %d\n",
+                                 entry_id);
                         if (mac->opmode == NL80211_IFTYPE_AP)
                                 rtl_cam_del_entry(hw, p_macaddr);
                         rtl_cam_delete_one_entry(hw, p_macaddr, entry_id);
                 } else {
                         RT_TRACE(rtlpriv, COMP_SEC, DBG_LOUD,
-                                 ("The insert KEY length is %d\n",
-                                  rtlpriv->sec.key_len[PAIRWISE_KEYIDX]));
+                                 "The insert KEY length is %d\n",
+                                 rtlpriv->sec.key_len[PAIRWISE_KEYIDX]);
                         RT_TRACE(rtlpriv, COMP_SEC, DBG_LOUD,
-                                 ("The insert KEY  is %x %x\n",
-                                  rtlpriv->sec.key_buf[0][0],
-                                  rtlpriv->sec.key_buf[0][1]));
+                                 "The insert KEY is %x %x\n",
+                                 rtlpriv->sec.key_buf[0][0],
+                                 rtlpriv->sec.key_buf[0][1]);
                         RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,
-                                 ("add one entry\n"));
+                                 "add one entry\n");
                         if (is_pairwise) {
                                 RT_PRINT_DATA(rtlpriv, COMP_SEC, DBG_LOUD,
-                                              "Pairwiase Key content :",
+                                              "Pairwise Key content",
                                               rtlpriv->sec.pairwise_key,
                                               rtlpriv->
                                               sec.key_len[PAIRWISE_KEYIDX]);
                                 RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,
-                                         ("set Pairwiase key\n"));
+                                         "set Pairwise key\n");
                                 rtl_cam_add_one_entry(hw, macaddr, key_index,
                                                       entry_id, enc_algo,
                                                       CAM_CONFIG_NO_USEDK,
@@ -2292,7 +2285,7 @@ void rtl92de_set_key(struct ieee80211_hw *hw, u32 key_index,
                                                       sec.key_buf[key_index]);
                         } else {
                                 RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,
-                                         ("set group key\n"));
+                                         "set group key\n");
                                 if (mac->opmode == NL80211_IFTYPE_ADHOC) {
                                         rtl_cam_add_one_entry(hw,
                                                 rtlefuse->dev_addr,
diff --git a/drivers/net/wireless/rtlwifi/rtl8192de/hw.h b/drivers/net/wireless/rtlwifi/rtl8192de/hw.h
index ad44ffa520e6..7c9f7a2f1e42 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192de/hw.h
+++ b/drivers/net/wireless/rtlwifi/rtl8192de/hw.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2009-2010  Realtek Corporation.
+ * Copyright(c) 2009-2012  Realtek Corporation.
  *
  * 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
diff --git a/drivers/net/wireless/rtlwifi/rtl8192de/led.c b/drivers/net/wireless/rtlwifi/rtl8192de/led.c
index f1552f4df658..76a57ae4af3e 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192de/led.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192de/led.c
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2009-2010  Realtek Corporation.
+ * Copyright(c) 2009-2012  Realtek Corporation.
  *
  * 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
@@ -45,8 +45,8 @@ void rtl92de_sw_led_on(struct ieee80211_hw *hw, struct rtl_led *pled)
         u8 ledcfg;
         struct rtl_priv *rtlpriv = rtl_priv(hw);
 
-        RT_TRACE(rtlpriv, COMP_LED, DBG_LOUD,
-                 ("LedAddr:%X ledpin=%d\n", REG_LEDCFG2, pled->ledpin));
+        RT_TRACE(rtlpriv, COMP_LED, DBG_LOUD, "LedAddr:%X ledpin=%d\n",
+                 REG_LEDCFG2, pled->ledpin);
 
         switch (pled->ledpin) {
         case LED_PIN_GPIO0:
@@ -71,7 +71,7 @@ void rtl92de_sw_led_on(struct ieee80211_hw *hw, struct rtl_led *pled)
                 break;
         default:
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("switch case not process\n"));
+                         "switch case not processed\n");
                 break;
         }
         pled->ledon = true;
@@ -83,8 +83,8 @@ void rtl92de_sw_led_off(struct ieee80211_hw *hw, struct rtl_led *pled)
         struct rtl_pci_priv *pcipriv = rtl_pcipriv(hw);
         u8 ledcfg;
 
-        RT_TRACE(rtlpriv, COMP_LED, DBG_LOUD,
-                 ("LedAddr:%X ledpin=%d\n", REG_LEDCFG2, pled->ledpin));
+        RT_TRACE(rtlpriv, COMP_LED, DBG_LOUD, "LedAddr:%X ledpin=%d\n",
+                 REG_LEDCFG2, pled->ledpin);
 
         ledcfg = rtl_read_byte(rtlpriv, REG_LEDCFG2);
 
@@ -106,7 +106,7 @@ void rtl92de_sw_led_off(struct ieee80211_hw *hw, struct rtl_led *pled)
                 break;
         default:
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("switch case not process\n"));
+                         "switch case not processed\n");
                 break;
         }
         pled->ledon = false;
@@ -153,7 +153,7 @@ void rtl92de_led_control(struct ieee80211_hw *hw, enum led_ctl_mode ledaction)
              ledaction == LED_CTL_POWER_ON)) {
                 return;
         }
-        RT_TRACE(rtlpriv, COMP_LED, DBG_LOUD, ("ledaction %d,\n", ledaction));
+        RT_TRACE(rtlpriv, COMP_LED, DBG_LOUD, "ledaction %d,\n", ledaction);
 
         _rtl92ce_sw_led_control(hw, ledaction);
 }
diff --git a/drivers/net/wireless/rtlwifi/rtl8192de/led.h b/drivers/net/wireless/rtlwifi/rtl8192de/led.h
index 57f4a3c583d4..a29df30c3025 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192de/led.h
+++ b/drivers/net/wireless/rtlwifi/rtl8192de/led.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2009-2010  Realtek Corporation.
+ * Copyright(c) 2009-2012  Realtek Corporation.
  *
  * 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
diff --git a/drivers/net/wireless/rtlwifi/rtl8192de/phy.c b/drivers/net/wireless/rtlwifi/rtl8192de/phy.c
index 0883349e1c83..9581a19c2548 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192de/phy.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192de/phy.c
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2009-2010  Realtek Corporation.
+ * Copyright(c) 2009-2012  Realtek Corporation.
  *
  * 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
@@ -204,8 +204,8 @@ u32 rtl92d_phy_query_bb_reg(struct ieee80211_hw *hw, u32 regaddr, u32 bitmask)
         u32 returnvalue, originalvalue, bitshift;
         u8 dbi_direct;
 
-        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE, ("regaddr(%#x), "
-                "bitmask(%#x)\n", regaddr, bitmask));
+        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE, "regaddr(%#x), bitmask(%#x)\n",
+                 regaddr, bitmask);
         if (rtlhal->during_mac1init_radioa || rtlhal->during_mac0init_radiob) {
                 /* mac1 use phy0 read radio_b. */
                 /* mac0 use phy1 read radio_b. */
@@ -220,8 +220,9 @@ u32 rtl92d_phy_query_bb_reg(struct ieee80211_hw *hw, u32 regaddr, u32 bitmask)
         }
         bitshift = _rtl92d_phy_calculate_bit_shift(bitmask);
         returnvalue = (originalvalue & bitmask) >> bitshift;
-        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE, ("BBR MASK=0x%x "
-                "Addr[0x%x]=0x%x\n", bitmask, regaddr, originalvalue));
+        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
+                 "BBR MASK=0x%x Addr[0x%x]=0x%x\n",
+                 bitmask, regaddr, originalvalue);
         return returnvalue;
 }
 
@@ -233,8 +234,9 @@ void rtl92d_phy_set_bb_reg(struct ieee80211_hw *hw,
         u8 dbi_direct = 0;
         u32 originalvalue, bitshift;
 
-        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE, ("regaddr(%#x), bitmask(%#x),"
-                " data(%#x)\n", regaddr, bitmask, data));
+        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
+                 "regaddr(%#x), bitmask(%#x), data(%#x)\n",
+                 regaddr, bitmask, data);
         if (rtlhal->during_mac1init_radioa)
                 dbi_direct = BIT(3);
         else if (rtlhal->during_mac0init_radiob)
@@ -255,8 +257,9 @@ void rtl92d_phy_set_bb_reg(struct ieee80211_hw *hw,
                 rtl92de_write_dword_dbi(hw, (u16) regaddr, data, dbi_direct);
         else
                 rtl_write_dword(rtlpriv, regaddr, data);
-        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE, ("regaddr(%#x), bitmask(%#x),"
-                 " data(%#x)\n", regaddr, bitmask, data));
+        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
+                 "regaddr(%#x), bitmask(%#x), data(%#x)\n",
+                 regaddr, bitmask, data);
 }
 
 static u32 _rtl92d_phy_rf_serial_read(struct ieee80211_hw *hw,
@@ -300,8 +303,8 @@ static u32 _rtl92d_phy_rf_serial_read(struct ieee80211_hw *hw,
         else
                 retvalue = rtl_get_bbreg(hw, pphyreg->rflssi_readback,
                         BLSSIREADBACKDATA);
-        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE, ("RFR-%d Addr[0x%x] = 0x%x\n",
-                 rfpath, pphyreg->rflssi_readback, retvalue));
+        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE, "RFR-%d Addr[0x%x] = 0x%x\n",
+                 rfpath, pphyreg->rflssi_readback, retvalue);
         return retvalue;
 }
 
@@ -319,8 +322,8 @@ static void _rtl92d_phy_rf_serial_write(struct ieee80211_hw *hw,
         /* T65 RF */
         data_and_addr = ((newoffset << 20) | (data & 0x000fffff)) & 0x0fffffff;
         rtl_set_bbreg(hw, pphyreg->rf3wire_offset, BMASKDWORD, data_and_addr);
-        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE, ("RFW-%d Addr[0x%x]=0x%x\n",
-                rfpath, pphyreg->rf3wire_offset, data_and_addr));
+        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE, "RFW-%d Addr[0x%x]=0x%x\n",
+                 rfpath, pphyreg->rf3wire_offset, data_and_addr);
 }
 
 u32 rtl92d_phy_query_rf_reg(struct ieee80211_hw *hw,
@@ -330,17 +333,17 @@ u32 rtl92d_phy_query_rf_reg(struct ieee80211_hw *hw,
         u32 original_value, readback_value, bitshift;
         unsigned long flags;
 
-        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE, ("regaddr(%#x), "
-                "rfpath(%#x), bitmask(%#x)\n",
-                regaddr, rfpath, bitmask));
+        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
+                 "regaddr(%#x), rfpath(%#x), bitmask(%#x)\n",
+                 regaddr, rfpath, bitmask);
         spin_lock_irqsave(&rtlpriv->locks.rf_lock, flags);
         original_value = _rtl92d_phy_rf_serial_read(hw, rfpath, regaddr);
         bitshift = _rtl92d_phy_calculate_bit_shift(bitmask);
         readback_value = (original_value & bitmask) >> bitshift;
         spin_unlock_irqrestore(&rtlpriv->locks.rf_lock, flags);
-        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE, ("regaddr(%#x), rfpath(%#x), "
-                "bitmask(%#x), original_value(%#x)\n",
-                regaddr, rfpath, bitmask, original_value));
+        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
+                 "regaddr(%#x), rfpath(%#x), bitmask(%#x), original_value(%#x)\n",
+                 regaddr, rfpath, bitmask, original_value);
         return readback_value;
 }
 
@@ -353,8 +356,8 @@ void rtl92d_phy_set_rf_reg(struct ieee80211_hw *hw, enum radio_path rfpath,
         unsigned long flags;
 
         RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
-                ("regaddr(%#x), bitmask(%#x), data(%#x), rfpath(%#x)\n",
-                regaddr, bitmask, data, rfpath));
+                 "regaddr(%#x), bitmask(%#x), data(%#x), rfpath(%#x)\n",
+                 regaddr, bitmask, data, rfpath);
         if (bitmask == 0)
                 return;
         spin_lock_irqsave(&rtlpriv->locks.rf_lock, flags);
@@ -369,9 +372,9 @@ void rtl92d_phy_set_rf_reg(struct ieee80211_hw *hw, enum radio_path rfpath,
                 _rtl92d_phy_rf_serial_write(hw, rfpath, regaddr, data);
         }
         spin_unlock_irqrestore(&rtlpriv->locks.rf_lock, flags);
-        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE, ("regaddr(%#x), "
-                "bitmask(%#x), data(%#x), rfpath(%#x)\n",
-                regaddr, bitmask, data, rfpath));
+        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
+                 "regaddr(%#x), bitmask(%#x), data(%#x), rfpath(%#x)\n",
+                 regaddr, bitmask, data, rfpath);
 }
 
 bool rtl92d_phy_mac_config(struct ieee80211_hw *hw)
@@ -381,10 +384,10 @@ bool rtl92d_phy_mac_config(struct ieee80211_hw *hw)
         u32 arraylength;
         u32 *ptrarray;
 
-        RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, ("Read Rtl819XMACPHY_Array\n"));
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, "Read Rtl819XMACPHY_Array\n");
         arraylength = MAC_2T_ARRAYLENGTH;
         ptrarray = rtl8192de_mac_2tarray;
-        RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, ("Img:Rtl819XMAC_Array\n"));
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, "Img:Rtl819XMAC_Array\n");
         for (i = 0; i < arraylength; i = i + 2)
                 rtl_write_byte(rtlpriv, ptrarray[i], (u8) ptrarray[i + 1]);
         if (rtlpriv->rtlhal.macphymode == SINGLEMAC_SINGLEPHY) {
@@ -561,25 +564,25 @@ static bool _rtl92d_phy_config_bb_with_headerfile(struct ieee80211_hw *hw,
                 agctab_arraylen = AGCTAB_ARRAYLENGTH;
                 agctab_array_table = rtl8192de_agctab_array;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
-                         (" ===> phy:MAC0, Rtl819XAGCTAB_Array\n"));
+                         " ===> phy:MAC0, Rtl819XAGCTAB_Array\n");
         } else {
                 if (rtlhal->current_bandtype == BAND_ON_2_4G) {
                         agctab_arraylen = AGCTAB_2G_ARRAYLENGTH;
                         agctab_array_table = rtl8192de_agctab_2garray;
                         RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
-                                 (" ===> phy:MAC1, Rtl819XAGCTAB_2GArray\n"));
+                                 " ===> phy:MAC1, Rtl819XAGCTAB_2GArray\n");
                 } else {
                         agctab_5garraylen = AGCTAB_5G_ARRAYLENGTH;
                         agctab_5garray_table = rtl8192de_agctab_5garray;
                         RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
-                                 (" ===> phy:MAC1, Rtl819XAGCTAB_5GArray\n"));
+                                 " ===> phy:MAC1, Rtl819XAGCTAB_5GArray\n");
 
                 }
         }
         phy_reg_arraylen = PHY_REG_2T_ARRAYLENGTH;
         phy_regarray_table = rtl8192de_phy_reg_2tarray;
         RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
-                 (" ===> phy:Rtl819XPHY_REG_Array_PG\n"));
+                 " ===> phy:Rtl819XPHY_REG_Array_PG\n");
         if (configtype == BASEBAND_CONFIG_PHY_REG) {
                 for (i = 0; i < phy_reg_arraylen; i = i + 2) {
                         if (phy_regarray_table[i] == 0xfe)
@@ -598,10 +601,9 @@ static bool _rtl92d_phy_config_bb_with_headerfile(struct ieee80211_hw *hw,
                                       phy_regarray_table[i + 1]);
                         udelay(1);
                         RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                                 ("The phy_regarray_table[0] is %x"
-                                  " Rtl819XPHY_REGArray[1] is %x\n",
-                                  phy_regarray_table[i],
-                                  phy_regarray_table[i + 1]));
+                                 "The phy_regarray_table[0] is %x Rtl819XPHY_REGArray[1] is %x\n",
+                                 phy_regarray_table[i],
+                                 phy_regarray_table[i + 1]);
                 }
         } else if (configtype == BASEBAND_CONFIG_AGC_TAB) {
                 if (rtlhal->interfaceindex == 0) {
@@ -613,15 +615,12 @@ static bool _rtl92d_phy_config_bb_with_headerfile(struct ieee80211_hw *hw,
                                  * setting. */
                                 udelay(1);
                                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                                         ("The Rtl819XAGCTAB_Array_"
-                                         "Table[0] is %ul "
-                                         "Rtl819XPHY_REGArray[1] is %ul\n",
+                                         "The Rtl819XAGCTAB_Array_Table[0] is %ul Rtl819XPHY_REGArray[1] is %ul\n",
                                          agctab_array_table[i],
-                                         agctab_array_table[i + 1]));
+                                         agctab_array_table[i + 1]);
                         }
                         RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
-                                 ("Normal Chip, MAC0, load "
-                                 "Rtl819XAGCTAB_Array\n"));
+                                 "Normal Chip, MAC0, load Rtl819XAGCTAB_Array\n");
                 } else {
                         if (rtlhal->current_bandtype == BAND_ON_2_4G) {
                                 for (i = 0; i < agctab_arraylen; i = i + 2) {
@@ -632,14 +631,12 @@ static bool _rtl92d_phy_config_bb_with_headerfile(struct ieee80211_hw *hw,
                                          * setting. */
                                         udelay(1);
                                         RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                                                 ("The Rtl819XAGCTAB_Array_"
-                                                 "Table[0] is %ul Rtl819XPHY_"
-                                                 "REGArray[1] is %ul\n",
+                                                 "The Rtl819XAGCTAB_Array_Table[0] is %ul Rtl819XPHY_REGArray[1] is %ul\n",
                                                  agctab_array_table[i],
-                                                 agctab_array_table[i + 1]));
+                                                 agctab_array_table[i + 1]);
                                 }
                                 RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
-                                         ("Load Rtl819XAGCTAB_2GArray\n"));
+                                         "Load Rtl819XAGCTAB_2GArray\n");
                         } else {
                                 for (i = 0; i < agctab_5garraylen; i = i + 2) {
                                         rtl_set_bbreg(hw,
@@ -650,14 +647,12 @@ static bool _rtl92d_phy_config_bb_with_headerfile(struct ieee80211_hw *hw,
                                          * setting. */
                                         udelay(1);
                                         RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                                                 ("The Rtl819XAGCTAB_5GArray_"
-                                                 "Table[0] is %ul Rtl819XPHY_"
-                                                 "REGArray[1] is %ul\n",
+                                                 "The Rtl819XAGCTAB_5GArray_Table[0] is %ul Rtl819XPHY_REGArray[1] is %ul\n",
                                                  agctab_5garray_table[i],
-                                                 agctab_5garray_table[i + 1]));
+                                                 agctab_5garray_table[i + 1]);
                                 }
                                 RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
-                                        ("Load Rtl819XAGCTAB_5GArray\n"));
+                                         "Load Rtl819XAGCTAB_5GArray\n");
                         }
                 }
         }
@@ -675,145 +670,145 @@ static void _rtl92d_store_pwrindex_diffrate_offset(struct ieee80211_hw *hw,
                 rtlphy->mcs_txpwrlevel_origoffset[rtlphy->pwrgroup_cnt][0] =
                                                                          data;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                         ("MCSTxPowerLevelOriginalOffset[%d][0] = 0x%ulx\n",
+                         "MCSTxPowerLevelOriginalOffset[%d][0] = 0x%ulx\n",
                          rtlphy->pwrgroup_cnt,
                          rtlphy->mcs_txpwrlevel_origoffset
-                         [rtlphy->pwrgroup_cnt][0]));
+                         [rtlphy->pwrgroup_cnt][0]);
         }
         if (regaddr == RTXAGC_A_RATE54_24) {
                 rtlphy->mcs_txpwrlevel_origoffset[rtlphy->pwrgroup_cnt][1] =
                                                                          data;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                         ("MCSTxPowerLevelOriginalOffset[%d][1] = 0x%ulx\n",
+                         "MCSTxPowerLevelOriginalOffset[%d][1] = 0x%ulx\n",
                          rtlphy->pwrgroup_cnt,
                          rtlphy->mcs_txpwrlevel_origoffset
-                         [rtlphy->pwrgroup_cnt][1]));
+                         [rtlphy->pwrgroup_cnt][1]);
         }
         if (regaddr == RTXAGC_A_CCK1_MCS32) {
                 rtlphy->mcs_txpwrlevel_origoffset[rtlphy->pwrgroup_cnt][6] =
                                                                          data;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                         ("MCSTxPowerLevelOriginalOffset[%d][6] = 0x%ulx\n",
+                         "MCSTxPowerLevelOriginalOffset[%d][6] = 0x%ulx\n",
                          rtlphy->pwrgroup_cnt,
                          rtlphy->mcs_txpwrlevel_origoffset
-                         [rtlphy->pwrgroup_cnt][6]));
+                         [rtlphy->pwrgroup_cnt][6]);
         }
         if (regaddr == RTXAGC_B_CCK11_A_CCK2_11 && bitmask == 0xffffff00) {
                 rtlphy->mcs_txpwrlevel_origoffset[rtlphy->pwrgroup_cnt][7] =
                                                                          data;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                         ("MCSTxPowerLevelOriginalOffset[%d][7] = 0x%ulx\n",
+                         "MCSTxPowerLevelOriginalOffset[%d][7] = 0x%ulx\n",
                          rtlphy->pwrgroup_cnt,
                          rtlphy->mcs_txpwrlevel_origoffset
-                         [rtlphy->pwrgroup_cnt][7]));
+                         [rtlphy->pwrgroup_cnt][7]);
         }
         if (regaddr == RTXAGC_A_MCS03_MCS00) {
                 rtlphy->mcs_txpwrlevel_origoffset[rtlphy->pwrgroup_cnt][2] =
                                                                          data;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                         ("MCSTxPowerLevelOriginalOffset[%d][2] = 0x%ulx\n",
+                         "MCSTxPowerLevelOriginalOffset[%d][2] = 0x%ulx\n",
                          rtlphy->pwrgroup_cnt,
                          rtlphy->mcs_txpwrlevel_origoffset
-                         [rtlphy->pwrgroup_cnt][2]));
+                         [rtlphy->pwrgroup_cnt][2]);
         }
         if (regaddr == RTXAGC_A_MCS07_MCS04) {
                 rtlphy->mcs_txpwrlevel_origoffset[rtlphy->pwrgroup_cnt][3] =
                                                                          data;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                         ("MCSTxPowerLevelOriginalOffset[%d][3] = 0x%ulx\n",
+                         "MCSTxPowerLevelOriginalOffset[%d][3] = 0x%ulx\n",
                          rtlphy->pwrgroup_cnt,
                          rtlphy->mcs_txpwrlevel_origoffset
-                         [rtlphy->pwrgroup_cnt][3]));
+                         [rtlphy->pwrgroup_cnt][3]);
         }
         if (regaddr == RTXAGC_A_MCS11_MCS08) {
                 rtlphy->mcs_txpwrlevel_origoffset[rtlphy->pwrgroup_cnt][4] =
                                                                          data;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                         ("MCSTxPowerLevelOriginalOffset[%d][4] = 0x%ulx\n",
+                         "MCSTxPowerLevelOriginalOffset[%d][4] = 0x%ulx\n",
                          rtlphy->pwrgroup_cnt,
                          rtlphy->mcs_txpwrlevel_origoffset
-                         [rtlphy->pwrgroup_cnt][4]));
+                         [rtlphy->pwrgroup_cnt][4]);
         }
         if (regaddr == RTXAGC_A_MCS15_MCS12) {
                 rtlphy->mcs_txpwrlevel_origoffset[rtlphy->pwrgroup_cnt][5] =
                                                                          data;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                         ("MCSTxPowerLevelOriginalOffset[%d][5] = 0x%ulx\n",
+                         "MCSTxPowerLevelOriginalOffset[%d][5] = 0x%ulx\n",
                          rtlphy->pwrgroup_cnt,
                          rtlphy->mcs_txpwrlevel_origoffset
-                         [rtlphy->pwrgroup_cnt][5]));
+                         [rtlphy->pwrgroup_cnt][5]);
         }
         if (regaddr == RTXAGC_B_RATE18_06) {
                 rtlphy->mcs_txpwrlevel_origoffset[rtlphy->pwrgroup_cnt][8] =
                                                                          data;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                         ("MCSTxPowerLevelOriginalOffset[%d][8] = 0x%ulx\n",
+                         "MCSTxPowerLevelOriginalOffset[%d][8] = 0x%ulx\n",
                          rtlphy->pwrgroup_cnt,
                          rtlphy->mcs_txpwrlevel_origoffset
-                         [rtlphy->pwrgroup_cnt][8]));
+                         [rtlphy->pwrgroup_cnt][8]);
         }
         if (regaddr == RTXAGC_B_RATE54_24) {
                 rtlphy->mcs_txpwrlevel_origoffset[rtlphy->pwrgroup_cnt][9] =
                                                                          data;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                         ("MCSTxPowerLevelOriginalOffset[%d][9] = 0x%ulx\n",
+                         "MCSTxPowerLevelOriginalOffset[%d][9] = 0x%ulx\n",
                          rtlphy->pwrgroup_cnt,
                          rtlphy->mcs_txpwrlevel_origoffset
-                         [rtlphy->pwrgroup_cnt][9]));
+                         [rtlphy->pwrgroup_cnt][9]);
         }
         if (regaddr == RTXAGC_B_CCK1_55_MCS32) {
                 rtlphy->mcs_txpwrlevel_origoffset[rtlphy->pwrgroup_cnt][14] =
                                                                          data;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                         ("MCSTxPowerLevelOriginalOffset[%d][14] = 0x%ulx\n",
+                         "MCSTxPowerLevelOriginalOffset[%d][14] = 0x%ulx\n",
                          rtlphy->pwrgroup_cnt,
                          rtlphy->mcs_txpwrlevel_origoffset
-                         [rtlphy->pwrgroup_cnt][14]));
+                         [rtlphy->pwrgroup_cnt][14]);
         }
         if (regaddr == RTXAGC_B_CCK11_A_CCK2_11 && bitmask == 0x000000ff) {
                 rtlphy->mcs_txpwrlevel_origoffset[rtlphy->pwrgroup_cnt][15] =
                                                                          data;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                         ("MCSTxPowerLevelOriginalOffset[%d][15] = 0x%ulx\n",
+                         "MCSTxPowerLevelOriginalOffset[%d][15] = 0x%ulx\n",
                          rtlphy->pwrgroup_cnt,
                          rtlphy->mcs_txpwrlevel_origoffset
-                         [rtlphy->pwrgroup_cnt][15]));
+                         [rtlphy->pwrgroup_cnt][15]);
         }
         if (regaddr == RTXAGC_B_MCS03_MCS00) {
                 rtlphy->mcs_txpwrlevel_origoffset[rtlphy->pwrgroup_cnt][10] =
                                                                          data;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                         ("MCSTxPowerLevelOriginalOffset[%d][10] = 0x%ulx\n",
+                         "MCSTxPowerLevelOriginalOffset[%d][10] = 0x%ulx\n",
                          rtlphy->pwrgroup_cnt,
                          rtlphy->mcs_txpwrlevel_origoffset
-                         [rtlphy->pwrgroup_cnt][10]));
+                         [rtlphy->pwrgroup_cnt][10]);
         }
         if (regaddr == RTXAGC_B_MCS07_MCS04) {
                 rtlphy->mcs_txpwrlevel_origoffset[rtlphy->pwrgroup_cnt][11] =
                                                                          data;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                         ("MCSTxPowerLevelOriginalOffset[%d][11] = 0x%ulx\n",
+                         "MCSTxPowerLevelOriginalOffset[%d][11] = 0x%ulx\n",
                          rtlphy->pwrgroup_cnt,
                          rtlphy->mcs_txpwrlevel_origoffset
-                         [rtlphy->pwrgroup_cnt][11]));
+                         [rtlphy->pwrgroup_cnt][11]);
         }
         if (regaddr == RTXAGC_B_MCS11_MCS08) {
                 rtlphy->mcs_txpwrlevel_origoffset[rtlphy->pwrgroup_cnt][12] =
                                                                          data;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                         ("MCSTxPowerLevelOriginalOffset[%d][12] = 0x%ulx\n",
-                          rtlphy->pwrgroup_cnt,
-                          rtlphy->mcs_txpwrlevel_origoffset
-                                        [rtlphy->pwrgroup_cnt][12]));
+                         "MCSTxPowerLevelOriginalOffset[%d][12] = 0x%ulx\n",
+                         rtlphy->pwrgroup_cnt,
+                         rtlphy->mcs_txpwrlevel_origoffset
+                         [rtlphy->pwrgroup_cnt][12]);
         }
         if (regaddr == RTXAGC_B_MCS15_MCS12) {
                 rtlphy->mcs_txpwrlevel_origoffset[rtlphy->pwrgroup_cnt][13] =
                                                                          data;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                         ("MCSTxPowerLevelOriginalOffset[%d][13] = 0x%ulx\n",
-                          rtlphy->pwrgroup_cnt,
-                          rtlphy->mcs_txpwrlevel_origoffset
-                                        [rtlphy->pwrgroup_cnt][13]));
+                         "MCSTxPowerLevelOriginalOffset[%d][13] = 0x%ulx\n",
+                         rtlphy->pwrgroup_cnt,
+                         rtlphy->mcs_txpwrlevel_origoffset
+                         [rtlphy->pwrgroup_cnt][13]);
                 rtlphy->pwrgroup_cnt++;
         }
 }
@@ -849,7 +844,7 @@ static bool _rtl92d_phy_config_bb_with_pgheaderfile(struct ieee80211_hw *hw,
                 }
         } else {
                 RT_TRACE(rtlpriv, COMP_SEND, DBG_TRACE,
-                         ("configtype != BaseBand_Config_PHY_REG\n"));
+                         "configtype != BaseBand_Config_PHY_REG\n");
         }
         return true;
 }
@@ -861,17 +856,17 @@ static bool _rtl92d_phy_bb_config(struct ieee80211_hw *hw)
         struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw));
         bool rtstatus = true;
 
-        RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, ("==>\n"));
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, "==>\n");
         rtstatus = _rtl92d_phy_config_bb_with_headerfile(hw,
                 BASEBAND_CONFIG_PHY_REG);
         if (rtstatus != true) {
-                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, ("Write BB Reg Fail!!"));
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "Write BB Reg Fail!!\n");
                 return false;
         }
 
         /* if (rtlphy->rf_type == RF_1T2R) {
          *      _rtl92c_phy_bb_config_1t(hw);
-         *     RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, ("Config to 1T!!\n"));
+         *     RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, "Config to 1T!!\n");
          *} */
 
         if (rtlefuse->autoload_failflag == false) {
@@ -880,13 +875,13 @@ static bool _rtl92d_phy_bb_config(struct ieee80211_hw *hw)
                         BASEBAND_CONFIG_PHY_REG);
         }
         if (rtstatus != true) {
-                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, ("BB_PG Reg Fail!!"));
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "BB_PG Reg Fail!!\n");
                 return false;
         }
         rtstatus = _rtl92d_phy_config_bb_with_headerfile(hw,
                 BASEBAND_CONFIG_AGC_TAB);
         if (rtstatus != true) {
-                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, ("AGC Table Fail\n"));
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "AGC Table Fail\n");
                 return false;
         }
         rtlphy->cck_high_power = (bool) (rtl_get_bbreg(hw,
@@ -951,19 +946,17 @@ bool rtl92d_phy_config_rf_with_headerfile(struct ieee80211_hw *hw,
                 radiob_array_table = rtl8192de_radiob_2t_int_paarray;
         }
         RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
-                 ("PHY_ConfigRFWithHeaderFile() "
-                 "Radio_A:Rtl819XRadioA_1TArray\n"));
+                 "PHY_ConfigRFWithHeaderFile() Radio_A:Rtl819XRadioA_1TArray\n");
         RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
-                 ("PHY_ConfigRFWithHeaderFile() "
-                 "Radio_B:Rtl819XRadioB_1TArray\n"));
-        RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, ("Radio No %x\n", rfpath));
+                 "PHY_ConfigRFWithHeaderFile() Radio_B:Rtl819XRadioB_1TArray\n");
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, "Radio No %x\n", rfpath);
 
         /* this only happens when DMDP, mac0 start on 2.4G,
          * mac1 start on 5G, mac 0 has to set phy0&phy1
          * pathA or mac1 has to set phy0&phy1 pathA */
         if ((content == radiob_txt) && (rfpath == RF90_PATH_A)) {
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
-                         (" ===> althougth Path A, we load radiob.txt\n"));
+                         " ===> althougth Path A, we load radiob.txt\n");
                 radioa_arraylen = radiob_arraylen;
                 radioa_array_table = radiob_array_table;
         }
@@ -1022,11 +1015,11 @@ bool rtl92d_phy_config_rf_with_headerfile(struct ieee80211_hw *hw,
                 break;
         case RF90_PATH_C:
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("switch case not process\n"));
+                         "switch case not processed\n");
                 break;
         case RF90_PATH_D:
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("switch case not process\n"));
+                         "switch case not processed\n");
                 break;
         }
         return true;
@@ -1046,19 +1039,18 @@ void rtl92d_phy_get_hw_reg_originalvalue(struct ieee80211_hw *hw)
         rtlphy->default_initialgain[3] =
             (u8) rtl_get_bbreg(hw, ROFDM0_XDAGCCORE1, BMASKBYTE0);
         RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                 ("Default initial gain (c50=0x%x, "
-                  "c58=0x%x, c60=0x%x, c68=0x%x\n",
-                  rtlphy->default_initialgain[0],
-                  rtlphy->default_initialgain[1],
-                  rtlphy->default_initialgain[2],
-                  rtlphy->default_initialgain[3]));
+                 "Default initial gain (c50=0x%x, c58=0x%x, c60=0x%x, c68=0x%x\n",
+                 rtlphy->default_initialgain[0],
+                 rtlphy->default_initialgain[1],
+                 rtlphy->default_initialgain[2],
+                 rtlphy->default_initialgain[3]);
         rtlphy->framesync = (u8)rtl_get_bbreg(hw, ROFDM0_RXDETECTOR3,
                                               BMASKBYTE0);
         rtlphy->framesync_c34 = rtl_get_bbreg(hw, ROFDM0_RXDETECTOR2,
                                               BMASKDWORD);
         RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                 ("Default framesync (0x%x) = 0x%x\n",
-                  ROFDM0_RXDETECTOR3, rtlphy->framesync));
+                 "Default framesync (0x%x) = 0x%x\n",
+                 ROFDM0_RXDETECTOR3, rtlphy->framesync);
 }
 
 static void _rtl92d_get_txpower_index(struct ieee80211_hw *hw, u8 channel,
@@ -1172,7 +1164,7 @@ void rtl92d_phy_scan_operation_backup(struct ieee80211_hw *hw, u8 operation)
                         break;
                 default:
                         RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                                 ("Unknown Scan Backup operation.\n"));
+                                 "Unknown Scan Backup operation\n");
                         break;
                 }
         }
@@ -1193,14 +1185,13 @@ void rtl92d_phy_set_bw_mode(struct ieee80211_hw *hw,
                 return;
         if ((is_hal_stop(rtlhal)) || (RT_CANNOT_IO(hw))) {
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
-                         ("FALSE driver sleep or unload\n"));
+                         "FALSE driver sleep or unload\n");
                 return;
         }
         rtlphy->set_bwmode_inprogress = true;
-        RT_TRACE(rtlpriv, COMP_SCAN, DBG_TRACE,
-                 ("Switch to %s bandwidth\n",
-                  rtlphy->current_chan_bw == HT_CHANNEL_WIDTH_20 ?
-                  "20MHz" : "40MHz"));
+        RT_TRACE(rtlpriv, COMP_SCAN, DBG_TRACE, "Switch to %s bandwidth\n",
+                 rtlphy->current_chan_bw == HT_CHANNEL_WIDTH_20 ?
+                 "20MHz" : "40MHz");
         reg_bw_opmode = rtl_read_byte(rtlpriv, REG_BWOPMODE);
         reg_prsr_rsc = rtl_read_byte(rtlpriv, REG_RRSR + 2);
         switch (rtlphy->current_chan_bw) {
@@ -1218,7 +1209,7 @@ void rtl92d_phy_set_bw_mode(struct ieee80211_hw *hw,
                 break;
         default:
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("unknown bandwidth: %#X\n", rtlphy->current_chan_bw));
+                         "unknown bandwidth: %#X\n", rtlphy->current_chan_bw);
                 break;
         }
         switch (rtlphy->current_chan_bw) {
@@ -1250,13 +1241,13 @@ void rtl92d_phy_set_bw_mode(struct ieee80211_hw *hw,
                 break;
         default:
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("unknown bandwidth: %#X\n", rtlphy->current_chan_bw));
+                         "unknown bandwidth: %#X\n", rtlphy->current_chan_bw);
                 break;
 
         }
         rtl92d_phy_rf6052_set_bandwidth(hw, rtlphy->current_chan_bw);
         rtlphy->set_bwmode_inprogress = false;
-        RT_TRACE(rtlpriv, COMP_SCAN, DBG_TRACE, ("<==\n"));
+        RT_TRACE(rtlpriv, COMP_SCAN, DBG_TRACE, "<==\n");
 }
 
 static void _rtl92d_phy_stop_trx_before_changeband(struct ieee80211_hw *hw)
@@ -1273,7 +1264,7 @@ static void rtl92d_phy_switch_wirelessband(struct ieee80211_hw *hw, u8 band)
         struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
         u8 value8;
 
-        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, ("==>\n"));
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "==>\n");
         rtlhal->bandset = band;
         rtlhal->current_bandtype = band;
         if (IS_92D_SINGLEPHY(rtlhal->version))
@@ -1283,13 +1274,13 @@ static void rtl92d_phy_switch_wirelessband(struct ieee80211_hw *hw, u8 band)
         /* reconfig BB/RF according to wireless mode */
         if (rtlhal->current_bandtype == BAND_ON_2_4G) {
                 /* BB & RF Config */
-                RT_TRACE(rtlpriv, COMP_CMD, DBG_DMESG, ("====>2.4G\n"));
+                RT_TRACE(rtlpriv, COMP_CMD, DBG_DMESG, "====>2.4G\n");
                 if (rtlhal->interfaceindex == 1)
                         _rtl92d_phy_config_bb_with_headerfile(hw,
                                 BASEBAND_CONFIG_AGC_TAB);
         } else {
                 /* 5G band */
-                RT_TRACE(rtlpriv, COMP_CMD, DBG_DMESG, ("====>5G\n"));
+                RT_TRACE(rtlpriv, COMP_CMD, DBG_DMESG, "====>5G\n");
                 if (rtlhal->interfaceindex == 1)
                         _rtl92d_phy_config_bb_with_headerfile(hw,
                                 BASEBAND_CONFIG_AGC_TAB);
@@ -1317,7 +1308,7 @@ static void rtl92d_phy_switch_wirelessband(struct ieee80211_hw *hw, u8 band)
                         0 ? REG_MAC0 : REG_MAC1), value8);
         }
         mdelay(1);
-        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, ("<==Switch Band OK.\n"));
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "<==Switch Band OK\n");
 }
 
 static void _rtl92d_phy_reload_imr_setting(struct ieee80211_hw *hw,
@@ -1329,9 +1320,9 @@ static void _rtl92d_phy_reload_imr_setting(struct ieee80211_hw *hw,
         u8 group, i;
         unsigned long flag = 0;
 
-        RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD, ("====>path %d\n", rfpath));
+        RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD, "====>path %d\n", rfpath);
         if (rtlpriv->rtlhal.current_bandtype == BAND_ON_5G) {
-                RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD, ("====>5G\n"));
+                RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD, "====>5G\n");
                 rtl_set_bbreg(hw, RFPGA0_RFMOD, BIT(25) | BIT(24), 0);
                 rtl_set_bbreg(hw, RFPGA0_ANALOGPARAMETER4, 0x00f00000, 0xf);
                 /* fc area 0xd2c */
@@ -1353,14 +1344,13 @@ static void _rtl92d_phy_reload_imr_setting(struct ieee80211_hw *hw,
         } else {
                 /* G band. */
                 RT_TRACE(rtlpriv, COMP_SCAN, DBG_LOUD,
-                         ("Load RF IMR parameters for G band. IMR already "
-                         "setting %d\n",
-                          rtlpriv->rtlhal.load_imrandiqk_setting_for2g));
-                RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD, ("====>2.4G\n"));
+                         "Load RF IMR parameters for G band. IMR already setting %d\n",
+                         rtlpriv->rtlhal.load_imrandiqk_setting_for2g);
+                RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD, "====>2.4G\n");
                 if (!rtlpriv->rtlhal.load_imrandiqk_setting_for2g) {
                         RT_TRACE(rtlpriv, COMP_SCAN, DBG_LOUD,
-                                ("Load RF IMR parameters "
-                                "for G band. %d\n", rfpath));
+                                 "Load RF IMR parameters for G band. %d\n",
+                                 rfpath);
                         rtl92d_acquire_cckandrw_pagea_ctl(hw, &flag);
                         rtl_set_bbreg(hw, RFPGA0_RFMOD, BIT(25) | BIT(24), 0);
                         rtl_set_bbreg(hw, RFPGA0_ANALOGPARAMETER4,
@@ -1378,7 +1368,7 @@ static void _rtl92d_phy_reload_imr_setting(struct ieee80211_hw *hw,
                         rtl92d_release_cckandrw_pagea_ctl(hw, &flag);
                 }
         }
-        RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD, ("<====\n"));
+        RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD, "<====\n");
 }
 
 static void _rtl92d_phy_enable_rf_env(struct ieee80211_hw *hw,
@@ -1388,7 +1378,7 @@ static void _rtl92d_phy_enable_rf_env(struct ieee80211_hw *hw,
         struct rtl_phy *rtlphy = &(rtlpriv->phy);
         struct bb_reg_def *pphyreg = &rtlphy->phyreg_def[rfpath];
 
-        RT_TRACE(rtlpriv, COMP_RF, DBG_LOUD, ("====>\n"));
+        RT_TRACE(rtlpriv, COMP_RF, DBG_LOUD, "====>\n");
         /*----Store original RFENV control type----*/
         switch (rfpath) {
         case RF90_PATH_A:
@@ -1414,7 +1404,7 @@ static void _rtl92d_phy_enable_rf_env(struct ieee80211_hw *hw,
         /*Set 0 to 12 bits for 8255 */
         rtl_set_bbreg(hw, pphyreg->rfhssi_para2, B3WIREDATALENGTH, 0x0);
         udelay(1);
-        RT_TRACE(rtlpriv, COMP_RF, DBG_LOUD, ("<====\n"));
+        RT_TRACE(rtlpriv, COMP_RF, DBG_LOUD, "<====\n");
 }
 
 static void _rtl92d_phy_restore_rf_env(struct ieee80211_hw *hw, u8 rfpath,
@@ -1424,7 +1414,7 @@ static void _rtl92d_phy_restore_rf_env(struct ieee80211_hw *hw, u8 rfpath,
         struct rtl_phy *rtlphy = &(rtlpriv->phy);
         struct bb_reg_def *pphyreg = &rtlphy->phyreg_def[rfpath];
 
-        RT_TRACE(rtlpriv, COMP_RF, DBG_LOUD, ("=====>\n"));
+        RT_TRACE(rtlpriv, COMP_RF, DBG_LOUD, "=====>\n");
         /*----Restore RFENV control type----*/ ;
         switch (rfpath) {
         case RF90_PATH_A:
@@ -1437,7 +1427,7 @@ static void _rtl92d_phy_restore_rf_env(struct ieee80211_hw *hw, u8 rfpath,
                               *pu4_regval);
                 break;
         }
-        RT_TRACE(rtlpriv, COMP_RF, DBG_LOUD, ("<=====\n"));
+        RT_TRACE(rtlpriv, COMP_RF, DBG_LOUD, "<=====\n");
 }
 
 static void _rtl92d_phy_switch_rf_setting(struct ieee80211_hw *hw, u8 channel)
@@ -1451,13 +1441,13 @@ static void _rtl92d_phy_switch_rf_setting(struct ieee80211_hw *hw, u8 channel)
         bool need_pwr_down = false, internal_pa = false;
         u32 u4regvalue, mask = 0x1C000, value = 0, u4tmp, u4tmp2;
 
-        RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD, ("====>\n"));
+        RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD, "====>\n");
         /* config path A for 5G */
         if (rtlhal->current_bandtype == BAND_ON_5G) {
-                RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD, ("====>5G\n"));
+                RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD, "====>5G\n");
                 u4tmp = curveindex_5g[channel - 1];
-                RTPRINT(rtlpriv, FINIT, INIT_IQK, ("ver 1 set RF-A, 5G, "
-                        "0x28 = 0x%x !!\n", u4tmp));
+                RTPRINT(rtlpriv, FINIT, INIT_IQK,
+                        "ver 1 set RF-A, 5G, 0x28 = 0x%x !!\n", u4tmp);
                 for (i = 0; i < RF_CHNL_NUM_5G; i++) {
                         if (channel == rf_chnl_5g[i] && channel <= 140)
                                 index = 0;
@@ -1503,12 +1493,13 @@ static void _rtl92d_phy_switch_rf_setting(struct ieee80211_hw *hw, u8 channel)
                                               rf_reg_pram_c_5g[index][i]);
                         }
                         RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
-                                ("offset 0x%x value 0x%x "
-                                "path %d index %d readback 0x%x\n",
-                                rf_reg_for_c_cut_5g[i],
-                                rf_reg_pram_c_5g[index][i], path,
-                                index, rtl_get_rfreg(hw, (enum radio_path)path,
-                                rf_reg_for_c_cut_5g[i], BRFREGOFFSETMASK)));
+                                 "offset 0x%x value 0x%x path %d index %d readback 0x%x\n",
+                                 rf_reg_for_c_cut_5g[i],
+                                 rf_reg_pram_c_5g[index][i],
+                                 path, index,
+                                 rtl_get_rfreg(hw, (enum radio_path)path,
+                                               rf_reg_for_c_cut_5g[i],
+                                               BRFREGOFFSETMASK));
                 }
                 if (need_pwr_down)
                         _rtl92d_phy_restore_rf_env(hw, path, &u4regvalue);
@@ -1541,11 +1532,10 @@ static void _rtl92d_phy_switch_rf_setting(struct ieee80211_hw *hw, u8 channel)
                                                 BRFREGOFFSETMASK,
                                                 rf_pram_c_5g_int_pa[index][i]);
                                         RT_TRACE(rtlpriv, COMP_RF, DBG_LOUD,
-                                                 ("offset 0x%x value 0x%x "
-                                                 "path %d index %d\n",
+                                                 "offset 0x%x value 0x%x path %d index %d\n",
                                                  rf_for_c_cut_5g_internal_pa[i],
                                                  rf_pram_c_5g_int_pa[index][i],
-                                                 rfpath, index));
+                                                 rfpath, index);
                                 }
                         } else {
                                 rtl_set_rfreg(hw, (enum radio_path)rfpath, 0x0B,
@@ -1553,10 +1543,10 @@ static void _rtl92d_phy_switch_rf_setting(struct ieee80211_hw *hw, u8 channel)
                         }
                 }
         } else if (rtlhal->current_bandtype == BAND_ON_2_4G) {
-                RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD, ("====>2.4G\n"));
+                RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD, "====>2.4G\n");
                 u4tmp = curveindex_2g[channel - 1];
-                RTPRINT(rtlpriv, FINIT, INIT_IQK, ("ver 3 set RF-B, 2G, "
-                        "0x28 = 0x%x !!\n", u4tmp));
+                RTPRINT(rtlpriv, FINIT, INIT_IQK,
+                        "ver 3 set RF-B, 2G, 0x28 = 0x%x !!\n", u4tmp);
                 if (channel == 1 || channel == 2 || channel == 4 || channel == 9
                     || channel == 10 || channel == 11 || channel == 12)
                         index = 0;
@@ -1590,18 +1580,17 @@ static void _rtl92d_phy_switch_rf_setting(struct ieee80211_hw *hw, u8 channel)
                                               rf_reg_param_for_c_cut_2g
                                               [index][i]);
                         RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
-                                ("offset 0x%x value 0x%x mak 0x%x path %d "
-                                "index %d readback 0x%x\n",
-                                rf_reg_for_c_cut_2g[i],
-                                rf_reg_param_for_c_cut_2g[index][i],
-                                rf_reg_mask_for_c_cut_2g[i], path, index,
-                                rtl_get_rfreg(hw, (enum radio_path)path,
-                                rf_reg_for_c_cut_2g[i],
-                                BRFREGOFFSETMASK)));
+                                 "offset 0x%x value 0x%x mak 0x%x path %d index %d readback 0x%x\n",
+                                 rf_reg_for_c_cut_2g[i],
+                                 rf_reg_param_for_c_cut_2g[index][i],
+                                 rf_reg_mask_for_c_cut_2g[i], path, index,
+                                 rtl_get_rfreg(hw, (enum radio_path)path,
+                                               rf_reg_for_c_cut_2g[i],
+                                               BRFREGOFFSETMASK));
                 }
                 RTPRINT(rtlpriv, FINIT, INIT_IQK,
-                        ("cosa ver 3 set RF-B, 2G, 0x28 = 0x%x !!\n",
-                        rf_syn_g4_for_c_cut_2g | (u4tmp << 11)));
+                        "cosa ver 3 set RF-B, 2G, 0x28 = 0x%x !!\n",
+                        rf_syn_g4_for_c_cut_2g | (u4tmp << 11));
 
                 rtl_set_rfreg(hw, (enum radio_path)path, RF_SYN_G4,
                               BRFREGOFFSETMASK,
@@ -1611,7 +1600,7 @@ static void _rtl92d_phy_switch_rf_setting(struct ieee80211_hw *hw, u8 channel)
                 if (rtlhal->during_mac0init_radiob)
                         rtl92d_phy_powerdown_anotherphy(hw, true);
         }
-        RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD, ("<====\n"));
+        RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD, "<====\n");
 }
 
 u8 rtl92d_get_rightchnlplace_for_iqk(u8 chnl)
@@ -1648,9 +1637,9 @@ static u8 _rtl92d_phy_patha_iqk(struct ieee80211_hw *hw, bool configpathb)
         u32 regeac, rege94, rege9c, regea4;
         u8 result = 0;
 
-        RTPRINT(rtlpriv, FINIT, INIT_IQK, ("Path A IQK!\n"));
+        RTPRINT(rtlpriv, FINIT, INIT_IQK,  "Path A IQK!\n");
         /* path-A IQK setting */
-        RTPRINT(rtlpriv, FINIT, INIT_IQK, ("Path-A IQK setting!\n"));
+        RTPRINT(rtlpriv, FINIT, INIT_IQK,  "Path-A IQK setting!\n");
         if (rtlhal->interfaceindex == 0) {
                 rtl_set_bbreg(hw, 0xe30, BMASKDWORD, 0x10008c1f);
                 rtl_set_bbreg(hw, 0xe34, BMASKDWORD, 0x10008c1f);
@@ -1668,26 +1657,26 @@ static u8 _rtl92d_phy_patha_iqk(struct ieee80211_hw *hw, bool configpathb)
                 rtl_set_bbreg(hw, 0xe5c, BMASKDWORD, 0x28160206);
         }
         /* LO calibration setting */
-        RTPRINT(rtlpriv, FINIT, INIT_IQK, ("LO calibration setting!\n"));
+        RTPRINT(rtlpriv, FINIT, INIT_IQK,  "LO calibration setting!\n");
         rtl_set_bbreg(hw, 0xe4c, BMASKDWORD, 0x00462911);
         /* One shot, path A LOK & IQK */
-        RTPRINT(rtlpriv, FINIT, INIT_IQK, ("One shot, path A LOK & IQK!\n"));
+        RTPRINT(rtlpriv, FINIT, INIT_IQK,  "One shot, path A LOK & IQK!\n");
         rtl_set_bbreg(hw, 0xe48, BMASKDWORD, 0xf9000000);
         rtl_set_bbreg(hw, 0xe48, BMASKDWORD, 0xf8000000);
         /* delay x ms */
         RTPRINT(rtlpriv, FINIT, INIT_IQK,
-                ("Delay %d ms for One shot, path A LOK & IQK.\n",
-                IQK_DELAY_TIME));
+                "Delay %d ms for One shot, path A LOK & IQK\n",
+                IQK_DELAY_TIME);
         mdelay(IQK_DELAY_TIME);
         /* Check failed */
         regeac = rtl_get_bbreg(hw, 0xeac, BMASKDWORD);
-        RTPRINT(rtlpriv, FINIT, INIT_IQK, ("0xeac = 0x%x\n", regeac));
+        RTPRINT(rtlpriv, FINIT, INIT_IQK,  "0xeac = 0x%x\n", regeac);
         rege94 = rtl_get_bbreg(hw, 0xe94, BMASKDWORD);
-        RTPRINT(rtlpriv, FINIT, INIT_IQK, ("0xe94 = 0x%x\n", rege94));
+        RTPRINT(rtlpriv, FINIT, INIT_IQK,  "0xe94 = 0x%x\n", rege94);
         rege9c = rtl_get_bbreg(hw, 0xe9c, BMASKDWORD);
-        RTPRINT(rtlpriv, FINIT, INIT_IQK, ("0xe9c = 0x%x\n", rege9c));
+        RTPRINT(rtlpriv, FINIT, INIT_IQK,  "0xe9c = 0x%x\n", rege9c);
         regea4 = rtl_get_bbreg(hw, 0xea4, BMASKDWORD);
-        RTPRINT(rtlpriv, FINIT, INIT_IQK, ("0xea4 = 0x%x\n", regea4));
+        RTPRINT(rtlpriv, FINIT, INIT_IQK,  "0xea4 = 0x%x\n", regea4);
         if (!(regeac & BIT(28)) && (((rege94 & 0x03FF0000) >> 16) != 0x142) &&
             (((rege9c & 0x03FF0000) >> 16) != 0x42))
                 result |= 0x01;
@@ -1698,7 +1687,7 @@ static u8 _rtl92d_phy_patha_iqk(struct ieee80211_hw *hw, bool configpathb)
             (((regeac & 0x03FF0000) >> 16) != 0x36))
                 result |= 0x02;
         else
-                RTPRINT(rtlpriv, FINIT, INIT_IQK, ("Path A Rx IQK fail!!\n"));
+                RTPRINT(rtlpriv, FINIT, INIT_IQK,  "Path A Rx IQK fail!!\n");
         return result;
 }
 
@@ -1719,9 +1708,9 @@ static u8 _rtl92d_phy_patha_iqk_5g_normal(struct ieee80211_hw *hw,
                 TxOKBit = BIT(31);
                 RxOKBit = BIT(30);
         }
-        RTPRINT(rtlpriv, FINIT, INIT_IQK, ("Path A IQK!\n"));
+        RTPRINT(rtlpriv, FINIT, INIT_IQK,  "Path A IQK!\n");
         /* path-A IQK setting */
-        RTPRINT(rtlpriv, FINIT, INIT_IQK, ("Path-A IQK setting!\n"));
+        RTPRINT(rtlpriv, FINIT, INIT_IQK,  "Path-A IQK setting!\n");
         rtl_set_bbreg(hw, 0xe30, BMASKDWORD, 0x18008c1f);
         rtl_set_bbreg(hw, 0xe34, BMASKDWORD, 0x18008c1f);
         rtl_set_bbreg(hw, 0xe38, BMASKDWORD, 0x82140307);
@@ -1734,7 +1723,7 @@ static u8 _rtl92d_phy_patha_iqk_5g_normal(struct ieee80211_hw *hw,
                 rtl_set_bbreg(hw, 0xe5c, BMASKDWORD, 0x68110000);
         }
         /* LO calibration setting */
-        RTPRINT(rtlpriv, FINIT, INIT_IQK, ("LO calibration setting!\n"));
+        RTPRINT(rtlpriv, FINIT, INIT_IQK,  "LO calibration setting!\n");
         rtl_set_bbreg(hw, 0xe4c, BMASKDWORD, 0x00462911);
         /* path-A PA on */
         rtl_set_bbreg(hw, RFPGA0_XAB_RFINTERFACESW, BMASKDWORD, 0x07000f60);
@@ -1742,29 +1731,29 @@ static u8 _rtl92d_phy_patha_iqk_5g_normal(struct ieee80211_hw *hw,
         for (i = 0; i < retrycount; i++) {
                 /* One shot, path A LOK & IQK */
                 RTPRINT(rtlpriv, FINIT, INIT_IQK,
-                        ("One shot, path A LOK & IQK!\n"));
+                        "One shot, path A LOK & IQK!\n");
                 rtl_set_bbreg(hw, 0xe48, BMASKDWORD, 0xf9000000);
                 rtl_set_bbreg(hw, 0xe48, BMASKDWORD, 0xf8000000);
                 /* delay x ms */
                 RTPRINT(rtlpriv, FINIT, INIT_IQK,
-                        ("Delay %d ms for One shot, path A LOK & IQK.\n",
-                        IQK_DELAY_TIME));
+                        "Delay %d ms for One shot, path A LOK & IQK.\n",
+                        IQK_DELAY_TIME);
                 mdelay(IQK_DELAY_TIME * 10);
                 /* Check failed */
                 regeac = rtl_get_bbreg(hw, 0xeac, BMASKDWORD);
-                RTPRINT(rtlpriv, FINIT, INIT_IQK, ("0xeac = 0x%x\n", regeac));
+                RTPRINT(rtlpriv, FINIT, INIT_IQK,  "0xeac = 0x%x\n", regeac);
                 rege94 = rtl_get_bbreg(hw, 0xe94, BMASKDWORD);
-                RTPRINT(rtlpriv, FINIT, INIT_IQK, ("0xe94 = 0x%x\n", rege94));
+                RTPRINT(rtlpriv, FINIT, INIT_IQK,  "0xe94 = 0x%x\n", rege94);
                 rege9c = rtl_get_bbreg(hw, 0xe9c, BMASKDWORD);
-                RTPRINT(rtlpriv, FINIT, INIT_IQK, ("0xe9c = 0x%x\n", rege9c));
+                RTPRINT(rtlpriv, FINIT, INIT_IQK,  "0xe9c = 0x%x\n", rege9c);
                 regea4 = rtl_get_bbreg(hw, 0xea4, BMASKDWORD);
-                RTPRINT(rtlpriv, FINIT, INIT_IQK, ("0xea4 = 0x%x\n", regea4));
+                RTPRINT(rtlpriv, FINIT, INIT_IQK,  "0xea4 = 0x%x\n", regea4);
                 if (!(regeac & TxOKBit) &&
                      (((rege94 & 0x03FF0000) >> 16) != 0x142)) {
                         result |= 0x01;
                 } else { /* if Tx not OK, ignore Rx */
                         RTPRINT(rtlpriv, FINIT, INIT_IQK,
-                                ("Path A Tx IQK fail!!\n"));
+                                "Path A Tx IQK fail!!\n");
                         continue;
                 }
 
@@ -1775,7 +1764,7 @@ static u8 _rtl92d_phy_patha_iqk_5g_normal(struct ieee80211_hw *hw,
                         break;
                 } else {
                         RTPRINT(rtlpriv, FINIT, INIT_IQK,
-                                ("Path A Rx IQK fail!!\n"));
+                                "Path A Rx IQK fail!!\n");
                 }
         }
         /* path A PA off */
@@ -1793,27 +1782,26 @@ static u8 _rtl92d_phy_pathb_iqk(struct ieee80211_hw *hw)
         u32 regeac, regeb4, regebc, regec4, regecc;
         u8 result = 0;
 
-        RTPRINT(rtlpriv, FINIT, INIT_IQK, ("Path B IQK!\n"));
+        RTPRINT(rtlpriv, FINIT, INIT_IQK,  "Path B IQK!\n");
         /* One shot, path B LOK & IQK */
-        RTPRINT(rtlpriv, FINIT, INIT_IQK, ("One shot, path A LOK & IQK!\n"));
+        RTPRINT(rtlpriv, FINIT, INIT_IQK,  "One shot, path A LOK & IQK!\n");
         rtl_set_bbreg(hw, 0xe60, BMASKDWORD, 0x00000002);
         rtl_set_bbreg(hw, 0xe60, BMASKDWORD, 0x00000000);
         /* delay x ms  */
         RTPRINT(rtlpriv, FINIT, INIT_IQK,
-                ("Delay %d ms for One shot, path B LOK & IQK.\n",
-                IQK_DELAY_TIME));
+                "Delay %d ms for One shot, path B LOK & IQK\n", IQK_DELAY_TIME);
         mdelay(IQK_DELAY_TIME);
         /* Check failed */
         regeac = rtl_get_bbreg(hw, 0xeac, BMASKDWORD);
-        RTPRINT(rtlpriv, FINIT, INIT_IQK, ("0xeac = 0x%x\n", regeac));
+        RTPRINT(rtlpriv, FINIT, INIT_IQK,  "0xeac = 0x%x\n", regeac);
         regeb4 = rtl_get_bbreg(hw, 0xeb4, BMASKDWORD);
-        RTPRINT(rtlpriv, FINIT, INIT_IQK, ("0xeb4 = 0x%x\n", regeb4));
+        RTPRINT(rtlpriv, FINIT, INIT_IQK,  "0xeb4 = 0x%x\n", regeb4);
         regebc = rtl_get_bbreg(hw, 0xebc, BMASKDWORD);
-        RTPRINT(rtlpriv, FINIT, INIT_IQK, ("0xebc = 0x%x\n", regebc));
+        RTPRINT(rtlpriv, FINIT, INIT_IQK,  "0xebc = 0x%x\n", regebc);
         regec4 = rtl_get_bbreg(hw, 0xec4, BMASKDWORD);
-        RTPRINT(rtlpriv, FINIT, INIT_IQK, ("0xec4 = 0x%x\n", regec4));
+        RTPRINT(rtlpriv, FINIT, INIT_IQK,  "0xec4 = 0x%x\n", regec4);
         regecc = rtl_get_bbreg(hw, 0xecc, BMASKDWORD);
-        RTPRINT(rtlpriv, FINIT, INIT_IQK, ("0xecc = 0x%x\n", regecc));
+        RTPRINT(rtlpriv, FINIT, INIT_IQK,  "0xecc = 0x%x\n", regecc);
         if (!(regeac & BIT(31)) && (((regeb4 & 0x03FF0000) >> 16) != 0x142) &&
             (((regebc & 0x03FF0000) >> 16) != 0x42))
                 result |= 0x01;
@@ -1823,7 +1811,7 @@ static u8 _rtl92d_phy_pathb_iqk(struct ieee80211_hw *hw)
             (((regecc & 0x03FF0000) >> 16) != 0x36))
                 result |= 0x02;
         else
-                RTPRINT(rtlpriv, FINIT, INIT_IQK, ("Path B Rx IQK fail!!\n"));
+                RTPRINT(rtlpriv, FINIT, INIT_IQK,  "Path B Rx IQK fail!!\n");
         return result;
 }
 
@@ -1837,9 +1825,9 @@ static u8 _rtl92d_phy_pathb_iqk_5g_normal(struct ieee80211_hw *hw)
         u8 i;
         u8 retrycount = 2;
 
-        RTPRINT(rtlpriv, FINIT, INIT_IQK, ("Path B IQK!\n"));
+        RTPRINT(rtlpriv, FINIT, INIT_IQK,  "Path B IQK!\n");
         /* path-A IQK setting */
-        RTPRINT(rtlpriv, FINIT, INIT_IQK, ("Path-A IQK setting!\n"));
+        RTPRINT(rtlpriv, FINIT, INIT_IQK,  "Path-A IQK setting!\n");
         rtl_set_bbreg(hw, 0xe30, BMASKDWORD, 0x18008c1f);
         rtl_set_bbreg(hw, 0xe34, BMASKDWORD, 0x18008c1f);
         rtl_set_bbreg(hw, 0xe38, BMASKDWORD, 0x82110000);
@@ -1852,7 +1840,7 @@ static u8 _rtl92d_phy_pathb_iqk_5g_normal(struct ieee80211_hw *hw)
         rtl_set_bbreg(hw, 0xe5c, BMASKDWORD, 0x68160960);
 
         /* LO calibration setting */
-        RTPRINT(rtlpriv, FINIT, INIT_IQK, ("LO calibration setting!\n"));
+        RTPRINT(rtlpriv, FINIT, INIT_IQK,  "LO calibration setting!\n");
         rtl_set_bbreg(hw, 0xe4c, BMASKDWORD, 0x00462911);
 
         /* path-B PA on */
@@ -1862,26 +1850,26 @@ static u8 _rtl92d_phy_pathb_iqk_5g_normal(struct ieee80211_hw *hw)
         for (i = 0; i < retrycount; i++) {
                 /* One shot, path B LOK & IQK */
                 RTPRINT(rtlpriv, FINIT, INIT_IQK,
-                        ("One shot, path A LOK & IQK!\n"));
+                        "One shot, path A LOK & IQK!\n");
                 rtl_set_bbreg(hw, 0xe48, BMASKDWORD, 0xfa000000);
                 rtl_set_bbreg(hw, 0xe48, BMASKDWORD, 0xf8000000);
 
                 /* delay x ms */
                 RTPRINT(rtlpriv, FINIT, INIT_IQK,
-                        ("Delay %d ms for One shot, path B LOK & IQK.\n", 10));
+                        "Delay %d ms for One shot, path B LOK & IQK.\n", 10);
                 mdelay(IQK_DELAY_TIME * 10);
 
                 /* Check failed */
                 regeac = rtl_get_bbreg(hw, 0xeac, BMASKDWORD);
-                RTPRINT(rtlpriv, FINIT, INIT_IQK, ("0xeac = 0x%x\n", regeac));
+                RTPRINT(rtlpriv, FINIT, INIT_IQK,  "0xeac = 0x%x\n", regeac);
                 regeb4 = rtl_get_bbreg(hw, 0xeb4, BMASKDWORD);
-                RTPRINT(rtlpriv, FINIT, INIT_IQK, ("0xeb4 = 0x%x\n", regeb4));
+                RTPRINT(rtlpriv, FINIT, INIT_IQK,  "0xeb4 = 0x%x\n", regeb4);
                 regebc = rtl_get_bbreg(hw, 0xebc, BMASKDWORD);
-                RTPRINT(rtlpriv, FINIT, INIT_IQK, ("0xebc = 0x%x\n", regebc));
+                RTPRINT(rtlpriv, FINIT, INIT_IQK,  "0xebc = 0x%x\n", regebc);
                 regec4 = rtl_get_bbreg(hw, 0xec4, BMASKDWORD);
-                RTPRINT(rtlpriv, FINIT, INIT_IQK, ("0xec4 = 0x%x\n", regec4));
+                RTPRINT(rtlpriv, FINIT, INIT_IQK,  "0xec4 = 0x%x\n", regec4);
                 regecc = rtl_get_bbreg(hw, 0xecc, BMASKDWORD);
-                RTPRINT(rtlpriv, FINIT, INIT_IQK, ("0xecc = 0x%x\n", regecc));
+                RTPRINT(rtlpriv, FINIT, INIT_IQK,  "0xecc = 0x%x\n", regecc);
                 if (!(regeac & BIT(31)) &&
                     (((regeb4 & 0x03FF0000) >> 16) != 0x142))
                         result |= 0x01;
@@ -1893,7 +1881,7 @@ static u8 _rtl92d_phy_pathb_iqk_5g_normal(struct ieee80211_hw *hw)
                         break;
                 } else {
                         RTPRINT(rtlpriv, FINIT, INIT_IQK,
-                                ("Path B Rx IQK fail!!\n"));
+                                "Path B Rx IQK fail!!\n");
                 }
         }
 
@@ -1912,7 +1900,7 @@ static void _rtl92d_phy_save_adda_registers(struct ieee80211_hw *hw,
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         u32 i;
 
-        RTPRINT(rtlpriv, FINIT, INIT_IQK, ("Save ADDA parameters.\n"));
+        RTPRINT(rtlpriv, FINIT, INIT_IQK,  "Save ADDA parameters.\n");
         for (i = 0; i < regnum; i++)
                 adda_backup[i] = rtl_get_bbreg(hw, adda_reg[i], BMASKDWORD);
 }
@@ -1923,7 +1911,7 @@ static void _rtl92d_phy_save_mac_registers(struct ieee80211_hw *hw,
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         u32 i;
 
-        RTPRINT(rtlpriv, FINIT, INIT_IQK, ("Save MAC parameters.\n"));
+        RTPRINT(rtlpriv, FINIT, INIT_IQK,  "Save MAC parameters.\n");
         for (i = 0; i < (IQK_MAC_REG_NUM - 1); i++)
                 macbackup[i] = rtl_read_byte(rtlpriv, macreg[i]);
         macbackup[i] = rtl_read_dword(rtlpriv, macreg[i]);
@@ -1937,7 +1925,7 @@ static void _rtl92d_phy_reload_adda_registers(struct ieee80211_hw *hw,
         u32 i;
 
         RTPRINT(rtlpriv, FINIT, INIT_IQK,
-                ("Reload ADDA power saving parameters !\n"));
+                "Reload ADDA power saving parameters !\n");
         for (i = 0; i < regnum; i++)
                 rtl_set_bbreg(hw, adda_reg[i], BMASKDWORD, adda_backup[i]);
 }
@@ -1948,7 +1936,7 @@ static void _rtl92d_phy_reload_mac_registers(struct ieee80211_hw *hw,
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         u32 i;
 
-        RTPRINT(rtlpriv, FINIT, INIT_IQK, ("Reload MAC parameters !\n"));
+        RTPRINT(rtlpriv, FINIT, INIT_IQK,  "Reload MAC parameters !\n");
         for (i = 0; i < (IQK_MAC_REG_NUM - 1); i++)
                 rtl_write_byte(rtlpriv, macreg[i], (u8) macbackup[i]);
         rtl_write_byte(rtlpriv, macreg[i], macbackup[i]);
@@ -1961,7 +1949,7 @@ static void _rtl92d_phy_path_adda_on(struct ieee80211_hw *hw,
         u32 pathon;
         u32 i;
 
-        RTPRINT(rtlpriv, FINIT, INIT_IQK, ("ADDA ON.\n"));
+        RTPRINT(rtlpriv, FINIT, INIT_IQK,  "ADDA ON.\n");
         pathon = patha_on ? 0x04db25a4 : 0x0b1b25a4;
         if (patha_on)
                 pathon = rtlpriv->rtlhal.interfaceindex == 0 ?
@@ -1976,7 +1964,7 @@ static void _rtl92d_phy_mac_setting_calibration(struct ieee80211_hw *hw,
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         u32 i;
 
-        RTPRINT(rtlpriv, FINIT, INIT_IQK, ("MAC settings for Calibration.\n"));
+        RTPRINT(rtlpriv, FINIT, INIT_IQK,  "MAC settings for Calibration.\n");
         rtl_write_byte(rtlpriv, macreg[0], 0x3F);
 
         for (i = 1; i < (IQK_MAC_REG_NUM - 1); i++)
@@ -1988,7 +1976,7 @@ static void _rtl92d_phy_mac_setting_calibration(struct ieee80211_hw *hw,
 static void _rtl92d_phy_patha_standby(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
-        RTPRINT(rtlpriv, FINIT, INIT_IQK, ("Path-A standby mode!\n"));
+        RTPRINT(rtlpriv, FINIT, INIT_IQK,  "Path-A standby mode!\n");
 
         rtl_set_bbreg(hw, 0xe28, BMASKDWORD, 0x0);
         rtl_set_bbreg(hw, RFPGA0_XA_LSSIPARAMETER, BMASKDWORD, 0x00010000);
@@ -2001,7 +1989,7 @@ static void _rtl92d_phy_pimode_switch(struct ieee80211_hw *hw, bool pi_mode)
         u32 mode;
 
         RTPRINT(rtlpriv, FINIT, INIT_IQK,
-                ("BB Switch to %s mode!\n", (pi_mode ? "PI" : "SI")));
+                "BB Switch to %s mode!\n", pi_mode ? "PI" : "SI");
         mode = pi_mode ? 0x01000100 : 0x01000000;
         rtl_set_bbreg(hw, 0x820, BMASKDWORD, mode);
         rtl_set_bbreg(hw, 0x828, BMASKDWORD, mode);
@@ -2033,12 +2021,12 @@ static void _rtl92d_phy_iq_calibrate(struct ieee80211_hw *hw, long result[][8],
         const u32 retrycount = 2;
         u32 bbvalue;
 
-        RTPRINT(rtlpriv, FINIT, INIT_IQK, ("IQK for 2.4G :Start!!!\n"));
+        RTPRINT(rtlpriv, FINIT, INIT_IQK,  "IQK for 2.4G :Start!!!\n");
         if (t == 0) {
                 bbvalue = rtl_get_bbreg(hw, RFPGA0_RFMOD, BMASKDWORD);
-                RTPRINT(rtlpriv, FINIT, INIT_IQK, ("==>0x%08x\n", bbvalue));
-                RTPRINT(rtlpriv, FINIT, INIT_IQK, ("IQ Calibration for %s\n",
-                        (is2t ? "2T2R" : "1T1R")));
+                RTPRINT(rtlpriv, FINIT, INIT_IQK,  "==>0x%08x\n", bbvalue);
+                RTPRINT(rtlpriv, FINIT, INIT_IQK, "IQ Calibration for %s\n",
+                        is2t ? "2T2R" : "1T1R");
 
                 /*  Save ADDA parameters, turn Path A ADDA on */
                 _rtl92d_phy_save_adda_registers(hw, adda_reg,
@@ -2076,7 +2064,7 @@ static void _rtl92d_phy_iq_calibrate(struct ieee80211_hw *hw, long result[][8],
         if (is2t)
                 rtl_set_bbreg(hw, 0xb6c, BMASKDWORD, 0x0f600000);
         /* IQ calibration setting */
-        RTPRINT(rtlpriv, FINIT, INIT_IQK, ("IQK setting!\n"));
+        RTPRINT(rtlpriv, FINIT, INIT_IQK,  "IQK setting!\n");
         rtl_set_bbreg(hw, 0xe28, BMASKDWORD, 0x80800000);
         rtl_set_bbreg(hw, 0xe40, BMASKDWORD, 0x01007c00);
         rtl_set_bbreg(hw, 0xe44, BMASKDWORD, 0x01004800);
@@ -2084,7 +2072,7 @@ static void _rtl92d_phy_iq_calibrate(struct ieee80211_hw *hw, long result[][8],
                 patha_ok = _rtl92d_phy_patha_iqk(hw, is2t);
                 if (patha_ok == 0x03) {
                         RTPRINT(rtlpriv, FINIT, INIT_IQK,
-                                ("Path A IQK Success!!\n"));
+                                "Path A IQK Success!!\n");
                         result[t][0] = (rtl_get_bbreg(hw, 0xe94, BMASKDWORD) &
                                         0x3FF0000) >> 16;
                         result[t][1] = (rtl_get_bbreg(hw, 0xe9c, BMASKDWORD) &
@@ -2097,7 +2085,7 @@ static void _rtl92d_phy_iq_calibrate(struct ieee80211_hw *hw, long result[][8],
                 } else if (i == (retrycount - 1) && patha_ok == 0x01) {
                         /* Tx IQK OK */
                         RTPRINT(rtlpriv, FINIT, INIT_IQK,
-                                ("Path A IQK Only  Tx Success!!\n"));
+                                "Path A IQK Only  Tx Success!!\n");
 
                         result[t][0] = (rtl_get_bbreg(hw, 0xe94, BMASKDWORD) &
                                         0x3FF0000) >> 16;
@@ -2106,7 +2094,7 @@ static void _rtl92d_phy_iq_calibrate(struct ieee80211_hw *hw, long result[][8],
                 }
         }
         if (0x00 == patha_ok)
-                RTPRINT(rtlpriv, FINIT, INIT_IQK, ("Path A IQK failed!!\n"));
+                RTPRINT(rtlpriv, FINIT, INIT_IQK,  "Path A IQK failed!!\n");
         if (is2t) {
                 _rtl92d_phy_patha_standby(hw);
                 /* Turn Path B ADDA on */
@@ -2115,7 +2103,7 @@ static void _rtl92d_phy_iq_calibrate(struct ieee80211_hw *hw, long result[][8],
                         pathb_ok = _rtl92d_phy_pathb_iqk(hw);
                         if (pathb_ok == 0x03) {
                                 RTPRINT(rtlpriv, FINIT, INIT_IQK,
-                                        ("Path B IQK Success!!\n"));
+                                        "Path B IQK Success!!\n");
                                 result[t][4] = (rtl_get_bbreg(hw, 0xeb4,
                                                BMASKDWORD) & 0x3FF0000) >> 16;
                                 result[t][5] = (rtl_get_bbreg(hw, 0xebc,
@@ -2128,7 +2116,7 @@ static void _rtl92d_phy_iq_calibrate(struct ieee80211_hw *hw, long result[][8],
                         } else if (i == (retrycount - 1) && pathb_ok == 0x01) {
                                 /* Tx IQK OK */
                                 RTPRINT(rtlpriv, FINIT, INIT_IQK,
-                                        ("Path B Only Tx IQK Success!!\n"));
+                                        "Path B Only Tx IQK Success!!\n");
                                 result[t][4] = (rtl_get_bbreg(hw, 0xeb4,
                                                BMASKDWORD) & 0x3FF0000) >> 16;
                                 result[t][5] = (rtl_get_bbreg(hw, 0xebc,
@@ -2137,12 +2125,12 @@ static void _rtl92d_phy_iq_calibrate(struct ieee80211_hw *hw, long result[][8],
                 }
                 if (0x00 == pathb_ok)
                         RTPRINT(rtlpriv, FINIT, INIT_IQK,
-                                ("Path B IQK failed!!\n"));
+                                "Path B IQK failed!!\n");
         }
 
         /* Back to BB mode, load original value */
         RTPRINT(rtlpriv, FINIT, INIT_IQK,
-                ("IQK:Back to BB mode, load original value!\n"));
+                "IQK:Back to BB mode, load original value!\n");
 
         rtl_set_bbreg(hw, 0xe28, BMASKDWORD, 0);
         if (t != 0) {
@@ -2167,7 +2155,7 @@ static void _rtl92d_phy_iq_calibrate(struct ieee80211_hw *hw, long result[][8],
                 rtl_set_bbreg(hw, 0xe30, BMASKDWORD, 0x01008c00);
                 rtl_set_bbreg(hw, 0xe34, BMASKDWORD, 0x01008c00);
         }
-        RTPRINT(rtlpriv, FINIT, INIT_IQK, ("<==\n"));
+        RTPRINT(rtlpriv, FINIT, INIT_IQK,  "<==\n");
 }
 
 static void _rtl92d_phy_iq_calibrate_5g_normal(struct ieee80211_hw *hw,
@@ -2199,13 +2187,13 @@ static void _rtl92d_phy_iq_calibrate_5g_normal(struct ieee80211_hw *hw,
         /* Note: IQ calibration must be performed after loading
          * PHY_REG.txt , and radio_a, radio_b.txt */
 
-        RTPRINT(rtlpriv, FINIT, INIT_IQK, ("IQK for 5G NORMAL:Start!!!\n"));
+        RTPRINT(rtlpriv, FINIT, INIT_IQK,  "IQK for 5G NORMAL:Start!!!\n");
         mdelay(IQK_DELAY_TIME * 20);
         if (t == 0) {
                 bbvalue = rtl_get_bbreg(hw, RFPGA0_RFMOD, BMASKDWORD);
-                RTPRINT(rtlpriv, FINIT, INIT_IQK, ("==>0x%08x\n", bbvalue));
-                RTPRINT(rtlpriv, FINIT, INIT_IQK, ("IQ Calibration for %s\n",
-                        (is2t ? "2T2R" : "1T1R")));
+                RTPRINT(rtlpriv, FINIT, INIT_IQK,  "==>0x%08x\n", bbvalue);
+                RTPRINT(rtlpriv, FINIT, INIT_IQK, "IQ Calibration for %s\n",
+                        is2t ? "2T2R" : "1T1R");
                 /* Save ADDA parameters, turn Path A ADDA on */
                 _rtl92d_phy_save_adda_registers(hw, adda_reg,
                                                 rtlphy->adda_backup,
@@ -2242,13 +2230,13 @@ static void _rtl92d_phy_iq_calibrate_5g_normal(struct ieee80211_hw *hw,
         if (is2t)
                 rtl_set_bbreg(hw, 0xb6c, BMASKDWORD, 0x0f600000);
         /* IQ calibration setting  */
-        RTPRINT(rtlpriv, FINIT, INIT_IQK, ("IQK setting!\n"));
+        RTPRINT(rtlpriv, FINIT, INIT_IQK,  "IQK setting!\n");
         rtl_set_bbreg(hw, 0xe28, BMASKDWORD, 0x80800000);
         rtl_set_bbreg(hw, 0xe40, BMASKDWORD, 0x10007c00);
         rtl_set_bbreg(hw, 0xe44, BMASKDWORD, 0x01004800);
         patha_ok = _rtl92d_phy_patha_iqk_5g_normal(hw, is2t);
         if (patha_ok == 0x03) {
-                RTPRINT(rtlpriv, FINIT, INIT_IQK, ("Path A IQK Success!!\n"));
+                RTPRINT(rtlpriv, FINIT, INIT_IQK,  "Path A IQK Success!!\n");
                 result[t][0] = (rtl_get_bbreg(hw, 0xe94, BMASKDWORD) &
                                 0x3FF0000) >> 16;
                 result[t][1] = (rtl_get_bbreg(hw, 0xe9c, BMASKDWORD) &
@@ -2259,14 +2247,14 @@ static void _rtl92d_phy_iq_calibrate_5g_normal(struct ieee80211_hw *hw,
                                 0x3FF0000) >> 16;
         } else if (patha_ok == 0x01) {  /* Tx IQK OK */
                 RTPRINT(rtlpriv, FINIT, INIT_IQK,
-                        ("Path A IQK Only  Tx Success!!\n"));
+                        "Path A IQK Only  Tx Success!!\n");
 
                 result[t][0] = (rtl_get_bbreg(hw, 0xe94, BMASKDWORD) &
                                 0x3FF0000) >> 16;
                 result[t][1] = (rtl_get_bbreg(hw, 0xe9c, BMASKDWORD) &
                                 0x3FF0000) >> 16;
         } else {
-                RTPRINT(rtlpriv, FINIT, INIT_IQK, ("Path A IQK Fail!!\n"));
+                RTPRINT(rtlpriv, FINIT, INIT_IQK,  "Path A IQK Fail!!\n");
         }
         if (is2t) {
                 /* _rtl92d_phy_patha_standby(hw); */
@@ -2275,7 +2263,7 @@ static void _rtl92d_phy_iq_calibrate_5g_normal(struct ieee80211_hw *hw,
                 pathb_ok = _rtl92d_phy_pathb_iqk_5g_normal(hw);
                 if (pathb_ok == 0x03) {
                         RTPRINT(rtlpriv, FINIT, INIT_IQK,
-                                ("Path B IQK Success!!\n"));
+                                "Path B IQK Success!!\n");
                         result[t][4] = (rtl_get_bbreg(hw, 0xeb4, BMASKDWORD) &
                              0x3FF0000) >> 16;
                         result[t][5] = (rtl_get_bbreg(hw, 0xebc, BMASKDWORD) &
@@ -2286,20 +2274,20 @@ static void _rtl92d_phy_iq_calibrate_5g_normal(struct ieee80211_hw *hw,
                              0x3FF0000) >> 16;
                 } else if (pathb_ok == 0x01) { /* Tx IQK OK */
                         RTPRINT(rtlpriv, FINIT, INIT_IQK,
-                                ("Path B Only Tx IQK Success!!\n"));
+                                "Path B Only Tx IQK Success!!\n");
                         result[t][4] = (rtl_get_bbreg(hw, 0xeb4, BMASKDWORD) &
                              0x3FF0000) >> 16;
                         result[t][5] = (rtl_get_bbreg(hw, 0xebc, BMASKDWORD) &
                              0x3FF0000) >> 16;
                 } else {
                         RTPRINT(rtlpriv, FINIT, INIT_IQK,
-                                ("Path B IQK failed!!\n"));
+                                "Path B IQK failed!!\n");
                 }
         }
 
         /* Back to BB mode, load original value */
         RTPRINT(rtlpriv, FINIT, INIT_IQK,
-                ("IQK:Back to BB mode, load original value!\n"));
+                "IQK:Back to BB mode, load original value!\n");
         rtl_set_bbreg(hw, 0xe28, BMASKDWORD, 0);
         if (t != 0) {
                 if (is2t)
@@ -2321,7 +2309,7 @@ static void _rtl92d_phy_iq_calibrate_5g_normal(struct ieee80211_hw *hw,
                                                   rtlphy->adda_backup,
                                                   IQK_ADDA_REG_NUM);
         }
-        RTPRINT(rtlpriv, FINIT, INIT_IQK, ("<==\n"));
+        RTPRINT(rtlpriv, FINIT, INIT_IQK,  "<==\n");
 }
 
 static bool _rtl92d_phy_simularity_compare(struct ieee80211_hw *hw,
@@ -2395,8 +2383,7 @@ static void _rtl92d_phy_patha_fill_iqk_matrix(struct ieee80211_hw *hw,
             rtlhal->macphymode == DUALMAC_DUALPHY;
 
         RTPRINT(rtlpriv, FINIT, INIT_IQK,
-                ("Path A IQ Calibration %s !\n",
-                (iqk_ok) ? "Success" : "Failed"));
+                "Path A IQ Calibration %s !\n", iqk_ok ? "Success" : "Failed");
         if (final_candidate == 0xFF) {
                 return;
         } else if (iqk_ok) {
@@ -2406,8 +2393,9 @@ static void _rtl92d_phy_patha_fill_iqk_matrix(struct ieee80211_hw *hw,
                 if ((val_x & 0x00000200) != 0)
                         val_x = val_x | 0xFFFFFC00;
                 tx0_a = (val_x * oldval_0) >> 8;
-                RTPRINT(rtlpriv, FINIT, INIT_IQK, ("X = 0x%x, tx0_a = 0x%x,"
-                        " oldval_0 0x%x\n",     val_x, tx0_a, oldval_0));
+                RTPRINT(rtlpriv, FINIT, INIT_IQK,
+                        "X = 0x%x, tx0_a = 0x%x, oldval_0 0x%x\n",
+                        val_x, tx0_a, oldval_0);
                 rtl_set_bbreg(hw, ROFDM0_XATxIQIMBALANCE, 0x3FF, tx0_a);
                 rtl_set_bbreg(hw, ROFDM0_ECCATHRESHOLD, BIT(24),
                               ((val_x * oldval_0 >> 7) & 0x1));
@@ -2419,8 +2407,9 @@ static void _rtl92d_phy_patha_fill_iqk_matrix(struct ieee80211_hw *hw,
                         rtlhal->current_bandtype == BAND_ON_5G)
                         val_y += 3;
                 tx0_c = (val_y * oldval_0) >> 8;
-                RTPRINT(rtlpriv, FINIT, INIT_IQK, ("Y = 0x%lx, tx0_c = 0x%lx\n",
-                        val_y, tx0_c));
+                RTPRINT(rtlpriv, FINIT, INIT_IQK,
+                        "Y = 0x%lx, tx0_c = 0x%lx\n",
+                        val_y, tx0_c);
                 rtl_set_bbreg(hw, ROFDM0_XCTxAFE, 0xF0000000,
                               ((tx0_c & 0x3C0) >> 6));
                 rtl_set_bbreg(hw, ROFDM0_XATxIQIMBALANCE, 0x003F0000,
@@ -2428,11 +2417,11 @@ static void _rtl92d_phy_patha_fill_iqk_matrix(struct ieee80211_hw *hw,
                 if (is2t)
                         rtl_set_bbreg(hw, ROFDM0_ECCATHRESHOLD, BIT(26),
                                       ((val_y * oldval_0 >> 7) & 0x1));
-                RTPRINT(rtlpriv, FINIT, INIT_IQK, ("0xC80 = 0x%x\n",
-                         rtl_get_bbreg(hw, ROFDM0_XATxIQIMBALANCE,
-                                       BMASKDWORD)));
+                RTPRINT(rtlpriv, FINIT, INIT_IQK, "0xC80 = 0x%x\n",
+                        rtl_get_bbreg(hw, ROFDM0_XATxIQIMBALANCE,
+                                      BMASKDWORD));
                 if (txonly) {
-                        RTPRINT(rtlpriv, FINIT, INIT_IQK, ("only Tx OK\n"));
+                        RTPRINT(rtlpriv, FINIT, INIT_IQK,  "only Tx OK\n");
                         return;
                 }
                 reg = result[final_candidate][2];
@@ -2452,8 +2441,8 @@ static void _rtl92d_phy_pathb_fill_iqk_matrix(struct ieee80211_hw *hw,
         u32 oldval_1, val_x, tx1_a, reg;
         long val_y, tx1_c;
 
-        RTPRINT(rtlpriv, FINIT, INIT_IQK, ("Path B IQ Calibration %s !\n",
-                 (iqk_ok) ? "Success" : "Failed"));
+        RTPRINT(rtlpriv, FINIT, INIT_IQK, "Path B IQ Calibration %s !\n",
+                iqk_ok ? "Success" : "Failed");
         if (final_candidate == 0xFF) {
                 return;
         } else if (iqk_ok) {
@@ -2463,8 +2452,8 @@ static void _rtl92d_phy_pathb_fill_iqk_matrix(struct ieee80211_hw *hw,
                 if ((val_x & 0x00000200) != 0)
                         val_x = val_x | 0xFFFFFC00;
                 tx1_a = (val_x * oldval_1) >> 8;
-                RTPRINT(rtlpriv, FINIT, INIT_IQK, ("X = 0x%x, tx1_a = 0x%x\n",
-                        val_x, tx1_a));
+                RTPRINT(rtlpriv, FINIT, INIT_IQK, "X = 0x%x, tx1_a = 0x%x\n",
+                        val_x, tx1_a);
                 rtl_set_bbreg(hw, ROFDM0_XBTxIQIMBALANCE, 0x3FF, tx1_a);
                 rtl_set_bbreg(hw, ROFDM0_ECCATHRESHOLD, BIT(28),
                               ((val_x * oldval_1 >> 7) & 0x1));
@@ -2474,8 +2463,8 @@ static void _rtl92d_phy_pathb_fill_iqk_matrix(struct ieee80211_hw *hw,
                 if (rtlhal->current_bandtype == BAND_ON_5G)
                         val_y += 3;
                 tx1_c = (val_y * oldval_1) >> 8;
-                RTPRINT(rtlpriv, FINIT, INIT_IQK, ("Y = 0x%lx, tx1_c = 0x%lx\n",
-                        val_y, tx1_c));
+                RTPRINT(rtlpriv, FINIT, INIT_IQK, "Y = 0x%lx, tx1_c = 0x%lx\n",
+                        val_y, tx1_c);
                 rtl_set_bbreg(hw, ROFDM0_XDTxAFE, 0xF0000000,
                               ((tx1_c & 0x3C0) >> 6));
                 rtl_set_bbreg(hw, ROFDM0_XBTxIQIMBALANCE, 0x003F0000,
@@ -2507,7 +2496,7 @@ void rtl92d_phy_iq_calibrate(struct ieee80211_hw *hw)
         unsigned long flag = 0;
 
         RTPRINT(rtlpriv, FINIT, INIT_IQK,
-                ("IQK:Start!!!channel %d\n", rtlphy->current_channel));
+                "IQK:Start!!!channel %d\n", rtlphy->current_channel);
         for (i = 0; i < 8; i++) {
                 result[0][i] = 0;
                 result[1][i] = 0;
@@ -2521,7 +2510,7 @@ void rtl92d_phy_iq_calibrate(struct ieee80211_hw *hw)
         is23simular = false;
         is13simular = false;
         RTPRINT(rtlpriv, FINIT, INIT_IQK,
-                ("IQK !!!currentband %d\n", rtlhal->current_bandtype));
+                "IQK !!!currentband %d\n", rtlhal->current_bandtype);
         rtl92d_acquire_cckandrw_pagea_ctl(hw, &flag);
         for (i = 0; i < 3; i++) {
                 if (rtlhal->current_bandtype == BAND_ON_5G) {
@@ -2573,10 +2562,9 @@ void rtl92d_phy_iq_calibrate(struct ieee80211_hw *hw)
                 regec4 = result[i][6];
                 regecc = result[i][7];
                 RTPRINT(rtlpriv, FINIT, INIT_IQK,
-                        ("IQK: rege94=%lx rege9c=%lx regea4=%lx regeac=%lx "
-                        "regeb4=%lx regebc=%lx regec4=%lx regecc=%lx\n ",
+                        "IQK: rege94=%lx rege9c=%lx regea4=%lx regeac=%lx regeb4=%lx regebc=%lx regec4=%lx regecc=%lx\n",
                         rege94, rege9c, regea4, regeac, regeb4, regebc, regec4,
-                        regecc));
+                        regecc);
         }
         if (final_candidate != 0xff) {
                 rtlphy->reg_e94 = rege94 = result[final_candidate][0];
@@ -2588,12 +2576,11 @@ void rtl92d_phy_iq_calibrate(struct ieee80211_hw *hw)
                 regec4 = result[final_candidate][6];
                 regecc = result[final_candidate][7];
                 RTPRINT(rtlpriv, FINIT, INIT_IQK,
-                        ("IQK: final_candidate is %x\n", final_candidate));
+                        "IQK: final_candidate is %x\n", final_candidate);
                 RTPRINT(rtlpriv, FINIT, INIT_IQK,
-                        ("IQK: rege94=%lx rege9c=%lx regea4=%lx regeac=%lx "
-                        "regeb4=%lx regebc=%lx regec4=%lx regecc=%lx\n ",
+                        "IQK: rege94=%lx rege9c=%lx regea4=%lx regeac=%lx regeb4=%lx regebc=%lx regec4=%lx regecc=%lx\n",
                         rege94, rege9c, regea4, regeac, regeb4, regebc, regec4,
-                        regecc));
+                        regecc);
                 patha_ok = pathb_ok = true;
         } else {
                 rtlphy->reg_e94 = rtlphy->reg_eb4 = 0x100; /* X default value */
@@ -2618,7 +2605,7 @@ void rtl92d_phy_iq_calibrate(struct ieee80211_hw *hw)
                         true;
 
                 RT_TRACE(rtlpriv, COMP_SCAN | COMP_MLME, DBG_LOUD,
-                         ("\nIQK OK indexforchannel %d.\n", indexforchannel));
+                         "IQK OK indexforchannel %d\n", indexforchannel);
         }
 }
 
@@ -2629,17 +2616,17 @@ void rtl92d_phy_reload_iqk_setting(struct ieee80211_hw *hw, u8 channel)
         struct rtl_hal *rtlhal = &(rtlpriv->rtlhal);
         u8 indexforchannel;
 
-        RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD, ("channel %d\n", channel));
+        RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD, "channel %d\n", channel);
         /*------Do IQK for normal chip and test chip 5G band------- */
         indexforchannel = rtl92d_get_rightchnlplace_for_iqk(channel);
-        RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD,
-                ("indexforchannel %d done %d\n", indexforchannel,
-                rtlphy->iqk_matrix_regsetting[indexforchannel].iqk_done));
+        RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD, "indexforchannel %d done %d\n",
+                 indexforchannel,
+                 rtlphy->iqk_matrix_regsetting[indexforchannel].iqk_done);
         if (0 && !rtlphy->iqk_matrix_regsetting[indexforchannel].iqk_done &&
                 rtlphy->need_iqk) {
                 /* Re Do IQK. */
                 RT_TRACE(rtlpriv, COMP_SCAN | COMP_INIT, DBG_LOUD,
-                         ("Do IQK Matrix reg for channel:%d....\n", channel));
+                         "Do IQK Matrix reg for channel:%d....\n", channel);
                 rtl92d_phy_iq_calibrate(hw);
         } else {
                 /* Just load the value. */
@@ -2647,8 +2634,8 @@ void rtl92d_phy_reload_iqk_setting(struct ieee80211_hw *hw, u8 channel)
                 if (((!rtlhal->load_imrandiqk_setting_for2g) &&
                     indexforchannel == 0) || indexforchannel > 0) {
                         RT_TRACE(rtlpriv, COMP_SCAN, DBG_LOUD,
-                                 ("Just Read IQK Matrix reg for channel:%d"
-                                 "....\n", channel));
+                                 "Just Read IQK Matrix reg for channel:%d....\n",
+                                 channel);
                         if ((rtlphy->iqk_matrix_regsetting[indexforchannel].
                              value[0] != NULL)
                                 /*&&(regea4 != 0) */)
@@ -2672,7 +2659,7 @@ void rtl92d_phy_reload_iqk_setting(struct ieee80211_hw *hw, u8 channel)
                 }
         }
         rtlphy->need_iqk = false;
-        RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD, ("<====\n"));
+        RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD, "<====\n");
 }
 
 static u32 _rtl92d_phy_get_abs(u32 val1, u32 val2)
@@ -2727,8 +2714,8 @@ static void _rtl92d_phy_calc_curvindex(struct ieee80211_hw *hw,
                         }
                 }
                 smallest_abs_val = 0xffffffff;
-                RTPRINT(rtlpriv, FINIT, INIT_IQK, ("curveindex[%d] = %x\n", i,
-                        curveindex[i]));
+                RTPRINT(rtlpriv, FINIT, INIT_IQK, "curveindex[%d] = %x\n",
+                        i, curveindex[i]);
         }
 }
 
@@ -2743,14 +2730,14 @@ static void _rtl92d_phy_reload_lck_setting(struct ieee80211_hw *hw,
         u32 u4tmp = 0, u4regvalue = 0;
         bool bneed_powerdown_radio = false;
 
-        RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD, ("path %d\n", erfpath));
-        RTPRINT(rtlpriv, FINIT, INIT_IQK, ("band type = %d\n",
-                rtlpriv->rtlhal.current_bandtype));
-        RTPRINT(rtlpriv, FINIT, INIT_IQK, ("channel = %d\n", channel));
+        RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD, "path %d\n", erfpath);
+        RTPRINT(rtlpriv, FINIT, INIT_IQK, "band type = %d\n",
+                rtlpriv->rtlhal.current_bandtype);
+        RTPRINT(rtlpriv, FINIT, INIT_IQK,  "channel = %d\n", channel);
         if (rtlpriv->rtlhal.current_bandtype == BAND_ON_5G) {/* Path-A for 5G */
                 u4tmp = curveindex_5g[channel-1];
                 RTPRINT(rtlpriv, FINIT, INIT_IQK,
-                        ("ver 1 set RF-A, 5G,   0x28 = 0x%ulx !!\n", u4tmp));
+                        "ver 1 set RF-A, 5G,    0x28 = 0x%ulx !!\n", u4tmp);
                 if (rtlpriv->rtlhal.macphymode == DUALMAC_DUALPHY &&
                         rtlpriv->rtlhal.interfaceindex == 1) {
                         bneed_powerdown_radio =
@@ -2769,7 +2756,7 @@ static void _rtl92d_phy_reload_lck_setting(struct ieee80211_hw *hw,
         } else if (rtlpriv->rtlhal.current_bandtype == BAND_ON_2_4G) {
                 u4tmp = curveindex_2g[channel-1];
                 RTPRINT(rtlpriv, FINIT, INIT_IQK,
-                        ("ver 3 set RF-B, 2G, 0x28 = 0x%ulx !!\n", u4tmp));
+                        "ver 3 set RF-B, 2G, 0x28 = 0x%ulx !!\n", u4tmp);
                 if (rtlpriv->rtlhal.macphymode == DUALMAC_DUALPHY &&
                         rtlpriv->rtlhal.interfaceindex == 0) {
                         bneed_powerdown_radio =
@@ -2781,14 +2768,14 @@ static void _rtl92d_phy_reload_lck_setting(struct ieee80211_hw *hw,
                 }
                 rtl_set_rfreg(hw, erfpath, RF_SYN_G4, 0x3f800, u4tmp);
                 RTPRINT(rtlpriv, FINIT, INIT_IQK,
-                        ("ver 3 set RF-B, 2G, 0x28 = 0x%ulx !!\n",
-                        rtl_get_rfreg(hw,  erfpath, RF_SYN_G4, 0x3f800)));
+                        "ver 3 set RF-B, 2G, 0x28 = 0x%ulx !!\n",
+                        rtl_get_rfreg(hw,  erfpath, RF_SYN_G4, 0x3f800));
                 if (bneed_powerdown_radio)
                         _rtl92d_phy_restore_rf_env(hw, erfpath, &u4regvalue);
                 if (rtlpriv->rtlhal.during_mac0init_radiob)
                         rtl92d_phy_powerdown_anotherphy(hw, true);
         }
-        RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD, ("<====\n"));
+        RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD, "<====\n");
 }
 
 static void _rtl92d_phy_lc_calibrate_sw(struct ieee80211_hw *hw, bool is2t)
@@ -2836,20 +2823,20 @@ static void _rtl92d_phy_lc_calibrate_sw(struct ieee80211_hw *hw, bool is2t)
                                               RF_SYN_G6, BRFREGOFFSETMASK);
                 }
                 RTPRINT(rtlpriv, FINIT, INIT_IQK,
-                        ("PHY_LCK finish delay for %d ms=2\n", timecount));
+                        "PHY_LCK finish delay for %d ms=2\n", timecount);
                 u4tmp = rtl_get_rfreg(hw, index, RF_SYN_G4, BRFREGOFFSETMASK);
                 if (index == 0 && rtlhal->interfaceindex == 0) {
                         RTPRINT(rtlpriv, FINIT, INIT_IQK,
-                                ("path-A / 5G LCK\n"));
+                                "path-A / 5G LCK\n");
                 } else {
                         RTPRINT(rtlpriv, FINIT, INIT_IQK,
-                                ("path-B / 2.4G LCK\n"));
+                                "path-B / 2.4G LCK\n");
                 }
                 memset(&curvecount_val[0], 0, CV_CURVE_CNT * 2);
                 /* Set LC calibration off */
                 rtl_set_rfreg(hw, (enum radio_path)index, RF_CHNLBW,
                               0x08000, 0x0);
-                RTPRINT(rtlpriv, FINIT, INIT_IQK, ("set RF 0x18[15] = 0\n"));
+                RTPRINT(rtlpriv, FINIT, INIT_IQK,  "set RF 0x18[15] = 0\n");
                 /* save Curve-counting number */
                 for (i = 0; i < CV_CURVE_CNT; i++) {
                         u32 readval = 0, readval2 = 0;
@@ -2899,7 +2886,7 @@ static void _rtl92d_phy_lc_calibrate(struct ieee80211_hw *hw, bool is2t)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
 
-        RTPRINT(rtlpriv, FINIT, INIT_IQK, ("cosa PHY_LCK ver=2\n"));
+        RTPRINT(rtlpriv, FINIT, INIT_IQK,  "cosa PHY_LCK ver=2\n");
         _rtl92d_phy_lc_calibrate_sw(hw, is2t);
 }
 
@@ -2917,8 +2904,8 @@ void rtl92d_phy_lc_calibrate(struct ieee80211_hw *hw)
 
         rtlphy->lck_inprogress = true;
         RTPRINT(rtlpriv, FINIT, INIT_IQK,
-                ("LCK:Start!!! currentband %x delay %d ms\n",
-                 rtlhal->current_bandtype, timecount));
+                "LCK:Start!!! currentband %x delay %d ms\n",
+                rtlhal->current_bandtype, timecount);
         if (IS_92D_SINGLEPHY(rtlhal->version)) {
                 _rtl92d_phy_lc_calibrate(hw, true);
         } else {
@@ -2926,7 +2913,7 @@ void rtl92d_phy_lc_calibrate(struct ieee80211_hw *hw)
                 _rtl92d_phy_lc_calibrate(hw, false);
         }
         rtlphy->lck_inprogress = false;
-        RTPRINT(rtlpriv, FINIT, INIT_IQK, ("LCK:Finish!!!\n"));
+        RTPRINT(rtlpriv, FINIT, INIT_IQK,  "LCK:Finish!!!\n");
 }
 
 void rtl92d_phy_ap_calibrate(struct ieee80211_hw *hw, char delta)
@@ -2941,7 +2928,7 @@ static bool _rtl92d_phy_set_sw_chnl_cmdarray(struct swchnlcmd *cmdtable,
         struct swchnlcmd *pcmd;
 
         if (cmdtable == NULL) {
-                RT_ASSERT(false, ("cmdtable cannot be NULL.\n"));
+                RT_ASSERT(false, "cmdtable cannot be NULL\n");
                 return false;
         }
         if (cmdtableidx >= cmdtablesz)
@@ -2962,10 +2949,10 @@ void rtl92d_phy_reset_iqk_result(struct ieee80211_hw *hw)
         u8 i;
 
         RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
-                        ("settings regs %d default regs %d\n",
-                        (int)(sizeof(rtlphy->iqk_matrix_regsetting) /
-                        sizeof(struct iqk_matrix_regs)),
-                        IQK_MATRIX_REG_NUM));
+                 "settings regs %d default regs %d\n",
+                 (int)(sizeof(rtlphy->iqk_matrix_regsetting) /
+                       sizeof(struct iqk_matrix_regs)),
+                 IQK_MATRIX_REG_NUM);
         /* 0xe94, 0xe9c, 0xea4, 0xeac, 0xeb4, 0xebc, 0xec4, 0xecc */
         for (i = 0; i < IQK_MATRIX_SETTINGS_NUM; i++) {
                 rtlphy->iqk_matrix_regsetting[i].value[0][0] = 0x100;
@@ -3084,7 +3071,7 @@ static bool _rtl92d_phy_sw_chnl_step_by_step(struct ieee80211_hw *hw,
                         break;
                 default:
                         RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                                 ("switch case not process\n"));
+                                 "switch case not processed\n");
                         break;
                 }
                 break;
@@ -3111,7 +3098,7 @@ u8 rtl92d_phy_sw_chnl(struct ieee80211_hw *hw)
 
         if ((is_hal_stop(rtlhal)) || (RT_CANNOT_IO(hw))) {
                 RT_TRACE(rtlpriv, COMP_CHAN, DBG_LOUD,
-                         ("sw_chnl_inprogress false driver sleep or unload\n"));
+                         "sw_chnl_inprogress false driver sleep or unload\n");
                 return 0;
         }
         while (rtlphy->lck_inprogress && timecount < timeout) {
@@ -3133,19 +3120,18 @@ u8 rtl92d_phy_sw_chnl(struct ieee80211_hw *hw)
                  * 5G and 2.4G band. */
                 if (channel <= 14)
                         return 0;
-                RT_ASSERT((channel > 14), ("5G but channel<=14"));
+                RT_ASSERT((channel > 14), "5G but channel<=14\n");
                 break;
         case BAND_ON_2_4G:
                 /* Get first channel error when change between
                  * 5G and 2.4G band. */
                 if (channel > 14)
                         return 0;
-                RT_ASSERT((channel <= 14), ("2G but channel>14"));
+                RT_ASSERT((channel <= 14), "2G but channel>14\n");
                 break;
         default:
-                RT_ASSERT(false,
-                          ("Invalid WirelessMode(%#x)!!\n",
-                           rtlpriv->mac80211.mode));
+                RT_ASSERT(false, "Invalid WirelessMode(%#x)!!\n",
+                          rtlpriv->mac80211.mode);
                 break;
         }
         rtlphy->sw_chnl_inprogress = true;
@@ -3154,7 +3140,7 @@ u8 rtl92d_phy_sw_chnl(struct ieee80211_hw *hw)
         rtlphy->sw_chnl_stage = 0;
         rtlphy->sw_chnl_step = 0;
         RT_TRACE(rtlpriv, COMP_SCAN, DBG_TRACE,
-                 ("switch to channel%d\n", rtlphy->current_channel));
+                 "switch to channel%d\n", rtlphy->current_channel);
 
         do {
                 if (!rtlphy->sw_chnl_inprogress)
@@ -3171,7 +3157,7 @@ u8 rtl92d_phy_sw_chnl(struct ieee80211_hw *hw)
                 }
                 break;
         } while (true);
-        RT_TRACE(rtlpriv, COMP_SCAN, DBG_TRACE, ("<==\n"));
+        RT_TRACE(rtlpriv, COMP_SCAN, DBG_TRACE, "<==\n");
         rtlphy->sw_chnl_inprogress = false;
         return 1;
 }
@@ -3182,8 +3168,8 @@ static void rtl92d_phy_set_io(struct ieee80211_hw *hw)
         struct rtl_phy *rtlphy = &(rtlpriv->phy);
 
         RT_TRACE(rtlpriv, COMP_CMD, DBG_TRACE,
-                 ("--->Cmd(%#x), set_io_inprogress(%d)\n",
-                 rtlphy->current_io_type, rtlphy->set_io_inprogress));
+                 "--->Cmd(%#x), set_io_inprogress(%d)\n",
+                 rtlphy->current_io_type, rtlphy->set_io_inprogress);
         switch (rtlphy->current_io_type) {
         case IO_CMD_RESUME_DM_BY_SCAN:
                 de_digtable.cur_igvalue = rtlphy->initgain_backup.xaagccore1;
@@ -3197,12 +3183,12 @@ static void rtl92d_phy_set_io(struct ieee80211_hw *hw)
                 break;
         default:
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("switch case not process\n"));
+                         "switch case not processed\n");
                 break;
         }
         rtlphy->set_io_inprogress = false;
-        RT_TRACE(rtlpriv, COMP_CMD, DBG_TRACE,
-                 ("<---(%#x)\n", rtlphy->current_io_type));
+        RT_TRACE(rtlpriv, COMP_CMD, DBG_TRACE, "<---(%#x)\n",
+                 rtlphy->current_io_type);
 }
 
 bool rtl92d_phy_set_io_cmd(struct ieee80211_hw *hw, enum io_type iotype)
@@ -3212,23 +3198,23 @@ bool rtl92d_phy_set_io_cmd(struct ieee80211_hw *hw, enum io_type iotype)
         bool postprocessing = false;
 
         RT_TRACE(rtlpriv, COMP_CMD, DBG_TRACE,
-                 ("-->IO Cmd(%#x), set_io_inprogress(%d)\n",
-                 iotype, rtlphy->set_io_inprogress));
+                 "-->IO Cmd(%#x), set_io_inprogress(%d)\n",
+                 iotype, rtlphy->set_io_inprogress);
         do {
                 switch (iotype) {
                 case IO_CMD_RESUME_DM_BY_SCAN:
                         RT_TRACE(rtlpriv, COMP_CMD, DBG_TRACE,
-                                 ("[IO CMD] Resume DM after scan.\n"));
+                                 "[IO CMD] Resume DM after scan\n");
                         postprocessing = true;
                         break;
                 case IO_CMD_PAUSE_DM_BY_SCAN:
                         RT_TRACE(rtlpriv, COMP_CMD, DBG_TRACE,
-                                 ("[IO CMD] Pause DM before scan.\n"));
+                                 "[IO CMD] Pause DM before scan\n");
                         postprocessing = true;
                         break;
                 default:
                         RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                                 ("switch case not process\n"));
+                                 "switch case not processed\n");
                         break;
                 }
         } while (false);
@@ -3239,7 +3225,7 @@ bool rtl92d_phy_set_io_cmd(struct ieee80211_hw *hw, enum io_type iotype)
                 return false;
         }
         rtl92d_phy_set_io(hw);
-        RT_TRACE(rtlpriv, COMP_CMD, DBG_TRACE, ("<--IO Type(%#x)\n", iotype));
+        RT_TRACE(rtlpriv, COMP_CMD, DBG_TRACE, "<--IO Type(%#x)\n", iotype);
         return true;
 }
 
@@ -3297,7 +3283,7 @@ static void _rtl92d_phy_set_rfsleep(struct ieee80211_hw *hw)
                 rtl_write_byte(rtlpriv, REG_SYS_FUNC_EN, 0xE3);
                 rtl_write_byte(rtlpriv, REG_TXPAUSE, 0x00);
                 RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
-                        ("Fail !!! Switch RF timeout.\n"));
+                         "Fail !!! Switch RF timeout\n");
                 return;
         }
         /* e.   For PCIE: SYS_FUNC_EN 0x02[7:0] = 0xE2 reset BB TRX function */
@@ -3332,7 +3318,7 @@ bool rtl92d_phy_set_rf_power_state(struct ieee80211_hw *hw,
                         do {
                                 InitializeCount++;
                                 RT_TRACE(rtlpriv, COMP_RF, DBG_DMESG,
-                                         ("IPS Set eRf nic enable\n"));
+                                         "IPS Set eRf nic enable\n");
                                 rtstatus = rtl_ps_enable_nic(hw);
                         } while ((rtstatus != true) &&
                                  (InitializeCount < 10));
@@ -3341,11 +3327,10 @@ bool rtl92d_phy_set_rf_power_state(struct ieee80211_hw *hw,
                                           RT_RF_OFF_LEVL_HALT_NIC);
                 } else {
                         RT_TRACE(rtlpriv, COMP_POWER, DBG_DMESG,
-                                 ("awake, sleeped:%d ms state_"
-                                 "inap:%x\n",
+                                 "awake, sleeped:%d ms state_inap:%x\n",
                                  jiffies_to_msecs(jiffies -
-                                 ppsc->last_sleep_jiffies),
-                                 rtlpriv->psc.state_inap));
+                                                  ppsc->last_sleep_jiffies),
+                                 rtlpriv->psc.state_inap);
                         ppsc->last_awake_jiffies = jiffies;
                         _rtl92d_phy_set_rfon(hw);
                 }
@@ -3360,7 +3345,7 @@ bool rtl92d_phy_set_rf_power_state(struct ieee80211_hw *hw,
         case ERFOFF:
                 if (ppsc->reg_rfps_level & RT_RF_OFF_LEVL_HALT_NIC) {
                         RT_TRACE(rtlpriv, COMP_RF, DBG_DMESG,
-                                 ("IPS Set eRf nic disable\n"));
+                                 "IPS Set eRf nic disable\n");
                         rtl_ps_disable_nic(hw);
                         RT_SET_PS_LEVEL(ppsc, RT_RF_OFF_LEVL_HALT_NIC);
                 } else {
@@ -3385,41 +3370,40 @@ bool rtl92d_phy_set_rf_power_state(struct ieee80211_hw *hw,
                                 continue;
                         } else if (rtlpci->pdev->current_state != PCI_D0) {
                                 RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
-                                         ("eRf Off/Sleep: %d times TcbBusyQueu"
-                                         "e[%d] !=0 but lower power state!\n",
-                                         (i + 1), queue_id));
+                                         "eRf Off/Sleep: %d times TcbBusyQueue[%d] !=0 but lower power state!\n",
+                                         i + 1, queue_id);
                                 break;
                         } else {
                                 RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
-                                         ("eRf Off/Sleep: %d times TcbBusyQueu"
-                                         "e[%d] =%d "
-                                         "before doze!\n", (i + 1), queue_id,
-                                          skb_queue_len(&ring->queue)));
+                                         "eRf Off/Sleep: %d times TcbBusyQueue[%d] =%d before doze!\n",
+                                         i + 1, queue_id,
+                                         skb_queue_len(&ring->queue));
                                 udelay(10);
                                 i++;
                         }
 
                         if (i >= MAX_DOZE_WAITING_TIMES_9x) {
                                 RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
-                                         ("\nERFOFF: %d times TcbBusyQueue[%d] "
-                                         "= %d !\n",
-                                          MAX_DOZE_WAITING_TIMES_9x, queue_id,
-                                          skb_queue_len(&ring->queue)));
+                                         "ERFOFF: %d times TcbBusyQueue[%d] = %d !\n",
+                                         MAX_DOZE_WAITING_TIMES_9x, queue_id,
+                                         skb_queue_len(&ring->queue));
                                 break;
                         }
                 }
                 RT_TRACE(rtlpriv, COMP_POWER, DBG_DMESG,
-                         ("Set rfsleep awaked:%d ms\n",
-                         jiffies_to_msecs(jiffies - ppsc->last_awake_jiffies)));
-                RT_TRACE(rtlpriv, COMP_POWER, DBG_DMESG, ("sleep awaked:%d ms "
-                         "state_inap:%x\n", jiffies_to_msecs(jiffies -
-                         ppsc->last_awake_jiffies), rtlpriv->psc.state_inap));
+                         "Set rfsleep awaked:%d ms\n",
+                         jiffies_to_msecs(jiffies - ppsc->last_awake_jiffies));
+                RT_TRACE(rtlpriv, COMP_POWER, DBG_DMESG,
+                         "sleep awaked:%d ms state_inap:%x\n",
+                         jiffies_to_msecs(jiffies -
+                                          ppsc->last_awake_jiffies),
+                         rtlpriv->psc.state_inap);
                 ppsc->last_sleep_jiffies = jiffies;
                 _rtl92d_phy_set_rfsleep(hw);
                 break;
         default:
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("switch case not process\n"));
+                         "switch case not processed\n");
                 bresult = false;
                 break;
         }
@@ -3437,17 +3421,17 @@ void rtl92d_phy_config_macphymode(struct ieee80211_hw *hw)
         switch (rtlhal->macphymode) {
         case DUALMAC_DUALPHY:
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
-                         ("MacPhyMode: DUALMAC_DUALPHY\n"));
+                         "MacPhyMode: DUALMAC_DUALPHY\n");
                 rtl_write_byte(rtlpriv, offset, 0xF3);
                 break;
         case SINGLEMAC_SINGLEPHY:
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
-                         ("MacPhyMode: SINGLEMAC_SINGLEPHY\n"));
+                         "MacPhyMode: SINGLEMAC_SINGLEPHY\n");
                 rtl_write_byte(rtlpriv, offset, 0xF4);
                 break;
         case DUALMAC_SINGLEPHY:
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
-                         ("MacPhyMode: DUALMAC_SINGLEPHY\n"));
+                         "MacPhyMode: DUALMAC_SINGLEPHY\n");
                 rtl_write_byte(rtlpriv, offset, 0xF1);
                 break;
         }
@@ -3578,7 +3562,7 @@ void rtl92d_phy_set_poweron(struct ieee80211_hw *hw)
                         }
                 }
                 if (i == 200)
-                        RT_ASSERT(false, ("Another mac power off over time\n"));
+                        RT_ASSERT(false, "Another mac power off over time\n");
         }
 }
 
@@ -3615,7 +3599,7 @@ void rtl92d_update_bbrf_configuration(struct ieee80211_hw *hw)
         struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw));
         u8 rfpath, i;
 
-        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, ("==>\n"));
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "==>\n");
         /* r_select_5G for path_A/B 0 for 2.4G, 1 for 5G */
         if (rtlhal->current_bandtype == BAND_ON_2_4G) {
                 /* r_select_5G for path_A/B,0x878 */
@@ -3764,7 +3748,7 @@ void rtl92d_update_bbrf_configuration(struct ieee80211_hw *hw)
                 } else {
                         rtl92d_phy_enable_anotherphy(hw, false);
                         RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
-                                 ("MAC1 use DBI to update 0x888"));
+                                 "MAC1 use DBI to update 0x888\n");
                         /* 0x888 */
                         rtl92de_write_dword_dbi(hw, RFPGA0_ADDALLOCKEN,
                                                 rtl92de_read_dword_dbi(hw,
@@ -3789,9 +3773,9 @@ void rtl92d_update_bbrf_configuration(struct ieee80211_hw *hw)
                         BRFREGOFFSETMASK);
         }
         for (i = 0; i < 2; i++)
-                RT_TRACE(rtlpriv, COMP_RF, DBG_LOUD, ("RF 0x18 = 0x%x\n",
-                          rtlphy->rfreg_chnlval[i]));
-        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, ("<==\n"));
+                RT_TRACE(rtlpriv, COMP_RF, DBG_LOUD, "RF 0x18 = 0x%x\n",
+                         rtlphy->rfreg_chnlval[i]);
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "<==\n");
 
 }
 
diff --git a/drivers/net/wireless/rtlwifi/rtl8192de/phy.h b/drivers/net/wireless/rtlwifi/rtl8192de/phy.h
index a52c824b41e3..f074952bf25c 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192de/phy.h
+++ b/drivers/net/wireless/rtlwifi/rtl8192de/phy.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2009-2010  Realtek Corporation.
+ * Copyright(c) 2009-2012  Realtek Corporation.
  *
  * 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
diff --git a/drivers/net/wireless/rtlwifi/rtl8192de/reg.h b/drivers/net/wireless/rtlwifi/rtl8192de/reg.h
index 131acc306fcc..9bc462331078 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192de/reg.h
+++ b/drivers/net/wireless/rtlwifi/rtl8192de/reg.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2009-2010  Realtek Corporation.
+ * Copyright(c) 2009-2012  Realtek Corporation.
  *
  * 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
diff --git a/drivers/net/wireless/rtlwifi/rtl8192de/rf.c b/drivers/net/wireless/rtlwifi/rtl8192de/rf.c
index db27cebaac2c..ff34d2dd39b8 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192de/rf.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192de/rf.c
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2009-2010  Realtek Corporation.
+ * Copyright(c) 2009-2012  Realtek Corporation.
  *
  * 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
@@ -50,8 +50,8 @@ void rtl92d_phy_rf6052_set_bandwidth(struct ieee80211_hw *hw, u8 bandwidth)
                                       BIT(11), 0x01);
 
                         RT_TRACE(rtlpriv, COMP_RF, DBG_LOUD,
-                                 ("20M RF 0x18 = 0x%x\n",
-                                 rtlphy->rfreg_chnlval[rfpath]));
+                                 "20M RF 0x18 = 0x%x\n",
+                                 rtlphy->rfreg_chnlval[rfpath]);
                 }
 
                 break;
@@ -62,13 +62,13 @@ void rtl92d_phy_rf6052_set_bandwidth(struct ieee80211_hw *hw, u8 bandwidth)
                         rtl_set_rfreg(hw, rfpath, RF_CHNLBW, BIT(10) | BIT(11),
                                       0x00);
                         RT_TRACE(rtlpriv, COMP_RF, DBG_LOUD,
-                                 ("40M RF 0x18 = 0x%x\n",
-                                 rtlphy->rfreg_chnlval[rfpath]));
+                                 "40M RF 0x18 = 0x%x\n",
+                                 rtlphy->rfreg_chnlval[rfpath]);
                 }
                 break;
         default:
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("unknown bandwidth: %#X\n", bandwidth));
+                         "unknown bandwidth: %#X\n", bandwidth);
                 break;
         }
 }
@@ -127,23 +127,23 @@ void rtl92d_phy_rf6052_set_cck_txpower(struct ieee80211_hw *hw,
         tmpval = tx_agc[RF90_PATH_A] & 0xff;
         rtl_set_bbreg(hw, RTXAGC_A_CCK1_MCS32, BMASKBYTE1, tmpval);
         RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
-                ("CCK PWR 1M (rf-A) = 0x%x (reg 0x%x)\n", tmpval,
-                RTXAGC_A_CCK1_MCS32));
+                "CCK PWR 1M (rf-A) = 0x%x (reg 0x%x)\n",
+                tmpval, RTXAGC_A_CCK1_MCS32);
         tmpval = tx_agc[RF90_PATH_A] >> 8;
         rtl_set_bbreg(hw, RTXAGC_B_CCK11_A_CCK2_11, 0xffffff00, tmpval);
         RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
-                ("CCK PWR 2~11M (rf-A) = 0x%x (reg 0x%x)\n", tmpval,
-                RTXAGC_B_CCK11_A_CCK2_11));
+                "CCK PWR 2~11M (rf-A) = 0x%x (reg 0x%x)\n",
+                tmpval, RTXAGC_B_CCK11_A_CCK2_11);
         tmpval = tx_agc[RF90_PATH_B] >> 24;
         rtl_set_bbreg(hw, RTXAGC_B_CCK11_A_CCK2_11, BMASKBYTE0, tmpval);
         RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
-                ("CCK PWR 11M (rf-B) = 0x%x (reg 0x%x)\n", tmpval,
-                RTXAGC_B_CCK11_A_CCK2_11));
+                "CCK PWR 11M (rf-B) = 0x%x (reg 0x%x)\n",
+                tmpval, RTXAGC_B_CCK11_A_CCK2_11);
         tmpval = tx_agc[RF90_PATH_B] & 0x00ffffff;
         rtl_set_bbreg(hw, RTXAGC_B_CCK1_55_MCS32, 0xffffff00, tmpval);
         RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
-                ("CCK PWR 1~5.5M (rf-B) = 0x%x (reg 0x%x)\n", tmpval,
-                RTXAGC_B_CCK1_55_MCS32));
+                "CCK PWR 1~5.5M (rf-B) = 0x%x (reg 0x%x)\n",
+                tmpval, RTXAGC_B_CCK1_55_MCS32);
 }
 
 static void _rtl92d_phy_get_power_base(struct ieee80211_hw *hw,
@@ -165,8 +165,8 @@ static void _rtl92d_phy_get_power_base(struct ieee80211_hw *hw,
                     (powerbase0 << 8) | powerbase0;
                 *(ofdmbase + i) = powerbase0;
                 RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
-                        (" [OFDM power base index rf(%c) = 0x%x]\n",
-                        ((i == 0) ? 'A' : 'B'), *(ofdmbase + i)));
+                        " [OFDM power base index rf(%c) = 0x%x]\n",
+                        i == 0 ? 'A' : 'B', *(ofdmbase + i));
         }
 
         for (i = 0; i < 2; i++) {
@@ -179,8 +179,8 @@ static void _rtl92d_phy_get_power_base(struct ieee80211_hw *hw,
                              (powerbase1 << 8) | powerbase1;
                 *(mcsbase + i) = powerbase1;
                 RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
-                        (" [MCS power base index rf(%c) = 0x%x]\n",
-                        ((i == 0) ? 'A' : 'B'), *(mcsbase + i)));
+                        " [MCS power base index rf(%c) = 0x%x]\n",
+                        i == 0 ? 'A' : 'B', *(mcsbase + i));
         }
 }
 
@@ -232,9 +232,9 @@ static void _rtl92d_get_txpower_writeval_by_regulatory(struct ieee80211_hw *hw,
                                         (rf ? 8 : 0)] + ((index < 2) ?
                                         powerbase0[rf] :
                                         powerbase1[rf]);
-                        RTPRINT(rtlpriv, FPHY, PHY_TXPWR, ("RTK better "
-                                "performance, writeval(%c) = 0x%x\n",
-                                ((rf == 0) ? 'A' : 'B'), writeval));
+                        RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
+                                "RTK better performance, writeval(%c) = 0x%x\n",
+                                rf == 0 ? 'A' : 'B', writeval);
                         break;
                 case 1:
                         if (rtlphy->pwrgroup_cnt == 1)
@@ -253,33 +253,31 @@ static void _rtl92d_get_txpower_writeval_by_regulatory(struct ieee80211_hw *hw,
                                                 powerbase0[rf] :
                                                 powerbase1[rf]);
                                 RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
-                                        ("Realtek regulatory, "
-                                        "20MHz, writeval(%c) = 0x%x\n",
-                                        ((rf == 0) ? 'A' : 'B'),
-                                        writeval));
+                                        "Realtek regulatory, 20MHz, writeval(%c) = 0x%x\n",
+                                        rf == 0 ? 'A' : 'B', writeval);
                         }
                         break;
                 case 2:
                         writeval = ((index < 2) ? powerbase0[rf] :
                                    powerbase1[rf]);
-                        RTPRINT(rtlpriv, FPHY, PHY_TXPWR, ("Better regulatory, "
-                                "writeval(%c) = 0x%x\n",
-                                ((rf == 0) ? 'A' : 'B'), writeval));
+                        RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
+                                "Better regulatory, writeval(%c) = 0x%x\n",
+                                rf == 0 ? 'A' : 'B', writeval);
                         break;
                 case 3:
                         chnlgroup = 0;
                         if (rtlphy->current_chan_bw == HT_CHANNEL_WIDTH_20_40) {
                                 RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
-                                        ("customer's limit, 40MHz rf(%c) = "
-                                        "0x%x\n", ((rf == 0) ? 'A' : 'B'),
+                                        "customer's limit, 40MHz rf(%c) = 0x%x\n",
+                                        rf == 0 ? 'A' : 'B',
                                         rtlefuse->pwrgroup_ht40[rf]
-                                        [channel - 1]));
+                                        [channel - 1]);
                         } else {
                                 RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
-                                        ("customer's limit, 20MHz rf(%c) = "
-                                        "0x%x\n", ((rf == 0) ? 'A' : 'B'),
+                                        "customer's limit, 20MHz rf(%c) = 0x%x\n",
+                                        rf == 0 ? 'A' : 'B',
                                         rtlefuse->pwrgroup_ht20[rf]
-                                        [channel - 1]));
+                                        [channel - 1]);
                         }
                         for (i = 0; i < 4; i++) {
                                 pwr_diff_limit[i] =
@@ -308,13 +306,13 @@ static void _rtl92d_get_txpower_writeval_by_regulatory(struct ieee80211_hw *hw,
                                          (pwr_diff_limit[1] << 8) |
                                          (pwr_diff_limit[0]);
                         RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
-                                ("Customer's limit rf(%c) = 0x%x\n",
-                                ((rf == 0) ? 'A' : 'B'), customer_limit));
+                                "Customer's limit rf(%c) = 0x%x\n",
+                                rf == 0 ? 'A' : 'B', customer_limit);
                         writeval = customer_limit + ((index < 2) ?
                                    powerbase0[rf] : powerbase1[rf]);
                         RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
-                                ("Customer, writeval rf(%c)= 0x%x\n",
-                                ((rf == 0) ? 'A' : 'B'), writeval));
+                                "Customer, writeval rf(%c)= 0x%x\n",
+                                rf == 0 ? 'A' : 'B', writeval);
                         break;
                 default:
                         chnlgroup = 0;
@@ -323,9 +321,8 @@ static void _rtl92d_get_txpower_writeval_by_regulatory(struct ieee80211_hw *hw,
                                    (rf ? 8 : 0)] + ((index < 2) ?
                                    powerbase0[rf] : powerbase1[rf]);
                         RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
-                                ("RTK better performance, writeval "
-                                "rf(%c) = 0x%x\n",
-                                ((rf == 0) ? 'A' : 'B'), writeval));
+                                "RTK better performance, writeval rf(%c) = 0x%x\n",
+                                rf == 0 ? 'A' : 'B', writeval);
                         break;
                 }
                 *(p_outwriteval + rf) = writeval;
@@ -367,7 +364,7 @@ static void _rtl92d_write_ofdm_power_reg(struct ieee80211_hw *hw,
                         regoffset = regoffset_b[index];
                 rtl_set_bbreg(hw, regoffset, BMASKDWORD, writeval);
                 RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
-                        ("Set 0x%x = %08x\n", regoffset, writeval));
+                        "Set 0x%x = %08x\n", regoffset, writeval);
                 if (((get_rf_type(rtlphy) == RF_2T2R) &&
                     (regoffset == RTXAGC_A_MCS15_MCS12 ||
                     regoffset == RTXAGC_B_MCS15_MCS12)) ||
@@ -423,11 +420,11 @@ bool rtl92d_phy_enable_anotherphy(struct ieee80211_hw *hw, bool bmac0)
 
         rtlhal->during_mac0init_radiob = false;
         rtlhal->during_mac1init_radioa = false;
-        RT_TRACE(rtlpriv, COMP_RF, DBG_LOUD, ("===>\n"));
+        RT_TRACE(rtlpriv, COMP_RF, DBG_LOUD, "===>\n");
         /* MAC0 Need PHY1 load radio_b.txt . Driver use DBI to write. */
         u1btmp = rtl_read_byte(rtlpriv, mac_reg);
         if (!(u1btmp & mac_on_bit)) {
-                RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, ("enable BB & RF\n"));
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "enable BB & RF\n");
                 /* Enable BB and RF power */
                 rtl92de_write_dword_dbi(hw, REG_SYS_ISO_CTRL,
                         rtl92de_read_dword_dbi(hw, REG_SYS_ISO_CTRL, direct) |
@@ -437,7 +434,7 @@ bool rtl92d_phy_enable_anotherphy(struct ieee80211_hw *hw, bool bmac0)
                  * and radio_b.txt has been load. */
                 bresult = false;
         }
-        RT_TRACE(rtlpriv, COMP_RF, DBG_LOUD, ("<===\n"));
+        RT_TRACE(rtlpriv, COMP_RF, DBG_LOUD, "<===\n");
         return bresult;
 
 }
@@ -453,17 +450,17 @@ void rtl92d_phy_powerdown_anotherphy(struct ieee80211_hw *hw, bool bmac0)
 
         rtlhal->during_mac0init_radiob = false;
         rtlhal->during_mac1init_radioa = false;
-        RT_TRACE(rtlpriv, COMP_RF, DBG_LOUD, ("====>\n"));
+        RT_TRACE(rtlpriv, COMP_RF, DBG_LOUD, "====>\n");
         /* check MAC0 enable or not again now, if
          * enabled, not power down radio A. */
         u1btmp = rtl_read_byte(rtlpriv, mac_reg);
         if (!(u1btmp & mac_on_bit)) {
-                RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, ("power down\n"));
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "power down\n");
                 /* power down RF radio A according to YuNan's advice. */
                 rtl92de_write_dword_dbi(hw, RFPGA0_XA_LSSIPARAMETER,
                                         0x00000000, direct);
         }
-        RT_TRACE(rtlpriv, COMP_RF, DBG_LOUD, ("<====\n"));
+        RT_TRACE(rtlpriv, COMP_RF, DBG_LOUD, "<====\n");
 }
 
 bool rtl92d_phy_rf6052_config(struct ieee80211_hw *hw)
@@ -606,7 +603,7 @@ bool rtl92d_phy_rf6052_config(struct ieee80211_hw *hw)
                 }
                 if (rtstatus != true) {
                         RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                                ("Radio[%d] Fail!!", rfpath));
+                                 "Radio[%d] Fail!!", rfpath);
                         goto phy_rf_cfg_fail;
                 }
 
@@ -620,7 +617,7 @@ bool rtl92d_phy_rf6052_config(struct ieee80211_hw *hw)
                 rtl92d_phy_powerdown_anotherphy(hw, false);
         else if (need_pwrdown_radiob)
                 rtl92d_phy_powerdown_anotherphy(hw, true);
-        RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, ("<---\n"));
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, "<---\n");
         return rtstatus;
 
 phy_rf_cfg_fail:
diff --git a/drivers/net/wireless/rtlwifi/rtl8192de/rf.h b/drivers/net/wireless/rtlwifi/rtl8192de/rf.h
index 74b9cfc39a83..0fe1a48593e8 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192de/rf.h
+++ b/drivers/net/wireless/rtlwifi/rtl8192de/rf.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2009-2010  Realtek Corporation.
+ * Copyright(c) 2009-2012  Realtek Corporation.
  *
  * 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
diff --git a/drivers/net/wireless/rtlwifi/rtl8192de/sw.c b/drivers/net/wireless/rtlwifi/rtl8192de/sw.c
index 7911c9c87085..4898c502974d 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192de/sw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192de/sw.c
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2009-2010  Realtek Corporation.
+ * Copyright(c) 2009-2012  Realtek Corporation.
  *
  * 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
@@ -27,11 +27,6 @@
  *
  *****************************************************************************/
 
-#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-
-#include <linux/vmalloc.h>
-#include <linux/module.h>
-
 #include "../wifi.h"
 #include "../core.h"
 #include "../pci.h"
@@ -44,6 +39,8 @@
 #include "trx.h"
 #include "led.h"
 
+#include <linux/module.h>
+
 static void rtl92d_init_aspm_vars(struct ieee80211_hw *hw)
 {
         struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
@@ -94,7 +91,6 @@ static int rtl92d_init_sw_vars(struct ieee80211_hw *hw)
         u8 tid;
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
-        const struct firmware *firmware;
         static int header_print;
 
         rtlpriv->dm.dm_initialgain_enable = true;
@@ -154,9 +150,9 @@ static int rtl92d_init_sw_vars(struct ieee80211_hw *hw)
         rtlpriv->psc.swctrl_lps = rtlpriv->cfg->mod_params->swctrl_lps;
         rtlpriv->psc.fwctrl_lps = rtlpriv->cfg->mod_params->fwctrl_lps;
         if (!rtlpriv->psc.inactiveps)
-                pr_info("rtl8192ce: Power Save off (module option)\n");
+                pr_info("Power Save off (module option)\n");
         if (!rtlpriv->psc.fwctrl_lps)
-                pr_info("rtl8192ce: FW Power Save off (module option)\n");
+                pr_info("FW Power Save off (module option)\n");
         rtlpriv->psc.reg_fwctrl_lps = 3;
         rtlpriv->psc.reg_max_lps_awakeintvl = 5;
         /* for ASPM, you can close aspm through
@@ -170,41 +166,38 @@ static int rtl92d_init_sw_vars(struct ieee80211_hw *hw)
         else if (rtlpriv->psc.reg_fwctrl_lps == 3)
                 rtlpriv->psc.fwctrl_psmode = FW_PS_DTIM_MODE;
 
+        /* for early mode */
+        rtlpriv->rtlhal.earlymode_enable = true;
+        for (tid = 0; tid < 8; tid++)
+                skb_queue_head_init(&rtlpriv->mac80211.skb_waitq[tid]);
+
+        /* Only load firmware for first MAC */
+        if (header_print)
+                return 0;
+
         /* for firmware buf */
         rtlpriv->rtlhal.pfirmware = vzalloc(0x8000);
         if (!rtlpriv->rtlhal.pfirmware) {
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("Can't alloc buffer for fw.\n"));
+                         "Can't alloc buffer for fw\n");
                 return 1;
         }
 
-        if (!header_print) {
-                pr_info("Driver for Realtek RTL8192DE WLAN interface\n");
-                pr_info("Loading firmware file %s\n", rtlpriv->cfg->fw_name);
-                header_print++;
-        }
+        rtlpriv->max_fw_size = 0x8000;
+        pr_info("Driver for Realtek RTL8192DE WLAN interface\n");
+        pr_info("Loading firmware file %s\n", rtlpriv->cfg->fw_name);
+        header_print++;
+
         /* request fw */
-        err = request_firmware(&firmware, rtlpriv->cfg->fw_name,
-                               rtlpriv->io.dev);
+        err = request_firmware_nowait(THIS_MODULE, 1, rtlpriv->cfg->fw_name,
+                                      rtlpriv->io.dev, GFP_KERNEL, hw,
+                                      rtl_fw_cb);
         if (err) {
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("Failed to request firmware!\n"));
-                return 1;
-        }
-        if (firmware->size > 0x8000) {
-                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("Firmware is too big!\n"));
-                release_firmware(firmware);
+                         "Failed to request firmware!\n");
                 return 1;
         }
-        memcpy(rtlpriv->rtlhal.pfirmware, firmware->data, firmware->size);
-        rtlpriv->rtlhal.fwsize = firmware->size;
-        release_firmware(firmware);
 
-        /* for early mode */
-        rtlpriv->rtlhal.earlymode_enable = true;
-        for (tid = 0; tid < 8; tid++)
-                skb_queue_head_init(&rtlpriv->mac80211.skb_waitq[tid]);
         return 0;
 }
 
@@ -424,7 +417,7 @@ static int __init rtl92de_module_init(void)
 
         ret = pci_register_driver(&rtl92de_driver);
         if (ret)
-                RT_ASSERT(false, (": No device found\n"));
+                RT_ASSERT(false, "No device found\n");
         return ret;
 }
 
diff --git a/drivers/net/wireless/rtlwifi/rtl8192de/sw.h b/drivers/net/wireless/rtlwifi/rtl8192de/sw.h
index c95e47de1346..0e6035b8fd86 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192de/sw.h
+++ b/drivers/net/wireless/rtlwifi/rtl8192de/sw.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2009-2010  Realtek Corporation.
+ * Copyright(c) 2009-2012  Realtek Corporation.
  *
  * 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
diff --git a/drivers/net/wireless/rtlwifi/rtl8192de/table.c b/drivers/net/wireless/rtlwifi/rtl8192de/table.c
index bad7f9449ecf..8ea6f528dfa6 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192de/table.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192de/table.c
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2009-2010  Realtek Corporation.
+ * Copyright(c) 2009-2012  Realtek Corporation.
  *
  * 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
diff --git a/drivers/net/wireless/rtlwifi/rtl8192de/table.h b/drivers/net/wireless/rtlwifi/rtl8192de/table.h
index 93f30ca62d8f..8b724a86117a 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192de/table.h
+++ b/drivers/net/wireless/rtlwifi/rtl8192de/table.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2009-2010  Realtek Corporation.
+ * Copyright(c) 2009-2012  Realtek Corporation.
  *
  * 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
diff --git a/drivers/net/wireless/rtlwifi/rtl8192de/trx.c b/drivers/net/wireless/rtlwifi/rtl8192de/trx.c
index 3637c0c33525..a7f6126e2f86 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192de/trx.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192de/trx.c
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2009-2010  Realtek Corporation.
+ * Copyright(c) 2009-2012  Realtek Corporation.
  *
  * 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
@@ -602,8 +602,8 @@ void rtl92de_tx_fill_desc(struct ieee80211_hw *hw,
                                            EM_HDR_LEN);
                         if (ptcb_desc->empkt_num) {
                                 RT_TRACE(rtlpriv, COMP_SEND, DBG_LOUD,
-                                         ("Insert 8 byte.pTcb->EMPktNum:%d\n",
-                                          ptcb_desc->empkt_num));
+                                         "Insert 8 byte.pTcb->EMPktNum:%d\n",
+                                         ptcb_desc->empkt_num);
                                 _rtl92de_insert_emcontent(ptcb_desc,
                                                           (u8 *)(skb->data));
                         }
@@ -700,7 +700,7 @@ void rtl92de_tx_fill_desc(struct ieee80211_hw *hw,
                 if (ieee80211_is_data_qos(fc)) {
                         if (mac->rdg_en) {
                                 RT_TRACE(rtlpriv, COMP_SEND, DBG_TRACE,
-                                        ("Enable RDG function.\n"));
+                                         "Enable RDG function\n");
                                 SET_TX_DESC_RDG_ENABLE(pdesc, 1);
                                 SET_TX_DESC_HTC(pdesc, 1);
                         }
@@ -726,7 +726,7 @@ void rtl92de_tx_fill_desc(struct ieee80211_hw *hw,
                 SET_TX_DESC_PKT_ID(pdesc, 8);
         }
         SET_TX_DESC_MORE_FRAG(pdesc, (lastseg ? 0 : 1));
-        RT_TRACE(rtlpriv, COMP_SEND, DBG_TRACE, ("\n"));
+        RT_TRACE(rtlpriv, COMP_SEND, DBG_TRACE, "\n");
 }
 
 void rtl92de_tx_fill_cmddesc(struct ieee80211_hw *hw,
@@ -776,7 +776,7 @@ void rtl92de_tx_fill_cmddesc(struct ieee80211_hw *hw,
         }
 
         RT_PRINT_DATA(rtlpriv, COMP_CMD, DBG_LOUD,
-                      "H2C Tx Cmd Content\n", pdesc, TX_DESC_SIZE);
+                      "H2C Tx Cmd Content", pdesc, TX_DESC_SIZE);
         wmb();
         SET_TX_DESC_OWN(pdesc, 1);
 }
@@ -793,8 +793,8 @@ void rtl92de_set_desc(u8 *pdesc, bool istx, u8 desc_name, u8 *val)
                         SET_TX_DESC_NEXT_DESC_ADDRESS(pdesc, *(u32 *) val);
                         break;
                 default:
-                        RT_ASSERT(false, ("ERR txdesc :%d"
-                                          " not process\n", desc_name));
+                        RT_ASSERT(false, "ERR txdesc :%d not process\n",
+                                  desc_name);
                         break;
                 }
         } else {
@@ -813,8 +813,8 @@ void rtl92de_set_desc(u8 *pdesc, bool istx, u8 desc_name, u8 *val)
                         SET_RX_DESC_EOR(pdesc, 1);
                         break;
                 default:
-                        RT_ASSERT(false, ("ERR rxdesc :%d "
-                                          "not process\n", desc_name));
+                        RT_ASSERT(false, "ERR rxdesc :%d not process\n",
+                                  desc_name);
                         break;
                 }
         }
@@ -833,8 +833,8 @@ u32 rtl92de_get_desc(u8 *p_desc, bool istx, u8 desc_name)
                         ret = GET_TX_DESC_TX_BUFFER_ADDRESS(p_desc);
                         break;
                 default:
-                        RT_ASSERT(false, ("ERR txdesc :%d "
-                                          "not process\n", desc_name));
+                        RT_ASSERT(false, "ERR txdesc :%d not process\n",
+                                  desc_name);
                         break;
                 }
         } else {
@@ -847,8 +847,8 @@ u32 rtl92de_get_desc(u8 *p_desc, bool istx, u8 desc_name)
                         ret = GET_RX_DESC_PKT_LEN(pdesc);
                         break;
                 default:
-                        RT_ASSERT(false, ("ERR rxdesc :%d "
-                                          "not process\n", desc_name));
+                        RT_ASSERT(false, "ERR rxdesc :%d not process\n",
+                                  desc_name);
                         break;
                 }
         }
diff --git a/drivers/net/wireless/rtlwifi/rtl8192de/trx.h b/drivers/net/wireless/rtlwifi/rtl8192de/trx.h
index 4d55d0b6816d..0dc736c2723b 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192de/trx.h
+++ b/drivers/net/wireless/rtlwifi/rtl8192de/trx.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2009-2010  Realtek Corporation.
+ * Copyright(c) 2009-2012  Realtek Corporation.
  *
  * 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
diff --git a/drivers/net/wireless/rtlwifi/rtl8192se/def.h b/drivers/net/wireless/rtlwifi/rtl8192se/def.h
index c6c044816d39..d1b0a1e14971 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192se/def.h
+++ b/drivers/net/wireless/rtlwifi/rtl8192se/def.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2009-2010  Realtek Corporation.
+ * Copyright(c) 2009-2012  Realtek Corporation.
  *
  * 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
diff --git a/drivers/net/wireless/rtlwifi/rtl8192se/dm.c b/drivers/net/wireless/rtlwifi/rtl8192se/dm.c
index 4203a8531ca0..fbabae17259e 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192se/dm.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192se/dm.c
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2009-2010  Realtek Corporation.
+ * Copyright(c) 2009-2012  Realtek Corporation.
  *
  * 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
@@ -170,9 +170,9 @@ static void _rtl92s_dm_txpowertracking_callback_thermalmeter(
         thermalvalue = (u8)rtl_get_rfreg(hw, RF90_PATH_A, RF_T_METER, 0x1f);
 
         RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
-                 ("Readback Thermal Meter = 0x%x pre thermal meter 0x%x "
-                  "eeprom_thermalmeter 0x%x\n", thermalvalue,
-                  rtlpriv->dm.thermalvalue, rtlefuse->eeprom_thermalmeter));
+                 "Readback Thermal Meter = 0x%x pre thermal meter 0x%x eeprom_thermal meter 0x%x\n",
+                 thermalvalue,
+                 rtlpriv->dm.thermalvalue, rtlefuse->eeprom_thermalmeter);
 
         if (thermalvalue) {
                 rtlpriv->dm.thermalvalue = thermalvalue;
@@ -282,11 +282,11 @@ static void _rtl92s_dm_refresh_rateadaptive_mask(struct ieee80211_hw *hw)
                 }
 
                 if (ra->pre_ratr_state != ra->ratr_state) {
-                        RT_TRACE(rtlpriv, COMP_RATE, DBG_LOUD, ("RSSI = %ld "
-                                "RSSI_LEVEL = %d PreState = %d, CurState = %d\n",
-                                rtlpriv->dm.undecorated_smoothed_pwdb,
-                                ra->ratr_state,
-                                ra->pre_ratr_state, ra->ratr_state));
+                        RT_TRACE(rtlpriv, COMP_RATE, DBG_LOUD,
+                                 "RSSI = %ld RSSI_LEVEL = %d PreState = %d, CurState = %d\n",
+                                 rtlpriv->dm.undecorated_smoothed_pwdb,
+                                 ra->ratr_state,
+                                 ra->pre_ratr_state, ra->ratr_state);
 
                         rtlpriv->cfg->ops->update_rate_tbl(hw, sta,
                                                            ra->ratr_state);
@@ -586,7 +586,7 @@ static void _rtl92s_dm_dynamic_txpower(struct ieee80211_hw *hw)
         if ((mac->link_state < MAC80211_LINKED) &&
             (rtlpriv->dm.entry_min_undecoratedsmoothed_pwdb == 0)) {
                 RT_TRACE(rtlpriv, COMP_POWER, DBG_TRACE,
-                         ("Not connected to any\n"));
+                         "Not connected to any\n");
 
                 rtlpriv->dm.dynamic_txhighpower_lvl = TX_HIGHPWR_LEVEL_NORMAL;
 
@@ -599,22 +599,22 @@ static void _rtl92s_dm_dynamic_txpower(struct ieee80211_hw *hw)
                         undecorated_smoothed_pwdb =
                             rtlpriv->dm.entry_min_undecoratedsmoothed_pwdb;
                         RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
-                                 ("AP Client PWDB = 0x%lx\n",
-                                  undecorated_smoothed_pwdb));
+                                 "AP Client PWDB = 0x%lx\n",
+                                 undecorated_smoothed_pwdb);
                 } else {
                         undecorated_smoothed_pwdb =
                             rtlpriv->dm.undecorated_smoothed_pwdb;
                         RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
-                                 ("STA Default Port PWDB = 0x%lx\n",
-                                  undecorated_smoothed_pwdb));
+                                 "STA Default Port PWDB = 0x%lx\n",
+                                 undecorated_smoothed_pwdb);
                 }
         } else {
                 undecorated_smoothed_pwdb =
                     rtlpriv->dm.entry_min_undecoratedsmoothed_pwdb;
 
                 RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
-                         ("AP Ext Port PWDB = 0x%lx\n",
-                          undecorated_smoothed_pwdb));
+                         "AP Ext Port PWDB = 0x%lx\n",
+                         undecorated_smoothed_pwdb);
         }
 
         txpwr_threshold_lv2 = TX_POWER_NEAR_FIELD_THRESH_LVL2;
diff --git a/drivers/net/wireless/rtlwifi/rtl8192se/dm.h b/drivers/net/wireless/rtlwifi/rtl8192se/dm.h
index 9051a556acc4..e1b19a641765 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192se/dm.h
+++ b/drivers/net/wireless/rtlwifi/rtl8192se/dm.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2009-2010  Realtek Corporation.
+ * Copyright(c) 2009-2012  Realtek Corporation.
  *
  * 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
diff --git a/drivers/net/wireless/rtlwifi/rtl8192se/fw.c b/drivers/net/wireless/rtlwifi/rtl8192se/fw.c
index 3fda6b1dcf46..0d8bf5657008 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192se/fw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192se/fw.c
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2009-2010  Realtek Corporation.
+ * Copyright(c) 2009-2012  Realtek Corporation.
  *
  * 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
@@ -66,7 +66,7 @@ static bool _rtl92s_firmware_enable_cpu(struct ieee80211_hw *hw)
                 cpustatus = rtl_read_byte(rtlpriv, TCR);
                 if (cpustatus & IMEM_RDY) {
                         RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
-                                ("IMEM Ready after CPU has refilled.\n"));
+                                 "IMEM Ready after CPU has refilled\n");
                         break;
                 }
 
@@ -120,9 +120,8 @@ static u8 _rtl92s_firmware_header_map_rftype(struct ieee80211_hw *hw)
                 return 0x22;
                 break;
         default:
-                RT_TRACE(rtlpriv, COMP_INIT, DBG_EMERG,
-                         ("Unknown RF type(%x)\n",
-                         rtlphy->rf_type));
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_EMERG, "Unknown RF type(%x)\n",
+                         rtlphy->rf_type);
                 break;
         }
         return 0x22;
@@ -177,7 +176,7 @@ static bool _rtl92s_firmware_downloadcode(struct ieee80211_hw *hw,
 
         if (buffer_len >= MAX_FIRMWARE_CODE_SIZE) {
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                        ("Size over FIRMWARE_CODE_SIZE!\n"));
+                         "Size over FIRMWARE_CODE_SIZE!\n");
 
                 return false;
         }
@@ -231,8 +230,8 @@ static bool _rtl92s_firmware_checkready(struct ieee80211_hw *hw,
         short pollingcnt = 1000;
         bool rtstatus = true;
 
-        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, ("LoadStaus(%d)\n",
-                 loadfw_status));
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
+                 "LoadStaus(%d)\n", loadfw_status);
 
         firmware->fwstatus = (enum fw_status)loadfw_status;
 
@@ -248,8 +247,8 @@ static bool _rtl92s_firmware_checkready(struct ieee80211_hw *hw,
 
                 if (!(cpustatus & IMEM_CHK_RPT) || (pollingcnt <= 0)) {
                         RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                                 ("FW_STATUS_LOAD_IMEM"
-                                 " FAIL CPU, Status=%x\r\n", cpustatus));
+                                 "FW_STATUS_LOAD_IMEM FAIL CPU, Status=%x\n",
+                                 cpustatus);
                         goto status_check_fail;
                 }
                 break;
@@ -266,8 +265,8 @@ static bool _rtl92s_firmware_checkready(struct ieee80211_hw *hw,
 
                 if (!(cpustatus & EMEM_CHK_RPT) || (pollingcnt <= 0)) {
                         RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                                 ("FW_STATUS_LOAD_EMEM"
-                                 " FAIL CPU, Status=%x\r\n", cpustatus));
+                                 "FW_STATUS_LOAD_EMEM FAIL CPU, Status=%x\n",
+                                 cpustatus);
                         goto status_check_fail;
                 }
 
@@ -275,7 +274,7 @@ static bool _rtl92s_firmware_checkready(struct ieee80211_hw *hw,
                 rtstatus = _rtl92s_firmware_enable_cpu(hw);
                 if (rtstatus != true) {
                         RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                                 ("Enable CPU fail!\n"));
+                                 "Enable CPU fail!\n");
                         goto status_check_fail;
                 }
                 break;
@@ -291,14 +290,14 @@ static bool _rtl92s_firmware_checkready(struct ieee80211_hw *hw,
 
                 if (!(cpustatus & DMEM_CODE_DONE) || (pollingcnt <= 0)) {
                         RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                                 ("Polling  DMEM code done"
-                                 " fail ! cpustatus(%#x)\n", cpustatus));
+                                 "Polling DMEM code done fail ! cpustatus(%#x)\n",
+                                 cpustatus);
                         goto status_check_fail;
                 }
 
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
-                         ("DMEM code download success,"
-                        " cpustatus(%#x)\n", cpustatus));
+                         "DMEM code download success, cpustatus(%#x)\n",
+                         cpustatus);
 
                 /* Prevent Delay too much and being scheduled out */
                 /* Polling Load Firmware ready */
@@ -311,14 +310,14 @@ static bool _rtl92s_firmware_checkready(struct ieee80211_hw *hw,
                 } while (pollingcnt--);
 
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
-                         ("Polling Load Firmware ready,"
-                        " cpustatus(%x)\n",     cpustatus));
+                         "Polling Load Firmware ready, cpustatus(%x)\n",
+                         cpustatus);
 
                 if (((cpustatus & LOAD_FW_READY) != LOAD_FW_READY) ||
                     (pollingcnt <= 0)) {
                         RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                                 ("Polling Load Firmware"
-                                " ready fail ! cpustatus(%x)\n", cpustatus));
+                                 "Polling Load Firmware ready fail ! cpustatus(%x)\n",
+                                 cpustatus);
                         goto status_check_fail;
                 }
 
@@ -332,7 +331,7 @@ static bool _rtl92s_firmware_checkready(struct ieee80211_hw *hw,
                                 RCR_APP_ICV | RCR_APP_MIC));
 
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
-                         ("Current RCR settings(%#x)\n", tmpu4b));
+                         "Current RCR settings(%#x)\n", tmpu4b);
 
                 /* Set to normal mode. */
                 rtl_write_byte(rtlpriv, LBKMD_SEL, LBK_NORMAL);
@@ -340,14 +339,15 @@ static bool _rtl92s_firmware_checkready(struct ieee80211_hw *hw,
 
         default:
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_EMERG,
-                         ("Unknown status check!\n"));
+                         "Unknown status check!\n");
                 rtstatus = false;
                 break;
         }
 
 status_check_fail:
-        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, ("loadfw_status(%d), "
-                 "rtstatus(%x)\n", loadfw_status, rtstatus));
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
+                 "loadfw_status(%d), rtstatus(%x)\n",
+                 loadfw_status, rtstatus);
         return rtstatus;
 }
 
@@ -364,7 +364,7 @@ int rtl92s_download_fw(struct ieee80211_hw *hw)
         u8 fwstatus = FW_STATUS_INIT;
         bool rtstatus = true;
 
-        if (!rtlhal->pfirmware)
+        if (rtlpriv->max_fw_size == 0 || !rtlhal->pfirmware)
                 return 1;
 
         firmware = (struct rt_firmware *)rtlhal->pfirmware;
@@ -378,17 +378,17 @@ int rtl92s_download_fw(struct ieee80211_hw *hw)
         firmware->firmwareversion =  byte(pfwheader->version, 0);
         firmware->pfwheader->fwpriv.hci_sel = 1;/* pcie */
 
-        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, ("signature:%x, version:"
-                 "%x, size:%x,"
-                 "imemsize:%x, sram size:%x\n", pfwheader->signature,
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
+                 "signature:%x, version:%x, size:%x, imemsize:%x, sram size:%x\n",
+                 pfwheader->signature,
                  pfwheader->version, pfwheader->dmem_size,
-                 pfwheader->img_imem_size, pfwheader->img_sram_size));
+                 pfwheader->img_imem_size, pfwheader->img_sram_size);
 
         /* 2. Retrieve IMEM image. */
         if ((pfwheader->img_imem_size == 0) || (pfwheader->img_imem_size >
             sizeof(firmware->fw_imem))) {
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                        ("memory for data image is less than IMEM required\n"));
+                         "memory for data image is less than IMEM required\n");
                 goto fail;
         } else {
                 puc_mappedfile += fwhdr_size;
@@ -401,7 +401,7 @@ int rtl92s_download_fw(struct ieee80211_hw *hw)
         /* 3. Retriecve EMEM image. */
         if (pfwheader->img_sram_size > sizeof(firmware->fw_emem)) {
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                        ("memory for data image is less than EMEM required\n"));
+                         "memory for data image is less than EMEM required\n");
                 goto fail;
         } else {
                 puc_mappedfile += firmware->fw_imem_len;
@@ -436,7 +436,7 @@ int rtl92s_download_fw(struct ieee80211_hw *hw)
                         break;
                 default:
                         RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                                        ("Unexpected Download step!!\n"));
+                                 "Unexpected Download step!!\n");
                         goto fail;
                         break;
                 }
@@ -446,14 +446,14 @@ int rtl92s_download_fw(struct ieee80211_hw *hw)
                                 ul_filelength);
 
                 if (rtstatus != true) {
-                        RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, ("fail!\n"));
+                        RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "fail!\n");
                         goto fail;
                 }
 
                 /* <3> Check whether load FW process is ready */
                 rtstatus = _rtl92s_firmware_checkready(hw, fwstatus);
                 if (rtstatus != true) {
-                        RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, ("fail!\n"));
+                        RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "fail!\n");
                         goto fail;
                 }
 
diff --git a/drivers/net/wireless/rtlwifi/rtl8192se/fw.h b/drivers/net/wireless/rtlwifi/rtl8192se/fw.h
index 74cc503efe8a..babe85d4b694 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192se/fw.h
+++ b/drivers/net/wireless/rtlwifi/rtl8192se/fw.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2009-2010  Realtek Corporation.
+ * Copyright(c) 2009-2012  Realtek Corporation.
  *
  * 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
diff --git a/drivers/net/wireless/rtlwifi/rtl8192se/hw.c b/drivers/net/wireless/rtlwifi/rtl8192se/hw.c
index c474486e3911..22098c2f38f1 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192se/hw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192se/hw.c
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2009-2010  Realtek Corporation.
+ * Copyright(c) 2009-2012  Realtek Corporation.
  *
  * 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
@@ -27,8 +27,6 @@
  *
  *****************************************************************************/
 
-#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-
 #include "../wifi.h"
 #include "../efuse.h"
 #include "../base.h"
@@ -80,8 +78,8 @@ void rtl92se_get_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                         break;
                 }
         default: {
-                        RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                                 ("switch case not process\n"));
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
+                         "switch case not processed\n");
                         break;
                 }
         }
@@ -140,7 +138,7 @@ void rtl92se_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                         u8 e_aci;
 
                         RT_TRACE(rtlpriv, COMP_MLME, DBG_LOUD,
-                                 ("HW_VAR_SLOT_TIME %x\n", val[0]));
+                                 "HW_VAR_SLOT_TIME %x\n", val[0]);
 
                         rtl_write_byte(rtlpriv, SLOT_TIME, val[0]);
 
@@ -185,8 +183,8 @@ void rtl92se_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                                 *val = min_spacing_to_set;
 
                                 RT_TRACE(rtlpriv, COMP_MLME, DBG_LOUD,
-                                         ("Set HW_VAR_AMPDU_MIN_SPACE: %#x\n",
-                                          mac->min_space_cfg));
+                                         "Set HW_VAR_AMPDU_MIN_SPACE: %#x\n",
+                                         mac->min_space_cfg);
 
                                 rtl_write_byte(rtlpriv, AMPDU_MIN_SPACE,
                                                mac->min_space_cfg);
@@ -201,8 +199,8 @@ void rtl92se_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                         mac->min_space_cfg |= (density_to_set << 3);
 
                         RT_TRACE(rtlpriv, COMP_MLME, DBG_LOUD,
-                                 ("Set HW_VAR_SHORTGI_DENSITY: %#x\n",
-                                  mac->min_space_cfg));
+                                 "Set HW_VAR_SHORTGI_DENSITY: %#x\n",
+                                 mac->min_space_cfg);
 
                         rtl_write_byte(rtlpriv, AMPDU_MIN_SPACE,
                                        mac->min_space_cfg);
@@ -244,8 +242,8 @@ void rtl92se_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                                 rtl_write_byte(rtlpriv, AGGLEN_LMT_H, regtoset);
 
                                 RT_TRACE(rtlpriv, COMP_MLME, DBG_LOUD,
-                                         ("Set HW_VAR_AMPDU_FACTOR: %#x\n",
-                                          factor_toset));
+                                         "Set HW_VAR_AMPDU_FACTOR: %#x\n",
+                                         factor_toset);
                         }
                         break;
                 }
@@ -282,8 +280,8 @@ void rtl92se_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                                         break;
                                 default:
                                         RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
-                                                 ("HW_VAR_ACM_CTRL acm set "
-                                                  "failed: eACI is %d\n", acm));
+                                                 "HW_VAR_ACM_CTRL acm set failed: eACI is %d\n",
+                                                 acm);
                                         break;
                                 }
                         } else {
@@ -299,13 +297,13 @@ void rtl92se_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                                         break;
                                 default:
                                         RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                                                 ("switch case not process\n"));
+                                                 "switch case not processed\n");
                                         break;
                                 }
                         }
 
                         RT_TRACE(rtlpriv, COMP_QOS, DBG_TRACE,
-                                 ("HW_VAR_ACM_CTRL Write 0x%X\n", acm_ctrl));
+                                 "HW_VAR_ACM_CTRL Write 0x%X\n", acm_ctrl);
                         rtl_write_byte(rtlpriv, AcmHwCtrl, acm_ctrl);
                         break;
                 }
@@ -404,7 +402,7 @@ void rtl92se_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                 }
         default:
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("switch case not process\n"));
+                         "switch case not processed\n");
                 break;
         }
 
@@ -415,14 +413,14 @@ void rtl92se_enable_hw_security_config(struct ieee80211_hw *hw)
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         u8 sec_reg_value = 0x0;
 
-        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, ("PairwiseEncAlgorithm = %d "
-                 "GroupEncAlgorithm = %d\n",
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
+                 "PairwiseEncAlgorithm = %d GroupEncAlgorithm = %d\n",
                  rtlpriv->sec.pairwise_enc_algorithm,
-                 rtlpriv->sec.group_enc_algorithm));
+                 rtlpriv->sec.group_enc_algorithm);
 
         if (rtlpriv->cfg->mod_params->sw_crypto || rtlpriv->sec.use_sw_sec) {
                 RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,
-                         ("not open hw encryption\n"));
+                         "not open hw encryption\n");
                 return;
         }
 
@@ -433,8 +431,8 @@ void rtl92se_enable_hw_security_config(struct ieee80211_hw *hw)
                 sec_reg_value |= SCR_RXUSEDK;
         }
 
-        RT_TRACE(rtlpriv, COMP_SEC, DBG_LOUD, ("The SECR-value %x\n",
-                        sec_reg_value));
+        RT_TRACE(rtlpriv, COMP_SEC, DBG_LOUD, "The SECR-value %x\n",
+                 sec_reg_value);
 
         rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_WPA_CONFIG, &sec_reg_value);
 
@@ -718,8 +716,8 @@ static void _rtl92se_macconfig_before_fwdownload(struct ieee80211_hw *hw)
 
         if (pollingcnt <= 0) {
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("Polling TXDMA_INIT_VALUE "
-                         "timeout!! Current TCR(%#x)\n", tmpu1b));
+                         "Polling TXDMA_INIT_VALUE timeout!! Current TCR(%#x)\n",
+                         tmpu1b);
                 tmpu1b = rtl_read_byte(rtlpriv, CMDR);
                 rtl_write_byte(rtlpriv, CMDR, tmpu1b & (~TXDMA_EN));
                 udelay(2);
@@ -870,10 +868,10 @@ static void _rtl92se_macconfig_after_fwdownload(struct ieee80211_hw *hw)
 
                 /* Change Program timing */
                 rtl_write_byte(rtlpriv, REG_EFUSE_CTRL + 3, 0x72);
-                RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, ("EFUSE CONFIG OK\n"));
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "EFUSE CONFIG OK\n");
         }
 
-        RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, ("OK\n"));
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "OK\n");
 
 }
 
@@ -951,12 +949,9 @@ int rtl92se_hw_init(struct ieee80211_hw *hw)
         rtstatus = rtl92s_download_fw(hw);
         if (!rtstatus) {
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
-                         ("Failed to download FW. "
-                         "Init HW without FW now.., Please copy FW into"
-                         "/lib/firmware/rtlwifi\n"));
-                rtlhal->fw_ready = false;
-        } else {
-                rtlhal->fw_ready = true;
+                         "Failed to download FW. Init HW without FW now... "
+                         "Please copy FW into /lib/firmware/rtlwifi\n");
+                return 1;
         }
 
         /* After FW download, we have to reset MAC register */
@@ -968,7 +963,7 @@ int rtl92se_hw_init(struct ieee80211_hw *hw)
 
         /* 3. Initialize MAC/PHY Config by MACPHY_reg.txt */
         if (rtl92s_phy_mac_config(hw) != true) {
-                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, ("MAC Config failed\n"));
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "MAC Config failed\n");
                 return rtstatus;
         }
 
@@ -978,7 +973,7 @@ int rtl92se_hw_init(struct ieee80211_hw *hw)
 
         /* 4. Initialize BB After MAC Config PHY_reg.txt, AGC_Tab.txt */
         if (rtl92s_phy_bb_config(hw) != true) {
-                RT_TRACE(rtlpriv, COMP_INIT, DBG_EMERG, ("BB Config failed\n"));
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_EMERG, "BB Config failed\n");
                 return rtstatus;
         }
 
@@ -1014,7 +1009,7 @@ int rtl92se_hw_init(struct ieee80211_hw *hw)
                 rtl_write_byte(rtlpriv, RF_CTRL, 0x07);
 
         if (rtl92s_phy_rf_config(hw) != true) {
-                RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, ("RF Config failed\n"));
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "RF Config failed\n");
                 return rtstatus;
         }
 
@@ -1129,26 +1124,26 @@ static int _rtl92se_set_media_status(struct ieee80211_hw *hw,
         case NL80211_IFTYPE_UNSPECIFIED:
                 bt_msr |= (MSR_LINK_NONE << MSR_LINK_SHIFT);
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                         ("Set Network type to NO LINK!\n"));
+                         "Set Network type to NO LINK!\n");
                 break;
         case NL80211_IFTYPE_ADHOC:
                 bt_msr |= (MSR_LINK_ADHOC << MSR_LINK_SHIFT);
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                         ("Set Network type to Ad Hoc!\n"));
+                         "Set Network type to Ad Hoc!\n");
                 break;
         case NL80211_IFTYPE_STATION:
                 bt_msr |= (MSR_LINK_MANAGED << MSR_LINK_SHIFT);
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                         ("Set Network type to STA!\n"));
+                         "Set Network type to STA!\n");
                 break;
         case NL80211_IFTYPE_AP:
                 bt_msr |= (MSR_LINK_MASTER << MSR_LINK_SHIFT);
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                         ("Set Network type to AP!\n"));
+                         "Set Network type to AP!\n");
                 break;
         default:
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("Network type %d not support!\n", type));
+                         "Network type %d not supported!\n", type);
                 return 1;
                 break;
 
@@ -1202,7 +1197,7 @@ void rtl92se_set_qos(struct ieee80211_hw *hw, int aci)
                 rtl_write_dword(rtlpriv, EDCAPARA_VO, 0x2f3222);
                 break;
         default:
-                RT_ASSERT(false, ("invalid aci: %d !\n", aci));
+                RT_ASSERT(false, "invalid aci: %d !\n", aci);
                 break;
         }
 }
@@ -1219,9 +1214,14 @@ void rtl92se_enable_interrupt(struct ieee80211_hw *hw)
 
 void rtl92se_disable_interrupt(struct ieee80211_hw *hw)
 {
-        struct rtl_priv *rtlpriv = rtl_priv(hw);
-        struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
+        struct rtl_priv *rtlpriv;
+        struct rtl_pci *rtlpci;
 
+        rtlpriv = rtl_priv(hw);
+        /* if firmware not available, no interrupts */
+        if (!rtlpriv || !rtlpriv->max_fw_size)
+                return;
+        rtlpci = rtl_pcidev(rtl_pcipriv(hw));
         rtl_write_dword(rtlpriv, INTA_MASK, 0);
         rtl_write_dword(rtlpriv, INTA_MASK + 4, 0);
 
@@ -1583,8 +1583,8 @@ void rtl92se_update_interrupt_mask(struct ieee80211_hw *hw,
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
 
-        RT_TRACE(rtlpriv, COMP_INTR, DBG_LOUD,
-                 ("add_msr:%x, rm_msr:%x\n", add_msr, rm_msr));
+        RT_TRACE(rtlpriv, COMP_INTR, DBG_LOUD, "add_msr:%x, rm_msr:%x\n",
+                 add_msr, rm_msr);
 
         if (add_msr)
                 rtlpci->irq_mask[0] |= add_msr;
@@ -1627,7 +1627,7 @@ static void _rtl92se_read_adapter_info(struct ieee80211_hw *hw)
 
         if (rtlefuse->epromtype == EEPROM_93C46) {
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("RTL819X Not boot from eeprom, check it !!"));
+                         "RTL819X Not boot from eeprom, check it !!\n");
         } else if (rtlefuse->epromtype == EEPROM_BOOT_EFUSE) {
                 rtl_efuse_shadow_map_update(hw);
 
@@ -1636,16 +1636,16 @@ static void _rtl92se_read_adapter_info(struct ieee80211_hw *hw)
                         HWSET_MAX_SIZE_92S);
         }
 
-        RT_PRINT_DATA(rtlpriv, COMP_INIT, DBG_DMESG, ("MAP\n"),
+        RT_PRINT_DATA(rtlpriv, COMP_INIT, DBG_DMESG, "MAP",
                       hwinfo, HWSET_MAX_SIZE_92S);
 
         eeprom_id = *((u16 *)&hwinfo[0]);
         if (eeprom_id != RTL8190_EEPROM_ID) {
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
-                         ("EEPROM ID(%#x) is invalid!!\n", eeprom_id));
+                         "EEPROM ID(%#x) is invalid!!\n", eeprom_id);
                 rtlefuse->autoload_failflag = true;
         } else {
-                RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, ("Autoload OK\n"));
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "Autoload OK\n");
                 rtlefuse->autoload_failflag = false;
         }
 
@@ -1663,15 +1663,15 @@ static void _rtl92se_read_adapter_info(struct ieee80211_hw *hw)
         rtlefuse->eeprom_version = *(u16 *)&hwinfo[EEPROM_VERSION];
 
         RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
-                        ("EEPROMId = 0x%4x\n", eeprom_id));
+                 "EEPROMId = 0x%4x\n", eeprom_id);
         RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
-                        ("EEPROM VID = 0x%4x\n", rtlefuse->eeprom_vid));
+                 "EEPROM VID = 0x%4x\n", rtlefuse->eeprom_vid);
         RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
-                        ("EEPROM DID = 0x%4x\n", rtlefuse->eeprom_did));
+                 "EEPROM DID = 0x%4x\n", rtlefuse->eeprom_did);
         RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
-                        ("EEPROM SVID = 0x%4x\n", rtlefuse->eeprom_svid));
+                 "EEPROM SVID = 0x%4x\n", rtlefuse->eeprom_svid);
         RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
-                        ("EEPROM SMID = 0x%4x\n", rtlefuse->eeprom_smid));
+                 "EEPROM SMID = 0x%4x\n", rtlefuse->eeprom_smid);
 
         for (i = 0; i < 6; i += 2) {
                 usvalue = *(u16 *)&hwinfo[EEPROM_MAC_ADDR + i];
@@ -1681,8 +1681,7 @@ static void _rtl92se_read_adapter_info(struct ieee80211_hw *hw)
         for (i = 0; i < 6; i++)
                 rtl_write_byte(rtlpriv, MACIDR0 + i, rtlefuse->dev_addr[i]);
 
-        RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
-                 ("%pM\n", rtlefuse->dev_addr));
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "%pM\n", rtlefuse->dev_addr);
 
         /* Get Tx Power Level by Channel */
         /* Read Tx power of Channel 1 ~ 14 from EEPROM. */
@@ -1707,23 +1706,24 @@ static void _rtl92se_read_adapter_info(struct ieee80211_hw *hw)
         for (rf_path = 0; rf_path < 2; rf_path++)
                 for (i = 0; i < 3; i++)
                         RTPRINT(rtlpriv, FINIT, INIT_EEPROM,
-                                ("RF(%d) EEPROM CCK Area(%d) = 0x%x\n", rf_path,
-                                i, rtlefuse->eeprom_chnlarea_txpwr_cck
-                                        [rf_path][i]));
+                                "RF(%d) EEPROM CCK Area(%d) = 0x%x\n",
+                                rf_path, i,
+                                rtlefuse->eeprom_chnlarea_txpwr_cck
+                                [rf_path][i]);
         for (rf_path = 0; rf_path < 2; rf_path++)
                 for (i = 0; i < 3; i++)
                         RTPRINT(rtlpriv, FINIT, INIT_EEPROM,
-                                ("RF(%d) EEPROM HT40 1S Area(%d) = 0x%x\n",
-                                 rf_path, i,
-                                 rtlefuse->eeprom_chnlarea_txpwr_ht40_1s
-                                                [rf_path][i]));
+                                "RF(%d) EEPROM HT40 1S Area(%d) = 0x%x\n",
+                                rf_path, i,
+                                rtlefuse->eeprom_chnlarea_txpwr_ht40_1s
+                                [rf_path][i]);
         for (rf_path = 0; rf_path < 2; rf_path++)
                 for (i = 0; i < 3; i++)
                         RTPRINT(rtlpriv, FINIT, INIT_EEPROM,
-                                ("RF(%d) EEPROM HT40 2S Diff Area(%d) = 0x%x\n",
-                                 rf_path, i,
-                                 rtlefuse->eeprom_chnlarea_txpwr_ht40_2sdiif
-                                        [rf_path][i]));
+                                "RF(%d) EEPROM HT40 2S Diff Area(%d) = 0x%x\n",
+                                rf_path, i,
+                                rtlefuse->eeprom_chnlarea_txpwr_ht40_2sdiif
+                                [rf_path][i]);
 
         for (rf_path = 0; rf_path < 2; rf_path++) {
 
@@ -1754,11 +1754,11 @@ static void _rtl92se_read_adapter_info(struct ieee80211_hw *hw)
 
                 for (i = 0; i < 14; i++) {
                         RTPRINT(rtlpriv, FINIT, INIT_TxPower,
-                                ("RF(%d)-Ch(%d) [CCK / HT40_1S / HT40_2S] = "
-                                 "[0x%x / 0x%x / 0x%x]\n", rf_path, i,
-                                 rtlefuse->txpwrlevel_cck[rf_path][i],
-                                 rtlefuse->txpwrlevel_ht40_1s[rf_path][i],
-                                 rtlefuse->txpwrlevel_ht40_2s[rf_path][i]));
+                                "RF(%d)-Ch(%d) [CCK / HT40_1S / HT40_2S] = [0x%x / 0x%x / 0x%x]\n",
+                                rf_path, i,
+                                rtlefuse->txpwrlevel_cck[rf_path][i],
+                                rtlefuse->txpwrlevel_ht40_1s[rf_path][i],
+                                rtlefuse->txpwrlevel_ht40_2s[rf_path][i]);
                 }
         }
 
@@ -1791,13 +1791,13 @@ static void _rtl92se_read_adapter_info(struct ieee80211_hw *hw)
                                 0xf0) >> 4);
 
                         RTPRINT(rtlpriv, FINIT, INIT_TxPower,
-                                ("RF-%d pwrgroup_ht20[%d] = 0x%x\n",
-                                 rf_path, i,
-                                 rtlefuse->pwrgroup_ht20[rf_path][i]));
+                                "RF-%d pwrgroup_ht20[%d] = 0x%x\n",
+                                rf_path, i,
+                                rtlefuse->pwrgroup_ht20[rf_path][i]);
                         RTPRINT(rtlpriv, FINIT, INIT_TxPower,
-                                ("RF-%d pwrgroup_ht40[%d] = 0x%x\n",
-                                 rf_path, i,
-                                 rtlefuse->pwrgroup_ht40[rf_path][i]));
+                                "RF-%d pwrgroup_ht40[%d] = 0x%x\n",
+                                rf_path, i,
+                                rtlefuse->pwrgroup_ht40[rf_path][i]);
                         }
         }
 
@@ -1852,27 +1852,27 @@ static void _rtl92se_read_adapter_info(struct ieee80211_hw *hw)
                                  (hwinfo[EEPROM_REGULATORY] & 0x1);
         }
         RTPRINT(rtlpriv, FINIT, INIT_TxPower,
-                ("eeprom_regulatory = 0x%x\n", rtlefuse->eeprom_regulatory));
+                "eeprom_regulatory = 0x%x\n", rtlefuse->eeprom_regulatory);
 
         for (i = 0; i < 14; i++)
                 RTPRINT(rtlpriv, FINIT, INIT_TxPower,
-                        ("RF-A Ht20 to HT40 Diff[%d] = 0x%x\n", i,
-                         rtlefuse->txpwr_ht20diff[RF90_PATH_A][i]));
+                        "RF-A Ht20 to HT40 Diff[%d] = 0x%x\n",
+                        i, rtlefuse->txpwr_ht20diff[RF90_PATH_A][i]);
         for (i = 0; i < 14; i++)
                 RTPRINT(rtlpriv, FINIT, INIT_TxPower,
-                        ("RF-A Legacy to Ht40 Diff[%d] = 0x%x\n", i,
-                         rtlefuse->txpwr_legacyhtdiff[RF90_PATH_A][i]));
+                        "RF-A Legacy to Ht40 Diff[%d] = 0x%x\n",
+                        i, rtlefuse->txpwr_legacyhtdiff[RF90_PATH_A][i]);
         for (i = 0; i < 14; i++)
                 RTPRINT(rtlpriv, FINIT, INIT_TxPower,
-                        ("RF-B Ht20 to HT40 Diff[%d] = 0x%x\n", i,
-                         rtlefuse->txpwr_ht20diff[RF90_PATH_B][i]));
+                        "RF-B Ht20 to HT40 Diff[%d] = 0x%x\n",
+                        i, rtlefuse->txpwr_ht20diff[RF90_PATH_B][i]);
         for (i = 0; i < 14; i++)
                 RTPRINT(rtlpriv, FINIT, INIT_TxPower,
-                        ("RF-B Legacy to HT40 Diff[%d] = 0x%x\n", i,
-                         rtlefuse->txpwr_legacyhtdiff[RF90_PATH_B][i]));
+                        "RF-B Legacy to HT40 Diff[%d] = 0x%x\n",
+                        i, rtlefuse->txpwr_legacyhtdiff[RF90_PATH_B][i]);
 
-        RTPRINT(rtlpriv, FINIT, INIT_TxPower, ("TxPwrSafetyFlag = %d\n",
-                rtlefuse->txpwr_safetyflag));
+        RTPRINT(rtlpriv, FINIT, INIT_TxPower,
+                "TxPwrSafetyFlag = %d\n", rtlefuse->txpwr_safetyflag);
 
         /* Read RF-indication and Tx Power gain
          * index diff of legacy to HT OFDM rate. */
@@ -1881,8 +1881,8 @@ static void _rtl92se_read_adapter_info(struct ieee80211_hw *hw)
         rtlefuse->legacy_httxpowerdiff =
                 rtlefuse->txpwr_legacyhtdiff[RF90_PATH_A][0];
 
-        RTPRINT(rtlpriv, FINIT, INIT_TxPower, ("TxPowerDiff = %#x\n",
-                rtlefuse->eeprom_txpowerdiff));
+        RTPRINT(rtlpriv, FINIT, INIT_TxPower,
+                "TxPowerDiff = %#x\n", rtlefuse->eeprom_txpowerdiff);
 
         /* Get TSSI value for each path. */
         usvalue = *(u16 *)&hwinfo[EEPROM_TSSI_A];
@@ -1890,16 +1890,16 @@ static void _rtl92se_read_adapter_info(struct ieee80211_hw *hw)
         usvalue = *(u8 *)&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",
-                 rtlefuse->eeprom_tssi[RF90_PATH_A],
-                 rtlefuse->eeprom_tssi[RF90_PATH_B]));
+        RTPRINT(rtlpriv, FINIT, INIT_TxPower, "TSSI_A = 0x%x, TSSI_B = 0x%x\n",
+                rtlefuse->eeprom_tssi[RF90_PATH_A],
+                rtlefuse->eeprom_tssi[RF90_PATH_B]);
 
         /* Read antenna tx power offset of B/C/D to A  from EEPROM */
         /* and read ThermalMeter from EEPROM */
         tempval = *(u8 *)&hwinfo[EEPROM_THERMALMETER];
         rtlefuse->eeprom_thermalmeter = tempval;
-        RTPRINT(rtlpriv, FINIT, INIT_TxPower, ("thermalmeter = 0x%x\n",
-                rtlefuse->eeprom_thermalmeter));
+        RTPRINT(rtlpriv, FINIT, INIT_TxPower,
+                "thermalmeter = 0x%x\n", rtlefuse->eeprom_thermalmeter);
 
         /* ThermalMeter, BIT(0)~3 for RFIC1, BIT(4)~7 for RFIC2 */
         rtlefuse->thermalmeter[0] = (rtlefuse->eeprom_thermalmeter & 0x1f);
@@ -1915,8 +1915,8 @@ static void _rtl92se_read_adapter_info(struct ieee80211_hw *hw)
         /* Version ID, Channel plan */
         rtlefuse->eeprom_channelplan = *(u8 *)&hwinfo[EEPROM_CHANNELPLAN];
         rtlefuse->txpwr_fromeprom = true;
-        RTPRINT(rtlpriv, FINIT, INIT_TxPower, ("EEPROM ChannelPlan = 0x%4x\n",
-                rtlefuse->eeprom_channelplan));
+        RTPRINT(rtlpriv, FINIT, INIT_TxPower,
+                "EEPROM ChannelPlan = 0x%4x\n", rtlefuse->eeprom_channelplan);
 
         /* Read Customer ID or Board Type!!! */
         tempval = *(u8 *)&hwinfo[EEPROM_BOARDTYPE];
@@ -1937,14 +1937,14 @@ static void _rtl92se_read_adapter_info(struct ieee80211_hw *hw)
                 if (!(tempval & BIT(0))) {
                         rtlefuse->b1x1_recvcombine = true;
                         RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
-                                ("RF_TYPE=1T2R but only 1SS\n"));
+                                 "RF_TYPE=1T2R but only 1SS\n");
                 }
         }
         rtlefuse->b1ss_support = rtlefuse->b1x1_recvcombine;
         rtlefuse->eeprom_oemid = *(u8 *)&hwinfo[EEPROM_CUSTOMID];
 
-        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, ("EEPROM Customer ID: 0x%2x",
-                        rtlefuse->eeprom_oemid));
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "EEPROM Customer ID: 0x%2x",
+                 rtlefuse->eeprom_oemid);
 
         /* set channel paln to world wide 13 */
         rtlefuse->channel_plan = COUNTRY_CODE_WORLD_WIDE_13;
@@ -1959,19 +1959,19 @@ void rtl92se_read_eeprom_info(struct ieee80211_hw *hw)
         tmp_u1b = rtl_read_byte(rtlpriv, EPROM_CMD);
 
         if (tmp_u1b & BIT(4)) {
-                RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, ("Boot from EEPROM\n"));
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "Boot from EEPROM\n");
                 rtlefuse->epromtype = EEPROM_93C46;
         } else {
-                RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, ("Boot from EFUSE\n"));
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "Boot from EFUSE\n");
                 rtlefuse->epromtype = EEPROM_BOOT_EFUSE;
         }
 
         if (tmp_u1b & BIT(5)) {
-                RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, ("Autoload OK\n"));
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "Autoload OK\n");
                 rtlefuse->autoload_failflag = false;
                 _rtl92se_read_adapter_info(hw);
         } else {
-                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, ("Autoload ERR!!\n"));
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "Autoload ERR!!\n");
                 rtlefuse->autoload_failflag = true;
         }
 }
@@ -2071,8 +2071,8 @@ static void rtl92se_update_hal_rate_table(struct ieee80211_hw *hw,
         else
                 rtl92s_phy_set_fw_cmd(hw, FW_CMD_RA_REFRESH_BG);
 
-        RT_TRACE(rtlpriv, COMP_RATR, DBG_DMESG,
-                 ("%x\n", rtl_read_dword(rtlpriv, ARFR0)));
+        RT_TRACE(rtlpriv, COMP_RATR, DBG_DMESG, "%x\n",
+                 rtl_read_dword(rtlpriv, ARFR0));
 }
 
 static void rtl92se_update_hal_rate_mask(struct ieee80211_hw *hw,
@@ -2224,8 +2224,8 @@ static void rtl92se_update_hal_rate_mask(struct ieee80211_hw *hw,
 
         mask |= (bmulticast ? 1 : 0) << 9 | (macid & 0x1f) << 4 | (band & 0xf);
 
-        RT_TRACE(rtlpriv, COMP_RATR, DBG_TRACE, ("mask = %x, bitmap = %x\n",
-                        mask, ratr_bitmap));
+        RT_TRACE(rtlpriv, COMP_RATR, DBG_TRACE, "mask = %x, bitmap = %x\n",
+                 mask, ratr_bitmap);
         rtl_write_dword(rtlpriv, 0x2c4, ratr_bitmap);
         rtl_write_dword(rtlpriv, WFM5, (FW_RA_UPDATE_MASK | (mask << 8)));
 
@@ -2301,14 +2301,14 @@ bool rtl92se_gpio_radio_on_off_checking(struct ieee80211_hw *hw, u8 *valid)
 
         if ((ppsc->hwradiooff) && (rfpwr_toset == ERFON)) {
                 RT_TRACE(rtlpriv, COMP_RF, DBG_DMESG,
-                         ("RFKILL-HW Radio ON, RF ON\n"));
+                         "RFKILL-HW Radio ON, RF ON\n");
 
                 rfpwr_toset = ERFON;
                 ppsc->hwradiooff = false;
                 actuallyset = true;
         } else if ((ppsc->hwradiooff == false) && (rfpwr_toset == ERFOFF)) {
-                RT_TRACE(rtlpriv, COMP_RF, DBG_DMESG,
-                         ("RFKILL-HW Radio OFF, RF OFF\n"));
+                RT_TRACE(rtlpriv, COMP_RF,
+                         DBG_DMESG, "RFKILL-HW Radio OFF, RF OFF\n");
 
                 rfpwr_toset = ERFOFF;
                 ppsc->hwradiooff = true;
@@ -2372,7 +2372,7 @@ void rtl92se_set_key(struct ieee80211_hw *hw, u32 key_index, u8 *p_macaddr,
                 u8 cam_offset = 0;
                 u8 clear_number = 5;
 
-                RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG, ("clear_all\n"));
+                RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG, "clear_all\n");
 
                 for (idx = 0; idx < clear_number; idx++) {
                         rtl_cam_mark_invalid(hw, cam_offset + idx);
@@ -2401,7 +2401,7 @@ void rtl92se_set_key(struct ieee80211_hw *hw, u32 key_index, u8 *p_macaddr,
                         break;
                 default:
                         RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                                        ("switch case not process\n"));
+                                 "switch case not processed\n");
                         enc_algo = CAM_TKIP;
                         break;
                 }
@@ -2419,9 +2419,8 @@ void rtl92se_set_key(struct ieee80211_hw *hw, u32 key_index, u8 *p_macaddr,
                                                                  p_macaddr);
                                         if (entry_id >=  TOTAL_CAM_ENTRY) {
                                                 RT_TRACE(rtlpriv,
-                                                   COMP_SEC, DBG_EMERG,
-                                                   ("Can not find free hw"
-                                                   " security cam entry\n"));
+                                                         COMP_SEC, DBG_EMERG,
+                                                         "Can not find free hw security cam entry\n");
                                                 return;
                                         }
                                 } else {
@@ -2435,30 +2434,31 @@ void rtl92se_set_key(struct ieee80211_hw *hw, u32 key_index, u8 *p_macaddr,
 
                 if (rtlpriv->sec.key_len[key_index] == 0) {
                         RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,
-                                 ("delete one entry, entry_id is %d\n",
-                                 entry_id));
+                                 "delete one entry, entry_id is %d\n",
+                                 entry_id);
                         if (mac->opmode == NL80211_IFTYPE_AP)
                                 rtl_cam_del_entry(hw, p_macaddr);
                         rtl_cam_delete_one_entry(hw, p_macaddr, entry_id);
                 } else {
                         RT_TRACE(rtlpriv, COMP_SEC, DBG_LOUD,
-                                 ("The insert KEY length is %d\n",
-                                  rtlpriv->sec.key_len[PAIRWISE_KEYIDX]));
+                                 "The insert KEY length is %d\n",
+                                 rtlpriv->sec.key_len[PAIRWISE_KEYIDX]);
                         RT_TRACE(rtlpriv, COMP_SEC, DBG_LOUD,
-                                 ("The insert KEY  is %x %x\n",
-                                  rtlpriv->sec.key_buf[0][0],
-                                  rtlpriv->sec.key_buf[0][1]));
+                                 "The insert KEY is %x %x\n",
+                                 rtlpriv->sec.key_buf[0][0],
+                                 rtlpriv->sec.key_buf[0][1]);
 
                         RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,
-                                 ("add one entry\n"));
+                                 "add one entry\n");
                         if (is_pairwise) {
                                 RT_PRINT_DATA(rtlpriv, COMP_SEC, DBG_LOUD,
-                                      "Pairwiase Key content :",
-                                       rtlpriv->sec.pairwise_key,
-                                       rtlpriv->sec.key_len[PAIRWISE_KEYIDX]);
+                                              "Pairwise Key content",
+                                              rtlpriv->sec.pairwise_key,
+                                              rtlpriv->sec.
+                                              key_len[PAIRWISE_KEYIDX]);
 
                                 RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,
-                                         ("set Pairwiase key\n"));
+                                         "set Pairwise key\n");
 
                                 rtl_cam_add_one_entry(hw, macaddr, key_index,
                                         entry_id, enc_algo,
@@ -2466,7 +2466,7 @@ void rtl92se_set_key(struct ieee80211_hw *hw, u32 key_index, u8 *p_macaddr,
                                         rtlpriv->sec.key_buf[key_index]);
                         } else {
                                 RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,
-                                         ("set group key\n"));
+                                         "set group key\n");
 
                                 if (mac->opmode == NL80211_IFTYPE_ADHOC) {
                                         rtl_cam_add_one_entry(hw,
diff --git a/drivers/net/wireless/rtlwifi/rtl8192se/hw.h b/drivers/net/wireless/rtlwifi/rtl8192se/hw.h
index 6160a9bfe98a..1886c2644a26 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192se/hw.h
+++ b/drivers/net/wireless/rtlwifi/rtl8192se/hw.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2009-2010  Realtek Corporation.
+ * Copyright(c) 2009-2012  Realtek Corporation.
  *
  * 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
diff --git a/drivers/net/wireless/rtlwifi/rtl8192se/led.c b/drivers/net/wireless/rtlwifi/rtl8192se/led.c
index e3fe7c90ebf4..44949b5cbb87 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192se/led.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192se/led.c
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2009-2010  Realtek Corporation.
+ * Copyright(c) 2009-2012  Realtek Corporation.
  *
  * 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
@@ -52,8 +52,8 @@ void rtl92se_sw_led_on(struct ieee80211_hw *hw, struct rtl_led *pled)
         u8 ledcfg;
         struct rtl_priv *rtlpriv = rtl_priv(hw);
 
-        RT_TRACE(rtlpriv, COMP_LED, DBG_LOUD,
-                 ("LedAddr:%X ledpin=%d\n", LEDCFG, pled->ledpin));
+        RT_TRACE(rtlpriv, COMP_LED, DBG_LOUD, "LedAddr:%X ledpin=%d\n",
+                 LEDCFG, pled->ledpin);
 
         ledcfg = rtl_read_byte(rtlpriv, LEDCFG);
 
@@ -68,7 +68,7 @@ void rtl92se_sw_led_on(struct ieee80211_hw *hw, struct rtl_led *pled)
                 break;
         default:
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("switch case not process\n"));
+                         "switch case not processed\n");
                 break;
         }
         pled->ledon = true;
@@ -76,12 +76,15 @@ void rtl92se_sw_led_on(struct ieee80211_hw *hw, struct rtl_led *pled)
 
 void rtl92se_sw_led_off(struct ieee80211_hw *hw, struct rtl_led *pled)
 {
-        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_priv *rtlpriv;
         struct rtl_pci_priv *pcipriv = rtl_pcipriv(hw);
         u8 ledcfg;
 
-        RT_TRACE(rtlpriv, COMP_LED, DBG_LOUD,
-                 ("LedAddr:%X ledpin=%d\n", LEDCFG, pled->ledpin));
+        rtlpriv = rtl_priv(hw);
+        if (!rtlpriv || rtlpriv->max_fw_size)
+                return;
+        RT_TRACE(rtlpriv, COMP_LED, DBG_LOUD, "LedAddr:%X ledpin=%d\n",
+                 LEDCFG, pled->ledpin);
 
         ledcfg = rtl_read_byte(rtlpriv, LEDCFG);
 
@@ -101,7 +104,7 @@ void rtl92se_sw_led_off(struct ieee80211_hw *hw, struct rtl_led *pled)
                 break;
         default:
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("switch case not process\n"));
+                         "switch case not processed\n");
                 break;
         }
         pled->ledon = false;
@@ -141,8 +144,7 @@ void rtl92se_led_control(struct ieee80211_hw *hw, enum led_ctl_mode ledaction)
             ledaction == LED_CTL_POWER_ON)) {
                 return;
         }
-        RT_TRACE(rtlpriv, COMP_LED, DBG_LOUD, ("ledaction %d,\n",
-                 ledaction));
+        RT_TRACE(rtlpriv, COMP_LED, DBG_LOUD, "ledaction %d\n", ledaction);
 
         _rtl92se_sw_led_control(hw, ledaction);
 }
diff --git a/drivers/net/wireless/rtlwifi/rtl8192se/led.h b/drivers/net/wireless/rtlwifi/rtl8192se/led.h
index 8cce3870af3c..2182dbeb5f32 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192se/led.h
+++ b/drivers/net/wireless/rtlwifi/rtl8192se/led.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2009-2010  Realtek Corporation.
+ * Copyright(c) 2009-2012  Realtek Corporation.
  *
  * 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
diff --git a/drivers/net/wireless/rtlwifi/rtl8192se/phy.c b/drivers/net/wireless/rtlwifi/rtl8192se/phy.c
index f10ac1ad9087..05b4e2790e99 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192se/phy.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192se/phy.c
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2009-2010  Realtek Corporation.
+ * Copyright(c) 2009-2012  Realtek Corporation.
  *
  * 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
@@ -27,8 +27,6 @@
  *
  *****************************************************************************/
 
-#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-
 #include "../wifi.h"
 #include "../pci.h"
 #include "../ps.h"
@@ -58,16 +56,15 @@ u32 rtl92s_phy_query_bb_reg(struct ieee80211_hw *hw, u32 regaddr, u32 bitmask)
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         u32 returnvalue = 0, originalvalue, bitshift;
 
-        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE, ("regaddr(%#x), bitmask(%#x)\n",
-                        regaddr, bitmask));
+        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE, "regaddr(%#x), bitmask(%#x)\n",
+                 regaddr, bitmask);
 
         originalvalue = rtl_read_dword(rtlpriv, regaddr);
         bitshift = _rtl92s_phy_calculate_bit_shift(bitmask);
         returnvalue = (originalvalue & bitmask) >> bitshift;
 
-        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
-                 ("BBR MASK=0x%x Addr[0x%x]=0x%x\n",
-                 bitmask, regaddr, originalvalue));
+        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE, "BBR MASK=0x%x Addr[0x%x]=0x%x\n",
+                 bitmask, regaddr, originalvalue);
 
         return returnvalue;
 
@@ -79,8 +76,9 @@ void rtl92s_phy_set_bb_reg(struct ieee80211_hw *hw, u32 regaddr, u32 bitmask,
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         u32 originalvalue, bitshift;
 
-        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE, ("regaddr(%#x), bitmask(%#x),"
-                        " data(%#x)\n", regaddr, bitmask, data));
+        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
+                 "regaddr(%#x), bitmask(%#x), data(%#x)\n",
+                 regaddr, bitmask, data);
 
         if (bitmask != MASKDWORD) {
                 originalvalue = rtl_read_dword(rtlpriv, regaddr);
@@ -90,8 +88,9 @@ void rtl92s_phy_set_bb_reg(struct ieee80211_hw *hw, u32 regaddr, u32 bitmask,
 
         rtl_write_dword(rtlpriv, regaddr, data);
 
-        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE, ("regaddr(%#x), bitmask(%#x),"
-                        " data(%#x)\n", regaddr, bitmask, data));
+        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
+                 "regaddr(%#x), bitmask(%#x), data(%#x)\n",
+                 regaddr, bitmask, data);
 
 }
 
@@ -149,8 +148,8 @@ static u32 _rtl92s_phy_rf_serial_read(struct ieee80211_hw *hw,
         retvalue = rtl_get_bbreg(hw, pphyreg->rflssi_readback,
                                  BLSSI_READBACK_DATA);
 
-        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE, ("RFR-%d Addr[0x%x]=0x%x\n",
-                 rfpath, pphyreg->rflssi_readback, retvalue));
+        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE, "RFR-%d Addr[0x%x]=0x%x\n",
+                 rfpath, pphyreg->rflssi_readback, retvalue);
 
         return retvalue;
 
@@ -172,8 +171,8 @@ static void _rtl92s_phy_rf_serial_write(struct ieee80211_hw *hw,
         data_and_addr = ((newoffset << 20) | (data & 0x000fffff)) & 0x0fffffff;
         rtl_set_bbreg(hw, pphyreg->rf3wire_offset, MASKDWORD, data_and_addr);
 
-        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE, ("RFW-%d Addr[0x%x]=0x%x\n",
-                 rfpath, pphyreg->rf3wire_offset, data_and_addr));
+        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE, "RFW-%d Addr[0x%x]=0x%x\n",
+                 rfpath, pphyreg->rf3wire_offset, data_and_addr);
 }
 
 
@@ -183,8 +182,9 @@ u32 rtl92s_phy_query_rf_reg(struct ieee80211_hw *hw, enum radio_path rfpath,
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         u32 original_value, readback_value, bitshift;
 
-        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE, ("regaddr(%#x), rfpath(%#x), "
-                 "bitmask(%#x)\n", regaddr, rfpath, bitmask));
+        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
+                 "regaddr(%#x), rfpath(%#x), bitmask(%#x)\n",
+                 regaddr, rfpath, bitmask);
 
         spin_lock(&rtlpriv->locks.rf_lock);
 
@@ -195,9 +195,9 @@ u32 rtl92s_phy_query_rf_reg(struct ieee80211_hw *hw, enum radio_path rfpath,
 
         spin_unlock(&rtlpriv->locks.rf_lock);
 
-        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE, ("regaddr(%#x), rfpath(%#x), "
-                 "bitmask(%#x), original_value(%#x)\n", regaddr, rfpath,
-                 bitmask, original_value));
+        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
+                 "regaddr(%#x), rfpath(%#x), bitmask(%#x), original_value(%#x)\n",
+                 regaddr, rfpath, bitmask, original_value);
 
         return readback_value;
 }
@@ -212,8 +212,9 @@ void rtl92s_phy_set_rf_reg(struct ieee80211_hw *hw, enum radio_path rfpath,
         if (!((rtlphy->rf_pathmap >> rfpath) & 0x1))
                 return;
 
-        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE, ("regaddr(%#x), bitmask(%#x),"
-                 " data(%#x), rfpath(%#x)\n", regaddr, bitmask, data, rfpath));
+        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
+                 "regaddr(%#x), bitmask(%#x), data(%#x), rfpath(%#x)\n",
+                 regaddr, bitmask, data, rfpath);
 
         spin_lock(&rtlpriv->locks.rf_lock);
 
@@ -228,8 +229,9 @@ void rtl92s_phy_set_rf_reg(struct ieee80211_hw *hw, enum radio_path rfpath,
 
         spin_unlock(&rtlpriv->locks.rf_lock);
 
-        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE, ("regaddr(%#x), bitmask(%#x), "
-                 "data(%#x), rfpath(%#x)\n", regaddr, bitmask, data, rfpath));
+        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
+                 "regaddr(%#x), bitmask(%#x), data(%#x), rfpath(%#x)\n",
+                 regaddr, bitmask, data, rfpath);
 
 }
 
@@ -249,7 +251,7 @@ void rtl92s_phy_scan_operation_backup(struct ieee80211_hw *hw,
                         break;
                 default:
                         RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                                 ("Unknown operation.\n"));
+                                 "Unknown operation\n");
                         break;
                 }
         }
@@ -264,9 +266,9 @@ void rtl92s_phy_set_bw_mode(struct ieee80211_hw *hw,
         struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
         u8 reg_bw_opmode;
 
-        RT_TRACE(rtlpriv, COMP_SCAN, DBG_TRACE, ("Switch to %s bandwidth\n",
-                  rtlphy->current_chan_bw == HT_CHANNEL_WIDTH_20 ?
-                  "20MHz" : "40MHz"));
+        RT_TRACE(rtlpriv, COMP_SCAN, DBG_TRACE, "Switch to %s bandwidth\n",
+                 rtlphy->current_chan_bw == HT_CHANNEL_WIDTH_20 ?
+                 "20MHz" : "40MHz");
 
         if (rtlphy->set_bwmode_inprogress)
                 return;
@@ -290,8 +292,7 @@ void rtl92s_phy_set_bw_mode(struct ieee80211_hw *hw,
                 break;
         default:
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("unknown bandwidth: %#X\n",
-                         rtlphy->current_chan_bw));
+                         "unknown bandwidth: %#X\n", rtlphy->current_chan_bw);
                 break;
         }
 
@@ -316,13 +317,13 @@ void rtl92s_phy_set_bw_mode(struct ieee80211_hw *hw,
                 break;
         default:
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("unknown bandwidth: %#X\n", rtlphy->current_chan_bw));
+                         "unknown bandwidth: %#X\n", rtlphy->current_chan_bw);
                 break;
         }
 
         rtl92s_phy_rf6052_set_bandwidth(hw, rtlphy->current_chan_bw);
         rtlphy->set_bwmode_inprogress = false;
-        RT_TRACE(rtlpriv, COMP_SCAN, DBG_TRACE, ("<==\n"));
+        RT_TRACE(rtlpriv, COMP_SCAN, DBG_TRACE, "<==\n");
 }
 
 static bool _rtl92s_phy_set_sw_chnl_cmdarray(struct swchnlcmd *cmdtable,
@@ -332,7 +333,7 @@ static bool _rtl92s_phy_set_sw_chnl_cmdarray(struct swchnlcmd *cmdtable,
         struct swchnlcmd *pcmd;
 
         if (cmdtable == NULL) {
-                RT_ASSERT(false, ("cmdtable cannot be NULL.\n"));
+                RT_ASSERT(false, "cmdtable cannot be NULL\n");
                 return false;
         }
 
@@ -377,7 +378,7 @@ static bool _rtl92s_phy_sw_chnl_step_by_step(struct ieee80211_hw *hw,
         rfdependcmdcnt = 0;
 
         RT_ASSERT((channel >= 1 && channel <= 14),
-                  ("illegal channel for Zebra: %d\n", channel));
+                  "invalid channel for Zebra: %d\n", channel);
 
         _rtl92s_phy_set_sw_chnl_cmdarray(rfdependcmd, rfdependcmdcnt++,
                                          MAX_RFDEPENDCMD_CNT, CMDID_RF_WRITEREG,
@@ -438,7 +439,7 @@ static bool _rtl92s_phy_sw_chnl_step_by_step(struct ieee80211_hw *hw,
                         break;
                 default:
                         RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                                 ("switch case not process\n"));
+                                 "switch case not processed\n");
                         break;
                 }
 
@@ -458,9 +459,8 @@ u8 rtl92s_phy_sw_chnl(struct ieee80211_hw *hw)
         u32 delay;
         bool ret;
 
-        RT_TRACE(rtlpriv, COMP_SCAN, DBG_TRACE,
-                 ("switch to channel%d\n",
-                 rtlphy->current_channel));
+        RT_TRACE(rtlpriv, COMP_SCAN, DBG_TRACE, "switch to channel%d\n",
+                 rtlphy->current_channel);
 
         if (rtlphy->sw_chnl_inprogress)
                 return 0;
@@ -496,7 +496,7 @@ u8 rtl92s_phy_sw_chnl(struct ieee80211_hw *hw)
 
         rtlphy->sw_chnl_inprogress = false;
 
-        RT_TRACE(rtlpriv, COMP_SCAN, DBG_TRACE, ("<==\n"));
+        RT_TRACE(rtlpriv, COMP_SCAN, DBG_TRACE, "<==\n");
 
         return 1;
 }
@@ -556,7 +556,7 @@ bool rtl92s_phy_set_rf_power_state(struct ieee80211_hw *hw,
                                 do {
                                         InitializeCount++;
                                         RT_TRACE(rtlpriv, COMP_RF, DBG_DMESG,
-                                                 ("IPS Set eRf nic enable\n"));
+                                                 "IPS Set eRf nic enable\n");
                                         rtstatus = rtl_ps_enable_nic(hw);
                                 } while ((rtstatus != true) &&
                                          (InitializeCount < 10));
@@ -565,11 +565,11 @@ bool rtl92s_phy_set_rf_power_state(struct ieee80211_hw *hw,
                                                   RT_RF_OFF_LEVL_HALT_NIC);
                         } else {
                                 RT_TRACE(rtlpriv, COMP_POWER, DBG_DMESG,
-                                         ("awake, sleeped:%d ms "
-                                        "state_inap:%x\n",
-                                        jiffies_to_msecs(jiffies -
-                                        ppsc->last_sleep_jiffies),
-                                        rtlpriv->psc.state_inap));
+                                         "awake, sleeped:%d ms state_inap:%x\n",
+                                         jiffies_to_msecs(jiffies -
+                                                          ppsc->
+                                                          last_sleep_jiffies),
+                                         rtlpriv->psc.state_inap);
                                 ppsc->last_awake_jiffies = jiffies;
                                 rtl_write_word(rtlpriv, CMDR, 0x37FC);
                                 rtl_write_byte(rtlpriv, TXPAUSE, 0x00);
@@ -587,7 +587,7 @@ bool rtl92s_phy_set_rf_power_state(struct ieee80211_hw *hw,
         case ERFOFF:{
                         if (ppsc->reg_rfps_level & RT_RF_OFF_LEVL_HALT_NIC) {
                                 RT_TRACE(rtlpriv, COMP_RF, DBG_DMESG,
-                                         ("IPS Set eRf nic disable\n"));
+                                         "IPS Set eRf nic disable\n");
                                 rtl_ps_disable_nic(hw);
                                 RT_SET_PS_LEVEL(ppsc, RT_RF_OFF_LEVL_HALT_NIC);
                         } else {
@@ -613,11 +613,9 @@ bool rtl92s_phy_set_rf_power_state(struct ieee80211_hw *hw,
                                         continue;
                                 } else {
                                         RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
-                                                 ("eRf Off/Sleep: "
-                                                 "%d times TcbBusyQueue[%d] = "
-                                                 "%d before doze!\n",
-                                                 (i + 1), queue_id,
-                                                 skb_queue_len(&ring->queue)));
+                                                 "eRf Off/Sleep: %d times TcbBusyQueue[%d] = %d before doze!\n",
+                                                 i + 1, queue_id,
+                                                 skb_queue_len(&ring->queue));
 
                                         udelay(10);
                                         i++;
@@ -625,31 +623,30 @@ bool rtl92s_phy_set_rf_power_state(struct ieee80211_hw *hw,
 
                                 if (i >= MAX_DOZE_WAITING_TIMES_9x) {
                                         RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
-                                                 ("\nERFOFF: %d times"
-                                                 "TcbBusyQueue[%d] = %d !\n",
+                                                 "ERFOFF: %d times TcbBusyQueue[%d] = %d !\n",
                                                  MAX_DOZE_WAITING_TIMES_9x,
                                                  queue_id,
-                                                 skb_queue_len(&ring->queue)));
+                                                 skb_queue_len(&ring->queue));
                                         break;
                                 }
                         }
 
                         RT_TRACE(rtlpriv, COMP_POWER, DBG_DMESG,
-                                 ("Set ERFSLEEP awaked:%d ms\n",
+                                 "Set ERFSLEEP awaked:%d ms\n",
                                  jiffies_to_msecs(jiffies -
-                                 ppsc->last_awake_jiffies)));
+                                                  ppsc->last_awake_jiffies));
 
                         RT_TRACE(rtlpriv, COMP_POWER, DBG_DMESG,
-                                 ("sleep awaked:%d ms "
-                                "state_inap:%x\n", jiffies_to_msecs(jiffies -
-                                ppsc->last_awake_jiffies),
-                                rtlpriv->psc.state_inap));
+                                 "sleep awaked:%d ms state_inap:%x\n",
+                                 jiffies_to_msecs(jiffies -
+                                                  ppsc->last_awake_jiffies),
+                                 rtlpriv->psc.state_inap);
                         ppsc->last_sleep_jiffies = jiffies;
                         _rtl92se_phy_set_rf_sleep(hw);
             break;
         default:
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("switch case not process\n"));
+                         "switch case not processed\n");
                 bresult = false;
                 break;
         }
@@ -995,7 +992,7 @@ static bool _rtl92s_phy_bb_config_parafile(struct ieee80211_hw *hw)
 
         if (rtstatus != true) {
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_EMERG,
-                         ("Write BB Reg Fail!!"));
+                         "Write BB Reg Fail!!\n");
                 goto phy_BB8190_Config_ParaFile_Fail;
         }
 
@@ -1009,8 +1006,7 @@ static bool _rtl92s_phy_bb_config_parafile(struct ieee80211_hw *hw)
         }
         if (rtstatus != true) {
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_EMERG,
-                         ("_rtl92s_phy_bb_config_parafile(): "
-                         "BB_PG Reg Fail!!"));
+                         "_rtl92s_phy_bb_config_parafile(): BB_PG Reg Fail!!\n");
                 goto phy_BB8190_Config_ParaFile_Fail;
         }
 
@@ -1053,7 +1049,7 @@ u8 rtl92s_phy_config_rf(struct ieee80211_hw *hw, enum radio_path rfpath)
                 radio_b_tblen = RADIOB_ARRAYLENGTH;
         }
 
-        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, ("Radio No %x\n", rfpath));
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "Radio No %x\n", rfpath);
         rtstatus = true;
 
         switch (rfpath) {
@@ -1175,11 +1171,11 @@ bool rtl92s_phy_bb_config(struct ieee80211_hw *hw)
             (rtlphy->rf_type == RF_2T2R && rf_num != 2) ||
             (rtlphy->rf_type == RF_2T2R_GREEN && rf_num != 2)) {
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_EMERG,
-                         ("RF_Type(%x) does not match "
-                         "RF_Num(%x)!!\n", rtlphy->rf_type, rf_num));
+                         "RF_Type(%x) does not match RF_Num(%x)!!\n",
+                         rtlphy->rf_type, rf_num);
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_EMERG,
-                         ("path1 0x%x, path2 0x%x, pathmap "
-                          "0x%x\n", path1, path2, pathmap));
+                         "path1 0x%x, path2 0x%x, pathmap 0x%x\n",
+                         path1, path2, pathmap);
         }
 
         return rtstatus;
@@ -1214,20 +1210,20 @@ void rtl92s_phy_get_hw_reg_originalvalue(struct ieee80211_hw *hw)
                         ROFDM0_XCAGCCORE1, MASKBYTE0);
         rtlphy->default_initialgain[3] = rtl_get_bbreg(hw,
                         ROFDM0_XDAGCCORE1, MASKBYTE0);
-        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, ("Default initial gain "
-                 "(c50=0x%x, c58=0x%x, c60=0x%x, c68=0x%x)\n",
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
+                 "Default initial gain (c50=0x%x, c58=0x%x, c60=0x%x, c68=0x%x)\n",
                  rtlphy->default_initialgain[0],
                  rtlphy->default_initialgain[1],
                  rtlphy->default_initialgain[2],
-                 rtlphy->default_initialgain[3]));
+                 rtlphy->default_initialgain[3]);
 
         /* read framesync */
         rtlphy->framesync = rtl_get_bbreg(hw, ROFDM0_RXDETECTOR3, MASKBYTE0);
         rtlphy->framesync_c34 = rtl_get_bbreg(hw, ROFDM0_RXDETECTOR2,
                                               MASKDWORD);
         RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
-                 ("Default framesync (0x%x) = 0x%x\n",
-                 ROFDM0_RXDETECTOR3, rtlphy->framesync));
+                 "Default framesync (0x%x) = 0x%x\n",
+                 ROFDM0_RXDETECTOR3, rtlphy->framesync);
 
 }
 
@@ -1287,10 +1283,9 @@ void rtl92s_phy_set_txpower(struct ieee80211_hw *hw, u8	channel)
                         &ofdmpowerLevel[0]);
 
         RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
-                        ("Channel-%d, cckPowerLevel (A / B) = "
-                        "0x%x / 0x%x,   ofdmPowerLevel (A / B) = 0x%x / 0x%x\n",
-                        channel, cckpowerlevel[0], cckpowerlevel[1],
-                        ofdmpowerLevel[0], ofdmpowerLevel[1]));
+                 "Channel-%d, cckPowerLevel (A / B) = 0x%x / 0x%x, ofdmPowerLevel (A / B) = 0x%x / 0x%x\n",
+                 channel, cckpowerlevel[0], cckpowerlevel[1],
+                 ofdmpowerLevel[0], ofdmpowerLevel[1]);
 
         _rtl92s_phy_ccxpower_indexcheck(hw, channel, &cckpowerlevel[0],
                         &ofdmpowerLevel[0]);
@@ -1316,7 +1311,7 @@ void rtl92s_phy_chk_fwcmd_iodone(struct ieee80211_hw *hw)
         } while (--pollingcnt);
 
         if (pollingcnt == 0)
-                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, ("Set FW Cmd fail!!\n"));
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "Set FW Cmd fail!!\n");
 }
 
 
@@ -1345,20 +1340,17 @@ static void _rtl92s_phy_set_fwcmd_io(struct ieee80211_hw *hw)
 
         switch (rtlhal->current_fwcmd_io) {
         case FW_CMD_RA_RESET:
-                RT_TRACE(rtlpriv, COMP_CMD, DBG_DMESG,
-                         ("FW_CMD_RA_RESET\n"));
+                RT_TRACE(rtlpriv, COMP_CMD, DBG_DMESG, "FW_CMD_RA_RESET\n");
                 rtl_write_dword(rtlpriv, WFM5, FW_RA_RESET);
                 rtl92s_phy_chk_fwcmd_iodone(hw);
                 break;
         case FW_CMD_RA_ACTIVE:
-                RT_TRACE(rtlpriv, COMP_CMD, DBG_DMESG,
-                         ("FW_CMD_RA_ACTIVE\n"));
+                RT_TRACE(rtlpriv, COMP_CMD, DBG_DMESG, "FW_CMD_RA_ACTIVE\n");
                 rtl_write_dword(rtlpriv, WFM5, FW_RA_ACTIVE);
                 rtl92s_phy_chk_fwcmd_iodone(hw);
                 break;
         case FW_CMD_RA_REFRESH_N:
-                RT_TRACE(rtlpriv, COMP_CMD, DBG_DMESG,
-                         ("FW_CMD_RA_REFRESH_N\n"));
+                RT_TRACE(rtlpriv, COMP_CMD, DBG_DMESG, "FW_CMD_RA_REFRESH_N\n");
                 input = FW_RA_REFRESH;
                 rtl_write_dword(rtlpriv, WFM5, input);
                 rtl92s_phy_chk_fwcmd_iodone(hw);
@@ -1367,7 +1359,7 @@ static void _rtl92s_phy_set_fwcmd_io(struct ieee80211_hw *hw)
                 break;
         case FW_CMD_RA_REFRESH_BG:
                 RT_TRACE(rtlpriv, COMP_CMD, DBG_DMESG,
-                         ("FW_CMD_RA_REFRESH_BG\n"));
+                         "FW_CMD_RA_REFRESH_BG\n");
                 rtl_write_dword(rtlpriv, WFM5, FW_RA_REFRESH);
                 rtl92s_phy_chk_fwcmd_iodone(hw);
                 rtl_write_dword(rtlpriv, WFM5, FW_RA_DISABLE_RSSI_MASK);
@@ -1375,21 +1367,20 @@ static void _rtl92s_phy_set_fwcmd_io(struct ieee80211_hw *hw)
                 break;
         case FW_CMD_RA_REFRESH_N_COMB:
                 RT_TRACE(rtlpriv, COMP_CMD, DBG_DMESG,
-                         ("FW_CMD_RA_REFRESH_N_COMB\n"));
+                         "FW_CMD_RA_REFRESH_N_COMB\n");
                 input = FW_RA_IOT_N_COMB;
                 rtl_write_dword(rtlpriv, WFM5, input);
                 rtl92s_phy_chk_fwcmd_iodone(hw);
                 break;
         case FW_CMD_RA_REFRESH_BG_COMB:
                 RT_TRACE(rtlpriv, COMP_CMD, DBG_DMESG,
-                         ("FW_CMD_RA_REFRESH_BG_COMB\n"));
+                         "FW_CMD_RA_REFRESH_BG_COMB\n");
                 input = FW_RA_IOT_BG_COMB;
                 rtl_write_dword(rtlpriv, WFM5, input);
                 rtl92s_phy_chk_fwcmd_iodone(hw);
                 break;
         case FW_CMD_IQK_ENABLE:
-                RT_TRACE(rtlpriv, COMP_CMD, DBG_DMESG,
-                         ("FW_CMD_IQK_ENABLE\n"));
+                RT_TRACE(rtlpriv, COMP_CMD, DBG_DMESG, "FW_CMD_IQK_ENABLE\n");
                 rtl_write_dword(rtlpriv, WFM5, FW_IQK_ENABLE);
                 rtl92s_phy_chk_fwcmd_iodone(hw);
                 break;
@@ -1424,8 +1415,7 @@ static void _rtl92s_phy_set_fwcmd_io(struct ieee80211_hw *hw)
                 rtl_set_bbreg(hw, RCCK0_CCA, MASKBYTE2, 0xcd);
                 break;
         case FW_CMD_LPS_ENTER:
-                RT_TRACE(rtlpriv, COMP_CMD, DBG_DMESG,
-                         ("FW_CMD_LPS_ENTER\n"));
+                RT_TRACE(rtlpriv, COMP_CMD, DBG_DMESG, "FW_CMD_LPS_ENTER\n");
                 current_aid = rtlpriv->mac80211.assoc_id;
                 rtl_write_dword(rtlpriv, WFM5, (FW_LPS_ENTER |
                                 ((current_aid | 0xc000) << 8)));
@@ -1434,20 +1424,18 @@ static void _rtl92s_phy_set_fwcmd_io(struct ieee80211_hw *hw)
                  * turbo mode until driver leave LPS */
                 break;
         case FW_CMD_LPS_LEAVE:
-                RT_TRACE(rtlpriv, COMP_CMD, DBG_DMESG,
-                         ("FW_CMD_LPS_LEAVE\n"));
+                RT_TRACE(rtlpriv, COMP_CMD, DBG_DMESG, "FW_CMD_LPS_LEAVE\n");
                 rtl_write_dword(rtlpriv, WFM5, FW_LPS_LEAVE);
                 rtl92s_phy_chk_fwcmd_iodone(hw);
                 break;
         case FW_CMD_ADD_A2_ENTRY:
-                RT_TRACE(rtlpriv, COMP_CMD, DBG_DMESG,
-                         ("FW_CMD_ADD_A2_ENTRY\n"));
+                RT_TRACE(rtlpriv, COMP_CMD, DBG_DMESG, "FW_CMD_ADD_A2_ENTRY\n");
                 rtl_write_dword(rtlpriv, WFM5, FW_ADD_A2_ENTRY);
                 rtl92s_phy_chk_fwcmd_iodone(hw);
                 break;
         case FW_CMD_CTRL_DM_BY_DRIVER:
                 RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD,
-                         ("FW_CMD_CTRL_DM_BY_DRIVER\n"));
+                         "FW_CMD_CTRL_DM_BY_DRIVER\n");
                 rtl_write_dword(rtlpriv, WFM5, FW_CTRL_DM_BY_DRIVER);
                 rtl92s_phy_chk_fwcmd_iodone(hw);
                 break;
@@ -1472,8 +1460,8 @@ bool rtl92s_phy_set_fw_cmd(struct ieee80211_hw *hw, enum fwcmd_iotype fw_cmdio)
         bool bPostProcessing = false;
 
         RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD,
-                        ("Set FW Cmd(%#x), set_fwcmd_inprogress(%d)\n",
-                        fw_cmdio, rtlhal->set_fwcmd_inprogress));
+                 "Set FW Cmd(%#x), set_fwcmd_inprogress(%d)\n",
+                 fw_cmdio, rtlhal->set_fwcmd_inprogress);
 
         do {
                 /* We re-map to combined FW CMD ones if firmware version */
@@ -1501,7 +1489,7 @@ bool rtl92s_phy_set_fw_cmd(struct ieee80211_hw *hw, enum fwcmd_iotype fw_cmdio)
                  * DM map table in the future. */
                 switch (fw_cmdio) {
                 case FW_CMD_RA_INIT:
-                        RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD, ("RA init!!\n"));
+                        RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD, "RA init!!\n");
                         fw_cmdmap |= FW_RA_INIT_CTL;
                         FW_CMD_IO_SET(rtlpriv, fw_cmdmap);
                         /* Clear control flag to sync with FW. */
@@ -1509,7 +1497,7 @@ bool rtl92s_phy_set_fw_cmd(struct ieee80211_hw *hw, enum fwcmd_iotype fw_cmdio)
                         break;
                 case FW_CMD_DIG_DISABLE:
                         RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD,
-                                 ("Set DIG disable!!\n"));
+                                 "Set DIG disable!!\n");
                         fw_cmdmap &= ~FW_DIG_ENABLE_CTL;
                         FW_CMD_IO_SET(rtlpriv, fw_cmdmap);
                         break;
@@ -1517,14 +1505,14 @@ bool rtl92s_phy_set_fw_cmd(struct ieee80211_hw *hw, enum fwcmd_iotype fw_cmdio)
                 case FW_CMD_DIG_RESUME:
                         if (!(rtlpriv->dm.dm_flag & HAL_DM_DIG_DISABLE)) {
                                 RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD,
-                                        ("Set DIG enable or resume!!\n"));
+                                         "Set DIG enable or resume!!\n");
                                 fw_cmdmap |= (FW_DIG_ENABLE_CTL | FW_SS_CTL);
                                 FW_CMD_IO_SET(rtlpriv, fw_cmdmap);
                         }
                         break;
                 case FW_CMD_DIG_HALT:
                         RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD,
-                                 ("Set DIG halt!!\n"));
+                                 "Set DIG halt!!\n");
                         fw_cmdmap &= ~(FW_DIG_ENABLE_CTL | FW_SS_CTL);
                         FW_CMD_IO_SET(rtlpriv, fw_cmdmap);
                         break;
@@ -1540,9 +1528,8 @@ bool rtl92s_phy_set_fw_cmd(struct ieee80211_hw *hw, enum fwcmd_iotype fw_cmdio)
                                      (rtlefuse->thermalmeter[0] << 16));
 
                         RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD,
-                                 ("Set TxPwr tracking!! "
-                                 "FwCmdMap(%#x), FwParam(%#x)\n",
-                                 fw_cmdmap, fw_param));
+                                 "Set TxPwr tracking!! FwCmdMap(%#x), FwParam(%#x)\n",
+                                 fw_cmdmap, fw_param);
 
                         FW_CMD_PARA_SET(rtlpriv, fw_param);
                         FW_CMD_IO_SET(rtlpriv, fw_cmdmap);
@@ -1563,9 +1550,8 @@ bool rtl92s_phy_set_fw_cmd(struct ieee80211_hw *hw, enum fwcmd_iotype fw_cmdio)
                         fw_param &= FW_RA_PARAM_CLR;
 
                         RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD,
-                                 ("[FW CMD] [New Version] "
-                                 "Set RA/IOT Comb in n mode!! FwCmdMap(%#x), "
-                                 "FwParam(%#x)\n", fw_cmdmap, fw_param));
+                                 "[FW CMD] [New Version] Set RA/IOT Comb in n mode!! FwCmdMap(%#x), FwParam(%#x)\n",
+                                 fw_cmdmap, fw_param);
 
                         FW_CMD_PARA_SET(rtlpriv, fw_param);
                         FW_CMD_IO_SET(rtlpriv, fw_cmdmap);
@@ -1652,7 +1638,7 @@ bool rtl92s_phy_set_fw_cmd(struct ieee80211_hw *hw, enum fwcmd_iotype fw_cmdio)
                         break;
                 case FW_CMD_PAPE_CONTROL:
                         RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD,
-                                 ("[FW CMD] Set PAPE Control\n"));
+                                 "[FW CMD] Set PAPE Control\n");
                         fw_cmdmap &= ~FW_PAPE_CTL_BY_SW_HW;
 
                         FW_CMD_IO_SET(rtlpriv, fw_cmdmap);
diff --git a/drivers/net/wireless/rtlwifi/rtl8192se/phy.h b/drivers/net/wireless/rtlwifi/rtl8192se/phy.h
index 37e504af6446..ac0387770630 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192se/phy.h
+++ b/drivers/net/wireless/rtlwifi/rtl8192se/phy.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2009-2010  Realtek Corporation.
+ * Copyright(c) 2009-2012  Realtek Corporation.
  *
  * 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
diff --git a/drivers/net/wireless/rtlwifi/rtl8192se/reg.h b/drivers/net/wireless/rtlwifi/rtl8192se/reg.h
index 11f125c030ce..84d1181795b8 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192se/reg.h
+++ b/drivers/net/wireless/rtlwifi/rtl8192se/reg.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2009-2010  Realtek Corporation.
+ * Copyright(c) 2009-2012  Realtek Corporation.
  *
  * 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
diff --git a/drivers/net/wireless/rtlwifi/rtl8192se/rf.c b/drivers/net/wireless/rtlwifi/rtl8192se/rf.c
index 0ad50fe44aa2..ad51906124db 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192se/rf.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192se/rf.c
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2009-2010  Realtek Corporation.
+ * Copyright(c) 2009-2012  Realtek Corporation.
  *
  * 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
@@ -27,8 +27,6 @@
  *
  *****************************************************************************/
 
-#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-
 #include "../wifi.h"
 #include "reg.h"
 #include "def.h"
@@ -123,13 +121,13 @@ static void _rtl92s_get_powerbase(struct ieee80211_hw *hw, u8 *p_pwrlevel,
         }
 
         if (rtlphy->current_chan_bw == HT_CHANNEL_WIDTH_20_40) {
-                RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD, ("40MHz finalpwr_idx "
-                        "(A / B) = 0x%x / 0x%x\n", p_final_pwridx[0],
-                        p_final_pwridx[1]));
+                RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
+                         "40MHz finalpwr_idx (A / B) = 0x%x / 0x%x\n",
+                         p_final_pwridx[0], p_final_pwridx[1]);
         } else {
-                RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD, ("20MHz finalpwr_idx "
-                        "(A / B) = 0x%x / 0x%x\n", p_final_pwridx[0],
-                         p_final_pwridx[1]));
+                RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
+                         "20MHz finalpwr_idx (A / B) = 0x%x / 0x%x\n",
+                         p_final_pwridx[0], p_final_pwridx[1]);
         }
 }
 
@@ -153,9 +151,8 @@ static void _rtl92s_set_antennadiff(struct ieee80211_hw *hw,
                         ant_pwr_diff = -8;
 
                 RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
-                         ("Antenna Diff from RF-B "
-                        "to RF-A = %d (0x%x)\n", ant_pwr_diff,
-                         ant_pwr_diff & 0xf));
+                         "Antenna Diff from RF-B to RF-A = %d (0x%x)\n",
+                         ant_pwr_diff, ant_pwr_diff & 0xf);
 
                 ant_pwr_diff &= 0xf;
         }
@@ -172,9 +169,8 @@ static void _rtl92s_set_antennadiff(struct ieee80211_hw *hw,
         rtl_set_bbreg(hw, RFPGA0_TXGAINSTAGE, (BXBTXAGC | BXCTXAGC | BXDTXAGC),
                       u4reg_val);
 
-        RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
-                 ("Write BCD-Diff(0x%x) = 0x%x\n",
-                 RFPGA0_TXGAINSTAGE, u4reg_val));
+        RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD, "Write BCD-Diff(0x%x) = 0x%x\n",
+                 RFPGA0_TXGAINSTAGE, u4reg_val);
 }
 
 static void _rtl92s_get_txpower_writeval_byregulatory(struct ieee80211_hw *hw,
@@ -201,8 +197,7 @@ static void _rtl92s_get_txpower_writeval_byregulatory(struct ieee80211_hw *hw,
                                 ((index < 2) ? pwrbase0 : pwrbase1);
 
                 RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
-                         ("RTK better performance, "
-                         "writeval = 0x%x\n", writeval));
+                         "RTK better performance, writeval = 0x%x\n", writeval);
                 break;
         case 1:
                 /* Realtek regulatory increase power diff defined
@@ -211,8 +206,8 @@ static void _rtl92s_get_txpower_writeval_byregulatory(struct ieee80211_hw *hw,
                         writeval = ((index < 2) ? pwrbase0 : pwrbase1);
 
                         RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
-                                 ("Realtek regulatory, "
-                                 "40MHz, writeval = 0x%x\n", writeval));
+                                 "Realtek regulatory, 40MHz, writeval = 0x%x\n",
+                                 writeval);
                 } else {
                         if (rtlphy->pwrgroup_cnt == 1)
                                 chnlgroup = 0;
@@ -234,16 +229,15 @@ static void _rtl92s_get_txpower_writeval_byregulatory(struct ieee80211_hw *hw,
                                         pwrbase0 : pwrbase1);
 
                         RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
-                                 ("Realtek regulatory, "
-                                 "20MHz, writeval = 0x%x\n", writeval));
+                                 "Realtek regulatory, 20MHz, writeval = 0x%x\n",
+                                 writeval);
                 }
                 break;
         case 2:
                 /* Better regulatory don't increase any power diff */
                 writeval = ((index < 2) ? pwrbase0 : pwrbase1);
                 RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
-                         ("Better regulatory, "
-                         "writeval = 0x%x\n", writeval));
+                         "Better regulatory, writeval = 0x%x\n", writeval);
                 break;
         case 3:
                 /* Customer defined power diff. increase power diff
@@ -252,14 +246,14 @@ static void _rtl92s_get_txpower_writeval_byregulatory(struct ieee80211_hw *hw,
 
                 if (rtlphy->current_chan_bw == HT_CHANNEL_WIDTH_20_40) {
                         RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
-                                ("customer's limit, 40MHz = 0x%x\n",
-                                rtlefuse->pwrgroup_ht40
-                                [RF90_PATH_A][chnl - 1]));
+                                 "customer's limit, 40MHz = 0x%x\n",
+                                 rtlefuse->pwrgroup_ht40
+                                 [RF90_PATH_A][chnl - 1]);
                 } else {
                         RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
-                                ("customer's limit, 20MHz = 0x%x\n",
-                                rtlefuse->pwrgroup_ht20
-                                [RF90_PATH_A][chnl - 1]));
+                                 "customer's limit, 20MHz = 0x%x\n",
+                                 rtlefuse->pwrgroup_ht20
+                                 [RF90_PATH_A][chnl - 1]);
                 }
 
                 for (i = 0; i < 4; i++) {
@@ -293,22 +287,19 @@ static void _rtl92s_get_txpower_writeval_byregulatory(struct ieee80211_hw *hw,
                                 (pwrdiff_limit[1] << 8) |
                                 (pwrdiff_limit[0]);
                 RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
-                         ("Customer's limit = 0x%x\n",
-                         customer_limit));
+                         "Customer's limit = 0x%x\n", customer_limit);
 
                 writeval = customer_limit + ((index < 2) ?
                                              pwrbase0 : pwrbase1);
                 RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
-                         ("Customer, writeval = "
-                         "0x%x\n", writeval));
+                         "Customer, writeval = 0x%x\n", writeval);
                 break;
         default:
                 chnlgroup = 0;
                 writeval = rtlphy->mcs_txpwrlevel_origoffset[chnlgroup][index] +
                                 ((index < 2) ? pwrbase0 : pwrbase1);
                 RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
-                         ("RTK better performance, "
-                         "writeval = 0x%x\n", writeval));
+                         "RTK better performance, writeval = 0x%x\n", writeval);
                 break;
         }
 
@@ -541,8 +532,7 @@ void rtl92s_phy_rf6052_set_bandwidth(struct ieee80211_hw *hw, u8 bandwidth)
                 break;
         default:
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("unknown bandwidth: %#X\n",
-                         bandwidth));
+                         "unknown bandwidth: %#X\n", bandwidth);
                 break;
         }
 }
diff --git a/drivers/net/wireless/rtlwifi/rtl8192se/rf.h b/drivers/net/wireless/rtlwifi/rtl8192se/rf.h
index 3843baa1a874..8a29eb94ab17 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192se/rf.h
+++ b/drivers/net/wireless/rtlwifi/rtl8192se/rf.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2009-2010  Realtek Corporation.
+ * Copyright(c) 2009-2012  Realtek Corporation.
  *
  * 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
diff --git a/drivers/net/wireless/rtlwifi/rtl8192se/sw.c b/drivers/net/wireless/rtlwifi/rtl8192se/sw.c
index 78723cf59491..eda30b9d0f15 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192se/sw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192se/sw.c
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2009-2010  Realtek Corporation.
+ * Copyright(c) 2009-2012  Realtek Corporation.
  *
  * 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
@@ -27,14 +27,11 @@
  *
  *****************************************************************************/
 
-#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-
-#include <linux/vmalloc.h>
-#include <linux/module.h>
-
 #include "../wifi.h"
 #include "../core.h"
 #include "../pci.h"
+#include "../base.h"
+#include "../pci.h"
 #include "reg.h"
 #include "def.h"
 #include "phy.h"
@@ -45,6 +42,8 @@
 #include "trx.h"
 #include "led.h"
 
+#include <linux/module.h>
+
 static void rtl92s_init_aspm_vars(struct ieee80211_hw *hw)
 {
         struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
@@ -89,12 +88,53 @@ static void rtl92s_init_aspm_vars(struct ieee80211_hw *hw)
         rtlpci->const_support_pciaspm = 2;
 }
 
+static void rtl92se_fw_cb(const struct firmware *firmware, void *context)
+{
+        struct ieee80211_hw *hw = context;
+        struct rtl_pci_priv *pcipriv = rtl_pcipriv(hw);
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_pci *rtlpci = rtl_pcidev(pcipriv);
+        struct rt_firmware *pfirmware = NULL;
+        int err;
+
+        RT_TRACE(rtlpriv, COMP_ERR, DBG_LOUD,
+                         "Firmware callback routine entered!\n");
+        complete(&rtlpriv->firmware_loading_complete);
+        if (!firmware) {
+                pr_err("Firmware %s not available\n", rtlpriv->cfg->fw_name);
+                rtlpriv->max_fw_size = 0;
+                return;
+        }
+        if (firmware->size > rtlpriv->max_fw_size) {
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
+                         "Firmware is too big!\n");
+                release_firmware(firmware);
+                return;
+        }
+        pfirmware = (struct rt_firmware *)rtlpriv->rtlhal.pfirmware;
+        memcpy(pfirmware->sz_fw_tmpbuffer, firmware->data, firmware->size);
+        pfirmware->sz_fw_tmpbufferlen = firmware->size;
+        release_firmware(firmware);
+
+        err = ieee80211_register_hw(hw);
+        if (err) {
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
+                         "Can't register mac80211 hw\n");
+                return;
+        } else {
+                rtlpriv->mac80211.mac80211_registered = 1;
+        }
+        rtlpci->irq_alloc = 1;
+        set_bit(RTL_STATUS_INTERFACE_START, &rtlpriv->status);
+
+        /*init rfkill */
+        rtl_init_rfkill(hw);
+}
+
 static int rtl92s_init_sw_vars(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
-        const struct firmware *firmware;
-        struct rt_firmware *pfirmware = NULL;
         int err = 0;
         u16 earlyrxthreshold = 7;
 
@@ -168,9 +208,9 @@ static int rtl92s_init_sw_vars(struct ieee80211_hw *hw)
         rtlpriv->psc.swctrl_lps = rtlpriv->cfg->mod_params->swctrl_lps;
         rtlpriv->psc.fwctrl_lps = rtlpriv->cfg->mod_params->fwctrl_lps;
         if (!rtlpriv->psc.inactiveps)
-                pr_info("rtl8192ce: Power Save off (module option)\n");
+                pr_info("Power Save off (module option)\n");
         if (!rtlpriv->psc.fwctrl_lps)
-                pr_info("rtl8192ce: FW Power Save off (module option)\n");
+                pr_info("FW Power Save off (module option)\n");
         rtlpriv->psc.reg_fwctrl_lps = 3;
         rtlpriv->psc.reg_max_lps_awakeintvl = 5;
         /* for ASPM, you can close aspm through
@@ -186,33 +226,22 @@ static int rtl92s_init_sw_vars(struct ieee80211_hw *hw)
 
         /* for firmware buf */
         rtlpriv->rtlhal.pfirmware = vzalloc(sizeof(struct rt_firmware));
-        if (!rtlpriv->rtlhal.pfirmware) {
-                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("Can't alloc buffer for fw.\n"));
+        if (!rtlpriv->rtlhal.pfirmware)
                 return 1;
-        }
+
+        rtlpriv->max_fw_size = sizeof(struct rt_firmware);
 
         pr_info("Driver for Realtek RTL8192SE/RTL8191SE\n"
                 "Loading firmware %s\n", rtlpriv->cfg->fw_name);
         /* request fw */
-        err = request_firmware(&firmware, rtlpriv->cfg->fw_name,
-                        rtlpriv->io.dev);
+        err = request_firmware_nowait(THIS_MODULE, 1, rtlpriv->cfg->fw_name,
+                                      rtlpriv->io.dev, GFP_KERNEL, hw,
+                                      rtl92se_fw_cb);
         if (err) {
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("Failed to request firmware!\n"));
+                         "Failed to request firmware!\n");
                 return 1;
         }
-        if (firmware->size > sizeof(struct rt_firmware)) {
-                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("Firmware is too big!\n"));
-                release_firmware(firmware);
-                return 1;
-        }
-
-        pfirmware = (struct rt_firmware *)rtlpriv->rtlhal.pfirmware;
-        memcpy(pfirmware->sz_fw_tmpbuffer, firmware->data, firmware->size);
-        pfirmware->sz_fw_tmpbufferlen = firmware->size;
-        release_firmware(firmware);
 
         return err;
 }
@@ -426,7 +455,7 @@ static int __init rtl92se_module_init(void)
 
         ret = pci_register_driver(&rtl92se_driver);
         if (ret)
-                RT_ASSERT(false, (": No device found\n"));
+                RT_ASSERT(false, "No device found\n");
 
         return ret;
 }
diff --git a/drivers/net/wireless/rtlwifi/rtl8192se/sw.h b/drivers/net/wireless/rtlwifi/rtl8192se/sw.h
index fc4eb285a0ac..2eb88862ebe4 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192se/sw.h
+++ b/drivers/net/wireless/rtlwifi/rtl8192se/sw.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2009-2010  Realtek Corporation.
+ * Copyright(c) 2009-2012  Realtek Corporation.
  *
  * 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
diff --git a/drivers/net/wireless/rtlwifi/rtl8192se/table.c b/drivers/net/wireless/rtlwifi/rtl8192se/table.c
index 154185b3969d..f1a73f75127e 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192se/table.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192se/table.c
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2009-2010  Realtek Corporation.
+ * Copyright(c) 2009-2012  Realtek Corporation.
  *
  * 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
diff --git a/drivers/net/wireless/rtlwifi/rtl8192se/table.h b/drivers/net/wireless/rtlwifi/rtl8192se/table.h
index b4ed6d951ebb..2feb73b71a4f 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192se/table.h
+++ b/drivers/net/wireless/rtlwifi/rtl8192se/table.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright(c) 2008 - 2010 Realtek Corporation. All rights reserved.
+ * Copyright(c) 2008 - 2012 Realtek Corporation. All rights reserved.
  *
  * This program is distributed in the hope that it will be useful, but WITHOUT
  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
diff --git a/drivers/net/wireless/rtlwifi/rtl8192se/trx.c b/drivers/net/wireless/rtlwifi/rtl8192se/trx.c
index fbebe3ea0a22..2fd3d13b7ced 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192se/trx.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192se/trx.c
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2009-2010  Realtek Corporation.
+ * Copyright(c) 2009-2012  Realtek Corporation.
  *
  * 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
@@ -756,7 +756,7 @@ void rtl92se_tx_fill_desc(struct ieee80211_hw *hw,
         /* DOWRD 8 */
         SET_TX_DESC_TX_BUFFER_ADDRESS(pdesc, cpu_to_le32(mapping));
 
-        RT_TRACE(rtlpriv, COMP_SEND, DBG_TRACE, ("\n"));
+        RT_TRACE(rtlpriv, COMP_SEND, DBG_TRACE, "\n");
 }
 
 void rtl92se_tx_fill_cmddesc(struct ieee80211_hw *hw, u8 *pdesc,
@@ -823,8 +823,8 @@ void rtl92se_set_desc(u8 *pdesc, bool istx, u8 desc_name, u8 *val)
                         SET_TX_DESC_NEXT_DESC_ADDRESS(pdesc, *(u32 *) val);
                         break;
                 default:
-                        RT_ASSERT(false, ("ERR txdesc :%d not process\n",
-                                  desc_name));
+                        RT_ASSERT(false, "ERR txdesc :%d not process\n",
+                                  desc_name);
                         break;
                 }
         } else {
@@ -843,8 +843,8 @@ void rtl92se_set_desc(u8 *pdesc, bool istx, u8 desc_name, u8 *val)
                         SET_RX_STATUS_DESC_EOR(pdesc, 1);
                         break;
                 default:
-                        RT_ASSERT(false, ("ERR rxdesc :%d not process\n",
-                                  desc_name));
+                        RT_ASSERT(false, "ERR rxdesc :%d not process\n",
+                                  desc_name);
                         break;
                 }
         }
@@ -863,8 +863,8 @@ u32 rtl92se_get_desc(u8 *desc, bool istx, u8 desc_name)
                         ret = GET_TX_DESC_TX_BUFFER_ADDRESS(desc);
                         break;
                 default:
-                        RT_ASSERT(false, ("ERR txdesc :%d not process\n",
-                                  desc_name));
+                        RT_ASSERT(false, "ERR txdesc :%d not process\n",
+                                  desc_name);
                         break;
                 }
         } else {
@@ -876,8 +876,8 @@ u32 rtl92se_get_desc(u8 *desc, bool istx, u8 desc_name)
                         ret = GET_RX_STATUS_DESC_PKT_LEN(desc);
                         break;
                 default:
-                        RT_ASSERT(false, ("ERR rxdesc :%d not process\n",
-                                  desc_name));
+                        RT_ASSERT(false, "ERR rxdesc :%d not process\n",
+                                  desc_name);
                         break;
                 }
         }
diff --git a/drivers/net/wireless/rtlwifi/rtl8192se/trx.h b/drivers/net/wireless/rtlwifi/rtl8192se/trx.h
index 05862c51b861..011e7b0695f2 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192se/trx.h
+++ b/drivers/net/wireless/rtlwifi/rtl8192se/trx.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2009-2010  Realtek Corporation.
+ * Copyright(c) 2009-2012  Realtek Corporation.
  *
  * 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
diff --git a/drivers/net/wireless/rtlwifi/usb.c b/drivers/net/wireless/rtlwifi/usb.c
index e956fa71d040..ffcf89fe45e4 100644
--- a/drivers/net/wireless/rtlwifi/usb.c
+++ b/drivers/net/wireless/rtlwifi/usb.c
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2009-2011  Realtek Corporation. All rights reserved.
+ * Copyright(c) 2009-2012  Realtek 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
@@ -25,16 +25,13 @@
  *
  *****************************************************************************/
 
-#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-
-#include <linux/usb.h>
-#include <linux/export.h>
-#include "core.h"
 #include "wifi.h"
+#include "core.h"
 #include "usb.h"
 #include "base.h"
 #include "ps.h"
 #include "rtl8192c/fw_common.h"
+#include <linux/export.h>
 
 #define REALTEK_USB_VENQT_READ                  0xC0
 #define REALTEK_USB_VENQT_WRITE                 0x40
@@ -276,14 +273,14 @@ static int _rtl_usb_init_tx(struct ieee80211_hw *hw)
                                                     ? USB_HIGH_SPEED_BULK_SIZE
                                                     : USB_FULL_SPEED_BULK_SIZE;
 
-        RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, ("USB Max Bulk-out Size=%d\n",
-                 rtlusb->max_bulk_out_size));
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "USB Max Bulk-out Size=%d\n",
+                 rtlusb->max_bulk_out_size);
 
         for (i = 0; i < __RTL_TXQ_NUM; i++) {
                 u32 ep_num = rtlusb->ep_map.ep_mapping[i];
                 if (!ep_num) {
                         RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
-                                 ("Invalid endpoint map setting!\n"));
+                                 "Invalid endpoint map setting!\n");
                         return -EINVAL;
                 }
         }
@@ -345,9 +342,9 @@ static int _rtl_usb_init(struct ieee80211_hw *hw)
                         rtlusb->out_ep_nums++;
 
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
-                         ("USB EP(0x%02x), MaxPacketSize=%d ,Interval=%d.\n",
+                         "USB EP(0x%02x), MaxPacketSize=%d, Interval=%d\n",
                          pep_desc->bEndpointAddress, pep_desc->wMaxPacketSize,
-                         pep_desc->bInterval));
+                         pep_desc->bInterval);
         }
         if (rtlusb->in_ep_nums <  rtlpriv->cfg->usb_interface_cfg->in_ep_num)
                 return -EINVAL ;
@@ -414,7 +411,7 @@ static struct sk_buff *_rtl_prep_rx_urb(struct ieee80211_hw *hw,
                                gfp_mask);
         if (!skb) {
                 RT_TRACE(rtlpriv, COMP_USB, DBG_EMERG,
-                         ("Failed to __dev_alloc_skb!!\n"))
+                         "Failed to __dev_alloc_skb!!\n");
                 return ERR_PTR(-ENOMEM);
         }
 
@@ -520,12 +517,14 @@ static void _rtl_usb_rx_process_noagg(struct ieee80211_hw *hw,
                         u8 *pdata;
 
                         uskb = dev_alloc_skb(skb->len + 128);
-                        memcpy(IEEE80211_SKB_RXCB(uskb), &rx_status,
-                               sizeof(rx_status));
-                        pdata = (u8 *)skb_put(uskb, skb->len);
-                        memcpy(pdata, skb->data, skb->len);
+                        if (uskb) {     /* drop packet on allocation failure */
+                                memcpy(IEEE80211_SKB_RXCB(uskb), &rx_status,
+                                       sizeof(rx_status));
+                                pdata = (u8 *)skb_put(uskb, skb->len);
+                                memcpy(pdata, skb->data, skb->len);
+                                ieee80211_rx_irqsafe(hw, uskb);
+                        }
                         dev_kfree_skb_any(skb);
-                        ieee80211_rx_irqsafe(hw, uskb);
                 } else {
                         dev_kfree_skb_any(skb);
                 }
@@ -575,7 +574,7 @@ static void _rtl_rx_completed(struct urb *_urb)
                         if (IS_ERR(_skb)) {
                                 err = PTR_ERR(_skb);
                                 RT_TRACE(rtlpriv, COMP_USB, DBG_EMERG,
-                                        ("Can't allocate skb for bulk IN!\n"));
+                                         "Can't allocate skb for bulk IN!\n");
                                 return;
                         }
                         skb = _skb;
@@ -632,14 +631,14 @@ static int _rtl_usb_receive(struct ieee80211_hw *hw)
                 urb = usb_alloc_urb(0, GFP_KERNEL);
                 if (!urb) {
                         RT_TRACE(rtlpriv, COMP_USB, DBG_EMERG,
-                                 ("Failed to alloc URB!!\n"))
+                                 "Failed to alloc URB!!\n");
                         goto err_out;
                 }
 
                 skb = _rtl_prep_rx_urb(hw, rtlusb, urb, GFP_KERNEL);
                 if (IS_ERR(skb)) {
                         RT_TRACE(rtlpriv, COMP_USB, DBG_EMERG,
-                                 ("Failed to prep_rx_urb!!\n"))
+                                 "Failed to prep_rx_urb!!\n");
                         err = PTR_ERR(skb);
                         goto err_out;
                 }
@@ -665,15 +664,17 @@ static int rtl_usb_start(struct ieee80211_hw *hw)
         struct rtl_usb *rtlusb = rtl_usbdev(rtl_usbpriv(hw));
 
         err = rtlpriv->cfg->ops->hw_init(hw);
-        rtl_init_rx_config(hw);
+        if (!err) {
+                rtl_init_rx_config(hw);
 
-        /* Enable software */
-        SET_USB_START(rtlusb);
-        /* should after adapter start and interrupt enable. */
-        set_hal_start(rtlhal);
+                /* Enable software */
+                SET_USB_START(rtlusb);
+                /* should after adapter start and interrupt enable. */
+                set_hal_start(rtlhal);
 
-        /* Start bulk IN */
-        _rtl_usb_receive(hw);
+                /* Start bulk IN */
+                _rtl_usb_receive(hw);
+        }
 
         return err;
 }
@@ -745,7 +746,7 @@ static void _rtl_submit_tx_urb(struct ieee80211_hw *hw, struct urb *_urb)
                 struct sk_buff *skb;
 
                 RT_TRACE(rtlpriv, COMP_USB, DBG_EMERG,
-                         ("Failed to submit urb.\n"));
+                         "Failed to submit urb\n");
                 usb_unanchor_urb(_urb);
                 skb = (struct sk_buff *)_urb->context;
                 kfree_skb(skb);
@@ -768,7 +769,7 @@ static int _usb_tx_post(struct ieee80211_hw *hw, struct urb *urb,
 
         if (urb->status) {
                 RT_TRACE(rtlpriv, COMP_USB, DBG_EMERG,
-                         ("Urb has error status 0x%X\n", urb->status));
+                         "Urb has error status 0x%X\n", urb->status);
                 goto out;
         }
         /*  TODO:       statistics */
@@ -805,7 +806,7 @@ static struct urb *_rtl_usb_tx_urb_setup(struct ieee80211_hw *hw,
         _urb = usb_alloc_urb(0, GFP_ATOMIC);
         if (!_urb) {
                 RT_TRACE(rtlpriv, COMP_USB, DBG_EMERG,
-                         ("Can't allocate URB for bulk out!\n"));
+                         "Can't allocate URB for bulk out!\n");
                 kfree_skb(skb);
                 return NULL;
         }
@@ -830,7 +831,7 @@ static void _rtl_usb_transmit(struct ieee80211_hw *hw, struct sk_buff *skb,
         WARN_ON(NULL == rtlusb->usb_tx_aggregate_hdl);
         if (unlikely(IS_USB_STOP(rtlusb))) {
                 RT_TRACE(rtlpriv, COMP_USB, DBG_EMERG,
-                         ("USB device is stopping...\n"));
+                         "USB device is stopping...\n");
                 kfree_skb(skb);
                 return;
         }
@@ -840,7 +841,7 @@ static void _rtl_usb_transmit(struct ieee80211_hw *hw, struct sk_buff *skb,
         _urb = _rtl_usb_tx_urb_setup(hw, _skb, ep_num);
         if (unlikely(!_urb)) {
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("Can't allocate urb. Drop skb!\n"));
+                         "Can't allocate urb. Drop skb!\n");
                 return;
         }
         urb_list = &rtlusb->tx_pending[ep_num];
@@ -865,7 +866,7 @@ static void _rtl_usb_tx_preprocess(struct ieee80211_hw *hw, struct sk_buff *skb,
 
         memset(&tcb_desc, 0, sizeof(struct rtl_tcb_desc));
         if (ieee80211_is_auth(fc)) {
-                RT_TRACE(rtlpriv, COMP_SEND, DBG_DMESG, ("MAC80211_LINKING\n"));
+                RT_TRACE(rtlpriv, COMP_SEND, DBG_DMESG, "MAC80211_LINKING\n");
                 rtl_ips_nic_on(hw);
         }
 
@@ -946,10 +947,11 @@ int __devinit rtl_usb_probe(struct usb_interface *intf,
         hw = ieee80211_alloc_hw(sizeof(struct rtl_priv) +
                                 sizeof(struct rtl_usb_priv), &rtl_ops);
         if (!hw) {
-                RT_ASSERT(false, ("%s : ieee80211 alloc failed\n", __func__));
+                RT_ASSERT(false, "ieee80211 alloc failed\n");
                 return -ENOMEM;
         }
         rtlpriv = hw->priv;
+        init_completion(&rtlpriv->firmware_loading_complete);
         SET_IEEE80211_DEV(hw, &intf->dev);
         udev = interface_to_usbdev(intf);
         usb_get_dev(udev);
@@ -969,8 +971,7 @@ int __devinit rtl_usb_probe(struct usb_interface *intf,
         /*like read eeprom and so on */
         rtlpriv->cfg->ops->read_eeprom_info(hw);
         if (rtlpriv->cfg->ops->init_sw_vars(hw)) {
-                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("Can't init_sw_vars.\n"));
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "Can't init_sw_vars\n");
                 goto error_out;
         }
         rtlpriv->cfg->ops->init_sw_leds(hw);
@@ -980,28 +981,16 @@ int __devinit rtl_usb_probe(struct usb_interface *intf,
         err = rtl_init_core(hw);
         if (err) {
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("Can't allocate sw for mac80211.\n"));
+                         "Can't allocate sw for mac80211\n");
                 goto error_out;
         }
 
-        /*init rfkill */
-        /* rtl_init_rfkill(hw); */
-
-        err = ieee80211_register_hw(hw);
-        if (err) {
-                RT_TRACE(rtlpriv, COMP_INIT, DBG_EMERG,
-                         ("Can't register mac80211 hw.\n"));
-                goto error_out;
-        } else {
-                rtlpriv->mac80211.mac80211_registered = 1;
-        }
-        set_bit(RTL_STATUS_INTERFACE_START, &rtlpriv->status);
         return 0;
 error_out:
         rtl_deinit_core(hw);
         _rtl_usb_io_handler_release(hw);
-        ieee80211_free_hw(hw);
         usb_put_dev(udev);
+        complete(&rtlpriv->firmware_loading_complete);
         return -ENODEV;
 }
 EXPORT_SYMBOL(rtl_usb_probe);
@@ -1015,6 +1004,9 @@ void rtl_usb_disconnect(struct usb_interface *intf)
 
         if (unlikely(!rtlpriv))
                 return;
+
+        /* just in case driver is removed before firmware callback */
+        wait_for_completion(&rtlpriv->firmware_loading_complete);
         /*ieee80211_unregister_hw will call ops_stop */
         if (rtlmac->mac80211_registered == 1) {
                 ieee80211_unregister_hw(hw);
diff --git a/drivers/net/wireless/rtlwifi/usb.h b/drivers/net/wireless/rtlwifi/usb.h
index d2a63fb3e1e6..43846b329153 100644
--- a/drivers/net/wireless/rtlwifi/usb.h
+++ b/drivers/net/wireless/rtlwifi/usb.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2009-2011  Realtek Corporation. All rights reserved.
+ * Copyright(c) 2009-2012  Realtek 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
@@ -28,7 +28,6 @@
 #ifndef __RTL_USB_H__
 #define __RTL_USB_H__
 
-#include <linux/usb.h>
 #include <linux/skbuff.h>
 
 #define RTL_RX_DESC_SIZE                24
diff --git a/drivers/net/wireless/rtlwifi/wifi.h b/drivers/net/wireless/rtlwifi/wifi.h
index cdaf1429fa0b..b591614c3b9b 100644
--- a/drivers/net/wireless/rtlwifi/wifi.h
+++ b/drivers/net/wireless/rtlwifi/wifi.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2009-2010  Realtek Corporation.
+ * Copyright(c) 2009-2012  Realtek Corporation.
  *
  * 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
@@ -30,12 +30,15 @@
 #ifndef __RTL_WIFI_H__
 #define __RTL_WIFI_H__
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/sched.h>
 #include <linux/firmware.h>
 #include <linux/etherdevice.h>
 #include <linux/vmalloc.h>
 #include <linux/usb.h>
 #include <net/mac80211.h>
+#include <linux/completion.h>
 #include "debug.h"
 
 #define RF_CHANGE_BY_INIT                       0
@@ -1045,7 +1048,6 @@ struct rtl_hal {
         u16 fw_subversion;
         bool h2c_setinprogress;
         u8 last_hmeboxnum;
-        bool fw_ready;
         /*Reserve page start offset except beacon in TxQ. */
         u8 fw_rsvdpage_startoffset;
         u8 h2c_txcmd_seq;
@@ -1591,6 +1593,7 @@ struct rtl_debug {
 };
 
 struct rtl_priv {
+        struct completion firmware_loading_complete;
         struct rtl_locks locks;
         struct rtl_works works;
         struct rtl_mac mac80211;
@@ -1612,6 +1615,7 @@ struct rtl_priv {
         struct rtl_rate_priv *rate_priv;
 
         struct rtl_debug dbg;
+        int max_fw_size;
 
         /*
          *hal_cfg : for diff cards
diff --git a/drivers/net/wireless/wl1251/main.c b/drivers/net/wireless/wl1251/main.c
index ba3268ea81fe..41302c7b1ad0 100644
--- a/drivers/net/wireless/wl1251/main.c
+++ b/drivers/net/wireless/wl1251/main.c
@@ -514,6 +514,9 @@ static int wl1251_op_add_interface(struct ieee80211_hw *hw,
         struct wl1251 *wl = hw->priv;
         int ret = 0;
 
+        vif->driver_flags |= IEEE80211_VIF_BEACON_FILTER |
+                             IEEE80211_VIF_SUPPORTS_CQM_RSSI;
+
         wl1251_debug(DEBUG_MAC80211, "mac80211 add interface type %d mac %pM",
                      vif->type, vif->addr);
 
@@ -1338,9 +1341,7 @@ int wl1251_init_ieee80211(struct wl1251 *wl)
 
         wl->hw->flags = IEEE80211_HW_SIGNAL_DBM |
                 IEEE80211_HW_SUPPORTS_PS |
-                IEEE80211_HW_BEACON_FILTER |
-                IEEE80211_HW_SUPPORTS_UAPSD |
-                IEEE80211_HW_SUPPORTS_CQM_RSSI;
+                IEEE80211_HW_SUPPORTS_UAPSD;
 
         wl->hw->wiphy->interface_modes = BIT(NL80211_IFTYPE_STATION) |
                                          BIT(NL80211_IFTYPE_ADHOC);
diff --git a/drivers/net/wireless/wl12xx/main.c b/drivers/net/wireless/wl12xx/main.c
index d5f55a149de5..f8748cedbae1 100644
--- a/drivers/net/wireless/wl12xx/main.c
+++ b/drivers/net/wireless/wl12xx/main.c
@@ -2060,6 +2060,9 @@ static int wl1271_op_add_interface(struct ieee80211_hw *hw,
         u8 role_type;
         bool booted = false;
 
+        vif->driver_flags |= IEEE80211_VIF_BEACON_FILTER |
+                             IEEE80211_VIF_SUPPORTS_CQM_RSSI;
+
         wl1271_debug(DEBUG_MAC80211, "mac80211 add interface type %d mac %pM",
                      ieee80211_vif_type_p2p(vif), vif->addr);
 
@@ -4898,12 +4901,10 @@ static int wl1271_init_ieee80211(struct wl1271 *wl)
         wl->hw->max_listen_interval = wl->conf.conn.max_listen_interval;
 
         wl->hw->flags = IEEE80211_HW_SIGNAL_DBM |
-                IEEE80211_HW_BEACON_FILTER |
                 IEEE80211_HW_SUPPORTS_PS |
                 IEEE80211_HW_SUPPORTS_UAPSD |
                 IEEE80211_HW_HAS_RATE_CONTROL |
                 IEEE80211_HW_CONNECTION_MONITOR |
-                IEEE80211_HW_SUPPORTS_CQM_RSSI |
                 IEEE80211_HW_REPORTS_TX_ACK_STATUS |
                 IEEE80211_HW_SPECTRUM_MGMT |
                 IEEE80211_HW_AP_LINK_PS |
diff --git a/drivers/net/xen-netback/netback.c b/drivers/net/xen-netback/netback.c
index 59effac15f36..2596401308a8 100644
--- a/drivers/net/xen-netback/netback.c
+++ b/drivers/net/xen-netback/netback.c
@@ -1639,10 +1639,8 @@ static int __init netback_init(void)
 
         xen_netbk_group_nr = num_online_cpus();
         xen_netbk = vzalloc(sizeof(struct xen_netbk) * xen_netbk_group_nr);
-        if (!xen_netbk) {
-                printk(KERN_ALERT "%s: out of memory\n", __func__);
+        if (!xen_netbk)
                 return -ENOMEM;
-        }
 
         for (group = 0; group < xen_netbk_group_nr; group++) {
                 struct xen_netbk *netbk = &xen_netbk[group];
diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c
index 698b905058dd..b16175032327 100644
--- a/drivers/net/xen-netfront.c
+++ b/drivers/net/xen-netfront.c
@@ -489,6 +489,7 @@ static int xennet_start_xmit(struct sk_buff *skb, struct net_device *dev)
         int frags = skb_shinfo(skb)->nr_frags;
         unsigned int offset = offset_in_page(data);
         unsigned int len = skb_headlen(skb);
+        unsigned long flags;
 
         frags += DIV_ROUND_UP(offset + len, PAGE_SIZE);
         if (unlikely(frags > MAX_SKB_FRAGS + 1)) {
@@ -498,12 +499,12 @@ static int xennet_start_xmit(struct sk_buff *skb, struct net_device *dev)
                 goto drop;
         }
 
-        spin_lock_irq(&np->tx_lock);
+        spin_lock_irqsave(&np->tx_lock, flags);
 
         if (unlikely(!netif_carrier_ok(dev) ||
                      (frags > 1 && !xennet_can_sg(dev)) ||
                      netif_needs_gso(skb, netif_skb_features(skb)))) {
-                spin_unlock_irq(&np->tx_lock);
+                spin_unlock_irqrestore(&np->tx_lock, flags);
                 goto drop;
         }
 
@@ -574,7 +575,7 @@ static int xennet_start_xmit(struct sk_buff *skb, struct net_device *dev)
         if (!netfront_tx_slot_available(np))
                 netif_stop_queue(dev);
 
-        spin_unlock_irq(&np->tx_lock);
+        spin_unlock_irqrestore(&np->tx_lock, flags);
 
         return NETDEV_TX_OK;
 
@@ -1228,6 +1229,33 @@ static int xennet_set_features(struct net_device *dev,
         return 0;
 }
 
+static irqreturn_t xennet_interrupt(int irq, void *dev_id)
+{
+        struct net_device *dev = dev_id;
+        struct netfront_info *np = netdev_priv(dev);
+        unsigned long flags;
+
+        spin_lock_irqsave(&np->tx_lock, flags);
+
+        if (likely(netif_carrier_ok(dev))) {
+                xennet_tx_buf_gc(dev);
+                /* Under tx_lock: protects access to rx shared-ring indexes. */
+                if (RING_HAS_UNCONSUMED_RESPONSES(&np->rx))
+                        napi_schedule(&np->napi);
+        }
+
+        spin_unlock_irqrestore(&np->tx_lock, flags);
+
+        return IRQ_HANDLED;
+}
+
+#ifdef CONFIG_NET_POLL_CONTROLLER
+static void xennet_poll_controller(struct net_device *dev)
+{
+        xennet_interrupt(0, dev);
+}
+#endif
+
 static const struct net_device_ops xennet_netdev_ops = {
         .ndo_open            = xennet_open,
         .ndo_uninit          = xennet_uninit,
@@ -1239,6 +1267,9 @@ static const struct net_device_ops xennet_netdev_ops = {
         .ndo_validate_addr   = eth_validate_addr,
         .ndo_fix_features    = xennet_fix_features,
         .ndo_set_features    = xennet_set_features,
+#ifdef CONFIG_NET_POLL_CONTROLLER
+        .ndo_poll_controller = xennet_poll_controller,
+#endif
 };
 
 static struct net_device * __devinit xennet_create_dev(struct xenbus_device *dev)
@@ -1248,11 +1279,8 @@ static struct net_device * __devinit xennet_create_dev(struct xenbus_device *dev
         struct netfront_info *np;
 
         netdev = alloc_etherdev(sizeof(struct netfront_info));
-        if (!netdev) {
-                printk(KERN_WARNING "%s> alloc_etherdev failed.\n",
-                       __func__);
+        if (!netdev)
                 return ERR_PTR(-ENOMEM);
-        }
 
         np                   = netdev_priv(netdev);
         np->xbdev            = dev;
@@ -1448,26 +1476,6 @@ static int xen_net_read_mac(struct xenbus_device *dev, u8 mac[])
         return 0;
 }
 
-static irqreturn_t xennet_interrupt(int irq, void *dev_id)
-{
-        struct net_device *dev = dev_id;
-        struct netfront_info *np = netdev_priv(dev);
-        unsigned long flags;
-
-        spin_lock_irqsave(&np->tx_lock, flags);
-
-        if (likely(netif_carrier_ok(dev))) {
-                xennet_tx_buf_gc(dev);
-                /* Under tx_lock: protects access to rx shared-ring indexes. */
-                if (RING_HAS_UNCONSUMED_RESPONSES(&np->rx))
-                        napi_schedule(&np->napi);
-        }
-
-        spin_unlock_irqrestore(&np->tx_lock, flags);
-
-        return IRQ_HANDLED;
-}
-
 static int setup_netfront(struct xenbus_device *dev, struct netfront_info *info)
 {
         struct xen_netif_tx_sring *txs;
diff --git a/drivers/nfc/nfcwilink.c b/drivers/nfc/nfcwilink.c
index 06c3642e5bdb..1f74a77d040d 100644
--- a/drivers/nfc/nfcwilink.c
+++ b/drivers/nfc/nfcwilink.c
@@ -28,6 +28,8 @@
  */
 #include <linux/platform_device.h>
 #include <linux/module.h>
+#include <linux/types.h>
+#include <linux/firmware.h>
 #include <linux/nfc.h>
 #include <net/nfc/nci.h>
 #include <net/nfc/nci_core.h>
@@ -40,11 +42,52 @@
 #define NFCWILINK_OFFSET_LEN_IN_HDR     1
 #define NFCWILINK_LEN_SIZE              2
 #define NFCWILINK_REGISTER_TIMEOUT      8000    /* 8 sec */
+#define NFCWILINK_CMD_TIMEOUT           5000    /* 5 sec */
+
+#define BTS_FILE_NAME_MAX_SIZE          40
+#define BTS_FILE_HDR_MAGIC              0x42535442
+#define BTS_FILE_CMD_MAX_LEN            0xff
+#define BTS_FILE_ACTION_TYPE_SEND_CMD   1
+
+#define NCI_VS_NFCC_INFO_CMD_GID        0x2f
+#define NCI_VS_NFCC_INFO_CMD_OID        0x12
+#define NCI_VS_NFCC_INFO_RSP_GID        0x4f
+#define NCI_VS_NFCC_INFO_RSP_OID        0x12
 
 struct nfcwilink_hdr {
-        u8 chnl;
-        u8 opcode;
-        u16 len;
+        __u8 chnl;
+        __u8 opcode;
+        __le16 len;
+} __packed;
+
+struct nci_vs_nfcc_info_cmd {
+        __u8 gid;
+        __u8 oid;
+        __u8 plen;
+} __packed;
+
+struct nci_vs_nfcc_info_rsp {
+        __u8 gid;
+        __u8 oid;
+        __u8 plen;
+        __u8 status;
+        __u8 hw_id;
+        __u8 sw_ver_x;
+        __u8 sw_ver_z;
+        __u8 patch_id;
+} __packed;
+
+struct bts_file_hdr {
+        __le32 magic;
+        __le32 ver;
+        __u8 rfu[24];
+        __u8 actions[0];
+} __packed;
+
+struct bts_file_action {
+        __le16 type;
+        __le16 len;
+        __u8 data[0];
 } __packed;
 
 struct nfcwilink {
@@ -54,14 +97,241 @@ struct nfcwilink {
 
         char                            st_register_cb_status;
         long                            (*st_write) (struct sk_buff *);
-        struct completion               st_register_completed;
+
+        struct completion               completed;
+
+        struct nci_vs_nfcc_info_rsp     nfcc_info;
 };
 
 /* NFCWILINK driver flags */
 enum {
         NFCWILINK_RUNNING,
+        NFCWILINK_FW_DOWNLOAD,
 };
 
+static int nfcwilink_send(struct sk_buff *skb);
+
+static inline struct sk_buff *nfcwilink_skb_alloc(unsigned int len, gfp_t how)
+{
+        struct sk_buff *skb;
+
+        skb = alloc_skb(len + NFCWILINK_HDR_LEN, how);
+        if (skb)
+                skb_reserve(skb, NFCWILINK_HDR_LEN);
+
+        return skb;
+}
+
+static void nfcwilink_fw_download_receive(struct nfcwilink *drv,
+                                                struct sk_buff *skb)
+{
+        struct nci_vs_nfcc_info_rsp *rsp = (void *)skb->data;
+
+        /* Detect NCI_VS_NFCC_INFO_RSP and store the result */
+        if ((skb->len > 3) && (rsp->gid == NCI_VS_NFCC_INFO_RSP_GID) &&
+                (rsp->oid == NCI_VS_NFCC_INFO_RSP_OID)) {
+                memcpy(&drv->nfcc_info, rsp,
+                        sizeof(struct nci_vs_nfcc_info_rsp));
+        }
+
+        kfree_skb(skb);
+
+        complete(&drv->completed);
+}
+
+static int nfcwilink_get_bts_file_name(struct nfcwilink *drv, char *file_name)
+{
+        struct nci_vs_nfcc_info_cmd *cmd;
+        struct sk_buff *skb;
+        unsigned long comp_ret;
+        int rc;
+
+        nfc_dev_dbg(&drv->pdev->dev, "get_bts_file_name entry");
+
+        skb = nfcwilink_skb_alloc(sizeof(struct nci_vs_nfcc_info_cmd),
+                                        GFP_KERNEL);
+        if (!skb) {
+                nfc_dev_err(&drv->pdev->dev,
+                                "no memory for nci_vs_nfcc_info_cmd");
+                return -ENOMEM;
+        }
+
+        skb->dev = (void *)drv->ndev;
+
+        cmd = (struct nci_vs_nfcc_info_cmd *)
+                        skb_put(skb, sizeof(struct nci_vs_nfcc_info_cmd));
+        cmd->gid = NCI_VS_NFCC_INFO_CMD_GID;
+        cmd->oid = NCI_VS_NFCC_INFO_CMD_OID;
+        cmd->plen = 0;
+
+        drv->nfcc_info.plen = 0;
+
+        rc = nfcwilink_send(skb);
+        if (rc)
+                return rc;
+
+        comp_ret = wait_for_completion_timeout(&drv->completed,
+                                msecs_to_jiffies(NFCWILINK_CMD_TIMEOUT));
+        nfc_dev_dbg(&drv->pdev->dev, "wait_for_completion_timeout returned %ld",
+                        comp_ret);
+        if (comp_ret == 0) {
+                nfc_dev_err(&drv->pdev->dev,
+                                "timeout on wait_for_completion_timeout");
+                return -ETIMEDOUT;
+        }
+
+        nfc_dev_dbg(&drv->pdev->dev, "nci_vs_nfcc_info_rsp: plen %d, status %d",
+                        drv->nfcc_info.plen,
+                        drv->nfcc_info.status);
+
+        if ((drv->nfcc_info.plen != 5) || (drv->nfcc_info.status != 0)) {
+                nfc_dev_err(&drv->pdev->dev,
+                                "invalid nci_vs_nfcc_info_rsp");
+                return -EINVAL;
+        }
+
+        snprintf(file_name, BTS_FILE_NAME_MAX_SIZE,
+                        "TINfcInit_%d.%d.%d.%d.bts",
+                        drv->nfcc_info.hw_id,
+                        drv->nfcc_info.sw_ver_x,
+                        drv->nfcc_info.sw_ver_z,
+                        drv->nfcc_info.patch_id);
+
+        nfc_dev_info(&drv->pdev->dev, "nfcwilink FW file name: %s", file_name);
+
+        return 0;
+}
+
+static int nfcwilink_send_bts_cmd(struct nfcwilink *drv, __u8 *data, int len)
+{
+        struct nfcwilink_hdr *hdr = (struct nfcwilink_hdr *)data;
+        struct sk_buff *skb;
+        unsigned long comp_ret;
+        int rc;
+
+        nfc_dev_dbg(&drv->pdev->dev, "send_bts_cmd entry");
+
+        /* verify valid cmd for the NFC channel */
+        if ((len <= sizeof(struct nfcwilink_hdr)) ||
+                (len > BTS_FILE_CMD_MAX_LEN) ||
+                (hdr->chnl != NFCWILINK_CHNL) ||
+                (hdr->opcode != NFCWILINK_OPCODE)) {
+                nfc_dev_err(&drv->pdev->dev,
+                        "ignoring invalid bts cmd, len %d, chnl %d, opcode %d",
+                        len, hdr->chnl, hdr->opcode);
+                return 0;
+        }
+
+        /* remove the ST header */
+        len -= sizeof(struct nfcwilink_hdr);
+        data += sizeof(struct nfcwilink_hdr);
+
+        skb = nfcwilink_skb_alloc(len, GFP_KERNEL);
+        if (!skb) {
+                nfc_dev_err(&drv->pdev->dev, "no memory for bts cmd");
+                return -ENOMEM;
+        }
+
+        skb->dev = (void *)drv->ndev;
+
+        memcpy(skb_put(skb, len), data, len);
+
+        rc = nfcwilink_send(skb);
+        if (rc)
+                return rc;
+
+        comp_ret = wait_for_completion_timeout(&drv->completed,
+                                msecs_to_jiffies(NFCWILINK_CMD_TIMEOUT));
+        nfc_dev_dbg(&drv->pdev->dev, "wait_for_completion_timeout returned %ld",
+                        comp_ret);
+        if (comp_ret == 0) {
+                nfc_dev_err(&drv->pdev->dev,
+                                "timeout on wait_for_completion_timeout");
+                return -ETIMEDOUT;
+        }
+
+        return 0;
+}
+
+static int nfcwilink_download_fw(struct nfcwilink *drv)
+{
+        unsigned char file_name[BTS_FILE_NAME_MAX_SIZE];
+        const struct firmware *fw;
+        __u16 action_type, action_len;
+        __u8 *ptr;
+        int len, rc;
+
+        nfc_dev_dbg(&drv->pdev->dev, "download_fw entry");
+
+        set_bit(NFCWILINK_FW_DOWNLOAD, &drv->flags);
+
+        rc = nfcwilink_get_bts_file_name(drv, file_name);
+        if (rc)
+                goto exit;
+
+        rc = request_firmware(&fw, file_name, &drv->pdev->dev);
+        if (rc) {
+                nfc_dev_err(&drv->pdev->dev, "request_firmware failed %d", rc);
+
+                /* if the file is not found, don't exit with failure */
+                if (rc == -ENOENT)
+                        rc = 0;
+
+                goto exit;
+        }
+
+        len = fw->size;
+        ptr = (__u8 *)fw->data;
+
+        if ((len == 0) || (ptr == NULL)) {
+                nfc_dev_dbg(&drv->pdev->dev,
+                                "request_firmware returned size %d", len);
+                goto release_fw;
+        }
+
+        if (__le32_to_cpu(((struct bts_file_hdr *)ptr)->magic) !=
+                        BTS_FILE_HDR_MAGIC) {
+                nfc_dev_err(&drv->pdev->dev, "wrong bts magic number");
+                rc = -EINVAL;
+                goto release_fw;
+        }
+
+        /* remove the BTS header */
+        len -= sizeof(struct bts_file_hdr);
+        ptr += sizeof(struct bts_file_hdr);
+
+        while (len > 0) {
+                action_type =
+                        __le16_to_cpu(((struct bts_file_action *)ptr)->type);
+                action_len =
+                        __le16_to_cpu(((struct bts_file_action *)ptr)->len);
+
+                nfc_dev_dbg(&drv->pdev->dev, "bts_file_action type %d, len %d",
+                                action_type, action_len);
+
+                switch (action_type) {
+                case BTS_FILE_ACTION_TYPE_SEND_CMD:
+                        rc = nfcwilink_send_bts_cmd(drv,
+                                        ((struct bts_file_action *)ptr)->data,
+                                        action_len);
+                        if (rc)
+                                goto release_fw;
+                        break;
+                }
+
+                /* advance to the next action */
+                len -= (sizeof(struct bts_file_action) + action_len);
+                ptr += (sizeof(struct bts_file_action) + action_len);
+        }
+
+release_fw:
+        release_firmware(fw);
+
+exit:
+        clear_bit(NFCWILINK_FW_DOWNLOAD, &drv->flags);
+        return rc;
+}
+
 /* Called by ST when registration is complete */
 static void nfcwilink_register_complete(void *priv_data, char data)
 {
@@ -73,7 +343,7 @@ static void nfcwilink_register_complete(void *priv_data, char data)
         drv->st_register_cb_status = data;
 
         /* complete the wait in nfc_st_open() */
-        complete(&drv->st_register_completed);
+        complete(&drv->completed);
 }
 
 /* Called by ST when receive data is available */
@@ -96,6 +366,11 @@ static long nfcwilink_receive(void *priv_data, struct sk_buff *skb)
         (apart for the chnl byte, which is not received in the hdr) */
         skb_pull(skb, (NFCWILINK_HDR_LEN-1));
 
+        if (test_bit(NFCWILINK_FW_DOWNLOAD, &drv->flags)) {
+                nfcwilink_fw_download_receive(drv, skb);
+                return 0;
+        }
+
         skb->dev = (void *) drv->ndev;
 
         /* Forward skb to NCI core layer */
@@ -136,14 +411,14 @@ static int nfcwilink_open(struct nci_dev *ndev)
 
         nfcwilink_proto.priv_data = drv;
 
-        init_completion(&drv->st_register_completed);
+        init_completion(&drv->completed);
         drv->st_register_cb_status = -EINPROGRESS;
 
         rc = st_register(&nfcwilink_proto);
         if (rc < 0) {
                 if (rc == -EINPROGRESS) {
                         comp_ret = wait_for_completion_timeout(
-                        &drv->st_register_completed,
+                        &drv->completed,
                         msecs_to_jiffies(NFCWILINK_REGISTER_TIMEOUT));
 
                         nfc_dev_dbg(&drv->pdev->dev,
@@ -171,6 +446,12 @@ static int nfcwilink_open(struct nci_dev *ndev)
         BUG_ON(nfcwilink_proto.write == NULL);
         drv->st_write = nfcwilink_proto.write;
 
+        if (nfcwilink_download_fw(drv)) {
+                nfc_dev_err(&drv->pdev->dev, "nfcwilink_download_fw failed %d",
+                                rc);
+                /* open should succeed, even if the FW download failed */
+        }
+
         goto exit;
 
 clear_exit:
@@ -208,11 +489,13 @@ static int nfcwilink_send(struct sk_buff *skb)
 
         nfc_dev_dbg(&drv->pdev->dev, "send entry, len %d", skb->len);
 
-        if (!test_bit(NFCWILINK_RUNNING, &drv->flags))
-                return -EBUSY;
+        if (!test_bit(NFCWILINK_RUNNING, &drv->flags)) {
+                kfree_skb(skb);
+                return -EINVAL;
+        }
 
         /* add the ST hdr to the start of the buffer */
-        hdr.len = skb->len;
+        hdr.len = cpu_to_le16(skb->len);
         memcpy(skb_push(skb, NFCWILINK_HDR_LEN), &hdr, NFCWILINK_HDR_LEN);
 
         /* Insert skb to shared transport layer's transmit queue.
@@ -239,7 +522,7 @@ static int nfcwilink_probe(struct platform_device *pdev)
 {
         static struct nfcwilink *drv;
         int rc;
-        u32 protocols;
+        __u32 protocols;
 
         nfc_dev_dbg(&pdev->dev, "probe entry");
 
diff --git a/drivers/s390/net/qeth_core.h b/drivers/s390/net/qeth_core.h
index 4abc79d3963f..ec7921b5138e 100644
--- a/drivers/s390/net/qeth_core.h
+++ b/drivers/s390/net/qeth_core.h
@@ -906,6 +906,7 @@ void qeth_prepare_ipa_cmd(struct qeth_card *, struct qeth_cmd_buffer *, char);
 struct qeth_cmd_buffer *qeth_wait_for_buffer(struct qeth_channel *);
 int qeth_mdio_read(struct net_device *, int, int);
 int qeth_snmp_command(struct qeth_card *, char __user *);
+int qeth_query_oat_command(struct qeth_card *, char __user *);
 struct qeth_cmd_buffer *qeth_get_adapter_cmd(struct qeth_card *, __u32, __u32);
 int qeth_default_setadapterparms_cb(struct qeth_card *, struct qeth_reply *,
                                         unsigned long);
diff --git a/drivers/s390/net/qeth_core_main.c b/drivers/s390/net/qeth_core_main.c
index 9c3f38da4c01..cbb101828dc3 100644
--- a/drivers/s390/net/qeth_core_main.c
+++ b/drivers/s390/net/qeth_core_main.c
@@ -26,6 +26,7 @@
 #include <asm/ebcdic.h>
 #include <asm/io.h>
 #include <asm/sysinfo.h>
+#include <asm/compat.h>
 
 #include "qeth_core.h"
 
@@ -677,6 +678,7 @@ void qeth_release_buffer(struct qeth_channel *channel,
         iob->callback = qeth_send_control_data_cb;
         iob->rc = 0;
         spin_unlock_irqrestore(&channel->iob_lock, flags);
+        wake_up(&channel->wait_q);
 }
 EXPORT_SYMBOL_GPL(qeth_release_buffer);
 
@@ -4402,6 +4404,104 @@ int qeth_snmp_command(struct qeth_card *card, char __user *udata)
 }
 EXPORT_SYMBOL_GPL(qeth_snmp_command);
 
+static int qeth_setadpparms_query_oat_cb(struct qeth_card *card,
+                struct qeth_reply *reply, unsigned long data)
+{
+        struct qeth_ipa_cmd *cmd;
+        struct qeth_qoat_priv *priv;
+        char *resdata;
+        int resdatalen;
+
+        QETH_CARD_TEXT(card, 3, "qoatcb");
+
+        cmd = (struct qeth_ipa_cmd *)data;
+        priv = (struct qeth_qoat_priv *)reply->param;
+        resdatalen = cmd->data.setadapterparms.hdr.cmdlength;
+        resdata = (char *)data + 28;
+
+        if (resdatalen > (priv->buffer_len - priv->response_len)) {
+                cmd->hdr.return_code = IPA_RC_FFFF;
+                return 0;
+        }
+
+        memcpy((priv->buffer + priv->response_len), resdata,
+                resdatalen);
+        priv->response_len += resdatalen;
+
+        if (cmd->data.setadapterparms.hdr.seq_no <
+            cmd->data.setadapterparms.hdr.used_total)
+                return 1;
+        return 0;
+}
+
+int qeth_query_oat_command(struct qeth_card *card, char __user *udata)
+{
+        int rc = 0;
+        struct qeth_cmd_buffer *iob;
+        struct qeth_ipa_cmd *cmd;
+        struct qeth_query_oat *oat_req;
+        struct qeth_query_oat_data oat_data;
+        struct qeth_qoat_priv priv;
+        void __user *tmp;
+
+        QETH_CARD_TEXT(card, 3, "qoatcmd");
+
+        if (!qeth_adp_supported(card, IPA_SETADP_QUERY_OAT)) {
+                rc = -EOPNOTSUPP;
+                goto out;
+        }
+
+        if (copy_from_user(&oat_data, udata,
+            sizeof(struct qeth_query_oat_data))) {
+                        rc = -EFAULT;
+                        goto out;
+        }
+
+        priv.buffer_len = oat_data.buffer_len;
+        priv.response_len = 0;
+        priv.buffer =  kzalloc(oat_data.buffer_len, GFP_KERNEL);
+        if (!priv.buffer) {
+                rc = -ENOMEM;
+                goto out;
+        }
+
+        iob = qeth_get_adapter_cmd(card, IPA_SETADP_QUERY_OAT,
+                                   sizeof(struct qeth_ipacmd_setadpparms_hdr) +
+                                   sizeof(struct qeth_query_oat));
+        cmd = (struct qeth_ipa_cmd *)(iob->data+IPA_PDU_HEADER_SIZE);
+        oat_req = &cmd->data.setadapterparms.data.query_oat;
+        oat_req->subcmd_code = oat_data.command;
+
+        rc = qeth_send_ipa_cmd(card, iob, qeth_setadpparms_query_oat_cb,
+                               &priv);
+        if (!rc) {
+                if (is_compat_task())
+                        tmp = compat_ptr(oat_data.ptr);
+                else
+                        tmp = (void __user *)(unsigned long)oat_data.ptr;
+
+                if (copy_to_user(tmp, priv.buffer,
+                    priv.response_len)) {
+                        rc = -EFAULT;
+                        goto out_free;
+                }
+
+                oat_data.response_len = priv.response_len;
+
+                if (copy_to_user(udata, &oat_data,
+                    sizeof(struct qeth_query_oat_data)))
+                        rc = -EFAULT;
+        } else
+                if (rc == IPA_RC_FFFF)
+                        rc = -EFAULT;
+
+out_free:
+        kfree(priv.buffer);
+out:
+        return rc;
+}
+EXPORT_SYMBOL_GPL(qeth_query_oat_command);
+
 static inline int qeth_get_qdio_q_format(struct qeth_card *card)
 {
         switch (card->info.type) {
diff --git a/drivers/s390/net/qeth_core_mpc.h b/drivers/s390/net/qeth_core_mpc.h
index e5a9d1c03839..578e19a2de6b 100644
--- a/drivers/s390/net/qeth_core_mpc.h
+++ b/drivers/s390/net/qeth_core_mpc.h
@@ -249,6 +249,7 @@ enum qeth_ipa_setadp_cmd {
         IPA_SETADP_SET_PROMISC_MODE             = 0x00000800L,
         IPA_SETADP_SET_DIAG_ASSIST              = 0x00002000L,
         IPA_SETADP_SET_ACCESS_CONTROL           = 0x00010000L,
+        IPA_SETADP_QUERY_OAT                    = 0x00080000L,
 };
 enum qeth_ipa_mac_ops {
         CHANGE_ADDR_READ_MAC            = 0,
@@ -398,6 +399,17 @@ struct qeth_set_access_ctrl {
         __u32 subcmd_code;
 } __attribute__((packed));
 
+struct qeth_query_oat {
+        __u32 subcmd_code;
+        __u8 reserved[12];
+} __packed;
+
+struct qeth_qoat_priv {
+        __u32 buffer_len;
+        __u32 response_len;
+        char *buffer;
+};
+
 struct qeth_ipacmd_setadpparms_hdr {
         __u32 supp_hw_cmds;
         __u32 reserved1;
@@ -417,6 +429,7 @@ struct qeth_ipacmd_setadpparms {
                 struct qeth_change_addr change_addr;
                 struct qeth_snmp_cmd snmp;
                 struct qeth_set_access_ctrl set_access_ctrl;
+                struct qeth_query_oat query_oat;
                 __u32 mode;
         } data;
 } __attribute__ ((packed));
diff --git a/drivers/s390/net/qeth_l2_main.c b/drivers/s390/net/qeth_l2_main.c
index c12967133114..e5c9cf15e5c6 100644
--- a/drivers/s390/net/qeth_l2_main.c
+++ b/drivers/s390/net/qeth_l2_main.c
@@ -75,6 +75,9 @@ static int qeth_l2_do_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
                         mii_data->val_out = qeth_mdio_read(dev,
                                 mii_data->phy_id, mii_data->reg_num);
                 break;
+        case SIOC_QETH_QUERY_OAT:
+                rc = qeth_query_oat_command(card, rq->ifr_ifru.ifru_data);
+                break;
         default:
                 rc = -EOPNOTSUPP;
         }
diff --git a/drivers/s390/net/qeth_l3_main.c b/drivers/s390/net/qeth_l3_main.c
index 9648e4e68337..73bf8889984b 100644
--- a/drivers/s390/net/qeth_l3_main.c
+++ b/drivers/s390/net/qeth_l3_main.c
@@ -28,6 +28,8 @@
 
 #include <net/ip.h>
 #include <net/arp.h>
+#include <net/route.h>
+#include <net/ip6_fib.h>
 #include <net/ip6_checksum.h>
 #include <net/iucv/af_iucv.h>
 
@@ -2743,6 +2745,9 @@ static int qeth_l3_do_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
                                                         mii_data->phy_id,
                                                         mii_data->reg_num);
                 break;
+        case SIOC_QETH_QUERY_OAT:
+                rc = qeth_query_oat_command(card, rq->ifr_ifru.ifru_data);
+                break;
         default:
                 rc = -EOPNOTSUPP;
         }
@@ -2832,7 +2837,6 @@ static void qeth_l3_fill_af_iucv_hdr(struct qeth_card *card,
 static void qeth_l3_fill_header(struct qeth_card *card, struct qeth_hdr *hdr,
                 struct sk_buff *skb, int ipv, int cast_type)
 {
-        struct neighbour *n = NULL;
         struct dst_entry *dst;
 
         memset(hdr, 0, sizeof(struct qeth_hdr));
@@ -2855,33 +2859,29 @@ static void qeth_l3_fill_header(struct qeth_card *card, struct qeth_hdr *hdr,
 
         rcu_read_lock();
         dst = skb_dst(skb);
-        if (dst)
-                n = dst_get_neighbour_noref(dst);
         if (ipv == 4) {
+                struct rtable *rt = (struct rtable *) dst;
+                __be32 *pkey = &ip_hdr(skb)->daddr;
+
+                if (rt->rt_gateway)
+                        pkey = &rt->rt_gateway;
+
                 /* IPv4 */
                 hdr->hdr.l3.flags = qeth_l3_get_qeth_hdr_flags4(cast_type);
                 memset(hdr->hdr.l3.dest_addr, 0, 12);
-                if (n) {
-                        *((u32 *) (&hdr->hdr.l3.dest_addr[12])) =
-                            *((u32 *) n->primary_key);
-                } else {
-                        /* fill in destination address used in ip header */
-                        *((u32 *) (&hdr->hdr.l3.dest_addr[12])) =
-                                                        ip_hdr(skb)->daddr;
-                }
+                *((__be32 *) (&hdr->hdr.l3.dest_addr[12])) = *pkey;
         } else if (ipv == 6) {
+                struct rt6_info *rt = (struct rt6_info *) dst;
+                struct in6_addr *pkey = &ipv6_hdr(skb)->daddr;
+
+                if (!ipv6_addr_any(&rt->rt6i_gateway))
+                        pkey = &rt->rt6i_gateway;
+
                 /* IPv6 */
                 hdr->hdr.l3.flags = qeth_l3_get_qeth_hdr_flags6(cast_type);
                 if (card->info.type == QETH_CARD_TYPE_IQD)
                         hdr->hdr.l3.flags &= ~QETH_HDR_PASSTHRU;
-                if (n) {
-                        memcpy(hdr->hdr.l3.dest_addr,
-                               n->primary_key, 16);
-                } else {
-                        /* fill in destination address used in ip header */
-                        memcpy(hdr->hdr.l3.dest_addr,
-                               &ipv6_hdr(skb)->daddr, 16);
-                }
+                memcpy(hdr->hdr.l3.dest_addr, pkey, 16);
         } else {
                 /* passthrough */
                 if ((skb->dev->type == ARPHRD_IEEE802_TR) &&
diff --git a/drivers/ssb/pci.c b/drivers/ssb/pci.c
index 973223f5de8e..befa89eac6f3 100644
--- a/drivers/ssb/pci.c
+++ b/drivers/ssb/pci.c
@@ -523,7 +523,13 @@ static void sprom_extract_r45(struct ssb_sprom *out, const u16 *in)
 static void sprom_extract_r8(struct ssb_sprom *out, const u16 *in)
 {
         int i;
-        u16 v;
+        u16 v, o;
+        u16 pwr_info_offset[] = {
+                SSB_SROM8_PWR_INFO_CORE0, SSB_SROM8_PWR_INFO_CORE1,
+                SSB_SROM8_PWR_INFO_CORE2, SSB_SROM8_PWR_INFO_CORE3
+        };
+        BUILD_BUG_ON(ARRAY_SIZE(pwr_info_offset) !=
+                        ARRAY_SIZE(out->core_pwr_info));
 
         /* extract the MAC address */
         for (i = 0; i < 3; i++) {
@@ -607,6 +613,38 @@ static void sprom_extract_r8(struct ssb_sprom *out, const u16 *in)
         memcpy(&out->antenna_gain.ghz5, &out->antenna_gain.ghz24,
                sizeof(out->antenna_gain.ghz5));
 
+        /* Extract cores power info info */
+        for (i = 0; i < ARRAY_SIZE(pwr_info_offset); i++) {
+                o = pwr_info_offset[i];
+                SPEX(core_pwr_info[i].itssi_2g, o + SSB_SROM8_2G_MAXP_ITSSI,
+                        SSB_SPROM8_2G_ITSSI, SSB_SPROM8_2G_ITSSI_SHIFT);
+                SPEX(core_pwr_info[i].maxpwr_2g, o + SSB_SROM8_2G_MAXP_ITSSI,
+                        SSB_SPROM8_2G_MAXP, 0);
+
+                SPEX(core_pwr_info[i].pa_2g[0], o + SSB_SROM8_2G_PA_0, ~0, 0);
+                SPEX(core_pwr_info[i].pa_2g[1], o + SSB_SROM8_2G_PA_1, ~0, 0);
+                SPEX(core_pwr_info[i].pa_2g[2], o + SSB_SROM8_2G_PA_2, ~0, 0);
+
+                SPEX(core_pwr_info[i].itssi_5g, o + SSB_SROM8_5G_MAXP_ITSSI,
+                        SSB_SPROM8_5G_ITSSI, SSB_SPROM8_5G_ITSSI_SHIFT);
+                SPEX(core_pwr_info[i].maxpwr_5g, o + SSB_SROM8_5G_MAXP_ITSSI,
+                        SSB_SPROM8_5G_MAXP, 0);
+                SPEX(core_pwr_info[i].maxpwr_5gh, o + SSB_SPROM8_5GHL_MAXP,
+                        SSB_SPROM8_5GH_MAXP, 0);
+                SPEX(core_pwr_info[i].maxpwr_5gl, o + SSB_SPROM8_5GHL_MAXP,
+                        SSB_SPROM8_5GL_MAXP, SSB_SPROM8_5GL_MAXP_SHIFT);
+
+                SPEX(core_pwr_info[i].pa_5gl[0], o + SSB_SROM8_5GL_PA_0, ~0, 0);
+                SPEX(core_pwr_info[i].pa_5gl[1], o + SSB_SROM8_5GL_PA_1, ~0, 0);
+                SPEX(core_pwr_info[i].pa_5gl[2], o + SSB_SROM8_5GL_PA_2, ~0, 0);
+                SPEX(core_pwr_info[i].pa_5g[0], o + SSB_SROM8_5G_PA_0, ~0, 0);
+                SPEX(core_pwr_info[i].pa_5g[1], o + SSB_SROM8_5G_PA_1, ~0, 0);
+                SPEX(core_pwr_info[i].pa_5g[2], o + SSB_SROM8_5G_PA_2, ~0, 0);
+                SPEX(core_pwr_info[i].pa_5gh[0], o + SSB_SROM8_5GH_PA_0, ~0, 0);
+                SPEX(core_pwr_info[i].pa_5gh[1], o + SSB_SROM8_5GH_PA_1, ~0, 0);
+                SPEX(core_pwr_info[i].pa_5gh[2], o + SSB_SROM8_5GH_PA_2, ~0, 0);
+        }
+
         /* Extract FEM info */
         SPEX(fem.ghz2.tssipos, SSB_SPROM8_FEM2G,
                 SSB_SROM8_FEM_TSSIPOS, SSB_SROM8_FEM_TSSIPOS_SHIFT);
diff --git a/include/linux/can/dev.h b/include/linux/can/dev.h
index a0969fcb72b9..5d2efe7e3f1b 100644
--- a/include/linux/can/dev.h
+++ b/include/linux/can/dev.h
@@ -92,7 +92,7 @@ void can_bus_off(struct net_device *dev);
 
 void can_put_echo_skb(struct sk_buff *skb, struct net_device *dev,
                       unsigned int idx);
-void can_get_echo_skb(struct net_device *dev, unsigned int idx);
+unsigned int can_get_echo_skb(struct net_device *dev, unsigned int idx);
 void can_free_echo_skb(struct net_device *dev, unsigned int idx);
 
 struct sk_buff *alloc_can_skb(struct net_device *dev, struct can_frame **cf);
diff --git a/include/linux/in.h b/include/linux/in.h
index 01129c0ea87c..e0337f11d92e 100644
--- a/include/linux/in.h
+++ b/include/linux/in.h
@@ -111,6 +111,7 @@ struct in_addr {
 #define MCAST_LEAVE_SOURCE_GROUP        47
 #define MCAST_MSFILTER                  48
 #define IP_MULTICAST_ALL                49
+#define IP_UNICAST_IF                   50
 
 #define MCAST_EXCLUDE   0
 #define MCAST_INCLUDE   1
diff --git a/include/linux/in6.h b/include/linux/in6.h
index 097a34b55560..5c83d9e3eb8f 100644
--- a/include/linux/in6.h
+++ b/include/linux/in6.h
@@ -271,6 +271,7 @@ struct in6_flowlabel_req {
 #define IPV6_ORIGDSTADDR        74
 #define IPV6_RECVORIGDSTADDR    IPV6_ORIGDSTADDR
 #define IPV6_TRANSPARENT        75
+#define IPV6_UNICAST_IF         76
 
 /*
  * Multicast Routing:
diff --git a/include/linux/ipv6.h b/include/linux/ipv6.h
index 6318268dcaf5..743a16a41040 100644
--- a/include/linux/ipv6.h
+++ b/include/linux/ipv6.h
@@ -324,6 +324,7 @@ struct ipv6_pinfo {
                                 __unused_2:6;
         __s16                   mcast_hops:9;
 #endif
+        int                     ucast_oif;
         int                     mcast_oif;
 
         /* pktoption flags */
diff --git a/include/linux/netlink.h b/include/linux/netlink.h
index 52e48959cfa1..a390e9d54827 100644
--- a/include/linux/netlink.h
+++ b/include/linux/netlink.h
@@ -237,22 +237,8 @@ struct netlink_notify {
         int protocol;
 };
 
-static __inline__ struct nlmsghdr *
-__nlmsg_put(struct sk_buff *skb, u32 pid, u32 seq, int type, int len, int flags)
-{
-        struct nlmsghdr *nlh;
-        int size = NLMSG_LENGTH(len);
-
-        nlh = (struct nlmsghdr*)skb_put(skb, NLMSG_ALIGN(size));
-        nlh->nlmsg_type = type;
-        nlh->nlmsg_len = size;
-        nlh->nlmsg_flags = flags;
-        nlh->nlmsg_pid = pid;
-        nlh->nlmsg_seq = seq;
-        if (!__builtin_constant_p(size) || NLMSG_ALIGN(size) - size != 0)
-                memset(NLMSG_DATA(nlh) + len, 0, NLMSG_ALIGN(size) - size);
-        return nlh;
-}
+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))) \
diff --git a/include/linux/nfc.h b/include/linux/nfc.h
index 01d4e5d60325..b4999abcb2a2 100644
--- a/include/linux/nfc.h
+++ b/include/linux/nfc.h
@@ -89,6 +89,8 @@ enum nfc_commands {
  * @NFC_ATTR_TARGET_SEL_RES: NFC-A targets extra information (useful if the
  *      target is not NFC-Forum compliant)
  * @NFC_ATTR_TARGET_NFCID1: NFC-A targets identifier, max 10 bytes
+ * @NFC_ATTR_TARGET_SENSB_RES: NFC-B targets extra information, max 12 bytes
+ * @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
  */
@@ -101,6 +103,8 @@ enum nfc_attrs {
         NFC_ATTR_TARGET_SENS_RES,
         NFC_ATTR_TARGET_SEL_RES,
         NFC_ATTR_TARGET_NFCID1,
+        NFC_ATTR_TARGET_SENSB_RES,
+        NFC_ATTR_TARGET_SENSF_RES,
         NFC_ATTR_COMM_MODE,
         NFC_ATTR_RF_MODE,
 /* private: internal use only */
@@ -109,6 +113,9 @@ enum nfc_attrs {
 #define NFC_ATTR_MAX (__NFC_ATTR_AFTER_LAST - 1)
 
 #define NFC_DEVICE_NAME_MAXSIZE 8
+#define NFC_NFCID1_MAXSIZE 10
+#define NFC_SENSB_RES_MAXSIZE 12
+#define NFC_SENSF_RES_MAXSIZE 18
 
 /* NFC protocols */
 #define NFC_PROTO_JEWEL         1
diff --git a/include/linux/nl80211.h b/include/linux/nl80211.h
index 0f5ff3739820..ad56e21a9f10 100644
--- a/include/linux/nl80211.h
+++ b/include/linux/nl80211.h
@@ -1475,6 +1475,7 @@ enum nl80211_attrs {
 #define NL80211_ATTR_FEATURE_FLAGS NL80211_ATTR_FEATURE_FLAGS
 
 #define NL80211_MAX_SUPP_RATES                  32
+#define NL80211_MAX_SUPP_HT_RATES               77
 #define NL80211_MAX_SUPP_REG_RULES              32
 #define NL80211_TKIP_DATA_OFFSET_ENCR_KEY       0
 #define NL80211_TKIP_DATA_OFFSET_TX_MIC_KEY     16
@@ -2104,6 +2105,9 @@ enum nl80211_mntr_flags {
  * 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)
+ *
  * @NL80211_MESHCONF_ATTR_MAX: highest possible mesh configuration attribute
  *
  * @__NL80211_MESHCONF_ATTR_AFTER_LAST: internal use
@@ -2128,6 +2132,7 @@ enum nl80211_meshconf_params {
         NL80211_MESHCONF_HWMP_RANN_INTERVAL,
         NL80211_MESHCONF_GATE_ANNOUNCEMENTS,
         NL80211_MESHCONF_HWMP_PERR_MIN_INTERVAL,
+        NL80211_MESHCONF_FORWARDING,
 
         /* keep last */
         __NL80211_MESHCONF_ATTR_AFTER_LAST,
@@ -2401,12 +2406,15 @@ enum nl80211_key_attributes {
  *      in an array of rates as defined in IEEE 802.11 7.3.2.2 (u8 values with
  *      1 = 500 kbps) but without the IE length restriction (at most
  *      %NL80211_MAX_SUPP_RATES in a single array).
+ * @NL80211_TXRATE_MCS: HT (MCS) rates allowed for TX rate selection
+ *      in an array of MCS numbers.
  * @__NL80211_TXRATE_AFTER_LAST: internal
  * @NL80211_TXRATE_MAX: highest TX rate attribute
  */
 enum nl80211_tx_rate_attributes {
         __NL80211_TXRATE_INVALID,
         NL80211_TXRATE_LEGACY,
+        NL80211_TXRATE_MCS,
 
         /* keep last */
         __NL80211_TXRATE_AFTER_LAST,
diff --git a/include/linux/pkt_sched.h b/include/linux/pkt_sched.h
index 0d5b79365d03..410b33d014d2 100644
--- a/include/linux/pkt_sched.h
+++ b/include/linux/pkt_sched.h
@@ -127,6 +127,27 @@ struct tc_multiq_qopt {
         __u16   max_bands;              /* Maximum number of queues */
 };
 
+/* PLUG section */
+
+#define TCQ_PLUG_BUFFER                0
+#define TCQ_PLUG_RELEASE_ONE           1
+#define TCQ_PLUG_RELEASE_INDEFINITE    2
+#define TCQ_PLUG_LIMIT                 3
+
+struct tc_plug_qopt {
+        /* TCQ_PLUG_BUFFER: Inset a plug into the queue and
+         *  buffer any incoming packets
+         * TCQ_PLUG_RELEASE_ONE: Dequeue packets from queue head
+         *   to beginning of the next plug.
+         * TCQ_PLUG_RELEASE_INDEFINITE: Dequeue all packets from queue.
+         *   Stop buffering packets until the next TCQ_PLUG_BUFFER
+         *   command is received (just act as a pass-thru queue).
+         * TCQ_PLUG_LIMIT: Increase/decrease queue size
+         */
+        int             action;
+        __u32           limit;
+};
+
 /* TBF section */
 
 struct tc_tbf_qopt {
diff --git a/include/linux/snmp.h b/include/linux/snmp.h
index c1241c428179..8ee8af4e6da9 100644
--- a/include/linux/snmp.h
+++ b/include/linux/snmp.h
@@ -232,6 +232,7 @@ enum
         LINUX_MIB_TCPTIMEWAITOVERFLOW,          /* TCPTimeWaitOverflow */
         LINUX_MIB_TCPREQQFULLDOCOOKIES,         /* TCPReqQFullDoCookies */
         LINUX_MIB_TCPREQQFULLDROP,              /* TCPReqQFullDrop */
+        LINUX_MIB_TCPRETRANSFAIL,               /* TCPRetransFail */
         __LINUX_MIB_MAX
 };
 
diff --git a/include/linux/ssb/ssb.h b/include/linux/ssb/ssb.h
index dcf35b0f303a..bbc2612cb64a 100644
--- a/include/linux/ssb/ssb.h
+++ b/include/linux/ssb/ssb.h
@@ -16,6 +16,12 @@ struct pcmcia_device;
 struct ssb_bus;
 struct ssb_driver;
 
+struct ssb_sprom_core_pwr_info {
+        u8 itssi_2g, itssi_5g;
+        u8 maxpwr_2g, maxpwr_5gl, maxpwr_5g, maxpwr_5gh;
+        u16 pa_2g[3], pa_5gl[3], pa_5g[3], pa_5gh[3];
+};
+
 struct ssb_sprom {
         u8 revision;
         u8 il0mac[6];           /* MAC address for 802.11b/g */
@@ -82,6 +88,8 @@ struct ssb_sprom {
         u16 boardflags2_hi;     /* Board flags (bits 48-63) */
         /* TODO store board flags in a single u64 */
 
+        struct ssb_sprom_core_pwr_info core_pwr_info[4];
+
         /* Antenna gain values for up to 4 antennas
          * on each band. Values in dBm/4 (Q5.2). Negative gain means the
          * loss in the connectors is bigger than the gain. */
diff --git a/include/linux/ssb/ssb_regs.h b/include/linux/ssb/ssb_regs.h
index c814ae6eeb22..40b1ef8595ee 100644
--- a/include/linux/ssb/ssb_regs.h
+++ b/include/linux/ssb/ssb_regs.h
@@ -449,6 +449,39 @@
 #define SSB_SPROM8_TS_SLP_OPT_CORRX     0x00B6
 #define SSB_SPROM8_FOC_HWIQ_IQSWP       0x00B8
 #define SSB_SPROM8_PHYCAL_TEMPDELTA     0x00BA
+
+/* There are 4 blocks with power info sharing the same layout */
+#define SSB_SROM8_PWR_INFO_CORE0        0x00C0
+#define SSB_SROM8_PWR_INFO_CORE1        0x00E0
+#define SSB_SROM8_PWR_INFO_CORE2        0x0100
+#define SSB_SROM8_PWR_INFO_CORE3        0x0120
+
+#define SSB_SROM8_2G_MAXP_ITSSI         0x00
+#define  SSB_SPROM8_2G_MAXP             0x00FF
+#define  SSB_SPROM8_2G_ITSSI            0xFF00
+#define  SSB_SPROM8_2G_ITSSI_SHIFT      8
+#define SSB_SROM8_2G_PA_0               0x02    /* 2GHz power amp settings */
+#define SSB_SROM8_2G_PA_1               0x04
+#define SSB_SROM8_2G_PA_2               0x06
+#define SSB_SROM8_5G_MAXP_ITSSI         0x08    /* 5GHz ITSSI and 5.3GHz Max Power */
+#define  SSB_SPROM8_5G_MAXP             0x00FF
+#define  SSB_SPROM8_5G_ITSSI            0xFF00
+#define  SSB_SPROM8_5G_ITSSI_SHIFT      8
+#define SSB_SPROM8_5GHL_MAXP            0x0A    /* 5.2GHz and 5.8GHz Max Power */
+#define  SSB_SPROM8_5GH_MAXP            0x00FF
+#define  SSB_SPROM8_5GL_MAXP            0xFF00
+#define  SSB_SPROM8_5GL_MAXP_SHIFT      8
+#define SSB_SROM8_5G_PA_0               0x0C    /* 5.3GHz power amp settings */
+#define SSB_SROM8_5G_PA_1               0x0E
+#define SSB_SROM8_5G_PA_2               0x10
+#define SSB_SROM8_5GL_PA_0              0x12    /* 5.2GHz power amp settings */
+#define SSB_SROM8_5GL_PA_1              0x14
+#define SSB_SROM8_5GL_PA_2              0x16
+#define SSB_SROM8_5GH_PA_0              0x18    /* 5.8GHz power amp settings */
+#define SSB_SROM8_5GH_PA_1              0x1A
+#define SSB_SROM8_5GH_PA_2              0x1C
+
+/* TODO: Make it deprecated */
 #define SSB_SPROM8_MAXP_BG              0x00C0  /* Max Power 2GHz in path 1 */
 #define  SSB_SPROM8_MAXP_BG_MASK        0x00FF  /* Mask for Max Power 2GHz */
 #define  SSB_SPROM8_ITSSI_BG            0xFF00  /* Mask for path 1 itssi_bg */
@@ -473,6 +506,7 @@
 #define SSB_SPROM8_PA1HIB0              0x00D8  /* 5.8GHz power amp settings */
 #define SSB_SPROM8_PA1HIB1              0x00DA
 #define SSB_SPROM8_PA1HIB2              0x00DC
+
 #define SSB_SPROM8_CCK2GPO              0x0140  /* CCK power offset */
 #define SSB_SPROM8_OFDM2GPO             0x0142  /* 2.4GHz OFDM power offset */
 #define SSB_SPROM8_OFDM5GPO             0x0146  /* 5.3GHz OFDM power offset */
diff --git a/include/linux/tcp.h b/include/linux/tcp.h
index 46a85c9e1f25..115389e9b945 100644
--- a/include/linux/tcp.h
+++ b/include/linux/tcp.h
@@ -463,7 +463,7 @@ struct tcp_sock {
         const struct tcp_sock_af_ops    *af_specific;
 
 /* TCP MD5 Signature Option information */
-        struct tcp_md5sig_info  *md5sig_info;
+        struct tcp_md5sig_info  __rcu *md5sig_info;
 #endif
 
         /* When the cookie options are generated and exchanged, then this
@@ -486,8 +486,7 @@ struct tcp_timewait_sock {
         u32                       tw_ts_recent;
         long                      tw_ts_recent_stamp;
 #ifdef CONFIG_TCP_MD5SIG
-        u16                       tw_md5_keylen;
-        u8                        tw_md5_key[TCP_MD5SIG_MAXKEYLEN];
+        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/net/addrconf.h b/include/net/addrconf.h
index f68dce2d8d88..757a17638b1b 100644
--- a/include/net/addrconf.h
+++ b/include/net/addrconf.h
@@ -160,7 +160,6 @@ extern void addrconf_prefix_rcv(struct net_device *dev,
 extern int ipv6_sock_ac_join(struct sock *sk,int ifindex, const struct in6_addr *addr);
 extern int ipv6_sock_ac_drop(struct sock *sk,int ifindex, const struct in6_addr *addr);
 extern void ipv6_sock_ac_close(struct sock *sk);
-extern int inet6_ac_check(struct sock *sk, const struct in6_addr *addr, int ifindex);
 
 extern int ipv6_dev_ac_inc(struct net_device *dev, const struct in6_addr *addr);
 extern int __ipv6_dev_ac_dec(struct inet6_dev *idev, const struct in6_addr *addr);
diff --git a/include/net/caif/caif_hsi.h b/include/net/caif/caif_hsi.h
index 8d552519ff67..6db8ecf52aa2 100644
--- a/include/net/caif/caif_hsi.h
+++ b/include/net/caif/caif_hsi.h
@@ -138,6 +138,7 @@ struct cfhsi {
         u8 *rx_ptr;
         u8 *tx_buf;
         u8 *rx_buf;
+        u8 *rx_flip_buf;
         spinlock_t lock;
         int flow_off_sent;
         u32 q_low_mark;
diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h
index a067d30ce73e..2964205332f4 100644
--- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h
@@ -120,6 +120,7 @@ enum ieee80211_channel_flags {
  * @band: band this channel belongs to.
  * @max_antenna_gain: maximum antenna gain in dBi
  * @max_power: maximum transmission power (in dBm)
+ * @max_reg_power: maximum regulatory transmission power (in dBm)
  * @beacon_found: helper to regulatory code to indicate when a beacon
  *      has been found on this channel. Use regulatory_hint_found_beacon()
  *      to enable this, this is useful only on 5 GHz band.
@@ -133,6 +134,7 @@ struct ieee80211_channel {
         u32 flags;
         int max_antenna_gain;
         int max_power;
+        int max_reg_power;
         bool beacon_found;
         u32 orig_flags;
         int orig_mag, orig_mpwr;
@@ -796,6 +798,7 @@ struct mesh_config {
          * 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 dot11MeshForwarding;
 };
 
 /**
@@ -1229,8 +1232,7 @@ enum wiphy_params_flags {
 struct cfg80211_bitrate_mask {
         struct {
                 u32 legacy;
-                /* TODO: add support for masking MCS rates; e.g.: */
-                /* u8 mcs[IEEE80211_HT_MCS_MASK_LEN]; */
+                u8 mcs[IEEE80211_HT_MCS_MASK_LEN];
         } control[IEEE80211_NUM_BANDS];
 };
 /**
diff --git a/include/net/genetlink.h b/include/net/genetlink.h
index 7db32995ccd3..ccb68880abf5 100644
--- a/include/net/genetlink.h
+++ b/include/net/genetlink.h
@@ -131,35 +131,8 @@ extern void genl_unregister_mc_group(struct genl_family *family,
 extern void genl_notify(struct sk_buff *skb, struct net *net, u32 pid,
                         u32 group, struct nlmsghdr *nlh, gfp_t flags);
 
-/**
- * genlmsg_put - Add generic netlink header to netlink message
- * @skb: socket buffer holding the message
- * @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
- * @cmd: generic netlink command
- *
- * Returns pointer to user specific header
- */
-static inline void *genlmsg_put(struct sk_buff *skb, u32 pid, u32 seq,
-                                struct genl_family *family, int flags, u8 cmd)
-{
-        struct nlmsghdr *nlh;
-        struct genlmsghdr *hdr;
-
-        nlh = nlmsg_put(skb, pid, seq, family->id, GENL_HDRLEN +
-                        family->hdrsize, flags);
-        if (nlh == NULL)
-                return NULL;
-
-        hdr = nlmsg_data(nlh);
-        hdr->cmd = cmd;
-        hdr->version = family->version;
-        hdr->reserved = 0;
-
-        return (char *) hdr + GENL_HDRLEN;
-}
+void *genlmsg_put(struct sk_buff *skb, u32 pid, u32 seq,
+                                struct genl_family *family, int flags, u8 cmd);
 
 /**
  * genlmsg_nlhdr - Obtain netlink header from user specified header
diff --git a/include/net/inet_sock.h b/include/net/inet_sock.h
index e3e405106afe..022f772c0ebe 100644
--- a/include/net/inet_sock.h
+++ b/include/net/inet_sock.h
@@ -132,6 +132,7 @@ struct rtable;
  * @tos - TOS
  * @mc_ttl - Multicasting TTL
  * @is_icsk - is this an inet_connection_sock?
+ * @uc_index - Unicast outgoing device index
  * @mc_index - Multicast device index
  * @mc_list - Group array
  * @cork - info to build ip hdr on each ip frag while socket is corked
@@ -167,6 +168,7 @@ struct inet_sock {
                                 transparent:1,
                                 mc_all:1,
                                 nodefrag:1;
+        int                     uc_index;
         int                     mc_index;
         __be32                  mc_addr;
         struct ip_mc_socklist __rcu     *mc_list;
diff --git a/include/net/iucv/af_iucv.h b/include/net/iucv/af_iucv.h
index 0954ec959159..2e1d5ecc2d1b 100644
--- a/include/net/iucv/af_iucv.h
+++ b/include/net/iucv/af_iucv.h
@@ -113,6 +113,7 @@ struct iucv_sock {
         spinlock_t              accept_q_lock;
         struct sock             *parent;
         struct iucv_path        *path;
+        struct net_device       *hs_dev;
         struct sk_buff_head     send_skb_q;
         struct sk_buff_head     backlog_skb_q;
         struct sock_msg_q       message_q;
@@ -131,6 +132,7 @@ struct iucv_sock {
 /* iucv socket options (SOL_IUCV) */
 #define SO_IPRMDATA_MSG 0x0080          /* send/recv IPRM_DATA msgs */
 #define SO_MSGLIMIT     0x1000          /* get/set IUCV MSGLIMIT */
+#define SO_MSGSIZE      0x0800          /* get maximum msgsize */
 
 /* iucv related control messages (scm) */
 #define SCM_IUCV_TRGCLS 0x0001          /* target class control message */
diff --git a/include/net/mac80211.h b/include/net/mac80211.h
index d49928ba5d09..520eb4c5e5a2 100644
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -852,6 +852,21 @@ struct ieee80211_channel_switch {
 };
 
 /**
+ * enum ieee80211_vif_flags - virtual interface flags
+ *
+ * @IEEE80211_VIF_BEACON_FILTER: the device performs beacon filtering
+ *      on this virtual interface to avoid unnecessary CPU wakeups
+ * @IEEE80211_VIF_SUPPORTS_CQM_RSSI: the device can do connection quality
+ *      monitoring on this virtual interface -- i.e. it can monitor
+ *      connection quality related parameters, such as the RSSI level and
+ *      provide notifications if configured trigger levels are reached.
+ */
+enum ieee80211_vif_flags {
+        IEEE80211_VIF_BEACON_FILTER             = BIT(0),
+        IEEE80211_VIF_SUPPORTS_CQM_RSSI         = BIT(1),
+};
+
+/**
  * struct ieee80211_vif - per-interface data
  *
  * Data in this structure is continually present for driver
@@ -863,6 +878,10 @@ struct ieee80211_channel_switch {
  * @addr: address of this interface
  * @p2p: indicates whether this AP or STA interface is a p2p
  *      interface, i.e. a GO or p2p-sta respectively
+ * @driver_flags: flags/capabilities the driver has for this interface,
+ *      these need to be set (or cleared) when the interface is added
+ *      or, if supported by the driver, the interface type is changed
+ *      at runtime, mac80211 will never touch this field
  * @drv_priv: data area for driver use, will always be aligned to
  *      sizeof(void *).
  */
@@ -871,6 +890,7 @@ struct ieee80211_vif {
         struct ieee80211_bss_conf bss_conf;
         u8 addr[ETH_ALEN];
         bool p2p;
+        u32 driver_flags;
         /* must be last */
         u8 drv_priv[0] __attribute__((__aligned__(sizeof(void *))));
 };
@@ -1079,10 +1099,6 @@ enum sta_notify_cmd {
  * @IEEE80211_HW_MFP_CAPABLE:
  *      Hardware supports management frame protection (MFP, IEEE 802.11w).
  *
- * @IEEE80211_HW_BEACON_FILTER:
- *      Hardware supports dropping of irrelevant beacon frames to
- *      avoid waking up cpu.
- *
  * @IEEE80211_HW_SUPPORTS_STATIC_SMPS:
  *      Hardware supports static spatial multiplexing powersave,
  *      ie. can turn off all but one chain even on HT connections
@@ -1108,11 +1124,6 @@ enum sta_notify_cmd {
  *      When this flag is set, signaling beacon-loss will cause an immediate
  *      change to disassociated state.
  *
- * @IEEE80211_HW_SUPPORTS_CQM_RSSI:
- *      Hardware can do connection quality monitoring - i.e. it can monitor
- *      connection quality related parameters, such as the RSSI level and
- *      provide notifications if configured trigger levels are reached.
- *
  * @IEEE80211_HW_NEED_DTIM_PERIOD:
  *      This device needs to know the DTIM period for the BSS before
  *      associating.
@@ -1150,13 +1161,13 @@ enum ieee80211_hw_flags {
         IEEE80211_HW_PS_NULLFUNC_STACK                  = 1<<11,
         IEEE80211_HW_SUPPORTS_DYNAMIC_PS                = 1<<12,
         IEEE80211_HW_MFP_CAPABLE                        = 1<<13,
-        IEEE80211_HW_BEACON_FILTER                      = 1<<14,
+        /* reuse bit 14 */
         IEEE80211_HW_SUPPORTS_STATIC_SMPS               = 1<<15,
         IEEE80211_HW_SUPPORTS_DYNAMIC_SMPS              = 1<<16,
         IEEE80211_HW_SUPPORTS_UAPSD                     = 1<<17,
         IEEE80211_HW_REPORTS_TX_ACK_STATUS              = 1<<18,
         IEEE80211_HW_CONNECTION_MONITOR                 = 1<<19,
-        IEEE80211_HW_SUPPORTS_CQM_RSSI                  = 1<<20,
+        /* reuse bit 20 */
         IEEE80211_HW_SUPPORTS_PER_STA_GTK               = 1<<21,
         IEEE80211_HW_AP_LINK_PS                         = 1<<22,
         IEEE80211_HW_TX_AMPDU_SETUP_IN_HW               = 1<<23,
@@ -1446,8 +1457,8 @@ void ieee80211_free_txskb(struct ieee80211_hw *hw, struct sk_buff *skb);
  * way the host will only receive beacons where some relevant information
  * (for example ERP protection or WMM settings) have changed.
  *
- * Beacon filter support is advertised with the %IEEE80211_HW_BEACON_FILTER
- * hardware capability. The driver needs to enable beacon filter support
+ * Beacon filter support is advertised with the %IEEE80211_VIF_BEACON_FILTER
+ * interface capability. The driver needs to enable beacon filter support
  * whenever power save is enabled, that is %IEEE80211_CONF_PS is set. When
  * power save is enabled, the stack will not check for beacon loss and the
  * driver needs to notify about loss of beacons with ieee80211_beacon_loss().
@@ -3316,7 +3327,7 @@ struct sk_buff *ieee80211_ap_probereq_get(struct ieee80211_hw *hw,
  *
  * @vif: &struct ieee80211_vif pointer from the add_interface callback.
  *
- * When beacon filtering is enabled with %IEEE80211_HW_BEACON_FILTER and
+ * When beacon filtering is enabled with %IEEE80211_VIF_BEACON_FILTER and
  * %IEEE80211_CONF_PS is set, the driver needs to inform whenever the
  * hardware is not receiving beacons with this function.
  */
@@ -3327,7 +3338,7 @@ void ieee80211_beacon_loss(struct ieee80211_vif *vif);
  *
  * @vif: &struct ieee80211_vif pointer from the add_interface callback.
  *
- * When beacon filtering is enabled with %IEEE80211_HW_BEACON_FILTER, and
+ * When beacon filtering is enabled with %IEEE80211_VIF_BEACON_FILTER, and
  * %IEEE80211_CONF_PS and %IEEE80211_HW_CONNECTION_MONITOR are set, the driver
  * needs to inform if the connection to the AP has been lost.
  *
@@ -3397,7 +3408,7 @@ void ieee80211_enable_dyn_ps(struct ieee80211_vif *vif);
  * @rssi_event: the RSSI trigger event type
  * @gfp: context flags
  *
- * When the %IEEE80211_HW_SUPPORTS_CQM_RSSI is set, and a connection quality
+ * When the %IEEE80211_VIF_SUPPORTS_CQM_RSSI is set, and a connection quality
  * monitoring is configured with an rssi threshold, the driver will inform
  * whenever the rssi level reaches the threshold.
  */
@@ -3540,6 +3551,7 @@ struct ieee80211_tx_rate_control {
         bool rts, short_preamble;
         u8 max_rate_idx;
         u32 rate_idx_mask;
+        u8 rate_idx_mcs_mask[IEEE80211_HT_MCS_MASK_LEN];
         bool bss;
 };
 
diff --git a/include/net/ndisc.h b/include/net/ndisc.h
index e3133c23980e..6f9c25a76cd1 100644
--- a/include/net/ndisc.h
+++ b/include/net/ndisc.h
@@ -133,7 +133,6 @@ extern void			ndisc_send_rs(struct net_device *dev,
                                               const struct in6_addr *daddr);
 
 extern void                     ndisc_send_redirect(struct sk_buff *skb,
-                                                    struct neighbour *neigh,
                                                     const struct in6_addr *target);
 
 extern int                      ndisc_mc_map(const struct in6_addr *addr, char *buf,
diff --git a/include/net/netlink.h b/include/net/netlink.h
index cb1f3504687f..f394fe5d7641 100644
--- a/include/net/netlink.h
+++ b/include/net/netlink.h
@@ -441,41 +441,6 @@ static inline int nlmsg_report(const struct nlmsghdr *nlh)
         nla_for_each_attr(pos, nlmsg_attrdata(nlh, hdrlen), \
                           nlmsg_attrlen(nlh, hdrlen), rem)
 
-#if 0
-/* FIXME: Enable once all users have been converted */
-
-/**
- * __nlmsg_put - Add a new netlink message to an skb
- * @skb: socket buffer to store message in
- * @pid: netlink process id
- * @seq: sequence number of message
- * @type: message type
- * @payload: length of message payload
- * @flags: message flags
- *
- * The caller is responsible to ensure that the skb provides enough
- * tailroom for both the netlink header and payload.
- */
-static inline struct nlmsghdr *__nlmsg_put(struct sk_buff *skb, u32 pid,
-                                           u32 seq, int type, int payload,
-                                           int flags)
-{
-        struct nlmsghdr *nlh;
-
-        nlh = (struct nlmsghdr *) skb_put(skb, nlmsg_total_size(payload));
-        nlh->nlmsg_type = type;
-        nlh->nlmsg_len = nlmsg_msg_size(payload);
-        nlh->nlmsg_flags = flags;
-        nlh->nlmsg_pid = pid;
-        nlh->nlmsg_seq = seq;
-
-        memset((unsigned char *) nlmsg_data(nlh) + payload, 0,
-               nlmsg_padlen(payload));
-
-        return nlh;
-}
-#endif
-
 /**
  * nlmsg_put - Add a new netlink message to an skb
  * @skb: socket buffer to store message in
diff --git a/include/net/nfc/nci.h b/include/net/nfc/nci.h
index 2be95e2626c0..276094b91d7c 100644
--- a/include/net/nfc/nci.h
+++ b/include/net/nfc/nci.h
@@ -116,6 +116,11 @@
 #define NCI_DISC_MAP_MODE_POLL                                  0x01
 #define NCI_DISC_MAP_MODE_LISTEN                                0x02
 
+/* NCI Discover Notification Type */
+#define NCI_DISCOVER_NTF_TYPE_LAST                              0x00
+#define NCI_DISCOVER_NTF_TYPE_LAST_NFCC                         0x01
+#define NCI_DISCOVER_NTF_TYPE_MORE                              0x02
+
 /* NCI Deactivation Type */
 #define NCI_DEACTIVATE_TYPE_IDLE_MODE                           0x00
 #define NCI_DEACTIVATE_TYPE_SLEEP_MODE                          0x01
@@ -207,6 +212,13 @@ struct nci_rf_disc_cmd {
         struct disc_config              disc_configs[NCI_MAX_NUM_RF_CONFIGS];
 } __packed;
 
+#define NCI_OP_RF_DISCOVER_SELECT_CMD   nci_opcode_pack(NCI_GID_RF_MGMT, 0x04)
+struct nci_rf_discover_select_cmd {
+        __u8    rf_discovery_id;
+        __u8    rf_protocol;
+        __u8    rf_interface;
+} __packed;
+
 #define NCI_OP_RF_DEACTIVATE_CMD        nci_opcode_pack(NCI_GID_RF_MGMT, 0x06)
 struct nci_rf_deactivate_cmd {
         __u8    type;
@@ -244,6 +256,8 @@ struct nci_core_init_rsp_2 {
 
 #define NCI_OP_RF_DISCOVER_RSP          nci_opcode_pack(NCI_GID_RF_MGMT, 0x03)
 
+#define NCI_OP_RF_DISCOVER_SELECT_RSP   nci_opcode_pack(NCI_GID_RF_MGMT, 0x04)
+
 #define NCI_OP_RF_DEACTIVATE_RSP        nci_opcode_pack(NCI_GID_RF_MGMT, 0x06)
 
 /* --------------------------- */
@@ -260,13 +274,15 @@ struct nci_core_conn_credit_ntf {
         struct conn_credit_entry        conn_entries[NCI_MAX_NUM_CONN];
 } __packed;
 
+#define NCI_OP_CORE_GENERIC_ERROR_NTF   nci_opcode_pack(NCI_GID_CORE, 0x07)
+
 #define NCI_OP_CORE_INTF_ERROR_NTF      nci_opcode_pack(NCI_GID_CORE, 0x08)
 struct nci_core_intf_error_ntf {
         __u8    status;
         __u8    conn_id;
 } __packed;
 
-#define NCI_OP_RF_INTF_ACTIVATED_NTF    nci_opcode_pack(NCI_GID_RF_MGMT, 0x05)
+#define NCI_OP_RF_DISCOVER_NTF          nci_opcode_pack(NCI_GID_RF_MGMT, 0x03)
 struct rf_tech_specific_params_nfca_poll {
         __u16   sens_res;
         __u8    nfcid1_len;     /* 0, 4, 7, or 10 Bytes */
@@ -275,11 +291,43 @@ struct rf_tech_specific_params_nfca_poll {
         __u8    sel_res;
 } __packed;
 
+struct rf_tech_specific_params_nfcb_poll {
+        __u8    sensb_res_len;
+        __u8    sensb_res[12];  /* 11 or 12 Bytes */
+} __packed;
+
+struct rf_tech_specific_params_nfcf_poll {
+        __u8    bit_rate;
+        __u8    sensf_res_len;
+        __u8    sensf_res[18];  /* 16 or 18 Bytes */
+} __packed;
+
+struct nci_rf_discover_ntf {
+        __u8    rf_discovery_id;
+        __u8    rf_protocol;
+        __u8    rf_tech_and_mode;
+        __u8    rf_tech_specific_params_len;
+
+        union {
+                struct rf_tech_specific_params_nfca_poll nfca_poll;
+                struct rf_tech_specific_params_nfcb_poll nfcb_poll;
+                struct rf_tech_specific_params_nfcf_poll nfcf_poll;
+        } rf_tech_specific_params;
+
+        __u8    ntf_type;
+} __packed;
+
+#define NCI_OP_RF_INTF_ACTIVATED_NTF    nci_opcode_pack(NCI_GID_RF_MGMT, 0x05)
 struct activation_params_nfca_poll_iso_dep {
         __u8    rats_res_len;
         __u8    rats_res[20];
 };
 
+struct activation_params_nfcb_poll_iso_dep {
+        __u8    attrib_res_len;
+        __u8    attrib_res[50];
+};
+
 struct nci_rf_intf_activated_ntf {
         __u8    rf_discovery_id;
         __u8    rf_interface;
@@ -291,6 +339,8 @@ struct nci_rf_intf_activated_ntf {
 
         union {
                 struct rf_tech_specific_params_nfca_poll nfca_poll;
+                struct rf_tech_specific_params_nfcb_poll nfcb_poll;
+                struct rf_tech_specific_params_nfcf_poll nfcf_poll;
         } rf_tech_specific_params;
 
         __u8    data_exch_rf_tech_and_mode;
@@ -300,6 +350,7 @@ struct nci_rf_intf_activated_ntf {
 
         union {
                 struct activation_params_nfca_poll_iso_dep nfca_poll_iso_dep;
+                struct activation_params_nfcb_poll_iso_dep nfcb_poll_iso_dep;
         } activation_params;
 
 } __packed;
diff --git a/include/net/nfc/nci_core.h b/include/net/nfc/nci_core.h
index bccd89e9d4c2..86fee8b5c65c 100644
--- a/include/net/nfc/nci_core.h
+++ b/include/net/nfc/nci_core.h
@@ -34,21 +34,31 @@
 #include <net/nfc/nfc.h>
 #include <net/nfc/nci.h>
 
-/* NCI device state */
-enum {
+/* NCI device flags */
+enum nci_flag {
         NCI_INIT,
         NCI_UP,
+        NCI_DATA_EXCHANGE,
+        NCI_DATA_EXCHANGE_TO,
+};
+
+/* NCI device states */
+enum nci_state {
+        NCI_IDLE,
         NCI_DISCOVERY,
+        NCI_W4_ALL_DISCOVERIES,
+        NCI_W4_HOST_SELECT,
         NCI_POLL_ACTIVE,
-        NCI_DATA_EXCHANGE,
 };
 
 /* NCI timeouts */
 #define NCI_RESET_TIMEOUT                       5000
 #define NCI_INIT_TIMEOUT                        5000
 #define NCI_RF_DISC_TIMEOUT                     5000
-#define NCI_RF_DEACTIVATE_TIMEOUT               5000
+#define NCI_RF_DISC_SELECT_TIMEOUT              5000
+#define NCI_RF_DEACTIVATE_TIMEOUT               30000
 #define NCI_CMD_TIMEOUT                         5000
+#define NCI_DATA_TIMEOUT                        700
 
 struct nci_dev;
 
@@ -59,6 +69,7 @@ struct nci_ops {
 };
 
 #define NCI_MAX_SUPPORTED_RF_INTERFACES         4
+#define NCI_MAX_DISCOVERED_TARGETS              10
 
 /* NCI Core structures */
 struct nci_dev {
@@ -68,12 +79,14 @@ struct nci_dev {
         int                     tx_headroom;
         int                     tx_tailroom;
 
+        atomic_t                state;
         unsigned long           flags;
 
         atomic_t                cmd_cnt;
         atomic_t                credits_cnt;
 
         struct timer_list       cmd_timer;
+        struct timer_list       data_timer;
 
         struct workqueue_struct *cmd_wq;
         struct work_struct      cmd_work;
@@ -96,9 +109,11 @@ struct nci_dev {
         void                    *driver_data;
 
         __u32                   poll_prots;
-        __u32                   target_available_prots;
         __u32                   target_active_prot;
 
+        struct nfc_target       targets[NCI_MAX_DISCOVERED_TARGETS];
+        int                     n_targets;
+
         /* received during NCI_OP_CORE_RESET_RSP */
         __u8                    nci_ver;
 
@@ -169,6 +184,7 @@ int nci_send_cmd(struct nci_dev *ndev, __u16 opcode, __u8 plen, void *payload);
 int nci_send_data(struct nci_dev *ndev, __u8 conn_id, struct sk_buff *skb);
 void nci_data_exchange_complete(struct nci_dev *ndev, struct sk_buff *skb,
                                 int err);
+void nci_clear_target_list(struct nci_dev *ndev);
 
 /* ----- NCI requests ----- */
 #define NCI_REQ_DONE            0
diff --git a/include/net/nfc/nfc.h b/include/net/nfc/nfc.h
index 8696b773a695..d253278e5a96 100644
--- a/include/net/nfc/nfc.h
+++ b/include/net/nfc/nfc.h
@@ -24,6 +24,7 @@
 #ifndef __NET_NFC_H
 #define __NET_NFC_H
 
+#include <linux/nfc.h>
 #include <linux/device.h>
 #include <linux/skbuff.h>
 
@@ -65,7 +66,6 @@ struct nfc_ops {
 
 #define NFC_TARGET_IDX_ANY -1
 #define NFC_MAX_GT_LEN 48
-#define NFC_MAX_NFCID1_LEN 10
 
 struct nfc_target {
         u32 idx;
@@ -73,7 +73,11 @@ struct nfc_target {
         u16 sens_res;
         u8 sel_res;
         u8 nfcid1_len;
-        u8 nfcid1[NFC_MAX_NFCID1_LEN];
+        u8 nfcid1[NFC_NFCID1_MAXSIZE];
+        u8 sensb_res_len;
+        u8 sensb_res[NFC_SENSB_RES_MAXSIZE];
+        u8 sensf_res_len;
+        u8 sensf_res[NFC_SENSF_RES_MAXSIZE];
 };
 
 struct nfc_genl_data {
@@ -83,7 +87,6 @@ struct nfc_genl_data {
 
 struct nfc_dev {
         unsigned idx;
-        unsigned target_idx;
         struct nfc_target *targets;
         int n_targets;
         int targets_generation;
diff --git a/include/net/tcp.h b/include/net/tcp.h
index 42c29bfbcee3..6b2acfce4cfd 100644
--- a/include/net/tcp.h
+++ b/include/net/tcp.h
@@ -1138,35 +1138,27 @@ static inline void tcp_clear_all_retrans_hints(struct tcp_sock *tp)
 /* MD5 Signature */
 struct crypto_hash;
 
+union tcp_md5_addr {
+        struct in_addr  a4;
+#if IS_ENABLED(CONFIG_IPV6)
+        struct in6_addr a6;
+#endif
+};
+
 /* - key database */
 struct tcp_md5sig_key {
-        u8                      *key;
+        struct hlist_node       node;
         u8                      keylen;
-};
-
-struct tcp4_md5sig_key {
-        struct tcp_md5sig_key   base;
-        __be32                  addr;
-};
-
-struct tcp6_md5sig_key {
-        struct tcp_md5sig_key   base;
-#if 0
-        u32                     scope_id;       /* XXX */
-#endif
-        struct in6_addr         addr;
+        u8                      family; /* AF_INET or AF_INET6 */
+        union tcp_md5_addr      addr;
+        u8                      key[TCP_MD5SIG_MAXKEYLEN];
+        struct rcu_head         rcu;
 };
 
 /* - sock block */
 struct tcp_md5sig_info {
-        struct tcp4_md5sig_key  *keys4;
-#if IS_ENABLED(CONFIG_IPV6)
-        struct tcp6_md5sig_key  *keys6;
-        u32                     entries6;
-        u32                     alloced6;
-#endif
-        u32                     entries4;
-        u32                     alloced4;
+        struct hlist_head       head;
+        struct rcu_head         rcu;
 };
 
 /* - pseudo header */
@@ -1203,19 +1195,25 @@ extern int tcp_v4_md5_hash_skb(char *md5_hash, struct tcp_md5sig_key *key,
                                const struct sock *sk,
                                const struct request_sock *req,
                                const struct sk_buff *skb);
-extern struct tcp_md5sig_key * tcp_v4_md5_lookup(struct sock *sk,
-                                                 struct sock *addr_sk);
-extern int tcp_v4_md5_do_add(struct sock *sk, __be32 addr, u8 *newkey,
-                             u8 newkeylen);
-extern int tcp_v4_md5_do_del(struct sock *sk, __be32 addr);
+extern int tcp_md5_do_add(struct sock *sk, const union tcp_md5_addr *addr,
+                          int family, const u8 *newkey,
+                          u8 newkeylen, gfp_t gfp);
+extern int tcp_md5_do_del(struct sock *sk, const union tcp_md5_addr *addr,
+                          int family);
+extern struct tcp_md5sig_key *tcp_v4_md5_lookup(struct sock *sk,
+                                         struct sock *addr_sk);
 
 #ifdef CONFIG_TCP_MD5SIG
-#define tcp_twsk_md5_key(twsk)  ((twsk)->tw_md5_keylen ?                 \
-                                 &(struct tcp_md5sig_key) {              \
-                                        .key = (twsk)->tw_md5_key,       \
-                                        .keylen = (twsk)->tw_md5_keylen, \
-                                } : NULL)
+extern struct tcp_md5sig_key *tcp_md5_do_lookup(struct sock *sk,
+                        const union tcp_md5_addr *addr, int family);
+#define tcp_twsk_md5_key(twsk)  ((twsk)->tw_md5_key)
 #else
+static inline struct tcp_md5sig_key *tcp_md5_do_lookup(struct sock *sk,
+                                         const union tcp_md5_addr *addr,
+                                         int family)
+{
+        return NULL;
+}
 #define tcp_twsk_md5_key(twsk)  NULL
 #endif
 
@@ -1470,10 +1468,6 @@ struct tcp_sock_af_ops {
                                                   const struct sock *sk,
                                                   const struct request_sock *req,
                                                   const struct sk_buff *skb);
-        int                     (*md5_add) (struct sock *sk,
-                                            struct sock *addr_sk,
-                                            u8 *newkey,
-                                            u8 len);
         int                     (*md5_parse) (struct sock *sk,
                                               char __user *optval,
                                               int optlen);
diff --git a/net/atm/clip.c b/net/atm/clip.c
index c12c2582457c..ef95a30306fa 100644
--- a/net/atm/clip.c
+++ b/net/atm/clip.c
@@ -328,6 +328,8 @@ static netdev_tx_t clip_start_xmit(struct sk_buff *skb,
         struct atmarp_entry *entry;
         struct neighbour *n;
         struct atm_vcc *vcc;
+        struct rtable *rt;
+        __be32 *daddr;
         int old;
         unsigned long flags;
 
@@ -338,7 +340,12 @@ static netdev_tx_t clip_start_xmit(struct sk_buff *skb,
                 dev->stats.tx_dropped++;
                 return NETDEV_TX_OK;
         }
-        n = dst_get_neighbour_noref(dst);
+        rt = (struct rtable *) dst;
+        if (rt->rt_gateway)
+                daddr = &rt->rt_gateway;
+        else
+                daddr = &ip_hdr(skb)->daddr;
+        n = dst_neigh_lookup(dst, daddr);
         if (!n) {
                 pr_err("NO NEIGHBOUR !\n");
                 dev_kfree_skb(skb);
@@ -358,7 +365,7 @@ static netdev_tx_t clip_start_xmit(struct sk_buff *skb,
                         dev_kfree_skb(skb);
                         dev->stats.tx_dropped++;
                 }
-                return NETDEV_TX_OK;
+                goto out_release_neigh;
         }
         pr_debug("neigh %p, vccs %p\n", entry, entry->vccs);
         ATM_SKB(skb)->vcc = vcc = entry->vccs->vcc;
@@ -377,14 +384,14 @@ static netdev_tx_t clip_start_xmit(struct sk_buff *skb,
         old = xchg(&entry->vccs->xoff, 1);      /* assume XOFF ... */
         if (old) {
                 pr_warning("XOFF->XOFF transition\n");
-                return NETDEV_TX_OK;
+                goto out_release_neigh;
         }
         dev->stats.tx_packets++;
         dev->stats.tx_bytes += skb->len;
         vcc->send(vcc, skb);
         if (atm_may_send(vcc, 0)) {
                 entry->vccs->xoff = 0;
-                return NETDEV_TX_OK;
+                goto out_release_neigh;
         }
         spin_lock_irqsave(&clip_priv->xoff_lock, flags);
         netif_stop_queue(dev);  /* XOFF -> throttle immediately */
@@ -396,6 +403,8 @@ static netdev_tx_t clip_start_xmit(struct sk_buff *skb,
            of the brief netif_stop_queue. If this isn't true or if it
            changes, use netif_wake_queue instead. */
         spin_unlock_irqrestore(&clip_priv->xoff_lock, flags);
+out_release_neigh:
+        neigh_release(n);
         return NETDEV_TX_OK;
 }
 
diff --git a/net/caif/caif_dev.c b/net/caif/caif_dev.c
index 82c57069415f..aa6f716524fd 100644
--- a/net/caif/caif_dev.c
+++ b/net/caif/caif_dev.c
@@ -162,7 +162,6 @@ void caif_flow_cb(struct sk_buff *skb)
 static int transmit(struct cflayer *layer, struct cfpkt *pkt)
 {
         int err, high = 0, qlen = 0;
-        struct caif_dev_common *caifdev;
         struct caif_device_entry *caifd =
             container_of(layer, struct caif_device_entry, layer);
         struct sk_buff *skb;
@@ -174,7 +173,6 @@ static int transmit(struct cflayer *layer, struct cfpkt *pkt)
         skb->dev = caifd->netdev;
         skb_reset_network_header(skb);
         skb->protocol = htons(ETH_P_CAIF);
-        caifdev = netdev_priv(caifd->netdev);
 
         /* Check if we need to handle xoff */
         if (likely(caifd->netdev->tx_queue_len == 0))
diff --git a/net/caif/caif_socket.c b/net/caif/caif_socket.c
index a97d97a3a512..5016fa57b623 100644
--- a/net/caif/caif_socket.c
+++ b/net/caif/caif_socket.c
@@ -43,34 +43,9 @@ enum caif_states {
 #define TX_FLOW_ON_BIT  1
 #define RX_FLOW_ON_BIT  2
 
-static struct dentry *debugfsdir;
-
-#ifdef CONFIG_DEBUG_FS
-struct debug_fs_counter {
-        atomic_t caif_nr_socks;
-        atomic_t caif_sock_create;
-        atomic_t num_connect_req;
-        atomic_t num_connect_resp;
-        atomic_t num_connect_fail_resp;
-        atomic_t num_disconnect;
-        atomic_t num_remote_shutdown_ind;
-        atomic_t num_tx_flow_off_ind;
-        atomic_t num_tx_flow_on_ind;
-        atomic_t num_rx_flow_off;
-        atomic_t num_rx_flow_on;
-};
-static struct debug_fs_counter cnt;
-#define dbfs_atomic_inc(v) atomic_inc_return(v)
-#define dbfs_atomic_dec(v) atomic_dec_return(v)
-#else
-#define dbfs_atomic_inc(v) 0
-#define dbfs_atomic_dec(v) 0
-#endif
-
 struct caifsock {
         struct sock sk; /* must be first member */
         struct cflayer layer;
-        char name[CAIF_LAYER_NAME_SZ]; /* Used for debugging */
         u32 flow_state;
         struct caif_connect_request conn_req;
         struct mutex readlock;
@@ -161,7 +136,6 @@ static int caif_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
                                         atomic_read(&cf_sk->sk.sk_rmem_alloc),
                                         sk_rcvbuf_lowwater(cf_sk));
                 set_rx_flow_off(cf_sk);
-                dbfs_atomic_inc(&cnt.num_rx_flow_off);
                 caif_flow_ctrl(sk, CAIF_MODEMCMD_FLOW_OFF_REQ);
         }
 
@@ -172,7 +146,6 @@ static int caif_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
                 set_rx_flow_off(cf_sk);
                 if (net_ratelimit())
                         pr_debug("sending flow OFF due to rmem_schedule\n");
-                dbfs_atomic_inc(&cnt.num_rx_flow_off);
                 caif_flow_ctrl(sk, CAIF_MODEMCMD_FLOW_OFF_REQ);
         }
         skb->dev = NULL;
@@ -233,14 +206,12 @@ static void caif_ctrl_cb(struct cflayer *layr,
         switch (flow) {
         case CAIF_CTRLCMD_FLOW_ON_IND:
                 /* OK from modem to start sending again */
-                dbfs_atomic_inc(&cnt.num_tx_flow_on_ind);
                 set_tx_flow_on(cf_sk);
                 cf_sk->sk.sk_state_change(&cf_sk->sk);
                 break;
 
         case CAIF_CTRLCMD_FLOW_OFF_IND:
                 /* Modem asks us to shut up */
-                dbfs_atomic_inc(&cnt.num_tx_flow_off_ind);
                 set_tx_flow_off(cf_sk);
                 cf_sk->sk.sk_state_change(&cf_sk->sk);
                 break;
@@ -249,7 +220,6 @@ static void caif_ctrl_cb(struct cflayer *layr,
                 /* We're now connected */
                 caif_client_register_refcnt(&cf_sk->layer,
                                                 cfsk_hold, cfsk_put);
-                dbfs_atomic_inc(&cnt.num_connect_resp);
                 cf_sk->sk.sk_state = CAIF_CONNECTED;
                 set_tx_flow_on(cf_sk);
                 cf_sk->sk.sk_state_change(&cf_sk->sk);
@@ -263,7 +233,6 @@ static void caif_ctrl_cb(struct cflayer *layr,
 
         case CAIF_CTRLCMD_INIT_FAIL_RSP:
                 /* Connect request failed */
-                dbfs_atomic_inc(&cnt.num_connect_fail_resp);
                 cf_sk->sk.sk_err = ECONNREFUSED;
                 cf_sk->sk.sk_state = CAIF_DISCONNECTED;
                 cf_sk->sk.sk_shutdown = SHUTDOWN_MASK;
@@ -277,7 +246,6 @@ static void caif_ctrl_cb(struct cflayer *layr,
 
         case CAIF_CTRLCMD_REMOTE_SHUTDOWN_IND:
                 /* Modem has closed this connection, or device is down. */
-                dbfs_atomic_inc(&cnt.num_remote_shutdown_ind);
                 cf_sk->sk.sk_shutdown = SHUTDOWN_MASK;
                 cf_sk->sk.sk_err = ECONNRESET;
                 set_rx_flow_on(cf_sk);
@@ -297,7 +265,6 @@ static void caif_check_flow_release(struct sock *sk)
                 return;
 
         if (atomic_read(&sk->sk_rmem_alloc) <= sk_rcvbuf_lowwater(cf_sk)) {
-                        dbfs_atomic_inc(&cnt.num_rx_flow_on);
                         set_rx_flow_on(cf_sk);
                         caif_flow_ctrl(sk, CAIF_MODEMCMD_FLOW_ON_REQ);
         }
@@ -856,7 +823,6 @@ static int caif_connect(struct socket *sock, struct sockaddr *uaddr,
         /*ifindex = id of the interface.*/
         cf_sk->conn_req.ifindex = cf_sk->sk.sk_bound_dev_if;
 
-        dbfs_atomic_inc(&cnt.num_connect_req);
         cf_sk->layer.receive = caif_sktrecv_cb;
 
         err = caif_connect_client(sock_net(sk), &cf_sk->conn_req,
@@ -945,8 +911,6 @@ static int caif_release(struct socket *sock)
         spin_unlock_bh(&sk->sk_receive_queue.lock);
         sock->sk = NULL;
 
-        dbfs_atomic_inc(&cnt.num_disconnect);
-
         WARN_ON(IS_ERR(cf_sk->debugfs_socket_dir));
         if (cf_sk->debugfs_socket_dir != NULL)
                 debugfs_remove_recursive(cf_sk->debugfs_socket_dir);
@@ -1054,14 +1018,12 @@ static void caif_sock_destructor(struct sock *sk)
                 return;
         }
         sk_stream_kill_queues(&cf_sk->sk);
-        dbfs_atomic_dec(&cnt.caif_nr_socks);
         caif_free_client(&cf_sk->layer);
 }
 
 static int caif_create(struct net *net, struct socket *sock, int protocol,
                         int kern)
 {
-        int num;
         struct sock *sk = NULL;
         struct caifsock *cf_sk = NULL;
         static struct proto prot = {.name = "PF_CAIF",
@@ -1122,34 +1084,6 @@ static int caif_create(struct net *net, struct socket *sock, int protocol,
         cf_sk->sk.sk_priority = CAIF_PRIO_NORMAL;
         cf_sk->conn_req.link_selector = CAIF_LINK_LOW_LATENCY;
         cf_sk->conn_req.protocol = protocol;
-        /* Increase the number of sockets created. */
-        dbfs_atomic_inc(&cnt.caif_nr_socks);
-        num = dbfs_atomic_inc(&cnt.caif_sock_create);
-#ifdef CONFIG_DEBUG_FS
-        if (!IS_ERR(debugfsdir)) {
-
-                /* Fill in some information concerning the misc socket. */
-                snprintf(cf_sk->name, sizeof(cf_sk->name), "cfsk%d", num);
-
-                cf_sk->debugfs_socket_dir =
-                        debugfs_create_dir(cf_sk->name, debugfsdir);
-
-                debugfs_create_u32("sk_state", S_IRUSR | S_IWUSR,
-                                cf_sk->debugfs_socket_dir,
-                                (u32 *) &cf_sk->sk.sk_state);
-                debugfs_create_u32("flow_state", S_IRUSR | S_IWUSR,
-                                cf_sk->debugfs_socket_dir, &cf_sk->flow_state);
-                debugfs_create_u32("sk_rmem_alloc", S_IRUSR | S_IWUSR,
-                                cf_sk->debugfs_socket_dir,
-                                (u32 *) &cf_sk->sk.sk_rmem_alloc);
-                debugfs_create_u32("sk_wmem_alloc", S_IRUSR | S_IWUSR,
-                                cf_sk->debugfs_socket_dir,
-                                (u32 *) &cf_sk->sk.sk_wmem_alloc);
-                debugfs_create_u32("identity", S_IRUSR | S_IWUSR,
-                                cf_sk->debugfs_socket_dir,
-                                (u32 *) &cf_sk->layer.id);
-        }
-#endif
         release_sock(&cf_sk->sk);
         return 0;
 }
@@ -1161,7 +1095,7 @@ static struct net_proto_family caif_family_ops = {
         .owner = THIS_MODULE,
 };
 
-static int af_caif_init(void)
+static int __init caif_sktinit_module(void)
 {
         int err = sock_register(&caif_family_ops);
         if (!err)
@@ -1169,54 +1103,9 @@ static int af_caif_init(void)
         return 0;
 }
 
-static int __init caif_sktinit_module(void)
-{
-#ifdef CONFIG_DEBUG_FS
-        debugfsdir = debugfs_create_dir("caif_sk", NULL);
-        if (!IS_ERR(debugfsdir)) {
-                debugfs_create_u32("num_sockets", S_IRUSR | S_IWUSR,
-                                debugfsdir,
-                                (u32 *) &cnt.caif_nr_socks);
-                debugfs_create_u32("num_create", S_IRUSR | S_IWUSR,
-                                debugfsdir,
-                                (u32 *) &cnt.caif_sock_create);
-                debugfs_create_u32("num_connect_req", S_IRUSR | S_IWUSR,
-                                debugfsdir,
-                                (u32 *) &cnt.num_connect_req);
-                debugfs_create_u32("num_connect_resp", S_IRUSR | S_IWUSR,
-                                debugfsdir,
-                                (u32 *) &cnt.num_connect_resp);
-                debugfs_create_u32("num_connect_fail_resp", S_IRUSR | S_IWUSR,
-                                debugfsdir,
-                                (u32 *) &cnt.num_connect_fail_resp);
-                debugfs_create_u32("num_disconnect", S_IRUSR | S_IWUSR,
-                                debugfsdir,
-                                (u32 *) &cnt.num_disconnect);
-                debugfs_create_u32("num_remote_shutdown_ind",
-                                S_IRUSR | S_IWUSR, debugfsdir,
-                                (u32 *) &cnt.num_remote_shutdown_ind);
-                debugfs_create_u32("num_tx_flow_off_ind", S_IRUSR | S_IWUSR,
-                                debugfsdir,
-                                (u32 *) &cnt.num_tx_flow_off_ind);
-                debugfs_create_u32("num_tx_flow_on_ind", S_IRUSR | S_IWUSR,
-                                debugfsdir,
-                                (u32 *) &cnt.num_tx_flow_on_ind);
-                debugfs_create_u32("num_rx_flow_off", S_IRUSR | S_IWUSR,
-                                debugfsdir,
-                                (u32 *) &cnt.num_rx_flow_off);
-                debugfs_create_u32("num_rx_flow_on", S_IRUSR | S_IWUSR,
-                                debugfsdir,
-                                (u32 *) &cnt.num_rx_flow_on);
-        }
-#endif
-        return af_caif_init();
-}
-
 static void __exit caif_sktexit_module(void)
 {
         sock_unregister(PF_CAIF);
-        if (debugfsdir != NULL)
-                debugfs_remove_recursive(debugfsdir);
 }
 module_init(caif_sktinit_module);
 module_exit(caif_sktexit_module);
diff --git a/net/caif/chnl_net.c b/net/caif/chnl_net.c
index 865690948bbc..e866234d0e5a 100644
--- a/net/caif/chnl_net.c
+++ b/net/caif/chnl_net.c
@@ -72,14 +72,12 @@ static void robust_list_del(struct list_head *delete_node)
 static int chnl_recv_cb(struct cflayer *layr, struct cfpkt *pkt)
 {
         struct sk_buff *skb;
-        struct chnl_net *priv  = container_of(layr, struct chnl_net, chnl);
+        struct chnl_net *priv;
         int pktlen;
-        int err = 0;
         const u8 *ip_version;
         u8 buf;
 
         priv = container_of(layr, struct chnl_net, chnl);
-
         if (!priv)
                 return -EINVAL;
 
@@ -95,8 +93,7 @@ static int chnl_recv_cb(struct cflayer *layr, struct cfpkt *pkt)
 
         /* check the version of IP */
         ip_version = skb_header_pointer(skb, 0, 1, &buf);
-        if (!ip_version)
-                return -EINVAL;
+
         switch (*ip_version >> 4) {
         case 4:
                 skb->protocol = htons(ETH_P_IP);
@@ -105,6 +102,7 @@ static int chnl_recv_cb(struct cflayer *layr, struct cfpkt *pkt)
                 skb->protocol = htons(ETH_P_IPV6);
                 break;
         default:
+                priv->netdev->stats.rx_errors++;
                 return -EINVAL;
         }
 
@@ -123,7 +121,7 @@ static int chnl_recv_cb(struct cflayer *layr, struct cfpkt *pkt)
         priv->netdev->stats.rx_packets++;
         priv->netdev->stats.rx_bytes += pktlen;
 
-        return err;
+        return 0;
 }
 
 static int delete_device(struct chnl_net *dev)
@@ -221,11 +219,13 @@ static int chnl_net_start_xmit(struct sk_buff *skb, struct net_device *dev)
 
         if (skb->len > priv->netdev->mtu) {
                 pr_warn("Size of skb exceeded MTU\n");
+                dev->stats.tx_errors++;
                 return -ENOSPC;
         }
 
         if (!priv->flowenabled) {
                 pr_debug("dropping packets flow off\n");
+                dev->stats.tx_dropped++;
                 return NETDEV_TX_BUSY;
         }
 
@@ -240,8 +240,7 @@ static int chnl_net_start_xmit(struct sk_buff *skb, struct net_device *dev)
         /* Send the packet down the stack. */
         result = priv->chnl.dn->transmit(priv->chnl.dn, pkt);
         if (result) {
-                if (result == -EAGAIN)
-                        result = NETDEV_TX_BUSY;
+                dev->stats.tx_dropped++;
                 return result;
         }
 
diff --git a/net/core/dev.c b/net/core/dev.c
index 6ca32f6b3105..763a0eda7158 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -446,7 +446,7 @@ void __dev_remove_pack(struct packet_type *pt)
                 }
         }
 
-        printk(KERN_WARNING "dev_remove_pack: %p not found.\n", pt);
+        pr_warn("dev_remove_pack: %p not found\n", pt);
 out:
         spin_unlock(&ptype_lock);
 }
@@ -1039,8 +1039,7 @@ rollback:
                         memcpy(dev->name, oldname, IFNAMSIZ);
                         goto rollback;
                 } else {
-                        printk(KERN_ERR
-                               "%s: name change rollback failed: %d.\n",
+                        pr_err("%s: name change rollback failed: %d\n",
                                dev->name, ret);
                 }
         }
@@ -1139,9 +1138,8 @@ void dev_load(struct net *net, const char *name)
                 no_module = request_module("netdev-%s", name);
         if (no_module && capable(CAP_SYS_MODULE)) {
                 if (!request_module("%s", name))
-                        pr_err("Loading kernel module for a network device "
-"with CAP_SYS_MODULE (deprecated).  Use CAP_NET_ADMIN and alias netdev-%s "
-"instead\n", name);
+                        pr_err("Loading kernel module for a network device with CAP_SYS_MODULE (deprecated).  Use CAP_NET_ADMIN and alias netdev-%s instead.\n",
+                               name);
         }
 }
 EXPORT_SYMBOL(dev_load);
@@ -1655,10 +1653,9 @@ static void dev_queue_xmit_nit(struct sk_buff *skb, struct net_device *dev)
                         if (skb_network_header(skb2) < skb2->data ||
                             skb2->network_header > skb2->tail) {
                                 if (net_ratelimit())
-                                        printk(KERN_CRIT "protocol %04x is "
-                                               "buggy, dev %s\n",
-                                               ntohs(skb2->protocol),
-                                               dev->name);
+                                        pr_crit("protocol %04x is buggy, dev %s\n",
+                                                ntohs(skb2->protocol),
+                                                dev->name);
                                 skb_reset_network_header(skb2);
                         }
 
@@ -1691,9 +1688,7 @@ static void netif_setup_tc(struct net_device *dev, unsigned int txq)
 
         /* If TC0 is invalidated disable TC mapping */
         if (tc->offset + tc->count > txq) {
-                pr_warning("Number of in use tx queues changed "
-                           "invalidating tc mappings. Priority "
-                           "traffic classification disabled!\n");
+                pr_warn("Number of in use tx queues changed invalidating tc mappings. Priority traffic classification disabled!\n");
                 dev->num_tc = 0;
                 return;
         }
@@ -1704,11 +1699,8 @@ static void netif_setup_tc(struct net_device *dev, unsigned int txq)
 
                 tc = &dev->tc_to_txq[q];
                 if (tc->offset + tc->count > txq) {
-                        pr_warning("Number of in use tx queues "
-                                   "changed. Priority %i to tc "
-                                   "mapping %i is no longer valid "
-                                   "setting map to 0\n",
-                                   i, q);
+                        pr_warn("Number of in use tx queues changed. Priority %i to tc mapping %i is no longer valid. Setting map to 0\n",
+                                i, q);
                         netdev_set_prio_tc_map(dev, i, 0);
                 }
         }
@@ -2014,8 +2006,7 @@ EXPORT_SYMBOL(skb_gso_segment);
 void netdev_rx_csum_fault(struct net_device *dev)
 {
         if (net_ratelimit()) {
-                printk(KERN_ERR "%s: hw csum failure.\n",
-                        dev ? dev->name : "<unknown>");
+                pr_err("%s: hw csum failure\n", dev ? dev->name : "<unknown>");
                 dump_stack();
         }
 }
@@ -2332,9 +2323,9 @@ static inline u16 dev_cap_txqueue(struct net_device *dev, u16 queue_index)
 {
         if (unlikely(queue_index >= dev->real_num_tx_queues)) {
                 if (net_ratelimit()) {
-                        pr_warning("%s selects TX queue %d, but "
-                                "real number of TX queues is %d\n",
-                                dev->name, queue_index, dev->real_num_tx_queues);
+                        pr_warn("%s selects TX queue %d, but real number of TX queues is %d\n",
+                                dev->name, queue_index,
+                                dev->real_num_tx_queues);
                 }
                 return 0;
         }
@@ -2578,16 +2569,16 @@ int dev_queue_xmit(struct sk_buff *skb)
                         }
                         HARD_TX_UNLOCK(dev, txq);
                         if (net_ratelimit())
-                                printk(KERN_CRIT "Virtual device %s asks to "
-                                       "queue packet!\n", dev->name);
+                                pr_crit("Virtual device %s asks to queue packet!\n",
+                                        dev->name);
                 } else {
                         /* Recursion is detected! It is possible,
                          * unfortunately
                          */
 recursion_alert:
                         if (net_ratelimit())
-                                printk(KERN_CRIT "Dead loop on virtual device "
-                                       "%s, fix it urgently!\n", dev->name);
+                                pr_crit("Dead loop on virtual device %s, fix it urgently!\n",
+                                        dev->name);
                 }
         }
 
@@ -3069,8 +3060,8 @@ static int ing_filter(struct sk_buff *skb, struct netdev_queue *rxq)
 
         if (unlikely(MAX_RED_LOOP < ttl++)) {
                 if (net_ratelimit())
-                        pr_warning( "Redir loop detected Dropping packet (%d->%d)\n",
-                               skb->skb_iif, dev->ifindex);
+                        pr_warn("Redir loop detected Dropping packet (%d->%d)\n",
+                                skb->skb_iif, dev->ifindex);
                 return TC_ACT_SHOT;
         }
 
@@ -4497,16 +4488,15 @@ static int __dev_set_promiscuity(struct net_device *dev, int inc)
                         dev->flags &= ~IFF_PROMISC;
                 else {
                         dev->promiscuity -= inc;
-                        printk(KERN_WARNING "%s: promiscuity touches roof, "
-                                "set promiscuity failed, promiscuity feature "
-                                "of device might be broken.\n", dev->name);
+                        pr_warn("%s: promiscuity touches roof, set promiscuity failed. promiscuity feature of device might be broken.\n",
+                                dev->name);
                         return -EOVERFLOW;
                 }
         }
         if (dev->flags != old_flags) {
-                printk(KERN_INFO "device %s %s promiscuous mode\n",
-                       dev->name, (dev->flags & IFF_PROMISC) ? "entered" :
-                                                               "left");
+                pr_info("device %s %s promiscuous mode\n",
+                        dev->name,
+                        dev->flags & IFF_PROMISC ? "entered" : "left");
                 if (audit_enabled) {
                         current_uid_gid(&uid, &gid);
                         audit_log(current->audit_context, GFP_ATOMIC,
@@ -4579,9 +4569,8 @@ int dev_set_allmulti(struct net_device *dev, int inc)
                         dev->flags &= ~IFF_ALLMULTI;
                 else {
                         dev->allmulti -= inc;
-                        printk(KERN_WARNING "%s: allmulti touches roof, "
-                                "set allmulti failed, allmulti feature of "
-                                "device might be broken.\n", dev->name);
+                        pr_warn("%s: allmulti touches roof, set allmulti failed. allmulti feature of device might be broken.\n",
+                                dev->name);
                         return -EOVERFLOW;
                 }
         }
@@ -5238,8 +5227,8 @@ static void rollback_registered_many(struct list_head *head)
                  * devices and proceed with the remaining.
                  */
                 if (dev->reg_state == NETREG_UNINITIALIZED) {
-                        pr_debug("unregister_netdevice: device %s/%p never "
-                                 "was registered\n", dev->name, dev);
+                        pr_debug("unregister_netdevice: device %s/%p never was registered\n",
+                                 dev->name, dev);
 
                         WARN_ON(1);
                         list_del(&dev->unreg_list);
@@ -5471,7 +5460,7 @@ static int netif_alloc_rx_queues(struct net_device *dev)
 
         rx = kcalloc(count, sizeof(struct netdev_rx_queue), GFP_KERNEL);
         if (!rx) {
-                pr_err("netdev: Unable to allocate %u rx queues.\n", count);
+                pr_err("netdev: Unable to allocate %u rx queues\n", count);
                 return -ENOMEM;
         }
         dev->_rx = rx;
@@ -5505,8 +5494,7 @@ static int netif_alloc_netdev_queues(struct net_device *dev)
 
         tx = kcalloc(count, sizeof(struct netdev_queue), GFP_KERNEL);
         if (!tx) {
-                pr_err("netdev: Unable to allocate %u tx queues.\n",
-                       count);
+                pr_err("netdev: Unable to allocate %u tx queues\n", count);
                 return -ENOMEM;
         }
         dev->_tx = tx;
@@ -5765,10 +5753,8 @@ static void netdev_wait_allrefs(struct net_device *dev)
                 refcnt = netdev_refcnt_read(dev);
 
                 if (time_after(jiffies, warning_time + 10 * HZ)) {
-                        printk(KERN_EMERG "unregister_netdevice: "
-                               "waiting for %s to become free. Usage "
-                               "count = %d\n",
-                               dev->name, refcnt);
+                        pr_emerg("unregister_netdevice: waiting for %s to become free. Usage count = %d\n",
+                                 dev->name, refcnt);
                         warning_time = jiffies;
                 }
         }
@@ -5819,7 +5805,7 @@ void netdev_run_todo(void)
                 list_del(&dev->todo_list);
 
                 if (unlikely(dev->reg_state != NETREG_UNREGISTERING)) {
-                        printk(KERN_ERR "network todo '%s' but state %d\n",
+                        pr_err("network todo '%s' but state %d\n",
                                dev->name, dev->reg_state);
                         dump_stack();
                         continue;
@@ -5935,15 +5921,13 @@ struct net_device *alloc_netdev_mqs(int sizeof_priv, const char *name,
         BUG_ON(strlen(name) >= sizeof(dev->name));
 
         if (txqs < 1) {
-                pr_err("alloc_netdev: Unable to allocate device "
-                       "with zero queues.\n");
+                pr_err("alloc_netdev: Unable to allocate device with zero queues\n");
                 return NULL;
         }
 
 #ifdef CONFIG_RPS
         if (rxqs < 1) {
-                pr_err("alloc_netdev: Unable to allocate device "
-                       "with zero RX queues.\n");
+                pr_err("alloc_netdev: Unable to allocate device with zero RX queues\n");
                 return NULL;
         }
 #endif
@@ -5959,7 +5943,7 @@ struct net_device *alloc_netdev_mqs(int sizeof_priv, const char *name,
 
         p = kzalloc(alloc_size, GFP_KERNEL);
         if (!p) {
-                printk(KERN_ERR "alloc_netdev: Unable to allocate device.\n");
+                pr_err("alloc_netdev: Unable to allocate device\n");
                 return NULL;
         }
 
@@ -6492,8 +6476,8 @@ static void __net_exit default_device_exit(struct net *net)
                 snprintf(fb_name, IFNAMSIZ, "dev%d", dev->ifindex);
                 err = dev_change_net_namespace(dev, &init_net, fb_name);
                 if (err) {
-                        printk(KERN_EMERG "%s: failed to move %s to init_net: %d\n",
-                                __func__, dev->name, err);
+                        pr_emerg("%s: failed to move %s to init_net: %d\n",
+                                 __func__, dev->name, err);
                         BUG();
                 }
         }
diff --git a/net/core/neighbour.c b/net/core/neighbour.c
index e287346e0934..f98ec444133a 100644
--- a/net/core/neighbour.c
+++ b/net/core/neighbour.c
@@ -2165,6 +2165,35 @@ nla_put_failure:
         return -EMSGSIZE;
 }
 
+static int pneigh_fill_info(struct sk_buff *skb, struct pneigh_entry *pn,
+                            u32 pid, u32 seq, int type, unsigned int flags,
+                            struct neigh_table *tbl)
+{
+        struct nlmsghdr *nlh;
+        struct ndmsg *ndm;
+
+        nlh = nlmsg_put(skb, pid, seq, type, sizeof(*ndm), flags);
+        if (nlh == NULL)
+                return -EMSGSIZE;
+
+        ndm = nlmsg_data(nlh);
+        ndm->ndm_family  = tbl->family;
+        ndm->ndm_pad1    = 0;
+        ndm->ndm_pad2    = 0;
+        ndm->ndm_flags   = pn->flags | NTF_PROXY;
+        ndm->ndm_type    = NDA_DST;
+        ndm->ndm_ifindex = pn->dev->ifindex;
+        ndm->ndm_state   = NUD_NONE;
+
+        NLA_PUT(skb, NDA_DST, tbl->key_len, pn->key);
+
+        return nlmsg_end(skb, nlh);
+
+nla_put_failure:
+        nlmsg_cancel(skb, nlh);
+        return -EMSGSIZE;
+}
+
 static void neigh_update_notify(struct neighbour *neigh)
 {
         call_netevent_notifiers(NETEVENT_NEIGH_UPDATE, neigh);
@@ -2214,23 +2243,78 @@ out:
         return rc;
 }
 
+static int pneigh_dump_table(struct neigh_table *tbl, struct sk_buff *skb,
+                             struct netlink_callback *cb)
+{
+        struct pneigh_entry *n;
+        struct net *net = sock_net(skb->sk);
+        int rc, h, s_h = cb->args[3];
+        int idx, s_idx = idx = cb->args[4];
+
+        read_lock_bh(&tbl->lock);
+
+        for (h = 0; h <= PNEIGH_HASHMASK; h++) {
+                if (h < s_h)
+                        continue;
+                if (h > s_h)
+                        s_idx = 0;
+                for (n = tbl->phash_buckets[h], idx = 0; n; n = n->next) {
+                        if (dev_net(n->dev) != net)
+                                continue;
+                        if (idx < s_idx)
+                                goto next;
+                        if (pneigh_fill_info(skb, n, NETLINK_CB(cb->skb).pid,
+                                            cb->nlh->nlmsg_seq,
+                                            RTM_NEWNEIGH,
+                                            NLM_F_MULTI, tbl) <= 0) {
+                                read_unlock_bh(&tbl->lock);
+                                rc = -1;
+                                goto out;
+                        }
+                next:
+                        idx++;
+                }
+        }
+
+        read_unlock_bh(&tbl->lock);
+        rc = skb->len;
+out:
+        cb->args[3] = h;
+        cb->args[4] = idx;
+        return rc;
+
+}
+
 static int neigh_dump_info(struct sk_buff *skb, struct netlink_callback *cb)
 {
         struct neigh_table *tbl;
         int t, family, s_t;
+        int proxy = 0;
+        int err = 0;
 
         read_lock(&neigh_tbl_lock);
         family = ((struct rtgenmsg *) nlmsg_data(cb->nlh))->rtgen_family;
+
+        /* check for full ndmsg structure presence, family member is
+         * the same for both structures
+         */
+        if (nlmsg_len(cb->nlh) >= sizeof(struct ndmsg) &&
+            ((struct ndmsg *) nlmsg_data(cb->nlh))->ndm_flags == NTF_PROXY)
+                proxy = 1;
+
         s_t = cb->args[0];
 
-        for (tbl = neigh_tables, t = 0; tbl; tbl = tbl->next, t++) {
+        for (tbl = neigh_tables, t = 0; tbl && (err >= 0);
+             tbl = tbl->next, t++) {
                 if (t < s_t || (family && tbl->family != family))
                         continue;
                 if (t > s_t)
                         memset(&cb->args[1], 0, sizeof(cb->args) -
                                                 sizeof(cb->args[0]));
-                if (neigh_dump_table(tbl, skb, cb) < 0)
-                        break;
+                if (proxy)
+                        err = pneigh_dump_table(tbl, skb, cb);
+                else
+                        err = neigh_dump_table(tbl, skb, cb);
         }
         read_unlock(&neigh_tbl_lock);
 
diff --git a/net/core/netpoll.c b/net/core/netpoll.c
index 556b08298669..4ce473ea5dc0 100644
--- a/net/core/netpoll.c
+++ b/net/core/netpoll.c
@@ -9,6 +9,8 @@
  * Copyright (C) 2002  Red Hat, Inc.
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/moduleparam.h>
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
@@ -45,9 +47,11 @@ static atomic_t trapped;
 #define NETPOLL_RX_ENABLED  1
 #define NETPOLL_RX_DROP     2
 
-#define MAX_SKB_SIZE \
-                (MAX_UDP_CHUNK + sizeof(struct udphdr) + \
-                                sizeof(struct iphdr) + sizeof(struct ethhdr))
+#define MAX_SKB_SIZE                                                    \
+        (sizeof(struct ethhdr) +                                        \
+         sizeof(struct iphdr) +                                         \
+         sizeof(struct udphdr) +                                        \
+         MAX_UDP_CHUNK)
 
 static void zap_completion_queue(void);
 static void arp_reply(struct sk_buff *skb);
@@ -55,6 +59,13 @@ static void arp_reply(struct sk_buff *skb);
 static unsigned int carrier_timeout = 4;
 module_param(carrier_timeout, uint, 0644);
 
+#define np_info(np, fmt, ...)                           \
+        pr_info("%s: " fmt, np->name, ##__VA_ARGS__)
+#define np_err(np, fmt, ...)                            \
+        pr_err("%s: " fmt, np->name, ##__VA_ARGS__)
+#define np_notice(np, fmt, ...)                         \
+        pr_notice("%s: " fmt, np->name, ##__VA_ARGS__)
+
 static void queue_process(struct work_struct *work)
 {
         struct netpoll_info *npinfo =
@@ -627,18 +638,12 @@ out:
 
 void netpoll_print_options(struct netpoll *np)
 {
-        printk(KERN_INFO "%s: local port %d\n",
-                         np->name, np->local_port);
-        printk(KERN_INFO "%s: local IP %pI4\n",
-                         np->name, &np->local_ip);
-        printk(KERN_INFO "%s: interface '%s'\n",
-                         np->name, np->dev_name);
-        printk(KERN_INFO "%s: remote port %d\n",
-                         np->name, np->remote_port);
-        printk(KERN_INFO "%s: remote IP %pI4\n",
-                         np->name, &np->remote_ip);
-        printk(KERN_INFO "%s: remote ethernet address %pM\n",
-                         np->name, np->remote_mac);
+        np_info(np, "local port %d\n", np->local_port);
+        np_info(np, "local IP %pI4\n", &np->local_ip);
+        np_info(np, "interface '%s'\n", np->dev_name);
+        np_info(np, "remote port %d\n", np->remote_port);
+        np_info(np, "remote IP %pI4\n", &np->remote_ip);
+        np_info(np, "remote ethernet address %pM\n", np->remote_mac);
 }
 EXPORT_SYMBOL(netpoll_print_options);
 
@@ -680,8 +685,7 @@ int netpoll_parse_options(struct netpoll *np, char *opt)
                         goto parse_failed;
                 *delim = 0;
                 if (*cur == ' ' || *cur == '\t')
-                        printk(KERN_INFO "%s: warning: whitespace"
-                                        "is not allowed\n", np->name);
+                        np_info(np, "warning: whitespace is not allowed\n");
                 np->remote_port = simple_strtol(cur, NULL, 10);
                 cur = delim;
         }
@@ -705,8 +709,7 @@ int netpoll_parse_options(struct netpoll *np, char *opt)
         return 0;
 
  parse_failed:
-        printk(KERN_INFO "%s: couldn't parse config at '%s'!\n",
-               np->name, cur);
+        np_info(np, "couldn't parse config at '%s'!\n", cur);
         return -1;
 }
 EXPORT_SYMBOL(netpoll_parse_options);
@@ -721,8 +724,8 @@ int __netpoll_setup(struct netpoll *np)
 
         if ((ndev->priv_flags & IFF_DISABLE_NETPOLL) ||
             !ndev->netdev_ops->ndo_poll_controller) {
-                printk(KERN_ERR "%s: %s doesn't support polling, aborting.\n",
-                       np->name, np->dev_name);
+                np_err(np, "%s doesn't support polling, aborting\n",
+                       np->dev_name);
                 err = -ENOTSUPP;
                 goto out;
         }
@@ -785,14 +788,12 @@ int netpoll_setup(struct netpoll *np)
         if (np->dev_name)
                 ndev = dev_get_by_name(&init_net, np->dev_name);
         if (!ndev) {
-                printk(KERN_ERR "%s: %s doesn't exist, aborting.\n",
-                       np->name, np->dev_name);
+                np_err(np, "%s doesn't exist, aborting\n", np->dev_name);
                 return -ENODEV;
         }
 
         if (ndev->master) {
-                printk(KERN_ERR "%s: %s is a slave device, aborting.\n",
-                       np->name, np->dev_name);
+                np_err(np, "%s is a slave device, aborting\n", np->dev_name);
                 err = -EBUSY;
                 goto put;
         }
@@ -800,16 +801,14 @@ int netpoll_setup(struct netpoll *np)
         if (!netif_running(ndev)) {
                 unsigned long atmost, atleast;
 
-                printk(KERN_INFO "%s: device %s not up yet, forcing it\n",
-                       np->name, np->dev_name);
+                np_info(np, "device %s not up yet, forcing it\n", np->dev_name);
 
                 rtnl_lock();
                 err = dev_open(ndev);
                 rtnl_unlock();
 
                 if (err) {
-                        printk(KERN_ERR "%s: failed to open %s\n",
-                               np->name, ndev->name);
+                        np_err(np, "failed to open %s\n", ndev->name);
                         goto put;
                 }
 
@@ -817,9 +816,7 @@ int netpoll_setup(struct netpoll *np)
                 atmost = jiffies + carrier_timeout * HZ;
                 while (!netif_carrier_ok(ndev)) {
                         if (time_after(jiffies, atmost)) {
-                                printk(KERN_NOTICE
-                                       "%s: timeout waiting for carrier\n",
-                                       np->name);
+                                np_notice(np, "timeout waiting for carrier\n");
                                 break;
                         }
                         msleep(1);
@@ -831,9 +828,7 @@ int netpoll_setup(struct netpoll *np)
                  */
 
                 if (time_before(jiffies, atleast)) {
-                        printk(KERN_NOTICE "%s: carrier detect appears"
-                               " untrustworthy, waiting 4 seconds\n",
-                               np->name);
+                        np_notice(np, "carrier detect appears untrustworthy, waiting 4 seconds\n");
                         msleep(4000);
                 }
         }
@@ -844,15 +839,15 @@ int netpoll_setup(struct netpoll *np)
 
                 if (!in_dev || !in_dev->ifa_list) {
                         rcu_read_unlock();
-                        printk(KERN_ERR "%s: no IP address for %s, aborting\n",
-                               np->name, np->dev_name);
+                        np_err(np, "no IP address for %s, aborting\n",
+                               np->dev_name);
                         err = -EDESTADDRREQ;
                         goto put;
                 }
 
                 np->local_ip = in_dev->ifa_list->ifa_local;
                 rcu_read_unlock();
-                printk(KERN_INFO "%s: local IP %pI4\n", np->name, &np->local_ip);
+                np_info(np, "local IP %pI4\n", &np->local_ip);
         }
 
         np->dev = ndev;
diff --git a/net/decnet/dn_neigh.c b/net/decnet/dn_neigh.c
index befe426491ba..ee7013f24fca 100644
--- a/net/decnet/dn_neigh.c
+++ b/net/decnet/dn_neigh.c
@@ -205,17 +205,23 @@ static int dn_neigh_output_packet(struct sk_buff *skb)
         struct neighbour *neigh = dst_get_neighbour_noref(dst);
         struct net_device *dev = neigh->dev;
         char mac_addr[ETH_ALEN];
+        unsigned int seq;
+        int err;
 
         dn_dn2eth(mac_addr, rt->rt_local_src);
-        if (dev_hard_header(skb, dev, ntohs(skb->protocol), neigh->ha,
-                            mac_addr, skb->len) >= 0)
-                return dev_queue_xmit(skb);
-
-        if (net_ratelimit())
-                printk(KERN_DEBUG "dn_neigh_output_packet: oops, can't send packet\n");
-
-        kfree_skb(skb);
-        return -EINVAL;
+        do {
+                seq = read_seqbegin(&neigh->ha_lock);
+                err = dev_hard_header(skb, dev, ntohs(skb->protocol),
+                                      neigh->ha, mac_addr, skb->len);
+        } while (read_seqretry(&neigh->ha_lock, seq));
+
+        if (err >= 0)
+                err = dev_queue_xmit(skb);
+        else {
+                kfree_skb(skb);
+                err = -EINVAL;
+        }
+        return err;
 }
 
 static int dn_long_output(struct neighbour *neigh, struct sk_buff *skb)
diff --git a/net/decnet/dn_route.c b/net/decnet/dn_route.c
index f31ce72dca65..80a3de4906d3 100644
--- a/net/decnet/dn_route.c
+++ b/net/decnet/dn_route.c
@@ -724,11 +724,10 @@ static int dn_output(struct sk_buff *skb)
         struct dn_route *rt = (struct dn_route *)dst;
         struct net_device *dev = dst->dev;
         struct dn_skb_cb *cb = DN_SKB_CB(skb);
-        struct neighbour *neigh;
 
         int err = -EINVAL;
 
-        if ((neigh = dst_get_neighbour_noref(dst)) == NULL)
+        if (dst_get_neighbour_noref(dst) == NULL)
                 goto error;
 
         skb->dev = dev;
diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c
index 6b3ca5ba4450..0286d78c589c 100644
--- a/net/ipv4/ip_gre.c
+++ b/net/ipv4/ip_gre.c
@@ -730,15 +730,16 @@ static netdev_tx_t ipgre_tunnel_xmit(struct sk_buff *skb, struct net_device *dev
 
                 if (skb->protocol == htons(ETH_P_IP)) {
                         rt = skb_rtable(skb);
-                        if ((dst = rt->rt_gateway) == 0)
-                                goto tx_error_icmp;
+                        dst = rt->rt_gateway;
                 }
 #if IS_ENABLED(CONFIG_IPV6)
                 else if (skb->protocol == htons(ETH_P_IPV6)) {
-                        struct neighbour *neigh = dst_get_neighbour_noref(skb_dst(skb));
                         const struct in6_addr *addr6;
+                        struct neighbour *neigh;
+                        bool do_tx_error_icmp;
                         int addr_type;
 
+                        neigh = dst_neigh_lookup(skb_dst(skb), &ipv6_hdr(skb)->daddr);
                         if (neigh == NULL)
                                 goto tx_error;
 
@@ -751,9 +752,14 @@ static netdev_tx_t ipgre_tunnel_xmit(struct sk_buff *skb, struct net_device *dev
                         }
 
                         if ((addr_type & IPV6_ADDR_COMPATv4) == 0)
+                                do_tx_error_icmp = true;
+                        else {
+                                do_tx_error_icmp = false;
+                                dst = addr6->s6_addr32[3];
+                        }
+                        neigh_release(neigh);
+                        if (do_tx_error_icmp)
                                 goto tx_error_icmp;
-
-                        dst = addr6->s6_addr32[3];
                 }
 #endif
                 else
@@ -914,9 +920,10 @@ static netdev_tx_t ipgre_tunnel_xmit(struct sk_buff *skb, struct net_device *dev
         __IPTUNNEL_XMIT(tstats, &dev->stats);
         return NETDEV_TX_OK;
 
+#if IS_ENABLED(CONFIG_IPV6)
 tx_error_icmp:
         dst_link_failure(skb);
-
+#endif
 tx_error:
         dev->stats.tx_errors++;
         dev_kfree_skb(skb);
diff --git a/net/ipv4/ip_sockglue.c b/net/ipv4/ip_sockglue.c
index 8aa87c19fa00..9125529dab95 100644
--- a/net/ipv4/ip_sockglue.c
+++ b/net/ipv4/ip_sockglue.c
@@ -469,6 +469,7 @@ static int do_ip_setsockopt(struct sock *sk, int level,
                              (1<<IP_ROUTER_ALERT) | (1<<IP_FREEBIND) |
                              (1<<IP_PASSSEC) | (1<<IP_TRANSPARENT) |
                              (1<<IP_MINTTL) | (1<<IP_NODEFRAG))) ||
+            optname == IP_UNICAST_IF ||
             optname == IP_MULTICAST_TTL ||
             optname == IP_MULTICAST_ALL ||
             optname == IP_MULTICAST_LOOP ||
@@ -628,6 +629,35 @@ static int do_ip_setsockopt(struct sock *sk, int level,
                         goto e_inval;
                 inet->mc_loop = !!val;
                 break;
+        case IP_UNICAST_IF:
+        {
+                struct net_device *dev = NULL;
+                int ifindex;
+
+                if (optlen != sizeof(int))
+                        goto e_inval;
+
+                ifindex = (__force int)ntohl((__force __be32)val);
+                if (ifindex == 0) {
+                        inet->uc_index = 0;
+                        err = 0;
+                        break;
+                }
+
+                dev = dev_get_by_index(sock_net(sk), ifindex);
+                err = -EADDRNOTAVAIL;
+                if (!dev)
+                        break;
+                dev_put(dev);
+
+                err = -EINVAL;
+                if (sk->sk_bound_dev_if)
+                        break;
+
+                inet->uc_index = ifindex;
+                err = 0;
+                break;
+        }
         case IP_MULTICAST_IF:
         {
                 struct ip_mreqn mreq;
@@ -1178,6 +1208,9 @@ static int do_ip_getsockopt(struct sock *sk, int level, int optname,
         case IP_MULTICAST_LOOP:
                 val = inet->mc_loop;
                 break;
+        case IP_UNICAST_IF:
+                val = (__force int)htonl((__u32) inet->uc_index);
+                break;
         case IP_MULTICAST_IF:
         {
                 struct in_addr addr;
diff --git a/net/ipv4/ipip.c b/net/ipv4/ipip.c
index 22a199315309..f84ebff5cdb0 100644
--- a/net/ipv4/ipip.c
+++ b/net/ipv4/ipip.c
@@ -454,8 +454,7 @@ static netdev_tx_t ipip_tunnel_xmit(struct sk_buff *skb, struct net_device *dev)
                         dev->stats.tx_fifo_errors++;
                         goto tx_error;
                 }
-                if ((dst = rt->rt_gateway) == 0)
-                        goto tx_error_icmp;
+                dst = rt->rt_gateway;
         }
 
         rt = ip_route_output_ports(dev_net(dev), &fl4, NULL,
diff --git a/net/ipv4/ping.c b/net/ipv4/ping.c
index aea5a199c37a..cfc82cf339f6 100644
--- a/net/ipv4/ping.c
+++ b/net/ipv4/ping.c
@@ -556,7 +556,8 @@ static int ping_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
                         ipc.oif = inet->mc_index;
                 if (!saddr)
                         saddr = inet->mc_addr;
-        }
+        } else if (!ipc.oif)
+                ipc.oif = inet->uc_index;
 
         flowi4_init_output(&fl4, ipc.oif, sk->sk_mark, tos,
                            RT_SCOPE_UNIVERSE, sk->sk_protocol,
diff --git a/net/ipv4/proc.c b/net/ipv4/proc.c
index 6afc807ee2ad..02d61079f08b 100644
--- a/net/ipv4/proc.c
+++ b/net/ipv4/proc.c
@@ -256,6 +256,7 @@ static const struct snmp_mib snmp4_net_list[] = {
         SNMP_MIB_ITEM("TCPTimeWaitOverflow", LINUX_MIB_TCPTIMEWAITOVERFLOW),
         SNMP_MIB_ITEM("TCPReqQFullDoCookies", LINUX_MIB_TCPREQQFULLDOCOOKIES),
         SNMP_MIB_ITEM("TCPReqQFullDrop", LINUX_MIB_TCPREQQFULLDROP),
+        SNMP_MIB_ITEM("TCPRetransFail", LINUX_MIB_TCPRETRANSFAIL),
         SNMP_MIB_SENTINEL
 };
 
diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c
index 3ccda5ae8a27..ab466305b629 100644
--- a/net/ipv4/raw.c
+++ b/net/ipv4/raw.c
@@ -563,7 +563,8 @@ static int raw_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
                         ipc.oif = inet->mc_index;
                 if (!saddr)
                         saddr = inet->mc_addr;
-        }
+        } else if (!ipc.oif)
+                ipc.oif = inet->uc_index;
 
         flowi4_init_output(&fl4, ipc.oif, sk->sk_mark, tos,
                            RT_SCOPE_UNIVERSE,
diff --git a/net/ipv4/route.c b/net/ipv4/route.c
index bcacf54e5418..4eeb8ce856e2 100644
--- a/net/ipv4/route.c
+++ b/net/ipv4/route.c
@@ -1117,10 +1117,15 @@ static struct neighbour *ipv4_neigh_lookup(const struct dst_entry *dst, const vo
         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)
+                pkey = (const __be32 *) &rt->rt_gateway;
 
         n = __ipv4_neigh_lookup(&arp_tbl, dev, *(__force u32 *)pkey);
         if (n)
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
index 94d683a61cba..4d6f81c818dc 100644
--- a/net/ipv4/tcp_ipv4.c
+++ b/net/ipv4/tcp_ipv4.c
@@ -90,16 +90,8 @@ EXPORT_SYMBOL(sysctl_tcp_low_latency);
 
 
 #ifdef CONFIG_TCP_MD5SIG
-static struct tcp_md5sig_key *tcp_v4_md5_do_lookup(struct sock *sk,
-                                                   __be32 addr);
-static int tcp_v4_md5_hash_hdr(char *md5_hash, struct tcp_md5sig_key *key,
+static int tcp_v4_md5_hash_hdr(char *md5_hash, const struct tcp_md5sig_key *key,
                                __be32 daddr, __be32 saddr, const struct tcphdr *th);
-#else
-static inline
-struct tcp_md5sig_key *tcp_v4_md5_do_lookup(struct sock *sk, __be32 addr)
-{
-        return NULL;
-}
 #endif
 
 struct inet_hashinfo tcp_hashinfo;
@@ -601,6 +593,10 @@ static void tcp_v4_send_reset(struct sock *sk, struct sk_buff *skb)
         struct ip_reply_arg arg;
 #ifdef CONFIG_TCP_MD5SIG
         struct tcp_md5sig_key *key;
+        const __u8 *hash_location = NULL;
+        unsigned char newhash[16];
+        int genhash;
+        struct sock *sk1 = NULL;
 #endif
         struct net *net;
 
@@ -631,7 +627,36 @@ static void tcp_v4_send_reset(struct sock *sk, struct sk_buff *skb)
         arg.iov[0].iov_len  = sizeof(rep.th);
 
 #ifdef CONFIG_TCP_MD5SIG
-        key = sk ? tcp_v4_md5_do_lookup(sk, ip_hdr(skb)->saddr) : NULL;
+        hash_location = tcp_parse_md5sig_option(th);
+        if (!sk && hash_location) {
+                /*
+                 * active side is lost. Try to find listening socket through
+                 * source port, and then find md5 key through listening socket.
+                 * we are not loose security here:
+                 * Incoming packet is checked with md5 hash with finding key,
+                 * no RST generated if md5 hash doesn't match.
+                 */
+                sk1 = __inet_lookup_listener(dev_net(skb_dst(skb)->dev),
+                                             &tcp_hashinfo, ip_hdr(skb)->daddr,
+                                             ntohs(th->source), inet_iif(skb));
+                /* don't send rst if it can't find key */
+                if (!sk1)
+                        return;
+                rcu_read_lock();
+                key = tcp_md5_do_lookup(sk1, (union tcp_md5_addr *)
+                                        &ip_hdr(skb)->saddr, AF_INET);
+                if (!key)
+                        goto release_sk1;
+
+                genhash = tcp_v4_md5_hash_skb(newhash, key, NULL, NULL, skb);
+                if (genhash || memcmp(hash_location, newhash, 16) != 0)
+                        goto release_sk1;
+        } else {
+                key = sk ? tcp_md5_do_lookup(sk, (union tcp_md5_addr *)
+                                             &ip_hdr(skb)->saddr,
+                                             AF_INET) : NULL;
+        }
+
         if (key) {
                 rep.opt[0] = htonl((TCPOPT_NOP << 24) |
                                    (TCPOPT_NOP << 16) |
@@ -664,6 +689,14 @@ static void tcp_v4_send_reset(struct sock *sk, struct sk_buff *skb)
 
         TCP_INC_STATS_BH(net, TCP_MIB_OUTSEGS);
         TCP_INC_STATS_BH(net, TCP_MIB_OUTRSTS);
+
+#ifdef CONFIG_TCP_MD5SIG
+release_sk1:
+        if (sk1) {
+                rcu_read_unlock();
+                sock_put(sk1);
+        }
+#endif
 }
 
 /* The code following below sending ACKs in SYN-RECV and TIME-WAIT states
@@ -764,7 +797,8 @@ static void tcp_v4_reqsk_send_ack(struct sock *sk, struct sk_buff *skb,
                         tcp_rsk(req)->rcv_isn + 1, req->rcv_wnd,
                         req->ts_recent,
                         0,
-                        tcp_v4_md5_do_lookup(sk, ip_hdr(skb)->daddr),
+                        tcp_md5_do_lookup(sk, (union tcp_md5_addr *)&ip_hdr(skb)->daddr,
+                                          AF_INET),
                         inet_rsk(req)->no_srccheck ? IP_REPLY_ARG_NOSRCCHECK : 0,
                         ip_hdr(skb)->tos);
 }
@@ -881,153 +915,137 @@ static struct ip_options_rcu *tcp_v4_save_options(struct sock *sk,
  */
 
 /* Find the Key structure for an address.  */
-static struct tcp_md5sig_key *
-                        tcp_v4_md5_do_lookup(struct sock *sk, __be32 addr)
+struct tcp_md5sig_key *tcp_md5_do_lookup(struct sock *sk,
+                                         const union tcp_md5_addr *addr,
+                                         int family)
 {
         struct tcp_sock *tp = tcp_sk(sk);
-        int i;
-
-        if (!tp->md5sig_info || !tp->md5sig_info->entries4)
+        struct tcp_md5sig_key *key;
+        struct hlist_node *pos;
+        unsigned int size = sizeof(struct in_addr);
+        struct tcp_md5sig_info *md5sig;
+
+        /* caller either holds rcu_read_lock() or socket lock */
+        md5sig = rcu_dereference_check(tp->md5sig_info,
+                                       sock_owned_by_user(sk));
+        if (!md5sig)
                 return NULL;
-        for (i = 0; i < tp->md5sig_info->entries4; i++) {
-                if (tp->md5sig_info->keys4[i].addr == addr)
-                        return &tp->md5sig_info->keys4[i].base;
+#if IS_ENABLED(CONFIG_IPV6)
+        if (family == AF_INET6)
+                size = sizeof(struct in6_addr);
+#endif
+        hlist_for_each_entry_rcu(key, pos, &md5sig->head, node) {
+                if (key->family != family)
+                        continue;
+                if (!memcmp(&key->addr, addr, size))
+                        return key;
         }
         return NULL;
 }
+EXPORT_SYMBOL(tcp_md5_do_lookup);
 
 struct tcp_md5sig_key *tcp_v4_md5_lookup(struct sock *sk,
                                          struct sock *addr_sk)
 {
-        return tcp_v4_md5_do_lookup(sk, inet_sk(addr_sk)->inet_daddr);
+        union tcp_md5_addr *addr;
+
+        addr = (union tcp_md5_addr *)&inet_sk(addr_sk)->inet_daddr;
+        return tcp_md5_do_lookup(sk, addr, AF_INET);
 }
 EXPORT_SYMBOL(tcp_v4_md5_lookup);
 
 static struct tcp_md5sig_key *tcp_v4_reqsk_md5_lookup(struct sock *sk,
                                                       struct request_sock *req)
 {
-        return tcp_v4_md5_do_lookup(sk, inet_rsk(req)->rmt_addr);
+        union tcp_md5_addr *addr;
+
+        addr = (union tcp_md5_addr *)&inet_rsk(req)->rmt_addr;
+        return tcp_md5_do_lookup(sk, addr, AF_INET);
 }
 
 /* This can be called on a newly created socket, from other files */
-int tcp_v4_md5_do_add(struct sock *sk, __be32 addr,
-                      u8 *newkey, u8 newkeylen)
+int tcp_md5_do_add(struct sock *sk, const union tcp_md5_addr *addr,
+                   int family, const u8 *newkey, u8 newkeylen, gfp_t gfp)
 {
         /* Add Key to the list */
         struct tcp_md5sig_key *key;
         struct tcp_sock *tp = tcp_sk(sk);
-        struct tcp4_md5sig_key *keys;
+        struct tcp_md5sig_info *md5sig;
 
-        key = tcp_v4_md5_do_lookup(sk, addr);
+        key = tcp_md5_do_lookup(sk, (union tcp_md5_addr *)&addr, AF_INET);
         if (key) {
                 /* Pre-existing entry - just update that one. */
-                kfree(key->key);
-                key->key = newkey;
+                memcpy(key->key, newkey, newkeylen);
                 key->keylen = newkeylen;
-        } else {
-                struct tcp_md5sig_info *md5sig;
-
-                if (!tp->md5sig_info) {
-                        tp->md5sig_info = kzalloc(sizeof(*tp->md5sig_info),
-                                                  GFP_ATOMIC);
-                        if (!tp->md5sig_info) {
-                                kfree(newkey);
-                                return -ENOMEM;
-                        }
-                        sk_nocaps_add(sk, NETIF_F_GSO_MASK);
-                }
+                return 0;
+        }
 
-                md5sig = tp->md5sig_info;
-                if (md5sig->entries4 == 0 &&
-                    tcp_alloc_md5sig_pool(sk) == NULL) {
-                        kfree(newkey);
+        md5sig = rcu_dereference_protected(tp->md5sig_info,
+                                           sock_owned_by_user(sk));
+        if (!md5sig) {
+                md5sig = kmalloc(sizeof(*md5sig), gfp);
+                if (!md5sig)
                         return -ENOMEM;
-                }
-
-                if (md5sig->alloced4 == md5sig->entries4) {
-                        keys = kmalloc((sizeof(*keys) *
-                                        (md5sig->entries4 + 1)), GFP_ATOMIC);
-                        if (!keys) {
-                                kfree(newkey);
-                                if (md5sig->entries4 == 0)
-                                        tcp_free_md5sig_pool();
-                                return -ENOMEM;
-                        }
 
-                        if (md5sig->entries4)
-                                memcpy(keys, md5sig->keys4,
-                                       sizeof(*keys) * md5sig->entries4);
+                sk_nocaps_add(sk, NETIF_F_GSO_MASK);
+                INIT_HLIST_HEAD(&md5sig->head);
+                rcu_assign_pointer(tp->md5sig_info, md5sig);
+        }
 
-                        /* Free old key list, and reference new one */
-                        kfree(md5sig->keys4);
-                        md5sig->keys4 = keys;
-                        md5sig->alloced4++;
-                }
-                md5sig->entries4++;
-                md5sig->keys4[md5sig->entries4 - 1].addr        = addr;
-                md5sig->keys4[md5sig->entries4 - 1].base.key    = newkey;
-                md5sig->keys4[md5sig->entries4 - 1].base.keylen = newkeylen;
+        key = sock_kmalloc(sk, sizeof(*key), gfp);
+        if (!key)
+                return -ENOMEM;
+        if (hlist_empty(&md5sig->head) && !tcp_alloc_md5sig_pool(sk)) {
+                sock_kfree_s(sk, key, sizeof(*key));
+                return -ENOMEM;
         }
-        return 0;
-}
-EXPORT_SYMBOL(tcp_v4_md5_do_add);
 
-static int tcp_v4_md5_add_func(struct sock *sk, struct sock *addr_sk,
-                               u8 *newkey, u8 newkeylen)
-{
-        return tcp_v4_md5_do_add(sk, inet_sk(addr_sk)->inet_daddr,
-                                 newkey, newkeylen);
+        memcpy(key->key, newkey, newkeylen);
+        key->keylen = newkeylen;
+        key->family = family;
+        memcpy(&key->addr, addr,
+               (family == AF_INET6) ? sizeof(struct in6_addr) :
+                                      sizeof(struct in_addr));
+        hlist_add_head_rcu(&key->node, &md5sig->head);
+        return 0;
 }
+EXPORT_SYMBOL(tcp_md5_do_add);
 
-int tcp_v4_md5_do_del(struct sock *sk, __be32 addr)
+int tcp_md5_do_del(struct sock *sk, const union tcp_md5_addr *addr, int family)
 {
         struct tcp_sock *tp = tcp_sk(sk);
-        int i;
-
-        for (i = 0; i < tp->md5sig_info->entries4; i++) {
-                if (tp->md5sig_info->keys4[i].addr == addr) {
-                        /* Free the key */
-                        kfree(tp->md5sig_info->keys4[i].base.key);
-                        tp->md5sig_info->entries4--;
-
-                        if (tp->md5sig_info->entries4 == 0) {
-                                kfree(tp->md5sig_info->keys4);
-                                tp->md5sig_info->keys4 = NULL;
-                                tp->md5sig_info->alloced4 = 0;
-                                tcp_free_md5sig_pool();
-                        } else if (tp->md5sig_info->entries4 != i) {
-                                /* Need to do some manipulation */
-                                memmove(&tp->md5sig_info->keys4[i],
-                                        &tp->md5sig_info->keys4[i+1],
-                                        (tp->md5sig_info->entries4 - i) *
-                                         sizeof(struct tcp4_md5sig_key));
-                        }
-                        return 0;
-                }
-        }
-        return -ENOENT;
+        struct tcp_md5sig_key *key;
+        struct tcp_md5sig_info *md5sig;
+
+        key = tcp_md5_do_lookup(sk, (union tcp_md5_addr *)&addr, AF_INET);
+        if (!key)
+                return -ENOENT;
+        hlist_del_rcu(&key->node);
+        atomic_sub(sizeof(*key), &sk->sk_omem_alloc);
+        kfree_rcu(key, rcu);
+        md5sig = rcu_dereference_protected(tp->md5sig_info,
+                                           sock_owned_by_user(sk));
+        if (hlist_empty(&md5sig->head))
+                tcp_free_md5sig_pool();
+        return 0;
 }
-EXPORT_SYMBOL(tcp_v4_md5_do_del);
+EXPORT_SYMBOL(tcp_md5_do_del);
 
-static void tcp_v4_clear_md5_list(struct sock *sk)
+void tcp_clear_md5_list(struct sock *sk)
 {
         struct tcp_sock *tp = tcp_sk(sk);
+        struct tcp_md5sig_key *key;
+        struct hlist_node *pos, *n;
+        struct tcp_md5sig_info *md5sig;
 
-        /* Free each key, then the set of key keys,
-         * the crypto element, and then decrement our
-         * hold on the last resort crypto.
-         */
-        if (tp->md5sig_info->entries4) {
-                int i;
-                for (i = 0; i < tp->md5sig_info->entries4; i++)
-                        kfree(tp->md5sig_info->keys4[i].base.key);
-                tp->md5sig_info->entries4 = 0;
+        md5sig = rcu_dereference_protected(tp->md5sig_info, 1);
+
+        if (!hlist_empty(&md5sig->head))
                 tcp_free_md5sig_pool();
-        }
-        if (tp->md5sig_info->keys4) {
-                kfree(tp->md5sig_info->keys4);
-                tp->md5sig_info->keys4 = NULL;
-                tp->md5sig_info->alloced4  = 0;
+        hlist_for_each_entry_safe(key, pos, n, &md5sig->head, node) {
+                hlist_del_rcu(&key->node);
+                atomic_sub(sizeof(*key), &sk->sk_omem_alloc);
+                kfree_rcu(key, rcu);
         }
 }
 
@@ -1036,7 +1054,6 @@ static int tcp_v4_parse_md5_keys(struct sock *sk, char __user *optval,
 {
         struct tcp_md5sig cmd;
         struct sockaddr_in *sin = (struct sockaddr_in *)&cmd.tcpm_addr;
-        u8 *newkey;
 
         if (optlen < sizeof(cmd))
                 return -EINVAL;
@@ -1047,32 +1064,16 @@ static int tcp_v4_parse_md5_keys(struct sock *sk, char __user *optval,
         if (sin->sin_family != AF_INET)
                 return -EINVAL;
 
-        if (!cmd.tcpm_key || !cmd.tcpm_keylen) {
-                if (!tcp_sk(sk)->md5sig_info)
-                        return -ENOENT;
-                return tcp_v4_md5_do_del(sk, sin->sin_addr.s_addr);
-        }
+        if (!cmd.tcpm_key || !cmd.tcpm_keylen)
+                return tcp_md5_do_del(sk, (union tcp_md5_addr *)&sin->sin_addr.s_addr,
+                                      AF_INET);
 
         if (cmd.tcpm_keylen > TCP_MD5SIG_MAXKEYLEN)
                 return -EINVAL;
 
-        if (!tcp_sk(sk)->md5sig_info) {
-                struct tcp_sock *tp = tcp_sk(sk);
-                struct tcp_md5sig_info *p;
-
-                p = kzalloc(sizeof(*p), sk->sk_allocation);
-                if (!p)
-                        return -EINVAL;
-
-                tp->md5sig_info = p;
-                sk_nocaps_add(sk, NETIF_F_GSO_MASK);
-        }
-
-        newkey = kmemdup(cmd.tcpm_key, cmd.tcpm_keylen, sk->sk_allocation);
-        if (!newkey)
-                return -ENOMEM;
-        return tcp_v4_md5_do_add(sk, sin->sin_addr.s_addr,
-                                 newkey, cmd.tcpm_keylen);
+        return tcp_md5_do_add(sk, (union tcp_md5_addr *)&sin->sin_addr.s_addr,
+                              AF_INET, cmd.tcpm_key, cmd.tcpm_keylen,
+                              GFP_KERNEL);
 }
 
 static int tcp_v4_md5_hash_pseudoheader(struct tcp_md5sig_pool *hp,
@@ -1098,7 +1099,7 @@ static int tcp_v4_md5_hash_pseudoheader(struct tcp_md5sig_pool *hp,
         return crypto_hash_update(&hp->md5_desc, &sg, sizeof(*bp));
 }
 
-static int tcp_v4_md5_hash_hdr(char *md5_hash, struct tcp_md5sig_key *key,
+static int tcp_v4_md5_hash_hdr(char *md5_hash, const struct tcp_md5sig_key *key,
                                __be32 daddr, __be32 saddr, const struct tcphdr *th)
 {
         struct tcp_md5sig_pool *hp;
@@ -1198,7 +1199,8 @@ static int tcp_v4_inbound_md5_hash(struct sock *sk, const struct sk_buff *skb)
         int genhash;
         unsigned char newhash[16];
 
-        hash_expected = tcp_v4_md5_do_lookup(sk, iph->saddr);
+        hash_expected = tcp_md5_do_lookup(sk, (union tcp_md5_addr *)&iph->saddr,
+                                          AF_INET);
         hash_location = tcp_parse_md5sig_option(th);
 
         /* We've parsed the options - do we have a hash? */
@@ -1486,7 +1488,8 @@ struct sock *tcp_v4_syn_recv_sock(struct sock *sk, struct sk_buff *skb,
 
 #ifdef CONFIG_TCP_MD5SIG
         /* Copy over the MD5 key from the original socket */
-        key = tcp_v4_md5_do_lookup(sk, newinet->inet_daddr);
+        key = tcp_md5_do_lookup(sk, (union tcp_md5_addr *)&newinet->inet_daddr,
+                                AF_INET);
         if (key != NULL) {
                 /*
                  * We're using one, so create a matching key
@@ -1494,10 +1497,8 @@ struct sock *tcp_v4_syn_recv_sock(struct sock *sk, struct sk_buff *skb,
                  * memory, then we end up not copying the key
                  * across. Shucks.
                  */
-                char *newkey = kmemdup(key->key, key->keylen, GFP_ATOMIC);
-                if (newkey != NULL)
-                        tcp_v4_md5_do_add(newsk, newinet->inet_daddr,
-                                          newkey, key->keylen);
+                tcp_md5_do_add(newsk, (union tcp_md5_addr *)&newinet->inet_daddr,
+                               AF_INET, key->key, key->keylen, GFP_ATOMIC);
                 sk_nocaps_add(newsk, NETIF_F_GSO_MASK);
         }
 #endif
@@ -1858,7 +1859,6 @@ EXPORT_SYMBOL(ipv4_specific);
 static const struct tcp_sock_af_ops tcp_sock_ipv4_specific = {
         .md5_lookup             = tcp_v4_md5_lookup,
         .calc_md5_hash          = tcp_v4_md5_hash_skb,
-        .md5_add                = tcp_v4_md5_add_func,
         .md5_parse              = tcp_v4_parse_md5_keys,
 };
 #endif
@@ -1947,8 +1947,8 @@ void tcp_v4_destroy_sock(struct sock *sk)
 #ifdef CONFIG_TCP_MD5SIG
         /* Clean up the MD5 key list, if any */
         if (tp->md5sig_info) {
-                tcp_v4_clear_md5_list(sk);
-                kfree(tp->md5sig_info);
+                tcp_clear_md5_list(sk);
+                kfree_rcu(tp->md5sig_info, rcu);
                 tp->md5sig_info = NULL;
         }
 #endif
diff --git a/net/ipv4/tcp_minisocks.c b/net/ipv4/tcp_minisocks.c
index 550e755747e0..3cabafb5cdd1 100644
--- a/net/ipv4/tcp_minisocks.c
+++ b/net/ipv4/tcp_minisocks.c
@@ -359,13 +359,11 @@ void tcp_time_wait(struct sock *sk, int state, int timeo)
                  */
                 do {
                         struct tcp_md5sig_key *key;
-                        memset(tcptw->tw_md5_key, 0, sizeof(tcptw->tw_md5_key));
-                        tcptw->tw_md5_keylen = 0;
+                        tcptw->tw_md5_key = NULL;
                         key = tp->af_specific->md5_lookup(sk, sk);
                         if (key != NULL) {
-                                memcpy(&tcptw->tw_md5_key, key->key, key->keylen);
-                                tcptw->tw_md5_keylen = key->keylen;
-                                if (tcp_alloc_md5sig_pool(sk) == NULL)
+                                tcptw->tw_md5_key = kmemdup(key, sizeof(*key), GFP_ATOMIC);
+                                if (tcptw->tw_md5_key && tcp_alloc_md5sig_pool(sk) == NULL)
                                         BUG();
                         }
                 } while (0);
@@ -405,8 +403,10 @@ void tcp_twsk_destructor(struct sock *sk)
 {
 #ifdef CONFIG_TCP_MD5SIG
         struct tcp_timewait_sock *twsk = tcp_twsk(sk);
-        if (twsk->tw_md5_keylen)
+        if (twsk->tw_md5_key) {
                 tcp_free_md5sig_pool();
+                kfree_rcu(twsk->tw_md5_key, rcu);
+        }
 #endif
 }
 EXPORT_SYMBOL_GPL(tcp_twsk_destructor);
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c
index 4ff3b6dc74fc..364784a91939 100644
--- a/net/ipv4/tcp_output.c
+++ b/net/ipv4/tcp_output.c
@@ -2306,8 +2306,10 @@ begin_fwd:
                 if (sacked & (TCPCB_SACKED_ACKED|TCPCB_SACKED_RETRANS))
                         continue;
 
-                if (tcp_retransmit_skb(sk, skb))
+                if (tcp_retransmit_skb(sk, skb)) {
+                        NET_INC_STATS_BH(sock_net(sk), LINUX_MIB_TCPRETRANSFAIL);
                         return;
+                }
                 NET_INC_STATS_BH(sock_net(sk), mib_idx);
 
                 if (inet_csk(sk)->icsk_ca_state == TCP_CA_Recovery)
diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
index 5d075b5f70fc..cd99f1a0f59f 100644
--- a/net/ipv4/udp.c
+++ b/net/ipv4/udp.c
@@ -917,7 +917,8 @@ int udp_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
                 if (!saddr)
                         saddr = inet->mc_addr;
                 connected = 0;
-        }
+        } else if (!ipc.oif)
+                ipc.oif = inet->uc_index;
 
         if (connected)
                 rt = (struct rtable *)sk_dst_check(sk, 0);
diff --git a/net/ipv6/anycast.c b/net/ipv6/anycast.c
index 59402b4637f9..db00d27ffb16 100644
--- a/net/ipv6/anycast.c
+++ b/net/ipv6/anycast.c
@@ -211,35 +211,6 @@ void ipv6_sock_ac_close(struct sock *sk)
         rcu_read_unlock();
 }
 
-#if 0
-/* The function is not used, which is funny. Apparently, author
- * supposed to use it to filter out datagrams inside udp/raw but forgot.
- *
- * It is OK, anycasts are not special comparing to delivery to unicasts.
- */
-
-int inet6_ac_check(struct sock *sk, struct in6_addr *addr, int ifindex)
-{
-        struct ipv6_ac_socklist *pac;
-        struct ipv6_pinfo *np = inet6_sk(sk);
-        int     found;
-
-        found = 0;
-        read_lock(&ipv6_sk_ac_lock);
-        for (pac=np->ipv6_ac_list; pac; pac=pac->acl_next) {
-                if (ifindex && pac->acl_ifindex != ifindex)
-                        continue;
-                found = ipv6_addr_equal(&pac->acl_addr, addr);
-                if (found)
-                        break;
-        }
-        read_unlock(&ipv6_sk_ac_lock);
-
-        return found;
-}
-
-#endif
-
 static void aca_put(struct ifacaddr6 *ac)
 {
         if (atomic_dec_and_test(&ac->aca_refcnt)) {
diff --git a/net/ipv6/icmp.c b/net/ipv6/icmp.c
index 01d46bff63c3..af88934e4d79 100644
--- a/net/ipv6/icmp.c
+++ b/net/ipv6/icmp.c
@@ -468,6 +468,8 @@ void icmpv6_send(struct sk_buff *skb, u8 type, u8 code, __u32 info)
 
         if (!fl6.flowi6_oif && ipv6_addr_is_multicast(&fl6.daddr))
                 fl6.flowi6_oif = np->mcast_oif;
+        else if (!fl6.flowi6_oif)
+                fl6.flowi6_oif = np->ucast_oif;
 
         dst = icmpv6_route_lookup(net, skb, sk, &fl6);
         if (IS_ERR(dst))
@@ -553,6 +555,8 @@ static void icmpv6_echo_reply(struct sk_buff *skb)
 
         if (!fl6.flowi6_oif && ipv6_addr_is_multicast(&fl6.daddr))
                 fl6.flowi6_oif = np->mcast_oif;
+        else if (!fl6.flowi6_oif)
+                fl6.flowi6_oif = np->ucast_oif;
 
         err = ip6_dst_lookup(sk, &dst, &fl6);
         if (err)
diff --git a/net/ipv6/ip6_fib.c b/net/ipv6/ip6_fib.c
index b82bcde53f7a..5b27fbcae346 100644
--- a/net/ipv6/ip6_fib.c
+++ b/net/ipv6/ip6_fib.c
@@ -1552,11 +1552,20 @@ static int fib6_age(struct rt6_info *rt, void *arg)
                     time_after_eq(now, rt->dst.lastuse + gc_args.timeout)) {
                         RT6_TRACE("aging clone %p\n", rt);
                         return -1;
-                } else if ((rt->rt6i_flags & RTF_GATEWAY) &&
-                           (!(dst_get_neighbour_noref_raw(&rt->dst)->flags & NTF_ROUTER))) {
-                        RT6_TRACE("purging route %p via non-router but gateway\n",
-                                  rt);
-                        return -1;
+                } else if (rt->rt6i_flags & RTF_GATEWAY) {
+                        struct neighbour *neigh;
+                        __u8 neigh_flags = 0;
+
+                        neigh = dst_neigh_lookup(&rt->dst, &rt->rt6i_gateway);
+                        if (neigh) {
+                                neigh_flags = neigh->flags;
+                                neigh_release(neigh);
+                        }
+                        if (neigh_flags & NTF_ROUTER) {
+                                RT6_TRACE("purging route %p via non-router but gateway\n",
+                                          rt);
+                                return -1;
+                        }
                 }
                 gc_args.more++;
         }
diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c
index d97e07183ce9..7a98fc2a5d97 100644
--- a/net/ipv6/ip6_output.c
+++ b/net/ipv6/ip6_output.c
@@ -388,7 +388,6 @@ int ip6_forward(struct sk_buff *skb)
         struct ipv6hdr *hdr = ipv6_hdr(skb);
         struct inet6_skb_parm *opt = IP6CB(skb);
         struct net *net = dev_net(dst->dev);
-        struct neighbour *n;
         u32 mtu;
 
         if (net->ipv6.devconf_all->forwarding == 0)
@@ -463,8 +462,7 @@ int ip6_forward(struct sk_buff *skb)
            send redirects to source routed frames.
            We don't send redirects to frames decapsulated from IPsec.
          */
-        n = dst_get_neighbour_noref(dst);
-        if (skb->dev == dst->dev && n && opt->srcrt == 0 && !skb_sec_path(skb)) {
+        if (skb->dev == dst->dev && opt->srcrt == 0 && !skb_sec_path(skb)) {
                 struct in6_addr *target = NULL;
                 struct rt6_info *rt;
 
@@ -474,8 +472,8 @@ int ip6_forward(struct sk_buff *skb)
                  */
 
                 rt = (struct rt6_info *) dst;
-                if ((rt->rt6i_flags & RTF_GATEWAY))
-                        target = (struct in6_addr*)&n->primary_key;
+                if (rt->rt6i_flags & RTF_GATEWAY)
+                        target = &rt->rt6i_gateway;
                 else
                         target = &hdr->daddr;
 
@@ -486,7 +484,7 @@ int ip6_forward(struct sk_buff *skb)
                    and by source (inside ndisc_send_redirect)
                  */
                 if (inet_peer_xrlim_allow(rt->rt6i_peer, 1*HZ))
-                        ndisc_send_redirect(skb, n, target);
+                        ndisc_send_redirect(skb, target);
         } else {
                 int addrtype = ipv6_addr_type(&hdr->saddr);
 
diff --git a/net/ipv6/ipv6_sockglue.c b/net/ipv6/ipv6_sockglue.c
index 18a2719003c3..6d6b65fdaa1a 100644
--- a/net/ipv6/ipv6_sockglue.c
+++ b/net/ipv6/ipv6_sockglue.c
@@ -516,6 +516,36 @@ done:
                 retv = 0;
                 break;
 
+        case IPV6_UNICAST_IF:
+        {
+                struct net_device *dev = NULL;
+                int ifindex;
+
+                if (optlen != sizeof(int))
+                        goto e_inval;
+
+                ifindex = (__force int)ntohl((__force __be32)val);
+                if (ifindex == 0) {
+                        np->ucast_oif = 0;
+                        retv = 0;
+                        break;
+                }
+
+                dev = dev_get_by_index(net, ifindex);
+                retv = -EADDRNOTAVAIL;
+                if (!dev)
+                        break;
+                dev_put(dev);
+
+                retv = -EINVAL;
+                if (sk->sk_bound_dev_if)
+                        break;
+
+                np->ucast_oif = ifindex;
+                retv = 0;
+                break;
+        }
+
         case IPV6_MULTICAST_IF:
                 if (sk->sk_type == SOCK_STREAM)
                         break;
@@ -1160,6 +1190,10 @@ static int do_ipv6_getsockopt(struct sock *sk, int level, int optname,
                 val = np->mcast_oif;
                 break;
 
+        case IPV6_UNICAST_IF:
+                val = (__force int)htonl((__u32) np->ucast_oif);
+                break;
+
         case IPV6_MTU_DISCOVER:
                 val = np->pmtudisc;
                 break;
diff --git a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c
index d8f02ef88e59..8d817018c188 100644
--- a/net/ipv6/ndisc.c
+++ b/net/ipv6/ndisc.c
@@ -1223,11 +1223,17 @@ static void ndisc_router_discovery(struct sk_buff *skb)
 
         rt = rt6_get_dflt_router(&ipv6_hdr(skb)->saddr, skb->dev);
 
-        if (rt)
-                neigh = dst_get_neighbour_noref(&rt->dst);
-
+        if (rt) {
+                neigh = dst_neigh_lookup(&rt->dst, &ipv6_hdr(skb)->saddr);
+                if (!neigh) {
+                        ND_PRINTK0(KERN_ERR
+                                   "ICMPv6 RA: %s() got default router without neighbour.\n",
+                                   __func__);
+                        dst_release(&rt->dst);
+                        return;
+                }
+        }
         if (rt && lifetime == 0) {
-                neigh_clone(neigh);
                 ip6_del_rt(rt);
                 rt = NULL;
         }
@@ -1244,7 +1250,7 @@ static void ndisc_router_discovery(struct sk_buff *skb)
                         return;
                 }
 
-                neigh = dst_get_neighbour_noref(&rt->dst);
+                neigh = dst_neigh_lookup(&rt->dst, &ipv6_hdr(skb)->saddr);
                 if (neigh == NULL) {
                         ND_PRINTK0(KERN_ERR
                                    "ICMPv6 RA: %s() got default router without neighbour.\n",
@@ -1411,7 +1417,7 @@ skip_routeinfo:
 out:
         if (rt)
                 dst_release(&rt->dst);
-        else if (neigh)
+        if (neigh)
                 neigh_release(neigh);
 }
 
@@ -1506,8 +1512,7 @@ static void ndisc_redirect_rcv(struct sk_buff *skb)
         }
 }
 
-void ndisc_send_redirect(struct sk_buff *skb, struct neighbour *neigh,
-                         const struct in6_addr *target)
+void ndisc_send_redirect(struct sk_buff *skb, const struct in6_addr *target)
 {
         struct net_device *dev = skb->dev;
         struct net *net = dev_net(dev);
@@ -1565,6 +1570,13 @@ void ndisc_send_redirect(struct sk_buff *skb, struct neighbour *neigh,
                 goto release;
 
         if (dev->addr_len) {
+                struct neighbour *neigh = dst_neigh_lookup(skb_dst(skb), target);
+                if (!neigh) {
+                        ND_PRINTK2(KERN_WARNING
+                                   "ICMPv6 Redirect: no neigh for target address\n");
+                        goto release;
+                }
+
                 read_lock_bh(&neigh->lock);
                 if (neigh->nud_state & NUD_VALID) {
                         memcpy(ha_buf, neigh->ha, dev->addr_len);
@@ -1573,6 +1585,8 @@ void ndisc_send_redirect(struct sk_buff *skb, struct neighbour *neigh,
                         len += ndisc_opt_addr_space(dev);
                 } else
                         read_unlock_bh(&neigh->lock);
+
+                neigh_release(neigh);
         }
 
         rd_len = min_t(unsigned int,
diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c
index d02f7e4dd611..5bddea778840 100644
--- a/net/ipv6/raw.c
+++ b/net/ipv6/raw.c
@@ -856,6 +856,8 @@ static int rawv6_sendmsg(struct kiocb *iocb, struct sock *sk,
 
         if (!fl6.flowi6_oif && ipv6_addr_is_multicast(&fl6.daddr))
                 fl6.flowi6_oif = np->mcast_oif;
+        else if (!fl6.flowi6_oif)
+                fl6.flowi6_oif = np->ucast_oif;
         security_sk_classify_flow(sk, flowi6_to_flowi(&fl6));
 
         dst = ip6_dst_lookup_flow(sk, &fl6, final_p, true);
diff --git a/net/ipv6/reassembly.c b/net/ipv6/reassembly.c
index b69fae76a6f1..9447bd69873a 100644
--- a/net/ipv6/reassembly.c
+++ b/net/ipv6/reassembly.c
@@ -336,12 +336,11 @@ static int ip6_frag_queue(struct frag_queue *fq, struct sk_buff *skb,
         }
 
 found:
-        /* RFC5722, Section 4:
-         *                                  When reassembling an IPv6 datagram, if
+        /* RFC5722, Section 4, amended by Errata ID : 3089
+         *                          When reassembling an IPv6 datagram, if
          *   one or more its constituent fragments is determined to be an
          *   overlapping fragment, the entire datagram (and any constituent
-         *   fragments, including those not yet received) MUST be silently
-         *   discarded.
+         *   fragments) MUST be silently discarded.
          */
 
         /* Check for overlap with preceding fragment. */
diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index 8c2e3ab58f2a..92be12bb8d23 100644
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -121,9 +121,22 @@ 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)
+{
+        struct in6_addr *p = &rt->rt6i_gateway;
+
+        if (!ipv6_addr_any(p))
+                return (const void *) p;
+        return daddr;
+}
+
 static struct neighbour *ip6_neigh_lookup(const struct dst_entry *dst, const void *daddr)
 {
-        struct neighbour *n = __ipv6_neigh_lookup(&nd_tbl, dst->dev, daddr);
+        struct rt6_info *rt = (struct rt6_info *) dst;
+        struct neighbour *n;
+
+        daddr = choose_neigh_daddr(rt, daddr);
+        n = __ipv6_neigh_lookup(&nd_tbl, dst->dev, daddr);
         if (n)
                 return n;
         return neigh_create(&nd_tbl, daddr, dst->dev);
diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c
index 133768e52912..c4ffd1743528 100644
--- a/net/ipv6/sit.c
+++ b/net/ipv6/sit.c
@@ -680,9 +680,10 @@ static netdev_tx_t ipip6_tunnel_xmit(struct sk_buff *skb,
         /* ISATAP (RFC4214) - must come before 6to4 */
         if (dev->priv_flags & IFF_ISATAP) {
                 struct neighbour *neigh = NULL;
+                bool do_tx_error = false;
 
                 if (skb_dst(skb))
-                        neigh = dst_get_neighbour_noref(skb_dst(skb));
+                        neigh = dst_neigh_lookup(skb_dst(skb), &iph6->daddr);
 
                 if (neigh == NULL) {
                         if (net_ratelimit())
@@ -697,6 +698,10 @@ static netdev_tx_t ipip6_tunnel_xmit(struct sk_buff *skb,
                      ipv6_addr_is_isatap(addr6))
                         dst = addr6->s6_addr32[3];
                 else
+                        do_tx_error = true;
+
+                neigh_release(neigh);
+                if (do_tx_error)
                         goto tx_error;
         }
 
@@ -705,9 +710,10 @@ static netdev_tx_t ipip6_tunnel_xmit(struct sk_buff *skb,
 
         if (!dst) {
                 struct neighbour *neigh = NULL;
+                bool do_tx_error = false;
 
                 if (skb_dst(skb))
-                        neigh = dst_get_neighbour_noref(skb_dst(skb));
+                        neigh = dst_neigh_lookup(skb_dst(skb), &iph6->daddr);
 
                 if (neigh == NULL) {
                         if (net_ratelimit())
@@ -723,10 +729,14 @@ static netdev_tx_t ipip6_tunnel_xmit(struct sk_buff *skb,
                         addr_type = ipv6_addr_type(addr6);
                 }
 
-                if ((addr_type & IPV6_ADDR_COMPATv4) == 0)
-                        goto tx_error_icmp;
+                if ((addr_type & IPV6_ADDR_COMPATv4) != 0)
+                        dst = addr6->s6_addr32[3];
+                else
+                        do_tx_error = true;
 
-                dst = addr6->s6_addr32[3];
+                neigh_release(neigh);
+                if (do_tx_error)
+                        goto tx_error;
         }
 
         rt = ip_route_output_ports(dev_net(dev), &fl4, NULL,
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
index 3edd05ae4388..d16414cb3421 100644
--- a/net/ipv6/tcp_ipv6.c
+++ b/net/ipv6/tcp_ipv6.c
@@ -540,19 +540,7 @@ static void tcp_v6_reqsk_destructor(struct request_sock *req)
 static struct tcp_md5sig_key *tcp_v6_md5_do_lookup(struct sock *sk,
                                                    const struct in6_addr *addr)
 {
-        struct tcp_sock *tp = tcp_sk(sk);
-        int i;
-
-        BUG_ON(tp == NULL);
-
-        if (!tp->md5sig_info || !tp->md5sig_info->entries6)
-                return NULL;
-
-        for (i = 0; i < tp->md5sig_info->entries6; i++) {
-                if (ipv6_addr_equal(&tp->md5sig_info->keys6[i].addr, addr))
-                        return &tp->md5sig_info->keys6[i].base;
-        }
-        return NULL;
+        return tcp_md5_do_lookup(sk, (union tcp_md5_addr *)addr, AF_INET6);
 }
 
 static struct tcp_md5sig_key *tcp_v6_md5_lookup(struct sock *sk,
@@ -567,136 +555,11 @@ static struct tcp_md5sig_key *tcp_v6_reqsk_md5_lookup(struct sock *sk,
         return tcp_v6_md5_do_lookup(sk, &inet6_rsk(req)->rmt_addr);
 }
 
-static int tcp_v6_md5_do_add(struct sock *sk, const struct in6_addr *peer,
-                             char *newkey, u8 newkeylen)
-{
-        /* Add key to the list */
-        struct tcp_md5sig_key *key;
-        struct tcp_sock *tp = tcp_sk(sk);
-        struct tcp6_md5sig_key *keys;
-
-        key = tcp_v6_md5_do_lookup(sk, peer);
-        if (key) {
-                /* modify existing entry - just update that one */
-                kfree(key->key);
-                key->key = newkey;
-                key->keylen = newkeylen;
-        } else {
-                /* reallocate new list if current one is full. */
-                if (!tp->md5sig_info) {
-                        tp->md5sig_info = kzalloc(sizeof(*tp->md5sig_info), GFP_ATOMIC);
-                        if (!tp->md5sig_info) {
-                                kfree(newkey);
-                                return -ENOMEM;
-                        }
-                        sk_nocaps_add(sk, NETIF_F_GSO_MASK);
-                }
-                if (tp->md5sig_info->entries6 == 0 &&
-                        tcp_alloc_md5sig_pool(sk) == NULL) {
-                        kfree(newkey);
-                        return -ENOMEM;
-                }
-                if (tp->md5sig_info->alloced6 == tp->md5sig_info->entries6) {
-                        keys = kmalloc((sizeof (tp->md5sig_info->keys6[0]) *
-                                       (tp->md5sig_info->entries6 + 1)), GFP_ATOMIC);
-
-                        if (!keys) {
-                                kfree(newkey);
-                                if (tp->md5sig_info->entries6 == 0)
-                                        tcp_free_md5sig_pool();
-                                return -ENOMEM;
-                        }
-
-                        if (tp->md5sig_info->entries6)
-                                memmove(keys, tp->md5sig_info->keys6,
-                                        (sizeof (tp->md5sig_info->keys6[0]) *
-                                         tp->md5sig_info->entries6));
-
-                        kfree(tp->md5sig_info->keys6);
-                        tp->md5sig_info->keys6 = keys;
-                        tp->md5sig_info->alloced6++;
-                }
-
-                tp->md5sig_info->keys6[tp->md5sig_info->entries6].addr = *peer;
-                tp->md5sig_info->keys6[tp->md5sig_info->entries6].base.key = newkey;
-                tp->md5sig_info->keys6[tp->md5sig_info->entries6].base.keylen = newkeylen;
-
-                tp->md5sig_info->entries6++;
-        }
-        return 0;
-}
-
-static int tcp_v6_md5_add_func(struct sock *sk, struct sock *addr_sk,
-                               u8 *newkey, __u8 newkeylen)
-{
-        return tcp_v6_md5_do_add(sk, &inet6_sk(addr_sk)->daddr,
-                                 newkey, newkeylen);
-}
-
-static int tcp_v6_md5_do_del(struct sock *sk, const struct in6_addr *peer)
-{
-        struct tcp_sock *tp = tcp_sk(sk);
-        int i;
-
-        for (i = 0; i < tp->md5sig_info->entries6; i++) {
-                if (ipv6_addr_equal(&tp->md5sig_info->keys6[i].addr, peer)) {
-                        /* Free the key */
-                        kfree(tp->md5sig_info->keys6[i].base.key);
-                        tp->md5sig_info->entries6--;
-
-                        if (tp->md5sig_info->entries6 == 0) {
-                                kfree(tp->md5sig_info->keys6);
-                                tp->md5sig_info->keys6 = NULL;
-                                tp->md5sig_info->alloced6 = 0;
-                                tcp_free_md5sig_pool();
-                        } else {
-                                /* shrink the database */
-                                if (tp->md5sig_info->entries6 != i)
-                                        memmove(&tp->md5sig_info->keys6[i],
-                                                &tp->md5sig_info->keys6[i+1],
-                                                (tp->md5sig_info->entries6 - i)
-                                                * sizeof (tp->md5sig_info->keys6[0]));
-                        }
-                        return 0;
-                }
-        }
-        return -ENOENT;
-}
-
-static void tcp_v6_clear_md5_list (struct sock *sk)
-{
-        struct tcp_sock *tp = tcp_sk(sk);
-        int i;
-
-        if (tp->md5sig_info->entries6) {
-                for (i = 0; i < tp->md5sig_info->entries6; i++)
-                        kfree(tp->md5sig_info->keys6[i].base.key);
-                tp->md5sig_info->entries6 = 0;
-                tcp_free_md5sig_pool();
-        }
-
-        kfree(tp->md5sig_info->keys6);
-        tp->md5sig_info->keys6 = NULL;
-        tp->md5sig_info->alloced6 = 0;
-
-        if (tp->md5sig_info->entries4) {
-                for (i = 0; i < tp->md5sig_info->entries4; i++)
-                        kfree(tp->md5sig_info->keys4[i].base.key);
-                tp->md5sig_info->entries4 = 0;
-                tcp_free_md5sig_pool();
-        }
-
-        kfree(tp->md5sig_info->keys4);
-        tp->md5sig_info->keys4 = NULL;
-        tp->md5sig_info->alloced4 = 0;
-}
-
 static int tcp_v6_parse_md5_keys (struct sock *sk, char __user *optval,
                                   int optlen)
 {
         struct tcp_md5sig cmd;
         struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *)&cmd.tcpm_addr;
-        u8 *newkey;
 
         if (optlen < sizeof(cmd))
                 return -EINVAL;
@@ -708,36 +571,22 @@ static int tcp_v6_parse_md5_keys (struct sock *sk, char __user *optval,
                 return -EINVAL;
 
         if (!cmd.tcpm_keylen) {
-                if (!tcp_sk(sk)->md5sig_info)
-                        return -ENOENT;
                 if (ipv6_addr_v4mapped(&sin6->sin6_addr))
-                        return tcp_v4_md5_do_del(sk, sin6->sin6_addr.s6_addr32[3]);
-                return tcp_v6_md5_do_del(sk, &sin6->sin6_addr);
+                        return tcp_md5_do_del(sk, (union tcp_md5_addr *)&sin6->sin6_addr.s6_addr32[3],
+                                              AF_INET);
+                return tcp_md5_do_del(sk, (union tcp_md5_addr *)&sin6->sin6_addr,
+                                      AF_INET6);
         }
 
         if (cmd.tcpm_keylen > TCP_MD5SIG_MAXKEYLEN)
                 return -EINVAL;
 
-        if (!tcp_sk(sk)->md5sig_info) {
-                struct tcp_sock *tp = tcp_sk(sk);
-                struct tcp_md5sig_info *p;
-
-                p = kzalloc(sizeof(struct tcp_md5sig_info), GFP_KERNEL);
-                if (!p)
-                        return -ENOMEM;
+        if (ipv6_addr_v4mapped(&sin6->sin6_addr))
+                return tcp_md5_do_add(sk, (union tcp_md5_addr *)&sin6->sin6_addr.s6_addr32[3],
+                                      AF_INET, cmd.tcpm_key, cmd.tcpm_keylen, GFP_KERNEL);
 
-                tp->md5sig_info = p;
-                sk_nocaps_add(sk, NETIF_F_GSO_MASK);
-        }
-
-        newkey = kmemdup(cmd.tcpm_key, cmd.tcpm_keylen, GFP_KERNEL);
-        if (!newkey)
-                return -ENOMEM;
-        if (ipv6_addr_v4mapped(&sin6->sin6_addr)) {
-                return tcp_v4_md5_do_add(sk, sin6->sin6_addr.s6_addr32[3],
-                                         newkey, cmd.tcpm_keylen);
-        }
-        return tcp_v6_md5_do_add(sk, &sin6->sin6_addr, newkey, cmd.tcpm_keylen);
+        return tcp_md5_do_add(sk, (union tcp_md5_addr *)&sin6->sin6_addr,
+                              AF_INET6, cmd.tcpm_key, cmd.tcpm_keylen, GFP_KERNEL);
 }
 
 static int tcp_v6_md5_hash_pseudoheader(struct tcp_md5sig_pool *hp,
@@ -1074,6 +923,13 @@ static void tcp_v6_send_reset(struct sock *sk, struct sk_buff *skb)
         const struct tcphdr *th = tcp_hdr(skb);
         u32 seq = 0, ack_seq = 0;
         struct tcp_md5sig_key *key = NULL;
+#ifdef CONFIG_TCP_MD5SIG
+        const __u8 *hash_location = NULL;
+        struct ipv6hdr *ipv6h = ipv6_hdr(skb);
+        unsigned char newhash[16];
+        int genhash;
+        struct sock *sk1 = NULL;
+#endif
 
         if (th->rst)
                 return;
@@ -1082,8 +938,32 @@ static void tcp_v6_send_reset(struct sock *sk, struct sk_buff *skb)
                 return;
 
 #ifdef CONFIG_TCP_MD5SIG
-        if (sk)
-                key = tcp_v6_md5_do_lookup(sk, &ipv6_hdr(skb)->saddr);
+        hash_location = tcp_parse_md5sig_option(th);
+        if (!sk && hash_location) {
+                /*
+                 * active side is lost. Try to find listening socket through
+                 * source port, and then find md5 key through listening socket.
+                 * we are not loose security here:
+                 * Incoming packet is checked with md5 hash with finding key,
+                 * no RST generated if md5 hash doesn't match.
+                 */
+                sk1 = inet6_lookup_listener(dev_net(skb_dst(skb)->dev),
+                                           &tcp_hashinfo, &ipv6h->daddr,
+                                           ntohs(th->source), inet6_iif(skb));
+                if (!sk1)
+                        return;
+
+                rcu_read_lock();
+                key = tcp_v6_md5_do_lookup(sk1, &ipv6h->saddr);
+                if (!key)
+                        goto release_sk1;
+
+                genhash = tcp_v6_md5_hash_skb(newhash, key, NULL, NULL, skb);
+                if (genhash || memcmp(hash_location, newhash, 16) != 0)
+                        goto release_sk1;
+        } else {
+                key = sk ? tcp_v6_md5_do_lookup(sk, &ipv6h->saddr) : NULL;
+        }
 #endif
 
         if (th->ack)
@@ -1093,6 +973,14 @@ static void tcp_v6_send_reset(struct sock *sk, struct sk_buff *skb)
                           (th->doff << 2);
 
         tcp_v6_send_response(skb, seq, ack_seq, 0, 0, key, 1, 0);
+
+#ifdef CONFIG_TCP_MD5SIG
+release_sk1:
+        if (sk1) {
+                rcu_read_unlock();
+                sock_put(sk1);
+        }
+#endif
 }
 
 static void tcp_v6_send_ack(struct sk_buff *skb, u32 seq, u32 ack, u32 win, u32 ts,
@@ -1510,10 +1398,8 @@ static struct sock * tcp_v6_syn_recv_sock(struct sock *sk, struct sk_buff *skb,
                  * memory, then we end up not copying the key
                  * across. Shucks.
                  */
-                char *newkey = kmemdup(key->key, key->keylen, GFP_ATOMIC);
-                if (newkey != NULL)
-                        tcp_v6_md5_do_add(newsk, &newnp->daddr,
-                                          newkey, key->keylen);
+                tcp_md5_do_add(newsk, (union tcp_md5_addr *)&newnp->daddr,
+                               AF_INET6, key->key, key->keylen, GFP_ATOMIC);
         }
 #endif
 
@@ -1898,7 +1784,6 @@ static const struct inet_connection_sock_af_ops ipv6_specific = {
 static const struct tcp_sock_af_ops tcp_sock_ipv6_specific = {
         .md5_lookup     =       tcp_v6_md5_lookup,
         .calc_md5_hash  =       tcp_v6_md5_hash_skb,
-        .md5_add        =       tcp_v6_md5_add_func,
         .md5_parse      =       tcp_v6_parse_md5_keys,
 };
 #endif
@@ -1930,7 +1815,6 @@ static const struct inet_connection_sock_af_ops ipv6_mapped = {
 static const struct tcp_sock_af_ops tcp_sock_ipv6_mapped_specific = {
         .md5_lookup     =       tcp_v4_md5_lookup,
         .calc_md5_hash  =       tcp_v4_md5_hash_skb,
-        .md5_add        =       tcp_v6_md5_add_func,
         .md5_parse      =       tcp_v6_parse_md5_keys,
 };
 #endif
@@ -2004,11 +1888,6 @@ static int tcp_v6_init_sock(struct sock *sk)
 
 static void tcp_v6_destroy_sock(struct sock *sk)
 {
-#ifdef CONFIG_TCP_MD5SIG
-        /* Clean up the MD5 key list */
-        if (tcp_sk(sk)->md5sig_info)
-                tcp_v6_clear_md5_list(sk);
-#endif
         tcp_v4_destroy_sock(sk);
         inet6_destroy_sock(sk);
 }
diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c
index 4f96b5c63685..8aebf8f90436 100644
--- a/net/ipv6/udp.c
+++ b/net/ipv6/udp.c
@@ -1130,7 +1130,8 @@ do_udp_sendmsg:
         if (!fl6.flowi6_oif && ipv6_addr_is_multicast(&fl6.daddr)) {
                 fl6.flowi6_oif = np->mcast_oif;
                 connected = 0;
-        }
+        } else if (!fl6.flowi6_oif)
+                fl6.flowi6_oif = np->ucast_oif;
 
         security_sk_classify_flow(sk, flowi6_to_flowi(&fl6));
 
diff --git a/net/ipv6/xfrm6_output.c b/net/ipv6/xfrm6_output.c
index 4eeff89c1aaa..8755a3079d0f 100644
--- a/net/ipv6/xfrm6_output.c
+++ b/net/ipv6/xfrm6_output.c
@@ -146,7 +146,7 @@ static int __xfrm6_output(struct sk_buff *skb)
                 return -EMSGSIZE;
         }
 
-        if ((x && x->props.mode == XFRM_MODE_TUNNEL) &&
+        if (x->props.mode == XFRM_MODE_TUNNEL &&
             ((skb->len > mtu && !skb_is_gso(skb)) ||
                 dst_allfrag(skb_dst(skb)))) {
                         return ip6_fragment(skb, x->outer_mode->afinfo->output_finish);
diff --git a/net/iucv/af_iucv.c b/net/iucv/af_iucv.c
index d5c5b8fd1d01..98d1f0ba7fe9 100644
--- a/net/iucv/af_iucv.c
+++ b/net/iucv/af_iucv.c
@@ -90,6 +90,7 @@ do {									\
 
 static void iucv_sock_kill(struct sock *sk);
 static void iucv_sock_close(struct sock *sk);
+static void iucv_sever_path(struct sock *, int);
 
 static int afiucv_hs_rcv(struct sk_buff *skb, struct net_device *dev,
         struct packet_type *pt, struct net_device *orig_dev);
@@ -130,17 +131,6 @@ static inline void low_nmcpy(unsigned char *dst, char *src)
        memcpy(&dst[8], src, 8);
 }
 
-static void iucv_skb_queue_purge(struct sk_buff_head *list)
-{
-        struct sk_buff *skb;
-
-        while ((skb = skb_dequeue(list)) != NULL) {
-                if (skb->dev)
-                        dev_put(skb->dev);
-                kfree_skb(skb);
-        }
-}
-
 static int afiucv_pm_prepare(struct device *dev)
 {
 #ifdef CONFIG_PM_DEBUG
@@ -175,17 +165,13 @@ static int afiucv_pm_freeze(struct device *dev)
         read_lock(&iucv_sk_list.lock);
         sk_for_each(sk, node, &iucv_sk_list.head) {
                 iucv = iucv_sk(sk);
-                iucv_skb_queue_purge(&iucv->send_skb_q);
+                skb_queue_purge(&iucv->send_skb_q);
                 skb_queue_purge(&iucv->backlog_skb_q);
                 switch (sk->sk_state) {
                 case IUCV_DISCONN:
                 case IUCV_CLOSING:
                 case IUCV_CONNECTED:
-                        if (iucv->path) {
-                                err = pr_iucv->path_sever(iucv->path, NULL);
-                                iucv_path_free(iucv->path);
-                                iucv->path = NULL;
-                        }
+                        iucv_sever_path(sk, 0);
                         break;
                 case IUCV_OPEN:
                 case IUCV_BOUND:
@@ -194,6 +180,8 @@ static int afiucv_pm_freeze(struct device *dev)
                 default:
                         break;
                 }
+                skb_queue_purge(&iucv->send_skb_q);
+                skb_queue_purge(&iucv->backlog_skb_q);
         }
         read_unlock(&iucv_sk_list.lock);
         return err;
@@ -338,7 +326,6 @@ static void iucv_sock_wake_msglim(struct sock *sk)
 static int afiucv_hs_send(struct iucv_message *imsg, struct sock *sock,
                    struct sk_buff *skb, u8 flags)
 {
-        struct net *net = sock_net(sock);
         struct iucv_sock *iucv = iucv_sk(sock);
         struct af_iucv_trans_hdr *phs_hdr;
         struct sk_buff *nskb;
@@ -375,10 +362,10 @@ static int afiucv_hs_send(struct iucv_message *imsg, struct sock *sock,
         if (imsg)
                 memcpy(&phs_hdr->iucv_hdr, imsg, sizeof(struct iucv_message));
 
-        skb->dev = dev_get_by_index(net, sock->sk_bound_dev_if);
+        skb->dev = iucv->hs_dev;
         if (!skb->dev)
                 return -ENODEV;
-        if (!(skb->dev->flags & IFF_UP))
+        if (!(skb->dev->flags & IFF_UP) || !netif_carrier_ok(skb->dev))
                 return -ENETDOWN;
         if (skb->len > skb->dev->mtu) {
                 if (sock->sk_type == SOCK_SEQPACKET)
@@ -393,15 +380,14 @@ static int afiucv_hs_send(struct iucv_message *imsg, struct sock *sock,
                 return -ENOMEM;
         skb_queue_tail(&iucv->send_skb_q, nskb);
         err = dev_queue_xmit(skb);
-        if (err) {
+        if (net_xmit_eval(err)) {
                 skb_unlink(nskb, &iucv->send_skb_q);
-                dev_put(nskb->dev);
                 kfree_skb(nskb);
         } else {
                 atomic_sub(confirm_recv, &iucv->msg_recv);
                 WARN_ON(atomic_read(&iucv->msg_recv) < 0);
         }
-        return err;
+        return net_xmit_eval(err);
 }
 
 static struct sock *__iucv_get_sock_by_name(char *nm)
@@ -447,13 +433,33 @@ static void iucv_sock_kill(struct sock *sk)
         sock_put(sk);
 }
 
+/* Terminate an IUCV path */
+static void iucv_sever_path(struct sock *sk, int with_user_data)
+{
+        unsigned char user_data[16];
+        struct iucv_sock *iucv = iucv_sk(sk);
+        struct iucv_path *path = iucv->path;
+
+        if (iucv->path) {
+                iucv->path = NULL;
+                if (with_user_data) {
+                        low_nmcpy(user_data, iucv->src_name);
+                        high_nmcpy(user_data, iucv->dst_name);
+                        ASCEBC(user_data, sizeof(user_data));
+                        pr_iucv->path_sever(path, user_data);
+                } else
+                        pr_iucv->path_sever(path, NULL);
+                iucv_path_free(path);
+        }
+}
+
 /* Close an IUCV socket */
 static void iucv_sock_close(struct sock *sk)
 {
-        unsigned char user_data[16];
         struct iucv_sock *iucv = iucv_sk(sk);
         unsigned long timeo;
-        int err, blen;
+        int err = 0;
+        int blen;
         struct sk_buff *skb;
 
         lock_sock(sk);
@@ -480,7 +486,7 @@ static void iucv_sock_close(struct sock *sk)
                 sk->sk_state = IUCV_CLOSING;
                 sk->sk_state_change(sk);
 
-                if (!skb_queue_empty(&iucv->send_skb_q)) {
+                if (!err && !skb_queue_empty(&iucv->send_skb_q)) {
                         if (sock_flag(sk, SOCK_LINGER) && sk->sk_lingertime)
                                 timeo = sk->sk_lingertime;
                         else
@@ -494,25 +500,20 @@ static void iucv_sock_close(struct sock *sk)
                 sk->sk_state = IUCV_CLOSED;
                 sk->sk_state_change(sk);
 
-                if (iucv->path) {
-                        low_nmcpy(user_data, iucv->src_name);
-                        high_nmcpy(user_data, iucv->dst_name);
-                        ASCEBC(user_data, sizeof(user_data));
-                        pr_iucv->path_sever(iucv->path, user_data);
-                        iucv_path_free(iucv->path);
-                        iucv->path = NULL;
-                }
-
                 sk->sk_err = ECONNRESET;
                 sk->sk_state_change(sk);
 
-                iucv_skb_queue_purge(&iucv->send_skb_q);
+                skb_queue_purge(&iucv->send_skb_q);
                 skb_queue_purge(&iucv->backlog_skb_q);
-                break;
 
-        default:
-                /* nothing to do here */
-                break;
+        default:   /* fall through */
+                iucv_sever_path(sk, 1);
+        }
+
+        if (iucv->hs_dev) {
+                dev_put(iucv->hs_dev);
+                iucv->hs_dev = NULL;
+                sk->sk_bound_dev_if = 0;
         }
 
         /* mark socket for deletion by iucv_sock_kill() */
@@ -706,7 +707,6 @@ static int iucv_sock_bind(struct socket *sock, struct sockaddr *addr,
                 goto done_unlock;
 
         /* Bind the socket */
-
         if (pr_iucv)
                 if (!memcmp(sa->siucv_user_id, iucv_userid, 8))
                         goto vm_bind; /* VM IUCV transport */
@@ -720,6 +720,8 @@ static int iucv_sock_bind(struct socket *sock, struct sockaddr *addr,
                         memcpy(iucv->src_name, sa->siucv_name, 8);
                         memcpy(iucv->src_user_id, sa->siucv_user_id, 8);
                         sk->sk_bound_dev_if = dev->ifindex;
+                        iucv->hs_dev = dev;
+                        dev_hold(dev);
                         sk->sk_state = IUCV_BOUND;
                         iucv->transport = AF_IUCV_TRANS_HIPER;
                         if (!iucv->msglimit)
@@ -894,11 +896,8 @@ static int iucv_sock_connect(struct socket *sock, struct sockaddr *addr,
         if (sk->sk_state == IUCV_DISCONN || sk->sk_state == IUCV_CLOSED)
                 err = -ECONNREFUSED;
 
-        if (err && iucv->transport == AF_IUCV_TRANS_IUCV) {
-                pr_iucv->path_sever(iucv->path, NULL);
-                iucv_path_free(iucv->path);
-                iucv->path = NULL;
-        }
+        if (err && iucv->transport == AF_IUCV_TRANS_IUCV)
+                iucv_sever_path(sk, 0);
 
 done:
         release_sock(sk);
@@ -1124,8 +1123,10 @@ static int iucv_sock_sendmsg(struct kiocb *iocb, struct socket *sock,
                         noblock, &err);
         else
                 skb = sock_alloc_send_skb(sk, len, noblock, &err);
-        if (!skb)
+        if (!skb) {
+                err = -ENOMEM;
                 goto out;
+        }
         if (iucv->transport == AF_IUCV_TRANS_HIPER)
                 skb_reserve(skb, sizeof(struct af_iucv_trans_hdr) + ETH_HLEN);
         if (memcpy_fromiovec(skb_put(skb, len), msg->msg_iov, len)) {
@@ -1148,6 +1149,7 @@ static int iucv_sock_sendmsg(struct kiocb *iocb, struct socket *sock,
         /* increment and save iucv message tag for msg_completion cbk */
         txmsg.tag = iucv->send_tag++;
         memcpy(CB_TAG(skb), &txmsg.tag, CB_TAG_LEN);
+
         if (iucv->transport == AF_IUCV_TRANS_HIPER) {
                 atomic_inc(&iucv->msg_sent);
                 err = afiucv_hs_send(&txmsg, sk, skb, 0);
@@ -1202,8 +1204,6 @@ release:
         return len;
 
 fail:
-        if (skb->dev)
-                dev_put(skb->dev);
         kfree_skb(skb);
 out:
         release_sock(sk);
@@ -1396,7 +1396,14 @@ static int iucv_sock_recvmsg(struct kiocb *iocb, struct socket *sock,
                 }
 
                 kfree_skb(skb);
-                atomic_inc(&iucv->msg_recv);
+                if (iucv->transport == AF_IUCV_TRANS_HIPER) {
+                        atomic_inc(&iucv->msg_recv);
+                        if (atomic_read(&iucv->msg_recv) > iucv->msglimit) {
+                                WARN_ON(1);
+                                iucv_sock_close(sk);
+                                return -EFAULT;
+                        }
+                }
 
                 /* Queue backlog skbs */
                 spin_lock_bh(&iucv->message_q.lock);
@@ -1486,7 +1493,7 @@ unsigned int iucv_sock_poll(struct file *file, struct socket *sock,
         if (sk->sk_state == IUCV_DISCONN)
                 mask |= POLLIN;
 
-        if (sock_writeable(sk))
+        if (sock_writeable(sk) && iucv_below_msglim(sk))
                 mask |= POLLOUT | POLLWRNORM | POLLWRBAND;
         else
                 set_bit(SOCK_ASYNC_NOSPACE, &sk->sk_socket->flags);
@@ -1565,13 +1572,6 @@ static int iucv_sock_release(struct socket *sock)
 
         iucv_sock_close(sk);
 
-        /* Unregister with IUCV base support */
-        if (iucv_sk(sk)->path) {
-                pr_iucv->path_sever(iucv_sk(sk)->path, NULL);
-                iucv_path_free(iucv_sk(sk)->path);
-                iucv_sk(sk)->path = NULL;
-        }
-
         sock_orphan(sk);
         iucv_sock_kill(sk);
         return err;
@@ -1633,7 +1633,8 @@ static int iucv_sock_getsockopt(struct socket *sock, int level, int optname,
 {
         struct sock *sk = sock->sk;
         struct iucv_sock *iucv = iucv_sk(sk);
-        int val, len;
+        unsigned int val;
+        int len;
 
         if (level != SOL_IUCV)
                 return -ENOPROTOOPT;
@@ -1656,6 +1657,13 @@ static int iucv_sock_getsockopt(struct socket *sock, int level, int optname,
                                            : iucv->msglimit;    /* default */
                 release_sock(sk);
                 break;
+        case SO_MSGSIZE:
+                if (sk->sk_state == IUCV_OPEN)
+                        return -EBADFD;
+                val = (iucv->hs_dev) ? iucv->hs_dev->mtu -
+                                sizeof(struct af_iucv_trans_hdr) - ETH_HLEN :
+                                0x7fffffff;
+                break;
         default:
                 return -ENOPROTOOPT;
         }
@@ -1750,8 +1758,7 @@ static int iucv_callback_connreq(struct iucv_path *path,
         path->msglim = iucv->msglimit;
         err = pr_iucv->path_accept(path, &af_iucv_handler, nuser_data, nsk);
         if (err) {
-                err = pr_iucv->path_sever(path, user_data);
-                iucv_path_free(path);
+                iucv_sever_path(nsk, 1);
                 iucv_sock_kill(nsk);
                 goto fail;
         }
@@ -1828,6 +1835,7 @@ static void iucv_callback_txdone(struct iucv_path *path,
         struct sk_buff *list_skb = list->next;
         unsigned long flags;
 
+        bh_lock_sock(sk);
         if (!skb_queue_empty(list)) {
                 spin_lock_irqsave(&list->lock, flags);
 
@@ -1849,7 +1857,6 @@ static void iucv_callback_txdone(struct iucv_path *path,
                         iucv_sock_wake_msglim(sk);
                 }
         }
-        BUG_ON(!this);
 
         if (sk->sk_state == IUCV_CLOSING) {
                 if (skb_queue_empty(&iucv_sk(sk)->send_skb_q)) {
@@ -1857,6 +1864,7 @@ static void iucv_callback_txdone(struct iucv_path *path,
                         sk->sk_state_change(sk);
                 }
         }
+        bh_unlock_sock(sk);
 
 }
 
@@ -1864,9 +1872,15 @@ static void iucv_callback_connrej(struct iucv_path *path, u8 ipuser[16])
 {
         struct sock *sk = path->private;
 
+        if (sk->sk_state == IUCV_CLOSED)
+                return;
+
+        bh_lock_sock(sk);
+        iucv_sever_path(sk, 1);
         sk->sk_state = IUCV_DISCONN;
 
         sk->sk_state_change(sk);
+        bh_unlock_sock(sk);
 }
 
 /* called if the other communication side shuts down its RECV direction;
@@ -1954,6 +1968,8 @@ static int afiucv_hs_callback_syn(struct sock *sk, struct sk_buff *skb)
         memcpy(niucv->src_name, iucv->src_name, 8);
         memcpy(niucv->src_user_id, iucv->src_user_id, 8);
         nsk->sk_bound_dev_if = sk->sk_bound_dev_if;
+        niucv->hs_dev = iucv->hs_dev;
+        dev_hold(niucv->hs_dev);
         afiucv_swap_src_dest(skb);
         trans_hdr->flags = AF_IUCV_FLAG_SYN | AF_IUCV_FLAG_ACK;
         trans_hdr->window = niucv->msglimit;
@@ -2022,12 +2038,15 @@ static int afiucv_hs_callback_fin(struct sock *sk, struct sk_buff *skb)
         struct iucv_sock *iucv = iucv_sk(sk);
 
         /* other end of connection closed */
-        if (iucv) {
-                bh_lock_sock(sk);
+        if (!iucv)
+                goto out;
+        bh_lock_sock(sk);
+        if (sk->sk_state == IUCV_CONNECTED) {
                 sk->sk_state = IUCV_DISCONN;
                 sk->sk_state_change(sk);
-                bh_unlock_sock(sk);
         }
+        bh_unlock_sock(sk);
+out:
         kfree_skb(skb);
         return NET_RX_SUCCESS;
 }
@@ -2172,11 +2191,11 @@ static int afiucv_hs_rcv(struct sk_buff *skb, struct net_device *dev,
                 break;
         case (AF_IUCV_FLAG_WIN):
                 err = afiucv_hs_callback_win(sk, skb);
-                if (skb->len > sizeof(struct af_iucv_trans_hdr))
-                        err = afiucv_hs_callback_rx(sk, skb);
-                else
-                        kfree(skb);
-                break;
+                if (skb->len == sizeof(struct af_iucv_trans_hdr)) {
+                        kfree_skb(skb);
+                        break;
+                }
+                /* fall through */
         case 0:
                 /* plain data frame */
                 memcpy(CB_TRGCLS(skb), &trans_hdr->iucv_hdr.class,
@@ -2202,65 +2221,64 @@ static void afiucv_hs_callback_txnotify(struct sk_buff *skb,
         struct iucv_sock *iucv = NULL;
         struct sk_buff_head *list;
         struct sk_buff *list_skb;
-        struct sk_buff *this = NULL;
+        struct sk_buff *nskb;
         unsigned long flags;
         struct hlist_node *node;
 
-        read_lock(&iucv_sk_list.lock);
+        read_lock_irqsave(&iucv_sk_list.lock, flags);
         sk_for_each(sk, node, &iucv_sk_list.head)
                 if (sk == isk) {
                         iucv = iucv_sk(sk);
                         break;
                 }
-        read_unlock(&iucv_sk_list.lock);
+        read_unlock_irqrestore(&iucv_sk_list.lock, flags);
 
-        if (!iucv)
+        if (!iucv || sock_flag(sk, SOCK_ZAPPED))
                 return;
 
-        bh_lock_sock(sk);
         list = &iucv->send_skb_q;
-        list_skb = list->next;
+        spin_lock_irqsave(&list->lock, flags);
         if (skb_queue_empty(list))
                 goto out_unlock;
-
-        spin_lock_irqsave(&list->lock, flags);
+        list_skb = list->next;
+        nskb = list_skb->next;
         while (list_skb != (struct sk_buff *)list) {
                 if (skb_shinfo(list_skb) == skb_shinfo(skb)) {
-                        this = list_skb;
                         switch (n) {
                         case TX_NOTIFY_OK:
-                                __skb_unlink(this, list);
+                                __skb_unlink(list_skb, list);
+                                kfree_skb(list_skb);
                                 iucv_sock_wake_msglim(sk);
-                                dev_put(this->dev);
-                                kfree_skb(this);
                                 break;
                         case TX_NOTIFY_PENDING:
                                 atomic_inc(&iucv->pendings);
                                 break;
                         case TX_NOTIFY_DELAYED_OK:
-                                __skb_unlink(this, list);
+                                __skb_unlink(list_skb, list);
                                 atomic_dec(&iucv->pendings);
                                 if (atomic_read(&iucv->pendings) <= 0)
                                         iucv_sock_wake_msglim(sk);
-                                dev_put(this->dev);
-                                kfree_skb(this);
+                                kfree_skb(list_skb);
                                 break;
                         case TX_NOTIFY_UNREACHABLE:
                         case TX_NOTIFY_DELAYED_UNREACHABLE:
                         case TX_NOTIFY_TPQFULL: /* not yet used */
                         case TX_NOTIFY_GENERALERROR:
                         case TX_NOTIFY_DELAYED_GENERALERROR:
-                                __skb_unlink(this, list);
-                                dev_put(this->dev);
-                                kfree_skb(this);
-                                sk->sk_state = IUCV_DISCONN;
-                                sk->sk_state_change(sk);
+                                __skb_unlink(list_skb, list);
+                                kfree_skb(list_skb);
+                                if (sk->sk_state == IUCV_CONNECTED) {
+                                        sk->sk_state = IUCV_DISCONN;
+                                        sk->sk_state_change(sk);
+                                }
                                 break;
                         }
                         break;
                 }
-                list_skb = list_skb->next;
+                list_skb = nskb;
+                nskb = nskb->next;
         }
+out_unlock:
         spin_unlock_irqrestore(&list->lock, flags);
 
         if (sk->sk_state == IUCV_CLOSING) {
@@ -2270,8 +2288,6 @@ static void afiucv_hs_callback_txnotify(struct sk_buff *skb,
                 }
         }
 
-out_unlock:
-        bh_unlock_sock(sk);
 }
 static const struct proto_ops iucv_sock_ops = {
         .family         = PF_IUCV,
diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index 296620d6ca0c..d15ba0d0de94 100644
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -776,12 +776,10 @@ static int sta_apply_parameters(struct ieee80211_local *local,
 
                 if (set & BIT(NL80211_STA_FLAG_AUTHENTICATED) &&
                     !test_sta_flag(sta, WLAN_STA_AUTH)) {
-                        ret = sta_info_move_state_checked(sta,
-                                        IEEE80211_STA_AUTH);
+                        ret = sta_info_move_state(sta, IEEE80211_STA_AUTH);
                         if (ret)
                                 return ret;
-                        ret = sta_info_move_state_checked(sta,
-                                        IEEE80211_STA_ASSOC);
+                        ret = sta_info_move_state(sta, IEEE80211_STA_ASSOC);
                         if (ret)
                                 return ret;
                 }
@@ -789,11 +787,9 @@ static int sta_apply_parameters(struct ieee80211_local *local,
 
         if (mask & BIT(NL80211_STA_FLAG_AUTHORIZED)) {
                 if (set & BIT(NL80211_STA_FLAG_AUTHORIZED))
-                        ret = sta_info_move_state_checked(sta,
-                                        IEEE80211_STA_AUTHORIZED);
+                        ret = sta_info_move_state(sta, IEEE80211_STA_AUTHORIZED);
                 else if (test_sta_flag(sta, WLAN_STA_AUTHORIZED))
-                        ret = sta_info_move_state_checked(sta,
-                                        IEEE80211_STA_ASSOC);
+                        ret = sta_info_move_state(sta, IEEE80211_STA_ASSOC);
                 if (ret)
                         return ret;
         }
@@ -805,12 +801,10 @@ static int sta_apply_parameters(struct ieee80211_local *local,
 
                 if (!(set & BIT(NL80211_STA_FLAG_AUTHENTICATED)) &&
                     test_sta_flag(sta, WLAN_STA_AUTH)) {
-                        ret = sta_info_move_state_checked(sta,
-                                        IEEE80211_STA_AUTH);
+                        ret = sta_info_move_state(sta, IEEE80211_STA_AUTH);
                         if (ret)
                                 return ret;
-                        ret = sta_info_move_state_checked(sta,
-                                        IEEE80211_STA_NONE);
+                        ret = sta_info_move_state(sta, IEEE80211_STA_NONE);
                         if (ret)
                                 return ret;
                 }
@@ -944,8 +938,8 @@ static int ieee80211_add_station(struct wiphy *wiphy, struct net_device *dev,
         if (!sta)
                 return -ENOMEM;
 
-        sta_info_move_state(sta, IEEE80211_STA_AUTH);
-        sta_info_move_state(sta, IEEE80211_STA_ASSOC);
+        sta_info_pre_move_state(sta, IEEE80211_STA_AUTH);
+        sta_info_pre_move_state(sta, IEEE80211_STA_ASSOC);
 
         err = sta_apply_parameters(local, sta, params);
         if (err) {
@@ -1001,6 +995,7 @@ static int ieee80211_change_station(struct wiphy *wiphy,
         struct ieee80211_local *local = wiphy_priv(wiphy);
         struct sta_info *sta;
         struct ieee80211_sub_if_data *vlansdata;
+        int err;
 
         mutex_lock(&local->sta_mtx);
 
@@ -1040,7 +1035,11 @@ static int ieee80211_change_station(struct wiphy *wiphy,
                 ieee80211_send_layer2_update(sta);
         }
 
-        sta_apply_parameters(local, sta, params);
+        err = sta_apply_parameters(local, sta, params);
+        if (err) {
+                mutex_unlock(&local->sta_mtx);
+                return err;
+        }
 
         if (test_sta_flag(sta, WLAN_STA_TDLS_PEER) && params->supported_rates)
                 rate_control_rate_init(sta);
@@ -1341,6 +1340,8 @@ static int ieee80211_update_mesh_config(struct wiphy *wiphy,
                 conf->dot11MeshHWMPRannInterval =
                         nconf->dot11MeshHWMPRannInterval;
         }
+        if (_chg_mesh_attr(NL80211_MESHCONF_FORWARDING, mask))
+                conf->dot11MeshForwarding = nconf->dot11MeshForwarding;
         return 0;
 }
 
@@ -1868,7 +1869,6 @@ static int ieee80211_set_cqm_rssi_config(struct wiphy *wiphy,
                                          s32 rssi_thold, u32 rssi_hyst)
 {
         struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
-        struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
         struct ieee80211_vif *vif = &sdata->vif;
         struct ieee80211_bss_conf *bss_conf = &vif->bss_conf;
 
@@ -1879,14 +1879,9 @@ static int ieee80211_set_cqm_rssi_config(struct wiphy *wiphy,
         bss_conf->cqm_rssi_thold = rssi_thold;
         bss_conf->cqm_rssi_hyst = rssi_hyst;
 
-        if (!(local->hw.flags & IEEE80211_HW_SUPPORTS_CQM_RSSI)) {
-                if (sdata->vif.type != NL80211_IFTYPE_STATION)
-                        return -EOPNOTSUPP;
-                return 0;
-        }
-
         /* tell the driver upon association, unless already associated */
-        if (sdata->u.mgd.associated)
+        if (sdata->u.mgd.associated &&
+            sdata->vif.driver_flags & IEEE80211_VIF_SUPPORTS_CQM_RSSI)
                 ieee80211_bss_info_change_notify(sdata, BSS_CHANGED_CQM);
 
         return 0;
@@ -1907,8 +1902,11 @@ static int ieee80211_set_bitrate_mask(struct wiphy *wiphy,
                         return ret;
         }
 
-        for (i = 0; i < IEEE80211_NUM_BANDS; i++)
+        for (i = 0; i < IEEE80211_NUM_BANDS; i++) {
                 sdata->rc_rateidx_mask[i] = mask->control[i].legacy;
+                memcpy(sdata->rc_rateidx_mcs_mask[i], mask->control[i].mcs,
+                       sizeof(mask->control[i].mcs));
+        }
 
         return 0;
 }
diff --git a/net/mac80211/chan.c b/net/mac80211/chan.c
index 889c3e93e0f4..d1f7abddb182 100644
--- a/net/mac80211/chan.c
+++ b/net/mac80211/chan.c
@@ -20,23 +20,29 @@ __ieee80211_get_channel_mode(struct ieee80211_local *local,
                 if (!ieee80211_sdata_running(sdata))
                         continue;
 
-                if (sdata->vif.type == NL80211_IFTYPE_MONITOR)
+                switch (sdata->vif.type) {
+                case NL80211_IFTYPE_MONITOR:
                         continue;
-
-                if (sdata->vif.type == NL80211_IFTYPE_STATION &&
-                    !sdata->u.mgd.associated)
-                        continue;
-
-                if (sdata->vif.type == NL80211_IFTYPE_ADHOC) {
+                case NL80211_IFTYPE_STATION:
+                        if (!sdata->u.mgd.associated)
+                                continue;
+                        break;
+                case NL80211_IFTYPE_ADHOC:
                         if (!sdata->u.ibss.ssid_len)
                                 continue;
                         if (!sdata->u.ibss.fixed_channel)
                                 return CHAN_MODE_HOPPING;
-                }
-
-                if (sdata->vif.type == NL80211_IFTYPE_AP &&
-                    !sdata->u.ap.beacon)
+                        break;
+                case NL80211_IFTYPE_AP_VLAN:
+                        /* will also have _AP interface */
                         continue;
+                case NL80211_IFTYPE_AP:
+                        if (!sdata->u.ap.beacon)
+                                continue;
+                        break;
+                default:
+                        break;
+                }
 
                 return CHAN_MODE_FIXED;
         }
diff --git a/net/mac80211/debugfs.c b/net/mac80211/debugfs.c
index 90baea53e7c5..affe64be9092 100644
--- a/net/mac80211/debugfs.c
+++ b/net/mac80211/debugfs.c
@@ -247,8 +247,6 @@ static ssize_t hwflags_read(struct file *file, char __user *user_buf,
                 sf += snprintf(buf + sf, mxln - sf, "SUPPORTS_DYNAMIC_PS\n");
         if (local->hw.flags & IEEE80211_HW_MFP_CAPABLE)
                 sf += snprintf(buf + sf, mxln - sf, "MFP_CAPABLE\n");
-        if (local->hw.flags & IEEE80211_HW_BEACON_FILTER)
-                sf += snprintf(buf + sf, mxln - sf, "BEACON_FILTER\n");
         if (local->hw.flags & IEEE80211_HW_SUPPORTS_STATIC_SMPS)
                 sf += snprintf(buf + sf, mxln - sf, "SUPPORTS_STATIC_SMPS\n");
         if (local->hw.flags & IEEE80211_HW_SUPPORTS_DYNAMIC_SMPS)
@@ -259,8 +257,6 @@ static ssize_t hwflags_read(struct file *file, char __user *user_buf,
                 sf += snprintf(buf + sf, mxln - sf, "REPORTS_TX_ACK_STATUS\n");
         if (local->hw.flags & IEEE80211_HW_CONNECTION_MONITOR)
                 sf += snprintf(buf + sf, mxln - sf, "CONNECTION_MONITOR\n");
-        if (local->hw.flags & IEEE80211_HW_SUPPORTS_CQM_RSSI)
-                sf += snprintf(buf + sf, mxln - sf, "SUPPORTS_CQM_RSSI\n");
         if (local->hw.flags & IEEE80211_HW_SUPPORTS_PER_STA_GTK)
                 sf += snprintf(buf + sf, mxln - sf, "SUPPORTS_PER_STA_GTK\n");
         if (local->hw.flags & IEEE80211_HW_AP_LINK_PS)
diff --git a/net/mac80211/debugfs_netdev.c b/net/mac80211/debugfs_netdev.c
index 176c08ffb13c..510ed1dab3c7 100644
--- a/net/mac80211/debugfs_netdev.c
+++ b/net/mac80211/debugfs_netdev.c
@@ -87,6 +87,21 @@ static ssize_t ieee80211_if_fmt_##name(					\
 #define IEEE80211_IF_FMT_SIZE(name, field)                              \
                 IEEE80211_IF_FMT(name, field, "%zd\n")
 
+#define IEEE80211_IF_FMT_HEXARRAY(name, field)                          \
+static ssize_t ieee80211_if_fmt_##name(                                 \
+        const struct ieee80211_sub_if_data *sdata,                      \
+        char *buf, int buflen)                                          \
+{                                                                       \
+        char *p = buf;                                                  \
+        int i;                                                          \
+        for (i = 0; i < sizeof(sdata->field); i++) {                    \
+                p += scnprintf(p, buflen + buf - p, "%.2x ",            \
+                                 sdata->field[i]);                      \
+        }                                                               \
+        p += scnprintf(p, buflen + buf - p, "\n");                      \
+        return p - buf;                                                 \
+}
+
 #define IEEE80211_IF_FMT_ATOMIC(name, field)                            \
 static ssize_t ieee80211_if_fmt_##name(                                 \
         const struct ieee80211_sub_if_data *sdata,                      \
@@ -148,6 +163,11 @@ IEEE80211_IF_FILE(rc_rateidx_mask_2ghz, rc_rateidx_mask[IEEE80211_BAND_2GHZ],
                   HEX);
 IEEE80211_IF_FILE(rc_rateidx_mask_5ghz, rc_rateidx_mask[IEEE80211_BAND_5GHZ],
                   HEX);
+IEEE80211_IF_FILE(rc_rateidx_mcs_mask_2ghz,
+                  rc_rateidx_mcs_mask[IEEE80211_BAND_2GHZ], HEXARRAY);
+IEEE80211_IF_FILE(rc_rateidx_mcs_mask_5ghz,
+                  rc_rateidx_mcs_mask[IEEE80211_BAND_5GHZ], HEXARRAY);
+
 IEEE80211_IF_FILE(flags, flags, HEX);
 IEEE80211_IF_FILE(state, state, LHEX);
 IEEE80211_IF_FILE(channel_type, vif.bss_conf.channel_type, DEC);
@@ -422,6 +442,7 @@ IEEE80211_IF_FILE(dot11MeshGateAnnouncementProtocol,
                 u.mesh.mshcfg.dot11MeshGateAnnouncementProtocol, DEC);
 IEEE80211_IF_FILE(dot11MeshHWMPRannInterval,
                 u.mesh.mshcfg.dot11MeshHWMPRannInterval, DEC);
+IEEE80211_IF_FILE(dot11MeshForwarding, u.mesh.mshcfg.dot11MeshForwarding, DEC);
 #endif
 
 
@@ -441,6 +462,8 @@ static void add_sta_files(struct ieee80211_sub_if_data *sdata)
         DEBUGFS_ADD(channel_type);
         DEBUGFS_ADD(rc_rateidx_mask_2ghz);
         DEBUGFS_ADD(rc_rateidx_mask_5ghz);
+        DEBUGFS_ADD(rc_rateidx_mcs_mask_2ghz);
+        DEBUGFS_ADD(rc_rateidx_mcs_mask_5ghz);
 
         DEBUGFS_ADD(bssid);
         DEBUGFS_ADD(aid);
@@ -458,6 +481,8 @@ static void add_ap_files(struct ieee80211_sub_if_data *sdata)
         DEBUGFS_ADD(channel_type);
         DEBUGFS_ADD(rc_rateidx_mask_2ghz);
         DEBUGFS_ADD(rc_rateidx_mask_5ghz);
+        DEBUGFS_ADD(rc_rateidx_mcs_mask_2ghz);
+        DEBUGFS_ADD(rc_rateidx_mcs_mask_5ghz);
 
         DEBUGFS_ADD(num_sta_authorized);
         DEBUGFS_ADD(num_sta_ps);
@@ -468,6 +493,12 @@ static void add_ap_files(struct ieee80211_sub_if_data *sdata)
 
 static void add_ibss_files(struct ieee80211_sub_if_data *sdata)
 {
+        DEBUGFS_ADD(channel_type);
+        DEBUGFS_ADD(rc_rateidx_mask_2ghz);
+        DEBUGFS_ADD(rc_rateidx_mask_5ghz);
+        DEBUGFS_ADD(rc_rateidx_mcs_mask_2ghz);
+        DEBUGFS_ADD(rc_rateidx_mcs_mask_5ghz);
+
         DEBUGFS_ADD_MODE(tsf, 0600);
 }
 
@@ -479,6 +510,8 @@ static void add_wds_files(struct ieee80211_sub_if_data *sdata)
         DEBUGFS_ADD(channel_type);
         DEBUGFS_ADD(rc_rateidx_mask_2ghz);
         DEBUGFS_ADD(rc_rateidx_mask_5ghz);
+        DEBUGFS_ADD(rc_rateidx_mcs_mask_2ghz);
+        DEBUGFS_ADD(rc_rateidx_mcs_mask_5ghz);
 
         DEBUGFS_ADD(peer);
 }
@@ -491,6 +524,8 @@ static void add_vlan_files(struct ieee80211_sub_if_data *sdata)
         DEBUGFS_ADD(channel_type);
         DEBUGFS_ADD(rc_rateidx_mask_2ghz);
         DEBUGFS_ADD(rc_rateidx_mask_5ghz);
+        DEBUGFS_ADD(rc_rateidx_mcs_mask_2ghz);
+        DEBUGFS_ADD(rc_rateidx_mcs_mask_5ghz);
 }
 
 static void add_monitor_files(struct ieee80211_sub_if_data *sdata)
diff --git a/net/mac80211/debugfs_sta.c b/net/mac80211/debugfs_sta.c
index 2406b3e7393f..c8383712fdec 100644
--- a/net/mac80211/debugfs_sta.c
+++ b/net/mac80211/debugfs_sta.c
@@ -63,14 +63,15 @@ static ssize_t sta_flags_read(struct file *file, char __user *userbuf,
         test_sta_flag(sta, WLAN_STA_##flg) ? #flg "\n" : ""
 
         int res = scnprintf(buf, sizeof(buf),
-                            "%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s",
+                            "%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s",
                             TEST(AUTH), TEST(ASSOC), TEST(PS_STA),
                             TEST(PS_DRIVER), TEST(AUTHORIZED),
                             TEST(SHORT_PREAMBLE),
                             TEST(WME), TEST(WDS), TEST(CLEAR_PS_FILT),
                             TEST(MFP), TEST(BLOCK_BA), TEST(PSPOLL),
                             TEST(UAPSD), TEST(SP), TEST(TDLS_PEER),
-                            TEST(TDLS_PEER_AUTH));
+                            TEST(TDLS_PEER_AUTH), TEST(4ADDR_EVENT),
+                            TEST(INSERTED));
 #undef TEST
         return simple_read_from_buffer(userbuf, count, ppos, buf, res);
 }
diff --git a/net/mac80211/ibss.c b/net/mac80211/ibss.c
index a4643969a13b..7b3a0b0aa246 100644
--- a/net/mac80211/ibss.c
+++ b/net/mac80211/ibss.c
@@ -36,31 +36,6 @@
 #define IEEE80211_IBSS_MAX_STA_ENTRIES 128
 
 
-static void ieee80211_rx_mgmt_auth_ibss(struct ieee80211_sub_if_data *sdata,
-                                        struct ieee80211_mgmt *mgmt,
-                                        size_t len)
-{
-        u16 auth_alg, auth_transaction;
-
-        lockdep_assert_held(&sdata->u.ibss.mtx);
-
-        if (len < 24 + 6)
-                return;
-
-        auth_alg = le16_to_cpu(mgmt->u.auth.auth_alg);
-        auth_transaction = le16_to_cpu(mgmt->u.auth.auth_transaction);
-
-        /*
-         * IEEE 802.11 standard does not require authentication in IBSS
-         * networks and most implementations do not seem to use it.
-         * However, try to reply to authentication attempts if someone
-         * has actually implemented this.
-         */
-        if (auth_alg == WLAN_AUTH_OPEN && auth_transaction == 1)
-                ieee80211_send_auth(sdata, 2, WLAN_AUTH_OPEN, NULL, 0,
-                                    sdata->u.ibss.bssid, NULL, 0, 0);
-}
-
 static void __ieee80211_sta_join_ibss(struct ieee80211_sub_if_data *sdata,
                                       const u8 *bssid, const int beacon_int,
                                       struct ieee80211_channel *chan,
@@ -276,7 +251,8 @@ static void ieee80211_sta_join_ibss(struct ieee80211_sub_if_data *sdata,
                                   cbss->tsf);
 }
 
-static struct sta_info *ieee80211_ibss_finish_sta(struct sta_info *sta)
+static struct sta_info *ieee80211_ibss_finish_sta(struct sta_info *sta,
+                                                  bool auth)
         __acquires(RCU)
 {
         struct ieee80211_sub_if_data *sdata = sta->sdata;
@@ -290,22 +266,31 @@ static struct sta_info *ieee80211_ibss_finish_sta(struct sta_info *sta)
                     addr, sdata->name);
 #endif
 
-        sta_info_move_state(sta, IEEE80211_STA_AUTH);
-        sta_info_move_state(sta, IEEE80211_STA_ASSOC);
-        sta_info_move_state(sta, IEEE80211_STA_AUTHORIZED);
+        sta_info_pre_move_state(sta, IEEE80211_STA_AUTH);
+        sta_info_pre_move_state(sta, IEEE80211_STA_ASSOC);
+        sta_info_pre_move_state(sta, IEEE80211_STA_AUTHORIZED);
 
         rate_control_rate_init(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
+                ieee80211_send_auth(sdata, 1, WLAN_AUTH_OPEN, NULL, 0,
+                                    addr, sdata->u.ibss.bssid, NULL, 0, 0);
+        }
         return sta;
 }
 
 static struct sta_info *
 ieee80211_ibss_add_sta(struct ieee80211_sub_if_data *sdata,
                        const u8 *bssid, const u8 *addr,
-                       u32 supp_rates)
+                       u32 supp_rates, bool auth)
         __acquires(RCU)
 {
         struct ieee80211_if_ibss *ifibss = &sdata->u.ibss;
@@ -347,7 +332,42 @@ ieee80211_ibss_add_sta(struct ieee80211_sub_if_data *sdata,
         sta->sta.supp_rates[band] = supp_rates |
                         ieee80211_mandatory_rates(local, band);
 
-        return ieee80211_ibss_finish_sta(sta);
+        return ieee80211_ibss_finish_sta(sta, auth);
+}
+
+static void ieee80211_rx_mgmt_auth_ibss(struct ieee80211_sub_if_data *sdata,
+                                        struct ieee80211_mgmt *mgmt,
+                                        size_t len)
+{
+        u16 auth_alg, auth_transaction;
+
+        lockdep_assert_held(&sdata->u.ibss.mtx);
+
+        if (len < 24 + 6)
+                return;
+
+        auth_alg = le16_to_cpu(mgmt->u.auth.auth_alg);
+        auth_transaction = le16_to_cpu(mgmt->u.auth.auth_transaction);
+
+        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
+        sta_info_destroy_addr(sdata, mgmt->sa);
+        ieee80211_ibss_add_sta(sdata, mgmt->bssid, mgmt->sa, 0, false);
+        rcu_read_unlock();
+
+        /*
+         * IEEE 802.11 standard does not require authentication in IBSS
+         * networks and most implementations do not seem to use it.
+         * However, try to reply to authentication attempts if someone
+         * has actually implemented this.
+         */
+        ieee80211_send_auth(sdata, 2, WLAN_AUTH_OPEN, NULL, 0,
+                            mgmt->sa, sdata->u.ibss.bssid, NULL, 0, 0);
 }
 
 static void ieee80211_rx_bss_info(struct ieee80211_sub_if_data *sdata,
@@ -412,7 +432,7 @@ static void ieee80211_rx_bss_info(struct ieee80211_sub_if_data *sdata,
                         } else {
                                 rcu_read_unlock();
                                 sta = ieee80211_ibss_add_sta(sdata, mgmt->bssid,
-                                                mgmt->sa, supp_rates);
+                                                mgmt->sa, supp_rates, true);
                         }
                 }
 
@@ -540,7 +560,7 @@ static void ieee80211_rx_bss_info(struct ieee80211_sub_if_data *sdata,
                 ieee80211_sta_join_ibss(sdata, bss);
                 supp_rates = ieee80211_sta_get_rates(local, elems, band);
                 ieee80211_ibss_add_sta(sdata, mgmt->bssid, mgmt->sa,
-                                       supp_rates);
+                                       supp_rates, true);
                 rcu_read_unlock();
         }
 
@@ -643,8 +663,7 @@ static void ieee80211_sta_merge_ibss(struct ieee80211_sub_if_data *sdata)
                "IBSS networks with same SSID (merge)\n", sdata->name);
 
         ieee80211_request_internal_scan(sdata,
-                        ifibss->ssid, ifibss->ssid_len,
-                        ifibss->fixed_channel ? ifibss->channel : NULL);
+                        ifibss->ssid, ifibss->ssid_len, NULL);
 }
 
 static void ieee80211_sta_create_ibss(struct ieee80211_sub_if_data *sdata)
@@ -855,9 +874,6 @@ static void ieee80211_rx_mgmt_probe_resp(struct ieee80211_sub_if_data *sdata,
         size_t baselen;
         struct ieee802_11_elems elems;
 
-        if (memcmp(mgmt->da, sdata->vif.addr, ETH_ALEN))
-                return; /* ignore ProbeResp to foreign address */
-
         baselen = (u8 *) mgmt->u.probe_resp.variable - (u8 *) mgmt;
         if (baselen > len)
                 return;
@@ -945,7 +961,7 @@ void ieee80211_ibss_work(struct ieee80211_sub_if_data *sdata)
                 list_del(&sta->list);
                 spin_unlock_bh(&ifibss->incomplete_lock);
 
-                ieee80211_ibss_finish_sta(sta);
+                ieee80211_ibss_finish_sta(sta, true);
                 rcu_read_unlock();
                 spin_lock_bh(&ifibss->incomplete_lock);
         }
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
index 2f0642d9e154..d47e8c110b16 100644
--- a/net/mac80211/ieee80211_i.h
+++ b/net/mac80211/ieee80211_i.h
@@ -646,6 +646,7 @@ struct ieee80211_sub_if_data {
 
         /* bitmap of allowed (non-MCS) rate indexes for rate control */
         u32 rc_rateidx_mask[IEEE80211_NUM_BANDS];
+        u8  rc_rateidx_mcs_mask[IEEE80211_NUM_BANDS][IEEE80211_HT_MCS_MASK_LEN];
 
         union {
                 struct ieee80211_if_ap ap;
@@ -1396,7 +1397,7 @@ void ieee80211_add_pending_skbs_fn(struct ieee80211_local *local,
 void ieee80211_send_auth(struct ieee80211_sub_if_data *sdata,
                          u16 transaction, u16 auth_alg,
                          u8 *extra, size_t extra_len, const u8 *bssid,
-                         const u8 *key, u8 key_len, u8 key_idx);
+                         const u8 *da, const u8 *key, u8 key_len, u8 key_idx);
 int ieee80211_build_preq_ies(struct ieee80211_local *local, u8 *buffer,
                              const u8 *ie, size_t ie_len,
                              enum ieee80211_band band, u32 rate_mask,
diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
index 01a21c2f6ab3..2efd595b2f7a 100644
--- a/net/mac80211/iface.c
+++ b/net/mac80211/iface.c
@@ -318,9 +318,9 @@ static int ieee80211_do_open(struct net_device *dev, bool coming_up)
                         goto err_del_interface;
                 }
 
-                sta_info_move_state(sta, IEEE80211_STA_AUTH);
-                sta_info_move_state(sta, IEEE80211_STA_ASSOC);
-                sta_info_move_state(sta, IEEE80211_STA_AUTHORIZED);
+                sta_info_pre_move_state(sta, IEEE80211_STA_AUTH);
+                sta_info_pre_move_state(sta, IEEE80211_STA_ASSOC);
+                sta_info_pre_move_state(sta, IEEE80211_STA_AUTHORIZED);
 
                 res = sta_info_insert(sta);
                 if (res) {
@@ -1181,6 +1181,13 @@ int ieee80211_if_add(struct ieee80211_local *local, const char *name,
                 sband = local->hw.wiphy->bands[i];
                 sdata->rc_rateidx_mask[i] =
                         sband ? (1 << sband->n_bitrates) - 1 : 0;
+                if (sband)
+                        memcpy(sdata->rc_rateidx_mcs_mask[i],
+                               sband->ht_cap.mcs.rx_mask,
+                               sizeof(sdata->rc_rateidx_mcs_mask[i]));
+                else
+                        memset(sdata->rc_rateidx_mcs_mask[i], 0,
+                               sizeof(sdata->rc_rateidx_mcs_mask[i]));
         }
 
         /* setup type-dependent data */
diff --git a/net/mac80211/main.c b/net/mac80211/main.c
index 0a0d94ad9b08..6192caadfab9 100644
--- a/net/mac80211/main.c
+++ b/net/mac80211/main.c
@@ -155,7 +155,8 @@ int ieee80211_hw_config(struct ieee80211_local *local, u32 changed)
                 power = chan->max_power;
         else
                 power = local->power_constr_level ?
-                        (chan->max_power - local->power_constr_level) :
+                        min(chan->max_power,
+                                (chan->max_reg_power  - local->power_constr_level)) :
                         chan->max_power;
 
         if (local->user_power_level >= 0)
diff --git a/net/mac80211/mesh_hwmp.c b/net/mac80211/mesh_hwmp.c
index 54df1b2bafd2..c27dec904963 100644
--- a/net/mac80211/mesh_hwmp.c
+++ b/net/mac80211/mesh_hwmp.c
@@ -575,7 +575,7 @@ static void hwmp_preq_frame_process(struct ieee80211_sub_if_data *sdata,
                         ifmsh->mshstats.dropped_frames_ttl++;
         }
 
-        if (forward) {
+        if (forward && ifmsh->mshcfg.dot11MeshForwarding) {
                 u32 preq_id;
                 u8 hopcount, flags;
 
diff --git a/net/mac80211/mesh_plink.c b/net/mac80211/mesh_plink.c
index a17251730b9e..8806e5ef8ffe 100644
--- a/net/mac80211/mesh_plink.c
+++ b/net/mac80211/mesh_plink.c
@@ -96,9 +96,9 @@ static struct sta_info *mesh_plink_alloc(struct ieee80211_sub_if_data *sdata,
         if (!sta)
                 return NULL;
 
-        sta_info_move_state(sta, IEEE80211_STA_AUTH);
-        sta_info_move_state(sta, IEEE80211_STA_ASSOC);
-        sta_info_move_state(sta, IEEE80211_STA_AUTHORIZED);
+        sta_info_pre_move_state(sta, IEEE80211_STA_AUTH);
+        sta_info_pre_move_state(sta, IEEE80211_STA_ASSOC);
+        sta_info_pre_move_state(sta, IEEE80211_STA_AUTHORIZED);
 
         set_sta_flag(sta, WLAN_STA_WME);
 
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index 295be92f7c77..49fd1acd5d15 100644
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -127,7 +127,7 @@ static void run_again(struct ieee80211_if_managed *ifmgd,
 
 void ieee80211_sta_reset_beacon_monitor(struct ieee80211_sub_if_data *sdata)
 {
-        if (sdata->local->hw.flags & IEEE80211_HW_BEACON_FILTER)
+        if (sdata->vif.driver_flags & IEEE80211_VIF_BEACON_FILTER)
                 return;
 
         mod_timer(&sdata->u.mgd.bcn_mon_timer,
@@ -547,7 +547,7 @@ static void ieee80211_handle_pwr_constr(struct ieee80211_sub_if_data *sdata,
         if (pwr_constr_elem_len != 1)
                 return;
 
-        if ((*pwr_constr_elem <= conf->channel->max_power) &&
+        if ((*pwr_constr_elem <= conf->channel->max_reg_power) &&
             (*pwr_constr_elem != sdata->local->power_constr_level)) {
                 sdata->local->power_constr_level = *pwr_constr_elem;
                 ieee80211_hw_config(sdata->local, 0);
@@ -1043,7 +1043,7 @@ static void ieee80211_set_associated(struct ieee80211_sub_if_data *sdata,
         bss_info_changed |= BSS_CHANGED_BSSID;
 
         /* Tell the driver to monitor connection quality (if supported) */
-        if ((local->hw.flags & IEEE80211_HW_SUPPORTS_CQM_RSSI) &&
+        if (sdata->vif.driver_flags & IEEE80211_VIF_SUPPORTS_CQM_RSSI &&
             bss_conf->cqm_rssi_thold)
                 bss_info_changed |= BSS_CHANGED_CQM;
 
@@ -1587,10 +1587,19 @@ static bool ieee80211_assoc_success(struct ieee80211_work *wk,
                 return false;
         }
 
-        sta_info_move_state(sta, IEEE80211_STA_AUTH);
-        sta_info_move_state(sta, IEEE80211_STA_ASSOC);
-        if (!(ifmgd->flags & IEEE80211_STA_CONTROL_PORT))
-                sta_info_move_state(sta, IEEE80211_STA_AUTHORIZED);
+        err = sta_info_move_state(sta, IEEE80211_STA_AUTH);
+        if (!err)
+                err = sta_info_move_state(sta, IEEE80211_STA_ASSOC);
+        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);
+                WARN_ON(__sta_info_destroy(sta));
+                mutex_unlock(&sdata->local->sta_mtx);
+                return false;
+        }
 
         rates = 0;
         basic_rates = 0;
@@ -1882,7 +1891,7 @@ static void ieee80211_rx_mgmt_beacon(struct ieee80211_sub_if_data *sdata,
 
         if (bss_conf->cqm_rssi_thold &&
             ifmgd->count_beacon_signal >= IEEE80211_SIGNAL_AVE_MIN_COUNT &&
-            !(local->hw.flags & IEEE80211_HW_SUPPORTS_CQM_RSSI)) {
+            !(sdata->vif.driver_flags & IEEE80211_VIF_SUPPORTS_CQM_RSSI)) {
                 int sig = ifmgd->ave_beacon_signal / 16;
                 int last_event = ifmgd->last_cqm_event_signal;
                 int thold = bss_conf->cqm_rssi_thold;
diff --git a/net/mac80211/rate.c b/net/mac80211/rate.c
index 5a5a7767d541..3fef26d8898a 100644
--- a/net/mac80211/rate.c
+++ b/net/mac80211/rate.c
@@ -159,7 +159,6 @@ static struct rate_control_ref *rate_control_alloc(const char *name,
         ref = kmalloc(sizeof(struct rate_control_ref), GFP_KERNEL);
         if (!ref)
                 goto fail_ref;
-        kref_init(&ref->kref);
         ref->local = local;
         ref->ops = ieee80211_rate_control_ops_get(name);
         if (!ref->ops)
@@ -184,11 +183,8 @@ fail_ref:
         return NULL;
 }
 
-static void rate_control_release(struct kref *kref)
+static void rate_control_free(struct rate_control_ref *ctrl_ref)
 {
-        struct rate_control_ref *ctrl_ref;
-
-        ctrl_ref = container_of(kref, struct rate_control_ref, kref);
         ctrl_ref->ops->free(ctrl_ref->priv);
 
 #ifdef CONFIG_MAC80211_DEBUGFS
@@ -293,8 +289,8 @@ bool rate_control_send_low(struct ieee80211_sta *sta,
 }
 EXPORT_SYMBOL(rate_control_send_low);
 
-static void rate_idx_match_mask(struct ieee80211_tx_rate *rate,
-                                int n_bitrates, u32 mask)
+static bool rate_idx_match_legacy_mask(struct ieee80211_tx_rate *rate,
+                                       int n_bitrates, u32 mask)
 {
         int j;
 
@@ -303,7 +299,7 @@ static void rate_idx_match_mask(struct ieee80211_tx_rate *rate,
                 if (mask & (1 << j)) {
                         /* Okay, found a suitable rate. Use it. */
                         rate->idx = j;
-                        return;
+                        return true;
                 }
         }
 
@@ -312,6 +308,112 @@ static void rate_idx_match_mask(struct ieee80211_tx_rate *rate,
                 if (mask & (1 << j)) {
                         /* Okay, found a suitable rate. Use it. */
                         rate->idx = j;
+                        return true;
+                }
+        }
+        return false;
+}
+
+static bool rate_idx_match_mcs_mask(struct ieee80211_tx_rate *rate,
+                                    u8 mcs_mask[IEEE80211_HT_MCS_MASK_LEN])
+{
+        int i, j;
+        int ridx, rbit;
+
+        ridx = rate->idx / 8;
+        rbit = rate->idx % 8;
+
+        /* sanity check */
+        if (ridx < 0 || ridx > IEEE80211_HT_MCS_MASK_LEN)
+                return false;
+
+        /* See whether the selected rate or anything below it is allowed. */
+        for (i = ridx; i >= 0; i--) {
+                for (j = rbit; j >= 0; j--)
+                        if (mcs_mask[i] & BIT(j)) {
+                                rate->idx = i * 8 + j;
+                                return true;
+                        }
+                rbit = 7;
+        }
+
+        /* Try to find a higher rate that would be allowed */
+        ridx = (rate->idx + 1) / 8;
+        rbit = (rate->idx + 1) % 8;
+
+        for (i = ridx; i < IEEE80211_HT_MCS_MASK_LEN; i++) {
+                for (j = rbit; j < 8; j++)
+                        if (mcs_mask[i] & BIT(j)) {
+                                rate->idx = i * 8 + j;
+                                return true;
+                        }
+                rbit = 0;
+        }
+        return false;
+}
+
+
+
+static void rate_idx_match_mask(struct ieee80211_tx_rate *rate,
+                                struct ieee80211_tx_rate_control *txrc,
+                                u32 mask,
+                                u8 mcs_mask[IEEE80211_HT_MCS_MASK_LEN])
+{
+        struct ieee80211_tx_rate alt_rate;
+
+        /* handle HT rates */
+        if (rate->flags & IEEE80211_TX_RC_MCS) {
+                if (rate_idx_match_mcs_mask(rate, mcs_mask))
+                        return;
+
+                /* also try the legacy rates. */
+                alt_rate.idx = 0;
+                /* keep protection flags */
+                alt_rate.flags = rate->flags &
+                                 (IEEE80211_TX_RC_USE_RTS_CTS |
+                                  IEEE80211_TX_RC_USE_CTS_PROTECT |
+                                  IEEE80211_TX_RC_USE_SHORT_PREAMBLE);
+                alt_rate.count = rate->count;
+                if (rate_idx_match_legacy_mask(&alt_rate,
+                                               txrc->sband->n_bitrates,
+                                               mask)) {
+                        *rate = alt_rate;
+                        return;
+                }
+        } else {
+                struct sk_buff *skb = txrc->skb;
+                struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;
+                __le16 fc;
+
+                /* handle legacy rates */
+                if (rate_idx_match_legacy_mask(rate, txrc->sband->n_bitrates,
+                                               mask))
+                        return;
+
+                /* if HT BSS, and we handle a data frame, also try HT rates */
+                if (txrc->bss_conf->channel_type == NL80211_CHAN_NO_HT)
+                        return;
+
+                fc = hdr->frame_control;
+                if (!ieee80211_is_data(fc))
+                        return;
+
+                alt_rate.idx = 0;
+                /* keep protection flags */
+                alt_rate.flags = rate->flags &
+                                 (IEEE80211_TX_RC_USE_RTS_CTS |
+                                  IEEE80211_TX_RC_USE_CTS_PROTECT |
+                                  IEEE80211_TX_RC_USE_SHORT_PREAMBLE);
+                alt_rate.count = rate->count;
+
+                alt_rate.flags |= IEEE80211_TX_RC_MCS;
+
+                if ((txrc->bss_conf->channel_type == NL80211_CHAN_HT40MINUS) ||
+                    (txrc->bss_conf->channel_type == NL80211_CHAN_HT40PLUS))
+                        alt_rate.flags |= IEEE80211_TX_RC_40_MHZ_WIDTH;
+
+                if (rate_idx_match_mcs_mask(&alt_rate, mcs_mask)) {
+                        *rate = alt_rate;
                         return;
                 }
         }
@@ -335,6 +437,7 @@ void rate_control_get_rate(struct ieee80211_sub_if_data *sdata,
         struct ieee80211_tx_info *info = IEEE80211_SKB_CB(txrc->skb);
         int i;
         u32 mask;
+        u8 mcs_mask[IEEE80211_HT_MCS_MASK_LEN];
 
         if (sta) {
                 ista = &sta->sta;
@@ -358,10 +461,14 @@ void rate_control_get_rate(struct ieee80211_sub_if_data *sdata,
          * the common case.
          */
         mask = sdata->rc_rateidx_mask[info->band];
+        memcpy(mcs_mask, sdata->rc_rateidx_mcs_mask[info->band],
+               sizeof(mcs_mask));
         if (mask != (1 << txrc->sband->n_bitrates) - 1) {
                 if (sta) {
                         /* Filter out rates that the STA does not support */
                         mask &= sta->sta.supp_rates[info->band];
+                        for (i = 0; i < sizeof(mcs_mask); i++)
+                                mcs_mask[i] &= sta->sta.ht_cap.mcs.rx_mask[i];
                 }
                 /*
                  * Make sure the rate index selected for each TX rate is
@@ -372,32 +479,18 @@ void rate_control_get_rate(struct ieee80211_sub_if_data *sdata,
                         /* Skip invalid rates */
                         if (info->control.rates[i].idx < 0)
                                 break;
-                        /* Rate masking supports only legacy rates for now */
-                        if (info->control.rates[i].flags & IEEE80211_TX_RC_MCS)
-                                continue;
-                        rate_idx_match_mask(&info->control.rates[i],
-                                            txrc->sband->n_bitrates, mask);
+                        rate_idx_match_mask(&info->control.rates[i], txrc,
+                                            mask, mcs_mask);
                 }
         }
 
         BUG_ON(info->control.rates[0].idx < 0);
 }
 
-struct rate_control_ref *rate_control_get(struct rate_control_ref *ref)
-{
-        kref_get(&ref->kref);
-        return ref;
-}
-
-void rate_control_put(struct rate_control_ref *ref)
-{
-        kref_put(&ref->kref, rate_control_release);
-}
-
 int ieee80211_init_rate_ctrl_alg(struct ieee80211_local *local,
                                  const char *name)
 {
-        struct rate_control_ref *ref, *old;
+        struct rate_control_ref *ref;
 
         ASSERT_RTNL();
 
@@ -417,12 +510,8 @@ int ieee80211_init_rate_ctrl_alg(struct ieee80211_local *local,
                 return -ENOENT;
         }
 
-        old = local->rate_ctrl;
+        WARN_ON(local->rate_ctrl);
         local->rate_ctrl = ref;
-        if (old) {
-                rate_control_put(old);
-                sta_info_flush(local, NULL);
-        }
 
         wiphy_debug(local->hw.wiphy, "Selected rate control algorithm '%s'\n",
                     ref->ops->name);
@@ -440,6 +529,6 @@ void rate_control_deinitialize(struct ieee80211_local *local)
                 return;
 
         local->rate_ctrl = NULL;
-        rate_control_put(ref);
+        rate_control_free(ref);
 }
 
diff --git a/net/mac80211/rate.h b/net/mac80211/rate.h
index 168427b0ffdc..8268457bd143 100644
--- a/net/mac80211/rate.h
+++ b/net/mac80211/rate.h
@@ -14,7 +14,6 @@
 #include <linux/netdevice.h>
 #include <linux/skbuff.h>
 #include <linux/types.h>
-#include <linux/kref.h>
 #include <net/mac80211.h>
 #include "ieee80211_i.h"
 #include "sta_info.h"
@@ -23,14 +22,11 @@ struct rate_control_ref {
         struct ieee80211_local *local;
         struct rate_control_ops *ops;
         void *priv;
-        struct kref kref;
 };
 
 void rate_control_get_rate(struct ieee80211_sub_if_data *sdata,
                            struct sta_info *sta,
                            struct ieee80211_tx_rate_control *txrc);
-struct rate_control_ref *rate_control_get(struct rate_control_ref *ref);
-void rate_control_put(struct rate_control_ref *ref);
 
 static inline void rate_control_tx_status(struct ieee80211_local *local,
                                           struct ieee80211_supported_band *sband,
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
index 5a5e504a8ffb..b5ee0847a7e1 100644
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@ -1145,19 +1145,15 @@ static void ap_sta_ps_start(struct sta_info *sta)
 
 static void ap_sta_ps_end(struct sta_info *sta)
 {
-        struct ieee80211_sub_if_data *sdata = sta->sdata;
-
-        atomic_dec(&sdata->bss->num_sta_ps);
-
 #ifdef CONFIG_MAC80211_VERBOSE_PS_DEBUG
         printk(KERN_DEBUG "%s: STA %pM aid %d exits power save mode\n",
-               sdata->name, sta->sta.addr, sta->sta.aid);
+               sta->sdata->name, sta->sta.addr, sta->sta.aid);
 #endif /* CONFIG_MAC80211_VERBOSE_PS_DEBUG */
 
         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",
-                       sdata->name, sta->sta.addr, sta->sta.aid);
+                       sta->sdata->name, sta->sta.addr, sta->sta.aid);
 #endif /* CONFIG_MAC80211_VERBOSE_PS_DEBUG */
                 return;
         }
@@ -2180,9 +2176,6 @@ ieee80211_rx_h_mgmt_check(struct ieee80211_rx_data *rx)
         if (rx->sdata->vif.type == NL80211_IFTYPE_AP &&
             ieee80211_is_beacon(mgmt->frame_control) &&
             !(rx->flags & IEEE80211_RX_BEACON_REPORTED)) {
-                struct ieee80211_rx_status *status;
-
-                status = IEEE80211_SKB_RXCB(rx->skb);
                 cfg80211_report_obss_beacon(rx->local->hw.wiphy,
                                             rx->skb->data, rx->skb->len,
                                             status->freq, GFP_ATOMIC);
diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c
index ff11f6bf8266..fa0823892b2d 100644
--- a/net/mac80211/sta_info.c
+++ b/net/mac80211/sta_info.c
@@ -208,10 +208,8 @@ struct sta_info *sta_info_get_by_idx(struct ieee80211_sub_if_data *sdata,
  */
 void sta_info_free(struct ieee80211_local *local, struct sta_info *sta)
 {
-        if (sta->rate_ctrl) {
+        if (sta->rate_ctrl)
                 rate_control_free_sta(sta);
-                rate_control_put(sta->rate_ctrl);
-        }
 
 #ifdef CONFIG_MAC80211_VERBOSE_DEBUG
         wiphy_debug(local->hw.wiphy, "Destroyed STA %pM\n", sta->sta.addr);
@@ -264,13 +262,11 @@ static int sta_prepare_rate_control(struct ieee80211_local *local,
         if (local->hw.flags & IEEE80211_HW_HAS_RATE_CONTROL)
                 return 0;
 
-        sta->rate_ctrl = rate_control_get(local->rate_ctrl);
+        sta->rate_ctrl = local->rate_ctrl;
         sta->rate_ctrl_priv = rate_control_alloc_sta(sta->rate_ctrl,
                                                      &sta->sta, gfp);
-        if (!sta->rate_ctrl_priv) {
-                rate_control_put(sta->rate_ctrl);
+        if (!sta->rate_ctrl_priv)
                 return -ENOMEM;
-        }
 
         return 0;
 }
@@ -407,6 +403,8 @@ static int sta_info_insert_finish(struct sta_info *sta) __acquires(RCU)
                 sta_info_hash_add(local, sta);
 
                 list_add(&sta->list, &local->sta_list);
+
+                set_sta_flag(sta, WLAN_STA_INSERTED);
         } else {
                 sta->dummy = false;
         }
@@ -711,7 +709,7 @@ static bool sta_info_cleanup_expire_buffered(struct ieee80211_local *local,
         return have_buffered;
 }
 
-static int __must_check __sta_info_destroy(struct sta_info *sta)
+int __must_check __sta_info_destroy(struct sta_info *sta)
 {
         struct ieee80211_local *local;
         struct ieee80211_sub_if_data *sdata;
@@ -726,6 +724,8 @@ static int __must_check __sta_info_destroy(struct sta_info *sta)
         local = sta->local;
         sdata = sta->sdata;
 
+        lockdep_assert_held(&local->sta_mtx);
+
         /*
          * Before removing the station from the driver and
          * rate control, it might still start new aggregation
@@ -750,25 +750,19 @@ static int __must_check __sta_info_destroy(struct sta_info *sta)
 
         sta->dead = true;
 
-        if (test_sta_flag(sta, WLAN_STA_PS_STA) ||
-            test_sta_flag(sta, WLAN_STA_PS_DRIVER)) {
-                BUG_ON(!sdata->bss);
-
-                clear_sta_flag(sta, WLAN_STA_PS_STA);
-                clear_sta_flag(sta, WLAN_STA_PS_DRIVER);
-
-                atomic_dec(&sdata->bss->num_sta_ps);
-                sta_info_recalc_tim(sta);
-        }
-
         local->num_sta--;
         local->sta_generation++;
 
         if (sdata->vif.type == NL80211_IFTYPE_AP_VLAN)
                 RCU_INIT_POINTER(sdata->u.vlan.sta, NULL);
 
-        while (sta->sta_state > IEEE80211_STA_NONE)
-                sta_info_move_state(sta, sta->sta_state - 1);
+        while (sta->sta_state > IEEE80211_STA_NONE) {
+                int err = sta_info_move_state(sta, sta->sta_state - 1);
+                if (err) {
+                        WARN_ON_ONCE(1);
+                        break;
+                }
+        }
 
         if (sta->uploaded) {
                 if (sdata->vif.type == NL80211_IFTYPE_AP_VLAN)
@@ -787,6 +781,15 @@ static int __must_check __sta_info_destroy(struct sta_info *sta)
          */
         synchronize_rcu();
 
+        if (test_sta_flag(sta, WLAN_STA_PS_STA)) {
+                BUG_ON(!sdata->bss);
+
+                clear_sta_flag(sta, WLAN_STA_PS_STA);
+
+                atomic_dec(&sdata->bss->num_sta_ps);
+                sta_info_recalc_tim(sta);
+        }
+
         for (ac = 0; ac < IEEE80211_NUM_ACS; ac++) {
                 local->total_ps_buffered -= skb_queue_len(&sta->ps_tx_buf[ac]);
                 __skb_queue_purge(&sta->ps_tx_buf[ac]);
@@ -815,35 +818,20 @@ static int __must_check __sta_info_destroy(struct sta_info *sta)
         }
 #endif
 
-        /* There could be some memory leaks because of ampdu tx pending queue
-         * not being freed before destroying the station info.
-         *
-         * Make sure that such queues are purged before freeing the station
-         * info.
-         * TODO: We have to somehow postpone the full destruction
-         * until the aggregation stop completes. Refer
-         * http://thread.gmane.org/gmane.linux.kernel.wireless.general/81936
+        /*
+         * Destroy aggregation state here. It would be nice to wait for the
+         * driver to finish aggregation stop and then clean up, but for now
+         * drivers have to handle aggregation stop being requested, followed
+         * directly by station destruction.
          */
-
-        mutex_lock(&sta->ampdu_mlme.mtx);
-
         for (i = 0; i < STA_TID_NUM; i++) {
-                tid_tx = rcu_dereference_protected_tid_tx(sta, i);
+                tid_tx = rcu_dereference_raw(sta->ampdu_mlme.tid_tx[i]);
                 if (!tid_tx)
                         continue;
-                if (skb_queue_len(&tid_tx->pending)) {
-#ifdef CONFIG_MAC80211_HT_DEBUG
-                        wiphy_debug(local->hw.wiphy, "TX A-MPDU  purging %d "
-                                "packets for tid=%d\n",
-                                skb_queue_len(&tid_tx->pending), i);
-#endif /* CONFIG_MAC80211_HT_DEBUG */
-                        __skb_queue_purge(&tid_tx->pending);
-                }
-                kfree_rcu(tid_tx, rcu_head);
+                __skb_queue_purge(&tid_tx->pending);
+                kfree(tid_tx);
         }
 
-        mutex_unlock(&sta->ampdu_mlme.mtx);
-
         sta_info_free(local, sta);
 
         return 0;
@@ -1009,9 +997,11 @@ EXPORT_SYMBOL(ieee80211_find_sta);
 static void clear_sta_ps_flags(void *_sta)
 {
         struct sta_info *sta = _sta;
+        struct ieee80211_sub_if_data *sdata = sta->sdata;
 
         clear_sta_flag(sta, WLAN_STA_PS_DRIVER);
-        clear_sta_flag(sta, WLAN_STA_PS_STA);
+        if (test_and_clear_sta_flag(sta, WLAN_STA_PS_STA))
+                atomic_dec(&sdata->bss->num_sta_ps);
 }
 
 /* powersave support code */
@@ -1410,8 +1400,8 @@ void ieee80211_sta_set_buffered(struct ieee80211_sta *pubsta,
 }
 EXPORT_SYMBOL(ieee80211_sta_set_buffered);
 
-int sta_info_move_state_checked(struct sta_info *sta,
-                                enum ieee80211_sta_state new_state)
+int sta_info_move_state(struct sta_info *sta,
+                        enum ieee80211_sta_state new_state)
 {
         might_sleep();
 
diff --git a/net/mac80211/sta_info.h b/net/mac80211/sta_info.h
index 6f77f12dc3fc..381de37d2478 100644
--- a/net/mac80211/sta_info.h
+++ b/net/mac80211/sta_info.h
@@ -52,6 +52,7 @@
  * @WLAN_STA_SP: Station is in a service period, so don't try to
  *      reply to other uAPSD trigger frames or PS-Poll.
  * @WLAN_STA_4ADDR_EVENT: 4-addr event was already sent for this frame.
+ * @WLAN_STA_INSERTED: This station is inserted into the hash table.
  */
 enum ieee80211_sta_info_flags {
         WLAN_STA_AUTH,
@@ -71,6 +72,7 @@ enum ieee80211_sta_info_flags {
         WLAN_STA_UAPSD,
         WLAN_STA_SP,
         WLAN_STA_4ADDR_EVENT,
+        WLAN_STA_INSERTED,
 };
 
 enum ieee80211_sta_state {
@@ -427,13 +429,17 @@ static inline int test_and_set_sta_flag(struct sta_info *sta,
         return test_and_set_bit(flag, &sta->_flags);
 }
 
-int sta_info_move_state_checked(struct sta_info *sta,
-                                enum ieee80211_sta_state new_state);
+int sta_info_move_state(struct sta_info *sta,
+                        enum ieee80211_sta_state new_state);
 
-static inline void sta_info_move_state(struct sta_info *sta,
-                                       enum ieee80211_sta_state new_state)
+static inline void sta_info_pre_move_state(struct sta_info *sta,
+                                           enum ieee80211_sta_state new_state)
 {
-        int ret = sta_info_move_state_checked(sta, new_state);
+        int ret;
+
+        WARN_ON_ONCE(test_sta_flag(sta, WLAN_STA_INSERTED));
+
+        ret = sta_info_move_state(sta, new_state);
         WARN_ON_ONCE(ret);
 }
 
@@ -544,6 +550,7 @@ int sta_info_insert(struct sta_info *sta);
 int sta_info_insert_rcu(struct sta_info *sta) __acquires(RCU);
 int sta_info_reinsert(struct sta_info *sta);
 
+int __must_check __sta_info_destroy(struct sta_info *sta);
 int sta_info_destroy_addr(struct ieee80211_sub_if_data *sdata,
                           const u8 *addr);
 int sta_info_destroy_addr_bss(struct ieee80211_sub_if_data *sdata,
diff --git a/net/mac80211/status.c b/net/mac80211/status.c
index 30c265c98f73..d67f0b967f8a 100644
--- a/net/mac80211/status.c
+++ b/net/mac80211/status.c
@@ -350,7 +350,6 @@ void ieee80211_tx_status(struct ieee80211_hw *hw, struct sk_buff *skb)
         bool send_to_cooked;
         bool acked;
         struct ieee80211_bar *bar;
-        u16 tid;
         int rtap_len;
 
         for (i = 0; i < IEEE80211_TX_MAX_RATES; i++) {
@@ -412,7 +411,7 @@ void ieee80211_tx_status(struct ieee80211_hw *hw, struct sk_buff *skb)
                 }
 
                 if (!acked && ieee80211_is_back_req(fc)) {
-                        u16 control;
+                        u16 tid, control;
 
                         /*
                          * BAR failed, store the last SSN and retry sending
@@ -516,7 +515,8 @@ void ieee80211_tx_status(struct ieee80211_hw *hw, struct sk_buff *skb)
 
                 if (ieee80211_is_nullfunc(hdr->frame_control) ||
                     ieee80211_is_qos_nullfunc(hdr->frame_control)) {
-                        bool acked = info->flags & IEEE80211_TX_STAT_ACK;
+                        acked = info->flags & IEEE80211_TX_STAT_ACK;
+
                         cfg80211_probe_status(skb->dev, hdr->addr1,
                                               cookie, acked, GFP_ATOMIC);
                 } else {
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index e05667cd5e76..1be0ca2b5936 100644
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@ -635,6 +635,9 @@ ieee80211_tx_h_rate_ctrl(struct ieee80211_tx_data *tx)
                 txrc.max_rate_idx = -1;
         else
                 txrc.max_rate_idx = fls(txrc.rate_idx_mask) - 1;
+        memcpy(txrc.rate_idx_mcs_mask,
+               tx->sdata->rc_rateidx_mcs_mask[tx->channel->band],
+               sizeof(txrc.rate_idx_mcs_mask));
         txrc.bss = (tx->sdata->vif.type == NL80211_IFTYPE_AP ||
                     tx->sdata->vif.type == NL80211_IFTYPE_MESH_POINT ||
                     tx->sdata->vif.type == NL80211_IFTYPE_ADHOC);
@@ -2431,6 +2434,8 @@ struct sk_buff *ieee80211_beacon_get_tim(struct ieee80211_hw *hw,
                 txrc.max_rate_idx = -1;
         else
                 txrc.max_rate_idx = fls(txrc.rate_idx_mask) - 1;
+        memcpy(txrc.rate_idx_mcs_mask, sdata->rc_rateidx_mcs_mask[band],
+               sizeof(txrc.rate_idx_mcs_mask));
         txrc.bss = true;
         rate_control_get_rate(sdata, NULL, &txrc);
 
diff --git a/net/mac80211/util.c b/net/mac80211/util.c
index 9919892575f4..d82d886d0867 100644
--- a/net/mac80211/util.c
+++ b/net/mac80211/util.c
@@ -862,8 +862,8 @@ u32 ieee80211_mandatory_rates(struct ieee80211_local *local,
 
 void ieee80211_send_auth(struct ieee80211_sub_if_data *sdata,
                          u16 transaction, u16 auth_alg,
-                         u8 *extra, size_t extra_len, const u8 *bssid,
-                         const u8 *key, u8 key_len, u8 key_idx)
+                         u8 *extra, size_t extra_len, const u8 *da,
+                         const u8 *bssid, const u8 *key, u8 key_len, u8 key_idx)
 {
         struct ieee80211_local *local = sdata->local;
         struct sk_buff *skb;
@@ -881,7 +881,7 @@ void ieee80211_send_auth(struct ieee80211_sub_if_data *sdata,
         memset(mgmt, 0, 24 + 6);
         mgmt->frame_control = cpu_to_le16(IEEE80211_FTYPE_MGMT |
                                           IEEE80211_STYPE_AUTH);
-        memcpy(mgmt->da, bssid, ETH_ALEN);
+        memcpy(mgmt->da, da, ETH_ALEN);
         memcpy(mgmt->sa, sdata->vif.addr, ETH_ALEN);
         memcpy(mgmt->bssid, bssid, ETH_ALEN);
         mgmt->u.auth.auth_alg = cpu_to_le16(auth_alg);
@@ -1272,6 +1272,21 @@ int ieee80211_reconfig(struct ieee80211_local *local)
         ieee80211_recalc_ps(local, -1);
 
         /*
+         * The sta might be in psm against the ap (e.g. because
+         * this was the state before a hw restart), so we
+         * explicitly send a null packet in order to make sure
+         * it'll sync against the ap (and get out of psm).
+         */
+        if (!(local->hw.conf.flags & IEEE80211_CONF_PS)) {
+                list_for_each_entry(sdata, &local->interfaces, list) {
+                        if (sdata->vif.type != NL80211_IFTYPE_STATION)
+                                continue;
+
+                        ieee80211_send_nullfunc(local, sdata, 0);
+                }
+        }
+
+        /*
          * Clear the WLAN_STA_BLOCK_BA flag so new aggregation
          * sessions can be established after a resume.
          *
diff --git a/net/mac80211/work.c b/net/mac80211/work.c
index c6dd01a05291..0a1a176fbe91 100644
--- a/net/mac80211/work.c
+++ b/net/mac80211/work.c
@@ -480,7 +480,8 @@ ieee80211_authenticate(struct ieee80211_work *wk)
                sdata->name, wk->filter_ta, wk->probe_auth.tries);
 
         ieee80211_send_auth(sdata, 1, wk->probe_auth.algorithm, wk->ie,
-                            wk->ie_len, wk->filter_ta, NULL, 0, 0);
+                            wk->ie_len, wk->filter_ta, wk->filter_ta, NULL, 0,
+                            0);
         wk->probe_auth.transaction = 2;
 
         wk->timeout = jiffies + IEEE80211_AUTH_TIMEOUT;
@@ -598,7 +599,7 @@ static void ieee80211_auth_challenge(struct ieee80211_work *wk,
                 return;
         ieee80211_send_auth(sdata, 3, wk->probe_auth.algorithm,
                             elems.challenge - 2, elems.challenge_len + 2,
-                            wk->filter_ta, wk->probe_auth.key,
+                            wk->filter_ta, wk->filter_ta, wk->probe_auth.key,
                             wk->probe_auth.key_len, wk->probe_auth.key_idx);
         wk->probe_auth.transaction = 4;
 }
diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c
index 629b06182f3f..4d751e3d4b4b 100644
--- a/net/netlink/af_netlink.c
+++ b/net/netlink/af_netlink.c
@@ -1645,6 +1645,24 @@ static void netlink_destroy_callback(struct netlink_callback *cb)
         kfree(cb);
 }
 
+struct nlmsghdr *
+__nlmsg_put(struct sk_buff *skb, u32 pid, u32 seq, int type, int len, int flags)
+{
+        struct nlmsghdr *nlh;
+        int size = NLMSG_LENGTH(len);
+
+        nlh = (struct nlmsghdr*)skb_put(skb, NLMSG_ALIGN(size));
+        nlh->nlmsg_type = type;
+        nlh->nlmsg_len = size;
+        nlh->nlmsg_flags = flags;
+        nlh->nlmsg_pid = pid;
+        nlh->nlmsg_seq = seq;
+        if (!__builtin_constant_p(size) || NLMSG_ALIGN(size) - size != 0)
+                memset(NLMSG_DATA(nlh) + len, 0, NLMSG_ALIGN(size) - size);
+        return nlh;
+}
+EXPORT_SYMBOL(__nlmsg_put);
+
 /*
  * It looks a bit ugly.
  * It would be better to create kernel thread.
diff --git a/net/netlink/genetlink.c b/net/netlink/genetlink.c
index c29d2568c9e0..a1154717219e 100644
--- a/net/netlink/genetlink.c
+++ b/net/netlink/genetlink.c
@@ -498,6 +498,37 @@ int genl_unregister_family(struct genl_family *family)
 }
 EXPORT_SYMBOL(genl_unregister_family);
 
+/**
+ * genlmsg_put - Add generic netlink header to netlink message
+ * @skb: socket buffer holding the message
+ * @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
+ * @cmd: generic netlink command
+ *
+ * Returns pointer to user specific header
+ */
+void *genlmsg_put(struct sk_buff *skb, u32 pid, u32 seq,
+                                struct genl_family *family, int flags, u8 cmd)
+{
+        struct nlmsghdr *nlh;
+        struct genlmsghdr *hdr;
+
+        nlh = nlmsg_put(skb, pid, seq, family->id, GENL_HDRLEN +
+                        family->hdrsize, flags);
+        if (nlh == NULL)
+                return NULL;
+
+        hdr = nlmsg_data(nlh);
+        hdr->cmd = cmd;
+        hdr->version = family->version;
+        hdr->reserved = 0;
+
+        return (char *) hdr + GENL_HDRLEN;
+}
+EXPORT_SYMBOL(genlmsg_put);
+
 static int genl_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
 {
         struct genl_ops *ops;
diff --git a/net/nfc/core.c b/net/nfc/core.c
index 3ddf6e698df0..6089aca67b14 100644
--- a/net/nfc/core.c
+++ b/net/nfc/core.c
@@ -431,15 +431,10 @@ EXPORT_SYMBOL(nfc_alloc_recv_skb);
 int nfc_targets_found(struct nfc_dev *dev, struct nfc_target *targets,
                                                         int n_targets)
 {
-        int i;
-
         pr_debug("dev_name=%s n_targets=%d\n", dev_name(&dev->dev), n_targets);
 
         dev->polling = false;
 
-        for (i = 0; i < n_targets; i++)
-                targets[i].idx = dev->target_idx++;
-
         spin_lock_bh(&dev->targets_lock);
 
         dev->targets_generation++;
diff --git a/net/nfc/nci/core.c b/net/nfc/nci/core.c
index 7650139a1a05..a47e90c7d9d1 100644
--- a/net/nfc/nci/core.c
+++ b/net/nfc/nci/core.c
@@ -216,6 +216,39 @@ static void nci_rf_discover_req(struct nci_dev *ndev, unsigned long opt)
                 &cmd);
 }
 
+struct nci_rf_discover_select_param {
+        __u8    rf_discovery_id;
+        __u8    rf_protocol;
+};
+
+static void nci_rf_discover_select_req(struct nci_dev *ndev, unsigned long opt)
+{
+        struct nci_rf_discover_select_param *param =
+                                (struct nci_rf_discover_select_param *)opt;
+        struct nci_rf_discover_select_cmd cmd;
+
+        cmd.rf_discovery_id = param->rf_discovery_id;
+        cmd.rf_protocol = param->rf_protocol;
+
+        switch (cmd.rf_protocol) {
+        case NCI_RF_PROTOCOL_ISO_DEP:
+                cmd.rf_interface = NCI_RF_INTERFACE_ISO_DEP;
+                break;
+
+        case NCI_RF_PROTOCOL_NFC_DEP:
+                cmd.rf_interface = NCI_RF_INTERFACE_NFC_DEP;
+                break;
+
+        default:
+                cmd.rf_interface = NCI_RF_INTERFACE_FRAME;
+                break;
+        }
+
+        nci_send_cmd(ndev, NCI_OP_RF_DISCOVER_SELECT_CMD,
+                        sizeof(struct nci_rf_discover_select_cmd),
+                        &cmd);
+}
+
 static void nci_rf_deactivate_req(struct nci_dev *ndev, unsigned long opt)
 {
         struct nci_rf_deactivate_cmd cmd;
@@ -264,6 +297,8 @@ static int nci_open_device(struct nci_dev *ndev)
 
         if (!rc) {
                 set_bit(NCI_UP, &ndev->flags);
+                nci_clear_target_list(ndev);
+                atomic_set(&ndev->state, NCI_IDLE);
         } else {
                 /* Init failed, cleanup */
                 skb_queue_purge(&ndev->cmd_q);
@@ -286,6 +321,7 @@ static int nci_close_device(struct nci_dev *ndev)
 
         if (!test_and_clear_bit(NCI_UP, &ndev->flags)) {
                 del_timer_sync(&ndev->cmd_timer);
+                del_timer_sync(&ndev->data_timer);
                 mutex_unlock(&ndev->req_lock);
                 return 0;
         }
@@ -331,6 +367,15 @@ static void nci_cmd_timer(unsigned long arg)
         queue_work(ndev->cmd_wq, &ndev->cmd_work);
 }
 
+/* NCI data exchange timer function */
+static void nci_data_timer(unsigned long arg)
+{
+        struct nci_dev *ndev = (void *) arg;
+
+        set_bit(NCI_DATA_EXCHANGE_TO, &ndev->flags);
+        queue_work(ndev->rx_wq, &ndev->rx_work);
+}
+
 static int nci_dev_up(struct nfc_dev *nfc_dev)
 {
         struct nci_dev *ndev = nfc_get_drvdata(nfc_dev);
@@ -350,7 +395,8 @@ static int nci_start_poll(struct nfc_dev *nfc_dev, __u32 protocols)
         struct nci_dev *ndev = nfc_get_drvdata(nfc_dev);
         int rc;
 
-        if (test_bit(NCI_DISCOVERY, &ndev->flags)) {
+        if ((atomic_read(&ndev->state) == NCI_DISCOVERY) ||
+                (atomic_read(&ndev->state) == NCI_W4_ALL_DISCOVERIES)) {
                 pr_err("unable to start poll, since poll is already active\n");
                 return -EBUSY;
         }
@@ -360,8 +406,9 @@ static int nci_start_poll(struct nfc_dev *nfc_dev, __u32 protocols)
                 return -EBUSY;
         }
 
-        if (test_bit(NCI_POLL_ACTIVE, &ndev->flags)) {
-                pr_debug("target is active, implicitly deactivate...\n");
+        if ((atomic_read(&ndev->state) == NCI_W4_HOST_SELECT) ||
+                (atomic_read(&ndev->state) == NCI_POLL_ACTIVE)) {
+                pr_debug("target active or w4 select, implicitly deactivate\n");
 
                 rc = nci_request(ndev, nci_rf_deactivate_req, 0,
                         msecs_to_jiffies(NCI_RF_DEACTIVATE_TIMEOUT));
@@ -382,7 +429,8 @@ static void nci_stop_poll(struct nfc_dev *nfc_dev)
 {
         struct nci_dev *ndev = nfc_get_drvdata(nfc_dev);
 
-        if (!test_bit(NCI_DISCOVERY, &ndev->flags)) {
+        if ((atomic_read(&ndev->state) != NCI_DISCOVERY) &&
+                (atomic_read(&ndev->state) != NCI_W4_ALL_DISCOVERIES)) {
                 pr_err("unable to stop poll, since poll is not active\n");
                 return;
         }
@@ -395,10 +443,15 @@ static int nci_activate_target(struct nfc_dev *nfc_dev, __u32 target_idx,
                                 __u32 protocol)
 {
         struct nci_dev *ndev = nfc_get_drvdata(nfc_dev);
+        struct nci_rf_discover_select_param param;
+        struct nfc_target *target = NULL;
+        int i;
+        int rc = 0;
 
         pr_debug("target_idx %d, protocol 0x%x\n", target_idx, protocol);
 
-        if (!test_bit(NCI_POLL_ACTIVE, &ndev->flags)) {
+        if ((atomic_read(&ndev->state) != NCI_W4_HOST_SELECT) &&
+                (atomic_read(&ndev->state) != NCI_POLL_ACTIVE)) {
                 pr_err("there is no available target to activate\n");
                 return -EINVAL;
         }
@@ -408,16 +461,47 @@ static int nci_activate_target(struct nfc_dev *nfc_dev, __u32 target_idx,
                 return -EBUSY;
         }
 
-        if (!(ndev->target_available_prots & (1 << protocol))) {
+        for (i = 0; i < ndev->n_targets; i++) {
+                if (ndev->targets[i].idx == target_idx) {
+                        target = &ndev->targets[i];
+                        break;
+                }
+        }
+
+        if (!target) {
+                pr_err("unable to find the selected target\n");
+                return -EINVAL;
+        }
+
+        if (!(target->supported_protocols & (1 << protocol))) {
                 pr_err("target does not support the requested protocol 0x%x\n",
                        protocol);
                 return -EINVAL;
         }
 
-        ndev->target_active_prot = protocol;
-        ndev->target_available_prots = 0;
+        if (atomic_read(&ndev->state) == NCI_W4_HOST_SELECT) {
+                param.rf_discovery_id = target->idx;
 
-        return 0;
+                if (protocol == NFC_PROTO_JEWEL)
+                        param.rf_protocol = NCI_RF_PROTOCOL_T1T;
+                else if (protocol == NFC_PROTO_MIFARE)
+                        param.rf_protocol = NCI_RF_PROTOCOL_T2T;
+                else if (protocol == NFC_PROTO_FELICA)
+                        param.rf_protocol = NCI_RF_PROTOCOL_T3T;
+                else if (protocol == NFC_PROTO_ISO14443)
+                        param.rf_protocol = NCI_RF_PROTOCOL_ISO_DEP;
+                else
+                        param.rf_protocol = NCI_RF_PROTOCOL_NFC_DEP;
+
+                rc = nci_request(ndev, nci_rf_discover_select_req,
+                                (unsigned long)&param,
+                                msecs_to_jiffies(NCI_RF_DISC_SELECT_TIMEOUT));
+        }
+
+        if (!rc)
+                ndev->target_active_prot = protocol;
+
+        return rc;
 }
 
 static void nci_deactivate_target(struct nfc_dev *nfc_dev, __u32 target_idx)
@@ -433,7 +517,7 @@ static void nci_deactivate_target(struct nfc_dev *nfc_dev, __u32 target_idx)
 
         ndev->target_active_prot = 0;
 
-        if (test_bit(NCI_POLL_ACTIVE, &ndev->flags)) {
+        if (atomic_read(&ndev->state) == NCI_POLL_ACTIVE) {
                 nci_request(ndev, nci_rf_deactivate_req, 0,
                         msecs_to_jiffies(NCI_RF_DEACTIVATE_TIMEOUT));
         }
@@ -585,6 +669,8 @@ int nci_register_device(struct nci_dev *ndev)
 
         setup_timer(&ndev->cmd_timer, nci_cmd_timer,
                         (unsigned long) ndev);
+        setup_timer(&ndev->data_timer, nci_data_timer,
+                        (unsigned long) ndev);
 
         mutex_init(&ndev->req_lock);
 
@@ -722,6 +808,9 @@ static void nci_tx_work(struct work_struct *work)
                          nci_plen(skb->data));
 
                 nci_send_frame(skb);
+
+                mod_timer(&ndev->data_timer,
+                        jiffies + msecs_to_jiffies(NCI_DATA_TIMEOUT));
         }
 }
 
@@ -753,6 +842,15 @@ static void nci_rx_work(struct work_struct *work)
                         break;
                 }
         }
+
+        /* check if a data exchange timout has occurred */
+        if (test_bit(NCI_DATA_EXCHANGE_TO, &ndev->flags)) {
+                /* complete the data exchange transaction, if exists */
+                if (test_bit(NCI_DATA_EXCHANGE, &ndev->flags))
+                        nci_data_exchange_complete(ndev, NULL, -ETIMEDOUT);
+
+                clear_bit(NCI_DATA_EXCHANGE_TO, &ndev->flags);
+        }
 }
 
 /* ----- NCI TX CMD worker thread ----- */
diff --git a/net/nfc/nci/data.c b/net/nfc/nci/data.c
index e5756b30e602..7880ae924d5e 100644
--- a/net/nfc/nci/data.c
+++ b/net/nfc/nci/data.c
@@ -44,6 +44,10 @@ void nci_data_exchange_complete(struct nci_dev *ndev,
 
         pr_debug("len %d, err %d\n", skb ? skb->len : 0, err);
 
+        /* data exchange is complete, stop the data timer */
+        del_timer_sync(&ndev->data_timer);
+        clear_bit(NCI_DATA_EXCHANGE_TO, &ndev->flags);
+
         if (cb) {
                 ndev->data_exchange_cb = NULL;
                 ndev->data_exchange_cb_context = 0;
diff --git a/net/nfc/nci/ntf.c b/net/nfc/nci/ntf.c
index b16a8dc2afbe..03e7b4626a3e 100644
--- a/net/nfc/nci/ntf.c
+++ b/net/nfc/nci/ntf.c
@@ -71,6 +71,20 @@ static void nci_core_conn_credits_ntf_packet(struct nci_dev *ndev,
                 queue_work(ndev->tx_wq, &ndev->tx_work);
 }
 
+static void nci_core_generic_error_ntf_packet(struct nci_dev *ndev,
+                                                struct sk_buff *skb)
+{
+        __u8 status = skb->data[0];
+
+        pr_debug("status 0x%x\n", status);
+
+        if (atomic_read(&ndev->state) == NCI_W4_HOST_SELECT) {
+                /* Activation failed, so complete the request
+                (the state remains the same) */
+                nci_req_complete(ndev, status);
+        }
+}
+
 static void nci_core_conn_intf_error_ntf_packet(struct nci_dev *ndev,
                                                 struct sk_buff *skb)
 {
@@ -86,12 +100,9 @@ static void nci_core_conn_intf_error_ntf_packet(struct nci_dev *ndev,
 }
 
 static __u8 *nci_extract_rf_params_nfca_passive_poll(struct nci_dev *ndev,
-                        struct nci_rf_intf_activated_ntf *ntf, __u8 *data)
+                        struct rf_tech_specific_params_nfca_poll *nfca_poll,
+                        __u8 *data)
 {
-        struct rf_tech_specific_params_nfca_poll *nfca_poll;
-
-        nfca_poll = &ntf->rf_tech_specific_params.nfca_poll;
-
         nfca_poll->sens_res = __le16_to_cpu(*((__u16 *)data));
         data += 2;
 
@@ -115,15 +126,213 @@ static __u8 *nci_extract_rf_params_nfca_passive_poll(struct nci_dev *ndev,
         return data;
 }
 
+static __u8 *nci_extract_rf_params_nfcb_passive_poll(struct nci_dev *ndev,
+                        struct rf_tech_specific_params_nfcb_poll *nfcb_poll,
+                        __u8 *data)
+{
+        nfcb_poll->sensb_res_len = *data++;
+
+        pr_debug("sensb_res_len %d\n", nfcb_poll->sensb_res_len);
+
+        memcpy(nfcb_poll->sensb_res, data, nfcb_poll->sensb_res_len);
+        data += nfcb_poll->sensb_res_len;
+
+        return data;
+}
+
+static __u8 *nci_extract_rf_params_nfcf_passive_poll(struct nci_dev *ndev,
+                        struct rf_tech_specific_params_nfcf_poll *nfcf_poll,
+                        __u8 *data)
+{
+        nfcf_poll->bit_rate = *data++;
+        nfcf_poll->sensf_res_len = *data++;
+
+        pr_debug("bit_rate %d, sensf_res_len %d\n",
+                nfcf_poll->bit_rate, nfcf_poll->sensf_res_len);
+
+        memcpy(nfcf_poll->sensf_res, data, nfcf_poll->sensf_res_len);
+        data += nfcf_poll->sensf_res_len;
+
+        return data;
+}
+
+static int nci_add_new_protocol(struct nci_dev *ndev,
+                                struct nfc_target *target,
+                                __u8 rf_protocol,
+                                __u8 rf_tech_and_mode,
+                                void *params)
+{
+        struct rf_tech_specific_params_nfca_poll *nfca_poll;
+        struct rf_tech_specific_params_nfcb_poll *nfcb_poll;
+        struct rf_tech_specific_params_nfcf_poll *nfcf_poll;
+        __u32 protocol;
+
+        if (rf_protocol == NCI_RF_PROTOCOL_T2T)
+                protocol = NFC_PROTO_MIFARE_MASK;
+        else if (rf_protocol == NCI_RF_PROTOCOL_ISO_DEP)
+                protocol = NFC_PROTO_ISO14443_MASK;
+        else if (rf_protocol == NCI_RF_PROTOCOL_T3T)
+                protocol = NFC_PROTO_FELICA_MASK;
+        else
+                protocol = 0;
+
+        if (!(protocol & ndev->poll_prots)) {
+                pr_err("the target found does not have the desired protocol\n");
+                return -EPROTO;
+        }
+
+        if (rf_tech_and_mode == NCI_NFC_A_PASSIVE_POLL_MODE) {
+                nfca_poll = (struct rf_tech_specific_params_nfca_poll *)params;
+
+                target->sens_res = nfca_poll->sens_res;
+                target->sel_res = nfca_poll->sel_res;
+                target->nfcid1_len = nfca_poll->nfcid1_len;
+                if (target->nfcid1_len > 0) {
+                        memcpy(target->nfcid1, nfca_poll->nfcid1,
+                                target->nfcid1_len);
+                }
+        } else if (rf_tech_and_mode == NCI_NFC_B_PASSIVE_POLL_MODE) {
+                nfcb_poll = (struct rf_tech_specific_params_nfcb_poll *)params;
+
+                target->sensb_res_len = nfcb_poll->sensb_res_len;
+                if (target->sensb_res_len > 0) {
+                        memcpy(target->sensb_res, nfcb_poll->sensb_res,
+                                target->sensb_res_len);
+                }
+        } else if (rf_tech_and_mode == NCI_NFC_F_PASSIVE_POLL_MODE) {
+                nfcf_poll = (struct rf_tech_specific_params_nfcf_poll *)params;
+
+                target->sensf_res_len = nfcf_poll->sensf_res_len;
+                if (target->sensf_res_len > 0) {
+                        memcpy(target->sensf_res, nfcf_poll->sensf_res,
+                                target->sensf_res_len);
+                }
+        } else {
+                pr_err("unsupported rf_tech_and_mode 0x%x\n", rf_tech_and_mode);
+                return -EPROTO;
+        }
+
+        target->supported_protocols |= protocol;
+
+        pr_debug("protocol 0x%x\n", protocol);
+
+        return 0;
+}
+
+static void nci_add_new_target(struct nci_dev *ndev,
+                                struct nci_rf_discover_ntf *ntf)
+{
+        struct nfc_target *target;
+        int i, rc;
+
+        for (i = 0; i < ndev->n_targets; i++) {
+                target = &ndev->targets[i];
+                if (target->idx == ntf->rf_discovery_id) {
+                        /* This target already exists, add the new protocol */
+                        nci_add_new_protocol(ndev, target, ntf->rf_protocol,
+                                                ntf->rf_tech_and_mode,
+                                                &ntf->rf_tech_specific_params);
+                        return;
+                }
+        }
+
+        /* This is a new target, check if we've enough room */
+        if (ndev->n_targets == NCI_MAX_DISCOVERED_TARGETS) {
+                pr_debug("not enough room, ignoring new target...\n");
+                return;
+        }
+
+        target = &ndev->targets[ndev->n_targets];
+
+        rc = nci_add_new_protocol(ndev, target, ntf->rf_protocol,
+                                        ntf->rf_tech_and_mode,
+                                        &ntf->rf_tech_specific_params);
+        if (!rc) {
+                target->idx = ntf->rf_discovery_id;
+                ndev->n_targets++;
+
+                pr_debug("target_idx %d, n_targets %d\n", target->idx,
+                                ndev->n_targets);
+        }
+}
+
+void nci_clear_target_list(struct nci_dev *ndev)
+{
+        memset(ndev->targets, 0,
+                (sizeof(struct nfc_target)*NCI_MAX_DISCOVERED_TARGETS));
+
+        ndev->n_targets = 0;
+}
+
+static void nci_rf_discover_ntf_packet(struct nci_dev *ndev,
+                                        struct sk_buff *skb)
+{
+        struct nci_rf_discover_ntf ntf;
+        __u8 *data = skb->data;
+        bool add_target = true;
+
+        ntf.rf_discovery_id = *data++;
+        ntf.rf_protocol = *data++;
+        ntf.rf_tech_and_mode = *data++;
+        ntf.rf_tech_specific_params_len = *data++;
+
+        pr_debug("rf_discovery_id %d\n", ntf.rf_discovery_id);
+        pr_debug("rf_protocol 0x%x\n", ntf.rf_protocol);
+        pr_debug("rf_tech_and_mode 0x%x\n", ntf.rf_tech_and_mode);
+        pr_debug("rf_tech_specific_params_len %d\n",
+                        ntf.rf_tech_specific_params_len);
+
+        if (ntf.rf_tech_specific_params_len > 0) {
+                switch (ntf.rf_tech_and_mode) {
+                case NCI_NFC_A_PASSIVE_POLL_MODE:
+                        data = nci_extract_rf_params_nfca_passive_poll(ndev,
+                                &(ntf.rf_tech_specific_params.nfca_poll), data);
+                        break;
+
+                case NCI_NFC_B_PASSIVE_POLL_MODE:
+                        data = nci_extract_rf_params_nfcb_passive_poll(ndev,
+                                &(ntf.rf_tech_specific_params.nfcb_poll), data);
+                        break;
+
+                case NCI_NFC_F_PASSIVE_POLL_MODE:
+                        data = nci_extract_rf_params_nfcf_passive_poll(ndev,
+                                &(ntf.rf_tech_specific_params.nfcf_poll), data);
+                        break;
+
+                default:
+                        pr_err("unsupported rf_tech_and_mode 0x%x\n",
+                               ntf.rf_tech_and_mode);
+                        data += ntf.rf_tech_specific_params_len;
+                        add_target = false;
+                }
+        }
+
+        ntf.ntf_type = *data++;
+        pr_debug("ntf_type %d\n", ntf.ntf_type);
+
+        if (add_target == true)
+                nci_add_new_target(ndev, &ntf);
+
+        if (ntf.ntf_type == NCI_DISCOVER_NTF_TYPE_MORE) {
+                atomic_set(&ndev->state, NCI_W4_ALL_DISCOVERIES);
+        } else {
+                atomic_set(&ndev->state, NCI_W4_HOST_SELECT);
+                nfc_targets_found(ndev->nfc_dev, ndev->targets,
+                                        ndev->n_targets);
+        }
+}
+
 static int nci_extract_activation_params_iso_dep(struct nci_dev *ndev,
                         struct nci_rf_intf_activated_ntf *ntf, __u8 *data)
 {
         struct activation_params_nfca_poll_iso_dep *nfca_poll;
+        struct activation_params_nfcb_poll_iso_dep *nfcb_poll;
 
         switch (ntf->activation_rf_tech_and_mode) {
         case NCI_NFC_A_PASSIVE_POLL_MODE:
                 nfca_poll = &ntf->activation_params.nfca_poll_iso_dep;
                 nfca_poll->rats_res_len = *data++;
+                pr_debug("rats_res_len %d\n", nfca_poll->rats_res_len);
                 if (nfca_poll->rats_res_len > 0) {
                         memcpy(nfca_poll->rats_res,
                                 data,
@@ -131,52 +340,47 @@ static int nci_extract_activation_params_iso_dep(struct nci_dev *ndev,
                 }
                 break;
 
+        case NCI_NFC_B_PASSIVE_POLL_MODE:
+                nfcb_poll = &ntf->activation_params.nfcb_poll_iso_dep;
+                nfcb_poll->attrib_res_len = *data++;
+                pr_debug("attrib_res_len %d\n",
+                        nfcb_poll->attrib_res_len);
+                if (nfcb_poll->attrib_res_len > 0) {
+                        memcpy(nfcb_poll->attrib_res,
+                                data,
+                                nfcb_poll->attrib_res_len);
+                }
+                break;
+
         default:
                 pr_err("unsupported activation_rf_tech_and_mode 0x%x\n",
                        ntf->activation_rf_tech_and_mode);
-                return -EPROTO;
+                return NCI_STATUS_RF_PROTOCOL_ERROR;
         }
 
-        return 0;
+        return NCI_STATUS_OK;
 }
 
-static void nci_target_found(struct nci_dev *ndev,
-                                struct nci_rf_intf_activated_ntf *ntf)
+static void nci_target_auto_activated(struct nci_dev *ndev,
+                                        struct nci_rf_intf_activated_ntf *ntf)
 {
-        struct nfc_target nfc_tgt;
+        struct nfc_target *target;
+        int rc;
 
-        if (ntf->rf_protocol == NCI_RF_PROTOCOL_T2T)    /* T2T MifareUL */
-                nfc_tgt.supported_protocols = NFC_PROTO_MIFARE_MASK;
-        else if (ntf->rf_protocol == NCI_RF_PROTOCOL_ISO_DEP)   /* 4A */
-                nfc_tgt.supported_protocols = NFC_PROTO_ISO14443_MASK;
-        else
-                nfc_tgt.supported_protocols = 0;
-
-        nfc_tgt.sens_res = ntf->rf_tech_specific_params.nfca_poll.sens_res;
-        nfc_tgt.sel_res = ntf->rf_tech_specific_params.nfca_poll.sel_res;
-        nfc_tgt.nfcid1_len = ntf->rf_tech_specific_params.nfca_poll.nfcid1_len;
-        if (nfc_tgt.nfcid1_len > 0) {
-                memcpy(nfc_tgt.nfcid1,
-                        ntf->rf_tech_specific_params.nfca_poll.nfcid1,
-                        nfc_tgt.nfcid1_len);
-        }
+        target = &ndev->targets[ndev->n_targets];
 
-        if (!(nfc_tgt.supported_protocols & ndev->poll_prots)) {
-                pr_debug("the target found does not have the desired protocol\n");
+        rc = nci_add_new_protocol(ndev, target, ntf->rf_protocol,
+                                        ntf->activation_rf_tech_and_mode,
+                                        &ntf->rf_tech_specific_params);
+        if (rc)
                 return;
-        }
 
-        pr_debug("new target found,  supported_protocols 0x%x\n",
-                 nfc_tgt.supported_protocols);
+        target->idx = ntf->rf_discovery_id;
+        ndev->n_targets++;
 
-        ndev->target_available_prots = nfc_tgt.supported_protocols;
-        ndev->max_data_pkt_payload_size = ntf->max_data_pkt_payload_size;
-        ndev->initial_num_credits = ntf->initial_num_credits;
+        pr_debug("target_idx %d, n_targets %d\n", target->idx, ndev->n_targets);
 
-        /* set the available credits to initial value */
-        atomic_set(&ndev->credits_cnt, ndev->initial_num_credits);
-
-        nfc_targets_found(ndev->nfc_dev, &nfc_tgt, 1);
+        nfc_targets_found(ndev->nfc_dev, ndev->targets, ndev->n_targets);
 }
 
 static void nci_rf_intf_activated_ntf_packet(struct nci_dev *ndev,
@@ -184,10 +388,7 @@ static void nci_rf_intf_activated_ntf_packet(struct nci_dev *ndev,
 {
         struct nci_rf_intf_activated_ntf ntf;
         __u8 *data = skb->data;
-        int err = 0;
-
-        clear_bit(NCI_DISCOVERY, &ndev->flags);
-        set_bit(NCI_POLL_ACTIVE, &ndev->flags);
+        int err = NCI_STATUS_OK;
 
         ntf.rf_discovery_id = *data++;
         ntf.rf_interface = *data++;
@@ -212,13 +413,24 @@ static void nci_rf_intf_activated_ntf_packet(struct nci_dev *ndev,
                 switch (ntf.activation_rf_tech_and_mode) {
                 case NCI_NFC_A_PASSIVE_POLL_MODE:
                         data = nci_extract_rf_params_nfca_passive_poll(ndev,
-                                &ntf, data);
+                                &(ntf.rf_tech_specific_params.nfca_poll), data);
+                        break;
+
+                case NCI_NFC_B_PASSIVE_POLL_MODE:
+                        data = nci_extract_rf_params_nfcb_passive_poll(ndev,
+                                &(ntf.rf_tech_specific_params.nfcb_poll), data);
+                        break;
+
+                case NCI_NFC_F_PASSIVE_POLL_MODE:
+                        data = nci_extract_rf_params_nfcf_passive_poll(ndev,
+                                &(ntf.rf_tech_specific_params.nfcf_poll), data);
                         break;
 
                 default:
                         pr_err("unsupported activation_rf_tech_and_mode 0x%x\n",
                                ntf.activation_rf_tech_and_mode);
-                        return;
+                        err = NCI_STATUS_RF_PROTOCOL_ERROR;
+                        goto exit;
                 }
         }
 
@@ -250,12 +462,30 @@ static void nci_rf_intf_activated_ntf_packet(struct nci_dev *ndev,
                 default:
                         pr_err("unsupported rf_interface 0x%x\n",
                                ntf.rf_interface);
-                        return;
+                        err = NCI_STATUS_RF_PROTOCOL_ERROR;
+                        break;
                 }
         }
 
-        if (!err)
-                nci_target_found(ndev, &ntf);
+exit:
+        if (err == NCI_STATUS_OK) {
+                ndev->max_data_pkt_payload_size = ntf.max_data_pkt_payload_size;
+                ndev->initial_num_credits = ntf.initial_num_credits;
+
+                /* set the available credits to initial value */
+                atomic_set(&ndev->credits_cnt, ndev->initial_num_credits);
+        }
+
+        if (atomic_read(&ndev->state) == NCI_DISCOVERY) {
+                /* A single target was found and activated automatically */
+                atomic_set(&ndev->state, NCI_POLL_ACTIVE);
+                if (err == NCI_STATUS_OK)
+                        nci_target_auto_activated(ndev, &ntf);
+        } else {        /* ndev->state == NCI_W4_HOST_SELECT */
+                /* A selected target was activated, so complete the request */
+                atomic_set(&ndev->state, NCI_POLL_ACTIVE);
+                nci_req_complete(ndev, err);
+        }
 }
 
 static void nci_rf_deactivate_ntf_packet(struct nci_dev *ndev,
@@ -265,9 +495,6 @@ static void nci_rf_deactivate_ntf_packet(struct nci_dev *ndev,
 
         pr_debug("entry, type 0x%x, reason 0x%x\n", ntf->type, ntf->reason);
 
-        clear_bit(NCI_POLL_ACTIVE, &ndev->flags);
-        ndev->target_active_prot = 0;
-
         /* drop tx data queue */
         skb_queue_purge(&ndev->tx_q);
 
@@ -280,6 +507,10 @@ static void nci_rf_deactivate_ntf_packet(struct nci_dev *ndev,
         /* complete the data exchange transaction, if exists */
         if (test_bit(NCI_DATA_EXCHANGE, &ndev->flags))
                 nci_data_exchange_complete(ndev, NULL, -EIO);
+
+        nci_clear_target_list(ndev);
+        atomic_set(&ndev->state, NCI_IDLE);
+        nci_req_complete(ndev, NCI_STATUS_OK);
 }
 
 void nci_ntf_packet(struct nci_dev *ndev, struct sk_buff *skb)
@@ -300,10 +531,18 @@ void nci_ntf_packet(struct nci_dev *ndev, struct sk_buff *skb)
                 nci_core_conn_credits_ntf_packet(ndev, skb);
                 break;
 
+        case NCI_OP_CORE_GENERIC_ERROR_NTF:
+                nci_core_generic_error_ntf_packet(ndev, skb);
+                break;
+
         case NCI_OP_CORE_INTF_ERROR_NTF:
                 nci_core_conn_intf_error_ntf_packet(ndev, skb);
                 break;
 
+        case NCI_OP_RF_DISCOVER_NTF:
+                nci_rf_discover_ntf_packet(ndev, skb);
+                break;
+
         case NCI_OP_RF_INTF_ACTIVATED_NTF:
                 nci_rf_intf_activated_ntf_packet(ndev, skb);
                 break;
diff --git a/net/nfc/nci/rsp.c b/net/nfc/nci/rsp.c
index 2840ae2f3615..aa63b1e99188 100644
--- a/net/nfc/nci/rsp.c
+++ b/net/nfc/nci/rsp.c
@@ -137,11 +137,23 @@ static void nci_rf_disc_rsp_packet(struct nci_dev *ndev, struct sk_buff *skb)
         pr_debug("status 0x%x\n", status);
 
         if (status == NCI_STATUS_OK)
-                set_bit(NCI_DISCOVERY, &ndev->flags);
+                atomic_set(&ndev->state, NCI_DISCOVERY);
 
         nci_req_complete(ndev, status);
 }
 
+static void nci_rf_disc_select_rsp_packet(struct nci_dev *ndev,
+                                                struct sk_buff *skb)
+{
+        __u8 status = skb->data[0];
+
+        pr_debug("status 0x%x\n", status);
+
+        /* Complete the request on intf_activated_ntf or generic_error_ntf */
+        if (status != NCI_STATUS_OK)
+                nci_req_complete(ndev, status);
+}
+
 static void nci_rf_deactivate_rsp_packet(struct nci_dev *ndev,
                                         struct sk_buff *skb)
 {
@@ -149,9 +161,13 @@ static void nci_rf_deactivate_rsp_packet(struct nci_dev *ndev,
 
         pr_debug("status 0x%x\n", status);
 
-        clear_bit(NCI_DISCOVERY, &ndev->flags);
-
-        nci_req_complete(ndev, status);
+        /* If target was active, complete the request only in deactivate_ntf */
+        if ((status != NCI_STATUS_OK) ||
+                (atomic_read(&ndev->state) != NCI_POLL_ACTIVE)) {
+                nci_clear_target_list(ndev);
+                atomic_set(&ndev->state, NCI_IDLE);
+                nci_req_complete(ndev, status);
+        }
 }
 
 void nci_rsp_packet(struct nci_dev *ndev, struct sk_buff *skb)
@@ -187,6 +203,10 @@ void nci_rsp_packet(struct nci_dev *ndev, struct sk_buff *skb)
                 nci_rf_disc_rsp_packet(ndev, skb);
                 break;
 
+        case NCI_OP_RF_DISCOVER_SELECT_RSP:
+                nci_rf_disc_select_rsp_packet(ndev, skb);
+                break;
+
         case NCI_OP_RF_DEACTIVATE_RSP:
                 nci_rf_deactivate_rsp_packet(ndev, skb);
                 break;
diff --git a/net/nfc/netlink.c b/net/nfc/netlink.c
index 6989dfa28ee2..07f0348aabf5 100644
--- a/net/nfc/netlink.c
+++ b/net/nfc/netlink.c
@@ -70,6 +70,12 @@ static int nfc_genl_send_target(struct sk_buff *msg, struct nfc_target *target,
         if (target->nfcid1_len > 0)
                 NLA_PUT(msg, NFC_ATTR_TARGET_NFCID1, target->nfcid1_len,
                                 target->nfcid1);
+        if (target->sensb_res_len > 0)
+                NLA_PUT(msg, NFC_ATTR_TARGET_SENSB_RES, target->sensb_res_len,
+                                target->sensb_res);
+        if (target->sensf_res_len > 0)
+                NLA_PUT(msg, NFC_ATTR_TARGET_SENSF_RES, target->sensf_res_len,
+                                target->sensf_res);
 
         return genlmsg_end(msg, hdr);
 
diff --git a/net/nfc/rawsock.c b/net/nfc/rawsock.c
index 2e2f8c6a61fe..5325439b0c60 100644
--- a/net/nfc/rawsock.c
+++ b/net/nfc/rawsock.c
@@ -92,18 +92,6 @@ static int rawsock_connect(struct socket *sock, struct sockaddr *_addr,
                 goto error;
         }
 
-        if (addr->target_idx > dev->target_idx - 1 ||
-                addr->target_idx < dev->target_idx - dev->n_targets) {
-                rc = -EINVAL;
-                goto error;
-        }
-
-        if (addr->target_idx > dev->target_idx - 1 ||
-                addr->target_idx < dev->target_idx - dev->n_targets) {
-                rc = -EINVAL;
-                goto error;
-        }
-
         rc = nfc_activate_target(dev, addr->target_idx, addr->nfc_protocol);
         if (rc)
                 goto put_dev;
diff --git a/net/sched/Kconfig b/net/sched/Kconfig
index 2590e91b3289..75b58f81d53d 100644
--- a/net/sched/Kconfig
+++ b/net/sched/Kconfig
@@ -260,6 +260,32 @@ config NET_SCH_INGRESS
           To compile this code as a module, choose M here: the
           module will be called sch_ingress.
 
+config NET_SCH_PLUG
+        tristate "Plug network traffic until release (PLUG)"
+        ---help---
+
+          This queuing discipline allows userspace to plug/unplug a network
+          output queue, using the netlink interface.  When it receives an
+          enqueue command it inserts a plug into the outbound queue that
+          causes following packets to enqueue until a dequeue command arrives
+          over netlink, causing the plug to be removed and resuming the normal
+          packet flow.
+
+          This module also provides a generic "network output buffering"
+          functionality (aka output commit), wherein upon arrival of a dequeue
+          command, only packets up to the first plug are released for delivery.
+          The Remus HA project uses this module to enable speculative execution
+          of virtual machines by allowing the generated network output to be rolled
+          back if needed.
+
+          For more information, please refer to http://wiki.xensource.com/xenwiki/Remus
+
+          Say Y here if you are using this kernel for Xen dom0 and
+          want to protect Xen guests with Remus.
+
+          To compile this code as a module, choose M here: the
+          module will be called sch_plug.
+
 comment "Classification"
 
 config NET_CLS
diff --git a/net/sched/Makefile b/net/sched/Makefile
index dc5889c0a15a..8cdf4e2b51d3 100644
--- a/net/sched/Makefile
+++ b/net/sched/Makefile
@@ -33,6 +33,7 @@ obj-$(CONFIG_NET_SCH_MULTIQ)	+= sch_multiq.o
 obj-$(CONFIG_NET_SCH_ATM)       += sch_atm.o
 obj-$(CONFIG_NET_SCH_NETEM)     += sch_netem.o
 obj-$(CONFIG_NET_SCH_DRR)       += sch_drr.o
+obj-$(CONFIG_NET_SCH_PLUG)      += sch_plug.o
 obj-$(CONFIG_NET_SCH_MQPRIO)    += sch_mqprio.o
 obj-$(CONFIG_NET_SCH_CHOKE)     += sch_choke.o
 obj-$(CONFIG_NET_SCH_QFQ)       += sch_qfq.o
diff --git a/net/sched/sch_plug.c b/net/sched/sch_plug.c
new file mode 100644
index 000000000000..ba7b737e4055
--- /dev/null
+++ b/net/sched/sch_plug.c
@@ -0,0 +1,233 @@
+/*
+ * sch_plug.c Queue traffic until an explicit release command
+ *
+ *             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; either version
+ *             2 of the License, or (at your option) any later version.
+ *
+ * There are two ways to use this qdisc:
+ * 1. A simple "instantaneous" plug/unplug operation, by issuing an alternating
+ *    sequence of TCQ_PLUG_BUFFER & TCQ_PLUG_RELEASE_INDEFINITE commands.
+ *
+ * 2. For network output buffering (a.k.a output commit) functionality.
+ *    Output commit property is commonly used by applications using checkpoint
+ *    based fault-tolerance to ensure that the checkpoint from which a system
+ *    is being restored is consistent w.r.t outside world.
+ *
+ *    Consider for e.g. Remus - a Virtual Machine checkpointing system,
+ *    wherein a VM is checkpointed, say every 50ms. The checkpoint is replicated
+ *    asynchronously to the backup host, while the VM continues executing the
+ *    next epoch speculatively.
+ *
+ *    The following is a typical sequence of output buffer operations:
+ *       1.At epoch i, start_buffer(i)
+ *       2. At end of epoch i (i.e. after 50ms):
+ *          2.1 Stop VM and take checkpoint(i).
+ *          2.2 start_buffer(i+1) and Resume VM
+ *       3. While speculatively executing epoch(i+1), asynchronously replicate
+ *          checkpoint(i) to backup host.
+ *       4. When checkpoint_ack(i) is received from backup, release_buffer(i)
+ *    Thus, this Qdisc would receive the following sequence of commands:
+ *       TCQ_PLUG_BUFFER (epoch i)
+ *       .. TCQ_PLUG_BUFFER (epoch i+1)
+ *       ....TCQ_PLUG_RELEASE_ONE (epoch i)
+ *       ......TCQ_PLUG_BUFFER (epoch i+2)
+ *       ........
+ */
+
+#include <linux/module.h>
+#include <linux/types.h>
+#include <linux/kernel.h>
+#include <linux/errno.h>
+#include <linux/netdevice.h>
+#include <linux/skbuff.h>
+#include <net/pkt_sched.h>
+
+/*
+ * State of the queue, when used for network output buffering:
+ *
+ *                 plug(i+1)            plug(i)          head
+ * ------------------+--------------------+---------------->
+ *                   |                    |
+ *                   |                    |
+ * pkts_current_epoch| pkts_last_epoch    |pkts_to_release
+ * ----------------->|<--------+--------->|+--------------->
+ *                   v                    v
+ *
+ */
+
+struct plug_sched_data {
+        /* If true, the dequeue function releases all packets
+         * from head to end of the queue. The queue turns into
+         * a pass-through queue for newly arriving packets.
+         */
+        bool unplug_indefinite;
+
+        /* Queue Limit in bytes */
+        u32 limit;
+
+        /* Number of packets (output) from the current speculatively
+         * executing epoch.
+         */
+        u32 pkts_current_epoch;
+
+        /* Number of packets corresponding to the recently finished
+         * epoch. These will be released when we receive a
+         * TCQ_PLUG_RELEASE_ONE command. This command is typically
+         * issued after committing a checkpoint at the target.
+         */
+        u32 pkts_last_epoch;
+
+        /*
+         * Number of packets from the head of the queue, that can
+         * be released (committed checkpoint).
+         */
+        u32 pkts_to_release;
+};
+
+static int plug_enqueue(struct sk_buff *skb, struct Qdisc *sch)
+{
+        struct plug_sched_data *q = qdisc_priv(sch);
+
+        if (likely(sch->qstats.backlog + skb->len <= q->limit)) {
+                if (!q->unplug_indefinite)
+                        q->pkts_current_epoch++;
+                return qdisc_enqueue_tail(skb, sch);
+        }
+
+        return qdisc_reshape_fail(skb, sch);
+}
+
+static struct sk_buff *plug_dequeue(struct Qdisc *sch)
+{
+        struct plug_sched_data *q = qdisc_priv(sch);
+
+        if (qdisc_is_throttled(sch))
+                return NULL;
+
+        if (!q->unplug_indefinite) {
+                if (!q->pkts_to_release) {
+                        /* No more packets to dequeue. Block the queue
+                         * and wait for the next release command.
+                         */
+                        qdisc_throttled(sch);
+                        return NULL;
+                }
+                q->pkts_to_release--;
+        }
+
+        return qdisc_dequeue_head(sch);
+}
+
+static int plug_init(struct Qdisc *sch, struct nlattr *opt)
+{
+        struct plug_sched_data *q = qdisc_priv(sch);
+
+        q->pkts_current_epoch = 0;
+        q->pkts_last_epoch = 0;
+        q->pkts_to_release = 0;
+        q->unplug_indefinite = false;
+
+        if (opt == NULL) {
+                /* We will set a default limit of 100 pkts (~150kB)
+                 * in case tx_queue_len is not available. The
+                 * default value is completely arbitrary.
+                 */
+                u32 pkt_limit = qdisc_dev(sch)->tx_queue_len ? : 100;
+                q->limit = pkt_limit * psched_mtu(qdisc_dev(sch));
+        } else {
+                struct tc_plug_qopt *ctl = nla_data(opt);
+
+                if (nla_len(opt) < sizeof(*ctl))
+                        return -EINVAL;
+
+                q->limit = ctl->limit;
+        }
+
+        qdisc_throttled(sch);
+        return 0;
+}
+
+/* Receives 4 types of messages:
+ * TCQ_PLUG_BUFFER: Inset a plug into the queue and
+ *  buffer any incoming packets
+ * TCQ_PLUG_RELEASE_ONE: Dequeue packets from queue head
+ *   to beginning of the next plug.
+ * TCQ_PLUG_RELEASE_INDEFINITE: Dequeue all packets from queue.
+ *   Stop buffering packets until the next TCQ_PLUG_BUFFER
+ *   command is received (just act as a pass-thru queue).
+ * TCQ_PLUG_LIMIT: Increase/decrease queue size
+ */
+static int plug_change(struct Qdisc *sch, struct nlattr *opt)
+{
+        struct plug_sched_data *q = qdisc_priv(sch);
+        struct tc_plug_qopt *msg;
+
+        if (opt == NULL)
+                return -EINVAL;
+
+        msg = nla_data(opt);
+        if (nla_len(opt) < sizeof(*msg))
+                return -EINVAL;
+
+        switch (msg->action) {
+        case TCQ_PLUG_BUFFER:
+                /* Save size of the current buffer */
+                q->pkts_last_epoch = q->pkts_current_epoch;
+                q->pkts_current_epoch = 0;
+                if (q->unplug_indefinite)
+                        qdisc_throttled(sch);
+                q->unplug_indefinite = false;
+                break;
+        case TCQ_PLUG_RELEASE_ONE:
+                /* Add packets from the last complete buffer to the
+                 * packets to be released set.
+                 */
+                q->pkts_to_release += q->pkts_last_epoch;
+                q->pkts_last_epoch = 0;
+                qdisc_unthrottled(sch);
+                netif_schedule_queue(sch->dev_queue);
+                break;
+        case TCQ_PLUG_RELEASE_INDEFINITE:
+                q->unplug_indefinite = true;
+                q->pkts_to_release = 0;
+                q->pkts_last_epoch = 0;
+                q->pkts_current_epoch = 0;
+                qdisc_unthrottled(sch);
+                netif_schedule_queue(sch->dev_queue);
+                break;
+        case TCQ_PLUG_LIMIT:
+                /* Limit is supplied in bytes */
+                q->limit = msg->limit;
+                break;
+        default:
+                return -EINVAL;
+        }
+
+        return 0;
+}
+
+struct Qdisc_ops plug_qdisc_ops = {
+        .id          =       "plug",
+        .priv_size   =       sizeof(struct plug_sched_data),
+        .enqueue     =       plug_enqueue,
+        .dequeue     =       plug_dequeue,
+        .peek        =       qdisc_peek_head,
+        .init        =       plug_init,
+        .change      =       plug_change,
+        .owner       =       THIS_MODULE,
+};
+
+static int __init plug_module_init(void)
+{
+        return register_qdisc(&plug_qdisc_ops);
+}
+
+static void __exit plug_module_exit(void)
+{
+        unregister_qdisc(&plug_qdisc_ops);
+}
+module_init(plug_module_init)
+module_exit(plug_module_exit)
+MODULE_LICENSE("GPL");
diff --git a/net/tipc/bcast.c b/net/tipc/bcast.c
index 8eb87b11d100..41ecf313073c 100644
--- a/net/tipc/bcast.c
+++ b/net/tipc/bcast.c
@@ -157,39 +157,14 @@ u32 tipc_bclink_get_last_sent(void)
         return bcl->fsm_msg_cnt;
 }
 
-/**
- * bclink_set_gap - set gap according to contents of current deferred pkt queue
- *
- * Called with 'node' locked, bc_lock unlocked
- */
-
-static void bclink_set_gap(struct tipc_node *n_ptr)
-{
-        struct sk_buff *buf = n_ptr->bclink.deferred_head;
-
-        n_ptr->bclink.gap_after = n_ptr->bclink.gap_to =
-                mod(n_ptr->bclink.last_in);
-        if (unlikely(buf != NULL))
-                n_ptr->bclink.gap_to = mod(buf_seqno(buf) - 1);
-}
-
-/**
- * bclink_ack_allowed - test if ACK or NACK message can be sent at this moment
- *
- * This mechanism endeavours to prevent all nodes in network from trying
- * to ACK or NACK at the same time.
- *
- * Note: TIPC uses a different trigger to distribute ACKs than it does to
- *       distribute NACKs, but tries to use the same spacing (divide by 16).
- */
-
-static int bclink_ack_allowed(u32 n)
+static void bclink_update_last_sent(struct tipc_node *node, u32 seqno)
 {
-        return (n % TIPC_MIN_LINK_WIN) == tipc_own_tag;
+        node->bclink.last_sent = less_eq(node->bclink.last_sent, seqno) ?
+                                                seqno : node->bclink.last_sent;
 }
 
 
-/**
+/*
  * tipc_bclink_retransmit_to - get most recent node to request retransmission
  *
  * Called with bc_lock locked
@@ -300,140 +275,94 @@ exit:
         spin_unlock_bh(&bc_lock);
 }
 
-/**
- * bclink_send_ack - unicast an ACK msg
+/*
+ * tipc_bclink_update_link_state - update broadcast link state
  *
  * tipc_net_lock and node lock set
  */
 
-static void bclink_send_ack(struct tipc_node *n_ptr)
+void tipc_bclink_update_link_state(struct tipc_node *n_ptr, u32 last_sent)
 {
-        struct tipc_link *l_ptr = n_ptr->active_links[n_ptr->addr & 1];
+        struct sk_buff *buf;
 
-        if (l_ptr != NULL)
-                tipc_link_send_proto_msg(l_ptr, STATE_MSG, 0, 0, 0, 0, 0);
-}
+        /* Ignore "stale" link state info */
 
-/**
- * bclink_send_nack- broadcast a NACK msg
- *
- * tipc_net_lock and node lock set
- */
+        if (less_eq(last_sent, n_ptr->bclink.last_in))
+                return;
 
-static void bclink_send_nack(struct tipc_node *n_ptr)
-{
-        struct sk_buff *buf;
-        struct tipc_msg *msg;
+        /* Update link synchronization state; quit if in sync */
+
+        bclink_update_last_sent(n_ptr, last_sent);
+
+        if (n_ptr->bclink.last_sent == n_ptr->bclink.last_in)
+                return;
+
+        /* Update out-of-sync state; quit if loss is still unconfirmed */
+
+        if ((++n_ptr->bclink.oos_state) == 1) {
+                if (n_ptr->bclink.deferred_size < (TIPC_MIN_LINK_WIN / 2))
+                        return;
+                n_ptr->bclink.oos_state++;
+        }
 
-        if (!less(n_ptr->bclink.gap_after, n_ptr->bclink.gap_to))
+        /* Don't NACK if one has been recently sent (or seen) */
+
+        if (n_ptr->bclink.oos_state & 0x1)
                 return;
 
+        /* Send NACK */
+
         buf = tipc_buf_acquire(INT_H_SIZE);
         if (buf) {
-                msg = buf_msg(buf);
+                struct tipc_msg *msg = buf_msg(buf);
+
                 tipc_msg_init(msg, BCAST_PROTOCOL, STATE_MSG,
-                         INT_H_SIZE, n_ptr->addr);
+                              INT_H_SIZE, n_ptr->addr);
                 msg_set_non_seq(msg, 1);
                 msg_set_mc_netid(msg, tipc_net_id);
-                msg_set_bcast_ack(msg, mod(n_ptr->bclink.last_in));
-                msg_set_bcgap_after(msg, n_ptr->bclink.gap_after);
-                msg_set_bcgap_to(msg, n_ptr->bclink.gap_to);
-                msg_set_bcast_tag(msg, tipc_own_tag);
+                msg_set_bcast_ack(msg, n_ptr->bclink.last_in);
+                msg_set_bcgap_after(msg, n_ptr->bclink.last_in);
+                msg_set_bcgap_to(msg, n_ptr->bclink.deferred_head
+                                 ? buf_seqno(n_ptr->bclink.deferred_head) - 1
+                                 : n_ptr->bclink.last_sent);
 
+                spin_lock_bh(&bc_lock);
                 tipc_bearer_send(&bcbearer->bearer, buf, NULL);
                 bcl->stats.sent_nacks++;
+                spin_unlock_bh(&bc_lock);
                 buf_discard(buf);
 
-                /*
-                 * Ensure we doesn't send another NACK msg to the node
-                 * until 16 more deferred messages arrive from it
-                 * (i.e. helps prevent all nodes from NACK'ing at same time)
-                 */
-
-                n_ptr->bclink.nack_sync = tipc_own_tag;
+                n_ptr->bclink.oos_state++;
         }
 }
 
-/**
- * tipc_bclink_check_gap - send a NACK if a sequence gap exists
+/*
+ * bclink_peek_nack - monitor retransmission requests sent by other nodes
  *
- * tipc_net_lock and node lock set
- */
-
-void tipc_bclink_check_gap(struct tipc_node *n_ptr, u32 last_sent)
-{
-        if (!n_ptr->bclink.supported ||
-            less_eq(last_sent, mod(n_ptr->bclink.last_in)))
-                return;
-
-        bclink_set_gap(n_ptr);
-        if (n_ptr->bclink.gap_after == n_ptr->bclink.gap_to)
-                n_ptr->bclink.gap_to = last_sent;
-        bclink_send_nack(n_ptr);
-}
-
-/**
- * tipc_bclink_peek_nack - process a NACK msg meant for another node
+ * Delay any upcoming NACK by this node if another node has already
+ * requested the first message this node is going to ask for.
  *
  * Only tipc_net_lock set.
  */
 
-static void tipc_bclink_peek_nack(u32 dest, u32 sender_tag, u32 gap_after, u32 gap_to)
+static void bclink_peek_nack(struct tipc_msg *msg)
 {
-        struct tipc_node *n_ptr = tipc_node_find(dest);
-        u32 my_after, my_to;
+        struct tipc_node *n_ptr = tipc_node_find(msg_destnode(msg));
 
-        if (unlikely(!n_ptr || !tipc_node_is_up(n_ptr)))
+        if (unlikely(!n_ptr))
                 return;
+
         tipc_node_lock(n_ptr);
-        /*
-         * Modify gap to suppress unnecessary NACKs from this node
-         */
-        my_after = n_ptr->bclink.gap_after;
-        my_to = n_ptr->bclink.gap_to;
-
-        if (less_eq(gap_after, my_after)) {
-                if (less(my_after, gap_to) && less(gap_to, my_to))
-                        n_ptr->bclink.gap_after = gap_to;
-                else if (less_eq(my_to, gap_to))
-                        n_ptr->bclink.gap_to = n_ptr->bclink.gap_after;
-        } else if (less_eq(gap_after, my_to)) {
-                if (less_eq(my_to, gap_to))
-                        n_ptr->bclink.gap_to = gap_after;
-        } else {
-                /*
-                 * Expand gap if missing bufs not in deferred queue:
-                 */
-                struct sk_buff *buf = n_ptr->bclink.deferred_head;
-                u32 prev = n_ptr->bclink.gap_to;
 
-                for (; buf; buf = buf->next) {
-                        u32 seqno = buf_seqno(buf);
+        if (n_ptr->bclink.supported &&
+            (n_ptr->bclink.last_in != n_ptr->bclink.last_sent) &&
+            (n_ptr->bclink.last_in == msg_bcgap_after(msg)))
+                n_ptr->bclink.oos_state = 2;
 
-                        if (mod(seqno - prev) != 1) {
-                                buf = NULL;
-                                break;
-                        }
-                        if (seqno == gap_after)
-                                break;
-                        prev = seqno;
-                }
-                if (buf == NULL)
-                        n_ptr->bclink.gap_to = gap_after;
-        }
-        /*
-         * Some nodes may send a complementary NACK now:
-         */
-        if (bclink_ack_allowed(sender_tag + 1)) {
-                if (n_ptr->bclink.gap_to != n_ptr->bclink.gap_after) {
-                        bclink_send_nack(n_ptr);
-                        bclink_set_gap(n_ptr);
-                }
-        }
         tipc_node_unlock(n_ptr);
 }
 
-/**
+/*
  * tipc_bclink_send_msg - broadcast a packet to all nodes in cluster
  */
 
@@ -460,7 +389,33 @@ exit:
         return res;
 }
 
-/**
+/*
+ * bclink_accept_pkt - accept an incoming, in-sequence broadcast packet
+ *
+ * Called with both sending node's lock and bc_lock taken.
+ */
+
+static void bclink_accept_pkt(struct tipc_node *node, u32 seqno)
+{
+        bclink_update_last_sent(node, seqno);
+        node->bclink.last_in = seqno;
+        node->bclink.oos_state = 0;
+        bcl->stats.recv_info++;
+
+        /*
+         * Unicast an ACK periodically, ensuring that
+         * all nodes in the cluster don't ACK at the same time
+         */
+
+        if (((seqno - tipc_own_addr) % TIPC_MIN_LINK_WIN) == 0) {
+                tipc_link_send_proto_msg(
+                        node->active_links[node->addr & 1],
+                        STATE_MSG, 0, 0, 0, 0, 0);
+                bcl->stats.sent_acks++;
+        }
+}
+
+/*
  * tipc_bclink_recv_pkt - receive a broadcast packet, and deliver upwards
  *
  * tipc_net_lock is read_locked, no other locks set
@@ -472,7 +427,7 @@ void tipc_bclink_recv_pkt(struct sk_buff *buf)
         struct tipc_node *node;
         u32 next_in;
         u32 seqno;
-        struct sk_buff *deferred;
+        int deferred;
 
         /* Screen out unwanted broadcast messages */
 
@@ -487,6 +442,8 @@ void tipc_bclink_recv_pkt(struct sk_buff *buf)
         if (unlikely(!node->bclink.supported))
                 goto unlock;
 
+        /* Handle broadcast protocol message */
+
         if (unlikely(msg_user(msg) == BCAST_PROTOCOL)) {
                 if (msg_type(msg) != STATE_MSG)
                         goto unlock;
@@ -501,85 +458,114 @@ void tipc_bclink_recv_pkt(struct sk_buff *buf)
                         spin_unlock_bh(&bc_lock);
                 } else {
                         tipc_node_unlock(node);
-                        tipc_bclink_peek_nack(msg_destnode(msg),
-                                              msg_bcast_tag(msg),
-                                              msg_bcgap_after(msg),
-                                              msg_bcgap_to(msg));
+                        bclink_peek_nack(msg);
                 }
                 goto exit;
         }
 
         /* Handle in-sequence broadcast message */
 
-receive:
-        next_in = mod(node->bclink.last_in + 1);
         seqno = msg_seqno(msg);
+        next_in = mod(node->bclink.last_in + 1);
 
         if (likely(seqno == next_in)) {
-                bcl->stats.recv_info++;
-                node->bclink.last_in++;
-                bclink_set_gap(node);
-                if (unlikely(bclink_ack_allowed(seqno))) {
-                        bclink_send_ack(node);
-                        bcl->stats.sent_acks++;
-                }
+receive:
+                /* Deliver message to destination */
+
                 if (likely(msg_isdata(msg))) {
+                        spin_lock_bh(&bc_lock);
+                        bclink_accept_pkt(node, seqno);
+                        spin_unlock_bh(&bc_lock);
                         tipc_node_unlock(node);
                         if (likely(msg_mcast(msg)))
                                 tipc_port_recv_mcast(buf, NULL);
                         else
                                 buf_discard(buf);
                 } else if (msg_user(msg) == MSG_BUNDLER) {
+                        spin_lock_bh(&bc_lock);
+                        bclink_accept_pkt(node, seqno);
                         bcl->stats.recv_bundles++;
                         bcl->stats.recv_bundled += msg_msgcnt(msg);
+                        spin_unlock_bh(&bc_lock);
                         tipc_node_unlock(node);
                         tipc_link_recv_bundle(buf);
                 } else if (msg_user(msg) == MSG_FRAGMENTER) {
+                        int ret = tipc_link_recv_fragment(&node->bclink.defragm,
+                                                      &buf, &msg);
+                        if (ret < 0)
+                                goto unlock;
+                        spin_lock_bh(&bc_lock);
+                        bclink_accept_pkt(node, seqno);
                         bcl->stats.recv_fragments++;
-                        if (tipc_link_recv_fragment(&node->bclink.defragm,
-                                                    &buf, &msg))
+                        if (ret > 0)
                                 bcl->stats.recv_fragmented++;
+                        spin_unlock_bh(&bc_lock);
                         tipc_node_unlock(node);
                         tipc_net_route_msg(buf);
                 } else if (msg_user(msg) == NAME_DISTRIBUTOR) {
+                        spin_lock_bh(&bc_lock);
+                        bclink_accept_pkt(node, seqno);
+                        spin_unlock_bh(&bc_lock);
                         tipc_node_unlock(node);
                         tipc_named_recv(buf);
                 } else {
+                        spin_lock_bh(&bc_lock);
+                        bclink_accept_pkt(node, seqno);
+                        spin_unlock_bh(&bc_lock);
                         tipc_node_unlock(node);
                         buf_discard(buf);
                 }
                 buf = NULL;
+
+                /* Determine new synchronization state */
+
                 tipc_node_lock(node);
-                deferred = node->bclink.deferred_head;
-                if (deferred && (buf_seqno(deferred) == mod(next_in + 1))) {
-                        buf = deferred;
-                        msg = buf_msg(buf);
-                        node->bclink.deferred_head = deferred->next;
-                        goto receive;
-                }
-        } else if (less(next_in, seqno)) {
-                u32 gap_after = node->bclink.gap_after;
-                u32 gap_to = node->bclink.gap_to;
-
-                if (tipc_link_defer_pkt(&node->bclink.deferred_head,
-                                        &node->bclink.deferred_tail,
-                                        buf)) {
-                        node->bclink.nack_sync++;
-                        bcl->stats.deferred_recv++;
-                        if (seqno == mod(gap_after + 1))
-                                node->bclink.gap_after = seqno;
-                        else if (less(gap_after, seqno) && less(seqno, gap_to))
-                                node->bclink.gap_to = seqno;
+                if (unlikely(!tipc_node_is_up(node)))
+                        goto unlock;
+
+                if (node->bclink.last_in == node->bclink.last_sent)
+                        goto unlock;
+
+                if (!node->bclink.deferred_head) {
+                        node->bclink.oos_state = 1;
+                        goto unlock;
                 }
+
+                msg = buf_msg(node->bclink.deferred_head);
+                seqno = msg_seqno(msg);
+                next_in = mod(next_in + 1);
+                if (seqno != next_in)
+                        goto unlock;
+
+                /* Take in-sequence message from deferred queue & deliver it */
+
+                buf = node->bclink.deferred_head;
+                node->bclink.deferred_head = buf->next;
+                node->bclink.deferred_size--;
+                goto receive;
+        }
+
+        /* Handle out-of-sequence broadcast message */
+
+        if (less(next_in, seqno)) {
+                deferred = tipc_link_defer_pkt(&node->bclink.deferred_head,
+                                               &node->bclink.deferred_tail,
+                                               buf);
+                node->bclink.deferred_size += deferred;
+                bclink_update_last_sent(node, seqno);
                 buf = NULL;
-                if (bclink_ack_allowed(node->bclink.nack_sync)) {
-                        if (gap_to != gap_after)
-                                bclink_send_nack(node);
-                        bclink_set_gap(node);
-                }
-        } else {
+        } else
+                deferred = 0;
+
+        spin_lock_bh(&bc_lock);
+
+        if (deferred)
+                bcl->stats.deferred_recv++;
+        else
                 bcl->stats.duplicates++;
-        }
+
+        spin_unlock_bh(&bc_lock);
+
 unlock:
         tipc_node_unlock(node);
 exit:
diff --git a/net/tipc/bcast.h b/net/tipc/bcast.h
index b009666c60b0..5571394098f9 100644
--- a/net/tipc/bcast.h
+++ b/net/tipc/bcast.h
@@ -96,7 +96,7 @@ int  tipc_bclink_send_msg(struct sk_buff *buf);
 void tipc_bclink_recv_pkt(struct sk_buff *buf);
 u32  tipc_bclink_get_last_sent(void);
 u32  tipc_bclink_acks_missing(struct tipc_node *n_ptr);
-void tipc_bclink_check_gap(struct tipc_node *n_ptr, u32 seqno);
+void tipc_bclink_update_link_state(struct tipc_node *n_ptr, u32 last_sent);
 int  tipc_bclink_stats(char *stats_buf, const u32 buf_size);
 int  tipc_bclink_reset_stats(void);
 int  tipc_bclink_set_queue_limits(u32 limit);
diff --git a/net/tipc/link.c b/net/tipc/link.c
index ac1832a66f8a..d8b0a22367b6 100644
--- a/net/tipc/link.c
+++ b/net/tipc/link.c
@@ -1501,13 +1501,13 @@ static void link_retransmit_failure(struct tipc_link *l_ptr,
                 tipc_node_lock(n_ptr);
 
                 tipc_addr_string_fill(addr_string, n_ptr->addr);
-                info("Multicast link info for %s\n", addr_string);
+                info("Broadcast link info for %s\n", addr_string);
+                info("Supportable: %d,  ", n_ptr->bclink.supportable);
                 info("Supported: %d,  ", n_ptr->bclink.supported);
                 info("Acked: %u\n", n_ptr->bclink.acked);
                 info("Last in: %u,  ", n_ptr->bclink.last_in);
-                info("Gap after: %u,  ", n_ptr->bclink.gap_after);
-                info("Gap to: %u\n", n_ptr->bclink.gap_to);
-                info("Nack sync: %u\n\n", n_ptr->bclink.nack_sync);
+                info("Oos state: %u,  ", n_ptr->bclink.oos_state);
+                info("Last sent: %u\n", n_ptr->bclink.last_sent);
 
                 tipc_k_signal((Handler)link_reset_all, (unsigned long)n_ptr->addr);
 
@@ -1736,7 +1736,7 @@ void tipc_recv_msg(struct sk_buff *head, struct tipc_bearer *b_ptr)
 
                 /* Release acked messages */
 
-                if (tipc_node_is_up(n_ptr) && n_ptr->bclink.supported)
+                if (n_ptr->bclink.supported)
                         tipc_bclink_acknowledge(n_ptr, msg_bcast_ack(msg));
 
                 crs = l_ptr->first_out;
@@ -1774,6 +1774,7 @@ protocol_check:
                                         head = link_insert_deferred_queue(l_ptr,
                                                                           head);
                                 if (likely(msg_is_dest(msg, tipc_own_addr))) {
+                                        int ret;
 deliver:
                                         if (likely(msg_isdata(msg))) {
                                                 tipc_node_unlock(n_ptr);
@@ -1798,11 +1799,15 @@ deliver:
                                                 continue;
                                         case MSG_FRAGMENTER:
                                                 l_ptr->stats.recv_fragments++;
-                                                if (tipc_link_recv_fragment(&l_ptr->defragm_buf,
-                                                                            &buf, &msg)) {
+                                                ret = tipc_link_recv_fragment(
+                                                        &l_ptr->defragm_buf,
+                                                        &buf, &msg);
+                                                if (ret == 1) {
                                                         l_ptr->stats.recv_fragmented++;
                                                         goto deliver;
                                                 }
+                                                if (ret == -1)
+                                                        l_ptr->next_in_no--;
                                                 break;
                                         case CHANGEOVER_PROTOCOL:
                                                 type = msg_type(msg);
@@ -1853,17 +1858,16 @@ cont:
 }
 
 /*
- * link_defer_buf(): Sort a received out-of-sequence packet
- *                   into the deferred reception queue.
- * Returns the increase of the queue length,i.e. 0 or 1
+ * tipc_link_defer_pkt - Add out-of-sequence message to deferred reception queue
+ *
+ * Returns increase in queue length (i.e. 0 or 1)
  */
 
-u32 tipc_link_defer_pkt(struct sk_buff **head,
-                        struct sk_buff **tail,
+u32 tipc_link_defer_pkt(struct sk_buff **head, struct sk_buff **tail,
                         struct sk_buff *buf)
 {
-        struct sk_buff *prev = NULL;
-        struct sk_buff *crs = *head;
+        struct sk_buff *queue_buf;
+        struct sk_buff **prev;
         u32 seq_no = buf_seqno(buf);
 
         buf->next = NULL;
@@ -1881,31 +1885,30 @@ u32 tipc_link_defer_pkt(struct sk_buff **head,
                 return 1;
         }
 
-        /* Scan through queue and sort it in */
-        do {
-                struct tipc_msg *msg = buf_msg(crs);
+        /* Locate insertion point in queue, then insert; discard if duplicate */
+        prev = head;
+        queue_buf = *head;
+        for (;;) {
+                u32 curr_seqno = buf_seqno(queue_buf);
 
-                if (less(seq_no, msg_seqno(msg))) {
-                        buf->next = crs;
-                        if (prev)
-                                prev->next = buf;
-                        else
-                                *head = buf;
-                        return 1;
+                if (seq_no == curr_seqno) {
+                        buf_discard(buf);
+                        return 0;
                 }
-                if (seq_no == msg_seqno(msg))
+
+                if (less(seq_no, curr_seqno))
                         break;
-                prev = crs;
-                crs = crs->next;
-        } while (crs);
 
-        /* Message is a duplicate of an existing message */
+                prev = &queue_buf->next;
+                queue_buf = queue_buf->next;
+        }
 
-        buf_discard(buf);
-        return 0;
+        buf->next = queue_buf;
+        *prev = buf;
+        return 1;
 }
 
-/**
+/*
  * link_handle_out_of_seq_msg - handle arrival of out-of-sequence packet
  */
 
@@ -1956,6 +1959,13 @@ void tipc_link_send_proto_msg(struct tipc_link *l_ptr, u32 msg_typ,
         u32 msg_size = sizeof(l_ptr->proto_msg);
         int r_flag;
 
+        /* Discard any previous message that was deferred due to congestion */
+
+        if (l_ptr->proto_msg_queue) {
+                buf_discard(l_ptr->proto_msg_queue);
+                l_ptr->proto_msg_queue = NULL;
+        }
+
         if (link_blocked(l_ptr))
                 return;
 
@@ -1964,9 +1974,11 @@ void tipc_link_send_proto_msg(struct tipc_link *l_ptr, u32 msg_typ,
         if ((l_ptr->owner->block_setup) && (msg_typ != RESET_MSG))
                 return;
 
+        /* Create protocol message with "out-of-sequence" sequence number */
+
         msg_set_type(msg, msg_typ);
         msg_set_net_plane(msg, l_ptr->b_ptr->net_plane);
-        msg_set_bcast_ack(msg, mod(l_ptr->owner->bclink.last_in));
+        msg_set_bcast_ack(msg, l_ptr->owner->bclink.last_in);
         msg_set_last_bcast(msg, tipc_bclink_get_last_sent());
 
         if (msg_typ == STATE_MSG) {
@@ -2020,44 +2032,36 @@ void tipc_link_send_proto_msg(struct tipc_link *l_ptr, u32 msg_typ,
         r_flag = (l_ptr->owner->working_links > tipc_link_is_up(l_ptr));
         msg_set_redundant_link(msg, r_flag);
         msg_set_linkprio(msg, l_ptr->priority);
-
-        /* Ensure sequence number will not fit : */
+        msg_set_size(msg, msg_size);
 
         msg_set_seqno(msg, mod(l_ptr->next_out_no + (0xffff/2)));
 
-        /* Congestion? */
-
-        if (tipc_bearer_congested(l_ptr->b_ptr, l_ptr)) {
-                if (!l_ptr->proto_msg_queue) {
-                        l_ptr->proto_msg_queue =
-                                tipc_buf_acquire(sizeof(l_ptr->proto_msg));
-                }
-                buf = l_ptr->proto_msg_queue;
-                if (!buf)
-                        return;
-                skb_copy_to_linear_data(buf, msg, sizeof(l_ptr->proto_msg));
-                return;
-        }
-
-        /* Message can be sent */
-
         buf = tipc_buf_acquire(msg_size);
         if (!buf)
                 return;
 
         skb_copy_to_linear_data(buf, msg, sizeof(l_ptr->proto_msg));
-        msg_set_size(buf_msg(buf), msg_size);
 
-        if (tipc_bearer_send(l_ptr->b_ptr, buf, &l_ptr->media_addr)) {
-                l_ptr->unacked_window = 0;
-                buf_discard(buf);
+        /* Defer message if bearer is already congested */
+
+        if (tipc_bearer_congested(l_ptr->b_ptr, l_ptr)) {
+                l_ptr->proto_msg_queue = buf;
                 return;
         }
 
-        /* New congestion */
-        tipc_bearer_schedule(l_ptr->b_ptr, l_ptr);
-        l_ptr->proto_msg_queue = buf;
-        l_ptr->stats.bearer_congs++;
+        /* Defer message if attempting to send results in bearer congestion */
+
+        if (!tipc_bearer_send(l_ptr->b_ptr, buf, &l_ptr->media_addr)) {
+                tipc_bearer_schedule(l_ptr->b_ptr, l_ptr);
+                l_ptr->proto_msg_queue = buf;
+                l_ptr->stats.bearer_congs++;
+                return;
+        }
+
+        /* Discard message if it was sent successfully */
+
+        l_ptr->unacked_window = 0;
+        buf_discard(buf);
 }
 
 /*
@@ -2105,6 +2109,8 @@ static void link_recv_proto_msg(struct tipc_link *l_ptr, struct sk_buff *buf)
                         l_ptr->owner->block_setup = WAIT_NODE_DOWN;
                 }
 
+                link_state_event(l_ptr, RESET_MSG);
+
                 /* fall thru' */
         case ACTIVATE_MSG:
                 /* Update link settings according other endpoint's values */
@@ -2127,16 +2133,22 @@ static void link_recv_proto_msg(struct tipc_link *l_ptr, struct sk_buff *buf)
                 } else {
                         l_ptr->max_pkt = l_ptr->max_pkt_target;
                 }
-                l_ptr->owner->bclink.supported = (max_pkt_info != 0);
+                l_ptr->owner->bclink.supportable = (max_pkt_info != 0);
 
-                link_state_event(l_ptr, msg_type(msg));
+                /* Synchronize broadcast link info, if not done previously */
+
+                if (!tipc_node_is_up(l_ptr->owner)) {
+                        l_ptr->owner->bclink.last_sent =
+                                l_ptr->owner->bclink.last_in =
+                                msg_last_bcast(msg);
+                        l_ptr->owner->bclink.oos_state = 0;
+                }
 
                 l_ptr->peer_session = msg_session(msg);
                 l_ptr->peer_bearer_id = msg_bearer_id(msg);
 
-                /* Synchronize broadcast sequence numbers */
-                if (!tipc_node_redundant_links(l_ptr->owner))
-                        l_ptr->owner->bclink.last_in = mod(msg_last_bcast(msg));
+                if (msg_type(msg) == ACTIVATE_MSG)
+                        link_state_event(l_ptr, ACTIVATE_MSG);
                 break;
         case STATE_MSG:
 
@@ -2177,7 +2189,9 @@ static void link_recv_proto_msg(struct tipc_link *l_ptr, struct sk_buff *buf)
 
                 /* Protocol message before retransmits, reduce loss risk */
 
-                tipc_bclink_check_gap(l_ptr->owner, msg_last_bcast(msg));
+                if (l_ptr->owner->bclink.supported)
+                        tipc_bclink_update_link_state(l_ptr->owner,
+                                                      msg_last_bcast(msg));
 
                 if (rec_gap || (msg_probe(msg))) {
                         tipc_link_send_proto_msg(l_ptr, STATE_MSG,
@@ -2623,7 +2637,9 @@ int tipc_link_recv_fragment(struct sk_buff **pending, struct sk_buff **fb,
                         set_fragm_size(pbuf, fragm_sz);
                         set_expected_frags(pbuf, exp_fragm_cnt - 1);
                 } else {
-                        warn("Link unable to reassemble fragmented message\n");
+                        dbg("Link unable to reassemble fragmented message\n");
+                        buf_discard(fbuf);
+                        return -1;
                 }
                 buf_discard(fbuf);
                 return 0;
diff --git a/net/tipc/name_distr.c b/net/tipc/name_distr.c
index 98ebb37f1808..acecfda82f37 100644
--- a/net/tipc/name_distr.c
+++ b/net/tipc/name_distr.c
@@ -239,9 +239,6 @@ exit:
  *
  * Invoked for each publication issued by a newly failed node.
  * Removes publication structure from name table & deletes it.
- * In rare cases the link may have come back up again when this
- * function is called, and we have two items representing the same
- * publication. Nudge this item's key to distinguish it from the other.
  */
 
 static void named_purge_publ(struct publication *publ)
@@ -249,7 +246,6 @@ static void named_purge_publ(struct publication *publ)
         struct publication *p;
 
         write_lock_bh(&tipc_nametbl_lock);
-        publ->key += 1222345;
         p = tipc_nametbl_remove_publ(publ->type, publ->lower,
                                      publ->node, publ->ref, publ->key);
         if (p)
diff --git a/net/tipc/node.c b/net/tipc/node.c
index 6b226faad89f..7bc45e135fb4 100644
--- a/net/tipc/node.c
+++ b/net/tipc/node.c
@@ -49,9 +49,8 @@ LIST_HEAD(tipc_node_list);
 static u32 tipc_num_nodes;
 
 static atomic_t tipc_num_links = ATOMIC_INIT(0);
-u32 tipc_own_tag;
 
-/**
+/*
  * tipc_node_find - locate specified node object, if it exists
  */
 
@@ -306,10 +305,9 @@ static void node_established_contact(struct tipc_node *n_ptr)
         /* Syncronize broadcast acks */
         n_ptr->bclink.acked = tipc_bclink_get_last_sent();
 
-        if (n_ptr->bclink.supported) {
+        if (n_ptr->bclink.supportable) {
                 tipc_bclink_add_node(n_ptr->addr);
-                if (n_ptr->addr < tipc_own_addr)
-                        tipc_own_tag++;
+                n_ptr->bclink.supported = 1;
         }
 }
 
@@ -338,12 +336,12 @@ static void node_lost_contact(struct tipc_node *n_ptr)
         /* Flush broadcast link info associated with lost node */
 
         if (n_ptr->bclink.supported) {
-                n_ptr->bclink.gap_after = n_ptr->bclink.gap_to = 0;
                 while (n_ptr->bclink.deferred_head) {
                         struct sk_buff *buf = n_ptr->bclink.deferred_head;
                         n_ptr->bclink.deferred_head = buf->next;
                         buf_discard(buf);
                 }
+                n_ptr->bclink.deferred_size = 0;
 
                 if (n_ptr->bclink.defragm) {
                         buf_discard(n_ptr->bclink.defragm);
@@ -352,8 +350,6 @@ static void node_lost_contact(struct tipc_node *n_ptr)
 
                 tipc_bclink_remove_node(n_ptr->addr);
                 tipc_bclink_acknowledge(n_ptr, INVALID_LINK_SEQ);
-                if (n_ptr->addr < tipc_own_addr)
-                        tipc_own_tag--;
 
                 n_ptr->bclink.supported = 0;
         }
@@ -449,7 +445,7 @@ struct sk_buff *tipc_node_get_links(const void *req_tlv_area, int req_tlv_space)
 
         read_lock_bh(&tipc_net_lock);
 
-        /* Get space for all unicast links + multicast link */
+        /* Get space for all unicast links + broadcast link */
 
         payload_size = TLV_SPACE(sizeof(link_info)) *
                 (atomic_read(&tipc_num_links) + 1);
diff --git a/net/tipc/node.h b/net/tipc/node.h
index 0b1c5f8b6996..e1b78a2199c2 100644
--- a/net/tipc/node.h
+++ b/net/tipc/node.h
@@ -62,12 +62,13 @@
  * @link_cnt: number of links to node
  * @permit_changeover: non-zero if node has redundant links to this system
  * @bclink: broadcast-related info
+ *    @supportable: non-zero if node supports TIPC b'cast link capability
  *    @supported: non-zero if node supports TIPC b'cast capability
  *    @acked: sequence # of last outbound b'cast message acknowledged by node
  *    @last_in: sequence # of last in-sequence b'cast message received from node
- *    @gap_after: sequence # of last message not requiring a NAK request
- *    @gap_to: sequence # of last message requiring a NAK request
- *    @nack_sync: counter that determines when NAK requests should be sent
+ *    @last_sent: sequence # of last b'cast message sent by node
+ *    @oos_state: state tracker for handling OOS b'cast messages
+ *    @deferred_size: number of OOS b'cast messages in deferred queue
  *    @deferred_head: oldest OOS b'cast message received from node
  *    @deferred_tail: newest OOS b'cast message received from node
  *    @defragm: list of partially reassembled b'cast message fragments from node
@@ -86,12 +87,13 @@ struct tipc_node {
         int block_setup;
         int permit_changeover;
         struct {
-                int supported;
+                u8 supportable;
+                u8 supported;
                 u32 acked;
                 u32 last_in;
-                u32 gap_after;
-                u32 gap_to;
-                u32 nack_sync;
+                u32 last_sent;
+                u32 oos_state;
+                u32 deferred_size;
                 struct sk_buff *deferred_head;
                 struct sk_buff *deferred_tail;
                 struct sk_buff *defragm;
@@ -112,8 +114,6 @@ static inline unsigned int tipc_hashfn(u32 addr)
         return addr & (NODE_HTABLE_SIZE - 1);
 }
 
-extern u32 tipc_own_tag;
-
 struct tipc_node *tipc_node_find(u32 addr);
 struct tipc_node *tipc_node_create(u32 addr);
 void tipc_node_delete(struct tipc_node *n_ptr);
diff --git a/net/tipc/port.c b/net/tipc/port.c
index d91efc69e6f9..ba3268b8da42 100644
--- a/net/tipc/port.c
+++ b/net/tipc/port.c
@@ -400,15 +400,16 @@ int tipc_reject_msg(struct sk_buff *buf, u32 err)
 
         /* send self-abort message when rejecting on a connected port */
         if (msg_connected(msg)) {
-                struct sk_buff *abuf = NULL;
                 struct tipc_port *p_ptr = tipc_port_lock(msg_destport(msg));
 
                 if (p_ptr) {
+                        struct sk_buff *abuf = NULL;
+
                         if (p_ptr->connected)
                                 abuf = port_build_self_abort_msg(p_ptr, err);
                         tipc_port_unlock(p_ptr);
+                        tipc_net_route_msg(abuf);
                 }
-                tipc_net_route_msg(abuf);
         }
 
         /* send returned message & dispose of rejected message */
diff --git a/net/wireless/mesh.c b/net/wireless/mesh.c
index 8c550df13037..9d3e3b6bfcf4 100644
--- a/net/wireless/mesh.c
+++ b/net/wireless/mesh.c
@@ -55,6 +55,7 @@ const struct mesh_config default_mesh_config = {
         .min_discovery_timeout = MESH_MIN_DISCOVERY_TIMEOUT,
         .dot11MeshHWMPRannInterval = MESH_RANN_INTERVAL,
         .dot11MeshGateAnnouncementProtocol = false,
+        .dot11MeshForwarding = true,
 };
 
 const struct mesh_setup default_mesh_setup = {
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index afeea32e04ad..c910b0750dc2 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -427,10 +427,9 @@ static int nl80211_parse_key_new(struct nlattr *key, struct key_parse *k)
 
         if (tb[NL80211_KEY_DEFAULT_TYPES]) {
                 struct nlattr *kdt[NUM_NL80211_KEY_DEFAULT_TYPES];
-                int err = nla_parse_nested(kdt,
-                                           NUM_NL80211_KEY_DEFAULT_TYPES - 1,
-                                           tb[NL80211_KEY_DEFAULT_TYPES],
-                                           nl80211_key_default_policy);
+                err = nla_parse_nested(kdt, NUM_NL80211_KEY_DEFAULT_TYPES - 1,
+                                       tb[NL80211_KEY_DEFAULT_TYPES],
+                                       nl80211_key_default_policy);
                 if (err)
                         return err;
 
@@ -3259,6 +3258,8 @@ static int nl80211_get_mesh_config(struct sk_buff *skb,
                         cur_params.dot11MeshHWMPRannInterval);
         NLA_PUT_U8(msg, NL80211_MESHCONF_GATE_ANNOUNCEMENTS,
                         cur_params.dot11MeshGateAnnouncementProtocol);
+        NLA_PUT_U8(msg, NL80211_MESHCONF_FORWARDING,
+                        cur_params.dot11MeshForwarding);
         nla_nest_end(msg, pinfoattr);
         genlmsg_end(msg, hdr);
         return genlmsg_reply(msg, info);
@@ -3290,6 +3291,7 @@ static const struct nla_policy nl80211_meshconf_params_policy[NL80211_MESHCONF_A
         [NL80211_MESHCONF_HWMP_ROOTMODE] = { .type = NLA_U8 },
         [NL80211_MESHCONF_HWMP_RANN_INTERVAL] = { .type = NLA_U16 },
         [NL80211_MESHCONF_GATE_ANNOUNCEMENTS] = { .type = NLA_U8 },
+        [NL80211_MESHCONF_FORWARDING] = { .type = NLA_U8 },
 };
 
 static const struct nla_policy
@@ -3379,6 +3381,8 @@ do {\
                         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);
         if (mask_out)
                 *mask_out = mask;
 
@@ -4781,7 +4785,6 @@ static int nl80211_join_ibss(struct sk_buff *skb, struct genl_info *info)
                         nla_len(info->attrs[NL80211_ATTR_BSS_BASIC_RATES]);
                 struct ieee80211_supported_band *sband =
                         wiphy->bands[ibss.channel->band];
-                int err;
 
                 err = ieee80211_get_ratemask(sband, rates, n_rates,
                                              &ibss.basic_rates);
@@ -5390,9 +5393,39 @@ static u32 rateset_to_mask(struct ieee80211_supported_band *sband,
         return mask;
 }
 
+static bool ht_rateset_to_mask(struct ieee80211_supported_band *sband,
+                               u8 *rates, u8 rates_len,
+                               u8 mcs[IEEE80211_HT_MCS_MASK_LEN])
+{
+        u8 i;
+
+        memset(mcs, 0, IEEE80211_HT_MCS_MASK_LEN);
+
+        for (i = 0; i < rates_len; i++) {
+                int ridx, rbit;
+
+                ridx = rates[i] / 8;
+                rbit = BIT(rates[i] % 8);
+
+                /* check validity */
+                if ((ridx < 0) || (ridx > IEEE80211_HT_MCS_MASK_LEN))
+                        return false;
+
+                /* check availability */
+                if (sband->ht_cap.mcs.rx_mask[ridx] & rbit)
+                        mcs[ridx] |= rbit;
+                else
+                        return false;
+        }
+
+        return true;
+}
+
 static const struct nla_policy nl80211_txattr_policy[NL80211_TXRATE_MAX + 1] = {
         [NL80211_TXRATE_LEGACY] = { .type = NLA_BINARY,
                                     .len = NL80211_MAX_SUPP_RATES },
+        [NL80211_TXRATE_MCS] = { .type = NLA_BINARY,
+                                 .len = NL80211_MAX_SUPP_HT_RATES },
 };
 
 static int nl80211_set_tx_bitrate_mask(struct sk_buff *skb,
@@ -5418,12 +5451,20 @@ static int nl80211_set_tx_bitrate_mask(struct sk_buff *skb,
                 sband = rdev->wiphy.bands[i];
                 mask.control[i].legacy =
                         sband ? (1 << sband->n_bitrates) - 1 : 0;
+                if (sband)
+                        memcpy(mask.control[i].mcs,
+                               sband->ht_cap.mcs.rx_mask,
+                               sizeof(mask.control[i].mcs));
+                else
+                        memset(mask.control[i].mcs, 0,
+                               sizeof(mask.control[i].mcs));
         }
 
         /*
          * The nested attribute uses enum nl80211_band as the index. This maps
          * directly to the enum ieee80211_band values used in cfg80211.
          */
+        BUILD_BUG_ON(NL80211_MAX_SUPP_HT_RATES > IEEE80211_HT_MCS_MASK_LEN * 8);
         nla_for_each_nested(tx_rates, info->attrs[NL80211_ATTR_TX_RATES], rem)
         {
                 enum ieee80211_band band = nla_type(tx_rates);
@@ -5439,7 +5480,28 @@ static int nl80211_set_tx_bitrate_mask(struct sk_buff *skb,
                                 sband,
                                 nla_data(tb[NL80211_TXRATE_LEGACY]),
                                 nla_len(tb[NL80211_TXRATE_LEGACY]));
-                        if (mask.control[band].legacy == 0)
+                }
+                if (tb[NL80211_TXRATE_MCS]) {
+                        if (!ht_rateset_to_mask(
+                                        sband,
+                                        nla_data(tb[NL80211_TXRATE_MCS]),
+                                        nla_len(tb[NL80211_TXRATE_MCS]),
+                                        mask.control[band].mcs))
+                                return -EINVAL;
+                }
+
+                if (mask.control[band].legacy == 0) {
+                        /* don't allow empty legacy rates if HT
+                         * is not even supported. */
+                        if (!rdev->wiphy.bands[band]->ht_cap.ht_supported)
+                                return -EINVAL;
+
+                        for (i = 0; i < IEEE80211_HT_MCS_MASK_LEN; i++)
+                                if (mask.control[band].mcs[i])
+                                        break;
+
+                        /* legacy and mcs rates may not be both empty */
+                        if (i == IEEE80211_HT_MCS_MASK_LEN)
                                 return -EINVAL;
                 }
         }
diff --git a/net/wireless/reg.c b/net/wireless/reg.c
index f65feaad155f..e9a0ac83b84c 100644
--- a/net/wireless/reg.c
+++ b/net/wireless/reg.c
@@ -882,23 +882,8 @@ static void handle_channel(struct wiphy *wiphy,
         chan->flags = flags | bw_flags | map_regdom_flags(reg_rule->flags);
         chan->max_antenna_gain = min(chan->orig_mag,
                 (int) MBI_TO_DBI(power_rule->max_antenna_gain));
-        if (chan->orig_mpwr) {
-                /*
-                 * Devices that have their own custom regulatory domain
-                 * but also use WIPHY_FLAG_STRICT_REGULATORY will follow the
-                 * passed country IE power settings.
-                 */
-                if (initiator == NL80211_REGDOM_SET_BY_COUNTRY_IE &&
-                    wiphy->flags & WIPHY_FLAG_CUSTOM_REGULATORY &&
-                    wiphy->flags & WIPHY_FLAG_STRICT_REGULATORY) {
-                        chan->max_power =
-                                MBM_TO_DBM(power_rule->max_eirp);
-                } else {
-                        chan->max_power = min(chan->orig_mpwr,
-                                (int) MBM_TO_DBM(power_rule->max_eirp));
-                }
-        } else
-                chan->max_power = (int) MBM_TO_DBM(power_rule->max_eirp);
+        chan->max_reg_power = (int) MBM_TO_DBM(power_rule->max_eirp);
+        chan->max_power = min(chan->max_power, chan->max_reg_power);
 }
 
 static void handle_band(struct wiphy *wiphy,