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

Quoth David:

1) GRO MAC header comparisons were ethernet specific, breaking other
   link types.  This required a multi-faceted fix to cure the originally
   noted case (Infiniband), because IPoIB was lying about it's actual
   hard header length.  Thanks to Eric Dumazet, Roland Dreier, and
   others.

2) Fix build failure when INET_UDP_DIAG is built in and ipv6 is modular.
   From Anisse Astier.

3) Off by ones and other bug fixes in netprio_cgroup from Neil Horman.

4) ipv4 TCP reset generation needs to respect any network interface
   binding from the socket, otherwise route lookups might give a
   different result than all the other segments received.  From Shawn
   Lu.

5) Fix unintended regression in ipv4 proxy ARP responses, from Thomas
   Graf.

6) Fix SKB under-allocation bug in sh_eth, from Yoshihiro Shimoda.

7) Revert skge PCI mapping changes that are causing crashes for some
   folks, from Stephen Hemminger.

8) IPV4 route lookups fill in the wildcarded fields of the given flow
   lookup key passed in, which is fine most of the time as this is
   exactly what the caller's want.  However there are a few cases that
   want to retain the original flow key values afterwards, so handle
   those cases properly.  Fix from Julian Anastasov.

9) IGB/IXGBE VF lookup bug fixes from Greg Rose.

10) Properly null terminate filename passed to ethtool flash device
    method, from Ben Hutchings.

11) S3 resume fix in via-velocity from David Lv.

12) Fix double SKB free during xmit failure in CAIF, from Dmitry
    Tarnyagin.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (72 commits)
  net: Don't proxy arp respond if iif == rt->dst.dev if private VLAN is disabled
  ipv4: Fix wrong order of ip_rt_get_source() and update iph->daddr.
  netprio_cgroup: fix wrong memory access when NETPRIO_CGROUP=m
  netprio_cgroup: don't allocate prio table when a device is registered
  netprio_cgroup: fix an off-by-one bug
  bna: fix error handling of bnad_get_flash_partition_by_offset()
  isdn: type bug in isdn_net_header()
  net: Make qdisc_skb_cb upper size bound explicit.
  ixgbe: ethtool: stats user buffer overrun
  ixgbe: dcb: up2tc mapping lost on disable/enable CEE DCB state
  ixgbe: do not update real num queues when netdev is going away
  ixgbe: Fix broken dependency on MAX_SKB_FRAGS being related to page size
  ixgbe: Fix case of Tx Hang in PF with 32 VFs
  ixgbe: fix vf lookup
  igb: fix vf lookup
  e1000: add dropped DMA receive enable back in for WoL
  gro: more generic L2 header check
  IPoIB: Stop lying about hard_header_len and use skb->cb to stash LL addresses
  zd1211rw: firmware needs duration_id set to zero for non-pspoll frames
  net: enable TC35815 for MIPS again
  ...

3 files changed, 24 insertions, 47 deletions

diff --git a/drivers/infiniband/ulp/ipoib/ipoib.h b/drivers/infiniband/ulp/ipoib/ipoib.h
index b3cc1e062b17..86df632ea612 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib.h
+++ b/drivers/infiniband/ulp/ipoib/ipoib.h
@@ -44,6 +44,7 @@
 #include <linux/mutex.h>
 
 #include <net/neighbour.h>
+#include <net/sch_generic.h>
 
 #include <linux/atomic.h>
 
@@ -117,8 +118,9 @@ struct ipoib_header {
         u16     reserved;
 };
 
-struct ipoib_pseudoheader {
-        u8  hwaddr[INFINIBAND_ALEN];
+struct ipoib_cb {
+        struct qdisc_skb_cb     qdisc_cb;
+        u8                      hwaddr[INFINIBAND_ALEN];
 };
 
 /* Used for all multicast joins (broadcast, IPv4 mcast and IPv6 mcast) */
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_main.c b/drivers/infiniband/ulp/ipoib/ipoib_main.c
index 3514ca05deea..3974c290b667 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_main.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_main.c
@@ -653,7 +653,7 @@ static void ipoib_path_lookup(struct sk_buff *skb, struct neighbour *n, struct n
 }
 
 static void unicast_arp_send(struct sk_buff *skb, struct net_device *dev,
-                             struct ipoib_pseudoheader *phdr)
+                             struct ipoib_cb *cb)
 {
         struct ipoib_dev_priv *priv = netdev_priv(dev);
         struct ipoib_path *path;
@@ -661,17 +661,15 @@ static void unicast_arp_send(struct sk_buff *skb, struct net_device *dev,
 
         spin_lock_irqsave(&priv->lock, flags);
 
-        path = __path_find(dev, phdr->hwaddr + 4);
+        path = __path_find(dev, cb->hwaddr + 4);
         if (!path || !path->valid) {
                 int new_path = 0;
 
                 if (!path) {
-                        path = path_rec_create(dev, phdr->hwaddr + 4);
+                        path = path_rec_create(dev, cb->hwaddr + 4);
                         new_path = 1;
                 }
                 if (path) {
-                        /* put pseudoheader back on for next time */
-                        skb_push(skb, sizeof *phdr);
                         __skb_queue_tail(&path->queue, skb);
 
                         if (!path->query && path_rec_start(dev, path)) {
@@ -695,12 +693,10 @@ static void unicast_arp_send(struct sk_buff *skb, struct net_device *dev,
                           be16_to_cpu(path->pathrec.dlid));
 
                 spin_unlock_irqrestore(&priv->lock, flags);
-                ipoib_send(dev, skb, path->ah, IPOIB_QPN(phdr->hwaddr));
+                ipoib_send(dev, skb, path->ah, IPOIB_QPN(cb->hwaddr));
                 return;
         } else if ((path->query || !path_rec_start(dev, path)) &&
                    skb_queue_len(&path->queue) < IPOIB_MAX_PATH_REC_QUEUE) {
-                /* put pseudoheader back on for next time */
-                skb_push(skb, sizeof *phdr);
                 __skb_queue_tail(&path->queue, skb);
         } else {
                 ++dev->stats.tx_dropped;
@@ -774,16 +770,14 @@ static int ipoib_start_xmit(struct sk_buff *skb, struct net_device *dev)
                         dev_kfree_skb_any(skb);
                 }
         } else {
-                struct ipoib_pseudoheader *phdr =
-                        (struct ipoib_pseudoheader *) skb->data;
-                skb_pull(skb, sizeof *phdr);
+                struct ipoib_cb *cb = (struct ipoib_cb *) skb->cb;
 
-                if (phdr->hwaddr[4] == 0xff) {
+                if (cb->hwaddr[4] == 0xff) {
                         /* Add in the P_Key for multicast*/
-                        phdr->hwaddr[8] = (priv->pkey >> 8) & 0xff;
-                        phdr->hwaddr[9] = priv->pkey & 0xff;
+                        cb->hwaddr[8] = (priv->pkey >> 8) & 0xff;
+                        cb->hwaddr[9] = priv->pkey & 0xff;
 
-                        ipoib_mcast_send(dev, phdr->hwaddr + 4, skb);
+                        ipoib_mcast_send(dev, cb->hwaddr + 4, skb);
                 } else {
                         /* unicast GID -- should be ARP or RARP reply */
 
@@ -792,14 +786,14 @@ static int ipoib_start_xmit(struct sk_buff *skb, struct net_device *dev)
                                 ipoib_warn(priv, "Unicast, no %s: type %04x, QPN %06x %pI6\n",
                                            skb_dst(skb) ? "neigh" : "dst",
                                            be16_to_cpup((__be16 *) skb->data),
-                                           IPOIB_QPN(phdr->hwaddr),
-                                           phdr->hwaddr + 4);
+                                           IPOIB_QPN(cb->hwaddr),
+                                           cb->hwaddr + 4);
                                 dev_kfree_skb_any(skb);
                                 ++dev->stats.tx_dropped;
                                 goto unlock;
                         }
 
-                        unicast_arp_send(skb, dev, phdr);
+                        unicast_arp_send(skb, dev, cb);
                 }
         }
 unlock:
@@ -825,8 +819,6 @@ static int ipoib_hard_header(struct sk_buff *skb,
                              const void *daddr, const void *saddr, unsigned len)
 {
         struct ipoib_header *header;
-        struct dst_entry *dst;
-        struct neighbour *n;
 
         header = (struct ipoib_header *) skb_push(skb, sizeof *header);
 
@@ -834,18 +826,13 @@ static int ipoib_hard_header(struct sk_buff *skb,
         header->reserved = 0;
 
         /*
-         * If we don't have a neighbour structure, stuff the
-         * destination address onto the front of the skb so we can
-         * figure out where to send the packet later.
+         * If we don't have a dst_entry structure, stuff the
+         * destination address into skb->cb so we can figure out where
+         * to send the packet later.
          */
-        dst = skb_dst(skb);
-        n = NULL;
-        if (dst)
-                n = dst_get_neighbour_noref_raw(dst);
-        if ((!dst || !n) && daddr) {
-                struct ipoib_pseudoheader *phdr =
-                        (struct ipoib_pseudoheader *) skb_push(skb, sizeof *phdr);
-                memcpy(phdr->hwaddr, daddr, INFINIBAND_ALEN);
+        if (!skb_dst(skb)) {
+                struct ipoib_cb *cb = (struct ipoib_cb *) skb->cb;
+                memcpy(cb->hwaddr, daddr, INFINIBAND_ALEN);
         }
 
         return 0;
@@ -1021,11 +1008,7 @@ static void ipoib_setup(struct net_device *dev)
 
         dev->flags              |= IFF_BROADCAST | IFF_MULTICAST;
 
-        /*
-         * We add in INFINIBAND_ALEN to allow for the destination
-         * address "pseudoheader" for skbs without neighbour struct.
-         */
-        dev->hard_header_len     = IPOIB_ENCAP_LEN + INFINIBAND_ALEN;
+        dev->hard_header_len     = IPOIB_ENCAP_LEN;
         dev->addr_len            = INFINIBAND_ALEN;
         dev->type                = ARPHRD_INFINIBAND;
         dev->tx_queue_len        = ipoib_sendq_size * 2;
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_multicast.c b/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
index f7ff9dd66cda..20ebc6fd1bb9 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
@@ -262,21 +262,13 @@ static int ipoib_mcast_join_finish(struct ipoib_mcast *mcast,
         netif_tx_lock_bh(dev);
         while (!skb_queue_empty(&mcast->pkt_queue)) {
                 struct sk_buff *skb = skb_dequeue(&mcast->pkt_queue);
-                struct dst_entry *dst = skb_dst(skb);
-                struct neighbour *n = NULL;
 
                 netif_tx_unlock_bh(dev);
 
                 skb->dev = dev;
-                if (dst)
-                        n = dst_get_neighbour_noref_raw(dst);
-                if (!dst || !n) {
-                        /* put pseudoheader back on for next time */
-                        skb_push(skb, sizeof (struct ipoib_pseudoheader));
-                }
-
                 if (dev_queue_xmit(skb))
                         ipoib_warn(priv, "dev_queue_xmit failed to requeue packet\n");
+
                 netif_tx_lock_bh(dev);
         }
         netif_tx_unlock_bh(dev);