Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (1745 commits)
  dp83640: free packet queues on remove
  dp83640: use proper function to free transmit time stamping packets
  ipv6: Do not use routes from locally generated RAs
  |PATCH net-next] tg3: add tx_dropped counter
  be2net: don't create multiple RX/TX rings in multi channel mode
  be2net: don't create multiple TXQs in BE2
  be2net: refactor VF setup/teardown code into be_vf_setup/clear()
  be2net: add vlan/rx-mode/flow-control config to be_setup()
  net_sched: cls_flow: use skb_header_pointer()
  ipv4: avoid useless call of the function check_peer_pmtu
  TCP: remove TCP_DEBUG
  net: Fix driver name for mdio-gpio.c
  ipv4: tcp: fix TOS value in ACK messages sent from TIME_WAIT
  rtnetlink: Add missing manual netlink notification in dev_change_net_namespaces
  ipv4: fix ipsec forward performance regression
  jme: fix irq storm after suspend/resume
  route: fix ICMP redirect validation
  net: hold sock reference while processing tx timestamps
  tcp: md5: add more const attributes
  Add ethtool -g support to virtio_net
  ...

Fix up conflicts in:
 - drivers/net/Kconfig:
	The split-up generated a trivial conflict with removal of a
	stale reference to Documentation/networking/net-modules.txt.
	Remove it from the new location instead.
 - fs/sysfs/dir.c:
	Fairly nasty conflicts with the sysfs rb-tree usage, conflicting
	with Eric Biederman's changes for tagged directories.

6 files changed, 19 insertions, 15 deletions

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;