11 files changed, 84 insertions, 53 deletions

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 19f04a34783a..93359fab240e 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -3416,7 +3416,8 @@ config NETCONSOLE
 
 config NETCONSOLE_DYNAMIC
         bool "Dynamic reconfiguration of logging targets"
-        depends on NETCONSOLE && SYSFS && CONFIGFS_FS
+        depends on NETCONSOLE && SYSFS && CONFIGFS_FS && \
+                        !(NETCONSOLE=y && CONFIGFS_FS=m)
         help
           This option enables the ability to dynamically reconfigure target
           parameters (interface, IP addresses, port numbers, MAC addresses)
diff --git a/drivers/net/bnx2x/bnx2x_main.c b/drivers/net/bnx2x/bnx2x_main.c
index 4b70311a11ef..74be989f51c5 100644
--- a/drivers/net/bnx2x/bnx2x_main.c
+++ b/drivers/net/bnx2x/bnx2x_main.c
@@ -49,6 +49,7 @@
 #include <linux/zlib.h>
 #include <linux/io.h>
 #include <linux/stringify.h>
+#include <linux/vmalloc.h>
 
 #define BNX2X_MAIN
 #include "bnx2x.h"
@@ -4537,8 +4538,7 @@ static int bnx2x_gunzip_init(struct bnx2x *bp)
         if (bp->strm  == NULL)
                 goto gunzip_nomem2;
 
-        bp->strm->workspace = kmalloc(zlib_inflate_workspacesize(),
-                                      GFP_KERNEL);
+        bp->strm->workspace = vmalloc(zlib_inflate_workspacesize());
         if (bp->strm->workspace == NULL)
                 goto gunzip_nomem3;
 
@@ -4562,7 +4562,7 @@ gunzip_nomem1:
 static void bnx2x_gunzip_end(struct bnx2x *bp)
 {
         if (bp->strm) {
-                kfree(bp->strm->workspace);
+                vfree(bp->strm->workspace);
                 kfree(bp->strm);
                 bp->strm = NULL;
         }
diff --git a/drivers/net/can/Kconfig b/drivers/net/can/Kconfig
index 1d699e3df547..754df5ef1729 100644
--- a/drivers/net/can/Kconfig
+++ b/drivers/net/can/Kconfig
@@ -36,7 +36,7 @@ config CAN_SLCAN
 config CAN_DEV
         tristate "Platform CAN drivers with Netlink support"
         depends on CAN
-        default Y
+        default y
         ---help---
           Enables the common framework for platform CAN drivers with Netlink
           support. This is the standard library for CAN drivers.
@@ -45,7 +45,7 @@ config CAN_DEV
 config CAN_CALC_BITTIMING
         bool "CAN bit-timing calculation"
         depends on CAN_DEV
-        default Y
+        default y
         ---help---
           If enabled, CAN bit-timing parameters will be calculated for the
           bit-rate specified via Netlink argument "bitrate" when the device
diff --git a/drivers/net/cxgb3/sge.c b/drivers/net/cxgb3/sge.c
index 3f562ba2f0c9..76bf5892b962 100644
--- a/drivers/net/cxgb3/sge.c
+++ b/drivers/net/cxgb3/sge.c
@@ -2026,7 +2026,7 @@ static void rx_eth(struct adapter *adap, struct sge_rspq *rq,
                 skb->ip_summed = CHECKSUM_UNNECESSARY;
         } else
                 skb_checksum_none_assert(skb);
-        skb_record_rx_queue(skb, qs - &adap->sge.qs[0]);
+        skb_record_rx_queue(skb, qs - &adap->sge.qs[pi->first_qset]);
 
         if (unlikely(p->vlan_valid)) {
                 struct vlan_group *grp = pi->vlan_grp;
@@ -2145,7 +2145,7 @@ static void lro_add_page(struct adapter *adap, struct sge_qset *qs,
         if (!complete)
                 return;
 
-        skb_record_rx_queue(skb, qs - &adap->sge.qs[0]);
+        skb_record_rx_queue(skb, qs - &adap->sge.qs[pi->first_qset]);
 
         if (unlikely(cpl->vlan_valid)) {
                 struct vlan_group *grp = pi->vlan_grp;
diff --git a/drivers/net/ppp_deflate.c b/drivers/net/ppp_deflate.c
index 31e9407a0739..1dbdf82a6dfd 100644
--- a/drivers/net/ppp_deflate.c
+++ b/drivers/net/ppp_deflate.c
@@ -305,7 +305,7 @@ static void z_decomp_free(void *arg)
 
         if (state) {
                 zlib_inflateEnd(&state->strm);
-                kfree(state->strm.workspace);
+                vfree(state->strm.workspace);
                 kfree(state);
         }
 }
@@ -345,8 +345,7 @@ static void *z_decomp_alloc(unsigned char *options, int opt_len)
 
         state->w_size         = w_size;
         state->strm.next_out  = NULL;
-        state->strm.workspace = kmalloc(zlib_inflate_workspacesize(),
-                                        GFP_KERNEL|__GFP_REPEAT);
+        state->strm.workspace = vmalloc(zlib_inflate_workspacesize());
         if (state->strm.workspace == NULL)
                 goto out_free;
 
diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
index 05d81780d1fd..5990621fb5cd 100644
--- a/drivers/net/r8169.c
+++ b/drivers/net/r8169.c
@@ -742,7 +742,7 @@ static void rtl8168_oob_notify(struct rtl8169_private *tp, u8 cmd)
         msleep(2);
         for (i = 0; i < 5; i++) {
                 udelay(100);
-                if (!(RTL_R32(ERIDR) & ERIAR_FLAG))
+                if (!(RTL_R32(ERIAR) & ERIAR_FLAG))
                         break;
         }
 
diff --git a/drivers/net/rionet.c b/drivers/net/rionet.c
index 77c5092a6a40..5d3436d47edd 100644
--- a/drivers/net/rionet.c
+++ b/drivers/net/rionet.c
@@ -378,7 +378,7 @@ static int rionet_close(struct net_device *ndev)
 
 static void rionet_remove(struct rio_dev *rdev)
 {
-        struct net_device *ndev = NULL;
+        struct net_device *ndev = rio_get_drvdata(rdev);
         struct rionet_peer *peer, *tmp;
 
         free_pages((unsigned long)rionet_active, rdev->net->hport->sys_size ?
@@ -433,22 +433,12 @@ static const struct net_device_ops rionet_netdev_ops = {
         .ndo_set_mac_address    = eth_mac_addr,
 };
 
-static int rionet_setup_netdev(struct rio_mport *mport)
+static int rionet_setup_netdev(struct rio_mport *mport, struct net_device *ndev)
 {
         int rc = 0;
-        struct net_device *ndev = NULL;
         struct rionet_private *rnet;
         u16 device_id;
 
-        /* Allocate our net_device structure */
-        ndev = alloc_etherdev(sizeof(struct rionet_private));
-        if (ndev == NULL) {
-                printk(KERN_INFO "%s: could not allocate ethernet device.\n",
-                       DRV_NAME);
-                rc = -ENOMEM;
-                goto out;
-        }
-
         rionet_active = (struct rio_dev **)__get_free_pages(GFP_KERNEL,
                         mport->sys_size ? __fls(sizeof(void *)) + 4 : 0);
         if (!rionet_active) {
@@ -504,11 +494,21 @@ static int rionet_probe(struct rio_dev *rdev, const struct rio_device_id *id)
         int rc = -ENODEV;
         u32 lpef, lsrc_ops, ldst_ops;
         struct rionet_peer *peer;
+        struct net_device *ndev = NULL;
 
         /* If local device is not rionet capable, give up quickly */
         if (!rionet_capable)
                 goto out;
 
+        /* Allocate our net_device structure */
+        ndev = alloc_etherdev(sizeof(struct rionet_private));
+        if (ndev == NULL) {
+                printk(KERN_INFO "%s: could not allocate ethernet device.\n",
+                       DRV_NAME);
+                rc = -ENOMEM;
+                goto out;
+        }
+
         /*
          * First time through, make sure local device is rionet
          * capable, setup netdev,  and set flags so this is skipped
@@ -529,7 +529,7 @@ static int rionet_probe(struct rio_dev *rdev, const struct rio_device_id *id)
                         goto out;
                 }
 
-                rc = rionet_setup_netdev(rdev->net->hport);
+                rc = rionet_setup_netdev(rdev->net->hport, ndev);
                 rionet_check = 1;
         }
 
@@ -546,6 +546,8 @@ static int rionet_probe(struct rio_dev *rdev, const struct rio_device_id *id)
                 list_add_tail(&peer->node, &rionet_peers);
         }
 
+        rio_set_drvdata(rdev, ndev);
+
       out:
         return rc;
 }
diff --git a/drivers/net/usb/kalmia.c b/drivers/net/usb/kalmia.c
index d965fb1e013e..a9b6c63d54e4 100644
--- a/drivers/net/usb/kalmia.c
+++ b/drivers/net/usb/kalmia.c
@@ -100,34 +100,42 @@ kalmia_send_init_packet(struct usbnet *dev, u8 *init_msg, u8 init_msg_len,
 static int
 kalmia_init_and_get_ethernet_addr(struct usbnet *dev, u8 *ethernet_addr)
 {
-        char init_msg_1[] =
+        const static char init_msg_1[] =
                 { 0x57, 0x50, 0x04, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00,
                 0x00, 0x00 };
-        char init_msg_2[] =
+        const static char init_msg_2[] =
                 { 0x57, 0x50, 0x04, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0xf4,
                 0x00, 0x00 };
-        char receive_buf[28];
+        const static int buflen = 28;
+        char *usb_buf;
         int status;
 
-        status = kalmia_send_init_packet(dev, init_msg_1, sizeof(init_msg_1)
-                / sizeof(init_msg_1[0]), receive_buf, 24);
+        usb_buf = kmalloc(buflen, GFP_DMA | GFP_KERNEL);
+        if (!usb_buf)
+                return -ENOMEM;
+
+        memcpy(usb_buf, init_msg_1, 12);
+        status = kalmia_send_init_packet(dev, usb_buf, sizeof(init_msg_1)
+                / sizeof(init_msg_1[0]), usb_buf, 24);
         if (status != 0)
                 return status;
 
-        status = kalmia_send_init_packet(dev, init_msg_2, sizeof(init_msg_2)
-                / sizeof(init_msg_2[0]), receive_buf, 28);
+        memcpy(usb_buf, init_msg_2, 12);
+        status = kalmia_send_init_packet(dev, usb_buf, sizeof(init_msg_2)
+                / sizeof(init_msg_2[0]), usb_buf, 28);
         if (status != 0)
                 return status;
 
-        memcpy(ethernet_addr, receive_buf + 10, ETH_ALEN);
+        memcpy(ethernet_addr, usb_buf + 10, ETH_ALEN);
 
+        kfree(usb_buf);
         return status;
 }
 
 static int
 kalmia_bind(struct usbnet *dev, struct usb_interface *intf)
 {
-        u8 status;
+        int status;
         u8 ethernet_addr[ETH_ALEN];
 
         /* Don't bind to AT command interface */
@@ -190,7 +198,8 @@ kalmia_tx_fixup(struct usbnet *dev, struct sk_buff *skb, gfp_t flags)
         dev_kfree_skb_any(skb);
         skb = skb2;
 
-        done: header_start = skb_push(skb, KALMIA_HEADER_LENGTH);
+done:
+        header_start = skb_push(skb, KALMIA_HEADER_LENGTH);
         ether_type_1 = header_start[KALMIA_HEADER_LENGTH + 12];
         ether_type_2 = header_start[KALMIA_HEADER_LENGTH + 13];
 
@@ -201,9 +210,8 @@ kalmia_tx_fixup(struct usbnet *dev, struct sk_buff *skb, gfp_t flags)
         header_start[0] = 0x57;
         header_start[1] = 0x44;
         content_len = skb->len - KALMIA_HEADER_LENGTH;
-        header_start[2] = (content_len & 0xff); /* low byte */
-        header_start[3] = (content_len >> 8); /* high byte */
 
+        put_unaligned_le16(content_len, &header_start[2]);
         header_start[4] = ether_type_1;
         header_start[5] = ether_type_2;
 
@@ -231,13 +239,13 @@ kalmia_rx_fixup(struct usbnet *dev, struct sk_buff *skb)
          * Our task here is to strip off framing, leaving skb with one
          * data frame for the usbnet framework code to process.
          */
-        const u8 HEADER_END_OF_USB_PACKET[] =
+        const static u8 HEADER_END_OF_USB_PACKET[] =
                 { 0x57, 0x5a, 0x00, 0x00, 0x08, 0x00 };
-        const u8 EXPECTED_UNKNOWN_HEADER_1[] =
+        const static u8 EXPECTED_UNKNOWN_HEADER_1[] =
                 { 0x57, 0x43, 0x1e, 0x00, 0x15, 0x02 };
-        const u8 EXPECTED_UNKNOWN_HEADER_2[] =
+        const static u8 EXPECTED_UNKNOWN_HEADER_2[] =
                 { 0x57, 0x50, 0x0e, 0x00, 0x00, 0x00 };
-        u8 i = 0;
+        int i = 0;
 
         /* incomplete header? */
         if (skb->len < KALMIA_HEADER_LENGTH)
@@ -285,7 +293,7 @@ kalmia_rx_fixup(struct usbnet *dev, struct sk_buff *skb)
 
                 /* subtract start header and end header */
                 usb_packet_length = skb->len - (2 * KALMIA_HEADER_LENGTH);
-                ether_packet_length = header_start[2] + (header_start[3] << 8);
+                ether_packet_length = get_unaligned_le16(&header_start[2]);
                 skb_pull(skb, KALMIA_HEADER_LENGTH);
 
                 /* Some small packets misses end marker */
diff --git a/drivers/net/usb/zaurus.c b/drivers/net/usb/zaurus.c
index 241756e0e86f..1a2234c20514 100644
--- a/drivers/net/usb/zaurus.c
+++ b/drivers/net/usb/zaurus.c
@@ -331,17 +331,7 @@ static const struct usb_device_id	products [] = {
         ZAURUS_MASTER_INTERFACE,
         .driver_info = ZAURUS_PXA_INFO,
 },
-
-
-/* At least some of the newest PXA units have very different lies about
- * their standards support:  they claim to be cell phones offering
- * direct access to their radios!  (No, they don't conform to CDC MDLM.)
- */
 {
-        USB_INTERFACE_INFO(USB_CLASS_COMM, USB_CDC_SUBCLASS_MDLM,
-                        USB_CDC_PROTO_NONE),
-        .driver_info = (unsigned long) &bogus_mdlm_info,
-}, {
         /* Motorola MOTOMAGX phones */
         USB_DEVICE_AND_INTERFACE_INFO(0x22b8, 0x6425, USB_CLASS_COMM,
                         USB_CDC_SUBCLASS_MDLM, USB_CDC_PROTO_NONE),
diff --git a/drivers/net/wireless/rtlwifi/pci.c b/drivers/net/wireless/rtlwifi/pci.c
index 9f8ccae93317..254b64ba4bf6 100644
--- a/drivers/net/wireless/rtlwifi/pci.c
+++ b/drivers/net/wireless/rtlwifi/pci.c
@@ -1624,6 +1624,16 @@ static bool _rtl_pci_find_adapter(struct pci_dev *pdev,
         pci_read_config_byte(pdev, 0x8, &revisionid);
         pci_read_config_word(pdev, 0x3C, &irqline);
 
+        /* PCI ID 0x10ec:0x8192 occurs for both RTL8192E, which uses
+         * r8192e_pci, and RTL8192SE, which uses this driver. If the
+         * revision ID is RTL_PCI_REVISION_ID_8192PCIE (0x01), then
+         * the correct driver is r8192e_pci, thus this routine should
+         * return false.
+         */
+        if (deviceid == RTL_PCI_8192SE_DID &&
+            revisionid == RTL_PCI_REVISION_ID_8192PCIE)
+                return false;
+
         if (deviceid == RTL_PCI_8192_DID ||
             deviceid == RTL_PCI_0044_DID ||
             deviceid == RTL_PCI_0047_DID ||
@@ -1856,7 +1866,8 @@ int __devinit rtl_pci_probe(struct pci_dev *pdev,
         pci_write_config_byte(pdev, 0x04, 0x07);
 
         /* find adapter */
-        _rtl_pci_find_adapter(pdev, hw);
+        if (!_rtl_pci_find_adapter(pdev, hw))
+                goto fail3;
 
         /* Init IO handler */
         _rtl_pci_io_handler_init(&pdev->dev, hw);
diff --git a/drivers/net/wireless/rtlwifi/rtl8192cu/sw.c b/drivers/net/wireless/rtlwifi/rtl8192cu/sw.c
index bee7c1480f63..092e342c19df 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192cu/sw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192cu/sw.c
@@ -53,6 +53,8 @@ MODULE_FIRMWARE("rtlwifi/rtl8192cufw.bin");
 static int rtl92cu_init_sw_vars(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
+        const struct firmware *firmware;
+        int err;
 
         rtlpriv->dm.dm_initialgain_enable = 1;
         rtlpriv->dm.dm_flag = 0;
@@ -64,6 +66,24 @@ static int rtl92cu_init_sw_vars(struct ieee80211_hw *hw)
                          ("Can't alloc buffer for fw.\n"));
                 return 1;
         }
+        /* request fw */
+        err = request_firmware(&firmware, rtlpriv->cfg->fw_name,
+                        rtlpriv->io.dev);
+        if (err) {
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
+                         ("Failed to request firmware!\n"));
+                return 1;
+        }
+        if (firmware->size > 0x4000) {
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
+                         ("Firmware is too big!\n"));
+                release_firmware(firmware);
+                return 1;
+        }
+        memcpy(rtlpriv->rtlhal.pfirmware, firmware->data, firmware->size);
+        rtlpriv->rtlhal.fwsize = firmware->size;
+        release_firmware(firmware);
+
         return 0;
 }