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

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1750 commits)
  ixgbe: Allow Priority Flow Control settings to survive a device reset
  net: core: remove unneeded include in net/core/utils.c.
  e1000e: update version number
  e1000e: fix close interrupt race
  e1000e: fix loss of multicast packets
  e1000e: commonize tx cleanup routine to match e1000 & igb
  netfilter: fix nf_logger name in ebt_ulog.
  netfilter: fix warning in ebt_ulog init function.
  netfilter: fix warning about invalid const usage
  e1000: fix close race with interrupt
  e1000: cleanup clean_tx_irq routine so that it completely cleans ring
  e1000: fix tx hang detect logic and address dma mapping issues
  bridge: bad error handling when adding invalid ether address
  bonding: select current active slave when enslaving device for mode tlb and alb
  gianfar: reallocate skb when headroom is not enough for fcb
  Bump release date to 25Mar2009 and version to 0.22
  r6040: Fix second PHY address
  qeth: fix wait_event_timeout handling
  qeth: check for completion of a running recovery
  qeth: unregister MAC addresses during recovery.
  ...

Manually fixed up conflicts in:
	drivers/infiniband/hw/cxgb3/cxio_hal.h
	drivers/infiniband/hw/nes/nes_nic.c

2 files changed, 14 insertions, 10 deletions

diff --git a/drivers/infiniband/ulp/ipoib/ipoib_ib.c b/drivers/infiniband/ulp/ipoib/ipoib_ib.c
index a1925810be3c..da6082739839 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_ib.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_ib.c
@@ -446,11 +446,11 @@ poll_more:
                 if (dev->features & NETIF_F_LRO)
                         lro_flush_all(&priv->lro.lro_mgr);
 
-                netif_rx_complete(napi);
+                napi_complete(napi);
                 if (unlikely(ib_req_notify_cq(priv->recv_cq,
                                               IB_CQ_NEXT_COMP |
                                               IB_CQ_REPORT_MISSED_EVENTS)) &&
-                    netif_rx_reschedule(napi))
+                    napi_reschedule(napi))
                         goto poll_more;
         }
 
@@ -462,7 +462,7 @@ void ipoib_ib_completion(struct ib_cq *cq, void *dev_ptr)
         struct net_device *dev = dev_ptr;
         struct ipoib_dev_priv *priv = netdev_priv(dev);
 
-        netif_rx_schedule(&priv->napi);
+        napi_schedule(&priv->napi);
 }
 
 static void drain_tx_cq(struct net_device *dev)
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_main.c b/drivers/infiniband/ulp/ipoib/ipoib_main.c
index 353c13b91e8f..421a6640c9bd 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_main.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_main.c
@@ -1021,18 +1021,22 @@ static void ipoib_lro_setup(struct ipoib_dev_priv *priv)
         priv->lro.lro_mgr.ip_summed_aggr = CHECKSUM_UNNECESSARY;
 }
 
+static const struct net_device_ops ipoib_netdev_ops = {
+        .ndo_open                = ipoib_open,
+        .ndo_stop                = ipoib_stop,
+        .ndo_change_mtu          = ipoib_change_mtu,
+        .ndo_start_xmit          = ipoib_start_xmit,
+        .ndo_tx_timeout          = ipoib_timeout,
+        .ndo_set_multicast_list  = ipoib_set_mcast_list,
+        .ndo_neigh_setup         = ipoib_neigh_setup_dev,
+};
+
 static void ipoib_setup(struct net_device *dev)
 {
         struct ipoib_dev_priv *priv = netdev_priv(dev);
 
-        dev->open                = ipoib_open;
-        dev->stop                = ipoib_stop;
-        dev->change_mtu          = ipoib_change_mtu;
-        dev->hard_start_xmit     = ipoib_start_xmit;
-        dev->tx_timeout          = ipoib_timeout;
+        dev->netdev_ops          = &ipoib_netdev_ops;
         dev->header_ops          = &ipoib_header_ops;
-        dev->set_multicast_list  = ipoib_set_mcast_list;
-        dev->neigh_setup         = ipoib_neigh_setup_dev;
 
         ipoib_set_ethtool_ops(dev);