13 files changed, 38 insertions, 27 deletions

diff --git a/drivers/scsi/bnx2fc/Kconfig b/drivers/scsi/bnx2fc/Kconfig
index 6a38080e35ed..cfcad8bde7cf 100644
--- a/drivers/scsi/bnx2fc/Kconfig
+++ b/drivers/scsi/bnx2fc/Kconfig
@@ -2,7 +2,8 @@ config SCSI_BNX2X_FCOE
         tristate "Broadcom NetXtreme II FCoE support"
         depends on PCI
         select NETDEVICES
-        select NETDEV_1000
+        select ETHERNET
+        select NET_VENDOR_BROADCOM
         select LIBFC
         select LIBFCOE
         select CNIC
diff --git a/drivers/scsi/bnx2fc/bnx2fc.h b/drivers/scsi/bnx2fc/bnx2fc.h
index 42228ca5a9d2..dd335a2a797b 100644
--- a/drivers/scsi/bnx2fc/bnx2fc.h
+++ b/drivers/scsi/bnx2fc/bnx2fc.h
@@ -58,7 +58,7 @@
 
 #include "57xx_hsi_bnx2fc.h"
 #include "bnx2fc_debug.h"
-#include "../../net/cnic_if.h"
+#include "../../net/ethernet/broadcom/cnic_if.h"
 #include "bnx2fc_constants.h"
 
 #define BNX2FC_NAME             "bnx2fc"
@@ -81,7 +81,7 @@
 #define BNX2FC_RQ_WQES_MAX      16
 #define BNX2FC_CQ_WQES_MAX      (BNX2FC_SQ_WQES_MAX + BNX2FC_RQ_WQES_MAX)
 
-#define BNX2FC_NUM_MAX_SESS     128
+#define BNX2FC_NUM_MAX_SESS     1024
 #define BNX2FC_NUM_MAX_SESS_LOG (ilog2(BNX2FC_NUM_MAX_SESS))
 
 #define BNX2FC_MAX_OUTSTANDING_CMNDS    2048
diff --git a/drivers/scsi/bnx2fc/bnx2fc_fcoe.c b/drivers/scsi/bnx2fc/bnx2fc_fcoe.c
index 7cb2cd48b17b..820a1840c3f7 100644
--- a/drivers/scsi/bnx2fc/bnx2fc_fcoe.c
+++ b/drivers/scsi/bnx2fc/bnx2fc_fcoe.c
@@ -302,7 +302,7 @@ static int bnx2fc_xmit(struct fc_lport *lport, struct fc_frame *fp)
                         return -ENOMEM;
                 }
                 frag = &skb_shinfo(skb)->frags[skb_shinfo(skb)->nr_frags - 1];
-                cp = kmap_atomic(frag->page, KM_SKB_DATA_SOFTIRQ)
+                cp = kmap_atomic(skb_frag_page(frag), KM_SKB_DATA_SOFTIRQ)
                                 + frag->page_offset;
         } else {
                 cp = (struct fcoe_crc_eof *)skb_put(skb, tlen);
@@ -673,7 +673,7 @@ static void bnx2fc_link_speed_update(struct fc_lport *lport)
         struct net_device *netdev = interface->netdev;
         struct ethtool_cmd ecmd;
 
-        if (!dev_ethtool_get_settings(netdev, &ecmd)) {
+        if (!__ethtool_get_settings(netdev, &ecmd)) {
                 lport->link_supported_speeds &=
                         ~(FC_PORTSPEED_1GBIT | FC_PORTSPEED_10GBIT);
                 if (ecmd.supported & (SUPPORTED_1000baseT_Half |
@@ -1001,9 +1001,11 @@ static int bnx2fc_vport_create(struct fc_vport *vport, bool disabled)
                         "this interface\n");
                 return -EIO;
         }
+        rtnl_lock();
         mutex_lock(&bnx2fc_dev_lock);
         vn_port = bnx2fc_if_create(interface, &vport->dev, 1);
         mutex_unlock(&bnx2fc_dev_lock);
+        rtnl_unlock();
 
         if (IS_ERR(vn_port)) {
                 printk(KERN_ERR PFX "bnx2fc_vport_create (%s) failed\n",
diff --git a/drivers/scsi/bnx2i/Kconfig b/drivers/scsi/bnx2i/Kconfig
index 45a6154ce972..01cff1894b6d 100644
--- a/drivers/scsi/bnx2i/Kconfig
+++ b/drivers/scsi/bnx2i/Kconfig
@@ -4,7 +4,8 @@ config SCSI_BNX2_ISCSI
         depends on PCI
         select SCSI_ISCSI_ATTRS
         select NETDEVICES
-        select NETDEV_1000
+        select ETHERNET
+        select NET_VENDOR_BROADCOM
         select CNIC
         ---help---
         This driver supports iSCSI offload for the Broadcom NetXtreme II
diff --git a/drivers/scsi/bnx2i/bnx2i.h b/drivers/scsi/bnx2i/bnx2i.h
index dc5700765db4..0bd70e80efe4 100644
--- a/drivers/scsi/bnx2i/bnx2i.h
+++ b/drivers/scsi/bnx2i/bnx2i.h
@@ -40,7 +40,7 @@
 #include <scsi/libiscsi.h>
 #include <scsi/scsi_transport_iscsi.h>
 
-#include "../../net/cnic_if.h"
+#include "../../net/ethernet/broadcom/cnic_if.h"
 #include "57xx_iscsi_hsi.h"
 #include "57xx_iscsi_constants.h"
 
diff --git a/drivers/scsi/cxgbi/cxgb3i/Kbuild b/drivers/scsi/cxgbi/cxgb3i/Kbuild
index 09dbf9efc8ea..6f095e28a974 100644
--- a/drivers/scsi/cxgbi/cxgb3i/Kbuild
+++ b/drivers/scsi/cxgbi/cxgb3i/Kbuild
@@ -1,3 +1,3 @@
-EXTRA_CFLAGS += -I$(srctree)/drivers/net/cxgb3
+EXTRA_CFLAGS += -I$(srctree)/drivers/net/ethernet/chelsio/cxgb3
 
 obj-$(CONFIG_SCSI_CXGB3_ISCSI) += cxgb3i.o
diff --git a/drivers/scsi/cxgbi/cxgb3i/Kconfig b/drivers/scsi/cxgbi/cxgb3i/Kconfig
index 11dff23f7838..6bbc36fbd6ec 100644
--- a/drivers/scsi/cxgbi/cxgb3i/Kconfig
+++ b/drivers/scsi/cxgbi/cxgb3i/Kconfig
@@ -2,7 +2,8 @@ config SCSI_CXGB3_ISCSI
         tristate "Chelsio T3 iSCSI support"
         depends on PCI && INET
         select NETDEVICES
-        select NETDEV_10000
+        select ETHERNET
+        select NET_VENDOR_CHELSIO
         select CHELSIO_T3
         select SCSI_ISCSI_ATTRS
         ---help---
diff --git a/drivers/scsi/cxgbi/cxgb4i/Kbuild b/drivers/scsi/cxgbi/cxgb4i/Kbuild
index b9f4af7454b7..8290cdaa4652 100644
--- a/drivers/scsi/cxgbi/cxgb4i/Kbuild
+++ b/drivers/scsi/cxgbi/cxgb4i/Kbuild
@@ -1,3 +1,3 @@
-EXTRA_CFLAGS += -I$(srctree)/drivers/net/cxgb4
+EXTRA_CFLAGS += -I$(srctree)/drivers/net/ethernet/chelsio/cxgb4
 
 obj-$(CONFIG_SCSI_CXGB4_ISCSI) += cxgb4i.o
diff --git a/drivers/scsi/cxgbi/cxgb4i/Kconfig b/drivers/scsi/cxgbi/cxgb4i/Kconfig
index d5302c27f377..16b2c7d26617 100644
--- a/drivers/scsi/cxgbi/cxgb4i/Kconfig
+++ b/drivers/scsi/cxgbi/cxgb4i/Kconfig
@@ -2,7 +2,8 @@ config SCSI_CXGB4_ISCSI
         tristate "Chelsio T4 iSCSI support"
         depends on PCI && INET
         select NETDEVICES
-        select NETDEV_10000
+        select ETHERNET
+        select NET_VENDOR_CHELSIO
         select CHELSIO_T4
         select SCSI_ISCSI_ATTRS
         ---help---
diff --git a/drivers/scsi/cxgbi/libcxgbi.c b/drivers/scsi/cxgbi/libcxgbi.c
index 77ac217ad5ce..1c1329bc77c7 100644
--- a/drivers/scsi/cxgbi/libcxgbi.c
+++ b/drivers/scsi/cxgbi/libcxgbi.c
@@ -1787,7 +1787,7 @@ static int sgl_seek_offset(struct scatterlist *sgl, unsigned int sgcnt,
 }
 
 static int sgl_read_to_frags(struct scatterlist *sg, unsigned int sgoffset,
-                                unsigned int dlen, skb_frag_t *frags,
+                                unsigned int dlen, struct page_frag *frags,
                                 int frag_max)
 {
         unsigned int datalen = dlen;
@@ -1814,7 +1814,7 @@ static int sgl_read_to_frags(struct scatterlist *sg, unsigned int sgoffset,
                 copy = min(datalen, sglen);
                 if (i && page == frags[i - 1].page &&
                     sgoffset + sg->offset ==
-                        frags[i - 1].page_offset + frags[i - 1].size) {
+                        frags[i - 1].offset + frags[i - 1].size) {
                         frags[i - 1].size += copy;
                 } else {
                         if (i >= frag_max) {
@@ -1824,7 +1824,7 @@ static int sgl_read_to_frags(struct scatterlist *sg, unsigned int sgoffset,
                         }
 
                         frags[i].page = page;
-                        frags[i].page_offset = sg->offset + sgoffset;
+                        frags[i].offset = sg->offset + sgoffset;
                         frags[i].size = copy;
                         i++;
                 }
@@ -1944,14 +1944,14 @@ int cxgbi_conn_init_pdu(struct iscsi_task *task, unsigned int offset,
                 if (tdata->nr_frags > MAX_SKB_FRAGS ||
                     (padlen && tdata->nr_frags == MAX_SKB_FRAGS)) {
                         char *dst = skb->data + task->hdr_len;
-                        skb_frag_t *frag = tdata->frags;
+                        struct page_frag *frag = tdata->frags;
 
                         /* data fits in the skb's headroom */
                         for (i = 0; i < tdata->nr_frags; i++, frag++) {
                                 char *src = kmap_atomic(frag->page,
                                                         KM_SOFTIRQ0);
 
-                                memcpy(dst, src+frag->page_offset, frag->size);
+                                memcpy(dst, src+frag->offset, frag->size);
                                 dst += frag->size;
                                 kunmap_atomic(src, KM_SOFTIRQ0);
                         }
@@ -1962,11 +1962,13 @@ int cxgbi_conn_init_pdu(struct iscsi_task *task, unsigned int offset,
                         skb_put(skb, count + padlen);
                 } else {
                         /* data fit into frag_list */
-                        for (i = 0; i < tdata->nr_frags; i++)
-                                get_page(tdata->frags[i].page);
-
-                        memcpy(skb_shinfo(skb)->frags, tdata->frags,
-                                sizeof(skb_frag_t) * tdata->nr_frags);
+                        for (i = 0; i < tdata->nr_frags; i++) {
+                                __skb_fill_page_desc(skb, i,
+                                                tdata->frags[i].page,
+                                                tdata->frags[i].offset,
+                                                tdata->frags[i].size);
+                                skb_frag_ref(skb, i);
+                        }
                         skb_shinfo(skb)->nr_frags = tdata->nr_frags;
                         skb->len += count;
                         skb->data_len += count;
diff --git a/drivers/scsi/cxgbi/libcxgbi.h b/drivers/scsi/cxgbi/libcxgbi.h
index 9267844519c9..3a25b1187c10 100644
--- a/drivers/scsi/cxgbi/libcxgbi.h
+++ b/drivers/scsi/cxgbi/libcxgbi.h
@@ -574,7 +574,7 @@ struct cxgbi_endpoint {
 #define MAX_PDU_FRAGS   ((ULP2_MAX_PDU_PAYLOAD + 512 - 1) / 512)
 struct cxgbi_task_data {
         unsigned short nr_frags;
-        skb_frag_t frags[MAX_PDU_FRAGS];
+        struct page_frag frags[MAX_PDU_FRAGS];
         struct sk_buff *skb;
         unsigned int offset;
         unsigned int count;
diff --git a/drivers/scsi/fcoe/fcoe.c b/drivers/scsi/fcoe/fcoe.c
index 34c8d82b7423..a1c0ddd53aa9 100644
--- a/drivers/scsi/fcoe/fcoe.c
+++ b/drivers/scsi/fcoe/fcoe.c
@@ -1517,7 +1517,7 @@ int fcoe_xmit(struct fc_lport *lport, struct fc_frame *fp)
                         return -ENOMEM;
                 }
                 frag = &skb_shinfo(skb)->frags[skb_shinfo(skb)->nr_frags - 1];
-                cp = kmap_atomic(frag->page, KM_SKB_DATA_SOFTIRQ)
+                cp = kmap_atomic(skb_frag_page(frag), KM_SKB_DATA_SOFTIRQ)
                         + frag->page_offset;
         } else {
                 cp = (struct fcoe_crc_eof *)skb_put(skb, tlen);
@@ -2045,7 +2045,7 @@ int fcoe_link_speed_update(struct fc_lport *lport)
         struct net_device *netdev = fcoe_netdev(lport);
         struct ethtool_cmd ecmd;
 
-        if (!dev_ethtool_get_settings(netdev, &ecmd)) {
+        if (!__ethtool_get_settings(netdev, &ecmd)) {
                 lport->link_supported_speeds &=
                         ~(FC_PORTSPEED_1GBIT | FC_PORTSPEED_10GBIT);
                 if (ecmd.supported & (SUPPORTED_1000baseT_Half |
@@ -2454,7 +2454,9 @@ static int fcoe_vport_create(struct fc_vport *vport, bool disabled)
         }
 
         mutex_lock(&fcoe_config_mutex);
+        rtnl_lock();
         vn_port = fcoe_if_create(fcoe, &vport->dev, 1);
+        rtnl_unlock();
         mutex_unlock(&fcoe_config_mutex);
 
         if (IS_ERR(vn_port)) {
diff --git a/drivers/scsi/fcoe/fcoe_transport.c b/drivers/scsi/fcoe/fcoe_transport.c
index 41068e8748e7..dac8e39a5188 100644
--- a/drivers/scsi/fcoe/fcoe_transport.c
+++ b/drivers/scsi/fcoe/fcoe_transport.c
@@ -105,11 +105,12 @@ u32 fcoe_fc_crc(struct fc_frame *fp)
         for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) {
                 frag = &skb_shinfo(skb)->frags[i];
                 off = frag->page_offset;
-                len = frag->size;
+                len = skb_frag_size(frag);
                 while (len > 0) {
                         clen = min(len, PAGE_SIZE - (off & ~PAGE_MASK));
-                        data = kmap_atomic(frag->page + (off >> PAGE_SHIFT),
-                                           KM_SKB_DATA_SOFTIRQ);
+                        data = kmap_atomic(
+                                skb_frag_page(frag) + (off >> PAGE_SHIFT),
+                                KM_SKB_DATA_SOFTIRQ);
                         crc = crc32(crc, data + (off & ~PAGE_MASK), clen);
                         kunmap_atomic(data, KM_SKB_DATA_SOFTIRQ);
                         off += clen;