92 files changed, 1333 insertions, 662 deletions
diff --git a/Documentation/DocBook/kernel-hacking.tmpl b/Documentation/DocBook/kernel-hacking.tmpl
index a50d6cd58573..992e67e6be7f 100644
--- a/Documentation/DocBook/kernel-hacking.tmpl
+++ b/Documentation/DocBook/kernel-hacking.tmpl
@@ -449,8 +449,8 @@ printk(KERN_INFO "i = %u\n", i);
   </para>
   <programlisting>
-__u32 ipaddress;
+__be32 ipaddress;
-printk(KERN_INFO "my ip: %d.%d.%d.%d\n", NIPQUAD(ipaddress));
+printk(KERN_INFO "my ip: %pI4\n", &amp;ipaddress);
   </programlisting>
   <para>
diff --git a/Documentation/networking/00-INDEX b/Documentation/networking/00-INDEX
index 1634c6dcecae..50189bf07d53 100644
--- a/Documentation/networking/00-INDEX
+++ b/Documentation/networking/00-INDEX
@@ -60,6 +60,8 @@ framerelay.txt
        - info on using Frame Relay/Data Link Connection Identifier (DLCI).
 generic_netlink.txt
        - info on Generic Netlink
+ieee802154.txt
+        - Linux IEEE 802.15.4 implementation, API and drivers
 ip-sysctl.txt
        - /proc/sys/net/ipv4/* variables
 ip_dynaddr.txt
diff --git a/Documentation/networking/ieee802154.txt b/Documentation/networking/ieee802154.txt
index a0280ad2edc9..1d4ed66b1b1c 100644
--- a/Documentation/networking/ieee802154.txt
+++ b/Documentation/networking/ieee802154.txt
@@ -69,7 +69,7 @@ We provide an example of simple HardMAC driver at drivers/ieee802154/fakehard.c
 SoftMAC
 =======
-We are going to provide intermediate layer impelementing IEEE 802.15.4 MAC
+We are going to provide intermediate layer implementing IEEE 802.15.4 MAC
 in software. This is currently WIP.
 See header include/net/ieee802154/mac802154.h and several drivers in
diff --git a/drivers/atm/solos-pci.c b/drivers/atm/solos-pci.c
index 9359613addc5..307321b32cb3 100644
--- a/drivers/atm/solos-pci.c
+++ b/drivers/atm/solos-pci.c
@@ -372,7 +372,7 @@ static int process_status(struct solos_card *card, int port, struct sk_buff *skb
        }
        snr = next_string(skb);
-        if (!str)
+        if (!snr)
                return -EIO;
        attn = next_string(skb);
        if (!attn)
diff --git a/drivers/ieee802154/fakehard.c b/drivers/ieee802154/fakehard.c
index 14045a7ba388..c94d2c24c352 100644
--- a/drivers/ieee802154/fakehard.c
+++ b/drivers/ieee802154/fakehard.c
@@ -26,11 +26,17 @@
 #include <linux/skbuff.h>
 #include <linux/if_arp.h>
-#include <net/ieee802154/af_ieee802154.h>
+#include <net/af_ieee802154.h>
-#include <net/ieee802154/netdevice.h>
+#include <net/ieee802154_netdev.h>
-#include <net/ieee802154/mac_def.h>
+#include <net/ieee802154.h>
-#include <net/ieee802154/nl802154.h>
+#include <net/nl802154.h>
+/**
+ * fake_get_pan_id - Retrieve the PAN ID of the device.
+ * @dev: The network device to retrieve the PAN of.
+ *
+ * Return the ID of the PAN from the PIB.
+ */
 static u16 fake_get_pan_id(struct net_device *dev)
 {
        BUG_ON(dev->type != ARPHRD_IEEE802154);
@@ -38,6 +44,14 @@ static u16 fake_get_pan_id(struct net_device *dev)
        return 0xeba1;
 }
+/**
+ * fake_get_short_addr - Retrieve the short address of the device.
+ * @dev: The network device to retrieve the short address of.
+ *
+ * Returns the IEEE 802.15.4 short-form address cached for this
+ * device. If the device has not yet had a short address assigned
+ * then this should return 0xFFFF to indicate a lack of association.
+ */
 static u16 fake_get_short_addr(struct net_device *dev)
 {
        BUG_ON(dev->type != ARPHRD_IEEE802154);
@@ -45,6 +59,19 @@ static u16 fake_get_short_addr(struct net_device *dev)
        return 0x1;
 }
+/**
+ * fake_get_dsn - Retrieve the DSN of the device.
+ * @dev: The network device to retrieve the DSN for.
+ *
+ * Returns the IEEE 802.15.4 DSN for the network device.
+ * The DSN is the sequence number which will be added to each
+ * packet or MAC command frame by the MAC during transmission.
+ *
+ * DSN means 'Data Sequence Number'.
+ *
+ * Note: This is in section 7.2.1.2 of the IEEE 802.15.4-2006
+ *       document.
+ */
 static u8 fake_get_dsn(struct net_device *dev)
 {
        BUG_ON(dev->type != ARPHRD_IEEE802154);
@@ -52,6 +79,19 @@ static u8 fake_get_dsn(struct net_device *dev)
        return 0x00; /* DSN are implemented in HW, so return just 0 */
 }
+/**
+ * fake_get_bsn - Retrieve the BSN of the device.
+ * @dev: The network device to retrieve the BSN for.
+ *
+ * Returns the IEEE 802.15.4 BSN for the network device.
+ * The BSN is the sequence number which will be added to each
+ * beacon frame sent by the MAC.
+ *
+ * BSN means 'Beacon Sequence Number'.
+ *
+ * Note: This is in section 7.2.1.2 of the IEEE 802.15.4-2006
+ *       document.
+ */
 static u8 fake_get_bsn(struct net_device *dev)
 {
        BUG_ON(dev->type != ARPHRD_IEEE802154);
@@ -59,6 +99,19 @@ static u8 fake_get_bsn(struct net_device *dev)
        return 0x00; /* BSN are implemented in HW, so return just 0 */
 }
+/**
+ * fake_assoc_req - Make an association request to the HW.
+ * @dev: The network device which we are associating to a network.
+ * @addr: The coordinator with which we wish to associate.
+ * @channel: The channel on which to associate.
+ * @cap: The capability information field to use in the association.
+ *
+ * Start an association with a coordinator. The coordinator's address
+ * and PAN ID can be found in @addr.
+ *
+ * Note: This is in section 7.3.1 and 7.5.3.1 of the IEEE
+ *       802.15.4-2006 document.
+ */
 static int fake_assoc_req(struct net_device *dev,
                struct ieee802154_addr *addr, u8 channel, u8 cap)
 {
@@ -67,18 +120,70 @@ static int fake_assoc_req(struct net_device *dev,
                        IEEE802154_SUCCESS);
 }
+/**
+ * fake_assoc_resp - Send an association response to a device.
+ * @dev: The network device on which to send the response.
+ * @addr: The address of the device to respond to.
+ * @short_addr: The assigned short address for the device (if any).
+ * @status: The result of the association request.
+ *
+ * Queue the association response of the coordinator to another
+ * device's attempt to associate with the network which we
+ * coordinate. This is then added to the indirect-send queue to be
+ * transmitted to the end device when it polls for data.
+ *
+ * Note: This is in section 7.3.2 and 7.5.3.1 of the IEEE
+ *       802.15.4-2006 document.
+ */
 static int fake_assoc_resp(struct net_device *dev,
                struct ieee802154_addr *addr, u16 short_addr, u8 status)
 {
        return 0;
 }
+/**
+ * fake_disassoc_req - Disassociate a device from a network.
+ * @dev: The network device on which we're disassociating a device.
+ * @addr: The device to disassociate from the network.
+ * @reason: The reason to give to the device for being disassociated.
+ *
+ * This sends a disassociation notification to the device being
+ * disassociated from the network.
+ *
+ * Note: This is in section 7.5.3.2 of the IEEE 802.15.4-2006
+ *       document, with the reason described in 7.3.3.2.
+ */
 static int fake_disassoc_req(struct net_device *dev,
                struct ieee802154_addr *addr, u8 reason)
 {
        return ieee802154_nl_disassoc_confirm(dev, IEEE802154_SUCCESS);
 }
+/**
+ * fake_start_req - Start an IEEE 802.15.4 PAN.
+ * @dev: The network device on which to start the PAN.
+ * @addr: The coordinator address to use when starting the PAN.
+ * @channel: The channel on which to start the PAN.
+ * @bcn_ord: Beacon order.
+ * @sf_ord: Superframe order.
+ * @pan_coord: Whether or not we are the PAN coordinator or just
+ *             requesting a realignment perhaps?
+ * @blx: Battery Life Extension feature bitfield.
+ * @coord_realign: Something to realign something else.
+ *
+ * If pan_coord is non-zero then this starts a network with the
+ * provided parameters, otherwise it attempts a coordinator
+ * realignment of the stated network instead.
+ *
+ * Note: This is in section 7.5.2.3 of the IEEE 802.15.4-2006
+ * document, with 7.3.8 describing coordinator realignment.
+ *
+ * Note: There is currently no way to notify the coordinator userland
+ * program of whether or not the PAN has started successfully. As
+ * such, the coordinator program cannot know when the MAC has
+ * completed starting the network and will simply have to assume
+ * completeness based on some form of time delay.
+ */
 static int fake_start_req(struct net_device *dev, struct ieee802154_addr *addr,
                                u8 channel,
                                u8 bcn_ord, u8 sf_ord, u8 pan_coord, u8 blx,
@@ -87,6 +192,21 @@ static int fake_start_req(struct net_device *dev, struct ieee802154_addr *addr,
        return 0;
 }
+/**
+ * fake_scan_req - Start a channel scan.
+ * @dev: The network device on which to perform a channel scan.
+ * @type: The type of scan to perform.
+ * @channels: The channel bitmask to scan.
+ * @duration: How long to spend on each channel.
+ *
+ * This starts either a passive (energy) scan or an active (PAN) scan
+ * on the channels indicated in the @channels bitmask. The duration of
+ * the scan is measured in terms of superframe duration. Specifically,
+ * the scan will spend aBaseSuperFrameDuration * ((2^n) + 1) on each
+ * channel.
+ *
+ * Note: This is in section 7.5.2.1 of the IEEE 802.15.4-2006 document.
+ */
 static int fake_scan_req(struct net_device *dev, u8 type, u32 channels,
                u8 duration)
 {
diff --git a/drivers/isdn/hardware/mISDN/iohelper.h b/drivers/isdn/hardware/mISDN/iohelper.h
index c16a217301e8..b438981107ae 100644
--- a/drivers/isdn/hardware/mISDN/iohelper.h
+++ b/drivers/isdn/hardware/mISDN/iohelper.h
@@ -26,9 +26,9 @@
 #ifndef _IOHELPER_H
 #define _IOHELPER_H
-typedef u8      (read_reg_t)(void *, u8);
+typedef u8      (read_reg_func)(void *hwp, u8 offset);
-typedef void    (write_reg_t)(void *, u8, u8);
+typedef void    (write_reg_func)(void *hwp, u8 offset, u8 value);
-typedef void    (fifo_func_t)(void *, u8, u8 *, int);
+typedef void    (fifo_func)(void *hwp, u8 offset, u8 *datap, int size);
 struct _ioport {
        u32     port;
@@ -90,7 +90,7 @@ struct _ioport {
                        *dp++ = readb(((typ *)hw->adr) + off);\
        } \
        static void WriteFiFo##name##_MIO(void *p, u8 off, u8 *dp, int size) {\
-                struct inf_hw *hw = p;\
+                struct hws *hw = p;\
                while (size--)\
                        writeb(*dp++, ((typ *)hw->adr) + off);\
        }
@@ -106,4 +106,4 @@ struct _ioport {
        ASSIGN_FUNC(typ, IPAC, target);\
        } while (0)
-#endif
-\ No newline at end of file
+#endif
diff --git a/drivers/isdn/hardware/mISDN/ipac.h b/drivers/isdn/hardware/mISDN/ipac.h
index f9601d55dbca..74a6ccf9065c 100644
--- a/drivers/isdn/hardware/mISDN/ipac.h
+++ b/drivers/isdn/hardware/mISDN/ipac.h
@@ -30,10 +30,10 @@ struct isac_hw {
        u32                     off;            /* offset to isac regs */
        char                    *name;
        spinlock_t              *hwlock;        /* lock HW acccess */
-        read_reg_t              *read_reg;
+        read_reg_func           *read_reg;
-        write_reg_t             *write_reg;
+        write_reg_func          *write_reg;
-        fifo_func_t             *read_fifo;
+        fifo_func               *read_fifo;
-        fifo_func_t             *write_fifo;
+        fifo_func               *write_fifo;
        int                     (*monitor)(void *, u32, u8 *, int);
        void                    (*release)(struct isac_hw *);
        int                     (*init)(struct isac_hw *);
@@ -73,10 +73,10 @@ struct ipac_hw {
        spinlock_t              *hwlock;        /* lock HW acccess */
        struct module           *owner;
        u32                     type;
-        read_reg_t              *read_reg;
+        read_reg_func           *read_reg;
-        write_reg_t             *write_reg;
+        write_reg_func          *write_reg;
-        fifo_func_t             *read_fifo;
+        fifo_func               *read_fifo;
-        fifo_func_t             *write_fifo;
+        fifo_func               *write_fifo;
        void                    (*release)(struct ipac_hw *);
        int                     (*init)(struct ipac_hw *);
        int                     (*ctrl)(struct ipac_hw *, u32, u_long);
diff --git a/drivers/isdn/hardware/mISDN/isar.h b/drivers/isdn/hardware/mISDN/isar.h
index 092351acd2ab..4a134acd44d0 100644
--- a/drivers/isdn/hardware/mISDN/isar.h
+++ b/drivers/isdn/hardware/mISDN/isar.h
@@ -47,10 +47,10 @@ struct isar_hw {
        spinlock_t      *hwlock;        /* lock HW acccess */
        char            *name;
        struct module   *owner;
-        read_reg_t      *read_reg;
+        read_reg_func   *read_reg;
-        write_reg_t     *write_reg;
+        write_reg_func  *write_reg;
-        fifo_func_t     *read_fifo;
+        fifo_func       *read_fifo;
-        fifo_func_t     *write_fifo;
+        fifo_func       *write_fifo;
        int             (*ctrl)(void *, u32, u_long);
        void            (*release)(struct isar_hw *);
        int             (*init)(struct isar_hw *);
diff --git a/drivers/net/3c515.c b/drivers/net/3c515.c
index 85ffd132bada..3116410b3499 100644
--- a/drivers/net/3c515.c
+++ b/drivers/net/3c515.c
@@ -832,7 +832,9 @@ static int corkscrew_open(struct net_device *dev)
                        skb_reserve(skb, 2);    /* Align IP on 16 byte boundaries */
                        vp->rx_ring[i].addr = isa_virt_to_bus(skb->data);
                }
-                vp->rx_ring[i - 1].next = isa_virt_to_bus(&vp->rx_ring[0]);     /* Wrap the ring. */
+                if (i != 0)
+                        vp->rx_ring[i - 1].next =
+                                isa_virt_to_bus(&vp->rx_ring[0]);       /* Wrap the ring. */
                outl(isa_virt_to_bus(&vp->rx_ring[0]), ioaddr + UpListPtr);
        }
        if (vp->full_bus_master_tx) {   /* Boomerang bus master Tx. */
diff --git a/drivers/net/at1700.c b/drivers/net/at1700.c
index c2227d79673a..5349c58d1fae 100644
--- a/drivers/net/at1700.c
+++ b/drivers/net/at1700.c
@@ -318,7 +318,7 @@ static int __init at1700_probe1(struct net_device *dev, int ioaddr)
                                pos3 = mca_read_stored_pos( slot, 3 );
                                pos4 = mca_read_stored_pos( slot, 4 );
-                                for (l_i = 0; l_i < 0x09; l_i++)
+                                for (l_i = 0; l_i < 8; l_i++)
                                        if (( pos3 & 0x07) == at1700_ioaddr_pattern[l_i])
                                                break;
                                ioaddr = at1700_mca_probe_list[l_i];
diff --git a/drivers/net/bnx2x_main.c b/drivers/net/bnx2x_main.c
index a2de0cd9c9f9..2d035d795f02 100644
--- a/drivers/net/bnx2x_main.c
+++ b/drivers/net/bnx2x_main.c
@@ -56,8 +56,8 @@
 #include "bnx2x_init_ops.h"
 #include "bnx2x_dump.h"
-#define DRV_MODULE_VERSION      "1.48.113-1"
+#define DRV_MODULE_VERSION      "1.48.114-1"
-#define DRV_MODULE_RELDATE      "2009/07/21"
+#define DRV_MODULE_RELDATE      "2009/07/29"
 #define BNX2X_BC_VER            0x040200
 #include <linux/firmware.h>
@@ -4831,7 +4831,14 @@ static void bnx2x_set_storm_rx_mode(struct bnx2x *bp)
        int mode = bp->rx_mode;
        int mask = (1 << BP_L_ID(bp));
        int func = BP_FUNC(bp);
+        int port = BP_PORT(bp);
        int i;
+        /* All but management unicast packets should pass to the host as well */
+        u32 llh_mask =
+                NIG_LLH0_BRB1_DRV_MASK_REG_LLH0_BRB1_DRV_MASK_BRCST |
+                NIG_LLH0_BRB1_DRV_MASK_REG_LLH0_BRB1_DRV_MASK_MLCST |
+                NIG_LLH0_BRB1_DRV_MASK_REG_LLH0_BRB1_DRV_MASK_VLAN |
+                NIG_LLH0_BRB1_DRV_MASK_REG_LLH0_BRB1_DRV_MASK_NO_VLAN;
        DP(NETIF_MSG_IFUP, "rx mode %d  mask 0x%x\n", mode, mask);
@@ -4855,6 +4862,8 @@ static void bnx2x_set_storm_rx_mode(struct bnx2x *bp)
                tstorm_mac_filter.ucast_accept_all = mask;
                tstorm_mac_filter.mcast_accept_all = mask;
                tstorm_mac_filter.bcast_accept_all = mask;
+                /* pass management unicast packets as well */
+                llh_mask |= NIG_LLH0_BRB1_DRV_MASK_REG_LLH0_BRB1_DRV_MASK_UNCST;
                break;
        default:
@@ -4862,6 +4871,10 @@ static void bnx2x_set_storm_rx_mode(struct bnx2x *bp)
                break;
        }
+        REG_WR(bp,
+               (port ? NIG_REG_LLH1_BRB1_DRV_MASK : NIG_REG_LLH0_BRB1_DRV_MASK),
+               llh_mask);
        for (i = 0; i < sizeof(struct tstorm_eth_mac_filter_config)/4; i++) {
                REG_WR(bp, BAR_TSTRORM_INTMEM +
                       TSTORM_MAC_FILTER_CONFIG_OFFSET(func) + i * 4,
@@ -7341,17 +7354,17 @@ static int bnx2x_nic_unload(struct bnx2x *bp, int unload_mode)
                for (i = 0; i < MC_HASH_SIZE; i++)
                        REG_WR(bp, MC_HASH_OFFSET(bp, i), 0);
+                REG_WR(bp, MISC_REG_E1HMF_MODE, 0);
        }
        if (unload_mode == UNLOAD_NORMAL)
                reset_code = DRV_MSG_CODE_UNLOAD_REQ_WOL_DIS;
-        else if (bp->flags & NO_WOL_FLAG) {
+        else if (bp->flags & NO_WOL_FLAG)
                reset_code = DRV_MSG_CODE_UNLOAD_REQ_WOL_MCP;
-                if (CHIP_IS_E1H(bp))
-                        REG_WR(bp, MISC_REG_E1HMF_MODE, 0);
-        } else if (bp->wol) {
+        else if (bp->wol) {
                u32 emac_base = port ? GRCBASE_EMAC1 : GRCBASE_EMAC0;
                u8 *mac_addr = bp->dev->dev_addr;
                u32 val;
@@ -9402,10 +9415,9 @@ static int bnx2x_test_registers(struct bnx2x *bp)
                { XCM_REG_WU_DA_SET_TMR_CNT_FLG_CMD00, 4, 0x00000001 },
                { XCM_REG_WU_DA_CNT_CMD00,             4, 0x00000003 },
                { XCM_REG_GLB_DEL_ACK_MAX_CNT_0,       4, 0x000000ff },
-                { NIG_REG_EGRESS_MNG0_FIFO,           20, 0xffffffff },
                { NIG_REG_LLH0_T_BIT,                  4, 0x00000001 },
-/* 20 */        { NIG_REG_EMAC0_IN_EN,                 4, 0x00000001 },
+                { NIG_REG_EMAC0_IN_EN,                 4, 0x00000001 },
-                { NIG_REG_BMAC0_IN_EN,                 4, 0x00000001 },
+/* 20 */        { NIG_REG_BMAC0_IN_EN,                 4, 0x00000001 },
                { NIG_REG_XCM0_OUT_EN,                 4, 0x00000001 },
                { NIG_REG_BRB0_OUT_EN,                 4, 0x00000001 },
                { NIG_REG_LLH0_XCM_MASK,               4, 0x00000007 },
@@ -9414,8 +9426,8 @@ static int bnx2x_test_registers(struct bnx2x *bp)
                { NIG_REG_LLH0_DEST_MAC_0_0,         160, 0xffffffff },
                { NIG_REG_LLH0_DEST_IP_0_1,          160, 0xffffffff },
                { NIG_REG_LLH0_IPV4_IPV6_0,          160, 0x00000001 },
-/* 30 */        { NIG_REG_LLH0_DEST_UDP_0,           160, 0x0000ffff },
+                { NIG_REG_LLH0_DEST_UDP_0,           160, 0x0000ffff },
-                { NIG_REG_LLH0_DEST_TCP_0,           160, 0x0000ffff },
+/* 30 */        { NIG_REG_LLH0_DEST_TCP_0,           160, 0x0000ffff },
                { NIG_REG_LLH0_VLAN_ID_0,            160, 0x00000fff },
                { NIG_REG_XGXS_SERDES0_MODE_SEL,       4, 0x00000001 },
                { NIG_REG_LED_CONTROL_OVERRIDE_TRAFFIC_P0, 4, 0x00000001 },
diff --git a/drivers/net/bnx2x_reg.h b/drivers/net/bnx2x_reg.h
index d771168ec20a..8e9e7a24f2fc 100644
--- a/drivers/net/bnx2x_reg.h
+++ b/drivers/net/bnx2x_reg.h
@@ -1616,6 +1616,11 @@
 /* [RW 1] Set by the MCP to remember if one or more of the drivers is/are
   loaded; 0-prepare; -unprepare */
 #define MISC_REG_UNPREPARED                                      0xa424
+#define NIG_LLH0_BRB1_DRV_MASK_REG_LLH0_BRB1_DRV_MASK_BRCST      (0x1<<0)
+#define NIG_LLH0_BRB1_DRV_MASK_REG_LLH0_BRB1_DRV_MASK_MLCST      (0x1<<1)
+#define NIG_LLH0_BRB1_DRV_MASK_REG_LLH0_BRB1_DRV_MASK_NO_VLAN    (0x1<<4)
+#define NIG_LLH0_BRB1_DRV_MASK_REG_LLH0_BRB1_DRV_MASK_UNCST      (0x1<<2)
+#define NIG_LLH0_BRB1_DRV_MASK_REG_LLH0_BRB1_DRV_MASK_VLAN       (0x1<<3)
 #define NIG_MASK_INTERRUPT_PORT0_REG_MASK_EMAC0_MISC_MI_INT      (0x1<<0)
 #define NIG_MASK_INTERRUPT_PORT0_REG_MASK_SERDES0_LINK_STATUS    (0x1<<9)
 #define NIG_MASK_INTERRUPT_PORT0_REG_MASK_XGXS0_LINK10G          (0x1<<15)
diff --git a/drivers/net/cnic.c b/drivers/net/cnic.c
index 4d1515f45ba2..4869d77cbe91 100644
--- a/drivers/net/cnic.c
+++ b/drivers/net/cnic.c
@@ -227,7 +227,7 @@ static int cnic_send_nlmsg(struct cnic_local *cp, u32 type,
        }
        rcu_read_lock();
-        ulp_ops = rcu_dereference(cp->ulp_ops[CNIC_ULP_ISCSI]);
+        ulp_ops = rcu_dereference(cnic_ulp_tbl[CNIC_ULP_ISCSI]);
        if (ulp_ops)
                ulp_ops->iscsi_nl_send_msg(cp->dev, msg_type, buf, len);
        rcu_read_unlock();
@@ -319,6 +319,20 @@ static int cnic_abort_prep(struct cnic_sock *csk)
        return 0;
 }
+static void cnic_uio_stop(void)
+{
+        struct cnic_dev *dev;
+        read_lock(&cnic_dev_lock);
+        list_for_each_entry(dev, &cnic_dev_list, list) {
+                struct cnic_local *cp = dev->cnic_priv;
+                if (cp->cnic_uinfo)
+                        cnic_send_nlmsg(cp, ISCSI_KEVENT_IF_DOWN, NULL);
+        }
+        read_unlock(&cnic_dev_lock);
+}
 int cnic_register_driver(int ulp_type, struct cnic_ulp_ops *ulp_ops)
 {
        struct cnic_dev *dev;
@@ -390,6 +404,9 @@ int cnic_unregister_driver(int ulp_type)
        }
        read_unlock(&cnic_dev_lock);
+        if (ulp_type == CNIC_ULP_ISCSI)
+                cnic_uio_stop();
        rcu_assign_pointer(cnic_ulp_tbl[ulp_type], NULL);
        mutex_unlock(&cnic_lock);
@@ -632,7 +649,6 @@ static void cnic_free_resc(struct cnic_dev *dev)
        int i = 0;
        if (cp->cnic_uinfo) {
-                cnic_send_nlmsg(cp, ISCSI_KEVENT_IF_DOWN, NULL);
                while (cp->uio_dev != -1 && i < 15) {
                        msleep(100);
                        i++;
@@ -1057,6 +1073,9 @@ static void cnic_ulp_stop(struct cnic_dev *dev)
        struct cnic_local *cp = dev->cnic_priv;
        int if_type;
+        if (cp->cnic_uinfo)
+                cnic_send_nlmsg(cp, ISCSI_KEVENT_IF_DOWN, NULL);
        rcu_read_lock();
        for (if_type = 0; if_type < MAX_CNIC_ULP_TYPE; if_type++) {
                struct cnic_ulp_ops *ulp_ops;
diff --git a/drivers/net/eepro.c b/drivers/net/eepro.c
index 71605d63708c..53317a83857a 100644
--- a/drivers/net/eepro.c
+++ b/drivers/net/eepro.c
@@ -1784,7 +1784,7 @@ int __init init_module(void)
                printk(KERN_INFO "eepro_init_module: Auto-detecting boards (May God protect us...)\n");
        }
-        for (i = 0; io[i] != -1 && i < MAX_EEPRO; i++) {
+        for (i = 0; i < MAX_EEPRO && io[i] != -1; i++) {
                dev = alloc_etherdev(sizeof(struct eepro_local));
                if (!dev)
                        break;
diff --git a/drivers/net/eexpress.c b/drivers/net/eexpress.c
index 8c44ef4ba357..d1b6368faacd 100644
--- a/drivers/net/eexpress.c
+++ b/drivers/net/eexpress.c
@@ -1474,13 +1474,13 @@ static void eexp_hw_init586(struct net_device *dev)
        outw(0x0000, ioaddr + 0x800c);
        outw(0x0000, ioaddr + 0x800e);
-        for (i = 0; i < (sizeof(start_code)); i+=32) {
+        for (i = 0; i < ARRAY_SIZE(start_code) * 2; i+=32) {
                int j;
                outw(i, ioaddr + SM_PTR);
-                for (j = 0; j < 16; j+=2)
+                for (j = 0; j < 16 && (i+j)/2 < ARRAY_SIZE(start_code); j+=2)
                        outw(start_code[(i+j)/2],
                             ioaddr+0x4000+j);
-                for (j = 0; j < 16; j+=2)
+                for (j = 0; j < 16 && (i+j+16)/2 < ARRAY_SIZE(start_code); j+=2)
                        outw(start_code[(i+j+16)/2],
                             ioaddr+0x8000+j);
        }
diff --git a/drivers/net/ethoc.c b/drivers/net/ethoc.c
index ceb6a9c357ad..4dbe5f173273 100644
--- a/drivers/net/ethoc.c
+++ b/drivers/net/ethoc.c
@@ -894,7 +894,7 @@ static int ethoc_probe(struct platform_device *pdev)
        mmio = devm_request_mem_region(&pdev->dev, res->start,
                        res->end - res->start + 1, res->name);
-        if (!res) {
+        if (!mmio) {
                dev_err(&pdev->dev, "cannot request I/O memory space\n");
                ret = -ENXIO;
                goto free;
diff --git a/drivers/net/fealnx.c b/drivers/net/fealnx.c
index 75e5fe5153d9..b2d617206bd9 100644
--- a/drivers/net/fealnx.c
+++ b/drivers/net/fealnx.c
@@ -584,7 +584,8 @@ static int __devinit fealnx_init_one(struct pci_dev *pdev,
        if (np->flags == HAS_MII_XCVR) {
                int phy, phy_idx = 0;
-                for (phy = 1; phy < 32 && phy_idx < 4; phy++) {
+                for (phy = 1; phy < 32 && phy_idx < ARRAY_SIZE(np->phys);
+                               phy++) {
                        int mii_status = mdio_read(dev, phy, 1);
                        if (mii_status != 0xffff && mii_status != 0x0000) {
diff --git a/drivers/net/gianfar_ethtool.c b/drivers/net/gianfar_ethtool.c
index dbf06e9313cc..2234118eedbb 100644
--- a/drivers/net/gianfar_ethtool.c
+++ b/drivers/net/gianfar_ethtool.c
@@ -366,9 +366,8 @@ static int gfar_scoalesce(struct net_device *dev, struct ethtool_coalesce *cvals
                return -EINVAL;
        }
-        priv->rxic = mk_ic_value(
+        priv->rxic = mk_ic_value(cvals->rx_max_coalesced_frames,
-                gfar_usecs2ticks(priv, cvals->rx_coalesce_usecs),
+                gfar_usecs2ticks(priv, cvals->rx_coalesce_usecs));
-                cvals->rx_max_coalesced_frames);
        /* Set up tx coalescing */
        if ((cvals->tx_coalesce_usecs == 0) ||
@@ -390,9 +389,8 @@ static int gfar_scoalesce(struct net_device *dev, struct ethtool_coalesce *cvals
                return -EINVAL;
        }
-        priv->txic = mk_ic_value(
+        priv->txic = mk_ic_value(cvals->tx_max_coalesced_frames,
-                gfar_usecs2ticks(priv, cvals->tx_coalesce_usecs),
+                gfar_usecs2ticks(priv, cvals->tx_coalesce_usecs));
-                cvals->tx_max_coalesced_frames);
        gfar_write(&priv->regs->rxic, 0);
        if (priv->rxcoalescing)
diff --git a/drivers/net/ixgbe/ixgbe.h b/drivers/net/ixgbe/ixgbe.h
index dc3cc4348d1d..62b6c028ae81 100644
--- a/drivers/net/ixgbe/ixgbe.h
+++ b/drivers/net/ixgbe/ixgbe.h
@@ -96,6 +96,8 @@
 #define IXGBE_TX_FLAGS_VLAN_PRIO_MASK   0x0000e000
 #define IXGBE_TX_FLAGS_VLAN_SHIFT       16
+#define IXGBE_MAX_RSC_INT_RATE          162760
 /* wrapper around a pointer to a socket buffer,
 * so a DMA handle can be stored along with the buffer */
 struct ixgbe_tx_buffer {
diff --git a/drivers/net/ixgbe/ixgbe_ethtool.c b/drivers/net/ixgbe/ixgbe_ethtool.c
index 1464b33f1b8e..c6db9a04187d 100644
--- a/drivers/net/ixgbe/ixgbe_ethtool.c
+++ b/drivers/net/ixgbe/ixgbe_ethtool.c
@@ -1980,7 +1980,10 @@ static int ixgbe_set_coalesce(struct net_device *netdev,
                 * any other value means disable eitr, which is best
                 * served by setting the interrupt rate very high
                 */
-                adapter->eitr_param = IXGBE_MAX_INT_RATE;
+                if (adapter->flags2 & IXGBE_FLAG2_RSC_ENABLED)
+                        adapter->eitr_param = IXGBE_MAX_RSC_INT_RATE;
+                else
+                        adapter->eitr_param = IXGBE_MAX_INT_RATE;
                adapter->itr_setting = 0;
        }
@@ -2004,13 +2007,13 @@ static int ixgbe_set_flags(struct net_device *netdev, u32 data)
        ethtool_op_set_flags(netdev, data);
-        if (!(adapter->flags & IXGBE_FLAG2_RSC_CAPABLE))
+        if (!(adapter->flags2 & IXGBE_FLAG2_RSC_CAPABLE))
                return 0;
        /* if state changes we need to update adapter->flags and reset */
        if ((!!(data & ETH_FLAG_LRO)) != 
-            (!!(adapter->flags & IXGBE_FLAG2_RSC_ENABLED))) {
+            (!!(adapter->flags2 & IXGBE_FLAG2_RSC_ENABLED))) {
-                adapter->flags ^= IXGBE_FLAG2_RSC_ENABLED;
+                adapter->flags2 ^= IXGBE_FLAG2_RSC_ENABLED;
                if (netif_running(netdev))
                        ixgbe_reinit_locked(adapter);
                else
diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c
index 50709da922c7..44adc9862826 100644
--- a/drivers/net/ixgbe/ixgbe_main.c
+++ b/drivers/net/ixgbe/ixgbe_main.c
@@ -513,8 +513,11 @@ static void ixgbe_receive_skb(struct ixgbe_q_vector *q_vector,
 * @skb: skb currently being received and modified
 **/
 static inline void ixgbe_rx_checksum(struct ixgbe_adapter *adapter,
-                                     u32 status_err, struct sk_buff *skb)
+                                     union ixgbe_adv_rx_desc *rx_desc,
+                                     struct sk_buff *skb)
 {
+        u32 status_err = le32_to_cpu(rx_desc->wb.upper.status_error);
        skb->ip_summed = CHECKSUM_NONE;
        /* Rx csum disabled */
@@ -532,6 +535,16 @@ static inline void ixgbe_rx_checksum(struct ixgbe_adapter *adapter,
                return;
        if (status_err & IXGBE_RXDADV_ERR_TCPE) {
+                u16 pkt_info = rx_desc->wb.lower.lo_dword.hs_rss.pkt_info;
+                /*
+                 * 82599 errata, UDP frames with a 0 checksum can be marked as
+                 * checksum errors.
+                 */
+                if ((pkt_info & IXGBE_RXDADV_PKTTYPE_UDP) &&
+                    (adapter->hw.mac.type == ixgbe_mac_82599EB))
+                        return;
                adapter->hw_csum_rx_error++;
                return;
        }
@@ -769,7 +782,7 @@ static bool ixgbe_clean_rx_irq(struct ixgbe_q_vector *q_vector,
                prefetch(next_rxd);
                cleaned_count++;
-                if (adapter->flags & IXGBE_FLAG2_RSC_CAPABLE)
+                if (adapter->flags2 & IXGBE_FLAG2_RSC_CAPABLE)
                        rsc_count = ixgbe_get_rsc_count(rx_desc);
                if (rsc_count) {
@@ -805,7 +818,7 @@ static bool ixgbe_clean_rx_irq(struct ixgbe_q_vector *q_vector,
                        goto next_desc;
                }
-                ixgbe_rx_checksum(adapter, staterr, skb);
+                ixgbe_rx_checksum(adapter, rx_desc, skb);
                /* probably a little skewed due to removing CRC */
                total_rx_bytes += skb->len;
@@ -2025,7 +2038,7 @@ static void ixgbe_configure_rx(struct ixgbe_adapter *adapter)
                        IXGBE_WRITE_REG(hw, IXGBE_PSRTYPE(0), psrtype);
                }
        } else {
-                if (!(adapter->flags & IXGBE_FLAG2_RSC_ENABLED) &&
+                if (!(adapter->flags2 & IXGBE_FLAG2_RSC_ENABLED) &&
                    (netdev->mtu <= ETH_DATA_LEN))
                        rx_buf_len = MAXIMUM_ETHERNET_VLAN_SIZE;
                else
@@ -2154,7 +2167,7 @@ static void ixgbe_configure_rx(struct ixgbe_adapter *adapter)
                IXGBE_WRITE_REG(hw, IXGBE_RDRXCTL, rdrxctl);
        }
-        if (adapter->flags & IXGBE_FLAG2_RSC_ENABLED) {
+        if (adapter->flags2 & IXGBE_FLAG2_RSC_ENABLED) {
                /* Enable 82599 HW-RSC */
                for (i = 0; i < adapter->num_rx_queues; i++) {
                        j = adapter->rx_ring[i].reg_idx;
@@ -3801,8 +3814,8 @@ static int __devinit ixgbe_sw_init(struct ixgbe_adapter *adapter)
                adapter->max_msix_q_vectors = MAX_MSIX_Q_VECTORS_82598;
        } else if (hw->mac.type == ixgbe_mac_82599EB) {
                adapter->max_msix_q_vectors = MAX_MSIX_Q_VECTORS_82599;
-                adapter->flags |= IXGBE_FLAG2_RSC_CAPABLE;
+                adapter->flags2 |= IXGBE_FLAG2_RSC_CAPABLE;
-                adapter->flags |= IXGBE_FLAG2_RSC_ENABLED;
+                adapter->flags2 |= IXGBE_FLAG2_RSC_ENABLED;
                adapter->flags |= IXGBE_FLAG_FDIR_HASH_CAPABLE;
                adapter->ring_feature[RING_F_FDIR].indices =
                                                         IXGBE_MAX_FDIR_INDICES;
@@ -5349,12 +5362,19 @@ static int ixgbe_del_sanmac_netdev(struct net_device *dev)
 static void ixgbe_netpoll(struct net_device *netdev)
 {
        struct ixgbe_adapter *adapter = netdev_priv(netdev);
+        int i;
-        disable_irq(adapter->pdev->irq);
        adapter->flags |= IXGBE_FLAG_IN_NETPOLL;
-        ixgbe_intr(adapter->pdev->irq, netdev);
+        if (adapter->flags & IXGBE_FLAG_MSIX_ENABLED) {
+                int num_q_vectors = adapter->num_msix_vectors - NON_Q_VECTORS;
+                for (i = 0; i < num_q_vectors; i++) {
+                        struct ixgbe_q_vector *q_vector = adapter->q_vector[i];
+                        ixgbe_msix_clean_many(0, q_vector);
+                }
+        } else {
+                ixgbe_intr(adapter->pdev->irq, netdev);
+        }
        adapter->flags &= ~IXGBE_FLAG_IN_NETPOLL;
-        enable_irq(adapter->pdev->irq);
 }
 #endif
@@ -5600,7 +5620,7 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev,
        if (pci_using_dac)
                netdev->features |= NETIF_F_HIGHDMA;
-        if (adapter->flags & IXGBE_FLAG2_RSC_ENABLED)
+        if (adapter->flags2 & IXGBE_FLAG2_RSC_ENABLED)
                netdev->features |= NETIF_F_LRO;
        /* make sure the EEPROM is good */
diff --git a/drivers/net/netxen/netxen_nic.h b/drivers/net/netxen/netxen_nic.h
index f86e05047d19..e22d08615893 100644
--- a/drivers/net/netxen/netxen_nic.h
+++ b/drivers/net/netxen/netxen_nic.h
@@ -57,8 +57,8 @@
 #define _NETXEN_NIC_LINUX_MAJOR 4
 #define _NETXEN_NIC_LINUX_MINOR 0
-#define _NETXEN_NIC_LINUX_SUBVERSION 30
+#define _NETXEN_NIC_LINUX_SUBVERSION 41
-#define NETXEN_NIC_LINUX_VERSIONID  "4.0.30"
+#define NETXEN_NIC_LINUX_VERSIONID  "4.0.41"
 #define NETXEN_VERSION_CODE(a, b, c)    (((a) << 24) + ((b) << 16) + (c))
 #define _major(v)       (((v) >> 24) & 0xff)
@@ -143,18 +143,13 @@
 #define NX_ETHERMTU                    1500
 #define NX_MAX_ETHERHDR                32 /* This contains some padding */
-#define NX_RX_NORMAL_BUF_MAX_LEN       (NX_MAX_ETHERHDR + NX_ETHERMTU)
+#define NX_P2_RX_BUF_MAX_LEN           1760
+#define NX_P3_RX_BUF_MAX_LEN           (NX_MAX_ETHERHDR + NX_ETHERMTU)
 #define NX_P2_RX_JUMBO_BUF_MAX_LEN     (NX_MAX_ETHERHDR + P2_MAX_MTU)
 #define NX_P3_RX_JUMBO_BUF_MAX_LEN     (NX_MAX_ETHERHDR + P3_MAX_MTU)
 #define NX_CT_DEFAULT_RX_BUF_LEN        2048
-#define MAX_RX_BUFFER_LENGTH            1760
+#define NX_RX_LRO_BUFFER_LENGTH         (8060)
-#define MAX_RX_JUMBO_BUFFER_LENGTH      8062
-#define MAX_RX_LRO_BUFFER_LENGTH        (8062)
-#define RX_DMA_MAP_LEN                  (MAX_RX_BUFFER_LENGTH - 2)
-#define RX_JUMBO_DMA_MAP_LEN    \
-        (MAX_RX_JUMBO_BUFFER_LENGTH - 2)
-#define RX_LRO_DMA_MAP_LEN              (MAX_RX_LRO_BUFFER_LENGTH - 2)
 /*
 * Maximum number of ring contexts
@@ -200,13 +195,20 @@
 #define RCV_RING_JUMBO  1
 #define RCV_RING_LRO    2
-#define MAX_CMD_DESCRIPTORS             4096
+#define MIN_CMD_DESCRIPTORS             64
-#define MAX_RCV_DESCRIPTORS             16384
+#define MIN_RCV_DESCRIPTORS             64
-#define MAX_CMD_DESCRIPTORS_HOST        1024
+#define MIN_JUMBO_DESCRIPTORS           32
-#define MAX_RCV_DESCRIPTORS_1G          2048
-#define MAX_RCV_DESCRIPTORS_10G         4096
+#define MAX_CMD_DESCRIPTORS             1024
-#define MAX_JUMBO_RCV_DESCRIPTORS       1024
+#define MAX_RCV_DESCRIPTORS_1G          4096
+#define MAX_RCV_DESCRIPTORS_10G         8192
+#define MAX_JUMBO_RCV_DESCRIPTORS_1G    512
+#define MAX_JUMBO_RCV_DESCRIPTORS_10G   1024
 #define MAX_LRO_RCV_DESCRIPTORS         8
+#define DEFAULT_RCV_DESCRIPTORS_1G      2048
+#define DEFAULT_RCV_DESCRIPTORS_10G     4096
 #define NETXEN_CTX_SIGNATURE    0xdee0
 #define NETXEN_CTX_SIGNATURE_V2 0x0002dee0
 #define NETXEN_CTX_RESET        0xbad0
@@ -302,6 +304,10 @@ struct netxen_ring_ctx {
 #define FLAGS_IPSEC_SA_ADD      0x04
 #define FLAGS_IPSEC_SA_DELETE   0x08
 #define FLAGS_VLAN_TAGGED       0x10
+#define FLAGS_VLAN_OOB          0x40
+#define netxen_set_tx_vlan_tci(cmd_desc, v)     \
+        (cmd_desc)->vlan_TCI = cpu_to_le16(v);
 #define netxen_set_cmd_desc_port(cmd_desc, var) \
        ((cmd_desc)->port_ctxid |= ((var) & 0x0F))
@@ -316,58 +322,33 @@ struct netxen_ring_ctx {
        cpu_to_le16(((_flags) & 0x7f) | (((_opcode) & 0x3f) << 7))
 #define netxen_set_tx_frags_len(_desc, _frags, _len) \
-        (_desc)->num_of_buffers_total_length = \
+        (_desc)->nfrags__length = \
        cpu_to_le32(((_frags) & 0xff) | (((_len) & 0xffffff) << 8))
 struct cmd_desc_type0 {
        u8 tcp_hdr_offset;      /* For LSO only */
        u8 ip_hdr_offset;       /* For LSO only */
-        /* Bit pattern: 0-6 flags, 7-12 opcode, 13-15 unused */
+        __le16 flags_opcode;    /* 15:13 unused, 12:7 opcode, 6:0 flags */
-        __le16 flags_opcode;
+        __le32 nfrags__length;  /* 31:8 total len, 7:0 frag count */
-        /* Bit pattern: 0-7 total number of segments,
-           8-31 Total size of the packet */
+        __le64 addr_buffer2;
-        __le32 num_of_buffers_total_length;
-        union {
-                struct {
-                        __le32 addr_low_part2;
-                        __le32 addr_high_part2;
-                };
-                __le64 addr_buffer2;
-        };
-        __le16 reference_handle;        /* changed to u16 to add mss */
+        __le16 reference_handle;
-        __le16 mss;             /* passed by NDIS_PACKET for LSO */
+        __le16 mss;
-        /* Bit pattern 0-3 port, 0-3 ctx id */
+        u8 port_ctxid;          /* 7:4 ctxid 3:0 port */
-        u8 port_ctxid;
        u8 total_hdr_length;    /* LSO only : MAC+IP+TCP Hdr size */
        __le16 conn_id;         /* IPSec offoad only */
-        union {
+        __le64 addr_buffer3;
-                struct {
+        __le64 addr_buffer1;
-                        __le32 addr_low_part3;
-                        __le32 addr_high_part3;
-                };
-                __le64 addr_buffer3;
-        };
-        union {
-                struct {
-                        __le32 addr_low_part1;
-                        __le32 addr_high_part1;
-                };
-                __le64 addr_buffer1;
-        };
        __le16 buffer_length[4];
-        union {
+        __le64 addr_buffer4;
-                struct {
-                        __le32 addr_low_part4;
-                        __le32 addr_high_part4;
-                };
-                __le64 addr_buffer4;
-        };
-        __le64 unused;
+        __le16 vlan_TCI;
+        __le16 reserved;
+        __le32 reserved2;
 } __attribute__ ((aligned(64)));
@@ -380,6 +361,7 @@ struct rcv_desc {
 };
 /* opcode field in status_desc */
+#define NETXEN_NIC_SYN_OFFLOAD  0x03
 #define NETXEN_NIC_RXPKT_DESC  0x04
 #define NETXEN_OLD_RXPKT_DESC  0x3f
 #define NETXEN_NIC_RESPONSE_DESC 0x05
@@ -1078,6 +1060,9 @@ typedef struct {
 #define NX_MAC_EVENT            0x1
+#define NX_IP_UP                2
+#define NX_IP_DOWN              3
 /*
 * Driver --> Firmware
 */
@@ -1132,6 +1117,9 @@ typedef struct {
 #define NX_FW_CAPABILITY_LINK_NOTIFICATION      (1 << 5)
 #define NX_FW_CAPABILITY_SWITCHING              (1 << 6)
+#define NX_FW_CAPABILITY_PEXQ                   (1 << 7)
+#define NX_FW_CAPABILITY_BDG                    (1 << 8)
+#define NX_FW_CAPABILITY_FVLANTX                (1 << 9)
 /* module types */
 #define LINKEVENT_MODULE_NOT_PRESENT                    1
@@ -1315,29 +1303,11 @@ struct netxen_adapter {
        nx_nic_intr_coalesce_t coal;
-        u32 fw_major;
+        u32 resv5;
        u32 fw_version;
        const struct firmware *fw;
 };
-/*
- * NetXen dma watchdog control structure
- *
- *      Bit 0           : enabled => R/O: 1 watchdog active, 0 inactive
- *      Bit 1           : disable_request => 1 req disable dma watchdog
- *      Bit 2           : enable_request =>  1 req enable dma watchdog
- *      Bit 3-31        : unused
- */
-#define netxen_set_dma_watchdog_disable_req(config_word) \
-        _netxen_set_bits(config_word, 1, 1, 1)
-#define netxen_set_dma_watchdog_enable_req(config_word) \
-        _netxen_set_bits(config_word, 2, 1, 1)
-#define netxen_get_dma_watchdog_enabled(config_word) \
-        ((config_word) & 0x1)
-#define netxen_get_dma_watchdog_disabled(config_word) \
-        (((config_word) >> 1) & 0x1)
 int netxen_niu_xgbe_enable_phy_interrupts(struct netxen_adapter *adapter);
 int netxen_niu_gbe_enable_phy_interrupts(struct netxen_adapter *adapter);
 int netxen_niu_xgbe_disable_phy_interrupts(struct netxen_adapter *adapter);
@@ -1398,8 +1368,9 @@ unsigned long netxen_nic_pci_set_window_2M(struct netxen_adapter *adapter,
                unsigned long long addr);
 /* Functions from netxen_nic_init.c */
-void netxen_free_adapter_offload(struct netxen_adapter *adapter);
+int netxen_init_dummy_dma(struct netxen_adapter *adapter);
-int netxen_initialize_adapter_offload(struct netxen_adapter *adapter);
+void netxen_free_dummy_dma(struct netxen_adapter *adapter);
 int netxen_phantom_init(struct netxen_adapter *adapter, int pegtune_val);
 int netxen_load_firmware(struct netxen_adapter *adapter);
 int netxen_need_fw_reset(struct netxen_adapter *adapter);
@@ -1443,6 +1414,7 @@ void netxen_p3_free_mac_list(struct netxen_adapter *adapter);
 int netxen_p3_nic_set_promisc(struct netxen_adapter *adapter, u32);
 int netxen_config_intr_coalesce(struct netxen_adapter *adapter);
 int netxen_config_rss(struct netxen_adapter *adapter, int enable);
+int netxen_config_ipaddr(struct netxen_adapter *adapter, u32 ip, int cmd);
 int netxen_linkevent_request(struct netxen_adapter *adapter, int enable);
 void netxen_advert_link_change(struct netxen_adapter *adapter, int linkup);
@@ -1455,6 +1427,9 @@ struct net_device_stats *netxen_nic_get_stats(struct net_device *netdev);
 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 *);
 /*
 * NetXen Board information
 */
@@ -1505,56 +1480,6 @@ static inline void get_brd_name_by_type(u32 type, char *name)
                name = "Unknown";
 }
-static inline int
-dma_watchdog_shutdown_request(struct netxen_adapter *adapter)
-{
-        u32 ctrl;
-        /* check if already inactive */
-        ctrl = adapter->hw_read_wx(adapter,
-                        NETXEN_CAM_RAM(NETXEN_CAM_RAM_DMA_WATCHDOG_CTRL));
-        if (netxen_get_dma_watchdog_enabled(ctrl) == 0)
-                return 1;
-        /* Send the disable request */
-        netxen_set_dma_watchdog_disable_req(ctrl);
-        NXWR32(adapter, NETXEN_CAM_RAM(NETXEN_CAM_RAM_DMA_WATCHDOG_CTRL), ctrl);
-        return 0;
-}
-static inline int
-dma_watchdog_shutdown_poll_result(struct netxen_adapter *adapter)
-{
-        u32 ctrl;
-        ctrl = adapter->hw_read_wx(adapter,
-                        NETXEN_CAM_RAM(NETXEN_CAM_RAM_DMA_WATCHDOG_CTRL));
-        return (netxen_get_dma_watchdog_enabled(ctrl) == 0);
-}
-static inline int
-dma_watchdog_wakeup(struct netxen_adapter *adapter)
-{
-        u32 ctrl;
-        ctrl = adapter->hw_read_wx(adapter,
-                        NETXEN_CAM_RAM(NETXEN_CAM_RAM_DMA_WATCHDOG_CTRL));
-        if (netxen_get_dma_watchdog_enabled(ctrl))
-                return 1;
-        /* send the wakeup request */
-        netxen_set_dma_watchdog_enable_req(ctrl);
-        NXWR32(adapter, NETXEN_CAM_RAM(NETXEN_CAM_RAM_DMA_WATCHDOG_CTRL), ctrl);
-        return 0;
-}
 static inline u32 netxen_tx_avail(struct nx_host_tx_ring *tx_ring)
 {
        smp_mb();
diff --git a/drivers/net/netxen/netxen_nic_ctx.c b/drivers/net/netxen/netxen_nic_ctx.c
index 9f8ae4719e2f..9e0469643d34 100644
--- a/drivers/net/netxen/netxen_nic_ctx.c
+++ b/drivers/net/netxen/netxen_nic_ctx.c
@@ -647,7 +647,7 @@ int netxen_alloc_hw_resources(struct netxen_adapter *adapter)
                }
                rds_ring->desc_head = (struct rcv_desc *)addr;
-                if (adapter->fw_major < 4)
+                if (NX_IS_REVISION_P2(adapter->ahw.revision_id))
                        rds_ring->crb_rcv_producer =
                                recv_crb_registers[port].crb_rcv_producer[ring];
        }
@@ -675,7 +675,7 @@ int netxen_alloc_hw_resources(struct netxen_adapter *adapter)
        }
-        if (adapter->fw_major >= 4) {
+        if (!NX_IS_REVISION_P2(adapter->ahw.revision_id)) {
                err = nx_fw_cmd_create_rx_ctx(adapter);
                if (err)
                        goto err_out_free;
@@ -705,7 +705,7 @@ void netxen_free_hw_resources(struct netxen_adapter *adapter)
        int port = adapter->portnum;
-        if (adapter->fw_major >= 4) {
+        if (!NX_IS_REVISION_P2(adapter->ahw.revision_id)) {
                nx_fw_cmd_destroy_rx_ctx(adapter);
                nx_fw_cmd_destroy_tx_ctx(adapter);
        } else {
diff --git a/drivers/net/netxen/netxen_nic_ethtool.c b/drivers/net/netxen/netxen_nic_ethtool.c
index e16ea46c24b8..39a308c363c7 100644
--- a/drivers/net/netxen/netxen_nic_ethtool.c
+++ b/drivers/net/netxen/netxen_nic_ethtool.c
@@ -490,28 +490,86 @@ netxen_nic_get_eeprom(struct net_device *dev, struct ethtool_eeprom *eeprom,
 }
 static void
-netxen_nic_get_ringparam(struct net_device *dev, struct ethtool_ringparam *ring)
+netxen_nic_get_ringparam(struct net_device *dev,
+                struct ethtool_ringparam *ring)
 {
        struct netxen_adapter *adapter = netdev_priv(dev);
-        ring->rx_pending = 0;
+        ring->rx_pending = adapter->num_rxd;
-        ring->rx_jumbo_pending = 0;
+        ring->rx_jumbo_pending = adapter->num_jumbo_rxd;
-        ring->rx_pending += adapter->recv_ctx.
+        ring->rx_jumbo_pending += adapter->num_lro_rxd;
-                rds_rings[RCV_RING_NORMAL].num_desc;
-        ring->rx_jumbo_pending += adapter->recv_ctx.
-                rds_rings[RCV_RING_JUMBO].num_desc;
        ring->tx_pending = adapter->num_txd;
-        if (adapter->ahw.port_type == NETXEN_NIC_GBE)
+        if (adapter->ahw.port_type == NETXEN_NIC_GBE) {
                ring->rx_max_pending = MAX_RCV_DESCRIPTORS_1G;
-        else
+                ring->rx_jumbo_max_pending = MAX_JUMBO_RCV_DESCRIPTORS_1G;
+        } else {
                ring->rx_max_pending = MAX_RCV_DESCRIPTORS_10G;
-        ring->tx_max_pending = MAX_CMD_DESCRIPTORS_HOST;
+                ring->rx_jumbo_max_pending = MAX_JUMBO_RCV_DESCRIPTORS_10G;
-        ring->rx_jumbo_max_pending = MAX_JUMBO_RCV_DESCRIPTORS;
+        }
+        ring->tx_max_pending = MAX_CMD_DESCRIPTORS;
        ring->rx_mini_max_pending = 0;
        ring->rx_mini_pending = 0;
 }
+static u32
+netxen_validate_ringparam(u32 val, u32 min, u32 max, char *r_name)
+{
+        u32 num_desc;
+        num_desc = max(val, min);
+        num_desc = min(num_desc, max);
+        num_desc = roundup_pow_of_two(num_desc);
+        if (val != num_desc) {
+                printk(KERN_INFO "%s: setting %s ring size %d instead of %d\n",
+                       netxen_nic_driver_name, r_name, num_desc, val);
+        }
+        return num_desc;
+}
+static int
+netxen_nic_set_ringparam(struct net_device *dev,
+                struct ethtool_ringparam *ring)
+{
+        struct netxen_adapter *adapter = netdev_priv(dev);
+        u16 max_rcv_desc = MAX_RCV_DESCRIPTORS_10G;
+        u16 max_jumbo_desc = MAX_JUMBO_RCV_DESCRIPTORS_10G;
+        u16 num_rxd, num_jumbo_rxd, num_txd;
+        if (NX_IS_REVISION_P2(adapter->ahw.revision_id))
+                return -EOPNOTSUPP;
+        if (ring->rx_mini_pending)
+                return -EOPNOTSUPP;
+        if (adapter->ahw.port_type == NETXEN_NIC_GBE) {
+                max_rcv_desc = MAX_RCV_DESCRIPTORS_1G;
+                max_jumbo_desc = MAX_JUMBO_RCV_DESCRIPTORS_10G;
+        }
+        num_rxd = netxen_validate_ringparam(ring->rx_pending,
+                        MIN_RCV_DESCRIPTORS, max_rcv_desc, "rx");
+        num_jumbo_rxd = netxen_validate_ringparam(ring->rx_jumbo_pending,
+                        MIN_JUMBO_DESCRIPTORS, max_jumbo_desc, "rx jumbo");
+        num_txd = netxen_validate_ringparam(ring->tx_pending,
+                        MIN_CMD_DESCRIPTORS, MAX_CMD_DESCRIPTORS, "tx");
+        if (num_rxd == adapter->num_rxd && num_txd == adapter->num_txd &&
+                        num_jumbo_rxd == adapter->num_jumbo_rxd)
+                return 0;
+        adapter->num_rxd = num_rxd;
+        adapter->num_jumbo_rxd = num_jumbo_rxd;
+        adapter->num_txd = num_txd;
+        return netxen_nic_reset_context(adapter);
+}
 static void
 netxen_nic_get_pauseparam(struct net_device *dev,
                          struct ethtool_pauseparam *pause)
@@ -893,6 +951,7 @@ struct ethtool_ops netxen_nic_ethtool_ops = {
        .get_eeprom_len = netxen_nic_get_eeprom_len,
        .get_eeprom = netxen_nic_get_eeprom,
        .get_ringparam = netxen_nic_get_ringparam,
+        .set_ringparam = netxen_nic_set_ringparam,
        .get_pauseparam = netxen_nic_get_pauseparam,
        .set_pauseparam = netxen_nic_set_pauseparam,
        .set_tx_csum = ethtool_op_set_tx_csum,
diff --git a/drivers/net/netxen/netxen_nic_hdr.h b/drivers/net/netxen/netxen_nic_hdr.h
index 824103675648..a7328584a21a 100644
--- a/drivers/net/netxen/netxen_nic_hdr.h
+++ b/drivers/net/netxen/netxen_nic_hdr.h
@@ -852,7 +852,7 @@ enum {
 #define NX_PEG_TUNE_MN_PRESENT          0x1
 #define NX_PEG_TUNE_CAPABILITY          (NETXEN_CAM_RAM(0x02c))
-#define NETXEN_CAM_RAM_DMA_WATCHDOG_CTRL                (0x14)
+#define NETXEN_DMA_WATCHDOG_CTRL        (NETXEN_CAM_RAM(0x14))
 #define NETXEN_PEG_ALIVE_COUNTER        (NETXEN_CAM_RAM(0xb0))
 #define ISR_MSI_INT_TRIGGER(FUNC) (NETXEN_PCIX_PS_REG(PCIX_MSI_F(FUNC)))
diff --git a/drivers/net/netxen/netxen_nic_hw.c b/drivers/net/netxen/netxen_nic_hw.c
index b9123d445c96..ddb9deb12b33 100644
--- a/drivers/net/netxen/netxen_nic_hw.c
+++ b/drivers/net/netxen/netxen_nic_hw.c
@@ -706,6 +706,30 @@ int netxen_config_rss(struct netxen_adapter *adapter, int enable)
        return rv;
 }
+int netxen_config_ipaddr(struct netxen_adapter *adapter, u32 ip, int cmd)
+{
+        nx_nic_req_t req;
+        u64 word;
+        int rv;
+        memset(&req, 0, sizeof(nx_nic_req_t));
+        req.qhdr = cpu_to_le64(NX_HOST_REQUEST << 23);
+        word = NX_NIC_H2C_OPCODE_CONFIG_IPADDR | ((u64)adapter->portnum << 16);
+        req.req_hdr = cpu_to_le64(word);
+        req.words[0] = cpu_to_le64(cmd);
+        req.words[1] = cpu_to_le64(ip);
+        rv = netxen_send_cmd_descs(adapter, (struct cmd_desc_type0 *)&req, 1);
+        if (rv != 0) {
+                printk(KERN_ERR "%s: could not notify %s IP 0x%x reuqest\n",
+                                adapter->netdev->name,
+                                (cmd == NX_IP_UP) ? "Add" : "Remove", ip);
+        }
+        return rv;
+}
 int netxen_linkevent_request(struct netxen_adapter *adapter, int enable)
 {
        nx_nic_req_t req;
@@ -2021,7 +2045,6 @@ void netxen_nic_get_firmware_info(struct netxen_adapter *adapter)
        fw_minor = NXRD32(adapter, NETXEN_FW_VERSION_MINOR);
        fw_build = NXRD32(adapter, NETXEN_FW_VERSION_SUB);
-        adapter->fw_major = fw_major;
        adapter->fw_version = NETXEN_VERSION_CODE(fw_major, fw_minor, fw_build);
        if (adapter->portnum == 0) {
@@ -2047,6 +2070,9 @@ void netxen_nic_get_firmware_info(struct netxen_adapter *adapter)
                dev_info(&pdev->dev, "firmware running in %s mode\n",
                adapter->ahw.cut_through ? "cut-through" : "legacy");
        }
+        if (adapter->fw_version >= NETXEN_VERSION_CODE(4, 0, 222))
+                adapter->capabilities = NXRD32(adapter, CRB_FW_CAPABILITIES_1);
 }
 int
diff --git a/drivers/net/netxen/netxen_nic_init.c b/drivers/net/netxen/netxen_nic_init.c
index 5d3343ef3d86..81253abbfa34 100644
--- a/drivers/net/netxen/netxen_nic_init.c
+++ b/drivers/net/netxen/netxen_nic_init.c
@@ -184,6 +184,13 @@ void netxen_free_sw_resources(struct netxen_adapter *adapter)
        kfree(recv_ctx->rds_rings);
 skip_rds:
+        if (recv_ctx->sds_rings == NULL)
+                goto skip_sds;
+        for(ring = 0; ring < adapter->max_sds_rings; ring++)
+                recv_ctx->sds_rings[ring].consumer = 0;
+skip_sds:
        if (adapter->tx_ring == NULL)
                return;
@@ -247,9 +254,14 @@ int netxen_alloc_sw_resources(struct netxen_adapter *adapter)
                                rds_ring->skb_size =
                                        NX_CT_DEFAULT_RX_BUF_LEN;
                        } else {
-                                rds_ring->dma_size = RX_DMA_MAP_LEN;
+                                if (NX_IS_REVISION_P3(adapter->ahw.revision_id))
+                                        rds_ring->dma_size =
+                                                NX_P3_RX_BUF_MAX_LEN;
+                                else
+                                        rds_ring->dma_size =
+                                                NX_P2_RX_BUF_MAX_LEN;
                                rds_ring->skb_size =
-                                        MAX_RX_BUFFER_LENGTH;
+                                        rds_ring->dma_size + NET_IP_ALIGN;
                        }
                        break;
@@ -267,8 +279,8 @@ int netxen_alloc_sw_resources(struct netxen_adapter *adapter)
                case RCV_RING_LRO:
                        rds_ring->num_desc = adapter->num_lro_rxd;
-                        rds_ring->dma_size = RX_LRO_DMA_MAP_LEN;
+                        rds_ring->dma_size = NX_RX_LRO_BUFFER_LENGTH;
-                        rds_ring->skb_size = MAX_RX_LRO_BUFFER_LENGTH;
+                        rds_ring->skb_size = rds_ring->dma_size + NET_IP_ALIGN;
                        break;
                }
@@ -880,22 +892,10 @@ netxen_validate_firmware(struct netxen_adapter *adapter, const char *fwname)
        return 0;
 }
-void netxen_request_firmware(struct netxen_adapter *adapter)
+static int
+netxen_p3_has_mn(struct netxen_adapter *adapter)
 {
        u32 capability, flashed_ver;
-        u8 fw_type;
-        struct pci_dev *pdev = adapter->pdev;
-        int rc = 0;
-        if (NX_IS_REVISION_P2(adapter->ahw.revision_id)) {
-                fw_type = NX_P2_MN_ROMIMAGE;
-                goto request_fw;
-        } else {
-                fw_type = NX_P3_CT_ROMIMAGE;
-                goto request_fw;
-        }
-request_mn:
        capability = 0;
        netxen_rom_fast_read(adapter,
@@ -903,23 +903,35 @@ request_mn:
        flashed_ver = NETXEN_DECODE_VERSION(flashed_ver);
        if (flashed_ver >= NETXEN_VERSION_CODE(4, 0, 220)) {
                capability = NXRD32(adapter, NX_PEG_TUNE_CAPABILITY);
-                if (capability & NX_PEG_TUNE_MN_PRESENT) {
+                if (capability & NX_PEG_TUNE_MN_PRESENT)
-                        fw_type = NX_P3_MN_ROMIMAGE;
+                        return 1;
-                        goto request_fw;
-                }
        }
+        return 0;
+}
-        fw_type = NX_FLASH_ROMIMAGE;
+void netxen_request_firmware(struct netxen_adapter *adapter)
-        adapter->fw = NULL;
+{
-        goto done;
+        u8 fw_type;
+        struct pci_dev *pdev = adapter->pdev;
+        int rc = 0;
+        if (NX_IS_REVISION_P2(adapter->ahw.revision_id)) {
+                fw_type = NX_P2_MN_ROMIMAGE;
+                goto request_fw;
+        }
+        fw_type = netxen_p3_has_mn(adapter) ?
+                NX_P3_MN_ROMIMAGE : NX_P3_CT_ROMIMAGE;
 request_fw:
        rc = request_firmware(&adapter->fw, fw_name[fw_type], &pdev->dev);
        if (rc != 0) {
-                if (fw_type == NX_P3_CT_ROMIMAGE) {
+                if (fw_type == NX_P3_MN_ROMIMAGE) {
                        msleep(1);
-                        goto request_mn;
+                        fw_type = NX_P3_CT_ROMIMAGE;
+                        goto request_fw;
                }
                fw_type = NX_FLASH_ROMIMAGE;
@@ -931,9 +943,10 @@ request_fw:
        if (rc != 0) {
                release_firmware(adapter->fw);
-                if (fw_type == NX_P3_CT_ROMIMAGE) {
+                if (fw_type == NX_P3_MN_ROMIMAGE) {
                        msleep(1);
-                        goto request_mn;
+                        fw_type = NX_P3_CT_ROMIMAGE;
+                        goto request_fw;
                }
                fw_type = NX_FLASH_ROMIMAGE;
@@ -953,19 +966,20 @@ netxen_release_firmware(struct netxen_adapter *adapter)
                release_firmware(adapter->fw);
 }
-int netxen_initialize_adapter_offload(struct netxen_adapter *adapter)
+int netxen_init_dummy_dma(struct netxen_adapter *adapter)
 {
-        uint64_t addr;
+        u64 addr;
-        uint32_t hi;
+        u32 hi, lo;
-        uint32_t lo;
+        if (!NX_IS_REVISION_P2(adapter->ahw.revision_id))
+                return 0;
-        adapter->dummy_dma.addr =
+        adapter->dummy_dma.addr = pci_alloc_consistent(adapter->pdev,
-            pci_alloc_consistent(adapter->pdev,
                                 NETXEN_HOST_DUMMY_DMA_SIZE,
                                 &adapter->dummy_dma.phys_addr);
        if (adapter->dummy_dma.addr == NULL) {
-                printk("%s: ERROR: Could not allocate dummy DMA memory\n",
+                dev_err(&adapter->pdev->dev,
-                       __func__);
+                        "ERROR: Could not allocate dummy DMA memory\n");
                return -ENOMEM;
        }
@@ -976,29 +990,41 @@ int netxen_initialize_adapter_offload(struct netxen_adapter *adapter)
        NXWR32(adapter, CRB_HOST_DUMMY_BUF_ADDR_HI, hi);
        NXWR32(adapter, CRB_HOST_DUMMY_BUF_ADDR_LO, lo);
-        if (NX_IS_REVISION_P3(adapter->ahw.revision_id)) {
-                uint32_t temp = 0;
-                NXWR32(adapter, CRB_HOST_DUMMY_BUF, temp);
-        }
        return 0;
 }
-void netxen_free_adapter_offload(struct netxen_adapter *adapter)
+/*
+ * NetXen DMA watchdog control:
+ *
+ *      Bit 0           : enabled => R/O: 1 watchdog active, 0 inactive
+ *      Bit 1           : disable_request => 1 req disable dma watchdog
+ *      Bit 2           : enable_request =>  1 req enable dma watchdog
+ *      Bit 3-31        : unused
+ */
+void netxen_free_dummy_dma(struct netxen_adapter *adapter)
 {
        int i = 100;
+        u32 ctrl;
+        if (!NX_IS_REVISION_P2(adapter->ahw.revision_id))
+                return;
        if (!adapter->dummy_dma.addr)
                return;
-        if (NX_IS_REVISION_P2(adapter->ahw.revision_id)) {
+        ctrl = NXRD32(adapter, NETXEN_DMA_WATCHDOG_CTRL);
-                do {
+        if ((ctrl & 0x1) != 0) {
-                        if (dma_watchdog_shutdown_request(adapter) == 1)
+                NXWR32(adapter, NETXEN_DMA_WATCHDOG_CTRL, (ctrl | 0x2));
-                                break;
+                while ((ctrl & 0x1) != 0) {
                        msleep(50);
-                        if (dma_watchdog_shutdown_poll_result(adapter) == 1)
+                        ctrl = NXRD32(adapter, NETXEN_DMA_WATCHDOG_CTRL);
+                        if (--i == 0)
                                break;
-                } while (--i);
+                };
        }
        if (i) {
@@ -1007,10 +1033,8 @@ void netxen_free_adapter_offload(struct netxen_adapter *adapter)
                            adapter->dummy_dma.addr,
                            adapter->dummy_dma.phys_addr);
                adapter->dummy_dma.addr = NULL;
-        } else {
+        } else
-                printk(KERN_ERR "%s: dma_watchdog_shutdown failed\n",
+                dev_err(&adapter->pdev->dev, "dma_watchdog_shutdown failed\n");
-                                adapter->netdev->name);
-        }
 }
 int netxen_phantom_init(struct netxen_adapter *adapter, int pegtune_val)
@@ -1083,10 +1107,6 @@ int netxen_init_firmware(struct netxen_adapter *adapter)
        NXWR32(adapter, CRB_MPORT_MODE, MPORT_MULTI_FUNCTION_MODE);
        NXWR32(adapter, CRB_CMDPEG_STATE, PHAN_INITIALIZE_ACK);
-        if (adapter->fw_version >= NETXEN_VERSION_CODE(4, 0, 222)) {
-                adapter->capabilities = NXRD32(adapter, CRB_FW_CAPABILITIES_1);
-        }
        return err;
 }
@@ -1296,6 +1316,7 @@ netxen_process_rcv_ring(struct nx_host_sds_ring *sds_ring, int max)
                switch (opcode) {
                case NETXEN_NIC_RXPKT_DESC:
                case NETXEN_OLD_RXPKT_DESC:
+                case NETXEN_NIC_SYN_OFFLOAD:
                        break;
                case NETXEN_NIC_RESPONSE_DESC:
                        netxen_handle_fw_message(desc_cnt, consumer, sds_ring);
@@ -1468,7 +1489,7 @@ netxen_post_rx_buffers(struct netxen_adapter *adapter, u32 ringid,
                NXWR32(adapter, rds_ring->crb_rcv_producer,
                                (producer-1) & (rds_ring->num_desc-1));
-                if (adapter->fw_major < 4) {
+                if (NX_IS_REVISION_P2(adapter->ahw.revision_id)) {
                        /*
                         * Write a doorbell msg to tell phanmon of change in
                         * receive ring producer
diff --git a/drivers/net/netxen/netxen_nic_main.c b/drivers/net/netxen/netxen_nic_main.c
index 637ac8b89bac..40549a0e9ff0 100644
--- a/drivers/net/netxen/netxen_nic_main.c
+++ b/drivers/net/netxen/netxen_nic_main.c
@@ -39,6 +39,7 @@
 #include <linux/if_vlan.h>
 #include <net/ip.h>
 #include <linux/ipv6.h>
+#include <linux/inetdevice.h>
 MODULE_DESCRIPTION("NetXen Multi port (1/10) Gigabit Network Driver");
 MODULE_LICENSE("GPL");
@@ -65,7 +66,7 @@ static int netxen_nic_open(struct net_device *netdev);
 static int netxen_nic_close(struct net_device *netdev);
 static int netxen_nic_xmit_frame(struct sk_buff *, struct net_device *);
 static void netxen_tx_timeout(struct net_device *netdev);
-static void netxen_tx_timeout_task(struct work_struct *work);
+static void netxen_reset_task(struct work_struct *work);
 static void netxen_watchdog(unsigned long);
 static int netxen_nic_poll(struct napi_struct *napi, int budget);
 #ifdef CONFIG_NET_POLL_CONTROLLER
@@ -181,7 +182,7 @@ netxen_napi_add(struct netxen_adapter *adapter, struct net_device *netdev)
        struct netxen_recv_context *recv_ctx = &adapter->recv_ctx;
        if (netxen_alloc_sds_rings(recv_ctx, adapter->max_sds_rings))
-                return 1;
+                return -ENOMEM;
        for (ring = 0; ring < adapter->max_sds_rings; ring++) {
                sds_ring = &recv_ctx->sds_rings[ring];
@@ -282,12 +283,16 @@ nx_update_dma_mask(struct netxen_adapter *adapter)
        return 0;
 }
-static void netxen_check_options(struct netxen_adapter *adapter)
+static void
+netxen_check_options(struct netxen_adapter *adapter)
 {
-        if (adapter->ahw.port_type == NETXEN_NIC_XGBE)
+        if (adapter->ahw.port_type == NETXEN_NIC_XGBE) {
-                adapter->num_rxd = MAX_RCV_DESCRIPTORS_10G;
+                adapter->num_rxd = DEFAULT_RCV_DESCRIPTORS_10G;
-        else if (adapter->ahw.port_type == NETXEN_NIC_GBE)
+                adapter->num_jumbo_rxd = MAX_JUMBO_RCV_DESCRIPTORS_10G;
-                adapter->num_rxd = MAX_RCV_DESCRIPTORS_1G;
+        } else if (adapter->ahw.port_type == NETXEN_NIC_GBE) {
+                adapter->num_rxd = DEFAULT_RCV_DESCRIPTORS_1G;
+                adapter->num_jumbo_rxd = MAX_JUMBO_RCV_DESCRIPTORS_1G;
+        }
        adapter->msix_supported = 0;
        if (NX_IS_REVISION_P3(adapter->ahw.revision_id)) {
@@ -305,11 +310,15 @@ static void netxen_check_options(struct netxen_adapter *adapter)
                }
        }
-        adapter->num_txd = MAX_CMD_DESCRIPTORS_HOST;
+        adapter->num_txd = MAX_CMD_DESCRIPTORS;
-        adapter->num_jumbo_rxd = MAX_JUMBO_RCV_DESCRIPTORS;
-        adapter->num_lro_rxd = MAX_LRO_RCV_DESCRIPTORS;
-        return;
+        if (NX_IS_REVISION_P2(adapter->ahw.revision_id)) {
+                adapter->num_lro_rxd = MAX_LRO_RCV_DESCRIPTORS;
+                adapter->max_rds_rings = 3;
+        } else {
+                adapter->num_lro_rxd = 0;
+                adapter->max_rds_rings = 2;
+        }
 }
 static int
@@ -744,7 +753,7 @@ netxen_start_firmware(struct netxen_adapter *adapter, int request_fw)
        }
-        err = netxen_initialize_adapter_offload(adapter);
+        err = netxen_init_dummy_dma(adapter);
        if (err)
                return err;
@@ -760,10 +769,14 @@ wait_init:
        /* Handshake with the card before we register the devices. */
        err = netxen_phantom_init(adapter, NETXEN_NIC_PEG_TUNE);
        if (err) {
-                netxen_free_adapter_offload(adapter);
+                netxen_free_dummy_dma(adapter);
                return err;
        }
+        nx_update_dma_mask(adapter);
+        netxen_nic_get_firmware_info(adapter);
        return 0;
 }
@@ -814,6 +827,20 @@ netxen_nic_free_irq(struct netxen_adapter *adapter)
        }
 }
+static void
+netxen_nic_init_coalesce_defaults(struct netxen_adapter *adapter)
+{
+        adapter->coal.flags = NETXEN_NIC_INTR_DEFAULT;
+        adapter->coal.normal.data.rx_time_us =
+                NETXEN_DEFAULT_INTR_COALESCE_RX_TIME_US;
+        adapter->coal.normal.data.rx_packets =
+                NETXEN_DEFAULT_INTR_COALESCE_RX_PACKETS;
+        adapter->coal.normal.data.tx_time_us =
+                NETXEN_DEFAULT_INTR_COALESCE_TX_TIME_US;
+        adapter->coal.normal.data.tx_packets =
+                NETXEN_DEFAULT_INTR_COALESCE_TX_PACKETS;
+}
 static int
 netxen_nic_up(struct netxen_adapter *adapter, struct net_device *netdev)
 {
@@ -836,6 +863,9 @@ netxen_nic_up(struct netxen_adapter *adapter, struct net_device *netdev)
        if (adapter->max_sds_rings > 1)
                netxen_config_rss(adapter, 1);
+        if (NX_IS_REVISION_P3(adapter->ahw.revision_id))
+                netxen_config_intr_coalesce(adapter);
        netxen_napi_enable(adapter);
        if (adapter->capabilities & NX_FW_CAPABILITY_LINK_NOTIFICATION)
@@ -880,17 +910,15 @@ netxen_nic_attach(struct netxen_adapter *adapter)
        struct nx_host_rds_ring *rds_ring;
        struct nx_host_tx_ring *tx_ring;
+        if (adapter->is_up == NETXEN_ADAPTER_UP_MAGIC)
+                return 0;
        err = netxen_init_firmware(adapter);
        if (err != 0) {
                printk(KERN_ERR "Failed to init firmware\n");
                return -EIO;
        }
-        if (adapter->fw_major < 4)
-                adapter->max_rds_rings = 3;
-        else
-                adapter->max_rds_rings = 2;
        err = netxen_alloc_sw_resources(adapter);
        if (err) {
                printk(KERN_ERR "%s: Error in setting sw resources\n",
@@ -907,7 +935,7 @@ netxen_nic_attach(struct netxen_adapter *adapter)
                goto err_out_free_sw;
        }
-        if (adapter->fw_major < 4) {
+        if (NX_IS_REVISION_P2(adapter->ahw.revision_id)) {
                tx_ring = adapter->tx_ring;
                tx_ring->crb_cmd_producer = crb_cmd_producer[adapter->portnum];
                tx_ring->crb_cmd_consumer = crb_cmd_consumer[adapter->portnum];
@@ -931,6 +959,9 @@ netxen_nic_attach(struct netxen_adapter *adapter)
                goto err_out_free_rxbuf;
        }
+        if (NX_IS_REVISION_P3(adapter->ahw.revision_id))
+                netxen_nic_init_coalesce_defaults(adapter);
        adapter->is_up = NETXEN_ADAPTER_UP_MAGIC;
        return 0;
@@ -945,6 +976,9 @@ err_out_free_sw:
 static void
 netxen_nic_detach(struct netxen_adapter *adapter)
 {
+        if (adapter->is_up != NETXEN_ADAPTER_UP_MAGIC)
+                return;
        netxen_free_hw_resources(adapter);
        netxen_release_rx_buffers(adapter);
        netxen_nic_free_irq(adapter);
@@ -953,6 +987,95 @@ netxen_nic_detach(struct netxen_adapter *adapter)
        adapter->is_up = 0;
 }
+int
+netxen_nic_reset_context(struct netxen_adapter *adapter)
+{
+        int err = 0;
+        struct net_device *netdev = adapter->netdev;
+        if (adapter->is_up == NETXEN_ADAPTER_UP_MAGIC) {
+                if (netif_running(netdev))
+                        netxen_nic_down(adapter, netdev);
+                netxen_nic_detach(adapter);
+                err = netxen_nic_attach(adapter);
+                if (err)
+                        goto done;
+                if (netif_running(netdev))
+                        err = netxen_nic_up(adapter, netdev);
+        }
+done:
+        return err;
+}
+static int
+netxen_setup_netdev(struct netxen_adapter *adapter,
+                struct net_device *netdev)
+{
+        int err = 0;
+        struct pci_dev *pdev = adapter->pdev;
+        adapter->rx_csum = 1;
+        adapter->mc_enabled = 0;
+        if (NX_IS_REVISION_P3(adapter->ahw.revision_id))
+                adapter->max_mc_count = 38;
+        else
+                adapter->max_mc_count = 16;
+        netdev->netdev_ops         = &netxen_netdev_ops;
+        netdev->watchdog_timeo     = 2*HZ;
+        netxen_nic_change_mtu(netdev, netdev->mtu);
+        SET_ETHTOOL_OPS(netdev, &netxen_nic_ethtool_ops);
+        netdev->features |= (NETIF_F_SG | NETIF_F_IP_CSUM | NETIF_F_TSO);
+        netdev->features |= (NETIF_F_GRO);
+        netdev->vlan_features |= (NETIF_F_SG | NETIF_F_IP_CSUM | NETIF_F_TSO);
+        if (NX_IS_REVISION_P3(adapter->ahw.revision_id)) {
+                netdev->features |= (NETIF_F_IPV6_CSUM | NETIF_F_TSO6);
+                netdev->vlan_features |= (NETIF_F_IPV6_CSUM | NETIF_F_TSO6);
+        }
+        if (adapter->pci_using_dac) {
+                netdev->features |= NETIF_F_HIGHDMA;
+                netdev->vlan_features |= NETIF_F_HIGHDMA;
+        }
+        if (adapter->capabilities & NX_FW_CAPABILITY_FVLANTX)
+                netdev->features |= (NETIF_F_HW_VLAN_TX);
+        netdev->irq = adapter->msix_entries[0].vector;
+        err = netxen_napi_add(adapter, netdev);
+        if (err)
+                return err;
+        init_timer(&adapter->watchdog_timer);
+        adapter->watchdog_timer.function = &netxen_watchdog;
+        adapter->watchdog_timer.data = (unsigned long)adapter;
+        INIT_WORK(&adapter->watchdog_task, netxen_watchdog_task);
+        INIT_WORK(&adapter->tx_timeout_task, netxen_reset_task);
+        if (netxen_read_mac_addr(adapter))
+                dev_warn(&pdev->dev, "failed to read mac addr\n");
+        netif_carrier_off(netdev);
+        netif_stop_queue(netdev);
+        err = register_netdev(netdev);
+        if (err) {
+                dev_err(&pdev->dev, "failed to register net device\n");
+                return err;
+        }
+        return 0;
+}
 static int __devinit
 netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 {
@@ -990,9 +1113,8 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
        netdev = alloc_etherdev(sizeof(struct netxen_adapter));
        if(!netdev) {
-                printk(KERN_ERR"%s: Failed to allocate memory for the "
+                dev_err(&pdev->dev, "failed to allocate net_device\n");
-                                "device block.Check system memory resource"
+                err = -ENOMEM;
-                                " usage.\n", netxen_nic_driver_name);
                goto err_out_free_res;
        }
@@ -1020,38 +1142,10 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
        /* This will be reset for mezz cards  */
        adapter->portnum = pci_func_id;
-        adapter->rx_csum = 1;
-        adapter->mc_enabled = 0;
-        if (NX_IS_REVISION_P3(revision_id))
-                adapter->max_mc_count = 38;
-        else
-                adapter->max_mc_count = 16;
-        netdev->netdev_ops         = &netxen_netdev_ops;
-        netdev->watchdog_timeo     = 2*HZ;
-        netxen_nic_change_mtu(netdev, netdev->mtu);
-        SET_ETHTOOL_OPS(netdev, &netxen_nic_ethtool_ops);
+        err = netxen_nic_get_board_info(adapter);
+        if (err) {
-        netdev->features |= (NETIF_F_SG | NETIF_F_IP_CSUM | NETIF_F_TSO);
+                dev_err(&pdev->dev, "Error getting board config info.\n");
-        netdev->features |= (NETIF_F_GRO);
-        netdev->vlan_features |= (NETIF_F_SG | NETIF_F_IP_CSUM | NETIF_F_TSO);
-        if (NX_IS_REVISION_P3(revision_id)) {
-                netdev->features |= (NETIF_F_IPV6_CSUM | NETIF_F_TSO6);
-                netdev->vlan_features |= (NETIF_F_IPV6_CSUM | NETIF_F_TSO6);
-        }
-        if (adapter->pci_using_dac) {
-                netdev->features |= NETIF_F_HIGHDMA;
-                netdev->vlan_features |= NETIF_F_HIGHDMA;
-        }
-        if (netxen_nic_get_board_info(adapter) != 0) {
-                printk("%s: Error getting board config info.\n",
-                                netxen_nic_driver_name);
-                err = -EIO;
                goto err_out_iounmap;
        }
@@ -1072,15 +1166,11 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
        if (err)
                goto err_out_iounmap;
-        nx_update_dma_mask(adapter);
-        netxen_nic_get_firmware_info(adapter);
        /*
         * See if the firmware gave us a virtual-physical port mapping.
         */
        adapter->physical_port = adapter->portnum;
-        if (adapter->fw_major < 4) {
+        if (NX_IS_REVISION_P2(adapter->ahw.revision_id)) {
                i = NXRD32(adapter, CRB_V2P(adapter->portnum));
                if (i != 0x55555555)
                        adapter->physical_port = i;
@@ -1090,31 +1180,9 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
        netxen_setup_intr(adapter);
-        netdev->irq = adapter->msix_entries[0].vector;
+        err = netxen_setup_netdev(adapter, netdev);
-        if (netxen_napi_add(adapter, netdev))
-                goto err_out_disable_msi;
-        init_timer(&adapter->watchdog_timer);
-        adapter->watchdog_timer.function = &netxen_watchdog;
-        adapter->watchdog_timer.data = (unsigned long)adapter;
-        INIT_WORK(&adapter->watchdog_task, netxen_watchdog_task);
-        INIT_WORK(&adapter->tx_timeout_task, netxen_tx_timeout_task);
-        err = netxen_read_mac_addr(adapter);
        if (err)
-                dev_warn(&pdev->dev, "failed to read mac addr\n");
-        netif_carrier_off(netdev);
-        netif_stop_queue(netdev);
-        if ((err = register_netdev(netdev))) {
-                printk(KERN_ERR "%s: register_netdev failed port #%d"
-                               " aborting\n", netxen_nic_driver_name,
-                               adapter->portnum);
-                err = -EIO;
                goto err_out_disable_msi;
-        }
        pci_set_drvdata(pdev, adapter);
@@ -1134,7 +1202,7 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 err_out_disable_msi:
        netxen_teardown_intr(adapter);
-        netxen_free_adapter_offload(adapter);
+        netxen_free_dummy_dma(adapter);
 err_out_iounmap:
        netxen_cleanup_pci_map(adapter);
@@ -1164,12 +1232,10 @@ static void __devexit netxen_nic_remove(struct pci_dev *pdev)
        unregister_netdev(netdev);
-        if (adapter->is_up == NETXEN_ADAPTER_UP_MAGIC) {
+        netxen_nic_detach(adapter);
-                netxen_nic_detach(adapter);
-        }
        if (adapter->portnum == 0)
-                netxen_free_adapter_offload(adapter);
+                netxen_free_dummy_dma(adapter);
        netxen_teardown_intr(adapter);
        netxen_free_sds_rings(&adapter->recv_ctx);
@@ -1198,8 +1264,7 @@ netxen_nic_suspend(struct pci_dev *pdev, pm_message_t state)
        if (netif_running(netdev))
                netxen_nic_down(adapter, netdev);
-        if (adapter->is_up == NETXEN_ADAPTER_UP_MAGIC)
+        netxen_nic_detach(adapter);
-                netxen_nic_detach(adapter);
        pci_save_state(pdev);
@@ -1260,11 +1325,9 @@ static int netxen_nic_open(struct net_device *netdev)
        if (adapter->driver_mismatch)
                return -EIO;
-        if (adapter->is_up != NETXEN_ADAPTER_UP_MAGIC) {
+        err = netxen_nic_attach(adapter);
-                err = netxen_nic_attach(adapter);
+        if (err)
-                if (err)
+                return err;
-                        return err;
-        }
        err = netxen_nic_up(adapter, netdev);
        if (err)
@@ -1290,30 +1353,52 @@ static int netxen_nic_close(struct net_device *netdev)
        return 0;
 }
-static bool netxen_tso_check(struct net_device *netdev,
+static void
-                      struct cmd_desc_type0 *desc, struct sk_buff *skb)
+netxen_tso_check(struct net_device *netdev,
+                struct nx_host_tx_ring *tx_ring,
+                struct cmd_desc_type0 *first_desc,
+                struct sk_buff *skb)
 {
-        bool tso = false;
        u8 opcode = TX_ETHER_PKT;
        __be16 protocol = skb->protocol;
-        u16 flags = 0;
+        u16 flags = 0, vid = 0;
+        u32 producer;
+        int copied, offset, copy_len, hdr_len = 0, tso = 0, vlan_oob = 0;
+        struct cmd_desc_type0 *hwdesc;
+        struct vlan_ethhdr *vh;
        if (protocol == cpu_to_be16(ETH_P_8021Q)) {
-                struct vlan_ethhdr *vh = (struct vlan_ethhdr *)skb->data;
+                vh = (struct vlan_ethhdr *)skb->data;
                protocol = vh->h_vlan_encapsulated_proto;
                flags = FLAGS_VLAN_TAGGED;
+        } else if (vlan_tx_tag_present(skb)) {
+                flags = FLAGS_VLAN_OOB;
+                vid = vlan_tx_tag_get(skb);
+                netxen_set_tx_vlan_tci(first_desc, vid);
+                vlan_oob = 1;
        }
        if ((netdev->features & (NETIF_F_TSO | NETIF_F_TSO6)) &&
                        skb_shinfo(skb)->gso_size > 0) {
-                desc->mss = cpu_to_le16(skb_shinfo(skb)->gso_size);
+                hdr_len = skb_transport_offset(skb) + tcp_hdrlen(skb);
-                desc->total_hdr_length =
-                        skb_transport_offset(skb) + tcp_hdrlen(skb);
+                first_desc->mss = cpu_to_le16(skb_shinfo(skb)->gso_size);
+                first_desc->total_hdr_length = hdr_len;
+                if (vlan_oob) {
+                        first_desc->total_hdr_length += VLAN_HLEN;
+                        first_desc->tcp_hdr_offset = VLAN_HLEN;
+                        first_desc->ip_hdr_offset = VLAN_HLEN;
+                        /* Only in case of TSO on vlan device */
+                        flags |= FLAGS_VLAN_TAGGED;
+                }
                opcode = (protocol == cpu_to_be16(ETH_P_IPV6)) ?
                                TX_TCP_LSO6 : TX_TCP_LSO;
-                tso = true;
+                tso = 1;
        } else if (skb->ip_summed == CHECKSUM_PARTIAL) {
                u8 l4proto;
@@ -1334,10 +1419,62 @@ static bool netxen_tso_check(struct net_device *netdev,
                                opcode = TX_UDPV6_PKT;
                }
        }
-        desc->tcp_hdr_offset = skb_transport_offset(skb);
-        desc->ip_hdr_offset = skb_network_offset(skb);
+        first_desc->tcp_hdr_offset += skb_transport_offset(skb);
-        netxen_set_tx_flags_opcode(desc, flags, opcode);
+        first_desc->ip_hdr_offset += skb_network_offset(skb);
-        return tso;
+        netxen_set_tx_flags_opcode(first_desc, flags, opcode);
+        if (!tso)
+                return;
+        /* For LSO, we need to copy the MAC/IP/TCP headers into
+         * the descriptor ring
+         */
+        producer = tx_ring->producer;
+        copied = 0;
+        offset = 2;
+        if (vlan_oob) {
+                /* Create a TSO vlan header template for firmware */
+                hwdesc = &tx_ring->desc_head[producer];
+                tx_ring->cmd_buf_arr[producer].skb = NULL;
+                copy_len = min((int)sizeof(struct cmd_desc_type0) - offset,
+                                hdr_len + VLAN_HLEN);
+                vh = (struct vlan_ethhdr *)((char *)hwdesc + 2);
+                skb_copy_from_linear_data(skb, vh, 12);
+                vh->h_vlan_proto = htons(ETH_P_8021Q);
+                vh->h_vlan_TCI = htons(vid);
+                skb_copy_from_linear_data_offset(skb, 12,
+                                (char *)vh + 16, copy_len - 16);
+                copied = copy_len;
+                offset = 0;
+                producer = get_next_index(producer, tx_ring->num_desc);
+        }
+        while (copied < hdr_len) {
+                copy_len = min((int)sizeof(struct cmd_desc_type0) - offset,
+                                (hdr_len - copied));
+                hwdesc = &tx_ring->desc_head[producer];
+                tx_ring->cmd_buf_arr[producer].skb = NULL;
+                skb_copy_from_linear_data_offset(skb, copied,
+                                 (char *)hwdesc + offset, copy_len);
+                copied += copy_len;
+                offset = 0;
+                producer = get_next_index(producer, tx_ring->num_desc);
+        }
+        tx_ring->producer = producer;
+        barrier();
 }
 static void
@@ -1361,9 +1498,8 @@ netxen_clean_tx_dma_mapping(struct pci_dev *pdev,
 static inline void
 netxen_clear_cmddesc(u64 *desc)
 {
-        int i;
+        desc[0] = 0ULL;
-        for (i = 0; i < 8; i++)
+        desc[2] = 0ULL;
-                desc[i] = 0ULL;
 }
 static int
@@ -1371,18 +1507,18 @@ netxen_nic_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
 {
        struct netxen_adapter *adapter = netdev_priv(netdev);
        struct nx_host_tx_ring *tx_ring = adapter->tx_ring;
-        unsigned int first_seg_len = skb->len - skb->data_len;
+        struct skb_frag_struct *frag;
        struct netxen_cmd_buffer *pbuf;
        struct netxen_skb_frag *buffrag;
-        struct cmd_desc_type0 *hwdesc;
+        struct cmd_desc_type0 *hwdesc, *first_desc;
-        struct pci_dev *pdev = adapter->pdev;
+        struct pci_dev *pdev;
        dma_addr_t temp_dma;
        int i, k;
+        unsigned long offset;
        u32 producer;
-        int frag_count, no_of_desc;
+        int len, frag_count, no_of_desc;
        u32 num_txd = tx_ring->num_desc;
-        bool is_tso = false;
        frag_count = skb_shinfo(skb)->nr_frags + 1;
@@ -1396,32 +1532,30 @@ netxen_nic_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
        producer = tx_ring->producer;
-        hwdesc = &tx_ring->desc_head[producer];
+        pdev = adapter->pdev;
-        netxen_clear_cmddesc((u64 *)hwdesc);
+        len = skb->len - skb->data_len;
-        pbuf = &tx_ring->cmd_buf_arr[producer];
-        is_tso = netxen_tso_check(netdev, hwdesc, skb);
+        temp_dma = pci_map_single(pdev, skb->data, len, PCI_DMA_TODEVICE);
+        if (pci_dma_mapping_error(pdev, temp_dma))
+                goto drop_packet;
+        pbuf = &tx_ring->cmd_buf_arr[producer];
        pbuf->skb = skb;
        pbuf->frag_count = frag_count;
-        buffrag = &pbuf->frag_array[0];
-        temp_dma = pci_map_single(pdev, skb->data, first_seg_len,
-                                      PCI_DMA_TODEVICE);
-        if (pci_dma_mapping_error(pdev, temp_dma))
-                goto drop_packet;
+        buffrag = &pbuf->frag_array[0];
        buffrag->dma = temp_dma;
-        buffrag->length = first_seg_len;
+        buffrag->length = len;
+        first_desc = hwdesc = &tx_ring->desc_head[producer];
+        netxen_clear_cmddesc((u64 *)hwdesc);
        netxen_set_tx_frags_len(hwdesc, frag_count, skb->len);
        netxen_set_tx_port(hwdesc, adapter->portnum);
-        hwdesc->buffer_length[0] = cpu_to_le16(first_seg_len);
+        hwdesc->buffer_length[0] = cpu_to_le16(len);
-        hwdesc->addr_buffer1 = cpu_to_le64(buffrag->dma);
+        hwdesc->addr_buffer1 = cpu_to_le64(temp_dma);
        for (i = 1, k = 1; i < frag_count; i++, k++) {
-                struct skb_frag_struct *frag;
-                int len, temp_len;
-                unsigned long offset;
                /* move to next desc. if there is a need */
                if ((i & 0x3) == 0) {
@@ -1432,11 +1566,11 @@ netxen_nic_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
                        pbuf = &tx_ring->cmd_buf_arr[producer];
                        pbuf->skb = NULL;
                }
+                buffrag = &pbuf->frag_array[i];
                frag = &skb_shinfo(skb)->frags[i - 1];
                len = frag->size;
                offset = frag->page_offset;
-                temp_len = len;
                temp_dma = pci_map_page(pdev, frag->page, offset,
                                        len, PCI_DMA_TODEVICE);
                if (pci_dma_mapping_error(pdev, temp_dma)) {
@@ -1444,11 +1578,10 @@ netxen_nic_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
                        goto drop_packet;
                }
-                buffrag++;
                buffrag->dma = temp_dma;
-                buffrag->length = temp_len;
+                buffrag->length = len;
-                hwdesc->buffer_length[k] = cpu_to_le16(temp_len);
+                hwdesc->buffer_length[k] = cpu_to_le16(len);
                switch (k) {
                case 0:
                        hwdesc->addr_buffer1 = cpu_to_le64(temp_dma);
@@ -1463,53 +1596,14 @@ netxen_nic_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
                        hwdesc->addr_buffer4 = cpu_to_le64(temp_dma);
                        break;
                }
-                frag++;
-        }
-        producer = get_next_index(producer, num_txd);
-        /* For LSO, we need to copy the MAC/IP/TCP headers into
-         * the descriptor ring
-         */
-        if (is_tso) {
-                int hdr_len, first_hdr_len, more_hdr;
-                hdr_len = skb_transport_offset(skb) + tcp_hdrlen(skb);
-                if (hdr_len > (sizeof(struct cmd_desc_type0) - 2)) {
-                        first_hdr_len = sizeof(struct cmd_desc_type0) - 2;
-                        more_hdr = 1;
-                } else {
-                        first_hdr_len = hdr_len;
-                        more_hdr = 0;
-                }
-                /* copy the MAC/IP/TCP headers to the cmd descriptor list */
-                hwdesc = &tx_ring->desc_head[producer];
-                pbuf = &tx_ring->cmd_buf_arr[producer];
-                pbuf->skb = NULL;
-                /* copy the first 64 bytes */
-                memcpy(((void *)hwdesc) + 2,
-                       (void *)(skb->data), first_hdr_len);
-                producer = get_next_index(producer, num_txd);
-                if (more_hdr) {
-                        hwdesc = &tx_ring->desc_head[producer];
-                        pbuf = &tx_ring->cmd_buf_arr[producer];
-                        pbuf->skb = NULL;
-                        /* copy the next 64 bytes - should be enough except
-                         * for pathological case
-                         */
-                        skb_copy_from_linear_data_offset(skb, first_hdr_len,
-                                                         hwdesc,
-                                                         (hdr_len -
-                                                          first_hdr_len));
-                        producer = get_next_index(producer, num_txd);
-                }
        }
+        tx_ring->producer = get_next_index(producer, num_txd);
-        tx_ring->producer = producer;
+        netxen_tso_check(netdev, tx_ring, first_desc, skb);
-        adapter->stats.txbytes += skb->len;
        netxen_nic_update_cmd_producer(adapter, tx_ring);
+        adapter->stats.txbytes += skb->len;
        adapter->stats.xmitcalled++;
        return NETDEV_TX_OK;
@@ -1641,10 +1735,13 @@ static void netxen_tx_timeout(struct net_device *netdev)
 {
        struct netxen_adapter *adapter = (struct netxen_adapter *)
                                                netdev_priv(netdev);
+        dev_err(&netdev->dev, "transmit timeout, resetting.\n");
        SCHEDULE_WORK(&adapter->tx_timeout_task);
 }
-static void netxen_tx_timeout_task(struct work_struct *work)
+static void netxen_reset_task(struct work_struct *work)
 {
        struct netxen_adapter *adapter =
                container_of(work, struct netxen_adapter, tx_timeout_task);
@@ -1652,9 +1749,6 @@ static void netxen_tx_timeout_task(struct work_struct *work)
        if (!netif_running(adapter->netdev))
                return;
-        printk(KERN_ERR "%s %s: transmit timeout, resetting.\n",
-               netxen_nic_driver_name, adapter->netdev->name);
        netxen_napi_disable(adapter);
        adapter->netdev->trans_start = jiffies;
@@ -1712,7 +1806,7 @@ static irqreturn_t netxen_intr(int irq, void *data)
        }
        /* clear interrupt */
-        if (adapter->fw_major < 4)
+        if (NX_IS_REVISION_P2(adapter->ahw.revision_id))
                netxen_nic_disable_int(sds_ring);
        adapter->pci_write_immediate(adapter,
@@ -1781,6 +1875,128 @@ static void netxen_nic_poll_controller(struct net_device *netdev)
 }
 #endif
+#ifdef CONFIG_INET
+#define is_netxen_netdev(dev) (dev->netdev_ops == &netxen_netdev_ops)
+static int
+netxen_destip_supported(struct netxen_adapter *adapter)
+{
+        if (NX_IS_REVISION_P2(adapter->ahw.revision_id))
+                return 0;
+        if (adapter->ahw.cut_through)
+                return 0;
+        return 1;
+}
+static int netxen_netdev_event(struct notifier_block *this,
+                                 unsigned long event, void *ptr)
+{
+        struct netxen_adapter *adapter;
+        struct net_device *dev = (struct net_device *)ptr;
+        struct in_device *indev;
+recheck:
+        if (dev == NULL)
+                goto done;
+        if (dev->priv_flags & IFF_802_1Q_VLAN) {
+                dev = vlan_dev_real_dev(dev);
+                goto recheck;
+        }
+        if (!is_netxen_netdev(dev))
+                goto done;
+        adapter = netdev_priv(dev);
+        if (!adapter || !netxen_destip_supported(adapter))
+                goto done;
+        if (adapter->is_up != NETXEN_ADAPTER_UP_MAGIC)
+                goto done;
+        indev = in_dev_get(dev);
+        if (!indev)
+                goto done;
+        for_ifa(indev) {
+                switch (event) {
+                case NETDEV_UP:
+                        netxen_config_ipaddr(adapter,
+                                        ifa->ifa_address, NX_IP_UP);
+                        break;
+                case NETDEV_DOWN:
+                        netxen_config_ipaddr(adapter,
+                                        ifa->ifa_address, NX_IP_DOWN);
+                        break;
+                default:
+                        break;
+                }
+        } endfor_ifa(indev);
+        in_dev_put(indev);
+done:
+        return NOTIFY_DONE;
+}
+static int
+netxen_inetaddr_event(struct notifier_block *this,
+                unsigned long event, void *ptr)
+{
+        struct netxen_adapter *adapter;
+        struct net_device *dev;
+        struct in_ifaddr *ifa = (struct in_ifaddr *)ptr;
+        dev = ifa->ifa_dev ? ifa->ifa_dev->dev : NULL;
+recheck:
+        if (dev == NULL || !netif_running(dev))
+                goto done;
+        if (dev->priv_flags & IFF_802_1Q_VLAN) {
+                dev = vlan_dev_real_dev(dev);
+                goto recheck;
+        }
+        if (!is_netxen_netdev(dev))
+                goto done;
+        adapter = netdev_priv(dev);
+        if (!adapter || !netxen_destip_supported(adapter))
+                goto done;
+        if (adapter->is_up != NETXEN_ADAPTER_UP_MAGIC)
+                goto done;
+        switch (event) {
+        case NETDEV_UP:
+                netxen_config_ipaddr(adapter, ifa->ifa_address, NX_IP_UP);
+                break;
+        case NETDEV_DOWN:
+                netxen_config_ipaddr(adapter, ifa->ifa_address, NX_IP_DOWN);
+                break;
+        default:
+                break;
+        }
+done:
+        return NOTIFY_DONE;
+}
+static struct notifier_block    netxen_netdev_cb = {
+        .notifier_call = netxen_netdev_event,
+};
+static struct notifier_block netxen_inetaddr_cb = {
+        .notifier_call = netxen_inetaddr_event,
+};
+#endif
 static struct pci_driver netxen_driver = {
        .name = netxen_nic_driver_name,
        .id_table = netxen_pci_tbl,
@@ -1792,8 +2008,6 @@ static struct pci_driver netxen_driver = {
 #endif
 };
-/* Driver Registration on NetXen card    */
 static int __init netxen_init_module(void)
 {
        printk(KERN_INFO "%s\n", netxen_nic_driver_string);
@@ -1801,6 +2015,11 @@ static int __init netxen_init_module(void)
        if ((netxen_workq = create_singlethread_workqueue("netxen")) == NULL)
                return -ENOMEM;
+#ifdef CONFIG_INET
+        register_netdevice_notifier(&netxen_netdev_cb);
+        register_inetaddr_notifier(&netxen_inetaddr_cb);
+#endif
        return pci_register_driver(&netxen_driver);
 }
@@ -1809,6 +2028,11 @@ module_init(netxen_init_module);
 static void __exit netxen_exit_module(void)
 {
        pci_unregister_driver(&netxen_driver);
+#ifdef CONFIG_INET
+        unregister_inetaddr_notifier(&netxen_inetaddr_cb);
+        unregister_netdevice_notifier(&netxen_netdev_cb);
+#endif
        destroy_workqueue(netxen_workq);
 }
diff --git a/drivers/net/pppoe.c b/drivers/net/pppoe.c
index f0031f1f97e5..5f2090233d7b 100644
--- a/drivers/net/pppoe.c
+++ b/drivers/net/pppoe.c
@@ -1063,6 +1063,7 @@ static void *pppoe_seq_next(struct seq_file *seq, void *v, loff_t *pos)
        else {
                int hash = hash_item(po->pppoe_pa.sid, po->pppoe_pa.remote);
+                po = NULL;
                while (++hash < PPPOE_HASH_SIZE) {
                        po = pn->hash_table[hash];
                        if (po)
diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
index 4b53b58d75fc..b82780d805f5 100644
--- a/drivers/net/r8169.c
+++ b/drivers/net/r8169.c
@@ -2060,8 +2060,6 @@ rtl8169_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
                }
        }
-        pci_set_master(pdev);
        /* ioremap MMIO region */
        ioaddr = ioremap(pci_resource_start(pdev, region), R8169_REGS_SIZE);
        if (!ioaddr) {
@@ -2089,6 +2087,8 @@ rtl8169_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
        RTL_W16(IntrStatus, 0xffff);
+        pci_set_master(pdev);
        /* Identify chip attached to board */
        rtl8169_get_mac_version(tp, ioaddr);
@@ -3874,6 +3874,15 @@ static void rtl_shutdown(struct pci_dev *pdev)
        spin_unlock_irq(&tp->lock);
        if (system_state == SYSTEM_POWER_OFF) {
+                /* WoL fails with some 8168 when the receiver is disabled. */
+                if (tp->features & RTL_FEATURE_WOL) {
+                        pci_clear_master(pdev);
+                        RTL_W8(ChipCmd, CmdRxEnb);
+                        /* PCI commit */
+                        RTL_R8(ChipCmd);
+                }
                pci_wake_from_d3(pdev, true);
                pci_set_power_state(pdev, PCI_D3hot);
        }
diff --git a/drivers/net/smc91x.h b/drivers/net/smc91x.h
index f1f773b17fe1..57a159fac99f 100644
--- a/drivers/net/smc91x.h
+++ b/drivers/net/smc91x.h
@@ -186,7 +186,8 @@ static inline void SMC_outw(u16 val, void __iomem *ioaddr, int reg)
 #define SMC_outsb(a, r, p, l)   writesb((a) + (r), p, (l))
 #define SMC_IRQ_FLAGS           (-1)    /* from resource */
-#elif   defined(CONFIG_MACH_LOGICPD_PXA270)
+#elif   defined(CONFIG_MACH_LOGICPD_PXA270) \
+        || defined(CONFIG_MACH_NOMADIK_8815NHK)
 #define SMC_CAN_USE_8BIT        0
 #define SMC_CAN_USE_16BIT       1
diff --git a/drivers/net/tokenring/ibmtr.c b/drivers/net/tokenring/ibmtr.c
index 6472ba5cfc5e..96d00c8f8d3e 100644
--- a/drivers/net/tokenring/ibmtr.c
+++ b/drivers/net/tokenring/ibmtr.c
@@ -1912,7 +1912,7 @@ static int __init ibmtr_init(void)
        find_turbo_adapters(io);
-        for (i = 0; io[i] && (i < IBMTR_MAX_ADAPTERS); i++) {
+        for (i = 0; i < IBMTR_MAX_ADAPTERS && io[i]; i++) {
                struct net_device *dev;
                irq[i] = 0;
                mem[i] = 0;
diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c
index 49f3139a3fe7..c150c4858576 100644
--- a/drivers/net/wireless/airo.c
+++ b/drivers/net/wireless/airo.c
@@ -5918,20 +5918,19 @@ static int airo_set_essid(struct net_device *dev,
        readSsidRid(local, &SSID_rid);
        /* Check if we asked for `any' */
-        if(dwrq->flags == 0) {
+        if (dwrq->flags == 0) {
                /* Just send an empty SSID list */
                memset(&SSID_rid, 0, sizeof(SSID_rid));
        } else {
-                int     index = (dwrq->flags & IW_ENCODE_INDEX) - 1;
+                unsigned index = (dwrq->flags & IW_ENCODE_INDEX) - 1;
                /* Check the size of the string */
-                if(dwrq->length > IW_ESSID_MAX_SIZE) {
+                if (dwrq->length > IW_ESSID_MAX_SIZE)
                        return -E2BIG ;
-                }
                /* Check if index is valid */
-                if((index < 0) || (index >= 4)) {
+                if (index >= ARRAY_SIZE(SSID_rid.ssids))
                        return -EINVAL;
-                }
                /* Set the SSID */
                memset(SSID_rid.ssids[index].ssid, 0,
@@ -6819,7 +6818,7 @@ static int airo_set_txpow(struct net_device *dev,
                return -EINVAL;
        }
        clear_bit (FLAG_RADIO_OFF, &local->flags);
-        for (i = 0; cap_rid.txPowerLevels[i] && (i < 8); i++)
+        for (i = 0; i < 8 && cap_rid.txPowerLevels[i]; i++)
                if (v == cap_rid.txPowerLevels[i]) {
                        readConfigRid(local, 1);
                        local->config.txPower = v;
diff --git a/drivers/net/wireless/ath/ath9k/eeprom.c b/drivers/net/wireless/ath/ath9k/eeprom.c
index 9b1d960dc80f..6fb1a8034b3c 100644
--- a/drivers/net/wireless/ath/ath9k/eeprom.c
+++ b/drivers/net/wireless/ath/ath9k/eeprom.c
@@ -460,7 +460,7 @@ static int ath9k_hw_4k_check_eeprom(struct ath_hw *ah)
                integer = swab32(eep->modalHeader.antCtrlCommon);
                eep->modalHeader.antCtrlCommon = integer;
-                for (i = 0; i < AR5416_MAX_CHAINS; i++) {
+                for (i = 0; i < AR5416_EEP4K_MAX_CHAINS; i++) {
                        integer = swab32(eep->modalHeader.antCtrlChain[i]);
                        eep->modalHeader.antCtrlChain[i] = integer;
                }
@@ -914,7 +914,7 @@ static void ath9k_hw_set_4k_power_per_rate_table(struct ath_hw *ah,
                        ctlMode, numCtlModes, isHt40CtlMode,
                        (pCtlMode[ctlMode] & EXT_ADDITIVE));
-                for (i = 0; (i < AR5416_NUM_CTLS) &&
+                for (i = 0; (i < AR5416_EEP4K_NUM_CTLS) &&
                                pEepData->ctlIndex[i]; i++) {
                        DPRINTF(ah->ah_sc, ATH_DBG_EEPROM,
                                "  LOOP-Ctlidx %d: cfgCtl 0x%2.2x "
diff --git a/drivers/net/wireless/iwlwifi/iwl-tx.c b/drivers/net/wireless/iwlwifi/iwl-tx.c
index 660d1a76292b..6bb9602f3477 100644
--- a/drivers/net/wireless/iwlwifi/iwl-tx.c
+++ b/drivers/net/wireless/iwlwifi/iwl-tx.c
@@ -737,8 +737,6 @@ int iwl_tx_skb(struct iwl_priv *priv, struct sk_buff *skb)
                goto drop_unlock;
        }
-        spin_unlock_irqrestore(&priv->lock, flags);
        hdr_len = ieee80211_hdrlen(fc);
        /* Find (or create) index into station table for destination station */
@@ -746,7 +744,7 @@ int iwl_tx_skb(struct iwl_priv *priv, struct sk_buff *skb)
        if (sta_id == IWL_INVALID_STATION) {
                IWL_DEBUG_DROP(priv, "Dropping - INVALID STATION: %pM\n",
                               hdr->addr1);
-                goto drop;
+                goto drop_unlock;
        }
        IWL_DEBUG_TX(priv, "station Id %d\n", sta_id);
@@ -764,14 +762,17 @@ int iwl_tx_skb(struct iwl_priv *priv, struct sk_buff *skb)
                /* aggregation is on for this <sta,tid> */
                if (info->flags & IEEE80211_TX_CTL_AMPDU)
                        txq_id = priv->stations[sta_id].tid[tid].agg.txq_id;
-                priv->stations[sta_id].tid[tid].tfds_in_queue++;
        }
        txq = &priv->txq[txq_id];
        swq_id = txq->swq_id;
        q = &txq->q;
-        spin_lock_irqsave(&priv->lock, flags);
+        if (unlikely(iwl_queue_space(q) < q->high_mark))
+                goto drop_unlock;
+        if (ieee80211_is_data_qos(fc))
+                priv->stations[sta_id].tid[tid].tfds_in_queue++;
        /* Set up driver data for this TFD */
        memset(&(txq->txb[q->write_ptr]), 0, sizeof(struct iwl_tx_info));
@@ -917,7 +918,6 @@ int iwl_tx_skb(struct iwl_priv *priv, struct sk_buff *skb)
 drop_unlock:
        spin_unlock_irqrestore(&priv->lock, flags);
-drop:
        return -1;
 }
 EXPORT_SYMBOL(iwl_tx_skb);
@@ -1194,6 +1194,8 @@ int iwl_tx_agg_start(struct iwl_priv *priv, const u8 *ra, u16 tid, u16 *ssn)
                IWL_ERR(priv, "Start AGG on invalid station\n");
                return -ENXIO;
        }
+        if (unlikely(tid >= MAX_TID_COUNT))
+                return -EINVAL;
        if (priv->stations[sta_id].tid[tid].agg.state != IWL_AGG_OFF) {
                IWL_ERR(priv, "Start AGG when state is not IWL_AGG_OFF !\n");
diff --git a/drivers/net/wireless/iwmc3200wifi/netdev.c b/drivers/net/wireless/iwmc3200wifi/netdev.c
index 30116d1b4489..35ec006c2d2c 100644
--- a/drivers/net/wireless/iwmc3200wifi/netdev.c
+++ b/drivers/net/wireless/iwmc3200wifi/netdev.c
@@ -99,10 +99,8 @@ void *iwm_if_alloc(int sizeof_bus, struct device *dev,
        int ret = 0;
        wdev = iwm_wdev_alloc(sizeof_bus, dev);
-        if (!wdev) {
+        if (IS_ERR(wdev))
-                dev_err(dev, "no memory for wireless device instance\n");
+                return wdev;
-                return ERR_PTR(-ENOMEM);
-        }
        iwm = wdev_to_iwm(wdev);
        iwm->bus_ops = if_ops;
diff --git a/drivers/net/wireless/libertas/assoc.c b/drivers/net/wireless/libertas/assoc.c
index 385b50f4b105..1902b6f0b78c 100644
--- a/drivers/net/wireless/libertas/assoc.c
+++ b/drivers/net/wireless/libertas/assoc.c
@@ -1,6 +1,7 @@
 /* Copyright (C) 2006, Red Hat, Inc. */
 #include <linux/types.h>
+#include <linux/kernel.h>
 #include <linux/etherdevice.h>
 #include <linux/ieee80211.h>
 #include <linux/if_arp.h>
@@ -43,21 +44,21 @@ static int get_common_rates(struct lbs_private *priv,
        u16 *rates_size)
 {
        u8 *card_rates = lbs_bg_rates;
-        size_t num_card_rates = sizeof(lbs_bg_rates);
        int ret = 0, i, j;
-        u8 tmp[30];
+        u8 tmp[(ARRAY_SIZE(lbs_bg_rates) - 1) * (*rates_size - 1)];
        size_t tmp_size = 0;
        /* For each rate in card_rates that exists in rate1, copy to tmp */
-        for (i = 0; card_rates[i] && (i < num_card_rates); i++) {
+        for (i = 0; i < ARRAY_SIZE(lbs_bg_rates) && card_rates[i]; i++) {
-                for (j = 0; rates[j] && (j < *rates_size); j++) {
+                for (j = 0; j < *rates_size && rates[j]; j++) {
                        if (rates[j] == card_rates[i])
                                tmp[tmp_size++] = card_rates[i];
                }
        }
        lbs_deb_hex(LBS_DEB_JOIN, "AP rates    ", rates, *rates_size);
-        lbs_deb_hex(LBS_DEB_JOIN, "card rates  ", card_rates, num_card_rates);
+        lbs_deb_hex(LBS_DEB_JOIN, "card rates  ", card_rates,
+                        ARRAY_SIZE(lbs_bg_rates));
        lbs_deb_hex(LBS_DEB_JOIN, "common rates", tmp, tmp_size);
        lbs_deb_join("TX data rate 0x%02x\n", priv->cur_rate);
@@ -69,10 +70,7 @@ static int get_common_rates(struct lbs_private *priv,
                lbs_pr_alert("Previously set fixed data rate %#x isn't "
                       "compatible with the network.\n", priv->cur_rate);
                ret = -1;
-                goto done;
        }
-        ret = 0;
 done:
        memset(rates, 0, *rates_size);
        *rates_size = min_t(int, tmp_size, *rates_size);
@@ -320,7 +318,7 @@ static int lbs_associate(struct lbs_private *priv,
        rates = (struct mrvl_ie_rates_param_set *) pos;
        rates->header.type = cpu_to_le16(TLV_TYPE_RATES);
        memcpy(&rates->rates, &bss->rates, MAX_RATES);
-        tmplen = MAX_RATES;
+        tmplen = min_t(u16, ARRAY_SIZE(rates->rates), MAX_RATES);
        if (get_common_rates(priv, rates->rates, &tmplen)) {
                ret = -1;
                goto done;
@@ -594,7 +592,7 @@ static int lbs_adhoc_join(struct lbs_private *priv,
        /* Copy Data rates from the rates recorded in scan response */
        memset(cmd.bss.rates, 0, sizeof(cmd.bss.rates));
-        ratesize = min_t(u16, sizeof(cmd.bss.rates), MAX_RATES);
+        ratesize = min_t(u16, ARRAY_SIZE(cmd.bss.rates), MAX_RATES);
        memcpy(cmd.bss.rates, bss->rates, ratesize);
        if (get_common_rates(priv, cmd.bss.rates, &ratesize)) {
                lbs_deb_join("ADHOC_JOIN: get_common_rates returned error.\n");
diff --git a/drivers/net/wireless/libertas/scan.c b/drivers/net/wireless/libertas/scan.c
index 601b54249677..6c95af3023cc 100644
--- a/drivers/net/wireless/libertas/scan.c
+++ b/drivers/net/wireless/libertas/scan.c
@@ -5,6 +5,7 @@
  *  for sending scan commands to the firmware.
  */
 #include <linux/types.h>
+#include <linux/kernel.h>
 #include <linux/etherdevice.h>
 #include <linux/if_arp.h>
 #include <asm/unaligned.h>
@@ -876,7 +877,7 @@ static inline char *lbs_translate_scan(struct lbs_private *priv,
        iwe.u.bitrate.disabled = 0;
        iwe.u.bitrate.value = 0;
-        for (j = 0; bss->rates[j] && (j < sizeof(bss->rates)); j++) {
+        for (j = 0; j < ARRAY_SIZE(bss->rates) && bss->rates[j]; j++) {
                /* Bit rate given in 500 kb/s units */
                iwe.u.bitrate.value = bss->rates[j] * 500000;
                current_val = iwe_stream_add_value(info, start, current_val,
diff --git a/drivers/scsi/scsi_transport_iscsi.c b/drivers/scsi/scsi_transport_iscsi.c
index 783e33c65eb7..b47240ca4b19 100644
--- a/drivers/scsi/scsi_transport_iscsi.c
+++ b/drivers/scsi/scsi_transport_iscsi.c
@@ -990,7 +990,7 @@ int iscsi_offload_mesg(struct Scsi_Host *shost,
        struct iscsi_uevent *ev;
        int len = NLMSG_SPACE(sizeof(*ev) + data_size);
-        skb = alloc_skb(len, GFP_NOIO);
+        skb = alloc_skb(len, GFP_ATOMIC);
        if (!skb) {
                printk(KERN_ERR "can not deliver iscsi offload message:OOM\n");
                return -ENOMEM;
@@ -1012,7 +1012,7 @@ int iscsi_offload_mesg(struct Scsi_Host *shost,
        memcpy((char *)ev + sizeof(*ev), data, data_size);
-        return iscsi_multicast_skb(skb, ISCSI_NL_GRP_UIP, GFP_NOIO);
+        return iscsi_multicast_skb(skb, ISCSI_NL_GRP_UIP, GFP_ATOMIC);
 }
 EXPORT_SYMBOL_GPL(iscsi_offload_mesg);
diff --git a/include/linux/ethtool.h b/include/linux/ethtool.h
index 9b660bd2e2b3..90c4a3616d94 100644
--- a/include/linux/ethtool.h
+++ b/include/linux/ethtool.h
@@ -368,6 +368,7 @@ struct net_device;
 /* Some generic methods drivers may use in their ethtool_ops */
 u32 ethtool_op_get_link(struct net_device *dev);
+u32 ethtool_op_get_rx_csum(struct net_device *dev);
 u32 ethtool_op_get_tx_csum(struct net_device *dev);
 int ethtool_op_set_tx_csum(struct net_device *dev, u32 data);
 int ethtool_op_set_tx_hw_csum(struct net_device *dev, u32 data);
diff --git a/include/linux/inetdevice.h b/include/linux/inetdevice.h
index acef2a770b6b..ad27c7da8798 100644
--- a/include/linux/inetdevice.h
+++ b/include/linux/inetdevice.h
@@ -82,7 +82,7 @@ static inline void ipv4_devconf_setall(struct in_device *in_dev)
 #define IN_DEV_FORWARD(in_dev)          IN_DEV_CONF_GET((in_dev), FORWARDING)
 #define IN_DEV_MFORWARD(in_dev)         IN_DEV_ANDCONF((in_dev), MC_FORWARDING)
-#define IN_DEV_RPFILTER(in_dev)         IN_DEV_ANDCONF((in_dev), RP_FILTER)
+#define IN_DEV_RPFILTER(in_dev)         IN_DEV_MAXCONF((in_dev), RP_FILTER)
 #define IN_DEV_SOURCE_ROUTE(in_dev)     IN_DEV_ANDCONF((in_dev), \
                                                       ACCEPT_SOURCE_ROUTE)
 #define IN_DEV_BOOTP_RELAY(in_dev)      IN_DEV_ANDCONF((in_dev), BOOTP_RELAY)
diff --git a/include/net/ieee802154/af_ieee802154.h b/include/net/af_ieee802154.h
index 0d78605fb1a6..0d78605fb1a6 100644
--- a/include/net/ieee802154/af_ieee802154.h
+++ b/include/net/af_ieee802154.h
diff --git a/include/net/ieee802154/mac_def.h b/include/net/ieee802154.h
index 8cb684635650..d52685defb11 100644
--- a/include/net/ieee802154/mac_def.h
+++ b/include/net/ieee802154.h
@@ -23,8 +23,8 @@
 * Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
 */
-#ifndef IEEE802154_MAC_DEF_H
+#ifndef NET_IEEE802154_H
-#define IEEE802154_MAC_DEF_H
+#define NET_IEEE802154_H
 #define IEEE802154_FC_TYPE_BEACON       0x0     /* Frame is beacon */
 #define IEEE802154_FC_TYPE_DATA         0x1     /* Frame is data */
diff --git a/include/net/ieee802154/nl802154.h b/include/net/ieee802154/nl802154.h
deleted file mode 100644
index 78efcdf52b59..000000000000
--- a/include/net/ieee802154/nl802154.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * nl802154.h
- *
- * Copyright (C) 2007, 2008, 2009 Siemens AG
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- */
-#ifndef IEEE802154_NL_H
-#define IEEE802154_NL_H
-struct net_device;
-struct ieee802154_addr;
-int ieee802154_nl_assoc_indic(struct net_device *dev,
-                struct ieee802154_addr *addr, u8 cap);
-int ieee802154_nl_assoc_confirm(struct net_device *dev,
-                u16 short_addr, u8 status);
-int ieee802154_nl_disassoc_indic(struct net_device *dev,
-                struct ieee802154_addr *addr, u8 reason);
-int ieee802154_nl_disassoc_confirm(struct net_device *dev,
-                u8 status);
-int ieee802154_nl_scan_confirm(struct net_device *dev,
-                u8 status, u8 scan_type, u32 unscanned,
-                u8 *edl/*, struct list_head *pan_desc_list */);
-int ieee802154_nl_beacon_indic(struct net_device *dev, u16 panid,
-                u16 coord_addr);
-#endif
diff --git a/include/net/ieee802154/netdevice.h b/include/net/ieee802154_netdev.h
index e2506af3e7c8..e2506af3e7c8 100644
--- a/include/net/ieee802154/netdevice.h
+++ b/include/net/ieee802154_netdev.h
diff --git a/include/net/ip6_fib.h b/include/net/ip6_fib.h
index 7c5c0f79168a..15b492a9aa79 100644
--- a/include/net/ip6_fib.h
+++ b/include/net/ip6_fib.h
@@ -22,6 +22,12 @@
 #include <net/flow.h>
 #include <net/netlink.h>
+#ifdef CONFIG_IPV6_MULTIPLE_TABLES
+#define FIB6_TABLE_HASHSZ 256
+#else
+#define FIB6_TABLE_HASHSZ 1
+#endif
 struct rt6_info;
 struct fib6_config
diff --git a/include/net/ip_vs.h b/include/net/ip_vs.h
index bbae1e87efcd..910820327bc4 100644
--- a/include/net/ip_vs.h
+++ b/include/net/ip_vs.h
@@ -99,47 +99,47 @@ static inline const char *ip_vs_dbg_addr(int af, char *buf, size_t buf_len,
        return &buf[*idx - len];
 }
-#define IP_VS_DBG_BUF(level, msg...)                    \
+#define IP_VS_DBG_BUF(level, msg, ...)                                  \
-    do {                                                \
+        do {                                                            \
-            char ip_vs_dbg_buf[160];                    \
+                char ip_vs_dbg_buf[160];                                \
-            int ip_vs_dbg_idx = 0;                      \
+                int ip_vs_dbg_idx = 0;                                  \
-            if (level <= ip_vs_get_debug_level())       \
+                if (level <= ip_vs_get_debug_level())                   \
-                    printk(KERN_DEBUG "IPVS: " msg);    \
+                        printk(KERN_DEBUG pr_fmt(msg), ##__VA_ARGS__);  \
-    } while (0)
+        } while (0)
-#define IP_VS_ERR_BUF(msg...)                           \
+#define IP_VS_ERR_BUF(msg...)                                           \
-    do {                                                \
+        do {                                                            \
-            char ip_vs_dbg_buf[160];                    \
+                char ip_vs_dbg_buf[160];                                \
-            int ip_vs_dbg_idx = 0;                      \
+                int ip_vs_dbg_idx = 0;                                  \
-            printk(KERN_ERR "IPVS: " msg);              \
+                pr_err(msg);                                            \
-    } while (0)
+        } while (0)
 /* Only use from within IP_VS_DBG_BUF() or IP_VS_ERR_BUF macros */
-#define IP_VS_DBG_ADDR(af, addr)                        \
+#define IP_VS_DBG_ADDR(af, addr)                                        \
-    ip_vs_dbg_addr(af, ip_vs_dbg_buf,                   \
+        ip_vs_dbg_addr(af, ip_vs_dbg_buf,                               \
-                   sizeof(ip_vs_dbg_buf), addr,         \
+                       sizeof(ip_vs_dbg_buf), addr,                     \
-                   &ip_vs_dbg_idx)
+                       &ip_vs_dbg_idx)
-#define IP_VS_DBG(level, msg...)                        \
+#define IP_VS_DBG(level, msg, ...)                                      \
-    do {                                                \
+        do {                                                            \
-            if (level <= ip_vs_get_debug_level())       \
+                if (level <= ip_vs_get_debug_level())                   \
-                    printk(KERN_DEBUG "IPVS: " msg);    \
+                        printk(KERN_DEBUG pr_fmt(msg), ##__VA_ARGS__);  \
-    } while (0)
+        } while (0)
-#define IP_VS_DBG_RL(msg...)                            \
+#define IP_VS_DBG_RL(msg, ...)                                          \
-    do {                                                \
+        do {                                                            \
-            if (net_ratelimit())                        \
+                if (net_ratelimit())                                    \
-                    printk(KERN_DEBUG "IPVS: " msg);    \
+                        printk(KERN_DEBUG pr_fmt(msg), ##__VA_ARGS__);  \
-    } while (0)
+        } while (0)
-#define IP_VS_DBG_PKT(level, pp, skb, ofs, msg)         \
+#define IP_VS_DBG_PKT(level, pp, skb, ofs, msg)                         \
-    do {                                                \
+        do {                                                            \
-            if (level <= ip_vs_get_debug_level())       \
+                if (level <= ip_vs_get_debug_level())                   \
-                pp->debug_packet(pp, skb, ofs, msg);    \
+                        pp->debug_packet(pp, skb, ofs, msg);            \
-    } while (0)
+        } while (0)
-#define IP_VS_DBG_RL_PKT(level, pp, skb, ofs, msg)      \
+#define IP_VS_DBG_RL_PKT(level, pp, skb, ofs, msg)                      \
-    do {                                                \
+        do {                                                            \
-            if (level <= ip_vs_get_debug_level() &&     \
+                if (level <= ip_vs_get_debug_level() &&                 \
-                net_ratelimit())                        \
+                    net_ratelimit())                                    \
-                pp->debug_packet(pp, skb, ofs, msg);    \
+                        pp->debug_packet(pp, skb, ofs, msg);            \
-    } while (0)
+        } while (0)
 #else   /* NO DEBUGGING at ALL */
 #define IP_VS_DBG_BUF(level, msg...)  do {} while (0)
 #define IP_VS_ERR_BUF(msg...)  do {} while (0)
@@ -150,29 +150,30 @@ static inline const char *ip_vs_dbg_addr(int af, char *buf, size_t buf_len,
 #endif
 #define IP_VS_BUG() BUG()
-#define IP_VS_ERR(msg...) printk(KERN_ERR "IPVS: " msg)
+#define IP_VS_ERR(msg...) pr_err(msg)
-#define IP_VS_INFO(msg...) printk(KERN_INFO "IPVS: " msg)
+#define IP_VS_INFO(msg...) pr_info(msg)
-#define IP_VS_WARNING(msg...) \
+#define IP_VS_WARNING(msg...) pr_warning(msg)
-        printk(KERN_WARNING "IPVS: " msg)
+#define IP_VS_ERR_RL(msg...)                                            \
-#define IP_VS_ERR_RL(msg...)                            \
+        do {                                                            \
-    do {                                                \
+                if (net_ratelimit())                                    \
-            if (net_ratelimit())                        \
+                        pr_err(msg);                                    \
-                    printk(KERN_ERR "IPVS: " msg);      \
+        } while (0)
-    } while (0)
 #ifdef CONFIG_IP_VS_DEBUG
 #define EnterFunction(level)                                            \
-    do {                                                                \
+        do {                                                            \
-            if (level <= ip_vs_get_debug_level())                       \
+                if (level <= ip_vs_get_debug_level())                   \
-                    printk(KERN_DEBUG "Enter: %s, %s line %i\n",        \
+                        printk(KERN_DEBUG                               \
-                           __func__, __FILE__, __LINE__);               \
+                               pr_fmt("Enter: %s, %s line %i\n"),       \
-    } while (0)
+                               __func__, __FILE__, __LINE__);           \
-#define LeaveFunction(level)                                            \
+        } while (0)
-    do {                                                                \
+#define LeaveFunction(level)                                            \
-            if (level <= ip_vs_get_debug_level())                       \
+        do {                                                            \
-                        printk(KERN_DEBUG "Leave: %s, %s line %i\n",    \
+                if (level <= ip_vs_get_debug_level())                   \
-                               __func__, __FILE__, __LINE__);       \
+                        printk(KERN_DEBUG                               \
-    } while (0)
+                               pr_fmt("Leave: %s, %s line %i\n"),       \
+                               __func__, __FILE__, __LINE__);           \
+        } while (0)
 #else
 #define EnterFunction(level)   do {} while (0)
 #define LeaveFunction(level)   do {} while (0)
diff --git a/include/net/nl802154.h b/include/net/nl802154.h
new file mode 100644
index 000000000000..6096096f6d7d
--- /dev/null
+++ b/include/net/nl802154.h
@@ -0,0 +1,117 @@
+/*
+ * nl802154.h
+ *
+ * Copyright (C) 2007, 2008, 2009 Siemens AG
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ */
+#ifndef IEEE802154_NL_H
+#define IEEE802154_NL_H
+struct net_device;
+struct ieee802154_addr;
+/**
+ * ieee802154_nl_assoc_indic - Notify userland of an association request.
+ * @dev: The network device on which this association request was
+ *       received.
+ * @addr: The address of the device requesting association.
+ * @cap: The capability information field from the device.
+ *
+ * This informs a userland coordinator of a device requesting to
+ * associate with the PAN controlled by the coordinator.
+ *
+ * Note: This is in section 7.3.1 of the IEEE 802.15.4-2006 document.
+ */
+int ieee802154_nl_assoc_indic(struct net_device *dev,
+                struct ieee802154_addr *addr, u8 cap);
+/**
+ * ieee802154_nl_assoc_confirm - Notify userland of association.
+ * @dev: The device which has completed association.
+ * @short_addr: The short address assigned to the device.
+ * @status: The status of the association.
+ *
+ * Inform userland of the result of an association request. If the
+ * association request included asking the coordinator to allocate
+ * a short address then it is returned in @short_addr.
+ *
+ * Note: This is in section 7.3.2 of the IEEE 802.15.4 document.
+ */
+int ieee802154_nl_assoc_confirm(struct net_device *dev,
+                u16 short_addr, u8 status);
+/**
+ * ieee802154_nl_disassoc_indic - Notify userland of disassociation.
+ * @dev: The device on which disassociation was indicated.
+ * @addr: The device which is disassociating.
+ * @reason: The reason for the disassociation.
+ *
+ * Inform userland that a device has disassociated from the network.
+ *
+ * Note: This is in section 7.3.3 of the IEEE 802.15.4 document.
+ */
+int ieee802154_nl_disassoc_indic(struct net_device *dev,
+                struct ieee802154_addr *addr, u8 reason);
+/**
+ * ieee802154_nl_disassoc_confirm - Notify userland of disassociation
+ * completion.
+ * @dev: The device on which disassociation was ordered.
+ * @status: The result of the disassociation.
+ *
+ * Inform userland of the result of requesting that a device
+ * disassociate, or the result of requesting that we disassociate from
+ * a PAN managed by another coordinator.
+ *
+ * Note: This is in section 7.1.4.3 of the IEEE 802.15.4 document.
+ */
+int ieee802154_nl_disassoc_confirm(struct net_device *dev,
+                u8 status);
+/**
+ * ieee802154_nl_scan_confirm - Notify userland of completion of scan.
+ * @dev: The device which was instructed to scan.
+ * @status: The status of the scan operation.
+ * @scan_type: What type of scan was performed.
+ * @unscanned: Any channels that the device was unable to scan.
+ * @edl: The energy levels (if a passive scan).
+ *
+ *
+ * Note: This is in section 7.1.11 of the IEEE 802.15.4 document.
+ * Note: This API does not permit the return of an active scan result.
+ */
+int ieee802154_nl_scan_confirm(struct net_device *dev,
+                u8 status, u8 scan_type, u32 unscanned,
+                u8 *edl/*, struct list_head *pan_desc_list */);
+/**
+ * ieee802154_nl_beacon_indic - Notify userland of a received beacon.
+ * @dev: The device on which a beacon was received.
+ * @panid: The PAN of the coordinator.
+ * @coord_addr: The short address of the coordinator on that PAN.
+ *
+ * Note: This is in section 7.1.5 of the IEEE 802.15.4 document.
+ * Note: This API does not provide extended information such as what
+ * channel the PAN is on or what the LQI of the beacon frame was on
+ * receipt.
+ * Note: This API cannot indicate a beacon frame for a coordinator
+ *       operating in long addressing mode.
+ */
+int ieee802154_nl_beacon_indic(struct net_device *dev, u16 panid,
+                u16 coord_addr);
+#endif
diff --git a/include/net/rose.h b/include/net/rose.h
index cbd5364b2c8a..5ba9f02731eb 100644
--- a/include/net/rose.h
+++ b/include/net/rose.h
@@ -156,7 +156,7 @@ extern int  sysctl_rose_maximum_vcs;
 extern int  sysctl_rose_window_size;
 extern int  rosecmp(rose_address *, rose_address *);
 extern int  rosecmpm(rose_address *, rose_address *, unsigned short);
-extern const char *rose2asc(const rose_address *);
+extern char *rose2asc(char *buf, const rose_address *);
 extern struct sock *rose_find_socket(unsigned int, struct rose_neigh *);
 extern void rose_kill_by_neigh(struct rose_neigh *);
 extern unsigned int rose_new_lci(struct rose_neigh *);
diff --git a/include/net/xfrm.h b/include/net/xfrm.h
index 9e3a3f4c1f60..223e90a44824 100644
--- a/include/net/xfrm.h
+++ b/include/net/xfrm.h
@@ -1280,7 +1280,7 @@ struct xfrm6_tunnel {
 };
 extern void xfrm_init(void);
-extern void xfrm4_init(void);
+extern void xfrm4_init(int rt_hash_size);
 extern int xfrm_state_init(struct net *net);
 extern void xfrm_state_fini(struct net *net);
 extern void xfrm4_state_init(void);
diff --git a/net/8021q/vlan.c b/net/8021q/vlan.c
index 6d37b7e2a767..a1f16303703a 100644
--- a/net/8021q/vlan.c
+++ b/net/8021q/vlan.c
@@ -225,12 +225,6 @@ int vlan_check_real_dev(struct net_device *real_dev, u16 vlan_id)
                return -EOPNOTSUPP;
        }
-        /* The real device must be up and operating in order to
-         * assosciate a VLAN device with it.
-         */
-        if (!(real_dev->flags & IFF_UP))
-                return -ENETDOWN;
        if (__find_vlan_dev(real_dev, vlan_id) != NULL)
                return -EEXIST;
diff --git a/net/bridge/br_if.c b/net/bridge/br_if.c
index 8a96672e2c5c..eb404dc3ed6e 100644
--- a/net/bridge/br_if.c
+++ b/net/bridge/br_if.c
@@ -424,7 +424,7 @@ int br_add_if(struct net_bridge *br, struct net_device *dev)
 err2:
        br_fdb_delete_by_port(br, p, 1);
 err1:
-        kobject_del(&p->kobj);
+        kobject_put(&p->kobj);
 err0:
        dev_set_promiscuity(dev, -1);
 put_back:
diff --git a/net/core/ethtool.c b/net/core/ethtool.c
index cf36ff44ebb2..44e571111d3a 100644
--- a/net/core/ethtool.c
+++ b/net/core/ethtool.c
@@ -34,11 +34,13 @@ u32 ethtool_op_get_rx_csum(struct net_device *dev)
 {
        return (dev->features & NETIF_F_ALL_CSUM) != 0;
 }
+EXPORT_SYMBOL(ethtool_op_get_rx_csum);
 u32 ethtool_op_get_tx_csum(struct net_device *dev)
 {
        return (dev->features & NETIF_F_ALL_CSUM) != 0;
 }
+EXPORT_SYMBOL(ethtool_op_get_tx_csum);
 int ethtool_op_set_tx_csum(struct net_device *dev, u32 data)
 {
@@ -1125,7 +1127,6 @@ int dev_ethtool(struct net *net, struct ifreq *ifr)
 EXPORT_SYMBOL(ethtool_op_get_link);
 EXPORT_SYMBOL(ethtool_op_get_sg);
 EXPORT_SYMBOL(ethtool_op_get_tso);
-EXPORT_SYMBOL(ethtool_op_get_tx_csum);
 EXPORT_SYMBOL(ethtool_op_set_sg);
 EXPORT_SYMBOL(ethtool_op_set_tso);
 EXPORT_SYMBOL(ethtool_op_set_tx_csum);
diff --git a/net/ieee802154/af_ieee802154.c b/net/ieee802154/af_ieee802154.c
index 3bb6bdb1dac1..69c8d9207aa7 100644
--- a/net/ieee802154/af_ieee802154.c
+++ b/net/ieee802154/af_ieee802154.c
@@ -34,8 +34,8 @@
 #include <net/tcp_states.h>
 #include <net/route.h>
-#include <net/ieee802154/af_ieee802154.h>
+#include <net/af_ieee802154.h>
-#include <net/ieee802154/netdevice.h>
+#include <net/ieee802154_netdev.h>
 #include "af802154.h"
diff --git a/net/ieee802154/dgram.c b/net/ieee802154/dgram.c
index 14d39840dd62..53dd912d52b4 100644
--- a/net/ieee802154/dgram.c
+++ b/net/ieee802154/dgram.c
@@ -26,9 +26,9 @@
 #include <linux/if_arp.h>
 #include <linux/list.h>
 #include <net/sock.h>
-#include <net/ieee802154/af_ieee802154.h>
+#include <net/af_ieee802154.h>
-#include <net/ieee802154/mac_def.h>
+#include <net/ieee802154.h>
-#include <net/ieee802154/netdevice.h>
+#include <net/ieee802154_netdev.h>
 #include <asm/ioctls.h>
diff --git a/net/ieee802154/netlink.c b/net/ieee802154/netlink.c
index 27eda9fdf3c2..a615b9d13212 100644
--- a/net/ieee802154/netlink.c
+++ b/net/ieee802154/netlink.c
@@ -27,9 +27,9 @@
 #include <net/netlink.h>
 #include <net/genetlink.h>
 #include <linux/nl802154.h>
-#include <net/ieee802154/af_ieee802154.h>
+#include <net/af_ieee802154.h>
-#include <net/ieee802154/nl802154.h>
+#include <net/nl802154.h>
-#include <net/ieee802154/netdevice.h>
+#include <net/ieee802154_netdev.h>
 static unsigned int ieee802154_seq_num;
diff --git a/net/ieee802154/raw.c b/net/ieee802154/raw.c
index fca44d59f97e..ea8d1f15206e 100644
--- a/net/ieee802154/raw.c
+++ b/net/ieee802154/raw.c
@@ -26,7 +26,7 @@
 #include <linux/if_arp.h>
 #include <linux/list.h>
 #include <net/sock.h>
-#include <net/ieee802154/af_ieee802154.h>
+#include <net/af_ieee802154.h>
 #include "af802154.h"
diff --git a/net/ipv4/arp.c b/net/ipv4/arp.c
index c29d75d8f1b1..090e9991ac2a 100644
--- a/net/ipv4/arp.c
+++ b/net/ipv4/arp.c
@@ -1304,7 +1304,9 @@ static void arp_format_neigh_entry(struct seq_file *seq,
                hbuffer[k++] = hex_asc_lo(n->ha[j]);
                hbuffer[k++] = ':';
        }
-        hbuffer[--k] = 0;
+        if (k != 0)
+                --k;
+        hbuffer[k] = 0;
 #if defined(CONFIG_AX25) || defined(CONFIG_AX25_MODULE)
        }
 #endif
diff --git a/net/ipv4/route.c b/net/ipv4/route.c
index 278f46f5011b..fafbe163e2b5 100644
--- a/net/ipv4/route.c
+++ b/net/ipv4/route.c
@@ -3442,7 +3442,7 @@ int __init ip_rt_init(void)
                printk(KERN_ERR "Unable to create route proc files\n");
 #ifdef CONFIG_XFRM
        xfrm_init();
-        xfrm4_init();
+        xfrm4_init(ip_rt_max_size);
 #endif
        rtnl_register(PF_INET, RTM_GETROUTE, inet_rtm_getroute, NULL);
diff --git a/net/ipv4/xfrm4_policy.c b/net/ipv4/xfrm4_policy.c
index 0071ee6f441f..1ba44742ebbf 100644
--- a/net/ipv4/xfrm4_policy.c
+++ b/net/ipv4/xfrm4_policy.c
@@ -264,6 +264,20 @@ static struct xfrm_policy_afinfo xfrm4_policy_afinfo = {
        .fill_dst =             xfrm4_fill_dst,
 };
+static struct ctl_table xfrm4_policy_table[] = {
+        {
+                .ctl_name       = CTL_UNNUMBERED,
+                .procname       = "xfrm4_gc_thresh",
+                .data           = &xfrm4_dst_ops.gc_thresh,
+                .maxlen         = sizeof(int),
+                .mode           = 0644,
+                .proc_handler   = proc_dointvec,
+        },
+        { }
+};
+static struct ctl_table_header *sysctl_hdr;
 static void __init xfrm4_policy_init(void)
 {
        xfrm_policy_register_afinfo(&xfrm4_policy_afinfo);
@@ -271,12 +285,27 @@ static void __init xfrm4_policy_init(void)
 static void __exit xfrm4_policy_fini(void)
 {
+        if (sysctl_hdr)
+                unregister_net_sysctl_table(sysctl_hdr);
        xfrm_policy_unregister_afinfo(&xfrm4_policy_afinfo);
 }
-void __init xfrm4_init(void)
+void __init xfrm4_init(int rt_max_size)
 {
        xfrm4_state_init();
        xfrm4_policy_init();
+        /*
+         * Select a default value for the gc_thresh based on the main route
+         * table hash size.  It seems to me the worst case scenario is when
+         * we have ipsec operating in transport mode, in which we create a
+         * dst_entry per socket.  The xfrm gc algorithm starts trying to remove
+         * entries at gc_thresh, and prevents new allocations as 2*gc_thresh
+         * so lets set an initial xfrm gc_thresh value at the rt_max_size/2.
+         * That will let us store an ipsec connection per route table entry,
+         * and start cleaning when were 1/2 full
+         */
+        xfrm4_dst_ops.gc_thresh = rt_max_size/2;
+        sysctl_hdr = register_net_sysctl_table(&init_net, net_ipv4_ctl_path,
+                                                xfrm4_policy_table);
 }
diff --git a/net/ipv6/ip6_fib.c b/net/ipv6/ip6_fib.c
index 52ee1dced2ff..0e93ca56eb69 100644
--- a/net/ipv6/ip6_fib.c
+++ b/net/ipv6/ip6_fib.c
@@ -164,12 +164,6 @@ static __inline__ void rt6_release(struct rt6_info *rt)
                dst_free(&rt->u.dst);
 }
-#ifdef CONFIG_IPV6_MULTIPLE_TABLES
-#define FIB_TABLE_HASHSZ 256
-#else
-#define FIB_TABLE_HASHSZ 1
-#endif
 static void fib6_link_table(struct net *net, struct fib6_table *tb)
 {
        unsigned int h;
@@ -180,7 +174,7 @@ static void fib6_link_table(struct net *net, struct fib6_table *tb)
         */
        rwlock_init(&tb->tb6_lock);
-        h = tb->tb6_id & (FIB_TABLE_HASHSZ - 1);
+        h = tb->tb6_id & (FIB6_TABLE_HASHSZ - 1);
        /*
         * No protection necessary, this is the only list mutatation
@@ -231,7 +225,7 @@ struct fib6_table *fib6_get_table(struct net *net, u32 id)
        if (id == 0)
                id = RT6_TABLE_MAIN;
-        h = id & (FIB_TABLE_HASHSZ - 1);
+        h = id & (FIB6_TABLE_HASHSZ - 1);
        rcu_read_lock();
        head = &net->ipv6.fib_table_hash[h];
        hlist_for_each_entry_rcu(tb, node, head, tb6_hlist) {
@@ -382,7 +376,7 @@ static int inet6_dump_fib(struct sk_buff *skb, struct netlink_callback *cb)
        arg.net = net;
        w->args = &arg;
-        for (h = s_h; h < FIB_TABLE_HASHSZ; h++, s_e = 0) {
+        for (h = s_h; h < FIB6_TABLE_HASHSZ; h++, s_e = 0) {
                e = 0;
                head = &net->ipv6.fib_table_hash[h];
                hlist_for_each_entry(tb, node, head, tb6_hlist) {
@@ -1368,7 +1362,7 @@ void fib6_clean_all(struct net *net, int (*func)(struct rt6_info *, void *arg),
        unsigned int h;
        rcu_read_lock();
-        for (h = 0; h < FIB_TABLE_HASHSZ; h++) {
+        for (h = 0; h < FIB6_TABLE_HASHSZ; h++) {
                head = &net->ipv6.fib_table_hash[h];
                hlist_for_each_entry_rcu(table, node, head, tb6_hlist) {
                        write_lock_bh(&table->tb6_lock);
@@ -1483,7 +1477,7 @@ static int fib6_net_init(struct net *net)
        if (!net->ipv6.rt6_stats)
                goto out_timer;
-        net->ipv6.fib_table_hash = kcalloc(FIB_TABLE_HASHSZ,
+        net->ipv6.fib_table_hash = kcalloc(FIB6_TABLE_HASHSZ,
                                           sizeof(*net->ipv6.fib_table_hash),
                                           GFP_KERNEL);
        if (!net->ipv6.fib_table_hash)
diff --git a/net/ipv6/xfrm6_policy.c b/net/ipv6/xfrm6_policy.c
index 3a3c677bc0f2..611cffcf554f 100644
--- a/net/ipv6/xfrm6_policy.c
+++ b/net/ipv6/xfrm6_policy.c
@@ -306,9 +306,24 @@ static void xfrm6_policy_fini(void)
        xfrm_policy_unregister_afinfo(&xfrm6_policy_afinfo);
 }
+static struct ctl_table xfrm6_policy_table[] = {
+        {
+                .ctl_name       = CTL_UNNUMBERED,
+                .procname       = "xfrm6_gc_thresh",
+                .data           = &xfrm6_dst_ops.gc_thresh,
+                .maxlen         = sizeof(int),
+                .mode           = 0644,
+                .proc_handler   = proc_dointvec,
+        },
+        { }
+};
+static struct ctl_table_header *sysctl_hdr;
 int __init xfrm6_init(void)
 {
        int ret;
+        unsigned int gc_thresh;
        ret = xfrm6_policy_init();
        if (ret)
@@ -317,6 +332,22 @@ int __init xfrm6_init(void)
        ret = xfrm6_state_init();
        if (ret)
                goto out_policy;
+        /*
+         * We need a good default value for the xfrm6 gc threshold.
+         * In ipv4 we set it to the route hash table size * 8, which
+         * is half the size of the maximaum route cache for ipv4.  It
+         * would be good to do the same thing for v6, except the table is
+         * constructed differently here.  Here each table for a net namespace
+         * can have FIB_TABLE_HASHSZ entries, so lets go with the same
+         * computation that we used for ipv4 here.  Also, lets keep the initial
+         * gc_thresh to a minimum of 1024, since, the ipv6 route cache defaults
+         * to that as a minimum as well
+         */
+        gc_thresh = FIB6_TABLE_HASHSZ * 8;
+        xfrm6_dst_ops.gc_thresh = (gc_thresh < 1024) ? 1024 : gc_thresh;
+        sysctl_hdr = register_net_sysctl_table(&init_net, net_ipv6_ctl_path,
+                                                xfrm6_policy_table);
 out:
        return ret;
 out_policy:
@@ -326,6 +357,8 @@ out_policy:
 void xfrm6_fini(void)
 {
+        if (sysctl_hdr)
+                unregister_net_sysctl_table(sysctl_hdr);
        //xfrm6_input_fini();
        xfrm6_policy_fini();
        xfrm6_state_fini();
diff --git a/net/irda/irttp.c b/net/irda/irttp.c
index ecf4eb2717cb..9cb79f95bf63 100644
--- a/net/irda/irttp.c
+++ b/net/irda/irttp.c
@@ -1453,6 +1453,7 @@ struct tsap_cb *irttp_dup(struct tsap_cb *orig, void *instance)
        }
        /* Dup */
        memcpy(new, orig, sizeof(struct tsap_cb));
+        spin_lock_init(&new->lock);
        /* We don't need the old instance any more */
        spin_unlock_irqrestore(&irttp->tsaps->hb_spinlock, flags);
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index f60a83102ea2..ee83125ed179 100644
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -760,7 +760,7 @@ void ieee80211_dynamic_ps_timer(unsigned long data)
 {
        struct ieee80211_local *local = (void *) data;
-        if (local->quiescing)
+        if (local->quiescing || local->suspended)
                return;
        queue_work(local->hw.workqueue, &local->dynamic_ps_enable_work);
diff --git a/net/mac80211/pm.c b/net/mac80211/pm.c
index 7a549f9deb96..5e3d476972f9 100644
--- a/net/mac80211/pm.c
+++ b/net/mac80211/pm.c
@@ -55,15 +55,6 @@ int __ieee80211_suspend(struct ieee80211_hw *hw)
        rcu_read_unlock();
-        /* flush again, in case driver queued work */
-        flush_workqueue(local->hw.workqueue);
-        /* stop hardware - this must stop RX */
-        if (local->open_count) {
-                ieee80211_led_radio(local, false);
-                drv_stop(local);
-        }
        /* remove STAs */
        spin_lock_irqsave(&local->sta_lock, flags);
        list_for_each_entry(sta, &local->sta_list, list) {
@@ -111,7 +102,22 @@ int __ieee80211_suspend(struct ieee80211_hw *hw)
                drv_remove_interface(local, &conf);
        }
+        /* stop hardware - this must stop RX */
+        if (local->open_count) {
+                ieee80211_led_radio(local, false);
+                drv_stop(local);
+        }
+        /*
+         * flush again, in case driver queued work -- it
+         * shouldn't be doing (or cancel everything in the
+         * stop callback) that but better safe than sorry.
+         */
+        flush_workqueue(local->hw.workqueue);
        local->suspended = true;
+        /* need suspended to be visible before quiescing is false */
+        barrier();
        local->quiescing = false;
        return 0;
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
index f195705146bd..25a669c86e14 100644
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@ -2442,6 +2442,18 @@ void __ieee80211_rx(struct ieee80211_hw *hw, struct sk_buff *skb)
                return;
        }
+        /*
+         * If we're suspending, it is possible although not too likely
+         * that we'd be receiving frames after having already partially
+         * quiesced the stack. We can't process such frames then since
+         * that might, for example, cause stations to be added or other
+         * driver callbacks be invoked.
+         */
+        if (unlikely(local->quiescing || local->suspended)) {
+                kfree_skb(skb);
+                return;
+        }
        if (status->flag & RX_FLAG_HT) {
                /* rate_idx is MCS index */
                if (WARN_ON(status->rate_idx < 0 ||
diff --git a/net/netfilter/ipvs/ip_vs_app.c b/net/netfilter/ipvs/ip_vs_app.c
index 201b8ea3020d..c1781f80daf2 100644
--- a/net/netfilter/ipvs/ip_vs_app.c
+++ b/net/netfilter/ipvs/ip_vs_app.c
@@ -18,6 +18,9 @@
 *
 */
+#define KMSG_COMPONENT "IPVS"
+#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/skbuff.h>
diff --git a/net/netfilter/ipvs/ip_vs_conn.c b/net/netfilter/ipvs/ip_vs_conn.c
index 77bfdfeb966e..4173d7b1d4cc 100644
--- a/net/netfilter/ipvs/ip_vs_conn.c
+++ b/net/netfilter/ipvs/ip_vs_conn.c
@@ -22,6 +22,9 @@
 *
 */
+#define KMSG_COMPONENT "IPVS"
+#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
 #include <linux/interrupt.h>
 #include <linux/in.h>
 #include <linux/net.h>
diff --git a/net/netfilter/ipvs/ip_vs_core.c b/net/netfilter/ipvs/ip_vs_core.c
index 8dddb17a947a..6811dcaca0f6 100644
--- a/net/netfilter/ipvs/ip_vs_core.c
+++ b/net/netfilter/ipvs/ip_vs_core.c
@@ -24,6 +24,9 @@
 *
 */
+#define KMSG_COMPONENT "IPVS"
+#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/ip.h>
diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c
index 2d24d81474ce..e6133ea1ea4c 100644
--- a/net/netfilter/ipvs/ip_vs_ctl.c
+++ b/net/netfilter/ipvs/ip_vs_ctl.c
@@ -18,6 +18,9 @@
 *
 */
+#define KMSG_COMPONENT "IPVS"
+#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/types.h>
diff --git a/net/netfilter/ipvs/ip_vs_dh.c b/net/netfilter/ipvs/ip_vs_dh.c
index a9dac74bb13f..d0c0594d1e2e 100644
--- a/net/netfilter/ipvs/ip_vs_dh.c
+++ b/net/netfilter/ipvs/ip_vs_dh.c
@@ -35,6 +35,9 @@
 *
 */
+#define KMSG_COMPONENT "IPVS"
+#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
 #include <linux/ip.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
diff --git a/net/netfilter/ipvs/ip_vs_est.c b/net/netfilter/ipvs/ip_vs_est.c
index 2eb2860dabb5..702b53ca937c 100644
--- a/net/netfilter/ipvs/ip_vs_est.c
+++ b/net/netfilter/ipvs/ip_vs_est.c
@@ -11,6 +11,10 @@
 * Changes:
 *
 */
+#define KMSG_COMPONENT "IPVS"
+#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
 #include <linux/kernel.h>
 #include <linux/jiffies.h>
 #include <linux/slab.h>
diff --git a/net/netfilter/ipvs/ip_vs_ftp.c b/net/netfilter/ipvs/ip_vs_ftp.c
index 428edbf481cc..9c16a3f64c1b 100644
--- a/net/netfilter/ipvs/ip_vs_ftp.c
+++ b/net/netfilter/ipvs/ip_vs_ftp.c
@@ -22,6 +22,9 @@
 *
 */
+#define KMSG_COMPONENT "IPVS"
+#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/kernel.h>
diff --git a/net/netfilter/ipvs/ip_vs_lblc.c b/net/netfilter/ipvs/ip_vs_lblc.c
index 3eb5e2660c49..98fb185d890b 100644
--- a/net/netfilter/ipvs/ip_vs_lblc.c
+++ b/net/netfilter/ipvs/ip_vs_lblc.c
@@ -39,6 +39,9 @@
 * me to write this module.
 */
+#define KMSG_COMPONENT "IPVS"
+#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
 #include <linux/ip.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
diff --git a/net/netfilter/ipvs/ip_vs_lblcr.c b/net/netfilter/ipvs/ip_vs_lblcr.c
index c04ce56c7f0f..5f5e5f4bad5e 100644
--- a/net/netfilter/ipvs/ip_vs_lblcr.c
+++ b/net/netfilter/ipvs/ip_vs_lblcr.c
@@ -37,6 +37,9 @@
 *
 */
+#define KMSG_COMPONENT "IPVS"
+#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
 #include <linux/ip.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
diff --git a/net/netfilter/ipvs/ip_vs_lc.c b/net/netfilter/ipvs/ip_vs_lc.c
index d0dadc8a65fd..4ecd5e19c39a 100644
--- a/net/netfilter/ipvs/ip_vs_lc.c
+++ b/net/netfilter/ipvs/ip_vs_lc.c
@@ -14,6 +14,9 @@
 *
 */
+#define KMSG_COMPONENT "IPVS"
+#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
 #include <linux/module.h>
 #include <linux/kernel.h>
diff --git a/net/netfilter/ipvs/ip_vs_nq.c b/net/netfilter/ipvs/ip_vs_nq.c
index 694952db5026..2224478bdea8 100644
--- a/net/netfilter/ipvs/ip_vs_nq.c
+++ b/net/netfilter/ipvs/ip_vs_nq.c
@@ -31,6 +31,9 @@
 *
 */
+#define KMSG_COMPONENT "IPVS"
+#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
 #include <linux/module.h>
 #include <linux/kernel.h>
diff --git a/net/netfilter/ipvs/ip_vs_proto.c b/net/netfilter/ipvs/ip_vs_proto.c
index a01520e3d6b8..a95bc4021c90 100644
--- a/net/netfilter/ipvs/ip_vs_proto.c
+++ b/net/netfilter/ipvs/ip_vs_proto.c
@@ -13,6 +13,9 @@
 *
 */
+#define KMSG_COMPONENT "IPVS"
+#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/skbuff.h>
@@ -181,7 +184,7 @@ ip_vs_tcpudp_debug_packet_v4(struct ip_vs_protocol *pp,
                                &ih->daddr, ntohs(pptr[1]));
        }
-        printk(KERN_DEBUG "IPVS: %s: %s\n", msg, buf);
+        pr_debug("%s: %s\n", msg, buf);
 }
 #ifdef CONFIG_IP_VS_IPV6
@@ -215,7 +218,7 @@ ip_vs_tcpudp_debug_packet_v6(struct ip_vs_protocol *pp,
                                &ih->daddr, ntohs(pptr[1]));
        }
-        printk(KERN_DEBUG "IPVS: %s: %s\n", msg, buf);
+        pr_debug("%s: %s\n", msg, buf);
 }
 #endif
diff --git a/net/netfilter/ipvs/ip_vs_proto_ah_esp.c b/net/netfilter/ipvs/ip_vs_proto_ah_esp.c
index 79f56c1e7c19..c30b43c36cd7 100644
--- a/net/netfilter/ipvs/ip_vs_proto_ah_esp.c
+++ b/net/netfilter/ipvs/ip_vs_proto_ah_esp.c
@@ -10,6 +10,9 @@
 *
 */
+#define KMSG_COMPONENT "IPVS"
+#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
 #include <linux/in.h>
 #include <linux/ip.h>
 #include <linux/module.h>
@@ -138,7 +141,7 @@ ah_esp_debug_packet_v4(struct ip_vs_protocol *pp, const struct sk_buff *skb,
                sprintf(buf, "%s %pI4->%pI4",
                        pp->name, &ih->saddr, &ih->daddr);
-        printk(KERN_DEBUG "IPVS: %s: %s\n", msg, buf);
+        pr_debug("%s: %s\n", msg, buf);
 }
 #ifdef CONFIG_IP_VS_IPV6
@@ -156,7 +159,7 @@ ah_esp_debug_packet_v6(struct ip_vs_protocol *pp, const struct sk_buff *skb,
                sprintf(buf, "%s %pI6->%pI6",
                        pp->name, &ih->saddr, &ih->daddr);
-        printk(KERN_DEBUG "IPVS: %s: %s\n", msg, buf);
+        pr_debug("%s: %s\n", msg, buf);
 }
 #endif
diff --git a/net/netfilter/ipvs/ip_vs_proto_tcp.c b/net/netfilter/ipvs/ip_vs_proto_tcp.c
index 8cba41802850..c36c80d3a2b4 100644
--- a/net/netfilter/ipvs/ip_vs_proto_tcp.c
+++ b/net/netfilter/ipvs/ip_vs_proto_tcp.c
@@ -13,6 +13,9 @@
 *
 */
+#define KMSG_COMPONENT "IPVS"
+#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
 #include <linux/kernel.h>
 #include <linux/ip.h>
 #include <linux/tcp.h>                  /* for tcphdr */
diff --git a/net/netfilter/ipvs/ip_vs_proto_udp.c b/net/netfilter/ipvs/ip_vs_proto_udp.c
index d2930a71084b..96ebe40bc537 100644
--- a/net/netfilter/ipvs/ip_vs_proto_udp.c
+++ b/net/netfilter/ipvs/ip_vs_proto_udp.c
@@ -13,6 +13,9 @@
 *
 */
+#define KMSG_COMPONENT "IPVS"
+#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
 #include <linux/in.h>
 #include <linux/ip.h>
 #include <linux/kernel.h>
diff --git a/net/netfilter/ipvs/ip_vs_rr.c b/net/netfilter/ipvs/ip_vs_rr.c
index 2d16ab7f8c1e..b01007e1c11e 100644
--- a/net/netfilter/ipvs/ip_vs_rr.c
+++ b/net/netfilter/ipvs/ip_vs_rr.c
@@ -19,6 +19,9 @@
 *
 */
+#define KMSG_COMPONENT "IPVS"
+#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
 #include <linux/module.h>
 #include <linux/kernel.h>
diff --git a/net/netfilter/ipvs/ip_vs_sched.c b/net/netfilter/ipvs/ip_vs_sched.c
index a46ad9e35016..87bc5ea0ef29 100644
--- a/net/netfilter/ipvs/ip_vs_sched.c
+++ b/net/netfilter/ipvs/ip_vs_sched.c
@@ -17,6 +17,9 @@
 *
 */
+#define KMSG_COMPONENT "IPVS"
+#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
 #include <linux/module.h>
 #include <linux/spinlock.h>
 #include <linux/interrupt.h>
diff --git a/net/netfilter/ipvs/ip_vs_sed.c b/net/netfilter/ipvs/ip_vs_sed.c
index 20e4657d2f3b..4f745dd86dd8 100644
--- a/net/netfilter/ipvs/ip_vs_sed.c
+++ b/net/netfilter/ipvs/ip_vs_sed.c
@@ -35,6 +35,9 @@
 *
 */
+#define KMSG_COMPONENT "IPVS"
+#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
 #include <linux/module.h>
 #include <linux/kernel.h>
diff --git a/net/netfilter/ipvs/ip_vs_sh.c b/net/netfilter/ipvs/ip_vs_sh.c
index 75709ebeb630..fb4d2d23f2fe 100644
--- a/net/netfilter/ipvs/ip_vs_sh.c
+++ b/net/netfilter/ipvs/ip_vs_sh.c
@@ -32,6 +32,9 @@
 *
 */
+#define KMSG_COMPONENT "IPVS"
+#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
 #include <linux/ip.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
diff --git a/net/netfilter/ipvs/ip_vs_sync.c b/net/netfilter/ipvs/ip_vs_sync.c
index 5c48378a852f..cc04c99815fd 100644
--- a/net/netfilter/ipvs/ip_vs_sync.c
+++ b/net/netfilter/ipvs/ip_vs_sync.c
@@ -17,6 +17,9 @@
 *      Justin Ossevoort        :       Fix endian problem on sync message size.
 */
+#define KMSG_COMPONENT "IPVS"
+#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
 #include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/inetdevice.h>
diff --git a/net/netfilter/ipvs/ip_vs_wlc.c b/net/netfilter/ipvs/ip_vs_wlc.c
index 8e942565b47d..bbddfdb10db2 100644
--- a/net/netfilter/ipvs/ip_vs_wlc.c
+++ b/net/netfilter/ipvs/ip_vs_wlc.c
@@ -19,6 +19,9 @@
 *
 */
+#define KMSG_COMPONENT "IPVS"
+#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
 #include <linux/module.h>
 #include <linux/kernel.h>
diff --git a/net/netfilter/ipvs/ip_vs_wrr.c b/net/netfilter/ipvs/ip_vs_wrr.c
index f7d74ef1ecf9..c39ebb6c5a54 100644
--- a/net/netfilter/ipvs/ip_vs_wrr.c
+++ b/net/netfilter/ipvs/ip_vs_wrr.c
@@ -18,6 +18,9 @@
 *
 */
+#define KMSG_COMPONENT "IPVS"
+#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/net.h>
diff --git a/net/netfilter/ipvs/ip_vs_xmit.c b/net/netfilter/ipvs/ip_vs_xmit.c
index 5874657af7f2..061e76dfdad9 100644
--- a/net/netfilter/ipvs/ip_vs_xmit.c
+++ b/net/netfilter/ipvs/ip_vs_xmit.c
@@ -13,6 +13,9 @@
 *
 */
+#define KMSG_COMPONENT "IPVS"
+#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
 #include <linux/kernel.h>
 #include <linux/tcp.h>                  /* for tcphdr */
 #include <net/ip.h>
diff --git a/net/netlabel/netlabel_kapi.c b/net/netlabel/netlabel_kapi.c
index b0e582f2d37a..6ce00205f342 100644
--- a/net/netlabel/netlabel_kapi.c
+++ b/net/netlabel/netlabel_kapi.c
@@ -151,7 +151,7 @@ int netlbl_cfg_unlbl_map_add(const char *domain,
                        addr6 = addr;
                        mask6 = mask;
                        map6 = kzalloc(sizeof(*map6), GFP_ATOMIC);
-                        if (map4 == NULL)
+                        if (map6 == NULL)
                                goto cfg_unlbl_map_add_failure;
                        map6->type = NETLBL_NLTYPE_UNLABELED;
                        ipv6_addr_copy(&map6->list.addr, addr6);
@@ -185,8 +185,7 @@ int netlbl_cfg_unlbl_map_add(const char *domain,
        return 0;
 cfg_unlbl_map_add_failure:
-        if (entry != NULL)
+        kfree(entry->domain);
-                kfree(entry->domain);
        kfree(entry);
        kfree(addrmap);
        kfree(map4);
@@ -385,8 +384,7 @@ int netlbl_cfg_cipsov4_map_add(u32 doi,
 cfg_cipsov4_map_add_failure:
        cipso_v4_doi_putdef(doi_def);
-        if (entry != NULL)
+        kfree(entry->domain);
-                kfree(entry->domain);
        kfree(entry);
        kfree(addrmap);
        kfree(addrinfo);
diff --git a/net/rose/af_rose.c b/net/rose/af_rose.c
index 6bd8e93869ed..f0a76f6bca71 100644
--- a/net/rose/af_rose.c
+++ b/net/rose/af_rose.c
@@ -92,23 +92,21 @@ static void rose_set_lockdep_key(struct net_device *dev)
 /*
 *      Convert a ROSE address into text.
 */
-const char *rose2asc(const rose_address *addr)
+char *rose2asc(char *buf, const rose_address *addr)
 {
-        static char buffer[11];
        if (addr->rose_addr[0] == 0x00 && addr->rose_addr[1] == 0x00 &&
            addr->rose_addr[2] == 0x00 && addr->rose_addr[3] == 0x00 &&
            addr->rose_addr[4] == 0x00) {
-                strcpy(buffer, "*");
+                strcpy(buf, "*");
        } else {
-                sprintf(buffer, "%02X%02X%02X%02X%02X", addr->rose_addr[0] & 0xFF,
+                sprintf(buf, "%02X%02X%02X%02X%02X", addr->rose_addr[0] & 0xFF,
                                                addr->rose_addr[1] & 0xFF,
                                                addr->rose_addr[2] & 0xFF,
                                                addr->rose_addr[3] & 0xFF,
                                                addr->rose_addr[4] & 0xFF);
        }
-        return buffer;
+        return buf;
 }
 /*
@@ -1437,7 +1435,7 @@ static void rose_info_stop(struct seq_file *seq, void *v)
 static int rose_info_show(struct seq_file *seq, void *v)
 {
-        char buf[11];
+        char buf[11], rsbuf[11];
        if (v == SEQ_START_TOKEN)
                seq_puts(seq,
@@ -1455,8 +1453,8 @@ static int rose_info_show(struct seq_file *seq, void *v)
                        devname = dev->name;
                seq_printf(seq, "%-10s %-9s ",
-                        rose2asc(&rose->dest_addr),
+                           rose2asc(rsbuf, &rose->dest_addr),
-                        ax2asc(buf, &rose->dest_call));
+                           ax2asc(buf, &rose->dest_call));
                if (ax25cmp(&rose->source_call, &null_ax25_address) == 0)
                        callsign = "??????-?";
@@ -1465,7 +1463,7 @@ static int rose_info_show(struct seq_file *seq, void *v)
                seq_printf(seq,
                           "%-10s %-9s %-5s %3.3X %05d  %d  %d  %d  %d %3lu %3lu %3lu %3lu %3lu %3lu/%03lu %5d %5d %ld\n",
-                        rose2asc(&rose->source_addr),
+                        rose2asc(rsbuf, &rose->source_addr),
                        callsign,
                        devname,
                        rose->lci & 0x0FFF,
diff --git a/net/rose/rose_route.c b/net/rose/rose_route.c
index a81066a1010a..9478d9b3d977 100644
--- a/net/rose/rose_route.c
+++ b/net/rose/rose_route.c
@@ -1104,6 +1104,7 @@ static void rose_node_stop(struct seq_file *seq, void *v)
 static int rose_node_show(struct seq_file *seq, void *v)
 {
+        char rsbuf[11];
        int i;
        if (v == SEQ_START_TOKEN)
@@ -1112,13 +1113,13 @@ static int rose_node_show(struct seq_file *seq, void *v)
                const struct rose_node *rose_node = v;
                /* if (rose_node->loopback) {
                        seq_printf(seq, "%-10s %04d 1 loopback\n",
-                                rose2asc(&rose_node->address),
+                                   rose2asc(rsbuf, &rose_node->address),
-                                rose_node->mask);
+                                   rose_node->mask);
                } else { */
                        seq_printf(seq, "%-10s %04d %d",
-                                rose2asc(&rose_node->address),
+                                   rose2asc(rsbuf, &rose_node->address),
-                                rose_node->mask,
+                                   rose_node->mask,
-                                rose_node->count);
+                                   rose_node->count);
                        for (i = 0; i < rose_node->count; i++)
                                seq_printf(seq, " %05d",
@@ -1267,7 +1268,7 @@ static void rose_route_stop(struct seq_file *seq, void *v)
 static int rose_route_show(struct seq_file *seq, void *v)
 {
-        char buf[11];
+        char buf[11], rsbuf[11];
        if (v == SEQ_START_TOKEN)
                seq_puts(seq,
@@ -1279,7 +1280,7 @@ static int rose_route_show(struct seq_file *seq, void *v)
                        seq_printf(seq,
                                   "%3.3X  %-10s  %-9s  %05d      ",
                                   rose_route->lci1,
-                                   rose2asc(&rose_route->src_addr),
+                                   rose2asc(rsbuf, &rose_route->src_addr),
                                   ax2asc(buf, &rose_route->src_call),
                                   rose_route->neigh1->number);
                else
@@ -1289,10 +1290,10 @@ static int rose_route_show(struct seq_file *seq, void *v)
                if (rose_route->neigh2)
                        seq_printf(seq,
                                   "%3.3X  %-10s  %-9s  %05d\n",
-                                rose_route->lci2,
+                                   rose_route->lci2,
-                                rose2asc(&rose_route->dest_addr),
+                                   rose2asc(rsbuf, &rose_route->dest_addr),
-                                ax2asc(buf, &rose_route->dest_call),
+                                   ax2asc(buf, &rose_route->dest_call),
-                                rose_route->neigh2->number);
+                                   rose_route->neigh2->number);
                 else
                         seq_puts(seq,
                                  "000  *           *          00000\n");