Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (867 commits)
  [SKY2]: status polling loop (post merge)
  [NET]: Fix NAPI completion handling in some drivers.
  [TCP]: Limit processing lost_retrans loop to work-to-do cases
  [TCP]: Fix lost_retrans loop vs fastpath problems
  [TCP]: No need to re-count fackets_out/sacked_out at RTO
  [TCP]: Extract tcp_match_queue_to_sack from sacktag code
  [TCP]: Kill almost unused variable pcount from sacktag
  [TCP]: Fix mark_head_lost to ignore R-bit when trying to mark L
  [TCP]: Add bytes_acked (ABC) clearing to FRTO too
  [IPv6]: Update setsockopt(IPV6_MULTICAST_IF) to support RFC 3493, try2
  [NETFILTER]: x_tables: add missing ip6t_modulename aliases
  [NETFILTER]: nf_conntrack_tcp: fix connection reopening
  [QETH]: fix qeth_main.c
  [NETLINK]: fib_frontend build fixes
  [IPv6]: Export userland ND options through netlink (RDNSS support)
  [9P]: build fix with !CONFIG_SYSCTL
  [NET]: Fix dev_put() and dev_hold() comments
  [NET]: make netlink user -> kernel interface synchronious
  [NET]: unify netlink kernel socket recognition
  [NET]: cleanup 3rd argument in netlink_sendskb
  ...

Fix up conflicts manually in Documentation/feature-removal-schedule.txt
and my new least favourite crap, the "mod_devicetable" support in the
files include/linux/mod_devicetable.h and scripts/mod/file2alias.c.

(The latter files seem to be explicitly _designed_ to get conflicts when
different subsystems work with them - that have an absolutely horrid
lack of subsystem separation!)

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

5 files changed, 66 insertions, 75 deletions

diff --git a/drivers/infiniband/ulp/ipoib/ipoib.h b/drivers/infiniband/ulp/ipoib/ipoib.h
index 285c143115cc..34c6128d2a34 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib.h
+++ b/drivers/infiniband/ulp/ipoib/ipoib.h
@@ -228,6 +228,8 @@ struct ipoib_dev_priv {
 
         struct net_device *dev;
 
+        struct napi_struct napi;
+
         unsigned long flags;
 
         struct mutex mcast_mutex;
@@ -278,8 +280,6 @@ struct ipoib_dev_priv {
 
         struct ib_event_handler event_handler;
 
-        struct net_device_stats stats;
-
         struct net_device *parent;
         struct list_head child_intfs;
         struct list_head list;
@@ -351,7 +351,7 @@ extern struct workqueue_struct *ipoib_workqueue;
 
 /* functions */
 
-int ipoib_poll(struct net_device *dev, int *budget);
+int ipoib_poll(struct napi_struct *napi, int budget);
 void ipoib_ib_completion(struct ib_cq *cq, void *dev_ptr);
 
 struct ipoib_ah *ipoib_create_ah(struct net_device *dev,
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_cm.c b/drivers/infiniband/ulp/ipoib/ipoib_cm.c
index 08b4676a3820..1afd93cdd6bb 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_cm.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_cm.c
@@ -430,7 +430,7 @@ void ipoib_cm_handle_rx_wc(struct net_device *dev, struct ib_wc *wc)
                 ipoib_dbg(priv, "cm recv error "
                            "(status=%d, wrid=%d vend_err %x)\n",
                            wc->status, wr_id, wc->vendor_err);
-                ++priv->stats.rx_dropped;
+                ++dev->stats.rx_dropped;
                 goto repost;
         }
 
@@ -457,7 +457,7 @@ void ipoib_cm_handle_rx_wc(struct net_device *dev, struct ib_wc *wc)
                  * this packet and reuse the old buffer.
                  */
                 ipoib_dbg(priv, "failed to allocate receive buffer %d\n", wr_id);
-                ++priv->stats.rx_dropped;
+                ++dev->stats.rx_dropped;
                 goto repost;
         }
 
@@ -474,8 +474,8 @@ void ipoib_cm_handle_rx_wc(struct net_device *dev, struct ib_wc *wc)
         skb_pull(skb, IPOIB_ENCAP_LEN);
 
         dev->last_rx = jiffies;
-        ++priv->stats.rx_packets;
-        priv->stats.rx_bytes += skb->len;
+        ++dev->stats.rx_packets;
+        dev->stats.rx_bytes += skb->len;
 
         skb->dev = dev;
         /* XXX get correct PACKET_ type here */
@@ -512,8 +512,8 @@ void ipoib_cm_send(struct net_device *dev, struct sk_buff *skb, struct ipoib_cm_
         if (unlikely(skb->len > tx->mtu)) {
                 ipoib_warn(priv, "packet len %d (> %d) too long to send, dropping\n",
                            skb->len, tx->mtu);
-                ++priv->stats.tx_dropped;
-                ++priv->stats.tx_errors;
+                ++dev->stats.tx_dropped;
+                ++dev->stats.tx_errors;
                 ipoib_cm_skb_too_long(dev, skb, tx->mtu - IPOIB_ENCAP_LEN);
                 return;
         }
@@ -532,7 +532,7 @@ void ipoib_cm_send(struct net_device *dev, struct sk_buff *skb, struct ipoib_cm_
         tx_req->skb = skb;
         addr = ib_dma_map_single(priv->ca, skb->data, skb->len, DMA_TO_DEVICE);
         if (unlikely(ib_dma_mapping_error(priv->ca, addr))) {
-                ++priv->stats.tx_errors;
+                ++dev->stats.tx_errors;
                 dev_kfree_skb_any(skb);
                 return;
         }
@@ -542,7 +542,7 @@ void ipoib_cm_send(struct net_device *dev, struct sk_buff *skb, struct ipoib_cm_
         if (unlikely(post_send(priv, tx, tx->tx_head & (ipoib_sendq_size - 1),
                                 addr, skb->len))) {
                 ipoib_warn(priv, "post_send failed\n");
-                ++priv->stats.tx_errors;
+                ++dev->stats.tx_errors;
                 ib_dma_unmap_single(priv->ca, addr, skb->len, DMA_TO_DEVICE);
                 dev_kfree_skb_any(skb);
         } else {
@@ -580,8 +580,8 @@ static void ipoib_cm_handle_tx_wc(struct net_device *dev, struct ipoib_cm_tx *tx
         ib_dma_unmap_single(priv->ca, tx_req->mapping, tx_req->skb->len, DMA_TO_DEVICE);
 
         /* FIXME: is this right? Shouldn't we only increment on success? */
-        ++priv->stats.tx_packets;
-        priv->stats.tx_bytes += tx_req->skb->len;
+        ++dev->stats.tx_packets;
+        dev->stats.tx_bytes += tx_req->skb->len;
 
         dev_kfree_skb_any(tx_req->skb);
 
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_ib.c b/drivers/infiniband/ulp/ipoib/ipoib_ib.c
index 10944888cffd..0ec28c302fbf 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_ib.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_ib.c
@@ -208,7 +208,7 @@ static void ipoib_ib_handle_rx_wc(struct net_device *dev, struct ib_wc *wc)
          * this packet and reuse the old buffer.
          */
         if (unlikely(ipoib_alloc_rx_skb(dev, wr_id))) {
-                ++priv->stats.rx_dropped;
+                ++dev->stats.rx_dropped;
                 goto repost;
         }
 
@@ -225,8 +225,8 @@ static void ipoib_ib_handle_rx_wc(struct net_device *dev, struct ib_wc *wc)
         skb_pull(skb, IPOIB_ENCAP_LEN);
 
         dev->last_rx = jiffies;
-        ++priv->stats.rx_packets;
-        priv->stats.rx_bytes += skb->len;
+        ++dev->stats.rx_packets;
+        dev->stats.rx_bytes += skb->len;
 
         skb->dev = dev;
         /* XXX get correct PACKET_ type here */
@@ -260,8 +260,8 @@ static void ipoib_ib_handle_tx_wc(struct net_device *dev, struct ib_wc *wc)
         ib_dma_unmap_single(priv->ca, tx_req->mapping,
                             tx_req->skb->len, DMA_TO_DEVICE);
 
-        ++priv->stats.tx_packets;
-        priv->stats.tx_bytes += tx_req->skb->len;
+        ++dev->stats.tx_packets;
+        dev->stats.tx_bytes += tx_req->skb->len;
 
         dev_kfree_skb_any(tx_req->skb);
 
@@ -281,63 +281,58 @@ static void ipoib_ib_handle_tx_wc(struct net_device *dev, struct ib_wc *wc)
                            wc->status, wr_id, wc->vendor_err);
 }
 
-int ipoib_poll(struct net_device *dev, int *budget)
+int ipoib_poll(struct napi_struct *napi, int budget)
 {
-        struct ipoib_dev_priv *priv = netdev_priv(dev);
-        int max = min(*budget, dev->quota);
+        struct ipoib_dev_priv *priv = container_of(napi, struct ipoib_dev_priv, napi);
+        struct net_device *dev = priv->dev;
         int done;
         int t;
-        int empty;
         int n, i;
 
         done  = 0;
-        empty = 0;
 
-        while (max) {
+poll_more:
+        while (done < budget) {
+                int max = (budget - done);
+
                 t = min(IPOIB_NUM_WC, max);
                 n = ib_poll_cq(priv->cq, t, priv->ibwc);
 
-                for (i = 0; i < n; ++i) {
+                for (i = 0; i < n; i++) {
                         struct ib_wc *wc = priv->ibwc + i;
 
                         if (wc->wr_id & IPOIB_CM_OP_SRQ) {
                                 ++done;
-                                --max;
                                 ipoib_cm_handle_rx_wc(dev, wc);
                         } else if (wc->wr_id & IPOIB_OP_RECV) {
                                 ++done;
-                                --max;
                                 ipoib_ib_handle_rx_wc(dev, wc);
                         } else
                                 ipoib_ib_handle_tx_wc(dev, wc);
                 }
 
-                if (n != t) {
-                        empty = 1;
+                if (n != t)
                         break;
-                }
         }
 
-        dev->quota -= done;
-        *budget    -= done;
-
-        if (empty) {
-                netif_rx_complete(dev);
+        if (done < budget) {
+                netif_rx_complete(dev, napi);
                 if (unlikely(ib_req_notify_cq(priv->cq,
                                               IB_CQ_NEXT_COMP |
                                               IB_CQ_REPORT_MISSED_EVENTS)) &&
-                    netif_rx_reschedule(dev, 0))
-                        return 1;
-
-                return 0;
+                    netif_rx_reschedule(dev, napi))
+                        goto poll_more;
         }
 
-        return 1;
+        return done;
 }
 
 void ipoib_ib_completion(struct ib_cq *cq, void *dev_ptr)
 {
-        netif_rx_schedule(dev_ptr);
+        struct net_device *dev = dev_ptr;
+        struct ipoib_dev_priv *priv = netdev_priv(dev);
+
+        netif_rx_schedule(dev, &priv->napi);
 }
 
 static inline int post_send(struct ipoib_dev_priv *priv,
@@ -367,8 +362,8 @@ void ipoib_send(struct net_device *dev, struct sk_buff *skb,
         if (unlikely(skb->len > priv->mcast_mtu + IPOIB_ENCAP_LEN)) {
                 ipoib_warn(priv, "packet len %d (> %d) too long to send, dropping\n",
                            skb->len, priv->mcast_mtu + IPOIB_ENCAP_LEN);
-                ++priv->stats.tx_dropped;
-                ++priv->stats.tx_errors;
+                ++dev->stats.tx_dropped;
+                ++dev->stats.tx_errors;
                 ipoib_cm_skb_too_long(dev, skb, priv->mcast_mtu);
                 return;
         }
@@ -388,7 +383,7 @@ void ipoib_send(struct net_device *dev, struct sk_buff *skb,
         addr = ib_dma_map_single(priv->ca, skb->data, skb->len,
                                  DMA_TO_DEVICE);
         if (unlikely(ib_dma_mapping_error(priv->ca, addr))) {
-                ++priv->stats.tx_errors;
+                ++dev->stats.tx_errors;
                 dev_kfree_skb_any(skb);
                 return;
         }
@@ -397,7 +392,7 @@ void ipoib_send(struct net_device *dev, struct sk_buff *skb,
         if (unlikely(post_send(priv, priv->tx_head & (ipoib_sendq_size - 1),
                                address->ah, qpn, addr, skb->len))) {
                 ipoib_warn(priv, "post_send failed\n");
-                ++priv->stats.tx_errors;
+                ++dev->stats.tx_errors;
                 ib_dma_unmap_single(priv->ca, addr, skb->len, DMA_TO_DEVICE);
                 dev_kfree_skb_any(skb);
         } else {
@@ -577,7 +572,6 @@ int ipoib_ib_dev_stop(struct net_device *dev, int flush)
         int i;
 
         clear_bit(IPOIB_FLAG_INITIALIZED, &priv->flags);
-        netif_poll_disable(dev);
 
         ipoib_cm_dev_stop(dev);
 
@@ -660,7 +654,6 @@ timeout:
                 msleep(1);
         }
 
-        netif_poll_enable(dev);
         ib_req_notify_cq(priv->cq, IB_CQ_NEXT_COMP);
 
         return 0;
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_main.c b/drivers/infiniband/ulp/ipoib/ipoib_main.c
index 894b1dcdf3eb..855c9deca8b7 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_main.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_main.c
@@ -98,16 +98,20 @@ int ipoib_open(struct net_device *dev)
 
         ipoib_dbg(priv, "bringing up interface\n");
 
+        napi_enable(&priv->napi);
         set_bit(IPOIB_FLAG_ADMIN_UP, &priv->flags);
 
         if (ipoib_pkey_dev_delay_open(dev))
                 return 0;
 
-        if (ipoib_ib_dev_open(dev))
+        if (ipoib_ib_dev_open(dev)) {
+                napi_disable(&priv->napi);
                 return -EINVAL;
+        }
 
         if (ipoib_ib_dev_up(dev)) {
                 ipoib_ib_dev_stop(dev, 1);
+                napi_disable(&priv->napi);
                 return -EINVAL;
         }
 
@@ -140,6 +144,7 @@ static int ipoib_stop(struct net_device *dev)
         ipoib_dbg(priv, "stopping interface\n");
 
         clear_bit(IPOIB_FLAG_ADMIN_UP, &priv->flags);
+        napi_disable(&priv->napi);
 
         netif_stop_queue(dev);
 
@@ -512,7 +517,7 @@ static void neigh_add_path(struct sk_buff *skb, struct net_device *dev)
 
         neigh = ipoib_neigh_alloc(skb->dst->neighbour);
         if (!neigh) {
-                ++priv->stats.tx_dropped;
+                ++dev->stats.tx_dropped;
                 dev_kfree_skb_any(skb);
                 return;
         }
@@ -577,7 +582,7 @@ err_list:
 err_path:
         ipoib_neigh_free(dev, neigh);
 err_drop:
-        ++priv->stats.tx_dropped;
+        ++dev->stats.tx_dropped;
         dev_kfree_skb_any(skb);
 
         spin_unlock(&priv->lock);
@@ -626,7 +631,7 @@ static void unicast_arp_send(struct sk_buff *skb, struct net_device *dev,
                         } else
                                 __path_add(dev, path);
                 } else {
-                        ++priv->stats.tx_dropped;
+                        ++dev->stats.tx_dropped;
                         dev_kfree_skb_any(skb);
                 }
 
@@ -645,7 +650,7 @@ static void unicast_arp_send(struct sk_buff *skb, struct net_device *dev,
                 skb_push(skb, sizeof *phdr);
                 __skb_queue_tail(&path->queue, skb);
         } else {
-                ++priv->stats.tx_dropped;
+                ++dev->stats.tx_dropped;
                 dev_kfree_skb_any(skb);
         }
 
@@ -713,7 +718,7 @@ static int ipoib_start_xmit(struct sk_buff *skb, struct net_device *dev)
                         __skb_queue_tail(&neigh->queue, skb);
                         spin_unlock(&priv->lock);
                 } else {
-                        ++priv->stats.tx_dropped;
+                        ++dev->stats.tx_dropped;
                         dev_kfree_skb_any(skb);
                 }
         } else {
@@ -739,7 +744,7 @@ static int ipoib_start_xmit(struct sk_buff *skb, struct net_device *dev)
                                            IPOIB_QPN(phdr->hwaddr),
                                            IPOIB_GID_RAW_ARG(phdr->hwaddr + 4));
                                 dev_kfree_skb_any(skb);
-                                ++priv->stats.tx_dropped;
+                                ++dev->stats.tx_dropped;
                                 goto out;
                         }
 
@@ -753,13 +758,6 @@ out:
         return NETDEV_TX_OK;
 }
 
-static struct net_device_stats *ipoib_get_stats(struct net_device *dev)
-{
-        struct ipoib_dev_priv *priv = netdev_priv(dev);
-
-        return &priv->stats;
-}
-
 static void ipoib_timeout(struct net_device *dev)
 {
         struct ipoib_dev_priv *priv = netdev_priv(dev);
@@ -775,7 +773,7 @@ static void ipoib_timeout(struct net_device *dev)
 static int ipoib_hard_header(struct sk_buff *skb,
                              struct net_device *dev,
                              unsigned short type,
-                             void *daddr, void *saddr, unsigned len)
+                             const void *daddr, const void *saddr, unsigned len)
 {
         struct ipoib_header *header;
 
@@ -856,11 +854,10 @@ struct ipoib_neigh *ipoib_neigh_alloc(struct neighbour *neighbour)
 
 void ipoib_neigh_free(struct net_device *dev, struct ipoib_neigh *neigh)
 {
-        struct ipoib_dev_priv *priv = netdev_priv(dev);
         struct sk_buff *skb;
         *to_ipoib_neigh(neigh->neighbour) = NULL;
         while ((skb = __skb_dequeue(&neigh->queue))) {
-                ++priv->stats.tx_dropped;
+                ++dev->stats.tx_dropped;
                 dev_kfree_skb_any(skb);
         }
         if (ipoib_cm_get(neigh))
@@ -935,6 +932,10 @@ void ipoib_dev_cleanup(struct net_device *dev)
         priv->tx_ring = NULL;
 }
 
+static const struct header_ops ipoib_header_ops = {
+        .create = ipoib_hard_header,
+};
+
 static void ipoib_setup(struct net_device *dev)
 {
         struct ipoib_dev_priv *priv = netdev_priv(dev);
@@ -943,13 +944,12 @@ static void ipoib_setup(struct net_device *dev)
         dev->stop                = ipoib_stop;
         dev->change_mtu          = ipoib_change_mtu;
         dev->hard_start_xmit     = ipoib_start_xmit;
-        dev->get_stats           = ipoib_get_stats;
         dev->tx_timeout          = ipoib_timeout;
-        dev->hard_header         = ipoib_hard_header;
+        dev->header_ops          = &ipoib_header_ops;
         dev->set_multicast_list  = ipoib_set_mcast_list;
         dev->neigh_setup         = ipoib_neigh_setup_dev;
-        dev->poll                = ipoib_poll;
-        dev->weight              = 100;
+
+        netif_napi_add(dev, &priv->napi, ipoib_poll, 100);
 
         dev->watchdog_timeo      = HZ;
 
@@ -973,8 +973,6 @@ static void ipoib_setup(struct net_device *dev)
 
         netif_carrier_off(dev);
 
-        SET_MODULE_OWNER(dev);
-
         priv->dev = dev;
 
         spin_lock_init(&priv->lock);
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_multicast.c b/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
index aae367057a56..98e904a7f3e8 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
@@ -125,7 +125,7 @@ static void ipoib_mcast_free(struct ipoib_mcast *mcast)
         }
 
         spin_lock_irqsave(&priv->tx_lock, flags);
-        priv->stats.tx_dropped += tx_dropped;
+        dev->stats.tx_dropped += tx_dropped;
         spin_unlock_irqrestore(&priv->tx_lock, flags);
 
         kfree(mcast);
@@ -320,7 +320,7 @@ ipoib_mcast_sendonly_join_complete(int status,
                 /* Flush out any queued packets */
                 spin_lock_irq(&priv->tx_lock);
                 while (!skb_queue_empty(&mcast->pkt_queue)) {
-                        ++priv->stats.tx_dropped;
+                        ++dev->stats.tx_dropped;
                         dev_kfree_skb_any(skb_dequeue(&mcast->pkt_queue));
                 }
                 spin_unlock_irq(&priv->tx_lock);
@@ -675,7 +675,7 @@ void ipoib_mcast_send(struct net_device *dev, void *mgid, struct sk_buff *skb)
         if (!test_bit(IPOIB_MCAST_STARTED, &priv->flags)        ||
             !priv->broadcast                                    ||
             !test_bit(IPOIB_MCAST_FLAG_ATTACHED, &priv->broadcast->flags)) {
-                ++priv->stats.tx_dropped;
+                ++dev->stats.tx_dropped;
                 dev_kfree_skb_any(skb);
                 goto unlock;
         }
@@ -690,7 +690,7 @@ void ipoib_mcast_send(struct net_device *dev, void *mgid, struct sk_buff *skb)
                 if (!mcast) {
                         ipoib_warn(priv, "unable to allocate memory for "
                                    "multicast structure\n");
-                        ++priv->stats.tx_dropped;
+                        ++dev->stats.tx_dropped;
                         dev_kfree_skb_any(skb);
                         goto out;
                 }
@@ -705,7 +705,7 @@ void ipoib_mcast_send(struct net_device *dev, void *mgid, struct sk_buff *skb)
                 if (skb_queue_len(&mcast->pkt_queue) < IPOIB_MAX_MCAST_QUEUE)
                         skb_queue_tail(&mcast->pkt_queue, skb);
                 else {
-                        ++priv->stats.tx_dropped;
+                        ++dev->stats.tx_dropped;
                         dev_kfree_skb_any(skb);
                 }